diff --git a/.gitignore b/.gitignore
index 0743489f8ec..b6b4a1a559a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
 /src/utils/LogCompilation/target/
+/src/utils/LogCompilation/logc.jar
 /.project/
 /.settings/
 /compile_commands.json
diff --git a/bin/update_copyright_year.sh b/bin/update_copyright_year.sh
index fa7989d234b..fcdac6b935f 100644
--- a/bin/update_copyright_year.sh
+++ b/bin/update_copyright_year.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -f
 
 #
-# Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,13 @@
 # questions.
 #
 
-# Script to update the Copyright YEAR range in Mercurial & Git sources.
+# Script to update the Copyright YEAR range in Git sources.
 #  (Originally from xdono, Thanks!)
 
+# To update Copyright years for changes in a specific branch,
+# you use a command along these lines:
+# $ git diff upstream/master...<branch-name> | lsdiff | cut -d '/' -f 2-  | bash bin/update_copyright_year.sh -m -
+
 #------------------------------------------------------------
 copyright="Copyright"
 copyright_symbol="(c)"
@@ -47,7 +51,7 @@ rm -f -r ${tmp}
 mkdir -p ${tmp}
 total=0
 
-usage="Usage: `basename "$0"` [-c company] [-y year] [-h|f]"
+usage="Usage: `basename "$0"` [-c company] [-y year] [-m file] [-h|f]"
 Help()
 {
   # Display Help
@@ -65,15 +69,18 @@ Help()
   echo "-b     Specifies the base reference for change set lookup."
   echo "-f     Updates the copyright for all change sets in a given year,"
   echo "       as specified by -y. Overrides -b flag."
+  echo "-m     Read the list of modified files from the given file,"
+  echo "       use - to read from stdin"
   echo "-h     Print this help."
   echo
 }
 
 full_year=false
 base_reference=master
+modified_files_origin="";
 
 # Process options
-while getopts "b:c:fhy:" option; do
+while getopts "b:c:fhm:y:" option; do
   case $option in
     b) # supplied base reference
       base_reference=${OPTARG}
@@ -91,6 +98,9 @@ while getopts "b:c:fhy:" option; do
     y) # supplied company year
       year=${OPTARG}
       ;;
+    m) # modified files will be read from the given origin
+      modified_files_origin="${OPTARG}"
+      ;;
     \?) # illegal option
       echo "$usage"
       exit 1
@@ -110,18 +120,10 @@ git status &> /dev/null && git_found=true
 if [ "$git_found" != "true" ]; then
   echo "Error: Please execute script from within a JDK git repository."
   exit 1
-else
-  echo "Using Git version control system"
-  vcs_status=(git ls-files -m)
-  if [ "$full_year" = "true" ]; then
-    vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
-  else
-    vcs_list_changesets=(git log --no-merges "${base_reference}..HEAD" --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
-  fi
-  vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
-  vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}
 fi
 
+echo "Using Git version control system"
+
 # Return true if it makes sense to edit this file
 saneFileToCheck()
 {
@@ -168,6 +170,25 @@ updateFile() # file
   echo "${changed}"
 }
 
+# Update the copyright year on files sent in stdin
+updateFiles() # stdin: list of files to update
+{
+  count=0
+  fcount=0
+  while read i; do
+    fcount=`expr ${fcount} '+' 1`
+    if [ `updateFile "${i}"` = "true" ] ; then
+      count=`expr ${count} '+' 1`
+    fi
+  done
+  if [ ${count} -gt 0 ] ; then
+    printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
+    total=`expr ${total} '+' ${count}`
+   else
+    printf "  None of the %d files were changed.\n" ${fcount}
+  fi
+}
+
 # Update the copyright year on all files changed by this changeset
 updateChangesetFiles() # changeset
 {
@@ -178,18 +199,7 @@ updateChangesetFiles() # changeset
     | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \
     > ${files}
   if [ -f "${files}" -a -s "${files}" ] ; then
-    fcount=`cat ${files}| wc -l`
-    for i in `cat ${files}` ; do
-      if [ `updateFile "${i}"` = "true" ] ; then
-        count=`expr ${count} '+' 1`
-      fi
-    done
-    if [ ${count} -gt 0 ] ; then
-      printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
-      total=`expr ${total} '+' ${count}`
-    else
-      printf "  None of the %d files were changed.\n" ${fcount}
-    fi
+    cat ${files} | updateFiles
   else
     printf "  ERROR: No files changed in the changeset? Must be a mistake.\n"
     set -x
@@ -204,67 +214,80 @@ updateChangesetFiles() # changeset
 }
 
 # Check if repository is clean
+vcs_status=(git ls-files -m)
 previous=`"${vcs_status[@]}"|wc -l`
 if [ ${previous} -ne 0 ] ; then
   echo "WARNING: This repository contains previously edited working set files."
   echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
 fi
 
-# Get all changesets this year
-all_changesets=${tmp}/all_changesets
-rm -f ${all_changesets}
-"${vcs_list_changesets[@]}" > ${all_changesets}
-
-# Check changeset to see if it is Copyright only changes, filter changesets
-if [ -s ${all_changesets} ] ; then
-  echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
-  index=0
-  cat ${all_changesets} | while read changeset ; do
-    index=`expr ${index} '+' 1`
-    desc=${tmp}/desc.${changeset}
-    rm -f ${desc}
-    echo "------------------------------------------------"
-    "${vcs_changeset_message[@]}" "${changeset}" > ${desc}
-    printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
-    if [ "${year}" = "2010" ] ; then
-      if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
-        printf "  EXCLUDED tag changeset.\n"
-      elif cat ${desc} | grep -i -F rebrand > /dev/null ; then
-        printf "  EXCLUDED rebrand changeset.\n"
-      elif cat ${desc} | grep -i -F copyright > /dev/null ; then
-        printf "  EXCLUDED copyright changeset.\n"
-      else
-        updateChangesetFiles ${changeset}
-      fi
-    else
-      if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
-        printf "  EXCLUDED tag changeset.\n"
-      elif cat ${desc} | grep -i -F "copyright year" > /dev/null ; then
-        printf "  EXCLUDED copyright year changeset.\n"
-      else
-        updateChangesetFiles ${changeset}
-      fi
-    fi
-    rm -f ${desc}
-  done
-fi
-
-if [ ${total} -gt 0 ] ; then
-   echo "---------------------------------------------"
-   echo "Updated the copyright year on a total of ${total} files."
-   if [ ${previous} -eq 0 ] ; then
-     echo "This count should match the count of modified files in the repository: ${vcs_status[*]}"
-   else
-     echo "WARNING: This repository contained previously edited working set files."
-   fi
-   echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
+if [ "x$modified_files_origin" != "x" ]; then
+  cat $modified_files_origin | updateFiles
 else
-   echo "---------------------------------------------"
-   echo "No files were changed"
-   if [ ${previous} -ne 0 ] ; then
-     echo "WARNING: This repository contained previously edited working set files."
-   fi
-   echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
+  # Get all changesets this year
+  if [ "$full_year" = "true" ]; then
+    vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
+  else
+    vcs_list_changesets=(git log --no-merges "${base_reference}..HEAD" --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
+  fi
+  vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
+  vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}
+
+  all_changesets=${tmp}/all_changesets
+  rm -f ${all_changesets}
+  "${vcs_list_changesets[@]}" > ${all_changesets}
+
+  # Check changeset to see if it is Copyright only changes, filter changesets
+  if [ -s ${all_changesets} ] ; then
+    echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
+    index=0
+    cat ${all_changesets} | while read changeset ; do
+      index=`expr ${index} '+' 1`
+      desc=${tmp}/desc.${changeset}
+      rm -f ${desc}
+      echo "------------------------------------------------"
+      "${vcs_changeset_message[@]}" "${changeset}" > ${desc}
+      printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
+      if [ "${year}" = "2010" ] ; then
+        if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
+          printf "  EXCLUDED tag changeset.\n"
+        elif cat ${desc} | grep -i -F rebrand > /dev/null ; then
+          printf "  EXCLUDED rebrand changeset.\n"
+        elif cat ${desc} | grep -i -F copyright > /dev/null ; then
+          printf "  EXCLUDED copyright changeset.\n"
+        else
+          updateChangesetFiles ${changeset}
+        fi
+      else
+        if cat ${desc} | grep -i -F "Added tag" > /dev/null ; then
+          printf "  EXCLUDED tag changeset.\n"
+        elif cat ${desc} | grep -i -F "copyright year" > /dev/null ; then
+          printf "  EXCLUDED copyright year changeset.\n"
+        else
+          updateChangesetFiles ${changeset}
+        fi
+      fi
+      rm -f ${desc}
+    done
+  fi
+
+  if [ ${total} -gt 0 ] ; then
+     echo "---------------------------------------------"
+     echo "Updated the copyright year on a total of ${total} files."
+     if [ ${previous} -eq 0 ] ; then
+       echo "This count should match the count of modified files in the repository: ${vcs_status[*]}"
+     else
+       echo "WARNING: This repository contained previously edited working set files."
+     fi
+     echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
+  else
+     echo "---------------------------------------------"
+     echo "No files were changed"
+     if [ ${previous} -ne 0 ] ; then
+       echo "WARNING: This repository contained previously edited working set files."
+     fi
+     echo "  ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`"
+  fi
 fi
 
 # Cleanup
diff --git a/doc/building.html b/doc/building.html
index 8e5a7625371..534888ef667 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -1385,10 +1385,9 @@ dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .</code></pre></li>
 can specify it by <code>--with-alsa</code>.</p></li>
 </ul>
 <h4 id="x11-1">X11</h4>
-<p>You will need X11 libraries suitable for your <em>target</em> system.
-In most cases, using Debian's pre-built libraries work fine.</p>
-<p>Note that X11 is needed even if you only want to build a headless
-JDK.</p>
+<p>When not building a headless JDK, you will need X11 libraries
+suitable for your <em>target</em> system. In most cases, using Debian's
+pre-built libraries work fine.</p>
 <ul>
 <li><p>Go to <a href="https://www.debian.org/distrib/packages">Debian
 Package Search</a>, search for the following packages for your
diff --git a/doc/building.md b/doc/building.md
index b626027f101..d653d36eb55 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -1178,10 +1178,8 @@ Note that alsa is needed even if you only want to build a headless JDK.
 
 #### X11
 
-You will need X11 libraries suitable for your *target* system. In most cases,
-using Debian's pre-built libraries work fine.
-
-Note that X11 is needed even if you only want to build a headless JDK.
+When not building a headless JDK, you will need X11 libraries suitable for your
+*target* system. In most cases, using Debian's pre-built libraries work fine.
 
 * Go to [Debian Package Search](https://www.debian.org/distrib/packages),
   search for the following packages for your *target* system, and download them
diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html
index 362245cd00a..c7126622c7d 100644
--- a/doc/hotspot-style.html
+++ b/doc/hotspot-style.html
@@ -965,9 +965,8 @@ rather than <code>NULL</code>. See the paper for reasons to avoid
 <code>NULL</code>.</p>
 <p>Don't use (constant expression or literal) 0 for pointers. Note that
 C++14 removed non-literal 0 constants from <em>null pointer
-constants</em>, though some compilers continue to treat them as such.
-For historical reasons there may be lingering uses of 0 as a
-pointer.</p>
+constants</em>, though some compilers continue to treat them as
+such.</p>
 <h3 id="atomic">&lt;atomic&gt;</h3>
 <p>Do not use facilities provided by the <code>&lt;atomic&gt;</code>
 header (<a
diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md
index 26549e3ca02..a1ee0403632 100644
--- a/doc/hotspot-style.md
+++ b/doc/hotspot-style.md
@@ -884,8 +884,7 @@ rather than `NULL`.  See the paper for reasons to avoid `NULL`.
 
 Don't use (constant expression or literal) 0 for pointers.  Note that C++14
 removed non-literal 0 constants from _null pointer constants_, though some
-compilers continue to treat them as such.  For historical reasons there may be
-lingering uses of 0 as a pointer.
+compilers continue to treat them as such.
 
 ### &lt;atomic&gt;
 
diff --git a/doc/testing.html b/doc/testing.html
index 31f4fbd1778..195153c8612 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -72,6 +72,7 @@ id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+<li><a href="#sctp-tests" id="toc-sctp-tests">SCTP Tests</a></li>
 <li><a href="#testing-ahead-of-time-optimizations"
 id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
 Optimizations</a></li>
@@ -621,6 +622,21 @@ element of the appropriate <code>@Artifact</code> class. (See
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
+<h3 id="sctp-tests">SCTP Tests</h3>
+<p>The SCTP tests require the SCTP runtime library, which is often not
+installed by default in popular Linux distributions. Without this
+library, the SCTP tests will be skipped. If you want to enable the SCTP
+tests, you should install the SCTP library before running the tests.</p>
+<p>For distributions using the .deb packaging format and the apt tool
+(such as Debian, Ubuntu, etc.), try this:</p>
+<pre><code>sudo apt install libsctp1
+sudo modprobe sctp
+lsmod | grep sctp</code></pre>
+<p>For distributions using the .rpm packaging format and the dnf tool
+(such as Fedora, Red Hat, etc.), try this:</p>
+<pre><code>sudo dnf install -y lksctp-tools
+sudo modprobe sctp
+lsmod | grep sctp</code></pre>
 <h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
 Optimizations</h3>
 <p>One way to improve test coverage of ahead-of-time (AOT) optimizations
diff --git a/doc/testing.md b/doc/testing.md
index b95f59de9fd..d0e54aab02b 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -640,6 +640,32 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
+
+### SCTP Tests
+
+The SCTP tests require the SCTP runtime library, which is often not installed
+by default in popular Linux distributions. Without this library, the SCTP tests
+will be skipped. If you want to enable the SCTP tests, you should install the
+SCTP library before running the tests.
+
+For distributions using the .deb packaging format and the apt tool
+(such as Debian, Ubuntu, etc.), try this:
+
+```
+sudo apt install libsctp1
+sudo modprobe sctp
+lsmod | grep sctp
+```
+
+For distributions using the .rpm packaging format and the dnf tool
+(such as Fedora, Red Hat, etc.), try this:
+
+```
+sudo dnf install -y lksctp-tools
+sudo modprobe sctp
+lsmod | grep sctp
+```
+
 ### Testing Ahead-of-time Optimizations
 
 One way to improve test coverage of ahead-of-time (AOT) optimizations in
diff --git a/make/PreInit.gmk b/make/PreInit.gmk
index 3df44308dd9..8152587781c 100644
--- a/make/PreInit.gmk
+++ b/make/PreInit.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,8 @@ CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
 ifeq ($(CALLED_SPEC_TARGETS), )
   SKIP_SPEC := true
 endif
-ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
+MFLAGS_SINGLE := $(filter-out --%, $(MFLAGS))
+ifeq ($(findstring p, $(MFLAGS_SINGLE))$(findstring q, $(MFLAGS_SINGLE)), pq)
   SKIP_SPEC := true
 endif
 
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 946b1332edc..02ea632e3ec 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -972,6 +972,10 @@ define SetupRunJtregTestBody
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
   endif
 
+  ifneq ($$(findstring -XX:+UseCompactObjectHeaders, $$(JTREG_ALL_OPTIONS)), )
+    JTREG_AUTO_PROBLEM_LISTS += ProblemList-coh.txt
+  endif
+
 
   ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
     # Accept both absolute paths as well as relative to the current test root.
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 5a9fdc57c74..2d39d84f52e 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -69,22 +69,18 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # Debug prefix mapping if supported by compiler
   DEBUG_PREFIX_CFLAGS=
 
-  UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: string,
-    DEFAULT: "",
-    RESULT: DEBUG_SYMBOLS_LEVEL,
+  UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: literal,
+    DEFAULT: [auto], VALID_VALUES: [auto 1 2 3],
+    CHECK_AVAILABLE: [
+      if test x$TOOLCHAIN_TYPE = xmicrosoft; then
+        AVAILABLE=false
+      fi
+    ],
     DESC: [set the native debug symbol level (GCC and Clang only)],
-    DEFAULT_DESC: [toolchain default])
-  AC_SUBST(DEBUG_SYMBOLS_LEVEL)
-
-  if test "x${TOOLCHAIN_TYPE}" = xgcc || \
-     test "x${TOOLCHAIN_TYPE}" = xclang; then
-    DEBUG_SYMBOLS_LEVEL_FLAGS="-g"
-    if test "x${DEBUG_SYMBOLS_LEVEL}" != "x"; then
-      DEBUG_SYMBOLS_LEVEL_FLAGS="-g${DEBUG_SYMBOLS_LEVEL}"
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_SYMBOLS_LEVEL_FLAGS}],
-          IF_FALSE: AC_MSG_ERROR("Debug info level ${DEBUG_SYMBOLS_LEVEL} is not supported"))
-    fi
-  fi
+    DEFAULT_DESC: [toolchain default],
+    IF_AUTO: [
+      RESULT=""
+    ])
 
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -111,8 +107,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     fi
 
     # Debug info level should follow the debug format to be effective.
-    CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 ${DEBUG_SYMBOLS_LEVEL_FLAGS}"
-    ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
+    CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
       # Check if compiler supports -fdebug-prefix-map. If so, use that to make
@@ -132,8 +128,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
         IF_FALSE: [GDWARF_FLAGS=""])
 
     # Debug info level should follow the debug format to be effective.
-    CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} ${DEBUG_SYMBOLS_LEVEL_FLAGS}"
-    ASFLAGS_DEBUG_SYMBOLS="${DEBUG_SYMBOLS_LEVEL_FLAGS}"
+    CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
@@ -213,8 +209,12 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       BUILD_CC_DISABLE_WARNING_PREFIX="-wd"
       CFLAGS_WARNINGS_ARE_ERRORS="-WX"
 
-      WARNINGS_ENABLE_ALL="-W3"
+      WARNINGS_ENABLE_ALL_NORMAL="-W3"
+      WARNINGS_ENABLE_ADDITIONAL=""
+      WARNINGS_ENABLE_ADDITIONAL_CXX=""
+      WARNINGS_ENABLE_ADDITIONAL_JVM=""
       DISABLED_WARNINGS="4800 5105"
+      CFLAGS_CONVERSION_WARNINGS=
       ;;
 
     gcc)
@@ -222,14 +222,16 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
+      WARNINGS_ENABLE_ALL_NORMAL="-Wall -Wextra"
+
       # Additional warnings that are not activated by -Wall and -Wextra
-      WARNINGS_ENABLE_ADDITIONAL="-Winvalid-pch -Wpointer-arith -Wreturn-type \
+      WARNINGS_ENABLE_ADDITIONAL="-Wformat=2 \
+          -Winvalid-pch -Wpointer-arith -Wreturn-type \
           -Wsign-compare -Wtrampolines -Wtype-limits -Wundef -Wuninitialized \
           -Wunused-const-variable=1 -Wunused-function -Wunused-result \
           -Wunused-value"
       WARNINGS_ENABLE_ADDITIONAL_CXX="-Woverloaded-virtual -Wreorder"
-      WARNINGS_ENABLE_ALL_CFLAGS="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
-      WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
+      WARNINGS_ENABLE_ADDITIONAL_JVM="-Wzero-as-null-pointer-constant"
 
       # These warnings will never be turned on, since they generate too many
       # false positives.
@@ -238,6 +240,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
         DISABLED_WARNINGS="$DISABLED_WARNINGS psabi"
       fi
+      CFLAGS_CONVERSION_WARNINGS="-Wconversion -Wno-float-conversion"
       ;;
 
     clang)
@@ -245,22 +248,32 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
+      WARNINGS_ENABLE_ALL_NORMAL="-Wall -Wextra"
+
       # Additional warnings that are not activated by -Wall and -Wextra
-      WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wsign-compare -Wreorder \
+      WARNINGS_ENABLE_ADDITIONAL="-Wformat=2 \
+          -Wpointer-arith -Wsign-compare -Wreorder \
           -Wunused-function -Wundef -Wunused-value -Woverloaded-virtual"
-      WARNINGS_ENABLE_ALL="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
+      WARNINGS_ENABLE_ADDITIONAL_CXX=""
+      WARNINGS_ENABLE_ADDITIONAL_JVM="-Wzero-as-null-pointer-constant"
 
       # These warnings will never be turned on, since they generate too many
       # false positives.
       DISABLED_WARNINGS="unknown-warning-option unused-parameter"
+      CFLAGS_CONVERSION_WARNINGS="-Wimplicit-int-conversion"
       ;;
   esac
+  WARNINGS_ENABLE_ALL="$WARNINGS_ENABLE_ALL_NORMAL $WARNINGS_ENABLE_ADDITIONAL"
+  WARNINGS_ENABLE_ALL_CXX="$WARNINGS_ENABLE_ALL $WARNINGS_ENABLE_ADDITIONAL_CXX"
+  WARNINGS_ENABLE_ALL_JVM="$WARNINGS_ENABLE_ALL_CXX $WARNINGS_ENABLE_ADDITIONAL_JVM"
+
   AC_SUBST(DISABLE_WARNING_PREFIX)
   AC_SUBST(BUILD_CC_DISABLE_WARNING_PREFIX)
   AC_SUBST(CFLAGS_WARNINGS_ARE_ERRORS)
   AC_SUBST(DISABLED_WARNINGS)
   AC_SUBST(DISABLED_WARNINGS_C)
   AC_SUBST(DISABLED_WARNINGS_CXX)
+  AC_SUBST(CFLAGS_CONVERSION_WARNINGS)
 ])
 
 AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
@@ -608,19 +621,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   ADLC_LANGSTD_CXXFLAGS="$LANGSTD_CXXFLAGS"
 
   # CFLAGS WARNINGS STUFF
-  # Set JVM_CFLAGS warning handling
-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    WARNING_CFLAGS_JDK_CONLY="$WARNINGS_ENABLE_ALL_CFLAGS"
-    WARNING_CFLAGS_JDK_CXXONLY="$WARNINGS_ENABLE_ALL_CXXFLAGS"
-    WARNING_CFLAGS_JVM="$WARNINGS_ENABLE_ALL_CXXFLAGS"
-
-  elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    WARNING_CFLAGS="$WARNINGS_ENABLE_ALL"
-
-  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    WARNING_CFLAGS="$WARNINGS_ENABLE_ALL"
-
-  fi
+  WARNING_CFLAGS_JDK_CONLY="$WARNINGS_ENABLE_ALL"
+  WARNING_CFLAGS_JDK_CXXONLY="$WARNINGS_ENABLE_ALL_CXX"
+  WARNING_CFLAGS_JVM="$WARNINGS_ENABLE_ALL_JVM"
 
   # Set some additional per-OS defines.
 
@@ -882,12 +885,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
+      $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
       $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
+      $DEBUG_SYMBOLS_CFLAGS_JDK \
       $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
diff --git a/make/autoconf/lib-bundled.m4 b/make/autoconf/lib-bundled.m4
index a6266bec014..7aa5fdf2589 100644
--- a/make/autoconf/lib-bundled.m4
+++ b/make/autoconf/lib-bundled.m4
@@ -267,8 +267,8 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
   LIBZ_LIBS=""
   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
-    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-        LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
+    if test "x$OPENJDK_TARGET_OS" = xmacosx -o "x$OPENJDK_TARGET_OS" = xaix -o "x$OPENJDK_TARGET_OS" = xlinux; then
+        LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1"
     fi
   else
     LIBZ_LIBS="-lz"
diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
index 31d48055984..faaf229eacd 100644
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=8.1
+JTREG_MINIMUM_VERSION=8.2.1
 GTEST_MINIMUM_VERSION=1.14.0
 
 ################################################################################
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index 8dc3d55ed0c..5daacdc1ced 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -42,12 +42,12 @@ m4_include([lib-tests.m4])
 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 [
   # Check if X11 is needed
-  if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # No X11 support on windows or macosx
+  if test "x$OPENJDK_TARGET_OS" = xwindows ||
+     test "x$OPENJDK_TARGET_OS" = xmacosx ||
+     test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
     NEEDS_LIB_X11=false
   else
-    # All other instances need X11, even if building headless only, libawt still
-    # needs X11 headers.
+    # All other instances need X11 for libawt.
     NEEDS_LIB_X11=true
   fi
 
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
index 1b247e159ac..90d5d795626 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -311,6 +311,12 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   else
     OPENJDK_BUILD_OS_ENV="$VAR_OS"
   fi
+  # Special handling for MSYS2 that reports a Cygwin triplet as the default host triplet.
+  case `uname` in
+    MSYS*)
+      OPENJDK_BUILD_OS_ENV=windows.msys2
+      ;;
+  esac
   OPENJDK_BUILD_CPU="$VAR_CPU"
   OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
   OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index b3d58704c50..c4e5a23d31a 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -529,6 +529,7 @@ CFLAGS_WARNINGS_ARE_ERRORS := @CFLAGS_WARNINGS_ARE_ERRORS@
 DISABLED_WARNINGS := @DISABLED_WARNINGS@
 DISABLED_WARNINGS_C := @DISABLED_WARNINGS_C@
 DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
+CFLAGS_CONVERSION_WARNINGS := @CFLAGS_CONVERSION_WARNINGS@
 
 # A global flag (true or false) determining if native warnings are considered errors.
 WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 97ef88932cb..45cc3c77dea 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -141,6 +141,66 @@ endef
 # Make sure logging is setup for everyone that includes MakeBase.gmk.
 $(eval $(call SetupLogging))
 
+################################################################################
+# Make does not have support for VARARGS, you can send variable amount
+# of arguments, but you can for example not append a list at the end.
+# It is therefore not easy to send the elements of a list of unknown
+# length as argument to a function. This can somewhat be worked around
+# by sending a list as an argument, and then interpreting each element
+# of the list as an argument to the function. However, Make is
+# limited, and using this method you can not easily send spaces.
+#
+# We need to quote strings for two reasons when sending them as
+# "variable append packs":
+#
+# 1) variable appends can include spaces, and those must be preserved
+# 2) variable appends can include assignment strings ":=", and those
+# must be quoted to a form so that we can recognise the "append pack".
+# We recognise an "append pack" by its lack of strict assignment ":="
+
+Q       := $(HASH)
+SpaceQ  := $(Q)s
+AppendQ := $(Q)+
+AssignQ := $(Q)a
+QQ      := $(Q)$(Q)
+
+# $(call Quote,echo "#trala:=") -> echo#s"##trala#a"
+Quote = $(subst :=,$(AssignQ),$(subst $(SPACE),$(SpaceQ),$(subst $(Q),$(QQ),$1)))
+
+# $(call Unquote,echo#s"##trala#a") -> echo "#trala:="
+Unquote = $(subst $(QQ),$(Q),$(subst $(SpaceQ),$(SPACE),$(subst $(AssignQ),:=,$1)))
+
+# $(call QuoteAppend,name,some value) -> name#+some#svalue
+# $(call QuoteAppend,bad+=name,some value) -> error
+QuoteAppend = $(if $(findstring +=,$1),$(error you can not have += in a variable name: "$1"),$(call Quote,$1)$(AppendQ)$(call Quote,$2))
+
+# $(call UnquoteAppendIndex,name#+some#svalue,1) -> name
+# $(call UnquoteAppendIndex,name#+some#svalue,2) -> some value
+UnquoteAppendIndex = $(call Unquote,$(word $2,$(subst $(AppendQ),$(SPACE),$1)))
+
+# $(call FilterFiles,dir,%.cpp) -> file1.cpp file2.cpp (without path)
+FilterFiles = $(filter $2,$(notdir $(call FindFiles,$1)))
+
+# $(call Unpack module_,file1.cpp_CXXFLAGS#+-Wconversion file2.cpp_CXXFLAGS#+-Wconversion) -> module_file1.cpp_CXXFLAGS += -Wconversion
+#                                                                                             module_file2.cpp_CXXFLAGS += -Wconversion
+Unpack = $(foreach pair,$2,$1$(call UnquoteAppendIndex,$(pair),1) += $(call UnquoteAppendIndex,$(pair),2)$(NEWLINE))
+
+# This macro takes four arguments:
+# $1: directory where to find files (striped), example: $(TOPDIR)/src/hotspot/share/gc/g1
+# $2: filter to match what to keep (striped), example: g1Concurrent%.cpp
+# $3: what flags to override (striped), example: _CXXFLAGS
+# $4: what value to append to the flag (striped), example: $(CFLAGS_CONVERSION_WARNINGS)
+#
+# The result will be a quoted string that can be unpacked to a list of
+# variable appendings (see macro Unpack above). You do not need to take
+# care of unpacking, it is done in NamedParamsMacroTemplate.
+#
+# This feature should only be used for warnings that we want to
+# incrementally add to the rest of the code base.
+#
+# $(call ExtendFlags,dir,%.cpp,_CXXFLAGS,-Wconversion) -> file1.cpp_CXXFLAGS#+-Wconversion file2.cpp_CXXFLAGS#+-Wconversion
+ExtendFlags = $(foreach file,$(call FilterFiles,$(strip $1),$(strip $2)),$(call QuoteAppend,$(file)$(strip $3),$(strip $4)))
+
 ################################################################################
 
 MAX_PARAMS := 96
@@ -166,7 +226,10 @@ define NamedParamsMacroTemplate
       Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk))
   # Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix
   $(foreach i, $(PARAM_SEQUENCE), $(if $(strip $($i)), \
-    $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE)))
+    $(if $(findstring :=,$($i)), \
+      $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE), \
+      $(call Unpack,$(strip $1)_,$($i)))))
+
   # Debug print all named parameter names and values
   $(if $(findstring $(LOG_LEVEL), trace), \
     $(info $0 $(strip $1) $(foreach i, $(PARAM_SEQUENCE), \
diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index bd73e909062..ebfc9191535 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=8.1+1
+JTREG_VERSION=8.2.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_linux-x64_bin.tar.gz
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 93aeebc0dd6..76a94b7789e 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1174,9 +1174,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "8.1",
+            version: "8.2.1",
             build_number: "1",
-            file: "bundles/jtreg-8.1+1.zip",
+            file: "bundles/jtreg-8.2.1+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
index db77f2f3f74..74c6d861777 100644
--- a/make/devkit/Tools.gmk
+++ b/make/devkit/Tools.gmk
@@ -78,7 +78,7 @@ else ifeq ($(BASE_OS), Fedora)
     endif
     BASE_URL := http://fedora.riscv.rocks/repos-dist/f$(BASE_OS_VERSION)/latest/$(ARCH)/Packages/
   else
-    LATEST_ARCHIVED_OS_VERSION := 36
+    LATEST_ARCHIVED_OS_VERSION := 41
     ifeq ($(filter aarch64 armhfp x86_64, $(ARCH)), )
       FEDORA_TYPE := fedora-secondary
     else
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index 60912992134..327014b1e9d 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,8 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
     INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
     DISABLED_WARNINGS_gcc := format-nonliteral maybe-uninitialized undef \
         unused-result zero-as-null-pointer-constant, \
-    DISABLED_WARNINGS_clang := format-nonliteral undef unused-result, \
+    DISABLED_WARNINGS_clang := format-nonliteral undef unused-result \
+        zero-as-null-pointer-constant, \
     DISABLED_WARNINGS_microsoft := 4530, \
     DEFAULT_CFLAGS := false, \
     CFLAGS := $(JVM_CFLAGS) \
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index 39a549b7db0..f41693e05fb 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -105,7 +105,7 @@ DISABLED_WARNINGS_gcc := array-bounds comment delete-non-virtual-dtor \
 DISABLED_WARNINGS_clang := delete-non-abstract-non-virtual-dtor \
     invalid-offsetof missing-braces \
     sometimes-uninitialized unknown-pragmas unused-but-set-variable \
-    unused-function unused-local-typedef unused-private-field unused-variable
+    unused-local-typedef unused-private-field unused-variable
 
 ifneq ($(DEBUG_LEVEL), release)
   # Assert macro gives warning
@@ -190,6 +190,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     abstract_vm_version.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     arguments.cpp_CXXFLAGS := $(CFLAGS_VM_VERSION), \
     whitebox.cpp_CXXFLAGS := $(CFLAGS_SHIP_DEBUGINFO), \
+    $(call ExtendFlags, $(TOPDIR)/src/hotspot/share/gc/g1, \
+        g1Numa.cpp, _CXXFLAGS, $(CFLAGS_CONVERSION_WARNINGS)), \
     DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc), \
     DISABLED_WARNINGS_gcc_ad_$(HOTSPOT_TARGET_CPU_ARCH).cpp := nonnull, \
     DISABLED_WARNINGS_gcc_bytecodeInterpreter.cpp := unused-label, \
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index 55dd6a8d6ad..ab878a4d2a5 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,8 +293,10 @@ public class CLDRConverter {
         bundleGenerator = new ResourceBundleGenerator();
 
         // Parse data independent of locales
-        parseSupplemental();
+        // parseBCP47() must precede parseSupplemental(). The latter depends
+        // on IANA alias map, which is produced by the former.
         parseBCP47();
+        parseSupplemental();
 
         // rules maps
         pluralRules = generateRules(handlerPlurals);
@@ -536,6 +538,12 @@ public class CLDRConverter {
 
         // canonical tz name map
         // alias -> primary
+        //
+        // Note that CLDR meta zones do not necessarily align with IANA's
+        // current time zone identifiers. For example, the CLDR "India"
+        // meta zone maps to "Asia/Calcutta", whereas IANA now uses
+        // "Asia/Kolkata" for the zone. Accordingly, "canonical" here is
+        // defined in terms of CLDR's zone mappings.
         handlerTimeZone.getData().forEach((k, v) -> {
             String[] ids = ((String)v).split("\\s");
             for (int i = 1; i < ids.length; i++) {
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/TimeZoneParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/TimeZoneParseHandler.java
index 66e94e5ca06..8203a9f0b91 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/TimeZoneParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/TimeZoneParseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@ package build.tools.cldrconverter;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -40,6 +43,10 @@ import org.xml.sax.SAXException;
 class TimeZoneParseHandler extends AbstractLDMLHandler<Object> {
     private static final String PREF_PREFIX = "preferred:";
 
+    // CLDR aliases to IANA ids map. The initial capacity is estimated
+    // from the number of aliases in timezone.xml as of CLDR v48
+    private final Map<String, String> ianaAliasMap = HashMap.newHashMap(32);
+
     @Override
     public InputSource resolveEntity(String publicID, String systemID) throws IOException, SAXException {
         // avoid HTTP traffic to unicode.org
@@ -61,7 +68,16 @@ class TimeZoneParseHandler extends AbstractLDMLHandler<Object> {
                         put(attributes.getValue("name"), PREF_PREFIX + preferred);
                     }
                 } else {
-                    put(attributes.getValue("name"), attributes.getValue("alias"));
+                    var alias = attributes.getValue("alias");
+                    var iana = attributes.getValue("iana");
+                    if (iana != null) {
+                        for (var a : alias.split("\\s+")) {
+                            if (!a.equals(iana)) {
+                                ianaAliasMap.put(a, iana);
+                            }
+                        }
+                    }
+                    put(attributes.getValue("name"), alias);
                 }
             }
             break;
@@ -80,4 +96,8 @@ class TimeZoneParseHandler extends AbstractLDMLHandler<Object> {
             .forEach(e -> map.put(e.getKey(),
                 map.get(e.getValue().toString().substring(PREF_PREFIX.length()))));
     }
+
+    Map<String, String> getIanaAliasMap() {
+        return ianaAliasMap;
+    }
 }
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/WinZonesParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/WinZonesParseHandler.java
index a584358f0cb..343e143b6ad 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/WinZonesParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/WinZonesParseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@ class WinZonesParseHandler extends AbstractLDMLHandler<Object> {
             String zoneName = attributes.getValue("other");
             String territory = attributes.getValue("territory");
             String javatz = attributes.getValue("type").replaceFirst("\\s.*", "");
+            javatz = CLDRConverter.handlerTimeZone.getIanaAliasMap().getOrDefault(javatz, javatz);
             put(zoneName + ":" + territory, javatz);
             pushIgnoredContainer(qName);
             break;
diff --git a/make/jdk/src/classes/build/tools/taglet/JSpec.java b/make/jdk/src/classes/build/tools/taglet/JSpec.java
index 1c301e94a8a..7e1e0ca215e 100644
--- a/make/jdk/src/classes/build/tools/taglet/JSpec.java
+++ b/make/jdk/src/classes/build/tools/taglet/JSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,13 +49,15 @@ import static com.sun.source.doctree.DocTree.Kind.*;
  * The tags can be used as follows:
  *
  * <pre>
- * &commat;jls section-number description
+ * &commat;jls chapter.section description
+ * &commat;jls preview-feature-chapter.section description
  * </pre>
  *
  * For example:
  *
  * <pre>
  * &commat;jls 3.4 Line Terminators
+ * &commat;jls primitive-types-in-patterns-instanceof-switch-5.7.1 Exact Testing Conversions
  * </pre>
  *
  * will produce the following HTML, depending on the file containing
@@ -64,10 +66,24 @@ import static com.sun.source.doctree.DocTree.Kind.*;
  * <pre>{@code
  * <dt>See <i>Java Language Specification</i>:
  * <dd><a href="../../specs/jls/jls-3.html#jls-3.4">3.4 Line terminators</a>
+ * <dd><a href="../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-5.7.1">
+ * 5.7.1 Exact Testing Conversions</a><sup class="preview-mark">
+ * <a href="../../specs/jls/jls-1.html#jls-1.5.1">PREVIEW</a></sup>
  * }</pre>
  *
- * Copies of JLS and JVMS are expected to have been placed in the {@code specs}
- * folder. These documents are not included in open-source repositories.
+ * In inline tags (note you need manual JLS/JVMS prefix):
+ * <pre>
+ * JLS {&commat;jls 3.4}
+ * </pre>
+ *
+ * produces (note the section sign and no trailing dot):
+ * <pre>
+ * JLS <a href="../../specs/jls/jls-3.html#jls-3.4">§3.4</a>
+ * </pre>
+ *
+ * Copies of JLS, JVMS, and preview JLS and JVMS changes are expected to have
+ * been placed in the {@code specs} folder. These documents are not included
+ * in open-source repositories.
  */
 public class JSpec implements Taglet  {
 
@@ -87,9 +103,9 @@ public class JSpec implements Taglet  {
         }
     }
 
-    private String tagName;
-    private String specTitle;
-    private String idPrefix;
+    private final String tagName;
+    private final String specTitle;
+    private final String idPrefix;
 
     JSpec(String tagName, String specTitle, String idPrefix) {
         this.tagName = tagName;
@@ -98,7 +114,7 @@ public class JSpec implements Taglet  {
     }
 
     // Note: Matches special cases like @jvms 6.5.checkcast
-    private static final Pattern TAG_PATTERN = Pattern.compile("(?s)(.+ )?(?<chapter>[1-9][0-9]*)(?<section>[0-9a-z_.]*)( .*)?$");
+    private static final Pattern TAG_PATTERN = Pattern.compile("(?s)(.+ )?(?<preview>([a-z0-9]+-)+)?(?<chapter>[1-9][0-9]*)(?<section>[0-9a-z_.]*)( .*)?$");
 
     /**
      * Returns the set of locations in which the tag may be used.
@@ -157,19 +173,50 @@ public class JSpec implements Taglet  {
                     .trim();
             Matcher m = TAG_PATTERN.matcher(tagText);
             if (m.find()) {
+                // preview-feature-4.6 is preview-feature-, 4, .6
+                String preview = m.group("preview"); // null if no preview feature
                 String chapter = m.group("chapter");
                 String section = m.group("section");
                 String rootParent = currentPath().replaceAll("[^/]+", "..");
 
-                String url = String.format("%1$s/specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
-                        rootParent, idPrefix, chapter, section);
+                String url = preview == null ?
+                        String.format("%1$s/specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
+                                rootParent, idPrefix, chapter, section) :
+                        String.format("%1$s/specs/%5$s%2$s.html#%2$s-%3$s%4$s",
+                                rootParent, idPrefix, chapter, section, preview);
+
+                var literal = expand(contents).trim();
+                var prefix = (preview == null ? "" : preview) + chapter + section;
+                if (literal.startsWith(prefix)) {
+                    var hasFullTitle = literal.length() > prefix.length();
+                    if (hasFullTitle) {
+                        // Drop the preview identifier
+                        literal = chapter + section + literal.substring(prefix.length());
+                    } else {
+                        // No section sign if the tag refers to a chapter, like {@jvms 4}
+                        String sectionSign = section.isEmpty() ? "" : "§";
+                        // Change whole text to "§chapter.x" in inline tags.
+                        literal = sectionSign + chapter + section;
+                    }
+                }
 
                 sb.append("<a href=\"")
                         .append(url)
                         .append("\">")
-                        .append(expand(contents))
+                        .append(literal)
                         .append("</a>");
 
+                if (preview != null) {
+                    // Add PREVIEW superscript that links to JLS/JVMS 1.5.1
+                    // "Restrictions on the Use of Preview Features"
+                    // Similar to how APIs link to the Preview info box warning
+                    var sectionLink = String.format("%1$s/specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
+                            rootParent, idPrefix, "1", ".5.1");
+                    sb.append("<sup class=\"preview-mark\"><a href=\"")
+                            .append(sectionLink)
+                            .append("\">PREVIEW</a></sup>");
+                }
+
                 if (tag.getKind() == DocTree.Kind.UNKNOWN_BLOCK_TAG) {
                     sb.append("<br>");
                 }
diff --git a/make/modules/java.base/Copy.gmk b/make/modules/java.base/Copy.gmk
index b8c1f2c05fa..43b9db651e0 100644
--- a/make/modules/java.base/Copy.gmk
+++ b/make/modules/java.base/Copy.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -172,6 +172,10 @@ ifeq ($(USE_EXTERNAL_LIBZ), true)
   LEGAL_EXCLUDES += zlib.md
 endif
 
+ifneq ($(TOOLCHAIN_TYPE), gcc)
+  LEGAL_EXCLUDES += gcc.md
+endif
+
 $(eval $(call SetupCopyLegalFiles, COPY_LEGAL, \
     EXCLUDES := $(LEGAL_EXCLUDES), \
 ))
diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index 463e09e12dc..8b6b50b9e62 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -88,6 +88,10 @@ LIBAWT_EXTRA_HEADER_DIRS := \
 
 LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
 
+ifeq ($(ENABLE_HEADLESS_ONLY), true)
+  LIBAWT_CFLAGS += -DHEADLESS
+endif
+
 ifeq ($(call isTargetOs, windows), true)
   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE -DMLIB_OS64BIT
   LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
@@ -167,11 +171,18 @@ ifeq ($(call isTargetOs, windows macosx), false)
       $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
       #
 
+  LIBAWT_HEADLESS_EXCLUDE_FILES := \
+      GLXGraphicsConfig.c \
+      GLXSurfaceData.c \
+      X11PMBlitLoops.c \
+      X11Renderer.c \
+      X11SurfaceData.c \
+      #
+
   LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
       $(LIBAWT_DEFAULT_HEADER_DIRS) \
       common/awt/debug \
       common/font \
-      common/java2d/opengl \
       java.base:libjvm \
       #
 
@@ -191,7 +202,8 @@ ifeq ($(call isTargetOs, windows macosx), false)
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
       NAME := awt_headless, \
       EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
-      EXCLUDES := medialib, \
+      EXCLUDES := medialib opengl, \
+      EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXCLUDE_FILES), \
       ONLY_EXPORTED := $(LIBAWT_HEADLESS_ONLY_EXPORTED), \
       OPTIMIZATION := LOW, \
       CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
diff --git a/make/modules/jdk.jpackage/Lib.gmk b/make/modules/jdk.jpackage/Lib.gmk
index 704436bbde6..86b11bdafee 100644
--- a/make/modules/jdk.jpackage/Lib.gmk
+++ b/make/modules/jdk.jpackage/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGEAPPLAUNCHER, \
     SRC := applauncher, \
     EXTRA_SRC := common, \
     INCLUDE_FILES := $(JPACKAGEAPPLAUNCHER_INCLUDE_FILES), \
-    OPTIMIZATION := LOW, \
+    OPTIMIZATION := SIZE, \
     DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
     DISABLED_WARNINGS_clang_LinuxPackage.c := format-nonliteral, \
     DISABLED_WARNINGS_clang_Log.cpp := unused-const-variable, \
@@ -91,7 +91,7 @@ ifeq ($(call isTargetOs, linux), true)
           common, \
       EXCLUDE_FILES := LinuxLauncher.c LinuxPackage.c, \
       LINK_TYPE := C++, \
-      OPTIMIZATION := LOW, \
+      OPTIMIZATION := SIZE, \
       DISABLED_WARNINGS_gcc_Log.cpp := unused-const-variable, \
       DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
       DISABLED_WARNINGS_clang_tstrings.cpp := format-nonliteral, \
diff --git a/make/modules/jdk.security.auth/Lib.gmk b/make/modules/jdk.security.auth/Lib.gmk
index 9ead32dbe12..96d609f08d6 100644
--- a/make/modules/jdk.security.auth/Lib.gmk
+++ b/make/modules/jdk.security.auth/Lib.gmk
@@ -31,13 +31,14 @@ include LibCommon.gmk
 ## Build libjaas
 ################################################################################
 
-$(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
-    NAME := jaas, \
-    OPTIMIZATION := LOW, \
-    EXTRA_HEADER_DIRS := java.base:libjava, \
-    LIBS_windows := advapi32.lib mpr.lib netapi32.lib user32.lib, \
-))
-
-TARGETS += $(BUILD_LIBJAAS)
+ifeq ($(call isTargetOs, windows), true)
+  $(eval $(call SetupJdkLibrary, BUILD_LIBJAAS, \
+      NAME := jaas, \
+      OPTIMIZATION := LOW, \
+      EXTRA_HEADER_DIRS := java.base:libjava, \
+      LIBS_windows := advapi32.lib mpr.lib netapi32.lib user32.lib, \
+  ))
 
+  TARGETS += $(BUILD_LIBJAAS)
+endif
 ################################################################################
diff --git a/src/demo/share/jfc/TableExample/OldJTable.java b/src/demo/share/jfc/TableExample/OldJTable.java
deleted file mode 100644
index 8c77978fe8a..00000000000
--- a/src/demo/share/jfc/TableExample/OldJTable.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Oracle nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This source code is provided to illustrate the usage of a given feature
- * or technique and has been deliberately simplified. Additional steps
- * required for a production-quality application, such as security checks,
- * input validation and proper error handling, might not be present in
- * this sample code.
- */
-
-
-
-import java.util.EventObject;
-import java.util.List;
-import javax.swing.JTable;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-
-
-/**
- *  The OldJTable is an unsupported class containing some methods that were
- *  deleted from the JTable between releases 0.6 and 0.7
- */
-@SuppressWarnings("serial")
-public class OldJTable extends JTable
-{
-   /*
-    *  A new convenience method returning the index of the column in the
-    *  co-ordinate space of the view.
-    */
-    public int getColumnIndex(Object identifier) {
-        return getColumnModel().getColumnIndex(identifier);
-    }
-
-//
-//  Methods deleted from the JTable because they only work with the
-//  DefaultTableModel.
-//
-
-    public TableColumn addColumn(Object columnIdentifier, int width) {
-        return addColumn(columnIdentifier, width, null, null, null);
-    }
-
-    public TableColumn addColumn(Object columnIdentifier, List<?> columnData) {
-        return addColumn(columnIdentifier, -1, null, null, columnData);
-    }
-
-    // Override the new JTable implementation - it will not add a column to the
-    // DefaultTableModel.
-    public TableColumn addColumn(Object columnIdentifier, int width,
-                                 TableCellRenderer renderer,
-                                 TableCellEditor editor) {
-        return addColumn(columnIdentifier, width, renderer, editor, null);
-    }
-
-    public TableColumn addColumn(Object columnIdentifier, int width,
-                                 TableCellRenderer renderer,
-                                 TableCellEditor editor, List<?> columnData) {
-        checkDefaultTableModel();
-
-        // Set up the model side first
-        DefaultTableModel m = (DefaultTableModel)getModel();
-        m.addColumn(columnIdentifier, columnData.toArray());
-
-        // The column will have been added to the end, so the index of the
-        // column in the model is the last element.
-        TableColumn newColumn = new TableColumn(
-                m.getColumnCount()-1, width, renderer, editor);
-        super.addColumn(newColumn);
-        return newColumn;
-    }
-
-    // Not possilble to make this work the same way ... change it so that
-    // it does not delete columns from the model.
-    public void removeColumn(Object columnIdentifier) {
-        super.removeColumn(getColumn(columnIdentifier));
-    }
-
-    public void addRow(Object[] rowData) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).addRow(rowData);
-    }
-
-    public void addRow(List<?> rowData) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).addRow(rowData.toArray());
-    }
-
-    public void removeRow(int rowIndex) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).removeRow(rowIndex);
-    }
-
-    public void moveRow(int startIndex, int endIndex, int toIndex) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).moveRow(startIndex, endIndex, toIndex);
-    }
-
-    public void insertRow(int rowIndex, Object[] rowData) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).insertRow(rowIndex, rowData);
-    }
-
-    public void insertRow(int rowIndex, List<?> rowData) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).insertRow(rowIndex, rowData.toArray());
-    }
-
-    public void setNumRows(int newSize) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).setNumRows(newSize);
-    }
-
-    public void setDataVector(Object[][] newData, List<?> columnIds) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).setDataVector(
-                newData, columnIds.toArray());
-    }
-
-    public void setDataVector(Object[][] newData, Object[] columnIds) {
-        checkDefaultTableModel();
-        ((DefaultTableModel)getModel()).setDataVector(newData, columnIds);
-    }
-
-    protected void checkDefaultTableModel() {
-        if(!(dataModel instanceof DefaultTableModel))
-            throw new InternalError("In order to use this method, the data model must be an instance of DefaultTableModel.");
-    }
-
-//
-//  Methods removed from JTable in the move from identifiers to ints.
-//
-
-    public Object getValueAt(Object columnIdentifier, int rowIndex) {
-        return super.getValueAt(rowIndex, getColumnIndex(columnIdentifier));
-    }
-
-    public boolean isCellEditable(Object columnIdentifier, int rowIndex) {
-        return super.isCellEditable(rowIndex, getColumnIndex(columnIdentifier));
-    }
-
-    public void setValueAt(Object aValue, Object columnIdentifier, int rowIndex) {
-        super.setValueAt(aValue, rowIndex, getColumnIndex(columnIdentifier));
-    }
-
-    public boolean editColumnRow(Object identifier, int row) {
-        return super.editCellAt(row, getColumnIndex(identifier));
-    }
-
-    public void moveColumn(Object columnIdentifier, Object targetColumnIdentifier) {
-        moveColumn(getColumnIndex(columnIdentifier),
-                   getColumnIndex(targetColumnIdentifier));
-    }
-
-    public boolean isColumnSelected(Object identifier) {
-        return isColumnSelected(getColumnIndex(identifier));
-    }
-
-    public TableColumn addColumn(int modelColumn, int width) {
-        return addColumn(modelColumn, width, null, null);
-    }
-
-    public TableColumn addColumn(int modelColumn) {
-        return addColumn(modelColumn, 75, null, null);
-    }
-
-    /**
-     *  Creates a new column with <I>modelColumn</I>, <I>width</I>,
-     *  <I>renderer</I>, and <I>editor</I> and adds it to the end of
-     *  the JTable's array of columns. This method also retrieves the
-     *  name of the column using the model's <I>getColumnName(modelColumn)</I>
-     *  method, and sets the both the header value and the identifier
-     *  for this TableColumn accordingly.
-     *  <p>
-     *  The <I>modelColumn</I> is the index of the column in the model which
-     *  will supply the data for this column in the table. This, like the
-     *  <I>columnIdentifier</I> in previous releases, does not change as the
-     *  columns are moved in the view.
-     *  <p>
-     *  For the rest of the JTable API, and all of its associated classes,
-     *  columns are referred to in the co-ordinate system of the view, the
-     *  index of the column in the model is kept inside the TableColumn
-     *  and is used only to retrieve the information from the appropraite
-     *  column in the model.
-     *  <p>
-     *
-     *  @param  modelColumn     The index of the column in the model
-     *  @param  width           The new column's width.  Or -1 to use
-     *                          the default width
-     *  @param  renderer        The renderer used with the new column.
-     *                          Or null to use the default renderer.
-     *  @param  editor          The editor used with the new column.
-     *                          Or null to use the default editor.
-     */
-    public TableColumn addColumn(int modelColumn, int width,
-                                 TableCellRenderer renderer,
-                                 TableCellEditor editor) {
-        TableColumn newColumn = new TableColumn(
-                modelColumn, width, renderer, editor);
-        addColumn(newColumn);
-        return newColumn;
-    }
-
-//
-//  Methods that had their arguments switched.
-//
-
-// These won't work with the new table package.
-
-/*
-    public Object getValueAt(int columnIndex, int rowIndex) {
-        return super.getValueAt(rowIndex, columnIndex);
-    }
-
-    public boolean isCellEditable(int columnIndex, int rowIndex) {
-        return super.isCellEditable(rowIndex, columnIndex);
-    }
-
-    public void setValueAt(Object aValue, int columnIndex, int rowIndex) {
-        super.setValueAt(aValue, rowIndex, columnIndex);
-    }
-*/
-
-    public boolean editColumnRow(int columnIndex, int rowIndex) {
-        return super.editCellAt(rowIndex, columnIndex);
-    }
-
-    public boolean editColumnRow(int columnIndex, int rowIndex, EventObject e){
-        return super.editCellAt(rowIndex, columnIndex, e);
-    }
-
-
-}  // End Of Class OldJTable
diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index b9252cc56ff..9734c6845ea 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1229,7 +1229,7 @@ public:
   // predicate controlling addressing modes
   bool size_fits_all_mem_uses(AddPNode* addp, int shift);
 
-  // Convert BootTest condition to Assembler condition.
+  // Convert BoolTest condition to Assembler condition.
   // Replicate the logic of cmpOpOper::ccode() and cmpOpUOper::ccode().
   Assembler::Condition to_assembler_cond(BoolTest::mask cond);
 %}
@@ -2579,7 +2579,7 @@ bool size_fits_all_mem_uses(AddPNode* addp, int shift) {
   return true;
 }
 
-// Convert BootTest condition to Assembler condition.
+// Convert BoolTest condition to Assembler condition.
 // Replicate the logic of cmpOpOper::ccode() and cmpOpUOper::ccode().
 Assembler::Condition to_assembler_cond(BoolTest::mask cond) {
   Assembler::Condition result;
@@ -3403,11 +3403,13 @@ encode %{
       } else if (rtype == relocInfo::metadata_type) {
         __ mov_metadata(dst_reg, (Metadata*)con);
       } else {
-        assert(rtype == relocInfo::none, "unexpected reloc type");
+        assert(rtype == relocInfo::none || rtype == relocInfo::external_word_type, "unexpected reloc type");
+        // load fake address constants using a normal move
         if (! __ is_valid_AArch64_address(con) ||
             con < (address)(uintptr_t)os::vm_page_size()) {
           __ mov(dst_reg, con);
         } else {
+          // no reloc so just use adrp and add
           uint64_t offset;
           __ adrp(dst_reg, con, offset);
           __ add(dst_reg, dst_reg, offset);
@@ -4535,6 +4537,18 @@ operand immP_1()
   interface(CONST_INTER);
 %}
 
+// AOT Runtime Constants Address
+operand immAOTRuntimeConstantsAddress()
+%{
+  // Check if the address is in the range of AOT Runtime Constants
+  predicate(AOTRuntimeConstants::contains((address)(n->get_ptr())));
+  match(ConP);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
 // Float and Double operands
 // Double Immediate
 operand immD()
@@ -6898,6 +6912,20 @@ instruct loadConP1(iRegPNoSp dst, immP_1 con)
   ins_pipe(ialu_imm);
 %}
 
+instruct loadAOTRCAddress(iRegPNoSp dst, immAOTRuntimeConstantsAddress con)
+%{
+  match(Set dst con);
+
+  ins_cost(INSN_COST);
+  format %{ "adr  $dst, $con\t# AOT Runtime Constants Address" %}
+
+  ins_encode %{
+    __ load_aotrc_address($dst$$Register, (address)$con$$constant);
+  %}
+
+  ins_pipe(ialu_imm);
+%}
+
 // Load Narrow Pointer Constant
 
 instruct loadConN(iRegNNoSp dst, immN con)
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 78ef121bd29..19f03d97a72 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2025, Arm Limited. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -201,6 +201,8 @@ source %{
       case Op_XorReductionV:
       case Op_MinReductionV:
       case Op_MaxReductionV:
+      case Op_UMinReductionV:
+      case Op_UMaxReductionV:
         // Reductions with less than 8 bytes vector length are
         // not supported.
         if (length_in_bytes < 8) {
@@ -383,6 +385,8 @@ source %{
         return !VM_Version::use_neon_for_vector(length_in_bytes);
       case Op_MinReductionV:
       case Op_MaxReductionV:
+      case Op_UMinReductionV:
+      case Op_UMaxReductionV:
         // For BYTE/SHORT/INT/FLOAT/DOUBLE types, we prefer using NEON
         // instructions rather than SVE predicated instructions for
         // better performance.
@@ -4218,6 +4222,224 @@ instruct reduce_minD_masked(vRegD dst, vRegD dsrc, vReg vsrc, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}
 
+// -------------------- Vector reduction unsigned min/max ----------------------
+
+// reduction uminI
+
+instruct reduce_uminI_neon(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc,
+                          vReg tmp, rFlagsReg cr) %{
+  predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n->in(2))) &&
+            (Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_INT));
+  match(Set dst (UMinReductionV isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_uminI_neon $dst, $isrc, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+    __ neon_reduce_minmax_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                                   $isrc$$Register, $vsrc$$FloatRegister,
+                                   length_in_bytes, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_uminI_sve(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc,
+                         vRegD tmp, rFlagsReg cr) %{
+  predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n->in(2))) &&
+            (Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_INT));
+  match(Set dst (UMinReductionV isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_uminI_sve $dst, $isrc, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+    assert(length_in_bytes == MaxVectorSize, "invalid vector length");
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           ptrue, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// reduction uminL
+
+instruct reduce_uminL_neon(iRegLNoSp dst, iRegL isrc, vReg vsrc, rFlagsReg cr) %{
+  predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
+  match(Set dst (UMinReductionV isrc vsrc));
+  effect(TEMP_DEF dst, KILL cr);
+  format %{ "reduce_uminL_neon $dst, $isrc, $vsrc\t# 2L. KILL cr" %}
+  ins_encode %{
+    __ neon_reduce_minmax_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
+                                   $isrc$$Register, $vsrc$$FloatRegister,
+                                   /* vector_length_in_bytes */ 16, fnoreg);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_uminL_sve(iRegLNoSp dst, iRegL isrc, vReg vsrc,
+                         vRegD tmp, rFlagsReg cr) %{
+  predicate(UseSVE > 0 && Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
+  match(Set dst (UMinReductionV isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_uminL_sve $dst, $isrc, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+    assert(length_in_bytes == MaxVectorSize, "invalid vector length");
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           ptrue, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// reduction umin - predicated
+
+instruct reduce_uminI_masked(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc, pRegGov pg,
+                            vRegD tmp, rFlagsReg cr) %{
+  predicate(UseSVE > 0 &&
+            (Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_BYTE ||
+             Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_SHORT ||
+             Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_INT));
+  match(Set dst (UMinReductionV (Binary isrc vsrc) pg));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_uminI_masked $dst, $isrc, $pg, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           $pg$$PRegister, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_uminL_masked(iRegLNoSp dst, iRegL isrc, vReg vsrc, pRegGov pg,
+                            vRegD tmp, rFlagsReg cr) %{
+  predicate(UseSVE > 0 && Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_LONG);
+  match(Set dst (UMinReductionV (Binary isrc vsrc) pg));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_uminL_masked $dst, $isrc, $pg, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           $pg$$PRegister, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// reduction umaxI
+
+instruct reduce_umaxI_neon(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc,
+                          vReg tmp, rFlagsReg cr) %{
+  predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n->in(2))) &&
+            (Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_INT));
+  match(Set dst (UMaxReductionV isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_umaxI_neon $dst, $isrc, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+    __ neon_reduce_minmax_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                                   $isrc$$Register, $vsrc$$FloatRegister,
+                                   length_in_bytes, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_umaxI_sve(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc,
+                         vRegD tmp, rFlagsReg cr) %{
+  predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n->in(2))) &&
+            (Matcher::vector_element_basic_type(n->in(2)) == T_BYTE ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_SHORT ||
+             Matcher::vector_element_basic_type(n->in(2)) == T_INT));
+  match(Set dst (UMaxReductionV isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_umaxI_sve $dst, $isrc, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+    assert(length_in_bytes == MaxVectorSize, "invalid vector length");
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           ptrue, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// reduction umaxL
+
+instruct reduce_umaxL_neon(iRegLNoSp dst, iRegL isrc, vReg vsrc, rFlagsReg cr) %{
+  predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
+  match(Set dst (UMaxReductionV isrc vsrc));
+  effect(TEMP_DEF dst, KILL cr);
+  format %{ "reduce_umaxL_neon $dst, $isrc, $vsrc\t# 2L. KILL cr" %}
+  ins_encode %{
+    __ neon_reduce_minmax_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
+                                   $isrc$$Register, $vsrc$$FloatRegister,
+                                   /* vector_length_in_bytes */ 16, fnoreg);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_umaxL_sve(iRegLNoSp dst, iRegL isrc, vReg vsrc,
+                         vRegD tmp, rFlagsReg cr) %{
+  predicate(UseSVE > 0 && Matcher::vector_element_basic_type(n->in(2)) == T_LONG);
+  match(Set dst (UMaxReductionV isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_umaxL_sve $dst, $isrc, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+    assert(length_in_bytes == MaxVectorSize, "invalid vector length");
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, T_LONG,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           ptrue, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// reduction umax - predicated
+
+instruct reduce_umaxI_masked(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc, pRegGov pg,
+                            vRegD tmp, rFlagsReg cr) %{
+  predicate(UseSVE > 0 &&
+            (Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_BYTE ||
+             Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_SHORT ||
+             Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_INT));
+  match(Set dst (UMaxReductionV (Binary isrc vsrc) pg));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_umaxI_masked $dst, $isrc, $pg, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           $pg$$PRegister, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_umaxL_masked(iRegLNoSp dst, iRegL isrc, vReg vsrc, pRegGov pg,
+                            vRegD tmp, rFlagsReg cr) %{
+  predicate(UseSVE > 0 && Matcher::vector_element_basic_type(n->in(1)->in(2)) == T_LONG);
+  match(Set dst (UMaxReductionV (Binary isrc vsrc) pg));
+  effect(TEMP_DEF dst, TEMP tmp, KILL cr);
+  format %{ "reduce_umaxL_masked $dst, $isrc, $pg, $vsrc\t# KILL $tmp, cr" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+    __ sve_reduce_integral(this->ideal_Opcode(), $dst$$Register, bt,
+                           $isrc$$Register, $vsrc$$FloatRegister,
+                           $pg$$PRegister, $tmp$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector reinterpret ---------------------------
 
 instruct reinterpret_same_size(vReg dst_src) %{
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 66dc22c3758..48bffb3cf35 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2025, Arm Limited. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -191,6 +191,8 @@ source %{
       case Op_XorReductionV:
       case Op_MinReductionV:
       case Op_MaxReductionV:
+      case Op_UMinReductionV:
+      case Op_UMaxReductionV:
         // Reductions with less than 8 bytes vector length are
         // not supported.
         if (length_in_bytes < 8) {
@@ -373,6 +375,8 @@ source %{
         return !VM_Version::use_neon_for_vector(length_in_bytes);
       case Op_MinReductionV:
       case Op_MaxReductionV:
+      case Op_UMinReductionV:
+      case Op_UMaxReductionV:
         // For BYTE/SHORT/INT/FLOAT/DOUBLE types, we prefer using NEON
         // instructions rather than SVE predicated instructions for
         // better performance.
@@ -2505,6 +2509,32 @@ REDUCE_MAXMIN_INT_PREDICATE(min, L, iRegL,      MinReductionV)
 REDUCE_MAXMIN_FP_PREDICATE(min, F, fsrc, MinReductionV, sve_fminv, fmins)
 REDUCE_MAXMIN_FP_PREDICATE(min, D, dsrc, MinReductionV, sve_fminv, fmind)
 
+// -------------------- Vector reduction unsigned min/max ----------------------
+
+// reduction uminI
+REDUCE_MAXMIN_I_NEON(umin, UMinReductionV)
+REDUCE_MAXMIN_I_SVE(umin, UMinReductionV)
+
+// reduction uminL
+REDUCE_MAXMIN_L_NEON(umin, UMinReductionV)
+REDUCE_MAXMIN_L_SVE(umin, UMinReductionV)
+
+// reduction umin - predicated
+REDUCE_MAXMIN_INT_PREDICATE(umin, I, iRegIorL2I, UMinReductionV)
+REDUCE_MAXMIN_INT_PREDICATE(umin, L, iRegL,      UMinReductionV)
+
+// reduction umaxI
+REDUCE_MAXMIN_I_NEON(umax, UMaxReductionV)
+REDUCE_MAXMIN_I_SVE(umax, UMaxReductionV)
+
+// reduction umaxL
+REDUCE_MAXMIN_L_NEON(umax, UMaxReductionV)
+REDUCE_MAXMIN_L_SVE(umax, UMaxReductionV)
+
+// reduction umax - predicated
+REDUCE_MAXMIN_INT_PREDICATE(umax, I, iRegIorL2I, UMaxReductionV)
+REDUCE_MAXMIN_INT_PREDICATE(umax, L, iRegL,      UMaxReductionV)
+
 // ------------------------------ Vector reinterpret ---------------------------
 
 instruct reinterpret_same_size(vReg dst_src) %{
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 18807c667e3..19b3bb1a65b 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2024, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -2658,6 +2658,8 @@ template<typename R, typename... Rx>
   INSN(uminv,  1, 0b011011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(smaxp,  0, 0b101001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(sminp,  0, 0b101011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
+  INSN(umaxp,  1, 0b101001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
+  INSN(uminp,  1, 0b101011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(sqdmulh,0, 0b101101, false); // accepted arrangements: T4H, T8H, T2S, T4S
   INSN(shsubv, 0, 0b001001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
 
@@ -3490,7 +3492,9 @@ public:
   INSN(sve_sub,   0b00000100, 0b000001000); // vector sub
   INSN(sve_uaddv, 0b00000100, 0b000001001); // unsigned add reduction to scalar
   INSN(sve_umax,  0b00000100, 0b001001000); // unsigned maximum vectors
+  INSN(sve_umaxv, 0b00000100, 0b001001001); // unsigned maximum reduction to scalar
   INSN(sve_umin,  0b00000100, 0b001011000); // unsigned minimum vectors
+  INSN(sve_uminv, 0b00000100, 0b001011001); // unsigned minimum reduction to scalar
 #undef INSN
 
 // SVE floating-point arithmetic - predicate
@@ -4325,6 +4329,7 @@ public:
 #undef INSN
 
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {
+    MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   }
 
   // Stack overflow checking
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 37a6a130e0d..30048a2079d 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -33,6 +33,7 @@
 #include "c1/c1_ValueStack.hpp"
 #include "ci/ciArrayKlass.hpp"
 #include "ci/ciInstance.hpp"
+#include "code/aotCodeCache.hpp"
 #include "code/compiledIC.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gc_globals.hpp"
@@ -532,6 +533,15 @@ void LIR_Assembler::const2reg(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_cod
 
     case T_LONG: {
       assert(patch_code == lir_patch_none, "no patching handled here");
+#if INCLUDE_CDS
+      if (AOTCodeCache::is_on_for_dump()) {
+        address b = c->as_pointer();
+        if (AOTRuntimeConstants::contains(b)) {
+          __ load_aotrc_address(dest->as_register_lo(), b);
+          break;
+        }
+      }
+#endif
       __ mov(dest->as_register_lo(), (intptr_t)c->as_jlong());
       break;
     }
@@ -1218,43 +1228,11 @@ void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
   __ bind(*op->stub()->continuation());
 }
 
-void LIR_Assembler::type_profile_helper(Register mdo,
-                                        ciMethodData *md, ciProfileData *data,
-                                        Register recv, Label* update_done) {
+void LIR_Assembler::type_profile_helper(Register mdo, ciMethodData *md,
+                                        ciProfileData *data, Register recv) {
 
-  // Given a profile data offset, generate an Address which points to
-  // the corresponding slot in mdo->data().
-  // Clobbers rscratch2.
-  auto slot_at = [=](ByteSize offset) -> Address {
-    return __ form_address(rscratch2, mdo,
-                           md->byte_offset_of_slot(data, offset),
-                           LogBytesPerWord);
-  };
-
-  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
-    Label next_test;
-    // See if the receiver is receiver[n].
-    __ ldr(rscratch1, slot_at(ReceiverTypeData::receiver_offset(i)));
-    __ cmp(recv, rscratch1);
-    __ br(Assembler::NE, next_test);
-    __ addptr(slot_at(ReceiverTypeData::receiver_count_offset(i)),
-              DataLayout::counter_increment);
-    __ b(*update_done);
-    __ bind(next_test);
-  }
-
-  // Didn't find receiver; find next empty slot and fill it in
-  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
-    Label next_test;
-    Address recv_addr(slot_at(ReceiverTypeData::receiver_offset(i)));
-    __ ldr(rscratch1, recv_addr);
-    __ cbnz(rscratch1, next_test);
-    __ str(recv, recv_addr);
-    __ mov(rscratch1, DataLayout::counter_increment);
-    __ str(rscratch1, slot_at(ReceiverTypeData::receiver_count_offset(i)));
-    __ b(*update_done);
-    __ bind(next_test);
-  }
+  int mdp_offset = md->byte_offset_of_slot(data, in_ByteSize(0));
+  __ profile_receiver_type(recv, mdo, mdp_offset);
 }
 
 void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, Label* failure, Label* obj_is_null) {
@@ -1316,14 +1294,9 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
     __ b(*obj_is_null);
     __ bind(not_null);
 
-    Label update_done;
     Register recv = k_RInfo;
     __ load_klass(recv, obj);
-    type_profile_helper(mdo, md, data, recv, &update_done);
-    Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
-    __ addptr(counter_addr, DataLayout::counter_increment);
-
-    __ bind(update_done);
+    type_profile_helper(mdo, md, data, recv);
   } else {
     __ cbz(obj, *obj_is_null);
   }
@@ -1430,13 +1403,9 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
       __ b(done);
       __ bind(not_null);
 
-      Label update_done;
       Register recv = k_RInfo;
       __ load_klass(recv, value);
-      type_profile_helper(mdo, md, data, recv, &update_done);
-      Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
-      __ addptr(counter_addr, DataLayout::counter_increment);
-      __ bind(update_done);
+      type_profile_helper(mdo, md, data, recv);
     } else {
       __ cbz(value, done);
     }
@@ -2540,13 +2509,9 @@ void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
     if (C1OptimizeVirtualCallProfiling && known_klass != nullptr) {
       // We know the type that will be seen at this call site; we can
       // statically update the MethodData* rather than needing to do
-      // dynamic tests on the receiver type
-
-      // NOTE: we should probably put a lock around this search to
-      // avoid collisions by concurrent compilations
+      // dynamic tests on the receiver type.
       ciVirtualCallData* vc_data = (ciVirtualCallData*) data;
-      uint i;
-      for (i = 0; i < VirtualCallData::row_limit(); i++) {
+      for (uint i = 0; i < VirtualCallData::row_limit(); i++) {
         ciKlass* receiver = vc_data->receiver(i);
         if (known_klass->equals(receiver)) {
           Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
@@ -2554,36 +2519,13 @@ void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
           return;
         }
       }
-
-      // Receiver type not found in profile data; select an empty slot
-
-      // Note that this is less efficient than it should be because it
-      // always does a write to the receiver part of the
-      // VirtualCallData rather than just the first time
-      for (i = 0; i < VirtualCallData::row_limit(); i++) {
-        ciKlass* receiver = vc_data->receiver(i);
-        if (receiver == nullptr) {
-          __ mov_metadata(rscratch1, known_klass->constant_encoding());
-          Address recv_addr =
-            __ form_address(rscratch2, mdo,
-                            md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)),
-                            LogBytesPerWord);
-          __ str(rscratch1, recv_addr);
-          Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
-          __ addptr(data_addr, DataLayout::counter_increment);
-          return;
-        }
-      }
+      // Receiver type is not found in profile data.
+      // Fall back to runtime helper to handle the rest at runtime.
+      __ mov_metadata(recv, known_klass->constant_encoding());
     } else {
       __ load_klass(recv, recv);
-      Label update_done;
-      type_profile_helper(mdo, md, data, recv, &update_done);
-      // Receiver did not match any saved receiver and there is no empty row for it.
-      // Increment total counter to indicate polymorphic case.
-      __ addptr(counter_addr, DataLayout::counter_increment);
-
-      __ bind(update_done);
     }
+    type_profile_helper(mdo, md, data, recv);
   } else {
     // Static call
     __ addptr(counter_addr, DataLayout::counter_increment);
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 21916a5f7dd..5af06fc6a1c 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -50,9 +50,8 @@ friend class ArrayCopyStub;
   Address stack_slot_address(int index, uint shift, Register tmp, int adjust = 0);
 
   // Record the type of the receiver in ReceiverTypeData
-  void type_profile_helper(Register mdo,
-                           ciMethodData *md, ciProfileData *data,
-                           Register recv, Label* update_done);
+  void type_profile_helper(Register mdo, ciMethodData *md,
+                           ciProfileData *data, Register recv);
   void add_debug_info_for_branch(address adr, CodeEmitInfo* info);
 
   void casw(Register addr, Register newval, Register cmpval);
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 75897a16fe4..dc0b9eb9546 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,9 @@
 #include "opto/matcher.hpp"
 #include "opto/output.hpp"
 #include "opto/subnode.hpp"
+#include "runtime/objectMonitorTable.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -221,37 +223,52 @@ void C2_MacroAssembler::fast_lock(Register obj, Register box, Register t1,
     if (!UseObjectMonitorTable) {
       assert(t1_monitor == t1_mark, "should be the same here");
     } else {
+      const Register t1_hash = t1;
       Label monitor_found;
 
-      // Load cache address
-      lea(t3_t, Address(rthread, JavaThread::om_cache_oops_offset()));
+      // Save the mark, we might need it to extract the hash.
+      mov(t3, t1_mark);
 
-      const int num_unrolled = 2;
+      // Look for the monitor in the om_cache.
+
+      ByteSize cache_offset   = JavaThread::om_cache_oops_offset();
+      ByteSize monitor_offset = OMCache::oop_to_monitor_difference();
+      const int num_unrolled  = OMCache::CAPACITY;
       for (int i = 0; i < num_unrolled; i++) {
-        ldr(t1, Address(t3_t));
-        cmp(obj, t1);
+        ldr(t1_monitor, Address(rthread, cache_offset + monitor_offset));
+        ldr(t2, Address(rthread, cache_offset));
+        cmp(obj, t2);
         br(Assembler::EQ, monitor_found);
-        increment(t3_t, in_bytes(OMCache::oop_to_oop_difference()));
+        cache_offset = cache_offset + OMCache::oop_to_oop_difference();
       }
 
-      Label loop;
+      // Look for the monitor in the table.
 
-      // Search for obj in cache.
-      bind(loop);
+      // Get the hash code.
+      ubfx(t1_hash, t3, markWord::hash_shift, markWord::hash_bits);
 
-      // Check for match.
-      ldr(t1, Address(t3_t));
-      cmp(obj, t1);
-      br(Assembler::EQ, monitor_found);
+      // Get the table and calculate the bucket's address
+      lea(t3, ExternalAddress(ObjectMonitorTable::current_table_address()));
+      ldr(t3, Address(t3));
+      ldr(t2, Address(t3, ObjectMonitorTable::table_capacity_mask_offset()));
+      ands(t1_hash, t1_hash, t2);
+      ldr(t3, Address(t3, ObjectMonitorTable::table_buckets_offset()));
 
-      // Search until null encountered, guaranteed _null_sentinel at end.
-      increment(t3_t, in_bytes(OMCache::oop_to_oop_difference()));
-      cbnz(t1, loop);
-      // Cache Miss, NE set from cmp above, cbnz does not set flags
-      b(slow_path);
+      // Read the monitor from the bucket.
+      ldr(t1_monitor, Address(t3, t1_hash, Address::lsl(LogBytesPerWord)));
+
+      // Check if the monitor in the bucket is special (empty, tombstone or removed).
+      cmp(t1_monitor, (unsigned char)ObjectMonitorTable::SpecialPointerValues::below_is_special);
+      br(Assembler::LO, slow_path);
+
+      // Check if object matches.
+      ldr(t3, Address(t1_monitor, ObjectMonitor::object_offset()));
+      BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
+      bs_asm->try_resolve_weak_handle_in_c2(this, t3, t2, slow_path);
+      cmp(t3, obj);
+      br(Assembler::NE, slow_path);
 
       bind(monitor_found);
-      ldr(t1_monitor, Address(t3_t, OMCache::oop_to_monitor_difference()));
     }
 
     const Register t2_owner_addr = t2;
@@ -1960,50 +1977,76 @@ void C2_MacroAssembler::neon_reduce_logical(int opc, Register dst, BasicType bt,
   BLOCK_COMMENT("} neon_reduce_logical");
 }
 
-// Vector reduction min/max for integral type with ASIMD instructions.
+// Helper function to decode min/max reduction operation properties
+void C2_MacroAssembler::decode_minmax_reduction_opc(int opc, bool* is_min,
+                                                    bool* is_unsigned,
+                                                    Condition* cond) {
+  switch(opc) {
+    case Op_MinReductionV:
+      *is_min = true;  *is_unsigned = false; *cond = LT; break;
+    case Op_MaxReductionV:
+      *is_min = false; *is_unsigned = false; *cond = GT; break;
+    case Op_UMinReductionV:
+      *is_min = true;  *is_unsigned = true;  *cond = LO; break;
+    case Op_UMaxReductionV:
+      *is_min = false; *is_unsigned = true;  *cond = HI; break;
+    default:
+      ShouldNotReachHere();
+  }
+}
+
+// Vector reduction min/max/umin/umax for integral type with ASIMD instructions.
 // Note: vtmp is not used and expected to be fnoreg for T_LONG case.
 // Clobbers: rscratch1, rflags
 void C2_MacroAssembler::neon_reduce_minmax_integral(int opc, Register dst, BasicType bt,
                                                     Register isrc, FloatRegister vsrc,
                                                     unsigned vector_length_in_bytes,
                                                     FloatRegister vtmp) {
-  assert(opc == Op_MinReductionV || opc == Op_MaxReductionV, "unsupported");
+  assert(opc == Op_MinReductionV || opc == Op_MaxReductionV ||
+         opc == Op_UMinReductionV || opc == Op_UMaxReductionV, "unsupported");
   assert(vector_length_in_bytes == 8 || vector_length_in_bytes == 16, "unsupported");
   assert(bt == T_BYTE || bt == T_SHORT || bt == T_INT || bt == T_LONG, "unsupported");
   assert_different_registers(dst, isrc);
   bool isQ = vector_length_in_bytes == 16;
-  bool is_min = opc == Op_MinReductionV;
-
+  bool is_min;
+  bool is_unsigned;
+  Condition cond;
+  decode_minmax_reduction_opc(opc, &is_min, &is_unsigned, &cond);
   BLOCK_COMMENT("neon_reduce_minmax_integral {");
     if (bt == T_LONG) {
       assert(vtmp == fnoreg, "should be");
       assert(isQ, "should be");
       umov(rscratch1, vsrc, D, 0);
       cmp(isrc, rscratch1);
-      csel(dst, isrc, rscratch1, is_min ? LT : GT);
+      csel(dst, isrc, rscratch1, cond);
       umov(rscratch1, vsrc, D, 1);
       cmp(dst, rscratch1);
-      csel(dst, dst, rscratch1, is_min ? LT : GT);
+      csel(dst, dst, rscratch1, cond);
     } else {
       SIMD_Arrangement size = esize2arrangement((unsigned)type2aelembytes(bt), isQ);
       if (size == T2S) {
-        is_min ? sminp(vtmp, size, vsrc, vsrc) : smaxp(vtmp, size, vsrc, vsrc);
+        // For T2S (2x32-bit elements), use pairwise instructions because
+        // uminv/umaxv/sminv/smaxv don't support arrangement 2S.
+        neon_minmaxp(is_unsigned, is_min, vtmp, size, vsrc, vsrc);
       } else {
-        is_min ? sminv(vtmp, size, vsrc) : smaxv(vtmp, size, vsrc);
+        // For other sizes, use reduction to scalar instructions.
+        neon_minmaxv(is_unsigned, is_min, vtmp, size, vsrc);
       }
       if (bt == T_INT) {
         umov(dst, vtmp, S, 0);
+      } else if (is_unsigned) {
+        umov(dst, vtmp, elemType_to_regVariant(bt), 0);
       } else {
         smov(dst, vtmp, elemType_to_regVariant(bt), 0);
       }
       cmpw(dst, isrc);
-      cselw(dst, dst, isrc, is_min ? LT : GT);
+      cselw(dst, dst, isrc, cond);
     }
   BLOCK_COMMENT("} neon_reduce_minmax_integral");
 }
 
 // Vector reduction for integral type with SVE instruction.
-// Supported operations are Add, And, Or, Xor, Max, Min.
+// Supported operations are Add, And, Or, Xor, Max, Min, UMax, UMin.
 // rflags would be clobbered if opc is Op_MaxReductionV or Op_MinReductionV.
 void C2_MacroAssembler::sve_reduce_integral(int opc, Register dst, BasicType bt, Register src1,
                                             FloatRegister src2, PRegister pg, FloatRegister tmp) {
@@ -2075,35 +2118,27 @@ void C2_MacroAssembler::sve_reduce_integral(int opc, Register dst, BasicType bt,
       }
       break;
     }
-    case Op_MaxReductionV: {
-      sve_smaxv(tmp, size, pg, src2);
-      if (bt == T_INT || bt == T_LONG) {
+    case Op_MaxReductionV:
+    case Op_MinReductionV:
+    case Op_UMaxReductionV:
+    case Op_UMinReductionV: {
+      bool is_min;
+      bool is_unsigned;
+      Condition cond;
+      decode_minmax_reduction_opc(opc, &is_min, &is_unsigned, &cond);
+      sve_minmaxv(is_unsigned, is_min, tmp, size, pg, src2);
+      // Move result from vector to general register
+      if (is_unsigned || bt == T_INT || bt == T_LONG) {
         umov(dst, tmp, size, 0);
       } else {
         smov(dst, tmp, size, 0);
       }
       if (bt == T_LONG) {
         cmp(dst, src1);
-        csel(dst, dst, src1, Assembler::GT);
+        csel(dst, dst, src1, cond);
       } else {
         cmpw(dst, src1);
-        cselw(dst, dst, src1, Assembler::GT);
-      }
-      break;
-    }
-    case Op_MinReductionV: {
-      sve_sminv(tmp, size, pg, src2);
-      if (bt == T_INT || bt == T_LONG) {
-        umov(dst, tmp, size, 0);
-      } else {
-        smov(dst, tmp, size, 0);
-      }
-      if (bt == T_LONG) {
-        cmp(dst, src1);
-        csel(dst, dst, src1, Assembler::LT);
-      } else {
-        cmpw(dst, src1);
-        cselw(dst, dst, src1, Assembler::LT);
+        cselw(dst, dst, src1, cond);
       }
       break;
     }
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index 412f0f37e9e..4f3a41da402 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,37 @@
   void neon_reduce_logical_helper(int opc, bool sf, Register Rd, Register Rn, Register Rm,
                                   enum shift_kind kind = Assembler::LSL, unsigned shift = 0);
 
+  // Helper functions for min/max reduction operations
+
+  void decode_minmax_reduction_opc(int opc, bool* is_min, bool* is_unsigned, Condition* cond);
+
+  void neon_minmaxp(bool is_unsigned, bool is_min, FloatRegister dst,
+                    SIMD_Arrangement size, FloatRegister src1, FloatRegister src2) {
+    auto m = is_unsigned ? (is_min ? &Assembler::uminp : &Assembler::umaxp)
+                         : (is_min ? &Assembler::sminp : &Assembler::smaxp);
+    (this->*m)(dst, size, src1, src2);
+  }
+
+  // Typedefs used to disambiguate overloaded member functions.
+  typedef void (Assembler::*neon_reduction2)
+    (FloatRegister, SIMD_Arrangement, FloatRegister);
+
+  void neon_minmaxv(bool is_unsigned, bool is_min, FloatRegister dst,
+                    SIMD_Arrangement size, FloatRegister src) {
+    auto m = is_unsigned ? (is_min ? (neon_reduction2)&Assembler::uminv
+                                   : (neon_reduction2)&Assembler::umaxv)
+                         : (is_min ? &Assembler::sminv
+                                   : &Assembler::smaxv);
+    (this->*m)(dst, size, src);
+  }
+
+  void sve_minmaxv(bool is_unsigned, bool is_min, FloatRegister dst,
+                   SIMD_RegVariant size, PRegister pg, FloatRegister src) {
+    auto m = is_unsigned ? (is_min ? &Assembler::sve_uminv : &Assembler::sve_umaxv)
+                         : (is_min ? &Assembler::sve_sminv : &Assembler::sve_smaxv);
+    (this->*m)(dst, size, pg, src);
+  }
+
   void select_from_two_vectors_neon(FloatRegister dst, FloatRegister src1,
                                     FloatRegister src2, FloatRegister index,
                                     FloatRegister tmp, unsigned vector_length_in_bytes);
diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
index d7884c27a2c..68291720208 100644
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
@@ -243,9 +244,25 @@ static void generate_post_barrier(MacroAssembler* masm,
   assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg, rscratch1);
 
   // Does store cross heap regions?
-  __ eor(tmp1, store_addr, new_val);                     // tmp1 := store address ^ new value
-  __ lsr(tmp1, tmp1, G1HeapRegion::LogOfHRGrainBytes);   // tmp1 := ((store address ^ new value) >> LogOfHRGrainBytes)
-  __ cbz(tmp1, done);
+ #if INCLUDE_CDS
+  // AOT code needs to load the barrier grain shift from the aot
+  // runtime constants area in the code cache otherwise we can compile
+  // it as an immediate operand
+  if (AOTCodeCache::is_on_for_dump()) {
+    address grain_shift_address = (address)AOTRuntimeConstants::grain_shift_address();
+    __ eor(tmp1, store_addr, new_val);
+    __ lea(tmp2, ExternalAddress(grain_shift_address));
+    __ ldrb(tmp2, tmp2);
+    __ lsrv(tmp1, tmp1, tmp2);
+    __ cbz(tmp1, done);
+  } else
+#endif
+  {
+    __ eor(tmp1, store_addr, new_val);                     // tmp1 := store address ^ new value
+    __ lsr(tmp1, tmp1, G1HeapRegion::LogOfHRGrainBytes);   // tmp1 := ((store address ^ new value) >> LogOfHRGrainBytes)
+    __ cbz(tmp1, done);
+  }
+
   // Crosses regions, storing null?
   if (new_val_may_be_null) {
     __ cbz(new_val, done);
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
index 021af3e5698..2a78d688097 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -441,6 +441,11 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
   return opto_reg;
 }
 
+void BarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  // Load the oop from the weak handle.
+  __ ldr(obj, Address(obj));
+}
+
 #undef __
 #define __ _masm->
 
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
index e69be999f00..c2581b2f962 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,6 +135,7 @@ public:
                                                   OptoReg::Name opto_reg);
   OptoReg::Name refine_register(const Node* node,
                                 OptoReg::Name opto_reg);
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
 #endif // COMPILER2
 };
 
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp
index 4d5ca01b6b4..3d5261c31d1 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetNMethod_aarch64.cpp
@@ -209,6 +209,10 @@ void BarrierSetNMethod::set_guard_value(nmethod* nm, int value, int bit_mask) {
     bs_asm->increment_patching_epoch();
   }
 
+  // Enable WXWrite: the function is called directly from nmethod_entry_barrier
+  // stub.
+  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current()));
+
   NativeNMethodBarrier barrier(nm);
   barrier.set_value(value, bit_mask);
 }
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index 9a035d9f40e..2f7707227b4 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2022, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,26 +86,16 @@ void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Dec
   }
 }
 
-void ShenandoahBarrierSetAssembler::shenandoah_write_barrier_pre(MacroAssembler* masm,
-                                                                 Register obj,
-                                                                 Register pre_val,
-                                                                 Register thread,
-                                                                 Register tmp,
-                                                                 bool tosca_live,
-                                                                 bool expand_call) {
-  if (ShenandoahSATBBarrier) {
-    satb_write_barrier_pre(masm, obj, pre_val, thread, tmp, rscratch1, tosca_live, expand_call);
-  }
-}
+void ShenandoahBarrierSetAssembler::satb_barrier(MacroAssembler* masm,
+                                                 Register obj,
+                                                 Register pre_val,
+                                                 Register thread,
+                                                 Register tmp1,
+                                                 Register tmp2,
+                                                 bool tosca_live,
+                                                 bool expand_call) {
+  assert(ShenandoahSATBBarrier, "Should be checked by caller");
 
-void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
-                                                           Register obj,
-                                                           Register pre_val,
-                                                           Register thread,
-                                                           Register tmp1,
-                                                           Register tmp2,
-                                                           bool tosca_live,
-                                                           bool expand_call) {
   // If expand_call is true then we expand the call_VM_leaf macro
   // directly to skip generating the check by
   // InterpreterMacroAssembler::call_VM_leaf_base that checks _last_sp.
@@ -358,20 +349,20 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d
   if (ShenandoahBarrierSet::need_keep_alive_barrier(decorators, type)) {
     __ enter(/*strip_ret_addr*/true);
     __ push_call_clobbered_registers();
-    satb_write_barrier_pre(masm /* masm */,
-                           noreg /* obj */,
-                           dst /* pre_val */,
-                           rthread /* thread */,
-                           tmp1 /* tmp1 */,
-                           tmp2 /* tmp2 */,
-                           true /* tosca_live */,
-                           true /* expand_call */);
+    satb_barrier(masm /* masm */,
+                 noreg /* obj */,
+                 dst /* pre_val */,
+                 rthread /* thread */,
+                 tmp1 /* tmp1 */,
+                 tmp2 /* tmp2 */,
+                 true /* tosca_live */,
+                 true /* expand_call */);
     __ pop_call_clobbered_registers();
     __ leave();
   }
 }
 
-void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj) {
+void ShenandoahBarrierSetAssembler::card_barrier(MacroAssembler* masm, Register obj) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
 
   __ lsr(obj, obj, CardTable::card_shift());
@@ -394,13 +385,13 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
 void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                              Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
-  bool on_oop = is_reference_type(type);
-  if (!on_oop) {
+  // 1: non-reference types require no barriers
+  if (!is_reference_type(type)) {
     BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
     return;
   }
 
-  // flatten object address if needed
+  // Flatten object address right away for simplicity: likely needed by barriers
   if (dst.index() == noreg && dst.offset() == 0) {
     if (dst.base() != tmp3) {
       __ mov(tmp3, dst.base());
@@ -409,20 +400,26 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
     __ lea(tmp3, dst);
   }
 
-  shenandoah_write_barrier_pre(masm,
-                               tmp3 /* obj */,
-                               tmp2 /* pre_val */,
-                               rthread /* thread */,
-                               tmp1  /* tmp */,
-                               val != noreg /* tosca_live */,
-                               false /* expand_call */);
+  bool storing_non_null = (val != noreg);
 
+  // 2: pre-barrier: SATB needs the previous value
+  if (ShenandoahBarrierSet::need_satb_barrier(decorators, type)) {
+    satb_barrier(masm,
+                 tmp3 /* obj */,
+                 tmp2 /* pre_val */,
+                 rthread /* thread */,
+                 tmp1 /* tmp */,
+                 rscratch1 /* tmp2 */,
+                 storing_non_null /* tosca_live */,
+                 false /* expand_call */);
+  }
+
+  // Store!
   BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp3, 0), val, noreg, noreg, noreg);
 
-  bool in_heap = (decorators & IN_HEAP) != 0;
-  bool needs_post_barrier = (val != noreg) && in_heap && ShenandoahCardBarrier;
-  if (needs_post_barrier) {
-    store_check(masm, tmp3);
+  // 3: post-barrier: card barrier needs store address
+  if (ShenandoahBarrierSet::need_card_barrier(decorators, type) && storing_non_null) {
+    card_barrier(masm, tmp3);
   }
 }
 
@@ -446,6 +443,30 @@ void ShenandoahBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler
   __ bind(done);
 }
 
+#ifdef COMPILER2
+void ShenandoahBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj,
+                                                                  Register tmp, Label& slow_path) {
+  assert_different_registers(obj, tmp);
+
+  Label done;
+
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, tmp, slow_path);
+
+  // Check if the reference is null, and if it is, take the fast path.
+  __ cbz(obj, done);
+
+  Address gc_state(rthread, ShenandoahThreadLocalData::gc_state_offset());
+  __ lea(tmp, gc_state);
+  __ ldrb(tmp, __ legitimize_address(gc_state, 1, tmp));
+
+  // Check if the heap is under weak-reference/roots processing, in
+  // which case we need to take the slow path.
+  __ tbnz(tmp, ShenandoahHeap::WEAK_ROOTS_BITPOS, slow_path);
+  __ bind(done);
+}
+#endif
+
 // Special Shenandoah CAS implementation that handles false negatives due
 // to concurrent evacuation.  The service is more complex than a
 // traditional CAS operation because the CAS operation is intended to
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
index c0e708e1292..d5d5ce8950e 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2021, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,23 +41,16 @@ class StubCodeGenerator;
 class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
 private:
 
-  void satb_write_barrier_pre(MacroAssembler* masm,
-                              Register obj,
-                              Register pre_val,
-                              Register thread,
-                              Register tmp1,
-                              Register tmp2,
-                              bool tosca_live,
-                              bool expand_call);
-  void shenandoah_write_barrier_pre(MacroAssembler* masm,
-                                    Register obj,
-                                    Register pre_val,
-                                    Register thread,
-                                    Register tmp,
-                                    bool tosca_live,
-                                    bool expand_call);
+  void satb_barrier(MacroAssembler* masm,
+                    Register obj,
+                    Register pre_val,
+                    Register thread,
+                    Register tmp1,
+                    Register tmp2,
+                    bool tosca_live,
+                    bool expand_call);
 
-  void store_check(MacroAssembler* masm, Register obj);
+  void card_barrier(MacroAssembler* masm, Register obj);
 
   void resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp = noreg);
   void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg);
@@ -86,6 +80,9 @@ public:
                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
                                              Register obj, Register tmp, Label& slowpath);
+#ifdef COMPILER2
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
+#endif
   void cmpxchg_oop(MacroAssembler* masm, Register addr, Register expected, Register new_val,
                    bool acquire, bool release, bool is_cae, Register result);
 };
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
index 07a2d6fbfa0..4f0977a414f 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1326,6 +1326,23 @@ void ZStoreBarrierStubC2Aarch64::emit_code(MacroAssembler& masm) {
   register_stub(this);
 }
 
+#undef __
+#define __ masm->
+
+void ZBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, tmp, slow_path);
+
+  // Check if the oop is bad, in which case we need to take the slow path.
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatMarkBadBeforeMov);
+  __ movzw(tmp, barrier_Relocation::unpatched);
+  __ tst(obj, tmp);
+  __ br(Assembler::NE, slow_path);
+
+  // Oop is okay, so we uncolor it.
+  __ lsr(obj, obj, ZPointerLoadShift);
+}
+
 #undef __
 
 #endif // COMPILER2
diff --git a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
index 487970ab0c5..fbbc5c1b517 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zBarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -191,6 +191,7 @@ public:
                                      ZLoadBarrierStubC2* stub) const;
   void generate_c2_store_barrier_stub(MacroAssembler* masm,
                                       ZStoreBarrierStubC2* stub) const;
+  void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
 #endif // COMPILER2
 
   void check_oop(MacroAssembler* masm, Register obj, Register tmp1, Register tmp2, Label& error);
diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index 8e520314c8b..a59e83c4b69 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2019, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,7 +39,7 @@ define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap nulls
 define_pd_global(bool, DelayCompilerStubsGeneration, COMPILER2_OR_JVMCI);
 
 define_pd_global(size_t, CodeCacheSegmentSize,   64);
-define_pd_global(intx, CodeEntryAlignment,       64);
+define_pd_global(uint, CodeEntryAlignment,       64);
 define_pd_global(intx, OptoLoopAlignment,        16);
 
 #define DEFAULT_STACK_YELLOW_PAGES (2)
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index 957c2aee1c1..2b506b241e0 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -240,15 +240,14 @@ void InterpreterMacroAssembler::load_resolved_klass_at_offset(
 //      Rsub_klass: subklass
 //
 // Kills:
-//      r2, r5
+//      r2
 void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
                                                   Label& ok_is_subtype) {
   assert(Rsub_klass != r0, "r0 holds superklass");
   assert(Rsub_klass != r2, "r2 holds 2ndary super array length");
-  assert(Rsub_klass != r5, "r5 holds 2ndary super array scan ptr");
 
   // Profile the not-null value's klass.
-  profile_typecheck(r2, Rsub_klass, r5); // blows r2, reloads r5
+  profile_typecheck(r2, Rsub_klass); // blows r2
 
   // Do the check.
   check_klass_subtype(Rsub_klass, r0, r2, ok_is_subtype); // blows r2
@@ -991,7 +990,6 @@ void InterpreterMacroAssembler::profile_final_call(Register mdp) {
 
 void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
                                                      Register mdp,
-                                                     Register reg2,
                                                      bool receiver_can_be_null) {
   if (ProfileInterpreter) {
     Label profile_continue;
@@ -1009,7 +1007,7 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
     }
 
     // Record the receiver type.
-    record_klass_in_profile(receiver, mdp, reg2);
+    profile_receiver_type(receiver, mdp, 0);
     bind(skip_receiver_profile);
 
     // The method data pointer needs to be updated to reflect the new target.
@@ -1018,131 +1016,6 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
   }
 }
 
-// This routine creates a state machine for updating the multi-row
-// type profile at a virtual call site (or other type-sensitive bytecode).
-// The machine visits each row (of receiver/count) until the receiver type
-// is found, or until it runs out of rows.  At the same time, it remembers
-// the location of the first empty row.  (An empty row records null for its
-// receiver, and can be allocated for a newly-observed receiver type.)
-// Because there are two degrees of freedom in the state, a simple linear
-// search will not work; it must be a decision tree.  Hence this helper
-// function is recursive, to generate the required tree structured code.
-// It's the interpreter, so we are trading off code space for speed.
-// See below for example code.
-void InterpreterMacroAssembler::record_klass_in_profile_helper(
-                                        Register receiver, Register mdp,
-                                        Register reg2, int start_row,
-                                        Label& done) {
-  if (TypeProfileWidth == 0) {
-    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-  } else {
-    record_item_in_profile_helper(receiver, mdp, reg2, 0, done, TypeProfileWidth,
-        &VirtualCallData::receiver_offset, &VirtualCallData::receiver_count_offset);
-  }
-}
-
-void InterpreterMacroAssembler::record_item_in_profile_helper(Register item, Register mdp,
-                                        Register reg2, int start_row, Label& done, int total_rows,
-                                        OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn) {
-  int last_row = total_rows - 1;
-  assert(start_row <= last_row, "must be work left to do");
-  // Test this row for both the item and for null.
-  // Take any of three different outcomes:
-  //   1. found item => increment count and goto done
-  //   2. found null => keep looking for case 1, maybe allocate this cell
-  //   3. found something else => keep looking for cases 1 and 2
-  // Case 3 is handled by a recursive call.
-  for (int row = start_row; row <= last_row; row++) {
-    Label next_test;
-    bool test_for_null_also = (row == start_row);
-
-    // See if the item is item[n].
-    int item_offset = in_bytes(item_offset_fn(row));
-    test_mdp_data_at(mdp, item_offset, item,
-                     (test_for_null_also ? reg2 : noreg),
-                     next_test);
-    // (Reg2 now contains the item from the CallData.)
-
-    // The item is item[n].  Increment count[n].
-    int count_offset = in_bytes(item_count_offset_fn(row));
-    increment_mdp_data_at(mdp, count_offset);
-    b(done);
-    bind(next_test);
-
-    if (test_for_null_also) {
-      Label found_null;
-      // Failed the equality check on item[n]...  Test for null.
-      if (start_row == last_row) {
-        // The only thing left to do is handle the null case.
-        cbz(reg2, found_null);
-        // Item did not match any saved item and there is no empty row for it.
-        // Increment total counter to indicate polymorphic case.
-        increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-        b(done);
-        bind(found_null);
-        break;
-      }
-      // Since null is rare, make it be the branch-taken case.
-      cbz(reg2, found_null);
-
-      // Put all the "Case 3" tests here.
-      record_item_in_profile_helper(item, mdp, reg2, start_row + 1, done, total_rows,
-        item_offset_fn, item_count_offset_fn);
-
-      // Found a null.  Keep searching for a matching item,
-      // but remember that this is an empty (unused) slot.
-      bind(found_null);
-    }
-  }
-
-  // In the fall-through case, we found no matching item, but we
-  // observed the item[start_row] is null.
-
-  // Fill in the item field and increment the count.
-  int item_offset = in_bytes(item_offset_fn(start_row));
-  set_mdp_data_at(mdp, item_offset, item);
-  int count_offset = in_bytes(item_count_offset_fn(start_row));
-  mov(reg2, DataLayout::counter_increment);
-  set_mdp_data_at(mdp, count_offset, reg2);
-  if (start_row > 0) {
-    b(done);
-  }
-}
-
-// Example state machine code for three profile rows:
-//   // main copy of decision tree, rooted at row[1]
-//   if (row[0].rec == rec) { row[0].incr(); goto done; }
-//   if (row[0].rec != nullptr) {
-//     // inner copy of decision tree, rooted at row[1]
-//     if (row[1].rec == rec) { row[1].incr(); goto done; }
-//     if (row[1].rec != nullptr) {
-//       // degenerate decision tree, rooted at row[2]
-//       if (row[2].rec == rec) { row[2].incr(); goto done; }
-//       if (row[2].rec != nullptr) { count.incr(); goto done; } // overflow
-//       row[2].init(rec); goto done;
-//     } else {
-//       // remember row[1] is empty
-//       if (row[2].rec == rec) { row[2].incr(); goto done; }
-//       row[1].init(rec); goto done;
-//     }
-//   } else {
-//     // remember row[0] is empty
-//     if (row[1].rec == rec) { row[1].incr(); goto done; }
-//     if (row[2].rec == rec) { row[2].incr(); goto done; }
-//     row[0].init(rec); goto done;
-//   }
-//   done:
-
-void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
-                                                        Register mdp, Register reg2) {
-  assert(ProfileInterpreter, "must be profiling");
-  Label done;
-
-  record_klass_in_profile_helper(receiver, mdp, reg2, 0, done);
-
-  bind (done);
-}
-
 void InterpreterMacroAssembler::profile_ret(Register return_bci,
                                             Register mdp) {
   if (ProfileInterpreter) {
@@ -1200,7 +1073,7 @@ void InterpreterMacroAssembler::profile_null_seen(Register mdp) {
   }
 }
 
-void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass, Register reg2) {
+void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass) {
   if (ProfileInterpreter) {
     Label profile_continue;
 
@@ -1213,7 +1086,7 @@ void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass,
       mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
 
       // Record the object type.
-      record_klass_in_profile(klass, mdp, reg2);
+      profile_receiver_type(klass, mdp, 0);
     }
     update_mdp_by_constant(mdp, mdp_delta);
 
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index 2b230a3b73e..74d4430000d 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -273,15 +273,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
                         Register test_value_out,
                         Label& not_equal_continue);
 
-  void record_klass_in_profile(Register receiver, Register mdp,
-                               Register reg2);
-  void record_klass_in_profile_helper(Register receiver, Register mdp,
-                                      Register reg2, int start_row,
-                                      Label& done);
-  void record_item_in_profile_helper(Register item, Register mdp,
-                                     Register reg2, int start_row, Label& done, int total_rows,
-                                     OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn);
-
   void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
   void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
   void update_mdp_by_constant(Register mdp_in, int constant);
@@ -295,11 +286,10 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void profile_call(Register mdp);
   void profile_final_call(Register mdp);
   void profile_virtual_call(Register receiver, Register mdp,
-                            Register scratch2,
                             bool receiver_can_be_null = false);
   void profile_ret(Register return_bci, Register mdp);
   void profile_null_seen(Register mdp);
-  void profile_typecheck(Register mdp, Register klass, Register scratch);
+  void profile_typecheck(Register mdp, Register klass);
   void profile_typecheck_failed(Register mdp);
   void profile_switch_default(Register mdp);
   void profile_switch_case(Register index_in_scratch, Register mdp,
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index b8a9afc123f..3e3e95be07e 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2024, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -406,7 +406,6 @@ public:
     offset <<= shift;
     uint64_t target_page = ((uint64_t)insn_addr) + offset;
     target_page &= ((uint64_t)-1) << shift;
-    uint32_t insn2 = insn_at(insn_addr, 1);
     target = address(target_page);
     precond(inner != nullptr);
     inner(insn_addr, target);
@@ -473,6 +472,7 @@ address MacroAssembler::target_addr_for_insn(address insn_addr) {
 // Patch any kind of instruction; there may be several instructions.
 // Return the total length (in bytes) of the instructions.
 int MacroAssembler::pd_patch_instruction_size(address insn_addr, address target) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   return RelocActions<Patcher>::run(insn_addr, target);
 }
 
@@ -481,6 +481,8 @@ int MacroAssembler::patch_oop(address insn_addr, address o) {
   unsigned insn = *(unsigned*)insn_addr;
   assert(nativeInstruction_at(insn_addr+4)->is_movk(), "wrong insns in patch");
 
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   // OOPs are either narrow (32 bits) or wide (48 bits).  We encode
   // narrow OOPs by setting the upper 16 bits in the first
   // instruction.
@@ -510,18 +512,13 @@ int MacroAssembler::patch_narrow_klass(address insn_addr, narrowKlass n) {
   assert(Instruction_aarch64::extract(insn->encoding(), 31, 21) == 0b11010010101 &&
          nativeInstruction_at(insn_addr+4)->is_movk(), "wrong insns in patch");
 
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   Instruction_aarch64::patch(insn_addr, 20, 5, n >> 16);
   Instruction_aarch64::patch(insn_addr+4, 20, 5, n & 0xffff);
   return 2 * NativeInstruction::instruction_size;
 }
 
-address MacroAssembler::target_addr_for_insn_or_null(address insn_addr) {
-  if (NativeInstruction::is_ldrw_to_zr(insn_addr)) {
-    return nullptr;
-  }
-  return MacroAssembler::target_addr_for_insn(insn_addr);
-}
-
 void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool in_nmethod, Register tmp) {
   ldr(tmp, Address(rthread, JavaThread::polling_word_offset()));
   if (at_return) {
@@ -1955,9 +1952,7 @@ void MacroAssembler::verify_secondary_supers_table(Register r_sub_klass,
 
   const Register
     r_array_base   = temp1,
-    r_array_length = temp2,
-    r_array_index  = noreg, // unused
-    r_bitmap       = noreg; // unused
+    r_array_length = temp2;
 
   BLOCK_COMMENT("verify_secondary_supers_table {");
 
@@ -2118,6 +2113,161 @@ Address MacroAssembler::argument_address(RegisterOrConstant arg_slot,
   }
 }
 
+// Handle the receiver type profile update given the "recv" klass.
+//
+// Normally updates the ReceiverData (RD) that starts at "mdp" + "mdp_offset".
+// If there are no matching or claimable receiver entries in RD, updates
+// the polymorphic counter.
+//
+// This code expected to run by either the interpreter or JIT-ed code, without
+// extra synchronization. For safety, receiver cells are claimed atomically, which
+// avoids grossly misrepresenting the profiles under concurrent updates. For speed,
+// counter updates are not atomic.
+//
+void MacroAssembler::profile_receiver_type(Register recv, Register mdp, int mdp_offset) {
+  assert_different_registers(recv, mdp, rscratch1, rscratch2);
+
+  int base_receiver_offset   = in_bytes(ReceiverTypeData::receiver_offset(0));
+  int end_receiver_offset    = in_bytes(ReceiverTypeData::receiver_offset(ReceiverTypeData::row_limit()));
+  int poly_count_offset      = in_bytes(CounterData::count_offset());
+  int receiver_step          = in_bytes(ReceiverTypeData::receiver_offset(1)) - base_receiver_offset;
+  int receiver_to_count_step = in_bytes(ReceiverTypeData::receiver_count_offset(0)) - base_receiver_offset;
+
+  // Adjust for MDP offsets.
+  base_receiver_offset += mdp_offset;
+  end_receiver_offset  += mdp_offset;
+  poly_count_offset    += mdp_offset;
+
+#ifdef ASSERT
+  // We are about to walk the MDO slots without asking for offsets.
+  // Check that our math hits all the right spots.
+  for (uint c = 0; c < ReceiverTypeData::row_limit(); c++) {
+    int real_recv_offset  = mdp_offset + in_bytes(ReceiverTypeData::receiver_offset(c));
+    int real_count_offset = mdp_offset + in_bytes(ReceiverTypeData::receiver_count_offset(c));
+    int offset = base_receiver_offset + receiver_step*c;
+    int count_offset = offset + receiver_to_count_step;
+    assert(offset == real_recv_offset, "receiver slot math");
+    assert(count_offset == real_count_offset, "receiver count math");
+  }
+  int real_poly_count_offset = mdp_offset + in_bytes(CounterData::count_offset());
+  assert(poly_count_offset == real_poly_count_offset, "poly counter math");
+#endif
+
+  // Corner case: no profile table. Increment poly counter and exit.
+  if (ReceiverTypeData::row_limit() == 0) {
+    increment(Address(mdp, poly_count_offset), DataLayout::counter_increment);
+    return;
+  }
+
+  Register offset = rscratch2;
+
+  Label L_loop_search_receiver, L_loop_search_empty;
+  Label L_restart, L_found_recv, L_found_empty, L_polymorphic, L_count_update;
+
+  // The code here recognizes three major cases:
+  //   A. Fastest: receiver found in the table
+  //   B. Fast: no receiver in the table, and the table is full
+  //   C. Slow: no receiver in the table, free slots in the table
+  //
+  // The case A performance is most important, as perfectly-behaved code would end up
+  // there, especially with larger TypeProfileWidth. The case B performance is
+  // important as well, this is where bulk of code would land for normally megamorphic
+  // cases. The case C performance is not essential, its job is to deal with installation
+  // races, we optimize for code density instead. Case C needs to make sure that receiver
+  // rows are only claimed once. This makes sure we never overwrite a row for another
+  // receiver and never duplicate the receivers in the list, making profile type-accurate.
+  //
+  // It is very tempting to handle these cases in a single loop, and claim the first slot
+  // without checking the rest of the table. But, profiling code should tolerate free slots
+  // in the table, as class unloading can clear them. After such cleanup, the receiver
+  // we need might be _after_ the free slot. Therefore, we need to let at least full scan
+  // to complete, before trying to install new slots. Splitting the code in several tight
+  // loops also helpfully optimizes for cases A and B.
+  //
+  // This code is effectively:
+  //
+  // restart:
+  //   // Fastest: receiver is already installed
+  //   for (i = 0; i < receiver_count(); i++) {
+  //     if (receiver(i) == recv) goto found_recv(i);
+  //   }
+  //
+  //   // Fast: no receiver, but profile is full
+  //   for (i = 0; i < receiver_count(); i++) {
+  //     if (receiver(i) == null) goto found_null(i);
+  //   }
+  //   goto polymorphic
+  //
+  //   // Slow: try to install receiver
+  // found_null(i):
+  //   CAS(&receiver(i), null, recv);
+  //   goto restart
+  //
+  // polymorphic:
+  //   count++;
+  //   return
+  //
+  // found_recv(i):
+  //   *receiver_count(i)++
+  //
+
+  bind(L_restart);
+
+  // Fastest: receiver is already installed
+  mov(offset, base_receiver_offset);
+  bind(L_loop_search_receiver);
+    ldr(rscratch1, Address(mdp, offset));
+    cmp(rscratch1, recv);
+    br(Assembler::EQ, L_found_recv);
+  add(offset, offset, receiver_step);
+  sub(rscratch1, offset, end_receiver_offset);
+  cbnz(rscratch1, L_loop_search_receiver);
+
+  // Fast: no receiver, but profile is full
+  mov(offset, base_receiver_offset);
+  bind(L_loop_search_empty);
+    ldr(rscratch1, Address(mdp, offset));
+    cbz(rscratch1, L_found_empty);
+  add(offset, offset, receiver_step);
+  sub(rscratch1, offset, end_receiver_offset);
+  cbnz(rscratch1, L_loop_search_empty);
+  b(L_polymorphic);
+
+  // Slow: try to install receiver
+  bind(L_found_empty);
+
+  // Atomically swing receiver slot: null -> recv.
+  //
+  // The update uses CAS, which clobbers rscratch1. Therefore, rscratch2
+  // is used to hold the destination address. This is safe because the
+  // offset is no longer needed after the address is computed.
+
+  lea(rscratch2, Address(mdp, offset));
+  cmpxchg(/*addr*/ rscratch2, /*expected*/ zr, /*new*/ recv, Assembler::xword,
+          /*acquire*/ false, /*release*/ false, /*weak*/ true, noreg);
+
+  // CAS success means the slot now has the receiver we want. CAS failure means
+  // something had claimed the slot concurrently: it can be the same receiver we want,
+  // or something else. Since this is a slow path, we can optimize for code density,
+  // and just restart the search from the beginning.
+  b(L_restart);
+
+  // Counter updates:
+
+  // Increment polymorphic counter instead of receiver slot.
+  bind(L_polymorphic);
+  mov(offset, poly_count_offset);
+  b(L_count_update);
+
+  // Found a receiver, convert its slot offset to corresponding count offset.
+  bind(L_found_recv);
+  add(offset, offset, receiver_to_count_step);
+
+  bind(L_count_update);
+  increment(Address(mdp, offset), DataLayout::counter_increment);
+}
+
+
 void MacroAssembler::call_VM_leaf_base(address entry_point,
                                        int number_of_arguments,
                                        Label *retaddr) {
@@ -3451,9 +3601,8 @@ extern "C" void findpc(intptr_t x);
 void MacroAssembler::debug64(char* msg, int64_t pc, int64_t regs[])
 {
   // In order to get locks to work, we need to fake a in_VM state
-  if (ShowMessageBoxOnError ) {
+  if (ShowMessageBoxOnError) {
     JavaThread* thread = JavaThread::current();
-    JavaThreadState saved_state = thread->thread_state();
     thread->set_thread_state(_thread_in_vm);
 #ifndef PRODUCT
     if (CountBytecodes || TraceBytecodes || StopInterpreterAt) {
@@ -5578,7 +5727,6 @@ address MacroAssembler::read_polling_page(Register r, relocInfo::relocType rtype
 }
 
 void MacroAssembler::adrp(Register reg1, const Address &dest, uint64_t &byte_offset) {
-  relocInfo::relocType rtype = dest.rspec().reloc()->type();
   uint64_t low_page = (uint64_t)CodeCache::low_bound() >> 12;
   uint64_t high_page = (uint64_t)(CodeCache::high_bound()-1) >> 12;
   uint64_t dest_page = (uint64_t)dest.target() >> 12;
@@ -5606,12 +5754,33 @@ void MacroAssembler::adrp(Register reg1, const Address &dest, uint64_t &byte_off
 }
 
 void MacroAssembler::load_byte_map_base(Register reg) {
-  CardTable::CardValue* byte_map_base =
-    ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
+#if INCLUDE_CDS
+  if (AOTCodeCache::is_on_for_dump()) {
+    address byte_map_base_adr = AOTRuntimeConstants::card_table_base_address();
+    lea(reg, ExternalAddress(byte_map_base_adr));
+    ldr(reg, Address(reg));
+    return;
+  }
+#endif
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
-  // Strictly speaking the byte_map_base isn't an address at all, and it might
+  // Strictly speaking the card table base isn't an address at all, and it might
   // even be negative. It is thus materialised as a constant.
-  mov(reg, (uint64_t)byte_map_base);
+  mov(reg, (uint64_t)ctbs->card_table_base_const());
+}
+
+void MacroAssembler::load_aotrc_address(Register reg, address a) {
+#if INCLUDE_CDS
+  assert(AOTRuntimeConstants::contains(a), "address out of range for data area");
+  if (AOTCodeCache::is_on_for_dump()) {
+    // all aotrc field addresses should be registered in the AOTCodeCache address table
+    lea(reg, ExternalAddress(a));
+  } else {
+    mov(reg, (uint64_t)a);
+  }
+#else
+  ShouldNotReachHere();
+#endif
 }
 
 void MacroAssembler::build_frame(int framesize) {
@@ -5782,6 +5951,9 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     //      return false;
     bind(A_IS_NOT_NULL);
     ldrw(cnt1, Address(a1, length_offset));
+    ldrw(tmp5, Address(a2, length_offset));
+    cmp(cnt1, tmp5);
+    br(NE, DONE); // If lengths differ, return false
     // Increase loop counter by diff between base- and actual start-offset.
     addw(cnt1, cnt1, extra_length);
     lea(a1, Address(a1, start_offset));
@@ -5848,6 +6020,9 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     cbz(a1, DONE);
     ldrw(cnt1, Address(a1, length_offset));
     cbz(a2, DONE);
+    ldrw(tmp5, Address(a2, length_offset));
+    cmp(cnt1, tmp5);
+    br(NE, DONE); // If lengths differ, return false
     // Increase loop counter by diff between base- and actual start-offset.
     addw(cnt1, cnt1, extra_length);
 
@@ -5949,7 +6124,6 @@ void MacroAssembler::string_equals(Register a1, Register a2,
   Label SAME, DONE, SHORT, NEXT_WORD;
   Register tmp1 = rscratch1;
   Register tmp2 = rscratch2;
-  Register cnt2 = tmp2;  // cnt2 only used in array length compare
 
   assert_different_registers(a1, a2, result, cnt1, rscratch1, rscratch2);
 
@@ -6259,10 +6433,14 @@ void MacroAssembler::fill_words(Register base, Register cnt, Register value)
 
 // Intrinsic for
 //
-// - sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray
-//     return the number of characters copied.
-// - java/lang/StringUTF16.compress
-//     return index of non-latin1 character if copy fails, otherwise 'len'.
+// - sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
+//   Encodes char[] to byte[] in ISO-8859-1
+//
+// - java.lang.StringCoding#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
+//   Encodes byte[] (containing UTF-16) to byte[] in ISO-8859-1
+//
+// - java.lang.StringCoding#encodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len)
+//   Encodes char[] to byte[] in ASCII
 //
 // This version always returns the number of characters copied, and does not
 // clobber the 'len' register. A successful copy will complete with the post-
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 4baa07d7d49..fa32f3055b9 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2024, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -678,7 +678,6 @@ public:
   static bool uses_implicit_null_check(void* address);
 
   static address target_addr_for_insn(address insn_addr);
-  static address target_addr_for_insn_or_null(address insn_addr);
 
   // Required platform-specific helpers for Label::patch_instructions.
   // They _shadow_ the declarations in AbstractAssembler, which are undefined.
@@ -1122,6 +1121,8 @@ public:
 
   Address argument_address(RegisterOrConstant arg_slot, int extra_slot_offset = 0);
 
+  void profile_receiver_type(Register recv, Register mdp, int mdp_offset);
+
   void verify_sve_vector_length(Register tmp = rscratch1);
   void reinitialize_ptrue() {
     if (UseSVE > 0) {
@@ -1475,6 +1476,9 @@ public:
   // Load the base of the cardtable byte map into reg.
   void load_byte_map_base(Register reg);
 
+  // Load a constant address in the AOT Runtime Constants area
+  void load_aotrc_address(Register reg, address a);
+
   // Prolog generator routines to support switch between x86 code and
   // generated ARM code
 
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
index f2003dd9b55..8b76b96d345 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -133,7 +133,6 @@ void NativeMovConstReg::verify() {
 
 
 intptr_t NativeMovConstReg::data() const {
-  // das(uint64_t(instruction_address()),2);
   address addr = MacroAssembler::target_addr_for_insn(instruction_address());
   if (maybe_cpool_ref(instruction_address())) {
     return *(intptr_t*)addr;
@@ -144,6 +143,7 @@ intptr_t NativeMovConstReg::data() const {
 
 void NativeMovConstReg::set_data(intptr_t x) {
   if (maybe_cpool_ref(instruction_address())) {
+    MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
     address addr = MacroAssembler::target_addr_for_insn(instruction_address());
     *(intptr_t*)addr = x;
   } else {
@@ -192,7 +192,6 @@ int NativeMovRegMem::offset() const  {
 
 void NativeMovRegMem::set_offset(int x) {
   address pc = instruction_address();
-  unsigned insn = *(unsigned*)pc;
   if (maybe_cpool_ref(pc)) {
     address addr = MacroAssembler::target_addr_for_insn(pc);
     *(int64_t*)addr = x;
@@ -204,7 +203,7 @@ void NativeMovRegMem::set_offset(int x) {
 
 void NativeMovRegMem::verify() {
 #ifdef ASSERT
-  address dest = MacroAssembler::target_addr_for_insn_or_null(instruction_address());
+  MacroAssembler::target_addr_for_insn(instruction_address());
 #endif
 }
 
@@ -213,7 +212,7 @@ void NativeMovRegMem::verify() {
 void NativeJump::verify() { ; }
 
 address NativeJump::jump_destination() const          {
-  address dest = MacroAssembler::target_addr_for_insn_or_null(instruction_address());
+  address dest = MacroAssembler::target_addr_for_insn(instruction_address());
 
   // We use jump to self as the unresolved address which the inline
   // cache code (and relocs) know about
@@ -350,8 +349,6 @@ bool NativeInstruction::is_stop() {
 
 //-------------------------------------------------------------------
 
-void NativeGeneralJump::verify() {  }
-
 // MT-safe patching of a long jump instruction.
 void NativeGeneralJump::replace_mt_safe(address instr_addr, address code_buffer) {
   ShouldNotCallThis();
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index c30cb911d96..fc7274714ad 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2025, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -78,7 +78,6 @@ public:
   inline bool is_nop() const;
   bool is_jump();
   bool is_general_jump();
-  inline bool is_jump_or_nop();
   inline bool is_cond_jump();
   bool is_safepoint_poll();
   bool is_movz();
@@ -90,16 +89,18 @@ protected:
 
   s_char sbyte_at(int offset) const { return *(s_char*)addr_at(offset); }
   u_char ubyte_at(int offset) const { return *(u_char*)addr_at(offset); }
-  jint int_at(int offset) const { return *(jint*)addr_at(offset); }
-  juint uint_at(int offset) const { return *(juint*)addr_at(offset); }
-  address ptr_at(int offset) const { return *(address*)addr_at(offset); }
-  oop oop_at(int offset) const { return *(oop*)addr_at(offset); }
+  jint int_at(int offset) const     { return *(jint*)addr_at(offset); }
+  juint uint_at(int offset) const   { return *(juint*)addr_at(offset); }
+  address ptr_at(int offset) const  { return *(address*)addr_at(offset); }
+  oop oop_at(int offset) const      { return *(oop*)addr_at(offset); }
 
-  void set_char_at(int offset, char c) { *addr_at(offset) = (u_char)c; }
-  void set_int_at(int offset, jint i) { *(jint*)addr_at(offset) = i; }
-  void set_uint_at(int offset, jint i) { *(juint*)addr_at(offset) = i; }
-  void set_ptr_at(int offset, address ptr) { *(address*)addr_at(offset) = ptr; }
-  void set_oop_at(int offset, oop o) { *(oop*)addr_at(offset) = o; }
+#define MACOS_WX_WRITE MACOS_AARCH64_ONLY(os::thread_wx_enable_write())
+  void set_char_at(int offset, char c)     { MACOS_WX_WRITE;  *addr_at(offset) = (u_char)c; }
+  void set_int_at(int offset, jint i)      { MACOS_WX_WRITE;  *(jint*)addr_at(offset) = i; }
+  void set_uint_at(int offset, jint i)     { MACOS_WX_WRITE;  *(juint*)addr_at(offset) = i; }
+  void set_ptr_at(int offset, address ptr) { MACOS_WX_WRITE;  *(address*)addr_at(offset) = ptr; }
+  void set_oop_at(int offset, oop o)       { MACOS_WX_WRITE;  *(oop*)addr_at(offset) = o; }
+#undef MACOS_WX_WRITE
 
   void wrote(int offset);
 
@@ -380,7 +381,6 @@ public:
   void set_jump_destination(address dest);
 
   static void replace_mt_safe(address instr_addr, address code_buffer);
-  static void verify();
 };
 
 inline NativeGeneralJump* nativeGeneralJump_at(address address) {
@@ -419,10 +419,6 @@ inline bool NativeInstruction::is_jump() {
     return false;
 }
 
-inline bool NativeInstruction::is_jump_or_nop() {
-  return is_nop() || is_jump();
-}
-
 // Call trampoline stubs.
 class NativeCallTrampolineStub : public NativeInstruction {
 public:
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 89ae6bc10e0..73b631029a0 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -722,22 +722,20 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
 
   // Class initialization barrier for static methods
   entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
-  if (VM_Version::supports_fast_class_init_checks()) {
-    Label L_skip_barrier;
+  assert(VM_Version::supports_fast_class_init_checks(), "sanity");
+  Label L_skip_barrier;
 
-    { // Bypass the barrier for non-static methods
-      __ ldrh(rscratch1, Address(rmethod, Method::access_flags_offset()));
-      __ andsw(zr, rscratch1, JVM_ACC_STATIC);
-      __ br(Assembler::EQ, L_skip_barrier); // non-static
-    }
+  // Bypass the barrier for non-static methods
+  __ ldrh(rscratch1, Address(rmethod, Method::access_flags_offset()));
+  __ andsw(zr, rscratch1, JVM_ACC_STATIC);
+  __ br(Assembler::EQ, L_skip_barrier); // non-static
 
-    __ load_method_holder(rscratch2, rmethod);
-    __ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);
-    __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+  __ load_method_holder(rscratch2, rmethod);
+  __ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);
+  __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
 
-    __ bind(L_skip_barrier);
-    entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
-  }
+  __ bind(L_skip_barrier);
+  entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
 
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->c2i_entry_barrier(masm);
@@ -1508,7 +1506,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // SVC, HVC, or SMC.  Make it a NOP.
   __ nop();
 
-  if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
+  if (method->needs_clinit_barrier()) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     Label L_skip_barrier;
     __ mov_metadata(rscratch2, method->method_holder()); // InstanceKlass*
     __ clinit_barrier(rscratch2, rscratch1, &L_skip_barrier);
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 7e2f333ba40..a459a28b09e 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -6081,14 +6081,18 @@ class StubGenerator: public StubCodeGenerator {
   // static int implKyber12To16(
   //         byte[] condensed, int index, short[] parsed, int parsedLength) {}
   //
-  // (parsedLength or (parsedLength - 48) must be divisible by 64.)
+  // we assume that parsed and condensed are allocated such that for
+  // n = (parsedLength + 63) / 64
+  // n blocks of 96 bytes of input can be processed, i.e.
+  // index + n * 96 <= condensed.length and
+  // n * 64 <= parsed.length
   //
   // condensed (byte[]) = c_rarg0
   // condensedIndex = c_rarg1
-  // parsed (short[112 or 256]) = c_rarg2
-  // parsedLength (112 or 256) = c_rarg3
+  // parsed (short[]) = c_rarg2
+  // parsedLength = c_rarg3
   address generate_kyber12To16() {
-    Label L_F00, L_loop, L_end;
+    Label L_F00, L_loop;
 
     __ align(CodeEntryAlignment);
     StubId stub_id = StubId::stubgen_kyber12To16_id;
@@ -6209,75 +6213,8 @@ class StubGenerator: public StubCodeGenerator {
     vs_st2_post(vs_front(vb), __ T8H, parsed);
 
     __ sub(parsedLength, parsedLength, 64);
-    __ cmp(parsedLength, (u1)64);
-    __ br(Assembler::GE, L_loop);
-    __ cbz(parsedLength, L_end);
-
-    // if anything is left it should be a final 72 bytes of input
-    // i.e. a final 48 12-bit values. so we handle this by loading
-    // 48 bytes into all 16B lanes of front(vin) and only 24
-    // bytes into the lower 8B lane of back(vin)
-    vs_ld3_post(vs_front(vin), __ T16B, condensed);
-    vs_ld3(vs_back(vin), __ T8B, condensed);
-
-    // Expand vin[0] into va[0:1], and vin[1] into va[2:3] and va[4:5]
-    // n.b. target elements 2 and 3 of va duplicate elements 4 and
-    // 5 and target element 2 of vb duplicates element 4.
-    __ ushll(va[0], __ T8H, vin[0], __ T8B, 0);
-    __ ushll2(va[1], __ T8H, vin[0], __ T16B, 0);
-    __ ushll(va[2], __ T8H, vin[1], __ T8B, 0);
-    __ ushll2(va[3], __ T8H, vin[1], __ T16B, 0);
-    __ ushll(va[4], __ T8H, vin[1], __ T8B, 0);
-    __ ushll2(va[5], __ T8H, vin[1], __ T16B, 0);
-
-    // This time expand just the lower 8 lanes
-    __ ushll(vb[0], __ T8H, vin[3], __ T8B, 0);
-    __ ushll(vb[2], __ T8H, vin[4], __ T8B, 0);
-    __ ushll(vb[4], __ T8H, vin[4], __ T8B, 0);
-
-    // shift lo byte of copy 1 of the middle stripe into the high byte
-    __ shl(va[2], __ T8H, va[2], 8);
-    __ shl(va[3], __ T8H, va[3], 8);
-    __ shl(vb[2], __ T8H, vb[2], 8);
-
-    // expand vin[2] into va[6:7] and lower 8 lanes of vin[5] into
-    // vb[6] pre-shifted by 4 to ensure top bits of the input 12-bit
-    // int are in bit positions [4..11].
-    __ ushll(va[6], __ T8H, vin[2], __ T8B, 4);
-    __ ushll2(va[7], __ T8H, vin[2], __ T16B, 4);
-    __ ushll(vb[6], __ T8H, vin[5], __ T8B, 4);
-
-    // mask hi 4 bits of each 1st 12-bit int in pair from copy1 and
-    // shift lo 4 bits of each 2nd 12-bit int in pair to bottom of
-    // copy2
-    __ andr(va[2], __ T16B, va[2], v31);
-    __ andr(va[3], __ T16B, va[3], v31);
-    __ ushr(va[4], __ T8H, va[4], 4);
-    __ ushr(va[5], __ T8H, va[5], 4);
-    __ andr(vb[2], __ T16B, vb[2], v31);
-    __ ushr(vb[4], __ T8H, vb[4], 4);
-
-
-
-    // sum hi 4 bits and lo 8 bits of each 1st 12-bit int in pair and
-    // hi 8 bits plus lo 4 bits of each 2nd 12-bit int in pair
-
-    // n.b. ordering ensures: i) inputs are consumed before they are
-    // overwritten ii) order of 16-bit results across succsessive
-    // pairs of vectors in va and then lower half of vb reflects order
-    // of corresponding 12-bit inputs
-    __ addv(va[0], __ T8H, va[0], va[2]);
-    __ addv(va[2], __ T8H, va[1], va[3]);
-    __ addv(va[1], __ T8H, va[4], va[6]);
-    __ addv(va[3], __ T8H, va[5], va[7]);
-    __ addv(vb[0], __ T8H, vb[0], vb[2]);
-    __ addv(vb[1], __ T8H, vb[4], vb[6]);
-
-    // store 48 results interleaved as shorts
-    vs_st2_post(vs_front(va), __ T8H, parsed);
-    vs_st2_post(vs_front(vs_front(vb)), __ T8H, parsed);
-
-    __ BIND(L_end);
+    __ cmp(parsedLength, (u1)0);
+    __ br(Assembler::GT, L_loop);
 
     __ leave(); // required for proper stackwalking of RuntimeStub frame
     __ mov(r0, zr); // return 0
@@ -11805,7 +11742,9 @@ class StubGenerator: public StubCodeGenerator {
     }
 #endif
 
-    StubRoutines::_unsafe_setmemory = generate_unsafe_setmemory();
+    if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_setMemory)) {
+      StubRoutines::_unsafe_setmemory = generate_unsafe_setmemory();
+    }
 
     StubRoutines::aarch64::set_completed(); // Inidicate that arraycopy and zero_blocks stubs are generated
   }
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index cde142b39ac..69769fb8441 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -96,10 +96,6 @@ static inline Address aaddress(Register r) {
   return iaddress(r);
 }
 
-static inline Address at_rsp() {
-  return Address(esp, 0);
-}
-
 // At top of Java expression stack which may be different than esp().  It
 // isn't for category 1 objects.
 static inline Address at_tos   () {
@@ -2290,7 +2286,8 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   __ subs(zr, temp, (int) code);  // have we resolved this bytecode?
 
   // Class initialization barrier for static methods
-  if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
+  if (bytecode() == Bytecodes::_invokestatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     __ br(Assembler::NE, L_clinit_barrier_slow);
     __ ldr(temp, Address(Rcache, in_bytes(ResolvedMethodEntry::method_offset())));
     __ load_method_holder(temp, temp);
@@ -2340,8 +2337,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   __ subs(zr, temp, (int) code);  // have we resolved this bytecode?
 
   // Class initialization barrier for static fields
-  if (VM_Version::supports_fast_class_init_checks() &&
-      (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
+  if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register field_holder = temp;
 
     __ br(Assembler::NE, L_clinit_barrier_slow);
@@ -3369,7 +3366,7 @@ void TemplateTable::invokevirtual_helper(Register index,
   __ load_klass(r0, recv);
 
   // profile this call
-  __ profile_virtual_call(r0, rlocals, r3);
+  __ profile_virtual_call(r0, rlocals);
 
   // get target Method & entry point
   __ lookup_virtual_method(r0, index, method);
@@ -3499,7 +3496,7 @@ void TemplateTable::invokeinterface(int byte_no) {
                              /*return_method=*/false);
 
   // profile this call
-  __ profile_virtual_call(r3, r13, r19);
+  __ profile_virtual_call(r3, r13);
 
   // Get declaring interface class from method, and itable index
 
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 659c231464a..9b85733ed08 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2020, Red Hat Inc. All rights reserved.
  * Copyright 2025 Arm Limited and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -201,16 +201,14 @@ void VM_Version::initialize() {
     }
   }
 
-  // Cortex A53
-  if (_cpu == CPU_ARM && model_is(0xd03)) {
+  if (_cpu == CPU_ARM && model_is(CPU_MODEL_ARM_CORTEX_A53)) {
     set_feature(CPU_A53MAC);
     if (FLAG_IS_DEFAULT(UseSIMDForArrayEquals)) {
       FLAG_SET_DEFAULT(UseSIMDForArrayEquals, false);
     }
   }
 
-  // Cortex A73
-  if (_cpu == CPU_ARM && model_is(0xd09)) {
+  if (_cpu == CPU_ARM && model_is(CPU_MODEL_ARM_CORTEX_A73)) {
     if (FLAG_IS_DEFAULT(SoftwarePrefetchHintDistance)) {
       FLAG_SET_DEFAULT(SoftwarePrefetchHintDistance, -1);
     }
@@ -220,16 +218,11 @@ void VM_Version::initialize() {
     }
   }
 
-  // Neoverse
-  //   N1: 0xd0c
-  //   N2: 0xd49
-  //   N3: 0xd8e
-  //   V1: 0xd40
-  //   V2: 0xd4f
-  //   V3: 0xd84
-  if (_cpu == CPU_ARM && (model_is(0xd0c) || model_is(0xd49) ||
-                          model_is(0xd40) || model_is(0xd4f) ||
-                          model_is(0xd8e) || model_is(0xd84))) {
+  if (_cpu == CPU_ARM &&
+      model_is_in({ CPU_MODEL_ARM_NEOVERSE_N1, CPU_MODEL_ARM_NEOVERSE_V1,
+                    CPU_MODEL_ARM_NEOVERSE_N2, CPU_MODEL_ARM_NEOVERSE_V2,
+                    CPU_MODEL_ARM_NEOVERSE_N3, CPU_MODEL_ARM_NEOVERSE_V3,
+                    CPU_MODEL_ARM_NEOVERSE_V3AE })) {
     if (FLAG_IS_DEFAULT(UseSIMDForMemoryOps)) {
       FLAG_SET_DEFAULT(UseSIMDForMemoryOps, true);
     }
@@ -261,12 +254,9 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseCRC32, false);
   }
 
-  // Neoverse
-  //   V1: 0xd40
-  //   V2: 0xd4f
-  //   V3: 0xd84
   if (_cpu == CPU_ARM &&
-      (model_is(0xd40) || model_is(0xd4f) || model_is(0xd84))) {
+      model_is_in({ CPU_MODEL_ARM_NEOVERSE_V1, CPU_MODEL_ARM_NEOVERSE_V2,
+                    CPU_MODEL_ARM_NEOVERSE_V3, CPU_MODEL_ARM_NEOVERSE_V3AE })) {
     if (FLAG_IS_DEFAULT(UseCryptoPmullForCRC32)) {
       FLAG_SET_DEFAULT(UseCryptoPmullForCRC32, true);
     }
@@ -456,7 +446,9 @@ void VM_Version::initialize() {
       FLAG_SET_DEFAULT(BlockZeroingLowLimit, 4 * VM_Version::zva_length());
     }
   } else if (UseBlockZeroing) {
-    warning("DC ZVA is not available on this CPU");
+    if (!FLAG_IS_DEFAULT(UseBlockZeroing)) {
+      warning("DC ZVA is not available on this CPU");
+    }
     FLAG_SET_DEFAULT(UseBlockZeroing, false);
   }
 
@@ -632,6 +624,22 @@ void VM_Version::initialize() {
 
   check_virtualizations();
 
+#ifdef __APPLE__
+  DefaultWXWriteMode = UseOldWX ? WXWrite : WXArmedForWrite;
+
+  if (TraceWXHealing) {
+    if (pthread_jit_write_protect_supported_np()) {
+      tty->print_cr("### TraceWXHealing is in use");
+      if (StressWXHealing) {
+        tty->print_cr("### StressWXHealing is in use");
+      }
+    } else {
+      tty->print_cr("WX Healing is not in use because MAP_JIT write protection "
+                    "does not work on this system.");
+    }
+  }
+#endif
+
   // Sync SVE related CPU features with flags
   if (UseSVE < 2) {
     clear_feature(CPU_SVE2);
@@ -658,16 +666,52 @@ void VM_Version::initialize() {
 void VM_Version::insert_features_names(uint64_t features, stringStream& ss) {
   int i = 0;
   ss.join([&]() {
-    while (i < MAX_CPU_FEATURES) {
-      if (supports_feature((VM_Version::Feature_Flag)i)) {
-        return _features_names[i++];
+    const char* str = nullptr;
+    while ((i < MAX_CPU_FEATURES) && (str == nullptr)) {
+      if (supports_feature(features, (VM_Version::Feature_Flag)i)) {
+        str = _features_names[i];
       }
       i += 1;
     }
-    return (const char*)nullptr;
+    return str;
   }, ", ");
 }
 
+void VM_Version::get_cpu_features_name(void* features_buffer, stringStream& ss) {
+  uint64_t features = *(uint64_t*)features_buffer;
+  insert_features_names(features, ss);
+}
+
+void VM_Version::get_missing_features_name(void* features_set1, void* features_set2, stringStream& ss) {
+  uint64_t vm_features_set1 = *(uint64_t*)features_set1;
+  uint64_t vm_features_set2 = *(uint64_t*)features_set2;
+  int i = 0;
+  ss.join([&]() {
+    const char* str = nullptr;
+    while ((i < MAX_CPU_FEATURES) && (str == nullptr)) {
+      Feature_Flag flag = (Feature_Flag)i;
+      if (supports_feature(vm_features_set1, flag) && !supports_feature(vm_features_set2, flag)) {
+        str = _features_names[i];
+      }
+      i += 1;
+    }
+    return str;
+  }, ", ");
+}
+
+int VM_Version::cpu_features_size() {
+  return sizeof(_features);
+}
+
+void VM_Version::store_cpu_features(void* buf) {
+  *(uint64_t*)buf = _features;
+}
+
+bool VM_Version::supports_features(void* features_buffer) {
+  uint64_t features_to_test = *(uint64_t*)features_buffer;
+  return (_features & features_to_test) == features_to_test;
+}
+
 #if defined(LINUX)
 static bool check_info_file(const char* fpath,
                             const char* virt1, VirtualizationType vt1,
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
index 17087d243d3..0213872852b 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,6 +30,8 @@
 #include "runtime/abstract_vm_version.hpp"
 #include "utilities/sizes.hpp"
 
+#include <initializer_list>
+
 class stringStream;
 
 #define BIT_MASK(flag) (1ULL<<(flag))
@@ -112,14 +114,26 @@ public:
     CPU_APPLE     = 'a',
   };
 
-enum Ampere_CPU_Model {
+  enum Ampere_CPU_Model {
     CPU_MODEL_EMAG      = 0x0,   /* CPU implementer is CPU_AMCC */
     CPU_MODEL_ALTRA     = 0xd0c, /* CPU implementer is CPU_ARM, Neoverse N1 */
     CPU_MODEL_ALTRAMAX  = 0xd0c, /* CPU implementer is CPU_ARM, Neoverse N1 */
     CPU_MODEL_AMPERE_1  = 0xac3, /* CPU implementer is CPU_AMPERE */
     CPU_MODEL_AMPERE_1A = 0xac4, /* CPU implementer is CPU_AMPERE */
     CPU_MODEL_AMPERE_1B = 0xac5  /* AMPERE_1B core Implements ARMv8.7 with CSSC, MTE, SM3/SM4 extensions */
-};
+  };
+
+  enum ARM_CPU_Model {
+    CPU_MODEL_ARM_CORTEX_A53    = 0xd03,
+    CPU_MODEL_ARM_CORTEX_A73    = 0xd09,
+    CPU_MODEL_ARM_NEOVERSE_N1   = 0xd0c,
+    CPU_MODEL_ARM_NEOVERSE_V1   = 0xd40,
+    CPU_MODEL_ARM_NEOVERSE_N2   = 0xd49,
+    CPU_MODEL_ARM_NEOVERSE_V2   = 0xd4f,
+    CPU_MODEL_ARM_NEOVERSE_V3AE = 0xd83,
+    CPU_MODEL_ARM_NEOVERSE_V3   = 0xd84,
+    CPU_MODEL_ARM_NEOVERSE_N3   = 0xd8e,
+  };
 
 #define CPU_FEATURE_FLAGS(decl)               \
     decl(FP,            fp,            0)     \
@@ -170,6 +184,9 @@ enum Ampere_CPU_Model {
   static bool supports_feature(Feature_Flag flag) {
     return (_features & BIT_MASK(flag)) != 0;
   }
+  static bool supports_feature(uint64_t features, Feature_Flag flag) {
+    return (features & BIT_MASK(flag)) != 0;
+  }
 
   static int cpu_family()                     { return _cpu; }
   static int cpu_model()                      { return _model; }
@@ -181,7 +198,16 @@ enum Ampere_CPU_Model {
     return _model == cpu_model || _model2 == cpu_model;
   }
 
-  static bool is_zva_enabled() { return 0 <= _zva_length; }
+  static bool model_is_in(std::initializer_list<int> cpu_models) {
+    for (const int& cpu_model : cpu_models) {
+      if (_model == cpu_model || _model2 == cpu_model) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  static bool is_zva_enabled() { return 0 < _zva_length; }
   static int zva_length() {
     assert(is_zva_enabled(), "ZVA not available");
     return _zva_length;
@@ -221,6 +247,20 @@ enum Ampere_CPU_Model {
   static bool use_neon_for_vector(int vector_length_in_bytes) {
     return vector_length_in_bytes <= 16;
   }
+
+  static void get_cpu_features_name(void* features_buffer, stringStream& ss);
+
+  // Returns names of features present in features_set1 but not in features_set2
+  static void get_missing_features_name(void* features_set1, void* features_set2, stringStream& ss);
+
+  // Returns number of bytes required to store cpu features representation
+  static int cpu_features_size();
+
+  // Stores cpu features representation in the provided buffer. This representation is arch dependent.
+  // Size of the buffer must be same as returned by cpu_features_size()
+  static void store_cpu_features(void* buf);
+
+  static bool supports_features(void* features_to_test);
 };
 
 #endif // CPU_AARCH64_VM_VERSION_AARCH64_HPP
diff --git a/src/hotspot/cpu/arm/frame_arm.cpp b/src/hotspot/cpu/arm/frame_arm.cpp
index 7a23296a3d4..f791fae7bd7 100644
--- a/src/hotspot/cpu/arm/frame_arm.cpp
+++ b/src/hotspot/cpu/arm/frame_arm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -356,10 +356,10 @@ frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
 bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
   assert(is_interpreted_frame(), "Not an interpreted frame");
   // These are reasonable sanity checks
-  if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
+  if (fp() == nullptr || (intptr_t(fp()) & (wordSize-1)) != 0) {
     return false;
   }
-  if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
+  if (sp() == nullptr || (intptr_t(sp()) & (wordSize-1)) != 0) {
     return false;
   }
   if (fp() + interpreter_frame_initial_sp_offset < sp()) {
diff --git a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp
index 2427d46cafa..5d63035ac69 100644
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp
@@ -67,9 +67,7 @@ void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet d
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                     Register addr, Register count, Register tmp) {
   BLOCK_COMMENT("CardTablePostBarrier");
-  BarrierSet* bs = BarrierSet::barrier_set();
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
   Label L_cardtable_loop, L_done;
 
@@ -83,7 +81,7 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
   __ sub(count, count, addr); // nb of cards
 
   // warning: Rthread has not been preserved
-  __ mov_address(tmp, (address) ct->byte_map_base());
+  __ mov_address(tmp, (address)ctbs->card_table_base_const());
   __ add(addr,tmp, addr);
 
   Register zero = __ zero_register(tmp);
@@ -122,8 +120,7 @@ void CardTableBarrierSetAssembler::store_check_part1(MacroAssembler* masm, Regis
   assert(bs->kind() == BarrierSet::CardTableBarrierSet,
          "Wrong barrier set kind");
 
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
   // Load card table base address.
 
@@ -140,7 +137,7 @@ void CardTableBarrierSetAssembler::store_check_part1(MacroAssembler* masm, Regis
      Possible cause is a cache miss (card table base address resides in a
      rarely accessed area of thread descriptor).
   */
-  __ mov_address(card_table_base, (address)ct->byte_map_base());
+  __ mov_address(card_table_base, (address)ctbs->card_table_base_const());
 }
 
 // The 2nd part of the store check.
@@ -170,8 +167,8 @@ void CardTableBarrierSetAssembler::store_check_part2(MacroAssembler* masm, Regis
 
 void CardTableBarrierSetAssembler::set_card(MacroAssembler* masm, Register card_table_base, Address card_table_addr, Register tmp) {
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  CardTable* ct = ctbs->card_table();
-  if ((((uintptr_t)ct->byte_map_base() & 0xff) == 0)) {
+
+  if ((((uintptr_t)ctbs->card_table_base_const() & 0xff) == 0)) {
     // Card table is aligned so the lowest byte of the table address base is zero.
     // This works only if the code is not saved for later use, possibly
     // in a context where the base would no longer be aligned.
diff --git a/src/hotspot/cpu/arm/globals_arm.hpp b/src/hotspot/cpu/arm/globals_arm.hpp
index 363a9a2c25c..c568ea04122 100644
--- a/src/hotspot/cpu/arm/globals_arm.hpp
+++ b/src/hotspot/cpu/arm/globals_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ define_pd_global(bool,  TrapBasedNullChecks,      false); // Not needed
 define_pd_global(bool,  DelayCompilerStubsGeneration, false); // No need - only few compiler's stubs
 
 define_pd_global(size_t, CodeCacheSegmentSize,     64);
-define_pd_global(intx,   CodeEntryAlignment,       16);
+define_pd_global(uint,   CodeEntryAlignment,       16);
 define_pd_global(intx,   OptoLoopAlignment,        16);
 
 #define DEFAULT_STACK_YELLOW_PAGES (2)
diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.cpp b/src/hotspot/cpu/arm/nativeInst_arm_32.cpp
index 232294b246a..df780ac31a6 100644
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.cpp
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,7 @@ void NativeMovConstReg::set_data(intptr_t x, address pc) {
 
     address addr = oop_addr != nullptr ? (address)oop_addr : (address)metadata_addr;
 
-    if(pc == 0) {
+    if (pc == nullptr) {
       offset = addr - instruction_address() - 8;
     } else {
       offset = addr - pc - 8;
@@ -228,7 +228,7 @@ void NativeMovConstReg::set_data(intptr_t x, address pc) {
 
 void NativeMovConstReg::set_pc_relative_offset(address addr, address pc) {
   int offset;
-  if (pc == 0) {
+  if (pc == nullptr) {
     offset = addr - instruction_address() - 8;
   } else {
     offset = addr - pc - 8;
diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
index 82385bf0244..2b52db89285 100644
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -371,7 +371,7 @@ class NativeMovConstReg: public NativeInstruction {
  public:
 
   intptr_t data() const;
-  void set_data(intptr_t x, address pc = 0);
+  void set_data(intptr_t x, address pc = nullptr);
   bool is_pc_relative() {
     return !is_movw();
   }
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index 15e38411482..da2daffd579 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -568,6 +568,9 @@ class Assembler : public AbstractAssembler {
     XSCVDPHP_OPCODE= (60u << OPCODE_SHIFT |  347u << 2 | 17u << 16), // XX2-FORM
     XXPERM_OPCODE  = (60u << OPCODE_SHIFT |   26u << 3),
     XXSEL_OPCODE   = (60u << OPCODE_SHIFT |    3u << 4),
+    XSCMPEQDP_OPCODE=(60u << OPCODE_SHIFT |   3u <<  3),
+    XSCMPGEDP_OPCODE=(60u << OPCODE_SHIFT |  19u <<  3),
+    XSCMPGTDP_OPCODE=(60u << OPCODE_SHIFT |  11u <<  3),
     XXSPLTIB_OPCODE= (60u << OPCODE_SHIFT |  360u << 1),
     XVDIVDP_OPCODE = (60u << OPCODE_SHIFT |  120u << 3),
     XVABSSP_OPCODE = (60u << OPCODE_SHIFT |  409u << 2),
@@ -596,6 +599,9 @@ class Assembler : public AbstractAssembler {
     XVMAXSP_OPCODE = (60u << OPCODE_SHIFT |  192u << 3),
     XVMAXDP_OPCODE = (60u << OPCODE_SHIFT |  224u << 3),
 
+    XSMINJDP_OPCODE = (60u << OPCODE_SHIFT | 152u << 3),
+    XSMAXJDP_OPCODE = (60u << OPCODE_SHIFT | 144u << 3),
+
     // Deliver A Random Number (introduced with POWER9)
     DARN_OPCODE    = (31u << OPCODE_SHIFT |  755u << 1),
 
@@ -2424,6 +2430,9 @@ class Assembler : public AbstractAssembler {
   inline void xscvdphp( VectorSRegister d, VectorSRegister b);
   inline void xxland(   VectorSRegister d, VectorSRegister a, VectorSRegister b);
   inline void xxsel(    VectorSRegister d, VectorSRegister a, VectorSRegister b, VectorSRegister c);
+  inline void xscmpeqdp(VectorSRegister t, VectorSRegister a, VectorSRegister b); // Requires Power9
+  inline void xscmpgedp(VectorSRegister t, VectorSRegister a, VectorSRegister b); // Requires Power9
+  inline void xscmpgtdp(VectorSRegister t, VectorSRegister a, VectorSRegister b); // Requires Power9
   inline void xxspltib( VectorSRegister d, int ui8);
   inline void xvdivsp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
   inline void xvdivdp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
@@ -2449,6 +2458,9 @@ class Assembler : public AbstractAssembler {
   inline void xvrdpim(  VectorSRegister d, VectorSRegister b);
   inline void xvrdpip(  VectorSRegister d, VectorSRegister b);
 
+  inline void xsminjdp( VectorSRegister d, VectorSRegister a, VectorSRegister b); // Requires Power 9
+  inline void xsmaxjdp( VectorSRegister d, VectorSRegister a, VectorSRegister b); // Requires Power 9
+
   // The following functions do not match exactly the Java.math semantics.
   inline void xvminsp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
   inline void xvmindp(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index 7e49ec7455d..bd6f3300606 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -908,6 +908,9 @@ inline void Assembler::xvrdpic(   VectorSRegister d, VectorSRegister b)
 inline void Assembler::xvrdpim(   VectorSRegister d, VectorSRegister b)                  { emit_int32( XVRDPIM_OPCODE | vsrt(d) | vsrb(b)); }
 inline void Assembler::xvrdpip(   VectorSRegister d, VectorSRegister b)                  { emit_int32( XVRDPIP_OPCODE | vsrt(d) | vsrb(b)); }
 
+inline void Assembler::xsminjdp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XSMINJDP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
+inline void Assembler::xsmaxjdp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XSMAXJDP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
+
 inline void Assembler::xvminsp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMINSP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
 inline void Assembler::xvmindp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMINDP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
 inline void Assembler::xvmaxsp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMAXSP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
@@ -923,6 +926,10 @@ inline void Assembler::xxmrghw( VectorSRegister d, VectorSRegister a, VectorSReg
 inline void Assembler::xxmrglw( VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XXMRGHW_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); }
 inline void Assembler::xxsel(   VectorSRegister d, VectorSRegister a, VectorSRegister b, VectorSRegister c) { emit_int32( XXSEL_OPCODE | vsrt(d) | vsra(a) | vsrb(b) | vsrc(c)); }
 
+inline void Assembler::xscmpeqdp(VectorSRegister t, VectorSRegister a, VectorSRegister b) { emit_int32( XSCMPEQDP_OPCODE | vsrt(t) | vsra(a) | vsrb(b) );}
+inline void Assembler::xscmpgedp(VectorSRegister t, VectorSRegister a, VectorSRegister b) { emit_int32( XSCMPGEDP_OPCODE | vsrt(t) | vsra(a) | vsrb(b) );}
+inline void Assembler::xscmpgtdp(VectorSRegister t, VectorSRegister a, VectorSRegister b) { emit_int32( XSCMPGTDP_OPCODE | vsrt(t) | vsra(a) | vsrb(b) );}
+
 // VSX Extended Mnemonics
 inline void Assembler::xxspltd( VectorSRegister d, VectorSRegister a, int x)             { xxpermdi(d, a, a, x ? 3 : 0); }
 inline void Assembler::xxmrghd( VectorSRegister d, VectorSRegister a, VectorSRegister b) { xxpermdi(d, a, b, 0); }
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
index edf348fdc50..8bbffc22c54 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -600,19 +601,21 @@ void C2_MacroAssembler::count_positives(Register src, Register cnt, Register res
   orr(tmp0, tmp2, tmp0);
 
   and_(tmp0, tmp0, tmp1);
-  bne(CR0, Lslow);               // Found negative byte.
+  bne(CR0, Lslow);                // Found negative byte.
   addi(result, result, 16);
   bdnz(Lfastloop);
 
   bind(Lslow);                    // Fallback to slow version.
   subf(tmp0, src, result);        // Bytes known positive.
-  subf_(tmp0, tmp0, cnt);         // Remaining Bytes.
+  clrldi(tmp1, cnt, 32);          // Clear garbage from upper 32 bits.
+  subf_(tmp0, tmp0, tmp1);        // Remaining Bytes.
   beq(CR0, Ldone);
   mtctr(tmp0);
+
   bind(Lloop);
   lbz(tmp0, 0, result);
   andi_(tmp0, tmp0, 0x80);
-  bne(CR0, Ldone);               // Found negative byte.
+  bne(CR0, Ldone);                // Found negative byte.
   addi(result, result, 1);
   bdnz(Lloop);
 
@@ -664,3 +667,37 @@ void C2_MacroAssembler::reduceI(int opcode, Register dst, Register iSrc, VectorR
   fn_scalar_op(opcode, dst, iSrc, R0);    // dst   <- op(iSrc, R0)
 }
 
+// Works for single and double precision floats.
+// dst = (op1 cmp(cc) op2) ? src1 : src2;
+// Unordered semantics are the same as for CmpF3Node/CmpD3Node which implement the fcmpl/dcmpl bytecodes.
+// Comparing unordered values has the same result as when src1 is less than src2.
+// So dst = src1 for <, <=, != and dst = src2 for >, >=, ==.
+void C2_MacroAssembler::cmovF(int cc, VectorSRegister dst, VectorSRegister op1, VectorSRegister op2,
+                              VectorSRegister src1, VectorSRegister src2, VectorSRegister tmp) {
+  // See operand cmpOp() for details.
+  bool invert_cond = (cc & 8) == 0; // invert reflects bcondCRbiIs0
+  auto cmp = (Assembler::Condition)(cc & 3);
+
+  switch(cmp) {
+  case Assembler::Condition::equal:
+    // Use false_result if "unordered".
+    xscmpeqdp(tmp, op1, op2);
+    break;
+  case Assembler::Condition::greater:
+    // Use false_result if "unordered".
+    xscmpgtdp(tmp, op1, op2);
+    break;
+  case Assembler::Condition::less:
+    // Use true_result if "unordered".
+    xscmpgedp(tmp, op1, op2);
+    invert_cond = !invert_cond;
+    break;
+  default:
+    assert(false, "unsupported compare condition: %d", cc);
+    ShouldNotReachHere();
+  }
+
+  VectorSRegister true_result  = invert_cond ? src2 : src1;
+  VectorSRegister false_result = invert_cond ? src1 : src2;
+  xxsel(dst, false_result, true_result, tmp);
+}
diff --git a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
index 5a114294c1f..e0dffec8396 100644
--- a/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp
@@ -74,5 +74,7 @@
   void count_positives(Register src, Register cnt, Register result, Register tmp1, Register tmp2);
 
   void reduceI(int opcode, Register dst, Register iSrc, VectorRegister vSrc, VectorRegister vTmp1, VectorRegister vTmp2);
+  void cmovF(int cc, VectorSRegister dst, VectorSRegister op1, VectorSRegister op2,
+             VectorSRegister src1, VectorSRegister src2, VectorSRegister tmp);
 
 #endif // CPU_PPC_C2_MACROASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
index d5a0ff10994..caef322d4a1 100644
--- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2019 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ define_pd_global(intx, CompileThreshold,             10000);
 
 define_pd_global(intx, OnStackReplacePercentage,     140);
 define_pd_global(intx, ConditionalMoveLimit,         3);
-define_pd_global(intx, FreqInlineSize,               175);
+define_pd_global(intx, FreqInlineSize,               325);
 define_pd_global(intx, MinJumpTableSize,             10);
 define_pd_global(intx, InteriorEntryAlignment,       16);
 define_pd_global(size_t, NewSizeThreadIncrease,      ScaleForWordSize(4*K));
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
index 8712c75711d..82d06f6c685 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -275,6 +275,11 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
   return opto_reg;
 }
 
+void BarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  // Load the oop from the weak handle.
+  __ ld(obj, 0, obj);
+}
+
 #undef __
 #define __ _masm->
 
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
index 2bf26bd5010..d78071f2ee0 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -81,6 +81,8 @@ public:
 
 #ifdef COMPILER2
   OptoReg::Name refine_register(const Node* node, OptoReg::Name opto_reg) const;
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj,
+                                             Register tmp, Label& slow_path);
 #endif // COMPILER2
 };
 
diff --git a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp
index 7404f7e2e5c..297ce57a394 100644
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp
@@ -103,8 +103,7 @@ void CardTableBarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Registe
 
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr,
                                                                     Register count, Register preserve) {
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  CardTable* ct = ctbs->card_table();
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
   assert_different_registers(addr, count, R0);
 
   Label Lskip_loop, Lstore_loop;
@@ -117,7 +116,7 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
   __ srdi(addr, addr, CardTable::card_shift());
   __ srdi(count, count, CardTable::card_shift());
   __ subf(count, addr, count);
-  __ add_const_optimized(addr, addr, (address)ct->byte_map_base(), R0);
+  __ add_const_optimized(addr, addr, (address)ctbs->card_table_base_const(), R0);
   __ addi(count, count, 1);
   __ li(R0, 0);
   __ mtctr(count);
@@ -140,8 +139,8 @@ void CardTableBarrierSetAssembler::card_table_write(MacroAssembler* masm,
 }
 
 void CardTableBarrierSetAssembler::card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register tmp) {
-  CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  card_table_write(masm, bs->card_table()->byte_map_base(), tmp, store_addr);
+  CardTableBarrierSet* bs = CardTableBarrierSet::barrier_set();
+  card_table_write(masm, bs->card_table_base_const(), tmp, store_addr);
 }
 
 void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
index 1f1bc7622ed..e1f0416d65d 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2025, Red Hat, Inc. All rights reserved.
  * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,14 +51,14 @@
 
 #define __ masm->
 
-void ShenandoahBarrierSetAssembler::satb_write_barrier(MacroAssembler *masm,
-                                                       Register base, RegisterOrConstant ind_or_offs,
-                                                       Register tmp1, Register tmp2, Register tmp3,
-                                                       MacroAssembler::PreservationLevel preservation_level) {
+void ShenandoahBarrierSetAssembler::satb_barrier(MacroAssembler *masm,
+                                                 Register base, RegisterOrConstant ind_or_offs,
+                                                 Register tmp1, Register tmp2, Register tmp3,
+                                                 MacroAssembler::PreservationLevel preservation_level) {
   if (ShenandoahSATBBarrier) {
-    __ block_comment("satb_write_barrier (shenandoahgc) {");
-    satb_write_barrier_impl(masm, 0, base, ind_or_offs, tmp1, tmp2, tmp3, preservation_level);
-    __ block_comment("} satb_write_barrier (shenandoahgc)");
+    __ block_comment("satb_barrier (shenandoahgc) {");
+    satb_barrier_impl(masm, 0, base, ind_or_offs, tmp1, tmp2, tmp3, preservation_level);
+    __ block_comment("} satb_barrier (shenandoahgc)");
   }
 }
 
@@ -198,11 +199,12 @@ void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Dec
 //              In "load mode", this register acts as a temporary register and must
 //              thus not be 'noreg'.  In "preloaded mode", its content will be sustained.
 // tmp1/tmp2:   Temporary registers, one of which must be non-volatile in "preloaded mode".
-void ShenandoahBarrierSetAssembler::satb_write_barrier_impl(MacroAssembler *masm, DecoratorSet decorators,
-                                                            Register base, RegisterOrConstant ind_or_offs,
-                                                            Register pre_val,
-                                                            Register tmp1, Register tmp2,
-                                                            MacroAssembler::PreservationLevel preservation_level) {
+void ShenandoahBarrierSetAssembler::satb_barrier_impl(MacroAssembler *masm, DecoratorSet decorators,
+                                                      Register base, RegisterOrConstant ind_or_offs,
+                                                      Register pre_val,
+                                                      Register tmp1, Register tmp2,
+                                                      MacroAssembler::PreservationLevel preservation_level) {
+  assert(ShenandoahSATBBarrier, "Should be checked by caller");
   assert_different_registers(tmp1, tmp2, pre_val, noreg);
 
   Label skip_barrier;
@@ -574,13 +576,13 @@ void ShenandoahBarrierSetAssembler::load_at(
   if (ShenandoahBarrierSet::need_keep_alive_barrier(decorators, type)) {
     if (ShenandoahSATBBarrier) {
       __ block_comment("keep_alive_barrier (shenandoahgc) {");
-      satb_write_barrier_impl(masm, 0, noreg, noreg, dst, tmp1, tmp2, preservation_level);
+      satb_barrier_impl(masm, 0, noreg, noreg, dst, tmp1, tmp2, preservation_level);
       __ block_comment("} keep_alive_barrier (shenandoahgc)");
     }
   }
 }
 
-void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register base, RegisterOrConstant ind_or_offs, Register tmp) {
+void ShenandoahBarrierSetAssembler::card_barrier(MacroAssembler* masm, Register base, RegisterOrConstant ind_or_offs, Register tmp) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
   assert_different_registers(base, tmp, R0);
 
@@ -603,21 +605,33 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler *masm, DecoratorSet
                                              Register base, RegisterOrConstant ind_or_offs, Register val,
                                              Register tmp1, Register tmp2, Register tmp3,
                                              MacroAssembler::PreservationLevel preservation_level) {
-  if (is_reference_type(type)) {
-    if (ShenandoahSATBBarrier) {
-      satb_write_barrier(masm, base, ind_or_offs, tmp1, tmp2, tmp3, preservation_level);
-    }
+  // 1: non-reference types require no barriers
+  if (!is_reference_type(type)) {
+    BarrierSetAssembler::store_at(masm, decorators, type,
+                                  base, ind_or_offs,
+                                  val,
+                                  tmp1, tmp2, tmp3,
+                                  preservation_level);
+    return;
   }
 
+  bool storing_non_null = (val != noreg);
+
+  // 2: pre-barrier: SATB needs the previous value
+  if (ShenandoahBarrierSet::need_satb_barrier(decorators, type)) {
+    satb_barrier(masm, base, ind_or_offs, tmp1, tmp2, tmp3, preservation_level);
+  }
+
+  // Store!
   BarrierSetAssembler::store_at(masm, decorators, type,
                                 base, ind_or_offs,
                                 val,
                                 tmp1, tmp2, tmp3,
                                 preservation_level);
 
-  // No need for post barrier if storing null
-  if (ShenandoahCardBarrier && is_reference_type(type) && val != noreg) {
-    store_check(masm, base, ind_or_offs, tmp1);
+  // 3: post-barrier: card barrier needs store address
+  if (ShenandoahBarrierSet::need_card_barrier(decorators, type) && storing_non_null) {
+    card_barrier(masm, base, ind_or_offs, tmp1);
   }
 }
 
@@ -649,6 +663,33 @@ void ShenandoahBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler
   __ block_comment("} try_resolve_jobject_in_native (shenandoahgc)");
 }
 
+#ifdef COMPILER2
+void ShenandoahBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler *masm, Register obj,
+                                                                  Register tmp, Label &slow_path) {
+  __ block_comment("try_resolve_weak_handle_in_c2 (shenandoahgc) {");
+
+  assert_different_registers(obj, tmp);
+
+  Label done;
+
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, tmp, slow_path);
+
+  // Check if the reference is null, and if it is, take the fast path.
+  __ cmpdi(CR0, obj, 0);
+  __ beq(CR0, done);
+
+  // Check if the heap is under weak-reference/roots processing, in
+  // which case we need to take the slow path.
+  __ lbz(tmp, in_bytes(ShenandoahThreadLocalData::gc_state_offset()), R16_thread);
+  __ andi_(tmp, tmp, ShenandoahHeap::WEAK_ROOTS);
+  __ bne(CR0, slow_path);
+  __ bind(done);
+
+  __ block_comment("} try_resolve_weak_handle_in_c2 (shenandoahgc)");
+}
+#endif
+
 // Special shenandoah CAS implementation that handles false negatives due
 // to concurrent evacuation.  That is, the CAS operation is intended to succeed in
 // the following scenarios (success criteria):
@@ -771,9 +812,6 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler *masm, Register b
 void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                      Register addr, Register count, Register preserve) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
-
-  ShenandoahBarrierSet* bs = ShenandoahBarrierSet::barrier_set();
-  CardTable* ct = bs->card_table();
   assert_different_registers(addr, count, R0);
 
   Label L_skip_loop, L_store_loop;
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp
index b058dcf1a2e..672f8122bcb 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2022, Red Hat, Inc. All rights reserved.
  * Copyright (c) 2012, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,15 +46,15 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
 private:
 
   /* ==== Actual barrier implementations ==== */
-  void satb_write_barrier_impl(MacroAssembler* masm, DecoratorSet decorators,
-                               Register base, RegisterOrConstant ind_or_offs,
-                               Register pre_val,
-                               Register tmp1, Register tmp2,
-                               MacroAssembler::PreservationLevel preservation_level);
+  void satb_barrier_impl(MacroAssembler* masm, DecoratorSet decorators,
+                         Register base, RegisterOrConstant ind_or_offs,
+                         Register pre_val,
+                         Register tmp1, Register tmp2,
+                         MacroAssembler::PreservationLevel preservation_level);
 
-  void store_check(MacroAssembler* masm,
-                   Register base, RegisterOrConstant ind_or_offs,
-                   Register tmp);
+  void card_barrier(MacroAssembler* masm,
+                    Register base, RegisterOrConstant ind_or_offs,
+                    Register tmp);
 
   void load_reference_barrier_impl(MacroAssembler* masm, DecoratorSet decorators,
                                    Register base, RegisterOrConstant ind_or_offs,
@@ -85,10 +86,10 @@ public:
 #endif
 
   /* ==== Available barriers (facades of the actual implementations) ==== */
-  void satb_write_barrier(MacroAssembler* masm,
-                          Register base, RegisterOrConstant ind_or_offs,
-                          Register tmp1, Register tmp2, Register tmp3,
-                          MacroAssembler::PreservationLevel preservation_level);
+  void satb_barrier(MacroAssembler* masm,
+                    Register base, RegisterOrConstant ind_or_offs,
+                    Register tmp1, Register tmp2, Register tmp3,
+                    MacroAssembler::PreservationLevel preservation_level);
 
   void load_reference_barrier(MacroAssembler* masm, DecoratorSet decorators,
                               Register base, RegisterOrConstant ind_or_offs,
@@ -121,6 +122,9 @@ public:
 
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register dst, Register jni_env,
                                              Register obj, Register tmp, Label& slowpath);
+#ifdef COMPILER2
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
+#endif
 };
 
 #endif // CPU_PPC_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
index 0aa5858c8e6..bfa3c87c179 100644
--- a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -950,6 +950,19 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
   __ b(*stub->continuation());
 }
 
+void ZBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, tmp, slow_path);
+
+  // Check if the oop is bad, in which case we need to take the slow path.
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatMarkBadMask);
+  __ andi_(R0, obj, barrier_Relocation::unpatched);
+  __ bne(CR0, slow_path);
+
+  // Oop is okay, so we uncolor it.
+  __ srdi(obj, obj, ZPointerLoadShift);
+}
+
 #undef __
 #endif // COMPILER2
 
diff --git a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
index 27203e7b01c..e31817370d9 100644
--- a/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -108,6 +108,8 @@ public:
   void generate_c2_load_barrier_stub(MacroAssembler* masm, ZLoadBarrierStubC2* stub) const;
 
   void generate_c2_store_barrier_stub(MacroAssembler* masm, ZStoreBarrierStubC2* stub) const;
+
+  void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
 #endif // COMPILER2
 
   void store_barrier_fast(MacroAssembler* masm,
diff --git a/src/hotspot/cpu/ppc/globals_ppc.hpp b/src/hotspot/cpu/ppc/globals_ppc.hpp
index 41a8e821ada..927a8cc2be3 100644
--- a/src/hotspot/cpu/ppc/globals_ppc.hpp
+++ b/src/hotspot/cpu/ppc/globals_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -60,7 +60,7 @@ define_pd_global(bool,  VMContinuations, true);
 
 // Use large code-entry alignment.
 define_pd_global(size_t, CodeCacheSegmentSize,  128);
-define_pd_global(intx,   CodeEntryAlignment,    64);
+define_pd_global(uint,   CodeEntryAlignment,    64);
 define_pd_global(intx,   OptoLoopAlignment,     16);
 define_pd_global(intx,   InlineSmallCode,       1500);
 
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index fc865be015e..f7bf457f72c 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -1109,11 +1109,11 @@ void InterpreterMacroAssembler::verify_method_data_pointer() {
   lhz(R11_scratch1, in_bytes(DataLayout::bci_offset()), R28_mdx);
   ld(R12_scratch2, in_bytes(Method::const_offset()), R19_method);
   addi(R11_scratch1, R11_scratch1, in_bytes(ConstMethod::codes_offset()));
-  add(R11_scratch1, R12_scratch2, R12_scratch2);
+  add(R11_scratch1, R11_scratch1, R12_scratch2);
   cmpd(CR0, R11_scratch1, R14_bcp);
   beq(CR0, verify_continue);
 
-  call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::verify_mdp ), R19_method, R14_bcp, R28_mdx);
+  call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::verify_mdp), R19_method, R14_bcp, R28_mdx);
 
   bind(verify_continue);
 #endif
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 5649ead2ea8..986dd335816 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -42,6 +42,7 @@
 #include "runtime/icache.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/objectMonitor.hpp"
+#include "runtime/objectMonitorTable.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.hpp"
@@ -2756,39 +2757,54 @@ void MacroAssembler::compiler_fast_lock_object(ConditionRegister flag, Register
       addi(owner_addr, mark, in_bytes(ObjectMonitor::owner_offset()) - monitor_tag);
       mark = noreg;
     } else {
+      const Register tmp3_bucket = tmp3;
+      const Register tmp2_hash = tmp2;
       Label monitor_found;
-      Register cache_addr = tmp2;
 
-      // Load cache address
-      addi(cache_addr, R16_thread, in_bytes(JavaThread::om_cache_oops_offset()));
+      // Save the mark, we might need it to extract the hash.
+      mr(tmp2_hash, mark);
 
-      const int num_unrolled = 2;
+      // Look for the monitor in the om_cache.
+
+      ByteSize cache_offset   = JavaThread::om_cache_oops_offset();
+      ByteSize monitor_offset = OMCache::oop_to_monitor_difference();
+      const int num_unrolled  = OMCache::CAPACITY;
       for (int i = 0; i < num_unrolled; i++) {
-        ld(R0, 0, cache_addr);
+        ld(R0, in_bytes(cache_offset), R16_thread);
+        ld(monitor, in_bytes(cache_offset + monitor_offset), R16_thread);
         cmpd(CR0, R0, obj);
         beq(CR0, monitor_found);
-        addi(cache_addr, cache_addr, in_bytes(OMCache::oop_to_oop_difference()));
+        cache_offset = cache_offset + OMCache::oop_to_oop_difference();
       }
 
-      Label loop;
+      // Look for the monitor in the table.
 
-      // Search for obj in cache.
-      bind(loop);
+      // Get the hash code.
+      srdi(tmp2_hash, tmp2_hash, markWord::hash_shift);
 
-      // Check for match.
-      ld(R0, 0, cache_addr);
-      cmpd(CR0, R0, obj);
-      beq(CR0, monitor_found);
+      // Get the table and calculate the bucket's address
+      int simm16_rest = load_const_optimized(tmp3, ObjectMonitorTable::current_table_address(), R0, true);
+      ld_ptr(tmp3, simm16_rest, tmp3);
+      ld(tmp1, in_bytes(ObjectMonitorTable::table_capacity_mask_offset()), tmp3);
+      andr(tmp2_hash, tmp2_hash, tmp1);
+      ld(tmp3_bucket, in_bytes(ObjectMonitorTable::table_buckets_offset()), tmp3);
 
-      // Search until null encountered, guaranteed _null_sentinel at end.
-      addi(cache_addr, cache_addr, in_bytes(OMCache::oop_to_oop_difference()));
-      cmpdi(CR1, R0, 0);
-      bne(CR1, loop);
-      // Cache Miss, CR0.NE set from cmp above
-      b(slow_path);
+      // Read the monitor from the bucket.
+      sldi(tmp2_hash, tmp2_hash, LogBytesPerWord);
+      ldx(monitor, tmp3_bucket, tmp2_hash);
+
+      // Check if the monitor in the bucket is special (empty, tombstone or removed).
+      cmpldi(CR0, monitor, ObjectMonitorTable::SpecialPointerValues::below_is_special);
+      blt(CR0, slow_path);
+
+      // Check if object matches.
+      ld(tmp3, in_bytes(ObjectMonitor::object_offset()), monitor);
+      BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
+      bs_asm->try_resolve_weak_handle_in_c2(this, tmp3, tmp2, slow_path);
+      cmpd(CR0, tmp3, obj);
+      bne(CR0, slow_path);
 
       bind(monitor_found);
-      ld(monitor, in_bytes(OMCache::oop_to_monitor_difference()), cache_addr);
 
       // Compute owner address.
       addi(owner_addr, monitor, in_bytes(ObjectMonitor::owner_offset()));
@@ -4535,7 +4551,7 @@ void MacroAssembler::push_cont_fastpath() {
   Label done;
   ld_ptr(R0, JavaThread::cont_fastpath_offset(), R16_thread);
   cmpld(CR0, R1_SP, R0);
-  ble(CR0, done);
+  ble(CR0, done);          // if (SP <= _cont_fastpath) goto done;
   st_ptr(R1_SP, JavaThread::cont_fastpath_offset(), R16_thread);
   bind(done);
 }
@@ -4546,7 +4562,7 @@ void MacroAssembler::pop_cont_fastpath() {
   Label done;
   ld_ptr(R0, JavaThread::cont_fastpath_offset(), R16_thread);
   cmpld(CR0, R1_SP, R0);
-  ble(CR0, done);
+  blt(CR0, done);          // if (SP < _cont_fastpath) goto done;
   li(R0, 0);
   st_ptr(R0, JavaThread::cont_fastpath_offset(), R16_thread);
   bind(done);
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
index 875602cae58..58dec702d7a 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/cpu/ppc/matcher_ppc.hpp b/src/hotspot/cpu/ppc/matcher_ppc.hpp
index aad41fb7b1c..2ddbec3e48c 100644
--- a/src/hotspot/cpu/ppc/matcher_ppc.hpp
+++ b/src/hotspot/cpu/ppc/matcher_ppc.hpp
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,12 +65,10 @@
     return true;
   }
 
-  // Use conditional move (CMOVL) on Power7.
   static constexpr int long_cmove_cost() { return 0; } // this only makes long cmoves more expensive than int cmoves
 
-  // Suppress CMOVF. Conditional move available (sort of) on PPC64 only from P7 onwards. Not exploited yet.
-  // fsel doesn't accept a condition register as input, so this would be slightly different.
-  static int float_cmove_cost() { return ConditionalMoveLimit; }
+  // Suppress CMOVF for Power8 because there are no fast nodes.
+  static int float_cmove_cost() { return (PowerArchitecturePPC64 >= 9) ? 0 : ConditionalMoveLimit; }
 
   // This affects two different things:
   //  - how Decode nodes are matched
diff --git a/src/hotspot/cpu/ppc/methodHandles_ppc.cpp b/src/hotspot/cpu/ppc/methodHandles_ppc.cpp
index 803bb6bfe69..45537e0ea96 100644
--- a/src/hotspot/cpu/ppc/methodHandles_ppc.cpp
+++ b/src/hotspot/cpu/ppc/methodHandles_ppc.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,11 +49,6 @@
 
 #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
 
-// Workaround for C++ overloading nastiness on '0' for RegisterOrConstant.
-inline static RegisterOrConstant constant(int value) {
-  return RegisterOrConstant(value);
-}
-
 void MethodHandles::load_klass_from_Class(MacroAssembler* _masm, Register klass_reg,
                                           Register temp_reg, Register temp2_reg) {
   if (VerifyMethodHandles) {
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 2a0a9149bb3..4cb9f8820a0 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -1,6 +1,6 @@
 //
-// Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+// Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2012, 2026 SAP SE. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -2234,6 +2234,12 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_FmaVD:
       return (SuperwordUseVSX && UseFMA);
 
+    case Op_MinF:
+    case Op_MaxF:
+    case Op_MinD:
+    case Op_MaxD:
+      return (PowerArchitecturePPC64 >= 9);
+
     case Op_Digit:
       return vmIntrinsics::is_intrinsic_available(vmIntrinsics::_isDigit);
     case Op_LowerCase:
@@ -3024,7 +3030,6 @@ encode %{
   %}
 
   enc_class postalloc_expand_encode_oop(iRegNdst dst, iRegPdst src, flagsReg crx) %{
-    // use isel instruction with Power 7
     cmpP_reg_imm16Node *n_compare  = new cmpP_reg_imm16Node();
     encodeP_subNode    *n_sub_base = new encodeP_subNode();
     encodeP_shiftNode  *n_shift    = new encodeP_shiftNode();
@@ -3099,7 +3104,6 @@ encode %{
     n_shift->_opnds[1] = op_src;
     n_shift->_bottom_type = _bottom_type;
 
-    // use isel instruction with Power 7
     decodeN_addNode *n_add_base = new decodeN_addNode();
     n_add_base->add_req(n_region, n_shift);
     n_add_base->_opnds[0] = op_dst;
@@ -6618,7 +6622,6 @@ instruct cond_sub_base(iRegNdst dst, flagsRegSrc crx, iRegPsrc src1) %{
   ins_pipe(pipe_class_default);
 %}
 
-// Power 7 can use isel instruction
 instruct cond_set_0_oop(iRegNdst dst, flagsRegSrc crx, iRegPsrc src1) %{
   // The match rule is needed to make it a 'MachTypeNode'!
   match(Set dst (EncodeP (Binary crx src1)));
@@ -7293,7 +7296,6 @@ instruct cmovF_reg(cmpOp cmp, flagsRegSrc crx, regF dst, regF src) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "CMOVEF  $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode %{
     Label done;
@@ -7313,7 +7315,6 @@ instruct cmovD_reg(cmpOp cmp, flagsRegSrc crx, regD dst, regD src) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "CMOVEF  $cmp, $crx, $dst, $src\n\t" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode %{
     Label done;
@@ -7326,6 +7327,70 @@ instruct cmovD_reg(cmpOp cmp, flagsRegSrc crx, regD dst, regD src) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct cmovF_cmpF(cmpOp cop, regF op1, regF op2, regF dst, regF false_result, regF true_result, regD tmp) %{
+  match(Set dst (CMoveF (Binary cop (CmpF op1 op2)) (Binary false_result true_result)));
+  predicate(PowerArchitecturePPC64 >= 9);
+  effect(TEMP tmp);
+  ins_cost(2*DEFAULT_COST);
+  format %{ "cmovF_cmpF  $dst = ($op1 $cop $op2) ? $true_result : $false_result\n\t" %}
+  size(8);
+  ins_encode %{
+    __ cmovF($cop$$cmpcode, $dst$$FloatRegister->to_vsr(),
+             $op1$$FloatRegister->to_vsr(), $op2$$FloatRegister->to_vsr(),
+             $true_result$$FloatRegister->to_vsr(), $false_result$$FloatRegister->to_vsr(),
+             $tmp$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct cmovF_cmpD(cmpOp cop, regD op1, regD op2, regF dst, regF false_result, regF true_result, regD tmp) %{
+  match(Set dst (CMoveF (Binary cop (CmpD op1 op2)) (Binary false_result true_result)));
+  predicate(PowerArchitecturePPC64 >= 9);
+  effect(TEMP tmp);
+  ins_cost(2*DEFAULT_COST);
+  format %{ "cmovF_cmpD  $dst = ($op1 $cop $op2) ? $true_result : $false_result\n\t" %}
+  size(8);
+  ins_encode %{
+    __ cmovF($cop$$cmpcode, $dst$$FloatRegister->to_vsr(),
+             $op1$$FloatRegister->to_vsr(), $op2$$FloatRegister->to_vsr(),
+             $true_result$$FloatRegister->to_vsr(), $false_result$$FloatRegister->to_vsr(),
+             $tmp$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct cmovD_cmpD(cmpOp cop, regD op1, regD op2, regD dst, regD false_result, regD true_result, regD tmp) %{
+  match(Set dst (CMoveD (Binary cop (CmpD op1 op2)) (Binary false_result true_result)));
+  predicate(PowerArchitecturePPC64 >= 9);
+  effect(TEMP tmp);
+  ins_cost(2*DEFAULT_COST);
+  format %{ "cmovD_cmpD  $dst = ($op1 $cop $op2) ? $true_result : $false_result\n\t" %}
+  size(8);
+  ins_encode %{
+    __ cmovF($cop$$cmpcode, $dst$$FloatRegister->to_vsr(),
+             $op1$$FloatRegister->to_vsr(), $op2$$FloatRegister->to_vsr(),
+             $true_result$$FloatRegister->to_vsr(), $false_result$$FloatRegister->to_vsr(),
+             $tmp$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct cmovD_cmpF(cmpOp cop, regF op1, regF op2, regD dst, regD false_result, regD true_result, regD tmp) %{
+  match(Set dst (CMoveD (Binary cop (CmpF op1 op2)) (Binary false_result true_result)));
+  predicate(PowerArchitecturePPC64 >= 9);
+  effect(TEMP tmp);
+  ins_cost(2*DEFAULT_COST);
+  format %{ "cmovD_cmpF  $dst = ($op1 $cop $op2) ? $true_result : $false_result\n\t" %}
+  size(8);
+  ins_encode %{
+    __ cmovF($cop$$cmpcode, $dst$$FloatRegister->to_vsr(),
+             $op1$$FloatRegister->to_vsr(), $op2$$FloatRegister->to_vsr(),
+             $true_result$$FloatRegister->to_vsr(), $false_result$$FloatRegister->to_vsr(),
+             $tmp$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 //----------Compare-And-Swap---------------------------------------------------
 
 // CompareAndSwap{P,I,L} have more than one output, therefore "CmpI
@@ -8492,7 +8557,6 @@ instruct cmovI_bne_negI_reg(iRegIdst dst, flagsRegSrc crx, iRegIsrc src1) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "CMOVE   $dst, neg($src1), $crx" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode %{
     Label done;
@@ -8551,7 +8615,6 @@ instruct cmovL_bne_negL_reg(iRegLdst dst, flagsRegSrc crx, iRegLsrc src1) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "CMOVE   $dst, neg($src1), $crx" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode %{
     Label done;
@@ -10262,7 +10325,6 @@ instruct cmovI_bso_stackSlotL(iRegIdst dst, flagsRegSrc crx, stackSlotL src) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "cmovI   $crx, $dst, $src" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode( enc_cmove_bso_stackSlotL(dst, crx, src) );
   ins_pipe(pipe_class_default);
@@ -10276,7 +10338,6 @@ instruct cmovI_bso_reg(iRegIdst dst, flagsRegSrc crx, regD src) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "cmovI   $crx, $dst, $src" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode( enc_cmove_bso_reg(dst, crx, src) );
   ins_pipe(pipe_class_default);
@@ -10439,7 +10500,6 @@ instruct cmovL_bso_stackSlotL(iRegLdst dst, flagsRegSrc crx, stackSlotL src) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "cmovL   $crx, $dst, $src" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode( enc_cmove_bso_stackSlotL(dst, crx, src) );
   ins_pipe(pipe_class_default);
@@ -10453,7 +10513,6 @@ instruct cmovL_bso_reg(iRegLdst dst, flagsRegSrc crx, regD src) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "cmovL   $crx, $dst, $src" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(8);
   ins_encode( enc_cmove_bso_reg(dst, crx, src) );
   ins_pipe(pipe_class_default);
@@ -11080,7 +11139,6 @@ instruct cmov_bns_less(flagsReg crx) %{
   ins_variable_size_depending_on_alignment(true);
 
   format %{ "cmov    $crx" %}
-  // Worst case is branch + move + stop, no stop without scheduler.
   size(12);
   ins_encode %{
     Label done;
@@ -12261,6 +12319,58 @@ instruct maxI_reg_reg_isel(iRegIdst dst, iRegIsrc src1, iRegIsrc src2, flagsRegC
   ins_pipe(pipe_class_default);
 %}
 
+instruct minF(regF dst, regF src1, regF src2) %{
+  match(Set dst (MinF src1 src2));
+  predicate(PowerArchitecturePPC64 >= 9);
+  ins_cost(DEFAULT_COST);
+
+  format %{ "MinF $dst, $src1, $src2" %}
+  size(4);
+  ins_encode %{
+    __ xsminjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct minD(regD dst, regD src1, regD src2) %{
+  match(Set dst (MinD src1 src2));
+  predicate(PowerArchitecturePPC64 >= 9);
+  ins_cost(DEFAULT_COST);
+
+  format %{ "MinD $dst, $src1, $src2" %}
+  size(4);
+  ins_encode %{
+    __ xsminjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct maxF(regF dst, regF src1, regF src2) %{
+  match(Set dst (MaxF src1 src2));
+  predicate(PowerArchitecturePPC64 >= 9);
+  ins_cost(DEFAULT_COST);
+
+  format %{ "MaxF $dst, $src1, $src2" %}
+  size(4);
+  ins_encode %{
+    __ xsmaxjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct maxD(regD dst, regD src1, regD src2) %{
+  match(Set dst (MaxD src1 src2));
+  predicate(PowerArchitecturePPC64 >= 9);
+  ins_cost(DEFAULT_COST);
+
+  format %{ "MaxD $dst, $src1, $src2" %}
+  size(4);
+  ins_encode %{
+    __ xsmaxjdp($dst$$FloatRegister->to_vsr(), $src1$$FloatRegister->to_vsr(), $src2$$FloatRegister->to_vsr());
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 //---------- Population Count Instructions ------------------------------------
 
 instruct popCountI(iRegIdst dst, iRegIsrc src) %{
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 4e427ace404..5260ed978ff 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -775,7 +775,6 @@ int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
   return stk;
 }
 
-#if defined(COMPILER1) || defined(COMPILER2)
 // Calling convention for calling C code.
 int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
                                         VMRegPair *regs,
@@ -913,7 +912,6 @@ int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
   return MAX2(arg, 8) * 2 + additional_frame_header_slots;
 #endif
 }
-#endif // COMPILER2
 
 int SharedRuntime::vector_calling_convention(VMRegPair *regs,
                                              uint num_bits,
@@ -1237,26 +1235,24 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
 
   // Class initialization barrier for static methods
   entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
-  if (VM_Version::supports_fast_class_init_checks()) {
-    Label L_skip_barrier;
+  assert(VM_Version::supports_fast_class_init_checks(), "sanity");
+  Label L_skip_barrier;
 
-    { // Bypass the barrier for non-static methods
-      __ lhz(R0, in_bytes(Method::access_flags_offset()), R19_method);
-      __ andi_(R0, R0, JVM_ACC_STATIC);
-      __ beq(CR0, L_skip_barrier); // non-static
-    }
+  // Bypass the barrier for non-static methods
+  __ lhz(R0, in_bytes(Method::access_flags_offset()), R19_method);
+  __ andi_(R0, R0, JVM_ACC_STATIC);
+  __ beq(CR0, L_skip_barrier); // non-static
 
-    Register klass = R11_scratch1;
-    __ load_method_holder(klass, R19_method);
-    __ clinit_barrier(klass, R16_thread, &L_skip_barrier /*L_fast_path*/);
+  Register klass = R11_scratch1;
+  __ load_method_holder(klass, R19_method);
+  __ clinit_barrier(klass, R16_thread, &L_skip_barrier /*L_fast_path*/);
 
-    __ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub(), R0);
-    __ mtctr(klass);
-    __ bctr();
+  __ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub(), R0);
+  __ mtctr(klass);
+  __ bctr();
 
-    __ bind(L_skip_barrier);
-    entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
-  }
+  __ bind(L_skip_barrier);
+  entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
 
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->c2i_entry_barrier(masm, /* tmp register*/ ic_klass, /* tmp register*/ receiver_klass, /* tmp register*/ code);
@@ -2210,7 +2206,8 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   // --------------------------------------------------------------------------
   vep_start_pc = (intptr_t)__ pc();
 
-  if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
+  if (method->needs_clinit_barrier()) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     Label L_skip_barrier;
     Register klass = r_temp_1;
     // Notify OOP recorder (don't need the relocation)
@@ -2875,7 +2872,6 @@ void SharedRuntime::generate_deopt_blob() {
   CodeBuffer buffer(name, 2048, 1024);
   InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
   Label exec_mode_initialized;
-  int frame_size_in_words;
   OopMap* map = nullptr;
   OopMapSet *oop_maps = new OopMapSet();
 
@@ -2887,6 +2883,9 @@ void SharedRuntime::generate_deopt_blob() {
   const Register exec_mode_reg = R21_tmp1;
 
   const address start = __ pc();
+  int exception_offset = 0;
+  int exception_in_tls_offset = 0;
+  int reexecute_offset = 0;
 
 #if defined(COMPILER1) || defined(COMPILER2)
   // --------------------------------------------------------------------------
@@ -2926,7 +2925,7 @@ void SharedRuntime::generate_deopt_blob() {
   // - R3_ARG1: exception oop
   // - R4_ARG2: exception pc
 
-  int exception_offset = __ pc() - start;
+  exception_offset = __ pc() - start;
 
   BLOCK_COMMENT("Prolog for exception case");
 
@@ -2937,7 +2936,7 @@ void SharedRuntime::generate_deopt_blob() {
   __ std(R4_ARG2, _abi0(lr), R1_SP);
 
   // Vanilla deoptimization with an exception pending in exception_oop.
-  int exception_in_tls_offset = __ pc() - start;
+  exception_in_tls_offset = __ pc() - start;
 
   // Push the "unpack frame".
   // Save everything in sight.
@@ -2950,8 +2949,6 @@ void SharedRuntime::generate_deopt_blob() {
   __ li(exec_mode_reg, Deoptimization::Unpack_exception);
 
   // fall through
-
-  int reexecute_offset = 0;
 #ifdef COMPILER1
   __ b(exec_mode_initialized);
 
@@ -3069,11 +3066,12 @@ void SharedRuntime::generate_deopt_blob() {
 
   // Return to the interpreter entry point.
   __ blr();
-  __ flush();
-#else // COMPILER2
+#else // !defined(COMPILER1) && !defined(COMPILER2)
   __ unimplemented("deopt blob needed only with compiler");
-  int exception_offset = __ pc() - start;
-#endif // COMPILER2
+#endif
+
+  // Make sure all code is generated
+  __ flush();
 
   _deopt_blob = DeoptimizationBlob::create(&buffer, oop_maps, 0, exception_offset,
                                            reexecute_offset, first_frame_size_in_bytes / wordSize);
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 8d61ba1b2d7..8a3af748fa1 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -2199,7 +2199,8 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no, Register Rca
   __ isync(); // Order load wrt. succeeding loads.
 
   // Class initialization barrier for static methods
-  if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
+  if (bytecode() == Bytecodes::_invokestatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register method = Rscratch;
     const Register klass  = Rscratch;
 
@@ -2244,8 +2245,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no, Register Rcac
   __ isync(); // Order load wrt. succeeding loads.
 
   // Class initialization barrier for static fields
-  if (VM_Version::supports_fast_class_init_checks() &&
-      (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
+  if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register field_holder = R4_ARG2;
 
     // InterpreterRuntime::resolve_get_put sets field_holder and finally release-stores put_code.
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index e77a2067e89..63e2fd015d7 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -1041,31 +1041,10 @@ void LIR_Assembler::emit_alloc_array(LIR_OpAllocArray* op) {
   __ bind(*op->stub()->continuation());
 }
 
-void LIR_Assembler::type_profile_helper(Register mdo, ciMethodData *md, ciProfileData *data,
-                                        Register recv, Label* update_done) {
-  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
-    Label next_test;
-    // See if the receiver is receiver[n].
-    __ ld(t1, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i))));
-    __ bne(recv, t1, next_test);
-    Address data_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)));
-    __ increment(data_addr, DataLayout::counter_increment);
-    __ j(*update_done);
-    __ bind(next_test);
-  }
-
-  // Didn't find receiver; find next empty slot and fill it in
-  for (uint i = 0; i < ReceiverTypeData::row_limit(); i++) {
-    Label next_test;
-    Address recv_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)));
-    __ ld(t1, recv_addr);
-    __ bnez(t1, next_test);
-    __ sd(recv, recv_addr);
-    __ mv(t1, DataLayout::counter_increment);
-    __ sd(t1, Address(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i))));
-    __ j(*update_done);
-    __ bind(next_test);
-  }
+void LIR_Assembler::type_profile_helper(Register mdo, ciMethodData *md,
+                                        ciProfileData *data, Register recv) {
+  int mdp_offset = md->byte_offset_of_slot(data, in_ByteSize(0));
+  __ profile_receiver_type(recv, mdo, mdp_offset);
 }
 
 void LIR_Assembler::data_check(LIR_OpTypeCheck *op, ciMethodData **md, ciProfileData **data) {
@@ -1139,14 +1118,9 @@ void LIR_Assembler::profile_object(ciMethodData* md, ciProfileData* data, Regist
   __ j(*obj_is_null);
   __ bind(not_null);
 
-  Label update_done;
   Register recv = k_RInfo;
   __ load_klass(recv, obj);
-  type_profile_helper(mdo, md, data, recv, &update_done);
-  Address counter_addr(mdo, md->byte_offset_of_slot(data, CounterData::count_offset()));
-  __ increment(counter_addr, DataLayout::counter_increment);
-
-  __ bind(update_done);
+  type_profile_helper(mdo, md, data, recv);
 }
 
 void LIR_Assembler::typecheck_loaded(LIR_OpTypeCheck *op, ciKlass* k, Register k_RInfo) {
@@ -1554,11 +1528,8 @@ void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
       // We know the type that will be seen at this call site; we can
       // statically update the MethodData* rather than needing to do
       // dynamic tests on the receiver type
-      // NOTE: we should probably put a lock around this search to
-      // avoid collisions by concurrent compilations
       ciVirtualCallData* vc_data = (ciVirtualCallData*) data;
-      uint i;
-      for (i = 0; i < VirtualCallData::row_limit(); i++) {
+      for (uint i = 0; i < VirtualCallData::row_limit(); i++) {
         ciKlass* receiver = vc_data->receiver(i);
         if (known_klass->equals(receiver)) {
           Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
@@ -1566,32 +1537,13 @@ void LIR_Assembler::emit_profile_call(LIR_OpProfileCall* op) {
           return;
         }
       }
-
-      // Receiver type not found in profile data; select an empty slot
-      // Note that this is less efficient than it should be because it
-      // always does a write to the receiver part of the
-      // VirtualCallData rather than just the first time
-      for (i = 0; i < VirtualCallData::row_limit(); i++) {
-        ciKlass* receiver = vc_data->receiver(i);
-        if (receiver == nullptr) {
-          Address recv_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_offset(i)));
-          __ mov_metadata(t1, known_klass->constant_encoding());
-          __ sd(t1, recv_addr);
-          Address data_addr(mdo, md->byte_offset_of_slot(data, VirtualCallData::receiver_count_offset(i)));
-          __ increment(data_addr, DataLayout::counter_increment);
-          return;
-        }
-      }
+      // Receiver type is not found in profile data.
+      // Fall back to runtime helper to handle the rest at runtime.
+      __ mov_metadata(recv, known_klass->constant_encoding());
     } else {
       __ load_klass(recv, recv);
-      Label update_done;
-      type_profile_helper(mdo, md, data, recv, &update_done);
-      // Receiver did not match any saved receiver and there is no empty row for it.
-      // Increment total counter to indicate polymorphic case.
-      __ increment(counter_addr, DataLayout::counter_increment);
-
-      __ bind(update_done);
     }
+    type_profile_helper(mdo, md, data, recv);
   } else {
     // Static call
     __ increment(counter_addr, DataLayout::counter_increment);
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index 1e466e90d37..90b6b3ee4f4 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -54,9 +54,8 @@ private:
   Address stack_slot_address(int index, uint shift, int adjust = 0);
 
   // Record the type of the receiver in ReceiverTypeData
-  void type_profile_helper(Register mdo,
-                           ciMethodData *md, ciProfileData *data,
-                           Register recv, Label* update_done);
+  void type_profile_helper(Register mdo, ciMethodData *md,
+                           ciProfileData *data, Register recv);
 
   void casw(Register addr, Register newval, Register cmpval);
   void caswu(Register addr, Register newval, Register cmpval);
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 824ea872935..72a90ddde1f 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,7 +30,9 @@
 #include "opto/intrinsicnode.hpp"
 #include "opto/output.hpp"
 #include "opto/subnode.hpp"
+#include "runtime/objectMonitorTable.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #ifdef PRODUCT
@@ -123,35 +125,52 @@ void C2_MacroAssembler::fast_lock(Register obj, Register box,
     if (!UseObjectMonitorTable) {
       assert(tmp1_monitor == tmp1_mark, "should be the same here");
     } else {
+      const Register tmp2_hash = tmp2;
+      const Register tmp3_bucket = tmp3;
       Label monitor_found;
 
-      // Load cache address
-      la(tmp3_t, Address(xthread, JavaThread::om_cache_oops_offset()));
+      // Save the mark, we might need it to extract the hash.
+      mv(tmp2_hash, tmp1_mark);
 
-      const int num_unrolled = 2;
+      // Look for the monitor in the om_cache.
+
+      ByteSize cache_offset   = JavaThread::om_cache_oops_offset();
+      ByteSize monitor_offset = OMCache::oop_to_monitor_difference();
+      const int num_unrolled  = OMCache::CAPACITY;
       for (int i = 0; i < num_unrolled; i++) {
-        ld(tmp1, Address(tmp3_t));
-        beq(obj, tmp1, monitor_found);
-        add(tmp3_t, tmp3_t, in_bytes(OMCache::oop_to_oop_difference()));
+        ld(tmp1_monitor, Address(xthread, cache_offset + monitor_offset));
+        ld(tmp4, Address(xthread, cache_offset));
+        beq(obj, tmp4, monitor_found);
+        cache_offset = cache_offset + OMCache::oop_to_oop_difference();
       }
 
-      Label loop;
+      // Look for the monitor in the table.
 
-      // Search for obj in cache.
-      bind(loop);
+      // Get the hash code.
+      srli(tmp2_hash, tmp2_hash, markWord::hash_shift);
 
-      // Check for match.
-      ld(tmp1, Address(tmp3_t));
-      beq(obj, tmp1, monitor_found);
+      // Get the table and calculate the bucket's address.
+      la(tmp3_t, ExternalAddress(ObjectMonitorTable::current_table_address()));
+      ld(tmp3_t, Address(tmp3_t));
+      ld(tmp1, Address(tmp3_t, ObjectMonitorTable::table_capacity_mask_offset()));
+      andr(tmp2_hash, tmp2_hash, tmp1);
+      ld(tmp3_t, Address(tmp3_t, ObjectMonitorTable::table_buckets_offset()));
 
-      // Search until null encountered, guaranteed _null_sentinel at end.
-      add(tmp3_t, tmp3_t, in_bytes(OMCache::oop_to_oop_difference()));
-      bnez(tmp1, loop);
-      // Cache Miss. Take the slowpath.
-      j(slow_path);
+      // Read the monitor from the bucket.
+      shadd(tmp3_bucket, tmp2_hash, tmp3_t, tmp4, LogBytesPerWord);
+      ld(tmp1_monitor, Address(tmp3_bucket));
+
+      // Check if the monitor in the bucket is special (empty, tombstone or removed).
+      mv(tmp2, ObjectMonitorTable::SpecialPointerValues::below_is_special);
+      bltu(tmp1_monitor, tmp2, slow_path);
+
+      // Check if object matches.
+      ld(tmp3, Address(tmp1_monitor, ObjectMonitor::object_offset()));
+      BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
+      bs_asm->try_resolve_weak_handle_in_c2(this, tmp3, tmp2, slow_path);
+      bne(tmp3, obj, slow_path);
 
       bind(monitor_found);
-      ld(tmp1_monitor, Address(tmp3_t, OMCache::oop_to_monitor_difference()));
     }
 
     const Register tmp2_owner_addr = tmp2;
@@ -2813,10 +2832,14 @@ void C2_MacroAssembler::char_array_compress_v(Register src, Register dst, Regist
 
 // Intrinsic for
 //
-// - sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray
-//     return the number of characters copied.
-// - java/lang/StringUTF16.compress
-//     return index of non-latin1 character if copy fails, otherwise 'len'.
+// - sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
+//   Encodes char[] to byte[] in ISO-8859-1
+//
+// - java.lang.StringCoding#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
+//   Encodes byte[] (containing UTF-16) to byte[] in ISO-8859-1
+//
+// - java.lang.StringCoding#encodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len)
+//   Encodes char[] to byte[] in ASCII
 //
 // This version always returns the number of characters copied. A successful
 // copy will complete with the post-condition: 'res' == 'len', while an
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
index f5916000890..aeb9df06de6 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -369,6 +369,11 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
   return opto_reg;
 }
 
+void BarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  // Load the oop from the weak handle.
+  __ ld(obj, Address(obj));
+}
+
 #undef __
 #define __ _masm->
 
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
index e50fa1dae36..bbb2a5af824 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -110,6 +110,8 @@ public:
 #ifdef COMPILER2
   OptoReg::Name refine_register(const Node* node,
                                 OptoReg::Name opto_reg);
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj,
+                                             Register tmp, Label& slow_path);
 #endif // COMPILER2
 };
 
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
index dd6c8556307..8d530d15ee5 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2020, Red Hat, Inc. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,26 +89,16 @@ void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Dec
   }
 }
 
-void ShenandoahBarrierSetAssembler::shenandoah_write_barrier_pre(MacroAssembler* masm,
-                                                                 Register obj,
-                                                                 Register pre_val,
-                                                                 Register thread,
-                                                                 Register tmp,
-                                                                 bool tosca_live,
-                                                                 bool expand_call) {
-  if (ShenandoahSATBBarrier) {
-    satb_write_barrier_pre(masm, obj, pre_val, thread, tmp, t0, tosca_live, expand_call);
-  }
-}
+void ShenandoahBarrierSetAssembler::satb_barrier(MacroAssembler* masm,
+                                                 Register obj,
+                                                 Register pre_val,
+                                                 Register thread,
+                                                 Register tmp1,
+                                                 Register tmp2,
+                                                 bool tosca_live,
+                                                 bool expand_call) {
+  assert(ShenandoahSATBBarrier, "Should be checked by caller");
 
-void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
-                                                           Register obj,
-                                                           Register pre_val,
-                                                           Register thread,
-                                                           Register tmp1,
-                                                           Register tmp2,
-                                                           bool tosca_live,
-                                                           bool expand_call) {
   // If expand_call is true then we expand the call_VM_leaf macro
   // directly to skip generating the check by
   // InterpreterMacroAssembler::call_VM_leaf_base that checks _last_sp.
@@ -376,21 +367,21 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm,
   if (ShenandoahBarrierSet::need_keep_alive_barrier(decorators, type)) {
     __ enter();
     __ push_call_clobbered_registers();
-    satb_write_barrier_pre(masm /* masm */,
-                           noreg /* obj */,
-                           dst /* pre_val */,
-                           xthread /* thread */,
-                           tmp1 /* tmp1 */,
-                           tmp2 /* tmp2 */,
-                           true /* tosca_live */,
-                           true /* expand_call */);
+    satb_barrier(masm /* masm */,
+                 noreg /* obj */,
+                 dst /* pre_val */,
+                 xthread /* thread */,
+                 tmp1 /* tmp1 */,
+                 tmp2 /* tmp2 */,
+                 true /* tosca_live */,
+                 true /* expand_call */);
     __ pop_call_clobbered_registers();
     __ leave();
   }
 }
 
-void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj) {
-  assert(ShenandoahCardBarrier, "Did you mean to enable ShenandoahCardBarrier?");
+void ShenandoahBarrierSetAssembler::card_barrier(MacroAssembler* masm, Register obj) {
+  assert(ShenandoahCardBarrier, "Should have been checked by caller");
 
   __ srli(obj, obj, CardTable::card_shift());
 
@@ -413,13 +404,13 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
 void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                                              Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
-  bool on_oop = is_reference_type(type);
-  if (!on_oop) {
+  // 1: non-reference types require no barriers
+  if (!is_reference_type(type)) {
     BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
     return;
   }
 
-  // flatten object address if needed
+  // Flatten object address right away for simplicity: likely needed by barriers
   if (dst.offset() == 0) {
     if (dst.base() != tmp3) {
       __ mv(tmp3, dst.base());
@@ -428,20 +419,26 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
     __ la(tmp3, dst);
   }
 
-  shenandoah_write_barrier_pre(masm,
-                               tmp3 /* obj */,
-                               tmp2 /* pre_val */,
-                               xthread /* thread */,
-                               tmp1  /* tmp */,
-                               val != noreg /* tosca_live */,
-                               false /* expand_call */);
+  bool storing_non_null = (val != noreg);
 
+  // 2: pre-barrier: SATB needs the previous value
+  if (ShenandoahBarrierSet::need_satb_barrier(decorators, type)) {
+    satb_barrier(masm,
+                 tmp3 /* obj */,
+                 tmp2 /* pre_val */,
+                 xthread /* thread */,
+                 tmp1 /* tmp */,
+                 t0 /* tmp2 */,
+                 storing_non_null /* tosca_live */,
+                 false /* expand_call */);
+  }
+
+  // Store!
   BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp3, 0), val, noreg, noreg, noreg);
 
-  bool in_heap = (decorators & IN_HEAP) != 0;
-  bool needs_post_barrier = (val != noreg) && in_heap && ShenandoahCardBarrier;
-  if (needs_post_barrier) {
-    store_check(masm, tmp3);
+  // 3: post-barrier: card barrier needs store address
+  if (ShenandoahBarrierSet::need_card_barrier(decorators, type) && storing_non_null) {
+    card_barrier(masm, tmp3);
   }
 }
 
@@ -465,6 +462,30 @@ void ShenandoahBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler
   __ bind(done);
 }
 
+#ifdef COMPILER2
+void ShenandoahBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler *masm, Register obj,
+                                                                  Register tmp, Label& slow_path) {
+  assert_different_registers(obj, tmp);
+
+  Label done;
+
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, tmp, slow_path);
+
+  // Check if the reference is null, and if it is, take the fast path.
+  __ beqz(obj, done);
+
+  Address gc_state(xthread, ShenandoahThreadLocalData::gc_state_offset());
+  __ lbu(tmp, gc_state);
+
+  // Check if the heap is under weak-reference/roots processing, in
+  // which case we need to take the slow path.
+  __ test_bit(tmp, tmp, ShenandoahHeap::WEAK_ROOTS_BITPOS);
+  __ bnez(tmp, slow_path);
+  __ bind(done);
+}
+#endif
+
 // Special Shenandoah CAS implementation that handles false negatives due
 // to concurrent evacuation.  The service is more complex than a
 // traditional CAS operation because the CAS operation is intended to
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
index c8a7c35fb83..e35e09c93da 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,23 +42,16 @@ class StubCodeGenerator;
 class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
 private:
 
-  void satb_write_barrier_pre(MacroAssembler* masm,
-                              Register obj,
-                              Register pre_val,
-                              Register thread,
-                              Register tmp1,
-                              Register tmp2,
-                              bool tosca_live,
-                              bool expand_call);
-  void shenandoah_write_barrier_pre(MacroAssembler* masm,
-                                    Register obj,
-                                    Register pre_val,
-                                    Register thread,
-                                    Register tmp,
-                                    bool tosca_live,
-                                    bool expand_call);
+  void satb_barrier(MacroAssembler* masm,
+                    Register obj,
+                    Register pre_val,
+                    Register thread,
+                    Register tmp1,
+                    Register tmp2,
+                    bool tosca_live,
+                    bool expand_call);
 
-  void store_check(MacroAssembler* masm, Register obj);
+  void card_barrier(MacroAssembler* masm, Register obj);
 
   void resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp = noreg);
   void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg);
@@ -91,7 +85,9 @@ public:
 
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
                                              Register obj, Register tmp, Label& slowpath);
-
+#ifdef COMPILER2
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
+#endif
   void cmpxchg_oop(MacroAssembler* masm, Register addr, Register expected, Register new_val,
                    Assembler::Aqrl acquire, Assembler::Aqrl release, bool is_cae, Register result);
 };
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
index 09dea62b6d1..163271a2f11 100644
--- a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -602,6 +602,27 @@ void ZBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm,
   BLOCK_COMMENT("} ZBarrierSetAssembler::try_resolve_jobject_in_native");
 }
 
+#ifdef COMPILER2
+void ZBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  BLOCK_COMMENT("ZBarrierSetAssembler::try_resolve_weak_handle_in_c2 {");
+
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, tmp, slow_path);
+
+  // Check if the oop is bad, in which case we need to take the slow path.
+  __ relocate(barrier_Relocation::spec(), [&] {
+    __ li16u(tmp, barrier_Relocation::unpatched);
+  }, ZBarrierRelocationFormatMarkBadMask);
+  __ andr(tmp, obj, tmp);
+  __ bnez(tmp, slow_path);
+
+  // Oop is okay, so we uncolor it.
+  __ srli(obj, obj, ZPointerLoadShift);
+
+  BLOCK_COMMENT("} ZBarrierSetAssembler::try_resolve_weak_handle_in_c2");
+}
+#endif
+
 static uint16_t patch_barrier_relocation_value(int format) {
   switch (format) {
     case ZBarrierRelocationFormatLoadBadMask:
diff --git a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
index 190d81acd0c..648cb3bf63d 100644
--- a/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/z/zBarrierSetAssembler_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -170,6 +170,10 @@ public:
                                      ZLoadBarrierStubC2* stub) const;
   void generate_c2_store_barrier_stub(MacroAssembler* masm,
                                       ZStoreBarrierStubC2* stub) const;
+  void try_resolve_weak_handle_in_c2(MacroAssembler* masm,
+                                     Register obj,
+                                     Register tmp,
+                                     Label& slow_path);
 #endif // COMPILER2
 
   void check_oop(MacroAssembler* masm, Register obj, Register tmp1, Register tmp2, Label& error);
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index 390ed2daeb9..21b119266e2 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,7 +39,7 @@ define_pd_global(bool, UncommonNullCast,         true);  // Uncommon-trap nulls
 define_pd_global(bool, DelayCompilerStubsGeneration, COMPILER2_OR_JVMCI);
 
 define_pd_global(size_t, CodeCacheSegmentSize,   64 COMPILER1_AND_COMPILER2_PRESENT(+64)); // Tiered compilation has large code-entry alignment.
-define_pd_global(intx, CodeEntryAlignment,       64);
+define_pd_global(uint, CodeEntryAlignment,       64);
 define_pd_global(intx, OptoLoopAlignment,        16);
 
 #define DEFAULT_STACK_YELLOW_PAGES (2)
diff --git a/src/hotspot/cpu/riscv/icache_riscv.cpp b/src/hotspot/cpu/riscv/icache_riscv.cpp
index 258bc665770..20de2dbb2ad 100644
--- a/src/hotspot/cpu/riscv/icache_riscv.cpp
+++ b/src/hotspot/cpu/riscv/icache_riscv.cpp
@@ -39,7 +39,8 @@ static int icache_flush(address addr, int lines, int magic) {
   // We need to make sure stores happens before the I/D cache synchronization.
   __asm__ volatile("fence rw, rw" : : : "memory");
 
-  RiscvFlushIcache::flush((uintptr_t)addr, ((uintptr_t)lines) << ICache::log2_line_size);
+  uintptr_t end = (uintptr_t)addr + ((uintptr_t)lines << ICache::log2_line_size);
+  RiscvFlushIcache::flush((uintptr_t)addr, end);
 
   return magic;
 }
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index 189c7c93d07..744590bec2b 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -237,15 +237,14 @@ void InterpreterMacroAssembler::load_resolved_klass_at_offset(
 //      Rsub_klass: subklass
 //
 // Kills:
-//      x12, x15
+//      x12
 void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
                                                   Label& ok_is_subtype) {
   assert(Rsub_klass != x10, "x10 holds superklass");
   assert(Rsub_klass != x12, "x12 holds 2ndary super array length");
-  assert(Rsub_klass != x15, "x15 holds 2ndary super array scan ptr");
 
   // Profile the not-null value's klass.
-  profile_typecheck(x12, Rsub_klass, x15); // blows x12, reloads x15
+  profile_typecheck(x12, Rsub_klass); // blows x12
 
   // Do the check.
   check_klass_subtype(Rsub_klass, x10, x12, ok_is_subtype); // blows x12
@@ -1042,7 +1041,6 @@ void InterpreterMacroAssembler::profile_final_call(Register mdp) {
 
 void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
                                                      Register mdp,
-                                                     Register reg2,
                                                      bool receiver_can_be_null) {
   if (ProfileInterpreter) {
     Label profile_continue;
@@ -1060,7 +1058,7 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
     }
 
     // Record the receiver type.
-    record_klass_in_profile(receiver, mdp, reg2);
+    profile_receiver_type(receiver, mdp, 0);
     bind(skip_receiver_profile);
 
     // The method data pointer needs to be updated to reflect the new target.
@@ -1072,153 +1070,6 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
   }
 }
 
-// This routine creates a state machine for updating the multi-row
-// type profile at a virtual call site (or other type-sensitive bytecode).
-// The machine visits each row (of receiver/count) until the receiver type
-// is found, or until it runs out of rows.  At the same time, it remembers
-// the location of the first empty row.  (An empty row records null for its
-// receiver, and can be allocated for a newly-observed receiver type.)
-// Because there are two degrees of freedom in the state, a simple linear
-// search will not work; it must be a decision tree.  Hence this helper
-// function is recursive, to generate the required tree structured code.
-// It's the interpreter, so we are trading off code space for speed.
-// See below for example code.
-void InterpreterMacroAssembler::record_klass_in_profile_helper(
-                                Register receiver, Register mdp,
-                                Register reg2, Label& done) {
-  if (TypeProfileWidth == 0) {
-    increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-  } else {
-    record_item_in_profile_helper(receiver, mdp, reg2, 0, done, TypeProfileWidth,
-        &VirtualCallData::receiver_offset, &VirtualCallData::receiver_count_offset);
-  }
-}
-
-void InterpreterMacroAssembler::record_item_in_profile_helper(Register item, Register mdp,
-                                        Register reg2, int start_row, Label& done, int total_rows,
-                                        OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn) {
-  int last_row = total_rows - 1;
-  assert(start_row <= last_row, "must be work left to do");
-  // Test this row for both the item and for null.
-  // Take any of three different outcomes:
-  //   1. found item => increment count and goto done
-  //   2. found null => keep looking for case 1, maybe allocate this cell
-  //   3. found something else => keep looking for cases 1 and 2
-  // Case 3 is handled by a recursive call.
-  for (int row = start_row; row <= last_row; row++) {
-    Label next_test;
-    bool test_for_null_also = (row == start_row);
-
-    // See if the item is item[n].
-    int item_offset = in_bytes(item_offset_fn(row));
-    test_mdp_data_at(mdp, item_offset, item,
-                     (test_for_null_also ? reg2 : noreg),
-                     next_test);
-    // (Reg2 now contains the item from the CallData.)
-
-    // The item is item[n].  Increment count[n].
-    int count_offset = in_bytes(item_count_offset_fn(row));
-    increment_mdp_data_at(mdp, count_offset);
-    j(done);
-    bind(next_test);
-
-    if (test_for_null_also) {
-      Label found_null;
-      // Failed the equality check on item[n]...  Test for null.
-      if (start_row == last_row) {
-        // The only thing left to do is handle the null case.
-        beqz(reg2, found_null);
-        // Item did not match any saved item and there is no empty row for it.
-        // Increment total counter to indicate polymorphic case.
-        increment_mdp_data_at(mdp, in_bytes(CounterData::count_offset()));
-        j(done);
-        bind(found_null);
-        break;
-      }
-      // Since null is rare, make it be the branch-taken case.
-      beqz(reg2, found_null);
-
-      // Put all the "Case 3" tests here.
-      record_item_in_profile_helper(item, mdp, reg2, start_row + 1, done, total_rows,
-          item_offset_fn, item_count_offset_fn);
-
-      // Found a null.  Keep searching for a matching item,
-      // but remember that this is an empty (unused) slot.
-      bind(found_null);
-    }
-  }
-
-  // In the fall-through case, we found no matching item, but we
-  // observed the item[start_row] is null.
-  // Fill in the item field and increment the count.
-  int item_offset = in_bytes(item_offset_fn(start_row));
-  set_mdp_data_at(mdp, item_offset, item);
-  int count_offset = in_bytes(item_count_offset_fn(start_row));
-  mv(reg2, DataLayout::counter_increment);
-  set_mdp_data_at(mdp, count_offset, reg2);
-  if (start_row > 0) {
-    j(done);
-  }
-}
-
-// Example state machine code for three profile rows:
-//   # main copy of decision tree, rooted at row[1]
-//   if (row[0].rec == rec) then [
-//     row[0].incr()
-//     goto done
-//   ]
-//   if (row[0].rec != nullptr) then [
-//     # inner copy of decision tree, rooted at row[1]
-//     if (row[1].rec == rec) then [
-//       row[1].incr()
-//       goto done
-//     ]
-//     if (row[1].rec != nullptr) then [
-//       # degenerate decision tree, rooted at row[2]
-//       if (row[2].rec == rec) then [
-//         row[2].incr()
-//         goto done
-//       ]
-//       if (row[2].rec != nullptr) then [
-//         count.incr()
-//         goto done
-//       ] # overflow
-//       row[2].init(rec)
-//       goto done
-//     ] else [
-//       # remember row[1] is empty
-//       if (row[2].rec == rec) then [
-//         row[2].incr()
-//         goto done
-//       ]
-//       row[1].init(rec)
-//       goto done
-//     ]
-//   else [
-//     # remember row[0] is empty
-//     if (row[1].rec == rec) then [
-//       row[1].incr()
-//       goto done
-//     ]
-//     if (row[2].rec == rec) then [
-//       row[2].incr()
-//       goto done
-//     ]
-//     row[0].init(rec)
-//     goto done
-//   ]
-//   done:
-
-void InterpreterMacroAssembler::record_klass_in_profile(Register receiver,
-                                                        Register mdp, Register reg2) {
-  assert(ProfileInterpreter, "must be profiling");
-  Label done;
-
-  record_klass_in_profile_helper(receiver, mdp, reg2, done);
-
-  bind(done);
-}
-
 void InterpreterMacroAssembler::profile_ret(Register return_bci, Register mdp) {
   if (ProfileInterpreter) {
     Label profile_continue;
@@ -1274,7 +1125,7 @@ void InterpreterMacroAssembler::profile_null_seen(Register mdp) {
   }
 }
 
-void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass, Register reg2) {
+void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass) {
   if (ProfileInterpreter) {
     Label profile_continue;
 
@@ -1287,7 +1138,7 @@ void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass,
       mdp_delta = in_bytes(VirtualCallData::virtual_call_data_size());
 
       // Record the object type.
-      record_klass_in_profile(klass, mdp, reg2);
+      profile_receiver_type(klass, mdp, 0);
     }
     update_mdp_by_constant(mdp, mdp_delta);
 
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index a9df09d656a..59cc76b022f 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -262,14 +262,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
                         Register test_value_out,
                         Label& not_equal_continue);
 
-  void record_klass_in_profile(Register receiver, Register mdp,
-                               Register reg2);
-  void record_klass_in_profile_helper(Register receiver, Register mdp,
-                                      Register reg2, Label& done);
-  void record_item_in_profile_helper(Register item, Register mdp,
-                                     Register reg2, int start_row, Label& done, int total_rows,
-                                     OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn);
-
   void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
   void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
   void update_mdp_by_constant(Register mdp_in, int constant);
@@ -283,11 +275,10 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void profile_call(Register mdp);
   void profile_final_call(Register mdp);
   void profile_virtual_call(Register receiver, Register mdp,
-                            Register t1,
                             bool receiver_can_be_null = false);
   void profile_ret(Register return_bci, Register mdp);
   void profile_null_seen(Register mdp);
-  void profile_typecheck(Register mdp, Register klass, Register temp);
+  void profile_typecheck(Register mdp, Register klass);
   void profile_typecheck_failed(Register mdp);
   void profile_switch_default(Register mdp);
   void profile_switch_case(Register index_in_scratch, Register mdp,
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 43b17a13c20..4f5e7afc166 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -543,6 +543,160 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
   BLOCK_COMMENT("} verify_oop");
 }
 
+// Handle the receiver type profile update given the "recv" klass.
+//
+// Normally updates the ReceiverData (RD) that starts at "mdp" + "mdp_offset".
+// If there are no matching or claimable receiver entries in RD, updates
+// the polymorphic counter.
+//
+// This code expected to run by either the interpreter or JIT-ed code, without
+// extra synchronization. For safety, receiver cells are claimed atomically, which
+// avoids grossly misrepresenting the profiles under concurrent updates. For speed,
+// counter updates are not atomic.
+//
+void MacroAssembler::profile_receiver_type(Register recv, Register mdp, int mdp_offset) {
+  assert_different_registers(recv, mdp, t0, t1);
+
+  int base_receiver_offset   = in_bytes(ReceiverTypeData::receiver_offset(0));
+  int end_receiver_offset    = in_bytes(ReceiverTypeData::receiver_offset(ReceiverTypeData::row_limit()));
+  int poly_count_offset      = in_bytes(CounterData::count_offset());
+  int receiver_step          = in_bytes(ReceiverTypeData::receiver_offset(1)) - base_receiver_offset;
+  int receiver_to_count_step = in_bytes(ReceiverTypeData::receiver_count_offset(0)) - base_receiver_offset;
+
+  // Adjust for MDP offsets. Slots are pointer-sized, so is the global offset.
+  base_receiver_offset += mdp_offset;
+  end_receiver_offset  += mdp_offset;
+  poly_count_offset    += mdp_offset;
+
+#ifdef ASSERT
+  // We are about to walk the MDO slots without asking for offsets.
+  // Check that our math hits all the right spots.
+  for (uint c = 0; c < ReceiverTypeData::row_limit(); c++) {
+    int real_recv_offset  = mdp_offset + in_bytes(ReceiverTypeData::receiver_offset(c));
+    int real_count_offset = mdp_offset + in_bytes(ReceiverTypeData::receiver_count_offset(c));
+    int offset = base_receiver_offset + receiver_step*c;
+    int count_offset = offset + receiver_to_count_step;
+    assert(offset == real_recv_offset, "receiver slot math");
+    assert(count_offset  == real_count_offset, "receiver count math");
+  }
+  int real_poly_count_offset = mdp_offset + in_bytes(CounterData::count_offset());
+  assert(poly_count_offset == real_poly_count_offset, "poly counter math");
+#endif
+
+  // Corner case: no profile table. Increment poly counter and exit.
+  if (ReceiverTypeData::row_limit() == 0) {
+    increment(Address(mdp, poly_count_offset), DataLayout::counter_increment);
+    return;
+  }
+
+  Register offset = t1;
+
+  Label L_loop_search_receiver, L_loop_search_empty;
+  Label L_restart, L_found_recv, L_found_empty, L_polymorphic, L_count_update;
+
+  // The code here recognizes three major cases:
+  //   A. Fastest: receiver found in the table
+  //   B. Fast: no receiver in the table, and the table is full
+  //   C. Slow: no receiver in the table, free slots in the table
+  //
+  // The case A performance is most important, as perfectly-behaved code would end up
+  // there, especially with larger TypeProfileWidth. The case B performance is
+  // important as well, this is where bulk of code would land for normally megamorphic
+  // cases. The case C performance is not essential, its job is to deal with installation
+  // races, we optimize for code density instead. Case C needs to make sure that receiver
+  // rows are only claimed once. This makes sure we never overwrite a row for another
+  // receiver and never duplicate the receivers in the list, making profile type-accurate.
+  //
+  // It is very tempting to handle these cases in a single loop, and claim the first slot
+  // without checking the rest of the table. But, profiling code should tolerate free slots
+  // in the table, as class unloading can clear them. After such cleanup, the receiver
+  // we need might be _after_ the free slot. Therefore, we need to let at least full scan
+  // to complete, before trying to install new slots. Splitting the code in several tight
+  // loops also helpfully optimizes for cases A and B.
+  //
+  // This code is effectively:
+  //
+  // restart:
+  //   // Fastest: receiver is already installed
+  //   for (i = 0; i < receiver_count(); i++) {
+  //     if (receiver(i) == recv) goto found_recv(i);
+  //   }
+  //
+  //   // Fast: no receiver, but profile is full
+  //   for (i = 0; i < receiver_count(); i++) {
+  //     if (receiver(i) == null) goto found_null(i);
+  //   }
+  //   goto polymorphic
+  //
+  //   // Slow: try to install receiver
+  // found_null(i):
+  //   CAS(&receiver(i), null, recv);
+  //   goto restart
+  //
+  // polymorphic:
+  //   count++;
+  //   return
+  //
+  // found_recv(i):
+  //   *receiver_count(i)++
+  //
+
+  bind(L_restart);
+
+  // Fastest: receiver is already installed
+  mv(offset, base_receiver_offset);
+  bind(L_loop_search_receiver);
+    add(t0, mdp, offset);
+    ld(t0, Address(t0));
+    beq(recv, t0, L_found_recv);
+  add(offset, offset, receiver_step);
+  sub(t0, offset, end_receiver_offset);
+  bnez(t0, L_loop_search_receiver);
+
+  // Fast: no receiver, but profile is full
+  mv(offset, base_receiver_offset);
+  bind(L_loop_search_empty);
+    add(t0, mdp, offset);
+    ld(t0, Address(t0));
+    beqz(t0, L_found_empty);
+  add(offset, offset, receiver_step);
+  sub(t0, offset, end_receiver_offset);
+  bnez(t0, L_loop_search_empty);
+  j(L_polymorphic);
+
+  // Slow: try to install receiver
+  bind(L_found_empty);
+
+  // Atomically swing receiver slot: null -> recv.
+  //
+  // The update uses CAS, which clobbers t0. Therefore, t1
+  // is used to hold the destination address. This is safe because the
+  // offset is no longer needed after the address is computed.
+  add(t1, mdp, offset);
+  weak_cmpxchg(/*addr*/ t1, /*expected*/ zr, /*new*/ recv, Assembler::int64,
+               /*acquire*/ Assembler::relaxed, /*release*/ Assembler::relaxed, /*result*/ t0);
+
+  // CAS success means the slot now has the receiver we want. CAS failure means
+  // something had claimed the slot concurrently: it can be the same receiver we want,
+  // or something else. Since this is a slow path, we can optimize for code density,
+  // and just restart the search from the beginning.
+  j(L_restart);
+
+  // Counter updates:
+  // Increment polymorphic counter instead of receiver slot.
+  bind(L_polymorphic);
+  mv(offset, poly_count_offset);
+  j(L_count_update);
+
+  // Found a receiver, convert its slot offset to corresponding count offset.
+  bind(L_found_recv);
+  add(offset, offset, receiver_to_count_step);
+
+  bind(L_count_update);
+  add(t1, mdp, offset);
+  increment(Address(t1), DataLayout::counter_increment);
+}
+
 void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* file, int line) {
   if (!VerifyOops) {
     return;
@@ -5110,9 +5264,8 @@ void MacroAssembler::get_thread(Register thread) {
 }
 
 void MacroAssembler::load_byte_map_base(Register reg) {
-  CardTable::CardValue* byte_map_base =
-    ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
-  mv(reg, (uint64_t)byte_map_base);
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
+  mv(reg, (uint64_t)ctbs->card_table_base_const());
 }
 
 void MacroAssembler::build_frame(int framesize) {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 3b021388fa5..f5e985c28a2 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -390,6 +390,8 @@ class MacroAssembler: public Assembler {
 
   Address argument_address(RegisterOrConstant arg_slot, int extra_slot_offset = 0);
 
+  void profile_receiver_type(Register recv, Register mdp, int mdp_offset);
+
   // only if +VerifyOops
   void _verify_oop(Register reg, const char* s, const char* file, int line);
   void _verify_oop_addr(Address addr, const char* s, const char* file, int line);
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index eeb6fad1b59..8c343f6ab2b 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -213,7 +213,7 @@ void RegisterSaver::restore_live_registers(MacroAssembler* masm) {
 // Is vector's size (in bytes) bigger than a size saved by default?
 // riscv does not ovlerlay the floating-point registers on vector registers like aarch64.
 bool SharedRuntime::is_wide_vector(int size) {
-  return UseRVV;
+  return UseRVV && size > 0;
 }
 
 // ---------------------------------------------------------------------------
@@ -637,22 +637,20 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
 
   // Class initialization barrier for static methods
   entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
-  if (VM_Version::supports_fast_class_init_checks()) {
-    Label L_skip_barrier;
+  assert(VM_Version::supports_fast_class_init_checks(), "sanity");
+  Label L_skip_barrier;
 
-    { // Bypass the barrier for non-static methods
-      __ load_unsigned_short(t0, Address(xmethod, Method::access_flags_offset()));
-      __ test_bit(t1, t0, exact_log2(JVM_ACC_STATIC));
-      __ beqz(t1, L_skip_barrier); // non-static
-    }
+  // Bypass the barrier for non-static methods
+  __ load_unsigned_short(t0, Address(xmethod, Method::access_flags_offset()));
+  __ test_bit(t1, t0, exact_log2(JVM_ACC_STATIC));
+  __ beqz(t1, L_skip_barrier); // non-static
 
-    __ load_method_holder(t1, xmethod);
-    __ clinit_barrier(t1, t0, &L_skip_barrier);
-    __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
+  __ load_method_holder(t1, xmethod);
+  __ clinit_barrier(t1, t0, &L_skip_barrier);
+  __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
 
-    __ bind(L_skip_barrier);
-    entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
-  }
+  __ bind(L_skip_barrier);
+  entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
 
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->c2i_entry_barrier(masm);
@@ -1443,7 +1441,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     __ nop();  // 4 bytes
   }
 
-  if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
+  if (method->needs_clinit_barrier()) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     Label L_skip_barrier;
     __ mov_metadata(t1, method->method_holder()); // InstanceKlass*
     __ clinit_barrier(t1, t0, &L_skip_barrier);
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index ca41583e4bc..5cc725e3af4 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -708,7 +708,6 @@ void TemplateTable::index_check(Register array, Register index) {
     __ mv(x11, index);
   }
   Label ok;
-  __ sext(index, index, 32);
   __ bltu(index, length, ok);
   __ mv(x13, array);
   __ mv(t1, Interpreter::_throw_ArrayIndexOutOfBoundsException_entry);
@@ -1052,7 +1051,7 @@ void TemplateTable::aastore() {
   transition(vtos, vtos);
   // stack: ..., array, index, value
   __ ld(x10, at_tos());    // value
-  __ ld(x12, at_tos_p1()); // index
+  __ lw(x12, at_tos_p1()); // index
   __ ld(x13, at_tos_p2()); // array
 
   index_check(x13, x12);     // kills x11
@@ -1462,9 +1461,9 @@ void TemplateTable::iinc() {
   transition(vtos, vtos);
   __ load_signed_byte(x11, at_bcp(2)); // get constant
   locals_index(x12);
-  __ ld(x10, iaddress(x12, x10, _masm));
+  __ lw(x10, iaddress(x12, x10, _masm));
   __ addw(x10, x10, x11);
-  __ sd(x10, iaddress(x12, t0, _masm));
+  __ sw(x10, iaddress(x12, t0, _masm));
 }
 
 void TemplateTable::wide_iinc() {
@@ -1477,9 +1476,9 @@ void TemplateTable::wide_iinc() {
   __ orr(x11, x11, t1);
 
   locals_index_wide(x12);
-  __ ld(x10, iaddress(x12, t0, _masm));
+  __ lw(x10, iaddress(x12, t0, _masm));
   __ addw(x10, x10, x11);
-  __ sd(x10, iaddress(x12, t0, _masm));
+  __ sw(x10, iaddress(x12, t0, _masm));
 }
 
 void TemplateTable::convert() {
@@ -2192,7 +2191,8 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   __ mv(t0, (int) code);
 
   // Class initialization barrier for static methods
-  if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
+  if (bytecode() == Bytecodes::_invokestatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     __ bne(temp, t0, L_clinit_barrier_slow);  // have we resolved this bytecode?
     __ ld(temp, Address(Rcache, in_bytes(ResolvedMethodEntry::method_offset())));
     __ load_method_holder(temp, temp);
@@ -2243,8 +2243,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   __ mv(t0, (int) code);  // have we resolved this bytecode?
 
   // Class initialization barrier for static fields
-  if (VM_Version::supports_fast_class_init_checks() &&
-      (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
+  if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register field_holder = temp;
 
     __ bne(temp, t0, L_clinit_barrier_slow);
@@ -3279,7 +3279,7 @@ void TemplateTable::invokevirtual_helper(Register index,
   __ load_klass(x10, recv);
 
   // profile this call
-  __ profile_virtual_call(x10, xlocals, x13);
+  __ profile_virtual_call(x10, xlocals);
 
   // get target Method & entry point
   __ lookup_virtual_method(x10, index, method);
@@ -3406,7 +3406,7 @@ void TemplateTable::invokeinterface(int byte_no) {
                              /*return_method=*/false);
 
   // profile this call
-  __ profile_virtual_call(x13, x30, x9);
+  __ profile_virtual_call(x13, x30);
 
   // Get declaring interface class from method, and itable index
   __ load_method_holder(x10, xmethod);
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 22f19c4f5ea..36f0864da0b 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -167,11 +167,6 @@ void VM_Version::common_initialize() {
       (unaligned_scalar.value() == MISALIGNED_SCALAR_FAST));
   }
 
-  if (FLAG_IS_DEFAULT(AlignVector)) {
-    FLAG_SET_DEFAULT(AlignVector,
-      unaligned_vector.value() != MISALIGNED_VECTOR_FAST);
-  }
-
 #ifdef __riscv_ztso
   // Hotspot is compiled with TSO support, it will only run on hardware which
   // supports Ztso
@@ -242,6 +237,11 @@ void VM_Version::c2_initialize() {
     }
   }
 
+  if (FLAG_IS_DEFAULT(AlignVector)) {
+    FLAG_SET_DEFAULT(AlignVector,
+      unaligned_vector.value() != MISALIGNED_VECTOR_FAST);
+  }
+
   // NOTE: Make sure codes dependent on UseRVV are put after MaxVectorSize initialize,
   //       as there are extra checks inside it which could disable UseRVV
   //       in some situations.
diff --git a/src/hotspot/cpu/s390/c2_globals_s390.hpp b/src/hotspot/cpu/s390/c2_globals_s390.hpp
index 431a36cda07..125b317588d 100644
--- a/src/hotspot/cpu/s390/c2_globals_s390.hpp
+++ b/src/hotspot/cpu/s390/c2_globals_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -44,7 +44,7 @@ define_pd_global(intx, CompileThreshold,             10000);
 
 define_pd_global(intx, OnStackReplacePercentage,     140);
 define_pd_global(intx, ConditionalMoveLimit,         4);
-define_pd_global(intx, FreqInlineSize,               175);
+define_pd_global(intx, FreqInlineSize,               325);
 define_pd_global(intx, InteriorEntryAlignment,       4);
 define_pd_global(size_t, NewSizeThreadIncrease,      ScaleForWordSize(4*K));
 define_pd_global(intx, RegisterCostAreaRatio,        12000);
diff --git a/src/hotspot/cpu/s390/compiledIC_s390.cpp b/src/hotspot/cpu/s390/compiledIC_s390.cpp
index 8501a0cb346..43f5d80250e 100644
--- a/src/hotspot/cpu/s390/compiledIC_s390.cpp
+++ b/src/hotspot/cpu/s390/compiledIC_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2019 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,9 +29,6 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
-#ifdef COMPILER2
-#include "opto/matcher.hpp"
-#endif
 
 // ----------------------------------------------------------------------------
 
@@ -39,7 +36,6 @@
 #define __ masm->
 
 address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark/* = nullptr*/) {
-#ifdef COMPILER2
   // Stub is fixed up when the corresponding call is converted from calling
   // compiled code to calling interpreted code.
   if (mark == nullptr) {
@@ -55,7 +51,7 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
   __ relocate(static_stub_Relocation::spec(mark));
 
   AddressLiteral meta = __ allocate_metadata_address(nullptr);
-  bool success = __ load_const_from_toc(as_Register(Matcher::inline_cache_reg_encode()), meta);
+  bool success = __ load_const_from_toc(Z_inline_cache, meta);
 
   __ set_inst_mark();
   AddressLiteral a((address)-1);
@@ -67,10 +63,6 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
   __ z_br(Z_R1);
   __ end_a_stub(); // Update current stubs pointer and restore insts_end.
   return stub;
-#else
-  ShouldNotReachHere();
-  return nullptr;
-#endif
 }
 
 #undef __
diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
index 272136fc28c..617bc7cd00c 100644
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -129,6 +129,57 @@ void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* mas
   }
 }
 
+static void generate_post_barrier(MacroAssembler* masm,
+                                  const Register store_addr,
+                                  const Register new_val,
+                                  const Register thread,
+                                  const Register tmp1,
+                                  const Register tmp2,
+                                  Label& done,
+                                  bool new_val_may_be_null) {
+
+  __ block_comment("generate_post_barrier {");
+
+  assert(thread == Z_thread, "must be");
+  assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg);
+
+  // Does store cross heap regions?
+  if (VM_Version::has_DistinctOpnds()) {
+    __ z_xgrk(tmp1, store_addr, new_val);    // tmp1 := store address ^ new value
+  } else {
+    __ z_lgr(tmp1, store_addr);
+    __ z_xgr(tmp1, new_val);
+  }
+  __ z_srag(tmp1, tmp1, G1HeapRegion::LogOfHRGrainBytes); // tmp1 := ((store address ^ new value) >> LogOfHRGrainBytes)
+  __ branch_optimized(Assembler::bcondEqual, done);
+
+  // Crosses regions, storing null?
+  if (new_val_may_be_null) {
+    __ z_ltgr(new_val, new_val);
+    __ z_bre(done);
+  } else {
+#ifdef ASSERT
+    __ z_ltgr(new_val, new_val);
+    __ asm_assert(Assembler::bcondNotZero, "null oop not allowed (G1 post)", 0x322); // Checked by caller.
+#endif
+  }
+
+  __ z_srag(tmp1, store_addr, CardTable::card_shift());
+
+  Address card_table_addr(thread, in_bytes(G1ThreadLocalData::card_table_base_offset()));
+  __ z_alg(tmp1, card_table_addr);     // tmp1 := card address
+
+  if(UseCondCardMark) {
+    __ z_cli(0, tmp1, G1CardTable::clean_card_val());
+    __ branch_optimized(Assembler::bcondNotEqual, done);
+  }
+
+  static_assert(G1CardTable::dirty_card_val() == 0, "must be to use z_mvi");
+  __ z_mvi(0, tmp1, G1CardTable::dirty_card_val()); // *(card address) := dirty_card_val
+
+  __ block_comment("} generate_post_barrier");
+}
+
 #if defined(COMPILER2)
 
 #undef __
@@ -204,57 +255,6 @@ void G1BarrierSetAssembler::generate_c2_pre_barrier_stub(MacroAssembler* masm,
   BLOCK_COMMENT("} generate_c2_pre_barrier_stub");
 }
 
-static void generate_post_barrier(MacroAssembler* masm,
-                                  const Register store_addr,
-                                  const Register new_val,
-                                  const Register thread,
-                                  const Register tmp1,
-                                  const Register tmp2,
-                                  Label& done,
-                                  bool new_val_may_be_null) {
-
-  __ block_comment("generate_post_barrier {");
-
-  assert(thread == Z_thread, "must be");
-  assert_different_registers(store_addr, new_val, thread, tmp1, tmp2, noreg);
-
-  // Does store cross heap regions?
-  if (VM_Version::has_DistinctOpnds()) {
-    __ z_xgrk(tmp1, store_addr, new_val);    // tmp1 := store address ^ new value
-  } else {
-    __ z_lgr(tmp1, store_addr);
-    __ z_xgr(tmp1, new_val);
-  }
-  __ z_srag(tmp1, tmp1, G1HeapRegion::LogOfHRGrainBytes); // tmp1 := ((store address ^ new value) >> LogOfHRGrainBytes)
-  __ branch_optimized(Assembler::bcondEqual, done);
-
-  // Crosses regions, storing null?
-  if (new_val_may_be_null) {
-    __ z_ltgr(new_val, new_val);
-    __ z_bre(done);
-  } else {
-#ifdef ASSERT
-    __ z_ltgr(new_val, new_val);
-    __ asm_assert(Assembler::bcondNotZero, "null oop not allowed (G1 post)", 0x322); // Checked by caller.
-#endif
-  }
-
-  __ z_srag(tmp1, store_addr, CardTable::card_shift());
-
-  Address card_table_addr(thread, in_bytes(G1ThreadLocalData::card_table_base_offset()));
-  __ z_alg(tmp1, card_table_addr);     // tmp1 := card address
-
-  if(UseCondCardMark) {
-    __ z_cli(0, tmp1, G1CardTable::clean_card_val());
-    __ branch_optimized(Assembler::bcondNotEqual, done);
-  }
-
-  static_assert(G1CardTable::dirty_card_val() == 0, "must be to use z_mvi");
-  __ z_mvi(0, tmp1, G1CardTable::dirty_card_val()); // *(card address) := dirty_card_val
-
-  __ block_comment("} generate_post_barrier");
-}
-
 void G1BarrierSetAssembler::g1_write_barrier_post_c2(MacroAssembler* masm,
                                                      Register store_addr,
                                                      Register new_val,
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
index c6f5a4e119c..7617c7a49e8 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -206,6 +206,11 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
   return opto_reg;
 }
 
+void BarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
+  // Load the oop from the weak handle.
+  __ z_lg(obj, Address(obj));
+}
+
 #undef __
 #define __ _masm->
 
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
index 65db915b672..d5682450414 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -65,6 +65,8 @@ public:
 #ifdef COMPILER2
   OptoReg::Name refine_register(const Node* node,
                                 OptoReg::Name opto_reg) const;
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj,
+                                             Register tmp, Label& slow_path);
 #endif // COMPILER2
 
   static const int OFFSET_TO_PATCHABLE_DATA_INSTRUCTION = 6 + 6 + 6; // iihf(6) + iilf(6) + lg(6)
diff --git a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp
index a0da6ebe682..9bb7f63ff31 100644
--- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp
@@ -83,8 +83,7 @@ void CardTableBarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Registe
 
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
                                                                     bool do_return) {
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  CardTable* ct = ctbs->card_table();
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
   NearLabel doXC, done;
   assert_different_registers(Z_R0, Z_R1, addr, count);
@@ -105,7 +104,7 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
   __ add2reg_with_index(count, -BytesPerHeapOop, count, addr);
 
   // Get base address of card table.
-  __ load_const_optimized(Z_R1, (address)ct->byte_map_base());
+  __ load_const_optimized(Z_R1, (address)ctbs->card_table_base_const());
 
   // count = (count>>shift) - (addr>>shift)
   __ z_srlg(addr,  addr,  CardTable::card_shift());
@@ -179,13 +178,12 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
 void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register store_addr, Register tmp) {
   // Does a store check for the oop in register obj. The content of
   // register obj is destroyed afterwards.
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  CardTable* ct = ctbs->card_table();
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
   assert_different_registers(store_addr, tmp);
 
   __ z_srlg(store_addr, store_addr, CardTable::card_shift());
-  __ load_absolute_address(tmp, (address)ct->byte_map_base());
+  __ load_absolute_address(tmp, (address)ctbs->card_table_base_const());
   __ z_agr(store_addr, tmp);
   __ z_mvi(0, store_addr, CardTable::dirty_card_val());
 }
diff --git a/src/hotspot/cpu/s390/globals_s390.hpp b/src/hotspot/cpu/s390/globals_s390.hpp
index 07987ea3469..d110443adf8 100644
--- a/src/hotspot/cpu/s390/globals_s390.hpp
+++ b/src/hotspot/cpu/s390/globals_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -43,7 +43,7 @@ define_pd_global(size_t, CodeCacheSegmentSize,       256);
 // Ideally, this is 256 (cache line size). This keeps code end data
 // on separate lines. But we reduced it to 64 since 256 increased
 // code size significantly by padding nops between IVC and second UEP.
-define_pd_global(intx,  CodeEntryAlignment,          64);
+define_pd_global(uint,  CodeEntryAlignment,          64);
 define_pd_global(intx,  OptoLoopAlignment,           2);
 define_pd_global(intx,  InlineSmallCode,             2000);
 
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index f35e18c7398..78779a9098a 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * Copyright 2024 IBM Corporation. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,6 +44,7 @@
 #include "runtime/icache.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/objectMonitor.hpp"
+#include "runtime/objectMonitorTable.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointMechanism.hpp"
@@ -6372,45 +6373,55 @@ void MacroAssembler::compiler_fast_lock_object(Register obj, Register box, Regis
     if (!UseObjectMonitorTable) {
       assert(tmp1_monitor == mark, "should be the same here");
     } else {
+      const Register tmp1_bucket = tmp1;
+      const Register hash  = Z_R0_scratch;
       NearLabel monitor_found;
 
-      // load cache address
-      z_la(tmp1, Address(Z_thread, JavaThread::om_cache_oops_offset()));
+      // Save the mark, we might need it to extract the hash.
+      z_lgr(hash, mark);
 
-      const int num_unrolled = 2;
+      // Look for the monitor in the om_cache.
+
+      ByteSize cache_offset   = JavaThread::om_cache_oops_offset();
+      ByteSize monitor_offset = OMCache::oop_to_monitor_difference();
+      const int num_unrolled  = OMCache::CAPACITY;
       for (int i = 0; i < num_unrolled; i++) {
-        z_cg(obj, Address(tmp1));
+        z_lg(tmp1_monitor, Address(Z_thread, cache_offset + monitor_offset));
+        z_cg(obj, Address(Z_thread, cache_offset));
         z_bre(monitor_found);
-        add2reg(tmp1, in_bytes(OMCache::oop_to_oop_difference()));
+        cache_offset = cache_offset + OMCache::oop_to_oop_difference();
       }
 
-      NearLabel loop;
-      // Search for obj in cache
+      // Get the hash code.
+      z_srlg(hash, hash, markWord::hash_shift);
 
-      bind(loop);
+      // Get the table and calculate the bucket's address.
+      load_const_optimized(tmp2, ObjectMonitorTable::current_table_address());
+      z_lg(tmp2, Address(tmp2));
+      z_ng(hash, Address(tmp2, ObjectMonitorTable::table_capacity_mask_offset()));
+      z_lg(tmp1_bucket, Address(tmp2, ObjectMonitorTable::table_buckets_offset()));
+      z_sllg(hash, hash, LogBytesPerWord);
+      z_agr(tmp1_bucket, hash);
 
-      // check for match.
-      z_cg(obj, Address(tmp1));
-      z_bre(monitor_found);
+      // Read the monitor from the bucket.
+      z_lg(tmp1_monitor, Address(tmp1_bucket));
 
-      // search until null encountered, guaranteed _null_sentinel at end.
-      add2reg(tmp1, in_bytes(OMCache::oop_to_oop_difference()));
-      z_cghsi(0, tmp1, 0);
-      z_brne(loop); // if not EQ to 0, go for another loop
+      // Check if the monitor in the bucket is special (empty, tombstone or removed).
+      z_clgfi(tmp1_monitor, ObjectMonitorTable::SpecialPointerValues::below_is_special);
+      z_brl(slow_path);
 
-      // we reached to the end, cache miss
-      z_ltgr(obj, obj); // set CC to NE
-      z_bru(slow_path);
+      // Check if object matches.
+      z_lg(tmp2, Address(tmp1_monitor, ObjectMonitor::object_offset()));
+      BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
+      bs_asm->try_resolve_weak_handle_in_c2(this, tmp2, Z_R0_scratch, slow_path);
+      z_cgr(obj, tmp2);
+      z_brne(slow_path);
 
-      // cache hit
       bind(monitor_found);
-      z_lg(tmp1_monitor, Address(tmp1, OMCache::oop_to_monitor_difference()));
     }
     NearLabel monitor_locked;
     // lock the monitor
 
-    // mark contains the tagged ObjectMonitor*.
-    const Register tagged_monitor = mark;
     const Register zero           = tmp2;
 
     const ByteSize monitor_tag = in_ByteSize(UseObjectMonitorTable ? 0 : checked_cast<int>(markWord::monitor_value));
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 5b6f7dcd984..00a830a80cd 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1567,7 +1567,8 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
   //---------------------------------------------------------------------
   wrapper_VEPStart = __ offset();
 
-  if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
+  if (method->needs_clinit_barrier()) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     Label L_skip_barrier;
     Register klass = Z_R1_scratch;
     // Notify OOP recorder (don't need the relocation)
@@ -2378,24 +2379,22 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
 
   // Class initialization barrier for static methods
   entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
-  if (VM_Version::supports_fast_class_init_checks()) {
-    Label L_skip_barrier;
+  assert(VM_Version::supports_fast_class_init_checks(), "sanity");
+  Label L_skip_barrier;
 
-    { // Bypass the barrier for non-static methods
-      __ testbit_ushort(Address(Z_method, Method::access_flags_offset()), JVM_ACC_STATIC_BIT);
-      __ z_bfalse(L_skip_barrier); // non-static
-    }
+  // Bypass the barrier for non-static methods
+  __ testbit_ushort(Address(Z_method, Method::access_flags_offset()), JVM_ACC_STATIC_BIT);
+  __ z_bfalse(L_skip_barrier); // non-static
 
-    Register klass = Z_R11;
-    __ load_method_holder(klass, Z_method);
-    __ clinit_barrier(klass, Z_thread, &L_skip_barrier /*L_fast_path*/);
+  Register klass = Z_R11;
+  __ load_method_holder(klass, Z_method);
+  __ clinit_barrier(klass, Z_thread, &L_skip_barrier /*L_fast_path*/);
 
-    __ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub());
-    __ z_br(klass);
+  __ load_const_optimized(klass, SharedRuntime::get_handle_wrong_method_stub());
+  __ z_br(klass);
 
-    __ bind(L_skip_barrier);
-    entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
-  }
+  __ bind(L_skip_barrier);
+  entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
 
   gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
   return;
diff --git a/src/hotspot/cpu/s390/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp
index 4e8fdf275e4..647915ef4fa 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -2377,7 +2377,8 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   __ z_cli(Address(Rcache, bc_offset), code);
 
   // Class initialization barrier for static methods
-  if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
+  if (bytecode() == Bytecodes::_invokestatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register method = Z_R1_scratch;
     const Register klass  = Z_R1_scratch;
     __ z_brne(L_clinit_barrier_slow);
@@ -2427,8 +2428,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   __ z_cli(Address(cache, code_offset), code);
 
   // Class initialization barrier for static fields
-  if (VM_Version::supports_fast_class_init_checks() &&
-      (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
+  if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register field_holder = index;
 
     __ z_brne(L_clinit_barrier_slow);
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index cbc5c6988d4..3c8defe62d9 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -7320,6 +7320,25 @@ void Assembler::ucomisd(XMMRegister dst, XMMRegister src) {
   emit_int16(0x2E, (0xC0 | encode));
 }
 
+void Assembler::vucomxsd(XMMRegister dst, Address src) {
+  assert(VM_Version::supports_avx10_2(), "");
+  InstructionMark im(this);
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_64bit);
+  attributes.set_is_evex_instruction();
+  vex_prefix(src, 0, dst->encoding(), VEX_SIMD_F2, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x2E);
+  emit_operand(dst, src, 0);
+}
+
+void Assembler::vucomxsd(XMMRegister dst, XMMRegister src) {
+  assert(VM_Version::supports_avx10_2(), "");
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  attributes.set_is_evex_instruction();
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F2, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x2E, (0xC0 | encode));
+}
+
 void Assembler::ucomiss(XMMRegister dst, Address src) {
   InstructionMark im(this);
   InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
@@ -7335,6 +7354,25 @@ void Assembler::ucomiss(XMMRegister dst, XMMRegister src) {
   emit_int16(0x2E, (0xC0 | encode));
 }
 
+void Assembler::vucomxss(XMMRegister dst, Address src) {
+  assert(VM_Version::supports_avx10_2(), "");
+  InstructionMark im(this);
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_T1S, /* input_size_in_bits */ EVEX_32bit);
+  attributes.set_is_evex_instruction();
+  vex_prefix(src, 0, dst->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x2E);
+  emit_operand(dst, src, 0);
+}
+
+void Assembler::vucomxss(XMMRegister dst, XMMRegister src) {
+  assert(VM_Version::supports_avx10_2(), "");
+  InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
+  attributes.set_is_evex_instruction();
+  int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_F3, VEX_OPCODE_0F, &attributes);
+  emit_int16(0x2E, (0xC0 | encode));
+}
+
 void Assembler::xabort(int8_t imm8) {
   emit_int24((unsigned char)0xC6, (unsigned char)0xF8, (imm8 & 0xFF));
 }
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 26c57fc2d80..97854f712cf 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2331,10 +2331,14 @@ private:
   // Unordered Compare Scalar Double-Precision Floating-Point Values and set EFLAGS
   void ucomisd(XMMRegister dst, Address src);
   void ucomisd(XMMRegister dst, XMMRegister src);
+  void vucomxsd(XMMRegister dst, Address src);
+  void vucomxsd(XMMRegister dst, XMMRegister src);
 
   // Unordered Compare Scalar Single-Precision Floating-Point Values and set EFLAGS
   void ucomiss(XMMRegister dst, Address src);
   void ucomiss(XMMRegister dst, XMMRegister src);
+  void vucomxss(XMMRegister dst, Address src);
+  void vucomxss(XMMRegister dst, XMMRegister src);
 
   void xabort(int8_t imm8);
 
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index 37ee9451405..d9be0fdcc8d 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -32,6 +32,7 @@
 #include "c1/c1_ValueStack.hpp"
 #include "ci/ciArrayKlass.hpp"
 #include "ci/ciInstance.hpp"
+#include "code/aotCodeCache.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gc_globals.hpp"
@@ -535,6 +536,15 @@ void LIR_Assembler::const2reg(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_cod
 
     case T_LONG: {
       assert(patch_code == lir_patch_none, "no patching handled here");
+#if INCLUDE_CDS
+      if (AOTCodeCache::is_on_for_dump()) {
+        address b = c->as_pointer();
+        if (AOTRuntimeConstants::contains(b)) {
+          __ load_aotrc_address(dest->as_register_lo(), b);
+          break;
+        }
+      }
+#endif
       __ movptr(dest->as_register_lo(), (intptr_t)c->as_jlong());
       break;
     }
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 8fc3d18abb1..a3ccc081b6b 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,9 @@
 #include "opto/subnode.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/objectMonitor.hpp"
+#include "runtime/objectMonitorTable.hpp"
 #include "runtime/stubRoutines.hpp"
+#include "runtime/synchronizer.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
@@ -217,7 +219,6 @@ inline Assembler::AvxVectorLen C2_MacroAssembler::vector_length_encoding(int vle
 //    In the case of failure, the node will branch directly to the
 //    FailureLabel
 
-
 // obj: object to lock
 // box: on-stack box address -- KILLED
 // rax: tmp -- KILLED
@@ -286,7 +287,7 @@ void C2_MacroAssembler::fast_lock(Register obj, Register box, Register rax_reg,
     // After successful lock, push object on lock-stack.
     movptr(Address(thread, top), obj);
     addl(Address(thread, JavaThread::lock_stack_top_offset()), oopSize);
-    jmpb(locked);
+    jmp(locked);
   }
 
   { // Handle inflated monitor.
@@ -297,38 +298,49 @@ void C2_MacroAssembler::fast_lock(Register obj, Register box, Register rax_reg,
     if (!UseObjectMonitorTable) {
       assert(mark == monitor, "should be the same here");
     } else {
-      // Uses ObjectMonitorTable.  Look for the monitor in the om_cache.
-      // Fetch ObjectMonitor* from the cache or take the slow-path.
+      const Register hash = t;
       Label monitor_found;
 
-      // Load cache address
-      lea(t, Address(thread, JavaThread::om_cache_oops_offset()));
+      // Look for the monitor in the om_cache.
 
-      const int num_unrolled = 2;
+      ByteSize cache_offset   = JavaThread::om_cache_oops_offset();
+      ByteSize monitor_offset = OMCache::oop_to_monitor_difference();
+      const int num_unrolled  = OMCache::CAPACITY;
       for (int i = 0; i < num_unrolled; i++) {
-        cmpptr(obj, Address(t));
+        movptr(monitor, Address(thread,  cache_offset + monitor_offset));
+        cmpptr(obj, Address(thread, cache_offset));
         jccb(Assembler::equal, monitor_found);
-        increment(t, in_bytes(OMCache::oop_to_oop_difference()));
+        cache_offset = cache_offset + OMCache::oop_to_oop_difference();
       }
 
-      Label loop;
+      // Look for the monitor in the table.
 
-      // Search for obj in cache.
-      bind(loop);
+      // Get the hash code.
+      movptr(hash, Address(obj, oopDesc::mark_offset_in_bytes()));
+      shrq(hash, markWord::hash_shift);
+      andq(hash, markWord::hash_mask);
 
-      // Check for match.
-      cmpptr(obj, Address(t));
-      jccb(Assembler::equal, monitor_found);
+      // Get the table and calculate the bucket's address.
+      lea(rax_reg, ExternalAddress(ObjectMonitorTable::current_table_address()));
+      movptr(rax_reg, Address(rax_reg));
+      andq(hash, Address(rax_reg, ObjectMonitorTable::table_capacity_mask_offset()));
+      movptr(rax_reg, Address(rax_reg, ObjectMonitorTable::table_buckets_offset()));
 
-      // Search until null encountered, guaranteed _null_sentinel at end.
-      cmpptr(Address(t), 1);
-      jcc(Assembler::below, slow_path); // 0 check, but with ZF=0 when *t == 0
-      increment(t, in_bytes(OMCache::oop_to_oop_difference()));
-      jmpb(loop);
+      // Read the monitor from the bucket.
+      movptr(monitor, Address(rax_reg, hash, Address::times_ptr));
+
+      // Check if the monitor in the bucket is special (empty, tombstone or removed)
+      cmpptr(monitor, ObjectMonitorTable::SpecialPointerValues::below_is_special);
+      jcc(Assembler::below, slow_path);
+
+      // Check if object matches.
+      movptr(rax_reg, Address(monitor, ObjectMonitor::object_offset()));
+      BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
+      bs_asm->try_resolve_weak_handle_in_c2(this, rax_reg, slow_path);
+      cmpptr(rax_reg, obj);
+      jcc(Assembler::notEqual, slow_path);
 
-      // Cache hit.
       bind(monitor_found);
-      movptr(monitor, Address(t, OMCache::oop_to_monitor_difference()));
     }
     const ByteSize monitor_tag = in_ByteSize(UseObjectMonitorTable ? 0 : checked_cast<int>(markWord::monitor_value));
     const Address recursions_address(monitor, ObjectMonitor::recursions_offset() - monitor_tag);
@@ -487,14 +499,14 @@ void C2_MacroAssembler::fast_unlock(Register obj, Register reg_rax, Register t,
     cmpl(top, in_bytes(JavaThread::lock_stack_base_offset()));
     jcc(Assembler::below, check_done);
     cmpptr(obj, Address(thread, top));
-    jccb(Assembler::notEqual, inflated_check_lock_stack);
+    jcc(Assembler::notEqual, inflated_check_lock_stack);
     stop("Fast Unlock lock on stack");
     bind(check_done);
     if (UseObjectMonitorTable) {
       movptr(mark, Address(obj, oopDesc::mark_offset_in_bytes()));
     }
     testptr(mark, markWord::monitor_value);
-    jccb(Assembler::notZero, inflated);
+    jcc(Assembler::notZero, inflated);
     stop("Fast Unlock not monitor");
 #endif
 
@@ -519,7 +531,7 @@ void C2_MacroAssembler::fast_unlock(Register obj, Register reg_rax, Register t,
 
     // Check if recursive.
     cmpptr(recursions_address, 0);
-    jccb(Assembler::notZero, recursive);
+    jcc(Assembler::notZero, recursive);
 
     // Set owner to null.
     // Release to satisfy the JMM
@@ -530,11 +542,11 @@ void C2_MacroAssembler::fast_unlock(Register obj, Register reg_rax, Register t,
 
     // Check if the entry_list is empty.
     cmpptr(entry_list_address, NULL_WORD);
-    jccb(Assembler::zero, unlocked);    // If so we are done.
+    jcc(Assembler::zero, unlocked);    // If so we are done.
 
     // Check if there is a successor.
     cmpptr(succ_address, NULL_WORD);
-    jccb(Assembler::notZero, unlocked); // If so we are done.
+    jcc(Assembler::notZero, unlocked); // If so we are done.
 
     // Save the monitor pointer in the current thread, so we can try to
     // reacquire the lock in SharedRuntime::monitor_exit_helper().
@@ -1046,17 +1058,28 @@ void C2_MacroAssembler::signum_fp(int opcode, XMMRegister dst, XMMRegister zero,
 
   Label DONE_LABEL;
 
+  // Handle special cases +0.0/-0.0 and NaN, if argument is +0.0/-0.0 or NaN, return argument
+  // If AVX10.2 (or newer) floating point comparison instructions used, SF=1 for equal and unordered cases
+  // If other floating point comparison instructions used, ZF=1 for equal and unordered cases
   if (opcode == Op_SignumF) {
-    ucomiss(dst, zero);
-    jcc(Assembler::equal, DONE_LABEL);    // handle special case +0.0/-0.0, if argument is +0.0/-0.0, return argument
-    jcc(Assembler::parity, DONE_LABEL);   // handle special case NaN, if argument NaN, return NaN
+    if (VM_Version::supports_avx10_2()) {
+      vucomxss(dst, zero);
+      jcc(Assembler::negative, DONE_LABEL);
+    } else {
+      ucomiss(dst, zero);
+      jcc(Assembler::equal, DONE_LABEL);
+    }
     movflt(dst, one);
     jcc(Assembler::above, DONE_LABEL);
     xorps(dst, ExternalAddress(StubRoutines::x86::vector_float_sign_flip()), noreg);
   } else if (opcode == Op_SignumD) {
-    ucomisd(dst, zero);
-    jcc(Assembler::equal, DONE_LABEL);    // handle special case +0.0/-0.0, if argument is +0.0/-0.0, return argument
-    jcc(Assembler::parity, DONE_LABEL);   // handle special case NaN, if argument NaN, return NaN
+    if (VM_Version::supports_avx10_2()) {
+      vucomxsd(dst, zero);
+      jcc(Assembler::negative, DONE_LABEL);
+    } else {
+      ucomisd(dst, zero);
+      jcc(Assembler::equal, DONE_LABEL);
+    }
     movdbl(dst, one);
     jcc(Assembler::above, DONE_LABEL);
     xorpd(dst, ExternalAddress(StubRoutines::x86::vector_double_sign_flip()), noreg);
diff --git a/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp b/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp
index 0951bda0d17..77a149addb5 100644
--- a/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp
+++ b/src/hotspot/cpu/x86/c2_stubGenerator_x86_64_string.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Intel Corporation. All rights reserved.
+ * Copyright (c) 2024, 2026, Intel Corporation. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1330,10 +1330,12 @@ static void big_case_loop_helper(bool sizeKnown, int size, Label &noMatch, Label
   // Clarification:  The BYTE_K compare above compares haystack[(n-32):(n-1)].  We need to
   // compare haystack[(k-1):(k-1+31)].  Subtracting either index gives shift value of
   // (k + 31 - n):  x = (k-1+31)-(n-1) = k-1+31-n+1 = k+31-n.
+  // When isU is set, similarly, shift is from haystack[(n-32):(n-1)] to [(k-2):(k-2+31)]
+
   if (sizeKnown) {
-    __ movl(temp2, 31 + size);
+    __ movl(temp2, (isU ? 30 : 31) + size);
   } else {
-    __ movl(temp2, 31);
+    __ movl(temp2, isU ? 30 : 31);
     __ addl(temp2, needleLen);
   }
   __ subl(temp2, hsLength);
diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
index 34de9403ccf..b20d7b5cd07 100644
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BarrierSetAssembler.hpp"
 #include "gc/g1/g1BarrierSetRuntime.hpp"
@@ -268,6 +269,16 @@ void G1BarrierSetAssembler::g1_write_barrier_pre(MacroAssembler* masm,
   __ bind(done);
 }
 
+#if INCLUDE_CDS
+// return a register that differs from reg1, reg2, reg3 and reg4
+
+static Register pick_different_reg(Register reg1, Register reg2 = noreg, Register reg3= noreg, Register reg4 = noreg) {
+  RegSet available = (RegSet::of(rscratch1, rscratch2, rax, rbx) + rdx -
+                      RegSet::of(reg1, reg2, reg3, reg4));
+  return *(available.begin());
+}
+#endif // INCLUDE_CDS
+
 static void generate_post_barrier(MacroAssembler* masm,
                                   const Register store_addr,
                                   const Register new_val,
@@ -280,10 +291,32 @@ static void generate_post_barrier(MacroAssembler* masm,
 
   Label L_done;
   // Does store cross heap regions?
-  __ movptr(tmp1, store_addr);                                    // tmp1 := store address
-  __ xorptr(tmp1, new_val);                                       // tmp1 := store address ^ new value
-  __ shrptr(tmp1, G1HeapRegion::LogOfHRGrainBytes);               // ((store address ^ new value) >> LogOfHRGrainBytes) == 0?
-  __ jccb(Assembler::equal, L_done);
+#if INCLUDE_CDS
+  // AOT code needs to load the barrier grain shift from the aot
+  // runtime constants area in the code cache otherwise we can compile
+  // it as an immediate operand
+
+  if (AOTCodeCache::is_on_for_dump()) {
+    address grain_shift_addr = AOTRuntimeConstants::grain_shift_address();
+    Register save = pick_different_reg(rcx, tmp1, new_val, store_addr);
+    __ push(save);
+    __ movptr(save, store_addr);
+    __ xorptr(save, new_val);
+    __ push(rcx);
+    __ lea(rcx, ExternalAddress(grain_shift_addr));
+    __ movl(rcx, Address(rcx, 0));
+    __ shrptr(save);
+    __ pop(rcx);
+    __ pop(save);
+    __ jcc(Assembler::equal, L_done);
+  } else
+#endif // INCLUDE_CDS
+  {
+    __ movptr(tmp1, store_addr);                                    // tmp1 := store address
+    __ xorptr(tmp1, new_val);                                       // tmp1 := store address ^ new value
+    __ shrptr(tmp1, G1HeapRegion::LogOfHRGrainBytes);               // ((store address ^ new value) >> LogOfHRGrainBytes) == 0?
+    __ jccb(Assembler::equal, L_done);
+  }
 
   // Crosses regions, storing null?
   if (new_val_may_be_null) {
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index 09c5d93dbb3..215dc30f7fd 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -395,6 +395,11 @@ OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Na
 extern void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
                             int stack_offset, int reg, uint ireg, outputStream* st);
 
+void BarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Label& slowpath) {
+  // Load the oop from the weak handle.
+  __ movptr(obj, Address(obj));
+}
+
 #undef __
 #define __ _masm->
 
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
index c5bf17c3b4e..6aff29850e3 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,8 @@ public:
 #ifdef COMPILER2
   OptoReg::Name refine_register(const Node* node,
                                 OptoReg::Name opto_reg);
+
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Label& slowpath);
 #endif // COMPILER2
 };
 
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
index 2b91662ddb5..0ea769dd488 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "asm/macroAssembler.inline.hpp"
+#include "code/aotCodeCache.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
@@ -95,11 +96,7 @@ void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet d
 
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                     Register addr, Register count, Register tmp) {
-  BarrierSet *bs = BarrierSet::barrier_set();
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-  intptr_t disp = (intptr_t) ct->byte_map_base();
-  SHENANDOAHGC_ONLY(assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");)
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
   Label L_loop, L_done;
   const Register end = count;
@@ -115,7 +112,15 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
   __ shrptr(end, CardTable::card_shift());
   __ subptr(end, addr); // end --> cards count
 
-  __ mov64(tmp, disp);
+#if INCLUDE_CDS
+  if (AOTCodeCache::is_on_for_dump()) {
+    __ lea(tmp, ExternalAddress(AOTRuntimeConstants::card_table_base_address()));
+    __ movq(tmp, Address(tmp, 0));
+  } else
+#endif
+  {
+    __ mov64(tmp, (intptr_t)ctbs->card_table_base_const());
+  }
   __ addptr(addr, tmp);
 __ BIND(L_loop);
   __ movb(Address(addr, count, Address::times_1), 0);
@@ -125,13 +130,10 @@ __ BIND(L_loop);
 __ BIND(L_done);
 }
 
-void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst) {
+void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst, Register rscratch) {
   // Does a store check for the oop in register obj. The content of
   // register obj is destroyed afterwards.
-  BarrierSet* bs = BarrierSet::barrier_set();
-
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
 
   __ shrptr(obj, CardTable::card_shift());
 
@@ -142,7 +144,14 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
   // So this essentially converts an address to a displacement and it will
   // never need to be relocated. On 64bit however the value may be too
   // large for a 32bit displacement.
-  intptr_t byte_map_base = (intptr_t)ct->byte_map_base();
+  intptr_t byte_map_base = (intptr_t)ctbs->card_table_base_const();
+#if INCLUDE_CDS
+  if (AOTCodeCache::is_on_for_dump()) {
+    __ lea(rscratch, ExternalAddress(AOTRuntimeConstants::card_table_base_address()));
+    __ movq(rscratch, Address(rscratch, 0));
+    card_addr = Address(rscratch, obj, Address::times_1, 0);
+  } else
+#endif
   if (__ is_simm32(byte_map_base)) {
     card_addr = Address(noreg, obj, Address::times_1, byte_map_base);
   } else {
@@ -181,10 +190,10 @@ void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorS
   if (needs_post_barrier) {
     // flatten object address if needed
     if (!precise || (dst.index() == noreg && dst.disp() == 0)) {
-      store_check(masm, dst.base(), dst);
+      store_check(masm, dst.base(), dst, tmp2);
     } else {
       __ lea(tmp1, dst);
-      store_check(masm, tmp1, dst);
+      store_check(masm, tmp1, dst, tmp2);
     }
   }
 }
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
index 0a36571c757..201c11062f2 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
@@ -33,7 +33,7 @@ protected:
   virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                Register addr, Register count) {}
 
-  void store_check(MacroAssembler* masm, Register obj, Address dst);
+  void store_check(MacroAssembler* masm, Register obj, Address dst, Register rscratch);
 
   virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, Register tmp);
 
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index 9e321391f6c..67510fac58f 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2021, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -174,24 +175,14 @@ void ShenandoahBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Dec
   }
 }
 
-void ShenandoahBarrierSetAssembler::shenandoah_write_barrier_pre(MacroAssembler* masm,
-                                                                 Register obj,
-                                                                 Register pre_val,
-                                                                 Register tmp,
-                                                                 bool tosca_live,
-                                                                 bool expand_call) {
+void ShenandoahBarrierSetAssembler::satb_barrier(MacroAssembler* masm,
+                                                 Register obj,
+                                                 Register pre_val,
+                                                 Register tmp,
+                                                 bool tosca_live,
+                                                 bool expand_call) {
+  assert(ShenandoahSATBBarrier, "Should be checked by caller");
 
-  if (ShenandoahSATBBarrier) {
-    satb_write_barrier_pre(masm, obj, pre_val, tmp, tosca_live, expand_call);
-  }
-}
-
-void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
-                                                           Register obj,
-                                                           Register pre_val,
-                                                           Register tmp,
-                                                           bool tosca_live,
-                                                           bool expand_call) {
   // If expand_call is true then we expand the call_VM_leaf macro
   // directly to skip generating the check by
   // InterpreterMacroAssembler::call_VM_leaf_base that checks _last_sp.
@@ -533,18 +524,18 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d
     assert_different_registers(dst, tmp1, r15_thread);
     // Generate the SATB pre-barrier code to log the value of
     // the referent field in an SATB buffer.
-    shenandoah_write_barrier_pre(masm /* masm */,
-                                 noreg /* obj */,
-                                 dst /* pre_val */,
-                                 tmp1 /* tmp */,
-                                 true /* tosca_live */,
-                                 true /* expand_call */);
+    satb_barrier(masm /* masm */,
+                 noreg /* obj */,
+                 dst /* pre_val */,
+                 tmp1 /* tmp */,
+                 true /* tosca_live */,
+                 true /* expand_call */);
 
     restore_machine_state(masm, /* handle_gpr = */ true, /* handle_fp = */ true);
   }
 }
 
-void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj) {
+void ShenandoahBarrierSetAssembler::card_barrier(MacroAssembler* masm, Register obj) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
 
   // Does a store check for the oop in register obj. The content of
@@ -575,41 +566,40 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
               Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
 
-  bool on_oop = is_reference_type(type);
-  bool in_heap = (decorators & IN_HEAP) != 0;
-  bool as_normal = (decorators & AS_NORMAL) != 0;
-  if (on_oop && in_heap) {
-    bool needs_pre_barrier = as_normal;
+  // 1: non-reference types require no barriers
+  if (!is_reference_type(type)) {
+    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+    return;
+  }
 
-    // flatten object address if needed
-    // We do it regardless of precise because we need the registers
-    if (dst.index() == noreg && dst.disp() == 0) {
-      if (dst.base() != tmp1) {
-        __ movptr(tmp1, dst.base());
-      }
-    } else {
-      __ lea(tmp1, dst);
-    }
-
-    assert_different_registers(val, tmp1, tmp2, tmp3, r15_thread);
-
-    if (needs_pre_barrier) {
-      shenandoah_write_barrier_pre(masm /*masm*/,
-                                   tmp1 /* obj */,
-                                   tmp2 /* pre_val */,
-                                   tmp3  /* tmp */,
-                                   val != noreg /* tosca_live */,
-                                   false /* expand_call */);
-    }
-
-    BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
-    if (val != noreg) {
-      if (ShenandoahCardBarrier) {
-        store_check(masm, tmp1);
-      }
+  // Flatten object address right away for simplicity: likely needed by barriers
+  assert_different_registers(val, tmp1, tmp2, tmp3, r15_thread);
+  if (dst.index() == noreg && dst.disp() == 0) {
+    if (dst.base() != tmp1) {
+      __ movptr(tmp1, dst.base());
     }
   } else {
-    BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
+    __ lea(tmp1, dst);
+  }
+
+  bool storing_non_null = (val != noreg);
+
+  // 2: pre-barrier: SATB needs the previous value
+  if (ShenandoahBarrierSet::need_satb_barrier(decorators, type)) {
+    satb_barrier(masm,
+                 tmp1 /* obj */,
+                 tmp2 /* pre_val */,
+                 tmp3 /* tmp */,
+                 storing_non_null /* tosca_live */,
+                 false /* expand_call */);
+  }
+
+  // Store!
+  BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
+
+  // 3: post-barrier: card barrier needs store address
+  if (ShenandoahBarrierSet::need_card_barrier(decorators, type) && storing_non_null) {
+    card_barrier(masm, tmp1);
   }
 }
 
@@ -629,6 +619,27 @@ void ShenandoahBarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler
   __ bind(done);
 }
 
+#ifdef COMPILER2
+void ShenandoahBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Label& slowpath) {
+  Label done;
+
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, slowpath);
+
+  // Check if the reference is null, and if it is, take the fast path.
+  __ testptr(obj, obj);
+  __ jcc(Assembler::zero, done);
+
+  Address gc_state(r15_thread, ShenandoahThreadLocalData::gc_state_offset());
+
+  // Check if the heap is under weak-reference/roots processing, in
+  // which case we need to take the slow path.
+  __ testb(gc_state, ShenandoahHeap::WEAK_ROOTS);
+  __ jcc(Assembler::notZero, slowpath);
+  __ bind(done);
+}
+#endif // COMPILER2
+
 // Special Shenandoah CAS implementation that handles false negatives
 // due to concurrent evacuation.
 void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
index b0185f2dbff..79540aa19e1 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2021, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,21 +42,14 @@ class StubCodeGenerator;
 class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
 private:
 
-  void satb_write_barrier_pre(MacroAssembler* masm,
-                              Register obj,
-                              Register pre_val,
-                              Register tmp,
-                              bool tosca_live,
-                              bool expand_call);
+  void satb_barrier(MacroAssembler* masm,
+                    Register obj,
+                    Register pre_val,
+                    Register tmp,
+                    bool tosca_live,
+                    bool expand_call);
 
-  void shenandoah_write_barrier_pre(MacroAssembler* masm,
-                                    Register obj,
-                                    Register pre_val,
-                                    Register tmp,
-                                    bool tosca_live,
-                                    bool expand_call);
-
-  void store_check(MacroAssembler* masm, Register obj);
+  void card_barrier(MacroAssembler* masm, Register obj);
 
   void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                         Register addr, Register count,
@@ -84,6 +78,9 @@ public:
                         Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
   virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
                                              Register obj, Register tmp, Label& slowpath);
+#ifdef COMPILER2
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Label& slowpath);
+#endif // COMPILER2
 };
 
 #endif // CPU_X86_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
index ae93cca8c19..47a3dad54e7 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1328,6 +1328,19 @@ void ZBarrierSetAssembler::generate_c2_store_barrier_stub(MacroAssembler* masm,
   __ jmp(slow_continuation);
 }
 
+void ZBarrierSetAssembler::try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Label& slow_path) {
+  // Resolve weak handle using the standard implementation.
+  BarrierSetAssembler::try_resolve_weak_handle_in_c2(masm, obj, slow_path);
+
+  // Check if the oop is bad, in which case we need to take the slow path.
+  __ testptr(obj, Address(r15_thread, ZThreadLocalData::mark_bad_mask_offset()));
+  __ jcc(Assembler::notZero, slow_path);
+
+  // Oop is okay, so we uncolor it.
+  __ relocate(barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
+  __ shrq(obj, barrier_Relocation::unpatched);
+}
+
 #undef __
 #endif // COMPILER2
 
diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
index 19902500f93..e91e2b9ea20 100644
--- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -167,6 +167,8 @@ public:
                                      ZLoadBarrierStubC2* stub) const;
   void generate_c2_store_barrier_stub(MacroAssembler* masm,
                                       ZStoreBarrierStubC2* stub) const;
+
+  virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Label& slow_path);
 #endif // COMPILER2
 
   void store_barrier_fast(MacroAssembler* masm,
diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp
index 103e22d0185..4f5b6d31e75 100644
--- a/src/hotspot/cpu/x86/globals_x86.hpp
+++ b/src/hotspot/cpu/x86/globals_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,9 @@ define_pd_global(size_t, CodeCacheSegmentSize,   64 COMPILER1_AND_COMPILER2_PRES
 // the uep and the vep doesn't get real alignment but just slops on by
 // only assured that the entry instruction meets the 5 byte size requirement.
 #if COMPILER2_OR_JVMCI
-define_pd_global(intx, CodeEntryAlignment,       32);
+define_pd_global(uint, CodeEntryAlignment,       32);
 #else
-define_pd_global(intx, CodeEntryAlignment,       16);
+define_pd_global(uint, CodeEntryAlignment,       16);
 #endif // COMPILER2_OR_JVMCI
 define_pd_global(intx, OptoLoopAlignment,        16);
 define_pd_global(intx, InlineSmallCode,          1000);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index be7deb884ce..b54f6adc263 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -765,7 +765,7 @@ void MacroAssembler::align32() {
 
 void MacroAssembler::align(uint modulus) {
   // 8273459: Ensure alignment is possible with current segment alignment
-  assert(modulus <= (uintx)CodeEntryAlignment, "Alignment must be <= CodeEntryAlignment");
+  assert(modulus <= CodeEntryAlignment, "Alignment must be <= CodeEntryAlignment");
   align(modulus, offset());
 }
 
@@ -2656,6 +2656,17 @@ void MacroAssembler::ucomisd(XMMRegister dst, AddressLiteral src, Register rscra
   }
 }
 
+void MacroAssembler::vucomxsd(XMMRegister dst, AddressLiteral src, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (reachable(src)) {
+    Assembler::vucomxsd(dst, as_Address(src));
+  } else {
+    lea(rscratch, src);
+    Assembler::vucomxsd(dst, Address(rscratch, 0));
+  }
+}
+
 void MacroAssembler::ucomiss(XMMRegister dst, AddressLiteral src, Register rscratch) {
   assert(rscratch != noreg || always_reachable(src), "missing");
 
@@ -2667,6 +2678,17 @@ void MacroAssembler::ucomiss(XMMRegister dst, AddressLiteral src, Register rscra
   }
 }
 
+void MacroAssembler::vucomxss(XMMRegister dst, AddressLiteral src, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (reachable(src)) {
+    Assembler::vucomxss(dst, as_Address(src));
+  } else {
+    lea(rscratch, src);
+    Assembler::vucomxss(dst, Address(rscratch, 0));
+  }
+}
+
 void MacroAssembler::xorpd(XMMRegister dst, AddressLiteral src, Register rscratch) {
   assert(rscratch != noreg || always_reachable(src), "missing");
 
@@ -6086,7 +6108,7 @@ void MacroAssembler::generate_fill(BasicType t, bool aligned,
           vpbroadcastd(xtmp, xtmp, Assembler::AVX_512bit);
 
           subptr(count, 16 << shift);
-          jccb(Assembler::less, L_check_fill_32_bytes);
+          jcc(Assembler::less, L_check_fill_32_bytes);
           align(16);
 
           BIND(L_fill_64_bytes_loop_avx3);
@@ -6251,32 +6273,46 @@ void MacroAssembler::evpbroadcast(BasicType type, XMMRegister dst, Register src,
   }
 }
 
-// encode char[] to byte[] in ISO_8859_1 or ASCII
-   //@IntrinsicCandidate
-   //private static int implEncodeISOArray(byte[] sa, int sp,
-   //byte[] da, int dp, int len) {
-   //  int i = 0;
-   //  for (; i < len; i++) {
-   //    char c = StringUTF16.getChar(sa, sp++);
-   //    if (c > '\u00FF')
-   //      break;
-   //    da[dp++] = (byte)c;
-   //  }
-   //  return i;
-   //}
-   //
-   //@IntrinsicCandidate
-   //private static int implEncodeAsciiArray(char[] sa, int sp,
-   //    byte[] da, int dp, int len) {
-   //  int i = 0;
-   //  for (; i < len; i++) {
-   //    char c = sa[sp++];
-   //    if (c >= '\u0080')
-   //      break;
-   //    da[dp++] = (byte)c;
-   //  }
-   //  return i;
-   //}
+// Encode given char[]/byte[] to byte[] in ISO_8859_1 or ASCII
+//
+// @IntrinsicCandidate
+// int sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(
+//         char[] sa, int sp, byte[] da, int dp, int len) {
+//     int i = 0;
+//     for (; i < len; i++) {
+//         char c = sa[sp++];
+//         if (c > '\u00FF')
+//             break;
+//         da[dp++] = (byte) c;
+//     }
+//     return i;
+// }
+//
+// @IntrinsicCandidate
+// int java.lang.StringCoding.encodeISOArray0(
+//         byte[] sa, int sp, byte[] da, int dp, int len) {
+//   int i = 0;
+//   for (; i < len; i++) {
+//     char c = StringUTF16.getChar(sa, sp++);
+//     if (c > '\u00FF')
+//       break;
+//     da[dp++] = (byte) c;
+//   }
+//   return i;
+// }
+//
+// @IntrinsicCandidate
+// int java.lang.StringCoding.encodeAsciiArray0(
+//         char[] sa, int sp, byte[] da, int dp, int len) {
+//   int i = 0;
+//   for (; i < len; i++) {
+//     char c = sa[sp++];
+//     if (c >= '\u0080')
+//       break;
+//     da[dp++] = (byte) c;
+//   }
+//   return i;
+// }
 void MacroAssembler::encode_iso_array(Register src, Register dst, Register len,
   XMMRegister tmp1Reg, XMMRegister tmp2Reg,
   XMMRegister tmp3Reg, XMMRegister tmp4Reg,
@@ -9998,6 +10034,20 @@ void MacroAssembler::restore_legacy_gprs() {
   addq(rsp, 16 * wordSize);
 }
 
+void MacroAssembler::load_aotrc_address(Register reg, address a) {
+#if INCLUDE_CDS
+  assert(AOTRuntimeConstants::contains(a), "address out of range for data area");
+  if (AOTCodeCache::is_on_for_dump()) {
+    // all aotrc field addresses should be registered in the AOTCodeCache address table
+    lea(reg, ExternalAddress(a));
+  } else {
+    mov64(reg, (uint64_t)a);
+  }
+#else
+  ShouldNotReachHere();
+#endif
+}
+
 void MacroAssembler::setcc(Assembler::Condition comparison, Register dst) {
   if (VM_Version::supports_apx_f()) {
     esetzucc(comparison, dst);
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index 93e3529ac1e..5c049f710e2 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1313,10 +1313,18 @@ public:
   void ucomiss(XMMRegister dst, Address        src) { Assembler::ucomiss(dst, src); }
   void ucomiss(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
 
+  void vucomxss(XMMRegister dst, XMMRegister    src) { Assembler::vucomxss(dst, src); }
+  void vucomxss(XMMRegister dst, Address        src) { Assembler::vucomxss(dst, src); }
+  void vucomxss(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
+
   void ucomisd(XMMRegister dst, XMMRegister    src) { Assembler::ucomisd(dst, src); }
   void ucomisd(XMMRegister dst, Address        src) { Assembler::ucomisd(dst, src); }
   void ucomisd(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
 
+  void vucomxsd(XMMRegister dst, XMMRegister    src) { Assembler::vucomxsd(dst, src); }
+  void vucomxsd(XMMRegister dst, Address        src) { Assembler::vucomxsd(dst, src); }
+  void vucomxsd(XMMRegister dst, AddressLiteral src, Register rscratch = noreg);
+
   // Bitwise Logical XOR of Packed Double-Precision Floating-Point Values
   void xorpd(XMMRegister dst, XMMRegister    src);
   void xorpd(XMMRegister dst, Address        src) { Assembler::xorpd(dst, src); }
@@ -2062,6 +2070,7 @@ public:
 
   void save_legacy_gprs();
   void restore_legacy_gprs();
+  void load_aotrc_address(Register reg, address a);
   void setcc(Assembler::Condition comparison, Register dst);
 };
 
diff --git a/src/hotspot/cpu/x86/register_x86.cpp b/src/hotspot/cpu/x86/register_x86.cpp
index e6083429344..188af9264a8 100644
--- a/src/hotspot/cpu/x86/register_x86.cpp
+++ b/src/hotspot/cpu/x86/register_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,14 +32,10 @@ const KRegister::KRegisterImpl         all_KRegisterImpls    [KRegister::number_
 
 const char * Register::RegisterImpl::name() const {
   static const char *const names[number_of_registers] = {
-#ifdef _LP64
     "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi",
     "r8",  "r9",  "r10", "r11", "r12", "r13", "r14", "r15",
     "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
     "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31"
-#else
-    "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"
-#endif // _LP64
   };
   return is_valid() ? names[encoding()] : "noreg";
 }
@@ -54,11 +50,9 @@ const char* FloatRegister::FloatRegisterImpl::name() const {
 const char* XMMRegister::XMMRegisterImpl::name() const {
   static const char *const names[number_of_registers] = {
     "xmm0",    "xmm1",  "xmm2",  "xmm3",  "xmm4",  "xmm5",  "xmm6",  "xmm7"
-#ifdef _LP64
     ,"xmm8",   "xmm9",  "xmm10", "xmm11", "xmm12", "xmm13", "xmm14", "xmm15"
     ,"xmm16",  "xmm17", "xmm18", "xmm19", "xmm20", "xmm21", "xmm22", "xmm23"
     ,"xmm24",  "xmm25", "xmm26", "xmm27", "xmm28", "xmm29", "xmm30", "xmm31"
-#endif // _LP64
   };
   return is_valid() ? names[encoding()] : "xnoreg";
 }
diff --git a/src/hotspot/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp
index 0a8ecb7be26..5e0326b9aad 100644
--- a/src/hotspot/cpu/x86/register_x86.hpp
+++ b/src/hotspot/cpu/x86/register_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 class VMRegImpl;
 typedef VMRegImpl* VMReg;
 
-// The implementation of integer registers for the x86/x64 architectures.
+// The implementation of integer registers for the x64 architectures.
 class Register {
 private:
   int _encoding;
@@ -44,11 +44,9 @@ private:
 public:
   inline friend constexpr Register as_Register(int encoding);
 
-  enum {
-    number_of_registers      = LP64_ONLY( 32 ) NOT_LP64( 8 ),
-    number_of_byte_registers = LP64_ONLY( 32 ) NOT_LP64( 4 ),
-    max_slots_per_register   = LP64_ONLY(  2 ) NOT_LP64( 1 )
-  };
+  static const int number_of_registers      = 32;
+  static const int number_of_byte_registers = 32;
+  static const int max_slots_per_register   =  2;
 
   class RegisterImpl: public AbstractRegisterImpl {
     friend class Register;
@@ -79,11 +77,9 @@ public:
 
   // Actually available GP registers for use, depending on actual CPU capabilities and flags.
   static int available_gp_registers() {
-#ifdef _LP64
     if (!UseAPX) {
       return number_of_registers / 2;
     }
-#endif // _LP64
     return number_of_registers;
   }
 };
@@ -116,9 +112,8 @@ constexpr Register rsp = as_Register(4);
 constexpr Register rbp = as_Register(5);
 constexpr Register rsi = as_Register(6);
 constexpr Register rdi = as_Register(7);
-#ifdef _LP64
-constexpr Register r8  = as_Register( 8);
-constexpr Register r9  = as_Register( 9);
+constexpr Register r8  = as_Register(8);
+constexpr Register r9  = as_Register(9);
 constexpr Register r10 = as_Register(10);
 constexpr Register r11 = as_Register(11);
 constexpr Register r12 = as_Register(12);
@@ -141,7 +136,6 @@ constexpr Register r28 = as_Register(28);
 constexpr Register r29 = as_Register(29);
 constexpr Register r30 = as_Register(30);
 constexpr Register r31 = as_Register(31);
-#endif // _LP64
 
 
 // The implementation of x87 floating point registers for the ia32 architecture.
@@ -154,10 +148,8 @@ private:
 public:
   inline friend constexpr FloatRegister as_FloatRegister(int encoding);
 
-  enum {
-    number_of_registers    = 8,
-    max_slots_per_register = 2
-  };
+  static const int number_of_registers    = 8;
+  static const int max_slots_per_register = 2;
 
   class FloatRegisterImpl: public AbstractRegisterImpl {
     friend class FloatRegister;
@@ -217,10 +209,8 @@ private:
 public:
   inline friend constexpr XMMRegister as_XMMRegister(int encoding);
 
-  enum {
-    number_of_registers    = LP64_ONLY( 32 ) NOT_LP64(  8 ),
-    max_slots_per_register = LP64_ONLY( 16 ) NOT_LP64( 16 )   // 512-bit
-  };
+  static const int number_of_registers    =  32;
+  static const int max_slots_per_register =  16; // 512-bit
 
   class XMMRegisterImpl: public AbstractRegisterImpl {
     friend class XMMRegister;
@@ -250,11 +240,9 @@ public:
 
   // Actually available XMM registers for use, depending on actual CPU capabilities and flags.
   static int available_xmm_registers() {
-#ifdef _LP64
     if (UseAVX < 3) {
       return number_of_registers / 2;
     }
-#endif // _LP64
     return number_of_registers;
   }
 };
@@ -287,7 +275,6 @@ constexpr XMMRegister xmm4  = as_XMMRegister( 4);
 constexpr XMMRegister xmm5  = as_XMMRegister( 5);
 constexpr XMMRegister xmm6  = as_XMMRegister( 6);
 constexpr XMMRegister xmm7  = as_XMMRegister( 7);
-#ifdef _LP64
 constexpr XMMRegister xmm8  = as_XMMRegister( 8);
 constexpr XMMRegister xmm9  = as_XMMRegister( 9);
 constexpr XMMRegister xmm10 = as_XMMRegister(10);
@@ -312,7 +299,6 @@ constexpr XMMRegister xmm28 = as_XMMRegister(28);
 constexpr XMMRegister xmm29 = as_XMMRegister(29);
 constexpr XMMRegister xmm30 = as_XMMRegister(30);
 constexpr XMMRegister xmm31 = as_XMMRegister(31);
-#endif // _LP64
 
 
 // The implementation of AVX-512 opmask registers.
@@ -394,25 +380,17 @@ constexpr KRegister k7 = as_KRegister(7);
 // Define a class that exports it.
 class ConcreteRegisterImpl : public AbstractRegisterImpl {
  public:
-  enum {
-    max_gpr = Register::number_of_registers * Register::max_slots_per_register,
-    max_fpr = max_gpr + FloatRegister::number_of_registers * FloatRegister::max_slots_per_register,
-    max_xmm = max_fpr + XMMRegister::number_of_registers * XMMRegister::max_slots_per_register,
-    max_kpr = max_xmm + KRegister::number_of_registers * KRegister::max_slots_per_register,
+    static const int max_gpr = Register::number_of_registers * Register::max_slots_per_register;
+    static const int max_fpr = max_gpr + FloatRegister::number_of_registers * FloatRegister::max_slots_per_register;
+    static const int max_xmm = max_fpr + XMMRegister::number_of_registers * XMMRegister::max_slots_per_register;
+    static const int max_kpr = max_xmm + KRegister::number_of_registers * KRegister::max_slots_per_register;
 
     // A big enough number for C2: all the registers plus flags
     // This number must be large enough to cover REG_COUNT (defined by c2) registers.
     // There is no requirement that any ordering here matches any ordering c2 gives
     // it's optoregs.
-
-    // x86_32.ad defines additional dummy FILL0-FILL7 registers, in order to tally
-    // REG_COUNT (computed by ADLC based on the number of reg_defs seen in .ad files)
-    // with ConcreteRegisterImpl::number_of_registers additional count of 8 is being
-    // added for 32 bit jvm.
-    number_of_registers = max_kpr +       // gpr/fpr/xmm/kpr
-                          NOT_LP64( 8 + ) // FILL0-FILL7 in x86_32.ad
-                          1               // eflags
-  };
+    static const int number_of_registers = max_kpr + // gpr/fpr/xmm/kpr
+                                           1;        // eflags
 };
 
 template <>
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 5a4a5b1809e..bbd43c1a0e8 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1043,26 +1043,24 @@ void SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
 
   // Class initialization barrier for static methods
   entry_address[AdapterBlob::C2I_No_Clinit_Check] = nullptr;
-  if (VM_Version::supports_fast_class_init_checks()) {
-    Label L_skip_barrier;
-    Register method = rbx;
+  assert(VM_Version::supports_fast_class_init_checks(), "sanity");
+  Label L_skip_barrier;
+  Register method = rbx;
 
-    { // Bypass the barrier for non-static methods
-      Register flags = rscratch1;
-      __ load_unsigned_short(flags, Address(method, Method::access_flags_offset()));
-      __ testl(flags, JVM_ACC_STATIC);
-      __ jcc(Assembler::zero, L_skip_barrier); // non-static
-    }
+  // Bypass the barrier for non-static methods
+  Register flags = rscratch1;
+  __ load_unsigned_short(flags, Address(method, Method::access_flags_offset()));
+  __ testl(flags, JVM_ACC_STATIC);
+  __ jcc(Assembler::zero, L_skip_barrier); // non-static
 
-    Register klass = rscratch1;
-    __ load_method_holder(klass, method);
-    __ clinit_barrier(klass, &L_skip_barrier /*L_fast_path*/);
+  Register klass = rscratch1;
+  __ load_method_holder(klass, method);
+  __ clinit_barrier(klass, &L_skip_barrier /*L_fast_path*/);
 
-    __ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub())); // slow path
+  __ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub())); // slow path
 
-    __ bind(L_skip_barrier);
-    entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
-  }
+  __ bind(L_skip_barrier);
+  entry_address[AdapterBlob::C2I_No_Clinit_Check] = __ pc();
 
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->c2i_entry_barrier(masm);
@@ -1904,7 +1902,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
   int vep_offset = ((intptr_t)__ pc()) - start;
 
-  if (VM_Version::supports_fast_class_init_checks() && method->needs_clinit_barrier()) {
+  if (method->needs_clinit_barrier()) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     Label L_skip_barrier;
     Register klass = r10;
     __ mov_metadata(klass, method->method_holder()); // InstanceKlass*
@@ -3602,4 +3601,3 @@ RuntimeStub* SharedRuntime::generate_jfr_return_lease() {
 }
 
 #endif // INCLUDE_JFR
-
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp
index 3e5593322d5..7d5dee6a5df 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,39 @@ static address kyberAvx512ConstsAddr(int offset) {
 
 const Register scratch = r10;
 
+ATTRIBUTE_ALIGNED(64) static const uint8_t kyberAvx512_12To16Dup[] = {
+// 0 - 63
+    0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 7, 8, 9, 10, 10, 11, 12, 13, 13, 14, 15, 16,
+    16, 17, 18, 19, 19, 20, 21, 22, 22, 23, 24, 25, 25, 26, 27, 28, 28, 29, 30,
+    31, 31, 32, 33, 34, 34, 35, 36, 37, 37, 38, 39, 40, 40, 41, 42, 43, 43, 44,
+    45, 46, 46, 47
+  };
+
+static address kyberAvx512_12To16DupAddr() {
+  return (address) kyberAvx512_12To16Dup;
+}
+
+ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512_12To16Shift[] = {
+// 0 - 31
+    0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0,
+    4, 0, 4, 0, 4, 0, 4
+  };
+
+static address kyberAvx512_12To16ShiftAddr() {
+  return (address) kyberAvx512_12To16Shift;
+}
+
+ATTRIBUTE_ALIGNED(64) static const uint64_t kyberAvx512_12To16And[] = {
+// 0 - 7
+    0x0FFF0FFF0FFF0FFF, 0x0FFF0FFF0FFF0FFF, 0x0FFF0FFF0FFF0FFF,
+    0x0FFF0FFF0FFF0FFF, 0x0FFF0FFF0FFF0FFF, 0x0FFF0FFF0FFF0FFF,
+    0x0FFF0FFF0FFF0FFF, 0x0FFF0FFF0FFF0FFF
+  };
+
+static address kyberAvx512_12To16AndAddr() {
+  return (address) kyberAvx512_12To16And;
+}
+
 ATTRIBUTE_ALIGNED(64) static const uint16_t kyberAvx512NttPerms[] = {
 // 0
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
@@ -822,10 +855,65 @@ address generate_kyber12To16_avx512(StubGenerator *stubgen,
 
   const Register perms = r11;
 
-  Label Loop;
+  Label Loop, VBMILoop;
 
   __ addptr(condensed, condensedOffs);
 
+  if (VM_Version::supports_avx512_vbmi()) {
+    // mask load for the first 48 bytes of each vector
+    __ mov64(rax, 0x0000FFFFFFFFFFFF);
+    __ kmovql(k1, rax);
+
+    __ lea(perms, ExternalAddress(kyberAvx512_12To16DupAddr()));
+    __ evmovdqub(xmm20, Address(perms), Assembler::AVX_512bit);
+
+    __ lea(perms, ExternalAddress(kyberAvx512_12To16ShiftAddr()));
+    __ evmovdquw(xmm21, Address(perms), Assembler::AVX_512bit);
+
+    __ lea(perms, ExternalAddress(kyberAvx512_12To16AndAddr()));
+    __ evmovdquq(xmm22, Address(perms), Assembler::AVX_512bit);
+
+    __ align(OptoLoopAlignment);
+    __ BIND(VBMILoop);
+
+      __ evmovdqub(xmm0, k1, Address(condensed, 0), false,
+                   Assembler::AVX_512bit);
+      __ evmovdqub(xmm1, k1, Address(condensed, 48), false,
+                   Assembler::AVX_512bit);
+      __ evmovdqub(xmm2, k1, Address(condensed, 96), false,
+                   Assembler::AVX_512bit);
+      __ evmovdqub(xmm3, k1, Address(condensed, 144), false,
+                   Assembler::AVX_512bit);
+
+      __ evpermb(xmm4, k0, xmm20, xmm0, false, Assembler::AVX_512bit);
+      __ evpermb(xmm5, k0, xmm20, xmm1, false, Assembler::AVX_512bit);
+      __ evpermb(xmm6, k0, xmm20, xmm2, false, Assembler::AVX_512bit);
+      __ evpermb(xmm7, k0, xmm20, xmm3, false, Assembler::AVX_512bit);
+
+      __ evpsrlvw(xmm4, xmm4, xmm21, Assembler::AVX_512bit);
+      __ evpsrlvw(xmm5, xmm5, xmm21, Assembler::AVX_512bit);
+      __ evpsrlvw(xmm6, xmm6, xmm21, Assembler::AVX_512bit);
+      __ evpsrlvw(xmm7, xmm7, xmm21, Assembler::AVX_512bit);
+
+      __ evpandq(xmm0, xmm22, xmm4, Assembler::AVX_512bit);
+      __ evpandq(xmm1, xmm22, xmm5, Assembler::AVX_512bit);
+      __ evpandq(xmm2, xmm22, xmm6, Assembler::AVX_512bit);
+      __ evpandq(xmm3, xmm22, xmm7, Assembler::AVX_512bit);
+
+      store4regs(parsed, 0, xmm0_3, _masm);
+
+      __ addptr(condensed, 192);
+      __ addptr(parsed, 256);
+      __ subl(parsedLength, 128);
+      __ jcc(Assembler::greater, VBMILoop);
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov64(rax, 0); // return 0
+    __ ret(0);
+
+    return start;
+  }
+
   __ lea(perms, ExternalAddress(kyberAvx512_12To16PermsAddr()));
 
   load4regs(xmm24_27, perms, 0, _masm);
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 42392b84833..db7749ec482 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2216,7 +2216,8 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   __ cmpl(temp, code);  // have we resolved this bytecode?
 
   // Class initialization barrier for static methods
-  if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
+  if (bytecode() == Bytecodes::_invokestatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register method = temp;
     const Register klass  = temp;
 
@@ -2264,8 +2265,8 @@ void TemplateTable::resolve_cache_and_index_for_field(int byte_no,
   __ cmpl(temp, code);  // have we resolved this bytecode?
 
   // Class initialization barrier for static fields
-  if (VM_Version::supports_fast_class_init_checks() &&
-      (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic)) {
+  if (bytecode() == Bytecodes::_getstatic || bytecode() == Bytecodes::_putstatic) {
+    assert(VM_Version::supports_fast_class_init_checks(), "sanity");
     const Register field_holder = temp;
 
     __ jcc(Assembler::notEqual, L_clinit_barrier_slow);
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 747daefd51d..78d6dec08cf 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ int VM_Version::_stepping;
 bool VM_Version::_has_intel_jcc_erratum;
 VM_Version::CpuidInfo VM_Version::_cpuid_info = { 0, };
 
-#define DECLARE_CPU_FEATURE_NAME(id, name, bit) name,
+#define DECLARE_CPU_FEATURE_NAME(id, name, bit) XSTR(name),
 const char* VM_Version::_features_names[] = { CPU_FEATURE_FLAGS(DECLARE_CPU_FEATURE_NAME)};
 #undef DECLARE_CPU_FEATURE_NAME
 
@@ -143,7 +143,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
 
     Label detect_486, cpu486, detect_586, std_cpuid1, std_cpuid4, std_cpuid24, std_cpuid29;
     Label sef_cpuid, sefsl1_cpuid, ext_cpuid, ext_cpuid1, ext_cpuid5, ext_cpuid7;
-    Label ext_cpuid8, done, wrapup, vector_save_restore, apx_save_restore_warning;
+    Label ext_cpuid8, done, wrapup, vector_save_restore, apx_save_restore_warning, apx_xstate;
     Label legacy_setup, save_restore_except, legacy_save_restore, start_simd_check;
 
     StubCodeMark mark(this, "VM_Version", "get_cpu_info_stub");
@@ -468,6 +468,20 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
     __ movq(Address(rsi, 0), r16);
     __ movq(Address(rsi, 8), r31);
 
+    //
+    // Query CPUID 0xD.19 for APX XSAVE offset
+    // Extended State Enumeration Sub-leaf 19 (APX)
+    // EAX = size of APX state (should be 128)
+    // EBX = offset in standard XSAVE format
+    //
+    __ movl(rax, 0xD);
+    __ movl(rcx, 19);
+    __ cpuid();
+    __ lea(rsi, Address(rbp, in_bytes(VM_Version::apx_xstate_size_offset())));
+    __ movl(Address(rsi, 0), rax);
+    __ lea(rsi, Address(rbp, in_bytes(VM_Version::apx_xstate_offset_offset())));
+    __ movl(Address(rsi, 0), rbx);
+
     UseAPX = save_apx;
     __ bind(vector_save_restore);
     //
@@ -921,8 +935,9 @@ void VM_Version::get_processor_features() {
 
   // Check if processor has Intel Ecore
   if (FLAG_IS_DEFAULT(EnableX86ECoreOpts) && is_intel() && is_intel_server_family() &&
-    (_model == 0x97 || _model == 0xAA || _model == 0xAC || _model == 0xAF ||
-      _model == 0xCC || _model == 0xDD)) {
+    (supports_hybrid() ||
+     _model == 0xAF /* Xeon 6 E-cores (Sierra Forest) */ ||
+     _model == 0xDD /* Xeon 6+ E-cores (Clearwater Forest) */ )) {
     FLAG_SET_DEFAULT(EnableX86ECoreOpts, true);
   }
 
@@ -1137,6 +1152,10 @@ void VM_Version::get_processor_features() {
         warning("AES intrinsics require UseAES flag to be enabled. Intrinsics will be disabled.");
       }
       FLAG_SET_DEFAULT(UseAESIntrinsics, false);
+      if (UseAESCTRIntrinsics && !FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) {
+        warning("AES_CTR intrinsics require UseAES flag to be enabled. AES_CTR intrinsics will be disabled.");
+      }
+      FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
     } else {
       if (UseSSE > 2) {
         if (FLAG_IS_DEFAULT(UseAESIntrinsics)) {
@@ -1155,8 +1174,8 @@ void VM_Version::get_processor_features() {
       if (!UseAESIntrinsics) {
         if (UseAESCTRIntrinsics && !FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) {
           warning("AES-CTR intrinsics require UseAESIntrinsics flag to be enabled. Intrinsics will be disabled.");
-          FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
         }
+        FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
       } else {
         if (supports_sse4_1()) {
           if (FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) {
@@ -1176,16 +1195,16 @@ void VM_Version::get_processor_features() {
   } else if (UseAES || UseAESIntrinsics || UseAESCTRIntrinsics) {
     if (UseAES && !FLAG_IS_DEFAULT(UseAES)) {
       warning("AES instructions are not available on this CPU");
-      FLAG_SET_DEFAULT(UseAES, false);
     }
+    FLAG_SET_DEFAULT(UseAES, false);
     if (UseAESIntrinsics && !FLAG_IS_DEFAULT(UseAESIntrinsics)) {
       warning("AES intrinsics are not available on this CPU");
-      FLAG_SET_DEFAULT(UseAESIntrinsics, false);
     }
+    FLAG_SET_DEFAULT(UseAESIntrinsics, false);
     if (UseAESCTRIntrinsics && !FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) {
       warning("AES-CTR intrinsics are not available on this CPU");
-      FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
     }
+    FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
   }
 
   // Use CLMUL instructions if available.
@@ -1340,16 +1359,16 @@ void VM_Version::get_processor_features() {
     FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
   }
 
-  if (supports_evex() && supports_avx512bw()) {
-      if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
-          UseSHA3Intrinsics = true;
-      }
+  if (UseSHA && supports_evex() && supports_avx512bw()) {
+    if (FLAG_IS_DEFAULT(UseSHA3Intrinsics)) {
+      FLAG_SET_DEFAULT(UseSHA3Intrinsics, true);
+    }
   } else if (UseSHA3Intrinsics) {
-      warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
-      FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
+    warning("Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
   }
 
-  if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
+  if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics || UseSHA3Intrinsics)) {
     FLAG_SET_DEFAULT(UseSHA, false);
   }
 
@@ -1640,41 +1659,40 @@ void VM_Version::get_processor_features() {
     if (FLAG_IS_DEFAULT(AllocatePrefetchInstr) && supports_3dnow_prefetch()) {
       FLAG_SET_DEFAULT(AllocatePrefetchInstr, 3);
     }
-#ifdef COMPILER2
-    if (UseAVX > 2) {
-      if (FLAG_IS_DEFAULT(ArrayOperationPartialInlineSize) ||
-          (!FLAG_IS_DEFAULT(ArrayOperationPartialInlineSize) &&
-           ArrayOperationPartialInlineSize != 0 &&
-           ArrayOperationPartialInlineSize != 16 &&
-           ArrayOperationPartialInlineSize != 32 &&
-           ArrayOperationPartialInlineSize != 64)) {
-        int inline_size = 0;
-        if (MaxVectorSize >= 64 && AVX3Threshold == 0) {
-          inline_size = 64;
-        } else if (MaxVectorSize >= 32) {
-          inline_size = 32;
-        } else if (MaxVectorSize >= 16) {
-          inline_size = 16;
-        }
-        if(!FLAG_IS_DEFAULT(ArrayOperationPartialInlineSize)) {
-          warning("Setting ArrayOperationPartialInlineSize as %d", inline_size);
-        }
-        ArrayOperationPartialInlineSize = inline_size;
-      }
-
-      if (ArrayOperationPartialInlineSize > MaxVectorSize) {
-        ArrayOperationPartialInlineSize = MaxVectorSize >= 16 ? MaxVectorSize : 0;
-        if (ArrayOperationPartialInlineSize) {
-          warning("Setting ArrayOperationPartialInlineSize as MaxVectorSize=%zd", MaxVectorSize);
-        } else {
-          warning("Setting ArrayOperationPartialInlineSize as %zd", ArrayOperationPartialInlineSize);
-        }
-      }
-    }
-#endif
   }
 
 #ifdef COMPILER2
+  if (UseAVX > 2) {
+    if (FLAG_IS_DEFAULT(ArrayOperationPartialInlineSize) ||
+        (!FLAG_IS_DEFAULT(ArrayOperationPartialInlineSize) &&
+         ArrayOperationPartialInlineSize != 0 &&
+         ArrayOperationPartialInlineSize != 16 &&
+         ArrayOperationPartialInlineSize != 32 &&
+         ArrayOperationPartialInlineSize != 64)) {
+      int inline_size = 0;
+      if (MaxVectorSize >= 64 && AVX3Threshold == 0) {
+        inline_size = 64;
+      } else if (MaxVectorSize >= 32) {
+        inline_size = 32;
+      } else if (MaxVectorSize >= 16) {
+        inline_size = 16;
+      }
+      if(!FLAG_IS_DEFAULT(ArrayOperationPartialInlineSize)) {
+        warning("Setting ArrayOperationPartialInlineSize as %d", inline_size);
+      }
+      ArrayOperationPartialInlineSize = inline_size;
+    }
+
+    if (ArrayOperationPartialInlineSize > MaxVectorSize) {
+      ArrayOperationPartialInlineSize = MaxVectorSize >= 16 ? MaxVectorSize : 0;
+      if (ArrayOperationPartialInlineSize) {
+        warning("Setting ArrayOperationPartialInlineSize as MaxVectorSize=%zd", MaxVectorSize);
+      } else {
+        warning("Setting ArrayOperationPartialInlineSize as %zd", ArrayOperationPartialInlineSize);
+      }
+    }
+  }
+
   if (FLAG_IS_DEFAULT(OptimizeFill)) {
     if (MaxVectorSize < 32 || (!EnableX86ECoreOpts && !VM_Version::supports_avx512vlbw())) {
       OptimizeFill = false;
@@ -3279,12 +3297,50 @@ bool VM_Version::is_intrinsic_supported(vmIntrinsicID id) {
 void VM_Version::insert_features_names(VM_Version::VM_Features features, stringStream& ss) {
   int i = 0;
   ss.join([&]() {
-    while (i < MAX_CPU_FEATURES) {
-      if (_features.supports_feature((VM_Version::Feature_Flag)i)) {
-        return _features_names[i++];
+    const char* str = nullptr;
+    while ((i < MAX_CPU_FEATURES) && (str == nullptr)) {
+      if (features.supports_feature((VM_Version::Feature_Flag)i)) {
+        str = _features_names[i];
       }
       i += 1;
     }
-    return (const char*)nullptr;
+    return str;
   }, ", ");
 }
+
+void VM_Version::get_cpu_features_name(void* features_buffer, stringStream& ss) {
+  VM_Features* features = (VM_Features*)features_buffer;
+  insert_features_names(*features, ss);
+}
+
+void VM_Version::get_missing_features_name(void* features_set1, void* features_set2, stringStream& ss) {
+  VM_Features* vm_features_set1 = (VM_Features*)features_set1;
+  VM_Features* vm_features_set2 = (VM_Features*)features_set2;
+  int i = 0;
+  ss.join([&]() {
+    const char* str = nullptr;
+    while ((i < MAX_CPU_FEATURES) && (str == nullptr)) {
+      Feature_Flag flag = (Feature_Flag)i;
+      if (vm_features_set1->supports_feature(flag) && !vm_features_set2->supports_feature(flag)) {
+        str = _features_names[i];
+      }
+      i += 1;
+    }
+    return str;
+  }, ", ");
+}
+
+int VM_Version::cpu_features_size() {
+  return sizeof(VM_Features);
+}
+
+void VM_Version::store_cpu_features(void* buf) {
+  VM_Features copy = _features;
+  copy.clear_feature(CPU_HT); // HT does not result in incompatibility of aot code cache
+  memcpy(buf, &copy, sizeof(VM_Features));
+}
+
+bool VM_Version::supports_features(void* features_buffer) {
+  VM_Features* features_to_test = (VM_Features*)features_buffer;
+  return _features.supports_features(features_to_test);
+}
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index cc93ee3564e..e0a895737b7 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -377,84 +377,84 @@ protected:
    */
   enum Feature_Flag {
 #define CPU_FEATURE_FLAGS(decl) \
-    decl(CX8,               "cx8",               0)  /*  next bits are from cpuid 1 (EDX) */ \
-    decl(CMOV,              "cmov",              1)  \
-    decl(FXSR,              "fxsr",              2)  \
-    decl(HT,                "ht",                3)  \
+    decl(CX8,               cx8,               0)  /*  next bits are from cpuid 1 (EDX) */ \
+    decl(CMOV,              cmov,              1)  \
+    decl(FXSR,              fxsr,              2)  \
+    decl(HT,                ht,                3)  \
                                                      \
-    decl(MMX,               "mmx",               4)  \
-    decl(3DNOW_PREFETCH,    "3dnowpref",         5)  /* Processor supports 3dnow prefetch and prefetchw instructions */ \
+    decl(MMX,               mmx,               4)  \
+    decl(3DNOW_PREFETCH,    3dnowpref,         5)  /* Processor supports 3dnow prefetch and prefetchw instructions */ \
                                                      /* may not necessarily support other 3dnow instructions */ \
-    decl(SSE,               "sse",               6)  \
-    decl(SSE2,              "sse2",              7)  \
+    decl(SSE,               sse,               6)  \
+    decl(SSE2,              sse2,              7)  \
                                                      \
-    decl(SSE3,              "sse3",              8 ) /* SSE3 comes from cpuid 1 (ECX) */ \
-    decl(SSSE3,             "ssse3",             9 ) \
-    decl(SSE4A,             "sse4a",             10) \
-    decl(SSE4_1,            "sse4.1",            11) \
+    decl(SSE3,              sse3,              8 ) /* SSE3 comes from cpuid 1 (ECX) */ \
+    decl(SSSE3,             ssse3,             9 ) \
+    decl(SSE4A,             sse4a,             10) \
+    decl(SSE4_1,            sse4.1,            11) \
                                                      \
-    decl(SSE4_2,            "sse4.2",            12) \
-    decl(POPCNT,            "popcnt",            13) \
-    decl(LZCNT,             "lzcnt",             14) \
-    decl(TSC,               "tsc",               15) \
+    decl(SSE4_2,            sse4.2,            12) \
+    decl(POPCNT,            popcnt,            13) \
+    decl(LZCNT,             lzcnt,             14) \
+    decl(TSC,               tsc,               15) \
                                                      \
-    decl(TSCINV_BIT,        "tscinvbit",         16) \
-    decl(TSCINV,            "tscinv",            17) \
-    decl(AVX,               "avx",               18) \
-    decl(AVX2,              "avx2",              19) \
+    decl(TSCINV_BIT,        tscinvbit,         16) \
+    decl(TSCINV,            tscinv,            17) \
+    decl(AVX,               avx,               18) \
+    decl(AVX2,              avx2,              19) \
                                                      \
-    decl(AES,               "aes",               20) \
-    decl(ERMS,              "erms",              21) /* enhanced 'rep movsb/stosb' instructions */ \
-    decl(CLMUL,             "clmul",             22) /* carryless multiply for CRC */ \
-    decl(BMI1,              "bmi1",              23) \
+    decl(AES,               aes,               20) \
+    decl(ERMS,              erms,              21) /* enhanced 'rep movsb/stosb' instructions */ \
+    decl(CLMUL,             clmul,             22) /* carryless multiply for CRC */ \
+    decl(BMI1,              bmi1,              23) \
                                                      \
-    decl(BMI2,              "bmi2",              24) \
-    decl(RTM,               "rtm",               25) /* Restricted Transactional Memory instructions */ \
-    decl(ADX,               "adx",               26) \
-    decl(AVX512F,           "avx512f",           27) /* AVX 512bit foundation instructions */ \
+    decl(BMI2,              bmi2,              24) \
+    decl(RTM,               rtm,               25) /* Restricted Transactional Memory instructions */ \
+    decl(ADX,               adx,               26) \
+    decl(AVX512F,           avx512f,           27) /* AVX 512bit foundation instructions */ \
                                                      \
-    decl(AVX512DQ,          "avx512dq",          28) \
-    decl(AVX512PF,          "avx512pf",          29) \
-    decl(AVX512ER,          "avx512er",          30) \
-    decl(AVX512CD,          "avx512cd",          31) \
+    decl(AVX512DQ,          avx512dq,          28) \
+    decl(AVX512PF,          avx512pf,          29) \
+    decl(AVX512ER,          avx512er,          30) \
+    decl(AVX512CD,          avx512cd,          31) \
                                                      \
-    decl(AVX512BW,          "avx512bw",          32) /* Byte and word vector instructions */ \
-    decl(AVX512VL,          "avx512vl",          33) /* EVEX instructions with smaller vector length */ \
-    decl(SHA,               "sha",               34) /* SHA instructions */ \
-    decl(FMA,               "fma",               35) /* FMA instructions */ \
+    decl(AVX512BW,          avx512bw,          32) /* Byte and word vector instructions */ \
+    decl(AVX512VL,          avx512vl,          33) /* EVEX instructions with smaller vector length */ \
+    decl(SHA,               sha,               34) /* SHA instructions */ \
+    decl(FMA,               fma,               35) /* FMA instructions */ \
                                                      \
-    decl(VZEROUPPER,        "vzeroupper",        36) /* Vzeroupper instruction */ \
-    decl(AVX512_VPOPCNTDQ,  "avx512_vpopcntdq",  37) /* Vector popcount */ \
-    decl(AVX512_VPCLMULQDQ, "avx512_vpclmulqdq", 38) /* Vector carryless multiplication */ \
-    decl(AVX512_VAES,       "avx512_vaes",       39) /* Vector AES instruction */ \
+    decl(VZEROUPPER,        vzeroupper,        36) /* Vzeroupper instruction */ \
+    decl(AVX512_VPOPCNTDQ,  avx512_vpopcntdq,  37) /* Vector popcount */ \
+    decl(AVX512_VPCLMULQDQ, avx512_vpclmulqdq, 38) /* Vector carryless multiplication */ \
+    decl(AVX512_VAES,       avx512_vaes,       39) /* Vector AES instruction */ \
                                                      \
-    decl(AVX512_VNNI,       "avx512_vnni",       40) /* Vector Neural Network Instructions */ \
-    decl(FLUSH,             "clflush",           41) /* flush instruction */ \
-    decl(FLUSHOPT,          "clflushopt",        42) /* flusopth instruction */ \
-    decl(CLWB,              "clwb",              43) /* clwb instruction */ \
+    decl(AVX512_VNNI,       avx512_vnni,       40) /* Vector Neural Network Instructions */ \
+    decl(FLUSH,             clflush,           41) /* flush instruction */ \
+    decl(FLUSHOPT,          clflushopt,        42) /* flusopth instruction */ \
+    decl(CLWB,              clwb,              43) /* clwb instruction */ \
                                                      \
-    decl(AVX512_VBMI2,      "avx512_vbmi2",      44) /* VBMI2 shift left double instructions */ \
-    decl(AVX512_VBMI,       "avx512_vbmi",       45) /* Vector BMI instructions */ \
-    decl(HV,                "hv",                46) /* Hypervisor instructions */ \
-    decl(SERIALIZE,         "serialize",         47) /* CPU SERIALIZE */ \
-    decl(RDTSCP,            "rdtscp",            48) /* RDTSCP instruction */ \
-    decl(RDPID,             "rdpid",             49) /* RDPID instruction */ \
-    decl(FSRM,              "fsrm",              50) /* Fast Short REP MOV */ \
-    decl(GFNI,              "gfni",              51) /* Vector GFNI instructions */ \
-    decl(AVX512_BITALG,     "avx512_bitalg",     52) /* Vector sub-word popcount and bit gather instructions */\
-    decl(F16C,              "f16c",              53) /* Half-precision and single precision FP conversion instructions*/ \
-    decl(PKU,               "pku",               54) /* Protection keys for user-mode pages */ \
-    decl(OSPKE,             "ospke",             55) /* OS enables protection keys */ \
-    decl(CET_IBT,           "cet_ibt",           56) /* Control Flow Enforcement - Indirect Branch Tracking */ \
-    decl(CET_SS,            "cet_ss",            57) /* Control Flow Enforcement - Shadow Stack */ \
-    decl(AVX512_IFMA,       "avx512_ifma",       58) /* Integer Vector FMA instructions*/ \
-    decl(AVX_IFMA,          "avx_ifma",          59) /* 256-bit VEX-coded variant of AVX512-IFMA*/ \
-    decl(APX_F,             "apx_f",             60) /* Intel Advanced Performance Extensions*/ \
-    decl(SHA512,            "sha512",            61) /* SHA512 instructions*/ \
-    decl(AVX512_FP16,       "avx512_fp16",       62) /* AVX512 FP16 ISA support*/ \
-    decl(AVX10_1,           "avx10_1",           63) /* AVX10 512 bit vector ISA Version 1 support*/ \
-    decl(AVX10_2,           "avx10_2",           64) /* AVX10 512 bit vector ISA Version 2 support*/ \
-    decl(HYBRID,            "hybrid",            65) /* Hybrid architecture */
+    decl(AVX512_VBMI2,      avx512_vbmi2,      44) /* VBMI2 shift left double instructions */ \
+    decl(AVX512_VBMI,       avx512_vbmi,       45) /* Vector BMI instructions */ \
+    decl(HV,                hv,                46) /* Hypervisor instructions */ \
+    decl(SERIALIZE,         serialize,         47) /* CPU SERIALIZE */ \
+    decl(RDTSCP,            rdtscp,            48) /* RDTSCP instruction */ \
+    decl(RDPID,             rdpid,             49) /* RDPID instruction */ \
+    decl(FSRM,              fsrm,              50) /* Fast Short REP MOV */ \
+    decl(GFNI,              gfni,              51) /* Vector GFNI instructions */ \
+    decl(AVX512_BITALG,     avx512_bitalg,     52) /* Vector sub-word popcount and bit gather instructions */\
+    decl(F16C,              f16c,              53) /* Half-precision and single precision FP conversion instructions*/ \
+    decl(PKU,               pku,               54) /* Protection keys for user-mode pages */ \
+    decl(OSPKE,             ospke,             55) /* OS enables protection keys */ \
+    decl(CET_IBT,           cet_ibt,           56) /* Control Flow Enforcement - Indirect Branch Tracking */ \
+    decl(CET_SS,            cet_ss,            57) /* Control Flow Enforcement - Shadow Stack */ \
+    decl(AVX512_IFMA,       avx512_ifma,       58) /* Integer Vector FMA instructions*/ \
+    decl(AVX_IFMA,          avx_ifma,          59) /* 256-bit VEX-coded variant of AVX512-IFMA*/ \
+    decl(APX_F,             apx_f,             60) /* Intel Advanced Performance Extensions*/ \
+    decl(SHA512,            sha512,            61) /* SHA512 instructions*/ \
+    decl(AVX512_FP16,       avx512_fp16,       62) /* AVX512 FP16 ISA support*/ \
+    decl(AVX10_1,           avx10_1,           63) /* AVX10 512 bit vector ISA Version 1 support*/ \
+    decl(AVX10_2,           avx10_2,           64) /* AVX10 512 bit vector ISA Version 2 support*/ \
+    decl(HYBRID,            hybrid,            65) /* Hybrid architecture */
 
 #define DECLARE_CPU_FEATURE_FLAG(id, name, bit) CPU_##id = (bit),
     CPU_FEATURE_FLAGS(DECLARE_CPU_FEATURE_FLAG)
@@ -516,6 +516,15 @@ protected:
       int idx = index(feature);
       return (_features_bitmap[idx] & bit_mask(feature)) != 0;
     }
+
+    bool supports_features(VM_Features* features_to_test) {
+      for (int i = 0; i < features_bitmap_element_count(); i++) {
+        if ((_features_bitmap[i] & features_to_test->_features_bitmap[i]) != features_to_test->_features_bitmap[i]) {
+          return false;
+       }
+      }
+      return true;
+    }
   };
 
   // CPU feature flags vector, can be affected by VM settings.
@@ -676,6 +685,10 @@ protected:
     // Space to save apx registers after signal handle
     jlong        apx_save[2]; // Save r16 and r31
 
+    // cpuid function 0xD, subleaf 19 (APX extended state)
+    uint32_t          apx_xstate_size;          // EAX: size of APX state (128)
+    uint32_t          apx_xstate_offset;        // EBX: offset in standard XSAVE area
+
     VM_Features feature_flags() const;
 
     // Asserts
@@ -739,6 +752,11 @@ public:
   static ByteSize ymm_save_offset() { return byte_offset_of(CpuidInfo, ymm_save); }
   static ByteSize zmm_save_offset() { return byte_offset_of(CpuidInfo, zmm_save); }
   static ByteSize apx_save_offset() { return byte_offset_of(CpuidInfo, apx_save); }
+  static ByteSize apx_xstate_offset_offset() { return byte_offset_of(CpuidInfo, apx_xstate_offset); }
+  static ByteSize apx_xstate_size_offset() { return byte_offset_of(CpuidInfo, apx_xstate_size); }
+
+  static uint32_t apx_xstate_offset() { return _cpuid_info.apx_xstate_offset; }
+  static uint32_t apx_xstate_size()   { return _cpuid_info.apx_xstate_size; }
 
   // The value used to check ymm register after signal handle
   static int ymm_test_value()    { return 0xCAFEBABE; }
@@ -1094,6 +1112,20 @@ public:
   static bool supports_tscinv_ext(void);
 
   static void initialize_cpu_information(void);
+
+  static void get_cpu_features_name(void* features_buffer, stringStream& ss);
+
+  // Returns names of features present in features_set1 but not in features_set2
+  static void get_missing_features_name(void* features_set1, void* features_set2, stringStream& ss);
+
+  // Returns number of bytes required to store cpu features representation
+  static int cpu_features_size();
+
+  // Stores cpu features representation in the provided buffer. This representation is arch dependent.
+  // Size of the buffer must be same as returned by cpu_features_size()
+  static void store_cpu_features(void* buf);
+
+  static bool supports_features(void* features_to_test);
 };
 
 #endif // CPU_X86_VM_VERSION_X86_HPP
diff --git a/src/hotspot/cpu/x86/vmreg_x86.cpp b/src/hotspot/cpu/x86/vmreg_x86.cpp
index 44aee56ef15..45269e69fcb 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.cpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,7 @@ void VMRegImpl::set_regName() {
   int i;
   for (i = 0; i < ConcreteRegisterImpl::max_gpr ; ) {
     regName[i++] = reg->name();
-#ifdef AMD64
     regName[i++] = reg->name();
-#endif // AMD64
     reg = reg->successor();
   }
 
diff --git a/src/hotspot/cpu/x86/vmreg_x86.hpp b/src/hotspot/cpu/x86/vmreg_x86.hpp
index 6f7c7fafb32..032ce654f2f 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.hpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,14 +52,8 @@ inline bool is_KRegister() {
 }
 
 inline Register as_Register() {
-
-  assert( is_Register(), "must be");
-  // Yuk
-#ifdef AMD64
+  assert(is_Register(), "must be");
   return ::as_Register(value() >> 1);
-#else
-  return ::as_Register(value());
-#endif // AMD64
 }
 
 inline FloatRegister as_FloatRegister() {
@@ -82,9 +76,6 @@ inline KRegister as_KRegister() {
 
 inline   bool is_concrete() {
   assert(is_reg(), "must be");
-#ifndef AMD64
-  if (is_Register()) return true;
-#endif // AMD64
   // Do not use is_XMMRegister() here as it depends on the UseAVX setting.
   if (value() >= ConcreteRegisterImpl::max_fpr && value() < ConcreteRegisterImpl::max_xmm) {
     int base = value() - ConcreteRegisterImpl::max_fpr;
diff --git a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp
index 1aeedc094fd..76d70900fe4 100644
--- a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #define CPU_X86_VMREG_X86_INLINE_HPP
 
 inline VMReg Register::RegisterImpl::as_VMReg() const {
-  return VMRegImpl::as_VMReg(encoding() LP64_ONLY( << 1 ));
+  return VMRegImpl::as_VMReg(encoding() << 1);
 }
 
 inline VMReg FloatRegister::FloatRegisterImpl::as_VMReg() const {
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index 93b306c37d6..0ffa4c2031c 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -1699,9 +1699,10 @@ static void emit_cmpfp_fixup(MacroAssembler* masm) {
 }
 
 static void emit_cmpfp3(MacroAssembler* masm, Register dst) {
+  // If any floating point comparison instruction is used, unordered case always triggers jump
+  // for below condition, CF=1 is true when at least one input is NaN
   Label done;
   __ movl(dst, -1);
-  __ jcc(Assembler::parity, done);
   __ jcc(Assembler::below, done);
   __ setcc(Assembler::notEqual, dst);
   __ bind(done);
@@ -5186,6 +5187,18 @@ operand immL_65535()
   interface(CONST_INTER);
 %}
 
+// AOT Runtime Constants Address
+operand immAOTRuntimeConstantsAddress()
+%{
+  // Check if the address is in the range of AOT Runtime Constants
+  predicate(AOTRuntimeConstants::contains((address)(n->get_ptr())));
+  match(ConP);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
 operand kReg()
 %{
   constraint(ALLOC_IN_RC(vectmask_reg));
@@ -5529,12 +5542,21 @@ operand rFlagsRegU()
 operand rFlagsRegUCF() %{
   constraint(ALLOC_IN_RC(int_flags));
   match(RegFlags);
-  predicate(false);
+  predicate(!UseAPX || !VM_Version::supports_avx10_2());
 
   format %{ "RFLAGS_U_CF" %}
   interface(REG_INTER);
 %}
 
+operand rFlagsRegUCFE() %{
+  constraint(ALLOC_IN_RC(int_flags));
+  match(RegFlags);
+  predicate(UseAPX && VM_Version::supports_avx10_2());
+
+  format %{ "RFLAGS_U_CFE" %}
+  interface(REG_INTER);
+%}
+
 // Float register operands
 operand regF() %{
    constraint(ALLOC_IN_RC(float_reg));
@@ -6027,10 +6049,10 @@ operand cmpOp()
   interface(COND_INTER) %{
     equal(0x4, "e");
     not_equal(0x5, "ne");
-    less(0xC, "l");
-    greater_equal(0xD, "ge");
-    less_equal(0xE, "le");
-    greater(0xF, "g");
+    less(0xc, "l");
+    greater_equal(0xd, "ge");
+    less_equal(0xe, "le");
+    greater(0xf, "g");
     overflow(0x0, "o");
     no_overflow(0x1, "no");
   %}
@@ -6062,11 +6084,12 @@ operand cmpOpU()
 // don't need to use cmpOpUCF2 for eq/ne
 operand cmpOpUCF() %{
   match(Bool);
-  predicate(n->as_Bool()->_test._test == BoolTest::lt ||
-            n->as_Bool()->_test._test == BoolTest::ge ||
-            n->as_Bool()->_test._test == BoolTest::le ||
-            n->as_Bool()->_test._test == BoolTest::gt ||
-            n->in(1)->in(1) == n->in(1)->in(2));
+  predicate((!UseAPX || !VM_Version::supports_avx10_2()) &&
+            (n->as_Bool()->_test._test == BoolTest::lt ||
+             n->as_Bool()->_test._test == BoolTest::ge ||
+             n->as_Bool()->_test._test == BoolTest::le ||
+             n->as_Bool()->_test._test == BoolTest::gt ||
+             n->in(1)->in(1) == n->in(1)->in(2)));
   format %{ "" %}
   interface(COND_INTER) %{
     equal(0xb, "np");
@@ -6084,7 +6107,8 @@ operand cmpOpUCF() %{
 // Floating comparisons that can be fixed up with extra conditional jumps
 operand cmpOpUCF2() %{
   match(Bool);
-  predicate((n->as_Bool()->_test._test == BoolTest::ne ||
+  predicate((!UseAPX || !VM_Version::supports_avx10_2()) &&
+            (n->as_Bool()->_test._test == BoolTest::ne ||
              n->as_Bool()->_test._test == BoolTest::eq) &&
             n->in(1)->in(1) != n->in(1)->in(2));
   format %{ "" %}
@@ -6100,6 +6124,37 @@ operand cmpOpUCF2() %{
   %}
 %}
 
+
+// Floating point comparisons that set condition flags to test more directly,
+// Unsigned tests are used for G (>) and GE (>=) conditions while signed tests
+// are used for L (<) and LE (<=) conditions. It's important to convert these
+// latter conditions to ones that use unsigned tests before passing into an
+// instruction because the preceding comparison might be based on a three way
+// comparison (CmpF3 or CmpD3) that also assigns unordered outcomes to -1.
+operand cmpOpUCFE()
+%{
+  match(Bool);
+  predicate((UseAPX && VM_Version::supports_avx10_2()) &&
+            (n->as_Bool()->_test._test == BoolTest::ne ||
+             n->as_Bool()->_test._test == BoolTest::eq ||
+             n->as_Bool()->_test._test == BoolTest::lt ||
+             n->as_Bool()->_test._test == BoolTest::ge ||
+             n->as_Bool()->_test._test == BoolTest::le ||
+             n->as_Bool()->_test._test == BoolTest::gt));
+
+  format %{ "" %}
+  interface(COND_INTER) %{
+    equal(0x4, "e");
+    not_equal(0x5, "ne");
+    less(0x2, "b");
+    greater_equal(0x3, "ae");
+    less_equal(0x6, "be");
+    greater(0x7, "a");
+    overflow(0x0, "o");
+    no_overflow(0x1, "no");
+  %}
+%}
+
 // Operands for bound floating pointer register arguments
 operand rxmm0() %{
   constraint(ALLOC_IN_RC(xmm0_reg));
@@ -7289,6 +7344,19 @@ instruct loadD(regD dst, memory mem)
   ins_pipe(pipe_slow); // XXX
 %}
 
+instruct loadAOTRCAddress(rRegP dst, immAOTRuntimeConstantsAddress con)
+%{
+  match(Set dst con);
+
+  format %{ "leaq  $dst, $con\t# AOT Runtime Constants Address" %}
+
+  ins_encode %{
+    __ load_aotrc_address($dst$$Register, (address)$con$$constant);
+  %}
+
+  ins_pipe(ialu_reg_fat);
+%}
+
 // max = java.lang.Math.max(float a, float b)
 instruct maxF_reg_avx10_2(regF dst, regF a, regF b) %{
   predicate(VM_Version::supports_avx10_2());
@@ -9116,20 +9184,34 @@ instruct cmovI_imm_01UCF(rRegI dst, immI_1 src, rFlagsRegUCF cr, cmpOpUCF cop)
   ins_pipe(ialu_reg);
 %}
 
+instruct cmovI_imm_01UCFE(rRegI dst, immI_1 src, rFlagsRegUCFE cr, cmpOpUCFE cop)
+%{
+  predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_int() == 0);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src dst)));
+
+  ins_cost(100); // XXX
+  format %{ "setbn$cop $dst\t# signed, unsigned, int" %}
+  ins_encode %{
+    Assembler::Condition cond = (Assembler::Condition)($cop$$cmpcode);
+    __ setb(MacroAssembler::negate_condition(cond), $dst$$Register);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct cmovI_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
-  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
+
   ins_cost(200);
   expand %{
     cmovI_regU(cop, cr, dst, src);
   %}
 %}
 
-instruct cmovI_regUCF_ndd(rRegI dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegI src1, rRegI src2) %{
-  predicate(UseAPX);
+instruct cmovI_regUCFE_ndd(rRegI dst, cmpOpUCFE cop, rFlagsRegUCFE cr, rRegI src1, rRegI src2) %{
   match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
+
   ins_cost(200);
-  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, int ndd" %}
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# signed, unsigned, int ndd" %}
   ins_encode %{
     __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
   %}
@@ -9137,7 +9219,7 @@ instruct cmovI_regUCF_ndd(rRegI dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegI src1,
 %}
 
 instruct cmovI_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
-  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -9150,25 +9232,10 @@ instruct cmovI_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src)
   ins_pipe(pipe_cmov_reg);
 %}
 
-instruct cmovI_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src1, rRegI src2) %{
-  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
-  match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
-  effect(TEMP dst);
-
-  ins_cost(200);
-  format %{ "ecmovpl  $dst, $src1, $src2\n\t"
-            "cmovnel  $dst, $src2" %}
-  ins_encode %{
-    __ ecmovl(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ cmovl(Assembler::notEqual, $dst$$Register, $src2$$Register);
-  %}
-  ins_pipe(pipe_cmov_reg);
-%}
-
 // Since (x == y) == !(x != y), we can flip the sense of the test by flipping the
 // inputs of the CMove
 instruct cmovI_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
-  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveI (Binary cop cr) (Binary src dst)));
   effect(TEMP dst);
 
@@ -9182,23 +9249,6 @@ instruct cmovI_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src)
   ins_pipe(pipe_cmov_reg);
 %}
 
-// We need this special handling for only eq / neq comparison since NaN == NaN is false,
-// and parity flag bit is set if any of the operand is a NaN.
-instruct cmovI_regUCF2_eq_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src1, rRegI src2) %{
-  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
-  match(Set dst (CMoveI (Binary cop cr) (Binary src2 src1)));
-  effect(TEMP dst);
-
-  ins_cost(200);
-  format %{ "ecmovpl  $dst, $src1, $src2\n\t"
-            "cmovnel  $dst, $src2" %}
-  ins_encode %{
-    __ ecmovl(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ cmovl(Assembler::notEqual, $dst$$Register, $src2$$Register);
-  %}
-  ins_pipe(pipe_cmov_reg);
-%}
-
 // Conditional move
 instruct cmovI_mem(cmpOp cop, rFlagsReg cr, rRegI dst, memory src) %{
   predicate(!UseAPX);
@@ -9241,8 +9291,8 @@ instruct cmovI_memU(cmpOpU cop, rFlagsRegU cr, rRegI dst, memory src)
 %}
 
 instruct cmovI_memUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegI dst, memory src) %{
-  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
+
   ins_cost(250);
   expand %{
     cmovI_memU(cop, cr, dst, src);
@@ -9262,12 +9312,12 @@ instruct cmovI_rReg_rReg_memU_ndd(rRegI dst, cmpOpU cop, rFlagsRegU cr, rRegI sr
   ins_pipe(pipe_cmov_mem);
 %}
 
-instruct cmovI_rReg_rReg_memUCF_ndd(rRegI dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegI src1, memory src2)
+instruct cmovI_rReg_rReg_memUCFE_ndd(rRegI dst, cmpOpUCFE cop, rFlagsRegUCFE cr, rRegI src1, memory src2)
 %{
-  predicate(UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary src1 (LoadI src2))));
+
   ins_cost(250);
-  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, int ndd" %}
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# signed, unsigned, int ndd" %}
   ins_encode %{
     __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
   %}
@@ -9317,8 +9367,8 @@ instruct cmovN_regU(cmpOpU cop, rFlagsRegU cr, rRegN dst, rRegN src)
 %}
 
 instruct cmovN_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegN dst, rRegN src) %{
-  predicate(!UseAPX);
   match(Set dst (CMoveN (Binary cop cr) (Binary dst src)));
+
   ins_cost(200);
   expand %{
     cmovN_regU(cop, cr, dst, src);
@@ -9339,11 +9389,11 @@ instruct cmovN_regU_ndd(rRegN dst, cmpOpU cop, rFlagsRegU cr, rRegN src1, rRegN
   ins_pipe(pipe_cmov_reg);
 %}
 
-instruct cmovN_regUCF_ndd(rRegN dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegN src1, rRegN src2) %{
-  predicate(UseAPX);
+instruct cmovN_regUCFE_ndd(rRegN dst, cmpOpUCFE cop, rFlagsRegUCFE cr, rRegN src1, rRegN src2) %{
   match(Set dst (CMoveN (Binary cop cr) (Binary src1 src2)));
+
   ins_cost(200);
-  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, compressed ptr ndd" %}
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# signed, unsigned, compressed ptr ndd" %}
   ins_encode %{
     __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
   %}
@@ -9437,19 +9487,19 @@ instruct cmovP_regU_ndd(rRegP dst, cmpOpU cop, rFlagsRegU cr, rRegP src1, rRegP
 %}
 
 instruct cmovP_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
-  predicate(!UseAPX);
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
+
   ins_cost(200);
   expand %{
     cmovP_regU(cop, cr, dst, src);
   %}
 %}
 
-instruct cmovP_regUCF_ndd(rRegP dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegP src1, rRegP src2) %{
-  predicate(UseAPX);
+instruct cmovP_regUCFE_ndd(rRegP dst, cmpOpUCFE cop, rFlagsRegUCFE cr, rRegP src1, rRegP src2) %{
   match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
+
   ins_cost(200);
-  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, ptr ndd" %}
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# signed, unsigned, ptr ndd" %}
   ins_encode %{
     __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
   %}
@@ -9457,7 +9507,7 @@ instruct cmovP_regUCF_ndd(rRegP dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegP src1,
 %}
 
 instruct cmovP_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
-  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -9470,25 +9520,10 @@ instruct cmovP_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src)
   ins_pipe(pipe_cmov_reg);
 %}
 
-instruct cmovP_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src1, rRegP src2) %{
-  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
-  match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
-  effect(TEMP dst);
-
-  ins_cost(200);
-  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "cmovneq  $dst, $src2" %}
-  ins_encode %{
-    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
-  %}
-  ins_pipe(pipe_cmov_reg);
-%}
-
 // Since (x == y) == !(x != y), we can flip the sense of the test by flipping the
 // inputs of the CMove
 instruct cmovP_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
-  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveP (Binary cop cr) (Binary src dst)));
 
   ins_cost(200); // XXX
@@ -9501,21 +9536,6 @@ instruct cmovP_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src)
   ins_pipe(pipe_cmov_reg);
 %}
 
-instruct cmovP_regUCF2_eq_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src1, rRegP src2) %{
-  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
-  match(Set dst (CMoveP (Binary cop cr) (Binary src2 src1)));
-  effect(TEMP dst);
-
-  ins_cost(200);
-  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "cmovneq  $dst, $src2" %}
-  ins_encode %{
-    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
-  %}
-  ins_pipe(pipe_cmov_reg);
-%}
-
 instruct cmovL_imm_01(rRegL dst, immL1 src, rFlagsReg cr, cmpOp cop)
 %{
   predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_long() == 0);
@@ -9636,21 +9656,35 @@ instruct cmovL_imm_01UCF(rRegL dst, immL1 src, rFlagsRegUCF cr, cmpOpUCF cop)
   ins_pipe(ialu_reg);
 %}
 
+instruct cmovL_imm_01UCFE(rRegL dst, immL1 src, rFlagsRegUCFE cr, cmpOpUCFE cop)
+%{
+  predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_long() == 0);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src dst)));
+
+  ins_cost(100); // XXX
+  format %{ "setbn$cop $dst\t# signed, unsigned, long" %}
+  ins_encode %{
+    Assembler::Condition cond = (Assembler::Condition)($cop$$cmpcode);
+    __ setb(MacroAssembler::negate_condition(cond), $dst$$Register);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct cmovL_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
-  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
+
   ins_cost(200);
   expand %{
     cmovL_regU(cop, cr, dst, src);
   %}
 %}
 
-instruct cmovL_regUCF_ndd(rRegL dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegL src1, rRegL src2)
+instruct cmovL_regUCFE_ndd(rRegL dst, cmpOpUCFE cop, rFlagsRegUCFE cr, rRegL src1, rRegL src2)
 %{
-  predicate(UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
+
   ins_cost(200);
-  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, long ndd" %}
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# signed, unsigned, long ndd" %}
   ins_encode %{
     __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
   %}
@@ -9658,7 +9692,7 @@ instruct cmovL_regUCF_ndd(rRegL dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegL src1,
 %}
 
 instruct cmovL_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
-  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -9671,25 +9705,10 @@ instruct cmovL_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src)
   ins_pipe(pipe_cmov_reg);
 %}
 
-instruct cmovL_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src1, rRegL src2) %{
-  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
-  match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
-  effect(TEMP dst);
-
-  ins_cost(200);
-  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "cmovneq  $dst, $src2" %}
-  ins_encode %{
-    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
-  %}
-  ins_pipe(pipe_cmov_reg);
-%}
-
 // Since (x == y) == !(x != y), we can flip the sense of the test by flipping the
 // inputs of the CMove
 instruct cmovL_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
-  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveL (Binary cop cr) (Binary src dst)));
 
   ins_cost(200); // XXX
@@ -9702,21 +9721,6 @@ instruct cmovL_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src)
   ins_pipe(pipe_cmov_reg);
 %}
 
-instruct cmovL_regUCF2_eq_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src1, rRegL src2) %{
-  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
-  match(Set dst (CMoveL (Binary cop cr) (Binary src2 src1)));
-  effect(TEMP dst);
-
-  ins_cost(200);
-  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
-            "cmovneq $dst, $src2" %}
-  ins_encode %{
-    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
-    __ cmovq(Assembler::notEqual, $dst$$Register, $src2$$Register);
-  %}
-  ins_pipe(pipe_cmov_reg);
-%}
-
 instruct cmovL_memU(cmpOpU cop, rFlagsRegU cr, rRegL dst, memory src)
 %{
   predicate(!UseAPX);
@@ -9731,8 +9735,8 @@ instruct cmovL_memU(cmpOpU cop, rFlagsRegU cr, rRegL dst, memory src)
 %}
 
 instruct cmovL_memUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegL dst, memory src) %{
-  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst (LoadL src))));
+
   ins_cost(200);
   expand %{
     cmovL_memU(cop, cr, dst, src);
@@ -9752,12 +9756,12 @@ instruct cmovL_rReg_rReg_memU_ndd(rRegL dst, cmpOpU cop, rFlagsRegU cr, rRegL sr
   ins_pipe(pipe_cmov_mem);
 %}
 
-instruct cmovL_rReg_rReg_memUCF_ndd(rRegL dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegL src1, memory src2)
+instruct cmovL_rReg_rReg_memUCFE_ndd(rRegL dst, cmpOpUCFE cop, rFlagsRegUCFE cr, rRegL src1, memory src2)
 %{
-  predicate(UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary src1 (LoadL src2))));
+
   ins_cost(200);
-  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, long ndd" %}
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# signed, unsigned, long ndd" %}
   ins_encode %{
     __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
   %}
@@ -9802,12 +9806,31 @@ instruct cmovF_regU(cmpOpU cop, rFlagsRegU cr, regF dst, regF src)
 
 instruct cmovF_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, regF dst, regF src) %{
   match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
+
   ins_cost(200);
   expand %{
     cmovF_regU(cop, cr, dst, src);
   %}
 %}
 
+instruct cmovF_regUCFE(cmpOpUCFE cop, rFlagsRegUCFE cr, regF dst, regF src)
+%{
+  match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
+
+  ins_cost(200); // XXX
+  format %{ "jn$cop    skip\t# signed, unsigned cmove float\n\t"
+            "movss     $dst, $src\n"
+    "skip:" %}
+  ins_encode %{
+    Label Lskip;
+    // Invert sense of branch from sense of CMOV
+    __ jccb((Assembler::Condition)($cop$$cmpcode^1), Lskip);
+    __ movflt($dst$$XMMRegister, $src$$XMMRegister);
+    __ bind(Lskip);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct cmovD_reg(cmpOp cop, rFlagsReg cr, regD dst, regD src)
 %{
   match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
@@ -9846,12 +9869,31 @@ instruct cmovD_regU(cmpOpU cop, rFlagsRegU cr, regD dst, regD src)
 
 instruct cmovD_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, regD dst, regD src) %{
   match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
+
   ins_cost(200);
   expand %{
     cmovD_regU(cop, cr, dst, src);
   %}
 %}
 
+instruct cmovD_regUCFE(cmpOpUCFE cop, rFlagsRegUCFE cr, regD dst, regD src)
+%{
+  match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
+
+  ins_cost(200); // XXX
+  format %{ "jn$cop    skip\t# signed, unsigned cmove double\n\t"
+            "movsd     $dst, $src\n"
+    "skip:" %}
+  ins_encode %{
+    Label Lskip;
+    // Invert sense of branch from sense of CMOV
+    __ jccb((Assembler::Condition)($cop$$cmpcode^1), Lskip);
+    __ movdbl($dst$$XMMRegister, $src$$XMMRegister);
+    __ bind(Lskip);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 //----------Arithmetic Instructions--------------------------------------------
 //----------Addition Instructions----------------------------------------------
 
@@ -14319,7 +14361,7 @@ instruct cmpF_cc_reg(rFlagsRegU cr, regF src1, regF src2)
   ins_pipe(pipe_slow);
 %}
 
-instruct cmpF_cc_reg_CF(rFlagsRegUCF cr, regF src1, regF src2) %{
+instruct cmpF_cc_regCF(rFlagsRegUCF cr, regF src1, regF src2) %{
   match(Set cr (CmpF src1 src2));
 
   ins_cost(100);
@@ -14330,6 +14372,17 @@ instruct cmpF_cc_reg_CF(rFlagsRegUCF cr, regF src1, regF src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct cmpF_cc_regCFE(rFlagsRegUCFE cr, regF src1, regF src2) %{
+  match(Set cr (CmpF src1 src2));
+
+  ins_cost(100);
+  format %{ "vucomxss $src1, $src2" %}
+  ins_encode %{
+    __ vucomxss($src1$$XMMRegister, $src2$$XMMRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct cmpF_cc_memCF(rFlagsRegUCF cr, regF src1, memory src2) %{
   match(Set cr (CmpF src1 (LoadF src2)));
 
@@ -14341,8 +14394,20 @@ instruct cmpF_cc_memCF(rFlagsRegUCF cr, regF src1, memory src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct cmpF_cc_memCFE(rFlagsRegUCFE cr, regF src1, memory src2) %{
+  match(Set cr (CmpF src1 (LoadF src2)));
+
+  ins_cost(100);
+  format %{ "vucomxss $src1, $src2" %}
+  ins_encode %{
+    __ vucomxss($src1$$XMMRegister, $src2$$Address);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct cmpF_cc_immCF(rFlagsRegUCF cr, regF src, immF con) %{
   match(Set cr (CmpF src con));
+
   ins_cost(100);
   format %{ "ucomiss $src, [$constantaddress]\t# load from constant table: float=$con" %}
   ins_encode %{
@@ -14351,6 +14416,17 @@ instruct cmpF_cc_immCF(rFlagsRegUCF cr, regF src, immF con) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct cmpF_cc_immCFE(rFlagsRegUCFE cr, regF src, immF con) %{
+  match(Set cr (CmpF src con));
+
+  ins_cost(100);
+  format %{ "vucomxss $src, [$constantaddress]\t# load from constant table: float=$con" %}
+  ins_encode %{
+    __ vucomxss($src$$XMMRegister, $constantaddress($con));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // Really expensive, avoid
 instruct cmpD_cc_reg(rFlagsRegU cr, regD src1, regD src2)
 %{
@@ -14370,7 +14446,7 @@ instruct cmpD_cc_reg(rFlagsRegU cr, regD src1, regD src2)
   ins_pipe(pipe_slow);
 %}
 
-instruct cmpD_cc_reg_CF(rFlagsRegUCF cr, regD src1, regD src2) %{
+instruct cmpD_cc_regCF(rFlagsRegUCF cr, regD src1, regD src2) %{
   match(Set cr (CmpD src1 src2));
 
   ins_cost(100);
@@ -14381,6 +14457,17 @@ instruct cmpD_cc_reg_CF(rFlagsRegUCF cr, regD src1, regD src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct cmpD_cc_regCFE(rFlagsRegUCFE cr, regD src1, regD src2) %{
+  match(Set cr (CmpD src1 src2));
+
+  ins_cost(100);
+  format %{ "vucomxsd $src1, $src2 test" %}
+  ins_encode %{
+    __ vucomxsd($src1$$XMMRegister, $src2$$XMMRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct cmpD_cc_memCF(rFlagsRegUCF cr, regD src1, memory src2) %{
   match(Set cr (CmpD src1 (LoadD src2)));
 
@@ -14392,6 +14479,17 @@ instruct cmpD_cc_memCF(rFlagsRegUCF cr, regD src1, memory src2) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct cmpD_cc_memCFE(rFlagsRegUCFE cr, regD src1, memory src2) %{
+  match(Set cr (CmpD src1 (LoadD src2)));
+
+  ins_cost(100);
+  format %{ "vucomxsd $src1, $src2" %}
+  ins_encode %{
+    __ vucomxsd($src1$$XMMRegister, $src2$$Address);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 instruct cmpD_cc_immCF(rFlagsRegUCF cr, regD src, immD con) %{
   match(Set cr (CmpD src con));
   ins_cost(100);
@@ -14402,6 +14500,17 @@ instruct cmpD_cc_immCF(rFlagsRegUCF cr, regD src, immD con) %{
   ins_pipe(pipe_slow);
 %}
 
+instruct cmpD_cc_immCFE(rFlagsRegUCFE cr, regD src, immD con) %{
+  match(Set cr (CmpD src con));
+
+  ins_cost(100);
+  format %{ "vucomxsd $src, [$constantaddress]\t# load from constant table: double=$con" %}
+  ins_encode %{
+    __ vucomxsd($src$$XMMRegister, $constantaddress($con));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // Compare into -1,0,1
 instruct cmpF_reg(rRegI dst, regF src1, regF src2, rFlagsReg cr)
 %{
@@ -16808,6 +16917,21 @@ instruct jmpConUCF2(cmpOpUCF2 cop, rFlagsRegUCF cmp, label labl) %{
   ins_pipe(pipe_jcc);
 %}
 
+// Jump Direct Conditional - using signed and unsigned comparison
+instruct jmpConUCFE(cmpOpUCFE cop, rFlagsRegUCFE cmp, label labl) %{
+  match(If cop cmp);
+  effect(USE labl);
+
+  ins_cost(200);
+  format %{ "j$cop,su   $labl" %}
+  size(6);
+  ins_encode %{
+    Label* L = $labl$$label;
+    __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+  %}
+  ins_pipe(pipe_jcc);
+%}
+
 // ============================================================================
 // The 2nd slow-half of a subtype check.  Scan the subklass's 2ndary
 // superklass array for an instance of the superklass.  Set a hidden
@@ -17026,6 +17150,22 @@ instruct jmpConUCF2_short(cmpOpUCF2 cop, rFlagsRegUCF cmp, label labl) %{
   ins_short_branch(1);
 %}
 
+// Jump Direct Conditional - using signed and unsigned comparison
+instruct jmpConUCFE_short(cmpOpUCFE cop, rFlagsRegUCFE cmp, label labl) %{
+  match(If cop cmp);
+  effect(USE labl);
+
+  ins_cost(300);
+  format %{ "j$cop,sus  $labl" %}
+  size(2);
+  ins_encode %{
+    Label* L = $labl$$label;
+    __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+  %}
+  ins_pipe(pipe_jcc);
+  ins_short_branch(1);
+%}
+
 // ============================================================================
 // inlined locking and unlocking
 
diff --git a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
index 4d813cd53c6..4c73368b673 100644
--- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
@@ -26,6 +26,8 @@
 #ifndef CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
 #define CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
 
+#include "sanitizers/ub.hpp"
+
 // Inline interpreter functions for zero
 
 inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) {
@@ -40,6 +42,7 @@ inline jfloat BytecodeInterpreter::VMfloatMul(jfloat op1, jfloat op2) {
   return op1 * op2;
 }
 
+ATTRIBUTE_NO_UBSAN // IEEE-754 division by zero is well-defined
 inline jfloat BytecodeInterpreter::VMfloatDiv(jfloat op1, jfloat op2) {
   return op1 / op2;
 }
@@ -68,7 +71,7 @@ inline void BytecodeInterpreter::VMmemCopy64(uint32_t       to[2],
 }
 
 inline jlong BytecodeInterpreter::VMlongAdd(jlong op1, jlong op2) {
-  return op1 + op2;
+  return java_add(op1, op2);
 }
 
 inline jlong BytecodeInterpreter::VMlongAnd(jlong op1, jlong op2) {
@@ -82,7 +85,7 @@ inline jlong BytecodeInterpreter::VMlongDiv(jlong op1, jlong op2) {
 }
 
 inline jlong BytecodeInterpreter::VMlongMul(jlong op1, jlong op2) {
-  return op1 * op2;
+  return java_multiply(op1, op2);
 }
 
 inline jlong BytecodeInterpreter::VMlongOr(jlong op1, jlong op2) {
@@ -90,7 +93,7 @@ inline jlong BytecodeInterpreter::VMlongOr(jlong op1, jlong op2) {
 }
 
 inline jlong BytecodeInterpreter::VMlongSub(jlong op1, jlong op2) {
-  return op1 - op2;
+  return java_subtract(op1, op2);
 }
 
 inline jlong BytecodeInterpreter::VMlongXor(jlong op1, jlong op2) {
@@ -104,19 +107,19 @@ inline jlong BytecodeInterpreter::VMlongRem(jlong op1, jlong op2) {
 }
 
 inline jlong BytecodeInterpreter::VMlongUshr(jlong op1, jint op2) {
-  return ((unsigned long long) op1) >> (op2 & 0x3F);
+  return java_shift_right_unsigned(op1, op2);
 }
 
 inline jlong BytecodeInterpreter::VMlongShr(jlong op1, jint op2) {
-  return op1 >> (op2 & 0x3F);
+  return java_shift_right(op1, op2);
 }
 
 inline jlong BytecodeInterpreter::VMlongShl(jlong op1, jint op2) {
-  return op1 << (op2 & 0x3F);
+  return java_shift_left(op1, op2);
 }
 
 inline jlong BytecodeInterpreter::VMlongNeg(jlong op) {
-  return -op;
+  return java_negate(op);
 }
 
 inline jlong BytecodeInterpreter::VMlongNot(jlong op) {
@@ -183,8 +186,8 @@ inline jdouble BytecodeInterpreter::VMdoubleAdd(jdouble op1, jdouble op2) {
   return op1 + op2;
 }
 
+ATTRIBUTE_NO_UBSAN // IEEE-754 division by zero is well-defined
 inline jdouble BytecodeInterpreter::VMdoubleDiv(jdouble op1, jdouble op2) {
-  // Divide by zero... QQQ
   return op1 / op2;
 }
 
@@ -228,7 +231,7 @@ inline jdouble BytecodeInterpreter::VMfloat2Double(jfloat op) {
 // Integer Arithmetic
 
 inline jint BytecodeInterpreter::VMintAdd(jint op1, jint op2) {
-  return op1 + op2;
+  return java_add(op1, op2);
 }
 
 inline jint BytecodeInterpreter::VMintAnd(jint op1, jint op2) {
@@ -242,11 +245,11 @@ inline jint BytecodeInterpreter::VMintDiv(jint op1, jint op2) {
 }
 
 inline jint BytecodeInterpreter::VMintMul(jint op1, jint op2) {
-  return op1 * op2;
+  return java_multiply(op1, op2);
 }
 
 inline jint BytecodeInterpreter::VMintNeg(jint op) {
-  return -op;
+  return java_negate(op);
 }
 
 inline jint BytecodeInterpreter::VMintOr(jint op1, jint op2) {
@@ -260,19 +263,19 @@ inline jint BytecodeInterpreter::VMintRem(jint op1, jint op2) {
 }
 
 inline jint BytecodeInterpreter::VMintShl(jint op1, jint op2) {
-  return op1 << (op2 & 0x1F);
+  return java_shift_left(op1, op2);
 }
 
 inline jint BytecodeInterpreter::VMintShr(jint op1, jint op2) {
-  return op1 >> (op2 & 0x1F);
+  return java_shift_right(op1, op2);
 }
 
 inline jint BytecodeInterpreter::VMintSub(jint op1, jint op2) {
-  return op1 - op2;
+  return java_subtract(op1, op2);
 }
 
 inline juint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
-  return ((juint) op1) >> (op2 & 0x1F);
+  return java_shift_right_unsigned(op1, op2);
 }
 
 inline jint BytecodeInterpreter::VMintXor(jint op1, jint op2) {
diff --git a/src/hotspot/cpu/zero/globals_zero.hpp b/src/hotspot/cpu/zero/globals_zero.hpp
index 6b6c6ea983c..6dc7d81275c 100644
--- a/src/hotspot/cpu/zero/globals_zero.hpp
+++ b/src/hotspot/cpu/zero/globals_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,7 +39,7 @@ define_pd_global(bool,  UncommonNullCast,     true);
 define_pd_global(bool,  DelayCompilerStubsGeneration, false); // Don't have compiler's stubs
 
 define_pd_global(size_t, CodeCacheSegmentSize, 64 COMPILER1_AND_COMPILER2_PRESENT(+64)); // Tiered compilation has large code-entry alignment.
-define_pd_global(intx,   CodeEntryAlignment,   32);
+define_pd_global(uint,   CodeEntryAlignment,   32);
 define_pd_global(intx,   OptoLoopAlignment,    16);
 define_pd_global(intx,   InlineSmallCode,      1000);
 
diff --git a/src/hotspot/cpu/zero/register_zero.hpp b/src/hotspot/cpu/zero/register_zero.hpp
index fd30f206762..846b649eebd 100644
--- a/src/hotspot/cpu/zero/register_zero.hpp
+++ b/src/hotspot/cpu/zero/register_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -48,7 +48,6 @@ class RegisterImpl : public AbstractRegisterImpl {
   };
 
   // construction
-  inline friend Register as_Register(int encoding);
   VMReg as_VMReg();
 
   // derived registers, offsets, and addresses
@@ -113,7 +112,6 @@ class ConcreteRegisterImpl : public AbstractRegisterImpl {
   static const int max_fpr;
 };
 
-CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
-#define noreg ((Register)(noreg_RegisterEnumValue))
+const Register noreg = as_Register(-1);
 
 #endif // CPU_ZERO_REGISTER_ZERO_HPP
diff --git a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
index 28c2364315e..1b20761f6e4 100644
--- a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
+++ b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp
@@ -368,12 +368,15 @@ int ZeroInterpreter::native_entry(Method* method, intptr_t UNUSED, TRAPS) {
     goto unlock_unwind_and_return;
 
   void **arguments;
-  void *mirror; {
+  // These locals must remain on stack until call completes
+  void *mirror;
+  void *env;
+  {
     arguments =
       (void **) stack->alloc(handler->argument_count() * sizeof(void **));
     void **dst = arguments;
 
-    void *env = thread->jni_environment();
+    env = thread->jni_environment();
     *(dst++) = &env;
 
     if (method->is_static()) {
diff --git a/src/hotspot/os/aix/decoder_aix.hpp b/src/hotspot/os/aix/decoder_aix.hpp
index 2ba3e1c5a3a..632355ccf4e 100644
--- a/src/hotspot/os/aix/decoder_aix.hpp
+++ b/src/hotspot/os/aix/decoder_aix.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -38,7 +38,7 @@ class AIXDecoder: public AbstractDecoder {
   virtual bool demangle(const char* symbol, char* buf, int buflen) { return false; } // use AixSymbols::get_function_name to demangle
 
   virtual bool decode(address addr, char* buf, int buflen, int* offset, const char* modulepath, bool demangle) {
-    return AixSymbols::get_function_name(addr, buf, buflen, offset, 0, demangle);
+    return AixSymbols::get_function_name(addr, buf, buflen, offset, nullptr, demangle);
   }
   virtual bool decode(address addr, char *buf, int buflen, int* offset, const void *base) {
     ShouldNotReachHere();
diff --git a/src/hotspot/os/aix/globals_aix.hpp b/src/hotspot/os/aix/globals_aix.hpp
index 14b956235e8..473d7759063 100644
--- a/src/hotspot/os/aix/globals_aix.hpp
+++ b/src/hotspot/os/aix/globals_aix.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,10 +61,6 @@
   product(bool, OptimizePollingPageLocation, true, DIAGNOSTIC,                      \
              "Optimize the location of the polling page used for Safepoints")       \
                                                                                     \
-  /* Use 64K pages for virtual memory (shmat). */                                   \
-  product(bool, Use64KPages, true, DIAGNOSTIC,                                      \
-          "Use 64K pages if available.")                                            \
-                                                                                    \
   /* Normally AIX commits memory on touch, but sometimes it is helpful to have */   \
   /* explicit commit behaviour. This flag, if true, causes the VM to touch     */   \
   /* memory on os::commit_memory() (which normally is a noop).                 */   \
@@ -79,7 +75,6 @@
 //
 
 // UseLargePages means nothing, for now, on AIX.
-// Use Use64KPages or Use16MPages instead.
 define_pd_global(size_t, PreTouchParallelChunkSize, 1 * G);
 define_pd_global(bool, UseLargePages, false);
 define_pd_global(bool, UseLargePagesIndividualAllocation, false);
diff --git a/src/hotspot/os/aix/libodm_aix.cpp b/src/hotspot/os/aix/libodm_aix.cpp
index 38e8067181a..57eee47c098 100644
--- a/src/hotspot/os/aix/libodm_aix.cpp
+++ b/src/hotspot/os/aix/libodm_aix.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2019 SAP SE. All rights reserved.
+ * Copyright (c) 2015, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,13 +63,12 @@ dynamicOdm::~dynamicOdm() {
 void odmWrapper::clean_data() { if (_data) { permit_forbidden_function::free(_data); _data = nullptr; } }
 
 
-int odmWrapper::class_offset(const char *field, bool is_aix_5)
+int odmWrapper::class_offset(const char *field)
 {
   assert(has_class(), "initialization");
   for (int i = 0; i < odm_class()->nelem; i++) {
     if (strcmp(odm_class()->elem[i].elemname, field) == 0) {
       int offset = odm_class()->elem[i].offset;
-      if (is_aix_5) { offset += LINK_VAL_OFFSET; }
       return offset;
     }
   }
@@ -88,11 +87,10 @@ void odmWrapper::determine_os_kernel_version(uint32_t* p_ver) {
     return;
   }
   int voff, roff, moff, foff;
-  bool is_aix_5 = (major_aix_version == 5);
-  voff = odm.class_offset("ver", is_aix_5);
-  roff = odm.class_offset("rel", is_aix_5);
-  moff = odm.class_offset("mod", is_aix_5);
-  foff = odm.class_offset("fix", is_aix_5);
+  voff = odm.class_offset("ver");
+  roff = odm.class_offset("rel");
+  moff = odm.class_offset("mod");
+  foff = odm.class_offset("fix");
   if (voff == -1 || roff == -1 || moff == -1 || foff == -1) {
     trcVerbose("try_determine_os_kernel_version: could not get offsets");
     return;
diff --git a/src/hotspot/os/aix/libodm_aix.hpp b/src/hotspot/os/aix/libodm_aix.hpp
index 924ccaf8c51..11e67a4f5ae 100644
--- a/src/hotspot/os/aix/libodm_aix.hpp
+++ b/src/hotspot/os/aix/libodm_aix.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@ class odmWrapper : private dynamicOdm {
 
   CLASS_SYMBOL odm_class() { return _odm_class; }
   bool has_class() { return odm_class() != (CLASS_SYMBOL)-1; }
-  int class_offset(const char *field, bool is_aix_5);
+  int class_offset(const char *field);
   char* data() { return _data; }
 
   char* retrieve_obj(const char* name = nullptr) {
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index f88729cdc66..af743dc7484 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,12 +122,6 @@
 extern "C"
 int mread_real_time(timebasestruct_t *t, size_t size_of_timebasestruct_t);
 
-#if !defined(_AIXVERSION_610)
-extern "C" int getthrds64(pid_t, struct thrdentry64*, int, tid64_t*, int);
-extern "C" int getprocs64(procentry64*, int, fdsinfo*, int, pid_t*, int);
-extern "C" int getargs(procsinfo*, int, char*, int);
-#endif
-
 #define MAX_PATH (2 * K)
 
 // for multipage initialization error analysis (in 'g_multipage_error')
@@ -216,7 +210,7 @@ static address g_brk_at_startup = nullptr;
 // shmctl(). Different shared memory regions can have different page
 // sizes.
 //
-// More information can be found at AIBM info center:
+// More information can be found at IBM info center:
 //   http://publib.boulder.ibm.com/infocenter/aix/v6r1/index.jsp?topic=/com.ibm.aix.prftungd/doc/prftungd/multiple_page_size_app_support.htm
 //
 static struct {
@@ -258,10 +252,18 @@ bool os::free_memory(physical_memory_size_type& value) {
   return Aix::available_memory(value);
 }
 
+bool os::Machine::free_memory(physical_memory_size_type& value) {
+  return Aix::available_memory(value);
+}
+
 bool os::available_memory(physical_memory_size_type& value) {
   return Aix::available_memory(value);
 }
 
+bool os::Machine::available_memory(physical_memory_size_type& value) {
+  return Aix::available_memory(value);
+}
+
 bool os::Aix::available_memory(physical_memory_size_type& value) {
   os::Aix::meminfo_t mi;
   if (os::Aix::get_meminfo(&mi)) {
@@ -273,6 +275,10 @@ bool os::Aix::available_memory(physical_memory_size_type& value) {
 }
 
 bool os::total_swap_space(physical_memory_size_type& value) {
+  return Machine::total_swap_space(value);
+}
+
+bool os::Machine::total_swap_space(physical_memory_size_type& value) {
   perfstat_memory_total_t memory_info;
   if (libperfstat::perfstat_memory_total(nullptr, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) {
     return false;
@@ -282,6 +288,10 @@ bool os::total_swap_space(physical_memory_size_type& value) {
 }
 
 bool os::free_swap_space(physical_memory_size_type& value) {
+  return Machine::free_swap_space(value);
+}
+
+bool os::Machine::free_swap_space(physical_memory_size_type& value) {
   perfstat_memory_total_t memory_info;
   if (libperfstat::perfstat_memory_total(nullptr, &memory_info, sizeof(perfstat_memory_total_t), 1) == -1) {
     return false;
@@ -294,6 +304,10 @@ physical_memory_size_type os::physical_memory() {
   return Aix::physical_memory();
 }
 
+physical_memory_size_type os::Machine::physical_memory() {
+  return Aix::physical_memory();
+}
+
 size_t os::rss() { return (size_t)0; }
 
 // Cpu architecture string
@@ -683,7 +697,7 @@ static void *thread_native_entry(Thread *thread) {
   log_info(os, thread)("Thread finished (tid: %zu, kernel thread id: %zu).",
     os::current_thread_id(), (uintx) kernel_thread_id);
 
-  return 0;
+  return nullptr;
 }
 
 bool os::create_thread(Thread* thread, ThreadType thr_type,
@@ -1733,10 +1747,9 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
   return true;
 }
 
-bool os::remove_stack_guard_pages(char* addr, size_t size) {
+void os::remove_stack_guard_pages(char* addr, size_t size) {
   // Do not call this; no need to commit stack pages on AIX.
   ShouldNotReachHere();
-  return true;
 }
 
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -1937,11 +1950,6 @@ char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_
   return nullptr;
 }
 
-bool os::pd_release_memory_special(char* base, size_t bytes) {
-  fatal("os::release_memory_special should not be called on AIX.");
-  return false;
-}
-
 size_t os::large_page_size() {
   return _large_page_size;
 }
@@ -2123,46 +2131,12 @@ void os::init(void) {
   // 64k          no              --- AIX 5.2 ? ---
   // 64k          yes                                              64k                             new systems and standard java loader (we set datapsize=64k when linking)
 
-  // We explicitly leave no option to change page size, because only upgrading would work,
-  // not downgrading (if stack page size is 64k you cannot pretend its 4k).
-
-  if (g_multipage_support.datapsize == 4*K) {
-    // datapsize = 4K. Data segment, thread stacks are 4K paged.
-    if (g_multipage_support.can_use_64K_pages || g_multipage_support.can_use_64K_mmap_pages) {
-      // .. but we are able to use 64K pages dynamically.
-      // This would be typical for java launchers which are not linked
-      // with datapsize=64K (like, any other launcher but our own).
-      //
-      // In this case it would be smart to allocate the java heap with 64K
-      // to get the performance benefit, and to fake 64k pages for the
-      // data segment (when dealing with thread stacks).
-      //
-      // However, leave a possibility to downgrade to 4K, using
-      // -XX:-Use64KPages.
-      if (Use64KPages) {
-        trcVerbose("64K page mode (faked for data segment)");
-        set_page_size(64*K);
-      } else {
-        trcVerbose("4K page mode (Use64KPages=off)");
-        set_page_size(4*K);
-      }
-    } else {
-      // .. and not able to allocate 64k pages dynamically. Here, just
-      // fall back to 4K paged mode and use mmap for everything.
-      trcVerbose("4K page mode");
-      set_page_size(4*K);
-      FLAG_SET_ERGO(Use64KPages, false);
-    }
-  } else {
-    // datapsize = 64k. Data segment, thread stacks are 64k paged.
-    // This normally means that we can allocate 64k pages dynamically.
-    // (There is one special case where this may be false: EXTSHM=on.
-    // but we decided to not support that mode).
-    assert0(g_multipage_support.can_use_64K_pages || g_multipage_support.can_use_64K_mmap_pages);
-    set_page_size(64*K);
-    trcVerbose("64K page mode");
-    FLAG_SET_ERGO(Use64KPages, true);
-  }
+  // datapsize = 64k. Data segment, thread stacks are 64k paged.
+  // This normally means that we can allocate 64k pages dynamically.
+  // (There is one special case where this may be false: EXTSHM=on.
+  // but we decided to not support that mode).
+  assert0(g_multipage_support.can_use_64K_pages || g_multipage_support.can_use_64K_mmap_pages);
+  set_page_size(64*K);
 
   // For now UseLargePages is just ignored.
   FLAG_SET_ERGO(UseLargePages, false);
@@ -2264,6 +2238,10 @@ int os::active_processor_count() {
     return ActiveProcessorCount;
   }
 
+  return Machine::active_processor_count();
+}
+
+int os::Machine::active_processor_count() {
   int online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN);
   assert(online_cpus > 0 && online_cpus <= processor_count(), "sanity check");
   return online_cpus;
@@ -2541,23 +2519,18 @@ void os::Aix::initialize_os_info() {
     assert(minor > 0, "invalid OS release");
     _os_version = (major << 24) | (minor << 16);
     char ver_str[20] = {0};
-    const char* name_str = "unknown OS";
 
-    if (strcmp(uts.sysname, "AIX") == 0) {
-      // We run on AIX. We do not support versions older than AIX 7.1.
-      // Determine detailed AIX version: Version, Release, Modification, Fix Level.
-      odmWrapper::determine_os_kernel_version(&_os_version);
-      if (os_version_short() < 0x0701) {
-        log_warning(os)("AIX releases older than AIX 7.1 are not supported.");
-        assert(false, "AIX release too old.");
-      }
-      name_str = "AIX";
-      jio_snprintf(ver_str, sizeof(ver_str), "%u.%u.%u.%u",
-                   major, minor, (_os_version >> 8) & 0xFF, _os_version & 0xFF);
-    } else {
-      assert(false, "%s", name_str);
+    // We do not support versions older than AIX 7.2 TL 5.
+    // Determine detailed AIX version: Version, Release, Modification, Fix Level.
+    odmWrapper::determine_os_kernel_version(&_os_version);
+    if (_os_version < 0x07020500) {
+      log_warning(os)("AIX releases older than AIX 7.2 TL 5 are not supported.");
+      assert(false, "AIX release too old.");
     }
-    log_info(os)("We run on %s %s", name_str, ver_str);
+
+    jio_snprintf(ver_str, sizeof(ver_str), "%u.%u.%u.%u",
+                 major, minor, (_os_version >> 8) & 0xFF, _os_version & 0xFF);
+    log_info(os)("We run on AIX %s", ver_str);
   }
 
   guarantee(_os_version, "Could not determine AIX release");
diff --git a/src/hotspot/os/aix/os_perf_aix.cpp b/src/hotspot/os/aix/os_perf_aix.cpp
index aa8819d035f..cbf78083483 100644
--- a/src/hotspot/os/aix/os_perf_aix.cpp
+++ b/src/hotspot/os/aix/os_perf_aix.cpp
@@ -143,12 +143,6 @@ static OSReturn get_jvm_load(double* jvm_uload, double* jvm_sload) {
   return OS_OK;
 }
 
-static void update_prev_time(jvm_time_store_t* from, jvm_time_store_t* to) {
-  if (from && to) {
-    memcpy(to, from, sizeof(jvm_time_store_t));
-  }
-}
-
 static void update_prev_ticks(cpu_tick_store_t* from, cpu_tick_store_t* to) {
   if (from && to) {
     memcpy(to, from, sizeof(cpu_tick_store_t));
diff --git a/src/hotspot/os/aix/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp
index 7311afc197b..b3f878fbfdd 100644
--- a/src/hotspot/os/aix/porting_aix.cpp
+++ b/src/hotspot/os/aix/porting_aix.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ class fixed_strings {
 
   public:
 
-  fixed_strings() : first(0) {}
+  fixed_strings() : first(nullptr) {}
   ~fixed_strings() {
     node* n = first;
     while (n) {
@@ -113,7 +113,7 @@ bool AixSymbols::get_function_name (
                                      //                 information (null if not available)
     bool demangle                    // [in] whether to demangle the name
   ) {
-  struct tbtable* tb = 0;
+  struct tbtable* tb = nullptr;
   unsigned int searchcount = 0;
 
   // initialize output parameters
@@ -653,10 +653,10 @@ void AixNativeCallstack::print_callstack_for_context(outputStream* st, const uco
 
   // To print the first frame, use the current value of iar:
   // current entry indicated by iar (the current pc)
-  codeptr_t cur_iar = 0;
-  stackptr_t cur_sp = 0;
-  codeptr_t cur_rtoc = 0;
-  codeptr_t cur_lr = 0;
+  codeptr_t cur_iar = nullptr;
+  stackptr_t cur_sp = nullptr;
+  codeptr_t cur_rtoc = nullptr;
+  codeptr_t cur_lr = nullptr;
 
   const ucontext_t* uc = (const ucontext_t*) context;
 
@@ -926,7 +926,7 @@ static struct handletableentry* p_handletable = nullptr;
 static const char* rtv_linkedin_libpath() {
   constexpr int bufsize = 4096;
   static char buffer[bufsize];
-  static const char* libpath = 0;
+  static const char* libpath = nullptr;
 
   // we only try to retrieve the libpath once. After that try we
   // let libpath point to buffer, which then contains a valid libpath
diff --git a/src/hotspot/os/bsd/globals_bsd.hpp b/src/hotspot/os/bsd/globals_bsd.hpp
index 850d491a11f..22f587ed789 100644
--- a/src/hotspot/os/bsd/globals_bsd.hpp
+++ b/src/hotspot/os/bsd/globals_bsd.hpp
@@ -28,6 +28,7 @@
 //
 // Declare Bsd specific flags. They are not available on other platforms.
 //
+#ifdef AARCH64
 #define RUNTIME_OS_FLAGS(develop,                                       \
                          develop_pd,                                    \
                          product,                                       \
@@ -35,9 +36,21 @@
                          range,                                         \
                          constraint)                                    \
                                                                         \
-  AARCH64_ONLY(develop(bool, AssertWXAtThreadSync, true,                \
-          "Conservatively check W^X thread state at possible safepoint" \
-          "or handshake"))
+  develop(bool, TraceWXHealing, false,                                  \
+          "track occurrences of W^X mode healing")                      \
+  develop(bool, UseOldWX, false,                                        \
+          "Choose old W^X implementation.")                             \
+  product(bool, StressWXHealing, false, DIAGNOSTIC,                     \
+          "Stress W xor X healing on MacOS")
+
+#else
+#define RUNTIME_OS_FLAGS(develop,                                       \
+                         develop_pd,                                    \
+                         product,                                       \
+                         product_pd,                                    \
+                         range,                                         \
+                         constraint)
+#endif
 
 // end of RUNTIME_OS_FLAGS
 
diff --git a/src/hotspot/os/bsd/memMapPrinter_macosx.cpp b/src/hotspot/os/bsd/memMapPrinter_macosx.cpp
index 6fd08d63e85..30e258c9d2c 100644
--- a/src/hotspot/os/bsd/memMapPrinter_macosx.cpp
+++ b/src/hotspot/os/bsd/memMapPrinter_macosx.cpp
@@ -132,7 +132,7 @@ public:
   static const char* tagToStr(uint32_t user_tag) {
     switch (user_tag) {
       case 0:
-        return 0;
+        return nullptr;
       X1(MALLOC, malloc);
       X1(MALLOC_SMALL, malloc_small);
       X1(MALLOC_LARGE, malloc_large);
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 61de48bb7fa..29ebe65e0db 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,10 +137,18 @@ bool os::available_memory(physical_memory_size_type& value) {
   return Bsd::available_memory(value);
 }
 
+bool os::Machine::available_memory(physical_memory_size_type& value) {
+  return Bsd::available_memory(value);
+}
+
 bool os::free_memory(physical_memory_size_type& value) {
   return Bsd::available_memory(value);
 }
 
+bool os::Machine::free_memory(physical_memory_size_type& value) {
+  return Bsd::available_memory(value);
+}
+
 // Available here means free. Note that this number is of no much use. As an estimate
 // for future memory pressure it is far too conservative, since MacOS will use a lot
 // of unused memory for caches, and return it willingly in case of needs.
@@ -181,6 +189,10 @@ void os::Bsd::print_uptime_info(outputStream* st) {
 }
 
 bool os::total_swap_space(physical_memory_size_type& value) {
+  return Machine::total_swap_space(value);
+}
+
+bool os::Machine::total_swap_space(physical_memory_size_type& value) {
 #if defined(__APPLE__)
   struct xsw_usage vmusage;
   size_t size = sizeof(vmusage);
@@ -195,6 +207,10 @@ bool os::total_swap_space(physical_memory_size_type& value) {
 }
 
 bool os::free_swap_space(physical_memory_size_type& value) {
+  return Machine::free_swap_space(value);
+}
+
+bool os::Machine::free_swap_space(physical_memory_size_type& value) {
 #if defined(__APPLE__)
   struct xsw_usage vmusage;
   size_t size = sizeof(vmusage);
@@ -212,6 +228,10 @@ physical_memory_size_type os::physical_memory() {
   return Bsd::physical_memory();
 }
 
+physical_memory_size_type os::Machine::physical_memory() {
+  return Bsd::physical_memory();
+}
+
 size_t os::rss() {
   size_t rss = 0;
 #ifdef __APPLE__
@@ -608,7 +628,7 @@ static void *thread_native_entry(Thread *thread) {
   log_info(os, thread)("Thread finished (tid: %zu, pthread id: %zu).",
     os::current_thread_id(), (uintx) pthread_self());
 
-  return 0;
+  return nullptr;
 }
 
 bool os::create_thread(Thread* thread, ThreadType thr_type,
@@ -821,6 +841,7 @@ jlong os::javaTimeNanos() {
   // We might also condition (c) on the magnitude of the delta between obsv and now.
   // Avoiding excessive CAS operations to hot RW locations is critical.
   // See https://blogs.oracle.com/dave/entry/cas_and_cache_trivia_invalidate
+  // https://web.archive.org/web/20131214182431/https://blogs.oracle.com/dave/entry/cas_and_cache_trivia_invalidate
   return (prev == obsv) ? now : obsv;
 }
 
@@ -1400,7 +1421,7 @@ int os::get_loaded_modules_info(os::LoadedModulesCallbackFunc callback, void *pa
 #elif defined(__APPLE__)
   for (uint32_t i = 1; i < _dyld_image_count(); i++) {
     // Value for top_address is returned as 0 since we don't have any information about module size
-    if (callback(_dyld_get_image_name(i), (address)_dyld_get_image_header(i), (address)0, param)) {
+    if (callback(_dyld_get_image_name(i), (address)_dyld_get_image_header(i), nullptr, param)) {
       return 1;
     }
   }
@@ -1761,10 +1782,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
   return os::commit_memory(addr, size, !ExecMem);
 }
 
-// If this is a growable mapping, remove the guard pages entirely by
-// munmap()ping them.  If not, just call uncommit_memory().
-bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  return os::uncommit_memory(addr, size);
+void os::remove_stack_guard_pages(char* addr, size_t size) {
+  os::uncommit_memory(addr, size);
 }
 
 // 'requested_addr' is only treated as a hint, the return value may or
@@ -1866,11 +1885,6 @@ char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_
   return nullptr;
 }
 
-bool os::pd_release_memory_special(char* base, size_t bytes) {
-  fatal("os::release_memory_special should not be called on BSD.");
-  return false;
-}
-
 size_t os::large_page_size() {
   return _large_page_size;
 }
@@ -2189,6 +2203,10 @@ int os::active_processor_count() {
     return ActiveProcessorCount;
   }
 
+  return Machine::active_processor_count();
+}
+
+int os::Machine::active_processor_count() {
   return _processor_count;
 }
 
diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
index f9c6f794ebd..e49d070890e 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -631,22 +631,20 @@ void CgroupSubsystemFactory::cleanup(CgroupInfo* cg_infos) {
  * return:
  *    true if there were no errors. false otherwise.
  */
-bool CgroupSubsystem::active_processor_count(int& value) {
-  int cpu_count;
-  int result = -1;
-
+bool CgroupSubsystem::active_processor_count(double& value) {
   // We use a cache with a timeout to avoid performing expensive
   // computations in the event this function is called frequently.
   // [See 8227006].
-  CachingCgroupController<CgroupCpuController>* contrl = cpu_controller();
-  CachedMetric* cpu_limit = contrl->metrics_cache();
+  CachingCgroupController<CgroupCpuController, double>* contrl = cpu_controller();
+  CachedMetric<double>* cpu_limit = contrl->metrics_cache();
   if (!cpu_limit->should_check_metric()) {
-    value = (int)cpu_limit->value();
-    log_trace(os, container)("CgroupSubsystem::active_processor_count (cached): %d", value);
+    value = cpu_limit->value();
+    log_trace(os, container)("CgroupSubsystem::active_processor_count (cached): %.2f", value);
     return true;
   }
 
-  cpu_count = os::Linux::active_processor_count();
+  int cpu_count = os::Linux::active_processor_count();
+  double result = -1;
   if (!CgroupUtil::processor_count(contrl->controller(), cpu_count, result)) {
     return false;
   }
@@ -671,8 +669,8 @@ bool CgroupSubsystem::active_processor_count(int& value) {
  */
 bool CgroupSubsystem::memory_limit_in_bytes(physical_memory_size_type upper_bound,
                                             physical_memory_size_type& value) {
-  CachingCgroupController<CgroupMemoryController>* contrl = memory_controller();
-  CachedMetric* memory_limit = contrl->metrics_cache();
+  CachingCgroupController<CgroupMemoryController, physical_memory_size_type>* contrl = memory_controller();
+  CachedMetric<physical_memory_size_type>* memory_limit = contrl->metrics_cache();
   if (!memory_limit->should_check_metric()) {
     value = memory_limit->value();
     return true;
diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
index 522b64f8816..d083a9985c2 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,20 +181,21 @@ class CgroupController: public CHeapObj<mtInternal> {
     static bool limit_from_str(char* limit_str, physical_memory_size_type& value);
 };
 
+template <typename MetricType>
 class CachedMetric : public CHeapObj<mtInternal>{
   private:
-    volatile physical_memory_size_type _metric;
+    volatile MetricType _metric;
     volatile jlong _next_check_counter;
   public:
     CachedMetric() {
-      _metric = value_unlimited;
+      _metric = static_cast<MetricType>(value_unlimited);
       _next_check_counter = min_jlong;
     }
     bool should_check_metric() {
       return os::elapsed_counter() > _next_check_counter;
     }
-    physical_memory_size_type value() { return _metric; }
-    void set_value(physical_memory_size_type value, jlong timeout) {
+    MetricType value() { return _metric; }
+    void set_value(MetricType value, jlong timeout) {
       _metric = value;
       // Metric is unlikely to change, but we want to remain
       // responsive to configuration changes. A very short grace time
@@ -205,19 +206,19 @@ class CachedMetric : public CHeapObj<mtInternal>{
     }
 };
 
-template <class T>
+template <class T, typename MetricType>
 class CachingCgroupController : public CHeapObj<mtInternal> {
   private:
     T* _controller;
-    CachedMetric* _metrics_cache;
+    CachedMetric<MetricType>* _metrics_cache;
 
   public:
     CachingCgroupController(T* cont) {
       _controller = cont;
-      _metrics_cache = new CachedMetric();
+      _metrics_cache = new CachedMetric<MetricType>();
     }
 
-    CachedMetric* metrics_cache() { return _metrics_cache; }
+    CachedMetric<MetricType>* metrics_cache() { return _metrics_cache; }
     T* controller() { return _controller; }
 };
 
@@ -277,7 +278,7 @@ class CgroupMemoryController: public CHeapObj<mtInternal> {
 class CgroupSubsystem: public CHeapObj<mtInternal> {
   public:
     bool memory_limit_in_bytes(physical_memory_size_type upper_bound, physical_memory_size_type& value);
-    bool active_processor_count(int& value);
+    bool active_processor_count(double& value);
 
     virtual bool pids_max(uint64_t& value) = 0;
     virtual bool pids_current(uint64_t& value) = 0;
@@ -286,8 +287,8 @@ class CgroupSubsystem: public CHeapObj<mtInternal> {
     virtual char * cpu_cpuset_cpus() = 0;
     virtual char * cpu_cpuset_memory_nodes() = 0;
     virtual const char * container_type() = 0;
-    virtual CachingCgroupController<CgroupMemoryController>* memory_controller() = 0;
-    virtual CachingCgroupController<CgroupCpuController>* cpu_controller() = 0;
+    virtual CachingCgroupController<CgroupMemoryController, physical_memory_size_type>* memory_controller() = 0;
+    virtual CachingCgroupController<CgroupCpuController, double>* cpu_controller() = 0;
     virtual CgroupCpuacctController* cpuacct_controller() = 0;
 
     bool cpu_quota(int& value);
diff --git a/src/hotspot/os/linux/cgroupUtil_linux.cpp b/src/hotspot/os/linux/cgroupUtil_linux.cpp
index 7aa07d53148..570b335940b 100644
--- a/src/hotspot/os/linux/cgroupUtil_linux.cpp
+++ b/src/hotspot/os/linux/cgroupUtil_linux.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2024, 2025, Red Hat, Inc.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +26,8 @@
 #include "cgroupUtil_linux.hpp"
 #include "os_linux.hpp"
 
-bool CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int upper_bound, int& value) {
+bool CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int upper_bound, double& value) {
   assert(upper_bound > 0, "upper bound of cpus must be positive");
-  int limit_count = upper_bound;
   int quota = -1;
   int period = -1;
   if (!cpu_ctrl->cpu_quota(quota)) {
@@ -37,20 +37,15 @@ bool CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int upper_bound,
     return false;
   }
   int quota_count = 0;
-  int result = upper_bound;
+  double result = upper_bound;
 
-  if (quota > -1 && period > 0) {
-    quota_count = ceilf((float)quota / (float)period);
-    log_trace(os, container)("CPU Quota count based on quota/period: %d", quota_count);
+  if (quota > 0 && period > 0) { // Use quotas
+    double cpu_quota = static_cast<double>(quota) / period;
+    log_trace(os, container)("CPU Quota based on quota/period: %.2f", cpu_quota);
+    result = MIN2(result, cpu_quota);
   }
 
-  // Use quotas
-  if (quota_count != 0) {
-    limit_count = quota_count;
-  }
-
-  result = MIN2(upper_bound, limit_count);
-  log_trace(os, container)("OSContainer::active_processor_count: %d", result);
+  log_trace(os, container)("OSContainer::active_processor_count: %.2f", result);
   value = result;
   return true;
 }
@@ -73,11 +68,11 @@ physical_memory_size_type CgroupUtil::get_updated_mem_limit(CgroupMemoryControll
 
 // Get an updated cpu limit. The return value is strictly less than or equal to the
 // passed in 'lowest' value.
-int CgroupUtil::get_updated_cpu_limit(CgroupCpuController* cpu,
+double CgroupUtil::get_updated_cpu_limit(CgroupCpuController* cpu,
                                      int lowest,
                                      int upper_bound) {
   assert(lowest > 0 && lowest <= upper_bound, "invariant");
-  int cpu_limit_val = -1;
+  double cpu_limit_val = -1;
   if (CgroupUtil::processor_count(cpu, upper_bound, cpu_limit_val) && cpu_limit_val != upper_bound) {
     assert(cpu_limit_val <= upper_bound, "invariant");
     if (lowest > cpu_limit_val) {
@@ -172,7 +167,7 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
   assert(cg_path[0] == '/', "cgroup path must start with '/'");
   int host_cpus = os::Linux::active_processor_count();
   int lowest_limit = host_cpus;
-  int cpus = get_updated_cpu_limit(cpu, lowest_limit, host_cpus);
+  double cpus = get_updated_cpu_limit(cpu, lowest_limit, host_cpus);
   int orig_limit = lowest_limit != host_cpus ? lowest_limit : host_cpus;
   char* limit_cg_path = nullptr;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
diff --git a/src/hotspot/os/linux/cgroupUtil_linux.hpp b/src/hotspot/os/linux/cgroupUtil_linux.hpp
index d72bbd1cf1e..1fd2a7d872b 100644
--- a/src/hotspot/os/linux/cgroupUtil_linux.hpp
+++ b/src/hotspot/os/linux/cgroupUtil_linux.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2024, Red Hat, Inc.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +32,7 @@
 class CgroupUtil: AllStatic {
 
   public:
-    static bool processor_count(CgroupCpuController* cpu, int upper_bound, int& value);
+    static bool processor_count(CgroupCpuController* cpu, int upper_bound, double& value);
     // Given a memory controller, adjust its path to a point in the hierarchy
     // that represents the closest memory limit.
     static void adjust_controller(CgroupMemoryController* m);
@@ -42,9 +43,7 @@ class CgroupUtil: AllStatic {
     static physical_memory_size_type get_updated_mem_limit(CgroupMemoryController* m,
                                                            physical_memory_size_type lowest,
                                                            physical_memory_size_type upper_bound);
-    static int get_updated_cpu_limit(CgroupCpuController* c,
-                                     int lowest,
-                                     int upper_bound);
+    static double get_updated_cpu_limit(CgroupCpuController* c, int lowest, int upper_bound);
 };
 
 #endif // CGROUP_UTIL_LINUX_HPP
diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
index 2df604083d2..c8f5a290c99 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -328,8 +328,8 @@ CgroupV1Subsystem::CgroupV1Subsystem(CgroupV1Controller* cpuset,
     _pids(pids) {
   CgroupUtil::adjust_controller(memory);
   CgroupUtil::adjust_controller(cpu);
-  _memory = new CachingCgroupController<CgroupMemoryController>(memory);
-  _cpu = new CachingCgroupController<CgroupCpuController>(cpu);
+  _memory = new CachingCgroupController<CgroupMemoryController, physical_memory_size_type>(memory);
+  _cpu = new CachingCgroupController<CgroupCpuController, double>(cpu);
 }
 
 bool CgroupV1Subsystem::is_containerized() {
diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
index f556bc57f26..af8d0efd378 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,15 +214,15 @@ class CgroupV1Subsystem: public CgroupSubsystem {
     const char * container_type() override {
       return "cgroupv1";
     }
-    CachingCgroupController<CgroupMemoryController>* memory_controller() override { return _memory; }
-    CachingCgroupController<CgroupCpuController>* cpu_controller() override { return _cpu; }
+    CachingCgroupController<CgroupMemoryController, physical_memory_size_type>* memory_controller() override { return _memory; }
+    CachingCgroupController<CgroupCpuController, double>* cpu_controller() override { return _cpu; }
     CgroupCpuacctController* cpuacct_controller() override { return _cpuacct; }
 
   private:
     /* controllers */
-    CachingCgroupController<CgroupMemoryController>* _memory = nullptr;
+    CachingCgroupController<CgroupMemoryController, physical_memory_size_type>* _memory = nullptr;
     CgroupV1Controller* _cpuset = nullptr;
-    CachingCgroupController<CgroupCpuController>* _cpu = nullptr;
+    CachingCgroupController<CgroupCpuController, double>* _cpu = nullptr;
     CgroupV1CpuacctController* _cpuacct = nullptr;
     CgroupV1Controller* _pids = nullptr;
 
diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
index c61d30e9236..30e1affc646 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2025, Red Hat Inc.
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,8 +156,8 @@ CgroupV2Subsystem::CgroupV2Subsystem(CgroupV2MemoryController * memory,
                                      _unified(unified) {
   CgroupUtil::adjust_controller(memory);
   CgroupUtil::adjust_controller(cpu);
-  _memory = new CachingCgroupController<CgroupMemoryController>(memory);
-  _cpu = new CachingCgroupController<CgroupCpuController>(cpu);
+  _memory = new CachingCgroupController<CgroupMemoryController, physical_memory_size_type>(memory);
+  _cpu = new CachingCgroupController<CgroupCpuController, double>(cpu);
   _cpuacct = cpuacct;
 }
 
diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
index 39a4fabe9f6..998145c0ff9 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, 2024, Red Hat Inc.
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,8 +152,8 @@ class CgroupV2Subsystem: public CgroupSubsystem {
     /* One unified controller */
     CgroupV2Controller _unified;
     /* Caching wrappers for cpu/memory metrics */
-    CachingCgroupController<CgroupMemoryController>* _memory = nullptr;
-    CachingCgroupController<CgroupCpuController>* _cpu = nullptr;
+    CachingCgroupController<CgroupMemoryController, physical_memory_size_type>* _memory = nullptr;
+    CachingCgroupController<CgroupCpuController, double>* _cpu = nullptr;
 
     CgroupCpuacctController* _cpuacct = nullptr;
 
@@ -175,8 +175,8 @@ class CgroupV2Subsystem: public CgroupSubsystem {
     const char * container_type() override {
       return "cgroupv2";
     }
-    CachingCgroupController<CgroupMemoryController>* memory_controller() override { return _memory; }
-    CachingCgroupController<CgroupCpuController>* cpu_controller() override { return _cpu; }
+    CachingCgroupController<CgroupMemoryController, physical_memory_size_type>* memory_controller() override { return _memory; }
+    CachingCgroupController<CgroupCpuController, double>* cpu_controller() override { return _cpu; }
     CgroupCpuacctController* cpuacct_controller() override { return _cpuacct; };
 };
 
diff --git a/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp b/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
index 25ffd0b8078..28159ae4801 100644
--- a/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
+++ b/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
@@ -66,9 +66,6 @@
 #endif
 
 // open(2) flags
-#ifndef O_CLOEXEC
-#define O_CLOEXEC                        02000000
-#endif
 #ifndef O_TMPFILE
 #define O_TMPFILE                        (020000000 | O_DIRECTORY)
 #endif
diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index 15a6403d07f..b46263efd99 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,8 +86,8 @@ void OSContainer::init() {
     //  2.) On a physical Linux system with a limit enforced by other means (like systemd slice)
     physical_memory_size_type mem_limit_val = value_unlimited;
     (void)memory_limit_in_bytes(mem_limit_val);  // discard error and use default
-    int host_cpus = os::Linux::active_processor_count();
-    int cpus = host_cpus;
+    double host_cpus = os::Linux::active_processor_count();
+    double cpus = host_cpus;
     (void)active_processor_count(cpus);  // discard error and use default
     any_mem_cpu_limit_present = mem_limit_val != value_unlimited || host_cpus != cpus;
     if (any_mem_cpu_limit_present) {
@@ -127,8 +127,7 @@ bool OSContainer::available_memory_in_bytes(physical_memory_size_type& value) {
   return false;
 }
 
-bool OSContainer::available_swap_in_bytes(physical_memory_size_type host_free_swap,
-                                          physical_memory_size_type& value) {
+bool OSContainer::available_swap_in_bytes(physical_memory_size_type& value) {
   physical_memory_size_type mem_limit = 0;
   physical_memory_size_type mem_swap_limit = 0;
   if (memory_limit_in_bytes(mem_limit) &&
@@ -179,8 +178,7 @@ bool OSContainer::available_swap_in_bytes(physical_memory_size_type host_free_sw
     assert(num < 25, "buffer too small");
     mem_limit_buf[num] = '\0';
     log_trace(os,container)("OSContainer::available_swap_in_bytes: container_swap_limit=%s"
-                            " container_mem_limit=%s, host_free_swap: " PHYS_MEM_TYPE_FORMAT,
-                            mem_swap_buf, mem_limit_buf, host_free_swap);
+                            " container_mem_limit=%s", mem_swap_buf, mem_limit_buf);
   }
   return false;
 }
@@ -252,7 +250,7 @@ char * OSContainer::cpu_cpuset_memory_nodes() {
   return cgroup_subsystem->cpu_cpuset_memory_nodes();
 }
 
-bool OSContainer::active_processor_count(int& value) {
+bool OSContainer::active_processor_count(double& value) {
   assert(cgroup_subsystem != nullptr, "cgroup subsystem not available");
   return cgroup_subsystem->active_processor_count(value);
 }
@@ -291,11 +289,13 @@ template<typename T> struct metric_fmt;
 template<> struct metric_fmt<unsigned long long int> { static constexpr const char* fmt = "%llu"; };
 template<> struct metric_fmt<unsigned long int> { static constexpr const char* fmt = "%lu"; };
 template<> struct metric_fmt<int> { static constexpr const char* fmt = "%d"; };
+template<> struct metric_fmt<double> { static constexpr const char* fmt = "%.2f"; };
 template<> struct metric_fmt<const char*> { static constexpr const char* fmt = "%s"; };
 
 template void OSContainer::print_container_metric<unsigned long long int>(outputStream*, const char*, unsigned long long int, const char*);
 template void OSContainer::print_container_metric<unsigned long int>(outputStream*, const char*, unsigned long int, const char*);
 template void OSContainer::print_container_metric<int>(outputStream*, const char*, int, const char*);
+template void OSContainer::print_container_metric<double>(outputStream*, const char*, double, const char*);
 template void OSContainer::print_container_metric<const char*>(outputStream*, const char*, const char*, const char*);
 
 template <typename T>
@@ -304,12 +304,13 @@ void OSContainer::print_container_metric(outputStream* st, const char* metrics,
   constexpr int longest_value = max_length - 11; // Max length - shortest "metric: " string ("cpu_quota: ")
   char value_str[longest_value + 1] = {};
   os::snprintf_checked(value_str, longest_value, metric_fmt<T>::fmt, value);
-  st->print("%s: %*s", metrics, max_length - static_cast<int>(strlen(metrics)) - 2, value_str); // -2 for the ": "
-  if (unit[0] != '\0') {
-    st->print_cr(" %s", unit);
-  } else {
-    st->print_cr("");
-  }
+
+  const int pad_width = max_length - static_cast<int>(strlen(metrics)) - 2; // -2 for the ": "
+  const char* unit_prefix = unit[0] != '\0' ? " " : "";
+
+  char line[128] = {};
+  os::snprintf_checked(line, sizeof(line), "%s: %*s%s%s", metrics, pad_width, value_str, unit_prefix, unit);
+  st->print_cr("%s", line);
 }
 
 void OSContainer::print_container_helper(outputStream* st, MetricResult& res, const char* metrics) {
diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index 11c3e086feb..96b59b98db8 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,8 +72,7 @@ class OSContainer: AllStatic {
   static const char * container_type();
 
   static bool available_memory_in_bytes(physical_memory_size_type& value);
-  static bool available_swap_in_bytes(physical_memory_size_type host_free_swap,
-                                      physical_memory_size_type& value);
+  static bool available_swap_in_bytes(physical_memory_size_type& value);
   static bool memory_limit_in_bytes(physical_memory_size_type& value);
   static bool memory_and_swap_limit_in_bytes(physical_memory_size_type& value);
   static bool memory_and_swap_usage_in_bytes(physical_memory_size_type& value);
@@ -84,7 +83,7 @@ class OSContainer: AllStatic {
   static bool rss_usage_in_bytes(physical_memory_size_type& value);
   static bool cache_usage_in_bytes(physical_memory_size_type& value);
 
-  static bool active_processor_count(int& value);
+  static bool active_processor_count(double& value);
 
   static char * cpu_cpuset_cpus();
   static char * cpu_cpuset_memory_nodes();
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 88e5e9b582a..9c2fbab7535 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -211,15 +211,58 @@ static bool suppress_primordial_thread_resolution = false;
 
 // utility functions
 
+bool os::is_containerized() {
+  return OSContainer::is_containerized();
+}
+
+bool os::Container::memory_limit(physical_memory_size_type& value) {
+  physical_memory_size_type result = 0;
+  if (OSContainer::memory_limit_in_bytes(result) && result != value_unlimited) {
+    value = result;
+    return true;
+  }
+  return false;
+}
+
+bool os::Container::memory_soft_limit(physical_memory_size_type& value) {
+  physical_memory_size_type result = 0;
+  if (OSContainer::memory_soft_limit_in_bytes(result) && result != 0 && result != value_unlimited) {
+    value = result;
+    return true;
+  }
+  return false;
+}
+
+bool os::Container::memory_throttle_limit(physical_memory_size_type& value) {
+  physical_memory_size_type result = 0;
+  if (OSContainer::memory_throttle_limit_in_bytes(result) && result != value_unlimited) {
+    value = result;
+    return true;
+  }
+  return false;
+}
+
+bool os::Container::used_memory(physical_memory_size_type& value) {
+  return OSContainer::memory_usage_in_bytes(value);
+}
+
 bool os::available_memory(physical_memory_size_type& value) {
-  if (OSContainer::is_containerized() && OSContainer::available_memory_in_bytes(value)) {
+  if (is_containerized() && Container::available_memory(value)) {
     log_trace(os)("available container memory: " PHYS_MEM_TYPE_FORMAT, value);
     return true;
   }
 
+  return Machine::available_memory(value);
+}
+
+bool os::Machine::available_memory(physical_memory_size_type& value) {
   return Linux::available_memory(value);
 }
 
+bool os::Container::available_memory(physical_memory_size_type& value) {
+  return OSContainer::available_memory_in_bytes(value);
+}
+
 bool os::Linux::available_memory(physical_memory_size_type& value) {
   physical_memory_size_type avail_mem = 0;
 
@@ -251,11 +294,15 @@ bool os::Linux::available_memory(physical_memory_size_type& value) {
 }
 
 bool os::free_memory(physical_memory_size_type& value) {
-  if (OSContainer::is_containerized() && OSContainer::available_memory_in_bytes(value)) {
+  if (is_containerized() && Container::available_memory(value)) {
     log_trace(os)("free container memory: " PHYS_MEM_TYPE_FORMAT, value);
     return true;
   }
 
+  return Machine::free_memory(value);
+}
+
+bool os::Machine::free_memory(physical_memory_size_type& value) {
   return Linux::free_memory(value);
 }
 
@@ -274,21 +321,30 @@ bool os::Linux::free_memory(physical_memory_size_type& value) {
 }
 
 bool os::total_swap_space(physical_memory_size_type& value) {
-  if (OSContainer::is_containerized()) {
-    physical_memory_size_type mem_swap_limit = value_unlimited;
-    physical_memory_size_type memory_limit = value_unlimited;
-    if (OSContainer::memory_and_swap_limit_in_bytes(mem_swap_limit) &&
-        OSContainer::memory_limit_in_bytes(memory_limit)) {
-      if (memory_limit != value_unlimited && mem_swap_limit != value_unlimited &&
-          mem_swap_limit >= memory_limit /* ensure swap is >= 0 */) {
-        value = mem_swap_limit - memory_limit;
-        return true;
-      }
-    }
-  } // fallback to the host swap space if the container returned unlimited
+  if (is_containerized() && Container::total_swap_space(value)) {
+    return true;
+  } // fallback to the host swap space if the container value fails
+  return Machine::total_swap_space(value);
+}
+
+bool os::Machine::total_swap_space(physical_memory_size_type& value) {
   return Linux::host_swap(value);
 }
 
+bool os::Container::total_swap_space(physical_memory_size_type& value) {
+  physical_memory_size_type mem_swap_limit = value_unlimited;
+  physical_memory_size_type memory_limit = value_unlimited;
+  if (OSContainer::memory_and_swap_limit_in_bytes(mem_swap_limit) &&
+      OSContainer::memory_limit_in_bytes(memory_limit)) {
+    if (memory_limit != value_unlimited && mem_swap_limit != value_unlimited &&
+        mem_swap_limit >= memory_limit /* ensure swap is >= 0 */) {
+      value = mem_swap_limit - memory_limit;
+      return true;
+    }
+  }
+  return false;
+}
+
 static bool host_free_swap_f(physical_memory_size_type& value) {
   struct sysinfo si;
   int ret = sysinfo(&si);
@@ -309,32 +365,45 @@ bool os::free_swap_space(physical_memory_size_type& value) {
     return false;
   }
   physical_memory_size_type host_free_swap_val = MIN2(total_swap_space, host_free_swap);
-  if (OSContainer::is_containerized()) {
-    if (OSContainer::available_swap_in_bytes(host_free_swap_val, value)) {
+  if (is_containerized()) {
+    if (Container::free_swap_space(value)) {
       return true;
     }
     // Fall through to use host value
     log_trace(os,container)("os::free_swap_space: containerized value unavailable"
                             " returning host value: " PHYS_MEM_TYPE_FORMAT, host_free_swap_val);
   }
+
   value = host_free_swap_val;
   return true;
 }
 
+bool os::Machine::free_swap_space(physical_memory_size_type& value) {
+  return host_free_swap_f(value);
+}
+
+bool os::Container::free_swap_space(physical_memory_size_type& value) {
+  return OSContainer::available_swap_in_bytes(value);
+}
+
 physical_memory_size_type os::physical_memory() {
-  if (OSContainer::is_containerized()) {
+  if (is_containerized()) {
     physical_memory_size_type mem_limit = value_unlimited;
-    if (OSContainer::memory_limit_in_bytes(mem_limit) && mem_limit != value_unlimited) {
+    if (Container::memory_limit(mem_limit) && mem_limit != value_unlimited) {
       log_trace(os)("total container memory: " PHYS_MEM_TYPE_FORMAT, mem_limit);
       return mem_limit;
     }
   }
 
-  physical_memory_size_type phys_mem = Linux::physical_memory();
+  physical_memory_size_type phys_mem = Machine::physical_memory();
   log_trace(os)("total system memory: " PHYS_MEM_TYPE_FORMAT, phys_mem);
   return phys_mem;
 }
 
+physical_memory_size_type os::Machine::physical_memory() {
+  return Linux::physical_memory();
+}
+
 // Returns the resident set size (RSS) of the process.
 // Falls back to using VmRSS from /proc/self/status if /proc/self/smaps_rollup is unavailable.
 // Note: On kernels with memory cgroups or shared memory, VmRSS may underreport RSS.
@@ -2439,20 +2508,21 @@ bool os::Linux::print_container_info(outputStream* st) {
   OSContainer::print_container_metric(st, "cpu_memory_nodes", p != nullptr ? p : "not supported");
   free(p);
 
-  int i = -1;
-  bool supported = OSContainer::active_processor_count(i);
+  double cpus = -1;
+  bool supported = OSContainer::active_processor_count(cpus);
   if (supported) {
-    assert(i > 0, "must be");
+    assert(cpus > 0, "must be");
     if (ActiveProcessorCount > 0) {
       OSContainer::print_container_metric(st, "active_processor_count", ActiveProcessorCount, "(from -XX:ActiveProcessorCount)");
     } else {
-      OSContainer::print_container_metric(st, "active_processor_count", i);
+      OSContainer::print_container_metric(st, "active_processor_count", cpus);
     }
   } else {
     OSContainer::print_container_metric(st, "active_processor_count", "not supported");
   }
 
 
+  int i = -1;
   supported = OSContainer::cpu_quota(i);
   if (supported && i > 0) {
     OSContainer::print_container_metric(st, "cpu_quota", i);
@@ -3453,6 +3523,9 @@ bool os::pd_uncommit_memory(char* addr, size_t size, bool exec) {
     log_trace(os, map)("mmap failed: " RANGEFMT " errno=(%s)",
                        RANGEFMTARGS(addr, size),
                        os::strerror(ep.saved_errno()));
+    if (ep.saved_errno() == ENOMEM) {
+      fatal("Failed to uncommit " RANGEFMT ". It is possible that the process's maximum number of mappings would have been exceeded. Try increasing the limit.", RANGEFMTARGS(addr, size));
+    }
     return false;
   }
   return true;
@@ -3563,14 +3636,16 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
 // It's safe to always unmap guard pages for primordial thread because we
 // always place it right after end of the mapped region.
 
-bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  uintptr_t stack_extent, stack_base;
+void os::remove_stack_guard_pages(char* addr, size_t size) {
 
   if (os::is_primordial_thread()) {
-    return ::munmap(addr, size) == 0;
+    if (::munmap(addr, size) != 0) {
+      fatal("Failed to munmap " RANGEFMT, RANGEFMTARGS(addr, size));
+    }
+    return;
   }
 
-  return os::uncommit_memory(addr, size);
+  os::uncommit_memory(addr, size);
 }
 
 // 'requested_addr' is only treated as a hint, the return value may or
@@ -4133,12 +4208,6 @@ char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_
   return addr;
 }
 
-bool os::pd_release_memory_special(char* base, size_t bytes) {
-  assert(UseLargePages, "only for large pages");
-  // Plain munmap is sufficient
-  return pd_release_memory(base, bytes);
-}
-
 size_t os::large_page_size() {
   return _large_page_size;
 }
@@ -4737,15 +4806,26 @@ int os::active_processor_count() {
     return ActiveProcessorCount;
   }
 
-  int active_cpus = -1;
-  if (OSContainer::is_containerized() && OSContainer::active_processor_count(active_cpus)) {
-    log_trace(os)("active_processor_count: determined by OSContainer: %d",
-                   active_cpus);
-  } else {
-    active_cpus = os::Linux::active_processor_count();
+  if (is_containerized()) {
+    double cpu_quota;
+    if (Container::processor_count(cpu_quota)) {
+      int active_cpus = ceilf(cpu_quota); // Round fractional CPU quota up.
+      assert(active_cpus <= Machine::active_processor_count(), "must be");
+      log_trace(os)("active_processor_count: determined by OSContainer: %d",
+                     active_cpus);
+      return active_cpus;
+    }
   }
 
-  return active_cpus;
+  return Machine::active_processor_count();
+}
+
+int os::Machine::active_processor_count() {
+  return os::Linux::active_processor_count();
+}
+
+bool os::Container::processor_count(double& value) {
+  return OSContainer::active_processor_count(value);
 }
 
 static bool should_warn_invalid_processor_id() {
@@ -4878,36 +4958,18 @@ int os::open(const char *path, int oflag, int mode) {
   // All file descriptors that are opened in the Java process and not
   // specifically destined for a subprocess should have the close-on-exec
   // flag set.  If we don't set it, then careless 3rd party native code
-  // might fork and exec without closing all appropriate file descriptors,
-  // and this in turn might:
-  //
-  // - cause end-of-file to fail to be detected on some file
-  //   descriptors, resulting in mysterious hangs, or
-  //
-  // - might cause an fopen in the subprocess to fail on a system
-  //   suffering from bug 1085341.
-  //
-  // (Yes, the default setting of the close-on-exec flag is a Unix
-  // design flaw)
-  //
-  // See:
-  // 1085341: 32-bit stdio routines should support file descriptors >255
-  // 4843136: (process) pipe file descriptor from Runtime.exec not being closed
-  // 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9
-  //
-  // Modern Linux kernels (after 2.6.23 2007) support O_CLOEXEC with open().
-  // O_CLOEXEC is preferable to using FD_CLOEXEC on an open file descriptor
-  // because it saves a system call and removes a small window where the flag
-  // is unset.  On ancient Linux kernels the O_CLOEXEC flag will be ignored
-  // and we fall back to using FD_CLOEXEC (see below).
-#ifdef O_CLOEXEC
+  // might fork and exec without closing all appropriate file descriptors.
   oflag |= O_CLOEXEC;
-#endif
 
   int fd = ::open(path, oflag, mode);
-  if (fd == -1) return -1;
+  // No further checking is needed if open() returned an error or
+  // access mode is not read only.
+  if (fd == -1 || (oflag & O_ACCMODE) != O_RDONLY) {
+    return fd;
+  }
 
-  //If the open succeeded, the file might still be a directory
+  // If the open succeeded and is read only, the file might be a directory
+  // which the JVM doesn't allow to be read.
   {
     struct stat buf;
     int ret = ::fstat(fd, &buf);
@@ -4925,21 +4987,6 @@ int os::open(const char *path, int oflag, int mode) {
     }
   }
 
-#ifdef FD_CLOEXEC
-  // Validate that the use of the O_CLOEXEC flag on open above worked.
-  // With recent kernels, we will perform this check exactly once.
-  static sig_atomic_t O_CLOEXEC_is_known_to_work = 0;
-  if (!O_CLOEXEC_is_known_to_work) {
-    int flags = ::fcntl(fd, F_GETFD);
-    if (flags != -1) {
-      if ((flags & FD_CLOEXEC) != 0)
-        O_CLOEXEC_is_known_to_work = 1;
-      else
-        ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
-    }
-  }
-#endif
-
   return fd;
 }
 
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 5412e2bc92d..f147ed4be93 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -906,8 +906,25 @@ FILE* os::fdopen(int fd, const char* mode) {
 
 ssize_t os::pd_write(int fd, const void *buf, size_t nBytes) {
   ssize_t res;
+#ifdef __APPLE__
+  // macOS fails for individual write operations > 2GB.
+  // See https://gitlab.haskell.org/ghc/ghc/-/issues/17414
+  ssize_t total = 0;
+  while (nBytes > 0) {
+    size_t bytes_to_write = MIN2(nBytes, (size_t)INT_MAX);
+    RESTARTABLE(::write(fd, buf, bytes_to_write), res);
+    if (res == OS_ERR) {
+      return OS_ERR;
+    }
+    buf = (const char*)buf + res;
+    nBytes -= res;
+    total += res;
+  }
+  return total;
+#else
   RESTARTABLE(::write(fd, buf, nBytes), res);
   return res;
+#endif
 }
 
 ssize_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) {
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 08a19270943..d9bde6fa825 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -112,6 +112,10 @@ static void save_memory_to_file(char* addr, size_t size) {
     result = ::close(fd);
     if (result == OS_ERR) {
       warning("Could not close %s: %s\n", destfile, os::strerror(errno));
+    } else {
+      if (!successful_write) {
+        remove(destfile);
+      }
     }
   }
   FREE_C_HEAP_ARRAY(char, destfile);
@@ -490,6 +494,7 @@ static char* get_user_name(uid_t uid) {
   return user_name;
 }
 
+#ifndef __APPLE__
 // return the name of the user that owns the process identified by vmid.
 //
 // This method uses a slow directory search algorithm to find the backing
@@ -653,6 +658,7 @@ static char* get_user_name(int vmid, int *nspid, TRAPS) {
 #endif
   return result;
 }
+#endif
 
 // return the file name of the backing store file for the named
 // shared memory region for the given user name and vmid.
@@ -949,6 +955,7 @@ static int create_sharedmem_file(const char* dirname, const char* filename, size
         warning("Insufficient space for shared memory file: %s/%s\n", dirname, filename);
       }
       result = OS_ERR;
+      remove(filename);
       break;
     }
   }
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index efbd1fe7c68..76f47640e5a 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -839,10 +839,18 @@ bool os::available_memory(physical_memory_size_type& value) {
   return win32::available_memory(value);
 }
 
+bool os::Machine::available_memory(physical_memory_size_type& value) {
+  return win32::available_memory(value);
+}
+
 bool os::free_memory(physical_memory_size_type& value) {
   return win32::available_memory(value);
 }
 
+bool os::Machine::free_memory(physical_memory_size_type& value) {
+  return win32::available_memory(value);
+}
+
 bool os::win32::available_memory(physical_memory_size_type& value) {
   // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
   // value if total memory is larger than 4GB
@@ -858,7 +866,11 @@ bool os::win32::available_memory(physical_memory_size_type& value) {
   }
 }
 
-bool os::total_swap_space(physical_memory_size_type& value) {
+bool os::total_swap_space(physical_memory_size_type& value)  {
+  return Machine::total_swap_space(value);
+}
+
+bool os::Machine::total_swap_space(physical_memory_size_type& value) {
   MEMORYSTATUSEX ms;
   ms.dwLength = sizeof(ms);
   BOOL res = GlobalMemoryStatusEx(&ms);
@@ -872,6 +884,10 @@ bool os::total_swap_space(physical_memory_size_type& value) {
 }
 
 bool os::free_swap_space(physical_memory_size_type& value) {
+  return Machine::free_swap_space(value);
+}
+
+bool os::Machine::free_swap_space(physical_memory_size_type& value) {
   MEMORYSTATUSEX ms;
   ms.dwLength = sizeof(ms);
   BOOL res = GlobalMemoryStatusEx(&ms);
@@ -888,6 +904,10 @@ physical_memory_size_type os::physical_memory() {
   return win32::physical_memory();
 }
 
+physical_memory_size_type os::Machine::physical_memory() {
+  return win32::physical_memory();
+}
+
 size_t os::rss() {
   size_t rss = 0;
   PROCESS_MEMORY_COUNTERS_EX pmex;
@@ -911,6 +931,10 @@ int os::active_processor_count() {
     return ActiveProcessorCount;
   }
 
+  return Machine::active_processor_count();
+}
+
+int os::Machine::active_processor_count() {
   bool schedules_all_processor_groups = win32::is_windows_11_or_greater() || win32::is_windows_server_2022_or_greater();
   if (UseAllWindowsProcessorGroups && !schedules_all_processor_groups && !win32::processor_group_warning_displayed()) {
     win32::set_processor_group_warning_displayed(true);
@@ -3257,11 +3281,10 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
     // Do manual alignment
     aligned_base = align_up(extra_base, alignment);
 
-    bool rc = (file_desc != -1) ? os::unmap_memory(extra_base, extra_size) :
-                                  os::release_memory(extra_base, extra_size);
-    assert(rc, "release failed");
-    if (!rc) {
-      return nullptr;
+    if (file_desc != -1) {
+      os::unmap_memory(extra_base, extra_size);
+    } else {
+      os::release_memory(extra_base, extra_size);
     }
 
     // Attempt to map, into the just vacated space, the slightly smaller aligned area.
@@ -3494,11 +3517,6 @@ char* os::pd_reserve_memory_special(size_t bytes, size_t alignment, size_t page_
   return reserve_large_pages(bytes, addr, exec);
 }
 
-bool os::pd_release_memory_special(char* base, size_t bytes) {
-  assert(base != nullptr, "Sanity check");
-  return pd_release_memory(base, bytes);
-}
-
 static void warn_fail_commit_memory(char* addr, size_t bytes, bool exec) {
   int err = os::get_last_error();
   char buf[256];
@@ -3657,8 +3675,8 @@ bool os::pd_create_stack_guard_pages(char* addr, size_t size) {
   return os::commit_memory(addr, size, !ExecMem);
 }
 
-bool os::remove_stack_guard_pages(char* addr, size_t size) {
-  return os::uncommit_memory(addr, size);
+void os::remove_stack_guard_pages(char* addr, size_t size) {
+  os::uncommit_memory(addr, size);
 }
 
 static bool protect_pages_individually(char* addr, size_t bytes, unsigned int p, DWORD *old_status) {
diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
index afef21b091a..3ab81697280 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -412,12 +412,8 @@ run_stub:
 }
 
 void os::Aix::init_thread_fpu_state(void) {
-#if !defined(USE_XLC_BUILTINS)
   // Disable FP exceptions.
   __asm__ __volatile__ ("mtfsfi 6,0");
-#else
-  __mtfsfi(6, 0);
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
index c741335b5f0..d9dac0e231f 100644
--- a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,29 +29,21 @@
 // Included in runtime/prefetch.inline.hpp
 
 inline void Prefetch::read(const void *loc, intx interval) {
-#if !defined(USE_XLC_BUILTINS)
   __asm__ __volatile__ (
     "   dcbt   0, %0       \n"
     :
     : /*%0*/"r" ( ((address)loc) +((long)interval) )
     //:
     );
-#else
-  __dcbt(((address)loc) +((long)interval));
-#endif
 }
 
 inline void Prefetch::write(void *loc, intx interval) {
-#if !defined(USE_XLC_BUILTINS)
   __asm__ __volatile__ (
     "   dcbtst 0, %0       \n"
     :
     : /*%0*/"r" ( ((address)loc) +((long)interval) )
     //:
     );
-#else
-  __dcbtst( ((address)loc) +((long)interval) );
-#endif
 }
 
 #endif // OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index 62dba218b2f..36599594842 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -54,8 +54,11 @@
 #include "signals_posix.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
+#include "utilities/decoder.hpp"
 #include "utilities/events.hpp"
+#include "utilities/nativeStackPrinter.hpp"
 #include "utilities/vmError.hpp"
+#include "compiler/disassembler.hpp"
 
 // put OS-includes here
 # include <sys/types.h>
@@ -85,6 +88,8 @@
 #define SPELL_REG_SP "sp"
 
 #ifdef __APPLE__
+WXMode DefaultWXWriteMode;
+
 // see darwin-xnu/osfmk/mach/arm/_structs.h
 
 // 10.5 UNIX03 member name prefixes
@@ -233,19 +238,56 @@ NOINLINE frame os::current_frame() {
 
 bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                                              ucontext_t* uc, JavaThread* thread) {
-  // Enable WXWrite: this function is called by the signal handler at arbitrary
-  // point of execution.
-  ThreadWXEnable wx(WXWrite, thread);
-
   // decide if this trap can be handled by a stub
   address stub = nullptr;
-
-  address pc          = nullptr;
+  address pc   = nullptr;
 
   //%note os_trap_1
   if (info != nullptr && uc != nullptr && thread != nullptr) {
     pc = (address) os::Posix::ucontext_get_pc(uc);
 
+#ifdef MACOS_AARCH64
+    // If we got a SIGBUS because we tried to write into the code
+    // cache, try enabling WXWrite mode.
+    if (sig == SIGBUS
+        && pc != info->si_addr
+        && CodeCache::contains(info->si_addr)
+        && os::address_is_in_vm(pc)) {
+      WXMode *entry_mode = thread->_cur_wx_mode;
+      if (entry_mode != nullptr && *entry_mode == WXArmedForWrite) {
+        if (TraceWXHealing) {
+          static const char *mode_names[3] = {"WXWrite", "WXExec", "WXArmedForWrite"};
+          tty->print("Healing WXMode %s at %p to WXWrite",
+                        mode_names[*entry_mode], entry_mode);
+          char name[128];
+          int offset = 0;
+          if (os::dll_address_to_function_name(pc, name, sizeof name, &offset)) {
+            tty->print_cr("  (%s+0x%x)", name, offset);
+          } else {
+            tty->cr();
+          }
+          if (Verbose) {
+            char buf[O_BUFLEN];
+            NativeStackPrinter nsp(thread);
+            nsp.print_stack(tty, buf, sizeof(buf), pc,
+                            true /* print_source_info */, -1 /* max stack */);
+          }
+        }
+#ifndef PRODUCT
+        guarantee(StressWXHealing,
+                  "We should not reach here unless StressWXHealing");
+#endif
+        *(thread->_cur_wx_mode) = WXWrite;
+        return thread->wx_enable_write();
+      }
+    }
+
+    // There may be cases where code after this point that we call
+    // from the signal handler changes WX state, so we protect against
+    // that by saving and restoring the state.
+    ThreadWXEnable wx(thread->get_wx_state(), thread);
+#endif
+
     // Handle ALL stack overflow variations here
     if (sig == SIGSEGV || sig == SIGBUS) {
       address addr = (address) info->si_addr;
@@ -515,11 +557,42 @@ int os::extra_bang_size_in_bytes() {
   return 0;
 }
 
-#ifdef __APPLE__
+#ifdef MACOS_AARCH64
+THREAD_LOCAL bool os::_jit_exec_enabled;
+
+// This is a wrapper around the standard library function
+// pthread_jit_write_protect_np(3). We keep track of the state of
+// per-thread write protection on the MAP_JIT region in the
+// thread-local variable os::_jit_exec_enabled
 void os::current_thread_enable_wx(WXMode mode) {
-  pthread_jit_write_protect_np(mode == WXExec);
+  bool exec_enabled = mode != WXWrite;
+  if (exec_enabled != _jit_exec_enabled NOT_PRODUCT( || DefaultWXWriteMode == WXWrite)) {
+    permit_forbidden_function::pthread_jit_write_protect_np(exec_enabled);
+    _jit_exec_enabled = exec_enabled;
+  }
 }
-#endif
+
+// If the current thread is in the WX state WXArmedForWrite, change
+// the state to WXWrite.
+bool Thread::wx_enable_write() {
+  if (_wx_state == WXArmedForWrite) {
+    _wx_state = WXWrite;
+    os::current_thread_enable_wx(WXWrite);
+    return true;
+  } else {
+    return false;
+  }
+}
+
+// A wrapper around wx_enable_write() for when the current thread is
+// not known.
+void os::thread_wx_enable_write_impl() {
+  if (!StressWXHealing) {
+    Thread::current()->wx_enable_write();
+  }
+}
+
+#endif // MACOS_AARCH64
 
 static inline void atomic_copy64(const volatile void *src, volatile void *dst) {
   *(jlong *) dst = *(const jlong *) src;
diff --git a/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.cpp b/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.cpp
index 3dc0035ed87..2b96e978980 100644
--- a/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.cpp
+++ b/src/hotspot/os_cpu/linux_arm/javaThread_linux_arm.cpp
@@ -42,8 +42,19 @@ frame JavaThread::pd_last_frame() {
 void JavaThread::cache_global_variables() {
   BarrierSet* bs = BarrierSet::barrier_set();
 
+#if INCLUDE_G1GC
+  if (bs->is_a(BarrierSet::G1BarrierSet)) {
+    _card_table_base = nullptr;
+  } else
+#endif
+#if INCLUDE_SHENANDOAHGC
+  if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+    _card_table_base = nullptr;
+  } else
+#endif
   if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
-    _card_table_base = (address) (barrier_set_cast<CardTableBarrierSet>(bs)->card_table()->byte_map_base());
+    CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
+    _card_table_base = (address)ctbs->card_table_base_const();
   } else {
     _card_table_base = nullptr;
   }
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index 07f53582a76..ee08738c678 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -52,6 +52,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
+#include "runtime/vm_version.hpp"
 
 // put OS-includes here
 # include <sys/types.h>
@@ -380,6 +381,43 @@ size_t os::Posix::default_stack_size(os::ThreadType thr_type) {
 /////////////////////////////////////////////////////////////////////////////
 // helper functions for fatal error handler
 
+// XSAVE constants - from Intel SDM Vol. 1, Chapter 13
+#define XSAVE_HDR_OFFSET 512
+#define XFEATURE_APX     (1ULL << 19)
+
+// XSAVE header structure
+// See: Intel SDM Vol. 1, Section 13.4.2 "XSAVE Header"
+// Also: Linux kernel arch/x86/include/asm/fpu/types.h
+struct xstate_header {
+    uint64_t xfeatures;
+    uint64_t xcomp_bv;
+    uint64_t reserved[6];
+};
+
+// APX extended state - R16-R31 (16 x 64-bit registers)
+// See: Intel APX Architecture Specification
+struct apx_state {
+    uint64_t regs[16];  // r16-r31
+};
+
+static apx_state* get_apx_state(const ucontext_t* uc) {
+    uint32_t offset = VM_Version::apx_xstate_offset();
+    if (offset == 0 || uc->uc_mcontext.fpregs == nullptr) {
+        return nullptr;
+    }
+
+    char* xsave = (char*)uc->uc_mcontext.fpregs;
+    xstate_header* hdr = (xstate_header*)(xsave + XSAVE_HDR_OFFSET);
+
+    // Check if APX state is present in this context
+    if (!(hdr->xfeatures & XFEATURE_APX)) {
+        return nullptr;
+    }
+
+    return (apx_state*)(xsave + offset);
+}
+
+
 void os::print_context(outputStream *st, const void *context) {
   if (context == nullptr) return;
 
@@ -406,6 +444,14 @@ void os::print_context(outputStream *st, const void *context) {
   st->print(", R14=" INTPTR_FORMAT, (intptr_t)uc->uc_mcontext.gregs[REG_R14]);
   st->print(", R15=" INTPTR_FORMAT, (intptr_t)uc->uc_mcontext.gregs[REG_R15]);
   st->cr();
+  // Dump APX EGPRs (R16-R31)
+  apx_state* apx = UseAPX ? get_apx_state(uc) : nullptr;
+  if (apx != nullptr) {
+    for (int i = 0; i < 16; i++) {
+      st->print("%sR%d=" INTPTR_FORMAT, (i % 4 == 0) ? "" : ", ", 16 + i, (intptr_t)apx->regs[i]);
+      if (i % 4 == 3) st->cr();
+    }
+  }
   st->print(  "RIP=" INTPTR_FORMAT, (intptr_t)uc->uc_mcontext.gregs[REG_RIP]);
   st->print(", EFLAGS=" INTPTR_FORMAT, (intptr_t)uc->uc_mcontext.gregs[REG_EFL]);
   st->print(", CSGSFS=" INTPTR_FORMAT, (intptr_t)uc->uc_mcontext.gregs[REG_CSGSFS]);
@@ -432,37 +478,50 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 16;
+  if (context == nullptr) {
+    return;
+  }
+  const ucontext_t *uc = (const ucontext_t*)context;
+  apx_state* apx = UseAPX ? get_apx_state(uc) : nullptr;
+
+  const int register_count = 16 + (apx != nullptr ? 16 : 0);
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
-  if (context == nullptr || n == register_count) {
+  if (n == register_count) {
     return;
   }
 
-  const ucontext_t *uc = (const ucontext_t*)context;
   while (n < register_count) {
     // Update continuation with next index before printing location
     continuation = n + 1;
+
+    if (n < 16) {
+      // Standard registers (RAX-R15)
 # define CASE_PRINT_REG(n, str, id) case n: st->print(str); print_location(st, uc->uc_mcontext.gregs[REG_##id]);
-    switch (n) {
-    CASE_PRINT_REG( 0, "RAX=", RAX); break;
-    CASE_PRINT_REG( 1, "RBX=", RBX); break;
-    CASE_PRINT_REG( 2, "RCX=", RCX); break;
-    CASE_PRINT_REG( 3, "RDX=", RDX); break;
-    CASE_PRINT_REG( 4, "RSP=", RSP); break;
-    CASE_PRINT_REG( 5, "RBP=", RBP); break;
-    CASE_PRINT_REG( 6, "RSI=", RSI); break;
-    CASE_PRINT_REG( 7, "RDI=", RDI); break;
-    CASE_PRINT_REG( 8, "R8 =", R8); break;
-    CASE_PRINT_REG( 9, "R9 =", R9); break;
-    CASE_PRINT_REG(10, "R10=", R10); break;
-    CASE_PRINT_REG(11, "R11=", R11); break;
-    CASE_PRINT_REG(12, "R12=", R12); break;
-    CASE_PRINT_REG(13, "R13=", R13); break;
-    CASE_PRINT_REG(14, "R14=", R14); break;
-    CASE_PRINT_REG(15, "R15=", R15); break;
-    }
+      switch (n) {
+        CASE_PRINT_REG( 0, "RAX=", RAX); break;
+        CASE_PRINT_REG( 1, "RBX=", RBX); break;
+        CASE_PRINT_REG( 2, "RCX=", RCX); break;
+        CASE_PRINT_REG( 3, "RDX=", RDX); break;
+        CASE_PRINT_REG( 4, "RSP=", RSP); break;
+        CASE_PRINT_REG( 5, "RBP=", RBP); break;
+        CASE_PRINT_REG( 6, "RSI=", RSI); break;
+        CASE_PRINT_REG( 7, "RDI=", RDI); break;
+        CASE_PRINT_REG( 8, "R8 =", R8); break;
+        CASE_PRINT_REG( 9, "R9 =", R9); break;
+        CASE_PRINT_REG(10, "R10=", R10); break;
+        CASE_PRINT_REG(11, "R11=", R11); break;
+        CASE_PRINT_REG(12, "R12=", R12); break;
+        CASE_PRINT_REG(13, "R13=", R13); break;
+        CASE_PRINT_REG(14, "R14=", R14); break;
+        CASE_PRINT_REG(15, "R15=", R15); break;
+      }
 # undef CASE_PRINT_REG
+    } else {
+      // APX extended general purpose registers (R16-R31)
+      st->print("R%d=", n);
+      print_location(st, apx->regs[n - 16]);
+    }
     ++n;
   }
 }
diff --git a/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp
index a20feadcba4..93beb549366 100644
--- a/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp
+++ b/src/hotspot/os_cpu/windows_aarch64/vm_version_windows_aarch64.cpp
@@ -27,22 +27,30 @@
 #include "runtime/vm_version.hpp"
 
 int VM_Version::get_current_sve_vector_length() {
-  assert(_features & CPU_SVE, "should not call this");
+  assert(VM_Version::supports_sve(), "should not call this");
   ShouldNotReachHere();
   return 0;
 }
 
 int VM_Version::set_and_get_current_sve_vector_length(int length) {
-  assert(_features & CPU_SVE, "should not call this");
+  assert(VM_Version::supports_sve(), "should not call this");
   ShouldNotReachHere();
   return 0;
 }
 
 void VM_Version::get_os_cpu_info() {
 
-  if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE))   _features |= CPU_CRC32;
-  if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE))  _features |= CPU_AES | CPU_SHA1 | CPU_SHA2;
-  if (IsProcessorFeaturePresent(PF_ARM_VFP_32_REGISTERS_AVAILABLE))        _features |= CPU_ASIMD;
+  if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE)) {
+    set_feature(CPU_CRC32);
+  }
+  if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE)) {
+    set_feature(CPU_AES);
+    set_feature(CPU_SHA1);
+    set_feature(CPU_SHA2);
+  }
+  if (IsProcessorFeaturePresent(PF_ARM_VFP_32_REGISTERS_AVAILABLE)) {
+    set_feature(CPU_ASIMD);
+  }
   // No check for CPU_PMULL, CPU_SVE, CPU_SVE2
 
   __int64 dczid_el0 = _ReadStatusReg(0x5807 /* ARM64_DCZID_EL0 */);
diff --git a/src/hotspot/share/adlc/adlArena.cpp b/src/hotspot/share/adlc/adlArena.cpp
index ebd1f74911d..e3ae60e91a9 100644
--- a/src/hotspot/share/adlc/adlArena.cpp
+++ b/src/hotspot/share/adlc/adlArena.cpp
@@ -136,9 +136,9 @@ void *AdlArena::Acalloc( size_t items, size_t x ) {
 }
 
 //------------------------------realloc----------------------------------------
-static size_t pointer_delta(const void *left, const void *right) {
-  assert(left >= right, "pointer delta underflow");
-  return (uintptr_t)left - (uintptr_t)right;
+static size_t pointer_delta(const void* high, const void* low) {
+  assert(high >= low, "pointer delta underflow");
+  return (uintptr_t)high - (uintptr_t)low;
 }
 
 // Reallocate storage in AdlArena.
diff --git a/src/hotspot/share/adlc/main.cpp b/src/hotspot/share/adlc/main.cpp
index 4e8a96617e8..8e6ea5bbec9 100644
--- a/src/hotspot/share/adlc/main.cpp
+++ b/src/hotspot/share/adlc/main.cpp
@@ -213,6 +213,7 @@ int main(int argc, char *argv[])
   AD.addInclude(AD._CPP_file, "adfiles", get_basename(AD._VM_file._name));
   AD.addInclude(AD._CPP_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._CPP_file, "memory/allocation.inline.hpp");
+  AD.addInclude(AD._CPP_file, "code/aotCodeCache.hpp");
   AD.addInclude(AD._CPP_file, "code/codeCache.hpp");
   AD.addInclude(AD._CPP_file, "code/compiledIC.hpp");
   AD.addInclude(AD._CPP_file, "code/nativeInst.hpp");
@@ -257,6 +258,7 @@ int main(int argc, char *argv[])
   AD.addInclude(AD._CPP_PEEPHOLE_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name));
   AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name));
+  AD.addInclude(AD._DFA_file, "code/aotCodeCache.hpp");
   AD.addInclude(AD._DFA_file, "oops/compressedOops.hpp");
   AD.addInclude(AD._DFA_file, "opto/cfgnode.hpp");  // Use PROB_MAX in predicate.
   AD.addInclude(AD._DFA_file, "opto/intrinsicnode.hpp");
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 7871134e923..ba525588f32 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,6 +98,8 @@ CodeBuffer::CodeBuffer(const CodeBlob* blob) DEBUG_ONLY(: Scrubber(this, sizeof(
 }
 
 void CodeBuffer::initialize(csize_t code_size, csize_t locs_size) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   // Always allow for empty slop around each section.
   int slop = (int) CodeSection::end_slop();
 
@@ -466,9 +468,7 @@ void CodeBuffer::compute_final_layout(CodeBuffer* dest) const {
   assert(!_finalize_stubs, "non-finalized stubs");
 
   {
-    // not sure why this is here, but why not...
-    int alignSize = MAX2((intx) sizeof(jdouble), CodeEntryAlignment);
-    assert( (dest->_total_start - _insts.start()) % alignSize == 0, "copy must preserve alignment");
+    assert( (dest->_total_start - _insts.start()) % CodeEntryAlignment == 0, "copy must preserve alignment");
   }
 
   const CodeSection* prev_cs      = nullptr;
diff --git a/src/hotspot/share/asm/register.hpp b/src/hotspot/share/asm/register.hpp
index f406995b8ac..95c7c7922cf 100644
--- a/src/hotspot/share/asm/register.hpp
+++ b/src/hotspot/share/asm/register.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,15 +49,7 @@ class AbstractRegisterImpl {
 
 // Macros to help define all kinds of registers
 
-#ifndef USE_POINTERS_TO_REGISTER_IMPL_ARRAY
-
-#define AS_REGISTER(type,name)         ((type)name##_##type##EnumValue)
-
-#define CONSTANT_REGISTER_DECLARATION(type, name, value)                \
-const type name = ((type)value);                                        \
-enum { name##_##type##EnumValue = (value) }
-
-#else // USE_POINTERS_TO_REGISTER_IMPL_ARRAY
+#ifdef USE_POINTERS_TO_REGISTER_IMPL_ARRAY
 
 #define REGISTER_IMPL_DECLARATION(type, impl_type, reg_count)           \
 inline constexpr type as_ ## type(int encoding) {                       \
@@ -69,16 +61,8 @@ inline constexpr type impl_type::first() { return all_ ## type ## s + 1; }
 #define REGISTER_IMPL_DEFINITION(type, impl_type, reg_count)            \
 impl_type all_ ## type ## s[reg_count + 1];
 
-#define CONSTANT_REGISTER_DECLARATION(type, name, value)                \
-constexpr type name = as_ ## type(value);
-
 #endif // USE_POINTERS_TO_REGISTER_IMPL_ARRAY
 
-
-#define REGISTER_DECLARATION(type, name, value) \
-const type name = ((type)value)
-
-
 // For definitions of RegisterImpl* instances. To be redefined in an
 // OS-specific way.
 #ifdef __GNUC__
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index a4c956ff5be..63764dd113a 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -541,6 +541,7 @@ extern void vm_exit(int code);
 // unpack_with_exception entry instead. This makes life for the exception blob easier
 // because making that same check and diverting is painful from assembly language.
 JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* current, oopDesc* ex, address pc, nmethod*& nm))
+  MACOS_AARCH64_ONLY(current->wx_enable_write());
   Handle exception(current, ex);
 
   // This function is called when we are about to throw an exception. Therefore,
diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index f77aac3540c..9275b914ef9 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -426,7 +426,8 @@ bool AOTClassLocation::check(const char* runtime_path, bool has_aot_linked_class
     bool size_differs = _filesize != st.st_size;
     bool time_differs = _check_time && (_timestamp != st.st_mtime);
     if (size_differs || time_differs) {
-      aot_log_warning(aot)("This file is not the one used while building the shared archive file: '%s'%s%s",
+      aot_log_warning(aot)("This file is not the one used while building the %s: '%s'%s%s",
+                       CDSConfig::type_of_archive_being_loaded(),
                        runtime_path,
                        time_differs ? ", timestamp has changed" : "",
                        size_differs ? ", size has changed" : "");
@@ -448,6 +449,13 @@ void AOTClassLocationConfig::dumptime_init(JavaThread* current) {
     java_lang_Throwable::print(current->pending_exception(), tty);
     vm_exit_during_initialization("AOTClassLocationConfig::dumptime_init_helper() failed unexpectedly");
   }
+
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    // The _max_used_index is usually updated by ClassLoader::record_result(). However,
+    // when dumping the final archive, the classes are loaded from their images in
+    // the AOT config file, so we don't go through ClassLoader::record_result().
+    dumptime_update_max_used_index(runtime()->_max_used_index); // Same value as recorded in the training run.
+  }
 }
 
 void AOTClassLocationConfig::dumptime_init_helper(TRAPS) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java b/src/hotspot/share/cds/aotCompressedPointers.cpp
similarity index 75%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java
rename to src/hotspot/share/cds/aotCompressedPointers.cpp
index 0a8bf4721e4..c3efa7a7185 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeDataInterface.java
+++ b/src/hotspot/share/cds/aotCompressedPointers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,9 @@
  *
  */
 
-package sun.jvm.hotspot.oops;
+#include "cds/aotCompressedPointers.hpp"
+#include "cds/archiveBuilder.hpp"
 
-public interface CallTypeDataInterface<K> {
-  int numberOfArguments();
-  boolean hasArguments();
-  K argumentType(int i);
-  boolean hasReturn();
-  K returnType();
-  int argumentTypeIndex(int i);
-  int returnTypeIndex();
+size_t AOTCompressedPointers::compute_byte_offset(address p) {
+  return ArchiveBuilder::current()->any_to_offset(p);
 }
diff --git a/src/hotspot/share/cds/aotCompressedPointers.hpp b/src/hotspot/share/cds/aotCompressedPointers.hpp
new file mode 100644
index 00000000000..a3919fb95a9
--- /dev/null
+++ b/src/hotspot/share/cds/aotCompressedPointers.hpp
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_AOTCOMPRESSEDPOINTERS_HPP
+#define SHARE_CDS_AOTCOMPRESSEDPOINTERS_HPP
+
+#include "cds/cds_globals.hpp"
+#include "memory/allStatic.hpp"
+#include "memory/metaspace.hpp"
+#include "metaprogramming/enableIf.hpp"
+#include "utilities/align.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+class AOTCompressedPointers: public AllStatic {
+public:
+  // For space saving, we can encode the location of metadata objects in the "rw" and "ro"
+  // regions using a 32-bit offset from the bottom of the mapped AOT metaspace. Since metadata
+  // objects are 8-byte aligned, we store scaled offset units (offset_bytes >> 3) to address
+  // up to ~32GB on 64-bit platforms.  We currently limit the MaxMetadataOffsetBytes to about
+  // 3.5 GB to be compatible with +CompactObjectHeaders.
+  enum class narrowPtr : u4;
+  static constexpr size_t MetadataOffsetShift = LP64_ONLY(3) NOT_LP64(0);
+  static constexpr size_t MaxMetadataOffsetBytes = LP64_ONLY(3584ULL * M) NOT_LP64(0x7FFFFFFF);
+
+  // Convert the encoded narrowPtr to a byte offset by applying the shift.
+  inline static size_t get_byte_offset(narrowPtr narrowp) {
+    return ((size_t)checked_cast<u4>(narrowp)) << MetadataOffsetShift;
+  }
+
+  inline static narrowPtr null() {
+    return static_cast<narrowPtr>(0);
+  }
+
+  // Encoding ------
+
+  // ptr can point to one of the following
+  // - an object in the ArchiveBuilder's buffer.
+  // - an object in the currently mapped AOT cache rw/ro regions.
+  // - an object that has been copied into the ArchiveBuilder's buffer.
+  template <typename T>
+  static narrowPtr encode_not_null(T ptr) {
+    address p = reinterpret_cast<address>(ptr);
+    return encode_byte_offset(compute_byte_offset(p));
+  }
+
+  template <typename T>
+  static narrowPtr encode(T ptr) { // may be null
+    if (ptr == nullptr) {
+      return null();
+    } else {
+      return encode_not_null(ptr);
+    }
+  }
+
+  // ptr must be in the currently mapped AOT cache rw/ro regions.
+  template <typename T>
+  static narrowPtr encode_address_in_cache(T ptr) {
+    assert(Metaspace::in_aot_cache(ptr), "must be");
+    address p = reinterpret_cast<address>(ptr);
+    address base = reinterpret_cast<address>(SharedBaseAddress);
+    return encode_byte_offset(pointer_delta(p, base, 1));
+  }
+
+  template <typename T>
+  static narrowPtr encode_address_in_cache_or_null(T ptr) {
+    if (ptr == nullptr) {
+      return null();
+    } else {
+      return encode_address_in_cache<T>(ptr);
+    }
+  }
+
+  // Decoding -----
+
+  // If base_address is null, decode an address within the mapped aot cache range.
+  template <typename T>
+  static T decode_not_null(narrowPtr narrowp, address base_address = nullptr) {
+    assert(narrowp != null(), "sanity");
+    if (base_address == nullptr) {
+      T p = reinterpret_cast<T>(reinterpret_cast<address>(SharedBaseAddress) + get_byte_offset(narrowp));
+      assert(Metaspace::in_aot_cache(p), "must be");
+      return p;
+    } else {
+      // This is usually called before the cache is fully mapped.
+      return reinterpret_cast<T>(base_address + get_byte_offset(narrowp));
+    }
+  }
+
+  template <typename T>
+  static T decode(narrowPtr narrowp, address base_address = nullptr) { // may be null
+    if (narrowp == null()) {
+      return nullptr;
+    } else {
+      return decode_not_null<T>(narrowp, base_address);
+    }
+  }
+
+private:
+  static size_t compute_byte_offset(address p);
+
+  static narrowPtr encode_byte_offset(size_t offset) {
+    assert(offset != 0, "offset 0 is in protection zone");
+    precond(offset <= MaxMetadataOffsetBytes);
+    assert(is_aligned(offset, (size_t)1 << MetadataOffsetShift), "offset not aligned");
+    return checked_cast<narrowPtr>(offset >> MetadataOffsetShift);
+  }
+};
+
+// Type casts -- declared as global functions to save a few keystrokes
+
+// A simple type cast. No change in numerical value.
+inline AOTCompressedPointers::narrowPtr cast_from_u4(u4 narrowp) {
+  return checked_cast<AOTCompressedPointers::narrowPtr>(narrowp);
+}
+
+// A simple type cast. No change in numerical value.
+// !!!DO NOT CALL THIS if you want a byte offset!!!
+inline u4 cast_to_u4(AOTCompressedPointers::narrowPtr narrowp) {
+  return checked_cast<u4>(narrowp);
+}
+
+#endif // SHARE_CDS_AOTCOMPRESSEDPOINTERS_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/cds/aotGrowableArray.cpp
similarity index 62%
rename from src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
rename to src/hotspot/share/cds/aotGrowableArray.cpp
index f6d47acdc01..ec63e7aa57f 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
+++ b/src/hotspot/share/cds/aotGrowableArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,17 +22,13 @@
  *
  */
 
-#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
-#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
+#include "cds/aotGrowableArray.hpp"
+#include "cds/aotMetaspace.hpp"
+#include "memory/allocation.inline.hpp"
+#include "utilities/growableArray.hpp"
 
-#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
-
-#include "gc/shared/gc_globals.hpp"
-#include "oops/oop.inline.hpp"
-#include "oops/oopsHierarchy.hpp"
-
-inline bool G1CMObjArrayProcessor::should_be_sliced(oop obj) {
-  return obj->is_objArray() && ((objArrayOop)obj)->size() >= 2 * ObjArrayMarkingStride;
+void AOTGrowableArrayHelper::deallocate(void* mem) {
+  if (!AOTMetaspace::in_aot_cache(mem)) {
+    GrowableArrayCHeapAllocator::deallocate(mem);
+  }
 }
-
-#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
diff --git a/src/hotspot/share/cds/aotGrowableArray.hpp b/src/hotspot/share/cds/aotGrowableArray.hpp
new file mode 100644
index 00000000000..0a0c137ed07
--- /dev/null
+++ b/src/hotspot/share/cds/aotGrowableArray.hpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_AOT_AOTGROWABLEARRAY_HPP
+#define SHARE_AOT_AOTGROWABLEARRAY_HPP
+
+#include <memory/metaspaceClosureType.hpp>
+#include <utilities/growableArray.hpp>
+
+class AOTGrowableArrayHelper {
+public:
+  static void deallocate(void* mem);
+};
+
+// An AOTGrowableArray<T> provides the same functionality as a GrowableArray<T> that
+// uses the C heap allocator. In addition, AOTGrowableArray<T> can be iterated with
+// MetaspaceClosure. This type should be used for growable arrays that need to be
+// stored in the AOT cache. See ModuleEntry::_reads for an example.
+template <typename E>
+class AOTGrowableArray : public GrowableArrayWithAllocator<E, AOTGrowableArray<E>> {
+  friend class VMStructs;
+  friend class GrowableArrayWithAllocator<E, AOTGrowableArray>;
+
+  static E* allocate(int max, MemTag mem_tag) {
+    return (E*)GrowableArrayCHeapAllocator::allocate(max, sizeof(E), mem_tag);
+  }
+
+  E* allocate() {
+    return allocate(this->_capacity, mtClass);
+  }
+
+  void deallocate(E* mem) {
+#if INCLUDE_CDS
+    AOTGrowableArrayHelper::deallocate(mem);
+#else
+    GrowableArrayCHeapAllocator::deallocate(mem);
+#endif
+  }
+
+public:
+  AOTGrowableArray(int initial_capacity, MemTag mem_tag) :
+      GrowableArrayWithAllocator<E, AOTGrowableArray>(
+          allocate(initial_capacity, mem_tag),
+          initial_capacity) {}
+
+  AOTGrowableArray() : AOTGrowableArray(0, mtClassShared) {}
+
+  // methods required by MetaspaceClosure
+  void metaspace_pointers_do(MetaspaceClosure* it);
+  int size_in_heapwords() const { return (int)heap_word_size(sizeof(*this)); }
+  MetaspaceClosureType type() const { return MetaspaceClosureType::GrowableArrayType; }
+  static bool is_read_only_by_default() { return false; }
+};
+
+#endif // SHARE_AOT_AOTGROWABLEARRAY_HPP
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java b/src/hotspot/share/cds/aotGrowableArray.inline.hpp
similarity index 66%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java
rename to src/hotspot/share/cds/aotGrowableArray.inline.hpp
index 8e6b131ee9d..8c6e8cb6503 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodDataInterface.java
+++ b/src/hotspot/share/cds/aotGrowableArray.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,18 +22,16 @@
  *
  */
 
-package sun.jvm.hotspot.oops;
+#ifndef SHARE_CDS_AOTGROWABLEARRAY_INLINE_HPP
+#define SHARE_CDS_AOTGROWABLEARRAY_INLINE_HPP
 
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
+#include "cds/aotGrowableArray.hpp"
 
-public interface MethodDataInterface<K, M> {
-  K getKlassAtAddress(Address addr);
-  M getMethodAtAddress(Address addr);
-  void printKlassValueOn(K klass, PrintStream st);
-  void printMethodValueOn(M klass, PrintStream st);
+#include "memory/metaspaceClosure.hpp"
+
+template <typename E>
+void AOTGrowableArray<E>::metaspace_pointers_do(MetaspaceClosure* it) {
+  it->push_c_array(AOTGrowableArray<E>::data_addr(), AOTGrowableArray<E>::capacity());
 }
+
+#endif // SHARE_CDS_AOTGROWABLEARRAY_INLINE_HPP
diff --git a/src/hotspot/share/cds/aotMapLogger.cpp b/src/hotspot/share/cds/aotMapLogger.cpp
index a252eae4b84..fa769aee1bf 100644
--- a/src/hotspot/share/cds/aotMapLogger.cpp
+++ b/src/hotspot/share/cds/aotMapLogger.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
 #include "cds/aotStreamedHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/filemap.hpp"
+#include "classfile/moduleEntry.hpp"
+#include "classfile/packageEntry.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
 #include "logging/log.hpp"
@@ -86,7 +88,7 @@ void AOTMapLogger::ergo_initialize() {
 }
 
 void AOTMapLogger::dumptime_log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
-                                ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info,
+                                AOTMappedHeapInfo* mapped_heap_info, AOTStreamedHeapInfo* streamed_heap_info,
                                 char* bitmap, size_t bitmap_size_in_bytes) {
   _is_runtime_logging = false;
   _buffer_to_requested_delta =  ArchiveBuilder::current()->buffer_to_requested_delta();
@@ -141,7 +143,7 @@ public:
       info._buffered_addr = ref->obj();
       info._requested_addr = ref->obj();
       info._bytes = ref->size() * BytesPerWord;
-      info._type = ref->msotype();
+      info._type = ref->type();
       _objs.append(info);
     }
 
@@ -214,7 +216,7 @@ void AOTMapLogger::dumptime_log_metaspace_region(const char* name, DumpRegion* r
       info._buffered_addr = src_info->buffered_addr();
       info._requested_addr = info._buffered_addr + _buffer_to_requested_delta;
       info._bytes = src_info->size_in_bytes();
-      info._type = src_info->msotype();
+      info._type = src_info->type();
       objs.append(info);
     }
 
@@ -332,43 +334,52 @@ void AOTMapLogger::log_metaspace_objects_impl(address region_base, address regio
     address buffered_addr = info._buffered_addr;
     address requested_addr = info._requested_addr;
     int bytes = info._bytes;
-    MetaspaceObj::Type type = info._type;
-    const char* type_name = MetaspaceObj::type_name(type);
+    MetaspaceClosureType type = info._type;
+    const char* type_name = MetaspaceClosure::type_name(type);
 
     log_as_hex(last_obj_base, buffered_addr, last_obj_base + _buffer_to_requested_delta);
 
     switch (type) {
-    case MetaspaceObj::ClassType:
+    case MetaspaceClosureType::ClassType:
       log_klass((Klass*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::ConstantPoolType:
+    case MetaspaceClosureType::ConstantPoolType:
       log_constant_pool((ConstantPool*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::ConstantPoolCacheType:
+    case MetaspaceClosureType::ConstantPoolCacheType:
       log_constant_pool_cache((ConstantPoolCache*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::ConstMethodType:
+    case MetaspaceClosureType::ConstMethodType:
       log_const_method((ConstMethod*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::MethodType:
+    case MetaspaceClosureType::MethodType:
       log_method((Method*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::MethodCountersType:
+    case MetaspaceClosureType::MethodCountersType:
       log_method_counters((MethodCounters*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::MethodDataType:
+    case MetaspaceClosureType::MethodDataType:
       log_method_data((MethodData*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::SymbolType:
+    case MetaspaceClosureType::ModuleEntryType:
+      log_module_entry((ModuleEntry*)src, requested_addr, type_name, bytes, current);
+      break;
+    case MetaspaceClosureType::PackageEntryType:
+      log_package_entry((PackageEntry*)src, requested_addr, type_name, bytes, current);
+      break;
+    case MetaspaceClosureType::GrowableArrayType:
+      log_growable_array((GrowableArrayBase*)src, requested_addr, type_name, bytes, current);
+      break;
+    case MetaspaceClosureType::SymbolType:
       log_symbol((Symbol*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::KlassTrainingDataType:
+    case MetaspaceClosureType::KlassTrainingDataType:
       log_klass_training_data((KlassTrainingData*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::MethodTrainingDataType:
+    case MetaspaceClosureType::MethodTrainingDataType:
       log_method_training_data((MethodTrainingData*)src, requested_addr, type_name, bytes, current);
       break;
-    case MetaspaceObj::CompileTrainingDataType:
+    case MetaspaceClosureType::CompileTrainingDataType:
       log_compile_training_data((CompileTrainingData*)src, requested_addr, type_name, bytes, current);
       break;
     default:
@@ -421,6 +432,27 @@ void AOTMapLogger::log_method_data(MethodData* md, address requested_addr, const
   log_debug(aot, map)(_LOG_PREFIX " %s", p2i(requested_addr), type_name, bytes,  md->method()->external_name());
 }
 
+void AOTMapLogger::log_module_entry(ModuleEntry* mod, address requested_addr, const char* type_name,
+                                   int bytes, Thread* current) {
+  ResourceMark rm(current);
+  log_debug(aot, map)(_LOG_PREFIX " %s", p2i(requested_addr), type_name, bytes,
+                      mod->name_as_C_string());
+}
+
+void AOTMapLogger::log_package_entry(PackageEntry* pkg, address requested_addr, const char* type_name,
+                                   int bytes, Thread* current) {
+  ResourceMark rm(current);
+  log_debug(aot, map)(_LOG_PREFIX " %s - %s", p2i(requested_addr), type_name, bytes,
+                      pkg->module()->name_as_C_string(), pkg->name_as_C_string());
+}
+
+void AOTMapLogger::log_growable_array(GrowableArrayBase* arr, address requested_addr, const char* type_name,
+                                      int bytes, Thread* current) {
+  ResourceMark rm(current);
+  log_debug(aot, map)(_LOG_PREFIX " %d (%d)", p2i(requested_addr), type_name, bytes,
+                      arr->length(), arr->capacity());
+}
+
 void AOTMapLogger::log_klass(Klass* k, address requested_addr, const char* type_name,
                              int bytes, Thread* current) {
   ResourceMark rm(current);
@@ -791,7 +823,7 @@ public:
   }
 }; // AOTMapLogger::ArchivedFieldPrinter
 
-void AOTMapLogger::dumptime_log_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) {
+void AOTMapLogger::dumptime_log_mapped_heap_region(AOTMappedHeapInfo* heap_info) {
   MemRegion r = heap_info->buffer_region();
   address buffer_start = address(r.start()); // start of the current oop inside the buffer
   address buffer_end = address(r.end());
@@ -803,7 +835,7 @@ void AOTMapLogger::dumptime_log_mapped_heap_region(ArchiveMappedHeapInfo* heap_i
   log_archived_objects(AOTMappedHeapWriter::oop_iterator(heap_info));
 }
 
-void AOTMapLogger::dumptime_log_streamed_heap_region(ArchiveStreamedHeapInfo* heap_info) {
+void AOTMapLogger::dumptime_log_streamed_heap_region(AOTStreamedHeapInfo* heap_info) {
   MemRegion r = heap_info->buffer_region();
   address buffer_start = address(r.start()); // start of the current oop inside the buffer
   address buffer_end = address(r.end());
diff --git a/src/hotspot/share/cds/aotMapLogger.hpp b/src/hotspot/share/cds/aotMapLogger.hpp
index ba188514861..f495ed97f40 100644
--- a/src/hotspot/share/cds/aotMapLogger.hpp
+++ b/src/hotspot/share/cds/aotMapLogger.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,18 +28,23 @@
 #include "cds/archiveBuilder.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/metaspaceClosureType.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
 
-class ArchiveMappedHeapInfo;
-class ArchiveStreamedHeapInfo;
+class AOTMappedHeapInfo;
+class AOTStreamedHeapInfo;
 class CompileTrainingData;
 class DumpRegion;
 class FileMapInfo;
+class GrowableArrayBase;
 class KlassTrainingData;
+class MethodCounters;
 class MethodTrainingData;
+class ModuleEntry;
 class outputStream;
+class PackageEntry;
 
 // Write detailed info to a mapfile to analyze contents of the AOT cache/CDS archive.
 // -Xlog:aot+map* can be used both when creating an AOT cache, or when using an AOT cache.
@@ -62,7 +67,7 @@ class AOTMapLogger : AllStatic {
     address _buffered_addr;
     address _requested_addr;
     int _bytes;
-    MetaspaceObj::Type _type;
+    MetaspaceClosureType _type;
   };
 
 public:
@@ -142,6 +147,9 @@ private:
   Thread* current);
   static void log_klass(Klass* k, address requested_addr, const char* type_name, int bytes, Thread* current);
   static void log_method(Method* m, address requested_addr, const char* type_name, int bytes, Thread* current);
+  static void log_module_entry(ModuleEntry* mod, address requested_addr, const char* type_name, int bytes, Thread* current);
+  static void log_package_entry(PackageEntry* pkg, address requested_addr, const char* type_name, int bytes, Thread* current);
+  static void log_growable_array(GrowableArrayBase* arr, address requested_addr, const char* type_name, int bytes, Thread* current);
   static void log_symbol(Symbol* s, address requested_addr, const char* type_name, int bytes, Thread* current);
   static void log_klass_training_data(KlassTrainingData* ktd, address requested_addr, const char* type_name, int bytes, Thread* current);
   static void log_method_training_data(MethodTrainingData* mtd, address requested_addr, const char* type_name, int bytes, Thread* current);
@@ -149,8 +157,8 @@ private:
 
 
 #if INCLUDE_CDS_JAVA_HEAP
-  static void dumptime_log_mapped_heap_region(ArchiveMappedHeapInfo* mapped_heap_info);
-  static void dumptime_log_streamed_heap_region(ArchiveStreamedHeapInfo* streamed_heap_info);
+  static void dumptime_log_mapped_heap_region(AOTMappedHeapInfo* mapped_heap_info);
+  static void dumptime_log_streamed_heap_region(AOTStreamedHeapInfo* streamed_heap_info);
   static void runtime_log_heap_region(FileMapInfo* mapinfo);
 
   static void print_oop_info_cr(outputStream* st, FakeOop fake_oop, bool print_location = true);
@@ -165,7 +173,7 @@ public:
   static bool is_logging_at_bootstrap() { return _is_logging_at_bootstrap; }
 
   static void dumptime_log(ArchiveBuilder* builder, FileMapInfo* mapinfo,
-                           ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info,
+                           AOTMappedHeapInfo* mapped_heap_info, AOTStreamedHeapInfo* streamed_heap_info,
                            char* bitmap, size_t bitmap_size_in_bytes);
   static void runtime_log(FileMapInfo* static_mapinfo, FileMapInfo* dynamic_mapinfo);
 };
diff --git a/src/hotspot/share/cds/aotMappedHeap.cpp b/src/hotspot/share/cds/aotMappedHeap.cpp
new file mode 100644
index 00000000000..ba24c43eea1
--- /dev/null
+++ b/src/hotspot/share/cds/aotMappedHeap.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotMappedHeap.hpp"
+
+// Anything that goes in the header must be thoroughly purged from uninitialized memory
+// as it will be written to disk. Therefore, the constructors memset the memory to 0.
+// This is not the prettiest thing, but we need to know every byte is initialized,
+// including potential padding between fields.
+
+AOTMappedHeapHeader::AOTMappedHeapHeader(size_t ptrmap_start_pos,
+                                         size_t oopmap_start_pos,
+                                         HeapRootSegments root_segments) {
+  memset((char*)this, 0, sizeof(*this));
+  _ptrmap_start_pos = ptrmap_start_pos;
+  _oopmap_start_pos = oopmap_start_pos;
+  _root_segments = root_segments;
+}
+
+AOTMappedHeapHeader::AOTMappedHeapHeader() {
+  memset((char*)this, 0, sizeof(*this));
+}
+
+AOTMappedHeapHeader AOTMappedHeapInfo::create_header() {
+  return AOTMappedHeapHeader{_ptrmap_start_pos,
+                             _oopmap_start_pos,
+                             _root_segments};
+}
diff --git a/src/hotspot/share/cds/aotMappedHeap.hpp b/src/hotspot/share/cds/aotMappedHeap.hpp
new file mode 100644
index 00000000000..307451b24d4
--- /dev/null
+++ b/src/hotspot/share/cds/aotMappedHeap.hpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_AOTMAPPEDHEAP_HPP
+#define SHARE_CDS_AOTMAPPEDHEAP_HPP
+
+#include "cds/aotMapLogger.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+
+class AOTMappedHeapHeader {
+  size_t           _ptrmap_start_pos; // The first bit in the ptrmap corresponds to this position in the heap.
+  size_t           _oopmap_start_pos; // The first bit in the oopmap corresponds to this position in the heap.
+  HeapRootSegments _root_segments;    // Heap root segments info
+
+public:
+  AOTMappedHeapHeader();
+  AOTMappedHeapHeader(size_t ptrmap_start_pos,
+                      size_t oopmap_start_pos,
+                      HeapRootSegments root_segments);
+
+  size_t ptrmap_start_pos() const { return _ptrmap_start_pos; }
+  size_t oopmap_start_pos() const { return _oopmap_start_pos; }
+  HeapRootSegments root_segments() const { return _root_segments; }
+
+  // This class is trivially copyable and assignable.
+  AOTMappedHeapHeader(const AOTMappedHeapHeader&) = default;
+  AOTMappedHeapHeader& operator=(const AOTMappedHeapHeader&) = default;
+};
+
+class AOTMappedHeapInfo {
+  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
+  CHeapBitMap _oopmap;
+  CHeapBitMap _ptrmap;
+  HeapRootSegments _root_segments;
+  size_t _oopmap_start_pos;             // How many zeros were removed from the beginning of the bit map?
+  size_t _ptrmap_start_pos;             // How many zeros were removed from the beginning of the bit map?
+
+public:
+  AOTMappedHeapInfo() :
+    _buffer_region(),
+    _oopmap(128, mtClassShared),
+    _ptrmap(128, mtClassShared),
+    _root_segments(),
+    _oopmap_start_pos(),
+    _ptrmap_start_pos() {}
+  bool is_used() { return !_buffer_region.is_empty(); }
+
+  MemRegion buffer_region() { return _buffer_region; }
+  void set_buffer_region(MemRegion r) { _buffer_region = r; }
+
+  char* buffer_start() { return (char*)_buffer_region.start(); }
+  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
+
+  CHeapBitMap* oopmap() { return &_oopmap; }
+  CHeapBitMap* ptrmap() { return &_ptrmap; }
+
+  void set_oopmap_start_pos(size_t start_pos) { _oopmap_start_pos = start_pos; }
+  void set_ptrmap_start_pos(size_t start_pos) { _ptrmap_start_pos = start_pos; }
+
+  void set_root_segments(HeapRootSegments segments) { _root_segments = segments; };
+  HeapRootSegments root_segments() { return _root_segments; }
+
+  AOTMappedHeapHeader create_header();
+};
+
+#if INCLUDE_CDS_JAVA_HEAP
+class AOTMappedHeapOopIterator : public AOTMapLogger::OopDataIterator {
+protected:
+  address _current;
+  address _next;
+
+  address _buffer_start;
+  address _buffer_end;
+  uint64_t _buffer_start_narrow_oop;
+  intptr_t _buffer_to_requested_delta;
+  int _requested_shift;
+
+  size_t _num_root_segments;
+  size_t _num_obj_arrays_logged;
+
+public:
+  AOTMappedHeapOopIterator(address buffer_start,
+                           address buffer_end,
+                           address requested_base,
+                           address requested_start,
+                           int requested_shift,
+                           size_t num_root_segments)
+    : _current(nullptr),
+      _next(buffer_start),
+      _buffer_start(buffer_start),
+      _buffer_end(buffer_end),
+      _requested_shift(requested_shift),
+      _num_root_segments(num_root_segments),
+      _num_obj_arrays_logged(0) {
+    _buffer_to_requested_delta = requested_start - buffer_start;
+    _buffer_start_narrow_oop = 0xdeadbeed;
+    if (UseCompressedOops) {
+      _buffer_start_narrow_oop = (uint64_t)(pointer_delta(requested_start, requested_base, 1)) >> requested_shift;
+      assert(_buffer_start_narrow_oop < 0xffffffff, "sanity");
+    }
+  }
+
+  virtual AOTMapLogger::OopData capture(address buffered_addr) = 0;
+
+  bool has_next() override {
+    return _next < _buffer_end;
+  }
+
+  AOTMapLogger::OopData next() override {
+    _current = _next;
+    AOTMapLogger::OopData result = capture(_current);
+    if (result._klass->is_objArray_klass()) {
+      result._is_root_segment = _num_obj_arrays_logged++ < _num_root_segments;
+    }
+    _next = _current + result._size * BytesPerWord;
+    return result;
+  }
+
+  AOTMapLogger::OopData obj_at(narrowOop* addr) override {
+    uint64_t n = (uint64_t)(*addr);
+    if (n == 0) {
+      return null_data();
+    } else {
+      precond(n >= _buffer_start_narrow_oop);
+      address buffer_addr = _buffer_start + ((n - _buffer_start_narrow_oop) << _requested_shift);
+      return capture(buffer_addr);
+    }
+  }
+
+  AOTMapLogger::OopData obj_at(oop* addr) override {
+    address requested_value = cast_from_oop<address>(*addr);
+    if (requested_value == nullptr) {
+      return null_data();
+    } else {
+      address buffer_addr = requested_value - _buffer_to_requested_delta;
+      return capture(buffer_addr);
+    }
+  }
+
+  GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
+    return new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
+  }
+};
+#endif // INCLUDE_CDS_JAVA_HEAP
+
+#endif // SHARE_CDS_AOTMAPPEDHEAP_HPP
diff --git a/src/hotspot/share/cds/aotMappedHeapLoader.cpp b/src/hotspot/share/cds/aotMappedHeapLoader.cpp
index 84051cbd9e5..7a201d8297f 100644
--- a/src/hotspot/share/cds/aotMappedHeapLoader.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotLogging.hpp"
+#include "cds/aotMappedHeap.hpp"
 #include "cds/aotMappedHeapLoader.inline.hpp"
 #include "cds/aotMappedHeapWriter.hpp"
 #include "cds/aotMetaspace.hpp"
@@ -221,7 +222,7 @@ void AOTMappedHeapLoader::patch_embedded_pointers(FileMapInfo* info,
 // the heap object may be loaded at a different address at run time. This structure is used
 // to translate the dump time addresses for all objects in FileMapInfo::space_at(region_index)
 // to their runtime addresses.
-struct LoadedArchiveHeapRegion {
+struct AOTMappedHeapRegion {
   int       _region_index;   // index for FileMapInfo::space_at(index)
   size_t    _region_size;    // number of bytes in this region
   uintptr_t _dumptime_base;  // The dump-time (decoded) address of the first object in this region
@@ -232,7 +233,7 @@ struct LoadedArchiveHeapRegion {
   }
 };
 
-void AOTMappedHeapLoader::init_loaded_heap_relocation(LoadedArchiveHeapRegion* loaded_region) {
+void AOTMappedHeapLoader::init_loaded_heap_relocation(AOTMappedHeapRegion* loaded_region) {
   _dumptime_base = loaded_region->_dumptime_base;
   _dumptime_top = loaded_region->top();
   _runtime_offset = loaded_region->_runtime_offset;
@@ -249,7 +250,7 @@ class AOTMappedHeapLoader::PatchLoadedRegionPointers: public BitMapClosure {
   uintptr_t _top;
 
  public:
-  PatchLoadedRegionPointers(narrowOop* start, LoadedArchiveHeapRegion* loaded_region)
+  PatchLoadedRegionPointers(narrowOop* start, AOTMappedHeapRegion* loaded_region)
     : _start(start),
       _offset(loaded_region->_runtime_offset),
       _base(loaded_region->_dumptime_base),
@@ -270,7 +271,7 @@ class AOTMappedHeapLoader::PatchLoadedRegionPointers: public BitMapClosure {
   }
 };
 
-bool AOTMappedHeapLoader::init_loaded_region(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
+bool AOTMappedHeapLoader::init_loaded_region(FileMapInfo* mapinfo, AOTMappedHeapRegion* loaded_region,
                                              MemRegion& archive_space) {
   size_t total_bytes = 0;
   FileMapRegion* r = mapinfo->region_at(AOTMetaspace::hp);
@@ -301,7 +302,7 @@ bool AOTMappedHeapLoader::init_loaded_region(FileMapInfo* mapinfo, LoadedArchive
   return true;
 }
 
-bool AOTMappedHeapLoader::load_heap_region_impl(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
+bool AOTMappedHeapLoader::load_heap_region_impl(FileMapInfo* mapinfo, AOTMappedHeapRegion* loaded_region,
                                                 uintptr_t load_address) {
   uintptr_t bitmap_base = (uintptr_t)mapinfo->map_bitmap_region();
   if (bitmap_base == 0) {
@@ -340,7 +341,7 @@ bool AOTMappedHeapLoader::load_heap_region(FileMapInfo* mapinfo) {
   assert(can_load(), "loaded heap for must be supported");
   init_narrow_oop_decoding(mapinfo->narrow_oop_base(), mapinfo->narrow_oop_shift());
 
-  LoadedArchiveHeapRegion loaded_region;
+  AOTMappedHeapRegion loaded_region;
   memset(&loaded_region, 0, sizeof(loaded_region));
 
   MemRegion archive_space;
@@ -360,10 +361,8 @@ bool AOTMappedHeapLoader::load_heap_region(FileMapInfo* mapinfo) {
 }
 
 objArrayOop AOTMappedHeapLoader::root_segment(int segment_idx) {
-  if (CDSConfig::is_dumping_heap()) {
-    assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
-  } else {
-    assert(CDSConfig::is_using_archive(), "must be");
+  if (!CDSConfig::is_using_archive()) {
+    assert(CDSConfig::is_dumping_heap() && Thread::current() == (Thread*)VMThread::vm_thread(), "sanity");
   }
 
   objArrayOop segment = (objArrayOop)_root_segments->at(segment_idx).resolve();
@@ -466,7 +465,9 @@ void AOTMappedHeapLoader::finish_initialization(FileMapInfo* info) {
       add_root_segment((objArrayOop)segment_oop);
     }
 
-    StringTable::load_shared_strings_array();
+    if (CDSConfig::is_dumping_final_static_archive()) {
+      StringTable::move_shared_strings_into_runtime_table();
+    }
   }
 }
 
@@ -619,7 +620,7 @@ bool AOTMappedHeapLoader::map_heap_region_impl(FileMapInfo* info) {
   aot_log_info(aot)("Preferred address to map heap data (to avoid relocation) is " INTPTR_FORMAT, p2i(requested_start));
 
   // allocate from java heap
-  HeapWord* start = G1CollectedHeap::heap()->alloc_archive_region(word_size, (HeapWord*)requested_start);
+  HeapWord* start = G1CollectedHeap::heap()->alloc_archive_region(word_size);
   if (start == nullptr) {
     AOTMetaspace::report_loading_error("UseSharedSpaces: Unable to allocate java heap region for archive heap.");
     return false;
@@ -733,40 +734,22 @@ void AOTMappedHeapLoader::dealloc_heap_region(FileMapInfo* info) {
 }
 
 AOTMapLogger::OopDataIterator* AOTMappedHeapLoader::oop_iterator(FileMapInfo* info, address buffer_start, address buffer_end) {
-  class MappedLoaderOopIterator : public AOTMapLogger::OopDataIterator {
-  private:
-    address _current;
-    address _next;
-
-    address _buffer_start;
-    address _buffer_end;
-    uint64_t _buffer_start_narrow_oop;
-    intptr_t _buffer_to_requested_delta;
-    int _requested_shift;
-
-    size_t _num_root_segments;
-    size_t _num_obj_arrays_logged;
-
+  class MappedLoaderOopIterator : public AOTMappedHeapOopIterator {
   public:
     MappedLoaderOopIterator(address buffer_start,
                             address buffer_end,
-                            uint64_t buffer_start_narrow_oop,
-                            intptr_t buffer_to_requested_delta,
+                            address requested_base,
+                            address requested_start,
                             int requested_shift,
-                            size_t num_root_segments)
-      : _current(nullptr),
-        _next(buffer_start),
-        _buffer_start(buffer_start),
-        _buffer_end(buffer_end),
-        _buffer_start_narrow_oop(buffer_start_narrow_oop),
-        _buffer_to_requested_delta(buffer_to_requested_delta),
-        _requested_shift(requested_shift),
-        _num_root_segments(num_root_segments),
-        _num_obj_arrays_logged(0) {
-    }
+                            size_t num_root_segments) :
+      AOTMappedHeapOopIterator(buffer_start,
+                               buffer_end,
+                               requested_base,
+                               requested_start,
+                               requested_shift,
+                               num_root_segments) {}
 
-
-    AOTMapLogger::OopData capture(address buffered_addr) {
+    AOTMapLogger::OopData capture(address buffered_addr) override {
       oopDesc* raw_oop = (oopDesc*)buffered_addr;
       size_t size = raw_oop->size();
       address requested_addr = buffered_addr + _buffer_to_requested_delta;
@@ -784,62 +767,17 @@ AOTMapLogger::OopDataIterator* AOTMappedHeapLoader::oop_iterator(FileMapInfo* in
                size,
                false };
     }
-
-    bool has_next() override {
-      return _next < _buffer_end;
-    }
-
-    AOTMapLogger::OopData next() override {
-      _current = _next;
-      AOTMapLogger::OopData result = capture(_current);
-      if (result._klass->is_objArray_klass()) {
-        result._is_root_segment = _num_obj_arrays_logged++ < _num_root_segments;
-      }
-      _next = _current + result._size * BytesPerWord;
-      return result;
-    }
-
-    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
-      uint64_t n = (uint64_t)(*addr);
-      if (n == 0) {
-        return null_data();
-      } else {
-        precond(n >= _buffer_start_narrow_oop);
-        address buffer_addr = _buffer_start + ((n - _buffer_start_narrow_oop) << _requested_shift);
-        return capture(buffer_addr);
-      }
-    }
-
-    AOTMapLogger::OopData obj_at(oop* addr) override {
-      address requested_value = cast_from_oop<address>(*addr);
-      if (requested_value == nullptr) {
-        return null_data();
-      } else {
-        address buffer_addr = requested_value - _buffer_to_requested_delta;
-        return capture(buffer_addr);
-      }
-    }
-
-    GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
-      return new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
-    }
   };
 
   FileMapRegion* r = info->region_at(AOTMetaspace::hp);
   address requested_base = UseCompressedOops ? (address)info->narrow_oop_base() : heap_region_requested_address(info);
   address requested_start = requested_base + r->mapping_offset();
   int requested_shift = info->narrow_oop_shift();
-  intptr_t buffer_to_requested_delta = requested_start - buffer_start;
-  uint64_t buffer_start_narrow_oop = 0xdeadbeed;
-  if (UseCompressedOops) {
-    buffer_start_narrow_oop = (uint64_t)(pointer_delta(requested_start, requested_base, 1)) >> requested_shift;
-    assert(buffer_start_narrow_oop < 0xffffffff, "sanity");
-  }
 
   return new MappedLoaderOopIterator(buffer_start,
                                      buffer_end,
-                                     buffer_start_narrow_oop,
-                                     buffer_to_requested_delta,
+                                     requested_base,
+                                     requested_start,
                                      requested_shift,
                                      info->mapped_heap()->root_segments().count());
 }
diff --git a/src/hotspot/share/cds/aotMappedHeapLoader.hpp b/src/hotspot/share/cds/aotMappedHeapLoader.hpp
index d344d7b0b0a..7c5ca1b1f9e 100644
--- a/src/hotspot/share/cds/aotMappedHeapLoader.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapLoader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 
+struct AOTMappedHeapRegion;
 class  FileMapInfo;
-struct LoadedArchiveHeapRegion;
 
 class AOTMappedHeapLoader : AllStatic {
   friend class AOTMapLogger;
@@ -93,7 +93,7 @@ public:
   // function instead.
   inline static oop decode_from_archive(narrowOop v) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
 
-  // More efficient version, but works only when ArchiveHeap is mapped.
+  // More efficient version, but works only when is_mapped()
   inline static oop decode_from_mapped_archive(narrowOop v) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
 
   static void patch_compressed_embedded_pointers(BitMapView bm,
@@ -113,7 +113,7 @@ private:
   static bool _is_loaded;
 
   // Support for loaded archived heap. These are cached values from
-  // LoadedArchiveHeapRegion's.
+  // AOTMappedHeapRegion's.
   static uintptr_t _dumptime_base;
   static uintptr_t _dumptime_top;
   static intx _runtime_offset;
@@ -141,10 +141,10 @@ private:
   static bool _heap_pointers_need_patching;
 
   static void init_narrow_oop_decoding(address base, int shift);
-  static bool init_loaded_region(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region,
+  static bool init_loaded_region(FileMapInfo* mapinfo, AOTMappedHeapRegion* loaded_region,
                                  MemRegion& archive_space);
-  static bool load_heap_region_impl(FileMapInfo* mapinfo, LoadedArchiveHeapRegion* loaded_region, uintptr_t buffer);
-  static void init_loaded_heap_relocation(LoadedArchiveHeapRegion* reloc_info);
+  static bool load_heap_region_impl(FileMapInfo* mapinfo, AOTMappedHeapRegion* loaded_region, uintptr_t buffer);
+  static void init_loaded_heap_relocation(AOTMappedHeapRegion* reloc_info);
   static void patch_native_pointers();
   static void finish_loaded_heap();
   static void verify_loaded_heap();
diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.cpp b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
index e73b980614a..64c0e3c40e8 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "cds/aotMappedHeapLoader.hpp"
+#include "cds/aotMappedHeap.hpp"
 #include "cds/aotMappedHeapWriter.hpp"
 #include "cds/aotReferenceObjSupport.hpp"
 #include "cds/cdsConfig.hpp"
@@ -151,7 +151,7 @@ void AOTMappedHeapWriter::add_source_obj(oop src_obj) {
 }
 
 void AOTMappedHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
-                                ArchiveMappedHeapInfo* heap_info) {
+                                AOTMappedHeapInfo* heap_info) {
   assert(CDSConfig::is_dumping_heap(), "sanity");
   allocate_buffer();
   copy_source_objs_to_buffer(roots);
@@ -598,7 +598,7 @@ size_t AOTMappedHeapWriter::copy_one_source_obj_to_buffer(oop src_obj) {
 //
 //     So we just hard code it to NOCOOPS_REQUESTED_BASE.
 //
-void AOTMappedHeapWriter::set_requested_address_range(ArchiveMappedHeapInfo* info) {
+void AOTMappedHeapWriter::set_requested_address_range(AOTMappedHeapInfo* info) {
   assert(!info->is_used(), "only set once");
 
   size_t heap_region_byte_size = _buffer_used;
@@ -792,7 +792,7 @@ static void log_bitmap_usage(const char* which, BitMap* bitmap, size_t total_bit
 
 // Update all oop fields embedded in the buffered objects
 void AOTMappedHeapWriter::relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots,
-                                                      ArchiveMappedHeapInfo* heap_info) {
+                                                      AOTMappedHeapInfo* heap_info) {
   size_t oopmap_unit = (UseCompressedOops ? sizeof(narrowOop) : sizeof(oop));
   size_t heap_region_byte_size = _buffer_used;
   heap_info->oopmap()->resize(heap_region_byte_size   / oopmap_unit);
@@ -862,7 +862,7 @@ void AOTMappedHeapWriter::mark_native_pointers(oop orig_obj) {
   });
 }
 
-void AOTMappedHeapWriter::compute_ptrmap(ArchiveMappedHeapInfo* heap_info) {
+void AOTMappedHeapWriter::compute_ptrmap(AOTMappedHeapInfo* heap_info) {
   int num_non_null_ptrs = 0;
   Metadata** bottom = (Metadata**) _requested_bottom;
   Metadata** top = (Metadata**) _requested_top; // exclusive
@@ -909,40 +909,23 @@ void AOTMappedHeapWriter::compute_ptrmap(ArchiveMappedHeapInfo* heap_info) {
                       num_non_null_ptrs, size_t(heap_info->ptrmap()->size()));
 }
 
-AOTMapLogger::OopDataIterator* AOTMappedHeapWriter::oop_iterator(ArchiveMappedHeapInfo* heap_info) {
-  class MappedWriterOopIterator : public AOTMapLogger::OopDataIterator {
-  private:
-    address _current;
-    address _next;
-
-    address _buffer_start;
-    address _buffer_end;
-    uint64_t _buffer_start_narrow_oop;
-    intptr_t _buffer_to_requested_delta;
-    int _requested_shift;
-
-    size_t _num_root_segments;
-    size_t _num_obj_arrays_logged;
-
+AOTMapLogger::OopDataIterator* AOTMappedHeapWriter::oop_iterator(AOTMappedHeapInfo* heap_info) {
+  class MappedWriterOopIterator : public AOTMappedHeapOopIterator {
   public:
     MappedWriterOopIterator(address buffer_start,
                             address buffer_end,
-                            uint64_t buffer_start_narrow_oop,
-                            intptr_t buffer_to_requested_delta,
+                            address requested_base,
+                            address requested_start,
                             int requested_shift,
-                            size_t num_root_segments)
-      : _current(nullptr),
-        _next(buffer_start),
-        _buffer_start(buffer_start),
-        _buffer_end(buffer_end),
-        _buffer_start_narrow_oop(buffer_start_narrow_oop),
-        _buffer_to_requested_delta(buffer_to_requested_delta),
-        _requested_shift(requested_shift),
-        _num_root_segments(num_root_segments),
-        _num_obj_arrays_logged(0) {
-    }
+                            size_t num_root_segments) :
+      AOTMappedHeapOopIterator(buffer_start,
+                               buffer_end,
+                               requested_base,
+                               requested_start,
+                               requested_shift,
+                               num_root_segments) {}
 
-    AOTMapLogger::OopData capture(address buffered_addr) {
+    AOTMapLogger::OopData capture(address buffered_addr) override {
       oopDesc* raw_oop = (oopDesc*)buffered_addr;
       size_t size = size_of_buffered_oop(buffered_addr);
       address requested_addr = buffered_addr_to_requested_addr(buffered_addr);
@@ -960,45 +943,6 @@ AOTMapLogger::OopDataIterator* AOTMappedHeapWriter::oop_iterator(ArchiveMappedHe
                size,
                false };
     }
-
-    bool has_next() override {
-      return _next < _buffer_end;
-    }
-
-    AOTMapLogger::OopData next() override {
-      _current = _next;
-      AOTMapLogger::OopData result = capture(_current);
-      if (result._klass->is_objArray_klass()) {
-        result._is_root_segment = _num_obj_arrays_logged++ < _num_root_segments;
-      }
-      _next = _current + result._size * BytesPerWord;
-      return result;
-    }
-
-    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
-      uint64_t n = (uint64_t)(*addr);
-      if (n == 0) {
-        return null_data();
-      } else {
-        precond(n >= _buffer_start_narrow_oop);
-        address buffer_addr = _buffer_start + ((n - _buffer_start_narrow_oop) << _requested_shift);
-        return capture(buffer_addr);
-      }
-    }
-
-    AOTMapLogger::OopData obj_at(oop* addr) override {
-      address requested_value = cast_from_oop<address>(*addr);
-      if (requested_value == nullptr) {
-        return null_data();
-      } else {
-        address buffer_addr = requested_value - _buffer_to_requested_delta;
-        return capture(buffer_addr);
-      }
-    }
-
-    GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
-      return new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
-    }
   };
 
   MemRegion r = heap_info->buffer_region();
@@ -1008,17 +952,11 @@ AOTMapLogger::OopDataIterator* AOTMappedHeapWriter::oop_iterator(ArchiveMappedHe
   address requested_base = UseCompressedOops ? AOTMappedHeapWriter::narrow_oop_base() : (address)AOTMappedHeapWriter::NOCOOPS_REQUESTED_BASE;
   address requested_start = UseCompressedOops ? AOTMappedHeapWriter::buffered_addr_to_requested_addr(buffer_start) : requested_base;
   int requested_shift = AOTMappedHeapWriter::narrow_oop_shift();
-  intptr_t buffer_to_requested_delta = requested_start - buffer_start;
-  uint64_t buffer_start_narrow_oop = 0xdeadbeed;
-  if (UseCompressedOops) {
-    buffer_start_narrow_oop = (uint64_t)(pointer_delta(requested_start, requested_base, 1)) >> requested_shift;
-    assert(buffer_start_narrow_oop < 0xffffffff, "sanity");
-  }
 
   return new MappedWriterOopIterator(buffer_start,
                                      buffer_end,
-                                     buffer_start_narrow_oop,
-                                     buffer_to_requested_delta,
+                                     requested_base,
+                                     requested_start,
                                      requested_shift,
                                      heap_info->root_segments().count());
 }
diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.hpp b/src/hotspot/share/cds/aotMappedHeapWriter.hpp
index eafd38ac8bb..7481e7922a0 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.hpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -196,10 +196,10 @@ private:
   static int filler_array_length(size_t fill_bytes);
   static HeapWord* init_filler_array_at_buffer_top(int array_length, size_t fill_bytes);
 
-  static void set_requested_address_range(ArchiveMappedHeapInfo* info);
+  static void set_requested_address_range(AOTMappedHeapInfo* info);
   static void mark_native_pointers(oop orig_obj);
-  static void relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots, ArchiveMappedHeapInfo* info);
-  static void compute_ptrmap(ArchiveMappedHeapInfo *info);
+  static void relocate_embedded_oops(GrowableArrayCHeap<oop, mtClassShared>* roots, AOTMappedHeapInfo* info);
+  static void compute_ptrmap(AOTMappedHeapInfo *info);
   static bool is_in_requested_range(oop o);
   static oop requested_obj_from_buffer_offset(size_t offset);
 
@@ -229,7 +229,7 @@ public:
   static bool is_string_too_large_to_archive(oop string);
   static bool is_dumped_interned_string(oop o);
   static void add_to_dumped_interned_strings(oop string);
-  static void write(GrowableArrayCHeap<oop, mtClassShared>*, ArchiveMappedHeapInfo* heap_info);
+  static void write(GrowableArrayCHeap<oop, mtClassShared>*, AOTMappedHeapInfo* heap_info);
   static address requested_address();  // requested address of the lowest achived heap object
   static size_t get_filler_size_at(address buffered_addr);
 
@@ -240,7 +240,7 @@ public:
   static Klass* real_klass_of_buffered_oop(address buffered_addr);
   static size_t size_of_buffered_oop(address buffered_addr);
 
-  static AOTMapLogger::OopDataIterator* oop_iterator(ArchiveMappedHeapInfo* heap_info);
+  static AOTMapLogger::OopDataIterator* oop_iterator(AOTMappedHeapInfo* heap_info);
 };
 #endif // INCLUDE_CDS_JAVA_HEAP
 #endif // SHARE_CDS_AOTMAPPEDHEAPWRITER_HPP
diff --git a/src/hotspot/share/cds/aotMetaspace.cpp b/src/hotspot/share/cds/aotMetaspace.cpp
index 79d789e0c70..b75d7628aa9 100644
--- a/src/hotspot/share/cds/aotMetaspace.cpp
+++ b/src/hotspot/share/cds/aotMetaspace.cpp
@@ -661,8 +661,8 @@ void AOTMetaspace::rewrite_bytecodes_and_calculate_fingerprints(Thread* thread,
 
 class VM_PopulateDumpSharedSpace : public VM_Operation {
 private:
-  ArchiveMappedHeapInfo _mapped_heap_info;
-  ArchiveStreamedHeapInfo _streamed_heap_info;
+  AOTMappedHeapInfo _mapped_heap_info;
+  AOTStreamedHeapInfo _streamed_heap_info;
   FileMapInfo* _map_info;
   StaticArchiveBuilder& _builder;
 
@@ -682,8 +682,8 @@ public:
   bool skip_operation() const { return false; }
 
   VMOp_Type type() const { return VMOp_PopulateDumpSharedSpace; }
-  ArchiveMappedHeapInfo* mapped_heap_info()  { return &_mapped_heap_info; }
-  ArchiveStreamedHeapInfo* streamed_heap_info()  { return &_streamed_heap_info; }
+  AOTMappedHeapInfo* mapped_heap_info()  { return &_mapped_heap_info; }
+  AOTStreamedHeapInfo* streamed_heap_info()  { return &_streamed_heap_info; }
   void doit();   // outline because gdb sucks
   bool allow_nested_vm_operations() const { return true; }
 }; // class VM_PopulateDumpSharedSpace
@@ -698,6 +698,9 @@ public:
     Universe::metaspace_pointers_do(it);
     vmSymbols::metaspace_pointers_do(it);
     TrainingData::iterate_roots(it);
+    if (CDSConfig::is_dumping_full_module_graph()) {
+      ClassLoaderDataShared::iterate_roots(it);
+    }
 
     // The above code should find all the symbols that are referenced by the
     // archived classes. We just need to add the extra symbols which
@@ -795,6 +798,10 @@ void VM_PopulateDumpSharedSpace::doit() {
   _builder.make_klasses_shareable();
   AOTMetaspace::make_method_handle_intrinsics_shareable();
 
+  if (CDSConfig::is_dumping_full_module_graph()) {
+    ClassLoaderDataShared::remove_unshareable_info();
+  }
+
   dump_java_heap_objects();
   dump_shared_symbol_table(_builder.symbols());
 
@@ -1097,7 +1104,12 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
 
 #if INCLUDE_CDS_JAVA_HEAP
   if (CDSConfig::is_dumping_heap()) {
-    assert(CDSConfig::allow_only_single_java_thread(), "Required");
+    if (!CDSConfig::is_dumping_preimage_static_archive()) {
+      // A single thread is required for Reference handling and deterministic CDS archive.
+      // Its's not required for dumping preimage, where References won't be archived and
+      // determinism is not needed.
+      assert(CDSConfig::allow_only_single_java_thread(), "Required");
+    }
     if (!HeapShared::is_archived_boot_layer_available(THREAD)) {
       report_loading_error("archivedBootLayer not available, disabling full module graph");
       CDSConfig::stop_dumping_full_module_graph();
@@ -1135,7 +1147,8 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
     HeapShared::init_heap_writer();
     if (CDSConfig::is_dumping_full_module_graph()) {
       ClassLoaderDataShared::ensure_module_entry_tables_exist();
-      HeapShared::reset_archived_object_states(CHECK);
+      ClassLoaderDataShared::build_tables(CHECK);
+      HeapShared::prepare_for_archiving(CHECK);
     }
 
     AOTReferenceObjSupport::initialize(CHECK);
@@ -1154,12 +1167,6 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
       // Perhaps there is a way to avoid hard-coding these names here.
       // See discussion in JDK-8342481.
     }
-
-    if (HeapShared::is_writing_mapping_mode()) {
-      // Do this at the very end, when no Java code will be executed. Otherwise
-      // some new strings may be added to the intern table.
-      StringTable::allocate_shared_strings_array(CHECK);
-    }
   } else {
     log_info(aot)("Not dumping heap, reset CDSConfig::_is_using_optimized_module_handling");
     CDSConfig::stop_using_optimized_module_handling();
@@ -1205,8 +1212,8 @@ void AOTMetaspace::dump_static_archive_impl(StaticArchiveBuilder& builder, TRAPS
 
 bool AOTMetaspace::write_static_archive(ArchiveBuilder* builder,
                                         FileMapInfo* map_info,
-                                        ArchiveMappedHeapInfo* mapped_heap_info,
-                                        ArchiveStreamedHeapInfo* streamed_heap_info) {
+                                        AOTMappedHeapInfo* mapped_heap_info,
+                                        AOTStreamedHeapInfo* streamed_heap_info) {
   // relocate the data so that it can be mapped to AOTMetaspace::requested_base_address()
   // without runtime relocation.
   builder->relocate_to_requested();
@@ -2099,7 +2106,7 @@ MapArchiveResult AOTMetaspace::map_archive(FileMapInfo* mapinfo, char* mapped_ba
     // Currently, only static archive uses early serialized data.
     char* buffer = mapinfo->early_serialized_data();
     intptr_t* array = (intptr_t*)buffer;
-    ReadClosure rc(&array, (intptr_t)mapped_base_address);
+    ReadClosure rc(&array, (address)mapped_base_address);
     early_serialize(&rc);
   }
 
@@ -2145,7 +2152,7 @@ void AOTMetaspace::initialize_shared_spaces() {
   // shared string/symbol tables.
   char* buffer = static_mapinfo->serialized_data();
   intptr_t* array = (intptr_t*)buffer;
-  ReadClosure rc(&array, (intptr_t)SharedBaseAddress);
+  ReadClosure rc(&array, (address)SharedBaseAddress);
   serialize(&rc);
 
   // Finish initializing the heap dump mode used in the archive
@@ -2157,7 +2164,7 @@ void AOTMetaspace::initialize_shared_spaces() {
 
   if (dynamic_mapinfo != nullptr) {
     intptr_t* buffer = (intptr_t*)dynamic_mapinfo->serialized_data();
-    ReadClosure rc(&buffer, (intptr_t)SharedBaseAddress);
+    ReadClosure rc(&buffer, (address)SharedBaseAddress);
     DynamicArchive::serialize(&rc);
   }
 
diff --git a/src/hotspot/share/cds/aotMetaspace.hpp b/src/hotspot/share/cds/aotMetaspace.hpp
index ab78787288f..4607a936abe 100644
--- a/src/hotspot/share/cds/aotMetaspace.hpp
+++ b/src/hotspot/share/cds/aotMetaspace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,8 @@
 #include "utilities/macros.hpp"
 
 class ArchiveBuilder;
-class ArchiveMappedHeapInfo;
-class ArchiveStreamedHeapInfo;
+class AOTMappedHeapInfo;
+class AOTStreamedHeapInfo;
 class FileMapInfo;
 class Method;
 class outputStream;
@@ -192,8 +192,8 @@ private:
   static void open_output_mapinfo();
   static bool write_static_archive(ArchiveBuilder* builder,
                                    FileMapInfo* map_info,
-                                   ArchiveMappedHeapInfo* mapped_heap_info,
-                                   ArchiveStreamedHeapInfo* streamed_heap_info);
+                                   AOTMappedHeapInfo* mapped_heap_info,
+                                   AOTStreamedHeapInfo* streamed_heap_info);
   static FileMapInfo* open_static_archive();
   static FileMapInfo* open_dynamic_archive();
   // use_requested_addr: If true (default), attempt to map at the address the
diff --git a/src/hotspot/share/cds/aotReferenceObjSupport.cpp b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
index aa7cc875533..0c27c8ce5f0 100644
--- a/src/hotspot/share/cds/aotReferenceObjSupport.cpp
+++ b/src/hotspot/share/cds/aotReferenceObjSupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,12 +177,17 @@ void AOTReferenceObjSupport::init_keep_alive_objs_table() {
 
 // Returns true IFF obj is an instance of java.lang.ref.Reference. If so, perform extra eligibility checks.
 bool AOTReferenceObjSupport::check_if_ref_obj(oop obj) {
-  // We have a single Java thread. This means java.lang.ref.Reference$ReferenceHandler thread
-  // is not running. Otherwise the checks for next/discovered may not work.
-  precond(CDSConfig::allow_only_single_java_thread());
   assert_at_safepoint(); // _keep_alive_objs_table uses raw oops
 
   if (obj->klass()->is_subclass_of(vmClasses::Reference_klass())) {
+    // The following check works only if the java.lang.ref.Reference$ReferenceHandler thread
+    // is not running.
+    //
+    // This code is called on every object found by AOTArtifactFinder. When dumping the
+    // preimage archive, AOTArtifactFinder should not find any Reference objects.
+    precond(!CDSConfig::is_dumping_preimage_static_archive());
+    precond(CDSConfig::allow_only_single_java_thread());
+
     precond(AOTReferenceObjSupport::is_enabled());
     precond(JavaClasses::is_supported_for_archiving(obj));
     precond(_keep_alive_objs_table != nullptr);
diff --git a/src/hotspot/share/cds/aotStreamedHeap.cpp b/src/hotspot/share/cds/aotStreamedHeap.cpp
new file mode 100644
index 00000000000..3378924bf32
--- /dev/null
+++ b/src/hotspot/share/cds/aotStreamedHeap.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotStreamedHeap.hpp"
+
+// Anything that goes in the header must be thoroughly purged from uninitialized memory
+// as it will be written to disk. Therefore, the constructors memset the memory to 0.
+// This is not the prettiest thing, but we need to know every byte is initialized,
+// including potential padding between fields.
+
+AOTStreamedHeapHeader::AOTStreamedHeapHeader(size_t forwarding_offset,
+                                             size_t roots_offset,
+                                             size_t num_roots,
+                                             size_t root_highest_object_index_table_offset,
+                                             size_t num_archived_objects) {
+  memset((char*)this, 0, sizeof(*this));
+  _forwarding_offset = forwarding_offset;
+  _roots_offset = roots_offset;
+  _num_roots = num_roots;
+  _root_highest_object_index_table_offset = root_highest_object_index_table_offset;
+  _num_archived_objects = num_archived_objects;
+}
+
+AOTStreamedHeapHeader::AOTStreamedHeapHeader() {
+  memset((char*)this, 0, sizeof(*this));
+}
+
+AOTStreamedHeapHeader AOTStreamedHeapInfo::create_header() {
+  return AOTStreamedHeapHeader{_forwarding_offset,
+                               _roots_offset,
+                               _num_roots,
+                               _root_highest_object_index_table_offset,
+                               _num_archived_objects};
+}
diff --git a/src/hotspot/share/cds/aotStreamedHeap.hpp b/src/hotspot/share/cds/aotStreamedHeap.hpp
new file mode 100644
index 00000000000..f06b1bcb4c6
--- /dev/null
+++ b/src/hotspot/share/cds/aotStreamedHeap.hpp
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_CDS_AOTSTREAMEDHEAP_HPP
+#define SHARE_CDS_AOTSTREAMEDHEAP_HPP
+
+#include "cds/aotMapLogger.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
+
+class AOTStreamedHeapHeader {
+  size_t _forwarding_offset;                      // Offset of forwarding information in the heap region.
+  size_t _roots_offset;                           // Start position for the roots
+  size_t _root_highest_object_index_table_offset; // Offset of root dfs depth information
+  size_t _num_roots;                              // Number of embedded roots
+  size_t _num_archived_objects;                   // The number of archived heap objects
+
+public:
+  AOTStreamedHeapHeader();
+  AOTStreamedHeapHeader(size_t forwarding_offset,
+                        size_t roots_offset,
+                        size_t num_roots,
+                        size_t root_highest_object_index_table_offset,
+                        size_t num_archived_objects);
+
+  size_t forwarding_offset() const { return _forwarding_offset; }
+  size_t roots_offset() const { return _roots_offset; }
+  size_t num_roots() const { return _num_roots; }
+  size_t root_highest_object_index_table_offset() const { return _root_highest_object_index_table_offset; }
+  size_t num_archived_objects() const { return _num_archived_objects; }
+
+  // This class is trivially copyable and assignable.
+  AOTStreamedHeapHeader(const AOTStreamedHeapHeader&) = default;
+  AOTStreamedHeapHeader& operator=(const AOTStreamedHeapHeader&) = default;
+};
+
+class AOTStreamedHeapInfo {
+  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
+  CHeapBitMap _oopmap;
+  size_t _roots_offset;                 // Offset of the HeapShared::roots() object, from the bottom
+                                        // of the archived heap objects, in bytes.
+  size_t _num_roots;
+
+  size_t _forwarding_offset;            // Offset of forwarding information from the bottom
+  size_t _root_highest_object_index_table_offset; // Offset to root dfs depth information
+  size_t _num_archived_objects;         // The number of archived objects written into the CDS archive.
+
+public:
+  AOTStreamedHeapInfo()
+    : _buffer_region(),
+      _oopmap(128, mtClassShared),
+      _roots_offset(),
+      _forwarding_offset(),
+      _root_highest_object_index_table_offset(),
+      _num_archived_objects() {}
+
+  bool is_used() { return !_buffer_region.is_empty(); }
+
+  void set_buffer_region(MemRegion r) { _buffer_region = r; }
+  MemRegion buffer_region() { return _buffer_region; }
+  char* buffer_start() { return (char*)_buffer_region.start(); }
+  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
+
+  CHeapBitMap* oopmap() { return &_oopmap; }
+  void set_roots_offset(size_t n) { _roots_offset = n; }
+  size_t roots_offset() { return _roots_offset; }
+  void set_num_roots(size_t n) { _num_roots = n; }
+  size_t num_roots() { return _num_roots; }
+  void set_forwarding_offset(size_t n) { _forwarding_offset = n; }
+  void set_root_highest_object_index_table_offset(size_t n) { _root_highest_object_index_table_offset = n; }
+  void set_num_archived_objects(size_t n) { _num_archived_objects = n; }
+  size_t num_archived_objects() { return _num_archived_objects; }
+
+  AOTStreamedHeapHeader create_header();
+};
+
+#if INCLUDE_CDS_JAVA_HEAP
+class AOTStreamedHeapOopIterator : public AOTMapLogger::OopDataIterator {
+protected:
+  int _current;
+  int _next;
+  address _buffer_start;
+  int _num_archived_objects;
+
+public:
+  AOTStreamedHeapOopIterator(address buffer_start,
+                             int num_archived_objects)
+    : _current(0),
+      _next(1),
+      _buffer_start(buffer_start),
+      _num_archived_objects(num_archived_objects) {}
+
+  virtual AOTMapLogger::OopData capture(int dfs_index)  = 0;
+
+  bool has_next() override {
+    return _next <= _num_archived_objects;
+  }
+
+  AOTMapLogger::OopData next() override {
+    _current = _next;
+    AOTMapLogger::OopData result = capture(_current);
+    _next = _current + 1;
+    return result;
+  }
+
+  AOTMapLogger::OopData obj_at(narrowOop* addr) override {
+    int dfs_index = (int)(*addr);
+    if (dfs_index == 0) {
+      return null_data();
+    } else {
+      return capture(dfs_index);
+    }
+  }
+
+  AOTMapLogger::OopData obj_at(oop* addr) override {
+    int dfs_index = (int)cast_from_oop<uintptr_t>(*addr);
+    if (dfs_index == 0) {
+      return null_data();
+    } else {
+      return capture(dfs_index);
+    }
+  }
+};
+#endif // INCLUDE_CDS_JAVA_HEAP
+
+#endif // SHARE_CDS_AOTSTREAMEDHEAP_HPP
diff --git a/src/hotspot/share/cds/aotStreamedHeapLoader.cpp b/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
index 6719f9bf898..39f735543cd 100644
--- a/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
+++ b/src/hotspot/share/cds/aotStreamedHeapLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1102,25 +1102,13 @@ void AOTStreamedHeapLoader::finish_initialization(FileMapInfo* static_mapinfo) {
 }
 
 AOTMapLogger::OopDataIterator* AOTStreamedHeapLoader::oop_iterator(FileMapInfo* info, address buffer_start, address buffer_end) {
-  class StreamedLoaderOopIterator : public AOTMapLogger::OopDataIterator {
-  private:
-    int _current;
-    int _next;
-
-    address _buffer_start;
-
-    int _num_archived_objects;
-
+  class StreamedLoaderOopIterator : public AOTStreamedHeapOopIterator {
   public:
     StreamedLoaderOopIterator(address buffer_start,
                               int num_archived_objects)
-      : _current(0),
-        _next(1),
-        _buffer_start(buffer_start),
-        _num_archived_objects(num_archived_objects) {
-    }
+      : AOTStreamedHeapOopIterator(buffer_start, num_archived_objects) {}
 
-    AOTMapLogger::OopData capture(int dfs_index) {
+    AOTMapLogger::OopData capture(int dfs_index) override {
       size_t buffered_offset = buffer_offset_for_object_index(dfs_index);
       address buffered_addr = _buffer_start + buffered_offset;
       oopDesc* raw_oop = (oopDesc*)buffered_addr;
@@ -1142,35 +1130,6 @@ AOTMapLogger::OopDataIterator* AOTStreamedHeapLoader::oop_iterator(FileMapInfo*
                false };
     }
 
-    bool has_next() override {
-      return _next <= _num_archived_objects;
-    }
-
-    AOTMapLogger::OopData next() override {
-      _current = _next;
-      AOTMapLogger::OopData result = capture(_current);
-      _next = _current + 1;
-      return result;
-    }
-
-    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
-      int dfs_index = (int)(*addr);
-      if (dfs_index == 0) {
-        return null_data();
-      } else {
-        return capture(dfs_index);
-      }
-    }
-
-    AOTMapLogger::OopData obj_at(oop* addr) override {
-      int dfs_index = (int)cast_from_oop<uintptr_t>(*addr);
-      if (dfs_index == 0) {
-        return null_data();
-      } else {
-        return capture(dfs_index);
-      }
-    }
-
     GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
       GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* result = new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
 
diff --git a/src/hotspot/share/cds/aotStreamedHeapWriter.cpp b/src/hotspot/share/cds/aotStreamedHeapWriter.cpp
index 16acebc7d8d..f52532b2f2a 100644
--- a/src/hotspot/share/cds/aotStreamedHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotStreamedHeapWriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -163,7 +163,7 @@ void AOTStreamedHeapWriter::order_source_objs(GrowableArrayCHeap<oop, mtClassSha
 }
 
 void AOTStreamedHeapWriter::write(GrowableArrayCHeap<oop, mtClassShared>* roots,
-                                  ArchiveStreamedHeapInfo* heap_info) {
+                                  AOTStreamedHeapInfo* heap_info) {
   assert(CDSConfig::is_dumping_heap(), "sanity");
   allocate_buffer();
   order_source_objs(roots);
@@ -453,7 +453,7 @@ static void log_bitmap_usage(const char* which, BitMap* bitmap, size_t total_bit
 }
 
 // Update all oop fields embedded in the buffered objects
-void AOTStreamedHeapWriter::map_embedded_oops(ArchiveStreamedHeapInfo* heap_info) {
+void AOTStreamedHeapWriter::map_embedded_oops(AOTStreamedHeapInfo* heap_info) {
   size_t oopmap_unit = (UseCompressedOops ? sizeof(narrowOop) : sizeof(oop));
   size_t heap_region_byte_size = _buffer_used;
   heap_info->oopmap()->resize(heap_region_byte_size / oopmap_unit);
@@ -497,7 +497,7 @@ oop AOTStreamedHeapWriter::buffered_addr_to_source_obj(address buffered_addr) {
   return buffered_offset_to_source_obj(buffered_address_to_offset(buffered_addr));
 }
 
-void AOTStreamedHeapWriter::populate_archive_heap_info(ArchiveStreamedHeapInfo* info) {
+void AOTStreamedHeapWriter::populate_archive_heap_info(AOTStreamedHeapInfo* info) {
   assert(!info->is_used(), "only set once");
 
   size_t heap_region_byte_size = _buffer_used;
@@ -512,15 +512,9 @@ void AOTStreamedHeapWriter::populate_archive_heap_info(ArchiveStreamedHeapInfo*
   info->set_num_archived_objects((size_t)_source_objs->length());
 }
 
-AOTMapLogger::OopDataIterator* AOTStreamedHeapWriter::oop_iterator(ArchiveStreamedHeapInfo* heap_info) {
-  class StreamedWriterOopIterator : public AOTMapLogger::OopDataIterator {
+AOTMapLogger::OopDataIterator* AOTStreamedHeapWriter::oop_iterator(AOTStreamedHeapInfo* heap_info) {
+  class StreamedWriterOopIterator : public AOTStreamedHeapOopIterator {
   private:
-    int _current;
-    int _next;
-
-    address _buffer_start;
-
-    int _num_archived_objects;
     int _num_archived_roots;
     int* _roots;
 
@@ -529,15 +523,11 @@ AOTMapLogger::OopDataIterator* AOTStreamedHeapWriter::oop_iterator(ArchiveStream
                               int num_archived_objects,
                               int num_archived_roots,
                               int* roots)
-      : _current(0),
-        _next(1),
-        _buffer_start(buffer_start),
-        _num_archived_objects(num_archived_objects),
+      : AOTStreamedHeapOopIterator(buffer_start, num_archived_objects),
         _num_archived_roots(num_archived_roots),
-        _roots(roots) {
-    }
+        _roots(roots) {}
 
-    AOTMapLogger::OopData capture(int dfs_index) {
+    AOTMapLogger::OopData capture(int dfs_index) override {
       size_t buffered_offset = _dfs_to_archive_object_table[dfs_index];
       address buffered_addr = _buffer_start + buffered_offset;
       oop src_obj = AOTStreamedHeapWriter::buffered_offset_to_source_obj(buffered_offset);
@@ -561,35 +551,6 @@ AOTMapLogger::OopDataIterator* AOTStreamedHeapWriter::oop_iterator(ArchiveStream
                false };
     }
 
-    bool has_next() override {
-      return _next <= _num_archived_objects;
-    }
-
-    AOTMapLogger::OopData next() override {
-      _current = _next;
-      AOTMapLogger::OopData result = capture(_current);
-      _next = _current + 1;
-      return result;
-    }
-
-    AOTMapLogger::OopData obj_at(narrowOop* addr) override {
-      int dfs_index = (int)(*addr);
-      if (dfs_index == 0) {
-        return null_data();
-      } else {
-        return capture(dfs_index);
-      }
-    }
-
-    AOTMapLogger::OopData obj_at(oop* addr) override {
-      int dfs_index = (int)cast_from_oop<uintptr_t>(*addr);
-      if (dfs_index == 0) {
-        return null_data();
-      } else {
-        return capture(dfs_index);
-      }
-    }
-
     GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* roots() override {
       GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>* result = new GrowableArrayCHeap<AOTMapLogger::OopData, mtClass>();
 
diff --git a/src/hotspot/share/cds/aotStreamedHeapWriter.hpp b/src/hotspot/share/cds/aotStreamedHeapWriter.hpp
index bde82f8ce29..ab5aec0327b 100644
--- a/src/hotspot/share/cds/aotStreamedHeapWriter.hpp
+++ b/src/hotspot/share/cds/aotStreamedHeapWriter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ class AOTStreamedHeapWriter : AllStatic {
   static void copy_forwarding_to_buffer();
   static void copy_roots_max_dfs_to_buffer(int roots_length);
 
-  static void map_embedded_oops(ArchiveStreamedHeapInfo* info);
+  static void map_embedded_oops(AOTStreamedHeapInfo* info);
   static bool is_in_requested_range(oop o);
   static oop requested_obj_from_buffer_offset(size_t offset);
 
@@ -131,14 +131,14 @@ class AOTStreamedHeapWriter : AllStatic {
 
   static void update_header_for_buffered_addr(address buffered_addr, oop src_obj, Klass* src_klass);
 
-  static void populate_archive_heap_info(ArchiveStreamedHeapInfo* info);
+  static void populate_archive_heap_info(AOTStreamedHeapInfo* info);
 
 public:
   static void init() NOT_CDS_JAVA_HEAP_RETURN;
 
   static void delete_tables_with_raw_oops();
   static void add_source_obj(oop src_obj);
-  static void write(GrowableArrayCHeap<oop, mtClassShared>*, ArchiveStreamedHeapInfo* heap_info);
+  static void write(GrowableArrayCHeap<oop, mtClassShared>*, AOTStreamedHeapInfo* heap_info);
   static address buffered_heap_roots_addr() {
     return offset_to_buffered_address<address>(_roots_offset);
   }
@@ -156,7 +156,7 @@ public:
   static oop buffered_offset_to_source_obj(size_t buffered_offset);
   static oop buffered_addr_to_source_obj(address buffered_addr);
 
-  static AOTMapLogger::OopDataIterator* oop_iterator(ArchiveStreamedHeapInfo* heap_info);
+  static AOTMapLogger::OopDataIterator* oop_iterator(AOTStreamedHeapInfo* heap_info);
 };
 #endif // INCLUDE_CDS_JAVA_HEAP
 #endif // SHARE_CDS_AOTSTREAMEDHEAPWRITER_HPP
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 6bbefea5cd9..0ea5d6c6ecb 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -24,6 +24,7 @@
 
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassLinker.hpp"
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotLogging.hpp"
 #include "cds/aotMapLogger.hpp"
 #include "cds/aotMetaspace.hpp"
@@ -175,10 +176,10 @@ ArchiveBuilder::ArchiveBuilder() :
   _mapped_static_archive_bottom(nullptr),
   _mapped_static_archive_top(nullptr),
   _buffer_to_requested_delta(0),
-  _pz_region("pz", MAX_SHARED_DELTA), // protection zone -- used only during dumping; does NOT exist in cds archive.
-  _rw_region("rw", MAX_SHARED_DELTA),
-  _ro_region("ro", MAX_SHARED_DELTA),
-  _ac_region("ac", MAX_SHARED_DELTA),
+  _pz_region("pz"), // protection zone -- used only during dumping; does NOT exist in cds archive.
+  _rw_region("rw"),
+  _ro_region("ro"),
+  _ac_region("ac"),
   _ptrmap(mtClassShared),
   _rw_ptrmap(mtClassShared),
   _ro_ptrmap(mtClassShared),
@@ -243,7 +244,7 @@ bool ArchiveBuilder::gather_klass_and_symbol(MetaspaceClosure::Ref* ref, bool re
   if (get_follow_mode(ref) != make_a_copy) {
     return false;
   }
-  if (ref->msotype() == MetaspaceObj::ClassType) {
+  if (ref->type() == MetaspaceClosureType::ClassType) {
     Klass* klass = (Klass*)ref->obj();
     assert(klass->is_klass(), "must be");
     if (!is_excluded(klass)) {
@@ -252,7 +253,7 @@ bool ArchiveBuilder::gather_klass_and_symbol(MetaspaceClosure::Ref* ref, bool re
         assert(klass->is_instance_klass(), "must be");
       }
     }
-  } else if (ref->msotype() == MetaspaceObj::SymbolType) {
+  } else if (ref->type() == MetaspaceClosureType::SymbolType) {
     // Make sure the symbol won't be GC'ed while we are dumping the archive.
     Symbol* sym = (Symbol*)ref->obj();
     sym->increment_refcount();
@@ -271,11 +272,6 @@ void ArchiveBuilder::gather_klasses_and_symbols() {
   aot_log_info(aot)("Gathering classes and symbols ... ");
   GatherKlassesAndSymbols doit(this);
   iterate_roots(&doit);
-#if INCLUDE_CDS_JAVA_HEAP
-  if (CDSConfig::is_dumping_full_module_graph()) {
-    ClassLoaderDataShared::iterate_symbols(&doit);
-  }
-#endif
   doit.finish();
 
   if (CDSConfig::is_dumping_static_archive()) {
@@ -325,8 +321,10 @@ void ArchiveBuilder::sort_klasses() {
 }
 
 address ArchiveBuilder::reserve_buffer() {
-  // AOTCodeCache::max_aot_code_size() accounts for aot code region.
-  size_t buffer_size = LP64_ONLY(CompressedClassSpaceSize) NOT_LP64(256 * M) + AOTCodeCache::max_aot_code_size();
+  // On 64-bit: reserve address space for archives up to the max encoded offset limit.
+  // On 32-bit: use 256MB + AOT code size due to limited virtual address space.
+  size_t buffer_size = LP64_ONLY(AOTCompressedPointers::MaxMetadataOffsetBytes)
+                       NOT_LP64(256 * M + AOTCodeCache::max_aot_code_size());
   ReservedSpace rs = MemoryReserver::reserve(buffer_size,
                                              AOTMetaspace::core_region_alignment(),
                                              os::vm_page_size(),
@@ -446,14 +444,14 @@ bool ArchiveBuilder::gather_one_source_obj(MetaspaceClosure::Ref* ref, bool read
   }
 
 #ifdef ASSERT
-  if (ref->msotype() == MetaspaceObj::MethodType) {
+  if (ref->type() == MetaspaceClosureType::MethodType) {
     Method* m = (Method*)ref->obj();
     assert(!RegeneratedClasses::has_been_regenerated((address)m->method_holder()),
            "Should not archive methods in a class that has been regenerated");
   }
 #endif
 
-  if (ref->msotype() == MetaspaceObj::MethodDataType) {
+  if (ref->type() == MetaspaceClosureType::MethodDataType) {
     MethodData* md = (MethodData*)ref->obj();
     md->clean_method_data(false /* always_clean */);
   }
@@ -554,16 +552,16 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
   if (CDSConfig::is_dumping_dynamic_archive() && AOTMetaspace::in_aot_cache(obj)) {
     // Don't dump existing shared metadata again.
     return point_to_it;
-  } else if (ref->msotype() == MetaspaceObj::MethodDataType ||
-             ref->msotype() == MetaspaceObj::MethodCountersType ||
-             ref->msotype() == MetaspaceObj::KlassTrainingDataType ||
-             ref->msotype() == MetaspaceObj::MethodTrainingDataType ||
-             ref->msotype() == MetaspaceObj::CompileTrainingDataType) {
+  } else if (ref->type() == MetaspaceClosureType::MethodDataType ||
+             ref->type() == MetaspaceClosureType::MethodCountersType ||
+             ref->type() == MetaspaceClosureType::KlassTrainingDataType ||
+             ref->type() == MetaspaceClosureType::MethodTrainingDataType ||
+             ref->type() == MetaspaceClosureType::CompileTrainingDataType) {
     return (TrainingData::need_data() || TrainingData::assembling_data()) ? make_a_copy : set_to_null;
-  } else if (ref->msotype() == MetaspaceObj::AdapterHandlerEntryType) {
+  } else if (ref->type() == MetaspaceClosureType::AdapterHandlerEntryType) {
     return CDSConfig::is_dumping_adapters() ? make_a_copy : set_to_null;
   } else {
-    if (ref->msotype() == MetaspaceObj::ClassType) {
+    if (ref->type() == MetaspaceClosureType::ClassType) {
       Klass* klass = (Klass*)ref->obj();
       assert(klass->is_klass(), "must be");
       if (RegeneratedClasses::has_been_regenerated(klass)) {
@@ -571,7 +569,12 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
       }
       if (is_excluded(klass)) {
         ResourceMark rm;
-        log_debug(cds, dynamic)("Skipping class (excluded): %s", klass->external_name());
+        aot_log_trace(aot)("pointer set to null: class (excluded): %s", klass->external_name());
+        return set_to_null;
+      }
+      if (klass->is_array_klass() && CDSConfig::is_dumping_dynamic_archive()) {
+        ResourceMark rm;
+        aot_log_trace(aot)("pointer set to null: array class not supported in dynamic region: %s", klass->external_name());
         return set_to_null;
       }
     }
@@ -615,15 +618,6 @@ void ArchiveBuilder::dump_rw_metadata() {
   ResourceMark rm;
   aot_log_info(aot)("Allocating RW objects ... ");
   make_shallow_copies(&_rw_region, &_rw_src_objs);
-
-#if INCLUDE_CDS_JAVA_HEAP
-  if (CDSConfig::is_dumping_full_module_graph()) {
-    // Archive the ModuleEntry's and PackageEntry's of the 3 built-in loaders
-    char* start = rw_region()->top();
-    ClassLoaderDataShared::allocate_archived_tables();
-    alloc_stats()->record_modules(rw_region()->top() - start, /*read_only*/false);
-  }
-#endif
 }
 
 void ArchiveBuilder::dump_ro_metadata() {
@@ -632,15 +626,6 @@ void ArchiveBuilder::dump_ro_metadata() {
 
   start_dump_region(&_ro_region);
   make_shallow_copies(&_ro_region, &_ro_src_objs);
-
-#if INCLUDE_CDS_JAVA_HEAP
-  if (CDSConfig::is_dumping_full_module_graph()) {
-    char* start = ro_region()->top();
-    ClassLoaderDataShared::init_archived_tables();
-    alloc_stats()->record_modules(ro_region()->top() - start, /*read_only*/true);
-  }
-#endif
-
   RegeneratedClasses::record_regenerated_objects();
 }
 
@@ -658,7 +643,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
   size_t alignment = SharedSpaceObjectAlignment; // alignment for the dest pointer
 
   char* oldtop = dump_region->top();
-  if (src_info->msotype() == MetaspaceObj::ClassType) {
+  if (src_info->type() == MetaspaceClosureType::ClassType) {
     // Allocate space for a pointer directly in front of the future InstanceKlass, so
     // we can do a quick lookup from InstanceKlass* -> RunTimeClassInfo*
     // without building another hashtable. See RunTimeClassInfo::get_for()
@@ -674,7 +659,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
       alignment = nth_bit(ArchiveBuilder::precomputed_narrow_klass_shift());
     }
 #endif
-  } else if (src_info->msotype() == MetaspaceObj::SymbolType) {
+  } else if (src_info->type() == MetaspaceClosureType::SymbolType) {
     // Symbols may be allocated by using AllocateHeap, so their sizes
     // may be less than size_in_bytes() indicates.
     bytes = ((Symbol*)src)->byte_size();
@@ -684,7 +669,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
   memcpy(dest, src, bytes);
 
   // Update the hash of buffered sorted symbols for static dump so that the symbols have deterministic contents
-  if (CDSConfig::is_dumping_static_archive() && (src_info->msotype() == MetaspaceObj::SymbolType)) {
+  if (CDSConfig::is_dumping_static_archive() && (src_info->type() == MetaspaceClosureType::SymbolType)) {
     Symbol* buffered_symbol = (Symbol*)dest;
     assert(((Symbol*)src)->is_permanent(), "archived symbols must be permanent");
     buffered_symbol->update_identity_hash();
@@ -699,7 +684,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
     }
   }
 
-  intptr_t* archived_vtable = CppVtables::get_archived_vtable(src_info->msotype(), (address)dest);
+  intptr_t* archived_vtable = CppVtables::get_archived_vtable(src_info->type(), (address)dest);
   if (archived_vtable != nullptr) {
     *(address*)dest = (address)archived_vtable;
     ArchivePtrMarker::mark_pointer((address*)dest);
@@ -709,7 +694,7 @@ void ArchiveBuilder::make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* s
   src_info->set_buffered_addr((address)dest);
 
   char* newtop = dump_region->top();
-  _alloc_stats.record(src_info->msotype(), int(newtop - oldtop), src_info->read_only());
+  _alloc_stats.record(src_info->type(), int(newtop - oldtop), src_info->read_only());
 
   DEBUG_ONLY(_alloc_stats.verify((int)dump_region->used(), src_info->read_only()));
 }
@@ -992,15 +977,15 @@ void ArchiveBuilder::make_training_data_shareable() {
       return;
     }
 
-    if (info.msotype() == MetaspaceObj::KlassTrainingDataType ||
-        info.msotype() == MetaspaceObj::MethodTrainingDataType ||
-        info.msotype() == MetaspaceObj::CompileTrainingDataType) {
+    if (info.type() == MetaspaceClosureType::KlassTrainingDataType ||
+        info.type() == MetaspaceClosureType::MethodTrainingDataType ||
+        info.type() == MetaspaceClosureType::CompileTrainingDataType) {
       TrainingData* buffered_td = (TrainingData*)info.buffered_addr();
       buffered_td->remove_unshareable_info();
-    } else if (info.msotype() == MetaspaceObj::MethodDataType) {
+    } else if (info.type() == MetaspaceClosureType::MethodDataType) {
       MethodData* buffered_mdo = (MethodData*)info.buffered_addr();
       buffered_mdo->remove_unshareable_info();
-    } else if (info.msotype() == MetaspaceObj::MethodCountersType) {
+    } else if (info.type() == MetaspaceClosureType::MethodCountersType) {
       MethodCounters* buffered_mc = (MethodCounters*)info.buffered_addr();
       buffered_mc->remove_unshareable_info();
     }
@@ -1008,16 +993,15 @@ void ArchiveBuilder::make_training_data_shareable() {
   _src_obj_table.iterate_all(clean_td);
 }
 
-uintx ArchiveBuilder::buffer_to_offset(address p) const {
+size_t ArchiveBuilder::buffer_to_offset(address p) const {
   address requested_p = to_requested(p);
-  assert(requested_p >= _requested_static_archive_bottom, "must be");
-  return requested_p - _requested_static_archive_bottom;
+  return pointer_delta(requested_p, _requested_static_archive_bottom, 1);
 }
 
-uintx ArchiveBuilder::any_to_offset(address p) const {
+size_t ArchiveBuilder::any_to_offset(address p) const {
   if (is_in_mapped_static_archive(p)) {
     assert(CDSConfig::is_dumping_dynamic_archive(), "must be");
-    return p - _mapped_static_archive_bottom;
+    return pointer_delta(p, _mapped_static_archive_bottom, 1);
   }
   if (!is_in_buffer_space(p)) {
     // p must be a "source" address
@@ -1026,7 +1010,7 @@ uintx ArchiveBuilder::any_to_offset(address p) const {
   return buffer_to_offset(p);
 }
 
-address ArchiveBuilder::offset_to_buffered_address(u4 offset) const {
+address ArchiveBuilder::offset_to_buffered_address(size_t offset) const {
   address requested_addr = _requested_static_archive_bottom + offset;
   address buffered_addr = requested_addr - _buffer_to_requested_delta;
   assert(is_in_buffer_space(buffered_addr), "bad offset");
@@ -1172,7 +1156,7 @@ void ArchiveBuilder::print_stats() {
   _alloc_stats.print_stats(int(_ro_region.used()), int(_rw_region.used()));
 }
 
-void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info) {
+void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, AOTMappedHeapInfo* mapped_heap_info, AOTStreamedHeapInfo* streamed_heap_info) {
   // Make sure NUM_CDS_REGIONS (exported in cds.h) agrees with
   // AOTMetaspace::n_regions (internal to hotspot).
   assert(NUM_CDS_REGIONS == AOTMetaspace::n_regions, "sanity");
@@ -1231,8 +1215,8 @@ void ArchiveBuilder::count_relocated_pointer(bool tagged, bool nulled) {
 }
 
 void ArchiveBuilder::print_region_stats(FileMapInfo *mapinfo,
-                                        ArchiveMappedHeapInfo* mapped_heap_info,
-                                        ArchiveStreamedHeapInfo* streamed_heap_info) {
+                                        AOTMappedHeapInfo* mapped_heap_info,
+                                        AOTStreamedHeapInfo* streamed_heap_info) {
   // Print statistics of all the regions
   const size_t bitmap_used = mapinfo->region_at(AOTMetaspace::bm)->used();
   const size_t bitmap_reserved = mapinfo->region_at(AOTMetaspace::bm)->used_aligned();
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 9a628439039..b3667ea11b4 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,8 @@
 #include "utilities/hashTable.hpp"
 #include "utilities/resizableHashTable.hpp"
 
-class ArchiveMappedHeapInfo;
-class ArchiveStreamedHeapInfo;
+class AOTMappedHeapInfo;
+class AOTStreamedHeapInfo;
 class CHeapBitMap;
 class FileMapInfo;
 class Klass;
@@ -134,13 +134,13 @@ private:
     int _size_in_bytes;
     int _id; // Each object has a unique serial ID, starting from zero. The ID is assigned
              // when the object is added into _source_objs.
-    MetaspaceObj::Type _msotype;
+    MetaspaceClosureType _type;
     address _source_addr;    // The source object to be copied.
     address _buffered_addr;  // The copy of this object insider the buffer.
   public:
     SourceObjInfo(MetaspaceClosure::Ref* ref, bool read_only, FollowMode follow_mode) :
       _ptrmap_start(0), _ptrmap_end(0), _read_only(read_only), _has_embedded_pointer(false), _follow_mode(follow_mode),
-      _size_in_bytes(ref->size() * BytesPerWord), _id(0), _msotype(ref->msotype()),
+      _size_in_bytes(ref->size() * BytesPerWord), _id(0), _type(ref->type()),
       _source_addr(ref->obj()) {
       if (follow_mode == point_to_it) {
         _buffered_addr = ref->obj();
@@ -155,7 +155,7 @@ private:
     SourceObjInfo(address src, SourceObjInfo* renegerated_obj_info) :
       _ptrmap_start(0), _ptrmap_end(0), _read_only(false),
       _follow_mode(renegerated_obj_info->_follow_mode),
-      _size_in_bytes(0), _msotype(renegerated_obj_info->_msotype),
+      _size_in_bytes(0), _type(renegerated_obj_info->_type),
       _source_addr(src),  _buffered_addr(renegerated_obj_info->_buffered_addr) {}
 
     bool should_copy() const { return _follow_mode == make_a_copy; }
@@ -182,7 +182,7 @@ private:
       }
       return _buffered_addr;
     }
-    MetaspaceObj::Type msotype() const { return _msotype; }
+    MetaspaceClosureType type() const { return _type; }
     FollowMode follow_mode() const { return _follow_mode; }
   };
 
@@ -247,8 +247,8 @@ private:
   } _relocated_ptr_info;
 
   void print_region_stats(FileMapInfo *map_info,
-                          ArchiveMappedHeapInfo* mapped_heap_info,
-                          ArchiveStreamedHeapInfo* streamed_heap_info);
+                          AOTMappedHeapInfo* mapped_heap_info,
+                          AOTStreamedHeapInfo* streamed_heap_info);
   void print_bitmap_region_stats(size_t size, size_t total_size);
   void print_heap_region_stats(char* start, size_t size, size_t total_size);
 
@@ -329,49 +329,22 @@ public:
     return current()->buffer_to_requested_delta();
   }
 
-  inline static u4 to_offset_u4(uintx offset) {
-    guarantee(offset <= MAX_SHARED_DELTA, "must be 32-bit offset " INTPTR_FORMAT, offset);
-    return (u4)offset;
-  }
-
 public:
-  static const uintx MAX_SHARED_DELTA = ArchiveUtils::MAX_SHARED_DELTA;;
-
   // The address p points to an object inside the output buffer. When the archive is mapped
   // at the requested address, what's the offset of this object from _requested_static_archive_bottom?
-  uintx buffer_to_offset(address p) const;
+  size_t buffer_to_offset(address p) const;
 
-  // Same as buffer_to_offset, except that the address p points to either (a) an object
-  // inside the output buffer, or (b), an object in the currently mapped static archive.
-  uintx any_to_offset(address p) const;
+  // Same as buffer_to_offset, except that the address p points to one of the following:
+  // - an object in the ArchiveBuilder's buffer.
+  // - an object in the currently mapped AOT cache rw/ro regions.
+  // - an object that has been copied into the ArchiveBuilder's buffer.
+  size_t any_to_offset(address p) const;
 
   // The reverse of buffer_to_offset()
-  address offset_to_buffered_address(u4 offset) const;
+  address offset_to_buffered_address(size_t offset) const;
 
   template <typename T>
-  u4 buffer_to_offset_u4(T p) const {
-    uintx offset = buffer_to_offset((address)p);
-    return to_offset_u4(offset);
-  }
-
-  template <typename T>
-  u4 any_to_offset_u4(T p) const {
-    assert(p != nullptr, "must not be null");
-    uintx offset = any_to_offset((address)p);
-    return to_offset_u4(offset);
-  }
-
-  template <typename T>
-  u4 any_or_null_to_offset_u4(T p) const {
-    if (p == nullptr) {
-      return 0;
-    } else {
-      return any_to_offset_u4<T>(p);
-    }
-  }
-
-  template <typename T>
-  T offset_to_buffered(u4 offset) const {
+  T offset_to_buffered(size_t offset) const {
     return (T)offset_to_buffered_address(offset);
   }
 
@@ -438,8 +411,8 @@ public:
   void make_training_data_shareable();
   void relocate_to_requested();
   void write_archive(FileMapInfo* mapinfo,
-                     ArchiveMappedHeapInfo* mapped_heap_info,
-                     ArchiveStreamedHeapInfo* streamed_heap_info);
+                     AOTMappedHeapInfo* mapped_heap_info,
+                     AOTStreamedHeapInfo* streamed_heap_info);
   void write_region(FileMapInfo* mapinfo, int region_idx, DumpRegion* dump_region,
                     bool read_only,  bool allow_exec);
 
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 842668509cf..ea9bde8eb8d 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotLogging.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
@@ -201,13 +202,13 @@ char* DumpRegion::expand_top_to(char* newtop) {
   commit_to(newtop);
   _top = newtop;
 
-  if (_max_delta > 0) {
+  if (ArchiveBuilder::is_active() && ArchiveBuilder::current()->is_in_buffer_space(_base)) {
     uintx delta = ArchiveBuilder::current()->buffer_to_offset((address)(newtop-1));
-    if (delta > _max_delta) {
+    if (delta > AOTCompressedPointers::MaxMetadataOffsetBytes) {
       // This is just a sanity check and should not appear in any real world usage. This
       // happens only if you allocate more than 2GB of shared objects and would require
       // millions of shared classes.
-      aot_log_error(aot)("Out of memory in the CDS archive: Please reduce the number of shared classes.");
+      aot_log_error(aot)("Out of memory in the %s: Please reduce the number of shared classes.", CDSConfig::type_of_archive_being_written());
       AOTMetaspace::unrecoverable_writing_error();
     }
   }
@@ -311,29 +312,15 @@ void DumpRegion::pack(DumpRegion* next) {
 }
 
 void WriteClosure::do_ptr(void** p) {
-  // Write ptr into the archive; ptr can be:
-  //   (a) null                 -> written as 0
-  //   (b) a "buffered" address -> written as is
-  //   (c) a "source"   address -> convert to "buffered" and write
-  // The common case is (c). E.g., when writing the vmClasses into the archive.
-  // We have (b) only when we don't have a corresponding source object. E.g.,
-  // the archived c++ vtable entries.
   address ptr = *(address*)p;
-  if (ptr != nullptr && !ArchiveBuilder::current()->is_in_buffer_space(ptr)) {
-    ptr = ArchiveBuilder::current()->get_buffered_addr(ptr);
-  }
-  // null pointers do not need to be converted to offsets
-  if (ptr != nullptr) {
-    ptr = (address)ArchiveBuilder::current()->buffer_to_offset(ptr);
-  }
-  _dump_region->append_intptr_t((intptr_t)ptr, false);
+  AOTCompressedPointers::narrowPtr narrowp = AOTCompressedPointers::encode(ptr);
+  _dump_region->append_intptr_t(checked_cast<intptr_t>(narrowp), false);
 }
 
 void ReadClosure::do_ptr(void** p) {
   assert(*p == nullptr, "initializing previous initialized pointer.");
-  intptr_t obj = nextPtr();
-  assert(obj >= 0, "sanity.");
-  *p = (obj != 0) ? (void*)(_base_address + obj) : (void*)obj;
+  u4 narrowp = checked_cast<u4>(nextPtr());
+  *p = AOTCompressedPointers::decode<void*>(cast_from_u4(narrowp), _base_address);
 }
 
 void ReadClosure::do_u4(u4* p) {
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index 79d894f0144..e5d1efa5eab 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,7 +153,6 @@ private:
   char* _base;
   char* _top;
   char* _end;
-  uintx _max_delta;
   bool _is_packed;
   ReservedSpace* _rs;
   VirtualSpace* _vs;
@@ -161,9 +160,9 @@ private:
   void commit_to(char* newtop);
 
 public:
-  DumpRegion(const char* name, uintx max_delta = 0)
+  DumpRegion(const char* name)
     : _name(name), _base(nullptr), _top(nullptr), _end(nullptr),
-      _max_delta(max_delta), _is_packed(false),
+      _is_packed(false),
       _rs(nullptr), _vs(nullptr) {}
 
   char* expand_top_to(char* newtop);
@@ -237,13 +236,13 @@ public:
 class ReadClosure : public SerializeClosure {
 private:
   intptr_t** _ptr_array;
-  intptr_t _base_address;
+  address _base_address;
   inline intptr_t nextPtr() {
     return *(*_ptr_array)++;
   }
 
 public:
-  ReadClosure(intptr_t** ptr_array, intptr_t base_address) :
+  ReadClosure(intptr_t** ptr_array, address base_address) :
     _ptr_array(ptr_array), _base_address(base_address) {}
 
   void do_ptr(void** p);
@@ -260,7 +259,6 @@ class ArchiveUtils {
   template <typename T> static Array<T>* archive_ptr_array(GrowableArray<T>* tmp_array);
 
 public:
-  static const uintx MAX_SHARED_DELTA = 0x7FFFFFFF;
   static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
   static bool has_aot_initialized_mirror(InstanceKlass* src_ik);
 
@@ -273,50 +271,6 @@ public:
   static Array<T>* archive_array(GrowableArray<T>* tmp_array) {
     return archive_ptr_array(tmp_array);
   }
-
-  // The following functions translate between a u4 offset and an address in the
-  // the range of the mapped CDS archive (e.g., Metaspace::in_aot_cache()).
-  // Since the first 16 bytes in this range are dummy data (see ArchiveBuilder::reserve_buffer()),
-  // we know that offset 0 never represents a valid object. As a result, an offset of 0
-  // is used to encode a nullptr.
-  //
-  // Use the "archived_address_or_null" variants if a nullptr may be encoded.
-
-  // offset must represent an object of type T in the mapped shared space. Return
-  // a direct pointer to this object.
-  template <typename T> T static offset_to_archived_address(u4 offset) {
-    assert(offset != 0, "sanity");
-    T p = (T)(SharedBaseAddress + offset);
-    assert(Metaspace::in_aot_cache(p), "must be");
-    return p;
-  }
-
-  template <typename T> T static offset_to_archived_address_or_null(u4 offset) {
-    if (offset == 0) {
-      return nullptr;
-    } else {
-      return offset_to_archived_address<T>(offset);
-    }
-  }
-
-  // p must be an archived object. Get its offset from SharedBaseAddress
-  template <typename T> static u4 archived_address_to_offset(T p) {
-    uintx pn = (uintx)p;
-    uintx base = (uintx)SharedBaseAddress;
-    assert(Metaspace::in_aot_cache(p), "must be");
-    assert(pn > base, "sanity"); // No valid object is stored at 0 offset from SharedBaseAddress
-    uintx offset = pn - base;
-    assert(offset <= MAX_SHARED_DELTA, "range check");
-    return static_cast<u4>(offset);
-  }
-
-  template <typename T> static u4 archived_address_or_null_to_offset(T p) {
-    if (p == nullptr) {
-      return 0;
-    } else {
-      return archived_address_to_offset<T>(p);
-    }
-  }
 };
 
 class HeapRootSegments {
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 5f6b568dd6e..f4ef3c66f7a 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -556,7 +556,9 @@ void CDSConfig::check_aotmode_record() {
 
   // At VM exit, the module graph may be contaminated with program states.
   // We will rebuild the module graph when dumping the CDS final image.
-  disable_heap_dumping();
+  _is_using_optimized_module_handling = false;
+  _is_using_full_module_graph = false;
+  _is_dumping_full_module_graph = false;
 }
 
 void CDSConfig::check_aotmode_create() {
@@ -582,6 +584,7 @@ void CDSConfig::check_aotmode_create() {
   substitute_aot_filename(FLAG_MEMBER_ENUM(AOTCache));
 
   _is_dumping_final_static_archive = true;
+  _is_using_full_module_graph = false;
   UseSharedSpaces = true;
   RequireSharedSpaces = true;
 
@@ -954,7 +957,9 @@ bool CDSConfig::are_vm_options_incompatible_with_dumping_heap() {
 }
 
 bool CDSConfig::is_dumping_heap() {
-  if (!(is_dumping_classic_static_archive() || is_dumping_final_static_archive())
+  // Note: when dumping preimage static archive, only a very limited set of oops
+  // are dumped.
+  if (!is_dumping_static_archive()
       || are_vm_options_incompatible_with_dumping_heap()
       || _disable_heap_dumping) {
     return false;
@@ -966,6 +971,26 @@ bool CDSConfig::is_loading_heap() {
   return HeapShared::is_archived_heap_in_use();
 }
 
+bool CDSConfig::is_dumping_klass_subgraphs() {
+  if (is_dumping_classic_static_archive() || is_dumping_final_static_archive()) {
+    // KlassSubGraphs (see heapShared.cpp) is a legacy mechanism for archiving oops. It
+    // has been superceded by AOT class linking. This feature is used only when
+    // AOT class linking is disabled.
+    //
+    // KlassSubGraphs are disabled in the preimage static archive, which contains a very
+    // limited set of oops.
+    return is_dumping_heap() && !is_dumping_aot_linked_classes();
+  } else {
+    return false;
+  }
+}
+
+bool CDSConfig::is_using_klass_subgraphs() {
+  return (is_loading_heap() &&
+          !CDSConfig::is_using_aot_linked_classes() &&
+          !CDSConfig::is_dumping_final_static_archive());
+}
+
 bool CDSConfig::is_using_full_module_graph() {
   if (ClassLoaderDataShared::is_full_module_graph_loaded()) {
     return true;
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index 202904e8231..739dbb4937b 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,6 +188,9 @@ public:
   static bool is_dumping_heap()                              NOT_CDS_JAVA_HEAP_RETURN_(false);
   static bool is_loading_heap()                              NOT_CDS_JAVA_HEAP_RETURN_(false);
 
+  static bool is_dumping_klass_subgraphs()                   NOT_CDS_JAVA_HEAP_RETURN_(false);
+  static bool is_using_klass_subgraphs()                     NOT_CDS_JAVA_HEAP_RETURN_(false);
+
   static bool is_dumping_invokedynamic()                     NOT_CDS_JAVA_HEAP_RETURN_(false);
   static bool is_dumping_method_handles()                    NOT_CDS_JAVA_HEAP_RETURN_(false);
 
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index f2862454286..dc5a777d7b1 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,14 @@
  *
  */
 
+#include "cds/aotGrowableArray.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cppVtables.hpp"
 #include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/instanceClassLoaderKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/instanceRefKlass.hpp"
@@ -53,6 +55,19 @@
 // + at run time:   we clone the actual contents of the vtables from libjvm.so
 //                  into our own tables.
 
+
+#ifndef PRODUCT
+
+// AOTGrowableArray has a vtable only when in non-product builds (due to
+// the virtual printing functions in AnyObj).
+
+using GrowableArray_ModuleEntry_ptr = AOTGrowableArray<ModuleEntry*>;
+
+#define DEBUG_CPP_VTABLE_TYPES_DO(f) \
+  f(GrowableArray_ModuleEntry_ptr) \
+
+#endif
+
 // Currently, the archive contains ONLY the following types of objects that have C++ vtables.
 #define CPP_VTABLE_TYPES_DO(f) \
   f(ConstantPool) \
@@ -68,7 +83,8 @@
   f(TypeArrayKlass) \
   f(KlassTrainingData) \
   f(MethodTrainingData) \
-  f(CompileTrainingData)
+  f(CompileTrainingData) \
+  NOT_PRODUCT(DEBUG_CPP_VTABLE_TYPES_DO(f))
 
 class CppVtableInfo {
   intptr_t _vtable_size;
@@ -86,7 +102,7 @@ public:
   }
 };
 
-static inline intptr_t* vtable_of(const Metadata* m) {
+static inline intptr_t* vtable_of(const void* m) {
   return *((intptr_t**)m);
 }
 
@@ -116,6 +132,7 @@ CppVtableInfo* CppVtableCloner<T>::allocate_and_initialize(const char* name) {
 
 template <class T>
 void CppVtableCloner<T>::initialize(const char* name, CppVtableInfo* info) {
+  ResourceMark rm;
   T tmp; // Allocate temporary dummy metadata object to get to the original vtable.
   int n = info->vtable_size();
   intptr_t* srcvtable = vtable_of(&tmp);
@@ -123,7 +140,7 @@ void CppVtableCloner<T>::initialize(const char* name, CppVtableInfo* info) {
 
   // We already checked (and, if necessary, adjusted n) when the vtables were allocated, so we are
   // safe to do memcpy.
-  log_debug(aot, vtables)("Copying %3d vtable entries for %s", n, name);
+  log_debug(aot, vtables)("Copying %3d vtable entries for %s to " INTPTR_FORMAT, n, name, p2i(dstvtable));
   memcpy(dstvtable, srcvtable, sizeof(intptr_t) * n);
 }
 
@@ -268,7 +285,7 @@ void CppVtables::serialize(SerializeClosure* soc) {
   }
 }
 
-intptr_t* CppVtables::get_archived_vtable(MetaspaceObj::Type msotype, address obj) {
+intptr_t* CppVtables::get_archived_vtable(MetaspaceClosureType type, address obj) {
   if (!_orig_cpp_vtptrs_inited) {
     CPP_VTABLE_TYPES_DO(INIT_ORIG_CPP_VTPTRS);
     _orig_cpp_vtptrs_inited = true;
@@ -276,19 +293,23 @@ intptr_t* CppVtables::get_archived_vtable(MetaspaceObj::Type msotype, address ob
 
   assert(CDSConfig::is_dumping_archive(), "sanity");
   int kind = -1;
-  switch (msotype) {
-  case MetaspaceObj::SymbolType:
-  case MetaspaceObj::TypeArrayU1Type:
-  case MetaspaceObj::TypeArrayU2Type:
-  case MetaspaceObj::TypeArrayU4Type:
-  case MetaspaceObj::TypeArrayU8Type:
-  case MetaspaceObj::TypeArrayOtherType:
-  case MetaspaceObj::ConstMethodType:
-  case MetaspaceObj::ConstantPoolCacheType:
-  case MetaspaceObj::AnnotationsType:
-  case MetaspaceObj::RecordComponentType:
-  case MetaspaceObj::AdapterHandlerEntryType:
-  case MetaspaceObj::AdapterFingerPrintType:
+  switch (type) {
+  case MetaspaceClosureType::SymbolType:
+  case MetaspaceClosureType::TypeArrayU1Type:
+  case MetaspaceClosureType::TypeArrayU2Type:
+  case MetaspaceClosureType::TypeArrayU4Type:
+  case MetaspaceClosureType::TypeArrayU8Type:
+  case MetaspaceClosureType::TypeArrayOtherType:
+  case MetaspaceClosureType::CArrayType:
+  case MetaspaceClosureType::ConstMethodType:
+  case MetaspaceClosureType::ConstantPoolCacheType:
+  case MetaspaceClosureType::AnnotationsType:
+  case MetaspaceClosureType::ModuleEntryType:
+  case MetaspaceClosureType::PackageEntryType:
+  case MetaspaceClosureType::RecordComponentType:
+  case MetaspaceClosureType::AdapterHandlerEntryType:
+  case MetaspaceClosureType::AdapterFingerPrintType:
+  PRODUCT_ONLY(case MetaspaceClosureType::GrowableArrayType:)
     // These have no vtables.
     break;
   default:
diff --git a/src/hotspot/share/cds/cppVtables.hpp b/src/hotspot/share/cds/cppVtables.hpp
index b40ca036023..9e28ba020ee 100644
--- a/src/hotspot/share/cds/cppVtables.hpp
+++ b/src/hotspot/share/cds/cppVtables.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/metaspaceClosureType.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ArchiveBuilder;
@@ -40,7 +41,7 @@ class CppVtables : AllStatic {
 public:
   static void dumptime_init(ArchiveBuilder* builder);
   static void zero_archived_vtables();
-  static intptr_t* get_archived_vtable(MetaspaceObj::Type msotype, address obj);
+  static intptr_t* get_archived_vtable(MetaspaceClosureType type, address obj);
   static void serialize(SerializeClosure* sc);
   static bool is_valid_shared_method(const Method* m) NOT_CDS_RETURN_(false);
   static char* vtables_serialized_base() { return _vtables_serialized_base; }
diff --git a/src/hotspot/share/cds/dumpAllocStats.hpp b/src/hotspot/share/cds/dumpAllocStats.hpp
index 7d651320e6f..4553f0f6a01 100644
--- a/src/hotspot/share/cds/dumpAllocStats.hpp
+++ b/src/hotspot/share/cds/dumpAllocStats.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,32 +27,34 @@
 
 #include "classfile/compactHashtable.hpp"
 #include "memory/allocation.hpp"
+#include "memory/metaspaceClosureType.hpp"
 
 // This is for dumping detailed statistics for the allocations
 // in the shared spaces.
 class DumpAllocStats : public StackObj {
 public:
 
-  // Here's poor man's enum inheritance
-#define SHAREDSPACE_OBJ_TYPES_DO(f) \
-  METASPACE_OBJ_TYPES_DO(f) \
+#define DUMPED_OBJ_TYPES_DO(f) \
+  METASPACE_CLOSURE_TYPES_DO(f) \
   f(SymbolHashentry) \
   f(SymbolBucket) \
   f(StringHashentry) \
   f(StringBucket) \
-  f(ModulesNatives) \
   f(CppVTables) \
   f(Other)
 
+#define DUMPED_TYPE_DECLARE(name) name ## Type,
+#define DUMPED_TYPE_NAME_CASE(name) case name ## Type: return #name;
+
   enum Type {
     // Types are MetaspaceObj::ClassType, MetaspaceObj::SymbolType, etc
-    SHAREDSPACE_OBJ_TYPES_DO(METASPACE_OBJ_TYPE_DECLARE)
+    DUMPED_OBJ_TYPES_DO(DUMPED_TYPE_DECLARE)
     _number_of_types
   };
 
   static const char* type_name(Type type) {
     switch(type) {
-    SHAREDSPACE_OBJ_TYPES_DO(METASPACE_OBJ_TYPE_NAME_CASE)
+    DUMPED_OBJ_TYPES_DO(DUMPED_TYPE_NAME_CASE)
     default:
       ShouldNotReachHere();
       return nullptr;
@@ -101,16 +103,12 @@ public:
   CompactHashtableStats* symbol_stats() { return &_symbol_stats; }
   CompactHashtableStats* string_stats() { return &_string_stats; }
 
-  void record(MetaspaceObj::Type type, int byte_size, bool read_only) {
-    assert(int(type) >= 0 && type < MetaspaceObj::_number_of_types, "sanity");
+  void record(MetaspaceClosureType type, int byte_size, bool read_only) {
+    int t = (int)type;
+    assert(t >= 0 && t < (int)MetaspaceClosureType::_number_of_types, "sanity");
     int which = (read_only) ? RO : RW;
-    _counts[which][type] ++;
-    _bytes [which][type] += byte_size;
-  }
-
-  void record_modules(int byte_size, bool read_only) {
-    int which = (read_only) ? RO : RW;
-    _bytes [which][ModulesNativesType] += byte_size;
+    _counts[which][t] ++;
+    _bytes [which][t] += byte_size;
   }
 
   void record_other_type(int byte_size, bool read_only) {
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index d39cf3775e4..cd6890555d3 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -25,6 +25,7 @@
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassLinker.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotLogging.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
@@ -75,13 +76,13 @@ public:
       return 0;
     }
 
-    u4 a_offset = ArchiveBuilder::current()->any_to_offset_u4(a_name);
-    u4 b_offset = ArchiveBuilder::current()->any_to_offset_u4(b_name);
+    u4 a_narrowp = cast_to_u4(AOTCompressedPointers::encode_not_null(a_name));
+    u4 b_narrowp = cast_to_u4(AOTCompressedPointers::encode_not_null(b_name));
 
-    if (a_offset < b_offset) {
+    if (a_narrowp < b_narrowp) {
       return -1;
     } else {
-      assert(a_offset > b_offset, "must be");
+      assert(a_narrowp > b_narrowp, "must be");
       return 1;
     }
   }
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 0eeb96bb269..91fbce701e5 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -298,11 +298,11 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- compressed_class_ptrs:                    %d", _compressed_class_ptrs);
   st->print_cr("- narrow_klass_pointer_bits:                %d", _narrow_klass_pointer_bits);
   st->print_cr("- narrow_klass_shift:                       %d", _narrow_klass_shift);
-  st->print_cr("- cloned_vtables_offset:                    0x%zx", _cloned_vtables_offset);
-  st->print_cr("- early_serialized_data_offset:             0x%zx", _early_serialized_data_offset);
-  st->print_cr("- serialized_data_offset:                   0x%zx", _serialized_data_offset);
+  st->print_cr("- cloned_vtables:                           %u", cast_to_u4(_cloned_vtables));
+  st->print_cr("- early_serialized_data:                    %u", cast_to_u4(_early_serialized_data));
+  st->print_cr("- serialized_data:                          %u", cast_to_u4(_serialized_data));
   st->print_cr("- jvm_ident:                                %s", _jvm_ident);
-  st->print_cr("- class_location_config_offset:             0x%zx", _class_location_config_offset);
+  st->print_cr("- class_location_config:                    %d", cast_to_u4(_class_location_config));
   st->print_cr("- verify_local:                             %d", _verify_local);
   st->print_cr("- verify_remote:                            %d", _verify_remote);
   st->print_cr("- has_platform_or_app_classes:              %d", _has_platform_or_app_classes);
@@ -717,8 +717,8 @@ bool FileMapInfo::init_from_file(int fd) {
 }
 
 void FileMapInfo::seek_to_position(size_t pos) {
-  if (os::lseek(_fd, (long)pos, SEEK_SET) < 0) {
-    aot_log_error(aot)("Unable to seek to position %zu", pos);
+  if (os::lseek(_fd, (jlong)pos, SEEK_SET) < 0) {
+    aot_log_error(aot)("Unable to seek to position %zu (errno=%d: %s)", pos, errno, os::strerror(errno));
     AOTMetaspace::unrecoverable_loading_error();
   }
 }
@@ -974,8 +974,8 @@ size_t FileMapInfo::remove_bitmap_zeros(CHeapBitMap* map) {
 
 char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap,
                                        CHeapBitMap* ro_ptrmap,
-                                       ArchiveMappedHeapInfo* mapped_heap_info,
-                                       ArchiveStreamedHeapInfo* streamed_heap_info,
+                                       AOTMappedHeapInfo* mapped_heap_info,
+                                       AOTStreamedHeapInfo* streamed_heap_info,
                                        size_t &size_in_bytes) {
   size_t removed_rw_leading_zeros = remove_bitmap_zeros(rw_ptrmap);
   size_t removed_ro_leading_zeros = remove_bitmap_zeros(ro_ptrmap);
@@ -1035,7 +1035,7 @@ char* FileMapInfo::write_bitmap_region(CHeapBitMap* rw_ptrmap,
 }
 
 #if INCLUDE_CDS_JAVA_HEAP
-size_t FileMapInfo::write_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) {
+size_t FileMapInfo::write_mapped_heap_region(AOTMappedHeapInfo* heap_info) {
   char* buffer_start = heap_info->buffer_start();
   size_t buffer_size = heap_info->buffer_byte_size();
   write_region(AOTMetaspace::hp, buffer_start, buffer_size, false, false);
@@ -1043,7 +1043,7 @@ size_t FileMapInfo::write_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) {
   return buffer_size;
 }
 
-size_t FileMapInfo::write_streamed_heap_region(ArchiveStreamedHeapInfo* heap_info) {
+size_t FileMapInfo::write_streamed_heap_region(AOTStreamedHeapInfo* heap_info) {
   char* buffer_start = heap_info->buffer_start();
   size_t buffer_size = heap_info->buffer_byte_size();
   write_region(AOTMetaspace::hp, buffer_start, buffer_size, true, false);
@@ -1325,9 +1325,7 @@ char* FileMapInfo::map_auxiliary_region(int region_index, bool read_only) {
 
   if (VerifySharedSpaces && !r->check_region_crc(mapped_base)) {
     aot_log_error(aot)("region %d CRC error", region_index);
-    if (!os::unmap_memory(mapped_base, r->used_aligned())) {
-      fatal("os::unmap_memory of region %d failed", region_index);
-    }
+    os::unmap_memory(mapped_base, r->used_aligned());
     return nullptr;
   }
 
@@ -1654,9 +1652,7 @@ void FileMapInfo::unmap_region(int i) {
         // is released. Zero it so that we don't accidentally read its content.
         aot_log_info(aot)("Region #%d (%s) is in a reserved space, it will be freed when the space is released", i, shared_region_name[i]);
       } else {
-        if (!os::unmap_memory(mapped_base, size)) {
-          fatal("os::unmap_memory failed");
-        }
+        os::unmap_memory(mapped_base, size);
       }
     }
     r->set_mapped_base(nullptr);
@@ -1767,10 +1763,6 @@ void FileMapInfo::print(outputStream* st) const {
   }
 }
 
-void FileMapHeader::set_as_offset(char* p, size_t *offset) {
-  *offset = ArchiveBuilder::current()->any_to_offset((address)p);
-}
-
 int FileMapHeader::compute_crc() {
   char* start = (char*)this;
   // start computing from the field after _header_size to end of base archive name.
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index fbd3c8e1681..56b88df378a 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,10 @@
 #ifndef SHARE_CDS_FILEMAP_HPP
 #define SHARE_CDS_FILEMAP_HPP
 
+#include "cds/aotCompressedPointers.hpp"
+#include "cds/aotMappedHeap.hpp"
 #include "cds/aotMetaspace.hpp"
+#include "cds/aotStreamedHeap.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/heapShared.hpp"
 #include "include/cds.h"
@@ -102,7 +105,7 @@ public:
 class FileMapHeader: private CDSFileMapHeaderBase {
   friend class CDSConstants;
   friend class VMStructs;
-
+  using narrowPtr = AOTCompressedPointers::narrowPtr;
 private:
   // The following fields record the states of the VM during dump time.
   // They are compared with the runtime states to see if the archive
@@ -120,16 +123,16 @@ private:
   bool    _compressed_class_ptrs;                 // save the flag UseCompressedClassPointers
   int     _narrow_klass_pointer_bits;             // save number of bits in narrowKlass
   int     _narrow_klass_shift;                    // save shift width used to pre-compute narrowKlass IDs in archived heap objects
-  size_t  _cloned_vtables_offset;                 // The address of the first cloned vtable
-  size_t  _early_serialized_data_offset;          // Data accessed using {ReadClosure,WriteClosure}::serialize()
-  size_t  _serialized_data_offset;                // Data accessed using {ReadClosure,WriteClosure}::serialize()
+  narrowPtr _cloned_vtables;                      // The address of the first cloned vtable
+  narrowPtr _early_serialized_data;               // Data accessed using {ReadClosure,WriteClosure}::serialize()
+  narrowPtr _serialized_data;                     // Data accessed using {ReadClosure,WriteClosure}::serialize()
 
   // The following fields are all sanity checks for whether this archive
   // will function correctly with this JVM and the bootclasspath it's
   // invoked with.
   char  _jvm_ident[JVM_IDENT_MAX];  // identifier string of the jvm that created this dump
 
-  size_t _class_location_config_offset;
+  narrowPtr _class_location_config;
 
   bool   _verify_local;                 // BytecodeVerificationLocal setting
   bool   _verify_remote;                // BytecodeVerificationRemote setting
@@ -144,8 +147,8 @@ private:
   size_t _rw_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the rw region
   size_t _ro_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the ro region
 
-  ArchiveMappedHeapHeader _mapped_heap_header;
-  ArchiveStreamedHeapHeader _streamed_heap_header;
+  AOTMappedHeapHeader _mapped_heap_header;
+  AOTStreamedHeapHeader _streamed_heap_header;
 
   // The following are parameters that affect MethodData layout.
   u1      _compiler_type;
@@ -158,12 +161,8 @@ private:
   bool    _type_profile_casts;
   int     _spec_trap_limit_extra_entries;
 
-  template <typename T> T from_mapped_offset(size_t offset) const {
-    return (T)(mapped_base_address() + offset);
-  }
-  void set_as_offset(char* p, size_t *offset);
-  template <typename T> void set_as_offset(T p, size_t *offset) {
-    set_as_offset((char*)p, offset);
+  template <typename T> T decode(narrowPtr narrowp) const {
+    return AOTCompressedPointers::decode_not_null<T>(narrowp, reinterpret_cast<address>(mapped_base_address()));
   }
 
 public:
@@ -191,9 +190,9 @@ public:
   bool compact_headers()                   const { return _compact_headers; }
   uintx max_heap_size()                    const { return _max_heap_size; }
   CompressedOops::Mode narrow_oop_mode()   const { return _narrow_oop_mode; }
-  char* cloned_vtables()                   const { return from_mapped_offset<char*>(_cloned_vtables_offset); }
-  char* early_serialized_data()            const { return from_mapped_offset<char*>(_early_serialized_data_offset); }
-  char* serialized_data()                  const { return from_mapped_offset<char*>(_serialized_data_offset); }
+  char* cloned_vtables()                   const { return decode<char*>(_cloned_vtables); }
+  char* early_serialized_data()            const { return decode<char*>(_early_serialized_data); }
+  char* serialized_data()                  const { return decode<char*>(_serialized_data); }
   bool object_streaming_mode()             const { return _object_streaming_mode; }
   const char* jvm_ident()                  const { return _jvm_ident; }
   char* requested_base_address()           const { return _requested_base_address; }
@@ -209,16 +208,16 @@ public:
   size_t ro_ptrmap_start_pos()             const { return _ro_ptrmap_start_pos; }
 
   // Heap archiving
-  const ArchiveMappedHeapHeader*   mapped_heap()   const { return &_mapped_heap_header; }
-  const ArchiveStreamedHeapHeader* streamed_heap() const { return &_streamed_heap_header; }
+  const AOTMappedHeapHeader*   mapped_heap()   const { return &_mapped_heap_header; }
+  const AOTStreamedHeapHeader* streamed_heap() const { return &_streamed_heap_header; }
 
-  void set_streamed_heap_header(ArchiveStreamedHeapHeader header) { _streamed_heap_header = header; }
-  void set_mapped_heap_header(ArchiveMappedHeapHeader header) { _mapped_heap_header = header; }
+  void set_streamed_heap_header(AOTStreamedHeapHeader header) { _streamed_heap_header = header; }
+  void set_mapped_heap_header(AOTMappedHeapHeader header) { _mapped_heap_header = header; }
 
   void set_has_platform_or_app_classes(bool v)   { _has_platform_or_app_classes = v; }
-  void set_cloned_vtables(char* p)               { set_as_offset(p, &_cloned_vtables_offset); }
-  void set_early_serialized_data(char* p)        { set_as_offset(p, &_early_serialized_data_offset); }
-  void set_serialized_data(char* p)              { set_as_offset(p, &_serialized_data_offset); }
+  void set_cloned_vtables(char* p)               { _cloned_vtables = AOTCompressedPointers::encode_not_null(p); }
+  void set_early_serialized_data(char* p)        { _early_serialized_data = AOTCompressedPointers::encode_not_null(p); }
+  void set_serialized_data(char* p)              { _serialized_data = AOTCompressedPointers::encode_not_null(p); }
   void set_mapped_base_address(char* p)          { _mapped_base_address = p; }
   void set_rw_ptrmap_start_pos(size_t n)         { _rw_ptrmap_start_pos = n; }
   void set_ro_ptrmap_start_pos(size_t n)         { _ro_ptrmap_start_pos = n; }
@@ -226,11 +225,11 @@ public:
   void copy_base_archive_name(const char* name);
 
   void set_class_location_config(AOTClassLocationConfig* table) {
-    set_as_offset(table, &_class_location_config_offset);
+    _class_location_config = AOTCompressedPointers::encode_not_null(table);
   }
 
   AOTClassLocationConfig* class_location_config() {
-    return from_mapped_offset<AOTClassLocationConfig*>(_class_location_config_offset);
+    return decode<AOTClassLocationConfig*>(_class_location_config);
   }
 
   void set_requested_base(char* b) {
@@ -309,8 +308,8 @@ public:
   uintx   max_heap_size()      const { return header()->max_heap_size(); }
   size_t  core_region_alignment() const { return header()->core_region_alignment(); }
 
-  const ArchiveMappedHeapHeader*   mapped_heap()   const { return header()->mapped_heap(); }
-  const ArchiveStreamedHeapHeader* streamed_heap() const { return header()->streamed_heap(); }
+  const AOTMappedHeapHeader*   mapped_heap()   const { return header()->mapped_heap(); }
+  const AOTStreamedHeapHeader* streamed_heap() const { return header()->streamed_heap(); }
 
   bool object_streaming_mode()                const { return header()->object_streaming_mode(); }
   CompressedOops::Mode narrow_oop_mode()      const { return header()->narrow_oop_mode(); }
@@ -372,11 +371,11 @@ public:
   size_t remove_bitmap_zeros(CHeapBitMap* map);
   char* write_bitmap_region(CHeapBitMap* rw_ptrmap,
                             CHeapBitMap* ro_ptrmap,
-                            ArchiveMappedHeapInfo* mapped_heap_info,
-                            ArchiveStreamedHeapInfo* streamed_heap_info,
+                            AOTMappedHeapInfo* mapped_heap_info,
+                            AOTStreamedHeapInfo* streamed_heap_info,
                             size_t &size_in_bytes);
-  size_t write_mapped_heap_region(ArchiveMappedHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN_(0);
-  size_t write_streamed_heap_region(ArchiveStreamedHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN_(0);
+  size_t write_mapped_heap_region(AOTMappedHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN_(0);
+  size_t write_streamed_heap_region(AOTStreamedHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN_(0);
   void  write_bytes(const void* buffer, size_t count);
   void  write_bytes_aligned(const void* buffer, size_t count);
   size_t  read_bytes(void* buffer, size_t count);
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index fdc335f3799..0c0f70eac0a 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotLogging.hpp"
 #include "cds/aotMappedHeapLoader.hpp"
 #include "cds/aotMappedHeapWriter.hpp"
@@ -95,55 +96,6 @@ struct ArchivableStaticFieldInfo {
   }
 };
 
-// Anything that goes in the header must be thoroughly purged from uninitialized memory
-// as it will be written to disk. Therefore, the constructors memset the memory to 0.
-// This is not the prettiest thing, but we need to know every byte is initialized,
-// including potential padding between fields.
-
-ArchiveMappedHeapHeader::ArchiveMappedHeapHeader(size_t ptrmap_start_pos,
-                                                 size_t oopmap_start_pos,
-                                                 HeapRootSegments root_segments) {
-  memset((char*)this, 0, sizeof(*this));
-  _ptrmap_start_pos = ptrmap_start_pos;
-  _oopmap_start_pos = oopmap_start_pos;
-  _root_segments = root_segments;
-}
-
-ArchiveMappedHeapHeader::ArchiveMappedHeapHeader() {
-  memset((char*)this, 0, sizeof(*this));
-}
-
-ArchiveMappedHeapHeader ArchiveMappedHeapInfo::create_header() {
-  return ArchiveMappedHeapHeader{_ptrmap_start_pos,
-                                 _oopmap_start_pos,
-                                 _root_segments};
-}
-
-ArchiveStreamedHeapHeader::ArchiveStreamedHeapHeader(size_t forwarding_offset,
-                                                     size_t roots_offset,
-                                                     size_t num_roots,
-                                                     size_t root_highest_object_index_table_offset,
-                                                     size_t num_archived_objects) {
-  memset((char*)this, 0, sizeof(*this));
-  _forwarding_offset = forwarding_offset;
-  _roots_offset = roots_offset;
-  _num_roots = num_roots;
-  _root_highest_object_index_table_offset = root_highest_object_index_table_offset;
-  _num_archived_objects = num_archived_objects;
-}
-
-ArchiveStreamedHeapHeader::ArchiveStreamedHeapHeader() {
-  memset((char*)this, 0, sizeof(*this));
-}
-
-ArchiveStreamedHeapHeader ArchiveStreamedHeapInfo::create_header() {
-  return ArchiveStreamedHeapHeader{_forwarding_offset,
-                                   _roots_offset,
-                                   _num_roots,
-                                   _root_highest_object_index_table_offset,
-                                   _num_archived_objects};
-}
-
 HeapArchiveMode HeapShared::_heap_load_mode = HeapArchiveMode::_uninitialized;
 HeapArchiveMode HeapShared::_heap_write_mode = HeapArchiveMode::_uninitialized;
 
@@ -210,7 +162,7 @@ static bool is_subgraph_root_class_of(ArchivableStaticFieldInfo fields[], Instan
 
 bool HeapShared::is_subgraph_root_class(InstanceKlass* ik) {
   assert(CDSConfig::is_dumping_heap(), "dump-time only");
-  if (!CDSConfig::is_dumping_aot_linked_classes()) {
+  if (CDSConfig::is_dumping_klass_subgraphs()) {
     // Legacy CDS archive support (to be deprecated)
     return is_subgraph_root_class_of(archive_subgraph_entry_fields, ik) ||
            is_subgraph_root_class_of(fmg_archive_subgraph_entry_fields, ik);
@@ -295,6 +247,28 @@ void HeapShared::reset_archived_object_states(TRAPS) {
   reset_states(boot_loader(), CHECK);
 }
 
+void HeapShared::ensure_determinism(TRAPS) {
+  TempNewSymbol class_name = SymbolTable::new_symbol("jdk/internal/util/WeakReferenceKey");
+  TempNewSymbol method_name = SymbolTable::new_symbol("ensureDeterministicAOTCache");
+
+  Klass* weak_ref_key_class = SystemDictionary::resolve_or_fail(class_name, true, CHECK);
+  precond(weak_ref_key_class != nullptr);
+
+  log_debug(aot)("Calling WeakReferenceKey::ensureDeterministicAOTCache(Object.class)");
+  JavaValue result(T_BOOLEAN);
+  JavaCalls::call_static(&result,
+                         weak_ref_key_class,
+                         method_name,
+                         vmSymbols::void_boolean_signature(),
+                         CHECK);
+  assert(result.get_jboolean() == false, "sanity");
+}
+
+void HeapShared::prepare_for_archiving(TRAPS) {
+  reset_archived_object_states(CHECK);
+  ensure_determinism(CHECK);
+}
+
 HeapShared::ArchivedObjectCache* HeapShared::_archived_object_cache = nullptr;
 
 bool HeapShared::is_archived_heap_in_use() {
@@ -413,6 +387,8 @@ void HeapShared::materialize_thread_object() {
 void HeapShared::add_to_dumped_interned_strings(oop string) {
   assert(HeapShared::is_writing_mapping_mode(), "Only used by this mode");
   AOTMappedHeapWriter::add_to_dumped_interned_strings(string);
+  bool success = archive_reachable_objects_from(1, _dump_time_special_subgraph, string);
+  assert(success, "shared strings array must not point to arrays or strings that are too large to archive");
 }
 
 void HeapShared::finalize_initialization(FileMapInfo* static_mapinfo) {
@@ -453,7 +429,6 @@ int HeapShared::append_root(oop obj) {
 
 oop HeapShared::get_root(int index, bool clear) {
   assert(index >= 0, "sanity");
-  assert(!CDSConfig::is_dumping_heap() && CDSConfig::is_using_archive(), "runtime only");
   assert(is_archived_heap_in_use(), "getting roots into heap that is not used");
 
   oop result;
@@ -598,8 +573,7 @@ public:
   void set_oop(MetaspaceObj* ptr, oop o) {
     MutexLocker ml(ScratchObjects_lock, Mutex::_no_safepoint_check_flag);
     OopHandle handle(Universe::vm_global(), o);
-    bool is_new = put(ptr, handle);
-    assert(is_new, "cannot set twice");
+    put_when_absent(ptr, handle);
   }
   void remove_oop(MetaspaceObj* ptr) {
     MutexLocker ml(ScratchObjects_lock, Mutex::_no_safepoint_check_flag);
@@ -612,6 +586,11 @@ public:
 };
 
 void HeapShared::add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) {
+  if (CDSConfig::is_dumping_preimage_static_archive() && scratch_resolved_references(src) != nullptr) {
+    // We are in AOT training run. The class has been redefined and we are giving it a new resolved_reference.
+    // Ignore it, as this class will be excluded from the AOT config.
+    return;
+  }
   if (SystemDictionaryShared::is_builtin_loader(src->pool_holder()->class_loader_data())) {
     _scratch_objects_table->set_oop(src, dest);
   }
@@ -831,14 +810,6 @@ static objArrayOop get_archived_resolved_references(InstanceKlass* src_ik) {
   return nullptr;
 }
 
-void HeapShared::archive_strings() {
-  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
-  oop shared_strings_array = StringTable::init_shared_strings_array();
-  bool success = archive_reachable_objects_from(1, _dump_time_special_subgraph, shared_strings_array);
-  assert(success, "shared strings array must not point to arrays or strings that are too large to archive");
-  StringTable::set_shared_strings_array_index(append_root(shared_strings_array));
-}
-
 int HeapShared::archive_exception_instance(oop exception) {
   bool success = archive_reachable_objects_from(1, _dump_time_special_subgraph, exception);
   assert(success, "sanity");
@@ -890,12 +861,12 @@ void HeapShared::start_scanning_for_oops() {
 
 void HeapShared::end_scanning_for_oops() {
   if (is_writing_mapping_mode()) {
-    archive_strings();
+    StringTable::init_shared_table();
   }
   delete_seen_objects_table();
 }
 
-void HeapShared::write_heap(ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info) {
+void HeapShared::write_heap(AOTMappedHeapInfo* mapped_heap_info, AOTStreamedHeapInfo* streamed_heap_info) {
   {
     NoSafepointVerifier nsv;
     CDSHeapVerifier::verify();
@@ -940,7 +911,7 @@ void HeapShared::scan_java_class(Klass* orig_k) {
 void HeapShared::archive_subgraphs() {
   assert(CDSConfig::is_dumping_heap(), "must be");
 
-  if (!CDSConfig::is_dumping_aot_linked_classes()) {
+  if (CDSConfig::is_dumping_klass_subgraphs()) {
     archive_object_subgraphs(archive_subgraph_entry_fields,
                              false /* is_full_module_graph */);
     if (CDSConfig::is_dumping_full_module_graph()) {
@@ -948,10 +919,6 @@ void HeapShared::archive_subgraphs() {
                                true /* is_full_module_graph */);
     }
   }
-
-  if (CDSConfig::is_dumping_full_module_graph()) {
-    Modules::verify_archived_modules();
-  }
 }
 
 //
@@ -1204,8 +1171,7 @@ public:
       ArchivedKlassSubGraphInfoRecord* record = HeapShared::archive_subgraph_info(&info);
       Klass* buffered_k = ArchiveBuilder::get_buffered_klass(klass);
       unsigned int hash = SystemDictionaryShared::hash_for_shared_dictionary((address)buffered_k);
-      u4 delta = ArchiveBuilder::current()->any_to_offset_u4(record);
-      _writer->add(hash, delta);
+      _writer->add(hash, AOTCompressedPointers::encode_not_null(record));
     }
     return true; // keep on iterating
   }
@@ -1302,10 +1268,7 @@ static void verify_the_heap(Klass* k, const char* which) {
 // this case, we will not load the ArchivedKlassSubGraphInfoRecord and will clear its roots.
 void HeapShared::resolve_classes(JavaThread* current) {
   assert(CDSConfig::is_using_archive(), "runtime only!");
-  if (!is_archived_heap_in_use()) {
-    return; // nothing to do
-  }
-  if (!CDSConfig::is_using_aot_linked_classes()) {
+  if (CDSConfig::is_using_klass_subgraphs()) {
     resolve_classes_for_subgraphs(current, archive_subgraph_entry_fields);
     resolve_classes_for_subgraphs(current, fmg_archive_subgraph_entry_fields);
   }
@@ -1395,7 +1358,7 @@ void HeapShared::init_classes_for_special_subgraph(Handle class_loader, TRAPS) {
 
 void HeapShared::initialize_from_archived_subgraph(JavaThread* current, Klass* k) {
   JavaThread* THREAD = current;
-  if (!is_archived_heap_in_use()) {
+  if (!CDSConfig::is_using_klass_subgraphs()) {
     return; // nothing to do
   }
 
@@ -1871,7 +1834,7 @@ void HeapShared::archive_reachable_objects_from_static_field(InstanceKlass *k,
                                                              const char* klass_name,
                                                              int field_offset,
                                                              const char* field_name) {
-  assert(CDSConfig::is_dumping_heap(), "dump time only");
+  precond(CDSConfig::is_dumping_klass_subgraphs());
   assert(k->defined_by_boot_loader(), "must be boot class");
 
   oop m = k->java_mirror();
@@ -1922,7 +1885,7 @@ class VerifySharedOopClosure: public BasicOopIterateClosure {
 };
 
 void HeapShared::verify_subgraph_from_static_field(InstanceKlass* k, int field_offset) {
-  assert(CDSConfig::is_dumping_heap(), "dump time only");
+  precond(CDSConfig::is_dumping_klass_subgraphs());
   assert(k->defined_by_boot_loader(), "must be boot class");
 
   oop m = k->java_mirror();
@@ -2148,7 +2111,7 @@ void HeapShared::init_subgraph_entry_fields(ArchivableStaticFieldInfo fields[],
 void HeapShared::init_subgraph_entry_fields(TRAPS) {
   assert(CDSConfig::is_dumping_heap(), "must be");
   _dump_time_subgraph_info_table = new (mtClass)DumpTimeKlassSubGraphInfoTable();
-  if (!CDSConfig::is_dumping_aot_linked_classes()) {
+  if (CDSConfig::is_dumping_klass_subgraphs()) {
     init_subgraph_entry_fields(archive_subgraph_entry_fields, CHECK);
     if (CDSConfig::is_dumping_full_module_graph()) {
       init_subgraph_entry_fields(fmg_archive_subgraph_entry_fields, CHECK);
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index 118c60faa60..2cb330160e4 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -142,129 +142,6 @@ enum class HeapArchiveMode {
   _streaming
 };
 
-class ArchiveMappedHeapHeader {
-  size_t           _ptrmap_start_pos; // The first bit in the ptrmap corresponds to this position in the heap.
-  size_t           _oopmap_start_pos; // The first bit in the oopmap corresponds to this position in the heap.
-  HeapRootSegments _root_segments;    // Heap root segments info
-
-public:
-  ArchiveMappedHeapHeader();
-  ArchiveMappedHeapHeader(size_t ptrmap_start_pos,
-                          size_t oopmap_start_pos,
-                          HeapRootSegments root_segments);
-
-  size_t ptrmap_start_pos() const { return _ptrmap_start_pos; }
-  size_t oopmap_start_pos() const { return _oopmap_start_pos; }
-  HeapRootSegments root_segments() const { return _root_segments; }
-
-  // This class is trivially copyable and assignable.
-  ArchiveMappedHeapHeader(const ArchiveMappedHeapHeader&) = default;
-  ArchiveMappedHeapHeader& operator=(const ArchiveMappedHeapHeader&) = default;
-};
-
-
-class ArchiveStreamedHeapHeader {
-  size_t _forwarding_offset;                      // Offset of forwarding information in the heap region.
-  size_t _roots_offset;                           // Start position for the roots
-  size_t _root_highest_object_index_table_offset; // Offset of root dfs depth information
-  size_t _num_roots;                              // Number of embedded roots
-  size_t _num_archived_objects;                   // The number of archived heap objects
-
-public:
-  ArchiveStreamedHeapHeader();
-  ArchiveStreamedHeapHeader(size_t forwarding_offset,
-                            size_t roots_offset,
-                            size_t num_roots,
-                            size_t root_highest_object_index_table_offset,
-                            size_t num_archived_objects);
-
-  size_t forwarding_offset() const { return _forwarding_offset; }
-  size_t roots_offset() const { return _roots_offset; }
-  size_t num_roots() const { return _num_roots; }
-  size_t root_highest_object_index_table_offset() const { return _root_highest_object_index_table_offset; }
-  size_t num_archived_objects() const { return _num_archived_objects; }
-
-  // This class is trivially copyable and assignable.
-  ArchiveStreamedHeapHeader(const ArchiveStreamedHeapHeader&) = default;
-  ArchiveStreamedHeapHeader& operator=(const ArchiveStreamedHeapHeader&) = default;
-};
-
-class ArchiveMappedHeapInfo {
-  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
-  CHeapBitMap _oopmap;
-  CHeapBitMap _ptrmap;
-  HeapRootSegments _root_segments;
-  size_t _oopmap_start_pos;             // How many zeros were removed from the beginning of the bit map?
-  size_t _ptrmap_start_pos;             // How many zeros were removed from the beginning of the bit map?
-
-public:
-  ArchiveMappedHeapInfo() :
-    _buffer_region(),
-    _oopmap(128, mtClassShared),
-    _ptrmap(128, mtClassShared),
-    _root_segments(),
-    _oopmap_start_pos(),
-    _ptrmap_start_pos() {}
-  bool is_used() { return !_buffer_region.is_empty(); }
-
-  MemRegion buffer_region() { return _buffer_region; }
-  void set_buffer_region(MemRegion r) { _buffer_region = r; }
-
-  char* buffer_start() { return (char*)_buffer_region.start(); }
-  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
-
-  CHeapBitMap* oopmap() { return &_oopmap; }
-  CHeapBitMap* ptrmap() { return &_ptrmap; }
-
-  void set_oopmap_start_pos(size_t start_pos) { _oopmap_start_pos = start_pos; }
-  void set_ptrmap_start_pos(size_t start_pos) { _ptrmap_start_pos = start_pos; }
-
-  void set_root_segments(HeapRootSegments segments) { _root_segments = segments; };
-  HeapRootSegments root_segments() { return _root_segments; }
-
-  ArchiveMappedHeapHeader create_header();
-};
-
-class ArchiveStreamedHeapInfo {
-  MemRegion _buffer_region;             // Contains the archived objects to be written into the CDS archive.
-  CHeapBitMap _oopmap;
-  size_t _roots_offset;                 // Offset of the HeapShared::roots() object, from the bottom
-                                        // of the archived heap objects, in bytes.
-  size_t _num_roots;
-
-  size_t _forwarding_offset;            // Offset of forwarding information from the bottom
-  size_t _root_highest_object_index_table_offset; // Offset to root dfs depth information
-  size_t _num_archived_objects;         // The number of archived objects written into the CDS archive.
-
-public:
-  ArchiveStreamedHeapInfo()
-    : _buffer_region(),
-      _oopmap(128, mtClassShared),
-      _roots_offset(),
-      _forwarding_offset(),
-      _root_highest_object_index_table_offset(),
-      _num_archived_objects() {}
-
-  bool is_used() { return !_buffer_region.is_empty(); }
-
-  void set_buffer_region(MemRegion r) { _buffer_region = r; }
-  MemRegion buffer_region() { return _buffer_region; }
-  char* buffer_start() { return (char*)_buffer_region.start(); }
-  size_t buffer_byte_size() { return _buffer_region.byte_size();    }
-
-  CHeapBitMap* oopmap() { return &_oopmap; }
-  void set_roots_offset(size_t n) { _roots_offset = n; }
-  size_t roots_offset() { return _roots_offset; }
-  void set_num_roots(size_t n) { _num_roots = n; }
-  size_t num_roots() { return _num_roots; }
-  void set_forwarding_offset(size_t n) { _forwarding_offset = n; }
-  void set_root_highest_object_index_table_offset(size_t n) { _root_highest_object_index_table_offset = n; }
-  void set_num_archived_objects(size_t n) { _num_archived_objects = n; }
-  size_t num_archived_objects() { return _num_archived_objects; }
-
-  ArchiveStreamedHeapHeader create_header();
-};
-
 class HeapShared: AllStatic {
   friend class VerifySharedOopClosure;
 
@@ -478,7 +355,6 @@ private:
 
   static bool has_been_archived(oop orig_obj);
   static void prepare_resolved_references();
-  static void archive_strings();
   static void archive_subgraphs();
   static void copy_java_mirror(oop orig_mirror, oop scratch_m);
 
@@ -506,8 +382,10 @@ private:
   static bool walk_one_object(PendingOopStack* stack, int level, KlassSubGraphInfo* subgraph_info,
                               oop orig_obj, oop referrer);
 
- public:
   static void reset_archived_object_states(TRAPS);
+  static void ensure_determinism(TRAPS);
+ public:
+  static void prepare_for_archiving(TRAPS);
   static void create_archived_object_cache() {
     _archived_object_cache =
       new (mtClass)ArchivedObjectCache(INITIAL_TABLE_SIZE, MAX_TABLE_SIZE);
@@ -576,7 +454,7 @@ private:
  public:
   static void finish_materialize_objects() NOT_CDS_JAVA_HEAP_RETURN;
 
-  static void write_heap(ArchiveMappedHeapInfo* mapped_heap_info, ArchiveStreamedHeapInfo* streamed_heap_info) NOT_CDS_JAVA_HEAP_RETURN;
+  static void write_heap(AOTMappedHeapInfo* mapped_heap_info, AOTStreamedHeapInfo* streamed_heap_info) NOT_CDS_JAVA_HEAP_RETURN;
   static objArrayOop scratch_resolved_references(ConstantPool* src);
   static void add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) NOT_CDS_JAVA_HEAP_RETURN;
   static void init_dumping() NOT_CDS_JAVA_HEAP_RETURN;
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
index 19dae28c5b5..3ff5705b79d 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotClassFilter.hpp"
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
@@ -52,7 +53,7 @@
 #include "runtime/mutexLocker.hpp"
 
 GrowableArrayCHeap<char*, mtClassShared>* LambdaFormInvokers::_lambdaform_lines = nullptr;
-Array<u4>*  LambdaFormInvokers::_static_archive_invokers = nullptr;
+Array<AOTCompressedPointers::narrowPtr>*  LambdaFormInvokers::_static_archive_invokers = nullptr;
 static bool _stop_appending = false;
 
 #define NUM_FILTER 4
@@ -252,7 +253,7 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
       }
     }
     if (count > 0) {
-      _static_archive_invokers = ArchiveBuilder::new_ro_array<u4>(count);
+      _static_archive_invokers = ArchiveBuilder::new_ro_array<narrowPtr>(count);
       int index = 0;
       for (int i = 0; i < len; i++) {
         char* str = _lambdaform_lines->at(i);
@@ -261,7 +262,7 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
           Array<char>* line = ArchiveBuilder::new_ro_array<char>((int)str_len);
           strncpy(line->adr_at(0), str, str_len);
 
-          _static_archive_invokers->at_put(index, ArchiveBuilder::current()->any_to_offset_u4(line));
+          _static_archive_invokers->at_put(index, AOTCompressedPointers::encode_not_null(line));
           index++;
         }
       }
@@ -274,8 +275,8 @@ void LambdaFormInvokers::dump_static_archive_invokers() {
 void LambdaFormInvokers::read_static_archive_invokers() {
   if (_static_archive_invokers != nullptr) {
     for (int i = 0; i < _static_archive_invokers->length(); i++) {
-      u4 offset = _static_archive_invokers->at(i);
-      Array<char>* line = ArchiveUtils::offset_to_archived_address<Array<char>*>(offset);
+      narrowPtr encoded = _static_archive_invokers->at(i);
+      Array<char>* line = AOTCompressedPointers::decode_not_null<Array<char>*>(encoded);
       char* str = line->adr_at(0);
       append(str);
     }
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.hpp b/src/hotspot/share/cds/lambdaFormInvokers.hpp
index 583a863a1c2..9b91850f5b1 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.hpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 
 #ifndef SHARE_CDS_LAMBDAFORMINVOKERS_HPP
 #define SHARE_CDS_LAMBDAFORMINVOKERS_HPP
+
+#include "cds/aotCompressedPointers.hpp"
 #include "memory/allStatic.hpp"
 #include "oops/oopHandle.hpp"
 #include "runtime/handles.hpp"
@@ -35,10 +37,11 @@ class Array;
 class SerializeClosure;
 
 class LambdaFormInvokers : public AllStatic {
+  using narrowPtr = AOTCompressedPointers::narrowPtr;
  private:
   static GrowableArrayCHeap<char*, mtClassShared>* _lambdaform_lines;
   // For storing LF form lines (LF_RESOLVE only) in read only table.
-  static Array<u4>* _static_archive_invokers;
+  static Array<narrowPtr>* _static_archive_invokers;
   static void regenerate_class(char* name, ClassFileStream& st, TRAPS);
  public:
   static void append(char* line);
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index d091067c116..4d212dbf2c2 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotClassFilter.hpp"
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsProtectionDomain.hpp"
@@ -49,11 +50,11 @@ unsigned int LambdaProxyClassKey::hash() const {
 }
 
 unsigned int RunTimeLambdaProxyClassKey::hash() const {
-  return primitive_hash<u4>(_caller_ik) +
-         primitive_hash<u4>(_invoked_name) +
-         primitive_hash<u4>(_invoked_type) +
-         primitive_hash<u4>(_method_type) +
-         primitive_hash<u4>(_instantiated_method_type);
+  return primitive_hash<u4>(cast_to_u4(_caller_ik)) +
+         primitive_hash<u4>(cast_to_u4(_invoked_name)) +
+         primitive_hash<u4>(cast_to_u4(_invoked_type)) +
+         primitive_hash<u4>(cast_to_u4(_method_type)) +
+         primitive_hash<u4>(cast_to_u4(_instantiated_method_type));
 }
 
 #ifndef PRODUCT
@@ -71,12 +72,12 @@ void LambdaProxyClassKey::print_on(outputStream* st) const {
 void RunTimeLambdaProxyClassKey::print_on(outputStream* st) const {
   ResourceMark rm;
   st->print_cr("LambdaProxyClassKey       : " INTPTR_FORMAT " hash: %0x08x", p2i(this), hash());
-  st->print_cr("_caller_ik                : %d", _caller_ik);
-  st->print_cr("_instantiated_method_type : %d", _instantiated_method_type);
-  st->print_cr("_invoked_name             : %d", _invoked_name);
-  st->print_cr("_invoked_type             : %d", _invoked_type);
-  st->print_cr("_member_method            : %d", _member_method);
-  st->print_cr("_method_type              : %d", _method_type);
+  st->print_cr("_caller_ik                : %d", cast_to_u4(_caller_ik));
+  st->print_cr("_instantiated_method_type : %d", cast_to_u4(_instantiated_method_type));
+  st->print_cr("_invoked_name             : %d", cast_to_u4(_invoked_name));
+  st->print_cr("_invoked_type             : %d", cast_to_u4(_invoked_type));
+  st->print_cr("_member_method            : %d", cast_to_u4(_member_method));
+  st->print_cr("_method_type              : %d", cast_to_u4(_method_type));
 }
 
 void RunTimeLambdaProxyClassInfo::print_on(outputStream* st) const {
@@ -418,8 +419,7 @@ public:
         (RunTimeLambdaProxyClassInfo*)ArchiveBuilder::ro_region_alloc(byte_size);
     runtime_info->init(key, info);
     unsigned int hash = runtime_info->hash();
-    u4 delta = _builder->any_to_offset_u4((void*)runtime_info);
-    _writer->add(hash, delta);
+    _writer->add(hash, AOTCompressedPointers::encode_not_null(runtime_info));
     return true;
   }
 };
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
index 91e508bfdc5..dfb75532917 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,9 @@
 #ifndef SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
 #define SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotMetaspace.hpp"
-#include "cds/archiveBuilder.hpp"
+#include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "utilities/growableArray.hpp"
@@ -132,19 +133,20 @@ public:
 };
 
 class RunTimeLambdaProxyClassKey {
-  u4 _caller_ik;
-  u4 _invoked_name;
-  u4 _invoked_type;
-  u4 _method_type;
-  u4 _member_method;
-  u4 _instantiated_method_type;
+  using narrowPtr = AOTCompressedPointers::narrowPtr;
+  narrowPtr _caller_ik;
+  narrowPtr _invoked_name;
+  narrowPtr _invoked_type;
+  narrowPtr _method_type;
+  narrowPtr _member_method;
+  narrowPtr _instantiated_method_type;
 
-  RunTimeLambdaProxyClassKey(u4 caller_ik,
-                             u4 invoked_name,
-                             u4 invoked_type,
-                             u4 method_type,
-                             u4 member_method,
-                             u4 instantiated_method_type) :
+  RunTimeLambdaProxyClassKey(narrowPtr caller_ik,
+                             narrowPtr invoked_name,
+                             narrowPtr invoked_type,
+                             narrowPtr method_type,
+                             narrowPtr member_method,
+                             narrowPtr instantiated_method_type) :
     _caller_ik(caller_ik),
     _invoked_name(invoked_name),
     _invoked_type(invoked_type),
@@ -154,15 +156,12 @@ class RunTimeLambdaProxyClassKey {
 
 public:
   static RunTimeLambdaProxyClassKey init_for_dumptime(LambdaProxyClassKey& key) {
-    assert(ArchiveBuilder::is_active(), "sanity");
-    ArchiveBuilder* b = ArchiveBuilder::current();
-
-    u4 caller_ik                = b->any_to_offset_u4(key.caller_ik());
-    u4 invoked_name             = b->any_to_offset_u4(key.invoked_name());
-    u4 invoked_type             = b->any_to_offset_u4(key.invoked_type());
-    u4 method_type              = b->any_to_offset_u4(key.method_type());
-    u4 member_method            = b->any_or_null_to_offset_u4(key.member_method()); // could be null
-    u4 instantiated_method_type = b->any_to_offset_u4(key.instantiated_method_type());
+    narrowPtr caller_ik                = AOTCompressedPointers::encode_not_null(key.caller_ik());
+    narrowPtr invoked_name             = AOTCompressedPointers::encode_not_null(key.invoked_name());
+    narrowPtr invoked_type             = AOTCompressedPointers::encode_not_null(key.invoked_type());
+    narrowPtr method_type              = AOTCompressedPointers::encode_not_null(key.method_type());
+    narrowPtr member_method            = AOTCompressedPointers::encode(key.member_method()); // could be null
+    narrowPtr instantiated_method_type = AOTCompressedPointers::encode_not_null(key.instantiated_method_type());
 
     return RunTimeLambdaProxyClassKey(caller_ik, invoked_name, invoked_type, method_type,
                                       member_method, instantiated_method_type);
@@ -176,12 +175,12 @@ public:
                                                      Symbol*        instantiated_method_type) {
     // All parameters must be in shared space, or else you'd get an assert in
     // ArchiveUtils::to_offset().
-    return RunTimeLambdaProxyClassKey(ArchiveUtils::archived_address_to_offset(caller_ik),
-                                      ArchiveUtils::archived_address_to_offset(invoked_name),
-                                      ArchiveUtils::archived_address_to_offset(invoked_type),
-                                      ArchiveUtils::archived_address_to_offset(method_type),
-                                      ArchiveUtils::archived_address_or_null_to_offset(member_method), // could be null
-                                      ArchiveUtils::archived_address_to_offset(instantiated_method_type));
+    return RunTimeLambdaProxyClassKey(AOTCompressedPointers::encode_address_in_cache(caller_ik),
+                                      AOTCompressedPointers::encode_address_in_cache(invoked_name),
+                                      AOTCompressedPointers::encode_address_in_cache(invoked_type),
+                                      AOTCompressedPointers::encode_address_in_cache(method_type),
+                                      AOTCompressedPointers::encode_address_in_cache_or_null(member_method), // could be null
+                                      AOTCompressedPointers::encode_address_in_cache(instantiated_method_type));
   }
 
   unsigned int hash() const;
diff --git a/src/hotspot/share/cds/runTimeClassInfo.cpp b/src/hotspot/share/cds/runTimeClassInfo.cpp
index fe940ca6c18..a1f50ab4ffa 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.cpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,15 @@
  *
  */
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/dumpTimeClassInfo.hpp"
 #include "cds/runTimeClassInfo.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 
 void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
-  ArchiveBuilder* builder = ArchiveBuilder::current();
   InstanceKlass* k = info._klass;
-  _klass_offset = builder->any_to_offset_u4(k);
+  _klass = AOTCompressedPointers::encode_not_null(k);
 
   if (!SystemDictionaryShared::is_builtin(k)) {
     CrcInfo* c = crc();
@@ -50,8 +50,8 @@ void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
     RTVerifierConstraint* vf_constraints = verifier_constraints();
     char* flags = verifier_constraint_flags();
     for (i = 0; i < _num_verifier_constraints; i++) {
-      vf_constraints[i]._name = builder->any_to_offset_u4(info._verifier_constraints->at(i).name());
-      vf_constraints[i]._from_name = builder->any_or_null_to_offset_u4(info._verifier_constraints->at(i).from_name());
+      vf_constraints[i]._name = AOTCompressedPointers::encode_not_null(info._verifier_constraints->at(i).name());
+      vf_constraints[i]._from_name = AOTCompressedPointers::encode(info._verifier_constraints->at(i).from_name());
     }
     for (i = 0; i < _num_verifier_constraints; i++) {
       flags[i] = info._verifier_constraint_flags->at(i);
@@ -61,14 +61,14 @@ void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
   if (_num_loader_constraints > 0) {
     RTLoaderConstraint* ld_constraints = loader_constraints();
     for (i = 0; i < _num_loader_constraints; i++) {
-      ld_constraints[i]._name = builder->any_to_offset_u4(info._loader_constraints->at(i).name());
+      ld_constraints[i]._name = AOTCompressedPointers::encode_not_null(info._loader_constraints->at(i).name());
       ld_constraints[i]._loader_type1 = info._loader_constraints->at(i).loader_type1();
       ld_constraints[i]._loader_type2 = info._loader_constraints->at(i).loader_type2();
     }
   }
 
   if (k->is_hidden() && info.nest_host() != nullptr) {
-    _nest_host_offset = builder->any_to_offset_u4(info.nest_host());
+    _nest_host = AOTCompressedPointers::encode_not_null(info.nest_host());
   }
   if (k->has_archived_enum_objs()) {
     int num = info.num_enum_klass_static_fields();
@@ -83,11 +83,12 @@ void RunTimeClassInfo::init(DumpTimeClassInfo& info) {
 InstanceKlass* RunTimeClassInfo::klass() const {
   if (AOTMetaspace::in_aot_cache(this)) {
     // <this> is inside a mmaped CDS archive.
-    return ArchiveUtils::offset_to_archived_address<InstanceKlass*>(_klass_offset);
+    return AOTCompressedPointers::decode_not_null<InstanceKlass*>(_klass);
   } else {
     // <this> is a temporary copy of a RunTimeClassInfo that's being initialized
     // by the ArchiveBuilder.
-    return ArchiveBuilder::current()->offset_to_buffered<InstanceKlass*>(_klass_offset);
+    size_t byte_offset = AOTCompressedPointers::get_byte_offset(_klass);
+    return ArchiveBuilder::current()->offset_to_buffered<InstanceKlass*>(byte_offset);
   }
 }
 
diff --git a/src/hotspot/share/cds/runTimeClassInfo.hpp b/src/hotspot/share/cds/runTimeClassInfo.hpp
index 371924f9065..d63a04698bb 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.hpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_CDS_RUNTIMECLASSINFO_HPP
 #define SHARE_CDS_RUNTIMECLASSINFO_HPP
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
@@ -41,8 +42,10 @@ class Method;
 class Symbol;
 
 class RunTimeClassInfo {
- public:
- enum : char {
+  using narrowPtr = AOTCompressedPointers::narrowPtr;
+
+public:
+  enum : char {
     FROM_FIELD_IS_PROTECTED = 1 << 0,
     FROM_IS_ARRAY           = 1 << 1,
     FROM_IS_OBJECT          = 1 << 2
@@ -56,19 +59,19 @@ class RunTimeClassInfo {
   // This is different than DumpTimeClassInfo::DTVerifierConstraint. We use
   // u4 instead of Symbol* to save space on 64-bit CPU.
   struct RTVerifierConstraint {
-    u4 _name;
-    u4 _from_name;
-    Symbol* name() { return ArchiveUtils::offset_to_archived_address<Symbol*>(_name); }
+    narrowPtr _name;
+    narrowPtr _from_name;
+    Symbol* name() { return AOTCompressedPointers::decode_not_null<Symbol*>(_name); }
     Symbol* from_name() {
-      return (_from_name == 0) ? nullptr : ArchiveUtils::offset_to_archived_address<Symbol*>(_from_name);
+      return AOTCompressedPointers::decode<Symbol*>(_from_name);
     }
   };
 
   struct RTLoaderConstraint {
-    u4   _name;
+    narrowPtr   _name;
     char _loader_type1;
     char _loader_type2;
-    Symbol* constraint_name() { return ArchiveUtils::offset_to_archived_address<Symbol*>(_name); }
+    Symbol* constraint_name() { return AOTCompressedPointers::decode_not_null<Symbol*>(_name); }
   };
   struct RTEnumKlassStaticFields {
     int _num;
@@ -76,8 +79,8 @@ class RunTimeClassInfo {
   };
 
 private:
-  u4 _klass_offset;
-  u4 _nest_host_offset;
+  narrowPtr _klass;
+  narrowPtr _nest_host;
   int _num_verifier_constraints;
   int _num_loader_constraints;
 
@@ -185,7 +188,7 @@ public:
 
   InstanceKlass* nest_host() {
     assert(!ArchiveBuilder::is_active(), "not called when dumping archive");
-    return ArchiveUtils::offset_to_archived_address_or_null<InstanceKlass*>(_nest_host_offset);
+    return AOTCompressedPointers::decode<InstanceKlass*>(_nest_host); // may be null
   }
 
   RTLoaderConstraint* loader_constraints() {
diff --git a/src/hotspot/share/ci/ciField.cpp b/src/hotspot/share/ci/ciField.cpp
index 19e05784f4d..946fea5346f 100644
--- a/src/hotspot/share/ci/ciField.cpp
+++ b/src/hotspot/share/ci/ciField.cpp
@@ -213,9 +213,13 @@ ciField::ciField(fieldDescriptor *fd) :
          "bootstrap classes must not create & cache unshared fields");
 }
 
-static bool trust_final_non_static_fields(ciInstanceKlass* holder) {
+static bool trust_final_nonstatic_fields(ciInstanceKlass* holder) {
   if (holder == nullptr)
     return false;
+  if (holder->trust_final_fields()) {
+    // Explicit opt-in from system classes
+    return true;
+  }
   // Even if general trusting is disabled, trust system-built closures in these packages.
   if (holder->is_in_package("java/lang/invoke") || holder->is_in_package("sun/invoke") ||
       holder->is_in_package("java/lang/reflect") || holder->is_in_package("jdk/internal/reflect") ||
@@ -230,14 +234,6 @@ static bool trust_final_non_static_fields(ciInstanceKlass* holder) {
   // Trust final fields in records
   if (holder->is_record())
     return true;
-  // Trust Atomic*FieldUpdaters: they are very important for performance, and make up one
-  // more reason not to use Unsafe, if their final fields are trusted. See more in JDK-8140483.
-  if (holder->name() == ciSymbols::java_util_concurrent_atomic_AtomicIntegerFieldUpdater_Impl() ||
-      holder->name() == ciSymbols::java_util_concurrent_atomic_AtomicLongFieldUpdater_CASUpdater() ||
-      holder->name() == ciSymbols::java_util_concurrent_atomic_AtomicLongFieldUpdater_LockedUpdater() ||
-      holder->name() == ciSymbols::java_util_concurrent_atomic_AtomicReferenceFieldUpdater_Impl()) {
-    return true;
-  }
   return TrustFinalNonStaticFields;
 }
 
@@ -263,7 +259,7 @@ void ciField::initialize_from(fieldDescriptor* fd) {
       // An instance field can be constant if it's a final static field or if
       // it's a final non-static field of a trusted class (classes in
       // java.lang.invoke and sun.invoke packages and subpackages).
-      _is_constant = is_stable_field || trust_final_non_static_fields(_holder);
+      _is_constant = is_stable_field || trust_final_nonstatic_fields(_holder);
     }
   } else {
     // For CallSite objects treat the target field as a compile time constant.
diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp
index 64b9acf9146..6243258acd9 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.cpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.cpp
@@ -65,6 +65,7 @@ ciInstanceKlass::ciInstanceKlass(Klass* k) :
   _has_nonstatic_concrete_methods = ik->has_nonstatic_concrete_methods();
   _is_hidden = ik->is_hidden();
   _is_record = ik->is_record();
+  _trust_final_fields = ik->trust_final_fields();
   _nonstatic_fields = nullptr; // initialized lazily by compute_nonstatic_fields:
   _has_injected_fields = -1;
   _implementor = nullptr; // we will fill these lazily
@@ -391,7 +392,7 @@ bool ciInstanceKlass::contains_field_offset(int offset) {
   return get_instanceKlass()->contains_field_offset(offset);
 }
 
-ciField* ciInstanceKlass::get_non_static_field_by_offset(const int field_offset) {
+ciField* ciInstanceKlass::get_nonstatic_field_by_offset(const int field_offset) {
   for (int i = 0, len = nof_nonstatic_fields(); i < len; i++) {
     ciField* field = _nonstatic_fields->at(i);
     int field_off = field->offset_in_bytes();
@@ -405,7 +406,7 @@ ciField* ciInstanceKlass::get_non_static_field_by_offset(const int field_offset)
 // ciInstanceKlass::get_field_by_offset
 ciField* ciInstanceKlass::get_field_by_offset(int field_offset, bool is_static) {
   if (!is_static) {
-    return get_non_static_field_by_offset(field_offset);
+    return get_nonstatic_field_by_offset(field_offset);
   }
   VM_ENTRY_MARK;
   InstanceKlass* k = get_instanceKlass();
@@ -436,7 +437,7 @@ ciField* ciInstanceKlass::get_field_by_name(ciSymbol* name, ciSymbol* signature,
 // except this does not require allocating memory for a new ciField
 BasicType ciInstanceKlass::get_field_type_by_offset(const int field_offset, const bool is_static) {
   if (!is_static) {
-    ciField* field = get_non_static_field_by_offset(field_offset);
+    ciField* field = get_nonstatic_field_by_offset(field_offset);
     return field != nullptr ? field->layout_type() : T_ILLEGAL;
   }
 
diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp
index a1b2d8dd12d..a84c63981c9 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp
@@ -59,6 +59,7 @@ private:
   bool                   _has_nonstatic_concrete_methods;
   bool                   _is_hidden;
   bool                   _is_record;
+  bool                   _trust_final_fields;
   bool                   _has_trusted_loader;
 
   ciFlags                _flags;
@@ -82,7 +83,7 @@ private:
   bool compute_injected_fields_helper();
   void compute_transitive_interfaces();
 
-  ciField* get_non_static_field_by_offset(int field_offset);
+  ciField* get_nonstatic_field_by_offset(int field_offset);
 
 protected:
   ciInstanceKlass(Klass* k);
@@ -207,6 +208,10 @@ public:
     return _is_record;
   }
 
+  bool trust_final_fields() const {
+    return _trust_final_fields;
+  }
+
   ciInstanceKlass* get_canonical_holder(int offset);
   ciField* get_field_by_offset(int field_offset, bool is_static);
   ciField* get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static);
diff --git a/src/hotspot/share/ci/ciUtilities.cpp b/src/hotspot/share/ci/ciUtilities.cpp
index 0c5b4d9824f..011fa049275 100644
--- a/src/hotspot/share/ci/ciUtilities.cpp
+++ b/src/hotspot/share/ci/ciUtilities.cpp
@@ -42,10 +42,7 @@ const char* basictype_to_str(BasicType t) {
 
 // ------------------------------------------------------------------
 // card_table_base
-CardTable::CardValue* ci_card_table_address() {
-  BarrierSet* bs = BarrierSet::barrier_set();
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-  assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");
-  return ct->byte_map_base();
+CardTable::CardValue* ci_card_table_address_const() {
+  CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
+  return ctbs->card_table_base_const();
 }
diff --git a/src/hotspot/share/ci/ciUtilities.hpp b/src/hotspot/share/ci/ciUtilities.hpp
index 75dbb03adf4..3333972d57d 100644
--- a/src/hotspot/share/ci/ciUtilities.hpp
+++ b/src/hotspot/share/ci/ciUtilities.hpp
@@ -51,9 +51,9 @@ inline const char* bool_to_str(bool b) {
 
 const char* basictype_to_str(BasicType t);
 
-CardTable::CardValue* ci_card_table_address();
+CardTable::CardValue* ci_card_table_address_const();
 template <typename T> T ci_card_table_address_as() {
-  return reinterpret_cast<T>(ci_card_table_address());
+  return reinterpret_cast<T>(ci_card_table_address_const());
 }
 
 #endif // SHARE_CI_CIUTILITIES_HPP
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index c9d9d3632b5..c1f00cbe536 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -943,6 +943,7 @@ public:
     _java_lang_Deprecated_for_removal,
     _jdk_internal_vm_annotation_AOTSafeClassInitializer,
     _method_AOTRuntimeSetup,
+    _jdk_internal_vm_annotation_TrustFinalFields,
     _annotation_LIMIT
   };
   const Location _location;
@@ -1016,7 +1017,8 @@ public:
 };
 
 
-static int skip_annotation_value(const u1*, int, int); // fwd decl
+static int skip_annotation_value(const u1* buffer, int limit, int index, int recursion_depth); // fwd decl
+static const int max_recursion_depth = 5;
 
 // Safely increment index by val if does not pass limit
 #define SAFE_ADD(index, limit, val) \
@@ -1024,23 +1026,29 @@ if (index >= limit - val) return limit; \
 index += val;
 
 // Skip an annotation.  Return >=limit if there is any problem.
-static int skip_annotation(const u1* buffer, int limit, int index) {
+static int skip_annotation(const u1* buffer, int limit, int index, int recursion_depth = 0) {
   assert(buffer != nullptr, "invariant");
+  if (recursion_depth > max_recursion_depth) {
+    return limit;
+  }
   // annotation := atype:u2 do(nmem:u2) {member:u2 value}
   // value := switch (tag:u1) { ... }
   SAFE_ADD(index, limit, 4); // skip atype and read nmem
   int nmem = Bytes::get_Java_u2((address)buffer + index - 2);
   while (--nmem >= 0 && index < limit) {
     SAFE_ADD(index, limit, 2); // skip member
-    index = skip_annotation_value(buffer, limit, index);
+    index = skip_annotation_value(buffer, limit, index, recursion_depth + 1);
   }
   return index;
 }
 
 // Skip an annotation value.  Return >=limit if there is any problem.
-static int skip_annotation_value(const u1* buffer, int limit, int index) {
+static int skip_annotation_value(const u1* buffer, int limit, int index, int recursion_depth) {
   assert(buffer != nullptr, "invariant");
 
+  if (recursion_depth > max_recursion_depth) {
+    return limit;
+  }
   // value := switch (tag:u1) {
   //   case B, C, I, S, Z, D, F, J, c: con:u2;
   //   case e: e_class:u2 e_name:u2;
@@ -1072,12 +1080,12 @@ static int skip_annotation_value(const u1* buffer, int limit, int index) {
       SAFE_ADD(index, limit, 2); // read nval
       int nval = Bytes::get_Java_u2((address)buffer + index - 2);
       while (--nval >= 0 && index < limit) {
-        index = skip_annotation_value(buffer, limit, index);
+        index = skip_annotation_value(buffer, limit, index, recursion_depth + 1);
       }
     }
     break;
     case '@':
-      index = skip_annotation(buffer, limit, index);
+      index = skip_annotation(buffer, limit, index, recursion_depth + 1);
       break;
     default:
       return limit;  //  bad tag byte
@@ -1878,6 +1886,11 @@ AnnotationCollector::annotation_index(const ClassLoaderData* loader_data,
       if (!privileged)              break;  // only allow in privileged code
       return _field_Stable;
     }
+    case VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_TrustFinalFields_signature): {
+      if (_location != _in_class)   break;  // only allow for classes
+      if (!privileged)              break;  // only allow in privileged code
+      return _jdk_internal_vm_annotation_TrustFinalFields;
+    }
     case VM_SYMBOL_ENUM_NAME(jdk_internal_vm_annotation_Contended_signature): {
       if (_location != _in_field && _location != _in_class) {
         break;  // only allow for fields and classes
@@ -1992,6 +2005,9 @@ void ClassFileParser::ClassAnnotationCollector::apply_to(InstanceKlass* ik) {
   if (has_annotation(_jdk_internal_vm_annotation_AOTSafeClassInitializer)) {
     ik->set_has_aot_safe_initializer();
   }
+  if (has_annotation(_jdk_internal_vm_annotation_TrustFinalFields)) {
+    ik->set_trust_final_fields(true);
+  }
 }
 
 #define MAX_ARGS_SIZE 255
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index d9a63cd154b..eced83577cb 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -127,6 +127,7 @@ PerfCounter*    ClassLoader::_perf_ik_link_methods_count = nullptr;
 PerfCounter*    ClassLoader::_perf_method_adapters_count = nullptr;
 PerfCounter*    ClassLoader::_unsafe_defineClassCallCounter = nullptr;
 PerfCounter*    ClassLoader::_perf_secondary_hash_time = nullptr;
+PerfCounter*    ClassLoader::_perf_change_wx_time = nullptr;
 
 PerfCounter*    ClassLoader::_perf_resolve_indy_time = nullptr;
 PerfCounter*    ClassLoader::_perf_resolve_invokehandle_time = nullptr;
@@ -1370,6 +1371,7 @@ void ClassLoader::initialize(TRAPS) {
     NEWPERFBYTECOUNTER(_perf_sys_classfile_bytes_read, SUN_CLS, "sysClassBytes");
     NEWPERFEVENTCOUNTER(_unsafe_defineClassCallCounter, SUN_CLS, "unsafeDefineClassCalls");
     NEWPERFTICKCOUNTER(_perf_secondary_hash_time, SUN_CLS, "secondarySuperHashTime");
+    NEWPERFTICKCOUNTER(_perf_change_wx_time, SUN_CLS, "changeWXTime");
 
     if (log_is_enabled(Info, perf, class, link)) {
       NEWPERFTICKCOUNTER(_perf_ik_link_methods_time, SUN_CLS, "linkMethodsTime");
@@ -1418,6 +1420,10 @@ char* ClassLoader::lookup_vm_options() {
   jio_snprintf(modules_path, JVM_MAXPATHLEN, "%s%slib%smodules", Arguments::get_java_home(), fileSep, fileSep);
   JImage_file =(*JImageOpen)(modules_path, &error);
   if (JImage_file == nullptr) {
+    if (Arguments::has_jimage()) {
+      // The modules file exists but is unreadable or corrupt
+      vm_exit_during_initialization(err_msg("Unable to load %s", modules_path));
+    }
     return nullptr;
   }
 
diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp
index afb0a581dcc..a935d3027ac 100644
--- a/src/hotspot/share/classfile/classLoader.hpp
+++ b/src/hotspot/share/classfile/classLoader.hpp
@@ -184,6 +184,7 @@ class ClassLoader: AllStatic {
 
   // Count the time taken to hash the scondary superclass arrays.
   static PerfCounter* _perf_secondary_hash_time;
+  static PerfCounter* _perf_change_wx_time;
 
   // The boot class path consists of 3 ordered pieces:
   //  1. the module/path pairs specified to --patch-module
@@ -268,6 +269,9 @@ class ClassLoader: AllStatic {
   static PerfCounter* perf_secondary_hash_time() {
     return _perf_secondary_hash_time;
   }
+  static PerfCounter* perf_change_wx_time() {
+    return _perf_change_wx_time;
+  }
   static PerfCounter* perf_sys_classload_time()       { return _perf_sys_classload_time; }
   static PerfCounter* perf_app_classload_time()       { return _perf_app_classload_time; }
   static PerfCounter* perf_app_classload_selftime()   { return _perf_app_classload_selftime; }
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.cpp b/src/hotspot/share/classfile/classLoaderDataShared.cpp
index 7a7743edd03..d415fe64bac 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "classfile/packageEntry.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "logging/log.hpp"
+#include "memory/metaspaceClosure.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/safepoint.hpp"
 
@@ -56,9 +57,9 @@ class ArchivedClassLoaderData {
 public:
   ArchivedClassLoaderData() : _packages(nullptr), _modules(nullptr), _unnamed_module(nullptr) {}
 
-  void iterate_symbols(ClassLoaderData* loader_data, MetaspaceClosure* closure);
-  void allocate(ClassLoaderData* loader_data);
-  void init_archived_entries(ClassLoaderData* loader_data);
+  void iterate_roots(MetaspaceClosure* closure);
+  void build_tables(ClassLoaderData* loader_data, TRAPS);
+  void remove_unshareable_info();
   ModuleEntry* unnamed_module() {
     return _unnamed_module;
   }
@@ -80,17 +81,14 @@ static ModuleEntry* _archived_javabase_moduleEntry = nullptr;
 static int _platform_loader_root_index = -1;
 static int _system_loader_root_index = -1;
 
-void ArchivedClassLoaderData::iterate_symbols(ClassLoaderData* loader_data, MetaspaceClosure* closure) {
+void ArchivedClassLoaderData::iterate_roots(MetaspaceClosure* it) {
   assert(CDSConfig::is_dumping_full_module_graph(), "must be");
-  assert_valid(loader_data);
-  if (loader_data != nullptr) {
-    loader_data->packages()->iterate_symbols(closure);
-    loader_data->modules() ->iterate_symbols(closure);
-    loader_data->unnamed_module()->iterate_symbols(closure);
-  }
+  it->push(&_packages);
+  it->push(&_modules);
+  it->push(&_unnamed_module);
 }
 
-void ArchivedClassLoaderData::allocate(ClassLoaderData* loader_data) {
+void ArchivedClassLoaderData::build_tables(ClassLoaderData* loader_data, TRAPS) {
   assert(CDSConfig::is_dumping_full_module_graph(), "must be");
   assert_valid(loader_data);
   if (loader_data != nullptr) {
@@ -98,19 +96,28 @@ void ArchivedClassLoaderData::allocate(ClassLoaderData* loader_data) {
     // address of the Symbols, which may be relocated at runtime due to ASLR.
     // So we store the packages/modules in Arrays. At runtime, we create
     // the hashtables using these arrays.
-    _packages = loader_data->packages()->allocate_archived_entries();
-    _modules  = loader_data->modules() ->allocate_archived_entries();
-    _unnamed_module = loader_data->unnamed_module()->allocate_archived_entry();
+    _packages = loader_data->packages()->build_aot_table(loader_data, CHECK);
+    _modules  = loader_data->modules()->build_aot_table(loader_data, CHECK);
+    _unnamed_module = loader_data->unnamed_module();
   }
 }
 
-void ArchivedClassLoaderData::init_archived_entries(ClassLoaderData* loader_data) {
-  assert(CDSConfig::is_dumping_full_module_graph(), "must be");
-  assert_valid(loader_data);
-  if (loader_data != nullptr) {
-    loader_data->packages()->init_archived_entries(_packages);
-    loader_data->modules() ->init_archived_entries(_modules);
-    _unnamed_module->init_as_archived_entry();
+void ArchivedClassLoaderData::remove_unshareable_info() {
+  if (_packages != nullptr) {
+    _packages = ArchiveBuilder::current()->get_buffered_addr(_packages);
+    for (int i = 0; i < _packages->length(); i++) {
+      _packages->at(i)->remove_unshareable_info();
+    }
+  }
+  if (_modules != nullptr) {
+    _modules = ArchiveBuilder::current()->get_buffered_addr(_modules);
+    for (int i = 0; i < _modules->length(); i++) {
+      _modules->at(i)->remove_unshareable_info();
+    }
+  }
+  if (_unnamed_module != nullptr) {
+    _unnamed_module = ArchiveBuilder::current()->get_buffered_addr(_unnamed_module);
+    _unnamed_module->remove_unshareable_info();
   }
 }
 
@@ -153,7 +160,6 @@ void ArchivedClassLoaderData::clear_archived_oops() {
 // ------------------------------
 
 void ClassLoaderDataShared::load_archived_platform_and_system_class_loaders() {
-#if INCLUDE_CDS_JAVA_HEAP
   // The streaming object loader prefers loading the class loader related objects before
   //  the CLD constructor which has a NoSafepointVerifier.
   if (!HeapShared::is_loading_streaming_mode()) {
@@ -178,7 +184,6 @@ void ClassLoaderDataShared::load_archived_platform_and_system_class_loaders() {
   if (system_loader_module_entry != nullptr) {
     system_loader_module_entry->preload_archived_oops();
   }
-#endif
 }
 
 static ClassLoaderData* null_class_loader_data() {
@@ -210,28 +215,27 @@ void ClassLoaderDataShared::ensure_module_entry_table_exists(oop class_loader) {
   assert(met != nullptr, "sanity");
 }
 
-void ClassLoaderDataShared::iterate_symbols(MetaspaceClosure* closure) {
+void ClassLoaderDataShared::build_tables(TRAPS) {
   assert(CDSConfig::is_dumping_full_module_graph(), "must be");
-  _archived_boot_loader_data.iterate_symbols    (null_class_loader_data(), closure);
-  _archived_platform_loader_data.iterate_symbols(java_platform_loader_data_or_null(), closure);
-  _archived_system_loader_data.iterate_symbols  (java_system_loader_data_or_null(), closure);
+  _archived_boot_loader_data.build_tables(null_class_loader_data(), CHECK);
+  _archived_platform_loader_data.build_tables(java_platform_loader_data_or_null(), CHECK);
+  _archived_system_loader_data.build_tables(java_system_loader_data_or_null(), CHECK);
 }
 
-void ClassLoaderDataShared::allocate_archived_tables() {
+void ClassLoaderDataShared::iterate_roots(MetaspaceClosure* it) {
   assert(CDSConfig::is_dumping_full_module_graph(), "must be");
-  _archived_boot_loader_data.allocate    (null_class_loader_data());
-  _archived_platform_loader_data.allocate(java_platform_loader_data_or_null());
-  _archived_system_loader_data.allocate  (java_system_loader_data_or_null());
+  _archived_boot_loader_data.iterate_roots(it);
+  _archived_platform_loader_data.iterate_roots(it);
+  _archived_system_loader_data.iterate_roots(it);
 }
 
-void ClassLoaderDataShared::init_archived_tables() {
+void ClassLoaderDataShared::remove_unshareable_info() {
   assert(CDSConfig::is_dumping_full_module_graph(), "must be");
+  _archived_boot_loader_data.remove_unshareable_info();
+  _archived_platform_loader_data.remove_unshareable_info();
+  _archived_system_loader_data.remove_unshareable_info();
 
-  _archived_boot_loader_data.init_archived_entries    (null_class_loader_data());
-  _archived_platform_loader_data.init_archived_entries(java_platform_loader_data_or_null());
-  _archived_system_loader_data.init_archived_entries  (java_system_loader_data_or_null());
-
-  _archived_javabase_moduleEntry = ModuleEntry::get_archived_entry(ModuleEntryTable::javabase_moduleEntry());
+  _archived_javabase_moduleEntry = ArchiveBuilder::current()->get_buffered_addr(ModuleEntryTable::javabase_moduleEntry());
 
   _platform_loader_root_index = HeapShared::append_root(SystemDictionary::java_platform_loader());
   _system_loader_root_index = HeapShared::append_root(SystemDictionary::java_system_loader());
@@ -271,7 +275,6 @@ ModuleEntry* ClassLoaderDataShared::archived_unnamed_module(ClassLoaderData* loa
   return archived_module;
 }
 
-
 void ClassLoaderDataShared::clear_archived_oops() {
   assert(!CDSConfig::is_using_full_module_graph(), "must be");
   _archived_boot_loader_data.clear_archived_oops();
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.hpp b/src/hotspot/share/classfile/classLoaderDataShared.hpp
index 39d0a89418f..2cf37310e50 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.hpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,11 +40,11 @@ class ClassLoaderDataShared : AllStatic {
 public:
   static void load_archived_platform_and_system_class_loaders() NOT_CDS_JAVA_HEAP_RETURN;
   static void restore_archived_modules_for_preloading_classes(JavaThread* current) NOT_CDS_JAVA_HEAP_RETURN;
+  static void build_tables(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
+  static void iterate_roots(MetaspaceClosure* closure) NOT_CDS_JAVA_HEAP_RETURN;
+  static void remove_unshareable_info() NOT_CDS_JAVA_HEAP_RETURN;
 #if INCLUDE_CDS_JAVA_HEAP
   static void ensure_module_entry_tables_exist();
-  static void allocate_archived_tables();
-  static void iterate_symbols(MetaspaceClosure* closure);
-  static void init_archived_tables();
   static void serialize(SerializeClosure* f);
   static void clear_archived_oops();
   static void restore_archived_entries_for_null_class_loader_data();
diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index 6808ae7bb8f..de67971c403 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,14 +96,16 @@ void CompactHashtableWriter::allocate_table() {
                                   "Too many entries.");
   }
 
-  _compact_buckets = ArchiveBuilder::new_ro_array<u4>(_num_buckets + 1);
-  _compact_entries = ArchiveBuilder::new_ro_array<u4>(entries_space);
+  _num_compact_buckets = checked_cast<size_t>(_num_buckets + 1); // extra slot for TABLEEND_BUCKET_TYPE
+  _num_compact_entries = checked_cast<size_t>(entries_space);
+  _compact_buckets = (u4*)ArchiveBuilder::ro_region_alloc(_num_compact_buckets * sizeof(u4));
+  _compact_entries = (u4*)ArchiveBuilder::ro_region_alloc(_num_compact_entries * sizeof(u4));
 
   _stats->bucket_count    = _num_buckets;
-  _stats->bucket_bytes    = align_up(_compact_buckets->size() * BytesPerWord,
+  _stats->bucket_bytes    = align_up(checked_cast<int>(_num_compact_buckets * sizeof(u4)),
                                      SharedSpaceObjectAlignment);
   _stats->hashentry_count = _num_entries_written;
-  _stats->hashentry_bytes = align_up(_compact_entries->size() * BytesPerWord,
+  _stats->hashentry_bytes = align_up(checked_cast<int>(_num_compact_entries * sizeof(u4)),
                                      SharedSpaceObjectAlignment);
 }
 
@@ -114,21 +116,21 @@ void CompactHashtableWriter::dump_table(NumberSeq* summary) {
     GrowableArray<Entry>* bucket = _buckets[index];
     int bucket_size = bucket->length();
     if (bucket_size == 1) {
-      _compact_buckets->at_put(index, BUCKET_INFO(offset, VALUE_ONLY_BUCKET_TYPE));
+      compact_buckets_set(index, BUCKET_INFO(offset, VALUE_ONLY_BUCKET_TYPE));
 
       Entry ent = bucket->at(0);
       // bucket with one entry is value_only and only has the encoded_value
-      _compact_entries->at_put(offset++, ent.encoded_value());
+      compact_entries_set(offset++, ent.encoded_value());
       _num_value_only_buckets++;
     } else {
       // regular bucket, it could contain zero or more than one entry,
       // each entry is a <hash, encoded_value> pair
-      _compact_buckets->at_put(index, BUCKET_INFO(offset, REGULAR_BUCKET_TYPE));
+      compact_buckets_set(index, BUCKET_INFO(offset, REGULAR_BUCKET_TYPE));
 
       for (int i=0; i<bucket_size; i++) {
         Entry ent = bucket->at(i);
-        _compact_entries->at_put(offset++, u4(ent.hash()));      // write entry hash
-        _compact_entries->at_put(offset++, ent.encoded_value()); // write entry encoded_value
+        compact_entries_set(offset++, u4(ent.hash()));      // write entry hash
+        compact_entries_set(offset++, ent.encoded_value()); // write entry encoded_value
       }
       if (bucket_size == 0) {
         _num_empty_buckets++;
@@ -140,10 +142,19 @@ void CompactHashtableWriter::dump_table(NumberSeq* summary) {
   }
 
   // Mark the end of the buckets
-  _compact_buckets->at_put(_num_buckets, BUCKET_INFO(offset, TABLEEND_BUCKET_TYPE));
-  assert(offset == (u4)_compact_entries->length(), "sanity");
+  compact_buckets_set(_num_buckets, BUCKET_INFO(offset, TABLEEND_BUCKET_TYPE));
+  assert(offset == checked_cast<u4>(_num_compact_entries), "sanity");
 }
 
+void CompactHashtableWriter::compact_buckets_set(u4 index, u4 value) {
+  precond(index < _num_compact_buckets);
+  _compact_buckets[index] = value;
+}
+
+void CompactHashtableWriter::compact_entries_set(u4 index, u4 value) {
+  precond(index < _num_compact_entries);
+  _compact_entries[index] = value;
+}
 
 // Write the compact table
 void CompactHashtableWriter::dump(SimpleCompactHashtable *cht, const char* table_name) {
@@ -154,7 +165,7 @@ void CompactHashtableWriter::dump(SimpleCompactHashtable *cht, const char* table
   int table_bytes = _stats->bucket_bytes + _stats->hashentry_bytes;
   address base_address = address(SharedBaseAddress);
   cht->init(base_address,  _num_entries_written, _num_buckets,
-            _compact_buckets->data(), _compact_entries->data());
+            _compact_buckets, _compact_entries);
 
   LogMessage(aot, hashtables) msg;
   if (msg.is_info()) {
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 944fb876521..81f2951289d 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
 #define SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/cds_globals.hpp"
 #include "oops/array.hpp"
 #include "oops/symbol.hpp"
@@ -114,8 +115,13 @@ private:
   int _num_other_buckets;
   GrowableArray<Entry>** _buckets;
   CompactHashtableStats* _stats;
-  Array<u4>* _compact_buckets;
-  Array<u4>* _compact_entries;
+  u4* _compact_buckets;
+  size_t _num_compact_buckets;
+  u4* _compact_entries;
+  size_t _num_compact_entries;
+
+  void compact_buckets_set(u4 index, u4 value);
+  void compact_entries_set(u4 index, u4 value);
 
 public:
   // This is called at dump-time only
@@ -123,6 +129,9 @@ public:
   ~CompactHashtableWriter();
 
   void add(unsigned int hash, u4 encoded_value);
+  void add(unsigned int hash, AOTCompressedPointers::narrowPtr encoded_value) {
+    add(hash, cast_to_u4(encoded_value));
+  }
   void dump(SimpleCompactHashtable *cht, const char* table_name);
 
 private:
@@ -371,11 +380,11 @@ public:
 //
 // OffsetCompactHashtable -- This is used to store many types of objects
 // in the CDS archive. On 64-bit platforms, we save space by using a 32-bit
-// offset from the CDS base address.
+// narrowPtr from the CDS base address.
 
 template <typename V>
-inline V read_value_from_compact_hashtable(address base_address, u4 offset) {
-  return (V)(base_address + offset);
+inline V read_value_from_compact_hashtable(address base_address, u4 narrowp) {
+  return AOTCompressedPointers::decode_not_null<V>(cast_from_u4(narrowp), base_address);
 }
 
 template <
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index dd70d7b49ab..ef1eeec14dd 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1263,6 +1263,10 @@ bool java_lang_Class::restore_archived_mirror(Klass *k,
         "Restored %s archived mirror " PTR_FORMAT, k->external_name(), p2i(mirror()));
   }
 
+  if (CDSConfig::is_dumping_heap()) {
+    create_scratch_mirror(k, CHECK_(false));
+  }
+
   return true;
 }
 #endif // INCLUDE_CDS_JAVA_HEAP
@@ -1904,16 +1908,16 @@ oop java_lang_Thread::park_blocker(oop java_thread) {
   return java_thread->obj_field_access<MO_RELAXED>(_park_blocker_offset);
 }
 
-// Obtain stack trace for platform or mounted virtual thread.
-// If jthread is a virtual thread and it has been unmounted (or remounted to different carrier) the method returns null.
-// The caller (java.lang.VirtualThread) handles returned nulls via retry.
+// Obtain stack trace for a platform or virtual thread.
 oop java_lang_Thread::async_get_stack_trace(jobject jthread, TRAPS) {
   ThreadsListHandle tlh(THREAD);
   JavaThread* java_thread = nullptr;
-  oop thread_oop;
+  oop thread_oop = nullptr;
 
   bool has_java_thread = tlh.cv_internal_thread_to_JavaThread(jthread, &java_thread, &thread_oop);
-  if (!has_java_thread) {
+  assert(thread_oop != nullptr, "Missing Thread oop");
+  bool is_virtual = java_lang_VirtualThread::is_instance(thread_oop);
+  if (!has_java_thread && !is_virtual) {
     return nullptr;
   }
 
@@ -1921,61 +1925,33 @@ oop java_lang_Thread::async_get_stack_trace(jobject jthread, TRAPS) {
   public:
     const Handle _thread_h;
     int _depth;
-    bool _retry_handshake;
-    GrowableArray<Method*>* _methods;
-    GrowableArray<int>*     _bcis;
+    enum InitLength { len = 64 }; // Minimum length that covers most cases
+    GrowableArrayCHeap<Method*, mtInternal> _methods;
+    GrowableArrayCHeap<int, mtInternal>     _bcis;
 
     GetStackTraceHandshakeClosure(Handle thread_h) :
-        HandshakeClosure("GetStackTraceHandshakeClosure"), _thread_h(thread_h), _depth(0), _retry_handshake(false),
-        _methods(nullptr), _bcis(nullptr) {
-    }
-    ~GetStackTraceHandshakeClosure() {
-      delete _methods;
-      delete _bcis;
-    }
-
-    bool read_reset_retry() {
-      bool ret = _retry_handshake;
-      // If we re-execute the handshake this method need to return false
-      // when the handshake cannot be performed. (E.g. thread terminating)
-      _retry_handshake = false;
-      return ret;
+        HandshakeClosure("GetStackTraceHandshakeClosure"), _thread_h(thread_h), _depth(0),
+        _methods(InitLength::len), _bcis(InitLength::len) {
     }
 
     void do_thread(Thread* th) {
-      if (!Thread::current()->is_Java_thread()) {
-        _retry_handshake = true;
+      JavaThread* java_thread = th != nullptr ? JavaThread::cast(th) : nullptr;
+      if (java_thread != nullptr && !java_thread->has_last_Java_frame()) {
+        // stack trace is empty
         return;
       }
 
-      JavaThread* java_thread = JavaThread::cast(th);
-
-      if (!java_thread->has_last_Java_frame()) {
-        return;
-      }
-
-      bool carrier = false;
-      if (java_lang_VirtualThread::is_instance(_thread_h())) {
-        // Ensure _thread_h is still mounted to java_thread.
-        const ContinuationEntry* ce = java_thread->vthread_continuation();
-        if (ce == nullptr || ce->cont_oop(java_thread) != java_lang_VirtualThread::continuation(_thread_h())) {
-          // Target thread has been unmounted.
-          return;
-        }
-      } else {
-        carrier = (java_thread->vthread_continuation() != nullptr);
-      }
+      bool is_virtual = java_lang_VirtualThread::is_instance(_thread_h());
+      bool vthread_carrier = !is_virtual && (java_thread->vthread_continuation() != nullptr);
 
       const int max_depth = MaxJavaStackTraceDepth;
       const bool skip_hidden = !ShowHiddenFrames;
 
-      // Pick minimum length that will cover most cases
-      int init_length = 64;
-      _methods = new (mtInternal) GrowableArray<Method*>(init_length, mtInternal);
-      _bcis = new (mtInternal) GrowableArray<int>(init_length, mtInternal);
-
       int total_count = 0;
-      for (vframeStream vfst(java_thread, false, false, carrier); // we don't process frames as we don't care about oops
+      vframeStream vfst(java_thread != nullptr
+        ? vframeStream(java_thread, false, false, vthread_carrier)  // we don't process frames as we don't care about oops
+        : vframeStream(java_lang_VirtualThread::continuation(_thread_h())));
+      for (;
            !vfst.at_end() && (max_depth == 0 || max_depth != total_count);
            vfst.next()) {
 
@@ -1984,8 +1960,8 @@ oop java_lang_Thread::async_get_stack_trace(jobject jthread, TRAPS) {
           continue;
         }
 
-        _methods->push(vfst.method());
-        _bcis->push(vfst.bci());
+        _methods.push(vfst.method());
+        _bcis.push(vfst.bci());
         total_count++;
       }
 
@@ -1997,9 +1973,11 @@ oop java_lang_Thread::async_get_stack_trace(jobject jthread, TRAPS) {
   ResourceMark rm(THREAD);
   HandleMark   hm(THREAD);
   GetStackTraceHandshakeClosure gsthc(Handle(THREAD, thread_oop));
-  do {
-   Handshake::execute(&gsthc, &tlh, java_thread);
-  } while (gsthc.read_reset_retry());
+  if (is_virtual) {
+    Handshake::execute(&gsthc, thread_oop);
+  } else {
+    Handshake::execute(&gsthc, &tlh, java_thread);
+  }
 
   // Stop if no stack trace is found.
   if (gsthc._depth == 0) {
@@ -2015,9 +1993,9 @@ oop java_lang_Thread::async_get_stack_trace(jobject jthread, TRAPS) {
   objArrayHandle trace = oopFactory::new_objArray_handle(k, gsthc._depth, CHECK_NULL);
 
   for (int i = 0; i < gsthc._depth; i++) {
-    methodHandle method(THREAD, gsthc._methods->at(i));
+    methodHandle method(THREAD, gsthc._methods.at(i));
     oop element = java_lang_StackTraceElement::create(method,
-                                                      gsthc._bcis->at(i),
+                                                      gsthc._bcis.at(i),
                                                       CHECK_NULL);
     trace->obj_at_put(i, element);
   }
@@ -2196,7 +2174,7 @@ void java_lang_VirtualThread::set_timeout(oop vthread, jlong value) {
 
 JavaThreadStatus java_lang_VirtualThread::map_state_to_thread_status(int state) {
   JavaThreadStatus status = JavaThreadStatus::NEW;
-  switch (state & ~SUSPENDED) {
+  switch (state) {
     case NEW:
       status = JavaThreadStatus::NEW;
       break;
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index a8562a345c8..3276d398faf 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -592,9 +592,6 @@ class java_lang_VirtualThread : AllStatic {
     TIMED_WAITING = 17,
     TIMED_WAIT    = 18,  // waiting in timed-Object.wait
     TERMINATED    = 99,
-
-    // additional state bits
-    SUSPENDED    = 1 << 8,   // suspended when unmounted
   };
 
   static void compute_offsets();
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index 5fb3d6f2d13..b5b8aa4ef55 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotGrowableArray.inline.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
@@ -37,6 +38,7 @@
 #include "jni.h"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/metadataFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/oopHandle.inline.hpp"
@@ -44,7 +46,6 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/events.hpp"
-#include "utilities/growableArray.hpp"
 #include "utilities/hashTable.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/quickSort.hpp"
@@ -167,7 +168,7 @@ void ModuleEntry::add_read(ModuleEntry* m) {
   } else {
     if (reads() == nullptr) {
       // Lazily create a module's reads list
-      GrowableArray<ModuleEntry*>* new_reads = new (mtModule) GrowableArray<ModuleEntry*>(MODULE_READS_SIZE, mtModule);
+      AOTGrowableArray<ModuleEntry*>* new_reads = new (mtModule) AOTGrowableArray<ModuleEntry*>(MODULE_READS_SIZE, mtModule);
       set_reads(new_reads);
     }
 
@@ -274,8 +275,7 @@ ModuleEntry::ModuleEntry(Handle module_handle,
     _has_default_read_edges(false),
     _must_walk_reads(false),
     _is_open(is_open),
-    _is_patched(false)
-    DEBUG_ONLY(COMMA _reads_is_archived(false)) {
+    _is_patched(false) {
 
   // Initialize fields specific to a ModuleEntry
   if (_name == nullptr) {
@@ -394,7 +394,6 @@ ModuleEntryTable::~ModuleEntryTable() {
   ModuleEntryTableDeleter deleter;
   _table.unlink(&deleter);
   assert(_table.number_of_entries() == 0, "should have removed all entries");
-
 }
 
 void ModuleEntry::set_loader_data(ClassLoaderData* cld) {
@@ -402,147 +401,51 @@ void ModuleEntry::set_loader_data(ClassLoaderData* cld) {
   _loader_data = cld;
 }
 
+void ModuleEntry::metaspace_pointers_do(MetaspaceClosure* it) {
+  it->push(&_name);
+  it->push(&_reads);
+  it->push(&_version);
+  it->push(&_location);
+}
+
 #if INCLUDE_CDS_JAVA_HEAP
-typedef HashTable<
-  const ModuleEntry*,
-  ModuleEntry*,
-  557, // prime number
-  AnyObj::C_HEAP> ArchivedModuleEntries;
-static ArchivedModuleEntries* _archive_modules_entries = nullptr;
-
-#ifndef PRODUCT
-static int _num_archived_module_entries = 0;
-static int _num_inited_module_entries = 0;
-#endif
-
 bool ModuleEntry::should_be_archived() const {
   return SystemDictionaryShared::is_builtin_loader(loader_data());
 }
 
-ModuleEntry* ModuleEntry::allocate_archived_entry() const {
-  precond(should_be_archived());
-  precond(CDSConfig::is_dumping_full_module_graph());
-  ModuleEntry* archived_entry = (ModuleEntry*)ArchiveBuilder::rw_region_alloc(sizeof(ModuleEntry));
-  memcpy((void*)archived_entry, (void*)this, sizeof(ModuleEntry));
+void ModuleEntry::remove_unshareable_info() {
+  _archived_module_index = HeapShared::append_root(module_oop());
 
-  archived_entry->_archived_module_index = HeapShared::append_root(module_oop());
-  if (_archive_modules_entries == nullptr) {
-    _archive_modules_entries = new (mtClass)ArchivedModuleEntries();
-  }
-  assert(_archive_modules_entries->get(this) == nullptr, "Each ModuleEntry must not be shared across ModuleEntryTables");
-  _archive_modules_entries->put(this, archived_entry);
-  DEBUG_ONLY(_num_archived_module_entries++);
-
-  if (CDSConfig::is_dumping_final_static_archive()) {
-    OopHandle null_handle;
-    archived_entry->_shared_pd = null_handle;
-  } else {
-    assert(archived_entry->shared_protection_domain() == nullptr, "never set during -Xshare:dump");
+  if (_reads != nullptr) {
+    _reads->set_in_aot_cache();
   }
 
   // Clear handles and restore at run time. Handles cannot be archived.
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    OopHandle null_handle;
+    _shared_pd = null_handle;
+  } else {
+    assert(shared_protection_domain() == nullptr, "never set during -Xshare:dump");
+  }
+
   OopHandle null_handle;
-  archived_entry->_module_handle = null_handle;
-
-  // For verify_archived_module_entries()
-  DEBUG_ONLY(_num_inited_module_entries++);
-
-  if (log_is_enabled(Info, aot, module)) {
-    ResourceMark rm;
-    LogStream ls(Log(aot, module)::info());
-    ls.print("Stored in archive: ");
-    archived_entry->print(&ls);
-  }
-  return archived_entry;
-}
-
-bool ModuleEntry::has_been_archived() {
-  assert(!ArchiveBuilder::current()->is_in_buffer_space(this), "must be called on original ModuleEntry");
-  return _archive_modules_entries->contains(this);
-}
-
-ModuleEntry* ModuleEntry::get_archived_entry(ModuleEntry* orig_entry) {
-  ModuleEntry** ptr = _archive_modules_entries->get(orig_entry);
-  assert(ptr != nullptr && *ptr != nullptr, "must have been allocated");
-  return *ptr;
-}
-
-// This function is used to archive ModuleEntry::_reads and PackageEntry::_qualified_exports.
-// GrowableArray cannot be directly archived, as it needs to be expandable at runtime.
-// Write it out as an Array, and convert it back to GrowableArray at runtime.
-Array<ModuleEntry*>* ModuleEntry::write_growable_array(GrowableArray<ModuleEntry*>* array) {
-  Array<ModuleEntry*>* archived_array = nullptr;
-  int length = (array == nullptr) ? 0 : array->length();
-  if (length > 0) {
-    archived_array = ArchiveBuilder::new_ro_array<ModuleEntry*>(length);
-    for (int i = 0; i < length; i++) {
-      ModuleEntry* archived_entry = get_archived_entry(array->at(i));
-      archived_array->at_put(i, archived_entry);
-      ArchivePtrMarker::mark_pointer((address*)archived_array->adr_at(i));
-    }
-  }
-
-  return archived_array;
-}
-
-GrowableArray<ModuleEntry*>* ModuleEntry::restore_growable_array(Array<ModuleEntry*>* archived_array) {
-  GrowableArray<ModuleEntry*>* array = nullptr;
-  int length = (archived_array == nullptr) ? 0 : archived_array->length();
-  if (length > 0) {
-    array = new (mtModule) GrowableArray<ModuleEntry*>(length, mtModule);
-    for (int i = 0; i < length; i++) {
-      ModuleEntry* archived_entry = archived_array->at(i);
-      array->append(archived_entry);
-    }
-  }
-
-  return array;
-}
-
-void ModuleEntry::iterate_symbols(MetaspaceClosure* closure) {
-  closure->push(&_name);
-  closure->push(&_version);
-  closure->push(&_location);
-}
-
-void ModuleEntry::init_as_archived_entry() {
-  set_archived_reads(write_growable_array(reads()));
+  _module_handle = null_handle;
 
   _loader_data = nullptr;  // re-init at runtime
   if (name() != nullptr) {
-    _shared_path_index = AOTClassLocationConfig::dumptime()->get_module_shared_path_index(_location);
-    _name = ArchiveBuilder::get_buffered_symbol(_name);
-    ArchivePtrMarker::mark_pointer((address*)&_name);
+    Symbol* src_location = ArchiveBuilder::current()->get_source_addr(_location);
+    _shared_path_index = AOTClassLocationConfig::dumptime()->get_module_shared_path_index(src_location);
   } else {
     // _shared_path_index is used only by SystemDictionary::is_shared_class_visible_impl()
     // for checking classes in named modules.
     _shared_path_index = -1;
   }
-  if (_version != nullptr) {
-    _version = ArchiveBuilder::get_buffered_symbol(_version);
-  }
-  if (_location != nullptr) {
-    _location = ArchiveBuilder::get_buffered_symbol(_location);
-  }
   JFR_ONLY(set_trace_id(0);) // re-init at runtime
-
-  ArchivePtrMarker::mark_pointer((address*)&_reads);
-  ArchivePtrMarker::mark_pointer((address*)&_version);
-  ArchivePtrMarker::mark_pointer((address*)&_location);
 }
 
-#ifndef PRODUCT
-void ModuleEntry::verify_archived_module_entries() {
-  assert(_num_archived_module_entries == _num_inited_module_entries,
-         "%d ModuleEntries have been archived but %d of them have been properly initialized with archived java.lang.Module objects",
-         _num_archived_module_entries, _num_inited_module_entries);
-}
-#endif // PRODUCT
-
 void ModuleEntry::load_from_archive(ClassLoaderData* loader_data) {
   assert(CDSConfig::is_using_archive(), "runtime only");
   set_loader_data(loader_data);
-  set_reads(restore_growable_array(archived_reads()));
   JFR_ONLY(INIT_ID(this);)
 }
 
@@ -581,38 +484,28 @@ static int compare_module_by_name(ModuleEntry* a, ModuleEntry* b) {
   return a->name()->fast_compare(b->name());
 }
 
-void ModuleEntryTable::iterate_symbols(MetaspaceClosure* closure) {
-  auto syms = [&] (const SymbolHandle& key, ModuleEntry*& m) {
-      m->iterate_symbols(closure);
-  };
-  _table.iterate_all(syms);
-}
-
-Array<ModuleEntry*>* ModuleEntryTable::allocate_archived_entries() {
-  Array<ModuleEntry*>* archived_modules = ArchiveBuilder::new_rw_array<ModuleEntry*>(_table.number_of_entries());
+Array<ModuleEntry*>* ModuleEntryTable::build_aot_table(ClassLoaderData* loader_data, TRAPS) {
+  Array<ModuleEntry*>* aot_table =
+    MetadataFactory::new_array<ModuleEntry*>(loader_data, _table.number_of_entries(), nullptr, CHECK_NULL);
   int n = 0;
   auto grab = [&] (const SymbolHandle& key, ModuleEntry*& m) {
-    archived_modules->at_put(n++, m);
+    m->pack_reads();
+    aot_table->at_put(n++, m);
+    if (log_is_enabled(Info, aot, module)) {
+      ResourceMark rm;
+      LogStream ls(Log(aot, module)::info());
+      ls.print("Stored in archive: ");
+      m->print(&ls);
+    }
   };
   _table.iterate_all(grab);
 
   if (n > 1) {
     // Always allocate in the same order to produce deterministic archive.
-    QuickSort::sort(archived_modules->data(), n, compare_module_by_name);
+    QuickSort::sort(aot_table->data(), n, compare_module_by_name);
   }
-  for (int i = 0; i < n; i++) {
-    archived_modules->at_put(i, archived_modules->at(i)->allocate_archived_entry());
-    ArchivePtrMarker::mark_pointer((address*)archived_modules->adr_at(i));
-  }
-  return archived_modules;
-}
 
-void ModuleEntryTable::init_archived_entries(Array<ModuleEntry*>* archived_modules) {
-  assert(CDSConfig::is_dumping_full_module_graph(), "sanity");
-  for (int i = 0; i < archived_modules->length(); i++) {
-    ModuleEntry* archived_entry = archived_modules->at(i);
-    archived_entry->init_as_archived_entry();
-  }
+  return aot_table;
 }
 
 void ModuleEntryTable::load_archived_entries(ClassLoaderData* loader_data,
diff --git a/src/hotspot/share/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp
index 2e1852c5369..1a0251a2c2a 100644
--- a/src/hotspot/share/classfile/moduleEntry.hpp
+++ b/src/hotspot/share/classfile/moduleEntry.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 #ifndef SHARE_CLASSFILE_MODULEENTRY_HPP
 #define SHARE_CLASSFILE_MODULEENTRY_HPP
 
+#include "cds/aotGrowableArray.hpp"
 #include "jni.h"
+#include "memory/metaspaceClosureType.hpp"
 #include "oops/oopHandle.hpp"
 #include "oops/symbol.hpp"
 #include "oops/symbolHandle.hpp"
@@ -68,11 +70,8 @@ private:
                                        // for shared classes from this module
   Symbol*          _name;              // name of this module
   ClassLoaderData* _loader_data;
+  AOTGrowableArray<ModuleEntry*>* _reads;  // list of modules that are readable by this module
 
-  union {
-    GrowableArray<ModuleEntry*>* _reads;  // list of modules that are readable by this module
-    Array<ModuleEntry*>* _archived_reads; // List of readable modules stored in the CDS archive
-  };
   Symbol* _version;                    // module version number
   Symbol* _location;                   // module location
   CDS_ONLY(int _shared_path_index;)    // >=0 if classes in this module are in CDS archive
@@ -81,7 +80,6 @@ private:
   bool _must_walk_reads;               // walk module's reads list at GC safepoints to purge out dead modules
   bool _is_open;                       // whether the packages in the module are all unqualifiedly exported
   bool _is_patched;                    // whether the module is patched via --patch-module
-  DEBUG_ONLY(bool _reads_is_archived);
   CDS_JAVA_HEAP_ONLY(int _archived_module_index;)
 
   JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
@@ -120,22 +118,18 @@ public:
 
   bool             can_read(ModuleEntry* m) const;
   bool             has_reads_list() const;
-  GrowableArray<ModuleEntry*>* reads() const {
-    assert(!_reads_is_archived, "sanity");
+  AOTGrowableArray<ModuleEntry*>* reads() const {
     return _reads;
   }
-  void set_reads(GrowableArray<ModuleEntry*>* r) {
+  void set_reads(AOTGrowableArray<ModuleEntry*>* r) {
     _reads = r;
-    DEBUG_ONLY(_reads_is_archived = false);
   }
-  Array<ModuleEntry*>* archived_reads() const {
-    assert(_reads_is_archived, "sanity");
-    return _archived_reads;
-  }
-  void set_archived_reads(Array<ModuleEntry*>* r) {
-    _archived_reads = r;
-    DEBUG_ONLY(_reads_is_archived = true);
+  void pack_reads() {
+    if (_reads != nullptr) {
+      _reads->shrink_to_fit();
+    }
   }
+
   void             add_read(ModuleEntry* m);
   void             set_read_walk_required(ClassLoaderData* m_loader_data);
 
@@ -189,6 +183,13 @@ public:
   const char* name_as_C_string() const {
     return is_named() ? name()->as_C_string() : UNNAMED_MODULE;
   }
+
+  // methods required by MetaspaceClosure
+  void metaspace_pointers_do(MetaspaceClosure* it);
+  int size_in_heapwords() const { return (int)heap_word_size(sizeof(ModuleEntry)); }
+  MetaspaceClosureType type() const { return MetaspaceClosureType::ModuleEntryType; }
+  static bool is_read_only_by_default() { return false; }
+
   void print(outputStream* st = tty) const;
   void verify();
 
@@ -198,18 +199,11 @@ public:
 
 #if INCLUDE_CDS_JAVA_HEAP
   bool should_be_archived() const;
-  void iterate_symbols(MetaspaceClosure* closure);
-  ModuleEntry* allocate_archived_entry() const;
-  void init_as_archived_entry();
-  static ModuleEntry* get_archived_entry(ModuleEntry* orig_entry);
-  bool has_been_archived();
-  static Array<ModuleEntry*>* write_growable_array(GrowableArray<ModuleEntry*>* array);
-  static GrowableArray<ModuleEntry*>* restore_growable_array(Array<ModuleEntry*>* archived_array);
+  void remove_unshareable_info();
   void load_from_archive(ClassLoaderData* loader_data);
   void preload_archived_oops();
   void restore_archived_oops(ClassLoaderData* loader_data);
   void clear_archived_oops();
-  static void verify_archived_module_entries() PRODUCT_RETURN;
 #endif
 };
 
@@ -275,9 +269,7 @@ public:
   void verify();
 
 #if INCLUDE_CDS_JAVA_HEAP
-  void iterate_symbols(MetaspaceClosure* closure);
-  Array<ModuleEntry*>* allocate_archived_entries();
-  void init_archived_entries(Array<ModuleEntry*>* archived_modules);
+  Array<ModuleEntry*>* build_aot_table(ClassLoaderData* loader_data, TRAPS);
   void load_archived_entries(ClassLoaderData* loader_data,
                              Array<ModuleEntry*>* archived_modules);
   void restore_archived_oops(ClassLoaderData* loader_data,
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index baf2acfb78c..51d09d9c47f 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -505,13 +505,10 @@ void Modules::check_archived_module_oop(oop orig_module_obj) {
     ClassLoaderData* loader_data = orig_module_ent->loader_data();
     assert(loader_data->is_builtin_class_loader_data(), "must be");
 
-    if (orig_module_ent->name() != nullptr) {
-      // For each named module, we archive both the java.lang.Module oop and the ModuleEntry.
-      assert(orig_module_ent->has_been_archived(), "sanity");
-    } else {
+    precond(ArchiveBuilder::current()->has_been_archived(orig_module_ent));
+    if (orig_module_ent->name() == nullptr) {
       // We always archive unnamed module oop for boot, platform, and system loaders.
       precond(orig_module_ent->should_be_archived());
-      precond(orig_module_ent->has_been_archived());
 
       if (loader_data->is_boot_class_loader_data()) {
         assert(!_seen_boot_unnamed_module, "only once");
@@ -529,10 +526,6 @@ void Modules::check_archived_module_oop(oop orig_module_obj) {
   }
 }
 
-void Modules::verify_archived_modules() {
-  ModuleEntry::verify_archived_module_entries();
-}
-
 class Modules::ArchivedProperty {
   const char* _prop;
   const bool _numbered;
diff --git a/src/hotspot/share/classfile/modules.hpp b/src/hotspot/share/classfile/modules.hpp
index 27a22c1017a..75857c8960c 100644
--- a/src/hotspot/share/classfile/modules.hpp
+++ b/src/hotspot/share/classfile/modules.hpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,6 @@ public:
                                       TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
   static void init_archived_modules(JavaThread* current, Handle h_platform_loader, Handle h_system_loader)
                                    NOT_CDS_JAVA_HEAP_RETURN;
-  static void verify_archived_modules() NOT_CDS_JAVA_HEAP_RETURN;
   static void dump_archived_module_info() NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_archived_module_info(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
 
diff --git a/src/hotspot/share/classfile/packageEntry.cpp b/src/hotspot/share/classfile/packageEntry.cpp
index ea2e6cd1def..3e61f2e3a3e 100644
--- a/src/hotspot/share/classfile/packageEntry.cpp
+++ b/src/hotspot/share/classfile/packageEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  *
  */
 
+#include "cds/aotGrowableArray.inline.hpp"
+#include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
@@ -31,13 +33,13 @@
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "memory/metadataFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/array.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 #include "utilities/events.hpp"
-#include "utilities/growableArray.hpp"
 #include "utilities/hashTable.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/quickSort.hpp"
@@ -51,7 +53,7 @@ PackageEntry::PackageEntry(Symbol* name, ModuleEntry* module) :
   _qualified_exports(nullptr),
   _defined_by_cds_in_class_path(0)
 {
-  // name can't be null
+  // name can't be null -- a class in the default package gets a PackageEntry of nullptr.
   _name->increment_refcount();
 
   JFR_ONLY(INIT_ID(this);)
@@ -81,7 +83,7 @@ void PackageEntry::add_qexport(ModuleEntry* m) {
   if (!has_qual_exports_list()) {
     // Lazily create a package's qualified exports list.
     // Initial size is small, do not anticipate export lists to be large.
-    _qualified_exports = new (mtModule) GrowableArray<ModuleEntry*>(QUAL_EXP_SIZE, mtModule);
+    _qualified_exports = new (mtModule) AOTGrowableArray<ModuleEntry*>(QUAL_EXP_SIZE, mtModule);
   }
 
   // Determine, based on this newly established export to module m,
@@ -183,12 +185,24 @@ void PackageEntry::purge_qualified_exports() {
 }
 
 void PackageEntry::delete_qualified_exports() {
-  if (_qualified_exports != nullptr) {
+  if (_qualified_exports != nullptr && !AOTMetaspace::in_aot_cache(_qualified_exports)) {
     delete _qualified_exports;
   }
   _qualified_exports = nullptr;
 }
 
+void PackageEntry::pack_qualified_exports() {
+  if (_qualified_exports != nullptr) {
+    _qualified_exports->shrink_to_fit();
+  }
+}
+
+void PackageEntry::metaspace_pointers_do(MetaspaceClosure* it) {
+  it->push(&_name);
+  it->push(&_module);
+  it->push(&_qualified_exports);
+}
+
 PackageEntryTable::PackageEntryTable() { }
 
 PackageEntryTable::~PackageEntryTable() {
@@ -212,66 +226,19 @@ PackageEntryTable::~PackageEntryTable() {
 }
 
 #if INCLUDE_CDS_JAVA_HEAP
-typedef HashTable<
-  const PackageEntry*,
-  PackageEntry*,
-  557, // prime number
-  AnyObj::C_HEAP> ArchivedPackageEntries;
-static ArchivedPackageEntries* _archived_packages_entries = nullptr;
-
 bool PackageEntry::should_be_archived() const {
   return module()->should_be_archived();
 }
 
-PackageEntry* PackageEntry::allocate_archived_entry() const {
-  precond(should_be_archived());
-  PackageEntry* archived_entry = (PackageEntry*)ArchiveBuilder::rw_region_alloc(sizeof(PackageEntry));
-  memcpy((void*)archived_entry, (void*)this, sizeof(PackageEntry));
-
-  if (_archived_packages_entries == nullptr) {
-    _archived_packages_entries = new (mtClass)ArchivedPackageEntries();
+void PackageEntry::remove_unshareable_info() {
+  if (_qualified_exports != nullptr) {
+    _qualified_exports->set_in_aot_cache();
   }
-  assert(_archived_packages_entries->get(this) == nullptr, "Each PackageEntry must not be shared across PackageEntryTables");
-  _archived_packages_entries->put(this, archived_entry);
-
-  return archived_entry;
-}
-
-PackageEntry* PackageEntry::get_archived_entry(PackageEntry* orig_entry) {
-  PackageEntry** ptr = _archived_packages_entries->get(orig_entry);
-  if (ptr != nullptr) {
-    return *ptr;
-  } else {
-    return nullptr;
-  }
-}
-
-void PackageEntry::iterate_symbols(MetaspaceClosure* closure) {
-  closure->push(&_name);
-}
-
-void PackageEntry::init_as_archived_entry() {
-  Array<ModuleEntry*>* archived_qualified_exports = ModuleEntry::write_growable_array(_qualified_exports);
-
-  _name = ArchiveBuilder::get_buffered_symbol(_name);
-  _module = ModuleEntry::get_archived_entry(_module);
-  _qualified_exports = (GrowableArray<ModuleEntry*>*)archived_qualified_exports;
   _defined_by_cds_in_class_path = 0;
   JFR_ONLY(set_trace_id(0);) // re-init at runtime
-
-  ArchivePtrMarker::mark_pointer((address*)&_name);
-  ArchivePtrMarker::mark_pointer((address*)&_module);
-  ArchivePtrMarker::mark_pointer((address*)&_qualified_exports);
-
-  LogStreamHandle(Info, aot, package) st;
-  if (st.is_enabled()) {
-    st.print("archived ");
-    print(&st);
-  }
 }
 
 void PackageEntry::load_from_archive() {
-  _qualified_exports = ModuleEntry::restore_growable_array((Array<ModuleEntry*>*)_qualified_exports);
   JFR_ONLY(INIT_ID(this);)
 }
 
@@ -280,14 +247,7 @@ static int compare_package_by_name(PackageEntry* a, PackageEntry* b) {
   return a->name()->fast_compare(b->name());
 }
 
-void PackageEntryTable::iterate_symbols(MetaspaceClosure* closure) {
-  auto syms = [&] (const SymbolHandle& key, PackageEntry*& p) {
-      p->iterate_symbols(closure);
-  };
-  _table.iterate_all(syms);
-}
-
-Array<PackageEntry*>* PackageEntryTable::allocate_archived_entries() {
+Array<PackageEntry*>* PackageEntryTable::build_aot_table(ClassLoaderData* loader_data, TRAPS) {
   // First count the packages in named modules
   int n = 0;
   auto count = [&] (const SymbolHandle& key, PackageEntry*& p) {
@@ -297,12 +257,19 @@ Array<PackageEntry*>* PackageEntryTable::allocate_archived_entries() {
   };
   _table.iterate_all(count);
 
-  Array<PackageEntry*>* archived_packages = ArchiveBuilder::new_rw_array<PackageEntry*>(n);
+  Array<PackageEntry*>* archived_packages = MetadataFactory::new_array<PackageEntry*>(loader_data, n, nullptr, CHECK_NULL);
   // reset n
   n = 0;
   auto grab = [&] (const SymbolHandle& key, PackageEntry*& p) {
     if (p->should_be_archived()) {
+      p->pack_qualified_exports();
       archived_packages->at_put(n++, p);
+
+      LogStreamHandle(Info, aot, package) st;
+      if (st.is_enabled()) {
+        st.print("archived ");
+        p->print(&st);
+      }
     }
   };
   _table.iterate_all(grab);
@@ -311,18 +278,8 @@ Array<PackageEntry*>* PackageEntryTable::allocate_archived_entries() {
     // Always allocate in the same order to produce deterministic archive.
     QuickSort::sort(archived_packages->data(), n, compare_package_by_name);
   }
-  for (int i = 0; i < n; i++) {
-    archived_packages->at_put(i, archived_packages->at(i)->allocate_archived_entry());
-    ArchivePtrMarker::mark_pointer((address*)archived_packages->adr_at(i));
-  }
-  return archived_packages;
-}
 
-void PackageEntryTable::init_archived_entries(Array<PackageEntry*>* archived_packages) {
-  for (int i = 0; i < archived_packages->length(); i++) {
-    PackageEntry* archived_entry = archived_packages->at(i);
-    archived_entry->init_as_archived_entry();
-  }
+  return archived_packages;
 }
 
 void PackageEntryTable::load_archived_entries(Array<PackageEntry*>* archived_packages) {
diff --git a/src/hotspot/share/classfile/packageEntry.hpp b/src/hotspot/share/classfile/packageEntry.hpp
index 6abf89dc60f..7b174a92287 100644
--- a/src/hotspot/share/classfile/packageEntry.hpp
+++ b/src/hotspot/share/classfile/packageEntry.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 #ifndef SHARE_CLASSFILE_PACKAGEENTRY_HPP
 #define SHARE_CLASSFILE_PACKAGEENTRY_HPP
 
+#include "cds/aotGrowableArray.hpp"
 #include "classfile/moduleEntry.hpp"
+#include "memory/metaspaceClosureType.hpp"
 #include "oops/symbol.hpp"
 #include "oops/symbolHandle.hpp"
 #include "runtime/atomicAccess.hpp"
@@ -114,7 +116,7 @@ private:
   bool _must_walk_exports;
   // Contains list of modules this package is qualifiedly exported to.  Access
   // to this list is protected by the Module_lock.
-  GrowableArray<ModuleEntry*>* _qualified_exports;
+  AOTGrowableArray<ModuleEntry*>* _qualified_exports;
   JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
 
   // Initial size of a package entry's list of qualified exports.
@@ -205,14 +207,24 @@ public:
   void purge_qualified_exports();
   void delete_qualified_exports();
 
+  void pack_qualified_exports(); // used by AOT
+
+  // methods required by MetaspaceClosure
+  void metaspace_pointers_do(MetaspaceClosure* it);
+  int size_in_heapwords() const { return (int)heap_word_size(sizeof(PackageEntry)); }
+  MetaspaceClosureType type() const { return MetaspaceClosureType::PackageEntryType; }
+  static bool is_read_only_by_default() { return false; }
+
   void print(outputStream* st = tty);
 
+  char* name_as_C_string() const {
+    assert(_name != nullptr, "name can't be null");
+    return name()->as_C_string();
+  }
+
 #if INCLUDE_CDS_JAVA_HEAP
   bool should_be_archived() const;
-  void iterate_symbols(MetaspaceClosure* closure);
-  PackageEntry* allocate_archived_entry() const;
-  void init_as_archived_entry();
-  static PackageEntry* get_archived_entry(PackageEntry* orig_entry);
+  void remove_unshareable_info();
   void load_from_archive();
 #endif
 
@@ -271,9 +283,7 @@ public:
   void print(outputStream* st = tty);
 
 #if INCLUDE_CDS_JAVA_HEAP
-  void iterate_symbols(MetaspaceClosure* closure);
-  Array<PackageEntry*>* allocate_archived_entries();
-  void init_archived_entries(Array<PackageEntry*>* archived_packages);
+  Array<PackageEntry*>* build_aot_table(ClassLoaderData* loader_data, TRAPS);
   void load_archived_entries(Array<PackageEntry*>* archived_packages);
 #endif
 };
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index c775014cfac..2b8b7780a41 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,24 +74,9 @@ const size_t REHASH_LEN = 100;
 const double CLEAN_DEAD_HIGH_WATER_MARK = 0.5;
 
 #if INCLUDE_CDS_JAVA_HEAP
-bool StringTable::_is_two_dimensional_shared_strings_array = false;
-OopHandle StringTable::_shared_strings_array;
-int StringTable::_shared_strings_array_root_index;
-
 inline oop StringTable::read_string_from_compact_hashtable(address base_address, u4 index) {
   assert(AOTMappedHeapLoader::is_in_use(), "sanity");
-  objArrayOop array = (objArrayOop)(_shared_strings_array.resolve());
-  oop s;
-
-  if (!_is_two_dimensional_shared_strings_array) {
-    s = array->obj_at((int)index);
-  } else {
-    int primary_index = index >> _secondary_array_index_bits;
-    int secondary_index = index & _secondary_array_index_mask;
-    objArrayOop secondary = (objArrayOop)array->obj_at(primary_index);
-    s = secondary->obj_at(secondary_index);
-  }
-
+  oop s = HeapShared::get_root((int)index, false);
   assert(java_lang_String::is_instance(s), "must be");
   return s;
 }
@@ -115,7 +100,6 @@ OopStorage*   StringTable::_oop_storage;
 
 static size_t _current_size = 0;
 static volatile size_t _items_count = 0;
-DEBUG_ONLY(static bool _disable_interning_during_cds_dump = false);
 
 volatile bool _alt_hash = false;
 
@@ -317,12 +301,6 @@ void StringTable::create_table() {
   _oop_storage->register_num_dead_callback(&gc_notification);
 }
 
-#if INCLUDE_CDS_JAVA_HEAP
-void StringTable::load_shared_strings_array() {
-  _shared_strings_array = OopHandle(Universe::vm_global(), HeapShared::get_root(_shared_strings_array_root_index));
-}
-#endif
-
 void StringTable::item_added() {
   AtomicAccess::inc(&_items_count);
 }
@@ -509,9 +487,6 @@ oop StringTable::intern(const char* utf8_string, TRAPS) {
 }
 
 oop StringTable::intern(const StringWrapper& name, TRAPS) {
-  assert(!AtomicAccess::load_acquire(&_disable_interning_during_cds_dump),
-         "All threads that may intern strings should have been stopped before CDS starts copying the interned string table");
-
   // shared table always uses java_lang_String::hash_code
   unsigned int hash = hash_wrapped_string(name);
   oop found_string = lookup_shared(name, hash);
@@ -614,6 +589,10 @@ struct StringTableDeleteCheck : StackObj {
 };
 
 void StringTable::clean_dead_entries(JavaThread* jt) {
+  // BulkDeleteTask::prepare() may take ConcurrentHashTableResize_lock (nosafepoint-2).
+  // When NativeHeapTrimmer is enabled, SuspendMark may take NativeHeapTrimmer::_lock (nosafepoint).
+  // Take SuspendMark first to keep lock order and avoid deadlock.
+  NativeHeapTrimmer::SuspendMark sm("stringtable");
   StringTableHash::BulkDeleteTask bdt(_local_table);
   if (!bdt.prepare(jt)) {
     return;
@@ -621,7 +600,6 @@ void StringTable::clean_dead_entries(JavaThread* jt) {
 
   StringTableDeleteCheck stdc;
   StringTableDoDelete stdd;
-  NativeHeapTrimmer::SuspendMark sm("stringtable");
   {
     TraceTime timer("Clean", TRACETIME_LOG(Debug, stringtable, perf));
     while(bdt.do_task(jt, stdc, stdd)) {
@@ -954,118 +932,13 @@ oop StringTable::lookup_shared(const jchar* name, int len) {
   return _shared_table.lookup(wrapped_name, java_lang_String::hash_code(name, len), 0);
 }
 
-// This is called BEFORE we enter the CDS safepoint. We can still allocate Java object arrays to
-// be used by the shared strings table.
-void StringTable::allocate_shared_strings_array(TRAPS) {
-  if (!CDSConfig::is_dumping_heap()) {
-    return;
-  }
+void StringTable::init_shared_table() {
+  assert(SafepointSynchronize::is_at_safepoint(), "inside AOT safepoint");
+  precond(CDSConfig::is_dumping_heap());
+  assert(HeapShared::is_writing_mapping_mode(), "not used for streamed oops");
 
-  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
-
-  CompileBroker::wait_for_no_active_tasks();
-
-  precond(CDSConfig::allow_only_single_java_thread());
-
-  // At this point, no more strings will be added:
-  // - There's only a single Java thread (this thread). It no longer executes Java bytecodes
-  //   so JIT compilation will eventually stop.
-  // - CompileBroker has no more active tasks, so all JIT requests have been processed.
-
-  // This flag will be cleared after intern table dumping has completed, so we can run the
-  // compiler again (for future AOT method compilation, etc).
-  DEBUG_ONLY(AtomicAccess::release_store(&_disable_interning_during_cds_dump, true));
-
-  if (items_count_acquire() > (size_t)max_jint) {
-    fatal("Too many strings to be archived: %zu", items_count_acquire());
-  }
-
-  int total = (int)items_count_acquire();
-  size_t single_array_size = objArrayOopDesc::object_size(total);
-
-  log_info(aot)("allocated string table for %d strings", total);
-
-  if (!HeapShared::is_too_large_to_archive(single_array_size)) {
-    // The entire table can fit in a single array
-    objArrayOop array = oopFactory::new_objArray(vmClasses::Object_klass(), total, CHECK);
-    _shared_strings_array = OopHandle(Universe::vm_global(), array);
-    log_info(aot)("string table array (single level) length = %d", total);
-  } else {
-    // Split the table in two levels of arrays.
-    int primary_array_length = (total + _secondary_array_max_length - 1) / _secondary_array_max_length;
-    size_t primary_array_size = objArrayOopDesc::object_size(primary_array_length);
-    size_t secondary_array_size = objArrayOopDesc::object_size(_secondary_array_max_length);
-
-    if (HeapShared::is_too_large_to_archive(secondary_array_size)) {
-      // This can only happen if you have an extremely large number of classes that
-      // refer to more than 16384 * 16384 = 26M interned strings! Not a practical concern
-      // but bail out for safety.
-      log_error(aot)("Too many strings to be archived: %zu", items_count_acquire());
-      AOTMetaspace::unrecoverable_writing_error();
-    }
-
-    objArrayOop primary = oopFactory::new_objArray(vmClasses::Object_klass(), primary_array_length, CHECK);
-    objArrayHandle primaryHandle(THREAD, primary);
-    _shared_strings_array = OopHandle(Universe::vm_global(), primary);
-
-    log_info(aot)("string table array (primary) length = %d", primary_array_length);
-    for (int i = 0; i < primary_array_length; i++) {
-      int len;
-      if (total > _secondary_array_max_length) {
-        len = _secondary_array_max_length;
-      } else {
-        len = total;
-      }
-      total -= len;
-
-      objArrayOop secondary = oopFactory::new_objArray(vmClasses::Object_klass(), len, CHECK);
-      primaryHandle()->obj_at_put(i, secondary);
-
-      log_info(aot)("string table array (secondary)[%d] length = %d", i, len);
-      assert(!HeapShared::is_too_large_to_archive(secondary), "sanity");
-    }
-
-    assert(total == 0, "must be");
-    _is_two_dimensional_shared_strings_array = true;
-  }
-}
-
-#ifndef PRODUCT
-void StringTable::verify_secondary_array_index_bits() {
-  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
-  int max;
-  for (max = 1; ; max++) {
-    size_t next_size = objArrayOopDesc::object_size(1 << (max + 1));
-    if (HeapShared::is_too_large_to_archive(next_size)) {
-      break;
-    }
-  }
-  // Currently max is 17 for +UseCompressedOops, 16 for -UseCompressedOops.
-  // When we add support for Shenandoah (which has a smaller mininum region size than G1),
-  // max will become 15/14.
-  //
-  // We use _secondary_array_index_bits==14 as that will be the eventual value, and will
-  // make testing easier.
-  assert(_secondary_array_index_bits <= max,
-         "_secondary_array_index_bits (%d) must be smaller than max possible value (%d)",
-         _secondary_array_index_bits, max);
-}
-#endif // PRODUCT
-
-// This is called AFTER we enter the CDS safepoint.
-//
-// For each shared string:
-// [1] Store it into _shared_strings_array. Encode its position as a 32-bit index.
-// [2] Store the index and hashcode into _shared_table.
-oop StringTable::init_shared_strings_array() {
-  assert(CDSConfig::is_dumping_heap(), "must be");
-  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
-  objArrayOop array = (objArrayOop)(_shared_strings_array.resolve());
-
-  verify_secondary_array_index_bits();
-
-  int index = 0;
-  auto copy_into_array = [&] (WeakHandle* val) {
+  int n = 0;
+  auto copy_into_aot_heap = [&] (WeakHandle* val) {
     oop string = val->peek();
     if (string != nullptr && !HeapShared::is_string_too_large_to_archive(string)) {
       // If string is too large, don't put it into the string table.
@@ -1074,53 +947,34 @@ oop StringTable::init_shared_strings_array() {
       // - If there's a reference to it, we will report an error inside HeapShared.cpp and
       //   dumping will fail.
       HeapShared::add_to_dumped_interned_strings(string);
-      if (!_is_two_dimensional_shared_strings_array) {
-        assert(index < array->length(), "no strings should have been added");
-        array->obj_at_put(index, string);
-      } else {
-        int primary_index = index >> _secondary_array_index_bits;
-        int secondary_index = index & _secondary_array_index_mask;
-
-        assert(primary_index < array->length(), "no strings should have been added");
-        objArrayOop secondary = (objArrayOop)array->obj_at(primary_index);
-
-        assert(secondary != nullptr && secondary->is_objArray(), "must be");
-        assert(secondary_index < secondary->length(), "no strings should have been added");
-        secondary->obj_at_put(secondary_index, string);
-      }
-      index ++;
     }
+    n++;
     return true;
   };
 
-  _local_table->do_safepoint_scan(copy_into_array);
-  log_info(aot)("Archived %d interned strings", index);
-  return array;
+  _local_table->do_safepoint_scan(copy_into_aot_heap);
+  log_info(aot)("Archived %d interned strings", n);
 };
 
 void StringTable::write_shared_table() {
+  assert(SafepointSynchronize::is_at_safepoint(), "inside AOT safepoint");
+  precond(CDSConfig::is_dumping_heap());
+  assert(HeapShared::is_writing_mapping_mode(), "not used for streamed oops");
+
   _shared_table.reset();
   CompactHashtableWriter writer((int)items_count_acquire(), ArchiveBuilder::string_stats());
 
-  int index = 0;
   auto copy_into_shared_table = [&] (WeakHandle* val) {
     oop string = val->peek();
     if (string != nullptr && !HeapShared::is_string_too_large_to_archive(string)) {
       unsigned int hash = java_lang_String::hash_code(string);
-      writer.add(hash, index);
-      index ++;
+      int root_id = HeapShared::append_root(string);
+      writer.add(hash, root_id);
     }
     return true;
   };
   _local_table->do_safepoint_scan(copy_into_shared_table);
   writer.dump(&_shared_table, "string");
-
-  DEBUG_ONLY(AtomicAccess::release_store(&_disable_interning_during_cds_dump, false));
-}
-
-void StringTable::set_shared_strings_array_index(int root_index) {
-  assert(HeapShared::is_writing_mapping_mode(), "should not reach here");
-  _shared_strings_array_root_index = root_index;
 }
 
 void StringTable::serialize_shared_table_header(SerializeClosure* soc) {
@@ -1132,8 +986,27 @@ void StringTable::serialize_shared_table_header(SerializeClosure* soc) {
   } else if (!AOTMappedHeapLoader::is_in_use()) {
     _shared_table.reset();
   }
+}
 
-  soc->do_bool(&_is_two_dimensional_shared_strings_array);
-  soc->do_int(&_shared_strings_array_root_index);
+void StringTable::move_shared_strings_into_runtime_table() {
+  precond(CDSConfig::is_dumping_final_static_archive());
+  JavaThread* THREAD = JavaThread::current();
+  HandleMark hm(THREAD);
+
+  int n = 0;
+  _shared_table.iterate_all([&](oop string) {
+    int length = java_lang_String::length(string);
+    Handle h_string (THREAD, string);
+    StringWrapper name(h_string, length);
+    unsigned int hash = hash_wrapped_string(name);
+
+    assert(!_alt_hash, "too early");
+    oop interned = do_intern(name, hash, THREAD);
+    assert(string == interned, "must be");
+    n++;
+  });
+
+  _shared_table.reset();
+  log_info(aot)("Moved %d interned strings to runtime table", n);
 }
 #endif //INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp
index 839e9d9053d..0024a45a2f2 100644
--- a/src/hotspot/share/classfile/stringTable.hpp
+++ b/src/hotspot/share/classfile/stringTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,49 +109,17 @@ public:
   static bool needs_rehashing() { return _needs_rehashing; }
   static inline void update_needs_rehash(bool rehash);
 
-  // Sharing
-#if INCLUDE_CDS_JAVA_HEAP
-  static inline oop read_string_from_compact_hashtable(address base_address, u4 index);
-
+  // AOT support
+  static inline oop read_string_from_compact_hashtable(address base_address, u4 index) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
 private:
-  static bool _is_two_dimensional_shared_strings_array;
-  static OopHandle _shared_strings_array;
-  static int _shared_strings_array_root_index;
-
-  // All the shared strings are referenced through _shared_strings_array to keep them alive.
-  // Each shared string is stored as a 32-bit index in ::_shared_table. The index
-  // is interpreted in two ways:
-  //
-  // [1] _is_two_dimensional_shared_strings_array = false: _shared_strings_array is an Object[].
-  //     Each shared string is stored as _shared_strings_array[index]
-  //
-  // [2] _is_two_dimensional_shared_strings_array = true: _shared_strings_array is an Object[][]
-  //     This happens when there are too many elements in the shared table. We store them
-  //     using two levels of objArrays, such that none of the arrays are too big for
-  //     AOTMappedHeapWriter::is_too_large_to_archive(). In this case, the index is splited into two
-  //     parts. Each shared string is stored as _shared_strings_array[primary_index][secondary_index]:
-  //
-  //           [bits 31 .. 14][ bits 13 .. 0  ]
-  //            primary_index  secondary_index
-  const static int _secondary_array_index_bits = 14;
-  const static int _secondary_array_max_length = 1 << _secondary_array_index_bits;
-  const static int _secondary_array_index_mask = _secondary_array_max_length - 1;
-
-  // make sure _secondary_array_index_bits is not too big
-  static void verify_secondary_array_index_bits() PRODUCT_RETURN;
-#endif // INCLUDE_CDS_JAVA_HEAP
-
- private:
   static oop lookup_shared(const StringWrapper& name, unsigned int hash) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
- public:
+public:
   static oop lookup_shared(const jchar* name, int len) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
   static size_t shared_entry_count() NOT_CDS_JAVA_HEAP_RETURN_(0);
-  static void allocate_shared_strings_array(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
-  static void load_shared_strings_array() NOT_CDS_JAVA_HEAP_RETURN;
-  static oop init_shared_strings_array() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
+  static void init_shared_table() NOT_CDS_JAVA_HEAP_RETURN;
   static void write_shared_table() NOT_CDS_JAVA_HEAP_RETURN;
-  static void set_shared_strings_array_index(int root_index) NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_shared_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
+  static void move_shared_strings_into_runtime_table();
 
   // Jcmd
   static void dump(outputStream* st, bool verbose=false);
diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index ec639a2b4d3..20aa7f0776d 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
@@ -690,7 +691,7 @@ void SymbolTable::copy_shared_symbol_table(GrowableArray<Symbol*>* symbols,
     assert(fixed_hash == hash_symbol((const char*)sym->bytes(), sym->utf8_length(), false),
            "must not rehash during dumping");
     sym->set_permanent();
-    writer->add(fixed_hash, builder->buffer_to_offset_u4((address)sym));
+    writer->add(fixed_hash, AOTCompressedPointers::encode_not_null(sym));
   }
 }
 
@@ -763,6 +764,10 @@ struct SymbolTableDeleteCheck : StackObj {
 };
 
 void SymbolTable::clean_dead_entries(JavaThread* jt) {
+  // BulkDeleteTask::prepare() may take ConcurrentHashTableResize_lock (nosafepoint-2).
+  // When NativeHeapTrimmer is enabled, SuspendMark may take NativeHeapTrimmer::_lock (nosafepoint).
+  // Take SuspendMark first to keep lock order and avoid deadlock.
+  NativeHeapTrimmer::SuspendMark sm("symboltable");
   SymbolTableHash::BulkDeleteTask bdt(_local_table);
   if (!bdt.prepare(jt)) {
     return;
@@ -770,7 +775,6 @@ void SymbolTable::clean_dead_entries(JavaThread* jt) {
 
   SymbolTableDeleteCheck stdc;
   SymbolTableDoDelete stdd;
-  NativeHeapTrimmer::SuspendMark sm("symboltable");
   {
     TraceTime timer("Clean", TRACETIME_LOG(Debug, symboltable, perf));
     while (bdt.do_task(jt, stdc, stdd)) {
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index afc190c36cf..cfb20412ab8 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 #include "cds/aotClassFilter.hpp"
 #include "cds/aotClassLocation.hpp"
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/aotLogging.hpp"
 #include "cds/aotMetaspace.hpp"
 #include "cds/archiveBuilder.hpp"
@@ -1282,11 +1283,10 @@ unsigned int SystemDictionaryShared::hash_for_shared_dictionary(address ptr) {
 class CopySharedClassInfoToArchive : StackObj {
   CompactHashtableWriter* _writer;
   bool _is_builtin;
-  ArchiveBuilder *_builder;
 public:
   CopySharedClassInfoToArchive(CompactHashtableWriter* writer,
                                bool is_builtin)
-    : _writer(writer), _is_builtin(is_builtin), _builder(ArchiveBuilder::current()) {}
+    : _writer(writer), _is_builtin(is_builtin) {}
 
   void do_entry(InstanceKlass* k, DumpTimeClassInfo& info) {
     if (!info.is_excluded() && info.is_builtin() == _is_builtin) {
@@ -1299,11 +1299,10 @@ public:
       Symbol* name = info._klass->name();
       name = ArchiveBuilder::current()->get_buffered_addr(name);
       hash = SystemDictionaryShared::hash_for_shared_dictionary((address)name);
-      u4 delta = _builder->buffer_to_offset_u4((address)record);
       if (_is_builtin && info._klass->is_hidden()) {
         // skip
       } else {
-        _writer->add(hash, delta);
+        _writer->add(hash, AOTCompressedPointers::encode_not_null(record));
       }
       if (log_is_enabled(Trace, aot, hashtables)) {
         ResourceMark rm;
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 38dba1d3d5f..76d09161fdd 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,9 +190,8 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
   // effect (sic!) for external_name(), but instead of doing that, we opt to
   // explicitly push the hashcode in here. This is signify the following block
   // is IMPORTANT:
-  if (klass->java_mirror() != nullptr) {
-    klass->java_mirror()->identity_hash();
-  }
+  assert(klass->java_mirror() != nullptr, "must be");
+  klass->java_mirror()->identity_hash();
 
   if (!is_eligible_for_verification(klass, should_verify_class)) {
     return true;
@@ -621,9 +620,6 @@ TypeOrigin ClassVerifier::ref_ctx(const char* sig) {
 void ClassVerifier::verify_class(TRAPS) {
   log_info(verification)("Verifying class %s with new format", _klass->external_name());
 
-  // Either verifying both local and remote classes or just remote classes.
-  assert(BytecodeVerificationRemote, "Should not be here");
-
   Array<Method*>* methods = _klass->methods();
   int num_methods = methods->length();
 
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 07fa294e8e1..67817682ced 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -257,6 +257,7 @@ class methodHandle;
   do_intrinsic(_bitCount_i,               java_lang_Integer,      bitCount_name,            int_int_signature,   F_S)   \
   do_intrinsic(_bitCount_l,               java_lang_Long,         bitCount_name,            long_int_signature,  F_S)   \
   do_intrinsic(_compress_i,               java_lang_Integer,      compress_name,            int2_int_signature,   F_S)  \
+   do_name(     compress_name,                                   "compress")                                            \
   do_intrinsic(_compress_l,               java_lang_Long,         compress_name,            long2_long_signature, F_S)  \
   do_intrinsic(_expand_i,                 java_lang_Integer,      expand_name,              int2_int_signature,   F_S)  \
   do_intrinsic(_expand_l,                 java_lang_Long,         expand_name,              long2_long_signature, F_S)  \
@@ -358,11 +359,11 @@ class methodHandle;
    do_name(     vectorizedHashCode_name,                         "vectorizedHashCode")                                  \
    do_signature(vectorizedHashCode_signature,                    "(Ljava/lang/Object;IIII)I")                           \
                                                                                                                         \
-  do_intrinsic(_compressStringC,          java_lang_StringUTF16,  compress_name, encodeISOArray_signature,       F_S)   \
-   do_name(     compress_name,                                   "compress")                                            \
-  do_intrinsic(_compressStringB,          java_lang_StringUTF16,  compress_name, indexOfI_signature,             F_S)   \
+  do_intrinsic(_compressStringC,          java_lang_StringUTF16,  compressString_name, encodeISOArray_signature, F_S)   \
+   do_name(     compressString_name,                                  "compress0")                                      \
+  do_intrinsic(_compressStringB,          java_lang_StringUTF16,  compressString_name, indexOfI_signature,       F_S)   \
   do_intrinsic(_inflateStringC,           java_lang_StringLatin1, inflate_name, inflateC_signature,              F_S)   \
-   do_name(     inflate_name,                                    "inflate")                                             \
+   do_name(     inflate_name,                                    "inflate0")                                            \
    do_signature(inflateC_signature,                              "([BI[CII)V")                                          \
   do_intrinsic(_inflateStringB,           java_lang_StringLatin1, inflate_name, inflateB_signature,              F_S)   \
    do_signature(inflateB_signature,                              "([BI[BII)V")                                          \
@@ -381,9 +382,9 @@ class methodHandle;
   do_intrinsic(_compareToLU,              java_lang_StringLatin1,compareToLU_name, compareTo_indexOf_signature,  F_S)   \
   do_intrinsic(_compareToUL,              java_lang_StringUTF16, compareToUL_name, compareTo_indexOf_signature,  F_S)   \
    do_signature(compareTo_indexOf_signature,                     "([B[B)I")                                             \
-   do_name(     compareTo_name,                                  "compareTo")                                           \
-   do_name(     compareToLU_name,                                "compareToUTF16")                                      \
-   do_name(     compareToUL_name,                                "compareToLatin1")                                     \
+   do_name(     compareTo_name,                                  "compareTo0")                                          \
+   do_name(     compareToLU_name,                                "compareToUTF16_0")                                    \
+   do_name(     compareToUL_name,                                "compareToLatin1_0")                                   \
   do_intrinsic(_indexOfL,                 java_lang_StringLatin1,indexOf_name, compareTo_indexOf_signature,      F_S)   \
   do_intrinsic(_indexOfU,                 java_lang_StringUTF16, indexOf_name, compareTo_indexOf_signature,      F_S)   \
   do_intrinsic(_indexOfUL,                java_lang_StringUTF16, indexOfUL_name, compareTo_indexOf_signature,    F_S)   \
@@ -392,12 +393,13 @@ class methodHandle;
   do_intrinsic(_indexOfIUL,               java_lang_StringUTF16, indexOfUL_name, indexOfI_signature,             F_S)   \
   do_intrinsic(_indexOfU_char,            java_lang_StringUTF16, indexOfChar_name, indexOfChar_signature,        F_S)   \
   do_intrinsic(_indexOfL_char,            java_lang_StringLatin1,indexOfChar_name, indexOfChar_signature,        F_S)   \
-   do_name(     indexOf_name,                                    "indexOf")                                             \
-   do_name(     indexOfChar_name,                                "indexOfChar")                                         \
-   do_name(     indexOfUL_name,                                  "indexOfLatin1")                                       \
+   do_name(     indexOf_name,                                    "indexOf0")                                            \
+   do_name(     indexOfChar_name,                                "indexOfChar0")                                        \
+   do_name(     indexOfUL_name,                                  "indexOfLatin1_0")                                     \
    do_signature(indexOfI_signature,                              "([BI[BII)I")                                          \
    do_signature(indexOfChar_signature,                           "([BIII)I")                                            \
-  do_intrinsic(_equalsL,                  java_lang_StringLatin1,equals_name, equalsB_signature,                 F_S)   \
+  do_intrinsic(_equalsL,                  java_lang_StringLatin1,equalsString_name, equalsB_signature,           F_S)   \
+   do_name(     equalsString_name,                               "equals0")                                             \
                                                                                                                         \
   do_intrinsic(_isDigit,                  java_lang_CharacterDataLatin1, isDigit_name,      int_bool_signature,  F_R)   \
    do_name(     isDigit_name,                                           "isDigit")                                      \
@@ -415,18 +417,18 @@ class methodHandle;
                                                                                                                         \
   do_class(java_lang_StringCoding,        "java/lang/StringCoding")                                                     \
   do_intrinsic(_countPositives,     java_lang_StringCoding, countPositives_name, countPositives_signature, F_S)         \
-   do_name(     countPositives_name,                       "countPositives")                                            \
+   do_name(     countPositives_name,                       "countPositives0")                                           \
    do_signature(countPositives_signature,                  "([BII)I")                                                   \
                                                                                                                         \
   do_class(sun_nio_cs_iso8859_1_Encoder,  "sun/nio/cs/ISO_8859_1$Encoder")                                              \
   do_intrinsic(_encodeISOArray,     sun_nio_cs_iso8859_1_Encoder, encodeISOArray_name, encodeISOArray_signature, F_S)   \
-   do_name(     encodeISOArray_name,                             "implEncodeISOArray")                                  \
+   do_name(     encodeISOArray_name,                             "encodeISOArray0")                                     \
    do_signature(encodeISOArray_signature,                        "([CI[BII)I")                                          \
                                                                                                                         \
   do_intrinsic(_encodeByteISOArray,     java_lang_StringCoding, encodeISOArray_name, indexOfI_signature,         F_S)   \
                                                                                                                         \
   do_intrinsic(_encodeAsciiArray,       java_lang_StringCoding, encodeAsciiArray_name, encodeISOArray_signature, F_S)   \
-   do_name(     encodeAsciiArray_name,                           "implEncodeAsciiArray")                                \
+   do_name(     encodeAsciiArray_name,                           "encodeAsciiArray0")                                   \
                                                                                                                         \
   do_class(java_math_BigInteger,                      "java/math/BigInteger")                                           \
   do_intrinsic(_multiplyToLen,      java_math_BigInteger, multiplyToLen_name, multiplyToLen_signature, F_S)             \
@@ -1003,7 +1005,7 @@ class methodHandle;
    do_signature(vector_unary_op_sig, "(I"                                                                                                      \
                                       "Ljava/lang/Class;"                                                                                      \
                                       "Ljava/lang/Class;"                                                                                      \
-                                      "Ljava/lang/Class;"                                                                                      \
+                                      "I"                                                                                                      \
                                       "I"                                                                                                      \
                                       "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                          \
                                       "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                      \
@@ -1015,7 +1017,7 @@ class methodHandle;
    do_signature(vector_binary_op_sig, "(I"                                                                                                     \
                                        "Ljava/lang/Class;"                                                                                     \
                                        "Ljava/lang/Class;"                                                                                     \
-                                       "Ljava/lang/Class;"                                                                                     \
+                                       "I"                                                                                                     \
                                        "I"                                                                                                     \
                                        "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                                  \
                                        "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                                  \
@@ -1027,7 +1029,7 @@ class methodHandle;
   do_intrinsic(_VectorUnaryLibOp, jdk_internal_vm_vector_VectorSupport, vector_unary_lib_op_name, vector_unary_lib_op_sig, F_S)                \
    do_signature(vector_unary_lib_op_sig,"(J"                                                                                                   \
                                          "Ljava/lang/Class;"                                                                                   \
-                                         "Ljava/lang/Class;"                                                                                   \
+                                         "I"                                                                                                   \
                                          "I"                                                                                                   \
                                          "Ljava/lang/String;"                                                                                  \
                                          "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                       \
@@ -1038,7 +1040,7 @@ class methodHandle;
   do_intrinsic(_VectorBinaryLibOp, jdk_internal_vm_vector_VectorSupport, vector_binary_lib_op_name, vector_binary_lib_op_sig, F_S)             \
    do_signature(vector_binary_lib_op_sig,"(J"                                                                                                  \
                                           "Ljava/lang/Class;"                                                                                  \
-                                          "Ljava/lang/Class;"                                                                                  \
+                                          "I"                                                                                                  \
                                           "I"                                                                                                  \
                                           "Ljava/lang/String;"                                                                                 \
                                           "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                               \
@@ -1051,7 +1053,7 @@ class methodHandle;
    do_signature(vector_ternary_op_sig, "(I"                                                                                                    \
                                         "Ljava/lang/Class;"                                                                                    \
                                         "Ljava/lang/Class;"                                                                                    \
-                                        "Ljava/lang/Class;"                                                                                    \
+                                        "I"                                                                                                    \
                                         "I"                                                                                                    \
                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                        \
                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                        \
@@ -1063,7 +1065,7 @@ class methodHandle;
                                                                                                                                                \
   do_intrinsic(_VectorSelectFromTwoVectorOp, jdk_internal_vm_vector_VectorSupport, vector_select_from_op_name, vector_select_from_op_sig, F_S) \
    do_signature(vector_select_from_op_sig, "(Ljava/lang/Class;"                                                                                \
-                                            "Ljava/lang/Class;"                                                                                \
+                                            "I"                                                                                                \
                                             "I"                                                                                                \
                                             "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                    \
                                             "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                    \
@@ -1074,7 +1076,7 @@ class methodHandle;
                                                                                                                                                \
   do_intrinsic(_VectorFromBitsCoerced, jdk_internal_vm_vector_VectorSupport, vector_frombits_coerced_name, vector_frombits_coerced_sig, F_S)   \
    do_signature(vector_frombits_coerced_sig, "(Ljava/lang/Class;"                                                                              \
-                                               "Ljava/lang/Class;"                                                                             \
+                                               "I"                                                                                             \
                                                "I"                                                                                             \
                                                "J"                                                                                             \
                                                "I"                                                                                             \
@@ -1085,7 +1087,7 @@ class methodHandle;
                                                                                                                                                \
   do_intrinsic(_VectorLoadOp, jdk_internal_vm_vector_VectorSupport, vector_load_op_name, vector_load_op_sig, F_S)                              \
    do_signature(vector_load_op_sig, "(Ljava/lang/Class;"                                                                                       \
-                                     "Ljava/lang/Class;"                                                                                       \
+                                     "I"                                                                                                       \
                                      "I"                                                                                                       \
                                      "Ljava/lang/Object;"                                                                                      \
                                      "J"                                                                                                       \
@@ -1100,7 +1102,7 @@ class methodHandle;
   do_intrinsic(_VectorLoadMaskedOp, jdk_internal_vm_vector_VectorSupport, vector_load_masked_op_name, vector_load_masked_op_sig, F_S)          \
    do_signature(vector_load_masked_op_sig, "(Ljava/lang/Class;"                                                                                \
                                             "Ljava/lang/Class;"                                                                                \
-                                            "Ljava/lang/Class;"                                                                                \
+                                            "I"                                                                                                \
                                             "I"                                                                                                \
                                             "Ljava/lang/Object;"                                                                               \
                                             "J"                                                                                                \
@@ -1116,7 +1118,7 @@ class methodHandle;
                                                                                                                                                \
   do_intrinsic(_VectorStoreOp, jdk_internal_vm_vector_VectorSupport, vector_store_op_name, vector_store_op_sig, F_S)                           \
    do_signature(vector_store_op_sig, "(Ljava/lang/Class;"                                                                                      \
-                                      "Ljava/lang/Class;"                                                                                      \
+                                      "I"                                                                                                      \
                                       "I"                                                                                                      \
                                       "Ljava/lang/Object;"                                                                                     \
                                       "J"                                                                                                      \
@@ -1131,7 +1133,7 @@ class methodHandle;
   do_intrinsic(_VectorStoreMaskedOp, jdk_internal_vm_vector_VectorSupport, vector_store_masked_op_name, vector_store_masked_op_sig, F_S)       \
    do_signature(vector_store_masked_op_sig, "(Ljava/lang/Class;"                                                                               \
                                              "Ljava/lang/Class;"                                                                               \
-                                             "Ljava/lang/Class;"                                                                               \
+                                             "I"                                                                                               \
                                              "I"                                                                                               \
                                              "Ljava/lang/Object;"                                                                              \
                                              "J"                                                                                               \
@@ -1148,7 +1150,7 @@ class methodHandle;
    do_signature(vector_reduction_coerced_sig, "(I"                                                                                             \
                                                "Ljava/lang/Class;"                                                                             \
                                                "Ljava/lang/Class;"                                                                             \
-                                               "Ljava/lang/Class;"                                                                             \
+                                               "I"                                                                                             \
                                                "I"                                                                                             \
                                                "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                 \
                                                "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                             \
@@ -1159,7 +1161,7 @@ class methodHandle;
   do_intrinsic(_VectorTest, jdk_internal_vm_vector_VectorSupport, vector_test_name, vector_test_sig, F_S)                                      \
    do_signature(vector_test_sig, "(I"                                                                                                          \
                                   "Ljava/lang/Class;"                                                                                          \
-                                  "Ljava/lang/Class;"                                                                                          \
+                                  "I"                                                                                                          \
                                   "I"                                                                                                          \
                                   "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                          \
                                   "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                          \
@@ -1170,7 +1172,7 @@ class methodHandle;
   do_intrinsic(_VectorBlend, jdk_internal_vm_vector_VectorSupport, vector_blend_name, vector_blend_sig, F_S)                                   \
    do_signature(vector_blend_sig, "(Ljava/lang/Class;"                                                                                         \
                                    "Ljava/lang/Class;"                                                                                         \
-                                   "Ljava/lang/Class;"                                                                                         \
+                                   "I"                                                                                                         \
                                    "I"                                                                                                         \
                                    "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                             \
                                    "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                             \
@@ -1182,7 +1184,8 @@ class methodHandle;
   do_intrinsic(_VectorCompare, jdk_internal_vm_vector_VectorSupport, vector_compare_name, vector_compare_sig, F_S)                             \
    do_signature(vector_compare_sig, "(I"                                                                                                       \
                                      "Ljava/lang/Class;"                                                                                       \
-                                     "Ljava/lang/Class;Ljava/lang/Class;"                                                                      \
+                                     "Ljava/lang/Class;"                                                                                       \
+                                     "I"                                                                                                       \
                                      "I"                                                                                                       \
                                      "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                           \
                                      "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                           \
@@ -1195,7 +1198,7 @@ class methodHandle;
    do_signature(vector_rearrange_sig, "(Ljava/lang/Class;"                                                                                     \
                                        "Ljava/lang/Class;"                                                                                     \
                                        "Ljava/lang/Class;"                                                                                     \
-                                       "Ljava/lang/Class;"                                                                                     \
+                                       "I"                                                                                                     \
                                        "I"                                                                                                     \
                                        "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                         \
                                        "Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;"                                                  \
@@ -1207,18 +1210,18 @@ class methodHandle;
   do_intrinsic(_VectorSelectFrom, jdk_internal_vm_vector_VectorSupport, vector_select_from_name, vector_select_from_sig, F_S)                  \
    do_signature(vector_select_from_sig, "(Ljava/lang/Class;"                                                                                   \
                                         "Ljava/lang/Class;"                                                                                     \
-                                        "Ljava/lang/Class;"                                                                                     \
+                                        "I"                                                                                                     \
                                         "I"                                                                                                     \
                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                         \
                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                         \
                                         "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                     \
                                         "Ljdk/internal/vm/vector/VectorSupport$VectorSelectFromOp;)"                                            \
                                         "Ljdk/internal/vm/vector/VectorSupport$Vector;")                                                        \
-   do_name(vector_select_from_name, "selectFromOp")                                                                                              \
+   do_name(vector_select_from_name, "selectFromOp")                                                                                            \
                                                                                                                                                \
   do_intrinsic(_VectorExtract, jdk_internal_vm_vector_VectorSupport, vector_extract_name, vector_extract_sig, F_S)                             \
    do_signature(vector_extract_sig, "(Ljava/lang/Class;"                                                                                       \
-                                     "Ljava/lang/Class;"                                                                                       \
+                                     "I"                                                                                                       \
                                      "I"                                                                                                       \
                                      "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                                    \
                                      "I"                                                                                                       \
@@ -1228,7 +1231,7 @@ class methodHandle;
                                                                                                                                                \
  do_intrinsic(_VectorInsert, jdk_internal_vm_vector_VectorSupport, vector_insert_name, vector_insert_sig, F_S)                                 \
    do_signature(vector_insert_sig, "(Ljava/lang/Class;"                                                                                        \
-                                    "Ljava/lang/Class;"                                                                                        \
+                                    "I"                                                                                                        \
                                     "I"                                                                                                        \
                                     "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                            \
                                     "IJ"                                                                                                       \
@@ -1240,7 +1243,7 @@ class methodHandle;
    do_signature(vector_broadcast_int_sig, "(I"                                                                                                 \
                                            "Ljava/lang/Class;"                                                                                 \
                                            "Ljava/lang/Class;"                                                                                 \
-                                           "Ljava/lang/Class;"                                                                                 \
+                                           "I"                                                                                                 \
                                            "I"                                                                                                 \
                                            "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                     \
                                            "I"                                                                                                 \
@@ -1252,10 +1255,10 @@ class methodHandle;
   do_intrinsic(_VectorConvert, jdk_internal_vm_vector_VectorSupport, vector_convert_name, vector_convert_sig, F_S)                             \
    do_signature(vector_convert_sig, "(I"                                                                                                       \
                                      "Ljava/lang/Class;"                                                                                       \
-                                     "Ljava/lang/Class;"                                                                                       \
+                                     "I"                                                                                                       \
                                      "I"                                                                                                       \
                                      "Ljava/lang/Class;"                                                                                       \
-                                     "Ljava/lang/Class;"                                                                                       \
+                                     "I"                                                                                                       \
                                      "I"                                                                                                       \
                                      "Ljdk/internal/vm/vector/VectorSupport$VectorPayload;"                                                    \
                                      "Ljdk/internal/vm/vector/VectorSupport$VectorSpecies;"                                                    \
@@ -1266,7 +1269,7 @@ class methodHandle;
    do_intrinsic(_VectorGatherOp, jdk_internal_vm_vector_VectorSupport, vector_gather_name, vector_gather_sig, F_S)                             \
     do_signature(vector_gather_sig, "(Ljava/lang/Class;"                                                                                       \
                                      "Ljava/lang/Class;"                                                                                       \
-                                     "Ljava/lang/Class;"                                                                                       \
+                                     "I"                                                                                                       \
                                      "I"                                                                                                       \
                                      "Ljava/lang/Class;"                                                                                       \
                                      "I"                                                                                                       \
@@ -1287,7 +1290,7 @@ class methodHandle;
    do_intrinsic(_VectorScatterOp, jdk_internal_vm_vector_VectorSupport, vector_scatter_name, vector_scatter_sig, F_S)                          \
     do_signature(vector_scatter_sig, "(Ljava/lang/Class;"                                                                                      \
                                       "Ljava/lang/Class;"                                                                                      \
-                                      "Ljava/lang/Class;"                                                                                      \
+                                      "I"                                                                                                      \
                                       "I"                                                                                                      \
                                       "Ljava/lang/Class;"                                                                                      \
                                       "I"                                                                                                      \
@@ -1309,7 +1312,7 @@ class methodHandle;
   do_intrinsic(_VectorMaskOp, jdk_internal_vm_vector_VectorSupport, vector_mask_oper_name, vector_mask_oper_sig, F_S)                          \
     do_signature(vector_mask_oper_sig, "(I"                                                                                                    \
                                         "Ljava/lang/Class;"                                                                                    \
-                                        "Ljava/lang/Class;"                                                                                    \
+                                        "I"                                                                                                    \
                                         "I"                                                                                                    \
                                         "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                    \
                                         "Ljdk/internal/vm/vector/VectorSupport$VectorMaskOp;)"                                                 \
@@ -1320,7 +1323,7 @@ class methodHandle;
    do_signature(vector_compress_expand_op_sig, "(I"                                                                                            \
                                       "Ljava/lang/Class;"                                                                                      \
                                       "Ljava/lang/Class;"                                                                                      \
-                                      "Ljava/lang/Class;"                                                                                      \
+                                      "I"                                                                                                      \
                                       "I"                                                                                                      \
                                       "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                          \
                                       "Ljdk/internal/vm/vector/VectorSupport$VectorMask;"                                                      \
@@ -1330,7 +1333,7 @@ class methodHandle;
                                                                                                                                                \
   do_intrinsic(_IndexVector, jdk_internal_vm_vector_VectorSupport, index_vector_op_name, index_vector_op_sig, F_S)                             \
     do_signature(index_vector_op_sig, "(Ljava/lang/Class;"                                                                                     \
-                                       "Ljava/lang/Class;"                                                                                     \
+                                       "I"                                                                                                     \
                                        "I"                                                                                                     \
                                        "Ljdk/internal/vm/vector/VectorSupport$Vector;"                                                         \
                                        "I"                                                                                                     \
@@ -1341,7 +1344,7 @@ class methodHandle;
                                                                                                                                                \
   do_intrinsic(_IndexPartiallyInUpperRange, jdk_internal_vm_vector_VectorSupport, index_partially_in_upper_range_name, index_partially_in_upper_range_sig, F_S)\
     do_signature(index_partially_in_upper_range_sig, "(Ljava/lang/Class;"                                                                                      \
-                                                     "Ljava/lang/Class;"                                                                                       \
+                                                     "I"                                                                                                       \
                                                      "I"                                                                                                       \
                                                      "J"                                                                                                       \
                                                      "J"                                                                                                       \
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index 8388b98faae..2ae42bebcfd 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,6 +98,7 @@ class SerializeClosure;
   template(jdk_internal_vm_vector_VectorMask,         "jdk/internal/vm/vector/VectorSupport$VectorMask")    \
   template(jdk_internal_vm_vector_VectorShuffle,      "jdk/internal/vm/vector/VectorSupport$VectorShuffle") \
   template(payload_name,                              "payload")                                            \
+  template(CTYPE_name,                                "CTYPE")                                              \
   template(ETYPE_name,                                "ETYPE")                                              \
   template(VLENGTH_name,                              "VLENGTH")                                            \
                                                                                                   \
@@ -245,10 +246,6 @@ class SerializeClosure;
                                                                                                   \
   /* Concurrency support */                                                                       \
   template(java_util_concurrent_locks_AbstractOwnableSynchronizer,           "java/util/concurrent/locks/AbstractOwnableSynchronizer") \
-  template(java_util_concurrent_atomic_AtomicIntegerFieldUpdater_Impl,       "java/util/concurrent/atomic/AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl") \
-  template(java_util_concurrent_atomic_AtomicLongFieldUpdater_CASUpdater,    "java/util/concurrent/atomic/AtomicLongFieldUpdater$CASUpdater") \
-  template(java_util_concurrent_atomic_AtomicLongFieldUpdater_LockedUpdater, "java/util/concurrent/atomic/AtomicLongFieldUpdater$LockedUpdater") \
-  template(java_util_concurrent_atomic_AtomicReferenceFieldUpdater_Impl,     "java/util/concurrent/atomic/AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl") \
   template(jdk_internal_vm_annotation_Contended_signature,                   "Ljdk/internal/vm/annotation/Contended;")    \
   template(jdk_internal_vm_annotation_ReservedStackAccess_signature,         "Ljdk/internal/vm/annotation/ReservedStackAccess;") \
   template(jdk_internal_ValueBased_signature,                                "Ljdk/internal/ValueBased;") \
@@ -302,6 +299,7 @@ class SerializeClosure;
   template(jdk_internal_misc_Scoped_signature,               "Ljdk/internal/misc/ScopedMemoryAccess$Scoped;") \
   template(jdk_internal_vm_annotation_IntrinsicCandidate_signature, "Ljdk/internal/vm/annotation/IntrinsicCandidate;") \
   template(jdk_internal_vm_annotation_Stable_signature,      "Ljdk/internal/vm/annotation/Stable;") \
+  template(jdk_internal_vm_annotation_TrustFinalFields_signature, "Ljdk/internal/vm/annotation/TrustFinalFields;") \
                                                                                                   \
   template(jdk_internal_vm_annotation_ChangesCurrentThread_signature,  "Ljdk/internal/vm/annotation/ChangesCurrentThread;")  \
   template(jdk_internal_vm_annotation_JvmtiHideEvents_signature,       "Ljdk/internal/vm/annotation/JvmtiHideEvents;")  \
@@ -751,8 +749,6 @@ class SerializeClosure;
   template(jdk_internal_vm_ThreadLock,             "jdk/internal/vm/ThreadSnapshot$ThreadLock")                   \
   template(jdk_internal_vm_ThreadLock_signature,   "Ljdk/internal/vm/ThreadSnapshot$ThreadLock;")                 \
   template(jdk_internal_vm_ThreadLock_array,       "[Ljdk/internal/vm/ThreadSnapshot$ThreadLock;")                \
-  template(java_lang_StackTraceElement_of_name,    "of")                                                          \
-  template(java_lang_StackTraceElement_of_signature, "([Ljava/lang/StackTraceElement;)[Ljava/lang/StackTraceElement;") \
                                                                                                                   \
   /* jcmd Thread.vthread_scheduler and Thread.vthread_pollers */                                                  \
   template(jdk_internal_vm_JcmdVThreadCommands,    "jdk/internal/vm/JcmdVThreadCommands")                         \
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 0314c5227d2..e5f68afc51d 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,11 @@
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/heapShared.hpp"
+#include "ci/ciUtilities.hpp"
 #include "classfile/javaAssertions.hpp"
 #include "code/aotCodeCache.hpp"
 #include "code/codeCache.hpp"
+#include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/gcConfig.hpp"
 #include "logging/logStream.hpp"
 #include "memory/memoryReserver.hpp"
@@ -53,6 +55,7 @@
 #endif
 #if INCLUDE_G1GC
 #include "gc/g1/g1BarrierSetRuntime.hpp"
+#include "gc/g1/g1HeapRegion.hpp"
 #endif
 #if INCLUDE_SHENANDOAHGC
 #include "gc/shenandoah/shenandoahRuntime.hpp"
@@ -258,6 +261,9 @@ void AOTCodeCache::init2() {
     return;
   }
 
+  // initialize aot runtime constants as appropriate to this runtime
+  AOTRuntimeConstants::initialize_from_runtime();
+
   // initialize the table of external routines so we can save
   // generated code blobs that reference them
   AOTCodeAddressTable* table = opened_cache->_table;
@@ -399,7 +405,7 @@ AOTCodeCache::~AOTCodeCache() {
   }
 }
 
-void AOTCodeCache::Config::record() {
+void AOTCodeCache::Config::record(uint cpu_features_offset) {
   _flags = 0;
 #ifdef ASSERT
   _flags |= debugVM;
@@ -430,9 +436,50 @@ void AOTCodeCache::Config::record() {
   _compressedKlassShift  = CompressedKlassPointers::shift();
   _contendedPaddingWidth = ContendedPaddingWidth;
   _gc                    = (uint)Universe::heap()->kind();
+  _cpu_features_offset   = cpu_features_offset;
 }
 
-bool AOTCodeCache::Config::verify() const {
+bool AOTCodeCache::Config::verify_cpu_features(AOTCodeCache* cache) const {
+  LogStreamHandle(Debug, aot, codecache, init) log;
+  uint offset = _cpu_features_offset;
+  uint cpu_features_size = *(uint *)cache->addr(offset);
+  assert(cpu_features_size == (uint)VM_Version::cpu_features_size(), "must be");
+  offset += sizeof(uint);
+
+  void* cached_cpu_features_buffer = (void *)cache->addr(offset);
+  if (log.is_enabled()) {
+    ResourceMark rm; // required for stringStream::as_string()
+    stringStream ss;
+    VM_Version::get_cpu_features_name(cached_cpu_features_buffer, ss);
+    log.print_cr("CPU features recorded in AOTCodeCache: %s", ss.as_string());
+  }
+
+  if (VM_Version::supports_features(cached_cpu_features_buffer)) {
+    if (log.is_enabled()) {
+      ResourceMark rm; // required for stringStream::as_string()
+      stringStream ss;
+      char* runtime_cpu_features = NEW_RESOURCE_ARRAY(char, VM_Version::cpu_features_size());
+      VM_Version::store_cpu_features(runtime_cpu_features);
+      VM_Version::get_missing_features_name(runtime_cpu_features, cached_cpu_features_buffer, ss);
+      if (!ss.is_empty()) {
+        log.print_cr("Additional runtime CPU features: %s", ss.as_string());
+      }
+    }
+  } else {
+    if (log.is_enabled()) {
+      ResourceMark rm; // required for stringStream::as_string()
+      stringStream ss;
+      char* runtime_cpu_features = NEW_RESOURCE_ARRAY(char, VM_Version::cpu_features_size());
+      VM_Version::store_cpu_features(runtime_cpu_features);
+      VM_Version::get_missing_features_name(cached_cpu_features_buffer, runtime_cpu_features, ss);
+      log.print_cr("AOT Code Cache disabled: required cpu features are missing: %s", ss.as_string());
+    }
+    return false;
+  }
+  return true;
+}
+
+bool AOTCodeCache::Config::verify(AOTCodeCache* cache) const {
   // First checks affect all cached AOT code
 #ifdef ASSERT
   if ((_flags & debugVM) == 0) {
@@ -478,6 +525,9 @@ bool AOTCodeCache::Config::verify() const {
     AOTStubCaching = false;
   }
 
+  if (!verify_cpu_features(cache)) {
+    return false;
+  }
   return true;
 }
 
@@ -679,6 +729,17 @@ extern "C" {
   }
 }
 
+void AOTCodeCache::store_cpu_features(char*& buffer, uint buffer_size) {
+  uint* size_ptr = (uint *)buffer;
+  *size_ptr = buffer_size;
+  buffer += sizeof(uint);
+
+  VM_Version::store_cpu_features(buffer);
+  log_debug(aot, codecache, exit)("CPU features recorded in AOTCodeCache: %s", VM_Version::features_string());
+  buffer += buffer_size;
+  buffer = align_up(buffer, DATA_ALIGNMENT);
+}
+
 bool AOTCodeCache::finish_write() {
   if (!align_write()) {
     return false;
@@ -698,23 +759,32 @@ bool AOTCodeCache::finish_write() {
 
   uint store_count = _store_entries_cnt;
   if (store_count > 0) {
-    uint header_size = (uint)align_up(sizeof(AOTCodeCache::Header),  DATA_ALIGNMENT);
+    uint header_size = (uint)align_up(sizeof(AOTCodeCache::Header), DATA_ALIGNMENT);
     uint code_count = store_count;
     uint search_count = code_count * 2;
     uint search_size = search_count * sizeof(uint);
     uint entries_size = (uint)align_up(code_count * sizeof(AOTCodeEntry), DATA_ALIGNMENT); // In bytes
     // _write_position includes size of code and strings
     uint code_alignment = code_count * DATA_ALIGNMENT; // We align_up code size when storing it.
-    uint total_size = header_size + _write_position + code_alignment + search_size + entries_size;
+    uint cpu_features_size = VM_Version::cpu_features_size();
+    uint total_cpu_features_size = sizeof(uint) + cpu_features_size; // sizeof(uint) to store cpu_features_size
+    uint total_size = header_size + _write_position + code_alignment + search_size + entries_size +
+                      align_up(total_cpu_features_size, DATA_ALIGNMENT);
     assert(total_size < max_aot_code_size(), "AOT Code size (" UINT32_FORMAT " bytes) is greater than AOTCodeMaxSize(" UINT32_FORMAT " bytes).", total_size, max_aot_code_size());
 
-    // Create ordered search table for entries [id, index];
-    uint* search = NEW_C_HEAP_ARRAY(uint, search_count, mtCode);
     // Allocate in AOT Cache buffer
     char* buffer = (char *)AOTCacheAccess::allocate_aot_code_region(total_size + DATA_ALIGNMENT);
     char* start = align_up(buffer, DATA_ALIGNMENT);
     char* current = start + header_size; // Skip header
 
+    uint cpu_features_offset = current - start;
+    store_cpu_features(current, cpu_features_size);
+    assert(is_aligned(current, DATA_ALIGNMENT), "sanity check");
+    assert(current < start + total_size, "sanity check");
+
+    // Create ordered search table for entries [id, index];
+    uint* search = NEW_C_HEAP_ARRAY(uint, search_count, mtCode);
+
     AOTCodeEntry* entries_address = _store_entries; // Pointer to latest entry
     uint adapters_count = 0;
     uint shared_blobs_count = 0;
@@ -790,7 +860,7 @@ bool AOTCodeCache::finish_write() {
     header->init(size, (uint)strings_count, strings_offset,
                  entries_count, new_entries_offset,
                  adapters_count, shared_blobs_count,
-                 C1_blobs_count, C2_blobs_count);
+                 C1_blobs_count, C2_blobs_count, cpu_features_offset);
 
     log_info(aot, codecache, exit)("Wrote %d AOT code entries to AOT Code Cache", entries_count);
   }
@@ -1371,6 +1441,7 @@ void AOTCodeAddressTable::init_extrs() {
   SET_ADDRESS(_extrs, ShenandoahRuntime::load_reference_barrier_phantom_narrow);
 #endif
 #if INCLUDE_ZGC
+  SET_ADDRESS(_extrs, ZBarrierSetRuntime::load_barrier_on_oop_field_preloaded_addr());
   SET_ADDRESS(_extrs, ZBarrierSetRuntime::load_barrier_on_phantom_oop_field_preloaded_addr());
 #if defined(AMD64)
   SET_ADDRESS(_extrs, &ZPointerLoadShift);
@@ -1382,6 +1453,12 @@ void AOTCodeAddressTable::init_extrs() {
 #endif
 #endif // ZERO
 
+  // addresses of fields in AOT runtime constants area
+  address* p = AOTRuntimeConstants::field_addresses_list();
+  while (*p != nullptr) {
+    SET_ADDRESS(_extrs, *p++);
+  }
+
   _extrs_complete = true;
   log_debug(aot, codecache, init)("External addresses recorded");
 }
@@ -1664,6 +1741,11 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
   if (addr == (address)-1) { // Static call stub has jump to itself
     return id;
   }
+  // Check card_table_base address first since it can point to any address
+  BarrierSet* bs = BarrierSet::barrier_set();
+  bool is_const_card_table_base = !UseG1GC && !UseShenandoahGC && bs->is_a(BarrierSet::CardTableBarrierSet);
+  guarantee(!is_const_card_table_base || addr != ci_card_table_address_const(), "sanity");
+
   // Seach for C string
   id = id_for_C_string(addr);
   if (id >= 0) {
@@ -1733,6 +1815,44 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
   return id;
 }
 
+AOTRuntimeConstants AOTRuntimeConstants::_aot_runtime_constants;
+
+void AOTRuntimeConstants::initialize_from_runtime() {
+  BarrierSet* bs = BarrierSet::barrier_set();
+  address card_table_base = nullptr;
+  uint grain_shift = 0;
+#if INCLUDE_G1GC
+  if (bs->is_a(BarrierSet::G1BarrierSet)) {
+    grain_shift = G1HeapRegion::LogOfHRGrainBytes;
+  } else
+#endif
+#if INCLUDE_SHENANDOAHGC
+  if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+    grain_shift = 0;
+  } else
+#endif
+  if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
+    CardTable::CardValue* base = ci_card_table_address_const();
+    assert(base != nullptr, "unexpected byte_map_base");
+    card_table_base = base;
+    CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
+    grain_shift = ctbs->grain_shift();
+  }
+  _aot_runtime_constants._card_table_base = card_table_base;
+  _aot_runtime_constants._grain_shift = grain_shift;
+}
+
+address AOTRuntimeConstants::_field_addresses_list[] = {
+  ((address)&_aot_runtime_constants._card_table_base),
+  ((address)&_aot_runtime_constants._grain_shift),
+  nullptr
+};
+
+address AOTRuntimeConstants::card_table_base_address() {
+  assert(UseSerialGC || UseParallelGC, "Only these GCs have constant card table base");
+  return (address)&_aot_runtime_constants._card_table_base;
+}
+
 // This is called after initialize() but before init2()
 // and _cache is not set yet.
 void AOTCodeCache::print_on(outputStream* st) {
diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp
index 778ad34e448..85f8b47920f 100644
--- a/src/hotspot/share/code/aotCodeCache.hpp
+++ b/src/hotspot/share/code/aotCodeCache.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #ifndef SHARE_CODE_AOTCODECACHE_HPP
 #define SHARE_CODE_AOTCODECACHE_HPP
 
+#include "gc/shared/gc_globals.hpp"
 #include "runtime/stubInfo.hpp"
 
 /*
@@ -185,10 +186,12 @@ protected:
       restrictContendedPadding = 128
     };
     uint _flags;
+    uint _cpu_features_offset; // offset in the cache where cpu features are stored
 
   public:
-    void record();
-    bool verify() const;
+    void record(uint cpu_features_offset);
+    bool verify_cpu_features(AOTCodeCache* cache) const;
+    bool verify(AOTCodeCache* cache) const;
   };
 
   class Header : public CHeapObj<mtCode> {
@@ -206,14 +209,15 @@ protected:
     uint   _shared_blobs_count;
     uint   _C1_blobs_count;
     uint   _C2_blobs_count;
-    Config _config;
+    Config _config; // must be the last element as there is trailing data stored immediately after Config
 
   public:
     void init(uint cache_size,
               uint strings_count,  uint strings_offset,
               uint entries_count,  uint entries_offset,
               uint adapters_count, uint shared_blobs_count,
-              uint C1_blobs_count, uint C2_blobs_count) {
+              uint C1_blobs_count, uint C2_blobs_count,
+              uint cpu_features_offset) {
       _version        = AOT_CODE_VERSION;
       _cache_size     = cache_size;
       _strings_count  = strings_count;
@@ -224,7 +228,7 @@ protected:
       _shared_blobs_count = shared_blobs_count;
       _C1_blobs_count = C1_blobs_count;
       _C2_blobs_count = C2_blobs_count;
-      _config.record();
+      _config.record(cpu_features_offset);
     }
 
 
@@ -239,8 +243,8 @@ protected:
     uint C2_blobs_count() const { return _C2_blobs_count; }
 
     bool verify(uint load_size)  const;
-    bool verify_config() const { // Called after Universe initialized
-      return _config.verify();
+    bool verify_config(AOTCodeCache* cache) const { // Called after Universe initialized
+      return _config.verify(cache);
     }
   };
 
@@ -320,6 +324,8 @@ public:
 
   AOTCodeEntry* find_entry(AOTCodeEntry::Kind kind, uint id);
 
+  void store_cpu_features(char*& buffer, uint buffer_size);
+
   bool finish_write();
 
   bool write_relocations(CodeBlob& code_blob);
@@ -361,7 +367,7 @@ private:
   static bool open_cache(bool is_dumping, bool is_using);
   bool verify_config() {
     if (for_use()) {
-      return _load_header->verify_config();
+      return _load_header->verify_config(this);
     }
     return true;
   }
@@ -417,4 +423,36 @@ public:
 #endif // PRODUCT
 };
 
+// code cache internal runtime constants area used by AOT code
+class AOTRuntimeConstants {
+ friend class AOTCodeCache;
+ private:
+  address _card_table_base;
+  uint    _grain_shift;
+  static address _field_addresses_list[];
+  static AOTRuntimeConstants _aot_runtime_constants;
+  // private constructor for unique singleton
+  AOTRuntimeConstants() { }
+  // private for use by friend class AOTCodeCache
+  static void initialize_from_runtime();
+ public:
+#if INCLUDE_CDS
+  static bool contains(address adr) {
+    address base = (address)&_aot_runtime_constants;
+    address hi = base + sizeof(AOTRuntimeConstants);
+    return (base <= adr && adr < hi);
+  }
+  static address card_table_base_address();
+  static address grain_shift_address() { return (address)&_aot_runtime_constants._grain_shift; }
+  static address* field_addresses_list() {
+    return _field_addresses_list;
+  }
+#else
+  static bool contains(address adr)        { return false; }
+  static address card_table_base_address() { return nullptr; }
+  static address grain_shift_address()     { return nullptr; }
+  static address* field_addresses_list()   { return nullptr; }
+#endif
+};
+
 #endif // SHARE_CODE_AOTCODECACHE_HPP
diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index a0a34ec23fa..fcc0b42a461 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -336,6 +336,7 @@ RuntimeBlob::RuntimeBlob(
 
 void RuntimeBlob::free(RuntimeBlob* blob) {
   assert(blob != nullptr, "caller must check for nullptr");
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
   blob->purge();
   {
@@ -520,6 +521,8 @@ VtableBlob* VtableBlob::create(const char* name, int buffer_size) {
       // eventually.
       return nullptr;
     }
+
+    MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
     blob = new (size) VtableBlob(name, size);
     CodeCache_lock->unlock();
   }
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 95a2fb908de..2a0256cc316 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -248,13 +248,61 @@ void CodeCache::initialize_heaps() {
     set_size_of_unset_code_heap(&non_nmethod, cache_size, profiled.size + non_profiled.size, non_nmethod_min_size);
   }
 
-  size_t total = non_nmethod.size + profiled.size + non_profiled.size;
-  if (total != cache_size && !cache_size_set) {
-    log_info(codecache)("ReservedCodeCache size %zuK changed to total segments size NonNMethod "
-                        "%zuK NonProfiled %zuK Profiled %zuK = %zuK",
-                        cache_size/K, non_nmethod.size/K, non_profiled.size/K, profiled.size/K, total/K);
-    // Adjust ReservedCodeCacheSize as necessary because it was not set explicitly
-    cache_size = total;
+  // Note: if large page support is enabled, min_size is at least the large
+  // page size. This ensures that the code cache is covered by large pages.
+  non_nmethod.size = align_up(non_nmethod.size, min_size);
+  profiled.size = align_up(profiled.size, min_size);
+  non_profiled.size = align_up(non_profiled.size, min_size);
+
+  size_t aligned_total = non_nmethod.size + profiled.size + non_profiled.size;
+  if (!cache_size_set) {
+    // If ReservedCodeCacheSize is explicitly set and exceeds CODE_CACHE_SIZE_LIMIT,
+    // it is rejected by flag validation elsewhere. Here we only handle the case
+    // where ReservedCodeCacheSize is not set explicitly, but the computed segmented
+    // sizes (after alignment) exceed the platform limit.
+    if (aligned_total > CODE_CACHE_SIZE_LIMIT) {
+      err_msg message("ReservedCodeCacheSize (%zuK), Max (%zuK)."
+                      "Segments: NonNMethod (%zuK), NonProfiled (%zuK), Profiled (%zuK).",
+                      aligned_total/K, CODE_CACHE_SIZE_LIMIT/K,
+                      non_nmethod.size/K, non_profiled.size/K, profiled.size/K);
+      vm_exit_during_initialization("Code cache size exceeds platform limit", message);
+    }
+    if (aligned_total != cache_size) {
+      log_info(codecache)("ReservedCodeCache size %zuK changed to total segments size NonNMethod "
+                          "%zuK NonProfiled %zuK Profiled %zuK = %zuK",
+                          cache_size/K, non_nmethod.size/K, non_profiled.size/K, profiled.size/K, aligned_total/K);
+      // Adjust ReservedCodeCacheSize as necessary because it was not set explicitly
+      cache_size = aligned_total;
+    }
+  } else {
+    check_min_size("reserved code cache", cache_size, min_cache_size);
+    // ReservedCodeCacheSize was set explicitly, so treat it as a hard cap.
+    // If alignment causes the total to exceed the cap, shrink unset heaps
+    // in min_size steps, never below their minimum sizes.
+    //
+    // A total smaller than cache_size typically happens when all segment sizes
+    // are explicitly set. In that case there is nothing to adjust, so we
+    // only validate the sizes.
+    if (aligned_total > cache_size) {
+      size_t delta = (aligned_total - cache_size) / min_size;
+      while (delta > 0) {
+        size_t start_delta = delta;
+        // Do not shrink the non-nmethod heap here: running out of non-nmethod space
+        // is more critical and may lead to unrecoverable VM errors.
+        if (non_profiled.enabled && !non_profiled.set && non_profiled.size > min_size) {
+          non_profiled.size -= min_size;
+          if (--delta == 0) break;
+        }
+        if (profiled.enabled && !profiled.set && profiled.size > min_size) {
+          profiled.size -= min_size;
+          delta--;
+        }
+        if (delta == start_delta) {
+          break;
+        }
+      }
+      aligned_total = non_nmethod.size + profiled.size + non_profiled.size;
+    }
   }
 
   log_debug(codecache)("Initializing code heaps ReservedCodeCache %zuK NonNMethod %zuK"
@@ -270,12 +318,9 @@ void CodeCache::initialize_heaps() {
   if (non_profiled.enabled) { // non_profiled.enabled is always ON for segmented code heap, leave it checked for clarity
     check_min_size("non-profiled code heap", non_profiled.size, min_size);
   }
-  if (cache_size_set) {
-    check_min_size("reserved code cache", cache_size, min_cache_size);
-  }
 
   // ReservedCodeCacheSize was set explicitly, so report an error and abort if it doesn't match the segment sizes
-  if (total != cache_size && cache_size_set) {
+  if (aligned_total != cache_size && cache_size_set) {
     err_msg message("NonNMethodCodeHeapSize (%zuK)", non_nmethod.size/K);
     if (profiled.enabled) {
       message.append(" + ProfiledCodeHeapSize (%zuK)", profiled.size/K);
@@ -283,8 +328,8 @@ void CodeCache::initialize_heaps() {
     if (non_profiled.enabled) {
       message.append(" + NonProfiledCodeHeapSize (%zuK)", non_profiled.size/K);
     }
-    message.append(" = %zuK", total/K);
-    message.append((total > cache_size) ? " is greater than " : " is less than ");
+    message.append(" = %zuK", aligned_total/K);
+    message.append((aligned_total > cache_size) ? " is greater than " : " is less than ");
     message.append("ReservedCodeCacheSize (%zuK).", cache_size/K);
 
     vm_exit_during_initialization("Invalid code heap sizes", message);
@@ -300,13 +345,6 @@ void CodeCache::initialize_heaps() {
     }
   }
 
-  // Note: if large page support is enabled, min_size is at least the large
-  // page size. This ensures that the code cache is covered by large pages.
-  non_nmethod.size = align_up(non_nmethod.size, min_size);
-  profiled.size = align_up(profiled.size, min_size);
-  non_profiled.size = align_up(non_profiled.size, min_size);
-  cache_size = non_nmethod.size + profiled.size + non_profiled.size;
-
   FLAG_SET_ERGO(NonNMethodCodeHeapSize, non_nmethod.size);
   FLAG_SET_ERGO(ProfiledCodeHeapSize, profiled.size);
   FLAG_SET_ERGO(NonProfiledCodeHeapSize, non_profiled.size);
@@ -1101,7 +1139,7 @@ size_t CodeCache::freelists_length() {
 void icache_init();
 
 void CodeCache::initialize() {
-  assert(CodeCacheSegmentSize >= (size_t)CodeEntryAlignment, "CodeCacheSegmentSize must be large enough to align entry points");
+  assert(CodeCacheSegmentSize >= CodeEntryAlignment, "CodeCacheSegmentSize must be large enough to align entry points");
 #ifdef COMPILER2
   assert(CodeCacheSegmentSize >= (size_t)OptoLoopAlignment,  "CodeCacheSegmentSize must be large enough to align inner loops");
 #endif
diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp
index d90695739a1..dbfe1cd884e 100644
--- a/src/hotspot/share/code/dependencies.cpp
+++ b/src/hotspot/share/code/dependencies.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1124,7 +1124,7 @@ class AbstractClassHierarchyWalker {
   Klass* find_witness(InstanceKlass* context_type, KlassDepChange* changes = nullptr);
 
   static void init();
-  static void print_statistics();
+  NOT_PRODUCT(static void print_statistics();)
 };
 
 PerfCounter* AbstractClassHierarchyWalker::_perf_find_witness_anywhere_calls_count = nullptr;
@@ -2277,6 +2277,7 @@ bool KlassDepChange::involves_context(Klass* k) {
   return is_contained;
 }
 
+#ifndef PRODUCT
 void Dependencies::print_statistics() {
   AbstractClassHierarchyWalker::print_statistics();
 }
@@ -2302,6 +2303,7 @@ void AbstractClassHierarchyWalker::print_statistics() {
     }
   }
 }
+#endif
 
 CallSiteDepChange::CallSiteDepChange(Handle call_site, Handle method_handle) :
   _call_site(call_site),
diff --git a/src/hotspot/share/code/dependencies.hpp b/src/hotspot/share/code/dependencies.hpp
index d11c51a66dc..582a08183f9 100644
--- a/src/hotspot/share/code/dependencies.hpp
+++ b/src/hotspot/share/code/dependencies.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -649,7 +649,7 @@ class Dependencies: public ResourceObj {
   };
   friend class Dependencies::DepStream;
 
-  static void print_statistics();
+  NOT_PRODUCT(static void print_statistics();)
 };
 
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index edfca5c98ee..4c2f9157b99 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -938,7 +938,8 @@ address nmethod::continuation_for_implicit_exception(address pc, bool for_div0_c
     stringStream ss;
     ss.print_cr("implicit exception happened at " INTPTR_FORMAT, p2i(pc));
     print_on(&ss);
-    method()->print_codes_on(&ss);
+    // Buffering to a stringStream, disable internal buffering so it's not done twice.
+    method()->print_codes_on(&ss, 0, false);
     print_code_on(&ss);
     print_pcs_on(&ss);
     tty->print("%s", ss.as_string()); // print all at once
@@ -2137,6 +2138,9 @@ void nmethod::make_deoptimized() {
   ResourceMark rm;
   RelocIterator iter(this, oops_reloc_begin());
 
+  // Assume there will be some calls to make deoptimized.
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   while (iter.next()) {
 
     switch (iter.type()) {
@@ -2213,6 +2217,7 @@ void nmethod::verify_clean_inline_caches() {
 }
 
 void nmethod::mark_as_maybe_on_stack() {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   AtomicAccess::store(&_gc_epoch, CodeCache::gc_epoch());
 }
 
@@ -2305,6 +2310,8 @@ bool nmethod::make_not_entrant(InvalidationReason invalidation_reason) {
     return false;
   }
 
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   {
     // Enter critical section.  Does not block for safepoint.
     ConditionalMutexLocker ml(NMethodState_lock, !NMethodState_lock->owned_by_self(), Mutex::_no_safepoint_check_flag);
@@ -2740,6 +2747,8 @@ bool nmethod::is_unloading() {
   state_is_unloading = IsUnloadingBehaviour::is_unloading(this);
   uint8_t new_state = IsUnloadingState::create(state_is_unloading, state_unloading_cycle);
 
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   // Note that if an nmethod has dead oops, everyone will agree that the
   // nmethod is_unloading. However, the is_cold heuristics can yield
   // different outcomes, so we guard the computed result with a CAS
diff --git a/src/hotspot/share/code/vtableStubs.cpp b/src/hotspot/share/code/vtableStubs.cpp
index b926888595d..35b226a8798 100644
--- a/src/hotspot/share/code/vtableStubs.cpp
+++ b/src/hotspot/share/code/vtableStubs.cpp
@@ -51,6 +51,9 @@ VMReg   VtableStub::_receiver_location = VMRegImpl::Bad();
 void* VtableStub::operator new(size_t size, int code_size) throw() {
   assert_lock_strong(VtableStubs_lock);
   assert(size == sizeof(VtableStub), "mismatched size");
+
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   // compute real VtableStub size (rounded to nearest word)
   const int real_size = align_up(code_size + (int)sizeof(VtableStub), wordSize);
   // malloc them in chunks to minimize header overhead
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 574f4d6543b..7b236ed3589 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2346,12 +2346,18 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
 
       /* Repeat compilation without installing code for profiling purposes */
       int repeat_compilation_count = directive->RepeatCompilationOption;
-      while (repeat_compilation_count > 0) {
-        ResourceMark rm(thread);
-        task->print_ul("NO CODE INSTALLED");
-        thread->timeout()->reset();
-        comp->compile_method(&ci_env, target, osr_bci, false, directive);
-        repeat_compilation_count--;
+      if (repeat_compilation_count > 0) {
+        CHeapStringHolder failure_reason;
+        failure_reason.set(ci_env._failure_reason.get());
+        while (repeat_compilation_count > 0) {
+          ResourceMark rm(thread);
+          task->print_ul("NO CODE INSTALLED");
+          thread->timeout()->reset();
+          ci_env._failure_reason.clear();
+          comp->compile_method(&ci_env, target, osr_bci, false, directive);
+          repeat_compilation_count--;
+        }
+        ci_env._failure_reason.set(failure_reason.get());
       }
     }
 
diff --git a/src/hotspot/share/compiler/compilerDefinitions.cpp b/src/hotspot/share/compiler/compilerDefinitions.cpp
index aed1edc0db5..9bd6e893bcd 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.cpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -404,14 +404,12 @@ void CompilerConfig::set_compilation_policy_flags() {
 #endif
 
   if (CompilerConfig::is_tiered() && CompilerConfig::is_c2_enabled()) {
-#ifdef COMPILER2
-    // Some inlining tuning
-#if defined(X86) || defined(AARCH64) || defined(RISCV64)
+#if defined(COMPILER2) && defined(_LP64)
+    // LP64 specific inlining tuning for C2
     if (FLAG_IS_DEFAULT(InlineSmallCode)) {
       FLAG_SET_DEFAULT(InlineSmallCode, 2500);
     }
 #endif
-#endif // COMPILER2
   }
 
 }
diff --git a/src/hotspot/share/compiler/disassembler.cpp b/src/hotspot/share/compiler/disassembler.cpp
index c79c15e0f32..2c1ef235e07 100644
--- a/src/hotspot/share/compiler/disassembler.cpp
+++ b/src/hotspot/share/compiler/disassembler.cpp
@@ -607,10 +607,27 @@ void decode_env::print_address(address adr) {
       return;
     }
 
+    address card_table_base = nullptr;
     BarrierSet* bs = BarrierSet::barrier_set();
-    if (bs->is_a(BarrierSet::CardTableBarrierSet) &&
-        adr == ci_card_table_address_as<address>()) {
-      st->print("word_map_base");
+#if INCLUDE_G1GC
+    if (bs->is_a(BarrierSet::G1BarrierSet)) {
+      G1BarrierSet* g1bs = barrier_set_cast<G1BarrierSet>(bs);
+      card_table_base = g1bs->card_table()->byte_map_base();
+    } else
+#endif
+#if INCLUDE_SHENANDOAHGC
+    if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+      ShenandoahBarrierSet* sbs = barrier_set_cast<ShenandoahBarrierSet>(bs);
+      if (sbs->card_table() != nullptr) {
+        card_table_base = sbs->card_table()->byte_map_base();
+      }
+    } else
+#endif
+    if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
+      card_table_base = ci_card_table_address_as<address>();
+    }
+    if (card_table_base != nullptr && adr == card_table_base) {
+      st->print("card_table_base");
       if (WizardMode) st->print(" " INTPTR_FORMAT, p2i(adr));
       return;
     }
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index 59ab69b2427..e32daa3d79e 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2022, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -34,7 +34,6 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/ostream.hpp"
 
@@ -75,6 +74,10 @@ jint EpsilonHeap::initialize() {
 void EpsilonHeap::initialize_serviceability() {
   _pool = new EpsilonMemoryPool(this);
   _memory_manager.add_pool(_pool);
+}
+
+void EpsilonHeap::post_initialize() {
+  CollectedHeap::post_initialize();
   _monitoring_support->mark_ready();
 }
 
diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
index 8d7aa7960fd..ef75f7c1bb9 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp
@@ -69,6 +69,7 @@ public:
 
   jint initialize() override;
   void initialize_serviceability() override;
+  void post_initialize() override;
 
   GrowableArray<GCMemoryManager*> memory_managers() override;
   GrowableArray<MemoryPool*> memory_pools() override;
diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 61402301eb1..34d31702e80 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -351,7 +351,6 @@ Node* G1BarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) co
 
 Node* G1BarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
                                                      Node* new_val, const Type* value_type) const {
-  GraphKit* kit = access.kit();
   if (!access.is_oop()) {
     return BarrierSetC2::atomic_cmpxchg_val_at_resolved(access, expected_val, new_val, value_type);
   }
@@ -361,7 +360,6 @@ Node* G1BarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess& access
 
 Node* G1BarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAccess& access, Node* expected_val,
                                                       Node* new_val, const Type* value_type) const {
-  GraphKit* kit = access.kit();
   if (!access.is_oop()) {
     return BarrierSetC2::atomic_cmpxchg_bool_at_resolved(access, expected_val, new_val, value_type);
   }
@@ -370,7 +368,6 @@ Node* G1BarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAccess& acces
 }
 
 Node* G1BarrierSetC2::atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const {
-  GraphKit* kit = access.kit();
   if (!access.is_oop()) {
     return BarrierSetC2::atomic_xchg_at_resolved(access, new_val, value_type);
   }
diff --git a/src/hotspot/share/gc/g1/g1Arguments.cpp b/src/hotspot/share/gc/g1/g1Arguments.cpp
index 58e76cdd43a..8bec6e7e86f 100644
--- a/src/hotspot/share/gc/g1/g1Arguments.cpp
+++ b/src/hotspot/share/gc/g1/g1Arguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -209,6 +209,17 @@ void G1Arguments::initialize() {
     FLAG_SET_DEFAULT(GCTimeRatio, 24);
   }
 
+  // Do not interfere with GC-Pressure driven heap resizing unless the user
+  // explicitly sets otherwise. G1 heap sizing should be free to grow or shrink
+  // the heap based on GC pressure, rather than being forced to satisfy
+  // MinHeapFreeRatio or MaxHeapFreeRatio defaults that the user did not set.
+  if (FLAG_IS_DEFAULT(MinHeapFreeRatio)) {
+    FLAG_SET_DEFAULT(MinHeapFreeRatio, 0);
+  }
+  if (FLAG_IS_DEFAULT(MaxHeapFreeRatio)) {
+    FLAG_SET_DEFAULT(MaxHeapFreeRatio, 100);
+  }
+
   // Below, we might need to calculate the pause time interval based on
   // the pause target. When we do so we are going to give G1 maximum
   // flexibility and allow it to do pauses when it needs to. So, we'll
@@ -231,10 +242,6 @@ void G1Arguments::initialize() {
     FLAG_SET_DEFAULT(GCPauseIntervalMillis, MaxGCPauseMillis + 1);
   }
 
-  if (FLAG_IS_DEFAULT(ParallelRefProcEnabled) && ParallelGCThreads > 1) {
-    FLAG_SET_DEFAULT(ParallelRefProcEnabled, true);
-  }
-
 #ifdef COMPILER2
   // Enable loop strip mining to offer better pause time guarantees
   if (FLAG_IS_DEFAULT(UseCountedLoopSafepoints)) {
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.cpp b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
index 622651ce0d8..dee50500e07 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.cpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,13 +64,13 @@ G1BarrierSet::G1BarrierSet(G1CardTable* card_table,
 {}
 
 G1BarrierSet::~G1BarrierSet() {
-  delete _refinement_table;
+  delete refinement_table();
 }
 
 void G1BarrierSet::swap_global_card_table() {
-  G1CardTable* temp = static_cast<G1CardTable*>(_card_table);
-  _card_table = _refinement_table;
-  _refinement_table = temp;
+  G1CardTable* temp = static_cast<G1CardTable*>(card_table());
+  _card_table.store_relaxed(refinement_table());
+  _refinement_table.store_relaxed(temp);
 }
 
 void G1BarrierSet::update_card_table_base(Thread* thread) {
@@ -80,7 +80,7 @@ void G1BarrierSet::update_card_table_base(Thread* thread) {
     assert(thread->is_Java_thread(), "may only update card table base of JavaThreads, not %s", thread->name());
   }
 #endif
-  G1ThreadLocalData::set_byte_map_base(thread, _card_table->byte_map_base());
+  G1ThreadLocalData::set_byte_map_base(thread, card_table()->byte_map_base());
 }
 
 template <class T> void
@@ -135,10 +135,10 @@ void G1BarrierSet::write_region(MemRegion mr) {
   // marks next time.
   // If we write to the old card table (after the switching, then the refinement
   // table) the oncoming handshake will do the memory synchronization.
-  CardTable* card_table = AtomicAccess::load(&_card_table);
+  CardTable* local_card_table = card_table();
 
-  volatile CardValue* byte = card_table->byte_for(mr.start());
-  CardValue* last_byte = card_table->byte_for(mr.last());
+  volatile CardValue* byte = local_card_table->byte_for(mr.start());
+  CardValue* last_byte = local_card_table->byte_for(mr.last());
 
   // Dirty cards only if necessary.
   for (; byte <= last_byte; byte++) {
@@ -190,6 +190,6 @@ void G1BarrierSet::on_thread_detach(Thread* thread) {
 }
 
 void G1BarrierSet::print_on(outputStream* st) const {
-  _card_table->print_on(st, "Card");
-  _refinement_table->print_on(st, "Refinement");
+  card_table()->print_on(st, "Card");
+  refinement_table()->print_on(st, "Refinement");
 }
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
index bf595973a32..c5c7058471c 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,12 @@
 #ifndef SHARE_GC_G1_G1BARRIERSET_HPP
 #define SHARE_GC_G1_G1BARRIERSET_HPP
 
+#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "runtime/atomic.hpp"
 
 class G1CardTable;
 class Thread;
@@ -66,7 +68,7 @@ class G1BarrierSet: public CardTableBarrierSet {
   BufferNode::Allocator _satb_mark_queue_buffer_allocator;
   G1SATBMarkQueueSet _satb_mark_queue_set;
 
-  G1CardTable* _refinement_table;
+  Atomic<G1CardTable*> _refinement_table;
 
  public:
   G1BarrierSet(G1CardTable* card_table, G1CardTable* refinement_table);
@@ -76,7 +78,7 @@ class G1BarrierSet: public CardTableBarrierSet {
     return barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
   }
 
-  G1CardTable* refinement_table() const { return _refinement_table; }
+  G1CardTable* refinement_table() const { return _refinement_table.load_relaxed(); }
 
   // Swap the global card table references, without synchronization.
   void swap_global_card_table();
@@ -115,6 +117,8 @@ class G1BarrierSet: public CardTableBarrierSet {
 
   virtual void print_on(outputStream* st) const;
 
+  virtual uint grain_shift() { return G1HeapRegion::LogOfHRGrainBytes; }
+
   // Callbacks for runtime accesses.
   template <DecoratorSet decorators, typename BarrierSetT = G1BarrierSet>
   class AccessBarrier: public CardTableBarrierSet::AccessBarrier<decorators, BarrierSetT> {
diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
index ee2c1450d9b..54892c9191d 100644
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,11 @@ inline void G1BarrierSet::write_ref_field_pre(T* field) {
 
 template <DecoratorSet decorators, typename T>
 inline void G1BarrierSet::write_ref_field_post(T* field) {
-  volatile CardValue* byte = _card_table->byte_for(field);
+  // Make sure that the card table reference is read only once. Otherwise the compiler
+  // might reload that value in the two accesses below, that could cause writes to
+  // the wrong card table.
+  CardTable* local_card_table = card_table();
+  CardValue* byte = local_card_table->byte_for(field);
   if (*byte == G1CardTable::clean_card_val()) {
     *byte = G1CardTable::dirty_card_val();
   }
diff --git a/src/hotspot/share/gc/g1/g1BatchedTask.cpp b/src/hotspot/share/gc/g1/g1BatchedTask.cpp
index 57558301541..1f082153476 100644
--- a/src/hotspot/share/gc/g1/g1BatchedTask.cpp
+++ b/src/hotspot/share/gc/g1/g1BatchedTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 #include "gc/g1/g1BatchedTask.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1GCParPhaseTimesTracker.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/growableArray.hpp"
 
 void G1AbstractSubTask::record_work_item(uint worker_id, uint index, size_t count) {
@@ -40,7 +39,7 @@ const char* G1AbstractSubTask::name() const {
 }
 
 bool G1BatchedTask::try_claim_serial_task(int& task) {
-  task = AtomicAccess::fetch_then_add(&_num_serial_tasks_done, 1);
+  task = _num_serial_tasks_done.fetch_then_add(1);
   return task < _serial_tasks.length();
 }
 
@@ -96,8 +95,8 @@ void G1BatchedTask::work(uint worker_id) {
 }
 
 G1BatchedTask::~G1BatchedTask() {
-  assert(AtomicAccess::load(&_num_serial_tasks_done) >= _serial_tasks.length(),
-         "Only %d tasks of %d claimed", AtomicAccess::load(&_num_serial_tasks_done), _serial_tasks.length());
+  assert(_num_serial_tasks_done.load_relaxed() >= _serial_tasks.length(),
+         "Only %d tasks of %d claimed", _num_serial_tasks_done.load_relaxed(), _serial_tasks.length());
 
   for (G1AbstractSubTask* task : _parallel_tasks) {
     delete task;
diff --git a/src/hotspot/share/gc/g1/g1BatchedTask.hpp b/src/hotspot/share/gc/g1/g1BatchedTask.hpp
index 020fda634e4..a6d2ef923c0 100644
--- a/src/hotspot/share/gc/g1/g1BatchedTask.hpp
+++ b/src/hotspot/share/gc/g1/g1BatchedTask.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 
 template <typename E, MemTag MT>
 class GrowableArrayCHeap;
@@ -120,7 +121,7 @@ public:
 // 5) ~T()
 //
 class G1BatchedTask : public WorkerTask {
-  volatile int _num_serial_tasks_done;
+  Atomic<int> _num_serial_tasks_done;
   G1GCPhaseTimes* _phase_times;
 
   bool try_claim_serial_task(int& task);
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
index 4653f96980d..fd70796251d 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,9 @@
 
 #include "gc/g1/g1BlockOffsetTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1HeapRegion.inline.hpp"
+#include "gc/g1/g1RegionToSpaceMapper.hpp"
+#include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "logging/log.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/java.hpp"
 #include "runtime/os.hpp"
 
 size_t G1BlockOffsetTable::compute_size(size_t mem_region_words) {
@@ -40,26 +39,32 @@ G1BlockOffsetTable::G1BlockOffsetTable(MemRegion heap, G1RegionToSpaceMapper* st
 
   MemRegion bot_reserved = storage->reserved();
 
-  _offset_base = ((uint8_t*)bot_reserved.start() - (uintptr_t(_reserved.start()) >> CardTable::card_shift()));
+  _offset_base = ((Atomic<uint8_t>*)bot_reserved.start() - (uintptr_t(_reserved.start()) >> CardTable::card_shift()));
 
   log_trace(gc, bot)("G1BlockOffsetTable::G1BlockOffsetTable: ");
   log_trace(gc, bot)("    rs.base(): " PTR_FORMAT "  rs.size(): %zu  rs end(): " PTR_FORMAT,
                      p2i(bot_reserved.start()), bot_reserved.byte_size(), p2i(bot_reserved.end()));
 }
 
-void G1BlockOffsetTable::set_offset_array(uint8_t* addr, uint8_t offset) {
+void G1BlockOffsetTable::set_offset_array(Atomic<uint8_t>* addr, uint8_t offset) {
   check_address(addr, "Block offset table address out of range");
-  AtomicAccess::store(addr, offset);
+  addr->store_relaxed(offset);
 }
 
-void G1BlockOffsetTable::set_offset_array(uint8_t* addr, HeapWord* high, HeapWord* low) {
+static void check_offset(size_t offset, const char* msg) {
+  assert(offset < CardTable::card_size_in_words(),
+         "%s - offset: %zu, N_words: %u",
+         msg, offset, CardTable::card_size_in_words());
+}
+
+void G1BlockOffsetTable::set_offset_array(Atomic<uint8_t>* addr, HeapWord* high, HeapWord* low) {
   assert(high >= low, "addresses out of order");
   size_t offset = pointer_delta(high, low);
   check_offset(offset, "offset too large");
   set_offset_array(addr, (uint8_t)offset);
 }
 
-void G1BlockOffsetTable::set_offset_array(uint8_t* left, uint8_t* right, uint8_t offset) {
+void G1BlockOffsetTable::set_offset_array(Atomic<uint8_t>* left, Atomic<uint8_t>* right, uint8_t offset) {
   check_address(right, "Right block offset table address out of range");
   assert(left <= right, "indexes out of order");
   size_t num_cards = right - left + 1;
@@ -67,9 +72,9 @@ void G1BlockOffsetTable::set_offset_array(uint8_t* left, uint8_t* right, uint8_t
 }
 
 #ifdef ASSERT
-void G1BlockOffsetTable::check_address(uint8_t* addr, const char* msg) const {
-  uint8_t* start_addr = const_cast<uint8_t*>(_offset_base + (uintptr_t(_reserved.start()) >> CardTable::card_shift()));
-  uint8_t* end_addr = const_cast<uint8_t*>(_offset_base + (uintptr_t(_reserved.end()) >> CardTable::card_shift()));
+void G1BlockOffsetTable::check_address(Atomic<uint8_t>* addr, const char* msg) const {
+  Atomic<uint8_t>* start_addr = const_cast<Atomic<uint8_t>*>(_offset_base + (uintptr_t(_reserved.start()) >> CardTable::card_shift()));
+  Atomic<uint8_t>* end_addr = const_cast<Atomic<uint8_t>*>(_offset_base + (uintptr_t(_reserved.end()) >> CardTable::card_shift()));
   assert(addr >= start_addr && addr <= end_addr,
          "%s - offset address: " PTR_FORMAT ", start address: " PTR_FORMAT ", end address: " PTR_FORMAT,
          msg, (p2i(addr)), (p2i(start_addr)), (p2i(end_addr)));
@@ -113,17 +118,17 @@ void G1BlockOffsetTable::check_address(uint8_t* addr, const char* msg) const {
 //      Move back N (e.g., 8) entries and repeat with the
 //        value of the new entry
 //
-void G1BlockOffsetTable::set_remainder_to_point_to_start_incl(uint8_t* start_card, uint8_t* end_card) {
+void G1BlockOffsetTable::set_remainder_to_point_to_start_incl(Atomic<uint8_t>* start_card, Atomic<uint8_t>* end_card) {
   assert(start_card <= end_card, "precondition");
   assert(offset_array(start_card-1) < CardTable::card_size_in_words(),
          "Offset card has an unexpected value");
-  uint8_t* start_card_for_region = start_card;
+  Atomic<uint8_t>* start_card_for_region = start_card;
   uint8_t offset = UINT8_MAX;
   for (uint i = 0; i < BOTConstants::N_powers; i++) {
     // -1 so that the card with the actual offset is counted.  Another -1
     // so that the reach ends in this region and not at the start
     // of the next.
-    uint8_t* reach = start_card - 1 + (BOTConstants::power_to_cards_back(i+1) - 1);
+    Atomic<uint8_t>* reach = start_card - 1 + (BOTConstants::power_to_cards_back(i+1) - 1);
     offset = CardTable::card_size_in_words() + i;
     if (reach >= end_card) {
       set_offset_array(start_card_for_region, end_card, offset);
@@ -141,12 +146,12 @@ void G1BlockOffsetTable::set_remainder_to_point_to_start_incl(uint8_t* start_car
 // The card-interval [start_card, end_card] is a closed interval; this
 // is an expensive check -- use with care and only under protection of
 // suitable flag.
-void G1BlockOffsetTable::check_all_cards(uint8_t* start_card, uint8_t* end_card) const {
+void G1BlockOffsetTable::check_all_cards(Atomic<uint8_t>* start_card, Atomic<uint8_t>* end_card) const {
   if (end_card < start_card) {
     return;
   }
   guarantee(offset_array(start_card) == CardTable::card_size_in_words(), "Wrong value in second card");
-  for (uint8_t* c = start_card + 1; c <= end_card; c++ /* yeah! */) {
+  for (Atomic<uint8_t>* c = start_card + 1; c <= end_card; c++ /* yeah! */) {
     uint8_t entry = offset_array(c);
     if ((unsigned)(c - start_card) > BOTConstants::power_to_cards_back(1)) {
       guarantee(entry > CardTable::card_size_in_words(),
@@ -157,7 +162,7 @@ void G1BlockOffsetTable::check_all_cards(uint8_t* start_card, uint8_t* end_card)
                 (uint)entry, (uint)offset_array(c), CardTable::card_size_in_words());
     }
     size_t backskip = BOTConstants::entry_to_cards_back(entry);
-    uint8_t* landing_card = c - backskip;
+    Atomic<uint8_t>* landing_card = c - backskip;
     guarantee(landing_card >= (start_card - 1), "Inv");
     if (landing_card >= start_card) {
       guarantee(offset_array(landing_card) <= entry,
@@ -188,7 +193,7 @@ void G1BlockOffsetTable::check_all_cards(uint8_t* start_card, uint8_t* end_card)
 //
 void G1BlockOffsetTable::update_for_block_work(HeapWord* blk_start, HeapWord* blk_end) {
   HeapWord* const cur_card_boundary = align_up_by_card_size(blk_start);
-  uint8_t* const offset_card = entry_for_addr(cur_card_boundary);
+  Atomic<uint8_t>* const offset_card = entry_for_addr(cur_card_boundary);
 
   assert(blk_start != nullptr && blk_end > blk_start,
          "phantom block");
@@ -209,7 +214,7 @@ void G1BlockOffsetTable::update_for_block_work(HeapWord* blk_start, HeapWord* bl
   // We need to now mark the subsequent cards that this block spans.
 
   // Index of card on which the block ends.
-  uint8_t* end_card = entry_for_addr(blk_end - 1);
+  Atomic<uint8_t>* end_card = entry_for_addr(blk_end - 1);
 
   // Are there more cards left to be updated?
   if (offset_card + 1 <= end_card) {
@@ -224,7 +229,7 @@ void G1BlockOffsetTable::update_for_block_work(HeapWord* blk_start, HeapWord* bl
 
   // The offset can be 0 if the block starts on a boundary.  That
   // is checked by an assertion above.
-  uint8_t* previous_card = entry_for_addr(blk_start);
+  Atomic<uint8_t>* previous_card = entry_for_addr(blk_start);
   HeapWord* boundary = addr_for_entry(previous_card);
   assert((offset_array(offset_card) == 0 && blk_start == boundary) ||
          (offset_array(offset_card) > 0 && offset_array(offset_card) < CardTable::card_size_in_words()),
@@ -240,7 +245,7 @@ void G1BlockOffsetTable::update_for_block_work(HeapWord* blk_start, HeapWord* bl
 }
 
 #ifdef ASSERT
-void G1BlockOffsetTable::verify_offset(uint8_t* card_index, uint8_t upper_boundary) const {
+void G1BlockOffsetTable::verify_offset(Atomic<uint8_t>* card_index, uint8_t upper_boundary) const {
   assert(offset_array(card_index) <= upper_boundary,
          "Offset %u should not be larger than upper boundary %u.",
          (uint) offset_array(card_index),
@@ -250,19 +255,19 @@ void G1BlockOffsetTable::verify_offset(uint8_t* card_index, uint8_t upper_bounda
 void G1BlockOffsetTable::verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const {
   assert(is_crossing_card_boundary(blk_start, blk_end), "precondition");
 
-  uint8_t* start_card = entry_for_addr(align_up_by_card_size(blk_start));
-  uint8_t* end_card = entry_for_addr(blk_end - 1);
+  Atomic<uint8_t>* start_card = entry_for_addr(align_up_by_card_size(blk_start));
+  Atomic<uint8_t>* end_card = entry_for_addr(blk_end - 1);
   // Check cards in [start_card, end_card]
   verify_offset(start_card, CardTable::card_size_in_words());
 
-  for (uint8_t* current_card = start_card + 1; current_card <= end_card; ++current_card) {
+  for (Atomic<uint8_t>* current_card = start_card + 1; current_card <= end_card; ++current_card) {
     assert(offset_array(current_card) > 0,
            "Offset %u is not larger than 0.",
            (uint) offset_array(current_card));
     verify_offset(current_card, (uint8_t) (CardTable::card_size_in_words() + BOTConstants::N_powers - 1));
 
-    uint8_t* prev  = current_card - 1;
-    uint8_t* value = current_card;
+    Atomic<uint8_t>* prev  = current_card - 1;
+    Atomic<uint8_t>* value = current_card;
     if (offset_array(prev) != offset_array(value)) {
       assert(offset_array(value) >= offset_array(prev), "monotonic");
       size_t n_cards_back = BOTConstants::entry_to_cards_back(offset_array(value));
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
index 3b97efc4f0f..21d447549a6 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/shared/blockOffsetTable.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "memory/memRegion.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // This implementation of "G1BlockOffsetTable" divides the covered region
@@ -36,47 +37,40 @@
 // for each such subregion indicates how far back one must go to find the
 // start of the chunk that includes the first word of the subregion.
 class G1BlockOffsetTable : public CHeapObj<mtGC> {
-private:
   // The reserved region covered by the table.
   MemRegion _reserved;
 
   // Biased array-start of BOT array for fast BOT entry translation
-  volatile uint8_t* _offset_base;
-
-  void check_offset(size_t offset, const char* msg) const {
-    assert(offset < CardTable::card_size_in_words(),
-           "%s - offset: %zu, N_words: %u",
-           msg, offset, CardTable::card_size_in_words());
-  }
+  Atomic<uint8_t>* _offset_base;
 
   // Bounds checking accessors:
   // For performance these have to devolve to array accesses in product builds.
-  inline uint8_t offset_array(uint8_t* addr) const;
+  inline uint8_t offset_array(Atomic<uint8_t>* addr) const;
 
-  inline void set_offset_array(uint8_t* addr, uint8_t offset);
+  inline void set_offset_array(Atomic<uint8_t>* addr, uint8_t offset);
 
-  inline void set_offset_array(uint8_t* addr, HeapWord* high, HeapWord* low);
+  inline void set_offset_array(Atomic<uint8_t>* addr, HeapWord* high, HeapWord* low);
 
-  inline void set_offset_array(uint8_t* left, uint8_t* right, uint8_t offset);
+  inline void set_offset_array(Atomic<uint8_t>* left, Atomic<uint8_t>* right, uint8_t offset);
 
   // Mapping from address to object start array entry
-  inline uint8_t* entry_for_addr(const void* const p) const;
+  inline Atomic<uint8_t>* entry_for_addr(const void* const p) const;
 
   // Mapping from object start array entry to address of first word
-  inline HeapWord* addr_for_entry(const uint8_t* const p) const;
+  inline HeapWord* addr_for_entry(const Atomic<uint8_t>* const p) const;
 
-  void check_address(uint8_t* addr, const char* msg) const NOT_DEBUG_RETURN;
+  void check_address(Atomic<uint8_t>* addr, const char* msg) const NOT_DEBUG_RETURN;
 
   // Sets the entries corresponding to the cards starting at "start" and ending
   // at "end" to point back to the card before "start"; [start, end]
-  void set_remainder_to_point_to_start_incl(uint8_t* start, uint8_t* end);
+  void set_remainder_to_point_to_start_incl(Atomic<uint8_t>* start, Atomic<uint8_t>* end);
 
   // Update BOT entries corresponding to the mem range [blk_start, blk_end).
   void update_for_block_work(HeapWord* blk_start, HeapWord* blk_end);
 
-  void check_all_cards(uint8_t* left_card, uint8_t* right_card) const NOT_DEBUG_RETURN;
+  void check_all_cards(Atomic<uint8_t>* left_card, Atomic<uint8_t>* right_card) const NOT_DEBUG_RETURN;
 
-  void verify_offset(uint8_t* card_index, uint8_t upper) const NOT_DEBUG_RETURN;
+  void verify_offset(Atomic<uint8_t>* card_index, uint8_t upper) const NOT_DEBUG_RETURN;
   void verify_for_block(HeapWord* blk_start, HeapWord* blk_end) const NOT_DEBUG_RETURN;
 
   static HeapWord* align_up_by_card_size(HeapWord* const addr) {
@@ -84,7 +78,6 @@ private:
   }
 
 public:
-
   // Return the number of slots needed for an offset array
   // that covers mem_region_words words.
   static size_t compute_size(size_t mem_region_words);
@@ -98,22 +91,14 @@ public:
   // in the heap parameter.
   G1BlockOffsetTable(MemRegion heap, G1RegionToSpaceMapper* storage);
 
-  static bool is_crossing_card_boundary(HeapWord* const obj_start,
-                                        HeapWord* const obj_end) {
-    HeapWord* cur_card_boundary = align_up_by_card_size(obj_start);
-    // strictly greater-than
-    return obj_end > cur_card_boundary;
-  }
+  inline static bool is_crossing_card_boundary(HeapWord* const obj_start,
+                                               HeapWord* const obj_end);
 
   // Returns the address of the start of the block reaching into the card containing
   // "addr".
   inline HeapWord* block_start_reaching_into_card(const void* addr) const;
 
-  void update_for_block(HeapWord* blk_start, HeapWord* blk_end) {
-    if (is_crossing_card_boundary(blk_start, blk_end)) {
-      update_for_block_work(blk_start, blk_end);
-    }
-  }
+  inline void update_for_block(HeapWord* blk_start, HeapWord* blk_end);
 };
 
 #endif // SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
index 900e9516c1a..b707e310781 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,12 @@
 
 #include "gc/g1/g1BlockOffsetTable.hpp"
 
-#include "gc/g1/g1HeapRegion.hpp"
 #include "gc/shared/cardTable.hpp"
-#include "gc/shared/memset_with_concurrent_readers.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 
 inline HeapWord* G1BlockOffsetTable::block_start_reaching_into_card(const void* addr) const {
   assert(_reserved.contains(addr), "invalid address");
 
-  uint8_t* entry = entry_for_addr(addr);
+  Atomic<uint8_t>* entry = entry_for_addr(addr);
   uint8_t offset = offset_array(entry);
   while (offset >= CardTable::card_size_in_words()) {
     // The excess of the offset from N_words indicates a power of Base
@@ -50,19 +46,19 @@ inline HeapWord* G1BlockOffsetTable::block_start_reaching_into_card(const void*
   return q - offset;
 }
 
-uint8_t G1BlockOffsetTable::offset_array(uint8_t* addr) const {
+uint8_t G1BlockOffsetTable::offset_array(Atomic<uint8_t>* addr) const {
   check_address(addr, "Block offset table address out of range");
-  return AtomicAccess::load(addr);
+  return addr->load_relaxed();
 }
 
-inline uint8_t* G1BlockOffsetTable::entry_for_addr(const void* const p) const {
+inline Atomic<uint8_t>* G1BlockOffsetTable::entry_for_addr(const void* const p) const {
   assert(_reserved.contains(p),
          "out of bounds access to block offset table");
-  uint8_t* result = const_cast<uint8_t*>(&_offset_base[uintptr_t(p) >> CardTable::card_shift()]);
+  Atomic<uint8_t>* result = const_cast<Atomic<uint8_t>*>(&_offset_base[uintptr_t(p) >> CardTable::card_shift()]);
   return result;
 }
 
-inline HeapWord* G1BlockOffsetTable::addr_for_entry(const uint8_t* const p) const {
+inline HeapWord* G1BlockOffsetTable::addr_for_entry(const Atomic<uint8_t>* const p) const {
   // _offset_base can be "negative", so can't use pointer_delta().
   size_t delta = p - _offset_base;
   HeapWord* result = (HeapWord*) (delta << CardTable::card_shift());
@@ -71,4 +67,17 @@ inline HeapWord* G1BlockOffsetTable::addr_for_entry(const uint8_t* const p) cons
   return result;
 }
 
+inline bool G1BlockOffsetTable::is_crossing_card_boundary(HeapWord* const obj_start,
+                                                          HeapWord* const obj_end) {
+  HeapWord* cur_card_boundary = align_up_by_card_size(obj_start);
+  // strictly greater-than
+  return obj_end > cur_card_boundary;
+}
+
+inline void G1BlockOffsetTable::update_for_block(HeapWord* blk_start, HeapWord* blk_end) {
+  if (is_crossing_card_boundary(blk_start, blk_end)) {
+    update_for_block_work(blk_start, blk_end);
+  }
+}
+
 #endif // SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1CardSet.cpp b/src/hotspot/share/gc/g1/g1CardSet.cpp
index 80cf5fea76a..60ad63e812c 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.cpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 #include "gc/shared/gcLogPrecious.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "memory/allocation.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "utilities/bitMap.inline.hpp"
@@ -192,32 +191,32 @@ const char* G1CardSetConfiguration::mem_object_type_name_str(uint index) {
 void G1CardSetCoarsenStats::reset() {
   STATIC_ASSERT(ARRAY_SIZE(_coarsen_from) == ARRAY_SIZE(_coarsen_collision));
   for (uint i = 0; i < ARRAY_SIZE(_coarsen_from); i++) {
-    _coarsen_from[i] = 0;
-    _coarsen_collision[i] = 0;
+    _coarsen_from[i].store_relaxed(0);
+    _coarsen_collision[i].store_relaxed(0);
   }
 }
 
 void G1CardSetCoarsenStats::set(G1CardSetCoarsenStats& other) {
   STATIC_ASSERT(ARRAY_SIZE(_coarsen_from) == ARRAY_SIZE(_coarsen_collision));
   for (uint i = 0; i < ARRAY_SIZE(_coarsen_from); i++) {
-    _coarsen_from[i] = other._coarsen_from[i];
-    _coarsen_collision[i] = other._coarsen_collision[i];
+    _coarsen_from[i].store_relaxed(other._coarsen_from[i].load_relaxed());
+    _coarsen_collision[i].store_relaxed(other._coarsen_collision[i].load_relaxed());
   }
 }
 
 void G1CardSetCoarsenStats::subtract_from(G1CardSetCoarsenStats& other) {
   STATIC_ASSERT(ARRAY_SIZE(_coarsen_from) == ARRAY_SIZE(_coarsen_collision));
   for (uint i = 0; i < ARRAY_SIZE(_coarsen_from); i++) {
-    _coarsen_from[i] = other._coarsen_from[i] - _coarsen_from[i];
-    _coarsen_collision[i] = other._coarsen_collision[i] - _coarsen_collision[i];
+    _coarsen_from[i].store_relaxed(other._coarsen_from[i].load_relaxed() - _coarsen_from[i].load_relaxed());
+    _coarsen_collision[i].store_relaxed(other._coarsen_collision[i].load_relaxed() - _coarsen_collision[i].load_relaxed());
   }
 }
 
 void G1CardSetCoarsenStats::record_coarsening(uint tag, bool collision) {
   assert(tag < ARRAY_SIZE(_coarsen_from), "tag %u out of bounds", tag);
-  AtomicAccess::inc(&_coarsen_from[tag], memory_order_relaxed);
+  _coarsen_from[tag].add_then_fetch(1u, memory_order_relaxed);
   if (collision) {
-    AtomicAccess::inc(&_coarsen_collision[tag], memory_order_relaxed);
+    _coarsen_collision[tag].add_then_fetch(1u, memory_order_relaxed);
   }
 }
 
@@ -228,13 +227,13 @@ void G1CardSetCoarsenStats::print_on(outputStream* out) {
                 "Inline->AoC %zu (%zu) "
                 "AoC->BitMap %zu (%zu) "
                 "BitMap->Full %zu (%zu) ",
-                _coarsen_from[0], _coarsen_collision[0],
-                _coarsen_from[1], _coarsen_collision[1],
+                _coarsen_from[0].load_relaxed(), _coarsen_collision[0].load_relaxed(),
+                _coarsen_from[1].load_relaxed(), _coarsen_collision[1].load_relaxed(),
                 // There is no BitMap at the first level so we can't .
-                _coarsen_from[3], _coarsen_collision[3],
-                _coarsen_from[4], _coarsen_collision[4],
-                _coarsen_from[5], _coarsen_collision[5],
-                _coarsen_from[6], _coarsen_collision[6]
+                _coarsen_from[3].load_relaxed(), _coarsen_collision[3].load_relaxed(),
+                _coarsen_from[4].load_relaxed(), _coarsen_collision[4].load_relaxed(),
+                _coarsen_from[5].load_relaxed(), _coarsen_collision[5].load_relaxed(),
+                _coarsen_from[6].load_relaxed(), _coarsen_collision[6].load_relaxed()
                );
 }
 
@@ -248,7 +247,7 @@ class G1CardSetHashTable : public CHeapObj<mtGCCardSet> {
   // the per region cardsets.
   const static uint GroupBucketClaimSize = 4;
   // Did we insert at least one card in the table?
-  bool volatile _inserted_card;
+  Atomic<bool> _inserted_card;
 
   G1CardSetMemoryManager* _mm;
   CardSetHash _table;
@@ -311,10 +310,10 @@ public:
     G1CardSetHashTableValue value(region_idx, G1CardSetInlinePtr());
     bool inserted = _table.insert_get(Thread::current(), lookup, value, found, should_grow);
 
-    if (!_inserted_card && inserted) {
+    if (!_inserted_card.load_relaxed() && inserted) {
       // It does not matter to us who is setting the flag so a regular atomic store
       // is sufficient.
-      AtomicAccess::store(&_inserted_card, true);
+      _inserted_card.store_relaxed(true);
     }
 
     return found.value();
@@ -343,9 +342,9 @@ public:
   }
 
   void reset() {
-    if (AtomicAccess::load(&_inserted_card)) {
+    if (_inserted_card.load_relaxed()) {
       _table.unsafe_reset(InitialLogTableSize);
-      AtomicAccess::store(&_inserted_card, false);
+      _inserted_card.store_relaxed(false);
     }
   }
 
@@ -455,14 +454,14 @@ void G1CardSet::free_mem_object(ContainerPtr container) {
   _mm->free(container_type_to_mem_object_type(type), value);
 }
 
-G1CardSet::ContainerPtr G1CardSet::acquire_container(ContainerPtr volatile* container_addr) {
+G1CardSet::ContainerPtr G1CardSet::acquire_container(Atomic<ContainerPtr>* container_addr) {
   // Update reference counts under RCU critical section to avoid a
   // use-after-cleapup bug where we increment a reference count for
   // an object whose memory has already been cleaned up and reused.
   GlobalCounter::CriticalSection cs(Thread::current());
   while (true) {
     // Get ContainerPtr and increment refcount atomically wrt to memory reuse.
-    ContainerPtr container = AtomicAccess::load_acquire(container_addr);
+    ContainerPtr container = container_addr->load_acquire();
     uint cs_type = container_type(container);
     if (container == FullCardSet || cs_type == ContainerInlinePtr) {
       return container;
@@ -503,15 +502,15 @@ class G1ReleaseCardsets : public StackObj {
   G1CardSet* _card_set;
   using ContainerPtr = G1CardSet::ContainerPtr;
 
-  void coarsen_to_full(ContainerPtr* container_addr) {
+  void coarsen_to_full(Atomic<ContainerPtr>* container_addr) {
     while (true) {
-      ContainerPtr cur_container = AtomicAccess::load_acquire(container_addr);
+      ContainerPtr cur_container = container_addr->load_acquire();
       uint cs_type = G1CardSet::container_type(cur_container);
       if (cur_container == G1CardSet::FullCardSet) {
         return;
       }
 
-      ContainerPtr old_value = AtomicAccess::cmpxchg(container_addr, cur_container, G1CardSet::FullCardSet);
+      ContainerPtr old_value = container_addr->compare_exchange(cur_container, G1CardSet::FullCardSet);
 
       if (old_value == cur_container) {
         _card_set->release_and_maybe_free_container(cur_container);
@@ -523,7 +522,7 @@ class G1ReleaseCardsets : public StackObj {
 public:
   explicit G1ReleaseCardsets(G1CardSet* card_set) : _card_set(card_set) { }
 
-  void operator ()(ContainerPtr* container_addr) {
+  void operator ()(Atomic<ContainerPtr>* container_addr) {
     coarsen_to_full(container_addr);
   }
 };
@@ -544,10 +543,10 @@ G1AddCardResult G1CardSet::add_to_howl(ContainerPtr parent_container,
   ContainerPtr container;
 
   uint bucket = _config->howl_bucket_index(card_in_region);
-  ContainerPtr volatile* bucket_entry = howl->container_addr(bucket);
+  Atomic<ContainerPtr>* bucket_entry = howl->container_addr(bucket);
 
   while (true) {
-    if (AtomicAccess::load(&howl->_num_entries) >= _config->cards_in_howl_threshold()) {
+    if (howl->_num_entries.load_relaxed() >= _config->cards_in_howl_threshold()) {
       return Overflow;
     }
 
@@ -571,7 +570,7 @@ G1AddCardResult G1CardSet::add_to_howl(ContainerPtr parent_container,
   }
 
   if (increment_total && add_result == Added) {
-    AtomicAccess::inc(&howl->_num_entries, memory_order_relaxed);
+    howl->_num_entries.add_then_fetch(1u, memory_order_relaxed);
   }
 
   if (to_transfer != nullptr) {
@@ -588,7 +587,7 @@ G1AddCardResult G1CardSet::add_to_bitmap(ContainerPtr container, uint card_in_re
   return bitmap->add(card_offset, _config->cards_in_howl_bitmap_threshold(), _config->max_cards_in_howl_bitmap());
 }
 
-G1AddCardResult G1CardSet::add_to_inline_ptr(ContainerPtr volatile* container_addr, ContainerPtr container, uint card_in_region) {
+G1AddCardResult G1CardSet::add_to_inline_ptr(Atomic<ContainerPtr>* container_addr, ContainerPtr container, uint card_in_region) {
   G1CardSetInlinePtr value(container_addr, container);
   return value.add(card_in_region, _config->inline_ptr_bits_per_card(), _config->max_cards_in_inline_ptr());
 }
@@ -610,7 +609,7 @@ G1CardSet::ContainerPtr G1CardSet::create_coarsened_array_of_cards(uint card_in_
   return new_container;
 }
 
-bool G1CardSet::coarsen_container(ContainerPtr volatile* container_addr,
+bool G1CardSet::coarsen_container(Atomic<ContainerPtr>* container_addr,
                                   ContainerPtr cur_container,
                                   uint card_in_region,
                                   bool within_howl) {
@@ -640,7 +639,7 @@ bool G1CardSet::coarsen_container(ContainerPtr volatile* container_addr,
       ShouldNotReachHere();
   }
 
-  ContainerPtr old_value = AtomicAccess::cmpxchg(container_addr, cur_container, new_container); // Memory order?
+  ContainerPtr old_value = container_addr->compare_exchange(cur_container, new_container); // Memory order?
   if (old_value == cur_container) {
     // Success. Indicate that the cards from the current card set must be transferred
     // by this caller.
@@ -687,7 +686,7 @@ void G1CardSet::transfer_cards(G1CardSetHashTableValue* table_entry, ContainerPt
     assert(container_type(source_container) == ContainerHowl, "must be");
     // Need to correct for that the Full remembered set occupies more cards than the
     // AoCS before.
-    AtomicAccess::add(&_num_occupied, _config->max_cards_in_region() - table_entry->_num_occupied, memory_order_relaxed);
+    _num_occupied.add_then_fetch(_config->max_cards_in_region() - table_entry->_num_occupied.load_relaxed(), memory_order_relaxed);
   }
 }
 
@@ -713,18 +712,18 @@ void G1CardSet::transfer_cards_in_howl(ContainerPtr parent_container,
     diff -= 1;
 
     G1CardSetHowl* howling_array = container_ptr<G1CardSetHowl>(parent_container);
-    AtomicAccess::add(&howling_array->_num_entries, diff, memory_order_relaxed);
+    howling_array->_num_entries.add_then_fetch(diff, memory_order_relaxed);
 
     G1CardSetHashTableValue* table_entry = get_container(card_region);
     assert(table_entry != nullptr, "Table entry not found for transferred cards");
 
-    AtomicAccess::add(&table_entry->_num_occupied, diff, memory_order_relaxed);
+    table_entry->_num_occupied.add_then_fetch(diff, memory_order_relaxed);
 
-    AtomicAccess::add(&_num_occupied, diff, memory_order_relaxed);
+    _num_occupied.add_then_fetch(diff, memory_order_relaxed);
   }
 }
 
-G1AddCardResult G1CardSet::add_to_container(ContainerPtr volatile* container_addr,
+G1AddCardResult G1CardSet::add_to_container(Atomic<ContainerPtr>* container_addr,
                                             ContainerPtr container,
                                             uint card_region,
                                             uint card_in_region,
@@ -827,8 +826,8 @@ G1AddCardResult G1CardSet::add_card(uint card_region, uint card_in_region, bool
   }
 
   if (increment_total && add_result == Added) {
-    AtomicAccess::inc(&table_entry->_num_occupied, memory_order_relaxed);
-    AtomicAccess::inc(&_num_occupied, memory_order_relaxed);
+    table_entry->_num_occupied.add_then_fetch(1u, memory_order_relaxed);
+    _num_occupied.add_then_fetch(1u, memory_order_relaxed);
   }
   if (should_grow_table) {
     _table->grow();
@@ -853,7 +852,7 @@ bool G1CardSet::contains_card(uint card_region, uint card_in_region) {
     return false;
   }
 
-  ContainerPtr container = table_entry->_container;
+  ContainerPtr container = table_entry->_container.load_relaxed();
   if (container == FullCardSet) {
     // contains_card() is not a performance critical method so we do not hide that
     // case in the switch below.
@@ -889,7 +888,7 @@ void G1CardSet::print_info(outputStream* st, uintptr_t card) {
     return;
   }
 
-  ContainerPtr container = table_entry->_container;
+  ContainerPtr container = table_entry->_container.load_relaxed();
   if (container == FullCardSet) {
     st->print("FULL card set)");
     return;
@@ -940,7 +939,7 @@ void G1CardSet::iterate_cards_during_transfer(ContainerPtr const container, Card
 void G1CardSet::iterate_containers(ContainerPtrClosure* cl, bool at_safepoint) {
   auto do_value =
     [&] (G1CardSetHashTableValue* value) {
-      cl->do_containerptr(value->_region_idx, value->_num_occupied, value->_container);
+      cl->do_containerptr(value->_region_idx, value->_num_occupied.load_relaxed(), value->_container.load_relaxed());
       return true;
     };
 
@@ -1001,11 +1000,11 @@ bool G1CardSet::occupancy_less_or_equal_to(size_t limit) const {
 }
 
 bool G1CardSet::is_empty() const {
-  return _num_occupied == 0;
+  return _num_occupied.load_relaxed() == 0;
 }
 
 size_t G1CardSet::occupied() const {
-  return _num_occupied;
+  return _num_occupied.load_relaxed();
 }
 
 size_t G1CardSet::num_containers() {
@@ -1024,10 +1023,6 @@ size_t G1CardSet::num_containers() {
   return cl._count;
 }
 
-G1CardSetCoarsenStats G1CardSet::coarsen_stats() {
-  return _coarsen_stats;
-}
-
 void G1CardSet::print_coarsen_stats(outputStream* out) {
   _last_coarsen_stats.subtract_from(_coarsen_stats);
 
@@ -1055,7 +1050,7 @@ size_t G1CardSet::static_mem_size() {
 
 void G1CardSet::clear() {
   _table->reset();
-  _num_occupied = 0;
+  _num_occupied.store_relaxed(0);
   _mm->flush();
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CardSet.hpp b/src/hotspot/share/gc/g1/g1CardSet.hpp
index 9cefc4b1c22..64ddf0ca6a4 100644
--- a/src/hotspot/share/gc/g1/g1CardSet.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/concurrentHashTable.hpp"
 
 class G1CardSetAllocOptions;
@@ -154,8 +155,8 @@ public:
 
 private:
   // Indices are "from" indices.
-  size_t _coarsen_from[NumCoarsenCategories];
-  size_t _coarsen_collision[NumCoarsenCategories];
+  Atomic<size_t> _coarsen_from[NumCoarsenCategories];
+  Atomic<size_t> _coarsen_collision[NumCoarsenCategories];
 
 public:
   G1CardSetCoarsenStats() { reset(); }
@@ -271,11 +272,11 @@ private:
 
   // Total number of cards in this card set. This is a best-effort value, i.e. there may
   // be (slightly) more cards in the card set than this value in reality.
-  size_t _num_occupied;
+  Atomic<size_t> _num_occupied;
 
   ContainerPtr make_container_ptr(void* value, uintptr_t type);
 
-  ContainerPtr acquire_container(ContainerPtr volatile* container_addr);
+  ContainerPtr acquire_container(Atomic<ContainerPtr>* container_addr);
   // Returns true if the card set container should be released
   bool release_container(ContainerPtr container);
   // Release card set and free if needed.
@@ -288,7 +289,7 @@ private:
   // coarsen_container does not transfer cards from cur_container
   // to the new container. Transfer is achieved by transfer_cards.
   // Returns true if this was the thread that coarsened the container (and added the card).
-  bool coarsen_container(ContainerPtr volatile* container_addr,
+  bool coarsen_container(Atomic<ContainerPtr>* container_addr,
                          ContainerPtr cur_container,
                          uint card_in_region, bool within_howl = false);
 
@@ -300,9 +301,9 @@ private:
   void transfer_cards(G1CardSetHashTableValue* table_entry, ContainerPtr source_container, uint card_region);
   void transfer_cards_in_howl(ContainerPtr parent_container, ContainerPtr source_container, uint card_region);
 
-  G1AddCardResult add_to_container(ContainerPtr volatile* container_addr, ContainerPtr container, uint card_region, uint card, bool increment_total = true);
+  G1AddCardResult add_to_container(Atomic<ContainerPtr>* container_addr, ContainerPtr container, uint card_region, uint card, bool increment_total = true);
 
-  G1AddCardResult add_to_inline_ptr(ContainerPtr volatile* container_addr, ContainerPtr container, uint card_in_region);
+  G1AddCardResult add_to_inline_ptr(Atomic<ContainerPtr>* container_addr, ContainerPtr container, uint card_in_region);
   G1AddCardResult add_to_array(ContainerPtr container, uint card_in_region);
   G1AddCardResult add_to_bitmap(ContainerPtr container, uint card_in_region);
   G1AddCardResult add_to_howl(ContainerPtr parent_container, uint card_region, uint card_in_region, bool increment_total = true);
@@ -366,7 +367,6 @@ public:
 
   size_t num_containers();
 
-  static G1CardSetCoarsenStats coarsen_stats();
   static void print_coarsen_stats(outputStream* out);
 
   // Returns size of the actual remembered set containers in bytes.
@@ -412,8 +412,15 @@ public:
   using ContainerPtr = G1CardSet::ContainerPtr;
 
   const uint _region_idx;
-  uint volatile _num_occupied;
-  ContainerPtr volatile _container;
+  Atomic<uint> _num_occupied;
+  Atomic<ContainerPtr> _container;
+
+  // Copy constructor needed for use in ConcurrentHashTable.
+  G1CardSetHashTableValue(const G1CardSetHashTableValue& other) :
+    _region_idx(other._region_idx),
+    _num_occupied(other._num_occupied.load_relaxed()),
+    _container(other._container.load_relaxed())
+  { }
 
   G1CardSetHashTableValue(uint region_idx, ContainerPtr container) : _region_idx(region_idx), _num_occupied(0), _container(container) { }
 };
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
index 72c7795be2e..78551479e06 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 #include "gc/g1/g1CardSet.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -67,7 +67,7 @@ class G1CardSetInlinePtr : public StackObj {
 
   using ContainerPtr = G1CardSet::ContainerPtr;
 
-  ContainerPtr volatile * _value_addr;
+  Atomic<ContainerPtr>* _value_addr;
   ContainerPtr _value;
 
   static const uint SizeFieldLen = 3;
@@ -103,7 +103,7 @@ public:
   explicit G1CardSetInlinePtr(ContainerPtr value) :
     G1CardSetInlinePtr(nullptr, value) {}
 
-  G1CardSetInlinePtr(ContainerPtr volatile* value_addr, ContainerPtr value) : _value_addr(value_addr), _value(value) {
+  G1CardSetInlinePtr(Atomic<ContainerPtr>* value_addr, ContainerPtr value) : _value_addr(value_addr), _value(value) {
     assert(G1CardSet::container_type(_value) == G1CardSet::ContainerInlinePtr, "Value " PTR_FORMAT " is not a valid G1CardSetInlinePtr.", p2i(_value));
   }
 
@@ -145,13 +145,13 @@ public:
 // All but inline pointers are of this kind. For those, card entries are stored
 // directly in the ContainerPtr of the ConcurrentHashTable node.
 class G1CardSetContainer {
-  uintptr_t _ref_count;
+  Atomic<uintptr_t> _ref_count;
 protected:
   ~G1CardSetContainer() = default;
 public:
   G1CardSetContainer() : _ref_count(3) { }
 
-  uintptr_t refcount() const { return AtomicAccess::load_acquire(&_ref_count); }
+  uintptr_t refcount() const { return _ref_count.load_acquire(); }
 
   bool try_increment_refcount();
 
@@ -172,7 +172,7 @@ public:
   using ContainerPtr = G1CardSet::ContainerPtr;
 private:
   EntryCountType _size;
-  EntryCountType volatile _num_entries;
+  Atomic<EntryCountType> _num_entries;
   // VLA implementation.
   EntryDataType _data[1];
 
@@ -180,10 +180,10 @@ private:
   static const EntryCountType EntryMask = LockBitMask - 1;
 
   class G1CardSetArrayLocker : public StackObj {
-    EntryCountType volatile* _num_entries_addr;
+    Atomic<EntryCountType>* _num_entries_addr;
     EntryCountType _local_num_entries;
   public:
-    G1CardSetArrayLocker(EntryCountType volatile* value);
+    G1CardSetArrayLocker(Atomic<EntryCountType>* value);
 
     EntryCountType num_entries() const { return _local_num_entries; }
     void inc_num_entries() {
@@ -192,7 +192,7 @@ private:
     }
 
     ~G1CardSetArrayLocker() {
-      AtomicAccess::release_store(_num_entries_addr, _local_num_entries);
+      _num_entries_addr->release_store(_local_num_entries);
     }
   };
 
@@ -213,7 +213,7 @@ public:
   template <class CardVisitor>
   void iterate(CardVisitor& found);
 
-  size_t num_entries() const { return _num_entries & EntryMask; }
+  size_t num_entries() const { return _num_entries.load_relaxed() & EntryMask; }
 
   static size_t header_size_in_bytes();
 
@@ -223,7 +223,7 @@ public:
 };
 
 class G1CardSetBitMap : public G1CardSetContainer {
-  size_t _num_bits_set;
+  Atomic<size_t> _num_bits_set;
   BitMap::bm_word_t _bits[1];
 
 public:
@@ -236,7 +236,7 @@ public:
     return bm.at(card_idx);
   }
 
-  uint num_bits_set() const { return (uint)_num_bits_set; }
+  uint num_bits_set() const { return (uint)_num_bits_set.load_relaxed(); }
 
   template <class CardVisitor>
   void iterate(CardVisitor& found, size_t const size_in_bits, uint offset);
@@ -255,10 +255,10 @@ class G1CardSetHowl : public G1CardSetContainer {
 public:
   typedef uint EntryCountType;
   using ContainerPtr = G1CardSet::ContainerPtr;
-  EntryCountType volatile _num_entries;
+  Atomic<EntryCountType> _num_entries;
 private:
   // VLA implementation.
-  ContainerPtr _buckets[1];
+  Atomic<ContainerPtr> _buckets[1];
   // Do not add class member variables beyond this point.
 
   // Iterates over the given ContainerPtr with at index in this Howl card set,
@@ -268,14 +268,14 @@ private:
 
   ContainerPtr at(EntryCountType index) const;
 
-  ContainerPtr const* buckets() const;
+  Atomic<ContainerPtr> const* buckets() const;
 
 public:
   G1CardSetHowl(EntryCountType card_in_region, G1CardSetConfiguration* config);
 
-  ContainerPtr const* container_addr(EntryCountType index) const;
+  Atomic<ContainerPtr> const* container_addr(EntryCountType index) const;
 
-  ContainerPtr* container_addr(EntryCountType index);
+  Atomic<ContainerPtr>* container_addr(EntryCountType index);
 
   bool contains(uint card_idx, G1CardSetConfiguration* config);
   // Iterates over all ContainerPtrs in this Howl card set, applying a CardOrRangeVisitor
diff --git a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
index 1958309f517..3c6fb9d1a02 100644
--- a/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ inline G1AddCardResult G1CardSetInlinePtr::add(uint card_idx, uint bits_per_card
       return Overflow;
     }
     ContainerPtr new_value = merge(_value, card_idx, num_cards, bits_per_card);
-    ContainerPtr old_value = AtomicAccess::cmpxchg(_value_addr, _value, new_value, memory_order_relaxed);
+    ContainerPtr old_value = _value_addr->compare_exchange(_value, new_value, memory_order_relaxed);
     if (_value == old_value) {
       return Added;
     }
@@ -126,7 +126,7 @@ inline bool G1CardSetContainer::try_increment_refcount() {
     }
 
     uintptr_t new_value = old_value + 2;
-    uintptr_t ref_count = AtomicAccess::cmpxchg(&_ref_count, old_value, new_value);
+    uintptr_t ref_count = _ref_count.compare_exchange(old_value, new_value);
     if (ref_count == old_value) {
       return true;
     }
@@ -137,7 +137,7 @@ inline bool G1CardSetContainer::try_increment_refcount() {
 inline uintptr_t G1CardSetContainer::decrement_refcount() {
   uintptr_t old_value = refcount();
   assert((old_value & 0x1) != 0 && old_value >= 3, "precondition");
-  return AtomicAccess::sub(&_ref_count, 2u);
+  return _ref_count.sub_then_fetch(2u);
 }
 
 inline G1CardSetArray::G1CardSetArray(uint card_in_region, EntryCountType num_cards) :
@@ -149,14 +149,13 @@ inline G1CardSetArray::G1CardSetArray(uint card_in_region, EntryCountType num_ca
   *entry_addr(0) = checked_cast<EntryDataType>(card_in_region);
 }
 
-inline G1CardSetArray::G1CardSetArrayLocker::G1CardSetArrayLocker(EntryCountType volatile* num_entries_addr) :
+inline G1CardSetArray::G1CardSetArrayLocker::G1CardSetArrayLocker(Atomic<EntryCountType>* num_entries_addr) :
   _num_entries_addr(num_entries_addr) {
   SpinYield s;
-  EntryCountType num_entries = AtomicAccess::load(_num_entries_addr) & EntryMask;
+  EntryCountType num_entries = _num_entries_addr->load_relaxed() & EntryMask;
   while (true) {
-    EntryCountType old_value = AtomicAccess::cmpxchg(_num_entries_addr,
-                                                     num_entries,
-                                                     (EntryCountType)(num_entries | LockBitMask));
+    EntryCountType old_value = _num_entries_addr->compare_exchange(num_entries,
+                                                                   (EntryCountType)(num_entries | LockBitMask));
     if (old_value == num_entries) {
       // Succeeded locking the array.
       _local_num_entries = num_entries;
@@ -174,7 +173,7 @@ inline G1CardSetArray::EntryDataType const* G1CardSetArray::base_addr() const {
 }
 
 inline G1CardSetArray::EntryDataType const* G1CardSetArray::entry_addr(EntryCountType index) const {
-  assert(index < _num_entries, "precondition");
+  assert(index < _num_entries.load_relaxed(), "precondition");
   return base_addr() + index;
 }
 
@@ -189,7 +188,7 @@ inline G1CardSetArray::EntryDataType G1CardSetArray::at(EntryCountType index) co
 inline G1AddCardResult G1CardSetArray::add(uint card_idx) {
   assert(card_idx < (1u << (sizeof(EntryDataType) * BitsPerByte)),
          "Card index %u does not fit allowed card value range.", card_idx);
-  EntryCountType num_entries = AtomicAccess::load_acquire(&_num_entries) & EntryMask;
+  EntryCountType num_entries = _num_entries.load_acquire() & EntryMask;
   EntryCountType idx = 0;
   for (; idx < num_entries; idx++) {
     if (at(idx) == card_idx) {
@@ -223,7 +222,7 @@ inline G1AddCardResult G1CardSetArray::add(uint card_idx) {
 }
 
 inline bool G1CardSetArray::contains(uint card_idx) {
-  EntryCountType num_entries = AtomicAccess::load_acquire(&_num_entries) & EntryMask;
+  EntryCountType num_entries = _num_entries.load_acquire() & EntryMask;
 
   for (EntryCountType idx = 0; idx < num_entries; idx++) {
     if (at(idx) == card_idx) {
@@ -235,7 +234,7 @@ inline bool G1CardSetArray::contains(uint card_idx) {
 
 template <class CardVisitor>
 void G1CardSetArray::iterate(CardVisitor& found) {
-  EntryCountType num_entries = AtomicAccess::load_acquire(&_num_entries) & EntryMask;
+  EntryCountType num_entries = _num_entries.load_acquire() & EntryMask;
   for (EntryCountType idx = 0; idx < num_entries; idx++) {
     found(at(idx));
   }
@@ -256,11 +255,11 @@ inline G1CardSetBitMap::G1CardSetBitMap(uint card_in_region, uint size_in_bits)
 
 inline G1AddCardResult G1CardSetBitMap::add(uint card_idx, size_t threshold, size_t size_in_bits) {
   BitMapView bm(_bits, size_in_bits);
-  if (_num_bits_set >= threshold) {
+  if (_num_bits_set.load_relaxed() >= threshold) {
     return bm.at(card_idx) ? Found : Overflow;
   }
   if (bm.par_set_bit(card_idx)) {
-    AtomicAccess::inc(&_num_bits_set, memory_order_relaxed);
+    _num_bits_set.add_then_fetch(1u, memory_order_relaxed);
     return Added;
   }
   return Found;
@@ -276,22 +275,22 @@ inline size_t G1CardSetBitMap::header_size_in_bytes() {
     return offset_of(G1CardSetBitMap, _bits);
 }
 
-inline G1CardSetHowl::ContainerPtr const* G1CardSetHowl::container_addr(EntryCountType index) const {
-  assert(index < _num_entries, "precondition");
+inline Atomic<G1CardSetHowl::ContainerPtr> const* G1CardSetHowl::container_addr(EntryCountType index) const {
+  assert(index < _num_entries.load_relaxed(), "precondition");
   return buckets() + index;
 }
 
-inline G1CardSetHowl::ContainerPtr* G1CardSetHowl::container_addr(EntryCountType index) {
-  return const_cast<ContainerPtr*>(const_cast<const G1CardSetHowl*>(this)->container_addr(index));
+inline Atomic<G1CardSetHowl::ContainerPtr>* G1CardSetHowl::container_addr(EntryCountType index) {
+  return const_cast<Atomic<ContainerPtr>*>(const_cast<const G1CardSetHowl*>(this)->container_addr(index));
 }
 
 inline G1CardSetHowl::ContainerPtr G1CardSetHowl::at(EntryCountType index) const {
-  return *container_addr(index);
+  return (*container_addr(index)).load_relaxed();
 }
 
-inline G1CardSetHowl::ContainerPtr const* G1CardSetHowl::buckets() const {
+inline Atomic<G1CardSetHowl::ContainerPtr> const* G1CardSetHowl::buckets() const {
   const void* ptr = reinterpret_cast<const char*>(this) + header_size_in_bytes();
-  return reinterpret_cast<ContainerPtr const*>(ptr);
+  return reinterpret_cast<Atomic<ContainerPtr> const*>(ptr);
 }
 
 inline G1CardSetHowl::G1CardSetHowl(EntryCountType card_in_region, G1CardSetConfiguration* config) :
@@ -300,7 +299,7 @@ inline G1CardSetHowl::G1CardSetHowl(EntryCountType card_in_region, G1CardSetConf
   EntryCountType num_buckets = config->num_buckets_in_howl();
   EntryCountType bucket = config->howl_bucket_index(card_in_region);
   for (uint i = 0; i < num_buckets; ++i) {
-    *container_addr(i) = G1CardSetInlinePtr();
+    container_addr(i)->store_relaxed(G1CardSetInlinePtr());
     if (i == bucket) {
       G1CardSetInlinePtr value(container_addr(i), at(i));
       value.add(card_in_region, config->inline_ptr_bits_per_card(), config->max_cards_in_inline_ptr());
@@ -310,8 +309,8 @@ inline G1CardSetHowl::G1CardSetHowl(EntryCountType card_in_region, G1CardSetConf
 
 inline bool G1CardSetHowl::contains(uint card_idx, G1CardSetConfiguration* config) {
   EntryCountType bucket = config->howl_bucket_index(card_idx);
-  ContainerPtr* array_entry = container_addr(bucket);
-  ContainerPtr container = AtomicAccess::load_acquire(array_entry);
+  Atomic<ContainerPtr>* array_entry = container_addr(bucket);
+  ContainerPtr container = array_entry->load_acquire();
 
   switch (G1CardSet::container_type(container)) {
     case G1CardSet::ContainerArrayOfCards: {
diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
index d13a6fe2dca..60602ef942b 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 #include "gc/g1/g1CardSetContainers.inline.hpp"
 #include "gc/g1/g1CardSetMemory.inline.hpp"
 #include "gc/g1/g1MonotonicArena.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/ostream.hpp"
 
 G1CardSetAllocator::G1CardSetAllocator(const char* name,
diff --git a/src/hotspot/share/gc/g1/g1CardTableClaimTable.cpp b/src/hotspot/share/gc/g1/g1CardTableClaimTable.cpp
index e0cadbdd907..d8cabaa00a4 100644
--- a/src/hotspot/share/gc/g1/g1CardTableClaimTable.cpp
+++ b/src/hotspot/share/gc/g1/g1CardTableClaimTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,20 +44,20 @@ G1CardTableClaimTable::~G1CardTableClaimTable() {
 
 void G1CardTableClaimTable::initialize(uint max_reserved_regions) {
   assert(_card_claims == nullptr, "Must not be initialized twice");
-  _card_claims = NEW_C_HEAP_ARRAY(uint, max_reserved_regions, mtGC);
+  _card_claims = NEW_C_HEAP_ARRAY(Atomic<uint>, max_reserved_regions, mtGC);
   _max_reserved_regions = max_reserved_regions;
   reset_all_to_unclaimed();
 }
 
 void G1CardTableClaimTable::reset_all_to_unclaimed() {
   for (uint i = 0; i < _max_reserved_regions; i++) {
-    _card_claims[i] = 0;
+    _card_claims[i].store_relaxed(0);
   }
 }
 
 void G1CardTableClaimTable::reset_all_to_claimed() {
   for (uint i = 0; i < _max_reserved_regions; i++) {
-    _card_claims[i] = (uint)G1HeapRegion::CardsPerRegion;
+    _card_claims[i].store_relaxed((uint)G1HeapRegion::CardsPerRegion);
   }
 }
 
diff --git a/src/hotspot/share/gc/g1/g1CardTableClaimTable.hpp b/src/hotspot/share/gc/g1/g1CardTableClaimTable.hpp
index 4f524b83f97..822ef45c722 100644
--- a/src/hotspot/share/gc/g1/g1CardTableClaimTable.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTableClaimTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "gc/g1/g1CardTable.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 
 class G1HeapRegionClosure;
 
@@ -45,7 +46,7 @@ class G1CardTableClaimTable : public CHeapObj<mtGC> {
 
   // Card table iteration claim values for every heap region, from 0 (completely unclaimed)
   // to (>=) G1HeapRegion::CardsPerRegion (completely claimed).
-  uint volatile* _card_claims;
+  Atomic<uint>* _card_claims;
 
   uint _cards_per_chunk;           // For conversion between card index and chunk index.
 
diff --git a/src/hotspot/share/gc/g1/g1CardTableClaimTable.inline.hpp b/src/hotspot/share/gc/g1/g1CardTableClaimTable.inline.hpp
index d682f0d17ae..35b2484982c 100644
--- a/src/hotspot/share/gc/g1/g1CardTableClaimTable.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CardTableClaimTable.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,26 +29,25 @@
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 
 bool G1CardTableClaimTable::has_unclaimed_cards(uint region) {
   assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
-  return AtomicAccess::load(&_card_claims[region]) < G1HeapRegion::CardsPerRegion;
+  return _card_claims[region].load_relaxed() < G1HeapRegion::CardsPerRegion;
 }
 
 void G1CardTableClaimTable::reset_to_unclaimed(uint region) {
   assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
-  AtomicAccess::store(&_card_claims[region], 0u);
+  _card_claims[region].store_relaxed(0u);
 }
 
 uint G1CardTableClaimTable::claim_cards(uint region, uint increment) {
   assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
-  return AtomicAccess::fetch_then_add(&_card_claims[region], increment, memory_order_relaxed);
+  return _card_claims[region].fetch_then_add(increment, memory_order_relaxed);
 }
 
 uint G1CardTableClaimTable::claim_chunk(uint region) {
   assert(region < _max_reserved_regions, "Tried to access invalid region %u", region);
-  return AtomicAccess::fetch_then_add(&_card_claims[region], cards_per_chunk(), memory_order_relaxed);
+  return _card_claims[region].fetch_then_add(cards_per_chunk(), memory_order_relaxed);
 }
 
 uint G1CardTableClaimTable::claim_all_cards(uint region) {
diff --git a/src/hotspot/share/gc/g1/g1CodeRootSet.cpp b/src/hotspot/share/gc/g1/g1CodeRootSet.cpp
index 60ad3a2af32..ca4487876b9 100644
--- a/src/hotspot/share/gc/g1/g1CodeRootSet.cpp
+++ b/src/hotspot/share/gc/g1/g1CodeRootSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 #include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
 #include "utilities/concurrentHashTableTasks.inline.hpp"
 
@@ -60,7 +60,7 @@ class G1CodeRootSetHashTable : public CHeapObj<mtGC> {
   HashTable _table;
   HashTableScanTask _table_scanner;
 
-  size_t volatile _num_entries;
+  Atomic<size_t> _num_entries;
 
   bool is_empty() const { return number_of_entries() == 0; }
 
@@ -120,7 +120,7 @@ public:
     bool grow_hint = false;
     bool inserted = _table.insert(Thread::current(), lookup, method, &grow_hint);
     if (inserted) {
-      AtomicAccess::inc(&_num_entries);
+      _num_entries.add_then_fetch(1u);
     }
     if (grow_hint) {
       _table.grow(Thread::current());
@@ -131,7 +131,7 @@ public:
     HashTableLookUp lookup(method);
     bool removed = _table.remove(Thread::current(), lookup);
     if (removed) {
-      AtomicAccess::dec(&_num_entries);
+      _num_entries.sub_then_fetch(1u);
     }
     return removed;
   }
@@ -182,7 +182,7 @@ public:
     guarantee(succeeded, "unable to clean table");
 
     if (num_deleted != 0) {
-      size_t current_size = AtomicAccess::sub(&_num_entries, num_deleted);
+      size_t current_size = _num_entries.sub_then_fetch(num_deleted);
       shrink_to_match(current_size);
     }
   }
@@ -226,7 +226,7 @@ public:
 
   size_t mem_size() { return sizeof(*this) + _table.get_mem_size(Thread::current()); }
 
-  size_t number_of_entries() const { return AtomicAccess::load(&_num_entries); }
+  size_t number_of_entries() const { return _num_entries.load_relaxed(); }
 };
 
 uintx G1CodeRootSetHashTable::HashTableLookUp::get_hash() const {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 2ad5a26d5e6..3f5d674c443 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -103,7 +103,6 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/cpuTimeCounters.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
@@ -139,6 +138,26 @@ void G1RegionMappingChangedListener::on_commit(uint start_idx, size_t num_region
   reset_from_card_cache(start_idx, num_regions);
 }
 
+// Collects commonly used scoped objects that are related to initial setup.
+class G1GCMark : StackObj {
+  ResourceMark _rm;
+  IsSTWGCActiveMark _active_gc_mark;
+  GCIdMark _gc_id_mark;
+  SvcGCMarker _sgcm;
+  GCTraceCPUTime _tcpu;
+
+public:
+  G1GCMark(GCTracer* tracer, bool is_full_gc) :
+    _rm(),
+    _active_gc_mark(),
+    _gc_id_mark(),
+    _sgcm(is_full_gc ? SvcGCMarker::FULL : SvcGCMarker::MINOR),
+    _tcpu(tracer) {
+
+    assert_at_safepoint_on_vm_thread();
+  }
+};
+
 void G1CollectedHeap::run_batch_task(G1BatchedTask* cl) {
   uint num_workers = MAX2(1u, MIN2(cl->num_workers_estimate(), workers()->active_workers()));
   cl->set_max_workers(num_workers);
@@ -526,7 +545,7 @@ void G1CollectedHeap::iterate_regions_in_range(MemRegion range, const Func& func
   }
 }
 
-HeapWord* G1CollectedHeap::alloc_archive_region(size_t word_size, HeapWord* preferred_addr) {
+HeapWord* G1CollectedHeap::alloc_archive_region(size_t word_size) {
   assert(!is_init_completed(), "Expect to be called at JVM init time");
   MutexLocker x(Heap_lock);
 
@@ -687,8 +706,8 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size) {
   // before the allocation is that we avoid having to keep track of the newly
   // allocated memory while we do a GC.
   // Only try that if we can actually perform a GC.
-  if (is_init_completed() && policy()->need_to_start_conc_mark("concurrent humongous allocation",
-                                        word_size)) {
+  if (is_init_completed() &&
+      policy()->need_to_start_conc_mark("concurrent humongous allocation", word_size)) {
     try_collect(word_size, GCCause::_g1_humongous_allocation, collection_counters(this));
   }
 
@@ -915,12 +934,11 @@ void G1CollectedHeap::verify_after_full_collection() {
 void G1CollectedHeap::do_full_collection(size_t allocation_word_size,
                                          bool clear_all_soft_refs,
                                          bool do_maximal_compaction) {
-  assert_at_safepoint_on_vm_thread();
-
-  G1FullGCMark gc_mark;
+  G1FullGCTracer tracer;
+  G1GCMark gc_mark(&tracer, true /* is_full_gc */);
   GCTraceTime(Info, gc) tm("Pause Full", nullptr, gc_cause(), true);
-  G1FullCollector collector(this, clear_all_soft_refs, do_maximal_compaction, gc_mark.tracer());
 
+  G1FullCollector collector(this, clear_all_soft_refs, do_maximal_compaction, &tracer);
   collector.prepare_collection();
   collector.collect();
   collector.complete_collection(allocation_word_size);
@@ -1321,7 +1339,6 @@ G1CollectedHeap::G1CollectedHeap() :
   _card_set_freelist_pool(G1CardSetConfiguration::num_mem_object_types()),
   _young_regions_cset_group(card_set_config(), &_card_set_freelist_pool, G1CSetCandidateGroup::YoungRegionId),
   _cm(nullptr),
-  _cm_thread(nullptr),
   _cr(nullptr),
   _task_queues(nullptr),
   _partial_array_state_manager(nullptr),
@@ -1565,7 +1582,6 @@ jint G1CollectedHeap::initialize() {
   // Create the G1ConcurrentMark data structure and thread.
   // (Must do this late, so that "max_[reserved_]regions" is defined.)
   _cm = new G1ConcurrentMark(this, bitmap_storage);
-  _cm_thread = _cm->cm_thread();
 
   // Now expand into the initial heap size.
   if (!expand(init_byte_size, _workers)) {
@@ -1637,7 +1653,9 @@ jint G1CollectedHeap::initialize() {
 }
 
 bool G1CollectedHeap::concurrent_mark_is_terminating() const {
-  return _cm_thread->should_terminate();
+  assert(_cm != nullptr, "_cm must have been created");
+  assert(_cm->is_fully_initialized(), "thread must exist in order to check if mark is terminating");
+  return _cm->cm_thread()->should_terminate();
 }
 
 void G1CollectedHeap::stop() {
@@ -1646,7 +1664,9 @@ void G1CollectedHeap::stop() {
   // that are destroyed during shutdown.
   _cr->stop();
   _service_thread->stop();
-  _cm_thread->stop();
+  if (_cm->is_fully_initialized()) {
+    _cm->cm_thread()->stop();
+  }
 }
 
 void G1CollectedHeap::safepoint_synchronize_begin() {
@@ -1703,8 +1723,7 @@ void G1CollectedHeap::ref_processing_init() {
   //   * Reference discovery is MT (see below).
   //   * Reference discovery requires a barrier (see below).
   //   * Reference processing may or may not be MT
-  //     (depending on the value of ParallelRefProcEnabled
-  //     and ParallelGCThreads).
+  //     (depending on the value of ParallelGCThreads).
   //   * A full GC disables reference discovery by the CM
   //     ref processor and abandons any entries on it's
   //     discovered lists.
@@ -1843,7 +1862,7 @@ void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent,
   // is set) so that if a waiter requests another System.gc() it doesn't
   // incorrectly see that a marking cycle is still in progress.
   if (concurrent) {
-    _cm_thread->set_idle();
+    _cm->cm_thread()->set_idle();
   }
 
   // Notify threads waiting in System.gc() (with ExplicitGCInvokesConcurrent)
@@ -2422,7 +2441,6 @@ void G1CollectedHeap::print_gc_on(outputStream* st) const {
 
 void G1CollectedHeap::gc_threads_do(ThreadClosure* tc) const {
   workers()->threads_do(tc);
-  tc->do_thread(_cm_thread);
   _cm->threads_do(tc);
   _cr->threads_do(tc);
   tc->do_thread(_service_thread);
@@ -2543,15 +2561,15 @@ HeapWord* G1CollectedHeap::do_collection_pause(size_t word_size,
 }
 
 void G1CollectedHeap::start_concurrent_cycle(bool concurrent_operation_is_full_mark) {
-  assert(!_cm_thread->in_progress(), "Can not start concurrent operation while in progress");
-
+  assert(_cm->is_fully_initialized(), "sanity");
+  assert(!_cm->in_progress(), "Can not start concurrent operation while in progress");
   MutexLocker x(G1CGC_lock, Mutex::_no_safepoint_check_flag);
   if (concurrent_operation_is_full_mark) {
     _cm->post_concurrent_mark_start();
-    _cm_thread->start_full_mark();
+    _cm->cm_thread()->start_full_mark();
   } else {
     _cm->post_concurrent_undo_start();
-    _cm_thread->start_undo_mark();
+    _cm->cm_thread()->start_undo_mark();
   }
   G1CGC_lock->notify();
 }
@@ -2714,19 +2732,12 @@ void G1CollectedHeap::flush_region_pin_cache() {
 }
 
 void G1CollectedHeap::do_collection_pause_at_safepoint(size_t allocation_word_size) {
-  assert_at_safepoint_on_vm_thread();
-  assert(!is_stw_gc_active(), "collection is not reentrant");
-
-  ResourceMark rm;
-
-  IsSTWGCActiveMark active_gc_mark;
-  GCIdMark gc_id_mark;
-  SvcGCMarker sgcm(SvcGCMarker::MINOR);
-
-  GCTraceCPUTime tcpu(_gc_tracer_stw);
+  G1GCMark gcm(_gc_tracer_stw, false /* is_full_gc */);
 
   _bytes_used_during_gc = 0;
 
+  _cm->fully_initialize();
+
   policy()->decide_on_concurrent_start_pause();
   // Record whether this pause may need to trigger a concurrent operation. Later,
   // when we signal the G1ConcurrentMarkThread, the collector state has already
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index aff7166d391..8ff9d481000 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,7 @@
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
 #include "memory/memRegion.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/threadSMR.hpp"
 #include "utilities/bitMap.hpp"
@@ -124,7 +125,7 @@ class G1JavaThreadsListClaimer : public StackObj {
   ThreadsListHandle _list;
   uint _claim_step;
 
-  volatile uint _cur_claim;
+  Atomic<uint> _cur_claim;
 
   // Attempts to claim _claim_step JavaThreads, returning an array of claimed
   // JavaThread* with count elements. Returns null (and a zero count) if there
@@ -735,12 +736,10 @@ public:
   void iterate_regions_in_range(MemRegion range, const Func& func);
 
   // Commit the required number of G1 region(s) according to the size requested
-  // and mark them as 'old' region(s). Preferred address is treated as a hint for
-  // the location of the archive space in the heap. The returned address may or may
-  // not be same as the preferred address.
+  // and mark them as 'old' region(s).
   // This API is only used for allocating heap space for the archived heap objects
   // in the CDS archive.
-  HeapWord* alloc_archive_region(size_t word_size, HeapWord* preferred_addr);
+  HeapWord* alloc_archive_region(size_t word_size);
 
   // Populate the G1BlockOffsetTable for archived regions with the given
   // memory range.
@@ -824,7 +823,6 @@ public:
 
   // The concurrent marker (and the thread it runs in.)
   G1ConcurrentMark* _cm;
-  G1ConcurrentMarkThread* _cm_thread;
 
   // The concurrent refiner.
   G1ConcurrentRefine* _cr;
@@ -1267,7 +1265,6 @@ public:
 
   bool is_marked(oop obj) const;
 
-  inline static bool is_obj_filler(const oop obj);
   // Determine if an object is dead, given the object and also
   // the region to which the object belongs.
   inline bool is_obj_dead(const oop obj, const G1HeapRegion* hr) const;
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
index abd61e72d57..8782b65b6f9 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "gc/g1/g1CollectorState.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1EvacFailureRegions.hpp"
+#include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionManager.inline.hpp"
 #include "gc/g1/g1HeapRegionRemSet.hpp"
@@ -38,10 +39,10 @@
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1RegionPinCache.inline.hpp"
 #include "gc/g1/g1RemSet.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/markBitMap.inline.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "oops/stackChunkOop.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "utilities/bitMap.inline.hpp"
 
@@ -53,10 +54,10 @@ inline bool G1STWIsAliveClosure::do_object_b(oop p) {
 
 inline JavaThread* const* G1JavaThreadsListClaimer::claim(uint& count) {
   count = 0;
-  if (AtomicAccess::load(&_cur_claim) >= _list.length()) {
+  if (_cur_claim.load_relaxed() >= _list.length()) {
     return nullptr;
   }
-  uint claim = AtomicAccess::fetch_then_add(&_cur_claim, _claim_step);
+  uint claim = _cur_claim.fetch_then_add(_claim_step);
   if (claim >= _list.length()) {
     return nullptr;
   }
@@ -230,16 +231,11 @@ inline bool G1CollectedHeap::requires_barriers(stackChunkOop obj) const {
   return !heap_region_containing(obj)->is_young(); // is_in_young does an unnecessary null check
 }
 
-inline bool G1CollectedHeap::is_obj_filler(const oop obj) {
-  Klass* k = obj->klass_without_asserts();
-  return k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass();
-}
-
 inline bool G1CollectedHeap::is_obj_dead(const oop obj, const G1HeapRegion* hr) const {
   assert(!hr->is_free(), "looking up obj " PTR_FORMAT " in Free region %u", p2i(obj), hr->hrm_index());
   if (hr->is_in_parsable_area(obj)) {
     // This object is in the parsable part of the heap, live unless scrubbed.
-    return is_obj_filler(obj);
+    return is_filler_object(obj);
   } else {
     // From Remark until a region has been concurrently scrubbed, parts of the
     // region is not guaranteed to be parsable. Use the bitmap for liveness.
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
index 954ca40a77f..e7bab32129e 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 #include "gc/g1/g1CollectionSetChooser.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/shared/space.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/quickSort.hpp"
 
 // Determine collection set candidates (from marking): For all regions determine
@@ -50,7 +50,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
 
     G1HeapRegion** _data;
 
-    uint volatile _cur_claim_idx;
+    Atomic<uint> _cur_claim_idx;
 
     static int compare_region_gc_efficiency(G1HeapRegion** rr1, G1HeapRegion** rr2) {
       G1HeapRegion* r1 = *rr1;
@@ -105,7 +105,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
 
     // Claim a new chunk, returning its bounds [from, to[.
     void claim_chunk(uint& from, uint& to) {
-      uint result = AtomicAccess::add(&_cur_claim_idx, _chunk_size);
+      uint result = _cur_claim_idx.add_then_fetch(_chunk_size);
       assert(_max_size > result - 1,
              "Array too small, is %u should be %u with chunk size %u.",
              _max_size, result, _chunk_size);
@@ -121,14 +121,15 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
     }
 
     void sort_by_gc_efficiency() {
-      if (_cur_claim_idx == 0) {
+      uint length = _cur_claim_idx.load_relaxed();
+      if (length == 0) {
         return;
       }
-      for (uint i = _cur_claim_idx; i < _max_size; i++) {
+      for (uint i = length; i < _max_size; i++) {
         assert(_data[i] == nullptr, "must be");
       }
-      qsort(_data, _cur_claim_idx, sizeof(_data[0]), (_sort_Fn)compare_region_gc_efficiency);
-      for (uint i = _cur_claim_idx; i < _max_size; i++) {
+      qsort(_data, length, sizeof(_data[0]), (_sort_Fn)compare_region_gc_efficiency);
+      for (uint i = length; i < _max_size; i++) {
         assert(_data[i] == nullptr, "must be");
       }
     }
@@ -202,13 +203,13 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
   G1CollectedHeap* _g1h;
   G1HeapRegionClaimer _hrclaimer;
 
-  uint volatile _num_regions_added;
+  Atomic<uint> _num_regions_added;
 
   G1BuildCandidateArray _result;
 
   void update_totals(uint num_regions) {
     if (num_regions > 0) {
-      AtomicAccess::add(&_num_regions_added, num_regions);
+      _num_regions_added.add_then_fetch(num_regions);
     }
   }
 
@@ -220,7 +221,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
   void prune(G1HeapRegion** data) {
     G1Policy* p = G1CollectedHeap::heap()->policy();
 
-    uint num_candidates = AtomicAccess::load(&_num_regions_added);
+    uint num_candidates = _num_regions_added.load_relaxed();
 
     uint min_old_cset_length = p->calc_min_old_cset_length(num_candidates);
     uint num_pruned = 0;
@@ -253,7 +254,7 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
                               wasted_bytes,
                               allowed_waste);
 
-    AtomicAccess::sub(&_num_regions_added, num_pruned, memory_order_relaxed);
+    _num_regions_added.sub_then_fetch(num_pruned, memory_order_relaxed);
   }
 
 public:
@@ -274,7 +275,7 @@ public:
     _result.sort_by_gc_efficiency();
     prune(_result.array());
     candidates->set_candidates_from_marking(_result.array(),
-                                            _num_regions_added);
+                                            _num_regions_added.load_relaxed());
   }
 };
 
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 456d543fa10..ec5649f4fe2 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 #include "classfile/classLoaderData.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
+#include "cppstdlib/new.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1BatchedTask.hpp"
 #include "gc/g1/g1CardSetMemory.hpp"
@@ -51,6 +52,9 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "gc/shared/gcVMOperations.hpp"
+#include "gc/shared/partialArraySplitter.inline.hpp"
+#include "gc/shared/partialArrayState.hpp"
+#include "gc/shared/partialArrayTaskStats.hpp"
 #include "gc/shared/referencePolicy.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
@@ -67,7 +71,6 @@
 #include "nmt/memTracker.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
@@ -76,6 +79,7 @@
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/threads.hpp"
 #include "utilities/align.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/powerOfTwo.hpp"
@@ -99,7 +103,7 @@ bool G1CMBitMapClosure::do_addr(HeapWord* const addr) {
   // We move that task's local finger along.
   _task->move_finger_to(addr);
 
-  _task->scan_task_entry(G1TaskQueueEntry::from_oop(cast_to_oop(addr)));
+  _task->process_entry(G1TaskQueueEntry(cast_to_oop(addr)), false /* stolen */);
   // we only partially drain the local queue and global stack
   _task->drain_local_queue(true);
   _task->drain_global_stack(true);
@@ -148,25 +152,25 @@ bool G1CMMarkStack::initialize() {
 }
 
 G1CMMarkStack::TaskQueueEntryChunk* G1CMMarkStack::ChunkAllocator::allocate_new_chunk() {
-  if (_size >= _max_capacity) {
+  if (_size.load_relaxed() >= _max_capacity) {
     return nullptr;
   }
 
-  size_t cur_idx = AtomicAccess::fetch_then_add(&_size, 1u);
+  size_t cur_idx = _size.fetch_then_add(1u);
 
   if (cur_idx >= _max_capacity) {
     return nullptr;
   }
 
   size_t bucket = get_bucket(cur_idx);
-  if (AtomicAccess::load_acquire(&_buckets[bucket]) == nullptr) {
+  if (_buckets[bucket].load_acquire() == nullptr) {
     if (!_should_grow) {
       // Prefer to restart the CM.
       return nullptr;
     }
 
     MutexLocker x(G1MarkStackChunkList_lock, Mutex::_no_safepoint_check_flag);
-    if (AtomicAccess::load_acquire(&_buckets[bucket]) == nullptr) {
+    if (_buckets[bucket].load_acquire() == nullptr) {
       size_t desired_capacity = bucket_size(bucket) * 2;
       if (!try_expand_to(desired_capacity)) {
         return nullptr;
@@ -175,7 +179,7 @@ G1CMMarkStack::TaskQueueEntryChunk* G1CMMarkStack::ChunkAllocator::allocate_new_
   }
 
   size_t bucket_idx = get_bucket_index(cur_idx);
-  TaskQueueEntryChunk* result = ::new (&_buckets[bucket][bucket_idx]) TaskQueueEntryChunk;
+  TaskQueueEntryChunk* result = ::new (&_buckets[bucket].load_relaxed()[bucket_idx]) TaskQueueEntryChunk;
   result->next = nullptr;
   return result;
 }
@@ -197,10 +201,10 @@ bool G1CMMarkStack::ChunkAllocator::initialize(size_t initial_capacity, size_t m
   _max_capacity = max_capacity;
   _num_buckets  = get_bucket(_max_capacity) + 1;
 
-  _buckets = NEW_C_HEAP_ARRAY(TaskQueueEntryChunk*, _num_buckets, mtGC);
+  _buckets = NEW_C_HEAP_ARRAY(Atomic<TaskQueueEntryChunk*>, _num_buckets, mtGC);
 
   for (size_t i = 0; i < _num_buckets; i++) {
-    _buckets[i] = nullptr;
+    _buckets[i].store_relaxed(nullptr);
   }
 
   size_t new_capacity = bucket_size(0);
@@ -240,9 +244,9 @@ G1CMMarkStack::ChunkAllocator::~ChunkAllocator() {
   }
 
   for (size_t i = 0; i < _num_buckets; i++) {
-    if (_buckets[i] != nullptr) {
-      MmapArrayAllocator<TaskQueueEntryChunk>::free(_buckets[i],  bucket_size(i));
-      _buckets[i] = nullptr;
+    if (_buckets[i].load_relaxed() != nullptr) {
+      MmapArrayAllocator<TaskQueueEntryChunk>::free(_buckets[i].load_relaxed(),  bucket_size(i));
+      _buckets[i].store_relaxed(nullptr);
     }
   }
 
@@ -259,7 +263,7 @@ bool G1CMMarkStack::ChunkAllocator::reserve(size_t new_capacity) {
   // and the new capacity (new_capacity). This step ensures that there are no gaps in the
   // array and that the capacity accurately reflects the reserved memory.
   for (; i <= highest_bucket; i++) {
-    if (AtomicAccess::load_acquire(&_buckets[i]) != nullptr) {
+    if (_buckets[i].load_acquire() != nullptr) {
       continue; // Skip over already allocated buckets.
     }
 
@@ -279,7 +283,7 @@ bool G1CMMarkStack::ChunkAllocator::reserve(size_t new_capacity) {
       return false;
     }
     _capacity += bucket_capacity;
-    AtomicAccess::release_store(&_buckets[i], bucket_base);
+    _buckets[i].release_store(bucket_base);
   }
   return true;
 }
@@ -288,9 +292,9 @@ void G1CMMarkStack::expand() {
   _chunk_allocator.try_expand();
 }
 
-void G1CMMarkStack::add_chunk_to_list(TaskQueueEntryChunk* volatile* list, TaskQueueEntryChunk* elem) {
-  elem->next = *list;
-  *list = elem;
+void G1CMMarkStack::add_chunk_to_list(Atomic<TaskQueueEntryChunk*>* list, TaskQueueEntryChunk* elem) {
+  elem->next = list->load_relaxed();
+  list->store_relaxed(elem);
 }
 
 void G1CMMarkStack::add_chunk_to_chunk_list(TaskQueueEntryChunk* elem) {
@@ -304,10 +308,10 @@ void G1CMMarkStack::add_chunk_to_free_list(TaskQueueEntryChunk* elem) {
   add_chunk_to_list(&_free_list, elem);
 }
 
-G1CMMarkStack::TaskQueueEntryChunk* G1CMMarkStack::remove_chunk_from_list(TaskQueueEntryChunk* volatile* list) {
-  TaskQueueEntryChunk* result = *list;
+G1CMMarkStack::TaskQueueEntryChunk* G1CMMarkStack::remove_chunk_from_list(Atomic<TaskQueueEntryChunk*>* list) {
+  TaskQueueEntryChunk* result = list->load_relaxed();
   if (result != nullptr) {
-    *list = (*list)->next;
+    list->store_relaxed(list->load_relaxed()->next);
   }
   return result;
 }
@@ -361,8 +365,8 @@ bool G1CMMarkStack::par_pop_chunk(G1TaskQueueEntry* ptr_arr) {
 
 void G1CMMarkStack::set_empty() {
   _chunks_in_chunk_list = 0;
-  _chunk_list = nullptr;
-  _free_list = nullptr;
+  _chunk_list.store_relaxed(nullptr);
+  _free_list.store_relaxed(nullptr);
   _chunk_allocator.reset();
 }
 
@@ -379,12 +383,12 @@ G1CMRootMemRegions::~G1CMRootMemRegions() {
 }
 
 void G1CMRootMemRegions::reset() {
-  _num_root_regions = 0;
+  _num_root_regions.store_relaxed(0);
 }
 
 void G1CMRootMemRegions::add(HeapWord* start, HeapWord* end) {
   assert_at_safepoint();
-  size_t idx = AtomicAccess::fetch_then_add(&_num_root_regions, 1u);
+  size_t idx = _num_root_regions.fetch_then_add(1u);
   assert(idx < _max_regions, "Trying to add more root MemRegions than there is space %zu", _max_regions);
   assert(start != nullptr && end != nullptr && start <= end, "Start (" PTR_FORMAT ") should be less or equal to "
          "end (" PTR_FORMAT ")", p2i(start), p2i(end));
@@ -395,36 +399,38 @@ void G1CMRootMemRegions::add(HeapWord* start, HeapWord* end) {
 void G1CMRootMemRegions::prepare_for_scan() {
   assert(!scan_in_progress(), "pre-condition");
 
-  _scan_in_progress = _num_root_regions > 0;
+  _scan_in_progress.store_relaxed(num_root_regions() > 0);
 
-  _claimed_root_regions = 0;
-  _should_abort = false;
+  _claimed_root_regions.store_relaxed(0);
+  _should_abort.store_relaxed(false);
 }
 
 const MemRegion* G1CMRootMemRegions::claim_next() {
-  if (_should_abort) {
+  if (_should_abort.load_relaxed()) {
     // If someone has set the should_abort flag, we return null to
     // force the caller to bail out of their loop.
     return nullptr;
   }
 
-  if (_claimed_root_regions >= _num_root_regions) {
+  uint local_num_root_regions = num_root_regions();
+  if (_claimed_root_regions.load_relaxed() >= local_num_root_regions) {
     return nullptr;
   }
 
-  size_t claimed_index = AtomicAccess::fetch_then_add(&_claimed_root_regions, 1u);
-  if (claimed_index < _num_root_regions) {
+  size_t claimed_index = _claimed_root_regions.fetch_then_add(1u);
+  if (claimed_index < local_num_root_regions) {
     return &_root_regions[claimed_index];
   }
   return nullptr;
 }
 
 uint G1CMRootMemRegions::num_root_regions() const {
-  return (uint)_num_root_regions;
+  return (uint)_num_root_regions.load_relaxed();
 }
 
 bool G1CMRootMemRegions::contains(const MemRegion mr) const {
-  for (uint i = 0; i < _num_root_regions; i++) {
+  uint local_num_root_regions = num_root_regions();
+  for (uint i = 0; i < local_num_root_regions; i++) {
     if (_root_regions[i].equals(mr)) {
       return true;
     }
@@ -434,7 +440,7 @@ bool G1CMRootMemRegions::contains(const MemRegion mr) const {
 
 void G1CMRootMemRegions::notify_scan_done() {
   MutexLocker x(G1RootRegionScan_lock, Mutex::_no_safepoint_check_flag);
-  _scan_in_progress = false;
+  _scan_in_progress.store_relaxed(false);
   G1RootRegionScan_lock->notify_all();
 }
 
@@ -445,10 +451,10 @@ void G1CMRootMemRegions::cancel_scan() {
 void G1CMRootMemRegions::scan_finished() {
   assert(scan_in_progress(), "pre-condition");
 
-  if (!_should_abort) {
-    assert(_claimed_root_regions >= num_root_regions(),
+  if (!_should_abort.load_relaxed()) {
+    assert(_claimed_root_regions.load_relaxed() >= num_root_regions(),
            "we should have claimed all root regions, claimed %zu, length = %u",
-           _claimed_root_regions, num_root_regions());
+           _claimed_root_regions.load_relaxed(), num_root_regions());
   }
 
   notify_scan_done();
@@ -470,7 +476,7 @@ bool G1CMRootMemRegions::wait_until_scan_finished() {
 
 G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
                                    G1RegionToSpaceMapper* bitmap_storage) :
-  // _cm_thread set inside the constructor
+  _cm_thread(nullptr),
   _g1h(g1h),
 
   _mark_bitmap(),
@@ -481,15 +487,15 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
 
   _global_mark_stack(),
 
-  // _finger set in set_non_marking_state
+  _finger(nullptr), // _finger set in set_non_marking_state
 
   _worker_id_offset(G1ConcRefinementThreads), // The refinement control thread does not refine cards, so it's just the worker threads.
   _max_num_tasks(MAX2(ConcGCThreads, ParallelGCThreads)),
-  // _num_active_tasks set in set_non_marking_state()
-  // _tasks set inside the constructor
-
+  _num_active_tasks(0), // _num_active_tasks set in set_non_marking_state()
+  _tasks(nullptr), // _tasks set inside late_init()
   _task_queues(new G1CMTaskQueueSet(_max_num_tasks)),
   _terminator(_max_num_tasks, _task_queues),
+  _partial_array_state_manager(new PartialArrayStateManager(_max_num_tasks)),
 
   _first_overflow_barrier_sync(),
   _second_overflow_barrier_sync(),
@@ -514,13 +520,19 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
   _max_concurrent_workers(0),
 
   _region_mark_stats(NEW_C_HEAP_ARRAY(G1RegionMarkStats, _g1h->max_num_regions(), mtGC)),
-  _top_at_mark_starts(NEW_C_HEAP_ARRAY(HeapWord*, _g1h->max_num_regions(), mtGC)),
-  _top_at_rebuild_starts(NEW_C_HEAP_ARRAY(HeapWord*, _g1h->max_num_regions(), mtGC)),
+  _top_at_mark_starts(NEW_C_HEAP_ARRAY(Atomic<HeapWord*>, _g1h->max_num_regions(), mtGC)),
+  _top_at_rebuild_starts(NEW_C_HEAP_ARRAY(Atomic<HeapWord*>, _g1h->max_num_regions(), mtGC)),
   _needs_remembered_set_rebuild(false)
 {
   assert(G1CGC_lock != nullptr, "CGC_lock must be initialized");
 
   _mark_bitmap.initialize(g1h->reserved(), bitmap_storage);
+}
+
+void G1ConcurrentMark::fully_initialize() {
+  if (is_fully_initialized()) {
+    return;
+  }
 
   // Create & start ConcurrentMark thread.
   _cm_thread = new G1ConcurrentMarkThread(this);
@@ -553,11 +565,24 @@ G1ConcurrentMark::G1ConcurrentMark(G1CollectedHeap* g1h,
     _tasks[i] = new G1CMTask(i, this, task_queue, _region_mark_stats);
   }
 
+  uint max_num_regions = _g1h->max_num_regions();
+  ::new (_region_mark_stats) G1RegionMarkStats[max_num_regions]{};
+  ::new (_top_at_mark_starts) Atomic<HeapWord*>[max_num_regions]{};
+  ::new (_top_at_rebuild_starts) Atomic<HeapWord*>[max_num_regions]{};
+
   reset_at_marking_complete();
 }
 
+bool G1ConcurrentMark::in_progress() const {
+  return is_fully_initialized() ? _cm_thread->in_progress() : false;
+}
+
+PartialArrayStateManager* G1ConcurrentMark::partial_array_state_manager() const {
+  return _partial_array_state_manager;
+}
+
 void G1ConcurrentMark::reset() {
-  _has_aborted = false;
+  _has_aborted.store_relaxed(false);
 
   reset_marking_for_restart();
 
@@ -568,8 +593,8 @@ void G1ConcurrentMark::reset() {
   }
 
   uint max_num_regions = _g1h->max_num_regions();
+  ::new (_top_at_rebuild_starts) Atomic<HeapWord*>[max_num_regions]{};
   for (uint i = 0; i < max_num_regions; i++) {
-    _top_at_rebuild_starts[i] = nullptr;
     _region_mark_stats[i].clear();
   }
 
@@ -581,7 +606,7 @@ void G1ConcurrentMark::clear_statistics(G1HeapRegion* r) {
   for (uint j = 0; j < _max_num_tasks; ++j) {
     _tasks[j]->clear_mark_stats_cache(region_idx);
   }
-  _top_at_rebuild_starts[region_idx] = nullptr;
+  _top_at_rebuild_starts[region_idx].store_relaxed(nullptr);
   _region_mark_stats[region_idx].clear();
 }
 
@@ -617,11 +642,10 @@ void G1ConcurrentMark::reset_marking_for_restart() {
   }
 
   clear_has_overflown();
-  _finger = _heap.start();
+  _finger.store_relaxed(_heap.start());
 
   for (uint i = 0; i < _max_num_tasks; ++i) {
-    G1CMTaskQueue* queue = _task_queues->queue(i);
-    queue->set_empty();
+    _tasks[i]->reset_for_restart();
   }
 }
 
@@ -639,18 +663,37 @@ void G1ConcurrentMark::set_concurrency(uint active_tasks) {
 void G1ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurrent) {
   set_concurrency(active_tasks);
 
-  _concurrent = concurrent;
+  _concurrent.store_relaxed(concurrent);
 
   if (!concurrent) {
     // At this point we should be in a STW phase, and completed marking.
     assert_at_safepoint_on_vm_thread();
     assert(out_of_regions(),
            "only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT,
-           p2i(_finger), p2i(_heap.end()));
+           p2i(finger()), p2i(_heap.end()));
   }
 }
 
+#if TASKQUEUE_STATS
+void G1ConcurrentMark::print_and_reset_taskqueue_stats() {
+
+  _task_queues->print_and_reset_taskqueue_stats("G1ConcurrentMark Oop Queue");
+
+  auto get_pa_stats = [&](uint i) {
+    return _tasks[i]->partial_array_task_stats();
+  };
+
+  PartialArrayTaskStats::log_set(_max_num_tasks, get_pa_stats,
+                                 "G1ConcurrentMark Partial Array Task Stats");
+
+  for (uint i = 0; i < _max_num_tasks; ++i) {
+    get_pa_stats(i)->reset();
+  }
+}
+#endif
+
 void G1ConcurrentMark::reset_at_marking_complete() {
+  TASKQUEUE_STATS_ONLY(print_and_reset_taskqueue_stats());
   // We set the global marking state to some default values when we're
   // not doing marking.
   reset_marking_for_restart();
@@ -658,8 +701,8 @@ void G1ConcurrentMark::reset_at_marking_complete() {
 }
 
 G1ConcurrentMark::~G1ConcurrentMark() {
-  FREE_C_HEAP_ARRAY(HeapWord*, _top_at_mark_starts);
-  FREE_C_HEAP_ARRAY(HeapWord*, _top_at_rebuild_starts);
+  FREE_C_HEAP_ARRAY(Atomic<HeapWord*>, _top_at_mark_starts);
+  FREE_C_HEAP_ARRAY(Atomic<HeapWord*>, _top_at_rebuild_starts);
   FREE_C_HEAP_ARRAY(G1RegionMarkStats, _region_mark_stats);
   // The G1ConcurrentMark instance is never freed.
   ShouldNotReachHere();
@@ -738,7 +781,7 @@ private:
         // as asserts here to minimize their overhead on the product. However, we
         // will have them as guarantees at the beginning / end of the bitmap
         // clearing to get some checking in the product.
-        assert(!suspendible() || _cm->cm_thread()->in_progress(), "invariant");
+        assert(!suspendible() || _cm->in_progress(), "invariant");
         assert(!suspendible() || !G1CollectedHeap::heap()->collector_state()->mark_or_rebuild_in_progress(), "invariant");
 
         // Abort iteration if necessary.
@@ -794,7 +837,8 @@ void G1ConcurrentMark::clear_bitmap(WorkerThreads* workers, bool may_yield) {
 void G1ConcurrentMark::cleanup_for_next_mark() {
   // Make sure that the concurrent mark thread looks to still be in
   // the current cycle.
-  guarantee(cm_thread()->in_progress(), "invariant");
+  guarantee(is_fully_initialized(), "should be initializd");
+  guarantee(in_progress(), "invariant");
 
   // We are finishing up the current cycle by clearing the next
   // marking bitmap and getting it ready for the next cycle. During
@@ -804,11 +848,26 @@ void G1ConcurrentMark::cleanup_for_next_mark() {
 
   clear_bitmap(_concurrent_workers, true);
 
+  reset_partial_array_state_manager();
+
   // Repeat the asserts from above.
-  guarantee(cm_thread()->in_progress(), "invariant");
+  guarantee(is_fully_initialized(), "should be initializd");
+  guarantee(in_progress(), "invariant");
   guarantee(!_g1h->collector_state()->mark_or_rebuild_in_progress(), "invariant");
 }
 
+void G1ConcurrentMark::reset_partial_array_state_manager() {
+  for (uint i = 0; i < _max_num_tasks; ++i) {
+    _tasks[i]->unregister_partial_array_splitter();
+  }
+
+  partial_array_state_manager()->reset();
+
+  for (uint i = 0; i < _max_num_tasks; ++i) {
+    _tasks[i]->register_partial_array_splitter();
+  }
+}
+
 void G1ConcurrentMark::clear_bitmap(WorkerThreads* workers) {
   assert_at_safepoint_on_vm_thread();
   // To avoid fragmentation the full collection requesting to clear the bitmap
@@ -868,6 +927,8 @@ public:
   bool do_heap_region(G1HeapRegion* r) override {
     if (r->is_old_or_humongous() && !r->is_collection_set_candidate() && !r->in_collection_set()) {
       _cm->update_top_at_mark_start(r);
+    } else {
+      _cm->reset_top_at_mark_start(r);
     }
     return false;
   }
@@ -1110,7 +1171,7 @@ void G1ConcurrentMark::concurrent_cycle_start() {
 }
 
 uint G1ConcurrentMark::completed_mark_cycles() const {
-  return AtomicAccess::load(&_completed_mark_cycles);
+  return _completed_mark_cycles.load_relaxed();
 }
 
 void G1ConcurrentMark::concurrent_cycle_end(bool mark_cycle_completed) {
@@ -1119,7 +1180,7 @@ void G1ConcurrentMark::concurrent_cycle_end(bool mark_cycle_completed) {
   _g1h->trace_heap_after_gc(_gc_tracer_cm);
 
   if (mark_cycle_completed) {
-    AtomicAccess::inc(&_completed_mark_cycles, memory_order_relaxed);
+    _completed_mark_cycles.add_then_fetch(1u, memory_order_relaxed);
   }
 
   if (has_aborted()) {
@@ -1133,7 +1194,7 @@ void G1ConcurrentMark::concurrent_cycle_end(bool mark_cycle_completed) {
 }
 
 void G1ConcurrentMark::mark_from_roots() {
-  _restart_for_overflow = false;
+  _restart_for_overflow.store_relaxed(false);
 
   uint active_workers = calc_active_marking_workers();
 
@@ -1302,7 +1363,7 @@ void G1ConcurrentMark::remark() {
     }
   } else {
     // We overflowed.  Restart concurrent marking.
-    _restart_for_overflow = true;
+    _restart_for_overflow.store_relaxed(true);
 
     verify_during_pause(G1HeapVerifier::G1VerifyRemark, VerifyLocation::RemarkOverflow);
 
@@ -1731,44 +1792,45 @@ void G1ConcurrentMark::clear_bitmap_for_region(G1HeapRegion* hr) {
 }
 
 G1HeapRegion* G1ConcurrentMark::claim_region(uint worker_id) {
-  // "checkpoint" the finger
-  HeapWord* finger = _finger;
+  // "Checkpoint" the finger.
+  HeapWord* local_finger = finger();
 
-  while (finger < _heap.end()) {
-    assert(_g1h->is_in_reserved(finger), "invariant");
+  while (local_finger < _heap.end()) {
+    assert(_g1h->is_in_reserved(local_finger), "invariant");
 
-    G1HeapRegion* curr_region = _g1h->heap_region_containing_or_null(finger);
+    G1HeapRegion* curr_region = _g1h->heap_region_containing_or_null(local_finger);
     // Make sure that the reads below do not float before loading curr_region.
     OrderAccess::loadload();
     // Above heap_region_containing may return null as we always scan claim
     // until the end of the heap. In this case, just jump to the next region.
-    HeapWord* end = curr_region != nullptr ? curr_region->end() : finger + G1HeapRegion::GrainWords;
+    HeapWord* end = curr_region != nullptr ? curr_region->end() : local_finger + G1HeapRegion::GrainWords;
 
     // Is the gap between reading the finger and doing the CAS too long?
-    HeapWord* res = AtomicAccess::cmpxchg(&_finger, finger, end);
-    if (res == finger && curr_region != nullptr) {
-      // we succeeded
+    HeapWord* res = _finger.compare_exchange(local_finger, end);
+    if (res == local_finger && curr_region != nullptr) {
+      // We succeeded.
       HeapWord* bottom = curr_region->bottom();
       HeapWord* limit = top_at_mark_start(curr_region);
 
       log_trace(gc, marking)("Claim region %u bottom " PTR_FORMAT " tams " PTR_FORMAT, curr_region->hrm_index(), p2i(curr_region->bottom()), p2i(top_at_mark_start(curr_region)));
-      // notice that _finger == end cannot be guaranteed here since,
-      // someone else might have moved the finger even further
-      assert(_finger >= end, "the finger should have moved forward");
+      // Notice that _finger == end cannot be guaranteed here since,
+      // someone else might have moved the finger even further.
+      assert(finger() >= end, "The finger should have moved forward");
 
       if (limit > bottom) {
         return curr_region;
       } else {
         assert(limit == bottom,
-               "the region limit should be at bottom");
+               "The region limit should be at bottom");
         // We return null and the caller should try calling
         // claim_region() again.
         return nullptr;
       }
     } else {
-      assert(_finger > finger, "the finger should have moved forward");
-      // read it again
-      finger = _finger;
+      // Read the finger again.
+      HeapWord* next_finger = finger();
+      assert(next_finger > local_finger, "The finger should have moved forward " PTR_FORMAT " " PTR_FORMAT, p2i(local_finger), p2i(next_finger));
+      local_finger = next_finger;
     }
   }
 
@@ -1789,17 +1851,18 @@ public:
   { }
 
   void operator()(G1TaskQueueEntry task_entry) const {
-    if (task_entry.is_array_slice()) {
-      guarantee(_g1h->is_in_reserved(task_entry.slice()), "Slice " PTR_FORMAT " must be in heap.", p2i(task_entry.slice()));
+    if (task_entry.is_partial_array_state()) {
+      oop obj = task_entry.to_partial_array_state()->source();
+      guarantee(_g1h->is_in_reserved(obj), "Partial Array " PTR_FORMAT " must be in heap.", p2i(obj));
       return;
     }
-    guarantee(oopDesc::is_oop(task_entry.obj()),
+    guarantee(oopDesc::is_oop(task_entry.to_oop()),
               "Non-oop " PTR_FORMAT ", phase: %s, info: %d",
-              p2i(task_entry.obj()), _phase, _info);
-    G1HeapRegion* r = _g1h->heap_region_containing(task_entry.obj());
+              p2i(task_entry.to_oop()), _phase, _info);
+    G1HeapRegion* r = _g1h->heap_region_containing(task_entry.to_oop());
     guarantee(!(r->in_collection_set() || r->has_index_in_opt_cset()),
               "obj " PTR_FORMAT " from %s (%d) in region %u in (optional) collection set",
-              p2i(task_entry.obj()), _phase, _info, r->hrm_index());
+              p2i(task_entry.to_oop()), _phase, _info, r->hrm_index());
   }
 };
 
@@ -1883,15 +1946,12 @@ bool G1ConcurrentMark::concurrent_cycle_abort() {
   // nothing, but this situation should be extremely rare (a full gc after shutdown
   // has been signalled is already rare), and this work should be negligible compared
   // to actual full gc work.
-  if (!cm_thread()->in_progress() && !_g1h->concurrent_mark_is_terminating()) {
+
+  if (!is_fully_initialized() || (!cm_thread()->in_progress() && !_g1h->concurrent_mark_is_terminating())) {
     return false;
   }
 
-  // Empty mark stack
   reset_marking_for_restart();
-  for (uint i = 0; i < _max_num_tasks; ++i) {
-    _tasks[i]->clear_region_fields();
-  }
 
   abort_marking_threads();
 
@@ -1906,7 +1966,7 @@ bool G1ConcurrentMark::concurrent_cycle_abort() {
 
 void G1ConcurrentMark::abort_marking_threads() {
   assert(!_root_regions.scan_in_progress(), "still doing root region scan");
-  _has_aborted = true;
+  _has_aborted.store_relaxed(true);
   _first_overflow_barrier_sync.abort();
   _second_overflow_barrier_sync.abort();
 }
@@ -1945,6 +2005,10 @@ void G1ConcurrentMark::print_summary_info() {
   }
 
   log.trace(" Concurrent marking:");
+  if (!is_fully_initialized()) {
+    log.trace("    has not been initialized yet");
+    return;
+  }
   print_ms_time_info("  ", "remarks", _remark_times);
   {
     print_ms_time_info("     ", "final marks", _remark_mark_times);
@@ -1961,7 +2025,10 @@ void G1ConcurrentMark::print_summary_info() {
 }
 
 void G1ConcurrentMark::threads_do(ThreadClosure* tc) const {
-  _concurrent_workers->threads_do(tc);
+  if (is_fully_initialized()) { // they are initialized late
+    tc->do_thread(_cm_thread);
+    _concurrent_workers->threads_do(tc);
+  }
 }
 
 void G1ConcurrentMark::print_on(outputStream* st) const {
@@ -2055,6 +2122,24 @@ void G1CMTask::reset(G1CMBitMap* mark_bitmap) {
   _mark_stats_cache.reset();
 }
 
+void G1CMTask::reset_for_restart() {
+  clear_region_fields();
+  _task_queue->set_empty();
+  TASKQUEUE_STATS_ONLY(_partial_array_splitter.stats()->reset());
+  TASKQUEUE_STATS_ONLY(_task_queue->stats.reset());
+}
+
+void G1CMTask::register_partial_array_splitter() {
+
+  ::new (&_partial_array_splitter) PartialArraySplitter(_cm->partial_array_state_manager(),
+                                                        _cm->max_num_tasks(),
+                                                        ObjArrayMarkingStride);
+}
+
+void G1CMTask::unregister_partial_array_splitter() {
+  _partial_array_splitter.~PartialArraySplitter();
+}
+
 bool G1CMTask::should_exit_termination() {
   if (!regular_clock_call()) {
     return true;
@@ -2185,7 +2270,7 @@ bool G1CMTask::get_entries_from_global_stack() {
     if (task_entry.is_null()) {
       break;
     }
-    assert(task_entry.is_array_slice() || oopDesc::is_oop(task_entry.obj()), "Element " PTR_FORMAT " must be an array slice or oop", p2i(task_entry.obj()));
+    assert(task_entry.is_partial_array_state() || oopDesc::is_oop(task_entry.to_oop()), "Element " PTR_FORMAT " must be an array slice or oop", p2i(task_entry.to_oop()));
     bool success = _task_queue->push(task_entry);
     // We only call this when the local queue is empty or under a
     // given target limit. So, we do not expect this push to fail.
@@ -2216,7 +2301,7 @@ void G1CMTask::drain_local_queue(bool partially) {
     G1TaskQueueEntry entry;
     bool ret = _task_queue->pop_local(entry);
     while (ret) {
-      scan_task_entry(entry);
+      process_entry(entry, false /* stolen */);
       if (_task_queue->size() <= target_size || has_aborted()) {
         ret = false;
       } else {
@@ -2226,6 +2311,37 @@ void G1CMTask::drain_local_queue(bool partially) {
   }
 }
 
+size_t G1CMTask::start_partial_array_processing(oop obj) {
+  assert(should_be_sliced(obj), "Must be an array object %d and large %zu", obj->is_objArray(), obj->size());
+
+  objArrayOop obj_array = objArrayOop(obj);
+  size_t array_length = obj_array->length();
+
+  size_t initial_chunk_size = _partial_array_splitter.start(_task_queue, obj_array, nullptr, array_length);
+
+  // Mark objArray klass metadata
+  if (_cm_oop_closure->do_metadata()) {
+    _cm_oop_closure->do_klass(obj_array->klass());
+  }
+
+  process_array_chunk(obj_array, 0, initial_chunk_size);
+
+  // Include object header size
+  return objArrayOopDesc::object_size(checked_cast<int>(initial_chunk_size));
+}
+
+size_t G1CMTask::process_partial_array(const G1TaskQueueEntry& task, bool stolen) {
+  PartialArrayState* state = task.to_partial_array_state();
+  // Access state before release by claim().
+  objArrayOop obj = objArrayOop(state->source());
+
+  PartialArraySplitter::Claim claim =
+    _partial_array_splitter.claim(state, _task_queue, stolen);
+
+  process_array_chunk(obj, claim._start, claim._end);
+  return heap_word_size((claim._end - claim._start) * heapOopSize);
+}
+
 void G1CMTask::drain_global_stack(bool partially) {
   if (has_aborted()) {
     return;
@@ -2430,7 +2546,7 @@ void G1CMTask::attempt_stealing() {
   while (!has_aborted()) {
     G1TaskQueueEntry entry;
     if (_cm->try_stealing(_worker_id, entry)) {
-      scan_task_entry(entry);
+      process_entry(entry, true /* stolen */);
 
       // And since we're towards the end, let's totally drain the
       // local queue and global stack.
@@ -2759,12 +2875,12 @@ G1CMTask::G1CMTask(uint worker_id,
                    G1ConcurrentMark* cm,
                    G1CMTaskQueue* task_queue,
                    G1RegionMarkStats* mark_stats) :
-  _objArray_processor(this),
   _worker_id(worker_id),
   _g1h(G1CollectedHeap::heap()),
   _cm(cm),
   _mark_bitmap(nullptr),
   _task_queue(task_queue),
+  _partial_array_splitter(_cm->partial_array_state_manager(), _cm->max_num_tasks(), ObjArrayMarkingStride),
   _mark_stats_cache(mark_stats, G1RegionMarkStatsCache::RegionMarkStatsCacheSize),
   _calls(0),
   _time_target_ms(0.0),
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
index 752082ce629..11da6dae5b3 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,20 @@
 #define SHARE_GC_G1_G1CONCURRENTMARK_HPP
 
 #include "gc/g1/g1ConcurrentMarkBitMap.hpp"
-#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
 #include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HeapVerifier.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
 #include "gc/shared/gcCause.hpp"
+#include "gc/shared/partialArraySplitter.hpp"
+#include "gc/shared/partialArrayState.hpp"
+#include "gc/shared/partialArrayTaskStats.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/verifyOption.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "gc/shared/workerUtils.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/compilerWarnings.hpp"
 #include "utilities/numberSeq.hpp"
 
@@ -53,41 +56,7 @@ class G1RegionToSpaceMapper;
 class G1SurvivorRegions;
 class ThreadClosure;
 
-// This is a container class for either an oop or a continuation address for
-// mark stack entries. Both are pushed onto the mark stack.
-class G1TaskQueueEntry {
-private:
-  void* _holder;
-
-  static const uintptr_t ArraySliceBit = 1;
-
-  G1TaskQueueEntry(oop obj) : _holder(obj) {
-    assert(_holder != nullptr, "Not allowed to set null task queue element");
-  }
-  G1TaskQueueEntry(HeapWord* addr) : _holder((void*)((uintptr_t)addr | ArraySliceBit)) { }
-public:
-
-  G1TaskQueueEntry() : _holder(nullptr) { }
-  // Trivially copyable, for use in GenericTaskQueue.
-
-  static G1TaskQueueEntry from_slice(HeapWord* what) { return G1TaskQueueEntry(what); }
-  static G1TaskQueueEntry from_oop(oop obj) { return G1TaskQueueEntry(obj); }
-
-  oop obj() const {
-    assert(!is_array_slice(), "Trying to read array slice " PTR_FORMAT " as oop", p2i(_holder));
-    return cast_to_oop(_holder);
-  }
-
-  HeapWord* slice() const {
-    assert(is_array_slice(), "Trying to read oop " PTR_FORMAT " as array slice", p2i(_holder));
-    return (HeapWord*)((uintptr_t)_holder & ~ArraySliceBit);
-  }
-
-  bool is_oop() const { return !is_array_slice(); }
-  bool is_array_slice() const { return ((uintptr_t)_holder & ArraySliceBit) != 0; }
-  bool is_null() const { return _holder == nullptr; }
-};
-
+typedef ScannerTask G1TaskQueueEntry;
 typedef GenericTaskQueue<G1TaskQueueEntry, mtGC> G1CMTaskQueue;
 typedef GenericTaskQueueSet<G1CMTaskQueue, mtGC> G1CMTaskQueueSet;
 
@@ -172,9 +141,9 @@ private:
     size_t _capacity;
     size_t _num_buckets;
     bool _should_grow;
-    TaskQueueEntryChunk* volatile* _buckets;
+    Atomic<TaskQueueEntryChunk*>* _buckets;
     char _pad0[DEFAULT_PADDING_SIZE];
-    volatile size_t _size;
+    Atomic<size_t> _size;
     char _pad4[DEFAULT_PADDING_SIZE - sizeof(size_t)];
 
     size_t bucket_size(size_t bucket) {
@@ -212,7 +181,7 @@ private:
     bool initialize(size_t initial_capacity, size_t max_capacity);
 
     void reset() {
-      _size = 0;
+      _size.store_relaxed(0);
       _should_grow = false;
     }
 
@@ -241,17 +210,17 @@ private:
   ChunkAllocator _chunk_allocator;
 
   char _pad0[DEFAULT_PADDING_SIZE];
-  TaskQueueEntryChunk* volatile _free_list;  // Linked list of free chunks that can be allocated by users.
+  Atomic<TaskQueueEntryChunk*> _free_list;  // Linked list of free chunks that can be allocated by users.
   char _pad1[DEFAULT_PADDING_SIZE - sizeof(TaskQueueEntryChunk*)];
-  TaskQueueEntryChunk* volatile _chunk_list; // List of chunks currently containing data.
+  Atomic<TaskQueueEntryChunk*> _chunk_list; // List of chunks currently containing data.
   volatile size_t _chunks_in_chunk_list;
   char _pad2[DEFAULT_PADDING_SIZE - sizeof(TaskQueueEntryChunk*) - sizeof(size_t)];
 
   // Atomically add the given chunk to the list.
-  void add_chunk_to_list(TaskQueueEntryChunk* volatile* list, TaskQueueEntryChunk* elem);
+  void add_chunk_to_list(Atomic<TaskQueueEntryChunk*>* list, TaskQueueEntryChunk* elem);
   // Atomically remove and return a chunk from the given list. Returns null if the
   // list is empty.
-  TaskQueueEntryChunk* remove_chunk_from_list(TaskQueueEntryChunk* volatile* list);
+  TaskQueueEntryChunk* remove_chunk_from_list(Atomic<TaskQueueEntryChunk*>* list);
 
   void add_chunk_to_chunk_list(TaskQueueEntryChunk* elem);
   void add_chunk_to_free_list(TaskQueueEntryChunk* elem);
@@ -283,7 +252,7 @@ private:
 
   // Return whether the chunk list is empty. Racy due to unsynchronized access to
   // _chunk_list.
-  bool is_empty() const { return _chunk_list == nullptr; }
+  bool is_empty() const { return _chunk_list.load_relaxed() == nullptr; }
 
   size_t capacity() const  { return _chunk_allocator.capacity(); }
 
@@ -321,12 +290,12 @@ class G1CMRootMemRegions {
   MemRegion* _root_regions;
   size_t const _max_regions;
 
-  volatile size_t _num_root_regions; // Actual number of root regions.
+  Atomic<size_t> _num_root_regions;  // Actual number of root regions.
 
-  volatile size_t _claimed_root_regions; // Number of root regions currently claimed.
+  Atomic<size_t> _claimed_root_regions; // Number of root regions currently claimed.
 
-  volatile bool _scan_in_progress;
-  volatile bool _should_abort;
+  Atomic<bool> _scan_in_progress;
+  Atomic<bool> _should_abort;
 
   void notify_scan_done();
 
@@ -343,11 +312,11 @@ public:
   void prepare_for_scan();
 
   // Forces get_next() to return null so that the iteration aborts early.
-  void abort() { _should_abort = true; }
+  void abort() { _should_abort.store_relaxed(true); }
 
   // Return true if the CM thread are actively scanning root regions,
   // false otherwise.
-  bool scan_in_progress() { return _scan_in_progress; }
+  bool scan_in_progress() { return _scan_in_progress.load_relaxed(); }
 
   // Claim the next root MemRegion to scan atomically, or return null if
   // all have been claimed.
@@ -399,7 +368,7 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
 
   // For grey objects
   G1CMMarkStack           _global_mark_stack; // Grey objects behind global finger
-  HeapWord* volatile      _finger;            // The global finger, region aligned,
+  Atomic<HeapWord*>       _finger;            // The global finger, region aligned,
                                               // always pointing to the end of the
                                               // last claimed region
 
@@ -411,6 +380,8 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
   G1CMTaskQueueSet*       _task_queues; // Task queue set
   TaskTerminator          _terminator;  // For termination
 
+  PartialArrayStateManager* _partial_array_state_manager;
+
   // Two sync barriers that are used to synchronize tasks when an
   // overflow occurs. The algorithm is the following. All tasks enter
   // the first one to ensure that they have all stopped manipulating
@@ -424,19 +395,19 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
   WorkerThreadsBarrierSync     _second_overflow_barrier_sync;
 
   // Number of completed mark cycles.
-  volatile uint           _completed_mark_cycles;
+  Atomic<uint>            _completed_mark_cycles;
 
   // This is set by any task, when an overflow on the global data
   // structures is detected
-  volatile bool           _has_overflown;
+  Atomic<bool>            _has_overflown;
   // True: marking is concurrent, false: we're in remark
-  volatile bool           _concurrent;
+  Atomic<bool>            _concurrent;
   // Set at the end of a Full GC so that marking aborts
-  volatile bool           _has_aborted;
+  Atomic<bool>            _has_aborted;
 
   // Used when remark aborts due to an overflow to indicate that
   // another concurrent marking phase should start
-  volatile bool           _restart_for_overflow;
+  Atomic<bool>            _restart_for_overflow;
 
   ConcurrentGCTimer*      _gc_timer_cm;
 
@@ -488,8 +459,10 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
   // Prints all gathered CM-related statistics
   void print_stats();
 
-  HeapWord*           finger()       { return _finger;   }
-  bool                concurrent()   { return _concurrent; }
+  void print_and_reset_taskqueue_stats();
+
+  HeapWord*           finger()       { return _finger.load_relaxed();   }
+  bool                concurrent()   { return _concurrent.load_relaxed(); }
   uint                active_tasks() { return _num_active_tasks; }
   TaskTerminator*     terminator()   { return &_terminator; }
 
@@ -514,7 +487,7 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
   // to satisfy an allocation without doing a GC. This is fine, because all
   // objects in those regions will be considered live anyway because of
   // SATB guarantees (i.e. their TAMS will be equal to bottom).
-  bool out_of_regions() { return _finger >= _heap.end(); }
+  bool out_of_regions() { return finger() >= _heap.end(); }
 
   // Returns the task with the given id
   G1CMTask* task(uint id) {
@@ -526,10 +499,10 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
 
   // Access / manipulation of the overflow flag which is set to
   // indicate that the global stack has overflown
-  bool has_overflown()           { return _has_overflown; }
-  void set_has_overflown()       { _has_overflown = true; }
-  void clear_has_overflown()     { _has_overflown = false; }
-  bool restart_for_overflow()    { return _restart_for_overflow; }
+  bool has_overflown()           { return _has_overflown.load_relaxed(); }
+  void set_has_overflown()       { _has_overflown.store_relaxed(true); }
+  void clear_has_overflown()     { _has_overflown.store_relaxed(false); }
+  bool restart_for_overflow()    { return _restart_for_overflow.load_relaxed(); }
 
   // Methods to enter the two overflow sync barriers
   void enter_first_sync_barrier(uint worker_id);
@@ -543,12 +516,12 @@ class G1ConcurrentMark : public CHeapObj<mtGC> {
   G1RegionMarkStats* _region_mark_stats;
   // Top pointer for each region at the start of marking. Must be valid for all committed
   // regions.
-  HeapWord* volatile* _top_at_mark_starts;
+  Atomic<HeapWord*>* _top_at_mark_starts;
   // Top pointer for each region at the start of the rebuild remembered set process
   // for regions which remembered sets need to be rebuilt. A null for a given region
   // means that this region does not be scanned during the rebuilding remembered
   // set phase at all.
-  HeapWord* volatile* _top_at_rebuild_starts;
+  Atomic<HeapWord*>* _top_at_rebuild_starts;
   // True when Remark pause selected regions for rebuilding.
   bool _needs_remembered_set_rebuild;
 public:
@@ -556,14 +529,14 @@ public:
   // mark_in_bitmap call. Updates various statistics data.
   void add_to_liveness(uint worker_id, oop const obj, size_t size);
   // Did the last marking find a live object between bottom and TAMS?
-  bool contains_live_object(uint region) const { return _region_mark_stats[region]._live_words != 0; }
+  bool contains_live_object(uint region) const { return _region_mark_stats[region].live_words() != 0; }
   // Live bytes in the given region as determined by concurrent marking, i.e. the amount of
   // live bytes between bottom and TAMS.
-  size_t live_bytes(uint region) const { return _region_mark_stats[region]._live_words * HeapWordSize; }
+  size_t live_bytes(uint region) const { return _region_mark_stats[region].live_words() * HeapWordSize; }
   // Set live bytes for concurrent marking.
-  void set_live_bytes(uint region, size_t live_bytes) { _region_mark_stats[region]._live_words = live_bytes / HeapWordSize; }
+  void set_live_bytes(uint region, size_t live_bytes) { _region_mark_stats[region]._live_words.store_relaxed(live_bytes / HeapWordSize); }
   // Approximate number of incoming references found during marking.
-  size_t incoming_refs(uint region) const { return _region_mark_stats[region]._incoming_refs; }
+  size_t incoming_refs(uint region) const { return _region_mark_stats[region].incoming_refs(); }
 
   // Update the TAMS for the given region to the current top.
   inline void update_top_at_mark_start(G1HeapRegion* r);
@@ -582,6 +555,11 @@ public:
 
   uint worker_id_offset() const { return _worker_id_offset; }
 
+  void fully_initialize();
+  bool is_fully_initialized() const { return _cm_thread != nullptr; }
+  bool in_progress() const;
+  uint max_num_tasks() const {return _max_num_tasks; }
+
   // Clear statistics gathered during the concurrent cycle for the given region after
   // it has been reclaimed.
   void clear_statistics(G1HeapRegion* r);
@@ -631,6 +609,8 @@ public:
   // Calculates the number of concurrent GC threads to be used in the marking phase.
   uint calc_active_marking_workers();
 
+  PartialArrayStateManager* partial_array_state_manager() const;
+
   // Resets the global marking data structures, as well as the
   // task local ones; should be called during concurrent start.
   void reset();
@@ -642,6 +622,10 @@ public:
   // to be called concurrently to the mutator. It will yield to safepoint requests.
   void cleanup_for_next_mark();
 
+  // Recycle the memory that has been requested by allocators associated with
+  // this manager.
+  void reset_partial_array_state_manager();
+
   // Clear the next marking bitmap during safepoint.
   void clear_bitmap(WorkerThreads* workers);
 
@@ -695,7 +679,7 @@ public:
 
   uint completed_mark_cycles() const;
 
-  bool has_aborted()      { return _has_aborted; }
+  bool has_aborted() { return _has_aborted.load_relaxed(); }
 
   void print_summary_info();
 
@@ -732,14 +716,13 @@ private:
     refs_reached_period           = 1024,
   };
 
-  G1CMObjArrayProcessor       _objArray_processor;
-
   uint                        _worker_id;
   G1CollectedHeap*            _g1h;
   G1ConcurrentMark*           _cm;
   G1CMBitMap*                 _mark_bitmap;
   // the task queue of this task
   G1CMTaskQueue*              _task_queue;
+  PartialArraySplitter        _partial_array_splitter;
 
   G1RegionMarkStatsCache      _mark_stats_cache;
   // Number of calls to this task
@@ -850,13 +833,26 @@ private:
   // mark bitmap scan, and so needs to be pushed onto the mark stack.
   bool is_below_finger(oop obj, HeapWord* global_finger) const;
 
-  template<bool scan> void process_grey_task_entry(G1TaskQueueEntry task_entry);
+  template<bool scan> void process_grey_task_entry(G1TaskQueueEntry task_entry, bool stolen);
+
+  static bool should_be_sliced(oop obj);
+  // Start processing the given objArrayOop by first pushing its continuations and
+  // then scanning the first chunk including the header.
+  size_t start_partial_array_processing(oop obj);
+  // Process the given continuation. Returns the number of words scanned.
+  size_t process_partial_array(const G1TaskQueueEntry& task, bool stolen);
+  // Apply the closure to the given range of elements in the objArray.
+  inline void process_array_chunk(objArrayOop obj, size_t start, size_t end);
 public:
-  // Apply the closure on the given area of the objArray. Return the number of words
-  // scanned.
-  inline size_t scan_objArray(objArrayOop obj, MemRegion mr);
-  // Resets the task; should be called right at the beginning of a marking phase.
+  // Resets the task completely for a new marking; should be called right at the beginning of a marking phase.
   void reset(G1CMBitMap* mark_bitmap);
+  // Minimal reset of the task, making it ready for continuing to mark.
+  void reset_for_restart();
+  // Register/unregister Partial Array Splitter Allocator with the PartialArrayStateManager.
+  // This allows us to discard memory arenas used for partial object array states at the end
+  // of a concurrent mark cycle.
+  void register_partial_array_splitter();
+  void unregister_partial_array_splitter();
   // Clears all the fields that correspond to a claimed region.
   void clear_region_fields();
 
@@ -912,7 +908,7 @@ public:
   inline bool deal_with_reference(T* p);
 
   // Scans an object and visits its children.
-  inline void scan_task_entry(G1TaskQueueEntry task_entry);
+  inline void process_entry(G1TaskQueueEntry task_entry, bool stolen);
 
   // Pushes an object on the local queue.
   inline void push(G1TaskQueueEntry task_entry);
@@ -957,6 +953,11 @@ public:
   Pair<size_t, size_t> flush_mark_stats_cache();
   // Prints statistics associated with this task
   void print_stats();
+#if TASKQUEUE_STATS
+  PartialArrayTaskStats* partial_array_task_stats() {
+    return _partial_array_splitter.stats();
+  }
+#endif
 };
 
 // Class that's used to to print out per-region liveness
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
index 6f71012ff7c..21167d5cae9 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
-#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
 #include "gc/g1/g1OopClosures.inline.hpp"
@@ -39,6 +38,7 @@
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "utilities/bitMap.inline.hpp"
+#include "utilities/checkedCast.hpp"
 
 inline bool G1CMIsAliveClosure::do_object_b(oop obj) {
   // Check whether the passed in object is null. During discovery the referent
@@ -90,7 +90,7 @@ inline void G1CMMarkStack::iterate(Fn fn) const {
 
   size_t num_chunks = 0;
 
-  TaskQueueEntryChunk* cur = _chunk_list;
+  TaskQueueEntryChunk* cur = _chunk_list.load_relaxed();
   while (cur != nullptr) {
     guarantee(num_chunks <= _chunks_in_chunk_list, "Found %zu oop chunks which is more than there should be", num_chunks);
 
@@ -107,13 +107,15 @@ inline void G1CMMarkStack::iterate(Fn fn) const {
 #endif
 
 // It scans an object and visits its children.
-inline void G1CMTask::scan_task_entry(G1TaskQueueEntry task_entry) { process_grey_task_entry<true>(task_entry); }
+inline void G1CMTask::process_entry(G1TaskQueueEntry task_entry, bool stolen) {
+  process_grey_task_entry<true>(task_entry, stolen);
+}
 
 inline void G1CMTask::push(G1TaskQueueEntry task_entry) {
-  assert(task_entry.is_array_slice() || _g1h->is_in_reserved(task_entry.obj()), "invariant");
-  assert(task_entry.is_array_slice() || !_g1h->is_on_master_free_list(
-              _g1h->heap_region_containing(task_entry.obj())), "invariant");
-  assert(task_entry.is_array_slice() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.obj())), "invariant");
+  assert(task_entry.is_partial_array_state() || _g1h->is_in_reserved(task_entry.to_oop()), "invariant");
+  assert(task_entry.is_partial_array_state() || !_g1h->is_on_master_free_list(
+              _g1h->heap_region_containing(task_entry.to_oop())), "invariant");
+  assert(task_entry.is_partial_array_state() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.to_oop())), "invariant");
 
   if (!_task_queue->push(task_entry)) {
     // The local task queue looks full. We need to push some entries
@@ -159,39 +161,44 @@ inline bool G1CMTask::is_below_finger(oop obj, HeapWord* global_finger) const {
 }
 
 template<bool scan>
-inline void G1CMTask::process_grey_task_entry(G1TaskQueueEntry task_entry) {
-  assert(scan || (task_entry.is_oop() && task_entry.obj()->is_typeArray()), "Skipping scan of grey non-typeArray");
-  assert(task_entry.is_array_slice() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.obj())),
+inline void G1CMTask::process_grey_task_entry(G1TaskQueueEntry task_entry, bool stolen) {
+  assert(scan || (!task_entry.is_partial_array_state() && task_entry.to_oop()->is_typeArray()), "Skipping scan of grey non-typeArray");
+  assert(task_entry.is_partial_array_state() || _mark_bitmap->is_marked(cast_from_oop<HeapWord*>(task_entry.to_oop())),
          "Any stolen object should be a slice or marked");
 
   if (scan) {
-    if (task_entry.is_array_slice()) {
-      _words_scanned += _objArray_processor.process_slice(task_entry.slice());
+    if (task_entry.is_partial_array_state()) {
+      _words_scanned += process_partial_array(task_entry, stolen);
     } else {
-      oop obj = task_entry.obj();
-      if (G1CMObjArrayProcessor::should_be_sliced(obj)) {
-        _words_scanned += _objArray_processor.process_obj(obj);
+      oop obj = task_entry.to_oop();
+      if (should_be_sliced(obj)) {
+        _words_scanned += start_partial_array_processing(obj);
       } else {
-        _words_scanned += obj->oop_iterate_size(_cm_oop_closure);;
+        _words_scanned += obj->oop_iterate_size(_cm_oop_closure);
       }
     }
   }
   check_limits();
 }
 
-inline size_t G1CMTask::scan_objArray(objArrayOop obj, MemRegion mr) {
-  obj->oop_iterate(_cm_oop_closure, mr);
-  return mr.word_size();
+inline bool G1CMTask::should_be_sliced(oop obj) {
+  return obj->is_objArray() && ((objArrayOop)obj)->length() >= (int)ObjArrayMarkingStride;
+}
+
+inline void G1CMTask::process_array_chunk(objArrayOop obj, size_t start, size_t end) {
+  obj->oop_iterate_elements_range(_cm_oop_closure,
+                                  checked_cast<int>(start),
+                                  checked_cast<int>(end));
 }
 
 inline void G1ConcurrentMark::update_top_at_mark_start(G1HeapRegion* r) {
   uint const region = r->hrm_index();
   assert(region < _g1h->max_num_regions(), "Tried to access TAMS for region %u out of bounds", region);
-  _top_at_mark_starts[region] = r->top();
+  _top_at_mark_starts[region].store_relaxed(r->top());
 }
 
 inline void G1ConcurrentMark::reset_top_at_mark_start(G1HeapRegion* r) {
-  _top_at_mark_starts[r->hrm_index()] = r->bottom();
+  _top_at_mark_starts[r->hrm_index()].store_relaxed(r->bottom());
 }
 
 inline HeapWord* G1ConcurrentMark::top_at_mark_start(const G1HeapRegion* r) const {
@@ -200,7 +207,7 @@ inline HeapWord* G1ConcurrentMark::top_at_mark_start(const G1HeapRegion* r) cons
 
 inline HeapWord* G1ConcurrentMark::top_at_mark_start(uint region) const {
   assert(region < _g1h->max_num_regions(), "Tried to access TARS for region %u out of bounds", region);
-  return _top_at_mark_starts[region];
+  return _top_at_mark_starts[region].load_relaxed();
 }
 
 inline bool G1ConcurrentMark::obj_allocated_since_mark_start(oop obj) const {
@@ -210,7 +217,7 @@ inline bool G1ConcurrentMark::obj_allocated_since_mark_start(oop obj) const {
 }
 
 inline HeapWord* G1ConcurrentMark::top_at_rebuild_start(G1HeapRegion* r) const {
-  return _top_at_rebuild_starts[r->hrm_index()];
+  return _top_at_rebuild_starts[r->hrm_index()].load_relaxed();
 }
 
 inline void G1ConcurrentMark::update_top_at_rebuild_start(G1HeapRegion* r) {
@@ -218,10 +225,10 @@ inline void G1ConcurrentMark::update_top_at_rebuild_start(G1HeapRegion* r) {
 
   uint const region = r->hrm_index();
   assert(region < _g1h->max_num_regions(), "Tried to access TARS for region %u out of bounds", region);
-  assert(_top_at_rebuild_starts[region] == nullptr,
+  assert(top_at_rebuild_start(r) == nullptr,
          "TARS for region %u has already been set to " PTR_FORMAT " should be null",
-         region, p2i(_top_at_rebuild_starts[region]));
-  _top_at_rebuild_starts[region] = r->top();
+         region, p2i(top_at_rebuild_start(r)));
+  _top_at_rebuild_starts[region].store_relaxed(r->top());
 }
 
 inline void G1CMTask::update_liveness(oop const obj, const size_t obj_size) {
@@ -265,7 +272,7 @@ inline bool G1CMTask::make_reference_grey(oop obj) {
   // be pushed on the stack. So, some duplicate work, but no
   // correctness problems.
   if (is_below_finger(obj, global_finger)) {
-    G1TaskQueueEntry entry = G1TaskQueueEntry::from_oop(obj);
+    G1TaskQueueEntry entry(obj);
     if (obj->is_typeArray()) {
       // Immediately process arrays of primitive types, rather
       // than pushing on the mark stack.  This keeps us from
@@ -277,7 +284,7 @@ inline bool G1CMTask::make_reference_grey(oop obj) {
       // by only doing a bookkeeping update and avoiding the
       // actual scan of the object - a typeArray contains no
       // references, and the metadata is built-in.
-      process_grey_task_entry<false>(entry);
+      process_grey_task_entry<false>(entry, false /* stolen */);
     } else {
       push(entry);
     }
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
deleted file mode 100644
index 7f62e5527d5..00000000000
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1ConcurrentMark.inline.hpp"
-#include "gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp"
-#include "gc/g1/g1HeapRegion.inline.hpp"
-#include "gc/shared/gc_globals.hpp"
-#include "memory/memRegion.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-void G1CMObjArrayProcessor::push_array_slice(HeapWord* what) {
-  _task->push(G1TaskQueueEntry::from_slice(what));
-}
-
-size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
-  size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
-
-  if (remaining > ObjArrayMarkingStride) {
-    push_array_slice(start_from + ObjArrayMarkingStride);
-  }
-
-  // Then process current area.
-  MemRegion mr(start_from, words_to_scan);
-  return _task->scan_objArray(obj, mr);
-}
-
-size_t G1CMObjArrayProcessor::process_obj(oop obj) {
-  assert(should_be_sliced(obj), "Must be an array object %d and large %zu", obj->is_objArray(), obj->size());
-
-  return process_array_slice(objArrayOop(obj), cast_from_oop<HeapWord*>(obj), objArrayOop(obj)->size());
-}
-
-size_t G1CMObjArrayProcessor::process_slice(HeapWord* slice) {
-
-  // Find the start address of the objArrayOop.
-  // Shortcut the BOT access if the given address is from a humongous object. The BOT
-  // slide is fast enough for "smaller" objects in non-humongous regions, but is slower
-  // than directly using heap region table.
-  G1CollectedHeap* g1h = G1CollectedHeap::heap();
-  G1HeapRegion* r = g1h->heap_region_containing(slice);
-
-  HeapWord* const start_address = r->is_humongous() ?
-                                  r->humongous_start_region()->bottom() :
-                                  r->block_start(slice);
-
-  assert(cast_to_oop(start_address)->is_objArray(), "Address " PTR_FORMAT " does not refer to an object array ", p2i(start_address));
-  assert(start_address < slice,
-         "Object start address " PTR_FORMAT " must be smaller than decoded address " PTR_FORMAT,
-         p2i(start_address),
-         p2i(slice));
-
-  objArrayOop objArray = objArrayOop(cast_to_oop(start_address));
-
-  size_t already_scanned = pointer_delta(slice, start_address);
-  size_t remaining = objArray->size() - already_scanned;
-
-  return process_array_slice(objArray, slice, remaining);
-}
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp
deleted file mode 100644
index c2737dbbda6..00000000000
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
-#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
-
-#include "oops/oopsHierarchy.hpp"
-
-class G1CMTask;
-
-// Helper class to mark through large objArrays during marking in an efficient way.
-// Instead of pushing large object arrays, we push continuations onto the
-// mark stack. These continuations are identified by having their LSB set.
-// This allows incremental processing of large objects.
-class G1CMObjArrayProcessor {
-private:
-  // Reference to the task for doing the actual work.
-  G1CMTask* _task;
-
-  // Push the continuation at the given address onto the mark stack.
-  void push_array_slice(HeapWord* addr);
-
-  // Process (apply the closure) on the given continuation of the given objArray.
-  size_t process_array_slice(objArrayOop const obj, HeapWord* start_from, size_t remaining);
-public:
-  static bool should_be_sliced(oop obj);
-
-  G1CMObjArrayProcessor(G1CMTask* task) : _task(task) {
-  }
-
-  // Process the given continuation. Returns the number of words scanned.
-  size_t process_slice(HeapWord* slice);
-  // Start processing the given objArrayOop by scanning the header and pushing its
-  // continuation.
-  size_t process_obj(oop obj);
-};
-
-#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.cpp
index fdef4214622..4eb11f6d8f6 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1RemSetTrackingPolicy.hpp"
 #include "logging/log.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 
 struct G1UpdateRegionLivenessAndSelectForRebuildTask::G1OnRegionClosure : public G1HeapRegionClosure {
@@ -154,7 +153,7 @@ void G1UpdateRegionLivenessAndSelectForRebuildTask::work(uint worker_id) {
   G1OnRegionClosure on_region_cl(_g1h, _cm, &local_cleanup_list);
   _g1h->heap_region_par_iterate_from_worker_offset(&on_region_cl, &_hrclaimer, worker_id);
 
-  AtomicAccess::add(&_total_selected_for_rebuild, on_region_cl._num_selected_for_rebuild);
+  _total_selected_for_rebuild.add_then_fetch(on_region_cl._num_selected_for_rebuild);
 
   // Update the old/humongous region sets
   _g1h->remove_from_old_gen_sets(on_region_cl._num_old_regions_removed,
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.hpp
index 161f0b4b9f5..a256693ff1d 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkRemarkTasks.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "gc/g1/g1HeapRegionManager.hpp"
 #include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/shared/workerThread.hpp"
+#include "runtime/atomic.hpp"
 
 class G1CollectedHeap;
 class G1ConcurrentMark;
@@ -41,7 +42,7 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
   G1ConcurrentMark* _cm;
   G1HeapRegionClaimer _hrclaimer;
 
-  uint volatile _total_selected_for_rebuild;
+  Atomic<uint> _total_selected_for_rebuild;
 
   // Reclaimed empty regions
   G1FreeRegionList _cleanup_list;
@@ -57,7 +58,9 @@ public:
 
   void work(uint worker_id) override;
 
-  uint total_selected_for_rebuild() const { return _total_selected_for_rebuild; }
+  uint total_selected_for_rebuild() const {
+    return _total_selected_for_rebuild.load_relaxed();
+  }
 
   static uint desired_num_workers(uint num_regions);
 };
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
index ed6a9ad4292..8546e6e2d64 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
@@ -28,6 +28,7 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1CollectionSet.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
+#include "gc/g1/g1ConcurrentRefineStats.inline.hpp"
 #include "gc/g1/g1ConcurrentRefineSweepTask.hpp"
 #include "gc/g1/g1ConcurrentRefineThread.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.cpp
index 83a09c55a3f..7da0066e2f1 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,36 +22,31 @@
  *
  */
 
-#include "gc/g1/g1ConcurrentRefineStats.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "gc/g1/g1ConcurrentRefineStats.inline.hpp"
 #include "runtime/timer.hpp"
 
-G1ConcurrentRefineStats::G1ConcurrentRefineStats() :
-  _sweep_duration(0),
-  _yield_during_sweep_duration(0),
-  _cards_scanned(0),
-  _cards_clean(0),
-  _cards_not_parsable(0),
-  _cards_already_refer_to_cset(0),
-  _cards_refer_to_cset(0),
-  _cards_no_cross_region(0),
-  _refine_duration(0)
-{}
-
 void G1ConcurrentRefineStats::add_atomic(G1ConcurrentRefineStats* other) {
-  AtomicAccess::add(&_sweep_duration, other->_sweep_duration, memory_order_relaxed);
-  AtomicAccess::add(&_yield_during_sweep_duration, other->_yield_during_sweep_duration, memory_order_relaxed);
+  _sweep_duration.add_then_fetch(other->_sweep_duration.load_relaxed(), memory_order_relaxed);
+  _yield_during_sweep_duration.add_then_fetch(other->yield_during_sweep_duration(), memory_order_relaxed);
 
-  AtomicAccess::add(&_cards_scanned, other->_cards_scanned, memory_order_relaxed);
-  AtomicAccess::add(&_cards_clean, other->_cards_clean, memory_order_relaxed);
-  AtomicAccess::add(&_cards_not_parsable, other->_cards_not_parsable, memory_order_relaxed);
-  AtomicAccess::add(&_cards_already_refer_to_cset, other->_cards_already_refer_to_cset, memory_order_relaxed);
-  AtomicAccess::add(&_cards_refer_to_cset, other->_cards_refer_to_cset, memory_order_relaxed);
-  AtomicAccess::add(&_cards_no_cross_region, other->_cards_no_cross_region, memory_order_relaxed);
+  _cards_scanned.add_then_fetch(other->cards_scanned(), memory_order_relaxed);
+  _cards_clean.add_then_fetch(other->cards_clean(), memory_order_relaxed);
+  _cards_not_parsable.add_then_fetch(other->cards_not_parsable(), memory_order_relaxed);
+  _cards_already_refer_to_cset.add_then_fetch(other->cards_already_refer_to_cset(), memory_order_relaxed);
+  _cards_refer_to_cset.add_then_fetch(other->cards_refer_to_cset(), memory_order_relaxed);
+  _cards_no_cross_region.add_then_fetch(other->cards_no_cross_region(), memory_order_relaxed);
 
-  AtomicAccess::add(&_refine_duration, other->_refine_duration, memory_order_relaxed);
+  _refine_duration.add_then_fetch(other->refine_duration(), memory_order_relaxed);
 }
 
 void G1ConcurrentRefineStats::reset() {
-  *this = G1ConcurrentRefineStats();
+  _sweep_duration.store_relaxed(0);
+  _yield_during_sweep_duration.store_relaxed(0);
+  _cards_scanned.store_relaxed(0);
+  _cards_clean.store_relaxed(0);
+  _cards_not_parsable.store_relaxed(0);
+  _cards_already_refer_to_cset.store_relaxed(0);
+  _cards_refer_to_cset.store_relaxed(0);
+  _cards_no_cross_region.store_relaxed(0);
+  _refine_duration.store_relaxed(0);
 }
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.hpp
index ce22f4317df..a91ad0eb2e4 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,61 +26,59 @@
 #define SHARE_GC_G1_G1CONCURRENTREFINESTATS_HPP
 
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "utilities/ticks.hpp"
 
 // Collection of statistics for concurrent refinement processing.
 // Used for collecting per-thread statistics and for summaries over a
 // collection of threads.
 class G1ConcurrentRefineStats : public CHeapObj<mtGC> {
-  jlong _sweep_duration;              // Time spent sweeping the table finding non-clean cards
-                                      // and refining them.
-  jlong _yield_during_sweep_duration; // Time spent yielding during the sweep (not doing the sweep).
+  Atomic<jlong> _sweep_duration;              // Time spent sweeping the table finding non-clean cards
+                                              // and refining them.
+  Atomic<jlong> _yield_during_sweep_duration; // Time spent yielding during the sweep (not doing the sweep).
 
-  size_t _cards_scanned;              // Total number of cards scanned.
-  size_t _cards_clean;                // Number of cards found clean.
-  size_t _cards_not_parsable;         // Number of cards we could not parse and left unrefined.
-  size_t _cards_already_refer_to_cset;// Number of cards marked found to be already young.
-  size_t _cards_refer_to_cset;        // Number of dirty cards that were recently found to contain a to-cset reference.
-  size_t _cards_no_cross_region;      // Number of dirty cards that were dirtied, but then cleaned again by the mutator.
+  Atomic<size_t> _cards_scanned;              // Total number of cards scanned.
+  Atomic<size_t> _cards_clean;                // Number of cards found clean.
+  Atomic<size_t> _cards_not_parsable;         // Number of cards we could not parse and left unrefined.
+  Atomic<size_t> _cards_already_refer_to_cset;// Number of cards marked found to be already young.
+  Atomic<size_t> _cards_refer_to_cset;        // Number of dirty cards that were recently found to contain a to-cset reference.
+  Atomic<size_t> _cards_no_cross_region;      // Number of dirty cards that were dirtied, but then cleaned again by the mutator.
 
-  jlong _refine_duration;             // Time spent during actual refinement.
+  Atomic<jlong> _refine_duration;             // Time spent during actual refinement.
 
 public:
-  G1ConcurrentRefineStats();
-
   // Time spent performing sweeping the refinement table (includes actual refinement,
   // but not yield time).
-  jlong sweep_duration() const { return _sweep_duration - _yield_during_sweep_duration; }
-  jlong yield_during_sweep_duration() const { return _yield_during_sweep_duration; }
-  jlong refine_duration() const { return _refine_duration; }
+  inline jlong sweep_duration() const;
+  inline jlong yield_during_sweep_duration() const;
+  inline jlong refine_duration() const;
 
   // Number of refined cards.
-  size_t refined_cards() const { return cards_not_clean(); }
+  inline size_t refined_cards() const;
 
-  size_t cards_scanned() const { return _cards_scanned; }
-  size_t cards_clean() const { return _cards_clean; }
-  size_t cards_not_clean() const { return _cards_scanned - _cards_clean; }
-  size_t cards_not_parsable() const { return _cards_not_parsable; }
-  size_t cards_already_refer_to_cset() const { return _cards_already_refer_to_cset; }
-  size_t cards_refer_to_cset() const { return _cards_refer_to_cset; }
-  size_t cards_no_cross_region() const { return _cards_no_cross_region; }
+  inline size_t cards_scanned() const;
+  inline size_t cards_clean() const;
+  inline size_t cards_not_clean() const;
+  inline size_t cards_not_parsable() const;
+  inline size_t cards_already_refer_to_cset() const;
+  inline size_t cards_refer_to_cset() const;
+  inline size_t cards_no_cross_region() const;
   // Number of cards that were marked dirty and in need of refinement. This includes cards recently
   // found to refer to the collection set as they originally were dirty.
-  size_t cards_pending() const { return cards_not_clean() - _cards_already_refer_to_cset; }
+  inline size_t cards_pending() const;
 
-  size_t cards_to_cset() const { return _cards_already_refer_to_cset + _cards_refer_to_cset; }
+  inline size_t cards_to_cset() const;
 
-  void inc_sweep_time(jlong t) { _sweep_duration += t; }
-  void inc_yield_during_sweep_duration(jlong t) { _yield_during_sweep_duration += t; }
-  void inc_refine_duration(jlong t) { _refine_duration += t; }
+  inline void inc_sweep_time(jlong t);
+  inline void inc_yield_during_sweep_duration(jlong t);
+  inline void inc_refine_duration(jlong t);
 
-  void inc_cards_scanned(size_t increment) { _cards_scanned += increment; }
-  void inc_cards_clean(size_t increment) { _cards_clean += increment; }
-  void inc_cards_not_parsable() { _cards_not_parsable++; }
-  void inc_cards_already_refer_to_cset() { _cards_already_refer_to_cset++; }
-  void inc_cards_refer_to_cset() { _cards_refer_to_cset++; }
-  void inc_cards_no_cross_region() { _cards_no_cross_region++; }
+  inline void inc_cards_scanned(size_t increment);
+  inline void inc_cards_clean(size_t increment);
+  inline void inc_cards_not_parsable();
+  inline void inc_cards_already_refer_to_cset();
+  inline void inc_cards_refer_to_cset();
+  inline void inc_cards_no_cross_region();
 
   void add_atomic(G1ConcurrentRefineStats* other);
 
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.inline.hpp
new file mode 100644
index 00000000000..e1a296c6494
--- /dev/null
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineStats.inline.hpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_G1_G1CONCURRENTREFINESTATS_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTREFINESTATS_INLINE_HPP
+
+#include "gc/g1/g1ConcurrentRefineStats.hpp"
+
+inline jlong G1ConcurrentRefineStats::sweep_duration() const {
+  return _sweep_duration.load_relaxed() - yield_during_sweep_duration();
+}
+
+inline jlong G1ConcurrentRefineStats::yield_during_sweep_duration() const {
+  return _yield_during_sweep_duration.load_relaxed();
+}
+
+inline jlong G1ConcurrentRefineStats::refine_duration() const {
+  return _refine_duration.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::refined_cards() const {
+  return cards_not_clean();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_scanned() const {
+  return _cards_scanned.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_clean() const {
+  return _cards_clean.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_not_clean() const {
+  return cards_scanned() - cards_clean();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_not_parsable() const {
+  return _cards_not_parsable.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_already_refer_to_cset() const {
+  return _cards_already_refer_to_cset.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_refer_to_cset() const {
+  return _cards_refer_to_cset.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_no_cross_region() const {
+  return _cards_no_cross_region.load_relaxed();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_pending() const {
+  return cards_not_clean() - cards_already_refer_to_cset();
+}
+
+inline size_t G1ConcurrentRefineStats::cards_to_cset() const {
+  return cards_already_refer_to_cset() + cards_refer_to_cset();
+}
+
+inline void G1ConcurrentRefineStats::inc_sweep_time(jlong t) {
+  _sweep_duration.store_relaxed(_sweep_duration.load_relaxed() + t);
+}
+
+inline void G1ConcurrentRefineStats::inc_yield_during_sweep_duration(jlong t) {
+  _yield_during_sweep_duration.store_relaxed(yield_during_sweep_duration() + t);
+}
+
+inline void G1ConcurrentRefineStats::inc_refine_duration(jlong t) {
+  _refine_duration.store_relaxed(refine_duration() + t);
+}
+
+inline void G1ConcurrentRefineStats::inc_cards_scanned(size_t increment) {
+  _cards_scanned.store_relaxed(cards_scanned() + increment);
+}
+
+inline void G1ConcurrentRefineStats::inc_cards_clean(size_t increment) {
+  _cards_clean.store_relaxed(cards_clean() + increment);
+}
+
+inline void G1ConcurrentRefineStats::inc_cards_not_parsable() {
+  _cards_not_parsable.store_relaxed(cards_not_parsable() + 1);
+}
+
+inline void G1ConcurrentRefineStats::inc_cards_already_refer_to_cset() {
+  _cards_already_refer_to_cset.store_relaxed(cards_already_refer_to_cset() + 1);
+}
+
+inline void G1ConcurrentRefineStats::inc_cards_refer_to_cset() {
+  _cards_refer_to_cset.store_relaxed(cards_refer_to_cset() + 1);
+}
+
+inline void G1ConcurrentRefineStats::inc_cards_no_cross_region() {
+  _cards_no_cross_region.store_relaxed(cards_no_cross_region() + 1);
+}
+
+#endif // SHARE_GC_G1_G1CONCURRENTREFINESTATS_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.cpp
index ca5bc9ebe5f..ce944f2254d 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.cpp
@@ -24,6 +24,7 @@
 
 #include "gc/g1/g1CardTableClaimTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
+#include "gc/g1/g1ConcurrentRefineStats.inline.hpp"
 #include "gc/g1/g1ConcurrentRefineSweepTask.hpp"
 
 class G1RefineRegionClosure : public G1HeapRegionClosure {
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.hpp
index bf24c5ae850..827b9a3c402 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineSweepTask.hpp
@@ -25,10 +25,10 @@
 #ifndef SHARE_GC_G1_G1CONCURRENTREFINESWEEPTASK_HPP
 #define SHARE_GC_G1_G1CONCURRENTREFINESWEEPTASK_HPP
 
-#include "gc/g1/g1ConcurrentRefineStats.hpp"
 #include "gc/shared/workerThread.hpp"
 
 class G1CardTableClaimTable;
+class G1ConcurrentRefineStats;
 
 class G1ConcurrentRefineSweepTask : public WorkerTask {
   G1CardTableClaimTable* _scan_state;
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp
index eccfe466d48..6b51e5eef62 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.cpp
@@ -26,7 +26,7 @@
 #include "gc/g1/g1CardTableClaimTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
-#include "gc/g1/g1ConcurrentRefineStats.hpp"
+#include "gc/g1/g1ConcurrentRefineStats.inline.hpp"
 #include "gc/g1/g1ConcurrentRefineSweepTask.hpp"
 #include "gc/g1/g1ConcurrentRefineThread.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
index 7cdc001d348..2ecbdc668eb 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
@@ -25,7 +25,6 @@
 #ifndef SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
 #define SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
 
-#include "gc/g1/g1ConcurrentRefineStats.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
 #include "runtime/mutex.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp
index ffcb5a0022f..37553e2aa56 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +29,6 @@
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 G1EvacFailureRegions::G1EvacFailureRegions() :
@@ -43,7 +43,7 @@ G1EvacFailureRegions::~G1EvacFailureRegions() {
 }
 
 void G1EvacFailureRegions::pre_collection(uint max_regions) {
-  AtomicAccess::store(&_num_regions_evac_failed, 0u);
+  _num_regions_evac_failed.store_relaxed(0u);
   _regions_evac_failed.resize(max_regions);
   _regions_pinned.resize(max_regions);
   _regions_alloc_failed.resize(max_regions);
@@ -69,6 +69,6 @@ void G1EvacFailureRegions::par_iterate(G1HeapRegionClosure* closure,
   G1CollectedHeap::heap()->par_iterate_regions_array(closure,
                                                      hrclaimer,
                                                      _evac_failed_regions,
-                                                     AtomicAccess::load(&_num_regions_evac_failed),
+                                                     num_regions_evac_failed(),
                                                      worker_id);
 }
diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp
index 9d29957b782..f752a3f8ab7 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +26,7 @@
 #ifndef SHARE_GC_G1_G1EVACFAILUREREGIONS_HPP
 #define SHARE_GC_G1_G1EVACFAILUREREGIONS_HPP
 
+#include "runtime/atomic.hpp"
 #include "utilities/bitMap.hpp"
 
 class G1AbstractSubTask;
@@ -53,14 +55,14 @@ class G1EvacFailureRegions {
   // Evacuation failed regions (indexes) in the current collection.
   uint* _evac_failed_regions;
   // Number of regions evacuation failed in the current collection.
-  volatile uint _num_regions_evac_failed;
+  Atomic<uint> _num_regions_evac_failed;
 
 public:
   G1EvacFailureRegions();
   ~G1EvacFailureRegions();
 
   uint get_region_idx(uint idx) const {
-    assert(idx < _num_regions_evac_failed, "precondition");
+    assert(idx < _num_regions_evac_failed.load_relaxed(), "precondition");
     return _evac_failed_regions[idx];
   }
 
diff --git a/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp b/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
index 6eec9b63e6b..fb456475b56 100644
--- a/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacFailureRegions.inline.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +30,9 @@
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
-#include "runtime/atomicAccess.hpp"
 
 uint G1EvacFailureRegions::num_regions_evac_failed() const {
-  return AtomicAccess::load(&_num_regions_evac_failed);
+  return _num_regions_evac_failed.load_relaxed();
 }
 
 bool G1EvacFailureRegions::has_regions_evac_failed() const {
@@ -57,7 +57,7 @@ bool G1EvacFailureRegions::record(uint worker_id, uint region_idx, bool cause_pi
   bool success = _regions_evac_failed.par_set_bit(region_idx,
                                                   memory_order_relaxed);
   if (success) {
-    size_t offset = AtomicAccess::fetch_then_add(&_num_regions_evac_failed, 1u);
+    size_t offset = _num_regions_evac_failed.fetch_then_add(1u);
     _evac_failed_regions[offset] = region_idx;
 
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.cpp b/src/hotspot/share/gc/g1/g1EvacStats.cpp
index 049175a4ecc..d93f63383c4 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.cpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,13 +22,24 @@
  *
  */
 
-#include "gc/g1/g1EvacStats.hpp"
+#include "gc/g1/g1EvacStats.inline.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shared/gcId.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/globals.hpp"
 
+void G1EvacStats::reset() {
+  PLABStats::reset();
+  _region_end_waste.store_relaxed(0);
+  _regions_filled.store_relaxed(0);
+  _num_plab_filled.store_relaxed(0);
+  _direct_allocated.store_relaxed(0);
+  _num_direct_allocated.store_relaxed(0);
+  _failure_used.store_relaxed(0);
+  _failure_waste.store_relaxed(0);
+}
+
 void G1EvacStats::log_plab_allocation() {
   log_debug(gc, plab)("%s PLAB allocation: "
                       "allocated: %zuB, "
@@ -37,11 +48,11 @@ void G1EvacStats::log_plab_allocation() {
                       "used: %zuB, "
                       "undo waste: %zuB, ",
                       _description,
-                      _allocated * HeapWordSize,
-                      _wasted * HeapWordSize,
-                      _unused * HeapWordSize,
+                      allocated() * HeapWordSize,
+                      wasted() * HeapWordSize,
+                      unused() * HeapWordSize,
                       used() * HeapWordSize,
-                      _undo_wasted * HeapWordSize);
+                      undo_wasted() * HeapWordSize);
   log_debug(gc, plab)("%s other allocation: "
                       "region end waste: %zuB, "
                       "regions filled: %u, "
@@ -51,13 +62,13 @@ void G1EvacStats::log_plab_allocation() {
                       "failure used: %zuB, "
                       "failure wasted: %zuB",
                       _description,
-                      _region_end_waste * HeapWordSize,
-                      _regions_filled,
-                      _num_plab_filled,
-                      _direct_allocated * HeapWordSize,
-                      _num_direct_allocated,
-                      _failure_used * HeapWordSize,
-                      _failure_waste * HeapWordSize);
+                      region_end_waste() * HeapWordSize,
+                      regions_filled(),
+                      num_plab_filled(),
+                      direct_allocated() * HeapWordSize,
+                      num_direct_allocated(),
+                      failure_used() * HeapWordSize,
+                      failure_waste() * HeapWordSize);
 }
 
 void G1EvacStats::log_sizing(size_t calculated_words, size_t net_desired_words) {
@@ -109,7 +120,7 @@ size_t G1EvacStats::compute_desired_plab_size() const {
   // threads do not allocate anything but a few rather large objects. In this
   // degenerate case the PLAB size would simply quickly tend to minimum PLAB size,
   // which is an okay reaction.
-  size_t const used_for_waste_calculation = used() > _region_end_waste ? used() - _region_end_waste : 0;
+  size_t const used_for_waste_calculation = used() > region_end_waste() ? used() - region_end_waste() : 0;
 
   size_t const total_waste_allowed = used_for_waste_calculation * TargetPLABWastePct;
   return (size_t)((double)total_waste_allowed / (100 - G1LastPLABAverageOccupancy));
@@ -146,13 +157,13 @@ void G1EvacStats::adjust_desired_plab_size() {
     assert(is_object_aligned(max_size()) && min_size() <= max_size(),
            "PLAB clipping computation may be incorrect");
 
-    assert(_allocated != 0 || _unused == 0,
+    assert(allocated() != 0 || unused() == 0,
            "Inconsistency in PLAB stats: "
            "_allocated: %zu, "
            "_wasted: %zu, "
            "_unused: %zu, "
            "_undo_wasted: %zu",
-           _allocated, _wasted, _unused, _undo_wasted);
+           allocated(), wasted(), unused(), undo_wasted());
 
     size_t plab_size = compute_desired_plab_size();
     // Take historical weighted average
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.hpp b/src/hotspot/share/gc/g1/g1EvacStats.hpp
index e6eb80442d6..b250d4580b5 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "gc/shared/gcUtil.hpp"
 #include "gc/shared/plab.hpp"
+#include "runtime/atomic.hpp"
 
 // Records various memory allocation statistics gathered during evacuation. All sizes
 // are in HeapWords.
@@ -36,30 +37,21 @@ class G1EvacStats : public PLABStats {
   AdaptiveWeightedAverage
          _net_plab_size_filter;  // Integrator with decay
 
-  size_t _region_end_waste; // Number of words wasted due to skipping to the next region.
-  uint   _regions_filled;   // Number of regions filled completely.
-  size_t _num_plab_filled; // Number of PLABs filled and retired.
-  size_t _direct_allocated; // Number of words allocated directly into the regions.
-  size_t _num_direct_allocated; // Number of direct allocation attempts.
+  Atomic<size_t> _region_end_waste; // Number of words wasted due to skipping to the next region.
+  Atomic<uint>   _regions_filled;   // Number of regions filled completely.
+  Atomic<size_t> _num_plab_filled; // Number of PLABs filled and retired.
+  Atomic<size_t> _direct_allocated; // Number of words allocated directly into the regions.
+  Atomic<size_t> _num_direct_allocated; // Number of direct allocation attempts.
 
   // Number of words in live objects remaining in regions that ultimately suffered an
   // evacuation failure. This is used in the regions when the regions are made old regions.
-  size_t _failure_used;
+  Atomic<size_t> _failure_used;
   // Number of words wasted in regions which failed evacuation. This is the sum of space
   // for objects successfully copied out of the regions (now dead space) plus waste at the
   // end of regions.
-  size_t _failure_waste;
+  Atomic<size_t> _failure_waste;
 
-  virtual void reset() {
-    PLABStats::reset();
-    _region_end_waste = 0;
-    _regions_filled = 0;
-    _num_plab_filled = 0;
-    _direct_allocated = 0;
-    _num_direct_allocated = 0;
-    _failure_used = 0;
-    _failure_waste = 0;
-  }
+  virtual void reset();
 
   void log_plab_allocation();
   void log_sizing(size_t calculated_words, size_t net_desired_words);
@@ -77,16 +69,16 @@ public:
   // Should be called at the end of a GC pause.
   void adjust_desired_plab_size();
 
-  uint regions_filled() const { return _regions_filled; }
-  size_t num_plab_filled() const { return _num_plab_filled; }
-  size_t region_end_waste() const { return _region_end_waste; }
-  size_t direct_allocated() const { return _direct_allocated; }
-  size_t num_direct_allocated() const { return _num_direct_allocated; }
+  uint regions_filled() const;
+  size_t num_plab_filled() const;
+  size_t region_end_waste() const;
+  size_t direct_allocated() const;
+  size_t num_direct_allocated() const;
 
   // Amount of space in heapwords used in the failing regions when an evacuation failure happens.
-  size_t failure_used() const { return _failure_used; }
+  size_t failure_used() const;
   // Amount of space in heapwords wasted (unused) in the failing regions when an evacuation failure happens.
-  size_t failure_waste() const { return _failure_waste; }
+  size_t failure_waste() const;
 
   inline void add_num_plab_filled(size_t value);
   inline void add_direct_allocated(size_t value);
diff --git a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
index c90598a30cb..2bd3b37719a 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,28 +27,54 @@
 
 #include "gc/g1/g1EvacStats.hpp"
 
-#include "runtime/atomicAccess.hpp"
+inline uint G1EvacStats::regions_filled() const {
+  return _regions_filled.load_relaxed();
+}
+
+inline size_t G1EvacStats::num_plab_filled() const {
+  return _num_plab_filled.load_relaxed();
+}
+
+inline size_t G1EvacStats::region_end_waste() const {
+  return _region_end_waste.load_relaxed();
+}
+
+inline size_t G1EvacStats::direct_allocated() const {
+  return _direct_allocated.load_relaxed();
+}
+
+inline size_t G1EvacStats::num_direct_allocated() const {
+  return _num_direct_allocated.load_relaxed();
+}
+
+inline size_t G1EvacStats::failure_used() const {
+  return _failure_used.load_relaxed();
+}
+
+inline size_t G1EvacStats::failure_waste() const {
+  return _failure_waste.load_relaxed();
+}
 
 inline void G1EvacStats::add_direct_allocated(size_t value) {
-  AtomicAccess::add(&_direct_allocated, value, memory_order_relaxed);
+  _direct_allocated.add_then_fetch(value, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_num_plab_filled(size_t value) {
-  AtomicAccess::add(&_num_plab_filled, value, memory_order_relaxed);
+  _num_plab_filled.add_then_fetch(value, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_num_direct_allocated(size_t value) {
-  AtomicAccess::add(&_num_direct_allocated, value, memory_order_relaxed);
+  _num_direct_allocated.add_then_fetch(value, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_region_end_waste(size_t value) {
-  AtomicAccess::add(&_region_end_waste, value, memory_order_relaxed);
-  AtomicAccess::inc(&_regions_filled, memory_order_relaxed);
+  _region_end_waste.add_then_fetch(value, memory_order_relaxed);
+  _regions_filled.add_then_fetch(1u, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_failure_used_and_waste(size_t used, size_t waste) {
-  AtomicAccess::add(&_failure_used, used, memory_order_relaxed);
-  AtomicAccess::add(&_failure_waste, waste, memory_order_relaxed);
+  _failure_used.add_then_fetch(used, memory_order_relaxed);
+  _failure_waste.add_then_fetch(waste, memory_order_relaxed);
 }
 
 #endif // SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
index 5ca5dcef001..e8498250f85 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "classfile/classLoaderDataGraph.hpp"
+#include "cppstdlib/new.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1FullCollector.inline.hpp"
 #include "gc/g1/g1FullGCAdjustTask.hpp"
@@ -110,14 +111,14 @@ uint G1FullCollector::calc_active_workers() {
 G1FullCollector::G1FullCollector(G1CollectedHeap* heap,
                                  bool clear_soft_refs,
                                  bool do_maximal_compaction,
-                                 G1FullGCTracer* tracer) :
+                                 GCTracer* tracer) :
     _heap(heap),
     _scope(heap->monitoring_support(), clear_soft_refs, do_maximal_compaction, tracer),
     _num_workers(calc_active_workers()),
     _has_compaction_targets(false),
     _has_humongous(false),
-    _oop_queue_set(_num_workers),
-    _array_queue_set(_num_workers),
+    _marking_task_queues(_num_workers),
+    _partial_array_state_manager(nullptr),
     _preserved_marks_set(true),
     _serial_compaction_point(this, nullptr),
     _humongous_compaction_point(this, nullptr),
@@ -134,32 +135,41 @@ G1FullCollector::G1FullCollector(G1CollectedHeap* heap,
   _compaction_points = NEW_C_HEAP_ARRAY(G1FullGCCompactionPoint*, _num_workers, mtGC);
 
   _live_stats = NEW_C_HEAP_ARRAY(G1RegionMarkStats, _heap->max_num_regions(), mtGC);
-  _compaction_tops = NEW_C_HEAP_ARRAY(HeapWord*, _heap->max_num_regions(), mtGC);
   for (uint j = 0; j < heap->max_num_regions(); j++) {
     _live_stats[j].clear();
-    _compaction_tops[j] = nullptr;
   }
 
+  _compaction_tops = NEW_C_HEAP_ARRAY(Atomic<HeapWord*>, _heap->max_num_regions(), mtGC);
+  ::new (_compaction_tops) Atomic<HeapWord*>[heap->max_num_regions()]{};
+
+  _partial_array_state_manager = new PartialArrayStateManager(_num_workers);
+
   for (uint i = 0; i < _num_workers; i++) {
     _markers[i] = new G1FullGCMarker(this, i, _live_stats);
     _compaction_points[i] = new G1FullGCCompactionPoint(this, _preserved_marks_set.get(i));
-    _oop_queue_set.register_queue(i, marker(i)->oop_stack());
-    _array_queue_set.register_queue(i, marker(i)->objarray_stack());
+    _marking_task_queues.register_queue(i, marker(i)->task_queue());
   }
+
   _serial_compaction_point.set_preserved_stack(_preserved_marks_set.get(0));
   _humongous_compaction_point.set_preserved_stack(_preserved_marks_set.get(0));
   _region_attr_table.initialize(heap->reserved(), G1HeapRegion::GrainBytes);
 }
 
+PartialArrayStateManager* G1FullCollector::partial_array_state_manager() const {
+  return _partial_array_state_manager;
+}
+
 G1FullCollector::~G1FullCollector() {
   for (uint i = 0; i < _num_workers; i++) {
     delete _markers[i];
     delete _compaction_points[i];
   }
 
+  delete _partial_array_state_manager;
+
   FREE_C_HEAP_ARRAY(G1FullGCMarker*, _markers);
   FREE_C_HEAP_ARRAY(G1FullGCCompactionPoint*, _compaction_points);
-  FREE_C_HEAP_ARRAY(HeapWord*, _compaction_tops);
+  FREE_C_HEAP_ARRAY(Atomic<HeapWord*>, _compaction_tops);
   FREE_C_HEAP_ARRAY(G1RegionMarkStats, _live_stats);
 }
 
@@ -268,6 +278,21 @@ void G1FullCollector::before_marking_update_attribute_table(G1HeapRegion* hr) {
 class G1FullGCRefProcProxyTask : public RefProcProxyTask {
   G1FullCollector& _collector;
 
+  // G1 Full GC specific closure for handling discovered fields. Do NOT need any
+  // barriers as Full GC discards all this information anyway.
+  class G1FullGCDiscoveredFieldClosure : public EnqueueDiscoveredFieldClosure {
+    G1CollectedHeap* _g1h;
+
+  public:
+    G1FullGCDiscoveredFieldClosure() : _g1h(G1CollectedHeap::heap()) { }
+
+    void enqueue(HeapWord* discovered_field_addr, oop value) override {
+      assert(_g1h->is_in(discovered_field_addr), PTR_FORMAT " is not in heap ", p2i(discovered_field_addr));
+      // Store the value and done.
+      RawAccess<>::oop_store(discovered_field_addr, value);
+    }
+  };
+
 public:
   G1FullGCRefProcProxyTask(G1FullCollector &collector, uint max_workers)
     : RefProcProxyTask("G1FullGCRefProcProxyTask", max_workers),
@@ -278,9 +303,9 @@ public:
     G1IsAliveClosure is_alive(&_collector);
     uint index = (_tm == RefProcThreadModel::Single) ? 0 : worker_id;
     G1FullKeepAliveClosure keep_alive(_collector.marker(index));
-    BarrierEnqueueDiscoveredFieldClosure enqueue;
-    G1FollowStackClosure* complete_gc = _collector.marker(index)->stack_closure();
-    _rp_task->rp_work(worker_id, &is_alive, &keep_alive, &enqueue, complete_gc);
+    G1FullGCDiscoveredFieldClosure enqueue;
+    G1MarkStackClosure* complete_marking = _collector.marker(index)->stack_closure();
+    _rp_task->rp_work(worker_id, &is_alive, &keep_alive, &enqueue, complete_marking);
   }
 };
 
@@ -302,7 +327,7 @@ void G1FullCollector::phase1_mark_live_objects() {
     const ReferenceProcessorStats& stats = reference_processor()->process_discovered_references(task, _heap->workers(), pt);
     scope()->tracer()->report_gc_reference_stats(stats);
     pt.print_all_references();
-    assert(marker(0)->oop_stack()->is_empty(), "Should be no oops on the stack");
+    assert(marker(0)->task_queue()->is_empty(), "Should be no oops on the stack");
   }
 
   {
@@ -328,8 +353,7 @@ void G1FullCollector::phase1_mark_live_objects() {
     scope()->tracer()->report_object_count_after_gc(&_is_alive, _heap->workers());
   }
 #if TASKQUEUE_STATS
-  oop_queue_set()->print_and_reset_taskqueue_stats("Oop Queue");
-  array_queue_set()->print_and_reset_taskqueue_stats("ObjArrayOop Queue");
+  marking_task_queues()->print_and_reset_taskqueue_stats("Marking Task Queue");
 #endif
 }
 
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.hpp b/src/hotspot/share/gc/g1/g1FullCollector.hpp
index ed8225fc004..605556a2ba6 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,18 +58,6 @@ public:
   }
 };
 
-// Full GC Mark that holds GC id and CPU time trace. Needs to be separate
-// from the G1FullCollector and G1FullGCScope to allow the Full GC logging
-// to have the same structure as the Young GC logging.
-class G1FullGCMark : StackObj {
-  GCIdMark       _gc_id;
-  G1FullGCTracer _tracer;
-  GCTraceCPUTime _cpu_time;
-public:
-  G1FullGCMark() : _gc_id(), _tracer(), _cpu_time(&_tracer) { }
-  G1FullGCTracer* tracer() { return &_tracer; }
-};
-
 // The G1FullCollector holds data associated with the current Full GC.
 class G1FullCollector : StackObj {
   G1CollectedHeap*          _heap;
@@ -79,8 +67,8 @@ class G1FullCollector : StackObj {
   bool                      _has_humongous;
   G1FullGCMarker**          _markers;
   G1FullGCCompactionPoint** _compaction_points;
-  OopQueueSet               _oop_queue_set;
-  ObjArrayTaskQueueSet      _array_queue_set;
+  G1MarkTasksQueueSet       _marking_task_queues;
+  PartialArrayStateManager* _partial_array_state_manager;
   PreservedMarksSet         _preserved_marks_set;
   G1FullGCCompactionPoint   _serial_compaction_point;
   G1FullGCCompactionPoint   _humongous_compaction_point;
@@ -96,13 +84,13 @@ class G1FullCollector : StackObj {
 
   G1FullGCHeapRegionAttr _region_attr_table;
 
-  HeapWord* volatile* _compaction_tops;
+  Atomic<HeapWord*>* _compaction_tops;
 
 public:
   G1FullCollector(G1CollectedHeap* heap,
                   bool clear_soft_refs,
                   bool do_maximal_compaction,
-                  G1FullGCTracer* tracer);
+                  GCTracer* tracer);
   ~G1FullCollector();
 
   void prepare_collection();
@@ -113,8 +101,7 @@ public:
   uint                     workers() { return _num_workers; }
   G1FullGCMarker*          marker(uint id) { return _markers[id]; }
   G1FullGCCompactionPoint* compaction_point(uint id) { return _compaction_points[id]; }
-  OopQueueSet*             oop_queue_set() { return &_oop_queue_set; }
-  ObjArrayTaskQueueSet*    array_queue_set() { return &_array_queue_set; }
+  G1MarkTasksQueueSet*     marking_task_queues() { return &_marking_task_queues; }
   PreservedMarksSet*       preserved_mark_set() { return &_preserved_marks_set; }
   G1FullGCCompactionPoint* serial_compaction_point() { return &_serial_compaction_point; }
   G1FullGCCompactionPoint* humongous_compaction_point() { return &_humongous_compaction_point; }
@@ -122,9 +109,11 @@ public:
   ReferenceProcessor*      reference_processor();
   size_t live_words(uint region_index) const {
     assert(region_index < _heap->max_num_regions(), "sanity");
-    return _live_stats[region_index]._live_words;
+    return _live_stats[region_index].live_words();
   }
 
+  PartialArrayStateManager* partial_array_state_manager() const;
+
   void before_marking_update_attribute_table(G1HeapRegion* hr);
 
   inline bool is_compacting(oop obj) const;
diff --git a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp
index b52f3d79604..ef6344d349d 100644
--- a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "gc/g1/g1FullGCHeapRegionAttr.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
-#include "runtime/atomicAccess.hpp"
 
 bool G1FullCollector::is_compacting(oop obj) const {
   return _region_attr_table.is_compacting(cast_from_oop<HeapWord *>(obj));
@@ -63,11 +62,11 @@ void G1FullCollector::update_from_skip_compacting_to_compacting(uint region_idx)
 }
 
 void G1FullCollector::set_compaction_top(G1HeapRegion* r, HeapWord* value) {
-  AtomicAccess::store(&_compaction_tops[r->hrm_index()], value);
+  _compaction_tops[r->hrm_index()].store_relaxed(value);
 }
 
 HeapWord* G1FullCollector::compaction_top(G1HeapRegion* r) const {
-  return AtomicAccess::load(&_compaction_tops[r->hrm_index()]);
+  return _compaction_tops[r->hrm_index()].load_relaxed();
 }
 
 void G1FullCollector::set_has_compaction_targets() {
diff --git a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp
index 83c846e84d4..c02b028112b 100644
--- a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@
 #include "gc/shared/weakProcessor.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 
 class G1AdjustLiveClosure : public StackObj {
   G1AdjustClosure* _adjust_closure;
diff --git a/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp b/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp
index 52b0d04a500..f14e1108db8 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarkTask.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 G1FullGCMarkTask::G1FullGCMarkTask(G1FullCollector* collector) :
     G1FullGCTask("G1 Parallel Marking Task", collector),
     _root_processor(G1CollectedHeap::heap(), collector->workers()),
-    _terminator(collector->workers(), collector->array_queue_set()) {
+    _terminator(collector->workers(), collector->marking_task_queues()) {
 }
 
 void G1FullGCMarkTask::work(uint worker_id) {
@@ -54,10 +54,9 @@ void G1FullGCMarkTask::work(uint worker_id) {
   }
 
   // Mark stack is populated, now process and drain it.
-  marker->complete_marking(collector()->oop_queue_set(), collector()->array_queue_set(), &_terminator);
+  marker->complete_marking(collector()->marking_task_queues(), &_terminator);
 
   // This is the point where the entire marking should have completed.
-  assert(marker->oop_stack()->is_empty(), "Marking should have completed");
-  assert(marker->objarray_stack()->is_empty(), "Array marking should have completed");
+  assert(marker->task_queue()->is_empty(), "Marking should have completed");
   log_task("Marking task", worker_id, start);
 }
diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
index aa8f12a2d1b..2b0b78ac1ce 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 #include "classfile/classLoaderData.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "gc/g1/g1FullGCMarker.inline.hpp"
+#include "gc/shared/partialArraySplitter.inline.hpp"
+#include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/verifyOption.hpp"
@@ -36,8 +38,8 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector,
     _collector(collector),
     _worker_id(worker_id),
     _bitmap(collector->mark_bitmap()),
-    _oop_stack(),
-    _objarray_stack(),
+    _task_queue(),
+    _partial_array_splitter(collector->partial_array_state_manager(), collector->workers(), ObjArrayMarkingStride),
     _mark_closure(worker_id, this, ClassLoaderData::_claim_stw_fullgc_mark, G1CollectedHeap::heap()->ref_processor_stw()),
     _stack_closure(this),
     _cld_closure(mark_closure(), ClassLoaderData::_claim_stw_fullgc_mark),
@@ -47,24 +49,36 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector,
 }
 
 G1FullGCMarker::~G1FullGCMarker() {
-  assert(is_empty(), "Must be empty at this point");
+  assert(is_task_queue_empty(), "Must be empty at this point");
 }
 
-void G1FullGCMarker::complete_marking(OopQueueSet* oop_stacks,
-                                      ObjArrayTaskQueueSet* array_stacks,
+void G1FullGCMarker::process_partial_array(PartialArrayState* state, bool stolen) {
+  // Access state before release by claim().
+  objArrayOop obj_array = objArrayOop(state->source());
+  PartialArraySplitter::Claim claim =
+    _partial_array_splitter.claim(state, task_queue(), stolen);
+  process_array_chunk(obj_array, claim._start, claim._end);
+}
+
+void G1FullGCMarker::start_partial_array_processing(objArrayOop obj) {
+  mark_closure()->do_klass(obj->klass());
+  // Don't push empty arrays to avoid unnecessary work.
+  size_t array_length = obj->length();
+  if (array_length > 0) {
+    size_t initial_chunk_size = _partial_array_splitter.start(task_queue(), obj, nullptr, array_length);
+    process_array_chunk(obj, 0, initial_chunk_size);
+  }
+}
+
+void G1FullGCMarker::complete_marking(G1ScannerTasksQueueSet* task_queues,
                                       TaskTerminator* terminator) {
   do {
-    follow_marking_stacks();
-    ObjArrayTask steal_array;
-    if (array_stacks->steal(_worker_id, steal_array)) {
-      follow_array_chunk(objArrayOop(steal_array.obj()), steal_array.index());
-    } else {
-      oop steal_oop;
-      if (oop_stacks->steal(_worker_id, steal_oop)) {
-        follow_object(steal_oop);
-      }
+    process_marking_stacks();
+    ScannerTask stolen_task;
+    if (task_queues->steal(_worker_id, stolen_task)) {
+      dispatch_task(stolen_task, true);
     }
-  } while (!is_empty() || !terminator->offer_termination());
+  } while (!is_task_queue_empty() || !terminator->offer_termination());
 }
 
 void G1FullGCMarker::flush_mark_stats_cache() {
diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp
index b1b750eae90..5973cc841c5 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
 #include "gc/g1/g1FullGCOopClosures.hpp"
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
+#include "gc/shared/partialArraySplitter.hpp"
+#include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "memory/iterator.hpp"
@@ -38,16 +40,15 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/stack.hpp"
 
-typedef OverflowTaskQueue<oop, mtGC>                 OopQueue;
-typedef OverflowTaskQueue<ObjArrayTask, mtGC>        ObjArrayTaskQueue;
 
-typedef GenericTaskQueueSet<OopQueue, mtGC>          OopQueueSet;
-typedef GenericTaskQueueSet<ObjArrayTaskQueue, mtGC> ObjArrayTaskQueueSet;
 
 class G1CMBitMap;
 class G1FullCollector;
 class TaskTerminator;
 
+typedef OverflowTaskQueue<ScannerTask, mtGC>        G1MarkTasksQueue;
+typedef GenericTaskQueueSet<G1MarkTasksQueue, mtGC> G1MarkTasksQueueSet;
+
 class G1FullGCMarker : public CHeapObj<mtGC> {
   G1FullCollector*   _collector;
 
@@ -56,56 +57,50 @@ class G1FullGCMarker : public CHeapObj<mtGC> {
   G1CMBitMap*        _bitmap;
 
   // Mark stack
-  OopQueue           _oop_stack;
-  ObjArrayTaskQueue  _objarray_stack;
+  G1MarkTasksQueue     _task_queue;
+  PartialArraySplitter _partial_array_splitter;
 
   // Marking closures
   G1MarkAndPushClosure  _mark_closure;
-  G1FollowStackClosure  _stack_closure;
+  G1MarkStackClosure    _stack_closure;
   CLDToOopClosure       _cld_closure;
   StringDedup::Requests _string_dedup_requests;
 
 
   G1RegionMarkStatsCache _mark_stats_cache;
 
-  inline bool is_empty();
-  inline void push_objarray(oop obj, size_t index);
+  inline bool is_task_queue_empty();
   inline bool mark_object(oop obj);
 
   // Marking helpers
-  inline void follow_object(oop obj);
-  inline void follow_array(objArrayOop array);
-  inline void follow_array_chunk(objArrayOop array, int index);
+  inline void process_array_chunk(objArrayOop obj, size_t start, size_t end);
+  inline void dispatch_task(const ScannerTask& task, bool stolen);
+  // Start processing the given objArrayOop by first pushing its continuations and
+  // then scanning the first chunk.
+  void start_partial_array_processing(objArrayOop obj);
+  // Process the given continuation.
+  void process_partial_array(PartialArrayState* state, bool stolen);
 
   inline void publish_and_drain_oop_tasks();
-  // Try to publish all contents from the objArray task queue overflow stack to
-  // the shared objArray stack.
-  // Returns true and a valid task if there has not been enough space in the shared
-  // objArray stack, otherwise returns false and the task is invalid.
-  inline bool publish_or_pop_objarray_tasks(ObjArrayTask& task);
-
 public:
   G1FullGCMarker(G1FullCollector* collector,
                  uint worker_id,
                  G1RegionMarkStats* mark_stats);
   ~G1FullGCMarker();
 
-  // Stack getters
-  OopQueue*          oop_stack()       { return &_oop_stack; }
-  ObjArrayTaskQueue* objarray_stack()  { return &_objarray_stack; }
+  G1MarkTasksQueue* task_queue() { return &_task_queue; }
 
   // Marking entry points
   template <class T> inline void mark_and_push(T* p);
 
-  inline void follow_marking_stacks();
-  void complete_marking(OopQueueSet* oop_stacks,
-                        ObjArrayTaskQueueSet* array_stacks,
+  inline void process_marking_stacks();
+  void complete_marking(G1MarkTasksQueueSet* task_queues,
                         TaskTerminator* terminator);
 
   // Closure getters
   CLDToOopClosure*      cld_closure()   { return &_cld_closure; }
   G1MarkAndPushClosure* mark_closure()  { return &_mark_closure; }
-  G1FollowStackClosure* stack_closure() { return &_stack_closure; }
+  G1MarkStackClosure*   stack_closure() { return &_stack_closure; }
 
   // Flush live bytes to regions
   void flush_mark_stats_cache();
diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
index 6cbfe2674e8..a6f45abe005 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 
 inline bool G1FullGCMarker::mark_object(oop obj) {
@@ -71,94 +72,55 @@ template <class T> inline void G1FullGCMarker::mark_and_push(T* p) {
   if (!CompressedOops::is_null(heap_oop)) {
     oop obj = CompressedOops::decode_not_null(heap_oop);
     if (mark_object(obj)) {
-      _oop_stack.push(obj);
+      _task_queue.push(ScannerTask(obj));
     }
     assert(_bitmap->is_marked(obj), "Must be marked");
   }
 }
 
-inline bool G1FullGCMarker::is_empty() {
-  return _oop_stack.is_empty() && _objarray_stack.is_empty();
+inline bool G1FullGCMarker::is_task_queue_empty() {
+  return _task_queue.is_empty();
 }
 
-inline void G1FullGCMarker::push_objarray(oop obj, size_t index) {
-  ObjArrayTask task(obj, index);
-  assert(task.is_valid(), "bad ObjArrayTask");
-  _objarray_stack.push(task);
+inline void G1FullGCMarker::process_array_chunk(objArrayOop obj, size_t start, size_t end) {
+  obj->oop_iterate_elements_range(mark_closure(),
+                                  checked_cast<int>(start),
+                                  checked_cast<int>(end));
 }
 
-inline void G1FullGCMarker::follow_array(objArrayOop array) {
-  mark_closure()->do_klass(array->klass());
-  // Don't push empty arrays to avoid unnecessary work.
-  if (array->length() > 0) {
-    push_objarray(array, 0);
-  }
-}
-
-void G1FullGCMarker::follow_array_chunk(objArrayOop array, int index) {
-  const int len = array->length();
-  const int beg_index = index;
-  assert(beg_index < len || len == 0, "index too large");
-
-  const int stride = MIN2(len - beg_index, (int) ObjArrayMarkingStride);
-  const int end_index = beg_index + stride;
-
-  // Push the continuation first to allow more efficient work stealing.
-  if (end_index < len) {
-    push_objarray(array, end_index);
-  }
-
-  array->oop_iterate_range(mark_closure(), beg_index, end_index);
-}
-
-inline void G1FullGCMarker::follow_object(oop obj) {
-  assert(_bitmap->is_marked(obj), "should be marked");
-  if (obj->is_objArray()) {
-    // Handle object arrays explicitly to allow them to
-    // be split into chunks if needed.
-    follow_array((objArrayOop)obj);
+inline void G1FullGCMarker::dispatch_task(const ScannerTask& task, bool stolen) {
+  if (task.is_partial_array_state()) {
+    assert(_bitmap->is_marked(task.to_partial_array_state()->source()), "should be marked");
+    process_partial_array(task.to_partial_array_state(), stolen);
   } else {
-    obj->oop_iterate(mark_closure());
+    oop obj = task.to_oop();
+    assert(_bitmap->is_marked(obj), "should be marked");
+    if (obj->is_objArray()) {
+      // Handle object arrays explicitly to allow them to
+      // be split into chunks if needed.
+      start_partial_array_processing((objArrayOop)obj);
+    } else {
+      obj->oop_iterate(mark_closure());
+    }
   }
 }
 
 inline void G1FullGCMarker::publish_and_drain_oop_tasks() {
-  oop obj;
-  while (_oop_stack.pop_overflow(obj)) {
-    if (!_oop_stack.try_push_to_taskqueue(obj)) {
-      assert(_bitmap->is_marked(obj), "must be marked");
-      follow_object(obj);
+  ScannerTask task;
+  while (_task_queue.pop_overflow(task)) {
+    if (!_task_queue.try_push_to_taskqueue(task)) {
+      dispatch_task(task, false);
     }
   }
-  while (_oop_stack.pop_local(obj)) {
-    assert(_bitmap->is_marked(obj), "must be marked");
-    follow_object(obj);
+  while (_task_queue.pop_local(task)) {
+    dispatch_task(task, false);
   }
 }
 
-inline bool G1FullGCMarker::publish_or_pop_objarray_tasks(ObjArrayTask& task) {
-  // It is desirable to move as much as possible work from the overflow queue to
-  // the shared queue as quickly as possible.
-  while (_objarray_stack.pop_overflow(task)) {
-    if (!_objarray_stack.try_push_to_taskqueue(task)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void G1FullGCMarker::follow_marking_stacks() {
+void G1FullGCMarker::process_marking_stacks() {
   do {
-    // First, drain regular oop stack.
     publish_and_drain_oop_tasks();
-
-    // Then process ObjArrays one at a time to avoid marking stack bloat.
-    ObjArrayTask task;
-    if (publish_or_pop_objarray_tasks(task) ||
-        _objarray_stack.pop_local(task)) {
-      follow_array_chunk(objArrayOop(task.obj()), task.index());
-    }
-  } while (!is_empty());
+  } while (!is_task_queue_empty());
 }
 
 #endif // SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.cpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.cpp
index d9cf64a3655..273508ea9e3 100644
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.cpp
@@ -35,7 +35,7 @@
 G1IsAliveClosure::G1IsAliveClosure(G1FullCollector* collector) :
   G1IsAliveClosure(collector, collector->mark_bitmap()) { }
 
-void G1FollowStackClosure::do_void() { _marker->follow_marking_stacks(); }
+void G1MarkStackClosure::do_void() { _marker->process_marking_stacks(); }
 
 void G1FullKeepAliveClosure::do_oop(oop* p) { do_oop_work(p); }
 void G1FullKeepAliveClosure::do_oop(narrowOop* p) { do_oop_work(p); }
diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp
index 388f8032de4..08ed5f982e1 100644
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp
@@ -86,11 +86,11 @@ public:
   virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
 };
 
-class G1FollowStackClosure: public VoidClosure {
+class G1MarkStackClosure: public VoidClosure {
   G1FullGCMarker* _marker;
 
 public:
-  G1FollowStackClosure(G1FullGCMarker* marker) : _marker(marker) {}
+  G1MarkStackClosure(G1FullGCMarker* marker) : _marker(marker) {}
   virtual void do_void();
 };
 
diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.cpp b/src/hotspot/share/gc/g1/g1FullGCScope.cpp
index 8b92d51a8a3..cb4ebe423ff 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,18 +38,14 @@ G1FullGCJFRTracerMark::~G1FullGCJFRTracerMark() {
 G1FullGCScope::G1FullGCScope(G1MonitoringSupport* monitoring_support,
                              bool clear_soft,
                              bool do_maximal_compaction,
-                             G1FullGCTracer* tracer) :
-    _rm(),
+                             GCTracer* tracer) :
     _should_clear_soft_refs(clear_soft),
     _do_maximal_compaction(do_maximal_compaction),
-    _g1h(G1CollectedHeap::heap()),
-    _svc_marker(SvcGCMarker::FULL),
     _timer(),
     _tracer(tracer),
-    _active(),
     _tracer_mark(&_timer, _tracer),
     _monitoring_scope(monitoring_support),
-    _heap_printer(_g1h),
+    _heap_printer(G1CollectedHeap::heap()),
     _region_compaction_threshold(do_maximal_compaction ?
                                  G1HeapRegion::GrainWords :
                                  (1 - MarkSweepDeadRatio / 100.0) * G1HeapRegion::GrainWords) { }
@@ -58,7 +54,7 @@ STWGCTimer* G1FullGCScope::timer() {
   return &_timer;
 }
 
-G1FullGCTracer* G1FullGCScope::tracer() {
+GCTracer* G1FullGCScope::tracer() {
   return _tracer;
 }
 
diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
index 7a0d0a5395e..fc9d5a71f92 100644
--- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,14 +46,10 @@ public:
 
 // Class used to group scoped objects used in the Full GC together.
 class G1FullGCScope : public StackObj {
-  ResourceMark            _rm;
   bool                    _should_clear_soft_refs;
   bool                    _do_maximal_compaction;
-  G1CollectedHeap*        _g1h;
-  SvcGCMarker             _svc_marker;
   STWGCTimer              _timer;
-  G1FullGCTracer*         _tracer;
-  IsSTWGCActiveMark       _active;
+  GCTracer*               _tracer;
   G1FullGCJFRTracerMark   _tracer_mark;
   G1FullGCMonitoringScope _monitoring_scope;
   G1HeapPrinterMark       _heap_printer;
@@ -63,13 +59,13 @@ public:
   G1FullGCScope(G1MonitoringSupport* monitoring_support,
                 bool clear_soft,
                 bool do_maximal_compaction,
-                G1FullGCTracer* tracer);
+                GCTracer* tracer);
 
   bool should_clear_soft_refs() const { return _should_clear_soft_refs; }
   bool do_maximal_compaction() { return _do_maximal_compaction; }
 
   STWGCTimer* timer();
-  G1FullGCTracer* tracer();
+  GCTracer* tracer();
   size_t region_compaction_threshold() const;
 };
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index 361e19d4be5..2052a3ce156 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -131,8 +131,8 @@ void G1HeapRegion::hr_clear(bool clear_space) {
 
   G1CollectedHeap::heap()->concurrent_mark()->reset_top_at_mark_start(this);
 
-  _parsable_bottom = bottom();
-  _garbage_bytes = 0;
+  _parsable_bottom.store_relaxed(bottom());
+  _garbage_bytes.store_relaxed(0);
   _incoming_refs = 0;
 
   if (clear_space) clear(SpaceDecorator::Mangle);
@@ -294,12 +294,12 @@ void G1HeapRegion::report_region_type_change(G1HeapRegionTraceType::Type to) {
   // young gen regions never have their PB set to anything other than bottom.
   assert(parsable_bottom_acquire() == bottom(), "must be");
 
-  _garbage_bytes = 0;
+  _garbage_bytes.store_relaxed(0);
   _incoming_refs = 0;
 }
 
 void G1HeapRegion::note_self_forward_chunk_done(size_t garbage_bytes) {
-  AtomicAccess::add(&_garbage_bytes, garbage_bytes, memory_order_relaxed);
+  _garbage_bytes.add_then_fetch(garbage_bytes, memory_order_relaxed);
 }
 
 // Code roots support
@@ -448,7 +448,7 @@ void G1HeapRegion::print_on(outputStream* st) const {
       st->print("|-");
     }
   }
-  st->print("|%3zu", AtomicAccess::load(&_pinned_object_count));
+  st->print("|%3zu", _pinned_object_count.load_relaxed());
   st->print_cr("");
 }
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
index fe915b0dafe..2b4b640d52b 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "gc/shared/verifyOption.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 #include "utilities/macros.hpp"
 
@@ -73,7 +74,7 @@ class G1HeapRegion : public CHeapObj<mtGC> {
   HeapWord* const _bottom;
   HeapWord* const _end;
 
-  HeapWord* volatile _top;
+  Atomic<HeapWord*> _top;
 
   G1BlockOffsetTable* _bot;
 
@@ -89,8 +90,8 @@ public:
   HeapWord* bottom() const         { return _bottom; }
   HeapWord* end() const            { return _end;    }
 
-  void set_top(HeapWord* value) { _top = value; }
-  HeapWord* top() const { return _top; }
+  void set_top(HeapWord* value) { _top.store_relaxed(value); }
+  HeapWord* top() const { return _top.load_relaxed(); }
 
   // See the comment above in the declaration of _pre_dummy_top for an
   // explanation of what it is.
@@ -231,10 +232,10 @@ private:
   //
   // Below this limit the marking bitmap must be used to determine size and
   // liveness.
-  HeapWord* volatile _parsable_bottom;
+  Atomic<HeapWord*> _parsable_bottom;
 
   // Amount of dead data in the region.
-  size_t _garbage_bytes;
+  Atomic<size_t> _garbage_bytes;
 
   // Approximate number of references to this regions at the end of concurrent
   // marking. We we do not mark through all objects, so this is an estimate.
@@ -249,7 +250,7 @@ private:
   uint _node_index;
 
   // Number of objects in this region that are currently pinned.
-  volatile size_t _pinned_object_count;
+  Atomic<size_t> _pinned_object_count;
 
   void report_region_type_change(G1HeapRegionTraceType::Type to);
 
@@ -331,7 +332,7 @@ public:
   }
 
   // A lower bound on the amount of garbage bytes in the region.
-  size_t garbage_bytes() const { return _garbage_bytes; }
+  size_t garbage_bytes() const { return _garbage_bytes.load_relaxed(); }
 
   // Return the amount of bytes we'll reclaim if we collect this
   // region. This includes not only the known garbage bytes in the
@@ -393,8 +394,8 @@ public:
 
   bool is_old_or_humongous() const { return _type.is_old_or_humongous(); }
 
-  size_t pinned_count() const { return AtomicAccess::load(&_pinned_object_count); }
-  bool has_pinned_objects() const { return pinned_count() > 0; }
+  inline size_t pinned_count() const;
+  inline bool has_pinned_objects() const;
 
   void set_free();
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
index f25bf62c9be..4f242b7a537 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 #include "gc/g1/g1Policy.hpp"
 #include "gc/g1/g1Predictions.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/init.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/safepoint.hpp"
@@ -131,7 +130,7 @@ inline void G1HeapRegion::prepare_for_full_gc() {
   // After marking and class unloading the heap temporarily contains dead objects
   // with unloaded klasses. Moving parsable_bottom makes some (debug) code correctly
   // skip dead objects.
-  _parsable_bottom = top();
+  _parsable_bottom.store_relaxed(top());
 }
 
 inline void G1HeapRegion::reset_compacted_after_full_gc(HeapWord* new_top) {
@@ -154,7 +153,7 @@ inline void G1HeapRegion::reset_after_full_gc_common() {
   // Everything above bottom() is parsable and live.
   reset_parsable_bottom();
 
-  _garbage_bytes = 0;
+  _garbage_bytes.store_relaxed(0);
 
   _incoming_refs = 0;
 
@@ -188,20 +187,22 @@ inline void G1HeapRegion::apply_to_marked_objects(G1CMBitMap* bitmap, ApplyToMar
 inline HeapWord* G1HeapRegion::par_allocate(size_t min_word_size,
                                             size_t desired_word_size,
                                             size_t* actual_word_size) {
+  HeapWord* obj = top();
   do {
-    HeapWord* obj = top();
     size_t available = pointer_delta(end(), obj);
     size_t want_to_allocate = MIN2(available, desired_word_size);
     if (want_to_allocate >= min_word_size) {
       HeapWord* new_top = obj + want_to_allocate;
-      HeapWord* result = AtomicAccess::cmpxchg(&_top, obj, new_top);
-      // result can be one of two:
-      // the old top value: the exchange succeeded
+      HeapWord* result = _top.compare_exchange(obj, new_top);
+      // Result can be one of two:
+      // the old top value: the exchange succeeded, return.
       // otherwise: the new value of the top is returned.
       if (result == obj) {
         assert(is_object_aligned(obj) && is_object_aligned(new_top), "checking alignment");
         *actual_word_size = want_to_allocate;
         return obj;
+      } else {
+        obj = result;
       }
     } else {
       return nullptr;
@@ -254,27 +255,27 @@ inline void G1HeapRegion::update_bot_for_block(HeapWord* start, HeapWord* end) {
 
 inline HeapWord* G1HeapRegion::parsable_bottom() const {
   assert(!is_init_completed() || SafepointSynchronize::is_at_safepoint(), "only during initialization or safepoint");
-  return _parsable_bottom;
+  return _parsable_bottom.load_relaxed();
 }
 
 inline HeapWord* G1HeapRegion::parsable_bottom_acquire() const {
-  return AtomicAccess::load_acquire(&_parsable_bottom);
+  return _parsable_bottom.load_acquire();
 }
 
 inline void G1HeapRegion::reset_parsable_bottom() {
-  AtomicAccess::release_store(&_parsable_bottom, bottom());
+  _parsable_bottom.release_store(bottom());
 }
 
 inline void G1HeapRegion::note_end_of_marking(HeapWord* top_at_mark_start, size_t marked_bytes, size_t incoming_refs) {
   assert_at_safepoint();
 
   if (top_at_mark_start != bottom()) {
-    _garbage_bytes = byte_size(bottom(), top_at_mark_start) - marked_bytes;
+    _garbage_bytes.store_relaxed(byte_size(bottom(), top_at_mark_start) - marked_bytes);
     _incoming_refs = incoming_refs;
   }
 
   if (needs_scrubbing()) {
-    _parsable_bottom = top_at_mark_start;
+    _parsable_bottom.store_relaxed(top_at_mark_start);
   }
 }
 
@@ -286,6 +287,14 @@ inline bool G1HeapRegion::needs_scrubbing() const {
   return is_old();
 }
 
+inline size_t G1HeapRegion::pinned_count() const {
+  return _pinned_object_count.load_relaxed();
+}
+
+inline bool G1HeapRegion::has_pinned_objects() const {
+  return pinned_count() > 0;
+}
+
 inline bool G1HeapRegion::in_collection_set() const {
   return G1CollectedHeap::heap()->is_in_cset(this);
 }
@@ -511,7 +520,7 @@ inline void G1HeapRegion::record_surv_words_in_group(size_t words_survived) {
 inline void G1HeapRegion::add_pinned_object_count(size_t value) {
   assert(value != 0, "wasted effort");
   assert(!is_free(), "trying to pin free region %u, adding %zu", hrm_index(), value);
-  AtomicAccess::add(&_pinned_object_count, value, memory_order_relaxed);
+  _pinned_object_count.add_then_fetch(value, memory_order_relaxed);
 }
 
 inline void G1HeapRegion::install_cset_group(G1CSetCandidateGroup* cset_group) {
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index 795b6543bae..fdd3b919590 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@
 #include "jfr/jfrEvents.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/bitMap.inline.hpp"
@@ -713,8 +712,10 @@ void G1HeapRegionManager::verify_optional() {
 
 G1HeapRegionClaimer::G1HeapRegionClaimer(uint n_workers) :
     _n_workers(n_workers), _n_regions(G1CollectedHeap::heap()->_hrm._next_highest_used_hrm_index), _claims(nullptr) {
-  uint* new_claims = NEW_C_HEAP_ARRAY(uint, _n_regions, mtGC);
-  memset(new_claims, Unclaimed, sizeof(*_claims) * _n_regions);
+  Atomic<uint>* new_claims = NEW_C_HEAP_ARRAY(Atomic<uint>, _n_regions, mtGC);
+  for (uint i = 0; i < _n_regions; i++) {
+    new_claims[i].store_relaxed(Unclaimed);
+  }
   _claims = new_claims;
 }
 
@@ -730,13 +731,12 @@ uint G1HeapRegionClaimer::offset_for_worker(uint worker_id) const {
 
 bool G1HeapRegionClaimer::is_region_claimed(uint region_index) const {
   assert(region_index < _n_regions, "Invalid index.");
-  return _claims[region_index] == Claimed;
+  return _claims[region_index].load_relaxed() == Claimed;
 }
 
 bool G1HeapRegionClaimer::claim_region(uint region_index) {
   assert(region_index < _n_regions, "Invalid index.");
-  uint old_val = AtomicAccess::cmpxchg(&_claims[region_index], Unclaimed, Claimed);
-  return old_val == Unclaimed;
+  return _claims[region_index].compare_set(Unclaimed, Claimed);
 }
 
 class G1RebuildFreeListTask : public WorkerTask {
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
index b4ce3b0a8be..eb593ff408e 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "services/memoryUsage.hpp"
 
 class G1HeapRegion;
@@ -294,7 +295,7 @@ public:
 class G1HeapRegionClaimer : public StackObj {
   uint           _n_workers;
   uint           _n_regions;
-  volatile uint* _claims;
+  Atomic<uint>*  _claims;
 
   static const uint Unclaimed = 0;
   static const uint Claimed   = 1;
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp
index fae73a2c6bf..13c7a6a8d3e 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 #include "memory/allocation.hpp"
 #include "memory/padded.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp
index 0f78e0d6271..950098c706e 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "gc/g1/g1CodeRootSet.hpp"
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1FromCardCache.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/bitMap.hpp"
@@ -123,9 +122,6 @@ public:
 
   static void initialize(MemRegion reserved);
 
-  // Coarsening statistics since VM start.
-  static G1CardSetCoarsenStats coarsen_stats() { return G1CardSet::coarsen_stats(); }
-
   inline uintptr_t to_card(OopOrNarrowOopStar from) const;
 
 private:
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp
index fbd529cb1d3..f621b1318c1 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionRemSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "gc/g1/g1CardSet.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/bitMap.inline.hpp"
 
 void G1HeapRegionRemSet::set_state_untracked() {
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArena.cpp b/src/hotspot/share/gc/g1/g1MonotonicArena.cpp
index a9c6462680f..3f97870a67f 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArena.cpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArena.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 
 #include "gc/g1/g1MonotonicArena.inline.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/vmOperations.hpp"
 #include "utilities/globalCounter.inline.hpp"
 
@@ -61,13 +60,13 @@ void G1MonotonicArena::SegmentFreeList::bulk_add(Segment& first,
                                                  size_t num,
                                                  size_t mem_size) {
   _list.prepend(first, last);
-  AtomicAccess::add(&_num_segments, num, memory_order_relaxed);
-  AtomicAccess::add(&_mem_size, mem_size, memory_order_relaxed);
+  _num_segments.add_then_fetch(num, memory_order_relaxed);
+  _mem_size.add_then_fetch(mem_size, memory_order_relaxed);
 }
 
 void G1MonotonicArena::SegmentFreeList::print_on(outputStream* out, const char* prefix) {
   out->print_cr("%s: segments %zu size %zu",
-                prefix, AtomicAccess::load(&_num_segments), AtomicAccess::load(&_mem_size));
+                prefix, _num_segments.load_relaxed(), _mem_size.load_relaxed());
 }
 
 G1MonotonicArena::Segment* G1MonotonicArena::SegmentFreeList::get_all(size_t& num_segments,
@@ -75,12 +74,12 @@ G1MonotonicArena::Segment* G1MonotonicArena::SegmentFreeList::get_all(size_t& nu
   GlobalCounter::CriticalSection cs(Thread::current());
 
   Segment* result = _list.pop_all();
-  num_segments = AtomicAccess::load(&_num_segments);
-  mem_size = AtomicAccess::load(&_mem_size);
+  num_segments = _num_segments.load_relaxed();
+  mem_size = _mem_size.load_relaxed();
 
   if (result != nullptr) {
-    AtomicAccess::sub(&_num_segments, num_segments, memory_order_relaxed);
-    AtomicAccess::sub(&_mem_size, mem_size, memory_order_relaxed);
+    _num_segments.sub_then_fetch(num_segments, memory_order_relaxed);
+    _mem_size.sub_then_fetch(mem_size, memory_order_relaxed);
   }
   return result;
 }
@@ -96,8 +95,8 @@ void G1MonotonicArena::SegmentFreeList::free_all() {
     Segment::delete_segment(cur);
   }
 
-  AtomicAccess::sub(&_num_segments, num_freed, memory_order_relaxed);
-  AtomicAccess::sub(&_mem_size, mem_size_freed, memory_order_relaxed);
+  _num_segments.sub_then_fetch(num_freed, memory_order_relaxed);
+  _mem_size.sub_then_fetch(mem_size_freed, memory_order_relaxed);
 }
 
 G1MonotonicArena::Segment* G1MonotonicArena::new_segment(Segment* const prev) {
@@ -115,7 +114,7 @@ G1MonotonicArena::Segment* G1MonotonicArena::new_segment(Segment* const prev) {
   }
 
   // Install it as current allocation segment.
-  Segment* old = AtomicAccess::cmpxchg(&_first, prev, next);
+  Segment* old = _first.compare_exchange(prev, next);
   if (old != prev) {
     // Somebody else installed the segment, use that one.
     Segment::delete_segment(next);
@@ -126,9 +125,9 @@ G1MonotonicArena::Segment* G1MonotonicArena::new_segment(Segment* const prev) {
       _last = next;
     }
     // Successfully installed the segment into the list.
-    AtomicAccess::inc(&_num_segments, memory_order_relaxed);
-    AtomicAccess::add(&_mem_size, next->mem_size(), memory_order_relaxed);
-    AtomicAccess::add(&_num_total_slots, next->num_slots(), memory_order_relaxed);
+    _num_segments.add_then_fetch(1u, memory_order_relaxed);
+    _mem_size.add_then_fetch(next->mem_size(), memory_order_relaxed);
+    _num_total_slots.add_then_fetch(next->num_slots(), memory_order_relaxed);
     return next;
   }
 }
@@ -155,7 +154,7 @@ uint G1MonotonicArena::slot_size() const {
 }
 
 void G1MonotonicArena::drop_all() {
-  Segment* cur = AtomicAccess::load_acquire(&_first);
+  Segment* cur = _first.load_acquire();
 
   if (cur != nullptr) {
     assert(_last != nullptr, "If there is at least one segment, there must be a last one.");
@@ -175,25 +174,25 @@ void G1MonotonicArena::drop_all() {
       cur = next;
     }
 #endif
-    assert(num_segments == _num_segments, "Segment count inconsistent %u %u", num_segments, _num_segments);
-    assert(mem_size == _mem_size, "Memory size inconsistent");
+    assert(num_segments == _num_segments.load_relaxed(), "Segment count inconsistent %u %u", num_segments, _num_segments.load_relaxed());
+    assert(mem_size == _mem_size.load_relaxed(), "Memory size inconsistent");
     assert(last == _last, "Inconsistent last segment");
 
-    _segment_free_list->bulk_add(*first, *_last, _num_segments, _mem_size);
+    _segment_free_list->bulk_add(*first, *_last, _num_segments.load_relaxed(), _mem_size.load_relaxed());
   }
 
-  _first = nullptr;
+  _first.store_relaxed(nullptr);
   _last = nullptr;
-  _num_segments = 0;
-  _mem_size = 0;
-  _num_total_slots = 0;
-  _num_allocated_slots = 0;
+  _num_segments.store_relaxed(0);
+  _mem_size.store_relaxed(0);
+  _num_total_slots.store_relaxed(0);
+  _num_allocated_slots.store_relaxed(0);
 }
 
 void* G1MonotonicArena::allocate() {
   assert(slot_size() > 0, "instance size not set.");
 
-  Segment* cur = AtomicAccess::load_acquire(&_first);
+  Segment* cur = _first.load_acquire();
   if (cur == nullptr) {
     cur = new_segment(cur);
   }
@@ -201,7 +200,7 @@ void* G1MonotonicArena::allocate() {
   while (true) {
     void* slot = cur->allocate_slot();
     if (slot != nullptr) {
-      AtomicAccess::inc(&_num_allocated_slots, memory_order_relaxed);
+      _num_allocated_slots.add_then_fetch(1u, memory_order_relaxed);
       guarantee(is_aligned(slot, _alloc_options->slot_alignment()),
                 "result " PTR_FORMAT " not aligned at %u", p2i(slot), _alloc_options->slot_alignment());
       return slot;
@@ -213,7 +212,7 @@ void* G1MonotonicArena::allocate() {
 }
 
 uint G1MonotonicArena::num_segments() const {
-  return AtomicAccess::load(&_num_segments);
+  return _num_segments.load_relaxed();
 }
 
 #ifdef ASSERT
@@ -238,7 +237,7 @@ uint G1MonotonicArena::calculate_length() const {
 
 template <typename SegmentClosure>
 void G1MonotonicArena::iterate_segments(SegmentClosure& closure) const {
-  Segment* cur = AtomicAccess::load_acquire(&_first);
+  Segment* cur = _first.load_acquire();
 
   assert((cur != nullptr) == (_last != nullptr),
          "If there is at least one segment, there must be a last one");
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArena.hpp b/src/hotspot/share/gc/g1/g1MonotonicArena.hpp
index 211820c5254..d8e658b5a64 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArena.hpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArena.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +28,7 @@
 
 #include "gc/shared/freeListAllocator.hpp"
 #include "nmt/memTag.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/lockFreeStack.hpp"
 
@@ -65,27 +66,27 @@ private:
   // AllocOptions provides parameters for Segment sizing and expansion.
   const AllocOptions* _alloc_options;
 
-  Segment* volatile _first;       // The (start of the) list of all segments.
-  Segment* _last;                 // The last segment of the list of all segments.
-  volatile uint _num_segments;    // Number of assigned segments to this allocator.
-  volatile size_t _mem_size;      // Memory used by all segments.
+  Atomic<Segment*> _first;       // The (start of the) list of all segments.
+  Segment* _last;                // The last segment of the list of all segments.
+  Atomic<uint> _num_segments;    // Number of assigned segments to this allocator.
+  Atomic<size_t> _mem_size;      // Memory used by all segments.
 
   SegmentFreeList* _segment_free_list;  // The global free segment list to preferentially
                                         // get new segments from.
 
-  volatile uint _num_total_slots; // Number of slots available in all segments (allocated + not yet used).
-  volatile uint _num_allocated_slots; // Number of total slots allocated ever (including free and pending).
+  Atomic<uint> _num_total_slots; // Number of slots available in all segments (allocated + not yet used).
+  Atomic<uint> _num_allocated_slots; // Number of total slots allocated ever (including free and pending).
 
   inline Segment* new_segment(Segment* const prev);
 
   DEBUG_ONLY(uint calculate_length() const;)
 
 public:
-  const Segment* first_segment() const { return AtomicAccess::load(&_first); }
+  const Segment* first_segment() const { return _first.load_relaxed(); }
 
-  uint num_total_slots() const { return AtomicAccess::load(&_num_total_slots); }
+  uint num_total_slots() const { return _num_total_slots.load_relaxed(); }
   uint num_allocated_slots() const {
-    uint allocated = AtomicAccess::load(&_num_allocated_slots);
+    uint allocated = _num_allocated_slots.load_relaxed();
     assert(calculate_length() == allocated, "Must be");
     return allocated;
   }
@@ -116,11 +117,11 @@ static constexpr uint SegmentPayloadMaxAlignment = 8;
 class alignas(SegmentPayloadMaxAlignment) G1MonotonicArena::Segment {
   const uint _slot_size;
   const uint _num_slots;
-  Segment* volatile _next;
+  Atomic<Segment*> _next;
   // Index into the next free slot to allocate into. Full if equal (or larger)
   // to _num_slots (can be larger because we atomically increment this value and
   // check only afterwards if the allocation has been successful).
-  uint volatile _next_allocate;
+  Atomic<uint> _next_allocate;
   const MemTag _mem_tag;
 
   static size_t header_size() { return align_up(sizeof(Segment), SegmentPayloadMaxAlignment); }
@@ -139,21 +140,21 @@ class alignas(SegmentPayloadMaxAlignment) G1MonotonicArena::Segment {
   Segment(uint slot_size, uint num_slots, Segment* next, MemTag mem_tag);
   ~Segment() = default;
 public:
-  Segment* volatile* next_addr() { return &_next; }
+  Atomic<Segment*>* next_addr() { return &_next; }
 
   void* allocate_slot();
 
   uint num_slots() const { return _num_slots; }
 
-  Segment* next() const { return _next; }
+  Segment* next() const { return _next.load_relaxed(); }
 
   void set_next(Segment* next) {
     assert(next != this, " loop condition");
-    _next = next;
+    _next.store_relaxed(next);
   }
 
   void reset(Segment* next) {
-    _next_allocate = 0;
+    _next_allocate.store_relaxed(0);
     assert(next != this, " loop condition");
     set_next(next);
     memset(payload(0), 0, payload_size());
@@ -166,7 +167,7 @@ public:
   uint length() const {
     // _next_allocate might grow larger than _num_slots in multi-thread environments
     // due to races.
-    return MIN2(_next_allocate, _num_slots);
+    return MIN2(_next_allocate.load_relaxed(), _num_slots);
   }
 
   static size_t size_in_bytes(uint slot_size, uint num_slots) {
@@ -176,7 +177,7 @@ public:
   static Segment* create_segment(uint slot_size, uint num_slots, Segment* next, MemTag mem_tag);
   static void delete_segment(Segment* segment);
 
-  bool is_full() const { return _next_allocate >= _num_slots; }
+  bool is_full() const { return _next_allocate.load_relaxed() >= _num_slots; }
 };
 
 static_assert(alignof(G1MonotonicArena::Segment) >= SegmentPayloadMaxAlignment, "assert alignment of Segment (and indirectly its payload)");
@@ -186,15 +187,15 @@ static_assert(alignof(G1MonotonicArena::Segment) >= SegmentPayloadMaxAlignment,
 // performed by multiple threads concurrently.
 // Counts and memory usage are current on a best-effort basis if accessed concurrently.
 class G1MonotonicArena::SegmentFreeList {
-  static Segment* volatile* next_ptr(Segment& segment) {
+  static Atomic<Segment*>* next_ptr(Segment& segment) {
     return segment.next_addr();
   }
   using SegmentStack = LockFreeStack<Segment, &SegmentFreeList::next_ptr>;
 
   SegmentStack _list;
 
-  volatile size_t _num_segments;
-  volatile size_t _mem_size;
+  Atomic<size_t> _num_segments;
+  Atomic<size_t> _mem_size;
 
 public:
   SegmentFreeList() : _list(), _num_segments(0), _mem_size(0) { }
@@ -210,8 +211,8 @@ public:
 
   void print_on(outputStream* out, const char* prefix = "");
 
-  size_t num_segments() const { return AtomicAccess::load(&_num_segments); }
-  size_t mem_size() const { return AtomicAccess::load(&_mem_size); }
+  size_t num_segments() const { return _num_segments.load_relaxed(); }
+  size_t mem_size() const { return _mem_size.load_relaxed(); }
 };
 
 // Configuration for G1MonotonicArena, e.g slot size, slot number of next Segment.
diff --git a/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp b/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp
index dd9ccae1849..cf1b35ccead 100644
--- a/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1MonotonicArena.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2022, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,14 +28,13 @@
 
 #include "gc/g1/g1MonotonicArena.hpp"
 
-#include "runtime/atomicAccess.hpp"
 #include "utilities/globalCounter.inline.hpp"
 
 inline void* G1MonotonicArena::Segment::allocate_slot() {
-  if (_next_allocate >= _num_slots) {
+  if (_next_allocate.load_relaxed() >= _num_slots) {
     return nullptr;
   }
-  uint result = AtomicAccess::fetch_then_add(&_next_allocate, 1u, memory_order_relaxed);
+  uint result = _next_allocate.fetch_then_add(1u, memory_order_relaxed);
   if (result >= _num_slots) {
     return nullptr;
   }
@@ -48,8 +47,8 @@ inline G1MonotonicArena::Segment* G1MonotonicArena::SegmentFreeList::get() {
 
   Segment* result = _list.pop();
   if (result != nullptr) {
-    AtomicAccess::dec(&_num_segments, memory_order_relaxed);
-    AtomicAccess::sub(&_mem_size, result->mem_size(), memory_order_relaxed);
+    _num_segments.sub_then_fetch(1u, memory_order_relaxed);
+    _mem_size.sub_then_fetch(result->mem_size(), memory_order_relaxed);
   }
   return result;
 }
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
index d7e0c6e394f..529ef62b44d 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 #include "nmt/memTracker.hpp"
 #include "oops/markWord.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index 80e5fd44fcd..75a8ef1a336 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -238,9 +237,9 @@ void G1ParScanThreadState::do_partial_array(PartialArrayState* state, bool stole
   G1HeapRegionAttr dest_attr = _g1h->region_attr(to_array);
   G1SkipCardMarkSetter x(&_scanner, dest_attr.is_new_survivor());
   // Process claimed task.
-  to_array->oop_iterate_range(&_scanner,
-                              checked_cast<int>(claim._start),
-                              checked_cast<int>(claim._end));
+  to_array->oop_iterate_elements_range(&_scanner,
+                                       checked_cast<int>(claim._start),
+                                       checked_cast<int>(claim._end));
 }
 
 MAYBE_INLINE_EVACUATION
@@ -260,7 +259,7 @@ void G1ParScanThreadState::start_partial_objarray(oop from_obj,
   // Process the initial chunk.  No need to process the type in the
   // klass, as it will already be handled by processing the built-in
   // module.
-  to_array->oop_iterate_range(&_scanner, 0, checked_cast<int>(initial_chunk_size));
+  to_array->oop_iterate_elements_range(&_scanner, 0, checked_cast<int>(initial_chunk_size));
 }
 
 MAYBE_INLINE_EVACUATION
diff --git a/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp b/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp
index 8d5e2a3239c..e3eabff5a50 100644
--- a/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp
+++ b/src/hotspot/share/gc/g1/g1ParallelCleaning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 
 
 #include "gc/g1/g1ParallelCleaning.hpp"
-#include "runtime/atomicAccess.hpp"
 #if INCLUDE_JVMCI
 #include "jvmci/jvmci.hpp"
 #endif
@@ -35,11 +34,11 @@ JVMCICleaningTask::JVMCICleaningTask() :
 }
 
 bool JVMCICleaningTask::claim_cleaning_task() {
-  if (AtomicAccess::load(&_cleaning_claimed)) {
+  if (_cleaning_claimed.load_relaxed()) {
     return false;
   }
 
-  return !AtomicAccess::cmpxchg(&_cleaning_claimed, false, true);
+  return _cleaning_claimed.compare_set(false, true);
 }
 
 void JVMCICleaningTask::work(bool unloading_occurred) {
diff --git a/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp b/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp
index d8725cb110d..815b0883e16 100644
--- a/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp
+++ b/src/hotspot/share/gc/g1/g1ParallelCleaning.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,13 @@
 #define SHARE_GC_G1_G1PARALLELCLEANING_HPP
 
 #include "gc/shared/parallelCleaning.hpp"
+#if INCLUDE_JVMCI
+#include "runtime/atomic.hpp"
+#endif
 
 #if INCLUDE_JVMCI
 class JVMCICleaningTask : public StackObj {
-  volatile bool _cleaning_claimed;
+  Atomic<bool> _cleaning_claimed;
 
 public:
   JVMCICleaningTask();
diff --git a/src/hotspot/share/gc/g1/g1PeriodicGCTask.cpp b/src/hotspot/share/gc/g1/g1PeriodicGCTask.cpp
index 50002ac2bfe..f280d76f3c7 100644
--- a/src/hotspot/share/gc/g1/g1PeriodicGCTask.cpp
+++ b/src/hotspot/share/gc/g1/g1PeriodicGCTask.cpp
@@ -39,7 +39,7 @@ bool G1PeriodicGCTask::should_start_periodic_gc(G1CollectedHeap* g1h,
   SuspendibleThreadSetJoiner sts;
 
   // If we are currently in a concurrent mark we are going to uncommit memory soon.
-  if (g1h->concurrent_mark()->cm_thread()->in_progress()) {
+  if (g1h->concurrent_mark()->in_progress()) {
     log_debug(gc, periodic)("Concurrent cycle in progress. Skipping.");
     return false;
   }
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 6eef6cbfa87..98e6acc1d77 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 #include "gc/g1/g1ConcurrentMark.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp"
 #include "gc/g1/g1ConcurrentRefine.hpp"
-#include "gc/g1/g1ConcurrentRefineStats.hpp"
+#include "gc/g1/g1ConcurrentRefineStats.inline.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionRemSet.inline.hpp"
@@ -203,8 +203,8 @@ void G1Policy::update_young_length_bounds(size_t pending_cards, size_t card_rs_l
   // allocation.
   // That is "fine" - at most this will schedule a GC (hopefully only a little) too
   // early or too late.
-  AtomicAccess::store(&_young_list_desired_length, new_young_list_desired_length);
-  AtomicAccess::store(&_young_list_target_length, new_young_list_target_length);
+  _young_list_desired_length.store_relaxed(new_young_list_desired_length);
+  _young_list_target_length.store_relaxed(new_young_list_target_length);
 }
 
 // Calculates desired young gen length. It is calculated from:
@@ -739,7 +739,7 @@ double G1Policy::constant_other_time_ms(double pause_time_ms) const {
 }
 
 bool G1Policy::about_to_start_mixed_phase() const {
-  return _g1h->concurrent_mark()->cm_thread()->in_progress() || collector_state()->in_young_gc_before_mixed();
+  return _g1h->concurrent_mark()->in_progress() || collector_state()->in_young_gc_before_mixed();
 }
 
 bool G1Policy::need_to_start_conc_mark(const char* source, size_t allocation_word_size) {
@@ -943,7 +943,7 @@ void G1Policy::record_young_collection_end(bool concurrent_operation_is_full_mar
                           phase_times()->sum_thread_work_items(G1GCPhaseTimes::MergePSS, G1GCPhaseTimes::MergePSSToYoungGenCards));
   }
 
-  record_pause(this_pause, start_time_sec, end_time_sec, allocation_failure);
+  record_pause(this_pause, start_time_sec, end_time_sec);
 
   if (G1GCPauseTypeHelper::is_last_young_pause(this_pause)) {
     assert(!G1GCPauseTypeHelper::is_concurrent_start_pause(this_pause),
@@ -1235,7 +1235,7 @@ bool G1Policy::force_concurrent_start_if_outside_cycle(GCCause::Cause gc_cause)
   // We actually check whether we are marking here and not if we are in a
   // reclamation phase. This means that we will schedule a concurrent mark
   // even while we are still in the process of reclaiming memory.
-  bool during_cycle = _g1h->concurrent_mark()->cm_thread()->in_progress();
+  bool during_cycle = _g1h->concurrent_mark()->in_progress();
   if (!during_cycle) {
     log_debug(gc, ergo)("Request concurrent cycle initiation (requested by GC cause). "
                         "GC cause: %s",
@@ -1389,16 +1389,13 @@ void G1Policy::update_gc_pause_time_ratios(G1GCPauseType gc_type, double start_t
 
 void G1Policy::record_pause(G1GCPauseType gc_type,
                             double start,
-                            double end,
-                            bool allocation_failure) {
+                            double end) {
   // Manage the MMU tracker. For some reason it ignores Full GCs.
   if (gc_type != G1GCPauseType::FullGC) {
     _mmu_tracker->add_pause(start, end);
   }
 
-  if (!allocation_failure) {
-    update_gc_pause_time_ratios(gc_type, start, end);
-  }
+  update_gc_pause_time_ratios(gc_type, start, end);
 
   update_time_to_mixed_tracking(gc_type, start, end);
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index 72fdc6deb5b..9513c79869e 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
 #include "gc/g1/g1RemSetTrackingPolicy.hpp"
 #include "gc/g1/g1YoungGenSizer.hpp"
 #include "gc/shared/gcCause.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/pair.hpp"
 #include "utilities/ticks.hpp"
 
@@ -81,12 +81,9 @@ class G1Policy: public CHeapObj<mtGC> {
 
   // Desired young gen length without taking actually available free regions into
   // account.
-  volatile uint _young_list_desired_length;
+  Atomic<uint> _young_list_desired_length;
   // Actual target length given available free memory.
-  volatile uint _young_list_target_length;
-  // The max number of regions we can extend the eden by while the GC
-  // locker is active. This should be >= _young_list_target_length;
-  volatile uint _young_list_max_length;
+  Atomic<uint> _young_list_target_length;
 
   // The survivor rate groups below must be initialized after the predictor because they
   // indirectly use it through the "this" object passed to their constructor.
@@ -275,8 +272,7 @@ private:
   // Record the given STW pause with the given start and end times (in s).
   void record_pause(G1GCPauseType gc_type,
                     double start,
-                    double end,
-                    bool allocation_failure = false);
+                    double end);
 
   void update_gc_pause_time_ratios(G1GCPauseType gc_type, double start_sec, double end_sec);
 
@@ -363,8 +359,8 @@ public:
   // This must be called at the very beginning of an evacuation pause.
   void decide_on_concurrent_start_pause();
 
-  uint young_list_desired_length() const { return AtomicAccess::load(&_young_list_desired_length); }
-  uint young_list_target_length() const { return AtomicAccess::load(&_young_list_target_length); }
+  uint young_list_desired_length() const { return _young_list_desired_length.load_relaxed(); }
+  uint young_list_target_length() const { return _young_list_target_length.load_relaxed(); }
 
   bool should_allocate_mutator_region() const;
   bool should_expand_on_mutator_allocation() const;
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.cpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.cpp
index d9b7ec294bd..c5f55e1d20c 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.cpp
@@ -29,12 +29,12 @@
 
 G1RegionMarkStatsCache::G1RegionMarkStatsCache(G1RegionMarkStats* target, uint num_cache_entries) :
   _target(target),
+  _cache(NEW_C_HEAP_ARRAY(G1RegionMarkStatsCacheEntry, num_cache_entries, mtGC)),
   _num_cache_entries(num_cache_entries),
   _num_cache_entries_mask(_num_cache_entries - 1) {
 
   guarantee(is_power_of_2(num_cache_entries),
             "Number of cache entries must be power of two, but is %u", num_cache_entries);
-  _cache = NEW_C_HEAP_ARRAY(G1RegionMarkStatsCacheEntry, _num_cache_entries, mtGC);
 }
 
 G1RegionMarkStatsCache::~G1RegionMarkStatsCache() {
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
index 3c1a6ed4667..4dcdd33846e 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/pair.hpp"
@@ -40,20 +41,23 @@
 // * the number of incoming references found during marking. This is an approximate
 //   value because we do not mark through all objects.
 struct G1RegionMarkStats {
-  size_t _live_words;
-  size_t _incoming_refs;
+  Atomic<size_t> _live_words;
+  Atomic<size_t> _incoming_refs;
 
   // Clear all members.
   void clear() {
-    _live_words = 0;
-    _incoming_refs = 0;
+    _live_words.store_relaxed(0);
+    _incoming_refs.store_relaxed(0);
   }
   // Clear all members after a marking overflow. Only needs to clear the number of
   // incoming references as all objects will be rescanned, while the live words are
   // gathered whenever a thread can mark an object, which is synchronized.
   void clear_during_overflow() {
-    _incoming_refs = 0;
+    _incoming_refs.store_relaxed(0);
   }
+
+  size_t live_words() const { return _live_words.load_relaxed(); }
+  size_t incoming_refs() const { return _incoming_refs.load_relaxed(); }
 };
 
 // Per-marking thread cache for the region mark statistics.
@@ -112,12 +116,16 @@ public:
   void add_live_words(oop obj);
   void add_live_words(uint region_idx, size_t live_words) {
     G1RegionMarkStatsCacheEntry* const cur = find_for_add(region_idx);
-    cur->_stats._live_words += live_words;
+    // This method is only ever called single-threaded, so we do not need atomic
+    // update here.
+    cur->_stats._live_words.store_relaxed(cur->_stats.live_words() + live_words);
   }
 
   void inc_incoming_refs(uint region_idx) {
     G1RegionMarkStatsCacheEntry* const cur = find_for_add(region_idx);
-    cur->_stats._incoming_refs++;
+    // This method is only ever called single-threaded, so we do not need atomic
+    // update here.
+    cur->_stats._incoming_refs.store_relaxed(cur->_stats.incoming_refs() + 1u);
   }
 
   void reset(uint region_idx) {
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
index 6b0ebb34e0d..71cd33e71ae 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@
 
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
 
-#include "runtime/atomicAccess.hpp"
-
 inline G1RegionMarkStatsCache::G1RegionMarkStatsCacheEntry* G1RegionMarkStatsCache::find_for_add(uint region_idx) {
   uint const cache_idx = hash(region_idx);
 
@@ -46,12 +44,12 @@ inline G1RegionMarkStatsCache::G1RegionMarkStatsCacheEntry* G1RegionMarkStatsCac
 
 inline void G1RegionMarkStatsCache::evict(uint idx) {
   G1RegionMarkStatsCacheEntry* cur = &_cache[idx];
-  if (cur->_stats._live_words != 0) {
-    AtomicAccess::add(&_target[cur->_region_idx]._live_words, cur->_stats._live_words);
+  if (cur->_stats.live_words() != 0) {
+    _target[cur->_region_idx]._live_words.add_then_fetch(cur->_stats.live_words());
   }
 
-  if (cur->_stats._incoming_refs != 0) {
-    AtomicAccess::add(&_target[cur->_region_idx]._incoming_refs, cur->_stats._incoming_refs);
+  if (cur->_stats.incoming_refs() != 0) {
+    _target[cur->_region_idx]._incoming_refs.add_then_fetch(cur->_stats.incoming_refs());
   }
 
   cur->clear();
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index c7724de280f..0c9a0fad8f2 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -107,46 +107,48 @@ class G1RemSetScanState : public CHeapObj<mtGC> {
 // Set of (unique) regions that can be added to concurrently.
   class G1DirtyRegions : public CHeapObj<mtGC> {
     uint* _buffer;
-    uint _cur_idx;
+    Atomic<uint> _cur_idx;
     size_t _max_reserved_regions;
 
-    bool* _contains;
+    Atomic<bool>* _contains;
 
   public:
     G1DirtyRegions(size_t max_reserved_regions) :
       _buffer(NEW_C_HEAP_ARRAY(uint, max_reserved_regions, mtGC)),
       _cur_idx(0),
       _max_reserved_regions(max_reserved_regions),
-      _contains(NEW_C_HEAP_ARRAY(bool, max_reserved_regions, mtGC)) {
+      _contains(NEW_C_HEAP_ARRAY(Atomic<bool>, max_reserved_regions, mtGC)) {
 
       reset();
     }
 
     ~G1DirtyRegions() {
       FREE_C_HEAP_ARRAY(uint, _buffer);
-      FREE_C_HEAP_ARRAY(bool, _contains);
+      FREE_C_HEAP_ARRAY(Atomic<bool>, _contains);
     }
 
     void reset() {
-      _cur_idx = 0;
-      ::memset(_contains, false, _max_reserved_regions * sizeof(bool));
+      _cur_idx.store_relaxed(0);
+      for (uint i = 0; i < _max_reserved_regions; i++) {
+        _contains[i].store_relaxed(false);
+      }
     }
 
-    uint size() const { return _cur_idx; }
+    uint size() const { return _cur_idx.load_relaxed(); }
 
     uint at(uint idx) const {
-      assert(idx < _cur_idx, "Index %u beyond valid regions", idx);
+      assert(idx < size(), "Index %u beyond valid regions", idx);
       return _buffer[idx];
     }
 
     void add_dirty_region(uint region) {
-      if (_contains[region]) {
+      if (_contains[region].load_relaxed()) {
         return;
       }
 
-      bool marked_as_dirty = AtomicAccess::cmpxchg(&_contains[region], false, true) == false;
+      bool marked_as_dirty = _contains[region].compare_set(false, true);
       if (marked_as_dirty) {
-        uint allocated = AtomicAccess::fetch_then_add(&_cur_idx, 1u);
+        uint allocated = _cur_idx.fetch_then_add(1u);
         _buffer[allocated] = region;
       }
     }
@@ -155,9 +157,11 @@ class G1RemSetScanState : public CHeapObj<mtGC> {
     void merge(const G1DirtyRegions* other) {
       for (uint i = 0; i < other->size(); i++) {
         uint region = other->at(i);
-        if (!_contains[region]) {
-          _buffer[_cur_idx++] = region;
-          _contains[region] = true;
+        if (!_contains[region].load_relaxed()) {
+          uint cur = _cur_idx.load_relaxed();
+          _buffer[cur] = region;
+          _cur_idx.store_relaxed(cur + 1);
+          _contains[region].store_relaxed(true);
         }
       }
     }
@@ -173,7 +177,7 @@ class G1RemSetScanState : public CHeapObj<mtGC> {
 class G1ClearCardTableTask : public G1AbstractSubTask {
     G1CollectedHeap* _g1h;
     G1DirtyRegions* _regions;
-    uint volatile _cur_dirty_regions;
+    Atomic<uint> _cur_dirty_regions;
 
     G1RemSetScanState* _scan_state;
 
@@ -210,8 +214,9 @@ class G1ClearCardTableTask : public G1AbstractSubTask {
     void do_work(uint worker_id) override {
       const uint num_regions_per_worker = num_cards_per_worker / (uint)G1HeapRegion::CardsPerRegion;
 
-      while (_cur_dirty_regions < _regions->size()) {
-        uint next = AtomicAccess::fetch_then_add(&_cur_dirty_regions, num_regions_per_worker);
+      uint cur = _cur_dirty_regions.load_relaxed();
+      while (cur < _regions->size()) {
+        uint next = _cur_dirty_regions.fetch_then_add(num_regions_per_worker);
         uint max = MIN2(next + num_regions_per_worker, _regions->size());
 
         for (uint i = next; i < max; i++) {
@@ -226,6 +231,7 @@ class G1ClearCardTableTask : public G1AbstractSubTask {
           // old regions use it for old->collection set candidates, so they should not be cleared
           // either.
         }
+        cur = max;
       }
     }
   };
@@ -1115,7 +1121,7 @@ class G1MergeHeapRootsTask : public WorkerTask {
 
   bool _initial_evacuation;
 
-  volatile bool _fast_reclaim_handled;
+  Atomic<bool> _fast_reclaim_handled;
 
 public:
   G1MergeHeapRootsTask(G1RemSetScanState* scan_state, uint num_workers, bool initial_evacuation) :
@@ -1143,8 +1149,8 @@ public:
         // 1. eager-reclaim candidates
         if (_initial_evacuation &&
             g1h->has_humongous_reclaim_candidates() &&
-            !_fast_reclaim_handled &&
-            !AtomicAccess::cmpxchg(&_fast_reclaim_handled, false, true)) {
+            !_fast_reclaim_handled.load_relaxed() &&
+            _fast_reclaim_handled.compare_set(false, true)) {
 
           G1GCParPhaseTimesTracker subphase_x(p, G1GCPhaseTimes::MergeER, worker_id);
 
diff --git a/src/hotspot/share/gc/g1/g1VMOperations.cpp b/src/hotspot/share/gc/g1/g1VMOperations.cpp
index 1c024f2943b..56ab3a4b0fe 100644
--- a/src/hotspot/share/gc/g1/g1VMOperations.cpp
+++ b/src/hotspot/share/gc/g1/g1VMOperations.cpp
@@ -85,7 +85,7 @@ void VM_G1TryInitiateConcMark::doit() {
   GCCauseSetter x(g1h, _gc_cause);
 
   _mark_in_progress = g1h->collector_state()->mark_in_progress();
-  _cycle_already_in_progress = g1h->concurrent_mark()->cm_thread()->in_progress();
+  _cycle_already_in_progress = g1h->concurrent_mark()->in_progress();
 
   if (!g1h->policy()->force_concurrent_start_if_outside_cycle(_gc_cause)) {
     // Failure to force the next GC pause to be a concurrent start indicates
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index fa5c617f1db..a9db9a7c269 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
 #include "gc/g1/g1EvacFailureRegions.inline.hpp"
 #include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
+#include "gc/g1/g1HeapRegion.inline.hpp"
 #include "gc/g1/g1HeapRegionPrinter.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "gc/g1/g1ParScanThreadState.inline.hpp"
@@ -58,6 +59,7 @@
 #include "gc/shared/workerThread.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "memory/resourceArea.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/threads.hpp"
 #include "utilities/ticks.hpp"
 
@@ -459,8 +461,8 @@ class G1PrepareEvacuationTask : public WorkerTask {
 
   G1CollectedHeap* _g1h;
   G1HeapRegionClaimer _claimer;
-  volatile uint _humongous_total;
-  volatile uint _humongous_candidates;
+  Atomic<uint> _humongous_total;
+  Atomic<uint> _humongous_candidates;
 
   G1MonotonicArenaMemoryStats _all_card_set_stats;
 
@@ -481,19 +483,19 @@ public:
   }
 
   void add_humongous_candidates(uint candidates) {
-    AtomicAccess::add(&_humongous_candidates, candidates);
+    _humongous_candidates.add_then_fetch(candidates);
   }
 
   void add_humongous_total(uint total) {
-    AtomicAccess::add(&_humongous_total, total);
+    _humongous_total.add_then_fetch(total);
   }
 
   uint humongous_candidates() {
-    return _humongous_candidates;
+    return _humongous_candidates.load_relaxed();
   }
 
   uint humongous_total() {
-    return _humongous_total;
+    return _humongous_total.load_relaxed();
   }
 
   const G1MonotonicArenaMemoryStats all_card_set_stats() const {
@@ -698,7 +700,7 @@ protected:
   virtual void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) = 0;
 
 private:
-  volatile bool _pinned_regions_recorded;
+  Atomic<bool> _pinned_regions_recorded;
 
 public:
   G1EvacuateRegionsBaseTask(const char* name,
@@ -722,7 +724,7 @@ public:
       G1ParScanThreadState* pss = _per_thread_states->state_for_worker(worker_id);
       pss->set_ref_discoverer(_g1h->ref_processor_stw());
 
-      if (!AtomicAccess::cmpxchg(&_pinned_regions_recorded, false, true)) {
+      if (_pinned_regions_recorded.compare_set(false, true)) {
         record_pinned_regions(pss, worker_id);
       }
       scan_roots(pss, worker_id);
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index ec5d2393d8c..a0013d27172 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -24,6 +24,7 @@
 
 
 #include "compiler/oopMap.hpp"
+#include "cppstdlib/new.hpp"
 #include "gc/g1/g1CardSetMemory.hpp"
 #include "gc/g1/g1CardTableEntryClosure.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
@@ -46,6 +47,7 @@
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.hpp"
@@ -496,10 +498,6 @@ class G1PostEvacuateCollectionSetCleanupTask2::ProcessEvacuationFailedRegionsTas
       G1CollectedHeap* g1h = G1CollectedHeap::heap();
       G1ConcurrentMark* cm = g1h->concurrent_mark();
 
-      HeapWord* top_at_mark_start = cm->top_at_mark_start(r);
-      assert(top_at_mark_start == r->bottom(), "TAMS must not have been set for region %u", r->hrm_index());
-      assert(cm->live_bytes(r->hrm_index()) == 0, "Marking live bytes must not be set for region %u", r->hrm_index());
-
       // Concurrent mark does not mark through regions that we retain (they are root
       // regions wrt to marking), so we must clear their mark data (tams, bitmap, ...)
       // set eagerly or during evacuation failure.
@@ -759,7 +757,7 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1
   const size_t*       _surviving_young_words;
   uint                _active_workers;
   G1EvacFailureRegions* _evac_failure_regions;
-  volatile uint       _num_retained_regions;
+  Atomic<uint>        _num_retained_regions;
 
   FreeCSetStats* worker_stats(uint worker) {
     return &_worker_stats[worker];
@@ -794,7 +792,7 @@ public:
   virtual ~FreeCollectionSetTask() {
     Ticks serial_time = Ticks::now();
 
-    bool has_new_retained_regions = AtomicAccess::load(&_num_retained_regions) != 0;
+    bool has_new_retained_regions = _num_retained_regions.load_relaxed() != 0;
     if (has_new_retained_regions) {
       G1CollectionSetCandidates* candidates = _g1h->collection_set()->candidates();
       candidates->sort_by_efficiency();
@@ -817,9 +815,7 @@ public:
   void set_max_workers(uint max_workers) override {
     _active_workers = max_workers;
     _worker_stats = NEW_C_HEAP_ARRAY(FreeCSetStats, max_workers, mtGC);
-    for (uint worker = 0; worker < _active_workers; worker++) {
-      ::new (&_worker_stats[worker]) FreeCSetStats();
-    }
+    ::new (_worker_stats) FreeCSetStats[_active_workers]{};
     _claimer.set_n_workers(_active_workers);
   }
 
@@ -829,7 +825,7 @@ public:
     // Report per-region type timings.
     cl.report_timing();
 
-    AtomicAccess::add(&_num_retained_regions, cl.num_retained_regions(), memory_order_relaxed);
+    _num_retained_regions.add_then_fetch(cl.num_retained_regions(), memory_order_relaxed);
   }
 };
 
@@ -853,7 +849,7 @@ public:
 
       void do_thread(Thread* thread) {
         if (UseTLAB && ResizeTLAB) {
-          static_cast<JavaThread*>(thread)->tlab().resize();
+          thread->tlab().resize();
         }
 
         G1BarrierSet::g1_barrier_set()->update_card_table_base(thread);
diff --git a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
index b11213ddeb3..936457659b6 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
+#include "cppstdlib/new.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1ConcurrentRefineStats.hpp"
 #include "gc/g1/g1RegionPinCache.inline.hpp"
 #include "gc/g1/g1ThreadLocalData.hpp"
 #include "gc/g1/g1YoungGCPreEvacuateTasks.hpp"
@@ -90,10 +90,7 @@ public:
   void set_max_workers(uint max_workers) override {
     _num_workers = max_workers;
     _local_tlab_stats = NEW_C_HEAP_ARRAY(ThreadLocalAllocStats, _num_workers, mtGC);
-
-    for (uint i = 0; i < _num_workers; i++) {
-      ::new (&_local_tlab_stats[i]) ThreadLocalAllocStats();
-    }
+    ::new (_local_tlab_stats) ThreadLocalAllocStats[_num_workers]{};
   }
 
   ThreadLocalAllocStats tlab_stats() const {
diff --git a/src/hotspot/share/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
index 21c86d47a6b..af236ec8581 100644
--- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp
+++ b/src/hotspot/share/gc/g1/vmStructs_g1.hpp
@@ -28,6 +28,7 @@
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
 #include "gc/g1/g1HeapRegionManager.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/macros.hpp"
 
 #define VM_STRUCTS_G1GC(nonstatic_field,                                      \
@@ -39,9 +40,9 @@
                                                                               \
   nonstatic_field(G1HeapRegion, _type,           G1HeapRegionType)            \
   nonstatic_field(G1HeapRegion, _bottom,         HeapWord* const)             \
-  nonstatic_field(G1HeapRegion, _top,            HeapWord* volatile)          \
+  nonstatic_field(G1HeapRegion, _top,            Atomic<HeapWord*>)           \
   nonstatic_field(G1HeapRegion, _end,            HeapWord* const)             \
-  volatile_nonstatic_field(G1HeapRegion, _pinned_object_count, size_t)        \
+  volatile_nonstatic_field(G1HeapRegion, _pinned_object_count, Atomic<size_t>)\
                                                                               \
   nonstatic_field(G1HeapRegionType, _tag,   G1HeapRegionType::Tag volatile)   \
                                                                               \
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index e0b1edf2efc..c5d112ffbc1 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/typeArrayOop.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.inline.hpp"
@@ -489,7 +489,7 @@ HeapWord* MutableNUMASpace::cas_allocate(size_t size) {
   if (p != nullptr) {
     HeapWord* cur_top, *cur_chunk_top = p + size;
     while ((cur_top = top()) < cur_chunk_top) { // Keep _top updated.
-      if (AtomicAccess::cmpxchg(top_addr(), cur_top, cur_chunk_top) == cur_top) {
+      if (top_addr()->compare_set(cur_top, cur_chunk_top)) {
         break;
       }
     }
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index fc42fc1eab2..d99db493989 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
@@ -123,7 +122,7 @@ void MutableSpace::initialize(MemRegion mr,
   // makes the new space available for allocation by other threads.  So this
   // assignment must follow all other configuration and initialization that
   // might be done for expansion.
-  AtomicAccess::release_store(end_addr(), mr.end());
+  _end.release_store(mr.end());
 
   if (clear_space) {
     clear(mangle_space);
@@ -140,7 +139,7 @@ void MutableSpace::clear(bool mangle_space) {
 #ifndef PRODUCT
 
 void MutableSpace::mangle_unused_area() {
-  mangle_region(MemRegion(_top, _end));
+  mangle_region(MemRegion(top(), end()));
 }
 
 void MutableSpace::mangle_region(MemRegion mr) {
@@ -155,14 +154,10 @@ HeapWord* MutableSpace::cas_allocate(size_t size) {
     // If end is read first, other threads may advance end and top such that
     // current top > old end and current top + size > current end.  Then
     // pointer_delta underflows, allowing installation of top > current end.
-    HeapWord* obj = AtomicAccess::load_acquire(top_addr());
+    HeapWord* obj = _top.load_acquire();
     if (pointer_delta(end(), obj) >= size) {
       HeapWord* new_top = obj + size;
-      HeapWord* result = AtomicAccess::cmpxchg(top_addr(), obj, new_top);
-      // result can be one of two:
-      //  the old top value: the exchange succeeded
-      //  otherwise: the new value of the top is returned.
-      if (result != obj) {
+      if (!_top.compare_set(obj, new_top)) {
         continue; // another thread beat us to the allocation, try again
       }
       assert(is_object_aligned(obj) && is_object_aligned(new_top),
@@ -177,7 +172,7 @@ HeapWord* MutableSpace::cas_allocate(size_t size) {
 // Try to deallocate previous allocation. Returns true upon success.
 bool MutableSpace::cas_deallocate(HeapWord *obj, size_t size) {
   HeapWord* expected_top = obj + size;
-  return AtomicAccess::cmpxchg(top_addr(), expected_top, obj) == expected_top;
+  return _top.compare_set(expected_top, obj);
 }
 
 void MutableSpace::oop_iterate(OopIterateClosure* cl) {
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index 9d3894e2489..28df19a7c4b 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
 #include "memory/memRegion.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -53,8 +54,8 @@ class MutableSpace: public CHeapObj<mtGC> {
   MemRegion _last_setup_region;
   size_t _page_size;
   HeapWord* _bottom;
-  HeapWord* volatile _top;
-  HeapWord* _end;
+  Atomic<HeapWord*> _top;
+  Atomic<HeapWord*> _end;
 
   void numa_setup_pages(MemRegion mr, bool clear_space);
 
@@ -64,21 +65,20 @@ class MutableSpace: public CHeapObj<mtGC> {
 protected:
   size_t page_size() const                 { return _page_size;         }
 
+  Atomic<HeapWord*>* top_addr()            { return &_top;              }
+
 public:
   virtual ~MutableSpace() = default;
   MutableSpace(size_t page_size);
 
   // Accessors
   HeapWord* bottom() const                 { return _bottom; }
-  HeapWord* top() const                    { return _top;    }
-  HeapWord* end() const                    { return _end; }
+  HeapWord* top() const                    { return _top.load_relaxed(); }
+  HeapWord* end() const                    { return _end.load_relaxed(); }
 
   void set_bottom(HeapWord* value)         { _bottom = value; }
-  virtual void set_top(HeapWord* value)    { _top = value;   }
-  void set_end(HeapWord* value)            { _end = value; }
-
-  HeapWord* volatile* top_addr()           { return &_top; }
-  HeapWord** end_addr()                    { return &_end; }
+  virtual void set_top(HeapWord* value)    { _top.store_relaxed(value); }
+  void set_end(HeapWord* value)            { _end.store_relaxed(value); }
 
   MemRegion region() const { return MemRegion(bottom(), end()); }
 
@@ -110,7 +110,7 @@ public:
   // Boolean queries.
   bool is_empty() const              { return used_in_words() == 0; }
   bool not_empty() const             { return used_in_words() > 0; }
-  bool contains(const void* p) const { return _bottom <= p && p < _end; }
+  bool contains(const void* p) const { return _bottom <= p && p < end(); }
 
   // Size computations.  Sizes are in bytes.
   size_t used_in_bytes() const                { return used_in_words() * HeapWordSize; }
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
index c613c8615f0..bbd6669df8d 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 #include "memory/memoryReserver.hpp"
 #include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
diff --git a/src/hotspot/share/gc/parallel/parallelArguments.cpp b/src/hotspot/share/gc/parallel/parallelArguments.cpp
index be9673224f5..a856078edab 100644
--- a/src/hotspot/share/gc/parallel/parallelArguments.cpp
+++ b/src/hotspot/share/gc/parallel/parallelArguments.cpp
@@ -128,10 +128,6 @@ void ParallelArguments::initialize() {
     }
   }
 
-  if (FLAG_IS_DEFAULT(ParallelRefProcEnabled) && ParallelGCThreads > 1) {
-    FLAG_SET_DEFAULT(ParallelRefProcEnabled, true);
-  }
-
   FullGCForwarding::initialize_flags(heap_reserved_size_bytes());
 }
 
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 0d8a3166f79..f49419595e1 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
 #include "memory/reservedSpace.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/cpuTimeCounters.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"
@@ -438,7 +439,7 @@ bool ParallelScavengeHeap::check_gc_overhead_limit() {
     log_debug(gc)("GC Overhead Limit: GC Time %f Free Space Young %f Old %f Counter %zu",
                   (100 - _size_policy->mutator_time_percent()),
                   percent_of(_young_gen->free_in_bytes(), _young_gen->capacity_in_bytes()),
-                  percent_of(_old_gen->free_in_bytes(), _young_gen->capacity_in_bytes()),
+                  percent_of(_old_gen->free_in_bytes(), _old_gen->capacity_in_bytes()),
                   _gc_overhead_counter);
 
     if (little_mutator_time && little_free_space) {
@@ -594,7 +595,7 @@ void ParallelScavengeHeap::object_iterate(ObjectClosure* cl) {
 // these spaces.
 // The old space is divided into fixed-size blocks.
 class HeapBlockClaimer : public StackObj {
-  size_t _claimed_index;
+  Atomic<size_t> _claimed_index;
 
 public:
   static const size_t InvalidIndex = SIZE_MAX;
@@ -606,7 +607,7 @@ public:
   // Claim the block and get the block index.
   size_t claim_and_get_block() {
     size_t block_index;
-    block_index = AtomicAccess::fetch_then_add(&_claimed_index, 1u);
+    block_index = _claimed_index.fetch_then_add(1u);
 
     PSOldGen* old_gen = ParallelScavengeHeap::heap()->old_gen();
     size_t num_claims = old_gen->num_iterable_blocks() + NumNonOldGenClaims;
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
index f257f4c9177..0f00b3ec2f9 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
@@ -30,8 +30,11 @@
 #include "gc/parallel/psScavenge.hpp"
 
 inline bool ParallelScavengeHeap::should_alloc_in_eden(const size_t size) const {
-  const size_t eden_size = young_gen()->eden_space()->capacity_in_words();
-  return size < eden_size / 2;
+  const size_t max_young_gen_bytes = young_gen()->max_gen_size();
+  const size_t survivor_size_bytes = young_gen()->from_space()->capacity_in_bytes();
+  const size_t max_eden_size_bytes = max_young_gen_bytes - survivor_size_bytes * 2;
+  const size_t max_eden_size_words = max_eden_size_bytes / HeapWordSize;
+  return size < max_eden_size_words / 2;
 }
 
 inline bool ParallelScavengeHeap::is_in_young(const void* p) const {
diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
index 7515031f01f..ff7a0aee088 100644
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "gc/shared/gcPolicyCounters.hpp"
 #include "gc/shared/gcUtil.hpp"
 #include "logging/log.hpp"
+#include "runtime/atomicAccess.hpp"
 #include "runtime/timer.hpp"
 #include "utilities/align.hpp"
 
diff --git a/src/hotspot/share/gc/parallel/psCardTable.cpp b/src/hotspot/share/gc/parallel/psCardTable.cpp
index fcd0dd67a45..6429766309a 100644
--- a/src/hotspot/share/gc/parallel/psCardTable.cpp
+++ b/src/hotspot/share/gc/parallel/psCardTable.cpp
@@ -108,7 +108,7 @@ void PSCardTable::scan_obj_with_limit(PSPromotionManager* pm,
 }
 
 void PSCardTable::pre_scavenge(uint active_workers) {
-  _preprocessing_active_workers = active_workers;
+  _preprocessing_active_workers.store_relaxed(active_workers);
 }
 
 // The "shadow" table is a copy of the card table entries of the current stripe.
@@ -382,9 +382,9 @@ void PSCardTable::scavenge_contents_parallel(ObjectStartArray* start_array,
   preprocess_card_table_parallel(object_start, old_gen_bottom, old_gen_top, stripe_index, n_stripes);
 
   // Sync with other workers.
-  AtomicAccess::dec(&_preprocessing_active_workers);
+  _preprocessing_active_workers.sub_then_fetch(1);
   SpinYield spin_yield;
-  while (AtomicAccess::load_acquire(&_preprocessing_active_workers) > 0) {
+  while (_preprocessing_active_workers.load_acquire() > 0) {
     spin_yield.wait();
   }
 
diff --git a/src/hotspot/share/gc/parallel/psCardTable.hpp b/src/hotspot/share/gc/parallel/psCardTable.hpp
index 70c32d23b7f..033933bcbf1 100644
--- a/src/hotspot/share/gc/parallel/psCardTable.hpp
+++ b/src/hotspot/share/gc/parallel/psCardTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "gc/shared/cardTable.hpp"
 #include "oops/oop.hpp"
+#include "runtime/atomic.hpp"
 
 class MutableSpace;
 class ObjectStartArray;
@@ -37,7 +38,7 @@ class PSCardTable: public CardTable {
   static constexpr size_t num_cards_in_stripe = 128;
   static_assert(num_cards_in_stripe >= 1, "progress");
 
-  volatile int _preprocessing_active_workers;
+  Atomic<int> _preprocessing_active_workers;
 
   bool is_dirty(CardValue* card) {
     return !is_clean(card);
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 974cd6aca59..6a9f8bfeedc 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -30,6 +30,7 @@
 #include "gc/parallel/psOldGen.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/gcLocker.hpp"
+#include "gc/shared/hSpaceCounters.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
@@ -113,9 +114,11 @@ void PSOldGen::initialize_performance_counters() {
   const char* perf_data_name = "old";
   _gen_counters = new GenerationCounters(perf_data_name, 1, 1, min_gen_size(),
                                          max_gen_size(), virtual_space()->committed_size());
-  _space_counters = new SpaceCounters(perf_data_name, 0,
-                                      virtual_space()->reserved_size(),
-                                      _object_space, _gen_counters);
+  _space_counters = new HSpaceCounters(_gen_counters->name_space(),
+                                       perf_data_name,
+                                       0,
+                                       virtual_space()->reserved_size(),
+                                       _object_space->capacity_in_bytes());
 }
 
 HeapWord* PSOldGen::expand_and_allocate(size_t word_size) {
@@ -266,7 +269,7 @@ bool PSOldGen::expand_by(size_t bytes) {
     }
     post_resize();
     if (UsePerfData) {
-      _space_counters->update_capacity();
+      _space_counters->update_capacity(_object_space->capacity_in_bytes());
       _gen_counters->update_capacity(_virtual_space->committed_size());
     }
   }
@@ -394,7 +397,7 @@ void PSOldGen::print_on(outputStream* st) const {
 
 void PSOldGen::update_counters() {
   if (UsePerfData) {
-    _space_counters->update_all();
+    _space_counters->update_all(_object_space->capacity_in_bytes(), _object_space->used_in_bytes());
     _gen_counters->update_capacity(_virtual_space->committed_size());
   }
 }
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index 05359b12836..7e3975036d4 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -28,7 +28,8 @@
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
-#include "gc/parallel/spaceCounters.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/hSpaceCounters.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
 
@@ -43,7 +44,7 @@ class PSOldGen : public CHeapObj<mtGC> {
 
   // Performance Counters
   GenerationCounters*      _gen_counters;
-  SpaceCounters*           _space_counters;
+  HSpaceCounters*          _space_counters;
 
   // Sizing information, in bytes, set in constructor
   const size_t _min_gen_size;
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index b1b07b4bc5c..d03bc3cda45 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "code/codeCache.hpp"
 #include "code/nmethod.hpp"
 #include "compiler/oopMap.hpp"
+#include "cppstdlib/new.hpp"
 #include "gc/parallel/objectStartArray.inline.hpp"
 #include "gc/parallel/parallelArguments.hpp"
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"
@@ -44,6 +45,7 @@
 #include "gc/parallel/psStringDedup.hpp"
 #include "gc/parallel/psYoungGen.hpp"
 #include "gc/shared/classUnloadingContext.hpp"
+#include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/fullGCForwarding.inline.hpp"
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
@@ -82,7 +84,6 @@
 #include "oops/methodData.hpp"
 #include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/safepoint.hpp"
@@ -134,8 +135,8 @@ bool ParallelCompactData::RegionData::is_clear() {
          (_source_region == 0) &&
          (_partial_obj_addr == nullptr) &&
          (_partial_obj_size == 0) &&
-         (_dc_and_los == 0) &&
-         (_shadow_state == 0);
+         (dc_and_los() == 0) &&
+         (shadow_state() == 0);
 }
 
 #ifdef ASSERT
@@ -144,8 +145,8 @@ void ParallelCompactData::RegionData::verify_clear() {
   assert(_source_region == 0, "inv");
   assert(_partial_obj_addr == nullptr, "inv");
   assert(_partial_obj_size == 0, "inv");
-  assert(_dc_and_los == 0, "inv");
-  assert(_shadow_state == 0, "inv");
+  assert(dc_and_los() == 0, "inv");
+  assert(shadow_state() == 0, "inv");
 }
 #endif
 
@@ -295,7 +296,9 @@ void ParallelCompactData::clear_range(size_t beg_region, size_t end_region) {
   assert(end_region <= _region_count, "end_region out of range");
 
   const size_t region_cnt = end_region - beg_region;
-  memset(_region_data + beg_region, 0, region_cnt * sizeof(RegionData));
+  for (size_t i = beg_region; i < end_region; i++) {
+    ::new (&_region_data[i]) RegionData{};
+  }
 }
 
 // The total live words on src_region would overflow the target space, so find
@@ -932,6 +935,17 @@ void PSParallelCompact::summary_phase(bool should_do_max_compaction)
   }
 }
 
+void PSParallelCompact::report_object_count_after_gc() {
+  GCTraceTime(Debug, gc, phases) tm("Report Object Count", &_gc_timer);
+  // The heap is compacted, all objects are iterable. However there may be
+  // filler objects in the heap which we should ignore.
+  class SkipFillerObjectClosure : public BoolObjectClosure {
+  public:
+    bool do_object_b(oop obj) override { return !CollectedHeap::is_filler_object(obj); }
+  } cl;
+  _gc_tracer.report_object_count_after_gc(&cl, &ParallelScavengeHeap::heap()->workers());
+}
+
 bool PSParallelCompact::invoke(bool clear_all_soft_refs, bool should_do_max_compaction) {
   assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
   assert(Thread::current() == (Thread*)VMThread::vm_thread(),
@@ -1027,6 +1041,8 @@ bool PSParallelCompact::invoke(bool clear_all_soft_refs, bool should_do_max_comp
 
     heap->print_heap_change(pre_gc_values);
 
+    report_object_count_after_gc();
+
     // Track memory usage and detect low memory
     MemoryService::track_memory_usage();
     heap->update_counters();
@@ -1274,17 +1290,13 @@ void PSParallelCompact::marking_phase(ParallelOldTracer *gc_tracer) {
     }
   }
 
-  {
-    GCTraceTime(Debug, gc, phases) tm("Report Object Count", &_gc_timer);
-    _gc_tracer.report_object_count_after_gc(is_alive_closure(), &ParallelScavengeHeap::heap()->workers());
-  }
 #if TASKQUEUE_STATS
   ParCompactionManager::print_and_reset_taskqueue_stats();
 #endif
 }
 
 template<typename Func>
-void PSParallelCompact::adjust_in_space_helper(SpaceId id, volatile uint* claim_counter, Func&& on_stripe) {
+void PSParallelCompact::adjust_in_space_helper(SpaceId id, Atomic<uint>* claim_counter, Func&& on_stripe) {
   MutableSpace* sp = PSParallelCompact::space(id);
   HeapWord* const bottom = sp->bottom();
   HeapWord* const top = sp->top();
@@ -1297,7 +1309,7 @@ void PSParallelCompact::adjust_in_space_helper(SpaceId id, volatile uint* claim_
   const size_t stripe_size = num_regions_per_stripe * region_size;
 
   while (true) {
-    uint counter = AtomicAccess::fetch_then_add(claim_counter, num_regions_per_stripe);
+    uint counter = claim_counter->fetch_then_add(num_regions_per_stripe);
     HeapWord* cur_stripe = bottom + counter * region_size;
     if (cur_stripe >= top) {
       break;
@@ -1307,7 +1319,7 @@ void PSParallelCompact::adjust_in_space_helper(SpaceId id, volatile uint* claim_
   }
 }
 
-void PSParallelCompact::adjust_in_old_space(volatile uint* claim_counter) {
+void PSParallelCompact::adjust_in_old_space(Atomic<uint>* claim_counter) {
   // Regions in old-space shouldn't be split.
   assert(!_space_info[old_space_id].split_info().is_valid(), "inv");
 
@@ -1338,7 +1350,7 @@ void PSParallelCompact::adjust_in_old_space(volatile uint* claim_counter) {
   });
 }
 
-void PSParallelCompact::adjust_in_young_space(SpaceId id, volatile uint* claim_counter) {
+void PSParallelCompact::adjust_in_young_space(SpaceId id, Atomic<uint>* claim_counter) {
   adjust_in_space_helper(id, claim_counter, [](HeapWord* stripe_start, HeapWord* stripe_end) {
     HeapWord* obj_start = stripe_start;
     while (obj_start < stripe_end) {
@@ -1352,7 +1364,7 @@ void PSParallelCompact::adjust_in_young_space(SpaceId id, volatile uint* claim_c
   });
 }
 
-void PSParallelCompact::adjust_pointers_in_spaces(uint worker_id, volatile uint* claim_counters) {
+void PSParallelCompact::adjust_pointers_in_spaces(uint worker_id, Atomic<uint>* claim_counters) {
   auto start_time = Ticks::now();
   adjust_in_old_space(&claim_counters[0]);
   for (uint id = eden_space_id; id < last_space_id; ++id) {
@@ -1366,12 +1378,12 @@ class PSAdjustTask final : public WorkerTask {
   WeakProcessor::Task                        _weak_proc_task;
   OopStorageSetStrongParState<false, false>  _oop_storage_iter;
   uint                                       _nworkers;
-  volatile bool                              _code_cache_claimed;
-  volatile uint _claim_counters[PSParallelCompact::last_space_id] = {};
+  Atomic<bool>                               _code_cache_claimed;
+  Atomic<uint> _claim_counters[PSParallelCompact::last_space_id];
 
   bool try_claim_code_cache_task() {
-    return AtomicAccess::load(&_code_cache_claimed) == false
-        && AtomicAccess::cmpxchg(&_code_cache_claimed, false, true) == false;
+    return _code_cache_claimed.load_relaxed() == false
+        && _code_cache_claimed.compare_set(false, true);
   }
 
 public:
@@ -1383,6 +1395,9 @@ public:
     _nworkers(nworkers),
     _code_cache_claimed(false) {
 
+    for (unsigned int i = PSParallelCompact::old_space_id; i < PSParallelCompact::last_space_id; ++i) {
+      ::new (&_claim_counters[i]) Atomic<uint>{};
+    }
     ClassLoaderDataGraph::verify_claimed_marks_cleared(ClassLoaderData::_claim_stw_fullgc_adjust);
   }
 
@@ -1835,8 +1850,7 @@ void PSParallelCompact::verify_filler_in_dense_prefix() {
       oop obj = cast_to_oop(cur_addr);
       oopDesc::verify(obj);
       if (!mark_bitmap()->is_marked(cur_addr)) {
-        Klass* k = cast_to_oop(cur_addr)->klass();
-        assert(k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass(), "inv");
+        assert(CollectedHeap::is_filler_object(cast_to_oop(cur_addr)), "inv");
       }
       cur_addr += obj->size();
     }
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 2297d720b35..f5ab041fa97 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "oops/oop.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 
 class ParallelScavengeHeap;
@@ -236,7 +236,7 @@ public:
     // in this region (words).  This does not include the partial object
     // extending onto the region (if any), or the part of an object that extends
     // onto the next region (if any).
-    size_t live_obj_size() const { return _dc_and_los & los_mask; }
+    size_t live_obj_size() const { return dc_and_los() & los_mask; }
 
     // Total live data that lies within the region (words).
     size_t data_size() const { return partial_obj_size() + live_obj_size(); }
@@ -268,9 +268,9 @@ public:
     // Minor subtlety:  claimed() returns true if the region is marked
     // completed(), which is desirable since a region must be claimed before it
     // can be completed.
-    bool available() const { return _dc_and_los < dc_one; }
-    bool claimed()   const { return _dc_and_los >= dc_claimed; }
-    bool completed() const { return _dc_and_los >= dc_completed; }
+    bool available() const { return dc_and_los() < dc_one; }
+    bool claimed()   const { return dc_and_los() >= dc_claimed; }
+    bool completed() const { return dc_and_los() >= dc_completed; }
 
     // These are not atomic.
     void set_destination(HeapWord* addr)       { _destination = addr; }
@@ -315,7 +315,7 @@ public:
     // Return to the normal path here
     inline void shadow_to_normal();
 
-    int shadow_state() { return _shadow_state; }
+    int shadow_state() { return _shadow_state.load_relaxed(); }
 
     bool is_clear();
 
@@ -339,9 +339,10 @@ public:
     size_t               _source_region;
     HeapWord*            _partial_obj_addr;
     region_sz_t          _partial_obj_size;
-    region_sz_t volatile _dc_and_los;
-    int         volatile _shadow_state;
+    Atomic<region_sz_t>  _dc_and_los;
+    Atomic<int>          _shadow_state;
 
+    region_sz_t dc_and_los() const { return _dc_and_los.load_relaxed(); }
 #ifdef ASSERT
    public:
     uint                 _pushed;   // 0 until region is pushed onto a stack
@@ -411,7 +412,7 @@ private:
 inline uint
 ParallelCompactData::RegionData::destination_count_raw() const
 {
-  return _dc_and_los & dc_mask;
+  return dc_and_los() & dc_mask;
 }
 
 inline uint
@@ -425,26 +426,26 @@ ParallelCompactData::RegionData::set_destination_count(uint count)
 {
   assert(count <= (dc_completed >> dc_shift), "count too large");
   const region_sz_t live_sz = (region_sz_t) live_obj_size();
-  _dc_and_los = (count << dc_shift) | live_sz;
+  _dc_and_los.store_relaxed((count << dc_shift) | live_sz);
 }
 
 inline void ParallelCompactData::RegionData::set_live_obj_size(size_t words)
 {
   assert(words <= los_mask, "would overflow");
-  _dc_and_los = destination_count_raw() | (region_sz_t)words;
+  _dc_and_los.store_relaxed(destination_count_raw() | (region_sz_t)words);
 }
 
 inline void ParallelCompactData::RegionData::decrement_destination_count()
 {
-  assert(_dc_and_los < dc_claimed, "already claimed");
-  assert(_dc_and_los >= dc_one, "count would go negative");
-  AtomicAccess::add(&_dc_and_los, dc_mask);
+  assert(dc_and_los() < dc_claimed, "already claimed");
+  assert(dc_and_los() >= dc_one, "count would go negative");
+  _dc_and_los.add_then_fetch(dc_mask);
 }
 
 inline void ParallelCompactData::RegionData::set_completed()
 {
   assert(claimed(), "must be claimed first");
-  _dc_and_los = dc_completed | (region_sz_t) live_obj_size();
+  _dc_and_los.store_relaxed(dc_completed | (region_sz_t) live_obj_size());
 }
 
 // MT-unsafe claiming of a region.  Should only be used during single threaded
@@ -452,7 +453,7 @@ inline void ParallelCompactData::RegionData::set_completed()
 inline bool ParallelCompactData::RegionData::claim_unsafe()
 {
   if (available()) {
-    _dc_and_los |= dc_claimed;
+    _dc_and_los.store_relaxed(dc_and_los() | dc_claimed);
     return true;
   }
   return false;
@@ -461,36 +462,35 @@ inline bool ParallelCompactData::RegionData::claim_unsafe()
 inline void ParallelCompactData::RegionData::add_live_obj(size_t words)
 {
   assert(words <= (size_t)los_mask - live_obj_size(), "overflow");
-  AtomicAccess::add(&_dc_and_los, static_cast<region_sz_t>(words));
+  _dc_and_los.add_then_fetch(static_cast<region_sz_t>(words));
 }
 
 inline bool ParallelCompactData::RegionData::claim()
 {
   const region_sz_t los = static_cast<region_sz_t>(live_obj_size());
-  const region_sz_t old = AtomicAccess::cmpxchg(&_dc_and_los, los, dc_claimed | los);
-  return old == los;
+  return _dc_and_los.compare_set(los, dc_claimed | los);
 }
 
 inline bool ParallelCompactData::RegionData::mark_normal() {
-  return AtomicAccess::cmpxchg(&_shadow_state, UnusedRegion, NormalRegion) == UnusedRegion;
+  return _shadow_state.compare_set(UnusedRegion, NormalRegion);
 }
 
 inline bool ParallelCompactData::RegionData::mark_shadow() {
-  if (_shadow_state != UnusedRegion) return false;
-  return AtomicAccess::cmpxchg(&_shadow_state, UnusedRegion, ShadowRegion) == UnusedRegion;
+  if (shadow_state() != UnusedRegion) return false;
+  return _shadow_state.compare_set(UnusedRegion, ShadowRegion);
 }
 
 inline void ParallelCompactData::RegionData::mark_filled() {
-  int old = AtomicAccess::cmpxchg(&_shadow_state, ShadowRegion, FilledShadow);
+  int old = _shadow_state.compare_exchange(ShadowRegion, FilledShadow);
   assert(old == ShadowRegion, "Fail to mark the region as filled");
 }
 
 inline bool ParallelCompactData::RegionData::mark_copied() {
-  return AtomicAccess::cmpxchg(&_shadow_state, FilledShadow, CopiedShadow) == FilledShadow;
+  return _shadow_state.compare_set(FilledShadow, CopiedShadow);
 }
 
 void ParallelCompactData::RegionData::shadow_to_normal() {
-  int old = AtomicAccess::cmpxchg(&_shadow_state, ShadowRegion, NormalRegion);
+  int old = _shadow_state.compare_exchange(ShadowRegion, NormalRegion);
   assert(old == ShadowRegion, "Fail to mark the region as finish");
 }
 
@@ -749,6 +749,7 @@ private:
   // Move objects to new locations.
   static void compact();
 
+  static void report_object_count_after_gc();
   // Add available regions to the stack and draining tasks to the task queue.
   static void prepare_region_draining_tasks(uint parallel_gc_threads);
 
@@ -763,13 +764,13 @@ public:
   static bool invoke(bool clear_all_soft_refs, bool should_do_max_compaction);
 
   template<typename Func>
-  static void adjust_in_space_helper(SpaceId id, volatile uint* claim_counter, Func&& on_stripe);
+  static void adjust_in_space_helper(SpaceId id, Atomic<uint>* claim_counter, Func&& on_stripe);
 
-  static void adjust_in_old_space(volatile uint* claim_counter);
+  static void adjust_in_old_space(Atomic<uint>* claim_counter);
 
-  static void adjust_in_young_space(SpaceId id, volatile uint* claim_counter);
+  static void adjust_in_young_space(SpaceId id, Atomic<uint>* claim_counter);
 
-  static void adjust_pointers_in_spaces(uint worker_id, volatile uint* claim_counter);
+  static void adjust_pointers_in_spaces(uint worker_id, Atomic<uint>* claim_counter);
 
   static void post_initialize();
   // Perform initialization for PSParallelCompact that requires
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
index a41a9403082..d6208755374 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
@@ -43,6 +43,7 @@
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
+#include "oops/oopsHierarchy.hpp"
 #include "utilities/checkedCast.hpp"
 
 PaddedEnd<PSPromotionManager>* PSPromotionManager::_manager_array = nullptr;
@@ -248,30 +249,19 @@ void PSPromotionManager::flush_labs() {
   }
 }
 
-template <class T>
-void PSPromotionManager::process_array_chunk_work(oop obj, int start, int end) {
-  assert(start <= end, "invariant");
-  T* const base      = (T*)objArrayOop(obj)->base();
-  T* p               = base + start;
-  T* const chunk_end = base + end;
-  while (p < chunk_end) {
-    claim_or_forward_depth(p);
-    ++p;
-  }
+void PSPromotionManager::process_array_chunk(objArrayOop obj, size_t start, size_t end) {
+  PSPushContentsClosure pcc(this);
+  obj->oop_iterate_elements_range(&pcc,
+                                  checked_cast<int>(start),
+                                  checked_cast<int>(end));
 }
 
 void PSPromotionManager::process_array_chunk(PartialArrayState* state, bool stolen) {
   // Access before release by claim().
-  oop new_obj = state->destination();
+  objArrayOop to_array = objArrayOop(state->destination());
   PartialArraySplitter::Claim claim =
     _partial_array_splitter.claim(state, &_claimed_stack_depth, stolen);
-  int start = checked_cast<int>(claim._start);
-  int end = checked_cast<int>(claim._end);
-  if (UseCompressedOops) {
-    process_array_chunk_work<narrowOop>(new_obj, start, end);
-  } else {
-    process_array_chunk_work<oop>(new_obj, start, end);
-  }
+  process_array_chunk(to_array, claim._start, claim._end);
 }
 
 void PSPromotionManager::push_objArray(oop old_obj, oop new_obj) {
@@ -284,12 +274,8 @@ void PSPromotionManager::push_objArray(oop old_obj, oop new_obj) {
   size_t initial_chunk_size =
     // The source array is unused when processing states.
     _partial_array_splitter.start(&_claimed_stack_depth, nullptr, to_array, array_length);
-  int end = checked_cast<int>(initial_chunk_size);
-  if (UseCompressedOops) {
-    process_array_chunk_work<narrowOop>(to_array, 0, end);
-  } else {
-    process_array_chunk_work<oop>(to_array, 0, end);
-  }
+
+  process_array_chunk(to_array, 0, initial_chunk_size);
 }
 
 oop PSPromotionManager::oop_promotion_failed(oop obj, markWord obj_mark) {
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
index 44df708eea4..2b0fc56c0bf 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp
@@ -97,9 +97,8 @@ class PSPromotionManager {
 
   inline static PSPromotionManager* manager_array(uint index);
 
-  template <class T> void  process_array_chunk_work(oop obj,
-                                                    int start, int end);
   void process_array_chunk(PartialArrayState* state, bool stolen);
+  void process_array_chunk(objArrayOop obj, size_t start, size_t end);
   void push_objArray(oop old_obj, oop new_obj);
 
   inline void promotion_trace_event(oop new_obj, Klass* klass, size_t obj_size,
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index f1fd49c7dfe..9e904e44b22 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -51,7 +51,7 @@ inline PSPromotionManager* PSPromotionManager::manager_array(uint index) {
 }
 
 template <class T>
-inline void PSPromotionManager::claim_or_forward_depth(T* p) {
+ALWAYSINLINE void PSPromotionManager::claim_or_forward_depth(T* p) {
   assert(ParallelScavengeHeap::heap()->is_in(p), "pointer outside heap");
   T heap_oop = RawAccess<>::oop_load(p);
   if (PSScavenge::is_obj_in_young(heap_oop)) {
diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.cpp b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
index f4b24fa51af..93803cf38e1 100644
--- a/src/hotspot/share/gc/parallel/psVirtualspace.cpp
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.cpp
@@ -78,12 +78,13 @@ bool PSVirtualSpace::shrink_by(size_t bytes) {
   }
 
   char* const base_addr = committed_high_addr() - bytes;
-  bool result = special() || os::uncommit_memory(base_addr, bytes);
-  if (result) {
-    _committed_high_addr -= bytes;
+  if (!special()) {
+    os::uncommit_memory(base_addr, bytes);
   }
 
-  return result;
+  _committed_high_addr -= bytes;
+
+  return true;
 }
 
 #ifndef PRODUCT
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.cpp b/src/hotspot/share/gc/parallel/psYoungGen.cpp
index 593df38e985..870e912f51e 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp
@@ -28,6 +28,7 @@
 #include "gc/parallel/psYoungGen.hpp"
 #include "gc/shared/gcUtil.hpp"
 #include "gc/shared/genArguments.hpp"
+#include "gc/shared/hSpaceCounters.hpp"
 #include "gc/shared/spaceDecorator.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
@@ -133,12 +134,21 @@ void PSYoungGen::initialize_work() {
     max_eden_size = size - 2 * max_survivor_size;
   }
 
-  _eden_counters = new SpaceCounters("eden", 0, max_eden_size, _eden_space,
-                                     _gen_counters);
-  _from_counters = new SpaceCounters("s0", 1, max_survivor_size, _from_space,
-                                     _gen_counters);
-  _to_counters = new SpaceCounters("s1", 2, max_survivor_size, _to_space,
-                                   _gen_counters);
+  _eden_counters = new HSpaceCounters(_gen_counters->name_space(),
+                                       "eden",
+                                       0,
+                                       max_eden_size,
+                                       _eden_space->capacity_in_bytes());
+  _from_counters = new HSpaceCounters(_gen_counters->name_space(),
+                                       "s0",
+                                       1,
+                                       max_survivor_size,
+                                       _from_space->capacity_in_bytes());
+  _to_counters = new HSpaceCounters(_gen_counters->name_space(),
+                                     "s1",
+                                     2,
+                                     max_survivor_size,
+                                     _to_space->capacity_in_bytes());
 
   compute_initial_space_boundaries();
 }
@@ -161,9 +171,9 @@ void PSYoungGen::compute_initial_space_boundaries() {
   space_invariants();
 
   if (UsePerfData) {
-    _eden_counters->update_capacity();
-    _from_counters->update_capacity();
-    _to_counters->update_capacity();
+    _eden_counters->update_capacity(_eden_space->capacity_in_bytes());
+    _from_counters->update_capacity(_from_space->capacity_in_bytes());
+    _to_counters->update_capacity(_to_space->capacity_in_bytes());
   }
 }
 
@@ -606,9 +616,9 @@ void PSYoungGen::post_resize() {
 
 void PSYoungGen::update_counters() {
   if (UsePerfData) {
-    _eden_counters->update_all();
-    _from_counters->update_all();
-    _to_counters->update_all();
+    _eden_counters->update_all(_eden_space->capacity_in_bytes(), _eden_space->used_in_bytes());
+    _from_counters->update_all(_from_space->capacity_in_bytes(), _from_space->used_in_bytes());
+    _to_counters->update_all(_to_space->capacity_in_bytes(), _to_space->used_in_bytes());
     _gen_counters->update_capacity(_virtual_space->committed_size());
   }
 }
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp
index 98337d53184..10aa037da98 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp
@@ -28,7 +28,8 @@
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
-#include "gc/parallel/spaceCounters.hpp"
+#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/hSpaceCounters.hpp"
 
 class ReservedSpace;
 
@@ -51,9 +52,9 @@ class PSYoungGen : public CHeapObj<mtGC> {
 
   // Performance counters
   GenerationCounters*   _gen_counters;
-  SpaceCounters*        _eden_counters;
-  SpaceCounters*        _from_counters;
-  SpaceCounters*        _to_counters;
+  HSpaceCounters*       _eden_counters;
+  HSpaceCounters*       _from_counters;
+  HSpaceCounters*       _to_counters;
 
   // Initialize the space boundaries
   void compute_initial_space_boundaries();
diff --git a/src/hotspot/share/gc/parallel/spaceCounters.cpp b/src/hotspot/share/gc/parallel/spaceCounters.cpp
deleted file mode 100644
index 8f24373abcb..00000000000
--- a/src/hotspot/share/gc/parallel/spaceCounters.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "gc/parallel/spaceCounters.hpp"
-#include "memory/allocation.inline.hpp"
-#include "memory/resourceArea.hpp"
-#include "runtime/atomicAccess.hpp"
-#include "runtime/mutex.hpp"
-#include "runtime/mutexLocker.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/macros.hpp"
-
-SpaceCounters::SpaceCounters(const char* name, int ordinal, size_t max_size,
-                             MutableSpace* m, GenerationCounters* gc)
-    : _object_space(m) {
-  if (UsePerfData) {
-    EXCEPTION_MARK;
-    ResourceMark rm;
-
-    const char* cns = PerfDataManager::name_space(gc->name_space(), "space",
-                                                  ordinal);
-
-    _name_space = NEW_C_HEAP_ARRAY(char, strlen(cns)+1, mtGC);
-    strcpy(_name_space, cns);
-
-    const char* cname = PerfDataManager::counter_name(_name_space, "name");
-    PerfDataManager::create_string_constant(SUN_GC, cname, name, CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "maxCapacity");
-    PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes,
-                                     (jlong)max_size, CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "capacity");
-    _capacity = PerfDataManager::create_variable(SUN_GC, cname,
-                                                 PerfData::U_Bytes,
-                                                 _object_space->capacity_in_bytes(),
-                                                 CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "used");
-    _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes,
-                                             _object_space->used_in_bytes(),
-                                             CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "initCapacity");
-    PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes,
-                                     _object_space->capacity_in_bytes(), CHECK);
-  }
-}
-
-SpaceCounters::~SpaceCounters() {
-  FREE_C_HEAP_ARRAY(char, _name_space);
-}
-
-void SpaceCounters::update_used() {
-  _used->set_value(_object_space->used_in_bytes());
-}
diff --git a/src/hotspot/share/gc/parallel/spaceCounters.hpp b/src/hotspot/share/gc/parallel/spaceCounters.hpp
deleted file mode 100644
index 86fc8438b23..00000000000
--- a/src/hotspot/share/gc/parallel/spaceCounters.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
-#define SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
-
-#include "gc/parallel/mutableSpace.hpp"
-#include "gc/shared/generationCounters.hpp"
-#include "runtime/perfData.hpp"
-#include "utilities/macros.hpp"
-
-// A SpaceCounter is a holder class for performance counters
-// that track a space;
-
-class SpaceCounters: public CHeapObj<mtGC> {
-  friend class VMStructs;
-
- private:
-  PerfVariable*      _capacity;
-  PerfVariable*      _used;
-
-  // Constant PerfData types don't need to retain a reference.
-  // However, it's a good idea to document them here.
-  // PerfConstant*     _size;
-
-  MutableSpace*     _object_space;
-  char*             _name_space;
-
- public:
-
-  SpaceCounters(const char* name, int ordinal, size_t max_size,
-                MutableSpace* m, GenerationCounters* gc);
-
-  ~SpaceCounters();
-
-  inline void update_capacity() {
-    _capacity->set_value(_object_space->capacity_in_bytes());
-  }
-
-  void update_used();
-
-  inline void update_all() {
-    update_used();
-    update_capacity();
-  }
-
-  const char* name_space() const        { return _name_space; }
-};
-
-#endif // SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
index f69219a1f40..f8dabc4539e 100644
--- a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
+++ b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
@@ -47,8 +47,8 @@
   nonstatic_field(PSVirtualSpace,              _committed_high_addr,                          char*)                                 \
                                                                                                                                      \
   nonstatic_field(MutableSpace,                _bottom,                                       HeapWord*)                             \
-  nonstatic_field(MutableSpace,                _end,                                          HeapWord*)                             \
-  volatile_nonstatic_field(MutableSpace,       _top,                                          HeapWord*)                             \
+  nonstatic_field(MutableSpace,                _end,                                          Atomic<HeapWord*>)                     \
+  volatile_nonstatic_field(MutableSpace,       _top,                                          Atomic<HeapWord*>)                     \
                                                                                                                                      \
   nonstatic_field(PSYoungGen,                  _reserved,                                     MemRegion)                             \
   nonstatic_field(PSYoungGen,                  _virtual_space,                                PSVirtualSpace*)                       \
diff --git a/src/hotspot/share/gc/serial/serialFullGC.cpp b/src/hotspot/share/gc/serial/serialFullGC.cpp
index 546084e38dd..0c8ca51fc99 100644
--- a/src/hotspot/share/gc/serial/serialFullGC.cpp
+++ b/src/hotspot/share/gc/serial/serialFullGC.cpp
@@ -412,7 +412,7 @@ void SerialFullGC::follow_array_chunk(objArrayOop array, int index) {
   const int stride = MIN2(len - beg_index, (int) ObjArrayMarkingStride);
   const int end_index = beg_index + stride;
 
-  array->oop_iterate_range(&mark_and_push_closure, beg_index, end_index);
+  array->oop_iterate_elements_range(&mark_and_push_closure, beg_index, end_index);
 
   if (end_index < len) {
     SerialFullGC::push_objarray(array, end_index); // Push the continuation.
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
index ab94bae079a..a1f03a4bf50 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
@@ -111,6 +111,8 @@ bool BarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
     return true;
   }
 
+  // Enable WXWrite: the function is called directly from nmethod_entry_barrier
+  // stub.
   MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current()));
 
   // If the nmethod is the only thing pointing to the oops, and we are using a
diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
index ebc1c1c7fb7..86b74aa5736 100644
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "code/aotCodeCache.hpp"
 #include "gc/shared/c1/cardTableBarrierSetC1.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
@@ -104,11 +105,8 @@ void CardTableBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Op
     return;
   }
 
-  BarrierSet* bs = BarrierSet::barrier_set();
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-  LIR_Const* card_table_base = new LIR_Const(ct->byte_map_base());
-  SHENANDOAHGC_ONLY(assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");)
+  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
+  LIR_Const* card_table_base = new LIR_Const(ctbs->card_table_base_const());
 
   if (addr->is_address()) {
     LIR_Address* address = addr->as_address_ptr();
@@ -126,6 +124,7 @@ void CardTableBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Op
   assert(addr->is_register(), "must be a register at this point");
 
 #ifdef CARDTABLEBARRIERSET_POST_BARRIER_HELPER
+  assert(!AOTCodeCache::is_on(), "this path is not implemented");
   gen->CardTableBarrierSet_post_barrier_helper(addr, card_table_base);
 #else
   LIR_Opr tmp = gen->new_pointer_register();
@@ -138,6 +137,17 @@ void CardTableBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Op
   }
 
   LIR_Address* card_addr;
+#if INCLUDE_CDS
+  if (AOTCodeCache::is_on_for_dump()) {
+    // load the card table address from the AOT Runtime Constants area
+    LIR_Opr byte_map_base_adr = LIR_OprFact::intptrConst(AOTRuntimeConstants::card_table_base_address());
+    LIR_Opr byte_map_base_reg = gen->new_pointer_register();
+    __ move(byte_map_base_adr, byte_map_base_reg);
+    LIR_Address* byte_map_base_indirect = new LIR_Address(byte_map_base_reg, 0, T_LONG);
+    __ move(byte_map_base_indirect, byte_map_base_reg);
+    card_addr = new LIR_Address(tmp, byte_map_base_reg, T_BYTE);
+  } else
+#endif
   if (gen->can_inline_as_constant(card_table_base)) {
     card_addr = new LIR_Address(tmp, card_table_base->as_jint(), T_BYTE);
   } else {
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index c4eefee5f65..53577bad1d8 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -771,7 +771,7 @@ Node* BarrierSetC2::obj_allocate(PhaseMacroExpand* macro, Node* mem, Node* toobi
   //       this will require extensive changes to the loop optimization in order to
   //       prevent a degradation of the optimization.
   //       See comment in memnode.hpp, around line 227 in class LoadPNode.
-  Node* tlab_end = macro->make_load(toobig_false, mem, tlab_end_adr, 0, TypeRawPtr::BOTTOM, T_ADDRESS);
+  Node* tlab_end = macro->make_load_raw(toobig_false, mem, tlab_end_adr, 0, TypeRawPtr::BOTTOM, T_ADDRESS);
 
   // Load the TLAB top.
   Node* old_tlab_top = new LoadPNode(toobig_false, mem, tlab_top_adr, TypeRawPtr::BOTTOM, TypeRawPtr::BOTTOM, MemNode::unordered);
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
index fada2672e9f..f7445ff254f 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "ci/ciUtilities.hpp"
+#include "code/aotCodeCache.hpp"
 #include "gc/shared/c2/cardTableBarrierSetC2.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
@@ -114,13 +115,20 @@ Node* CardTableBarrierSetC2::atomic_xchg_at_resolved(C2AtomicParseAccess& access
   return result;
 }
 
-Node* CardTableBarrierSetC2::byte_map_base_node(GraphKit* kit) const {
+Node* CardTableBarrierSetC2::byte_map_base_node(IdealKit* kit) const {
   // Get base of card map
-  CardTable::CardValue* card_table_base = ci_card_table_address();
+#if INCLUDE_CDS
+  if (AOTCodeCache::is_on_for_dump()) {
+    // load the card table address from the AOT Runtime Constants area
+    Node* byte_map_base_adr = kit->makecon(TypeRawPtr::make(AOTRuntimeConstants::card_table_base_address()));
+    return kit->load_aot_const(byte_map_base_adr, TypeRawPtr::NOTNULL);
+  }
+#endif
+  CardTable::CardValue* card_table_base = ci_card_table_address_const();
    if (card_table_base != nullptr) {
      return kit->makecon(TypeRawPtr::make((address)card_table_base));
    } else {
-     return kit->null();
+     return kit->makecon(Type::get_zero_type(T_ADDRESS));
    }
 }
 
@@ -168,7 +176,7 @@ void CardTableBarrierSetC2::post_barrier(GraphKit* kit,
   Node* card_offset = __ URShiftX(cast, __ ConI(CardTable::card_shift()));
 
   // Combine card table base and card offset
-  Node* card_adr = __ AddP(__ top(), byte_map_base_node(kit), card_offset);
+  Node* card_adr = __ AddP(__ top(), byte_map_base_node(&ideal), card_offset);
 
   // Get the alias_index for raw card-mark memory
   int adr_type = Compile::AliasIdxRaw;
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
index 84876808f0d..8f5bae8c6dd 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
@@ -43,7 +43,7 @@ protected:
                                                 Node* new_val, const Type* value_type) const;
   virtual Node* atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const;
 
-  Node* byte_map_base_node(GraphKit* kit) const;
+  Node* byte_map_base_node(IdealKit* kit) const;
 
 public:
   virtual void eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const;
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index 34f1847befe..e6e3fdf3d82 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -169,9 +169,7 @@ void CardTable::resize_covered_region(MemRegion new_region) {
     // Shrink.
     MemRegion delta = MemRegion(new_committed.end(),
                                 old_committed.word_size() - new_committed.word_size());
-    bool res = os::uncommit_memory((char*)delta.start(),
-                                   delta.byte_size());
-    assert(res, "uncommit should succeed");
+    os::uncommit_memory((char*)delta.start(), delta.byte_size());
   }
 
   log_trace(gc, barrier)("CardTable::resize_covered_region: ");
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index 539e40820a8..d6541198858 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,15 +73,15 @@ CardTableBarrierSet::CardTableBarrierSet(CardTable* card_table) :
 {}
 
 CardTableBarrierSet::~CardTableBarrierSet() {
-  delete _card_table;
+  delete card_table();
 }
 
 void CardTableBarrierSet::write_region(MemRegion mr) {
-  _card_table->dirty_MemRegion(mr);
+  card_table()->dirty_MemRegion(mr);
 }
 
 void CardTableBarrierSet::print_on(outputStream* st) const {
-  _card_table->print_on(st);
+  card_table()->print_on(st);
 }
 
 // Helper for ReduceInitialCardMarks. For performance,
@@ -116,7 +116,7 @@ void CardTableBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop ne
   if (!ReduceInitialCardMarks) {
     return;
   }
-  if (new_obj->is_typeArray() || _card_table->is_in_young(new_obj)) {
+  if (new_obj->is_typeArray() || card_table()->is_in_young(new_obj)) {
     // Arrays of non-references don't need a post-barrier.
   } else {
     MemRegion mr(cast_from_oop<HeapWord*>(new_obj), new_obj->size());
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
index faeb007c77d..5d355318b21 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
 
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
+#include "gc/shared/gc_globals.hpp"
 #include "memory/memRegion.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/align.hpp"
 
 // This kind of "BarrierSet" allows a "CollectedHeap" to detect and
@@ -48,7 +50,7 @@ class CardTableBarrierSet: public BarrierSet {
 
 protected:
   typedef CardTable::CardValue CardValue;
-  CardTable* _card_table;
+  Atomic<CardTable*> _card_table;
 
   CardTableBarrierSet(BarrierSetAssembler* barrier_set_assembler,
                       BarrierSetC1* barrier_set_c1,
@@ -60,6 +62,10 @@ public:
   CardTableBarrierSet(CardTable* card_table);
   virtual ~CardTableBarrierSet();
 
+  inline static CardTableBarrierSet* barrier_set() {
+    return barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
+  }
+
   template <DecoratorSet decorators, typename T>
   inline void write_ref_field_pre(T* addr) {}
 
@@ -85,12 +91,22 @@ public:
   // at the address "start", which may not necessarily be HeapWord-aligned
   inline void write_ref_array(HeapWord* start, size_t count);
 
-  CardTable* card_table() const { return _card_table; }
+  CardTable* card_table() { return _card_table.load_relaxed(); }
+  CardTable* card_table() const { return _card_table.load_relaxed(); }
+
+  CardValue* card_table_base_const() const {
+    assert(UseSerialGC || UseParallelGC, "Only these GCs have constant card table base");
+    return card_table()->byte_map_base();
+  }
 
   virtual void on_slowpath_allocation_exit(JavaThread* thread, oop new_obj);
 
   virtual void print_on(outputStream* st) const;
 
+  // The AOT code cache manager needs to know the region grain size
+  // shift for some barrier sets.
+  virtual uint grain_shift() { return 0; }
+
   template <DecoratorSet decorators, typename BarrierSetT = CardTableBarrierSet>
   class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
     typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
index ea539a70be5..f60a7f47a19 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
 
 template <DecoratorSet decorators, typename T>
 inline void CardTableBarrierSet::write_ref_field_post(T* field) {
-  volatile CardValue* byte = _card_table->byte_for(field);
+  volatile CardValue* byte = card_table()->byte_for(field);
   *byte = CardTable::dirty_card_val();
 }
 
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index a59ea3745ab..9db23df7ace 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -598,7 +598,6 @@ void CollectedHeap::initialize_reserved_region(const ReservedHeapSpace& rs) {
 
 void CollectedHeap::post_initialize() {
   StringDedup::initialize();
-  initialize_serviceability();
 }
 
 bool CollectedHeap::is_shutting_down() {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 6f335b1cdf4..f13c3ab7b6e 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -241,6 +241,10 @@ protected:
    */
   virtual jint initialize() = 0;
 
+  // Initialize serviceability support. This should prepare the implementation
+  // for accepting serviceability-related calls, like memory_managers(), memory_pools().
+  virtual void initialize_serviceability() = 0;
+
   // In many heaps, there will be a need to perform some initialization activities
   // after the Universe is fully formed, but before general heap allocation is allowed.
   // This is the correct place to place such initialization methods.
@@ -309,6 +313,8 @@ protected:
     fill_with_object(start, pointer_delta(end, start), zap);
   }
 
+  inline static bool is_filler_object(oop obj);
+
   virtual void fill_with_dummy_object(HeapWord* start, HeapWord* end, bool zap);
   static size_t min_dummy_object_size() {
     return oopDesc::header_size();
@@ -417,8 +423,6 @@ protected:
   // Generate any dumps preceding or following a full gc
   void full_gc_dump(GCTimer* timer, bool before);
 
-  virtual void initialize_serviceability() = 0;
-
   void print_relative_to_gc(GCWhen::Type when) const;
 
  public:
diff --git a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
index c9d84f54449..194c1fe0bf2 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,9 @@
 
 #include "gc/shared/collectedHeap.hpp"
 
+#include "classfile/vmClasses.hpp"
 #include "gc/shared/memAllocator.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "utilities/align.hpp"
 
@@ -50,4 +52,9 @@ inline void CollectedHeap::add_vmthread_cpu_time(jlong time) {
   _vmthread_cpu_time += time;
 }
 
+inline bool CollectedHeap::is_filler_object(oop obj) {
+  Klass* k = obj->klass_without_asserts();
+  return k == Universe::fillerArrayKlass() || k == vmClasses::FillerObject_klass();
+}
+
 #endif // SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index d08e95378f7..65c970435e5 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -198,13 +198,6 @@
           constraint(MarkStackSizeConstraintFunc,AfterErgo)                 \
           range(1, (INT_MAX - 1))                                           \
                                                                             \
-  product(bool, ParallelRefProcEnabled, false,                              \
-          "(Deprecated) Enable parallel reference processing "              \
-          "whenever possible")                                              \
-                                                                            \
-  product(bool, ParallelRefProcBalancingEnabled, true,                      \
-          "(Deprecated) Enable balancing of reference processing queues")   \
-                                                                            \
   product(size_t, ReferencesPerThread, 1000, EXPERIMENTAL,                  \
                "Ergonomically start one thread for this amount of "         \
                "references for reference processing if "                    \
@@ -261,6 +254,7 @@
   develop(uintx, ObjArrayMarkingStride, 2048,                               \
           "Number of object array elements to push onto the marking stack " \
           "before pushing a continuation entry")                            \
+          range(1, INT_MAX/2)                                               \
                                                                             \
   product_pd(bool, NeverActAsServerClassMachine,                            \
           "(Deprecated) Never act like a server-class machine")             \
@@ -268,18 +262,13 @@
   product(bool, AlwaysActAsServerClassMachine, false,                       \
           "(Deprecated) Always act like a server-class machine")            \
                                                                             \
-  product(uint64_t, MaxRAM, 0,                                              \
-          "(Deprecated) Real memory size (in bytes) used to set maximum "   \
-          "heap size")                                                      \
-          range(0, 0XFFFFFFFFFFFFFFFF)                                      \
-                                                                            \
   product(bool, AggressiveHeap, false,                                      \
           "(Deprecated) Optimize heap options for long-running memory "     \
           "intensive apps")                                                 \
                                                                             \
   product(size_t, ErgoHeapSizeLimit, 0,                                     \
           "Maximum ergonomically set heap size (in bytes); zero means use " \
-          "MaxRAM * MaxRAMPercentage / 100")                                \
+          "(System RAM) * MaxRAMPercentage / 100")                          \
           range(0, max_uintx)                                               \
                                                                             \
   product(double, MaxRAMPercentage, 25.0,                                   \
diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.cpp b/src/hotspot/share/gc/shared/hSpaceCounters.cpp
index 818d7422fba..a873bc2f45c 100644
--- a/src/hotspot/share/gc/shared/hSpaceCounters.cpp
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.cpp
@@ -81,14 +81,3 @@ void HSpaceCounters::update_all(size_t capacity, size_t used) {
   update_capacity(capacity);
   update_used(used);
 }
-
-DEBUG_ONLY(
-  // for security reasons, we do not allow arbitrary reads from
-  // the counters as they may live in shared memory.
-  jlong HSpaceCounters::used() {
-    return _used->get_value();
-  }
-  jlong HSpaceCounters::capacity() {
-    return _used->get_value();
-  }
-)
diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.hpp b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
index b9a6011bd65..cd008ac6dd3 100644
--- a/src/hotspot/share/gc/shared/hSpaceCounters.hpp
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.hpp
@@ -54,13 +54,6 @@ class HSpaceCounters: public CHeapObj<mtGC> {
 
   void update_all(size_t capacity, size_t used);
 
-  DEBUG_ONLY(
-    // for security reasons, we do not allow arbitrary reads from
-    // the counters as they may live in shared memory.
-    jlong used();
-    jlong capacity();
-  )
-
   const char* name_space() const        { return _name_space; }
 };
 #endif // SHARE_GC_SHARED_HSPACECOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp b/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp
index 8e220e745e5..8341a3b20c4 100644
--- a/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp
+++ b/src/hotspot/share/gc/shared/oopStorageSetParState.inline.hpp
@@ -31,7 +31,6 @@
 #include "gc/shared/oopStorageSet.hpp"
 #include "memory/iterator.hpp"
 #include "oops/access.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/debug.hpp"
 
 template <bool concurrent, bool is_const>
diff --git a/src/hotspot/share/gc/shared/parallelCleaning.cpp b/src/hotspot/share/gc/shared/parallelCleaning.cpp
index e302085d0cc..8e275564a9f 100644
--- a/src/hotspot/share/gc/shared/parallelCleaning.cpp
+++ b/src/hotspot/share/gc/shared/parallelCleaning.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 #include "gc/shared/parallelCleaning.hpp"
 #include "logging/log.hpp"
 #include "oops/klass.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 
 CodeCacheUnloadingTask::CodeCacheUnloadingTask(bool unloading_occurred) :
   _unloading_occurred(unloading_occurred),
@@ -39,7 +38,7 @@ CodeCacheUnloadingTask::CodeCacheUnloadingTask(bool unloading_occurred) :
   if(iter.next()) {
     _first_nmethod = iter.method();
   }
-  _claimed_nmethod = _first_nmethod;
+  _claimed_nmethod.store_relaxed(_first_nmethod);
 }
 
 CodeCacheUnloadingTask::~CodeCacheUnloadingTask() {
@@ -53,7 +52,7 @@ void CodeCacheUnloadingTask::claim_nmethods(nmethod** claimed_nmethods, int *num
   do {
     *num_claimed_nmethods = 0;
 
-    first = _claimed_nmethod;
+    first = _claimed_nmethod.load_relaxed();
     last = NMethodIterator(NMethodIterator::all, first);
 
     if (first != nullptr) {
@@ -67,7 +66,7 @@ void CodeCacheUnloadingTask::claim_nmethods(nmethod** claimed_nmethods, int *num
       }
     }
 
-  } while (AtomicAccess::cmpxchg(&_claimed_nmethod, first, last.method()) != first);
+  } while (!_claimed_nmethod.compare_set(first, last.method()));
 }
 
 void CodeCacheUnloadingTask::work(uint worker_id) {
diff --git a/src/hotspot/share/gc/shared/parallelCleaning.hpp b/src/hotspot/share/gc/shared/parallelCleaning.hpp
index ed76c4c9df9..0f5cb78bf55 100644
--- a/src/hotspot/share/gc/shared/parallelCleaning.hpp
+++ b/src/hotspot/share/gc/shared/parallelCleaning.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "code/codeCache.hpp"
 #include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/workerThread.hpp"
+#include "runtime/atomic.hpp"
 
 class CodeCacheUnloadingTask {
 
@@ -36,7 +37,7 @@ class CodeCacheUnloadingTask {
 
   // Variables used to claim nmethods.
   nmethod* _first_nmethod;
-  nmethod* volatile _claimed_nmethod;
+  Atomic<nmethod*> _claimed_nmethod;
 
 public:
   CodeCacheUnloadingTask(bool unloading_occurred);
diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
index 6f714d48a35..aadbc46b7c1 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -28,7 +28,6 @@
 #include "memory/arena.hpp"
 #include "nmt/memTag.hpp"
 #include "oops/oopsHierarchy.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
index aaa86e2de16..6946f7c69ff 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
@@ -28,7 +28,6 @@
 #include "gc/shared/partialArrayTaskStepper.hpp"
 
 #include "gc/shared/partialArrayState.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 
diff --git a/src/hotspot/share/gc/shared/plab.hpp b/src/hotspot/share/gc/shared/plab.hpp
index 2eebdeeadb4..d893a720e2a 100644
--- a/src/hotspot/share/gc/shared/plab.hpp
+++ b/src/hotspot/share/gc/shared/plab.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "gc/shared/collectedHeap.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // Forward declarations.
@@ -146,37 +147,37 @@ public:
 
 // PLAB book-keeping.
 class PLABStats : public CHeapObj<mtGC> {
+  Atomic<size_t> _allocated;          // Total allocated
+  Atomic<size_t> _wasted;             // of which wasted (internal fragmentation)
+  Atomic<size_t> _undo_wasted;        // of which wasted on undo (is not used for calculation of PLAB size)
+  Atomic<size_t> _unused;             // Unused in last buffer
+
 protected:
   const char* _description;   // Identifying string.
 
-  size_t _allocated;          // Total allocated
-  size_t _wasted;             // of which wasted (internal fragmentation)
-  size_t _undo_wasted;        // of which wasted on undo (is not used for calculation of PLAB size)
-  size_t _unused;             // Unused in last buffer
-
   virtual void reset() {
-    _allocated   = 0;
-    _wasted      = 0;
-    _undo_wasted = 0;
-    _unused      = 0;
+    _allocated.store_relaxed(0);
+    _wasted.store_relaxed(0);
+    _undo_wasted.store_relaxed(0);
+    _unused.store_relaxed(0);
   }
 
 public:
   PLABStats(const char* description) :
-    _description(description),
     _allocated(0),
     _wasted(0),
     _undo_wasted(0),
-    _unused(0)
+    _unused(0),
+    _description(description)
   { }
 
   virtual ~PLABStats() { }
 
-  size_t allocated() const { return _allocated; }
-  size_t wasted() const { return _wasted; }
-  size_t unused() const { return _unused; }
+  size_t allocated() const { return _allocated.load_relaxed(); }
+  size_t wasted() const { return _wasted.load_relaxed(); }
+  size_t undo_wasted() const { return _undo_wasted.load_relaxed(); }
+  size_t unused() const { return _unused.load_relaxed(); }
   size_t used() const { return allocated() - (wasted() + unused()); }
-  size_t undo_wasted() const { return _undo_wasted; }
 
   static size_t min_size() {
     return PLAB::min_size();
diff --git a/src/hotspot/share/gc/shared/plab.inline.hpp b/src/hotspot/share/gc/shared/plab.inline.hpp
index 020738352d3..5f3e9c91e26 100644
--- a/src/hotspot/share/gc/shared/plab.inline.hpp
+++ b/src/hotspot/share/gc/shared/plab.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,22 +29,21 @@
 
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "memory/allocation.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 
 void PLABStats::add_allocated(size_t v) {
-  AtomicAccess::add(&_allocated, v);
+  _allocated.add_then_fetch(v);
 }
 
 void PLABStats::add_unused(size_t v) {
-  AtomicAccess::add(&_unused, v);
+  _unused.add_then_fetch(v);
 }
 
 void PLABStats::add_wasted(size_t v) {
-  AtomicAccess::add(&_wasted, v);
+  _wasted.add_then_fetch(v);
 }
 
 void PLABStats::add_undo_wasted(size_t v) {
-  AtomicAccess::add(&_undo_wasted, v);
+  _undo_wasted.add_then_fetch(v);
 }
 
 #endif // SHARE_GC_SHARED_PLAB_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/preservedMarks.cpp b/src/hotspot/share/gc/shared/preservedMarks.cpp
index 1c9f1c82e6f..605b7afe072 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.cpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/macros.hpp"
 
 void PreservedMarks::restore() {
@@ -55,15 +55,6 @@ void PreservedMarks::adjust_during_full_gc() {
   }
 }
 
-void PreservedMarks::restore_and_increment(volatile size_t* const total_size_addr) {
-  const size_t stack_size = size();
-  restore();
-  // Only do the atomic add if the size is > 0.
-  if (stack_size > 0) {
-    AtomicAccess::add(total_size_addr, stack_size);
-  }
-}
-
 #ifndef PRODUCT
 void PreservedMarks::assert_empty() {
   assert(_stack.is_empty(), "stack expected to be empty, size = %zu",
@@ -93,7 +84,7 @@ void PreservedMarksSet::init(uint num) {
 class RestorePreservedMarksTask : public WorkerTask {
   PreservedMarksSet* const _preserved_marks_set;
   SequentialSubTasksDone _sub_tasks;
-  volatile size_t _total_size;
+  Atomic<size_t> _total_size;
 #ifdef ASSERT
   size_t _total_size_before;
 #endif // ASSERT
@@ -102,7 +93,12 @@ public:
   void work(uint worker_id) override {
     uint task_id = 0;
     while (_sub_tasks.try_claim_task(task_id)) {
-      _preserved_marks_set->get(task_id)->restore_and_increment(&_total_size);
+      PreservedMarks* next = _preserved_marks_set->get(task_id);
+      size_t num_restored = next->size();
+      next->restore();
+      if (num_restored > 0) {
+        _total_size.add_then_fetch(num_restored);
+      }
     }
   }
 
@@ -121,9 +117,11 @@ public:
   }
 
   ~RestorePreservedMarksTask() {
-    assert(_total_size == _total_size_before, "total_size = %zu before = %zu", _total_size, _total_size_before);
-    size_t mem_size = _total_size * (sizeof(oop) + sizeof(markWord));
-    log_trace(gc)("Restored %zu marks, occupying %zu %s", _total_size,
+    size_t local_total_size = _total_size.load_relaxed();
+
+    assert(local_total_size == _total_size_before, "total_size = %zu before = %zu", local_total_size, _total_size_before);
+    size_t mem_size = local_total_size * (sizeof(oop) + sizeof(markWord));
+    log_trace(gc)("Restored %zu marks, occupying %zu %s", local_total_size,
                                                           byte_size_in_proper_unit(mem_size),
                                                           proper_unit_for_byte_size(mem_size));
   }
diff --git a/src/hotspot/share/gc/shared/preservedMarks.hpp b/src/hotspot/share/gc/shared/preservedMarks.hpp
index 10f75116524..3bbbd335011 100644
--- a/src/hotspot/share/gc/shared/preservedMarks.hpp
+++ b/src/hotspot/share/gc/shared/preservedMarks.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,8 +59,7 @@ public:
   size_t size() const { return _stack.size(); }
   inline void push_if_necessary(oop obj, markWord m);
   inline void push_always(oop obj, markWord m);
-  // Iterate over the stack, restore all preserved marks, and
-  // reclaim the memory taken up by the stack segments.
+  // Restore all preserved marks, and reclaim the memory taken up by the stack segments.
   void restore();
 
   // Adjust the preserved mark according to its
@@ -71,8 +70,6 @@ public:
   // to their forwarding location stored in the mark.
   void adjust_during_full_gc();
 
-  void restore_and_increment(volatile size_t* const _total_size_addr);
-
   // Assert the stack is empty and has no cached segments.
   void assert_empty() PRODUCT_RETURN;
 
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp
index 0153ee13287..b82db08ecbd 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp
@@ -122,7 +122,7 @@ void ReferenceProcessor::verify_no_references_recorded() {
 #endif
 
 bool ReferenceProcessor::processing_is_mt() const {
-  return ParallelRefProcEnabled && _num_queues > 1;
+  return _num_queues > 1;
 }
 
 void ReferenceProcessor::weak_oops_do(OopClosure* f) {
@@ -586,33 +586,9 @@ void ReferenceProcessor::set_active_mt_degree(uint v) {
   _next_id = 0;
 }
 
-bool ReferenceProcessor::need_balance_queues(DiscoveredList refs_lists[]) {
-  assert(processing_is_mt(), "why balance non-mt processing?");
-  // _num_queues is the processing degree.  Only list entries up to
-  // _num_queues will be processed, so any non-empty lists beyond
-  // that must be redistributed to lists in that range.  Even if not
-  // needed for that, balancing may be desirable to eliminate poor
-  // distribution of references among the lists.
-  if (ParallelRefProcBalancingEnabled) {
-    return true;                // Configuration says do it.
-  } else {
-    // Configuration says don't balance, but if there are non-empty
-    // lists beyond the processing degree, then must ignore the
-    // configuration and balance anyway.
-    for (uint i = _num_queues; i < _max_num_queues; ++i) {
-      if (!refs_lists[i].is_empty()) {
-        return true;            // Must balance despite configuration.
-      }
-    }
-    return false;               // Safe to obey configuration and not balance.
-  }
-}
-
 void ReferenceProcessor::maybe_balance_queues(DiscoveredList refs_lists[]) {
   assert(processing_is_mt(), "Should not call this otherwise");
-  if (need_balance_queues(refs_lists)) {
-    balance_queues(refs_lists);
-  }
+  balance_queues(refs_lists);
 }
 
 // Balances reference queues.
diff --git a/src/hotspot/share/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp
index b211b94a85d..67bf3d7de36 100644
--- a/src/hotspot/share/gc/shared/referenceProcessor.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp
@@ -366,7 +366,6 @@ private:
 
   // Balances reference queues.
   void balance_queues(DiscoveredList refs_lists[]);
-  bool need_balance_queues(DiscoveredList refs_lists[]);
 
   // If there is need to balance the given queue, do it.
   void maybe_balance_queues(DiscoveredList refs_lists[]);
diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
index df7d8f7b38d..fc7ef75c1be 100644
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/atomicAccess.hpp"
 
 #define ASSERT_REF_TYPE(ref_type) assert((ref_type) >= REF_SOFT && (ref_type) <= REF_PHANTOM, \
                                          "Invariant (%d)", (int)ref_type)
@@ -153,7 +152,15 @@ RefProcTotalPhaseTimesTracker::~RefProcTotalPhaseTimesTracker() {
 }
 
 ReferenceProcessorPhaseTimes::ReferenceProcessorPhaseTimes(GCTimer* gc_timer, uint max_gc_threads) :
-  _processing_is_mt(false), _gc_timer(gc_timer) {
+  _sub_phases_worker_time_sec{},
+  _balance_queues_time_ms{},
+  _soft_weak_final_refs_phase_worker_time_sec(nullptr),
+  _total_time_ms(0.0),
+   _ref_dropped{},
+  _ref_discovered{},
+  _processing_is_mt(false),
+  _gc_timer(gc_timer) {
+
   assert(gc_timer != nullptr, "pre-condition");
   for (uint i = 0; i < ReferenceProcessor::RefSubPhaseMax; i++) {
     _sub_phases_worker_time_sec[i] = new WorkerDataArray<double>(nullptr, SubPhasesParWorkTitle[i], max_gc_threads);
@@ -196,7 +203,7 @@ void ReferenceProcessorPhaseTimes::reset() {
   _soft_weak_final_refs_phase_worker_time_sec->reset();
 
   for (int i = 0; i < number_of_subclasses_of_ref; i++) {
-    _ref_dropped[i] = 0;
+    _ref_dropped[i].store_relaxed(0);
     _ref_discovered[i] = 0;
   }
 
@@ -214,7 +221,7 @@ ReferenceProcessorPhaseTimes::~ReferenceProcessorPhaseTimes() {
 
 void ReferenceProcessorPhaseTimes::add_ref_dropped(ReferenceType ref_type, size_t count) {
   ASSERT_REF_TYPE(ref_type);
-  AtomicAccess::add(&_ref_dropped[ref_type_2_index(ref_type)], count, memory_order_relaxed);
+  _ref_dropped[ref_type_2_index(ref_type)].add_then_fetch(count, memory_order_relaxed);
 }
 
 void ReferenceProcessorPhaseTimes::set_ref_discovered(ReferenceType ref_type, size_t count) {
@@ -271,7 +278,7 @@ void ReferenceProcessorPhaseTimes::print_reference(ReferenceType ref_type, uint
     int const ref_type_index = ref_type_2_index(ref_type);
 
     size_t discovered = _ref_discovered[ref_type_index];
-    size_t dropped = _ref_dropped[ref_type_index];
+    size_t dropped = _ref_dropped[ref_type_index].load_relaxed();
     assert(discovered >= dropped, "invariant");
     size_t processed = discovered - dropped;
 
diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
index 16691452ef4..82d26902bce 100644
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "gc/shared/workerDataArray.hpp"
 #include "memory/allocation.hpp"
 #include "memory/referenceType.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/ticks.hpp"
 
 class DiscoveredList;
@@ -52,7 +53,7 @@ class ReferenceProcessorPhaseTimes : public CHeapObj<mtGC> {
   // Total spent time for reference processing.
   double                   _total_time_ms;
 
-  size_t                   _ref_dropped[number_of_subclasses_of_ref];
+  Atomic<size_t>           _ref_dropped[number_of_subclasses_of_ref];
   size_t                   _ref_discovered[number_of_subclasses_of_ref];
 
   bool                     _processing_is_mt;
diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
index 011a0f5cfd8..093fa4432e2 100644
--- a/src/hotspot/share/gc/shared/space.cpp
+++ b/src/hotspot/share/gc/shared/space.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "memory/iterator.inline.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/java.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
@@ -52,7 +51,7 @@ void ContiguousSpace::initialize(MemRegion mr,
   set_bottom(bottom);
   set_end(end);
   if (clear_space) {
-    clear(SpaceDecorator::DontMangle);
+    set_top(bottom);
   }
   if (ZapUnusedHeapArea) {
     mangle_unused_area();
@@ -69,7 +68,7 @@ void ContiguousSpace::clear(bool mangle_space) {
 #ifndef PRODUCT
 
 void ContiguousSpace::mangle_unused_area() {
-  mangle_unused_area(MemRegion(_top, _end));
+  mangle_unused_area(MemRegion(top(), _end));
 }
 
 void ContiguousSpace::mangle_unused_area(MemRegion mr) {
@@ -128,11 +127,8 @@ inline HeapWord* ContiguousSpace::par_allocate_impl(size_t size) {
     HeapWord* obj = top();
     if (pointer_delta(end(), obj) >= size) {
       HeapWord* new_top = obj + size;
-      HeapWord* result = AtomicAccess::cmpxchg(top_addr(), obj, new_top);
-      // result can be one of two:
-      //  the old top value: the exchange succeeded
-      //  otherwise: the new value of the top is returned.
-      if (result == obj) {
+      // Retry if we did not successfully updated the top pointers.
+      if (_top.compare_set(obj, new_top)) {
         assert(is_object_aligned(obj) && is_object_aligned(new_top), "checking alignment");
         return obj;
       }
diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
index 7f2887275b3..05b22f680bf 100644
--- a/src/hotspot/share/gc/shared/space.hpp
+++ b/src/hotspot/share/gc/shared/space.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "memory/iterator.hpp"
 #include "memory/memRegion.hpp"
 #include "oops/markWord.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/macros.hpp"
@@ -53,7 +54,7 @@ class ContiguousSpace: public CHeapObj<mtGC> {
 private:
   HeapWord* _bottom;
   HeapWord* _end;
-  HeapWord* _top;
+  Atomic<HeapWord*> _top;
 
   // Allocation helpers (return null if full).
   inline HeapWord* allocate_impl(size_t word_size);
@@ -64,12 +65,12 @@ public:
 
   // Accessors
   HeapWord* bottom() const         { return _bottom; }
-  HeapWord* end() const            { return _end;    }
-  HeapWord* top() const            { return _top;    }
+  HeapWord* end() const            { return _end; }
+  HeapWord* top() const            { return _top.load_relaxed();    }
 
   void set_bottom(HeapWord* value) { _bottom = value; }
   void set_end(HeapWord* value)    { _end = value; }
-  void set_top(HeapWord* value)    { _top = value; }
+  void set_top(HeapWord* value)    { _top.store_relaxed(value); }
 
   // Testers
   bool is_empty() const              { return used() == 0; }
@@ -121,9 +122,6 @@ public:
   // Iteration
   void object_iterate(ObjectClosure* blk);
 
-  // Addresses for inlined allocation
-  HeapWord** top_addr() { return &_top; }
-
   // Debugging
   void verify() const;
 };
diff --git a/src/hotspot/share/gc/shared/taskqueue.cpp b/src/hotspot/share/gc/shared/taskqueue.cpp
index f75dc4c2923..58af1793a48 100644
--- a/src/hotspot/share/gc/shared/taskqueue.cpp
+++ b/src/hotspot/share/gc/shared/taskqueue.cpp
@@ -25,7 +25,6 @@
 #include "gc/shared/taskqueue.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp
index 4334773a4e9..5c2fe4e5178 100644
--- a/src/hotspot/share/gc/shared/taskqueue.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -641,6 +641,10 @@ public:
     return (raw_value() & PartialArrayTag) != 0;
   }
 
+  bool is_null() const {
+    return _p == nullptr;
+  }
+
   oop* to_oop_ptr() const {
     return static_cast<oop*>(decode(OopTag));
   }
diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
index 55851495a5f..e77645f4fcf 100644
--- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
@@ -32,7 +32,6 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index 9635ed4d0cb..61cf73fe04a 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,8 +76,8 @@ void ThreadLocalAllocBuffer::accumulate_and_reset_statistics(ThreadLocalAllocSta
   size_t used = Universe::heap()->tlab_used();
 
   _gc_waste += (unsigned)remaining();
-  size_t total_allocated = (size_t)thread()->allocated_bytes();
-  size_t allocated_since_last_gc = total_allocated - _allocated_before_last_gc;
+  uint64_t total_allocated = thread()->allocated_bytes();
+  uint64_t allocated_since_last_gc = total_allocated - _allocated_before_last_gc;
   _allocated_before_last_gc = total_allocated;
 
   print_stats("gc");
@@ -458,10 +458,22 @@ size_t ThreadLocalAllocBuffer::end_reserve() {
   return MAX2(reserve_size, (size_t)_reserve_for_allocation_prefetch);
 }
 
-const HeapWord* ThreadLocalAllocBuffer::start_relaxed() const {
-  return AtomicAccess::load(&_start);
-}
-
-const HeapWord* ThreadLocalAllocBuffer::top_relaxed() const {
-  return AtomicAccess::load(&_top);
+size_t ThreadLocalAllocBuffer::estimated_used_bytes() const {
+  // Data races due to unsynchronized access like the following reads to _start
+  // and _top are undefined behavior. Atomic<T> would not provide any additional
+  // guarantees, so use AtomicAccess directly.
+  HeapWord* start = AtomicAccess::load(&_start);
+  HeapWord* top = AtomicAccess::load(&_top);
+  // If there has been a race when retrieving _top and _start, return 0.
+  if (top < start) {
+    return 0;
+  }
+  size_t used_bytes = pointer_delta(top, start, 1);
+  // Comparing diff with the maximum allowed size will ensure that we don't add
+  // the used bytes from a semi-initialized TLAB ending up with implausible values.
+  // In this case also just return 0.
+  if (used_bytes > ThreadLocalAllocBuffer::max_size_in_bytes()) {
+    return 0;
+  }
+  return used_bytes;
 }
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index 8267a103539..25d9bf00eac 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,16 @@
 
 class ThreadLocalAllocStats;
 
-// ThreadLocalAllocBuffer: a descriptor for thread-local storage used by
-// the threads for allocation.
-//            It is thread-private at any time, but maybe multiplexed over
-//            time across multiple threads. The park()/unpark() pair is
-//            used to make it available for such multiplexing.
+// ThreadLocalAllocBuffer is a descriptor for thread-local storage used by
+// mutator threads for local/private allocation. As a TLAB is thread-private,
+// there is no concurrent/parallel access to its memory or its members,
+// other than by estimated_used_bytes().
 //
-//            Heap sampling is performed via the end and allocation_end
-//            fields.
-//            allocation_end contains the real end of the tlab allocation,
-//            whereas end can be set to an arbitrary spot in the tlab to
-//            trip the return and sample the allocation.
+// Heap sampling is performed via the end and allocation_end
+// fields.
+// allocation_end contains the real end of the tlab allocation,
+// whereas end can be set to an arbitrary spot in the tlab to
+// trip the return and sample the allocation.
 class ThreadLocalAllocBuffer: public CHeapObj<mtThread> {
   friend class VMStructs;
   friend class JVMCIVMStructs;
@@ -55,7 +54,7 @@ private:
 
   size_t    _desired_size;                       // desired size   (including alignment_reserve)
   size_t    _refill_waste_limit;                 // hold onto tlab if free() is larger than this
-  size_t    _allocated_before_last_gc;           // total bytes allocated up until the last gc
+  uint64_t  _allocated_before_last_gc;           // total bytes allocated up until the last gc
 
   static size_t   _max_size;                          // maximum size of any TLAB
   static int      _reserve_for_allocation_prefetch;   // Reserve at the end of the TLAB
@@ -116,17 +115,18 @@ public:
   HeapWord* end() const                          { return _end; }
   HeapWord* top() const                          { return _top; }
   HeapWord* hard_end();
-  HeapWord* pf_top() const                       { return _pf_top; }
   size_t desired_size() const                    { return _desired_size; }
-  size_t used() const                            { return pointer_delta(top(), start()); }
   size_t used_bytes() const                      { return pointer_delta(top(), start(), 1); }
   size_t free() const                            { return pointer_delta(end(), top()); }
   // Don't discard tlab if remaining space is larger than this.
   size_t refill_waste_limit() const              { return _refill_waste_limit; }
 
-  // For external inspection.
-  const HeapWord* start_relaxed() const;
-  const HeapWord* top_relaxed() const;
+  // Returns an estimate of the number of bytes currently used in the TLAB.
+  // Due to races with concurrent allocations and/or resetting the TLAB the return
+  // value may be inconsistent with any other metrics (e.g. total allocated
+  // bytes), and may just incorrectly return 0.
+  // Intended for external inspection only where accuracy is not 100% required.
+  size_t estimated_used_bytes() const;
 
   // Allocate size HeapWords. The memory is NOT initialized to zero.
   inline HeapWord* allocate(size_t size);
@@ -171,14 +171,6 @@ public:
 
   static size_t refill_waste_limit_increment();
 
-  template <typename T> void addresses_do(T f) {
-    f(&_start);
-    f(&_top);
-    f(&_pf_top);
-    f(&_end);
-    f(&_allocation_end);
-  }
-
   // Code generation support
   static ByteSize start_offset()                 { return byte_offset_of(ThreadLocalAllocBuffer, _start); }
   static ByteSize end_offset()                   { return byte_offset_of(ThreadLocalAllocBuffer, _end); }
diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
index db968e28f67..5bd87e6adf7 100644
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
 #if INCLUDE_ZGC
 #include "gc/z/vmStructs_z.hpp"
 #endif
+#include "runtime/atomic.hpp"
 
 #define VM_STRUCTS_GC(nonstatic_field,                                                                                               \
                       volatile_static_field,                                                                                         \
@@ -88,7 +89,7 @@
   nonstatic_field(CardTable,                   _byte_map_size,                                const size_t)                          \
   nonstatic_field(CardTable,                   _byte_map,                                     CardTable::CardValue*)                 \
   nonstatic_field(CardTable,                   _byte_map_base,                                CardTable::CardValue*)                 \
-  nonstatic_field(CardTableBarrierSet,         _card_table,                                   CardTable*)                            \
+  nonstatic_field(CardTableBarrierSet,         _card_table,                                   Atomic<CardTable*>)                    \
                                                                                                                                      \
      static_field(CollectedHeap,               _lab_alignment_reserve,                        size_t)                                \
   nonstatic_field(CollectedHeap,               _reserved,                                     MemRegion)                             \
@@ -97,7 +98,7 @@
                                                                                                                                      \
   nonstatic_field(ContiguousSpace,             _bottom,                                       HeapWord*)                             \
   nonstatic_field(ContiguousSpace,             _end,                                          HeapWord*)                             \
-  nonstatic_field(ContiguousSpace,             _top,                                          HeapWord*)                             \
+  nonstatic_field(ContiguousSpace,             _top,                                          Atomic<HeapWord*>)                     \
                                                                                                                                      \
   nonstatic_field(MemRegion,                   _start,                                        HeapWord*)                             \
   nonstatic_field(MemRegion,                   _word_size,                                    size_t)
@@ -149,13 +150,14 @@
                                                                           \
   declare_toplevel_type(BarrierSet*)                                      \
   declare_toplevel_type(CardTable*)                                       \
+  declare_toplevel_type(Atomic<CardTable*>)                               \
   declare_toplevel_type(CardTable*const)                                  \
   declare_toplevel_type(CardTableBarrierSet*)                             \
   declare_toplevel_type(CardTableBarrierSet**)                            \
   declare_toplevel_type(CollectedHeap*)                                   \
   declare_toplevel_type(ContiguousSpace*)                                 \
   declare_toplevel_type(HeapWord*)                                        \
-  declare_toplevel_type(HeapWord* volatile)                               \
+  declare_toplevel_type(Atomic<HeapWord*>)                                \
   declare_toplevel_type(MemRegion*)                                       \
   declare_toplevel_type(ThreadLocalAllocBuffer*)                          \
                                                                           \
diff --git a/src/hotspot/share/gc/shared/weakProcessor.cpp b/src/hotspot/share/gc/shared/weakProcessor.cpp
index bc7e9ad6375..071a004454a 100644
--- a/src/hotspot/share/gc/shared/weakProcessor.cpp
+++ b/src/hotspot/share/gc/shared/weakProcessor.cpp
@@ -72,7 +72,6 @@ void WeakProcessor::oops_do(OopClosure* closure) {
 }
 
 uint WeakProcessor::ergo_workers(uint max_workers) {
-  // Ignore ParallelRefProcEnabled; that's for j.l.r.Reference processing.
   if (ReferencesPerThread == 0) {
     // Configuration says always use all the threads.
     return max_workers;
diff --git a/src/hotspot/share/gc/shared/workerThread.cpp b/src/hotspot/share/gc/shared/workerThread.cpp
index 7a9404a195a..2f6f003608f 100644
--- a/src/hotspot/share/gc/shared/workerThread.cpp
+++ b/src/hotspot/share/gc/shared/workerThread.cpp
@@ -26,7 +26,6 @@
 #include "gc/shared/workerThread.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/init.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
@@ -96,8 +95,22 @@ void WorkerThreads::initialize_workers() {
   }
 }
 
+bool WorkerThreads::allow_inject_creation_failure() const {
+  if (!is_init_completed()) {
+    // Never allow creation failures during VM init
+    return false;
+  }
+
+  if (_created_workers == 0) {
+    // Never allow creation failures of the first worker, it will cause the VM to exit
+    return false;
+  }
+
+  return true;
+}
+
 WorkerThread* WorkerThreads::create_worker(uint name_suffix) {
-  if (is_init_completed() && InjectGCWorkerCreationFailure) {
+  if (InjectGCWorkerCreationFailure && allow_inject_creation_failure()) {
     return nullptr;
   }
 
diff --git a/src/hotspot/share/gc/shared/workerThread.hpp b/src/hotspot/share/gc/shared/workerThread.hpp
index a1f7282abe4..003ce8a2959 100644
--- a/src/hotspot/share/gc/shared/workerThread.hpp
+++ b/src/hotspot/share/gc/shared/workerThread.hpp
@@ -104,6 +104,7 @@ public:
   WorkerThreads(const char* name, uint max_workers);
 
   void initialize_workers();
+  bool allow_inject_creation_failure() const;
 
   uint max_workers() const     { return _max_workers; }
   uint created_workers() const { return _created_workers; }
diff --git a/src/hotspot/share/gc/shared/workerUtils.cpp b/src/hotspot/share/gc/shared/workerUtils.cpp
index 422d513a5cd..1826b9d7df8 100644
--- a/src/hotspot/share/gc/shared/workerUtils.cpp
+++ b/src/hotspot/share/gc/shared/workerUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,9 @@
  *
  */
 
+#include "cppstdlib/new.hpp"
 #include "gc/shared/workerUtils.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 
 // *** WorkerThreadsBarrierSync
@@ -80,21 +81,21 @@ void WorkerThreadsBarrierSync::abort() {
 
 SubTasksDone::SubTasksDone(uint n) :
   _tasks(nullptr), _n_tasks(n) {
-  _tasks = NEW_C_HEAP_ARRAY(bool, n, mtInternal);
+  _tasks = NEW_C_HEAP_ARRAY(Atomic<bool>, n, mtInternal);
   for (uint i = 0; i < _n_tasks; i++) {
-    _tasks[i] = false;
+    ::new (&_tasks[i]) Atomic<bool>(false);
   }
 }
 
 #ifdef ASSERT
 void SubTasksDone::all_tasks_claimed_impl(uint skipped[], size_t skipped_size) {
-  if (AtomicAccess::cmpxchg(&_verification_done, false, true)) {
+  if (!_verification_done.compare_set(false, true)) {
     // another thread has done the verification
     return;
   }
   // all non-skipped tasks are claimed
   for (uint i = 0; i < _n_tasks; ++i) {
-    if (!_tasks[i]) {
+    if (!_tasks[i].load_relaxed()) {
       auto is_skipped = false;
       for (size_t j = 0; j < skipped_size; ++j) {
         if (i == skipped[j]) {
@@ -109,27 +110,27 @@ void SubTasksDone::all_tasks_claimed_impl(uint skipped[], size_t skipped_size) {
   for (size_t i = 0; i < skipped_size; ++i) {
     auto task_index = skipped[i];
     assert(task_index < _n_tasks, "Array in range.");
-    assert(!_tasks[task_index], "%d is both claimed and skipped.", task_index);
+    assert(!_tasks[task_index].load_relaxed(), "%d is both claimed and skipped.", task_index);
   }
 }
 #endif
 
 bool SubTasksDone::try_claim_task(uint t) {
   assert(t < _n_tasks, "bad task id.");
-  return !_tasks[t] && !AtomicAccess::cmpxchg(&_tasks[t], false, true);
+  return !_tasks[t].load_relaxed() && _tasks[t].compare_set(false, true);
 }
 
 SubTasksDone::~SubTasksDone() {
-  assert(_verification_done, "all_tasks_claimed must have been called.");
-  FREE_C_HEAP_ARRAY(bool, _tasks);
+  assert(_verification_done.load_relaxed(), "all_tasks_claimed must have been called.");
+  FREE_C_HEAP_ARRAY(Atomic<bool>, _tasks);
 }
 
 // *** SequentialSubTasksDone
 
 bool SequentialSubTasksDone::try_claim_task(uint& t) {
-  t = _num_claimed;
+  t = _num_claimed.load_relaxed();
   if (t < _num_tasks) {
-    t = AtomicAccess::add(&_num_claimed, 1u) - 1;
+    t = _num_claimed.fetch_then_add(1u);
   }
   return t < _num_tasks;
 }
diff --git a/src/hotspot/share/gc/shared/workerUtils.hpp b/src/hotspot/share/gc/shared/workerUtils.hpp
index 5f771a57837..7bf9d7d7656 100644
--- a/src/hotspot/share/gc/shared/workerUtils.hpp
+++ b/src/hotspot/share/gc/shared/workerUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "cppstdlib/type_traits.hpp"
 #include "memory/allocation.hpp"
 #include "metaprogramming/enableIf.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -79,11 +80,11 @@ public:
 // enumeration type.
 
 class SubTasksDone: public CHeapObj<mtInternal> {
-  volatile bool* _tasks;
+  Atomic<bool>* _tasks;
   uint _n_tasks;
 
   // make sure verification logic is run exactly once to avoid duplicate assertion failures
-  DEBUG_ONLY(volatile bool _verification_done = false;)
+  DEBUG_ONLY(Atomic<bool> _verification_done;)
   void all_tasks_claimed_impl(uint skipped[], size_t skipped_size) NOT_DEBUG_RETURN;
 
   NONCOPYABLE(SubTasksDone);
@@ -127,7 +128,7 @@ public:
 class SequentialSubTasksDone : public CHeapObj<mtInternal> {
 
   uint _num_tasks;     // Total number of tasks available.
-  volatile uint _num_claimed;   // Number of tasks claimed.
+  Atomic<uint> _num_claimed;    // Number of tasks claimed.
 
   NONCOPYABLE(SequentialSubTasksDone);
 
@@ -135,7 +136,8 @@ public:
   SequentialSubTasksDone(uint num_tasks) : _num_tasks(num_tasks), _num_claimed(0) { }
   ~SequentialSubTasksDone() {
     // Claiming may try to claim more tasks than there are.
-    assert(_num_claimed >= _num_tasks, "Claimed %u tasks of %u", _num_claimed, _num_tasks);
+    assert(_num_claimed.load_relaxed() >= _num_tasks,
+           "Claimed %u tasks of %u", _num_claimed.load_relaxed(), _num_tasks);
   }
 
   // Attempt to claim the next unclaimed task in the sequence,
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
index 1ba18f37c2b..9b7824a50d7 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
@@ -33,7 +33,7 @@
 #include "utilities/numberSeq.hpp"
 
 /**
- * ShenanoahAllocationRate maintains a truncated history of recently sampled allocation rates for the purpose of providing
+ * ShenandoahAllocationRate maintains a truncated history of recently sampled allocation rates for the purpose of providing
  * informed estimates of current and future allocation rates based on weighted averages and standard deviations of the
  * truncated history.  More recently sampled allocations are weighted more heavily than older samples when computing
  * averages and standard deviations.
@@ -108,20 +108,20 @@ public:
 
   virtual ~ShenandoahAdaptiveHeuristics();
 
-  virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
-                                                     RegionData* data, size_t size,
-                                                     size_t actual_free) override;
+  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
+                                                       RegionData* data, size_t size,
+                                                       size_t actual_free) override;
 
-  virtual void record_cycle_start() override;
-  virtual void record_success_concurrent() override;
-  virtual void record_degenerated() override;
-  virtual void record_success_full() override;
+  void record_cycle_start() override;
+  void record_success_concurrent() override;
+  void record_degenerated() override;
+  void record_success_full() override;
 
-  virtual bool should_start_gc() override;
+  bool should_start_gc() override;
 
-  virtual const char* name() override     { return "Adaptive"; }
-  virtual bool is_diagnostic() override   { return false; }
-  virtual bool is_experimental() override { return false; }
+  const char* name() override     { return "Adaptive"; }
+  bool is_diagnostic() override   { return false; }
+  bool is_experimental() override { return false; }
 
  private:
   // These are used to adjust the margin of error and the spike threshold
@@ -185,7 +185,7 @@ protected:
   // in the generational case. Controlled by global flag ShenandoahMinFreeThreshold.
   size_t min_free_threshold();
 
-  inline void accept_trigger_with_type(Trigger trigger_type) {
+  void accept_trigger_with_type(Trigger trigger_type) {
     _last_trigger = trigger_type;
     ShenandoahHeuristics::accept_trigger();
   }
@@ -193,7 +193,7 @@ protected:
 public:
   // Sample the allocation rate at GC trigger time if possible.  Return the number of allocated bytes that were
   // not accounted for in the sample.  This must be called before resetting bytes allocated since gc start.
-  virtual size_t force_alloc_rate_sample(size_t bytes_allocated) override {
+  size_t force_alloc_rate_sample(size_t bytes_allocated) override {
     size_t unaccounted_bytes;
     _allocation_rate.force_sample(bytes_allocated, unaccounted_bytes);
     return unaccounted_bytes;
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
index 5075258f1ce..9dc88a61bf5 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
@@ -35,17 +35,17 @@ class ShenandoahAggressiveHeuristics : public ShenandoahHeuristics {
 public:
   ShenandoahAggressiveHeuristics(ShenandoahSpaceInfo* space_info);
 
-  virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
-                                                     RegionData* data, size_t size,
-                                                     size_t free);
+  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
+                                             RegionData* data, size_t size,
+                                             size_t free) override;
 
-  virtual bool should_start_gc();
+  bool should_start_gc() override;
 
-  virtual bool should_unload_classes();
+  bool should_unload_classes() override;
 
-  virtual const char* name()     { return "Aggressive"; }
-  virtual bool is_diagnostic()   { return true; }
-  virtual bool is_experimental() { return false; }
+  const char* name()     override { return "Aggressive"; }
+  bool is_diagnostic()   override { return true; }
+  bool is_experimental() override { return false; }
 };
 
 #endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
index 21ec99eabc0..a32c9c88478 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
@@ -33,17 +33,17 @@
  */
 class ShenandoahCompactHeuristics : public ShenandoahHeuristics {
 public:
-  ShenandoahCompactHeuristics(ShenandoahSpaceInfo* space_info);
+  explicit ShenandoahCompactHeuristics(ShenandoahSpaceInfo* space_info);
 
-  virtual bool should_start_gc();
+  bool should_start_gc() override;
 
-  virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
-                                                     RegionData* data, size_t size,
-                                                     size_t actual_free);
+  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
+                                             RegionData* data, size_t size,
+                                             size_t actual_free) override;
 
-  virtual const char* name()     { return "Compact"; }
-  virtual bool is_diagnostic()   { return false; }
-  virtual bool is_experimental() { return false; }
+  const char* name() override     { return "Compact"; }
+  bool is_diagnostic() override   { return false; }
+  bool is_experimental() override { return false; }
 };
 
 #endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
index b14d72f249b..029b917deab 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
@@ -25,19 +25,206 @@
 
 #include "gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
+#include "gc/shenandoah/shenandoahCollectionSetPreselector.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
+#include "gc/shenandoah/shenandoahInPlacePromoter.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
 #include "gc/shenandoah/shenandoahTrace.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "logging/log.hpp"
+#include "utilities/quickSort.hpp"
+
+using idx_t = ShenandoahSimpleBitMap::idx_t;
+
+typedef struct {
+  ShenandoahHeapRegion* _region;
+  size_t _live_data;
+} AgedRegionData;
+
+static int compare_by_aged_live(AgedRegionData a, AgedRegionData b) {
+  if (a._live_data < b._live_data)
+    return -1;
+  if (a._live_data > b._live_data)
+    return 1;
+  return 0;
+}
+
+inline void assert_no_in_place_promotions() {
+#ifdef ASSERT
+  class ShenandoahNoInPlacePromotions : public ShenandoahHeapRegionClosure {
+  public:
+    void heap_region_do(ShenandoahHeapRegion *r) override {
+      assert(r->get_top_before_promote() == nullptr,
+             "Region %zu should not be ready for in-place promotion", r->index());
+    }
+  } cl;
+  ShenandoahHeap::heap()->heap_region_iterate(&cl);
+#endif
+}
 
 ShenandoahGenerationalHeuristics::ShenandoahGenerationalHeuristics(ShenandoahGeneration* generation)
-        : ShenandoahAdaptiveHeuristics(generation), _generation(generation) {
+        : ShenandoahAdaptiveHeuristics(generation), _generation(generation), _add_regions_to_old(0) {
 }
 
 void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectionSet* collection_set) {
+  ShenandoahHeap* heap = ShenandoahHeap::heap();
+
+  _add_regions_to_old = 0;
+
+  // Seed the collection set with resource area-allocated
+  // preselected regions, which are removed when we exit this scope.
+  ShenandoahCollectionSetPreselector preselector(collection_set, heap->num_regions());
+
+  // Find the amount that will be promoted, regions that will be promoted in
+  // place, and preselected older regions that will be promoted by evacuation.
+  compute_evacuation_budgets(heap);
+
+  // Choose the collection set, including the regions preselected above for promotion into the old generation.
+  filter_regions(collection_set);
+
+  // Even if collection_set->is_empty(), we want to adjust budgets, making reserves available to mutator.
+  adjust_evacuation_budgets(heap, collection_set);
+
+  if (_generation->is_global()) {
+    // We have just chosen a collection set for a global cycle. The mark bitmap covering old regions is complete, so
+    // the remembered set scan can use that to avoid walking into garbage. When the next old mark begins, we will
+    // use the mark bitmap to make the old regions parsable by coalescing and filling any unmarked objects. Thus,
+    // we prepare for old collections by remembering which regions are old at this time. Note that any objects
+    // promoted into old regions will be above TAMS, and so will be considered marked. However, free regions that
+    // become old after this point will not be covered correctly by the mark bitmap, so we must be careful not to
+    // coalesce those regions. Only the old regions which are not part of the collection set at this point are
+    // eligible for coalescing. As implemented now, this has the side effect of possibly initiating mixed-evacuations
+    // after a global cycle for old regions that were not included in this collection set.
+    heap->old_generation()->prepare_for_mixed_collections_after_global_gc();
+  }
+}
+
+void ShenandoahGenerationalHeuristics::compute_evacuation_budgets(ShenandoahHeap* const heap) {
+  shenandoah_assert_generational();
+
+  ShenandoahOldGeneration* const old_generation = heap->old_generation();
+  ShenandoahYoungGeneration* const young_generation = heap->young_generation();
+  const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+
+  // During initialization and phase changes, it is more likely that fewer objects die young and old-gen
+  // memory is not yet full (or is in the process of being replaced).  During these times especially, it
+  // is beneficial to loan memory from old-gen to young-gen during the evacuation and update-refs phases
+  // of execution.
+
+  // Calculate EvacuationReserve before PromotionReserve.  Evacuation is more critical than promotion.
+  // If we cannot evacuate old-gen, we will not be able to reclaim old-gen memory.  Promotions are less
+  // critical.  If we cannot promote, there may be degradation of young-gen memory because old objects
+  // accumulate there until they can be promoted.  This increases the young-gen marking and evacuation work.
+
+  // First priority is to reclaim the easy garbage out of young-gen.
+
+  // maximum_young_evacuation_reserve is upper bound on memory to be evacuated into young Collector Reserve.  This is
+  // bounded at the end of previous GC cycle, based on available memory and balancing of evacuation to old and young.
+  size_t maximum_young_evacuation_reserve = young_generation->get_evacuation_reserve();
+
+  // maximum_old_evacuation_reserve is an upper bound on memory evacuated from old and evacuated to old (promoted),
+  // clamped by the old generation space available.
+  //
+  // Here's the algebra.
+  // Let SOEP = ShenandoahOldEvacPercent,
+  //     OE = old evac,
+  //     YE = young evac, and
+  //     TE = total evac = OE + YE
+  // By definition:
+  //            SOEP/100 = OE/TE
+  //                     = OE/(OE+YE)
+  //  => SOEP/(100-SOEP) = OE/((OE+YE)-OE)         // componendo-dividendo: If a/b = c/d, then a/(b-a) = c/(d-c)
+  //                     = OE/YE
+  //  =>              OE = YE*SOEP/(100-SOEP)
+
+  // We have to be careful in the event that SOEP is set to 100 by the user.
+  assert(ShenandoahOldEvacPercent <= 100, "Error");
+  const size_t old_available = old_generation->available();
+  const size_t maximum_old_evacuation_reserve = (ShenandoahOldEvacPercent == 100) ?
+    old_available : MIN2((maximum_young_evacuation_reserve * ShenandoahOldEvacPercent) / (100 - ShenandoahOldEvacPercent),
+                          old_available);
+
+  // In some cases, maximum_old_reserve < old_available (when limited by ShenandoahOldEvacPercent)
+  // This limit affects mixed evacuations, but does not affect promotions.
+
+  // Second priority is to reclaim garbage out of old-gen if there are old-gen collection candidates.  Third priority
+  // is to promote as much as we have room to promote.  However, if old-gen memory is in short supply, this means young
+  // GC is operating under "duress" and was unable to transfer the memory that we would normally expect.  In this case,
+  // old-gen will refrain from compacting itself in order to allow a quicker young-gen cycle (by avoiding the update-refs
+  // through ALL of old-gen).  If there is some memory available in old-gen, we will use this for promotions as promotions
+  // do not add to the update-refs burden of GC.
+
+  size_t old_evacuation_reserve, old_promo_reserve;
+  if (_generation->is_global()) {
+    // Global GC is typically triggered by user invocation of System.gc(), and typically indicates that there is lots
+    // of garbage to be reclaimed because we are starting a new phase of execution.  Marking for global GC may take
+    // significantly longer than typical young marking because we must mark through all old objects.  To expedite
+    // evacuation and update-refs, we give emphasis to reclaiming garbage first, wherever that garbage is found.
+    // Global GC will adjust generation sizes to accommodate the collection set it chooses.
+
+    // Use remnant of old_available to hold promotions.
+    old_promo_reserve = old_available - maximum_old_evacuation_reserve;
+
+    // Dedicate all available old memory to old_evacuation reserve.  This may be small, because old-gen is only
+    // expanded based on an existing mixed evacuation workload at the end of the previous GC cycle.  We'll expand
+    // the budget for evacuation of old during GLOBAL cset selection.
+    old_evacuation_reserve = maximum_old_evacuation_reserve;
+  } else if (old_generation->has_unprocessed_collection_candidates()) {
+    // We reserved all old-gen memory at end of previous GC to hold anticipated evacuations to old-gen.  If this is
+    // mixed evacuation, reserve all of this memory for compaction of old-gen and do not promote.  Prioritize compaction
+    // over promotion in order to defragment OLD so that it will be better prepared to efficiently receive promoted memory.
+    old_evacuation_reserve = maximum_old_evacuation_reserve;
+    old_promo_reserve = old_available - maximum_old_evacuation_reserve;
+  } else {
+    // Make all old-evacuation memory for promotion, but if we can't use it all for promotion, we'll allow some evacuation.
+    old_evacuation_reserve = old_available - maximum_old_evacuation_reserve;
+    old_promo_reserve = maximum_old_evacuation_reserve;
+  }
+  assert(old_evacuation_reserve <= old_available, "Error");
+
+
+  // We see too many old-evacuation failures if we force ourselves to evacuate into regions that are not initially empty.
+  // So we limit the old-evacuation reserve to unfragmented memory.  Even so, old-evacuation is free to fill in nooks and
+  // crannies within existing partially used regions and it generally tries to do so.
+  const size_t old_free_unfragmented = old_generation->free_unaffiliated_regions() * region_size_bytes;
+  if (old_evacuation_reserve > old_free_unfragmented) {
+    const size_t delta = old_evacuation_reserve - old_free_unfragmented;
+    old_evacuation_reserve -= delta;
+    // Let promo consume fragments of old-gen memory
+    old_promo_reserve += delta;
+  }
+
+  // If is_global(), we let garbage-first heuristic determine cset membership.  Otherwise, we give priority
+  // to tenurable regions by preselecting regions for promotion by evacuation (obtaining the live data to seed promoted_reserve).
+  // This also identifies regions that will be promoted in place. These use the tenuring threshold.
+  const size_t consumed_by_advance_promotion = select_aged_regions(_generation->is_global()? 0: old_promo_reserve);
+  assert(consumed_by_advance_promotion <= old_promo_reserve, "Do not promote more than budgeted");
+
+  // The young evacuation reserve can be no larger than young_unaffiliated.  Planning to evacuate into partially consumed
+  // young regions is doomed to failure if any of those partially consumed regions is selected for the collection set.
+  size_t young_unaffiliated = young_generation->free_unaffiliated_regions() * region_size_bytes;
+
+  // If any regions have been selected for promotion in place, this has the effect of decreasing available within mutator
+  // and collector partitions, due to padding of remnant memory within each promoted in place region.  This will affect
+  // young_evacuation_reserve but not old_evacuation_reserve or consumed_by_advance_promotion.  So recompute.
+  size_t young_evacuation_reserve = MIN2(maximum_young_evacuation_reserve, young_unaffiliated);
+
+  // Note that unused old_promo_reserve might not be entirely consumed_by_advance_promotion.  Do not transfer this
+  // to old_evacuation_reserve because this memory is likely very fragmented, and we do not want to increase the likelihood
+  // of old evacuation failure.  Leave this memory in the promoted reserve as it may be targeted by opportunistic
+  // promotions (found during evacuation of young regions).
+  young_generation->set_evacuation_reserve(young_evacuation_reserve);
+  old_generation->set_evacuation_reserve(old_evacuation_reserve);
+  old_generation->set_promoted_reserve(old_promo_reserve);
+
+  // There is no need to expand OLD because all memory used here was set aside at end of previous GC, except in the
+  // case of a GLOBAL gc.  During choose_collection_set() of GLOBAL, old will be expanded on demand.
+}
+
+void ShenandoahGenerationalHeuristics::filter_regions(ShenandoahCollectionSet* collection_set) {
   assert(collection_set->is_empty(), "Must be empty");
 
   auto heap = ShenandoahGenerationalHeap::heap();
@@ -168,14 +355,9 @@ void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectio
           byte_size_in_proper_unit(total_garbage), proper_unit_for_byte_size(total_garbage));
 
   size_t immediate_percent = (total_garbage == 0) ? 0 : (immediate_garbage * 100 / total_garbage);
-
   bool doing_promote_in_place = (humongous_regions_promoted + regular_regions_promoted_in_place > 0);
-  if (doing_promote_in_place || (preselected_candidates > 0) || (immediate_percent <= ShenandoahImmediateThreshold)) {
-    // Only young collections need to prime the collection set.
-    if (_generation->is_young()) {
-      heap->old_generation()->heuristics()->prime_collection_set(collection_set);
-    }
 
+  if (doing_promote_in_place || (preselected_candidates > 0) || (immediate_percent <= ShenandoahImmediateThreshold)) {
     // Call the subclasses to add young-gen regions into the collection set.
     choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
   }
@@ -196,6 +378,262 @@ void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectio
                                            immediate_garbage);
 }
 
+// Preselect for inclusion into the collection set all regions whose age is at or above tenure age and for which the
+// garbage percentage exceeds a dynamically adjusted threshold (known as the old-garbage threshold percentage).  We
+// identify these regions by setting the appropriate entry of the collection set's preselected regions array to true.
+// All entries are initialized to false before calling this function.
+//
+// During the subsequent selection of the collection set, we give priority to these promotion set candidates.
+// Without this prioritization, we found that the aged regions tend to be ignored because they typically have
+// much less garbage and much more live data than the recently allocated "eden" regions.  When aged regions are
+// repeatedly excluded from the collection set, the amount of live memory within the young generation tends to
+// accumulate and this has the undesirable side effect of causing young-generation collections to require much more
+// CPU and wall-clock time.
+//
+// A second benefit of treating aged regions differently than other regions during collection set selection is
+// that this allows us to more accurately budget memory to hold the results of evacuation.  Memory for evacuation
+// of aged regions must be reserved in the old generation.  Memory for evacuation of all other regions must be
+// reserved in the young generation.
+size_t ShenandoahGenerationalHeuristics::select_aged_regions(const size_t old_promotion_reserve) {
+
+  // There should be no regions configured for subsequent in-place-promotions carried over from the previous cycle.
+  assert_no_in_place_promotions();
+
+  auto const heap = ShenandoahGenerationalHeap::heap();
+  ShenandoahFreeSet* free_set = heap->free_set();
+  bool* const candidate_regions_for_promotion_by_copy = heap->collection_set()->preselected_regions();
+  ShenandoahMarkingContext* const ctx = heap->marking_context();
+
+  size_t promo_potential = 0;
+  size_t candidates = 0;
+
+  // Sort the promotion-eligible regions in order of increasing live-data-bytes so that we can first reclaim regions that require
+  // less evacuation effort.  This prioritizes garbage first, expanding the allocation pool early before we reclaim regions that
+  // have more live data.
+  const idx_t num_regions = heap->num_regions();
+
+  ResourceMark rm;
+  AgedRegionData* sorted_regions = NEW_RESOURCE_ARRAY(AgedRegionData, num_regions);
+
+  ShenandoahInPlacePromotionPlanner in_place_promotions(heap);
+
+  for (idx_t i = 0; i < num_regions; i++) {
+    ShenandoahHeapRegion* const r = heap->get_region(i);
+    if (r->is_empty() || !r->has_live() || !r->is_young() || !r->is_regular()) {
+      // skip over regions that aren't regular young with some live data
+      continue;
+    }
+    if (heap->is_tenurable(r)) {
+      if (in_place_promotions.is_eligible(r)) {
+        // We prefer to promote this region in place because it has a small amount of garbage and a large usage.
+        // Note that if this region has been used recently for allocation, it will not be promoted and it will
+        // not be selected for promotion by evacuation.
+        in_place_promotions.prepare(r);
+      } else {
+        // Record this promotion-eligible candidate region. After sorting and selecting the best candidates below,
+        // we may still decide to exclude this promotion-eligible region from the current collection set.  If this
+        // happens, we will consider this region as part of the anticipated promotion potential for the next GC
+        // pass; see further below.
+        sorted_regions[candidates]._region = r;
+        sorted_regions[candidates]._live_data = r->get_live_data_bytes();
+        candidates++;
+      }
+    } else {
+      // We only evacuate & promote objects from regular regions whose garbage() is above old-garbage-threshold.
+      // Objects in tenure-worthy regions with less garbage are promoted in place. These take a different path to
+      // old-gen.  Regions excluded from promotion because their garbage content is too low (causing us to anticipate that
+      // the region would be promoted in place) may be eligible for evacuation promotion by the time promotion takes
+      // place during a subsequent GC pass because more garbage is found within the region between now and then.  This
+      // should not happen if we are properly adapting the tenure age.  The theory behind adaptive tenuring threshold
+      // is to choose the youngest age that demonstrates no "significant" further loss of population since the previous
+      // age.  If not this, we expect the tenure age to demonstrate linear population decay for at least two population
+      // samples, whereas we expect to observe exponential population decay for ages younger than the tenure age.
+      //
+      // In the case that certain regions which were anticipated to be promoted in place need to be promoted by
+      // evacuation, it may be the case that there is not sufficient reserve within old-gen to hold evacuation of
+      // these regions.  The likely outcome is that these regions will not be selected for evacuation or promotion
+      // in the current cycle and we will anticipate that they will be promoted in the next cycle.  This will cause
+      // us to reserve more old-gen memory so that these objects can be promoted in the subsequent cycle.
+      if (heap->is_aging_cycle() && heap->age_census()->is_tenurable(r->age() + 1)) {
+        if (r->garbage() >= in_place_promotions.old_garbage_threshold()) {
+          promo_potential += r->get_live_data_bytes();
+        }
+      }
+    }
+    // Note that we keep going even if one region is excluded from selection.
+    // Subsequent regions may be selected if they have smaller live data.
+  }
+
+  in_place_promotions.update_free_set();
+
+  // Sort in increasing order according to live data bytes.  Note that candidates represents the number of regions
+  // that qualify to be promoted by evacuation.
+  size_t old_consumed = 0;
+  if (candidates > 0) {
+    size_t selected_regions = 0;
+    size_t selected_live = 0;
+    QuickSort::sort<AgedRegionData>(sorted_regions, candidates, compare_by_aged_live);
+    for (size_t i = 0; i < candidates; i++) {
+      ShenandoahHeapRegion* const region = sorted_regions[i]._region;
+      const size_t region_live_data = sorted_regions[i]._live_data;
+      const size_t promotion_need = (size_t) (region_live_data * ShenandoahPromoEvacWaste);
+      if (old_consumed + promotion_need <= old_promotion_reserve) {
+        old_consumed += promotion_need;
+        candidate_regions_for_promotion_by_copy[region->index()] = true;
+        selected_regions++;
+        selected_live += region_live_data;
+      } else {
+        // We rejected this promotable region from the collection set because we had no room to hold its copy.
+        // Add this region to promo potential for next GC.
+        promo_potential += region_live_data;
+        assert(!candidate_regions_for_promotion_by_copy[region->index()], "Shouldn't be selected");
+      }
+      // We keep going even if one region is excluded from selection because we need to accumulate all eligible
+      // regions that are not preselected into promo_potential
+    }
+    log_debug(gc, ergo)("Preselected %zu regions containing " PROPERFMT " live data,"
+                        " consuming: " PROPERFMT " of budgeted: " PROPERFMT,
+                        selected_regions, PROPERFMTARGS(selected_live), PROPERFMTARGS(old_consumed), PROPERFMTARGS(old_promotion_reserve));
+  }
+
+  log_info(gc, ergo)("Promotion potential of aged regions with sufficient garbage: " PROPERFMT, PROPERFMTARGS(promo_potential));
+  heap->old_generation()->set_promotion_potential(promo_potential);
+  return old_consumed;
+}
+
+// Having chosen the collection set, adjust the budgets for generational mode based on its composition.  Note
+// that young_generation->available() now knows about recently discovered immediate garbage.
+void ShenandoahGenerationalHeuristics::adjust_evacuation_budgets(ShenandoahHeap* const heap,
+                                                                 ShenandoahCollectionSet* const collection_set) {
+  shenandoah_assert_generational();
+  // We may find that old_evacuation_reserve and/or loaned_for_young_evacuation are not fully consumed, in which case we may
+  //  be able to increase regions_available_to_loan
+
+  // The role of adjust_evacuation_budgets() is to compute the correct value of regions_available_to_loan and to make
+  // effective use of this memory, including the remnant memory within these regions that may result from rounding loan to
+  // integral number of regions.  Excess memory that is available to be loaned is applied to an allocation supplement,
+  // which allows mutators to allocate memory beyond the current capacity of young-gen on the promise that the loan
+  // will be repaid as soon as we finish updating references for the recently evacuated collection set.
+
+  // We cannot recalculate regions_available_to_loan by simply dividing old_generation->available() by region_size_bytes
+  // because the available memory may be distributed between many partially occupied regions that are already holding old-gen
+  // objects.  Memory in partially occupied regions is not "available" to be loaned.  Note that an increase in old-gen
+  // available that results from a decrease in memory consumed by old evacuation is not necessarily available to be loaned
+  // to young-gen.
+
+  const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+  ShenandoahOldGeneration* const old_generation = heap->old_generation();
+  ShenandoahYoungGeneration* const young_generation = heap->young_generation();
+
+  const size_t old_evacuated = collection_set->get_live_bytes_in_old_regions();
+  size_t old_evacuated_committed = (size_t) (ShenandoahOldEvacWaste * double(old_evacuated));
+  size_t old_evacuation_reserve = old_generation->get_evacuation_reserve();
+
+  if (old_evacuated_committed > old_evacuation_reserve) {
+    // This should only happen due to round-off errors when enforcing ShenandoahOldEvacWaste
+    assert(old_evacuated_committed <= (33 * old_evacuation_reserve) / 32,
+           "Round-off errors should be less than 3.125%%, committed: %zu, reserved: %zu",
+           old_evacuated_committed, old_evacuation_reserve);
+    old_evacuated_committed = old_evacuation_reserve;
+    // Leave old_evac_reserve as previously configured
+  } else if (old_evacuated_committed < old_evacuation_reserve) {
+    // This happens if the old-gen collection consumes less than full budget.
+    log_debug(gc, cset)("Shrinking old evac reserve to match old_evac_commited: " PROPERFMT,
+                        PROPERFMTARGS(old_evacuated_committed));
+    old_evacuation_reserve = old_evacuated_committed;
+    old_generation->set_evacuation_reserve(old_evacuation_reserve);
+  }
+
+  size_t young_advance_promoted = collection_set->get_live_bytes_in_tenurable_regions();
+  size_t young_advance_promoted_reserve_used = (size_t) (ShenandoahPromoEvacWaste * double(young_advance_promoted));
+
+  size_t young_evacuated = collection_set->get_live_bytes_in_untenurable_regions();
+  size_t young_evacuated_reserve_used = (size_t) (ShenandoahEvacWaste * double(young_evacuated));
+
+  size_t total_young_available = young_generation->available_with_reserve() - _add_regions_to_old * region_size_bytes;;
+  assert(young_evacuated_reserve_used <= total_young_available, "Cannot evacuate (%zu) more than is available in young (%zu)",
+         young_evacuated_reserve_used, total_young_available);
+  young_generation->set_evacuation_reserve(young_evacuated_reserve_used);
+
+  // We have not yet rebuilt the free set.  Some of the memory that is thought to be avaiable within old may no
+  // longer be available if that memory had been free within regions that were selected for the collection set.
+  // Make the necessary adjustments to old_available.
+  size_t old_available =
+    old_generation->available() + _add_regions_to_old * region_size_bytes - collection_set->get_old_available_bytes_collected();
+
+  // Now that we've established the collection set, we know how much memory is really required by old-gen for evacuation
+  // and promotion reserves.  Try shrinking OLD now in case that gives us a bit more runway for mutator allocations during
+  // evac and update phases.
+  size_t old_consumed = old_evacuated_committed + young_advance_promoted_reserve_used;
+
+  if (old_available < old_consumed) {
+    // This can happen due to round-off errors when adding the results of truncated integer arithmetic.
+    // We've already truncated old_evacuated_committed.  Truncate young_advance_promoted_reserve_used here.
+
+    assert(young_advance_promoted_reserve_used <= (33 * (old_available - old_evacuated_committed)) / 32,
+           "Round-off errors should be less than 3.125%%, committed: %zu, reserved: %zu",
+           young_advance_promoted_reserve_used, old_available - old_evacuated_committed);
+    if (old_available > old_evacuated_committed) {
+      young_advance_promoted_reserve_used = old_available - old_evacuated_committed;
+    } else {
+      young_advance_promoted_reserve_used = 0;
+      old_evacuated_committed = old_available;
+    }
+    // TODO: reserve for full promotion reserve, not just for advance (preselected) promotion
+    old_consumed = old_evacuated_committed + young_advance_promoted_reserve_used;
+  }
+
+  assert(old_available >= old_consumed, "Cannot consume (%zu) more than is available (%zu)",
+         old_consumed, old_available);
+  size_t excess_old = old_available - old_consumed;
+  size_t unaffiliated_old_regions = old_generation->free_unaffiliated_regions() + _add_regions_to_old;
+  size_t unaffiliated_old = unaffiliated_old_regions * region_size_bytes;
+  assert(unaffiliated_old >= old_evacuated_committed, "Do not evacuate (%zu) more than unaffiliated old (%zu)",
+         old_evacuated_committed, unaffiliated_old);
+
+  // Make sure old_evac_committed is unaffiliated
+  if (old_evacuated_committed > 0) {
+    if (unaffiliated_old > old_evacuated_committed) {
+      size_t giveaway = unaffiliated_old - old_evacuated_committed;
+      size_t giveaway_regions = giveaway / region_size_bytes;  // round down
+      if (giveaway_regions > 0) {
+        excess_old = MIN2(excess_old, giveaway_regions * region_size_bytes);
+      } else {
+        excess_old = 0;
+      }
+    } else {
+      excess_old = 0;
+    }
+  }
+
+  // If we find that OLD has excess regions, give them back to YOUNG now to reduce likelihood we run out of allocation
+  // runway during evacuation and update-refs.  We may make further adjustments to balance.
+  ssize_t add_regions_to_young = 0;
+  if (excess_old > unaffiliated_old) {
+    // we can give back unaffiliated_old (all of unaffiliated is excess)
+    if (unaffiliated_old_regions > 0) {
+      add_regions_to_young = unaffiliated_old_regions;
+    }
+  } else if (unaffiliated_old_regions > 0) {
+    // excess_old < unaffiliated old: we can give back MIN(excess_old/region_size_bytes, unaffiliated_old_regions)
+    size_t excess_regions = excess_old / region_size_bytes;
+    add_regions_to_young = MIN2(excess_regions, unaffiliated_old_regions);
+  }
+
+  if (add_regions_to_young > 0) {
+    assert(excess_old >= add_regions_to_young * region_size_bytes, "Cannot xfer more than excess old");
+    excess_old -= add_regions_to_young * region_size_bytes;
+    log_debug(gc, ergo)("Before start of evacuation, total_promotion reserve is young_advance_promoted_reserve: %zu "
+                        "plus excess: old: %zu", young_advance_promoted_reserve_used, excess_old);
+  }
+
+  // Add in the excess_old memory to hold unanticipated promotions, if any.  If there are more unanticipated
+  // promotions than fit in reserved memory, they will be deferred until a future GC pass.
+  size_t total_promotion_reserve = young_advance_promoted_reserve_used + excess_old;
+
+  old_generation->set_promoted_reserve(total_promotion_reserve);
+  old_generation->reset_promoted_expended();
+}
 
 size_t ShenandoahGenerationalHeuristics::add_preselected_regions_to_collection_set(ShenandoahCollectionSet* cset,
                                                                                    const RegionData* data,
@@ -210,13 +648,6 @@ size_t ShenandoahGenerationalHeuristics::add_preselected_regions_to_collection_s
       assert(ShenandoahGenerationalHeap::heap()->is_tenurable(r), "Preselected regions must have tenure age");
       // Entire region will be promoted, This region does not impact young-gen or old-gen evacuation reserve.
       // This region has been pre-selected and its impact on promotion reserve is already accounted for.
-
-      // r->used() is r->garbage() + r->get_live_data_bytes()
-      // Since all live data in this region is being evacuated from young-gen, it is as if this memory
-      // is garbage insofar as young-gen is concerned.  Counting this as garbage reduces the need to
-      // reclaim highly utilized young-gen regions just for the sake of finding min_garbage to reclaim
-      // within young-gen memory.
-
       cur_young_garbage += r->garbage();
       cset->add_region(r);
     }
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp
index 31c016bb4b7..74d657feab7 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp
@@ -29,6 +29,9 @@
 #include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
 
 class ShenandoahGeneration;
+class ShenandoahHeap;
+class ShenandoahCollectionSet;
+class RegionData;
 
 /*
  * This class serves as the base class for heuristics used to trigger and
@@ -45,9 +48,41 @@ public:
   explicit ShenandoahGenerationalHeuristics(ShenandoahGeneration* generation);
 
   void choose_collection_set(ShenandoahCollectionSet* collection_set) override;
+
+private:
+  // Compute evacuation budgets prior to choosing collection set.
+  void compute_evacuation_budgets(ShenandoahHeap* const heap);
+
+  // Preselect for possible inclusion into the collection set exactly the most
+  // garbage-dense regions, including those that satisfy criteria 1 & 2 below,
+  // and whose live bytes will fit within old_available budget:
+  // Criterion 1. region age >= tenuring threshold
+  // Criterion 2. region garbage percentage > old garbage threshold
+  //
+  // Identifies regions eligible for promotion in place,
+  // being those of at least tenuring_threshold age that have lower garbage
+  // density.
+  //
+  // Updates promotion_potential and pad_for_promote_in_place fields
+  // of the heap. Returns bytes of live object memory in the preselected
+  // regions, which are marked in the preselected_regions() indicator
+  // array of the heap's collection set, which should be initialized
+  // to false.
+  size_t select_aged_regions(const size_t old_promotion_reserve);
+
+  // Filter and sort remaining regions before adding to collection set.
+  void filter_regions(ShenandoahCollectionSet* collection_set);
+
+  // Adjust evacuation budgets after choosing collection set.  The argument regions_to_xfer
+  // represents regions to be transferred to old based on decisions made in top_off_collection_set()
+  void adjust_evacuation_budgets(ShenandoahHeap* const heap,
+                                 ShenandoahCollectionSet* const collection_set);
+
 protected:
   ShenandoahGeneration* _generation;
 
+  size_t _add_regions_to_old;
+
   size_t add_preselected_regions_to_collection_set(ShenandoahCollectionSet* cset,
                                                    const RegionData* data,
                                                    size_t size) const;
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
index 51805b205dd..dd2ad28aa4b 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp"
+#include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahGlobalGeneration.hpp"
@@ -39,7 +40,7 @@ void ShenandoahGlobalHeuristics::choose_collection_set_from_regiondata(Shenandoa
                                                                        RegionData* data, size_t size,
                                                                        size_t actual_free) {
   // Better select garbage-first regions
-  QuickSort::sort<RegionData>(data, (int) size, compare_by_garbage);
+  QuickSort::sort<RegionData>(data, size, compare_by_garbage);
 
   choose_global_collection_set(cset, data, size, actual_free, 0 /* cur_young_garbage */);
 }
@@ -49,94 +50,212 @@ void ShenandoahGlobalHeuristics::choose_global_collection_set(ShenandoahCollecti
                                                               const ShenandoahHeuristics::RegionData* data,
                                                               size_t size, size_t actual_free,
                                                               size_t cur_young_garbage) const {
+  shenandoah_assert_heaplocked_or_safepoint();
   auto heap = ShenandoahGenerationalHeap::heap();
+  auto free_set = heap->free_set();
   size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
   size_t capacity = heap->soft_max_capacity();
+
   size_t garbage_threshold = region_size_bytes * ShenandoahGarbageThreshold / 100;
   size_t ignore_threshold = region_size_bytes * ShenandoahIgnoreGarbageThreshold / 100;
 
   size_t young_evac_reserve = heap->young_generation()->get_evacuation_reserve();
+  size_t original_young_evac_reserve = young_evac_reserve;
   size_t old_evac_reserve = heap->old_generation()->get_evacuation_reserve();
-  size_t max_young_cset = (size_t) (young_evac_reserve / ShenandoahEvacWaste);
-  size_t young_cur_cset = 0;
-  size_t max_old_cset = (size_t) (old_evac_reserve / ShenandoahOldEvacWaste);
-  size_t old_cur_cset = 0;
+  size_t old_promo_reserve = heap->old_generation()->get_promoted_reserve();
 
-  // Figure out how many unaffiliated young regions are dedicated to mutator and to evacuator.  Allow the young
-  // collector's unaffiliated regions to be transferred to old-gen if old-gen has more easily reclaimed garbage
-  // than young-gen.  At the end of this cycle, any excess regions remaining in old-gen will be transferred back
-  // to young.  Do not transfer the mutator's unaffiliated regions to old-gen.  Those must remain available
-  // to the mutator as it needs to be able to consume this memory during concurrent GC.
-
-  size_t unaffiliated_young_regions = heap->young_generation()->free_unaffiliated_regions();
+  size_t unaffiliated_young_regions = free_set->collector_unaffiliated_regions();
   size_t unaffiliated_young_memory = unaffiliated_young_regions * region_size_bytes;
+  size_t unaffiliated_old_regions = free_set->old_collector_unaffiliated_regions();
+  size_t unaffiliated_old_memory = unaffiliated_old_regions * region_size_bytes;
 
-  if (unaffiliated_young_memory > max_young_cset) {
-    size_t unaffiliated_mutator_memory = unaffiliated_young_memory - max_young_cset;
-    unaffiliated_young_memory -= unaffiliated_mutator_memory;
-    unaffiliated_young_regions = unaffiliated_young_memory / region_size_bytes; // round down
-    unaffiliated_young_memory = unaffiliated_young_regions * region_size_bytes;
+  // Figure out how many unaffiliated regions are dedicated to Collector and OldCollector reserves.  Let these
+  // be shuffled between young and old generations in order to expedite evacuation of whichever regions have the
+  // most garbage, regardless of whether these garbage-first regions reside in young or old generation.
+  // Excess reserves will be transferred back to the mutator after collection set has been chosen.  At the end
+  // of evacuation, any reserves not consumed by evacuation will also be transferred to the mutator free set.
+
+  // Truncate reserves to only target unaffiliated memory
+  size_t shared_reserve_regions = 0;
+  if (young_evac_reserve > unaffiliated_young_memory) {
+    shared_reserve_regions += unaffiliated_young_regions;
+  } else {
+    size_t delta_regions = young_evac_reserve / region_size_bytes;
+    shared_reserve_regions += delta_regions;
   }
+  young_evac_reserve = 0;
+  size_t total_old_reserve = old_evac_reserve + old_promo_reserve;
+  if (total_old_reserve > unaffiliated_old_memory) {
+    // Give all the unaffiliated memory to the shared reserves.  Leave the rest for promo reserve.
+    shared_reserve_regions += unaffiliated_old_regions;
+    old_promo_reserve = total_old_reserve - unaffiliated_old_memory;
+  } else {
+    size_t delta_regions = old_evac_reserve / region_size_bytes;
+    shared_reserve_regions += delta_regions;
+  }
+  old_evac_reserve = 0;
+  assert(shared_reserve_regions <=
+         (heap->young_generation()->free_unaffiliated_regions() + heap->old_generation()->free_unaffiliated_regions()),
+         "simple math");
 
-  // We'll affiliate these unaffiliated regions with either old or young, depending on need.
-  max_young_cset -= unaffiliated_young_memory;
+  size_t shared_reserves = shared_reserve_regions * region_size_bytes;
+  size_t committed_from_shared_reserves = 0;
 
-  // Keep track of how many regions we plan to transfer from young to old.
-  size_t regions_transferred_to_old = 0;
+  size_t promo_bytes = 0;
+  size_t old_evac_bytes = 0;
+  size_t young_evac_bytes = 0;
 
-  size_t free_target = (capacity * ShenandoahMinFreeThreshold) / 100 + max_young_cset;
+  size_t consumed_by_promo = 0;        // promo_bytes * ShenandoahPromoEvacWaste
+  size_t consumed_by_old_evac = 0;     // old_evac_bytes * ShenandoahOldEvacWaste
+  size_t consumed_by_young_evac = 0;   // young_evac_bytes * ShenandoahEvacWaste
+
+  // Of the memory reclaimed by GC, some of this will need to be reserved for the next GC collection.  Use the current
+  // young reserve as an approximation of the future Collector reserve requirement.  Try to end with at least
+  // (capacity * ShenandoahMinFreeThreshold) / 100 bytes available to the mutator.
+  size_t free_target = (capacity * ShenandoahMinFreeThreshold) / 100 + original_young_evac_reserve;
   size_t min_garbage = (free_target > actual_free) ? (free_target - actual_free) : 0;
 
-  log_info(gc, ergo)("Adaptive CSet Selection for GLOBAL. Max Young Evacuation: %zu"
-                     "%s, Max Old Evacuation: %zu%s, Max Either Evacuation: %zu%s, Actual Free: %zu%s.",
-                     byte_size_in_proper_unit(max_young_cset), proper_unit_for_byte_size(max_young_cset),
-                     byte_size_in_proper_unit(max_old_cset), proper_unit_for_byte_size(max_old_cset),
-                     byte_size_in_proper_unit(unaffiliated_young_memory), proper_unit_for_byte_size(unaffiliated_young_memory),
-                     byte_size_in_proper_unit(actual_free), proper_unit_for_byte_size(actual_free));
+  size_t aged_regions_promoted = 0;
+  size_t young_regions_evacuated = 0;
+  size_t old_regions_evacuated = 0;
 
+  log_info(gc, ergo)("Adaptive CSet Selection for GLOBAL. Discretionary evacuation budget (for either old or young): %zu%s"
+                     ", Actual Free: %zu%s.",
+                      byte_size_in_proper_unit(shared_reserves), proper_unit_for_byte_size(shared_reserves),
+                      byte_size_in_proper_unit(actual_free), proper_unit_for_byte_size(actual_free));
+
+  size_t cur_garbage = cur_young_garbage;
   for (size_t idx = 0; idx < size; idx++) {
     ShenandoahHeapRegion* r = data[idx].get_region();
     assert(!cset->is_preselected(r->index()), "There should be no preselected regions during GLOBAL GC");
     bool add_region = false;
-    if (r->is_old() || heap->is_tenurable(r)) {
-      size_t new_cset = old_cur_cset + r->get_live_data_bytes();
-      if ((r->garbage() > garbage_threshold)) {
-        while ((new_cset > max_old_cset) && (unaffiliated_young_regions > 0)) {
-          unaffiliated_young_regions--;
-          regions_transferred_to_old++;
-          max_old_cset += region_size_bytes / ShenandoahOldEvacWaste;
+    size_t region_garbage = r->garbage();
+    size_t new_garbage = cur_garbage + region_garbage;
+    bool add_regardless = (region_garbage > ignore_threshold) && (new_garbage < min_garbage);
+    size_t live_bytes = r->get_live_data_bytes();
+    if (add_regardless || (region_garbage >= garbage_threshold)) {
+      if (r->is_old()) {
+        size_t anticipated_consumption = (size_t) (live_bytes * ShenandoahOldEvacWaste);
+        size_t new_old_consumption = consumed_by_old_evac + anticipated_consumption;
+        size_t new_old_evac_reserve = old_evac_reserve;
+        size_t proposed_old_region_expansion = 0;
+        while ((new_old_consumption > new_old_evac_reserve) && (committed_from_shared_reserves < shared_reserves)) {
+          committed_from_shared_reserves += region_size_bytes;
+          proposed_old_region_expansion++;
+          new_old_evac_reserve += region_size_bytes;
         }
-      }
-      if ((new_cset <= max_old_cset) && (r->garbage() > garbage_threshold)) {
-        add_region = true;
-        old_cur_cset = new_cset;
-      }
-    } else {
-      assert(r->is_young() && !heap->is_tenurable(r), "DeMorgan's law (assuming r->is_affiliated)");
-      size_t new_cset = young_cur_cset + r->get_live_data_bytes();
-      size_t region_garbage = r->garbage();
-      size_t new_garbage = cur_young_garbage + region_garbage;
-      bool add_regardless = (region_garbage > ignore_threshold) && (new_garbage < min_garbage);
-
-      if (add_regardless || (r->garbage() > garbage_threshold)) {
-        while ((new_cset > max_young_cset) && (unaffiliated_young_regions > 0)) {
-          unaffiliated_young_regions--;
-          max_young_cset += region_size_bytes / ShenandoahEvacWaste;
+        // If this region has free memory and we choose to place it in the collection set, its free memory is no longer
+        // available to hold promotion results.  So we behave as if its free memory is consumed within the promotion reserve.
+        size_t anticipated_loss_from_promo_reserve = r->free();
+        size_t new_promo_consumption = consumed_by_promo + anticipated_loss_from_promo_reserve;
+        size_t new_promo_reserve = old_promo_reserve;
+        while ((new_promo_consumption > new_promo_reserve) && (committed_from_shared_reserves < shared_reserves)) {
+          committed_from_shared_reserves += region_size_bytes;
+          proposed_old_region_expansion++;
+          new_promo_reserve += region_size_bytes;
+        }
+        if ((new_old_consumption <= new_old_evac_reserve) && (new_promo_consumption <= new_promo_reserve)) {
+          add_region = true;
+          old_evac_reserve = new_old_evac_reserve;
+          old_promo_reserve = new_promo_reserve;
+          old_evac_bytes += live_bytes;
+          consumed_by_old_evac = new_old_consumption;
+          consumed_by_promo = new_promo_consumption;
+          cur_garbage = new_garbage;
+          old_regions_evacuated++;
+        } else {
+          // We failed to sufficiently expand old so unwind proposed expansion
+          committed_from_shared_reserves -= proposed_old_region_expansion * region_size_bytes;
+        }
+      } else if (heap->is_tenurable(r)) {
+        size_t anticipated_consumption = (size_t) (live_bytes * ShenandoahPromoEvacWaste);
+        size_t new_promo_consumption = consumed_by_promo + anticipated_consumption;
+        size_t new_promo_reserve = old_promo_reserve;
+        size_t proposed_old_region_expansion = 0;
+        while ((new_promo_consumption > new_promo_reserve) && (committed_from_shared_reserves < shared_reserves)) {
+          committed_from_shared_reserves += region_size_bytes;
+          proposed_old_region_expansion++;
+          new_promo_reserve += region_size_bytes;
+        }
+        if (new_promo_consumption <= new_promo_reserve) {
+          add_region = true;
+          old_promo_reserve = new_promo_reserve;
+          promo_bytes += live_bytes;
+          consumed_by_promo = new_promo_consumption;
+          cur_garbage = new_garbage;
+          aged_regions_promoted++;
+        } else {
+          // We failed to sufficiently expand old so unwind proposed expansion
+          committed_from_shared_reserves -= proposed_old_region_expansion * region_size_bytes;
+        }
+      } else {
+        assert(r->is_young() && !heap->is_tenurable(r), "DeMorgan's law (assuming r->is_affiliated)");
+        size_t anticipated_consumption = (size_t) (live_bytes * ShenandoahEvacWaste);
+        size_t new_young_evac_consumption = consumed_by_young_evac + anticipated_consumption;
+        size_t new_young_evac_reserve = young_evac_reserve;
+        size_t proposed_young_region_expansion = 0;
+        while ((new_young_evac_consumption > new_young_evac_reserve) && (committed_from_shared_reserves < shared_reserves)) {
+          committed_from_shared_reserves += region_size_bytes;
+          proposed_young_region_expansion++;
+          new_young_evac_reserve += region_size_bytes;
+        }
+        if (new_young_evac_consumption <= new_young_evac_reserve) {
+          add_region = true;
+          young_evac_reserve = new_young_evac_reserve;
+          young_evac_bytes += live_bytes;
+          consumed_by_young_evac = new_young_evac_consumption;
+          cur_garbage = new_garbage;
+          young_regions_evacuated++;
+        } else {
+          // We failed to sufficiently expand old so unwind proposed expansion
+          committed_from_shared_reserves -= proposed_young_region_expansion * region_size_bytes;
         }
-      }
-      if ((new_cset <= max_young_cset) && (add_regardless || (region_garbage > garbage_threshold))) {
-        add_region = true;
-        young_cur_cset = new_cset;
-        cur_young_garbage = new_garbage;
       }
     }
     if (add_region) {
       cset->add_region(r);
     }
   }
-  if (regions_transferred_to_old > 0) {
-    assert(young_evac_reserve > regions_transferred_to_old * region_size_bytes, "young reserve cannot be negative");
-    heap->young_generation()->set_evacuation_reserve(young_evac_reserve - regions_transferred_to_old * region_size_bytes);
-    heap->old_generation()->set_evacuation_reserve(old_evac_reserve + regions_transferred_to_old * region_size_bytes);
+
+  if (committed_from_shared_reserves < shared_reserves) {
+    // Give all the rest to promotion
+    old_promo_reserve += (shared_reserves - committed_from_shared_reserves);
+    // dead code: committed_from_shared_reserves = shared_reserves;
   }
+
+  // Consider the effects of round-off:
+  //  1. We know that the sum over each evacuation mutiplied by Evacuation Waste is <= total evacuation reserve
+  //  2. However, the reserve for each individual evacuation may be rounded down.  In the worst case, we will be over budget
+  //     by the number of regions evacuated, since each region's reserve might be under-estimated by at most 1
+  //  3. Likewise, if we take the sum of bytes evacuated and multiply this by the Evacuation Waste and then round down
+  //     to nearest integer, the calculated reserve will underestimate the true reserve needs by at most 1.
+  //  4. This explains the adjustments to subtotals in the assert statements below.
+  assert(young_evac_bytes * ShenandoahEvacWaste <= young_evac_reserve + young_regions_evacuated,
+         "budget: %zu <= %zu", (size_t) (young_evac_bytes * ShenandoahEvacWaste), young_evac_reserve);
+  assert(old_evac_bytes * ShenandoahOldEvacWaste <= old_evac_reserve + old_regions_evacuated,
+         "budget: %zu <= %zu", (size_t) (old_evac_bytes * ShenandoahOldEvacWaste), old_evac_reserve);
+  assert(promo_bytes * ShenandoahPromoEvacWaste <= old_promo_reserve + aged_regions_promoted,
+         "budget: %zu <= %zu", (size_t) (promo_bytes * ShenandoahPromoEvacWaste), old_promo_reserve);
+  assert(young_evac_reserve + old_evac_reserve + old_promo_reserve <=
+         heap->young_generation()->get_evacuation_reserve() + heap->old_generation()->get_evacuation_reserve() +
+         heap->old_generation()->get_promoted_reserve(), "Exceeded budget");
+
+  if (heap->young_generation()->get_evacuation_reserve() < young_evac_reserve) {
+    size_t delta_bytes = young_evac_reserve - heap->young_generation()->get_evacuation_reserve();
+    size_t delta_regions = delta_bytes / region_size_bytes;
+    size_t regions_to_transfer = MIN2(unaffiliated_old_regions, delta_regions);
+    log_info(gc)("Global GC moves %zu unaffiliated regions from old collector to young collector reserves", regions_to_transfer);
+    ssize_t negated_regions = -regions_to_transfer;
+    heap->free_set()->move_unaffiliated_regions_from_collector_to_old_collector(negated_regions);
+  } else if (heap->young_generation()->get_evacuation_reserve() > young_evac_reserve) {
+    size_t delta_bytes = heap->young_generation()->get_evacuation_reserve() - young_evac_reserve;
+    size_t delta_regions = delta_bytes / region_size_bytes;
+    size_t regions_to_transfer = MIN2(unaffiliated_young_regions, delta_regions);
+    log_info(gc)("Global GC moves %zu unaffiliated regions from young collector to old collector reserves", regions_to_transfer);
+    heap->free_set()->move_unaffiliated_regions_from_collector_to_old_collector(regions_to_transfer);
+  }
+
+  heap->young_generation()->set_evacuation_reserve(young_evac_reserve);
+  heap->old_generation()->set_evacuation_reserve(old_evac_reserve);
+  heap->old_generation()->set_promoted_reserve(old_promo_reserve);
 }
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
index eb740cfac61..8fc744112bf 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
@@ -153,7 +153,6 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
   if (immediate_percent <= ShenandoahImmediateThreshold) {
     choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
   }
-
   collection_set->summarize(total_garbage, immediate_garbage, immediate_regions);
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
index fb8cfb36353..633c4e87126 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
@@ -129,6 +129,13 @@ protected:
 #endif
     }
 
+    inline void update_livedata(size_t live) {
+      _region_union._live_data = live;
+#ifdef ASSERT
+      _union_tag = is_live_data;
+#endif
+    }
+
     inline ShenandoahHeapRegion* get_region() const {
       assert(_union_tag != is_uninitialized, "Cannot fetch region from uninitialized RegionData");
       return _region;
@@ -176,6 +183,7 @@ protected:
 
   static int compare_by_garbage(RegionData a, RegionData b);
 
+  // This is a helper function to choose_collection_set()
   virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
                                                      RegionData* data, size_t data_size,
                                                      size_t free) = 0;
@@ -226,6 +234,8 @@ public:
 
   virtual void record_requested_gc();
 
+  // Choose the collection set, returning the number of regions that need to be transferred to the old reserve from the young
+  // reserve in order to effectively evacuate the chosen collection set.  In non-generational mode, the return value is 0.
   virtual void choose_collection_set(ShenandoahCollectionSet* collection_set);
 
   virtual bool can_unload_classes();
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
index 029a4dd98fb..e0cab781674 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
@@ -26,9 +26,11 @@
 #include "gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp"
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
+#include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 #include "logging/log.hpp"
 #include "utilities/quickSort.hpp"
 
@@ -77,18 +79,31 @@ ShenandoahOldHeuristics::ShenandoahOldHeuristics(ShenandoahOldGeneration* genera
 }
 
 bool ShenandoahOldHeuristics::prime_collection_set(ShenandoahCollectionSet* collection_set) {
-  if (unprocessed_old_collection_candidates() == 0) {
-    return false;
-  }
+  _mixed_evac_cset = collection_set;
+  _included_old_regions = 0;
+  _evacuated_old_bytes = 0;
+  _collected_old_bytes = 0;
 
   if (_old_generation->is_preparing_for_mark()) {
     // We have unprocessed old collection candidates, but the heuristic has given up on evacuating them.
     // This is most likely because they were _all_ pinned at the time of the last mixed evacuation (and
     // this in turn is most likely because there are just one or two candidate regions remaining).
-    log_info(gc, ergo)("Remaining " UINT32_FORMAT " old regions are being coalesced and filled", unprocessed_old_collection_candidates());
+    log_info(gc, ergo)("Remaining " UINT32_FORMAT
+                       " old regions are being coalesced and filled", unprocessed_old_collection_candidates());
     return false;
   }
 
+  // Between consecutive mixed-evacuation cycles, the live data within each candidate region may change due to
+  // promotions and old-gen evacuations.  Re-sort the candidate regions in order to first evacuate regions that have
+  // the smallest amount of live data.  These are easiest to evacuate with least effort.  Doing these first allows
+  // us to more quickly replenish free memory with empty regions.
+  for (uint i = _next_old_collection_candidate; i < _last_old_collection_candidate; i++) {
+    ShenandoahHeapRegion* r = _region_data[i].get_region();
+    _region_data[i].update_livedata(r->get_mixed_candidate_live_data_bytes());
+  }
+  QuickSort::sort<RegionData>(_region_data + _next_old_collection_candidate, unprocessed_old_collection_candidates(),
+                              compare_by_live);
+
   _first_pinned_candidate = NOT_FOUND;
 
   uint included_old_regions = 0;
@@ -100,150 +115,44 @@ bool ShenandoahOldHeuristics::prime_collection_set(ShenandoahCollectionSet* coll
   // of memory that can still be evacuated.  We address this by reducing the evacuation budget by the amount
   // of live memory in that region and by the amount of unallocated memory in that region if the evacuation
   // budget is constrained by availability of free memory.
-  const size_t old_evacuation_reserve = _old_generation->get_evacuation_reserve();
-  const size_t old_evacuation_budget = (size_t) ((double) old_evacuation_reserve / ShenandoahOldEvacWaste);
-  size_t unfragmented_available = _old_generation->free_unaffiliated_regions() * ShenandoahHeapRegion::region_size_bytes();
-  size_t fragmented_available;
-  size_t excess_fragmented_available;
+  _old_evacuation_reserve = _old_generation->get_evacuation_reserve();
+  _old_evacuation_budget = (size_t) ((double) _old_evacuation_reserve / ShenandoahOldEvacWaste);
 
-  if (unfragmented_available > old_evacuation_budget) {
-    unfragmented_available = old_evacuation_budget;
-    fragmented_available = 0;
-    excess_fragmented_available = 0;
+  // fragmented_available is the amount of memory within partially consumed old regions that may be required to
+  // hold the results of old evacuations.  If all of the memory required by the old evacuation reserve is available
+  // in unfragmented regions (unaffiliated old regions), then fragmented_available is zero because we do not need
+  // to evacuate into the existing partially consumed old regions.
+
+  // if fragmented_available is non-zero, excess_fragmented_old_budget represents the amount of fragmented memory
+  // that is available within old, but is not required to hold the resuilts of old evacuation.  As old-gen regions
+  // are added into the collection set, their free memory is subtracted from excess_fragmented_old_budget until the
+  // excess is exhausted.  For old-gen regions subsequently added to the collection set, their free memory is
+  // subtracted from fragmented_available and from the old_evacuation_budget (since the budget decreases when this
+  // fragmented_available memory decreases).  After fragmented_available has been exhausted, any further old regions
+  // selected for the cset do not further decrease the old_evacuation_budget because all further evacuation is targeted
+  // to unfragmented regions.
+
+  size_t unaffiliated_available = _old_generation->free_unaffiliated_regions() * ShenandoahHeapRegion::region_size_bytes();
+  if (unaffiliated_available > _old_evacuation_reserve) {
+    _unspent_unfragmented_old_budget = _old_evacuation_budget;
+    _unspent_fragmented_old_budget = 0;
+    _excess_fragmented_old_budget = 0;
   } else {
-    assert(_old_generation->available() >= old_evacuation_budget, "Cannot budget more than is available");
-    fragmented_available = _old_generation->available() - unfragmented_available;
-    assert(fragmented_available + unfragmented_available >= old_evacuation_budget, "Budgets do not add up");
-    if (fragmented_available + unfragmented_available > old_evacuation_budget) {
-      excess_fragmented_available = (fragmented_available + unfragmented_available) - old_evacuation_budget;
-      fragmented_available -= excess_fragmented_available;
+    assert(_old_generation->available() >= _old_evacuation_reserve, "Cannot reserve more than is available");
+    size_t affiliated_available = _old_generation->available() - unaffiliated_available;
+    assert(affiliated_available + unaffiliated_available >= _old_evacuation_reserve, "Budgets do not add up");
+    if (affiliated_available + unaffiliated_available > _old_evacuation_reserve) {
+      _excess_fragmented_old_budget = (affiliated_available + unaffiliated_available) - _old_evacuation_reserve;
+      affiliated_available -= _excess_fragmented_old_budget;
     }
+    _unspent_fragmented_old_budget = (size_t) ((double) affiliated_available / ShenandoahOldEvacWaste);
+    _unspent_unfragmented_old_budget = (size_t) ((double) unaffiliated_available / ShenandoahOldEvacWaste);
   }
 
-  size_t remaining_old_evacuation_budget = old_evacuation_budget;
-  log_debug(gc)("Choose old regions for mixed collection: old evacuation budget: %zu%s, candidates: %u",
-                byte_size_in_proper_unit(old_evacuation_budget), proper_unit_for_byte_size(old_evacuation_budget),
+  log_debug(gc)("Choose old regions for mixed collection: old evacuation budget: " PROPERFMT ", candidates: %u",
+                PROPERFMTARGS(_old_evacuation_budget),
                 unprocessed_old_collection_candidates());
-
-  size_t lost_evacuation_capacity = 0;
-
-  // The number of old-gen regions that were selected as candidates for collection at the end of the most recent old-gen
-  // concurrent marking phase and have not yet been collected is represented by unprocessed_old_collection_candidates().
-  // Candidate regions are ordered according to increasing amount of live data.  If there is not sufficient room to
-  // evacuate region N, then there is no need to even consider evacuating region N+1.
-  while (unprocessed_old_collection_candidates() > 0) {
-    // Old collection candidates are sorted in order of decreasing garbage contained therein.
-    ShenandoahHeapRegion* r = next_old_collection_candidate();
-    if (r == nullptr) {
-      break;
-    }
-    assert(r->is_regular(), "There should be no humongous regions in the set of mixed-evac candidates");
-
-    // If region r is evacuated to fragmented memory (to free memory within a partially used region), then we need
-    // to decrease the capacity of the fragmented memory by the scaled loss.
-
-    const size_t live_data_for_evacuation = r->get_live_data_bytes();
-    size_t lost_available = r->free();
-
-    if ((lost_available > 0) && (excess_fragmented_available > 0)) {
-      if (lost_available < excess_fragmented_available) {
-        excess_fragmented_available -= lost_available;
-        lost_evacuation_capacity -= lost_available;
-        lost_available  = 0;
-      } else {
-        lost_available -= excess_fragmented_available;
-        lost_evacuation_capacity -= excess_fragmented_available;
-        excess_fragmented_available = 0;
-      }
-    }
-    size_t scaled_loss = (size_t) ((double) lost_available / ShenandoahOldEvacWaste);
-    if ((lost_available > 0) && (fragmented_available > 0)) {
-      if (scaled_loss + live_data_for_evacuation < fragmented_available) {
-        fragmented_available -= scaled_loss;
-        scaled_loss = 0;
-      } else {
-        // We will have to allocate this region's evacuation memory from unfragmented memory, so don't bother
-        // to decrement scaled_loss
-      }
-    }
-    if (scaled_loss > 0) {
-      // We were not able to account for the lost free memory within fragmented memory, so we need to take this
-      // allocation out of unfragmented memory.  Unfragmented memory does not need to account for loss of free.
-      if (live_data_for_evacuation > unfragmented_available) {
-        // There is no room to evacuate this region or any that come after it in within the candidates array.
-        log_debug(gc, cset)("Not enough unfragmented memory (%zu) to hold evacuees (%zu) from region: (%zu)",
-                            unfragmented_available, live_data_for_evacuation, r->index());
-        break;
-      } else {
-        unfragmented_available -= live_data_for_evacuation;
-      }
-    } else {
-      // Since scaled_loss == 0, we have accounted for the loss of free memory, so we can allocate from either
-      // fragmented or unfragmented available memory.  Use up the fragmented memory budget first.
-      size_t evacuation_need = live_data_for_evacuation;
-
-      if (evacuation_need > fragmented_available) {
-        evacuation_need -= fragmented_available;
-        fragmented_available = 0;
-      } else {
-        fragmented_available -= evacuation_need;
-        evacuation_need = 0;
-      }
-      if (evacuation_need > unfragmented_available) {
-        // There is no room to evacuate this region or any that come after it in within the candidates array.
-        log_debug(gc, cset)("Not enough unfragmented memory (%zu) to hold evacuees (%zu) from region: (%zu)",
-                            unfragmented_available, live_data_for_evacuation, r->index());
-        break;
-      } else {
-        unfragmented_available -= evacuation_need;
-        // dead code: evacuation_need == 0;
-      }
-    }
-    collection_set->add_region(r);
-    included_old_regions++;
-    evacuated_old_bytes += live_data_for_evacuation;
-    collected_old_bytes += r->garbage();
-    consume_old_collection_candidate();
-  }
-
-  if (_first_pinned_candidate != NOT_FOUND) {
-    // Need to deal with pinned regions
-    slide_pinned_regions_to_front();
-  }
-  decrease_unprocessed_old_collection_candidates_live_memory(evacuated_old_bytes);
-  if (included_old_regions > 0) {
-    log_info(gc, ergo)("Old-gen piggyback evac (" UINT32_FORMAT " regions, evacuating " PROPERFMT ", reclaiming: " PROPERFMT ")",
-                  included_old_regions, PROPERFMTARGS(evacuated_old_bytes), PROPERFMTARGS(collected_old_bytes));
-  }
-
-  if (unprocessed_old_collection_candidates() == 0) {
-    // We have added the last of our collection candidates to a mixed collection.
-    // Any triggers that occurred during mixed evacuations may no longer be valid.  They can retrigger if appropriate.
-    clear_triggers();
-
-    _old_generation->complete_mixed_evacuations();
-  } else if (included_old_regions == 0) {
-    // We have candidates, but none were included for evacuation - are they all pinned?
-    // or did we just not have enough room for any of them in this collection set?
-    // We don't want a region with a stuck pin to prevent subsequent old collections, so
-    // if they are all pinned we transition to a state that will allow us to make these uncollected
-    // (pinned) regions parsable.
-    if (all_candidates_are_pinned()) {
-      log_info(gc, ergo)("All candidate regions " UINT32_FORMAT " are pinned", unprocessed_old_collection_candidates());
-      _old_generation->abandon_mixed_evacuations();
-    } else {
-      log_info(gc, ergo)("No regions selected for mixed collection. "
-                         "Old evacuation budget: " PROPERFMT ", Remaining evacuation budget: " PROPERFMT
-                         ", Lost capacity: " PROPERFMT
-                         ", Next candidate: " UINT32_FORMAT ", Last candidate: " UINT32_FORMAT,
-                         PROPERFMTARGS(old_evacuation_reserve),
-                         PROPERFMTARGS(remaining_old_evacuation_budget),
-                         PROPERFMTARGS(lost_evacuation_capacity),
-                         _next_old_collection_candidate, _last_old_collection_candidate);
-    }
-  }
-
-  return (included_old_regions > 0);
+  return add_old_regions_to_cset();
 }
 
 bool ShenandoahOldHeuristics::all_candidates_are_pinned() {
@@ -317,6 +226,187 @@ void ShenandoahOldHeuristics::slide_pinned_regions_to_front() {
   _next_old_collection_candidate = write_index + 1;
 }
 
+bool ShenandoahOldHeuristics::add_old_regions_to_cset() {
+  if (unprocessed_old_collection_candidates() == 0) {
+    return false;
+  }
+  _first_pinned_candidate = NOT_FOUND;
+
+  // The number of old-gen regions that were selected as candidates for collection at the end of the most recent old-gen
+  // concurrent marking phase and have not yet been collected is represented by unprocessed_old_collection_candidates().
+  // Candidate regions are ordered according to increasing amount of live data.  If there is not sufficient room to
+  // evacuate region N, then there is no need to even consider evacuating region N+1.
+  while (unprocessed_old_collection_candidates() > 0) {
+    // Old collection candidates are sorted in order of decreasing garbage contained therein.
+    ShenandoahHeapRegion* r = next_old_collection_candidate();
+    if (r == nullptr) {
+      break;
+    }
+    assert(r->is_regular(), "There should be no humongous regions in the set of mixed-evac candidates");
+
+    // If region r is evacuated to fragmented memory (to free memory within a partially used region), then we need
+    // to decrease the capacity of the fragmented memory by the scaled loss.
+
+    const size_t live_data_for_evacuation = r->get_live_data_bytes();
+    size_t lost_available = r->free();
+
+    ssize_t fragmented_delta = 0;
+    ssize_t unfragmented_delta = 0;
+    ssize_t excess_delta = 0;
+
+    // We must decrease our mixed-evacuation budgets proportional to the lost available memory.  This memory that is no
+    // longer available was likely "promised" to promotions, so we must decrease our mixed evacuations now.
+    // (e.g. if we loose 14 bytes of available old memory, we must decrease the evacuation budget by 10 bytes.)
+    size_t scaled_loss = (size_t) (((double) lost_available) / ShenandoahOldEvacWaste);
+    if (lost_available > 0) {
+      // We need to subtract lost_available from our working evacuation budgets
+      if (scaled_loss < _excess_fragmented_old_budget) {
+        excess_delta -= scaled_loss;
+        _excess_fragmented_old_budget -= scaled_loss;
+      } else {
+        excess_delta -= _excess_fragmented_old_budget;
+        _excess_fragmented_old_budget = 0;
+      }
+
+      if (scaled_loss < _unspent_fragmented_old_budget) {
+        _unspent_fragmented_old_budget -= scaled_loss;
+        fragmented_delta = -scaled_loss;
+        scaled_loss = 0;
+      } else {
+        scaled_loss -= _unspent_fragmented_old_budget;
+        fragmented_delta = -_unspent_fragmented_old_budget;
+        _unspent_fragmented_old_budget = 0;
+      }
+
+      if (scaled_loss < _unspent_unfragmented_old_budget) {
+        _unspent_unfragmented_old_budget -= scaled_loss;
+        unfragmented_delta = -scaled_loss;
+        scaled_loss = 0;
+      } else {
+        scaled_loss -= _unspent_unfragmented_old_budget;
+        fragmented_delta = -_unspent_unfragmented_old_budget;
+        _unspent_unfragmented_old_budget = 0;
+      }
+    }
+
+    // Allocate replica from unfragmented memory if that exists
+    size_t evacuation_need = live_data_for_evacuation;
+    if (evacuation_need < _unspent_unfragmented_old_budget) {
+      _unspent_unfragmented_old_budget -= evacuation_need;
+    } else {
+      if (_unspent_unfragmented_old_budget > 0) {
+        evacuation_need -= _unspent_unfragmented_old_budget;
+        unfragmented_delta -= _unspent_unfragmented_old_budget;
+        _unspent_unfragmented_old_budget = 0;
+      }
+      // Take the remaining allocation out of fragmented available
+      if (_unspent_fragmented_old_budget > evacuation_need) {
+        _unspent_fragmented_old_budget -= evacuation_need;
+      } else {
+        // We cannot add this region into the collection set.  We're done.  Undo the adjustments to available.
+        _unspent_fragmented_old_budget -= fragmented_delta;
+        _unspent_unfragmented_old_budget -= unfragmented_delta;
+        _excess_fragmented_old_budget -= excess_delta;
+        break;
+      }
+    }
+    _mixed_evac_cset->add_region(r);
+    _included_old_regions++;
+    _evacuated_old_bytes += live_data_for_evacuation;
+    _collected_old_bytes += r->garbage();
+    consume_old_collection_candidate();
+  }
+  return true;
+}
+
+bool ShenandoahOldHeuristics::finalize_mixed_evacs() {
+  if (_first_pinned_candidate != NOT_FOUND) {
+    // Need to deal with pinned regions
+    slide_pinned_regions_to_front();
+  }
+  decrease_unprocessed_old_collection_candidates_live_memory(_evacuated_old_bytes);
+  if (_included_old_regions > 0) {
+    log_info(gc)("Old-gen mixed evac (%zu regions, evacuating %zu%s, reclaiming: %zu%s)",
+                 _included_old_regions,
+                 byte_size_in_proper_unit(_evacuated_old_bytes), proper_unit_for_byte_size(_evacuated_old_bytes),
+                 byte_size_in_proper_unit(_collected_old_bytes), proper_unit_for_byte_size(_collected_old_bytes));
+  }
+
+  if (unprocessed_old_collection_candidates() == 0) {
+    // We have added the last of our collection candidates to a mixed collection.
+    // Any triggers that occurred during mixed evacuations may no longer be valid.  They can retrigger if appropriate.
+    clear_triggers();
+    _old_generation->complete_mixed_evacuations();
+  } else if (_included_old_regions == 0) {
+    // We have candidates, but none were included for evacuation - are they all pinned?
+    // or did we just not have enough room for any of them in this collection set?
+    // We don't want a region with a stuck pin to prevent subsequent old collections, so
+    // if they are all pinned we transition to a state that will allow us to make these uncollected
+    // (pinned) regions parsable.
+    if (all_candidates_are_pinned()) {
+      log_info(gc)("All candidate regions " UINT32_FORMAT " are pinned", unprocessed_old_collection_candidates());
+      _old_generation->abandon_mixed_evacuations();
+    } else {
+      log_info(gc)("No regions selected for mixed collection. "
+                   "Old evacuation budget: " PROPERFMT ", Next candidate: " UINT32_FORMAT ", Last candidate: " UINT32_FORMAT,
+                   PROPERFMTARGS(_old_evacuation_reserve),
+                   _next_old_collection_candidate, _last_old_collection_candidate);
+    }
+  }
+  return (_included_old_regions > 0);
+}
+
+bool ShenandoahOldHeuristics::top_off_collection_set(size_t &add_regions_to_old) {
+  if (unprocessed_old_collection_candidates() == 0) {
+    add_regions_to_old = 0;
+    return false;
+  } else {
+    ShenandoahYoungGeneration* young_generation = _heap->young_generation();
+    size_t young_unaffiliated_regions = young_generation->free_unaffiliated_regions();
+    size_t max_young_cset = young_generation->get_evacuation_reserve();
+
+    // We have budgeted to assure the live_bytes_in_tenurable_regions() get evacuated into old generation.  Young reserves
+    // only for untenurable region evacuations.
+    size_t planned_young_evac = _mixed_evac_cset->get_live_bytes_in_untenurable_regions();
+    size_t consumed_from_young_cset = (size_t) (planned_young_evac * ShenandoahEvacWaste);
+
+    size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+    size_t regions_required_for_collector_reserve = (consumed_from_young_cset + region_size_bytes - 1) / region_size_bytes;
+
+    assert(consumed_from_young_cset <= max_young_cset, "sanity");
+    assert(max_young_cset <= young_unaffiliated_regions * region_size_bytes, "sanity");
+
+    size_t regions_for_old_expansion;
+    if (consumed_from_young_cset < max_young_cset) {
+      size_t excess_young_reserves = max_young_cset - consumed_from_young_cset;
+      // We can only transfer empty regions from young to old.  Furthermore, we must be careful to assure that the young
+      // Collector reserve that remains after transfer is comprised entirely of empty (unaffiliated) regions.
+      size_t consumed_unaffiliated_regions = (consumed_from_young_cset + region_size_bytes - 1) / region_size_bytes;
+      size_t available_unaffiliated_regions = ((young_unaffiliated_regions > consumed_unaffiliated_regions)?
+                                               young_unaffiliated_regions - consumed_unaffiliated_regions: 0);
+      regions_for_old_expansion = MIN2(available_unaffiliated_regions, excess_young_reserves / region_size_bytes);
+    } else {
+      regions_for_old_expansion = 0;
+    }
+    if (regions_for_old_expansion > 0) {
+      log_info(gc)("Augmenting old-gen evacuation budget from unexpended young-generation reserve by %zu regions",
+                   regions_for_old_expansion);
+      add_regions_to_old = regions_for_old_expansion;
+      size_t budget_supplement = region_size_bytes * regions_for_old_expansion;
+      size_t supplement_without_waste = (size_t) (((double) budget_supplement) / ShenandoahOldEvacWaste);
+      _old_evacuation_budget += supplement_without_waste;
+      _unspent_unfragmented_old_budget += supplement_without_waste;
+      _old_generation->augment_evacuation_reserve(budget_supplement);
+      young_generation->set_evacuation_reserve(max_young_cset - budget_supplement);
+
+      return add_old_regions_to_cset();
+    } else {
+      add_regions_to_old = 0;
+      return false;
+    }
+  }
+}
+
 void ShenandoahOldHeuristics::prepare_for_old_collections() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
 
@@ -325,7 +415,6 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
   size_t immediate_garbage = 0;
   size_t immediate_regions = 0;
   size_t live_data = 0;
-
   RegionData* candidates = _region_data;
   for (size_t i = 0; i < num_regions; i++) {
     ShenandoahHeapRegion* region = heap->get_region(i);
@@ -344,10 +433,10 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
     // else, regions that were promoted in place had 0 old live data at mark start
 
     if (region->is_regular() || region->is_regular_pinned()) {
-        // Only place regular or pinned regions with live data into the candidate set.
-        // Pinned regions cannot be evacuated, but we are not actually choosing candidates
-        // for the collection set here. That happens later during the next young GC cycle,
-        // by which time, the pinned region may no longer be pinned.
+      // Only place regular or pinned regions with live data into the candidate set.
+      // Pinned regions cannot be evacuated, but we are not actually choosing candidates
+      // for the collection set here. That happens later during the next young GC cycle,
+      // by which time, the pinned region may no longer be pinned.
       if (!region->has_live()) {
         assert(!region->is_pinned(), "Pinned region should have live (pinned) objects.");
         region->make_trash_immediate();
@@ -414,6 +503,8 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
     ShenandoahHeapRegion* r = candidates[i].get_region();
     size_t region_garbage = r->garbage();
     size_t region_free = r->free();
+
+    r->capture_mixed_candidate_garbage();
     candidates_garbage += region_garbage;
     unfragmented += region_free;
   }
@@ -456,6 +547,8 @@ void ShenandoahOldHeuristics::prepare_for_old_collections() {
              r->index(), ShenandoahHeapRegion::region_state_to_string(r->state()));
       const size_t region_garbage = r->garbage();
       const size_t region_free = r->free();
+
+      r->capture_mixed_candidate_garbage();
       candidates_garbage += region_garbage;
       unfragmented += region_free;
       defrag_count++;
@@ -546,6 +639,7 @@ unsigned int ShenandoahOldHeuristics::get_coalesce_and_fill_candidates(Shenandoa
 void ShenandoahOldHeuristics::abandon_collection_candidates() {
   _last_old_collection_candidate = 0;
   _next_old_collection_candidate = 0;
+  _live_bytes_in_unprocessed_candidates = 0;
   _last_old_region = 0;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
index f38194c1ee7..e657ac58ae4 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
@@ -102,9 +102,33 @@ private:
   size_t _fragmentation_first_old_region;
   size_t _fragmentation_last_old_region;
 
+  // State variables involved in construction of a mixed-evacuation collection set.  These variables are initialized
+  // when client code invokes prime_collection_set().  They are consulted, and sometimes modified, when client code
+  // calls top_off_collection_set() to possibly expand the number of old-gen regions in a mixed evacuation cset, and by
+  // finalize_mixed_evacs(), which prepares the way for mixed evacuations to begin.
+  ShenandoahCollectionSet* _mixed_evac_cset;
+  size_t _evacuated_old_bytes;
+  size_t _collected_old_bytes;
+  size_t _included_old_regions;
+  size_t _old_evacuation_reserve;
+  size_t _old_evacuation_budget;
+
+  // This represents the amount of memory that can be evacuated from old into initially empty regions during a mixed evacuation.
+  // This is the total amount of unfragmented free memory in old divided by ShenandoahOldEvacWaste.
+  size_t _unspent_unfragmented_old_budget;
+
+  // This represents the amount of memory that can be evacuated from old into initially non-empty regions during a mixed
+  // evacuation.  This is the total amount of initially fragmented free memory in old divided by ShenandoahOldEvacWaste.
+  size_t _unspent_fragmented_old_budget;
+
+  // If there is more available memory in old than is required by the intended mixed evacuation, the amount of excess
+  // memory is represented by _excess_fragmented_old.  To convert this value into a promotion budget, multiply by
+  // ShenandoahOldEvacWaste and divide by ShenandoahPromoWaste.
+  size_t _excess_fragmented_old_budget;
+
   // The value of command-line argument ShenandoahOldGarbageThreshold represents the percent of garbage that must
   // be present within an old-generation region before that region is considered a good candidate for inclusion in
-  // the collection set under normal circumstances.  For our purposes, normal circustances are when the memory consumed
+  // the collection set under normal circumstances.  For our purposes, normal circumstances are when the memory consumed
   // by the old generation is less than 50% of the soft heap capacity.  When the old generation grows beyond the 50%
   // threshold, we dynamically adjust the old garbage threshold, allowing us to invest in packing the old generation
   // more tightly so that more memory can be made available to the more frequent young GC cycles.  This variable
@@ -131,7 +155,15 @@ private:
   void set_trigger_if_old_is_overgrown();
 
  protected:
-  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set, RegionData* data, size_t data_size, size_t free) override;
+  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
+                                             RegionData* data, size_t data_size, size_t free) override;
+
+  // This internal helper routine adds as many mixed evacuation candidate regions as fit within the old-gen evacuation budget
+  // to the collection set.  This may be called twice to prepare for any given mixed evacuation cycle, the first time with
+  // a conservative old evacuation budget, and the second time with a larger more aggressive old evacuation budget.  Returns
+  // true iff we need to finalize mixed evacs.  (If no regions are added to the collection set, there is no need to finalize
+  // mixed evacuations.)
+  bool add_old_regions_to_cset();
 
 public:
   explicit ShenandoahOldHeuristics(ShenandoahOldGeneration* generation, ShenandoahGenerationalHeap* gen_heap);
@@ -139,8 +171,22 @@ public:
   // Prepare for evacuation of old-gen regions by capturing the mark results of a recently completed concurrent mark pass.
   void prepare_for_old_collections();
 
-  // Return true iff the collection set is primed with at least one old-gen region.
-  bool prime_collection_set(ShenandoahCollectionSet* set);
+  // Initialize instance variables to support the preparation of a mixed-evacuation collection set.  Adds as many
+  // old candidate regions into the collection set as can fit within the iniital conservative old evacuation budget.
+  // Returns true iff we need to finalize mixed evacs.
+  bool prime_collection_set(ShenandoahCollectionSet* collection_set);
+
+  // If young evacuation did not consume all of its available evacuation reserve, add as many additional mixed-
+  // evacuation candidate regions into the collection set as will fit within this excess repurposed reserved.
+  // Returns true iff we need to finalize mixed evacs.  Upon return, the var parameter regions_to_xfer holds the
+  // number of regions to transfer from young to old.
+  bool top_off_collection_set(size_t &add_regions_to_old);
+
+  // Having added all eligible mixed-evacuation candidates to the collection set, this function updates the total count
+  // of how much old-gen memory remains to be evacuated and adjusts the representation of old-gen regions that remain to
+  // be evacuated, giving special attention to regions that are currently pinned.  It outputs relevant log messages and
+  // returns true iff the collection set holds at least one unpinned mixed evacuation candidate.
+  bool finalize_mixed_evacs();
 
   // How many old-collection candidates have not yet been processed?
   uint unprocessed_old_collection_candidates() const;
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
index be4e91b1800..3cb85f5d05f 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
@@ -40,19 +40,19 @@ class ShenandoahPassiveHeuristics : public ShenandoahHeuristics {
 public:
   ShenandoahPassiveHeuristics(ShenandoahSpaceInfo* space_info);
 
-  virtual bool should_start_gc();
+  bool should_start_gc() override;
 
-  virtual bool should_unload_classes();
+  bool should_unload_classes() override;
 
-  virtual bool should_degenerate_cycle();
+  bool should_degenerate_cycle() override;
 
-  virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
-                                                     RegionData* data, size_t data_size,
-                                                     size_t free);
+  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
+                                             RegionData* data, size_t data_size,
+                                             size_t free) override;
 
-  virtual const char* name()     { return "Passive"; }
-  virtual bool is_diagnostic()   { return true; }
-  virtual bool is_experimental() { return false; }
+  const char* name() override     { return "Passive"; }
+  bool is_diagnostic() override   { return true; }
+  bool is_experimental() override { return false; }
 };
 
 #endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
index d4d66fef6a1..5f384f3dc73 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
@@ -37,8 +37,6 @@ ShenandoahStaticHeuristics::ShenandoahStaticHeuristics(ShenandoahSpaceInfo* spac
   SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
 }
 
-ShenandoahStaticHeuristics::~ShenandoahStaticHeuristics() {}
-
 bool ShenandoahStaticHeuristics::should_start_gc() {
   size_t capacity = ShenandoahHeap::heap()->soft_max_capacity();
   size_t available = _space_info->soft_mutator_available();
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
index 24cb5547921..b1514b55e5a 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
@@ -34,19 +34,17 @@
  */
 class ShenandoahStaticHeuristics : public ShenandoahHeuristics {
 public:
-  ShenandoahStaticHeuristics(ShenandoahSpaceInfo* space_info);
+  explicit ShenandoahStaticHeuristics(ShenandoahSpaceInfo* space_info);
 
-  virtual ~ShenandoahStaticHeuristics();
+  bool should_start_gc() override;
 
-  virtual bool should_start_gc();
+  void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
+                                             RegionData* data, size_t size,
+                                             size_t free) override;
 
-  virtual void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
-                                                     RegionData* data, size_t size,
-                                                     size_t free);
-
-  virtual const char* name()     { return "Static"; }
-  virtual bool is_diagnostic()   { return false; }
-  virtual bool is_experimental() { return false; }
+  const char* name() override     { return "Static"; }
+  bool is_diagnostic() override   { return false; }
+  bool is_experimental() override { return false; }
 };
 
 #endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
index 15d1058d7cd..beff2200d90 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
@@ -33,7 +33,7 @@
 #include "utilities/quickSort.hpp"
 
 ShenandoahYoungHeuristics::ShenandoahYoungHeuristics(ShenandoahYoungGeneration* generation)
-        : ShenandoahGenerationalHeuristics(generation) {
+    : ShenandoahGenerationalHeuristics(generation) {
 }
 
 
@@ -48,13 +48,24 @@ void ShenandoahYoungHeuristics::choose_collection_set_from_regiondata(Shenandoah
   // array before younger regions that typically contain more garbage. This is one reason why,
   // for example, we continue examining regions even after rejecting a region that has
   // more live data than we can evacuate.
+  ShenandoahGenerationalHeap* heap = ShenandoahGenerationalHeap::heap();
+  bool need_to_finalize_mixed = heap->old_generation()->heuristics()->prime_collection_set(cset);
 
   // Better select garbage-first regions
-  QuickSort::sort<RegionData>(data, (int) size, compare_by_garbage);
+  QuickSort::sort<RegionData>(data, size, compare_by_garbage);
 
   size_t cur_young_garbage = add_preselected_regions_to_collection_set(cset, data, size);
 
   choose_young_collection_set(cset, data, size, actual_free, cur_young_garbage);
+
+  // Especially when young-gen trigger is expedited in order to finish mixed evacuations, there may not be
+  // enough consolidated garbage to make effective use of young-gen evacuation reserve.  If there is still
+  // young-gen reserve available following selection of the young-gen collection set, see if we can use
+  // this memory to expand the old-gen evacuation collection set.
+  need_to_finalize_mixed |= heap->old_generation()->heuristics()->top_off_collection_set(_add_regions_to_old);
+  if (need_to_finalize_mixed) {
+    heap->old_generation()->heuristics()->finalize_mixed_evacs();
+  }
 }
 
 void ShenandoahYoungHeuristics::choose_young_collection_set(ShenandoahCollectionSet* cset,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 2aa37d7c575..004558a9fa8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -72,21 +72,33 @@ void ShenandoahBarrierSet::print_on(outputStream* st) const {
 
 bool ShenandoahBarrierSet::need_load_reference_barrier(DecoratorSet decorators, BasicType type) {
   if (!ShenandoahLoadRefBarrier) return false;
-  // Only needed for references
   return is_reference_type(type);
 }
 
 bool ShenandoahBarrierSet::need_keep_alive_barrier(DecoratorSet decorators, BasicType type) {
   if (!ShenandoahSATBBarrier) return false;
-  // Only needed for references
   if (!is_reference_type(type)) return false;
-
   bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0;
   bool unknown = (decorators & ON_UNKNOWN_OOP_REF) != 0;
   bool on_weak_ref = (decorators & (ON_WEAK_OOP_REF | ON_PHANTOM_OOP_REF)) != 0;
   return (on_weak_ref || unknown) && keep_alive;
 }
 
+bool ShenandoahBarrierSet::need_satb_barrier(DecoratorSet decorators, BasicType type) {
+  if (!ShenandoahSATBBarrier) return false;
+  if (!is_reference_type(type)) return false;
+  bool as_normal = (decorators & AS_NORMAL) != 0;
+  bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
+  return as_normal && !dest_uninitialized;
+}
+
+bool ShenandoahBarrierSet::need_card_barrier(DecoratorSet decorators, BasicType type) {
+  if (!ShenandoahCardBarrier) return false;
+  if (!is_reference_type(type)) return false;
+  bool in_heap = (decorators & IN_HEAP) != 0;
+  return in_heap;
+}
+
 void ShenandoahBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {
 #if COMPILER2_OR_JVMCI
   if (ReduceInitialCardMarks && ShenandoahCardBarrier && !ShenandoahHeap::heap()->is_in_young(new_obj)) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
index 28765605267..e7a0ed57740 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
@@ -60,6 +60,8 @@ public:
 
   static bool need_load_reference_barrier(DecoratorSet decorators, BasicType type);
   static bool need_keep_alive_barrier(DecoratorSet decorators, BasicType type);
+  static bool need_satb_barrier(DecoratorSet decorators, BasicType type);
+  static bool need_card_barrier(DecoratorSet decorators, BasicType type);
 
   static bool is_strong_access(DecoratorSet decorators) {
     return (decorators & (ON_WEAK_OOP_REF | ON_PHANTOM_OOP_REF)) == 0;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
index c6e6108fda8..2be5722f7f9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
@@ -41,9 +41,9 @@ bool ShenandoahBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
     return true;
   }
 
-  ShenandoahReentrantLock* lock = ShenandoahNMethod::lock_for_nmethod(nm);
+  ShenandoahNMethodLock* lock = ShenandoahNMethod::lock_for_nmethod(nm);
   assert(lock != nullptr, "Must be");
-  ShenandoahReentrantLocker locker(lock);
+  ShenandoahNMethodLocker locker(lock);
 
   if (!is_armed(nm)) {
     // Some other thread managed to complete while we were
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
index 07d339eb32e..64e135e9a4e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
@@ -136,13 +136,13 @@ public:
     assert(!nm_data->is_unregistered(), "Should not see unregistered entry");
 
     if (nm->is_unloading()) {
-      ShenandoahReentrantLocker locker(nm_data->lock());
+      ShenandoahNMethodLocker locker(nm_data->lock());
       nm->unlink();
       return;
     }
 
     {
-      ShenandoahReentrantLocker locker(nm_data->lock());
+      ShenandoahNMethodLocker locker(nm_data->lock());
 
       // Heal oops
       if (_bs->is_armed(nm)) {
@@ -154,7 +154,7 @@ public:
     }
 
     // Clear compiled ICs and exception caches
-    ShenandoahReentrantLocker locker(nm_data->ic_lock());
+    ShenandoahNMethodLocker locker(nm_data->ic_lock());
     nm->unload_nmethod_caches(_unloading_occurred);
   }
 };
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
index e58a7f40796..c1c6b876d90 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
@@ -50,6 +50,8 @@ ShenandoahCollectionSet::ShenandoahCollectionSet(ShenandoahHeap* heap, ReservedS
   _region_count(0),
   _old_garbage(0),
   _preselected_regions(nullptr),
+  _young_available_bytes_collected(0),
+  _old_available_bytes_collected(0),
   _current_index(0) {
 
   // The collection set map is reserved to cover the entire heap *and* zero addresses.
@@ -104,6 +106,7 @@ void ShenandoahCollectionSet::add_region(ShenandoahHeapRegion* r) {
     }
   } else if (r->is_old()) {
     _old_bytes_to_evacuate += live;
+    _old_available_bytes_collected += free;
     _old_garbage += garbage;
   }
 
@@ -140,6 +143,7 @@ void ShenandoahCollectionSet::clear() {
   _old_bytes_to_evacuate = 0;
 
   _young_available_bytes_collected = 0;
+  _old_available_bytes_collected = 0;
 
   _has_old_regions = false;
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
index a1b77baa2d3..c99271de1fb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
@@ -75,6 +75,10 @@ private:
   // should be subtracted from what's available.
   size_t                _young_available_bytes_collected;
 
+  // When a region having memory available to be allocated is added to the collection set, the region's available memory
+  // should be subtracted from what's available.
+  size_t                _old_available_bytes_collected;
+
   shenandoah_padding(0);
   volatile size_t       _current_index;
   shenandoah_padding(1);
@@ -121,6 +125,9 @@ public:
   // Returns the amount of free bytes in young regions in the collection set.
   size_t get_young_available_bytes_collected() const { return _young_available_bytes_collected; }
 
+  // Returns the amount of free bytes in old regions in the collection set.
+  size_t get_old_available_bytes_collected() const { return _old_available_bytes_collected; }
+
   // Returns the amount of garbage in old regions in the collection set.
   inline size_t get_old_garbage() const;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
index 5fe90f64f98..1166333ae3a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
@@ -63,17 +63,10 @@ private:
 
 public:
   // The most common scenario for lack of good progress following a degenerated GC is an accumulation of floating
-  // garbage during the most recently aborted concurrent GC effort.  With generational GC, it is far more effective to
+  // garbage during the most recently aborted concurrent GC effort.  Usually, it is far more effective to
   // reclaim this floating garbage with another degenerated cycle (which focuses on young generation and might require
-  // a pause of 200 ms) rather than a full GC cycle (which may require over 2 seconds with a 10 GB old generation).
-  //
-  // In generational mode, we'll only upgrade to full GC if we've done two degen cycles in a row and both indicated
-  // bad progress.  In non-generational mode, we'll preserve the original behavior, which is to upgrade to full
-  // immediately following a degenerated cycle with bad progress.  This preserves original behavior of non-generational
-  // Shenandoah to avoid introducing "surprising new behavior."  It also makes less sense with non-generational
-  // Shenandoah to replace a full GC with a degenerated GC, because both have similar pause times in non-generational
-  // mode.
-  static constexpr size_t GENERATIONAL_CONSECUTIVE_BAD_DEGEN_PROGRESS_THRESHOLD = 2;
+  // a pause of 200 ms) rather than a full GC cycle (which may require multiple seconds with a 10 GB old generation).
+  static constexpr size_t CONSECUTIVE_BAD_DEGEN_PROGRESS_THRESHOLD = 2;
 
   ShenandoahCollectorPolicy();
 
@@ -117,9 +110,9 @@ public:
     return _consecutive_degenerated_gcs;
   }
 
-  // Genshen will only upgrade to a full gc after the configured number of futile degenerated cycles.
-  bool generational_should_upgrade_degenerated_gc() const {
-    return _consecutive_degenerated_gcs_without_progress >= GENERATIONAL_CONSECUTIVE_BAD_DEGEN_PROGRESS_THRESHOLD;
+  // Only upgrade to a full gc after the configured number of futile degenerated cycles.
+  bool should_upgrade_degenerated_gc() const {
+    return _consecutive_degenerated_gcs_without_progress >= CONSECUTIVE_BAD_DEGEN_PROGRESS_THRESHOLD;
   }
 
   static bool is_allocation_failure(GCCause::Cause cause);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index cee8727a3f4..5206a0558e8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -204,9 +204,8 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
       return false;
     }
 
-    entry_concurrent_update_refs_prepare(heap);
-
     // Perform update-refs phase.
+    entry_concurrent_update_refs_prepare(heap);
     if (ShenandoahVerify) {
       vmop_entry_init_update_refs();
     }
@@ -227,6 +226,7 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
     // Update references freed up collection set, kick the cleanup to reclaim the space.
     entry_cleanup_complete();
   } else {
+    _abbreviated = true;
     if (!entry_final_roots()) {
       assert(_degen_point != _degenerated_unset, "Need to know where to start degenerated cycle");
       return false;
@@ -235,7 +235,6 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
     if (VerifyAfterGC) {
       vmop_entry_verify_final_roots();
     }
-    _abbreviated = true;
   }
 
   // We defer generation resizing actions until after cset regions have been recycled.  We do this even following an
@@ -282,7 +281,6 @@ bool ShenandoahConcurrentGC::complete_abbreviated_cycle() {
   return true;
 }
 
-
 void ShenandoahConcurrentGC::vmop_entry_init_mark() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   TraceCollectorStats tcs(heap->monitoring_support()->stw_collection_counters());
@@ -536,6 +534,12 @@ void ShenandoahConcurrentGC::entry_cleanup_early() {
   // This phase does not use workers, no need for setup
   heap->try_inject_alloc_failure();
   op_cleanup_early();
+  if (!heap->is_evacuation_in_progress()) {
+    // This is an abbreviated cycle.  Rebuild the freeset in order to establish reserves for the next GC cycle.  Doing
+    // the rebuild ASAP also expedites availability of immediate trash, reducing the likelihood that we will degenerate
+    // during promote-in-place processing.
+    heap->rebuild_free_set(true /*concurrent*/);
+  }
 }
 
 void ShenandoahConcurrentGC::entry_evacuate() {
@@ -1019,7 +1023,7 @@ public:
 
   void do_nmethod(nmethod* n) {
     ShenandoahNMethod* data = ShenandoahNMethod::gc_data(n);
-    ShenandoahReentrantLocker locker(data->lock());
+    ShenandoahNMethodLocker locker(data->lock());
     // Setup EvacOOM scope below reentrant lock to avoid deadlock with
     // nmethod_entry_barrier
     ShenandoahEvacOOMScope oom;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 590e7831f07..bc11659c5e5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -44,7 +44,7 @@ ShenandoahControlThread::ShenandoahControlThread() :
   ShenandoahController(),
   _requested_gc_cause(GCCause::_no_gc),
   _degen_point(ShenandoahGC::_degenerated_outside_cycle),
-  _control_lock(Mutex::nosafepoint - 2, "ShenandoahGCRequest_lock", true) {
+  _control_lock(CONTROL_LOCK_RANK, "ShenandoahControl_lock", true) {
   set_name("Shenandoah Control Thread");
   create_and_start();
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
index a6a699fac3b..b8ff4df4771 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
@@ -42,6 +42,9 @@ private:
   shenandoah_padding(1);
 
 protected:
+  const Mutex::Rank WAITERS_LOCK_RANK = Mutex::safepoint - 5;
+  const Mutex::Rank CONTROL_LOCK_RANK = Mutex::nosafepoint - 2;
+
   // While we could have a single lock for these, it may risk unblocking
   // GC waiters when alloc failure GC cycle finishes. We want instead
   // to make complete explicit cycle for demanding customers.
@@ -54,8 +57,8 @@ protected:
 public:
   ShenandoahController():
     _gc_id(0),
-    _alloc_failure_waiters_lock(Mutex::safepoint-2, "ShenandoahAllocFailureGC_lock", true),
-    _gc_waiters_lock(Mutex::safepoint-2, "ShenandoahRequestedGC_lock", true)
+    _alloc_failure_waiters_lock(WAITERS_LOCK_RANK, "ShenandoahAllocFailureWaiters_lock", true),
+    _gc_waiters_lock(WAITERS_LOCK_RANK, "ShenandoahGCWaiters_lock", true)
   { }
 
   // Request a collection cycle. This handles "explicit" gc requests
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 333bdbc6e72..99776e38bfe 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -314,7 +314,7 @@ void ShenandoahDegenGC::op_degenerated() {
   if (progress) {
     heap->notify_gc_progress();
     _generation->heuristics()->record_degenerated();
-  } else if (!heap->mode()->is_generational() || policy->generational_should_upgrade_degenerated_gc()) {
+  } else if (policy->should_upgrade_degenerated_gc()) {
     // Upgrade to full GC, register full-GC impact on heuristics.
     op_degenerated_futile();
   } else {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp
index dd09bec8a7c..5b24140ac1c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.cpp
@@ -37,22 +37,22 @@ ShenandoahEvacOOMCounter::ShenandoahEvacOOMCounter() :
 void ShenandoahEvacOOMCounter::decrement() {
   assert(unmasked_count() > 0, "sanity");
   // NOTE: It's ok to simply decrement, even with mask set, because unmasked value is positive.
-  AtomicAccess::dec(&_bits);
+  _bits.fetch_then_sub(1);
 }
 
 void ShenandoahEvacOOMCounter::clear() {
   assert(unmasked_count() == 0, "sanity");
-  AtomicAccess::release_store_fence(&_bits, (jint)0);
+  _bits.release_store_fence((jint)0);
 }
 
 void ShenandoahEvacOOMCounter::set_oom_bit(bool decrement) {
-  jint threads_in_evac = AtomicAccess::load_acquire(&_bits);
+  jint threads_in_evac = _bits.load_acquire();
   while (true) {
     jint newval = decrement
       ? (threads_in_evac - 1) | OOM_MARKER_MASK
       : threads_in_evac | OOM_MARKER_MASK;
 
-    jint other = AtomicAccess::cmpxchg(&_bits, threads_in_evac, newval);
+    jint other = _bits.compare_exchange(threads_in_evac, newval);
     if (other == threads_in_evac) {
       // Success: wait for other threads to get out of the protocol and return.
       break;
@@ -65,7 +65,7 @@ void ShenandoahEvacOOMCounter::set_oom_bit(bool decrement) {
 
 bool ShenandoahEvacOOMCounter::try_increment()
 {
-  jint threads_in_evac = AtomicAccess::load_acquire(&_bits);
+  jint threads_in_evac = _bits.load_acquire();
 
   while (true) {
     // Cannot enter evacuation if OOM_MARKER_MASK is set.
@@ -73,7 +73,7 @@ bool ShenandoahEvacOOMCounter::try_increment()
       return false;
     }
 
-    jint other = AtomicAccess::cmpxchg(&_bits, threads_in_evac, threads_in_evac + 1);
+    jint other = _bits.compare_exchange(threads_in_evac, threads_in_evac + 1);
     if (other == threads_in_evac) {
       // Success: caller may safely enter evacuation
       return true;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
index dd77f6216e0..3e28d9ac88e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
@@ -27,6 +27,7 @@
 
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -36,7 +37,7 @@
 class ShenandoahEvacOOMCounter {
 private:
   // Combination of a 31-bit counter and 1-bit OOM marker.
-  volatile jint _bits;
+  Atomic<jint> _bits;
 
   // This class must be at least a cache line in size to prevent false sharing.
   shenandoah_padding_minus_size(0, sizeof(jint));
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp
index 11509ec9d2d..4bd4381068a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.inline.hpp
@@ -29,14 +29,13 @@
 
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
-#include "runtime/atomicAccess.hpp"
 
 jint ShenandoahEvacOOMCounter::load_acquire() {
-  return AtomicAccess::load_acquire(&_bits);
+  return _bits.load_acquire();
 }
 
 jint ShenandoahEvacOOMCounter::unmasked_count() {
-  return AtomicAccess::load_acquire(&_bits) & ~OOM_MARKER_MASK;
+  return _bits.load_acquire() & ~OOM_MARKER_MASK;
 }
 
 void ShenandoahEvacOOMHandler::enter_evacuation(Thread* thr) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index c03e66e28da..961800f20d9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -326,7 +326,7 @@ void ShenandoahRegionPartitions::initialize_old_collector() {
 }
 
 void ShenandoahRegionPartitions::make_all_regions_unavailable() {
-  shenandoah_assert_heaplocked();
+  shenandoah_assert_heaplocked_or_safepoint();
   for (size_t partition_id = 0; partition_id < IntNumPartitions; partition_id++) {
     _membership[partition_id].clear_all();
     _leftmosts[partition_id] = _max;
@@ -338,7 +338,7 @@ void ShenandoahRegionPartitions::make_all_regions_unavailable() {
     _empty_region_counts[partition_id] = 0;
     _used[partition_id] = 0;
     _humongous_waste[partition_id] = 0;
-    _available[partition_id] = FreeSetUnderConstruction;
+    _available[partition_id] = 0;
   }
 }
 
@@ -439,6 +439,13 @@ void ShenandoahRegionPartitions::set_capacity_of(ShenandoahFreeSetPartitionId wh
   _available[int(which_partition)] = value - _used[int(which_partition)];
 }
 
+void ShenandoahRegionPartitions::set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
+  shenandoah_assert_heaplocked();
+  assert (which_partition < NumPartitions, "selected free set must be valid");
+  _used[int(which_partition)] = value;
+  _available[int(which_partition)] = _capacity[int(which_partition)] - value;
+}
+
 
 void ShenandoahRegionPartitions::increase_capacity(ShenandoahFreeSetPartitionId which_partition, size_t bytes) {
   shenandoah_assert_heaplocked();
@@ -900,7 +907,7 @@ idx_t ShenandoahRegionPartitions::rightmost_empty(ShenandoahFreeSetPartitionId w
 
 
 #ifdef ASSERT
-void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
+void ShenandoahRegionPartitions::assert_bounds() {
 
   size_t capacities[UIntNumPartitions];
   size_t used[UIntNumPartitions];
@@ -936,7 +943,7 @@ void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
     switch (partition) {
       case ShenandoahFreeSetPartitionId::NotFree:
       {
-        assert(!validate_totals || (capacity != _region_size_bytes), "Should not be retired if empty");
+        assert(capacity != _region_size_bytes, "Should not be retired if empty");
         ShenandoahHeapRegion* r = ShenandoahHeap::heap()->get_region(i);
         if (r->is_humongous()) {
           if (r->is_old()) {
@@ -976,12 +983,12 @@ void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
       case ShenandoahFreeSetPartitionId::Collector:
       case ShenandoahFreeSetPartitionId::OldCollector:
       {
+        ShenandoahHeapRegion* r = ShenandoahHeap::heap()->get_region(i);
         assert(capacity > 0, "free regions must have allocation capacity");
         bool is_empty = (capacity == _region_size_bytes);
         regions[int(partition)]++;
         used[int(partition)] += _region_size_bytes - capacity;
         capacities[int(partition)] += _region_size_bytes;
-
         if (i < leftmosts[int(partition)]) {
           leftmosts[int(partition)] = i;
         }
@@ -1020,20 +1027,20 @@ void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
   idx_t beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
   idx_t end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
   assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Mutator),
-          "Mutator free regions before the leftmost: %zd, bound %zd",
+          "Mutator free region before the leftmost: %zd, bound %zd",
           beg_off, leftmost(ShenandoahFreeSetPartitionId::Mutator));
   assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Mutator),
-          "Mutator free regions past the rightmost: %zd, bound %zd",
+          "Mutator free region past the rightmost: %zd, bound %zd",
           end_off, rightmost(ShenandoahFreeSetPartitionId::Mutator));
 
   beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
   end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)];
-  assert (beg_off >= leftmost_empty(ShenandoahFreeSetPartitionId::Mutator),
-          "Mutator free empty regions before the leftmost: %zd, bound %zd",
-          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Mutator));
-  assert (end_off <= rightmost_empty(ShenandoahFreeSetPartitionId::Mutator),
-          "Mutator free empty regions past the rightmost: %zd, bound %zd",
-          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Mutator));
+  assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+          "free empty region (%zd) before the leftmost bound %zd",
+          beg_off, _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)]);
+  assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+          "free empty region (%zd) past the rightmost bound %zd",
+          end_off, _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)]);
 
   // Performance invariants. Failing these would not break the free partition, but performance would suffer.
   assert (leftmost(ShenandoahFreeSetPartitionId::Collector) <= _max, "leftmost in bounds: %zd < %zd",
@@ -1053,20 +1060,20 @@ void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
   beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
   end_off = rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
   assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::Collector),
-          "Collector free regions before the leftmost: %zd, bound %zd",
+          "Collector free region before the leftmost: %zd, bound %zd",
           beg_off, leftmost(ShenandoahFreeSetPartitionId::Collector));
   assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::Collector),
-          "Collector free regions past the rightmost: %zd, bound %zd",
+          "Collector free region past the rightmost: %zd, bound %zd",
           end_off, rightmost(ShenandoahFreeSetPartitionId::Collector));
 
   beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::Collector)];
   end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::Collector)];
   assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
-          "Collector free empty regions before the leftmost: %zd, bound %zd",
-          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::Collector));
+          "Collector free empty region before the leftmost: %zd, bound %zd",
+          beg_off, _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
   assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
-          "Collector free empty regions past the rightmost: %zd, bound %zd",
-          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::Collector));
+          "Collector free empty region past the rightmost: %zd, bound %zd",
+          end_off, _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
 
   // Performance invariants. Failing these would not break the free partition, but performance would suffer.
   assert (leftmost(ShenandoahFreeSetPartitionId::OldCollector) <= _max, "OldCollector leftmost in bounds: %zd < %zd",
@@ -1083,107 +1090,122 @@ void ShenandoahRegionPartitions::assert_bounds(bool validate_totals) {
                                   ShenandoahFreeSetPartitionId::OldCollector),
           "OldCollector rightmost region should be free: %zd", rightmost(ShenandoahFreeSetPartitionId::OldCollector));
 
+  // Concurrent recycling of trash recycles a region (changing its state from is_trash to is_empty without the heap lock),
+
   // If OldCollector partition is empty, leftmosts will both equal max, rightmosts will both equal zero.
   // Likewise for empty region partitions.
   beg_off = leftmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
   end_off = rightmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
-  assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::OldCollector),
-          "OldCollector free regions before the leftmost: %zd, bound %zd",
+  assert (beg_off >= leftmost(ShenandoahFreeSetPartitionId::OldCollector), "free regions before the leftmost: %zd, bound %zd",
           beg_off, leftmost(ShenandoahFreeSetPartitionId::OldCollector));
-  assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::OldCollector),
-          "OldCollector free regions past the rightmost: %zd, bound %zd",
+  assert (end_off <= rightmost(ShenandoahFreeSetPartitionId::OldCollector), "free regions past the rightmost: %zd, bound %zd",
           end_off, rightmost(ShenandoahFreeSetPartitionId::OldCollector));
 
   beg_off = empty_leftmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
   end_off = empty_rightmosts[int(ShenandoahFreeSetPartitionId::OldCollector)];
   assert (beg_off >= _leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
-          "OldCollector free empty regions before the leftmost: %zd, bound %zd",
-          beg_off, leftmost_empty(ShenandoahFreeSetPartitionId::OldCollector));
+          "free empty region (%zd) before the leftmost bound %zd, region %s trash",
+          beg_off, _leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
+          ((beg_off >= _max)? "out of bounds is not":
+           (ShenandoahHeap::heap()->get_region(_leftmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)])->is_trash()?
+            "is": "is not")));
   assert (end_off <= _rightmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
-          "OldCollector free empty regions past the rightmost: %zd, bound %zd",
-          end_off, rightmost_empty(ShenandoahFreeSetPartitionId::OldCollector));
+          "free empty region (%zd) past the rightmost bound %zd, region %s trash",
+          end_off, _rightmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)],
+          ((end_off < 0)? "out of bounds is not" :
+           (ShenandoahHeap::heap()->get_region(_rightmosts_empty[int(ShenandoahFreeSetPartitionId::OldCollector)])->is_trash()?
+            "is": "is not")));
 
-  if (validate_totals) {
-    // young_retired_regions need to be added to either Mutator or Collector partitions, 100% used.
-    // Give enough of young_retired_regions, young_retired_capacity, young_retired_user
-    //  to the Mutator partition to top it off so that it matches the running totals.
-    //
-    // Give any remnants to the Collector partition.  After topping off the Collector partition, its values
-    //  should also match running totals.
+  // young_retired_regions need to be added to either Mutator or Collector partitions, 100% used.
+  // Give enough of young_retired_regions, young_retired_capacity, young_retired_user
+  //  to the Mutator partition to top it off so that it matches the running totals.
+  //
+  // Give any remnants to the Collector partition.  After topping off the Collector partition, its values
+  //  should also match running totals.
+  assert(young_retired_regions * _region_size_bytes == young_retired_capacity, "sanity");
+  assert(young_retired_capacity == young_retired_used, "sanity");
 
-    assert(young_retired_regions * _region_size_bytes == young_retired_capacity, "sanity");
-    assert(young_retired_capacity == young_retired_used, "sanity");
+  assert(capacities[int(ShenandoahFreeSetPartitionId::OldCollector)]
+         == _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector capacities must match (%zu != %zu)",
+         capacities[int(ShenandoahFreeSetPartitionId::OldCollector)],
+         _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)]);
+  assert(used[int(ShenandoahFreeSetPartitionId::OldCollector)]
+         == _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector used must match");
+  assert(regions[int(ShenandoahFreeSetPartitionId::OldCollector)]
+         == _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] / _region_size_bytes, "Old collector regions must match");
+  assert(_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)]
+         >= _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector capacity must be >= used");
+  assert(_available[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
+         (_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] - _used[int(ShenandoahFreeSetPartitionId::OldCollector)]),
+         "Old Collector available must equal capacity minus used");
+  assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
+         humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector humongous waste must match");
 
+  assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= capacities[int(ShenandoahFreeSetPartitionId::Mutator)],
+         "Capacity total must be >= counted tally");
+  size_t mutator_capacity_shortfall =
+    _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - capacities[int(ShenandoahFreeSetPartitionId::Mutator)];
+  assert(mutator_capacity_shortfall <= young_retired_capacity, "sanity");
+  capacities[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_capacity_shortfall;
+  young_retired_capacity -= mutator_capacity_shortfall;
+  capacities[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_capacity;
 
-    assert(capacities[int(ShenandoahFreeSetPartitionId::OldCollector)]
-           == _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector capacities must match");
-    assert(used[int(ShenandoahFreeSetPartitionId::OldCollector)]
-           == _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old collector used must match");
-    assert(regions[int(ShenandoahFreeSetPartitionId::OldCollector)]
-           == _capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] / _region_size_bytes, "Old collector regions must match");
-    assert(_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)]
-           >= _used[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector capacity must be >= used");
-    assert(_available[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
-           (_capacity[int(ShenandoahFreeSetPartitionId::OldCollector)] - _used[int(ShenandoahFreeSetPartitionId::OldCollector)]),
-           "Old Collector available must equal capacity minus used");
-    assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)] ==
-           humongous_waste[int(ShenandoahFreeSetPartitionId::OldCollector)], "Old Collector humongous waste must match");
+  assert(_used[int(ShenandoahFreeSetPartitionId::Mutator)] >= used[int(ShenandoahFreeSetPartitionId::Mutator)],
+         "Used total must be >= counted tally");
+  size_t mutator_used_shortfall =
+    _used[int(ShenandoahFreeSetPartitionId::Mutator)] - used[int(ShenandoahFreeSetPartitionId::Mutator)];
+  assert(mutator_used_shortfall <= young_retired_used, "sanity");
+  used[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_used_shortfall;
+  young_retired_used -= mutator_used_shortfall;
+  used[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_used;
 
-    assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= capacities[int(ShenandoahFreeSetPartitionId::Mutator)],
-           "Capacity total must be >= counted tally");
-    size_t mutator_capacity_shortfall =
-      _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - capacities[int(ShenandoahFreeSetPartitionId::Mutator)];
-    assert(mutator_capacity_shortfall <= young_retired_capacity, "sanity");
-    capacities[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_capacity_shortfall;
-    young_retired_capacity -= mutator_capacity_shortfall;
-    capacities[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_capacity;
+  assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
+         >= regions[int(ShenandoahFreeSetPartitionId::Mutator)], "Region total must be >= counted tally");
+  size_t mutator_regions_shortfall = (_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
+                                      - regions[int(ShenandoahFreeSetPartitionId::Mutator)]);
+  assert(mutator_regions_shortfall <= young_retired_regions, "sanity");
+  regions[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_regions_shortfall;
+  young_retired_regions -= mutator_regions_shortfall;
+  regions[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_regions;
 
+  assert(capacities[int(ShenandoahFreeSetPartitionId::Collector)] == _capacity[int(ShenandoahFreeSetPartitionId::Collector)],
+         "Collector capacities must match");
+  assert(used[int(ShenandoahFreeSetPartitionId::Collector)] == _used[int(ShenandoahFreeSetPartitionId::Collector)],
+         "Collector used must match");
+  assert(regions[int(ShenandoahFreeSetPartitionId::Collector)]
+         == _capacity[int(ShenandoahFreeSetPartitionId::Collector)] / _region_size_bytes, "Collector regions must match");
+  assert(_capacity[int(ShenandoahFreeSetPartitionId::Collector)] >= _used[int(ShenandoahFreeSetPartitionId::Collector)],
+         "Collector Capacity must be >= used");
+  assert(_available[int(ShenandoahFreeSetPartitionId::Collector)] ==
+         (_capacity[int(ShenandoahFreeSetPartitionId::Collector)] - _used[int(ShenandoahFreeSetPartitionId::Collector)]),
+         "Collector Available must equal capacity minus used");
 
-    assert(_used[int(ShenandoahFreeSetPartitionId::Mutator)] >= used[int(ShenandoahFreeSetPartitionId::Mutator)],
-           "Used total must be >= counted tally");
-    size_t mutator_used_shortfall =
-      _used[int(ShenandoahFreeSetPartitionId::Mutator)] - used[int(ShenandoahFreeSetPartitionId::Mutator)];
-    assert(mutator_used_shortfall <= young_retired_used, "sanity");
-    used[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_used_shortfall;
-    young_retired_used -= mutator_used_shortfall;
-    used[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_used;
+  assert(capacities[int(ShenandoahFreeSetPartitionId::Mutator)] == _capacity[int(ShenandoahFreeSetPartitionId::Mutator)],
+         "Mutator capacities must match");
+  assert(used[int(ShenandoahFreeSetPartitionId::Mutator)] == _used[int(ShenandoahFreeSetPartitionId::Mutator)],
+         "Mutator used must match");
+  assert(regions[int(ShenandoahFreeSetPartitionId::Mutator)]
+         == _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes, "Mutator regions must match");
+  assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= _used[int(ShenandoahFreeSetPartitionId::Mutator)],
+         "Mutator capacity must be >= used");
+  assert(_available[int(ShenandoahFreeSetPartitionId::Mutator)] ==
+         (_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - _used[int(ShenandoahFreeSetPartitionId::Mutator)]),
+         "Mutator available must equal capacity minus used");
+  assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::Mutator)] == young_humongous_waste,
+         "Mutator humongous waste must match");
+}
 
-    assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
-           >= regions[int(ShenandoahFreeSetPartitionId::Mutator)], "Region total must be >= counted tally");
-    size_t mutator_regions_shortfall = (_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes
-                                        - regions[int(ShenandoahFreeSetPartitionId::Mutator)]);
-    assert(mutator_regions_shortfall <= young_retired_regions, "sanity");
-    regions[int(ShenandoahFreeSetPartitionId::Mutator)] += mutator_regions_shortfall;
-    young_retired_regions -= mutator_regions_shortfall;
-    regions[int(ShenandoahFreeSetPartitionId::Collector)] += young_retired_regions;
+inline void ShenandoahRegionPartitions::assert_bounds_sanity() {
+  for (uint8_t i = 0; i < UIntNumPartitions; i++) {
+    ShenandoahFreeSetPartitionId partition = static_cast<ShenandoahFreeSetPartitionId>(i);
+    assert(leftmost(partition) == _max || membership(leftmost(partition)) == partition, "Left most boundry must be sane");
+    assert(rightmost(partition) == -1 || membership(rightmost(partition)) == partition, "Right most boundry must be sane");
 
-    assert(capacities[int(ShenandoahFreeSetPartitionId::Collector)] == _capacity[int(ShenandoahFreeSetPartitionId::Collector)],
-           "Collector capacities must match");
-    assert(used[int(ShenandoahFreeSetPartitionId::Collector)] == _used[int(ShenandoahFreeSetPartitionId::Collector)],
-           "Collector used must match");
-    assert(regions[int(ShenandoahFreeSetPartitionId::Collector)]
-           == _capacity[int(ShenandoahFreeSetPartitionId::Collector)] / _region_size_bytes, "Collector regions must match");
-    assert(_capacity[int(ShenandoahFreeSetPartitionId::Collector)] >= _used[int(ShenandoahFreeSetPartitionId::Collector)],
-           "Collector Capacity must be >= used");
-    assert(_available[int(ShenandoahFreeSetPartitionId::Collector)] ==
-           (_capacity[int(ShenandoahFreeSetPartitionId::Collector)] - _used[int(ShenandoahFreeSetPartitionId::Collector)]),
-           "Collector Available must equal capacity minus used");
-
-    assert(capacities[int(ShenandoahFreeSetPartitionId::Mutator)] == _capacity[int(ShenandoahFreeSetPartitionId::Mutator)],
-           "Mutator capacities must match");
-    assert(used[int(ShenandoahFreeSetPartitionId::Mutator)] == _used[int(ShenandoahFreeSetPartitionId::Mutator)],
-           "Mutator used must match");
-    assert(regions[int(ShenandoahFreeSetPartitionId::Mutator)]
-           == _capacity[int(ShenandoahFreeSetPartitionId::Mutator)] / _region_size_bytes, "Mutator regions must match");
-    assert(_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] >= _used[int(ShenandoahFreeSetPartitionId::Mutator)],
-           "Mutator capacity must be >= used");
-    assert(_available[int(ShenandoahFreeSetPartitionId::Mutator)] ==
-           (_capacity[int(ShenandoahFreeSetPartitionId::Mutator)] - _used[int(ShenandoahFreeSetPartitionId::Mutator)]),
-           "Mutator available must equal capacity minus used");
-    assert(_humongous_waste[int(ShenandoahFreeSetPartitionId::Mutator)] == young_humongous_waste,
-           "Mutator humongous waste must match");
+    assert(leftmost_empty(partition) == _max || leftmost_empty(partition) >= leftmost(partition), "Left most empty must be sane");
+    assert(rightmost_empty(partition) == -1 || rightmost_empty(partition) <= rightmost(partition), "Right most empty must be sane");
   }
 }
+
 #endif
 
 ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
@@ -1206,6 +1228,36 @@ ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
   clear_internal();
 }
 
+void ShenandoahFreeSet::move_unaffiliated_regions_from_collector_to_old_collector(ssize_t count) {
+  shenandoah_assert_heaplocked();
+  size_t region_size_bytes =  ShenandoahHeapRegion::region_size_bytes();
+
+  size_t old_capacity = _partitions.get_capacity(ShenandoahFreeSetPartitionId::OldCollector);
+  size_t collector_capacity = _partitions.get_capacity(ShenandoahFreeSetPartitionId::Collector);
+  if (count > 0) {
+    size_t ucount = count;
+    size_t bytes_moved = ucount * region_size_bytes;
+    assert(collector_capacity >= bytes_moved, "Cannot transfer");
+    assert(_partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Collector) >= ucount,
+           "Cannot transfer %zu of %zu", ucount, _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Collector));
+    _partitions.decrease_empty_region_counts(ShenandoahFreeSetPartitionId::Collector, ucount);
+    _partitions.set_capacity_of(ShenandoahFreeSetPartitionId::Collector, collector_capacity - bytes_moved);
+    _partitions.set_capacity_of(ShenandoahFreeSetPartitionId::OldCollector, old_capacity + bytes_moved);
+    _partitions.increase_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector, ucount);
+  } else if (count < 0) {
+    size_t ucount = -count;
+    size_t bytes_moved = ucount * region_size_bytes;
+    assert(old_capacity >= bytes_moved, "Cannot transfer");
+    assert(_partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector) >= ucount,
+           "Cannot transfer %zu of %zu", ucount, _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector));
+    _partitions.decrease_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector, ucount);
+    _partitions.set_capacity_of(ShenandoahFreeSetPartitionId::OldCollector, old_capacity - bytes_moved);
+    _partitions.set_capacity_of(ShenandoahFreeSetPartitionId::Collector, collector_capacity + bytes_moved);
+    _partitions.increase_empty_region_counts(ShenandoahFreeSetPartitionId::Collector, ucount);
+  }
+  // else, do nothing
+}
+
 // was pip_pad_bytes
 void ShenandoahFreeSet::add_promoted_in_place_region_to_old_collector(ShenandoahHeapRegion* region) {
   shenandoah_assert_heaplocked();
@@ -1261,7 +1313,7 @@ void ShenandoahFreeSet::add_promoted_in_place_region_to_old_collector(Shenandoah
                              /* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ true,
                              /* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ true,
                              /* UnaffiliatedChangesAreYoungNeutral */ true>();
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
 }
 
 template<typename Iter>
@@ -1496,9 +1548,12 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
     return nullptr;
   }
   HeapWord* result = nullptr;
+  // We must call try_recycle_under_lock() even if !r->is_trash().  The reason is that if r is being recycled at this
+  // moment by a GC worker thread, it may appear to be not trash even though it has not yet been fully recycled.  If
+  // we proceed without waiting for the worker to finish recycling the region, the worker thread may overwrite the
+  // region's affiliation with FREE after we set the region's affiliation to req.afiliation() below
   r->try_recycle_under_lock();
   in_new_region = r->is_empty();
-
   if (in_new_region) {
     log_debug(gc, free)("Using new region (%zu) for %s (" PTR_FORMAT ").",
                         r->index(), req.type_string(), p2i(&req));
@@ -1611,6 +1666,12 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
     // Not old collector alloc, so this is a young collector gclab or shared allocation
     orig_partition = ShenandoahFreeSetPartitionId::Collector;
   }
+  DEBUG_ONLY(bool boundary_changed = false;)
+  if ((result != nullptr) && in_new_region) {
+    _partitions.one_region_is_no_longer_empty(orig_partition);
+    DEBUG_ONLY(boundary_changed = true;)
+  }
+
   if (alloc_capacity(r) < PLAB::min_size() * HeapWordSize) {
     // Regardless of whether this allocation succeeded, if the remaining memory is less than PLAB:min_size(), retire this region.
     // Note that retire_from_partition() increases used to account for waste.
@@ -1619,15 +1680,11 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
     // then retire the region so that subsequent searches can find available memory more quickly.
 
     size_t idx = r->index();
-    if ((result != nullptr) && in_new_region) {
-      _partitions.one_region_is_no_longer_empty(orig_partition);
-    }
     size_t waste_bytes = _partitions.retire_from_partition(orig_partition, idx, r->used());
+    DEBUG_ONLY(boundary_changed = true;)
     if (req.is_mutator_alloc() && (waste_bytes > 0)) {
       increase_bytes_allocated(waste_bytes);
     }
-  } else if ((result != nullptr) && in_new_region) {
-    _partitions.one_region_is_no_longer_empty(orig_partition);
   }
 
   switch (orig_partition) {
@@ -1668,7 +1725,13 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
   default:
     assert(false, "won't happen");
   }
-  _partitions.assert_bounds(true);
+#ifdef ASSERT
+  if (boundary_changed) {
+    _partitions.assert_bounds();
+  } else {
+    _partitions.assert_bounds_sanity();
+  }
+#endif
   return result;
 }
 
@@ -1799,6 +1862,7 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req, bo
       increase_bytes_allocated(waste_bytes);
     }
   }
+
   _partitions.increase_used(ShenandoahFreeSetPartitionId::Mutator, total_used);
   increase_bytes_allocated(total_used);
   req.set_actual_size(words_size);
@@ -1819,14 +1883,16 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req, bo
                              /* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ false,
                              /* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ false,
                              /* UnaffiliatedChangesAreYoungNeutral */ false>();
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
   return _heap->get_region(beg)->bottom();
 }
 
 class ShenandoahRecycleTrashedRegionClosure final : public ShenandoahHeapRegionClosure {
 public:
   void heap_region_do(ShenandoahHeapRegion* r) {
-    r->try_recycle();
+    if (r->is_trash()) {
+      r->try_recycle();
+    }
   }
 
   bool is_thread_safe() {
@@ -1861,7 +1927,7 @@ bool ShenandoahFreeSet::transfer_one_region_from_mutator_to_old_collector(size_t
                                /* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ true,
                                /* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
                                /* UnaffiliatedChangesAreYoungNeutral */ false>();
-    _partitions.assert_bounds(true);
+    _partitions.assert_bounds();
     return true;
   } else {
     return false;
@@ -1914,7 +1980,7 @@ bool ShenandoahFreeSet::flip_to_old_gc(ShenandoahHeapRegion* r) {
                                  /* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ true,
                                  /* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
                                  /* UnaffiliatedChangesAreYoungNeutral */ false>();
-      _partitions.assert_bounds(true);
+      _partitions.assert_bounds();
       // 4. Do not adjust capacities for generations, we just swapped the regions that have already
       // been accounted for. However, we should adjust the evacuation reserves as those may have changed.
       shenandoah_assert_heaplocked();
@@ -1945,7 +2011,7 @@ void ShenandoahFreeSet::flip_to_gc(ShenandoahHeapRegion* r) {
                              /* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ false,
                              /* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
                              /* UnaffiliatedChangesAreYoungNeutral */ true>();
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
   // We do not ensure that the region is no longer trash, relying on try_allocate_in(), which always comes next,
   // to recycle trash before attempting to allocate anything in the region.
 }
@@ -2025,16 +2091,23 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
   for (size_t idx = 0; idx < num_regions; idx++) {
     ShenandoahHeapRegion* region = _heap->get_region(idx);
     if (region->is_trash()) {
-      // Trashed regions represent immediate garbage identified by final mark and regions that had been in the collection
-      // partition but have not yet been "cleaned up" following update refs.
+      // Trashed regions represent regions that had been in the collection set (or may have been identified as immediate garbage)
+      // but have not yet been "cleaned up".  The cset regions are not "trashed" until we have finished update refs.
       if (region->is_old()) {
+        // We're going to place this region into the Mutator set.  We increment old_trashed_regions because this count represents
+        // regions that the old generation is entitled to without any transfer from young.  We do not place this region into
+        // the OldCollector partition at this time.  Instead, we let reserve_regions() decide whether to place this region
+        // into the OldCollector partition.  Deferring the decision allows reserve_regions() to more effectively pack the
+        // OldCollector regions into high-address memory.  We do not adjust capacities of old and young generations at this
+        // time.  At the end of finish_rebuild(), the capacities are adjusted based on the results of reserve_regions().
         old_trashed_regions++;
       } else {
         assert(region->is_young(), "Trashed region should be old or young");
         young_trashed_regions++;
       }
     } else if (region->is_old()) {
-      // count both humongous and regular regions, but don't count trash (cset) regions.
+      // We count humongous and regular regions as "old regions".  We do not count trashed regions that are old.  Those
+      // are counted (above) as old_trashed_regions.
       old_region_count++;
       if (first_old_region > idx) {
         first_old_region = idx;
@@ -2048,7 +2121,7 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
       size_t ac = alloc_capacity(region);
       if (ac >= PLAB::min_size() * HeapWordSize) {
         if (region->is_trash() || !region->is_old()) {
-          // Both young and old collected regions (trashed) are placed into the Mutator set
+          // Both young and old (possibly immediately) collected regions (trashed) are placed into the Mutator set
           _partitions.raw_assign_membership(idx, ShenandoahFreeSetPartitionId::Mutator);
           if (idx < mutator_leftmost) {
             mutator_leftmost = idx;
@@ -2111,10 +2184,19 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
         assert(_partitions.membership(idx) == ShenandoahFreeSetPartitionId::NotFree, "Region should have been retired");
         size_t humongous_waste_bytes = 0;
         if (region->is_humongous_start()) {
-          oop obj = cast_to_oop(region->bottom());
-          size_t byte_size = obj->size() * HeapWordSize;
-          size_t region_span = ShenandoahHeapRegion::required_regions(byte_size);
-          humongous_waste_bytes = region_span * ShenandoahHeapRegion::region_size_bytes() - byte_size;
+          // Since rebuild does not necessarily happen at a safepoint, a newly allocated humongous object may not have been
+          // fully initialized.  Therefore, we cannot safely consult its header.
+          ShenandoahHeapRegion* last_of_humongous_continuation = region;
+          size_t next_idx;
+          for (next_idx = idx + 1; next_idx < num_regions; next_idx++) {
+            ShenandoahHeapRegion* humongous_cont_candidate = _heap->get_region(next_idx);
+            if (!humongous_cont_candidate->is_humongous_continuation()) {
+              break;
+            }
+            last_of_humongous_continuation = humongous_cont_candidate;
+          }
+          // For humongous regions, used() is established while holding the global heap lock so it is reliable here
+          humongous_waste_bytes = ShenandoahHeapRegion::region_size_bytes() - last_of_humongous_continuation->used();
         }
         if (region->is_old()) {
           old_collector_used += region_size_bytes;
@@ -2183,7 +2265,7 @@ void ShenandoahFreeSet::find_regions_with_alloc_capacity(size_t &young_trashed_r
                              /* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ true,
                              /* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ false,
                              /* UnaffiliatedChangesAreYoungNeutral */ false>();
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
 #ifdef ASSERT
   if (_heap->mode()->is_generational()) {
     assert(young_affiliated_regions() == _heap->young_generation()->get_affiliated_region_count(), "sanity");
@@ -2221,7 +2303,7 @@ void ShenandoahFreeSet::transfer_humongous_regions_from_mutator_to_old_collector
                              /* CollectorSizeChanged */ false, /* OldCollectorSizeChanged */ true,
                              /* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ true,
                              /* UnaffiliatedChangesAreYoungNeutral */ true>();
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
   // global_used is unaffected by this transfer
 
   // No need to adjust ranges because humongous regions are not allocatable
@@ -2303,7 +2385,7 @@ void ShenandoahFreeSet::transfer_empty_regions_from_to(ShenandoahFreeSetPartitio
                                  /* UnaffiliatedChangesAreYoungNeutral */ true>();
     }
   }
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
 }
 
 // Returns number of regions transferred, adds transferred bytes to var argument bytes_transferred
@@ -2370,7 +2452,7 @@ size_t ShenandoahFreeSet::transfer_empty_regions_from_collector_set_to_mutator_s
                                /* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
                                /* UnaffiliatedChangesAreYoungNeutral */ true>();
   }
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
   return transferred_regions;
 }
 
@@ -2445,7 +2527,7 @@ transfer_non_empty_regions_from_collector_set_to_mutator_set(ShenandoahFreeSetPa
                                /* AffiliatedChangesAreYoungNeutral */ true, /* AffiliatedChangesAreGlobalNeutral */ true,
                                /* UnaffiliatedChangesAreYoungNeutral */ true>();
   }
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
   return transferred_regions;
 }
 
@@ -2495,6 +2577,10 @@ void ShenandoahFreeSet::move_regions_from_collector_to_mutator(size_t max_xfer_r
 void ShenandoahFreeSet::prepare_to_rebuild(size_t &young_trashed_regions, size_t &old_trashed_regions,
                                            size_t &first_old_region, size_t &last_old_region, size_t &old_region_count) {
   shenandoah_assert_heaplocked();
+  assert(rebuild_lock() != nullptr, "sanity");
+  rebuild_lock()->lock(false);
+  // This resets all state information, removing all regions from all sets.
+  clear();
   log_debug(gc, free)("Rebuilding FreeSet");
 
   // This places regions that have alloc_capacity into the old_collector set if they identify as is_old() or the
@@ -2503,14 +2589,13 @@ void ShenandoahFreeSet::prepare_to_rebuild(size_t &young_trashed_regions, size_t
                                    first_old_region, last_old_region, old_region_count);
 }
 
-void ShenandoahFreeSet::finish_rebuild(size_t young_trashed_regions, size_t old_trashed_regions, size_t old_region_count,
-                                       bool have_evacuation_reserves) {
+
+void ShenandoahFreeSet::finish_rebuild(size_t young_cset_regions, size_t old_cset_regions, size_t old_region_count) {
   shenandoah_assert_heaplocked();
   size_t young_reserve(0), old_reserve(0);
 
   if (_heap->mode()->is_generational()) {
-    compute_young_and_old_reserves(young_trashed_regions, old_trashed_regions, have_evacuation_reserves,
-                                   young_reserve, old_reserve);
+    compute_young_and_old_reserves(young_cset_regions, old_cset_regions, young_reserve, old_reserve);
   } else {
     young_reserve = (_heap->max_capacity() / 100) * ShenandoahEvacReserve;
     old_reserve = 0;
@@ -2524,8 +2609,44 @@ void ShenandoahFreeSet::finish_rebuild(size_t young_trashed_regions, size_t old_
   _total_young_regions = _heap->num_regions() - old_region_count;
   _total_global_regions = _heap->num_regions();
   establish_old_collector_alloc_bias();
-  _partitions.assert_bounds(true);
+
+  // Release the rebuild lock now.  What remains in this function is read-only
+  rebuild_lock()->unlock();
+  _partitions.assert_bounds();
   log_status();
+  if (_heap->mode()->is_generational()) {
+    // Clear the region balance until it is adjusted in preparation for a subsequent GC cycle.
+    _heap->old_generation()->set_region_balance(0);
+  }
+}
+
+
+// Reduce old reserve (when there are insufficient resources to satisfy the original request).
+void ShenandoahFreeSet::reduce_old_reserve(size_t adjusted_old_reserve, size_t requested_old_reserve) {
+  ShenandoahOldGeneration* const old_generation = _heap->old_generation();
+  size_t requested_promoted_reserve = old_generation->get_promoted_reserve();
+  size_t requested_old_evac_reserve = old_generation->get_evacuation_reserve();
+  assert(adjusted_old_reserve < requested_old_reserve, "Only allow reduction");
+  assert(requested_promoted_reserve + requested_old_evac_reserve >= adjusted_old_reserve, "Sanity");
+  size_t delta = requested_old_reserve - adjusted_old_reserve;
+
+  if (requested_promoted_reserve >= delta) {
+    requested_promoted_reserve -= delta;
+    old_generation->set_promoted_reserve(requested_promoted_reserve);
+  } else {
+    delta -= requested_promoted_reserve;
+    requested_promoted_reserve = 0;
+    requested_old_evac_reserve -= delta;
+    old_generation->set_promoted_reserve(requested_promoted_reserve);
+    old_generation->set_evacuation_reserve(requested_old_evac_reserve);
+  }
+}
+
+// Reduce young reserve (when there are insufficient resources to satisfy the original request).
+void ShenandoahFreeSet::reduce_young_reserve(size_t adjusted_young_reserve, size_t requested_young_reserve) {
+  ShenandoahYoungGeneration* const young_generation = _heap->young_generation();
+  assert(adjusted_young_reserve < requested_young_reserve, "Only allow reduction");
+  young_generation->set_evacuation_reserve(adjusted_young_reserve);
 }
 
 /**
@@ -2542,7 +2663,6 @@ void ShenandoahFreeSet::finish_rebuild(size_t young_trashed_regions, size_t old_
  *     this value should computed by ShenandoahGenerationalHeap::compute_old_generation_balance().
  */
 void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regions, size_t old_trashed_regions,
-                                                       bool have_evacuation_reserves,
                                                        size_t& young_reserve_result, size_t& old_reserve_result) const {
   shenandoah_assert_generational();
   shenandoah_assert_heaplocked();
@@ -2559,6 +2679,15 @@ void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regi
   old_available += old_trashed_regions * region_size_bytes;
   young_unaffiliated_regions += young_trashed_regions;
 
+  assert(young_capacity >= young_generation->used(),
+         "Young capacity (%zu) must exceed used (%zu)", young_capacity, young_generation->used());
+
+  size_t young_available = young_capacity - young_generation->used();
+  young_available += young_trashed_regions * region_size_bytes;
+
+  assert(young_available >= young_unaffiliated_regions * region_size_bytes, "sanity");
+  assert(old_available >= old_unaffiliated_regions * region_size_bytes, "sanity");
+
   // Consult old-region balance to make adjustments to current generation capacities and availability.
   // The generation region transfers take place after we rebuild.  old_region_balance represents number of regions
   // to transfer from old to young.
@@ -2578,6 +2707,7 @@ void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regi
     ssize_t xfer_bytes = old_region_balance * checked_cast<ssize_t>(region_size_bytes);
     old_available -= xfer_bytes;
     old_unaffiliated_regions -= old_region_balance;
+    young_available += xfer_bytes;
     young_capacity += xfer_bytes;
     young_unaffiliated_regions += old_region_balance;
   }
@@ -2586,41 +2716,22 @@ void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regi
   // promotions and evacuations.  The partition between which old memory is reserved for evacuation and
   // which is reserved for promotion is enforced using thread-local variables that prescribe intentions for
   // each PLAB's available memory.
-  if (have_evacuation_reserves) {
-    // We are rebuilding at the end of final mark, having already established evacuation budgets for this GC pass.
-    const size_t promoted_reserve = old_generation->get_promoted_reserve();
-    const size_t old_evac_reserve = old_generation->get_evacuation_reserve();
-    young_reserve_result = young_generation->get_evacuation_reserve();
-    old_reserve_result = promoted_reserve + old_evac_reserve;
-    if (old_reserve_result > old_available) {
-      // Try to transfer memory from young to old.
-      size_t old_deficit = old_reserve_result - old_available;
-      size_t old_region_deficit = (old_deficit + region_size_bytes - 1) / region_size_bytes;
-      if (young_unaffiliated_regions < old_region_deficit) {
-        old_region_deficit = young_unaffiliated_regions;
-      }
-      young_unaffiliated_regions -= old_region_deficit;
-      old_unaffiliated_regions += old_region_deficit;
-      old_region_balance -= old_region_deficit;
-      old_generation->set_region_balance(old_region_balance);
-    }
-  } else {
-    // We are rebuilding at end of GC, so we set aside budgets specified on command line (or defaults)
-    young_reserve_result = (young_capacity * ShenandoahEvacReserve) / 100;
-    // The auto-sizer has already made old-gen large enough to hold all anticipated evacuations and promotions.
-    // Affiliated old-gen regions are already in the OldCollector free set.  Add in the relevant number of
-    // unaffiliated regions.
-    old_reserve_result = old_available;
-  }
+  const size_t promoted_reserve = old_generation->get_promoted_reserve();
+  const size_t old_evac_reserve = old_generation->get_evacuation_reserve();
+  young_reserve_result = young_generation->get_evacuation_reserve();
+  old_reserve_result = promoted_reserve + old_evac_reserve;
+  assert(old_reserve_result + young_reserve_result <= old_available + young_available,
+         "Cannot reserve (%zu + %zu + %zu) more than is available: %zu + %zu",
+         promoted_reserve, old_evac_reserve, young_reserve_result, old_available, young_available);
 
   // Old available regions that have less than PLAB::min_size() of available memory are not placed into the OldCollector
   // free set.  Because of this, old_available may not have enough memory to represent the intended reserve.  Adjust
   // the reserve downward to account for this possibility. This loss is part of the reason why the original budget
   // was adjusted with ShenandoahOldEvacWaste and ShenandoahOldPromoWaste multipliers.
   if (old_reserve_result >
-      _partitions.capacity_of(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes) {
+      _partitions.available_in(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes) {
     old_reserve_result =
-      _partitions.capacity_of(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes;
+      _partitions.available_in(ShenandoahFreeSetPartitionId::OldCollector) + old_unaffiliated_regions * region_size_bytes;
   }
 
   if (young_reserve_result > young_unaffiliated_regions * region_size_bytes) {
@@ -2784,19 +2895,17 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
       ShenandoahFreeSetPartitionId p = _partitions.membership(idx);
       size_t ac = alloc_capacity(r);
       assert(ac != region_size_bytes, "Empty regions should be in Mutator partion at entry to reserve_regions");
-      if (p == ShenandoahFreeSetPartitionId::Collector) {
-        if (ac != region_size_bytes) {
-          young_used_regions++;
-          young_used_bytes = region_size_bytes - ac;
-        }
-        // else, unaffiliated region has no used
-      } else if (p == ShenandoahFreeSetPartitionId::OldCollector) {
-        if (ac != region_size_bytes) {
-          old_used_regions++;
-          old_used_bytes = region_size_bytes - ac;
-        }
-        // else, unaffiliated region has no used
-      } else if (p == ShenandoahFreeSetPartitionId::NotFree) {
+      assert(p != ShenandoahFreeSetPartitionId::Collector, "Collector regions must be converted from Mutator regions");
+      if (p == ShenandoahFreeSetPartitionId::OldCollector) {
+        assert(!r->is_empty(), "Empty regions should be in Mutator partition at entry to reserve_regions");
+        old_used_regions++;
+        old_used_bytes = region_size_bytes - ac;
+        // This region is within the range for OldCollector partition, as established by find_regions_with_alloc_capacity()
+        assert((_partitions.leftmost(ShenandoahFreeSetPartitionId::OldCollector) <= idx) &&
+               (_partitions.rightmost(ShenandoahFreeSetPartitionId::OldCollector) >= idx),
+               "find_regions_with_alloc_capacity() should have established this is in range");
+      } else {
+        assert(p == ShenandoahFreeSetPartitionId::NotFree, "sanity");
         // This region has been retired
         if (r->is_old()) {
           old_used_regions++;
@@ -2806,21 +2915,6 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
           young_used_regions++;
           young_used_bytes += region_size_bytes - ac;
         }
-      } else {
-        assert(p == ShenandoahFreeSetPartitionId::OldCollector, "Not mutator and not NotFree, so must be OldCollector");
-        assert(!r->is_empty(), "Empty regions should be in Mutator partition at entry to reserve_regions");
-        if (idx < old_collector_low_idx) {
-          old_collector_low_idx = idx;
-        }
-        if (idx > old_collector_high_idx) {
-          old_collector_high_idx = idx;
-        }
-        if (idx < old_collector_empty_low_idx) {
-          old_collector_empty_low_idx = idx;
-        }
-        if (idx > old_collector_empty_high_idx) {
-          old_collector_empty_high_idx = idx;
-        }
       }
     }
   }
@@ -2849,14 +2943,14 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
     _partitions.increase_used(ShenandoahFreeSetPartitionId::OldCollector, used_to_old_collector);
   }
 
-  _partitions.expand_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId::Collector,
-                                                                collector_low_idx, collector_high_idx,
-                                                                collector_empty_low_idx, collector_empty_high_idx);
+  _partitions.establish_interval(ShenandoahFreeSetPartitionId::Mutator,
+                                 mutator_low_idx, mutator_high_idx, mutator_empty_low_idx, mutator_empty_high_idx);
+  _partitions.establish_interval(ShenandoahFreeSetPartitionId::Collector,
+                                 collector_low_idx, collector_high_idx, collector_empty_low_idx, collector_empty_high_idx);
+
   _partitions.expand_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId::OldCollector,
                                                                 old_collector_low_idx, old_collector_high_idx,
                                                                 old_collector_empty_low_idx, old_collector_empty_high_idx);
-  _partitions.establish_interval(ShenandoahFreeSetPartitionId::Mutator,
-                                 mutator_low_idx, mutator_high_idx, mutator_empty_low_idx, mutator_empty_high_idx);
 
   recompute_total_used</* UsedByMutatorChanged */ true,
                        /* UsedByCollectorChanged */ true, /* UsedByOldCollectorChanged */ true>();
@@ -2865,17 +2959,22 @@ void ShenandoahFreeSet::reserve_regions(size_t to_reserve, size_t to_reserve_old
                              /* CollectorSizeChanged */ true, /* OldCollectorSizeChanged */ true,
                              /* AffiliatedChangesAreYoungNeutral */ false, /* AffiliatedChangesAreGlobalNeutral */ false,
                              /* UnaffiliatedChangesAreYoungNeutral */ false>();
-  _partitions.assert_bounds(true);
+  _partitions.assert_bounds();
   if (LogTarget(Info, gc, free)::is_enabled()) {
     size_t old_reserve = _partitions.available_in(ShenandoahFreeSetPartitionId::OldCollector);
     if (old_reserve < to_reserve_old) {
       log_info(gc, free)("Wanted " PROPERFMT " for old reserve, but only reserved: " PROPERFMT,
                          PROPERFMTARGS(to_reserve_old), PROPERFMTARGS(old_reserve));
+      assert(_heap->mode()->is_generational(), "to_old_reserve > 0 implies generational mode");
+      reduce_old_reserve(old_reserve, to_reserve_old);
     }
     size_t reserve = _partitions.available_in(ShenandoahFreeSetPartitionId::Collector);
     if (reserve < to_reserve) {
+      if (_heap->mode()->is_generational()) {
+        reduce_young_reserve(reserve, to_reserve);
+      }
       log_info(gc, free)("Wanted " PROPERFMT " for young reserve, but only reserved: " PROPERFMT,
-                          PROPERFMTARGS(to_reserve), PROPERFMTARGS(reserve));
+                         PROPERFMTARGS(to_reserve), PROPERFMTARGS(reserve));
     }
   }
 }
@@ -3058,7 +3157,7 @@ void ShenandoahFreeSet::log_status() {
       size_t max_humongous = max_contig * ShenandoahHeapRegion::region_size_bytes();
       // capacity() is capacity of mutator
       // used() is used of mutator
-      size_t free = capacity() - used();
+      size_t free = capacity_holding_lock() - used_holding_lock();
       // Since certain regions that belonged to the Mutator free partition at the time of most recent rebuild may have been
       // retired, the sum of used and capacities within regions that are still in the Mutator free partition may not match
       // my internally tracked values of used() and free().
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 95f9fbe6856..d55a06d5713 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -28,9 +28,13 @@
 
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
+#include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
 #include "logging/logStream.hpp"
 
+typedef ShenandoahLock                           ShenandoahRebuildLock;
+typedef ShenandoahLocker<ShenandoahRebuildLock>  ShenandoahRebuildLocker;
+
 // Each ShenandoahHeapRegion is associated with a ShenandoahFreeSetPartitionId.
 enum class ShenandoahFreeSetPartitionId : uint8_t {
   Mutator,                      // Region is in the Mutator free set: available memory is available to mutators.
@@ -139,8 +143,6 @@ public:
   ShenandoahRegionPartitions(size_t max_regions, ShenandoahFreeSet* free_set);
   ~ShenandoahRegionPartitions() {}
 
-  static const size_t FreeSetUnderConstruction = SIZE_MAX;
-
   inline idx_t max() const { return _max; }
 
   // At initialization, reset OldCollector tallies
@@ -222,6 +224,10 @@ public:
   void transfer_used_capacity_from_to(ShenandoahFreeSetPartitionId from_partition, ShenandoahFreeSetPartitionId to_partition,
                                       size_t regions);
 
+  // For recycled region r in the OldCollector partition but possibly not within the interval for empty OldCollector regions,
+  // expand the empty interval to include this region.
+  inline void adjust_interval_for_recycled_old_region_under_lock(ShenandoahHeapRegion* r);
+
   const char* partition_membership_name(idx_t idx) const;
 
   // Return the index of the next available region >= start_index, or maximum_regions if not found.
@@ -352,6 +358,16 @@ public:
     return _available[int(which_partition)];
   }
 
+  // Return available_in assuming caller does not hold the heap lock but does hold the rebuild_lock.
+  // The returned value may be "slightly stale" because we do not assure that every fetch of this value
+  // sees the most recent update of this value.  Requiring the caller to hold the rebuild_lock assures
+  // that we don't see "bogus" values that are "worse than stale".  During rebuild of the freeset, the
+  // value of _available is not reliable.
+  inline size_t available_in_locked_for_rebuild(ShenandoahFreeSetPartitionId which_partition) const {
+    assert (which_partition < NumPartitions, "selected free set must be valid");
+    return _available[int(which_partition)];
+  }
+
   // Returns bytes of humongous waste
   inline size_t humongous_waste(ShenandoahFreeSetPartitionId which_partition) const {
     assert (which_partition < NumPartitions, "selected free set must be valid");
@@ -359,31 +375,9 @@ public:
     return _humongous_waste[int(which_partition)];
   }
 
-  // Return available_in assuming caller does not hold the heap lock.  In production builds, available is
-  // returned without acquiring the lock.  In debug builds, the global heap lock is acquired in order to
-  // enforce a consistency assert.
-  inline size_t available_in_not_locked(ShenandoahFreeSetPartitionId which_partition) const {
-    assert (which_partition < NumPartitions, "selected free set must be valid");
-    shenandoah_assert_not_heaplocked();
-#ifdef ASSERT
-    ShenandoahHeapLocker locker(ShenandoahHeap::heap()->lock());
-    assert((_available[int(which_partition)] == FreeSetUnderConstruction) ||
-           (_available[int(which_partition)] == _capacity[int(which_partition)] - _used[int(which_partition)]),
-           "Expect available (%zu) equals capacity (%zu) - used (%zu) for partition %s",
-           _available[int(which_partition)], _capacity[int(which_partition)], _used[int(which_partition)],
-           partition_membership_name(idx_t(which_partition)));
-#endif
-    return _available[int(which_partition)];
-  }
-
   inline void set_capacity_of(ShenandoahFreeSetPartitionId which_partition, size_t value);
 
-  inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value) {
-    shenandoah_assert_heaplocked();
-    assert (which_partition < NumPartitions, "selected free set must be valid");
-    _used[int(which_partition)] = value;
-    _available[int(which_partition)] = _capacity[int(which_partition)] - value;
-  }
+  inline void set_used_by(ShenandoahFreeSetPartitionId which_partition, size_t value);
 
   inline size_t count(ShenandoahFreeSetPartitionId which_partition) const { return _region_counts[int(which_partition)]; }
 
@@ -407,7 +401,10 @@ public:
   //       idx >= leftmost &&
   //       idx <= rightmost
   //     }
-  void assert_bounds(bool validate_totals) NOT_DEBUG_RETURN;
+  void assert_bounds() NOT_DEBUG_RETURN;
+  // this checks certain sanity conditions related to the bounds with much less effort than is required to
+  // more rigorously enforce correctness as is done by assert_bounds()
+  inline void assert_bounds_sanity() NOT_DEBUG_RETURN;
 };
 
 // Publicly, ShenandoahFreeSet represents memory that is available to mutator threads.  The public capacity(), used(),
@@ -440,6 +437,15 @@ private:
   ShenandoahHeap* const _heap;
   ShenandoahRegionPartitions _partitions;
 
+  // This locks the rebuild process (in combination with the global heap lock).  Whenever we rebuild the free set,
+  // we first acquire the global heap lock and then we acquire this _rebuild_lock in a nested context.  Threads that
+  // need to check available, acquire only the _rebuild_lock to make sure that they are not obtaining the value of
+  // available for a partially reconstructed free-set.
+  //
+  // Note that there is rank ordering of nested locks to prevent deadlock.  All threads that need to acquire both
+  // locks will acquire them in the same order: first the global heap lock and then the rebuild lock.
+  ShenandoahRebuildLock _rebuild_lock;
+
   size_t _total_humongous_waste;
 
   HeapWord* allocate_aligned_plab(size_t size, ShenandoahAllocRequest& req, ShenandoahHeapRegion* r);
@@ -630,15 +636,21 @@ private:
   void establish_old_collector_alloc_bias();
   size_t get_usable_free_words(size_t free_bytes) const;
 
+  void reduce_young_reserve(size_t adjusted_young_reserve, size_t requested_young_reserve);
+  void reduce_old_reserve(size_t adjusted_old_reserve, size_t requested_old_reserve);
+
   void log_freeset_stats(ShenandoahFreeSetPartitionId partition_id, LogStream& ls);
+
   // log status, assuming lock has already been acquired by the caller.
   void log_status();
 
 public:
-  static const size_t FreeSetUnderConstruction = ShenandoahRegionPartitions::FreeSetUnderConstruction;
-
   ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions);
 
+  ShenandoahRebuildLock* rebuild_lock() {
+    return &_rebuild_lock;
+  }
+
   inline size_t max_regions() const { return _partitions.max(); }
   ShenandoahFreeSetPartitionId membership(size_t index) const { return _partitions.membership(index); }
   inline void shrink_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId partition,
@@ -679,35 +691,46 @@ public:
     return _total_global_used;
   }
 
-  size_t global_unaffiliated_regions() {
+  // A negative argument results in moving from old_collector to collector
+  void move_unaffiliated_regions_from_collector_to_old_collector(ssize_t regions);
+
+  inline size_t global_unaffiliated_regions() {
     return _global_unaffiliated_regions;
   }
 
-  size_t young_unaffiliated_regions() {
+  inline size_t young_unaffiliated_regions() {
     return _young_unaffiliated_regions;
   }
 
-  size_t old_unaffiliated_regions() {
+  inline size_t collector_unaffiliated_regions() {
+    return _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::Collector);
+  }
+
+  inline size_t old_collector_unaffiliated_regions() {
     return _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector);
   }
 
-  size_t young_affiliated_regions() {
+  inline size_t old_unaffiliated_regions() {
+    return _partitions.get_empty_region_counts(ShenandoahFreeSetPartitionId::OldCollector);
+  }
+
+  inline size_t young_affiliated_regions() {
     return _young_affiliated_regions;
   }
 
-  size_t old_affiliated_regions() {
+  inline size_t old_affiliated_regions() {
     return _old_affiliated_regions;
   }
 
-  size_t global_affiliated_regions() {
+  inline size_t global_affiliated_regions() {
     return _global_affiliated_regions;
   }
 
-  size_t total_young_regions() {
+  inline size_t total_young_regions() {
     return _total_young_regions;
   }
 
-  size_t total_old_regions() {
+  inline size_t total_old_regions() {
     return _partitions.get_capacity(ShenandoahFreeSetPartitionId::OldCollector) / ShenandoahHeapRegion::region_size_bytes();
   }
 
@@ -719,36 +742,27 @@ public:
 
   // Examine the existing free set representation, capturing the current state into var arguments:
   //
-  // young_cset_regions is the number of regions currently in the young cset if we are starting to evacuate, or zero
-  //   old_cset_regions is the number of regions currently in the old cset if we are starting a mixed evacuation, or zero
+  // young_trashed_regions is the number of trashed regions (immediate garbage at final mark, cset regions after update refs)
+  //   old_trashed_regions is the number of trashed regions
+  //                       (immediate garbage at final old mark, cset regions after update refs for mixed evac)
   //   first_old_region is the index of the first region that is part of the OldCollector set
   //    last_old_region is the index of the last region that is part of the OldCollector set
   //   old_region_count is the number of regions in the OldCollector set that have memory available to be allocated
-  void prepare_to_rebuild(size_t &young_cset_regions, size_t &old_cset_regions,
+  void prepare_to_rebuild(size_t &young_trashed_regions, size_t &old_trashed_regions,
                           size_t &first_old_region, size_t &last_old_region, size_t &old_region_count);
 
   // At the end of final mark, but before we begin evacuating, heuristics calculate how much memory is required to
-  // hold the results of evacuating to young-gen and to old-gen, and have_evacuation_reserves should be true.
-  // These quantities, stored as reserves for their respective generations, are consulted prior to rebuilding
-  // the free set (ShenandoahFreeSet) in preparation for evacuation.  When the free set is rebuilt, we make sure
-  // to reserve sufficient memory in the collector and old_collector sets to hold evacuations.
+  // hold the results of evacuating to young-gen and to old-gen.  These quantities, stored in reserves for their
+  // respective generations, are consulted prior to rebuilding the free set (ShenandoahFreeSet) in preparation for
+  // evacuation.  When the free set is rebuilt, we make sure to reserve sufficient memory in the collector and
+  // old_collector sets to hold evacuations.  Likewise, at the end of update refs, we rebuild the free set in order
+  // to set aside reserves to be consumed during the next GC cycle.
   //
-  // We also rebuild the free set at the end of GC, as we prepare to idle GC until the next trigger.  In this case,
-  // have_evacuation_reserves is false because we don't yet know how much memory will need to be evacuated in the
-  // next GC cycle.  When have_evacuation_reserves is false, the free set rebuild operation reserves for the collector
-  // and old_collector sets based on alternative mechanisms, such as ShenandoahEvacReserve, ShenandoahOldEvacReserve, and
-  // ShenandoahOldCompactionReserve.  In a future planned enhancement, the reserve for old_collector set when the
-  // evacuation reserves are unknown, is based in part on anticipated promotion as determined by analysis of live data
-  // found during the previous GC pass which is one less than the current tenure age.
-  //
-  // young_cset_regions is the number of regions currently in the young cset if we are starting to evacuate, or zero
-  //   old_cset_regions is the number of regions currently in the old cset if we are starting a mixed evacuation, or zero
+  // young_trashed_regions is the number of trashed regions (immediate garbage at final mark, cset regions after update refs)
+  //   old_trashed_regions is the number of trashed regions
+  //                       (immediate garbage at final old mark, cset regions after update refs for mixed evac)
   //    num_old_regions is the number of old-gen regions that have available memory for further allocations (excluding old cset)
-  // have_evacuation_reserves is true iff the desired values of young-gen and old-gen evacuation reserves and old-gen
-  //                    promotion reserve have been precomputed (and can be obtained by invoking
-  //                    <generation>->get_evacuation_reserve() or old_gen->get_promoted_reserve()
-  void finish_rebuild(size_t young_cset_regions, size_t old_cset_regions, size_t num_old_regions,
-                      bool have_evacuation_reserves = false);
+  void finish_rebuild(size_t young_trashed_regions, size_t old_trashed_regions, size_t num_old_regions);
 
   // When a region is promoted in place, we add the region's available memory if it is greater than plab_min_size()
   // into the old collector partition by invoking this method.
@@ -776,13 +790,42 @@ public:
   // adjusts available with respect to lock holders.  However, sequential calls to these three functions may produce
   // inconsistent data: available may not equal capacity - used because the intermediate states of any "atomic"
   // locked action can be seen by these unlocked functions.
-  inline size_t capacity()  const { return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator);             }
-  inline size_t used()      const { return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);                 }
-  inline size_t available() const { return _partitions.available_in_not_locked(ShenandoahFreeSetPartitionId::Mutator); }
+  inline size_t capacity_holding_lock() const {
+    shenandoah_assert_heaplocked();
+    return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator);
+  }
+  inline size_t capacity_not_holding_lock() {
+    shenandoah_assert_not_heaplocked();
+    ShenandoahRebuildLocker locker(rebuild_lock());
+    return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator);
+  }
+  inline size_t used_holding_lock() const {
+    shenandoah_assert_heaplocked();
+    return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);
+  }
+  inline size_t used_not_holding_lock() {
+    shenandoah_assert_not_heaplocked();
+    ShenandoahRebuildLocker locker(rebuild_lock());
+    return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);
+  }
+  inline size_t available() {
+    shenandoah_assert_not_heaplocked();
+    ShenandoahRebuildLocker locker(rebuild_lock());
+    return _partitions.available_in_locked_for_rebuild(ShenandoahFreeSetPartitionId::Mutator);
+  }
+
+  // Use this version of available() if the heap lock is held.
+  inline size_t available_locked() const {
+    return _partitions.available_in(ShenandoahFreeSetPartitionId::Mutator);
+  }
 
   inline size_t total_humongous_waste() const      { return _total_humongous_waste; }
-  inline size_t humongous_waste_in_mutator() const { return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::Mutator); }
-  inline size_t humongous_waste_in_old() const { return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::OldCollector); }
+  inline size_t humongous_waste_in_mutator() const {
+    return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::Mutator);
+  }
+  inline size_t humongous_waste_in_old() const {
+    return _partitions.humongous_waste(ShenandoahFreeSetPartitionId::OldCollector);
+  }
 
   void decrease_humongous_waste_for_regular_bypass(ShenandoahHeapRegion* r, size_t waste);
 
@@ -848,7 +891,7 @@ public:
 
   // Reserve space for evacuations, with regions reserved for old evacuations placed to the right
   // of regions reserved of young evacuations.
-  void compute_young_and_old_reserves(size_t young_cset_regions, size_t old_cset_regions, bool have_evacuation_reserves,
+  void compute_young_and_old_reserves(size_t young_cset_regions, size_t old_cset_regions,
                                       size_t &young_reserve_result, size_t &old_reserve_result) const;
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 027d7e02268..3c92750cc0c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -522,6 +522,7 @@ public:
   void heap_region_do(ShenandoahHeapRegion* r) override {
     if (r->is_trash()) {
       r->try_recycle_under_lock();
+      // No need to adjust_interval_for_recycled_old_region.  That will be taken care of during freeset rebuild.
     }
     if (r->is_cset()) {
       // Leave affiliation unchanged
@@ -966,6 +967,7 @@ public:
     if (r->is_trash()) {
       live = 0;
       r->try_recycle_under_lock();
+      // No need to adjust_interval_for_recycled_old_region.  That will be taken care of during freeset rebuild.
     } else {
       if (r->is_old()) {
         ShenandoahGenerationalFullGC::account_for_region(r, _old_regions, _old_usage, _old_humongous_waste);
@@ -1113,18 +1115,17 @@ void ShenandoahFullGC::phase5_epilog() {
     ShenandoahPostCompactClosure post_compact;
     heap->heap_region_iterate(&post_compact);
     heap->collection_set()->clear();
-    size_t young_cset_regions, old_cset_regions;
-    size_t first_old, last_old, num_old;
-    heap->free_set()->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old, last_old, num_old);
-
-    // We also do not expand old generation size following Full GC because we have scrambled age populations and
-    // no longer have objects separated by age into distinct regions.
-    if (heap->mode()->is_generational()) {
-      ShenandoahGenerationalFullGC::compute_balances();
+    {
+      ShenandoahFreeSet* free_set = heap->free_set();
+      size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
+      free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
+      // We also do not expand old generation size following Full GC because we have scrambled age populations and
+      // no longer have objects separated by age into distinct regions.
+      if (heap->mode()->is_generational()) {
+        ShenandoahGenerationalFullGC::compute_balances();
+      }
+      free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
     }
-
-    heap->free_set()->finish_rebuild(young_cset_regions, old_cset_regions, num_old);
-
     // Set mark incomplete because the marking bitmaps have been reset except pinned regions.
     _generation->set_mark_incomplete();
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index d74ee872cd1..ddb50ee0020 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
-#include "gc/shenandoah/shenandoahCollectionSetPreselector.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahFreeSet.hpp"
 #include "gc/shenandoah/shenandoahGeneration.hpp"
@@ -245,484 +244,6 @@ void ShenandoahGeneration::parallel_heap_region_iterate_free(ShenandoahHeapRegio
   ShenandoahHeap::heap()->parallel_heap_region_iterate(cl);
 }
 
-void ShenandoahGeneration::compute_evacuation_budgets(ShenandoahHeap* const heap) {
-  shenandoah_assert_generational();
-
-  ShenandoahOldGeneration* const old_generation = heap->old_generation();
-  ShenandoahYoungGeneration* const young_generation = heap->young_generation();
-
-  // During initialization and phase changes, it is more likely that fewer objects die young and old-gen
-  // memory is not yet full (or is in the process of being replaced).  During these times especially, it
-  // is beneficial to loan memory from old-gen to young-gen during the evacuation and update-refs phases
-  // of execution.
-
-  // Calculate EvacuationReserve before PromotionReserve.  Evacuation is more critical than promotion.
-  // If we cannot evacuate old-gen, we will not be able to reclaim old-gen memory.  Promotions are less
-  // critical.  If we cannot promote, there may be degradation of young-gen memory because old objects
-  // accumulate there until they can be promoted.  This increases the young-gen marking and evacuation work.
-
-  // First priority is to reclaim the easy garbage out of young-gen.
-
-  // maximum_young_evacuation_reserve is upper bound on memory to be evacuated out of young
-  const size_t maximum_young_evacuation_reserve = (young_generation->max_capacity() * ShenandoahEvacReserve) / 100;
-  size_t young_evacuation_reserve = MIN2(maximum_young_evacuation_reserve, young_generation->available_with_reserve());
-
-  // maximum_old_evacuation_reserve is an upper bound on memory evacuated from old and evacuated to old (promoted),
-  // clamped by the old generation space available.
-  //
-  // Here's the algebra.
-  // Let SOEP = ShenandoahOldEvacRatioPercent,
-  //     OE = old evac,
-  //     YE = young evac, and
-  //     TE = total evac = OE + YE
-  // By definition:
-  //            SOEP/100 = OE/TE
-  //                     = OE/(OE+YE)
-  //  => SOEP/(100-SOEP) = OE/((OE+YE)-OE)         // componendo-dividendo: If a/b = c/d, then a/(b-a) = c/(d-c)
-  //                     = OE/YE
-  //  =>              OE = YE*SOEP/(100-SOEP)
-
-  // We have to be careful in the event that SOEP is set to 100 by the user.
-  assert(ShenandoahOldEvacRatioPercent <= 100, "Error");
-  const size_t old_available = old_generation->available();
-  const size_t maximum_old_evacuation_reserve = (ShenandoahOldEvacRatioPercent == 100) ?
-    old_available : MIN2((maximum_young_evacuation_reserve * ShenandoahOldEvacRatioPercent) / (100 - ShenandoahOldEvacRatioPercent),
-                          old_available);
-
-
-  // Second priority is to reclaim garbage out of old-gen if there are old-gen collection candidates.  Third priority
-  // is to promote as much as we have room to promote.  However, if old-gen memory is in short supply, this means young
-  // GC is operating under "duress" and was unable to transfer the memory that we would normally expect.  In this case,
-  // old-gen will refrain from compacting itself in order to allow a quicker young-gen cycle (by avoiding the update-refs
-  // through ALL of old-gen).  If there is some memory available in old-gen, we will use this for promotions as promotions
-  // do not add to the update-refs burden of GC.
-
-  size_t old_evacuation_reserve, old_promo_reserve;
-  if (is_global()) {
-    // Global GC is typically triggered by user invocation of System.gc(), and typically indicates that there is lots
-    // of garbage to be reclaimed because we are starting a new phase of execution.  Marking for global GC may take
-    // significantly longer than typical young marking because we must mark through all old objects.  To expedite
-    // evacuation and update-refs, we give emphasis to reclaiming garbage first, wherever that garbage is found.
-    // Global GC will adjust generation sizes to accommodate the collection set it chooses.
-
-    // Set old_promo_reserve to enforce that no regions are preselected for promotion.  Such regions typically
-    // have relatively high memory utilization.  We still call select_aged_regions() because this will prepare for
-    // promotions in place, if relevant.
-    old_promo_reserve = 0;
-
-    // Dedicate all available old memory to old_evacuation reserve.  This may be small, because old-gen is only
-    // expanded based on an existing mixed evacuation workload at the end of the previous GC cycle.  We'll expand
-    // the budget for evacuation of old during GLOBAL cset selection.
-    old_evacuation_reserve = maximum_old_evacuation_reserve;
-  } else if (old_generation->has_unprocessed_collection_candidates()) {
-    // We reserved all old-gen memory at end of previous GC to hold anticipated evacuations to old-gen.  If this is
-    // mixed evacuation, reserve all of this memory for compaction of old-gen and do not promote.  Prioritize compaction
-    // over promotion in order to defragment OLD so that it will be better prepared to efficiently receive promoted memory.
-    old_evacuation_reserve = maximum_old_evacuation_reserve;
-    old_promo_reserve = 0;
-  } else {
-    // Make all old-evacuation memory for promotion, but if we can't use it all for promotion, we'll allow some evacuation.
-    old_evacuation_reserve = 0;
-    old_promo_reserve = maximum_old_evacuation_reserve;
-  }
-  assert(old_evacuation_reserve <= old_available, "Error");
-
-  // We see too many old-evacuation failures if we force ourselves to evacuate into regions that are not initially empty.
-  // So we limit the old-evacuation reserve to unfragmented memory.  Even so, old-evacuation is free to fill in nooks and
-  // crannies within existing partially used regions and it generally tries to do so.
-  const size_t old_free_unfragmented = old_generation->free_unaffiliated_regions() * ShenandoahHeapRegion::region_size_bytes();
-  if (old_evacuation_reserve > old_free_unfragmented) {
-    const size_t delta = old_evacuation_reserve - old_free_unfragmented;
-    old_evacuation_reserve -= delta;
-    // Let promo consume fragments of old-gen memory if not global
-    if (!is_global()) {
-      old_promo_reserve += delta;
-    }
-  }
-
-  // Preselect regions for promotion by evacuation (obtaining the live data to seed promoted_reserve),
-  // and identify regions that will promote in place. These use the tenuring threshold.
-  const size_t consumed_by_advance_promotion = select_aged_regions(old_promo_reserve);
-  assert(consumed_by_advance_promotion <= maximum_old_evacuation_reserve, "Cannot promote more than available old-gen memory");
-
-  // If any regions have been selected for promotion in place, this has the effect of decreasing available within mutator
-  // and collector partitions, due to padding of remnant memory within each promoted in place region.  This will affect
-  // young_evacuation_reserve but not old_evacuation_reserve or consumed_by_advance_promotion.  So recompute.
-  young_evacuation_reserve = MIN2(young_evacuation_reserve, young_generation->available_with_reserve());
-
-  // Note that unused old_promo_reserve might not be entirely consumed_by_advance_promotion.  Do not transfer this
-  // to old_evacuation_reserve because this memory is likely very fragmented, and we do not want to increase the likelihood
-  // of old evacuation failure.
-  young_generation->set_evacuation_reserve(young_evacuation_reserve);
-  old_generation->set_evacuation_reserve(old_evacuation_reserve);
-  old_generation->set_promoted_reserve(consumed_by_advance_promotion);
-
-  // There is no need to expand OLD because all memory used here was set aside at end of previous GC, except in the
-  // case of a GLOBAL gc.  During choose_collection_set() of GLOBAL, old will be expanded on demand.
-}
-
-// Having chosen the collection set, adjust the budgets for generational mode based on its composition.  Note
-// that young_generation->available() now knows about recently discovered immediate garbage.
-//
-void ShenandoahGeneration::adjust_evacuation_budgets(ShenandoahHeap* const heap, ShenandoahCollectionSet* const collection_set) {
-  shenandoah_assert_generational();
-  // We may find that old_evacuation_reserve and/or loaned_for_young_evacuation are not fully consumed, in which case we may
-  //  be able to increase regions_available_to_loan
-
-  // The role of adjust_evacuation_budgets() is to compute the correct value of regions_available_to_loan and to make
-  // effective use of this memory, including the remnant memory within these regions that may result from rounding loan to
-  // integral number of regions.  Excess memory that is available to be loaned is applied to an allocation supplement,
-  // which allows mutators to allocate memory beyond the current capacity of young-gen on the promise that the loan
-  // will be repaid as soon as we finish updating references for the recently evacuated collection set.
-
-  // We cannot recalculate regions_available_to_loan by simply dividing old_generation->available() by region_size_bytes
-  // because the available memory may be distributed between many partially occupied regions that are already holding old-gen
-  // objects.  Memory in partially occupied regions is not "available" to be loaned.  Note that an increase in old-gen
-  // available that results from a decrease in memory consumed by old evacuation is not necessarily available to be loaned
-  // to young-gen.
-
-  const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
-  ShenandoahOldGeneration* const old_generation = heap->old_generation();
-  ShenandoahYoungGeneration* const young_generation = heap->young_generation();
-
-  const size_t old_evacuated = collection_set->get_live_bytes_in_old_regions();
-  size_t old_evacuated_committed = (size_t) (ShenandoahOldEvacWaste * double(old_evacuated));
-  size_t old_evacuation_reserve = old_generation->get_evacuation_reserve();
-
-  if (old_evacuated_committed > old_evacuation_reserve) {
-    // This should only happen due to round-off errors when enforcing ShenandoahOldEvacWaste
-    assert(old_evacuated_committed <= (33 * old_evacuation_reserve) / 32,
-           "Round-off errors should be less than 3.125%%, committed: %zu, reserved: %zu",
-           old_evacuated_committed, old_evacuation_reserve);
-    old_evacuated_committed = old_evacuation_reserve;
-    // Leave old_evac_reserve as previously configured
-  } else if (old_evacuated_committed < old_evacuation_reserve) {
-    // This happens if the old-gen collection consumes less than full budget.
-    log_debug(gc, cset)("Shrinking old evac reserve to match old_evac_commited: " PROPERFMT, PROPERFMTARGS(old_evacuated_committed));
-    old_evacuation_reserve = old_evacuated_committed;
-    old_generation->set_evacuation_reserve(old_evacuation_reserve);
-  }
-
-  size_t young_advance_promoted = collection_set->get_live_bytes_in_tenurable_regions();
-  size_t young_advance_promoted_reserve_used = (size_t) (ShenandoahPromoEvacWaste * double(young_advance_promoted));
-
-  size_t young_evacuated = collection_set->get_live_bytes_in_untenurable_regions();
-  size_t young_evacuated_reserve_used = (size_t) (ShenandoahEvacWaste * double(young_evacuated));
-
-  size_t total_young_available = young_generation->available_with_reserve();
-  assert(young_evacuated_reserve_used <= total_young_available, "Cannot evacuate more than is available in young");
-  young_generation->set_evacuation_reserve(young_evacuated_reserve_used);
-
-  size_t old_available = old_generation->available();
-  // Now that we've established the collection set, we know how much memory is really required by old-gen for evacuation
-  // and promotion reserves.  Try shrinking OLD now in case that gives us a bit more runway for mutator allocations during
-  // evac and update phases.
-  size_t old_consumed = old_evacuated_committed + young_advance_promoted_reserve_used;
-
-  if (old_available < old_consumed) {
-    // This can happen due to round-off errors when adding the results of truncated integer arithmetic.
-    // We've already truncated old_evacuated_committed.  Truncate young_advance_promoted_reserve_used here.
-    assert(young_advance_promoted_reserve_used <= (33 * (old_available - old_evacuated_committed)) / 32,
-           "Round-off errors should be less than 3.125%%, committed: %zu, reserved: %zu",
-           young_advance_promoted_reserve_used, old_available - old_evacuated_committed);
-    young_advance_promoted_reserve_used = old_available - old_evacuated_committed;
-    old_consumed = old_evacuated_committed + young_advance_promoted_reserve_used;
-  }
-
-  assert(old_available >= old_consumed, "Cannot consume (%zu) more than is available (%zu)",
-         old_consumed, old_available);
-  size_t excess_old = old_available - old_consumed;
-  size_t unaffiliated_old_regions = old_generation->free_unaffiliated_regions();
-  size_t unaffiliated_old = unaffiliated_old_regions * region_size_bytes;
-  assert(old_available >= unaffiliated_old,
-         "Unaffiliated old (%zu is %zu * %zu) is a subset of old available (%zu)",
-         unaffiliated_old, unaffiliated_old_regions, region_size_bytes, old_available);
-
-  // Make sure old_evac_committed is unaffiliated
-  if (old_evacuated_committed > 0) {
-    if (unaffiliated_old > old_evacuated_committed) {
-      size_t giveaway = unaffiliated_old - old_evacuated_committed;
-      size_t giveaway_regions = giveaway / region_size_bytes;  // round down
-      if (giveaway_regions > 0) {
-        excess_old = MIN2(excess_old, giveaway_regions * region_size_bytes);
-      } else {
-        excess_old = 0;
-      }
-    } else {
-      excess_old = 0;
-    }
-  }
-
-  // If we find that OLD has excess regions, give them back to YOUNG now to reduce likelihood we run out of allocation
-  // runway during evacuation and update-refs.
-  size_t regions_to_xfer = 0;
-  if (excess_old > unaffiliated_old) {
-    // we can give back unaffiliated_old (all of unaffiliated is excess)
-    if (unaffiliated_old_regions > 0) {
-      regions_to_xfer = unaffiliated_old_regions;
-    }
-  } else if (unaffiliated_old_regions > 0) {
-    // excess_old < unaffiliated old: we can give back MIN(excess_old/region_size_bytes, unaffiliated_old_regions)
-    size_t excess_regions = excess_old / region_size_bytes;
-    regions_to_xfer = MIN2(excess_regions, unaffiliated_old_regions);
-  }
-  if (regions_to_xfer > 0) {
-    excess_old -= regions_to_xfer * region_size_bytes;
-    log_debug(gc, ergo)("Before start of evacuation, total_promotion reserve is young_advance_promoted_reserve: %zu "
-                        "plus excess: old: %zu", young_advance_promoted_reserve_used, excess_old);
-  }
-
-  // Add in the excess_old memory to hold unanticipated promotions, if any.  If there are more unanticipated
-  // promotions than fit in reserved memory, they will be deferred until a future GC pass.
-  size_t total_promotion_reserve = young_advance_promoted_reserve_used + excess_old;
-  old_generation->set_promoted_reserve(total_promotion_reserve);
-  old_generation->reset_promoted_expended();
-}
-
-typedef struct {
-  ShenandoahHeapRegion* _region;
-  size_t _live_data;
-} AgedRegionData;
-
-static int compare_by_aged_live(AgedRegionData a, AgedRegionData b) {
-  if (a._live_data < b._live_data)
-    return -1;
-  else if (a._live_data > b._live_data)
-    return 1;
-  else return 0;
-}
-
-inline void assert_no_in_place_promotions() {
-#ifdef ASSERT
-  class ShenandoahNoInPlacePromotions : public ShenandoahHeapRegionClosure {
-  public:
-    void heap_region_do(ShenandoahHeapRegion *r) override {
-      assert(r->get_top_before_promote() == nullptr,
-             "Region %zu should not be ready for in-place promotion", r->index());
-    }
-  } cl;
-  ShenandoahHeap::heap()->heap_region_iterate(&cl);
-#endif
-}
-
-// Preselect for inclusion into the collection set all regions whose age is at or above tenure age and for which the
-// garbage percentage exceeds a dynamically adjusted threshold (known as the old-garbage threshold percentage).  We
-// identify these regions by setting the appropriate entry of the collection set's preselected regions array to true.
-// All entries are initialized to false before calling this function.
-//
-// During the subsequent selection of the collection set, we give priority to these promotion set candidates.
-// Without this prioritization, we found that the aged regions tend to be ignored because they typically have
-// much less garbage and much more live data than the recently allocated "eden" regions.  When aged regions are
-// repeatedly excluded from the collection set, the amount of live memory within the young generation tends to
-// accumulate and this has the undesirable side effect of causing young-generation collections to require much more
-// CPU and wall-clock time.
-//
-// A second benefit of treating aged regions differently than other regions during collection set selection is
-// that this allows us to more accurately budget memory to hold the results of evacuation.  Memory for evacuation
-// of aged regions must be reserved in the old generation.  Memory for evacuation of all other regions must be
-// reserved in the young generation.
-size_t ShenandoahGeneration::select_aged_regions(const size_t old_promotion_reserve) {
-
-  // There should be no regions configured for subsequent in-place-promotions carried over from the previous cycle.
-  assert_no_in_place_promotions();
-
-  auto const heap = ShenandoahGenerationalHeap::heap();
-  ShenandoahFreeSet* free_set = heap->free_set();
-  bool* const candidate_regions_for_promotion_by_copy = heap->collection_set()->preselected_regions();
-  ShenandoahMarkingContext* const ctx = heap->marking_context();
-
-  const size_t old_garbage_threshold =
-    (ShenandoahHeapRegion::region_size_bytes() * heap->old_generation()->heuristics()->get_old_garbage_threshold()) / 100;
-
-  const size_t pip_used_threshold = (ShenandoahHeapRegion::region_size_bytes() * ShenandoahGenerationalMinPIPUsage) / 100;
-
-  size_t promo_potential = 0;
-  size_t candidates = 0;
-
-  // Tracks the padding of space above top in regions eligible for promotion in place
-  size_t promote_in_place_pad = 0;
-
-  // Sort the promotion-eligible regions in order of increasing live-data-bytes so that we can first reclaim regions that require
-  // less evacuation effort.  This prioritizes garbage first, expanding the allocation pool early before we reclaim regions that
-  // have more live data.
-  const idx_t num_regions = heap->num_regions();
-
-  ResourceMark rm;
-  AgedRegionData* sorted_regions = NEW_RESOURCE_ARRAY(AgedRegionData, num_regions);
-
-  ShenandoahFreeSet* freeset = heap->free_set();
-
-  // Any region that is to be promoted in place needs to be retired from its Collector or Mutator partition.
-  idx_t pip_low_collector_idx = freeset->max_regions();
-  idx_t pip_high_collector_idx = -1;
-  idx_t pip_low_mutator_idx = freeset->max_regions();
-  idx_t pip_high_mutator_idx = -1;
-  size_t collector_regions_to_pip = 0;
-  size_t mutator_regions_to_pip = 0;
-
-  size_t pip_mutator_regions = 0;
-  size_t pip_collector_regions = 0;
-  size_t pip_mutator_bytes = 0;
-  size_t pip_collector_bytes = 0;
-
-  for (idx_t i = 0; i < num_regions; i++) {
-    ShenandoahHeapRegion* const r = heap->get_region(i);
-    if (r->is_empty() || !r->has_live() || !r->is_young() || !r->is_regular()) {
-      // skip over regions that aren't regular young with some live data
-      continue;
-    }
-    if (heap->is_tenurable(r)) {
-      if ((r->garbage() < old_garbage_threshold) && (r->used() > pip_used_threshold)) {
-        // We prefer to promote this region in place because it has a small amount of garbage and a large usage.
-        HeapWord* tams = ctx->top_at_mark_start(r);
-        HeapWord* original_top = r->top();
-        if (!heap->is_concurrent_old_mark_in_progress() && tams == original_top) {
-          // No allocations from this region have been made during concurrent mark. It meets all the criteria
-          // for in-place-promotion. Though we only need the value of top when we fill the end of the region,
-          // we use this field to indicate that this region should be promoted in place during the evacuation
-          // phase.
-          r->save_top_before_promote();
-          size_t remnant_bytes = r->free();
-          size_t remnant_words = remnant_bytes / HeapWordSize;
-          assert(ShenandoahHeap::min_fill_size() <= PLAB::min_size(), "Implementation makes invalid assumptions");
-          if (remnant_words >= ShenandoahHeap::min_fill_size()) {
-            ShenandoahHeap::fill_with_object(original_top, remnant_words);
-            // Fill the remnant memory within this region to assure no allocations prior to promote in place.  Otherwise,
-            // newly allocated objects will not be parsable when promote in place tries to register them.  Furthermore, any
-            // new allocations would not necessarily be eligible for promotion.  This addresses both issues.
-            r->set_top(r->end());
-            // The region r is either in the Mutator or Collector partition if remnant_words > heap()->plab_min_size.
-            // Otherwise, the region is in the NotFree partition.
-            ShenandoahFreeSetPartitionId p = free_set->membership(i);
-            if (p == ShenandoahFreeSetPartitionId::Mutator) {
-              mutator_regions_to_pip++;
-              if (i < pip_low_mutator_idx) {
-                pip_low_mutator_idx = i;
-              }
-              if (i > pip_high_mutator_idx) {
-                pip_high_mutator_idx = i;
-              }
-              pip_mutator_regions++;
-              pip_mutator_bytes += remnant_bytes;
-            } else if (p == ShenandoahFreeSetPartitionId::Collector) {
-              collector_regions_to_pip++;
-              if (i < pip_low_collector_idx) {
-                pip_low_collector_idx = i;
-              }
-              if (i > pip_high_collector_idx) {
-                pip_high_collector_idx = i;
-              }
-              pip_collector_regions++;
-              pip_collector_bytes += remnant_bytes;
-            } else {
-              assert((p == ShenandoahFreeSetPartitionId::NotFree) && (remnant_words < heap->plab_min_size()),
-                     "Should be NotFree if not in Collector or Mutator partitions");
-              // In this case, the memory is already counted as used and the region has already been retired.  There is
-              // no need for further adjustments to used.  Further, the remnant memory for this region will not be
-              // unallocated or made available to OldCollector after pip.
-              remnant_bytes = 0;
-            }
-            promote_in_place_pad += remnant_bytes;
-            free_set->prepare_to_promote_in_place(i, remnant_bytes);
-          } else {
-            // Since the remnant is so small that this region has already been retired, we don't have to worry about any
-            // accidental allocations occurring within this region before the region is promoted in place.
-
-            // This region was already not in the Collector or Mutator set, so no need to remove it.
-            assert(free_set->membership(i) == ShenandoahFreeSetPartitionId::NotFree, "sanity");
-          }
-        }
-        // Else, we do not promote this region (either in place or by copy) because it has received new allocations.
-
-        // During evacuation, we exclude from promotion regions for which age > tenure threshold, garbage < garbage-threshold,
-        //  used > pip_used_threshold, and get_top_before_promote() != tams
-      } else {
-        // Record this promotion-eligible candidate region. After sorting and selecting the best candidates below,
-        // we may still decide to exclude this promotion-eligible region from the current collection set.  If this
-        // happens, we will consider this region as part of the anticipated promotion potential for the next GC
-        // pass; see further below.
-        sorted_regions[candidates]._region = r;
-        sorted_regions[candidates++]._live_data = r->get_live_data_bytes();
-      }
-    } else {
-      // We only evacuate & promote objects from regular regions whose garbage() is above old-garbage-threshold.
-      // Objects in tenure-worthy regions with less garbage are promoted in place. These take a different path to
-      // old-gen.  Regions excluded from promotion because their garbage content is too low (causing us to anticipate that
-      // the region would be promoted in place) may be eligible for evacuation promotion by the time promotion takes
-      // place during a subsequent GC pass because more garbage is found within the region between now and then.  This
-      // should not happen if we are properly adapting the tenure age.  The theory behind adaptive tenuring threshold
-      // is to choose the youngest age that demonstrates no "significant" further loss of population since the previous
-      // age.  If not this, we expect the tenure age to demonstrate linear population decay for at least two population
-      // samples, whereas we expect to observe exponential population decay for ages younger than the tenure age.
-      //
-      // In the case that certain regions which were anticipated to be promoted in place need to be promoted by
-      // evacuation, it may be the case that there is not sufficient reserve within old-gen to hold evacuation of
-      // these regions.  The likely outcome is that these regions will not be selected for evacuation or promotion
-      // in the current cycle and we will anticipate that they will be promoted in the next cycle.  This will cause
-      // us to reserve more old-gen memory so that these objects can be promoted in the subsequent cycle.
-      if (heap->is_aging_cycle() && heap->age_census()->is_tenurable(r->age() + 1)) {
-        if (r->garbage() >= old_garbage_threshold) {
-          promo_potential += r->get_live_data_bytes();
-        }
-      }
-    }
-    // Note that we keep going even if one region is excluded from selection.
-    // Subsequent regions may be selected if they have smaller live data.
-  }
-
-  if (pip_mutator_regions + pip_collector_regions > 0) {
-    freeset->account_for_pip_regions(pip_mutator_regions, pip_mutator_bytes, pip_collector_regions, pip_collector_bytes);
-  }
-
-  // Retire any regions that have been selected for promote in place
-  if (collector_regions_to_pip > 0) {
-    freeset->shrink_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId::Collector,
-                                                               pip_low_collector_idx, pip_high_collector_idx,
-                                                               collector_regions_to_pip);
-  }
-  if (mutator_regions_to_pip > 0) {
-    freeset->shrink_interval_if_range_modifies_either_boundary(ShenandoahFreeSetPartitionId::Mutator,
-                                                               pip_low_mutator_idx, pip_high_mutator_idx,
-                                                               mutator_regions_to_pip);
-  }
-
-  // Sort in increasing order according to live data bytes.  Note that candidates represents the number of regions
-  // that qualify to be promoted by evacuation.
-  size_t old_consumed = 0;
-  if (candidates > 0) {
-    size_t selected_regions = 0;
-    size_t selected_live = 0;
-    QuickSort::sort<AgedRegionData>(sorted_regions, candidates, compare_by_aged_live);
-    for (size_t i = 0; i < candidates; i++) {
-      ShenandoahHeapRegion* const region = sorted_regions[i]._region;
-      const size_t region_live_data = sorted_regions[i]._live_data;
-      const size_t promotion_need = (size_t) (region_live_data * ShenandoahPromoEvacWaste);
-      if (old_consumed + promotion_need <= old_promotion_reserve) {
-        old_consumed += promotion_need;
-        candidate_regions_for_promotion_by_copy[region->index()] = true;
-        selected_regions++;
-        selected_live += region_live_data;
-      } else {
-        // We rejected this promotable region from the collection set because we had no room to hold its copy.
-        // Add this region to promo potential for next GC.
-        promo_potential += region_live_data;
-        assert(!candidate_regions_for_promotion_by_copy[region->index()], "Shouldn't be selected");
-      }
-      // We keep going even if one region is excluded from selection because we need to accumulate all eligible
-      // regions that are not preselected into promo_potential
-    }
-    log_debug(gc, ergo)("Preselected %zu regions containing " PROPERFMT " live data,"
-                        " consuming: " PROPERFMT " of budgeted: " PROPERFMT,
-                        selected_regions, PROPERFMTARGS(selected_live), PROPERFMTARGS(old_consumed), PROPERFMTARGS(old_promotion_reserve));
-  }
-
-  log_info(gc, ergo)("Promotion potential of aged regions with sufficient garbage: " PROPERFMT, PROPERFMTARGS(promo_potential));
-
-  heap->old_generation()->set_pad_for_promote_in_place(promote_in_place_pad);
-  heap->old_generation()->set_promotion_potential(promo_potential);
-  return old_consumed;
-}
-
 void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   ShenandoahCollectionSet* collection_set = heap->collection_set();
@@ -776,38 +297,7 @@ void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
 
     collection_set->clear();
     ShenandoahHeapLocker locker(heap->lock());
-    if (is_generational) {
-      // Seed the collection set with resource area-allocated
-      // preselected regions, which are removed when we exit this scope.
-      ShenandoahCollectionSetPreselector preselector(collection_set, heap->num_regions());
-
-      // Find the amount that will be promoted, regions that will be promoted in
-      // place, and preselect older regions that will be promoted by evacuation.
-      compute_evacuation_budgets(heap);
-
-      // Choose the collection set, including the regions preselected above for
-      // promotion into the old generation.
-      _heuristics->choose_collection_set(collection_set);
-      if (!collection_set->is_empty()) {
-        // only make use of evacuation budgets when we are evacuating
-        adjust_evacuation_budgets(heap, collection_set);
-      }
-
-      if (is_global()) {
-        // We have just chosen a collection set for a global cycle. The mark bitmap covering old regions is complete, so
-        // the remembered set scan can use that to avoid walking into garbage. When the next old mark begins, we will
-        // use the mark bitmap to make the old regions parsable by coalescing and filling any unmarked objects. Thus,
-        // we prepare for old collections by remembering which regions are old at this time. Note that any objects
-        // promoted into old regions will be above TAMS, and so will be considered marked. However, free regions that
-        // become old after this point will not be covered correctly by the mark bitmap, so we must be careful not to
-        // coalesce those regions. Only the old regions which are not part of the collection set at this point are
-        // eligible for coalescing. As implemented now, this has the side effect of possibly initiating mixed-evacuations
-        // after a global cycle for old regions that were not included in this collection set.
-        heap->old_generation()->prepare_for_mixed_collections_after_global_gc();
-      }
-    } else {
-      _heuristics->choose_collection_set(collection_set);
-    }
+    _heuristics->choose_collection_set(collection_set);
   }
 
 
@@ -815,19 +305,17 @@ void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
     ShenandoahGCPhase phase(concurrent ? ShenandoahPhaseTimings::final_rebuild_freeset :
                             ShenandoahPhaseTimings::degen_gc_final_rebuild_freeset);
     ShenandoahHeapLocker locker(heap->lock());
-    size_t young_cset_regions, old_cset_regions;
-
-    // We are preparing for evacuation.  At this time, we ignore cset region tallies.
-    size_t first_old, last_old, num_old;
-    _free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old, last_old, num_old);
 
+    // We are preparing for evacuation.
+    size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
+    _free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
     if (heap->mode()->is_generational()) {
       ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
-      gen_heap->compute_old_generation_balance(young_cset_regions, old_cset_regions);
+    size_t allocation_runway =
+      gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_trashed_regions);
+      gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
     }
-
-    // Free set construction uses reserve quantities, because they are known to be valid here
-    _free_set->finish_rebuild(young_cset_regions, old_cset_regions, num_old, true);
+    _free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
   }
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index 06cf132f946..946f2b91520 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -60,30 +60,6 @@ protected:
   ShenandoahHeuristics* _heuristics;
 
 private:
-  // Compute evacuation budgets prior to choosing collection set.
-  void compute_evacuation_budgets(ShenandoahHeap* heap);
-
-  // Adjust evacuation budgets after choosing collection set.
-  void adjust_evacuation_budgets(ShenandoahHeap* heap,
-                                 ShenandoahCollectionSet* collection_set);
-
-  // Preselect for possible inclusion into the collection set exactly the most
-  // garbage-dense regions, including those that satisfy criteria 1 & 2 below,
-  // and whose live bytes will fit within old_available budget:
-  // Criterion 1. region age >= tenuring threshold
-  // Criterion 2. region garbage percentage > old garbage threshold
-  //
-  // Identifies regions eligible for promotion in place,
-  // being those of at least tenuring_threshold age that have lower garbage
-  // density.
-  //
-  // Updates promotion_potential and pad_for_promote_in_place fields
-  // of the heap. Returns bytes of live object memory in the preselected
-  // regions, which are marked in the preselected_regions() indicator
-  // array of the heap's collection set, which should be initialized
-  // to false.
-  size_t select_aged_regions(size_t old_promotion_reserve);
-
   // Return available assuming that we can allocate no more than capacity bytes within this generation.
   size_t available(size_t capacity) const;
 
@@ -144,6 +120,22 @@ private:
   virtual void prepare_gc();
 
   // Called during final mark, chooses collection set, rebuilds free set.
+  // Upon return from prepare_regions_and_collection_set(), certain parameters have been established to govern the
+  // evacuation efforts that are about to begin.  In particular:
+  //
+  // old_generation->get_promoted_reserve() represents the amount of memory within old-gen's available memory that has
+  //   been set aside to hold objects promoted from young-gen memory.  This represents an estimated percentage
+  //   of the live young-gen memory within the collection set.  If there is more data ready to be promoted than
+  //   can fit within this reserve, the promotion of some objects will be deferred until a subsequent evacuation
+  //   pass.
+  //
+  // old_generation->get_evacuation_reserve() represents the amount of memory within old-gen's available memory that has been
+  //  set aside to hold objects evacuated from the old-gen collection set.
+  //
+  // young_generation->get_evacuation_reserve() represents the amount of memory within young-gen's available memory that has
+  //  been set aside to hold objects evacuated from the young-gen collection set.  Conservatively, this value
+  //  equals the entire amount of live young-gen memory within the collection set, even though some of this memory
+  //  will likely be promoted.
   virtual void prepare_regions_and_collection_set(bool concurrent);
 
   // Cancel marking (used by Full collect and when cancelling cycle).
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index 018b4898a19..3b57190cc75 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -47,7 +47,7 @@
 #include "utilities/events.hpp"
 
 ShenandoahGenerationalControlThread::ShenandoahGenerationalControlThread() :
-  _control_lock(Mutex::nosafepoint - 2, "ShenandoahGCRequest_lock", true),
+  _control_lock(CONTROL_LOCK_RANK, "ShenandoahGCRequest_lock", true),
   _requested_gc_cause(GCCause::_no_gc),
   _requested_generation(nullptr),
   _gc_mode(none),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
index c9b956f9c2f..6912750378e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
@@ -24,14 +24,11 @@
  */
 
 #include "gc/shenandoah/shenandoahAsserts.hpp"
-#include "gc/shenandoah/shenandoahFreeSet.hpp"
+#include "gc/shenandoah/shenandoahGeneration.hpp"
 #include "gc/shenandoah/shenandoahGenerationalEvacuationTask.hpp"
-#include "gc/shenandoah/shenandoahGenerationalHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
+#include "gc/shenandoah/shenandoahInPlacePromoter.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
-#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
 
 class ShenandoahConcurrentEvacuator : public ObjectClosure {
 private:
@@ -77,10 +74,10 @@ void ShenandoahGenerationalEvacuationTask::work(uint worker_id) {
 void ShenandoahGenerationalEvacuationTask::do_work() {
   if (_only_promote_regions) {
     // No allocations will be made, do not enter oom-during-evac protocol.
-    assert(ShenandoahHeap::heap()->collection_set()->is_empty(), "Should not have a collection set here");
+    assert(_heap->collection_set()->is_empty(), "Should not have a collection set here");
     promote_regions();
   } else {
-    assert(!ShenandoahHeap::heap()->collection_set()->is_empty(), "Should have a collection set here");
+    assert(!_heap->collection_set()->is_empty(), "Should have a collection set here");
     ShenandoahEvacOOMScope oom_evac_scope;
     evacuate_and_promote_regions();
   }
@@ -95,16 +92,16 @@ void log_region(const ShenandoahHeapRegion* r, LogStream* ls) {
 }
 
 void ShenandoahGenerationalEvacuationTask::promote_regions() {
-  ShenandoahHeapRegion* r;
   LogTarget(Debug, gc) lt;
-
+  ShenandoahInPlacePromoter promoter(_heap);
+  ShenandoahHeapRegion* r;
   while ((r = _regions->next()) != nullptr) {
     if (lt.is_enabled()) {
       LogStream ls(lt);
       log_region(r, &ls);
     }
 
-    maybe_promote_region(r);
+    promoter.maybe_promote_region(r);
 
     if (_heap->check_cancelled_gc_and_yield(_concurrent)) {
       break;
@@ -115,6 +112,7 @@ void ShenandoahGenerationalEvacuationTask::promote_regions() {
 void ShenandoahGenerationalEvacuationTask::evacuate_and_promote_regions() {
   LogTarget(Debug, gc) lt;
   ShenandoahConcurrentEvacuator cl(_heap);
+  ShenandoahInPlacePromoter promoter(_heap);
   ShenandoahHeapRegion* r;
 
   while ((r = _regions->next()) != nullptr) {
@@ -127,7 +125,7 @@ void ShenandoahGenerationalEvacuationTask::evacuate_and_promote_regions() {
       assert(r->has_live(), "Region %zu should have been reclaimed early", r->index());
       _heap->marked_object_iterate(r, &cl);
     } else {
-      maybe_promote_region(r);
+      promoter.maybe_promote_region(r);
     }
 
     if (_heap->check_cancelled_gc_and_yield(_concurrent)) {
@@ -135,182 +133,3 @@ void ShenandoahGenerationalEvacuationTask::evacuate_and_promote_regions() {
     }
   }
 }
-
-
-void ShenandoahGenerationalEvacuationTask::maybe_promote_region(ShenandoahHeapRegion* r) {
-  if (r->is_young() && r->is_active() && _heap->is_tenurable(r)) {
-    if (r->is_humongous_start()) {
-      // We promote humongous_start regions along with their affiliated continuations during evacuation rather than
-      // doing this work during a safepoint.  We cannot put humongous regions into the collection set because that
-      // triggers the load-reference barrier (LRB) to copy on reference fetch.
-      //
-      // Aged humongous continuation regions are handled with their start region.  If an aged regular region has
-      // more garbage than the old garbage threshold, we'll promote by evacuation.  If there is room for evacuation
-      // in this cycle, the region will be in the collection set.  If there is not room, the region will be promoted
-      // by evacuation in some future GC cycle.
-
-      // We do not promote primitive arrays because there's no performance penalty keeping them in young.  When/if they
-      // become garbage, reclaiming the memory from young is much quicker and more efficient than reclaiming them from old.
-      oop obj = cast_to_oop(r->bottom());
-      if (!obj->is_typeArray()) {
-        promote_humongous(r);
-      }
-    } else if (r->is_regular() && (r->get_top_before_promote() != nullptr)) {
-      // Likewise, we cannot put promote-in-place regions into the collection set because that would also trigger
-      // the LRB to copy on reference fetch.
-      //
-      // If an aged regular region has received allocations during the current cycle, we do not promote because the
-      // newly allocated objects do not have appropriate age; this region's age will be reset to zero at end of cycle.
-      promote_in_place(r);
-    }
-  }
-}
-
-// When we promote a region in place, we can continue to use the established marking context to guide subsequent remembered
-// set scans of this region's content.  The region will be coalesced and filled prior to the next old-gen marking effort.
-// We identify the entirety of the region as DIRTY to force the next remembered set scan to identify the "interesting pointers"
-// contained herein.
-void ShenandoahGenerationalEvacuationTask::promote_in_place(ShenandoahHeapRegion* region) {
-  assert(!_generation->is_old(), "Sanity check");
-  ShenandoahMarkingContext* const marking_context = _heap->young_generation()->complete_marking_context();
-  HeapWord* const tams = marking_context->top_at_mark_start(region);
-  size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
-
-  {
-    const size_t old_garbage_threshold =
-      (region_size_bytes * _heap->old_generation()->heuristics()->get_old_garbage_threshold()) / 100;
-    assert(!_heap->is_concurrent_old_mark_in_progress(), "Cannot promote in place during old marking");
-    assert(region->garbage_before_padded_for_promote() < old_garbage_threshold,
-           "Region %zu has too much garbage for promotion", region->index());
-    assert(region->is_young(), "Only young regions can be promoted");
-    assert(region->is_regular(), "Use different service to promote humongous regions");
-    assert(_heap->is_tenurable(region), "Only promote regions that are sufficiently aged");
-    assert(region->get_top_before_promote() == tams, "Region %zu has been used for allocations before promotion", region->index());
-  }
-
-  ShenandoahOldGeneration* const old_gen = _heap->old_generation();
-  ShenandoahYoungGeneration* const young_gen = _heap->young_generation();
-
-  // Rebuild the remembered set information and mark the entire range as DIRTY.  We do NOT scan the content of this
-  // range to determine which cards need to be DIRTY.  That would force us to scan the region twice, once now, and
-  // once during the subsequent remembered set scan.  Instead, we blindly (conservatively) mark everything as DIRTY
-  // now and then sort out the CLEAN pages during the next remembered set scan.
-  //
-  // Rebuilding the remembered set consists of clearing all object registrations (reset_object_range()) here,
-  // then registering every live object and every coalesced range of free objects in the loop that follows.
-  ShenandoahScanRemembered* const scanner = old_gen->card_scan();
-  scanner->reset_object_range(region->bottom(), region->end());
-  scanner->mark_range_as_dirty(region->bottom(), region->get_top_before_promote() - region->bottom());
-
-  HeapWord* obj_addr = region->bottom();
-  while (obj_addr < tams) {
-    oop obj = cast_to_oop(obj_addr);
-    if (marking_context->is_marked(obj)) {
-      assert(obj->klass() != nullptr, "klass should not be null");
-      // This thread is responsible for registering all objects in this region.  No need for lock.
-      scanner->register_object_without_lock(obj_addr);
-      obj_addr += obj->size();
-    } else {
-      HeapWord* next_marked_obj = marking_context->get_next_marked_addr(obj_addr, tams);
-      assert(next_marked_obj <= tams, "next marked object cannot exceed tams");
-      size_t fill_size = next_marked_obj - obj_addr;
-      assert(fill_size >= ShenandoahHeap::min_fill_size(), "previously allocated objects known to be larger than min_size");
-      ShenandoahHeap::fill_with_object(obj_addr, fill_size);
-      scanner->register_object_without_lock(obj_addr);
-      obj_addr = next_marked_obj;
-    }
-  }
-  // We do not need to scan above TAMS because restored top equals tams
-  assert(obj_addr == tams, "Expect loop to terminate when obj_addr equals tams");
-
-  {
-    ShenandoahHeapLocker locker(_heap->lock());
-
-    HeapWord* update_watermark = region->get_update_watermark();
-    // pip_unpadded is memory too small to be filled above original top
-    size_t pip_unpadded = (region->end() - region->top()) * HeapWordSize;
-    assert((region->top() == region->end())
-           || (pip_unpadded == (size_t) ((region->end() - region->top()) * HeapWordSize)), "Invariant");
-    assert(pip_unpadded < ShenandoahHeap::min_fill_size() * HeapWordSize, "Sanity");
-    size_t pip_pad_bytes = (region->top() - region->get_top_before_promote()) * HeapWordSize;
-    assert((pip_unpadded == 0) || (pip_pad_bytes == 0), "Only one of pip_unpadded and pip_pad_bytes is non-zero");
-
-    // Now that this region is affiliated with old, we can allow it to receive allocations, though it may not be in the
-    // is_collector_free range.  We'll add it to that range below.
-    region->restore_top_before_promote();
-#ifdef ASSERT
-    size_t region_to_be_used_in_old = region->used();
-    assert(region_to_be_used_in_old + pip_pad_bytes + pip_unpadded == region_size_bytes, "invariant");
-#endif
-
-    // The update_watermark was likely established while we had the artificially high value of top.  Make it sane now.
-    assert(update_watermark >= region->top(), "original top cannot exceed preserved update_watermark");
-    region->set_update_watermark(region->top());
-
-    // Transfer this region from young to old, increasing promoted_reserve if available space exceeds plab_min_size()
-    _heap->free_set()->add_promoted_in_place_region_to_old_collector(region);
-    region->set_affiliation(OLD_GENERATION);
-    region->set_promoted_in_place();
-  }
-}
-
-void ShenandoahGenerationalEvacuationTask::promote_humongous(ShenandoahHeapRegion* region) {
-  ShenandoahMarkingContext* marking_context = _heap->marking_context();
-  oop obj = cast_to_oop(region->bottom());
-  assert(_generation->is_mark_complete(), "sanity");
-  assert(region->is_young(), "Only young regions can be promoted");
-  assert(region->is_humongous_start(), "Should not promote humongous continuation in isolation");
-  assert(_heap->is_tenurable(region), "Only promote regions that are sufficiently aged");
-  assert(marking_context->is_marked(obj), "promoted humongous object should be alive");
-
-  const size_t used_bytes = obj->size() * HeapWordSize;
-  const size_t spanned_regions = ShenandoahHeapRegion::required_regions(used_bytes);
-  const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
-  const size_t humongous_waste = spanned_regions * region_size_bytes - obj->size() * HeapWordSize;
-  const size_t index_limit = region->index() + spanned_regions;
-
-  ShenandoahOldGeneration* const old_gen = _heap->old_generation();
-  ShenandoahGeneration* const young_gen = _heap->young_generation();
-  {
-    // We need to grab the heap lock in order to avoid a race when changing the affiliations of spanned_regions from
-    // young to old.
-    ShenandoahHeapLocker locker(_heap->lock());
-
-    // We promote humongous objects unconditionally, without checking for availability.  We adjust
-    // usage totals, including humongous waste, after evacuation is done.
-    log_debug(gc)("promoting humongous region %zu, spanning %zu", region->index(), spanned_regions);
-
-    // For this region and each humongous continuation region spanned by this humongous object, change
-    // affiliation to OLD_GENERATION and adjust the generation-use tallies.  The remnant of memory
-    // in the last humongous region that is not spanned by obj is currently not used.
-    for (size_t i = region->index(); i < index_limit; i++) {
-      ShenandoahHeapRegion* r = _heap->get_region(i);
-      log_debug(gc)("promoting humongous region %zu, from " PTR_FORMAT " to " PTR_FORMAT,
-              r->index(), p2i(r->bottom()), p2i(r->top()));
-      // We mark the entire humongous object's range as dirty after loop terminates, so no need to dirty the range here
-      r->set_affiliation(OLD_GENERATION);
-      r->set_promoted_in_place();
-    }
-
-    ShenandoahFreeSet* freeset = _heap->free_set();
-    freeset->transfer_humongous_regions_from_mutator_to_old_collector(spanned_regions, humongous_waste);
-  }
-
-  // Since this region may have served previously as OLD, it may hold obsolete object range info.
-  HeapWord* const humongous_bottom = region->bottom();
-  ShenandoahScanRemembered* const scanner = old_gen->card_scan();
-  scanner->reset_object_range(humongous_bottom, humongous_bottom + spanned_regions * ShenandoahHeapRegion::region_size_words());
-  // Since the humongous region holds only one object, no lock is necessary for this register_object() invocation.
-  scanner->register_object_without_lock(humongous_bottom);
-
-  if (obj->is_typeArray()) {
-    // Primitive arrays don't need to be scanned.
-    log_debug(gc)("Clean cards for promoted humongous object (Region %zu) from " PTR_FORMAT " to " PTR_FORMAT,
-            region->index(), p2i(humongous_bottom), p2i(humongous_bottom + obj->size()));
-    scanner->mark_range_as_clean(humongous_bottom, obj->size());
-  } else {
-    log_debug(gc)("Dirty cards for promoted humongous object (Region %zu) from " PTR_FORMAT " to " PTR_FORMAT,
-            region->index(), p2i(humongous_bottom), p2i(humongous_bottom + obj->size()));
-    scanner->mark_range_as_dirty(humongous_bottom, obj->size());
-  }
-}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.hpp
index de47184ffff..1ff58b42e8c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.hpp
@@ -27,6 +27,7 @@
 
 #include "gc/shared/workerThread.hpp"
 
+class ShenandoahGeneration;
 class ShenandoahGenerationalHeap;
 class ShenandoahHeapRegion;
 class ShenandoahRegionIterator;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
index 78672ee10a5..1b11c696d18 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
@@ -55,9 +55,6 @@ void ShenandoahGenerationalFullGC::prepare() {
   // Since we may arrive here from degenerated GC failure of either young or old, establish generation as GLOBAL.
   heap->set_active_generation(heap->global_generation());
 
-  // No need for old_gen->increase_used() as this was done when plabs were allocated.
-  heap->reset_generation_reserves();
-
   // Full GC supersedes any marking or coalescing in old generation.
   heap->old_generation()->cancel_gc();
 }
@@ -156,8 +153,11 @@ void ShenandoahGenerationalFullGC::compute_balances() {
 
   // In case this Full GC resulted from degeneration, clear the tally on anticipated promotion.
   heap->old_generation()->set_promotion_potential(0);
-  // Invoke this in case we are able to transfer memory from OLD to YOUNG.
-  heap->compute_old_generation_balance(0, 0);
+
+  // Invoke this in case we are able to transfer memory from OLD to YOUNG
+  size_t allocation_runway =
+    heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(0L);
+  heap->compute_old_generation_balance(allocation_runway, 0, 0);
 }
 
 ShenandoahPrepareForGenerationalCompactionObjectClosure::ShenandoahPrepareForGenerationalCompactionObjectClosure(PreservedMarks* preserved_marks,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index f887cc9064e..2c2e5533c01 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -104,17 +104,6 @@ void ShenandoahGenerationalHeap::initialize_heuristics() {
   // Initialize global generation and heuristics even in generational mode.
   ShenandoahHeap::initialize_heuristics();
 
-  // Max capacity is the maximum _allowed_ capacity. That is, the maximum allowed capacity
-  // for old would be total heap - minimum capacity of young. This means the sum of the maximum
-  // allowed for old and young could exceed the total heap size. It remains the case that the
-  // _actual_ capacity of young + old = total.
-  size_t region_count = num_regions();
-  size_t max_young_regions = MAX2((region_count * ShenandoahMaxYoungPercentage) / 100, (size_t) 1U);
-  size_t initial_capacity_young = max_young_regions * ShenandoahHeapRegion::region_size_bytes();
-  size_t max_capacity_young = initial_capacity_young;
-  size_t initial_capacity_old = max_capacity() - max_capacity_young;
-  size_t max_capacity_old = max_capacity() - initial_capacity_young;
-
   _young_generation = new ShenandoahYoungGeneration(max_workers());
   _old_generation = new ShenandoahOldGeneration(max_workers());
   _young_generation->initialize_heuristics(mode());
@@ -310,9 +299,9 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, uint
         alloc_from_lab = false;
       }
       // else, we leave copy equal to nullptr, signaling a promotion failure below if appropriate.
-      // We choose not to promote objects smaller than PLAB::min_size() by way of shared allocations, as this is too
+      // We choose not to promote objects smaller than size_threshold by way of shared allocations as this is too
       // costly.  Instead, we'll simply "evacuate" to young-gen memory (using a GCLAB) and will promote in a future
-      // evacuation pass.  This condition is denoted by: is_promotion && has_plab && (size <= PLAB::min_size())
+      // evacuation pass.  This condition is denoted by: is_promotion && has_plab && (size <= size_threshhold).
     }
 #ifdef ASSERT
   }
@@ -587,19 +576,18 @@ void ShenandoahGenerationalHeap::retire_plab(PLAB* plab) {
 
 // Make sure old-generation is large enough, but no larger than is necessary, to hold mixed evacuations
 // and promotions, if we anticipate either. Any deficit is provided by the young generation, subject to
-// xfer_limit, and any surplus is transferred to the young generation.
-//
-// xfer_limit is the maximum we're able to transfer from young to old based on either:
-//  1. an assumption that we will be able to replenish memory "borrowed" from young at the end of collection, or
-//  2. there is sufficient excess in the allocation runway during GC idle cycles
-void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t old_xfer_limit, size_t old_cset_regions) {
-
+// mutator_xfer_limit, and any surplus is transferred to the young generation.  mutator_xfer_limit is
+// the maximum we're able to transfer from young to old.  This is called at the end of GC, as we prepare
+// for the idle span that precedes the next GC.
+void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t mutator_xfer_limit,
+                                                                size_t old_trashed_regions, size_t young_trashed_regions) {
+  shenandoah_assert_heaplocked();
   // We can limit the old reserve to the size of anticipated promotions:
   // max_old_reserve is an upper bound on memory evacuated from old and promoted to old,
   // clamped by the old generation space available.
   //
   // Here's the algebra.
-  // Let SOEP = ShenandoahOldEvacRatioPercent,
+  // Let SOEP = ShenandoahOldEvacPercent,
   //     OE = old evac,
   //     YE = young evac, and
   //     TE = total evac = OE + YE
@@ -611,81 +599,212 @@ void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t old_xfer_
   //  =>              OE = YE*SOEP/(100-SOEP)
 
   // We have to be careful in the event that SOEP is set to 100 by the user.
-  assert(ShenandoahOldEvacRatioPercent <= 100, "Error");
-  const size_t old_available = old_generation()->available();
-  // The free set will reserve this amount of memory to hold young evacuations
-  const size_t young_reserve = (young_generation()->max_capacity() * ShenandoahEvacReserve) / 100;
-
-  // In the case that ShenandoahOldEvacRatioPercent equals 100, max_old_reserve is limited only by xfer_limit.
-
-  const double bound_on_old_reserve = old_available + old_xfer_limit + young_reserve;
-  const double max_old_reserve = ((ShenandoahOldEvacRatioPercent == 100)? bound_on_old_reserve:
-                                  MIN2(double(young_reserve * ShenandoahOldEvacRatioPercent)
-                                       / double(100 - ShenandoahOldEvacRatioPercent), bound_on_old_reserve));
-
+  assert(ShenandoahOldEvacPercent <= 100, "Error");
   const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
 
+  ShenandoahOldGeneration* old_gen = old_generation();
+  size_t old_capacity = old_gen->max_capacity();
+  size_t old_usage = old_gen->used(); // includes humongous waste
+  size_t old_currently_available =
+    ((old_capacity >= old_usage)? old_capacity - old_usage: 0) + old_trashed_regions * region_size_bytes;
+
+  ShenandoahYoungGeneration* young_gen = young_generation();
+  size_t young_capacity = young_gen->max_capacity();
+  size_t young_usage = young_gen->used(); // includes humongous waste
+  size_t young_available = ((young_capacity >= young_usage)? young_capacity - young_usage: 0);
+  size_t freeset_available = free_set()->available_locked();
+  if (young_available > freeset_available) {
+    young_available = freeset_available;
+  }
+  young_available += young_trashed_regions * region_size_bytes;
+
+  // The free set will reserve this amount of memory to hold young evacuations (initialized to the ideal reserve)
+  size_t young_reserve = (young_generation()->max_capacity() * ShenandoahEvacReserve) / 100;
+
+  // If ShenandoahOldEvacPercent equals 100, max_old_reserve is limited only by mutator_xfer_limit and young_reserve
+  const size_t bound_on_old_reserve =
+    ((old_currently_available + mutator_xfer_limit + young_reserve) * ShenandoahOldEvacPercent) / 100;
+  size_t proposed_max_old = ((ShenandoahOldEvacPercent == 100)?
+                             bound_on_old_reserve:
+                             MIN2((young_reserve * ShenandoahOldEvacPercent) / (100 - ShenandoahOldEvacPercent),
+                                  bound_on_old_reserve));
+  if (young_reserve > young_available) {
+    young_reserve = young_available;
+  }
+
   // Decide how much old space we should reserve for a mixed collection
-  double reserve_for_mixed = 0;
-  if (old_generation()->has_unprocessed_collection_candidates()) {
-    // We want this much memory to be unfragmented in order to reliably evacuate old.  This is conservative because we
-    // may not evacuate the entirety of unprocessed candidates in a single mixed evacuation.
-    const double max_evac_need =
-      (double(old_generation()->unprocessed_collection_candidates_live_memory()) * ShenandoahOldEvacWaste);
-    assert(old_available >= old_generation()->free_unaffiliated_regions() * region_size_bytes,
+  size_t proposed_reserve_for_mixed = 0;
+  const size_t old_fragmented_available =
+    old_currently_available - (old_generation()->free_unaffiliated_regions() + old_trashed_regions) * region_size_bytes;
+
+  if (old_fragmented_available > proposed_max_old) {
+    // In this case, the old_fragmented_available is greater than the desired amount of evacuation to old.
+    // We'll use all of this memory to hold results of old evacuation, and we'll give back to the young generation
+    // any old regions that are not fragmented.
+    //
+    // This scenario may happen after we have promoted many regions in place, and each of these regions had non-zero
+    // unused memory, so there is now an abundance of old-fragmented available memory, even more than the desired
+    // percentage for old reserve.  We cannot transfer these fragmented regions back to young.  Instead we make the
+    // best of the situation by using this fragmented memory for both promotions and evacuations.
+
+    proposed_max_old = old_fragmented_available;
+  }
+  // Otherwise: old_fragmented_available <= proposed_max_old. Do not shrink proposed_max_old from the original computation.
+
+  // Though we initially set proposed_reserve_for_promo to equal the entirety of old fragmented available, we have the
+  // opportunity below to shift some of this memory into the proposed_reserve_for_mixed.
+  size_t proposed_reserve_for_promo = old_fragmented_available;
+  const size_t max_old_reserve = proposed_max_old;
+
+  const size_t mixed_candidate_live_memory = old_generation()->unprocessed_collection_candidates_live_memory();
+  const bool doing_mixed = (mixed_candidate_live_memory > 0);
+  if (doing_mixed) {
+    // In the ideal, all of the memory reserved for mixed evacuation would be unfragmented, but we don't enforce
+    // this.  Note that the initial value of  max_evac_need is conservative because we may not evacuate all of the
+    // remaining mixed evacuation candidates in a single cycle.
+    const size_t max_evac_need = (size_t) (mixed_candidate_live_memory * ShenandoahOldEvacWaste);
+    assert(old_currently_available >= old_generation()->free_unaffiliated_regions() * region_size_bytes,
            "Unaffiliated available must be less than total available");
-    const double old_fragmented_available =
-      double(old_available - old_generation()->free_unaffiliated_regions() * region_size_bytes);
-    reserve_for_mixed = max_evac_need + old_fragmented_available;
-    if (reserve_for_mixed > max_old_reserve) {
-      reserve_for_mixed = max_old_reserve;
+
+    // We prefer to evacuate all of mixed into unfragmented memory, and will expand old in order to do so, unless
+    // we already have too much fragmented available memory in old.
+    proposed_reserve_for_mixed = max_evac_need;
+    if (proposed_reserve_for_mixed + proposed_reserve_for_promo > max_old_reserve) {
+      // We're trying to reserve more memory than is available.  So we need to shrink our reserves.
+      size_t excess_reserves = (proposed_reserve_for_mixed + proposed_reserve_for_promo) - max_old_reserve;
+      // We need to shrink reserves by excess_reserves.  We prefer to shrink by reducing promotion, giving priority to mixed
+      // evacuation.  If the promotion reserve is larger than the amount we need to shrink by, do all the shrinkage there.
+      if (proposed_reserve_for_promo > excess_reserves) {
+        proposed_reserve_for_promo -= excess_reserves;
+      } else {
+        // Otherwise, we'll shrink promotion reserve to zero and we'll shrink the mixed-evac reserve by the remaining excess.
+        excess_reserves -= proposed_reserve_for_promo;
+        proposed_reserve_for_promo = 0;
+        proposed_reserve_for_mixed -= excess_reserves;
+      }
+    }
+  }
+  assert(proposed_reserve_for_mixed + proposed_reserve_for_promo <= max_old_reserve,
+         "Reserve for mixed (%zu) plus reserve for promotions (%zu) must be less than maximum old reserve (%zu)",
+         proposed_reserve_for_mixed, proposed_reserve_for_promo, max_old_reserve);
+
+  // Decide how much additional space we should reserve for promotions from young.  We give priority to mixed evacations
+  // over promotions.
+  const size_t promo_load = old_generation()->get_promotion_potential();
+  const bool doing_promotions = promo_load > 0;
+
+  // promo_load represents the combined total of live memory within regions that have reached tenure age.  The true
+  // promotion potential is larger than this, because individual objects within regions that have not yet reached tenure
+  // age may be promotable. On the other hand, some of the objects that we intend to promote in the next GC cycle may
+  // die before they are next marked.  In the future, the promo_load will include the total size of tenurable objects
+  // residing in regions that have not yet reached tenure age.
+
+  if (doing_promotions) {
+    // We are always doing promotions, even when old_generation->get_promotion_potential() returns 0.  As currently implemented,
+    // get_promotion_potential() only knows the total live memory contained within young-generation regions whose age is
+    // tenurable. It does not know whether that memory will still be live at the end of the next mark cycle, and it doesn't
+    // know how much memory is contained within objects whose individual ages are tenurable, which reside in regions with
+    // non-tenurable age.  We use this, as adjusted by ShenandoahPromoEvacWaste, as an approximation of the total amount of
+    // memory to be promoted.  In the near future, we expect to implement a change that will allow get_promotion_potential()
+    // to account also for the total memory contained within individual objects that are tenure-ready even when they do
+    // not reside in aged regions.  This will represent a conservative over approximation of promotable memory because
+    // some of these objects may die before the next GC cycle executes.
+
+    // Be careful not to ask for too much promotion reserves. We have observed jtreg test failures under which a greedy
+    // promotion reserve causes a humongous allocation which is awaiting a full GC to fail (specifically
+    // gc/TestAllocHumongousFragment.java). This happens if too much of the memory reclaimed by the full GC
+    // is immediately reserved so that it cannot be allocated by the waiting mutator. It's not clear that this
+    // particular test is representative of the needs of typical GenShen users.  It is really a test of high frequency
+    // Full GCs under heap fragmentation stress.
+
+    size_t promo_need = (size_t) (promo_load * ShenandoahPromoEvacWaste);
+    if (promo_need > proposed_reserve_for_promo) {
+      const size_t available_for_additional_promotions =
+        max_old_reserve - (proposed_reserve_for_mixed + proposed_reserve_for_promo);
+      if (proposed_reserve_for_promo + available_for_additional_promotions >= promo_need) {
+        proposed_reserve_for_promo = promo_need;
+      } else {
+        proposed_reserve_for_promo += available_for_additional_promotions;
+      }
+    }
+  }
+  // else, leave proposed_reserve_for_promo as is.  By default, it is initialized to represent old_fragmented_available.
+
+  // This is the total old we want to reserve (initialized to the ideal reserve)
+  size_t proposed_old_reserve = proposed_reserve_for_mixed + proposed_reserve_for_promo;
+
+  // We now check if the old generation is running a surplus or a deficit.
+  size_t old_region_deficit = 0;
+  size_t old_region_surplus = 0;
+
+  size_t mutator_region_xfer_limit = mutator_xfer_limit / region_size_bytes;
+  // align the mutator_xfer_limit on region size
+  mutator_xfer_limit = mutator_region_xfer_limit * region_size_bytes;
+
+  if (old_currently_available >= proposed_old_reserve) {
+    // We are running a surplus, so the old region surplus can go to young
+    const size_t old_surplus = old_currently_available - proposed_old_reserve;
+    old_region_surplus = old_surplus / region_size_bytes;
+    const size_t unaffiliated_old_regions = old_generation()->free_unaffiliated_regions() + old_trashed_regions;
+    old_region_surplus = MIN2(old_region_surplus, unaffiliated_old_regions);
+    old_generation()->set_region_balance(checked_cast<ssize_t>(old_region_surplus));
+    old_currently_available -= old_region_surplus * region_size_bytes;
+    young_available += old_region_surplus * region_size_bytes;
+  } else if (old_currently_available + mutator_xfer_limit >= proposed_old_reserve) {
+    // We know that old_currently_available < proposed_old_reserve because above test failed. Expand old_currently_available.
+    // Mutator's xfer limit is sufficient to satisfy our need: transfer all memory from there.
+    size_t old_deficit = proposed_old_reserve - old_currently_available;
+    old_region_deficit = (old_deficit + region_size_bytes - 1) / region_size_bytes;
+    old_generation()->set_region_balance(0 - checked_cast<ssize_t>(old_region_deficit));
+    old_currently_available += old_region_deficit * region_size_bytes;
+    young_available -= old_region_deficit * region_size_bytes;
+  } else {
+    // We know that (old_currently_available < proposed_old_reserve) and
+    //   (old_currently_available + mutator_xfer_limit < proposed_old_reserve) because above tests failed.
+    // We need to shrink proposed_old_reserves.
+
+    // We could potentially shrink young_reserves in order to further expand proposed_old_reserves.  Let's not bother.  The
+    // important thing is that we keep a total amount of memory in reserve in preparation for the next GC cycle.  At
+    // the time we choose the next collection set, we'll have an opportunity to shift some of these young reserves
+    // into old reserves if that makes sense.
+
+    // Start by taking all of mutator_xfer_limit into old_currently_available.
+    size_t old_region_deficit = mutator_region_xfer_limit;
+    old_generation()->set_region_balance(0 - checked_cast<ssize_t>(old_region_deficit));
+    old_currently_available += old_region_deficit * region_size_bytes;
+    young_available -= old_region_deficit * region_size_bytes;
+
+    assert(old_currently_available < proposed_old_reserve,
+           "Old currently available (%zu) must be less than old reserve (%zu)", old_currently_available, proposed_old_reserve);
+
+    // There's not enough memory to satisfy our desire.  Scale back our old-gen intentions.  We prefer to satisfy
+    // the budget_overrun entirely from the promotion reserve, if that is large enough.  Otherwise, we'll satisfy
+    // the overrun from a combination of promotion and mixed-evacuation reserves.
+    size_t budget_overrun = proposed_old_reserve - old_currently_available;
+    if (proposed_reserve_for_promo > budget_overrun) {
+      proposed_reserve_for_promo -= budget_overrun;
+      // Dead code:
+      //  proposed_old_reserve -= budget_overrun;
+    } else {
+      budget_overrun -= proposed_reserve_for_promo;
+      proposed_reserve_for_promo = 0;
+      proposed_reserve_for_mixed = (proposed_reserve_for_mixed > budget_overrun)? proposed_reserve_for_mixed - budget_overrun: 0;
+      // Dead code:
+      //  Note: proposed_reserve_for_promo is 0 and proposed_reserve_for_mixed may equal 0.
+      //  proposed_old_reserve = proposed_reserve_for_mixed;
     }
   }
 
-  // Decide how much space we should reserve for promotions from young
-  size_t reserve_for_promo = 0;
-  const size_t promo_load = old_generation()->get_promotion_potential();
-  const bool doing_promotions = promo_load > 0;
-  if (doing_promotions) {
-    // We're promoting and have a bound on the maximum amount that can be promoted
-    assert(max_old_reserve >= reserve_for_mixed, "Sanity");
-    const size_t available_for_promotions = max_old_reserve - reserve_for_mixed;
-    reserve_for_promo = MIN2((size_t)(promo_load * ShenandoahPromoEvacWaste), available_for_promotions);
-  }
+  assert(old_region_deficit == 0 || old_region_surplus == 0,
+         "Only surplus (%zu) or deficit (%zu), never both", old_region_surplus, old_region_deficit);
+  assert(young_reserve + proposed_reserve_for_mixed + proposed_reserve_for_promo <= old_currently_available + young_available,
+         "Cannot reserve more memory than is available: %zu + %zu + %zu <= %zu + %zu",
+         young_reserve, proposed_reserve_for_mixed, proposed_reserve_for_promo, old_currently_available, young_available);
 
-  // This is the total old we want to ideally reserve
-  const size_t old_reserve = reserve_for_mixed + reserve_for_promo;
-  assert(old_reserve <= max_old_reserve, "cannot reserve more than max for old evacuations");
-
-  // We now check if the old generation is running a surplus or a deficit.
-  const size_t max_old_available = old_generation()->available() + old_cset_regions * region_size_bytes;
-  if (max_old_available >= old_reserve) {
-    // We are running a surplus, so the old region surplus can go to young
-    const size_t old_surplus = (max_old_available - old_reserve) / region_size_bytes;
-    const size_t unaffiliated_old_regions = old_generation()->free_unaffiliated_regions() + old_cset_regions;
-    const size_t old_region_surplus = MIN2(old_surplus, unaffiliated_old_regions);
-    old_generation()->set_region_balance(checked_cast<ssize_t>(old_region_surplus));
-  } else {
-    // We are running a deficit which we'd like to fill from young.
-    // Ignore that this will directly impact young_generation()->max_capacity(),
-    // indirectly impacting young_reserve and old_reserve.  These computations are conservative.
-    // Note that deficit is rounded up by one region.
-    const size_t old_need = (old_reserve - max_old_available + region_size_bytes - 1) / region_size_bytes;
-    const size_t max_old_region_xfer = old_xfer_limit / region_size_bytes;
-
-    // Round down the regions we can transfer from young to old. If we're running short
-    // on young-gen memory, we restrict the xfer. Old-gen collection activities will be
-    // curtailed if the budget is restricted.
-    const size_t old_region_deficit = MIN2(old_need, max_old_region_xfer);
-    old_generation()->set_region_balance(0 - checked_cast<ssize_t>(old_region_deficit));
-  }
-}
-
-void ShenandoahGenerationalHeap::reset_generation_reserves() {
-  ShenandoahHeapLocker locker(lock());
-  young_generation()->set_evacuation_reserve(0);
-  old_generation()->set_evacuation_reserve(0);
-  old_generation()->set_promoted_reserve(0);
+  // deficit/surplus adjustments to generation sizes will precede rebuild
+  young_generation()->set_evacuation_reserve(young_reserve);
+  old_generation()->set_evacuation_reserve(proposed_reserve_for_mixed);
+  old_generation()->set_promoted_reserve(proposed_reserve_for_promo);
 }
 
 void ShenandoahGenerationalHeap::coalesce_and_fill_old_regions(bool concurrent) {
@@ -1026,14 +1145,14 @@ void ShenandoahGenerationalHeap::final_update_refs_update_region_states() {
 
 void ShenandoahGenerationalHeap::complete_degenerated_cycle() {
   shenandoah_assert_heaplocked_or_safepoint();
-  // In case degeneration interrupted concurrent evacuation or update references, we need to clean up
-  // transient state. Otherwise, these actions have no effect.
-  reset_generation_reserves();
-
   if (!old_generation()->is_parsable()) {
     ShenandoahGCPhase phase(ShenandoahPhaseTimings::degen_gc_coalesce_and_fill);
     coalesce_and_fill_old_regions(false);
   }
+
+  log_info(gc, cset)("Degenerated cycle complete, promotions reserved: %zu, promotions expended: %zu, failed count: %zu, failed bytes: %zu",
+                     old_generation()->get_promoted_reserve(), old_generation()->get_promoted_expended(),
+                     old_generation()->get_promotion_failed_count(), old_generation()->get_promotion_failed_words() * HeapWordSize);
 }
 
 void ShenandoahGenerationalHeap::complete_concurrent_cycle() {
@@ -1047,7 +1166,10 @@ void ShenandoahGenerationalHeap::complete_concurrent_cycle() {
     // throw off the heuristics.
     entry_global_coalesce_and_fill();
   }
-  reset_generation_reserves();
+
+  log_info(gc, cset)("Concurrent cycle complete, promotions reserved: %zu, promotions expended: %zu, failed count: %zu, failed bytes: %zu",
+                     old_generation()->get_promoted_reserve(), old_generation()->get_promoted_expended(),
+                     old_generation()->get_promotion_failed_count(), old_generation()->get_promotion_failed_words() * HeapWordSize);
 }
 
 void ShenandoahGenerationalHeap::entry_global_coalesce_and_fill() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
index a2ae4a68cd0..719bae52a83 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.hpp
@@ -136,7 +136,7 @@ public:
   void reset_generation_reserves();
 
   // Computes the optimal size for the old generation, represented as a surplus or deficit of old regions
-  void compute_old_generation_balance(size_t old_xfer_limit, size_t old_cset_regions);
+  void compute_old_generation_balance(size_t old_xfer_limit, size_t old_trashed_regions, size_t young_trashed_regions);
 
   // Balances generations, coalesces and fills old regions if necessary
   void complete_degenerated_cycle();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 3bf53f800a2..d78bdae6a51 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -86,6 +86,7 @@
 #include "nmt/memTracker.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "prims/jvmtiTagMap.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
@@ -201,9 +202,9 @@ jint ShenandoahHeap::initialize() {
   assert(num_min_regions <= _num_regions, "sanity");
   _minimum_size = num_min_regions * reg_size_bytes;
 
-  _soft_max_size = clamp(SoftMaxHeapSize, min_capacity(), max_capacity());
+  _soft_max_size.store_relaxed(clamp(SoftMaxHeapSize, min_capacity(), max_capacity()));
 
-  _committed = _initial_size;
+  _committed.store_relaxed(_initial_size);
 
   size_t heap_page_size   = UseLargePages ? os::large_page_size() : os::vm_page_size();
   size_t bitmap_page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
@@ -425,22 +426,29 @@ jint ShenandoahHeap::initialize() {
 
       _affiliations[i] = ShenandoahAffiliation::FREE;
     }
+
+    if (mode()->is_generational()) {
+      size_t young_reserve = (soft_max_capacity() * ShenandoahEvacReserve) / 100;
+      young_generation()->set_evacuation_reserve(young_reserve);
+      old_generation()->set_evacuation_reserve((size_t) 0);
+      old_generation()->set_promoted_reserve((size_t) 0);
+    }
+
     _free_set = new ShenandoahFreeSet(this, _num_regions);
-
-
     post_initialize_heuristics();
+
     // We are initializing free set.  We ignore cset region tallies.
-    size_t young_cset_regions, old_cset_regions, first_old, last_old, num_old;
-    _free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old, last_old, num_old);
+    size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
+    _free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
     if (mode()->is_generational()) {
       ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
       // We cannot call
       //  gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_cset_regions)
       // until after the heap is fully initialized.  So we make up a safe value here.
       size_t allocation_runway = InitialHeapSize / 2;
-      gen_heap->compute_old_generation_balance(allocation_runway, old_cset_regions);
+      gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
     }
-    _free_set->finish_rebuild(young_cset_regions, old_cset_regions, num_old);
+    _free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
   }
 
   if (AlwaysPreTouch) {
@@ -718,17 +726,17 @@ size_t ShenandoahHeap::used() const {
 }
 
 size_t ShenandoahHeap::committed() const {
-  return AtomicAccess::load(&_committed);
+  return _committed.load_relaxed();
 }
 
 void ShenandoahHeap::increase_committed(size_t bytes) {
   shenandoah_assert_heaplocked_or_safepoint();
-  _committed += bytes;
+  _committed.fetch_then_add(bytes, memory_order_relaxed);
 }
 
 void ShenandoahHeap::decrease_committed(size_t bytes) {
   shenandoah_assert_heaplocked_or_safepoint();
-  _committed -= bytes;
+  _committed.fetch_then_sub(bytes, memory_order_relaxed);
 }
 
 size_t ShenandoahHeap::capacity() const {
@@ -740,7 +748,7 @@ size_t ShenandoahHeap::max_capacity() const {
 }
 
 size_t ShenandoahHeap::soft_max_capacity() const {
-  size_t v = AtomicAccess::load(&_soft_max_size);
+  size_t v = _soft_max_size.load_relaxed();
   assert(min_capacity() <= v && v <= max_capacity(),
          "Should be in bounds: %zu <= %zu <= %zu",
          min_capacity(), v, max_capacity());
@@ -751,7 +759,7 @@ void ShenandoahHeap::set_soft_max_capacity(size_t v) {
   assert(min_capacity() <= v && v <= max_capacity(),
          "Should be in bounds: %zu <= %zu <= %zu",
          min_capacity(), v, max_capacity());
-  AtomicAccess::store(&_soft_max_size, v);
+  _soft_max_size.store_relaxed(v);
 }
 
 size_t ShenandoahHeap::min_capacity() const {
@@ -1658,7 +1666,7 @@ void ShenandoahHeap::verify(VerifyOption vo) {
   }
 }
 size_t ShenandoahHeap::tlab_capacity() const {
-  return _free_set->capacity();
+  return _free_set->capacity_not_holding_lock();
 }
 
 class ObjectIterateScanRootClosure : public BasicOopIterateClosure {
@@ -1768,12 +1776,7 @@ void ShenandoahHeap::scan_roots_for_iteration(ShenandoahScanObjectStack* oop_sta
 
 void ShenandoahHeap::reclaim_aux_bitmap_for_iteration() {
   if (!_aux_bitmap_region_special) {
-    bool success = os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size());
-    if (!success) {
-      log_warning(gc)("Auxiliary marking bitmap uncommit failed: " PTR_FORMAT " (%zu bytes)",
-                      p2i(_aux_bitmap_region.start()), _aux_bitmap_region.byte_size());
-      assert(false, "Auxiliary marking bitmap uncommit should always succeed");
-    }
+    os::uncommit_memory((char*)_aux_bitmap_region.start(), _aux_bitmap_region.byte_size());
   }
 }
 
@@ -1939,7 +1942,7 @@ private:
   size_t const _stride;
 
   shenandoah_padding(0);
-  volatile size_t _index;
+  Atomic<size_t> _index;
   shenandoah_padding(1);
 
 public:
@@ -1952,8 +1955,8 @@ public:
     size_t stride = _stride;
 
     size_t max = _heap->num_regions();
-    while (AtomicAccess::load(&_index) < max) {
-      size_t cur = AtomicAccess::fetch_then_add(&_index, stride, memory_order_relaxed);
+    while (_index.load_relaxed() < max) {
+      size_t cur = _index.fetch_then_add(stride, memory_order_relaxed);
       size_t start = cur;
       size_t end = MIN2(cur + stride, max);
       if (start >= max) break;
@@ -2138,7 +2141,7 @@ GCTracer* ShenandoahHeap::tracer() {
 }
 
 size_t ShenandoahHeap::tlab_used() const {
-  return _free_set->used();
+  return _free_set->used_not_holding_lock();
 }
 
 bool ShenandoahHeap::try_cancel_gc(GCCause::Cause cause) {
@@ -2523,14 +2526,10 @@ void ShenandoahHeap::final_update_refs_update_region_states() {
   parallel_heap_region_iterate(&cl);
 }
 
-void ShenandoahHeap::rebuild_free_set(bool concurrent) {
-  ShenandoahGCPhase phase(concurrent ?
-                          ShenandoahPhaseTimings::final_update_refs_rebuild_freeset :
-                          ShenandoahPhaseTimings::degen_gc_final_update_refs_rebuild_freeset);
+void ShenandoahHeap::rebuild_free_set_within_phase() {
   ShenandoahHeapLocker locker(lock());
-  size_t young_cset_regions, old_cset_regions;
-  size_t first_old_region, last_old_region, old_region_count;
-  _free_set->prepare_to_rebuild(young_cset_regions, old_cset_regions, first_old_region, last_old_region, old_region_count);
+  size_t young_trashed_regions, old_trashed_regions, first_old_region, last_old_region, old_region_count;
+  _free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old_region, last_old_region, old_region_count);
   // If there are no old regions, first_old_region will be greater than last_old_region
   assert((first_old_region > last_old_region) ||
          ((last_old_region + 1 - first_old_region >= old_region_count) &&
@@ -2548,19 +2547,12 @@ void ShenandoahHeap::rebuild_free_set(bool concurrent) {
     // The computation of bytes_of_allocation_runway_before_gc_trigger is quite conservative so consider all of this
     // available for transfer to old. Note that transfer of humongous regions does not impact available.
     ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
-    size_t allocation_runway = gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_cset_regions);
-    gen_heap->compute_old_generation_balance(allocation_runway, old_cset_regions);
-
-    // Total old_available may have been expanded to hold anticipated promotions.  We trigger if the fragmented available
-    // memory represents more than 16 regions worth of data.  Note that fragmentation may increase when we promote regular
-    // regions in place when many of these regular regions have an abundant amount of available memory within them.  Fragmentation
-    // will decrease as promote-by-copy consumes the available memory within these partially consumed regions.
-    //
-    // We consider old-gen to have excessive fragmentation if more than 12.5% of old-gen is free memory that resides
-    // within partially consumed regions of memory.
+    size_t allocation_runway =
+      gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_trashed_regions);
+    gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
   }
   // Rebuild free set based on adjusted generation sizes.
-  _free_set->finish_rebuild(young_cset_regions, old_cset_regions, old_region_count);
+  _free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, old_region_count);
 
   if (mode()->is_generational()) {
     ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
@@ -2569,6 +2561,13 @@ void ShenandoahHeap::rebuild_free_set(bool concurrent) {
   }
 }
 
+void ShenandoahHeap::rebuild_free_set(bool concurrent) {
+  ShenandoahGCPhase phase(concurrent ?
+                          ShenandoahPhaseTimings::final_update_refs_rebuild_freeset :
+                          ShenandoahPhaseTimings::degen_gc_final_update_refs_rebuild_freeset);
+  rebuild_free_set_within_phase();
+}
+
 bool ShenandoahHeap::is_bitmap_slice_committed(ShenandoahHeapRegion* r, bool skip_self) {
   size_t slice = r->index() / _bitmap_regions_per_slice;
 
@@ -2623,11 +2622,7 @@ void ShenandoahHeap::uncommit_bitmap_slice(ShenandoahHeapRegion *r) {
   size_t len = _bitmap_bytes_per_slice;
 
   char* addr = (char*) _bitmap_region.start() + off;
-  bool success = os::uncommit_memory(addr, len);
-  if (!success) {
-    log_warning(gc)("Bitmap slice uncommit failed: " PTR_FORMAT " (%zu bytes)", p2i(addr), len);
-    assert(false, "Bitmap slice uncommit should always succeed");
-  }
+  os::uncommit_memory(addr, len);
 }
 
 void ShenandoahHeap::forbid_uncommit() {
@@ -2709,25 +2704,13 @@ ShenandoahRegionIterator::ShenandoahRegionIterator(ShenandoahHeap* heap) :
   _index(0) {}
 
 void ShenandoahRegionIterator::reset() {
-  _index = 0;
+  _index.store_relaxed(0);
 }
 
 bool ShenandoahRegionIterator::has_next() const {
-  return _index < _heap->num_regions();
+  return _index.load_relaxed() < _heap->num_regions();
 }
 
-char ShenandoahHeap::gc_state() const {
-  return _gc_state.raw_value();
-}
-
-bool ShenandoahHeap::is_gc_state(GCState state) const {
-  // If the global gc state has been changed, but hasn't yet been propagated to all threads, then
-  // the global gc state is the correct value. Once the gc state has been synchronized with all threads,
-  // _gc_state_changed will be toggled to false and we need to use the thread local state.
-  return _gc_state_changed ? _gc_state.is_set(state) : ShenandoahThreadLocalData::is_gc_state(state);
-}
-
-
 ShenandoahLiveData* ShenandoahHeap::get_liveness_cache(uint worker_id) {
 #ifdef ASSERT
   assert(_liveness_cache != nullptr, "sanity");
@@ -2851,3 +2834,13 @@ void ShenandoahHeap::log_heap_status(const char* msg) const {
     global_generation()->log_status(msg);
   }
 }
+
+ShenandoahHeapLocker::ShenandoahHeapLocker(ShenandoahHeapLock* lock, bool allow_block_for_safepoint) : _lock(lock) {
+#ifdef ASSERT
+  ShenandoahFreeSet* free_set = ShenandoahHeap::heap()->free_set();
+  // free_set is nullptr only at pre-initialized state
+  assert(free_set == nullptr || !free_set->rebuild_lock()->owned_by_self(), "Dead lock, can't acquire heap lock while holding free-set rebuild lock");
+  assert(_lock != nullptr, "Must not");
+#endif
+  _lock->lock(allow_block_for_safepoint);
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 65e3803627c..85ad339469d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -88,7 +88,7 @@ private:
   ShenandoahHeap* _heap;
 
   shenandoah_padding(0);
-  volatile size_t _index;
+  Atomic<size_t> _index;
   shenandoah_padding(1);
 
   // No implicit copying: iterators should be passed by reference to capture the state
@@ -117,9 +117,23 @@ public:
   virtual bool is_thread_safe() { return false; }
 };
 
-typedef ShenandoahLock    ShenandoahHeapLock;
-typedef ShenandoahLocker  ShenandoahHeapLocker;
-typedef Stack<oop, mtGC>  ShenandoahScanObjectStack;
+typedef ShenandoahLock                       ShenandoahHeapLock;
+// ShenandoahHeapLocker implements locker to assure mutually exclusive access to the global heap data structures.
+// Asserts in the implementation detect potential deadlock usage with regards the rebuild lock that is present
+// in ShenandoahFreeSet.  Whenever both locks are acquired, this lock should be acquired before the
+// ShenandoahFreeSet rebuild lock.
+class ShenandoahHeapLocker : public StackObj {
+private:
+  ShenandoahHeapLock* _lock;
+public:
+  ShenandoahHeapLocker(ShenandoahHeapLock* lock, bool allow_block_for_safepoint = false);
+
+  ~ShenandoahHeapLocker() {
+    _lock->unlock();
+  }
+};
+
+typedef Stack<oop, mtGC>                     ShenandoahScanObjectStack;
 
 // Shenandoah GC is low-pause concurrent GC that uses a load reference barrier
 // for concurent evacuation and a snapshot-at-the-beginning write barrier for
@@ -208,9 +222,9 @@ private:
   size_t _initial_size;
   size_t _minimum_size;
 
-  volatile size_t _soft_max_size;
+  Atomic<size_t> _soft_max_size;
   shenandoah_padding(0);
-  volatile size_t _committed;
+  Atomic<size_t> _committed;
   shenandoah_padding(1);
 
 public:
@@ -340,7 +354,7 @@ private:
   ShenandoahSharedFlag   _full_gc_move_in_progress;
   ShenandoahSharedFlag   _concurrent_strong_root_in_progress;
 
-  size_t _gc_no_progress_count;
+  Atomic<size_t> _gc_no_progress_count;
 
   // This updates the singular, global gc state. This call must happen on a safepoint.
   void set_gc_state_at_safepoint(uint mask, bool value);
@@ -353,7 +367,7 @@ private:
 
 public:
   // This returns the raw value of the singular, global gc state.
-  char gc_state() const;
+  inline char gc_state() const;
 
   // Compares the given state against either the global gc state, or the thread local state.
   // The global gc state may change on a safepoint and is the correct value to use until
@@ -361,7 +375,7 @@ public:
   // compare against the thread local state). The thread local gc state may also be changed
   // by a handshake operation, in which case, this function continues using the updated thread
   // local value.
-  bool is_gc_state(GCState state) const;
+  inline bool is_gc_state(GCState state) const;
 
   // This copies the global gc state into a thread local variable for all threads.
   // The thread local gc state is primarily intended to support quick access at barriers.
@@ -481,7 +495,9 @@ private:
   void rendezvous_threads(const char* name);
   void recycle_trash();
 public:
+  // The following two functions rebuild the free set at the end of GC, in preparation for an idle phase.
   void rebuild_free_set(bool concurrent);
+  void rebuild_free_set_within_phase();
   void notify_gc_progress();
   void notify_gc_no_progress();
   size_t get_gc_no_progress_count() const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 34c279a1495..02f2beaf4e0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -49,7 +49,7 @@
 #include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/prefetch.inline.hpp"
@@ -61,7 +61,7 @@ inline ShenandoahHeap* ShenandoahHeap::heap() {
 }
 
 inline ShenandoahHeapRegion* ShenandoahRegionIterator::next() {
-  size_t new_index = AtomicAccess::add(&_index, (size_t) 1, memory_order_relaxed);
+  size_t new_index = _index.add_then_fetch((size_t) 1, memory_order_relaxed);
   // get_region() provides the bounds-check and returns null on OOB.
   return _heap->get_region(new_index - 1);
 }
@@ -75,15 +75,15 @@ inline WorkerThreads* ShenandoahHeap::safepoint_workers() {
 }
 
 inline void ShenandoahHeap::notify_gc_progress() {
-  AtomicAccess::store(&_gc_no_progress_count, (size_t) 0);
+  _gc_no_progress_count.store_relaxed((size_t) 0);
 
 }
 inline void ShenandoahHeap::notify_gc_no_progress() {
-  AtomicAccess::inc(&_gc_no_progress_count);
+  _gc_no_progress_count.add_then_fetch((size_t) 1);
 }
 
 inline size_t ShenandoahHeap::get_gc_no_progress_count() const {
-  return AtomicAccess::load(&_gc_no_progress_count);
+  return _gc_no_progress_count.load_relaxed();
 }
 
 inline size_t ShenandoahHeap::heap_region_index_containing(const void* addr) const {
@@ -452,6 +452,17 @@ inline bool ShenandoahHeap::in_collection_set_loc(void* p) const {
   return collection_set()->is_in_loc(p);
 }
 
+inline char ShenandoahHeap::gc_state() const {
+  return _gc_state.raw_value();
+}
+
+inline bool ShenandoahHeap::is_gc_state(GCState state) const {
+  // If the global gc state has been changed, but hasn't yet been propagated to all threads, then
+  // the global gc state is the correct value. Once the gc state has been synchronized with all threads,
+  // _gc_state_changed will be toggled to false and we need to use the thread local state.
+  return _gc_state_changed ? _gc_state.is_set(state) : ShenandoahThreadLocalData::is_gc_state(state);
+}
+
 inline bool ShenandoahHeap::is_idle() const {
   return _gc_state_changed ? _gc_state.is_clear() : ShenandoahThreadLocalData::gc_state(Thread::current()) == 0;
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 3cd5cdd2ec3..afc6b24e168 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -43,7 +43,6 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -75,6 +74,7 @@ ShenandoahHeapRegion::ShenandoahHeapRegion(HeapWord* start, size_t index, bool c
   _plab_allocs(0),
   _live_data(0),
   _critical_pins(0),
+  _mixed_candidate_garbage_words(0),
   _update_watermark(start),
   _age(0),
 #ifdef SHENANDOAH_CENSUS_NOISE
@@ -383,7 +383,7 @@ size_t ShenandoahHeapRegion::get_plab_allocs() const {
 
 void ShenandoahHeapRegion::set_live_data(size_t s) {
   assert(Thread::current()->is_VM_thread(), "by VM thread");
-  _live_data = (s >> LogHeapWordSize);
+  _live_data.store_relaxed(s >> LogHeapWordSize);
 }
 
 void ShenandoahHeapRegion::print_on(outputStream* st) const {
@@ -434,7 +434,7 @@ void ShenandoahHeapRegion::print_on(outputStream* st) const {
   st->print("|TAMS " SHR_PTR_FORMAT,
             p2i(ShenandoahHeap::heap()->marking_context()->top_at_mark_start(const_cast<ShenandoahHeapRegion*>(this))));
   st->print("|UWM " SHR_PTR_FORMAT,
-            p2i(_update_watermark));
+            p2i(_update_watermark.load_relaxed()));
   st->print("|U %5zu%1s", byte_size_in_proper_unit(used()),                proper_unit_for_byte_size(used()));
   st->print("|T %5zu%1s", byte_size_in_proper_unit(get_tlab_allocs()),     proper_unit_for_byte_size(get_tlab_allocs()));
   st->print("|G %5zu%1s", byte_size_in_proper_unit(get_gclab_allocs()),    proper_unit_for_byte_size(get_gclab_allocs()));
@@ -565,6 +565,7 @@ void ShenandoahHeapRegion::recycle_internal() {
   assert(_recycling.is_set() && is_trash(), "Wrong state");
   ShenandoahHeap* heap = ShenandoahHeap::heap();
 
+  _mixed_candidate_garbage_words = 0;
   set_top(bottom());
   clear_live_data();
   reset_alloc_metadata();
@@ -593,6 +594,8 @@ void ShenandoahHeapRegion::try_recycle_under_lock() {
     _recycling.unset();
   } else {
     // Ensure recycling is unset before returning to mutator to continue memory allocation.
+    // Otherwise, the mutator might see region as fully recycled and might change its affiliation only to have
+    // the racing GC worker thread overwrite its affiliation to FREE.
     while (_recycling.is_set()) {
       if (os::is_MP()) {
         SpinPause();
@@ -603,6 +606,8 @@ void ShenandoahHeapRegion::try_recycle_under_lock() {
   }
 }
 
+// Note that return from try_recycle() does not mean the region has been recycled.  It only means that
+// some GC worker thread has taken responsibility to recycle the region, eventually.
 void ShenandoahHeapRegion::try_recycle() {
   shenandoah_assert_not_heaplocked();
   if (is_trash() && _recycling.try_set()) {
@@ -811,11 +816,7 @@ void ShenandoahHeapRegion::do_commit() {
 void ShenandoahHeapRegion::do_uncommit() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   if (!heap->is_heap_region_special()) {
-    bool success = os::uncommit_memory((char *) bottom(), RegionSizeBytes);
-    if (!success) {
-      log_warning(gc)("Region uncommit failed: " PTR_FORMAT " (%zu bytes)", p2i(bottom()), RegionSizeBytes);
-      assert(false, "Region uncommit should always succeed");
-    }
+    os::uncommit_memory((char *) bottom(), RegionSizeBytes);
   }
   if (!heap->is_bitmap_region_special()) {
     heap->uncommit_bitmap_slice(this);
@@ -833,20 +834,20 @@ void ShenandoahHeapRegion::set_state(RegionState to) {
     evt.set_to(to);
     evt.commit();
   }
-  AtomicAccess::store(&_state, to);
+  _state.store_relaxed(to);
 }
 
 void ShenandoahHeapRegion::record_pin() {
-  AtomicAccess::add(&_critical_pins, (size_t)1);
+  _critical_pins.add_then_fetch((size_t)1);
 }
 
 void ShenandoahHeapRegion::record_unpin() {
   assert(pin_count() > 0, "Region %zu should have non-zero pins", index());
-  AtomicAccess::sub(&_critical_pins, (size_t)1);
+  _critical_pins.sub_then_fetch((size_t)1);
 }
 
 size_t ShenandoahHeapRegion::pin_count() const {
-  return AtomicAccess::load(&_critical_pins);
+  return _critical_pins.load_relaxed();
 }
 
 void ShenandoahHeapRegion::set_affiliation(ShenandoahAffiliation new_affiliation) {
@@ -858,7 +859,7 @@ void ShenandoahHeapRegion::set_affiliation(ShenandoahAffiliation new_affiliation
     log_debug(gc)("Setting affiliation of Region %zu from %s to %s, top: " PTR_FORMAT ", TAMS: " PTR_FORMAT
                   ", watermark: " PTR_FORMAT ", top_bitmap: " PTR_FORMAT,
                   index(), shenandoah_affiliation_name(region_affiliation), shenandoah_affiliation_name(new_affiliation),
-                  p2i(top()), p2i(ctx->top_at_mark_start(this)), p2i(_update_watermark), p2i(ctx->top_bitmap(this)));
+                  p2i(top()), p2i(ctx->top_at_mark_start(this)), p2i(_update_watermark.load_relaxed()), p2i(ctx->top_bitmap(this)));
   }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index cf0dc5476d0..3a0ac042f57 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -34,6 +34,7 @@
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/sizes.hpp"
 
 class VMStructs;
@@ -43,6 +44,7 @@ class ShenandoahHeapRegion {
   friend class VMStructs;
   friend class ShenandoahHeapRegionStateConstant;
 private:
+
   /*
     Region state is described by a state machine. Transitions are guarded by
     heap lock, which allows changing the state of several regions atomically.
@@ -216,7 +218,7 @@ public:
   bool is_alloc_allowed()          const { auto cur_state = state(); return is_empty_state(cur_state) || cur_state == _regular || cur_state == _pinned; }
   bool is_stw_move_allowed()       const { auto cur_state = state(); return cur_state == _regular || cur_state == _cset || (ShenandoahHumongousMoves && cur_state == _humongous_start); }
 
-  RegionState state()              const { return AtomicAccess::load(&_state); }
+  RegionState state()              const { return _state.load_relaxed(); }
   int  state_ordinal()             const { return region_state_to_ordinal(state()); }
 
   void record_pin();
@@ -246,7 +248,7 @@ private:
   HeapWord* _top_before_promoted;
 
   // Seldom updated fields
-  volatile RegionState _state;
+  Atomic<RegionState> _state;
   HeapWord* _coalesce_and_fill_boundary; // for old regions not selected as collection set candidates.
 
   // Frequently updated fields
@@ -256,10 +258,12 @@ private:
   size_t _gclab_allocs;
   size_t _plab_allocs;
 
-  volatile size_t _live_data;
-  volatile size_t _critical_pins;
+  Atomic<size_t> _live_data;
+  Atomic<size_t> _critical_pins;
 
-  HeapWord* volatile _update_watermark;
+  size_t _mixed_candidate_garbage_words;
+
+  Atomic<HeapWord*> _update_watermark;
 
   uint _age;
   bool _promoted_in_place;
@@ -398,6 +402,14 @@ public:
   // above TAMS.
   inline size_t get_live_data_words() const;
 
+  inline size_t get_mixed_candidate_live_data_bytes() const;
+  inline size_t get_mixed_candidate_live_data_words() const;
+
+  inline void capture_mixed_candidate_garbage();
+
+  // Returns garbage by calculating difference between used and get_live_data_words.  The value returned is only
+  // meaningful immediately following completion of marking.  If there have been subsequent allocations in this region,
+  // use a different approach to determine garbage, such as (used() - get_mixed_candidate_live_data_bytes())
   inline size_t garbage() const;
 
   void print_on(outputStream* st) const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
index b9304ee9daa..39b7c732703 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
@@ -32,7 +32,6 @@
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahOldGeneration.hpp"
-#include "runtime/atomicAccess.hpp"
 
 HeapWord* ShenandoahHeapRegion::allocate_aligned(size_t size, ShenandoahAllocRequest &req, size_t alignment_in_bytes) {
   shenandoah_assert_heaplocked_or_safepoint();
@@ -147,22 +146,39 @@ inline void ShenandoahHeapRegion::increase_live_data_gc_words(size_t s) {
 }
 
 inline void ShenandoahHeapRegion::internal_increase_live_data(size_t s) {
-  AtomicAccess::add(&_live_data, s, memory_order_relaxed);
+  _live_data.add_then_fetch(s, memory_order_relaxed);
 }
 
 inline void ShenandoahHeapRegion::clear_live_data() {
-  AtomicAccess::store(&_live_data, (size_t)0);
+  _live_data.store_relaxed((size_t)0);
   _promoted_in_place = false;
 }
 
 inline size_t ShenandoahHeapRegion::get_live_data_words() const {
-  return AtomicAccess::load(&_live_data);
+  return _live_data.load_relaxed();
 }
 
 inline size_t ShenandoahHeapRegion::get_live_data_bytes() const {
   return get_live_data_words() * HeapWordSize;
 }
 
+inline size_t ShenandoahHeapRegion::get_mixed_candidate_live_data_bytes() const {
+  shenandoah_assert_heaplocked_or_safepoint();
+  assert(used() >= _mixed_candidate_garbage_words * HeapWordSize, "used must exceed garbage");
+  return used() - _mixed_candidate_garbage_words * HeapWordSize;
+}
+
+inline size_t ShenandoahHeapRegion::get_mixed_candidate_live_data_words() const {
+  shenandoah_assert_heaplocked_or_safepoint();
+  assert(used() >= _mixed_candidate_garbage_words * HeapWordSize, "used must exceed garbage");
+  return used() / HeapWordSize - _mixed_candidate_garbage_words;
+}
+
+inline void ShenandoahHeapRegion::capture_mixed_candidate_garbage() {
+  shenandoah_assert_heaplocked_or_safepoint();
+  _mixed_candidate_garbage_words = garbage() / HeapWordSize;
+}
+
 inline bool ShenandoahHeapRegion::has_live() const {
   return get_live_data_words() != 0;
 }
@@ -188,21 +204,21 @@ inline size_t ShenandoahHeapRegion::garbage_before_padded_for_promote() const {
 }
 
 inline HeapWord* ShenandoahHeapRegion::get_update_watermark() const {
-  HeapWord* watermark = AtomicAccess::load_acquire(&_update_watermark);
+  HeapWord* watermark = _update_watermark.load_acquire();
   assert(bottom() <= watermark && watermark <= top(), "within bounds");
   return watermark;
 }
 
 inline void ShenandoahHeapRegion::set_update_watermark(HeapWord* w) {
   assert(bottom() <= w && w <= top(), "within bounds");
-  AtomicAccess::release_store(&_update_watermark, w);
+  _update_watermark.release_store(w);
 }
 
 // Fast version that avoids synchronization, only to be used at safepoints.
 inline void ShenandoahHeapRegion::set_update_watermark_at_safepoint(HeapWord* w) {
   assert(bottom() <= w && w <= top(), "within bounds");
   assert(SafepointSynchronize::is_at_safepoint(), "Should be at Shenandoah safepoint");
-  _update_watermark = w;
+  _update_watermark.store_relaxed(w);
 }
 
 inline ShenandoahAffiliation ShenandoahHeapRegion::affiliation() const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp b/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp
new file mode 100644
index 00000000000..83f4217df83
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp
@@ -0,0 +1,311 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "gc/shared/plab.hpp"
+#include "gc/shenandoah/shenandoahFreeSet.hpp"
+#include "gc/shenandoah/shenandoahGenerationalHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahHeap.inline.hpp"
+#include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
+#include "gc/shenandoah/shenandoahInPlacePromoter.hpp"
+#include "gc/shenandoah/shenandoahMarkingContext.hpp"
+#include "gc/shenandoah/shenandoahOldGeneration.hpp"
+#include "gc/shenandoah/shenandoahYoungGeneration.hpp"
+
+ShenandoahInPlacePromotionPlanner::RegionPromotions::RegionPromotions(ShenandoahFreeSet* free_set)
+  : _low_idx(free_set->max_regions())
+  , _high_idx(-1)
+  , _regions(0)
+  , _bytes(0)
+  , _free_set(free_set)
+{
+}
+
+void ShenandoahInPlacePromotionPlanner::RegionPromotions::increment(idx_t region_index, size_t remnant_bytes) {
+  if (region_index < _low_idx) {
+    _low_idx = region_index;
+  }
+  if (region_index > _high_idx) {
+    _high_idx = region_index;
+  }
+  _regions++;
+  _bytes += remnant_bytes;
+}
+
+void ShenandoahInPlacePromotionPlanner::RegionPromotions::update_free_set(ShenandoahFreeSetPartitionId partition_id) const {
+  if (_regions > 0) {
+    _free_set->shrink_interval_if_range_modifies_either_boundary(partition_id, _low_idx, _high_idx, _regions);
+  }
+}
+
+ShenandoahInPlacePromotionPlanner::ShenandoahInPlacePromotionPlanner(const ShenandoahGenerationalHeap* heap)
+  : _old_garbage_threshold(ShenandoahHeapRegion::region_size_bytes() * heap->old_generation()->heuristics()->get_old_garbage_threshold() / 100)
+  , _pip_used_threshold(ShenandoahHeapRegion::region_size_bytes() * ShenandoahGenerationalMinPIPUsage / 100)
+  , _heap(heap)
+  , _free_set(_heap->free_set())
+  , _marking_context(_heap->marking_context())
+  , _mutator_regions(_free_set)
+  , _collector_regions(_free_set)
+  , _pip_padding_bytes(0)
+{
+}
+
+bool ShenandoahInPlacePromotionPlanner::is_eligible(const ShenandoahHeapRegion* region) const {
+  return region->garbage() < _old_garbage_threshold && region->used() > _pip_used_threshold;
+}
+
+void ShenandoahInPlacePromotionPlanner::prepare(ShenandoahHeapRegion* r) {
+  HeapWord* tams = _marking_context->top_at_mark_start(r);
+  HeapWord* original_top = r->top();
+
+  if (_heap->is_concurrent_mark_in_progress() || tams != original_top) {
+    // We do not promote this region (either in place or by copy) because it has received new allocations.
+    // During evacuation, we exclude from promotion regions for which age > tenure threshold, garbage < garbage-threshold,
+    // used > pip_used_threshold, and get_top_before_promote() != tams.
+    //  TODO: Such a region should have had its age reset to zero when it was used for allocation?
+    return;
+  }
+
+  // No allocations from this region have been made during concurrent mark. It meets all the criteria
+  // for in-place-promotion. Though we only need the value of top when we fill the end of the region,
+  // we use this field to indicate that this region should be promoted in place during the evacuation
+  // phase.
+  r->save_top_before_promote();
+  size_t remnant_bytes = r->free();
+  size_t remnant_words = remnant_bytes / HeapWordSize;
+  assert(ShenandoahHeap::min_fill_size() <= PLAB::min_size(), "Implementation makes invalid assumptions");
+  if (remnant_words >= ShenandoahHeap::min_fill_size()) {
+    ShenandoahHeap::fill_with_object(original_top, remnant_words);
+    // Fill the remnant memory within this region to assure no allocations prior to promote in place.  Otherwise,
+    // newly allocated objects will not be parsable when promote in place tries to register them.  Furthermore, any
+    // new allocations would not necessarily be eligible for promotion.  This addresses both issues.
+    r->set_top(r->end());
+    // The region r is either in the Mutator or Collector partition if remnant_words > heap()->plab_min_size.
+    // Otherwise, the region is in the NotFree partition.
+    const idx_t i = r->index();
+    ShenandoahFreeSetPartitionId p = _free_set->membership(i);
+    if (p == ShenandoahFreeSetPartitionId::Mutator) {
+      _mutator_regions.increment(i, remnant_bytes);
+    } else if (p == ShenandoahFreeSetPartitionId::Collector) {
+      _collector_regions.increment(i, remnant_bytes);
+    } else {
+      assert((p == ShenandoahFreeSetPartitionId::NotFree) && (remnant_words < _heap->plab_min_size()),
+             "Should be NotFree if not in Collector or Mutator partitions");
+      // In this case, the memory is already counted as used and the region has already been retired.  There is
+      // no need for further adjustments to used.  Further, the remnant memory for this region will not be
+      // unallocated or made available to OldCollector after pip.
+      remnant_bytes = 0;
+    }
+
+    _pip_padding_bytes += remnant_bytes;
+    _free_set->prepare_to_promote_in_place(i, remnant_bytes);
+  } else {
+    // Since the remnant is so small that this region has already been retired, we don't have to worry about any
+    // accidental allocations occurring within this region before the region is promoted in place.
+
+    // This region was already not in the Collector or Mutator set, so no need to remove it.
+    assert(_free_set->membership(r->index()) == ShenandoahFreeSetPartitionId::NotFree, "sanity");
+  }
+}
+
+void ShenandoahInPlacePromotionPlanner::update_free_set() const {
+  _heap->old_generation()->set_pad_for_promote_in_place(_pip_padding_bytes);
+
+  if (_mutator_regions._regions + _collector_regions._regions > 0) {
+    _free_set->account_for_pip_regions(_mutator_regions._regions, _mutator_regions._bytes,
+                         _collector_regions._regions, _collector_regions._bytes);
+  }
+
+  // Retire any regions that have been selected for promote in place
+  _mutator_regions.update_free_set(ShenandoahFreeSetPartitionId::Mutator);
+  _collector_regions.update_free_set(ShenandoahFreeSetPartitionId::Collector);
+}
+
+void ShenandoahInPlacePromoter::maybe_promote_region(ShenandoahHeapRegion* r) const {
+  if (r->is_young() && r->is_active() && _heap->is_tenurable(r)) {
+    if (r->is_humongous_start()) {
+      // We promote humongous_start regions along with their affiliated continuations during evacuation rather than
+      // doing this work during a safepoint.  We cannot put humongous regions into the collection set because that
+      // triggers the load-reference barrier (LRB) to copy on reference fetch.
+      //
+      // Aged humongous continuation regions are handled with their start region.  If an aged regular region has
+      // more garbage than ShenandoahOldGarbageThreshold, we'll promote by evacuation.  If there is room for evacuation
+      // in this cycle, the region will be in the collection set.  If there is no room, the region will be promoted
+      // by evacuation in some future GC cycle.
+
+      // We do not promote primitive arrays because there's no performance penalty keeping them in young.  When/if they
+      // become garbage, reclaiming the memory from young is much quicker and more efficient than reclaiming them from old.
+      oop obj = cast_to_oop(r->bottom());
+      if (!obj->is_typeArray()) {
+        promote_humongous(r);
+      }
+    } else if (r->is_regular() && (r->get_top_before_promote() != nullptr)) {
+      // Likewise, we cannot put promote-in-place regions into the collection set because that would also trigger
+      // the LRB to copy on reference fetch.
+      //
+      // If an aged regular region has received allocations during the current cycle, we do not promote because the
+      // newly allocated objects do not have appropriate age; this region's age will be reset to zero at end of cycle.
+      promote(r);
+    }
+  }
+}
+
+// When we promote a region in place, we can continue to use the established marking context to guide subsequent remembered
+// set scans of this region's content.  The region will be coalesced and filled prior to the next old-gen marking effort.
+// We identify the entirety of the region as DIRTY to force the next remembered set scan to identify the "interesting pointers"
+// contained herein.
+void ShenandoahInPlacePromoter::promote(ShenandoahHeapRegion* region) const {
+
+  ShenandoahMarkingContext* const marking_context = _heap->young_generation()->complete_marking_context();
+  HeapWord* const tams = marking_context->top_at_mark_start(region);
+  size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+
+  {
+    const size_t old_garbage_threshold =
+      (region_size_bytes * _heap->old_generation()->heuristics()->get_old_garbage_threshold()) / 100;
+    assert(!_heap->is_concurrent_old_mark_in_progress(), "Cannot promote in place during old marking");
+    assert(region->garbage_before_padded_for_promote() < old_garbage_threshold,
+           "Region %zu has too much garbage for promotion", region->index());
+    assert(region->is_young(), "Only young regions can be promoted");
+    assert(region->is_regular(), "Use different service to promote humongous regions");
+    assert(_heap->is_tenurable(region), "Only promote regions that are sufficiently aged");
+    assert(region->get_top_before_promote() == tams, "Region %zu has been used for allocations before promotion", region->index());
+  }
+
+  ShenandoahOldGeneration* const old_gen = _heap->old_generation();
+
+  // Rebuild the remembered set information and mark the entire range as DIRTY.  We do NOT scan the content of this
+  // range to determine which cards need to be DIRTY.  That would force us to scan the region twice, once now, and
+  // once during the subsequent remembered set scan.  Instead, we blindly (conservatively) mark everything as DIRTY
+  // now and then sort out the CLEAN pages during the next remembered set scan.
+  //
+  // Rebuilding the remembered set consists of clearing all object registrations (reset_object_range()) here,
+  // then registering every live object and every coalesced range of free objects in the loop that follows.
+  ShenandoahScanRemembered* const scanner = old_gen->card_scan();
+  scanner->reset_object_range(region->bottom(), region->end());
+  scanner->mark_range_as_dirty(region->bottom(), region->get_top_before_promote() - region->bottom());
+
+  HeapWord* obj_addr = region->bottom();
+  while (obj_addr < tams) {
+    oop obj = cast_to_oop(obj_addr);
+    if (marking_context->is_marked(obj)) {
+      assert(obj->klass() != nullptr, "klass should not be null");
+      // This thread is responsible for registering all objects in this region.  No need for lock.
+      scanner->register_object_without_lock(obj_addr);
+      obj_addr += obj->size();
+    } else {
+      HeapWord* next_marked_obj = marking_context->get_next_marked_addr(obj_addr, tams);
+      assert(next_marked_obj <= tams, "next marked object cannot exceed tams");
+      size_t fill_size = next_marked_obj - obj_addr;
+      assert(fill_size >= ShenandoahHeap::min_fill_size(), "previously allocated objects known to be larger than min_size");
+      ShenandoahHeap::fill_with_object(obj_addr, fill_size);
+      scanner->register_object_without_lock(obj_addr);
+      obj_addr = next_marked_obj;
+    }
+  }
+  // We do not need to scan above TAMS because restored top equals tams
+  assert(obj_addr == tams, "Expect loop to terminate when obj_addr equals tams");
+
+
+  {
+    ShenandoahHeapLocker locker(_heap->lock());
+#ifdef ASSERT
+    HeapWord* update_watermark = region->get_update_watermark();
+    // pip_unpadded is memory too small to be filled above original top
+    size_t pip_unpadded = (region->end() - region->top()) * HeapWordSize;
+    assert((region->top() == region->end())
+           || (pip_unpadded == (size_t) ((region->end() - region->top()) * HeapWordSize)), "Invariant");
+    assert(pip_unpadded < ShenandoahHeap::min_fill_size() * HeapWordSize, "Sanity");
+    size_t pip_pad_bytes = (region->top() - region->get_top_before_promote()) * HeapWordSize;
+    assert((pip_unpadded == 0) || (pip_pad_bytes == 0), "Only one of pip_unpadded and pip_pad_bytes is non-zero");
+#endif
+
+    // Now that this region is affiliated with old, we can allow it to receive allocations, though it may not be in the
+    // is_collector_free range.  We'll add it to that range below.
+    region->restore_top_before_promote();
+
+    assert(region->used() + pip_pad_bytes + pip_unpadded == region_size_bytes, "invariant");
+
+    // The update_watermark was likely established while we had the artificially high value of top.  Make it sane now.
+    assert(update_watermark >= region->top(), "original top cannot exceed preserved update_watermark");
+    region->set_update_watermark(region->top());
+
+    // Transfer this region from young to old, increasing promoted_reserve if available space exceeds plab_min_size()
+    _heap->free_set()->add_promoted_in_place_region_to_old_collector(region);
+    region->set_affiliation(OLD_GENERATION);
+    region->set_promoted_in_place();
+  }
+}
+
+void ShenandoahInPlacePromoter::promote_humongous(ShenandoahHeapRegion* region) const {
+  oop obj = cast_to_oop(region->bottom());
+
+  assert(region->is_young(), "Only young regions can be promoted");
+  assert(region->is_humongous_start(), "Should not promote humongous continuation in isolation");
+  assert(_heap->is_tenurable(region), "Only promote regions that are sufficiently aged");
+  assert(_heap->marking_context()->is_marked(obj), "Promoted humongous object should be alive");
+  assert(!obj->is_typeArray(), "Don't promote humongous primitives");
+
+  const size_t used_bytes = obj->size() * HeapWordSize;
+  const size_t spanned_regions = ShenandoahHeapRegion::required_regions(used_bytes);
+  const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+  const size_t humongous_waste = spanned_regions * region_size_bytes - obj->size() * HeapWordSize;
+  const size_t index_limit = region->index() + spanned_regions;
+
+  ShenandoahOldGeneration* const old_gen = _heap->old_generation();
+  {
+    // We need to grab the heap lock in order to avoid a race when changing the affiliations of spanned_regions from
+    // young to old.
+    ShenandoahHeapLocker locker(_heap->lock());
+
+    // We promote humongous objects unconditionally, without checking for availability.  We adjust
+    // usage totals, including humongous waste, after evacuation is done.
+    log_debug(gc)("promoting humongous region %zu, spanning %zu", region->index(), spanned_regions);
+
+    // For this region and each humongous continuation region spanned by this humongous object, change
+    // affiliation to OLD_GENERATION and adjust the generation-use tallies.  The remnant of memory
+    // in the last humongous region that is not spanned by obj is currently not used.
+    for (size_t i = region->index(); i < index_limit; i++) {
+      ShenandoahHeapRegion* r = _heap->get_region(i);
+      log_debug(gc)("promoting humongous region %zu, from " PTR_FORMAT " to " PTR_FORMAT,
+              r->index(), p2i(r->bottom()), p2i(r->top()));
+      // We mark the entire humongous object's range as dirty after loop terminates, so no need to dirty the range here
+      r->set_affiliation(OLD_GENERATION);
+      r->set_promoted_in_place();
+    }
+
+    ShenandoahFreeSet* freeset = _heap->free_set();
+    freeset->transfer_humongous_regions_from_mutator_to_old_collector(spanned_regions, humongous_waste);
+  }
+
+  // Since this region may have served previously as OLD, it may hold obsolete object range info.
+  HeapWord* const humongous_bottom = region->bottom();
+  ShenandoahScanRemembered* const scanner = old_gen->card_scan();
+  scanner->reset_object_range(humongous_bottom, humongous_bottom + spanned_regions * ShenandoahHeapRegion::region_size_words());
+  // Since the humongous region holds only one object, no lock is necessary for this register_object() invocation.
+  scanner->register_object_without_lock(humongous_bottom);
+
+  log_debug(gc)("Dirty cards for promoted humongous object (Region %zu) from " PTR_FORMAT " to " PTR_FORMAT,
+            region->index(), p2i(humongous_bottom), p2i(humongous_bottom + obj->size()));
+  scanner->mark_range_as_dirty(humongous_bottom, obj->size());
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.hpp b/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.hpp
new file mode 100644
index 00000000000..939107dd3ac
--- /dev/null
+++ b/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.hpp
@@ -0,0 +1,91 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHINPLACEPROMOTER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHINPLACEPROMOTER_HPP
+
+#include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
+
+class ShenandoahFreeSet;
+class ShenandoahMarkingContext;
+class ShenandoahGenerationalHeap;
+class ShenandoahHeapRegion;
+
+class ShenandoahInPlacePromotionPlanner {
+  using idx_t = ShenandoahSimpleBitMap::idx_t;
+
+  struct RegionPromotions {
+    idx_t _low_idx;
+    idx_t _high_idx;
+    size_t _regions;
+    size_t _bytes;
+    ShenandoahFreeSet* _free_set;
+
+    explicit RegionPromotions(ShenandoahFreeSet* free_set);
+    void increment(idx_t region_index, size_t remnant_bytes);
+    void update_free_set(ShenandoahFreeSetPartitionId partition_id) const;
+  };
+
+  const size_t _old_garbage_threshold;
+  const size_t _pip_used_threshold;
+
+  const ShenandoahGenerationalHeap* _heap;
+  ShenandoahFreeSet* _free_set;
+  const ShenandoahMarkingContext* _marking_context;
+
+  // Any region that is to be promoted in place needs to be retired from its Collector or Mutator partition.
+  RegionPromotions _mutator_regions;
+  RegionPromotions _collector_regions;
+
+  // Tracks the padding of space above top in regions eligible for promotion in place
+  size_t _pip_padding_bytes;
+public:
+  explicit ShenandoahInPlacePromotionPlanner(const ShenandoahGenerationalHeap* heap);
+
+  // Returns true if this region has garbage below and usage above the configurable thresholds
+  bool is_eligible(const ShenandoahHeapRegion* region) const;
+
+  // Prepares the region for promotion by moving top to the end to prevent allocations
+  void prepare(ShenandoahHeapRegion* region);
+
+  // Notifies the free set of in place promotions
+  void update_free_set() const;
+
+  size_t old_garbage_threshold() const { return _old_garbage_threshold; }
+};
+
+class ShenandoahInPlacePromoter {
+  ShenandoahGenerationalHeap* _heap;
+public:
+  explicit ShenandoahInPlacePromoter(ShenandoahGenerationalHeap* heap) : _heap(heap) {}
+
+  // If the region still meets the criteria for promotion in place, it will be promoted
+  void maybe_promote_region(ShenandoahHeapRegion* region) const;
+
+private:
+  void promote(ShenandoahHeapRegion* region) const;
+  void promote_humongous(ShenandoahHeapRegion* region) const;
+};
+
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHINPLACEPROMOTER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
index 7a3b33f5fd0..7e317f53424 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
@@ -24,7 +24,6 @@
 
 
 #include "gc/shenandoah/shenandoahLock.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
@@ -46,8 +45,8 @@ void ShenandoahLock::contended_lock_internal(JavaThread* java_thread) {
   int ctr = os::is_MP() ? 0xFF : 0;
   int yields = 0;
   // Apply TTAS to avoid more expensive CAS calls if the lock is still held by other thread.
-  while (AtomicAccess::load(&_state) == locked ||
-         AtomicAccess::cmpxchg(&_state, unlocked, locked) != unlocked) {
+  while (_state.load_relaxed() == locked ||
+         _state.compare_exchange(unlocked, locked) != unlocked) {
     if (ctr > 0 && !SafepointSynchronize::is_synchronizing()) {
       // Lightly contended, spin a little if no safepoint is pending.
       SpinPause();
@@ -94,7 +93,7 @@ ShenandoahSimpleLock::ShenandoahSimpleLock() {
   assert(os::mutex_init_done(), "Too early!");
 }
 
-void ShenandoahSimpleLock::lock() {
+void ShenandoahSimpleLock::lock(bool allow_block_for_safepoint) {
   _lock.lock();
 }
 
@@ -102,41 +101,49 @@ void ShenandoahSimpleLock::unlock() {
   _lock.unlock();
 }
 
-ShenandoahReentrantLock::ShenandoahReentrantLock() :
-  ShenandoahSimpleLock(), _owner(nullptr), _count(0) {
-  assert(os::mutex_init_done(), "Too early!");
+template<typename Lock>
+ShenandoahReentrantLock<Lock>::ShenandoahReentrantLock() :
+  Lock(), _owner(nullptr), _count(0) {
 }
 
-ShenandoahReentrantLock::~ShenandoahReentrantLock() {
+template<typename Lock>
+ShenandoahReentrantLock<Lock>::~ShenandoahReentrantLock() {
   assert(_count == 0, "Unbalance");
 }
 
-void ShenandoahReentrantLock::lock() {
+template<typename Lock>
+void ShenandoahReentrantLock<Lock>::lock(bool allow_block_for_safepoint) {
   Thread* const thread = Thread::current();
-  Thread* const owner = AtomicAccess::load(&_owner);
+  Thread* const owner = _owner.load_relaxed();
 
   if (owner != thread) {
-    ShenandoahSimpleLock::lock();
-    AtomicAccess::store(&_owner, thread);
+    Lock::lock(allow_block_for_safepoint);
+    _owner.store_relaxed(thread);
   }
 
   _count++;
 }
 
-void ShenandoahReentrantLock::unlock() {
+template<typename Lock>
+void ShenandoahReentrantLock<Lock>::unlock() {
   assert(owned_by_self(), "Invalid owner");
   assert(_count > 0, "Invalid count");
 
   _count--;
 
   if (_count == 0) {
-    AtomicAccess::store(&_owner, (Thread*)nullptr);
-    ShenandoahSimpleLock::unlock();
+    _owner.store_relaxed((Thread*)nullptr);
+    Lock::unlock();
   }
 }
 
-bool ShenandoahReentrantLock::owned_by_self() const {
+template<typename Lock>
+bool ShenandoahReentrantLock<Lock>::owned_by_self() const {
   Thread* const thread = Thread::current();
-  Thread* const owner = AtomicAccess::load(&_owner);
+  Thread* const owner = _owner.load_relaxed();
   return owner == thread;
 }
+
+// Explicit template instantiation
+template class ShenandoahReentrantLock<ShenandoahSimpleLock>;
+template class ShenandoahReentrantLock<ShenandoahLock>;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
index fbdf4971354..7c91df191e5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
@@ -27,17 +27,18 @@
 
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/safepoint.hpp"
 
-class ShenandoahLock  {
+class ShenandoahLock {
 private:
   enum LockState { unlocked = 0, locked = 1 };
 
   shenandoah_padding(0);
-  volatile LockState _state;
+  Atomic<LockState> _state;
   shenandoah_padding(1);
-  Thread* volatile _owner;
+  Atomic<Thread*> _owner;
   shenandoah_padding(2);
 
   template<bool ALLOW_BLOCK>
@@ -47,34 +48,34 @@ private:
 public:
   ShenandoahLock() : _state(unlocked), _owner(nullptr) {};
 
-  void lock(bool allow_block_for_safepoint) {
-    assert(AtomicAccess::load(&_owner) != Thread::current(), "reentrant locking attempt, would deadlock");
+  void lock(bool allow_block_for_safepoint = false) {
+    assert(_owner.load_relaxed() != Thread::current(), "reentrant locking attempt, would deadlock");
 
     if ((allow_block_for_safepoint && SafepointSynchronize::is_synchronizing()) ||
-        (AtomicAccess::cmpxchg(&_state, unlocked, locked) != unlocked)) {
+        (_state.compare_exchange(unlocked, locked) != unlocked)) {
       // 1. Java thread, and there is a pending safepoint. Dive into contended locking
       //    immediately without trying anything else, and block.
       // 2. Fast lock fails, dive into contended lock handling.
       contended_lock(allow_block_for_safepoint);
     }
 
-    assert(AtomicAccess::load(&_state) == locked, "must be locked");
-    assert(AtomicAccess::load(&_owner) == nullptr, "must not be owned");
-    DEBUG_ONLY(AtomicAccess::store(&_owner, Thread::current());)
+    assert(_state.load_relaxed() == locked, "must be locked");
+    assert(_owner.load_relaxed() == nullptr, "must not be owned");
+    DEBUG_ONLY(_owner.store_relaxed(Thread::current());)
   }
 
   void unlock() {
-    assert(AtomicAccess::load(&_owner) == Thread::current(), "sanity");
-    DEBUG_ONLY(AtomicAccess::store(&_owner, (Thread*)nullptr);)
+    assert(_owner.load_relaxed() == Thread::current(), "sanity");
+    DEBUG_ONLY(_owner.store_relaxed((Thread*)nullptr);)
     OrderAccess::fence();
-    AtomicAccess::store(&_state, unlocked);
+    _state.store_relaxed(unlocked);
   }
 
   void contended_lock(bool allow_block_for_safepoint);
 
   bool owned_by_self() {
 #ifdef ASSERT
-    return _state == locked && _owner == Thread::current();
+    return _state.load_relaxed() == locked && _owner.load_relaxed() == Thread::current();
 #else
     ShouldNotReachHere();
     return false;
@@ -82,66 +83,46 @@ public:
   }
 };
 
-class ShenandoahLocker : public StackObj {
-private:
-  ShenandoahLock* const _lock;
-public:
-  ShenandoahLocker(ShenandoahLock* lock, bool allow_block_for_safepoint = false) : _lock(lock) {
-    if (_lock != nullptr) {
-      _lock->lock(allow_block_for_safepoint);
-    }
-  }
-
-  ~ShenandoahLocker() {
-    if (_lock != nullptr) {
-      _lock->unlock();
-    }
-  }
-};
-
+// Simple lock using PlatformMonitor
 class ShenandoahSimpleLock {
 private:
   PlatformMonitor   _lock; // native lock
 public:
   ShenandoahSimpleLock();
-
-  virtual void lock();
-  virtual void unlock();
+  void lock(bool allow_block_for_safepoint = false);
+  void unlock();
 };
 
-class ShenandoahReentrantLock : public ShenandoahSimpleLock {
+// templated reentrant lock
+template<typename Lock>
+class ShenandoahReentrantLock : public Lock {
 private:
-  Thread* volatile      _owner;
+  Atomic<Thread*>       _owner;
   uint64_t              _count;
 
 public:
   ShenandoahReentrantLock();
   ~ShenandoahReentrantLock();
 
-  virtual void lock();
-  virtual void unlock();
+  void lock(bool allow_block_for_safepoint = false);
+  void unlock();
 
   // If the lock already owned by this thread
   bool owned_by_self() const ;
 };
 
-class ShenandoahReentrantLocker : public StackObj {
-private:
-  ShenandoahReentrantLock* const _lock;
-
+// template based ShenandoahLocker
+template<typename Lock>
+class ShenandoahLocker : public StackObj {
+  Lock* const _lock;
 public:
-  ShenandoahReentrantLocker(ShenandoahReentrantLock* lock) :
-    _lock(lock) {
-    if (_lock != nullptr) {
-      _lock->lock();
-    }
+  ShenandoahLocker(Lock* lock, bool allow_block_for_safepoint = false) : _lock(lock) {
+    assert(_lock != nullptr, "Must not");
+    _lock->lock(allow_block_for_safepoint);
   }
 
-  ~ShenandoahReentrantLocker() {
-    if (_lock != nullptr) {
-      assert(_lock->owned_by_self(), "Must be owner");
-      _lock->unlock();
-    }
+  ~ShenandoahLocker() {
+    _lock->unlock();
   }
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp
index 0a95ee9f149..ba24e890769 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp
@@ -167,7 +167,7 @@ inline void ShenandoahMark::do_chunked_array_start(ShenandoahObjToScanQueue* q,
 
   if (len <= (int) ObjArrayMarkingStride*2) {
     // A few slices only, process directly
-    array->oop_iterate_range(cl, 0, len);
+    array->oop_iterate_elements_range(cl, 0, len);
   } else {
     int bits = log2i_graceful(len);
     // Compensate for non-power-of-two arrays, cover the array in excess:
@@ -216,7 +216,7 @@ inline void ShenandoahMark::do_chunked_array_start(ShenandoahObjToScanQueue* q,
     // Process the irregular tail, if present
     int from = last_idx;
     if (from < len) {
-      array->oop_iterate_range(cl, from, len);
+      array->oop_iterate_elements_range(cl, from, len);
     }
   }
 }
@@ -226,8 +226,6 @@ inline void ShenandoahMark::do_chunked_array(ShenandoahObjToScanQueue* q, T* cl,
   assert(obj->is_objArray(), "expect object array");
   objArrayOop array = objArrayOop(obj);
 
-  assert (ObjArrayMarkingStride > 0, "sanity");
-
   // Split out tasks, as suggested in ShenandoahMarkTask docs. Avoid pushing tasks that
   // are known to start beyond the array.
   while ((1 << pow) > (int)ObjArrayMarkingStride && (chunk*2 < ShenandoahMarkTask::chunk_size())) {
@@ -248,7 +246,7 @@ inline void ShenandoahMark::do_chunked_array(ShenandoahObjToScanQueue* q, T* cl,
   assert (0 < to && to <= len, "to is sane: %d/%d", to, len);
 #endif
 
-  array->oop_iterate_range(cl, from, to);
+  array->oop_iterate_elements_range(cl, from, to);
 }
 
 template <ShenandoahGenerationType GENERATION>
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
index d774a8dba42..81c62ebbda9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
@@ -30,7 +30,7 @@
 
 ShenandoahMetricsSnapshot::ShenandoahMetricsSnapshot(ShenandoahFreeSet* free_set)
   : _free_set(free_set)
-  , _used_before(free_set->used())
+  , _used_before(free_set->used_not_holding_lock())
   , _if_before(free_set->internal_fragmentation())
   , _ef_before(free_set->external_fragmentation()) {
 }
@@ -38,7 +38,6 @@ ShenandoahMetricsSnapshot::ShenandoahMetricsSnapshot(ShenandoahFreeSet* free_set
 bool ShenandoahMetricsSnapshot::is_good_progress() const {
   // Under the critical threshold?
   const size_t free_actual = _free_set->available();
-  assert(free_actual != ShenandoahFreeSet::FreeSetUnderConstruction, "Avoid this race");
 
   // ShenandoahCriticalFreeThreshold is expressed as a percentage.  We multiply this percentage by 1/100th
   // of the soft max capacity to determine whether the available memory within the mutator partition of the
@@ -52,7 +51,7 @@ bool ShenandoahMetricsSnapshot::is_good_progress() const {
   }
 
   // Freed up enough?
-  const size_t used_after = _free_set->used();
+  const size_t used_after = _free_set->used_not_holding_lock();
   const size_t progress_actual   = (_used_before > used_after) ? _used_before - used_after : 0;
   const size_t progress_expected = ShenandoahHeapRegion::region_size_bytes();
   const bool prog_used = progress_actual >= progress_expected;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp
index 55cec63f045..594ad614d90 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp
@@ -241,7 +241,7 @@ void ShenandoahNMethodTable::register_nmethod(nmethod* nm) {
     assert(nm == data->nm(), "Must be same nmethod");
     // Prevent updating a nmethod while concurrent iteration is in progress.
     wait_until_concurrent_iteration_done();
-    ShenandoahReentrantLocker data_locker(data->lock());
+    ShenandoahNMethodLocker data_locker(data->lock());
     data->update();
   } else {
     // For a new nmethod, we can safely append it to the list, because
@@ -433,8 +433,8 @@ void ShenandoahNMethodTableSnapshot::parallel_nmethods_do(NMethodClosure *f) {
   ShenandoahNMethod** const list = _list->list();
 
   size_t max = (size_t)_limit;
-  while (_claimed < max) {
-    size_t cur = AtomicAccess::fetch_then_add(&_claimed, stride, memory_order_relaxed);
+  while (_claimed.load_relaxed() < max) {
+    size_t cur = _claimed.fetch_then_add(stride, memory_order_relaxed);
     size_t start = cur;
     size_t end = MIN2(cur + stride, max);
     if (start >= max) break;
@@ -457,8 +457,8 @@ void ShenandoahNMethodTableSnapshot::concurrent_nmethods_do(NMethodClosure* cl)
 
   ShenandoahNMethod** list = _list->list();
   size_t max = (size_t)_limit;
-  while (_claimed < max) {
-    size_t cur = AtomicAccess::fetch_then_add(&_claimed, stride, memory_order_relaxed);
+  while (_claimed.load_relaxed() < max) {
+    size_t cur = _claimed.fetch_then_add(stride, memory_order_relaxed);
     size_t start = cur;
     size_t end = MIN2(cur + stride, max);
     if (start >= max) break;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp
index 5387870c9dc..2686b4f4985 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp
@@ -30,8 +30,13 @@
 #include "gc/shenandoah/shenandoahLock.hpp"
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/growableArray.hpp"
 
+// Use ShenandoahReentrantLock as ShenandoahNMethodLock
+typedef ShenandoahReentrantLock<ShenandoahSimpleLock> ShenandoahNMethodLock;
+typedef ShenandoahLocker<ShenandoahNMethodLock>       ShenandoahNMethodLocker;
+
 // ShenandoahNMethod tuple records the internal locations of oop slots within reclocation stream in
 // the nmethod. This allows us to quickly scan the oops without doing the nmethod-internal scans,
 // that sometimes involves parsing the machine code. Note it does not record the oops themselves,
@@ -43,16 +48,16 @@ private:
   int                     _oops_count;
   bool                    _has_non_immed_oops;
   bool                    _unregistered;
-  ShenandoahReentrantLock _lock;
-  ShenandoahReentrantLock _ic_lock;
+  ShenandoahNMethodLock   _lock;
+  ShenandoahNMethodLock   _ic_lock;
 
 public:
   ShenandoahNMethod(nmethod *nm, GrowableArray<oop*>& oops, bool has_non_immed_oops);
   ~ShenandoahNMethod();
 
   inline nmethod* nm() const;
-  inline ShenandoahReentrantLock* lock();
-  inline ShenandoahReentrantLock* ic_lock();
+  inline ShenandoahNMethodLock* lock();
+  inline ShenandoahNMethodLock* ic_lock();
   inline void oops_do(OopClosure* oops, bool fix_relocations = false);
   // Update oops when the nmethod is re-registered
   void update();
@@ -60,8 +65,8 @@ public:
   inline bool is_unregistered() const;
 
   static ShenandoahNMethod* for_nmethod(nmethod* nm);
-  static inline ShenandoahReentrantLock* lock_for_nmethod(nmethod* nm);
-  static inline ShenandoahReentrantLock* ic_lock_for_nmethod(nmethod* nm);
+  static inline ShenandoahNMethodLock* lock_for_nmethod(nmethod* nm);
+  static inline ShenandoahNMethodLock* ic_lock_for_nmethod(nmethod* nm);
 
   static void heal_nmethod(nmethod* nm);
   static inline void heal_nmethod_metadata(ShenandoahNMethod* nmethod_data);
@@ -115,7 +120,7 @@ private:
   int                         _limit;
 
   shenandoah_padding(0);
-  volatile size_t       _claimed;
+  Atomic<size_t>            _claimed;
   shenandoah_padding(1);
 
 public:
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp
index 6758298675b..ef9e347b821 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.inline.hpp
@@ -35,11 +35,11 @@ nmethod* ShenandoahNMethod::nm() const {
   return _nm;
 }
 
-ShenandoahReentrantLock* ShenandoahNMethod::lock() {
+ShenandoahNMethodLock* ShenandoahNMethod::lock() {
   return &_lock;
 }
 
-ShenandoahReentrantLock* ShenandoahNMethod::ic_lock() {
+ShenandoahNMethodLock* ShenandoahNMethod::ic_lock() {
   return &_ic_lock;
 }
 
@@ -85,11 +85,11 @@ void ShenandoahNMethod::attach_gc_data(nmethod* nm, ShenandoahNMethod* gc_data)
   nm->set_gc_data<ShenandoahNMethod>(gc_data);
 }
 
-ShenandoahReentrantLock* ShenandoahNMethod::lock_for_nmethod(nmethod* nm) {
+ShenandoahNMethodLock* ShenandoahNMethod::lock_for_nmethod(nmethod* nm) {
   return gc_data(nm)->lock();
 }
 
-ShenandoahReentrantLock* ShenandoahNMethod::ic_lock_for_nmethod(nmethod* nm) {
+ShenandoahNMethodLock* ShenandoahNMethod::ic_lock_for_nmethod(nmethod* nm) {
   return gc_data(nm)->ic_lock();
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
index a44a831ef3d..ff441a0c868 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
@@ -128,8 +128,6 @@ bool ShenandoahOldGC::collect(GCCause::Cause cause) {
   // the space. This would be the last action if there is nothing to evacuate.
   entry_cleanup_early();
 
-  heap->free_set()->log_status_under_lock();
-
   assert(!heap->is_concurrent_strong_root_in_progress(), "No evacuations during old gc.");
 
   // We must execute this vm operation if we completed final mark. We cannot
@@ -138,7 +136,10 @@ bool ShenandoahOldGC::collect(GCCause::Cause cause) {
   // collection.
   heap->concurrent_final_roots();
 
-  size_t allocation_runway = heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(0);
-  heap->compute_old_generation_balance(allocation_runway, 0);
+  // After concurrent old marking finishes, we reclaim immediate garbage. Further, we may also want to expand OLD in order
+  // to make room for anticipated promotions and/or for mixed evacuations.  Mixed evacuations are especially likely to
+  // follow the end of OLD marking.
+  heap->rebuild_free_set_within_phase();
+  heap->free_set()->log_status_under_lock();
   return true;
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index c7cf013d034..4fda65b4030 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -63,7 +63,7 @@ private:
   uint                    _nworkers;
   ShenandoahHeapRegion**  _coalesce_and_fill_region_array;
   uint                    _coalesce_and_fill_region_count;
-  volatile bool           _is_preempted;
+  Atomic<bool>            _is_preempted;
 
 public:
   ShenandoahConcurrentCoalesceAndFillTask(uint nworkers,
@@ -88,7 +88,7 @@ public:
 
       if (!r->oop_coalesce_and_fill(true)) {
         // Coalesce and fill has been preempted
-        AtomicAccess::store(&_is_preempted, true);
+        _is_preempted.store_relaxed(true);
         return;
       }
     }
@@ -96,7 +96,7 @@ public:
 
   // Value returned from is_completed() is only valid after all worker thread have terminated.
   bool is_completed() {
-    return !AtomicAccess::load(&_is_preempted);
+    return !_is_preempted.load_relaxed();
   }
 };
 
@@ -147,23 +147,23 @@ void ShenandoahOldGeneration::augment_promoted_reserve(size_t increment) {
 
 void ShenandoahOldGeneration::reset_promoted_expended() {
   shenandoah_assert_heaplocked_or_safepoint();
-  AtomicAccess::store(&_promoted_expended, static_cast<size_t>(0));
-  AtomicAccess::store(&_promotion_failure_count, static_cast<size_t>(0));
-  AtomicAccess::store(&_promotion_failure_words, static_cast<size_t>(0));
+  _promoted_expended.store_relaxed(0);
+  _promotion_failure_count.store_relaxed(0);
+  _promotion_failure_words.store_relaxed(0);
 }
 
 size_t ShenandoahOldGeneration::expend_promoted(size_t increment) {
   shenandoah_assert_heaplocked_or_safepoint();
   assert(get_promoted_expended() + increment <= get_promoted_reserve(), "Do not expend more promotion than budgeted");
-  return AtomicAccess::add(&_promoted_expended, increment);
+  return _promoted_expended.add_then_fetch(increment);
 }
 
 size_t ShenandoahOldGeneration::unexpend_promoted(size_t decrement) {
-  return AtomicAccess::sub(&_promoted_expended, decrement);
+  return _promoted_expended.sub_then_fetch(decrement);
 }
 
 size_t ShenandoahOldGeneration::get_promoted_expended() const {
-  return AtomicAccess::load(&_promoted_expended);
+  return _promoted_expended.load_relaxed();
 }
 
 bool ShenandoahOldGeneration::can_allocate(const ShenandoahAllocRequest &req) const {
@@ -412,9 +412,12 @@ void ShenandoahOldGeneration::prepare_regions_and_collection_set(bool concurrent
     ShenandoahGCPhase phase(concurrent ?
         ShenandoahPhaseTimings::final_rebuild_freeset :
         ShenandoahPhaseTimings::degen_gc_final_rebuild_freeset);
+    ShenandoahFreeSet* free_set = heap->free_set();
     ShenandoahHeapLocker locker(heap->lock());
-    size_t young_trash_regions, old_trash_regions;
-    size_t first_old, last_old, num_old;
+
+    // This is completion of old-gen marking.  We rebuild in order to reclaim immediate garbage and to
+    // prepare for subsequent mixed evacuations.
+    size_t young_trash_regions, old_trash_regions, first_old, last_old, num_old;
     heap->free_set()->prepare_to_rebuild(young_trash_regions, old_trash_regions, first_old, last_old, num_old);
     // At the end of old-gen, we may find that we have reclaimed immediate garbage, allowing a longer allocation runway.
     // We may also find that we have accumulated canddiate regions for mixed evacuation.  If so, we will want to expand
@@ -424,8 +427,7 @@ void ShenandoahOldGeneration::prepare_regions_and_collection_set(bool concurrent
     ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
     size_t allocation_runway =
       gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_trash_regions);
-    gen_heap->compute_old_generation_balance(allocation_runway, old_trash_regions);
-
+    gen_heap->compute_old_generation_balance(allocation_runway, old_trash_regions, young_trash_regions);
     heap->free_set()->finish_rebuild(young_trash_regions, old_trash_regions, num_old);
   }
 }
@@ -580,8 +582,8 @@ void ShenandoahOldGeneration::handle_failed_evacuation() {
 }
 
 void ShenandoahOldGeneration::handle_failed_promotion(Thread* thread, size_t size) {
-  AtomicAccess::inc(&_promotion_failure_count);
-  AtomicAccess::add(&_promotion_failure_words, size);
+  _promotion_failure_count.add_then_fetch(1UL);
+  _promotion_failure_words.add_then_fetch(size);
 
   LogTarget(Debug, gc, plab) lt;
   LogStream ls(lt);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
index 90c1458ac97..5ebad461f3c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
@@ -64,10 +64,10 @@ private:
   // is therefore always accessed through atomic operations. This is increased when a
   // PLAB is allocated for promotions. The value is decreased by the amount of memory
   // remaining in a PLAB when it is retired.
-  size_t _promoted_expended;
+  Atomic<size_t> _promoted_expended;
 
-  // Represents the quantity of live bytes we expect to promote during the next evacuation
-  // cycle. This value is used by the young heuristic to trigger mixed collections.
+  // Represents the quantity of live bytes we expect to promote during the next GC cycle, either by
+  // evacuation or by promote-in-place.  This value is used by the young heuristic to trigger mixed collections.
   // It is also used when computing the optimum size for the old generation.
   size_t _promotion_potential;
 
@@ -78,8 +78,8 @@ private:
 
   // Keep track of the number and size of promotions that failed. Perhaps we should use this to increase
   // the size of the old generation for the next collection cycle.
-  size_t _promotion_failure_count;
-  size_t _promotion_failure_words;
+  Atomic<size_t> _promotion_failure_count;
+  Atomic<size_t> _promotion_failure_words;
 
   // During construction of the collection set, we keep track of regions that are eligible
   // for promotion in place. These fields track the count of those humongous and regular regions.
@@ -126,8 +126,8 @@ public:
   size_t get_promoted_expended() const;
 
   // Return the count and size (in words) of failed promotions since the last reset
-  size_t get_promotion_failed_count() const { return AtomicAccess::load(&_promotion_failure_count); }
-  size_t get_promotion_failed_words() const { return AtomicAccess::load(&_promotion_failure_words); }
+  size_t get_promotion_failed_count() const { return _promotion_failure_count.load_relaxed(); }
+  size_t get_promotion_failed_words() const { return _promotion_failure_words.load_relaxed(); }
 
   // Test if there is enough memory reserved for this promotion
   bool can_promote(size_t requested_bytes) const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
index 7187431c8f8..37e9729b7ff 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.cpp
@@ -504,7 +504,7 @@ void ShenandoahReferenceProcessor::process_references(ShenandoahRefProcThreadLoc
   if (!CompressedOops::is_null(*list)) {
     oop head = lrb(CompressedOops::decode_not_null(*list));
     shenandoah_assert_not_in_cset_except(&head, head, ShenandoahHeap::heap()->cancelled_gc() || !ShenandoahLoadRefBarrier);
-    oop prev = AtomicAccess::xchg(&_pending_list, head);
+    oop prev = _pending_list.exchange(head);
     set_oop_field(p, prev);
     if (prev == nullptr) {
       // First to prepend to list, record tail
@@ -519,14 +519,14 @@ void ShenandoahReferenceProcessor::process_references(ShenandoahRefProcThreadLoc
 void ShenandoahReferenceProcessor::work() {
   // Process discovered references
   uint max_workers = ShenandoahHeap::heap()->max_workers();
-  uint worker_id = AtomicAccess::add(&_iterate_discovered_list_id, 1U, memory_order_relaxed) - 1;
+  uint worker_id = _iterate_discovered_list_id.fetch_then_add(1U, memory_order_relaxed);
   while (worker_id < max_workers) {
     if (UseCompressedOops) {
       process_references<narrowOop>(_ref_proc_thread_locals[worker_id], worker_id);
     } else {
       process_references<oop>(_ref_proc_thread_locals[worker_id], worker_id);
     }
-    worker_id = AtomicAccess::add(&_iterate_discovered_list_id, 1U, memory_order_relaxed) - 1;
+    worker_id = _iterate_discovered_list_id.fetch_then_add(1U, memory_order_relaxed);
   }
 }
 
@@ -559,7 +559,7 @@ public:
 
 void ShenandoahReferenceProcessor::process_references(ShenandoahPhaseTimings::Phase phase, WorkerThreads* workers, bool concurrent) {
 
-  AtomicAccess::release_store_fence(&_iterate_discovered_list_id, 0U);
+  _iterate_discovered_list_id.release_store_fence(0U);
 
   // Process discovered lists
   ShenandoahReferenceProcessorTask task(phase, concurrent, this);
@@ -576,7 +576,7 @@ void ShenandoahReferenceProcessor::process_references(ShenandoahPhaseTimings::Ph
 
 void ShenandoahReferenceProcessor::enqueue_references_locked() {
   // Prepend internal pending list to external pending list
-  shenandoah_assert_not_in_cset_except(&_pending_list, _pending_list, ShenandoahHeap::heap()->cancelled_gc() || !ShenandoahLoadRefBarrier);
+  shenandoah_assert_not_in_cset_except(&_pending_list, _pending_list.load_relaxed(), ShenandoahHeap::heap()->cancelled_gc() || !ShenandoahLoadRefBarrier);
 
   // During reference processing, we maintain a local list of references that are identified by
   //   _pending_list and _pending_list_tail.  _pending_list_tail points to the next field of the last Reference object on
@@ -589,7 +589,7 @@ void ShenandoahReferenceProcessor::enqueue_references_locked() {
   //  2. Overwriting the next field of the last Reference on my local list to point at the previous head of the
   //     global Universe::_reference_pending_list
 
-  oop former_head_of_global_list = Universe::swap_reference_pending_list(_pending_list);
+  oop former_head_of_global_list = Universe::swap_reference_pending_list(_pending_list.load_relaxed());
   if (UseCompressedOops) {
     set_oop_field<narrowOop>(reinterpret_cast<narrowOop*>(_pending_list_tail), former_head_of_global_list);
   } else {
@@ -598,7 +598,7 @@ void ShenandoahReferenceProcessor::enqueue_references_locked() {
 }
 
 void ShenandoahReferenceProcessor::enqueue_references(bool concurrent) {
-  if (_pending_list == nullptr) {
+  if (_pending_list.load_relaxed() == nullptr) {
     // Nothing to enqueue
     return;
   }
@@ -616,7 +616,7 @@ void ShenandoahReferenceProcessor::enqueue_references(bool concurrent) {
   }
 
   // Reset internal pending list
-  _pending_list = nullptr;
+  _pending_list.store_relaxed(nullptr);
   _pending_list_tail = &_pending_list;
 }
 
@@ -640,9 +640,9 @@ void ShenandoahReferenceProcessor::abandon_partial_discovery() {
       clean_discovered_list<oop>(_ref_proc_thread_locals[index].discovered_list_addr<oop>());
     }
   }
-  if (_pending_list != nullptr) {
-    oop pending = _pending_list;
-    _pending_list = nullptr;
+  if (_pending_list.load_relaxed() != nullptr) {
+    oop pending = _pending_list.load_relaxed();
+    _pending_list.store_relaxed(nullptr);
     if (UseCompressedOops) {
       narrowOop* list = reference_discovered_addr<narrowOop>(pending);
       clean_discovered_list<narrowOop>(list);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
index 14adb924585..01c79029132 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
@@ -31,6 +31,7 @@
 #include "gc/shared/referenceProcessorStats.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 
 class ShenandoahMarkRefsSuperClosure;
 class WorkerThreads;
@@ -133,10 +134,10 @@ private:
 
   ShenandoahRefProcThreadLocal* _ref_proc_thread_locals;
 
-  oop _pending_list;
+  Atomic<oop> _pending_list;
   void* _pending_list_tail; // T*
 
-  volatile uint _iterate_discovered_list_id;
+  Atomic<uint> _iterate_discovered_list_id;
 
   ReferenceProcessorStats _stats;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index a3c96a7d53b..05af25f13ad 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -243,8 +243,7 @@ HeapWord* ShenandoahCardCluster::first_object_start(const size_t card_index, con
 #ifdef ASSERT
   assert(ShenandoahHeap::heap()->mode()->is_generational(), "Do not use in non-generational mode");
   assert(region->is_old(), "Do not use for young regions");
-  // For HumongousRegion:s it's more efficient to jump directly to the
-  // start region.
+  // For humongous regions it's more efficient to jump directly to the start region.
   assert(!region->is_humongous(), "Use region->humongous_start_region() instead");
 #endif
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
index 12c01ad5c90..e23187a5d3f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
@@ -27,7 +27,7 @@
 
 #include "gc/shenandoah/shenandoahPadding.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 
 typedef int32_t ShenandoahSharedValue;
 typedef struct ShenandoahSharedFlag {
@@ -37,7 +37,7 @@ typedef struct ShenandoahSharedFlag {
   };
 
   shenandoah_padding(0);
-  volatile ShenandoahSharedValue value;
+  Atomic<ShenandoahSharedValue> value;
   shenandoah_padding(1);
 
   ShenandoahSharedFlag() {
@@ -45,19 +45,19 @@ typedef struct ShenandoahSharedFlag {
   }
 
   void set() {
-    AtomicAccess::release_store_fence(&value, (ShenandoahSharedValue)SET);
+    value.release_store_fence((ShenandoahSharedValue)SET);
   }
 
   void unset() {
-    AtomicAccess::release_store_fence(&value, (ShenandoahSharedValue)UNSET);
+    value.release_store_fence((ShenandoahSharedValue)UNSET);
   }
 
   bool is_set() const {
-    return AtomicAccess::load_acquire(&value) == SET;
+    return value.load_acquire() == SET;
   }
 
   bool is_unset() const {
-    return AtomicAccess::load_acquire(&value) == UNSET;
+    return value.load_acquire() == UNSET;
   }
 
   void set_cond(bool val) {
@@ -72,7 +72,7 @@ typedef struct ShenandoahSharedFlag {
     if (is_set()) {
       return false;
     }
-    ShenandoahSharedValue old = AtomicAccess::cmpxchg(&value, (ShenandoahSharedValue)UNSET, (ShenandoahSharedValue)SET);
+    ShenandoahSharedValue old = value.compare_exchange((ShenandoahSharedValue)UNSET, (ShenandoahSharedValue)SET);
     return old == UNSET; // success
   }
 
@@ -80,17 +80,13 @@ typedef struct ShenandoahSharedFlag {
     if (!is_set()) {
       return false;
     }
-    ShenandoahSharedValue old = AtomicAccess::cmpxchg(&value, (ShenandoahSharedValue)SET, (ShenandoahSharedValue)UNSET);
+    ShenandoahSharedValue old = value.compare_exchange((ShenandoahSharedValue)SET, (ShenandoahSharedValue)UNSET);
     return old == SET; // success
   }
 
-  volatile ShenandoahSharedValue* addr_of() {
-    return &value;
-  }
-
 private:
   volatile ShenandoahSharedValue* operator&() {
-    fatal("Use addr_of() instead");
+    fatal("Not supported");
     return nullptr;
   }
 
@@ -105,7 +101,7 @@ private:
 
 typedef struct ShenandoahSharedBitmap {
   shenandoah_padding(0);
-  volatile ShenandoahSharedValue value;
+  Atomic<ShenandoahSharedValue> value;
   shenandoah_padding(1);
 
   ShenandoahSharedBitmap() {
@@ -116,7 +112,7 @@ typedef struct ShenandoahSharedBitmap {
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
     ShenandoahSharedValue mask_val = (ShenandoahSharedValue) mask;
     while (true) {
-      ShenandoahSharedValue ov = AtomicAccess::load_acquire(&value);
+      ShenandoahSharedValue ov = value.load_acquire();
       // We require all bits of mask_val to be set
       if ((ov & mask_val) == mask_val) {
         // already set
@@ -124,7 +120,7 @@ typedef struct ShenandoahSharedBitmap {
       }
 
       ShenandoahSharedValue nv = ov | mask_val;
-      if (AtomicAccess::cmpxchg(&value, ov, nv) == ov) {
+      if (value.compare_exchange(ov, nv) == ov) {
         // successfully set: if value returned from cmpxchg equals ov, then nv has overwritten value.
         return;
       }
@@ -135,14 +131,14 @@ typedef struct ShenandoahSharedBitmap {
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
     ShenandoahSharedValue mask_val = (ShenandoahSharedValue) mask;
     while (true) {
-      ShenandoahSharedValue ov = AtomicAccess::load_acquire(&value);
+      ShenandoahSharedValue ov = value.load_acquire();
       if ((ov & mask_val) == 0) {
         // already unset
         return;
       }
 
       ShenandoahSharedValue nv = ov & ~mask_val;
-      if (AtomicAccess::cmpxchg(&value, ov, nv) == ov) {
+      if (value.compare_exchange(ov, nv) == ov) {
         // successfully unset
         return;
       }
@@ -150,7 +146,7 @@ typedef struct ShenandoahSharedBitmap {
   }
 
   void clear() {
-    AtomicAccess::release_store_fence(&value, (ShenandoahSharedValue)0);
+    value.release_store_fence((ShenandoahSharedValue)0);
   }
 
   // Returns true iff any bit set in mask is set in this.value.
@@ -161,18 +157,18 @@ typedef struct ShenandoahSharedBitmap {
   // Returns true iff all bits set in mask are set in this.value.
   bool is_set_exactly(uint mask) const {
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
-    uint uvalue = AtomicAccess::load_acquire(&value);
+    uint uvalue = value.load_acquire();
     return (uvalue & mask) == mask;
   }
 
   // Returns true iff all bits set in mask are unset in this.value.
   bool is_unset(uint mask) const {
     assert (mask < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
-    return (AtomicAccess::load_acquire(&value) & (ShenandoahSharedValue) mask) == 0;
+    return (value.load_acquire() & (ShenandoahSharedValue) mask) == 0;
   }
 
   bool is_clear() const {
-    return (AtomicAccess::load_acquire(&value)) == 0;
+    return (value.load_acquire()) == 0;
   }
 
   void set_cond(uint mask, bool val) {
@@ -183,17 +179,13 @@ typedef struct ShenandoahSharedBitmap {
     }
   }
 
-  volatile ShenandoahSharedValue* addr_of() {
-    return &value;
-  }
-
   ShenandoahSharedValue raw_value() const {
-    return value;
+    return value.load_relaxed();
   }
 
 private:
   volatile ShenandoahSharedValue* operator&() {
-    fatal("Use addr_of() instead");
+    fatal("Not supported");
     return nullptr;
   }
 
@@ -210,42 +202,36 @@ template<class T>
 struct ShenandoahSharedEnumFlag {
   typedef uint32_t EnumValueType;
   shenandoah_padding(0);
-  volatile EnumValueType value;
+  Atomic<EnumValueType> value;
   shenandoah_padding(1);
 
-  ShenandoahSharedEnumFlag() {
-    value = 0;
-  }
+  ShenandoahSharedEnumFlag() : value(0) {}
 
   void set(T v) {
     assert (v >= 0, "sanity");
     assert (v < (sizeof(EnumValueType) * CHAR_MAX), "sanity");
-    AtomicAccess::release_store_fence(&value, (EnumValueType)v);
+    value.release_store_fence((EnumValueType)v);
   }
 
   T get() const {
-    return (T)AtomicAccess::load_acquire(&value);
+    return (T)value.load_acquire();
   }
 
   T cmpxchg(T new_value, T expected) {
     assert (new_value >= 0, "sanity");
     assert (new_value < (sizeof(EnumValueType) * CHAR_MAX), "sanity");
-    return (T)AtomicAccess::cmpxchg(&value, (EnumValueType)expected, (EnumValueType)new_value);
+    return (T)value.compare_exchange((EnumValueType)expected, (EnumValueType)new_value);
   }
 
   T xchg(T new_value) {
     assert (new_value >= 0, "sanity");
     assert (new_value < (sizeof(EnumValueType) * CHAR_MAX), "sanity");
-    return (T)AtomicAccess::xchg(&value, (EnumValueType)new_value);
-  }
-
-  volatile EnumValueType* addr_of() {
-    return &value;
+    return (T)value.exchange((EnumValueType)new_value);
   }
 
 private:
   volatile T* operator&() {
-    fatal("Use addr_of() instead");
+    fatal("Not supported");
     return nullptr;
   }
 
@@ -260,7 +246,7 @@ private:
 
 typedef struct ShenandoahSharedSemaphore {
   shenandoah_padding(0);
-  volatile ShenandoahSharedValue value;
+  Atomic<ShenandoahSharedValue> value;
   shenandoah_padding(1);
 
   static uint max_tokens() {
@@ -269,17 +255,17 @@ typedef struct ShenandoahSharedSemaphore {
 
   ShenandoahSharedSemaphore(uint tokens) {
     assert(tokens <= max_tokens(), "sanity");
-    AtomicAccess::release_store_fence(&value, (ShenandoahSharedValue)tokens);
+    value.release_store_fence((ShenandoahSharedValue)tokens);
   }
 
   bool try_acquire() {
     while (true) {
-      ShenandoahSharedValue ov = AtomicAccess::load_acquire(&value);
+      ShenandoahSharedValue ov = value.load_acquire();
       if (ov == 0) {
         return false;
       }
       ShenandoahSharedValue nv = ov - 1;
-      if (AtomicAccess::cmpxchg(&value, ov, nv) == ov) {
+      if (value.compare_exchange(ov, nv) == ov) {
         // successfully set
         return true;
       }
@@ -287,7 +273,7 @@ typedef struct ShenandoahSharedSemaphore {
   }
 
   void claim_all() {
-    AtomicAccess::release_store_fence(&value, (ShenandoahSharedValue)0);
+    value.release_store_fence((ShenandoahSharedValue)0);
   }
 
 } ShenandoahSharedSemaphore;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
index b248fab7958..ac7fe1f9a3a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
@@ -80,7 +80,7 @@ public:
   virtual bool has_dead_oop(nmethod* nm) const {
     assert(ShenandoahHeap::heap()->is_concurrent_weak_root_in_progress(), "Only for this phase");
     ShenandoahNMethod* data = ShenandoahNMethod::gc_data(nm);
-    ShenandoahReentrantLocker locker(data->lock());
+    ShenandoahNMethodLocker locker(data->lock());
     ShenandoahIsUnloadingOopClosure cl;
     data->oops_do(&cl);
     return  cl.is_unloading();
@@ -90,14 +90,14 @@ public:
 class ShenandoahCompiledICProtectionBehaviour : public CompiledICProtectionBehaviour {
 public:
   virtual bool lock(nmethod* nm) {
-    ShenandoahReentrantLock* const lock = ShenandoahNMethod::ic_lock_for_nmethod(nm);
+    ShenandoahNMethodLock* const lock = ShenandoahNMethod::ic_lock_for_nmethod(nm);
     assert(lock != nullptr, "Not yet registered?");
     lock->lock();
     return true;
   }
 
   virtual void unlock(nmethod* nm) {
-    ShenandoahReentrantLock* const lock = ShenandoahNMethod::ic_lock_for_nmethod(nm);
+    ShenandoahNMethodLock* const lock = ShenandoahNMethod::ic_lock_for_nmethod(nm);
     assert(lock != nullptr, "Not yet registered?");
     lock->unlock();
   }
@@ -107,7 +107,7 @@ public:
       return true;
     }
 
-    ShenandoahReentrantLock* const lock = ShenandoahNMethod::ic_lock_for_nmethod(nm);
+    ShenandoahNMethodLock* const lock = ShenandoahNMethod::ic_lock_for_nmethod(nm);
     assert(lock != nullptr, "Not yet registered?");
     return lock->owned_by_self();
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index 543df2422c0..225339a3219 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -42,7 +42,7 @@
 #include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/compressedOops.inline.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/threads.hpp"
 #include "utilities/align.hpp"
@@ -110,15 +110,15 @@ private:
   void do_oop_work(T* p) {
     T o = RawAccess<>::oop_load(p);
     if (!CompressedOops::is_null(o)) {
-      oop obj = CompressedOops::decode_not_null(o);
+      // Basic verification should happen before we touch anything else.
+      // For performance reasons, only fully verify non-marked field values.
+      // We are here when the host object for *p is already marked.
+      oop obj = CompressedOops::decode_raw_not_null(o);
+      verify_oop_at_basic(p, obj);
+
       if (is_instance_ref_klass(ShenandoahForwarding::klass(obj))) {
         obj = ShenandoahForwarding::get_forwardee(obj);
       }
-      // Single threaded verification can use faster non-atomic stack and bitmap
-      // methods.
-      //
-      // For performance reasons, only fully verify non-marked field values.
-      // We are here when the host object for *p is already marked.
       if (in_generation(obj) && _map->par_mark(obj)) {
         verify_oop_at(p, obj);
         _stack->push(ShenandoahVerifierTask(obj));
@@ -131,7 +131,7 @@ private:
     return _generation->contains(region);
   }
 
-  void verify_oop(oop obj) {
+  void verify_oop(oop obj, bool basic = false) {
     // Perform consistency checks with gradually decreasing safety level. This guarantees
     // that failure report would not try to touch something that was not yet verified to be
     // safe to process.
@@ -174,17 +174,21 @@ private:
         }
       }
 
+      check(ShenandoahAsserts::_safe_unknown, obj, obj_reg->is_active(),
+           "Object should be in active region");
+
       // ------------ obj is safe at this point --------------
 
-      check(ShenandoahAsserts::_safe_oop, obj, obj_reg->is_active(),
-            "Object should be in active region");
+      if (basic) {
+        return;
+      }
 
       switch (_options._verify_liveness) {
         case ShenandoahVerifier::_verify_liveness_disable:
           // skip
           break;
         case ShenandoahVerifier::_verify_liveness_complete:
-          AtomicAccess::add(&_ld[obj_reg->index()], (uint) ShenandoahForwarding::size(obj), memory_order_relaxed);
+          _ld[obj_reg->index()].add_then_fetch((uint) ShenandoahForwarding::size(obj), memory_order_relaxed);
           // fallthrough for fast failure for un-live regions:
         case ShenandoahVerifier::_verify_liveness_conservative:
           check(ShenandoahAsserts::_safe_oop, obj, obj_reg->has_live() ||
@@ -331,6 +335,18 @@ public:
     _interior_loc = nullptr;
   }
 
+  /**
+   * Verify object with known interior reference, with only basic verification.
+   * @param p interior reference where the object is referenced from; can be off-heap
+   * @param obj verified object
+   */
+  template <class T>
+  void verify_oop_at_basic(T* p, oop obj) {
+    _interior_loc = p;
+    verify_oop(obj, /* basic = */ true);
+    _interior_loc = nullptr;
+  }
+
   /**
    * Verify object without known interior reference.
    * Useful when picking up the object at known offset in heap,
@@ -420,7 +436,14 @@ public:
 
   // span is the total memory affiliated with these stats (some of which is in use and other is available)
   size_t span() const { return _regions * ShenandoahHeapRegion::region_size_bytes(); }
-  size_t non_trashed_span() const { return (_regions - _trashed_regions) * ShenandoahHeapRegion::region_size_bytes(); }
+  size_t non_trashed_span() const {
+    assert(_regions >= _trashed_regions, "sanity");
+    return (_regions - _trashed_regions) * ShenandoahHeapRegion::region_size_bytes();
+  }
+  size_t non_trashed_committed() const {
+    assert(_committed >= _trashed_regions * ShenandoahHeapRegion::region_size_bytes(), "sanity");
+    return _committed - (_trashed_regions * ShenandoahHeapRegion::region_size_bytes());
+  }
 };
 
 class ShenandoahGenerationStatsClosure : public ShenandoahHeapRegionClosure {
@@ -586,7 +609,7 @@ private:
   ShenandoahHeap* _heap;
   ShenandoahLivenessData* _ld;
   MarkBitMap* _bitmap;
-  volatile size_t _processed;
+  Atomic<size_t> _processed;
   ShenandoahGeneration* _generation;
 
 public:
@@ -605,7 +628,7 @@ public:
     _generation(generation) {};
 
   size_t processed() const {
-    return _processed;
+    return _processed.load_relaxed();
   }
 
   void work(uint worker_id) override {
@@ -641,7 +664,7 @@ public:
       }
     }
 
-    AtomicAccess::add(&_processed, processed, memory_order_relaxed);
+    _processed.add_then_fetch(processed, memory_order_relaxed);
   }
 };
 
@@ -662,8 +685,8 @@ class ShenandoahVerifierMarkedRegionTask : public WorkerTask {
   ShenandoahHeap *_heap;
   MarkBitMap* _bitmap;
   ShenandoahLivenessData* _ld;
-  volatile size_t _claimed;
-  volatile size_t _processed;
+  Atomic<size_t> _claimed;
+  Atomic<size_t> _processed;
   ShenandoahGeneration* _generation;
 
 public:
@@ -683,7 +706,7 @@ public:
           _generation(generation) {}
 
   size_t processed() {
-    return AtomicAccess::load(&_processed);
+    return _processed.load_relaxed();
   }
 
   void work(uint worker_id) override {
@@ -698,7 +721,7 @@ public:
                                   _options);
 
     while (true) {
-      size_t v = AtomicAccess::fetch_then_add(&_claimed, 1u, memory_order_relaxed);
+      size_t v = _claimed.fetch_then_add(1u, memory_order_relaxed);
       if (v < _heap->num_regions()) {
         ShenandoahHeapRegion* r = _heap->get_region(v);
         if (!in_generation(r)) {
@@ -726,7 +749,7 @@ public:
     if (_generation->complete_marking_context()->is_marked(cast_to_oop(obj))) {
       verify_and_follow(obj, stack, cl, &processed);
     }
-    AtomicAccess::add(&_processed, processed, memory_order_relaxed);
+    _processed.add_then_fetch(processed, memory_order_relaxed);
   }
 
   virtual void work_regular(ShenandoahHeapRegion *r, ShenandoahVerifierStack &stack, ShenandoahVerifyOopClosure &cl) {
@@ -759,7 +782,7 @@ public:
       }
     }
 
-    AtomicAccess::add(&_processed, processed, memory_order_relaxed);
+    _processed.add_then_fetch(processed, memory_order_relaxed);
   }
 
   void verify_and_follow(HeapWord *addr, ShenandoahVerifierStack &stack, ShenandoahVerifyOopClosure &cl, size_t *processed) {
@@ -1028,12 +1051,12 @@ void ShenandoahVerifier::verify_at_safepoint(ShenandoahGeneration* generation,
       if (r->is_humongous()) {
         // For humongous objects, test if start region is marked live, and if so,
         // all humongous regions in that chain have live data equal to their "used".
-        juint start_live = AtomicAccess::load(&ld[r->humongous_start_region()->index()]);
+        juint start_live = ld[r->humongous_start_region()->index()].load_relaxed();
         if (start_live > 0) {
           verf_live = (juint)(r->used() / HeapWordSize);
         }
       } else {
-        verf_live = AtomicAccess::load(&ld[r->index()]);
+        verf_live = ld[r->index()].load_relaxed();
       }
 
       size_t reg_live = r->get_live_data_words();
@@ -1225,7 +1248,9 @@ private:
   void do_oop_work(T* p) {
     T o = RawAccess<>::oop_load(p);
     if (!CompressedOops::is_null(o)) {
-      oop obj = CompressedOops::decode_not_null(o);
+      oop obj = CompressedOops::decode_raw_not_null(o);
+      ShenandoahAsserts::assert_correct(p, obj, __FILE__, __LINE__);
+
       oop fwd = ShenandoahForwarding::get_forwardee_raw_unchecked(obj);
       if (obj != fwd) {
         ShenandoahAsserts::print_failure(ShenandoahAsserts::_safe_all, obj, p, nullptr,
@@ -1245,7 +1270,9 @@ private:
   void do_oop_work(T* p) {
     T o = RawAccess<>::oop_load(p);
     if (!CompressedOops::is_null(o)) {
-      oop obj = CompressedOops::decode_not_null(o);
+      oop obj = CompressedOops::decode_raw_not_null(o);
+      ShenandoahAsserts::assert_correct(p, obj, __FILE__, __LINE__);
+
       ShenandoahHeap* heap = ShenandoahHeap::heap();
 
       if (!heap->marking_context()->is_marked_or_old(obj)) {
@@ -1299,7 +1326,9 @@ public:
   inline void work(T* p) {
     T o = RawAccess<>::oop_load(p);
     if (!CompressedOops::is_null(o)) {
-      oop obj = CompressedOops::decode_not_null(o);
+      oop obj = CompressedOops::decode_raw_not_null(o);
+      ShenandoahAsserts::assert_correct(p, obj, __FILE__, __LINE__);
+
       if (_heap->is_in_young(obj) && !_scanner->is_card_dirty((HeapWord*) p)) {
         ShenandoahAsserts::print_failure(ShenandoahAsserts::_safe_all, obj, p, nullptr,
                                          _message, "clean card, it should be dirty.", __FILE__, __LINE__);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
index f66d7bbec77..7e683cf7af8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
@@ -52,7 +52,7 @@ private:
 };
 
 typedef Stack<ShenandoahVerifierTask, mtGC> ShenandoahVerifierStack;
-typedef volatile juint ShenandoahLivenessData;
+typedef Atomic<juint> ShenandoahLivenessData;
 
 class ShenandoahVerifier : public CHeapObj<mtGC> {
 private:
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
index 15520c47bbc..3eb1a06a911 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -400,27 +400,20 @@
           "reserve/waste is incorrect, at the risk that application "       \
           "runs out of memory too early.")                                  \
                                                                             \
-  product(uintx, ShenandoahOldEvacRatioPercent, 75, EXPERIMENTAL,           \
-          "The maximum proportion of evacuation from old-gen memory, "      \
-          "expressed as a percentage. The default value 75 denotes that "   \
-          "no more than 75% of the collection set evacuation workload may " \
-          "be towards evacuation of old-gen heap regions. This limits both "\
-          "the promotion of aged regions and the compaction of existing "   \
-          "old regions. A value of 75 denotes that the total evacuation "   \
-          "work may increase to up to four times the young gen evacuation " \
-          "work. A larger value allows quicker promotion and allows "       \
-          "a smaller number of mixed evacuations to process "               \
-          "the entire list of old-gen collection candidates at the cost "   \
-          "of an increased disruption of the normal cadence of young-gen "  \
-          "collections.  A value of 100 allows a mixed evacuation to "      \
-          "focus entirely on old-gen memory, allowing no young-gen "        \
-          "regions to be collected, likely resulting in subsequent "        \
-          "allocation failures because the allocation pool is not "         \
-          "replenished.  A value of 0 allows a mixed evacuation to "        \
-          "focus entirely on young-gen memory, allowing no old-gen "        \
-          "regions to be collected, likely resulting in subsequent "        \
-          "promotion failures and triggering of stop-the-world full GC "    \
-          "events.")                                                        \
+  product(uintx, ShenandoahOldEvacPercent, 75, EXPERIMENTAL,                \
+          "The maximum evacuation to old-gen expressed as a percent of "    \
+          "the total live memory within the collection set.  With the "     \
+          "default setting, if collection set evacuates X, no more than "   \
+          "75% of X may hold objects evacuated from old or promoted to "    \
+          "old from young.  A value of 100 allows the entire collection "   \
+          "set to be comprised of old-gen regions and young regions that "  \
+          "have reached the tenure age.  Larger values allow fewer mixed "  \
+          "evacuations to reclaim all the garbage from old.  Smaller "      \
+          "values result in less variation in GC cycle times between "      \
+          "young vs. mixed cycles.  A value of 0 prevents mixed "           \
+          "evacations from running and blocks promotion of aged regions "   \
+          "by evacuation.  Setting the value to 0 does not prevent "        \
+          "regions from being promoted in place.")                          \
           range(0,100)                                                      \
                                                                             \
   product(bool, ShenandoahEvacTracking, false, DIAGNOSTIC,                  \
@@ -430,18 +423,6 @@
           "by thread type (worker or mutator) and evacuation type (young, " \
           "old, or promotion.")                                             \
                                                                             \
-  product(uintx, ShenandoahMinYoungPercentage, 20, EXPERIMENTAL,            \
-          "The minimum percentage of the heap to use for the young "        \
-          "generation. Heuristics will not adjust the young generation "    \
-          "to be less than this.")                                          \
-          range(0, 100)                                                     \
-                                                                            \
-  product(uintx, ShenandoahMaxYoungPercentage, 100, EXPERIMENTAL,           \
-          "The maximum percentage of the heap to use for the young "        \
-          "generation. Heuristics will not adjust the young generation "    \
-          "to be more than this.")                                          \
-          range(0, 100)                                                     \
-                                                                            \
   product(uintx, ShenandoahCriticalFreeThreshold, 1, EXPERIMENTAL,          \
           "How much of the heap needs to be free after recovery cycles, "   \
           "either Degenerated or Full GC to be claimed successful. If this "\
diff --git a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
index 3968575d089..4299bdb8126 100644
--- a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
+++ b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
@@ -29,21 +29,22 @@
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
 #include "gc/shenandoah/shenandoahMonitoringSupport.hpp"
+#include "runtime/atomic.hpp"
 
-#define VM_STRUCTS_SHENANDOAH(nonstatic_field, volatile_nonstatic_field, static_field)                \
-  nonstatic_field(ShenandoahHeap, _num_regions,                    size_t)                            \
-  nonstatic_field(ShenandoahHeap, _regions,                        ShenandoahHeapRegion**)            \
-  nonstatic_field(ShenandoahHeap, _log_min_obj_alignment_in_bytes, int)                               \
-  nonstatic_field(ShenandoahHeap, _free_set,                       ShenandoahFreeSet*)                \
-  volatile_nonstatic_field(ShenandoahHeap, _committed,             size_t)                            \
-  static_field(ShenandoahHeapRegion, RegionSizeBytes,              size_t)                            \
-  static_field(ShenandoahHeapRegion, RegionSizeBytesShift,         size_t)                            \
-  volatile_nonstatic_field(ShenandoahHeapRegion, _state,           ShenandoahHeapRegion::RegionState) \
-  nonstatic_field(ShenandoahHeapRegion, _index,                    size_t const)                      \
-  nonstatic_field(ShenandoahHeapRegion, _bottom,                   HeapWord* const)                   \
-  nonstatic_field(ShenandoahHeapRegion, _top,                      HeapWord*)                         \
-  nonstatic_field(ShenandoahHeapRegion, _end,                      HeapWord* const)                   \
-  nonstatic_field(ShenandoahFreeSet, _total_global_used,           size_t)                            \
+#define VM_STRUCTS_SHENANDOAH(nonstatic_field, volatile_nonstatic_field, static_field)                        \
+  nonstatic_field(ShenandoahHeap, _num_regions,                    size_t)                                    \
+  nonstatic_field(ShenandoahHeap, _regions,                        ShenandoahHeapRegion**)                    \
+  nonstatic_field(ShenandoahHeap, _log_min_obj_alignment_in_bytes, int)                                       \
+  nonstatic_field(ShenandoahHeap, _free_set,                       ShenandoahFreeSet*)                        \
+  volatile_nonstatic_field(ShenandoahHeap, _committed,             Atomic<size_t>)                            \
+  static_field(ShenandoahHeapRegion, RegionSizeBytes,              size_t)                                    \
+  static_field(ShenandoahHeapRegion, RegionSizeBytesShift,         size_t)                                    \
+  nonstatic_field(ShenandoahHeapRegion, _state,                    Atomic<ShenandoahHeapRegion::RegionState>) \
+  nonstatic_field(ShenandoahHeapRegion, _index,                    size_t const)                              \
+  nonstatic_field(ShenandoahHeapRegion, _bottom,                   HeapWord* const)                           \
+  nonstatic_field(ShenandoahHeapRegion, _top,                      HeapWord*)                                 \
+  nonstatic_field(ShenandoahHeapRegion, _end,                      HeapWord* const)                           \
+  nonstatic_field(ShenandoahFreeSet, _total_global_used,           size_t)                                    \
 
 #define VM_INT_CONSTANTS_SHENANDOAH(declare_constant, declare_constant_with_value) \
   declare_constant(ShenandoahHeapRegion::_empty_uncommitted)                       \
@@ -65,7 +66,7 @@
   declare_toplevel_type(ShenandoahHeapRegion)                                 \
   declare_toplevel_type(ShenandoahHeap*)                                      \
   declare_toplevel_type(ShenandoahHeapRegion*)                                \
-  declare_toplevel_type(ShenandoahHeapRegion::RegionState)                    \
+  declare_toplevel_type(Atomic<ShenandoahHeapRegion::RegionState>)            \
   declare_toplevel_type(ShenandoahFreeSet)                                    \
   declare_toplevel_type(ShenandoahFreeSet*)                                   \
 
diff --git a/src/hotspot/share/gc/z/vmStructs_z.hpp b/src/hotspot/share/gc/z/vmStructs_z.hpp
index a88dae188d3..de32b964a51 100644
--- a/src/hotspot/share/gc/z/vmStructs_z.hpp
+++ b/src/hotspot/share/gc/z/vmStructs_z.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,6 @@ typedef ZValue<ZPerNUMAStorage, ZPartition> ZPerNUMAZPartition;
                                                                                                      \
   nonstatic_field(ZForwarding,                  _virtual,             const ZVirtualMemory)          \
   nonstatic_field(ZForwarding,                  _object_alignment_shift, const size_t)               \
-  volatile_nonstatic_field(ZForwarding,         _ref_count,           int)                           \
   nonstatic_field(ZForwarding,                  _entries,             const ZAttachedArrayForForwarding) \
   nonstatic_field(ZForwardingEntry,             _entry,               uint64_t)                      \
   nonstatic_field(ZAttachedArrayForForwarding,  _length,              const size_t)
diff --git a/src/hotspot/share/gc/z/zAbort.cpp b/src/hotspot/share/gc/z/zAbort.cpp
index 3310793f730..82523ddebe8 100644
--- a/src/hotspot/share/gc/z/zAbort.cpp
+++ b/src/hotspot/share/gc/z/zAbort.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,9 @@
  */
 
 #include "gc/z/zAbort.hpp"
-#include "runtime/atomicAccess.hpp"
 
-volatile bool ZAbort::_should_abort = false;
+Atomic<bool> ZAbort::_should_abort{};
 
 void ZAbort::abort() {
-  AtomicAccess::store(&_should_abort, true);
+  _should_abort.store_relaxed(true);
 }
diff --git a/src/hotspot/share/gc/z/zAbort.hpp b/src/hotspot/share/gc/z/zAbort.hpp
index 925b0a79ac3..64633752d5d 100644
--- a/src/hotspot/share/gc/z/zAbort.hpp
+++ b/src/hotspot/share/gc/z/zAbort.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,11 @@
 #define SHARE_GC_Z_ZABORT_HPP
 
 #include "memory/allStatic.hpp"
+#include "runtime/atomic.hpp"
 
 class ZAbort : public AllStatic {
 private:
-  static volatile bool _should_abort;
+  static Atomic<bool> _should_abort;
 
 public:
   static bool should_abort();
diff --git a/src/hotspot/share/gc/z/zAbort.inline.hpp b/src/hotspot/share/gc/z/zAbort.inline.hpp
index 37503e25f70..856179e9d2a 100644
--- a/src/hotspot/share/gc/z/zAbort.inline.hpp
+++ b/src/hotspot/share/gc/z/zAbort.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,8 @@
 
 #include "gc/z/zAbort.hpp"
 
-#include "runtime/atomicAccess.hpp"
-
 inline bool ZAbort::should_abort() {
-  return AtomicAccess::load(&_should_abort);
+  return _should_abort.load_relaxed();
 }
 
 #endif // SHARE_GC_Z_ZABORT_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zAddress.inline.hpp b/src/hotspot/share/gc/z/zAddress.inline.hpp
index c8c8ec7ae3a..0b99802729b 100644
--- a/src/hotspot/share/gc/z/zAddress.inline.hpp
+++ b/src/hotspot/share/gc/z/zAddress.inline.hpp
@@ -199,18 +199,18 @@ CREATE_ZOFFSET_OPERATORS(zoffset)
 
 inline uintptr_t untype(zbacking_offset offset) {
   const uintptr_t value = static_cast<uintptr_t>(offset);
-  assert(value < ZBackingOffsetMax, "Offset out of bounds (" PTR_FORMAT " < " PTR_FORMAT ")", value, ZAddressOffsetMax);
+  assert(value < ZBackingOffsetMax, "Offset out of bounds (" PTR_FORMAT " < " PTR_FORMAT ")", value, ZBackingOffsetMax);
   return value;
 }
 
 inline uintptr_t untype(zbacking_offset_end offset) {
   const uintptr_t value = static_cast<uintptr_t>(offset);
-  assert(value <= ZBackingOffsetMax, "Offset out of bounds (" PTR_FORMAT " <= " PTR_FORMAT ")", value, ZAddressOffsetMax);
+  assert(value <= ZBackingOffsetMax, "Offset out of bounds (" PTR_FORMAT " <= " PTR_FORMAT ")", value, ZBackingOffsetMax);
   return value;
 }
 
 inline zbacking_offset to_zbacking_offset(uintptr_t value) {
-  assert(value < ZBackingOffsetMax, "Value out of bounds (" PTR_FORMAT " < " PTR_FORMAT ")", value, ZAddressOffsetMax);
+  assert(value < ZBackingOffsetMax, "Value out of bounds (" PTR_FORMAT " < " PTR_FORMAT ")", value, ZBackingOffsetMax);
   return zbacking_offset(value);
 }
 
@@ -227,7 +227,7 @@ inline zbacking_offset_end to_zbacking_offset_end(zbacking_offset start, size_t
 }
 
 inline zbacking_offset_end to_zbacking_offset_end(uintptr_t value) {
-  assert(value <= ZBackingOffsetMax, "Value out of bounds (" PTR_FORMAT " <= " PTR_FORMAT ")", value, ZAddressOffsetMax);
+  assert(value <= ZBackingOffsetMax, "Value out of bounds (" PTR_FORMAT " <= " PTR_FORMAT ")", value, ZBackingOffsetMax);
   return zbacking_offset_end(value);
 }
 
diff --git a/src/hotspot/share/gc/z/zArray.hpp b/src/hotspot/share/gc/z/zArray.hpp
index 2c2f8a5dbfb..d39def4096e 100644
--- a/src/hotspot/share/gc/z/zArray.hpp
+++ b/src/hotspot/share/gc/z/zArray.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 
 #include "cppstdlib/type_traits.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/growableArray.hpp"
@@ -78,7 +78,9 @@ public:
 template <typename T, bool Parallel>
 class ZArrayIteratorImpl : public StackObj {
 private:
-  size_t         _next;
+  using NextType = std::conditional_t<Parallel, Atomic<size_t>, size_t>;
+
+  NextType       _next;
   const size_t   _end;
   const T* const _array;
 
diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp
index 9e2bc19118e..15caa54ebab 100644
--- a/src/hotspot/share/gc/z/zArray.inline.hpp
+++ b/src/hotspot/share/gc/z/zArray.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 #include "gc/z/zArray.hpp"
 
 #include "gc/z/zLock.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 
 template <typename T>
 ZArraySlice<T>::ZArraySlice(T* data, int len)
@@ -130,7 +129,7 @@ inline bool ZArrayIteratorImpl<T, Parallel>::next_serial(size_t* index) {
 
 template <typename T, bool Parallel>
 inline bool ZArrayIteratorImpl<T, Parallel>::next_parallel(size_t* index) {
-  const size_t claimed_index = AtomicAccess::fetch_then_add(&_next, 1u, memory_order_relaxed);
+  const size_t claimed_index = _next.fetch_then_add(1u, memory_order_relaxed);
 
   if (claimed_index < _end) {
     *index = claimed_index;
@@ -177,7 +176,7 @@ inline bool ZArrayIteratorImpl<T, Parallel>::next_if(T* elem, Function predicate
 
 template <typename T, bool Parallel>
 inline bool ZArrayIteratorImpl<T, Parallel>::next_index(size_t* index) {
-  if (Parallel) {
+  if constexpr (Parallel) {
     return next_parallel(index);
   } else {
     return next_serial(index);
diff --git a/src/hotspot/share/gc/z/zForwarding.cpp b/src/hotspot/share/gc/z/zForwarding.cpp
index 820bb9dbc35..92fc1bc89df 100644
--- a/src/hotspot/share/gc/z/zForwarding.cpp
+++ b/src/hotspot/share/gc/z/zForwarding.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 #include "gc/z/zStat.hpp"
 #include "gc/z/zUtils.inline.hpp"
 #include "logging/log.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/align.hpp"
 
 //
@@ -50,7 +49,7 @@
 //
 
 bool ZForwarding::claim() {
-  return AtomicAccess::cmpxchg(&_claimed, false, true) == false;
+  return _claimed.compare_set(false, true);
 }
 
 void ZForwarding::in_place_relocation_start(zoffset relocated_watermark) {
@@ -60,7 +59,7 @@ void ZForwarding::in_place_relocation_start(zoffset relocated_watermark) {
 
   // Support for ZHeap::is_in checks of from-space objects
   // in a page that is in-place relocating
-  AtomicAccess::store(&_in_place_thread, Thread::current());
+  _in_place_thread.store_relaxed(Thread::current());
   _in_place_top_at_start = _page->top();
 }
 
@@ -76,17 +75,17 @@ void ZForwarding::in_place_relocation_finish() {
   }
 
   // Disable relaxed ZHeap::is_in checks
-  AtomicAccess::store(&_in_place_thread, (Thread*)nullptr);
+  _in_place_thread.store_relaxed(nullptr);
 }
 
 bool ZForwarding::in_place_relocation_is_below_top_at_start(zoffset offset) const {
   // Only the relocating thread is allowed to know about the old relocation top.
-  return AtomicAccess::load(&_in_place_thread) == Thread::current() && offset < _in_place_top_at_start;
+  return _in_place_thread.load_relaxed() == Thread::current() && offset < _in_place_top_at_start;
 }
 
 bool ZForwarding::retain_page(ZRelocateQueue* queue) {
   for (;;) {
-    const int32_t ref_count = AtomicAccess::load_acquire(&_ref_count);
+    const int32_t ref_count = _ref_count.load_acquire();
 
     if (ref_count == 0) {
       // Released
@@ -101,7 +100,7 @@ bool ZForwarding::retain_page(ZRelocateQueue* queue) {
       return false;
     }
 
-    if (AtomicAccess::cmpxchg(&_ref_count, ref_count, ref_count + 1) == ref_count) {
+    if (_ref_count.compare_set(ref_count, ref_count + 1)) {
       // Retained
       return true;
     }
@@ -110,11 +109,11 @@ bool ZForwarding::retain_page(ZRelocateQueue* queue) {
 
 void ZForwarding::in_place_relocation_claim_page() {
   for (;;) {
-    const int32_t ref_count = AtomicAccess::load(&_ref_count);
+    const int32_t ref_count = _ref_count.load_relaxed();
     assert(ref_count > 0, "Invalid state");
 
     // Invert reference count
-    if (AtomicAccess::cmpxchg(&_ref_count, ref_count, -ref_count) != ref_count) {
+    if (!_ref_count.compare_set(ref_count, -ref_count)) {
       continue;
     }
 
@@ -122,7 +121,7 @@ void ZForwarding::in_place_relocation_claim_page() {
     // and we have now claimed the page. Otherwise we wait until it is claimed.
     if (ref_count != 1) {
       ZLocker<ZConditionLock> locker(&_ref_lock);
-      while (AtomicAccess::load_acquire(&_ref_count) != -1) {
+      while (_ref_count.load_acquire() != -1) {
         _ref_lock.wait();
       }
     }
@@ -134,12 +133,12 @@ void ZForwarding::in_place_relocation_claim_page() {
 
 void ZForwarding::release_page() {
   for (;;) {
-    const int32_t ref_count = AtomicAccess::load(&_ref_count);
+    const int32_t ref_count = _ref_count.load_relaxed();
     assert(ref_count != 0, "Invalid state");
 
     if (ref_count > 0) {
       // Decrement reference count
-      if (AtomicAccess::cmpxchg(&_ref_count, ref_count, ref_count - 1) != ref_count) {
+      if (!_ref_count.compare_set(ref_count, ref_count - 1)) {
         continue;
       }
 
@@ -152,7 +151,7 @@ void ZForwarding::release_page() {
       }
     } else {
       // Increment reference count
-      if (AtomicAccess::cmpxchg(&_ref_count, ref_count, ref_count + 1) != ref_count) {
+      if (!_ref_count.compare_set(ref_count, ref_count + 1)) {
         continue;
       }
 
@@ -171,9 +170,9 @@ void ZForwarding::release_page() {
 
 ZPage* ZForwarding::detach_page() {
   // Wait until released
-  if (AtomicAccess::load_acquire(&_ref_count) != 0) {
+  if (_ref_count.load_acquire() != 0) {
     ZLocker<ZConditionLock> locker(&_ref_lock);
-    while (AtomicAccess::load_acquire(&_ref_count) != 0) {
+    while (_ref_count.load_acquire() != 0) {
       _ref_lock.wait();
     }
   }
@@ -182,16 +181,16 @@ ZPage* ZForwarding::detach_page() {
 }
 
 ZPage* ZForwarding::page() {
-  assert(AtomicAccess::load(&_ref_count) != 0, "The page has been released/detached");
+  assert(_ref_count.load_relaxed() != 0, "The page has been released/detached");
   return _page;
 }
 
 void ZForwarding::mark_done() {
-  AtomicAccess::store(&_done, true);
+  _done.store_relaxed(true);
 }
 
 bool ZForwarding::is_done() const {
-  return AtomicAccess::load(&_done);
+  return _done.load_relaxed();
 }
 
 //
@@ -288,7 +287,7 @@ void ZForwarding::relocated_remembered_fields_publish() {
   // used to have remembered set entries. Now publish the fields to
   // the YC.
 
-  const ZPublishState res = AtomicAccess::cmpxchg(&_relocated_remembered_fields_state, ZPublishState::none, ZPublishState::published);
+  const ZPublishState res = _relocated_remembered_fields_state.compare_exchange(ZPublishState::none, ZPublishState::published);
 
   // none:      OK to publish
   // published: Not possible - this operation makes this transition
@@ -319,7 +318,7 @@ void ZForwarding::relocated_remembered_fields_notify_concurrent_scan_of() {
   // Invariant: The page is being retained
   assert(ZGeneration::young()->is_phase_mark(), "Only called when");
 
-  const ZPublishState res = AtomicAccess::cmpxchg(&_relocated_remembered_fields_state, ZPublishState::none, ZPublishState::reject);
+  const ZPublishState res = _relocated_remembered_fields_state.compare_exchange(ZPublishState::none, ZPublishState::reject);
 
   // none:      OC has not completed relocation
   // published: OC has completed and published all relocated remembered fields
@@ -340,7 +339,7 @@ void ZForwarding::relocated_remembered_fields_notify_concurrent_scan_of() {
     // OC relocation already collected and published fields
 
     // Still notify concurrent scanning and reject the collected data from the OC
-    const ZPublishState res2 = AtomicAccess::cmpxchg(&_relocated_remembered_fields_state, ZPublishState::published, ZPublishState::reject);
+    const ZPublishState res2 = _relocated_remembered_fields_state.compare_exchange(ZPublishState::published, ZPublishState::reject);
     assert(res2 == ZPublishState::published, "Should not fail");
 
     log_debug(gc, remset)("Forwarding remset eager and reject: " PTR_FORMAT " " PTR_FORMAT, untype(start()), untype(end()));
@@ -368,7 +367,7 @@ bool ZForwarding::relocated_remembered_fields_published_contains(volatile zpoint
 }
 
 void ZForwarding::verify() const {
-  guarantee(_ref_count != 0, "Invalid reference count");
+  guarantee(_ref_count.load_relaxed() != 0, "Invalid reference count");
   guarantee(_page != nullptr, "Invalid page");
 
   uint32_t live_objects = 0;
diff --git a/src/hotspot/share/gc/z/zForwarding.hpp b/src/hotspot/share/gc/z/zForwarding.hpp
index 29b5cf4aabe..72319bd2ebb 100644
--- a/src/hotspot/share/gc/z/zForwarding.hpp
+++ b/src/hotspot/share/gc/z/zForwarding.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "gc/z/zPageAge.hpp"
 #include "gc/z/zPageType.hpp"
 #include "gc/z/zVirtualMemory.hpp"
+#include "runtime/atomic.hpp"
 
 class ObjectClosure;
 class ZForwardingAllocator;
@@ -62,13 +63,13 @@ private:
   const uint32_t         _partition_id;
   const ZPageAge         _from_age;
   const ZPageAge         _to_age;
-  volatile bool          _claimed;
+  Atomic<bool>           _claimed;
   mutable ZConditionLock _ref_lock;
-  volatile int32_t       _ref_count;
-  volatile bool          _done;
+  Atomic<int32_t>        _ref_count;
+  Atomic<bool>           _done;
 
   // Relocated remembered set fields support
-  volatile ZPublishState _relocated_remembered_fields_state;
+  Atomic<ZPublishState>  _relocated_remembered_fields_state;
   PointerArray           _relocated_remembered_fields_array;
   uint32_t               _relocated_remembered_fields_publish_young_seqnum;
 
@@ -77,7 +78,7 @@ private:
   zoffset_end            _in_place_top_at_start;
 
   // Debugging
-  volatile Thread*       _in_place_thread;
+  Atomic<Thread*>        _in_place_thread;
 
   ZForwardingEntry* entries() const;
   ZForwardingEntry at(ZForwardingCursor* cursor) const;
diff --git a/src/hotspot/share/gc/z/zForwarding.inline.hpp b/src/hotspot/share/gc/z/zForwarding.inline.hpp
index 45b5d495e79..02f61eb5b05 100644
--- a/src/hotspot/share/gc/z/zForwarding.inline.hpp
+++ b/src/hotspot/share/gc/z/zForwarding.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -196,7 +196,7 @@ void ZForwarding::oops_do_in_forwarded_via_table(Function function) {
 }
 
 inline bool ZForwarding::in_place_relocation() const {
-  assert(AtomicAccess::load(&_ref_count) != 0, "The page has been released/detached");
+  assert(_ref_count.load_relaxed() != 0, "The page has been released/detached");
   return _in_place;
 }
 
@@ -307,7 +307,7 @@ inline void ZForwarding::relocated_remembered_fields_register(volatile zpointer*
   // Invariant: Page is being retained
   assert(ZGeneration::young()->is_phase_mark(), "Only called when");
 
-  const ZPublishState res = AtomicAccess::load(&_relocated_remembered_fields_state);
+  const ZPublishState res = _relocated_remembered_fields_state.load_relaxed();
 
   // none:      Gather remembered fields
   // published: Have already published fields - not possible since they haven't been
@@ -327,7 +327,7 @@ inline void ZForwarding::relocated_remembered_fields_register(volatile zpointer*
 // Returns true iff the page is being (or about to be) relocated by the OC
 // while the YC gathered the remembered fields of the "from" page.
 inline bool ZForwarding::relocated_remembered_fields_is_concurrently_scanned() const {
-  return AtomicAccess::load(&_relocated_remembered_fields_state) == ZPublishState::reject;
+  return _relocated_remembered_fields_state.load_relaxed() == ZPublishState::reject;
 }
 
 template <typename Function>
@@ -335,7 +335,7 @@ inline void ZForwarding::relocated_remembered_fields_apply_to_published(Function
   // Invariant: Page is not being retained
   assert(ZGeneration::young()->is_phase_mark(), "Only called when");
 
-  const ZPublishState res = AtomicAccess::load_acquire(&_relocated_remembered_fields_state);
+  const ZPublishState res = _relocated_remembered_fields_state.load_acquire();
 
   // none:      Nothing published - page had already been relocated before YC started
   // published: OC relocated and published relocated remembered fields
@@ -363,14 +363,14 @@ inline void ZForwarding::relocated_remembered_fields_apply_to_published(Function
     // collection. Mark that it is unsafe (and unnecessary) to call scan_page
     // on the page in the page table.
     assert(res != ZPublishState::accept, "Unexpected");
-    AtomicAccess::store(&_relocated_remembered_fields_state, ZPublishState::reject);
+    _relocated_remembered_fields_state.store_relaxed(ZPublishState::reject);
   } else {
     log_debug(gc, remset)("scan_forwarding failed retain safe " PTR_FORMAT, untype(start()));
     // Guaranteed that the page was fully relocated and removed from page table.
     // Because of this we can signal to scan_page that any page found in page table
     // of the same slot as the current forwarding is a page that is safe to scan,
     // and in fact must be scanned.
-    AtomicAccess::store(&_relocated_remembered_fields_state, ZPublishState::accept);
+    _relocated_remembered_fields_state.store_relaxed(ZPublishState::accept);
   }
 }
 
diff --git a/src/hotspot/share/gc/z/zForwardingAllocator.cpp b/src/hotspot/share/gc/z/zForwardingAllocator.cpp
index 0b4e6c7b08c..451a1d62754 100644
--- a/src/hotspot/share/gc/z/zForwardingAllocator.cpp
+++ b/src/hotspot/share/gc/z/zForwardingAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@ ZForwardingAllocator::~ZForwardingAllocator() {
 }
 
 void ZForwardingAllocator::reset(size_t size) {
-  _start = _top = REALLOC_C_HEAP_ARRAY(char, _start, size, mtGC);
+  _start = REALLOC_C_HEAP_ARRAY(char, _start, size, mtGC);
+  _top.store_relaxed(_start);
   _end = _start + size;
 }
diff --git a/src/hotspot/share/gc/z/zForwardingAllocator.hpp b/src/hotspot/share/gc/z/zForwardingAllocator.hpp
index 8424fe6cd70..62d84885692 100644
--- a/src/hotspot/share/gc/z/zForwardingAllocator.hpp
+++ b/src/hotspot/share/gc/z/zForwardingAllocator.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,14 @@
 #ifndef SHARE_GC_Z_ZFORWARDINGALLOCATOR_HPP
 #define SHARE_GC_Z_ZFORWARDINGALLOCATOR_HPP
 
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ZForwardingAllocator {
 private:
-  char* _start;
-  char* _end;
-  char* _top;
+  char*         _start;
+  char*         _end;
+  Atomic<char*> _top;
 
 public:
   ZForwardingAllocator();
diff --git a/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp b/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp
index dc71507175c..c8811c84ede 100644
--- a/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp
+++ b/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 #include "gc/z/zForwardingAllocator.hpp"
 
-#include "runtime/atomicAccess.hpp"
 #include "utilities/debug.hpp"
 
 inline size_t ZForwardingAllocator::size() const {
@@ -34,11 +33,11 @@ inline size_t ZForwardingAllocator::size() const {
 }
 
 inline bool ZForwardingAllocator::is_full() const {
-  return _top == _end;
+  return _top.load_relaxed() == _end;
 }
 
 inline void* ZForwardingAllocator::alloc(size_t size) {
-  char* const addr = AtomicAccess::fetch_then_add(&_top, size);
+  char* const addr = _top.fetch_then_add(size);
   assert(addr + size <= _end, "Allocation should never fail");
   return addr;
 }
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index a8c646bf895..27f352a624f 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,6 @@
 #include "logging/log.hpp"
 #include "memory/universe.hpp"
 #include "prims/jvmtiTagMap.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/handshake.hpp"
 #include "runtime/safepoint.hpp"
@@ -298,33 +297,33 @@ bool ZGeneration::is_relocate_queue_active() const {
 
 void ZGeneration::reset_statistics() {
   assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
-  _freed = 0;
-  _promoted = 0;
-  _compacted = 0;
+  _freed.store_relaxed(0u);
+  _promoted.store_relaxed(0u);
+  _compacted.store_relaxed(0u);
 }
 
 size_t ZGeneration::freed() const {
-  return _freed;
+  return _freed.load_relaxed();
 }
 
 void ZGeneration::increase_freed(size_t size) {
-  AtomicAccess::add(&_freed, size, memory_order_relaxed);
+  _freed.add_then_fetch(size, memory_order_relaxed);
 }
 
 size_t ZGeneration::promoted() const {
-  return _promoted;
+  return _promoted.load_relaxed();;
 }
 
 void ZGeneration::increase_promoted(size_t size) {
-  AtomicAccess::add(&_promoted, size, memory_order_relaxed);
+  _promoted.add_then_fetch(size, memory_order_relaxed);
 }
 
 size_t ZGeneration::compacted() const {
-  return _compacted;
+  return _compacted.load_relaxed();;
 }
 
 void ZGeneration::increase_compacted(size_t size) {
-  AtomicAccess::add(&_compacted, size, memory_order_relaxed);
+  _compacted.add_then_fetch(size, memory_order_relaxed);
 }
 
 ConcurrentGCTimer* ZGeneration::gc_timer() const {
diff --git a/src/hotspot/share/gc/z/zGeneration.hpp b/src/hotspot/share/gc/z/zGeneration.hpp
index 3b700361460..1371865958b 100644
--- a/src/hotspot/share/gc/z/zGeneration.hpp
+++ b/src/hotspot/share/gc/z/zGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
 #include "gc/z/zWeakRootsProcessor.hpp"
 #include "gc/z/zWorkers.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 
 class ThreadClosure;
 class ZForwardingTable;
@@ -70,9 +71,9 @@ protected:
   ZRelocate             _relocate;
   ZRelocationSet        _relocation_set;
 
-  volatile size_t       _freed;
-  volatile size_t       _promoted;
-  volatile size_t       _compacted;
+  Atomic<size_t>        _freed;
+  Atomic<size_t>        _promoted;
+  Atomic<size_t>        _compacted;
 
   Phase                 _phase;
   uint32_t              _seqnum;
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index d6289178ea8..73ced211058 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -456,7 +456,7 @@ void ZHeapIterator::follow_array_chunk(const ZHeapIteratorContext& context, cons
 
   // Follow array chunk
   ZHeapIteratorOopClosure<false /* VisitReferents */> cl(this, context, obj);
-  ZIterator::oop_iterate_range(obj, &cl, start, end);
+  ZIterator::oop_iterate_elements_range(obj, &cl, start, end);
 }
 
 template <bool VisitWeaks>
diff --git a/src/hotspot/share/gc/z/zIterator.hpp b/src/hotspot/share/gc/z/zIterator.hpp
index 3a1de049dd0..e048002e52e 100644
--- a/src/hotspot/share/gc/z/zIterator.hpp
+++ b/src/hotspot/share/gc/z/zIterator.hpp
@@ -41,7 +41,7 @@ public:
   static void oop_iterate(oop obj, OopClosureT* cl);
 
   template <typename OopClosureT>
-  static void oop_iterate_range(objArrayOop obj, OopClosureT* cl, int start, int end);
+  static void oop_iterate_elements_range(objArrayOop obj, OopClosureT* cl, int start, int end);
 
   // This function skips invisible roots
   template <typename Function>
diff --git a/src/hotspot/share/gc/z/zIterator.inline.hpp b/src/hotspot/share/gc/z/zIterator.inline.hpp
index fb20a424288..cbfe1a79aaf 100644
--- a/src/hotspot/share/gc/z/zIterator.inline.hpp
+++ b/src/hotspot/share/gc/z/zIterator.inline.hpp
@@ -66,9 +66,9 @@ void ZIterator::oop_iterate(oop obj, OopClosureT* cl) {
 }
 
 template <typename OopClosureT>
-void ZIterator::oop_iterate_range(objArrayOop obj, OopClosureT* cl, int start, int end) {
+void ZIterator::oop_iterate_elements_range(objArrayOop obj, OopClosureT* cl, int start, int end) {
   assert(!is_invisible_object_array(obj), "not safe");
-  obj->oop_iterate_range(cl, start, end);
+  obj->oop_iterate_elements_range(cl, start, end);
 }
 
 template <typename Function>
diff --git a/src/hotspot/share/gc/z/zJNICritical.cpp b/src/hotspot/share/gc/z/zJNICritical.cpp
index 28cc70cb3b5..f50cc113936 100644
--- a/src/hotspot/share/gc/z/zJNICritical.cpp
+++ b/src/hotspot/share/gc/z/zJNICritical.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 #include "gc/z/zJNICritical.hpp"
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zStat.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/debug.hpp"
@@ -46,22 +45,22 @@
 
 static const ZStatCriticalPhase ZCriticalPhaseJNICriticalStall("JNI Critical Stall", false /* verbose */);
 
-volatile int64_t ZJNICritical::_count;
-ZConditionLock*  ZJNICritical::_lock;
+Atomic<int64_t> ZJNICritical::_count;
+ZConditionLock* ZJNICritical::_lock;
 
 void ZJNICritical::initialize() {
-  _count = 0;
+  precond(_count.load_relaxed() == 0);
   _lock = new ZConditionLock();
 }
 
 void ZJNICritical::block() {
   for (;;) {
-    const int64_t count = AtomicAccess::load_acquire(&_count);
+    const int64_t count = _count.load_acquire();
 
     if (count < 0) {
       // Already blocked, wait until unblocked
       ZLocker<ZConditionLock> locker(_lock);
-      while (AtomicAccess::load_acquire(&_count) < 0) {
+      while (_count.load_acquire() < 0) {
         _lock->wait();
       }
 
@@ -70,7 +69,7 @@ void ZJNICritical::block() {
     }
 
     // Increment and invert count
-    if (AtomicAccess::cmpxchg(&_count, count, -(count + 1)) != count) {
+    if (!_count.compare_set(count, -(count + 1))) {
       continue;
     }
 
@@ -80,7 +79,7 @@ void ZJNICritical::block() {
     if (count != 0) {
       // Wait until blocked
       ZLocker<ZConditionLock> locker(_lock);
-      while (AtomicAccess::load_acquire(&_count) != -1) {
+      while (_count.load_acquire() != -1) {
         _lock->wait();
       }
     }
@@ -91,18 +90,18 @@ void ZJNICritical::block() {
 }
 
 void ZJNICritical::unblock() {
-  const int64_t count = AtomicAccess::load_acquire(&_count);
+  const int64_t count = _count.load_acquire();
   assert(count == -1, "Invalid count");
 
   // Notify unblocked
   ZLocker<ZConditionLock> locker(_lock);
-  AtomicAccess::release_store(&_count, (int64_t)0);
+  _count.release_store(0);
   _lock->notify_all();
 }
 
 void ZJNICritical::enter_inner(JavaThread* thread) {
   for (;;) {
-    const int64_t count = AtomicAccess::load_acquire(&_count);
+    const int64_t count = _count.load_acquire();
 
     if (count < 0) {
       // Wait until unblocked
@@ -112,7 +111,7 @@ void ZJNICritical::enter_inner(JavaThread* thread) {
       ThreadBlockInVM tbivm(thread);
 
       ZLocker<ZConditionLock> locker(_lock);
-      while (AtomicAccess::load_acquire(&_count) < 0) {
+      while (_count.load_acquire() < 0) {
         _lock->wait();
       }
 
@@ -121,7 +120,7 @@ void ZJNICritical::enter_inner(JavaThread* thread) {
     }
 
     // Increment count
-    if (AtomicAccess::cmpxchg(&_count, count, count + 1) != count) {
+    if (!_count.compare_set(count, count + 1)) {
       continue;
     }
 
@@ -142,17 +141,17 @@ void ZJNICritical::enter(JavaThread* thread) {
 
 void ZJNICritical::exit_inner() {
   for (;;) {
-    const int64_t count = AtomicAccess::load_acquire(&_count);
+    const int64_t count = _count.load_acquire();
     assert(count != 0, "Invalid count");
 
     if (count > 0) {
       // No block in progress, decrement count
-      if (AtomicAccess::cmpxchg(&_count, count, count - 1) != count) {
+      if (!_count.compare_set(count, count - 1)) {
         continue;
       }
     } else {
       // Block in progress, increment count
-      if (AtomicAccess::cmpxchg(&_count, count, count + 1) != count) {
+      if (!_count.compare_set(count, count + 1)) {
         continue;
       }
 
diff --git a/src/hotspot/share/gc/z/zJNICritical.hpp b/src/hotspot/share/gc/z/zJNICritical.hpp
index d2ba80eddba..def6001ae9f 100644
--- a/src/hotspot/share/gc/z/zJNICritical.hpp
+++ b/src/hotspot/share/gc/z/zJNICritical.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,15 @@
 #define SHARE_GC_Z_ZJNICRITICAL_HPP
 
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 
 class JavaThread;
 class ZConditionLock;
 
 class ZJNICritical : public AllStatic {
 private:
-  static volatile int64_t _count;
-  static ZConditionLock*  _lock;
+  static Atomic<int64_t> _count;
+  static ZConditionLock* _lock;
 
   static void enter_inner(JavaThread* thread);
   static void exit_inner();
diff --git a/src/hotspot/share/gc/z/zLiveMap.cpp b/src/hotspot/share/gc/z/zLiveMap.cpp
index c4ae41b0873..8b03a97e03f 100644
--- a/src/hotspot/share/gc/z/zLiveMap.cpp
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 #include "gc/z/zStat.hpp"
 #include "gc/z/zUtils.hpp"
 #include "logging/log.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/spinYield.hpp"
@@ -60,18 +59,18 @@ void ZLiveMap::reset(ZGenerationId id) {
 
   // Multiple threads can enter here, make sure only one of them
   // resets the marking information while the others busy wait.
-  for (uint32_t seqnum = AtomicAccess::load_acquire(&_seqnum);
+  for (uint32_t seqnum = _seqnum.load_acquire();
        seqnum != generation->seqnum();
-       seqnum = AtomicAccess::load_acquire(&_seqnum)) {
+       seqnum = _seqnum.load_acquire()) {
 
     if (seqnum != seqnum_initializing) {
       // No one has claimed initialization of the livemap yet
-      if (AtomicAccess::cmpxchg(&_seqnum, seqnum, seqnum_initializing) == seqnum) {
+      if (_seqnum.compare_set(seqnum, seqnum_initializing)) {
         // This thread claimed the initialization
 
         // Reset marking information
-        _live_bytes = 0;
-        _live_objects = 0;
+        _live_bytes.store_relaxed(0u);
+        _live_objects.store_relaxed(0u);
 
         // Clear segment claimed/live bits
         segment_live_bits().clear();
@@ -81,13 +80,13 @@ void ZLiveMap::reset(ZGenerationId id) {
         // a bit is about to be set for the first time.
         initialize_bitmap();
 
-        assert(_seqnum == seqnum_initializing, "Invalid");
+        assert(_seqnum.load_relaxed() == seqnum_initializing, "Invalid");
 
         // Make sure the newly reset marking information is ordered
         // before the update of the page seqnum, such that when the
         // up-to-date seqnum is load acquired, the bit maps will not
         // contain stale information.
-        AtomicAccess::release_store(&_seqnum, generation->seqnum());
+        _seqnum.release_store(generation->seqnum());
         break;
       }
     }
diff --git a/src/hotspot/share/gc/z/zLiveMap.hpp b/src/hotspot/share/gc/z/zLiveMap.hpp
index 71457d05a41..9373f6aad98 100644
--- a/src/hotspot/share/gc/z/zLiveMap.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/z/zBitMap.hpp"
 #include "gc/z/zGenerationId.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 
 class ObjectClosure;
 
@@ -41,9 +42,9 @@ private:
   const uint32_t    _segment_size;
   const int         _segment_shift;
 
-  volatile uint32_t _seqnum;
-  volatile uint32_t _live_objects;
-  volatile size_t   _live_bytes;
+  Atomic<uint32_t>  _seqnum;
+  Atomic<uint32_t>  _live_objects;
+  Atomic<size_t>    _live_bytes;
   BitMap::bm_word_t _segment_live_bits;
   BitMap::bm_word_t _segment_claim_bits;
   ZBitMap           _bitmap;
diff --git a/src/hotspot/share/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
index e6176b928ff..69687d0b595 100644
--- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,24 +31,23 @@
 #include "gc/z/zGeneration.inline.hpp"
 #include "gc/z/zMark.hpp"
 #include "gc/z/zUtils.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/debug.hpp"
 
 inline void ZLiveMap::reset() {
-  _seqnum = 0;
+  _seqnum.store_relaxed(0u);
 }
 
 inline bool ZLiveMap::is_marked(ZGenerationId id) const {
-  return AtomicAccess::load_acquire(&_seqnum) == ZGeneration::generation(id)->seqnum();
+  return _seqnum.load_acquire() == ZGeneration::generation(id)->seqnum();
 }
 
 inline uint32_t ZLiveMap::live_objects() const {
-  return _live_objects;
+  return _live_objects.load_relaxed();
 }
 
 inline size_t ZLiveMap::live_bytes() const {
-  return _live_bytes;
+  return _live_bytes.load_relaxed();
 }
 
 inline const BitMapView ZLiveMap::segment_live_bits() const {
@@ -116,8 +115,8 @@ inline bool ZLiveMap::set(ZGenerationId id, BitMap::idx_t index, bool finalizabl
 }
 
 inline void ZLiveMap::inc_live(uint32_t objects, size_t bytes) {
-  AtomicAccess::add(&_live_objects, objects);
-  AtomicAccess::add(&_live_bytes, bytes);
+  _live_objects.add_then_fetch(objects);
+  _live_bytes.add_then_fetch(bytes);
 }
 
 inline BitMap::idx_t ZLiveMap::segment_start(BitMap::idx_t segment) const {
diff --git a/src/hotspot/share/gc/z/zLock.hpp b/src/hotspot/share/gc/z/zLock.hpp
index 640a9fb02d3..a843f2389d7 100644
--- a/src/hotspot/share/gc/z/zLock.hpp
+++ b/src/hotspot/share/gc/z/zLock.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #define SHARE_GC_Z_ZLOCK_HPP
 
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/mutex.hpp"
 
 class ZLock : public CHeapObj<mtGC> {
@@ -39,9 +40,9 @@ public:
 
 class ZReentrantLock {
 private:
-  ZLock            _lock;
-  Thread* volatile _owner;
-  uint64_t         _count;
+  ZLock           _lock;
+  Atomic<Thread*> _owner;
+  uint64_t        _count;
 
 public:
   ZReentrantLock();
diff --git a/src/hotspot/share/gc/z/zLock.inline.hpp b/src/hotspot/share/gc/z/zLock.inline.hpp
index edf59be5b4c..ba5d6692521 100644
--- a/src/hotspot/share/gc/z/zLock.inline.hpp
+++ b/src/hotspot/share/gc/z/zLock.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 #include "gc/z/zLock.hpp"
 
-#include "runtime/atomicAccess.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.inline.hpp"
 #include "utilities/debug.hpp"
@@ -50,11 +49,11 @@ inline ZReentrantLock::ZReentrantLock()
 
 inline void ZReentrantLock::lock() {
   Thread* const thread = Thread::current();
-  Thread* const owner = AtomicAccess::load(&_owner);
+  Thread* const owner = _owner.load_relaxed();
 
   if (owner != thread) {
     _lock.lock();
-    AtomicAccess::store(&_owner, thread);
+    _owner.store_relaxed(thread);
   }
 
   _count++;
@@ -67,14 +66,14 @@ inline void ZReentrantLock::unlock() {
   _count--;
 
   if (_count == 0) {
-    AtomicAccess::store(&_owner, (Thread*)nullptr);
+    _owner.store_relaxed(nullptr);
     _lock.unlock();
   }
 }
 
 inline bool ZReentrantLock::is_owned() const {
   Thread* const thread = Thread::current();
-  Thread* const owner = AtomicAccess::load(&_owner);
+  Thread* const owner = _owner.load_relaxed();
   return owner == thread;
 }
 
diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp
index 3b247fdd35e..03701ae9998 100644
--- a/src/hotspot/share/gc/z/zMark.cpp
+++ b/src/hotspot/share/gc/z/zMark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,6 @@
 #include "memory/iterator.inline.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/handshake.hpp"
 #include "runtime/javaThread.hpp"
@@ -152,13 +151,14 @@ void ZMark::prepare_work() {
   _terminate.reset(_nworkers);
 
   // Reset flush counters
-  _work_nproactiveflush = _work_nterminateflush = 0;
+  _work_nproactiveflush.store_relaxed(0u);
+  _work_nterminateflush.store_relaxed(0u);
 }
 
 void ZMark::finish_work() {
   // Accumulate proactive/terminate flush counters
-  _nproactiveflush += _work_nproactiveflush;
-  _nterminateflush += _work_nterminateflush;
+  _nproactiveflush += _work_nproactiveflush.load_relaxed();
+  _nterminateflush += _work_nterminateflush.load_relaxed();
 }
 
 void ZMark::follow_work_complete() {
@@ -594,7 +594,7 @@ bool ZMark::flush() {
 }
 
 bool ZMark::try_terminate_flush() {
-  AtomicAccess::inc(&_work_nterminateflush);
+  _work_nterminateflush.add_then_fetch(1u);
   _terminate.set_resurrected(false);
 
   if (ZVerifyMarking) {
@@ -610,12 +610,12 @@ bool ZMark::try_proactive_flush() {
     return false;
   }
 
-  if (AtomicAccess::load(&_work_nproactiveflush) == ZMarkProactiveFlushMax) {
+  if (_work_nproactiveflush.load_relaxed() == ZMarkProactiveFlushMax) {
     // Limit reached or we're trying to terminate
     return false;
   }
 
-  AtomicAccess::inc(&_work_nproactiveflush);
+  _work_nproactiveflush.add_then_fetch(1u);
 
   SuspendibleThreadSetLeaver sts_leaver;
   return flush();
diff --git a/src/hotspot/share/gc/z/zMark.hpp b/src/hotspot/share/gc/z/zMark.hpp
index cc398addeb8..72a527b957d 100644
--- a/src/hotspot/share/gc/z/zMark.hpp
+++ b/src/hotspot/share/gc/z/zMark.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
 #include "gc/z/zMarkStackEntry.hpp"
 #include "gc/z/zMarkTerminate.hpp"
 #include "oops/oopsHierarchy.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class Thread;
@@ -60,8 +61,8 @@ private:
   ZMarkingSMR        _marking_smr;
   ZMarkStripeSet     _stripes;
   ZMarkTerminate     _terminate;
-  volatile size_t    _work_nproactiveflush;
-  volatile size_t    _work_nterminateflush;
+  Atomic<size_t>     _work_nproactiveflush;
+  Atomic<size_t>     _work_nterminateflush;
   size_t             _nproactiveflush;
   size_t             _nterminateflush;
   size_t             _ntrycomplete;
diff --git a/src/hotspot/share/gc/z/zMarkTerminate.hpp b/src/hotspot/share/gc/z/zMarkTerminate.hpp
index cff1f8e73fa..9def3e72120 100644
--- a/src/hotspot/share/gc/z/zMarkTerminate.hpp
+++ b/src/hotspot/share/gc/z/zMarkTerminate.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #define SHARE_GC_Z_ZMARKTERMINATE_HPP
 
 #include "gc/z/zLock.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class ZMarkStripeSet;
@@ -32,9 +33,9 @@ class ZMarkStripeSet;
 class ZMarkTerminate {
 private:
   uint           _nworkers;
-  volatile uint  _nworking;
-  volatile uint  _nawakening;
-  volatile bool  _resurrected;
+  Atomic<uint>   _nworking;
+  Atomic<uint>   _nawakening;
+  Atomic<bool>   _resurrected;
   ZConditionLock _lock;
 
   void maybe_reduce_stripes(ZMarkStripeSet* stripes, size_t used_nstripes);
diff --git a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
index 575044e3a39..84a545623bc 100644
--- a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
+++ b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 #include "gc/z/zLock.inline.hpp"
 #include "gc/z/zMarkStack.hpp"
 #include "logging/log.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/thread.inline.hpp"
 
@@ -42,24 +41,23 @@ inline ZMarkTerminate::ZMarkTerminate()
     _lock() {}
 
 inline void ZMarkTerminate::reset(uint nworkers) {
-  AtomicAccess::store(&_nworkers, nworkers);
-  AtomicAccess::store(&_nworking, nworkers);
-  _nawakening = 0;
+  _nworkers = nworkers;
+  _nworking.store_relaxed(nworkers);
+  _nawakening.store_relaxed(0u);
 }
 
 inline void ZMarkTerminate::leave() {
   SuspendibleThreadSetLeaver sts_leaver;
   ZLocker<ZConditionLock> locker(&_lock);
 
-  AtomicAccess::store(&_nworking, _nworking - 1);
-  if (_nworking == 0) {
+  if (_nworking.sub_then_fetch(1u, memory_order_relaxed) == 0) {
     // Last thread leaving; notify waiters
     _lock.notify_all();
   }
 }
 
 inline void ZMarkTerminate::maybe_reduce_stripes(ZMarkStripeSet* stripes, size_t used_nstripes) {
-  size_t nstripes = stripes->nstripes();
+  const size_t nstripes = stripes->nstripes();
   if (used_nstripes == nstripes && nstripes > 1u) {
     stripes->try_set_nstripes(nstripes, nstripes >> 1);
   }
@@ -69,8 +67,7 @@ inline bool ZMarkTerminate::try_terminate(ZMarkStripeSet* stripes, size_t used_n
   SuspendibleThreadSetLeaver sts_leaver;
   ZLocker<ZConditionLock> locker(&_lock);
 
-  AtomicAccess::store(&_nworking, _nworking - 1);
-  if (_nworking == 0) {
+  if (_nworking.sub_then_fetch(1u, memory_order_relaxed) == 0) {
     // Last thread entering termination: success
     _lock.notify_all();
     return true;
@@ -83,24 +80,24 @@ inline bool ZMarkTerminate::try_terminate(ZMarkStripeSet* stripes, size_t used_n
 
   // We either got notification about more work
   // or got a spurious wakeup; don't terminate
-  if (_nawakening > 0) {
-    AtomicAccess::store(&_nawakening, _nawakening - 1);
+  if (_nawakening.load_relaxed() > 0) {
+    _nawakening.sub_then_fetch(1u, memory_order_relaxed);
   }
 
-  if (_nworking == 0) {
+  if (_nworking.load_relaxed() == 0) {
     // We got notified all work is done; terminate
     return true;
   }
 
-  AtomicAccess::store(&_nworking, _nworking + 1);
+  _nworking.add_then_fetch(1u, memory_order_relaxed);
 
   return false;
 }
 
 inline void ZMarkTerminate::wake_up() {
-  uint nworking = AtomicAccess::load(&_nworking);
-  uint nawakening = AtomicAccess::load(&_nawakening);
-  if (nworking + nawakening == AtomicAccess::load(&_nworkers)) {
+  const uint nworking = _nworking.load_relaxed();
+  const uint nawakening = _nawakening.load_relaxed();
+  if (nworking + nawakening == _nworkers) {
     // Everyone is working or about to
     return;
   }
@@ -111,24 +108,24 @@ inline void ZMarkTerminate::wake_up() {
   }
 
   ZLocker<ZConditionLock> locker(&_lock);
-  if (_nworking + _nawakening != _nworkers) {
+  if (_nworking.load_relaxed() + _nawakening.load_relaxed() != _nworkers) {
     // Everyone is not working
-    AtomicAccess::store(&_nawakening, _nawakening + 1);
+    _nawakening.add_then_fetch(1u, memory_order_relaxed);
     _lock.notify();
   }
 }
 
 inline bool ZMarkTerminate::saturated() const {
-  uint nworking = AtomicAccess::load(&_nworking);
-  uint nawakening = AtomicAccess::load(&_nawakening);
+  const uint nworking = _nworking.load_relaxed();
+  const uint nawakening = _nawakening.load_relaxed();
 
-  return nworking + nawakening == AtomicAccess::load(&_nworkers);
+  return nworking + nawakening == _nworkers;
 }
 
 inline void ZMarkTerminate::set_resurrected(bool value) {
   // Update resurrected if it changed
   if (resurrected() != value) {
-    AtomicAccess::store(&_resurrected, value);
+    _resurrected.store_relaxed(value);
     if (value) {
       log_debug(gc, marking)("Resurrection broke termination");
     } else {
@@ -138,7 +135,7 @@ inline void ZMarkTerminate::set_resurrected(bool value) {
 }
 
 inline bool ZMarkTerminate::resurrected() const {
-  return AtomicAccess::load(&_resurrected);
+  return _resurrected.load_relaxed();
 }
 
 #endif // SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zNMethodTableIteration.cpp b/src/hotspot/share/gc/z/zNMethodTableIteration.cpp
index bdd4270ddac..423e98dd28b 100644
--- a/src/hotspot/share/gc/z/zNMethodTableIteration.cpp
+++ b/src/hotspot/share/gc/z/zNMethodTableIteration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 #include "gc/z/zNMethodTableEntry.hpp"
 #include "gc/z/zNMethodTableIteration.hpp"
 #include "memory/iterator.hpp"
-#include "runtime/atomicAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -42,11 +41,11 @@ void ZNMethodTableIteration::nmethods_do_begin(ZNMethodTableEntry* table, size_t
 
   _table = table;
   _size = size;
-  _claimed = 0;
+  _claimed.store_relaxed(0u);
 }
 
 void ZNMethodTableIteration::nmethods_do_end() {
-  assert(_claimed >= _size, "Failed to claim all table entries");
+  assert(_claimed.load_relaxed() >= _size, "Failed to claim all table entries");
 
   // Finish iteration
   _table = nullptr;
@@ -57,7 +56,7 @@ void ZNMethodTableIteration::nmethods_do(NMethodClosure* cl) {
     // Claim table partition. Each partition is currently sized to span
     // two cache lines. This number is just a guess, but seems to work well.
     const size_t partition_size = (ZCacheLineSize * 2) / sizeof(ZNMethodTableEntry);
-    const size_t partition_start = MIN2(AtomicAccess::fetch_then_add(&_claimed, partition_size), _size);
+    const size_t partition_start = MIN2(_claimed.fetch_then_add(partition_size), _size);
     const size_t partition_end = MIN2(partition_start + partition_size, _size);
     if (partition_start == partition_end) {
       // End of table
diff --git a/src/hotspot/share/gc/z/zNMethodTableIteration.hpp b/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
index 064c3eafca0..12dc096491d 100644
--- a/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
+++ b/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
 #define SHARE_GC_Z_ZNMETHODTABLEITERATION_HPP
 
 #include "gc/z/zGlobals.hpp"
+#include "runtime/atomic.hpp"
 
 class NMethodClosure;
 class ZNMethodTableEntry;
 
 class ZNMethodTableIteration {
 private:
-  ZNMethodTableEntry*            _table;
-  size_t                         _size;
-  ZCACHE_ALIGNED volatile size_t _claimed;
+  ZNMethodTableEntry*           _table;
+  size_t                        _size;
+  ZCACHE_ALIGNED Atomic<size_t> _claimed;
 
   bool in_progress() const;
 
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index da07f67d859..d51cf5abbae 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,31 +64,31 @@ ZRelocateQueue::ZRelocateQueue()
     _needs_attention(0) {}
 
 bool ZRelocateQueue::needs_attention() const {
-  return AtomicAccess::load(&_needs_attention) != 0;
+  return _needs_attention.load_relaxed() != 0;
 }
 
 void ZRelocateQueue::inc_needs_attention() {
-  const int needs_attention = AtomicAccess::add(&_needs_attention, 1);
+  const int needs_attention = _needs_attention.add_then_fetch(1);
   assert(needs_attention == 1 || needs_attention == 2, "Invalid state");
 }
 
 void ZRelocateQueue::dec_needs_attention() {
-  const int needs_attention = AtomicAccess::sub(&_needs_attention, 1);
+  const int needs_attention = _needs_attention.sub_then_fetch(1);
   assert(needs_attention == 0 || needs_attention == 1, "Invalid state");
 }
 
 void ZRelocateQueue::activate(uint nworkers) {
-  _is_active = true;
+  _is_active.store_relaxed(true);
   join(nworkers);
 }
 
 void ZRelocateQueue::deactivate() {
-  AtomicAccess::store(&_is_active, false);
+  _is_active.store_relaxed(false);
   clear();
 }
 
 bool ZRelocateQueue::is_active() const {
-  return AtomicAccess::load(&_is_active);
+  return _is_active.load_relaxed();
 }
 
 void ZRelocateQueue::join(uint nworkers) {
@@ -453,7 +453,7 @@ static void retire_target_page(ZGeneration* generation, ZPage* page) {
 class ZRelocateSmallAllocator {
 private:
   ZGeneration* const _generation;
-  volatile size_t    _in_place_count;
+  Atomic<size_t>     _in_place_count;
 
 public:
   ZRelocateSmallAllocator(ZGeneration* generation)
@@ -463,7 +463,7 @@ public:
   ZPage* alloc_and_retire_target_page(ZForwarding* forwarding, ZPage* target) {
     ZPage* const page = alloc_page(forwarding);
     if (page == nullptr) {
-      AtomicAccess::inc(&_in_place_count);
+      _in_place_count.add_then_fetch(1u);
     }
 
     if (target != nullptr) {
@@ -493,7 +493,7 @@ public:
   }
 
   size_t in_place_count() const {
-    return _in_place_count;
+    return _in_place_count.load_relaxed();
   }
 };
 
@@ -503,7 +503,7 @@ private:
   ZConditionLock      _lock;
   ZRelocationTargets* _shared_targets;
   bool                _in_place;
-  volatile size_t     _in_place_count;
+  Atomic<size_t>      _in_place_count;
 
 public:
   ZRelocateMediumAllocator(ZGeneration* generation, ZRelocationTargets* shared_targets)
@@ -539,7 +539,7 @@ public:
       ZPage* const to_page = alloc_page(forwarding);
       _shared_targets->set(partition_id, to_age, to_page);
       if (to_page == nullptr) {
-        AtomicAccess::inc(&_in_place_count);
+        _in_place_count.add_then_fetch(1u);
         _in_place = true;
       }
 
@@ -579,7 +579,7 @@ public:
   }
 
   size_t in_place_count() const {
-    return _in_place_count;
+    return _in_place_count.load_relaxed();
   }
 };
 
diff --git a/src/hotspot/share/gc/z/zRelocate.hpp b/src/hotspot/share/gc/z/zRelocate.hpp
index 038efba83eb..d25536e1bce 100644
--- a/src/hotspot/share/gc/z/zRelocate.hpp
+++ b/src/hotspot/share/gc/z/zRelocate.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
 #include "gc/z/zPageAge.hpp"
 #include "gc/z/zRelocationSet.hpp"
 #include "gc/z/zValue.hpp"
+#include "runtime/atomic.hpp"
 
 class ZForwarding;
 class ZGeneration;
@@ -42,8 +43,8 @@ private:
   uint                 _nworkers;
   uint                 _nsynchronized;
   bool                 _synchronize;
-  volatile bool        _is_active;
-  volatile int         _needs_attention;
+  Atomic<bool>         _is_active;
+  Atomic<int>          _needs_attention;
 
   bool needs_attention() const;
   void inc_needs_attention();
diff --git a/src/hotspot/share/gc/z/zTLABUsage.cpp b/src/hotspot/share/gc/z/zTLABUsage.cpp
index c2e3db6bedf..d3613cf8632 100644
--- a/src/hotspot/share/gc/z/zTLABUsage.cpp
+++ b/src/hotspot/share/gc/z/zTLABUsage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,24 +23,23 @@
 
 #include "gc/z/zTLABUsage.hpp"
 #include "logging/log.hpp"
-#include "runtime/atomicAccess.hpp"
 
 ZTLABUsage::ZTLABUsage()
   : _used(0),
     _used_history() {}
 
 void ZTLABUsage::increase_used(size_t size) {
-  AtomicAccess::add(&_used, size, memory_order_relaxed);
+  _used.add_then_fetch(size, memory_order_relaxed);
 }
 
 void ZTLABUsage::decrease_used(size_t size) {
-  precond(size <= _used);
+  precond(size <= _used.load_relaxed());
 
-  AtomicAccess::sub(&_used, size, memory_order_relaxed);
+  _used.sub_then_fetch(size, memory_order_relaxed);
 }
 
 void ZTLABUsage::reset() {
-  const size_t used = AtomicAccess::xchg(&_used, (size_t) 0);
+  const size_t used = _used.exchange(0u);
 
   // Avoid updates when nothing has been allocated since the last YC
   if (used == 0) {
diff --git a/src/hotspot/share/gc/z/zTLABUsage.hpp b/src/hotspot/share/gc/z/zTLABUsage.hpp
index 3d1b084fe16..68c7620c26e 100644
--- a/src/hotspot/share/gc/z/zTLABUsage.hpp
+++ b/src/hotspot/share/gc/z/zTLABUsage.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 #ifndef SHARE_GC_Z_ZTLABUSAGE_HPP
 #define SHARE_GC_Z_ZTLABUSAGE_HPP
 
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/numberSeq.hpp"
 
@@ -42,9 +43,9 @@
 class ZTLABUsage {
 private:
   // Accounting TLAB used until the next GC cycle
-  volatile size_t _used;
+  Atomic<size_t> _used;
   // Sequence of historic used values
-  TruncatedSeq    _used_history;
+  TruncatedSeq   _used_history;
 
 public:
   ZTLABUsage();
diff --git a/src/hotspot/share/gc/z/zUtils.inline.hpp b/src/hotspot/share/gc/z/zUtils.inline.hpp
index b83f42d18e6..a221a925498 100644
--- a/src/hotspot/share/gc/z/zUtils.inline.hpp
+++ b/src/hotspot/share/gc/z/zUtils.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,9 @@
 inline uintptr_t ZUtils::alloc_aligned_unfreeable(size_t alignment, size_t size) {
   const size_t padded_size = size + (alignment - 1);
   void* const addr = os::malloc(padded_size, mtGC);
+  if (addr == nullptr) {
+    vm_exit_out_of_memory(padded_size, OOM_MALLOC_ERROR, "ZGC alloc_aligned_unfreeable malloc failed");
+  }
   void* const aligned_addr = align_up(addr, alignment);
 
   memset(aligned_addr, 0, size);
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index a7bc896172c..76de42db755 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
 #define CDS_DYNAMIC_ARCHIVE_MAGIC 0xf00baba8
 #define CDS_PREIMAGE_ARCHIVE_MAGIC 0xcafea07c
 #define CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION 13
-#define CURRENT_CDS_ARCHIVE_VERSION 19
+#define CURRENT_CDS_ARCHIVE_VERSION 20
 
 typedef struct CDSFileMapRegion {
   int     _crc;               // CRC checksum of this region.
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index 7236679d8f3..f99e8f162c6 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -301,7 +301,7 @@ JVM_Interrupt(JNIEnv *env, jobject thread);
 JNIEXPORT jboolean JNICALL
 JVM_HoldsLock(JNIEnv *env, jclass threadClass, jobject obj);
 
-JNIEXPORT jobject JNICALL
+JNIEXPORT jobjectArray JNICALL
 JVM_GetStackTrace(JNIEnv *env, jobject thread);
 
 JNIEXPORT jobject JNICALL
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.cpp b/src/hotspot/share/interpreter/bytecodeTracer.cpp
index f9980e389e2..21974218957 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.cpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,25 +185,29 @@ static Method* _method_currently_being_printed = nullptr;
 void BytecodeTracer::trace_interpreter(const methodHandle& method, address bcp, uintptr_t tos, uintptr_t tos2, outputStream* st) {
   if (TraceBytecodes && BytecodeCounter::counter_value() >= TraceBytecodesAt) {
     BytecodePrinter printer(AtomicAccess::load_acquire(&_method_currently_being_printed));
-    printer.trace(method, bcp, tos, tos2, st);
+    stringStream buf;
+    printer.trace(method, bcp, tos, tos2, &buf);
+    st->print("%s", buf.freeze());
     // Save method currently being printed to detect when method printing changes.
     AtomicAccess::release_store(&_method_currently_being_printed, method());
   }
 }
 #endif
 
-void BytecodeTracer::print_method_codes(const methodHandle& method, int from, int to, outputStream* st, int flags) {
+void BytecodeTracer::print_method_codes(const methodHandle& method, int from, int to, outputStream* st, int flags, bool buffered) {
   BytecodePrinter method_printer(flags);
   BytecodeStream s(method);
   s.set_interval(from, to);
 
-  // Keep output to st coherent: collect all lines and print at once.
   ResourceMark rm;
   stringStream ss;
+  outputStream* out = buffered ? &ss : st;
   while (s.next() >= 0) {
-    method_printer.trace(method, s.bcp(), &ss);
+    method_printer.trace(method, s.bcp(), out);
+  }
+  if (buffered) {
+    st->print("%s", ss.as_string());
   }
-  st->print("%s", ss.as_string());
 }
 
 void BytecodePrinter::print_constant(int cp_index, outputStream* st) {
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp
index b32e55abbcf..ab66030b6cd 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.hpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@ class outputStream;
 class BytecodeClosure;
 class BytecodeTracer: AllStatic {
  public:
-  NOT_PRODUCT(static void trace_interpreter(const methodHandle& method, address bcp, uintptr_t tos, uintptr_t tos2, outputStream* st = tty);)
-  static void print_method_codes(const methodHandle& method, int from, int to, outputStream* st, int flags);
+  NOT_PRODUCT(static void trace_interpreter(const methodHandle& method, address bcp, uintptr_t tos, uintptr_t tos2, outputStream* st);)
+  static void print_method_codes(const methodHandle& method, int from, int to, outputStream* st, int flags, bool buffered = true);
 };
 
 #endif // SHARE_INTERPRETER_BYTECODETRACER_HPP
diff --git a/src/hotspot/share/interpreter/interpreter.hpp b/src/hotspot/share/interpreter/interpreter.hpp
index 576146b344e..f7d42fcb4da 100644
--- a/src/hotspot/share/interpreter/interpreter.hpp
+++ b/src/hotspot/share/interpreter/interpreter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ class InterpreterCodelet: public Stub {
   // General info/converters
   int     size() const                           { return _size; }
   static  int alignment()                        { return HeapWordSize; }
-  static  int code_alignment()                   { return CodeEntryAlignment; }
+  static uint code_alignment()                   { return CodeEntryAlignment; }
 
   // Code info
   address code_begin() const                     { return align_up((address)this + sizeof(InterpreterCodelet), code_alignment()); }
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index b985d2af6ff..e3cf5d589c2 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -711,9 +711,7 @@ void InterpreterRuntime::resolve_get_put(Bytecodes::Code bytecode, int field_ind
   }
 
   ResolvedFieldEntry* entry = pool->resolved_field_entry_at(field_index);
-  entry->set_flags(info.access_flags().is_final(), info.access_flags().is_volatile());
-  entry->fill_in(info.field_holder(), info.offset(),
-                 checked_cast<u2>(info.index()), checked_cast<u1>(state),
+  entry->fill_in(info, checked_cast<u1>(state),
                  static_cast<u1>(get_code), static_cast<u1>(put_code));
 }
 
@@ -1189,10 +1187,9 @@ JRT_LEAF(void, InterpreterRuntime::at_unwind(JavaThread* current))
 JRT_END
 
 JRT_ENTRY(void, InterpreterRuntime::post_field_access(JavaThread* current, oopDesc* obj,
-                                                      ResolvedFieldEntry *entry))
+                                                      ResolvedFieldEntry* entry))
 
   // check the access_flags for the field in the klass
-
   InstanceKlass* ik = entry->field_holder();
   int index = entry->field_index();
   if (!ik->field_status(index).is_access_watched()) return;
@@ -1212,11 +1209,10 @@ JRT_ENTRY(void, InterpreterRuntime::post_field_access(JavaThread* current, oopDe
 JRT_END
 
 JRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread* current, oopDesc* obj,
-                                                            ResolvedFieldEntry *entry, jvalue *value))
-
-  InstanceKlass* ik = entry->field_holder();
+                                                            ResolvedFieldEntry* entry, jvalue* value))
 
   // check the access_flags for the field in the klass
+  InstanceKlass* ik = entry->field_holder();
   int index = entry->field_index();
   // bail out if field modifications are not watched
   if (!ik->field_status(index).is_modification_watched()) return;
@@ -1522,7 +1518,7 @@ JRT_LEAF(intptr_t, InterpreterRuntime::trace_bytecode(JavaThread* current, intpt
   LastFrameAccessor last_frame(current);
   assert(last_frame.is_interpreted_frame(), "must be an interpreted frame");
   methodHandle mh(current, last_frame.method());
-  BytecodeTracer::trace_interpreter(mh, last_frame.bcp(), tos, tos2);
+  BytecodeTracer::trace_interpreter(mh, last_frame.bcp(), tos, tos2, tty);
   return preserve_this_value;
 JRT_END
 #endif // !PRODUCT
diff --git a/src/hotspot/share/interpreter/rewriter.hpp b/src/hotspot/share/interpreter/rewriter.hpp
index b5a4ad4870f..92e8e7db534 100644
--- a/src/hotspot/share/interpreter/rewriter.hpp
+++ b/src/hotspot/share/interpreter/rewriter.hpp
@@ -78,9 +78,6 @@ class Rewriter: public StackObj {
     _resolved_reference_limit = _resolved_references_map.length();
   }
 
-  int  cp_entry_to_cp_cache(int i) { assert(has_cp_cache(i), "oob"); return _cp_map.at(i); }
-  bool has_cp_cache(int i) { return (uint) i < (uint) _cp_map.length() && _cp_map.at(i) >= 0; }
-
   int add_map_entry(int cp_index, GrowableArray<int>* cp_map, GrowableArray<int>* cp_cache_map) {
     assert(cp_map->at(cp_index) == -1, "not twice on same cp_index");
     int cache_index = cp_cache_map->append(cp_index);
diff --git a/src/hotspot/share/jfr/jfr.cpp b/src/hotspot/share/jfr/jfr.cpp
index b09a89594ad..d9892f80b6f 100644
--- a/src/hotspot/share/jfr/jfr.cpp
+++ b/src/hotspot/share/jfr/jfr.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "jfr/recorder/repository/jfrEmergencyDump.hpp"
 #include "jfr/recorder/repository/jfrRepository.hpp"
 #include "jfr/recorder/service/jfrOptionSet.hpp"
+#include "jfr/recorder/service/jfrRecorderService.hpp"
 #include "jfr/support/jfrClassDefineEvent.hpp"
 #include "jfr/support/jfrKlassExtension.hpp"
 #include "jfr/support/jfrResolution.hpp"
@@ -43,6 +44,7 @@
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"
 
+
 bool Jfr::is_enabled() {
   return JfrRecorder::is_enabled();
 }
@@ -153,9 +155,9 @@ void Jfr::on_resolution(const Method* caller, const Method* target, TRAPS) {
 }
 #endif
 
-void Jfr::on_vm_shutdown(bool emit_old_object_samples, bool emit_event_shutdown, bool halt) {
+void Jfr::on_vm_shutdown(bool exception_handler /* false */, bool halt /* false */, bool oom /* false */) {
   if (!halt && JfrRecorder::is_recording()) {
-    JfrEmergencyDump::on_vm_shutdown(emit_old_object_samples, emit_event_shutdown);
+    JfrEmergencyDump::on_vm_shutdown(exception_handler, oom);
   }
 }
 
@@ -173,6 +175,12 @@ bool Jfr::on_start_flight_recording_option(const JavaVMOption** option, char* de
   return JfrOptionSet::parse_start_flight_recording_option(option, delimiter);
 }
 
+void Jfr::on_report_java_out_of_memory() {
+  if (CrashOnOutOfMemoryError && JfrRecorder::is_recording()) {
+    JfrRecorderService::emit_leakprofiler_events_on_oom();
+  }
+}
+
 #if INCLUDE_CDS
 void Jfr::on_restoration(const Klass* k, JavaThread* jt) {
   assert(k != nullptr, "invariant");
diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp
index db567cc9a29..ac6a232dda1 100644
--- a/src/hotspot/share/jfr/jfr.hpp
+++ b/src/hotspot/share/jfr/jfr.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ class Jfr : AllStatic {
   static void on_resolution(const Method* caller, const Method* target, TRAPS);
   static void on_java_thread_start(JavaThread* starter, JavaThread* startee);
   static void on_set_current_thread(JavaThread* jt, oop thread);
-  static void on_vm_shutdown(bool emit_old_object_samples, bool emit_event_shutdown, bool halt = false);
+  static void on_vm_shutdown(bool exception_handler = false, bool halt = false, bool oom = false);
   static void on_vm_error_report(outputStream* st);
   static bool on_flight_recorder_option(const JavaVMOption** option, char* delimiter);
   static bool on_start_flight_recording_option(const JavaVMOption** option, char* delimiter);
@@ -79,6 +79,7 @@ class Jfr : AllStatic {
   static void initialize_main_thread(JavaThread* jt);
   static bool has_sample_request(JavaThread* jt);
   static void check_and_process_sample_request(JavaThread* jt);
+  static void on_report_java_out_of_memory();
   CDS_ONLY(static void on_restoration(const Klass* k, JavaThread* jt);)
 };
 
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index 6a1146587bc..885484020bd 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,10 +66,6 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-#ifdef LINUX
-#include "os_linux.hpp"
-#include "osContainer_linux.hpp"
-#endif
 
 #define NO_TRANSITION(result_type, header) extern "C" { result_type JNICALL header {
 #define NO_TRANSITION_END } }
@@ -364,8 +360,7 @@ JVM_ENTRY_NO_ENV(void, jfr_set_force_instrumentation(JNIEnv* env, jclass jvm, jb
 JVM_END
 
 NO_TRANSITION(void, jfr_emit_old_object_samples(JNIEnv* env, jclass jvm, jlong cutoff_ticks, jboolean emit_all, jboolean skip_bfs))
-  JfrRecorderService service;
-  service.emit_leakprofiler_events(cutoff_ticks, emit_all == JNI_TRUE, skip_bfs == JNI_TRUE);
+  JfrRecorderService::emit_leakprofiler_events(cutoff_ticks, emit_all == JNI_TRUE, skip_bfs == JNI_TRUE);
 NO_TRANSITION_END
 
 JVM_ENTRY_NO_ENV(void, jfr_exclude_thread(JNIEnv* env, jclass jvm, jobject t))
@@ -401,35 +396,18 @@ JVM_ENTRY_NO_ENV(jboolean, jfr_is_class_instrumented(JNIEnv* env, jclass jvm, jc
 JVM_END
 
 JVM_ENTRY_NO_ENV(jboolean, jfr_is_containerized(JNIEnv* env, jclass jvm))
-#ifdef LINUX
-  return OSContainer::is_containerized();
-#else
-  return false;
-#endif
+  return os::is_containerized();
 JVM_END
 
 JVM_ENTRY_NO_ENV(jlong, jfr_host_total_memory(JNIEnv* env, jclass jvm))
-#ifdef LINUX
-  // We want the host memory, not the container limit.
-  // os::physical_memory() would return the container limit.
-  return static_cast<jlong>(os::Linux::physical_memory());
-#else
-  return static_cast<jlong>(os::physical_memory());
-#endif
+  return static_cast<jlong>(os::Machine::physical_memory());
 JVM_END
 
 JVM_ENTRY_NO_ENV(jlong, jfr_host_total_swap_memory(JNIEnv* env, jclass jvm))
-#ifdef LINUX
-  // We want the host swap memory, not the container value.
-  physical_memory_size_type host_swap = 0;
-  (void)os::Linux::host_swap(host_swap); // Discard return value and treat as no swap
-  return static_cast<jlong>(host_swap);
-#else
   physical_memory_size_type total_swap_space = 0;
   // Return value ignored - defaulting to 0 on failure.
-  (void)os::total_swap_space(total_swap_space);
+  (void)os::Machine::total_swap_space(total_swap_space);
   return static_cast<jlong>(total_swap_space);
-#endif
 JVM_END
 
 JVM_ENTRY_NO_ENV(void, jfr_emit_data_loss(JNIEnv* env, jclass jvm, jlong bytes))
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index b30ebd8108c..426ba4e7650 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -493,7 +493,7 @@ TRACE_REQUEST_FUNC(InitialSystemProperty) {
 TRACE_REQUEST_FUNC(ThreadAllocationStatistics) {
   ResourceMark rm;
   int initial_size = Threads::number_of_threads();
-  GrowableArray<jlong> allocated(initial_size);
+  GrowableArray<uint64_t> allocated(initial_size);
   GrowableArray<traceid> thread_ids(initial_size);
   JfrTicks time_stamp = JfrTicks::now();
   JfrJavaThreadIterator iter;
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
index 7049df0198b..68a47193e55 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrSampleRequest.cpp
@@ -58,29 +58,22 @@ static inline bool in_stack(intptr_t* ptr, JavaThread* jt) {
   return jt->is_in_full_stack_checked(reinterpret_cast<address>(ptr));
 }
 
+#ifdef ASSERT
 static inline bool sp_in_stack(const JfrSampleRequest& request, JavaThread* jt) {
   return in_stack(static_cast<intptr_t*>(request._sample_sp), jt);
 }
+#endif // ASSERT
 
 static inline bool fp_in_stack(const JfrSampleRequest& request, JavaThread* jt) {
   return in_stack(static_cast<intptr_t*>(request._sample_bcp), jt);
 }
 
-static inline void update_interpreter_frame_sender_pc(JfrSampleRequest& request, intptr_t* fp) {
-  request._sample_pc = frame::interpreter_return_address(fp);
-}
-
 static inline void update_interpreter_frame_pc(JfrSampleRequest& request, JavaThread* jt) {
   assert(fp_in_stack(request, jt), "invariant");
   assert(is_interpreter(request), "invariant");
   request._sample_pc = frame::interpreter_return_address(static_cast<intptr_t*>(request._sample_bcp));
 }
 
-static inline address interpreter_frame_return_address(const JfrSampleRequest& request) {
-  assert(is_interpreter(request), "invariant");
-  return frame::interpreter_return_address(static_cast<intptr_t*>(request._sample_bcp));
-}
-
 static inline intptr_t* frame_sender_sp(const JfrSampleRequest& request, JavaThread* jt) {
   assert(fp_in_stack(request, jt), "invariant");
   return frame::sender_sp(static_cast<intptr_t*>(request._sample_bcp));
@@ -90,29 +83,10 @@ static inline void update_frame_sender_sp(JfrSampleRequest& request, JavaThread*
   request._sample_sp = frame_sender_sp(request, jt);
 }
 
-static inline void update_frame_sender_sp(JfrSampleRequest& request, intptr_t* fp) {
-  request._sample_sp = frame::sender_sp(fp);
-}
-
 static inline intptr_t* frame_link(const JfrSampleRequest& request) {
   return frame::link(static_cast<intptr_t*>(request._sample_bcp));
 }
 
-static inline void update_sp(JfrSampleRequest& request, int frame_size) {
-  assert(frame_size >= 0, "invariant");
-  request._sample_sp = static_cast<intptr_t*>(request._sample_sp) + frame_size;
-}
-
-static inline void update_pc(JfrSampleRequest& request) {
-  assert(request._sample_sp != nullptr, "invariant");
-  request._sample_pc = frame::return_address(static_cast<intptr_t*>(request._sample_sp));
-}
-
-static inline void update_fp(JfrSampleRequest& request) {
-  assert(request._sample_sp != nullptr, "invariant");
-  request._sample_bcp = is_interpreter(request) ? frame::fp(static_cast<intptr_t*>(request._sample_sp)) : nullptr;
-}
-
 // Less extensive sanity checks for an interpreter frame.
 static bool is_valid_interpreter_frame(const JfrSampleRequest& request, JavaThread* jt) {
   assert(sp_in_stack(request, jt), "invariant");
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
index 7e7747ba396..0a8b3975139 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -232,41 +232,50 @@ void JfrSamplerThread::task_stacktrace(JfrSampleRequestType type, JavaThread** l
   JavaThread* start = nullptr;
   elapsedTimer sample_time;
   sample_time.start();
-  ThreadsListHandle tlh;
-  // Resolve a sample session relative start position index into the thread list array.
-  // In cases where the last sampled thread is null or not-null but stale, find_index() returns -1.
-  _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
-  JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
+  {
+    /*
+     * Take the Threads_lock for three purposes:
+     *
+     * 1) Avoid sampling right through a safepoint,
+     *    which could result in touching oops in case of virtual threads.
+     * 2) Prevent JFR from issuing an epoch rotation while the sampler thread
+     *    is actively processing a thread in state native, as both threads are outside the safepoint protocol.
+     * 3) Some operating systems (BSD / Mac) require a process lock when sending a signal with pthread_kill.
+     *    Holding the Threads_lock prevents a JavaThread from calling os::create_thread(), which also takes the process lock.
+     *    In a sense, we provide a coarse signal mask, so we can always send the resume signal.
+     */
+    MutexLocker tlock(Threads_lock);
+    ThreadsListHandle tlh;
+    // Resolve a sample session relative start position index into the thread list array.
+    // In cases where the last sampled thread is null or not-null but stale, find_index() returns -1.
+    _cur_index = tlh.list()->find_index_of_JavaThread(*last_thread);
+    JavaThread* current = _cur_index != -1 ? *last_thread : nullptr;
 
-  while (num_samples < sample_limit) {
-    current = next_thread(tlh.list(), start, current);
-    if (current == nullptr) {
-      break;
-    }
-    if (is_excluded(current)) {
-      continue;
-    }
-    if (start == nullptr) {
-      start = current; // remember the thread where we started to attempt sampling
-    }
-    bool success;
-    if (JAVA_SAMPLE == type) {
-      success = sample_java_thread(current);
-    } else {
-      assert(type == NATIVE_SAMPLE, "invariant");
-      success = sample_native_thread(current);
-    }
-    if (success) {
-      num_samples++;
-    }
-    if (SafepointSynchronize::is_at_safepoint()) {
-      // For _thread_in_native, we cannot get the Threads_lock.
-      // For _thread_in_Java, well, there are none.
-      break;
+    while (num_samples < sample_limit) {
+      current = next_thread(tlh.list(), start, current);
+      if (current == nullptr) {
+        break;
+      }
+      if (is_excluded(current)) {
+        continue;
+      }
+      if (start == nullptr) {
+        start = current; // remember the thread where we started to attempt sampling
+      }
+      bool success;
+      if (JAVA_SAMPLE == type) {
+        success = sample_java_thread(current);
+      } else {
+        assert(type == NATIVE_SAMPLE, "invariant");
+        success = sample_native_thread(current);
+      }
+      if (success) {
+        num_samples++;
+      }
     }
+
+    *last_thread = current; // remember the thread we last attempted to sample
   }
-
-  *last_thread = current; // remember the thread we last attempted to sample
   sample_time.stop();
   log_trace(jfr)("JFR thread sampling done in %3.7f secs with %d java %d native samples",
     sample_time.seconds(), type == JAVA_SAMPLE ? num_samples : 0, type == NATIVE_SAMPLE ? num_samples : 0);
@@ -297,6 +306,7 @@ class OSThreadSampler : public SuspendedThreadTask {
 // Sampling a thread in state _thread_in_Java
 // involves a platform-specific thread suspend and CPU context retrieval.
 bool JfrSamplerThread::sample_java_thread(JavaThread* jt) {
+  assert_lock_strong(Threads_lock);
   if (jt->thread_state() != _thread_in_Java) {
     return false;
   }
@@ -328,6 +338,7 @@ static JfrSamplerThread* _sampler_thread = nullptr;
 // without thread suspension and CPU context retrieval,
 // if we carefully order the loads of the thread state.
 bool JfrSamplerThread::sample_native_thread(JavaThread* jt) {
+  assert_lock_strong(Threads_lock);
   if (jt->thread_state() != _thread_in_native) {
     return false;
   }
@@ -343,24 +354,14 @@ bool JfrSamplerThread::sample_native_thread(JavaThread* jt) {
 
   SafepointMechanism::arm_local_poll_release(jt);
 
-  // Take the Threads_lock for two purposes:
-  // 1) Avoid sampling through a safepoint which could result
-  //    in touching oops in case of virtual threads.
-  // 2) Prevent JFR from issuing an epoch rotation while the sampler thread
-  //    is actively processing a thread in native, as both threads are now
-  //    outside the safepoint protocol.
-
-  // OrderAccess::fence() as part of acquiring the lock prevents loads from floating up.
-  JfrMutexTryLock threads_lock(Threads_lock);
-
-  if (!threads_lock.acquired() || !jt->has_last_Java_frame()) {
-    // Remove the native sample request and release the potentially waiting thread.
-    JfrSampleMonitor jsm(tl);
-    return false;
+  // Separate the arming of the poll (above) from the reading of JavaThread state (below).
+  if (UseSystemMemoryBarrier) {
+    SystemMemoryBarrier::emit();
+  } else {
+    OrderAccess::fence();
   }
 
-  if (jt->thread_state() != _thread_in_native) {
-    assert_lock_strong(Threads_lock);
+  if (jt->thread_state() != _thread_in_native || !jt->has_last_Java_frame()) {
     JfrSampleMonitor jsm(tl);
     if (jsm.is_waiting()) {
       // The thread has already returned from native,
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
index 534c9996cfe..7c0f8c02e69 100644
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampling.cpp
@@ -66,10 +66,6 @@ static inline void send_safepoint_latency_event(const JfrSampleRequest& request,
   }
 }
 
-static inline bool is_interpreter(address pc) {
-  return Interpreter::contains(pc);
-}
-
 static inline bool is_interpreter(const JfrSampleRequest& request) {
   return request._sample_bcp != nullptr;
 }
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
index ff688a297ed..c6c1b4cad60 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -176,6 +176,7 @@ static inline bool is_global(ConstBufferPtr buffer) {
   return buffer->context() == JFR_GLOBAL;
 }
 
+#ifdef ASSERT
 static inline bool is_thread_local(ConstBufferPtr buffer) {
   assert(buffer != nullptr, "invariant");
   return buffer->context() == JFR_THREADLOCAL;
@@ -185,6 +186,7 @@ static inline bool is_virtual_thread_local(ConstBufferPtr buffer) {
   assert(buffer != nullptr, "invariant");
   return buffer->context() == JFR_VIRTUAL_THREADLOCAL;
 }
+#endif // ASSERT
 
 BufferPtr JfrCheckpointManager::lease_global(Thread* thread, bool previous_epoch /* false */, size_t size /* 0 */) {
   JfrCheckpointMspace* const mspace = instance()._global_mspace;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index b1c502e17f8..3dd9ea41d3d 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -1265,7 +1265,7 @@ static size_t teardown() {
     JfrKlassUnloading::clear();
     _artifacts->clear();
     _initial_type_set = true;
-  } else {
+  } else if (is_initial_typeset_for_chunk()) {
     _initial_type_set = false;
   }
   return total_count;
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index 6a6da0f9b04..5c12d5213ca 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,6 +102,9 @@ bool JfrRecorder::on_create_vm_1() {
     if (!create_checkpoint_manager()) {
       return false;
     }
+    if (!JfrSymbolTable::create()) {
+      return false;
+    }
   }
 
   // fast time initialization
@@ -240,7 +243,7 @@ bool JfrRecorder::on_create_vm_2() {
 }
 
 bool JfrRecorder::on_create_vm_3() {
-  JVMTI_ONLY( assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_LIVE, "invalid init sequence"); )
+  JVMTI_ONLY( assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_LIVE, "invalid init sequence, phase is %d", (int)JvmtiEnvBase::get_phase()); )
   return CDSConfig::is_dumping_archive() || launch_command_line_recordings(JavaThread::current());
 }
 
@@ -316,10 +319,7 @@ bool JfrRecorder::create_components() {
   if (!create_thread_group_manager()) {
     return false;
   }
-  if (!create_symbol_table()) {
-    return false;
-  }
-  return true;
+  return create_symbol_table();
 }
 
 // subsystems
@@ -418,7 +418,13 @@ bool JfrRecorder::create_thread_group_manager() {
 }
 
 bool JfrRecorder::create_symbol_table() {
-  return JfrSymbolTable::create();
+  return !is_started_on_commandline() ? JfrSymbolTable::create() : true;
+}
+
+void JfrRecorder::destroy_symbol_table() {
+  if (!is_started_on_commandline()) {
+    JfrSymbolTable::destroy();
+  }
 }
 
 void JfrRecorder::destroy_components() {
@@ -461,7 +467,7 @@ void JfrRecorder::destroy_components() {
   }
   JfrEventThrottler::destroy();
   JfrThreadGroupManager::destroy();
-  JfrSymbolTable::destroy();
+  destroy_symbol_table();
 }
 
 bool JfrRecorder::create_recorder_thread() {
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
index 8cc4521669d..fa1b677b31a 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp
@@ -59,6 +59,7 @@ class JfrRecorder : public JfrCHeapObj {
   static bool create_event_throttler();
   static bool create_symbol_table();
   static bool create_components();
+  static void destroy_symbol_table();
   static void destroy_components();
   static void on_recorder_thread_exit();
 
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
index 309ae961808..cdebcbcfcb5 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,8 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/thread.inline.hpp"
+#include "runtime/vmOperations.hpp"
+#include "runtime/vmThread.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/ostream.hpp"
 
@@ -460,15 +462,6 @@ static void release_locks(Thread* thread) {
   assert(thread != nullptr, "invariant");
   assert(!thread->is_Java_thread() || JavaThread::cast(thread)->thread_state() == _thread_in_vm, "invariant");
 
-#ifdef ASSERT
-  Mutex* owned_lock = thread->owned_locks();
-  while (owned_lock != nullptr) {
-    Mutex* next = owned_lock->next();
-    owned_lock->unlock();
-    owned_lock = next;
-  }
-#endif // ASSERT
-
   if (Threads_lock->owned_by_self()) {
     Threads_lock->unlock();
   }
@@ -550,17 +543,14 @@ class JavaThreadInVMAndNative : public StackObj {
   }
 };
 
-static void post_events(bool emit_old_object_samples, bool emit_event_shutdown, Thread* thread) {
-  if (emit_old_object_samples) {
-    LeakProfiler::emit_events(max_jlong, false, false);
-  }
-  if (emit_event_shutdown) {
+static void post_events(bool exception_handler, bool oom, Thread * thread) {
+  if (exception_handler) {
     EventShutdown e;
-    e.set_reason("VM Error");
+    e.set_reason(oom ? "CrashOnOutOfMemoryError" : "VM Error");
     e.commit();
   }
   EventDumpReason event;
-  event.set_reason(emit_old_object_samples ? "Out of Memory" : "Crash");
+  event.set_reason(exception_handler && oom ? "CrashOnOutOfMemoryError" : exception_handler ? "Crash" : "Out of Memory");
   event.set_recordingId(-1);
   event.commit();
 }
@@ -594,20 +584,40 @@ static bool guard_reentrancy() {
   return false;
 }
 
-void JfrEmergencyDump::on_vm_shutdown(bool emit_old_object_samples, bool emit_event_shutdown) {
+void JfrEmergencyDump::on_vm_shutdown(bool exception_handler, bool oom) {
   if (!guard_reentrancy()) {
     return;
   }
+
   Thread* const thread = Thread::current_or_null_safe();
   assert(thread != nullptr, "invariant");
-  if (thread->is_Watcher_thread()) {
-    log_info(jfr, system)("The Watcher thread crashed so no jfr emergency dump will be generated.");
-    return;
-  }
+
   // Ensure a JavaThread is _thread_in_vm when we make this call
   JavaThreadInVMAndNative jtivm(thread);
+  post_events(exception_handler, oom, thread);
+
+  if (thread->is_Watcher_thread()) {
+    // We cannot attempt an emergency dump using the Watcher thread
+    // because we rely on the WatcherThread task "is_error_reported()",
+    // to exit the VM after a hardcoded timeout, should the relatively
+    // risky operation of an emergency dump fail (deadlock, livelock).
+    log_warning(jfr, system)
+      ("The Watcher thread crashed so no jfr emergency dump will be generated.");
+    return;
+  }
+
+  if (thread->is_VM_thread()) {
+    const VM_Operation* const operation = VMThread::vm_operation();
+    if (operation != nullptr && operation->type() == VM_Operation::VMOp_JFROldObject) {
+      // We will not be able to issue a rotation because the rotation lock
+      // is held by the JFR Recorder Thread that issued the VM_Operation.
+      log_warning(jfr, system)
+        ("The VM Thread crashed as part of emitting leak profiler events so no jfr emergency dump will be generated.");
+      return;
+    }
+  }
+
   release_locks(thread);
-  post_events(emit_old_object_samples, emit_event_shutdown, thread);
 
   // if JavaThread, transition to _thread_in_native to issue a final flushpoint
   NoHandleMark nhm;
diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
index 04c2851a516..b337d73364a 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ class JfrEmergencyDump : AllStatic {
   static const char* chunk_path(const char* repository_path);
   static void on_vm_error(const char* repository_path);
   static void on_vm_error_report(outputStream* st, const char* repository_path);
-  static void on_vm_shutdown(bool emit_old_object_samples, bool emit_event_shutdown);
+  static void on_vm_shutdown(bool exception_handler, bool oom);
 };
 
 #endif // SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp b/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp
index a9ba456ad76..6db7a42ab27 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,8 @@
                              (MSGBIT(MSG_START))  |          \
                              (MSGBIT(MSG_CLONE_IN_MEMORY)) | \
                              (MSGBIT(MSG_VM_ERROR))        | \
-                             (MSGBIT(MSG_FLUSHPOINT))        \
+                             (MSGBIT(MSG_FLUSHPOINT))      | \
+                             (MSGBIT(MSG_EMIT_LEAKP_REFCHAINS)) \
                            )
 
 static JfrPostBox* _instance = nullptr;
@@ -165,7 +166,7 @@ void JfrPostBox::notify_waiters() {
   assert(JfrMsg_lock->owned_by_self(), "incrementing _msg_handled_serial is protected by JfrMsg_lock.");
   // Update made visible on release of JfrMsg_lock via fence instruction in Monitor::IUnlock.
   ++_msg_handled_serial;
-  JfrMsg_lock->notify();
+  JfrMsg_lock->notify_all();
 }
 
 // safeguard to ensure no threads are left waiting
diff --git a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
index 10457261643..92f70b1dc9b 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ enum JFR_Msg {
   MSG_SHUTDOWN,
   MSG_VM_ERROR,
   MSG_FLUSHPOINT,
+  MSG_EMIT_LEAKP_REFCHAINS,
   MSG_NO_OF_MSGS
 };
 
@@ -51,23 +52,25 @@ enum JFR_Msg {
  *
  *  Synchronous messages (posting thread waits for message completion):
  *
- *  MSG_CLONE_IN_MEMORY (0) ; MSGBIT(MSG_CLONE_IN_MEMORY) == (1 << 0) == 0x1
- *  MSG_START(1)            ; MSGBIT(MSG_START) == (1 << 0x1) == 0x2
- *  MSG_STOP (2)            ; MSGBIT(MSG_STOP) == (1 << 0x2) == 0x4
- *  MSG_ROTATE (3)          ; MSGBIT(MSG_ROTATE) == (1 << 0x3) == 0x8
- *  MSG_VM_ERROR (8)        ; MSGBIT(MSG_VM_ERROR) == (1 << 0x8) == 0x100
- *  MSG_FLUSHPOINT (9)     ; MSGBIT(MSG_FLUSHPOINT) == (1 << 0x9) == 0x200
+ *  MSG_CLONE_IN_MEMORY (0)      ; MSGBIT(MSG_CLONE_IN_MEMORY) == (1 << 0) == 0x1
+ *  MSG_START(1)                 ; MSGBIT(MSG_START) == (1 << 0x1) == 0x2
+ *  MSG_STOP (2)                 ; MSGBIT(MSG_STOP) == (1 << 0x2) == 0x4
+ *  MSG_ROTATE (3)               ; MSGBIT(MSG_ROTATE) == (1 << 0x3) == 0x8
+ *  MSG_VM_ERROR (8)             ; MSGBIT(MSG_VM_ERROR) == (1 << 0x8) == 0x100
+ *  MSG_FLUSHPOINT (9)           ; MSGBIT(MSG_FLUSHPOINT) == (1 << 0x9) == 0x200
+ *  MSG_EMIT_LEAKP_REFCHAINS (10); MSGBIT(MSG_EMIT_LEAKP_REFCHAINS) == (1 << 0xa) == 0x400
  *
  *  Asynchronous messages (posting thread returns immediately upon deposit):
  *
- *  MSG_FULLBUFFER (4)      ; MSGBIT(MSG_FULLBUFFER) == (1 << 0x4) == 0x10
- *  MSG_CHECKPOINT (5)      ; MSGBIT(CHECKPOINT) == (1 << 0x5) == 0x20
- *  MSG_WAKEUP (6)          ; MSGBIT(WAKEUP) == (1 << 0x6) == 0x40
- *  MSG_SHUTDOWN (7)        ; MSGBIT(MSG_SHUTDOWN) == (1 << 0x7) == 0x80
+ *  MSG_FULLBUFFER (4)           ; MSGBIT(MSG_FULLBUFFER) == (1 << 0x4) == 0x10
+ *  MSG_CHECKPOINT (5)           ; MSGBIT(CHECKPOINT) == (1 << 0x5) == 0x20
+ *  MSG_WAKEUP (6)               ; MSGBIT(WAKEUP) == (1 << 0x6) == 0x40
+ *  MSG_SHUTDOWN (7)             ; MSGBIT(MSG_SHUTDOWN) == (1 << 0x7) == 0x80
  */
 
 class JfrPostBox : public JfrCHeapObj {
   friend class JfrRecorder;
+  friend class JfrRecorderService;
  public:
   void post(JFR_Msg msg);
 
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index 08250a1ae59..6f8d44fb1a4 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/vmOperations.hpp"
 #include "runtime/vmThread.hpp"
+#include "utilities/growableArray.hpp"
 
 // incremented on each flushpoint
 static u8 flushpoint_id = 0;
@@ -391,6 +392,7 @@ class JfrSafepointWriteVMOperation : public VM_Operation {
 JfrRecorderService::JfrRecorderService() :
   _checkpoint_manager(JfrCheckpointManager::instance()),
   _chunkwriter(JfrRepository::chunkwriter()),
+  _post_box(JfrPostBox::instance()),
   _repository(JfrRepository::instance()),
   _stack_trace_repository(JfrStackTraceRepository::instance()),
   _storage(JfrStorage::instance()),
@@ -670,17 +672,173 @@ void JfrRecorderService::evaluate_chunk_size_for_rotation() {
   JfrChunkRotation::evaluate(_chunkwriter);
 }
 
-void JfrRecorderService::emit_leakprofiler_events(int64_t cutoff_ticks, bool emit_all, bool skip_bfs) {
-  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(JavaThread::current()));
-  // Take the rotation lock to exclude flush() during event emits. This is because event emit
-  // also creates a number checkpoint events. Those checkpoint events require a future typeset checkpoint
-  // event for completeness, i.e. to be generated before being flushed to a segment.
-  // The upcoming flush() or rotation() after event emit completes this typeset checkpoint
-  // and serializes all event emit checkpoint events to the same segment.
-  JfrRotationLock lock;
-  // Take the rotation lock before the transition.
-  JavaThread* current_thread = JavaThread::current();
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current_thread));
-  ThreadInVMfromNative transition(current_thread);
-  LeakProfiler::emit_events(cutoff_ticks, emit_all, skip_bfs);
+// LeakProfiler event serialization support.
+
+struct JfrLeakProfilerEmitRequest {
+  int64_t cutoff_ticks;
+  bool emit_all;
+  bool skip_bfs;
+  bool oom;
+};
+
+typedef GrowableArrayCHeap<JfrLeakProfilerEmitRequest, mtTracing> JfrLeakProfilerEmitRequestQueue;
+static JfrLeakProfilerEmitRequestQueue* _queue = nullptr;
+constexpr const static int64_t _no_path_to_gc_roots = 0;
+static bool _oom_emit_request_posted = false;
+static bool _oom_emit_request_delivered = false;
+
+static inline bool exclude_paths_to_gc_roots(int64_t cutoff_ticks) {
+  return cutoff_ticks <= _no_path_to_gc_roots;
+}
+
+static void enqueue(const JfrLeakProfilerEmitRequest& request) {
+  assert(JfrRotationLock::is_owner(), "invariant");
+  if (_queue == nullptr) {
+    _queue = new JfrLeakProfilerEmitRequestQueue(4);
+  }
+  assert(_queue != nullptr, "invariant");
+  assert(!_oom_emit_request_posted, "invariant");
+  if (request.oom) {
+    _oom_emit_request_posted = true;
+  }
+  _queue->append(request);
+}
+
+static JfrLeakProfilerEmitRequest dequeue() {
+  assert(JfrRotationLock::is_owner(), "invariant");
+  assert(_queue != nullptr, "invariant");
+  assert(_queue->is_nonempty(), "invariant");
+  const JfrLeakProfilerEmitRequest& request = _queue->first();
+  _queue->remove_at(0);
+  return request;
+}
+
+// This version of emit excludes path-to-gc-roots, i.e. it skips reference chains.
+static void emit_leakprofiler_events(bool emit_all, bool skip_bfs, JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt));
+  // Take the rotation lock to exclude flush() during event emits. This is because the event emit operation
+  // also creates a number of checkpoint events. Those checkpoint events require a future typeset checkpoint
+  // event for completeness, i.e., to be generated before being flushed to a segment.
+  // The upcoming flush() or rotation() after event emit completes this typeset checkpoint
+  // and serializes all checkpoint events to the same segment.
+  JfrRotationLock lock;
+  // Take the rotation lock before the thread transition, to avoid blocking safepoints.
+  if (_oom_emit_request_posted) {
+    // A request to emit leakprofiler events in response to CrashOnOutOfMemoryError
+    // is pending or has already been completed. We are about to crash at any time now.
+    assert(CrashOnOutOfMemoryError, "invariant");
+    return;
+  }
+  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
+  ThreadInVMfromNative transition(jt);
+  // Since we are not requesting path-to-gc-roots, i.e., reference chains, we need not issue a VM_Operation.
+  // Therefore, we can let the requesting thread process the request directly, since it already holds the requisite lock.
+  LeakProfiler::emit_events(_no_path_to_gc_roots, emit_all, skip_bfs);
+}
+
+void JfrRecorderService::transition_and_post_leakprofiler_emit_msg(JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt);)
+  assert(!JfrRotationLock::is_owner(), "invariant");
+  // Transition to _thread_in_VM and post a synchronous message to the JFR Recorder Thread
+  // for it to process our enqueued request, which includes paths-to-gc-roots, i.e., reference chains.
+  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
+  ThreadInVMfromNative transition(jt);
+  _post_box.post(MSG_EMIT_LEAKP_REFCHAINS);
+}
+
+// This version of emit includes path-to-gc-roots, i.e., it includes in the request traversing of reference chains.
+// Traversing reference chains is performed as part of a VM_Operation, and we initiate it from the JFR Recorder Thread.
+// Because multiple threads can concurrently report_on_java_out_of_memory(), having them all post a synchronous JFR msg,
+// they rendezvous at a safepoint in a convenient state, ThreadBlockInVM. This mechanism prevents any thread from racing past
+// this point and begin executing VMError::report_and_die(), until at least one oom request has been delivered.
+void JfrRecorderService::emit_leakprofiler_events_paths_to_gc_roots(int64_t cutoff_ticks,
+                                                                    bool emit_all,
+                                                                    bool skip_bfs,
+                                                                    bool oom,
+                                                                    JavaThread* jt) {
+  assert(jt != nullptr, "invariant");
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt);)
+  assert(!exclude_paths_to_gc_roots(cutoff_ticks), "invariant");
+
+  {
+    JfrRotationLock lock;
+    // Take the rotation lock to read and post a request for the JFR Recorder Thread.
+    if (_oom_emit_request_posted) {
+      if (!oom) {
+        // A request to emit leakprofiler events in response to CrashOnOutOfMemoryError
+        // is pending or has already been completed. We are about to crash at any time now.
+        assert(CrashOnOutOfMemoryError, "invariant");
+        return;
+      }
+    } else {
+      assert(!_oom_emit_request_posted, "invariant");
+      JfrLeakProfilerEmitRequest request = { cutoff_ticks, emit_all, skip_bfs, oom };
+      enqueue(request);
+    }
+  }
+  JfrRecorderService service;
+  service.transition_and_post_leakprofiler_emit_msg(jt);
+}
+
+// Leakprofiler serialization request, the jdk.jfr.internal.JVM.emitOldObjectSamples() Java entry point.
+void JfrRecorderService::emit_leakprofiler_events(int64_t cutoff_ticks,
+                                                  bool emit_all,
+                                                  bool skip_bfs) {
+  JavaThread* const jt = JavaThread::current();
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt);)
+  if (exclude_paths_to_gc_roots(cutoff_ticks)) {
+    ::emit_leakprofiler_events(emit_all, skip_bfs, jt);
+    return;
+  }
+  emit_leakprofiler_events_paths_to_gc_roots(cutoff_ticks, emit_all, skip_bfs, /* oom */ false, jt);
+}
+
+// Leakprofiler serialization request, the report_on_java_out_of_memory VM entry point.
+void JfrRecorderService::emit_leakprofiler_events_on_oom() {
+  assert(CrashOnOutOfMemoryError, "invariant");
+  if (EventOldObjectSample::is_enabled()) {
+    JavaThread* const jt = JavaThread::current();
+    DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(jt);)
+    ThreadToNativeFromVM transition(jt);
+    emit_leakprofiler_events_paths_to_gc_roots(max_jlong, false, false, /* oom */ true, jt);
+  }
+}
+
+// The worker routine for the JFR Recorder Thread when processing MSG_EMIT_LEAKP_REFCHAINS messages.
+void JfrRecorderService::emit_leakprofiler_events() {
+  JavaThread* const jt = JavaThread::current();
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt));
+  // Take the rotation lock before the transition.
+  JfrRotationLock lock;
+  if (_oom_emit_request_delivered) {
+    // A request to emit leakprofiler events in response to CrashOnOutOfMemoryError
+    // has already been completed. We are about to crash at any time now.
+    assert(_oom_emit_request_posted, "invariant");
+    assert(CrashOnOutOfMemoryError, "invariant");
+    return;
+  }
+
+  assert(_queue->is_nonempty(), "invariant");
+
+  {
+    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
+    ThreadInVMfromNative transition(jt);
+    while (_queue->is_nonempty()) {
+      const JfrLeakProfilerEmitRequest& request = dequeue();
+      LeakProfiler::emit_events(request.cutoff_ticks, request.emit_all, request.skip_bfs);
+      if (_oom_emit_request_posted && request.oom) {
+        assert(CrashOnOutOfMemoryError, "invariant");
+        _oom_emit_request_delivered = true;
+        break;
+      }
+    }
+  }
+
+  // If processing involved an out-of-memory request, issue an immediate flush operation.
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt));
+  if (_chunkwriter.is_valid() && _oom_emit_request_delivered) {
+    invoke_flush();
+  }
 }
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
index e5b4500afc0..3759ff98828 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,19 +27,23 @@
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
+class JavaThread;
 class JfrCheckpointManager;
 class JfrChunkWriter;
+class JfrPostBox;
 class JfrRepository;
 class JfrStackTraceRepository;
 class JfrStorage;
 class JfrStringPool;
 
 class JfrRecorderService : public StackObj {
+  friend class Jfr;
   friend class JfrSafepointClearVMOperation;
   friend class JfrSafepointWriteVMOperation;
  private:
   JfrCheckpointManager& _checkpoint_manager;
   JfrChunkWriter& _chunkwriter;
+  JfrPostBox& _post_box;
   JfrRepository& _repository;
   JfrStackTraceRepository& _stack_trace_repository;
   JfrStorage& _storage;
@@ -64,6 +68,14 @@ class JfrRecorderService : public StackObj {
   void invoke_safepoint_write();
   void post_safepoint_write();
 
+  void transition_and_post_leakprofiler_emit_msg(JavaThread* jt);
+
+  static void emit_leakprofiler_events_on_oom();
+  static void emit_leakprofiler_events_paths_to_gc_roots(int64_t cutoff_ticks,
+                                                         bool emit_all,
+                                                         bool skip_bfs,
+                                                         bool oom,
+                                                         JavaThread* jt);
  public:
   JfrRecorderService();
   void start();
@@ -72,8 +84,12 @@ class JfrRecorderService : public StackObj {
   void flushpoint();
   void process_full_buffers();
   void evaluate_chunk_size_for_rotation();
-  void emit_leakprofiler_events(int64_t cutoff_ticks, bool emit_all, bool skip_bfs);
+  void emit_leakprofiler_events();
+
   static bool is_recording();
+  static void emit_leakprofiler_events(int64_t cutoff_ticks,
+                                       bool emit_all,
+                                       bool skip_bfs);
 };
 
 #endif // SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp
index de015e9a502..bd01adf5b3a 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThreadLoop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ void recorderthread_entry(JavaThread* thread, JavaThread* unused) {
   #define ROTATE (msgs & (MSGBIT(MSG_ROTATE)|MSGBIT(MSG_STOP)))
   #define FLUSHPOINT (msgs & (MSGBIT(MSG_FLUSHPOINT)))
   #define PROCESS_FULL_BUFFERS (msgs & (MSGBIT(MSG_ROTATE)|MSGBIT(MSG_STOP)|MSGBIT(MSG_FULLBUFFER)))
+  #define LEAKPROFILER_REFCHAINS (msgs & MSGBIT(MSG_EMIT_LEAKP_REFCHAINS))
 
   JfrPostBox& post_box = JfrRecorderThreadEntry::post_box();
   log_debug(jfr, system)("Recorder thread STARTED");
@@ -70,6 +71,9 @@ void recorderthread_entry(JavaThread* thread, JavaThread* unused) {
         if (PROCESS_FULL_BUFFERS) {
           service.process_full_buffers();
         }
+        if (LEAKPROFILER_REFCHAINS) {
+          service.emit_leakprofiler_events();
+        }
         // Check amount of data written to chunk already
         // if it warrants asking for a new chunk.
         service.evaluate_chunk_size_for_rotation();
@@ -98,5 +102,5 @@ void recorderthread_entry(JavaThread* thread, JavaThread* unused) {
   #undef ROTATE
   #undef FLUSHPOINT
   #undef PROCESS_FULL_BUFFERS
-  #undef SCAVENGE
+  #undef LEAKPROFILER_REFCHAINS
 }
diff --git a/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp b/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
index 8886f412bb2..23e4cf839bd 100644
--- a/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
+++ b/src/hotspot/share/jfr/support/jfrDeprecationManager.cpp
@@ -194,9 +194,11 @@ static inline bool is_not_jdk_module(const ModuleEntry* module, JavaThread* jt)
   return !is_jdk_module(module, jt);
 }
 
+#ifdef ASSERT
 static inline bool jfr_is_started_on_command_line() {
   return JfrRecorder::is_started_on_commandline();
 }
+#endif // ASSERT
 
 static bool should_record(const Method* method, const Method* sender, JavaThread* jt) {
   assert(method != nullptr, "invariant");
diff --git a/src/hotspot/share/jfr/utilities/jfrSet.hpp b/src/hotspot/share/jfr/utilities/jfrSet.hpp
index 1432d40e4b2..c443434800a 100644
--- a/src/hotspot/share/jfr/utilities/jfrSet.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrSet.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 #ifndef SHARE_JFR_UTILITIES_JFRSET_HPP
 #define SHARE_JFR_UTILITIES_JFRSET_HPP
 
+#include "cppstdlib/new.hpp"
+#include "cppstdlib/type_traits.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 #include "memory/allocation.hpp"
 
@@ -67,7 +69,9 @@ class JfrSetStorage : public AnyObj {
     } else {
       table = NEW_RESOURCE_ARRAY(K, table_size);
     }
-    memset(table, 0, table_size * sizeof(K));
+    for (unsigned i = 0; i < table_size; ++i) {
+      ::new (&table[i]) K{};
+    }
     return table;
   }
 
@@ -88,7 +92,7 @@ class JfrSetStorage : public AnyObj {
     assert(is_nonempty(), "invariant");
     for (unsigned i = 0; i < _table_size; ++i) {
       K k = _table[i];
-      if (k != 0) {
+      if (k != K{}) {
         functor(k);
       }
     }
@@ -107,7 +111,14 @@ class JfrSetStorage : public AnyObj {
   }
 
   void clear() {
-    memset(_table, 0, _table_size * sizeof(K));
+    for (unsigned i = 0; i < _table_size; ++i) {
+      if constexpr (std::is_copy_assignable_v<K>) {
+        _table[i] = K{};
+      } else {
+        _table[i].~K();
+        ::new (&_table[i]) K{};
+      }
+    }
   }
 };
 
@@ -136,11 +147,11 @@ class JfrSet : public JfrSetStorage<CONFIG> {
     _resize_threshold = old_table_size;
     for (unsigned i = 0; i < old_table_size; ++i) {
       const K k = old_table[i];
-      if (k != 0) {
+      if (k != K{}) {
         uint32_t idx = slot_idx(CONFIG::hash(k));
         do {
           K v = this->_table[idx];
-          if (v == 0) {
+          if (v == K{}) {
             this->_table[idx] = k;
             break;
           }
@@ -161,7 +172,7 @@ class JfrSet : public JfrSetStorage<CONFIG> {
     K* result = nullptr;
     while (true) {
       K v = this->_table[idx];
-      if (v == 0) {
+      if (v == K{}) {
         result = &this->_table[idx];
         break;
       }
@@ -196,7 +207,7 @@ class JfrSet : public JfrSetStorage<CONFIG> {
       // Already exists.
       return false;
     }
-    assert(*slot == 0, "invariant");
+    assert(*slot == K{}, "invariant");
     *slot = k;
     if (++this->_elements == _resize_threshold) {
       resize();
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 801a9bf8eb4..6214f6a2746 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -236,16 +236,23 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
   JVMTI_ONLY( _should_notify_object_alloc = &JvmtiExport::_should_notify_object_alloc; )
 
   BarrierSet* bs = BarrierSet::barrier_set();
+#if INCLUDE_G1GC
+  if (bs->is_a(BarrierSet::G1BarrierSet)) {
+    cardtable_start_address = nullptr;
+    cardtable_shift = CardTable::card_shift();
+  } else
+#endif
+#if INCLUDE_SHENANDOAHGC
+  if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
+    cardtable_start_address = nullptr;
+    cardtable_shift = CardTable::card_shift();
+  } else
+#endif
   if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
-    CardTable::CardValue* base = ci_card_table_address();
+    CardTable::CardValue* base = ci_card_table_address_const();
     assert(base != nullptr, "unexpected byte_map_base");
     cardtable_start_address = base;
     cardtable_shift = CardTable::card_shift();
-#if INCLUDE_SHENANDOAHGC
-  } else if (bs->is_a(BarrierSet::ShenandoahBarrierSet)) {
-    cardtable_start_address = nullptr;
-    cardtable_shift = CardTable::card_shift();
-#endif
   } else {
     // No card mark barriers
     cardtable_start_address = nullptr;
@@ -348,7 +355,7 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
   return vmIntrinsics;
 }
 
-#define PREDEFINED_CONFIG_FLAGS(do_bool_flag, do_int_flag, do_size_t_flag, do_intx_flag, do_uintx_flag) \
+#define PREDEFINED_CONFIG_FLAGS(do_bool_flag, do_uint_flag, do_int_flag, do_size_t_flag, do_intx_flag, do_uintx_flag) \
   do_int_flag(AllocateInstancePrefetchLines)                               \
   do_int_flag(AllocatePrefetchDistance)                                    \
   do_intx_flag(AllocatePrefetchInstr)                                      \
@@ -360,7 +367,7 @@ JVMCIObjectArray CompilerToVM::initialize_intrinsics(JVMCI_TRAPS) {
   do_bool_flag(CITime)                                                     \
   do_bool_flag(CITimeEach)                                                 \
   do_size_t_flag(CodeCacheSegmentSize)                                     \
-  do_intx_flag(CodeEntryAlignment)                                         \
+  do_uint_flag(CodeEntryAlignment)                                         \
   do_int_flag(ContendedPaddingWidth)                                       \
   do_bool_flag(DontCompileHugeMethods)                                     \
   do_bool_flag(EagerJVMCI)                                                 \
@@ -547,16 +554,17 @@ jobjectArray readConfiguration0(JNIEnv *env, JVMCI_TRAPS) {
   JVMCIENV->put_object_at(vmFlags, i++, vmFlagObj);                                    \
 }
 #define ADD_BOOL_FLAG(name)   ADD_FLAG(bool, name, BOXED_BOOLEAN)
+#define ADD_UINT_FLAG(name)   ADD_FLAG(uint, name, BOXED_LONG)
 #define ADD_INT_FLAG(name)    ADD_FLAG(int, name, BOXED_LONG)
 #define ADD_SIZE_T_FLAG(name) ADD_FLAG(size_t, name, BOXED_LONG)
 #define ADD_INTX_FLAG(name)   ADD_FLAG(intx, name, BOXED_LONG)
 #define ADD_UINTX_FLAG(name)  ADD_FLAG(uintx, name, BOXED_LONG)
 
-  len = 0 + PREDEFINED_CONFIG_FLAGS(COUNT_FLAG, COUNT_FLAG, COUNT_FLAG, COUNT_FLAG, COUNT_FLAG);
+  len = 0 + PREDEFINED_CONFIG_FLAGS(COUNT_FLAG, COUNT_FLAG, COUNT_FLAG, COUNT_FLAG, COUNT_FLAG, COUNT_FLAG);
   JVMCIObjectArray vmFlags = JVMCIENV->new_VMFlag_array(len, JVMCI_CHECK_NULL);
   int i = 0;
   JVMCIObject value;
-  PREDEFINED_CONFIG_FLAGS(ADD_BOOL_FLAG, ADD_INT_FLAG, ADD_SIZE_T_FLAG, ADD_INTX_FLAG, ADD_UINTX_FLAG)
+  PREDEFINED_CONFIG_FLAGS(ADD_BOOL_FLAG, ADD_UINT_FLAG, ADD_INT_FLAG, ADD_SIZE_T_FLAG, ADD_INTX_FLAG, ADD_UINTX_FLAG)
 
   JVMCIObjectArray vmIntrinsics = CompilerToVM::initialize_intrinsics(JVMCI_CHECK_NULL);
 
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 91482e825cd..74314b0ad61 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -432,7 +432,7 @@
                                                                                                                                      \
   nonstatic_field(Thread,                   _poll_data,                                       SafepointMechanism::ThreadData)        \
   nonstatic_field(Thread,                   _tlab,                                            ThreadLocalAllocBuffer)                \
-  nonstatic_field(Thread,                   _allocated_bytes,                                 jlong)                                 \
+  nonstatic_field(Thread,                   _allocated_bytes,                                 uint64_t)                              \
   JFR_ONLY(nonstatic_field(Thread,          _jfr_thread_local,                                JfrThreadLocal))                       \
                                                                                                                                      \
   static_field(java_lang_Thread,            _tid_offset,                                      int)                                   \
diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
index 9df91225d6f..2a109688ca6 100644
--- a/src/hotspot/share/memory/allocation.cpp
+++ b/src/hotspot/share/memory/allocation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotMetaspace.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/arena.hpp"
 #include "memory/metaspace.hpp"
@@ -161,12 +162,33 @@ void AnyObj::set_allocation_type(address res, allocation_type type) {
   }
 }
 
+void AnyObj::set_in_aot_cache() {
+  _allocation_t[0] = 0;
+  _allocation_t[1] = 0;
+}
+
+bool AnyObj::in_aot_cache() const {
+  if (AOTMetaspace::in_aot_cache(this)) {
+    precond(_allocation_t[0] == 0);
+    precond(_allocation_t[1] == 0);
+    return true;
+  } else {
+    return false;
+  }
+}
+
 AnyObj::allocation_type AnyObj::get_allocation_type() const {
+  if (in_aot_cache()) {
+    return STACK_OR_EMBEDDED;
+  }
   assert(~(_allocation_t[0] | allocation_mask) == (uintptr_t)this, "lost resource object");
   return (allocation_type)((~_allocation_t[0]) & allocation_mask);
 }
 
 bool AnyObj::is_type_set() const {
+  if (in_aot_cache()) {
+    return true;
+  }
   allocation_type type = (allocation_type)(_allocation_t[1] & allocation_mask);
   return get_allocation_type()  == type &&
          (_allocation_t[1] - type) == (uintptr_t)(&_allocation_t[1]);
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index 963ca04aadf..15b7750a363 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -420,6 +420,7 @@ class AnyObj {
  public:
   enum allocation_type { STACK_OR_EMBEDDED = 0, RESOURCE_AREA, C_HEAP, ARENA, allocation_mask = 0x3 };
   static void set_allocation_type(address res, allocation_type type) NOT_DEBUG_RETURN;
+  void set_in_aot_cache() NOT_DEBUG_RETURN;
 #ifdef ASSERT
  private:
   // When this object is allocated on stack the new() operator is not
@@ -429,6 +430,7 @@ class AnyObj {
   uintptr_t _allocation_t[2];
   bool is_type_set() const;
   void initialize_allocation_info();
+  bool in_aot_cache() const;
  public:
   allocation_type get_allocation_type() const;
   bool allocated_on_stack_or_embedded() const { return get_allocation_type() == STACK_OR_EMBEDDED; }
diff --git a/src/hotspot/share/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp
index 5561cdbe6f7..1cbff9d0255 100644
--- a/src/hotspot/share/memory/allocation.inline.hpp
+++ b/src/hotspot/share/memory/allocation.inline.hpp
@@ -87,8 +87,7 @@ E* MmapArrayAllocator<E>::allocate(size_t length, MemTag mem_tag) {
 
 template <class E>
 void MmapArrayAllocator<E>::free(E* addr, size_t length) {
-  bool result = os::release_memory((char*)addr, size_for(length));
-  assert(result, "Failed to release memory");
+  os::release_memory((char*)addr, size_for(length));
 }
 
 template <class E>
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index 2de3f837c00..75cd909b028 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -330,6 +330,9 @@ void* Arena::grow(size_t x, AllocFailType alloc_failmode) {
   size_t len = MAX2(ARENA_ALIGN(x), (size_t) Chunk::size);
 
   if (MemTracker::check_exceeds_limit(x, _mem_tag)) {
+    if (alloc_failmode == AllocFailStrategy::EXIT_OOM) {
+      vm_exit_out_of_memory(x, OOM_MALLOC_ERROR, "MallocLimit in Arena::grow");
+    }
     return nullptr;
   }
 
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index a8450b5543a..7d88c79ca52 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,7 @@ public:
   FN(ra,          Resource areas) \
   FN(node,        C2 Node arena) \
   FN(comp,        C2 Compile arena) \
+  FN(idealloop,   C2 Ideal Loop arena) \
   FN(type,        C2 Type arena) \
   FN(states,      C2 Matcher States Arena) \
   FN(reglive,     C2 Register Allocation Live Arenas) \
diff --git a/src/hotspot/share/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp
index a1333ed13e9..3ade5169eef 100644
--- a/src/hotspot/share/memory/heap.cpp
+++ b/src/hotspot/share/memory/heap.cpp
@@ -163,6 +163,7 @@ void CodeHeap::mark_segmap_as_used(size_t beg, size_t end, bool is_FreeBlock_joi
 
 void CodeHeap::invalidate(size_t beg, size_t end, size_t hdr_size) {
 #ifndef PRODUCT
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   // Fill the given range with some bad value.
   // length is expected to be in segment_size units.
   // This prevents inadvertent execution of code leftover from previous use.
@@ -172,11 +173,13 @@ void CodeHeap::invalidate(size_t beg, size_t end, size_t hdr_size) {
 }
 
 void CodeHeap::clear(size_t beg, size_t end) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   mark_segmap_as_free(beg, end);
   invalidate(beg, end, 0);
 }
 
 void CodeHeap::clear() {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   _next_segment = 0;
   clear(_next_segment, _number_of_committed_segments);
 }
@@ -190,6 +193,7 @@ static size_t align_to_page_size(size_t size) {
 
 
 bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_size) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   assert(rs.size() >= committed_size, "reserved < committed");
   assert(is_aligned(committed_size, rs.page_size()), "must be page aligned");
   assert(segment_size >= sizeof(FreeBlock), "segment size is too small");
@@ -230,6 +234,7 @@ bool CodeHeap::reserve(ReservedSpace rs, size_t committed_size, size_t segment_s
 
 
 bool CodeHeap::expand_by(size_t size) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   assert_locked_or_safepoint(CodeCache_lock);
 
   // expand _memory space
@@ -259,6 +264,7 @@ bool CodeHeap::expand_by(size_t size) {
 
 
 void* CodeHeap::allocate(size_t instance_size) {
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   size_t number_of_segments = size_to_segments(instance_size + header_size());
   assert(segments_to_size(number_of_segments) >= sizeof(FreeBlock), "not enough room for FreeList");
   assert_locked_or_safepoint(CodeCache_lock);
diff --git a/src/hotspot/share/memory/memoryReserver.cpp b/src/hotspot/share/memory/memoryReserver.cpp
index e8d1887f59f..1c44f76ed11 100644
--- a/src/hotspot/share/memory/memoryReserver.cpp
+++ b/src/hotspot/share/memory/memoryReserver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,9 +99,7 @@ static char* reserve_memory_inner(char* requested_address,
   }
 
   // Base not aligned, retry.
-  if (!os::release_memory(base, size)) {
-    fatal("os::release_memory failed");
-  }
+  os::release_memory(base, size);
 
   // Map using the requested alignment.
   return os::reserve_memory_aligned(size, alignment, mem_tag, exec);
@@ -231,14 +229,9 @@ ReservedSpace MemoryReserver::reserve(size_t size,
                  mem_tag);
 }
 
-bool MemoryReserver::release(const ReservedSpace& reserved) {
+void MemoryReserver::release(const ReservedSpace& reserved) {
   assert(reserved.is_reserved(), "Precondition");
-
-  if (reserved.special()) {
-    return os::release_memory_special(reserved.base(), reserved.size());
-  } else {
-    return os::release_memory(reserved.base(), reserved.size());
-  }
+  os::release_memory(reserved.base(), reserved.size());
 }
 
 static char* map_memory_to_file(char* requested_address,
@@ -266,9 +259,7 @@ static char* map_memory_to_file(char* requested_address,
 
 
   // Base not aligned, retry.
-  if (!os::unmap_memory(base, size)) {
-    fatal("os::unmap_memory failed");
-  }
+  os::unmap_memory(base, size);
 
   // Map using the requested alignment.
   return os::map_memory_to_file_aligned(size, alignment, fd, mem_tag);
@@ -376,11 +367,7 @@ ReservedSpace HeapReserver::Instance::reserve_memory(size_t size,
 void HeapReserver::Instance::release(const ReservedSpace& reserved) {
   if (reserved.is_reserved()) {
     if (_fd == -1) {
-      if (reserved.special()) {
-        os::release_memory_special(reserved.base(), reserved.size());
-      } else{
-        os::release_memory(reserved.base(), reserved.size());
-      }
+      os::release_memory(reserved.base(), reserved.size());
     } else {
       os::unmap_memory(reserved.base(), reserved.size());
     }
diff --git a/src/hotspot/share/memory/memoryReserver.hpp b/src/hotspot/share/memory/memoryReserver.hpp
index 9ef12650b55..d13d8d72512 100644
--- a/src/hotspot/share/memory/memoryReserver.hpp
+++ b/src/hotspot/share/memory/memoryReserver.hpp
@@ -70,7 +70,7 @@ public:
                                MemTag mem_tag);
 
   // Release reserved memory
-  static bool release(const ReservedSpace& reserved);
+  static void release(const ReservedSpace& reserved);
 };
 
 class CodeMemoryReserver : AllStatic {
diff --git a/src/hotspot/share/memory/metaspace/blockTree.cpp b/src/hotspot/share/memory/metaspace/blockTree.cpp
index 7ad24353c96..bdae317a0b9 100644
--- a/src/hotspot/share/memory/metaspace/blockTree.cpp
+++ b/src/hotspot/share/memory/metaspace/blockTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,18 +39,14 @@ const size_t BlockTree::MinWordSize;
 #define NODE_FORMAT \
   "@" PTR_FORMAT \
   ": canary " INTPTR_FORMAT \
-  ", parent " PTR_FORMAT \
-  ", left " PTR_FORMAT \
-  ", right " PTR_FORMAT \
+  ", tree " PTR_FORMAT \
   ", next " PTR_FORMAT \
   ", size %zu"
 
 #define NODE_FORMAT_ARGS(n) \
   p2i(n), \
   (n)->_canary, \
-  p2i((n)->_parent), \
-  p2i((n)->_left), \
-  p2i((n)->_right), \
+  p2i(&(n)->_tree_node), \
   p2i((n)->_next), \
   (n)->_word_size
 
@@ -74,15 +70,6 @@ const size_t BlockTree::MinWordSize;
 #define tree_assert_invalid_node(cond, failure_node) \
   tree_assert(cond, "Invalid node: " NODE_FORMAT, NODE_FORMAT_ARGS(failure_node))
 
-// walkinfo keeps a node plus the size corridor it and its children
-//  are supposed to be in.
-struct BlockTree::walkinfo {
-  BlockTree::Node* n;
-  int depth;
-  size_t lim1; // (
-  size_t lim2; // )
-};
-
 // Helper for verify()
 void BlockTree::verify_node_pointer(const Node* n) const {
   tree_assert(os::is_readable_pointer(n),
@@ -98,80 +85,32 @@ void BlockTree::verify_node_pointer(const Node* n) const {
 
 void BlockTree::verify() const {
   // Traverse the tree and test that all nodes are in the correct order.
-
   MemRangeCounter counter;
-  if (_root != nullptr) {
 
-    ResourceMark rm;
-    GrowableArray<walkinfo> stack;
+  // Verifies node ordering (n1 < n2 => word_size1 < word_size2),
+  // node validity, and that the tree is balanced and not ill-formed.
+  _tree.verify_self([&](const TreeNode* tree_node) {
+    const Node* n = Node::cast_to_node(tree_node);
 
-    walkinfo info;
-    info.n = _root;
-    info.lim1 = 0;
-    info.lim2 = SIZE_MAX;
-    info.depth = 0;
+    verify_node_pointer(n);
 
-    stack.push(info);
+    counter.add(n->_word_size);
 
-    while (stack.length() > 0) {
-      info = stack.pop();
-      const Node* n = info.n;
+    tree_assert_invalid_node(n->_word_size >= MinWordSize, n);
+    tree_assert_invalid_node(n->_word_size <= chunklevel::MAX_CHUNK_WORD_SIZE, n);
 
-      verify_node_pointer(n);
-
-      // Assume a (ridiculously large) edge limit to catch cases
-      //  of badly degenerated or circular trees.
-      tree_assert(info.depth < 10000, "too deep (%d)", info.depth);
-      counter.add(n->_word_size);
-
-      if (n == _root) {
-        tree_assert_invalid_node(n->_parent == nullptr, n);
-      } else {
-        tree_assert_invalid_node(n->_parent != nullptr, n);
-      }
-
-      // check size and ordering
-      tree_assert_invalid_node(n->_word_size >= MinWordSize, n);
-      tree_assert_invalid_node(n->_word_size <= chunklevel::MAX_CHUNK_WORD_SIZE, n);
-      tree_assert_invalid_node(n->_word_size > info.lim1, n);
-      tree_assert_invalid_node(n->_word_size < info.lim2, n);
-
-      // Check children
-      if (n->_left != nullptr) {
-        tree_assert_invalid_node(n->_left != n, n);
-        tree_assert_invalid_node(n->_left->_parent == n, n);
-
-        walkinfo info2;
-        info2.n = n->_left;
-        info2.lim1 = info.lim1;
-        info2.lim2 = n->_word_size;
-        info2.depth = info.depth + 1;
-        stack.push(info2);
-      }
-
-      if (n->_right != nullptr) {
-        tree_assert_invalid_node(n->_right != n, n);
-        tree_assert_invalid_node(n->_right->_parent == n, n);
-
-        walkinfo info2;
-        info2.n = n->_right;
-        info2.lim1 = n->_word_size;
-        info2.lim2 = info.lim2;
-        info2.depth = info.depth + 1;
-        stack.push(info2);
-      }
-
-      // If node has same-sized siblings check those too.
-      const Node* n2 = n->_next;
-      while (n2 != nullptr) {
-        verify_node_pointer(n2);
-        tree_assert_invalid_node(n2 != n, n2); // catch simple circles
-        tree_assert_invalid_node(n2->_word_size == n->_word_size, n2);
-        counter.add(n2->_word_size);
-        n2 = n2->_next;
-      }
+    // If node has same-sized siblings check those too.
+    const Node* n2 = n->_next;
+    while (n2 != nullptr) {
+      verify_node_pointer(n2);
+      tree_assert_invalid_node(n2 != n, n2); // catch simple circles
+      tree_assert_invalid_node(n2->_word_size == n->_word_size, n2);
+      counter.add(n2->_word_size);
+      n2 = n2->_next;
     }
-  }
+
+    return true;
+  });
 
   // At the end, check that counters match
   // (which also verifies that we visited every node, or at least
@@ -189,64 +128,34 @@ void BlockTree::print_tree(outputStream* st) const {
   //  as a quasi list is much clearer to the eye.
   // We print the tree depth-first, with stacked nodes below normal ones
   //  (normal "real" nodes are marked with a leading '+')
-  if (_root != nullptr) {
+  if (is_empty()) {
+    st->print_cr("<no nodes>");
+    return;
+  }
 
-    ResourceMark rm;
-    GrowableArray<walkinfo> stack;
+  _tree.print_on(st, [&](outputStream *st, const TreeNode *tree_node, int depth) {
+    const Node* n = Node::cast_to_node(tree_node);
 
-    walkinfo info;
-    info.n = _root;
-    info.depth = 0;
-
-    stack.push(info);
-    while (stack.length() > 0) {
-      info = stack.pop();
-      const Node* n = info.n;
-
-      // Print node.
-      st->print("%4d + ", info.depth);
-      if (os::is_readable_pointer(n)) {
-        st->print_cr(NODE_FORMAT, NODE_FORMAT_ARGS(n));
-      } else {
-        st->print_cr("@" PTR_FORMAT ": unreadable (skipping subtree)", p2i(n));
-        continue; // don't print this subtree
-      }
-
-      // Print same-sized-nodes stacked under this node
-      for (Node* n2 = n->_next; n2 != nullptr; n2 = n2->_next) {
-        st->print_raw("       ");
-        if (os::is_readable_pointer(n2)) {
-          st->print_cr(NODE_FORMAT, NODE_FORMAT_ARGS(n2));
-        } else {
-          st->print_cr("@" PTR_FORMAT ": unreadable (skipping rest of chain).", p2i(n2));
-          break; // stop printing this chain.
-        }
-      }
-
-      // Handle simple circularities
-      if (n == n->_right || n == n->_left || n == n->_next) {
-        st->print_cr("@" PTR_FORMAT ": circularity detected.", p2i(n));
-        return; // stop printing
-      }
-
-      // Handle children.
-      if (n->_right != nullptr) {
-        walkinfo info2;
-        info2.n = n->_right;
-        info2.depth = info.depth + 1;
-        stack.push(info2);
-      }
-      if (n->_left != nullptr) {
-        walkinfo info2;
-        info2.n = n->_left;
-        info2.depth = info.depth + 1;
-        stack.push(info2);
-      }
+    // Print node.
+    st->print("%4d + ", depth);
+    if (os::is_readable_pointer(n)) {
+      st->print_cr(NODE_FORMAT, NODE_FORMAT_ARGS(n));
+    } else {
+      st->print_cr("@" PTR_FORMAT ": unreadable", p2i(n));
+      return;
     }
 
-  } else {
-    st->print_cr("<no nodes>");
-  }
+    // Print same-sized-nodes stacked under this node
+    for (Node* n2 = n->_next; n2 != nullptr; n2 = n2->_next) {
+      st->print_raw("       ");
+      if (os::is_readable_pointer(n2)) {
+        st->print_cr(NODE_FORMAT, NODE_FORMAT_ARGS(n2));
+      } else {
+        st->print_cr("@" PTR_FORMAT ": unreadable (skipping rest of chain).", p2i(n2));
+        break; // stop printing this chain.
+      }
+    }
+  });
 }
 
 #endif // ASSERT
diff --git a/src/hotspot/share/memory/metaspace/blockTree.hpp b/src/hotspot/share/memory/metaspace/blockTree.hpp
index a01f60b166f..e7c1edf9c4f 100644
--- a/src/hotspot/share/memory/metaspace/blockTree.hpp
+++ b/src/hotspot/share/memory/metaspace/blockTree.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,17 +32,18 @@
 #include "memory/metaspace/metablock.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/rbTree.inline.hpp"
 
 namespace metaspace {
 
-// BlockTree is a rather simple binary search tree. It is used to
-//  manage medium to large free memory blocks.
+// BlockTree is tree built on an intrusive red-black tree.
+//  It is used to manage medium to large free memory blocks.
 //
 // There is no separation between payload (managed blocks) and nodes: the
 //  memory blocks themselves are the nodes, with the block size being the key.
 //
 // We store node pointer information in these blocks when storing them. That
-//  imposes a minimum size to the managed memory blocks (1 word)
+//  imposes a minimum size to the managed memory blocks (1 MinWordSize)
 //
 // We want to manage many memory blocks of the same size, but we want
 //  to prevent the tree from blowing up and degenerating into a list. Therefore
@@ -53,9 +54,9 @@ namespace metaspace {
 //                   | 100 |
 //                   +-----+
 //                  /       \
-//           +-----+
-//           | 80  |
-//           +-----+
+//           +-----+         +-----+
+//           | 80  |         | 120 |
+//           +-----+         +-----+
 //          /   |   \
 //         / +-----+ \
 //  +-----+  | 80  |  +-----+
@@ -65,16 +66,11 @@ namespace metaspace {
 //           | 80  |
 //           +-----+
 //
-//
-// Todo: This tree is unbalanced. It would be a good fit for a red-black tree.
-//  In order to make this a red-black tree, we need an algorithm which can deal
-//  with nodes which are their own payload (most red-black tree implementations
-//  swap payloads of their nodes at some point, see e.g. j.u.TreeSet).
-// A good example is the Linux kernel rbtree, which is a clean, easy-to-read
-//  implementation.
 
 class BlockTree: public CHeapObj<mtMetaspace> {
 
+  using TreeNode = IntrusiveRBNode;
+
   struct Node {
 
     static const intptr_t _canary_value =
@@ -86,29 +82,27 @@ class BlockTree: public CHeapObj<mtMetaspace> {
     //  in debug.
     const intptr_t _canary;
 
-    // Normal tree node stuff...
-    //  (Note: all null if this is a stacked node)
-    Node* _parent;
-    Node* _left;
-    Node* _right;
+    // Tree node for linking blocks in the intrusive tree.
+    TreeNode _tree_node;
 
     // Blocks with the same size are put in a list with this node as head.
     Node* _next;
 
     // Word size of node. Note that size cannot be larger than max metaspace size,
-    // so this could be very well a 32bit value (in case we ever make this a balancing
-    // tree and need additional space for weighting information).
+    // so this could very well be a 32bit value.
     const size_t _word_size;
 
     Node(size_t word_size) :
       _canary(_canary_value),
-      _parent(nullptr),
-      _left(nullptr),
-      _right(nullptr),
+      _tree_node{},
       _next(nullptr),
       _word_size(word_size)
     {}
 
+    static Node* cast_to_node(const TreeNode* tree_node) {
+      return (Node*)((uintptr_t)tree_node - offset_of(Node, _tree_node));
+    }
+
 #ifdef ASSERT
     bool valid() const {
       return _canary == _canary_value &&
@@ -118,8 +112,23 @@ class BlockTree: public CHeapObj<mtMetaspace> {
 #endif
   };
 
-  // Needed for verify() and print_tree()
-  struct walkinfo;
+  struct TreeComparator {
+    static RBTreeOrdering cmp(const size_t a, const TreeNode* b) {
+      const size_t node_word_size = Node::cast_to_node(b)->_word_size;
+
+      if (a < node_word_size) { return RBTreeOrdering::LT; }
+      if (a > node_word_size) { return RBTreeOrdering::GT; }
+      return RBTreeOrdering::EQ;
+    }
+
+    static bool less_than(const TreeNode* a, const TreeNode* b) {
+      const size_t a_word_size = Node::cast_to_node(a)->_word_size;
+      const size_t b_word_size = Node::cast_to_node(b)->_word_size;
+
+      if (a_word_size < b_word_size) { return true; }
+      return false;
+    }
+  };
 
 #ifdef ASSERT
   // Run a quick check on a node; upon suspicion dive into a full tree check.
@@ -134,7 +143,7 @@ public:
 
 private:
 
-  Node* _root;
+  IntrusiveRBTree<const size_t, TreeComparator> _tree;
 
   MemRangeCounter _counter;
 
@@ -143,7 +152,7 @@ private:
     assert(head->_word_size == n->_word_size, "sanity");
     n->_next = head->_next;
     head->_next = n;
-    DEBUG_ONLY(n->_left = n->_right = n->_parent = nullptr;)
+    DEBUG_ONLY(n->_tree_node = TreeNode());
   }
 
   // Given a node list starting at head, remove one of the follow up nodes from
@@ -157,183 +166,6 @@ private:
     return n;
   }
 
-  // Given a node c and a node p, wire up c as left child of p.
-  static void set_left_child(Node* p, Node* c) {
-    p->_left = c;
-    if (c != nullptr) {
-      assert(c->_word_size < p->_word_size, "sanity");
-      c->_parent = p;
-    }
-  }
-
-  // Given a node c and a node p, wire up c as right child of p.
-  static void set_right_child(Node* p, Node* c) {
-    p->_right = c;
-    if (c != nullptr) {
-      assert(c->_word_size > p->_word_size, "sanity");
-      c->_parent = p;
-    }
-  }
-
-  // Given a node n, return its successor in the tree
-  // (node with the next-larger size).
-  static Node* successor(Node* n) {
-    Node* succ = nullptr;
-    if (n->_right != nullptr) {
-      // If there is a right child, search the left-most
-      // child of that child.
-      succ = n->_right;
-      while (succ->_left != nullptr) {
-        succ = succ->_left;
-      }
-    } else {
-      succ = n->_parent;
-      Node* n2 = n;
-      // As long as I am the right child of my parent, search upward
-      while (succ != nullptr && n2 == succ->_right) {
-        n2 = succ;
-        succ = succ->_parent;
-      }
-    }
-    return succ;
-  }
-
-  // Given a node, replace it with a replacement node as a child for its parent.
-  // If the node is root and has no parent, sets it as root.
-  void replace_node_in_parent(Node* child, Node* replace) {
-    Node* parent = child->_parent;
-    if (parent != nullptr) {
-      if (parent->_left == child) { // Child is left child
-        set_left_child(parent, replace);
-      } else {
-        set_right_child(parent, replace);
-      }
-    } else {
-      assert(child == _root, "must be root");
-      _root = replace;
-      if (replace != nullptr) {
-        replace->_parent = nullptr;
-      }
-    }
-    return;
-  }
-
-  // Given a node n and an insertion point, insert n under insertion point.
-  void insert(Node* insertion_point, Node* n) {
-    assert(n->_parent == nullptr, "Sanity");
-    for (;;) {
-      DEBUG_ONLY(check_node(insertion_point);)
-      if (n->_word_size == insertion_point->_word_size) {
-        add_to_list(n, insertion_point); // parent stays null in this case.
-        break;
-      } else if (n->_word_size > insertion_point->_word_size) {
-        if (insertion_point->_right == nullptr) {
-          set_right_child(insertion_point, n);
-          break;
-        } else {
-          insertion_point = insertion_point->_right;
-        }
-      } else {
-        if (insertion_point->_left == nullptr) {
-          set_left_child(insertion_point, n);
-          break;
-        } else {
-          insertion_point = insertion_point->_left;
-        }
-      }
-    }
-  }
-
-  // Given a node and a wish size, search this node and all children for
-  // the node closest (equal or larger sized) to the size s.
-  Node* find_closest_fit(Node* n, size_t s) {
-    Node* best_match = nullptr;
-    while (n != nullptr) {
-      DEBUG_ONLY(check_node(n);)
-      if (n->_word_size >= s) {
-        best_match = n;
-        if (n->_word_size == s) {
-          break; // perfect match or max depth reached
-        }
-        n = n->_left;
-      } else {
-        n = n->_right;
-      }
-    }
-    return best_match;
-  }
-
-  // Given a wish size, search the whole tree for a
-  // node closest (equal or larger sized) to the size s.
-  Node* find_closest_fit(size_t s) {
-    if (_root != nullptr) {
-      return find_closest_fit(_root, s);
-    }
-    return nullptr;
-  }
-
-  // Given a node n, remove it from the tree and repair tree.
-  void remove_node_from_tree(Node* n) {
-    assert(n->_next == nullptr, "do not delete a node which has a non-empty list");
-
-    if (n->_left == nullptr && n->_right == nullptr) {
-      replace_node_in_parent(n, nullptr);
-
-    } else if (n->_left == nullptr && n->_right != nullptr) {
-      replace_node_in_parent(n, n->_right);
-
-    } else if (n->_left != nullptr && n->_right == nullptr) {
-      replace_node_in_parent(n, n->_left);
-
-    } else {
-      // Node has two children.
-
-      // 1) Find direct successor (the next larger node).
-      Node* succ = successor(n);
-
-      // There has to be a successor since n->right was != null...
-      assert(succ != nullptr, "must be");
-
-      // ... and it should not have a left child since successor
-      //     is supposed to be the next larger node, so it must be the mostleft node
-      //     in the sub tree rooted at n->right
-      assert(succ->_left == nullptr, "must be");
-      assert(succ->_word_size > n->_word_size, "sanity");
-
-      Node* successor_parent = succ->_parent;
-      Node* successor_right_child = succ->_right;
-
-      // Remove successor from its parent.
-      if (successor_parent == n) {
-
-        // special case: successor is a direct child of n. Has to be the right child then.
-        assert(n->_right == succ, "sanity");
-
-        // Just replace n with this successor.
-        replace_node_in_parent(n, succ);
-
-        // Take over n's old left child, too.
-        // We keep the successor's right child.
-        set_left_child(succ, n->_left);
-      } else {
-        // If the successors parent is not n, we are deeper in the tree,
-        //  the successor has to be the left child of its parent.
-        assert(successor_parent->_left == succ, "sanity");
-
-        // The right child of the successor (if there was one) replaces
-        //  the successor at its parent's left child.
-        set_left_child(successor_parent, succ->_right);
-
-        // and the successor replaces n at its parent
-        replace_node_in_parent(n, succ);
-
-        // and takes over n's old children
-        set_left_child(succ, n->_left);
-        set_right_child(succ, n->_right);
-      }
-    }
-  }
-
 #ifdef ASSERT
   void zap_block(MetaBlock block);
   // Helper for verify()
@@ -342,7 +174,7 @@ private:
 
 public:
 
-  BlockTree() : _root(nullptr) {}
+  BlockTree() {}
 
   // Add a memory block to the tree. Its content will be overwritten.
   void add_block(MetaBlock block) {
@@ -350,10 +182,12 @@ public:
     const size_t word_size = block.word_size();
     assert(word_size >= MinWordSize, "invalid block size %zu", word_size);
     Node* n = new(block.base()) Node(word_size);
-    if (_root == nullptr) {
-      _root = n;
-    } else {
-      insert(_root, n);
+    IntrusiveRBTree<const size_t, TreeComparator>::Cursor cursor = _tree.cursor(word_size);
+    if (cursor.found()) {
+      add_to_list(n, Node::cast_to_node(cursor.node()));
+    }
+    else {
+      _tree.insert_at_cursor(&n->_tree_node, cursor);
     }
     _counter.add(word_size);
   }
@@ -364,9 +198,10 @@ public:
     assert(word_size >= MinWordSize, "invalid block size %zu", word_size);
 
     MetaBlock result;
-    Node* n = find_closest_fit(word_size);
+    TreeNode* tree_node = _tree.closest_ge(word_size);
 
-    if (n != nullptr) {
+    if (tree_node != nullptr) {
+      Node* n = Node::cast_to_node(tree_node);
       DEBUG_ONLY(check_node(n);)
       assert(n->_word_size >= word_size, "sanity");
 
@@ -377,7 +212,7 @@ public:
         //  node into its place in the tree).
         n = remove_from_list(n);
       } else {
-        remove_node_from_tree(n);
+        _tree.remove(tree_node);
       }
 
       result = MetaBlock((MetaWord*)n, n->_word_size);
@@ -395,7 +230,7 @@ public:
   // Returns total size, in words, of all elements.
   size_t total_size() const { return _counter.total_size(); }
 
-  bool is_empty() const { return _root == nullptr; }
+  bool is_empty() const { return _tree.size() == 0; }
 
   DEBUG_ONLY(void print_tree(outputStream* st) const;)
   DEBUG_ONLY(void verify() const;)
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index d21c6546cf5..df4e507b104 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -190,10 +190,7 @@ void VirtualSpaceNode::uncommit_range(MetaWord* p, size_t word_size) {
   }
 
   // Uncommit...
-  if (os::uncommit_memory((char*)p, word_size * BytesPerWord) == false) {
-    // Note: this can actually happen, since uncommit may increase the number of mappings.
-    fatal("Failed to uncommit metaspace.");
-  }
+  os::uncommit_memory((char*)p, word_size * BytesPerWord);
 
   ASAN_POISON_MEMORY_REGION((char*)p, word_size * BytesPerWord);
 
diff --git a/src/hotspot/share/memory/metaspaceClosure.cpp b/src/hotspot/share/memory/metaspaceClosure.cpp
index f3c6e350034..0239eadf692 100644
--- a/src/hotspot/share/memory/metaspaceClosure.cpp
+++ b/src/hotspot/share/memory/metaspaceClosure.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,21 @@
  *
  */
 
+#include "cds/aotGrowableArray.hpp"
+#include "classfile/packageEntry.hpp"
 #include "memory/metaspaceClosure.hpp"
+#include "oops/array.hpp"
+#include "oops/instanceKlass.hpp"
+
+// Sanity checks
+static_assert(!HAS_METASPACE_POINTERS_DO(int));
+
+static_assert(HAS_METASPACE_POINTERS_DO(Array<int>));
+static_assert(HAS_METASPACE_POINTERS_DO(Array<InstanceKlass*>));
+static_assert(HAS_METASPACE_POINTERS_DO(InstanceKlass));
+static_assert(HAS_METASPACE_POINTERS_DO(PackageEntry));
+static_assert(HAS_METASPACE_POINTERS_DO(AOTGrowableArray<int>));
+static_assert(HAS_METASPACE_POINTERS_DO(AOTGrowableArray<PackageEntry*>));
 
 void MetaspaceClosure::push_impl(MetaspaceClosure::Ref* ref) {
   if (_enclosing_ref != nullptr) {
diff --git a/src/hotspot/share/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp
index 329502d7a47..b6ba69d6f63 100644
--- a/src/hotspot/share/memory/metaspaceClosure.hpp
+++ b/src/hotspot/share/memory/metaspaceClosure.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,11 @@
 #ifndef SHARE_MEMORY_METASPACECLOSURE_HPP
 #define SHARE_MEMORY_METASPACECLOSURE_HPP
 
+#include "cds/aotGrowableArray.hpp"
 #include "cppstdlib/type_traits.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
+#include "memory/metaspaceClosureType.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "oops/array.hpp"
 #include "utilities/debug.hpp"
@@ -36,41 +38,27 @@
 #include "utilities/macros.hpp"
 #include "utilities/resizableHashTable.hpp"
 
-// The metadata hierarchy is separate from the oop hierarchy
-  class MetaspaceObj;        // no C++ vtable
-//class   Array;             // no C++ vtable
-  class   Annotations;       // no C++ vtable
-  class   ConstantPoolCache; // no C++ vtable
-  class   ConstMethod;       // no C++ vtable
-  class   MethodCounters;    // no C++ vtable
-  class   Symbol;            // no C++ vtable
-  class   Metadata;          // has C++ vtable (so do all subclasses)
-  class     ConstantPool;
-  class     MethodData;
-  class     Method;
-  class     Klass;
-  class       InstanceKlass;
-  class         InstanceMirrorKlass;
-  class         InstanceClassLoaderKlass;
-  class         InstanceRefKlass;
-  class       ArrayKlass;
-  class         ObjArrayKlass;
-  class         TypeArrayKlass;
+// This macro just check for the existence of a member with the name "metaspace_pointers_do". If the
+// parameter list is not (MetaspaceClosure* it), you will get a compilation error.
+#define HAS_METASPACE_POINTERS_DO(T) HasMetaspacePointersDo<T>::value
+
+template<typename T>
+class HasMetaspacePointersDo {
+  template<typename U> static void* test(decltype(&U::metaspace_pointers_do));
+  template<typename> static int test(...);
+  using test_type = decltype(test<T>(nullptr));
+public:
+  static constexpr bool value = std::is_pointer_v<test_type>;
+};
 
 // class MetaspaceClosure --
 //
-// This class is used for iterating the objects in the HotSpot Metaspaces. It
+// This class is used for iterating the class metadata objects. It
 // provides an API to walk all the reachable objects starting from a set of
 // root references (such as all Klass'es in the SystemDictionary).
 //
-// Currently it is used for compacting the CDS archive by eliminate temporary
-// objects allocated during archive creation time. See ArchiveBuilder for an example.
-//
-// To support MetaspaceClosure, each subclass of MetaspaceObj must provide
-// a method of the type void metaspace_pointers_do(MetaspaceClosure*). This method
-// should call MetaspaceClosure::push() on every pointer fields of this
-// class that points to a MetaspaceObj. See Annotations::metaspace_pointers_do()
-// for an example.
+// Currently it is used to copy class metadata into the AOT cache.
+// See ArchiveBuilder for an example.
 class MetaspaceClosure {
 public:
   enum Writability {
@@ -79,16 +67,32 @@ public:
     _default
   };
 
+#define METASPACE_CLOSURE_TYPE_NAME_CASE(name) case MetaspaceClosureType::name ## Type: return #name;
+
+  static const char* type_name(MetaspaceClosureType type) {
+    switch(type) {
+    METASPACE_CLOSURE_TYPES_DO(METASPACE_CLOSURE_TYPE_NAME_CASE)
+    default:
+      ShouldNotReachHere();
+      return nullptr;
+    }
+  }
+
   // class MetaspaceClosure::Ref --
   //
-  // MetaspaceClosure can be viewed as a very simple type of copying garbage
-  // collector. For it to function properly, it requires each subclass of
-  // MetaspaceObj to provide two methods:
+  // For type X to be iterable by MetaspaceClosure, X (or one of X's supertypes) must have
+  // the following public functions:
+  //         void metaspace_pointers_do(MetaspaceClosure* it);
+  //         static bool is_read_only_by_default() { return true; }
   //
-  //  size_t size();                                 -- to determine how much data to copy
-  //  void metaspace_pointers_do(MetaspaceClosure*); -- to locate all the embedded pointers
+  // In addition, if X is not a subtype of MetaspaceObj, it must have the following function:
+  //         MetaspaceClosureType type() const;
+  //         int size_in_heapwords() const;
   //
-  // Calling these methods would be trivial if these two were virtual methods.
+  // Currently, the iterable types include all subtypes of MetsapceObj, as well
+  // as GrowableArray, ModuleEntry and PackageEntry.
+  //
+  // Calling these functions would be trivial if these were virtual functions.
   // However, to save space, MetaspaceObj has NO vtable. The vtable is introduced
   // only in the Metadata class.
   //
@@ -97,7 +101,7 @@ public:
   // so that we can statically discover the type of a object. The use of Ref
   // depends on the fact that:
   //
-  // [1] We don't use polymorphic pointers for MetaspaceObj's that are not subclasses
+  // [1] We don't use polymorphic pointers to MetaspaceObj's that are not subclasses
   //     of Metadata. I.e., we don't do this:
   //     class Klass {
   //         MetaspaceObj *_obj;
@@ -130,8 +134,7 @@ public:
     virtual bool not_null() const = 0;
     virtual int size() const = 0;
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const = 0;
-    virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const = 0;
-    virtual MetaspaceObj::Type msotype() const = 0;
+    virtual MetaspaceClosureType type() const = 0;
     virtual bool is_read_only_by_default() const = 0;
     virtual ~Ref() {}
 
@@ -180,7 +183,26 @@ public:
   }
 
 private:
-  // MSORef -- iterate an instance of MetaspaceObj
+  template <typename T, ENABLE_IF(std::is_base_of<MetaspaceObj, T>::value)>
+  static int get_size(T* obj) {
+    return obj->size();
+  }
+
+  template <typename T, ENABLE_IF(!std::is_base_of<MetaspaceObj, T>::value)>
+  static int get_size(T* obj) {
+    return obj->size_in_heapwords();
+  }
+
+  static MetaspaceClosureType as_type(MetaspaceClosureType t) {
+    return t;
+  }
+
+  static MetaspaceClosureType as_type(MetaspaceObj::Type msotype) {
+    precond(msotype < MetaspaceObj::_number_of_types);
+    return (MetaspaceClosureType)msotype;
+  }
+
+  // MSORef -- iterate an instance of T, where T::metaspace_pointers_do() exists.
   template <class T> class MSORef : public Ref {
     T** _mpp;
     T* dereference() const {
@@ -196,18 +218,20 @@ private:
 
     virtual bool is_read_only_by_default() const { return T::is_read_only_by_default(); }
     virtual bool not_null()                const { return dereference() != nullptr; }
-    virtual int size()                     const { return dereference()->size(); }
-    virtual MetaspaceObj::Type msotype()   const { return dereference()->type(); }
+    virtual int size()                     const { return get_size(dereference()); }
+    virtual MetaspaceClosureType type()    const { return as_type(dereference()->type()); }
 
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
       dereference()->metaspace_pointers_do(it);
     }
-    virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
-      ((T*)new_loc)->metaspace_pointers_do(it);
-    }
   };
 
-  // abstract base class for MSOArrayRef, MSOPointerArrayRef and OtherArrayRef
+  //---------------------
+  // Support for Array<T>
+  //---------------------
+
+  // Abstract base class for MSOArrayRef, MSOPointerArrayRef and OtherArrayRef.
+  // These are used for iterating Array<T>.
   template <class T> class ArrayRef : public Ref {
     Array<T>** _mpp;
   protected:
@@ -224,10 +248,10 @@ private:
     virtual bool is_read_only_by_default() const { return true; }
     virtual bool not_null()                const { return dereference() != nullptr;  }
     virtual int size()                     const { return dereference()->size(); }
-    virtual MetaspaceObj::Type msotype()   const { return MetaspaceObj::array_type(sizeof(T)); }
+    virtual MetaspaceClosureType type()    const { return as_type(MetaspaceObj::array_type(sizeof(T))); }
   };
 
-  // OtherArrayRef -- iterate an instance of Array<T>, where T is NOT a subtype of MetaspaceObj.
+  // OtherArrayRef -- iterate an instance of Array<T>, where T does NOT have metaspace_pointer_do().
   // T can be a primitive type, such as int, or a structure. However, we do not scan
   // the fields inside T, so you should not embed any pointers inside T.
   template <class T> class OtherArrayRef : public ArrayRef<T> {
@@ -238,13 +262,9 @@ private:
       Array<T>* array = ArrayRef<T>::dereference();
       log_trace(aot)("Iter(OtherArray): %p [%d]", array, array->length());
     }
-    virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
-      Array<T>* array = (Array<T>*)new_loc;
-      log_trace(aot)("Iter(OtherArray): %p [%d]", array, array->length());
-    }
   };
 
-  // MSOArrayRef -- iterate an instance of Array<T>, where T is a subtype of MetaspaceObj.
+  // MSOArrayRef -- iterate an instance of Array<T>, where T has metaspace_pointer_do().
   // We recursively call T::metaspace_pointers_do() for each element in this array.
   template <class T> class MSOArrayRef : public ArrayRef<T> {
   public:
@@ -253,9 +273,6 @@ private:
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
       metaspace_pointers_do_at_impl(it, ArrayRef<T>::dereference());
     }
-    virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
-      metaspace_pointers_do_at_impl(it, (Array<T>*)new_loc);
-    }
   private:
     void metaspace_pointers_do_at_impl(MetaspaceClosure *it, Array<T>* array) const {
       log_trace(aot)("Iter(MSOArray): %p [%d]", array, array->length());
@@ -266,7 +283,7 @@ private:
     }
   };
 
-  // MSOPointerArrayRef -- iterate an instance of Array<T*>, where T is a subtype of MetaspaceObj.
+  // MSOPointerArrayRef -- iterate an instance of Array<T*>, where T has metaspace_pointer_do().
   // We recursively call MetaspaceClosure::push() for each pointer in this array.
   template <class T> class MSOPointerArrayRef : public ArrayRef<T*> {
   public:
@@ -275,9 +292,6 @@ private:
     virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
       metaspace_pointers_do_at_impl(it, ArrayRef<T*>::dereference());
     }
-    virtual void metaspace_pointers_do_at(MetaspaceClosure *it, address new_loc) const {
-      metaspace_pointers_do_at_impl(it, (Array<T*>*)new_loc);
-    }
   private:
     void metaspace_pointers_do_at_impl(MetaspaceClosure *it, Array<T*>* array) const {
       log_trace(aot)("Iter(MSOPointerArray): %p [%d]", array, array->length());
@@ -288,6 +302,102 @@ private:
     }
   };
 
+  //--------------------------------
+  // Support for AOTGrowableArray<T>
+  //--------------------------------
+
+  // Abstract base class for MSOCArrayRef, MSOPointerCArrayRef and OtherCArrayRef.
+  // These are used for iterating the buffer held by AOTGrowableArray<T>.
+  template <class T> class CArrayRef : public Ref {
+    T** _mpp;
+    int _num_elems; // Number of elements
+
+    int byte_size() const {
+      return _num_elems * sizeof(T);
+    }
+
+  protected:
+    // C pointer arrays don't support tagged pointers.
+    T* dereference() const {
+      return *_mpp;
+    }
+    virtual void** mpp() const {
+      return (void**)_mpp;
+    }
+    int num_elems() const {
+      return _num_elems;
+    }
+  public:
+    CArrayRef(T** mpp, int num_elems, Writability w)
+      : Ref(w), _mpp(mpp), _num_elems(num_elems) {
+      assert(is_aligned(byte_size(), BytesPerWord), "must be");
+    }
+
+    virtual bool is_read_only_by_default() const { return false; }
+    virtual bool not_null()                const { return dereference() != nullptr; }
+    virtual int size()                     const { return (int)heap_word_size(byte_size()); }
+    virtual MetaspaceClosureType type()    const { return MetaspaceClosureType::CArrayType; }
+  };
+
+  // OtherCArrayRef -- iterate a C array of type T, where T does NOT have metaspace_pointer_do().
+  // T can be a primitive type, such as int, or a structure. However, we do not scan
+  // the fields inside T, so you should not embed any pointers inside T.
+  template <class T> class OtherCArrayRef : public CArrayRef<T> {
+  public:
+    OtherCArrayRef(T** mpp, int num_elems, Writability w) : CArrayRef<T>(mpp, num_elems, w) {}
+
+    virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
+      T* array = CArrayRef<T>::dereference();
+      log_trace(aot)("Iter(OtherCArray): %p [%d]", array, CArrayRef<T>::num_elems());
+    }
+  };
+
+  // MSOCArrayRef<T> -- iterate a C array of type T, where T has metaspace_pointer_do().
+  // We recursively call T::metaspace_pointers_do() for each element in this array.
+  // This is for supporting AOTGrowableArray<T>.
+  //
+  // E.g., PackageEntry* _pkg_entry_pointers[2]; // a buffer that has 2 PackageEntry objects
+  //       ...
+  //       it->push(&_pkg_entry_pointers, 2);
+  //           /* calls _pkg_entry_pointers[0].metaspace_pointers_do(it); */
+  //           /* calls _pkg_entry_pointers[1].metaspace_pointers_do(it); */
+  template <class T> class MSOCArrayRef : public CArrayRef<T> {
+  public:
+    MSOCArrayRef(T** mpp, int num_elems, Writability w) : CArrayRef<T>(mpp, num_elems, w) {}
+
+    virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
+      T* array = CArrayRef<T>::dereference();
+      log_trace(aot)("Iter(MSOCArray): %p [%d]", array, CArrayRef<T>::num_elems());
+      for (int i = 0; i < CArrayRef<T>::num_elems(); i++) {
+        T* elm = array + i;
+        elm->metaspace_pointers_do(it);
+      }
+    }
+  };
+
+  // MSOPointerCArrayRef<T> -- iterate a C array of type T*, where T has metaspace_pointer_do().
+  // We recursively call MetaspaceClosure::push() for each pointer in this array.
+  // This is for supporting AOTGrowableArray<T*>.
+  //
+  // E.g., PackageEntry** _pkg_entry_pointers[2]; // a buffer that has 2 PackageEntry pointers
+  //       ...
+  //       it->push(&_pkg_entry_pointers, 2);
+  //           /* calls _pkg_entry_pointers[0]->metaspace_pointers_do(it); */
+  //           /* calls _pkg_entry_pointers[1]->metaspace_pointers_do(it); */
+  template <class T> class MSOPointerCArrayRef : public CArrayRef<T*> {
+  public:
+    MSOPointerCArrayRef(T*** mpp, int num_elems, Writability w) : CArrayRef<T*>(mpp, num_elems, w) {}
+
+    virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
+      T** array = CArrayRef<T*>::dereference();
+      log_trace(aot)("Iter(MSOPointerCArray): %p [%d]", array, CArrayRef<T*>::num_elems());
+      for (int i = 0; i < CArrayRef<T*>::num_elems(); i++) {
+        T** mpp = array + i;
+        it->push(mpp);
+      }
+    }
+  };
+
   // Normally, chains of references like a->b->c->d are iterated recursively. However,
   // if recursion is too deep, we save the Refs in _pending_refs, and push them later in
   // MetaspaceClosure::finish(). This avoids overflowing the C stack.
@@ -330,37 +440,61 @@ public:
   // Array<Array<Klass*>*>* a4 = ...;  it->push(&a4);    => MSOPointerArrayRef
   // Array<Annotation*>*    a5 = ...;  it->push(&a5);    => MSOPointerArrayRef
   //
-  // Note that the following will fail to compile (to prevent you from adding new fields
-  // into the MetaspaceObj subtypes that cannot be properly copied by CDS):
+  // AOTGrowableArrays have a separate "C array" buffer, so they are scanned in two steps:
   //
-  // MemoryPool*            p  = ...;  it->push(&p);     => MemoryPool is not a subclass of MetaspaceObj
-  // Array<MemoryPool*>*    a6 = ...;  it->push(&a6);    => MemoryPool is not a subclass of MetaspaceObj
-  // Array<int*>*           a7 = ...;  it->push(&a7);    => int       is not a subclass of MetaspaceObj
+  // AOTGrowableArray<jlong>*      ga1 = ...;  it->push(&ga1);  => MSORef => OtherCArrayRef
+  // AOTGrowableArray<Annotation>* ga2 = ...;  it->push(&ga2);  => MSORef => MSOCArrayRef
+  // AOTGrowableArray<Klass*>*     ga3 = ...;  it->push(&ga3);  => MSORef => MSOPointerCArrayRef
+  //
+  // Note that the following will fail to compile:
+  //
+  // MemoryPool*            p  = ...;  it->push(&p);     => MemoryPool doesn't have metaspace_pointers_do
+  // Array<MemoryPool*>*    a6 = ...;  it->push(&a6);    => MemoryPool doesn't have metaspace_pointers_do
+  // Array<int*>*           a7 = ...;  it->push(&a7);    => int doesn't have metaspace_pointers_do
 
+  // --- Regular iterable objects
   template <typename T>
   void push(T** mpp, Writability w = _default) {
-    static_assert(std::is_base_of<MetaspaceObj, T>::value, "Do not push pointers of arbitrary types");
+    static_assert(HAS_METASPACE_POINTERS_DO(T), "Do not push pointers of arbitrary types");
     push_with_ref<MSORef<T>>(mpp, w);
   }
 
-  template <typename T, ENABLE_IF(!std::is_base_of<MetaspaceObj, T>::value)>
+  // --- Array<T>
+  template <typename T, ENABLE_IF(!HAS_METASPACE_POINTERS_DO(T))>
   void push(Array<T>** mpp, Writability w = _default) {
     push_with_ref<OtherArrayRef<T>>(mpp, w);
   }
 
-  template <typename T, ENABLE_IF(std::is_base_of<MetaspaceObj, T>::value)>
+  template <typename T, ENABLE_IF(HAS_METASPACE_POINTERS_DO(T))>
   void push(Array<T>** mpp, Writability w = _default) {
     push_with_ref<MSOArrayRef<T>>(mpp, w);
   }
 
   template <typename T>
   void push(Array<T*>** mpp, Writability w = _default) {
-    static_assert(std::is_base_of<MetaspaceObj, T>::value, "Do not push Arrays of arbitrary pointer types");
+    static_assert(HAS_METASPACE_POINTERS_DO(T), "Do not push Arrays of arbitrary pointer types");
     push_with_ref<MSOPointerArrayRef<T>>(mpp, w);
   }
+
+  // --- The buffer of AOTGrowableArray<T>
+  template <typename T, ENABLE_IF(!HAS_METASPACE_POINTERS_DO(T))>
+  void push_c_array(T** mpp, int num_elems, Writability w = _default) {
+    push_impl(new OtherCArrayRef<T>(mpp, num_elems, w));
+  }
+
+  template <typename T, ENABLE_IF(HAS_METASPACE_POINTERS_DO(T))>
+  void push_c_array(T** mpp, int num_elems, Writability w = _default) {
+    push_impl(new MSOCArrayRef<T>(mpp, num_elems, w));
+  }
+
+  template <typename T>
+  void push_c_array(T*** mpp, int num_elems, Writability w = _default) {
+    static_assert(HAS_METASPACE_POINTERS_DO(T), "Do not push C arrays of arbitrary pointer types");
+    push_impl(new MSOPointerCArrayRef<T>(mpp, num_elems, w));
+  }
 };
 
-// This is a special MetaspaceClosure that visits each unique MetaspaceObj once.
+// This is a special MetaspaceClosure that visits each unique object once.
 class UniqueMetaspaceClosure : public MetaspaceClosure {
   static const int INITIAL_TABLE_SIZE = 15889;
   static const int MAX_TABLE_SIZE     = 1000000;
diff --git a/src/hotspot/share/memory/metaspaceClosureType.hpp b/src/hotspot/share/memory/metaspaceClosureType.hpp
new file mode 100644
index 00000000000..adf6805521b
--- /dev/null
+++ b/src/hotspot/share/memory/metaspaceClosureType.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_MEMORY_METASPACECLOSURETYPE_HPP
+#define SHARE_MEMORY_METASPACECLOSURETYPE_HPP
+
+#include "memory/allocation.hpp"
+
+// MetaspaceClosure is able to iterate on MetaspaceObjs, plus the following classes
+#define METASPACE_CLOSURE_TYPES_DO(f) \
+  METASPACE_OBJ_TYPES_DO(f) \
+  f(CArray) \
+  f(GrowableArray) \
+  f(ModuleEntry) \
+  f(PackageEntry) \
+
+#define METASPACE_CLOSURE_TYPE_DECLARE(name) name ## Type,
+
+enum class MetaspaceClosureType : int {
+  METASPACE_CLOSURE_TYPES_DO(METASPACE_CLOSURE_TYPE_DECLARE)
+  _number_of_types
+};
+
+
+#endif // SHARE_MEMORY_METASPACECLOSURETYPE_HPP
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index cfbab1b8afb..a78b245cc07 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -1182,13 +1182,12 @@ bool universe_post_init() {
     Universe::heap()->update_capacity_and_used_at_gc();
   }
 
-  // ("weak") refs processing infrastructure initialization
+  // Initialize serviceability
+  MemoryService::initialize(Universe::heap());
+
+  // Complete initialization
   Universe::heap()->post_initialize();
 
-  MemoryService::add_metaspace_memory_pools();
-
-  MemoryService::set_universe_heap(Universe::heap());
-
 #if INCLUDE_CDS
   AOTMetaspace::post_initialize(CHECK_false);
 #endif
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 92a168248d2..0627c0b9a8e 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -370,34 +370,22 @@ void VirtualSpace::shrink_by(size_t size) {
     assert(middle_high_boundary() <= aligned_upper_new_high &&
            aligned_upper_new_high + upper_needs <= upper_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable)) {
-      DEBUG_ONLY(warning("os::uncommit_memory failed"));
-      return;
-    } else {
-      _upper_high -= upper_needs;
-    }
+    os::uncommit_memory(aligned_upper_new_high, upper_needs, _executable);
+    _upper_high -= upper_needs;
   }
   if (middle_needs > 0) {
     assert(lower_high_boundary() <= aligned_middle_new_high &&
            aligned_middle_new_high + middle_needs <= middle_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable)) {
-      DEBUG_ONLY(warning("os::uncommit_memory failed"));
-      return;
-    } else {
-      _middle_high -= middle_needs;
-    }
+    os::uncommit_memory(aligned_middle_new_high, middle_needs, _executable);
+    _middle_high -= middle_needs;
   }
   if (lower_needs > 0) {
     assert(low_boundary() <= aligned_lower_new_high &&
            aligned_lower_new_high + lower_needs <= lower_high_boundary(),
            "must not shrink beyond region");
-    if (!os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable)) {
-      DEBUG_ONLY(warning("os::uncommit_memory failed"));
-      return;
-    } else {
-      _lower_high -= lower_needs;
-    }
+    os::uncommit_memory(aligned_lower_new_high, lower_needs, _executable);
+    _lower_high -= lower_needs;
   }
 
   _high -= size;
diff --git a/src/hotspot/share/nmt/mallocHeader.cpp b/src/hotspot/share/nmt/mallocHeader.cpp
index d88b5c790fb..e74e74fde48 100644
--- a/src/hotspot/share/nmt/mallocHeader.cpp
+++ b/src/hotspot/share/nmt/mallocHeader.cpp
@@ -75,4 +75,4 @@ void MallocHeader::print_block_on_error(outputStream* st, address bad_address, a
     // print one hex dump
     os::print_hex_dump(st, from1, to2, 1);
   }
-}
+}
\ No newline at end of file
diff --git a/src/hotspot/share/nmt/mallocHeader.hpp b/src/hotspot/share/nmt/mallocHeader.hpp
index 45568243ef3..33e288dd8e4 100644
--- a/src/hotspot/share/nmt/mallocHeader.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.hpp
@@ -27,10 +27,18 @@
 #define SHARE_NMT_MALLOCHEADER_HPP
 
 #include "nmt/memTag.hpp"
+#include "sanitizers/address.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/nativeCallStack.hpp"
 
+// With ASAN, we omit NMT block integrity checks since ASAN does a better and faster
+// job of alerting us to memory corruptions
+#if INCLUDE_ASAN
+#undef NMT_BLOCK_INTEGRITY_CHECKS
+#else
+#define NMT_BLOCK_INTEGRITY_CHECKS
+#endif
 class outputStream;
 
 /*
@@ -118,6 +126,7 @@ class MallocHeader {
   inline static OutTypeParam resolve_checked_impl(InTypeParam memblock);
 
 public:
+  static constexpr size_t footer_size = sizeof(uint16_t);
   // Contains all of the necessary data to to deaccount block with NMT.
   struct FreeInfo {
     const size_t size;
@@ -126,8 +135,9 @@ public:
   };
 
   inline MallocHeader(size_t size, MemTag mem_tag, uint32_t mst_marker);
-
-  inline static size_t malloc_overhead() { return sizeof(MallocHeader) + sizeof(uint16_t); }
+  inline static size_t malloc_overhead() { return sizeof(MallocHeader) + footer_size; }
+  inline static MallocHeader* kill_block(void* memblock);
+  inline static void revive_block(void* memblock);
   inline size_t size()  const { return _size; }
   inline MemTag mem_tag() const { return _mem_tag; }
   inline uint32_t mst_marker() const { return _mst_marker; }
@@ -164,5 +174,4 @@ public:
 // This needs to be true on both 64-bit and 32-bit platforms
 STATIC_ASSERT(sizeof(MallocHeader) == (sizeof(uint64_t) * 2));
 
-
-#endif // SHARE_NMT_MALLOCHEADER_HPP
+#endif // SHARE_NMT_MALLOCHEADER_HPP
\ No newline at end of file
diff --git a/src/hotspot/share/nmt/mallocHeader.inline.hpp b/src/hotspot/share/nmt/mallocHeader.inline.hpp
index 0ad0b3ddc81..09ab872c780 100644
--- a/src/hotspot/share/nmt/mallocHeader.inline.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.inline.hpp
@@ -46,9 +46,6 @@ inline MallocHeader::MallocHeader(size_t size, MemTag mem_tag, uint32_t mst_mark
 }
 
 inline void MallocHeader::revive() {
-  assert(_canary == _header_canary_dead_mark, "must be dead");
-  assert(get_footer() == _footer_canary_dead_mark, "must be dead");
-  NOT_LP64(assert(_alt_canary == _header_alt_canary_dead_mark, "must be dead"));
   _canary = _header_canary_live_mark;
   NOT_LP64(_alt_canary = _header_alt_canary_live_mark);
   set_footer(_footer_canary_live_mark);
@@ -96,16 +93,18 @@ inline bool MallocHeader::is_valid_malloced_pointer(const void* payload, char* m
 
 template<typename InTypeParam, typename OutTypeParam>
 inline OutTypeParam MallocHeader::resolve_checked_impl(InTypeParam memblock) {
-  char msg[256];
-  address corruption = nullptr;
-  if (!is_valid_malloced_pointer(memblock, msg, sizeof(msg))) {
-    fatal("Not a valid malloc pointer: " PTR_FORMAT ": %s", p2i(memblock), msg);
-  }
   OutTypeParam header_pointer = (OutTypeParam)memblock - 1;
-  if (!header_pointer->check_block_integrity(msg, sizeof(msg), &corruption)) {
-    header_pointer->print_block_on_error(tty, corruption != nullptr ? corruption : (address)header_pointer, (address)header_pointer);
-    fatal("NMT has detected a memory corruption bug. Block at " PTR_FORMAT ": %s", p2i(memblock), msg);
-  }
+  #ifdef NMT_BLOCK_INTEGRITY_CHECKS
+    char msg[256];
+    address corruption = nullptr;
+    if (!is_valid_malloced_pointer(memblock, msg, sizeof(msg))) {
+      fatal("Not a valid malloc pointer: " PTR_FORMAT ": %s", p2i(memblock), msg);
+    }
+    if (!header_pointer->check_block_integrity(msg, sizeof(msg), &corruption)) {
+      header_pointer->print_block_on_error(tty, corruption != nullptr ? corruption : (address)header_pointer, (address)header_pointer);
+      fatal("NMT has detected a memory corruption bug. Block at " PTR_FORMAT ": %s", p2i(memblock), msg);
+    }
+  #endif
   return header_pointer;
 }
 
@@ -163,4 +162,20 @@ inline bool MallocHeader::check_block_integrity(char* msg, size_t msglen, addres
   return true;
 }
 
+MallocHeader* MallocHeader::kill_block(void* memblock) {
+  MallocHeader* header = (MallocHeader*)memblock - 1;
+  ASAN_UNPOISON_MEMORY_REGION(header, sizeof(MallocHeader));
+  ASAN_UNPOISON_MEMORY_REGION(header->footer_address(), footer_size);
+  resolve_checked(memblock);
+  header->mark_block_as_dead();
+  return header;
+}
+
+void MallocHeader::revive_block(void* memblock) {
+  MallocHeader* header = (MallocHeader*)memblock - 1;
+  header->revive();
+  ASAN_POISON_MEMORY_REGION(header->footer_address(), footer_size);
+  ASAN_POISON_MEMORY_REGION(header, sizeof(MallocHeader));
+}
+
 #endif // SHARE_NMT_MALLOCHEADER_INLINE_HPP
diff --git a/src/hotspot/share/nmt/mallocTracker.cpp b/src/hotspot/share/nmt/mallocTracker.cpp
index 2cf5034c0bf..532b6f41bd0 100644
--- a/src/hotspot/share/nmt/mallocTracker.cpp
+++ b/src/hotspot/share/nmt/mallocTracker.cpp
@@ -199,7 +199,7 @@ void* MallocTracker::record_malloc(void* malloc_base, size_t size, MemTag mem_ta
     assert(header2->mem_tag() == mem_tag, "Wrong memory tag");
   }
 #endif
-
+  MallocHeader::revive_block(memblock);
   return memblock;
 }
 
@@ -207,7 +207,7 @@ void* MallocTracker::record_free_block(void* memblock) {
   assert(MemTracker::enabled(), "Sanity");
   assert(memblock != nullptr, "precondition");
 
-  MallocHeader* header = MallocHeader::resolve_checked(memblock);
+  MallocHeader* header = MallocHeader::kill_block(memblock);
 
   deaccount(header->free_info());
 
@@ -218,7 +218,6 @@ void* MallocTracker::record_free_block(void* memblock) {
   }
 
   header->mark_block_as_dead();
-
   return (void*)header;
 }
 
diff --git a/src/hotspot/share/nmt/mallocTracker.hpp b/src/hotspot/share/nmt/mallocTracker.hpp
index fc03faf7212..e96396ebbcb 100644
--- a/src/hotspot/share/nmt/mallocTracker.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.hpp
@@ -311,15 +311,6 @@ class MallocTracker : AllStatic {
   // totally failproof. Only use this during debugging or when you can afford
   // signals popping up, e.g. when writing an hs_err file.
   static bool print_pointer_information(const void* p, outputStream* st);
-
-  static inline MallocHeader* malloc_header(void *memblock) {
-    assert(memblock != nullptr, "null pointer");
-    return (MallocHeader*)memblock -1;
-  }
-  static inline const MallocHeader* malloc_header(const void *memblock) {
-    assert(memblock != nullptr, "null pointer");
-    return (const MallocHeader*)memblock -1;
-  }
 };
 
 #endif // SHARE_NMT_MALLOCTRACKER_HPP
diff --git a/src/hotspot/share/nmt/memBaseline.cpp b/src/hotspot/share/nmt/memBaseline.cpp
index 118e3ec64c0..65168fd4e09 100644
--- a/src/hotspot/share/nmt/memBaseline.cpp
+++ b/src/hotspot/share/nmt/memBaseline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,12 +168,13 @@ int compare_allocation_site(const VirtualMemoryAllocationSite& s1,
 }
 
 bool MemBaseline::aggregate_virtual_memory_allocation_sites() {
+
   SortedLinkedList<VirtualMemoryAllocationSite, compare_allocation_site> allocation_sites;
 
   VirtualMemoryAllocationSite* site;
   bool failed_oom = false;
-  _vma_allocations->visit_reserved_regions([&](ReservedMemoryRegion& rgn) {
-    VirtualMemoryAllocationSite tmp(*rgn.call_stack(), rgn.mem_tag());
+  _vma_allocations->visit_reserved_regions([&](VirtualMemoryRegion& rgn) {
+    VirtualMemoryAllocationSite tmp(*rgn.reserved_call_stack(), rgn.mem_tag());
     site = allocation_sites.find(tmp);
     if (site == nullptr) {
       LinkedListNode<VirtualMemoryAllocationSite>* node =
diff --git a/src/hotspot/share/nmt/memMapPrinter.cpp b/src/hotspot/share/nmt/memMapPrinter.cpp
index 9a2fe166d3d..639e06292fc 100644
--- a/src/hotspot/share/nmt/memMapPrinter.cpp
+++ b/src/hotspot/share/nmt/memMapPrinter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, 2024, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -149,7 +149,7 @@ public:
     }
   }
 
-  bool do_allocation_site(const ReservedMemoryRegion* rgn) override {
+  bool do_allocation_site(const VirtualMemoryRegion* rgn) override {
     // Cancel iteration if we run out of memory (add returns false);
     return add(rgn->base(), rgn->end(), rgn->mem_tag());
   }
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index 772bda2885b..27a94ec7bc0 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -395,14 +395,14 @@ int MemDetailReporter::report_virtual_memory_allocation_sites()  {
 void MemDetailReporter::report_virtual_memory_map() {
   // Virtual memory map always in base address order
   output()->print_cr("Virtual memory map:");
-  _baseline.virtual_memory_allocations()->visit_reserved_regions([&](ReservedMemoryRegion& rgn) {
+  _baseline.virtual_memory_allocations()->visit_reserved_regions([&](VirtualMemoryRegion& rgn) {
     report_virtual_memory_region(&rgn);
     return true;
   });
 }
 
-void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion* reserved_rgn) {
-  assert(reserved_rgn != nullptr, "null pointer");
+void MemDetailReporter::report_virtual_memory_region(const VirtualMemoryRegion* rgn) {
+  assert(rgn != nullptr, "null pointer");
 
   // We don't bother about reporting peaks here.
   // That is because peaks - in the context of virtual memory, peak of committed areas - make little sense
@@ -414,16 +414,16 @@ void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion*
   // usage *by callsite*.
 
   // Don't report if size is too small.
-  if (amount_in_current_scale(reserved_rgn->size()) == 0) return;
+  if (amount_in_current_scale(rgn->size()) == 0) return;
 
   outputStream* out = output();
   const char* scale = current_scale();
-  const NativeCallStack*  stack = reserved_rgn->call_stack();
-  bool all_committed = reserved_rgn->size() == _baseline.virtual_memory_allocations()->committed_size(*reserved_rgn);
+  const NativeCallStack*  stack = rgn->reserved_call_stack();
+  bool all_committed = rgn->size() == _baseline.virtual_memory_allocations()->committed_size(*rgn);
   const char* region_type = (all_committed ? "reserved and committed" : "reserved");
   out->cr();
-  print_virtual_memory_region(region_type, reserved_rgn->base(), reserved_rgn->size());
-  out->print(" for %s", NMTUtil::tag_to_name(reserved_rgn->mem_tag()));
+  print_virtual_memory_region(region_type, rgn->base(), rgn->size());
+  out->print(" for %s", NMTUtil::tag_to_name(rgn->mem_tag()));
   if (stack->is_empty()) {
     out->cr();
   } else {
@@ -433,9 +433,9 @@ void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion*
 
   if (all_committed) {
     bool reserved_and_committed = false;
-    _baseline.virtual_memory_allocations()->visit_committed_regions(*reserved_rgn,
-                                                                  [&](CommittedMemoryRegion& committed_rgn) {
-      if (committed_rgn.equals(*reserved_rgn)) {
+    _baseline.virtual_memory_allocations()->visit_committed_regions(*rgn,
+                                                                  [&](VirtualMemoryRegion& committed_rgn) {
+      if (committed_rgn.equals(*rgn)) {
         // One region spanning the entire reserved region, with the same stack trace.
         // Don't print this regions because the "reserved and committed" line above
         // already indicates that the region is committed.
@@ -450,13 +450,13 @@ void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion*
     }
   }
 
-  auto print_committed_rgn = [&](const CommittedMemoryRegion& crgn) {
+  auto print_committed_rgn = [&](const VirtualMemoryRegion& rgn) {
     // Don't report if size is too small
-    if (amount_in_current_scale(crgn.size()) == 0) return;
-    stack = crgn.call_stack();
+    if (amount_in_current_scale(rgn.size()) == 0) return;
+    stack = rgn.committed_call_stack();
     out->cr();
     INDENT_BY(8,
-      print_virtual_memory_region("committed", crgn.base(), crgn.size());
+      print_virtual_memory_region("committed", rgn.base(), rgn.size());
       if (stack->is_empty()) {
         out->cr();
       } else {
@@ -466,9 +466,9 @@ void MemDetailReporter::report_virtual_memory_region(const ReservedMemoryRegion*
     )
   };
 
-  _baseline.virtual_memory_allocations()->visit_committed_regions(*reserved_rgn,
-                                                                  [&](CommittedMemoryRegion& crgn) {
-    print_committed_rgn(crgn);
+  _baseline.virtual_memory_allocations()->visit_committed_regions(*rgn,
+                                                                  [&](VirtualMemoryRegion& committed_rgn) {
+    print_committed_rgn(committed_rgn);
     return true;
   });
 }
diff --git a/src/hotspot/share/nmt/memReporter.hpp b/src/hotspot/share/nmt/memReporter.hpp
index bab8de138d0..0d7e7344608 100644
--- a/src/hotspot/share/nmt/memReporter.hpp
+++ b/src/hotspot/share/nmt/memReporter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -178,7 +178,7 @@ class MemDetailReporter : public MemSummaryReporter {
   int report_virtual_memory_allocation_sites();
 
   // Report a virtual memory region
-  void report_virtual_memory_region(const ReservedMemoryRegion* rgn);
+  void report_virtual_memory_region(const VirtualMemoryRegion* rgn);
 };
 
 /*
diff --git a/src/hotspot/share/nmt/memoryFileTracker.cpp b/src/hotspot/share/nmt/memoryFileTracker.cpp
index fe723d09364..0a458347169 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.cpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,21 +44,21 @@ void MemoryFileTracker::allocate_memory(MemoryFile* file, size_t offset,
   VMATree::RegionData regiondata(sidx, mem_tag);
   VMATree::SummaryDiff diff;
   file->_tree.commit_mapping(offset, size, regiondata, diff);
-  for (int i = 0; i < mt_number_of_tags; i++) {
-    VirtualMemory* summary = file->_summary.by_tag(NMTUtil::index_to_tag(i));
-    summary->reserve_memory(diff.tag[i].commit);
-    summary->commit_memory(diff.tag[i].commit);
-  }
+  diff.visit([&](MemTag mt, const VMATree::SingleDiff& single_diff) {
+    VirtualMemory* summary = file->_summary.by_tag(mt);
+    summary->reserve_memory(single_diff.commit);
+    summary->commit_memory(single_diff.commit);
+  });
 }
 
 void MemoryFileTracker::free_memory(MemoryFile* file, size_t offset, size_t size) {
   VMATree::SummaryDiff diff;
   file->_tree.release_mapping(offset, size, diff);
-  for (int i = 0; i < mt_number_of_tags; i++) {
-    VirtualMemory* summary = file->_summary.by_tag(NMTUtil::index_to_tag(i));
-    summary->reserve_memory(diff.tag[i].commit);
-    summary->commit_memory(diff.tag[i].commit);
-  }
+  diff.visit([&](MemTag mt, const VMATree::SingleDiff& single_diff) {
+    VirtualMemory* summary = file->_summary.by_tag(mt);
+    summary->reserve_memory(single_diff.commit);
+    summary->commit_memory(single_diff.commit);
+  });
 }
 
 void MemoryFileTracker::print_report_on(const MemoryFile* file, outputStream* stream, size_t scale) {
diff --git a/src/hotspot/share/nmt/regionsTree.cpp b/src/hotspot/share/nmt/regionsTree.cpp
index 83306cbc14f..1a87d051928 100644
--- a/src/hotspot/share/nmt/regionsTree.cpp
+++ b/src/hotspot/share/nmt/regionsTree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,9 +58,9 @@ void RegionsTree::print_on(outputStream* st) {
 }
 #endif
 
-size_t RegionsTree::committed_size(const ReservedMemoryRegion& rgn) {
+size_t RegionsTree::committed_size(const VirtualMemoryRegion& rgn) {
   size_t result = 0;
-  visit_committed_regions(rgn, [&](CommittedMemoryRegion& crgn) {
+  visit_committed_regions(rgn, [&](VirtualMemoryRegion& crgn) {
     result += crgn.size();
     return true;
   });
diff --git a/src/hotspot/share/nmt/regionsTree.hpp b/src/hotspot/share/nmt/regionsTree.hpp
index 2e1b37d0c1a..4b27423db8c 100644
--- a/src/hotspot/share/nmt/regionsTree.hpp
+++ b/src/hotspot/share/nmt/regionsTree.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,7 @@
 #include "nmt/vmatree.hpp"
 
 
-class ReservedMemoryRegion;
-class CommittedMemoryRegion;
+class VirtualMemoryRegion;
 // RegionsTree extends VMATree to add some more specific API and also defines a helper
 // for processing the tree nodes in a shorter and more meaningful way.
 class RegionsTree : public VMATree {
@@ -46,7 +45,7 @@ class RegionsTree : public VMATree {
     _with_storage(other._with_storage) {}
   RegionsTree& operator=(const RegionsTree& other) = delete;
 
-  ReservedMemoryRegion find_reserved_region(address addr);
+  VirtualMemoryRegion find_reserved_region(address addr);
 
   void commit_region(address addr, size_t size, const NativeCallStack& stack, SummaryDiff& diff);
   void uncommit_region(address addr, size_t size, SummaryDiff& diff);
@@ -71,6 +70,7 @@ class RegionsTree : public VMATree {
         return position() - other.position();
       }
       inline NativeCallStackStorage::StackIndex out_stack_index() const { return _node->val().out.reserved_stack(); }
+      inline NativeCallStackStorage::StackIndex out_committed_stack_index() const { return _node->val().out.committed_stack(); }
       inline MemTag in_tag() const { return _node->val().in.mem_tag(); }
       inline MemTag out_tag() const { return _node->val().out.mem_tag(); }
       inline void set_in_tag(MemTag tag) { _node->val().in.set_tag(tag); }
@@ -81,7 +81,7 @@ class RegionsTree : public VMATree {
   DEBUG_ONLY(void print_on(outputStream* st);)
 
   template<typename F>
-  void visit_committed_regions(const ReservedMemoryRegion& rgn, F func);
+  void visit_committed_regions(const VirtualMemoryRegion& rgn, F func);
 
   template<typename F>
   void visit_reserved_regions(F func);
@@ -90,7 +90,7 @@ class RegionsTree : public VMATree {
     return RegionData(_ncs_storage.push(ncs), tag);
   }
 
-  inline const NativeCallStack stack(NodeHelper& node) {
+  inline const NativeCallStack reserved_stack(NodeHelper& node) {
     if (!_with_storage) {
       return NativeCallStack::empty_stack();
     }
@@ -98,7 +98,15 @@ class RegionsTree : public VMATree {
     return _ncs_storage.get(si);
   }
 
-  size_t committed_size(const ReservedMemoryRegion& rgn);
+  inline const NativeCallStack committed_stack(NodeHelper& node) {
+    if (!_with_storage) {
+      return NativeCallStack::empty_stack();
+    }
+    NativeCallStackStorage::StackIndex si = node.out_committed_stack_index();
+    return _ncs_storage.get(si);
+  }
+
+  size_t committed_size(const VirtualMemoryRegion& rgn);
 };
 
 #endif // NMT_REGIONSTREE_HPP
diff --git a/src/hotspot/share/nmt/regionsTree.inline.hpp b/src/hotspot/share/nmt/regionsTree.inline.hpp
index 98cfa0e7f2c..793a5c5f1fa 100644
--- a/src/hotspot/share/nmt/regionsTree.inline.hpp
+++ b/src/hotspot/share/nmt/regionsTree.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 #include "nmt/virtualMemoryTracker.hpp"
 
 template<typename F>
-void RegionsTree::visit_committed_regions(const ReservedMemoryRegion& rgn, F func) {
+void RegionsTree::visit_committed_regions(const VirtualMemoryRegion& rgn, F func) {
   position start = (position)rgn.base();
   size_t end = reinterpret_cast<size_t>(rgn.end()) + 1;
   size_t comm_size = 0;
@@ -38,8 +38,12 @@ void RegionsTree::visit_committed_regions(const ReservedMemoryRegion& rgn, F fun
   visit_range_in_order(start, end, [&](Node* node) {
     NodeHelper curr(node);
     if (prev.is_valid() && prev.is_committed_begin()) {
-      CommittedMemoryRegion cmr((address)prev.position(), curr.distance_from(prev), stack(prev));
-      if (!func(cmr)) {
+      VirtualMemoryRegion rgn((address)prev.position(),
+                              curr.distance_from(prev),
+                              reserved_stack(prev),
+                              committed_stack(prev),
+                              prev.out_tag());
+      if (!func(rgn)) {
         return false;
       }
     }
@@ -63,13 +67,13 @@ void RegionsTree::visit_reserved_regions(F func) {
     }
     prev = curr;
     if (curr.is_released_begin() || begin_node.out_tag() != curr.out_tag()) {
-      auto st = stack(begin_node);
+      auto st = reserved_stack(begin_node);
       if (rgn_size == 0) {
         prev.clear_node();
         return true;
       }
-      ReservedMemoryRegion rmr((address)begin_node.position(), rgn_size, st, begin_node.out_tag());
-      if (!func(rmr)) {
+      VirtualMemoryRegion rgn((address)begin_node.position(), rgn_size, st, begin_node.out_tag());
+      if (!func(rgn)) {
         return false;
       }
       rgn_size = 0;
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index d676d93e040..dc68664f34f 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,16 +80,17 @@ void VirtualMemoryTracker::Instance::set_reserved_region_tag(address addr, size_
 }
 
 void VirtualMemoryTracker::set_reserved_region_tag(address addr, size_t size, MemTag mem_tag) {
-    VMATree::SummaryDiff diff = tree()->set_tag((VMATree::position) addr, size, mem_tag);
-    apply_summary_diff(diff);
+  VMATree::SummaryDiff diff;
+  tree()->set_tag((VMATree::position)addr, size, mem_tag, diff);
+  apply_summary_diff(diff);
 }
 
-void VirtualMemoryTracker::Instance::apply_summary_diff(VMATree::SummaryDiff diff) {
+void VirtualMemoryTracker::Instance::apply_summary_diff(VMATree::SummaryDiff& diff) {
   assert(_tracker != nullptr, "Sanity check");
   _tracker->apply_summary_diff(diff);
 }
 
-void VirtualMemoryTracker::apply_summary_diff(VMATree::SummaryDiff diff) {
+void VirtualMemoryTracker::apply_summary_diff(VMATree::SummaryDiff& diff) {
   VMATree::SingleDiff::delta reserve_delta, commit_delta;
   size_t reserved, committed;
   MemTag tag = mtNone;
@@ -104,10 +105,9 @@ void VirtualMemoryTracker::apply_summary_diff(VMATree::SummaryDiff diff) {
 #endif
   };
 
-  for (int i = 0; i < mt_number_of_tags; i++) {
-    reserve_delta = diff.tag[i].reserve;
-    commit_delta = diff.tag[i].commit;
-    tag = NMTUtil::index_to_tag(i);
+  diff.visit([&](MemTag tag, const VMATree::SingleDiff& single_diff) {
+    reserve_delta = single_diff.reserve;
+    commit_delta = single_diff.commit;
     reserved = VirtualMemorySummary::as_snapshot()->by_tag(tag)->reserved();
     committed = VirtualMemorySummary::as_snapshot()->by_tag(tag)->committed();
     if (reserve_delta != 0) {
@@ -138,7 +138,7 @@ void VirtualMemoryTracker::apply_summary_diff(VMATree::SummaryDiff diff) {
         }
       }
     }
-  }
+  });
 }
 
 void VirtualMemoryTracker::Instance::add_committed_region(address addr, size_t size,
@@ -193,14 +193,14 @@ bool VirtualMemoryTracker::Instance::print_containing_region(const void* p, outp
 }
 
 bool VirtualMemoryTracker::print_containing_region(const void* p, outputStream* st) {
-  ReservedMemoryRegion rmr = tree()->find_reserved_region((address)p);
-  if (!rmr.contain_address((address)p)) {
+  VirtualMemoryRegion rgn = tree()->find_reserved_region((address)p);
+  if (!rgn.is_valid() || !rgn.contain_address((address)p)) {
     return false;
   }
   st->print_cr(PTR_FORMAT " in mmap'd memory region [" PTR_FORMAT " - " PTR_FORMAT "], tag %s",
-               p2i(p), p2i(rmr.base()), p2i(rmr.end()), NMTUtil::tag_to_enum_name(rmr.mem_tag()));
+               p2i(p), p2i(rgn.base()), p2i(rgn.end()), NMTUtil::tag_to_enum_name(rgn.mem_tag()));
   if (MemTracker::tracking_level() == NMT_detail) {
-    rmr.call_stack()->print_on(st);
+    rgn.reserved_call_stack()->print_on(st);
   }
   st->cr();
   return true;
@@ -213,7 +213,7 @@ bool VirtualMemoryTracker::Instance::walk_virtual_memory(VirtualMemoryWalker* wa
 
 bool VirtualMemoryTracker::walk_virtual_memory(VirtualMemoryWalker* walker) {
   bool ret = true;
-  tree()->visit_reserved_regions([&](ReservedMemoryRegion& rgn) {
+  tree()->visit_reserved_regions([&](VirtualMemoryRegion& rgn) {
     if (!walker->do_allocation_site(&rgn)) {
       ret = false;
       return false;
@@ -223,29 +223,29 @@ bool VirtualMemoryTracker::walk_virtual_memory(VirtualMemoryWalker* walker) {
   return ret;
 }
 
-size_t VirtualMemoryTracker::committed_size(const ReservedMemoryRegion* rmr) {
+size_t VirtualMemoryTracker::committed_size(const VirtualMemoryRegion* rgn) {
   size_t result = 0;
-  tree()->visit_committed_regions(*rmr, [&](CommittedMemoryRegion& crgn) {
+  tree()->visit_committed_regions(*rgn, [&](VirtualMemoryRegion& crgn) {
     result += crgn.size();
     return true;
   });
   return result;
 }
 
-size_t VirtualMemoryTracker::Instance::committed_size(const ReservedMemoryRegion* rmr) {
+size_t VirtualMemoryTracker::Instance::committed_size(const VirtualMemoryRegion* rgn) {
   assert(_tracker != nullptr, "Sanity check");
-  return _tracker->committed_size(rmr);
+  return _tracker->committed_size(rgn);
 }
 
-address VirtualMemoryTracker::Instance::thread_stack_uncommitted_bottom(const ReservedMemoryRegion* rmr) {
+address VirtualMemoryTracker::Instance::thread_stack_uncommitted_bottom(const VirtualMemoryRegion* rgn) {
   assert(_tracker != nullptr, "Sanity check");
-  return _tracker->thread_stack_uncommitted_bottom(rmr);
+  return _tracker->thread_stack_uncommitted_bottom(rgn);
 }
 
-address VirtualMemoryTracker::thread_stack_uncommitted_bottom(const ReservedMemoryRegion* rmr) {
-  address bottom = rmr->base();
-  address top = rmr->end();
-    tree()->visit_committed_regions(*rmr, [&](CommittedMemoryRegion& crgn) {
+address VirtualMemoryTracker::thread_stack_uncommitted_bottom(const VirtualMemoryRegion* rgn) {
+  address bottom = rgn->base();
+  address top = rgn->end();
+    tree()->visit_committed_regions(*rgn, [&](VirtualMemoryRegion& crgn) {
     address committed_top = crgn.base() + crgn.size();
     if (committed_top < top) {
       // committed stack guard pages, skip them
@@ -299,7 +299,7 @@ class SnapshotThreadStackWalker : public VirtualMemoryWalker {
 public:
   SnapshotThreadStackWalker() {}
 
-  bool do_allocation_site(const ReservedMemoryRegion* rgn) {
+  bool do_allocation_site(const VirtualMemoryRegion* rgn) {
     if (MemTracker::NmtVirtualMemoryLocker::is_safe_to_use()) {
       assert_lock_strong(NmtVirtualMemory_lock);
     }
@@ -340,19 +340,19 @@ void VirtualMemoryTracker::Instance::snapshot_thread_stacks() {
   walk_virtual_memory(&walker);
 }
 
-ReservedMemoryRegion RegionsTree::find_reserved_region(address addr) {
-    ReservedMemoryRegion rmr;
-    auto contain_region = [&](ReservedMemoryRegion& region_in_tree) {
+VirtualMemoryRegion RegionsTree::find_reserved_region(address addr) {
+    VirtualMemoryRegion rgn;
+    auto contain_region = [&](VirtualMemoryRegion& region_in_tree) {
       if (region_in_tree.contain_address(addr)) {
-        rmr = region_in_tree;
+        rgn = region_in_tree;
         return false;
       }
       return true;
     };
     visit_reserved_regions(contain_region);
-    return rmr;
+    return rgn;
 }
 
-bool CommittedMemoryRegion::equals(const ReservedMemoryRegion& rmr) const {
-  return size() == rmr.size() && call_stack()->equals(*(rmr.call_stack()));
+bool VirtualMemoryRegion::equals_including_stacks(const VirtualMemoryRegion& rgn) const {
+  return size() == rgn.size() && committed_call_stack()->equals(*(rgn.reserved_call_stack()));
 }
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
index c51b53194e6..f6cb18983a3 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -194,15 +194,38 @@ class VirtualMemorySummary : AllStatic {
  */
 class VirtualMemoryRegion {
  private:
-  address      _base_address;
-  size_t       _size;
+  address         _base_address;
+  size_t          _size;
+  MemTag          _mem_tag;
+  NativeCallStack _reserved_stack;
+  NativeCallStack _committed_stack;
 
  public:
+  VirtualMemoryRegion() :
+    _base_address(nullptr), _size(0), _mem_tag(mtNone),
+    _reserved_stack(NativeCallStack::empty_stack()) ,
+    _committed_stack(NativeCallStack::empty_stack()) {}
+
   VirtualMemoryRegion(address addr, size_t size) :
-    _base_address(addr), _size(size) {
+    _base_address(addr), _size(size), _mem_tag(mtNone),
+    _reserved_stack(NativeCallStack::empty_stack()) ,
+    _committed_stack(NativeCallStack::empty_stack()) {
      assert(addr != nullptr, "Invalid address");
      assert(size > 0, "Invalid size");
-   }
+  }
+
+  VirtualMemoryRegion(address addr, size_t size, const NativeCallStack& reserved_stack, const NativeCallStack& committed_stack, MemTag mem_tag = mtNone) :
+    _base_address(addr), _size(size), _mem_tag(mem_tag),
+    _reserved_stack(reserved_stack),
+    _committed_stack(committed_stack) {
+     assert(addr != nullptr, "Invalid address");
+     assert(size > 0, "Invalid size");
+  }
+
+  VirtualMemoryRegion(address addr, size_t size, const NativeCallStack& stack, MemTag mem_tag = mtNone)
+    : _base_address(addr), _size(size), _mem_tag(mem_tag),
+     _reserved_stack(stack),
+    _committed_stack(NativeCallStack::empty_stack()) {}
 
   inline address base() const { return _base_address;   }
   inline address end()  const { return base() + size(); }
@@ -211,48 +234,18 @@ class VirtualMemoryRegion {
   inline bool is_empty() const { return size() == 0; }
 
   inline bool contain_address(address addr) const {
+    assert(is_valid(), "sanity");
     return (addr >= base() && addr < end());
   }
 
-
-  inline bool contain_region(address addr, size_t size) const {
-    return contain_address(addr) && contain_address(addr + size - 1);
-  }
-
-  inline bool same_region(address addr, size_t sz) const {
-    return (addr == base() && sz == size());
-  }
-
-
+ private:
   inline bool overlap_region(address addr, size_t sz) const {
     assert(sz > 0, "Invalid size");
     assert(size() > 0, "Invalid size");
+    assert(is_valid(), "sanity");
     return MAX2(addr, base()) < MIN2(addr + sz, end());
   }
 
-  inline bool adjacent_to(address addr, size_t sz) const {
-    return (addr == end() || (addr + sz) == base());
-  }
-
-  void exclude_region(address addr, size_t sz) {
-    assert(contain_region(addr, sz), "Not containment");
-    assert(addr == base() || addr + sz == end(), "Can not exclude from middle");
-    size_t new_size = size() - sz;
-
-    if (addr == base()) {
-      set_base(addr + sz);
-    }
-    set_size(new_size);
-  }
-
-  void expand_region(address addr, size_t sz) {
-    assert(adjacent_to(addr, sz), "Not adjacent regions");
-    if (base() == addr + sz) {
-      set_base(addr);
-    }
-    set_size(size() + sz);
-  }
-
   // Returns 0 if regions overlap; 1 if this region follows rgn;
   //  -1 if this region precedes rgn.
   inline int compare(const VirtualMemoryRegion& rgn) const {
@@ -266,86 +259,27 @@ class VirtualMemoryRegion {
     }
   }
 
+ public:
   // Returns true if regions overlap, false otherwise.
   inline bool equals(const VirtualMemoryRegion& rgn) const {
     return compare(rgn) == 0;
   }
 
- protected:
-  void set_base(address base) {
-    assert(base != nullptr, "Sanity check");
-    _base_address = base;
-  }
+  bool equals_including_stacks(const VirtualMemoryRegion& other) const;
+  inline const NativeCallStack* committed_call_stack() const         { return &_committed_stack; }
 
-  void set_size(size_t  size) {
-    assert(size > 0, "Sanity check");
-    _size = size;
-  }
-};
+  bool is_valid() const { return base() != nullptr && size() != 0;}
 
+  inline const NativeCallStack* reserved_call_stack() const          { return &_reserved_stack;  }
 
-class CommittedMemoryRegion : public VirtualMemoryRegion {
- private:
-  NativeCallStack  _stack;
-
- public:
-  CommittedMemoryRegion()
-    : VirtualMemoryRegion((address)1, 1), _stack(NativeCallStack::empty_stack()) { }
-
-  CommittedMemoryRegion(address addr, size_t size, const NativeCallStack& stack)
-    : VirtualMemoryRegion(addr, size), _stack(stack) { }
-
-  inline void set_call_stack(const NativeCallStack& stack) { _stack = stack; }
-  inline const NativeCallStack* call_stack() const         { return &_stack; }
-  bool equals(const ReservedMemoryRegion& other) const;
-};
-
-class ReservedMemoryRegion : public VirtualMemoryRegion {
- private:
-  NativeCallStack  _stack;
-  MemTag         _mem_tag;
-
- public:
-  bool is_valid() { return base() != (address)1 && size() != 1;}
-
-  ReservedMemoryRegion()
-    : VirtualMemoryRegion((address)1, 1), _stack(NativeCallStack::empty_stack()), _mem_tag(mtNone) { }
-
-  ReservedMemoryRegion(address base, size_t size, const NativeCallStack& stack,
-    MemTag mem_tag = mtNone)
-    : VirtualMemoryRegion(base, size), _stack(stack), _mem_tag(mem_tag) { }
-
-
-  ReservedMemoryRegion(address base, size_t size)
-    : VirtualMemoryRegion(base, size), _stack(NativeCallStack::empty_stack()), _mem_tag(mtNone) { }
-
-  // Copy constructor
-  ReservedMemoryRegion(const ReservedMemoryRegion& rr)
-    : VirtualMemoryRegion(rr.base(), rr.size()) {
-    *this = rr;
-  }
-
-  inline void  set_call_stack(const NativeCallStack& stack) { _stack = stack; }
-  inline const NativeCallStack* call_stack() const          { return &_stack;  }
-
-  inline MemTag mem_tag() const            { return _mem_tag;  }
-
-  ReservedMemoryRegion& operator= (const ReservedMemoryRegion& other) {
-    set_base(other.base());
-    set_size(other.size());
-
-    _stack = *other.call_stack();
-    _mem_tag = other.mem_tag();
-
-    return *this;
-  }
+  inline MemTag mem_tag() const { return _mem_tag;  }
 
   const char* tag_name() const { return NMTUtil::tag_to_name(_mem_tag); }
 };
 
 class VirtualMemoryWalker : public StackObj {
  public:
-  virtual bool do_allocation_site(const ReservedMemoryRegion* rgn) { return false; }
+   virtual bool do_allocation_site(const VirtualMemoryRegion* rgn) { return false; }
 };
 
 
@@ -375,9 +309,9 @@ class VirtualMemoryTracker {
 
   // Snapshot current thread stacks
   void snapshot_thread_stacks();
-  void apply_summary_diff(VMATree::SummaryDiff diff);
-  size_t committed_size(const ReservedMemoryRegion* rmr);
-  address thread_stack_uncommitted_bottom(const ReservedMemoryRegion* rmr);
+  void apply_summary_diff(VMATree::SummaryDiff& diff);
+  size_t committed_size(const VirtualMemoryRegion* rmr);
+  address thread_stack_uncommitted_bottom(const VirtualMemoryRegion* rmr);
 
   RegionsTree* tree() { return &_tree; }
 
@@ -400,10 +334,10 @@ class VirtualMemoryTracker {
     static bool walk_virtual_memory(VirtualMemoryWalker* walker);
     static bool print_containing_region(const void* p, outputStream* st);
     static void snapshot_thread_stacks();
-    static void apply_summary_diff(VMATree::SummaryDiff diff);
-    static size_t committed_size(const ReservedMemoryRegion* rmr);
+    static void apply_summary_diff(VMATree::SummaryDiff& diff);
+    static size_t committed_size(const VirtualMemoryRegion* rmr);
     // uncommitted thread stack bottom, above guard pages if there is any.
-    static address thread_stack_uncommitted_bottom(const ReservedMemoryRegion* rmr);
+    static address thread_stack_uncommitted_bottom(const VirtualMemoryRegion* rgn);
 
     static RegionsTree* tree() { return _tracker->tree(); }
   };
diff --git a/src/hotspot/share/nmt/vmatree.cpp b/src/hotspot/share/nmt/vmatree.cpp
index df7b1ac867e..6c5ab691f6d 100644
--- a/src/hotspot/share/nmt/vmatree.cpp
+++ b/src/hotspot/share/nmt/vmatree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,6 +27,7 @@
 #include "nmt/vmatree.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 
 // Semantics
@@ -192,8 +193,8 @@ void VMATree::compute_summary_diff(const SingleDiff::delta region_size,
                                         {0,a,  0,a, -a,a },    // op == Commit
                                         {0,0,  0,0, -a,0 }     // op == Uncommit
                                      };
-  SingleDiff& from_rescom = diff.tag[NMTUtil::tag_to_index(current_tag)];
-  SingleDiff&   to_rescom = diff.tag[NMTUtil::tag_to_index(operation_tag)];
+  SingleDiff& from_rescom = diff.tag(current_tag);
+  SingleDiff&   to_rescom = diff.tag(operation_tag);
   int st = state_to_index(ex);
   from_rescom.reserve += reserve[op][st * 2    ];
     to_rescom.reserve += reserve[op][st * 2 + 1];
@@ -657,7 +658,7 @@ void VMATree::print_on(outputStream* out) {
 }
 #endif
 
-VMATree::SummaryDiff VMATree::set_tag(const position start, const size size, const MemTag tag) {
+void VMATree::set_tag(const position start, const size size, const MemTag tag, SummaryDiff& diff) {
   auto pos = [](TNode* n) { return n->key(); };
   position from = start;
   position end  = from+size;
@@ -689,14 +690,13 @@ VMATree::SummaryDiff VMATree::set_tag(const position start, const size size, con
   };
 
   bool success = find_next_range();
-  if (!success) return SummaryDiff();
+  if (!success) return;
   assert(range.start != nullptr && range.end != nullptr, "must be");
 
   end = MIN2(from + remsize, pos(range.end));
   IntervalState& out = out_state(range.start);
   StateType type = out.type();
 
-  SummaryDiff diff;
   // Ignore any released ranges, these must be mtNone and have no stack
   if (type != StateType::Released) {
     RegionData new_data = RegionData(out.reserved_stack(), tag);
@@ -713,7 +713,7 @@ VMATree::SummaryDiff VMATree::set_tag(const position start, const size size, con
     // Using register_mapping may invalidate the already found range, so we must
     // use find_next_range repeatedly
     bool success = find_next_range();
-    if (!success) return diff;
+    if (!success) return;
     assert(range.start != nullptr && range.end != nullptr, "must be");
 
     end = MIN2(from + remsize, pos(range.end));
@@ -729,25 +729,131 @@ VMATree::SummaryDiff VMATree::set_tag(const position start, const size size, con
     remsize = remsize - (end - from);
     from = end;
   }
-
-  return diff;
 }
 
 #ifdef ASSERT
 void VMATree::SummaryDiff::print_on(outputStream* out) {
-  for (int i = 0; i < mt_number_of_tags; i++) {
-    if (tag[i].reserve == 0 && tag[i].commit == 0) {
-      continue;
-    }
-    out->print_cr("Tag %s R: " INT64_FORMAT " C: " INT64_FORMAT, NMTUtil::tag_to_enum_name((MemTag)i), tag[i].reserve,
-                  tag[i].commit);
-  }
+  visit([&](MemTag mt, const SingleDiff& sd) {
+    out->print_cr("Tag %s R: " INT64_FORMAT " C: " INT64_FORMAT,
+                  NMTUtil::tag_to_enum_name(mt), sd.reserve, sd.commit);
+  });
 }
 #endif
 
 void VMATree::clear() {
   _tree.remove_all();
-};
+}
+
 bool VMATree::is_empty() {
   return _tree.size() == 0;
-};
+}
+
+VMATree::SummaryDiff::KVEntry&
+VMATree::SummaryDiff::hash_insert_or_get(const KVEntry& kv, bool* found) {
+  DEBUG_ONLY(int counter = 0);
+  // If the length is large (picked as 32)
+  // then we apply a load-factor check and rehash if it exceeds it.
+  // When the length is small we're OK with a full linear search for an empty space
+  // to avoid a grow and rehash.
+  constexpr float load_factor = 0.5;
+  constexpr int load_factor_cutoff_length = 32;
+  if (_length > load_factor_cutoff_length &&
+      (float)_occupied / _length > load_factor) {
+    grow_and_rehash();
+  }
+  while (true) {
+    DEBUG_ONLY(counter++);
+    assert(counter < 8, "Infinite loop?");
+    int i = hash_to_bucket(kv.mem_tag);
+    while (i < _length && _members[i].marker == Marker::Occupied) {
+      if (_members[i].mem_tag == kv.mem_tag) {
+        // Found previous
+        *found = true;
+        return _members[i];
+      }
+      i++;
+    }
+    *found = false;
+    // We didn't find it but ran out of space, grow and rehash
+    // Then look at again
+    if (i >= _length) {
+      assert(_length < std::numeric_limits<std::underlying_type_t<MemTag>>::max(), "");
+      grow_and_rehash();
+      continue;
+    }
+    // We didn't find it, but _members[i] is empty, allocate a new one
+    assert(_members[i].marker == Marker::Empty, "must be");
+    _members[i] = kv;
+    _occupied++;
+    return _members[i];
+  }
+}
+
+void VMATree::SummaryDiff::grow_and_rehash() {
+  assert(is_power_of_2(_length), "must be");
+  constexpr int length_limit = std::numeric_limits<std::underlying_type_t<MemTag>>::max() + 1;
+  assert(is_power_of_2(length_limit), "must be");
+  if (_length == length_limit) {
+    // If we are at MemTag's maximum size, then just continue with the current size.
+    return;
+  }
+
+  int new_len = _length * 2;
+  // Save old entries (can't use ResourceMark, too early)
+  GrowableArrayCHeap<KVEntry, mtNMT> tmp(_length);
+  for (int i = 0; i < _length; i++) {
+    tmp.push(_members[i]);
+  }
+
+  // Clear previous -- if applicable
+  if (_members != _small) {
+    FREE_C_HEAP_ARRAY(KVEntry, _members);
+  }
+
+  _members = NEW_C_HEAP_ARRAY(KVEntry, new_len, mtNMT);
+  // Clear new array
+  memset(_members, 0, sizeof(KVEntry) * new_len);
+  _length = new_len;
+  _occupied = 0;
+
+  for (int i = 0; i < tmp.length(); i++) {
+    bool _found = false;
+    hash_insert_or_get(tmp.at(i), &_found);
+  }
+}
+
+VMATree::SingleDiff& VMATree::SummaryDiff::tag(MemTag tag) {
+  KVEntry kv{Marker::Occupied, tag, {}};
+  bool _found = false;
+  KVEntry& inserted = hash_insert_or_get(kv, &_found);
+  return inserted.single_diff;
+}
+
+VMATree::SingleDiff& VMATree::SummaryDiff::tag(int mt_index) {
+  return tag((MemTag)mt_index);
+}
+
+void VMATree::SummaryDiff::add(const SummaryDiff& other) {
+  other.visit([&](MemTag mt, const SingleDiff& single_diff) {
+    bool found = false;
+    KVEntry other_kv = {Marker::Occupied, mt, single_diff};
+    KVEntry& this_kv = hash_insert_or_get(other_kv, &found);
+    if (found) {
+      this_kv.single_diff.reserve += other_kv.single_diff.reserve;
+      this_kv.single_diff.commit += other_kv.single_diff.commit;
+    }
+  });
+}
+
+void VMATree::SummaryDiff::clear() {
+  if (_members != _small) {
+    FREE_C_HEAP_ARRAY(KVEntry, _members);
+  }
+  memset(_small, 0, sizeof(_small));
+}
+
+uint32_t VMATree::SummaryDiff::hash_to_bucket(MemTag mt) {
+  uint32_t hash = primitive_hash<uint32_t>((uint32_t)mt);
+  assert(is_power_of_2(_length), "must be");
+  return hash & ((uint32_t)_length - 1);
+}
diff --git a/src/hotspot/share/nmt/vmatree.hpp b/src/hotspot/share/nmt/vmatree.hpp
index f7ca8f4c7e0..ae732a4b0d3 100644
--- a/src/hotspot/share/nmt/vmatree.hpp
+++ b/src/hotspot/share/nmt/vmatree.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
 #ifndef SHARE_NMT_VMATREE_HPP
 #define SHARE_NMT_VMATREE_HPP
 
+#include "memory/resourceArea.hpp"
 #include "nmt/memTag.hpp"
 #include "nmt/nmtNativeCallStackStorage.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -238,24 +239,57 @@ public:
     delta commit;
   };
 
-  struct SummaryDiff {
-    SingleDiff tag[mt_number_of_tags];
-    SummaryDiff() {
+  class SummaryDiff {
+    enum class Marker { Empty, Occupied };
+    static_assert((int)Marker::Empty == 0, "We memset the array to 0, so this must be true");
+
+    struct KVEntry {
+      Marker marker;
+      MemTag mem_tag;
+      SingleDiff single_diff;
+    };
+
+    static constexpr const int _init_size = 4;
+    KVEntry _small[_init_size];
+    KVEntry* _members;
+    int _length;
+    int _occupied;
+    KVEntry& hash_insert_or_get(const KVEntry& kv, bool* found);
+    void grow_and_rehash();
+    uint32_t hash_to_bucket(MemTag mt);
+
+  public:
+    SummaryDiff() : _small(), _members(_small), _length(_init_size), _occupied(0) {
       clear();
     }
-    void clear() {
-      for (int i = 0; i < mt_number_of_tags; i++) {
-        tag[i] = SingleDiff{0, 0};
+    ~SummaryDiff() {
+      if (_members != _small) {
+        FREE_C_HEAP_ARRAY(KVEntry, _members);
       }
     }
 
-    void add(SummaryDiff& other) {
-      for (int i = 0; i < mt_number_of_tags; i++) {
-        tag[i].reserve += other.tag[i].reserve;
-        tag[i].commit += other.tag[i].commit;
+    SingleDiff& tag(MemTag tag);
+    SingleDiff& tag(int mt_index);
+
+    template<typename F>
+    void visit(F f) const {
+      int hits = 0;
+      for (int i = 0; i < _length; i++) {
+        const KVEntry& kv = _members[i];
+        if (kv.marker == Marker::Occupied) {
+          f(kv.mem_tag, kv.single_diff);
+          hits++;
+        }
+        if (hits == _occupied) {
+          // Early exit
+          return;
+        }
       }
     }
 
+    void add(const SummaryDiff& other);
+    void clear();
+
 #ifdef ASSERT
     void print_on(outputStream* out);
 #endif
@@ -313,7 +347,7 @@ public:
   // partially contained within that interval and set their tag to the one provided.
   // This may cause merging and splitting of ranges.
   // Released regions are ignored.
-  SummaryDiff set_tag(position from, size size, MemTag tag);
+  void set_tag(position from, size size, MemTag tag, SummaryDiff& diff);
 
   void uncommit_mapping(position from, size size, const RegionData& metadata, SummaryDiff& diff) {
     register_mapping(from, from + size, StateType::Reserved, metadata, diff, true);
diff --git a/src/hotspot/share/oops/array.hpp b/src/hotspot/share/oops/array.hpp
index 90dcc9dfeaf..82067e007ea 100644
--- a/src/hotspot/share/oops/array.hpp
+++ b/src/hotspot/share/oops/array.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,8 @@
 
 // Array for metadata allocation
 
+class MetaspaceClosure;
+
 template <typename T>
 class Array: public MetaspaceObj {
   friend class ArchiveBuilder;
@@ -157,6 +159,9 @@ protected:
     st->print("Array<T>(" PTR_FORMAT ")", p2i(this));
   }
 
+  // This function does nothing. The iteration of the elements are done inside metaspaceClosure.hpp
+  void metaspace_pointers_do(MetaspaceClosure* it) {}
+
 #ifndef PRODUCT
   void print(outputStream* st) {
      for (int i = 0; i< _length; i++) {
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 640b2f2460f..456333efad0 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -310,8 +310,9 @@ void ConstantPool::iterate_archivable_resolved_references(Function function) {
     if (method_entries != nullptr) {
       for (int i = 0; i < method_entries->length(); i++) {
         ResolvedMethodEntry* rme = method_entries->adr_at(i);
+        const char* rejection_reason = nullptr;
         if (rme->is_resolved(Bytecodes::_invokehandle) && rme->has_appendix() &&
-            cache()->can_archive_resolved_method(this, rme)) {
+                               cache()->can_archive_resolved_method(this, rme, rejection_reason)) {
           int rr_index = rme->resolved_references_index();
           assert(resolved_reference_at(rr_index) != nullptr, "must exist");
           function(rr_index);
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index 75cdcb5310a..34d7aa10299 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -450,12 +450,15 @@ void ConstantPoolCache::remove_resolved_field_entries_if_non_deterministic() {
       Symbol* klass_name = cp->klass_name_at(klass_cp_index);
       Symbol* name = cp->uncached_name_ref_at(cp_index);
       Symbol* signature = cp->uncached_signature_ref_at(cp_index);
-      log.print("%s field  CP entry [%3d]: %s => %s.%s:%s%s",
-                (archived ? "archived" : "reverted"),
-                cp_index,
-                cp->pool_holder()->name()->as_C_string(),
-                klass_name->as_C_string(), name->as_C_string(), signature->as_C_string(),
-                rfi->is_resolved(Bytecodes::_getstatic) || rfi->is_resolved(Bytecodes::_putstatic) ? " *** static" : "");
+      if (resolved) {
+        log.print("%s field  CP entry [%3d]: %s => %s.%s:%s%s%s",
+                  (archived ? "archived" : "reverted"),
+                  cp_index,
+                  cp->pool_holder()->name()->as_C_string(),
+                  klass_name->as_C_string(), name->as_C_string(), signature->as_C_string(),
+                  rfi->is_resolved(Bytecodes::_getstatic) || rfi->is_resolved(Bytecodes::_putstatic) ? " *** static" : "",
+                  (archived ? "" : " (resolution is not deterministic)"));
+      }
     }
     ArchiveBuilder::alloc_stats()->record_field_cp_entry(archived, resolved && !archived);
   }
@@ -474,32 +477,40 @@ void ConstantPoolCache::remove_resolved_method_entries_if_non_deterministic() {
                     rme->is_resolved(Bytecodes::_invokehandle)    ||
                     (rme->is_resolved(Bytecodes::_invokestatic) && VM_Version::supports_fast_class_init_checks());
 
+    const char* rejection_reason = nullptr;
     if (resolved && !CDSConfig::is_dumping_preimage_static_archive()
-        && can_archive_resolved_method(src_cp, rme)) {
+        && can_archive_resolved_method(src_cp, rme, rejection_reason)) {
       rme->mark_and_relocate(src_cp);
       archived = true;
     } else {
       rme->remove_unshareable_info();
     }
-    LogStreamHandle(Trace, aot, resolve) log;
-    if (log.is_enabled()) {
+    LogTarget(Trace, aot, resolve) lt;
+    if (lt.is_enabled()) {
       ResourceMark rm;
       int klass_cp_index = cp->uncached_klass_ref_index_at(cp_index);
       Symbol* klass_name = cp->klass_name_at(klass_cp_index);
       Symbol* name = cp->uncached_name_ref_at(cp_index);
       Symbol* signature = cp->uncached_signature_ref_at(cp_index);
-      log.print("%s%s method CP entry [%3d]: %s %s.%s:%s",
+      LogStream ls(lt);
+      if (resolved) {
+        ls.print("%s%s method CP entry [%3d]: %s %s.%s:%s",
                 (archived ? "archived" : "reverted"),
                 (rme->is_resolved(Bytecodes::_invokeinterface) ? " interface" : ""),
                 cp_index,
                 cp->pool_holder()->name()->as_C_string(),
                 klass_name->as_C_string(), name->as_C_string(), signature->as_C_string());
+        if (rejection_reason != nullptr) {
+          ls.print(" %s", rejection_reason);
+        }
+      }
       if (archived) {
         Klass* resolved_klass = cp->resolved_klass_at(klass_cp_index);
-        log.print(" => %s%s",
+        ls.print(" => %s%s",
                   resolved_klass->name()->as_C_string(),
                   (rme->is_resolved(Bytecodes::_invokestatic) ? " *** static" : ""));
       }
+      ls.cr();
     }
     ArchiveBuilder::alloc_stats()->record_method_cp_entry(archived, resolved && !archived);
   }
@@ -528,42 +539,50 @@ void ConstantPoolCache::remove_resolved_indy_entries_if_non_deterministic() {
       Symbol* bsm_name = cp->uncached_name_ref_at(bsm_ref);
       Symbol* bsm_signature = cp->uncached_signature_ref_at(bsm_ref);
       Symbol* bsm_klass = cp->klass_name_at(cp->uncached_klass_ref_index_at(bsm_ref));
-      log.print("%s indy   CP entry [%3d]: %s (%d)",
-                (archived ? "archived" : "reverted"),
-                cp_index, cp->pool_holder()->name()->as_C_string(), i);
-      log.print(" %s %s.%s:%s", (archived ? "=>" : "  "), bsm_klass->as_C_string(),
-                bsm_name->as_C_string(), bsm_signature->as_C_string());
+      if (resolved) {
+        log.print("%s indy   CP entry [%3d]: %s (%d)",
+                  (archived ? "archived" : "reverted"),
+                  cp_index, cp->pool_holder()->name()->as_C_string(), i);
+        log.print(" %s %s.%s:%s%s", (archived ? "=>" : "  "), bsm_klass->as_C_string(),
+                  bsm_name->as_C_string(), bsm_signature->as_C_string(),
+                  (archived ? "" : " (resolution is not deterministic)"));
+      }
     }
     ArchiveBuilder::alloc_stats()->record_indy_cp_entry(archived, resolved && !archived);
   }
 }
 
-bool ConstantPoolCache::can_archive_resolved_method(ConstantPool* src_cp, ResolvedMethodEntry* method_entry) {
-  LogStreamHandle(Trace, aot, resolve) log;
+bool ConstantPoolCache::can_archive_resolved_method(ConstantPool* src_cp, ResolvedMethodEntry* method_entry, const char*& rejection_reason) {
   InstanceKlass* pool_holder = constant_pool()->pool_holder();
   if (pool_holder->defined_by_other_loaders()) {
     // Archiving resolved cp entries for classes from non-builtin loaders
     // is not yet supported.
+    rejection_reason = "(pool holder comes from a non-builtin loader)";
     return false;
   }
 
   if (CDSConfig::is_dumping_dynamic_archive()) {
     // InstanceKlass::methods() has been resorted. We need to
     // update the vtable_index in method_entry (not implemented)
+    rejection_reason = "(InstanceKlass::methods() has been resorted)";
     return false;
   }
 
   if (!method_entry->is_resolved(Bytecodes::_invokevirtual)) {
     if (method_entry->method() == nullptr) {
+      rejection_reason = "(method entry is not resolved)";
       return false;
     }
     if (method_entry->method()->is_continuation_native_intrinsic()) {
+      rejection_reason = "(corresponding stub is generated on demand during method resolution)";
       return false; // FIXME: corresponding stub is generated on demand during method resolution (see LinkResolver::resolve_static_call).
     }
     if (method_entry->is_resolved(Bytecodes::_invokehandle) && !CDSConfig::is_dumping_method_handles()) {
+      rejection_reason = "(not dumping method handles)";
       return false;
     }
     if (method_entry->method()->is_method_handle_intrinsic() && !CDSConfig::is_dumping_method_handles()) {
+      rejection_reason = "(not dumping intrinsic method handles)";
       return false;
     }
   }
@@ -572,6 +591,7 @@ bool ConstantPoolCache::can_archive_resolved_method(ConstantPool* src_cp, Resolv
   assert(src_cp->tag_at(cp_index).is_method() || src_cp->tag_at(cp_index).is_interface_method(), "sanity");
 
   if (!AOTConstantPoolResolver::is_resolution_deterministic(src_cp, cp_index)) {
+      rejection_reason = "(resolution is not deterministic)";
     return false;
   }
   return true;
diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp
index e9e4f9a40e5..f698f50d3a8 100644
--- a/src/hotspot/share/oops/cpCache.hpp
+++ b/src/hotspot/share/oops/cpCache.hpp
@@ -196,7 +196,7 @@ class ConstantPoolCache: public MetaspaceObj {
 #endif
 
  public:
-  static int size() { return align_metadata_size(sizeof(ConstantPoolCache) / wordSize); }
+  static int size() { return align_metadata_size(sizeof_auto(ConstantPoolCache) / wordSize); }
 
  private:
   // Helpers
@@ -226,7 +226,7 @@ class ConstantPoolCache: public MetaspaceObj {
   void remove_resolved_field_entries_if_non_deterministic();
   void remove_resolved_indy_entries_if_non_deterministic();
   void remove_resolved_method_entries_if_non_deterministic();
-  bool can_archive_resolved_method(ConstantPool* src_cp, ResolvedMethodEntry* method_entry);
+  bool can_archive_resolved_method(ConstantPool* src_cp, ResolvedMethodEntry* method_entry, const char*& rejection_reason);
 #endif
 
   // RedefineClasses support
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 56a80daed60..1963327fc78 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2693,6 +2693,10 @@ void InstanceKlass::metaspace_pointers_do(MetaspaceClosure* it) {
   it->push(&_nest_members);
   it->push(&_permitted_subclasses);
   it->push(&_record_components);
+
+  if (CDSConfig::is_dumping_full_module_graph() && !defined_by_other_loaders()) {
+    it->push(&_package_entry);
+  }
 }
 
 #if INCLUDE_CDS
@@ -2791,24 +2795,9 @@ void InstanceKlass::remove_java_mirror() {
 
 void InstanceKlass::init_shared_package_entry() {
   assert(CDSConfig::is_dumping_archive(), "must be");
-#if !INCLUDE_CDS_JAVA_HEAP
-  _package_entry = nullptr;
-#else
-  if (CDSConfig::is_dumping_full_module_graph()) {
-    if (defined_by_other_loaders()) {
-      _package_entry = nullptr;
-    } else {
-      _package_entry = PackageEntry::get_archived_entry(_package_entry);
-    }
-  } else if (CDSConfig::is_dumping_dynamic_archive() &&
-             CDSConfig::is_using_full_module_graph() &&
-             AOTMetaspace::in_aot_cache(_package_entry)) {
-    // _package_entry is an archived package in the base archive. Leave it as is.
-  } else {
+  if (!CDSConfig::is_dumping_full_module_graph() || defined_by_other_loaders()) {
     _package_entry = nullptr;
   }
-  ArchivePtrMarker::mark_pointer((address**)&_package_entry);
-#endif
 }
 
 void InstanceKlass::compute_has_loops_flag_for_methods() {
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 23a59d26093..e370a3b7a7c 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -353,6 +353,9 @@ class InstanceKlass: public Klass {
   int static_oop_field_count() const       { return (int)_static_oop_field_count; }
   void set_static_oop_field_count(u2 size) { _static_oop_field_count = size; }
 
+  bool trust_final_fields()                { return _misc_flags.trust_final_fields(); }
+  void set_trust_final_fields(bool value)  { _misc_flags.set_trust_final_fields(value); }
+
   // Java itable
   int  itable_length() const               { return _itable_len; }
   void set_itable_length(int len)          { _itable_len = len; }
diff --git a/src/hotspot/share/oops/instanceKlassFlags.hpp b/src/hotspot/share/oops/instanceKlassFlags.hpp
index 5eebaab27d1..d576805b30f 100644
--- a/src/hotspot/share/oops/instanceKlassFlags.hpp
+++ b/src/hotspot/share/oops/instanceKlassFlags.hpp
@@ -54,6 +54,7 @@ class InstanceKlassFlags {
     flag(has_localvariable_table            , 1 << 11) /* has localvariable information */ \
     flag(has_miranda_methods                , 1 << 12) /* True if this class has miranda methods in it's vtable */ \
     flag(has_final_method                   , 1 << 13) /* True if klass has final method */ \
+    flag(trust_final_fields                 , 1 << 14) /* All instance final fields in this class should be trusted */ \
     /* end of list */
 
 #define IK_FLAGS_ENUM_NAME(name, value)    _misc_##name = value,
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index b6974762209..d59db9744cb 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -510,18 +510,20 @@ protected:
     return (BasicType) btvalue;
   }
 
-  // Want a pattern to quickly diff against layout header in register
-  // find something less clever!
+  // Return a value containing a single set bit that is in the bitset difference between the
+  // layout helpers for array-of-boolean and array-of-byte.
   static int layout_helper_boolean_diffbit() {
-    jint zlh = array_layout_helper(T_BOOLEAN);
-    jint blh = array_layout_helper(T_BYTE);
-    assert(zlh != blh, "array layout helpers must differ");
-    int diffbit = 1;
-    while ((diffbit & (zlh ^ blh)) == 0 && (diffbit & zlh) == 0) {
-      diffbit <<= 1;
-      assert(diffbit != 0, "make sure T_BOOLEAN has a different bit than T_BYTE");
-    }
-    return diffbit;
+    uint zlh = static_cast<uint>(array_layout_helper(T_BOOLEAN));
+    uint blh = static_cast<uint>(array_layout_helper(T_BYTE));
+    // get all the bits that are set in zlh and clear in blh
+    uint candidates = (zlh & ~blh);
+    assert(candidates != 0, "must be"); // must be some if there is a solution.
+    // Use well known bit hack to isolate the low bit of candidates.
+    uint result = candidates & (-candidates);
+    assert(is_power_of_2(result), "must be power of 2");
+    assert((result & zlh) != 0, "must be set in alh of T_BOOLEAN");
+    assert((result & blh) == 0, "must be clear in alh of T_BYTE");
+    return static_cast<int>(result);
   }
 
   static int layout_helper_log2_element_size(jint lh) {
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 1a2e5f0bee4..949441585d8 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1898,15 +1898,15 @@ void Method::print_name(outputStream* st) const {
 #endif // !PRODUCT || INCLUDE_JVMTI
 
 
-void Method::print_codes_on(outputStream* st, int flags) const {
-  print_codes_on(0, code_size(), st, flags);
+void Method::print_codes_on(outputStream* st, int flags, bool buffered) const {
+  print_codes_on(0, code_size(), st, flags, buffered);
 }
 
-void Method::print_codes_on(int from, int to, outputStream* st, int flags) const {
+void Method::print_codes_on(int from, int to, outputStream* st, int flags, bool buffered) const {
   Thread *thread = Thread::current();
   ResourceMark rm(thread);
   methodHandle mh (thread, (Method*)this);
-  BytecodeTracer::print_method_codes(mh, from, to, st, flags);
+  BytecodeTracer::print_method_codes(mh, from, to, st, flags, buffered);
 }
 
 CompressedLineNumberReadStream::CompressedLineNumberReadStream(u_char* buffer) : CompressedReadStream(buffer) {
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index 4592cb8a8c0..e7479671dcf 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -465,9 +465,9 @@ public:
   bool    contains(address bcp) const { return constMethod()->contains(bcp); }
 
   // prints byte codes
-  void print_codes(int flags = 0) const { print_codes_on(tty, flags); }
-  void print_codes_on(outputStream* st, int flags = 0) const;
-  void print_codes_on(int from, int to, outputStream* st, int flags = 0) const;
+  void print_codes(int flags = 0, bool buffered = true) const { print_codes_on(tty, flags, buffered); }
+  void print_codes_on(outputStream* st, int flags = 0, bool buffered = true) const;
+  void print_codes_on(int from, int to, outputStream* st, int flags = 0, bool buffered = true) const;
 
   // method parameters
   bool has_method_parameters() const
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index 12db56351ed..cdf28b883e6 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -135,17 +135,16 @@ class ObjArrayKlass : public ArrayKlass {
   template <typename T, typename OopClosureType>
   inline void oop_oop_iterate_bounded(oop obj, OopClosureType* closure, MemRegion mr);
 
-  // Iterate over oop elements within [start, end), and metadata.
-  template <typename T, class OopClosureType>
-  inline void oop_oop_iterate_range(objArrayOop a, OopClosureType* closure, int start, int end);
-
- public:
-  // Iterate over all oop elements.
+  // Iterate over all oop elements, and no metadata.
   template <typename T, class OopClosureType>
   inline void oop_oop_iterate_elements(objArrayOop a, OopClosureType* closure);
 
+  // Iterate over oop elements within index range [start, end), and no metadata.
+  template <typename T, class OopClosureType>
+  inline void oop_oop_iterate_elements_range(objArrayOop a, OopClosureType* closure, int start, int end);
+
  private:
-  // Iterate over all oop elements with indices within mr.
+  // Iterate over all oop elements bounded by addresses [low, high), and no metadata.
   template <typename T, class OopClosureType>
   inline void oop_oop_iterate_elements_bounded(objArrayOop a, OopClosureType* closure, void* low, void* high);
 
diff --git a/src/hotspot/share/oops/objArrayKlass.inline.hpp b/src/hotspot/share/oops/objArrayKlass.inline.hpp
index a92c42d21a8..ee559548529 100644
--- a/src/hotspot/share/oops/objArrayKlass.inline.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.inline.hpp
@@ -38,10 +38,18 @@
 
 template <typename T, class OopClosureType>
 void ObjArrayKlass::oop_oop_iterate_elements(objArrayOop a, OopClosureType* closure) {
-  T* p         = (T*)a->base();
-  T* const end = p + a->length();
+  oop_oop_iterate_elements_range<T>(a, closure, 0, a->length());
+}
 
-  for (;p < end; p++) {
+// Like oop_oop_iterate but only iterates over a specified range and only used
+// for objArrayOops.
+template <typename T, class OopClosureType>
+void ObjArrayKlass::oop_oop_iterate_elements_range(objArrayOop a, OopClosureType* closure, int start, int end) {
+  T* base        = (T*)a->base();
+  T* p           = base + start;
+  T* const end_p = base + end;
+
+  for (;p < end_p; ++p) {
     Devirtualizer::do_oop(closure, p);
   }
 }
@@ -98,24 +106,4 @@ void ObjArrayKlass::oop_oop_iterate_bounded(oop obj, OopClosureType* closure, Me
   oop_oop_iterate_elements_bounded<T>(a, closure, mr.start(), mr.end());
 }
 
-// Like oop_oop_iterate but only iterates over a specified range and only used
-// for objArrayOops.
-template <typename T, class OopClosureType>
-void ObjArrayKlass::oop_oop_iterate_range(objArrayOop a, OopClosureType* closure, int start, int end) {
-  T* low = (T*)a->base() + start;
-  T* high = (T*)a->base() + end;
-
-  oop_oop_iterate_elements_bounded<T>(a, closure, low, high);
-}
-
-// Placed here to resolve include cycle between objArrayKlass.inline.hpp and objArrayOop.inline.hpp
-template <typename OopClosureType>
-void objArrayOopDesc::oop_iterate_range(OopClosureType* blk, int start, int end) {
-  if (UseCompressedOops) {
-    ((ObjArrayKlass*)klass())->oop_oop_iterate_range<narrowOop>(this, blk, start, end);
-  } else {
-    ((ObjArrayKlass*)klass())->oop_oop_iterate_range<oop>(this, blk, start, end);
-  }
-}
-
 #endif // SHARE_OOPS_OBJARRAYKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/objArrayOop.hpp b/src/hotspot/share/oops/objArrayOop.hpp
index 82bb41b5fd1..0af059efccf 100644
--- a/src/hotspot/share/oops/objArrayOop.hpp
+++ b/src/hotspot/share/oops/objArrayOop.hpp
@@ -83,9 +83,9 @@ class objArrayOopDesc : public arrayOopDesc {
   Klass* element_klass();
 
 public:
-  // special iterators for index ranges, returns size of object
+  // Special iterators for an element index range.
   template <typename OopClosureType>
-  void oop_iterate_range(OopClosureType* blk, int start, int end);
+  void oop_iterate_elements_range(OopClosureType* blk, int start, int end);
 };
 
 // See similar requirement for oopDesc.
diff --git a/src/hotspot/share/oops/objArrayOop.inline.hpp b/src/hotspot/share/oops/objArrayOop.inline.hpp
index 21f95b756de..63295a1459d 100644
--- a/src/hotspot/share/oops/objArrayOop.inline.hpp
+++ b/src/hotspot/share/oops/objArrayOop.inline.hpp
@@ -29,6 +29,7 @@
 
 #include "oops/access.hpp"
 #include "oops/arrayOop.hpp"
+#include "oops/objArrayKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/globals.hpp"
 
@@ -51,4 +52,13 @@ inline void objArrayOopDesc::obj_at_put(int index, oop value) {
   HeapAccess<IS_ARRAY>::oop_store_at(as_oop(), offset, value);
 }
 
+template <typename OopClosureType>
+void objArrayOopDesc::oop_iterate_elements_range(OopClosureType* blk, int start, int end) {
+  if (UseCompressedOops) {
+    ((ObjArrayKlass*)klass())->oop_oop_iterate_elements_range<narrowOop>(this, blk, start, end);
+  } else {
+    ((ObjArrayKlass*)klass())->oop_oop_iterate_elements_range<oop>(this, blk, start, end);
+  }
+}
+
 #endif // SHARE_OOPS_OBJARRAYOOP_INLINE_HPP
diff --git a/src/hotspot/share/oops/resolvedFieldEntry.cpp b/src/hotspot/share/oops/resolvedFieldEntry.cpp
index 83f1a6919a6..49e9115ca9a 100644
--- a/src/hotspot/share/oops/resolvedFieldEntry.cpp
+++ b/src/hotspot/share/oops/resolvedFieldEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,12 @@
 
 #include "cds/archiveBuilder.hpp"
 #include "cppstdlib/type_traits.hpp"
+#include "oops/instanceKlass.hpp"
+#include "oops/instanceOop.hpp"
 #include "oops/resolvedFieldEntry.hpp"
+#include "runtime/fieldDescriptor.inline.hpp"
+#include "utilities/checkedCast.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 static_assert(std::is_trivially_copyable_v<ResolvedFieldEntry>);
 
@@ -34,6 +39,19 @@ class ResolvedFieldEntryWithExtra : public ResolvedFieldEntry {
 };
 static_assert(sizeof(ResolvedFieldEntryWithExtra) > sizeof(ResolvedFieldEntry));
 
+void ResolvedFieldEntry::fill_in(const fieldDescriptor& info, u1 tos_state, u1 get_code, u1 put_code) {
+  set_flags(info.access_flags().is_final(), info.access_flags().is_volatile());
+  _field_holder = info.field_holder();
+  _field_offset = info.offset();
+  _field_index = checked_cast<u2>(info.index());
+  _tos_state = tos_state;
+
+  // These must be set after the other fields
+  set_bytecode(&_get_code, get_code);
+  set_bytecode(&_put_code, put_code);
+  assert_is_valid();
+}
+
 void ResolvedFieldEntry::print_on(outputStream* st) const {
   st->print_cr("Field Entry:");
 
@@ -52,6 +70,20 @@ void ResolvedFieldEntry::print_on(outputStream* st) const {
   st->print_cr(" - Put Bytecode: %s", Bytecodes::name((Bytecodes::Code)put_code()));
 }
 
+#ifdef ASSERT
+void ResolvedFieldEntry::assert_is_valid() const {
+  assert(field_holder()->is_instance_klass(), "should be instanceKlass");
+  assert(field_offset() >= instanceOopDesc::base_offset_in_bytes(),
+         "field offset out of range %d >= %d", field_offset(), instanceOopDesc::base_offset_in_bytes());
+  assert(as_BasicType((TosState)tos_state()) != T_ILLEGAL, "tos_state is ILLEGAL");
+  assert(_flags < (1 << (max_flag_shift + 1)), "flags are too large %d", _flags);
+  assert((get_code() == 0 || get_code() == Bytecodes::_getstatic || get_code() == Bytecodes::_getfield),
+         "invalid get bytecode %d", get_code());
+  assert((put_code() == 0 || put_code() == Bytecodes::_putstatic || put_code() == Bytecodes::_putfield),
+          "invalid put bytecode %d", put_code());
+}
+#endif
+
 #if INCLUDE_CDS
 void ResolvedFieldEntry::remove_unshareable_info() {
   *this = ResolvedFieldEntry(_cpool_index);
diff --git a/src/hotspot/share/oops/resolvedFieldEntry.hpp b/src/hotspot/share/oops/resolvedFieldEntry.hpp
index 77ad4815730..bdd9999dd63 100644
--- a/src/hotspot/share/oops/resolvedFieldEntry.hpp
+++ b/src/hotspot/share/oops/resolvedFieldEntry.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 #define SHARE_OOPS_RESOLVEDFIELDENTRY_HPP
 
 #include "interpreter/bytecodes.hpp"
-#include "oops/instanceKlass.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/sizes.hpp"
@@ -46,7 +45,8 @@
 // The explicit paddings are necessary for generating deterministic CDS archives. They prevent
 // the C++ compiler from potentially inserting random values in unused gaps.
 
-//class InstanceKlass;
+class InstanceKlass;
+
 class ResolvedFieldEntry {
   friend class VMStructs;
 
@@ -84,6 +84,7 @@ public:
   enum {
       is_volatile_shift     = 0,
       is_final_shift        = 1, // unused
+      max_flag_shift        = is_final_shift
   };
 
   // Getters
@@ -113,6 +114,7 @@ public:
   // Printing
   void print_on(outputStream* st) const;
 
+ private:
   void set_flags(bool is_final_flag, bool is_volatile_flag) {
     int new_flags = (is_final_flag << is_final_shift) | static_cast<int>(is_volatile_flag);
     _flags = checked_cast<u1>(new_flags);
@@ -129,17 +131,12 @@ public:
     AtomicAccess::release_store(code, new_code);
   }
 
-  // Populate the strucutre with resolution information
-  void fill_in(InstanceKlass* klass, int offset, u2 index, u1 tos_state, u1 b1, u1 b2) {
-    _field_holder = klass;
-    _field_offset = offset;
-    _field_index = index;
-    _tos_state = tos_state;
+   // Debug help
+  void assert_is_valid() const NOT_DEBUG_RETURN;
 
-    // These must be set after the other fields
-    set_bytecode(&_get_code, b1);
-    set_bytecode(&_put_code, b2);
-  }
+ public:
+  // Populate the strucutre with resolution information
+  void fill_in(const fieldDescriptor& info, u1 tos_state, u1 get_code, u1 put_code);
 
   // CDS
 #if INCLUDE_CDS
@@ -155,7 +152,6 @@ public:
   static ByteSize put_code_offset()     { return byte_offset_of(ResolvedFieldEntry, _put_code);     }
   static ByteSize type_offset()         { return byte_offset_of(ResolvedFieldEntry, _tos_state);    }
   static ByteSize flags_offset()        { return byte_offset_of(ResolvedFieldEntry, _flags);        }
-
 };
 
 #endif //SHARE_OOPS_RESOLVEDFIELDENTRY_HPP
diff --git a/src/hotspot/share/oops/trainingData.cpp b/src/hotspot/share/oops/trainingData.cpp
index 1a16fd70e44..f52c22ad38a 100644
--- a/src/hotspot/share/oops/trainingData.cpp
+++ b/src/hotspot/share/oops/trainingData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/cdsConfig.hpp"
 #include "ci/ciEnv.hpp"
 #include "ci/ciMetadata.hpp"
@@ -512,8 +513,7 @@ void TrainingData::dump_training_data() {
 #endif // ASSERT
       td = ArchiveBuilder::current()->get_buffered_addr(td);
       uint hash = TrainingData::Key::cds_hash(td->key());
-      u4 delta = ArchiveBuilder::current()->buffer_to_offset_u4((address)td);
-      writer.add(hash, delta);
+      writer.add(hash, AOTCompressedPointers::encode_not_null(td));
     }
     writer.dump(&_archived_training_data_dictionary_for_dumping, "training data dictionary");
   }
diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp
index 40cd6337c17..e04da430ef0 100644
--- a/src/hotspot/share/opto/addnode.cpp
+++ b/src/hotspot/share/opto/addnode.cpp
@@ -1195,7 +1195,7 @@ const Type* XorLNode::Value(PhaseGVN* phase) const {
   return AddNode::Value(phase);
 }
 
-Node* MaxNode::build_min_max_int(Node* a, Node* b, bool is_max) {
+Node* MinMaxNode::build_min_max_int(Node* a, Node* b, bool is_max) {
   if (is_max) {
     return new MaxINode(a, b);
   } else {
@@ -1203,7 +1203,7 @@ Node* MaxNode::build_min_max_int(Node* a, Node* b, bool is_max) {
   }
 }
 
-Node* MaxNode::build_min_max_long(PhaseGVN* phase, Node* a, Node* b, bool is_max) {
+Node* MinMaxNode::build_min_max_long(PhaseGVN* phase, Node* a, Node* b, bool is_max) {
   if (is_max) {
     return new MaxLNode(phase->C, a, b);
   } else {
@@ -1211,7 +1211,7 @@ Node* MaxNode::build_min_max_long(PhaseGVN* phase, Node* a, Node* b, bool is_max
   }
 }
 
-Node* MaxNode::build_min_max(Node* a, Node* b, bool is_max, bool is_unsigned, const Type* t, PhaseGVN& gvn) {
+Node* MinMaxNode::build_min_max(Node* a, Node* b, bool is_max, bool is_unsigned, const Type* t, PhaseGVN& gvn) {
   bool is_int = gvn.type(a)->isa_int();
   assert(is_int || gvn.type(a)->isa_long(), "int or long inputs");
   assert(is_int == (gvn.type(b)->isa_int() != nullptr), "inconsistent inputs");
@@ -1243,7 +1243,7 @@ Node* MaxNode::build_min_max(Node* a, Node* b, bool is_max, bool is_unsigned, co
   return res;
 }
 
-Node* MaxNode::build_min_max_diff_with_zero(Node* a, Node* b, bool is_max, const Type* t, PhaseGVN& gvn) {
+Node* MinMaxNode::build_min_max_diff_with_zero(Node* a, Node* b, bool is_max, const Type* t, PhaseGVN& gvn) {
   bool is_int = gvn.type(a)->isa_int();
   assert(is_int || gvn.type(a)->isa_long(), "int or long inputs");
   assert(is_int == (gvn.type(b)->isa_int() != nullptr), "inconsistent inputs");
@@ -1290,7 +1290,7 @@ static bool can_overflow(const TypeLong* t, jlong c) {
 // Let <x, x_off> = x_operands and <y, y_off> = y_operands.
 // If x == y and neither add(x, x_off) nor add(y, y_off) overflow, return
 // add(x, op(x_off, y_off)). Otherwise, return nullptr.
-Node* MaxNode::extract_add(PhaseGVN* phase, ConstAddOperands x_operands, ConstAddOperands y_operands) {
+Node* MinMaxNode::extract_add(PhaseGVN* phase, ConstAddOperands x_operands, ConstAddOperands y_operands) {
   Node* x = x_operands.first;
   Node* y = y_operands.first;
   int opcode = Opcode();
@@ -1327,7 +1327,7 @@ static ConstAddOperands as_add_with_constant(Node* n) {
   return ConstAddOperands(x, c_type->is_int()->get_con());
 }
 
-Node* MaxNode::IdealI(PhaseGVN* phase, bool can_reshape) {
+Node* MinMaxNode::IdealI(PhaseGVN* phase, bool can_reshape) {
   Node* n = AddNode::Ideal(phase, can_reshape);
   if (n != nullptr) {
     return n;
@@ -1401,7 +1401,7 @@ Node* MaxINode::Identity(PhaseGVN* phase) {
     return in(2);
   }
 
-  return MaxNode::Identity(phase);
+  return MinMaxNode::Identity(phase);
 }
 
 //=============================================================================
@@ -1434,7 +1434,7 @@ Node* MinINode::Identity(PhaseGVN* phase) {
     return in(1);
   }
 
-  return MaxNode::Identity(phase);
+  return MinMaxNode::Identity(phase);
 }
 
 //------------------------------add_ring---------------------------------------
@@ -1564,7 +1564,7 @@ Node* MaxLNode::Identity(PhaseGVN* phase) {
     return in(2);
   }
 
-  return MaxNode::Identity(phase);
+  return MinMaxNode::Identity(phase);
 }
 
 Node* MaxLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
@@ -1596,7 +1596,7 @@ Node* MinLNode::Identity(PhaseGVN* phase) {
     return in(1);
   }
 
-  return MaxNode::Identity(phase);
+  return MinMaxNode::Identity(phase);
 }
 
 Node* MinLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
@@ -1610,7 +1610,7 @@ Node* MinLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   return nullptr;
 }
 
-int MaxNode::opposite_opcode() const {
+int MinMaxNode::opposite_opcode() const {
   if (Opcode() == max_opcode()) {
     return min_opcode();
   } else {
@@ -1621,7 +1621,7 @@ int MaxNode::opposite_opcode() const {
 
 // Given a redundant structure such as Max/Min(A, Max/Min(B, C)) where A == B or A == C, return the useful part of the structure.
 // 'operation' is the node expected to be the inner 'Max/Min(B, C)', and 'operand' is the node expected to be the 'A' operand of the outer node.
-Node* MaxNode::find_identity_operation(Node* operation, Node* operand) {
+Node* MinMaxNode::find_identity_operation(Node* operation, Node* operand) {
   if (operation->Opcode() == Opcode() || operation->Opcode() == opposite_opcode()) {
     Node* n1 = operation->in(1);
     Node* n2 = operation->in(2);
@@ -1645,17 +1645,17 @@ Node* MaxNode::find_identity_operation(Node* operation, Node* operand) {
   return nullptr;
 }
 
-Node* MaxNode::Identity(PhaseGVN* phase) {
+Node* MinMaxNode::Identity(PhaseGVN* phase) {
   if (in(1) == in(2)) {
       return in(1);
   }
 
-  Node* identity_1 = MaxNode::find_identity_operation(in(2), in(1));
+  Node* identity_1 = MinMaxNode::find_identity_operation(in(2), in(1));
   if (identity_1 != nullptr) {
     return identity_1;
   }
 
-  Node* identity_2 = MaxNode::find_identity_operation(in(1), in(2));
+  Node* identity_2 = MinMaxNode::find_identity_operation(in(1), in(2));
   if (identity_2 != nullptr) {
     return identity_2;
   }
diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp
index 1bbdae92e48..6128de00efb 100644
--- a/src/hotspot/share/opto/addnode.hpp
+++ b/src/hotspot/share/opto/addnode.hpp
@@ -226,8 +226,11 @@ public:
          Base,                  // Base oop, for GC purposes
          Address,               // Actually address, derived from base
          Offset } ;             // Offset added to address
-  AddPNode( Node *base, Node *ptr, Node *off ) : Node(nullptr,base,ptr,off) {
+  AddPNode(Node *base, Node *ptr, Node *off) : Node(nullptr,base,ptr,off) {
     init_class_id(Class_AddP);
+    assert((ptr->bottom_type() == Type::TOP) ||
+      ((base == Compile::current()->top()) == (ptr->bottom_type()->make_ptr()->isa_oopptr() == nullptr)),
+      "base input only needed for heap addresses");
   }
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
@@ -324,14 +327,16 @@ public:
 //------------------------------MaxNode----------------------------------------
 // Max (or min) of 2 values.  Included with the ADD nodes because it inherits
 // all the behavior of addition on a ring.
-class MaxNode : public AddNode {
+class MinMaxNode : public AddNode {
 private:
   static Node* build_min_max(Node* a, Node* b, bool is_max, bool is_unsigned, const Type* t, PhaseGVN& gvn);
   static Node* build_min_max_diff_with_zero(Node* a, Node* b, bool is_max, const Type* t, PhaseGVN& gvn);
   Node* extract_add(PhaseGVN* phase, ConstAddOperands x_operands, ConstAddOperands y_operands);
 
 public:
-  MaxNode( Node *in1, Node *in2 ) : AddNode(in1,in2) {}
+  MinMaxNode(Node* in1, Node* in2) : AddNode(in1, in2) {
+    init_class_id(Class_MinMax);
+  }
   virtual int Opcode() const = 0;
   virtual int max_opcode() const = 0;
   virtual int min_opcode() const = 0;
@@ -373,9 +378,9 @@ public:
 //------------------------------MaxINode---------------------------------------
 // Maximum of 2 integers.  Included with the ADD nodes because it inherits
 // all the behavior of addition on a ring.
-class MaxINode : public MaxNode {
+class MaxINode : public MinMaxNode {
 public:
-  MaxINode( Node *in1, Node *in2 ) : MaxNode(in1,in2) {}
+  MaxINode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::make(min_jint); }
@@ -390,9 +395,9 @@ public:
 //------------------------------MinINode---------------------------------------
 // MINimum of 2 integers.  Included with the ADD nodes because it inherits
 // all the behavior of addition on a ring.
-class MinINode : public MaxNode {
+class MinINode : public MinMaxNode {
 public:
-  MinINode( Node *in1, Node *in2 ) : MaxNode(in1,in2) {}
+  MinINode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type *add_ring( const Type *, const Type * ) const;
   virtual const Type *add_id() const { return TypeInt::make(max_jint); }
@@ -406,9 +411,9 @@ public:
 
 //------------------------------MaxLNode---------------------------------------
 // MAXimum of 2 longs.
-class MaxLNode : public MaxNode {
+class MaxLNode : public MinMaxNode {
 public:
-  MaxLNode(Compile* C, Node* in1, Node* in2) : MaxNode(in1, in2) {
+  MaxLNode(Compile* C, Node* in1, Node* in2) : MinMaxNode(in1, in2) {
     init_flags(Flag_is_macro);
     C->add_macro_node(this);
   }
@@ -425,9 +430,9 @@ public:
 
 //------------------------------MinLNode---------------------------------------
 // MINimum of 2 longs.
-class MinLNode : public MaxNode {
+class MinLNode : public MinMaxNode {
 public:
-  MinLNode(Compile* C, Node* in1, Node* in2) : MaxNode(in1, in2) {
+  MinLNode(Compile* C, Node* in1, Node* in2) : MinMaxNode(in1, in2) {
     init_flags(Flag_is_macro);
     C->add_macro_node(this);
   }
@@ -444,9 +449,9 @@ public:
 
 //------------------------------MaxFNode---------------------------------------
 // Maximum of 2 floats.
-class MaxFNode : public MaxNode {
+class MaxFNode : public MinMaxNode {
 public:
-  MaxFNode(Node *in1, Node *in2) : MaxNode(in1, in2) {}
+  MaxFNode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type *add_ring(const Type*, const Type*) const;
   virtual const Type *add_id() const { return TypeF::NEG_INF; }
@@ -458,9 +463,9 @@ public:
 
 //------------------------------MinFNode---------------------------------------
 // Minimum of 2 floats.
-class MinFNode : public MaxNode {
+class MinFNode : public MinMaxNode {
 public:
-  MinFNode(Node *in1, Node *in2) : MaxNode(in1, in2) {}
+  MinFNode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type *add_ring(const Type*, const Type*) const;
   virtual const Type *add_id() const { return TypeF::POS_INF; }
@@ -472,9 +477,9 @@ public:
 
 //------------------------------MaxHFNode--------------------------------------
 // Maximum of 2 half floats.
-class MaxHFNode : public MaxNode {
+class MaxHFNode : public MinMaxNode {
 public:
-  MaxHFNode(Node* in1, Node* in2) : MaxNode(in1, in2) {}
+  MaxHFNode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type* add_ring(const Type*, const Type*) const;
   virtual const Type* add_id() const { return TypeH::NEG_INF; }
@@ -486,9 +491,9 @@ public:
 
 //------------------------------MinHFNode---------------------------------------
 // Minimum of 2 half floats.
-class MinHFNode : public MaxNode {
+class MinHFNode : public MinMaxNode {
 public:
-  MinHFNode(Node* in1, Node* in2) : MaxNode(in1, in2) {}
+  MinHFNode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type* add_ring(const Type*, const Type*) const;
   virtual const Type* add_id() const { return TypeH::POS_INF; }
@@ -500,9 +505,9 @@ public:
 
 //------------------------------MaxDNode---------------------------------------
 // Maximum of 2 doubles.
-class MaxDNode : public MaxNode {
+class MaxDNode : public MinMaxNode {
 public:
-  MaxDNode(Node *in1, Node *in2) : MaxNode(in1, in2) {}
+  MaxDNode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type *add_ring(const Type*, const Type*) const;
   virtual const Type *add_id() const { return TypeD::NEG_INF; }
@@ -514,9 +519,9 @@ public:
 
 //------------------------------MinDNode---------------------------------------
 // Minimum of 2 doubles.
-class MinDNode : public MaxNode {
+class MinDNode : public MinMaxNode {
 public:
-  MinDNode(Node *in1, Node *in2) : MaxNode(in1, in2) {}
+  MinDNode(Node* in1, Node* in2) : MinMaxNode(in1, in2) {}
   virtual int Opcode() const;
   virtual const Type *add_ring(const Type*, const Type*) const;
   virtual const Type *add_id() const { return TypeD::POS_INF; }
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index f470049bf7e..1662f808286 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -694,7 +694,9 @@
           "Print progress during Iterative Global Value Numbering")         \
                                                                             \
   develop(uint, VerifyIterativeGVN, 0,                                      \
-          "Verify Iterative Global Value Numbering =EDCBA, with:"           \
+          "Verify Iterative Global Value Numbering =FEDCBA, with:"          \
+          "  F: verify Node::Ideal does not return nullptr if the node"     \
+                "hash has changed"                                          \
           "  E: verify node specific invariants"                            \
           "  D: verify Node::Identity did not miss opportunities"           \
           "  C: verify Node::Ideal did not miss opportunities"              \
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index fac8596173f..9b3d7b38d15 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -1737,11 +1737,11 @@ void AllocateNode::compute_MemBar_redundancy(ciMethod* initializer)
     _is_allocation_MemBar_redundant = true;
   }
 }
-Node *AllocateNode::make_ideal_mark(PhaseGVN *phase, Node* obj, Node* control, Node* mem) {
+Node *AllocateNode::make_ideal_mark(PhaseGVN* phase, Node* control, Node* mem) {
   Node* mark_node = nullptr;
   if (UseCompactObjectHeaders) {
     Node* klass_node = in(AllocateNode::KlassNode);
-    Node* proto_adr = phase->transform(new AddPNode(klass_node, klass_node, phase->MakeConX(in_bytes(Klass::prototype_header_offset()))));
+    Node* proto_adr = phase->transform(new AddPNode(phase->C->top(), klass_node, phase->MakeConX(in_bytes(Klass::prototype_header_offset()))));
     mark_node = LoadNode::make(*phase, control, mem, proto_adr, TypeRawPtr::BOTTOM, TypeX_X, TypeX_X->basic_type(), MemNode::unordered);
   } else {
     // For now only enable fast locking for non-array types
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 0bb064efc43..95d1fc27d45 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,6 @@ public:
   virtual int Opcode() const;
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
-  virtual bool depends_only_on_test() const { return false; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual uint ideal_reg() const { return NotAMachineReg; }
@@ -141,7 +140,6 @@ class RethrowNode : public Node {
   virtual int Opcode() const;
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
-  virtual bool depends_only_on_test() const { return false; }
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual uint match_edge(uint idx) const;
@@ -1101,7 +1099,7 @@ public:
   void compute_MemBar_redundancy(ciMethod* initializer);
   bool is_allocation_MemBar_redundant() { return _is_allocation_MemBar_redundant; }
 
-  Node* make_ideal_mark(PhaseGVN *phase, Node* obj, Node* control, Node* mem);
+  Node* make_ideal_mark(PhaseGVN* phase, Node* control, Node* mem);
 
   NOT_PRODUCT(virtual void dump_spec(outputStream* st) const;)
 };
diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index 998b6a79903..4e3750b5ee5 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,6 +207,11 @@ bool ConstraintCastNode::higher_equal_types(PhaseGVN* phase, const Node* other)
   return true;
 }
 
+Node* ConstraintCastNode::pin_node_under_control_impl() const {
+  assert(_dependency.is_floating(), "already pinned");
+  return make_cast_for_type(in(0), in(1), bottom_type(), _dependency.with_pinned_dependency(), _extra_types);
+}
+
 #ifndef PRODUCT
 void ConstraintCastNode::dump_spec(outputStream *st) const {
   TypeNode::dump_spec(st);
@@ -277,12 +282,9 @@ void CastIINode::dump_spec(outputStream* st) const {
 }
 #endif
 
-CastIINode* CastIINode::pin_array_access_node() const {
+CastIINode* CastIINode::pin_node_under_control_impl() const {
   assert(_dependency.is_floating(), "already pinned");
-  if (has_range_check()) {
-    return new CastIINode(in(0), in(1), bottom_type(), _dependency.with_pinned_dependency(), has_range_check());
-  }
-  return nullptr;
+  return new CastIINode(in(0), in(1), bottom_type(), _dependency.with_pinned_dependency(), _range_check_dependency, _extra_types);
 }
 
 void CastIINode::remove_range_check_cast(Compile* C) {
@@ -392,8 +394,8 @@ Node* CastLLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     if (t != Type::TOP && t_in != Type::TOP) {
       const TypeLong* tl = t->is_long();
       const TypeLong* t_in_l = t_in->is_long();
-      assert(tl->_lo >= t_in_l->_lo && tl->_hi <= t_in_l->_hi, "CastLL type should be narrower than or equal to the type of its input");
-      assert((tl != t_in_l) == (tl->_lo > t_in_l->_lo || tl->_hi < t_in_l->_hi), "if type differs then this nodes's type must be narrower");
+      assert(t_in_l->contains(tl), "CastLL type should be narrower than or equal to the type of its input");
+      assert((tl != t_in_l) == t_in_l->strictly_contains(tl), "if type differs then this nodes's type must be narrower");
       if (tl != t_in_l) {
         const TypeInt* ti = TypeInt::make(checked_cast<jint>(tl->_lo), checked_cast<jint>(tl->_hi), tl->_widen);
         Node* castii = phase->transform(new CastIINode(in(0), in1->in(1), ti));
diff --git a/src/hotspot/share/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp
index f22df546f41..38545fd6f41 100644
--- a/src/hotspot/share/opto/castnode.hpp
+++ b/src/hotspot/share/opto/castnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,8 +166,6 @@ protected:
   virtual int Opcode() const;
   virtual uint ideal_reg() const = 0;
   bool carry_dependency() const { return !_dependency.cmp(DependencyType::FloatingNarrowing); }
-  // A cast node depends_only_on_test if and only if it is floating
-  virtual bool depends_only_on_test() const { return _dependency.is_floating(); }
   const DependencyType& dependency() const { return _dependency; }
   TypeNode* dominating_cast(PhaseGVN* gvn, PhaseTransform* pt) const;
   static Node* make_cast_for_basic_type(Node* c, Node* n, const Type* t, const DependencyType& dependency, BasicType bt);
@@ -191,6 +189,12 @@ protected:
   const Type* extra_type_at(int i) const {
     return _extra_types->field_at(i);
   }
+
+protected:
+  virtual bool depends_only_on_test_impl() const { return _dependency.is_floating(); }
+
+private:
+  virtual Node* pin_node_under_control_impl() const;
 };
 
 //------------------------------CastIINode-------------------------------------
@@ -222,13 +226,15 @@ class CastIINode: public ConstraintCastNode {
 #endif
   }
 
-  CastIINode* pin_array_access_node() const;
   CastIINode* make_with(Node* parent, const TypeInteger* type, const DependencyType& dependency) const;
   void remove_range_check_cast(Compile* C);
 
 #ifndef PRODUCT
   virtual void dump_spec(outputStream* st) const;
 #endif
+
+private:
+  virtual CastIINode* pin_node_under_control_impl() const;
 };
 
 class CastLLNode: public ConstraintCastNode {
@@ -320,8 +326,10 @@ class CheckCastPPNode: public ConstraintCastNode {
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual int   Opcode() const;
   virtual uint  ideal_reg() const { return Op_RegP; }
-  bool depends_only_on_test() const { return !type()->isa_rawptr() && ConstraintCastNode::depends_only_on_test(); }
- };
+
+private:
+  virtual bool depends_only_on_test_impl() const { return !type()->isa_rawptr() && ConstraintCastNode::depends_only_on_test_impl(); }
+};
 
 
 //------------------------------CastX2PNode-------------------------------------
@@ -349,8 +357,10 @@ class CastP2XNode : public Node {
   virtual Node* Identity(PhaseGVN* phase);
   virtual uint ideal_reg() const { return Op_RegX; }
   virtual const Type *bottom_type() const { return TypeX_X; }
+
+private:
   // Return false to keep node from moving away from an associated card mark.
-  virtual bool depends_only_on_test() const { return false; }
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 
diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp
index efa0b55e2c2..c65bc391792 100644
--- a/src/hotspot/share/opto/cfgnode.cpp
+++ b/src/hotspot/share/opto/cfgnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2243,7 +2243,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     PhaseIterGVN* igvn = phase->is_IterGVN();
     if (wait_for_cast_input_igvn(igvn)) {
       igvn->_worklist.push(this);
-      return nullptr;
+      return progress;
     }
     uncasted = true;
     uin = unique_input(phase, true);
@@ -2320,6 +2320,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       PhaseIterGVN* igvn = phase->is_IterGVN();
       for (uint i = 1; i < req(); i++) {
         set_req_X(i, cast, igvn);
+        progress = this;
       }
       uin = cast;
     }
@@ -2338,7 +2339,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 #endif
     // Identity may not return the expected uin, if it has to wait for the region, in irreducible case
     assert(ident == uin || ident->is_top() || must_wait_for_region_in_irreducible_loop(phase), "Identity must clean this up");
-    return nullptr;
+    return progress;
   }
 
   Node* opt = nullptr;
@@ -2529,7 +2530,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       // Phi references itself through all other inputs then splitting the
       // Phi through memory merges would create dead loop at later stage.
       if (ii == top) {
-        return nullptr; // Delay optimization until graph is cleaned.
+        return progress; // Delay optimization until graph is cleaned.
       }
       if (ii->is_MergeMem()) {
         MergeMemNode* n = ii->as_MergeMem();
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index ca549af1554..6af2972e688 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,6 @@ public:
   virtual bool pinned() const { return (const Node*)in(0) == this; }
   virtual bool is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; } // CFG nodes do not hash
-  virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return Type::CONTROL; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
@@ -287,7 +286,6 @@ public:
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
   virtual const Node *is_block_proj() const { return this; }
-  virtual bool depends_only_on_test() const { return false; }
   virtual const Type *bottom_type() const { return Type::CONTROL; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
@@ -462,7 +460,7 @@ public:
   Node* fold_compares(PhaseIterGVN* phase);
   static Node* up_one_dom(Node* curr, bool linear_only = false);
   bool is_zero_trip_guard() const;
-  Node* dominated_by(Node* prev_dom, PhaseIterGVN* igvn, bool pin_array_access_nodes);
+  Node* dominated_by(Node* prev_dom, PhaseIterGVN* igvn, bool prev_dom_not_imply_this);
   ProjNode* uncommon_trap_proj(CallStaticJavaNode*& call, Deoptimization::DeoptReason reason = Deoptimization::Reason_none) const;
 
   // Takes the type of val and filters it through the test represented
@@ -565,7 +563,7 @@ public:
     return in(0)->as_If()->proj_out(1 - _con)->as_IfProj();
   }
 
-  void pin_array_access_nodes(PhaseIterGVN* igvn);
+  void pin_dependent_nodes(PhaseIterGVN* igvn);
 
 protected:
   // Type of If input when this branch is always taken
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index d56abaa17dd..abd93fdd876 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -281,7 +281,7 @@ macro(OpaqueLoopInit)
 macro(OpaqueLoopStride)
 macro(OpaqueMultiversioning)
 macro(OpaqueZeroTripGuard)
-macro(OpaqueNotNull)
+macro(OpaqueConstantBool)
 macro(OpaqueInitializedAssertionPredicate)
 macro(OpaqueTemplateAssertionPredicate)
 macro(ProfileBoolean)
@@ -462,6 +462,8 @@ macro(UMinV)
 macro(UMaxV)
 macro(MinReductionV)
 macro(MaxReductionV)
+macro(UMinReductionV)
+macro(UMaxReductionV)
 macro(CompressV)
 macro(CompressM)
 macro(ExpandV)
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index cea2b09e142..f1ea8231df9 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -581,7 +581,7 @@ void Compile::print_phase(const char* phase_name) {
   tty->print_cr("%u.\t%s", ++_phase_counter, phase_name);
 }
 
-void Compile::print_ideal_ir(const char* phase_name) {
+void Compile::print_ideal_ir(const char* compile_phase_name) const {
   // keep the following output all in one block
   // This output goes directly to the tty, not the compiler log.
   // To enable tools to match it up with the compilation activity,
@@ -593,7 +593,7 @@ void Compile::print_ideal_ir(const char* phase_name) {
   stringStream ss;
 
   if (_output == nullptr) {
-    ss.print_cr("AFTER: %s", phase_name);
+    ss.print_cr("AFTER: %s", compile_phase_name);
     // Print out all nodes in ascending order of index.
     // It is important that we traverse both inputs and outputs of nodes,
     // so that we reach all nodes that are connected to Root.
@@ -610,7 +610,7 @@ void Compile::print_ideal_ir(const char* phase_name) {
     xtty->head("ideal compile_id='%d'%s compile_phase='%s'",
                compile_id(),
                is_osr_compilation() ? " compile_kind='osr'" : "",
-               phase_name);
+               compile_phase_name);
   }
 
   tty->print("%s", ss.as_string());
@@ -671,7 +671,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _coarsened_locks(comp_arena(), 8, 0, nullptr),
       _congraph(nullptr),
       NOT_PRODUCT(_igv_printer(nullptr) COMMA)
-          _unique(0),
+      _unique(0),
       _dead_node_count(0),
       _dead_node_list(comp_arena()),
       _node_arena_one(mtCompiler, Arena::Tag::tag_node),
@@ -865,7 +865,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
 
 #ifndef PRODUCT
   if (should_print_ideal()) {
-    print_ideal_ir("print_ideal");
+    print_ideal_ir("PrintIdeal");
   }
 #endif
 
@@ -938,7 +938,7 @@ Compile::Compile(ciEnv* ci_env,
       _for_merge_stores_igvn(comp_arena(), 8, 0, nullptr),
       _congraph(nullptr),
       NOT_PRODUCT(_igv_printer(nullptr) COMMA)
-          _unique(0),
+      _unique(0),
       _dead_node_count(0),
       _dead_node_list(comp_arena()),
       _node_arena_one(mtCompiler, Arena::Tag::tag_node),
@@ -1369,72 +1369,37 @@ const TypePtr *Compile::flatten_alias_type( const TypePtr *tj ) const {
               cast_to_ptr_type(ptr)->
               with_offset(offset);
     }
-  } else if (ta) {
-    // For arrays indexed by constant indices, we flatten the alias
-    // space to include all of the array body.  Only the header, klass
-    // and array length can be accessed un-aliased.
-    if( offset != Type::OffsetBot ) {
-      if( ta->const_oop() ) { // MethodData* or Method*
-        offset = Type::OffsetBot;   // Flatten constant access into array body
-        tj = ta = ta->
-                remove_speculative()->
-                cast_to_ptr_type(ptr)->
-                cast_to_exactness(false)->
-                with_offset(offset);
-      } else if( offset == arrayOopDesc::length_offset_in_bytes() ) {
-        // range is OK as-is.
-        tj = ta = TypeAryPtr::RANGE;
-      } else if( offset == oopDesc::klass_offset_in_bytes() ) {
-        tj = TypeInstPtr::KLASS; // all klass loads look alike
-        ta = TypeAryPtr::RANGE; // generic ignored junk
-        ptr = TypePtr::BotPTR;
-      } else if( offset == oopDesc::mark_offset_in_bytes() ) {
-        tj = TypeInstPtr::MARK;
-        ta = TypeAryPtr::RANGE; // generic ignored junk
-        ptr = TypePtr::BotPTR;
-      } else {                  // Random constant offset into array body
-        offset = Type::OffsetBot;   // Flatten constant access into array body
-        tj = ta = ta->
-                remove_speculative()->
-                cast_to_ptr_type(ptr)->
-                cast_to_exactness(false)->
-                with_offset(offset);
-      }
+  } else if (ta != nullptr) {
+    // Common slices
+    if (offset == arrayOopDesc::length_offset_in_bytes()) {
+      return TypeAryPtr::RANGE;
+    } else if (offset == oopDesc::klass_offset_in_bytes()) {
+      return TypeInstPtr::KLASS;
+    } else if (offset == oopDesc::mark_offset_in_bytes()) {
+      return TypeInstPtr::MARK;
     }
-    // Arrays of fixed size alias with arrays of unknown size.
-    if (ta->size() != TypeInt::POS) {
-      const TypeAry *tary = TypeAry::make(ta->elem(), TypeInt::POS);
-      tj = ta = ta->
-              remove_speculative()->
-              cast_to_ptr_type(ptr)->
-              with_ary(tary)->
-              cast_to_exactness(false);
-    }
-    // Arrays of known objects become arrays of unknown objects.
-    if (ta->elem()->isa_narrowoop() && ta->elem() != TypeNarrowOop::BOTTOM) {
-      const TypeAry *tary = TypeAry::make(TypeNarrowOop::BOTTOM, ta->size());
-      tj = ta = TypeAryPtr::make(ptr,ta->const_oop(),tary,nullptr,false,offset);
-    }
-    if (ta->elem()->isa_oopptr() && ta->elem() != TypeInstPtr::BOTTOM) {
-      const TypeAry *tary = TypeAry::make(TypeInstPtr::BOTTOM, ta->size());
-      tj = ta = TypeAryPtr::make(ptr,ta->const_oop(),tary,nullptr,false,offset);
+
+    // Remove size and stability
+    const TypeAry* normalized_ary = TypeAry::make(ta->elem(), TypeInt::POS, false);
+    // Remove ptr, const_oop, and offset
+    if (ta->elem() == Type::BOTTOM) {
+      // Bottom array (meet of int[] and byte[] for example), accesses to it will be done with
+      // Unsafe. This should alias with all arrays. For now just leave it as it is (this is
+      // incorrect, see JDK-8331133).
+      tj = ta = TypeAryPtr::make(TypePtr::BotPTR, nullptr, normalized_ary, nullptr, false, Type::OffsetBot);
+    } else if (ta->elem()->make_oopptr() != nullptr) {
+      // Object arrays, all of them share the same slice
+      const TypeAry* tary = TypeAry::make(TypeInstPtr::BOTTOM, TypeInt::POS, false);
+      tj = ta = TypeAryPtr::make(TypePtr::BotPTR, nullptr, tary, nullptr, false, Type::OffsetBot);
+    } else {
+      // Primitive arrays
+      tj = ta = TypeAryPtr::make(TypePtr::BotPTR, nullptr, normalized_ary, ta->exact_klass(), true, Type::OffsetBot);
     }
+
     // Arrays of bytes and of booleans both use 'bastore' and 'baload' so
     // cannot be distinguished by bytecode alone.
     if (ta->elem() == TypeInt::BOOL) {
-      const TypeAry *tary = TypeAry::make(TypeInt::BYTE, ta->size());
-      ciKlass* aklass = ciTypeArrayKlass::make(T_BYTE);
-      tj = ta = TypeAryPtr::make(ptr,ta->const_oop(),tary,aklass,false,offset);
-    }
-    // During the 2nd round of IterGVN, NotNull castings are removed.
-    // Make sure the Bottom and NotNull variants alias the same.
-    // Also, make sure exact and non-exact variants alias the same.
-    if (ptr == TypePtr::NotNull || ta->klass_is_exact() || ta->speculative() != nullptr) {
-      tj = ta = ta->
-              remove_speculative()->
-              cast_to_ptr_type(TypePtr::BotPTR)->
-              cast_to_exactness(false)->
-              with_offset(offset);
+      tj = ta = TypeAryPtr::BYTES;
     }
   }
 
@@ -1876,7 +1841,7 @@ void Compile::process_for_post_loop_opts_igvn(PhaseIterGVN& igvn) {
   // at least to this point, even if no loop optimizations were done.
   PhaseIdealLoop::verify(igvn);
 
-  if (has_loops() || _loop_opts_cnt > 0) {
+  if (_print_phase_loop_opts) {
     print_method(PHASE_AFTER_LOOP_OPTS, 2);
   }
   C->set_post_loop_opts_phase(); // no more loop opts allowed
@@ -2098,6 +2063,7 @@ void Compile::inline_boxing_calls(PhaseIterGVN& igvn) {
 
 bool Compile::inline_incrementally_one() {
   assert(IncrementalInline, "incremental inlining should be on");
+  assert(_late_inlines.length() > 0, "should have been checked by caller");
 
   TracePhase tp(_t_incrInline_inline);
 
@@ -2170,6 +2136,21 @@ void Compile::inline_incrementally_cleanup(PhaseIterGVN& igvn) {
   print_method(PHASE_INCREMENTAL_INLINE_CLEANUP, 3);
 }
 
+template<typename E>
+static void shuffle_array(Compile& C, GrowableArray<E>& array) {
+  if (array.length() < 2) {
+    return;
+  }
+  for (uint i = array.length() - 1; i >= 1; i--) {
+    uint j = C.random() % (i + 1);
+    swap(array.at(i), array.at(j));
+  }
+}
+
+void Compile::shuffle_late_inlines() {
+  shuffle_array(*C, _late_inlines);
+}
+
 // Perform incremental inlining until bound on number of live nodes is reached
 void Compile::inline_incrementally(PhaseIterGVN& igvn) {
   TracePhase tp(_t_incrInline);
@@ -2177,6 +2158,10 @@ void Compile::inline_incrementally(PhaseIterGVN& igvn) {
   set_inlining_incrementally(true);
   uint low_live_nodes = 0;
 
+  if (StressIncrementalInlining) {
+    shuffle_late_inlines();
+  }
+
   while (_late_inlines.length() > 0) {
     if (live_nodes() > (uint)LiveNodeCountInliningCutoff) {
       if (low_live_nodes < (uint)LiveNodeCountInliningCutoff * 8 / 10) {
@@ -2209,6 +2194,10 @@ void Compile::inline_incrementally(PhaseIterGVN& igvn) {
 
     igvn_worklist()->ensure_empty(); // should be done with igvn
 
+    if (_late_inlines.length() == 0) {
+      break; // no more progress
+    }
+
     while (inline_incrementally_one()) {
       assert(!failing_internal() || failure_is_artificial(), "inconsistent");
     }
@@ -2219,10 +2208,6 @@ void Compile::inline_incrementally(PhaseIterGVN& igvn) {
     print_method(PHASE_INCREMENTAL_INLINE_STEP, 3);
 
     if (failing())  return;
-
-    if (_late_inlines.length() == 0) {
-      break; // no more progress
-    }
   }
 
   igvn_worklist()->ensure_empty(); // should be done with igvn
@@ -2249,6 +2234,10 @@ void Compile::process_late_inline_calls_no_inline(PhaseIterGVN& igvn) {
   assert(_modified_nodes == nullptr, "not allowed");
   assert(_late_inlines.length() > 0, "sanity");
 
+  if (StressIncrementalInlining) {
+    shuffle_late_inlines();
+  }
+
   while (_late_inlines.length() > 0) {
     igvn_worklist()->ensure_empty(); // should be done with igvn
 
@@ -2404,7 +2393,8 @@ void Compile::Optimize() {
 
   if (failing())  return;
 
-  if (has_loops()) {
+  _print_phase_loop_opts = has_loops();
+  if (_print_phase_loop_opts) {
     print_method(PHASE_BEFORE_LOOP_OPTS, 2);
   }
 
@@ -3787,6 +3777,8 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
   case Op_MulReductionVD:
   case Op_MinReductionV:
   case Op_MaxReductionV:
+  case Op_UMinReductionV:
+  case Op_UMaxReductionV:
   case Op_AndReductionV:
   case Op_OrReductionV:
   case Op_XorReductionV:
@@ -5139,13 +5131,7 @@ void CloneMap::dump(node_idx_t key, outputStream* st) const {
 }
 
 void Compile::shuffle_macro_nodes() {
-  if (_macro_nodes.length() < 2) {
-    return;
-  }
-  for (uint i = _macro_nodes.length() - 1; i >= 1; i--) {
-    uint j = C->random() % (i + 1);
-    swap(_macro_nodes.at(i), _macro_nodes.at(j));
-  }
+  shuffle_array(*C, _macro_nodes);
 }
 
 // Move Allocate nodes to the start of the list
@@ -5165,17 +5151,17 @@ void Compile::sort_macro_nodes() {
   }
 }
 
-void Compile::print_method(CompilerPhaseType cpt, int level, Node* n) {
+void Compile::print_method(CompilerPhaseType compile_phase, int level, Node* n) {
   if (failing_internal()) { return; } // failing_internal to not stress bailouts from printing code.
   EventCompilerPhase event(UNTIMED);
   if (event.should_commit()) {
-    CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, cpt, C->_compile_id, level);
+    CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, compile_phase, C->_compile_id, level);
   }
 #ifndef PRODUCT
   ResourceMark rm;
   stringStream ss;
-  ss.print_raw(CompilerPhaseTypeHelper::to_description(cpt));
-  int iter = ++_igv_phase_iter[cpt];
+  ss.print_raw(CompilerPhaseTypeHelper::to_description(compile_phase));
+  int iter = ++_igv_phase_iter[compile_phase];
   if (iter > 1) {
     ss.print(" %d", iter);
   }
@@ -5203,8 +5189,8 @@ void Compile::print_method(CompilerPhaseType cpt, int level, Node* n) {
   if (should_print_phase(level)) {
     print_phase(name);
   }
-  if (should_print_ideal_phase(cpt)) {
-    print_ideal_ir(CompilerPhaseTypeHelper::to_name(cpt));
+  if (should_print_ideal_phase(compile_phase)) {
+    print_ideal_ir(CompilerPhaseTypeHelper::to_name(compile_phase));
   }
 #endif
   C->_latest_stage_start_counter.stamp();
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 45a3a4f548f..eb6be669f24 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -355,6 +355,7 @@ class Compile : public Phase {
   bool                  _print_assembly;        // True if we should dump assembly code for this compilation
   bool                  _print_inlining;        // True if we should print inlining for this compilation
   bool                  _print_intrinsics;      // True if we should print intrinsics for this compilation
+  bool                  _print_phase_loop_opts; // True if we should print before and after loop opts phase
 #ifndef PRODUCT
   uint                  _phase_counter;         // Counter for the number of already printed phases
   uint                  _igv_idx;               // Counter for IGV node identifiers
@@ -666,7 +667,7 @@ public:
   uint          next_igv_idx()                  { return _igv_idx++; }
   bool          trace_opto_output() const       { return _trace_opto_output; }
   void          print_phase(const char* phase_name);
-  void          print_ideal_ir(const char* phase_name);
+  void          print_ideal_ir(const char* compile_phase_name) const;
   bool          should_print_ideal() const      { return _directive->PrintIdealOption; }
   bool              parsed_irreducible_loop() const { return _parsed_irreducible_loop; }
   void          set_parsed_irreducible_loop(bool z) { _parsed_irreducible_loop = z; }
@@ -680,7 +681,7 @@ public:
   void begin_method();
   void end_method();
 
-  void print_method(CompilerPhaseType cpt, int level, Node* n = nullptr);
+  void print_method(CompilerPhaseType compile_phase, int level, Node* n = nullptr);
 
 #ifndef PRODUCT
   bool should_print_igv(int level);
@@ -794,6 +795,7 @@ public:
   void remove_from_merge_stores_igvn(Node* n);
   void process_for_merge_stores_igvn(PhaseIterGVN& igvn);
 
+  void shuffle_late_inlines();
   void shuffle_macro_nodes();
   void sort_macro_nodes();
 
@@ -1058,6 +1060,13 @@ public:
   // Record this CallGenerator for inlining at the end of parsing.
   void              add_late_inline(CallGenerator* cg)        {
     _late_inlines.insert_before(_late_inlines_pos, cg);
+    if (StressIncrementalInlining) {
+      assert(_late_inlines_pos < _late_inlines.length(), "unthinkable!");
+      if (_late_inlines.length() - _late_inlines_pos >= 2) {
+        int j = (C->random() % (_late_inlines.length() - _late_inlines_pos)) + _late_inlines_pos;
+        swap(_late_inlines.at(_late_inlines_pos), _late_inlines.at(j));
+      }
+    }
     _late_inlines_pos++;
   }
 
diff --git a/src/hotspot/share/opto/constantTable.cpp b/src/hotspot/share/opto/constantTable.cpp
index aba71e45e1c..ae4ac336d93 100644
--- a/src/hotspot/share/opto/constantTable.cpp
+++ b/src/hotspot/share/opto/constantTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@ void ConstantTable::calculate_offsets_and_size() {
   // Align size up to the next section start (which is insts; see
   // CodeBuffer::align_at_start).
   assert(_size == -1, "already set?");
-  _size = align_up(offset, (int)CodeEntryAlignment);
+  _size = align_up(offset, CodeEntryAlignment);
 }
 
 bool ConstantTable::emit(C2_MacroAssembler* masm) const {
diff --git a/src/hotspot/share/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp
index b13460c89f5..43432b271a4 100644
--- a/src/hotspot/share/opto/divnode.hpp
+++ b/src/hotspot/share/opto/divnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,15 +35,33 @@
 
 // Optimization - Graph Style
 
+class DivModIntegerNode : public Node {
+private:
+  bool _pinned;
+
+protected:
+  DivModIntegerNode(Node* c, Node* dividend, Node* divisor) : Node(c, dividend, divisor), _pinned(false) {}
+
+private:
+  virtual uint size_of() const override { return sizeof(DivModIntegerNode); }
+  virtual uint hash() const override { return Node::hash() + _pinned; }
+  virtual bool cmp(const Node& o) const override { return Node::cmp(o) && _pinned == static_cast<const DivModIntegerNode&>(o)._pinned; }
+  virtual bool depends_only_on_test_impl() const override { return !_pinned; }
+  virtual DivModIntegerNode* pin_node_under_control_impl() const override {
+    DivModIntegerNode* res = static_cast<DivModIntegerNode*>(clone());
+    res->_pinned = true;
+    return res;
+  }
+};
 
 //------------------------------DivINode---------------------------------------
 // Integer division
 // Note: this is division as defined by JVMS, i.e., MinInt/-1 == MinInt.
 // On processors which don't naturally support this special case (e.g., x86),
 // the matcher or runtime system must take care of this.
-class DivINode : public Node {
+class DivINode : public DivModIntegerNode {
 public:
-  DivINode( Node *c, Node *dividend, Node *divisor ) : Node(c, dividend, divisor ) {}
+  DivINode(Node* c, Node* dividend, Node* divisor) : DivModIntegerNode(c, dividend, divisor) {}
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -54,9 +72,9 @@ public:
 
 //------------------------------DivLNode---------------------------------------
 // Long division
-class DivLNode : public Node {
+class DivLNode : public DivModIntegerNode {
 public:
-  DivLNode( Node *c, Node *dividend, Node *divisor ) : Node(c, dividend, divisor ) {}
+  DivLNode(Node* c, Node* dividend, Node* divisor) : DivModIntegerNode(c, dividend, divisor) {}
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -107,9 +125,9 @@ public:
 
 //------------------------------UDivINode---------------------------------------
 // Unsigned integer division
-class UDivINode : public Node {
+class UDivINode : public DivModIntegerNode {
 public:
-  UDivINode( Node *c, Node *dividend, Node *divisor ) : Node(c, dividend, divisor ) {}
+  UDivINode(Node* c, Node* dividend, Node* divisor) : DivModIntegerNode(c, dividend, divisor) {}
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
@@ -120,9 +138,9 @@ public:
 
 //------------------------------UDivLNode---------------------------------------
 // Unsigned long division
-class UDivLNode : public Node {
+class UDivLNode : public DivModIntegerNode {
 public:
-  UDivLNode( Node *c, Node *dividend, Node *divisor ) : Node(c, dividend, divisor ) {}
+  UDivLNode(Node* c, Node* dividend, Node* divisor) : DivModIntegerNode(c, dividend, divisor) {}
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
@@ -133,9 +151,9 @@ public:
 
 //------------------------------ModINode---------------------------------------
 // Integer modulus
-class ModINode : public Node {
+class ModINode : public DivModIntegerNode {
 public:
-  ModINode( Node *c, Node *in1, Node *in2 ) : Node(c,in1, in2) {}
+  ModINode(Node* c, Node* in1, Node* in2) : DivModIntegerNode(c, in1, in2) {}
   virtual int Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -145,9 +163,9 @@ public:
 
 //------------------------------ModLNode---------------------------------------
 // Long modulus
-class ModLNode : public Node {
+class ModLNode : public DivModIntegerNode {
 public:
-  ModLNode( Node *c, Node *in1, Node *in2 ) : Node(c,in1, in2) {}
+  ModLNode(Node* c, Node* in1, Node* in2) : DivModIntegerNode(c, in1, in2) {}
   virtual int Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
@@ -199,9 +217,9 @@ public:
 
 //------------------------------UModINode---------------------------------------
 // Unsigned integer modulus
-class UModINode : public Node {
+class UModINode : public DivModIntegerNode {
 public:
-  UModINode( Node *c, Node *in1, Node *in2 ) : Node(c,in1, in2) {}
+  UModINode(Node* c, Node* in1, Node* in2) : DivModIntegerNode(c, in1, in2) {}
   virtual int Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *bottom_type() const { return TypeInt::INT; }
@@ -211,9 +229,9 @@ public:
 
 //------------------------------UModLNode---------------------------------------
 // Unsigned long modulus
-class UModLNode : public Node {
+class UModLNode : public DivModIntegerNode {
 public:
-  UModLNode( Node *c, Node *in1, Node *in2 ) : Node(c,in1, in2) {}
+  UModLNode(Node* c, Node* in1, Node* in2) : DivModIntegerNode(c, in1, in2) {}
   virtual int Opcode() const;
   virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
   virtual const Type *bottom_type() const { return TypeLong::LONG; }
@@ -243,6 +261,9 @@ public:
 
   ProjNode* div_proj() { return proj_out_or_null(div_proj_num); }
   ProjNode* mod_proj() { return proj_out_or_null(mod_proj_num); }
+
+private:
+  virtual bool depends_only_on_test() const { return false; }
 };
 
 //------------------------------DivModINode---------------------------------------
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 7b5c3855a9e..5befdd924ff 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -588,7 +588,7 @@ bool ConnectionGraph::can_reduce_check_users(Node* n, uint nesting) const {
         // CmpP/N used by the If controlling the cast.
         if (use->in(0)->is_IfTrue() || use->in(0)->is_IfFalse()) {
           Node* iff = use->in(0)->in(0);
-          // We may have an OpaqueNotNull node between If and Bool nodes. But we could also have a sub class of IfNode,
+          // We may have an OpaqueConstantBool node between If and Bool nodes. But we could also have a sub class of IfNode,
           // for example, an OuterStripMinedLoopEnd or a Parse Predicate. Bail out in all these cases.
           bool can_reduce = (iff->Opcode() == Op_If) && iff->in(1)->is_Bool() && iff->in(1)->in(1)->is_Cmp();
           if (can_reduce) {
@@ -1058,6 +1058,39 @@ void ConnectionGraph::updates_after_load_split(Node* data_phi, Node* previous_lo
     // "new_load" might actually be a constant, parameter, etc.
     if (new_load->is_Load()) {
       Node* new_addp = new_load->in(MemNode::Address);
+
+      // If new_load is a Load but not from an AddP, it means that the load is folded into another
+      // load. And since this load is not from a field, we cannot create a unique type for it.
+      // For example:
+      //
+      //   if (b) {
+      //       Holder h1 = new Holder();
+      //       Object o = ...;
+      //       h.o = o.getClass();
+      //   } else {
+      //       Holder h2 = ...;
+      //   }
+      //   Holder h = Phi(h1, h2);
+      //   Object r = h.o;
+      //
+      // Then, splitting r through the merge point results in:
+      //
+      //   if (b) {
+      //       Holder h1 = new Holder();
+      //       Object o = ...;
+      //       h.o = o.getClass();
+      //       Object o1 = h.o;
+      //   } else {
+      //       Holder h2 = ...;
+      //       Object o2 = h2.o;
+      //   }
+      //   Object r = Phi(o1, o2);
+      //
+      // In this case, o1 is folded to o.getClass() which is a Load but not from an AddP, but from
+      // an OopHandle that is loaded from the Klass of o.
+      if (!new_addp->is_AddP()) {
+        continue;
+      }
       Node* base = get_addp_base(new_addp);
 
       // The base might not be something that we can create an unique
@@ -3478,10 +3511,7 @@ bool ConnectionGraph::is_oop_field(Node* n, int offset, bool* unsafe) {
         bt = field->layout_type();
       } else {
         // Check for unsafe oop field access
-        if (n->has_out_with(Op_StoreP, Op_LoadP, Op_StoreN, Op_LoadN) ||
-            n->has_out_with(Op_GetAndSetP, Op_GetAndSetN, Op_CompareAndExchangeP, Op_CompareAndExchangeN) ||
-            n->has_out_with(Op_CompareAndSwapP, Op_CompareAndSwapN, Op_WeakCompareAndSwapP, Op_WeakCompareAndSwapN) ||
-            BarrierSet::barrier_set()->barrier_set_c2()->escape_has_out_with_unsafe_object(n)) {
+        if (has_oop_node_outs(n)) {
           bt = T_OBJECT;
           (*unsafe) = true;
         }
@@ -3497,16 +3527,22 @@ bool ConnectionGraph::is_oop_field(Node* n, int offset, bool* unsafe) {
       }
     } else if (adr_type->isa_rawptr() || adr_type->isa_klassptr()) {
       // Allocation initialization, ThreadLocal field access, unsafe access
-      if (n->has_out_with(Op_StoreP, Op_LoadP, Op_StoreN, Op_LoadN) ||
-          n->has_out_with(Op_GetAndSetP, Op_GetAndSetN, Op_CompareAndExchangeP, Op_CompareAndExchangeN) ||
-          n->has_out_with(Op_CompareAndSwapP, Op_CompareAndSwapN, Op_WeakCompareAndSwapP, Op_WeakCompareAndSwapN) ||
-          BarrierSet::barrier_set()->barrier_set_c2()->escape_has_out_with_unsafe_object(n)) {
+      if (has_oop_node_outs(n)) {
         bt = T_OBJECT;
       }
     }
   }
   // Note: T_NARROWOOP is not classed as a real reference type
-  return (is_reference_type(bt) || bt == T_NARROWOOP);
+  bool res = (is_reference_type(bt) || bt == T_NARROWOOP);
+  assert(!has_oop_node_outs(n) || res, "sanity: AddP has oop outs, needs to be treated as oop field");
+  return res;
+}
+
+bool ConnectionGraph::has_oop_node_outs(Node* n) {
+  return n->has_out_with(Op_StoreP, Op_LoadP, Op_StoreN, Op_LoadN) ||
+         n->has_out_with(Op_GetAndSetP, Op_GetAndSetN, Op_CompareAndExchangeP, Op_CompareAndExchangeN) ||
+         n->has_out_with(Op_CompareAndSwapP, Op_CompareAndSwapN, Op_WeakCompareAndSwapP, Op_WeakCompareAndSwapN) ||
+         BarrierSet::barrier_set()->barrier_set_c2()->escape_has_out_with_unsafe_object(n);
 }
 
 // Returns unique pointed java object or null.
@@ -3739,9 +3775,9 @@ Node* ConnectionGraph::get_addp_base(Node *addp) {
   //       | |
   //       AddP  ( base == address )
   //
-  // case #6. Constant Pool, ThreadLocal, CastX2P or
+  // case #6. Constant Pool, ThreadLocal, CastX2P, Klass, OSR buffer buf or
   //          Raw object's field reference:
-  //      {ConP, ThreadLocal, CastX2P, raw Load}
+  //      {ConP, ThreadLocal, CastX2P, raw Load, Parm0}
   //  top   |
   //     \  |
   //     AddP  ( base == top )
@@ -3783,7 +3819,9 @@ Node* ConnectionGraph::get_addp_base(Node *addp) {
       int opcode = uncast_base->Opcode();
       assert(opcode == Op_ConP || opcode == Op_ThreadLocal ||
              opcode == Op_CastX2P || uncast_base->is_DecodeNarrowPtr() ||
+             (_igvn->C->is_osr_compilation() && uncast_base->is_Parm() && uncast_base->as_Parm()->_con == TypeFunc::Parms)||
              (uncast_base->is_Mem() && (uncast_base->bottom_type()->isa_rawptr() != nullptr)) ||
+             (uncast_base->is_Mem() && (uncast_base->bottom_type()->isa_klassptr() != nullptr)) ||
              is_captured_store_address(addp), "sanity");
     }
   }
@@ -4378,7 +4416,6 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
   uint new_index_start = (uint) _compile->num_alias_types();
   VectorSet visited;
   ideal_nodes.clear(); // Reset for use with set_map/get_map.
-  uint unique_old = _compile->unique();
 
   //  Phase 1:  Process possible allocations from alloc_worklist.
   //  Create instance types for the CheckCastPP for allocations where possible.
diff --git a/src/hotspot/share/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp
index 04a9dc82982..dcb832889ec 100644
--- a/src/hotspot/share/opto/escape.hpp
+++ b/src/hotspot/share/opto/escape.hpp
@@ -539,7 +539,8 @@ private:
   }
 
   // Helper functions
-  bool   is_oop_field(Node* n, int offset, bool* unsafe);
+  bool is_oop_field(Node* n, int offset, bool* unsafe);
+  bool has_oop_node_outs(Node* n);
   static Node* find_second_addp(Node* addp, Node* n);
   // offset of a field reference
   int address_offset(Node* adr, PhaseValues* phase);
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 71ae8fe44a7..c969abb85bb 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -1177,7 +1177,21 @@ bool GraphKit::compute_stack_effects(int& inputs, int& depth) {
 //------------------------------basic_plus_adr---------------------------------
 Node* GraphKit::basic_plus_adr(Node* base, Node* ptr, Node* offset) {
   // short-circuit a common case
-  if (offset == intcon(0))  return ptr;
+  if (offset == MakeConX(0)) {
+    return ptr;
+  }
+#ifdef ASSERT
+  // Both 32-bit and 64-bit zeros should have been handled by the previous `if`
+  // statement, so if we see either 32-bit or 64-bit zeros here, then we have a
+  // problem.
+  if (offset->is_Con()) {
+    const Type* t = offset->bottom_type();
+    bool is_zero_int = t->isa_int() && t->is_int()->get_con() == 0;
+    bool is_zero_long = t->isa_long() && t->is_long()->get_con() == 0;
+    assert(!is_zero_int && !is_zero_long,
+           "Unexpected zero offset - should have matched MakeConX(0)");
+  }
+#endif
   return _gvn.transform( new AddPNode(base, ptr, offset) );
 }
 
@@ -1472,7 +1486,7 @@ Node* GraphKit::cast_not_null(Node* obj, bool do_replace_in_map) {
 // In that case that data path will die and we need the control path
 // to become dead as well to keep the graph consistent. So we have to
 // add a check for null for which one branch can't be taken. It uses
-// an OpaqueNotNull node that will cause the check to be removed after loop
+// an OpaqueConstantBool node that will cause the check to be removed after loop
 // opts so the test goes away and the compiled code doesn't execute a
 // useless check.
 Node* GraphKit::must_be_not_null(Node* value, bool do_replace_in_map) {
@@ -1481,7 +1495,7 @@ Node* GraphKit::must_be_not_null(Node* value, bool do_replace_in_map) {
   }
   Node* chk = _gvn.transform(new CmpPNode(value, null()));
   Node* tst = _gvn.transform(new BoolNode(chk, BoolTest::ne));
-  Node* opaq = _gvn.transform(new OpaqueNotNullNode(C, tst));
+  Node* opaq = _gvn.transform(new OpaqueConstantBoolNode(C, tst, true));
   IfNode* iff = new IfNode(control(), opaq, PROB_MAX, COUNT_UNKNOWN);
   _gvn.set_type(iff, iff->Value(&_gvn));
   if (!tst->is_Con()) {
@@ -1489,8 +1503,7 @@ Node* GraphKit::must_be_not_null(Node* value, bool do_replace_in_map) {
   }
   Node *if_f = _gvn.transform(new IfFalseNode(iff));
   Node *frame = _gvn.transform(new ParmNode(C->start(), TypeFunc::FramePtr));
-  Node* halt = _gvn.transform(new HaltNode(if_f, frame, "unexpected null in intrinsic"));
-  C->root()->add_req(halt);
+  halt(if_f, frame, "unexpected null in intrinsic");
   Node *if_t = _gvn.transform(new IfTrueNode(iff));
   set_control(if_t);
   return cast_not_null(value, do_replace_in_map);
@@ -2073,6 +2086,12 @@ void GraphKit::increment_counter(Node* counter_addr) {
   store_to_memory(ctrl, counter_addr, incr, T_LONG, MemNode::unordered);
 }
 
+void GraphKit::halt(Node* ctrl, Node* frameptr, const char* reason, bool generate_code_in_product) {
+  Node* halt = new HaltNode(ctrl, frameptr, reason
+                            PRODUCT_ONLY(COMMA generate_code_in_product));
+  halt = _gvn.transform(halt);
+  root()->add_req(halt);
+}
 
 //------------------------------uncommon_trap----------------------------------
 // Bail out to the interpreter in mid-method.  Implemented by calling the
@@ -2195,11 +2214,15 @@ Node* GraphKit::uncommon_trap(int trap_request,
   // The debug info is the only real input to this call.
 
   // Halt-and-catch fire here.  The above call should never return!
-  HaltNode* halt = new HaltNode(control(), frameptr(), "uncommon trap returned which should never happen"
-                                                       PRODUCT_ONLY(COMMA /*reachable*/false));
-  _gvn.set_type_bottom(halt);
-  root()->add_req(halt);
-
+  // We only emit code for the HaltNode in debug, which is enough for
+  // verifying correctness. In product, we don't want to emit it so
+  // that we can save on code space. HaltNode often get folded because
+  // the compiler can prove that the unreachable path is dead. But we
+  // cannot generally expect that for uncommon traps, which are often
+  // reachable and occasionally taken.
+  halt(control(), frameptr(),
+       "uncommon trap returned which should never happen",
+       false /* don't emit code in product */);
   stop_and_kill_map();
   return call;
 }
@@ -2734,7 +2757,7 @@ Node* Phase::gen_subtype_check(Node* subklass, Node* superklass, Node** ctrl, No
   // will always succeed.  We could leave a dependency behind to ensure this.
 
   // First load the super-klass's check-offset
-  Node *p1 = gvn.transform(new AddPNode(superklass, superklass, gvn.MakeConX(in_bytes(Klass::super_check_offset_offset()))));
+  Node *p1 = gvn.transform(new AddPNode(C->top(), superklass, gvn.MakeConX(in_bytes(Klass::super_check_offset_offset()))));
   Node* m = C->immutable_memory();
   Node *chk_off = gvn.transform(new LoadINode(nullptr, m, p1, gvn.type(p1)->is_ptr(), TypeInt::INT, MemNode::unordered));
   int cacheoff_con = in_bytes(Klass::secondary_super_cache_offset());
@@ -2752,7 +2775,7 @@ Node* Phase::gen_subtype_check(Node* subklass, Node* superklass, Node** ctrl, No
 #ifdef _LP64
   chk_off_X = gvn.transform(new ConvI2LNode(chk_off_X));
 #endif
-  Node *p2 = gvn.transform(new AddPNode(subklass,subklass,chk_off_X));
+  Node* p2 = gvn.transform(new AddPNode(C->top(), subklass, chk_off_X));
   // For some types like interfaces the following loadKlass is from a 1-word
   // cache which is mutable so can't use immutable memory.  Other
   // types load from the super-class display table which is immutable.
@@ -3589,7 +3612,7 @@ Node* GraphKit::get_layout_helper(Node* klass_node, jint& constant_value) {
     }
   }
   constant_value = Klass::_lh_neutral_value;  // put in a known value
-  Node* lhp = basic_plus_adr(klass_node, klass_node, in_bytes(Klass::layout_helper_offset()));
+  Node* lhp = basic_plus_adr(top(), klass_node, in_bytes(Klass::layout_helper_offset()));
   return make_load(nullptr, lhp, TypeInt::INT, T_INT, MemNode::unordered);
 }
 
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index 56e9a949e6f..0537d31ae36 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -709,6 +709,8 @@ class GraphKit : public Phase {
   void increment_counter(address counter_addr);   // increment a debug counter
   void increment_counter(Node*   counter_addr);   // increment a debug counter
 
+  void halt(Node* ctrl, Node* frameptr, const char* reason, bool generate_code_in_product = true);
+
   // Bail out to the interpreter right now
   // The optional klass is the one causing the trap.
   // The optional reason is debug information written to the compile log.
diff --git a/src/hotspot/share/opto/idealKit.cpp b/src/hotspot/share/opto/idealKit.cpp
index dd7e9ae52b7..fbb61bfdf72 100644
--- a/src/hotspot/share/opto/idealKit.cpp
+++ b/src/hotspot/share/opto/idealKit.cpp
@@ -360,6 +360,17 @@ Node* IdealKit::load(Node* ctl,
   return transform(ld);
 }
 
+// Load AOT runtime constant
+Node* IdealKit::load_aot_const(Node* adr, const Type* t) {
+  BasicType bt = t->basic_type();
+  const TypePtr* adr_type = nullptr; // debug-mode-only argument
+  DEBUG_ONLY(adr_type = C->get_adr_type(Compile::AliasIdxRaw));
+  Node* ctl = (Node*)C->root(); // Raw memory access needs control
+  Node* ld = LoadNode::make(_gvn, ctl, C->immutable_memory(), adr, adr_type, t, bt, MemNode::unordered,
+                            LoadNode::DependsOnlyOnTest, false, false, false, false, 0);
+  return transform(ld);
+}
+
 Node* IdealKit::store(Node* ctl, Node* adr, Node *val, BasicType bt,
                       int adr_idx,
                       MemNode::MemOrd mo, bool require_atomic_access,
diff --git a/src/hotspot/share/opto/idealKit.hpp b/src/hotspot/share/opto/idealKit.hpp
index 280f61fd9a9..518c3b92136 100644
--- a/src/hotspot/share/opto/idealKit.hpp
+++ b/src/hotspot/share/opto/idealKit.hpp
@@ -224,6 +224,9 @@ class IdealKit: public StackObj {
              MemNode::MemOrd mo = MemNode::unordered,
              LoadNode::ControlDependency control_dependency = LoadNode::DependsOnlyOnTest);
 
+  // Load AOT runtime constant
+  Node* load_aot_const(Node* adr, const Type* t);
+
   // Return the new StoreXNode
   Node* store(Node* ctl,
               Node* adr,
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index cd8017f9fb3..762791d467d 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -604,7 +604,7 @@ static void adjust_check(IfProjNode* proj, Node* range, Node* index,
   // at the lowest/nearest dominating check in the graph. To ensure that these Loads/Casts do not float above any of the
   // dominating checks (even when the lowest dominating check is later replaced by yet another dominating check), we
   // need to pin them at the lowest dominating check.
-  proj->pin_array_access_nodes(igvn);
+  proj->pin_dependent_nodes(igvn);
 }
 
 //------------------------------up_one_dom-------------------------------------
@@ -1539,7 +1539,7 @@ Node* IfNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 }
 
 //------------------------------dominated_by-----------------------------------
-Node* IfNode::dominated_by(Node* prev_dom, PhaseIterGVN* igvn, bool pin_array_access_nodes) {
+Node* IfNode::dominated_by(Node* prev_dom, PhaseIterGVN* igvn, bool prev_dom_not_imply_this) {
 #ifndef PRODUCT
   if (TraceIterativeGVN) {
     tty->print("   Removing IfNode: "); this->dump();
@@ -1570,20 +1570,16 @@ Node* IfNode::dominated_by(Node* prev_dom, PhaseIterGVN* igvn, bool pin_array_ac
     // Loop ends when projection has no more uses.
     for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) {
       Node* s = ifp->last_out(j);   // Get child of IfTrue/IfFalse
-      if (s->depends_only_on_test() && igvn->no_dependent_zero_check(s)) {
-        // For control producers.
-        // Do not rewire Div and Mod nodes which could have a zero divisor to avoid skipping their zero check.
+      if (s->depends_only_on_test()) {
+        // For control producers
         igvn->replace_input_of(s, 0, data_target); // Move child to data-target
-        if (pin_array_access_nodes && data_target != top) {
-          // As a result of range check smearing, Loads and range check Cast nodes that are control dependent on this
-          // range check (that is about to be removed) now depend on multiple dominating range checks. After the removal
-          // of this range check, these control dependent nodes end up at the lowest/nearest dominating check in the
-          // graph. To ensure that these Loads/Casts do not float above any of the dominating checks (even when the
-          // lowest dominating check is later replaced by yet another dominating check), we need to pin them at the
-          // lowest dominating check.
-          Node* clone = s->pin_array_access_node();
+        if (prev_dom_not_imply_this && data_target != top) {
+          // If prev_dom_not_imply_this, s now depends on multiple tests with prev_dom being the
+          // lowest dominating one. As a result, it must be pinned there. Otherwise, it can be
+          // incorrectly moved to a dominating test equivalent to the lowest one here.
+          Node* clone = s->pin_node_under_control();
           if (clone != nullptr) {
-            clone = igvn->transform(clone);
+            igvn->register_new_node_with_optimizer(clone, s);
             igvn->replace_node(s, clone);
           }
         }
@@ -1831,16 +1827,15 @@ bool IfNode::is_zero_trip_guard() const {
   return false;
 }
 
-void IfProjNode::pin_array_access_nodes(PhaseIterGVN* igvn) {
+void IfProjNode::pin_dependent_nodes(PhaseIterGVN* igvn) {
   for (DUIterator i = outs(); has_out(i); i++) {
     Node* u = out(i);
     if (!u->depends_only_on_test()) {
       continue;
     }
-    Node* clone = u->pin_array_access_node();
+    Node* clone = u->pin_node_under_control();
     if (clone != nullptr) {
-      clone = igvn->transform(clone);
-      assert(clone != u, "shouldn't common");
+      igvn->register_new_node_with_optimizer(clone, u);
       igvn->replace_node(u, clone);
       --i;
     }
diff --git a/src/hotspot/share/opto/intrinsicnode.cpp b/src/hotspot/share/opto/intrinsicnode.cpp
index 1397d31af53..c3e003ad8d3 100644
--- a/src/hotspot/share/opto/intrinsicnode.cpp
+++ b/src/hotspot/share/opto/intrinsicnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,8 @@ Node* StrIntrinsicNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   if (in(0) && in(0)->is_top())  return nullptr;
 
   if (can_reshape) {
-    Node* mem = phase->transform(in(MemNode::Memory));
-    // If transformed to a MergeMem, get the desired slice
+    Node* mem = in(MemNode::Memory);
+    // If mem input is a MergeMem, get the desired slice
     uint alias_idx = phase->C->get_alias_index(adr_type());
     mem = mem->is_MergeMem() ? mem->as_MergeMem()->memory_at(alias_idx) : mem;
     if (mem != in(MemNode::Memory)) {
diff --git a/src/hotspot/share/opto/intrinsicnode.hpp b/src/hotspot/share/opto/intrinsicnode.hpp
index 2672402881e..d81e7bed7e9 100644
--- a/src/hotspot/share/opto/intrinsicnode.hpp
+++ b/src/hotspot/share/opto/intrinsicnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,9 @@ class PartialSubtypeCheckNode : public Node {
   virtual int Opcode() const;
   virtual const Type* bottom_type() const { return TypeRawPtr::BOTTOM; }
   virtual uint ideal_reg() const { return Op_RegP; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------StrIntrinsic-------------------------------
@@ -74,13 +77,15 @@ class StrIntrinsicNode: public Node {
   Node(control, char_array_mem, s1, s2), _encoding(encoding) {
   }
 
-  virtual bool depends_only_on_test() const { return false; }
   virtual const TypePtr* adr_type() const { return TypeAryPtr::BYTES; }
   virtual uint match_edge(uint idx) const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
   ArgEncoding encoding() const { return _encoding; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------StrComp-------------------------------------
@@ -172,13 +177,15 @@ class VectorizedHashCodeNode: public Node {
   VectorizedHashCodeNode(Node* control, Node* ary_mem, Node* arg1, Node* cnt1, Node* result, Node* basic_type)
     : Node(control, ary_mem, arg1, cnt1, result, basic_type) {};
   virtual int Opcode() const;
-  virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::INT; }
   virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
   virtual uint match_edge(uint idx) const;
   virtual uint ideal_reg() const { return Op_RegI; }
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------EncodeISOArray--------------------------------
@@ -191,7 +198,6 @@ class EncodeISOArrayNode: public Node {
 
   bool is_ascii() { return _ascii; }
   virtual int Opcode() const;
-  virtual bool depends_only_on_test() const { return false; }
   virtual const Type* bottom_type() const { return TypeInt::INT; }
   virtual const TypePtr* adr_type() const { return TypePtr::BOTTOM; }
   virtual uint match_edge(uint idx) const;
@@ -203,6 +209,9 @@ class EncodeISOArrayNode: public Node {
   virtual bool cmp(const Node& n) const {
     return Node::cmp(n) && _ascii == ((EncodeISOArrayNode&)n).is_ascii();
   }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //-------------------------------DigitNode----------------------------------------
@@ -212,6 +221,9 @@ public:
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::BOOL; }
   virtual uint ideal_reg() const { return Op_RegI; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------LowerCaseNode------------------------------------
@@ -221,6 +233,9 @@ public:
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::BOOL; }
   virtual uint ideal_reg() const { return Op_RegI; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------UpperCaseNode------------------------------------
@@ -230,6 +245,9 @@ public:
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::BOOL; }
   virtual uint ideal_reg() const { return Op_RegI; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------WhitespaceCode-----------------------------------
@@ -239,6 +257,9 @@ public:
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::BOOL; }
   virtual uint ideal_reg() const { return Op_RegI; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------CopySign-----------------------------------------
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 2c2a7c020b8..3627d06a87a 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -891,13 +891,16 @@ inline Node* LibraryCallKit::generate_fair_guard(Node* test, RegionNode* region)
 }
 
 inline Node* LibraryCallKit::generate_negative_guard(Node* index, RegionNode* region,
-                                                     Node* *pos_index) {
+                                                     Node** pos_index, bool with_opaque) {
   if (stopped())
     return nullptr;                // already stopped
   if (_gvn.type(index)->higher_equal(TypeInt::POS)) // [0,maxint]
     return nullptr;                // index is already adequately typed
   Node* cmp_lt = _gvn.transform(new CmpINode(index, intcon(0)));
   Node* bol_lt = _gvn.transform(new BoolNode(cmp_lt, BoolTest::lt));
+  if (with_opaque) {
+    bol_lt = _gvn.transform(new OpaqueConstantBoolNode(C, bol_lt, false));
+  }
   Node* is_neg = generate_guard(bol_lt, region, PROB_MIN);
   if (is_neg != nullptr && pos_index != nullptr) {
     // Emulate effect of Parse::adjust_map_after_if.
@@ -924,7 +927,8 @@ inline Node* LibraryCallKit::generate_negative_guard(Node* index, RegionNode* re
 inline Node* LibraryCallKit::generate_limit_guard(Node* offset,
                                                   Node* subseq_length,
                                                   Node* array_length,
-                                                  RegionNode* region) {
+                                                  RegionNode* region,
+                                                  bool with_opaque) {
   if (stopped())
     return nullptr;                // already stopped
   bool zero_offset = _gvn.type(offset) == TypeInt::ZERO;
@@ -935,12 +939,19 @@ inline Node* LibraryCallKit::generate_limit_guard(Node* offset,
     last = _gvn.transform(new AddINode(last, offset));
   Node* cmp_lt = _gvn.transform(new CmpUNode(array_length, last));
   Node* bol_lt = _gvn.transform(new BoolNode(cmp_lt, BoolTest::lt));
+  if (with_opaque) {
+    bol_lt = _gvn.transform(new OpaqueConstantBoolNode(C, bol_lt, false));
+  }
   Node* is_over = generate_guard(bol_lt, region, PROB_MIN);
   return is_over;
 }
 
 // Emit range checks for the given String.value byte array
-void LibraryCallKit::generate_string_range_check(Node* array, Node* offset, Node* count, bool char_count) {
+void LibraryCallKit::generate_string_range_check(Node* array,
+                                                 Node* offset,
+                                                 Node* count,
+                                                 bool char_count,
+                                                 bool halt_on_oob) {
   if (stopped()) {
     return; // already stopped
   }
@@ -952,16 +963,23 @@ void LibraryCallKit::generate_string_range_check(Node* array, Node* offset, Node
   }
 
   // Offset and count must not be negative
-  generate_negative_guard(offset, bailout);
-  generate_negative_guard(count, bailout);
+  generate_negative_guard(offset, bailout, nullptr, halt_on_oob);
+  generate_negative_guard(count, bailout, nullptr, halt_on_oob);
   // Offset + count must not exceed length of array
-  generate_limit_guard(offset, count, load_array_length(array), bailout);
+  generate_limit_guard(offset, count, load_array_length(array), bailout, halt_on_oob);
 
   if (bailout->req() > 1) {
-    PreserveJVMState pjvms(this);
-    set_control(_gvn.transform(bailout));
-    uncommon_trap(Deoptimization::Reason_intrinsic,
-                  Deoptimization::Action_maybe_recompile);
+    if (halt_on_oob) {
+      bailout = _gvn.transform(bailout)->as_Region();
+      Node* frame = _gvn.transform(new ParmNode(C->start(), TypeFunc::FramePtr));
+      Node* halt = _gvn.transform(new HaltNode(bailout, frame, "unexpected guard failure in intrinsic"));
+      C->root()->add_req(halt);
+    } else {
+      PreserveJVMState pjvms(this);
+      set_control(_gvn.transform(bailout));
+      uncommon_trap(Deoptimization::Reason_intrinsic,
+                    Deoptimization::Action_maybe_recompile);
+    }
   }
 }
 
@@ -1119,6 +1137,7 @@ bool LibraryCallKit::inline_array_equals(StrIntrinsicNode::ArgEnc ae) {
 
 
 //------------------------------inline_countPositives------------------------------
+// int java.lang.StringCoding#countPositives0(byte[] ba, int off, int len)
 bool LibraryCallKit::inline_countPositives() {
   if (too_many_traps(Deoptimization::Reason_intrinsic)) {
     return false;
@@ -1131,12 +1150,11 @@ bool LibraryCallKit::inline_countPositives() {
   Node* len        = argument(2);
 
   ba = must_be_not_null(ba, true);
-
-  // Range checks
-  generate_string_range_check(ba, offset, len, false);
+  generate_string_range_check(ba, offset, len, false, true);
   if (stopped()) {
     return true;
   }
+
   Node* ba_start = array_element_address(ba, offset, T_BYTE);
   Node* result = new CountPositivesNode(control(), memory(TypeAryPtr::BYTES), ba_start, len);
   set_result(_gvn.transform(result));
@@ -1289,8 +1307,8 @@ bool LibraryCallKit::inline_string_indexOfI(StrIntrinsicNode::ArgEnc ae) {
   Node* tgt_start = array_element_address(tgt, intcon(0), T_BYTE);
 
   // Range checks
-  generate_string_range_check(src, src_offset, src_count, ae != StrIntrinsicNode::LL);
-  generate_string_range_check(tgt, intcon(0), tgt_count, ae == StrIntrinsicNode::UU);
+  generate_string_range_check(src, src_offset, src_count, ae != StrIntrinsicNode::LL, true);
+  generate_string_range_check(tgt, intcon(0), tgt_count, ae == StrIntrinsicNode::UU, true);
   if (stopped()) {
     return true;
   }
@@ -1386,7 +1404,7 @@ bool LibraryCallKit::inline_string_indexOfChar(StrIntrinsicNode::ArgEnc ae) {
   Node* src_count = _gvn.transform(new SubINode(max, from_index));
 
   // Range checks
-  generate_string_range_check(src, src_offset, src_count, ae == StrIntrinsicNode::U);
+  generate_string_range_check(src, src_offset, src_count, ae == StrIntrinsicNode::U, true);
 
   // Check for int_ch >= 0
   Node* int_ch_cmp = _gvn.transform(new CmpINode(int_ch, intcon(0)));
@@ -1430,11 +1448,11 @@ bool LibraryCallKit::inline_string_indexOfChar(StrIntrinsicNode::ArgEnc ae) {
 }
 //---------------------------inline_string_copy---------------------
 // compressIt == true --> generate a compressed copy operation (compress char[]/byte[] to byte[])
-//   int StringUTF16.compress(char[] src, int srcOff, byte[] dst, int dstOff, int len)
-//   int StringUTF16.compress(byte[] src, int srcOff, byte[] dst, int dstOff, int len)
+//   int StringUTF16.compress0(char[] src, int srcOff, byte[] dst, int dstOff, int len)
+//   int StringUTF16.compress0(byte[] src, int srcOff, byte[] dst, int dstOff, int len)
 // compressIt == false --> generate an inflated copy operation (inflate byte[] to char[]/byte[])
-//   void StringLatin1.inflate(byte[] src, int srcOff, char[] dst, int dstOff, int len)
-//   void StringLatin1.inflate(byte[] src, int srcOff, byte[] dst, int dstOff, int len)
+//   void StringLatin1.inflate0(byte[] src, int srcOff, char[] dst, int dstOff, int len)
+//   void StringLatin1.inflate0(byte[] src, int srcOff, byte[] dst, int dstOff, int len)
 bool LibraryCallKit::inline_string_copy(bool compress) {
   if (too_many_traps(Deoptimization::Reason_intrinsic)) {
     return false;
@@ -1477,8 +1495,8 @@ bool LibraryCallKit::inline_string_copy(bool compress) {
   }
 
   // Range checks
-  generate_string_range_check(src, src_offset, length, convert_src);
-  generate_string_range_check(dst, dst_offset, length, convert_dst);
+  generate_string_range_check(src, src_offset, length, convert_src, true);
+  generate_string_range_check(dst, dst_offset, length, convert_dst, true);
   if (stopped()) {
     return true;
   }
@@ -3000,7 +3018,7 @@ bool LibraryCallKit::inline_unsafe_allocate() {
     // Note:  The argument might still be an illegal value like
     // Serializable.class or Object[].class.   The runtime will handle it.
     // But we must make an explicit check for initialization.
-    Node* insp = basic_plus_adr(kls, in_bytes(InstanceKlass::init_state_offset()));
+    Node* insp = basic_plus_adr(top(), kls, in_bytes(InstanceKlass::init_state_offset()));
     // Use T_BOOLEAN for InstanceKlass::_init_state so the compiler
     // can generate code to load it as unsigned byte.
     Node* inst = make_load(nullptr, insp, TypeInt::UBYTE, T_BOOLEAN, MemNode::acquire);
@@ -3048,7 +3066,7 @@ bool LibraryCallKit::inline_native_vthread_start_transition(address funcAddr, co
   IdealKit ideal(this);
 
   Node* thread = ideal.thread();
-  Node* jt_addr = basic_plus_adr(thread, in_bytes(JavaThread::is_in_vthread_transition_offset()));
+  Node* jt_addr = basic_plus_adr(top(), thread, in_bytes(JavaThread::is_in_vthread_transition_offset()));
   Node* vt_addr = basic_plus_adr(vt_oop, java_lang_Thread::is_in_vthread_transition_offset());
   access_store_at(nullptr, jt_addr, _gvn.type(jt_addr)->is_ptr(), ideal.ConI(1), TypeInt::BOOL, T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
   access_store_at(nullptr, vt_addr, _gvn.type(vt_addr)->is_ptr(), ideal.ConI(1), TypeInt::BOOL, T_BOOLEAN, IN_NATIVE | MO_UNORDERED);
@@ -3089,7 +3107,7 @@ bool LibraryCallKit::inline_native_vthread_end_transition(address funcAddr, cons
     ideal.sync_kit(this);
   } ideal.else_(); {
     Node* thread = ideal.thread();
-    Node* jt_addr = basic_plus_adr(thread, in_bytes(JavaThread::is_in_vthread_transition_offset()));
+    Node* jt_addr = basic_plus_adr(top(), thread, in_bytes(JavaThread::is_in_vthread_transition_offset()));
     Node* vt_addr = basic_plus_adr(vt_oop, java_lang_Thread::is_in_vthread_transition_offset());
 
     sync_kit(ideal);
@@ -3115,7 +3133,7 @@ bool LibraryCallKit::inline_native_notify_jvmti_sync() {
     // unconditionally update the is_disable_suspend bit in current JavaThread
     Node* thread = ideal.thread();
     Node* arg = _gvn.transform(argument(0)); // argument for notification
-    Node* addr = basic_plus_adr(thread, in_bytes(JavaThread::is_disable_suspend_offset()));
+    Node* addr = basic_plus_adr(top(), thread, in_bytes(JavaThread::is_disable_suspend_offset()));
     const TypePtr *addr_type = _gvn.type(addr)->isa_ptr();
 
     sync_kit(ideal);
@@ -3689,7 +3707,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
   IfNode* iff_thread_not_equal_carrierThread =
     create_and_map_if(control(), test_thread_not_equal_carrierThread, PROB_FAIR, COUNT_UNKNOWN);
 
-  Node* vthread_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_OFFSET_JFR));
+  Node* vthread_offset = basic_plus_adr(top(), jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_OFFSET_JFR));
 
   // False branch, is carrierThread.
   Node* thread_equal_carrierThread = _gvn.transform(new IfFalseNode(iff_thread_not_equal_carrierThread));
@@ -3714,7 +3732,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
   Node* tid = load_field_from_object(thread, "tid", "J");
 
   // Store the vthread tid to the jfr thread local.
-  Node* thread_id_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_ID_OFFSET_JFR));
+  Node* thread_id_offset = basic_plus_adr(top(), jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_ID_OFFSET_JFR));
   Node* tid_memory = store_to_memory(control(), thread_id_offset, tid, T_LONG, MemNode::unordered, true);
 
   // Branch is_excluded to conditionalize updating the epoch .
@@ -3736,7 +3754,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
   Node* epoch = _gvn.transform(new AndINode(epoch_raw, _gvn.transform(epoch_mask)));
 
   // Store the vthread epoch to the jfr thread local.
-  Node* vthread_epoch_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_EPOCH_OFFSET_JFR));
+  Node* vthread_epoch_offset = basic_plus_adr(top(), jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_EPOCH_OFFSET_JFR));
   Node* included_memory = store_to_memory(control(), vthread_epoch_offset, epoch, T_CHAR, MemNode::unordered, true);
 
   RegionNode* excluded_rgn = new RegionNode(PATH_LIMIT);
@@ -3759,7 +3777,7 @@ void LibraryCallKit::extend_setCurrentThread(Node* jt, Node* thread) {
   set_all_memory(excluded_mem);
 
   // Store the vthread exclusion state to the jfr thread local.
-  Node* thread_local_excluded_offset = basic_plus_adr(jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_EXCLUDED_OFFSET_JFR));
+  Node* thread_local_excluded_offset = basic_plus_adr(top(), jt, in_bytes(THREAD_LOCAL_OFFSET_JFR + VTHREAD_EXCLUDED_OFFSET_JFR));
   store_to_memory(control(), thread_local_excluded_offset, _gvn.transform(exclusion), T_BOOLEAN, MemNode::unordered, true);
 
   // Store release
@@ -3814,7 +3832,7 @@ bool LibraryCallKit::inline_native_setCurrentThread() {
 
   // Change the _monitor_owner_id of the JavaThread
   Node* tid = load_field_from_object(arr, "tid", "J");
-  Node* monitor_owner_id_offset = basic_plus_adr(thread, in_bytes(JavaThread::monitor_owner_id_offset()));
+  Node* monitor_owner_id_offset = basic_plus_adr(top(), thread, in_bytes(JavaThread::monitor_owner_id_offset()));
   store_to_memory(control(), monitor_owner_id_offset, tid, T_LONG, MemNode::unordered, true);
 
   JFR_ONLY(extend_setCurrentThread(thread, arr);)
@@ -3956,7 +3974,7 @@ bool LibraryCallKit::inline_native_Continuation_pinning(bool unpin) {
 //---------------------------load_mirror_from_klass----------------------------
 // Given a klass oop, load its java mirror (a java.lang.Class oop).
 Node* LibraryCallKit::load_mirror_from_klass(Node* klass) {
-  Node* p = basic_plus_adr(klass, in_bytes(Klass::java_mirror_offset()));
+  Node* p = basic_plus_adr(top(), klass, in_bytes(Klass::java_mirror_offset()));
   Node* load = make_load(nullptr, p, TypeRawPtr::NOTNULL, T_ADDRESS, MemNode::unordered);
   // mirror = ((OopHandle)mirror)->resolve();
   return access_load(load, TypeInstPtr::MIRROR, T_OBJECT, IN_NATIVE);
@@ -3996,7 +4014,7 @@ Node* LibraryCallKit::generate_klass_flags_guard(Node* kls, int modifier_mask, i
                                                  ByteSize offset, const Type* type, BasicType bt) {
   // Branch around if the given klass has the given modifier bit set.
   // Like generate_guard, adds a new path onto the region.
-  Node* modp = basic_plus_adr(kls, in_bytes(offset));
+  Node* modp = basic_plus_adr(top(), kls, in_bytes(offset));
   Node* mods = make_load(nullptr, modp, type, bt, MemNode::unordered);
   Node* mask = intcon(modifier_mask);
   Node* bits = intcon(modifier_bits);
@@ -4130,7 +4148,7 @@ bool LibraryCallKit::inline_native_Class_query(vmIntrinsics::ID id) {
       phi->add_req(null());
     }
     // If we fall through, it's a plain class.  Get its _super.
-    p = basic_plus_adr(kls, in_bytes(Klass::super_offset()));
+    p = basic_plus_adr(top(), kls, in_bytes(Klass::super_offset()));
     kls = _gvn.transform(LoadKlassNode::make(_gvn, immutable_memory(), p, TypeRawPtr::BOTTOM, TypeInstKlassPtr::OBJECT_OR_NULL));
     null_ctl = top();
     kls = null_check_oop(kls, &null_ctl);
@@ -4668,7 +4686,7 @@ Node* LibraryCallKit::generate_virtual_guard(Node* obj_klass,
   int entry_offset  = in_bytes(Klass::vtable_start_offset()) +
                      vtable_index*vtableEntry::size_in_bytes() +
                      in_bytes(vtableEntry::method_offset());
-  Node* entry_addr  = basic_plus_adr(obj_klass, entry_offset);
+  Node* entry_addr  = basic_plus_adr(top(), obj_klass, entry_offset);
   Node* target_call = make_load(nullptr, entry_addr, TypePtr::NOTNULL, T_ADDRESS, MemNode::unordered);
 
   // Compare the target method with the expected method (e.g., Object.hashCode).
@@ -6171,6 +6189,9 @@ CallStaticJavaNode* LibraryCallKit::get_uncommon_trap_from_success_proj(Node* no
 }
 
 //-------------inline_encodeISOArray-----------------------------------
+// int sun.nio.cs.ISO_8859_1.Encoder#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
+// int java.lang.StringCoding#encodeISOArray0(byte[] sa, int sp, byte[] da, int dp, int len)
+// int java.lang.StringCoding#encodeAsciiArray0(char[] sa, int sp, byte[] da, int dp, int len)
 // encode char[] to byte[] in ISO_8859_1 or ASCII
 bool LibraryCallKit::inline_encodeISOArray(bool ascii) {
   assert(callee()->signature()->size() == 5, "encodeISOArray has 5 parameters");
@@ -6181,8 +6202,12 @@ bool LibraryCallKit::inline_encodeISOArray(bool ascii) {
   Node *dst_offset  = argument(3);
   Node *length      = argument(4);
 
+  // Cast source & target arrays to not-null
   src = must_be_not_null(src, true);
   dst = must_be_not_null(dst, true);
+  if (stopped()) {
+    return true;
+  }
 
   const TypeAryPtr* src_type = src->Value(&_gvn)->isa_aryptr();
   const TypeAryPtr* dst_type = dst->Value(&_gvn)->isa_aryptr();
@@ -6199,6 +6224,13 @@ bool LibraryCallKit::inline_encodeISOArray(bool ascii) {
     return false;
   }
 
+  // Check source & target bounds
+  generate_string_range_check(src, src_offset, length, src_elem == T_BYTE, true);
+  generate_string_range_check(dst, dst_offset, length, false, true);
+  if (stopped()) {
+    return true;
+  }
+
   Node* src_start = array_element_address(src, src_offset, T_CHAR);
   Node* dst_start = array_element_address(dst, dst_offset, dst_elem);
   // 'src_start' points to src array + scaled offset
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 00ba4c795f1..56141be2362 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,12 +158,15 @@ class LibraryCallKit : public GraphKit {
   Node* generate_fair_guard(Node* test, RegionNode* region);
   Node* generate_negative_guard(Node* index, RegionNode* region,
                                 // resulting CastII of index:
-                                Node* *pos_index = nullptr);
+                                Node** pos_index = nullptr,
+                                bool with_opaque = false);
   Node* generate_limit_guard(Node* offset, Node* subseq_length,
                              Node* array_length,
-                             RegionNode* region);
+                             RegionNode* region,
+                             bool with_opaque = false);
   void  generate_string_range_check(Node* array, Node* offset,
-                                    Node* length, bool char_count);
+                                    Node* length, bool char_count,
+                                    bool halt_on_oob = false);
   Node* current_thread_helper(Node* &tls_output, ByteSize handle_offset,
                               bool is_immutable);
   Node* generate_current_thread(Node* &tls_output);
diff --git a/src/hotspot/share/opto/locknode.hpp b/src/hotspot/share/opto/locknode.hpp
index ee54e893e59..7d1507ae998 100644
--- a/src/hotspot/share/opto/locknode.hpp
+++ b/src/hotspot/share/opto/locknode.hpp
@@ -147,6 +147,9 @@ public:
   virtual int Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const { return TypeInt::CC; }
   const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;}
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 
@@ -169,6 +172,8 @@ public:
   virtual const Type* Value(PhaseGVN* phase) const { return TypeInt::CC; }
   const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;}
 
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 #endif // SHARE_OPTO_LOCKNODE_HPP
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index 61a7ed29c3e..be099747fc0 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -334,7 +334,7 @@ class Invariance : public StackObj {
           // loop, it was marked invariant but n is only invariant if
           // it depends only on that test. Otherwise, unless that test
           // is out of the loop, it's not invariant.
-          if (n->is_CFG() || (n->depends_only_on_test() && _phase->igvn().no_dependent_zero_check(n)) || n->in(0) == nullptr || !_phase->is_member(_lpt, n->in(0))) {
+          if (n->is_CFG() || n->in(0) == nullptr || n->depends_only_on_test() || !_phase->is_member(_lpt, n->in(0))) {
             _invariant.set(n->_idx); // I am a invariant too
           }
         }
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index fdb3ab89b82..4e221a9a0ef 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1234,7 +1234,7 @@ bool IdealLoopTree::policy_range_check(PhaseIdealLoop* phase, bool provisional,
         continue;
       }
       if (!bol->is_Bool()) {
-        assert(bol->is_OpaqueNotNull() ||
+        assert(bol->is_OpaqueConstantBool() ||
                bol->is_OpaqueTemplateAssertionPredicate() ||
                bol->is_OpaqueInitializedAssertionPredicate() ||
                bol->is_OpaqueMultiversioning(),
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index dacc1a1a734..d68505836d4 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -590,7 +590,7 @@ Node* PhaseIdealLoop::loop_nest_replace_iv(Node* iv_to_replace, Node* inner_iv,
 // Add a Parse Predicate with an uncommon trap on the failing/false path. Normal control will continue on the true path.
 void PhaseIdealLoop::add_parse_predicate(Deoptimization::DeoptReason reason, Node* inner_head, IdealLoopTree* loop,
                                          SafePointNode* sfpt) {
-  if (!C->too_many_traps(reason)) {
+  if (!C->too_many_traps(sfpt->jvms()->method(), sfpt->jvms()->bci(), reason)) {
     ParsePredicateNode* parse_predicate = new ParsePredicateNode(inner_head->in(LoopNode::EntryControl), reason, &_igvn);
     register_control(parse_predicate, loop, inner_head->in(LoopNode::EntryControl));
     Node* if_false = new IfFalseNode(parse_predicate);
@@ -760,6 +760,24 @@ SafePointNode* PhaseIdealLoop::find_safepoint(Node* back_control, Node* x, Ideal
   return safepoint;
 }
 
+void PhaseIdealLoop::add_parse_predicates(IdealLoopTree* outer_ilt, LoopNode* inner_head, SafePointNode* cloned_sfpt) {
+  if (ShortRunningLongLoop) {
+    add_parse_predicate(Deoptimization::Reason_short_running_long_loop, inner_head, outer_ilt, cloned_sfpt);
+  }
+  if (UseLoopPredicate) {
+    add_parse_predicate(Deoptimization::Reason_predicate, inner_head, outer_ilt, cloned_sfpt);
+    if (UseProfiledLoopPredicate) {
+      add_parse_predicate(Deoptimization::Reason_profile_predicate, inner_head, outer_ilt, cloned_sfpt);
+    }
+  }
+
+  if (UseAutoVectorizationPredicate) {
+    add_parse_predicate(Deoptimization::Reason_auto_vectorization_check, inner_head, outer_ilt, cloned_sfpt);
+  }
+
+  add_parse_predicate(Deoptimization::Reason_loop_limit_check, inner_head, outer_ilt, cloned_sfpt);
+}
+
 // If the loop has the shape of a counted loop but with a long
 // induction variable, transform the loop in a loop nest: an inner
 // loop that iterates for at most max int iterations with an integer
@@ -979,9 +997,9 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
 
   Node* inner_iters_max = nullptr;
   if (stride_con > 0) {
-    inner_iters_max = MaxNode::max_diff_with_zero(limit, outer_phi, TypeInteger::bottom(bt), _igvn);
+    inner_iters_max = MinMaxNode::max_diff_with_zero(limit, outer_phi, TypeInteger::bottom(bt), _igvn);
   } else {
-    inner_iters_max = MaxNode::max_diff_with_zero(outer_phi, limit, TypeInteger::bottom(bt), _igvn);
+    inner_iters_max = MinMaxNode::max_diff_with_zero(outer_phi, limit, TypeInteger::bottom(bt), _igvn);
   }
 
   Node* inner_iters_limit = _igvn.integercon(iters_limit, bt);
@@ -989,7 +1007,7 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
   // Long.MIN_VALUE to Long.MAX_VALUE for instance). Use an unsigned
   // min.
   const TypeInteger* inner_iters_actual_range = TypeInteger::make(0, iters_limit, Type::WidenMin, bt);
-  Node* inner_iters_actual = MaxNode::unsigned_min(inner_iters_max, inner_iters_limit, inner_iters_actual_range, _igvn);
+  Node* inner_iters_actual = MinMaxNode::unsigned_min(inner_iters_max, inner_iters_limit, inner_iters_actual_range, _igvn);
 
   Node* inner_iters_actual_int;
   if (bt == T_LONG) {
@@ -1123,26 +1141,7 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
   if (safepoint != nullptr) {
     SafePointNode* cloned_sfpt = old_new[safepoint->_idx]->as_SafePoint();
 
-    if (ShortRunningLongLoop) {
-      add_parse_predicate(Deoptimization::Reason_short_running_long_loop, inner_head, outer_ilt, cloned_sfpt);
-    }
-    if (UseLoopPredicate) {
-      add_parse_predicate(Deoptimization::Reason_predicate, inner_head, outer_ilt, cloned_sfpt);
-      if (UseProfiledLoopPredicate) {
-        add_parse_predicate(Deoptimization::Reason_profile_predicate, inner_head, outer_ilt, cloned_sfpt);
-      }
-    }
-
-    if (UseAutoVectorizationPredicate) {
-      // We only want to use the auto-vectorization check as a trap once per bci. And
-      // PhaseIdealLoop::add_parse_predicate only checks trap limits per method, so
-      // we do a custom check here.
-      if (!C->too_many_traps(cloned_sfpt->jvms()->method(), cloned_sfpt->jvms()->bci(), Deoptimization::Reason_auto_vectorization_check)) {
-        add_parse_predicate(Deoptimization::Reason_auto_vectorization_check, inner_head, outer_ilt, cloned_sfpt);
-      }
-    }
-
-    add_parse_predicate(Deoptimization::Reason_loop_limit_check, inner_head, outer_ilt, cloned_sfpt);
+    add_parse_predicates(outer_ilt, inner_head, cloned_sfpt);
   }
 
 #ifndef PRODUCT
@@ -1618,7 +1617,7 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
       Node* max_jint_plus_one_long = longcon((jlong)max_jint + 1);
       Node* max_range = new AddLNode(max_jint_plus_one_long, L);
       register_new_node(max_range, entry_control);
-      R = MaxNode::unsigned_min(R, max_range, TypeLong::POS, _igvn);
+      R = MinMaxNode::unsigned_min(R, max_range, TypeLong::POS, _igvn);
       set_subtree_ctrl(R, true);
     }
 
@@ -1717,9 +1716,9 @@ void PhaseIdealLoop::transform_long_range_checks(int stride_con, const Node_List
 }
 
 Node* PhaseIdealLoop::clamp(Node* R, Node* L, Node* H) {
-  Node* min = MaxNode::signed_min(R, H, TypeLong::LONG, _igvn);
+  Node* min = MinMaxNode::signed_min(R, H, TypeLong::LONG, _igvn);
   set_subtree_ctrl(min, true);
-  Node* max = MaxNode::signed_max(L, min, TypeLong::LONG, _igvn);
+  Node* max = MinMaxNode::signed_max(L, min, TypeLong::LONG, _igvn);
   set_subtree_ctrl(max, true);
   return max;
 }
@@ -1893,7 +1892,7 @@ bool PhaseIdealLoop::convert_to_long_loop(Node* cmp, Node* phi, IdealLoopTree* l
 #endif
 
 //------------------------------is_counted_loop--------------------------------
-bool PhaseIdealLoop::is_counted_loop(Node* x, IdealLoopTree*&loop, BasicType iv_bt) {
+bool PhaseIdealLoop::is_counted_loop(Node* x, IdealLoopTree*& loop, BasicType iv_bt) {
   PhaseGVN *gvn = &_igvn;
 
   Node* back_control = loop_exit_control(x, loop);
@@ -3485,14 +3484,14 @@ void OuterStripMinedLoopNode::adjust_strip_mined_loop(PhaseIterGVN* igvn) {
     // the loop body to be run for LoopStripMiningIter.
     Node* max = nullptr;
     if (stride > 0) {
-      max = MaxNode::max_diff_with_zero(limit, iv_phi, TypeInt::INT, *igvn);
+      max = MinMaxNode::max_diff_with_zero(limit, iv_phi, TypeInt::INT, *igvn);
     } else {
-      max = MaxNode::max_diff_with_zero(iv_phi, limit, TypeInt::INT, *igvn);
+      max = MinMaxNode::max_diff_with_zero(iv_phi, limit, TypeInt::INT, *igvn);
     }
     // sub is positive and can be larger than the max signed int
     // value. Use an unsigned min.
     Node* const_iters = igvn->intcon(scaled_iters);
-    Node* min = MaxNode::unsigned_min(max, const_iters, TypeInt::make(0, scaled_iters, Type::WidenMin), *igvn);
+    Node* min = MinMaxNode::unsigned_min(max, const_iters, TypeInt::make(0, scaled_iters, Type::WidenMin), *igvn);
     // min is the number of iterations for the next inner loop execution:
     // unsigned_min(max(limit - iv_phi, 0), scaled_iters) if stride > 0
     // unsigned_min(max(iv_phi - limit, 0), scaled_iters) if stride < 0
@@ -3528,7 +3527,6 @@ void OuterStripMinedLoopNode::transform_to_counted_loop(PhaseIterGVN* igvn, Phas
   CountedLoopEndNode* cle = inner_cl->loopexit();
   Node* inner_test = cle->in(1);
   IfNode* outer_le = outer_loop_end();
-  CountedLoopEndNode* inner_cle = inner_cl->loopexit();
   Node* safepoint = outer_safepoint();
 
   fix_sunk_stores_when_back_to_counted_loop(igvn, iloop);
@@ -3754,6 +3752,20 @@ void CountedLoopEndNode::dump_spec(outputStream *st) const {
 }
 #endif
 
+IdealLoopTree::IdealLoopTree(PhaseIdealLoop* phase, Node* head, Node* tail): _parent(nullptr), _next(nullptr), _child(nullptr),
+                                                                             _head(head), _tail(tail),
+                                                                             _phase(phase),
+                                                                             _local_loop_unroll_limit(0), _local_loop_unroll_factor(0),
+                                                                             _body(phase->arena()),
+                                                                             _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0),
+                                                                             _has_range_checks(0), _has_range_checks_computed(0),
+                                                                             _safepts(nullptr),
+                                                                             _required_safept(nullptr),
+                                                                             _allow_optimizations(true) {
+  precond(_head != nullptr);
+  precond(_tail != nullptr);
+}
+
 //=============================================================================
 //------------------------------is_member--------------------------------------
 // Is 'l' a member of 'this'?
@@ -5091,8 +5103,8 @@ void PhaseIdealLoop::build_and_optimize() {
   // Since nodes do not have a slot for immediate dominator, make
   // a persistent side array for that info indexed on node->_idx.
   _idom_size = C->unique();
-  _idom      = NEW_RESOURCE_ARRAY( Node*, _idom_size );
-  _dom_depth = NEW_RESOURCE_ARRAY( uint,  _idom_size );
+  _idom      = NEW_ARENA_ARRAY(&_arena, Node*, _idom_size);
+  _dom_depth = NEW_ARENA_ARRAY(&_arena, uint,  _idom_size);
   _dom_stk   = nullptr; // Allocated on demand in recompute_dom_depth
   memset( _dom_depth, 0, _idom_size * sizeof(uint) );
 
@@ -5693,8 +5705,8 @@ void PhaseIdealLoop::set_idom(Node* d, Node* n, uint dom_depth) {
   uint idx = d->_idx;
   if (idx >= _idom_size) {
     uint newsize = next_power_of_2(idx);
-    _idom      = REALLOC_RESOURCE_ARRAY( Node*,     _idom,_idom_size,newsize);
-    _dom_depth = REALLOC_RESOURCE_ARRAY( uint, _dom_depth,_idom_size,newsize);
+    _idom      = REALLOC_ARENA_ARRAY(&_arena, Node*,     _idom,_idom_size,newsize);
+    _dom_depth = REALLOC_ARENA_ARRAY(&_arena,  uint, _dom_depth,_idom_size,newsize);
     memset( _dom_depth + _idom_size, 0, (newsize - _idom_size) * sizeof(uint) );
     _idom_size = newsize;
   }
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index ffc283ac941..986cfdaa3f1 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -669,21 +669,7 @@ public:
   Node_List* _required_safept;  // A inner loop cannot delete these safepts;
   bool  _allow_optimizations;   // Allow loop optimizations
 
-  IdealLoopTree( PhaseIdealLoop* phase, Node *head, Node *tail )
-    : _parent(nullptr), _next(nullptr), _child(nullptr),
-      _head(head), _tail(tail),
-      _phase(phase),
-      _local_loop_unroll_limit(0), _local_loop_unroll_factor(0),
-      _body(Compile::current()->comp_arena()),
-      _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0),
-      _has_range_checks(0), _has_range_checks_computed(0),
-      _safepts(nullptr),
-      _required_safept(nullptr),
-      _allow_optimizations(true)
-  {
-    precond(_head != nullptr);
-    precond(_tail != nullptr);
-  }
+  IdealLoopTree(PhaseIdealLoop* phase, Node* head, Node* tail);
 
   // Is 'l' a member of 'this'?
   bool is_member(const IdealLoopTree *l) const; // Test for nested membership
@@ -889,6 +875,8 @@ class PhaseIdealLoop : public PhaseTransform {
   friend class ShenandoahBarrierC2Support;
   friend class AutoNodeBudget;
 
+  Arena _arena; // For data whose lifetime is a single pass of loop optimizations
+
   // Map loop membership for CFG nodes, and ctrl for non-CFG nodes.
   //
   // Exception: dead CFG nodes may instead have a ctrl/idom forwarding
@@ -1049,6 +1037,8 @@ public:
 
   PhaseIterGVN &igvn() const { return _igvn; }
 
+  Arena* arena() { return &_arena; };
+
   bool has_node(const Node* n) const {
     guarantee(n != nullptr, "No Node.");
     return _loop_or_ctrl[n->_idx] != nullptr;
@@ -1223,7 +1213,8 @@ private:
   // Compute the Ideal Node to Loop mapping
   PhaseIdealLoop(PhaseIterGVN& igvn, LoopOptsMode mode) :
     PhaseTransform(Ideal_Loop),
-    _loop_or_ctrl(igvn.C->comp_arena()),
+    _arena(mtCompiler, Arena::Tag::tag_idealloop),
+    _loop_or_ctrl(&_arena),
     _igvn(igvn),
     _verify_me(nullptr),
     _verify_only(false),
@@ -1238,7 +1229,8 @@ private:
   // or only verify that the graph is valid if verify_me is null.
   PhaseIdealLoop(PhaseIterGVN& igvn, const PhaseIdealLoop* verify_me = nullptr) :
     PhaseTransform(Ideal_Loop),
-    _loop_or_ctrl(igvn.C->comp_arena()),
+    _arena(mtCompiler, Arena::Tag::tag_idealloop),
+    _loop_or_ctrl(&_arena),
     _igvn(igvn),
     _verify_me(verify_me),
     _verify_only(verify_me == nullptr),
@@ -1368,6 +1360,9 @@ public:
 #endif
   void add_parse_predicate(Deoptimization::DeoptReason reason, Node* inner_head, IdealLoopTree* loop, SafePointNode* sfpt);
   SafePointNode* find_safepoint(Node* back_control, Node* x, IdealLoopTree* loop);
+
+  void add_parse_predicates(IdealLoopTree* outer_ilt, LoopNode* inner_head, SafePointNode* cloned_sfpt);
+
   IdealLoopTree* insert_outer_loop(IdealLoopTree* loop, LoopNode* outer_l, Node* outer_ift);
   IdealLoopTree* create_outer_strip_mined_loop(Node* init_control,
                                                IdealLoopTree* loop, float cl_prob, float le_fcnt,
@@ -1681,8 +1676,8 @@ public:
   Node *has_local_phi_input( Node *n );
   // Mark an IfNode as being dominated by a prior test,
   // without actually altering the CFG (and hence IDOM info).
-  void dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip = false, bool pin_array_access_nodes = false);
-  void rewire_safe_outputs_to_dominator(Node* source, Node* dominator, bool pin_array_access_nodes);
+  void dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip = false, bool prev_dom_not_imply_this = false);
+  void rewire_safe_outputs_to_dominator(Node* source, Node* dominator, bool dominator_not_imply_source);
 
   // Split Node 'n' through merge point
   RegionNode* split_thru_region(Node* n, RegionNode* region);
@@ -1965,7 +1960,7 @@ public:
 
   bool can_move_to_inner_loop(Node* n, LoopNode* n_loop, Node* x);
 
-  void pin_array_access_nodes_dependent_on(Node* ctrl);
+  void pin_nodes_dependent_on(Node* ctrl, bool old_iff_is_rangecheck);
 
   Node* ensure_node_and_inputs_are_above_pre_end(CountedLoopEndNode* pre_end, Node* node);
 
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 9e3d4681e7c..862cb7067ec 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -345,7 +345,7 @@ bool PhaseIdealLoop::loop_phi_backedge_type_contains_zero(const Node* phi_diviso
 // Replace the dominated test with an obvious true or false.  Place it on the
 // IGVN worklist for later cleanup.  Move control-dependent data Nodes on the
 // live path up to the dominating control.
-void PhaseIdealLoop::dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip, bool pin_array_access_nodes) {
+void PhaseIdealLoop::dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip, bool prevdom_not_imply_this) {
   if (VerifyLoopOptimizations && PrintOpto) { tty->print_cr("dominating test"); }
 
   // prevdom is the dominating projection of the dominating test.
@@ -386,26 +386,25 @@ void PhaseIdealLoop::dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip, b
     return;
   }
 
-  rewire_safe_outputs_to_dominator(dp, prevdom, pin_array_access_nodes);
+  rewire_safe_outputs_to_dominator(dp, prevdom, prevdom_not_imply_this);
 }
 
-void PhaseIdealLoop::rewire_safe_outputs_to_dominator(Node* source, Node* dominator, const bool pin_array_access_nodes) {
+void PhaseIdealLoop::rewire_safe_outputs_to_dominator(Node* source, Node* dominator, const bool dominator_not_imply_source) {
   IdealLoopTree* old_loop = get_loop(source);
 
   for (DUIterator_Fast imax, i = source->fast_outs(imax); i < imax; i++) {
     Node* out = source->fast_out(i); // Control-dependent node
-    // Do not rewire Div and Mod nodes which could have a zero divisor to avoid skipping their zero check.
-    if (out->depends_only_on_test() && _igvn.no_dependent_zero_check(out)) {
+    if (out->depends_only_on_test()) {
       assert(out->in(0) == source, "must be control dependent on source");
       _igvn.replace_input_of(out, 0, dominator);
-      if (pin_array_access_nodes) {
+      if (dominator_not_imply_source) {
         // Because of Loop Predication, Loads and range check Cast nodes that are control dependent on this range
         // check (that is about to be removed) now depend on multiple dominating Hoisted Check Predicates. After the
         // removal of this range check, these control dependent nodes end up at the lowest/nearest dominating predicate
         // in the graph. To ensure that these Loads/Casts do not float above any of the dominating checks (even when the
         // lowest dominating check is later replaced by yet another dominating check), we need to pin them at the lowest
         // dominating check.
-        Node* clone = out->pin_array_access_node();
+        Node* clone = out->pin_node_under_control();
         if (clone != nullptr) {
           clone = _igvn.register_new_node_with_optimizer(clone, out);
           _igvn.replace_node(out, clone);
@@ -1644,7 +1643,7 @@ bool PhaseIdealLoop::try_merge_identical_ifs(Node* n) {
 void PhaseIdealLoop::push_pinned_nodes_thru_region(IfNode* dom_if, Node* region) {
   for (DUIterator i = region->outs(); region->has_out(i); i++) {
     Node* u = region->out(i);
-    if (!has_ctrl(u) || u->is_Phi() || !u->depends_only_on_test() || !_igvn.no_dependent_zero_check(u)) {
+    if (!has_ctrl(u) || u->is_Phi() || !u->depends_only_on_test()) {
       continue;
     }
     assert(u->in(0) == region, "not a control dependent node?");
@@ -1704,7 +1703,7 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
       !n->is_Proj() &&
       !n->is_MergeMem() &&
       !n->is_CMove() &&
-      !n->is_OpaqueNotNull() &&
+      !n->is_OpaqueConstantBool() &&
       !n->is_OpaqueInitializedAssertionPredicate() &&
       !n->is_OpaqueTemplateAssertionPredicate() &&
       !is_raw_to_oop_cast && // don't extend live ranges of raw oops
@@ -1724,11 +1723,11 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
         Node* outside_ctrl = place_outside_loop(n_ctrl, loop_ctrl);
         if (!would_sink_below_pre_loop_exit(loop_ctrl, outside_ctrl)) {
           if (n->depends_only_on_test()) {
-            Node* pinned_clone = n->pin_array_access_node();
+            // If this node depends_only_on_test, it will be rewired to a control input that is not
+            // the correct test. As a result, it must be pinned otherwise it can be incorrectly
+            // rewired to a dominating test equivalent to the new control.
+            Node* pinned_clone = n->pin_node_under_control();
             if (pinned_clone != nullptr) {
-              // Pin array access nodes: if this is an array load, it's going to be dependent on a condition that's not a
-              // range check for that access. If that condition is replaced by an identical dominating one, then an
-              // unpinned load would risk floating above its range check.
               register_new_node(pinned_clone, n_ctrl);
               maybe_pinned_n = pinned_clone;
               _igvn.replace_node(n, pinned_clone);
@@ -1754,11 +1753,11 @@ void PhaseIdealLoop::try_sink_out_of_loop(Node* n) {
           Node* u = n->last_out(j); // Clone private computation per use
           _igvn.rehash_node_delayed(u);
           Node* x = nullptr;
-          if (n->depends_only_on_test()) {
-            // Pin array access nodes: if this is an array load, it's going to be dependent on a condition that's not a
-            // range check for that access. If that condition is replaced by an identical dominating one, then an
-            // unpinned load would risk floating above its range check.
-            x = n->pin_array_access_node();
+          if (n->in(0) != nullptr && n->depends_only_on_test()) {
+            // If this node depends_only_on_test, it will be rewired to a control input that is not
+            // the correct test. As a result, it must be pinned otherwise it can be incorrectly
+            // rewired to a dominating test equivalent to the new control.
+            x = n->pin_node_under_control();
           }
           if (x == nullptr) {
             x = n->clone();
@@ -1922,11 +1921,6 @@ bool PhaseIdealLoop::ctrl_of_all_uses_out_of_loop(const Node* n, Node* n_ctrl, I
     if (u->is_Opaque1()) {
       return false;  // Found loop limit, bugfix for 4677003
     }
-    // We can't reuse tags in PhaseIdealLoop::dom_lca_for_get_late_ctrl_internal() so make sure calls to
-    // get_late_ctrl_with_anti_dep() use their own tag
-    _dom_lca_tags_round++;
-    assert(_dom_lca_tags_round != 0, "shouldn't wrap around");
-
     if (u->is_Phi()) {
       for (uint j = 1; j < u->req(); ++j) {
         if (u->in(j) == n && !ctrl_of_use_out_of_loop(n, n_ctrl, n_loop, u->in(0)->in(j))) {
@@ -1960,6 +1954,11 @@ bool PhaseIdealLoop::would_sink_below_pre_loop_exit(IdealLoopTree* n_loop, Node*
 
 bool PhaseIdealLoop::ctrl_of_use_out_of_loop(const Node* n, Node* n_ctrl, IdealLoopTree* n_loop, Node* ctrl) {
   if (n->is_Load()) {
+    // We can't reuse tags in PhaseIdealLoop::dom_lca_for_get_late_ctrl_internal() so make sure each call to
+    // get_late_ctrl_with_anti_dep() uses its own tag
+    _dom_lca_tags_round++;
+    assert(_dom_lca_tags_round != 0, "shouldn't wrap around");
+
     ctrl = get_late_ctrl_with_anti_dep(n->as_Load(), n_ctrl, ctrl);
   }
   IdealLoopTree *u_loop = get_loop(ctrl);
@@ -2045,14 +2044,14 @@ Node* PhaseIdealLoop::clone_iff(PhiNode* phi) {
     if (b->is_Phi()) {
       _igvn.replace_input_of(phi, i, clone_iff(b->as_Phi()));
     } else {
-      assert(b->is_Bool() || b->is_OpaqueNotNull() || b->is_OpaqueInitializedAssertionPredicate(),
-             "bool, non-null check with OpaqueNotNull or Initialized Assertion Predicate with its Opaque node");
+      assert(b->is_Bool() || b->is_OpaqueConstantBool() || b->is_OpaqueInitializedAssertionPredicate(),
+             "bool, non-null check with OpaqueConstantBool or Initialized Assertion Predicate with its Opaque node");
     }
   }
   Node* n = phi->in(1);
   Node* sample_opaque = nullptr;
   Node *sample_bool = nullptr;
-  if (n->is_OpaqueNotNull() || n->is_OpaqueInitializedAssertionPredicate()) {
+  if (n->is_OpaqueConstantBool() || n->is_OpaqueInitializedAssertionPredicate()) {
     sample_opaque = n;
     sample_bool = n->in(1);
     assert(sample_bool->is_Bool(), "wrong type");
@@ -2228,7 +2227,7 @@ void PhaseIdealLoop::clone_loop_handle_data_uses(Node* old, Node_List &old_new,
       // split if to break.
       assert(!use->is_OpaqueTemplateAssertionPredicate(),
              "should not clone a Template Assertion Predicate which should be removed once it's useless");
-      if (use->is_If() || use->is_CMove() || use->is_OpaqueNotNull() || use->is_OpaqueInitializedAssertionPredicate() ||
+      if (use->is_If() || use->is_CMove() || use->is_OpaqueConstantBool() || use->is_OpaqueInitializedAssertionPredicate() ||
           (use->Opcode() == Op_AllocateArray && use->in(AllocateNode::ValidLengthTest) == old)) {
         // Since this code is highly unlikely, we lazily build the worklist
         // of such Nodes to go split.
@@ -2328,14 +2327,12 @@ void PhaseIdealLoop::clone_loop_handle_data_uses(Node* old, Node_List &old_new,
       // We notify all uses of old, including use, and the indirect uses,
       // that may now be optimized because we have replaced old with phi.
       _igvn.add_users_to_worklist(old);
-      if (idx == 0 &&
-          use->depends_only_on_test()) {
-        Node* pinned_clone = use->pin_array_access_node();
+      if (idx == 0 && use->depends_only_on_test()) {
+        // If this node depends_only_on_test, it will be rewired to a control input that is not the
+        // correct test. As a result, it must be pinned otherwise it can be incorrectly rewired to
+        // a dominating test equivalent to the new control.
+        Node* pinned_clone = use->pin_node_under_control();
         if (pinned_clone != nullptr) {
-          // Pin array access nodes: control is updated here to a region. If, after some transformations, only one path
-          // into the region is left, an array load could become dependent on a condition that's not a range check for
-          // that access. If that condition is replaced by an identical dominating one, then an unpinned load would risk
-          // floating above its range check.
           pinned_clone->set_req(0, phi);
           register_new_node_with_ctrl_of(pinned_clone, use);
           _igvn.replace_node(use, pinned_clone);
@@ -4102,11 +4099,9 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
         not_peel.test(n->_idx) && peel.test(n->in(0)->_idx)) {
       Node* n_clone = old_new[n->_idx];
       if (n_clone->depends_only_on_test()) {
-        // Pin array access nodes: control is updated here to the loop head. If, after some transformations, the
-        // backedge is removed, an array load could become dependent on a condition that's not a range check for that
-        // access. If that condition is replaced by an identical dominating one, then an unpinned load would risk
-        // floating above its range check.
-        Node* pinned_clone = n_clone->pin_array_access_node();
+        // If this node depends_only_on_test, it will be rewire to the loop head, which is not the
+        // correct test
+        Node* pinned_clone = n_clone->pin_node_under_control();
         if (pinned_clone != nullptr) {
           register_new_node_with_ctrl_of(pinned_clone, n_clone);
           old_new.map(n->_idx, pinned_clone);
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 80818a4ddc7..ef38a511a88 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1198,8 +1198,8 @@ bool PhaseMacroExpand::eliminate_boxing_node(CallStaticJavaNode *boxing) {
 }
 
 
-Node* PhaseMacroExpand::make_load(Node* ctl, Node* mem, Node* base, int offset, const Type* value_type, BasicType bt) {
-  Node* adr = basic_plus_adr(base, offset);
+Node* PhaseMacroExpand::make_load_raw(Node* ctl, Node* mem, Node* base, int offset, const Type* value_type, BasicType bt) {
+  Node* adr = basic_plus_adr(top(), base, offset);
   const TypePtr* adr_type = adr->bottom_type()->is_ptr();
   Node* value = LoadNode::make(_igvn, ctl, mem, adr, adr_type, value_type, bt, MemNode::unordered);
   transform_later(value);
@@ -1207,8 +1207,8 @@ Node* PhaseMacroExpand::make_load(Node* ctl, Node* mem, Node* base, int offset,
 }
 
 
-Node* PhaseMacroExpand::make_store(Node* ctl, Node* mem, Node* base, int offset, Node* value, BasicType bt) {
-  Node* adr = basic_plus_adr(base, offset);
+Node* PhaseMacroExpand::make_store_raw(Node* ctl, Node* mem, Node* base, int offset, Node* value, BasicType bt) {
+  Node* adr = basic_plus_adr(top(), base, offset);
   mem = StoreNode::make(_igvn, ctl, mem, adr, nullptr, value, bt, MemNode::unordered);
   transform_later(mem);
   return mem;
@@ -1753,20 +1753,20 @@ PhaseMacroExpand::initialize_object(AllocateNode* alloc,
                                     Node* size_in_bytes) {
   InitializeNode* init = alloc->initialization();
   // Store the klass & mark bits
-  Node* mark_node = alloc->make_ideal_mark(&_igvn, object, control, rawmem);
+  Node* mark_node = alloc->make_ideal_mark(&_igvn, control, rawmem);
   if (!mark_node->is_Con()) {
     transform_later(mark_node);
   }
-  rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, TypeX_X->basic_type());
+  rawmem = make_store_raw(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, TypeX_X->basic_type());
 
   if (!UseCompactObjectHeaders) {
-    rawmem = make_store(control, rawmem, object, oopDesc::klass_offset_in_bytes(), klass_node, T_METADATA);
+    rawmem = make_store_raw(control, rawmem, object, oopDesc::klass_offset_in_bytes(), klass_node, T_METADATA);
   }
   int header_size = alloc->minimum_header_size();  // conservatively small
 
   // Array length
   if (length != nullptr) {         // Arrays need length field
-    rawmem = make_store(control, rawmem, object, arrayOopDesc::length_offset_in_bytes(), length, T_INT);
+    rawmem = make_store_raw(control, rawmem, object, arrayOopDesc::length_offset_in_bytes(), length, T_INT);
     // conservatively small header size:
     header_size = arrayOopDesc::base_offset_in_bytes(T_BYTE);
     if (_igvn.type(klass_node)->isa_aryklassptr()) {   // we know the exact header size in most cases:
@@ -1792,6 +1792,7 @@ PhaseMacroExpand::initialize_object(AllocateNode* alloc,
     if (!(UseTLAB && ZeroTLAB)) {
       rawmem = ClearArrayNode::clear_memory(control, rawmem, object,
                                             header_size, size_in_bytes,
+                                            true,
                                             &_igvn);
     }
   } else {
@@ -1946,7 +1947,7 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
       uint step_size = AllocatePrefetchStepSize;
       uint distance = AllocatePrefetchDistance;
       for ( intx i = 0; i < lines; i++ ) {
-        prefetch_adr = new AddPNode( old_eden_top, new_eden_top,
+        prefetch_adr = new AddPNode( top(), new_eden_top,
                                             _igvn.MakeConX(distance) );
         transform_later(prefetch_adr);
         prefetch = new PrefetchAllocationNode( i_o, prefetch_adr );
@@ -2321,12 +2322,7 @@ void PhaseMacroExpand::expand_unlock_node(UnlockNode *unlock) {
   // No need for a null check on unlock
 
   // Make the merge point
-  Node *region;
-  Node *mem_phi;
-
-  region  = new RegionNode(3);
-  // create a Phi for the memory state
-  mem_phi = new PhiNode( region, Type::MEMORY, TypeRawPtr::BOTTOM);
+  Node* region = new RegionNode(3);
 
   FastUnlockNode *funlock = new FastUnlockNode( ctrl, obj, box );
   funlock = transform_later( funlock )->as_FastUnlock();
@@ -2355,12 +2351,15 @@ void PhaseMacroExpand::expand_unlock_node(UnlockNode *unlock) {
   transform_later(region);
   _igvn.replace_node(_callprojs.fallthrough_proj, region);
 
-  Node *memproj = transform_later(new ProjNode(call, TypeFunc::Memory) );
-  mem_phi->init_req(1, memproj );
-  mem_phi->init_req(2, mem);
-  transform_later(mem_phi);
-
-  _igvn.replace_node(_callprojs.fallthrough_memproj, mem_phi);
+  if (_callprojs.fallthrough_memproj != nullptr) {
+    // create a Phi for the memory state
+    Node* mem_phi = new PhiNode( region, Type::MEMORY, TypeRawPtr::BOTTOM);
+    Node* memproj = transform_later(new ProjNode(call, TypeFunc::Memory));
+    mem_phi->init_req(1, memproj);
+    mem_phi->init_req(2, mem);
+    transform_later(mem_phi);
+    _igvn.replace_node(_callprojs.fallthrough_memproj, mem_phi);
+  }
 }
 
 void PhaseMacroExpand::expand_subtypecheck_node(SubTypeCheckNode *check) {
@@ -2500,7 +2499,7 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
         assert(n->Opcode() == Op_LoopLimit ||
                n->Opcode() == Op_ModD ||
                n->Opcode() == Op_ModF ||
-               n->is_OpaqueNotNull()       ||
+               n->is_OpaqueConstantBool()    ||
                n->is_OpaqueInitializedAssertionPredicate() ||
                n->Opcode() == Op_MaxL      ||
                n->Opcode() == Op_MinL      ||
@@ -2548,14 +2547,14 @@ void PhaseMacroExpand::eliminate_opaque_looplimit_macro_nodes() {
       } else if (n->is_Opaque1()) {
         _igvn.replace_node(n, n->in(1));
         success = true;
-      } else if (n->is_OpaqueNotNull()) {
-        // Tests with OpaqueNotNull nodes are implicitly known to be true. Replace the node with true. In debug builds,
+      } else if (n->is_OpaqueConstantBool()) {
+        // Tests with OpaqueConstantBool nodes are implicitly known. Replace the node with true/false. In debug builds,
         // we leave the test in the graph to have an additional sanity check at runtime. If the test fails (i.e. a bug),
         // we will execute a Halt node.
 #ifdef ASSERT
         _igvn.replace_node(n, n->in(1));
 #else
-        _igvn.replace_node(n, _igvn.intcon(1));
+        _igvn.replace_node(n, _igvn.intcon(n->as_OpaqueConstantBool()->constant()));
 #endif
         success = true;
       } else if (n->is_OpaqueInitializedAssertionPredicate()) {
@@ -2577,11 +2576,11 @@ void PhaseMacroExpand::eliminate_opaque_looplimit_macro_nodes() {
         // a CMoveL construct now. At least until here, the type could be computed
         // precisely. CMoveL is not so smart, but we can give it at least the best
         // type we know abouot n now.
-        Node* repl = MaxNode::signed_max(n->in(1), n->in(2), _igvn.type(n), _igvn);
+        Node* repl = MinMaxNode::signed_max(n->in(1), n->in(2), _igvn.type(n), _igvn);
         _igvn.replace_node(n, repl);
         success = true;
       } else if (n->Opcode() == Op_MinL) {
-        Node* repl = MaxNode::signed_min(n->in(1), n->in(2), _igvn.type(n), _igvn);
+        Node* repl = MinMaxNode::signed_min(n->in(1), n->in(2), _igvn.type(n), _igvn);
         _igvn.replace_node(n, repl);
         success = true;
       }
diff --git a/src/hotspot/share/opto/macro.hpp b/src/hotspot/share/opto/macro.hpp
index c899bed567c..0f8d8fb5172 100644
--- a/src/hotspot/share/opto/macro.hpp
+++ b/src/hotspot/share/opto/macro.hpp
@@ -58,10 +58,10 @@ public:
     _igvn.register_new_node_with_optimizer(n);
     return n;
   }
-  Node* make_load( Node* ctl, Node* mem, Node* base, int offset,
-                   const Type* value_type, BasicType bt);
-  Node* make_store(Node* ctl, Node* mem, Node* base, int offset,
-                   Node* value, BasicType bt);
+  Node* make_load_raw(Node* ctl, Node* mem, Node* base, int offset,
+                      const Type* value_type, BasicType bt);
+  Node* make_store_raw(Node* ctl, Node* mem, Node* base, int offset,
+                       Node* value, BasicType bt);
 
   Node* make_leaf_call(Node* ctrl, Node* mem,
                        const TypeFunc* call_type, address call_addr,
@@ -144,11 +144,10 @@ private:
                             Node* slice_idx,
                             Node* slice_len,
                             Node* dest_size);
-  bool generate_block_arraycopy(Node** ctrl, MergeMemNode** mem, Node* io,
+  bool generate_block_arraycopy(Node** ctrl, MergeMemNode** mem,
                                 const TypePtr* adr_type,
                                 BasicType basic_elem_type,
-                                AllocateNode* alloc,
-                                Node* src,  Node* src_offset,
+                                Node* src, Node* src_offset,
                                 Node* dest, Node* dest_offset,
                                 Node* dest_size, bool dest_uninitialized);
   MergeMemNode* generate_slow_arraycopy(ArrayCopyNode *ac,
diff --git a/src/hotspot/share/opto/macroArrayCopy.cpp b/src/hotspot/share/opto/macroArrayCopy.cpp
index fb4a1842a36..0719ffc45a5 100644
--- a/src/hotspot/share/opto/macroArrayCopy.cpp
+++ b/src/hotspot/share/opto/macroArrayCopy.cpp
@@ -384,7 +384,6 @@ Node* PhaseMacroExpand::generate_arraycopy(ArrayCopyNode *ac, AllocateArrayNode*
     transform_later(slow_region);
   }
 
-  Node* original_dest = dest;
   bool  dest_needs_zeroing   = false;
   bool  acopy_to_uninitialized = false;
 
@@ -424,7 +423,6 @@ Node* PhaseMacroExpand::generate_arraycopy(ArrayCopyNode *ac, AllocateArrayNode*
     // No zeroing elimination needed here.
     alloc                  = nullptr;
     acopy_to_uninitialized = false;
-    //original_dest        = dest;
     //dest_needs_zeroing   = false;
   }
 
@@ -557,10 +555,9 @@ Node* PhaseMacroExpand::generate_arraycopy(ArrayCopyNode *ac, AllocateArrayNode*
         MergeMemNode* local_mem = MergeMemNode::make(mem);
         transform_later(local_mem);
 
-        didit = generate_block_arraycopy(&local_ctrl, &local_mem, local_io,
-                                         adr_type, basic_elem_type, alloc,
-                                         src, src_offset, dest, dest_offset,
-                                         dest_size, acopy_to_uninitialized);
+        didit = generate_block_arraycopy(&local_ctrl, &local_mem, adr_type,
+                                         basic_elem_type, src, src_offset,
+                                         dest, dest_offset, dest_size, acopy_to_uninitialized);
         if (didit) {
           // Present the results of the block-copying fast call.
           result_region->init_req(bcopy_path, local_ctrl);
@@ -641,7 +638,7 @@ Node* PhaseMacroExpand::generate_arraycopy(ArrayCopyNode *ac, AllocateArrayNode*
 
         // (At this point we can assume disjoint_bases, since types differ.)
         int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
-        Node* p1 = basic_plus_adr(dest_klass, ek_offset);
+        Node* p1 = basic_plus_adr(top(), dest_klass, ek_offset);
         Node* n1 = LoadKlassNode::make(_igvn, C->immutable_memory(), p1, TypeRawPtr::BOTTOM);
         Node* dest_elem_klass = transform_later(n1);
         Node* cv = generate_checkcast_arraycopy(&local_ctrl, &local_mem,
@@ -918,12 +915,12 @@ void PhaseMacroExpand::generate_clear_array(Node* ctrl, MergeMemNode* merge_mem,
   if (start_con >= 0 && end_con >= 0) {
     // Constant start and end.  Simple.
     mem = ClearArrayNode::clear_memory(ctrl, mem, dest,
-                                       start_con, end_con, &_igvn);
+                                       start_con, end_con, false, &_igvn);
   } else if (start_con >= 0 && dest_size != top()) {
     // Constant start, pre-rounded end after the tail of the array.
     Node* end = dest_size;
     mem = ClearArrayNode::clear_memory(ctrl, mem, dest,
-                                       start_con, end, &_igvn);
+                                       start_con, end, false, &_igvn);
   } else if (start_con >= 0 && slice_len != top()) {
     // Constant start, non-constant end.  End needs rounding up.
     // End offset = round_up(abase + ((slice_idx_con + slice_len) << scale), 8)
@@ -936,7 +933,7 @@ void PhaseMacroExpand::generate_clear_array(Node* ctrl, MergeMemNode* merge_mem,
     end = transform_later(new AddXNode(end, MakeConX(end_base)) );
     end = transform_later(new AndXNode(end, MakeConX(~end_round)) );
     mem = ClearArrayNode::clear_memory(ctrl, mem, dest,
-                                       start_con, end, &_igvn);
+                                       start_con, end, false, &_igvn);
   } else if (start_con < 0 && dest_size != top()) {
     // Non-constant start, pre-rounded end after the tail of the array.
     // This is almost certainly a "round-to-end" operation.
@@ -970,7 +967,7 @@ void PhaseMacroExpand::generate_clear_array(Node* ctrl, MergeMemNode* merge_mem,
     }
     Node* end = dest_size; // pre-rounded
     mem = ClearArrayNode::clear_memory(ctrl, mem, dest,
-                                       start, end, &_igvn);
+                                       start, end, false, &_igvn);
   } else {
     // Non-constant start, unrounded non-constant end.
     // (Nobody zeroes a random midsection of an array using this routine.)
@@ -981,11 +978,10 @@ void PhaseMacroExpand::generate_clear_array(Node* ctrl, MergeMemNode* merge_mem,
   merge_mem->set_memory_at(alias_idx, mem);
 }
 
-bool PhaseMacroExpand::generate_block_arraycopy(Node** ctrl, MergeMemNode** mem, Node* io,
+bool PhaseMacroExpand::generate_block_arraycopy(Node** ctrl, MergeMemNode** mem,
                                                 const TypePtr* adr_type,
                                                 BasicType basic_elem_type,
-                                                AllocateNode* alloc,
-                                                Node* src,  Node* src_offset,
+                                                Node* src, Node* src_offset,
                                                 Node* dest, Node* dest_offset,
                                                 Node* dest_size, bool dest_uninitialized) {
   // See if there is an advantage from block transfer.
@@ -1133,7 +1129,7 @@ Node* PhaseMacroExpand::generate_checkcast_arraycopy(Node** ctrl, MergeMemNode**
   // look in each non-null element's class, at the desired klass's
   // super_check_offset, for the desired klass.
   int sco_offset = in_bytes(Klass::super_check_offset_offset());
-  Node* p3 = basic_plus_adr(dest_elem_klass, sco_offset);
+  Node* p3 = basic_plus_adr(top(), dest_elem_klass, sco_offset);
   Node* n3 = new LoadINode(nullptr, *mem /*memory(p3)*/, p3, _igvn.type(p3)->is_ptr(), TypeInt::INT, MemNode::unordered);
   Node* check_offset = ConvI2X(transform_later(n3));
   Node* check_value  = dest_elem_klass;
diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp
index a071cff9e3c..9579af84f24 100644
--- a/src/hotspot/share/opto/matcher.hpp
+++ b/src/hotspot/share/opto/matcher.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -327,6 +327,8 @@ public:
   // e.g. Op_ vector nodes and other intrinsics while guarding with vlen
   static bool match_rule_supported_vector(int opcode, int vlen, BasicType bt);
 
+  // Returns true if the platform efficiently implements the given masked vector
+  // operation using predicate features, false otherwise.
   static bool match_rule_supported_vector_masked(int opcode, int vlen, BasicType bt);
 
   // Determines if a vector operation needs to be partially implemented with a mask
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 5b76f5b42cf..21ed15f9ec7 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -44,6 +44,7 @@
 #include "opto/mempointer.hpp"
 #include "opto/mulnode.hpp"
 #include "opto/narrowptrnode.hpp"
+#include "opto/opcodes.hpp"
 #include "opto/phaseX.hpp"
 #include "opto/regalloc.hpp"
 #include "opto/regmask.hpp"
@@ -552,6 +553,18 @@ Node::DomResult MemNode::maybe_all_controls_dominate(Node* dom, Node* sub) {
 bool MemNode::detect_ptr_independence(Node* p1, AllocateNode* a1,
                                       Node* p2, AllocateNode* a2,
                                       PhaseTransform* phase) {
+  // Trivial case: Non-overlapping values. Be careful, we can cast a raw pointer to an oop (e.g. in
+  // the allocation pattern) so joining the types only works if both are oops. join may also give
+  // an incorrect result when both pointers are nullable and the result is supposed to be
+  // TypePtr::NULL_PTR, so we exclude that case.
+  const Type* p1_type = p1->bottom_type();
+  const Type* p2_type = p2->bottom_type();
+  if (p1_type->isa_oopptr() && p2_type->isa_oopptr() &&
+      (!p1_type->maybe_null() || !p2_type->maybe_null()) &&
+      p1_type->join(p2_type)->empty()) {
+    return true;
+  }
+
   // Attempt to prove that these two pointers cannot be aliased.
   // They may both manifestly be allocations, and they should differ.
   // Or, if they are not both allocations, they can be distinct constants.
@@ -690,6 +703,20 @@ Node* MemNode::find_previous_store(PhaseValues* phase) {
   Node*         base   = AddPNode::Ideal_base_and_offset(adr, phase, offset);
   AllocateNode* alloc  = AllocateNode::Ideal_allocation(base);
 
+  const TypePtr* adr_type = this->adr_type();
+  if (adr_type == nullptr) {
+    // This means the access is dead
+    return phase->C->top();
+  } else if (adr_type->base() == TypePtr::AnyPtr) {
+    assert(adr_type->ptr() == TypePtr::Null, "MemNode should never access a wide memory");
+    // Give up, this will upset Compile::get_alias_index
+    return nullptr;
+  }
+
+  int alias_idx = phase->C->get_alias_index(adr_type);
+  assert(alias_idx != Compile::AliasIdxTop, "must not be a dead node");
+  assert(alias_idx != Compile::AliasIdxBot || !phase->C->do_aliasing(), "must not be a very wide access");
+
   if (offset == Type::OffsetBot)
     return nullptr;            // cannot unalias unless there are precise offsets
 
@@ -709,15 +736,32 @@ Node* MemNode::find_previous_store(PhaseValues* phase) {
       Node* st_adr = mem->in(MemNode::Address);
       intptr_t st_offset = 0;
       Node* st_base = AddPNode::Ideal_base_and_offset(st_adr, phase, st_offset);
-      if (st_base == nullptr)
-        break;              // inscrutable pointer
-
-      // For raw accesses it's not enough to prove that constant offsets don't intersect.
-      // We need the bases to be the equal in order for the offset check to make sense.
-      if ((adr_maybe_raw || check_if_adr_maybe_raw(st_adr)) && st_base != base) {
+      if (st_base == nullptr) {
+        // inscrutable pointer
         break;
       }
 
+      // If the bases are the same and the offsets are the same, it seems that this is the exact
+      // store we are looking for, the caller will check if the type of the store matches using
+      // MemNode::can_see_stored_value
+      if (st_base == base && st_offset == offset) {
+        return mem; // (b) found the store that this access observes
+      }
+
+      // If it is provable that the memory accessed by mem does not overlap the memory accessed by
+      // this, we may walk past mem.
+      // For raw accesses, 2 accesses are independent if they have the same base and the offsets
+      // say that they do not overlap.
+      // For heap accesses, 2 accesses are independent if either the bases are provably different
+      // at runtime or the offsets say that the accesses do not overlap.
+      if ((adr_maybe_raw || check_if_adr_maybe_raw(st_adr)) && st_base != base) {
+        // Raw accesses can only be provably independent if they have the same base
+        break;
+      }
+
+      // If the offsets say that the accesses do not overlap, then it is provable that mem and this
+      // do not overlap. For example, a LoadI from Object+8 is independent from a StoreL into
+      // Object+12, no matter what the bases are.
       if (st_offset != offset && st_offset != Type::OffsetBot) {
         const int MAX_STORE = MAX2(BytesPerLong, (int)MaxVectorSize);
         assert(mem->as_Store()->memory_size() <= MAX_STORE, "");
@@ -730,25 +774,25 @@ Node* MemNode::find_previous_store(PhaseValues* phase) {
           // in the same sequence of RawMem effects.  We sometimes initialize
           // a whole 'tile' of array elements with a single jint or jlong.)
           mem = mem->in(MemNode::Memory);
-          continue;           // (a) advance through independent store memory
+          continue; // (a) advance through the independent store
         }
       }
-      if (st_base != base &&
-          detect_ptr_independence(base, alloc,
-                                  st_base,
-                                  AllocateNode::Ideal_allocation(st_base),
-                                  phase)) {
-        // Success:  The bases are provably independent.
+
+      // Same base and overlapping offsets, it seems provable that the accesses overlap, give up
+      if (st_base == base) {
+        break;
+      }
+
+      // Try to prove that 2 different base nodes at compile time are different values at runtime
+      bool known_independent = false;
+      if (detect_ptr_independence(base, alloc, st_base, AllocateNode::Ideal_allocation(st_base), phase)) {
+        known_independent = true;
+      }
+
+      if (known_independent) {
         mem = mem->in(MemNode::Memory);
-        continue;           // (a) advance through independent store memory
+        continue; // (a) advance through the independent store
       }
-
-      // (b) At this point, if the bases or offsets do not agree, we lose,
-      // since we have not managed to prove 'this' and 'mem' independent.
-      if (st_base == base && st_offset == offset) {
-        return mem;         // let caller handle steps (c), (d)
-      }
-
     } else if (mem->is_Proj() && mem->in(0)->is_Initialize()) {
       InitializeNode* st_init = mem->in(0)->as_Initialize();
       AllocateNode*  st_alloc = st_init->allocation();
@@ -769,7 +813,6 @@ Node* MemNode::find_previous_store(PhaseValues* phase) {
         // The bases are provably independent: Either they are
         // manifestly distinct allocations, or else the control
         // of this load dominates the store's allocation.
-        int alias_idx = phase->C->get_alias_index(adr_type());
         if (alias_idx == Compile::AliasIdxRaw) {
           mem = st_alloc->in(TypeFunc::Memory);
         } else {
@@ -792,6 +835,9 @@ Node* MemNode::find_previous_store(PhaseValues* phase) {
       }
       // Found an arraycopy that may affect that load
       return mem;
+    } else if (mem->is_MergeMem()) {
+      mem = mem->as_MergeMem()->memory_at(alias_idx);
+      continue;
     } else if (addr_t != nullptr && addr_t->is_known_instance_field()) {
       // Can't use optimize_simple_memory_chain() since it needs PhaseGVN.
       if (mem->is_Proj() && mem->in(0)->is_Call()) {
@@ -817,10 +863,6 @@ Node* MemNode::find_previous_store(PhaseValues* phase) {
           // we are looking for.
           return mem;
         }
-      } else if (mem->is_MergeMem()) {
-        int alias_idx = phase->C->get_alias_index(adr_type());
-        mem = mem->as_MergeMem()->memory_at(alias_idx);
-        continue;           // (a) advance through independent MergeMem memory
       }
     }
 
@@ -900,7 +942,7 @@ void LoadNode::dump_spec(outputStream *st) const {
     // standard dump does this in Verbose and WizardMode
     st->print(" #"); _type->dump_on(st);
   }
-  if (!depends_only_on_test()) {
+  if (in(0) != nullptr && !depends_only_on_test()) {
     st->print(" (does not depend only on test, ");
     if (control_dependency() == UnknownControl) {
       st->print("unknown control");
@@ -1025,14 +1067,6 @@ static bool skip_through_membars(Compile::AliasType* atp, const TypeInstPtr* tp,
   return false;
 }
 
-LoadNode* LoadNode::pin_array_access_node() const {
-  const TypePtr* adr_type = this->adr_type();
-  if (adr_type != nullptr && adr_type->isa_aryptr()) {
-    return clone_pinned();
-  }
-  return nullptr;
-}
-
 // Is the value loaded previously stored by an arraycopy? If so return
 // a load node that reads from the source array so we may be able to
 // optimize out the ArrayCopy node later.
@@ -1194,8 +1228,13 @@ Node* MemNode::can_see_stored_value(Node* st, PhaseValues* phase) const {
       }
       // LoadVector/StoreVector needs additional check to ensure the types match.
       if (st->is_StoreVector()) {
-        const TypeVect*  in_vt = st->as_StoreVector()->vect_type();
-        const TypeVect* out_vt = as_LoadVector()->vect_type();
+        if ((Opcode() != Op_LoadVector && Opcode() != Op_StoreVector) || st->Opcode() != Op_StoreVector) {
+          // Some kind of masked access or gather/scatter
+          return nullptr;
+        }
+
+        const TypeVect* in_vt = st->as_StoreVector()->vect_type();
+        const TypeVect* out_vt = is_Load() ? as_LoadVector()->vect_type() : as_StoreVector()->vect_type();
         if (in_vt != out_vt) {
           return nullptr;
         }
@@ -1851,7 +1890,6 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 
   Node* ctrl    = in(MemNode::Control);
   Node* address = in(MemNode::Address);
-  bool progress = false;
 
   bool addr_mark = ((phase->type(address)->isa_oopptr() || phase->type(address)->isa_narrowoop()) &&
          phase->type(address)->is_ptr()->offset() == oopDesc::mark_offset_in_bytes());
@@ -1864,7 +1902,7 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       (depends_only_on_test() || has_unknown_control_dependency())) {
     ctrl = ctrl->in(0);
     set_req(MemNode::Control,ctrl);
-    progress = true;
+    return this;
   }
 
   intptr_t ignore = 0;
@@ -1878,7 +1916,7 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
         && all_controls_dominate(base, phase->C->start())) {
       // A method-invariant, non-null address (constant or 'this' argument).
       set_req(MemNode::Control, nullptr);
-      progress = true;
+      return this;
     }
   }
 
@@ -1951,6 +1989,10 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   // the alias index stuff.  So instead, peek through Stores and IFF we can
   // fold up, do so.
   Node* prev_mem = find_previous_store(phase);
+  if (prev_mem != nullptr && prev_mem->is_top()) {
+    // find_previous_store returns top when the access is dead
+    return prev_mem;
+  }
   if (prev_mem != nullptr) {
     Node* value = can_see_arraycopy_value(prev_mem, phase);
     if (value != nullptr) {
@@ -1969,7 +2011,11 @@ Node *LoadNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     }
   }
 
-  return progress ? this : nullptr;
+  if (!can_reshape) {
+    phase->record_for_igvn(this);
+  }
+
+  return nullptr;
 }
 
 // Helper to recognize certain Klass fields which are invariant across
@@ -2563,7 +2609,13 @@ Node* LoadNode::klass_identity_common(PhaseGVN* phase) {
            ) {
           int mirror_field = in_bytes(Klass::java_mirror_offset());
           if (tkls->offset() == mirror_field) {
-            return adr2->in(AddPNode::Base);
+#ifdef ASSERT
+            const TypeKlassPtr* tkls2 = phase->type(adr2->in(AddPNode::Address))->is_klassptr();
+            assert(tkls2->offset() == 0, "not a load of java_mirror");
+#endif
+            assert(adr2->in(AddPNode::Base)->is_top(), "not an off heap load");
+            assert(adr2->in(AddPNode::Offset)->find_intptr_t_con(-1) == in_bytes(Klass::java_mirror_offset()), "incorrect offset");
+            return adr2->in(AddPNode::Address);
           }
         }
       }
@@ -2579,6 +2631,21 @@ LoadNode* LoadNode::clone_pinned() const {
   return ld;
 }
 
+// Pin a LoadNode if it carries a dependency on its control input. There are cases when the node
+// does not actually have any dependency on its control input. For example, if we have a LoadNode
+// being used only outside a loop but it must be scheduled inside the loop, we can clone the node
+// for each of its use so that all the clones can be scheduled outside the loop. Then, to prevent
+// the clones from being GVN-ed again, we add a control input for each of them at the loop exit. In
+// those case, since there is not a dependency between the node and its control input, we do not
+// need to pin it.
+LoadNode* LoadNode::pin_node_under_control_impl() const {
+  const TypePtr* adr_type = this->adr_type();
+  if (adr_type != nullptr && adr_type->isa_aryptr()) {
+    // Only array accesses have dependencies on their control input
+    return clone_pinned();
+  }
+  return nullptr;
+}
 
 //------------------------------Value------------------------------------------
 const Type* LoadNKlassNode::Value(PhaseGVN* phase) const {
@@ -3505,8 +3572,11 @@ Node* StoreNode::Identity(PhaseGVN* phase) {
       val->in(MemNode::Address)->eqv_uncast(adr) &&
       val->in(MemNode::Memory )->eqv_uncast(mem) &&
       val->as_Load()->store_Opcode() == Opcode()) {
-    // Ensure vector type is the same
-    if (!is_StoreVector() || (mem->is_LoadVector() && as_StoreVector()->vect_type() == mem->as_LoadVector()->vect_type())) {
+    if (!is_StoreVector()) {
+      result = mem;
+    } else if (Opcode() == Op_StoreVector && val->Opcode() == Op_LoadVector &&
+               as_StoreVector()->vect_type() == val->as_LoadVector()->vect_type()) {
+      // Ensure both are not masked accesses or gathers/scatters and vector types are the same
       result = mem;
     }
   }
@@ -3552,6 +3622,10 @@ Node* StoreNode::Identity(PhaseGVN* phase) {
       Node* prev_mem = find_previous_store(phase);
       // Steps (a), (b):  Walk past independent stores to find an exact match.
       if (prev_mem != nullptr) {
+        if (prev_mem->is_top()) {
+          // find_previous_store returns top when the access is dead
+          return prev_mem;
+        }
         Node* prev_val = can_see_stored_value(prev_mem, phase);
         if (prev_val != nullptr && prev_val == val) {
           // prev_val and val might differ by a cast; it would be good
@@ -3913,7 +3987,6 @@ const Type* SCMemProjNode::Value(PhaseGVN* phase) const
 LoadStoreNode::LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required )
   : Node(required),
     _type(rt),
-    _adr_type(at),
     _barrier_data(0)
 {
   init_req(MemNode::Control, c  );
@@ -3921,6 +3994,7 @@ LoadStoreNode::LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const Ty
   init_req(MemNode::Address, adr);
   init_req(MemNode::ValueIn, val);
   init_class_id(Class_LoadStore);
+  DEBUG_ONLY(_adr_type = at; adr_type();)
 }
 
 //------------------------------Value-----------------------------------------
@@ -3944,6 +4018,11 @@ const Type* LoadStoreNode::Value(PhaseGVN* phase) const {
   return bottom_type();
 }
 
+const TypePtr* LoadStoreNode::adr_type() const {
+  const TypePtr* cross_check = DEBUG_ONLY(_adr_type) NOT_DEBUG(nullptr);
+  return MemNode::calculate_adr_type(in(MemNode::Address)->bottom_type(), cross_check);
+}
+
 uint LoadStoreNode::ideal_reg() const {
   return _type->ideal_reg();
 }
@@ -4107,18 +4186,27 @@ bool ClearArrayNode::step_through(Node** np, uint instance_id, PhaseValues* phas
   return true;
 }
 
+Node* ClearArrayNode::make_address(Node* dest, Node* offset, bool raw_base, PhaseGVN* phase) {
+  Node* base = dest;
+  if (raw_base) {
+    // May be called as part of the initialization of a just allocated object
+    base = phase->C->top();
+  }
+  return phase->transform(new AddPNode(base, dest, offset));
+}
+
 //----------------------------clear_memory-------------------------------------
 // Generate code to initialize object storage to zero.
 Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
                                    intptr_t start_offset,
                                    Node* end_offset,
+                                   bool raw_base,
                                    PhaseGVN* phase) {
   intptr_t offset = start_offset;
 
   int unit = BytesPerLong;
   if ((offset % unit) != 0) {
-    Node* adr = new AddPNode(dest, dest, phase->MakeConX(offset));
-    adr = phase->transform(adr);
+    Node* adr = make_address(dest, phase->MakeConX(offset), raw_base, phase);
     const TypePtr* atp = TypeRawPtr::BOTTOM;
     mem = StoreNode::make(*phase, ctl, mem, adr, atp, phase->zerocon(T_INT), T_INT, MemNode::unordered);
     mem = phase->transform(mem);
@@ -4127,12 +4215,13 @@ Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
   assert((offset % unit) == 0, "");
 
   // Initialize the remaining stuff, if any, with a ClearArray.
-  return clear_memory(ctl, mem, dest, phase->MakeConX(offset), end_offset, phase);
+  return clear_memory(ctl, mem, dest, phase->MakeConX(offset), end_offset, raw_base, phase);
 }
 
 Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
                                    Node* start_offset,
                                    Node* end_offset,
+                                   bool raw_base,
                                    PhaseGVN* phase) {
   if (start_offset == end_offset) {
     // nothing to do
@@ -4152,7 +4241,7 @@ Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
 
   // Bulk clear double-words
   Node* zsize = phase->transform(new SubXNode(zend, zbase) );
-  Node* adr = phase->transform(new AddPNode(dest, dest, start_offset) );
+  Node* adr = make_address(dest, start_offset, raw_base, phase);
   mem = new ClearArrayNode(ctl, mem, zsize, adr, false);
   return phase->transform(mem);
 }
@@ -4160,6 +4249,7 @@ Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
 Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
                                    intptr_t start_offset,
                                    intptr_t end_offset,
+                                   bool raw_base,
                                    PhaseGVN* phase) {
   if (start_offset == end_offset) {
     // nothing to do
@@ -4173,11 +4263,10 @@ Node* ClearArrayNode::clear_memory(Node* ctl, Node* mem, Node* dest,
   }
   if (done_offset > start_offset) {
     mem = clear_memory(ctl, mem, dest,
-                       start_offset, phase->MakeConX(done_offset), phase);
+                       start_offset, phase->MakeConX(done_offset), raw_base, phase);
   }
   if (done_offset < end_offset) { // emit the final 32-bit store
-    Node* adr = new AddPNode(dest, dest, phase->MakeConX(done_offset));
-    adr = phase->transform(adr);
+    Node* adr = make_address(dest, phase->MakeConX(done_offset), raw_base, phase);
     const TypePtr* atp = TypeRawPtr::BOTTOM;
     mem = StoreNode::make(*phase, ctl, mem, adr, atp, phase->zerocon(T_INT), T_INT, MemNode::unordered);
     mem = phase->transform(mem);
@@ -5384,6 +5473,7 @@ Node* InitializeNode::complete_stores(Node* rawctl, Node* rawmem, Node* rawptr,
         zeroes_done = align_down(zeroes_done, BytesPerInt);
         rawmem = ClearArrayNode::clear_memory(rawctl, rawmem, rawptr,
                                               zeroes_done, zeroes_needed,
+                                              true,
                                               phase);
         zeroes_done = zeroes_needed;
         if (zsize > InitArrayShortSize && ++big_init_gaps > 2)
@@ -5442,7 +5532,7 @@ Node* InitializeNode::complete_stores(Node* rawctl, Node* rawmem, Node* rawptr,
     }
     if (zeroes_done < size_limit) {
       rawmem = ClearArrayNode::clear_memory(rawctl, rawmem, rawptr,
-                                            zeroes_done, size_in_bytes, phase);
+                                            zeroes_done, size_in_bytes, true, phase);
     }
   }
 
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index d554c037012..39b1ee88333 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -299,8 +299,6 @@ public:
   bool has_unknown_control_dependency() const  { return _control_dependency == UnknownControl; }
   bool has_pinned_control_dependency() const   { return _control_dependency == Pinned; }
 
-  LoadNode* pin_array_access_node() const;
-
 #ifndef PRODUCT
   virtual void dump_spec(outputStream *st) const;
 #endif
@@ -314,6 +312,7 @@ protected:
 
   Node* can_see_arraycopy_value(Node* st, PhaseGVN* phase) const;
 
+private:
   // depends_only_on_test is almost always true, and needs to be almost always
   // true to enable key hoisting & commoning optimizations.  However, for the
   // special case of RawPtr loads from TLS top & end, and other loads performed by
@@ -323,11 +322,12 @@ protected:
   // which produce results (new raw memory state) inside of loops preventing all
   // manner of other optimizations).  Basically, it's ugly but so is the alternative.
   // See comment in macro.cpp, around line 125 expand_allocate_common().
-  virtual bool depends_only_on_test() const {
+  virtual bool depends_only_on_test_impl() const {
     return adr_type() != TypeRawPtr::BOTTOM && _control_dependency == DependsOnlyOnTest;
   }
 
   LoadNode* clone_pinned() const;
+  virtual LoadNode* pin_node_under_control_impl() const;
 };
 
 //------------------------------LoadBNode--------------------------------------
@@ -534,7 +534,6 @@ public:
   virtual int Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual bool depends_only_on_test() const { return true; }
 
   // Polymorphic factory method:
   static Node* make(PhaseGVN& gvn, Node* mem, Node* adr, const TypePtr* at,
@@ -563,7 +562,6 @@ public:
 
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual bool depends_only_on_test() const { return true; }
 };
 
 
@@ -580,7 +578,6 @@ private:
   virtual uint size_of() const { return sizeof(*this); }
 protected:
   virtual bool cmp( const Node &n ) const;
-  virtual bool depends_only_on_test() const { return false; }
 
   Node *Ideal_masked_input       (PhaseGVN *phase, uint mask);
   Node* Ideal_sign_extended_input(PhaseGVN* phase, int num_rejected_bits);
@@ -660,6 +657,9 @@ public:
   Node* convert_to_reinterpret_store(PhaseGVN& gvn, Node* val, const Type* vt);
 
   MemBarNode* trailing_membar() const;
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------StoreBNode-------------------------------------
@@ -797,11 +797,6 @@ public:
   virtual int Opcode() const;
   virtual bool      is_CFG() const  { return false; }
   virtual const Type *bottom_type() const {return Type::MEMORY;}
-  virtual const TypePtr *adr_type() const {
-    Node* ctrl = in(0);
-    if (ctrl == nullptr)  return nullptr; // node is dead
-    return ctrl->in(MemNode::Memory)->adr_type();
-  }
   virtual uint ideal_reg() const { return 0;} // memory projections don't have a register
   virtual const Type* Value(PhaseGVN* phase) const;
 #ifndef PRODUCT
@@ -814,17 +809,18 @@ public:
 class LoadStoreNode : public Node {
 private:
   const Type* const _type;      // What kind of value is loaded?
-  const TypePtr* _adr_type;     // What kind of memory is being addressed?
   uint8_t _barrier_data;        // Bit field with barrier information
   virtual uint size_of() const; // Size is bigger
+#ifdef ASSERT
+  const TypePtr* _adr_type;     // What kind of memory is being addressed?
+#endif // ASSERT
 public:
   LoadStoreNode( Node *c, Node *mem, Node *adr, Node *val, const TypePtr* at, const Type* rt, uint required );
-  virtual bool depends_only_on_test() const { return false; }
   virtual uint match_edge(uint idx) const { return idx == MemNode::Address || idx == MemNode::ValueIn; }
 
   virtual const Type *bottom_type() const { return _type; }
   virtual uint ideal_reg() const;
-  virtual const class TypePtr *adr_type() const { return _adr_type; }  // returns bottom_type of address
+  virtual const TypePtr* adr_type() const;
   virtual const Type* Value(PhaseGVN* phase) const;
 
   bool result_not_used() const;
@@ -832,6 +828,9 @@ public:
 
   uint8_t barrier_data() { return _barrier_data; }
   void set_barrier_data(uint8_t barrier_data) { _barrier_data = barrier_data; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 class LoadStoreConditionalNode : public LoadStoreNode {
@@ -1075,6 +1074,7 @@ public:
 class ClearArrayNode: public Node {
 private:
   bool _is_large;
+  static Node* make_address(Node* dest, Node* offset, bool raw_base, PhaseGVN* phase);
 public:
   ClearArrayNode( Node *ctrl, Node *arymem, Node *word_cnt, Node *base, bool is_large)
     : Node(ctrl,arymem,word_cnt,base), _is_large(is_large) {
@@ -1102,18 +1102,24 @@ public:
   static Node* clear_memory(Node* control, Node* mem, Node* dest,
                             intptr_t start_offset,
                             intptr_t end_offset,
+                            bool raw_base,
                             PhaseGVN* phase);
   static Node* clear_memory(Node* control, Node* mem, Node* dest,
                             intptr_t start_offset,
                             Node* end_offset,
+                            bool raw_base,
                             PhaseGVN* phase);
   static Node* clear_memory(Node* control, Node* mem, Node* dest,
                             Node* start_offset,
                             Node* end_offset,
+                            bool raw_base,
                             PhaseGVN* phase);
   // Return allocation input memory edge if it is different instance
   // or itself if it is the one we are looking for.
   static bool step_through(Node** np, uint instance_id, PhaseValues* phase);
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------MemBar-----------------------------------------
@@ -1676,6 +1682,9 @@ public:
   virtual uint match_edge(uint idx) const { return (idx == 2); }
   virtual const TypePtr *adr_type() const { return TypePtr::BOTTOM; }
   virtual const Type *bottom_type() const { return Type::MEMORY; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 // cachewb pre sync node for ensuring that writebacks are serialised
@@ -1688,6 +1697,9 @@ public:
   virtual uint match_edge(uint idx) const { return false; }
   virtual const TypePtr *adr_type() const { return TypePtr::BOTTOM; }
   virtual const Type *bottom_type() const { return Type::MEMORY; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 // cachewb pre sync node for ensuring that writebacks are serialised
@@ -1700,6 +1712,9 @@ public:
   virtual uint match_edge(uint idx) const { return false; }
   virtual const TypePtr *adr_type() const { return TypePtr::BOTTOM; }
   virtual const Type *bottom_type() const { return Type::MEMORY; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------Prefetch---------------------------------------
@@ -1712,6 +1727,9 @@ public:
   virtual uint ideal_reg() const { return NotAMachineReg; }
   virtual uint match_edge(uint idx) const { return idx==2; }
   virtual const Type *bottom_type() const { return ( AllocatePrefetchStyle == 3 ) ? Type::MEMORY : Type::ABIO; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 #endif // SHARE_OPTO_MEMNODE_HPP
diff --git a/src/hotspot/share/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp
index 66db1df339b..6b6becb434f 100644
--- a/src/hotspot/share/opto/movenode.cpp
+++ b/src/hotspot/share/opto/movenode.cpp
@@ -271,9 +271,9 @@ Node* CMoveNode::Ideal_minmax(PhaseGVN* phase, CMoveNode* cmove) {
 
   // Create the Min/Max node based on the type and kind
   if (cmp_op == Op_CmpL) {
-    return MaxNode::build_min_max_long(phase, cmp_l, cmp_r, is_max);
+    return MinMaxNode::build_min_max_long(phase, cmp_l, cmp_r, is_max);
   } else {
-    return MaxNode::build_min_max_int(cmp_l, cmp_r, is_max);
+    return MinMaxNode::build_min_max_int(cmp_l, cmp_r, is_max);
   }
 }
 
diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index aa8d6cfce2e..9bdaa3b9f34 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -902,27 +902,28 @@ static bool mask_shift_amount(PhaseGVN* phase, const Node* shift_node, uint nBit
 }
 
 // Use this in ::Ideal only with shiftNode == this!
-// Returns the masked shift amount if constant or 0 if not constant.
-static uint mask_and_replace_shift_amount(PhaseGVN* phase, Node* shift_node, uint nBits) {
+// Sets masked_shift to the masked shift amount if constant or 0 if not constant.
+// Returns shift_node if the shift amount input node was modified, nullptr otherwise.
+static Node* mask_and_replace_shift_amount(PhaseGVN* phase, Node* shift_node, uint nBits, uint& masked_shift) {
   int real_shift;
-  uint masked_shift;
   if (mask_shift_amount(phase, shift_node, nBits, real_shift, masked_shift)) {
     if (masked_shift == 0) {
       // Let Identity() handle 0 shift count.
-      return 0;
+      return nullptr;
     }
 
     if (real_shift != (int)masked_shift) {
-      PhaseIterGVN* igvn = phase->is_IterGVN();
-      if (igvn != nullptr) {
-        igvn->_worklist.push(shift_node);
-      }
       shift_node->set_req(2, phase->intcon(masked_shift)); // Replace shift count with masked value.
+
+      // We need to notify the caller that the graph was reshaped, as Ideal needs
+      // to return the root of the reshaped graph if any change was made.
+      return shift_node;
     }
-    return masked_shift;
+  } else {
+    // Not a shift by a constant.
+    masked_shift = 0;
   }
-  // Not a shift by a constant.
-  return 0;
+  return nullptr;
 }
 
 // Called with
@@ -974,7 +975,8 @@ Node* LShiftINode::Identity(PhaseGVN* phase) {
 }
 
 Node* LShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) {
-  uint con = mask_and_replace_shift_amount(phase, this, bits_per_java_integer(bt));
+  uint con;
+  Node* progress = mask_and_replace_shift_amount(phase, this, bits_per_java_integer(bt), con);
   if (con == 0) {
     return nullptr;
   }
@@ -1113,7 +1115,7 @@ Node* LShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) {
     return doubleShift;
   }
 
-  return nullptr;
+  return progress;
 }
 
 //------------------------------Ideal------------------------------------------
@@ -1238,20 +1240,26 @@ Node* RShiftNode::IdentityIL(PhaseGVN* phase, BasicType bt) {
       return in(1);
     }
     // Check for useless sign-masking
+    int lshift_count = 0;
     if (in(1)->Opcode() == Op_LShift(bt) &&
         in(1)->req() == 3 &&
-        in(1)->in(2) == in(2)) {
+        // Compare shift counts by value, not by node pointer, to also match a not-yet-normalized
+        // negative constant (e.g. -1 vs 31)
+        const_shift_count(phase, in(1), &lshift_count)) {
       count &= bits_per_java_integer(bt) - 1; // semantics of Java shifts
-      // Compute masks for which this shifting doesn't change
-      jlong lo = (CONST64(-1) << (bits_per_java_integer(bt) - ((uint)count)-1)); // FFFF8000
-      jlong hi = ~lo;                                                            // 00007FFF
-      const TypeInteger* t11 = phase->type(in(1)->in(1))->isa_integer(bt);
-      if (t11 == nullptr) {
-        return this;
-      }
-      // Does actual value fit inside of mask?
-      if (lo <= t11->lo_as_long() && t11->hi_as_long() <= hi) {
-        return in(1)->in(1);      // Then shifting is a nop
+      lshift_count &= bits_per_java_integer(bt) - 1;
+      if (count == lshift_count) {
+        // Compute masks for which this shifting doesn't change
+        jlong lo = (CONST64(-1) << (bits_per_java_integer(bt) - ((uint)count)-1)); // FFFF8000
+        jlong hi = ~lo;                                                            // 00007FFF
+        const TypeInteger* t11 = phase->type(in(1)->in(1))->isa_integer(bt);
+        if (t11 == nullptr) {
+          return this;
+        }
+        // Does actual value fit inside of mask?
+        if (lo <= t11->lo_as_long() && t11->hi_as_long() <= hi) {
+          return in(1)->in(1);      // Then shifting is a nop
+        }
       }
     }
   }
@@ -1268,7 +1276,9 @@ Node* RShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) {
   if (t1 == nullptr) {
     return NodeSentinel;        // Left input is an integer
   }
-  int shift = mask_and_replace_shift_amount(phase, this, bits_per_java_integer(bt));
+
+  uint shift;
+  Node* progress = mask_and_replace_shift_amount(phase, this, bits_per_java_integer(bt), shift);
   if (shift == 0) {
     return NodeSentinel;
   }
@@ -1278,7 +1288,7 @@ Node* RShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) {
   // Such expressions arise normally from shift chains like (byte)(x >> 24).
   const Node* and_node = in(1);
   if (and_node->Opcode() != Op_And(bt)) {
-    return nullptr;
+    return progress;
   }
   const TypeInteger* mask_t = phase->type(and_node->in(2))->isa_integer(bt);
   if (mask_t != nullptr && mask_t->is_con()) {
@@ -1287,7 +1297,8 @@ Node* RShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) {
     Node* shr_nomask = phase->transform(RShiftNode::make(and_node->in(1), in(2), bt));
     return MulNode::make_and(shr_nomask, phase->integercon(maskbits >> shift, bt), bt);
   }
-  return nullptr;
+
+  return progress;
 }
 
 Node* RShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
@@ -1298,18 +1309,19 @@ Node* RShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
   if (progress != nullptr) {
     return progress;
   }
-  int shift = mask_and_replace_shift_amount(phase, this, BitsPerJavaInteger);
+  uint shift;
+  progress = mask_and_replace_shift_amount(phase, this, BitsPerJavaInteger, shift);
   assert(shift != 0, "handled by IdealIL");
 
   // Check for "(short[i] <<16)>>16" which simply sign-extends
   const Node *shl = in(1);
   if (shl->Opcode() != Op_LShiftI) {
-    return nullptr;
+    return progress;
   }
 
   const TypeInt* left_shift_t = phase->type(shl->in(2))->isa_int();
   if (left_shift_t == nullptr) {
-    return nullptr;
+    return progress;
   }
   if (shift == 16 && left_shift_t->is_con(16)) {
     Node *ld = shl->in(1);
@@ -1341,7 +1353,7 @@ Node* RShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
     }
   }
 
-  return nullptr;
+  return progress;
 }
 
 const Type* RShiftNode::ValueIL(PhaseGVN* phase, BasicType bt) const {
@@ -1497,7 +1509,8 @@ Node* URShiftINode::Identity(PhaseGVN* phase) {
 
 //------------------------------Ideal------------------------------------------
 Node* URShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  int con = mask_and_replace_shift_amount(phase, this, BitsPerJavaInteger);
+  uint con;
+  Node* progress = mask_and_replace_shift_amount(phase, this, BitsPerJavaInteger, con);
   if (con == 0) {
     return nullptr;
   }
@@ -1524,11 +1537,14 @@ Node* URShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
   // If Q is "X << z" the rounding is useless.  Look for patterns like
   // ((X<<Z) + Y) >>> Z  and replace with (X + Y>>>Z) & Z-mask.
   Node *add = in(1);
-  const TypeInt *t2 = phase->type(in(2))->isa_int();
   if (in1_op == Op_AddI) {
     Node *lshl = add->in(1);
-    if( lshl->Opcode() == Op_LShiftI &&
-        phase->type(lshl->in(2)) == t2 ) {
+    // Compare shift counts by value, not by node pointer, to also match a not-yet-normalized
+    // negative constant (e.g. -1 vs 31)
+    int lshl_con = 0;
+    if (lshl->Opcode() == Op_LShiftI &&
+        const_shift_count(phase, lshl, &lshl_con) &&
+        (lshl_con & (BitsPerJavaInteger - 1)) == con) {
       Node *y_z = phase->transform( new URShiftINode(add->in(2),in(2)) );
       Node *sum = phase->transform( new AddINode( lshl->in(1), y_z ) );
       return new AndINode( sum, phase->intcon(mask) );
@@ -1555,11 +1571,16 @@ Node* URShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
 
   // Check for "(X << z ) >>> z" which simply zero-extends
   Node *shl = in(1);
-  if( in1_op == Op_LShiftI &&
-      phase->type(shl->in(2)) == t2 )
-    return new AndINode( shl->in(1), phase->intcon(mask) );
+  // Compare shift counts by value, not by node pointer, to also match a not-yet-normalized
+  // negative constant (e.g. -1 vs 31)
+  int shl_con = 0;
+  if (in1_op == Op_LShiftI &&
+      const_shift_count(phase, shl, &shl_con) &&
+      (shl_con & (BitsPerJavaInteger - 1)) == con)
+    return new AndINode(shl->in(1), phase->intcon(mask));
 
   // Check for (x >> n) >>> 31. Replace with (x >>> 31)
+  const TypeInt* t2 = phase->type(in(2))->isa_int();
   Node *shr = in(1);
   if ( in1_op == Op_RShiftI ) {
     Node *in11 = shr->in(1);
@@ -1571,7 +1592,7 @@ Node* URShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
     }
   }
 
-  return nullptr;
+  return progress;
 }
 
 //------------------------------Value------------------------------------------
@@ -1661,7 +1682,8 @@ Node* URShiftLNode::Identity(PhaseGVN* phase) {
 
 //------------------------------Ideal------------------------------------------
 Node* URShiftLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
-  int con = mask_and_replace_shift_amount(phase, this, BitsPerJavaLong);
+  uint con;
+  Node* progress = mask_and_replace_shift_amount(phase, this, BitsPerJavaLong, con);
   if (con == 0) {
     return nullptr;
   }
@@ -1677,11 +1699,15 @@ Node* URShiftLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   const TypeInt *t2 = phase->type(in(2))->isa_int();
   if (add->Opcode() == Op_AddL) {
     Node *lshl = add->in(1);
-    if( lshl->Opcode() == Op_LShiftL &&
-        phase->type(lshl->in(2)) == t2 ) {
-      Node *y_z = phase->transform( new URShiftLNode(add->in(2),in(2)) );
-      Node *sum = phase->transform( new AddLNode( lshl->in(1), y_z ) );
-      return new AndLNode( sum, phase->longcon(mask) );
+    // Compare shift counts by value, not by node pointer, to also match a not-yet-normalized
+    // negative constant (e.g. -1 vs 63)
+    int lshl_con = 0;
+    if (lshl->Opcode() == Op_LShiftL &&
+        const_shift_count(phase, lshl, &lshl_con) &&
+        (lshl_con & (BitsPerJavaLong - 1)) == con) {
+      Node* y_z = phase->transform(new URShiftLNode(add->in(2), in(2)));
+      Node* sum = phase->transform(new AddLNode(lshl->in(1), y_z));
+      return new AndLNode(sum, phase->longcon(mask));
     }
   }
 
@@ -1701,9 +1727,14 @@ Node* URShiftLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 
   // Check for "(X << z ) >>> z" which simply zero-extends
   Node *shl = in(1);
-  if( shl->Opcode() == Op_LShiftL &&
-      phase->type(shl->in(2)) == t2 )
-    return new AndLNode( shl->in(1), phase->longcon(mask) );
+  // Compare shift counts by value, not by node pointer, to also match a not-yet-normalized
+  // negative constant (e.g. -1 vs 63)
+  int shl_con = 0;
+  if (shl->Opcode() == Op_LShiftL &&
+      const_shift_count(phase, shl, &shl_con) &&
+      (shl_con & (BitsPerJavaLong - 1)) == con) {
+    return new AndLNode(shl->in(1), phase->longcon(mask));
+  }
 
   // Check for (x >> n) >>> 63. Replace with (x >>> 63)
   Node *shr = in(1);
@@ -1716,7 +1747,8 @@ Node* URShiftLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
       return new URShiftLNode(in11, phase->intcon(63));
     }
   }
-  return nullptr;
+
+  return progress;
 }
 
 //------------------------------Value------------------------------------------
diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp
index 20ab59aeabc..b63d418b742 100644
--- a/src/hotspot/share/opto/multnode.hpp
+++ b/src/hotspot/share/opto/multnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ public:
   virtual const Type *bottom_type() const = 0;
   virtual bool       is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
-  virtual bool depends_only_on_test() const { return false; }
   virtual const RegMask &out_RegMask() const;
   virtual Node *match( const ProjNode *proj, const Matcher *m );
   virtual uint ideal_reg() const { return NotAMachineReg; }
@@ -176,8 +175,7 @@ public:
   const bool _is_io_use;        // Used to distinguish between the projections
                                 // used on the control and io paths from a macro node
   virtual int Opcode() const;
-  virtual bool      is_CFG() const;
-  virtual bool depends_only_on_test() const { return false; }
+  virtual bool is_CFG() const;
   virtual const Type *bottom_type() const;
   virtual const TypePtr *adr_type() const;
   virtual bool pinned() const;
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 832727a424e..cb5795a1250 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1151,15 +1151,19 @@ const Type* Node::Value(PhaseGVN* phase) const {
 // 'Idealize' the graph rooted at this Node.
 //
 // In order to be efficient and flexible there are some subtle invariants
-// these Ideal calls need to hold.  Running with '-XX:VerifyIterativeGVN=1' checks
-// these invariants, although its too slow to have on by default.  If you are
-// hacking an Ideal call, be sure to test with '-XX:VerifyIterativeGVN=1'
+// these Ideal calls need to hold. Some of the flag bits for '-XX:VerifyIterativeGVN'
+// can help with validating these invariants, although they are too slow to have on by default:
+//    - '-XX:VerifyIterativeGVN=1' checks the def-use info
+//    - '-XX:VerifyIterativeGVN=100000' checks the return value
+// If you are hacking an Ideal call, be sure to use these.
 //
 // The Ideal call almost arbitrarily reshape the graph rooted at the 'this'
 // pointer.  If ANY change is made, it must return the root of the reshaped
 // graph - even if the root is the same Node.  Example: swapping the inputs
 // to an AddINode gives the same answer and same root, but you still have to
-// return the 'this' pointer instead of null.
+// return the 'this' pointer instead of null. If the node was already dead
+// before the Ideal call, this rule does not apply, and it is fine to return
+// nullptr even if modifications were made.
 //
 // You cannot return an OLD Node, except for the 'this' pointer.  Use the
 // Identity call to return an old Node; basically if Identity can find
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 0adb2072100..46b89aa2c5f 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, 2025, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -130,6 +130,7 @@ class MemBarNode;
 class MemBarStoreStoreNode;
 class MemNode;
 class MergeMemNode;
+class MinMaxNode;
 class MoveNode;
 class MulNode;
 class MultiNode;
@@ -142,7 +143,7 @@ class Opaque1Node;
 class OpaqueLoopInitNode;
 class OpaqueLoopStrideNode;
 class OpaqueMultiversioningNode;
-class OpaqueNotNullNode;
+class OpaqueConstantBoolNode;
 class OpaqueInitializedAssertionPredicateNode;
 class OpaqueTemplateAssertionPredicateNode;
 class OuterStripMinedLoopNode;
@@ -809,6 +810,7 @@ public:
     DEFINE_CLASS_ID(AddP,     Node, 9)
     DEFINE_CLASS_ID(BoxLock,  Node, 10)
     DEFINE_CLASS_ID(Add,      Node, 11)
+      DEFINE_CLASS_ID(MinMax,      Add, 0)
     DEFINE_CLASS_ID(Mul,      Node, 12)
     DEFINE_CLASS_ID(ClearArray, Node, 14)
     DEFINE_CLASS_ID(Halt,     Node, 15)
@@ -816,7 +818,7 @@ public:
       DEFINE_CLASS_ID(OpaqueLoopInit, Opaque1, 0)
       DEFINE_CLASS_ID(OpaqueLoopStride, Opaque1, 1)
       DEFINE_CLASS_ID(OpaqueMultiversioning, Opaque1, 2)
-    DEFINE_CLASS_ID(OpaqueNotNull,  Node, 17)
+    DEFINE_CLASS_ID(OpaqueConstantBool,  Node, 17)
     DEFINE_CLASS_ID(OpaqueInitializedAssertionPredicate,  Node, 18)
     DEFINE_CLASS_ID(OpaqueTemplateAssertionPredicate,  Node, 19)
     DEFINE_CLASS_ID(Move,     Node, 20)
@@ -843,7 +845,8 @@ public:
     Flag_has_swapped_edges           = 1ULL << 11,
     Flag_is_scheduled                = 1ULL << 12,
     Flag_is_expensive                = 1ULL << 13,
-    Flag_is_predicated_vector        = 1ULL << 14,
+    Flag_is_predicated_vector        = 1ULL << 14, // Marked on a vector node that has an additional
+                                                   // mask input controlling the lane operations.
     Flag_for_post_loop_opts_igvn     = 1ULL << 15,
     Flag_for_merge_stores_igvn       = 1ULL << 16,
     Flag_is_removed_by_peephole      = 1ULL << 17,
@@ -986,6 +989,7 @@ public:
   DEFINE_CLASS_QUERY(MemBar)
   DEFINE_CLASS_QUERY(MemBarStoreStore)
   DEFINE_CLASS_QUERY(MergeMem)
+  DEFINE_CLASS_QUERY(MinMax)
   DEFINE_CLASS_QUERY(Move)
   DEFINE_CLASS_QUERY(Mul)
   DEFINE_CLASS_QUERY(Multi)
@@ -996,7 +1000,7 @@ public:
   DEFINE_CLASS_QUERY(NegV)
   DEFINE_CLASS_QUERY(NeverBranch)
   DEFINE_CLASS_QUERY(Opaque1)
-  DEFINE_CLASS_QUERY(OpaqueNotNull)
+  DEFINE_CLASS_QUERY(OpaqueConstantBool)
   DEFINE_CLASS_QUERY(OpaqueInitializedAssertionPredicate)
   DEFINE_CLASS_QUERY(OpaqueTemplateAssertionPredicate)
   DEFINE_CLASS_QUERY(OpaqueLoopInit)
@@ -1055,14 +1059,135 @@ public:
 
   virtual bool is_CFG() const { return false; }
 
-  // If this node is control-dependent on a test, can it be
-  // rerouted to a dominating equivalent test?  This is usually
-  // true of non-CFG nodes, but can be false for operations which
-  // depend for their correct sequencing on more than one test.
-  // (In that case, hoisting to a dominating test may silently
-  // skip some other important test.)
-  virtual bool depends_only_on_test() const { assert(!is_CFG(), ""); return true; };
+  // If this node is control-dependent on a test, can it be rerouted to a dominating equivalent
+  // test? This means that the node can be executed safely as long as it happens after the test
+  // that is its control input without worrying about the whole control flow. On the contrary, if
+  // the node depends on a test that is not its control input, or if it depends on more than one
+  // tests, then this method must return false.
+  //
+  // Pseudocode examples:
+  // 1. if (y != 0) {
+  //      x / y;
+  //    }
+  // The division depends only on the test y != 0 and can be executed anywhere y != 0 holds true.
+  // As a result, depends_only_on_test returns true.
+  // 2. if (y != 0) {
+  //      if (x > 1) {
+  //        x / y;
+  //      }
+  //    }
+  // If the division x / y has its control input being the IfTrueNode of the test y != 0, then
+  // depends_only_on_test returns true. Otherwise, if the division has its control input being the
+  // IfTrueNode of the test x > 1, then depends_only_on_test returns false.
+  // 3. if (y > z) {
+  //      if (z > 0) {
+  //        x / y
+  //      }
+  //    }
+  // The division depends on both tests y > z and z > 0. As a result, depends_only_on_test returns
+  // false.
+  //
+  // This method allows more freedom in certain nodes with regards to scheduling, for example it
+  // allows nodes to float out of loops together with its test.
+  //
+  // This method is pessimistic, this means that it may return false even if the node satisfy the
+  // requirements. However, it must return false if the node does not satisfy the requirements.
+  // When a test is decomposed into multiple tests, all nodes that depend on the decomposed test
+  // must be pinned at the lowest dominating test of those. For example, when a zero check of a
+  // division is split through a region but the division itself is not, it must be pinned at the
+  // merge point by returning false when calling this method.
+  bool depends_only_on_test() const {
+    if (is_CFG() || pinned()) {
+      return false;
+    }
+    assert(in(0) != nullptr, "must have a control input");
+    return depends_only_on_test_impl();
+  }
 
+  // Return a clone of the current node that's pinned. The current node must return true for
+  // depends_only_on_test, and the retuned node must return false. This method is called when the
+  // node is disconnected from its test.
+  //
+  // Examples:
+  // 1. for (int i = start; i <= limit; i++) {
+  //      if (!rangecheck(i, a)) {
+  //        trap;
+  //      }
+  //      a[i];
+  //    }
+  // Loop predication can then hoist the range check out of the loop:
+  //    if (!rangecheck(start, a)) {
+  //      trap;
+  //    }
+  //    if (!rangecheck(limit, a)) {
+  //      trap;
+  //    }
+  //    for (int i = start; i <= limit; i++) {
+  //      a[i];
+  //    }
+  // As the load a[i] now depends on both tests rangecheck(start, a) and rangecheck(limit, a), it
+  // must be pinned at the lowest dominating test of those.
+  //
+  // 2. if (y > x) {
+  //      if (x >= 0) {
+  //        if (y != 0) {
+  //          x / y;
+  //        }
+  //      }
+  //    }
+  // The test (y != 0) == true can be deduced from (y > x) == true and (x >= 0) == true, so we may
+  // choose to elide it. In such cases, the division x / y now depends on both tests
+  // (y > x) == true and (x >= 0) == true, so it must be pinned at the lowest dominating test of
+  // those.
+  //
+  // 3. if (b) {
+  //      ...
+  //    } else {
+  //      ...
+  //    }
+  //    if (y == 0) {
+  //      trap;
+  //    }
+  //    x / y;
+  // The division x / y depends only on the test (y == 0) == false, but if we split the test
+  // through the merge point but not the division:
+  //    if (b) {
+  //      ...
+  //      if (y == 0) {
+  //        trap;
+  //      }
+  //    } else {
+  //      ...
+  //      if (y == 0) {
+  //        trap;
+  //      }
+  //    }
+  //    x / y;
+  // The division now has the control input being the RegionNode merge the branches of if(b)
+  // instead of a test that proves y != 0. As a result, it must be pinned at that node.
+  //
+  // There are cases where the node does not actually have a dependency on its control input. For
+  // example, when we try to sink a LoadNode out of a loop in PhaseIdealLoop::try_sink_out_of_loop,
+  // we clone the node so that all of the clones can be scheduled out of the loop. To prevent the
+  // clones from being GVN-ed again, we add a control input for the node at the loop exit. For the
+  // cases when the node does provably not depend on its control input, this method can return
+  // nullptr.
+  Node* pin_node_under_control() const {
+    assert(depends_only_on_test(), "must be a depends_only_on_test node");
+    Node* res = pin_node_under_control_impl();
+    if (res == nullptr) {
+      assert(is_Load(), "unexpected failure to pin for %s", Name());
+      return nullptr;
+    }
+    assert(!res->depends_only_on_test(), "the result must not depends_only_on_test");
+    return res;
+  }
+
+private:
+  virtual bool depends_only_on_test_impl() const { assert(false, "%s", Name()); return false; }
+  virtual Node* pin_node_under_control_impl() const { assert(false, "%s", Name()); return nullptr; }
+
+public:
   // When building basic blocks, I need to have a notion of block beginning
   // Nodes, next block selector Nodes (block enders), and next block
   // projections.  These calls need to work on their machine equivalents.  The
@@ -1197,13 +1322,6 @@ public:
   template <typename Callback, typename Check>
   void visit_uses(Callback callback, Check is_boundary) const;
 
-  // Returns a clone of the current node that's pinned (if the current node is not) for nodes found in array accesses
-  // (Load and range check CastII nodes).
-  // This is used when an array access is made dependent on 2 or more range checks (range check smearing or Loop Predication).
-  virtual Node* pin_array_access_node() const {
-    return nullptr;
-  }
-
   //----------------- Code Generation
 
   // Ideal register class for Matching.  Zero means unmatched instruction
diff --git a/src/hotspot/share/opto/opaquenode.cpp b/src/hotspot/share/opto/opaquenode.cpp
index 29d625db190..428379e84ae 100644
--- a/src/hotspot/share/opto/opaquenode.cpp
+++ b/src/hotspot/share/opto/opaquenode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,10 +108,16 @@ void OpaqueMultiversioningNode::dump_spec(outputStream *st) const {
 }
 #endif
 
-const Type* OpaqueNotNullNode::Value(PhaseGVN* phase) const {
+const Type* OpaqueConstantBoolNode::Value(PhaseGVN* phase) const {
   return phase->type(in(1));
 }
 
+#ifndef PRODUCT
+void OpaqueConstantBoolNode::dump_spec(outputStream *st) const {
+  st->print(_constant ? " #true" : " #false");
+}
+#endif
+
 OpaqueTemplateAssertionPredicateNode::OpaqueTemplateAssertionPredicateNode(BoolNode* bol,  CountedLoopNode* loop_node)
     : Node(nullptr, bol),
       _loop_node(loop_node),
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index 9edfe2a7258..bb3da2aa65f 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,15 +130,26 @@ public:
 // This node is used in the context of intrinsics. We sometimes implicitly know that an object is non-null even though
 // the compiler cannot prove it. We therefore add a corresponding cast to propagate this implicit knowledge. However,
 // this cast could become top during optimizations (input to cast becomes null) and the data path is folded. To ensure
-// that the control path is also properly folded, we insert an If node with a OpaqueNotNullNode as condition. During
-// macro expansion, we replace the OpaqueNotNullNodes with true in product builds such that the actually unneeded checks
-// are folded and do not end up in the emitted code. In debug builds, we keep the actual checks as additional
-// verification code (i.e. removing OpaqueNotNullNodes and use the BoolNode inputs instead). For more details, also see
-// GraphKit::must_be_not_null().
-class OpaqueNotNullNode : public Node {
+// that the control path is also properly folded, we insert an If node with a OpaqueConstantBoolNode as condition.
+// During macro expansion, we replace the OpaqueConstantBoolNodes with true in product builds such that the actually
+// unneeded checks are folded and do not end up in the emitted code. In debug builds, we keep the actual checks as
+// additional verification code (i.e. removing OpaqueConstantBoolNodes and use the BoolNode inputs instead). For more
+// details, also see GraphKit::must_be_not_null().
+// Similarly, sometimes we know that a size or limit guard is checked (e.g. there is already a guard in the caller) but
+// the compiler cannot prove it. We could in principle avoid adding a guard in the intrinsic but in some cases (e.g.
+// when the input is a constant that breaks the guard and the caller guard is not inlined) the input of the intrinsic
+// can become top and the data path is folded. To ensure that the control path is also properly folded, we insert an
+// OpaqueConstantBoolNode before the If node in the guard. During macro expansion, we replace the OpaqueConstantBoolNode
+// with false in product builds such that the actually unneeded guards are folded and do not end up in the emitted code.
+// In debug builds, we keep the actual checks as additional verification code (i.e. removing OpaqueConstantBoolNodes and
+// use the BoolNode inputs instead).
+class OpaqueConstantBoolNode : public Node {
+ private:
+  const bool _constant;
  public:
-  OpaqueNotNullNode(Compile* C, Node* tst) : Node(nullptr, tst) {
-    init_class_id(Class_OpaqueNotNull);
+  OpaqueConstantBoolNode(Compile* C, Node* tst, bool constant) : Node(nullptr, tst), _constant(constant) {
+    assert(tst->is_Bool() || tst->is_Con(), "Test node must be a BoolNode or a constant");
+    init_class_id(Class_OpaqueConstantBool);
     init_flags(Flag_is_macro);
     C->add_macro_node(this);
   }
@@ -146,6 +157,9 @@ class OpaqueNotNullNode : public Node {
   virtual int Opcode() const;
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
+  int constant() const { return _constant ? 1 : 0; }
+  virtual uint size_of() const { return sizeof(OpaqueConstantBoolNode); }
+  NOT_PRODUCT(void dump_spec(outputStream* st) const);
 };
 
 // This node is used for Template Assertion Predicate BoolNodes. A Template Assertion Predicate is always removed
diff --git a/src/hotspot/share/opto/parse.hpp b/src/hotspot/share/opto/parse.hpp
index 19b302a8924..397a7796f88 100644
--- a/src/hotspot/share/opto/parse.hpp
+++ b/src/hotspot/share/opto/parse.hpp
@@ -442,7 +442,7 @@ class Parse : public GraphKit {
   SafePointNode* create_entry_map();
 
   // OSR helpers
-  Node *fetch_interpreter_state(int index, BasicType bt, Node *local_addrs, Node *local_addrs_base);
+  Node *fetch_interpreter_state(int index, BasicType bt, Node* local_addrs);
   Node* check_interpreter_type(Node* l, const Type* type, SafePointNode* &bad_type_exit);
   void  load_interpreter_state(Node* osr_buf);
 
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 7aa96d2ace3..2f699650037 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -103,10 +103,9 @@ void Parse::print_statistics() {
 // on stack replacement.
 Node *Parse::fetch_interpreter_state(int index,
                                      BasicType bt,
-                                     Node *local_addrs,
-                                     Node *local_addrs_base) {
+                                     Node* local_addrs) {
   Node *mem = memory(Compile::AliasIdxRaw);
-  Node *adr = basic_plus_adr( local_addrs_base, local_addrs, -index*wordSize );
+  Node *adr = basic_plus_adr(top(), local_addrs, -index*wordSize);
   Node *ctl = control();
 
   // Very similar to LoadNode::make, except we handle un-aligned longs and
@@ -121,7 +120,7 @@ Node *Parse::fetch_interpreter_state(int index,
   case T_DOUBLE: {
     // Since arguments are in reverse order, the argument address 'adr'
     // refers to the back half of the long/double.  Recompute adr.
-    adr = basic_plus_adr(local_addrs_base, local_addrs, -(index+1)*wordSize);
+    adr = basic_plus_adr(top(), local_addrs, -(index+1)*wordSize);
     if (Matcher::misaligned_doubles_ok) {
       l = (bt == T_DOUBLE)
         ? (Node*)new LoadDNode(ctl, mem, adr, TypeRawPtr::BOTTOM, Type::DOUBLE, MemNode::unordered)
@@ -220,7 +219,7 @@ void Parse::load_interpreter_state(Node* osr_buf) {
   // Commute monitors from interpreter frame to compiler frame.
   assert(jvms()->monitor_depth() == 0, "should be no active locks at beginning of osr");
   int mcnt = osr_block->flow()->monitor_count();
-  Node *monitors_addr = basic_plus_adr(osr_buf, osr_buf, (max_locals+mcnt*2-1)*wordSize);
+  Node *monitors_addr = basic_plus_adr(top(), osr_buf, (max_locals+mcnt*2-1)*wordSize);
   for (index = 0; index < mcnt; index++) {
     // Make a BoxLockNode for the monitor.
     BoxLockNode* osr_box = new BoxLockNode(next_monitor());
@@ -241,9 +240,9 @@ void Parse::load_interpreter_state(Node* osr_buf) {
     // Displaced headers and locked objects are interleaved in the
     // temp OSR buffer.  We only copy the locked objects out here.
     // Fetch the locked object from the OSR temp buffer and copy to our fastlock node.
-    Node *lock_object = fetch_interpreter_state(index*2, T_OBJECT, monitors_addr, osr_buf);
+    Node *lock_object = fetch_interpreter_state(index*2, T_OBJECT, monitors_addr);
     // Try and copy the displaced header to the BoxNode
-    Node *displaced_hdr = fetch_interpreter_state((index*2) + 1, T_ADDRESS, monitors_addr, osr_buf);
+    Node *displaced_hdr = fetch_interpreter_state((index*2) + 1, T_ADDRESS, monitors_addr);
 
 
     store_to_memory(control(), box, displaced_hdr, T_ADDRESS, MemNode::unordered);
@@ -271,7 +270,7 @@ void Parse::load_interpreter_state(Node* osr_buf) {
   }
 
   // Extract the needed locals from the interpreter frame.
-  Node *locals_addr = basic_plus_adr(osr_buf, osr_buf, (max_locals-1)*wordSize);
+  Node *locals_addr = basic_plus_adr(top(), osr_buf, (max_locals-1)*wordSize);
 
   // find all the locals that the interpreter thinks contain live oops
   const ResourceBitMap live_oops = method()->live_local_oops_at_bci(osr_bci());
@@ -318,7 +317,7 @@ void Parse::load_interpreter_state(Node* osr_buf) {
       // really for T_OBJECT types so correct it.
       bt = T_OBJECT;
     }
-    Node *value = fetch_interpreter_state(index, bt, locals_addr, osr_buf);
+    Node *value = fetch_interpreter_state(index, bt, locals_addr);
     set_local(index, value);
   }
 
@@ -1229,8 +1228,7 @@ void Parse::do_method_entry() {
       Node* not_subtype_ctrl = gen_subtype_check(receiver_obj, holder_klass);
       assert(!stopped(), "not a subtype");
 
-      Node* halt = _gvn.transform(new HaltNode(not_subtype_ctrl, frameptr(), "failed receiver subtype check"));
-      C->root()->add_req(halt);
+      halt(not_subtype_ctrl, frameptr(), "failed receiver subtype check");
     }
   }
 #endif // ASSERT
@@ -2129,7 +2127,7 @@ void Parse::call_register_finalizer() {
   Node* klass_addr = basic_plus_adr( receiver, receiver, oopDesc::klass_offset_in_bytes() );
   Node* klass = _gvn.transform(LoadKlassNode::make(_gvn, immutable_memory(), klass_addr, TypeInstPtr::KLASS));
 
-  Node* access_flags_addr = basic_plus_adr(klass, klass, in_bytes(Klass::misc_flags_offset()));
+  Node* access_flags_addr = basic_plus_adr(top(), klass, in_bytes(Klass::misc_flags_offset()));
   Node* access_flags = make_load(nullptr, access_flags_addr, TypeInt::UBYTE, T_BOOLEAN, MemNode::unordered);
 
   Node* mask  = _gvn.transform(new AndINode(access_flags, intcon(KlassFlags::_misc_has_finalizer)));
diff --git a/src/hotspot/share/opto/parseHelper.cpp b/src/hotspot/share/opto/parseHelper.cpp
index 1a1cea05454..2e8fca68a8d 100644
--- a/src/hotspot/share/opto/parseHelper.cpp
+++ b/src/hotspot/share/opto/parseHelper.cpp
@@ -220,7 +220,7 @@ void Parse::array_store_check() {
 
   // Extract the array element class
   int element_klass_offset = in_bytes(ObjArrayKlass::element_klass_offset());
-  Node* p2 = basic_plus_adr(array_klass, array_klass, element_klass_offset);
+  Node* p2 = basic_plus_adr(top(), array_klass, element_klass_offset);
   Node* a_e_klass = _gvn.transform(LoadKlassNode::make(_gvn, immutable_memory(), p2, tak));
   assert(array_klass->is_Con() == a_e_klass->is_Con() || StressReflectiveCode, "a constant array type must come with a constant element type");
 
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 1e4cd42e09a..3cbbc114778 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "opto/callnode.hpp"
 #include "opto/castnode.hpp"
 #include "opto/cfgnode.hpp"
+#include "opto/convertnode.hpp"
 #include "opto/idealGraphPrinter.hpp"
 #include "opto/loopnode.hpp"
 #include "opto/machnode.hpp"
@@ -532,6 +533,10 @@ void PhaseValues::init_con_caches() {
   memset(_zcons,0,sizeof(_zcons));
 }
 
+PhaseIterGVN* PhaseValues::is_IterGVN() {
+  return (_phase == PhaseValuesType::iter_gvn || _phase == PhaseValuesType::ccp) ? static_cast<PhaseIterGVN*>(this) : nullptr;
+}
+
 //--------------------------------find_int_type--------------------------------
 const TypeInt* PhaseValues::find_int_type(Node* n) {
   if (n == nullptr)  return nullptr;
@@ -762,26 +767,36 @@ bool PhaseGVN::is_dominator_helper(Node *d, Node *n, bool linear_only) {
 //------------------------------dead_loop_check--------------------------------
 // Check for a simple dead loop when a data node references itself directly
 // or through an other data node excluding cons and phis.
-void PhaseGVN::dead_loop_check( Node *n ) {
-  // Phi may reference itself in a loop
-  if (n != nullptr && !n->is_dead_loop_safe() && !n->is_CFG()) {
-    // Do 2 levels check and only data inputs.
-    bool no_dead_loop = true;
-    uint cnt = n->req();
-    for (uint i = 1; i < cnt && no_dead_loop; i++) {
-      Node *in = n->in(i);
-      if (in == n) {
-        no_dead_loop = false;
-      } else if (in != nullptr && !in->is_dead_loop_safe()) {
-        uint icnt = in->req();
-        for (uint j = 1; j < icnt && no_dead_loop; j++) {
-          if (in->in(j) == n || in->in(j) == in)
-            no_dead_loop = false;
-        }
+void PhaseGVN::dead_loop_check(Node* n) {
+  // Phi may reference itself in a loop.
+  if (n == nullptr || n->is_dead_loop_safe() || n->is_CFG()) {
+    return;
+  }
+
+  // Do 2 levels check and only data inputs.
+  for (uint i = 1; i < n->req(); i++) {
+    Node* in = n->in(i);
+    if (in == n) {
+      n->dump_bfs(100, nullptr, "");
+      fatal("Dead loop detected, node references itself: %s (%d)",
+            n->Name(), n->_idx);
+    }
+
+    if (in == nullptr || in->is_dead_loop_safe()) {
+      continue;
+    }
+    for (uint j = 1; j < in->req(); j++) {
+      if (in->in(j) == n) {
+        n->dump_bfs(100, nullptr, "");
+        fatal("Dead loop detected, node input references current node: %s (%d) -> %s (%d)",
+              in->Name(), in->_idx, n->Name(), n->_idx);
+      }
+      if (in->in(j) == in) {
+        n->dump_bfs(100, nullptr, "");
+        fatal("Dead loop detected, node input references itself: %s (%d)",
+              in->Name(), in->_idx);
       }
     }
-    if (!no_dead_loop) { n->dump_bfs(100, nullptr, ""); }
-    assert(no_dead_loop, "dead loop detected");
   }
 }
 
@@ -802,7 +817,7 @@ void PhaseGVN::dump_infinite_loop_info(Node* n, const char* where) {
 PhaseIterGVN::PhaseIterGVN(PhaseIterGVN* igvn) : _delay_transform(igvn->_delay_transform),
                                                  _worklist(*C->igvn_worklist())
 {
-  _iterGVN = true;
+  _phase = PhaseValuesType::iter_gvn;
   assert(&_worklist == &igvn->_worklist, "sanity");
 }
 
@@ -811,7 +826,7 @@ PhaseIterGVN::PhaseIterGVN(PhaseIterGVN* igvn) : _delay_transform(igvn->_delay_t
 PhaseIterGVN::PhaseIterGVN() : _delay_transform(false),
                                _worklist(*C->igvn_worklist())
 {
-  _iterGVN = true;
+  _phase = PhaseValuesType::iter_gvn;
   uint max;
 
   // Dead nodes in the hash table inherited from GVN were not treated as
@@ -1080,16 +1095,28 @@ void PhaseIterGVN::verify_optimize() {
       is_verify_invariants()) {
     ResourceMark rm;
     Unique_Node_List worklist;
-    bool failure = false;
     // BFS all nodes, starting at root
     worklist.push(C->root());
     for (uint j = 0; j < worklist.size(); ++j) {
       Node* n = worklist.at(j);
-      if (is_verify_Value())    { failure |= verify_Value_for(n); }
-      if (is_verify_Ideal())    { failure |= verify_Ideal_for(n, false); }
-      if (is_verify_Ideal())    { failure |= verify_Ideal_for(n, true); }
-      if (is_verify_Identity()) { failure |= verify_Identity_for(n); }
-      if (is_verify_invariants()) { failure |= verify_node_invariants_for(n); }
+      // If we get an assert here, check why the reported node was not processed again in IGVN.
+      // We should either make sure that this node is properly added back to the IGVN worklist
+      // in PhaseIterGVN::add_users_to_worklist to update it again or add an exception
+      // in the verification methods below if that is not possible for some reason (like Load nodes).
+      if (is_verify_Value()) {
+        verify_Value_for(n);
+      }
+      if (is_verify_Ideal()) {
+        verify_Ideal_for(n, false);
+        verify_Ideal_for(n, true);
+      }
+      if (is_verify_Identity()) {
+        verify_Identity_for(n);
+      }
+      if (is_verify_invariants()) {
+        verify_node_invariants_for(n);
+      }
+
       // traverse all inputs and outputs
       for (uint i = 0; i < n->req(); i++) {
         if (n->in(i) != nullptr) {
@@ -1100,11 +1127,6 @@ void PhaseIterGVN::verify_optimize() {
         worklist.push(n->fast_out(i));
       }
     }
-    // If we get this assert, check why the reported nodes were not processed again in IGVN.
-    // We should either make sure that these nodes are properly added back to the IGVN worklist
-    // in PhaseIterGVN::add_users_to_worklist to update them again or add an exception
-    // in the verification code above if that is not possible for some reason (like Load nodes).
-    assert(!failure, "Missed optimization opportunity/broken graph in PhaseIterGVN");
   }
 
   verify_empty_worklist(nullptr);
@@ -1129,18 +1151,18 @@ void PhaseIterGVN::verify_empty_worklist(Node* node) {
   assert(false, "igvn worklist must still be empty after verify");
 }
 
-// Check that type(n) == n->Value(), return true if we have a failure.
+// Check that type(n) == n->Value(), asserts if we have a failure.
 // We have a list of exceptions, see detailed comments in code.
 // (1) Integer "widen" changes, but the range is the same.
 // (2) LoadNode performs deep traversals. Load is not notified for changes far away.
 // (3) CmpPNode performs deep traversals if it compares oopptr. CmpP is not notified for changes far away.
-bool PhaseIterGVN::verify_Value_for(Node* n, bool strict) {
+void PhaseIterGVN::verify_Value_for(const Node* n, bool strict) {
   // If we assert inside type(n), because the type is still a null, then maybe
   // the node never went through gvn.transform, which would be a bug.
   const Type* told = type(n);
   const Type* tnew = n->Value(this);
   if (told == tnew) {
-    return false;
+    return;
   }
   // Exception (1)
   // Integer "widen" changes, but range is the same.
@@ -1149,7 +1171,7 @@ bool PhaseIterGVN::verify_Value_for(Node* n, bool strict) {
     const TypeInteger* t1 = tnew->is_integer(tnew->basic_type());
     if (t0->lo_as_long() == t1->lo_as_long() &&
         t0->hi_as_long() == t1->hi_as_long()) {
-      return false; // ignore integer widen
+      return; // ignore integer widen
     }
   }
   // Exception (2)
@@ -1158,7 +1180,7 @@ bool PhaseIterGVN::verify_Value_for(Node* n, bool strict) {
     // MemNode::can_see_stored_value looks up through many memory nodes,
     // which means we would need to notify modifications from far up in
     // the inputs all the way down to the LoadNode. We don't do that.
-    return false;
+    return;
   }
   // Exception (3)
   // CmpPNode performs deep traversals if it compares oopptr. CmpP is not notified for changes far away.
@@ -1174,10 +1196,10 @@ bool PhaseIterGVN::verify_Value_for(Node* n, bool strict) {
     // control sub of the allocation. The problems is that sometimes dominates answers
     // false conservatively, and later it can determine that it is indeed true. Loops with
     // Region heads can lead to giving up, whereas LoopNodes can be skipped easier, and
-    // so the traversal becomes more powerful. This is difficult to remidy, we would have
+    // so the traversal becomes more powerful. This is difficult to remedy, we would have
     // to notify the CmpP of CFG updates. Luckily, we recompute CmpP::Value during CCP
     // after loop-opts, so that should take care of many of these cases.
-    return false;
+    return;
   }
 
   stringStream ss; // Print as a block without tty lock.
@@ -1191,13 +1213,24 @@ bool PhaseIterGVN::verify_Value_for(Node* n, bool strict) {
   tnew->dump_on(&ss);
   ss.cr();
   tty->print_cr("%s", ss.as_string());
-  return true;
+
+  switch (_phase) {
+    case PhaseValuesType::iter_gvn:
+      assert(false, "Missed Value optimization opportunity in PhaseIterGVN for %s",n->Name());
+      break;
+    case PhaseValuesType::ccp:
+      assert(false, "PhaseCCP not at fixpoint: analysis result may be unsound for %s", n->Name());
+      break;
+    default:
+      assert(false, "Unexpected phase");
+      break;
+  }
 }
 
 // Check that all Ideal optimizations that could be done were done.
-// Returns true if it found missed optimization opportunities and
-//         false otherwise (no missed optimization, or skipped verification).
-bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
+// Asserts if it found missed optimization opportunities or encountered unexpected changes, and
+//         returns normally otherwise (no missed optimization, or skipped verification).
+void PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
   // First, we check a list of exceptions, where we skip verification,
   // because there are known cases where Ideal can optimize after IGVN.
   // Some may be expected and cannot be fixed, and others should be fixed.
@@ -1211,7 +1244,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xbatch --version
     case Op_RangeCheck:
-      return false;
+      return;
 
     // IfNode::Ideal does:
     //   Node* prev_dom = search_identical(dist, igvn);
@@ -1222,7 +1255,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_If:
-      return false;
+      return;
 
     // IfNode::simple_subsuming
     // Looks for dominating test that subsumes the current test.
@@ -1232,7 +1265,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   runtime/exceptionMsgs/ArrayIndexOutOfBoundsException/ArrayIndexOutOfBoundsExceptionTest.java#id1
     //   -XX:VerifyIterativeGVN=1110
     case Op_CountedLoopEnd:
-      return false;
+      return;
 
     // LongCountedLoopEndNode::Ideal
     // Probably same issue as above.
@@ -1241,7 +1274,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/predicates/assertion/TestAssertionPredicates.java#NoLoopPredicationXbatch
     //   -XX:StressLongCountedLoop=2000000 -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
     case Op_LongCountedLoopEnd:
-      return false;
+      return;
 
     // RegionNode::Ideal does "Skip around the useless IF diamond".
     //   245  IfTrue  === 244
@@ -1260,7 +1293,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_Region:
-      return false;
+      return;
 
     // In AddNode::Ideal, we call "commute", which swaps the inputs so
     // that smaller idx are first. Tracking it back, it led me to
@@ -1339,7 +1372,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     case Op_MulHF:
     case Op_MaxHF:
     case Op_MinHF:
-      return false;
+      return;
 
     // In MulNode::Ideal the edges can be swapped to help value numbering:
     //
@@ -1363,7 +1396,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java
     //    -XX:VerifyIterativeGVN=1110
     case Op_AndL:
-      return false;
+      return;
 
     // SubLNode::Ideal does transform like:
     //   Convert "c1 - (y+c0)" into "(c1-c0) - y"
@@ -1395,7 +1428,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_SubL:
-      return false;
+      return;
 
     // SubINode::Ideal does
     // Convert "x - (y+c0)" into "(x-y) - c0" AND
@@ -1407,7 +1440,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   test/hotspot/jtreg/compiler/c2/IVTest.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_SubI:
-      return false;
+      return;
 
     // AddNode::IdealIL does transform like:
     //   Convert x + (con - y) into "(x - y) + con"
@@ -1436,7 +1469,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_AddL:
-      return false;
+      return;
 
     // SubTypeCheckNode::Ideal calls SubTypeCheckNode::verify_helper, which does
     //   Node* cmp = phase->transform(new CmpPNode(subklass, in(SuperKlass)));
@@ -1461,7 +1494,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xbatch --version
     case Op_SubTypeCheck:
-      return false;
+      return;
 
     // LoopLimitNode::Ideal when stride is constant power-of-2, we can do a lowering
     // to other nodes: Conv, Add, Sub, Mul, And ...
@@ -1481,7 +1514,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Fond with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_LoopLimit:
-      return false;
+      return;
 
     // PhiNode::Ideal calls split_flow_path, which tries to do this:
     // "This optimization tries to find two or more inputs of phi with the same constant
@@ -1504,7 +1537,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_Phi:
-      return false;
+      return;
 
     // MemBarNode::Ideal does "Eliminate volatile MemBars for scalar replaced objects".
     // For examle "The allocated object does not escape".
@@ -1517,7 +1550,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_MemBarStoreStore:
-      return false;
+      return;
 
     // ConvI2LNode::Ideal converts
     //   648  AddI  === _ 583 645  [[ 661 ]]
@@ -1533,7 +1566,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
     case Op_ConvI2L:
-      return false;
+      return;
 
     // AddNode::IdealIL can do this transform (and similar other ones):
     //   Convert "a*b+a*c into a*(b+c)
@@ -1547,7 +1580,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   test/hotspot/jtreg/compiler/loopopts/superword/ReductionPerf.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_AddI:
-      return false;
+      return;
 
     // ArrayCopyNode::Ideal
     //    calls ArrayCopyNode::prepare_array_copy
@@ -1573,7 +1606,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/arraycopy/TestArrayCopyAsLoadsStores.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_ArrayCopy:
-      return false;
+      return;
 
     // CastLLNode::Ideal
     //    calls ConstraintCastNode::optimize_integer_cast -> pushes CastLL through SubL
@@ -1585,7 +1618,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/c2/TestMergeStoresMemorySegment.java#byte-array
     //   -XX:VerifyIterativeGVN=1110
     case Op_CastLL:
-      return false;
+      return;
 
     // Similar case happens to CastII
     //
@@ -1593,7 +1626,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/c2/TestScalarReplacementMaxLiveNodes.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_CastII:
-      return false;
+      return;
 
     // MaxLNode::Ideal
     //   calls AddNode::Ideal
@@ -1608,7 +1641,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   -XX:VerifyIterativeGVN=1110
     case Op_MaxL:
     case Op_MinL:
-      return false;
+      return;
 
     // OrINode::Ideal
     //   calls AddNode::Ideal
@@ -1622,7 +1655,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   -XX:VerifyIterativeGVN=1110
     case Op_OrI:
     case Op_OrL:
-      return false;
+      return;
 
     // Bool -> constant folded to 1.
     // Issue with notification?
@@ -1631,7 +1664,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/c2/irTests/TestVectorizationMismatchedAccess.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_Bool:
-      return false;
+      return;
 
     // LShiftLNode::Ideal
     // Looks at pattern: "(x + x) << c0", converts it to "x << (c0 + 1)"
@@ -1641,7 +1674,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/conversions/TestMoveConvI2LOrCastIIThruAddIs.java
     //   -ea -esa -XX:CompileThreshold=100 -XX:+UnlockExperimentalVMOptions -server -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
     case Op_LShiftL:
-      return false;
+      return;
 
     // LShiftINode::Ideal
     // pattern: ((x + con1) << con2) -> x << con2 + con1 << con2
@@ -1654,18 +1687,18 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   compiler/escapeAnalysis/Test6689060.java
     //   -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110 -ea -esa -XX:CompileThreshold=100 -XX:+UnlockExperimentalVMOptions -server -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
     case Op_LShiftI:
-      return false;
+      return;
 
     // AddPNode::Ideal seems to do set_req without removing lock first.
     // Found with various vector tests tier1-tier3.
     case Op_AddP:
-      return false;
+      return;
 
     // StrIndexOfNode::Ideal
     // Found in tier1-3.
     case Op_StrIndexOf:
     case Op_StrIndexOfChar:
-      return false;
+      return;
 
     // StrEqualsNode::Identity
     //
@@ -1674,7 +1707,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   -XX:+UnlockExperimentalVMOptions -XX:LockingMode=1 -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
     //   Note: The -XX:LockingMode option is not available anymore.
     case Op_StrEquals:
-      return false;
+      return;
 
     // AryEqNode::Ideal
     // Not investigated. Reshapes itself and adds lots of nodes to the worklist.
@@ -1683,22 +1716,17 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //   vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java
     //   -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -XX:+StressUnstableIfTraps -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
     case Op_AryEq:
-      return false;
+      return;
 
     // MergeMemNode::Ideal
     // Found in tier1-3. Did not investigate further yet.
     case Op_MergeMem:
-      return false;
-
-    // URShiftINode::Ideal
-    // Found in tier1-3. Did not investigate further yet.
-    case Op_URShiftI:
-      return false;
+      return;
 
     // CMoveINode::Ideal
     // Found in tier1-3. Did not investigate further yet.
     case Op_CMoveI:
-      return false;
+      return;
 
     // CmpPNode::Ideal calls isa_const_java_mirror
     // and generates new constant nodes, even if no progress is made.
@@ -1709,14 +1737,14 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=1110 -Xcomp --version
     case Op_CmpP:
-      return false;
+      return;
 
     // MinINode::Ideal
     // Did not investigate, but there are some patterns that might
     // need more notification.
     case Op_MinI:
     case Op_MaxI: // preemptively removed it as well.
-      return false;
+      return;
   }
 
   if (n->is_Load()) {
@@ -1732,7 +1760,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   test/hotspot/jtreg/compiler/arraycopy/TestCloneAccess.java
     //   -XX:VerifyIterativeGVN=1110
-    return false;
+    return;
   }
 
   if (n->is_Store()) {
@@ -1746,7 +1774,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     //
     // Found with:
     //   java -XX:VerifyIterativeGVN=0100 -Xcomp --version
-    return false;
+    return;
   }
 
   if (n->is_Vector()) {
@@ -1765,7 +1793,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   compiler/vectorapi/TestMaskedMacroLogicVector.java
     //   -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110 -XX:+UseParallelGC -XX:+UseNUMA
-    return false;
+    return;
   }
 
   if (n->is_Region()) {
@@ -1784,7 +1812,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   compiler/eliminateAutobox/TestShortBoxing.java
     //   -ea -esa -XX:CompileThreshold=100 -XX:+UnlockExperimentalVMOptions -server -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
-    return false;
+    return;
   }
 
   if (n->is_CallJava()) {
@@ -1816,13 +1844,19 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
     // Found with:
     //   compiler/loopopts/superword/TestDependencyOffsets.java#vanilla-U
     //   -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
-    return false;
+    return;
   }
 
   // The number of nodes shoud not increase.
   uint old_unique = C->unique();
   // The hash of a node should not change, this would indicate different inputs
   uint old_hash = n->hash();
+  // Remove 'n' from hash table in case it gets modified. We want to avoid
+  // hitting the "Need to remove from hash before changing edges" assert if
+  // a change occurs. Instead, we would like to proceed with the optimization,
+  // return and finally hit the assert in PhaseIterGVN::verify_optimize to get
+  // a more meaningful message
+  _table.hash_delete(n);
   Node* i = n->Ideal(this, can_reshape);
   // If there was no new Idealization, we are probably happy.
   if (i == nullptr) {
@@ -1833,7 +1867,7 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
       ss.print_cr("  old_unique = %d, unique = %d", old_unique, C->unique());
       n->dump_bfs(1, nullptr, "", &ss);
       tty->print_cr("%s", ss.as_string());
-      return true;
+      assert(false, "Unexpected new unused nodes from applying Ideal optimization on %s", n->Name());
     }
 
     if (old_hash != n->hash()) {
@@ -1843,13 +1877,14 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
       ss.print_cr("  old_hash = %d, hash = %d", old_hash, n->hash());
       n->dump_bfs(1, nullptr, "", &ss);
       tty->print_cr("%s", ss.as_string());
-      return true;
+      assert(false, "Unexpected hash change from applying Ideal optimization on %s", n->Name());
     }
 
     verify_empty_worklist(n);
 
     // Everything is good.
-    return false;
+    hash_find_insert(n);
+    return;
   }
 
   // We just saw a new Idealization which was not done during IGVN.
@@ -1866,13 +1901,14 @@ bool PhaseIterGVN::verify_Ideal_for(Node* n, bool can_reshape) {
   ss.print_cr("The result after Ideal:");
   i->dump_bfs(1, nullptr, "", &ss);
   tty->print_cr("%s", ss.as_string());
-  return true;
+
+  assert(false, "Missed Ideal optimization opportunity in PhaseIterGVN for %s", n->Name());
 }
 
 // Check that all Identity optimizations that could be done were done.
-// Returns true if it found missed optimization opportunities and
-//         false otherwise (no missed optimization, or skipped verification).
-bool PhaseIterGVN::verify_Identity_for(Node* n) {
+// Asserts if it found missed optimization opportunities, and
+//         returns normally otherwise (no missed optimization, or skipped verification).
+void PhaseIterGVN::verify_Identity_for(Node* n) {
   // First, we check a list of exceptions, where we skip verification,
   // because there are known cases where Ideal can optimize after IGVN.
   // Some may be expected and cannot be fixed, and others should be fixed.
@@ -1891,7 +1927,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=1000 -Xcomp --version
     case Op_SafePoint:
-      return false;
+      return;
 
     // MergeMemNode::Identity replaces the MergeMem with its base_memory if it
     // does not record any other memory splits.
@@ -1902,7 +1938,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     // Found with:
     //   java -XX:VerifyIterativeGVN=1000 -Xcomp --version
     case Op_MergeMem:
-      return false;
+      return;
 
     // ConstraintCastNode::Identity finds casts that are the same, except that
     // the control is "higher up", i.e. dominates. The call goes via
@@ -1916,7 +1952,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     case Op_CastPP:
     case Op_CastII:
     case Op_CastLL:
-      return false;
+      return;
 
     // Same issue for CheckCastPP, uses ConstraintCastNode::Identity and
     // checks dominator, which may be changed, but too far up for notification
@@ -1926,7 +1962,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     //   compiler/c2/irTests/TestSkeletonPredicates.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_CheckCastPP:
-      return false;
+      return;
 
     // In SubNode::Identity, we do:
     //   Convert "(X+Y) - Y" into X and "(X+Y) - X" into Y
@@ -1944,7 +1980,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     //   java -XX:VerifyIterativeGVN=1000 -Xcomp --version
     case Op_SubI:
     case Op_SubL:
-      return false;
+      return;
 
     // PhiNode::Identity checks for patterns like:
     //   r = (x != con) ? x : con;
@@ -1958,7 +1994,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     //   test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
     //   -XX:VerifyIterativeGVN=1110
     case Op_Phi:
-      return false;
+      return;
 
     // ConvI2LNode::Identity does
     // convert I2L(L2I(x)) => x
@@ -1969,46 +2005,12 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     //   compiler/loopopts/superword/TestDependencyOffsets.java#vanilla-A
     //   -XX:VerifyIterativeGVN=1110
     case Op_ConvI2L:
-      return false;
-
-    // MaxNode::find_identity_operation
-    //  Finds patterns like Max(A, Max(A, B)) -> Max(A, B)
-    //  This can be a 2-hop search, so maybe notification is not
-    //  good enough.
-    //
-    // Found with:
-    //   compiler/codegen/TestBooleanVect.java
-    //   -XX:VerifyIterativeGVN=1110
-    case Op_MaxL:
-    case Op_MinL:
-    case Op_MaxI:
-    case Op_MinI:
-    case Op_MaxF:
-    case Op_MinF:
-    case Op_MaxHF:
-    case Op_MinHF:
-    case Op_MaxD:
-    case Op_MinD:
-      return false;
-
-
-    // AddINode::Identity
-    // Converts (x-y)+y to x
-    // Could be issue with notification
-    //
-    // Turns out AddL does the same.
-    //
-    // Found with:
-    //  compiler/c2/Test6792161.java
-    //  -ea -esa -XX:CompileThreshold=100 -XX:+UnlockExperimentalVMOptions -server -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
-    case Op_AddI:
-    case Op_AddL:
-      return false;
+      return;
 
     // AbsINode::Identity
     // Not investigated yet.
     case Op_AbsI:
-      return false;
+      return;
   }
 
   if (n->is_Load()) {
@@ -2022,7 +2024,7 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     //
     // Found with:
     //   java -XX:VerifyIterativeGVN=1000 -Xcomp --version
-    return false;
+    return;
   }
 
   if (n->is_Store()) {
@@ -2033,20 +2035,20 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
     // Found with:
     //   applications/ctw/modules/java_base_2.java
     //   -ea -esa -XX:CompileThreshold=100 -XX:+UnlockExperimentalVMOptions -server -XX:-TieredCompilation -Djava.awt.headless=true -XX:+IgnoreUnrecognizedVMOptions -XX:VerifyIterativeGVN=1110
-    return false;
+    return;
   }
 
   if (n->is_Vector()) {
     // Found with tier1-3. Not investigated yet.
     // The observed issue was with AndVNode::Identity
-    return false;
+    return;
   }
 
   Node* i = n->Identity(this);
   // If we cannot find any other Identity, we are happy.
   if (i == n) {
     verify_empty_worklist(n);
-    return false;
+    return;
   }
 
   // The verification just found a new Identity that was not found during IGVN.
@@ -2058,11 +2060,12 @@ bool PhaseIterGVN::verify_Identity_for(Node* n) {
   ss.print_cr("New node:");
   i->dump_bfs(1, nullptr, "", &ss);
   tty->print_cr("%s", ss.as_string());
-  return true;
+
+  assert(false, "Missed Identity optimization opportunity in PhaseIterGVN for %s", n->Name());
 }
 
 // Some other verifications that are not specific to a particular transformation.
-bool PhaseIterGVN::verify_node_invariants_for(const Node* n) {
+void PhaseIterGVN::verify_node_invariants_for(const Node* n) {
   if (n->is_AddP()) {
     if (!n->as_AddP()->address_input_has_same_base()) {
       stringStream ss; // Print as a block without tty lock.
@@ -2070,10 +2073,10 @@ bool PhaseIterGVN::verify_node_invariants_for(const Node* n) {
       ss.print_cr("Base pointers must match for AddP chain:");
       n->dump_bfs(2, nullptr, "", &ss);
       tty->print_cr("%s", ss.as_string());
-      return true;
+
+      assert(false, "Broken node invariant for %s", n->Name());
     }
   }
-  return false;
 }
 #endif
 
@@ -2126,9 +2129,15 @@ Node *PhaseIterGVN::transform_old(Node* n) {
   DEBUG_ONLY(dead_loop_check(k);)
   DEBUG_ONLY(bool is_new = (k->outcnt() == 0);)
   C->remove_modified_node(k);
+#ifndef PRODUCT
+  uint hash_before = is_verify_Ideal_return() ? k->hash() : 0;
+#endif
   Node* i = apply_ideal(k, /*can_reshape=*/true);
   assert(i != k || is_new || i->outcnt() > 0, "don't return dead nodes");
 #ifndef PRODUCT
+  if (is_verify_Ideal_return()) {
+    assert(k->outcnt() == 0 || i != nullptr || hash_before == k->hash(), "hash changed after Ideal returned nullptr for %s", k->Name());
+  }
   verify_step(k);
 #endif
 
@@ -2152,9 +2161,15 @@ Node *PhaseIterGVN::transform_old(Node* n) {
     // Try idealizing again
     DEBUG_ONLY(is_new = (k->outcnt() == 0);)
     C->remove_modified_node(k);
+#ifndef PRODUCT
+    uint hash_before = is_verify_Ideal_return() ? k->hash() : 0;
+#endif
     i = apply_ideal(k, /*can_reshape=*/true);
     assert(i != k || is_new || (i->outcnt() > 0), "don't return dead nodes");
 #ifndef PRODUCT
+    if (is_verify_Ideal_return()) {
+      assert(k->outcnt() == 0 || i != nullptr || hash_before == k->hash(), "hash changed after Ideal returned nullptr for %s", k->Name());
+    }
     verify_step(k);
 #endif
     DEBUG_ONLY(loop_count++;)
@@ -2541,12 +2556,15 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
     auto is_boundary = [](Node* n){ return !n->is_ConstraintCast(); };
     use->visit_uses(push_the_uses_to_worklist, is_boundary);
   }
-  // If changed LShift inputs, check RShift users for useless sign-ext
+  // If changed LShift inputs, check RShift/URShift users for
+  // "(X << C) >> C" sign-ext and "(X << C) >>> C" zero-ext optimizations.
   if (use_op == Op_LShiftI || use_op == Op_LShiftL) {
     for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
       Node* u = use->fast_out(i2);
-      if (u->Opcode() == Op_RShiftI || u->Opcode() == Op_RShiftL)
+      if (u->Opcode() == Op_RShiftI || u->Opcode() == Op_RShiftL ||
+          u->Opcode() == Op_URShiftI || u->Opcode() == Op_URShiftL) {
         worklist.push(u);
+      }
     }
   }
   // If changed LShift inputs, check And users for shift and mask (And) operation
@@ -2598,6 +2616,26 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
+  // ConvD2F::Ideal matches ConvD2F(SqrtD(ConvF2D(x))) => SqrtF(x).
+  // Notify ConvD2F users of SqrtD when any input of the SqrtD changes.
+  if (use_op == Op_SqrtD) {
+    for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
+      Node* u = use->fast_out(i2);
+      if (u->Opcode() == Op_ConvD2F) {
+        worklist.push(u);
+      }
+    }
+  }
+  // ConvF2HF::Ideal matches ConvF2HF(binopF(ConvHF2F(...))) => FP16BinOp(...).
+  // Notify ConvF2HF users of float binary ops when any input changes.
+  if (Float16NodeFactory::is_float32_binary_oper(use_op)) {
+    for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
+      Node* u = use->fast_out(i2);
+      if (u->Opcode() == Op_ConvF2HF) {
+        worklist.push(u);
+      }
+    }
+  }
   // If changed AddP inputs:
   // - check Stores for loop invariant, and
   // - if the changed input is the offset, check constant-offset AddP users for
@@ -2623,6 +2661,15 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
       }
     }
   }
+  // Check for Max/Min(A, Max/Min(B, C)) where A == B or A == C
+  if (use->is_MinMax()) {
+    for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
+      Node* u = use->fast_out(i2);
+      if (u->is_MinMax()) {
+        worklist.push(u);
+      }
+    }
+  }
   auto enqueue_init_mem_projs = [&](ProjNode* proj) {
     add_users_to_worklist0(proj, worklist);
   };
@@ -2718,6 +2765,18 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
     };
     use->visit_uses(push_and_to_worklist, is_boundary);
   }
+
+  // If changed Sub inputs, check Add for identity.
+  // e.g., (x - y) + y -> x; x + (y - x) -> y.
+  if (use_op == Op_SubI || use_op == Op_SubL) {
+    const int add_op = (use_op == Op_SubI) ? Op_AddI : Op_AddL;
+    for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
+      Node* u = use->fast_out(i2);
+      if (u->Opcode() == add_op) {
+        worklist.push(u);
+      }
+    }
+  }
 }
 
 /**
@@ -2734,37 +2793,6 @@ void PhaseIterGVN::remove_speculative_types()  {
   _table.check_no_speculative_types();
 }
 
-// Check if the type of a divisor of a Div or Mod node includes zero.
-bool PhaseIterGVN::no_dependent_zero_check(Node* n) const {
-  switch (n->Opcode()) {
-    case Op_DivI:
-    case Op_ModI:
-    case Op_UDivI:
-    case Op_UModI: {
-      // Type of divisor includes 0?
-      if (type(n->in(2)) == Type::TOP) {
-        // 'n' is dead. Treat as if zero check is still there to avoid any further optimizations.
-        return false;
-      }
-      const TypeInt* type_divisor = type(n->in(2))->is_int();
-      return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
-    }
-    case Op_DivL:
-    case Op_ModL:
-    case Op_UDivL:
-    case Op_UModL: {
-      // Type of divisor includes 0?
-      if (type(n->in(2)) == Type::TOP) {
-        // 'n' is dead. Treat as if zero check is still there to avoid any further optimizations.
-        return false;
-      }
-      const TypeLong* type_divisor = type(n->in(2))->is_long();
-      return (type_divisor->_hi < 0 || type_divisor->_lo > 0);
-    }
-  }
-  return true;
-}
-
 //=============================================================================
 #ifndef PRODUCT
 uint PhaseCCP::_total_invokes   = 0;
@@ -2775,6 +2803,7 @@ uint PhaseCCP::_total_constants = 0;
 PhaseCCP::PhaseCCP( PhaseIterGVN *igvn ) : PhaseIterGVN(igvn) {
   NOT_PRODUCT( clear_constants(); )
   assert( _worklist.size() == 0, "" );
+  _phase = PhaseValuesType::ccp;
   analyze();
 }
 
@@ -2895,17 +2924,18 @@ bool PhaseCCP::needs_revisit(Node* n) const {
 // Note for CCP the non-convergence can lead to unsound analysis and mis-compilation.
 // Therefore, we are verifying Value convergence strictly.
 void PhaseCCP::verify_analyze(Unique_Node_List& worklist_verify) {
-  bool failure = false;
   while (worklist_verify.size()) {
     Node* n = worklist_verify.pop();
-    failure |= verify_Value_for(n, /* strict = */ true);
+
+    // An assert in verify_Value_for means that PhaseCCP is not at fixpoint
+    // and that the analysis result may be unsound.
+    // If this happens, check why the reported nodes were not processed again in CCP.
+    // We should either make sure that these nodes are properly added back to the CCP worklist
+    // in PhaseCCP::push_child_nodes_to_worklist() to update their type in the same round,
+    // or that they are added in PhaseCCP::needs_revisit() so that analysis revisits
+    // them at the end of the round.
+    verify_Value_for(n, true);
   }
-  // If we get this assert, check why the reported nodes were not processed again in CCP.
-  // We should either make sure that these nodes are properly added back to the CCP worklist
-  // in PhaseCCP::push_child_nodes_to_worklist() to update their type in the same round,
-  // or that they are added in PhaseCCP::needs_revisit() so that analysis revisits
-  // them at the end of the round.
-  assert(!failure, "PhaseCCP not at fixpoint: analysis result may be unsound.");
 }
 #endif
 
diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp
index 3f75aab8980..cd38f37ccf5 100644
--- a/src/hotspot/share/opto/phaseX.hpp
+++ b/src/hotspot/share/opto/phaseX.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -224,7 +224,13 @@ public:
 // 3) NodeHash table, to find identical nodes (and remove/update the hash of a node on modification).
 class PhaseValues : public PhaseTransform {
 protected:
-  bool      _iterGVN;
+  enum class PhaseValuesType {
+    gvn,
+    iter_gvn,
+    ccp
+  };
+
+  PhaseValuesType _phase;
 
   // Hash table for value-numbering. Reference to "C->node_hash()",
   NodeHash &_table;
@@ -247,7 +253,7 @@ protected:
   void init_con_caches();
 
 public:
-  PhaseValues() : PhaseTransform(GVN), _iterGVN(false),
+  PhaseValues() : PhaseTransform(GVN), _phase(PhaseValuesType::gvn),
                   _table(*C->node_hash()), _types(*C->types())
   {
     NOT_PRODUCT( clear_new_values(); )
@@ -256,7 +262,7 @@ public:
     init_con_caches();
   }
   NOT_PRODUCT(~PhaseValues();)
-  PhaseIterGVN* is_IterGVN() { return (_iterGVN) ? (PhaseIterGVN*)this : nullptr; }
+  PhaseIterGVN* is_IterGVN();
 
   // Some Ideal and other transforms delete --> modify --> insert values
   bool   hash_delete(Node* n)     { return _table.hash_delete(n); }
@@ -490,10 +496,10 @@ public:
   void optimize();
 #ifdef ASSERT
   void verify_optimize();
-  bool verify_Value_for(Node* n, bool strict = false);
-  bool verify_Ideal_for(Node* n, bool can_reshape);
-  bool verify_Identity_for(Node* n);
-  bool verify_node_invariants_for(const Node* n);
+  void verify_Value_for(const Node* n, bool strict = false);
+  void verify_Ideal_for(Node* n, bool can_reshape);
+  void verify_Identity_for(Node* n);
+  void verify_node_invariants_for(const Node* n);
   void verify_empty_worklist(Node* n);
 #endif
 
@@ -598,7 +604,6 @@ public:
   }
 
   bool is_dominator(Node *d, Node *n) { return is_dominator_helper(d, n, false); }
-  bool no_dependent_zero_check(Node* n) const;
 
 #ifndef PRODUCT
   static bool is_verify_def_use() {
@@ -621,6 +626,10 @@ public:
     // '-XX:VerifyIterativeGVN=10000'
     return ((VerifyIterativeGVN % 100000) / 10000) == 1;
   }
+  static bool is_verify_Ideal_return() {
+    // '-XX:VerifyIterativeGVN=100000'
+    return ((VerifyIterativeGVN % 1000000) / 100000) == 1;
+  }
 protected:
   // Sub-quadratic implementation of '-XX:VerifyIterativeGVN=1' (Use-Def verification).
   julong _verify_counter;
diff --git a/src/hotspot/share/opto/rangeinference.hpp b/src/hotspot/share/opto/rangeinference.hpp
index ebfd98ca4a6..66ea741a2da 100644
--- a/src/hotspot/share/opto/rangeinference.hpp
+++ b/src/hotspot/share/opto/rangeinference.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,7 +147,7 @@ public:
   static const Type* int_type_xmeet(const CT* i1, const Type* t2);
 
   template <class CTP>
-  static CTP int_type_union(CTP t1, CTP t2) {
+  static auto int_type_union(CTP t1, CTP t2) {
     using CT = std::conditional_t<std::is_pointer_v<CTP>, std::remove_pointer_t<CTP>, CTP>;
     using S = std::remove_const_t<decltype(CT::_lo)>;
     using U = std::remove_const_t<decltype(CT::_ulo)>;
@@ -209,7 +209,7 @@ public:
   KnownBits<U> _bits;
   int _widen = 0; // dummy field to mimic the same field in TypeInt, useful in testing
 
-  static TypeIntMirror make(const TypeIntPrototype<S, U>& t, int widen) {
+  static TypeIntMirror make(const TypeIntPrototype<S, U>& t, int widen = 0) {
     auto canonicalized_t = t.canonicalize_constraints();
     assert(!canonicalized_t.empty(), "must not be empty");
     return TypeIntMirror{canonicalized_t._data._srange._lo, canonicalized_t._data._srange._hi,
@@ -217,11 +217,15 @@ public:
                          canonicalized_t._data._bits};
   }
 
+  TypeIntMirror meet(const TypeIntMirror& o) const {
+    return TypeIntHelper::int_type_union(this, &o);
+  }
+
   // These allow TypeIntMirror to mimick the behaviors of TypeInt* and TypeLong*, so they can be
   // passed into RangeInference methods. These are only used in testing, so they are implemented in
   // the test file.
+  static TypeIntMirror make(const TypeIntMirror& t, int widen);
   const TypeIntMirror* operator->() const;
-  TypeIntMirror meet(const TypeIntMirror& o) const;
   bool contains(U u) const;
   bool contains(const TypeIntMirror& o) const;
   bool operator==(const TypeIntMirror& o) const;
@@ -322,7 +326,7 @@ private:
   // Infer a result given the input types of a binary operation
   template <class CTP, class Inference>
   static CTP infer_binary(CTP t1, CTP t2, Inference infer) {
-    CTP res;
+    TypeIntMirror<S<CTP>, U<CTP>> res;
     bool is_init = false;
 
     SimpleIntervalIterable<CTP> t1_simple_intervals(t1);
@@ -330,10 +334,10 @@ private:
 
     for (auto& st1 : t1_simple_intervals) {
       for (auto& st2 : t2_simple_intervals) {
-        CTP current = infer(st1, st2);
+        TypeIntMirror<S<CTP>, U<CTP>> current = infer(st1, st2);
 
         if (is_init) {
-          res = res->meet(current)->template cast<CT<CTP>>();
+          res = res.meet(current);
         } else {
           is_init = true;
           res = current;
@@ -342,7 +346,22 @@ private:
     }
 
     assert(is_init, "must be initialized");
-    return res;
+    // It is important that widen is computed on the whole result instead of during each step. This
+    // is because we normalize the widen of small Type instances to 0, so computing the widen value
+    // for each step and taking the union of them may return a widen value that conflicts with
+    // other computations, trigerring the monotonicity assert during CCP.
+    //
+    // For example, let us consider the operation r = x ^ y:
+    // - During the first step of CCP, type(x) = {0}, type(y) = [-2, 2], w = 3.
+    //   Since x is a constant that is the identity element of the xor operation, type(r) = type(y) = [-2, 2], w = 3
+    // - During the second step, type(x) is widened to [0, 2], w = 0.
+    //   We then compute the range for:
+    //   r1 = x ^ y1, type(x) = [0, 2], w = 0, type(y1) = [0, 2], w = 0
+    //   r2 = x ^ y2, type(x) = [0, 2], w = 0, type(y2) = [-2, -1], w = 0
+    //   This results in type(r1) = [0, 3], w = 0, and type(r2) = [-4, -1], w = 0
+    //   So the union of type(r1) and type(r2) is [-4, 3], w = 0. This widen value is smaller than
+    //   that of the previous step, triggering the monotonicity assert.
+    return CT<CTP>::make(res, MAX2(t1->_widen, t2->_widen));
   }
 
 public:
@@ -357,7 +376,7 @@ public:
       U<CTP> uhi = MIN2(st1._uhi, st2._uhi);
       U<CTP> zeros = st1._bits._zeros | st2._bits._zeros;
       U<CTP> ones = st1._bits._ones & st2._bits._ones;
-      return CT<CTP>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, MAX2(t1->_widen, t2->_widen));
+      return TypeIntMirror<S<CTP>, U<CTP>>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}});
     });
   }
 
@@ -372,7 +391,7 @@ public:
       U<CTP> uhi = std::numeric_limits<U<CTP>>::max();
       U<CTP> zeros = st1._bits._zeros & st2._bits._zeros;
       U<CTP> ones = st1._bits._ones | st2._bits._ones;
-      return CT<CTP>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, MAX2(t1->_widen, t2->_widen));
+      return TypeIntMirror<S<CTP>, U<CTP>>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}});
     });
   }
 
@@ -385,7 +404,7 @@ public:
       U<CTP> uhi = std::numeric_limits<U<CTP>>::max();
       U<CTP> zeros = (st1._bits._zeros & st2._bits._zeros) | (st1._bits._ones & st2._bits._ones);
       U<CTP> ones = (st1._bits._zeros & st2._bits._ones) | (st1._bits._ones & st2._bits._zeros);
-      return CT<CTP>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}}, MAX2(t1->_widen, t2->_widen));
+      return TypeIntMirror<S<CTP>, U<CTP>>::make(TypeIntPrototype<S<CTP>, U<CTP>>{{lo, hi}, {ulo, uhi}, {zeros, ones}});
     });
   }
 };
diff --git a/src/hotspot/share/opto/rootnode.hpp b/src/hotspot/share/opto/rootnode.hpp
index 3838578b4db..76f0ec440a9 100644
--- a/src/hotspot/share/opto/rootnode.hpp
+++ b/src/hotspot/share/opto/rootnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,6 @@ public:
   virtual const Type *bottom_type() const;
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash
-  virtual bool depends_only_on_test() const { return false; }
   virtual const Node *is_block_proj() const { return this; }
   virtual const RegMask &out_RegMask() const;
   virtual uint ideal_reg() const { return NotAMachineReg; }
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 6dbbfb0a130..0d2dbb813bd 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -1865,6 +1865,8 @@ JRT_ENTRY_NO_ASYNC(address, OptoRuntime::handle_exception_C_helper(JavaThread* c
   // has updated oops.
   StackWatermarkSet::after_unwind(current);
 
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
+
   // Do not confuse exception_oop with pending_exception. The exception_oop
   // is only used to pass arguments into the method. Not for general
   // exception handling.  DO NOT CHANGE IT to use pending_exception, since
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index 425c0c9e99d..dff8bf86606 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 #include "opto/movenode.hpp"
 #include "opto/node.hpp"
 #include "opto/opaquenode.hpp"
+#include "opto/opcodes.hpp"
 #include "opto/predicates.hpp"
 
 //------------------------------split_thru_region------------------------------
@@ -307,7 +308,7 @@ bool PhaseIdealLoop::clone_cmp_down(Node* n, const Node* blk1, const Node* blk2)
           assert( bol->is_Bool(), "" );
           if (bol->outcnt() == 1) {
             Node* use = bol->unique_out();
-            if (use->is_OpaqueNotNull() || use->is_OpaqueTemplateAssertionPredicate() ||
+            if (use->is_OpaqueConstantBool() || use->is_OpaqueTemplateAssertionPredicate() ||
                 use->is_OpaqueInitializedAssertionPredicate()) {
               if (use->outcnt() == 1) {
                 Node* iff = use->unique_out();
@@ -331,8 +332,8 @@ bool PhaseIdealLoop::clone_cmp_down(Node* n, const Node* blk1, const Node* blk2)
             // Recursively sink any BoolNode
             for (DUIterator j = bol->outs(); bol->has_out(j); j++) {
               Node* u = bol->out(j);
-              // Uses are either IfNodes, CMoves, OpaqueNotNull, or Opaque*AssertionPredicate
-              if (u->is_OpaqueNotNull() || u->is_OpaqueTemplateAssertionPredicate() ||
+              // Uses are either IfNodes, CMoves, OpaqueConstantBool or Opaque*AssertionPredicate
+              if (u->is_OpaqueConstantBool() || u->is_OpaqueTemplateAssertionPredicate() ||
                   u->is_OpaqueInitializedAssertionPredicate()) {
                 assert(u->in(1) == bol, "bad input");
                 for (DUIterator_Last kmin, k = u->last_outs(kmin); k >= kmin; --k) {
@@ -716,14 +717,11 @@ void PhaseIdealLoop::do_split_if(Node* iff, RegionNode** new_false_region, Regio
   } // End of while merge point has phis
 
   _igvn.remove_dead_node(region);
-  if (iff->Opcode() == Op_RangeCheck) {
-    // Pin array access nodes: control is updated here to a region. If, after some transformations, only one path
-    // into the region is left, an array load could become dependent on a condition that's not a range check for
-    // that access. If that condition is replaced by an identical dominating one, then an unpinned load would risk
-    // floating above its range check.
-    pin_array_access_nodes_dependent_on(new_true);
-    pin_array_access_nodes_dependent_on(new_false);
-  }
+
+  // Control is updated here to a region, which is not a test, so any node that
+  // depends_only_on_test must be pinned
+  pin_nodes_dependent_on(new_true, iff->Opcode() == Op_RangeCheck);
+  pin_nodes_dependent_on(new_false, iff->Opcode() == Op_RangeCheck);
 
   if (new_false_region != nullptr) {
     *new_false_region = new_false;
@@ -735,13 +733,22 @@ void PhaseIdealLoop::do_split_if(Node* iff, RegionNode** new_false_region, Regio
   DEBUG_ONLY( if (VerifyLoopOptimizations) { verify(); } );
 }
 
-void PhaseIdealLoop::pin_array_access_nodes_dependent_on(Node* ctrl) {
+void PhaseIdealLoop::pin_nodes_dependent_on(Node* ctrl, bool old_iff_is_rangecheck) {
   for (DUIterator i = ctrl->outs(); ctrl->has_out(i); i++) {
     Node* use = ctrl->out(i);
     if (!use->depends_only_on_test()) {
       continue;
     }
-    Node* pinned_clone = use->pin_array_access_node();
+
+
+    // When a RangeCheckNode is folded because its condition is a constant, IfProjNode::Identity
+    // returns the control input of the RangeCheckNode. As a result, when the old IfNode is not a
+    // RangeCheckNode, and a Load output of it depends_only_on_test, we don't need to pin the Load.
+    if (use->is_Load() && !old_iff_is_rangecheck) {
+      continue;
+    }
+
+    Node* pinned_clone = use->pin_node_under_control();
     if (pinned_clone != nullptr) {
       register_new_node_with_ctrl_of(pinned_clone, use);
       _igvn.replace_node(use, pinned_clone);
diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp
index a10cd2a8d5b..548df58eb35 100644
--- a/src/hotspot/share/opto/subnode.cpp
+++ b/src/hotspot/share/opto/subnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -745,71 +745,40 @@ const Type* CmpINode::Value(PhaseGVN* phase) const {
 
 // Simplify a CmpU (compare 2 integers) node, based on local information.
 // If both inputs are constants, compare them.
-const Type *CmpUNode::sub( const Type *t1, const Type *t2 ) const {
-  assert(!t1->isa_ptr(), "obsolete usage of CmpU");
+const Type* CmpUNode::sub(const Type* t1, const Type* t2) const {
+  const TypeInt* r0 = t1->is_int();
+  const TypeInt* r1 = t2->is_int();
 
-  // comparing two unsigned ints
-  const TypeInt *r0 = t1->is_int();   // Handy access
-  const TypeInt *r1 = t2->is_int();
-
-  // Current installed version
-  // Compare ranges for non-overlap
-  juint lo0 = r0->_lo;
-  juint hi0 = r0->_hi;
-  juint lo1 = r1->_lo;
-  juint hi1 = r1->_hi;
-
-  // If either one has both negative and positive values,
-  // it therefore contains both 0 and -1, and since [0..-1] is the
-  // full unsigned range, the type must act as an unsigned bottom.
-  bool bot0 = ((jint)(lo0 ^ hi0) < 0);
-  bool bot1 = ((jint)(lo1 ^ hi1) < 0);
-
-  if (bot0 || bot1) {
-    // All unsigned values are LE -1 and GE 0.
-    if (lo0 == 0 && hi0 == 0) {
-      return TypeInt::CC_LE;            //   0 <= bot
-    } else if ((jint)lo0 == -1 && (jint)hi0 == -1) {
-      return TypeInt::CC_GE;            // -1 >= bot
-    } else if (lo1 == 0 && hi1 == 0) {
-      return TypeInt::CC_GE;            // bot >= 0
-    } else if ((jint)lo1 == -1 && (jint)hi1 == -1) {
-      return TypeInt::CC_LE;            // bot <= -1
-    }
-  } else {
-    // We can use ranges of the form [lo..hi] if signs are the same.
-    assert(lo0 <= hi0 && lo1 <= hi1, "unsigned ranges are valid");
-    // results are reversed, '-' > '+' for unsigned compare
-    if (hi0 < lo1) {
-      return TypeInt::CC_LT;            // smaller
-    } else if (lo0 > hi1) {
-      return TypeInt::CC_GT;            // greater
-    } else if (hi0 == lo1 && lo0 == hi1) {
-      return TypeInt::CC_EQ;            // Equal results
-    } else if (lo0 >= hi1) {
-      return TypeInt::CC_GE;
-    } else if (hi0 <= lo1) {
-      // Check for special case in Hashtable::get.  (See below.)
-      if ((jint)lo0 >= 0 && (jint)lo1 >= 0 && is_index_range_check())
-        return TypeInt::CC_LT;
-      return TypeInt::CC_LE;
-    }
-  }
   // Check for special case in Hashtable::get - the hash index is
   // mod'ed to the table size so the following range check is useless.
   // Check for: (X Mod Y) CmpU Y, where the mod result and Y both have
   // to be positive.
   // (This is a gross hack, since the sub method never
   // looks at the structure of the node in any other case.)
-  if ((jint)lo0 >= 0 && (jint)lo1 >= 0 && is_index_range_check())
+  if (r0->_lo >= 0 && r1->_lo >= 0 && is_index_range_check()) {
     return TypeInt::CC_LT;
+  }
+
+  if (r0->_uhi < r1->_ulo) {
+    return TypeInt::CC_LT;
+  } else if (r0->_ulo > r1->_uhi) {
+    return TypeInt::CC_GT;
+  } else if (r0->is_con() && r1->is_con()) {
+    // Since r0->_ulo == r0->_uhi == r0->get_con(), we only reach here if the constants are equal
+    assert(r0->get_con() == r1->get_con(), "must reach a previous branch otherwise");
+    return TypeInt::CC_EQ;
+  } else if (r0->_uhi == r1->_ulo) {
+    return TypeInt::CC_LE;
+  } else if (r0->_ulo == r1->_uhi) {
+    return TypeInt::CC_GE;
+  }
 
   const Type* joined = r0->join(r1);
   if (joined == Type::TOP) {
     return TypeInt::CC_NE;
   }
 
-  return TypeInt::CC;                   // else use worst case results
+  return TypeInt::CC;
 }
 
 const Type* CmpUNode::Value(PhaseGVN* phase) const {
@@ -963,51 +932,21 @@ const Type *CmpLNode::sub( const Type *t1, const Type *t2 ) const {
 // Simplify a CmpUL (compare 2 unsigned longs) node, based on local information.
 // If both inputs are constants, compare them.
 const Type* CmpULNode::sub(const Type* t1, const Type* t2) const {
-  assert(!t1->isa_ptr(), "obsolete usage of CmpUL");
-
-  // comparing two unsigned longs
-  const TypeLong* r0 = t1->is_long();   // Handy access
+  const TypeLong* r0 = t1->is_long();
   const TypeLong* r1 = t2->is_long();
 
-  // Current installed version
-  // Compare ranges for non-overlap
-  julong lo0 = r0->_lo;
-  julong hi0 = r0->_hi;
-  julong lo1 = r1->_lo;
-  julong hi1 = r1->_hi;
-
-  // If either one has both negative and positive values,
-  // it therefore contains both 0 and -1, and since [0..-1] is the
-  // full unsigned range, the type must act as an unsigned bottom.
-  bool bot0 = ((jlong)(lo0 ^ hi0) < 0);
-  bool bot1 = ((jlong)(lo1 ^ hi1) < 0);
-
-  if (bot0 || bot1) {
-    // All unsigned values are LE -1 and GE 0.
-    if (lo0 == 0 && hi0 == 0) {
-      return TypeInt::CC_LE;            //   0 <= bot
-    } else if ((jlong)lo0 == -1 && (jlong)hi0 == -1) {
-      return TypeInt::CC_GE;            // -1 >= bot
-    } else if (lo1 == 0 && hi1 == 0) {
-      return TypeInt::CC_GE;            // bot >= 0
-    } else if ((jlong)lo1 == -1 && (jlong)hi1 == -1) {
-      return TypeInt::CC_LE;            // bot <= -1
-    }
-  } else {
-    // We can use ranges of the form [lo..hi] if signs are the same.
-    assert(lo0 <= hi0 && lo1 <= hi1, "unsigned ranges are valid");
-    // results are reversed, '-' > '+' for unsigned compare
-    if (hi0 < lo1) {
-      return TypeInt::CC_LT;            // smaller
-    } else if (lo0 > hi1) {
-      return TypeInt::CC_GT;            // greater
-    } else if (hi0 == lo1 && lo0 == hi1) {
-      return TypeInt::CC_EQ;            // Equal results
-    } else if (lo0 >= hi1) {
-      return TypeInt::CC_GE;
-    } else if (hi0 <= lo1) {
-      return TypeInt::CC_LE;
-    }
+  if (r0->_uhi < r1->_ulo) {
+    return TypeInt::CC_LT;
+  } else if (r0->_ulo > r1->_uhi) {
+    return TypeInt::CC_GT;
+  } else if (r0->is_con() && r1->is_con()) {
+    // Since r0->_ulo == r0->_uhi == r0->get_con(), we only reach here if the constants are equal
+    assert(r0->get_con() == r1->get_con(), "must reach a previous branch otherwise");
+    return TypeInt::CC_EQ;
+  } else if (r0->_uhi == r1->_ulo) {
+    return TypeInt::CC_LE;
+  } else if (r0->_ulo == r1->_uhi) {
+    return TypeInt::CC_GE;
   }
 
   const Type* joined = r0->join(r1);
@@ -1015,7 +954,7 @@ const Type* CmpULNode::sub(const Type* t1, const Type* t2) const {
     return TypeInt::CC_NE;
   }
 
-  return TypeInt::CC;                   // else use worst case results
+  return TypeInt::CC;
 }
 
 //=============================================================================
diff --git a/src/hotspot/share/opto/subnode.hpp b/src/hotspot/share/opto/subnode.hpp
index 463d9e020cb..54cb1d20cd0 100644
--- a/src/hotspot/share/opto/subnode.hpp
+++ b/src/hotspot/share/opto/subnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -507,6 +507,9 @@ public:
   virtual int Opcode() const;
   const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 
@@ -522,6 +525,9 @@ public:
   const Type *bottom_type() const { return Type::DOUBLE; }
   virtual uint ideal_reg() const { return Op_RegD; }
   virtual const Type* Value(PhaseGVN* phase) const;
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------SqrtFNode--------------------------------------
@@ -541,6 +547,9 @@ public:
   const Type *bottom_type() const { return Type::FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
   virtual const Type* Value(PhaseGVN* phase) const;
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 //------------------------------SqrtHFNode-------------------------------------
@@ -555,6 +564,9 @@ public:
   const Type* bottom_type() const { return Type::HALF_FLOAT; }
   virtual uint ideal_reg() const { return Op_RegF; }
   virtual const Type* Value(PhaseGVN* phase) const;
+
+private:
+  virtual bool depends_only_on_test_impl() const { return false; }
 };
 
 
diff --git a/src/hotspot/share/opto/subtypenode.cpp b/src/hotspot/share/opto/subtypenode.cpp
index b58194b87d2..8e4c7d829a7 100644
--- a/src/hotspot/share/opto/subtypenode.cpp
+++ b/src/hotspot/share/opto/subtypenode.cpp
@@ -182,7 +182,7 @@ bool SubTypeCheckNode::verify(PhaseGVN* phase) {
         return verify_helper(phase, load_klass(phase), cached_t);
       }
       case Compile::SSC_full_test: {
-        Node* p1 = phase->transform(new AddPNode(superklass, superklass, phase->MakeConX(in_bytes(Klass::super_check_offset_offset()))));
+        Node* p1 = phase->transform(new AddPNode(C->top(), superklass, phase->MakeConX(in_bytes(Klass::super_check_offset_offset()))));
         Node* chk_off = phase->transform(new LoadINode(nullptr, C->immutable_memory(), p1, phase->type(p1)->is_ptr(), TypeInt::INT, MemNode::unordered));
         record_for_cleanup(chk_off, phase);
 
@@ -194,7 +194,7 @@ bool SubTypeCheckNode::verify(PhaseGVN* phase) {
 #ifdef _LP64
           chk_off_X = phase->transform(new ConvI2LNode(chk_off_X));
 #endif
-          Node* p2 = phase->transform(new AddPNode(subklass, subklass, chk_off_X));
+          Node* p2 = phase->transform(new AddPNode(C->top(), subklass, chk_off_X));
           Node* nkls = phase->transform(LoadKlassNode::make(*phase, C->immutable_memory(), p2, phase->type(p2)->is_ptr(), TypeInstKlassPtr::OBJECT_OR_NULL));
 
           return verify_helper(phase, nkls, cached_t);
diff --git a/src/hotspot/share/opto/subtypenode.hpp b/src/hotspot/share/opto/subtypenode.hpp
index abf9cad4844..2dac3866209 100644
--- a/src/hotspot/share/opto/subtypenode.hpp
+++ b/src/hotspot/share/opto/subtypenode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,6 @@ public:
 
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::CC; }
-  bool depends_only_on_test() const { return false; }
 
   ciMethod* method() const { return _method; }
   int bci() const { return _bci; }
@@ -71,6 +70,8 @@ private:
   static bool is_oop(PhaseGVN* phase, Node* n);
 
   Node* load_klass(PhaseGVN* phase) const;
+
+  virtual bool depends_only_on_test_impl() const { return false; }
 #endif // ASSERT
 };
 
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 31cc8fa0460..d878b2b1d3d 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -2214,7 +2214,7 @@ bool SuperWord::is_vector_use(Node* use, int u_idx) const {
     return true;
   }
 
-  if (!is_velt_basic_type_compatible_use_def(use, def)) {
+  if (!is_velt_basic_type_compatible_use_def(use, def, d_pk->size())) {
     return false;
   }
 
@@ -2280,7 +2280,7 @@ Node_List* PackSet::strided_pack_input_at_index_or_null(const Node_List* pack, c
 
 // Check if the output type of def is compatible with the input type of use, i.e. if the
 // types have the same size.
-bool SuperWord::is_velt_basic_type_compatible_use_def(Node* use, Node* def) const {
+bool SuperWord::is_velt_basic_type_compatible_use_def(Node* use, Node* def, const uint pack_size) const {
   assert(in_bb(def) && in_bb(use), "both use and def are in loop");
 
   // Conversions are trivially compatible.
@@ -2306,8 +2306,17 @@ bool SuperWord::is_velt_basic_type_compatible_use_def(Node* use, Node* def) cons
            type2aelembytes(use_bt) == 4;
   }
 
-  // Default case: input size of use equals output size of def.
-  return type2aelembytes(use_bt) == type2aelembytes(def_bt);
+  // Input size of use equals output size of def
+  if (type2aelembytes(use_bt) == type2aelembytes(def_bt)) {
+    return true;
+  }
+
+  // Subword cast: Element sizes differ, but the platform supports a cast to change the def shape to the use shape.
+  if (VectorCastNode::is_supported_subword_cast(def_bt, use_bt, pack_size)) {
+    return true;
+  }
+
+  return false;
 }
 
 // Return nullptr if success, else failure message
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index 9654465220b..4e6fce70e5c 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -653,7 +653,7 @@ private:
   // Is use->in(u_idx) a vector use?
   bool is_vector_use(Node* use, int u_idx) const;
 
-  bool is_velt_basic_type_compatible_use_def(Node* use, Node* def) const;
+  bool is_velt_basic_type_compatible_use_def(Node* use, Node* def, const uint pack_size) const;
 
   bool do_vtransform() const;
 };
diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.cpp b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
index 832e91603d9..f8b8bfe2ed0 100644
--- a/src/hotspot/share/opto/superwordVTransformBuilder.cpp
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
@@ -254,6 +254,20 @@ VTransformNode* SuperWordVTransformBuilder::get_or_make_vtnode_vector_input_at_i
 
   Node_List* pack_in = _packset.pack_input_at_index_or_null(pack, index);
   if (pack_in != nullptr) {
+    Node* in_p0 = pack_in->at(0);
+    BasicType def_bt = _vloop_analyzer.types().velt_basic_type(in_p0);
+    BasicType use_bt = _vloop_analyzer.types().velt_basic_type(p0);
+
+    // If the use and def types are different, emit a cast node
+    if (use_bt != def_bt && !p0->is_Convert() && VectorCastNode::is_supported_subword_cast(def_bt, use_bt, pack->size())) {
+      VTransformNode* in = get_vtnode(pack_in->at(0));
+      const VTransformVectorNodeProperties properties = VTransformVectorNodeProperties::make_from_pack(pack, _vloop_analyzer);
+      VTransformNode* cast = new (_vtransform.arena()) VTransformElementWiseVectorNode(_vtransform, 2, properties, VectorCastNode::opcode(-1, def_bt));
+      cast->set_req(1, in);
+
+      return cast;
+    }
+
     // Input is a matching pack -> vtnode already exists.
     assert(index != 2 || !VectorNode::is_shift(p0), "shift's count cannot be vector");
     return get_vtnode(pack_in->at(0));
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index ecb8c2c1cd8..1a0872ee0e6 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,7 +97,7 @@ const Type::TypeInfo Type::_type_info[Type::lastype] = {
   { Bad,             T_ILLEGAL,    "vectorz:",      false, Op_VecZ,              relocInfo::none          },  // VectorZ
 #endif
   { Bad,             T_ADDRESS,    "anyptr:",       false, Op_RegP,              relocInfo::none          },  // AnyPtr
-  { Bad,             T_ADDRESS,    "rawptr:",       false, Op_RegP,              relocInfo::none          },  // RawPtr
+  { Bad,             T_ADDRESS,    "rawptr:",       false, Op_RegP,              relocInfo::external_word_type },  // RawPtr
   { Bad,             T_OBJECT,     "oop:",          true,  Op_RegP,              relocInfo::oop_type      },  // OopPtr
   { Bad,             T_OBJECT,     "inst:",         true,  Op_RegP,              relocInfo::oop_type      },  // InstPtr
   { Bad,             T_OBJECT,     "ary:",          true,  Op_RegP,              relocInfo::oop_type      },  // AryPtr
@@ -1816,6 +1816,13 @@ bool TypeInt::contains(const TypeInt* t) const {
   return TypeIntHelper::int_type_is_subset(this, t);
 }
 
+#ifdef ASSERT
+bool TypeInt::strictly_contains(const TypeInt* t) const {
+  assert(!_is_dual && !t->_is_dual, "dual types should only be used for join calculation");
+  return TypeIntHelper::int_type_is_subset(this, t) && !TypeIntHelper::int_type_is_equal(this, t);
+}
+#endif // ASSERT
+
 const Type* TypeInt::xmeet(const Type* t) const {
   return TypeIntHelper::int_type_xmeet(this, t);
 }
@@ -1944,6 +1951,13 @@ bool TypeLong::contains(const TypeLong* t) const {
   return TypeIntHelper::int_type_is_subset(this, t);
 }
 
+#ifdef ASSERT
+bool TypeLong::strictly_contains(const TypeLong* t) const {
+  assert(!_is_dual && !t->_is_dual, "dual types should only be used for join calculation");
+  return TypeIntHelper::int_type_is_subset(this, t) && !TypeIntHelper::int_type_is_equal(this, t);
+}
+#endif // ASSERT
+
 const Type* TypeLong::xmeet(const Type* t) const {
   return TypeIntHelper::int_type_xmeet(this, t);
 }
@@ -2443,6 +2457,12 @@ const TypeVect* TypeVect::make(BasicType elem_bt, uint length, bool is_mask) {
   return nullptr;
 }
 
+// Create a vector mask type with the given element basic type and length.
+// - Returns "TypeVectMask" (PVectMask) for platforms that support the predicate
+//   feature and it is implemented properly in the backend, allowing the mask to
+//   be stored in a predicate/mask register.
+// - Returns a normal vector type "TypeVectA ~ TypeVectZ" (NVectMask) otherwise,
+//   where the vector mask is stored in a vector register.
 const TypeVect* TypeVect::makemask(BasicType elem_bt, uint length) {
   if (Matcher::has_predicated_vectors() &&
       Matcher::match_rule_supported_vector_masked(Op_VectorLoadMask, length, elem_bt)) {
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index 73e2ba0045a..135f37f7267 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -799,6 +799,9 @@ public:
   static const TypeInt* make(jint lo, jint hi, int widen);
   static const Type* make_or_top(const TypeIntPrototype<jint, juint>& t, int widen);
   static const TypeInt* make(const TypeIntPrototype<jint, juint>& t, int widen) { return make_or_top(t, widen)->is_int(); }
+  static const TypeInt* make(const TypeIntMirror<jint, juint>& t, int widen) {
+    return (new TypeInt(TypeIntPrototype<jint, juint>{{t._lo, t._hi}, {t._ulo, t._uhi}, t._bits}, widen, false))->hashcons()->is_int();
+  }
 
   // Check for single integer
   bool is_con() const { return _lo == _hi; }
@@ -809,6 +812,11 @@ public:
   bool contains(jint i) const;
   bool contains(const TypeInt* t) const;
 
+#ifdef ASSERT
+  // Check whether t is a proper subset (i.e. a subset that is not equal to the superset) of this
+  bool strictly_contains(const TypeInt* t) const;
+#endif // ASSERT
+
   virtual bool is_finite() const;  // Has a finite value
 
   virtual const Type* xmeet(const Type* t) const;
@@ -881,6 +889,9 @@ public:
   static const TypeLong* make(jlong lo, jlong hi, int widen);
   static const Type* make_or_top(const TypeIntPrototype<jlong, julong>& t, int widen);
   static const TypeLong* make(const TypeIntPrototype<jlong, julong>& t, int widen) { return make_or_top(t, widen)->is_long(); }
+  static const TypeLong* make(const TypeIntMirror<jlong, julong>& t, int widen) {
+    return (new TypeLong(TypeIntPrototype<jlong, julong>{{t._lo, t._hi}, {t._ulo, t._uhi}, t._bits}, widen, false))->hashcons()->is_long();
+  }
 
   // Check for single integer
   bool is_con() const { return _lo == _hi; }
@@ -891,6 +902,11 @@ public:
   bool contains(jlong i) const;
   bool contains(const TypeLong* t) const;
 
+#ifdef ASSERT
+  // Check whether t is a proper subset (i.e. a subset that is not equal to the superset) of this
+  bool strictly_contains(const TypeLong* t) const;
+#endif // ASSERT
+
   // Check for positive 32-bit value.
   int is_positive_int() const { return _lo >= 0 && _hi <= (jlong)max_jint; }
 
@@ -1012,7 +1028,7 @@ public:
 };
 
 //------------------------------TypeVect---------------------------------------
-// Class of Vector Types
+// Basic class of vector (mask) types.
 class TypeVect : public Type {
   const BasicType _elem_bt;  // Vector's element type
   const uint _length;  // Elements in vector (power of 2)
@@ -1052,6 +1068,16 @@ public:
 #endif
 };
 
+// TypeVect subclasses representing vectors or vector masks with "BVectMask" or "NVectMask"
+// layout (see vectornode.hpp for detailed notes on vector mask representations), mapped
+// to vector registers and distinguished by vector register size:
+//
+// - TypeVectA: Scalable vector type (variable size, e.g., AArch64 SVE, RISC-V RVV)
+// - TypeVectS: 32-bit vector type
+// - TypeVectD: 64-bit vector type
+// - TypeVectX: 128-bit vector type
+// - TypeVectY: 256-bit vector type
+// - TypeVectZ: 512-bit vector type
 class TypeVectA : public TypeVect {
   friend class TypeVect;
   TypeVectA(BasicType elem_bt, uint length) : TypeVect(VectorA, elem_bt, length) {}
@@ -1082,6 +1108,9 @@ class TypeVectZ : public TypeVect {
   TypeVectZ(BasicType elem_bt, uint length) : TypeVect(VectorZ, elem_bt, length) {}
 };
 
+// Class of TypeVectMask, representing vector masks with "PVectMask" layout (see
+// vectornode.hpp for detailed notes on vector mask representations), mapped to
+// dedicated hardware predicate/mask registers.
 class TypeVectMask : public TypeVect {
 public:
   friend class TypeVect;
diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp
index cf01b2442e6..f44df7e6da2 100644
--- a/src/hotspot/share/opto/vector.cpp
+++ b/src/hotspot/share/opto/vector.cpp
@@ -326,37 +326,15 @@ Node* PhaseVector::expand_vbox_node_helper(Node* vbox,
     return expand_vbox_alloc_node(vbox_alloc, vect, box_type, vect_type);
   }
 
-  // Handle the case when both the allocation input and vector input to
-  // VectorBoxNode are Phi. This case is generated after the transformation of
-  // Phi: Phi (VectorBox1 VectorBox2) => VectorBox (Phi1 Phi2).
-  // With this optimization, the relative two allocation inputs of VectorBox1 and
-  // VectorBox2 are gathered into Phi1 now. Similarly, the original vector
-  // inputs of two VectorBox nodes are in Phi2.
-  //
-  // See PhiNode::merge_through_phi in cfg.cpp for more details.
-  if (vbox->is_Phi() && vect->is_Phi()) {
-    assert(vbox->as_Phi()->region() == vect->as_Phi()->region(), "");
+  // Handle the case when the allocation input to VectorBoxNode is a Phi.
+  // This is generated after the transformation in PhiNode::merge_through_phi:
+  //   Phi (VectorBox1 VectorBox2) => VectorBox (Phi1 Phi2)
+  // The vector input may also be a Phi (Phi2 above), or it may have been
+  // value-numbered to a single node if all inputs were identical.
+  if (vbox->is_Phi()) {
+    bool same_region = vect->is_Phi() && vbox->as_Phi()->region() == vect->as_Phi()->region();
     for (uint i = 1; i < vbox->req(); i++) {
-      Node* new_box = expand_vbox_node_helper(vbox->in(i), vect->in(i),
-                                              box_type, vect_type, visited);
-      if (!new_box->is_Phi()) {
-        C->initial_gvn()->hash_delete(vbox);
-        vbox->set_req(i, new_box);
-      }
-    }
-    return C->initial_gvn()->transform(vbox);
-  }
-
-  // Handle the case when the allocation input to VectorBoxNode is a phi
-  // but the vector input is not, which can definitely be the case if the
-  // vector input has been value-numbered. It seems to be safe to do by
-  // construction because VectorBoxNode and VectorBoxAllocate come in a
-  // specific order as a result of expanding an intrinsic call. After that, if
-  // any of the inputs to VectorBoxNode are value-numbered they can only
-  // move up and are guaranteed to dominate.
-  if (vbox->is_Phi() && (vect->is_Vector() || vect->is_LoadVector())) {
-    for (uint i = 1; i < vbox->req(); i++) {
-      Node* new_box = expand_vbox_node_helper(vbox->in(i), vect,
+      Node* new_box = expand_vbox_node_helper(vbox->in(i), same_region ? vect->in(i) : vect,
                                               box_type, vect_type, visited);
       if (!new_box->is_Phi()) {
         C->initial_gvn()->hash_delete(vbox);
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index b48b5f2cd05..7fc06db4b78 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "ci/ciSymbols.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "opto/library_call.hpp"
+#include "opto/rootnode.hpp"
 #include "opto/runtime.hpp"
 #include "opto/vectornode.hpp"
 #include "prims/vectorSupport.hpp"
@@ -41,7 +42,7 @@ static bool check_vbox(const TypeInstPtr* vbox_type) {
   ciInstanceKlass* ik = vbox_type->instance_klass();
   assert(is_vector(ik), "not a vector");
 
-  ciField* fd1 = ik->get_field_by_name(ciSymbols::ETYPE_name(), ciSymbols::class_signature(), /* is_static */ true);
+  ciField* fd1 = ik->get_field_by_name(ciSymbols::CTYPE_name(), ciSymbols::class_signature(), /* is_static */ true);
   assert(fd1 != nullptr, "element type info is missing");
 
   ciConstant val1 = fd1->constant_value();
@@ -73,6 +74,11 @@ static bool is_vector_mask(ciKlass* klass) {
   return klass->is_subclass_of(ciEnv::current()->vector_VectorMask_klass());
 }
 
+static Node* trace_vector(Node* operation) {
+  VectorNode::trace_new_vector(operation, "VectorAPI");
+  return operation;
+}
+
 bool LibraryCallKit::arch_supports_vector_rotate(int opc, int num_elem, BasicType elem_bt,
                                                  VectorMaskUseType mask_use_type, bool has_scalar_args) {
   bool is_supported = true;
@@ -169,6 +175,10 @@ Node* GraphKit::unbox_vector(Node* v, const TypeInstPtr* vbox_type, BasicType el
   assert(check_vbox(vbox_type), "");
   const TypeVect* vt = TypeVect::make(elem_bt, num_elem, is_vector_mask(vbox_type->instance_klass()));
   Node* unbox = gvn().transform(new VectorUnboxNode(C, vt, v, merged_memory()));
+  if (gvn().type(unbox)->isa_vect() == nullptr) {
+    assert(gvn().type(unbox) == Type::TOP, "sanity");
+    return nullptr; // not a vector
+  }
   return unbox;
 }
 
@@ -287,40 +297,63 @@ static bool is_klass_initialized(const TypeInstPtr* vec_klass) {
   return klass->is_initialized();
 }
 
-// public static
-// <V extends Vector<E>,
-//  M extends VectorMask<E>,
-//  E>
-// V unaryOp(int oprId, Class<? extends V> vmClass, Class<? extends M> maskClass, Class<E> elementType,
-//           int length, V v, M m,
-//           UnaryOperation<V, M> defaultImpl)
+static bool is_primitive_lane_type(VectorSupport::LaneType laneType) {
+  return laneType >= VectorSupport::LT_FLOAT && laneType <= VectorSupport::LT_LONG;
+}
+
+static BasicType get_vector_primitive_lane_type(VectorSupport::LaneType lanetype) {
+  assert(is_primitive_lane_type(lanetype), "");
+  switch (lanetype) {
+    case VectorSupport::LaneType::LT_FLOAT: return T_FLOAT;
+    case VectorSupport::LaneType::LT_DOUBLE: return T_DOUBLE;
+    case VectorSupport::LaneType::LT_LONG: return T_LONG;
+    case VectorSupport::LaneType::LT_INT: return T_INT;
+    case VectorSupport::LaneType::LT_SHORT: return T_SHORT;
+    case VectorSupport::LaneType::LT_BYTE: return T_BYTE;
+  }
+  return T_ILLEGAL;
+}
+
 //
-// public static
-// <V,
-//  M extends VectorMask<E>,
-//  E>
-// V binaryOp(int oprId, Class<? extends V> vmClass, Class<? extends M> maskClass, Class<E> elementType,
-//            int length, V v1, V v2, M m,
-//            BinaryOperation<V, M> defaultImpl)
+//  <V extends Vector<E>,
+//   M extends VectorMask<E>,
+//   E>
+//  V unaryOp(int oprId,
+//            Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
+//            int length,
+//            V v, M m,
+//            UnaryOperation<V, M> defaultImpl) {
+//
+//  <VM extends VectorPayload,
+//   M extends VectorMask<E>,
+//   E>
+//  VM binaryOp(int oprId,
+//              Class<? extends VM> vmClass, Class<? extends M> mClass, int laneType,
+//              int length,
+//              VM v1, VM v2, M m,
+//              BinaryOperation<VM, M> defaultImpl) {
+//
+//
+//  <V extends Vector<E>,
+//   M extends VectorMask<E>,
+//   E>
+//  V ternaryOp(int oprId,
+//              Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
+//              int length,
+//              V v1, V v2, V v3, M m,
+//              TernaryOperation<V, M> defaultImpl) {
 //
-// public static
-// <V extends Vector<E>,
-//  M extends VectorMask<E>,
-//  E>
-// V ternaryOp(int oprId, Class<? extends V> vmClass, Class<? extends M> maskClass, Class<E> elementType,
-//             int length, V v1, V v2, V v3, M m,
-//             TernaryOperation<V, M> defaultImpl)
 //
 bool LibraryCallKit::inline_vector_nary_operation(int n) {
   const TypeInt*     opr          = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* vector_klass = gvn().type(argument(1))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(4))->isa_int();
 
   if (opr          == nullptr || !opr->is_con() ||
+      laneType     == nullptr || !laneType->is_con() ||
       vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
       vlen         == nullptr || !vlen->is_con()) {
     log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -330,11 +363,12 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     return false; // not enough info for intrinsification
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
@@ -361,12 +395,13 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     }
   }
 
-  BasicType elem_bt = elem_type->basic_type();
   bool has_scalar_op = VectorSupport::has_scalar_op(opr->get_con());
   bool is_unsigned = VectorSupport::is_unsigned_op(opr->get_con());
 
   int num_elem = vlen->get_con();
-  int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
+  int opc = VectorSupport::vop2ideal(opr->get_con(), vltype);
+
   int sopc = has_scalar_op ? VectorNode::opcode(opc, elem_bt) : opc;
   if (sopc == 0 || num_elem == 1) {
     log_if_needed("  ** operation not supported: arity=%d opc=%s[%d] vlen=%d etype=%s",
@@ -457,7 +492,7 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     }
     default: fatal("unsupported arity: %d", n);
   }
-
+  trace_vector(operation);
   if (is_masked_op && mask != nullptr) {
     if (use_predicate) {
       operation->add_req(mask);
@@ -465,7 +500,7 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
     } else {
       operation->add_flag(Node::Flag_is_predicated_using_blend);
       operation = gvn().transform(operation);
-      operation = new VectorBlendNode(opd1, operation, mask);
+      operation = trace_vector(new VectorBlendNode(opd1, operation, mask));
     }
   }
   operation = gvn().transform(operation);
@@ -477,29 +512,29 @@ bool LibraryCallKit::inline_vector_nary_operation(int n) {
   return true;
 }
 
-// public static
-// <V extends Vector<E>, E>
-// V libraryUnaryOp(long address, Class<? extends V> vClass, Class<E> elementType, int length, String debugName,
-//                  V v,
-//                  UnaryOperation<V, ?> defaultImpl)
 //
-// public static
-// <V extends VectorPayload, E>
-// V libraryBinaryOp(long address, Class<? extends V> vClass, Class<E> elementType, int length, String debugName,
-//            V v1, V v2,
-//            BinaryOperation<V, ?> defaultImpl)
+//  <V extends Vector<E>, E>
+//  V libraryUnaryOp(long addr, Class<? extends V> vClass, int laneType, int length, String debugName,
+//                   V v,
+//                   UnaryOperation<V,?> defaultImpl)
+//
+//  <V extends VectorPayload, E>
+//  V libraryBinaryOp(long addr, Class<? extends V> vClass, int laneType, int length, String debugName,
+//                    V v1, V v2,
+//                    BinaryOperation<V,?> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_call(int arity) {
   assert(Matcher::supports_vector_calling_convention(), "required");
 
   const TypeLong*    entry          = gvn().type(argument(0))->isa_long();
   const TypeInstPtr* vector_klass   = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass     = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType       = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen           = gvn().type(argument(4))->isa_int();
   const TypeInstPtr* debug_name_oop = gvn().type(argument(5))->isa_instptr();
 
   if (entry        == nullptr   || !entry->is_con() ||
       vector_klass == nullptr   || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr   || elem_klass->const_oop() == nullptr ||
+      laneType     == nullptr   || !laneType->is_con() ||
       vlen         == nullptr   || !vlen->is_con() ||
       debug_name_oop == nullptr || debug_name_oop->const_oop() == nullptr) {
     log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s debug_name=%s",
@@ -516,18 +551,20 @@ bool LibraryCallKit::inline_vector_call(int arity) {
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
+
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
-  BasicType elem_bt = elem_type->basic_type();
   int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   if (!Matcher::vector_size_supported(elem_bt, num_elem)) {
     log_if_needed("  ** vector size (vlen=%d, etype=%s) is not supported",
                   num_elem, type2name(elem_bt));
@@ -579,18 +616,24 @@ bool LibraryCallKit::inline_vector_call(int arity) {
   return true;
 }
 
-// <E, M>
-// long maskReductionCoerced(int oper, Class<? extends M> maskClass, Class<?> elemClass,
-//                          int length, M m, VectorMaskOp<M> defaultImpl)
+//
+//  <M extends VectorMask<E>,
+//   E>
+//  long maskReductionCoerced(int oper,
+//                            Class<? extends M> mClass, int laneType,
+//                            int length,
+//                            M m,
+//                            VectorMaskOp<M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_mask_operation() {
   const TypeInt*     oper       = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* mask_klass = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType   = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen       = gvn().type(argument(3))->isa_int();
   Node*              mask       = argument(4);
 
   if (mask_klass == nullptr || mask_klass->const_oop() == nullptr ||
-      elem_klass == nullptr || elem_klass->const_oop() == nullptr ||
+      laneType   == nullptr || !laneType->is_con() ||
       vlen       == nullptr || !vlen->is_con() ||
       oper       == nullptr || !oper->is_con() ||
       mask->is_top()) {
@@ -602,11 +645,15 @@ bool LibraryCallKit::inline_vector_mask_operation() {
     return false;
   }
 
-  int num_elem = vlen->get_con();
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  BasicType elem_bt = elem_type->basic_type();
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
 
-  int mopc = VectorSupport::vop2ideal(oper->get_con(), elem_bt);
+  int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
+  int mopc = VectorSupport::vop2ideal(oper->get_con(), vltype);
   if (!arch_supports_vector(mopc, num_elem, elem_bt, VecMaskUseLoad)) {
     log_if_needed("  ** not supported: arity=1 op=cast#%d/3 vlen2=%d etype2=%s",
                     mopc, num_elem, type2name(elem_bt));
@@ -626,7 +673,7 @@ bool LibraryCallKit::inline_vector_mask_operation() {
     mask_vec = gvn().transform(VectorStoreMaskNode::make(gvn(), mask_vec, elem_bt, num_elem));
   }
   const Type* maskoper_ty = mopc == Op_VectorMaskToLong ? (const Type*)TypeLong::LONG : (const Type*)TypeInt::INT;
-  Node* maskoper = gvn().transform(VectorMaskOpNode::make(mask_vec, maskoper_ty, mopc));
+  Node* maskoper = gvn().transform(trace_vector(VectorMaskOpNode::make(mask_vec, maskoper_ty, mopc)));
   if (mopc != Op_VectorMaskToLong) {
     maskoper = ConvI2L(maskoper);
   }
@@ -636,16 +683,18 @@ bool LibraryCallKit::inline_vector_mask_operation() {
   return true;
 }
 
-// public static
-// <M,
-//  S extends VectorSpecies<E>,
-//  E>
-// M fromBitsCoerced(Class<? extends M> vmClass, Class<E> elementType, int length,
-//                    long bits, int mode, S s,
-//                    BroadcastOperation<M, E, S> defaultImpl)
+//
+//  <VM extends VectorPayload,
+//   S extends VectorSpecies<E>,
+//   E>
+//  VM fromBitsCoerced(Class<? extends VM> vmClass, int laneType,
+//                     int length,
+//                     long bits, int mode, S s,
+//                     FromBitsCoercedOperation<VM, S> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_frombits_coerced() {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(1))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(1))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(2))->isa_int();
   const TypeLong*    bits_type    = gvn().type(argument(3))->isa_long();
   // Mode argument determines the mode of operation it can take following values:-
@@ -654,7 +703,7 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
   const TypeInt*     mode         = gvn().type(argument(5))->isa_int();
 
   if (vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con() ||
       bits_type    == nullptr ||
       mode         == nullptr || !mode->is_con()) {
@@ -666,17 +715,19 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
     return false; // not enough info for intrinsification
   }
 
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-  BasicType elem_bt = elem_type->basic_type();
+
   int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
 
@@ -709,10 +760,10 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
   if (opc == Op_VectorLongToMask) {
     const TypeVect* vt = TypeVect::makemask(elem_bt, num_elem);
     if (Matcher::mask_op_prefers_predicate(opc, vt)) {
-      broadcast = gvn().transform(new VectorLongToMaskNode(elem, vt));
+      broadcast = gvn().transform(trace_vector(new VectorLongToMaskNode(elem, vt)));
     } else {
       const TypeVect* mvt = TypeVect::make(T_BOOLEAN, num_elem);
-      broadcast = gvn().transform(new VectorLongToMaskNode(elem, mvt));
+      broadcast = gvn().transform(trace_vector(new VectorLongToMaskNode(elem, mvt)));
       broadcast = gvn().transform(new VectorLoadMaskNode(broadcast, vt));
     }
   } else {
@@ -740,7 +791,7 @@ bool LibraryCallKit::inline_vector_frombits_coerced() {
       }
       default: fatal("%s", type2name(elem_bt));
     }
-    broadcast = VectorNode::scalar2vector(elem, num_elem, elem_bt, is_mask);
+    broadcast = trace_vector(VectorNode::scalar2vector(elem, num_elem, elem_bt, is_mask));
     broadcast = gvn().transform(broadcast);
   }
 
@@ -766,34 +817,34 @@ static bool elem_consistent_with_arr(BasicType elem_bt, const TypeAryPtr* arr_ty
   }
 }
 
-//  public static
+//
 //  <C,
 //   VM extends VectorPayload,
 //   E,
 //   S extends VectorSpecies<E>>
-//  VM load(Class<? extends VM> vmClass, Class<E> eClass,
+//  VM load(Class<? extends VM> vmClass, int laneType,
 //          int length,
-//          Object base, long offset,            // Unsafe addressing
-//          boolean fromSegment,
-//          C container, long index, S s,        // Arguments for default implementation
-//          LoadOperation<C, VM, S> defaultImpl) {
-//  public static
+//          Object base, long offset, boolean fromSegment,
+//          C container, long index, S s,
+//          LoadOperation<C, VM, S> defaultImpl)
+//
+//
 //  <C,
 //   V extends VectorPayload>
-//  void store(Class<?> vClass, Class<?> eClass,
+//  void store(Class<?> vClass, int laneType,
 //             int length,
-//             Object base, long offset,        // Unsafe addressing
-//             boolean fromSegment,
-//             V v, C container, long index,    // Arguments for default implementation
-//             StoreVectorOperation<C, V> defaultImpl) {
+//             Object base, long offset, boolean fromSegment,
+//             V v, C container, long index,
+//             StoreVectorOperation<C, V> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(1))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(1))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(2))->isa_int();
   const TypeInt*     from_ms      = gvn().type(argument(6))->isa_int();
 
   if (vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con() ||
       from_ms      == nullptr || !from_ms->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s from_ms=%s",
@@ -803,17 +854,19 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
                     NodeClassNames[argument(6)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   int num_elem = vlen->get_con();
 
   // TODO When mask usage is supported, VecMaskNotUsed needs to be VecMaskUseLoad.
@@ -926,22 +979,22 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
     if (is_mask) {
       val = gvn().transform(VectorStoreMaskNode::make(gvn(), val, elem_bt, num_elem));
     }
-    Node* vstore = gvn().transform(StoreVectorNode::make(0, control(), memory(addr), addr, addr_type, val, store_num_elem));
+    Node* vstore = gvn().transform(trace_vector(StoreVectorNode::make(0, control(), memory(addr), addr, addr_type, val, store_num_elem)));
     set_memory(vstore, addr_type);
   } else {
     // When using byte array, we need to load as byte then reinterpret the value. Otherwise, do a simple vector load.
     Node* vload = nullptr;
     if (mismatched_ms) {
-      vload = gvn().transform(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, mem_num_elem, mem_elem_bt));
+      vload = gvn().transform(trace_vector(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, mem_num_elem, mem_elem_bt)));
       const TypeVect* to_vect_type = TypeVect::make(elem_bt, num_elem);
       vload = gvn().transform(new VectorReinterpretNode(vload, vload->bottom_type()->is_vect(), to_vect_type));
     } else {
       // Special handle for masks
       if (is_mask) {
-        vload = gvn().transform(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, num_elem, T_BOOLEAN));
+        vload = gvn().transform(trace_vector(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, num_elem, T_BOOLEAN)));
         vload = gvn().transform(new VectorLoadMaskNode(vload, TypeVect::makemask(elem_bt, num_elem)));
       } else {
-        vload = gvn().transform(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, num_elem, elem_bt));
+        vload = gvn().transform(trace_vector(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, num_elem, elem_bt)));
       }
     }
     Node* box = box_vector(vload, vbox_type, elem_bt, num_elem);
@@ -958,40 +1011,39 @@ bool LibraryCallKit::inline_vector_mem_operation(bool is_store) {
   return true;
 }
 
-//  public static
+//
 //  <C,
 //   V extends Vector<?>,
 //   E,
 //   S extends VectorSpecies<E>,
 //   M extends VectorMask<E>>
-//  V loadMasked(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
-//               int length, Object base, long offset,          // Unsafe addressing
-//               boolean fromSegment,
+//  V loadMasked(Class<? extends V> vClass, Class<M> mClass, int laneType,
+//               int length, Object base, long offset, boolean fromSegment,
 //               M m, int offsetInRange,
-//               C container, long index, S s,                  // Arguments for default implementation
-//               LoadVectorMaskedOperation<C, V, S, M> defaultImpl) {
-//  public static
+//               C container, long index, S s,
+//               LoadVectorMaskedOperation<C, V, S, M> defaultImpl)
+//
 //  <C,
 //   V extends Vector<E>,
 //   M extends VectorMask<E>,
 //   E>
-//  void storeMasked(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+//  void storeMasked(Class<? extends V> vClass, Class<M> mClass, int laneType,
 //                   int length,
-//                   Object base, long offset,                  // Unsafe addressing
-//                   boolean fromSegment,
-//                   V v, M m, C container, long index,         // Arguments for default implementation
-//                   StoreVectorMaskedOperation<C, V, M> defaultImpl) {
+//                   Object base, long offset, boolean fromSegment,
+//                   V v, M m, C container, long index,
+//                   StoreVectorMaskedOperation<C, V, M> defaultImpl)
+//
 
 bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(3))->isa_int();
   const TypeInt*     from_ms      = gvn().type(argument(7))->isa_int();
 
   if (vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
       mask_klass   == nullptr || mask_klass->const_oop()   == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con() ||
       from_ms      == nullptr || !from_ms->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s from_ms=%s",
@@ -1002,6 +1054,13 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
                     NodeClassNames[argument(7)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
@@ -1012,13 +1071,7 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   int num_elem = vlen->get_con();
 
   Node* base = argument(4);
@@ -1139,7 +1192,7 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
       const TypeVect* to_mask_type = TypeVect::makemask(mem_elem_bt, mem_num_elem);
       mask = gvn().transform(new VectorReinterpretNode(mask, from_mask_type, to_mask_type));
     }
-    Node* vstore = gvn().transform(new StoreVectorMaskedNode(control(), memory(addr), addr, val, addr_type, mask));
+    Node* vstore = gvn().transform(trace_vector(new StoreVectorMaskedNode(control(), memory(addr), addr, val, addr_type, mask)));
     set_memory(vstore, addr_type);
   } else {
     Node* vload = nullptr;
@@ -1154,13 +1207,13 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
     if (supports_predicate) {
       // Generate masked load vector node if predicate feature is supported.
       const TypeVect* vt = TypeVect::make(mem_elem_bt, mem_num_elem);
-      vload = gvn().transform(new LoadVectorMaskedNode(control(), memory(addr), addr, addr_type, vt, mask));
+      vload = gvn().transform(trace_vector(new LoadVectorMaskedNode(control(), memory(addr), addr, addr_type, vt, mask)));
     } else {
       // Use the vector blend to implement the masked load vector. The biased elements are zeros.
       Node* zero = gvn().transform(gvn().zerocon(mem_elem_bt));
       zero = gvn().transform(VectorNode::scalar2vector(zero, mem_num_elem, mem_elem_bt));
-      vload = gvn().transform(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, mem_num_elem, mem_elem_bt));
-      vload = gvn().transform(new VectorBlendNode(zero, vload, mask));
+      vload = gvn().transform(trace_vector(LoadVectorNode::make(0, control(), memory(addr), addr, addr_type, mem_num_elem, mem_elem_bt)));
+      vload = gvn().transform(trace_vector(new VectorBlendNode(zero, vload, mask)));
     }
 
     if (mismatched_ms) {
@@ -1189,35 +1242,37 @@ bool LibraryCallKit::inline_vector_mem_masked_operation(bool is_store) {
 //   S extends VectorSpecies<E>,
 //   M extends VectorMask<E>,
 //   E>
-//   V loadWithMap(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass, int length,
-//                 Class<? extends Vector<Integer>> vectorIndexClass, int indexLength,
-//                 Object base, long offset,
-//                 W indexVector1, W indexVector2, W indexVector3, W indexVector4,
-//                 M m, C container, int index, int[] indexMap, int indexM, S s,
-//                 LoadVectorOperationWithMap<C, V, S, M> defaultImpl)
-//
+//  V loadWithMap(Class<? extends V> vClass, Class<M> mClass, int laneType,
+//                int length,
+//                Class<? extends Vector<Integer>> vectorIndexClass,
+//                int indexLength, Object base, long offset,
+//                W indexVector1, W indexVector2, W indexVector3, W indexVector4,
+//                M m, C container, int index, int[] indexMap, int indexM, S s,
+//                LoadVectorOperationWithMap<C, V, S, M> defaultImpl)
 //  <C,
 //   V extends Vector<E>,
 //   W extends Vector<Integer>,
 //   M extends VectorMask<E>,
 //   E>
-//   void storeWithMap(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass, int length,
-//                     Class<? extends Vector<Integer>> vectorIndexClass, int indexLength,
-//                     Object base, long offset, // Unsafe addressing
-//                     W indexVector, V v, M m,
-//                     C container, int index, int[] indexMap, int indexM, // Arguments for default implementation
-//                     StoreVectorOperationWithMap<C, V, M> defaultImpl)
+//  void storeWithMap(Class<? extends V> vClass, Class<M> mClass, int laneType,
+//                    int length,
+//                    Class<? extends Vector<Integer>> vectorIndexClass,
+//                    int indexLength, Object base, long offset,
+//                    W indexVector,
+//                    V v, M m, C container, int index, int[] indexMap, int indexM,
+//                    StoreVectorOperationWithMap<C, V, M> defaultImpl)
+//
 //
 bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   const TypeInstPtr* vector_klass     = gvn().type(argument(0))->isa_instptr();
   const TypeInstPtr* mask_klass       = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass       = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType         = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen             = gvn().type(argument(3))->isa_int();
   const TypeInstPtr* vector_idx_klass = gvn().type(argument(4))->isa_instptr();
   const TypeInt*     idx_vlen         = gvn().type(argument(5))->isa_int();
 
   if (vector_klass     == nullptr || vector_klass->const_oop()     == nullptr ||
-      elem_klass       == nullptr || elem_klass->const_oop()       == nullptr ||
+      laneType         == nullptr || !laneType->is_con() ||
       vlen             == nullptr || !vlen->is_con() ||
       vector_idx_klass == nullptr || vector_idx_klass->const_oop() == nullptr ||
       idx_vlen         == nullptr || !idx_vlen->is_con()) {
@@ -1235,13 +1290,13 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
 
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   int num_elem = vlen->get_con();
   int idx_num_elem = idx_vlen->get_con();
 
@@ -1364,17 +1419,17 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
 
     Node* vstore = nullptr;
     if (mask != nullptr) {
-      vstore = gvn().transform(new StoreVectorScatterMaskedNode(control(), memory(addr), addr, addr_type, val, indexes, mask));
+      vstore = gvn().transform(trace_vector(new StoreVectorScatterMaskedNode(control(), memory(addr), addr, addr_type, val, indexes, mask)));
     } else {
-      vstore = gvn().transform(new StoreVectorScatterNode(control(), memory(addr), addr, addr_type, val, indexes));
+      vstore = gvn().transform(trace_vector(new StoreVectorScatterNode(control(), memory(addr), addr, addr_type, val, indexes)));
     }
     set_memory(vstore, addr_type);
   } else {
     Node* vload = nullptr;
     if (mask != nullptr) {
-      vload = gvn().transform(new LoadVectorGatherMaskedNode(control(), memory(addr), addr, addr_type, vector_type, indexes, mask));
+      vload = gvn().transform(trace_vector(new LoadVectorGatherMaskedNode(control(), memory(addr), addr, addr_type, vector_type, indexes, mask)));
     } else {
-      vload = gvn().transform(new LoadVectorGatherNode(control(), memory(addr), addr, addr_type, vector_type, indexes));
+      vload = gvn().transform(trace_vector(new LoadVectorGatherNode(control(), memory(addr), addr, addr_type, vector_type, indexes)));
     }
     Node* box = box_vector(vload, vbox_type, elem_bt, num_elem);
     set_result(box);
@@ -1385,23 +1440,26 @@ bool LibraryCallKit::inline_vector_gather_scatter(bool is_scatter) {
   return true;
 }
 
-// public static
-// <V extends Vector<E>,
-//  M extends VectorMask<E>,
-//  E>
-// long reductionCoerced(int oprId, Class<? extends V> vectorClass, Class<? extends M> maskClass,
-//                       Class<E> elementType, int length, V v, M m,
-//                       ReductionOperation<V, M> defaultImpl)
+//
+//  <V extends Vector<E>,
+//   M extends VectorMask<E>,
+//   E>
+//  long reductionCoerced(int oprId,
+//                        Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
+//                        int length,
+//                        V v, M m,
+//                        ReductionOperation<V, M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_reduction() {
   const TypeInt*     opr          = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* vector_klass = gvn().type(argument(1))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(4))->isa_int();
 
   if (opr          == nullptr || !opr->is_con() ||
       vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con()) {
     log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -1414,12 +1472,14 @@ bool LibraryCallKit::inline_vector_reduction() {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
 
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   const Type* vmask_type = gvn().type(argument(6));
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
@@ -1439,9 +1499,8 @@ bool LibraryCallKit::inline_vector_reduction() {
     }
   }
 
-  BasicType elem_bt = elem_type->basic_type();
   int num_elem = vlen->get_con();
-  int opc  = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
+  int opc  = VectorSupport::vop2ideal(opr->get_con(), vltype);
   int sopc = ReductionNode::opcode(opc, elem_bt);
 
   // Ensure reduction operation for lanewise operation
@@ -1492,7 +1551,7 @@ bool LibraryCallKit::inline_vector_reduction() {
 
   // Make an unordered Reduction node. This affects only AddReductionVF/VD and MulReductionVF/VD,
   // as these operations are allowed to be associative (not requiring strict order) in VectorAPI.
-  value = ReductionNode::make(opc, nullptr, init, value, elem_bt, /* requires_strict_order */ false);
+  value = trace_vector(ReductionNode::make(opc, nullptr, init, value, elem_bt, /* requires_strict_order */ false));
 
   if (mask != nullptr && use_predicate) {
     value->add_req(mask);
@@ -1529,19 +1588,27 @@ bool LibraryCallKit::inline_vector_reduction() {
   return true;
 }
 
-// public static <V> boolean test(int cond, Class<?> vectorClass, Class<?> elementType, int vlen,
-//                                V v1, V v2,
-//                                BiFunction<V, V, Boolean> defaultImpl)
+
+
+//
+//  <M extends VectorMask<E>,
+//   E>
+//  boolean test(int cond,
+//               Class<?> mClass, int laneType,
+//               int length,
+//               M m1, M m2,
+//               BiFunction<M, M, Boolean> defaultImpl)
+//
 //
 bool LibraryCallKit::inline_vector_test() {
   const TypeInt*     cond         = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* vector_klass = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(3))->isa_int();
 
   if (cond         == nullptr || !cond->is_con() ||
       vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con()) {
     log_if_needed("  ** missing constant: cond=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -1550,17 +1617,20 @@ bool LibraryCallKit::inline_vector_test() {
                     NodeClassNames[argument(3)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-  BasicType elem_bt = elem_type->basic_type();
+
   int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   BoolTest::mask booltest = (BoolTest::mask)cond->get_con();
   ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
@@ -1584,7 +1654,7 @@ bool LibraryCallKit::inline_vector_test() {
     return false; // operand unboxing failed
   }
 
-  Node* cmp = gvn().transform(new VectorTestNode(opd1, opd2, booltest));
+  Node* cmp = gvn().transform(trace_vector(new VectorTestNode(opd1, opd2, booltest)));
   BoolTest::mask test = Matcher::vectortest_mask(booltest == BoolTest::overflow,
                                                  opd1->bottom_type()->isa_vectmask(), num_elem);
   Node* bol = gvn().transform(new BoolNode(cmp, test));
@@ -1595,24 +1665,26 @@ bool LibraryCallKit::inline_vector_test() {
   return true;
 }
 
-// public static
-// <V extends Vector<E>,
-//  M extends VectorMask<E>,
-//  E>
-// V blend(Class<? extends V> vectorClass, Class<M> maskClass, Class<E> elementType, int vlen,
-//         V v1, V v2, M m,
-//         VectorBlendOp<V, M, E> defaultImpl)
+//
+//  <V extends Vector<E>,
+//   M extends VectorMask<E>,
+//   E>
+//  V blend(Class<? extends V> vClass, Class<M> mClass, int laneType,
+//          int length,
+//          V v1, V v2, M m,
+//          VectorBlendOp<V, M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_blend() {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(3))->isa_int();
 
-  if (mask_klass == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr) {
+  if (mask_klass == nullptr || vector_klass == nullptr || vlen == nullptr || laneType == nullptr) {
     return false; // dead code
   }
   if (mask_klass->const_oop() == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass->const_oop() == nullptr || !vlen->is_con()) {
+      !vlen->is_con() || !laneType->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
@@ -1620,16 +1692,19 @@ bool LibraryCallKit::inline_vector_blend() {
                     NodeClassNames[argument(3)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false; // should be primitive type
+  }
+
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-  BasicType elem_bt = elem_type->basic_type();
+
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   BasicType mask_bt = elem_bt;
   int num_elem = vlen->get_con();
 
@@ -1652,7 +1727,7 @@ bool LibraryCallKit::inline_vector_blend() {
     return false; // operand unboxing failed
   }
 
-  Node* blend = gvn().transform(new VectorBlendNode(v1, v2, mask));
+  Node* blend = gvn().transform(trace_vector(new VectorBlendNode(v1, v2, mask)));
 
   Node* box = box_vector(blend, vbox_type, elem_bt, num_elem);
   set_result(box);
@@ -1660,25 +1735,29 @@ bool LibraryCallKit::inline_vector_blend() {
   return true;
 }
 
-//  public static
+
+//
 //  <V extends Vector<E>,
 //   M extends VectorMask<E>,
 //   E>
-//  M compare(int cond, Class<? extends V> vectorClass, Class<M> maskClass, Class<E> elementType, int vlen,
+//  M compare(int cond,
+//            Class<? extends V> vectorClass, Class<M> mClass, int laneType,
+//            int length,
 //            V v1, V v2, M m,
-//            VectorCompareOp<V,M> defaultImpl)
+//            VectorCompareOp<V, M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_compare() {
   const TypeInt*     cond         = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* vector_klass = gvn().type(argument(1))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(4))->isa_int();
 
-  if (cond == nullptr || vector_klass == nullptr || mask_klass == nullptr || elem_klass == nullptr || vlen == nullptr) {
+  if (cond == nullptr || vector_klass == nullptr || mask_klass == nullptr || laneType == nullptr || vlen == nullptr) {
     return false; // dead code
   }
   if (!cond->is_con() || vector_klass->const_oop() == nullptr || mask_klass->const_oop() == nullptr ||
-      elem_klass->const_oop() == nullptr || !vlen->is_con()) {
+      !laneType->is_con() || !vlen->is_con()) {
     log_if_needed("  ** missing constant: cond=%s vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
@@ -1687,18 +1766,20 @@ bool LibraryCallKit::inline_vector_compare() {
                     NodeClassNames[argument(4)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass) || !is_klass_initialized(mask_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
 
   int num_elem = vlen->get_con();
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   BasicType mask_bt = elem_bt;
 
   if ((cond->get_con() & BoolTest::unsigned_compare) != 0) {
@@ -1747,6 +1828,7 @@ bool LibraryCallKit::inline_vector_compare() {
 
   const TypeVect* vmask_type = TypeVect::makemask(mask_bt, num_elem);
   Node* operation = new VectorMaskCmpNode(pred, v1, v2, pred_node, vmask_type);
+  trace_vector(operation);
 
   if (is_masked_op) {
     if (use_predicate) {
@@ -1766,27 +1848,30 @@ bool LibraryCallKit::inline_vector_compare() {
   return true;
 }
 
-// public static
-// <V extends Vector<E>,
-//  Sh extends VectorShuffle<E>,
-//  M extends VectorMask<E>,
-//  E>
-// V rearrangeOp(Class<? extends V> vectorClass, Class<Sh> shuffleClass, Class<M> maskClass, Class<E> elementType, int vlen,
-//               V v1, Sh sh, M m,
-//               VectorRearrangeOp<V, Sh, M, E> defaultImpl)
+//
+//  <V extends Vector<E>,
+//   SH extends VectorShuffle<E>,
+//   M  extends VectorMask<E>,
+//   E>
+//  V rearrangeOp(Class<? extends V> vClass, Class<SH> shClass, Class<M> mClass, int laneType,
+//                int length,
+//                V v, SH sh, M m,
+//                VectorRearrangeOp<V, SH, M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_rearrange() {
   const TypeInstPtr* vector_klass  = gvn().type(argument(0))->isa_instptr();
   const TypeInstPtr* shuffle_klass = gvn().type(argument(1))->isa_instptr();
   const TypeInstPtr* mask_klass    = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass    = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType      = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen          = gvn().type(argument(4))->isa_int();
 
-  if (vector_klass == nullptr  || shuffle_klass == nullptr ||  elem_klass == nullptr || vlen == nullptr) {
+  if (vector_klass == nullptr  || shuffle_klass == nullptr ||  laneType == nullptr || vlen == nullptr) {
     return false; // dead code
   }
+
   if (shuffle_klass->const_oop() == nullptr ||
       vector_klass->const_oop()  == nullptr ||
-      elem_klass->const_oop()    == nullptr ||
+      !laneType->is_con() ||
       !vlen->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s sclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -1795,18 +1880,20 @@ bool LibraryCallKit::inline_vector_rearrange() {
                     NodeClassNames[argument(4)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
   if (!is_klass_initialized(vector_klass)  ||
       !is_klass_initialized(shuffle_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
 
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   BasicType shuffle_bt = elem_bt;
   if (shuffle_bt == T_FLOAT) {
     shuffle_bt = T_INT;
@@ -1886,6 +1973,7 @@ bool LibraryCallKit::inline_vector_rearrange() {
   }
 
   Node* rearrange = new VectorRearrangeNode(v1, shuffle);
+  trace_vector(rearrange);
   if (is_masked_op) {
     if (use_predicate) {
       rearrange->add_req(mask);
@@ -1905,22 +1993,23 @@ bool LibraryCallKit::inline_vector_rearrange() {
   return true;
 }
 
-//    public static
-//    <V extends Vector<E>,
-//     M  extends VectorMask<E>,
-//     E>
-//    V selectFromOp(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
-//                   int length, V v1, V v2, M m,
-//                   VectorSelectFromOp<V, M> defaultImpl)
+//
+//  <V extends Vector<E>,
+//   M  extends VectorMask<E>,
+//   E>
+//  V selectFromOp(Class<? extends V> vClass, Class<M> mClass, int laneType,
+//                 int length, V v1, V v2, M m,
+//                 VectorSelectFromOp<V, M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_select_from() {
   const TypeInstPtr* vector_klass  = gvn().type(argument(0))->isa_instptr();
   const TypeInstPtr* mask_klass    = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass    = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType      = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen          = gvn().type(argument(3))->isa_int();
 
-  if (vector_klass == nullptr  || elem_klass == nullptr || vlen == nullptr ||
+  if (vector_klass == nullptr  || laneType == nullptr || vlen == nullptr ||
       vector_klass->const_oop()  == nullptr ||
-      elem_klass->const_oop()    == nullptr ||
+      !laneType->is_con() ||
       !vlen->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -1928,17 +2017,20 @@ bool LibraryCallKit::inline_vector_select_from() {
                     NodeClassNames[argument(3)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
-  BasicType elem_bt = elem_type->basic_type();
+
   int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   if (!is_power_of_2(num_elem)) {
     log_if_needed("  ** vlen not power of two=%d", num_elem);
     return false;
@@ -2033,6 +2125,7 @@ bool LibraryCallKit::inline_vector_select_from() {
 
   // and finally rearrange
   Node* rearrange = new VectorRearrangeNode(v2, shuffle);
+  trace_vector(rearrange);
   if (is_masked_op) {
     if (use_predicate) {
       // masked rearrange is supported so use that directly
@@ -2061,25 +2154,27 @@ bool LibraryCallKit::inline_vector_select_from() {
   return true;
 }
 
-//  public static
-//  <V extends Vector<E>,
-//   M extends VectorMask<E>,
-//   E>
-//  V broadcastInt(int opr, Class<? extends V> vectorClass, Class<? extends M> maskClass,
-//                 Class<E> elementType, int length,
-//                 V v, int n, M m,
-//                 VectorBroadcastIntOp<V, M> defaultImpl)
+//
+//    <V extends Vector<E>,
+//     M extends VectorMask<E>,
+//     E>
+//    V broadcastInt(int opr,
+//                   Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
+//                   int length,
+//                   V v, int n, M m,
+//                   VectorBroadcastIntOp<V, M> defaultImpl) {
+//
 bool LibraryCallKit::inline_vector_broadcast_int() {
   const TypeInt*     opr          = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* vector_klass = gvn().type(argument(1))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(4))->isa_int();
 
-  if (opr == nullptr || vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr) {
+  if (opr == nullptr || vector_klass == nullptr || laneType == nullptr || vlen == nullptr) {
     return false; // dead code
   }
-  if (!opr->is_con() || vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con()) {
+  if (!opr->is_con() || vector_klass->const_oop() == nullptr || !laneType->is_con() || !vlen->is_con()) {
     log_if_needed("  ** missing constant: opr=%s vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
@@ -2092,6 +2187,12 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
     return false;
   }
 
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   const Type* vmask_type = gvn().type(argument(7));
   bool is_masked_op = vmask_type != TypePtr::NULL_PTR;
   if (is_masked_op) {
@@ -2111,15 +2212,9 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
     }
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-
   int num_elem = vlen->get_con();
-  BasicType elem_bt = elem_type->basic_type();
-  int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
+  int opc = VectorSupport::vop2ideal(opr->get_con(), vltype);
 
   bool is_shift  = VectorNode::is_shift_opcode(opc);
   bool is_rotate = VectorNode::is_rotate_opcode(opc);
@@ -2192,6 +2287,7 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
   }
 
   Node* operation = VectorNode::make(opc, opd1, opd2, num_elem, elem_bt);
+  trace_vector(operation);
   if (is_masked_op && mask != nullptr) {
     if (use_predicate) {
       operation->add_req(mask);
@@ -2208,12 +2304,12 @@ bool LibraryCallKit::inline_vector_broadcast_int() {
   return true;
 }
 
-// public static <VOUT extends VectorPayload,
-//                 VIN extends VectorPayload,
-//                   S extends VectorSpecies>
+// <VOUT extends VectorPayload,
+//  VIN extends VectorPayload,
+//  S extends VectorSpecies>
 // VOUT convert(int oprId,
-//           Class<?> fromVectorClass, Class<?> fromElementType, int fromVLen,
-//           Class<?>   toVectorClass, Class<?>   toElementType, int   toVLen,
+//           Class<?> fromVectorClass, int fromLaneType, int fromVLen,
+//           Class<?>   toVectorClass, int toLaneType, int toVLen,
 //           VIN v, S s,
 //           VectorConvertOp<VOUT, VIN, S> defaultImpl)
 //
@@ -2221,22 +2317,22 @@ bool LibraryCallKit::inline_vector_convert() {
   const TypeInt*     opr               = gvn().type(argument(0))->isa_int();
 
   const TypeInstPtr* vector_klass_from = gvn().type(argument(1))->isa_instptr();
-  const TypeInstPtr* elem_klass_from   = gvn().type(argument(2))->isa_instptr();
+  const TypeInt*     laneType_from     = gvn().type(argument(2))->isa_int();
   const TypeInt*     vlen_from         = gvn().type(argument(3))->isa_int();
 
   const TypeInstPtr* vector_klass_to   = gvn().type(argument(4))->isa_instptr();
-  const TypeInstPtr* elem_klass_to     = gvn().type(argument(5))->isa_instptr();
+  const TypeInt*     laneType_to       = gvn().type(argument(5))->isa_int();
   const TypeInt*     vlen_to           = gvn().type(argument(6))->isa_int();
 
   if (opr == nullptr ||
-      vector_klass_from == nullptr || elem_klass_from == nullptr || vlen_from == nullptr ||
-      vector_klass_to   == nullptr || elem_klass_to   == nullptr || vlen_to   == nullptr) {
+      vector_klass_from == nullptr || laneType_from == nullptr || vlen_from == nullptr ||
+      vector_klass_to   == nullptr || laneType_to == nullptr || vlen_to   == nullptr) {
     return false; // dead code
   }
   if (!opr->is_con() ||
-      vector_klass_from->const_oop() == nullptr || elem_klass_from->const_oop() == nullptr || !vlen_from->is_con() ||
-      vector_klass_to->const_oop() == nullptr || elem_klass_to->const_oop() == nullptr || !vlen_to->is_con()) {
-    log_if_needed("  ** missing constant: opr=%s vclass_from=%s etype_from=%s vlen_from=%s vclass_to=%s etype_to=%s vlen_to=%s",
+      vector_klass_from->const_oop() == nullptr || !laneType_from->is_con() || !vlen_from->is_con() ||
+      vector_klass_to->const_oop() == nullptr || !laneType_to->is_con() || !vlen_to->is_con()) {
+    log_if_needed("  ** missing constant: opr=%s vclass_from=%s laneType_from=%s vlen_from=%s vclass_to=%s laneType_to=%s vlen_to=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
                     NodeClassNames[argument(2)->Opcode()],
@@ -2262,16 +2358,19 @@ bool LibraryCallKit::inline_vector_convert() {
 
   bool is_mask = is_vector_mask(vbox_klass_from);
 
-  ciType* elem_type_from = elem_klass_from->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type_from->is_primitive_type()) {
+  VectorSupport::LaneType vltype_from = static_cast<VectorSupport::LaneType>(laneType_from->get_con());
+  if (!is_primitive_lane_type(vltype_from)) {
+    log_if_needed("  ** not a primitive from lt=%s", VectorSupport::lanetype2name(vltype_from));
     return false; // should be primitive type
   }
-  BasicType elem_bt_from = elem_type_from->basic_type();
-  ciType* elem_type_to = elem_klass_to->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type_to->is_primitive_type()) {
+
+  VectorSupport::LaneType vltype_to = static_cast<VectorSupport::LaneType>(laneType_to->get_con());
+  if (!is_primitive_lane_type(vltype_to)) {
+    log_if_needed("  ** not a primitive to lt=%s", VectorSupport::lanetype2name(vltype_to));
     return false; // should be primitive type
   }
-  BasicType elem_bt_to = elem_type_to->basic_type();
+  BasicType elem_bt_from = get_vector_primitive_lane_type(vltype_from);
+  BasicType elem_bt_to = get_vector_primitive_lane_type(vltype_to);
 
   int num_elem_from = vlen_from->get_con();
   int num_elem_to = vlen_to->get_con();
@@ -2330,6 +2429,21 @@ bool LibraryCallKit::inline_vector_convert() {
   Node* op = opd1;
   if (is_cast) {
     assert(!is_mask || num_elem_from == num_elem_to, "vector mask cast needs the same elem num");
+
+    // Make sure the precondition of VectorCastNode::opcode holds: we can only have
+    // unsigned casts for integral types (excluding long). VectorAPI code is not
+    // expected to violate this at runtime, but we may compile unreachable code
+    // where such impossible combinations arise.
+    if (is_ucast && (!is_integral_type(elem_bt_from) || elem_bt_from == T_LONG)) {
+      // Halt-and-catch fire here. This condition should never happen at runtime.
+      stringStream ss;
+      ss.print("impossible combination: unsigned vector cast from %s", type2name(elem_bt_from));
+      halt(control(), frameptr(), ss.as_string(C->comp_arena()));
+      stop_and_kill_map();
+      log_if_needed("  ** impossible combination: unsigned cast from %s", type2name(elem_bt_from));
+      return true;
+    }
+
     int cast_vopc = VectorCastNode::opcode(-1, elem_bt_from, !is_ucast);
 
     // Make sure that vector cast is implemented to particular type/size combination if it is
@@ -2354,7 +2468,7 @@ bool LibraryCallKit::inline_vector_convert() {
         return false;
       }
 
-      op = gvn().transform(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_for_cast));
+      op = gvn().transform(trace_vector(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_for_cast)));
       // Now ensure that the destination gets properly resized to needed size.
       op = gvn().transform(new VectorReinterpretNode(op, op->bottom_type()->is_vect(), dst_type));
     } else if (num_elem_from > num_elem_to) {
@@ -2375,7 +2489,7 @@ bool LibraryCallKit::inline_vector_convert() {
 
       const TypeVect* resize_type = TypeVect::make(elem_bt_from, num_elem_for_resize);
       op = gvn().transform(new VectorReinterpretNode(op, src_type, resize_type));
-      op = gvn().transform(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_to));
+      op = gvn().transform(trace_vector(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_to)));
     } else { // num_elem_from == num_elem_to
       if (is_mask) {
         // Make sure that cast for vector mask is implemented to particular type/size combination.
@@ -2384,16 +2498,16 @@ bool LibraryCallKit::inline_vector_convert() {
                           num_elem_to, type2name(elem_bt_to), is_mask);
           return false;
         }
-        op = gvn().transform(new VectorMaskCastNode(op, dst_type));
+        op = gvn().transform(trace_vector(new VectorMaskCastNode(op, dst_type)));
       } else {
         // Since input and output number of elements match, and since we know this vector size is
         // supported, simply do a cast with no resize needed.
-        op = gvn().transform(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_to));
+        op = gvn().transform(trace_vector(VectorCastNode::make(cast_vopc, op, elem_bt_to, num_elem_to)));
       }
     }
   } else if (!Type::equals(src_type, dst_type)) {
     assert(!is_cast, "must be reinterpret");
-    op = gvn().transform(new VectorReinterpretNode(op, src_type, dst_type));
+    op = gvn().transform(trace_vector(new VectorReinterpretNode(op, src_type, dst_type)));
   }
 
   const TypeInstPtr* vbox_type_to = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass_to);
@@ -2403,22 +2517,25 @@ bool LibraryCallKit::inline_vector_convert() {
   return true;
 }
 
-//  public static
+//
 //  <V extends Vector<E>,
 //   E>
-//  V insert(Class<? extends V> vectorClass, Class<E> elementType, int vlen,
-//           V vec, int ix, long val,
+//  V insert(Class<? extends V> vClass, int laneType,
+//           int length,
+//           V v, int i, long val,
 //           VecInsertOp<V> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_insert() {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(1))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(1))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(2))->isa_int();
   const TypeInt*     idx          = gvn().type(argument(4))->isa_int();
 
-  if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr || idx == nullptr) {
+  if (vector_klass == nullptr || laneType == nullptr || vlen == nullptr || idx == nullptr) {
     return false; // dead code
   }
-  if (vector_klass->const_oop() == nullptr || elem_klass->const_oop() == nullptr || !vlen->is_con() || !idx->is_con()) {
+  if (vector_klass->const_oop() == nullptr || !laneType->is_con() ||
+      !vlen->is_con() || !idx->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s idx=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
@@ -2426,17 +2543,20 @@ bool LibraryCallKit::inline_vector_insert() {
                     NodeClassNames[argument(4)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-  BasicType elem_bt = elem_type->basic_type();
+
   int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   if (!arch_supports_vector(Op_VectorInsert, num_elem, elem_bt, VecMaskNotUsed)) {
     log_if_needed("  ** not supported: arity=1 op=insert vlen=%d etype=%s ismask=no",
                     num_elem, type2name(elem_bt));
@@ -2478,7 +2598,7 @@ bool LibraryCallKit::inline_vector_insert() {
     default: fatal("%s", type2name(elem_bt)); break;
   }
 
-  Node* operation = gvn().transform(VectorInsertNode::make(opd, insert_val, idx->get_con(), gvn()));
+  Node* operation = gvn().transform(trace_vector(VectorInsertNode::make(opd, insert_val, idx->get_con(), gvn())));
 
   Node* vbox = box_vector(operation, vbox_type, elem_bt, num_elem);
   set_result(vbox);
@@ -2486,41 +2606,45 @@ bool LibraryCallKit::inline_vector_insert() {
   return true;
 }
 
-//  public static
+//
 //  <VM extends VectorPayload,
 //   E>
-//  long extract(Class<? extends VM> vClass, Class<E> eClass,
+//  long extract(Class<? extends VM> vClass, int laneType,
 //               int length,
 //               VM vm, int i,
 //               VecExtractOp<VM> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_extract() {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(1))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(1))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(2))->isa_int();
   const TypeInt*     idx          = gvn().type(argument(4))->isa_int();
 
   if (vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con() ||
       idx          == nullptr) {
-    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
+    log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s idx=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
-                    NodeClassNames[argument(2)->Opcode()]);
+                    NodeClassNames[argument(2)->Opcode()],
+                    NodeClassNames[argument(3)->Opcode()]);
     return false; // not enough info for intrinsification
   }
+
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-  BasicType elem_bt = elem_type->basic_type();
-  int num_elem = vlen->get_con();
 
+  int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   ciKlass* vbox_klass = vector_klass->const_oop()->as_instance()->java_lang_Class_klass();
   const TypeInstPtr* vbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, vbox_klass);
 
@@ -2536,7 +2660,7 @@ bool LibraryCallKit::inline_vector_extract() {
       if (opd == nullptr) {
         return false;
       }
-      opd = gvn().transform(VectorStoreMaskNode::make(gvn(), opd, elem_bt, num_elem));
+      opd = gvn().transform(trace_vector(VectorStoreMaskNode::make(gvn(), opd, elem_bt, num_elem)));
       opd = gvn().transform(new ExtractUBNode(opd, pos));
       opd = gvn().transform(new ConvI2LNode(opd));
     } else if (arch_supports_vector(Op_VectorMaskToLong, num_elem, elem_bt, VecMaskUseLoad)) {
@@ -2546,7 +2670,7 @@ bool LibraryCallKit::inline_vector_extract() {
       }
       // VectorMaskToLongNode requires the input is either a mask or a vector with BOOLEAN type.
       if (!Matcher::mask_op_prefers_predicate(Op_VectorMaskToLong, opd->bottom_type()->is_vect())) {
-        opd = gvn().transform(VectorStoreMaskNode::make(gvn(), opd, elem_bt, num_elem));
+        opd = gvn().transform(trace_vector(VectorStoreMaskNode::make(gvn(), opd, elem_bt, num_elem)));
       }
       // ((toLong() >>> pos) & 1L
       opd = gvn().transform(new VectorMaskToLongNode(opd, TypeLong::LONG));
@@ -2664,25 +2788,27 @@ static Node* LowerSelectFromTwoVectorOperation(PhaseGVN& phase, Node* index_vec,
   vmask_type = TypeVect::makemask(elem_bt, num_elem);
   mask = phase.transform(new VectorMaskCastNode(mask, vmask_type));
 
-  Node* p1 = phase.transform(new VectorRearrangeNode(src1, wrapped_index_vec));
-  Node* p2 = phase.transform(new VectorRearrangeNode(src2, wrapped_index_vec));
+  Node* p1 = phase.transform(trace_vector(new VectorRearrangeNode(src1, wrapped_index_vec)));
+  Node* p2 = phase.transform(trace_vector(new VectorRearrangeNode(src2, wrapped_index_vec)));
 
   return new VectorBlendNode(p2, p1, mask);
 }
 
-//  public static
+//
 //  <V extends Vector<E>,
 //   E>
-//  V selectFromTwoVectorOp(Class<? extends V> vClass, Class<E> eClass, int length,
+//  V selectFromTwoVectorOp(Class<? extends V> vClass, int laneType, int length,
 //                          V v1, V v2, V v3,
 //                          SelectFromTwoVector<V> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_select_from_two_vectors() {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass = gvn().type(argument(1))->isa_instptr();
+  const TypeInt* laneType = gvn().type(argument(1))->isa_int();
   const TypeInt* vlen = gvn().type(argument(2))->isa_int();
 
-  if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass->const_oop() == nullptr ||!vlen->is_con()) {
+  if (vector_klass == nullptr || laneType == nullptr || vlen == nullptr ||
+      vector_klass->const_oop() == nullptr ||
+      !laneType->is_con() || !vlen->is_con()) {
     log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
                     NodeClassNames[argument(1)->Opcode()],
@@ -2690,24 +2816,24 @@ bool LibraryCallKit::inline_vector_select_from_two_vectors() {
     return false; // not enough info for intrinsification
   }
 
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-
   int num_elem = vlen->get_con();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
   if (!is_power_of_2(num_elem)) {
     log_if_needed("  ** vlen is not power of two=%d", num_elem);
     return false;
   }
 
-  BasicType elem_bt = elem_type->basic_type();
   BasicType index_elem_bt = elem_bt;
   if (elem_bt == T_FLOAT) {
     index_elem_bt = T_INT;
@@ -2783,7 +2909,7 @@ bool LibraryCallKit::inline_vector_select_from_two_vectors() {
     Node* wrap_mask = gvn().makecon(TypeInteger::make(indexRangeMask, indexRangeMask, Type::WidenMin, index_elem_bt != T_LONG ? T_INT : index_elem_bt));
     Node* wrap_mask_vec = gvn().transform(VectorNode::scalar2vector(wrap_mask, num_elem, index_elem_bt, false));
     opd1 = gvn().transform(VectorNode::make(Op_AndV, opd1, wrap_mask_vec, opd1->bottom_type()->is_vect()));
-    operation = gvn().transform(VectorNode::make(Op_SelectFromTwoVector, opd1, opd2, opd3, vt));
+    operation = gvn().transform(trace_vector(VectorNode::make(Op_SelectFromTwoVector, opd1, opd2, opd3, vt)));
   }
 
   // Wrap it up in VectorBox to keep object type information.
@@ -2793,25 +2919,26 @@ bool LibraryCallKit::inline_vector_select_from_two_vectors() {
   return true;
 }
 
-// public static
-// <V extends Vector<E>,
-//  M extends VectorMask<E>,
-//  E>
-//  V compressExpandOp(int opr,
-//                    Class<? extends V> vClass, Class<? extends M> mClass, Class<E> eClass,
-//                    int length, V v, M m,
-//                    CompressExpandOperation<V, M> defaultImpl)
+//
+//  <V extends Vector<E>,
+//   M extends VectorMask<E>,
+//   E>
+//  VectorPayload compressExpandOp(int opr,
+//                                 Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
+//                                 int length, V v, M m,
+//                                 CompressExpandOperation<V, M> defaultImpl)
+//
 bool LibraryCallKit::inline_vector_compress_expand() {
   const TypeInt*     opr          = gvn().type(argument(0))->isa_int();
   const TypeInstPtr* vector_klass = gvn().type(argument(1))->isa_instptr();
   const TypeInstPtr* mask_klass   = gvn().type(argument(2))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(3))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(3))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(4))->isa_int();
 
   if (opr          == nullptr || !opr->is_con() ||
       vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
       mask_klass   == nullptr || mask_klass->const_oop()   == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con()) {
     log_if_needed("  ** missing constant: opr=%s vclass=%s mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -2827,15 +2954,15 @@ bool LibraryCallKit::inline_vector_compress_expand() {
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
   }
 
   int num_elem = vlen->get_con();
-  BasicType elem_bt = elem_type->basic_type();
-  int opc = VectorSupport::vop2ideal(opr->get_con(), elem_bt);
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
+  int opc = VectorSupport::vop2ideal(opr->get_con(), vltype);
 
   if (!arch_supports_vector(opc, num_elem, elem_bt, VecMaskUseLoad)) {
     log_if_needed("  ** not supported: opc=%d vlen=%d etype=%s ismask=useload",
@@ -2868,7 +2995,7 @@ bool LibraryCallKit::inline_vector_compress_expand() {
   }
 
   const TypeVect* vt = TypeVect::make(elem_bt, num_elem, opc == Op_CompressM);
-  Node* operation = gvn().transform(VectorNode::make(opc, opd1, mask, vt));
+  Node* operation = gvn().transform(trace_vector(VectorNode::make(opc, opd1, mask, vt)));
 
   // Wrap it up in VectorBox to keep object type information.
   const TypeInstPtr* box_type = opc == Op_CompressM ? mbox_type : vbox_type;
@@ -2878,21 +3005,22 @@ bool LibraryCallKit::inline_vector_compress_expand() {
   return true;
 }
 
-// public static
-// <V extends Vector<E>,
-//  E,
-//  S extends VectorSpecies<E>>
-//  V indexVector(Class<? extends V> vClass, Class<E> eClass,
+//
+//  <V extends Vector<E>,
+//   E,
+//   S extends VectorSpecies<E>>
+//  V indexVector(Class<? extends V> vClass, int laneType,
 //                int length,
 //                V v, int step, S s,
-//                IndexOperation<V, S> defaultImpl)
+//                IndexOperation<V, S> defaultImpl) {
+//
 bool LibraryCallKit::inline_index_vector() {
   const TypeInstPtr* vector_klass = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(1))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(1))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(2))->isa_int();
 
   if (vector_klass == nullptr || vector_klass->const_oop() == nullptr ||
-      elem_klass   == nullptr || elem_klass->const_oop()   == nullptr ||
+      laneType     == nullptr || !laneType->is_con() ||
       vlen         == nullptr || !vlen->is_con() ) {
     log_if_needed("  ** missing constant: vclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -2901,19 +3029,19 @@ bool LibraryCallKit::inline_index_vector() {
     return false; // not enough info for intrinsification
   }
 
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(vector_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-
   int num_elem = vlen->get_con();
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
 
   // Check whether the iota index generation op is supported by the current hardware
   if (!arch_supports_vector(Op_VectorLoadConst, num_elem, elem_bt, VecMaskNotUsed)) {
@@ -2921,7 +3049,7 @@ bool LibraryCallKit::inline_index_vector() {
     return false; // not supported
   }
 
-  int mul_op = VectorSupport::vop2ideal(VectorSupport::VECTOR_OP_MUL, elem_bt);
+  int mul_op = VectorSupport::vop2ideal(VectorSupport::VECTOR_OP_MUL, vltype);
   int vmul_op = VectorNode::opcode(mul_op, elem_bt);
   bool needs_mul = true;
   Node* scale = argument(4);
@@ -2957,7 +3085,7 @@ bool LibraryCallKit::inline_index_vector() {
     return false;
   }
 
-  int add_op = VectorSupport::vop2ideal(VectorSupport::VECTOR_OP_ADD, elem_bt);
+  int add_op = VectorSupport::vop2ideal(VectorSupport::VECTOR_OP_ADD, vltype);
   int vadd_op = VectorNode::opcode(add_op, elem_bt);
   bool needs_add = true;
   // The addition is not needed if all the element values of "opd" are zero
@@ -3001,12 +3129,12 @@ bool LibraryCallKit::inline_index_vector() {
       default: fatal("%s", type2name(elem_bt));
     }
     scale = gvn().transform(VectorNode::scalar2vector(scale, num_elem, elem_bt));
-    index = gvn().transform(VectorNode::make(vmul_op, index, scale, vt));
+    index = gvn().transform(trace_vector(VectorNode::make(vmul_op, index, scale, vt)));
   }
 
   // Add "opd" if addition is needed.
   if (needs_add) {
-    index = gvn().transform(VectorNode::make(vadd_op, opd, index, vt));
+    index = gvn().transform(trace_vector(VectorNode::make(vadd_op, opd, index, vt)));
   }
   Node* vbox = box_vector(index, vbox_type, elem_bt, num_elem);
   set_result(vbox);
@@ -3014,19 +3142,20 @@ bool LibraryCallKit::inline_index_vector() {
   return true;
 }
 
-// public static
-// <E,
-//  M extends VectorMask<E>>
-// M indexPartiallyInUpperRange(Class<? extends M> mClass, Class<E> eClass, int length,
-//                              long offset, long limit,
-//                              IndexPartiallyInUpperRangeOperation<E, M> defaultImpl)
+//
+//  <E,
+//   M extends VectorMask<E>>
+//  M indexPartiallyInUpperRange(Class<? extends M> mClass, int laneType,
+//                               int length, long offset, long limit,
+//                               IndexPartiallyInUpperRangeOperation<E, M> defaultImpl)
+//
 bool LibraryCallKit::inline_index_partially_in_upper_range() {
   const TypeInstPtr* mask_klass   = gvn().type(argument(0))->isa_instptr();
-  const TypeInstPtr* elem_klass   = gvn().type(argument(1))->isa_instptr();
+  const TypeInt*     laneType     = gvn().type(argument(1))->isa_int();
   const TypeInt*     vlen         = gvn().type(argument(2))->isa_int();
 
   if (mask_klass == nullptr || mask_klass->const_oop() == nullptr ||
-      elem_klass == nullptr || elem_klass->const_oop() == nullptr ||
+      laneType   == nullptr || !laneType->is_con() ||
       vlen       == nullptr || !vlen->is_con()) {
     log_if_needed("  ** missing constant: mclass=%s etype=%s vlen=%s",
                     NodeClassNames[argument(0)->Opcode()],
@@ -3035,19 +3164,19 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
     return false; // not enough info for intrinsification
   }
 
+  VectorSupport::LaneType vltype = static_cast<VectorSupport::LaneType>(laneType->get_con());
+  if (!is_primitive_lane_type(vltype)) {
+    log_if_needed("  ** not a primitive lt=%s", VectorSupport::lanetype2name(vltype));
+    return false;
+  }
+
   if (!is_klass_initialized(mask_klass)) {
     log_if_needed("  ** klass argument not initialized");
     return false;
   }
 
-  ciType* elem_type = elem_klass->const_oop()->as_instance()->java_mirror_type();
-  if (!elem_type->is_primitive_type()) {
-    log_if_needed("  ** not a primitive bt=%d", elem_type->basic_type());
-    return false; // should be primitive type
-  }
-
   int num_elem = vlen->get_con();
-  BasicType elem_bt = elem_type->basic_type();
+  BasicType elem_bt = get_vector_primitive_lane_type(vltype);
 
   // Check whether the necessary ops are supported by current hardware.
   bool supports_mask_gen = arch_supports_vector(Op_VectorMaskGen, num_elem, elem_bt, VecMaskUseStore);
@@ -3123,7 +3252,7 @@ bool LibraryCallKit::inline_index_partially_in_upper_range() {
     // Compute the vector mask with "mask = iota < indexLimit".
     ConINode* pred_node = (ConINode*)gvn().makecon(TypeInt::make(BoolTest::lt));
     const TypeVect* vmask_type = TypeVect::makemask(elem_bt, num_elem);
-    mask = gvn().transform(new VectorMaskCmpNode(BoolTest::lt, iota, indexLimit, pred_node, vmask_type));
+    mask = gvn().transform(trace_vector(new VectorMaskCmpNode(BoolTest::lt, iota, indexLimit, pred_node, vmask_type)));
   }
   Node* vbox = box_vector(mask, box_type, elem_bt, num_elem);
   set_result(vbox);
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 1755b0453eb..8e0ca927a16 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -1122,7 +1122,7 @@ Node* make_last(Node* initL, jint stride, Node* limitL, PhaseIdealLoop* phase) {
   Node* last = new AddLNode(initL, k_mul_stride);
 
   // Make sure that the last does not lie "before" init.
-  Node* last_clamped = MaxNode::build_min_max_long(&igvn, initL, last, stride > 0);
+  Node* last_clamped = MinMaxNode::build_min_max_long(&igvn, initL, last, stride > 0);
 
   phase->register_new_node_with_ctrl_of(diffL,        initL);
   phase->register_new_node_with_ctrl_of(diffL_m1,     initL);
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 271dc901dcb..d332bf440f6 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1326,6 +1326,32 @@ int ReductionNode::opcode(int opc, BasicType bt) {
       assert(bt == T_DOUBLE, "must be");
       vopc = Op_MaxReductionV;
       break;
+    case Op_UMinV:
+      switch (bt) {
+        case T_BOOLEAN:
+        case T_CHAR: return 0;
+        case T_BYTE:
+        case T_SHORT:
+        case T_INT:
+        case T_LONG:
+          vopc = Op_UMinReductionV;
+          break;
+        default: ShouldNotReachHere(); return 0;
+      }
+      break;
+    case Op_UMaxV:
+      switch (bt) {
+        case T_BOOLEAN:
+        case T_CHAR: return 0;
+        case T_BYTE:
+        case T_SHORT:
+        case T_INT:
+        case T_LONG:
+          vopc = Op_UMaxReductionV;
+          break;
+        default: ShouldNotReachHere(); return 0;
+      }
+      break;
     case Op_AndI:
       switch (bt) {
       case T_BOOLEAN:
@@ -1400,6 +1426,8 @@ ReductionNode* ReductionNode::make(int opc, Node* ctrl, Node* n1, Node* n2, Basi
   case Op_MulReductionVD: return new MulReductionVDNode(ctrl, n1, n2, requires_strict_order);
   case Op_MinReductionV:  return new MinReductionVNode (ctrl, n1, n2);
   case Op_MaxReductionV:  return new MaxReductionVNode (ctrl, n1, n2);
+  case Op_UMinReductionV: return new UMinReductionVNode(ctrl, n1, n2);
+  case Op_UMaxReductionV: return new UMaxReductionVNode(ctrl, n1, n2);
   case Op_AndReductionV:  return new AndReductionVNode (ctrl, n1, n2);
   case Op_OrReductionV:   return new OrReductionVNode  (ctrl, n1, n2);
   case Op_XorReductionV:  return new XorReductionVNode (ctrl, n1, n2);
@@ -1533,6 +1561,13 @@ bool VectorCastNode::implemented(int opc, uint vlen, BasicType src_type, BasicTy
   return false;
 }
 
+bool VectorCastNode::is_supported_subword_cast(BasicType def_bt, BasicType use_bt, const uint pack_size) {
+  assert(def_bt != use_bt, "use and def types must be different");
+
+  // Opcode is only required to disambiguate half float, so we pass -1 as it can't be encountered here.
+  return (is_subword_type(def_bt) || is_subword_type(use_bt)) && VectorCastNode::implemented(-1, pack_size, def_bt, use_bt);
+}
+
 Node* VectorCastNode::Identity(PhaseGVN* phase) {
   if (!in(1)->is_top()) {
     BasicType  in_bt = in(1)->bottom_type()->is_vect()->element_basic_type();
@@ -1611,6 +1646,30 @@ Node* ReductionNode::make_identity_con_scalar(PhaseGVN& gvn, int sopc, BasicType
           default: Unimplemented(); return nullptr;
       }
       break;
+    case Op_UMinReductionV:
+      switch (bt) {
+        case T_BYTE:
+          return gvn.makecon(TypeInt::make(max_jubyte));
+        case T_SHORT:
+          return gvn.makecon(TypeInt::make(max_jushort));
+        case T_INT:
+          return gvn.makecon(TypeInt::MINUS_1);
+        case T_LONG:
+          return gvn.makecon(TypeLong::MINUS_1);
+        default: Unimplemented(); return nullptr;
+      }
+      break;
+    case Op_UMaxReductionV:
+      switch (bt) {
+        case T_BYTE:
+        case T_SHORT:
+        case T_INT:
+          return gvn.makecon(TypeInt::ZERO);
+        case T_LONG:
+          return gvn.makecon(TypeLong::ZERO);
+        default: Unimplemented(); return nullptr;
+      }
+      break;
     default:
       fatal("Missed vector creation for '%s'", NodeClassNames[vopc]);
       return nullptr;
@@ -1919,6 +1978,15 @@ Node* VectorMaskToLongNode::Ideal_MaskAll(PhaseGVN* phase) {
   // saved with a predicate type.
   if (in1->Opcode() == Op_VectorStoreMask) {
     Node* mask = in1->in(1);
+    // Skip the optimization if the mask is dead.
+    if (phase->type(mask) == Type::TOP) {
+      return nullptr;
+    }
+    // If the ideal graph is transformed correctly, the input mask should be a
+    // vector type node. Following optimization can ignore the mismatched type
+    // issue. But we still keep the sanity check for the mask type by using
+    // "is_vect()" in the assertion below, so that there can be less optimizations
+    // evolved before the compiler finally runs into a problem.
     assert(!Matcher::mask_op_prefers_predicate(Opcode(), mask->bottom_type()->is_vect()), "sanity");
     in1 = mask;
   }
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index dc7aa13cf36..f0d010ee735 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,63 @@
 #include "opto/opcodes.hpp"
 #include "prims/vectorSupport.hpp"
 
-//------------------------------VectorNode-------------------------------------
+//=======================Notes-for-VectorMask-Representation=======================
+//
+// There are three distinct representations for vector masks based on platform and
+// use scenarios:
+//
+// - BVectMask: Platform-independent mask stored in a vector register with 8-bit
+//   lanes containing 1/0 values. The corresponding type is TypeVectA ~ TypeVectZ.
+//
+// - NVectMask: Platform-specific mask stored in vector registers with N-bit lanes,
+//   where all bits in each lane are either set (true) or unset (false). Generated
+//   on architectures without predicate/mask feature, such as AArch64 NEON, x86
+//   AVX2, etc. The corresponding type is TypeVectA ~ TypeVectZ.
+//
+// - PVectMask: Platform-specific mask stored in predicate/mask registers. Generated
+//   on architectures with predicate/mask feature, such as AArch64 SVE, x86 AVX-512,
+//   and RISC-V Vector Extension (RVV). The corresponding type is TypeVectMask.
+//
+// NVectMask and PVectMask encode element data type and vector length information.
+// They are the primary mask representations used in most mask and masked vector
+// operations. BVectMask primarily represents mask values loaded from or stored to
+// Java boolean memory (mask backing storage). VectorLoadMask/VectorStoreMask nodes
+// are needed to transform it to/from P/NVectMask. It is also used in certain mask
+// operations (e.g. VectorMaskOpNode).
+//
+//=========================Notes-for-Masked-Vector-Nodes===========================
+//
+// Each lane-wise and cross-lane (reduction) ALU node supports both non-masked
+// and masked operations.
+//
+// Currently masked vector nodes are only used to implement the Vector API's masked
+// operations (which might also be used for auto-vectorization in future), such as:
+//   Vector<E> lanewise(VectorOperators.Binary op, Vector<E> v, VectorMask<E> m)
+//
+// They are generated during intrinsification for Vector API, only on architectures
+// that support the relevant predicated instructions. The compiler uses
+// "Matcher::match_rule_supported_vector_masked()" to check whether the current
+// platform supports the predicated/masked vector instructions for an operation. It
+// generates the masked vector node for the operation if supported. Otherwise, it
+// generates the unpredicated vector node and implements the masked operation with
+// the help of a VectorBlendNode. Please see more details from API intrinsification
+// in vectorIntrinsics.cpp.
+//
+// To differentiate the masked and non-masked nodes, flag "Flag_is_predicated_vector"
+// is set for the masked version. Meanwhile, there is an additional mask input for
+// the masked nodes.
+//
+// For example:
+//   - Non-masked version:
+//          in1  in2
+//           \   /
+//         AddVBNode
+//
+//   - Masked version (with "Flag_is_predicated_vector" being set):
+//       in1  in2  mask
+//         \   |   /
+//         AddVBNode
+
 // Vector Operation
 class VectorNode : public TypeNode {
  public:
@@ -103,6 +159,8 @@ class VectorNode : public TypeNode {
   static bool implemented(int opc, uint vlen, BasicType bt);
   static bool is_shift(Node* n);
   static bool is_vshift_cnt(Node* n);
+  // Returns true if the lower vlen bits (bits [0, vlen-1]) of the long value
+  // are all 1s or all 0s, indicating a "mask all" or "mask none" pattern.
   static bool is_maskall_type(const TypeLong* type, int vlen);
   static bool is_muladds2i(const Node* n);
   static bool is_roundopD(Node* n);
@@ -176,7 +234,6 @@ class SaturatingVectorNode : public VectorNode {
   bool is_unsigned() { return _is_unsigned; }
 };
 
-//------------------------------AddVBNode--------------------------------------
 // Vector add byte
 class AddVBNode : public VectorNode {
  public:
@@ -184,7 +241,6 @@ class AddVBNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AddVSNode--------------------------------------
 // Vector add char/short
 class AddVSNode : public VectorNode {
  public:
@@ -192,7 +248,6 @@ class AddVSNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AddVINode--------------------------------------
 // Vector add int
 class AddVINode : public VectorNode {
  public:
@@ -200,7 +255,6 @@ class AddVINode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AddVLNode--------------------------------------
 // Vector add long
 class AddVLNode : public VectorNode {
 public:
@@ -208,7 +262,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AddVHFNode--------------------------------------
 // Vector add float
 class AddVHFNode : public VectorNode {
 public:
@@ -216,7 +269,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AddVFNode--------------------------------------
 // Vector add float
 class AddVFNode : public VectorNode {
 public:
@@ -224,7 +276,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AddVDNode--------------------------------------
 // Vector add double
 class AddVDNode : public VectorNode {
 public:
@@ -232,7 +283,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------ReductionNode------------------------------------
 // Perform reduction of a vector
 class ReductionNode : public Node {
  private:
@@ -294,7 +344,6 @@ class ReductionNode : public Node {
 #endif
 };
 
-//------------------------------AddReductionVINode--------------------------------------
 // Vector add byte, short and int as a reduction
 class AddReductionVINode : public ReductionNode {
 public:
@@ -302,7 +351,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AddReductionVLNode--------------------------------------
 // Vector add long as a reduction
 class AddReductionVLNode : public ReductionNode {
 public:
@@ -310,7 +358,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AddReductionVFNode--------------------------------------
 // Vector add float as a reduction
 class AddReductionVFNode : public ReductionNode {
 private:
@@ -337,7 +384,6 @@ public:
   virtual uint size_of() const { return sizeof(*this); }
 };
 
-//------------------------------AddReductionVDNode--------------------------------------
 // Vector add double as a reduction
 class AddReductionVDNode : public ReductionNode {
 private:
@@ -364,7 +410,6 @@ public:
   virtual uint size_of() const { return sizeof(*this); }
 };
 
-//------------------------------SubVBNode--------------------------------------
 // Vector subtract byte
 class SubVBNode : public VectorNode {
  public:
@@ -372,7 +417,6 @@ class SubVBNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SubVSNode--------------------------------------
 // Vector subtract short
 class SubVSNode : public VectorNode {
  public:
@@ -380,7 +424,6 @@ class SubVSNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SubVINode--------------------------------------
 // Vector subtract int
 class SubVINode : public VectorNode {
  public:
@@ -388,7 +431,6 @@ class SubVINode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SubVLNode--------------------------------------
 // Vector subtract long
 class SubVLNode : public VectorNode {
  public:
@@ -396,7 +438,6 @@ class SubVLNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SaturatingAddVNode-----------------------------
 // Vector saturating addition.
 class SaturatingAddVNode : public SaturatingVectorNode {
  public:
@@ -404,7 +445,6 @@ class SaturatingAddVNode : public SaturatingVectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SaturatingSubVNode-----------------------------
 // Vector saturating subtraction.
 class SaturatingSubVNode : public SaturatingVectorNode {
  public:
@@ -412,7 +452,6 @@ class SaturatingSubVNode : public SaturatingVectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SubVHFNode--------------------------------------
 // Vector subtract half float
 class SubVHFNode : public VectorNode {
 public:
@@ -420,8 +459,6 @@ public:
   virtual int Opcode() const;
 };
 
-
-//------------------------------SubVFNode--------------------------------------
 // Vector subtract float
 class SubVFNode : public VectorNode {
  public:
@@ -429,7 +466,6 @@ class SubVFNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SubVDNode--------------------------------------
 // Vector subtract double
 class SubVDNode : public VectorNode {
  public:
@@ -437,7 +473,6 @@ class SubVDNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------MulVBNode--------------------------------------
 // Vector multiply byte
 class MulVBNode : public VectorNode {
  public:
@@ -445,7 +480,6 @@ class MulVBNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------MulVSNode--------------------------------------
 // Vector multiply short
 class MulVSNode : public VectorNode {
  public:
@@ -453,7 +487,6 @@ class MulVSNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------MulVINode--------------------------------------
 // Vector multiply int
 class MulVINode : public VectorNode {
  public:
@@ -461,7 +494,6 @@ class MulVINode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------MulVLNode--------------------------------------
 // Vector multiply long
 class MulVLNode : public VectorNode {
 public:
@@ -473,7 +505,6 @@ public:
   bool has_uint_inputs() const;
 };
 
-//------------------------------MulVFNode--------------------------------------
 // Vector multiply half float
 class MulVHFNode : public VectorNode {
 public:
@@ -481,7 +512,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MulVFNode--------------------------------------
 // Vector multiply float
 class MulVFNode : public VectorNode {
 public:
@@ -489,7 +519,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MulVDNode--------------------------------------
 // Vector multiply double
 class MulVDNode : public VectorNode {
 public:
@@ -497,7 +526,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MulAddVS2VINode--------------------------------
 // Vector multiply shorts to int and add adjacent ints.
 class MulAddVS2VINode : public VectorNode {
   public:
@@ -505,7 +533,6 @@ class MulAddVS2VINode : public VectorNode {
     virtual int Opcode() const;
 };
 
-//------------------------------FmaVNode--------------------------------------
 // Vector fused-multiply-add
 class FmaVNode : public VectorNode {
 public:
@@ -515,7 +542,6 @@ public:
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
-//------------------------------FmaVDNode--------------------------------------
 // Vector fused-multiply-add double
 class FmaVDNode : public FmaVNode {
 public:
@@ -523,7 +549,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------FmaVFNode--------------------------------------
 // Vector fused-multiply-add float
 class FmaVFNode : public FmaVNode {
 public:
@@ -531,7 +556,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------FmaVHFNode-------------------------------------
 // Vector fused-multiply-add half-precision float
 class FmaVHFNode : public FmaVNode {
 public:
@@ -539,7 +563,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MulReductionVINode--------------------------------------
 // Vector multiply byte, short and int as a reduction
 class MulReductionVINode : public ReductionNode {
 public:
@@ -547,7 +570,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MulReductionVLNode--------------------------------------
 // Vector multiply int as a reduction
 class MulReductionVLNode : public ReductionNode {
 public:
@@ -555,7 +577,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MulReductionVFNode--------------------------------------
 // Vector multiply float as a reduction
 class MulReductionVFNode : public ReductionNode {
   // True if mul reduction operation for floats requires strict ordering.
@@ -581,7 +602,6 @@ public:
   virtual uint size_of() const { return sizeof(*this); }
 };
 
-//------------------------------MulReductionVDNode--------------------------------------
 // Vector multiply double as a reduction
 class MulReductionVDNode : public ReductionNode {
   // True if mul reduction operation for doubles requires strict ordering.
@@ -607,7 +627,6 @@ public:
   virtual uint size_of() const { return sizeof(*this); }
 };
 
-//------------------------------DivVHFNode-------------------------------------
 // Vector divide half float
 class DivVHFNode : public VectorNode {
 public:
@@ -615,7 +634,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------DivVFNode--------------------------------------
 // Vector divide float
 class DivVFNode : public VectorNode {
  public:
@@ -623,7 +641,6 @@ class DivVFNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------DivVDNode--------------------------------------
 // Vector Divide double
 class DivVDNode : public VectorNode {
  public:
@@ -631,7 +648,6 @@ class DivVDNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AbsVBNode--------------------------------------
 // Vector Abs byte
 class AbsVBNode : public VectorNode {
 public:
@@ -639,7 +655,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AbsVSNode--------------------------------------
 // Vector Abs short
 class AbsVSNode : public VectorNode {
 public:
@@ -647,7 +662,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MinVNode--------------------------------------
 // Vector Min
 class MinVNode : public VectorNode {
 public:
@@ -655,7 +669,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MinVHFNode------------------------------------
 // Vector Min for half floats
 class MinVHFNode : public VectorNode {
 public:
@@ -663,7 +676,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MaxVHFNode------------------------------------
 // Vector Max for half floats
 class MaxVHFNode : public VectorNode {
 public:
@@ -671,6 +683,7 @@ public:
   virtual int Opcode() const;
 };
 
+// Vector Unsigned Min
 class UMinVNode : public VectorNode {
  public:
   UMinVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2 ,vt) {
@@ -681,8 +694,6 @@ class UMinVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-
-//------------------------------MaxVNode--------------------------------------
 // Vector Max
 class MaxVNode : public VectorNode {
  public:
@@ -690,6 +701,7 @@ class MaxVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Vector Unsigned Max
 class UMaxVNode : public VectorNode {
  public:
   UMaxVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {
@@ -700,7 +712,6 @@ class UMaxVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AbsVINode--------------------------------------
 // Vector Abs int
 class AbsVINode : public VectorNode {
  public:
@@ -708,7 +719,6 @@ class AbsVINode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AbsVLNode--------------------------------------
 // Vector Abs long
 class AbsVLNode : public VectorNode {
 public:
@@ -716,7 +726,6 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------AbsVFNode--------------------------------------
 // Vector Abs float
 class AbsVFNode : public VectorNode {
  public:
@@ -724,7 +733,6 @@ class AbsVFNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AbsVDNode--------------------------------------
 // Vector Abs double
 class AbsVDNode : public VectorNode {
  public:
@@ -732,7 +740,6 @@ class AbsVDNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------NegVNode---------------------------------------
 // Vector Neg parent class (not for code generation).
 class NegVNode : public VectorNode {
  public:
@@ -746,7 +753,6 @@ class NegVNode : public VectorNode {
   Node* degenerate_integral_negate(PhaseGVN* phase, bool is_predicated);
 };
 
-//------------------------------NegVINode--------------------------------------
 // Vector Neg byte/short/int
 class NegVINode : public NegVNode {
  public:
@@ -754,7 +760,6 @@ class NegVINode : public NegVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------NegVLNode--------------------------------------
 // Vector Neg long
 class NegVLNode : public NegVNode {
  public:
@@ -762,7 +767,6 @@ class NegVLNode : public NegVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------NegVFNode--------------------------------------
 // Vector Neg float
 class NegVFNode : public NegVNode {
  public:
@@ -770,7 +774,6 @@ class NegVFNode : public NegVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------NegVDNode--------------------------------------
 // Vector Neg double
 class NegVDNode : public NegVNode {
  public:
@@ -778,7 +781,6 @@ class NegVDNode : public NegVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PopCountVINode---------------------------------
 // Vector popcount integer bits
 class PopCountVINode : public VectorNode {
  public:
@@ -786,7 +788,6 @@ class PopCountVINode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PopCountVLNode---------------------------------
 // Vector popcount long bits
 class PopCountVLNode : public VectorNode {
  public:
@@ -796,7 +797,6 @@ class PopCountVLNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SqrtVHFNode-------------------------------------
 // Vector Sqrt half-precision float
 class SqrtVHFNode : public VectorNode {
 public:
@@ -804,14 +804,13 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------SqrtVFNode--------------------------------------
 // Vector Sqrt float
 class SqrtVFNode : public VectorNode {
  public:
   SqrtVFNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {}
   virtual int Opcode() const;
 };
-//------------------------------RoundDoubleVNode--------------------------------
+
 // Vector round double
 class RoundDoubleModeVNode : public VectorNode {
  public:
@@ -819,7 +818,6 @@ class RoundDoubleModeVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------SqrtVDNode--------------------------------------
 // Vector Sqrt double
 class SqrtVDNode : public VectorNode {
  public:
@@ -827,8 +825,7 @@ class SqrtVDNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------ShiftVNode-----------------------------------
-// Class ShiftV functionality.  This covers the common behaviors for all kinds
+// Class ShiftV functionality. This covers the common behaviors for all kinds
 // of vector shifts.
 class ShiftVNode : public VectorNode {
  private:
@@ -848,7 +845,6 @@ class ShiftVNode : public VectorNode {
   virtual uint size_of() const { return sizeof(ShiftVNode); }
 };
 
-//------------------------------LShiftVBNode-----------------------------------
 // Vector left shift bytes
 class LShiftVBNode : public ShiftVNode {
  public:
@@ -857,7 +853,6 @@ class LShiftVBNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------LShiftVSNode-----------------------------------
 // Vector left shift shorts
 class LShiftVSNode : public ShiftVNode {
  public:
@@ -866,7 +861,6 @@ class LShiftVSNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------LShiftVINode-----------------------------------
 // Vector left shift ints
 class LShiftVINode : public ShiftVNode {
  public:
@@ -875,7 +869,6 @@ class LShiftVINode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------LShiftVLNode-----------------------------------
 // Vector left shift longs
 class LShiftVLNode : public ShiftVNode {
  public:
@@ -884,7 +877,6 @@ class LShiftVLNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------RShiftVBNode-----------------------------------
 // Vector right arithmetic (signed) shift bytes
 class RShiftVBNode : public ShiftVNode {
  public:
@@ -893,7 +885,6 @@ class RShiftVBNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------RShiftVSNode-----------------------------------
 // Vector right arithmetic (signed) shift shorts
 class RShiftVSNode : public ShiftVNode {
  public:
@@ -902,7 +893,6 @@ class RShiftVSNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------RShiftVINode-----------------------------------
 // Vector right arithmetic (signed) shift ints
 class RShiftVINode : public ShiftVNode {
  public:
@@ -911,7 +901,6 @@ class RShiftVINode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------RShiftVLNode-----------------------------------
 // Vector right arithmetic (signed) shift longs
 class RShiftVLNode : public ShiftVNode {
  public:
@@ -920,7 +909,6 @@ class RShiftVLNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------URShiftVBNode----------------------------------
 // Vector right logical (unsigned) shift bytes
 class URShiftVBNode : public ShiftVNode {
  public:
@@ -929,7 +917,6 @@ class URShiftVBNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------URShiftVSNode----------------------------------
 // Vector right logical (unsigned) shift shorts
 class URShiftVSNode : public ShiftVNode {
  public:
@@ -938,7 +925,6 @@ class URShiftVSNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------URShiftVINode----------------------------------
 // Vector right logical (unsigned) shift ints
 class URShiftVINode : public ShiftVNode {
  public:
@@ -947,7 +933,6 @@ class URShiftVINode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------URShiftVLNode----------------------------------
 // Vector right logical (unsigned) shift longs
 class URShiftVLNode : public ShiftVNode {
  public:
@@ -956,7 +941,6 @@ class URShiftVLNode : public ShiftVNode {
   virtual int Opcode() const;
 };
 
-//------------------------------LShiftCntVNode---------------------------------
 // Vector left shift count
 class LShiftCntVNode : public VectorNode {
  public:
@@ -964,7 +948,6 @@ class LShiftCntVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------RShiftCntVNode---------------------------------
 // Vector right shift count
 class RShiftCntVNode : public VectorNode {
  public:
@@ -972,7 +955,6 @@ class RShiftCntVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------AndVNode---------------------------------------
 // Vector and integer
 class AndVNode : public VectorNode {
  public:
@@ -981,7 +963,6 @@ class AndVNode : public VectorNode {
   virtual Node* Identity(PhaseGVN* phase);
 };
 
-//------------------------------AndReductionVNode--------------------------------------
 // Vector and byte, short, int, long as a reduction
 class AndReductionVNode : public ReductionNode {
  public:
@@ -989,8 +970,7 @@ class AndReductionVNode : public ReductionNode {
   virtual int Opcode() const;
 };
 
-//------------------------------OrVNode---------------------------------------
-// Vector or byte, short, int, long as a reduction
+// Vector or integer
 class OrVNode : public VectorNode {
  public:
   OrVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1,in2,vt) {}
@@ -998,15 +978,13 @@ class OrVNode : public VectorNode {
   virtual Node* Identity(PhaseGVN* phase);
 };
 
-//------------------------------OrReductionVNode--------------------------------------
-// Vector xor byte, short, int, long as a reduction
+// Vector or byte, short, int, long as a reduction
 class OrReductionVNode : public ReductionNode {
  public:
   OrReductionVNode(Node* ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
   virtual int Opcode() const;
 };
 
-//------------------------------XorVNode---------------------------------------
 // Vector xor integer
 class XorVNode : public VectorNode {
  public:
@@ -1016,15 +994,13 @@ class XorVNode : public VectorNode {
   Node* Ideal_XorV_VectorMaskCmp(PhaseGVN* phase, bool can_reshape);
 };
 
-//------------------------------XorReductionVNode--------------------------------------
-// Vector and int, long as a reduction
+// Vector xor byte, short, int, long as a reduction
 class XorReductionVNode : public ReductionNode {
  public:
   XorReductionVNode(Node* ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
   virtual int Opcode() const;
 };
 
-//------------------------------MinReductionVNode--------------------------------------
 // Vector min byte, short, int, long, float, double as a reduction
 class MinReductionVNode : public ReductionNode {
 public:
@@ -1032,15 +1008,27 @@ public:
   virtual int Opcode() const;
 };
 
-//------------------------------MaxReductionVNode--------------------------------------
-// Vector min byte, short, int, long, float, double as a reduction
+// Vector max byte, short, int, long, float, double as a reduction
 class MaxReductionVNode : public ReductionNode {
 public:
   MaxReductionVNode(Node* ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
   virtual int Opcode() const;
 };
 
-//------------------------------CompressVNode--------------------------------------
+// Vector unsigned min byte, short, int, long as a reduction
+class UMinReductionVNode : public ReductionNode {
+public:
+  UMinReductionVNode(Node* ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
+  virtual int Opcode() const;
+};
+
+// Vector unsigned max byte, short, int, long as a reduction
+class UMaxReductionVNode : public ReductionNode {
+public:
+  UMaxReductionVNode(Node* ctrl, Node* in1, Node* in2) : ReductionNode(ctrl, in1, in2) {}
+  virtual int Opcode() const;
+};
+
 // Vector compress
 class CompressVNode: public VectorNode {
  public:
@@ -1051,6 +1039,7 @@ class CompressVNode: public VectorNode {
   virtual int Opcode() const;
 };
 
+// Vector mask compress
 class CompressMNode: public VectorNode {
  public:
   CompressMNode(Node* mask, const TypeVect* vt) :
@@ -1060,7 +1049,6 @@ class CompressMNode: public VectorNode {
   virtual int Opcode() const;
 };
 
-//------------------------------ExpandVNode--------------------------------------
 // Vector expand
 class ExpandVNode: public VectorNode {
  public:
@@ -1073,7 +1061,6 @@ class ExpandVNode: public VectorNode {
 
 //================================= M E M O R Y ===============================
 
-//------------------------------LoadVectorNode---------------------------------
 // Load Vector from memory
 class LoadVectorNode : public LoadNode {
  private:
@@ -1115,7 +1102,6 @@ class LoadVectorNode : public LoadNode {
 #endif
 };
 
-//------------------------------LoadVectorGatherNode------------------------------
 // Load Vector from memory via index map
 class LoadVectorGatherNode : public LoadVectorNode {
  public:
@@ -1138,7 +1124,6 @@ class LoadVectorGatherNode : public LoadVectorNode {
   }
 };
 
-//------------------------------StoreVectorNode--------------------------------
 // Store Vector to memory
 class StoreVectorNode : public StoreNode {
  private:
@@ -1180,9 +1165,7 @@ class StoreVectorNode : public StoreNode {
 #endif
 };
 
-//------------------------------StoreVectorScatterNode------------------------------
 // Store Vector into memory via index map
-
  class StoreVectorScatterNode : public StoreVectorNode {
   public:
    enum { Indices = 4 };
@@ -1200,7 +1183,6 @@ class StoreVectorNode : public StoreNode {
    virtual Node* indices() const { return in(Indices); }
 };
 
-//------------------------------StoreVectorMaskedNode--------------------------------
 // Store Vector to memory under the influence of a predicate register(mask).
 class StoreVectorMaskedNode : public StoreVectorNode {
  public:
@@ -1221,7 +1203,6 @@ class StoreVectorMaskedNode : public StoreVectorNode {
   virtual Node* mask() const { return in(Mask); }
 };
 
-//------------------------------LoadVectorMaskedNode--------------------------------
 // Load Vector from memory under the influence of a predicate register(mask).
 class LoadVectorMaskedNode : public LoadVectorNode {
  public:
@@ -1245,7 +1226,6 @@ class LoadVectorMaskedNode : public LoadVectorNode {
   }
 };
 
-//-------------------------------LoadVectorGatherMaskedNode---------------------------------
 // Load Vector from memory via index map under the influence of a predicate register(mask).
 class LoadVectorGatherMaskedNode : public LoadVectorNode {
  public:
@@ -1268,7 +1248,6 @@ class LoadVectorGatherMaskedNode : public LoadVectorNode {
   }
 };
 
-//------------------------------StoreVectorScatterMaskedNode--------------------------------
 // Store Vector into memory via index map under the influence of a predicate register(mask).
 class StoreVectorScatterMaskedNode : public StoreVectorNode {
   public:
@@ -1312,7 +1291,6 @@ public:
   virtual const Type *bottom_type() const { return in(1)->bottom_type(); }
 };
 
-//------------------------------VectorCmpMaskedNode--------------------------------
 // Vector Comparison under the influence of a predicate register(mask).
 class VectorCmpMaskedNode : public TypeNode {
   public:
@@ -1325,7 +1303,8 @@ class VectorCmpMaskedNode : public TypeNode {
   virtual int Opcode() const;
 };
 
-//------------------------------VectorMaskGenNode----------------------------------
+// Generate a vector mask based on the given length. Lanes with indices in
+// [0, length) are set to true, while the remaining lanes are set to false.
 class VectorMaskGenNode : public TypeNode {
  public:
   VectorMaskGenNode(Node* length, const Type* ty): TypeNode(ty, 2) {
@@ -1338,7 +1317,8 @@ class VectorMaskGenNode : public TypeNode {
   static Node* make(Node* length, BasicType vmask_bt, int vmask_len);
 };
 
-//------------------------------VectorMaskOpNode-----------------------------------
+// Base class for certain vector mask operations. The supported input mask can
+// be either "BVectMask" or "PVectMask" depending on the platform.
 class VectorMaskOpNode : public TypeNode {
  private:
   int _mopc;
@@ -1359,6 +1339,7 @@ class VectorMaskOpNode : public TypeNode {
   static Node* make(Node* mask, const Type* ty, int mopc);
 };
 
+// Count the number of true (set) lanes in the vector mask.
 class VectorMaskTrueCountNode : public VectorMaskOpNode {
  public:
   VectorMaskTrueCountNode(Node* mask, const Type* ty):
@@ -1366,6 +1347,8 @@ class VectorMaskTrueCountNode : public VectorMaskOpNode {
   virtual int Opcode() const;
 };
 
+// Returns the index of the first true (set) lane in the vector mask.
+// If no lanes are set, returns the vector length.
 class VectorMaskFirstTrueNode : public VectorMaskOpNode {
  public:
   VectorMaskFirstTrueNode(Node* mask, const Type* ty):
@@ -1373,6 +1356,8 @@ class VectorMaskFirstTrueNode : public VectorMaskOpNode {
   virtual int Opcode() const;
 };
 
+// Returns the index of the last true (set) lane in the vector mask.
+// If no lanes are set, returns -1 .
 class VectorMaskLastTrueNode : public VectorMaskOpNode {
  public:
   VectorMaskLastTrueNode(Node* mask, const Type* ty):
@@ -1380,6 +1365,10 @@ class VectorMaskLastTrueNode : public VectorMaskOpNode {
   virtual int Opcode() const;
 };
 
+// Pack the mask lane values into a long value, supporting at most the
+// first 64 lanes. Each mask lane is packed into one bit in the long
+// value, ordered from the least significant bit to the most significant
+// bit.
 class VectorMaskToLongNode : public VectorMaskOpNode {
  public:
   VectorMaskToLongNode(Node* mask, const Type* ty):
@@ -1391,6 +1380,9 @@ class VectorMaskToLongNode : public VectorMaskOpNode {
   virtual Node* Identity(PhaseGVN* phase);
 };
 
+// Unpack bits from a long value into vector mask lane values. Each bit
+// in the long value is unpacked into one mask lane, ordered from the
+// least significant bit to the sign bit.
 class VectorLongToMaskNode : public VectorNode {
  public:
   VectorLongToMaskNode(Node* mask, const TypeVect* ty):
@@ -1400,36 +1392,40 @@ class VectorLongToMaskNode : public VectorNode {
   virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
-//-------------------------- Vector mask broadcast -----------------------------------
+// Broadcast a scalar value to all lanes of a vector mask. All lanes are set
+// to true if the input value is non-zero, or false if the input value is
+// zero. This node is only used to generate a mask with "PVectMask" layout.
 class MaskAllNode : public VectorNode {
  public:
   MaskAllNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {}
   virtual int Opcode() const;
 };
 
-//--------------------------- Vector mask logical and --------------------------------
+// Perform a bitwise AND operation between two vector masks. This node is
+// only used for vector masks with "PVectMask" layout.
 class AndVMaskNode : public AndVNode {
  public:
   AndVMaskNode(Node* in1, Node* in2, const TypeVect* vt) : AndVNode(in1, in2, vt) {}
   virtual int Opcode() const;
 };
 
-//--------------------------- Vector mask logical or ---------------------------------
+// Perform a bitwise OR operation between two vector masks. This node is
+// only used for vector masks with "PVectMask" layout.
 class OrVMaskNode : public OrVNode {
  public:
   OrVMaskNode(Node* in1, Node* in2, const TypeVect* vt) : OrVNode(in1, in2, vt) {}
   virtual int Opcode() const;
 };
 
-//--------------------------- Vector mask logical xor --------------------------------
+// Perform a bitwise XOR operation between two vector masks. This node is
+// only used for vector masks with "PVectMask" layout.
 class XorVMaskNode : public XorVNode {
  public:
   XorVMaskNode(Node* in1, Node* in2, const TypeVect* vt) : XorVNode(in1, in2, vt) {}
   virtual int Opcode() const;
 };
 
-//=========================Promote_Scalar_to_Vector============================
-
+// Replicate a scalar value to all lanes of a vector.
 class ReplicateNode : public VectorNode {
  public:
   ReplicateNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {
@@ -1439,7 +1435,7 @@ class ReplicateNode : public VectorNode {
   virtual int Opcode() const;
 };
 
-//======================Populate_Indices_into_a_Vector=========================
+// Populate indices into a vector.
 class PopulateIndexNode : public VectorNode {
  public:
   PopulateIndexNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
@@ -1448,7 +1444,6 @@ class PopulateIndexNode : public VectorNode {
 
 //========================Pack_Scalars_into_a_Vector===========================
 
-//------------------------------PackNode---------------------------------------
 // Pack parent class (not for code generation).
 class PackNode : public VectorNode {
  public:
@@ -1466,7 +1461,6 @@ class PackNode : public VectorNode {
   static PackNode* make(Node* s, uint vlen, BasicType bt);
 };
 
-//------------------------------PackBNode--------------------------------------
 // Pack byte scalars into vector
 class PackBNode : public PackNode {
  public:
@@ -1474,7 +1468,6 @@ class PackBNode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PackSNode--------------------------------------
 // Pack short scalars into a vector
 class PackSNode : public PackNode {
  public:
@@ -1483,7 +1476,6 @@ class PackSNode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PackINode--------------------------------------
 // Pack integer scalars into a vector
 class PackINode : public PackNode {
  public:
@@ -1492,7 +1484,6 @@ class PackINode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PackLNode--------------------------------------
 // Pack long scalars into a vector
 class PackLNode : public PackNode {
  public:
@@ -1501,7 +1492,6 @@ class PackLNode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------Pack2LNode-------------------------------------
 // Pack 2 long scalars into a vector
 class Pack2LNode : public PackNode {
  public:
@@ -1509,7 +1499,6 @@ class Pack2LNode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PackFNode--------------------------------------
 // Pack float scalars into vector
 class PackFNode : public PackNode {
  public:
@@ -1518,7 +1507,6 @@ class PackFNode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------PackDNode--------------------------------------
 // Pack double scalars into a vector
 class PackDNode : public PackNode {
  public:
@@ -1527,7 +1515,6 @@ class PackDNode : public PackNode {
   virtual int Opcode() const;
 };
 
-//------------------------------Pack2DNode-------------------------------------
 // Pack 2 double scalars into a vector
 class Pack2DNode : public PackNode {
  public:
@@ -1535,7 +1522,10 @@ class Pack2DNode : public PackNode {
   virtual int Opcode() const;
 };
 
-
+// Load the IOTA constant vector containing sequential indices starting from 0
+// and incrementing by 1 up to "VLENGTH - 1". So far, the first input is an int
+// constant 0. For example, a 128-bit vector with int (32-bit) elements produces
+// a vector like "[0, 1, 2, 3]".
 class VectorLoadConstNode : public VectorNode {
  public:
   VectorLoadConstNode(Node* in1, const TypeVect* vt) : VectorNode(in1, vt) {}
@@ -1544,8 +1534,7 @@ class VectorLoadConstNode : public VectorNode {
 
 //========================Extract_Scalar_from_Vector===========================
 
-//------------------------------ExtractNode------------------------------------
-// Extract a scalar from a vector at position "pos"
+// The base class for all extract nodes.
 class ExtractNode : public Node {
  public:
   ExtractNode(Node* src, Node* pos) : Node(nullptr, src, pos) {}
@@ -1554,8 +1543,7 @@ class ExtractNode : public Node {
   static int opcode(BasicType bt);
 };
 
-//------------------------------ExtractBNode-----------------------------------
-// Extract a byte from a vector at position "pos"
+// Extract a byte from a vector at position "pos".
 class ExtractBNode : public ExtractNode {
  public:
   ExtractBNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1564,8 +1552,7 @@ class ExtractBNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-//------------------------------ExtractUBNode----------------------------------
-// Extract a boolean from a vector at position "pos"
+// Extract a boolean from a vector at position "pos".
 class ExtractUBNode : public ExtractNode {
  public:
   ExtractUBNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1574,8 +1561,7 @@ class ExtractUBNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-//------------------------------ExtractCNode-----------------------------------
-// Extract a char from a vector at position "pos"
+// Extract a char from a vector at position "pos".
 class ExtractCNode : public ExtractNode {
  public:
   ExtractCNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1584,8 +1570,7 @@ class ExtractCNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-//------------------------------ExtractSNode-----------------------------------
-// Extract a short from a vector at position "pos"
+// Extract a short from a vector at position "pos".
 class ExtractSNode : public ExtractNode {
  public:
   ExtractSNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1594,8 +1579,7 @@ class ExtractSNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-//------------------------------ExtractINode-----------------------------------
-// Extract an int from a vector at position "pos"
+// Extract an int from a vector at position "pos".
 class ExtractINode : public ExtractNode {
  public:
   ExtractINode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1604,8 +1588,7 @@ class ExtractINode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-//------------------------------ExtractLNode-----------------------------------
-// Extract a long from a vector at position "pos"
+// Extract a long from a vector at position "pos".
 class ExtractLNode : public ExtractNode {
  public:
   ExtractLNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1614,8 +1597,7 @@ class ExtractLNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegL; }
 };
 
-//------------------------------ExtractFNode-----------------------------------
-// Extract a float from a vector at position "pos"
+// Extract a float from a vector at position "pos".
 class ExtractFNode : public ExtractNode {
  public:
   ExtractFNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1624,8 +1606,7 @@ class ExtractFNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegF; }
 };
 
-//------------------------------ExtractDNode-----------------------------------
-// Extract a double from a vector at position "pos"
+// Extract a double from a vector at position "pos".
 class ExtractDNode : public ExtractNode {
  public:
   ExtractDNode(Node* src, Node* pos) : ExtractNode(src, pos) {}
@@ -1634,7 +1615,6 @@ class ExtractDNode : public ExtractNode {
   virtual uint ideal_reg() const { return Op_RegD; }
 };
 
-//------------------------------MacroLogicVNode-------------------------------
 // Vector logical operations packing node.
 class MacroLogicVNode : public VectorNode {
 private:
@@ -1653,6 +1633,8 @@ public:
                                Node* mask, uint truth_table, const TypeVect* vt);
 };
 
+// Compare two vectors lane-wise using the specified predicate and produce a
+// vector mask.
 class VectorMaskCmpNode : public VectorNode {
  private:
   BoolTest::mask _predicate;
@@ -1697,6 +1679,8 @@ class VectorMaskWrapperNode : public VectorNode {
   Node* vector_mask() const { return in(2); }
 };
 
+// Test whether all or any lanes in the first input vector mask is true,
+// based on the specified predicate.
 class VectorTestNode : public CmpNode {
  private:
   BoolTest::mask _predicate;
@@ -1719,6 +1703,9 @@ class VectorTestNode : public CmpNode {
   }
 };
 
+// Blend two vectors based on a vector mask. For each lane, select the value
+// from the first input vector (vec1) if the corresponding mask lane is set,
+// otherwise select from the second input vector (vec2).
 class VectorBlendNode : public VectorNode {
  public:
   VectorBlendNode(Node* vec1, Node* vec2, Node* mask)
@@ -1732,11 +1719,14 @@ class VectorBlendNode : public VectorNode {
   Node* vec_mask() const { return in(3); }
 };
 
+// Rearrange lane elements from a source vector under the control of a shuffle
+// (indexes) vector. Each lane in the shuffle vector specifies which lane from
+// the source vector to select for the corresponding output lane. All indexes
+// are in the range [0, VLENGTH).
 class VectorRearrangeNode : public VectorNode {
  public:
   VectorRearrangeNode(Node* vec1, Node* shuffle)
     : VectorNode(vec1, shuffle, vec1->bottom_type()->is_vect()) {
-    // assert(mask->is_VectorMask(), "VectorBlendNode requires that third argument be a mask");
   }
 
   virtual int Opcode() const;
@@ -1744,9 +1734,12 @@ class VectorRearrangeNode : public VectorNode {
   Node* vec_shuffle() const { return in(2); }
 };
 
-
-// Select elements from two source vectors based on the wrapped indexes held in
-// the first vector.
+// Select lane elements from two source vectors ("src1" and "src2") under the
+// control of an "indexes" vector. The two source vectors are logically concatenated
+// to form a table of 2*VLENGTH elements, where src1 occupies indices [0, VLENGTH)
+// and src2 occupies indices [VLENGTH, 2*VLENGTH). Each lane in the "indexes"
+// vector specifies which element from this table to select for the corresponding
+// output lane.
 class SelectFromTwoVectorNode : public VectorNode {
 public:
   SelectFromTwoVectorNode(Node* indexes, Node* src1, Node* src2, const TypeVect* vt)
@@ -1758,13 +1751,19 @@ public:
   virtual int Opcode() const;
 };
 
-// The target may not directly support the rearrange operation for an element type. In those cases,
-// we can transform the rearrange into a different element type. For example, on x86 before AVX512,
-// there is no rearrange instruction for short elements, what we will then do is to transform the
-// shuffle vector into one that we can do byte rearrange such that it would provide the same
-// result. This could have been done in VectorRearrangeNode during code emission but we eagerly
-// expand this out because it is often the case that an index vector is reused in many rearrange
-// operations. This allows the index preparation to be GVN-ed as well as hoisted out of loops, etc.
+// Transform a shuffle vector when the target does not directly support rearrange
+// operations for the original element type. In such cases, the rearrange can be
+// transformed to use a different element type.
+//
+// For example, on x86 before AVX512, there are no rearrange instructions for short
+// elements. The shuffle vector is transformed into one suitable for byte rearrange
+// that produces the same result. This could have been done in VectorRearrangeNode
+// during code emission, but we eagerly expand it out because shuffle vectors are
+// often reused in many rearrange operations. This allows the transformation to be
+// GVN-ed and hoisted out of loops.
+//
+// Input:  Original shuffle vector (indices for the desired element type)
+// Output: Transformed shuffle vector (indices for the supported element type)
 class VectorLoadShuffleNode : public VectorNode {
  public:
   VectorLoadShuffleNode(Node* in, const TypeVect* vt)
@@ -1773,6 +1772,8 @@ class VectorLoadShuffleNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Convert a "BVectMask" into a platform-specific vector mask (either "NVectMask"
+// or "PVectMask").
 class VectorLoadMaskNode : public VectorNode {
  public:
   VectorLoadMaskNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {
@@ -1784,6 +1785,8 @@ class VectorLoadMaskNode : public VectorNode {
   Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
+// Convert a platform-specific vector mask (either "NVectMask" or "PVectMask")
+// into a "BVectMask".
 class VectorStoreMaskNode : public VectorNode {
  protected:
   VectorStoreMaskNode(Node* in1, ConINode* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
@@ -1795,6 +1798,8 @@ class VectorStoreMaskNode : public VectorNode {
   static VectorStoreMaskNode* make(PhaseGVN& gvn, Node* in, BasicType in_type, uint num_elem);
 };
 
+// Lane-wise type cast a vector mask to the given vector type. The vector length
+// of the input and output must be the same.
 class VectorMaskCastNode : public VectorNode {
  public:
   VectorMaskCastNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {
@@ -1831,6 +1836,8 @@ class VectorReinterpretNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Lane-wise type cast a vector to the given vector type. This is the base
+// class for all vector type cast operations.
 class VectorCastNode : public VectorNode {
  public:
   VectorCastNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {}
@@ -1839,10 +1846,12 @@ class VectorCastNode : public VectorNode {
   static VectorNode* make(int vopc, Node* n1, BasicType bt, uint vlen);
   static int  opcode(int opc, BasicType bt, bool is_signed = true);
   static bool implemented(int opc, uint vlen, BasicType src_type, BasicType dst_type);
+  static bool is_supported_subword_cast(BasicType def_bt, BasicType use_bt, const uint pack_size);
 
   virtual Node* Identity(PhaseGVN* phase);
 };
 
+// Cast a byte vector to the given vector type.
 class VectorCastB2XNode : public VectorCastNode {
  public:
   VectorCastB2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1851,6 +1860,7 @@ class VectorCastB2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast a short vector to the given vector type.
 class VectorCastS2XNode : public VectorCastNode {
  public:
   VectorCastS2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1859,6 +1869,7 @@ class VectorCastS2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast an int vector to the given vector type.
 class VectorCastI2XNode : public VectorCastNode {
  public:
   VectorCastI2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1867,6 +1878,7 @@ class VectorCastI2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast a long vector to the given vector type.
 class VectorCastL2XNode : public VectorCastNode {
  public:
   VectorCastL2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1875,6 +1887,7 @@ class VectorCastL2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast a float vector to the given vector type.
 class VectorCastF2XNode : public VectorCastNode {
  public:
   VectorCastF2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1883,6 +1896,7 @@ class VectorCastF2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast a double vector to the given vector type.
 class VectorCastD2XNode : public VectorCastNode {
  public:
   VectorCastD2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1891,6 +1905,7 @@ class VectorCastD2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast a half float vector to float vector type.
 class VectorCastHF2FNode : public VectorCastNode {
  public:
   VectorCastHF2FNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1899,6 +1914,7 @@ class VectorCastHF2FNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Cast a float vector to a half float vector type.
 class VectorCastF2HFNode : public VectorCastNode {
  public:
   VectorCastF2HFNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1907,8 +1923,12 @@ class VectorCastF2HFNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
-// So far, VectorUCastNode can only be used in Vector API unsigned extensions
-// between integral types. E.g., extending byte to float is not supported now.
+// Unsigned vector cast operations can only be used in unsigned (zero)
+// extensions between integral types so far. E.g., extending byte to
+// float is not supported now.
+
+// Unsigned cast a byte vector to the given vector type with short, int,
+// or long element type.
 class VectorUCastB2XNode : public VectorCastNode {
  public:
   VectorUCastB2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1920,6 +1940,8 @@ class VectorUCastB2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Unsigned cast a short vector to the given vector type with int or long
+// element type.
 class VectorUCastS2XNode : public VectorCastNode {
  public:
   VectorUCastS2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1930,6 +1952,7 @@ class VectorUCastS2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Unsigned cast an int vector to the given vector type with long element type.
 class VectorUCastI2XNode : public VectorCastNode {
  public:
   VectorUCastI2XNode(Node* in, const TypeVect* vt) : VectorCastNode(in, vt) {
@@ -1939,6 +1962,7 @@ class VectorUCastI2XNode : public VectorCastNode {
   virtual int Opcode() const;
 };
 
+// Vector round float to nearest integer.
 class RoundVFNode : public VectorNode {
  public:
   RoundVFNode(Node* in, const TypeVect* vt) :VectorNode(in, vt) {
@@ -1947,6 +1971,7 @@ class RoundVFNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Vector round double to nearest integer.
 class RoundVDNode : public VectorNode {
  public:
   RoundVDNode(Node* in, const TypeVect* vt) : VectorNode(in, vt) {
@@ -1955,6 +1980,7 @@ class RoundVDNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Insert a new value into a vector lane at the specified position.
 class VectorInsertNode : public VectorNode {
  public:
   VectorInsertNode(Node* vsrc, Node* new_val, ConINode* pos, const TypeVect* vt) : VectorNode(vsrc, new_val, (Node*)pos, vt) {
@@ -1968,6 +1994,9 @@ class VectorInsertNode : public VectorNode {
   static Node* make(Node* vec, Node* new_val, int position, PhaseGVN& gvn);
 };
 
+// Box a vector value into a Vector API object (e.g., IntMaxVector).
+// This is a macro node that gets expanded during vector optimization
+// phase.
 class VectorBoxNode : public Node {
  private:
   const TypeInstPtr* const _box_type;
@@ -1995,6 +2024,8 @@ class VectorBoxNode : public Node {
   static const TypeFunc* vec_box_type(const TypeInstPtr* box_type);
 };
 
+// Allocate storage for boxing a vector value. This is used during vector
+// box expansion.
 class VectorBoxAllocateNode : public CallStaticJavaNode {
  public:
   VectorBoxAllocateNode(Compile* C, const TypeInstPtr* vbox_type)
@@ -2009,6 +2040,9 @@ class VectorBoxAllocateNode : public CallStaticJavaNode {
 #endif // !PRODUCT
 };
 
+// Unbox a Vector API object (e.g., IntMaxVector) to extract the underlying
+// vector value. This is a macro node expanded during vector optimization
+// phase.
 class VectorUnboxNode : public VectorNode {
  protected:
   uint size_of() const { return sizeof(*this); }
@@ -2027,6 +2061,7 @@ class VectorUnboxNode : public VectorNode {
   Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
+// Lane-wise right rotation of the first input by the second input.
 class RotateRightVNode : public VectorNode {
 public:
   RotateRightVNode(Node* in1, Node* in2, const TypeVect* vt)
@@ -2036,6 +2071,7 @@ public:
   Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
+// Lane-wise left rotation of the first input by the second input.
 class RotateLeftVNode : public VectorNode {
 public:
   RotateLeftVNode(Node* in1, Node* in2, const TypeVect* vt)
@@ -2045,6 +2081,7 @@ public:
   Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
+// Count the number of leading zeros in each lane of the input.
 class CountLeadingZerosVNode : public VectorNode {
  public:
   CountLeadingZerosVNode(Node* in, const TypeVect* vt)
@@ -2056,6 +2093,7 @@ class CountLeadingZerosVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Count the number of trailing zeros in each lane of the input.
 class CountTrailingZerosVNode : public VectorNode {
  public:
   CountTrailingZerosVNode(Node* in, const TypeVect* vt)
@@ -2067,6 +2105,7 @@ class CountTrailingZerosVNode : public VectorNode {
   virtual int Opcode() const;
 };
 
+// Reverse the bits within each lane (e.g., 0b10110010 becomes 0b01001101).
 class ReverseVNode : public VectorNode {
 public:
   ReverseVNode(Node* in, const TypeVect* vt)
@@ -2076,6 +2115,7 @@ public:
   virtual int Opcode() const;
 };
 
+// Reverse the byte order within each lane (e.g., 0x12345678 becomes 0x78563412).
 class ReverseBytesVNode : public VectorNode {
 public:
   ReverseBytesVNode(Node* in, const TypeVect* vt)
@@ -2085,6 +2125,7 @@ public:
   virtual int Opcode() const;
 };
 
+// Vector signum float.
 class SignumVFNode : public VectorNode {
 public:
   SignumVFNode(Node* in1, Node* zero, Node* one, const TypeVect* vt)
@@ -2093,6 +2134,7 @@ public:
   virtual int Opcode() const;
 };
 
+// Vector signum double.
 class SignumVDNode : public VectorNode {
 public:
   SignumVDNode(Node* in1, Node* zero, Node* one, const TypeVect* vt)
@@ -2101,6 +2143,8 @@ public:
   virtual int Opcode() const;
 };
 
+// Compress (extract and pack) bits in each lane of the first input
+// based on the mask input.
 class CompressBitsVNode : public VectorNode {
 public:
   CompressBitsVNode(Node* in, Node* mask, const TypeVect* vt)
@@ -2108,6 +2152,8 @@ public:
   virtual int Opcode() const;
 };
 
+// Expand (deposit) bits in each lane of the first input based on the
+// mask input.
 class ExpandBitsVNode : public VectorNode {
 public:
   ExpandBitsVNode(Node* in, Node* mask, const TypeVect* vt)
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index b60c71945e1..2c535eca6d1 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -975,4 +975,5 @@ public:
   virtual VTransformApplyResult apply(VTransformApplyState& apply_state) const override;
   NOT_PRODUCT(virtual const char* name() const override { return "StoreVector"; };)
 };
+
 #endif // SHARE_OPTO_VTRANSFORM_HPP
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index ef5aca96a57..423e1a5a1f4 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,9 +115,6 @@
 #if INCLUDE_MANAGEMENT
 #include "services/finalizerService.hpp"
 #endif
-#ifdef LINUX
-#include "osContainer_linux.hpp"
-#endif
 
 #include <errno.h>
 
@@ -500,11 +497,9 @@ JVM_LEAF(jboolean, JVM_IsUseContainerSupport(void))
 JVM_END
 
 JVM_LEAF(jboolean, JVM_IsContainerized(void))
-#ifdef LINUX
-  if (OSContainer::is_containerized()) {
+  if (os::is_containerized()) {
     return JNI_TRUE;
   }
-#endif
   return JNI_FALSE;
 JVM_END
 
@@ -2915,18 +2910,14 @@ JVM_ENTRY(jboolean, JVM_HoldsLock(JNIEnv* env, jclass threadClass, jobject obj))
   return ObjectSynchronizer::current_thread_holds_lock(thread, h_obj);
 JVM_END
 
-JVM_ENTRY(jobject, JVM_GetStackTrace(JNIEnv *env, jobject jthread))
+JVM_ENTRY(jobjectArray, JVM_GetStackTrace(JNIEnv *env, jobject jthread))
   oop trace = java_lang_Thread::async_get_stack_trace(jthread, THREAD);
-  return JNIHandles::make_local(THREAD, trace);
+  return (jobjectArray) JNIHandles::make_local(THREAD, trace);
 JVM_END
 
 JVM_ENTRY(jobject, JVM_CreateThreadSnapshot(JNIEnv* env, jobject jthread))
-#if INCLUDE_JVMTI
   oop snapshot = ThreadSnapshotFactory::get_thread_snapshot(jthread, THREAD);
   return JNIHandles::make_local(THREAD, snapshot);
-#else
-  THROW_NULL(vmSymbols::java_lang_UnsupportedOperationException());
-#endif
 JVM_END
 
 JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
@@ -3650,7 +3641,9 @@ JVM_ENTRY(jobjectArray, JVM_GetVmArguments(JNIEnv *env))
 
   int index = 0;
   for (int j = 0; j < num_flags; j++, index++) {
-    Handle h = java_lang_String::create_from_platform_dependent_str(vm_flags[j], CHECK_NULL);
+    stringStream prefixed;
+    prefixed.print("-XX:%s", vm_flags[j]);
+    Handle h = java_lang_String::create_from_platform_dependent_str(prefixed.base(), CHECK_NULL);
     result_h->obj_at_put(index, h());
   }
   for (int i = 0; i < num_args; i++, index++) {
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index e0863c07f4f..9c5abdf790b 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1077,11 +1077,19 @@ JvmtiEnv::SuspendAllVirtualThreads(jint except_count, const jthread* except_list
         JvmtiVTSuspender::register_vthread_resume(thread_oop);
       }
     }
+    // Restore resumed state for current thread if it is virtual.
+    // It must be suspended in the suspend_thread call out of disabler context.
+    oop cur_oop = self_tobj();
+    if (cur_oop != nullptr) {
+      assert(JvmtiVTSuspender::is_vthread_suspended(cur_oop), "sanity check");
+      JvmtiVTSuspender::register_vthread_resume(cur_oop);
+    }
   }
   // Self suspend after all other suspends if necessary.
   // Do not use MountUnmountDisabler in context of self suspend to avoid deadlocks.
   if (self_tobj() != nullptr) {
-    suspend_thread(self_tobj(), current, /* single_suspend */ false);
+    // Register current vthread as suspended with the suspend_thread call.
+    suspend_thread(self_tobj(), current, /* single_suspend */ true);
   }
   return JVMTI_ERROR_NONE;
 } /* end SuspendAllVirtualThreads */
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index 4894a4dd21a..401bb4dfdb8 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2491,7 +2491,7 @@ SetOrClearFramePopClosure::do_thread(Thread *target) {
     _result = JVMTI_ERROR_NO_MORE_FRAMES;
     return;
   }
-  assert(_state->get_thread_or_saved() == java_thread, "Must be");
+  assert(_state->get_thread() == java_thread, "Must be");
 
   RegisterMap reg_map(java_thread,
                       RegisterMap::UpdateMap::include,
diff --git a/src/hotspot/share/prims/jvmtiEnvThreadState.cpp b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
index 571c4ca5528..303923076b1 100644
--- a/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvThreadState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,11 +151,6 @@ bool JvmtiEnvThreadState::is_virtual() {
   return _state->is_virtual();
 }
 
-// Use _thread_saved if cthread is detached from JavaThread (_thread == nullptr).
-JavaThread* JvmtiEnvThreadState::get_thread_or_saved() {
-  return _state->get_thread_or_saved();
-}
-
 JavaThread* JvmtiEnvThreadState::get_thread() {
   return _state->get_thread();
 }
@@ -344,7 +339,7 @@ void JvmtiEnvThreadState::reset_current_location(jvmtiEvent event_type, bool ena
   if (enabled) {
     // If enabling breakpoint, no need to reset.
     // Can't do anything if empty stack.
-    JavaThread* thread = get_thread_or_saved();
+    JavaThread* thread = get_thread();
 
     if (event_type == JVMTI_EVENT_SINGLE_STEP &&
         ((thread == nullptr && is_virtual()) || thread->has_last_Java_frame())) {
diff --git a/src/hotspot/share/prims/jvmtiEnvThreadState.hpp b/src/hotspot/share/prims/jvmtiEnvThreadState.hpp
index a2ab25a59dd..16b369e0857 100644
--- a/src/hotspot/share/prims/jvmtiEnvThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiEnvThreadState.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -170,8 +170,6 @@ public:
 
   inline JvmtiThreadState* jvmti_thread_state() { return _state; }
 
-  // use _thread_saved if cthread is detached from JavaThread
-  JavaThread *get_thread_or_saved();
   JavaThread *get_thread();
   inline JvmtiEnv *get_env() { return _env; }
 
diff --git a/src/hotspot/share/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp
index 9df3bbb4b3e..cb44b833c48 100644
--- a/src/hotspot/share/prims/jvmtiEventController.cpp
+++ b/src/hotspot/share/prims/jvmtiEventController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -217,6 +217,10 @@ class EnterInterpOnlyModeClosure : public HandshakeClosure {
 
     assert(state != nullptr, "sanity check");
     assert(state->get_thread() == jt, "handshake unsafe conditions");
+    assert(jt->jvmti_thread_state() == state, "sanity check");
+    assert(!jt->is_interp_only_mode(), "sanity check");
+    assert(!state->is_interp_only_mode(), "sanity check");
+
     if (!state->is_pending_interp_only_mode()) {
       _completed = true;
       return;  // The pending flag has been already cleared, so bail out.
@@ -361,7 +365,8 @@ void VM_ChangeSingleStep::doit() {
 
 void JvmtiEventControllerPrivate::enter_interp_only_mode(JvmtiThreadState *state) {
   EC_TRACE(("[%s] # Entering interpreter only mode",
-            JvmtiTrace::safe_get_thread_name(state->get_thread_or_saved())));
+            JvmtiTrace::safe_get_thread_name(state->get_thread())));
+
   JavaThread *target = state->get_thread();
   Thread *current = Thread::current();
 
@@ -371,8 +376,13 @@ void JvmtiEventControllerPrivate::enter_interp_only_mode(JvmtiThreadState *state
   }
   // This flag will be cleared in EnterInterpOnlyModeClosure handshake.
   state->set_pending_interp_only_mode(true);
-  if (target == nullptr) { // an unmounted virtual thread
-    return;  // EnterInterpOnlyModeClosure will be executed right after mount.
+
+  // There are two cases when entering interp_only_mode is postponed:
+  // 1. Unmounted virtual thread - EnterInterpOnlyModeClosure::do_thread will be executed at mount;
+  // 2. Carrier thread with mounted virtual thread - EnterInterpOnlyModeClosure::do_thread will be executed at unmount.
+  if (target == nullptr ||                                                         // an unmounted virtual thread
+      JvmtiEnvBase::is_thread_carrying_vthread(target, state->get_thread_oop())) { // a vthread carrying thread
+    return;  // EnterInterpOnlyModeClosure will be executed right after mount or unmount.
   }
   EnterInterpOnlyModeClosure hs(state);
   if (target->is_handshake_safe_for(current)) {
@@ -388,7 +398,8 @@ void JvmtiEventControllerPrivate::enter_interp_only_mode(JvmtiThreadState *state
 void
 JvmtiEventControllerPrivate::leave_interp_only_mode(JvmtiThreadState *state) {
   EC_TRACE(("[%s] # Leaving interpreter only mode",
-            JvmtiTrace::safe_get_thread_name(state->get_thread_or_saved())));
+            JvmtiTrace::safe_get_thread_name(state->get_thread())));
+
   if (state->is_pending_interp_only_mode()) {
     state->set_pending_interp_only_mode(false);  // Just clear the pending flag.
     assert(!state->is_interp_only_mode(), "sanity check");
@@ -409,7 +420,7 @@ JvmtiEventControllerPrivate::trace_changed(JvmtiThreadState *state, jlong now_en
       if (changed & bit) {
         // it changed, print it
          log_trace(jvmti)("[%s] # %s event %s",
-                      JvmtiTrace::safe_get_thread_name(state->get_thread_or_saved()),
+                      JvmtiTrace::safe_get_thread_name(state->get_thread()),
                       (now_enabled & bit)? "Enabling" : "Disabling", JvmtiTrace::event_name((jvmtiEvent)ei));
       }
     }
@@ -932,7 +943,7 @@ JvmtiEventControllerPrivate::set_user_enabled(JvmtiEnvBase *env, JavaThread *thr
 void
 JvmtiEventControllerPrivate::set_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) {
   EC_TRACE(("[%s] # set frame pop - frame=%d",
-            JvmtiTrace::safe_get_thread_name(ets->get_thread_or_saved()),
+            JvmtiTrace::safe_get_thread_name(ets->get_thread()),
             fpop.frame_number() ));
 
   ets->get_frame_pops()->set(fpop);
@@ -943,7 +954,7 @@ JvmtiEventControllerPrivate::set_frame_pop(JvmtiEnvThreadState *ets, JvmtiFrameP
 void
 JvmtiEventControllerPrivate::clear_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) {
   EC_TRACE(("[%s] # clear frame pop - frame=%d",
-            JvmtiTrace::safe_get_thread_name(ets->get_thread_or_saved()),
+            JvmtiTrace::safe_get_thread_name(ets->get_thread()),
             fpop.frame_number() ));
 
   ets->get_frame_pops()->clear(fpop);
@@ -953,7 +964,7 @@ JvmtiEventControllerPrivate::clear_frame_pop(JvmtiEnvThreadState *ets, JvmtiFram
 void
 JvmtiEventControllerPrivate::clear_all_frame_pops(JvmtiEnvThreadState *ets) {
   EC_TRACE(("[%s] # clear all frame pops",
-            JvmtiTrace::safe_get_thread_name(ets->get_thread_or_saved())
+            JvmtiTrace::safe_get_thread_name(ets->get_thread())
           ));
 
   ets->get_frame_pops()->clear_all();
@@ -965,7 +976,7 @@ JvmtiEventControllerPrivate::clear_to_frame_pop(JvmtiEnvThreadState *ets, JvmtiF
   int cleared_cnt = ets->get_frame_pops()->clear_to(fpop);
 
   EC_TRACE(("[%s] # clear to frame pop - frame=%d, count=%d",
-            JvmtiTrace::safe_get_thread_name(ets->get_thread_or_saved()),
+            JvmtiTrace::safe_get_thread_name(ets->get_thread()),
             fpop.frame_number(),
             cleared_cnt ));
 
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index 02f39460ff6..fca348fda26 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,7 @@
 #include "runtime/threadSMR.hpp"
 #include "runtime/vframe.inline.hpp"
 #include "runtime/vm_version.hpp"
+#include "utilities/events.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef JVMTI_TRACE
@@ -648,22 +649,27 @@ JvmtiExport::decode_version_values(jint version, int * major, int * minor,
 }
 
 void JvmtiExport::enter_primordial_phase() {
+  Events::log(Thread::current_or_null(), "JVMTI - enter primordial phase");
   JvmtiEnvBase::set_phase(JVMTI_PHASE_PRIMORDIAL);
 }
 
 void JvmtiExport::enter_early_start_phase() {
+  Events::log(Thread::current_or_null(), "JVMTI - enter early start phase");
   set_early_vmstart_recorded(true);
 }
 
 void JvmtiExport::enter_start_phase() {
+  Events::log(Thread::current_or_null(), "JVMTI - enter start phase");
   JvmtiEnvBase::set_phase(JVMTI_PHASE_START);
 }
 
 void JvmtiExport::enter_onload_phase() {
+  Events::log(Thread::current_or_null(), "JVMTI - enter onload phase");
   JvmtiEnvBase::set_phase(JVMTI_PHASE_ONLOAD);
 }
 
 void JvmtiExport::enter_live_phase() {
+  Events::log(Thread::current_or_null(), "JVMTI - enter live phase");
   JvmtiEnvBase::set_phase(JVMTI_PHASE_LIVE);
 }
 
@@ -813,6 +819,7 @@ void JvmtiExport::post_vm_death() {
     }
   }
 
+  Events::log(Thread::current_or_null(), "JVMTI - enter dead phase");
   JvmtiEnvBase::set_phase(JVMTI_PHASE_DEAD);
 }
 
diff --git a/src/hotspot/share/prims/jvmtiThreadState.cpp b/src/hotspot/share/prims/jvmtiThreadState.cpp
index fc965e568f7..32bf2c4e98e 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.cpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,13 +51,12 @@ static const int UNKNOWN_STACK_DEPTH = -99;
 //
 
 JvmtiThreadState *JvmtiThreadState::_head = nullptr;
-bool JvmtiThreadState::_seen_interp_only_mode = false;
+Atomic<bool> JvmtiThreadState::_seen_interp_only_mode{false};
 
 JvmtiThreadState::JvmtiThreadState(JavaThread* thread, oop thread_oop)
   : _thread_event_enable() {
   assert(JvmtiThreadState_lock->is_locked(), "sanity check");
   _thread               = thread;
-  _thread_saved         = nullptr;
   _exception_state      = ES_CLEARED;
   _hide_single_stepping = false;
   _pending_interp_only_mode = false;
@@ -118,11 +117,11 @@ JvmtiThreadState::JvmtiThreadState(JavaThread* thread, oop thread_oop)
 
   if (thread != nullptr) {
     if (thread_oop == nullptr || thread->jvmti_vthread() == nullptr || thread->jvmti_vthread() == thread_oop) {
-      // The JavaThread for carrier or mounted virtual thread case.
+      // The JavaThread for an active carrier or a mounted virtual thread case.
       // Set this only if thread_oop is current thread->jvmti_vthread().
       thread->set_jvmti_thread_state(this);
+      assert(!thread->is_interp_only_mode(), "sanity check");
     }
-    thread->set_interp_only_mode(false);
   }
 }
 
@@ -135,7 +134,10 @@ JvmtiThreadState::~JvmtiThreadState()   {
   }
 
   // clear this as the state for the thread
+  assert(get_thread() != nullptr, "sanity check");
+  assert(get_thread()->jvmti_thread_state() == this, "sanity check");
   get_thread()->set_jvmti_thread_state(nullptr);
+  get_thread()->set_interp_only_mode(false);
 
   // zap our env thread states
   {
@@ -321,18 +323,21 @@ void JvmtiThreadState::add_env(JvmtiEnvBase *env) {
 
 void JvmtiThreadState::enter_interp_only_mode() {
   assert(_thread != nullptr, "sanity check");
+  assert(JvmtiThreadState_lock->is_locked(), "sanity check");
   assert(!is_interp_only_mode(), "entering interp only when in interp only mode");
-  _seen_interp_only_mode = true;
+  assert(_thread->jvmti_vthread() == nullptr || _thread->jvmti_vthread() == get_thread_oop(), "sanity check");
+  assert(_thread->jvmti_thread_state() == this, "sanity check");
+  _saved_interp_only_mode = true;
   _thread->set_interp_only_mode(true);
   invalidate_cur_stack_depth();
 }
 
 void JvmtiThreadState::leave_interp_only_mode() {
+  assert(JvmtiThreadState_lock->is_locked(), "sanity check");
   assert(is_interp_only_mode(), "leaving interp only when not in interp only mode");
-  if (_thread == nullptr) {
-    // Unmounted virtual thread updates the saved value.
-    _saved_interp_only_mode = false;
-  } else {
+  _saved_interp_only_mode = false;
+  if (_thread != nullptr && _thread->jvmti_thread_state() == this) {
+    assert(_thread->jvmti_vthread() == nullptr || _thread->jvmti_vthread() == get_thread_oop(), "sanity check");
     _thread->set_interp_only_mode(false);
   }
 }
@@ -340,7 +345,7 @@ void JvmtiThreadState::leave_interp_only_mode() {
 
 // Helper routine used in several places
 int JvmtiThreadState::count_frames() {
-  JavaThread* thread = get_thread_or_saved();
+  JavaThread* thread = get_thread();
   javaVFrame *jvf;
   ResourceMark rm;
   if (thread == nullptr) {
@@ -479,8 +484,6 @@ void JvmtiThreadState::update_for_pop_top_frame() {
     }
     // force stack depth to be recalculated
     invalidate_cur_stack_depth();
-  } else {
-    assert(!is_enabled(JVMTI_EVENT_FRAME_POP), "Must have no framepops set");
   }
 }
 
@@ -579,11 +582,8 @@ void JvmtiThreadState::update_thread_oop_during_vm_start() {
   }
 }
 
+// For virtual threads only.
 void JvmtiThreadState::set_thread(JavaThread* thread) {
-  _thread_saved = nullptr;  // Common case.
-  if (!_is_virtual && thread == nullptr) {
-    // Save JavaThread* if carrier thread is being detached.
-    _thread_saved = _thread;
-  }
+  assert(is_virtual(), "sanity check");
   _thread = thread;
 }
diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp
index 43b568cf1fc..fa77518a8b6 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,8 +123,11 @@ class JvmtiVTSuspender : AllStatic {
 class JvmtiThreadState : public CHeapObj<mtInternal> {
  private:
   friend class JvmtiEnv;
+  // The _thread field is a link to the JavaThread associated with JvmtiThreadState.
+  // A platform (including carrier) thread should always have a stable link to its JavaThread.
+  // The _thread field of a virtual thread should point to the JavaThread when
+  // virtual thread is mounted. It should be set to null when it is unmounted.
   JavaThread        *_thread;
-  JavaThread        *_thread_saved;
   OopHandle         _thread_oop_h;
   // Jvmti Events that cannot be posted in their current context.
   JvmtiDeferredEventQueue* _jvmti_event_queue;
@@ -181,7 +184,7 @@ class JvmtiThreadState : public CHeapObj<mtInternal> {
   inline JvmtiEnvThreadState* head_env_thread_state();
   inline void set_head_env_thread_state(JvmtiEnvThreadState* ets);
 
-  static bool _seen_interp_only_mode; // interp_only_mode was requested at least once
+  static Atomic<bool> _seen_interp_only_mode; // interp_only_mode was requested at least once
 
  public:
   ~JvmtiThreadState();
@@ -204,19 +207,22 @@ class JvmtiThreadState : public CHeapObj<mtInternal> {
 
   // Return true if any thread has entered interp_only_mode at any point during the JVMs execution.
   static bool seen_interp_only_mode() {
-    return _seen_interp_only_mode;
+    return _seen_interp_only_mode.load_acquire();
   }
 
   void add_env(JvmtiEnvBase *env);
 
   // The pending_interp_only_mode is set when the interp_only_mode is triggered.
   // It is cleared by EnterInterpOnlyModeClosure handshake.
-  bool is_pending_interp_only_mode() { return _pending_interp_only_mode; }
-  void set_pending_interp_only_mode(bool val) { _pending_interp_only_mode = val; }
+  bool is_pending_interp_only_mode() {  return _pending_interp_only_mode; }
+  void set_pending_interp_only_mode(bool val) {
+    _seen_interp_only_mode.release_store(true);
+    _pending_interp_only_mode = val;
+  }
 
   // Used by the interpreter for fullspeed debugging support
   bool is_interp_only_mode()                {
-    return _thread == nullptr ? _saved_interp_only_mode : _thread->is_interp_only_mode();
+    return _saved_interp_only_mode;
   }
   void enter_interp_only_mode();
   void leave_interp_only_mode();
@@ -245,8 +251,10 @@ class JvmtiThreadState : public CHeapObj<mtInternal> {
 
   int count_frames();
 
-  inline JavaThread *get_thread()      { return _thread;              }
-  inline JavaThread *get_thread_or_saved(); // return _thread_saved if _thread is null
+  inline JavaThread *get_thread()      {
+    assert(is_virtual() || _thread != nullptr, "sanity check");
+    return _thread;
+  }
 
   // Needed for virtual threads as they can migrate to different JavaThread's.
   // Also used for carrier threads to clear/restore _thread.
diff --git a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
index 2b060f1a2e4..aa81463a696 100644
--- a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
+++ b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,22 +130,21 @@ inline JvmtiThreadState* JvmtiThreadState::state_for(JavaThread *thread, Handle
   return state;
 }
 
-inline JavaThread* JvmtiThreadState::get_thread_or_saved() {
-  // Use _thread_saved if cthread is detached from JavaThread (_thread == null).
-  return (_thread == nullptr && !is_virtual()) ? _thread_saved : _thread;
-}
-
 inline void JvmtiThreadState::set_should_post_on_exceptions(bool val) {
-  get_thread_or_saved()->set_should_post_on_exceptions_flag(val ? JNI_TRUE : JNI_FALSE);
+  get_thread()->set_should_post_on_exceptions_flag(val ? JNI_TRUE : JNI_FALSE);
 }
 
 inline void JvmtiThreadState::unbind_from(JvmtiThreadState* state, JavaThread* thread) {
   if (state == nullptr) {
+    assert(!thread->is_interp_only_mode(), "sanity check");
     return;
   }
-  // Save thread's interp_only_mode.
-  state->_saved_interp_only_mode = thread->is_interp_only_mode();
-  state->set_thread(nullptr);  // Make sure stale _thread value is never used.
+  assert(thread->jvmti_thread_state() == state, "sanity check");
+  assert(state->get_thread() == thread, "sanity check");
+  assert(thread->is_interp_only_mode() == state->_saved_interp_only_mode, "sanity check");
+  if (state->is_virtual()) {    // clean _thread link for virtual threads only
+    state->set_thread(nullptr); // make sure stale _thread value is never used
+  }
 }
 
 inline void JvmtiThreadState::bind_to(JvmtiThreadState* state, JavaThread* thread) {
@@ -158,7 +157,7 @@ inline void JvmtiThreadState::bind_to(JvmtiThreadState* state, JavaThread* threa
   // Bind JavaThread to JvmtiThreadState.
   thread->set_jvmti_thread_state(state);
 
-  if (state != nullptr) {
+  if (state != nullptr && state->is_virtual()) {
     // Bind to JavaThread.
     state->set_thread(thread);
   }
@@ -167,8 +166,13 @@ inline void JvmtiThreadState::bind_to(JvmtiThreadState* state, JavaThread* threa
 inline void JvmtiThreadState::process_pending_interp_only(JavaThread* current) {
   JvmtiThreadState* state = current->jvmti_thread_state();
 
-  if (state != nullptr && state->is_pending_interp_only_mode()) {
-    JvmtiEventController::enter_interp_only_mode(state);
+  if (state != nullptr && seen_interp_only_mode()) { // avoid MutexLocker if possible
+    MutexLocker mu(JvmtiThreadState_lock);
+    if (state->is_pending_interp_only_mode()) {
+      assert(state->get_thread() == current, "sanity check");
+      assert(!state->is_interp_only_mode(), "sanity check");
+      JvmtiEventController::enter_interp_only_mode(state);
+    }
   }
 }
 #endif // SHARE_PRIMS_JVMTITHREADSTATE_INLINE_HPP
diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index c243cae20ab..584f077eddc 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -557,7 +557,7 @@ bool MethodHandles::is_basic_type_signature(Symbol* sig) {
     switch (ss.type()) {
     case T_OBJECT:
       // only java/lang/Object is valid here
-      if (strncmp((char*) ss.raw_bytes(), OBJ_SIG, OBJ_SIG_LEN) != 0)
+      if (strncmp((char*) ss.raw_bytes(), OBJ_SIG, ss.raw_length()) != 0)
         return false;
       break;
     case T_VOID:
diff --git a/src/hotspot/share/prims/upcallStubs.cpp b/src/hotspot/share/prims/upcallStubs.cpp
index 5215e6d1735..a3271589fbb 100644
--- a/src/hotspot/share/prims/upcallStubs.cpp
+++ b/src/hotspot/share/prims/upcallStubs.cpp
@@ -26,6 +26,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 
 JVM_ENTRY(static jboolean, UH_FreeUpcallStub0(JNIEnv *env, jobject _unused, jlong addr))
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   // safe to call 'find_blob' without code cache lock, because stub is always alive
   CodeBlob* cb = CodeCache::find_blob((char*)addr);
   if (cb == nullptr) {
diff --git a/src/hotspot/share/prims/vectorSupport.cpp b/src/hotspot/share/prims/vectorSupport.cpp
index a98cad07227..58f22d38d33 100644
--- a/src/hotspot/share/prims/vectorSupport.cpp
+++ b/src/hotspot/share/prims/vectorSupport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@ bool VectorSupport::is_vector_mask(Klass* klass) {
 BasicType VectorSupport::klass2bt(InstanceKlass* ik) {
   assert(ik->is_subclass_of(vmClasses::vector_VectorPayload_klass()), "%s not a VectorPayload", ik->name()->as_C_string());
   fieldDescriptor fd; // find_field initializes fd if found
-  // static final Class<?> ETYPE;
-  Klass* holder = ik->find_field(vmSymbols::ETYPE_name(), vmSymbols::class_signature(), &fd);
+  // static final Class<?> CTYPE;
+  Klass* holder = ik->find_field(vmSymbols::CTYPE_name(), vmSymbols::class_signature(), &fd);
 
   assert(holder != nullptr, "sanity");
   assert(fd.is_static(), "");
@@ -199,395 +199,408 @@ bool VectorSupport::is_unsigned_op(jint id) {
   }
 }
 
-int VectorSupport::vop2ideal(jint id, BasicType bt) {
+const char* VectorSupport::lanetype2name(LaneType lane_type) {
+  assert(lane_type >= LT_FLOAT && lane_type <= LT_LONG, "");
+  const char* lanetype2name[] = {
+    "float",
+    "double",
+    "byte",
+    "short",
+    "int",
+    "long"
+  };
+  return lanetype2name[lane_type];
+}
+
+int VectorSupport::vop2ideal(jint id, LaneType lt) {
   VectorOperation vop = (VectorOperation)id;
   switch (vop) {
     case VECTOR_OP_ADD: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_AddI;
-        case T_LONG:   return Op_AddL;
-        case T_FLOAT:  return Op_AddF;
-        case T_DOUBLE: return Op_AddD;
-        default: fatal("ADD: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_AddI;
+        case LT_LONG:   return Op_AddL;
+        case LT_FLOAT:  return Op_AddF;
+        case LT_DOUBLE: return Op_AddD;
+        default: fatal("ADD: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_SUB: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_SubI;
-        case T_LONG:   return Op_SubL;
-        case T_FLOAT:  return Op_SubF;
-        case T_DOUBLE: return Op_SubD;
-        default: fatal("SUB: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_SubI;
+        case LT_LONG:   return Op_SubL;
+        case LT_FLOAT:  return Op_SubF;
+        case LT_DOUBLE: return Op_SubD;
+        default: fatal("SUB: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MUL: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_MulI;
-        case T_LONG:   return Op_MulL;
-        case T_FLOAT:  return Op_MulF;
-        case T_DOUBLE: return Op_MulD;
-        default: fatal("MUL: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_MulI;
+        case LT_LONG:   return Op_MulL;
+        case LT_FLOAT:  return Op_MulF;
+        case LT_DOUBLE: return Op_MulD;
+        default: fatal("MUL: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_DIV: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_DivI;
-        case T_LONG:   return Op_DivL;
-        case T_FLOAT:  return Op_DivF;
-        case T_DOUBLE: return Op_DivD;
-        default: fatal("DIV: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_DivI;
+        case LT_LONG:   return Op_DivL;
+        case LT_FLOAT:  return Op_DivF;
+        case LT_DOUBLE: return Op_DivD;
+        default: fatal("DIV: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MIN: {
-      switch (bt) {
-        case T_BYTE:
-        case T_SHORT:
-        case T_INT:    return Op_MinI;
-        case T_LONG:   return Op_MinL;
-        case T_FLOAT:  return Op_MinF;
-        case T_DOUBLE: return Op_MinD;
-        default: fatal("MIN: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:
+        case LT_SHORT:
+        case LT_INT:    return Op_MinI;
+        case LT_LONG:   return Op_MinL;
+        case LT_FLOAT:  return Op_MinF;
+        case LT_DOUBLE: return Op_MinD;
+        default: fatal("MIN: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MAX: {
-      switch (bt) {
-        case T_BYTE:
-        case T_SHORT:
-        case T_INT:    return Op_MaxI;
-        case T_LONG:   return Op_MaxL;
-        case T_FLOAT:  return Op_MaxF;
-        case T_DOUBLE: return Op_MaxD;
-        default: fatal("MAX: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:
+        case LT_SHORT:
+        case LT_INT:    return Op_MaxI;
+        case LT_LONG:   return Op_MaxL;
+        case LT_FLOAT:  return Op_MaxF;
+        case LT_DOUBLE: return Op_MaxD;
+        default: fatal("MAX: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_UMIN: {
-      switch (bt) {
-        case T_BYTE:
-        case T_SHORT:
-        case T_INT:
-        case T_LONG:   return Op_UMinV;
-        default: fatal("MIN: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:
+        case LT_SHORT:
+        case LT_INT:
+        case LT_LONG:   return Op_UMinV;
+        default: fatal("MIN: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_UMAX: {
-      switch (bt) {
-        case T_BYTE:
-        case T_SHORT:
-        case T_INT:
-        case T_LONG:   return Op_UMaxV;
-        default: fatal("MAX: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:
+        case LT_SHORT:
+        case LT_INT:
+        case LT_LONG:   return Op_UMaxV;
+        default: fatal("MAX: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_ABS: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_AbsI;
-        case T_LONG:   return Op_AbsL;
-        case T_FLOAT:  return Op_AbsF;
-        case T_DOUBLE: return Op_AbsD;
-        default: fatal("ABS: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_AbsI;
+        case LT_LONG:   return Op_AbsL;
+        case LT_FLOAT:  return Op_AbsF;
+        case LT_DOUBLE: return Op_AbsD;
+        default: fatal("ABS: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_NEG: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_NegI;
-        case T_LONG:   return Op_NegL;
-        case T_FLOAT:  return Op_NegF;
-        case T_DOUBLE: return Op_NegD;
-        default: fatal("NEG: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_NegI;
+        case LT_LONG:   return Op_NegL;
+        case LT_FLOAT:  return Op_NegF;
+        case LT_DOUBLE: return Op_NegD;
+        default: fatal("NEG: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_AND: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_AndI;
-        case T_LONG:   return Op_AndL;
-        default: fatal("AND: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_AndI;
+        case LT_LONG:   return Op_AndL;
+        default: fatal("AND: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_OR: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_OrI;
-        case T_LONG:   return Op_OrL;
-        default: fatal("OR: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_OrI;
+        case LT_LONG:   return Op_OrL;
+        default: fatal("OR: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_XOR: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    return Op_XorI;
-        case T_LONG:   return Op_XorL;
-        default: fatal("XOR: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_XorI;
+        case LT_LONG:   return Op_XorL;
+        default: fatal("XOR: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_SQRT: {
-      switch (bt) {
-        case T_FLOAT:  return Op_SqrtF;
-        case T_DOUBLE: return Op_SqrtD;
-        default: fatal("SQRT: %s", type2name(bt));
+      switch (lt) {
+        case LT_FLOAT:  return Op_SqrtF;
+        case LT_DOUBLE: return Op_SqrtD;
+        default: fatal("SQRT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_FMA: {
-      switch (bt) {
-        case T_FLOAT:  return Op_FmaF;
-        case T_DOUBLE: return Op_FmaD;
-        default: fatal("FMA: %s", type2name(bt));
+      switch (lt) {
+        case LT_FLOAT:  return Op_FmaF;
+        case LT_DOUBLE: return Op_FmaD;
+        default: fatal("FMA: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_LSHIFT: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:  return Op_LShiftI;
-        case T_LONG: return Op_LShiftL;
-        default: fatal("LSHIFT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_LShiftI;
+        case LT_LONG:   return Op_LShiftL;
+        default: fatal("LSHIFT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_RSHIFT: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:  return Op_RShiftI;
-        case T_LONG: return Op_RShiftL;
-        default: fatal("RSHIFT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    return Op_RShiftI;
+        case LT_LONG:   return Op_RShiftL;
+        default: fatal("RSHIFT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_URSHIFT: {
-      switch (bt) {
-        case T_BYTE:  return Op_URShiftB;
-        case T_SHORT: return Op_URShiftS;
-        case T_INT:   return Op_URShiftI;
-        case T_LONG:  return Op_URShiftL;
-        default: fatal("URSHIFT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:  return Op_URShiftB;
+        case LT_SHORT: return Op_URShiftS;
+        case LT_INT:   return Op_URShiftI;
+        case LT_LONG:  return Op_URShiftL;
+        default: fatal("URSHIFT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_LROTATE: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    // fall-through
-        case T_LONG:  return Op_RotateLeft;
-        default: fatal("LROTATE: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   return Op_RotateLeft;
+        default: fatal("LROTATE: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_RROTATE: {
-      switch (bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    // fall-through
-        case T_LONG:  return Op_RotateRight;
-        default: fatal("RROTATE: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   return Op_RotateRight;
+        default: fatal("RROTATE: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MASK_LASTTRUE: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_VectorMaskLastTrue;
-        default: fatal("MASK_LASTTRUE: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_VectorMaskLastTrue;
+        default: fatal("MASK_LASTTRUE: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MASK_FIRSTTRUE: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_VectorMaskFirstTrue;
-        default: fatal("MASK_FIRSTTRUE: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_VectorMaskFirstTrue;
+        default: fatal("MASK_FIRSTTRUE: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MASK_TRUECOUNT: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_VectorMaskTrueCount;
-        default: fatal("MASK_TRUECOUNT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_VectorMaskTrueCount;
+        default: fatal("MASK_TRUECOUNT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MASK_TOLONG: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_VectorMaskToLong;
-        default: fatal("MASK_TOLONG: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_VectorMaskToLong;
+        default: fatal("MASK_TOLONG: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_EXPAND: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_ExpandV;
-        default: fatal("EXPAND: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_ExpandV;
+        default: fatal("EXPAND: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_COMPRESS: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_CompressV;
-        default: fatal("COMPRESS: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_CompressV;
+        default: fatal("COMPRESS: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_MASK_COMPRESS: {
-      switch (bt) {
-        case T_BYTE:  // fall-through
-        case T_SHORT: // fall-through
-        case T_INT:   // fall-through
-        case T_LONG:  // fall-through
-        case T_FLOAT: // fall-through
-        case T_DOUBLE: return Op_CompressM;
-        default: fatal("MASK_COMPRESS: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   // fall-through
+        case LT_FLOAT:  // fall-through
+        case LT_DOUBLE: return Op_CompressM;
+        default: fatal("MASK_COMPRESS: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_BIT_COUNT: {
-      switch (bt) {
-        case T_BYTE:  // Returning Op_PopCountI
-        case T_SHORT: // for byte and short types temporarily
-        case T_INT:   return Op_PopCountI;
-        case T_LONG:  return Op_PopCountL;
-        default: fatal("BIT_COUNT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:  // Returning Op_PopCountI
+        case LT_SHORT: // for byte and short types temporarily
+        case LT_INT:   return Op_PopCountI;
+        case LT_LONG:  return Op_PopCountL;
+        default: fatal("BILT_COUNT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_TZ_COUNT: {
-      switch (bt) {
-        case T_BYTE:
-        case T_SHORT:
-        case T_INT:   return Op_CountTrailingZerosI;
-        case T_LONG:  return Op_CountTrailingZerosL;
-        default: fatal("TZ_COUNT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:
+        case LT_SHORT:
+        case LT_INT:   return Op_CountTrailingZerosI;
+        case LT_LONG:  return Op_CountTrailingZerosL;
+        default: fatal("TZ_COUNT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_LZ_COUNT: {
-      switch (bt) {
-        case T_BYTE:
-        case T_SHORT:
-        case T_INT:   return Op_CountLeadingZerosI;
-        case T_LONG:  return Op_CountLeadingZerosL;
-        default: fatal("LZ_COUNT: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:
+        case LT_SHORT:
+        case LT_INT:   return Op_CountLeadingZerosI;
+        case LT_LONG:  return Op_CountLeadingZerosL;
+        default: fatal("LZ_COUNT: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_REVERSE: {
-      switch (bt) {
-        case T_BYTE:  // Temporarily returning
-        case T_SHORT: // Op_ReverseI for byte and short
-        case T_INT:   return Op_ReverseI;
-        case T_LONG:  return Op_ReverseL;
-        default: fatal("REVERSE: %s", type2name(bt));
+      switch (lt) {
+        case LT_BYTE:  // Temporarily returning
+        case LT_SHORT: // Op_ReverseI for byte and short
+        case LT_INT:   return Op_ReverseI;
+        case LT_LONG:  return Op_ReverseL;
+        default: fatal("REVERSE: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_REVERSE_BYTES: {
-      switch (bt) {
-        case T_SHORT: return Op_ReverseBytesS;
+      switch (lt) {
+        case LT_SHORT: return Op_ReverseBytesS;
         // Superword requires type consistency between the ReverseBytes*
         // node and the data. But there's no ReverseBytesB node because
-        // no reverseBytes() method in Java Byte class. T_BYTE can only
+        // no reverseBytes() method in Java Byte class. LT_BYTE can only
         // appear in VectorAPI calls. We reuse Op_ReverseBytesI for this
         // to ensure vector intrinsification succeeds.
-        case T_BYTE:  // Intentionally fall-through
-        case T_INT:   return Op_ReverseBytesI;
-        case T_LONG:  return Op_ReverseBytesL;
-        default: fatal("REVERSE_BYTES: %s", type2name(bt));
+        case LT_BYTE:  // Intentionally fall-through
+        case LT_INT:   return Op_ReverseBytesI;
+        case LT_LONG:  return Op_ReverseBytesL;
+        default: fatal("REVERSE_BYTES: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_SADD:
     case VECTOR_OP_SUADD: {
-      switch(bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    // fall-through
-        case T_LONG:   return Op_SaturatingAddV;
-        default: fatal("S[U]ADD: %s", type2name(bt));
+      switch(lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   return Op_SaturatingAddV;
+        default: fatal("S[U]ADD: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_SSUB:
     case VECTOR_OP_SUSUB: {
-      switch(bt) {
-        case T_BYTE:   // fall-through
-        case T_SHORT:  // fall-through
-        case T_INT:    // fall-through
-        case T_LONG:   return Op_SaturatingSubV;
-        default: fatal("S[U}SUB: %s", type2name(bt));
+      switch(lt) {
+        case LT_BYTE:   // fall-through
+        case LT_SHORT:  // fall-through
+        case LT_INT:    // fall-through
+        case LT_LONG:   return Op_SaturatingSubV;
+        default: fatal("S[U}SUB: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_COMPRESS_BITS: {
-      switch (bt) {
-        case T_INT:
-        case T_LONG: return Op_CompressBits;
-        default: fatal("COMPRESS_BITS: %s", type2name(bt));
+      switch (lt) {
+        case LT_INT:
+        case LT_LONG: return Op_CompressBits;
+        default: fatal("COMPRESS_BITS: %s", lanetype2name(lt));
       }
       break;
     }
     case VECTOR_OP_EXPAND_BITS: {
-      switch (bt) {
-        case T_INT:
-        case T_LONG: return Op_ExpandBits;
-        default: fatal("EXPAND_BITS: %s", type2name(bt));
+      switch (lt) {
+        case LT_INT:
+        case LT_LONG: return Op_ExpandBits;
+        default: fatal("EXPAND_BITS: %s", lanetype2name(lt));
       }
       break;
     }
diff --git a/src/hotspot/share/prims/vectorSupport.hpp b/src/hotspot/share/prims/vectorSupport.hpp
index 5dd06f31b16..da3736b4711 100644
--- a/src/hotspot/share/prims/vectorSupport.hpp
+++ b/src/hotspot/share/prims/vectorSupport.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,12 +137,23 @@ class VectorSupport : AllStatic {
     NUM_VEC_SIZES = 5
   };
 
+  // Values in this enum correspond to the jdk.incubator.vector.LaneType ordinal values.
+  enum LaneType : int {
+    LT_FLOAT     = 0,
+    LT_DOUBLE    = 1,
+    LT_BYTE      = 2,
+    LT_SHORT     = 3,
+    LT_INT       = 4,
+    LT_LONG      = 5
+  };
+
   enum {
     MODE_BROADCAST = 0,
     MODE_BITS_COERCED_LONG_TO_MASK = 1
   };
 
-  static int vop2ideal(jint vop, BasicType bt);
+  static int vop2ideal(jint vop, LaneType lt);
+  static const char* lanetype2name(LaneType lane_type);
   static bool has_scalar_op(jint id);
   static bool is_unsigned_op(jint id);
 
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 1c2f5527ff9..1a440584fe1 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,7 +129,6 @@
 #ifdef LINUX
 #include "cgroupSubsystem_linux.hpp"
 #include "os_linux.hpp"
-#include "osContainer_linux.hpp"
 #endif
 
 #define CHECK_JNI_EXCEPTION_(env, value)                               \
@@ -579,7 +578,7 @@ WB_END
 WB_ENTRY(jboolean, WB_G1InConcurrentMark(JNIEnv* env, jobject o))
   if (UseG1GC) {
     G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    return g1h->concurrent_mark()->cm_thread()->in_progress();
+    return g1h->concurrent_mark()->in_progress();
   }
   THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1InConcurrentMark: G1 GC is not enabled");
 WB_END
@@ -2216,25 +2215,10 @@ WB_ENTRY(jboolean, WB_CDSMemoryMappingFailed(JNIEnv* env, jobject wb))
   return FileMapInfo::memory_mapping_failed();
 WB_END
 
-WB_ENTRY(jboolean, WB_IsSharedInternedString(JNIEnv* env, jobject wb, jobject str))
-  if (!HeapShared::is_loading_mapping_mode()) {
-    return false;
-  }
-  ResourceMark rm(THREAD);
-  oop str_oop = JNIHandles::resolve(str);
-  int length;
-  jchar* chars = java_lang_String::as_unicode_string(str_oop, length, CHECK_(false));
-  return StringTable::lookup_shared(chars, length) == str_oop;
-WB_END
-
 WB_ENTRY(jboolean, WB_IsSharedClass(JNIEnv* env, jobject wb, jclass clazz))
   return (jboolean)AOTMetaspace::in_aot_cache(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz)));
 WB_END
 
-WB_ENTRY(jboolean, WB_AreSharedStringsMapped(JNIEnv* env))
-  return AOTMappedHeapLoader::is_mapped();
-WB_END
-
 WB_ENTRY(void, WB_LinkClass(JNIEnv* env, jobject wb, jclass clazz))
   Klass *k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz));
   if (!k->is_instance_klass()) {
@@ -2582,14 +2566,12 @@ WB_ENTRY(jboolean, WB_CheckLibSpecifiesNoexecstack(JNIEnv* env, jobject o, jstri
 WB_END
 
 WB_ENTRY(jboolean, WB_IsContainerized(JNIEnv* env, jobject o))
-  LINUX_ONLY(return OSContainer::is_containerized();)
-  return false;
+  return os::is_containerized();
 WB_END
 
 // Physical memory of the host machine (including containers)
 WB_ENTRY(jlong, WB_HostPhysicalMemory(JNIEnv* env, jobject o))
-  LINUX_ONLY(return static_cast<jlong>(os::Linux::physical_memory());)
-  return static_cast<jlong>(os::physical_memory());
+  return static_cast<jlong>(os::Machine::physical_memory());
 WB_END
 
 // Available memory of the host machine (container-aware)
@@ -3061,9 +3043,7 @@ static JNINativeMethod methods[] = {
   {CC"getCDSGenericHeaderMinVersion",     CC"()I",    (void*)&WB_GetCDSGenericHeaderMinVersion},
   {CC"getCurrentCDSVersion",              CC"()I",    (void*)&WB_GetCDSCurrentVersion},
   {CC"isSharingEnabled",   CC"()Z",                   (void*)&WB_IsSharingEnabled},
-  {CC"isSharedInternedString", CC"(Ljava/lang/String;)Z", (void*)&WB_IsSharedInternedString },
   {CC"isSharedClass",      CC"(Ljava/lang/Class;)Z",  (void*)&WB_IsSharedClass },
-  {CC"areSharedStringsMapped",            CC"()Z",    (void*)&WB_AreSharedStringsMapped },
   {CC"linkClass",          CC"(Ljava/lang/Class;)V",  (void*)&WB_LinkClass},
   {CC"areOpenArchiveHeapObjectsMapped",   CC"()Z",    (void*)&WB_AreOpenArchiveHeapObjectsMapped},
   {CC"isCDSIncluded",                     CC"()Z",    (void*)&WB_IsCDSIncluded },
diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp
index 5a6b41506c7..17ade2c068d 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.hpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ typedef enum {
 } VirtualizationType;
 
 class outputStream;
+class stringStream;
 enum class vmIntrinsicID;
 
 // Abstract_VM_Version provides information about the VM.
@@ -226,6 +227,21 @@ class Abstract_VM_Version: AllStatic {
 
   static const char* cpu_name(void);
   static const char* cpu_description(void);
+
+  static void get_cpu_features_name(void* features_buffer, stringStream& ss) { return; }
+
+  // Returns names of features present in features_set1 but not in features_set2
+  static void get_missing_features_name(void* features_set1, void* features_set2, stringStream& ss) { return; }
+
+  // Returns number of bytes required to store cpu features representation
+  static int cpu_features_size() { return 0; }
+
+  // Stores arch dependent cpu features representation in the provided buffer.
+  // Size of the buffer must be same as returned by cpu_features_size()
+  static void store_cpu_features(void* buf) { return; }
+
+  // features_to_test is an opaque object that stores arch specific representation of cpu features
+  static bool supports_features(void* features_to_test) { return false; };
 };
 
 #endif // SHARE_RUNTIME_ABSTRACT_VM_VERSION_HPP
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index cf0a1ab9757..a1dae76f680 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,6 @@
 #include "runtime/vm_version.hpp"
 #include "services/management.hpp"
 #include "utilities/align.hpp"
-#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
@@ -537,9 +536,6 @@ static SpecialFlag const special_jvm_flags[] = {
 #ifdef _LP64
   { "UseCompressedClassPointers",   JDK_Version::jdk(25),  JDK_Version::jdk(27), JDK_Version::undefined() },
 #endif
-  { "ParallelRefProcEnabled",       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
-  { "ParallelRefProcBalancingEnabled", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
-  { "MaxRAM",                       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "AggressiveHeap",               JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "NeverActAsServerClassMachine", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
   { "AlwaysActAsServerClassMachine", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
@@ -554,6 +550,9 @@ static SpecialFlag const special_jvm_flags[] = {
 #endif
 
   { "PSChunkLargeArrays",           JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
+  { "ParallelRefProcEnabled",       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
+  { "ParallelRefProcBalancingEnabled", JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
+  { "MaxRAM",                       JDK_Version::jdk(26),  JDK_Version::jdk(27), JDK_Version::jdk(28) },
 
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },
@@ -1207,16 +1206,22 @@ bool Arguments::process_settings_file(const char* file_name, bool should_exist,
   }
 
   char token[1024];
-  int  pos = 0;
+  size_t pos = 0;
 
   bool in_white_space = true;
   bool in_comment     = false;
   bool in_quote       = false;
-  int  quote_c        = 0;
+  char quote_c        = 0;
   bool result         = true;
 
-  int c = getc(stream);
-  while(c != EOF && pos < (int)(sizeof(token)-1)) {
+  int c_or_eof = getc(stream);
+  while (c_or_eof != EOF && pos < (sizeof(token) - 1)) {
+    // We have checked the c_or_eof for EOF. getc should only ever return the
+    // EOF or an unsigned char converted to an int. We cast down to a char to
+    // avoid the char to int promotions we would otherwise do in the comparisons
+    // below (which would be incorrect if we ever compared to a non-ascii char),
+    // and the int to char conversions we would otherwise do in the assignments.
+    const char c = static_cast<char>(c_or_eof);
     if (in_white_space) {
       if (in_comment) {
         if (c == '\n') in_comment = false;
@@ -1224,7 +1229,7 @@ bool Arguments::process_settings_file(const char* file_name, bool should_exist,
         if (c == '#') in_comment = true;
         else if (!isspace((unsigned char) c)) {
           in_white_space = false;
-          token[pos++] = checked_cast<char>(c);
+          token[pos++] = c;
         }
       }
     } else {
@@ -1244,10 +1249,10 @@ bool Arguments::process_settings_file(const char* file_name, bool should_exist,
       } else if (in_quote && (c == quote_c)) {
         in_quote = false;
       } else {
-        token[pos++] = checked_cast<char>(c);
+        token[pos++] = c;
       }
     }
-    c = getc(stream);
+    c_or_eof = getc(stream);
   }
   if (pos > 0) {
     token[pos] = '\0';
@@ -1505,25 +1510,19 @@ void Arguments::set_heap_size() {
   // Check if the user has configured any limit on the amount of RAM we may use.
   bool has_ram_limit = !FLAG_IS_DEFAULT(MaxRAMPercentage) ||
                        !FLAG_IS_DEFAULT(MinRAMPercentage) ||
-                       !FLAG_IS_DEFAULT(InitialRAMPercentage) ||
-                       !FLAG_IS_DEFAULT(MaxRAM);
+                       !FLAG_IS_DEFAULT(InitialRAMPercentage);
 
-  if (FLAG_IS_DEFAULT(MaxRAM)) {
-    if (CompilerConfig::should_set_client_emulation_mode_flags()) {
-      // Limit the available memory if client emulation mode is enabled.
-      FLAG_SET_ERGO(MaxRAM, 1ULL*G);
-    } else {
-      // Use the available physical memory on the system.
-      FLAG_SET_ERGO(MaxRAM, os::physical_memory());
-    }
-  }
+  // Limit the available memory if client emulation mode is enabled.
+  const size_t avail_mem = CompilerConfig::should_set_client_emulation_mode_flags()
+      ? 1ULL*G
+      : os::physical_memory();
 
   // If the maximum heap size has not been set with -Xmx, then set it as
   // fraction of the size of physical memory, respecting the maximum and
   // minimum sizes of the heap.
   if (FLAG_IS_DEFAULT(MaxHeapSize)) {
-    uint64_t min_memory = (uint64_t)(((double)MaxRAM * MinRAMPercentage) / 100);
-    uint64_t max_memory = (uint64_t)(((double)MaxRAM * MaxRAMPercentage) / 100);
+    uint64_t min_memory = (uint64_t)(((double)avail_mem * MinRAMPercentage) / 100);
+    uint64_t max_memory = (uint64_t)(((double)avail_mem * MaxRAMPercentage) / 100);
 
     const size_t reasonable_min = clamp_by_size_t_max(min_memory);
     size_t reasonable_max = clamp_by_size_t_max(max_memory);
@@ -1610,7 +1609,7 @@ void Arguments::set_heap_size() {
     reasonable_minimum = limit_heap_by_allocatable_memory(reasonable_minimum);
 
     if (InitialHeapSize == 0) {
-      uint64_t initial_memory = (uint64_t)(((double)MaxRAM * InitialRAMPercentage) / 100);
+      uint64_t initial_memory = (uint64_t)(((double)avail_mem * InitialRAMPercentage) / 100);
       size_t reasonable_initial = clamp_by_size_t_max(initial_memory);
       reasonable_initial = limit_heap_by_allocatable_memory(reasonable_initial);
 
diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp
index f708e9c18ca..894e04eec57 100644
--- a/src/hotspot/share/runtime/atomic.hpp
+++ b/src/hotspot/share/runtime/atomic.hpp
@@ -58,9 +58,10 @@
 //     ValueType -> T
 //
 //   special functions:
-//     explicit constructor(T)
+//     constexpr constructor()             // See (2) below
+//     explicit constexpr constructor(T)
 //     noncopyable
-//     destructor
+//     destructor                          // Trivial
 //
 //   static member functions:
 //     value_offset_in_bytes() -> int   // constexpr
@@ -343,7 +344,8 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Integer>
   : public SupportsArithmetic<T>
 {
 public:
-  explicit constexpr Atomic(T value = 0) : SupportsArithmetic<T>(value) {}
+  constexpr Atomic() : Atomic(0) {}
+  explicit constexpr Atomic(T value) : SupportsArithmetic<T>(value) {}
 
   NONCOPYABLE(Atomic);
 
@@ -383,7 +385,8 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Byte>
   : public CommonCore<T>
 {
 public:
-  explicit constexpr Atomic(T value = 0) : CommonCore<T>(value) {}
+  constexpr Atomic() : Atomic(0) {}
+  explicit constexpr Atomic(T value) : CommonCore<T>(value) {}
 
   NONCOPYABLE(Atomic);
 
@@ -399,7 +402,8 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Pointer>
   : public SupportsArithmetic<T>
 {
 public:
-  explicit constexpr Atomic(T value = nullptr) : SupportsArithmetic<T>(value) {}
+  constexpr Atomic() : Atomic(nullptr) {}
+  explicit constexpr Atomic(T value) : SupportsArithmetic<T>(value) {}
 
   NONCOPYABLE(Atomic);
 
diff --git a/src/hotspot/share/runtime/continuation.cpp b/src/hotspot/share/runtime/continuation.cpp
index 935f304a751..0b7e64a3ba6 100644
--- a/src/hotspot/share/runtime/continuation.cpp
+++ b/src/hotspot/share/runtime/continuation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,8 @@ class UnmountBeginMark : public StackObj {
     }
   }
   ~UnmountBeginMark() {
-    assert(!_current->is_suspended(), "must be");
+    assert(!_current->is_suspended()
+           JVMTI_ONLY(|| (_current->is_vthread_transition_disabler() && _result != freeze_ok)), "must be");
     assert(_current->is_in_vthread_transition(), "must be");
 
     if (_result != freeze_ok) {
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index e2029a26d37..54a65358693 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,6 +132,7 @@ void DeoptimizationScope::mark(nmethod* nm, bool inc_recompile_counts) {
     return;
   }
 
+  MACOS_AARCH64_ONLY(os::thread_wx_enable_write());
   nmethod::DeoptimizationStatus status =
     inc_recompile_counts ? nmethod::deoptimize : nmethod::deoptimize_noupdate;
   AtomicAccess::store(&nm->_deoptimization_status, status);
@@ -2154,7 +2155,9 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr
       // Lock to read ProfileData, and ensure lock is not broken by a safepoint
       // We must do this already now, since we cannot acquire this lock while
       // holding the tty lock (lock ordering by rank).
-      MutexLocker ml(trap_mdo->extra_data_lock(), Mutex::_no_safepoint_check_flag);
+      ConditionalMutexLocker ml((trap_mdo != nullptr) ? trap_mdo->extra_data_lock() : nullptr,
+                                (trap_mdo != nullptr),
+                                Mutex::_no_safepoint_check_flag);
 
       ttyLocker ttyl;
 
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
index 63d3424b3ed..444ce321759 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -163,10 +163,10 @@ JVMFlag::Error CodeCacheSegmentSizeConstraintFunc(size_t value, bool verbose) {
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
-  if (CodeCacheSegmentSize < (size_t)CodeEntryAlignment) {
+  if (CodeCacheSegmentSize < CodeEntryAlignment) {
     JVMFlag::printError(verbose,
                         "CodeCacheSegmentSize  (%zu) must be "
-                        "larger than or equal to CodeEntryAlignment (%zd) "
+                        "larger than or equal to CodeEntryAlignment (%u) "
                         "to align entry points\n",
                         CodeCacheSegmentSize, CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
@@ -194,25 +194,25 @@ JVMFlag::Error CodeCacheSegmentSizeConstraintFunc(size_t value, bool verbose) {
   return JVMFlag::SUCCESS;
 }
 
-JVMFlag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
+JVMFlag::Error CodeEntryAlignmentConstraintFunc(uint value, bool verbose) {
   if (!is_power_of_2(value)) {
     JVMFlag::printError(verbose,
-                        "CodeEntryAlignment (%zd) must be "
+                        "CodeEntryAlignment (%u) must be "
                         "a power of two\n", CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
   if (CodeEntryAlignment < 16) {
       JVMFlag::printError(verbose,
-                          "CodeEntryAlignment (%zd) must be "
+                          "CodeEntryAlignment (%u) must be "
                           "greater than or equal to %d\n",
                           CodeEntryAlignment, 16);
       return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
-  if ((size_t)CodeEntryAlignment > CodeCacheSegmentSize) {
+  if (CodeEntryAlignment > CodeCacheSegmentSize) {
     JVMFlag::printError(verbose,
-                        "CodeEntryAlignment (%zd) must be "
+                        "CodeEntryAlignment (%u) must be "
                         "less than or equal to CodeCacheSegmentSize (%zu) "
                         "to align entry points\n",
                         CodeEntryAlignment, CodeCacheSegmentSize);
@@ -241,10 +241,10 @@ JVMFlag::Error OptoLoopAlignmentConstraintFunc(intx value, bool verbose) {
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
-  if (OptoLoopAlignment > CodeEntryAlignment) {
+  if (checked_cast<uintx>(OptoLoopAlignment) > CodeEntryAlignment) {
     JVMFlag::printError(verbose,
                         "OptoLoopAlignment (%zd) must be "
-                        "less or equal to CodeEntryAlignment (%zd)\n",
+                        "less or equal to CodeEntryAlignment (%u)\n",
                         value, CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
@@ -306,7 +306,7 @@ JVMFlag::Error TypeProfileLevelConstraintFunc(uint value, bool verbose) {
 }
 
 JVMFlag::Error VerifyIterativeGVNConstraintFunc(uint value, bool verbose) {
-  const int max_modes = 5;
+  const int max_modes = 6;
   uint original_value = value;
   for (int i = 0; i < max_modes; i++) {
     if (value % 10 > 1) {
@@ -339,10 +339,10 @@ JVMFlag::Error InitArrayShortSizeConstraintFunc(intx value, bool verbose) {
 
 #ifdef COMPILER2
 JVMFlag::Error InteriorEntryAlignmentConstraintFunc(intx value, bool verbose) {
-  if (InteriorEntryAlignment > CodeEntryAlignment) {
+  if (checked_cast<uintx>(InteriorEntryAlignment) > CodeEntryAlignment) {
     JVMFlag::printError(verbose,
                        "InteriorEntryAlignment (%zd) must be "
-                       "less than or equal to CodeEntryAlignment (%zd)\n",
+                       "less than or equal to CodeEntryAlignment (%u)\n",
                        InteriorEntryAlignment, CodeEntryAlignment);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
index 4544ad706fd..cf785800cfc 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
   f(intx,  CompileThresholdConstraintFunc)              \
   f(intx,  OnStackReplacePercentageConstraintFunc)      \
   f(size_t, CodeCacheSegmentSizeConstraintFunc)         \
-  f(intx,  CodeEntryAlignmentConstraintFunc)            \
+  f(uint,  CodeEntryAlignmentConstraintFunc)            \
   f(intx,  OptoLoopAlignmentConstraintFunc)             \
   f(uintx, ArraycopyDstPrefetchDistanceConstraintFunc)  \
   f(uintx, ArraycopySrcPrefetchDistanceConstraintFunc)  \
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 6a2bbc9c648..6d4b9908e1c 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1508,8 +1508,9 @@ const int ObjectAlignmentInBytes = 8;
           range(1, 1024)                                                    \
           constraint(CodeCacheSegmentSizeConstraintFunc, AfterErgo)         \
                                                                             \
-  product_pd(intx, CodeEntryAlignment, EXPERIMENTAL,                        \
-          "Code entry alignment for generated code (in bytes)")             \
+  product_pd(uint, CodeEntryAlignment, EXPERIMENTAL,                        \
+          "Code entry alignment for generated code"                         \
+          " (in bytes, power of two)")                                      \
           constraint(CodeEntryAlignmentConstraintFunc, AfterErgo)           \
                                                                             \
   product_pd(intx, OptoLoopAlignment,                                       \
diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp
index 89b02717a7a..b54068d65d6 100644
--- a/src/hotspot/share/runtime/handshake.cpp
+++ b/src/hotspot/share/runtime/handshake.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -521,8 +521,8 @@ HandshakeOperation* HandshakeState::get_op_for_self(bool allow_suspend, bool che
   assert(_lock.owned_by_self(), "Lock must be held");
   assert(allow_suspend || !check_async_exception, "invalid case");
 #if INCLUDE_JVMTI
-  if (allow_suspend && _handshakee->is_disable_suspend()) {
-    // filter out suspend operations while JavaThread is in disable_suspend mode
+  if (allow_suspend && (_handshakee->is_disable_suspend() || _handshakee->is_vthread_transition_disabler())) {
+    // filter out suspend operations while JavaThread can not be suspended
     allow_suspend = false;
   }
 #endif
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index ecd7397d81a..cd3a45a8d3c 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -279,12 +279,14 @@ class VMNativeEntryWrapper {
   os::verify_stack_alignment();                                      \
   /* begin of body */
 
-
 #define JRT_ENTRY(result_type, header)                               \
   result_type header {                                               \
     assert(current == JavaThread::current(), "Must be");             \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
     ThreadInVMfromJava __tiv(current);                               \
+    MACOS_AARCH64_ONLY(                                              \
+      static WXMode wx_mode = DefaultWXWriteMode;                    \
+      ThreadWXEnable __wx(&wx_mode, current);                        \
+    )                                                                \
     VM_ENTRY_BASE(result_type, header, current)                      \
     DEBUG_ONLY(VMEntryWrapper __vew;)
 
@@ -311,8 +313,11 @@ class VMNativeEntryWrapper {
 #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
   result_type header {                                               \
     assert(current == JavaThread::current(), "Must be");             \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
     ThreadInVMfromJava __tiv(current, false /* check asyncs */);     \
+    MACOS_AARCH64_ONLY(                                              \
+      static WXMode wx_mode = DefaultWXWriteMode;                    \
+      ThreadWXEnable __wx(&wx_mode, current);                        \
+    )                                                                \
     VM_ENTRY_BASE(result_type, header, current)                      \
     DEBUG_ONLY(VMEntryWrapper __vew;)
 
@@ -321,7 +326,10 @@ class VMNativeEntryWrapper {
 #define JRT_BLOCK_ENTRY(result_type, header)                         \
   result_type header {                                               \
     assert(current == JavaThread::current(), "Must be");             \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
+    MACOS_AARCH64_ONLY(                                              \
+      static WXMode wx_mode = DefaultWXWriteMode;                    \
+      ThreadWXEnable __wx(&wx_mode, current);                        \
+    )                                                                \
     HandleMarkCleaner __hm(current);
 
 #define JRT_BLOCK                                                    \
@@ -358,8 +366,11 @@ extern "C" {                                                         \
   result_type JNICALL header {                                       \
     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
     assert(thread == Thread::current(), "JNIEnv is only valid in same thread"); \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
     ThreadInVMfromNative __tiv(thread);                              \
+    MACOS_AARCH64_ONLY(                                              \
+      static WXMode wx_mode = DefaultWXWriteMode;                    \
+      ThreadWXEnable __wx(&wx_mode, thread);                         \
+    )                                                                \
     DEBUG_ONLY(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
 
@@ -383,8 +394,11 @@ extern "C" {                                                         \
 extern "C" {                                                         \
   result_type JNICALL header {                                       \
     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
     ThreadInVMfromNative __tiv(thread);                              \
+    MACOS_AARCH64_ONLY(                                              \
+      static WXMode wx_mode = DefaultWXWriteMode;                    \
+      ThreadWXEnable __wx(&wx_mode, thread);                         \
+    )                                                                \
     DEBUG_ONLY(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
 
@@ -393,8 +407,11 @@ extern "C" {                                                         \
 extern "C" {                                                         \
   result_type JNICALL header {                                       \
     JavaThread* thread = JavaThread::current();                      \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
     ThreadInVMfromNative __tiv(thread);                              \
+    MACOS_AARCH64_ONLY(                                              \
+      static WXMode wx_mode = DefaultWXWriteMode;                    \
+      ThreadWXEnable __wx(&wx_mode, thread);                         \
+    )                                                                \
     DEBUG_ONLY(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
 
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index c49a9f5d4b8..758051a7351 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -151,7 +151,8 @@ static void print_method_profiling_data() {
           ss.fill_to(2);
           m->method_data()->parameters_type_data()->print_data_on(&ss);
         }
-        m->print_codes_on(&ss);
+        // Buffering to a stringStream, disable internal buffering so it's not done twice.
+        m->print_codes_on(&ss, 0, false);
         tty->print("%s", ss.as_string()); // print all at once
         total_size += m->method_data()->size_in_bytes();
       }
@@ -466,10 +467,7 @@ void before_exit(JavaThread* thread, bool halt) {
     event.commit();
   }
 
-  // 2nd argument (emit_event_shutdown) should be set to false
-  // because EventShutdown would be emitted at Threads::destroy_vm().
-  // (one of the callers of before_exit())
-  JFR_ONLY(Jfr::on_vm_shutdown(true, false, halt);)
+  JFR_ONLY(Jfr::on_vm_shutdown(false, halt);)
 
   // Stop the WatcherThread. We do this before disenrolling various
   // PeriodicTasks to reduce the likelihood of races.
diff --git a/src/hotspot/share/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp
index 3ed678284e4..da701640006 100644
--- a/src/hotspot/share/runtime/javaCalls.cpp
+++ b/src/hotspot/share/runtime/javaCalls.cpp
@@ -94,16 +94,12 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei
 
   DEBUG_ONLY(_thread->inc_java_call_counter());
   _thread->set_active_handles(new_handles);     // install new handle block and reset Java frame linkage
-
-  MACOS_AARCH64_ONLY(_thread->enable_wx(WXExec));
 }
 
 
 JavaCallWrapper::~JavaCallWrapper() {
   assert(_thread == JavaThread::current(), "must still be the same thread");
 
-  MACOS_AARCH64_ONLY(_thread->enable_wx(WXWrite));
-
   // restore previous handle block & Java frame linkage
   JNIHandleBlock *_old_handles = _thread->active_handles();
   _thread->set_active_handles(_handles);
@@ -413,17 +409,20 @@ void JavaCalls::call_helper(JavaValue* result, const methodHandle& method, JavaC
 #endif
         }
       }
-      StubRoutines::call_stub()(
-        (address)&link,
-        // (intptr_t*)&(result->_value), // see NOTE above (compiler problem)
-        result_val_address,          // see NOTE above (compiler problem)
-        result_type,
-        method(),
-        entry_point,
-        parameter_address,
-        args->size_of_parameters(),
-        CHECK
-      );
+      {
+        MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, thread));
+        StubRoutines::call_stub()(
+          (address)&link,
+          // (intptr_t*)&(result->_value), // see NOTE above (compiler problem)
+          result_val_address,          // see NOTE above (compiler problem)
+          result_type,
+          method(),
+          entry_point,
+          parameter_address,
+          args->size_of_parameters(),
+          CHECK
+        );
+      }
 
       result = link.result();  // circumvent MS C++ 5.0 compiler bug (result is clobbered across call)
       // Preserve oop return value across possible gc points
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 4ee9a9dfd79..77a567d4a09 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -377,15 +377,6 @@ void JavaThread::check_possible_safepoint() {
   // Clear unhandled oops in JavaThreads so we get a crash right away.
   clear_unhandled_oops();
 #endif // CHECK_UNHANDLED_OOPS
-
-  // Macos/aarch64 should be in the right state for safepoint (e.g.
-  // deoptimization needs WXWrite).  Crashes caused by the wrong state rarely
-  // happens in practice, making such issues hard to find and reproduce.
-#if defined(__APPLE__) && defined(AARCH64)
-  if (AssertWXAtThreadSync) {
-    assert_wx_state(WXWrite);
-  }
-#endif
 }
 
 void JavaThread::check_for_valid_safepoint_state() {
@@ -499,7 +490,7 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _suspend_resume_manager(this, &_handshake._lock),
 
   _is_in_vthread_transition(false),
-  DEBUG_ONLY(_is_vthread_transition_disabler(false) COMMA)
+  JVMTI_ONLY(_is_vthread_transition_disabler(false) COMMA)
   DEBUG_ONLY(_is_disabler_at_start(false) COMMA)
 
   _popframe_preserved_args(nullptr),
@@ -521,6 +512,11 @@ JavaThread::JavaThread(MemTag mem_tag) :
   _last_freeze_fail_result(freeze_ok),
 #endif
 
+#ifdef MACOS_AARCH64
+  _cur_wx_enable(nullptr),
+  _cur_wx_mode(nullptr),
+#endif
+
   _lock_stack(this),
   _om_cache(this) {
   set_jni_functions(jni_functions());
@@ -1165,11 +1161,13 @@ void JavaThread::set_is_in_vthread_transition(bool val) {
   AtomicAccess::store(&_is_in_vthread_transition, val);
 }
 
-#ifdef ASSERT
+#if INCLUDE_JVMTI
 void JavaThread::set_is_vthread_transition_disabler(bool val) {
   _is_vthread_transition_disabler = val;
 }
+#endif
 
+#ifdef ASSERT
 void JavaThread::set_is_disabler_at_start(bool val) {
   _is_disabler_at_start = val;
 }
@@ -1183,7 +1181,9 @@ void JavaThread::set_is_disabler_at_start(bool val) {
 //
 bool JavaThread::java_suspend(bool register_vthread_SR) {
   // Suspending a vthread transition disabler can cause deadlocks.
-  assert(!is_vthread_transition_disabler(), "no suspend allowed for vthread transition disablers");
+  // The HandshakeState::has_operation does not allow such suspends.
+  // But the suspender thread is an exclusive transition disablers, so there can't be other disabers here.
+  JVMTI_ONLY(assert(!is_vthread_transition_disabler(), "suspender thread is an exclusive transition disabler");)
 
   guarantee(Thread::is_JavaThread_protected(/* target */ this),
             "target JavaThread is not protected in calling context.");
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index d4c12887e10..755a6abe0d8 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -81,6 +81,7 @@ class JavaThread;
 typedef void (*ThreadFunction)(JavaThread*, TRAPS);
 
 class EventVirtualThreadPinned;
+class ThreadWXEnable;
 
 class JavaThread: public Thread {
   friend class VMStructs;
@@ -734,14 +735,14 @@ public:
 
 private:
   bool _is_in_vthread_transition;                    // thread is in virtual thread mount state transition
-  DEBUG_ONLY(bool _is_vthread_transition_disabler;)  // thread currently disabled vthread transitions
+  JVMTI_ONLY(bool _is_vthread_transition_disabler;)  // thread currently disabled vthread transitions
   DEBUG_ONLY(bool _is_disabler_at_start;)            // thread at process of disabling vthread transitions
 public:
   bool is_in_vthread_transition() const;
   void set_is_in_vthread_transition(bool val);
+  JVMTI_ONLY(bool is_vthread_transition_disabler() const { return _is_vthread_transition_disabler; })
+  JVMTI_ONLY(void set_is_vthread_transition_disabler(bool val);)
 #ifdef ASSERT
-  bool is_vthread_transition_disabler() const       { return _is_vthread_transition_disabler; }
-  void set_is_vthread_transition_disabler(bool val);
   bool is_disabler_at_start() const                 { return _is_disabler_at_start; }
   void set_is_disabler_at_start(bool val);
 #endif
@@ -1288,6 +1289,15 @@ public:
   bool get_and_clear_interrupted();
 
 private:
+
+#ifdef MACOS_AARCH64
+  friend class ThreadWXEnable;
+  friend class PosixSignals;
+
+  ThreadWXEnable* _cur_wx_enable;
+  WXMode* _cur_wx_mode;
+#endif
+
   LockStack _lock_stack;
   OMCache _om_cache;
 
diff --git a/src/hotspot/share/runtime/lockStack.cpp b/src/hotspot/share/runtime/lockStack.cpp
index a88a84eb9f8..58b9c58a329 100644
--- a/src/hotspot/share/runtime/lockStack.cpp
+++ b/src/hotspot/share/runtime/lockStack.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2022, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,7 +118,4 @@ void LockStack::print_on(outputStream* st) {
 OMCache::OMCache(JavaThread* jt) : _entries() {
   STATIC_ASSERT(std::is_standard_layout<OMCache>::value);
   STATIC_ASSERT(std::is_standard_layout<OMCache::OMCacheEntry>::value);
-  STATIC_ASSERT(offsetof(OMCache, _null_sentinel) == offsetof(OMCache, _entries) +
-                offsetof(OMCache::OMCacheEntry, _oop) +
-                OMCache::CAPACITY * in_bytes(oop_to_oop_difference()));
 }
diff --git a/src/hotspot/share/runtime/lockStack.hpp b/src/hotspot/share/runtime/lockStack.hpp
index dbc958a71e2..a32364b1774 100644
--- a/src/hotspot/share/runtime/lockStack.hpp
+++ b/src/hotspot/share/runtime/lockStack.hpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2022, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,14 +132,13 @@ class LockStack {
 class OMCache {
   friend class VMStructs;
  public:
-  static constexpr int CAPACITY = 8;
+  static constexpr int CAPACITY = 2;
 
  private:
   struct OMCacheEntry {
     oop _oop = nullptr;
     ObjectMonitor* _monitor = nullptr;
   } _entries[CAPACITY];
-  const oop _null_sentinel = nullptr;
 
  public:
   static ByteSize entries_offset() { return byte_offset_of(OMCache, _entries); }
diff --git a/src/hotspot/share/runtime/mountUnmountDisabler.cpp b/src/hotspot/share/runtime/mountUnmountDisabler.cpp
index 8635eeb2dcc..65a82d6c563 100644
--- a/src/hotspot/share/runtime/mountUnmountDisabler.cpp
+++ b/src/hotspot/share/runtime/mountUnmountDisabler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -129,7 +129,8 @@ bool MountUnmountDisabler::is_start_transition_disabled(JavaThread* thread, oop
   int base_disable_count = notify_jvmti_events() ? 1 : 0;
   return java_lang_Thread::vthread_transition_disable_count(vthread) > 0
          || global_vthread_transition_disable_count() > base_disable_count
-         JVMTI_ONLY(|| (JvmtiVTSuspender::is_vthread_suspended(java_lang_Thread::thread_id(vthread)) || thread->is_suspended()));
+         JVMTI_ONLY(|| (!thread->is_vthread_transition_disabler() &&
+                        (JvmtiVTSuspender::is_vthread_suspended(java_lang_Thread::thread_id(vthread)) || thread->is_suspended())));
 }
 
 void MountUnmountDisabler::start_transition(JavaThread* current, oop vthread, bool is_mount, bool is_thread_end) {
@@ -294,7 +295,7 @@ MountUnmountDisabler::disable_transition_for_one() {
   // carrierThread to float up.
   // This pairs with the release barrier in end_transition().
   OrderAccess::acquire();
-  DEBUG_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(true);)
+  JVMTI_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(true);)
 }
 
 // disable transitions for all virtual threads
@@ -335,7 +336,7 @@ MountUnmountDisabler::disable_transition_for_all() {
   // carrierThread to float up.
   // This pairs with the release barrier in end_transition().
   OrderAccess::acquire();
-  DEBUG_ONLY(thread->set_is_vthread_transition_disabler(true);)
+  JVMTI_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(true);)
   DEBUG_ONLY(thread->set_is_disabler_at_start(false);)
 }
 
@@ -358,14 +359,12 @@ MountUnmountDisabler::enable_transition_for_one() {
   if (java_lang_Thread::vthread_transition_disable_count(_vthread()) == 0) {
     ml.notify_all();
   }
-  DEBUG_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(false);)
+  JVMTI_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(false);)
 }
 
 // enable transitions for all virtual threads
 void
 MountUnmountDisabler::enable_transition_for_all() {
-  JavaThread* thread = JavaThread::current();
-
   // End of the critical section. If some target was unmounted, we need a
   // release barrier before decrementing _global_vthread_transition_disable_count
   // to make sure any memory operations executed by the disabler are visible to
@@ -384,7 +383,7 @@ MountUnmountDisabler::enable_transition_for_all() {
   if (global_vthread_transition_disable_count() == base_disable_count || _is_exclusive) {
     ml.notify_all();
   }
-  DEBUG_ONLY(thread->set_is_vthread_transition_disabler(false);)
+  JVMTI_ONLY(JavaThread::current()->set_is_vthread_transition_disabler(false);)
 }
 
 int MountUnmountDisabler::global_vthread_transition_disable_count() {
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 785ee2af592..8c6994c2152 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -329,22 +329,18 @@ void ObjectMonitor::set_object_strong() {
 
 void ObjectMonitor::ExitOnSuspend::operator()(JavaThread* current) {
   if (current->is_suspended()) {
+    // There could be an ongoing safepoint/handshake operation.
+    // Process them, except suspend requests, before exiting the
+    // monitor, as this may involve touching oops if the successor
+    // is a virtual thread. Before processing pending operations,
+    // set the monitor as pending again.
+    current->set_current_pending_monitor(_om);
+    SafepointMechanism::process_if_requested(current, false /*allow_suspend*/, false /*check_async_exception*/);
     _om->_recursions = 0;
     _om->clear_successor();
     // Don't need a full fence after clearing successor here because of the call to exit().
     _om->exit(current, false /* not_suspended */);
     _om_exited = true;
-
-    current->set_current_pending_monitor(_om);
-  }
-}
-
-void ObjectMonitor::ClearSuccOnSuspend::operator()(JavaThread* current) {
-  if (current->is_suspended()) {
-    if (_om->has_successor(current)) {
-      _om->clear_successor();
-      OrderAccess::fence(); // always do a full fence when successor is cleared
-    }
   }
 }
 
@@ -500,7 +496,7 @@ bool ObjectMonitor::spin_enter(JavaThread* current) {
   return false;
 }
 
-bool ObjectMonitor::enter(JavaThread* current) {
+bool ObjectMonitor::enter(JavaThread* current, bool post_jvmti_events) {
   assert(current == JavaThread::current(), "must be");
 
   if (spin_enter(current)) {
@@ -521,15 +517,15 @@ bool ObjectMonitor::enter(JavaThread* current) {
   }
 
   // At this point this ObjectMonitor cannot be deflated, finish contended enter
-  enter_with_contention_mark(current, contention_mark);
+  enter_with_contention_mark(current, contention_mark, post_jvmti_events);
   return true;
 }
 
-void ObjectMonitor::notify_contended_enter(JavaThread* current) {
+void ObjectMonitor::notify_contended_enter(JavaThread* current, bool post_jvmti_events) {
   current->set_current_pending_monitor(this);
 
   DTRACE_MONITOR_PROBE(contended__enter, this, object(), current);
-  if (JvmtiExport::should_post_monitor_contended_enter()) {
+  if (post_jvmti_events && JvmtiExport::should_post_monitor_contended_enter()) {
     JvmtiExport::post_monitor_contended_enter(current, this);
 
     // The current thread does not yet own the monitor and does not
@@ -540,7 +536,7 @@ void ObjectMonitor::notify_contended_enter(JavaThread* current) {
   }
 }
 
-void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonitorContentionMark &cm) {
+void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonitorContentionMark &cm, bool post_jvmti_events) {
   assert(current == JavaThread::current(), "must be");
   assert(!has_owner(current), "must be");
   assert(cm._monitor == this, "must be");
@@ -564,7 +560,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
   ContinuationEntry* ce = current->last_continuation();
   bool is_virtual = ce != nullptr && ce->is_virtual_thread();
   if (is_virtual) {
-    notify_contended_enter(current);
+    notify_contended_enter(current, post_jvmti_events);
     result = Continuation::try_preempt(current, ce->cont_oop(current));
     if (result == freeze_ok) {
       bool acquired = vthread_monitor_enter(current);
@@ -573,7 +569,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
         // _entry_list so cancel preemption. We will still go through the preempt stub
         // but instead of unmounting we will call thaw to continue execution.
         current->set_preemption_cancelled(true);
-        if (JvmtiExport::should_post_monitor_contended_entered()) {
+        if (post_jvmti_events && JvmtiExport::should_post_monitor_contended_entered()) {
           // We are going to call thaw again after this and finish the VMTS
           // transition so no need to do it here. We will post the event there.
           current->set_contended_entered_monitor(this);
@@ -610,7 +606,8 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
         // states will still report that the thread is blocked trying to
         // acquire it.
         // If there is a suspend request, ExitOnSuspend will exit the OM
-        // and set the OM as pending.
+        // and set the OM as pending, the thread will not be reported as
+        // having "-locked" the monitor.
       }
       if (!eos.exited()) {
         // ExitOnSuspend did not exit the OM
@@ -644,7 +641,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
   // spinning we could increment JVMStat counters, etc.
 
   DTRACE_MONITOR_PROBE(contended__entered, this, object(), current);
-  if (JvmtiExport::should_post_monitor_contended_entered()) {
+  if (post_jvmti_events && JvmtiExport::should_post_monitor_contended_entered()) {
     JvmtiExport::post_monitor_contended_entered(current, this);
 
     // The current thread already owns the monitor and is not going to
@@ -1102,11 +1099,10 @@ void ObjectMonitor::enter_internal(JavaThread* current) {
 
 void ObjectMonitor::reenter_internal(JavaThread* current, ObjectWaiter* currentNode) {
   assert(current != nullptr, "invariant");
-  assert(current->thread_state() != _thread_blocked, "invariant");
+  assert(current->thread_state() == _thread_blocked, "invariant");
   assert(currentNode != nullptr, "invariant");
   assert(currentNode->_thread == current, "invariant");
   assert(_waiters > 0, "invariant");
-  assert_mark_word_consistency();
 
   // If there are unmounted virtual threads ahead in the _entry_list we want
   // to do a timed-park instead to alleviate some deadlock cases where one
@@ -1142,22 +1138,15 @@ void ObjectMonitor::reenter_internal(JavaThread* current, ObjectWaiter* currentN
 
     {
       OSThreadContendState osts(current->osthread());
-
-      assert(current->thread_state() == _thread_in_vm, "invariant");
-
-      {
-        ClearSuccOnSuspend csos(this);
-        ThreadBlockInVMPreprocess<ClearSuccOnSuspend> tbivs(current, csos, true /* allow_suspend */);
-        if (do_timed_parked) {
-          current->_ParkEvent->park(recheck_interval);
-          // Increase the recheck_interval, but clamp the value.
-          recheck_interval *= 8;
-          if (recheck_interval > MAX_RECHECK_INTERVAL) {
-            recheck_interval = MAX_RECHECK_INTERVAL;
-          }
-        } else {
-          current->_ParkEvent->park();
+      if (do_timed_parked) {
+        current->_ParkEvent->park(recheck_interval);
+        // Increase the recheck_interval, but clamp the value.
+        recheck_interval *= 8;
+        if (recheck_interval > MAX_RECHECK_INTERVAL) {
+          recheck_interval = MAX_RECHECK_INTERVAL;
         }
+      } else {
+        current->_ParkEvent->park();
       }
     }
 
@@ -1184,7 +1173,6 @@ void ObjectMonitor::reenter_internal(JavaThread* current, ObjectWaiter* currentN
 
   // Current has acquired the lock -- Unlink current from the _entry_list.
   assert(has_owner(current), "invariant");
-  assert_mark_word_consistency();
   unlink_after_acquire(current, currentNode);
   if (has_successor(current)) clear_successor();
   assert(!has_successor(current), "invariant");
@@ -1661,6 +1649,7 @@ void ObjectMonitor::exit_epilog(JavaThread* current, ObjectWaiter* Wakee) {
     Trigger = t->_ParkEvent;
     set_successor(t);
   } else {
+    assert_not_at_safepoint();
     vthread = Wakee->vthread();
     assert(vthread != nullptr, "");
     Trigger = ObjectMonitor::vthread_unparker_ParkEvent();
@@ -1883,7 +1872,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
   //   while (!timeout && !interrupted && node.TState == TS_WAIT) park()
 
   int ret = OS_OK;
-  bool was_notified = false;
+  bool was_notified = true;
 
   // Need to check interrupt state whilst still _thread_in_vm
   bool interrupted = interruptible && current->is_interrupted(false);
@@ -1895,8 +1884,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     assert(current->thread_state() == _thread_in_vm, "invariant");
 
     {
-      ClearSuccOnSuspend csos(this);
-      ThreadBlockInVMPreprocess<ClearSuccOnSuspend> tbivs(current, csos, true /* allow_suspend */);
+      ThreadBlockInVM tbivm(current, false /* allow_suspend */);
       if (interrupted || HAS_PENDING_EXCEPTION) {
         // Intentionally empty
       } else if (node.TState == ObjectWaiter::TS_WAIT) {
@@ -1928,17 +1916,16 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       if (node.TState == ObjectWaiter::TS_WAIT) {
         dequeue_specific_waiter(&node);       // unlink from wait_set
         node.TState = ObjectWaiter::TS_RUN;
+        was_notified = false;
       }
     }
-
-    // The thread is now either on off-list (TS_RUN),
+    // The thread is now either off-list (TS_RUN),
     // or on the entry_list (TS_ENTER).
     // The Node's TState variable is stable from the perspective of this thread.
     // No other threads will asynchronously modify TState.
     guarantee(node.TState != ObjectWaiter::TS_WAIT, "invariant");
     OrderAccess::loadload();
     if (has_successor(current)) clear_successor();
-    was_notified = node.TState == ObjectWaiter::TS_ENTER;
 
     // Reentry phase -- reacquire the monitor.
     // re-enter contended monitor after object.wait().
@@ -1947,27 +1934,19 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     // although the raw address of the object may have changed.
     // (Don't cache naked oops over safepoints, of course).
 
-    // post monitor waited event. Note that this is past-tense, we are done waiting.
-    if (JvmtiExport::should_post_monitor_waited()) {
-      JvmtiExport::post_monitor_waited(current, this, ret == OS_TIMEOUT);
+    // Post monitor waited event. Note that this is past-tense, we are done waiting.
+    // An event could have been enabled after notification, in this case
+    // a thread will have TS_ENTER state and posting the event may hit a suspension point.
+    // From a debugging perspective, it is more important to have no missing events.
+    if (interruptible && JvmtiExport::should_post_monitor_waited() && node.TState != ObjectWaiter::TS_ENTER) {
 
-      if (was_notified && has_successor(current)) {
-        // In this part of the monitor wait-notify-reenter protocol it
-        // is possible (and normal) for another thread to do a fastpath
-        // monitor enter-exit while this thread is still trying to get
-        // to the reenter portion of the protocol.
-        //
-        // The ObjectMonitor was notified and the current thread is
-        // the successor which also means that an unpark() has already
-        // been done. The JVMTI_EVENT_MONITOR_WAITED event handler can
-        // consume the unpark() that was done when the successor was
-        // set because the same ParkEvent is shared between Java
-        // monitors and JVM/TI RawMonitors (for now).
-        //
-        // We redo the unpark() to ensure forward progress, i.e., we
-        // don't want all pending threads hanging (parked) with none
-        // entering the unlocked monitor.
-        current->_ParkEvent->unpark();
+      // Process suspend requests now if any, before posting the event.
+      {
+        ThreadBlockInVM tbvm(current, true);
+      }
+      // Re-check the condition as the monitor waited events can be disabled whilst thread was suspended.
+      if (JvmtiExport::should_post_monitor_waited()) {
+        JvmtiExport::post_monitor_waited(current, this, ret == OS_TIMEOUT);
       }
     }
 
@@ -1986,8 +1965,30 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       NoPreemptMark npm(current);
       enter(current);
     } else {
+      // This means the thread has been un-parked and added to the entry_list
+      // in notify_internal, i.e. notified while waiting.
       guarantee(v == ObjectWaiter::TS_ENTER, "invariant");
-      reenter_internal(current, &node);
+      ExitOnSuspend eos(this);
+      {
+        ThreadBlockInVMPreprocess<ExitOnSuspend> tbivs(current, eos, true /* allow_suspend */);
+        reenter_internal(current, &node);
+        // We can go to a safepoint at the end of this block. If we
+        // do a thread dump during that safepoint, then this thread will show
+        // as having "-locked" the monitor, but the OS and java.lang.Thread
+        // states will still report that the thread is blocked trying to
+        // acquire it.
+        // If there is a suspend request, ExitOnSuspend will exit the OM
+        // and set the OM as pending, the thread will not be reported as
+        // having "-locked" the monitor.
+      }
+      if (eos.exited()) {
+        // ExitOnSuspend exit the OM
+        assert(!has_owner(current), "invariant");
+        guarantee(node.TState == ObjectWaiter::TS_RUN, "invariant");
+        current->set_current_pending_monitor(nullptr);
+        enter(current, false /* post_jvmti_events */);
+      }
+      assert(has_owner(current), "invariant");
       node.wait_reenter_end(this);
     }
 
@@ -2041,6 +2042,8 @@ bool ObjectMonitor::notify_internal(JavaThread* current) {
   ObjectWaiter* iterator = dequeue_waiter();
   if (iterator != nullptr) {
     guarantee(iterator->TState == ObjectWaiter::TS_WAIT, "invariant");
+    iterator->_notifier_tid = JFR_THREAD_ID(current);
+    did_notify = true;
 
     if (iterator->is_vthread()) {
       oop vthread = iterator->vthread();
@@ -2056,45 +2059,55 @@ bool ObjectMonitor::notify_internal(JavaThread* current) {
           old_state == java_lang_VirtualThread::TIMED_WAIT) {
         java_lang_VirtualThread::cmpxchg_state(vthread, old_state, java_lang_VirtualThread::BLOCKED);
       }
-      // Increment counter *before* adding the vthread to the _entry_list.
-      // Adding to _entry_list uses Atomic::cmpxchg() which already provides
-      // a fence that prevents reordering of the stores.
-      inc_unmounted_vthreads();
+      if (!JvmtiExport::should_post_monitor_waited()) {
+        // Increment counter *before* adding the vthread to the _entry_list.
+        // Adding to _entry_list uses Atomic::cmpxchg() which already provides
+        // a fence that prevents reordering of the stores.
+        inc_unmounted_vthreads();
+        add_to_entry_list(current, iterator);
+      } else {
+        iterator->TState = ObjectWaiter::TS_RUN;
+        if (java_lang_VirtualThread::set_onWaitingList(vthread, vthread_list_head())) {
+          ParkEvent* pe = ObjectMonitor::vthread_unparker_ParkEvent();
+          pe->unpark();
+        }
+      }
+    } else {
+      if (!JvmtiExport::should_post_monitor_waited()) {
+        add_to_entry_list(current, iterator);
+        // Read counter *after* adding the thread to the _entry_list.
+        // Adding to _entry_list uses Atomic::cmpxchg() which already provides
+        // a fence that prevents this load from floating up previous store.
+        if (has_unmounted_vthreads()) {
+          // Wake up the thread to alleviate some deadlock cases where the successor
+          // that will be picked up when this thread releases the monitor is an unmounted
+          // virtual thread that cannot run due to having run out of carriers. Upon waking
+          // up, the thread will call reenter_internal() which will use timed-park in case
+          // there is contention and there are still vthreads in the _entry_list.
+          // If the target was interrupted or the wait timed-out at the same time, it could
+          // have reached reenter_internal and read a false value of has_unmounted_vthreads()
+          // before we added it to the _entry_list above. To deal with that case, we set _do_timed_park
+          // which will be read by the target on the next loop iteration in reenter_internal.
+          iterator->_do_timed_park = true;
+          JavaThread* t = iterator->thread();
+          t->_ParkEvent->unpark();
+        }
+        iterator->wait_reenter_begin(this);
+      } else {
+        iterator->TState = ObjectWaiter::TS_RUN;
+        JavaThread* t = iterator->thread();
+        assert(t != nullptr, "");
+        t->_ParkEvent->unpark();
+      }
     }
 
-    iterator->_notifier_tid = JFR_THREAD_ID(current);
-    did_notify = true;
-    add_to_entry_list(current, iterator);
-
     // _wait_set_lock protects the wait queue, not the entry_list.  We could
     // move the add-to-entry_list operation, above, outside the critical section
     // protected by _wait_set_lock.  In practice that's not useful.  With the
-    // exception of  wait() timeouts and interrupts the monitor owner
+    // exception of wait() timeouts and interrupts the monitor owner
     // is the only thread that grabs _wait_set_lock.  There's almost no contention
     // on _wait_set_lock so it's not profitable to reduce the length of the
     // critical section.
-
-    if (!iterator->is_vthread()) {
-      iterator->wait_reenter_begin(this);
-
-      // Read counter *after* adding the thread to the _entry_list.
-      // Adding to _entry_list uses Atomic::cmpxchg() which already provides
-      // a fence that prevents this load from floating up previous store.
-      if (has_unmounted_vthreads()) {
-        // Wake up the thread to alleviate some deadlock cases where the successor
-        // that will be picked up when this thread releases the monitor is an unmounted
-        // virtual thread that cannot run due to having run out of carriers. Upon waking
-        // up, the thread will call reenter_internal() which will use timed-park in case
-        // there is contention and there are still vthreads in the _entry_list.
-        // If the target was interrupted or the wait timed-out at the same time, it could
-        // have reached reenter_internal and read a false value of has_unmounted_vthreads()
-        // before we added it to the _entry_list above. To deal with that case, we set _do_timed_park
-        // which will be read by the target on the next loop iteration in reenter_internal.
-        iterator->_do_timed_park = true;
-        JavaThread* t = iterator->thread();
-        t->_ParkEvent->unpark();
-      }
-    }
   }
   return did_notify;
 }
@@ -2221,19 +2234,22 @@ bool ObjectMonitor::vthread_wait_reenter(JavaThread* current, ObjectWaiter* node
   // The first time we run after being preempted on Object.wait() we
   // need to check if we were interrupted or the wait timed-out, and
   // in that case remove ourselves from the _wait_set queue.
+  bool was_notified = true;
   if (node->TState == ObjectWaiter::TS_WAIT) {
     SpinCriticalSection scs(&_wait_set_lock);
     if (node->TState == ObjectWaiter::TS_WAIT) {
       dequeue_specific_waiter(node);       // unlink from wait_set
       node->TState = ObjectWaiter::TS_RUN;
+      was_notified = false;
     }
   }
 
   // If this was an interrupted case, set the _interrupted boolean so that
   // once we re-acquire the monitor we know if we need to throw IE or not.
   ObjectWaiter::TStates state = node->TState;
-  bool was_notified = state == ObjectWaiter::TS_ENTER;
-  assert(was_notified || state == ObjectWaiter::TS_RUN, "");
+  assert(was_notified || state == ObjectWaiter::TS_RUN,
+         "was not notified and is not in the right state: state = %s",
+         node->getTStateName(state));
   node->_interrupted = node->_interruptible && !was_notified && current->is_interrupted(false);
 
   // Post JFR and JVMTI events. If non-interruptible we are in
@@ -2246,7 +2262,10 @@ bool ObjectMonitor::vthread_wait_reenter(JavaThread* current, ObjectWaiter* node
   // Mark that we are at reenter so that we don't call this method again.
   node->_at_reenter = true;
 
-  if (!was_notified) {
+  // We check the state rather than was_notified because, when JVMTI
+  // monitor_waited event is enabled, the notifier only unparks the waiter
+  // without adding it to the entry_list.
+  if (state == ObjectWaiter::TS_RUN) {
     bool acquired = vthread_monitor_enter(current, node);
     if (acquired) {
       guarantee(_recursions == 0, "invariant");
@@ -2537,6 +2556,23 @@ ObjectWaiter::ObjectWaiter(JavaThread* current) {
   _active   = false;
 }
 
+const char* ObjectWaiter::getTStateName(ObjectWaiter::TStates state) {
+  switch (state) {
+  case ObjectWaiter::TS_UNDEF:
+    return "TS_UNDEF";
+  case ObjectWaiter::TS_READY:
+    return "TS_READY";
+  case ObjectWaiter::TS_RUN:
+    return "TS_RUN";
+  case ObjectWaiter::TS_WAIT:
+    return "TS_WAIT";
+  case ObjectWaiter::TS_ENTER:
+    return "TS_ENTER";
+  default:
+    ShouldNotReachHere();
+  }
+}
+
 ObjectWaiter::ObjectWaiter(oop vthread, ObjectMonitor* mon) : ObjectWaiter(nullptr) {
   assert(oopDesc::is_oop(vthread), "");
   _vthread = OopHandle(JavaThread::thread_oop_storage(), vthread);
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 53b64f1e8a5..8d9a481bf37 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ class ParkEvent;
 class BasicLock;
 class ContinuationWrapper;
 
-
 class ObjectWaiter : public CHeapObj<mtThread> {
  public:
   enum TStates : uint8_t { TS_UNDEF, TS_READY, TS_RUN, TS_WAIT, TS_ENTER };
@@ -72,7 +71,7 @@ class ObjectWaiter : public CHeapObj<mtThread> {
   oop vthread() const;
   void wait_reenter_begin(ObjectMonitor *mon);
   void wait_reenter_end(ObjectMonitor *mon);
-
+  const char* getTStateName(TStates state);
   void set_bad_pointers() {
 #ifdef ASSERT
     this->_prev  = (ObjectWaiter*) badAddressVal;
@@ -218,6 +217,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
   static int Knob_SpinLimit;
 
+  static ByteSize object_offset()      { return byte_offset_of(ObjectMonitor, _object); }
   static ByteSize metadata_offset()    { return byte_offset_of(ObjectMonitor, _metadata); }
   static ByteSize owner_offset()       { return byte_offset_of(ObjectMonitor, _owner); }
   static ByteSize recursions_offset()  { return byte_offset_of(ObjectMonitor, _recursions); }
@@ -352,7 +352,6 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   // returns false and throws IllegalMonitorStateException (IMSE).
   bool      check_owner(TRAPS);
 
- private:
   class ExitOnSuspend {
    protected:
     ObjectMonitor* _om;
@@ -362,23 +361,16 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
     void operator()(JavaThread* current);
     bool exited() { return _om_exited; }
   };
-  class ClearSuccOnSuspend {
-   protected:
-    ObjectMonitor* _om;
-   public:
-    ClearSuccOnSuspend(ObjectMonitor* om) : _om(om)  {}
-    void operator()(JavaThread* current);
-  };
 
   bool      enter_is_async_deflating();
-  void      notify_contended_enter(JavaThread *current);
+  void      notify_contended_enter(JavaThread *current, bool post_jvmti_events = true);
  public:
   void      enter_for_with_contention_mark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark);
   bool      enter_for(JavaThread* locking_thread);
-  bool      enter(JavaThread* current);
+  bool      enter(JavaThread* current, bool post_jvmti_events = true);
   bool      try_enter(JavaThread* current, bool check_for_recursion = true);
   bool      spin_enter(JavaThread* current);
-  void      enter_with_contention_mark(JavaThread* current, ObjectMonitorContentionMark& contention_mark);
+  void      enter_with_contention_mark(JavaThread* current, ObjectMonitorContentionMark& contention_mark, bool post_jvmti_events = true);
   void      exit(JavaThread* current, bool not_suspended = true);
   bool      resume_operation(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont);
   void      wait(jlong millis, bool interruptible, TRAPS);
diff --git a/src/hotspot/share/runtime/objectMonitorTable.cpp b/src/hotspot/share/runtime/objectMonitorTable.cpp
index 9b522720a28..767f5de6897 100644
--- a/src/hotspot/share/runtime/objectMonitorTable.cpp
+++ b/src/hotspot/share/runtime/objectMonitorTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,278 +31,634 @@
 #include "runtime/thread.hpp"
 #include "runtime/timerTrace.hpp"
 #include "runtime/trimNativeHeap.hpp"
-#include "utilities/concurrentHashTableTasks.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // -----------------------------------------------------------------------------
-// ConcurrentHashTable storing links from objects to ObjectMonitors
+// Theory of operations -- Object Monitor Table:
+//
+// The OMT (Object Monitor Table) is a concurrent hash table specifically
+// designed so that it (in the normal case) can be searched from C2 generated
+// code.
+//
+// In its simplest form it consists of:
+//  1. An array of pointers.
+//  2. The size (capacity) of the array, which is always a power of two.
+//
+// When you want to find a monitor associated with an object, you extract the
+// hash value of the object. Then calculate an index by taking the hash value
+// and bit-wise AND it with the capacity mask (e.g. size-1) of the OMT. Now
+// use that index into the OMT's array of pointers. If the pointer is non
+// null, check if it's a monitor pointer that is associated with the object.
+// If so you're done. If the pointer is non null, but associated with another
+// object, you start looking at (index+1), (index+2) and so on, until you
+// either find the correct monitor, or a null pointer. Finding a null pointer
+// means that the monitor is simply not in the OMT.
+//
+// If the size of the pointer array is significantly larger than the number of
+// pointers in it, the chance of finding the monitor in the hash index
+// (without any further linear searching) is quite high. It is also straight
+// forward to generate C2 code for this, which for the fast path doesn't
+// contain any branching at all. See: C2_MacroAssembler::fast_lock().
+//
+// When the number of monitors (pointers in the array) reaches above the
+// allowed limit (defined by the GROW_LOAD_FACTOR symbol) we need to grow the
+// table.
+//
+// A simple description of how growing the OMT is done, is to say that we
+// allocate a new table (twice as large as the old one), and then copy all the
+// old monitor pointers from the old table to the new.
+//
+// But since the OMT is a concurrent hash table and things needs to work for
+// other clients of the OMT while we grow it, it's gets a bit more
+// complicated.
+//
+// Both the new and (potentially several) old table(s) may exist at the same
+// time. The newest is always called the "current", and the older ones are
+// singly linked using a "prev" pointer.
+//
+// As soon as we have allocated and linked in the new "current" OMT, all new
+// monitor pointers will be added to the new table. Effectively making the
+// atomic switch from "old current" to "new current" a linearization point.
+//
+// After that we start to go through all the indexes in the old table. If the
+// index is empty (the pointer is null) we put a "tombstone" into that index,
+// which will prevent any future concurrent insert ending up in that index.
+//
+// If the index contains a monitor pointer, we insert that monitor pointer
+// into the OMT which can be considered as one generation newer. If the index
+// contains a "removed" pointer, we just ignore it.
+//
+// We use special pointer values for "tombstone" and "removed". Any pointer
+// that is not null, not a tombstone and not removed, is considered to be a
+// pointer to a monitor.
+//
+// When all the monitor pointers from an old OMT has been transferred to the
+// new OMT, the old table is unlinked.
+//
+// This copying from an old OMT to one generation newer OMT, will continue
+// until all the monitor pointers from old OMTs has been transferred to the
+// newest "current" OMT.
+//
+// The memory for old, unlinked OMTs will be freed after a thread-local
+// handshake with all Java threads.
+//
+// Searching the OMT for a monitor pointer while there are several generations
+// of the OMT, will start from the oldest OMT.
+//
+// A note about the GROW_LOAD_FACTOR: In order to guarantee that the add and
+// search algorithms can't loop forever, we must make sure that there is at
+// least one null pointer in the array to stop them from dead looping.
+// Furthermore, when we grow the OMT, we must make sure that the new "current"
+// can accommodate all the monitors from all older OMTs, while still being so
+// sparsely populated that the C2 generated code will likely find what it's
+// searching for at the hash index, without needing further linear searching.
+// The grow load factor is set to 12.5%, which satisfies the above
+// requirements. Don't change it for fun, it might backfire.
+// -----------------------------------------------------------------------------
 
-using ConcurrentTable = ConcurrentHashTable<ObjectMonitorTableConfig, mtObjectMonitor>;
+ObjectMonitorTable::Table* volatile ObjectMonitorTable::_curr;
 
-static ConcurrentTable* _table = nullptr;
-static volatile size_t _items_count = 0;
-static size_t _table_size = 0;
-static volatile bool _resize = false;
+class ObjectMonitorTable::Table : public CHeapObj<mtObjectMonitor> {
+  friend class ObjectMonitorTable;
 
-class ObjectMonitorTableConfig : public AllStatic {
- public:
-  using Value = ObjectMonitor*;
-  static uintx get_hash(Value const& value, bool* is_dead) {
-    return (uintx)value->hash();
+  DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE, 0);
+  const size_t _capacity_mask;       // One less than its power-of-two capacity
+  Table* volatile _prev;             // Set while rehashing
+  Entry volatile* _buckets;          // The payload
+  DEFINE_PAD_MINUS_SIZE(1, DEFAULT_CACHE_LINE_SIZE, sizeof(_capacity_mask) + sizeof(_prev) + sizeof(_buckets));
+  volatile size_t _items_count;
+  DEFINE_PAD_MINUS_SIZE(2, DEFAULT_CACHE_LINE_SIZE, sizeof(_items_count));
+
+  static Entry as_entry(ObjectMonitor* monitor) {
+    Entry entry = static_cast<Entry>((uintptr_t)monitor);
+    assert(entry >= Entry::below_is_special, "Must be! (entry: " PTR_FORMAT ")", intptr_t(entry));
+    return entry;
   }
-  static void* allocate_node(void* context, size_t size, Value const& value) {
-    ObjectMonitorTable::inc_items_count();
-    return AllocateHeap(size, mtObjectMonitor);
-  };
-  static void free_node(void* context, void* memory, Value const& value) {
-    ObjectMonitorTable::dec_items_count();
-    FreeHeap(memory);
+
+  static ObjectMonitor* as_monitor(Entry entry) {
+    assert(entry >= Entry::below_is_special, "Must be! (entry: " PTR_FORMAT ")", intptr_t(entry));
+    return reinterpret_cast<ObjectMonitor*>(entry);
+  }
+
+  static Entry empty() {
+    return Entry::empty;
+  }
+
+  static Entry tombstone() {
+    return Entry::tombstone;
+  }
+
+  static Entry removed() {
+    return Entry::removed;
+  }
+
+  // Make sure we leave space for previous versions to relocate too.
+  bool try_inc_items_count() {
+    for (;;) {
+      size_t population = AtomicAccess::load(&_items_count);
+      if (should_grow(population)) {
+        return false;
+      }
+      if (AtomicAccess::cmpxchg(&_items_count, population, population + 1, memory_order_relaxed) == population) {
+        return true;
+      }
+    }
+  }
+
+  double get_load_factor(size_t count) {
+    return (double)count / (double)capacity();
+  }
+
+  void inc_items_count() {
+    AtomicAccess::inc(&_items_count, memory_order_relaxed);
+  }
+
+  void dec_items_count() {
+    AtomicAccess::dec(&_items_count, memory_order_relaxed);
+  }
+
+public:
+  Table(size_t capacity, Table* prev)
+    : _capacity_mask(capacity - 1),
+      _prev(prev),
+      _buckets(NEW_C_HEAP_ARRAY(Entry, capacity, mtObjectMonitor)),
+      _items_count(0)
+  {
+    for (size_t i = 0; i < capacity; ++i) {
+      _buckets[i] = empty();
+    }
+  }
+
+  ~Table() {
+    FREE_C_HEAP_ARRAY(Entry, _buckets);
+  }
+
+  Table* prev() {
+    return AtomicAccess::load(&_prev);
+  }
+
+  size_t capacity() {
+    return _capacity_mask + 1;
+  }
+
+  bool should_grow(size_t population) {
+    return get_load_factor(population) > GROW_LOAD_FACTOR;
+  }
+
+  bool should_grow() {
+    return should_grow(AtomicAccess::load(&_items_count));
+  }
+
+  size_t total_items() {
+    size_t current_items = AtomicAccess::load(&_items_count);
+    Table* prev = AtomicAccess::load(&_prev);
+    if (prev != nullptr) {
+      return prev->total_items() + current_items;
+    }
+    return current_items;
+  }
+
+  ObjectMonitor* get(oop obj, intptr_t hash) {
+    // Acquire tombstones and relocations in case prev transitioned to null
+    Table* prev = AtomicAccess::load_acquire(&_prev);
+    if (prev != nullptr) {
+      ObjectMonitor* result = prev->get(obj, hash);
+      if (result != nullptr) {
+        return result;
+      }
+    }
+
+    const size_t start_index = size_t(hash) & _capacity_mask;
+    size_t index = start_index;
+
+    for (;;) {
+      Entry volatile* bucket = _buckets + index;
+      Entry entry = AtomicAccess::load_acquire(bucket);
+
+      if (entry == tombstone() || entry == empty()) {
+        // Not found
+        break;
+      }
+
+      if (entry != removed() && as_monitor(entry)->object_peek() == obj) {
+        // Found matching monitor.
+        return as_monitor(entry);
+      }
+
+      index = (index + 1) & _capacity_mask;
+      assert(index != start_index, "invariant");
+    }
+
+    // Rehashing could have started by now, but if a monitor has been inserted in a
+    // newer table, it was inserted after the get linearization point.
+    return nullptr;
+  }
+
+  ObjectMonitor* prepare_insert(oop obj, intptr_t hash) {
+    // Acquire any tomb stones and relocations if prev transitioned to null.
+    Table* prev = AtomicAccess::load_acquire(&_prev);
+    if (prev != nullptr) {
+      ObjectMonitor* result = prev->prepare_insert(obj, hash);
+      if (result != nullptr) {
+        return result;
+      }
+    }
+
+    const size_t start_index = size_t(hash) & _capacity_mask;
+    size_t index = start_index;
+
+    for (;;) {
+      Entry volatile* bucket = _buckets + index;
+      Entry entry = AtomicAccess::load_acquire(bucket);
+
+      if (entry == empty()) {
+        // Found an empty slot to install the new monitor in.
+        // To avoid concurrent inserts succeeding, place a tomb stone here.
+        Entry result = AtomicAccess::cmpxchg(bucket, entry, tombstone(), memory_order_relaxed);
+        if (result == entry) {
+          // Success! Nobody will try to insert here again, except reinsert from rehashing.
+          return nullptr;
+        }
+        entry = result;
+      }
+
+      if (entry == tombstone()) {
+        // Can't insert into this table.
+        return nullptr;
+      }
+
+      if (entry != removed() && as_monitor(entry)->object_peek() == obj) {
+        // Found matching monitor.
+        return as_monitor(entry);
+      }
+
+      index = (index + 1) & _capacity_mask;
+      assert(index != start_index, "invariant");
+    }
+  }
+
+  ObjectMonitor* get_set(oop obj, Entry new_monitor, intptr_t hash) {
+    // Acquire any tombstones and relocations if prev transitioned to null.
+    Table* prev = AtomicAccess::load_acquire(&_prev);
+    if (prev != nullptr) {
+      // Sprinkle tombstones in previous tables to force concurrent inserters
+      // to the latest table. We only really want to try inserting in the
+      // latest table.
+      ObjectMonitor* result = prev->prepare_insert(obj, hash);
+      if (result != nullptr) {
+        return result;
+      }
+    }
+
+    const size_t start_index = size_t(hash) & _capacity_mask;
+    size_t index = start_index;
+
+    for (;;) {
+      Entry volatile* bucket = _buckets + index;
+      Entry entry = AtomicAccess::load_acquire(bucket);
+
+      if (entry == empty()) {
+        // Empty slot to install the new monitor
+        if (try_inc_items_count()) {
+          // Succeeding in claiming an item.
+          Entry result = AtomicAccess::cmpxchg(bucket, entry, new_monitor, memory_order_acq_rel);
+          if (result == entry) {
+            // Success - already incremented.
+            return as_monitor(new_monitor);
+          }
+
+          // Something else was installed in place.
+          dec_items_count();
+          entry = result;
+        } else {
+          // Out of allowance; leaving place for rehashing to succeed.
+          // To avoid concurrent inserts succeeding, place a tombstone here.
+          Entry result = AtomicAccess::cmpxchg(bucket, entry, tombstone(), memory_order_acq_rel);
+          if (result == entry) {
+            // Success; nobody will try to insert here again, except reinsert from rehashing.
+            return nullptr;
+          }
+          entry = result;
+        }
+      }
+
+      if (entry == tombstone()) {
+        // Can't insert into this table.
+        return nullptr;
+      }
+
+      if (entry != removed() && as_monitor(entry)->object_peek() == obj) {
+        // Found matching monitor.
+        return as_monitor(entry);
+      }
+
+      index = (index + 1) & _capacity_mask;
+      assert(index != start_index, "invariant");
+    }
+  }
+
+  void remove(oop obj, Entry old_monitor, intptr_t hash) {
+    assert(old_monitor >= Entry::below_is_special,
+           "Must be! (old_monitor: " PTR_FORMAT ")", intptr_t(old_monitor));
+
+    const size_t start_index = size_t(hash) & _capacity_mask;
+    size_t index = start_index;
+
+    for (;;) {
+      Entry volatile* bucket = _buckets + index;
+      Entry entry = AtomicAccess::load_acquire(bucket);
+
+      if (entry == empty()) {
+        // The monitor does not exist in this table.
+        break;
+      }
+
+      if (entry == tombstone()) {
+        // Stop searching at tombstones.
+        break;
+      }
+
+      if (entry == old_monitor) {
+        // Found matching entry; remove it
+        Entry result = AtomicAccess::cmpxchg(bucket, entry, removed(), memory_order_relaxed);
+        assert(result == entry, "should not fail");
+        break;
+      }
+
+      index = (index + 1) & _capacity_mask;
+      assert(index != start_index, "invariant");
+    }
+
+    // Old versions are removed after newer versions to ensure that observing
+    // the monitor removed and then doing a subsequent lookup results in there
+    // still not being a monitor, instead of flickering back to being there.
+    // Only the deflation thread rebuilds and unlinks tables, so we do not need
+    // any concurrency safe prev read below.
+    if (_prev != nullptr) {
+      _prev->remove(obj, old_monitor, hash);
+    }
+  }
+
+  void reinsert(oop obj, Entry new_monitor) {
+    intptr_t hash = obj->mark().hash();
+
+    const size_t start_index = size_t(hash) & _capacity_mask;
+    size_t index = start_index;
+
+    for (;;) {
+      Entry volatile* bucket = _buckets + index;
+      Entry entry = AtomicAccess::load_acquire(bucket);
+
+      if (entry == empty()) {
+        // Empty slot to install the new monitor.
+        Entry result = AtomicAccess::cmpxchg(bucket, entry, new_monitor, memory_order_acq_rel);
+        if (result == entry) {
+          // Success - unconditionally increment.
+          inc_items_count();
+          return;
+        }
+
+        // Another monitor was installed.
+        entry = result;
+      }
+
+      if (entry == tombstone()) {
+        // A concurrent inserter did not get enough allowance in the table.
+        // But reinsert always succeeds - we will take the spot.
+        Entry result = AtomicAccess::cmpxchg(bucket, entry, new_monitor, memory_order_acq_rel);
+        if (result == entry) {
+          // Success - unconditionally increment.
+          inc_items_count();
+          return;
+        }
+
+        // Another monitor was installed.
+        entry = result;
+      }
+
+      if (entry == removed()) {
+        // A removed entry can be flipped back with reinsertion.
+        Entry result = AtomicAccess::cmpxchg(bucket, entry, new_monitor, memory_order_release);
+        if (result == entry) {
+          // Success - but don't increment; the initial entry did that for us.
+          return;
+        }
+
+        // Another monitor was installed.
+        entry = result;
+      }
+
+      assert(entry != empty(), "invariant");
+      assert(entry != tombstone(), "invariant");
+      assert(entry != removed(), "invariant");
+      assert(as_monitor(entry)->object_peek() != obj, "invariant");
+      index = (index + 1) & _capacity_mask;
+      assert(index != start_index, "invariant");
+    }
+  }
+
+  void rebuild() {
+    Table* prev = _prev;
+    if (prev == nullptr) {
+      // Base case for recursion - no previous version.
+      return;
+    }
+
+    // Finish rebuilding up to prev as target so we can use prev as source.
+    prev->rebuild();
+
+    JavaThread* current = JavaThread::current();
+
+    // Relocate entries from prev.
+    for (size_t index = 0; index <= prev->_capacity_mask; index++) {
+      if ((index & 127) == 0) {
+        // Poll for safepoints to improve time to safepoint
+        ThreadBlockInVM tbivm(current);
+      }
+
+      Entry volatile* bucket = prev->_buckets + index;
+      Entry entry = AtomicAccess::load_acquire(bucket);
+
+      if (entry == empty()) {
+        // Empty slot; put a tombstone there.
+        Entry result = AtomicAccess::cmpxchg(bucket, entry, tombstone(), memory_order_acq_rel);
+        if (result == empty()) {
+          // Success; move to next entry.
+          continue;
+        }
+
+        // Concurrent insert; relocate.
+        entry = result;
+      }
+
+      if (entry != tombstone() && entry != removed()) {
+        // A monitor
+        ObjectMonitor* monitor = as_monitor(entry);
+        oop obj = monitor->object_peek();
+        if (obj != nullptr) {
+          // In the current implementation the deflation thread drives
+          // the rebuilding, and it will already have removed any entry
+          // it has deflated. The assert is only here to make sure.
+          assert(!monitor->is_being_async_deflated(), "Should be");
+          // Re-insert still live monitor.
+          reinsert(obj, entry);
+        }
+      }
+    }
+
+    // Unlink this table, releasing the tombstones and relocations.
+    AtomicAccess::release_store(&_prev, (Table*)nullptr);
   }
 };
 
-class Lookup : public StackObj {
-  oop _obj;
-
- public:
-  explicit Lookup(oop obj) : _obj(obj) {}
-
-  uintx get_hash() const {
-    uintx hash = _obj->mark().hash();
-    assert(hash != 0, "should have a hash");
-    return hash;
-  }
-
-  bool equals(ObjectMonitor** value) {
-    assert(*value != nullptr, "must be");
-    return (*value)->object_refers_to(_obj);
-  }
-
-  bool is_dead(ObjectMonitor** value) {
-    assert(*value != nullptr, "must be");
-    return false;
-  }
-};
-
-class LookupMonitor : public StackObj {
-  ObjectMonitor* _monitor;
-
- public:
-  explicit LookupMonitor(ObjectMonitor* monitor) : _monitor(monitor) {}
-
-  uintx get_hash() const {
-    return _monitor->hash();
-  }
-
-  bool equals(ObjectMonitor** value) {
-    return (*value) == _monitor;
-  }
-
-  bool is_dead(ObjectMonitor** value) {
-    assert(*value != nullptr, "must be");
-    return (*value)->object_is_dead();
-  }
-};
-
-void ObjectMonitorTable::inc_items_count() {
-  AtomicAccess::inc(&_items_count, memory_order_relaxed);
-}
-
-void ObjectMonitorTable::dec_items_count() {
-  AtomicAccess::dec(&_items_count, memory_order_relaxed);
-}
-
-double ObjectMonitorTable::get_load_factor() {
-  size_t count = AtomicAccess::load(&_items_count);
-  return (double)count / (double)_table_size;
-}
-
-size_t ObjectMonitorTable::table_size(Thread* current) {
-  return ((size_t)1) << _table->get_size_log2(current);
-}
-
-size_t ObjectMonitorTable::max_log_size() {
-  // TODO[OMTable]: Evaluate the max size.
-  // TODO[OMTable]: Need to fix init order to use Universe::heap()->max_capacity();
-  //                Using MaxHeapSize directly this early may be wrong, and there
-  //                are definitely rounding errors (alignment).
-  const size_t max_capacity = MaxHeapSize;
-  const size_t min_object_size = CollectedHeap::min_dummy_object_size() * HeapWordSize;
-  const size_t max_objects = max_capacity / MAX2(MinObjAlignmentInBytes, checked_cast<int>(min_object_size));
-  const size_t log_max_objects = log2i_graceful(max_objects);
-
-  return MAX2(MIN2<size_t>(SIZE_BIG_LOG2, log_max_objects), min_log_size());
-}
-
-// ~= log(AvgMonitorsPerThreadEstimate default)
-size_t ObjectMonitorTable::min_log_size() {
-  return 10;
-}
-
-template<typename V>
-size_t ObjectMonitorTable::clamp_log_size(V log_size) {
-  return MAX2(MIN2(log_size, checked_cast<V>(max_log_size())), checked_cast<V>(min_log_size()));
-}
-
-size_t ObjectMonitorTable::initial_log_size() {
-  const size_t estimate = log2i(MAX2(os::processor_count(), 1)) + log2i(MAX2(AvgMonitorsPerThreadEstimate, size_t(1)));
-  return clamp_log_size(estimate);
-}
-
-size_t ObjectMonitorTable::grow_hint() {
-  return ConcurrentTable::DEFAULT_GROW_HINT;
-}
-
 void ObjectMonitorTable::create() {
-  _table = new ConcurrentTable(initial_log_size(), max_log_size(), grow_hint());
-  _items_count = 0;
-  _table_size = table_size(Thread::current());
-  _resize = false;
-}
-
-void ObjectMonitorTable::verify_monitor_get_result(oop obj, ObjectMonitor* monitor) {
-#ifdef ASSERT
-  if (SafepointSynchronize::is_at_safepoint()) {
-    bool has_monitor = obj->mark().has_monitor();
-    assert(has_monitor == (monitor != nullptr),
-           "Inconsistency between markWord and ObjectMonitorTable has_monitor: %s monitor: " PTR_FORMAT,
-           BOOL_TO_STR(has_monitor), p2i(monitor));
-  }
-#endif
+  _curr = new Table(128, nullptr);
 }
 
 ObjectMonitor* ObjectMonitorTable::monitor_get(Thread* current, oop obj) {
-  ObjectMonitor* result = nullptr;
-  Lookup lookup_f(obj);
-  auto found_f = [&](ObjectMonitor** found) {
-    assert((*found)->object_peek() == obj, "must be");
-    result = *found;
-  };
-  _table->get(current, lookup_f, found_f);
-  verify_monitor_get_result(obj, result);
+  const intptr_t hash = obj->mark().hash();
+  Table* curr = AtomicAccess::load_acquire(&_curr);
+  ObjectMonitor* monitor = curr->get(obj, hash);
+  return monitor;
+}
+
+// Returns a new table to try inserting into.
+ObjectMonitorTable::Table* ObjectMonitorTable::grow_table(Table* curr) {
+  Table* result;
+  Table* new_table = AtomicAccess::load_acquire(&_curr);
+  if (new_table != curr) {
+    // Table changed; no need to try further
+    return new_table;
+  }
+
+  {
+    // Use MonitorDeflation_lock to only allow one inflating thread to
+    // attempt to allocate the new table.
+    MonitorLocker ml(MonitorDeflation_lock, Mutex::_no_safepoint_check_flag);
+
+    new_table = AtomicAccess::load_acquire(&_curr);
+    if (new_table != curr) {
+      // Table changed; no need to try further
+      return new_table;
+    }
+
+    new_table = new Table(curr->capacity() << 1, curr);
+    result = AtomicAccess::cmpxchg(&_curr, curr, new_table, memory_order_acq_rel);
+    if (result == curr) {
+      log_info(monitorinflation)("Growing object monitor table (capacity: %zu)",
+                                 new_table->capacity());
+      // Since we grew the table (we have a new current) we need to
+      // notify the deflation thread to rebuild the table (to get rid of
+      // old currents).
+      ObjectSynchronizer::set_is_async_deflation_requested(true);
+      ml.notify_all();
+      return new_table;
+    }
+  }
+
+  // Somebody else started rehashing; restart in new table.
+  delete new_table;
+
   return result;
 }
 
-void ObjectMonitorTable::try_notify_grow() {
-  if (!_table->is_max_size_reached() && !AtomicAccess::load(&_resize)) {
-    AtomicAccess::store(&_resize, true);
-    if (Service_lock->try_lock()) {
-      Service_lock->notify();
-      Service_lock->unlock();
-    }
-  }
-}
-
-bool ObjectMonitorTable::should_grow() {
-  return get_load_factor() > GROW_LOAD_FACTOR && !_table->is_max_size_reached();
-}
-
-bool ObjectMonitorTable::should_resize() {
-  return should_grow() || should_shrink() || AtomicAccess::load(&_resize);
-}
-
-template <typename Task, typename... Args>
-bool ObjectMonitorTable::run_task(JavaThread* current, Task& task, const char* task_name, Args&... args) {
-  if (task.prepare(current)) {
-    log_trace(monitortable)("Started to %s", task_name);
-    TraceTime timer(task_name, TRACETIME_LOG(Debug, monitortable, perf));
-    while (task.do_task(current, args...)) {
-      task.pause(current);
-      {
-        ThreadBlockInVM tbivm(current);
-      }
-      task.cont(current);
-    }
-    task.done(current);
-    return true;
-  }
-  return false;
-}
-
-bool ObjectMonitorTable::grow(JavaThread* current) {
-  ConcurrentTable::GrowTask grow_task(_table);
-  if (run_task(current, grow_task, "Grow")) {
-    _table_size = table_size(current);
-    log_info(monitortable)("Grown to size: %zu", _table_size);
-    return true;
-  }
-  return false;
-}
-
-bool ObjectMonitorTable::clean(JavaThread* current) {
-  ConcurrentTable::BulkDeleteTask clean_task(_table);
-  auto is_dead = [&](ObjectMonitor** monitor) {
-    return (*monitor)->object_is_dead();
-  };
-  auto do_nothing = [&](ObjectMonitor** monitor) {};
-  NativeHeapTrimmer::SuspendMark sm("ObjectMonitorTable");
-  return run_task(current, clean_task, "Clean", is_dead, do_nothing);
-}
-
-bool ObjectMonitorTable::resize(JavaThread* current) {
-  LogTarget(Info, monitortable) lt;
-  bool success = false;
-
-  if (should_grow()) {
-    lt.print("Start growing with load factor %f", get_load_factor());
-    success = grow(current);
-  } else {
-    if (!_table->is_max_size_reached() && AtomicAccess::load(&_resize)) {
-      lt.print("WARNING: Getting resize hints with load factor %f", get_load_factor());
-    }
-    lt.print("Start cleaning with load factor %f", get_load_factor());
-    success = clean(current);
-  }
-
-  AtomicAccess::store(&_resize, false);
-
-  return success;
-}
-
 ObjectMonitor* ObjectMonitorTable::monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj) {
-  // Enter the monitor into the concurrent hashtable.
-  ObjectMonitor* result = monitor;
-  Lookup lookup_f(obj);
-  auto found_f = [&](ObjectMonitor** found) {
-    assert((*found)->object_peek() == obj, "must be");
-    result = *found;
-  };
-  bool grow;
-  _table->insert_get(current, lookup_f, monitor, found_f, &grow);
-  verify_monitor_get_result(obj, result);
-  if (grow) {
-    try_notify_grow();
-  }
-  return result;
-}
+  const intptr_t hash = obj->mark().hash();
+  Table* curr = AtomicAccess::load_acquire(&_curr);
 
-bool ObjectMonitorTable::remove_monitor_entry(Thread* current, ObjectMonitor* monitor) {
-  LookupMonitor lookup_f(monitor);
-  return _table->remove(current, lookup_f);
-}
-
-bool ObjectMonitorTable::contains_monitor(Thread* current, ObjectMonitor* monitor) {
-  LookupMonitor lookup_f(monitor);
-  bool result = false;
-  auto found_f = [&](ObjectMonitor** found) {
-    result = true;
-  };
-  _table->get(current, lookup_f, found_f);
-  return result;
-}
-
-void ObjectMonitorTable::print_on(outputStream* st) {
-  auto printer = [&] (ObjectMonitor** entry) {
-    ObjectMonitor* om = *entry;
-    oop obj = om->object_peek();
-    st->print("monitor=" PTR_FORMAT ", ", p2i(om));
-    st->print("object=" PTR_FORMAT, p2i(obj));
-    assert(obj->mark().hash() == om->hash(), "hash must match");
-    st->cr();
-    return true;
-  };
-  if (SafepointSynchronize::is_at_safepoint()) {
-    _table->do_safepoint_scan(printer);
-  } else {
-    _table->do_scan(Thread::current(), printer);
+  for (;;) {
+    // Curr is the latest table and is reasonably loaded.
+    ObjectMonitor* result = curr->get_set(obj, curr->as_entry(monitor), hash);
+    if (result != nullptr) {
+      return result;
+    }
+    // The table's limit was reached, we need to grow it.
+    curr = grow_table(curr);
   }
 }
+
+void ObjectMonitorTable::remove_monitor_entry(Thread* current, ObjectMonitor* monitor) {
+  oop obj = monitor->object_peek();
+  if (obj == nullptr) {
+    // Defer removal until subsequent rebuilding.
+    return;
+  }
+  const intptr_t hash = obj->mark().hash();
+  Table* curr = AtomicAccess::load_acquire(&_curr);
+  curr->remove(obj, curr->as_entry(monitor), hash);
+  assert(monitor_get(current, obj) != monitor, "should have been removed");
+}
+
+// Before handshake; rehash and unlink tables.
+void ObjectMonitorTable::rebuild(GrowableArray<Table*>* delete_list) {
+  Table* new_table;
+  {
+    // Concurrent inserts while in the middle of rebuilding can result
+    // in the population count increasing past the load factor limit.
+    // For this to be okay we need to bound how much it may exceed the
+    // limit. A sequence of tables with doubling capacity may
+    // eventually, after rebuilding, reach the maximum population of
+    // max_population(table_1) + max_population(table_1*2) + ... +
+    // max_population(table_1*2^n).
+    // I.e. max_population(2*table_1 *2^n) - max_population(table_1).
+    // With a 12.5% load factor, the implication is that as long as
+    // rebuilding a table will double its capacity, the maximum load
+    // after rebuilding is less than 25%. However, we can't always
+    // double the size each time we rebuild the table. Instead we
+    // recursively estimate the population count of the chain of
+    // tables (the current, and all the previous currents). If the sum
+    // of the population is less than the growing factor, we do not
+    // need to grow the table. If the new concurrently rebuilding
+    // table is immediately filled up by concurrent inserts, then the
+    // worst case load factor after the rebuild may be twice as large,
+    // which is still guaranteed to be less than a 50% load. If this
+    // happens, it will cause subsequent rebuilds to increase the
+    // table capacity, keeping the worst case less than 50%, until the
+    // load factor eventually becomes less than 12.5% again. So in
+    // some sense this allows us to be fooled once, but not twice. So,
+    // given the growing threshold of 12.5%, it is impossible for the
+    // tables to reach a load factor above 50%. Which is more than
+    // enough to guarantee the function of this concurrent hash table.
+    Table* curr = AtomicAccess::load_acquire(&_curr);
+    size_t need_to_accomodate = curr->total_items();
+    size_t new_capacity = curr->should_grow(need_to_accomodate)
+      ? curr->capacity() << 1
+      : curr->capacity();
+    new_table = new Table(new_capacity, curr);
+    Table* result = AtomicAccess::cmpxchg(&_curr, curr, new_table, memory_order_acq_rel);
+    if (result != curr) {
+      // Somebody else racingly started rehashing. Delete the
+      // new_table and treat somebody else's table as the new one.
+      delete new_table;
+      new_table = result;
+    }
+    log_info(monitorinflation)("Rebuilding object monitor table (capacity: %zu)",
+                               new_table->capacity());
+  }
+
+  for (Table* curr = new_table->prev(); curr != nullptr; curr = curr->prev()) {
+    delete_list->append(curr);
+  }
+
+  // Rebuild with the new table as target.
+  new_table->rebuild();
+}
+
+// After handshake; destroy old tables
+void ObjectMonitorTable::destroy(GrowableArray<Table*>* delete_list) {
+  for (ObjectMonitorTable::Table* table: *delete_list) {
+    delete table;
+  }
+}
+
+address ObjectMonitorTable::current_table_address() {
+  return (address)(&_curr);
+}
+
+ByteSize ObjectMonitorTable::table_capacity_mask_offset() {
+  return byte_offset_of(Table, _capacity_mask);
+}
+
+ByteSize ObjectMonitorTable::table_buckets_offset() {
+  return byte_offset_of(Table, _buckets);
+}
diff --git a/src/hotspot/share/runtime/objectMonitorTable.hpp b/src/hotspot/share/runtime/objectMonitorTable.hpp
index 146468d46b2..e8e7c61c6fa 100644
--- a/src/hotspot/share/runtime/objectMonitorTable.hpp
+++ b/src/hotspot/share/runtime/objectMonitorTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,9 @@
 #include "memory/allStatic.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/sizes.hpp"
 
+template <typename T> class GrowableArray;
 class JavaThread;
 class ObjectMonitor;
 class ObjectMonitorTableConfig;
@@ -36,42 +38,39 @@ class outputStream;
 class Thread;
 
 class ObjectMonitorTable : AllStatic {
-  friend class ObjectMonitorTableConfig;
+  static constexpr double GROW_LOAD_FACTOR = 0.125;
 
- private:
-  static void inc_items_count();
-  static void dec_items_count();
-  static double get_load_factor();
-  static size_t table_size(Thread* current);
-  static size_t max_log_size();
-  static size_t min_log_size();
+public:
+  class Table;
 
-  template <typename V>
-  static size_t clamp_log_size(V log_size);
-  static size_t initial_log_size();
-  static size_t grow_hint();
+private:
+  static Table* volatile _curr;
+  static Table* grow_table(Table* curr);
+
+  enum class Entry : uintptr_t {
+    empty = 0,
+    tombstone = 1,
+    removed = 2,
+    below_is_special = (removed + 1)
+  };
+
+public:
+  typedef enum {
+    // Used in the platform code. See: C2_MacroAssembler::fast_lock().
+    below_is_special = (int)Entry::below_is_special
+  } SpecialPointerValues;
 
- public:
   static void create();
-  static void verify_monitor_get_result(oop obj, ObjectMonitor* monitor);
   static ObjectMonitor* monitor_get(Thread* current, oop obj);
-  static void try_notify_grow();
-  static bool should_shrink() { return false; } // Not implemented
-
-  static constexpr double GROW_LOAD_FACTOR = 0.75;
-
-  static bool should_grow();
-  static bool should_resize();
-
-  template <typename Task, typename... Args>
-  static bool run_task(JavaThread* current, Task& task, const char* task_name, Args&... args);
-  static bool grow(JavaThread* current);
-  static bool clean(JavaThread* current);
-  static bool resize(JavaThread* current);
   static ObjectMonitor* monitor_put_get(Thread* current, ObjectMonitor* monitor, oop obj);
-  static bool remove_monitor_entry(Thread* current, ObjectMonitor* monitor);
-  static bool contains_monitor(Thread* current, ObjectMonitor* monitor);
-  static void print_on(outputStream* st);
+  static void rebuild(GrowableArray<Table*>* delete_list);
+  static void destroy(GrowableArray<Table*>* delete_list);
+  static void remove_monitor_entry(Thread* current, ObjectMonitor* monitor);
+
+  // Compiler support
+  static address current_table_address();
+  static ByteSize table_capacity_mask_offset();
+  static ByteSize table_buckets_offset();
 };
 
 #endif // SHARE_RUNTIME_OBJECTMONITORTABLE_HPP
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index cf18388c625..16335f97fdb 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,10 +81,6 @@
 #include "utilities/permitForbiddenFunctions.hpp"
 #include "utilities/powerOfTwo.hpp"
 
-#ifdef LINUX
-#include "osContainer_linux.hpp"
-#endif
-
 #ifndef _WINDOWS
 # include <poll.h>
 #endif
@@ -706,57 +702,50 @@ void* os::realloc(void *memblock, size_t size, MemTag mem_tag, const NativeCallS
     if (new_outer_size < size) {
       return nullptr;
     }
-
-    const size_t old_size = MallocTracker::malloc_header(memblock)->size();
-
-    // Observe MallocLimit
-    if ((size > old_size) && MemTracker::check_exceeds_limit(size - old_size, mem_tag)) {
-      return nullptr;
-    }
+    MallocHeader* header = MallocHeader::kill_block(memblock);
+    const size_t old_size = header->size();
 
     // Perform integrity checks on and mark the old block as dead *before* calling the real realloc(3) since it
     // may invalidate the old block, including its header.
-    MallocHeader* header = MallocHeader::resolve_checked(memblock);
     assert(mem_tag == header->mem_tag(), "weird NMT type mismatch (new:\"%s\" != old:\"%s\")\n",
            NMTUtil::tag_to_name(mem_tag), NMTUtil::tag_to_name(header->mem_tag()));
-    const MallocHeader::FreeInfo free_info = header->free_info();
-
-    header->mark_block_as_dead();
-
-    // the real realloc
-    void* const new_outer_ptr = permit_forbidden_function::realloc(header, new_outer_size);
-
-    if (new_outer_ptr == nullptr) {
-      // realloc(3) failed and the block still exists.
-      // We have however marked it as dead, revert this change.
-      header->revive();
-      return nullptr;
-    }
-    // realloc(3) succeeded, variable header now points to invalid memory and we need to deaccount the old block.
-    MemTracker::deaccount(free_info);
-
-    // After a successful realloc(3), we account the resized block with its new size
-    // to NMT.
-    void* const new_inner_ptr = MemTracker::record_malloc(new_outer_ptr, size, mem_tag, stack);
+    bool within_malloc_limit = !((size > old_size) && MemTracker::check_exceeds_limit(size - old_size, mem_tag));
+    bool success = within_malloc_limit;
+    // Observe MallocLimit
+    if (success) {
+      // If realloc succeeds, the header is freed. Get FreeInfo before that.
+      MallocHeader::FreeInfo free_info = header->free_info();
+      void* const new_outer_ptr = permit_forbidden_function::realloc(header, new_outer_size);
+      success = new_outer_ptr != nullptr;
+      if (success) {
+        // realloc(3) succeeded, variable header now points to invalid memory and we need to deaccount the old block.
+        MemTracker::deaccount(free_info);
+        // After a successful realloc(3), we account the resized block with its new size
+        // to NMT.
+        void* const new_inner_ptr = MemTracker::record_malloc(new_outer_ptr, size, mem_tag, stack);
 
 #ifdef ASSERT
-    assert(old_size == free_info.size, "Sanity");
-    if (ZapCHeap && old_size < size) {
-      // We also zap the newly extended region.
-      ::memset((char*)new_inner_ptr + old_size, uninitBlockPad, size - old_size);
-    }
+        if (ZapCHeap && old_size < size) {
+          // We also zap the newly extended region.
+          ::memset((char*)new_inner_ptr + old_size, uninitBlockPad, size - old_size);
+        }
 #endif
 
-    rc = new_inner_ptr;
-
+        rc = new_inner_ptr;
+      }
+    }
+    if (!success) {
+      // realloc(3) failed and the block still exists.
+      // We have however marked it as dead, revert this change.
+      MallocHeader::revive_block(memblock);
+      return nullptr;
+    }
   } else {
-
     // NMT disabled.
     rc = permit_forbidden_function::realloc(memblock, size);
     if (rc == nullptr) {
       return nullptr;
     }
-
   }
 
   DEBUG_ONLY(break_if_ptr_caught(rc);)
@@ -2205,19 +2194,60 @@ static void assert_nonempty_range(const char* addr, size_t bytes) {
 }
 
 bool os::used_memory(physical_memory_size_type& value) {
-#ifdef LINUX
-  if (OSContainer::is_containerized()) {
-    return OSContainer::memory_usage_in_bytes(value);
+  if (is_containerized()) {
+    return Container::used_memory(value);
   }
-#endif
+
+  return Machine::used_memory(value);
+}
+
+bool os::Machine::used_memory(physical_memory_size_type& value) {
   physical_memory_size_type avail_mem = 0;
   // Return value ignored - defaulting to 0 on failure.
-  (void)os::available_memory(avail_mem);
-  physical_memory_size_type phys_mem = os::physical_memory();
+  (void)os::Machine::available_memory(avail_mem);
+  physical_memory_size_type phys_mem = os::Machine::physical_memory();
   value = phys_mem - avail_mem;
   return true;
 }
 
+#ifndef LINUX
+bool os::is_containerized() {
+  return false;
+}
+
+bool os::Container::processor_count(double& value) {
+  return false;
+}
+
+bool os::Container::available_memory(physical_memory_size_type& value) {
+  return false;
+}
+
+bool os::Container::used_memory(physical_memory_size_type& value) {
+  return false;
+}
+
+bool os::Container::total_swap_space(physical_memory_size_type& value) {
+  return false;
+}
+
+bool os::Container::free_swap_space(physical_memory_size_type& value) {
+  return false;
+}
+
+bool os::Container::memory_limit(physical_memory_size_type& value) {
+  return false;
+}
+
+bool os::Container::memory_soft_limit(physical_memory_size_type& value) {
+  return false;
+}
+
+bool os::Container::memory_throttle_limit(physical_memory_size_type& value) {
+  return false;
+}
+#endif
+
 
 bool os::commit_memory(char* addr, size_t bytes, bool executable) {
   assert_nonempty_range(addr, bytes);
@@ -2263,7 +2293,7 @@ void os::commit_memory_or_exit(char* addr, size_t size, size_t alignment_hint,
 // We do not have the same lock protection for pd_commit_memory and record_virtual_memory_commit.
 // We assume that there is some external synchronization that prevents a region from being uncommitted
 // before it is finished being committed.
-bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
+void os::uncommit_memory(char* addr, size_t bytes, bool executable) {
   assert_nonempty_range(addr, bytes);
   bool res;
   if (MemTracker::enabled()) {
@@ -2276,13 +2306,10 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
     res = pd_uncommit_memory(addr, bytes, executable);
   }
 
-  if (res) {
-    log_debug(os, map)("Uncommitted " RANGEFMT, RANGEFMTARGS(addr, bytes));
-  } else {
-    log_info(os, map)("Failed to uncommit " RANGEFMT, RANGEFMTARGS(addr, bytes));
+  if (!res) {
+    fatal("Failed to uncommit " RANGEFMT, RANGEFMTARGS(addr, bytes));
   }
-
-  return res;
+  log_debug(os, map)("Uncommitted " RANGEFMT, RANGEFMTARGS(addr, bytes));
 }
 
 // The scope of NmtVirtualMemoryLocker covers both pd_release_memory and record_virtual_memory_release because
@@ -2290,7 +2317,7 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
 // We do not have the same lock protection for pd_reserve_memory and record_virtual_memory_reserve.
 // We assume that there is some external synchronization that prevents a region from being released
 // before it is finished being reserved.
-bool os::release_memory(char* addr, size_t bytes) {
+void os::release_memory(char* addr, size_t bytes) {
   assert_nonempty_range(addr, bytes);
   bool res;
   if (MemTracker::enabled()) {
@@ -2303,11 +2330,9 @@ bool os::release_memory(char* addr, size_t bytes) {
     res = pd_release_memory(addr, bytes);
   }
   if (!res) {
-    log_info(os, map)("Failed to release " RANGEFMT, RANGEFMTARGS(addr, bytes));
-  } else {
-    log_debug(os, map)("Released " RANGEFMT, RANGEFMTARGS(addr, bytes));
+    fatal("Failed to release " RANGEFMT, RANGEFMTARGS(addr, bytes));
   }
-  return res;
+  log_debug(os, map)("Released " RANGEFMT, RANGEFMTARGS(addr, bytes));
 }
 
 // Prints all mappings
@@ -2376,7 +2401,7 @@ char* os::map_memory(int fd, const char* file_name, size_t file_offset,
   return result;
 }
 
-bool os::unmap_memory(char *addr, size_t bytes) {
+void os::unmap_memory(char *addr, size_t bytes) {
   bool result;
   if (MemTracker::enabled()) {
     MemTracker::NmtVirtualMemoryLocker nvml;
@@ -2387,7 +2412,9 @@ bool os::unmap_memory(char *addr, size_t bytes) {
   } else {
     result = pd_unmap_memory(addr, bytes);
   }
-  return result;
+  if (!result) {
+    fatal("Failed to unmap memory " RANGEFMT, RANGEFMTARGS(addr, bytes));
+  }
 }
 
 void os::disclaim_memory(char *addr, size_t bytes) {
@@ -2415,20 +2442,6 @@ char* os::reserve_memory_special(size_t size, size_t alignment, size_t page_size
   return result;
 }
 
-bool os::release_memory_special(char* addr, size_t bytes) {
-  bool res;
-  if (MemTracker::enabled()) {
-    MemTracker::NmtVirtualMemoryLocker nvml;
-    res = pd_release_memory_special(addr, bytes);
-    if (res) {
-      MemTracker::record_virtual_memory_release(addr, bytes);
-    }
-  } else {
-    res = pd_release_memory_special(addr, bytes);
-  }
-  return res;
-}
-
 // Convenience wrapper around naked_short_sleep to allow for longer sleep
 // times. Only for use by non-JavaThreads.
 void os::naked_sleep(jlong millis) {
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index d585d3e5fc0..e185188384f 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -140,11 +140,16 @@ enum ThreadPriority {        // JLS 20.20.1-3
   CriticalPriority = 11      // Critical thread priority
 };
 
+#ifdef MACOS_AARCH64
 enum WXMode {
-  WXWrite,
-  WXExec
+  WXWrite = 0,
+  WXExec = 1,
+  WXArmedForWrite = 2,
 };
 
+extern WXMode DefaultWXWriteMode;
+#endif // MACOS_AARCH64
+
 // Executable parameter flag for os::commit_memory() and
 // os::commit_memory_or_exit().
 const bool ExecMem = true;
@@ -240,9 +245,7 @@ class os: AllStatic {
   static size_t pd_pretouch_memory(void* first, void* last, size_t page_size);
 
   static char*  pd_reserve_memory_special(size_t size, size_t alignment, size_t page_size,
-
                                           char* addr, bool executable);
-  static bool   pd_release_memory_special(char* addr, size_t bytes);
 
   static size_t page_size_for_region(size_t region_size, size_t min_pages, bool must_be_aligned);
 
@@ -342,6 +345,52 @@ class os: AllStatic {
   static bool is_server_class_machine();
   static size_t rss();
 
+  // On platforms with container support (currently only Linux) we combine machine values with
+  // potential container values in os:: methods, abstracting which value is actually used.
+  // The os::Machine and os::Container classes and containing methods are used to get machine
+  // and container values (when available) separately.
+  static bool is_containerized();
+
+  // The os::Machine class reports system resource metrics from the perspective of the operating
+  // system, without considering container-imposed limits. The values returned by these methods
+  // reflect the resources visible to the process as reported by the OS, and may already be
+  // affected by mechanisms such as virtualization, hypervisor limits, or process affinity,
+  // but do NOT consider further restrictions imposed by container runtimes (e.g., cgroups)
+  class Machine : AllStatic {
+  public:
+    static int active_processor_count();
+
+    [[nodiscard]] static bool available_memory(physical_memory_size_type& value);
+    [[nodiscard]] static bool used_memory(physical_memory_size_type& value);
+    [[nodiscard]] static bool free_memory(physical_memory_size_type& value);
+
+    [[nodiscard]] static bool total_swap_space(physical_memory_size_type& value);
+    [[nodiscard]] static bool free_swap_space(physical_memory_size_type& value);
+
+    static physical_memory_size_type physical_memory();
+  };
+
+  // The os::Container class reports resource limits as imposed by a supported container runtime
+  // (currently only cgroup-based Linux runtimes). If the process is running inside a
+  // containerized environment, methods from this class report the effective limits imposed
+  // by the container, which may be more restrictive than what os::Machine reports.
+  // Methods return true and set the out-parameter if a limit is found,
+  // or false if no limit exists or it cannot be determined.
+  class Container : AllStatic {
+  public:
+    [[nodiscard]] static bool processor_count(double& value); // Returns the core-equivalent CPU quota
+
+    [[nodiscard]] static bool available_memory(physical_memory_size_type& value);
+    [[nodiscard]] static bool used_memory(physical_memory_size_type& value);
+
+    [[nodiscard]] static bool total_swap_space(physical_memory_size_type& value);
+    [[nodiscard]] static bool free_swap_space(physical_memory_size_type& value);
+
+    [[nodiscard]] static bool memory_limit(physical_memory_size_type& value);
+    [[nodiscard]] static bool memory_soft_limit(physical_memory_size_type& value);
+    [[nodiscard]] static bool memory_throttle_limit(physical_memory_size_type& value);
+  };
+
   // Returns the id of the processor on which the calling thread is currently executing.
   // The returned value is guaranteed to be between 0 and (os::processor_count() - 1).
   static uint processor_id();
@@ -485,8 +534,8 @@ class os: AllStatic {
   static void   commit_memory_or_exit(char* addr, size_t size,
                                       size_t alignment_hint,
                                       bool executable, const char* mesg);
-  static bool   uncommit_memory(char* addr, size_t bytes, bool executable = false);
-  static bool   release_memory(char* addr, size_t bytes);
+  static void   uncommit_memory(char* addr, size_t bytes, bool executable = false);
+  static void   release_memory(char* addr, size_t bytes);
 
   // Does the platform support trimming the native heap?
   static bool can_trim_native_heap();
@@ -515,7 +564,7 @@ class os: AllStatic {
   static bool   unguard_memory(char* addr, size_t bytes);
   static bool   create_stack_guard_pages(char* addr, size_t bytes);
   static bool   pd_create_stack_guard_pages(char* addr, size_t bytes);
-  static bool   remove_stack_guard_pages(char* addr, size_t bytes);
+  static void   remove_stack_guard_pages(char* addr, size_t bytes);
   // Helper function to create a new file with template jvmheap.XXXXXX.
   // Returns a valid fd on success or else returns -1
   static int create_file_for_heap(const char* dir);
@@ -531,7 +580,7 @@ class os: AllStatic {
   static char*  map_memory(int fd, const char* file_name, size_t file_offset,
                            char *addr, size_t bytes, MemTag mem_tag, bool read_only = false,
                            bool allow_exec = false);
-  static bool   unmap_memory(char *addr, size_t bytes);
+  static void   unmap_memory(char *addr, size_t bytes);
   static void   disclaim_memory(char *addr, size_t bytes);
   static void   realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
@@ -554,7 +603,6 @@ class os: AllStatic {
   // reserve, commit and pin the entire memory region
   static char*  reserve_memory_special(size_t size, size_t alignment, size_t page_size,
                                        char* addr, bool executable);
-  static bool   release_memory_special(char* addr, size_t bytes);
   static void   large_page_init();
   static size_t large_page_size();
   static bool   can_commit_large_page_memory();
@@ -1082,9 +1130,23 @@ class os: AllStatic {
   static char*  build_agent_function_name(const char *sym, const char *cname,
                                           bool is_absolute_path);
 
-#if defined(__APPLE__) && defined(AARCH64)
+#ifdef MACOS_AARCH64
   // Enables write or execute access to writeable and executable pages.
   static void current_thread_enable_wx(WXMode mode);
+  // Macos-AArch64 only.
+  static void thread_wx_enable_write_impl();
+
+  // Short circuit write enabling if it's already enabled. This
+  // function is executed many times, so it makes sense to inline a
+  // small part of it.
+private:
+  static THREAD_LOCAL bool _jit_exec_enabled;
+public:
+  static void thread_wx_enable_write() {
+    if (__builtin_expect(_jit_exec_enabled, false)) {
+      thread_wx_enable_write_impl();
+    }
+  }
 #endif // __APPLE__ && AARCH64
 
  protected:
diff --git a/src/hotspot/share/runtime/perfData.hpp b/src/hotspot/share/runtime/perfData.hpp
index ca1f1f410ad..d910f8662fe 100644
--- a/src/hotspot/share/runtime/perfData.hpp
+++ b/src/hotspot/share/runtime/perfData.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -716,7 +716,7 @@ class PerfDataManager : AllStatic {
 // Utility Classes
 
 /*
- * this class will administer a PerfCounter used as a time accumulator
+ * This class will administer a PerfCounter used as a time accumulator
  * for a basic block much like the TraceTime class.
  *
  * Example:
@@ -731,6 +731,9 @@ class PerfDataManager : AllStatic {
  * Note: use of this class does not need to occur within a guarded
  * block. The UsePerfData guard is used with the implementation
  * of this class.
+ *
+ * But also note this class does not guard against shutdown races -
+ * see SafePerfTraceTime below.
  */
 class PerfTraceTime : public StackObj {
 
@@ -756,6 +759,26 @@ class PerfTraceTime : public StackObj {
     }
 };
 
+/* A variant of PerfTraceTime that guards against use during shutdown -
+ * see PerfDataManager::destroy.
+ */
+class SafePerfTraceTime : public StackObj {
+
+  protected:
+    elapsedTimer _t;
+    PerfLongCounter* _timerp;
+
+  public:
+    inline SafePerfTraceTime(PerfLongCounter* timerp);
+
+    const char* name() const {
+      assert(_timerp != nullptr, "sanity");
+      return _timerp->name();
+    }
+
+    inline ~SafePerfTraceTime();
+};
+
 /* The PerfTraceTimedEvent class is responsible for counting the
  * occurrence of some event and measuring the elapsed time of
  * the event in two separate PerfCounter instances.
diff --git a/src/hotspot/share/runtime/perfData.inline.hpp b/src/hotspot/share/runtime/perfData.inline.hpp
index 5212691b924..ca0b27e25bc 100644
--- a/src/hotspot/share/runtime/perfData.inline.hpp
+++ b/src/hotspot/share/runtime/perfData.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "runtime/perfData.hpp"
 
+#include "utilities/globalCounter.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
 
@@ -50,4 +51,23 @@ inline bool PerfDataManager::exists(const char* name) {
   }
 }
 
+inline SafePerfTraceTime::SafePerfTraceTime(PerfLongCounter* timerp) : _timerp(timerp) {
+  GlobalCounter::CriticalSection cs(Thread::current());
+  if (!UsePerfData || !PerfDataManager::has_PerfData() || timerp == nullptr) {
+    return;
+  }
+  _t.start();
+}
+
+inline SafePerfTraceTime::~SafePerfTraceTime() {
+  GlobalCounter::CriticalSection cs(Thread::current());
+  if (!UsePerfData || !PerfDataManager::has_PerfData() || !_t.is_active()) {
+    return;
+  }
+
+  _t.stop();
+  _timerp->inc(_t.ticks());
+}
+
+
 #endif // SHARE_RUNTIME_PERFDATA_INLINE_HPP
diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp
index 27958885a7f..95e672984fa 100644
--- a/src/hotspot/share/runtime/serviceThread.cpp
+++ b/src/hotspot/share/runtime/serviceThread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,7 +85,6 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
     bool cldg_cleanup_work = false;
     bool jvmti_tagmap_work = false;
     bool oopmap_cache_work = false;
-    bool object_monitor_table_work = false;
     {
       // Need state transition ThreadBlockInVM so that this thread
       // will be handled by safepoint correctly when this thread is
@@ -112,8 +111,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
               (oop_handles_to_release = JavaThread::has_oop_handles_to_release()) |
               (cldg_cleanup_work = ClassLoaderDataGraph::should_clean_metaspaces_and_reset()) |
               (jvmti_tagmap_work = JvmtiTagMap::has_object_free_events_and_reset()) |
-              (oopmap_cache_work = OopMapCache::has_cleanup_work()) |
-              (object_monitor_table_work = ObjectSynchronizer::needs_resize())
+              (oopmap_cache_work = OopMapCache::has_cleanup_work())
              ) == 0) {
         // Wait until notified that there is some work to do or timer expires.
         // Some cleanup requests don't notify the ServiceThread so work needs to be done at periodic intervals.
@@ -171,10 +169,6 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
     if (oopmap_cache_work) {
       OopMapCache::cleanup();
     }
-
-    if (object_monitor_table_work) {
-      ObjectSynchronizer::resize_table(jt);
-    }
   }
 }
 
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index d426fd31a43..ae3835dd344 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,11 @@
  *
  */
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.inline.hpp"
 #include "classfile/classLoader.hpp"
+#include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/vmClasses.hpp"
@@ -2933,8 +2935,7 @@ public:
       assert(buffered_entry != nullptr,"sanity check");
 
       uint hash = fp->compute_hash();
-      u4 delta = _builder->buffer_to_offset_u4((address)buffered_entry);
-      _writer->add(hash, delta);
+      _writer->add(hash, AOTCompressedPointers::encode_not_null(buffered_entry));
       if (lsh.is_enabled()) {
         address fp_runtime_addr = (address)buffered_fp + ArchiveBuilder::current()->buffer_to_requested_delta();
         address entry_runtime_addr = (address)buffered_entry + ArchiveBuilder::current()->buffer_to_requested_delta();
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index 140207e5d63..a026a4b7d69 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,10 @@
 #ifndef SHARE_RUNTIME_SHAREDRUNTIME_HPP
 #define SHARE_RUNTIME_SHAREDRUNTIME_HPP
 
-#include "classfile/compactHashtable.hpp"
 #include "code/codeBlob.hpp"
 #include "code/vmreg.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "memory/allStatic.hpp"
-#include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/stubInfo.hpp"
@@ -38,6 +36,8 @@
 
 class AdapterHandlerEntry;
 class AdapterFingerPrint;
+class MetaspaceClosure;
+class SerializeClosure;
 class vframeStream;
 
 // Runtime is the base class for various runtime interfaces
diff --git a/src/hotspot/share/runtime/stackOverflow.cpp b/src/hotspot/share/runtime/stackOverflow.cpp
index e2bd157c555..61dbce8c5b4 100644
--- a/src/hotspot/share/runtime/stackOverflow.cpp
+++ b/src/hotspot/share/runtime/stackOverflow.cpp
@@ -116,13 +116,8 @@ void StackOverflow::remove_stack_guard_pages() {
   size_t len = stack_guard_zone_size();
 
   if (os::must_commit_stack_guard_pages()) {
-    if (os::remove_stack_guard_pages((char *) low_addr, len)) {
-      _stack_guard_state = stack_guard_unused;
-    } else {
-      log_warning(os, thread)("Attempt to deallocate stack guard pages failed ("
-        PTR_FORMAT "-" PTR_FORMAT ").", p2i(low_addr), p2i(low_addr + len));
-      return;
-    }
+    os::remove_stack_guard_pages((char *) low_addr, len);
+    _stack_guard_state = stack_guard_unused;
   } else {
     if (_stack_guard_state == stack_guard_unused) return;
     if (os::unguard_memory((char *) low_addr, len)) {
diff --git a/src/hotspot/share/runtime/suspendResumeManager.cpp b/src/hotspot/share/runtime/suspendResumeManager.cpp
index 067579b6386..3408d763e57 100644
--- a/src/hotspot/share/runtime/suspendResumeManager.cpp
+++ b/src/hotspot/share/runtime/suspendResumeManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,7 @@ void SuspendResumeManager::do_owner_suspend() {
   assert(_state_lock->owned_by_self(), "Lock must be held");
   assert(!_target->has_last_Java_frame() || _target->frame_anchor()->walkable(), "should have walkable stack");
   assert(_target->thread_state() == _thread_blocked, "Caller should have transitioned to _thread_blocked");
+  JVMTI_ONLY(assert(!_target->is_vthread_transition_disabler(), "attempt to suspend a vthread transition disabler");)
 
   while (is_suspended()) {
     log_trace(thread, suspend)("JavaThread:" INTPTR_FORMAT " suspended", p2i(_target));
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index fde1aa50400..c93e1a65512 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1195,13 +1195,10 @@ size_t ObjectSynchronizer::deflate_idle_monitors() {
     GrowableArray<ObjectMonitor*> delete_list((int)deflated_count);
     unlinked_count = _in_use_list.unlink_deflated(deflated_count, &delete_list, &safepointer);
 
-#ifdef ASSERT
+    GrowableArray<ObjectMonitorTable::Table*> table_delete_list;
     if (UseObjectMonitorTable) {
-      for (ObjectMonitor* monitor : delete_list) {
-        assert(!ObjectSynchronizer::contains_monitor(current, monitor), "Should have been removed");
-      }
+      ObjectMonitorTable::rebuild(&table_delete_list);
     }
-#endif
 
     log.before_handshake(unlinked_count);
 
@@ -1222,6 +1219,9 @@ size_t ObjectSynchronizer::deflate_idle_monitors() {
 
     // Delete the unlinked ObjectMonitors.
     deleted_count = delete_monitors(&delete_list, &safepointer);
+    if (UseObjectMonitorTable) {
+      ObjectMonitorTable::destroy(&table_delete_list);
+    }
     assert(unlinked_count == deleted_count, "must be");
   }
 
@@ -1549,11 +1549,11 @@ ObjectMonitor* ObjectSynchronizer::add_monitor(JavaThread* current, ObjectMonito
   return ObjectMonitorTable::monitor_put_get(current, monitor, obj);
 }
 
-bool ObjectSynchronizer::remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj) {
+void ObjectSynchronizer::remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj) {
   assert(UseObjectMonitorTable, "must be");
   assert(monitor->object_peek() == obj, "must be, cleared objects are removed by is_dead");
 
-  return ObjectMonitorTable::remove_monitor_entry(current, monitor);
+  ObjectMonitorTable::remove_monitor_entry(current, monitor);
 }
 
 void ObjectSynchronizer::deflate_mark_word(oop obj) {
@@ -1575,20 +1575,6 @@ void ObjectSynchronizer::create_om_table() {
   ObjectMonitorTable::create();
 }
 
-bool ObjectSynchronizer::needs_resize() {
-  if (!UseObjectMonitorTable) {
-    return false;
-  }
-  return ObjectMonitorTable::should_resize();
-}
-
-bool ObjectSynchronizer::resize_table(JavaThread* current) {
-  if (!UseObjectMonitorTable) {
-    return true;
-  }
-  return ObjectMonitorTable::resize(current);
-}
-
 class ObjectSynchronizer::LockStackInflateContendedLocks : private OopClosure {
  private:
   oop _contended_oops[LockStack::CAPACITY];
@@ -2296,10 +2282,7 @@ ObjectMonitor* ObjectSynchronizer::inflate_and_enter(oop object, BasicLock* lock
 void ObjectSynchronizer::deflate_monitor(Thread* current, oop obj, ObjectMonitor* monitor) {
   if (obj != nullptr) {
     deflate_mark_word(obj);
-  }
-  bool removed = remove_monitor(current, monitor, obj);
-  if (obj != nullptr) {
-    assert(removed, "Should have removed the entry if obj was alive");
+    remove_monitor(current, monitor, obj);
   }
 }
 
@@ -2308,11 +2291,6 @@ ObjectMonitor* ObjectSynchronizer::get_monitor_from_table(Thread* current, oop o
   return ObjectMonitorTable::monitor_get(current, obj);
 }
 
-bool ObjectSynchronizer::contains_monitor(Thread* current, ObjectMonitor* monitor) {
-  assert(UseObjectMonitorTable, "must be");
-  return ObjectMonitorTable::contains_monitor(current, monitor);
-}
-
 ObjectMonitor* ObjectSynchronizer::read_monitor(markWord mark) {
   return mark.monitor();
 }
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
index a10e44b3092..97690b9c886 100644
--- a/src/hotspot/share/runtime/synchronizer.hpp
+++ b/src/hotspot/share/runtime/synchronizer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -213,7 +213,7 @@ public:
   static ObjectMonitor* get_or_insert_monitor(oop object, JavaThread* current, ObjectSynchronizer::InflateCause cause);
 
   static ObjectMonitor* add_monitor(JavaThread* current, ObjectMonitor* monitor, oop obj);
-  static bool remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj);
+  static void remove_monitor(Thread* current, ObjectMonitor* monitor, oop obj);
 
   static void deflate_mark_word(oop object);
 
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index f3c08ae62f7..6de56c30d5f 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,6 +36,7 @@
 #include "memory/resourceArea.hpp"
 #include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
@@ -82,7 +83,7 @@ Thread::Thread(MemTag mem_tag) {
   _threads_hazard_ptr = nullptr;
   _threads_list_ptr = nullptr;
   _nested_threads_hazard_ptr_cnt = 0;
-  _rcu_counter = 0;
+  _rcu_counter.store_relaxed(0);
 
   // the handle mark links itself to last_handle_mark
   new HandleMark(this);
@@ -91,7 +92,7 @@ Thread::Thread(MemTag mem_tag) {
   DEBUG_ONLY(_owned_locks = nullptr;)
   NOT_PRODUCT(_skip_gcalot = false;)
   _jvmti_env_iteration_count = 0;
-  set_allocated_bytes(0);
+  _allocated_bytes = 0;
   _current_pending_raw_monitor = nullptr;
   _vm_error_callbacks = nullptr;
 
@@ -484,8 +485,8 @@ void Thread::print_on(outputStream* st, bool print_extended_info) const {
               (double)_statistical_info.getElapsedTime() / 1000.0
               );
     if (is_Java_thread() && (PrintExtendedThreadInfo || print_extended_info)) {
-      size_t allocated_bytes = (size_t) const_cast<Thread*>(this)->cooked_allocated_bytes();
-      st->print("allocated=%zu%s ",
+      uint64_t allocated_bytes = cooked_allocated_bytes();
+      st->print("allocated=" UINT64_FORMAT "%s ",
                 byte_size_in_proper_unit(allocated_bytes),
                 proper_unit_for_byte_size(allocated_bytes)
                 );
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 181dfc46f87..bef31a70170 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,6 +30,7 @@
 #include "gc/shared/threadLocalAllocBuffer.hpp"
 #include "jni.h"
 #include "memory/allocation.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
@@ -238,9 +239,9 @@ class Thread: public ThreadShadow {
 
   // Support for GlobalCounter
  private:
-  volatile uintx _rcu_counter;
+  Atomic<uintx> _rcu_counter;
  public:
-  volatile uintx* get_rcu_counter() {
+  Atomic<uintx>* get_rcu_counter() {
     return &_rcu_counter;
   }
 
@@ -256,7 +257,7 @@ class Thread: public ThreadShadow {
 
  private:
   ThreadLocalAllocBuffer _tlab;                 // Thread-local eden
-  jlong _allocated_bytes;                       // Cumulative number of bytes allocated on
+  uint64_t _allocated_bytes;                    // Cumulative number of bytes allocated on
                                                 // the Java heap
   ThreadHeapSampler _heap_sampler;              // For use when sampling the memory.
 
@@ -404,14 +405,14 @@ class Thread: public ThreadShadow {
 
   // Thread-Local Allocation Buffer (TLAB) support
   ThreadLocalAllocBuffer& tlab()                 { return _tlab; }
+  const ThreadLocalAllocBuffer& tlab() const     { return _tlab; }
   void initialize_tlab();
   void retire_tlab(ThreadLocalAllocStats* stats = nullptr);
   void fill_tlab(HeapWord* start, size_t pre_reserved, size_t new_size);
 
-  jlong allocated_bytes()               { return _allocated_bytes; }
-  void set_allocated_bytes(jlong value) { _allocated_bytes = value; }
-  void incr_allocated_bytes(jlong size) { _allocated_bytes += size; }
-  inline jlong cooked_allocated_bytes();
+  uint64_t allocated_bytes()               { return _allocated_bytes; }
+  void incr_allocated_bytes(uint64_t size) { _allocated_bytes += size; }
+  inline uint64_t cooked_allocated_bytes() const;
 
   ThreadHeapSampler& heap_sampler()     { return _heap_sampler; }
 
@@ -602,18 +603,21 @@ protected:
   jint _hashStateY;
   jint _hashStateZ;
 
-#if defined(__APPLE__) && defined(AARCH64)
+#ifdef MACOS_AARCH64
  private:
   DEBUG_ONLY(bool _wx_init);
   WXMode _wx_state;
  public:
   void init_wx();
   WXMode enable_wx(WXMode new_state);
-
+  bool wx_enable_write();
   void assert_wx_state(WXMode expected) {
     assert(_wx_state == expected, "wrong state");
   }
-#endif // __APPLE__ && AARCH64
+  WXMode get_wx_state() {
+    return _wx_state;
+  }
+#endif // MACOS_AARCH64
 
  private:
   bool _in_asgct = false;
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index 8e80cfc6125..b4cf3ec589a 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,32 +30,22 @@
 
 #include "gc/shared/tlab_globals.hpp"
 #include "runtime/atomicAccess.hpp"
+#include "utilities/permitForbiddenFunctions.hpp"
 
-#if defined(__APPLE__) && defined(AARCH64)
+#ifdef MACOS_AARCH64
 #include "runtime/os.hpp"
 #endif
 
-inline jlong Thread::cooked_allocated_bytes() {
-  jlong allocated_bytes = AtomicAccess::load_acquire(&_allocated_bytes);
+inline uint64_t Thread::cooked_allocated_bytes() const {
+  uint64_t allocated_bytes = AtomicAccess::load_acquire(&_allocated_bytes);
+  size_t used_bytes = 0;
   if (UseTLAB) {
-    // These reads are unsynchronized and unordered with the thread updating its tlab pointers.
-    // Use only if top > start && used_bytes <= max_tlab_size_bytes.
-    const HeapWord* const top = tlab().top_relaxed();
-    const HeapWord* const start = tlab().start_relaxed();
-    if (top <= start) {
-      return allocated_bytes;
-    }
-    const size_t used_bytes = pointer_delta(top, start, 1);
-    if (used_bytes <= ThreadLocalAllocBuffer::max_size_in_bytes()) {
-      // Comparing used_bytes with the maximum allowed size will ensure
-      // that we don't add the used bytes from a semi-initialized TLAB
-      // ending up with incorrect values. There is still a race between
-      // incrementing _allocated_bytes and clearing the TLAB, that might
-      // cause double counting in rare cases.
-      return allocated_bytes + used_bytes;
-    }
+    // cooked_used_bytes() does its best to not return implausible values, but
+    // there is still a potential race between incrementing _allocated_bytes and
+    // clearing the TLAB, that might cause double-counting.
+    used_bytes = tlab().estimated_used_bytes();
   }
-  return allocated_bytes;
+  return allocated_bytes + used_bytes;
 }
 
 inline ThreadsList* Thread::cmpxchg_threads_hazard_ptr(ThreadsList* exchange_value, ThreadsList* compare_value) {
@@ -71,11 +61,17 @@ inline void Thread::set_threads_hazard_ptr(ThreadsList* new_list) {
 }
 
 #if defined(__APPLE__) && defined(AARCH64)
+
+static void dummy() { }
+
 inline void Thread::init_wx() {
   assert(this == Thread::current(), "should only be called for current thread");
   assert(!_wx_init, "second init");
   _wx_state = WXWrite;
+  permit_forbidden_function::pthread_jit_write_protect_np(false);
   os::current_thread_enable_wx(_wx_state);
+  // Side effect: preload base address of libjvm
+  guarantee(os::address_is_in_vm(CAST_FROM_FN_PTR(address, &dummy)), "must be");
   DEBUG_ONLY(_wx_init = true);
 }
 
@@ -85,10 +81,19 @@ inline WXMode Thread::enable_wx(WXMode new_state) {
   WXMode old = _wx_state;
   if (_wx_state != new_state) {
     _wx_state = new_state;
-    os::current_thread_enable_wx(new_state);
+    switch (new_state) {
+      case WXWrite:
+      case WXExec:
+        os::current_thread_enable_wx(new_state);
+        break;
+      case WXArmedForWrite:
+        break;
+      default: ShouldNotReachHere();  break;
+    }
   }
   return old;
 }
+
 #endif // __APPLE__ && AARCH64
 
 #endif // SHARE_RUNTIME_THREAD_INLINE_HPP
diff --git a/src/hotspot/share/runtime/threadWXSetters.inline.hpp b/src/hotspot/share/runtime/threadWXSetters.inline.hpp
index 121584b81be..87f8d38e4dc 100644
--- a/src/hotspot/share/runtime/threadWXSetters.inline.hpp
+++ b/src/hotspot/share/runtime/threadWXSetters.inline.hpp
@@ -28,25 +28,61 @@
 
 // No threadWXSetters.hpp
 
-#if defined(__APPLE__) && defined(AARCH64)
+#ifdef MACOS_AARCH64
 
+#include "classfile/classLoader.hpp"
+#include "runtime/perfData.inline.hpp"
 #include "runtime/thread.inline.hpp"
 
 class ThreadWXEnable  {
   Thread* _thread;
   WXMode _old_mode;
+  WXMode *_this_wx_mode;
+  ThreadWXEnable *_prev;
 public:
-  ThreadWXEnable(WXMode new_mode, Thread* thread) :
-    _thread(thread),
-    _old_mode(_thread ? _thread->enable_wx(new_mode) : WXWrite)
-  { }
-  ~ThreadWXEnable() {
-    if (_thread) {
-      _thread->enable_wx(_old_mode);
+  ThreadWXEnable(WXMode* new_mode, Thread* thread) :
+    _thread(thread), _this_wx_mode(new_mode) {
+    NOT_PRODUCT(SafePerfTraceTime ptt(ClassLoader::perf_change_wx_time());)
+    JavaThread* javaThread
+      = _thread && _thread->is_Java_thread()
+                ? JavaThread::cast(_thread) : nullptr;
+    _prev = javaThread != nullptr ? javaThread->_cur_wx_enable: nullptr;
+    _old_mode = _thread != nullptr ? _thread->enable_wx(*new_mode) : WXWrite;
+    if (javaThread != nullptr) {
+      javaThread->_cur_wx_enable = this;
+      javaThread->_cur_wx_mode = new_mode;
     }
   }
+  ThreadWXEnable(WXMode new_mode, Thread* thread) :
+    _thread(thread), _this_wx_mode(nullptr) {
+    NOT_PRODUCT(SafePerfTraceTime ptt(ClassLoader::perf_change_wx_time());)
+    JavaThread* javaThread
+      = _thread && _thread->is_Java_thread()
+        ? JavaThread::cast(_thread) : nullptr;
+    _prev = javaThread != nullptr ? javaThread->_cur_wx_enable: nullptr;
+    _old_mode = _thread != nullptr ? _thread->enable_wx(new_mode) : WXWrite;
+    if (javaThread) {
+      javaThread->_cur_wx_enable = this;
+      javaThread->_cur_wx_mode = nullptr;
+    }
+  }
+
+  ~ThreadWXEnable() {
+    NOT_PRODUCT(SafePerfTraceTime ptt(ClassLoader::perf_change_wx_time());)
+    if (_thread) {
+      _thread->enable_wx(_old_mode);
+      JavaThread* javaThread
+        = _thread && _thread->is_Java_thread()
+          ? JavaThread::cast(_thread) : nullptr;
+      if (javaThread != nullptr) {
+        javaThread->_cur_wx_enable = _prev;
+        javaThread->_cur_wx_mode = _prev != nullptr ? _prev->_this_wx_mode : nullptr;
+      }
+    }
+  }
+
+  static bool test(address p);
 };
-#endif // __APPLE__ && AARCH64
+#endif // MACOS_AARCH64
 
 #endif // SHARE_RUNTIME_THREADWXSETTERS_INLINE_HPP
-
diff --git a/src/hotspot/share/runtime/vframe.inline.hpp b/src/hotspot/share/runtime/vframe.inline.hpp
index 54dbb44ebd4..6bd83e7f7c9 100644
--- a/src/hotspot/share/runtime/vframe.inline.hpp
+++ b/src/hotspot/share/runtime/vframe.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -176,7 +176,8 @@ inline void vframeStreamCommon::fill_from_compiled_frame(int decode_offset) {
                   INTPTR_FORMAT " not found or invalid at %d",
                   p2i(_frame.pc()), decode_offset);
       nm()->print_on(&ss);
-      nm()->method()->print_codes_on(&ss);
+      // Buffering to a stringStream, disable internal buffering so it's not done twice.
+      nm()->method()->print_codes_on(&ss, 0, false);
       nm()->print_code_on(&ss);
       nm()->print_pcs_on(&ss);
       tty->print("%s", ss.as_string()); // print all at once
diff --git a/src/hotspot/share/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp
index a68a0adf299..9f1c082ed8f 100644
--- a/src/hotspot/share/runtime/vframeArray.cpp
+++ b/src/hotspot/share/runtime/vframeArray.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -491,6 +491,15 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
 
 #ifndef PRODUCT
   if (PrintDeoptimizationDetails) {
+    const bool print_codes = WizardMode && Verbose;
+    ResourceMark rm(thread);
+    stringStream codes_ss;
+    if (print_codes) {
+      // print_codes_on() may acquire MDOExtraData_lock (rank nosafepoint-1).
+      // To keep the lock acquisition order correct, call it before taking tty_lock.
+      // Avoid double buffering: set buffered=false.
+      method()->print_codes_on(&codes_ss, 0, false);
+    }
     ttyLocker ttyl;
     tty->print_cr("[%d. Interpreted Frame]", ++unpack_counter);
     iframe()->print_on(tty);
@@ -500,7 +509,9 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
                     RegisterMap::WalkContinuation::skip);
     vframe* f = vframe::new_vframe(iframe(), &map, thread);
     f->print();
-    if (WizardMode && Verbose) method()->print_codes();
+    if (print_codes) {
+      tty->print("%s", codes_ss.as_string());
+    }
     tty->cr();
   }
 #endif // !PRODUCT
diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp
index c5539fd5e50..ef480f04c57 100644
--- a/src/hotspot/share/runtime/vmOperations.cpp
+++ b/src/hotspot/share/runtime/vmOperations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,7 @@
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/vmOperations.hpp"
 #include "services/threadService.hpp"
+#include "utilities/growableArray.hpp"
 #include "utilities/ticks.hpp"
 
 #define VM_OP_NAME_INITIALIZE(name) #name,
@@ -286,42 +287,27 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
   }
 
  private:
-  class ObjectMonitorLinkedList :
-    public LinkedListImpl<ObjectMonitor*,
-                          AnyObj::C_HEAP, mtThread,
-                          AllocFailStrategy::RETURN_NULL> {};
+  using ObjectMonitorList = GrowableArrayCHeap<ObjectMonitor*, mtThread>;
 
   // HashTable SIZE is specified at compile time so we
   // use 1031 which is the first prime after 1024.
-  typedef HashTable<int64_t, ObjectMonitorLinkedList*, 1031, AnyObj::C_HEAP, mtThread,
+  typedef HashTable<int64_t, ObjectMonitorList, 1031, AnyObj::C_HEAP, mtThread,
                             &ObjectMonitorsDump::ptr_hash> PtrTable;
   PtrTable* _ptrs;
   size_t _key_count;
   size_t _om_count;
 
-  void add_list(int64_t key, ObjectMonitorLinkedList* list) {
-    _ptrs->put(key, list);
-    _key_count++;
-  }
-
-  ObjectMonitorLinkedList* get_list(int64_t key) {
-    ObjectMonitorLinkedList** listpp = _ptrs->get(key);
-    return (listpp == nullptr) ? nullptr : *listpp;
-  }
-
   void add(ObjectMonitor* monitor) {
     int64_t key = monitor->owner();
 
-    ObjectMonitorLinkedList* list = get_list(key);
-    if (list == nullptr) {
-      // Create new list and add it to the hash table:
-      list = new (mtThread) ObjectMonitorLinkedList;
-      _ptrs->put(key, list);
+    bool created = false;
+    ObjectMonitorList* list = _ptrs->put_if_absent(key, &created);
+    if (created) {
       _key_count++;
     }
 
-    assert(list->find(monitor) == nullptr, "Should not contain duplicates");
-    list->add(monitor);  // Add the ObjectMonitor to the list.
+    assert(list->find(monitor) == -1, "Should not contain duplicates");
+    list->push(monitor);  // Add the ObjectMonitor to the list.
     _om_count++;
   }
 
@@ -332,17 +318,7 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
   ObjectMonitorsDump() : _ptrs(new (mtThread) PtrTable), _key_count(0), _om_count(0) {}
 
   ~ObjectMonitorsDump() {
-    class CleanupObjectMonitorsDump: StackObj {
-     public:
-      bool do_entry(int64_t& key, ObjectMonitorLinkedList*& list) {
-        list->clear();  // clear the LinkListNodes
-        delete list;    // then delete the LinkedList
-        return true;
-      }
-    } cleanup;
-
-    _ptrs->unlink(&cleanup);  // cleanup the LinkedLists
-    delete _ptrs;             // then delete the hash table
+    delete _ptrs;
   }
 
   // Implements MonitorClosure used to collect all owned monitors in the system
@@ -368,11 +344,12 @@ class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
   // Implements the ObjectMonitorsView interface
   void visit(MonitorClosure* closure, JavaThread* thread) override {
     int64_t key = ObjectMonitor::owner_id_from(thread);
-    ObjectMonitorLinkedList* list = get_list(key);
-    LinkedListIterator<ObjectMonitor*> iter(list != nullptr ? list->head() : nullptr);
-    while (!iter.is_empty()) {
-      ObjectMonitor* monitor = *iter.next();
-      closure->do_monitor(monitor);
+    ObjectMonitorList* list = _ptrs->get(key);
+    if (list == nullptr) {
+      return;
+    }
+    for (int i = 0; i < list->length(); i++) {
+      closure->do_monitor(list->at(i));
     }
   }
 
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 4ecc8f9ca01..a54fbc7e8ab 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotCompressedPointers.hpp"
 #include "cds/filemap.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
@@ -79,6 +80,7 @@
 #include "oops/typeArrayOop.hpp"
 #include "prims/jvmtiAgentThread.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/globals.hpp"
@@ -157,7 +159,7 @@
                 unchecked_nonstatic_field)                                                                                           \
                                                                                                                                      \
   /******************************************************************/                                                               \
-  /* OopDesc and Klass hierarchies (NOTE: MethodData* incomplete)   */                                                               \
+  /* OopDesc and Klass hierarchies                                  */                                                               \
   /******************************************************************/                                                               \
                                                                                                                                      \
   volatile_nonstatic_field(oopDesc,            _mark,                                         markWord)                              \
@@ -231,27 +233,7 @@
   nonstatic_field(Klass,                       _vtable_len,                                   int)                                   \
   nonstatic_field(Klass,                       _class_loader_data,                            ClassLoaderData*)                      \
   nonstatic_field(vtableEntry,                 _method,                                       Method*)                               \
-  nonstatic_field(MethodData,                  _size,                                         int)                                   \
   nonstatic_field(MethodData,                  _method,                                       Method*)                               \
-  nonstatic_field(MethodData,                  _data_size,                                    int)                                   \
-  nonstatic_field(MethodData,                  _data[0],                                      intptr_t)                              \
-  nonstatic_field(MethodData,                  _parameters_type_data_di,                      int)                                   \
-  nonstatic_field(MethodData,                  _compiler_counters._nof_decompiles,            uint)                                  \
-  nonstatic_field(MethodData,                  _compiler_counters._nof_overflow_recompiles,   uint)                                  \
-  nonstatic_field(MethodData,                  _compiler_counters._nof_overflow_traps,        uint)                                  \
-  nonstatic_field(MethodData,                  _compiler_counters._trap_hist._array[0],       u1)                                    \
-  nonstatic_field(MethodData,                  _eflags,                                       intx)                                  \
-  nonstatic_field(MethodData,                  _arg_local,                                    intx)                                  \
-  nonstatic_field(MethodData,                  _arg_stack,                                    intx)                                  \
-  nonstatic_field(MethodData,                  _arg_returned,                                 intx)                                  \
-  nonstatic_field(MethodData,                  _tenure_traps,                                 uint)                                  \
-  nonstatic_field(MethodData,                  _invoke_mask,                                  int)                                   \
-  nonstatic_field(MethodData,                  _backedge_mask,                                int)                                   \
-  nonstatic_field(DataLayout,                  _header._struct._tag,                          u1)                                    \
-  nonstatic_field(DataLayout,                  _header._struct._flags,                        u1)                                    \
-  nonstatic_field(DataLayout,                  _header._struct._bci,                          u2)                                    \
-  nonstatic_field(DataLayout,                  _header._struct._traps,                        u4)                                    \
-  nonstatic_field(DataLayout,                  _cells[0],                                     intptr_t)                              \
   nonstatic_field(MethodCounters,              _invoke_mask,                                  int)                                   \
   nonstatic_field(MethodCounters,              _backedge_mask,                                int)                                   \
   COMPILER2_OR_JVMCI_PRESENT(nonstatic_field(MethodCounters, _interpreter_throwout_count,     u2))                                   \
@@ -426,6 +408,8 @@
   volatile_nonstatic_field(ClassLoaderData,    _klasses,                                      Klass*)                                \
   nonstatic_field(ClassLoaderData,             _has_class_mirror_holder,                      bool)                                  \
                                                                                                                                      \
+  static_field(ClassLoaderData,                _the_null_class_loader_data,                   ClassLoaderData*)                      \
+                                                                                                                                     \
   volatile_static_field(ClassLoaderDataGraph, _head,                                          ClassLoaderData*)                      \
                                                                                                                                      \
   /**********/                                                                                                                       \
@@ -594,7 +578,7 @@
   nonstatic_field(ThreadShadow,                _exception_file,                               const char*)                           \
   nonstatic_field(ThreadShadow,                _exception_line,                               int)                                   \
   nonstatic_field(Thread,                      _tlab,                                         ThreadLocalAllocBuffer)                \
-  nonstatic_field(Thread,                      _allocated_bytes,                              jlong)                                 \
+  nonstatic_field(Thread,                      _allocated_bytes,                              uint64_t)                              \
   nonstatic_field(JavaThread,                  _lock_stack,                                   LockStack)                             \
   nonstatic_field(LockStack,                   _top,                                          uint32_t)                              \
   nonstatic_field(LockStack,                   _base[0],                                      oop)                                   \
@@ -761,7 +745,7 @@
   CDS_ONLY(nonstatic_field(FileMapInfo,        _header,                   FileMapHeader*))                                           \
   CDS_ONLY(   static_field(FileMapInfo,        _current_info,             FileMapInfo*))                                             \
   CDS_ONLY(nonstatic_field(FileMapHeader,      _regions[0],               CDSFileMapRegion))                                         \
-  CDS_ONLY(nonstatic_field(FileMapHeader,      _cloned_vtables_offset,    size_t))                                                   \
+  CDS_ONLY(nonstatic_field(FileMapHeader,      _cloned_vtables,           AOTCompressedPointers::narrowPtr))                         \
   CDS_ONLY(nonstatic_field(FileMapHeader,      _mapped_base_address,      char*))                                                    \
   CDS_ONLY(nonstatic_field(CDSFileMapRegion,   _mapped_base,              char*))                                                    \
   CDS_ONLY(nonstatic_field(CDSFileMapRegion,   _used,                     size_t))                                                   \
@@ -888,6 +872,7 @@
   declare_unsigned_integer_type(unsigned short)                           \
   declare_unsigned_integer_type(jushort)                                  \
   declare_unsigned_integer_type(unsigned long)                            \
+  declare_unsigned_integer_type(Atomic<size_t>)                           \
   /* The compiler thinks this is a different type than */                 \
   /* unsigned short on Win32 */                                           \
   declare_unsigned_integer_type(u1)                                       \
@@ -958,8 +943,6 @@
     declare_type(ConstMethod, MetaspaceObj)                               \
     declare_type(Annotations, MetaspaceObj)                               \
                                                                           \
-  declare_toplevel_type(MethodData::CompilerCounters)                     \
-                                                                          \
   declare_toplevel_type(narrowKlass)                                      \
                                                                           \
   declare_toplevel_type(vtableEntry)                                      \
@@ -968,7 +951,6 @@
            declare_toplevel_type(Symbol*)                                 \
   declare_toplevel_type(volatile Metadata*)                               \
                                                                           \
-  declare_toplevel_type(DataLayout)                                       \
   declare_toplevel_type(BSMAttributeEntries)                              \
                                                                           \
   /********/                                                              \
@@ -1200,6 +1182,7 @@
                                                                           \
   /* all enum types */                                                    \
                                                                           \
+   declare_integer_type(AOTCompressedPointers::narrowPtr)                 \
    declare_integer_type(Bytecodes::Code)                                  \
    declare_integer_type(InstanceKlass::ClassState)                        \
    declare_integer_type(JavaThreadState)                                  \
@@ -1307,6 +1290,12 @@
   VM_INT_CONSTANTS_GC(declare_constant,                                   \
                       declare_constant_with_value)                        \
                                                                           \
+  /*****************/                                                     \
+  /* CDS constants */                                                     \
+  /*****************/                                                     \
+                                                                          \
+  CDS_ONLY(declare_constant(AOTCompressedPointers::MetadataOffsetShift))  \
+                                                                          \
   /******************/                                                    \
   /* Useful globals */                                                    \
   /******************/                                                    \
diff --git a/src/hotspot/share/sanitizers/ub.hpp b/src/hotspot/share/sanitizers/ub.hpp
index d5901f6821c..8a6bfa50f51 100644
--- a/src/hotspot/share/sanitizers/ub.hpp
+++ b/src/hotspot/share/sanitizers/ub.hpp
@@ -33,12 +33,9 @@
 // Useful if the function or method is known to do something special or even 'dangerous', for
 // example causing desired signals/crashes.
 #ifdef UNDEFINED_BEHAVIOR_SANITIZER
-#if defined(__clang__)
+#if defined(__clang__) || defined(__GNUC__)
 #define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined","float-divide-by-zero")))
 #endif
-#if defined(__GNUC__) && !defined(__clang__)
-#define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined")))
-#endif
 #endif
 
 #ifndef ATTRIBUTE_NO_UBSAN
diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp
index 290e4839c96..09277e16479 100644
--- a/src/hotspot/share/services/management.cpp
+++ b/src/hotspot/share/services/management.cpp
@@ -2124,12 +2124,12 @@ JVM_ENTRY(jlong, jmm_GetTotalThreadAllocatedMemory(JNIEnv *env))
 
     // We keep a high water mark to ensure monotonicity in case threads counted
     // on a previous call end up in state (2).
-    static jlong high_water_result = 0;
+    static uint64_t high_water_result = 0;
 
     JavaThreadIteratorWithHandle jtiwh;
-    jlong result = ThreadService::exited_allocated_bytes();
+    uint64_t result = ThreadService::exited_allocated_bytes();
     for (; JavaThread* thread = jtiwh.next();) {
-      jlong size = thread->cooked_allocated_bytes();
+      uint64_t size = thread->cooked_allocated_bytes();
       result += size;
     }
 
@@ -2144,7 +2144,7 @@ JVM_ENTRY(jlong, jmm_GetTotalThreadAllocatedMemory(JNIEnv *env))
         high_water_result = result;
       }
     }
-    return result;
+    return checked_cast<jlong>(result);
 JVM_END
 
 // Gets the amount of memory allocated on the Java heap for a single thread.
@@ -2156,13 +2156,13 @@ JVM_ENTRY(jlong, jmm_GetOneThreadAllocatedMemory(JNIEnv *env, jlong thread_id))
   }
 
   if (thread_id == 0) { // current thread
-    return thread->cooked_allocated_bytes();
+    return checked_cast<jlong>(thread->cooked_allocated_bytes());
   }
 
   ThreadsListHandle tlh;
   JavaThread* java_thread = tlh.list()->find_JavaThread_from_java_tid(thread_id);
   if (is_platform_thread(java_thread)) {
-    return java_thread->cooked_allocated_bytes();
+    return checked_cast<jlong>(java_thread->cooked_allocated_bytes());
   }
   return -1;
 JVM_END
diff --git a/src/hotspot/share/services/memoryService.cpp b/src/hotspot/share/services/memoryService.cpp
index cd53f44e053..f64da3c5477 100644
--- a/src/hotspot/share/services/memoryService.cpp
+++ b/src/hotspot/share/services/memoryService.cpp
@@ -66,7 +66,13 @@ void GcThreadCountClosure::do_thread(Thread* thread) {
   _count++;
 }
 
-void MemoryService::set_universe_heap(CollectedHeap* heap) {
+void MemoryService::initialize(CollectedHeap* heap) {
+  // Prepare metaspace pools
+  add_metaspace_memory_pools();
+
+  // Ask heap to initialize its memory pools/managers
+  heap->initialize_serviceability();
+
   ResourceMark rm; // For internal allocations in GrowableArray.
 
   GrowableArray<MemoryPool*> gc_mem_pools = heap->memory_pools();
diff --git a/src/hotspot/share/services/memoryService.hpp b/src/hotspot/share/services/memoryService.hpp
index d10c3d2e9d9..1a947ec1d0c 100644
--- a/src/hotspot/share/services/memoryService.hpp
+++ b/src/hotspot/share/services/memoryService.hpp
@@ -60,7 +60,7 @@ private:
   static MemoryPool*                    _compressed_class_pool;
 
 public:
-  static void set_universe_heap(CollectedHeap* heap);
+  static void initialize(CollectedHeap* heap);
   static void add_code_heap_memory_pool(CodeHeap* heap, const char* name);
   static void add_metaspace_memory_pools();
 
diff --git a/src/hotspot/share/services/threadService.cpp b/src/hotspot/share/services/threadService.cpp
index 8772195df0b..4f511075967 100644
--- a/src/hotspot/share/services/threadService.cpp
+++ b/src/hotspot/share/services/threadService.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@
 #include "runtime/atomicAccess.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/init.hpp"
-#include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/objectMonitor.inline.hpp"
@@ -75,7 +74,7 @@ PerfVariable* ThreadService::_daemon_threads_count = nullptr;
 volatile int ThreadService::_atomic_threads_count = 0;
 volatile int ThreadService::_atomic_daemon_threads_count = 0;
 
-volatile jlong ThreadService::_exited_allocated_bytes = 0;
+volatile uint64_t ThreadService::_exited_allocated_bytes = 0;
 
 ThreadDumpResult* ThreadService::_threaddump_list = nullptr;
 
@@ -1122,8 +1121,6 @@ ThreadsListEnumerator::ThreadsListEnumerator(Thread* cur_thread,
 
 
 // jdk.internal.vm.ThreadSnapshot support
-#if INCLUDE_JVMTI
-
 class GetThreadSnapshotHandshakeClosure: public HandshakeClosure {
 private:
   static OopStorage* oop_storage() {
@@ -1300,7 +1297,7 @@ public:
       return;
     }
 
-    bool vthread_carrier = !is_virtual && (_java_thread != nullptr) && (_java_thread->vthread_continuation() != nullptr);
+    bool vthread_carrier = !is_virtual && (_java_thread->vthread_continuation() != nullptr);
 
     oop park_blocker = java_lang_Thread::park_blocker(_thread_h());
     if (park_blocker != nullptr) {
@@ -1458,13 +1455,13 @@ oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
   HandleMark   hm(THREAD);
 
   JavaThread* java_thread = nullptr;
-  oop thread_oop;
+  oop thread_oop = nullptr;
   bool has_javathread = tlh.cv_internal_thread_to_JavaThread(jthread, &java_thread, &thread_oop);
-  assert((has_javathread && thread_oop != nullptr) || !has_javathread, "Missing Thread oop");
+  assert(thread_oop != nullptr, "Missing Thread oop");
   bool is_virtual = java_lang_VirtualThread::is_instance(thread_oop);  // Deals with null
 
   if (!has_javathread && !is_virtual) {
-    return nullptr; // thread terminated so not of interest
+    return nullptr; // platform thread terminated
   }
 
   // Handshake with target
@@ -1476,6 +1473,11 @@ oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
     Handshake::execute(&cl, &tlh, java_thread);
   }
 
+  assert(cl._thread_status != JavaThreadStatus::NEW, "unstarted Thread");
+  if (is_virtual && (cl._thread_status == JavaThreadStatus::TERMINATED)) {
+    return nullptr; // virtual thread terminated
+  }
+
   // StackTrace
   InstanceKlass* ste_klass = vmClasses::StackTraceElement_klass();
   assert(ste_klass != nullptr, "must be loaded");
@@ -1505,17 +1507,6 @@ oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
     }
   }
 
-  // call static StackTraceElement[] StackTraceElement.of(StackTraceElement[] stackTrace)
-  // to properly initialize STEs.
-  JavaValue result(T_OBJECT);
-  JavaCalls::call_static(&result,
-    ste_klass,
-    vmSymbols::java_lang_StackTraceElement_of_name(),
-    vmSymbols::java_lang_StackTraceElement_of_signature(),
-    trace,
-    CHECK_NULL);
-  // the method return the same trace array
-
   Symbol* snapshot_klass_name = vmSymbols::jdk_internal_vm_ThreadSnapshot();
   Klass* snapshot_klass = SystemDictionary::resolve_or_fail(snapshot_klass_name, true, CHECK_NULL);
   if (snapshot_klass->should_be_initialized()) {
@@ -1534,5 +1525,3 @@ oop ThreadSnapshotFactory::get_thread_snapshot(jobject jthread, TRAPS) {
   }
   return snapshot();
 }
-
-#endif // INCLUDE_JVMTI
diff --git a/src/hotspot/share/services/threadService.hpp b/src/hotspot/share/services/threadService.hpp
index bbd0722c51f..ddfc78e6315 100644
--- a/src/hotspot/share/services/threadService.hpp
+++ b/src/hotspot/share/services/threadService.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ private:
 
   // As could this...
   // Number of heap bytes allocated by terminated threads.
-  static volatile jlong _exited_allocated_bytes;
+  static volatile uint64_t _exited_allocated_bytes;
 
   // These 2 counters are like the above thread counts, but are
   // atomically decremented in ThreadService::current_thread_exiting instead of
@@ -106,8 +106,8 @@ public:
   static int get_live_thread_count()          { return _atomic_threads_count; }
   static int get_daemon_thread_count()        { return _atomic_daemon_threads_count; }
 
-  static jlong exited_allocated_bytes()       { return AtomicAccess::load(&_exited_allocated_bytes); }
-  static void incr_exited_allocated_bytes(jlong size) {
+  static uint64_t exited_allocated_bytes()    { return AtomicAccess::load(&_exited_allocated_bytes); }
+  static void incr_exited_allocated_bytes(uint64_t size) {
     // No need for an atomic add because called under the Threads_lock,
     // but because _exited_allocated_bytes is read concurrently, need
     // atomic store to avoid readers seeing a partial update.
@@ -635,7 +635,7 @@ class JavaThreadSleepState : public JavaThreadStatusChanger {
 // jdk.internal.vm.ThreadSnapshot support
 class ThreadSnapshotFactory: AllStatic {
 public:
-  JVMTI_ONLY(static oop get_thread_snapshot(jobject jthread, TRAPS);)
+  static oop get_thread_snapshot(jobject jthread, TRAPS);
 };
 
 #endif // SHARE_SERVICES_THREADSERVICE_HPP
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index de39fe32dc1..504b923237e 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,12 +63,17 @@
 #include "utilities/nativeStackPrinter.hpp"
 #include "utilities/unsigned5.hpp"
 #include "utilities/vmError.hpp"
+#if INCLUDE_JFR
+#include "jfr/jfr.hpp"
+#endif
 
 #include <stdarg.h>
 #include <stdio.h>
 
-// These functions needs to be exported on Windows only
-#define DEBUGEXPORT WINDOWS_ONLY(JNIEXPORT)
+// These functions needs to be exported on Windows
+// On Linux it is also beneficial to export them to avoid
+// losing them e.g. with linktime gc
+#define DEBUGEXPORT JNIEXPORT
 
 // Support for showing register content on asserts/guarantees.
 #ifdef CAN_SHOW_REGISTERS_ON_ASSERT
@@ -262,6 +267,8 @@ void report_untested(const char* file, int line, const char* message) {
 void report_java_out_of_memory(const char* message) {
   static int out_of_memory_reported = 0;
 
+  JFR_ONLY(Jfr::on_report_java_out_of_memory();)
+
   // A number of threads may attempt to report OutOfMemoryError at around the
   // same time. To avoid dumping the heap or executing the data collection
   // commands multiple times we just do it once when the first threads reports
@@ -422,10 +429,8 @@ extern "C" DEBUGEXPORT void pp(void* p) {
     tty->print_cr("null");
     return;
   }
-  if (Universe::heap()->is_in(p)) {
-    oop obj = cast_to_oop(p);
-    obj->print();
-  } else {
+
+  if (!Universe::heap()->print_location(tty, p)) {
     // Ask NMT about this pointer.
     // GDB note: We will be using SafeFetch to access the supposed malloc header. If the address is
     // not readable, this will generate a signal. That signal will trip up the debugger: gdb will
@@ -648,13 +653,12 @@ extern "C" DEBUGEXPORT intptr_t u5p(intptr_t addr,
 void pp(intptr_t p)          { pp((void*)p); }
 void pp(oop p)               { pp((void*)p); }
 
-void help() {
+extern "C" DEBUGEXPORT void help() {
   Command c("help");
   tty->print_cr("basic");
   tty->print_cr("  pp(void* p)         - try to make sense of p");
   tty->print_cr("  ps()                - print current thread stack");
   tty->print_cr("  pss()               - print all thread stacks");
-  tty->print_cr("  pm(int pc)          - print Method* given compiled PC");
   tty->print_cr("  findnm(intptr_t pc) - find nmethod*");
   tty->print_cr("  findm(intptr_t pc)  - find Method*");
   tty->print_cr("  find(intptr_t x)    - find & print nmethod/stub/bytecode/oop based on pointer into it");
diff --git a/src/hotspot/share/utilities/forbiddenFunctions.hpp b/src/hotspot/share/utilities/forbiddenFunctions.hpp
index 9d1b88e6233..9b3c65b0656 100644
--- a/src/hotspot/share/utilities/forbiddenFunctions.hpp
+++ b/src/hotspot/share/utilities/forbiddenFunctions.hpp
@@ -63,4 +63,8 @@ PRAGMA_DIAG_POP
 FORBID_IMPORTED_C_FUNCTION(char* strdup(const char *s), noexcept, "use os::strdup");
 FORBID_IMPORTED_C_FUNCTION(wchar_t* wcsdup(const wchar_t *s), noexcept, "don't use");
 
+// Disallow non-wrapped raw library function.
+MACOS_AARCH64_ONLY(FORBID_C_FUNCTION(void pthread_jit_write_protect_np(int enabled), noexcept, \
+                                     "use os::current_thread_enable_wx");)
+
 #endif // SHARE_UTILITIES_FORBIDDENFUNCTIONS_HPP
diff --git a/src/hotspot/share/utilities/globalCounter.cpp b/src/hotspot/share/utilities/globalCounter.cpp
index 7019273d937..114d3b5fed1 100644
--- a/src/hotspot/share/utilities/globalCounter.cpp
+++ b/src/hotspot/share/utilities/globalCounter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  */
 
 #include "memory/iterator.hpp"
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/vmThread.hpp"
@@ -41,7 +41,7 @@ class GlobalCounter::CounterThreadCheck : public ThreadClosure {
     SpinYield yield;
     // Loops on this thread until it has exited the critical read section.
     while(true) {
-      uintx cnt = AtomicAccess::load_acquire(thread->get_rcu_counter());
+      uintx cnt = thread->get_rcu_counter()->load_acquire();
       // This checks if the thread's counter is active. And if so is the counter
       // for a pre-existing reader (belongs to this grace period). A pre-existing
       // reader will have a lower counter than the global counter version for this
@@ -57,9 +57,9 @@ class GlobalCounter::CounterThreadCheck : public ThreadClosure {
 };
 
 void GlobalCounter::write_synchronize() {
-  assert((*Thread::current()->get_rcu_counter() & COUNTER_ACTIVE) == 0x0, "must be outside a critcal section");
-  // AtomicAccess::add must provide fence since we have storeload dependency.
-  uintx gbl_cnt = AtomicAccess::add(&_global_counter._counter, COUNTER_INCREMENT);
+  assert((Thread::current()->get_rcu_counter()->load_relaxed() & COUNTER_ACTIVE) == 0x0, "must be outside a critcal section");
+  // Atomic add must provide fence since we have storeload dependency.
+  uintx gbl_cnt = _global_counter._counter.add_then_fetch(COUNTER_INCREMENT);
 
   // Do all RCU threads.
   CounterThreadCheck ctc(gbl_cnt);
diff --git a/src/hotspot/share/utilities/globalCounter.hpp b/src/hotspot/share/utilities/globalCounter.hpp
index c78831acfa5..80fc1b3e94e 100644
--- a/src/hotspot/share/utilities/globalCounter.hpp
+++ b/src/hotspot/share/utilities/globalCounter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "memory/allStatic.hpp"
 #include "memory/padded.hpp"
+#include "runtime/atomic.hpp"
 
 class Thread;
 
@@ -47,7 +48,7 @@ class GlobalCounter : public AllStatic {
   // counter is on a separate cacheline.
   struct PaddedCounter {
     DEFINE_PAD_MINUS_SIZE(0, DEFAULT_PADDING_SIZE, 0);
-    volatile uintx _counter;
+    Atomic<uintx> _counter;
     DEFINE_PAD_MINUS_SIZE(1, DEFAULT_PADDING_SIZE, sizeof(volatile uintx));
   };
 
diff --git a/src/hotspot/share/utilities/globalCounter.inline.hpp b/src/hotspot/share/utilities/globalCounter.inline.hpp
index 9cc746173b8..ed37b8a878d 100644
--- a/src/hotspot/share/utilities/globalCounter.inline.hpp
+++ b/src/hotspot/share/utilities/globalCounter.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,30 +27,29 @@
 
 #include "utilities/globalCounter.hpp"
 
-#include "runtime/atomicAccess.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
 
 inline GlobalCounter::CSContext
 GlobalCounter::critical_section_begin(Thread *thread) {
   assert(thread == Thread::current(), "must be current thread");
-  uintx old_cnt = AtomicAccess::load(thread->get_rcu_counter());
+  uintx old_cnt = thread->get_rcu_counter()->load_relaxed();
   // Retain the old counter value if already active, e.g. nested.
   // Otherwise, set the counter to the current version + active bit.
   uintx new_cnt = old_cnt;
   if ((new_cnt & COUNTER_ACTIVE) == 0) {
-    new_cnt = AtomicAccess::load(&_global_counter._counter) | COUNTER_ACTIVE;
+    new_cnt = _global_counter._counter.load_relaxed() | COUNTER_ACTIVE;
   }
-  AtomicAccess::release_store_fence(thread->get_rcu_counter(), new_cnt);
+  thread->get_rcu_counter()->release_store_fence(new_cnt);
   return static_cast<CSContext>(old_cnt);
 }
 
 inline void
 GlobalCounter::critical_section_end(Thread *thread, CSContext context) {
   assert(thread == Thread::current(), "must be current thread");
-  assert((*thread->get_rcu_counter() & COUNTER_ACTIVE) == COUNTER_ACTIVE, "must be in critical section");
+  assert((thread->get_rcu_counter()->load_relaxed() & COUNTER_ACTIVE) == COUNTER_ACTIVE, "must be in critical section");
   // Restore the counter value from before the associated begin.
-  AtomicAccess::release_store(thread->get_rcu_counter(),
-                              static_cast<uintx>(context));
+  thread->get_rcu_counter()->release_store(static_cast<uintx>(context));
 }
 
 class GlobalCounter::CriticalSection {
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 54602297759..9560d863a2c 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -168,6 +168,29 @@ class oopDesc;
 #define SIZE_FORMAT_X_0          "0x%08"      PRIxPTR
 #endif  // _LP64
 
+
+template<size_t N>
+constexpr auto sizeof_auto_impl() {
+  if constexpr (N <= std::numeric_limits<uint8_t>::max()) return uint8_t(N);
+  else if constexpr (N <= std::numeric_limits<uint16_t>::max()) return uint16_t(N);
+  else if constexpr (N <= std::numeric_limits<uint32_t>::max()) return uint32_t(N);
+  else return uint64_t(N);
+}
+
+// Yields the size (in bytes) of the operand, using the smallest
+// unsigned type that can represent the size value. The operand may be
+// an expression, which is an unevaluated operand, or it may be a
+// type. All of the restrictions for sizeof operands apply to the
+// operand. The result is a constant expression.
+//
+// Example of correct usage of sizeof/sizeof_auto:
+//   // this will wrap using sizeof_auto, use sizeof to ensure computation using size_t
+//   size_t size = std::numeric_limits<uint32_t>::max() * sizeof(uint16_t);
+//   // implicit narrowing conversion or compiler warning/error using stricter compiler flags when using sizeof
+//   int count = 42 / sizeof_auto(uint16_t);
+
+#define sizeof_auto(...) sizeof_auto_impl<sizeof(__VA_ARGS__)>()
+
 // Convert pointer to intptr_t, for use in printing pointers.
 inline intptr_t p2i(const volatile void* p) {
   return (intptr_t) p;
@@ -433,7 +456,8 @@ typedef unsigned char u_char;
 typedef u_char*       address;
 typedef const u_char* const_address;
 
-// Pointer subtraction.
+// Pointer subtraction, calculating high - low. Asserts on underflow.
+//
 // The idea here is to avoid ptrdiff_t, which is signed and so doesn't have
 // the range we might need to find differences from one end of the heap
 // to the other.
@@ -444,28 +468,28 @@ typedef const u_char* const_address;
 // and then additions like
 //       ... top() + size ...
 // are safe because we know that top() is at least size below end().
-inline size_t pointer_delta(const volatile void* left,
-                            const volatile void* right,
+inline size_t pointer_delta(const volatile void* high,
+                            const volatile void* low,
                             size_t element_size) {
-  assert(left >= right, "avoid underflow - left: " PTR_FORMAT " right: " PTR_FORMAT, p2i(left), p2i(right));
-  return (((uintptr_t) left) - ((uintptr_t) right)) / element_size;
+  assert(high >= low, "avoid underflow - high address: " PTR_FORMAT " low address: " PTR_FORMAT, p2i(high), p2i(low));
+  return (((uintptr_t) high) - ((uintptr_t) low)) / element_size;
 }
 
 // A version specialized for HeapWord*'s.
-inline size_t pointer_delta(const HeapWord* left, const HeapWord* right) {
-  return pointer_delta(left, right, sizeof(HeapWord));
+inline size_t pointer_delta(const HeapWord* high, const HeapWord* low) {
+  return pointer_delta(high, low, sizeof(HeapWord));
 }
 // A version specialized for MetaWord*'s.
-inline size_t pointer_delta(const MetaWord* left, const MetaWord* right) {
-  return pointer_delta(left, right, sizeof(MetaWord));
+inline size_t pointer_delta(const MetaWord* high, const MetaWord* low) {
+  return pointer_delta(high, low, sizeof(MetaWord));
 }
 
 // pointer_delta_as_int is called to do pointer subtraction for nearby pointers that
 // returns a non-negative int, usually used as a size of a code buffer range.
 // This scales to sizeof(T).
 template <typename T>
-inline int pointer_delta_as_int(const volatile T* left, const volatile T* right) {
-  size_t delta = pointer_delta(left, right, sizeof(T));
+inline int pointer_delta_as_int(const volatile T* high, const volatile T* low) {
+  size_t delta = pointer_delta(high, low, sizeof(T));
   assert(delta <= size_t(INT_MAX), "pointer delta out of range: %zu", delta);
   return static_cast<int>(delta);
 }
diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
index 1fef271c8c0..e300bea6993 100644
--- a/src/hotspot/share/utilities/growableArray.hpp
+++ b/src/hotspot/share/utilities/growableArray.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,6 +116,12 @@ protected:
 
   ~GrowableArrayView() {}
 
+protected:
+  // Used by AOTGrowableArray for MetaspaceClosure support.
+  E** data_addr() {
+    return &_data;
+  }
+
 public:
   bool operator==(const GrowableArrayView& rhs) const {
     if (_len != rhs._len)
@@ -487,16 +493,16 @@ public:
     return false;
   }
 
-  // Remove all elements up to the index (exclusive). The order is preserved.
-  void remove_till(int idx) {
-    remove_range(0, idx);
+  // Remove all elements in the range [0; end). The order is preserved.
+  void remove_till(int end) {
+    remove_range(0, end);
   }
 
-  // Remove all elements in the range [start - end). The order is preserved.
+  // Remove all elements in the range [start; end). The order is preserved.
   void remove_range(int start, int end) {
     assert(0 <= start, "illegal start index %d", start);
-    assert(start < end && end <= this->_len,
-           "erase called with invalid range (%d, %d) for length %d",
+    assert(start <= end && end <= this->_len,
+           "erase called with invalid range [%d, %d) for length %d",
            start, end, this->_len);
 
     for (int i = start, j = end; j < this->length(); i++, j++) {
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 8404fc757f0..a03255b5cf3 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -548,6 +548,9 @@
 #endif
 
 #define MACOS_AARCH64_ONLY(x) MACOS_ONLY(AARCH64_ONLY(x))
+#if defined(__APPLE__) && defined(AARCH64)
+#define MACOS_AARCH64 1
+#endif
 
 #if defined(RISCV32) || defined(RISCV64)
 #define RISCV
diff --git a/src/hotspot/share/utilities/permitForbiddenFunctions.hpp b/src/hotspot/share/utilities/permitForbiddenFunctions.hpp
index 71719ac8a76..5dec5062b0c 100644
--- a/src/hotspot/share/utilities/permitForbiddenFunctions.hpp
+++ b/src/hotspot/share/utilities/permitForbiddenFunctions.hpp
@@ -70,6 +70,10 @@ inline void* realloc(void* ptr, size_t size) { return ::realloc(ptr, size); }
 
 inline char* strdup(const char* s) { return ::strdup(s); }
 
+MACOS_AARCH64_ONLY( \
+  inline void pthread_jit_write_protect_np(int enabled) { return ::pthread_jit_write_protect_np(enabled); } \
+)
+
 END_ALLOW_FORBIDDEN_FUNCTIONS
 } // namespace permit_forbidden_function
 
diff --git a/src/hotspot/share/utilities/rbTree.hpp b/src/hotspot/share/utilities/rbTree.hpp
index a2f84ac2373..c522d787466 100644
--- a/src/hotspot/share/utilities/rbTree.hpp
+++ b/src/hotspot/share/utilities/rbTree.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,8 @@
 #define SHARE_UTILITIES_RBTREE_HPP
 
 #include "cppstdlib/type_traits.hpp"
-#include "metaprogramming/enableIf.hpp"
+#include "memory/allocation.hpp"
 #include "nmt/memTag.hpp"
-#include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // An intrusive red-black tree is constructed with two template parameters:
@@ -64,8 +63,9 @@ enum class RBTreeOrdering : int { LT, EQ, GT };
 
 template <typename K, typename NodeType, typename COMPARATOR>
 class AbstractRBTree;
-
+class Arena;
 class outputStream;
+class ResourceArea;
 
 class IntrusiveRBNode {
   template <typename K, typename NodeType, typename COMPARATOR>
@@ -81,7 +81,7 @@ class IntrusiveRBNode {
   DEBUG_ONLY(mutable bool _visited);
 
 public:
-  IntrusiveRBNode() : _parent(0), _left(nullptr), _right(nullptr) DEBUG_ONLY(COMMA _visited(false)) {}
+  IntrusiveRBNode();
 
   // Gets the previous in-order node in the tree.
   // nullptr is returned if there is no previous node.
@@ -96,22 +96,18 @@ public:
   void print_on(outputStream* st, int depth = 0) const;
 
 private:
-  bool is_black() const { return (_parent & 0x1) != 0; }
-  bool is_red() const { return (_parent & 0x1) == 0; }
+  bool is_black() const;
+  bool is_red() const;
 
-  void set_black() { _parent |= 0x1; }
-  void set_red() { _parent &= ~0x1; }
+  void set_black();
+  void set_red();
 
-  IntrusiveRBNode* parent() const { return (IntrusiveRBNode*)(_parent & ~0x1); }
-  void set_parent(IntrusiveRBNode* new_parent) { _parent = (_parent & 0x1) | (uintptr_t)new_parent; }
+  IntrusiveRBNode* parent() const;
+  void set_parent(IntrusiveRBNode* new_parent);
 
-  bool is_right_child() const {
-    return parent() != nullptr && parent()->_right == this;
-  }
+  bool is_right_child() const;
 
-  bool is_left_child() const {
-    return parent() != nullptr && parent()->_left == this;
-  }
+  bool is_left_child() const;
 
   void replace_child(IntrusiveRBNode* old_child, IntrusiveRBNode* new_child);
 
@@ -142,20 +138,20 @@ private:
   V _value;
 
 public:
-  const K& key() const { return _key; }
+  const K& key() const;
 
-  V& val() { return _value; }
-  const V& val() const { return _value; }
-  void set_val(const V& v) { _value = v; }
+  V& val();
+  const V& val() const;
+  void set_val(const V& v);
 
-  RBNode() {}
-  RBNode(const K& key) : IntrusiveRBNode(), _key(key) {}
-  RBNode(const K& key, const V& val) : IntrusiveRBNode(), _key(key), _value(val) {}
+  RBNode();
+  RBNode(const K& key);
+  RBNode(const K& key, const V& val);
 
-  const RBNode<K, V>* prev() const { return (RBNode<K, V>*)IntrusiveRBNode::prev(); }
-  const RBNode<K, V>* next() const { return (RBNode<K, V>*)IntrusiveRBNode::next(); }
-  RBNode<K, V>* prev() { return (RBNode<K, V>*)IntrusiveRBNode::prev(); }
-  RBNode<K, V>* next() { return (RBNode<K, V>*)IntrusiveRBNode::next(); }
+  const RBNode<K, V>* prev() const;
+  const RBNode<K, V>* next() const;
+  RBNode<K, V>* prev();
+  RBNode<K, V>* next();
 
   void print_on(outputStream* st, int depth = 0) const;
 
@@ -176,17 +172,15 @@ public:
     friend AbstractRBTree<K, NodeType, COMPARATOR>;
     NodeType** _insert_location;
     NodeType* _parent;
-    Cursor() : _insert_location(nullptr), _parent(nullptr) {}
-    Cursor(NodeType** insert_location, NodeType* parent)
-        : _insert_location(insert_location), _parent(parent) {}
-    Cursor(NodeType* const* insert_location, NodeType* parent)
-        : _insert_location((NodeType**)insert_location), _parent(parent) {}
+    Cursor();
+    Cursor(NodeType** insert_location, NodeType* parent);
+    Cursor(NodeType* const* insert_location, NodeType* parent);
 
   public:
-    bool valid() const { return _insert_location != nullptr; }
-    bool found() const { return *_insert_location != nullptr; }
-    NodeType* node() { return _insert_location == nullptr ? nullptr : *_insert_location; }
-    NodeType* node() const { return _insert_location == nullptr ? nullptr : *_insert_location; }
+    bool valid() const;
+    bool found() const;
+    NodeType* node();
+    NodeType* node() const;
   };
 
 protected:
@@ -212,36 +206,16 @@ private:
 
   static constexpr bool HasNodeVerifier = HasNodeVerifierImpl<COMPARATOR>::value;
 
-  RBTreeOrdering cmp(const K& a, const NodeType* b) const {
-    if constexpr (HasNodeComparator) {
-      return COMPARATOR::cmp(a, b);
-    } else if constexpr (HasKeyComparator) {
-      return COMPARATOR::cmp(a, b->key());
-    }
-  }
+  RBTreeOrdering cmp(const K& a, const NodeType* b) const;
 
-  bool less_than(const NodeType* a, const NodeType* b) const {
-    if constexpr (HasNodeVerifier) {
-      return COMPARATOR::less_than(a, b);
-    } else {
-      return true;
-    }
-  }
+  bool less_than(const NodeType* a, const NodeType* b) const;
 
-  void assert_key_leq(K a, K b) const {
-    if constexpr (HasKeyComparator) { // Cannot assert if no key comparator exist.
-      assert(COMPARATOR::cmp(a, b) != RBTreeOrdering::GT, "key a must be less or equal to key b");
-    }
-  }
+  void assert_key_leq(K a, K b) const;
 
   // True if node is black (nil nodes count as black)
-  static inline bool is_black(const IntrusiveRBNode* node) {
-    return node == nullptr || node->is_black();
-  }
+  static inline bool is_black(const IntrusiveRBNode* node);
 
-  static inline bool is_red(const IntrusiveRBNode* node) {
-    return node != nullptr && node->is_red();
-  }
+  static inline bool is_red(const IntrusiveRBNode* node);
 
   void fix_insert_violations(IntrusiveRBNode* node);
 
@@ -251,18 +225,14 @@ private:
   void remove_from_tree(IntrusiveRBNode* node);
 
   struct empty_verifier {
-    bool operator()(const NodeType* n) const {
-      return true;
-    }
+    bool operator()(const NodeType* n) const;
   };
 
   template <typename NODE_VERIFIER, typename USER_VERIFIER>
   void verify_self(NODE_VERIFIER verifier, const USER_VERIFIER& extra_verifier) const;
 
   struct default_printer {
-    void operator()(outputStream* st, const NodeType* n, int depth) const {
-      n->print_on(st, depth);
-    }
+    void operator()(outputStream* st, const NodeType* n, int depth) const;
   };
 
   template <typename PRINTER>
@@ -271,12 +241,9 @@ private:
 public:
   NONCOPYABLE(AbstractRBTree);
 
-  AbstractRBTree() : _num_nodes(0), _root(nullptr) DEBUG_ONLY(COMMA _expected_visited(false)) {
-    static_assert(std::is_trivially_destructible<K>::value, "key type must be trivially destructable");
-    static_assert(HasKeyComparator || HasNodeComparator, "comparator must be of correct type");
-  }
+  AbstractRBTree();
 
-  size_t size() const { return _num_nodes; }
+  size_t size() const;
 
   // Gets the cursor associated with the given node or key.
   Cursor cursor(const K& key, const NodeType* hint_node = nullptr);
@@ -311,87 +278,39 @@ public:
   void replace_at_cursor(NodeType* new_node, const Cursor& node_cursor);
 
   // Finds the node associated with the given key.
-  NodeType* find_node(const K& key, const NodeType* hint_node = nullptr) const {
-    Cursor node_cursor = cursor(key, hint_node);
-    return node_cursor.node();
-  }
-
-  NodeType* find_node(const K& key, const NodeType* hint_node = nullptr) {
-    Cursor node_cursor = cursor(key, hint_node);
-    return node_cursor.node();
-  }
+  NodeType* find_node(const K& key, const NodeType* hint_node = nullptr);
+  NodeType* find_node(const K& key, const NodeType* hint_node = nullptr) const;
 
   // Inserts the given node into the tree.
-  void insert(const K& key, NodeType* node, const NodeType* hint_node = nullptr) {
-    Cursor node_cursor = cursor(key, hint_node);
-    insert_at_cursor(node, node_cursor);
-  }
+  void insert(const K& key, NodeType* node, const NodeType* hint_node = nullptr);
 
-  void remove(NodeType* node) {
-    Cursor node_cursor = cursor(node);
-    remove_at_cursor(node_cursor);
-  }
+  // Removes the given node from the tree.
+  void remove(NodeType* node);
 
   // Finds the node with the closest key <= the given key.
   // If no node is found, null is returned instead.
-  NodeType* closest_leq(const K& key) const {
-    Cursor node_cursor = cursor(key);
-    return node_cursor.found() ? node_cursor.node() : prev(node_cursor).node();
-  }
-
-  NodeType* closest_leq(const K& key) {
-    Cursor node_cursor = cursor(key);
-    return node_cursor.found() ? node_cursor.node() : prev(node_cursor).node();
-  }
+  NodeType* closest_leq(const K& key);
+  NodeType* closest_leq(const K& key) const;
 
   // Finds the node with the closest key > the given key.
   // If no node is found, null is returned instead.
-  NodeType* closest_gt(const K& key) const {
-    Cursor node_cursor = cursor(key);
-    return next(node_cursor).node();
-  }
-
-  NodeType* closest_gt(const K& key) {
-    Cursor node_cursor = cursor(key);
-    return next(node_cursor).node();
-  }
+  NodeType* closest_gt(const K& key);
+  NodeType* closest_gt(const K& key) const;
 
   // Finds the node with the closest key >= the given key.
   // If no node is found, null is returned instead.
-  NodeType* closest_ge(const K& key) const {
-    Cursor node_cursor = cursor(key);
-    return node_cursor.found() ? node_cursor.node() : next(node_cursor).node();
-  }
-
-  NodeType* closest_ge(const K& key) {
-    Cursor node_cursor = cursor(key);
-    return node_cursor.found() ? node_cursor.node() : next(node_cursor).node();
-  }
+  NodeType* closest_ge(const K& key);
+  NodeType* closest_ge(const K& key) const;
 
   // Returns leftmost node, nullptr if tree is empty.
   // If COMPARATOR::cmp(a, b) behaves canonically (positive value for a > b), this will the smallest key value.
-  const NodeType* leftmost() const {
-    IntrusiveRBNode* n = _root, *n2 = nullptr;
-    while (n != nullptr) {
-      n2 = n;
-      n = n->_left;
-    }
-    return (NodeType*)n2;
-  }
+  NodeType* leftmost();
+  const NodeType* leftmost() const;
 
   // Returns rightmost node, nullptr if tree is empty.
   // If COMPARATOR::cmp(a, b) behaves canonically (positive value for a > b), this will the largest key value.
-  const NodeType* rightmost() const {
-    IntrusiveRBNode* n = _root, *n2 = nullptr;
-    while (n != nullptr) {
-      n2 = n;
-      n = n->_right;
-    }
-    return (NodeType*)n2;
-  }
-
-  NodeType* leftmost()  { return const_cast<NodeType*>(static_cast<const TreeType*>(this)->leftmost()); }
-  NodeType* rightmost() { return const_cast<NodeType*>(static_cast<const TreeType*>(this)->rightmost()); }
+  NodeType* rightmost();
+  const NodeType* rightmost() const;
 
   struct Range {
     NodeType* start;
@@ -403,11 +322,7 @@ public:
   // Return the range [start, end)
   // where start->key() <= addr < end->key().
   // Failure to find the range leads to start and/or end being null.
-  Range find_enclosing_range(K key) const {
-    NodeType* start = closest_leq(key);
-    NodeType* end = closest_gt(key);
-    return Range(start, end);
-  }
+  Range find_enclosing_range(K key) const;
 
   // Visit all RBNodes in ascending order, calling f on each node.
   // If f returns `true` the iteration continues, otherwise it is stopped at the current node.
@@ -417,7 +332,6 @@ public:
   template <typename F>
   void visit_in_order(F f);
 
-
   // Visit all RBNodes in ascending order whose keys are in range [from, to], calling f on each node.
   // If f returns `true` the iteration continues, otherwise it is stopped at the current node.
   template <typename F>
@@ -433,15 +347,7 @@ public:
   // This should return true if the node is valid.
   // If provided, each node is also verified through this callable.
   template <typename USER_VERIFIER = empty_verifier>
-  void verify_self(const USER_VERIFIER& extra_verifier = USER_VERIFIER()) const {
-    if constexpr (HasNodeVerifier) {
-      verify_self([](const NodeType* a, const NodeType* b){ return COMPARATOR::less_than(a, b);}, extra_verifier);
-    } else if constexpr (HasKeyComparator) {
-      verify_self([](const NodeType* a, const NodeType* b){ return COMPARATOR::cmp(a->key(), b->key()) == RBTreeOrdering::LT; }, extra_verifier);
-    } else {
-      verify_self([](const NodeType*, const NodeType*){ return true;}, extra_verifier);
-    }
-  }
+  void verify_self(const USER_VERIFIER& extra_verifier = USER_VERIFIER()) const;
 
   // Accepts an optional printing callable `void node_printer(outputStream* st, const Node* n, int depth)`.
   // If provided, each node is printed through this callable rather than the default `print_on`.
@@ -458,131 +364,82 @@ class RBTree : public AbstractRBTree<K, RBNode<K, V>, COMPARATOR> {
   ALLOCATOR _allocator;
 
 public:
-  RBTree() : BaseType(), _allocator() {}
+  template<typename... AllocArgs>
+  RBTree(AllocArgs... alloc_args);
+  ~RBTree();
   NONCOPYABLE(RBTree);
-  ~RBTree() { remove_all(); }
 
   bool copy_into(RBTree& other) const;
 
   typedef typename BaseType::Cursor Cursor;
   using BaseType::cursor;
   using BaseType::insert_at_cursor;
-  using BaseType::remove_at_cursor;
   using BaseType::next;
   using BaseType::prev;
 
-  void replace_at_cursor(RBNode<K, V>* new_node, const Cursor& node_cursor) {
-    RBNode<K, V>* old_node = node_cursor.node();
-    BaseType::replace_at_cursor(new_node, node_cursor);
-    free_node(old_node);
-  }
+  void remove_at_cursor(const Cursor& node_cursor);
+  void replace_at_cursor(RBNode<K, V>* new_node, const Cursor& node_cursor);
 
-  RBNode<K, V>* allocate_node(const K& key) {
-    void* node_place = _allocator.allocate(sizeof(RBNode<K, V>));
-    if (node_place == nullptr) {
-      return nullptr;
-    }
-    return new (node_place) RBNode<K, V>(key);
-  }
+  RBNode<K, V>* allocate_node(const K& key);
+  RBNode<K, V>* allocate_node(const K& key, const V& val);
 
-  RBNode<K, V>* allocate_node(const K& key, const V& val) {
-    void* node_place = _allocator.allocate(sizeof(RBNode<K, V>));
-    if (node_place == nullptr) {
-      return nullptr;
-    }
-    return new (node_place) RBNode<K, V>(key, val);
-  }
-
-  void free_node(RBNode<K, V>* node) {
-    node->_value.~V();
-    _allocator.free(node);
-  }
+  void free_node(RBNode<K, V>* node);
 
   // Inserts a node with the given key/value into the tree,
   // if the key already exist, the value is updated instead.
   // Returns false if and only if allocation of a new node failed.
-  bool upsert(const K& key, const V& val, const RBNode<K, V>* hint_node = nullptr) {
-    Cursor node_cursor = cursor(key, hint_node);
-    RBNode<K, V>* node = node_cursor.node();
-    if (node != nullptr) {
-      node->set_val(val);
-      return true;
-    }
-
-    node = allocate_node(key, val);
-    if (node == nullptr) {
-      return false;
-    }
-    insert_at_cursor(node, node_cursor);
-    return true;
-  }
+  bool upsert(const K& key, const V& val, const RBNode<K, V>* hint_node = nullptr);
 
   // Finds the value of the node associated with the given key.
-  V* find(const K& key) {
-    Cursor node_cursor = cursor(key);
-    return node_cursor.found() ? &node_cursor.node()->_value : nullptr;
-  }
+  V* find(const K& key);
+  V* find(const K& key) const;
 
-  V* find(const K& key) const {
-    const Cursor node_cursor = cursor(key);
-    return node_cursor.found() ? &node_cursor.node()->_value : nullptr;
-  }
-
-  void remove(RBNode<K, V>* node) {
-    Cursor node_cursor = cursor(node);
-    remove_at_cursor(node_cursor);
-    free_node(node);
-  }
+  void remove(RBNode<K, V>* node);
 
   // Removes the node with the given key from the tree if it exists.
   // Returns true if the node was successfully removed, false otherwise.
-  bool remove(const K& key) {
-    Cursor node_cursor = cursor(key);
-    if (!node_cursor.found()) {
-      return false;
-    }
-    RBNode<K, V>* node = node_cursor.node();
-    remove_at_cursor(node_cursor);
-    free_node((RBNode<K, V>*)node);
-    return true;
-  }
+  bool remove(const K& key);
 
   // Removes all existing nodes from the tree.
-  void remove_all() {
-    IntrusiveRBNode* to_delete[64];
-    int stack_idx = 0;
-    to_delete[stack_idx++] = BaseType::_root;
-
-    while (stack_idx > 0) {
-      IntrusiveRBNode* head = to_delete[--stack_idx];
-      if (head == nullptr) continue;
-      to_delete[stack_idx++] = head->_left;
-      to_delete[stack_idx++] = head->_right;
-      free_node((RBNode<K, V>*)head);
-    }
-    BaseType::_num_nodes = 0;
-    BaseType::_root = nullptr;
-  }
+  void remove_all();
 };
 
 template <MemTag mem_tag, AllocFailType strategy>
 class RBTreeCHeapAllocator {
 public:
-  void* allocate(size_t sz) {
-    void* allocation = os::malloc(sz, mem_tag);
-    if (allocation == nullptr && strategy == AllocFailStrategy::EXIT_OOM) {
-      vm_exit_out_of_memory(sz, OOM_MALLOC_ERROR,
-                            "red-black tree failed allocation");
-    }
-    return allocation;
-  }
-
-  void free(void* ptr) { os::free(ptr); }
+  void* allocate(size_t sz);
+  void free(void* ptr);
 };
 
+template <AllocFailType strategy>
+class RBTreeArenaAllocator {
+  Arena* _arena;
+public:
+  RBTreeArenaAllocator(Arena* arena);
+  void* allocate(size_t sz);
+  void free(void* ptr);
+};
+
+template <AllocFailType strategy>
+class RBTreeResourceAreaAllocator {
+  ResourceArea* _rarea;
+public:
+  RBTreeResourceAreaAllocator(ResourceArea* rarea);
+  void* allocate(size_t sz);
+  void free(void* ptr);
+};
+
+
+
 template <typename K, typename V, typename COMPARATOR, MemTag mem_tag, AllocFailType strategy = AllocFailStrategy::EXIT_OOM>
 using RBTreeCHeap = RBTree<K, V, COMPARATOR, RBTreeCHeapAllocator<mem_tag, strategy>>;
 
+template <typename K, typename V, typename COMPARATOR, AllocFailType strategy = AllocFailStrategy::EXIT_OOM>
+using RBTreeArena = RBTree<K, V, COMPARATOR, RBTreeArenaAllocator<strategy>>;
+
+template <typename K, typename V, typename COMPARATOR, AllocFailType strategy = AllocFailStrategy::EXIT_OOM>
+using RBTreeResourceArea = RBTree<K, V, COMPARATOR, RBTreeResourceAreaAllocator<strategy>>;
+
 template <typename K, typename COMPARATOR>
 using IntrusiveRBTree = AbstractRBTree<K, IntrusiveRBNode, COMPARATOR>;
 
diff --git a/src/hotspot/share/utilities/rbTree.inline.hpp b/src/hotspot/share/utilities/rbTree.inline.hpp
index 6e01f92d12a..381cb916405 100644
--- a/src/hotspot/share/utilities/rbTree.inline.hpp
+++ b/src/hotspot/share/utilities/rbTree.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,49 @@
 
 #include "utilities/rbTree.hpp"
 
+#include "memory/allocation.hpp"
+#include "memory/arena.hpp"
+#include "memory/resourceArea.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/powerOfTwo.hpp"
 
+inline IntrusiveRBNode::IntrusiveRBNode()
+  : _parent(0), _left(nullptr), _right(nullptr) DEBUG_ONLY(COMMA _visited(false)) {}
+
+inline bool IntrusiveRBNode::is_black() const {
+  return (_parent & 0x1) != 0;
+}
+
+inline bool IntrusiveRBNode::is_red() const {
+  return (_parent & 0x1) == 0;
+}
+
+inline void IntrusiveRBNode::set_black() {
+  _parent |= 0x1;
+}
+inline void IntrusiveRBNode::set_red() {
+  _parent &= ~0x1;
+}
+
+inline IntrusiveRBNode* IntrusiveRBNode::parent() const {
+  return reinterpret_cast<IntrusiveRBNode*>(_parent & ~0x1);
+}
+
+inline void IntrusiveRBNode::set_parent(IntrusiveRBNode* new_parent) {
+  _parent = (_parent & 0x1) | reinterpret_cast<uintptr_t>(new_parent);
+}
+
+inline bool IntrusiveRBNode::is_right_child() const {
+  return parent() != nullptr && parent()->_right == this;
+}
+
+inline bool IntrusiveRBNode::is_left_child() const {
+  return parent() != nullptr && parent()->_left == this;
+}
+
 inline void IntrusiveRBNode::replace_child(IntrusiveRBNode* old_child, IntrusiveRBNode* new_child) {
   if (_left == old_child) {
     _left = new_child;
@@ -185,6 +222,144 @@ inline void IntrusiveRBNode::verify(
 
 }
 
+template <typename K, typename V>
+inline const K& RBNode<K, V>::key() const {
+  return _key;
+}
+
+template <typename K, typename V>
+inline V& RBNode<K, V>::val() {
+  return _value;
+}
+
+template <typename K, typename V>
+inline const V& RBNode<K, V>::val() const {
+  return _value;
+}
+
+template <typename K, typename V>
+inline void RBNode<K, V>::set_val(const V& v) {
+  _value = v;
+}
+
+template <typename K, typename V>
+inline RBNode<K, V>::RBNode() {}
+
+template <typename K, typename V>
+inline RBNode<K, V>::RBNode(const K& key) : IntrusiveRBNode(), _key(key) {}
+
+template <typename K, typename V>
+inline RBNode<K, V>::RBNode(const K& key, const V& val) : IntrusiveRBNode(), _key(key), _value(val) {}
+
+template <typename K, typename V>
+inline const RBNode<K, V>* RBNode<K, V>::prev() const {
+  return static_cast<const RBNode<K, V>*>(IntrusiveRBNode::prev());
+}
+
+template <typename K, typename V>
+inline const RBNode<K, V>* RBNode<K, V>::next() const {
+  return static_cast<const RBNode<K, V>*>(IntrusiveRBNode::next());
+}
+
+template <typename K, typename V>
+inline RBNode<K, V>* RBNode<K, V>::prev() {
+  return static_cast<RBNode<K, V>*>(IntrusiveRBNode::prev());
+}
+
+template <typename K, typename V>
+inline RBNode<K, V>* RBNode<K, V>::next() {
+  return static_cast<RBNode<K, V>*>(IntrusiveRBNode::next());
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::Cursor()
+  : _insert_location(nullptr), _parent(nullptr) {}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::Cursor(NodeType** insert_location, NodeType* parent)
+  : _insert_location(insert_location), _parent(parent) {}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::Cursor(NodeType* const* insert_location, NodeType* parent)
+  : _insert_location(const_cast<NodeType**>(insert_location)), _parent(parent) {}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline bool AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::valid() const {
+  return _insert_location != nullptr;
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline bool AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::found() const {
+  return *_insert_location != nullptr;
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::node() {
+  return _insert_location == nullptr ? nullptr : *_insert_location;
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::Cursor::node() const {
+  return _insert_location == nullptr ? nullptr : *_insert_location;
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline RBTreeOrdering AbstractRBTree<K, NodeType, COMPARATOR>::cmp(const K& a, const NodeType* b) const {
+  if constexpr (HasNodeComparator) {
+    return COMPARATOR::cmp(a, b);
+  } else if constexpr (HasKeyComparator) {
+    return COMPARATOR::cmp(a, b->key());
+  }
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline bool AbstractRBTree<K, NodeType, COMPARATOR>::less_than(const NodeType* a, const NodeType* b) const {
+  if constexpr (HasNodeVerifier) {
+    return COMPARATOR::less_than(a, b);
+  } else {
+    return true;
+  }
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline void AbstractRBTree<K, NodeType, COMPARATOR>::assert_key_leq(K a, K b) const {
+  if constexpr (HasKeyComparator) { // Cannot assert if no key comparator exist.
+    assert(COMPARATOR::cmp(a, b) != RBTreeOrdering::GT, "key a must be less or equal to key b");
+  }
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline bool AbstractRBTree<K, NodeType, COMPARATOR>::is_black(const IntrusiveRBNode* node) {
+  return node == nullptr || node->is_black();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline bool AbstractRBTree<K, NodeType, COMPARATOR>::is_red(const IntrusiveRBNode* node) {
+  return node != nullptr && node->is_red();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline bool AbstractRBTree<K, NodeType, COMPARATOR>::empty_verifier::operator()(const NodeType* n) const {
+  return true;
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline void AbstractRBTree<K, NodeType, COMPARATOR>::default_printer::operator()(outputStream* st, const NodeType* n, int depth) const {
+  n->print_on(st, depth);
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline AbstractRBTree<K, NodeType, COMPARATOR>::AbstractRBTree()
+    : _num_nodes(0), _root(nullptr) DEBUG_ONLY(COMMA _expected_visited(false)) {
+  static_assert(std::is_trivially_destructible<K>::value, "key type must be trivially destructable");
+  static_assert(HasKeyComparator || HasNodeComparator, "comparator must be of correct type");
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline size_t AbstractRBTree<K, NodeType, COMPARATOR>::size() const {
+  return _num_nodes;
+}
+
 template <typename K, typename NodeType, typename COMPARATOR>
 inline const typename AbstractRBTree<K, NodeType, COMPARATOR>::Cursor
 AbstractRBTree<K, NodeType, COMPARATOR>::cursor(const K& key, const NodeType* hint_node) const {
@@ -233,7 +408,9 @@ AbstractRBTree<K, NodeType, COMPARATOR>::cursor(const K& key, const NodeType* hi
 
 template <typename K, typename NodeType, typename COMPARATOR>
 inline void AbstractRBTree<K, NodeType, COMPARATOR>::insert_at_cursor(NodeType* node, const Cursor& node_cursor) {
-  assert(node_cursor.valid() && !node_cursor.found(), "must be");
+  precond(node != nullptr);
+  precond(node_cursor.valid());
+  precond(!node_cursor.found());
   _num_nodes++;
 
   *node_cursor._insert_location = node;
@@ -447,7 +624,8 @@ inline void AbstractRBTree<K, NodeType, COMPARATOR>::remove_from_tree(IntrusiveR
 
 template <typename K, typename NodeType, typename COMPARATOR>
 inline void AbstractRBTree<K, NodeType, COMPARATOR>::remove_at_cursor(const Cursor& node_cursor) {
-  assert(node_cursor.valid() && node_cursor.found(), "must be");
+  precond(node_cursor.valid());
+  precond(node_cursor.found());
   _num_nodes--;
 
   IntrusiveRBNode* node = node_cursor.node();
@@ -543,7 +721,9 @@ AbstractRBTree<K, NodeType, COMPARATOR>::prev(const Cursor& node_cursor) const {
 
 template <typename K, typename NodeType, typename COMPARATOR>
 inline void AbstractRBTree<K, NodeType, COMPARATOR>::replace_at_cursor(NodeType* new_node, const Cursor& node_cursor) {
-  assert(node_cursor.valid() && node_cursor.found(), "must be");
+  precond(new_node != nullptr);
+  precond(node_cursor.valid());
+  precond(node_cursor.found());
   NodeType* old_node = node_cursor.node();
   if (old_node == new_node) {
     return;
@@ -596,6 +776,106 @@ AbstractRBTree<K, NodeType, COMPARATOR>::prev(const Cursor& node_cursor) {
   return static_cast<const AbstractRBTree<K, NodeType, COMPARATOR>*>(this)->prev(node_cursor);
 }
 
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::find_node(const K& key, const NodeType* hint_node) const {
+  Cursor node_cursor = cursor(key, hint_node);
+  return node_cursor.node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::find_node(const K& key, const NodeType* hint_node) {
+  Cursor node_cursor = cursor(key, hint_node);
+  return node_cursor.node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline void AbstractRBTree<K, NodeType, COMPARATOR>::insert(const K& key, NodeType* node, const NodeType* hint_node) {
+  precond(node != nullptr);
+  Cursor node_cursor = cursor(key, hint_node);
+  insert_at_cursor(node, node_cursor);
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline void AbstractRBTree<K, NodeType, COMPARATOR>::remove(NodeType* node) {
+  precond(node != nullptr);
+  Cursor node_cursor = cursor(node);
+  remove_at_cursor(node_cursor);
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::closest_leq(const K& key) const {
+  Cursor node_cursor = cursor(key);
+  return node_cursor.found() ? node_cursor.node() : prev(node_cursor).node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::closest_leq(const K& key) {
+  Cursor node_cursor = cursor(key);
+  return node_cursor.found() ? node_cursor.node() : prev(node_cursor).node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::closest_gt(const K& key) const {
+  Cursor node_cursor = cursor(key);
+  return next(node_cursor).node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::closest_gt(const K& key) {
+  Cursor node_cursor = cursor(key);
+  return next(node_cursor).node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::closest_ge(const K& key) const {
+  Cursor node_cursor = cursor(key);
+  return node_cursor.found() ? node_cursor.node() : next(node_cursor).node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::closest_ge(const K& key) {
+  Cursor node_cursor = cursor(key);
+  return node_cursor.found() ? node_cursor.node() : next(node_cursor).node();
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline const NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::leftmost() const {
+  IntrusiveRBNode* n = _root, *n2 = nullptr;
+  while (n != nullptr) {
+    n2 = n;
+    n = n->_left;
+  }
+  return static_cast<const NodeType*>(n2);
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline const NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::rightmost() const {
+  IntrusiveRBNode* n = _root, *n2 = nullptr;
+  while (n != nullptr) {
+    n2 = n;
+    n = n->_right;
+  }
+  return static_cast<const NodeType*>(n2);
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::leftmost() {
+  return const_cast<NodeType*>(static_cast<const AbstractRBTree<K, NodeType, COMPARATOR>*>(this)->leftmost());
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline NodeType* AbstractRBTree<K, NodeType, COMPARATOR>::rightmost() {
+  return const_cast<NodeType*>(static_cast<const AbstractRBTree<K, NodeType, COMPARATOR>*>(this)->rightmost());
+}
+
+template <typename K, typename NodeType, typename COMPARATOR>
+inline typename AbstractRBTree<K, NodeType, COMPARATOR>::Range
+AbstractRBTree<K, NodeType, COMPARATOR>::find_enclosing_range(K key) const {
+  NodeType* start = closest_leq(key);
+  NodeType* end = closest_gt(key);
+  return Range(start, end);
+}
+
 template <typename K, typename NodeType, typename COMPARATOR>
 template <typename F>
 inline void AbstractRBTree<K, NodeType, COMPARATOR>::visit_in_order(F f) const {
@@ -662,6 +942,18 @@ inline void AbstractRBTree<K, NodeType, COMPARATOR>::visit_range_in_order(const
   }
 }
 
+template <typename K, typename NodeType, typename COMPARATOR>
+template <typename USER_VERIFIER>
+inline void AbstractRBTree<K, NodeType, COMPARATOR>::verify_self(const USER_VERIFIER& extra_verifier) const {
+  if constexpr (HasNodeVerifier) {
+    verify_self([](const NodeType* a, const NodeType* b){ return COMPARATOR::less_than(a, b);}, extra_verifier);
+  } else if constexpr (HasKeyComparator) {
+    verify_self([](const NodeType* a, const NodeType* b){ return COMPARATOR::cmp(a->key(), b->key()) == RBTreeOrdering::LT; }, extra_verifier);
+  } else {
+    verify_self([](const NodeType*, const NodeType*){ return true;}, extra_verifier);
+  }
+}
+
 template <typename K, typename NodeType, typename COMPARATOR>
 template <typename NODE_VERIFIER, typename USER_VERIFIER>
 inline void AbstractRBTree<K, NodeType, COMPARATOR>::verify_self(NODE_VERIFIER verifier, const USER_VERIFIER& extra_verifier) const {
@@ -753,11 +1045,20 @@ void AbstractRBTree<K, NodeType, COMPARATOR>::print_on(outputStream* st, const P
   }
 }
 
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+template<typename... AllocArgs>
+inline RBTree<K, V, COMPARATOR, ALLOCATOR>::RBTree(AllocArgs... alloc_args) : BaseType(), _allocator(alloc_args...) {}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline RBTree<K, V, COMPARATOR, ALLOCATOR>::~RBTree() {
+  remove_all();
+}
+
 template<typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
 bool RBTree<K, V, COMPARATOR, ALLOCATOR>::copy_into(RBTree& other) const {
-  assert(other.size() == 0, "You can only copy into an empty RBTree");
-  assert(std::is_copy_constructible<K>::value, "Key type must be copy-constructible when copying a RBTree");
-  assert(std::is_copy_constructible<V>::value, "Value type must be copy-constructible when copying a RBTree");
+  precond(other.size() == 0);
+  precond(std::is_copy_constructible<K>::value);
+  precond(std::is_copy_constructible<V>::value);
   enum class Dir { Left, Right };
   struct node_pair { const IntrusiveRBNode* current; IntrusiveRBNode* other_parent; Dir dir; };
   struct stack {
@@ -802,4 +1103,145 @@ bool RBTree<K, V, COMPARATOR, ALLOCATOR>::copy_into(RBTree& other) const {
   return true;
 }
 
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline void RBTree<K, V, COMPARATOR, ALLOCATOR>::remove_at_cursor(const Cursor& node_cursor) {
+  precond(node_cursor.valid());
+  precond(node_cursor.found());
+  RBNode<K, V>* old_node = node_cursor.node();
+  BaseType::remove_at_cursor(node_cursor);
+  free_node(old_node);
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline void RBTree<K, V, COMPARATOR, ALLOCATOR>::replace_at_cursor(RBNode<K, V>* new_node, const Cursor& node_cursor) {
+  precond(new_node != nullptr);
+  precond(node_cursor.valid());
+  precond(node_cursor.found());
+  RBNode<K, V>* old_node = node_cursor.node();
+  BaseType::replace_at_cursor(new_node, node_cursor);
+  free_node(old_node);
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline RBNode<K, V>* RBTree<K, V, COMPARATOR, ALLOCATOR>::allocate_node(const K& key) {
+  void* node_place = _allocator.allocate(sizeof(RBNode<K, V>));
+  if (node_place == nullptr) {
+    return nullptr;
+  }
+  return new (node_place) RBNode<K, V>(key);
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline RBNode<K, V>* RBTree<K, V, COMPARATOR, ALLOCATOR>::allocate_node(const K& key, const V& val) {
+  void* node_place = _allocator.allocate(sizeof(RBNode<K, V>));
+  if (node_place == nullptr) {
+    return nullptr;
+  }
+  return new (node_place) RBNode<K, V>(key, val);
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline void RBTree<K, V, COMPARATOR, ALLOCATOR>::free_node(RBNode<K, V>* node) {
+  precond(node != nullptr);
+  node->_value.~V();
+  _allocator.free(node);
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline bool RBTree<K, V, COMPARATOR, ALLOCATOR>::upsert(const K& key, const V& val, const RBNode<K, V>* hint_node) {
+  Cursor node_cursor = cursor(key, hint_node);
+  RBNode<K, V>* node = node_cursor.node();
+  if (node != nullptr) {
+    node->set_val(val);
+    return true;
+  }
+
+  node = allocate_node(key, val);
+  if (node == nullptr) {
+    return false;
+  }
+  insert_at_cursor(node, node_cursor);
+  return true;
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline V* RBTree<K, V, COMPARATOR, ALLOCATOR>::find(const K& key) {
+  Cursor node_cursor = cursor(key);
+  return node_cursor.found() ? &node_cursor.node()->_value : nullptr;
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline V* RBTree<K, V, COMPARATOR, ALLOCATOR>::find(const K& key) const {
+  const Cursor node_cursor = cursor(key);
+  return node_cursor.found() ? &node_cursor.node()->_value : nullptr;
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline void RBTree<K, V, COMPARATOR, ALLOCATOR>::remove(RBNode<K, V>* node) {
+  Cursor node_cursor = cursor(node);
+  BaseType::remove_at_cursor(node_cursor);
+  free_node(node);
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline bool RBTree<K, V, COMPARATOR, ALLOCATOR>::remove(const K& key) {
+  Cursor node_cursor = cursor(key);
+  if (!node_cursor.found()) {
+    return false;
+  }
+  RBNode<K, V>* node = node_cursor.node();
+  BaseType::remove_at_cursor(node_cursor);
+  free_node((RBNode<K, V>*)node);
+  return true;
+}
+
+template <typename K, typename V, typename COMPARATOR, typename ALLOCATOR>
+inline void RBTree<K, V, COMPARATOR, ALLOCATOR>::remove_all() {
+  IntrusiveRBNode* to_delete[64];
+  int stack_idx = 0;
+  to_delete[stack_idx++] = BaseType::_root;
+
+  while (stack_idx > 0) {
+    IntrusiveRBNode* head = to_delete[--stack_idx];
+    if (head == nullptr) continue;
+    to_delete[stack_idx++] = head->_left;
+    to_delete[stack_idx++] = head->_right;
+    free_node((RBNode<K, V>*)head);
+  }
+  BaseType::_num_nodes = 0;
+  BaseType::_root = nullptr;
+}
+
+template <MemTag mem_tag, AllocFailType strategy>
+inline void* RBTreeCHeapAllocator<mem_tag, strategy>::allocate(size_t sz) {
+  return AllocateHeap(sz, mem_tag, strategy);
+}
+
+template <MemTag mem_tag, AllocFailType strategy>
+inline void RBTreeCHeapAllocator<mem_tag, strategy>::free(void* ptr) {
+  FreeHeap(ptr);
+}
+
+template <AllocFailType strategy>
+inline RBTreeArenaAllocator<strategy>::RBTreeArenaAllocator(Arena* arena) : _arena(arena) {}
+
+template <AllocFailType strategy>
+inline void* RBTreeArenaAllocator<strategy>::allocate(size_t sz) {
+  return _arena->Amalloc(sz, strategy);
+}
+
+template <AllocFailType strategy>
+inline void RBTreeArenaAllocator<strategy>::free(void* ptr) { /* NOP */ }
+
+template <AllocFailType strategy>
+inline RBTreeResourceAreaAllocator<strategy>::RBTreeResourceAreaAllocator(ResourceArea* rarea) : _rarea(rarea) {}
+
+template <AllocFailType strategy>
+inline void* RBTreeResourceAreaAllocator<strategy>::allocate(size_t sz) {
+  return _rarea->Amalloc(sz, strategy);
+}
+
+template <AllocFailType strategy>
+inline void RBTreeResourceAreaAllocator<strategy>::free(void* ptr) { /* NOP */ }
+
 #endif // SHARE_UTILITIES_RBTREE_INLINE_HPP
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index a290602e0be..6088eafbda4 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2024 SAP SE. All rights reserved.
  * Copyright (c) 2023, 2025, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -966,10 +966,15 @@ void VMError::report(outputStream* st, bool _verbose) {
     frame fr = _context ? os::fetch_frame_from_context(_context)
                         : os::current_frame();
 
-    if (fr.sp()) {
-      st->print(",  sp=" PTR_FORMAT, p2i(fr.sp()));
-      size_t free_stack_size = pointer_delta(fr.sp(), stack_bottom, 1024);
-      st->print(",  free space=%zuk", free_stack_size);
+    address sp = (address)fr.sp();
+    if (sp != nullptr) {
+      st->print(",  sp=" PTR_FORMAT, p2i(sp));
+      if (sp >= stack_bottom && sp < stack_top) {
+        size_t free_stack_size = pointer_delta(sp, stack_bottom, 1024);
+        st->print(",  free space=%zuk", free_stack_size);
+      } else {
+        st->print(" **OUTSIDE STACK**.");
+      }
     }
 
     st->cr();
@@ -1898,7 +1903,7 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt
     log.set_fd(-1);
   }
 
-  JFR_ONLY(Jfr::on_vm_shutdown(static_cast<VMErrorType>(_id) == OOM_JAVA_HEAP_FATAL, true);)
+  JFR_ONLY(Jfr::on_vm_shutdown(true, false, static_cast<VMErrorType>(_id) == OOM_JAVA_HEAP_FATAL);)
 
   if (PrintNMTStatistics) {
     fdStream fds(fd_out);
diff --git a/src/java.base/aix/classes/sun/nio/ch/DefaultPollerProvider.java b/src/java.base/aix/classes/sun/nio/ch/DefaultPollerProvider.java
index b645b735533..eb895d5a3a1 100644
--- a/src/java.base/aix/classes/sun/nio/ch/DefaultPollerProvider.java
+++ b/src/java.base/aix/classes/sun/nio/ch/DefaultPollerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,28 @@ import java.io.IOException;
  * Default PollerProvider for AIX.
  */
 class DefaultPollerProvider extends PollerProvider {
-    DefaultPollerProvider() { }
+    DefaultPollerProvider(Poller.Mode mode) {
+        if (mode != Poller.Mode.SYSTEM_THREADS) {
+            throw new UnsupportedOperationException();
+        }
+        super(mode);
+    }
+
+    DefaultPollerProvider() {
+        this(Poller.Mode.SYSTEM_THREADS);
+    }
 
     @Override
     Poller readPoller(boolean subPoller) throws IOException {
+        if (subPoller)
+            throw new UnsupportedOperationException();
         return new PollsetPoller(true);
     }
 
     @Override
     Poller writePoller(boolean subPoller) throws IOException {
+        if (subPoller)
+            throw new UnsupportedOperationException();
         return new PollsetPoller(false);
     }
 }
diff --git a/src/java.base/aix/classes/sun/nio/ch/PollsetPoller.java b/src/java.base/aix/classes/sun/nio/ch/PollsetPoller.java
index 724f14495a8..3eee39906ee 100644
--- a/src/java.base/aix/classes/sun/nio/ch/PollsetPoller.java
+++ b/src/java.base/aix/classes/sun/nio/ch/PollsetPoller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, IBM Corp.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -52,13 +52,19 @@ class PollsetPoller extends Poller {
         this.pollBuffer = Pollset.allocatePollArray(MAX_EVENTS_TO_POLL);
     }
 
+    @Override
+    void close() {
+        Pollset.pollsetDestroy(setid);
+        Pollset.freePollArray(pollBuffer);
+    }
+
     @Override
     int fdVal() {
         return setid;
     }
 
     @Override
-    void implRegister(int fd) throws IOException {
+    void implStartPoll(int fd) throws IOException {
         int ret = Pollset.pollsetCtl(setid, Pollset.PS_MOD, fd, Pollset.PS_POLLPRI | event);
         if (ret != 0) {
             throw new IOException("Unable to register fd " + fd);
@@ -66,7 +72,7 @@ class PollsetPoller extends Poller {
     }
 
     @Override
-    void implDeregister(int fd, boolean polled) {
+    void implStopPoll(int fd, boolean polled) {
         int ret = Pollset.pollsetCtl(setid, Pollset.PS_DELETE, fd, 0);
         assert ret == 0;
     }
diff --git a/src/java.base/linux/classes/sun/nio/ch/DefaultPollerProvider.java b/src/java.base/linux/classes/sun/nio/ch/DefaultPollerProvider.java
index a9b169a4657..b53a90e4f7f 100644
--- a/src/java.base/linux/classes/sun/nio/ch/DefaultPollerProvider.java
+++ b/src/java.base/linux/classes/sun/nio/ch/DefaultPollerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,34 +31,34 @@ import jdk.internal.vm.ContinuationSupport;
  * Default PollerProvider for Linux.
  */
 class DefaultPollerProvider extends PollerProvider {
-    DefaultPollerProvider() { }
+    DefaultPollerProvider(Poller.Mode mode) {
+        super(mode);
+    }
 
-    @Override
-    Poller.Mode defaultPollerMode() {
-        if (ContinuationSupport.isSupported()) {
-            return Poller.Mode.VTHREAD_POLLERS;
-        } else {
-            return Poller.Mode.SYSTEM_THREADS;
-        }
+    DefaultPollerProvider() {
+        var mode = ContinuationSupport.isSupported()
+                ? Poller.Mode.VTHREAD_POLLERS
+                : Poller.Mode.SYSTEM_THREADS;
+        this(mode);
     }
 
     @Override
-    int defaultReadPollers(Poller.Mode mode) {
+    int defaultReadPollers() {
         int ncpus = Runtime.getRuntime().availableProcessors();
-        if (mode == Poller.Mode.VTHREAD_POLLERS) {
-            return Math.min(Integer.highestOneBit(ncpus), 32);
-        } else {
-            return Math.max(Integer.highestOneBit(ncpus / 4), 1);
-        }
+        return switch (pollerMode()) {
+            case SYSTEM_THREADS  -> Math.max(Integer.highestOneBit(ncpus / 4), 1);
+            case VTHREAD_POLLERS -> Math.min(Integer.highestOneBit(ncpus), 32);
+            default              -> super.defaultReadPollers();
+        };
     }
 
     @Override
     Poller readPoller(boolean subPoller) throws IOException {
-        return new EPollPoller(subPoller, true);
+        return new EPollPoller(pollerMode(), subPoller, true);
     }
 
     @Override
     Poller writePoller(boolean subPoller) throws IOException {
-        return new EPollPoller(subPoller, false);
+        return new EPollPoller(pollerMode(), subPoller, false);
     }
 }
diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollPoller.java b/src/java.base/linux/classes/sun/nio/ch/EPollPoller.java
index cdebff7c766..5c45393bd62 100644
--- a/src/java.base/linux/classes/sun/nio/ch/EPollPoller.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollPoller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 package sun.nio.ch;
 
 import java.io.IOException;
+import java.lang.ref.Cleaner.Cleanable;
+import jdk.internal.ref.CleanerFactory;
 import static sun.nio.ch.EPoll.*;
 
 /**
@@ -38,12 +40,70 @@ class EPollPoller extends Poller {
     private final int event;
     private final int maxEvents;
     private final long address;
+    private final EventFD eventfd;  // wakeup event, used for shutdown
 
-    EPollPoller(boolean subPoller, boolean read) throws IOException {
-        this.epfd = EPoll.create();
+    // close action, and cleaner if this is subpoller
+    private final Runnable closer;
+    private final Cleanable cleaner;
+
+    EPollPoller(Poller.Mode mode, boolean subPoller, boolean read) throws IOException {
+        boolean wakeable = (mode == Mode.POLLER_PER_CARRIER) && subPoller;
+        int maxEvents = (subPoller) ? 16 : 64;
+
+        int epfd = EPoll.create();
+        long address = 0L;
+        EventFD eventfd = null;
+        try {
+            address = EPoll.allocatePollArray(maxEvents);
+
+            // register one end of the pipe with epoll to allow for wakeup
+            if (wakeable) {
+                eventfd = new EventFD();
+                IOUtil.configureBlocking(eventfd.efd(), false);
+                EPoll.ctl(epfd, EPOLL_CTL_ADD, eventfd.efd(), EPOLLIN);
+            }
+        } catch (Throwable e) {
+            FileDispatcherImpl.closeIntFD(epfd);
+            if (address != 0L) EPoll.freePollArray(address);
+            if (eventfd != null) eventfd.close();
+            throw e;
+        }
+
+        this.epfd = epfd;
         this.event = (read) ? EPOLLIN : EPOLLOUT;
-        this.maxEvents = (subPoller) ? 64 : 512;
-        this.address = EPoll.allocatePollArray(maxEvents);
+        this.maxEvents = maxEvents;
+        this.address = address;
+        this.eventfd = eventfd;
+
+        // create action to close epoll instance, register cleaner when wakeable
+        this.closer = closer(epfd, address, eventfd);
+        if (wakeable) {
+            this.cleaner = CleanerFactory.cleaner().register(this, closer);
+        } else {
+            this.cleaner = null;
+        }
+    }
+
+    /**
+     * Returns an action to close the epoll instance and release other resources.
+     */
+    private static Runnable closer(int epfd, long address, EventFD eventfd) {
+        return () -> {
+            try {
+                FileDispatcherImpl.closeIntFD(epfd);
+                EPoll.freePollArray(address);
+                if (eventfd != null) eventfd.close();
+            } catch (IOException _) { }
+        };
+    }
+
+    @Override
+    void close() {
+        if (cleaner != null) {
+            cleaner.clean();
+        } else {
+            closer.run();
+        }
     }
 
     @Override
@@ -52,8 +112,8 @@ class EPollPoller extends Poller {
     }
 
     @Override
-    void implRegister(int fdVal) throws IOException {
-        // re-arm
+    void implStartPoll(int fdVal) throws IOException {
+        // re-enable if already registered but disabled (previously polled)
         int err = EPoll.ctl(epfd, EPOLL_CTL_MOD, fdVal, (event | EPOLLONESHOT));
         if (err == ENOENT)
             err = EPoll.ctl(epfd, EPOLL_CTL_ADD, fdVal, (event | EPOLLONESHOT));
@@ -62,24 +122,36 @@ class EPollPoller extends Poller {
     }
 
     @Override
-    void implDeregister(int fdVal, boolean polled) {
+    void implStopPoll(int fdVal, boolean polled) {
         // event is disabled if already polled
         if (!polled) {
             EPoll.ctl(epfd, EPOLL_CTL_DEL, fdVal, 0);
         }
     }
 
+    @Override
+    void wakeupPoller() throws IOException {
+        if (eventfd == null) {
+            throw new UnsupportedOperationException();
+        }
+        eventfd.set();
+    }
+
     @Override
     int poll(int timeout) throws IOException {
         int n = EPoll.wait(epfd, address, maxEvents, timeout);
+        int polled = 0;
         int i = 0;
         while (i < n) {
             long eventAddress = EPoll.getEvent(address, i);
-            int fdVal = EPoll.getDescriptor(eventAddress);
-            polled(fdVal);
+            int fd = EPoll.getDescriptor(eventAddress);
+            if (eventfd == null || fd != eventfd.efd()) {
+                polled(fd);
+                polled++;
+            }
             i++;
         }
-        return n;
+        return polled;
     }
 }
 
diff --git a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
index efbd0ca5684..54d640b03a4 100644
--- a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
+++ b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferFrom0(JNIEnv *env, jobject this,
     if (n < 0) {
         if (errno == EAGAIN)
             return IOS_UNAVAILABLE;
-        if (errno == ENOSYS)
+        if (errno == ENOSYS || errno == EOPNOTSUPP)
             return IOS_UNSUPPORTED_CASE;
         if ((errno == EBADF || errno == EINVAL || errno == EXDEV) &&
             ((ssize_t)count >= 0))
@@ -103,6 +103,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferTo0(JNIEnv *env, jobject this,
                 case EINVAL:
                 case ENOSYS:
                 case EXDEV:
+                case EOPNOTSUPP:
                     // ignore and try sendfile()
                     break;
                 default:
diff --git a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
index c90e99dda07..4677411b0ba 100644
--- a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
+++ b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -193,6 +193,7 @@ Java_sun_nio_fs_LinuxNativeDispatcher_directCopy0
                     case EINVAL:
                     case ENOSYS:
                     case EXDEV:
+                    case EOPNOTSUPP:
                         // ignore and try sendfile()
                         break;
                     default:
diff --git a/src/java.base/macosx/classes/apple/security/KeychainStore.java b/src/java.base/macosx/classes/apple/security/KeychainStore.java
index 6f70fccbb24..63dfc39afe1 100644
--- a/src/java.base/macosx/classes/apple/security/KeychainStore.java
+++ b/src/java.base/macosx/classes/apple/security/KeychainStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@ import java.security.*;
 import java.security.cert.*;
 import java.security.cert.Certificate;
 import java.security.spec.*;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 import javax.crypto.*;
@@ -114,7 +116,7 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
     // SecCertificateRef.  When we delete the key we have to delete all of the corresponding
     // native objects.
     static class KeyEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation instant of this entry
         byte[] protectedPrivKey;
         char[] password;
         long keyRef;  // SecKeyRef for this key
@@ -124,7 +126,7 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
 
     // Trusted certificates
     static class TrustedCertEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation instant of this entry
 
         Certificate cert;
         long certRef;  // SecCertificateRef for this key
@@ -405,13 +407,32 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
      * not exist
      */
     public Date engineGetCreationDate(String alias) {
-        Object entry = entries.get(alias.toLowerCase(Locale.ROOT));
+        final Instant instant = this.engineGetCreationInstant(alias);
+        if (instant == null) {
+            return null;
+        }
+        return Date.from(instant);
+    }
+
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @since 27
+     */
+    public Instant engineGetCreationInstant(String alias) {
+        final Object entry = entries.get(alias.toLowerCase(Locale.ROOT));
 
         if (entry != null) {
-            if (entry instanceof TrustedCertEntry) {
-                return new Date(((TrustedCertEntry)entry).date.getTime());
+            if (entry instanceof TrustedCertEntry trustedCertEntry) {
+                return trustedCertEntry.date;
             } else {
-                return new Date(((KeyEntry)entry).date.getTime());
+                return ((KeyEntry)entry).date;
             }
         } else {
             return null;
@@ -447,7 +468,7 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
         synchronized(entries) {
             try {
                 KeyEntry entry = new KeyEntry();
-                entry.date = new Date();
+                entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
                 if (key instanceof PrivateKey) {
                     if ((key.getFormat().equals("PKCS#8")) ||
@@ -525,7 +546,7 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
                                             + "EncryptedPrivateKeyInfo");
             }
 
-            entry.date = new Date();
+            entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
             if ((chain != null) &&
                 (chain.length != 0)) {
@@ -927,9 +948,9 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
 
             // Make a creation date.
             if (creationDate != 0)
-                tce.date = new Date(creationDate);
+                tce.date = Instant.ofEpochMilli(creationDate);
             else
-                tce.date = new Date();
+                tce.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
             entries.put(alias.toLowerCase(Locale.ROOT), tce);
         } catch (Exception e) {
@@ -952,9 +973,9 @@ abstract sealed class KeychainStore extends KeyStoreSpi {
 
         // Make a creation date.
         if (creationDate != 0)
-            ke.date = new Date(creationDate);
+            ke.date = Instant.ofEpochMilli(creationDate);
         else
-            ke.date = new Date();
+            ke.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
         // Next, create X.509 Certificate objects from the raw data.  This is complicated
         // because a certificate's public key may be too long for Java's default encryption strength.
diff --git a/src/java.base/macosx/classes/sun/nio/ch/DefaultPollerProvider.java b/src/java.base/macosx/classes/sun/nio/ch/DefaultPollerProvider.java
index dc32c2cd90c..6349ae503e4 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/DefaultPollerProvider.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/DefaultPollerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,21 @@ import java.io.IOException;
  * Default PollerProvider for macOS.
  */
 class DefaultPollerProvider extends PollerProvider {
-    DefaultPollerProvider() { }
+    DefaultPollerProvider(Poller.Mode mode) {
+        super(mode);
+    }
+
+    DefaultPollerProvider() {
+        this(Poller.Mode.SYSTEM_THREADS);
+    }
 
     @Override
     Poller readPoller(boolean subPoller) throws IOException {
-        return new KQueuePoller(subPoller, true);
+        return new KQueuePoller(pollerMode(), subPoller, true);
     }
 
     @Override
     Poller writePoller(boolean subPoller) throws IOException {
-        return new KQueuePoller(subPoller, false);
+        return new KQueuePoller(pollerMode(), subPoller, false);
     }
 }
diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueuePoller.java b/src/java.base/macosx/classes/sun/nio/ch/KQueuePoller.java
index 6a1c771820e..69c191913a9 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueuePoller.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueuePoller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 package sun.nio.ch;
 
 import java.io.IOException;
+import java.lang.ref.Cleaner.Cleanable;
+import jdk.internal.ref.CleanerFactory;
 import static sun.nio.ch.KQueue.*;
 
 /**
@@ -36,11 +38,77 @@ class KQueuePoller extends Poller {
     private final int maxEvents;
     private final long address;
 
-    KQueuePoller(boolean subPoller, boolean read) throws IOException {
-        this.kqfd = KQueue.create();
+    // file descriptors used for wakeup during shutdown
+    private final int fd0;
+    private final int fd1;
+
+    // close action, and cleaner if this is subpoller
+    private final Runnable closer;
+    private final Cleanable cleaner;
+
+    KQueuePoller(Poller.Mode mode, boolean subPoller, boolean read) throws IOException {
+        boolean wakeable = (mode == Mode.POLLER_PER_CARRIER) && subPoller;
+        int maxEvents = (subPoller) ? 16 : 64;
+
+        int kqfd = KQueue.create();
+        long address = 0L;
+        int fd0 = -1;
+        int fd1 = -1;
+        try {
+            address = KQueue.allocatePollArray(maxEvents);
+
+            // register one end of the pipe with kqueue to allow for wakeup
+            if (wakeable) {
+                long fds = IOUtil.makePipe(false);
+                fd0 = (int) (fds >>> 32);
+                fd1 = (int) fds;
+                KQueue.register(kqfd, fd0, EVFILT_READ, EV_ADD);
+            }
+        } catch (Throwable e) {
+            FileDispatcherImpl.closeIntFD(kqfd);
+            if (address != 0L) KQueue.freePollArray(address);
+            if (fd0 >= 0) FileDispatcherImpl.closeIntFD(fd0);
+            if (fd1 >= 0) FileDispatcherImpl.closeIntFD(fd1);
+            throw e;
+        }
+
+        this.kqfd = kqfd;
         this.filter = (read) ? EVFILT_READ : EVFILT_WRITE;
-        this.maxEvents = (subPoller) ? 64 : 512;
-        this.address = KQueue.allocatePollArray(maxEvents);
+        this.maxEvents = maxEvents;
+        this.address = address;
+        this.fd0 = fd0;
+        this.fd1 = fd1;
+
+        // create action to close kqueue, register cleaner when wakeable
+        this.closer = closer(kqfd, address, fd0, fd1);
+        if (wakeable) {
+            this.cleaner = CleanerFactory.cleaner().register(this, closer);
+        } else {
+            this.cleaner = null;
+        }
+    }
+
+    /**
+     * Returns an action to close the kqueue and release other resources.
+     */
+    private static Runnable closer(int kqfd, long address, int fd0, int fd1) {
+        return () -> {
+            try {
+                FileDispatcherImpl.closeIntFD(kqfd);
+                KQueue.freePollArray(address);
+                if (fd0 >= 0) FileDispatcherImpl.closeIntFD(fd0);
+                if (fd1 >= 0) FileDispatcherImpl.closeIntFD(fd1);
+            } catch (IOException _) { }
+        };
+    }
+
+    @Override
+    void close() {
+        if (cleaner != null) {
+            cleaner.clean();
+        } else {
+            closer.run();
+        }
     }
 
     @Override
@@ -49,30 +117,42 @@ class KQueuePoller extends Poller {
     }
 
     @Override
-    void implRegister(int fdVal) throws IOException {
+    void implStartPoll(int fdVal) throws IOException {
         int err = KQueue.register(kqfd, fdVal, filter, (EV_ADD|EV_ONESHOT));
         if (err != 0)
             throw new IOException("kevent failed: " + err);
     }
 
     @Override
-    void implDeregister(int fdVal, boolean polled) {
+    void implStopPoll(int fdVal, boolean polled) {
         // event was deleted if already polled
         if (!polled) {
             KQueue.register(kqfd, fdVal, filter, EV_DELETE);
         }
     }
 
+    @Override
+    void wakeupPoller() throws IOException {
+        if (fd1 < 0) {
+            throw new UnsupportedOperationException();
+        }
+        IOUtil.write1(fd1, (byte)0);
+    }
+
     @Override
     int poll(int timeout) throws IOException {
         int n = KQueue.poll(kqfd, address, maxEvents, timeout);
+        int polled = 0;
         int i = 0;
         while (i < n) {
             long keventAddress = KQueue.getEvent(address, i);
             int fdVal = KQueue.getDescriptor(keventAddress);
-            polled(fdVal);
+            if (fdVal != fd0) {
+                polled(fdVal);
+                polled++;
+            }
             i++;
         }
-        return n;
+        return polled;
     }
 }
diff --git a/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
index 31572eaeb81..6d8eb832370 100644
--- a/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
+++ b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -134,10 +134,11 @@ static OSStatus completeCertChain(
     CFArrayAppendValue(certArray, identity);
 
     /* the single element in certs-to-be-evaluated comes from the identity */
-       ortn = SecIdentityCopyCertificate(identity, &certRef);
-    if(ortn) {
+    ortn = SecIdentityCopyCertificate(identity, &certRef);
+    if (ortn) {
         /* should never happen */
         cssmPerror("SecIdentityCopyCertificate", ortn);
+        CFRelease(certArray);
         return ortn;
     }
 
@@ -283,6 +284,7 @@ static void addIdentitiesToKeystore(JNIEnv *env, jobject keyStore, jmethodID jm_
     OSStatus err = SecIdentitySearchCreate(NULL, 0, &identitySearch);
     SecIdentityRef theIdentity = NULL;
     OSErr searchResult = noErr;
+    CFArrayRef certChain = NULL;
 
     do {
         searchResult = SecIdentitySearchCopyNext(identitySearch, &theIdentity);
@@ -291,7 +293,6 @@ static void addIdentitiesToKeystore(JNIEnv *env, jobject keyStore, jmethodID jm_
             // Get the cert from the identity, then generate a chain.
             SecCertificateRef certificate;
             SecIdentityCopyCertificate(theIdentity, &certificate);
-            CFArrayRef certChain = NULL;
 
             // *** Should do something with this error...
             err = completeCertChain(theIdentity, NULL, TRUE, &certChain);
@@ -357,6 +358,11 @@ static void addIdentitiesToKeystore(JNIEnv *env, jobject keyStore, jmethodID jm_
             if ((*env)->ExceptionCheck(env)) {
                 goto errOut;
             }
+
+            if (certChain != NULL) {
+                CFRelease(certChain);
+                certChain = NULL;
+            }
         }
     } while (searchResult == noErr);
 
@@ -364,6 +370,9 @@ errOut:
     if (identitySearch != NULL) {
         CFRelease(identitySearch);
     }
+    if (certChain != NULL) {
+        CFRelease(certChain);
+    }
 }
 
 #define ADD(list, str) { \
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
index ad98653b9c2..1e45a4e6a20 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@ import sun.security.util.Debug;
 import sun.security.util.IOUtils;
 
 import java.io.*;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.security.DigestInputStream;
 import java.security.DigestOutputStream;
@@ -70,14 +72,14 @@ public final class JceKeyStore extends KeyStoreSpi {
 
     // Private key and supporting certificate chain
     private static final class PrivateKeyEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation date of this entry
         byte[] protectedKey;
         Certificate[] chain;
     }
 
     // Secret key
     private static final class SecretKeyEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation date of this entry
         SealedObject sealedKey;
 
         // Maximum possible length of sealedKey. Used to detect malicious
@@ -89,7 +91,7 @@ public final class JceKeyStore extends KeyStoreSpi {
 
     // Trusted certificate
     private static final class TrustedCertEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation date of this entry
         Certificate cert;
     }
 
@@ -213,23 +215,38 @@ public final class JceKeyStore extends KeyStoreSpi {
      * not exist
      */
     public Date engineGetCreationDate(String alias) {
-        Date date = null;
+        final Instant instant = this.engineGetCreationInstant(alias);
+        if (instant == null) {
+            return null;
+        }
+        return Date.from(instant);
+    }
 
-        Object entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @since 27
+     */
+    public Instant engineGetCreationInstant(String alias) {
+        final Object entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
 
         if (entry != null) {
-            // We have to create a new instance of java.util.Date because
-            // dates are not immutable
             if (entry instanceof TrustedCertEntry) {
-                date = new Date(((TrustedCertEntry)entry).date.getTime());
+                return ((TrustedCertEntry)entry).date;
             } else if (entry instanceof PrivateKeyEntry) {
-                date = new Date(((PrivateKeyEntry)entry).date.getTime());
+                return ((PrivateKeyEntry)entry).date;
             } else {
-                date = new Date(((SecretKeyEntry)entry).date.getTime());
+                return ((SecretKeyEntry)entry).date;
             }
+        } else {
+            return null;
         }
-
-        return date;
     }
 
     /**
@@ -264,7 +281,7 @@ public final class JceKeyStore extends KeyStoreSpi {
 
                 if (key instanceof PrivateKey) {
                     PrivateKeyEntry entry = new PrivateKeyEntry();
-                    entry.date = new Date();
+                    entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
                     // protect the private key
                     entry.protectedKey = keyProtector.protect((PrivateKey)key);
@@ -282,7 +299,7 @@ public final class JceKeyStore extends KeyStoreSpi {
 
                 } else {
                     SecretKeyEntry entry = new SecretKeyEntry();
-                    entry.date = new Date();
+                    entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
                     // seal and store the key
                     entry.sealedKey = keyProtector.seal(key);
@@ -325,7 +342,7 @@ public final class JceKeyStore extends KeyStoreSpi {
             // We assume it's a private key, because there is no standard
             // (ASN.1) encoding format for wrapped secret keys
             PrivateKeyEntry entry = new PrivateKeyEntry();
-            entry.date = new Date();
+            entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
             entry.protectedKey = key.clone();
             if ((chain != null) &&
@@ -370,7 +387,7 @@ public final class JceKeyStore extends KeyStoreSpi {
 
             TrustedCertEntry trustedCertEntry = new TrustedCertEntry();
             trustedCertEntry.cert = cert;
-            trustedCertEntry.date = new Date();
+            trustedCertEntry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
             entries.put(alias.toLowerCase(Locale.ENGLISH), trustedCertEntry);
         }
     }
@@ -588,7 +605,7 @@ public final class JceKeyStore extends KeyStoreSpi {
                         dos.writeUTF(alias);
 
                         // write the (entry creation) date
-                        dos.writeLong(pentry.date.getTime());
+                        dos.writeLong(pentry.date.toEpochMilli());
 
                         // write the protected private key
                         dos.writeInt(pentry.protectedKey.length);
@@ -618,7 +635,9 @@ public final class JceKeyStore extends KeyStoreSpi {
                         dos.writeUTF(alias);
 
                         // write the (entry creation) date
-                        dos.writeLong(((TrustedCertEntry)entry).date.getTime());
+                        dos.writeLong(
+                                ((TrustedCertEntry)entry).date.toEpochMilli()
+                        );
 
                         // write the trusted certificate
                         encoded = ((TrustedCertEntry)entry).cert.getEncoded();
@@ -635,7 +654,9 @@ public final class JceKeyStore extends KeyStoreSpi {
                         dos.writeUTF(alias);
 
                         // write the (entry creation) date
-                        dos.writeLong(((SecretKeyEntry)entry).date.getTime());
+                        dos.writeLong(
+                                ((SecretKeyEntry)entry).date.toEpochMilli()
+                        );
 
                         // write the sealed key
                         oos = new ObjectOutputStream(dos);
@@ -753,7 +774,7 @@ public final class JceKeyStore extends KeyStoreSpi {
                         alias = dis.readUTF();
 
                         // read the (entry creation) date
-                        entry.date = new Date(dis.readLong());
+                        entry.date = Instant.ofEpochMilli(dis.readLong());
 
                         // read the private key
                         entry.protectedKey = IOUtils.readExactlyNBytes(dis, dis.readInt());
@@ -798,7 +819,7 @@ public final class JceKeyStore extends KeyStoreSpi {
                         alias = dis.readUTF();
 
                         // read the (entry creation) date
-                        entry.date = new Date(dis.readLong());
+                        entry.date = Instant.ofEpochMilli(dis.readLong());
 
                         // read the trusted certificate
                         if (xVersion == 2) {
@@ -832,7 +853,7 @@ public final class JceKeyStore extends KeyStoreSpi {
                         alias = dis.readUTF();
 
                         // read the (entry creation) date
-                        entry.date = new Date(dis.readLong());
+                        entry.date = Instant.ofEpochMilli(dis.readLong());
 
                         // read the sealed key
                         try {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
index 1280ccdad74..56a119893a7 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java
@@ -498,7 +498,7 @@ public final class ML_KEM {
     /*
     Main internal algorithms from Section 6 of specification
      */
-    protected ML_KEM_KeyPair generateKemKeyPair(byte[] kem_d, byte[] kem_z) {
+    protected ML_KEM_KeyPair generateKemKeyPair(byte[] kem_d_z) {
         MessageDigest mlKemH;
         try {
             mlKemH = MessageDigest.getInstance(HASH_H_NAME);
@@ -508,7 +508,8 @@ public final class ML_KEM {
         }
 
         //Generate K-PKE keys
-        var kPkeKeyPair = generateK_PkeKeyPair(kem_d);
+        //The 1st 32-byte `d` is used in K-PKE key pair generation
+        var kPkeKeyPair = generateK_PkeKeyPair(kem_d_z);
         //encaps key = kPke encryption key
         byte[] encapsKey = kPkeKeyPair.publicKey.keyBytes;
 
@@ -527,7 +528,8 @@ public final class ML_KEM {
             // This should never happen.
             throw new RuntimeException(e);
         }
-        System.arraycopy(kem_z, 0, decapsKey,
+        // The 2nd 32-byte `z` is copied into decapsKey
+        System.arraycopy(kem_d_z, 32, decapsKey,
             kPkePrivateKey.length + encapsKey.length + 32, 32);
 
         return new ML_KEM_KeyPair(
@@ -535,6 +537,12 @@ public final class ML_KEM {
             new ML_KEM_DecapsulationKey(decapsKey));
     }
 
+    public byte[] privKeyToPubKey(byte[] decapsKey) {
+        int pkLen = (mlKem_k * ML_KEM_N * 12) / 8 + 32 /* rho */;
+        int skLen = (mlKem_k * ML_KEM_N * 12) / 8;
+        return Arrays.copyOfRange(decapsKey, skLen, skLen + pkLen);
+    }
+
     protected ML_KEM_EncapsulateResult encapsulate(
             ML_KEM_EncapsulationKey encapsulationKey, byte[] randomMessage) {
         MessageDigest mlKemH;
@@ -648,10 +656,12 @@ public final class ML_KEM {
             throw new RuntimeException(e);
         }
 
-        mlKemG.update(seed);
+        // Note: only the 1st 32-byte in the seed is used
+        mlKemG.update(seed, 0, 32);
         mlKemG.update((byte)mlKem_k);
 
         var rhoSigma = mlKemG.digest();
+        mlKemG.reset();
         var rho = Arrays.copyOfRange(rhoSigma, 0, 32);
         var sigma = Arrays.copyOfRange(rhoSigma, 32, 64);
         Arrays.fill(rhoSigma, (byte)0);
@@ -1353,22 +1363,16 @@ public final class ML_KEM {
         }
     }
 
-    // The intrinsic implementations assume that the input and output buffers
-    // are such that condensed can be read in 96-byte chunks and
-    // parsed can be written in 64 shorts chunks except for the last chunk
-    // that can be either 48 or 64 shorts. In other words,
-    // if (i - 1) * 64 < parsedLengths <= i * 64 then
-    // parsed.length should be either i * 64 or (i-1) * 64 + 48 and
-    // condensed.length should be at least index + i * 96.
+    // An intrinsic implementation assumes that the input and output buffers
+    // are such that condensed can be read in chunks of 192 bytes and
+    // parsed can be written in chunks of 128 shorts, so callers should allocate
+    // the condensed and parsed arrays accordingly, see the assert()
     private void twelve2Sixteen(byte[] condensed, int index,
                                 short[] parsed, int parsedLength) {
-        int i = parsedLength / 64;
-        int remainder = parsedLength - i * 64;
-        if (remainder != 0) {
-            i++;
-        }
-        assert ((remainder == 0) || (remainder == 48)) &&
-                (index + i * 96 <= condensed.length);
+        int n = (parsedLength + 127) / 128;
+        assert ((parsed.length >= n * 128) &&
+                (condensed.length >= index + n * 192));
+
         implKyber12To16(condensed, index, parsed, parsedLength);
     }
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java
index 2ce5b3324e7..117f26e6981 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,12 @@
 package com.sun.crypto.provider;
 
 import sun.security.jca.JCAUtil;
+import sun.security.pkcs.NamedPKCS8Key;
 import sun.security.provider.NamedKEM;
 import sun.security.provider.NamedKeyFactory;
 import sun.security.provider.NamedKeyPairGenerator;
+import sun.security.util.KeyChoices;
+import sun.security.x509.NamedX509Key;
 
 import java.security.*;
 import java.util.Arrays;
@@ -37,6 +40,20 @@ import javax.crypto.DecapsulateException;
 
 public final class ML_KEM_Impls {
 
+    private static final int SEED_LEN = 64;
+
+    public static byte[] seedToExpanded(String pname, byte[] seed) {
+        return new ML_KEM(pname).generateKemKeyPair(seed)
+                .decapsulationKey()
+                .keyBytes();
+    }
+
+    public static NamedX509Key privKeyToPubKey(NamedPKCS8Key npk) {
+        return new NamedX509Key(npk.getAlgorithm(),
+                npk.getParams().getName(),
+                new ML_KEM(npk.getParams().getName()).privKeyToPubKey(npk.getExpanded()));
+    }
+
     public sealed static class KPG
         extends NamedKeyPairGenerator permits KPG2, KPG3, KPG5 {
 
@@ -50,25 +67,27 @@ public final class ML_KEM_Impls {
         }
 
         @Override
-        protected byte[][] implGenerateKeyPair(String name, SecureRandom random) {
-            byte[] seed = new byte[32];
+        protected byte[][] implGenerateKeyPair(String pname, SecureRandom random) {
+            byte[] seed = new byte[SEED_LEN];
             var r = random != null ? random : JCAUtil.getDefSecureRandom();
             r.nextBytes(seed);
-            byte[] z = new byte[32];
-            r.nextBytes(z);
 
-            ML_KEM mlKem = new ML_KEM(name);
+            ML_KEM mlKem = new ML_KEM(pname);
             ML_KEM.ML_KEM_KeyPair kp;
+            kp = mlKem.generateKemKeyPair(seed);
+            var expanded = kp.decapsulationKey().keyBytes();
+
             try {
-                kp = mlKem.generateKemKeyPair(seed, z);
+                return new byte[][]{
+                        kp.encapsulationKey().keyBytes(),
+                        KeyChoices.writeToChoice(
+                                KeyChoices.getPreferred("mlkem"),
+                                seed, expanded),
+                        expanded
+                };
             } finally {
-                Arrays.fill(seed, (byte)0);
-                Arrays.fill(z, (byte)0);
+                Arrays.fill(seed, (byte) 0);
             }
-            return new byte[][] {
-                    kp.encapsulationKey().keyBytes(),
-                    kp.decapsulationKey().keyBytes()
-            };
         }
     }
 
@@ -94,8 +113,39 @@ public final class ML_KEM_Impls {
         public KF() {
             super("ML-KEM", "ML-KEM-512", "ML-KEM-768", "ML-KEM-1024");
         }
-        public KF(String name) {
-            super("ML-KEM", name);
+        public KF(String pname) {
+            super("ML-KEM", pname);
+        }
+
+        @Override
+        protected byte[] implExpand(String pname, byte[] input)
+                throws InvalidKeyException {
+            return KeyChoices.choiceToExpanded(pname, SEED_LEN, input,
+                    ML_KEM_Impls::seedToExpanded);
+        }
+
+        @Override
+        protected Key engineTranslateKey(Key key) throws InvalidKeyException {
+            var nk = toNamedKey(key);
+            if (nk instanceof NamedPKCS8Key npk) {
+                var type = KeyChoices.getPreferred("mlkem");
+                if (KeyChoices.typeOfChoice(npk.getRawBytes()) != type) {
+                    var encoding = KeyChoices.choiceToChoice(
+                            type,
+                            npk.getParams().getName(),
+                            SEED_LEN, npk.getRawBytes(),
+                            ML_KEM_Impls::seedToExpanded);
+                    nk = NamedPKCS8Key.internalCreate(
+                            npk.getAlgorithm(),
+                            npk.getParams().getName(),
+                            encoding,
+                            npk.getExpanded().clone());
+                    if (npk != key) { // npk is neither input or output
+                        npk.destroy();
+                    }
+                }
+            }
+            return nk;
         }
     }
 
@@ -121,15 +171,15 @@ public final class ML_KEM_Impls {
         private static final int SEED_SIZE = 32;
 
         @Override
-        protected byte[][] implEncapsulate(String name, byte[] encapsulationKey,
+        protected byte[][] implEncapsulate(String pname, byte[] encapsulationKey,
                                            Object ek, SecureRandom secureRandom) {
 
             byte[] randomBytes = new byte[SEED_SIZE];
             var r = secureRandom != null ? secureRandom : JCAUtil.getDefSecureRandom();
             r.nextBytes(randomBytes);
 
-            ML_KEM mlKem = new ML_KEM(name);
-            ML_KEM.ML_KEM_EncapsulateResult mlKemEncapsulateResult = null;
+            ML_KEM mlKem = new ML_KEM(pname);
+            ML_KEM.ML_KEM_EncapsulateResult mlKemEncapsulateResult;
             try {
                 mlKemEncapsulateResult = mlKem.encapsulate(
                         new ML_KEM.ML_KEM_EncapsulationKey(
@@ -145,49 +195,49 @@ public final class ML_KEM_Impls {
         }
 
         @Override
-        protected byte[] implDecapsulate(String name, byte[] decapsulationKey,
+        protected byte[] implDecapsulate(String pname, byte[] decapsulationKey,
                                          Object dk, byte[] cipherText)
             throws DecapsulateException {
 
-            ML_KEM mlKem = new ML_KEM(name);
+            ML_KEM mlKem = new ML_KEM(pname);
             var kpkeCipherText = new ML_KEM.K_PKE_CipherText(cipherText);
             return mlKem.decapsulate(new ML_KEM.ML_KEM_DecapsulationKey(
                     decapsulationKey), kpkeCipherText);
         }
 
         @Override
-        protected int implSecretSize(String name) {
+        protected int implSecretSize(String pname) {
             return ML_KEM.SECRET_SIZE;
         }
 
         @Override
-        protected int implEncapsulationSize(String name) {
-            ML_KEM mlKem = new ML_KEM(name);
+        protected int implEncapsulationSize(String pname) {
+            ML_KEM mlKem = new ML_KEM(pname);
             return mlKem.getEncapsulationSize();
         }
 
         @Override
-        protected Object implCheckPublicKey(String name, byte[] pk)
+        protected Object implCheckPublicKey(String pname, byte[] pk)
             throws InvalidKeyException {
 
-            ML_KEM mlKem = new ML_KEM(name);
+            ML_KEM mlKem = new ML_KEM(pname);
             return mlKem.checkPublicKey(pk);
         }
 
         @Override
-        protected Object implCheckPrivateKey(String name, byte[] sk)
+        protected Object implCheckPrivateKey(String pname, byte[] sk)
             throws InvalidKeyException {
 
-            ML_KEM mlKem = new ML_KEM(name);
+            ML_KEM mlKem = new ML_KEM(pname);
             return mlKem.checkPrivateKey(sk);
         }
 
         public K() {
-            super("ML-KEM", "ML-KEM-512", "ML-KEM-768", "ML-KEM-1024");
+            super("ML-KEM", new KF());
         }
 
-        public K(String name) {
-            super("ML-KEM", name);
+        public K(String pname) {
+            super("ML-KEM", new KF(pname));
         }
     }
 
diff --git a/src/java.base/share/classes/java/io/ProxyingConsole.java b/src/java.base/share/classes/java/io/ProxyingConsole.java
index 5c8da9f51da..10188f3500a 100644
--- a/src/java.base/share/classes/java/io/ProxyingConsole.java
+++ b/src/java.base/share/classes/java/io/ProxyingConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,19 +27,32 @@ package java.io;
 
 import java.nio.charset.Charset;
 import java.util.Locale;
+import java.util.function.Supplier;
 
+import jdk.internal.ValueBased;
 import jdk.internal.io.JdkConsole;
 
 /**
  * Console implementation for internal use. Custom Console delegate may be
  * provided with jdk.internal.io.JdkConsoleProvider.
  */
+@ValueBased
 final class ProxyingConsole extends Console {
     private final JdkConsole delegate;
-    private final Object readLock = new Object();
-    private final Object writeLock = new Object();
-    private volatile Reader reader;
-    private volatile PrintWriter printWriter;
+    private final LazyConstant<Reader> reader =
+        LazyConstant.of(new Supplier<>(){
+            @Override
+            public Reader get() {
+                return new WrappingReader(delegate.reader());
+            }
+        });
+    private final LazyConstant<PrintWriter> printWriter =
+        LazyConstant.of(new Supplier<>() {
+            @Override
+            public PrintWriter get() {
+                return new WrappingWriter(delegate.writer());
+            }
+        });
 
     ProxyingConsole(JdkConsole delegate) {
         this.delegate = delegate;
@@ -50,17 +63,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public PrintWriter writer() {
-        PrintWriter printWriter = this.printWriter;
-        if (printWriter == null) {
-            synchronized (this) {
-                printWriter = this.printWriter;
-                if (printWriter == null) {
-                    printWriter = new WrappingWriter(delegate.writer(), writeLock);
-                    this.printWriter = printWriter;
-                }
-            }
-        }
-        return printWriter;
+        return printWriter.get();
     }
 
     /**
@@ -68,17 +71,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public Reader reader() {
-        Reader reader = this.reader;
-        if (reader == null) {
-            synchronized (this) {
-                reader = this.reader;
-                if (reader == null) {
-                    reader = new WrappingReader(delegate.reader(), readLock);
-                    this.reader = reader;
-                }
-            }
-        }
-        return reader;
+        return reader.get();
     }
 
     /**
@@ -94,9 +87,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public Console format(Locale locale, String format, Object ... args) {
-        synchronized (writeLock) {
-            delegate.format(locale, format, args);
-        }
+        delegate.format(locale, format, args);
         return this;
     }
 
@@ -113,9 +104,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public Console printf(Locale locale, String format, Object ... args) {
-        synchronized (writeLock) {
-            delegate.format(locale, format, args);
-        }
+        delegate.format(locale, format, args);
         return this;
     }
 
@@ -132,11 +121,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public String readLine(Locale locale, String format, Object ... args) {
-        synchronized (writeLock) {
-            synchronized (readLock) {
-                return delegate.readLine(locale, format, args);
-            }
-        }
+        return delegate.readLine(locale, format, args);
     }
 
     /**
@@ -144,9 +129,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public String readLine() {
-        synchronized (readLock) {
-            return delegate.readLine();
-        }
+        return delegate.readLine();
     }
 
     /**
@@ -162,11 +145,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public char[] readPassword(Locale locale, String format, Object ... args) {
-        synchronized (writeLock) {
-            synchronized (readLock) {
-                return delegate.readPassword(locale, format, args);
-            }
-        }
+        return delegate.readPassword(locale, format, args);
     }
 
     /**
@@ -174,9 +153,7 @@ final class ProxyingConsole extends Console {
      */
     @Override
     public char[] readPassword() {
-        synchronized (readLock) {
-            return delegate.readPassword();
-        }
+        return delegate.readPassword();
     }
 
     /**
@@ -197,19 +174,15 @@ final class ProxyingConsole extends Console {
 
     private static final class WrappingReader extends Reader {
         private final Reader r;
-        private final Object lock;
 
-        WrappingReader(Reader r, Object lock) {
-            super(lock);
+        WrappingReader(Reader r) {
+            super(r);
             this.r = r;
-            this.lock = lock;
         }
 
         @Override
         public int read(char[] cbuf, int off, int len) throws IOException {
-            synchronized (lock) {
-                return r.read(cbuf, off, len);
-            }
+            return r.read(cbuf, off, len);
         }
 
         @Override
@@ -219,25 +192,8 @@ final class ProxyingConsole extends Console {
     }
 
     private static final class WrappingWriter extends PrintWriter {
-        private final PrintWriter pw;
-        private final Object lock;
-
-        public WrappingWriter(PrintWriter pw, Object lock) {
-            super(pw, lock);
-            this.pw = pw;
-            this.lock = lock;
-        }
-
-        @Override
-        public void write(char[] cbuf, int off, int len) {
-            synchronized (lock) {
-                pw.write(cbuf, off, len);
-            }
-        }
-
-        @Override
-        public void flush() {
-            pw.flush();
+        public WrappingWriter(PrintWriter pw) {
+            super(pw);
         }
 
         @Override
diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java
index ffda729a45a..33284d86e2d 100644
--- a/src/java.base/share/classes/java/lang/Character.java
+++ b/src/java.base/share/classes/java/lang/Character.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -11233,7 +11233,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji;
      *          {@code false} otherwise.
-     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
+     * @spec https://www.unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmoji(int codePoint) {
@@ -11252,7 +11252,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character has the Emoji Presentation
      *          property; {@code false} otherwise.
-     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
+     * @spec https://www.unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiPresentation(int codePoint) {
@@ -11271,7 +11271,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji Modifier;
      *          {@code false} otherwise.
-     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
+     * @spec https://www.unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiModifier(int codePoint) {
@@ -11290,7 +11290,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji Modifier Base;
      *          {@code false} otherwise.
-     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
+     * @spec https://www.unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiModifierBase(int codePoint) {
@@ -11309,7 +11309,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Emoji Component;
      *          {@code false} otherwise.
-     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
+     * @spec https://www.unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isEmojiComponent(int codePoint) {
@@ -11328,7 +11328,7 @@ class Character implements java.io.Serializable, Comparable<Character>, Constabl
      * @param   codePoint the character (Unicode code point) to be tested.
      * @return  {@code true} if the character is an Extended Pictographic;
      *          {@code false} otherwise.
-     * @spec https://unicode.org/reports/tr51/ Unicode Emoji
+     * @spec https://www.unicode.org/reports/tr51/ Unicode Emoji
      * @since   21
      */
     public static boolean isExtendedPictographic(int codePoint) {
diff --git a/src/java.base/share/classes/java/lang/FdLibm.java b/src/java.base/share/classes/java/lang/FdLibm.java
index 73e1da46af4..5a6bdc9b94e 100644
--- a/src/java.base/share/classes/java/lang/FdLibm.java
+++ b/src/java.base/share/classes/java/lang/FdLibm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3508,4 +3508,151 @@ final class FdLibm {
             return iz;
         }
     }
+
+    /**
+     * Return the Inverse Hyperbolic Sine of x
+     *
+     * Method :
+     *
+     *
+     *      asinh(x) is defined so that asinh(sinh(alpha)) = alpha, -&infin; &lt; alpha &lt; &infin;
+     *      and sinh(asinh(x)) = x, -&infin; &lt; x &lt; &infin;
+     *      It can be written as asinh(x) = sign(x) * ln(|x| + sqrt(x^2 + 1)), -&infin; &lt; x &lt; &infin;
+     *      1. Replace x by |x| as the function is odd.
+     *      2.
+     *          asinh(x) := x, if 1+x^2 = 1,
+     *                   := sign(x)*(log(x)+ln2)) for large |x|, else
+     *                   := sign(x)*log(2|x|+1/(|x|+sqrt(x*x+1))) if|x|>2, else
+     *                   := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2)))
+     *
+     *
+     *
+     * Special cases:
+     *      only asinh(&plusmn;0)=&plusmn;0 is exact for finite x.
+     *      asinh(NaN) is NaN
+     *      asinh(&plusmn;&infin;) is &plusmn;&infin;
+     */
+    static final class Asinh {
+        private static final double ln2 = 6.93147180559945286227e-01;
+        private static final double huge = 1.0e300;
+
+        static double compute(double x) {
+            double t, w;
+            int hx, ix;
+            hx = __HI(x);
+            ix = hx & 0x7fff_ffff;
+            if (ix >= 0x7ff0_0000) {
+                return x + x;                       // x is inf or NaN
+            }
+            if (ix < 0x3e30_0000) {                 // |x| < 2**-28
+                if (huge + x > 1.0) {
+                    return x;                       // return x inexact except 0
+                }
+            }
+            if (ix > 0x41b0_0000) {                 // |x| > 2**28
+                w = Log.compute(Math.abs(x)) + ln2;
+            } else if (ix > 0x4000_0000) {          // 2**28 > |x| > 2.0
+                t = Math.abs(x);
+                w = Log.compute(2.0 * t + 1.0 / (Sqrt.compute(x * x + 1.0) + t));
+            } else {                                // 2.0 > |x| > 2**-28
+                t = x * x;
+                w = Log1p.compute(Math.abs(x) + t / (1.0 + Sqrt.compute(1.0 + t)));
+            }
+            return hx > 0 ? w : -w;
+        }
+    }
+
+    /**
+     * Return the Inverse Hyperbolic Cosine of x
+     *
+     * Method :
+     *
+     *
+     *      acosh(x) is defined so that acosh(cosh(alpha)) = alpha, -&infin; &lt; alpha &lt; &infin;
+     *      and cosh(acosh(x)) = x, 1 <= x &lt; &infin;.
+     *      It can be written as acosh(x) = log(x + sqrt(x^2 - 1)), 1 <= x  &lt; &infin;.
+     *      acosh(x) := log(x)+ln2, if x is large; else
+     *               := log(2x-1/(sqrt(x*x-1)+x)) if x&gt;2; else
+     *               := log1p(t+sqrt(2.0*t+t*t)); where t=x-1.
+     *
+     *
+     *
+     * Special cases:
+     *      acosh(x) is NaN with signal if x < 1.
+     *      acosh(NaN) is NaN without signal.
+     */
+    static final class Acosh {
+        private static final double ln2 = 6.93147180559945286227e-01;
+
+        static double compute(double x) {
+            double t;
+            int hx;
+            hx = __HI(x);
+            if (hx < 0x3ff0_0000) {                           // x < 1 */
+                return (x - x) / (x - x);
+            } else if (hx >= 0x41b0_0000) {                   // x > 2**28
+                if (hx >= 0x7ff0_0000) {                      // x is inf of NaN
+                    return x + x;
+                } else {
+                    return Log.compute(x) + ln2;              // acosh(huge) = log(2x)
+                }
+            } else if (((hx - 0x3ff0_0000) | __LO(x)) == 0) {
+                return 0.0;                                   // acosh(1) = 0
+            } else if (hx > 0x4000_0000) {                    // 2**28 > x > 2
+                t = x * x;
+                return Log.compute(2.0 * x - 1.0 / (x + Sqrt.compute(t - 1.0)));
+            } else {                                          // 1< x <2
+                t = x - 1.0;
+                return Log1p.compute(t + Sqrt.compute(2.0 * t + t * t));
+            }
+        }
+    }
+
+    /**
+     * Return the Inverse Hyperbolic Tangent of x
+     * Method :
+     *
+     *
+     *      atanh(x) is defined so that atanh(tanh(alpha)) = alpha, -&infin; &lt; alpha &lt; &infin;
+     *      and tanh(atanh(x)) = x, -1 &lt x &lt 1;
+     *      It can be written as atanh(x) = 0.5 * log1p(2 * x/(1-x)), -1 &lt; x &lt; 1;
+     *      1.
+     *          atanh(x) := 0.5 * log1p(2 * x/(1 - x)), if |x| >= 0.5,
+     *                   := 0.5 * log1p(2x + 2x * x/(1 - x)), if |x| < 0.5.
+     *
+     *
+     *
+     * Special cases:
+     *      only atanh(&plusmn;0)=&plusmn;0 is exact for finite x.
+     *      atanh(NaN) is NaN
+     *      atanh(&plusmn;1) is &plusmn;&infin;
+     */
+    static final class Atanh {
+
+        static double compute(double x) {
+            double t;
+            int hx,ix;
+            int lx;                                              // unsigned
+            hx = __HI(x);                                        // high word
+            lx = __LO(x);                                        // low word
+            ix = hx & 0x7fff_ffff;
+            if ((ix | ((lx | (-lx)) >>> 31)) > 0x3ff0_0000) {    // |x| > 1
+                return (x - x) / (x - x);
+            }
+            if (ix == 0x3ff0_0000) {
+                return x / 0.0;
+            }
+            if (ix < 0x3e30_0000 && (HUGE + x) > 0.0) {
+                return x;                                        // x<2**-28
+            }
+            x = __HI(x, ix);                                     // x <- |x|
+            if (ix < 0x3fe0_0000) {                              // x < 0.5
+                t = x + x;
+                t = 0.5 * Log1p.compute(t + t * x / (1.0 - x));
+            } else {
+                t = 0.5 * Log1p.compute((x + x) / (1.0 - x));
+            }
+            return hx >= 0 ? t : -t;
+        }
+    }
 }
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index a9da1c32490..85ca80735f8 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1448,6 +1448,7 @@ public final class Integer extends Number
      * @param divisor the value doing the dividing
      * @return the unsigned quotient of the first argument divided by
      * the second argument
+     * @throws ArithmeticException if the divisor is zero
      * @see #remainderUnsigned
      * @since 1.8
      */
@@ -1466,6 +1467,7 @@ public final class Integer extends Number
      * @param divisor the value doing the dividing
      * @return the unsigned remainder of the first argument divided by
      * the second argument
+     * @throws ArithmeticException if the divisor is zero
      * @see #divideUnsigned
      * @since 1.8
      */
diff --git a/src/java.base/share/classes/java/lang/LazyConstant.java b/src/java.base/share/classes/java/lang/LazyConstant.java
index 703d67b8abf..85f9d0e82fd 100644
--- a/src/java.base/share/classes/java/lang/LazyConstant.java
+++ b/src/java.base/share/classes/java/lang/LazyConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,9 +87,8 @@ import java.util.function.Supplier;
  * is thrown. Hence, a lazy constant can never hold a {@code null} value. Clients who
  * want to use a nullable constant can wrap the value into an {@linkplain Optional} holder.
  * <p>
- * If the computing function recursively invokes itself (directly or indirectly via
- * the lazy constant), an {@linkplain IllegalStateException} is thrown, and the lazy
- * constant is not initialized.
+ * If the computing function recursively invokes itself via the lazy constant, an
+ * {@linkplain IllegalStateException} is thrown, and the lazy constant is not initialized.
  *
  * <h2 id="composition">Composing lazy constants</h2>
  * A lazy constant can depend on other lazy constants, forming a dependency graph
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index c5cd9650f2d..5fa1b8fc2ea 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1411,6 +1411,7 @@ public final class Long extends Number
      * @param divisor the value doing the dividing
      * @return the unsigned quotient of the first argument divided by
      * the second argument
+     * @throws ArithmeticException if the divisor is zero
      * @see #remainderUnsigned
      * @since 1.8
      */
@@ -1434,6 +1435,7 @@ public final class Long extends Number
      * @param divisor the value doing the dividing
      * @return the unsigned remainder of the first argument divided by
      * the second argument
+     * @throws ArithmeticException if the divisor is zero
      * @see #divideUnsigned
      * @since 1.8
      */
diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 55659bed57b..38a5328fa0b 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -108,11 +108,11 @@ import static java.lang.Double.*;
  * sin}, {@link cos cos}, {@link tan tan}, {@link asin asin}, {@link
  * acos acos}, {@link atan atan}, {@link exp exp}, {@link expm1
  * expm1}, {@link log log}, {@link log10 log10}, {@link log1p log1p},
- * {@link sinh sinh}, {@link cosh cosh}, {@link tanh tanh}, {@link
- * hypot hypot}, and {@link pow pow}.  (The {@link sqrt sqrt}
- * operation is a required part of IEEE 754 from a different section
- * of the standard.) The special case behavior of the recommended
- * operations generally follows the guidance of the IEEE 754
+ * {@link sinh sinh}, {@link cosh cosh}, {@link tanh tanh}, {@link asinh asinh},
+ * {@link acosh acosh}, {@link atanh atanh}, {@link hypot hypot}, and {@link pow pow}.
+ * (The {@link sqrt sqrt} operation is a required part of IEEE 754
+ * from a different section of the standard.) The special case behavior
+ * of the recommended operations generally follows the guidance of the IEEE 754
  * standard. However, the {@code pow} method defines different
  * behavior for some arguments, as noted in its {@linkplain pow
  * specification}. The IEEE 754 standard defines its operations to be
@@ -2758,6 +2758,94 @@ public final class Math {
         return StrictMath.tanh(x);
     }
 
+    /**
+     * Returns the inverse hyperbolic sine of a {@code double} value.
+     * The inverse hyperbolic sine of <i>x</i> is defined to be the function such that
+     * asinh({@linkplain Math#sinh sinh(<i>x</i>)}) = <i>x</i> for any <i>x</i>.
+     * Note that both domain and range of the exact asinh are unrestricted.
+     * <p>Special cases:
+     * <ul>
+     *
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.
+     *
+     * <li>If the argument is infinity, then the result is
+     * infinity with the same sign as the argument.
+     *
+     * <li>If the argument is NaN, then the result is NaN.
+     *
+     *
+     * </ul>
+     * <p>The computed result must be within 2.5 ulps of the exact result.
+     * @param   x The number whose inverse hyperbolic sine is to be returned.
+     * @return  The inverse hyperbolic sine of {@code x}.
+     * @since 27
+     */
+    public static double asinh(double x) {
+        return StrictMath.asinh(x);
+    }
+
+
+
+    /**
+     * Returns the inverse hyperbolic cosine of a {@code double} value.
+     * The inverse hyperbolic cosine of <i>x</i> is defined to be the function such that
+     *  acosh({@linkplain Math#cosh cosh(<i>x</i>)}) = <i>x</i> for any <i>x</i> >= 0.
+     *  Note that range of the exact acosh(x) is >= 0.
+     * <p>Special cases:
+     * <ul>
+     *
+     * <li>If the argument is positive infinity, then the result is
+     * positive infinity
+     *
+     * <li>If the argument less than 1, then the result is NaN.
+     *
+     * <li>If the argument is NaN, then the result is NaN.
+     *
+     * <li>If the argument is {@code 1.0}, then the result is positive zero.
+     *
+     * </ul>
+     * <p>The computed result must be within 2.5 ulps of the exact result.
+     * @param   x The number whose inverse hyperbolic cosine is to be returned.
+     * @return  The inverse hyperbolic cosine of {@code x}.
+     * @since 27
+     */
+    public static double acosh(double x) {
+        return StrictMath.acosh(x);
+    }
+
+    /**
+     * Returns the inverse hyperbolic tangent of a {@code double} value.
+     * The inverse hyperbolic tangent of <i>x</i> is defined to be the function such that
+     * atanh({@linkplain Math#tanh tanh(<i>x</i>)}) = <i>x</i> for any <i>x</i>.
+     * Note that the domain of the exact atanh is (-1; 1), the range is unrestricted.
+     *
+     * <p>Special cases:
+     * <ul>
+     *
+     * <li>If the argument is NaN, then the result is NaN.
+     *
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.
+     *
+     * <li>If the argument is {@code +1.0}, then the result is
+     * positive infinity.
+     *
+     * <li>If the argument is {@code -1.0}, then the result is
+     * negative infinity.
+     *
+     * <li>If the argument is greater than {@code 1.0} in magnitude, then the result is NaN.
+     *
+     * </ul>
+     * <p> The computed result must be within 2.5 ulps of the exact result.
+     * @param   x The number whose inverse hyperbolic tangent is to be returned.
+     * @return  The inverse hyperbolic tangent of {@code x}.
+     * @since 27
+     */
+    public static double atanh(double x) {
+        return StrictMath.atanh(x);
+    }
+
     /**
      * Returns sqrt(<i>x</i><sup>2</sup>&nbsp;+<i>y</i><sup>2</sup>)
      * without intermediate overflow or underflow.
diff --git a/src/java.base/share/classes/java/lang/ProcessBuilder.java b/src/java.base/share/classes/java/lang/ProcessBuilder.java
index d461818eedf..bc92ea4ee82 100644
--- a/src/java.base/share/classes/java/lang/ProcessBuilder.java
+++ b/src/java.base/share/classes/java/lang/ProcessBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -930,6 +930,12 @@ public final class ProcessBuilder
      * command interpreters, or the standard C library function
      * {@code system()}.
      *
+     * @implNote
+     * When the process is {@link #start started},
+     * if {#code System.out} and/or {#code System.err} have been
+     * closed in the current process, the corresponding output
+     * in the subprocess will be discarded.
+     *
      * @return this process builder
      * @since  1.7
      */
diff --git a/src/java.base/share/classes/java/lang/Shutdown.java b/src/java.base/share/classes/java/lang/Shutdown.java
index 87c4732a5ce..a9d4d6a28a9 100644
--- a/src/java.base/share/classes/java/lang/Shutdown.java
+++ b/src/java.base/share/classes/java/lang/Shutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,11 +55,10 @@ class Shutdown {
     private static int currentRunningHook = -1;
 
     /* The preceding static fields are protected by this lock */
-    private static class Lock { };
-    private static Object lock = new Lock();
+    private static final Object lock = new Object();
 
     /* Lock object for the native halt method */
-    private static Object haltLock = new Lock();
+    private static final Object haltLock = new Object();
 
     /**
      * Add a new system shutdown hook.  Checks the shutdown state and
diff --git a/src/java.base/share/classes/java/lang/StackTraceElement.java b/src/java.base/share/classes/java/lang/StackTraceElement.java
index 70219a7f6ec..bbcfa2a8a17 100644
--- a/src/java.base/share/classes/java/lang/StackTraceElement.java
+++ b/src/java.base/share/classes/java/lang/StackTraceElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -561,7 +561,7 @@ public final class StackTraceElement implements java.io.Serializable {
 
         // VM to fill in StackTraceElement
         initStackTraceElements(stackTrace, x, depth);
-        return of(stackTrace);
+        return finishInit(stackTrace);
     }
 
     /*
@@ -575,7 +575,7 @@ public final class StackTraceElement implements java.io.Serializable {
         return ste;
     }
 
-    static StackTraceElement[] of(StackTraceElement[] stackTrace) {
+    static StackTraceElement[] finishInit(StackTraceElement[] stackTrace) {
         // ensure the proper StackTraceElement initialization
         for (StackTraceElement ste : stackTrace) {
             ste.computeFormat();
diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index 499fce73aee..a8f67ef58ba 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,7 @@ import jdk.internal.vm.annotation.IntrinsicCandidate;
  * {@code exp}, {@code log}, {@code log10},
  * {@code cbrt}, {@code atan2}, {@code pow},
  * {@code sinh}, {@code cosh}, {@code tanh},
+ * {@code asinh}, {@code acosh},{@code atanh},
  * {@code hypot}, {@code expm1}, and {@code log1p}.
  *
  * <p>
@@ -2170,6 +2171,89 @@ public final class StrictMath {
         return FdLibm.Tanh.compute(x);
     }
 
+    /**
+     * Returns the inverse hyperbolic sine of a {@code double} value.
+     * The inverse hyperbolic sine of <i>x</i> is defined to be the function such that
+     * asinh({@linkplain Math#sinh sinh(<i>x</i>)}) = <i>x</i> for any <i>x</i>.
+     * Note that both domain and range of the exact asinh are unrestricted.
+     * <p>Special cases:
+     * <ul>
+     *
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.
+     *
+     * <li>If the argument is infinity, then the result is
+     * infinity with the same sign as the argument.
+     *
+     * <li>If the argument is NaN, then the result is NaN.
+     *
+     * </ul>
+     * @param   x The number whose inverse hyperbolic sine is to be returned.
+     * @return  The inverse hyperbolic sine of {@code x}.
+     * @since 27
+     */
+    public static double asinh(double x) {
+        return FdLibm.Asinh.compute(x);
+    }
+
+    /**
+     * Returns the inverse hyperbolic cosine of a {@code double} value.
+     * The inverse hyperbolic cosine of <i>x</i> is defined to be the function such that
+     *  acosh({@linkplain Math#cosh cosh(<i>x</i>)}) = <i>x</i> for any <i>x</i> >= 0.
+     *  Note that range of the exact acosh(x) is >= 0.
+     * <p>Special cases:
+     * <ul>
+     *
+     * <li>If the argument is positive infinity, then the result is
+     * positive infinity
+     *
+     * <li>If the argument less than {@code 1.0}, then the result is NaN.
+     *
+     * <li>If the argument is NaN, then the result is NaN.
+     *
+     * <li>If the argument is {@code 1.0}, then the result is positive zero.
+     *
+     * </ul>
+     * @param   x The number whose inverse hyperbolic cosine is to be returned.
+     * @return  The inverse hyperbolic cosine of {@code x}.
+     * @since 27
+     */
+    public static double acosh(double x) {
+        return FdLibm.Acosh.compute(x);
+    }
+
+    /**
+     * Returns the inverse hyperbolic tangent of a {@code double} value.
+     * The inverse hyperbolic tangent of <i>x</i> is defined to be the function such that
+     * atanh({@linkplain Math#tanh tanh(<i>x</i>)}) = <i>x</i> for any <i>x</i>.
+     * Note that the domain of the exact atanh is (-1; 1), the range is unrestricted.
+     *
+     * <p>Special cases:
+     * <ul>
+     *
+     * <li>If the argument is NaN, then the result is NaN.
+     *
+     * <li>If the argument is zero, then the result is a zero with the
+     * same sign as the argument.
+     *
+     * <li>If the argument is {@code +1.0}, then the result is
+     * positive infinity.
+     *
+     * <li>If the argument is {@code -1.0}, then the result is
+     * negative infinity.
+     *
+     * <li>If the argument is greater than {@code 1.0} in magnitude, then the result is NaN.
+     *
+     * </ul>
+     *
+     * @param   x The number whose inverse hyperbolic tangent is to be returned.
+     * @return  The inverse hyperbolic tangent of {@code x}.
+     * @since 27
+     */
+    public static double atanh(double x) {
+        return FdLibm.Atanh.compute(x);
+    }
+
     /**
      * Returns sqrt(<i>x</i><sup>2</sup>&nbsp;+<i>y</i><sup>2</sup>)
      * without intermediate overflow or underflow.
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 1ac15e3a8b2..fc05febdb45 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1111,7 +1111,7 @@ public final class String
         int sp = 0;
         int sl = len;
         while (sp < sl) {
-            int ret = StringCoding.implEncodeISOArray(val, sp, dst, dp, len);
+            int ret = StringCoding.encodeISOArray(val, sp, dst, dp, len);
             sp = sp + ret;
             dp = dp + ret;
             if (ret != len) {
diff --git a/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java
index c02af28c37d..3145e7d0216 100644
--- a/src/java.base/share/classes/java/lang/StringCoding.java
+++ b/src/java.base/share/classes/java/lang/StringCoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,8 +26,11 @@
 
 package java.lang;
 
+import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
+import java.util.function.BiFunction;
+
 /**
  * Utility class for string encoding and decoding.
  */
@@ -38,7 +41,7 @@ class StringCoding {
     /**
      * Count the number of leading non-zero ascii chars in the range.
      */
-    public static int countNonZeroAscii(String s) {
+    static int countNonZeroAscii(String s) {
         byte[] value = s.value();
         if (s.isLatin1()) {
             return countNonZeroAsciiLatin1(value, 0, value.length);
@@ -50,7 +53,7 @@ class StringCoding {
     /**
      * Count the number of non-zero ascii chars in the range.
      */
-    public static int countNonZeroAsciiLatin1(byte[] ba, int off, int len) {
+    private static int countNonZeroAsciiLatin1(byte[] ba, int off, int len) {
         int limit = off + len;
         for (int i = off; i < limit; i++) {
             if (ba[i] <= 0) {
@@ -63,7 +66,7 @@ class StringCoding {
     /**
      * Count the number of leading non-zero ascii chars in the range.
      */
-    public static int countNonZeroAsciiUTF16(byte[] ba, int off, int strlen) {
+    private static int countNonZeroAsciiUTF16(byte[] ba, int off, int strlen) {
         int limit = off + strlen;
         for (int i = off; i < limit; i++) {
             char c = StringUTF16.charAt(ba, i);
@@ -74,7 +77,7 @@ class StringCoding {
         return strlen;
     }
 
-    public static boolean hasNegatives(byte[] ba, int off, int len) {
+    static boolean hasNegatives(byte[] ba, int off, int len) {
         return countPositives(ba, off, len) != len;
     }
 
@@ -85,9 +88,24 @@ class StringCoding {
      *   bytes in the range. If there are negative bytes, the implementation must return
      *   a value that is less than or equal to the index of the first negative byte
      *   in the range.
+     *
+     * @param ba a byte array
+     * @param off the index of the first byte to start reading from
+     * @param len the total number of bytes to read
+     * @throws NullPointerException if {@code ba} is null
+     * @throws ArrayIndexOutOfBoundsException if the provided sub-range is
+     *         {@linkplain Preconditions#checkFromIndexSize(int, int, int, BiFunction) out of bounds}
      */
+    static int countPositives(byte[] ba, int off, int len) {
+        Preconditions.checkFromIndexSize(
+                off, len,
+                ba.length,      // Implicit null check on `ba`
+                Preconditions.AIOOBE_FORMATTER);
+        return countPositives0(ba, off, len);
+    }
+
     @IntrinsicCandidate
-    public static int countPositives(byte[] ba, int off, int len) {
+    private static int countPositives0(byte[] ba, int off, int len) {
         int limit = off + len;
         for (int i = off; i < limit; i++) {
             if (ba[i] < 0) {
@@ -97,9 +115,37 @@ class StringCoding {
         return len;
     }
 
+    /**
+     * Encodes as many ISO-8859-1 codepoints as possible from the source byte
+     * array containing characters encoded in UTF-16, into the destination byte
+     * array, assuming that the encoding is ISO-8859-1 compatible.
+     *
+     * @param sa the source byte array containing characters encoded in UTF-16
+     * @param sp the index of the <em>character (not byte!)</em> from the source array to start reading from
+     * @param da the target byte array
+     * @param dp the index of the target array to start writing to
+     * @param len the maximum number of <em>characters (not bytes!)</em> to be encoded
+     * @return the total number of <em>characters (not bytes!)</em> successfully encoded
+     * @throws NullPointerException if any of the provided arrays is null
+     */
+    static int encodeISOArray(byte[] sa, int sp,
+                              byte[] da, int dp, int len) {
+        // This method should tolerate invalid arguments, matching the lenient behavior of the VM intrinsic.
+        // Hence, using operator expressions instead of `Preconditions`, which throw on failure.
+        int sl;
+        if ((sp | dp | len) < 0 ||
+                // Halving the length of `sa` to obtain the number of characters:
+                sp >= (sl = sa.length >>> 1) ||     // Implicit null check on `sa`
+                dp >= da.length) {                  // Implicit null check on `da`
+            return 0;
+        }
+        int minLen = Math.min(len, Math.min(sl - sp, da.length - dp));
+        return encodeISOArray0(sa, sp, da, dp, minLen);
+    }
+
     @IntrinsicCandidate
-    public static int implEncodeISOArray(byte[] sa, int sp,
-                                         byte[] da, int dp, int len) {
+    private static int encodeISOArray0(byte[] sa, int sp,
+                                       byte[] da, int dp, int len) {
         int i = 0;
         for (; i < len; i++) {
             char c = StringUTF16.getChar(sa, sp++);
@@ -110,10 +156,35 @@ class StringCoding {
         return i;
     }
 
+    /**
+     * Encodes as many ASCII codepoints as possible from the source
+     * character array into the destination byte array, assuming that
+     * the encoding is ASCII compatible.
+     *
+     * @param sa the source character array
+     * @param sp the index of the source array to start reading from
+     * @param da the target byte array
+     * @param dp the index of the target array to start writing to
+     * @param len the maximum number of characters to be encoded
+     * @return the total number of characters successfully encoded
+     * @throws NullPointerException if any of the provided arrays is null
+     */
+    static int encodeAsciiArray(char[] sa, int sp,
+                                byte[] da, int dp, int len) {
+        // This method should tolerate invalid arguments, matching the lenient behavior of the VM intrinsic.
+        // Hence, using operator expressions instead of `Preconditions`, which throw on failure.
+        if ((sp | dp | len) < 0 ||
+                sp >= sa.length ||      // Implicit null check on `sa`
+                dp >= da.length) {      // Implicit null check on `da`
+            return 0;
+        }
+        int minLen = Math.min(len, Math.min(sa.length - sp, da.length - dp));
+        return encodeAsciiArray0(sa, sp, da, dp, minLen);
+    }
+
     @IntrinsicCandidate
-    public static int implEncodeAsciiArray(char[] sa, int sp,
-                                           byte[] da, int dp, int len)
-    {
+    static int encodeAsciiArray0(char[] sa, int sp,
+                                 byte[] da, int dp, int len) {
         int i = 0;
         for (; i < len; i++) {
             char c = sa[sp++];
diff --git a/src/java.base/share/classes/java/lang/StringLatin1.java b/src/java.base/share/classes/java/lang/StringLatin1.java
index 21a8b2dd61a..adfd9c6dbab 100644
--- a/src/java.base/share/classes/java/lang/StringLatin1.java
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package java.lang;
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Spliterator;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
@@ -39,12 +40,22 @@ import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 import static java.lang.String.LATIN1;
 import static java.lang.String.UTF16;
-import static java.lang.String.checkIndex;
-import static java.lang.String.checkOffset;
 
+/**
+ * Latin-1 string operations.
+ * <p>
+ * Unless stated otherwise, all methods assume that
+ * <ul>
+ * <li>{@code byte[]} arguments denote a Latin-1 string byte array
+ * <li>indices, offsets, and lengths (typically of type {@code int}) are in
+ * number of characters, i.e., the number of {@code byte}s/{@code char}s for
+ * Latin-1 strings, and the number of <a href="Character.html#unicode">Unicode
+ * code units</a> for UTF-16 strings
+ * </ul>
+ */
 final class StringLatin1 {
     static char charAt(byte[] value, int index) {
-        checkIndex(index, value.length);
+        String.checkIndex(index, value.length);
         return (char)(value[index] & 0xff);
     }
 
@@ -84,8 +95,23 @@ final class StringLatin1 {
         System.arraycopy(value, srcBegin, dst, dstBegin, srcEnd - srcBegin);
     }
 
-    @IntrinsicCandidate
+    /**
+     * {@return {@code true} if provided byte arrays contain identical content; {@code false} otherwise}.
+     *
+     * @param value a byte array
+     * @param other a byte array
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     */
     static boolean equals(byte[] value, byte[] other) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        return equals0(value, other);
+    }
+
+    // vmIntrinsics::_equalsL
+    @IntrinsicCandidate
+    private static boolean equals0(byte[] value, byte[] other) {
         if (value.length == other.length) {
             for (int i = 0; i < value.length; i++) {
                 if (value[i] != other[i]) {
@@ -97,33 +123,102 @@ final class StringLatin1 {
         return false;
     }
 
-    @IntrinsicCandidate
+    /**
+     * Lexicographically compares two Latin-1 strings as specified in
+     * {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a Latin-1 string byte array
+     * @param other a Latin-1 string byte array
+     *
+     * @return {@code 0} if {@code value} is equal to {@code other}, a value
+     * less than {@code 0} if {@code value} is lexicographically less than
+     * {@code other}; a value greater than {@code 0} otherwise.
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     */
     static int compareTo(byte[] value, byte[] other) {
-        int len1 = value.length;
-        int len2 = other.length;
-        return compareTo(value, other, len1, len2);
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        return compareTo0(value, other);
     }
 
+    // vmIntrinsics::_compareToL
+    @IntrinsicCandidate
+    private static int compareTo0(byte[] value, byte[] other) {
+        return compareTo(value, other, value.length, other.length);
+    }
+
+    /**
+     * Lexicographically compares two Latin-1 string prefixes as specified in
+     * {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a Latin-1 string byte array
+     * @param other a Latin-1 string byte array
+     * @param len1 the number of characters in {@code value} to compare
+     * @param len2 the number of characters in {@code other} to compare
+     *
+     * @return {@code 0} if the {@code value} prefix is equal to the
+     * {@code other} prefix, a value less than {@code 0} if the {@code value}
+     * prefix is lexicographically less than the {@code other} prefix; a
+     * value greater than {@code 0} otherwise.
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
     static int compareTo(byte[] value, byte[] other, int len1, int len2) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        String.checkOffset(len1, length(value));
+        String.checkOffset(len2, length(other));
         int lim = Math.min(len1, len2);
         int k = ArraysSupport.mismatch(value, other, lim);
         return (k < 0) ? len1 - len2 : getChar(value, k) - getChar(other, k);
     }
 
-    @IntrinsicCandidate
+    /**
+     * Lexicographically compares a Latin-1 string to a UTF-16 string as
+     * specified in {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a Latin-1 string byte array
+     * @param other a UTF-16 string byte array
+     *
+     * @return {@code 0} if the {@code value} is equal to the {@code other}, a
+     * value less than {@code 0} if the {@code value} is lexicographically less
+     * than the {@code other}; a value greater than {@code 0} otherwise.
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     */
     static int compareToUTF16(byte[] value, byte[] other) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        return compareToUTF16_0(value, other);
+    }
+
+    // vmIntrinsics::_compareToLU
+    @IntrinsicCandidate
+    private static int compareToUTF16_0(byte[] value, byte[] other) {
         int len1 = length(value);
         int len2 = StringUTF16.length(other);
         return compareToUTF16Values(value, other, len1, len2);
     }
 
-    /*
-     * Checks the boundary and then compares the byte arrays.
+    /**
+     * Lexicographically compares a Latin-1 string prefix to a UTF-16 one as
+     * specified in {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a Latin-1 string byte array
+     * @param other a UTF-16 string byte array
+     * @param len1 the number of characters in {@code value} to compare
+     * @param len2 the number of characters in {@code other} to compare
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
      */
     static int compareToUTF16(byte[] value, byte[] other, int len1, int len2) {
-        checkOffset(len1, length(value));
-        checkOffset(len2, StringUTF16.length(other));
-
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        String.checkOffset(len1, length(value));
+        String.checkOffset(len2, StringUTF16.length(other));
         return compareToUTF16Values(value, other, len1, len2);
     }
 
@@ -139,9 +234,12 @@ final class StringLatin1 {
         return len1 - len2;
     }
 
+    /**
+     * Case-insensitive {@link #compareTo(byte[], byte[]) compareTo}.
+     */
     static int compareToCI(byte[] value, byte[] other) {
-        int len1 = value.length;
-        int len2 = other.length;
+        int len1 = value.length;    // Implicit null check on `value`
+        int len2 = other.length;    // Implicit null check on `other`
         int lim = Math.min(len1, len2);
         for (int k = 0; k < lim; k++) {
             if (value[k] != other[k]) {
@@ -159,7 +257,12 @@ final class StringLatin1 {
         return len1 - len2;
     }
 
+    /**
+     * Case-insensitive {@link #compareToUTF16(byte[], byte[]) compareToUTF16}.
+     */
     static int compareToCI_UTF16(byte[] value, byte[] other) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
         int len1 = length(value);
         int len2 = StringUTF16.length(other);
         int lim = Math.min(len1, len2);
@@ -307,16 +410,34 @@ final class StringLatin1 {
         return ArraysSupport.hashCodeOfUnsigned(value, 0, value.length, 0);
     }
 
-    // Caller must ensure that from- and toIndex are within bounds
+    /**
+     * Finds the index of the first character matching the provided one in the
+     * given Latin-1 string byte array sub-range. {@code -1} is returned if the
+     * provided character cannot be encoded in Latin-1, or cannot be found in
+     * the target string sub-range.
+     *
+     * @param value a Latin-1 string byte array to search in
+     * @param ch a character to search for
+     * @param fromIndex the index (inclusive) of the first character in the sub-range
+     * @param toIndex the index (exclusive) of the last character in the sub-range
+     *
+     * @return the index of the first character matching the provided one in the
+     * given target string sub-range; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code value} is null
+     * @throws StringIndexOutOfBoundsException if the sub-range is out of bounds
+     */
     static int indexOf(byte[] value, int ch, int fromIndex, int toIndex) {
+        String.checkBoundsBeginEnd(fromIndex, toIndex, value.length);   // Implicit null check on `value`
         if (!canEncode(ch)) {
             return -1;
         }
-        return indexOfChar(value, ch, fromIndex, toIndex);
+        return indexOfChar0(value, ch, fromIndex, toIndex);
     }
 
+    // vmIntrinsics::_indexOfL_char
     @IntrinsicCandidate
-    private static int indexOfChar(byte[] value, int ch, int fromIndex, int max) {
+    private static int indexOfChar0(byte[] value, int ch, int fromIndex, int max) {
         byte c = (byte)ch;
         for (int i = fromIndex; i < max; i++) {
             if (value[i] == c) {
@@ -326,22 +447,67 @@ final class StringLatin1 {
         return -1;
     }
 
-    @IntrinsicCandidate
+    /**
+     * Searches for the first occurrence of {@code str} in {@code value}, and,
+     * if found, returns the index of the first character of the matching
+     * {@code value} sub-range; {@code -1} otherwise.
+     *
+     * @param value a Latin-1 string byte array to search in
+     * @param str a Latin-1 string byte array to search for
+     *
+     * @return the index of the first character of the matching {@code value}
+     * sub-range if a match is found; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code value} or {@code str} is null
+     */
     static int indexOf(byte[] value, byte[] str) {
-        if (str.length == 0) {
-            return 0;
-        }
-        if (value.length == 0) {
-            return -1;
-        }
-        return indexOf(value, value.length, str, str.length, 0);
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(str);
+        return indexOf0(value, str);
     }
 
+    // vmIntrinsics::_indexOfL
     @IntrinsicCandidate
-    static int indexOf(byte[] value, int valueCount, byte[] str, int strCount, int fromIndex) {
+    private static int indexOf0(byte[] value, byte[] str) {
+        return indexOf0(value, value.length, str, str.length, 0);
+    }
+
+    /**
+     * Searches for the first occurrence of the given {@code str} sub-range in
+     * the given {@code value} sub-range, and, if found, returns the index of
+     * the first character of the matching {@code value} sub-range; {@code -1}
+     * otherwise.
+     *
+     * @param value a Latin-1 string byte array to search in
+     * @param valueToIndex the index (exclusive) of the last character in {@code value}
+     * @param str a Latin-1 string byte array to search for
+     * @param strToIndex the index (exclusive) of the last character in {@code str}
+     * @param valueFromIndex the index (inclusive) of the first character in {@code value}
+     *
+     * @return the index of the first character of the matching {@code value}
+     * sub-range if a match is found; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code value} or {@code str} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
+    static int indexOf(byte[] value, int valueToIndex, byte[] str, int strToIndex, int valueFromIndex) {
+        String.checkBoundsBeginEnd(valueFromIndex, valueToIndex, value.length);    // Implicit null check on `value`
+        String.checkBoundsBeginEnd(0, strToIndex, str.length);                     // Implicit null check on `str`
+        return indexOf0(value, valueToIndex, str, strToIndex, valueFromIndex);
+    }
+
+    // vmIntrinsics::_indexOfIL
+    @IntrinsicCandidate
+    private static int indexOf0(byte[] value, int valueToIndex, byte[] str, int strToIndex, int valueFromIndex) {
+        if (strToIndex == 0) {
+            return 0;
+        }
+        if ((valueToIndex - valueFromIndex) < strToIndex) {
+            return -1;
+        }
         byte first = str[0];
-        int max = (valueCount - strCount);
-        for (int i = fromIndex; i <= max; i++) {
+        int max = (valueToIndex - strToIndex);
+        for (int i = valueFromIndex; i <= max; i++) {
             // Look for first character.
             if (value[i] != first) {
                 while (++i <= max && value[i] != first);
@@ -349,7 +515,7 @@ final class StringLatin1 {
             // Found first character, now look at the rest of value
             if (i <= max) {
                 int j = i + 1;
-                int end = j + strCount - 1;
+                int end = j + strToIndex - 1;
                 for (int k = 1; j < end && value[j] == str[k]; j++, k++);
                 if (j == end) {
                     // Found whole string.
@@ -855,18 +1021,65 @@ final class StringLatin1 {
                           LATIN1);
     }
 
-    // inflatedCopy byte[] -> char[]
-    @IntrinsicCandidate
+    /**
+     * Copies characters from a Latin-1 string byte array sub-range to the
+     * given {@code char} array sub-range.
+     * <p>
+     * This effectively <em>inflates</em> the content from a 1 byte per
+     * character representation to a 2 byte one.
+     *
+     * @param src the source Latin-1 string byte array
+     * @param srcOff the index (inclusive) of the first character in {@code src}
+     * @param dst the target {@code char} array
+     * @param dstOff the index (inclusive) of the first character in {@code dst}
+     * @param len the maximum number of characters to copy
+     *
+     * @throws NullPointerException if {@code src} or {@code dst} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
     static void inflate(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
+        String.checkBoundsOffCount(srcOff, len, src.length);    // Implicit null check on `src`
+        String.checkBoundsOffCount(dstOff, len, dst.length);    // Implicit null check on `dst`
+        inflate0(src, srcOff, dst, dstOff, len);
+    }
+
+    // vmIntrinsics::_inflateStringC
+    @IntrinsicCandidate
+    private static void inflate0(byte[] src, int srcOff, char[] dst, int dstOff, int len) {
         for (int i = 0; i < len; i++) {
             dst[dstOff++] = (char)(src[srcOff++] & 0xff);
         }
     }
 
-    // inflatedCopy byte[] -> byte[]
-    @IntrinsicCandidate
+    /**
+     * Copies characters from a Latin-1 string byte array sub-range to a UTF-16
+     * one.
+     * <p>
+     * This effectively <em>inflates</em> the content from a 1 byte per
+     * character representation to a 2 byte one.
+     *
+     * @param src the source Latin-1 string byte array
+     * @param srcOff the index (inclusive) of the first character in {@code src}
+     * @param dst the target UTF-16 string byte array
+     * @param dstOff the index (inclusive) of the first character in {@code dst}
+     * @param len the maximum number of characters to copy
+     *
+     * @throws NullPointerException if {@code src} or {@code dst} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
     static void inflate(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
-        StringUTF16.inflate(src, srcOff, dst, dstOff, len);
+        String.checkBoundsOffCount(srcOff, len, src.length);    // Implicit null check on `src`
+        Objects.requireNonNull(dst);
+        String.checkBoundsOffCount(dstOff, len, StringUTF16.length(dst));
+        inflate0(src, srcOff, dst, dstOff, len);
+    }
+
+    // vmIntrinsics::_inflateStringB
+    @IntrinsicCandidate
+    private static void inflate0(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
+        for (int i = 0; i < len; i++) {
+            StringUTF16.putChar(dst, dstOff++, src[srcOff++] & 0xff);
+        }
     }
 
     static class CharsSpliterator implements Spliterator.OfInt {
diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java
index 75c9e8239ba..27b9ae54a8a 100644
--- a/src/java.base/share/classes/java/lang/StringUTF16.java
+++ b/src/java.base/share/classes/java/lang/StringUTF16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2025, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +28,7 @@ package java.lang;
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Spliterator;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
@@ -49,8 +50,13 @@ import static java.lang.String.UTF16;
 /// it has the same endianness as a char, which is the platform endianness.
 /// This is ensured in the static initializer of StringUTF16.
 ///
-/// All indices and sizes for byte arrays carrying UTF16 data are in number of
-/// chars instead of  number of bytes.
+/// Unless stated otherwise, all methods assume that
+///
+/// - `byte[]` arguments denote a UTF-16 string byte array
+/// - indices, offsets, and lengths (typically of type `int`) are in number of
+///   characters, i.e., the number of
+///   [Unicode code units](Character.html#unicode) for UTF-16 strings, and the
+///   number of `byte`s/`char`s for Latin-1 strings
 final class StringUTF16 {
 
     // Return a new byte array for a UTF16-coded string for len chars
@@ -388,9 +394,33 @@ final class StringUTF16 {
         return n;
     }
 
-    // compressedCopy char[] -> byte[]
-    @IntrinsicCandidate
+    /**
+     * Copies the prefix of Latin-1 characters from a {@code char} array
+     * sub-range to a Latin-1 string byte array sub-range.
+     * <p>
+     * This effectively <em>compresses</em> the content from a 2 byte per
+     * character representation to a 1 byte one.
+     *
+     * @param src the source {@code char} array
+     * @param srcOff the index (inclusive) of the first character in {@code src}
+     * @param dst the target Latin-1 string byte array
+     * @param dstOff the index (inclusive) of the first character in {@code dst}
+     * @param len the maximum number of characters to copy
+     *
+     * @return the number of characters copied
+     *
+     * @throws NullPointerException if {@code src} or {@code dst} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
     static int compress(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
+        String.checkBoundsOffCount(srcOff, len, src.length);    // Implicit null check on `src`
+        String.checkBoundsOffCount(dstOff, len, dst.length);    // Implicit null check on `dst`
+        return compress0(src, srcOff, dst, dstOff, len);
+    }
+
+    // vmIntrinsics::_compressStringC
+    @IntrinsicCandidate
+    private static int compress0(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
         for (int i = 0; i < len; i++) {
             char c = src[srcOff];
             if (c > 0xff) {
@@ -403,11 +433,34 @@ final class StringUTF16 {
         return len;
     }
 
-    // compressedCopy byte[] -> byte[]
-    @IntrinsicCandidate
+    /**
+     * Copies the prefix of Latin-1 characters from a UTF-16 string byte array
+     * sub-range to a Latin-1 one.
+     * <p>
+     * This effectively <em>compresses</em> the content from a 2 byte per
+     * character representation to a 1 byte one.
+     *
+     * @param src the source UTF-16 string byte array
+     * @param srcOff the index (inclusive) of the first character in {@code src}
+     * @param dst the target Latin-1 string byte array
+     * @param dstOff the index (inclusive) of the first character in {@code dst}
+     * @param len the maximum number of characters to copy
+     *
+     * @return the number of characters copied
+     *
+     * @throws NullPointerException if {@code src} or {@code dst} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
     static int compress(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
-        // We need a range check here because 'getChar' has no checks
-        checkBoundsOffCount(srcOff, len, src);
+        Objects.requireNonNull(src);
+        String.checkBoundsOffCount(srcOff, len, length(src));
+        String.checkBoundsOffCount(dstOff, len, dst.length);    // Implicit null check on `dst`
+        return compress0(src, srcOff, dst, dstOff, len);
+    }
+
+    // vmIntrinsics::_compressStringB
+    @IntrinsicCandidate
+    private static int compress0(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
         for (int i = 0; i < len; i++) {
             char c = getChar(src, srcOff);
             if (c > 0xff) {
@@ -446,7 +499,7 @@ final class StringUTF16 {
     static void getChars(byte[] value, int srcBegin, int srcEnd, char[] dst, int dstBegin) {
         // We need a range check here because 'getChar' has no checks
         if (srcBegin < srcEnd) {
-            checkBoundsOffCount(srcBegin, srcEnd - srcBegin, value);
+            String.checkBoundsOffCount(srcBegin, srcEnd - srcBegin, length(value));
         }
         for (int i = srcBegin; i < srcEnd; i++) {
             dst[dstBegin++] = getChar(value, i);
@@ -462,20 +515,50 @@ final class StringUTF16 {
         }
     }
 
-    @IntrinsicCandidate
+    /**
+     * Lexicographically compares two UTF-16 strings as specified in
+     * {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a UTF-16 string byte array
+     * @param other a UTF-16 string byte array
+     *
+     * @return {@code 0} if {@code value} is equal to {@code other}, a value
+     * less than {@code 0} if {@code value} is lexicographically less than
+     * {@code other}; a value greater than {@code 0} otherwise.
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     */
     static int compareTo(byte[] value, byte[] other) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        return compareTo0(value, other);
+    }
+
+    // vmIntrinsics::_compareToU
+    @IntrinsicCandidate
+    private static int compareTo0(byte[] value, byte[] other) {
         int len1 = length(value);
         int len2 = length(other);
         return compareValues(value, other, len1, len2);
     }
 
-    /*
-     * Checks the boundary and then compares the byte arrays.
+    /**
+     * Lexicographically compares two UTF-16 string prefixes as specified in
+     * {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a UTF-16 string byte array
+     * @param other a UTF-16 string byte array
+     * @param len1 the number of characters in {@code value} to compare
+     * @param len2 the number of characters in {@code other} to compare
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
      */
     static int compareTo(byte[] value, byte[] other, int len1, int len2) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
         checkOffset(len1, value);
         checkOffset(len2, other);
-
         return compareValues(value, other, len1, len2);
     }
 
@@ -491,16 +574,58 @@ final class StringUTF16 {
         return len1 - len2;
     }
 
-    @IntrinsicCandidate
+    /**
+     * Lexicographically compares a UTF-16 string to a Latin-1 one as specified
+     * in {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a UTF-16 string byte array
+     * @param other a Latin-1 string byte array
+     *
+     * @return {@code 0} if {@code value} is equal to {@code other}, a value
+     * less than {@code 0} if {@code value} is lexicographically less than
+     * {@code other}; a value greater than {@code 0} otherwise.
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     */
     static int compareToLatin1(byte[] value, byte[] other) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
+        return compareToLatin1_0(value, other);
+    }
+
+    // vmIntrinsics::_compareToUL
+    @IntrinsicCandidate
+    private static int compareToLatin1_0(byte[] value, byte[] other) {
         return -StringLatin1.compareToUTF16(other, value);
     }
 
+    /**
+     * Lexicographically compares a UTF-16 string prefix to a Latin-1 one as
+     * specified in {@link String#compareTo(String) String::compareTo}.
+     *
+     * @param value a UTF-16 string byte array
+     * @param other a Latin-1 string byte array
+     * @param len1 the number of characters from {@code value} to compare
+     * @param len2 the number of characters from {@code other} to compare
+     *
+     * @return {@code 0} if the {@code value} prefix is equal to the
+     * {@code other} prefix, a value less than {@code 0} if the {@code value}
+     * prefix is lexicographically less than the {@code other} prefix; a
+     * value greater than {@code 0} otherwise.
+     *
+     * @throws NullPointerException if {@code value} or {@code other} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
     static int compareToLatin1(byte[] value, byte[] other, int len1, int len2) {
         return -StringLatin1.compareToUTF16(other, value, len2, len1);
     }
 
+    /**
+     * Case-insensitive {@link #compareTo(byte[], byte[]) compareTo}.
+     */
     static int compareToCI(byte[] value, byte[] other) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(other);
         return compareToCIImpl(value, 0, length(value), other, 0, length(other));
     }
 
@@ -589,6 +714,9 @@ final class StringUTF16 {
         return cp;
     }
 
+    /**
+     * Case-insensitive {@link #compareToLatin1(byte[], byte[]) compareToLatin1}.
+     */
     static int compareToCI_Latin1(byte[] value, byte[] other) {
         return -StringLatin1.compareToCI_UTF16(other, value);
     }
@@ -668,19 +796,52 @@ final class StringUTF16 {
         return ArraysSupport.hashCodeOfUTF16(value, 0, value.length >> 1, 0);
     }
 
-    // Caller must ensure that from- and toIndex are within bounds
+    /**
+     * {@return the index of the first character matching the provided one in
+     * the given UTF-16 string byte array sub-range; {@code -1} otherwise}
+     *
+     * @param value a UTF-16 string byte array to search in
+     * @param ch a character to search for
+     * @param fromIndex the index (inclusive) of the first character in the sub-range
+     * @param toIndex the index (exclusive) of the last character in the sub-range
+     *
+     * @throws NullPointerException if {@code value} is null
+     * @throws StringIndexOutOfBoundsException if the sub-range is out of bounds
+     */
     static int indexOf(byte[] value, int ch, int fromIndex, int toIndex) {
+        Objects.requireNonNull(value);
+        checkBoundsBeginEnd(fromIndex, toIndex, value);
         if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
             // handle most cases here (ch is a BMP code point or a
             // negative value (invalid code point))
-            return indexOfChar(value, ch, fromIndex, toIndex);
+            return indexOfChar0(value, ch, fromIndex, toIndex);
         } else {
             return indexOfSupplementary(value, ch, fromIndex, toIndex);
         }
     }
 
-    @IntrinsicCandidate
+    /**
+     * Searches for the first occurrence of {@code str} in {@code value}, and,
+     * if found, returns the index of the first character of the matching
+     * {@code value} sub-range; {@code -1} otherwise.
+     *
+     * @param value a UTF-16 string byte array to search in
+     * @param str a UTF-16 string byte array to search for
+     *
+     * @return the index of the first character of the matching {@code value}
+     * sub-range if a match is found; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code value} or {@code str} is null
+     */
     static int indexOf(byte[] value, byte[] str) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(str);
+        return indexOf0(value, str);
+    }
+
+    // vmIntrinsics::_indexOfU
+    @IntrinsicCandidate
+    private static int indexOf0(byte[] value, byte[] str) {
         if (str.length == 0) {
             return 0;
         }
@@ -690,22 +851,58 @@ final class StringUTF16 {
         return indexOfUnsafe(value, length(value), str, length(str), 0);
     }
 
-    @IntrinsicCandidate
-    static int indexOf(byte[] value, int valueCount, byte[] str, int strCount, int fromIndex) {
-        checkBoundsBeginEnd(fromIndex, valueCount, value);
-        checkBoundsBeginEnd(0, strCount, str);
-        return indexOfUnsafe(value, valueCount, str, strCount, fromIndex);
+    /**
+     * Searches for the first occurrence of the given {@code str} sub-range in
+     * the given {@code value} sub-range, and, if found, returns the index of
+     * the first character of the matching {@code value} sub-range; {@code -1}
+     * otherwise.
+     *
+     * @param value a UTF-16 string byte array to search in
+     * @param valueToIndex the index (exclusive) of the last character in {@code value}
+     * @param str a UTF-16 string byte array to search for
+     * @param strToIndex the index (exclusive) of the last character in {@code str}
+     * @param valueFromIndex the index (inclusive) of the first character in {@code value}
+     *
+     * @return the index of the first character of the matching {@code value}
+     * sub-range if a match is found; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code value} or {@code str} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
+    static int indexOf(byte[] value, int valueToIndex, byte[] str, int strToIndex, int valueFromIndex) {
+        Objects.requireNonNull(value);
+        checkBoundsBeginEnd(valueFromIndex, valueToIndex, value);
+        Objects.requireNonNull(str);
+        checkBoundsBeginEnd(0, strToIndex, str);
+        return indexOf0(value, valueToIndex, str, strToIndex, valueFromIndex);
     }
 
+    // vmIntrinsics::_indexOfIU
+    @IntrinsicCandidate
+    private static int indexOf0(byte[] value, int valueToIndex, byte[] str, int strToIndex, int valueFromIndex) {
+        if (strToIndex == 0) {
+            return 0;
+        }
+        if ((valueToIndex - valueFromIndex) < strToIndex) {
+            return -1;
+        }
+        return indexOfUnsafe(value, valueToIndex, str, strToIndex, valueFromIndex);
+    }
 
-    private static int indexOfUnsafe(byte[] value, int valueCount, byte[] str, int strCount, int fromIndex) {
-        assert fromIndex >= 0;
-        assert strCount > 0;
-        assert strCount <= length(str);
-        assert valueCount >= strCount;
+    // This method has the following assumptions on its inputs:
+    //
+    // - Arrays are not null
+    // - Sub-ranges are valid
+    // - The `str` sub-range is not empty
+    // - The `value` sub-range length is greater than or equal to the `str` sub-range length
+    private static int indexOfUnsafe(byte[] value, int valueToIndex, byte[] str, int strToIndex, int valueFromIndex) {
+        assert valueFromIndex >= 0;
+        assert strToIndex > 0;
+        assert strToIndex <= length(str);
+        assert (valueToIndex - valueFromIndex) >= strToIndex;
         char first = getChar(str, 0);
-        int max = (valueCount - strCount);
-        for (int i = fromIndex; i <= max; i++) {
+        int max = (valueToIndex - strToIndex);
+        for (int i = valueFromIndex; i <= max; i++) {
             // Look for first character.
             if (getChar(value, i) != first) {
                 while (++i <= max && getChar(value, i) != first);
@@ -713,7 +910,7 @@ final class StringUTF16 {
             // Found first character, now look at the rest of value
             if (i <= max) {
                 int j = i + 1;
-                int end = j + strCount - 1;
+                int end = j + strToIndex - 1;
                 for (int k = 1; j < end && getChar(value, j) == getChar(str, k); j++, k++);
                 if (j == end) {
                     // Found whole string.
@@ -724,12 +921,29 @@ final class StringUTF16 {
         return -1;
     }
 
-
     /**
-     * Handles indexOf Latin1 substring in UTF16 string.
+     * Searches for the first occurrence of the given Latin-1 string byte array
+     * {@code str} in the given UTF-16 string byte array {@code value}, and, if
+     * found, returns the index of the first character of the matching
+     * {@code value} sub-range; {@code -1} otherwise.
+     *
+     * @param value a UTF-16 string byte array to search in
+     * @param str a Latin-1 string byte array to search for
+     *
+     * @return the index of the first character of the matching {@code value}
+     * sub-range if a match is found; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code value} or {@code str} is null
      */
-    @IntrinsicCandidate
     static int indexOfLatin1(byte[] value, byte[] str) {
+        Objects.requireNonNull(value);
+        Objects.requireNonNull(str);
+        return indexOfLatin1_0(value, str);
+    }
+
+    // vmIntrinsics::_indexOfUL
+    @IntrinsicCandidate
+    private static int indexOfLatin1_0(byte[] value, byte[] str) {
         if (str.length == 0) {
             return 0;
         }
@@ -739,18 +953,54 @@ final class StringUTF16 {
         return indexOfLatin1Unsafe(value, length(value), str, str.length, 0);
     }
 
-    @IntrinsicCandidate
-    static int indexOfLatin1(byte[] src, int srcCount, byte[] tgt, int tgtCount, int fromIndex) {
-        checkBoundsBeginEnd(fromIndex, srcCount, src);
-        String.checkBoundsBeginEnd(0, tgtCount, tgt.length);
-        return indexOfLatin1Unsafe(src, srcCount, tgt, tgtCount, fromIndex);
+    /**
+     * Searches for the first occurrence of the given Latin-1 string byte array
+     * {@code tgt} sub-range in the given UTF-16 string byte array {@code src}
+     * sub-range, and, if found, returns the index of the first character in
+     * {@code src}; {@code -1} otherwise.
+     *
+     * @param src a UTF-16 string byte array to search in
+     * @param srcToIndex the index (exclusive) of the last character in {@code src}
+     * @param tgt a Latin-1 string byte array to search for
+     * @param tgtToIndex the index (exclusive) of the last character in {@code tgt}
+     * @param tgtFromIndex the index (inclusive) of the first character in {@code src}
+     *
+     * @return the index of the first character of the matching {@code src}
+     * sub-range if a match is found; {@code -1} otherwise
+     *
+     * @throws NullPointerException if {@code src} or {@code tgt} is null
+     * @throws StringIndexOutOfBoundsException if the sub-ranges are out of bounds
+     */
+    static int indexOfLatin1(byte[] src, int srcToIndex, byte[] tgt, int tgtToIndex, int tgtFromIndex) {
+        Objects.requireNonNull(src);
+        checkBoundsBeginEnd(tgtFromIndex, srcToIndex, src);
+        String.checkBoundsBeginEnd(0, tgtToIndex, tgt.length);
+        return indexOfLatin1_0(src, srcToIndex, tgt, tgtToIndex, tgtFromIndex);
     }
 
-    static int indexOfLatin1Unsafe(byte[] src, int srcCount, byte[] tgt, int tgtCount, int fromIndex) {
+    // vmIntrinsics::_indexOfIUL
+    @IntrinsicCandidate
+    private static int indexOfLatin1_0(byte[] src, int srcToIndex, byte[] tgt, int tgtToIndex, int srcFromIndex) {
+        if (tgtToIndex == 0) {
+            return 0;
+        }
+        if ((srcToIndex - srcFromIndex) < tgtToIndex) {
+            return -1;
+        }
+        return indexOfLatin1Unsafe(src, srcToIndex, tgt, tgtToIndex, srcFromIndex);
+    }
+
+    // This method has the following assumptions on its inputs:
+    //
+    // - Arrays are not null
+    // - Sub-ranges are valid
+    // - The `tgt` sub-range is not empty
+    // - The `src` sub-range length is greater than or equal to the `tgt` sub-range length
+    private static int indexOfLatin1Unsafe(byte[] src, int srcCount, byte[] tgt, int tgtCount, int fromIndex) {
         assert fromIndex >= 0;
         assert tgtCount > 0;
         assert tgtCount <= tgt.length;
-        assert srcCount >= tgtCount;
+        assert (srcCount - fromIndex) >= tgtCount;
         char first = (char)(tgt[0] & 0xff);
         int max = (srcCount - tgtCount);
         for (int i = fromIndex; i <= max; i++) {
@@ -774,8 +1024,9 @@ final class StringUTF16 {
         return -1;
     }
 
+    // vmIntrinsics::_indexOfU_char
     @IntrinsicCandidate
-    private static int indexOfChar(byte[] value, int ch, int fromIndex, int max) {
+    private static int indexOfChar0(byte[] value, int ch, int fromIndex, int max) {
         for (int i = fromIndex; i < max; i++) {
             if (getChar(value, i) == ch) {
                 return i;
@@ -1590,7 +1841,7 @@ final class StringUTF16 {
     }
 
     static boolean contentEquals(byte[] v1, byte[] v2, int len) {
-        checkBoundsOffCount(0, len, v2);
+        String.checkBoundsOffCount(0, len, length(v2));
         for (int i = 0; i < len; i++) {
             if ((char)(v1[i] & 0xff) != getChar(v2, i)) {
                 return false;
@@ -1667,15 +1918,6 @@ final class StringUTF16 {
         }
     }
 
-    // inflatedCopy byte[] -> byte[]
-    static void inflate(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
-        // We need a range check here because 'putChar' has no checks
-        checkBoundsOffCount(dstOff, len, dst);
-        for (int i = 0; i < len; i++) {
-            putChar(dst, dstOff++, src[srcOff++] & 0xff);
-        }
-    }
-
     // srcCoder == UTF16 && tgtCoder == LATIN1
     static int lastIndexOfLatin1(byte[] src, int srcCount,
                                         byte[] tgt, int tgtCount, int fromIndex) {
@@ -1742,8 +1984,4 @@ final class StringUTF16 {
         String.checkBoundsBeginEnd(begin, end, length(val));
     }
 
-    static void checkBoundsOffCount(int offset, int count, byte[] val) {
-        String.checkBoundsOffCount(offset, count, length(val));
-    }
-
 }
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index cfe09c61375..2f772e4d065 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,6 @@ import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Supplier;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
@@ -2177,8 +2176,8 @@ public final class System {
                 return String.decodeASCII(src, srcOff, dst, dstOff, len);
             }
 
-            public int uncheckedEncodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len) {
-                return StringCoding.implEncodeAsciiArray(src, srcOff, dst, dstOff, len);
+            public int encodeASCII(char[] sa, int sp, byte[] da, int dp, int len) {
+                return StringCoding.encodeAsciiArray(sa, sp, da, dp, len);
             }
 
             public InputStream initialSystemIn() {
@@ -2278,6 +2277,14 @@ public final class System {
                 return Thread.scopedValueBindings();
             }
 
+            public long nativeThreadID(Thread thread) {
+                return thread.nativeThreadID();
+            }
+
+            public void setThreadNativeID(long id) {
+                Thread.currentThread().setNativeThreadID(id);
+            }
+
             public Continuation getContinuation(Thread thread) {
                 return thread.getContinuation();
             }
@@ -2312,7 +2319,7 @@ public final class System {
                 if (thread instanceof BaseVirtualThread vthread) {
                     vthread.unpark();
                 } else {
-                    throw new WrongThreadException();
+                    throw new IllegalArgumentException();
                 }
             }
 
@@ -2339,6 +2346,11 @@ public final class System {
             public boolean bytesCompatible(String string, Charset charset, int srcIndex, int numChars) {
                 return string.bytesCompatible(charset, srcIndex, numChars);
             }
+
+            @Override
+            public void finishInit(StackTraceElement[] stackTrace) {
+                StackTraceElement.finishInit(stackTrace);
+            }
         });
     }
 }
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 798ded2b941..4890c1af45b 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -286,6 +286,9 @@ public class Thread implements Runnable {
         volatile boolean daemon;
         volatile int threadStatus;
 
+        // Used by NativeThread for signalling
+        @Stable long nativeThreadID;
+
         // This map is maintained by the ThreadLocal class
         ThreadLocal.ThreadLocalMap terminatingThreadLocals;
 
@@ -312,6 +315,14 @@ public class Thread implements Runnable {
         holder.terminatingThreadLocals = map;
     }
 
+    long nativeThreadID() {
+        return holder.nativeThreadID;
+    }
+
+    void setNativeThreadID(long id) {
+        holder.nativeThreadID = id;
+    }
+
     /*
      * ThreadLocal values pertaining to this thread. This map is maintained
      * by the ThreadLocal class.
@@ -1870,8 +1881,8 @@ public class Thread implements Runnable {
      * been {@link #start() started}.
      *
      * @implNote
-     * For platform threads, the implementation uses a loop of {@code this.wait}
-     * calls conditioned on {@code this.isAlive}. As a thread terminates the
+     * This implementation uses a loop of {@code this.wait} calls
+     * conditioned on {@code this.isAlive}. As a thread terminates the
      * {@code this.notifyAll} method is invoked. It is recommended that
      * applications not use {@code wait}, {@code notify}, or
      * {@code notifyAll} on {@code Thread} instances.
@@ -1890,13 +1901,12 @@ public class Thread implements Runnable {
     public final void join(long millis) throws InterruptedException {
         if (millis < 0)
             throw new IllegalArgumentException("timeout value is negative");
-
-        if (this instanceof VirtualThread vthread) {
-            if (isAlive()) {
-                long nanos = MILLISECONDS.toNanos(millis);
-                vthread.joinNanos(nanos);
-            }
+        if (!isAlive())
             return;
+
+        // ensure there is a notifyAll to wake up waiters when this thread terminates
+        if (this instanceof VirtualThread vthread) {
+            vthread.beforeJoin();
         }
 
         synchronized (this) {
@@ -1925,8 +1935,8 @@ public class Thread implements Runnable {
      * been {@link #start() started}.
      *
      * @implNote
-     * For platform threads, the implementation uses a loop of {@code this.wait}
-     * calls conditioned on {@code this.isAlive}. As a thread terminates the
+     * This implementation uses a loop of {@code this.wait} calls
+     * conditioned on {@code this.isAlive}. As a thread terminates the
      * {@code this.notifyAll} method is invoked. It is recommended that
      * applications not use {@code wait}, {@code notify}, or
      * {@code notifyAll} on {@code Thread} instances.
@@ -1955,16 +1965,6 @@ public class Thread implements Runnable {
             throw new IllegalArgumentException("nanosecond timeout value out of range");
         }
 
-        if (this instanceof VirtualThread vthread) {
-            if (isAlive()) {
-                // convert arguments to a total in nanoseconds
-                long totalNanos = MILLISECONDS.toNanos(millis);
-                totalNanos += Math.min(Long.MAX_VALUE - totalNanos, nanos);
-                vthread.joinNanos(totalNanos);
-            }
-            return;
-        }
-
         if (nanos > 0 && millis < Long.MAX_VALUE) {
             millis++;
         }
@@ -2024,10 +2024,6 @@ public class Thread implements Runnable {
         if (nanos <= 0)
             return false;
 
-        if (this instanceof VirtualThread vthread) {
-            return vthread.joinNanos(nanos);
-        }
-
         // convert to milliseconds
         long millis = MILLISECONDS.convert(nanos, NANOSECONDS);
         if (nanos > NANOSECONDS.convert(millis, MILLISECONDS)) {
@@ -2208,40 +2204,23 @@ public class Thread implements Runnable {
      * @since 1.5
      */
     public StackTraceElement[] getStackTrace() {
-        if (this != Thread.currentThread()) {
+        if (Thread.currentThread() != this) {
             // optimization so we do not call into the vm for threads that
             // have not yet started or have terminated
             if (!isAlive()) {
                 return EMPTY_STACK_TRACE;
             }
-            StackTraceElement[] stackTrace = asyncGetStackTrace();
-            return (stackTrace != null) ? stackTrace : EMPTY_STACK_TRACE;
+            StackTraceElement[] stackTrace = getStackTrace0();
+            if (stackTrace != null) {
+                return StackTraceElement.finishInit(stackTrace);
+            }
+            return EMPTY_STACK_TRACE;
         } else {
             return (new Exception()).getStackTrace();
         }
     }
 
-    /**
-     * Returns an array of stack trace elements representing the stack dump of
-     * this thread. Returns null if the stack trace cannot be obtained. In
-     * the default implementation, null is returned if the thread is a virtual
-     * thread that is not mounted or the thread is a platform thread that has
-     * terminated.
-     */
-    StackTraceElement[] asyncGetStackTrace() {
-        Object stackTrace = getStackTrace0();
-        if (stackTrace == null) {
-            return null;
-        }
-        StackTraceElement[] stes = (StackTraceElement[]) stackTrace;
-        if (stes.length == 0) {
-            return null;
-        } else {
-            return StackTraceElement.of(stes);
-        }
-    }
-
-    private native Object getStackTrace0();
+    private native StackTraceElement[] getStackTrace0();
 
     /**
      * Returns a map of stack traces for all live platform threads. The map
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index 93862db9105..f058f967b91 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -26,7 +26,6 @@ package java.lang;
 
 import java.util.Locale;
 import java.util.Objects;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
@@ -68,7 +67,6 @@ final class VirtualThread extends BaseVirtualThread {
     private static final long STATE = U.objectFieldOffset(VirtualThread.class, "state");
     private static final long PARK_PERMIT = U.objectFieldOffset(VirtualThread.class, "parkPermit");
     private static final long CARRIER_THREAD = U.objectFieldOffset(VirtualThread.class, "carrierThread");
-    private static final long TERMINATION = U.objectFieldOffset(VirtualThread.class, "termination");
     private static final long ON_WAITING_LIST = U.objectFieldOffset(VirtualThread.class, "onWaitingList");
 
     // scheduler and continuation
@@ -154,9 +152,6 @@ final class VirtualThread extends BaseVirtualThread {
 
     private static final int TERMINATED = 99;  // final state
 
-    // can be suspended from scheduling when unmounted
-    private static final int SUSPENDED = 1 << 8;
-
     // parking permit made available by LockSupport.unpark
     private volatile boolean parkPermit;
 
@@ -187,8 +182,8 @@ final class VirtualThread extends BaseVirtualThread {
     // carrier thread when mounted, accessed by VM
     private volatile Thread carrierThread;
 
-    // termination object when joining, created lazily if needed
-    private volatile CountDownLatch termination;
+    // true to notifyAll after this virtual thread terminates
+    private volatile boolean notifyAllAfterTerminate;
 
     /**
      * Returns the default scheduler.
@@ -495,7 +490,7 @@ final class VirtualThread extends BaseVirtualThread {
     @ChangesCurrentThread
     @ReservedStackAccess
     private void mount() {
-        startTransition(/*is_mount*/true);
+        startTransition(/*mount*/true);
         // We assume following volatile accesses provide equivalent
         // of acquire ordering, otherwise we need U.loadFence() here.
 
@@ -540,7 +535,7 @@ final class VirtualThread extends BaseVirtualThread {
 
         // We assume previous volatile accesses provide equivalent
         // of release ordering, otherwise we need U.storeFence() here.
-        endTransition(/*is_mount*/false);
+        endTransition(/*mount*/false);
     }
 
     /**
@@ -549,11 +544,11 @@ final class VirtualThread extends BaseVirtualThread {
      */
     @Hidden
     private boolean yieldContinuation() {
-        startTransition(/*is_mount*/false);
+        startTransition(/*mount*/false);
         try {
             return Continuation.yield(VTHREAD_SCOPE);
         } finally {
-            endTransition(/*is_mount*/true);
+            endTransition(/*mount*/true);
         }
     }
 
@@ -620,9 +615,12 @@ final class VirtualThread extends BaseVirtualThread {
         // Object.wait
         if (s == WAITING || s == TIMED_WAITING) {
             int newState;
+            boolean blocked;
             boolean interruptible = interruptibleWait;
             if (s == WAITING) {
                 setState(newState = WAIT);
+                // may have been notified while in transition
+                blocked = notified && compareAndSetState(WAIT, BLOCKED);
             } else {
                 // For timed-wait, a timeout task is scheduled to execute. The timeout
                 // task will change the thread state to UNBLOCKED and submit the thread
@@ -637,22 +635,22 @@ final class VirtualThread extends BaseVirtualThread {
                     byte seqNo = ++timedWaitSeqNo;
                     timeoutTask = schedule(() -> waitTimeoutExpired(seqNo), timeout, MILLISECONDS);
                     setState(newState = TIMED_WAIT);
+                    // May have been notified while in transition. This must be done while
+                    // holding the monitor to avoid changing the state of a new timed wait call.
+                    blocked = notified && compareAndSetState(TIMED_WAIT, BLOCKED);
                 }
             }
 
-            // may have been notified while in transition to wait state
-            if (notified && compareAndSetState(newState, BLOCKED)) {
-                // may have even been unblocked already
+            if (blocked) {
+                // may have been unblocked already
                 if (blockPermit && compareAndSetState(BLOCKED, UNBLOCKED)) {
-                    submitRunContinuation();
+                    lazySubmitRunContinuation();
+                }
+            } else {
+                // may have been interrupted while in transition to wait state
+                if (interruptible && interrupted && compareAndSetState(newState, UNBLOCKED)) {
+                    lazySubmitRunContinuation();
                 }
-                return;
-            }
-
-            // may have been interrupted while in transition to wait state
-            if (interruptible && interrupted && compareAndSetState(newState, UNBLOCKED)) {
-                submitRunContinuation();
-                return;
             }
             return;
         }
@@ -677,11 +675,11 @@ final class VirtualThread extends BaseVirtualThread {
         assert carrierThread == null;
         setState(TERMINATED);
 
-        // notify anyone waiting for this virtual thread to terminate
-        CountDownLatch termination = this.termination;
-        if (termination != null) {
-            assert termination.getCount() == 1;
-            termination.countDown();
+        // notifyAll to wakeup any threads waiting for this thread to terminate
+        if (notifyAllAfterTerminate) {
+            synchronized (this) {
+                notifyAll();
+            }
         }
 
         // notify container
@@ -740,6 +738,13 @@ final class VirtualThread extends BaseVirtualThread {
         // do nothing
     }
 
+    /**
+     * Invoked by Thread.join before a thread waits for this virtual thread to terminate.
+     */
+    void beforeJoin() {
+        notifyAllAfterTerminate = true;
+    }
+
     /**
      * Parks until unparked or interrupted. If already unparked then the parking
      * permit is consumed and this method completes immediately (meaning it doesn't
@@ -928,28 +933,19 @@ final class VirtualThread extends BaseVirtualThread {
      */
     private void waitTimeoutExpired(byte seqNo) {
         assert !Thread.currentThread().isVirtual();
-        for (;;) {
-            boolean unblocked = false;
-            synchronized (timedWaitLock()) {
-                if (seqNo != timedWaitSeqNo) {
-                    // this timeout task is for a past timed-wait
-                    return;
-                }
-                int s = state();
-                if (s == TIMED_WAIT) {
-                    unblocked = compareAndSetState(TIMED_WAIT, UNBLOCKED);
-                } else if (s != (TIMED_WAIT | SUSPENDED)) {
-                    // notified or interrupted, no longer waiting
-                    return;
-                }
-            }
-            if (unblocked) {
-                lazySubmitRunContinuation();
+
+        synchronized (timedWaitLock()) {
+            if (seqNo != timedWaitSeqNo) {
+                // this timeout task is for a past timed-wait
+                return;
+            }
+            if (!compareAndSetState(TIMED_WAIT, UNBLOCKED)) {
+                // already notified (or interrupted)
                 return;
             }
-            // need to retry when thread is suspended in time-wait
-            Thread.yield();
         }
+
+        lazySubmitRunContinuation();
     }
 
     /**
@@ -1008,36 +1004,6 @@ final class VirtualThread extends BaseVirtualThread {
         }
     }
 
-    /**
-     * Waits up to {@code nanos} nanoseconds for this virtual thread to terminate.
-     * A timeout of {@code 0} means to wait forever.
-     *
-     * @throws InterruptedException if interrupted while waiting
-     * @return true if the thread has terminated
-     */
-    boolean joinNanos(long nanos) throws InterruptedException {
-        if (state() == TERMINATED)
-            return true;
-
-        // ensure termination object exists, then re-check state
-        CountDownLatch termination = getTermination();
-        if (state() == TERMINATED)
-            return true;
-
-        // wait for virtual thread to terminate
-        if (nanos == 0) {
-            termination.await();
-        } else {
-            boolean terminated = termination.await(nanos, NANOSECONDS);
-            if (!terminated) {
-                // waiting time elapsed
-                return false;
-            }
-        }
-        assert state() == TERMINATED;
-        return true;
-    }
-
     @Override
     void blockedOn(Interruptible b) {
         disableSuspendAndPreempt();
@@ -1117,8 +1083,7 @@ final class VirtualThread extends BaseVirtualThread {
 
     @Override
     Thread.State threadState() {
-        int s = state();
-        switch (s & ~SUSPENDED) {
+        switch (state()) {
             case NEW:
                 return Thread.State.NEW;
             case STARTED:
@@ -1186,85 +1151,6 @@ final class VirtualThread extends BaseVirtualThread {
         return (state == TERMINATED);
     }
 
-    @Override
-    StackTraceElement[] asyncGetStackTrace() {
-        StackTraceElement[] stackTrace;
-        do {
-            stackTrace = (carrierThread != null)
-                    ? super.asyncGetStackTrace()  // mounted
-                    : tryGetStackTrace();         // unmounted
-            if (stackTrace == null) {
-                Thread.yield();
-            }
-        } while (stackTrace == null);
-        return stackTrace;
-    }
-
-    /**
-     * Returns the stack trace for this virtual thread if it is unmounted.
-     * Returns null if the thread is mounted or in transition.
-     */
-    private StackTraceElement[] tryGetStackTrace() {
-        int initialState = state() & ~SUSPENDED;
-        switch (initialState) {
-            case NEW, STARTED, TERMINATED -> {
-                return new StackTraceElement[0];  // unmounted, empty stack
-            }
-            case RUNNING, PINNED, TIMED_PINNED -> {
-                return null;   // mounted
-            }
-            case PARKED, TIMED_PARKED, BLOCKED, WAIT, TIMED_WAIT -> {
-                // unmounted, not runnable
-            }
-            case UNPARKED, UNBLOCKED, YIELDED -> {
-                // unmounted, runnable
-            }
-            case PARKING, TIMED_PARKING, BLOCKING, YIELDING, WAITING, TIMED_WAITING -> {
-                return null;  // in transition
-            }
-            default -> throw new InternalError("" + initialState);
-        }
-
-        // thread is unmounted, prevent it from continuing
-        int suspendedState = initialState | SUSPENDED;
-        if (!compareAndSetState(initialState, suspendedState)) {
-            return null;
-        }
-
-        // get stack trace and restore state
-        StackTraceElement[] stack;
-        try {
-            stack = cont.getStackTrace();
-        } finally {
-            assert state == suspendedState;
-            setState(initialState);
-        }
-        boolean resubmit = switch (initialState) {
-            case UNPARKED, UNBLOCKED, YIELDED -> {
-                // resubmit as task may have run while suspended
-                yield true;
-            }
-            case PARKED, TIMED_PARKED -> {
-                // resubmit if unparked while suspended
-                yield parkPermit && compareAndSetState(initialState, UNPARKED);
-            }
-            case BLOCKED -> {
-                // resubmit if unblocked while suspended
-                yield blockPermit && compareAndSetState(BLOCKED, UNBLOCKED);
-            }
-            case WAIT, TIMED_WAIT -> {
-                // resubmit if notified or interrupted while waiting (Object.wait)
-                // waitTimeoutExpired will retry if the timed expired when suspended
-                yield (notified || interrupted) && compareAndSetState(initialState, UNBLOCKED);
-            }
-            default -> throw new InternalError();
-        };
-        if (resubmit) {
-            submitRunContinuation();
-        }
-        return stack;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("VirtualThread[#");
@@ -1328,20 +1214,6 @@ final class VirtualThread extends BaseVirtualThread {
         return obj == this;
     }
 
-    /**
-     * Returns the termination object, creating it if needed.
-     */
-    private CountDownLatch getTermination() {
-        CountDownLatch termination = this.termination;
-        if (termination == null) {
-            termination = new CountDownLatch(1);
-            if (!U.compareAndSetReference(this, TERMINATION, null, termination)) {
-                termination = this.termination;
-            }
-        }
-        return termination;
-    }
-
     /**
      * Returns the lock object to synchronize on when accessing carrierThread.
      * The lock prevents carrierThread from being reset to null during unmount.
@@ -1435,11 +1307,11 @@ final class VirtualThread extends BaseVirtualThread {
 
     @IntrinsicCandidate
     @JvmtiMountTransition
-    private native void startTransition(boolean is_mount);
+    private native void startTransition(boolean mount);
 
     @IntrinsicCandidate
     @JvmtiMountTransition
-    private native void endTransition(boolean is_mount);
+    private native void endTransition(boolean mount);
 
     @IntrinsicCandidate
     private static native void notifyJvmtiDisableSuspend(boolean enter);
diff --git a/src/java.base/share/classes/java/lang/classfile/attribute/CharacterRangeInfo.java b/src/java.base/share/classes/java/lang/classfile/attribute/CharacterRangeInfo.java
index f6f5f9928bc..e1cc52bfa1d 100644
--- a/src/java.base/share/classes/java/lang/classfile/attribute/CharacterRangeInfo.java
+++ b/src/java.base/share/classes/java/lang/classfile/attribute/CharacterRangeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,7 @@ public sealed interface CharacterRangeInfo
      * <li>{@link CharacterRange#FLAG_BRANCH_TRUE} A condition encoded
      * in the branch instruction immediately contained in the code range for
      * this item is not inverted towards the corresponding branch condition in
-     * the source code. I.e. actual jump occurs if and only if the the source
+     * the source code. I.e. actual jump occurs if and only if the source
      * code branch condition evaluates to true. Entries of this type are
      * produced only for conditions that are listed in the description of
      * CRT_FLOW_CONTROLLER flag. The source range for the entry contains flow
@@ -136,7 +136,7 @@ public sealed interface CharacterRangeInfo
      * <li>{@link CharacterRange#FLAG_BRANCH_FALSE} A condition encoded
      * in the branch instruction immediately contained in the code range for
      * this item is inverted towards the corresponding branch condition in the
-     * source code. I.e. actual jump occurs if and only if the the source code
+     * source code. I.e. actual jump occurs if and only if the source code
      * branch condition evaluates to false. Entries of this type are produced
      * only for conditions that are listed in the description of
      * CRT_FLOW_CONTROLLER flag. The source range for the entry contains flow
diff --git a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
index 4b6d74b1b2e..be3805cf5b1 100644
--- a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
+++ b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -746,15 +746,7 @@ abstract class ClassSpecializer<T,K,S extends ClassSpecializer<T,K,S>.SpeciesDat
                             new Consumer<>() {
                                 @Override
                                 public void accept(CodeBuilder cob) {
-                                    cob.aload(0); // this
-
                                     final List<Var> ctorArgs = AFTER_THIS.fromTypes(superCtorType.parameterList());
-                                    for (Var ca : ctorArgs) {
-                                        ca.emitLoadInstruction(cob);
-                                    }
-
-                                    // super(ca...)
-                                    cob.invokespecial(superClassDesc, INIT_NAME, methodDesc(superCtorType));
 
                                     // store down fields
                                     Var lastFV = AFTER_THIS.lastOf(ctorArgs);
@@ -766,6 +758,12 @@ abstract class ClassSpecializer<T,K,S extends ClassSpecializer<T,K,S>.SpeciesDat
                                         cob.putfield(classDesc, f.name, f.desc);
                                     }
 
+                                    // super(ca...)
+                                    cob.aload(0); // this
+                                    for (Var ca : ctorArgs) {
+                                        ca.emitLoadInstruction(cob);
+                                    }
+                                    cob.invokespecial(superClassDesc, INIT_NAME, methodDesc(superCtorType));
                                     cob.return_();
                                 }
                             });
diff --git a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index 4dac59771e8..d5cfc6f11a2 100644
--- a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -391,15 +391,15 @@ import sun.invoke.util.Wrapper;
                 new Consumer<>() {
                     @Override
                     public void accept(CodeBuilder cob) {
-                        cob.aload(0)
-                           .invokespecial(CD_Object, INIT_NAME, MTD_void);
                         int parameterCount = factoryType.parameterCount();
                         for (int i = 0; i < parameterCount; i++) {
                             cob.aload(0)
                                .loadLocal(TypeKind.from(factoryType.parameterType(i)), cob.parameterSlot(i))
                                .putfield(pool.fieldRefEntry(lambdaClassEntry, pool.nameAndTypeEntry(argName(i), argDescs[i])));
                         }
-                        cob.return_();
+                        cob.aload(0)
+                           .invokespecial(CD_Object, INIT_NAME, MTD_void)
+                           .return_();
                     }
                 });
     }
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
index 70592351827..16f5c7e59b8 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,10 +362,8 @@ public final class MethodHandleProxies {
 
             // <init>(Lookup, MethodHandle target, MethodHandle callerBoundTarget)
             clb.withMethodBody(INIT_NAME, MTD_void_Lookup_MethodHandle_MethodHandle, 0, cob -> {
-                cob.aload(0)
-                   .invokespecial(CD_Object, INIT_NAME, MTD_void)
-                   // call ensureOriginalLookup to verify the given Lookup has access
-                   .aload(1)
+                // call ensureOriginalLookup to verify the given Lookup has access
+                cob.aload(1)
                    .invokestatic(proxyDesc, ENSURE_ORIGINAL_LOOKUP, MTD_void_Lookup)
                    // this.target = target;
                    .aload(0)
@@ -383,7 +381,9 @@ public final class MethodHandleProxies {
                 }
 
                 // complete
-                cob.return_();
+                cob.aload(0)
+                   .invokespecial(CD_Object, INIT_NAME, MTD_void)
+                   .return_();
             });
 
             // private static void ensureOriginalLookup(Lookup) checks if the given Lookup
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index feb8aaaa1a9..7fde9d1dd89 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4826,7 +4826,9 @@ assert((int)twice.invokeExact(21) == 42);
      * Before the method handle is returned, the passed-in value is converted to the requested type.
      * If the requested type is primitive, widening primitive conversions are attempted,
      * else reference conversions are attempted.
-     * <p>The returned method handle is equivalent to {@code identity(type).bindTo(value)}.
+     * <p>The returned method handle is equivalent to {@code identity(type).bindTo(value)},
+     * for reference types.  For all types it is equivalent to
+     * {@code insertArguments(identity(type), 0, value)}.
      * @param type the return type of the desired method handle
      * @param value the value to return
      * @return a method handle of the given return type and no arguments, which always returns the given value
diff --git a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index d3879d4a8fc..ee1892e8878 100644
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,7 @@ public class ReferenceQueue<@jdk.internal.RequiresIdentity T> {
     private volatile Reference<? extends T> head;
     private long queueLength = 0;
 
-    private static class Lock { };
-    private final Lock lock = new Lock();
+    private final Object lock = new Object();
 
     /**
      * Constructs a new reference-object queue.
diff --git a/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java b/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java
index a1a93859c42..8d4389f7295 100644
--- a/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java
+++ b/src/java.base/share/classes/java/lang/runtime/ExactConversionsSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,12 +64,9 @@ package java.lang.runtime;
  *   floating-point type is considered exact.</li>
  * </ul>
  *
- * @see <a href="../../../../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-5.7.1">
- * JLS 5.7.1 Exact Testing Conversions</a>
- * @see <a href="../../../../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-5.7.2">
- * JLS 5.7.2 Unconditionally Exact Testing Conversions</a>
- * @see <a href="../../../../../specs/primitive-types-in-patterns-instanceof-switch-jls.html#jls-15.20.2">
- * JLS 15.20.2 The instanceof Operator</a>
+ * @jls primitive-types-in-patterns-instanceof-switch-5.7.1 Exact Testing Conversions
+ * @jls primitive-types-in-patterns-instanceof-switch-5.7.2 Unconditionally Exact Testing Conversions
+ * @jls primitive-types-in-patterns-instanceof-switch-15.20.2 The {@code instanceof} Operator
  *
  * @implNote Some exactness checks describe a test which can be redirected
  * safely through one of the existing methods. Those are omitted too (i.e.,
diff --git a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
index 18aa6f29f1f..e4b2886404f 100644
--- a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
+++ b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -363,9 +363,9 @@ public final class ObjectMethods {
      * @return the method handle
      */
     private static MethodHandle makeToString(MethodHandles.Lookup lookup,
-                                            Class<?> receiverClass,
-                                            MethodHandle[] getters,
-                                            List<String> names) {
+                                             Class<?> receiverClass,
+                                             MethodHandle[] getters,
+                                             List<String> names) {
         assert getters.length == names.size();
         if (getters.length == 0) {
             // special case
@@ -516,8 +516,8 @@ public final class ObjectMethods {
         requireNonNull(type);
         requireNonNull(recordClass);
         requireNonNull(names);
-        requireNonNull(getters);
-        Arrays.stream(getters).forEach(Objects::requireNonNull);
+        List<MethodHandle> getterList = List.of(getters); // deep null check
+
         MethodType methodType;
         if (type instanceof MethodType mt)
             methodType = mt;
@@ -526,7 +526,14 @@ public final class ObjectMethods {
             if (!MethodHandle.class.equals(type))
                 throw new IllegalArgumentException(type.toString());
         }
-        List<MethodHandle> getterList = List.of(getters);
+
+        for (MethodHandle getter : getterList) {
+            var getterType = getter.type();
+            if (getterType.parameterCount() != 1 || getterType.returnType() == void.class || getterType.parameterType(0) != recordClass) {
+                throw new IllegalArgumentException("Illegal getter type %s for recordClass %s".formatted(getterType, recordClass.getTypeName()));
+            }
+        }
+
         MethodHandle handle = switch (methodName) {
             case "equals"   -> {
                 if (methodType != null && !methodType.equals(MethodType.methodType(boolean.class, recordClass, Object.class)))
@@ -541,7 +548,7 @@ public final class ObjectMethods {
             case "toString" -> {
                 if (methodType != null && !methodType.equals(MethodType.methodType(String.class, recordClass)))
                     throw new IllegalArgumentException("Bad method type: " + methodType);
-                List<String> nameList = "".equals(names) ? List.of() : List.of(names.split(";"));
+                List<String> nameList = names.isEmpty() ? List.of() : List.of(names.split(";"));
                 if (nameList.size() != getterList.size())
                     throw new IllegalArgumentException("Name list and accessor list do not match");
                 yield makeToString(lookup, recordClass, getters, nameList);
diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index 30b6df0073e..087d2cc23a9 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,13 +188,17 @@ public final class SwitchBootstraps {
                                       String invocationName,
                                       MethodType invocationType,
                                       Object... labels) {
+        requireNonNull(lookup);
+        requireNonNull(invocationType);
+        requireNonNull(labels);
+
         Class<?> selectorType = invocationType.parameterType(0);
         if (invocationType.parameterCount() != 2
             || (!invocationType.returnType().equals(int.class))
             || !invocationType.parameterType(1).equals(int.class))
             throw new IllegalArgumentException("Illegal invocation type " + invocationType);
 
-        for (Object l : labels) { // implicit null-check
+        for (Object l : labels) {
             verifyLabel(l, selectorType);
         }
 
@@ -292,6 +296,10 @@ public final class SwitchBootstraps {
                                       String invocationName,
                                       MethodType invocationType,
                                       Object... labels) {
+        requireNonNull(lookup);
+        requireNonNull(invocationType);
+        requireNonNull(labels);
+
         if (invocationType.parameterCount() != 2
             || (!invocationType.returnType().equals(int.class))
             || invocationType.parameterType(0).isPrimitive()
@@ -299,7 +307,7 @@ public final class SwitchBootstraps {
             || !invocationType.parameterType(1).equals(int.class))
             throw new IllegalArgumentException("Illegal invocation type " + invocationType);
 
-        labels = labels.clone(); // implicit null check
+        labels = labels.clone();
 
         Class<?> enumClass = invocationType.parameterType(0);
         boolean constantsOnly = true;
@@ -307,7 +315,7 @@ public final class SwitchBootstraps {
 
         for (int i = 0; i < len; i++) {
             Object convertedLabel =
-                    convertEnumConstants(lookup, enumClass, labels[i]);
+                    convertEnumConstants(enumClass, labels[i]);
             labels[i] = convertedLabel;
             if (constantsOnly)
                 constantsOnly = convertedLabel instanceof EnumDesc;
@@ -331,7 +339,7 @@ public final class SwitchBootstraps {
         return new ConstantCallSite(target);
     }
 
-    private static <E extends Enum<E>> Object convertEnumConstants(MethodHandles.Lookup lookup, Class<?> enumClassTemplate, Object label) {
+    private static <E extends Enum<E>> Object convertEnumConstants(Class<?> enumClassTemplate, Object label) {
         if (label == null) {
             throw new IllegalArgumentException("null label found");
         }
diff --git a/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java b/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
index 192b1f7958b..4e6cadc737c 100644
--- a/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -208,7 +208,7 @@ public abstract class AsynchronousServerSocketChannel
      * <p> The {@code backlog} parameter is the maximum number of pending
      * connections on the socket. Its exact semantics are implementation specific.
      * In particular, an implementation may impose a maximum length or may choose
-     * to ignore the parameter altogther. If the {@code backlog} parameter has
+     * to ignore the parameter altogether. If the {@code backlog} parameter has
      * the value {@code 0}, or a negative value, then an implementation specific
      * default is used.
      *
diff --git a/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template b/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
index e900c2eca0f..aca987ed678 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
+++ b/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -819,6 +819,12 @@ public abstract class Charset$Coder$ {
      */
     public final $Otype$Buffer $code$($Itype$Buffer in)
         throws CharacterCodingException
+    {
+        return $code$(in, true);
+    }
+
+    private $Otype$Buffer $code$($Itype$Buffer in, boolean throwOnError)
+        throws CharacterCodingException
     {
         int n = Math.min((int)(in.remaining() * average$ItypesPerOtype$()),
                     ArraysSupport.SOFT_MAX_ARRAY_LENGTH);
@@ -844,7 +850,11 @@ public abstract class Charset$Coder$ {
                 out = o;
                 continue;
             }
-            cr.throwException();
+            if (throwOnError) {
+                cr.throwException();
+            } else {
+                return null;
+            }
         }
         out.flip();
         return out;
@@ -938,7 +948,8 @@ public abstract class Charset$Coder$ {
         try {
             onMalformedInput(CodingErrorAction.REPORT);
             onUnmappableCharacter(CodingErrorAction.REPORT);
-            encode(cb);
+            ByteBuffer bb = encode(cb, false);
+            return bb != null;
         } catch (CharacterCodingException x) {
             return false;
         } finally {
@@ -946,7 +957,6 @@ public abstract class Charset$Coder$ {
             onUnmappableCharacter(ua);
             reset();
         }
-        return true;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java b/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
index 4348c60f5e2..92a292bbac6 100644
--- a/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
+++ b/src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,8 +185,8 @@ public interface SecureDirectoryStream<T>
     /**
      * Move a file from this directory to another directory.
      *
-     * <p> This method works in a similar manner to {@link Files#move move}
-     * method when the {@link StandardCopyOption#ATOMIC_MOVE ATOMIC_MOVE} option
+     * <p> This method works in a similar manner to {@link Files#move Files.move}
+     * when the {@link StandardCopyOption#ATOMIC_MOVE ATOMIC_MOVE} option
      * is specified. That is, this method moves a file as an atomic file system
      * operation. If the {@code srcpath} parameter is an {@link Path#isAbsolute
      * absolute} path then it locates the source file. If the parameter is a
@@ -194,14 +194,15 @@ public interface SecureDirectoryStream<T>
      * the {@code targetpath} parameter is absolute then it locates the target
      * file (the {@code targetdir} parameter is ignored). If the parameter is
      * a relative path it is located relative to the open directory identified
-     * by the {@code targetdir} parameter. In all cases, if the target file
-     * exists then it is implementation specific if it is replaced or this
-     * method fails.
+     * by the {@code targetdir} parameter, unless {@code targetdir} is
+     * {@code null}, in which case it is located relative to the current
+     * working directory. In all cases, if the target file exists then it is
+     * implementation specific if it is replaced or this method fails.
      *
      * @param   srcpath
      *          the name of the file to move
      * @param   targetdir
-     *          the destination directory
+     *          the destination directory; can be {@code null}
      * @param   targetpath
      *          the name to give the file in the destination directory
      *
diff --git a/src/java.base/share/classes/java/security/CodeSource.java b/src/java.base/share/classes/java/security/CodeSource.java
index 7476b8a1d61..9e69b2f0849 100644
--- a/src/java.base/share/classes/java/security/CodeSource.java
+++ b/src/java.base/share/classes/java/security/CodeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -238,7 +238,12 @@ public class CodeSource implements java.io.Serializable {
         } else if (certs != null) {
             // Convert the certs to code signers
             signers = convertCertArrayToSignerArray(certs);
-            return signers.clone();
+            if (signers != null) {
+                return signers.clone();
+
+            } else {
+                return new CodeSigner[0];
+            }
 
         } else {
             return null;
diff --git a/src/java.base/share/classes/java/security/KeyStore.java b/src/java.base/share/classes/java/security/KeyStore.java
index 8f3d4ba29fd..434aa57e3ac 100644
--- a/src/java.base/share/classes/java/security/KeyStore.java
+++ b/src/java.base/share/classes/java/security/KeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.security.cert.CertificateException;
 import java.security.spec.AlgorithmParameterSpec;
+import java.time.Instant;
 import java.util.*;
 import javax.crypto.SecretKey;
 
@@ -1182,6 +1183,9 @@ public class KeyStore {
 
     /**
      * Returns the creation date of the entry identified by the given alias.
+     * <p>
+     * It is recommended to use the {@link #getCreationInstant(String)}
+     * method instead.
      *
      * @param alias the alias name
      *
@@ -1200,6 +1204,32 @@ public class KeyStore {
         return keyStoreSpi.engineGetCreationDate(alias);
     }
 
+
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @throws KeyStoreException if the keystore has not been initialized
+     * (loaded)
+     *
+     * @since 27
+     */
+    public final Instant getCreationInstant(String alias)
+            throws KeyStoreException
+    {
+        if (!initialized) {
+            throw new KeyStoreException("Uninitialized keystore");
+        }
+        return keyStoreSpi.engineGetCreationInstant(alias);
+    }
+
+
+
     /**
      * Assigns the given key to the given alias, protecting it with the given
      * password.
@@ -1840,6 +1870,7 @@ public class KeyStore {
         }
 
         KeyStore keystore = null;
+        String matched = null;
 
         try (DataInputStream dataStream =
             new DataInputStream(
@@ -1863,8 +1894,10 @@ public class KeyStore {
                                 if (CryptoAlgorithmConstraints.permits(
                                         "KEYSTORE", ksAlgo)) {
                                     keystore = new KeyStore(impl, p, ksAlgo);
-                                    break;
+                                } else {
+                                    matched = ksAlgo;
                                 }
+                                break;
                             }
                         } catch (NoSuchAlgorithmException e) {
                             // ignore
@@ -1894,9 +1927,14 @@ public class KeyStore {
                 return keystore;
             }
         }
-
-        throw new KeyStoreException("Unrecognized keystore format. "
-                + "Please load it with a specified type");
+        if (matched == null) {
+            throw new KeyStoreException("Unrecognized keystore format. "
+                    + "Please load it with a specified type");
+        } else {
+            throw new KeyStoreException("Keystore format " +
+                    matched +
+                    " disabled by jdk.crypto.disabledAlgorithms property");
+        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/security/KeyStoreSpi.java b/src/java.base/share/classes/java/security/KeyStoreSpi.java
index 0b0aa8adf19..5c60f44e4e9 100644
--- a/src/java.base/share/classes/java/security/KeyStoreSpi.java
+++ b/src/java.base/share/classes/java/security/KeyStoreSpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package java.security;
 
 import java.io.*;
+import java.time.Instant;
 import java.util.*;
 
 import java.security.KeyStore.*;
@@ -127,6 +128,29 @@ public abstract class KeyStoreSpi {
      */
     public abstract Date engineGetCreationDate(String alias);
 
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @apiNote Subclasses should override this method to directly return an
+     * instant.
+     *
+     * @implSpec
+     * The default implementation calls {@code engineGetCreationDate(alias)}
+     * and returns the output as an {@code Instant} value.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @since 27
+     */
+    public Instant engineGetCreationInstant(String alias) {
+        final Date date = engineGetCreationDate(alias);
+        return date == null ? null : date.toInstant();
+    }
+
     /**
      * Assigns the given key to the given alias, protecting it with the given
      * password.
diff --git a/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java
index 57dc98d5c68..b1ffe7b87d6 100644
--- a/src/java.base/share/classes/java/time/ZonedDateTime.java
+++ b/src/java.base/share/classes/java/time/ZonedDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2207,7 +2207,10 @@ public final class ZonedDateTime
      * Outputs this date-time as a {@code String}, such as
      * {@code 2007-12-03T10:15:30+01:00[Europe/Paris]}.
      * <p>
-     * The format consists of the {@code LocalDateTime} followed by the {@code ZoneOffset}.
+     * The format consists of the output of {@link LocalDateTime#toString()},
+     * followed by the output of {@link ZoneOffset#toString()}.
+     * If the time has zero seconds and/or nanoseconds, they are
+     * omitted to produce the shortest representation.
      * If the {@code ZoneId} is not the same as the offset, then the ID is output.
      * The output is compatible with ISO-8601 if the offset and ID are the same,
      * and the seconds in the offset are zero.
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatter.java b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
index 16d7193c556..9368cf54afd 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -817,6 +817,7 @@ public final class DateTimeFormatter {
      * <li>The {@link #ISO_LOCAL_DATE}
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      *  Parsing is case insensitive.
      * </ul>
      * <p>
@@ -829,7 +830,9 @@ public final class DateTimeFormatter {
         ISO_OFFSET_DATE = new DateTimeFormatterBuilder()
                 .parseCaseInsensitive()
                 .append(ISO_LOCAL_DATE)
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .toFormatter(ResolverStyle.STRICT, IsoChronology.INSTANCE);
     }
 
@@ -846,6 +849,7 @@ public final class DateTimeFormatter {
      * <li>If the offset is not available then the format is complete.
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      *  Parsing is case insensitive.
      * </ul>
      * <p>
@@ -862,7 +866,9 @@ public final class DateTimeFormatter {
                 .parseCaseInsensitive()
                 .append(ISO_LOCAL_DATE)
                 .optionalStart()
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .toFormatter(ResolverStyle.STRICT, IsoChronology.INSTANCE);
     }
 
@@ -919,6 +925,7 @@ public final class DateTimeFormatter {
      * <li>The {@link #ISO_LOCAL_TIME}
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      *  Parsing is case insensitive.
      * </ul>
      * <p>
@@ -930,7 +937,9 @@ public final class DateTimeFormatter {
         ISO_OFFSET_TIME = new DateTimeFormatterBuilder()
                 .parseCaseInsensitive()
                 .append(ISO_LOCAL_TIME)
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .toFormatter(ResolverStyle.STRICT, null);
     }
 
@@ -947,6 +956,7 @@ public final class DateTimeFormatter {
      * <li>If the offset is not available then the format is complete.
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      *  Parsing is case insensitive.
      * </ul>
      * <p>
@@ -962,7 +972,9 @@ public final class DateTimeFormatter {
                 .parseCaseInsensitive()
                 .append(ISO_LOCAL_TIME)
                 .optionalStart()
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .toFormatter(ResolverStyle.STRICT, null);
     }
 
@@ -1075,6 +1087,7 @@ public final class DateTimeFormatter {
      * <li>If the offset is not available to format or parse then the format is complete.
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      * <li>If the zone ID is not available or is a {@code ZoneOffset} then the format is complete.
      * <li>An open square bracket '['.
      * <li>The {@link ZoneId#getId() zone ID}. This is not part of the ISO-8601 standard.
@@ -1094,7 +1107,9 @@ public final class DateTimeFormatter {
         ISO_DATE_TIME = new DateTimeFormatterBuilder()
                 .append(ISO_LOCAL_DATE_TIME)
                 .optionalStart()
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .optionalStart()
                 .appendLiteral('[')
                 .parseCaseSensitive()
@@ -1121,6 +1136,7 @@ public final class DateTimeFormatter {
      * <li>If the offset is not available to format or parse then the format is complete.
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      *  Parsing is case insensitive.
      * </ul>
      * <p>
@@ -1139,7 +1155,9 @@ public final class DateTimeFormatter {
                 .appendLiteral('-')
                 .appendValue(DAY_OF_YEAR, 3)
                 .optionalStart()
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .toFormatter(ResolverStyle.STRICT, IsoChronology.INSTANCE);
     }
 
@@ -1165,6 +1183,7 @@ public final class DateTimeFormatter {
      * <li>If the offset is not available to format or parse then the format is complete.
      * <li>The {@link ZoneOffset#getId() offset ID}. If the offset has seconds then
      *  they will be handled even though this is not part of the ISO-8601 standard.
+     *  The offset parsing is lenient, which allows the minutes and seconds to be optional.
      *  Parsing is case insensitive.
      * </ul>
      * <p>
@@ -1185,7 +1204,9 @@ public final class DateTimeFormatter {
                 .appendLiteral('-')
                 .appendValue(DAY_OF_WEEK, 1)
                 .optionalStart()
+                .parseLenient()
                 .appendOffsetId()
+                .parseStrict()
                 .toFormatter(ResolverStyle.STRICT, IsoChronology.INSTANCE);
     }
 
diff --git a/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java
index 43408de292a..5f9a90e1748 100644
--- a/src/java.base/share/classes/java/util/List.java
+++ b/src/java.base/share/classes/java/util/List.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1224,7 +1224,7 @@ public interface List<E> extends SequencedCollection<E> {
      * The returned list and its {@link List#subList(int, int) subList()} or
      * {@link List#reversed()} views implement the {@link RandomAccess} interface.
      * <p>
-     * If the provided computing function recursively calls itself or the returned
+     * If the provided computing function recursively calls itself via the returned
      * lazy list for the same index, an {@linkplain IllegalStateException}
      * will be thrown.
      * <p>
diff --git a/src/java.base/share/classes/java/util/Map.java b/src/java.base/share/classes/java/util/Map.java
index 177f0522b1b..fa16fb89050 100644
--- a/src/java.base/share/classes/java/util/Map.java
+++ b/src/java.base/share/classes/java/util/Map.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1777,7 +1777,7 @@ public interface Map<K, V> {
      * The values of any {@link Map#values()} or {@link Map#entrySet()} views of
      * the returned map are also lazily computed.
      * <p>
-     * If the provided computing function recursively calls itself or
+     * If the provided computing function recursively calls itself via
      * the returned lazy map for the same key, an {@linkplain IllegalStateException}
      * will be thrown.
      * <p>
diff --git a/src/java.base/share/classes/java/util/Optional.java b/src/java.base/share/classes/java/util/Optional.java
index 3e577bd379c..3d0375c4354 100644
--- a/src/java.base/share/classes/java/util/Optional.java
+++ b/src/java.base/share/classes/java/util/Optional.java
@@ -25,7 +25,7 @@
 
 package java.util;
 
-import jdk.internal.vm.annotation.Stable;
+import jdk.internal.vm.annotation.TrustFinalFields;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -62,6 +62,7 @@ import java.util.stream.Stream;
  * @since 1.8
  */
 @jdk.internal.ValueBased
+@TrustFinalFields
 public final class Optional<T> {
     /**
      * Common instance for {@code empty()}.
@@ -71,7 +72,6 @@ public final class Optional<T> {
     /**
      * If non-null, the value; if null, indicates no value is present
      */
-    @Stable
     private final T value;
 
     /**
diff --git a/src/java.base/share/classes/java/util/Scanner.java b/src/java.base/share/classes/java/util/Scanner.java
index 3e27325aa0d..948fa595114 100644
--- a/src/java.base/share/classes/java/util/Scanner.java
+++ b/src/java.base/share/classes/java/util/Scanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.StringReader;
+import java.io.Reader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.CharBuffer;
@@ -800,7 +800,7 @@ public final class Scanner implements Iterator<String>, Closeable {
      * @param  source A string to scan
      */
     public Scanner(String source) {
-        this(new StringReader(source), WHITESPACE_PATTERN);
+        this(Reader.of(source), WHITESPACE_PATTERN);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/util/TreeMap.java b/src/java.base/share/classes/java/util/TreeMap.java
index f8eea8c8d8f..8b6e9dc0bd6 100644
--- a/src/java.base/share/classes/java/util/TreeMap.java
+++ b/src/java.base/share/classes/java/util/TreeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2138,10 +2138,12 @@ public class TreeMap<K,V>
                 return null;
             }
             public void forEachRemaining(Consumer<? super K> action) {
+                Objects.requireNonNull(action);
                 while (hasNext())
                     action.accept(next());
             }
             public boolean tryAdvance(Consumer<? super K> action) {
+                Objects.requireNonNull(action);
                 if (hasNext()) {
                     action.accept(next());
                     return true;
@@ -2176,10 +2178,12 @@ public class TreeMap<K,V>
                 return null;
             }
             public void forEachRemaining(Consumer<? super K> action) {
+                Objects.requireNonNull(action);
                 while (hasNext())
                     action.accept(next());
             }
             public boolean tryAdvance(Consumer<? super K> action) {
+                Objects.requireNonNull(action);
                 if (hasNext()) {
                     action.accept(next());
                     return true;
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
index 9295f0deb59..c4e1839e9fb 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -3310,7 +3310,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
                 return false;
             if (tr != null && (tr.parent != t || tr.hash < t.hash))
                 return false;
-            if (t.red && tl != null && tl.red && tr != null && tr.red)
+            if (t.red && (tl != null && tl.red || tr != null && tr.red))
                 return false;
             if (tl != null && !checkInvariants(tl))
                 return false;
diff --git a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
index cef1682b0b1..abc9fdb348c 100644
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
@@ -35,6 +35,13 @@
 
 package java.util.concurrent;
 
+import jdk.internal.misc.Unsafe;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamException;
+import java.io.Serial;
+import java.io.StreamCorruptedException;
 import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.Iterator;
@@ -445,4 +452,38 @@ public class CopyOnWriteArraySet<E> extends AbstractSet<E>
         return Spliterators.spliterator
             (al.getArray(), Spliterator.IMMUTABLE | Spliterator.DISTINCT);
     }
+
+    /**
+     * De-serialization without data not supported for this class.
+     */
+    @Serial
+    private void readObjectNoData() throws ObjectStreamException {
+        throw new StreamCorruptedException("Deserialized CopyOnWriteArraySet requires data");
+    }
+
+    /**
+     * Reconstitutes the {@code CopyOnWriteArraySet} instance from a stream
+     * (that is, deserializes it).
+     * @throws StreamCorruptedException if the object read from the stream is invalid.
+     */
+    @Serial
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        CopyOnWriteArrayList<E> newAl; // Set during the duplicate check
+
+        @SuppressWarnings("unchecked")
+        CopyOnWriteArrayList<E> inAl = (CopyOnWriteArrayList<E>) in.readFields().get("al", null);
+
+        if (inAl == null
+                || inAl.getClass() != CopyOnWriteArrayList.class
+                || (newAl = new CopyOnWriteArrayList<>()).addAllAbsent(inAl) != inAl.size()) {
+            throw new StreamCorruptedException("Content is invalid");
+        }
+
+        final Unsafe U = Unsafe.getUnsafe();
+        U.putReference(
+                this,
+                U.objectFieldOffset(CopyOnWriteArraySet.class, "al"),
+                newAl
+        );
+    }
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
index 2250009e8f5..70acb8a0889 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
@@ -42,6 +42,8 @@ import java.util.function.IntUnaryOperator;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import jdk.internal.vm.annotation.TrustFinalFields;
+
 import java.lang.invoke.VarHandle;
 
 /**
@@ -371,6 +373,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
     /**
      * Standard hotspot implementation using intrinsics.
      */
+    @TrustFinalFields
     private static final class AtomicIntegerFieldUpdaterImpl<T>
         extends AtomicIntegerFieldUpdater<T> {
         private static final Unsafe U = Unsafe.getUnsafe();
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
index 5f0a666cb04..d3a3fe63d0f 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
@@ -42,6 +42,8 @@ import java.util.function.LongUnaryOperator;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import jdk.internal.vm.annotation.TrustFinalFields;
+
 import java.lang.invoke.VarHandle;
 
 /**
@@ -368,6 +370,7 @@ public abstract class AtomicLongFieldUpdater<T> {
         return next;
     }
 
+    @TrustFinalFields
     private static final class CASUpdater<T> extends AtomicLongFieldUpdater<T> {
         private static final Unsafe U = Unsafe.getUnsafe();
         private final long offset;
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
index 4a758f77a47..3d47e8e323a 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
@@ -42,6 +42,8 @@ import java.util.function.UnaryOperator;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import jdk.internal.vm.annotation.TrustFinalFields;
+
 import java.lang.invoke.VarHandle;
 
 /**
@@ -312,6 +314,7 @@ public abstract class AtomicReferenceFieldUpdater<T,V> {
         return next;
     }
 
+    @TrustFinalFields
     private static final class AtomicReferenceFieldUpdaterImpl<T,V>
         extends AtomicReferenceFieldUpdater<T,V> {
         private static final Unsafe U = Unsafe.getUnsafe();
diff --git a/src/java.base/share/classes/java/util/jar/JarEntry.java b/src/java.base/share/classes/java/util/jar/JarEntry.java
index ff0750a3342..6037ee243e5 100644
--- a/src/java.base/share/classes/java/util/jar/JarEntry.java
+++ b/src/java.base/share/classes/java/util/jar/JarEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,8 +114,10 @@ public class JarEntry extends ZipEntry {
      * validate each signer's certificate chain, and determining whether
      * to trust the entry signed by the signers.
      *
-     * @return the {@code Certificate} objects for this entry, or
-     * {@code null} if none.
+     * @implSpec If non-null, this implementation returns a new array each time
+     *           this method is invoked.
+     *
+     * @return the {@code Certificate} objects for this entry, or {@code null} if none.
      *
      */
     public Certificate[] getCertificates() {
@@ -139,8 +141,10 @@ public class JarEntry extends ZipEntry {
      * validate each signer's certificate chain, and determining whether
      * to trust the entry signed by the signers.
      *
-     * @return the {@code CodeSigner} objects for this entry, or
-     * {@code null} if none.
+     * @implSpec If non-null, this implementation returns a new array each time
+     *           this method is invoked.
+     *
+     * @return the {@code CodeSigner} objects for this entry, or {@code null} if none.
      *
      * @since 1.5
      */
diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index 7fa507980c2..140d76c8c91 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.nio.charset.Charset;
 import java.nio.file.InvalidPathException;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.Files;
+import java.nio.file.attribute.FileTime;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.IntFunction;
@@ -86,11 +87,11 @@ public class ZipFile implements ZipConstants, Closeable {
     private final ZipCoder zipCoder;
     private volatile boolean closeRequested;
 
-    // The "resource" used by this ZIP file that needs to be
-    // cleaned after use.
+    // An object holding state which needs to be cleaned after
+    // this ZipFile is closed or becomes unreachable:
     // a) the input streams that need to be closed
     // b) the list of cached Inflater objects
-    // c) the "native" source of this ZIP file.
+    // c) the Source object providing read access to the actual ZIP file
     private final @Stable CleanableResource res;
 
     private static final int STORED = ZipEntry.STORED;
@@ -691,7 +692,7 @@ public class ZipFile implements ZipConstants, Closeable {
         final Set<InputStream> istreams;
 
         // List of cached Inflater objects for decompression
-        Deque<Inflater> inflaterCache;
+        List<Inflater> inflaterCache;
 
         final Cleanable cleanable;
 
@@ -701,7 +702,7 @@ public class ZipFile implements ZipConstants, Closeable {
             assert zipCoder != null : "null ZipCoder";
             this.cleanable = CleanerFactory.cleaner().register(zf, this);
             this.istreams = Collections.newSetFromMap(new WeakHashMap<>());
-            this.inflaterCache = new ArrayDeque<>();
+            this.inflaterCache = new ArrayList<>();
             this.zsrc = Source.get(file, (mode & OPEN_DELETE) != 0, zipCoder);
         }
 
@@ -714,10 +715,10 @@ public class ZipFile implements ZipConstants, Closeable {
          * a new one.
          */
         Inflater getInflater() {
-            Inflater inf;
             synchronized (inflaterCache) {
-                if ((inf = inflaterCache.poll()) != null) {
-                    return inf;
+                if (!inflaterCache.isEmpty()) {
+                    // return the most recently used Inflater from the cache of not-in-use Inflaters
+                    return inflaterCache.removeLast();
                 }
             }
             return new Inflater(true);
@@ -727,7 +728,7 @@ public class ZipFile implements ZipConstants, Closeable {
          * Releases the specified inflater to the list of available inflaters.
          */
         void releaseInflater(Inflater inf) {
-            Deque<Inflater> inflaters = this.inflaterCache;
+            List<Inflater> inflaters = this.inflaterCache;
             if (inflaters != null) {
                 synchronized (inflaters) {
                     // double checked!
@@ -746,13 +747,12 @@ public class ZipFile implements ZipConstants, Closeable {
             IOException ioe = null;
 
             // Release cached inflaters and close the cache first
-            Deque<Inflater> inflaters = this.inflaterCache;
+            List<Inflater> inflaters = this.inflaterCache;
             if (inflaters != null) {
                 synchronized (inflaters) {
                     // no need to double-check as only one thread gets a
                     // chance to execute run() (Cleaner guarantee)...
-                    Inflater inf;
-                    while ((inf = inflaters.poll()) != null) {
+                    for (Inflater inf : inflaters) {
                         inf.end();
                     }
                     // close inflaters cache
@@ -761,23 +761,22 @@ public class ZipFile implements ZipConstants, Closeable {
             }
 
             // Close streams, release their inflaters
-            if (istreams != null) {
-                synchronized (istreams) {
-                    if (!istreams.isEmpty()) {
-                        InputStream[] copy = istreams.toArray(new InputStream[0]);
-                        istreams.clear();
-                        for (InputStream is : copy) {
-                            try {
-                                is.close();
-                            } catch (IOException e) {
-                                if (ioe == null) ioe = e;
-                                else ioe.addSuppressed(e);
-                            }
+            synchronized (istreams) {
+                if (!istreams.isEmpty()) {
+                    InputStream[] copy = istreams.toArray(new InputStream[0]);
+                    istreams.clear();
+                    for (InputStream is : copy) {
+                        try {
+                            is.close();
+                        } catch (IOException e) {
+                            if (ioe == null) ioe = e;
+                            else ioe.addSuppressed(e);
                         }
                     }
                 }
             }
 
+
             // Release ZIP src
             if (zsrc != null) {
                 synchronized (zsrc) {
@@ -1444,11 +1443,13 @@ public class ZipFile implements ZipConstants, Closeable {
          * The unique combination of these components identifies a Source of a ZipFile.
          */
         private static class Key {
-            private final BasicFileAttributes attrs;
             private final File file;
+            private final Object fileKey;
+            private final FileTime lastModifiedTime;
             // the Charset that was provided when constructing the ZipFile instance
             private final Charset charset;
 
+
             /**
              * Constructs a {@code Key} to a {@code Source} of a {@code ZipFile}
              *
@@ -1457,7 +1458,8 @@ public class ZipFile implements ZipConstants, Closeable {
              * @param charset the Charset that was provided when constructing the ZipFile instance
              */
             public Key(File file, BasicFileAttributes attrs, Charset charset) {
-                this.attrs = attrs;
+                this.fileKey = attrs.fileKey();
+                this.lastModifiedTime = attrs.lastModifiedTime();
                 this.file = file;
                 this.charset = charset;
             }
@@ -1465,10 +1467,9 @@ public class ZipFile implements ZipConstants, Closeable {
             @Override
             public int hashCode() {
                 long t = charset.hashCode();
-                t += attrs.lastModifiedTime().toMillis();
-                Object fk = attrs.fileKey();
+                t += lastModifiedTime.toMillis();
                 return Long.hashCode(t) +
-                        (fk != null ? fk.hashCode() : file.hashCode());
+                        (fileKey != null ? fileKey.hashCode() : file.hashCode());
             }
 
             @Override
@@ -1477,12 +1478,12 @@ public class ZipFile implements ZipConstants, Closeable {
                     if (!charset.equals(key.charset)) {
                         return false;
                     }
-                    if (!attrs.lastModifiedTime().equals(key.attrs.lastModifiedTime())) {
+                    if (!lastModifiedTime.equals(key.lastModifiedTime)) {
                         return false;
                     }
-                    Object fk = attrs.fileKey();
-                    if (fk != null) {
-                        return fk.equals(key.attrs.fileKey());
+
+                    if (fileKey != null) {
+                        return fileKey.equals(key.fileKey);
                     } else {
                         return file.equals(key.file);
                     }
@@ -1718,8 +1719,10 @@ public class ZipFile implements ZipConstants, Closeable {
                     this.cen = null;
                     return;         // only END header present
                 }
-                if (end.cenlen > end.endpos)
+                // Validate END header
+                if (end.cenlen > end.endpos) {
                     zerror("invalid END header (bad central directory size)");
+                }
                 long cenpos = end.endpos - end.cenlen;     // position of CEN table
                 // Get position of first local file (LOC) header, taking into
                 // account that there may be a stub prefixed to the ZIP file.
@@ -1727,18 +1730,22 @@ public class ZipFile implements ZipConstants, Closeable {
                 if (locpos < 0) {
                     zerror("invalid END header (bad central directory offset)");
                 }
-                // read in the CEN
                 if (end.cenlen > MAX_CEN_SIZE) {
                     zerror("invalid END header (central directory size too large)");
                 }
                 if (end.centot < 0 || end.centot > end.cenlen / CENHDR) {
                     zerror("invalid END header (total entries count too large)");
                 }
-                cen = this.cen = new byte[(int)end.cenlen];
-                if (readFullyAt(cen, 0, cen.length, cenpos) != end.cenlen) {
+                // Validation ensures these are <= Integer.MAX_VALUE
+                int cenlen = Math.toIntExact(end.cenlen);
+                int centot = Math.toIntExact(end.centot);
+
+                // read in the CEN
+                cen = this.cen = new byte[cenlen];
+                if (readFullyAt(cen, 0, cen.length, cenpos) != cenlen) {
                     zerror("read CEN tables failed");
                 }
-                this.total = Math.toIntExact(end.centot);
+                this.total = centot;
             } else {
                 cen = this.cen;
                 this.total = knownTotal;
diff --git a/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java
index c4ca9e1e183..c5d4f4e5f8f 100644
--- a/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/HKDFParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,8 @@ import java.util.Objects;
  * <p>
  * Examples:
  * {@snippet lang = java:
- * // this usage depicts the initialization of an HKDF-Extract AlgorithmParameterSpec
+ * // this usage depicts the initialization of an HKDF-Extract
+ * // AlgorithmParameterSpec
  * AlgorithmParameterSpec derivationSpec =
  *             HKDFParameterSpec.ofExtract()
  *                              .addIKM(label)
@@ -58,12 +59,14 @@ import java.util.Objects;
  *                              .addSalt(salt).extractOnly();
  *}
  * {@snippet lang = java:
- * // this usage depicts the initialization of an HKDF-Expand AlgorithmParameterSpec
+ * // this usage depicts the initialization of an HKDF-Expand
+ * // AlgorithmParameterSpec
  * AlgorithmParameterSpec derivationSpec =
  *             HKDFParameterSpec.expandOnly(prk, info, 32);
  *}
  * {@snippet lang = java:
- * // this usage depicts the initialization of an HKDF-ExtractExpand AlgorithmParameterSpec
+ * // this usage depicts the initialization of an HKDF-ExtractExpand
+ * // AlgorithmParameterSpec
  * AlgorithmParameterSpec derivationSpec =
  *             HKDFParameterSpec.ofExtract()
  *                              .addIKM(ikm)
@@ -112,8 +115,8 @@ public interface HKDFParameterSpec extends AlgorithmParameterSpec {
          *
          * @implNote HKDF implementations will enforce that the length
          *         is not greater than 255 * HMAC length. HKDF implementations
-         *         will also enforce that a {code null} info value is treated as
-         *         zero-length byte array.
+         *         will also enforce that a {@code null} info value is
+         *         treated as zero-length byte array.
          *
          * @param info
          *         the optional context and application specific information
@@ -261,8 +264,8 @@ public interface HKDFParameterSpec extends AlgorithmParameterSpec {
      * @implNote HKDF implementations will enforce that the length is
      *         not greater than 255 * HMAC length. Implementations will also
      *         enforce that the prk argument is at least as many bytes as the
-     *         HMAC length. Implementations will also enforce that a {code null}
-     *         info value is treated as zero-length byte array.
+     *         HMAC length. Implementations will also enforce that a
+     *         {@code null} info value is treated as zero-length byte array.
      *
      * @param prk
      *         the pseudorandom key (PRK); must not be {@code null}
@@ -358,7 +361,7 @@ public interface HKDFParameterSpec extends AlgorithmParameterSpec {
          * @param prk
          *         the pseudorandom key (PRK); in the case of
          *         {@code ExtractThenExpand}, the {@code prk} argument may be
-         *         {@null} since the output of extract phase is used
+         *         {@code null} since the output of extract phase is used
          * @param info
          *         the optional context and application specific information
          *         (may be {@code null}); the byte array is cloned to prevent
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index b2a224f5917..9d980c3ba3b 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -448,15 +448,19 @@ public interface JavaLangAccess {
     PrintStream initialSystemErr();
 
     /**
-     * Encodes as many ASCII codepoints as possible from the source array into
-     * the destination byte array, assuming that the encoding is ASCII
-     * compatible.
-     * <p>
-     * <b>WARNING: This method does not perform any bound checks.</b>
+     * Encodes as many ASCII codepoints as possible from the source
+     * character array into the destination byte array, assuming that
+     * the encoding is ASCII compatible.
      *
-     * @return the number of bytes successfully encoded, or 0 if none
+     * @param sa the source character array
+     * @param sp the index of the source array to start reading from
+     * @param da the target byte array
+     * @param dp the index of the target array to start writing to
+     * @param len the total number of characters to be encoded
+     * @return the total number of characters successfully encoded
+     * @throws NullPointerException if any of the provided arrays is null
      */
-    int uncheckedEncodeASCII(char[] src, int srcOff, byte[] dst, int dstOff, int len);
+    int encodeASCII(char[] sa, int sp, byte[] da, int dp, int len);
 
     /**
      * Set the cause of Throwable
@@ -577,6 +581,16 @@ public interface JavaLangAccess {
      */
     Object scopedValueBindings();
 
+    /**
+     * Returns the native thread ID for the given platform thread or 0 if not set.
+     */
+    long nativeThreadID(Thread thread);
+
+    /**
+     * Sets the native thread ID for the current platform thread.
+     */
+    void setThreadNativeID(long id);
+
     /**
      * Returns the innermost mounted continuation
      */
@@ -640,4 +654,9 @@ public interface JavaLangAccess {
      * Are the string bytes compatible with the given charset?
      */
     boolean bytesCompatible(String string, Charset charset, int srcIndex, int numChars);
+
+    /**
+     * Finish initialization of the StackTraceElement objects in a stack trace.
+     */
+    void finishInit(StackTraceElement[] stackTrace);
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
index f75d67adbbb..235797f66e3 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
@@ -551,6 +551,7 @@ public abstract sealed class AbstractMemorySegmentImpl
                 unsafeGetOffset() == that.unsafeGetOffset();
     }
 
+    @ForceInline
     @Override
     public String getString(long offset, Charset charset, long byteLength) {
         Utils.checkNonNegativeArgument(byteLength, "byteLength");
diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
index a6f4174324e..06aafaabe88 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.io.Writer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Formatter;
@@ -84,18 +83,14 @@ public final class JdkConsoleImpl implements JdkConsole {
     @Override
     public String readLine(Locale locale, String format, Object ... args) {
         String line = null;
-        synchronized (writeLock) {
-            synchronized(readLock) {
-                if (!format.isEmpty())
-                    pw.format(locale, format, args);
-                try {
-                    char[] ca = readline(false);
-                    if (ca != null)
-                        line = new String(ca);
-                } catch (IOException x) {
-                    throw new IOError(x);
-                }
-            }
+        if (!format.isEmpty())
+            pw.format(locale, format, args);
+        try {
+            char[] ca = readline(false);
+            if (ca != null)
+                line = new String(ca);
+        } catch (IOException x) {
+            throw new IOError(x);
         }
         return line;
     }
@@ -116,24 +111,24 @@ public final class JdkConsoleImpl implements JdkConsole {
     // it should call this method to obtain a JdkConsoleImpl. This ensures only one Console
     // instance exists in the Java runtime.
     private static final LazyConstant<Optional<JdkConsoleImpl>> PASSWORD_CONSOLE = LazyConstant.of(
-            new Supplier<Optional<JdkConsoleImpl>>() {
-                @Override
-                public Optional<JdkConsoleImpl> get() {
-                    if (System.console() != null) {
-                        throw new IllegalStateException("Can’t create a dedicated password " +
-                                "console since a real console already exists");
-                    }
-
-                    // If stdin is NOT redirected, return an Optional containing a JdkConsoleImpl
-                    // instance, otherwise an empty Optional.
-                    return SharedSecrets.getJavaIOAccess().isStdinTty() ?
-                            Optional.of(
-                                    new JdkConsoleImpl(
-                                            Charset.forName(StaticProperty.stdinEncoding(), UTF_8.INSTANCE),
-                                            Charset.forName(StaticProperty.stdoutEncoding(), UTF_8.INSTANCE))) :
-                            Optional.empty();
+        new Supplier<Optional<JdkConsoleImpl>>() {
+            @Override
+            public Optional<JdkConsoleImpl> get() {
+                if (System.console() != null) {
+                    throw new IllegalStateException("Can’t create a dedicated password " +
+                            "console since a real console already exists");
                 }
+
+                // If stdin is NOT redirected, return an Optional containing a JdkConsoleImpl
+                // instance, otherwise an empty Optional.
+                return SharedSecrets.getJavaIOAccess().isStdinTty() ?
+                        Optional.of(
+                                new JdkConsoleImpl(
+                                        Charset.forName(StaticProperty.stdinEncoding(), UTF_8.INSTANCE),
+                                        Charset.forName(StaticProperty.stdoutEncoding(), UTF_8.INSTANCE))) :
+                        Optional.empty();
             }
+        }
     );
 
     public static Optional<JdkConsoleImpl> passwordConsole() {
@@ -149,54 +144,51 @@ public final class JdkConsoleImpl implements JdkConsole {
 
     private char[] readPassword0(boolean noNewLine, Locale locale, String format, Object ... args) {
         char[] passwd = null;
-        synchronized (writeLock) {
-            synchronized(readLock) {
-                installShutdownHook();
-                try {
-                    synchronized(restoreEchoLock) {
-                        restoreEcho = echo(false);
-                    }
-                } catch (IOException x) {
-                    throw new IOError(x);
-                }
-                IOError ioe = null;
-                try {
-                    if (!format.isEmpty())
-                        pw.format(locale, format, args);
-                    passwd = readline(true);
-                } catch (IOException x) {
-                    ioe = new IOError(x);
-                } finally {
-                    try {
-                        synchronized(restoreEchoLock) {
-                            if (restoreEcho) {
-                                restoreEcho = echo(true);
-                            }
-                        }
-                    } catch (IOException x) {
-                        if (ioe == null)
-                            ioe = new IOError(x);
-                        else
-                            ioe.addSuppressed(x);
-                    }
-                    if (ioe != null) {
-                        if (passwd != null) {
-                            Arrays.fill(passwd, ' ');
-                        }
-                        try {
-                            if (reader instanceof LineReader lr) {
-                                lr.zeroOut();
-                            }
-                        } catch (IOException _) {
-                            // ignore
-                        }
-                        throw ioe;
-                    }
-                }
-                if (!noNewLine) {
-                    pw.println();
-                }
+
+        installShutdownHook();
+        try {
+            synchronized(restoreEchoLock) {
+                restoreEcho = echo(false);
             }
+        } catch (IOException x) {
+            throw new IOError(x);
+        }
+        IOError ioe = null;
+        try {
+            if (!format.isEmpty())
+                pw.format(locale, format, args);
+            passwd = readline(true);
+        } catch (IOException x) {
+            ioe = new IOError(x);
+        } finally {
+            try {
+                synchronized(restoreEchoLock) {
+                    if (restoreEcho) {
+                        restoreEcho = echo(true);
+                    }
+                }
+            } catch (IOException x) {
+                if (ioe == null)
+                    ioe = new IOError(x);
+                else
+                    ioe.addSuppressed(x);
+            }
+            if (ioe != null) {
+                if (passwd != null) {
+                    Arrays.fill(passwd, ' ');
+                }
+                try {
+                    if (reader instanceof LineReader lr) {
+                        lr.zeroOut();
+                    }
+                } catch (IOException _) {
+                    // ignore
+                }
+                throw ioe;
+            }
+        }
+        if (!noNewLine) {
+            pw.println();
         }
         return passwd;
     }
@@ -243,14 +235,11 @@ public final class JdkConsoleImpl implements JdkConsole {
         return outCharset;
     }
 
-    private final Charset inCharset;
     private final Charset outCharset;
     private final Object readLock;
-    private final Object writeLock;
     // Must not block while holding this. It is used in the shutdown hook.
     private final Object restoreEchoLock;
     private final Reader reader;
-    private final Writer out;
     private final PrintWriter pw;
     private final Formatter formatter;
     private char[] rcb;
@@ -417,12 +406,11 @@ public final class JdkConsoleImpl implements JdkConsole {
     public JdkConsoleImpl(Charset inCharset, Charset outCharset) {
         Objects.requireNonNull(inCharset);
         Objects.requireNonNull(outCharset);
-        this.inCharset = inCharset;
         this.outCharset = outCharset;
         readLock = new Object();
-        writeLock = new Object();
+        var writeLock = new Object();
         restoreEchoLock = new Object();
-        out = StreamEncoder.forOutputStreamWriter(
+        var out = StreamEncoder.forOutputStreamWriter(
                 new FileOutputStream(FileDescriptor.out),
                 writeLock,
                 outCharset);
diff --git a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
index 10aa0397f0c..1c565a52c0f 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
@@ -195,10 +195,9 @@ public class BasicImageReader implements AutoCloseable {
         }
 
         if (result.getMajorVersion() != ImageHeader.MAJOR_VERSION ||
-            result.getMinorVersion() != ImageHeader.MINOR_VERSION) {
-            throw new IOException("The image file \"" + name + "\" is not " +
-                "the correct version. Major: " + result.getMajorVersion() +
-                ". Minor: " + result.getMinorVersion());
+                result.getMinorVersion() != ImageHeader.MINOR_VERSION) {
+            throw new ImageVersionMismatchException(
+                    name, result.getMajorVersion(), result.getMinorVersion());
         }
 
         return result;
@@ -447,4 +446,14 @@ public class BasicImageReader implements AutoCloseable {
 
         return new ByteArrayInputStream(bytes);
     }
+
+    public static final class ImageVersionMismatchException extends IOException {
+        @Deprecated
+        private static final long serialVersionUID = 1L;
+        // If needed we could capture major/minor version for use by JImageTask.
+        ImageVersionMismatchException(String name, int majorVersion, int minorVersion) {
+            super("The image file \"" + name + "\" is not the correct version. " +
+                    "Major: " + majorVersion + ". Minor: " + minorVersion);
+        }
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
index 3504ce7e8b3..90771575657 100644
--- a/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
+++ b/src/java.base/share/classes/jdk/internal/loader/URLClassPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@ import java.net.URLStreamHandler;
 import java.net.URLStreamHandlerFactory;
 import java.security.CodeSigner;
 import java.security.cert.Certificate;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -98,11 +97,20 @@ public class URLClassPath {
         DEBUG_CP_URL_CHECK = p != null ? p.equals("true") || p.isEmpty() : false;
     }
 
-    /* The original search path of URLs. */
-    private final ArrayList<URL> path;
+    /* Search path of URLs passed to the constructor or by calls to addURL.
+     * Access is guarded by a monitor on 'searchPath' itself
+     */
+    private final ArrayList<URL> searchPath;
 
-    /* The deque of unopened URLs */
-    private final ArrayDeque<URL> unopenedUrls;
+    /* Index of the next URL in the search path to process.
+     * Access is guarded by a monitor on 'searchPath'
+     */
+    private int nextURL = 0;
+
+    /* List of URLs found during expansion of JAR 'Class-Path' attributes.
+     * Access is guarded by a monitor on 'searchPath'
+     */
+    private final ArrayList<URL> manifestClassPath = new ArrayList<>();
 
     /* The resulting search path of Loaders */
     private final ArrayList<Loader> loaders = new ArrayList<>();
@@ -128,14 +136,8 @@ public class URLClassPath {
      */
     public URLClassPath(URL[] urls,
                         URLStreamHandlerFactory factory) {
-        ArrayList<URL> path = new ArrayList<>(urls.length);
-        ArrayDeque<URL> unopenedUrls = new ArrayDeque<>(urls.length);
-        for (URL url : urls) {
-            path.add(url);
-            unopenedUrls.add(url);
-        }
-        this.path = path;
-        this.unopenedUrls = unopenedUrls;
+        // Reject null URL array or any null element in the array
+        this.searchPath = new ArrayList<>(List.of(urls));
 
         if (factory != null) {
             jarHandler = factory.createURLStreamHandler("jar");
@@ -174,16 +176,7 @@ public class URLClassPath {
                 off = next + 1;
             } while (next != -1);
         }
-
-        // can't use ArrayDeque#addAll or new ArrayDeque(Collection);
-        // it's too early in the bootstrap to trigger use of lambdas
-        int size = path.size();
-        ArrayDeque<URL> unopenedUrls = new ArrayDeque<>(size);
-        for (int i = 0; i < size; i++)
-            unopenedUrls.add(path.get(i));
-
-        this.unopenedUrls = unopenedUrls;
-        this.path = path;
+        this.searchPath = path;
         // the application class loader uses the built-in protocol handler to avoid protocol
         // handler lookup when opening JAR files on the class path.
         this.jarHandler = new sun.net.www.protocol.jar.Handler();
@@ -215,10 +208,9 @@ public class URLClassPath {
     public synchronized void addURL(URL url) {
         if (closed || url == null)
             return;
-        synchronized (unopenedUrls) {
-            if (! path.contains(url)) {
-                unopenedUrls.addLast(url);
-                path.add(url);
+        synchronized (searchPath) {
+            if (! searchPath.contains(url)) {
+                searchPath.add(url);
             }
         }
     }
@@ -249,8 +241,8 @@ public class URLClassPath {
      * Returns the original search path of URLs.
      */
     public URL[] getURLs() {
-        synchronized (unopenedUrls) {
-            return path.toArray(new URL[0]);
+        synchronized (searchPath) {
+            return searchPath.toArray(new URL[0]);
         }
     }
 
@@ -379,6 +371,23 @@ public class URLClassPath {
         };
     }
 
+    /*
+     * Returns the next URL to process or null if finished
+     */
+    private URL nextURL() {
+        synchronized (searchPath) {
+            // Check paths discovered during 'Class-Path' expansion first
+            if (!manifestClassPath.isEmpty()) {
+                return manifestClassPath.removeLast();
+            }
+            // Check the regular search path
+            if (nextURL < searchPath.size()) {
+                return searchPath.get(nextURL++);
+            }
+            // All paths exhausted
+            return null;
+        }
+    }
     /*
      * Returns the Loader at the specified position in the URL search
      * path. The URLs are opened and expanded as needed. Returns null
@@ -389,14 +398,13 @@ public class URLClassPath {
             return null;
         }
         // Expand URL search path until the request can be satisfied
-        // or unopenedUrls is exhausted.
+        // or all paths are exhausted.
         while (loaders.size() < index + 1) {
-            final URL url;
-            synchronized (unopenedUrls) {
-                url = unopenedUrls.pollFirst();
-                if (url == null)
-                    return null;
+            final URL url = nextURL();
+            if (url == null) {
+                return null;
             }
+
             // Skip this URL if it already has a Loader.
             String urlNoFragString = URLUtil.urlNoFragString(url);
             if (lmap.containsKey(urlNoFragString)) {
@@ -422,7 +430,7 @@ public class URLClassPath {
                 continue;
             }
             if (loaderClassPathURLs != null) {
-                push(loaderClassPathURLs);
+                addManifestClassPaths(loaderClassPathURLs);
             }
             // Finally, add the Loader to the search path.
             loaders.add(loader);
@@ -475,13 +483,12 @@ public class URLClassPath {
     }
 
     /*
-     * Pushes the specified URLs onto the head of unopened URLs.
+     * Adds the specified URLs to the list of 'Class-Path' expanded URLs
      */
-    private void push(URL[] urls) {
-        synchronized (unopenedUrls) {
-            for (int i = urls.length - 1; i >= 0; --i) {
-                unopenedUrls.addFirst(urls[i]);
-            }
+    private void addManifestClassPaths(URL[] urls) {
+        synchronized (searchPath) {
+            // Adding in reversed order since manifestClassPath is consumed tail-first
+            manifestClassPath.addAll(Arrays.asList(urls).reversed());
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
index b594aca7a05..a04fea67b88 100644
--- a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
+++ b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -326,7 +326,7 @@ public final class ScopedMemoryAccess {
     @ForceInline
     public static
     <V extends VectorSupport.Vector<E>, E, S extends VectorSupport.VectorSpecies<E>>
-    V loadFromMemorySegment(Class<? extends V> vmClass, Class<E> e, int length,
+    V loadFromMemorySegment(Class<? extends V> vmClass, int laneType, int length,
                          AbstractMemorySegmentImpl msp, long offset,
                          S s,
                          VectorSupport.LoadOperation<AbstractMemorySegmentImpl, V, S> defaultImpl) {
@@ -334,7 +334,7 @@ public final class ScopedMemoryAccess {
         try {
             return loadFromMemorySegmentScopedInternal(
                     msp.sessionImpl(),
-                    vmClass, e, length,
+                    vmClass, laneType, length,
                     msp, offset,
                     s,
                     defaultImpl);
@@ -348,14 +348,14 @@ public final class ScopedMemoryAccess {
     private static
     <V extends VectorSupport.Vector<E>, E, S extends VectorSupport.VectorSpecies<E>>
     V loadFromMemorySegmentScopedInternal(MemorySessionImpl session,
-                                          Class<? extends V> vmClass, Class<E> e, int length,
+                                          Class<? extends V> vmClass, int laneType, int length,
                                           AbstractMemorySegmentImpl msp, long offset,
                                           S s,
                                           VectorSupport.LoadOperation<AbstractMemorySegmentImpl, V, S> defaultImpl) {
         try {
             session.checkValidStateRaw();
 
-            return VectorSupport.load(vmClass, e, length,
+            return VectorSupport.load(vmClass, laneType, length,
                     msp.unsafeGetBase(), msp.unsafeGetOffset() + offset, true,
                     msp, offset, s,
                     defaultImpl);
@@ -368,14 +368,14 @@ public final class ScopedMemoryAccess {
     public static
     <V extends VectorSupport.Vector<E>, E, S extends VectorSupport.VectorSpecies<E>,
      M extends VectorSupport.VectorMask<E>>
-    V loadFromMemorySegmentMasked(Class<? extends V> vmClass, Class<M> maskClass, Class<E> e,
+    V loadFromMemorySegmentMasked(Class<? extends V> vmClass, Class<M> maskClass, int laneType,
                                   int length, AbstractMemorySegmentImpl msp, long offset, M m, S s, int offsetInRange,
                                   VectorSupport.LoadVectorMaskedOperation<AbstractMemorySegmentImpl, V, S, M> defaultImpl) {
 
         try {
             return loadFromMemorySegmentMaskedScopedInternal(
                     msp.sessionImpl(),
-                    vmClass, maskClass, e, length,
+                    vmClass, maskClass, laneType, length,
                     msp, offset, m,
                     s, offsetInRange,
                     defaultImpl);
@@ -390,14 +390,14 @@ public final class ScopedMemoryAccess {
     <V extends VectorSupport.Vector<E>, E, S extends VectorSupport.VectorSpecies<E>,
      M extends VectorSupport.VectorMask<E>>
     V loadFromMemorySegmentMaskedScopedInternal(MemorySessionImpl session, Class<? extends V> vmClass,
-                                                Class<M> maskClass, Class<E> e, int length,
+                                                Class<M> maskClass, int laneType, int length,
                                                 AbstractMemorySegmentImpl msp, long offset, M m,
                                                 S s, int offsetInRange,
                                                 VectorSupport.LoadVectorMaskedOperation<AbstractMemorySegmentImpl, V, S, M> defaultImpl) {
         try {
             session.checkValidStateRaw();
 
-            return VectorSupport.loadMasked(vmClass, maskClass, e, length,
+            return VectorSupport.loadMasked(vmClass, maskClass, laneType, length,
                     msp.unsafeGetBase(), msp.unsafeGetOffset() + offset, true, m, offsetInRange,
                     msp, offset, s,
                     defaultImpl);
@@ -409,7 +409,7 @@ public final class ScopedMemoryAccess {
     @ForceInline
     public static
     <V extends VectorSupport.Vector<E>, E>
-    void storeIntoMemorySegment(Class<? extends V> vmClass, Class<E> e, int length,
+    void storeIntoMemorySegment(Class<? extends V> vmClass, int laneType, int length,
                                 V v,
                                 AbstractMemorySegmentImpl msp, long offset,
                                 VectorSupport.StoreVectorOperation<AbstractMemorySegmentImpl, V> defaultImpl) {
@@ -417,7 +417,7 @@ public final class ScopedMemoryAccess {
         try {
             storeIntoMemorySegmentScopedInternal(
                     msp.sessionImpl(),
-                    vmClass, e, length,
+                    vmClass, laneType, length,
                     v,
                     msp, offset,
                     defaultImpl);
@@ -431,14 +431,14 @@ public final class ScopedMemoryAccess {
     private static
     <V extends VectorSupport.Vector<E>, E>
     void storeIntoMemorySegmentScopedInternal(MemorySessionImpl session,
-                                              Class<? extends V> vmClass, Class<E> e, int length,
+                                              Class<? extends V> vmClass, int laneType, int length,
                                               V v,
                                               AbstractMemorySegmentImpl msp, long offset,
                                               VectorSupport.StoreVectorOperation<AbstractMemorySegmentImpl, V> defaultImpl) {
         try {
             session.checkValidStateRaw();
 
-            VectorSupport.store(vmClass, e, length,
+            VectorSupport.store(vmClass, laneType, length,
                     msp.unsafeGetBase(), msp.unsafeGetOffset() + offset, true,
                     v,
                     msp, offset,
@@ -451,15 +451,15 @@ public final class ScopedMemoryAccess {
     @ForceInline
     public static
     <V extends VectorSupport.Vector<E>, E, M extends VectorSupport.VectorMask<E>>
-    void storeIntoMemorySegmentMasked(Class<? extends V> vmClass, Class<M> maskClass, Class<E> e,
-                                      int length, V v, M m,
+    void storeIntoMemorySegmentMasked(Class<? extends V> vmClass, Class<M> maskClass,
+                                      int laneType, int length, V v, M m,
                                       AbstractMemorySegmentImpl msp, long offset,
                                       VectorSupport.StoreVectorMaskedOperation<AbstractMemorySegmentImpl, V, M> defaultImpl) {
 
         try {
             storeIntoMemorySegmentMaskedScopedInternal(
                     msp.sessionImpl(),
-                    vmClass, maskClass, e, length,
+                    vmClass, maskClass, laneType, length,
                     v, m,
                     msp, offset,
                     defaultImpl);
@@ -474,13 +474,13 @@ public final class ScopedMemoryAccess {
     <V extends VectorSupport.Vector<E>, E, M extends VectorSupport.VectorMask<E>>
     void storeIntoMemorySegmentMaskedScopedInternal(MemorySessionImpl session,
                                                     Class<? extends V> vmClass, Class<M> maskClass,
-                                                    Class<E> e, int length, V v, M m,
+                                                    int laneType, int length, V v, M m,
                                                     AbstractMemorySegmentImpl msp, long offset,
                                                     VectorSupport.StoreVectorMaskedOperation<AbstractMemorySegmentImpl, V, M> defaultImpl) {
         try {
             session.checkValidStateRaw();
 
-            VectorSupport.storeMasked(vmClass, maskClass, e, length,
+            VectorSupport.storeMasked(vmClass, maskClass, laneType, length,
                     msp.unsafeGetBase(), msp.unsafeGetOffset() + offset, true,
                     v, m,
                     msp, offset,
diff --git a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
index de7a5e44b91..c220455e80b 100644
--- a/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
+++ b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -599,8 +599,8 @@ public class ArraysSupport {
         if (length > 3) {
             if (a[aFromIndex] != b[bFromIndex])
                 return 0;
-            long aOffset = Unsafe.ARRAY_CHAR_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_CHAR_INDEX_SCALE);
-            long bOffset = Unsafe.ARRAY_CHAR_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_CHAR_INDEX_SCALE);
+            long aOffset = Unsafe.ARRAY_CHAR_BASE_OFFSET + ((long) aFromIndex << LOG2_ARRAY_CHAR_INDEX_SCALE);
+            long bOffset = Unsafe.ARRAY_CHAR_BASE_OFFSET + ((long) bFromIndex << LOG2_ARRAY_CHAR_INDEX_SCALE);
             i = vectorizedMismatch(
                     a, aOffset,
                     b, bOffset,
@@ -648,8 +648,8 @@ public class ArraysSupport {
         if (length > 3) {
             if (a[aFromIndex] != b[bFromIndex])
                 return 0;
-            long aOffset = Unsafe.ARRAY_SHORT_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_SHORT_INDEX_SCALE);
-            long bOffset = Unsafe.ARRAY_SHORT_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_SHORT_INDEX_SCALE);
+            long aOffset = Unsafe.ARRAY_SHORT_BASE_OFFSET + ((long) aFromIndex << LOG2_ARRAY_SHORT_INDEX_SCALE);
+            long bOffset = Unsafe.ARRAY_SHORT_BASE_OFFSET + ((long) bFromIndex << LOG2_ARRAY_SHORT_INDEX_SCALE);
             i = vectorizedMismatch(
                     a, aOffset,
                     b, bOffset,
@@ -697,8 +697,8 @@ public class ArraysSupport {
         if (length > 1) {
             if (a[aFromIndex] != b[bFromIndex])
                 return 0;
-            long aOffset = Unsafe.ARRAY_INT_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_INT_INDEX_SCALE);
-            long bOffset = Unsafe.ARRAY_INT_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_INT_INDEX_SCALE);
+            long aOffset = Unsafe.ARRAY_INT_BASE_OFFSET + ((long) aFromIndex << LOG2_ARRAY_INT_INDEX_SCALE);
+            long bOffset = Unsafe.ARRAY_INT_BASE_OFFSET + ((long) bFromIndex << LOG2_ARRAY_INT_INDEX_SCALE);
             i = vectorizedMismatch(
                     a, aOffset,
                     b, bOffset,
@@ -729,8 +729,8 @@ public class ArraysSupport {
         int i = 0;
         if (length > 1) {
             if (Float.floatToRawIntBits(a[aFromIndex]) == Float.floatToRawIntBits(b[bFromIndex])) {
-                long aOffset = Unsafe.ARRAY_FLOAT_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_FLOAT_INDEX_SCALE);
-                long bOffset = Unsafe.ARRAY_FLOAT_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_FLOAT_INDEX_SCALE);
+                long aOffset = Unsafe.ARRAY_FLOAT_BASE_OFFSET + ((long) aFromIndex << LOG2_ARRAY_FLOAT_INDEX_SCALE);
+                long bOffset = Unsafe.ARRAY_FLOAT_BASE_OFFSET + ((long) bFromIndex << LOG2_ARRAY_FLOAT_INDEX_SCALE);
                 i = vectorizedMismatch(
                         a, aOffset,
                         b, bOffset,
@@ -787,8 +787,8 @@ public class ArraysSupport {
         }
         if (a[aFromIndex] != b[bFromIndex])
             return 0;
-        long aOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_LONG_INDEX_SCALE);
-        long bOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_LONG_INDEX_SCALE);
+        long aOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + ((long) aFromIndex << LOG2_ARRAY_LONG_INDEX_SCALE);
+        long bOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + ((long) bFromIndex << LOG2_ARRAY_LONG_INDEX_SCALE);
         int i = vectorizedMismatch(
                 a, aOffset,
                 b, bOffset,
@@ -813,8 +813,8 @@ public class ArraysSupport {
         }
         int i = 0;
         if (Double.doubleToRawLongBits(a[aFromIndex]) == Double.doubleToRawLongBits(b[bFromIndex])) {
-            long aOffset = Unsafe.ARRAY_DOUBLE_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_DOUBLE_INDEX_SCALE);
-            long bOffset = Unsafe.ARRAY_DOUBLE_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_DOUBLE_INDEX_SCALE);
+            long aOffset = Unsafe.ARRAY_DOUBLE_BASE_OFFSET + ((long) aFromIndex << LOG2_ARRAY_DOUBLE_INDEX_SCALE);
+            long bOffset = Unsafe.ARRAY_DOUBLE_BASE_OFFSET + ((long) bFromIndex << LOG2_ARRAY_DOUBLE_INDEX_SCALE);
             i = vectorizedMismatch(
                     a, aOffset,
                     b, bOffset,
diff --git a/src/java.base/share/classes/jdk/internal/util/WeakReferenceKey.java b/src/java.base/share/classes/jdk/internal/util/WeakReferenceKey.java
index 3fe6d6026d7..0b26aa40c0d 100644
--- a/src/java.base/share/classes/jdk/internal/util/WeakReferenceKey.java
+++ b/src/java.base/share/classes/jdk/internal/util/WeakReferenceKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,4 +88,18 @@ final class WeakReferenceKey<T> extends WeakReference<T> implements ReferenceKey
     public String toString() {
         return this.getClass().getCanonicalName() + "#" + System.identityHashCode(this);
     }
+
+    // WeakReferenceKey.equals() is usually executed in the AOT assembly phase. However,
+    // in some rare occasions, it's not executed (due to peculiarity of hash code and
+    // memory addressing??). As a result, the constant pool entries used by
+    // equals() are not resolved.
+    //
+    // The JVM calls ensureDeterministicAOTCache() during the AOT assembly phase to ensure
+    // that the constant pool entries used by equals() are resolved, so that the
+    // the JDK's default CDS archives have deterministic contents.
+    private static boolean ensureDeterministicAOTCache() {
+        WeakReferenceKey<String> k1 = new WeakReferenceKey<>("1", null);
+        WeakReferenceKey<String> k2 = new WeakReferenceKey<>("2", null);
+        return k1.equals(k2);
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
index 357d38008d1..e84027764f1 100644
--- a/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
+++ b/src/java.base/share/classes/jdk/internal/vm/ThreadSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,14 @@ package jdk.internal.vm;
 
 import java.util.Arrays;
 import java.util.stream.Stream;
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 
 /**
  * Represents a snapshot of information about a Thread.
  */
 class ThreadSnapshot {
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
     private static final StackTraceElement[] EMPTY_STACK = new StackTraceElement[0];
     private static final ThreadLock[] EMPTY_LOCKS = new ThreadLock[0];
 
@@ -54,16 +57,16 @@ class ThreadSnapshot {
 
     /**
      * Take a snapshot of a Thread to get all information about the thread.
-     * Return null if a ThreadSnapshot is not created, for example if the
-     * thread has terminated.
-     * @throws UnsupportedOperationException if not supported by VM
+     * @return the snapshot or {@code null} if the thread is not alive
      */
     static ThreadSnapshot of(Thread thread) {
-        ThreadSnapshot snapshot = create(thread);
+        ThreadSnapshot snapshot = thread.isAlive() ? create(thread) : null;
         if (snapshot == null) {
-            return null; // thread terminated
+            return null; // thread not alive
         }
-        if (snapshot.stackTrace == null) {
+        if (snapshot.stackTrace != null) {
+            JLA.finishInit(snapshot.stackTrace);
+        } else {
             snapshot.stackTrace = EMPTY_STACK;
         }
         if (snapshot.locks != null) {
diff --git a/src/java.base/share/classes/jdk/internal/vm/annotation/TrustFinalFields.java b/src/java.base/share/classes/jdk/internal/vm/annotation/TrustFinalFields.java
new file mode 100644
index 00000000000..a94f58159a2
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/vm/annotation/TrustFinalFields.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.vm.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/// Indicates all instance final fields declared in the annotated class should
+/// be trusted as constants by compilers in `ciField::is_constant`.
+///
+/// The compiler already treats static final fields and instance final fields in
+/// record classes and hidden classes as constant.  All classes in select
+/// packages (Defined in `trust_final_non_static_fields` in `ciField.cpp`) in
+/// the boot class loader also have their instance final fields trusted.  This
+/// annotation is not necessary in these cases.
+///
+/// The [Stable] annotation treats fields as constants once they are not the
+/// zero or null value.  In comparison, a non-stable final instance field
+/// trusted by this annotation can treat zero and null values as constants.
+///
+/// This annotation is suitable when constant treatment of final fields is
+/// performance sensitive, yet package-wide final field constant treatment may
+/// be at risk from final field modifications such as serialization.
+///
+/// This annotation is only recognized on classes from the boot and platform
+/// class loaders and is ignored elsewhere.
+///
+/// @since 26
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface TrustFinalFields {
+}
diff --git a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
index d3705a279ca..23a787971c0 100644
--- a/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/vector/VectorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -149,14 +149,14 @@ public class VectorSupport {
     public static final int MODE_BROADCAST = 0;
     public static final int MODE_BITS_COERCED_LONG_TO_MASK = 1;
 
-    // BasicType codes, for primitives only:
+    // Values correspond to jdk.incubator.vector.LaneType ordinals
     public static final int
-        T_FLOAT   = 6,
-        T_DOUBLE  = 7,
-        T_BYTE    = 8,
-        T_SHORT   = 9,
-        T_INT     = 10,
-        T_LONG    = 11;
+        LT_FLOAT     = 0,
+        LT_DOUBLE    = 1,
+        LT_BYTE      = 2,
+        LT_SHORT     = 3,
+        LT_INT       = 4,
+        LT_LONG      = 5;
 
     /* ============================================================================ */
 
@@ -203,7 +203,7 @@ public class VectorSupport {
     <VM extends VectorPayload,
      S extends VectorSpecies<E>,
      E>
-    VM fromBitsCoerced(Class<? extends VM> vmClass, Class<E> eClass,
+    VM fromBitsCoerced(Class<? extends VM> vmClass, int laneType,
                        int length,
                        long bits, int mode, S s,
                        FromBitsCoercedOperation<VM, S> defaultImpl) {
@@ -221,7 +221,7 @@ public class VectorSupport {
     public static
     <E,
      M extends VectorMask<E>>
-    M indexPartiallyInUpperRange(Class<? extends M> mClass, Class<E> eClass,
+    M indexPartiallyInUpperRange(Class<? extends M> mClass, int laneType,
                                  int length, long offset, long limit,
                                  IndexPartiallyInUpperRangeOperation<E, M> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -239,7 +239,7 @@ public class VectorSupport {
     <V extends Vector<E>,
      E,
      S extends VectorSpecies<E>>
-    V indexVector(Class<? extends V> vClass, Class<E> eClass,
+    V indexVector(Class<? extends V> vClass, int laneType,
                   int length,
                   V v, int step, S s,
                   IndexOperation<V, S> defaultImpl) {
@@ -260,7 +260,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     long reductionCoerced(int oprId,
-                          Class<? extends V> vClass, Class<? extends M> mClass, Class<E> eClass,
+                          Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
                           int length,
                           V v, M m,
                           ReductionOperation<V, M> defaultImpl) {
@@ -279,7 +279,7 @@ public class VectorSupport {
     public static
     <VM extends VectorPayload,
      E>
-    long extract(Class<? extends VM> vClass, Class<E> eClass,
+    long extract(Class<? extends VM> vClass, int laneType,
                  int length,
                  VM vm, int i,
                  VecExtractOp<VM> defaultImpl) {
@@ -297,7 +297,7 @@ public class VectorSupport {
     public static
     <V extends Vector<E>,
      E>
-    V insert(Class<? extends V> vClass, Class<E> eClass,
+    V insert(Class<? extends V> vClass, int laneType,
              int length,
              V v, int i, long val,
              VecInsertOp<V> defaultImpl) {
@@ -318,7 +318,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     V unaryOp(int oprId,
-              Class<? extends V> vClass, Class<? extends M> mClass, Class<E> eClass,
+              Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
               int length,
               V v, M m,
               UnaryOperation<V, M> defaultImpl) {
@@ -336,7 +336,7 @@ public class VectorSupport {
     @IntrinsicCandidate
     public static
     <V extends Vector<E>, E>
-    V libraryUnaryOp(long addr, Class<? extends V> vClass, Class<E> eClass, int length, String debugName,
+    V libraryUnaryOp(long addr, Class<? extends V> vClass, int laneType, int length, String debugName,
                      V v,
                      UnaryOperation<V,?> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -356,7 +356,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     VM binaryOp(int oprId,
-                Class<? extends VM> vmClass, Class<? extends M> mClass, Class<E> eClass,
+                Class<? extends VM> vmClass, Class<? extends M> mClass, int laneType,
                 int length,
                 VM v1, VM v2, M m,
                 BinaryOperation<VM, M> defaultImpl) {
@@ -374,7 +374,7 @@ public class VectorSupport {
     @IntrinsicCandidate
     public static
     <V extends VectorPayload, E>
-    V libraryBinaryOp(long addr, Class<? extends V> vClass, Class<E> eClass, int length, String debugName,
+    V libraryBinaryOp(long addr, Class<? extends V> vClass, int laneType, int length, String debugName,
                       V v1, V v2,
                       BinaryOperation<V,?> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -391,7 +391,7 @@ public class VectorSupport {
     public static
     <V extends Vector<E>,
      E>
-    V selectFromTwoVectorOp(Class<? extends V> vClass, Class<E> eClass, int length,
+    V selectFromTwoVectorOp(Class<? extends V> vClass, int laneType, int length,
                             V v1, V v2, V v3,
                             SelectFromTwoVector<V> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -413,7 +413,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     V ternaryOp(int oprId,
-                Class<? extends V> vClass, Class<? extends M> mClass, Class<E> eClass,
+                Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
                 int length,
                 V v1, V v2, V v3, M m,
                 TernaryOperation<V, M> defaultImpl) {
@@ -437,7 +437,7 @@ public class VectorSupport {
      VM extends VectorPayload,
      E,
      S extends VectorSpecies<E>>
-    VM load(Class<? extends VM> vmClass, Class<E> eClass,
+    VM load(Class<? extends VM> vmClass, int laneType,
             int length,
             Object base, long offset, boolean fromSegment,
             C container, long index, S s,
@@ -462,7 +462,7 @@ public class VectorSupport {
      E,
      S extends VectorSpecies<E>,
      M extends VectorMask<E>>
-    V loadMasked(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+    V loadMasked(Class<? extends V> vClass, Class<M> mClass, int laneType,
                  int length, Object base, long offset, boolean fromSegment,
                  M m, int offsetInRange,
                  C container, long index, S s,
@@ -488,7 +488,7 @@ public class VectorSupport {
      S extends VectorSpecies<E>,
      M extends VectorMask<E>,
      E>
-    V loadWithMap(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+    V loadWithMap(Class<? extends V> vClass, Class<M> mClass, int laneType,
                   int length,
                   Class<? extends Vector<Integer>> vectorIndexClass,
                   int indexLength, Object base, long offset,
@@ -510,7 +510,7 @@ public class VectorSupport {
     public static
     <C,
      V extends VectorPayload>
-    void store(Class<?> vClass, Class<?> eClass,
+    void store(Class<?> vClass, int laneType,
                int length,
                Object base, long offset, boolean fromSegment,
                V v, C container, long index,
@@ -531,7 +531,7 @@ public class VectorSupport {
      V extends Vector<E>,
      M extends VectorMask<E>,
      E>
-    void storeMasked(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+    void storeMasked(Class<? extends V> vClass, Class<M> mClass, int laneType,
                      int length,
                      Object base, long offset, boolean fromSegment,
                      V v, M m, C container, long index,
@@ -555,7 +555,7 @@ public class VectorSupport {
      W extends Vector<Integer>,
      M extends VectorMask<E>,
      E>
-    void storeWithMap(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+    void storeWithMap(Class<? extends V> vClass, Class<M> mClass, int laneType,
                       int length,
                       Class<? extends Vector<Integer>> vectorIndexClass,
                       int indexLength, Object base, long offset,
@@ -573,7 +573,7 @@ public class VectorSupport {
     <M extends VectorMask<E>,
      E>
     boolean test(int cond,
-                 Class<?> mClass, Class<?> eClass,
+                 Class<?> mClass, int laneType,
                  int length,
                  M m1, M m2,
                  BiFunction<M, M, Boolean> defaultImpl) {
@@ -594,7 +594,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     M compare(int cond,
-              Class<? extends V> vectorClass, Class<M> mClass, Class<E> eClass,
+              Class<? extends V> vectorClass, Class<M> mClass, int laneType,
               int length,
               V v1, V v2, M m,
               VectorCompareOp<V, M> defaultImpl) {
@@ -615,7 +615,7 @@ public class VectorSupport {
      SH extends VectorShuffle<E>,
      M  extends VectorMask<E>,
      E>
-    V rearrangeOp(Class<? extends V> vClass, Class<SH> shClass, Class<M> mClass, Class<E> eClass,
+    V rearrangeOp(Class<? extends V> vClass, Class<SH> shClass, Class<M> mClass, int laneType,
                   int length,
                   V v, SH sh, M m,
                   VectorRearrangeOp<V, SH, M> defaultImpl) {
@@ -633,7 +633,7 @@ public class VectorSupport {
     <V extends Vector<E>,
      M  extends VectorMask<E>,
      E>
-    V selectFromOp(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+    V selectFromOp(Class<? extends V> vClass, Class<M> mClass, int laneType,
                    int length, V v1, V v2, M m,
                    VectorSelectFromOp<V, M> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -652,7 +652,7 @@ public class VectorSupport {
     <V extends Vector<E>,
      M extends VectorMask<E>,
      E>
-    V blend(Class<? extends V> vClass, Class<M> mClass, Class<E> eClass,
+    V blend(Class<? extends V> vClass, Class<M> mClass, int laneType,
             int length,
             V v1, V v2, M m,
             VectorBlendOp<V, M> defaultImpl) {
@@ -673,7 +673,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     V broadcastInt(int opr,
-                   Class<? extends V> vClass, Class<? extends M> mClass, Class<E> eClass,
+                   Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
                    int length,
                    V v, int n, M m,
                    VectorBroadcastIntOp<V, M> defaultImpl) {
@@ -698,8 +698,8 @@ public class VectorSupport {
                     VIN extends VectorPayload,
                       S extends VectorSpecies<?>>
     VOUT convert(int oprId,
-              Class<?> fromVectorClass, Class<?> fromeClass, int fromVLen,
-              Class<?>   toVectorClass, Class<?>   toeClass, int   toVLen,
+              Class<?> fromVectorClass, int fromLaneType, int fromVLen,
+              Class<?>   toVectorClass, int toLaneType, int   toVLen,
               VIN v, S s,
               VectorConvertOp<VOUT, VIN, S> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -719,7 +719,7 @@ public class VectorSupport {
      M extends VectorMask<E>,
      E>
     VectorPayload compressExpandOp(int opr,
-                                   Class<? extends V> vClass, Class<? extends M> mClass, Class<E> eClass,
+                                   Class<? extends V> vClass, Class<? extends M> mClass, int laneType,
                                    int length, V v, M m,
                                    CompressExpandOperation<V, M> defaultImpl) {
         assert isNonCapturingLambda(defaultImpl) : defaultImpl;
@@ -748,7 +748,7 @@ public class VectorSupport {
     <M extends VectorMask<E>,
      E>
     long maskReductionCoerced(int oper,
-                              Class<? extends M> mClass, Class<?> eClass,
+                              Class<? extends M> mClass, int laneType,
                               int length,
                               M m,
                               VectorMaskOp<M> defaultImpl) {
diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java
index 70a79390828..d20f6311bca 100644
--- a/src/java.base/share/classes/module-info.java
+++ b/src/java.base/share/classes/module-info.java
@@ -274,7 +274,8 @@ module java.base {
         jdk.httpserver,
         jdk.jlink,
         jdk.jpackage,
-        jdk.net;
+        jdk.net,
+        jdk.security.auth;
     exports sun.net to
         java.net.http,
         jdk.naming.dns;
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 89ad0cc48ed..3a915cf96df 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1677,11 +1677,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                 if (method.equals("HEAD") || cl == 0 ||
                     respCode == HTTP_NOT_MODIFIED ||
                     respCode == HTTP_NO_CONTENT) {
-
-                    http.finished();
-                    http = null;
-                    inputStream = new EmptyInputStream();
-                    connected = false;
+                    noResponseBody();
                 }
 
                 if (respCode == 200 || respCode == 203 || respCode == 206 ||
@@ -1763,6 +1759,24 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
         }
     }
 
+    /**
+     * This method is called when a response with no response
+     * body is received, and arrange for the http client to
+     * be returned to the pool (or released) immediately when
+     * possible.
+     * @apiNote Used by {@link sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection}
+     * to preserve the TLS information after receiving an empty body.
+     * @implSpec
+     * Subclasses that override this method should call the super class
+     * implementation.
+     */
+    protected void noResponseBody() {
+        http.finished();
+        http = null;
+        inputStream = new EmptyInputStream();
+        connected = false;
+    }
+
     /*
      * Creates a chained exception that has the same type as
      * original exception and with the same message. Right now,
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
index 7bf8280a7ad..1415658e34d 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,7 @@ import sun.net.www.protocol.http.HttpCallerInfo;
 public abstract class AbstractDelegateHttpsURLConnection extends
         HttpURLConnection {
 
+    private SSLSession savedSession = null;
     protected AbstractDelegateHttpsURLConnection(URL url,
             sun.net.www.protocol.http.Handler handler) throws IOException {
         this(url, null, handler);
@@ -92,6 +93,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
     public void setNewClient (URL url, boolean useCache)
         throws IOException {
         int readTimeout = getReadTimeout();
+        savedSession = null;
         http = HttpsClient.New (getSSLSocketFactory(),
                                 url,
                                 getHostnameVerifier(),
@@ -184,6 +186,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
         if (!http.isCachedConnection() && http.needsTunneling()) {
             doTunneling();
         }
+        savedSession = null;
         ((HttpsClient)http).afterConnect();
     }
 
@@ -204,6 +207,19 @@ public abstract class AbstractDelegateHttpsURLConnection extends
                                useCache, connectTimeout, this);
     }
 
+    @Override
+    protected void noResponseBody() {
+        savedSession = ((HttpsClient)http).getSSLSession();
+        super.noResponseBody();
+    }
+
+    private SSLSession session() {
+        if (http instanceof HttpsClient https) {
+            return https.getSSLSession();
+        }
+        return savedSession;
+    }
+
     /**
      * Returns the cipher suite in use on this connection.
      */
@@ -211,11 +227,12 @@ public abstract class AbstractDelegateHttpsURLConnection extends
         if (cachedResponse != null) {
             return ((SecureCacheResponse)cachedResponse).getCipherSuite();
         }
-        if (http == null) {
+
+        var session = session();
+        if (session == null) {
             throw new IllegalStateException("connection not yet open");
-        } else {
-           return ((HttpsClient)http).getCipherSuite ();
         }
+        return session.getCipherSuite();
     }
 
     /**
@@ -231,11 +248,12 @@ public abstract class AbstractDelegateHttpsURLConnection extends
                 return l.toArray(new java.security.cert.Certificate[0]);
             }
         }
-        if (http == null) {
+
+        var session = session();
+        if (session == null) {
             throw new IllegalStateException("connection not yet open");
-        } else {
-            return (((HttpsClient)http).getLocalCertificates ());
         }
+        return session.getLocalCertificates();
     }
 
     /**
@@ -256,11 +274,11 @@ public abstract class AbstractDelegateHttpsURLConnection extends
             }
         }
 
-        if (http == null) {
+        var session = session();
+        if (session == null) {
             throw new IllegalStateException("connection not yet open");
-        } else {
-            return (((HttpsClient)http).getServerCertificates ());
         }
+        return session.getPeerCertificates();
     }
 
     /**
@@ -274,11 +292,11 @@ public abstract class AbstractDelegateHttpsURLConnection extends
             return ((SecureCacheResponse)cachedResponse).getPeerPrincipal();
         }
 
-        if (http == null) {
+        var session = session();
+        if (session == null) {
             throw new IllegalStateException("connection not yet open");
-        } else {
-            return (((HttpsClient)http).getPeerPrincipal());
         }
+        return getPeerPrincipal(session);
     }
 
     /**
@@ -291,11 +309,11 @@ public abstract class AbstractDelegateHttpsURLConnection extends
             return ((SecureCacheResponse)cachedResponse).getLocalPrincipal();
         }
 
-        if (http == null) {
+        var session = session();
+        if (session == null) {
             throw new IllegalStateException("connection not yet open");
-        } else {
-            return (((HttpsClient)http).getLocalPrincipal());
         }
+        return getLocalPrincipal(session);
     }
 
     SSLSession getSSLSession() {
@@ -307,11 +325,12 @@ public abstract class AbstractDelegateHttpsURLConnection extends
             }
         }
 
-        if (http == null) {
+        var session = session();
+        if (session == null) {
             throw new IllegalStateException("connection not yet open");
         }
 
-        return ((HttpsClient)http).getSSLSession();
+        return session;
     }
 
     /*
@@ -354,7 +373,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
         }
         HttpsClient https = (HttpsClient)http;
         try {
-            Certificate[] certs = https.getServerCertificates();
+            Certificate[] certs = https.getSSLSession().getPeerCertificates();
             if (certs[0] instanceof X509Certificate x509Cert) {
                 return new HttpCallerInfo(url, proxy, port, x509Cert, authenticator);
             }
@@ -372,7 +391,7 @@ public abstract class AbstractDelegateHttpsURLConnection extends
         }
         HttpsClient https = (HttpsClient)http;
         try {
-            Certificate[] certs = https.getServerCertificates();
+            Certificate[] certs = https.getSSLSession().getPeerCertificates();
             if (certs[0] instanceof X509Certificate x509Cert) {
                 return new HttpCallerInfo(url, x509Cert, authenticator);
             }
@@ -381,4 +400,58 @@ public abstract class AbstractDelegateHttpsURLConnection extends
         }
         return super.getHttpCallerInfo(url, authenticator);
     }
+
+    @Override
+    public void disconnect() {
+        super.disconnect();
+        savedSession = null;
+    }
+
+    /**
+     * Returns the principal with which the server authenticated
+     * itself, or throw a SSLPeerUnverifiedException if the
+     * server did not authenticate.
+     * @param session The {@linkplain #getSSLSession() SSL session}
+     */
+    private static Principal getPeerPrincipal(SSLSession session)
+            throws SSLPeerUnverifiedException
+    {
+        Principal principal;
+        try {
+            principal = session.getPeerPrincipal();
+        } catch (AbstractMethodError e) {
+            // if the provider does not support it, fallback to peer certs.
+            // return the X500Principal of the end-entity cert.
+            java.security.cert.Certificate[] certs =
+                    session.getPeerCertificates();
+            principal = ((X509Certificate)certs[0]).getSubjectX500Principal();
+        }
+        return principal;
+    }
+
+    /**
+     * Returns the principal the client sent to the
+     * server, or null if the client did not authenticate.
+     * @param session The {@linkplain #getSSLSession() SSL session}
+     */
+    private static Principal getLocalPrincipal(SSLSession session)
+    {
+        Principal principal;
+        try {
+            principal = session.getLocalPrincipal();
+        } catch (AbstractMethodError e) {
+            principal = null;
+            // if the provider does not support it, fallback to local certs.
+            // return the X500Principal of the end-entity cert.
+            java.security.cert.Certificate[] certs =
+                    session.getLocalCertificates();
+            if (certs != null) {
+                principal = ((X509Certificate)certs[0]).getSubjectX500Principal();
+            }
+        }
+        return principal;
+    }
+
+
+
 }
diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
index 9f1d7b07021..f5804cd83bd 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -599,75 +599,6 @@ final class HttpsClient extends HttpClient
         }
     }
 
-    /**
-     * Returns the cipher suite in use on this connection.
-     */
-    String getCipherSuite() {
-        return session.getCipherSuite();
-    }
-
-    /**
-     * Returns the certificate chain the client sent to the
-     * server, or null if the client did not authenticate.
-     */
-    public java.security.cert.Certificate [] getLocalCertificates() {
-        return session.getLocalCertificates();
-    }
-
-    /**
-     * Returns the certificate chain with which the server
-     * authenticated itself, or throw a SSLPeerUnverifiedException
-     * if the server did not authenticate.
-     */
-    java.security.cert.Certificate [] getServerCertificates()
-            throws SSLPeerUnverifiedException
-    {
-        return session.getPeerCertificates();
-    }
-
-    /**
-     * Returns the principal with which the server authenticated
-     * itself, or throw a SSLPeerUnverifiedException if the
-     * server did not authenticate.
-     */
-    Principal getPeerPrincipal()
-            throws SSLPeerUnverifiedException
-    {
-        Principal principal;
-        try {
-            principal = session.getPeerPrincipal();
-        } catch (AbstractMethodError e) {
-            // if the provider does not support it, fallback to peer certs.
-            // return the X500Principal of the end-entity cert.
-            java.security.cert.Certificate[] certs =
-                        session.getPeerCertificates();
-            principal = ((X509Certificate)certs[0]).getSubjectX500Principal();
-        }
-        return principal;
-    }
-
-    /**
-     * Returns the principal the client sent to the
-     * server, or null if the client did not authenticate.
-     */
-    Principal getLocalPrincipal()
-    {
-        Principal principal;
-        try {
-            principal = session.getLocalPrincipal();
-        } catch (AbstractMethodError e) {
-            principal = null;
-            // if the provider does not support it, fallback to local certs.
-            // return the X500Principal of the end-entity cert.
-            java.security.cert.Certificate[] certs =
-                        session.getLocalCertificates();
-            if (certs != null) {
-                principal = ((X509Certificate)certs[0]).getSubjectX500Principal();
-            }
-        }
-        return principal;
-    }
-
     /**
      * Returns the {@code SSLSession} in use on this connection.
      */
diff --git a/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java b/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
index d30d18df9d6..7e4a6cb90d4 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,12 @@ import java.net.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.security.cert.Certificate;
 import java.util.*;
 import java.util.jar.*;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipEntry;
 import java.security.CodeSigner;
-import java.security.cert.Certificate;
 import sun.net.www.ParseUtil;
 
 /* URL jar file is a common JarFile subtype used for JarURLConnection */
@@ -172,6 +172,7 @@ public class URLJarFile extends JarFile {
             this.je = je;
         }
 
+        @Override
         public Attributes getAttributes() throws IOException {
             if (URLJarFile.this.isSuperMan()) {
                 Map<String, Attributes> e = URLJarFile.this.superEntries;
@@ -184,14 +185,28 @@ public class URLJarFile extends JarFile {
             return null;
         }
 
-        public java.security.cert.Certificate[] getCertificates() {
-            Certificate[] certs = je.getCertificates();
-            return certs == null? null: certs.clone();
+        @Override
+        public Certificate[] getCertificates() {
+            // super.getCertificates() returns Certificates that were
+            // captured by reading the "JarEntry.certs" field when
+            // the super instance was created. Some JarEntry
+            // implementations (like java.util.jar.JarFile$JarFileEntry)
+            // compute certificates lazily, so we explicitly
+            // call getCertificates() on the underlying JarEntry instead of
+            // super.getCertificates()
+            return je.getCertificates();
         }
 
+        @Override
         public CodeSigner[] getCodeSigners() {
-            CodeSigner[] csg = je.getCodeSigners();
-            return csg == null? null: csg.clone();
+            // super.getCodeSigners() returns CodeSigners that were
+            // captured by reading the "JarEntry.signers" field when
+            // the super instance was created. Some JarEntry
+            // implementations (like java.util.jar.JarFile$JarFileEntry)
+            // compute codesigners lazily, so we explicitly
+            // call getCodeSigners() on the underlying JarEntry instead of
+            // super.getCodeSigners()
+            return je.getCodeSigners();
         }
     }
 
diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index afb312ed722..f5002e8b716 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -134,9 +134,9 @@ class DatagramChannelImpl
     private static final int ST_CLOSED = 3;
     private int state;
 
-    // IDs of native threads doing reads and writes, for signalling
-    private long readerThread;
-    private long writerThread;
+    // Threads doing reads and writes, for signalling
+    private Thread readerThread;
+    private Thread writerThread;
 
     // Local and remote (connected) address
     private InetSocketAddress localAddress;
@@ -523,7 +523,7 @@ class DatagramChannelImpl
             if (localAddress == null)
                 bindInternal(null);
             if (blocking)
-                readerThread = NativeThread.current();
+                readerThread = NativeThread.threadToSignal();
         }
         return remote;
     }
@@ -538,7 +538,7 @@ class DatagramChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                readerThread = 0;
+                readerThread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
@@ -1030,7 +1030,7 @@ class DatagramChannelImpl
             if (localAddress == null)
                 bindInternal(null);
             if (blocking)
-                writerThread = NativeThread.current();
+                writerThread = NativeThread.threadToSignal();
         }
         return remote;
     }
@@ -1045,7 +1045,7 @@ class DatagramChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                writerThread = 0;
+                writerThread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
@@ -1714,7 +1714,7 @@ class DatagramChannelImpl
      */
     private boolean tryClose() throws IOException {
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-        if ((readerThread == 0) && (writerThread == 0) && !isRegistered()) {
+        if ((readerThread == null) && (writerThread == null) && !isRegistered()) {
             state = ST_CLOSED;
             try {
                 // close socket
diff --git a/src/java.base/share/classes/sun/nio/ch/IOUtil.java b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
index 45f8cb2e588..df6677ab94d 100644
--- a/src/java.base/share/classes/sun/nio/ch/IOUtil.java
+++ b/src/java.base/share/classes/sun/nio/ch/IOUtil.java
@@ -587,9 +587,11 @@ public final class IOUtil {
      */
     static native int drain1(int fd) throws IOException;
 
-    public static native void configureBlocking(FileDescriptor fd,
-                                                boolean blocking)
-        throws IOException;
+    static native void configureBlocking(int fd, boolean blocking) throws IOException;
+
+    public static void configureBlocking(FileDescriptor fd, boolean blocking) throws IOException {
+        configureBlocking(fdVal(fd), blocking);
+    }
 
     public static native int fdVal(FileDescriptor fd);
 
diff --git a/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java b/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
index 9b65310784a..63009b407ac 100644
--- a/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
+++ b/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
@@ -27,8 +27,6 @@ package sun.nio.ch;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
-import jdk.internal.access.JavaIOFileDescriptorAccess;
-import jdk.internal.access.SharedSecrets;
 
 /**
  * Allows different platforms to call different native methods
@@ -36,7 +34,6 @@ import jdk.internal.access.SharedSecrets;
  */
 
 abstract class NativeDispatcher {
-    private static final JavaIOFileDescriptorAccess JIOFDA = SharedSecrets.getJavaIOFileDescriptorAccess();
 
     abstract int read(FileDescriptor fd, long address, int len)
         throws IOException;
@@ -78,12 +75,17 @@ abstract class NativeDispatcher {
      * if a platform thread is blocked on the file descriptor then the file descriptor is
      * dup'ed to a special fd and the thread signalled so that the syscall fails with EINTR.
      */
-    final void preClose(FileDescriptor fd, long reader, long writer) throws IOException {
-        if (NativeThread.isVirtualThread(reader) || NativeThread.isVirtualThread(writer)) {
-            int fdVal = JIOFDA.get(fd);
-            Poller.stopPoll(fdVal);
+    final void preClose(FileDescriptor fd, Thread reader, Thread writer) throws IOException {
+        if (reader != null && reader.isVirtual()) {
+            NativeThread.signal(reader);  // unparks virtual thread
+            reader = null;
         }
-        if (NativeThread.isNativeThread(reader) || NativeThread.isNativeThread(writer)) {
+        if (writer != null && writer.isVirtual()) {
+            NativeThread.signal(writer);  // unparks virtual thread
+            writer = null;
+        }
+        // dup2 and signal platform threads
+        if (reader != null || writer != null) {
             implPreClose(fd, reader, writer);
         }
     }
@@ -92,8 +94,7 @@ abstract class NativeDispatcher {
      * This method does nothing by default. On Unix systems the file descriptor is dup'ed
      * to a special fd and native threads signalled.
      */
-
-    void implPreClose(FileDescriptor fd, long reader, long writer) throws IOException {
+    void implPreClose(FileDescriptor fd, Thread reader, Thread writer) throws IOException {
         // Do nothing by default; this is only needed on Unix
     }
 
diff --git a/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java b/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java
index 079291572a8..c5423141789 100644
--- a/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java
+++ b/src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,9 @@ class NativeThreadSet {
     private static final int OTHER_THREAD_INDEX = -99;
 
     private final int initialCapacity;
-    private long[] threads;             // array of thread handles, created lazily
-    private int used;                   // number of thread handles in threads array
-    private int otherThreads;           // count of threads without a native thread handle
+    private Thread[] threads;     // array of platform threads, created lazily
+    private int used;             // number of elements in threads array
+    private int otherThreads;     // additional threads that can't be signalled
     private boolean waitingToEmpty;
 
     NativeThreadSet(int n) {
@@ -45,28 +45,28 @@ class NativeThreadSet {
      * it can efficiently be removed later.
      */
     int add() {
-        long th = NativeThread.current();
         synchronized (this) {
-            if (!NativeThread.isNativeThread(th)) {
+            final Thread t = NativeThread.threadToSignal();
+            if (t == null || t.isVirtual()) {
                 otherThreads++;
                 return OTHER_THREAD_INDEX;
             }
 
-            // add native thread handle to array, creating or growing array if needed
+            // add platform threads to array, creating or growing array if needed
             int start = 0;
             if (threads == null) {
-                threads = new long[initialCapacity];
+                threads = new Thread[initialCapacity];
             } else if (used >= threads.length) {
                 int on = threads.length;
                 int nn = on * 2;
-                long[] nthreads = new long[nn];
+                Thread[] nthreads = new Thread[nn];
                 System.arraycopy(threads, 0, nthreads, 0, on);
                 threads = nthreads;
                 start = on;
             }
             for (int i = start; i < threads.length; i++) {
-                if (threads[i] == 0) {
-                    threads[i] = th;
+                if (threads[i] == null) {
+                    threads[i] = t;
                     used++;
                     return i;
                 }
@@ -81,8 +81,7 @@ class NativeThreadSet {
     void remove(int i) {
         synchronized (this) {
             if (i >= 0) {
-                assert threads[i] == NativeThread.current();
-                threads[i] = 0;
+                threads[i] = null;
                 used--;
             } else if (i == OTHER_THREAD_INDEX) {
                 otherThreads--;
@@ -104,9 +103,9 @@ class NativeThreadSet {
         while (used > 0 || otherThreads > 0) {
             int u = used, i = 0;
             while (u > 0 && i < threads.length) {
-                long th = threads[i];
-                if (th != 0) {
-                    NativeThread.signal(th);
+                Thread t = threads[i];
+                if (t != null) {
+                    NativeThread.signal(t);
                     u--;
                 }
                 i++;
diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
index 01f894be227..58b3bc7aaba 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -103,8 +103,8 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
     private volatile boolean nonBlocking;
 
     // used by connect/read/write/accept, protected by stateLock
-    private long readerThread;
-    private long writerThread;
+    private Thread readerThread;
+    private Thread writerThread;
 
     // used when SO_REUSEADDR is emulated, protected by stateLock
     private boolean isReuseAddress;
@@ -218,7 +218,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
     private FileDescriptor beginRead() throws SocketException {
         synchronized (stateLock) {
             ensureOpenAndConnected();
-            readerThread = NativeThread.current();
+            readerThread = NativeThread.threadToSignal();
             return fd;
         }
     }
@@ -229,7 +229,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
      */
     private void endRead(boolean completed) throws SocketException {
         synchronized (stateLock) {
-            readerThread = 0;
+            readerThread = null;
             int state = this.state;
             if (state == ST_CLOSING)
                 tryFinishClose();
@@ -370,7 +370,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
     private FileDescriptor beginWrite() throws SocketException {
         synchronized (stateLock) {
             ensureOpenAndConnected();
-            writerThread = NativeThread.current();
+            writerThread = NativeThread.threadToSignal();
             return fd;
         }
     }
@@ -381,7 +381,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
      */
     private void endWrite(boolean completed) throws SocketException {
         synchronized (stateLock) {
-            writerThread = 0;
+            writerThread = null;
             int state = this.state;
             if (state == ST_CLOSING)
                 tryFinishClose();
@@ -511,7 +511,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             this.address = address;
             this.port = port;
 
-            readerThread = NativeThread.current();
+            readerThread = NativeThread.threadToSignal();
             return fd;
         }
     }
@@ -522,7 +522,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
      */
     private void endConnect(FileDescriptor fd, boolean completed) throws IOException {
         synchronized (stateLock) {
-            readerThread = 0;
+            readerThread = null;
             int state = this.state;
             if (state == ST_CLOSING)
                 tryFinishClose();
@@ -666,7 +666,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             ensureOpen();
             if (localport == 0)
                 throw new SocketException("Not bound");
-            readerThread = NativeThread.current();
+            readerThread = NativeThread.threadToSignal();
             return fd;
         }
     }
@@ -678,7 +678,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
     private void endAccept(boolean completed) throws SocketException {
         synchronized (stateLock) {
             int state = this.state;
-            readerThread = 0;
+            readerThread = null;
             if (state == ST_CLOSING)
                 tryFinishClose();
             if (!completed && state >= ST_CLOSING)
@@ -844,7 +844,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
      */
     private boolean tryClose() throws IOException {
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-        if (readerThread == 0 && writerThread == 0) {
+        if (readerThread == null && writerThread == null) {
             try {
                 cleaner.clean();
             } catch (UncheckedIOException ioe) {
@@ -1143,8 +1143,8 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             ensureOpenAndConnected();
             if (!isInputClosed) {
                 Net.shutdown(fd, Net.SHUT_RD);
-                if (NativeThread.isVirtualThread(readerThread)) {
-                    Poller.stopPoll(fdVal(fd), Net.POLLIN);
+                if (readerThread != null && readerThread.isVirtual()) {
+                    Poller.stopPoll(readerThread);
                 }
                 isInputClosed = true;
             }
@@ -1157,8 +1157,8 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             ensureOpenAndConnected();
             if (!isOutputClosed) {
                 Net.shutdown(fd, Net.SHUT_WR);
-                if (NativeThread.isVirtualThread(writerThread)) {
-                    Poller.stopPoll(fdVal(fd), Net.POLLOUT);
+                if (writerThread != null && writerThread.isVirtual()) {
+                    Poller.stopPoll(writerThread);
                 }
                 isOutputClosed = true;
             }
diff --git a/src/java.base/share/classes/sun/nio/ch/Poller.java b/src/java.base/share/classes/sun/nio/ch/Poller.java
index 4a2cb4d8fdf..9360bcc8327 100644
--- a/src/java.base/share/classes/sun/nio/ch/Poller.java
+++ b/src/java.base/share/classes/sun/nio/ch/Poller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,61 +25,107 @@
 package sun.nio.ch;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.ref.Reference;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.locks.LockSupport;
 import java.util.function.BooleanSupplier;
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.InnocuousThread;
+import jdk.internal.misc.TerminatingThreadLocal;
+import jdk.internal.vm.Continuation;
+import jdk.internal.vm.ContinuationSupport;
 import jdk.internal.vm.annotation.Stable;
 
 /**
- * Polls file descriptors. Virtual threads invoke the poll method to park
- * until a given file descriptor is ready for I/O.
+ * I/O poller to allow virtual threads park until a file descriptor is ready for I/O.
  */
 public abstract class Poller {
-    private static final Pollers POLLERS;
-    static {
-        try {
-            var pollers = new Pollers();
-            pollers.start();
-            POLLERS = pollers;
-        } catch (IOException ioe) {
-            throw new ExceptionInInitializerError(ioe);
-        }
-    }
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
 
-    // the poller or sub-poller thread
+    // the poller group for the I/O pollers and poller threads
+    private static final PollerGroup POLLER_GROUP = createPollerGroup();
+
+    // the poller or sub-poller thread (used for observability only)
     private @Stable Thread owner;
 
     // maps file descriptors to parked Thread
     private final Map<Integer, Thread> map = new ConcurrentHashMap<>();
 
+    // shutdown (if supported by poller group)
+    private volatile boolean shutdown;
+
     /**
      * Poller mode.
      */
     enum Mode {
         /**
-         * ReadPoller and WritePoller are dedicated platform threads that block waiting
-         * for events and unpark virtual threads when file descriptors are ready for I/O.
+         * Read and write pollers are platform threads that block waiting for events and
+         * unpark virtual threads when file descriptors are ready for I/O.
          */
         SYSTEM_THREADS,
 
         /**
-         * ReadPoller and WritePoller threads are virtual threads that poll for events,
-         * yielding between polls and unparking virtual threads when file descriptors are
+         * Read and write pollers are virtual threads that poll for events, yielding
+         * between polls and unparking virtual threads when file descriptors are
          * ready for I/O. If there are no events then the poller threads park until there
          * are I/O events to poll. This mode helps to integrate polling with virtual
          * thread scheduling. The approach is similar to the default scheme in "User-level
          * Threading: Have Your Cake and Eat It Too" by Karsten and Barghi 2020
          * (https://dl.acm.org/doi/10.1145/3379483).
          */
-        VTHREAD_POLLERS
+        VTHREAD_POLLERS,
+
+        /**
+         * Read pollers are per-carrier virtual threads that poll for events, yielding
+         * between polls and unparking virtual threads when file descriptors are ready
+         * for I/O. If there are no events then the poller threads park until there
+         * are I/O events to poll. The write poller is a system-wide platform thread.
+         */
+        POLLER_PER_CARRIER
+    }
+
+    /**
+     * Create and return the PollerGroup.
+     */
+    private static PollerGroup createPollerGroup() {
+        try {
+            PollerProvider provider;
+            if (System.getProperty("jdk.pollerMode") instanceof String s) {
+                Mode mode = switch (s) {
+                    case "1" -> Mode.SYSTEM_THREADS;
+                    case "2" -> Mode.VTHREAD_POLLERS;
+                    case "3" -> Mode.POLLER_PER_CARRIER;
+                    default -> {
+                        throw new RuntimeException(s + " is not a valid polling mode");
+                    }
+                };
+                provider = PollerProvider.createProvider(mode);
+            } else {
+                provider = PollerProvider.createProvider();
+            }
+
+            int readPollers = pollerCount("jdk.readPollers", provider.defaultReadPollers());
+            int writePollers = pollerCount("jdk.writePollers", provider.defaultWritePollers());
+            PollerGroup group = switch (provider.pollerMode()) {
+                case SYSTEM_THREADS     -> new SystemThreadsPollerGroup(provider, readPollers, writePollers);
+                case VTHREAD_POLLERS    -> new VThreadsPollerGroup(provider, readPollers, writePollers);
+                case POLLER_PER_CARRIER -> new PollerPerCarrierPollerGroup(provider, writePollers);
+            };
+            group.start();
+            return group;
+        } catch (IOException ioe) {
+            throw new UncheckedIOException(ioe);
+        }
     }
 
     /**
@@ -89,9 +135,34 @@ public abstract class Poller {
     }
 
     /**
-     * Returns the poller's file descriptor, used when the read and write poller threads
-     * are virtual threads.
-     *
+     * Closes the poller and release resources. This method can only be used to cleanup
+     * when creating a poller group fails.
+     */
+    abstract void close() throws IOException;
+
+    /**
+     * Sets the poller's thread owner.
+     */
+    private void setOwner() {
+        owner = Thread.currentThread();
+    }
+
+    /**
+     * Returns true if this poller is marked for shutdown.
+     */
+    boolean isShutdown() {
+        return shutdown;
+    }
+
+    /**
+     * Marks this poller for shutdown.
+     */
+    private void setShutdown() {
+        shutdown = true;
+    }
+
+    /**
+     * Returns the poller's file descriptor to use when polling with the master poller.
      * @throws UnsupportedOperationException if not supported
      */
     int fdVal() {
@@ -99,16 +170,18 @@ public abstract class Poller {
     }
 
     /**
-     * Register the file descriptor. The registration is "one shot", meaning it should
-     * be polled at most once.
+     * Register the file descriptor with the I/O event management facility so that it is
+     * polled when the file descriptor is ready for I/O. The registration is "one shot",
+     * meaning it should be polled at most once.
      */
-    abstract void implRegister(int fdVal) throws IOException;
+    abstract void implStartPoll(int fdVal) throws IOException;
 
     /**
-     * Deregister the file descriptor.
+     * Deregister a file descriptor from the I/O event management facility. This may be
+     * a no-op in some implementations when the file descriptor has already been polled.
      * @param polled true if the file descriptor has already been polled
      */
-    abstract void implDeregister(int fdVal, boolean polled);
+    abstract void implStopPoll(int fdVal, boolean polled) throws IOException;
 
     /**
      * Poll for events. The {@link #polled(int)} method is invoked for each
@@ -116,15 +189,26 @@ public abstract class Poller {
      *
      * @param timeout if positive then block for up to {@code timeout} milliseconds,
      *     if zero then don't block, if -1 then block indefinitely
-     * @return the number of file descriptors polled
+     * @return >0 if file descriptors are polled, 0 if no file descriptor polled
      */
     abstract int poll(int timeout) throws IOException;
 
+    /**
+     * Wakeup the poller thread if blocked in poll so it can shutdown.
+     * @throws UnsupportedOperationException if not supported
+     */
+    void wakeupPoller() throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Callback by the poll method when a file descriptor is polled.
      */
     final void polled(int fdVal) {
-        wakeup(fdVal);
+        Thread t = map.remove(fdVal);
+        if (t != null) {
+            LockSupport.unpark(t);
+        }
     }
 
     /**
@@ -132,19 +216,10 @@ public abstract class Poller {
      * @param fdVal the file descriptor
      * @param event POLLIN or POLLOUT
      * @param nanos the waiting time or 0 to wait indefinitely
-     * @param supplier supplies a boolean to indicate if the enclosing object is open
+     * @param isOpen supplies a boolean to indicate if the enclosing object is open
      */
-    static void poll(int fdVal, int event, long nanos, BooleanSupplier supplier)
-        throws IOException
-    {
-        assert nanos >= 0L;
-        if (event == Net.POLLIN) {
-            POLLERS.readPoller(fdVal).poll(fdVal, nanos, supplier);
-        } else if (event == Net.POLLOUT) {
-            POLLERS.writePoller(fdVal).poll(fdVal, nanos, supplier);
-        } else {
-            assert false;
-        }
+    public static void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException {
+        POLLER_GROUP.poll(fdVal, event, nanos, isOpen);
     }
 
     /**
@@ -152,45 +227,24 @@ public abstract class Poller {
      * @param fdVal the Selector's file descriptor
      * @param nanos the waiting time or 0 to wait indefinitely
      */
-    static void pollSelector(int fdVal, long nanos) throws IOException {
-        assert nanos >= 0L;
-        Poller poller = POLLERS.masterPoller();
-        if (poller == null) {
-            poller = POLLERS.readPoller(fdVal);
-        }
-        poller.poll(fdVal, nanos, () -> true);
+    public static void pollSelector(int fdVal, long nanos) throws IOException {
+        POLLER_GROUP.pollSelector(fdVal, nanos);
     }
 
     /**
-     * If there is a thread polling the given file descriptor for the given event then
-     * the thread is unparked.
+     * Unpark the given thread so that it stops polling.
      */
-    static void stopPoll(int fdVal, int event) {
-        if (event == Net.POLLIN) {
-            POLLERS.readPoller(fdVal).wakeup(fdVal);
-        } else if (event == Net.POLLOUT) {
-            POLLERS.writePoller(fdVal).wakeup(fdVal);
-        } else {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /**
-     * If there are any threads polling the given file descriptor then they are unparked.
-     */
-    static void stopPoll(int fdVal) {
-        stopPoll(fdVal, Net.POLLIN);
-        stopPoll(fdVal, Net.POLLOUT);
+    public static void stopPoll(Thread thread) {
+        LockSupport.unpark(thread);
     }
 
     /**
      * Parks the current thread until a file descriptor is ready.
      */
-    private void poll(int fdVal, long nanos, BooleanSupplier supplier) throws IOException {
-        register(fdVal);
+    private void poll(int fdVal, long nanos, BooleanSupplier isOpen) throws IOException {
+        startPoll(fdVal);
         try {
-            boolean isOpen = supplier.getAsBoolean();
-            if (isOpen) {
+            if (isOpen.getAsBoolean() && !isShutdown()) {
                 if (nanos > 0) {
                     LockSupport.parkNanos(nanos);
                 } else {
@@ -198,42 +252,38 @@ public abstract class Poller {
                 }
             }
         } finally {
-            deregister(fdVal);
+            stopPoll(fdVal);
         }
     }
 
     /**
-     * Registers the file descriptor to be polled at most once when the file descriptor
-     * is ready for I/O.
+     * Register a file descriptor with the I/O event management facility so that it is
+     * polled when the file descriptor is ready for I/O.
      */
-    private void register(int fdVal) throws IOException {
+    private void startPoll(int fdVal) throws IOException {
         Thread previous = map.put(fdVal, Thread.currentThread());
         assert previous == null;
         try {
-            implRegister(fdVal);
+            implStartPoll(fdVal);
         } catch (Throwable t) {
             map.remove(fdVal);
             throw t;
+        } finally {
+            Reference.reachabilityFence(this);
         }
     }
 
     /**
-     * Deregister the file descriptor so that the file descriptor is not polled.
+     * Deregister a file descriptor from the I/O event management facility.
      */
-    private void deregister(int fdVal) {
+    private void stopPoll(int fdVal) throws IOException {
         Thread previous = map.remove(fdVal);
         boolean polled = (previous == null);
         assert polled || previous == Thread.currentThread();
-        implDeregister(fdVal, polled);
-    }
-
-    /**
-     * Unparks any thread that is polling the given file descriptor.
-     */
-    private void wakeup(int fdVal) {
-        Thread t = map.remove(fdVal);
-        if (t != null) {
-            LockSupport.unpark(t);
+        try {
+            implStopPoll(fdVal, polled);
+        } finally {
+            Reference.reachabilityFence(this);
         }
     }
 
@@ -242,9 +292,9 @@ public abstract class Poller {
      * descriptor that is polled.
      */
     private void pollerLoop() {
-        owner = Thread.currentThread();
+        setOwner();
         try {
-            for (;;) {
+            while (!isShutdown()) {
                 poll(-1);
             }
         } catch (Exception e) {
@@ -263,10 +313,10 @@ public abstract class Poller {
      */
     private void subPollerLoop(Poller masterPoller) {
         assert Thread.currentThread().isVirtual();
-        owner = Thread.currentThread();
+        setOwner();
         try {
             int polled = 0;
-            for (;;) {
+            while (!isShutdown()) {
                 if (polled == 0) {
                     masterPoller.poll(fdVal(), 0, () -> true);  // park
                 } else {
@@ -280,194 +330,463 @@ public abstract class Poller {
     }
 
     /**
-     * Returns the number I/O operations currently registered with this poller.
+     * Unparks all threads waiting on a file descriptor registered with this poller.
      */
-    public int registered() {
-        return map.size();
+    private void wakeupAll() {
+        map.values().forEach(LockSupport::unpark);
     }
 
     @Override
     public String toString() {
         return String.format("%s [registered = %d, owner = %s]",
-                Objects.toIdentityString(this), registered(), owner);
+            Objects.toIdentityString(this), map.size(), owner);
     }
 
     /**
-     * The Pollers used for read and write events.
+     * A group of poller threads that support virtual threads polling file descriptors.
      */
-    private static class Pollers {
+    private static abstract class PollerGroup {
         private final PollerProvider provider;
-        private final Poller.Mode pollerMode;
-        private final Poller masterPoller;
-        private final Poller[] readPollers;
-        private final Poller[] writePollers;
-
-        // used by start method to executor is kept alive
-        private Executor executor;
-
-        /**
-         * Creates the Poller instances based on configuration.
-         */
-        Pollers() throws IOException {
-            PollerProvider provider = PollerProvider.provider();
-            Poller.Mode mode;
-            String s = System.getProperty("jdk.pollerMode");
-            if (s != null) {
-                if (s.equalsIgnoreCase(Mode.SYSTEM_THREADS.name()) || s.equals("1")) {
-                    mode = Mode.SYSTEM_THREADS;
-                } else if (s.equalsIgnoreCase(Mode.VTHREAD_POLLERS.name()) || s.equals("2")) {
-                    mode = Mode.VTHREAD_POLLERS;
-                } else {
-                    throw new RuntimeException("Can't parse '" + s + "' as polling mode");
-                }
-            } else {
-                mode = provider.defaultPollerMode();
-            }
-
-            // vthread poller mode needs a master poller
-            Poller masterPoller = (mode == Mode.VTHREAD_POLLERS)
-                    ? provider.readPoller(false)
-                    : null;
-
-            // read pollers (or sub-pollers)
-            int readPollerCount = pollerCount("jdk.readPollers", provider.defaultReadPollers(mode));
-            Poller[] readPollers = new Poller[readPollerCount];
-            for (int i = 0; i < readPollerCount; i++) {
-                readPollers[i] = provider.readPoller(mode == Mode.VTHREAD_POLLERS);
-            }
-
-            // write pollers (or sub-pollers)
-            int writePollerCount = pollerCount("jdk.writePollers", provider.defaultWritePollers(mode));
-            Poller[] writePollers = new Poller[writePollerCount];
-            for (int i = 0; i < writePollerCount; i++) {
-                writePollers[i] = provider.writePoller(mode == Mode.VTHREAD_POLLERS);
-            }
 
+        PollerGroup(PollerProvider provider) {
             this.provider = provider;
-            this.pollerMode = mode;
-            this.masterPoller = masterPoller;
-            this.readPollers = readPollers;
-            this.writePollers = writePollers;
+        }
+
+        final PollerProvider provider() {
+            return provider;
         }
 
         /**
-         * Starts the Poller threads.
+         * Starts the poller group and any system-wide poller threads.
          */
-        void start() {
-            if (pollerMode == Mode.VTHREAD_POLLERS) {
-                startPlatformThread("MasterPoller", masterPoller::pollerLoop);
-                ThreadFactory factory = Thread.ofVirtual()
-                        .inheritInheritableThreadLocals(false)
-                        .name("SubPoller-", 0)
-                        .uncaughtExceptionHandler((t, e) -> e.printStackTrace())
-                        .factory();
-                executor = Executors.newThreadPerTaskExecutor(factory);
-                Arrays.stream(readPollers).forEach(p -> {
-                    executor.execute(() -> p.subPollerLoop(masterPoller));
-                });
-                Arrays.stream(writePollers).forEach(p -> {
-                    executor.execute(() -> p.subPollerLoop(masterPoller));
-                });
-            } else {
-                Arrays.stream(readPollers).forEach(p -> {
-                    startPlatformThread("Read-Poller", p::pollerLoop);
-                });
-                Arrays.stream(writePollers).forEach(p -> {
-                    startPlatformThread("Write-Poller", p::pollerLoop);
-                });
-            }
-        }
+        abstract void start();
 
         /**
-         * Returns the master poller, or null if there is no master poller.
+         * Parks the current thread until a file descriptor is ready for the given op.
          */
-        Poller masterPoller() {
-            return masterPoller;
-        }
+        abstract void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException;
 
         /**
-         * Returns the read poller for the given file descriptor.
+         * Parks the current thread until a Selector's file descriptor is ready.
          */
-        Poller readPoller(int fdVal) {
-            int index = provider.fdValToIndex(fdVal, readPollers.length);
-            return readPollers[index];
-        }
-
-        /**
-         * Returns the write poller for the given file descriptor.
-         */
-        Poller writePoller(int fdVal) {
-            int index = provider.fdValToIndex(fdVal, writePollers.length);
-            return writePollers[index];
-        }
-
-        /**
-         * Return the list of read pollers.
-         */
-        List<Poller> readPollers() {
-            return List.of(readPollers);
-        }
-
-        /**
-         * Return the list of write pollers.
-         */
-        List<Poller> writePollers() {
-            return List.of(writePollers);
-        }
-
-
-        /**
-         * Reads the given property name to get the poller count. If the property is
-         * set then the value must be a power of 2. Returns 1 if the property is not
-         * set.
-         * @throws IllegalArgumentException if the property is set to a value that
-         * is not a power of 2.
-         */
-        private static int pollerCount(String propName, int defaultCount) {
-            String s = System.getProperty(propName);
-            int count = (s != null) ? Integer.parseInt(s) : defaultCount;
-
-            // check power of 2
-            if (count != Integer.highestOneBit(count)) {
-                String msg = propName + " is set to a value that is not a power of 2";
-                throw new IllegalArgumentException(msg);
-            }
-            return count;
+        void pollSelector(int fdVal, long nanos) throws IOException {
+            poll(fdVal, Net.POLLIN, nanos, () -> true);
         }
 
         /**
          * Starts a platform thread to run the given task.
          */
-        private void startPlatformThread(String name, Runnable task) {
-            try {
-                Thread thread = InnocuousThread.newSystemThread(name, task);
-                thread.setDaemon(true);
-                thread.setUncaughtExceptionHandler((t, e) -> e.printStackTrace());
-                thread.start();
-            } catch (Exception e) {
-                throw new InternalError(e);
+        protected final void startPlatformThread(String name, Runnable task) {
+            Thread thread = InnocuousThread.newSystemThread(name, task);
+            thread.setDaemon(true);
+            thread.setUncaughtExceptionHandler((t, e) -> e.printStackTrace());
+            thread.start();
+        }
+
+        /**
+         * Return the master poller, or null if no master poller.
+         */
+        abstract Poller masterPoller();
+
+        /**
+         * Return the read pollers.
+         */
+        abstract List<Poller> readPollers();
+
+        /**
+         * Return the write pollers.
+         */
+        abstract List<Poller> writePollers();
+
+        /**
+         * Close the given pollers.
+         */
+        static void closeAll(Poller... pollers) {
+            for (Poller poller : pollers) {
+                if (poller != null) {
+                    try {
+                        poller.close();
+                    } catch (IOException _) { }
+                }
             }
         }
     }
 
+    /**
+     * SYSTEM_THREADS poller group. The read and write pollers are system-wide platform threads.
+     */
+    private static class SystemThreadsPollerGroup extends PollerGroup {
+        // system-wide read and write pollers
+        private final Poller[] readPollers;
+        private final Poller[] writePollers;
+
+        SystemThreadsPollerGroup(PollerProvider provider,
+                                 int readPollerCount,
+                                 int writePollerCount) throws IOException {
+            super(provider);
+            Poller[] readPollers = new Poller[readPollerCount];
+            Poller[] writePollers = new Poller[writePollerCount];
+            try {
+                for (int i = 0; i < readPollerCount; i++) {
+                    readPollers[i] = provider.readPoller(false);
+                }
+                for (int i = 0; i < writePollerCount; i++) {
+                    writePollers[i] = provider.writePoller(false);
+                }
+            } catch (Throwable e) {
+                closeAll(readPollers);
+                closeAll(writePollers);
+                throw e;
+            }
+
+            this.readPollers = readPollers;
+            this.writePollers = writePollers;
+        }
+
+        @Override
+        void start() {
+            Arrays.stream(readPollers).forEach(p -> {
+                startPlatformThread("Read-Poller", p::pollerLoop);
+            });
+            Arrays.stream(writePollers).forEach(p -> {
+                startPlatformThread("Write-Poller", p::pollerLoop);
+            });
+        }
+
+        private Poller readPoller(int fdVal) {
+            int index = provider().fdValToIndex(fdVal, readPollers.length);
+            return readPollers[index];
+        }
+
+        private Poller writePoller(int fdVal) {
+            int index = provider().fdValToIndex(fdVal, writePollers.length);
+            return writePollers[index];
+        }
+
+        @Override
+        void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException {
+            Poller poller = (event == Net.POLLIN)
+                    ? readPoller(fdVal)
+                    : writePoller(fdVal);
+            poller.poll(fdVal, nanos, isOpen);
+        }
+
+        @Override
+        Poller masterPoller() {
+            return null;
+        }
+
+        @Override
+        List<Poller> readPollers() {
+            return List.of(readPollers);
+        }
+
+        @Override
+        List<Poller> writePollers() {
+            return List.of(writePollers);
+        }
+    }
+
+    /**
+     * VTHREAD_POLLERS poller group. The read and write pollers are virtual threads.
+     * When read and write pollers need to block then they register with a system-wide
+     * "master poller" that runs in a dedicated platform thread.
+     */
+    private static class VThreadsPollerGroup extends PollerGroup {
+        private final Poller masterPoller;
+        private final Poller[] readPollers;
+        private final Poller[] writePollers;
+
+        // keep virtual thread pollers alive
+        private final Executor executor;
+
+        VThreadsPollerGroup(PollerProvider provider,
+                            int readPollerCount,
+                            int writePollerCount) throws IOException {
+            super(provider);
+            Poller masterPoller = provider.readPoller(false);
+            Poller[] readPollers = new Poller[readPollerCount];
+            Poller[] writePollers = new Poller[writePollerCount];
+
+            try {
+                for (int i = 0; i < readPollerCount; i++) {
+                    readPollers[i] = provider.readPoller(true);
+                }
+                for (int i = 0; i < writePollerCount; i++) {
+                    writePollers[i] = provider.writePoller(true);
+                }
+            } catch (Throwable e) {
+                masterPoller.close();
+                closeAll(readPollers);
+                closeAll(writePollers);
+                throw e;
+            }
+
+            this.masterPoller = masterPoller;
+            this.readPollers = readPollers;
+            this.writePollers = writePollers;
+
+            ThreadFactory factory = Thread.ofVirtual()
+                    .inheritInheritableThreadLocals(false)
+                    .name("SubPoller-", 0)
+                    .uncaughtExceptionHandler((_, e) -> e.printStackTrace())
+                    .factory();
+            this.executor = Executors.newThreadPerTaskExecutor(factory);
+        }
+
+        @Override
+        void start() {
+            startPlatformThread("Master-Poller", masterPoller::pollerLoop);
+            Arrays.stream(readPollers).forEach(p -> {
+                executor.execute(() -> p.subPollerLoop(masterPoller));
+            });
+            Arrays.stream(writePollers).forEach(p -> {
+                executor.execute(() -> p.subPollerLoop(masterPoller));
+            });
+        }
+
+        private Poller readPoller(int fdVal) {
+            int index = provider().fdValToIndex(fdVal, readPollers.length);
+            return readPollers[index];
+        }
+
+        private Poller writePoller(int fdVal) {
+            int index = provider().fdValToIndex(fdVal, writePollers.length);
+            return writePollers[index];
+        }
+
+        @Override
+        void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException {
+            Poller poller = (event == Net.POLLIN)
+                    ? readPoller(fdVal)
+                    : writePoller(fdVal);
+            poller.poll(fdVal, nanos, isOpen);
+        }
+
+        @Override
+        void pollSelector(int fdVal, long nanos) throws IOException {
+            masterPoller.poll(fdVal, nanos, () -> true);
+        }
+
+        @Override
+        Poller masterPoller() {
+            return masterPoller;
+        }
+
+        @Override
+        List<Poller> readPollers() {
+            return List.of(readPollers);
+        }
+
+        @Override
+        List<Poller> writePollers() {
+            return List.of(writePollers);
+        }
+    }
+
+    /**
+     * POLLER_PER_CARRIER poller group. The read poller is a per-carrier virtual thread.
+     * When a virtual thread polls a file descriptor for POLLIN, then it will use (almost
+     * always, not guaranteed) the read poller for its carrier. When a read poller needs
+     * to block then it registers with a system-wide "master poller" that runs in a
+     * dedicated platform thread. The read poller terminates if the carrier terminates.
+     * The write pollers are system-wide platform threads (usually one).
+     */
+    private static class PollerPerCarrierPollerGroup extends PollerGroup {
+        private record CarrierPoller(PollerPerCarrierPollerGroup group, Poller readPoller) { }
+        private static final TerminatingThreadLocal<CarrierPoller> CARRIER_POLLER =
+            new TerminatingThreadLocal<>() {
+                @Override
+                protected void threadTerminated(CarrierPoller carrierPoller) {
+                    Poller readPoller = carrierPoller.readPoller();
+                    carrierPoller.group().carrierTerminated(readPoller);
+                }
+            };
+
+        private final Poller masterPoller;
+        private final Set<Poller> readPollers;
+        private final Poller[] writePollers;
+
+        /**
+         * Create a PollerPerCarrierPollerGroup with the given number of write pollers.
+         */
+        PollerPerCarrierPollerGroup(PollerProvider provider,
+                                    int writePollerCount) throws IOException {
+            super(provider);
+            Poller masterPoller = provider.readPoller(false);
+            Poller[] writePollers = new Poller[writePollerCount];
+            try {
+                for (int i = 0; i < writePollerCount; i++) {
+                    writePollers[i] = provider.writePoller(false);
+                }
+            } catch (Throwable e) {
+                masterPoller.close();
+                closeAll(writePollers);
+                throw e;
+            }
+            this.masterPoller = masterPoller;
+            this.readPollers = ConcurrentHashMap.newKeySet();;
+            this.writePollers = writePollers;
+        }
+
+        @Override
+        void start() {
+            startPlatformThread("Master-Poller", masterPoller::pollerLoop);
+            Arrays.stream(writePollers).forEach(p -> {
+                startPlatformThread("Write-Poller", p::pollerLoop);
+            });
+        }
+
+        private Poller writePoller(int fdVal) {
+            int index = provider().fdValToIndex(fdVal, writePollers.length);
+            return writePollers[index];
+        }
+
+        /**
+         * Starts a read sub-poller in a virtual thread.
+         */
+        private Poller startReadPoller() throws IOException {
+            assert Thread.currentThread().isVirtual() && ContinuationSupport.isSupported();
+
+            // create read sub-poller
+            Poller readPoller = provider().readPoller(true);
+            readPollers.add(readPoller);
+
+            // start virtual thread to execute sub-polling loop
+            Thread carrier = JLA.currentCarrierThread();
+            Thread.ofVirtual()
+                    .inheritInheritableThreadLocals(false)
+                    .name(carrier.getName() + "-Read-Poller")
+                    .uncaughtExceptionHandler((_, e) -> e.printStackTrace())
+                    .start(() -> subPollerLoop(readPoller));
+            return readPoller;
+        }
+
+        /**
+         * Returns the read poller for the current carrier, starting it if required.
+         */
+        private Poller readPoller() throws IOException {
+            assert Thread.currentThread().isVirtual() && ContinuationSupport.isSupported();
+            Continuation.pin();
+            try {
+                CarrierPoller carrierPoller = CARRIER_POLLER.get();
+                if (carrierPoller != null) {
+                    return carrierPoller.readPoller();
+                } else {
+                    // first poll on this carrier will start poller
+                    Poller readPoller = startReadPoller();
+                    CARRIER_POLLER.set(new CarrierPoller(this, readPoller));
+                    return readPoller;
+                }
+            } finally {
+                Continuation.unpin();
+            }
+        }
+
+        @Override
+        void poll(int fdVal, int event, long nanos, BooleanSupplier isOpen) throws IOException {
+            // for POLLIN, get the read poller for this carrier
+            if (event == Net.POLLIN
+                    && Thread.currentThread().isVirtual()
+                    && ContinuationSupport.isSupported()) {
+                readPoller().poll(fdVal, nanos, isOpen);
+                return;
+            }
+
+            // -XX:-VMContinuations or POLLIN from platform thread does master poller
+            if (event == Net.POLLIN) {
+                masterPoller.poll(fdVal, nanos, isOpen);
+            } else {
+                writePoller(fdVal).poll(fdVal, nanos, isOpen);
+            }
+        }
+
+        @Override
+        void pollSelector(int fdVal, long nanos) throws IOException {
+            masterPoller.poll(fdVal, nanos, () -> true);
+        }
+
+        /**
+         * Sub-poller polling loop.
+         */
+        private void subPollerLoop(Poller readPoller) {
+            try {
+                readPoller.subPollerLoop(masterPoller);
+            } finally {
+                // wakeup all threads waiting on file descriptors registered with the
+                // read poller, these I/O operation will migrate to another carrier.
+                readPoller.wakeupAll();
+
+                // remove from serviceability view
+                readPollers.remove(readPoller);
+            }
+        }
+
+        /**
+         * Invoked by the carrier thread before it terminates.
+         */
+        private void carrierTerminated(Poller readPoller) {
+            readPoller.setShutdown();
+            try {
+                readPoller.wakeupPoller();
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }
+
+        @Override
+        Poller masterPoller() {
+            return masterPoller;
+        }
+
+        @Override
+        List<Poller> readPollers() {
+            return readPollers.stream().toList();
+        }
+
+        @Override
+        List<Poller> writePollers() {
+            return List.of(writePollers);
+        }
+    }
+
+    /**
+     * Reads the given property name to get the poller count. If the property is
+     * set then the value must be a power of 2. Returns 1 if the property is not
+     * set.
+     * @throws IllegalArgumentException if the property is set to a value that
+     * is not a power of 2.
+     */
+    private static int pollerCount(String propName, int defaultCount) {
+        String s = System.getProperty(propName);
+        int count = (s != null) ? Integer.parseInt(s) : defaultCount;
+
+        // check power of 2
+        if (count != Integer.highestOneBit(count)) {
+            String msg = propName + " is set to a value that is not a power of 2";
+            throw new IllegalArgumentException(msg);
+        }
+        return count;
+    }
+
     /**
      * Return the master poller or null if there is no master poller.
      */
     public static Poller masterPoller() {
-        return POLLERS.masterPoller();
+        return POLLER_GROUP.masterPoller();
     }
 
     /**
      * Return the list of read pollers.
      */
     public static List<Poller> readPollers() {
-        return POLLERS.readPollers();
+        return POLLER_GROUP.readPollers();
     }
 
     /**
      * Return the list of write pollers.
      */
     public static List<Poller> writePollers() {
-        return POLLERS.writePollers();
+        return POLLER_GROUP.writePollers();
     }
 }
diff --git a/src/java.base/share/classes/sun/nio/ch/PollerProvider.java b/src/java.base/share/classes/sun/nio/ch/PollerProvider.java
index b10ec309265..7d19b72d2fc 100644
--- a/src/java.base/share/classes/sun/nio/ch/PollerProvider.java
+++ b/src/java.base/share/classes/sun/nio/ch/PollerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,38 +30,43 @@ import java.io.IOException;
  * Provider class for Poller implementations.
  */
 abstract class PollerProvider {
-    private static final PollerProvider INSTANCE = new DefaultPollerProvider();
+    private final Poller.Mode mode;
 
-    PollerProvider() { }
+    PollerProvider(Poller.Mode mode) {
+        this.mode = mode;
+    }
 
-    /**
-     * Returns the system-wide PollerProvider.
-     */
-    static PollerProvider provider() {
-        return INSTANCE;
+    final Poller.Mode pollerMode() {
+        return mode;
     }
 
     /**
-     * Returns the default poller mode.
-     * @implSpec The default implementation uses system threads.
+     * Creates a PollerProvider that uses its preferred/default poller mode.
      */
-    Poller.Mode defaultPollerMode() {
-        return Poller.Mode.SYSTEM_THREADS;
+    static PollerProvider createProvider() {
+        return new DefaultPollerProvider();
     }
 
     /**
-     * Default number of read pollers for the given mode. The count must be a power of 2.
+     * Creates a PollerProvider that uses the given poller mode.
+     */
+    static PollerProvider createProvider(Poller.Mode mode) {
+        return new DefaultPollerProvider(mode);
+    }
+
+    /**
+     * Default number of read pollers. The count must be a power of 2.
      * @implSpec The default implementation returns 1.
      */
-    int defaultReadPollers(Poller.Mode mode) {
+    int defaultReadPollers() {
         return 1;
     }
 
     /**
-     * Default number of write pollers for the given mode. The count must be a power of 2.
+     * Default number of write pollers. The count must be a power of 2.
      * @implSpec The default implementation returns 1.
      */
-    int defaultWritePollers(Poller.Mode mode) {
+    int defaultWritePollers() {
         return 1;
     }
 
@@ -74,13 +79,13 @@ abstract class PollerProvider {
     }
 
     /**
-     * Creates a Poller for read ops.
+     * Creates a Poller for POLLIN polling.
      * @param subPoller true to create a sub-poller
      */
     abstract Poller readPoller(boolean subPoller) throws IOException;
 
     /**
-     * Creates a Poller for write ops.
+     * Creates a Poller for POLLOUT polling.
      * @param subPoller true to create a sub-poller
      */
     abstract Poller writePoller(boolean subPoller) throws IOException;
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index e75110a76ad..98f79e6671b 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -90,8 +90,8 @@ class ServerSocketChannelImpl
     private static final int ST_CLOSED = 2;
     private int state;
 
-    // ID of native thread currently blocked in this channel, for signalling
-    private long thread;
+    // Thread currently blocked in this channel, for signalling
+    private Thread thread;
 
     // Binding
     private SocketAddress localAddress; // null => unbound
@@ -349,7 +349,7 @@ class ServerSocketChannelImpl
             if (localAddress == null)
                 throw new NotYetBoundException();
             if (blocking)
-                thread = NativeThread.current();
+                thread = NativeThread.threadToSignal();
         }
     }
 
@@ -364,7 +364,7 @@ class ServerSocketChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                thread = 0;
+                thread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
@@ -551,7 +551,7 @@ class ServerSocketChannelImpl
      */
     private boolean tryClose() throws IOException {
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-        if ((thread == 0) && !isRegistered()) {
+        if ((thread == null) && !isRegistered()) {
             state = ST_CLOSED;
             nd.close(fd);
             return true;
@@ -583,7 +583,7 @@ class ServerSocketChannelImpl
             assert state < ST_CLOSING;
             state = ST_CLOSING;
             if (!tryClose()) {
-                nd.preClose(fd, thread, 0);
+                nd.preClose(fd, thread, null);
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index 868ed3b64bc..010b1832190 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -113,9 +113,9 @@ class SocketChannelImpl
     private static final int ST_CLOSED = 4;
     private volatile int state;  // need stateLock to change
 
-    // IDs of native threads doing reads and writes, for signalling
-    private long readerThread;
-    private long writerThread;
+    // Threads doing reads and writes, for signalling
+    private Thread readerThread;
+    private Thread writerThread;
 
     // Binding
     private SocketAddress localAddress;
@@ -368,7 +368,7 @@ class SocketChannelImpl
             synchronized (stateLock) {
                 ensureOpen();
                 // record thread so it can be signalled if needed
-                readerThread = NativeThread.current();
+                readerThread = NativeThread.threadToSignal();
             }
         }
     }
@@ -384,7 +384,7 @@ class SocketChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                readerThread = 0;
+                readerThread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
@@ -522,7 +522,7 @@ class SocketChannelImpl
                 if (isOutputClosed)
                     throw new ClosedChannelException();
                 // record thread so it can be signalled if needed
-                writerThread = NativeThread.current();
+                writerThread = NativeThread.threadToSignal();
             }
         }
     }
@@ -538,7 +538,7 @@ class SocketChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                writerThread = 0;
+                writerThread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
@@ -673,7 +673,7 @@ class SocketChannelImpl
                 ensureOpenAndConnected();
                 if (isOutputClosed)
                     throw new ClosedChannelException();
-                writerThread = NativeThread.current();
+                writerThread = NativeThread.threadToSignal();
                 completed = true;
             }
         } finally {
@@ -689,7 +689,7 @@ class SocketChannelImpl
      */
     void afterTransferTo(boolean completed) throws AsynchronousCloseException {
         synchronized (stateLock) {
-            writerThread = 0;
+            writerThread = null;
             if (state == ST_CLOSING) {
                 tryFinishClose();
             }
@@ -874,7 +874,7 @@ class SocketChannelImpl
 
             if (blocking) {
                 // record thread so it can be signalled if needed
-                readerThread = NativeThread.current();
+                readerThread = NativeThread.threadToSignal();
             }
         }
     }
@@ -993,7 +993,7 @@ class SocketChannelImpl
                 throw new NoConnectionPendingException();
             if (blocking) {
                 // record thread so it can be signalled if needed
-                readerThread = NativeThread.current();
+                readerThread = NativeThread.threadToSignal();
             }
         }
     }
@@ -1072,7 +1072,7 @@ class SocketChannelImpl
      */
     private boolean tryClose() throws IOException {
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-        if ((readerThread == 0) && (writerThread == 0) && !isRegistered()) {
+        if ((readerThread == null) && (writerThread == null) && !isRegistered()) {
             state = ST_CLOSED;
             nd.close(fd);
             return true;
@@ -1215,11 +1215,8 @@ class SocketChannelImpl
                 throw new NotYetConnectedException();
             if (!isInputClosed) {
                 Net.shutdown(fd, Net.SHUT_RD);
-                long reader = readerThread;
-                if (NativeThread.isVirtualThread(reader)) {
-                    Poller.stopPoll(fdVal, Net.POLLIN);
-                } else if (NativeThread.isNativeThread(reader)) {
-                    NativeThread.signal(reader);
+                if (readerThread != null && readerThread.isVirtual()) {
+                    Poller.stopPoll(readerThread);
                 }
                 isInputClosed = true;
             }
@@ -1235,11 +1232,8 @@ class SocketChannelImpl
                 throw new NotYetConnectedException();
             if (!isOutputClosed) {
                 Net.shutdown(fd, Net.SHUT_WR);
-                long writer = writerThread;
-                if (NativeThread.isVirtualThread(writer)) {
-                    Poller.stopPoll(fdVal, Net.POLLOUT);
-                } else if (NativeThread.isNativeThread(writer)) {
-                    NativeThread.signal(writer);
+                if (writerThread != null && writerThread.isVirtual()) {
+                    Poller.stopPoll(writerThread);
                 }
                 isOutputClosed = true;
             }
diff --git a/src/java.base/share/classes/sun/nio/cs/CESU_8.java b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
index 11f21f56139..7093e0fecb2 100644
--- a/src/java.base/share/classes/sun/nio/cs/CESU_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/CESU_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -445,7 +445,7 @@ class CESU_8 extends Unicode
             int dl = dst.arrayOffset() + dst.limit();
 
             // Handle ASCII-only prefix
-            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
index 2a4dbdc95ed..edad4a1f67b 100644
--- a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -583,6 +583,16 @@ public class DoubleByte {
             return encodeChar(c) != UNMAPPABLE_ENCODING;
         }
 
+        public boolean canEncode(CharSequence cs) {
+            int length = cs.length();
+            for (int i = 0; i < length; i++) {
+                if (!canEncode(cs.charAt(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         protected Surrogate.Parser sgp() {
             if (sgp == null)
                 sgp = new Surrogate.Parser();
@@ -600,7 +610,7 @@ public class DoubleByte {
 
             try {
                 if (isASCIICompatible) {
-                    int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     sp += n;
                     dp += n;
                 }
diff --git a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
index 39215bfa93d..036aaece9ab 100644
--- a/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
+++ b/src/java.base/share/classes/sun/nio/cs/ISO_8859_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@ import java.util.Objects;
 
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.SharedSecrets;
-import jdk.internal.util.Preconditions;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 
 public class ISO_8859_1
@@ -136,26 +135,50 @@ public class ISO_8859_1
             return c <= '\u00FF';
         }
 
+        public boolean canEncode(CharSequence cs) {
+            int length = cs.length();
+            for (int i = 0; i < length; i++) {
+                if (!canEncode(cs.charAt(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         public boolean isLegalReplacement(byte[] repl) {
             return true;  // we accept any byte value
         }
 
         private final Surrogate.Parser sgp = new Surrogate.Parser();
 
-        // Method possible replaced with a compiler intrinsic.
+        /**
+         * Encodes as many ISO-8859-1 codepoints as possible from the source
+         * character array into the destination byte array, assuming that
+         * the encoding is ISO-8859-1 compatible.
+         *
+         * @param sa the source character array
+         * @param sp the index of the source array to start reading from
+         * @param da the target byte array
+         * @param dp the index of the target array to start writing to
+         * @param len the maximum number of characters to be encoded
+         * @return the total number of characters successfully encoded
+         * @throws NullPointerException if any of the provided arrays is null
+         */
         private static int encodeISOArray(char[] sa, int sp,
                                           byte[] da, int dp, int len) {
-            if (len <= 0) {
+            // This method should tolerate invalid arguments, matching the lenient behavior of the VM intrinsic.
+            // Hence, using operator expressions instead of `Preconditions`, which throw on failure.
+            if ((sp | dp | len) < 0 ||
+                    sp >= sa.length ||      // Implicit null check on `sa`
+                    dp >= da.length) {      // Implicit null check on `da`
                 return 0;
             }
-            encodeISOArrayCheck(sa, sp, da, dp, len);
-            return implEncodeISOArray(sa, sp, da, dp, len);
+            int minLen = Math.min(len, Math.min(sa.length - sp, da.length - dp));
+            return encodeISOArray0(sa, sp, da, dp, minLen);
         }
 
         @IntrinsicCandidate
-        private static int implEncodeISOArray(char[] sa, int sp,
-                                              byte[] da, int dp, int len)
-        {
+        private static int encodeISOArray0(char[] sa, int sp, byte[] da, int dp, int len) {
             int i = 0;
             for (; i < len; i++) {
                 char c = sa[sp++];
@@ -166,17 +189,6 @@ public class ISO_8859_1
             return i;
         }
 
-        private static void encodeISOArrayCheck(char[] sa, int sp,
-                                                byte[] da, int dp, int len) {
-            Objects.requireNonNull(sa);
-            Objects.requireNonNull(da);
-            Preconditions.checkIndex(sp, sa.length, Preconditions.AIOOBE_FORMATTER);
-            Preconditions.checkIndex(dp, da.length, Preconditions.AIOOBE_FORMATTER);
-
-            Preconditions.checkIndex(sp + len - 1, sa.length, Preconditions.AIOOBE_FORMATTER);
-            Preconditions.checkIndex(dp + len - 1, da.length, Preconditions.AIOOBE_FORMATTER);
-        }
-
         private CoderResult encodeArrayLoop(CharBuffer src,
                                             ByteBuffer dst)
         {
diff --git a/src/java.base/share/classes/sun/nio/cs/SingleByte.java b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
index 59887b944d3..dad89b4ebd3 100644
--- a/src/java.base/share/classes/sun/nio/cs/SingleByte.java
+++ b/src/java.base/share/classes/sun/nio/cs/SingleByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -201,6 +201,16 @@ public class SingleByte
             return encode(c) != UNMAPPABLE_ENCODING;
         }
 
+        public boolean canEncode(CharSequence cs) {
+            int length = cs.length();
+            for (int i = 0; i < length; i++) {
+                if (!canEncode(cs.charAt(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         public boolean isLegalReplacement(byte[] repl) {
             return ((repl.length == 1 && repl[0] == (byte)'?') ||
                     super.isLegalReplacement(repl));
@@ -217,7 +227,7 @@ public class SingleByte
             int len = Math.min(dl - dp, sl - sp);
 
             if (isASCIICompatible) {
-                int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, len);
+                int n = JLA.encodeASCII(sa, sp, da, dp, len);
                 sp += n;
                 dp += n;
                 len -= n;
diff --git a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
index bb84ab1bd4b..dabe843c809 100644
--- a/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
+++ b/src/java.base/share/classes/sun/nio/cs/US_ASCII.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,6 +139,16 @@ public class US_ASCII
             return c < 0x80;
         }
 
+        public boolean canEncode(CharSequence cs) {
+            int length = cs.length();
+            for (int i = 0; i < length; i++) {
+                if (!canEncode(cs.charAt(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         public boolean isLegalReplacement(byte[] repl) {
             return (repl.length == 1 && repl[0] >= 0) ||
                    super.isLegalReplacement(repl);
@@ -159,7 +169,7 @@ public class US_ASCII
             assert (dp <= dl);
             dp = (dp <= dl ? dp : dl);
 
-            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/cs/UTF_8.java b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
index 54e479f838a..2928ae6d509 100644
--- a/src/java.base/share/classes/sun/nio/cs/UTF_8.java
+++ b/src/java.base/share/classes/sun/nio/cs/UTF_8.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -452,7 +452,7 @@ public final class UTF_8 extends Unicode {
             int dl = dst.arrayOffset() + dst.limit();
 
             // Handle ASCII-only prefix
-            int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
+            int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(sl - sp, dl - dp));
             sp += n;
             dp += n;
 
diff --git a/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java b/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java
index 9500a737af7..dc0c8e4d8c9 100644
--- a/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java
+++ b/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@
 
 package sun.nio.fs;
 
-import java.lang.ref.Cleaner.Cleanable;
 import jdk.internal.misc.Unsafe;
-import jdk.internal.ref.CleanerFactory;
 
 /**
  * A light-weight buffer in native memory.
@@ -38,27 +36,17 @@ class NativeBuffer implements AutoCloseable {
 
     private final long address;
     private final int size;
-    private final Cleanable cleanable;
 
     // optional "owner" to avoid copying
     // (only safe for use by thread-local caches)
     private Object owner;
 
-    private static class Deallocator implements Runnable {
-        private final long address;
-        Deallocator(long address) {
-            this.address = address;
-        }
-        public void run() {
-            unsafe.freeMemory(address);
-        }
-    }
+    // owner thread ID
+    private long ownerTid;
 
     NativeBuffer(int size) {
         this.address = unsafe.allocateMemory(size);
         this.size = size;
-        this.cleanable = CleanerFactory.cleaner()
-                                       .register(this, new Deallocator(address));
     }
 
     @Override
@@ -79,16 +67,26 @@ class NativeBuffer implements AutoCloseable {
     }
 
     void free() {
-        cleanable.clean();
+        unsafe.freeMemory(address);
     }
 
     // not synchronized; only safe for use by thread-local caches
     void setOwner(Object owner) {
+        Thread thread = Thread.currentThread();
+        assert !thread.isVirtual();
+        assert ownerTid == 0 || ownerTid == thread.threadId();
         this.owner = owner;
+        this.ownerTid = (owner != null) ? thread.threadId() : 0;
     }
 
     // not synchronized; only safe for use by thread-local caches
     Object owner() {
-        return owner;
+        long tid = Thread.currentThread().threadId();
+        assert ownerTid == 0 || ownerTid == tid;
+        if (ownerTid == tid) {
+            return owner;
+        } else {
+            return null;
+        }
     }
 }
diff --git a/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java b/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java
index 9b93cce9114..750da8c1a3d 100644
--- a/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java
+++ b/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,7 +92,8 @@ class NativeBuffers {
     static NativeBuffer getNativeBuffer(int size) {
         NativeBuffer buffer = getNativeBufferFromCache(size);
         if (buffer != null) {
-            buffer.setOwner(null);
+            if (!Thread.currentThread().isVirtual())
+                buffer.setOwner(null);
             return buffer;
         } else {
             return allocNativeBuffer(size);
diff --git a/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java
index a748433da87..e1beb8b6b9b 100644
--- a/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java
+++ b/src/java.base/share/classes/sun/security/pkcs/NamedPKCS8Key.java
@@ -25,11 +25,8 @@
 
 package sun.security.pkcs;
 
-import sun.security.util.DerInputStream;
-import sun.security.util.DerValue;
 import sun.security.x509.AlgorithmId;
 
-import javax.security.auth.DestroyFailedException;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
@@ -39,6 +36,7 @@ import java.security.NoSuchAlgorithmException;
 import java.security.ProviderException;
 import java.security.spec.NamedParameterSpec;
 import java.util.Arrays;
+import java.util.Objects;
 
 /// Represents a private key from an algorithm family that is specialized
 /// with a named parameter set.
@@ -50,6 +48,28 @@ import java.util.Arrays;
 /// identifier in the PKCS #8 encoding of the key is always a single OID derived
 /// from the parameter set name.
 ///
+/// Besides the existing [PKCS8Key#privKeyMaterial] field, this class optionally
+/// supports an expanded format stored in [#expanded]. While `privKeyMaterial`
+/// always represents the format used for encoding, `expanded` is always used
+/// in computations. The expanded format must be self-sufficient for
+/// cryptographic computations without requiring the encoding format.
+///
+/// 1. If only `privKeyMaterial` is present, it's also the expanded format.
+/// 2. If both `privKeyMaterial` and `expanded` are available, `privKeyMaterial`
+///    is the encoding format, and `expanded` is the expanded format.
+///
+/// If the two formats are the same, only `privKeyMaterial` is included, and
+/// `expanded` must be `null`. Some implementations might be tempted to put the
+/// same value into `privKeyMaterial` and `expanded`. However, problems can
+/// arise if they happen to be the same object. To avoid ambiguity, always set
+/// `expanded` to `null`.
+///
+/// If the `expanded` field is required by the algorithm, it is either
+/// [calculated from the PKCS #8 encoding][#NamedPKCS8Key(String, byte\[\], Expander)],
+/// or [provided directly][#internalCreate(String, String, byte\[\], byte\[\])].
+/// In the latter case, the caller must ensure the consistency of the `encoded`
+/// and `expanded` arguments. For example, seed and expanded key must match.
+///
 /// @see sun.security.provider.NamedKeyPairGenerator
 public final class NamedPKCS8Key extends PKCS8Key {
     @Serial
@@ -57,42 +77,64 @@ public final class NamedPKCS8Key extends PKCS8Key {
 
     private final String fname;
     private final transient NamedParameterSpec paramSpec;
-    private final byte[] rawBytes;
+    private final transient byte[] expanded;
 
     private transient boolean destroyed = false;
 
-    /// Ctor from family name, parameter set name, raw key bytes.
-    /// Key bytes won't be cloned, caller must relinquish ownership
-    public NamedPKCS8Key(String fname, String pname, byte[] rawBytes) {
+    /// Creates a `NamedPKCS8Key` from raw components.
+    ///
+    /// @param fname family name
+    /// @param pname parameter set name
+    /// @param encoded raw key bytes, not null
+    /// @param expanded expanded key format, can be `null`.
+    private NamedPKCS8Key(String fname, String pname, byte[] encoded, byte[] expanded) {
         this.fname = fname;
         this.paramSpec = new NamedParameterSpec(pname);
+        this.expanded = expanded;
+        this.privKeyMaterial = Objects.requireNonNull(encoded);
         try {
             this.algid = AlgorithmId.get(pname);
         } catch (NoSuchAlgorithmException e) {
             throw new ProviderException(e);
         }
-        this.rawBytes = rawBytes;
-
-        DerValue val = new DerValue(DerValue.tag_OctetString, rawBytes);
-        try {
-            this.privKeyMaterial = val.toByteArray();
-        } finally {
-            val.clear();
-        }
     }
 
-    /// Ctor from family name, and PKCS #8 bytes
-    public NamedPKCS8Key(String fname, byte[] encoded) throws InvalidKeyException {
+    /// Creates a `NamedPKCS8Key` from raw components.
+    ///
+    /// `encoded` and `expanded` won't be cloned, caller must relinquish
+    /// ownership. This caller must ensure `encoded` and `expanded` match
+    /// each other and `encoded` is valid and internally-consistent.
+    ///
+    /// @param fname family name
+    /// @param pname parameter set name
+    /// @param encoded raw key bytes, not null
+    /// @param expanded expanded key format, can be `null`.
+    public static NamedPKCS8Key internalCreate(String fname, String pname,
+            byte[] encoded, byte[] expanded) {
+        return new NamedPKCS8Key(fname, pname, encoded, expanded);
+    }
+
+    /// Creates a `NamedPKCS8Key` from family name and PKCS #8 encoding.
+    ///
+    /// @param fname family name
+    /// @param encoded PKCS #8 encoding. It is copied so caller can modify
+    ///     it after the method call.
+    /// @param expander a function that is able to calculate the expanded
+    ///     format from the encoding format inside `encoded`. If it recognizes
+    ///     the input already in expanded format, it must return `null`.
+    ///     This argument must be `null` if the algorithm's expanded format
+    ///     is always the same as its encoding format. Whatever the case, the
+    ///     ownership of the result is fully granted to this object.
+    public NamedPKCS8Key(String fname, byte[] encoded, Expander expander)
+            throws InvalidKeyException {
         super(encoded);
         this.fname = fname;
-        try {
-            paramSpec = new NamedParameterSpec(algid.getName());
-            if (algid.getEncodedParams() != null) {
-                throw new InvalidKeyException("algorithm identifier has params");
-            }
-            rawBytes = new DerInputStream(privKeyMaterial).getOctetString();
-        } catch (IOException e) {
-            throw new InvalidKeyException("Cannot parse input", e);
+        this.expanded = expander == null
+                ? null
+                : expander.expand(algid.getName(), this.privKeyMaterial);
+        paramSpec = new NamedParameterSpec(algid.getName());
+        if (algid.getEncodedParams() != null) {
+            throw new InvalidKeyException("algorithm identifier has params");
         }
     }
 
@@ -104,9 +146,15 @@ public final class NamedPKCS8Key extends PKCS8Key {
     }
 
     /// Returns the reference to the internal key. Caller must not modify
-    /// the content or keep a reference.
+    /// the content or pass the reference to untrusted application code.
     public byte[] getRawBytes() {
-        return rawBytes;
+        return privKeyMaterial;
+    }
+
+    /// Returns the reference to the key in expanded format. Caller must not
+    /// modify the content or pass the reference to untrusted application code.
+    public byte[] getExpanded() {
+        return expanded == null ? privKeyMaterial : expanded;
     }
 
     @Override
@@ -127,9 +175,11 @@ public final class NamedPKCS8Key extends PKCS8Key {
     }
 
     @Override
-    public void destroy() throws DestroyFailedException {
-        Arrays.fill(rawBytes, (byte)0);
+    public void destroy() {
         Arrays.fill(privKeyMaterial, (byte)0);
+        if (expanded != null) {
+            Arrays.fill(expanded, (byte)0);
+        }
         if (encodedKey != null) {
             Arrays.fill(encodedKey, (byte)0);
         }
@@ -140,4 +190,17 @@ public final class NamedPKCS8Key extends PKCS8Key {
     public boolean isDestroyed() {
         return destroyed;
     }
+
+    /// Expands from encoding format to expanded format.
+    @FunctionalInterface
+    public interface Expander {
+        /// The expand method
+        ///
+        /// @param pname parameter set name
+        /// @param input input encoding
+        /// @return the expanded key, `null` if `input` is already in expanded
+        /// @throws InvalidKeyException if `input` is invalid, for example,
+        ///         wrong encoding, or internal inconsistency
+        byte[] expand(String pname, byte[] input) throws InvalidKeyException;
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
index f85ba0f9c4b..33e8406a7f6 100644
--- a/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
+++ b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
@@ -179,7 +181,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
 
     // A keystore entry and associated attributes
     private static class Entry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation date of this entry
         String alias;
         byte[] keyId;
         Set<KeyStore.Entry.Attribute> attributes;
@@ -212,7 +214,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
         CertEntry(X509Certificate cert, byte[] keyId, String alias,
                 ObjectIdentifier[] trustedKeyUsage,
                 Set<? extends KeyStore.Entry.Attribute> attributes) {
-            this.date = new Date();
+            this.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
             this.cert = cert;
             this.keyId = keyId;
             this.alias = alias;
@@ -541,9 +543,28 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
      * not exist
      */
     public Date engineGetCreationDate(String alias) {
-        Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
+        final Instant instant = this.engineGetCreationInstant(alias);
+        if (instant == null) {
+            return null;
+        }
+        return Date.from(instant);
+    }
+
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @since 27
+     */
+    public Instant engineGetCreationInstant(String alias) {
+        final Entry entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
         if (entry != null) {
-            return new Date(entry.date.getTime());
+            return entry.date;
         } else {
             return null;
         }
@@ -606,7 +627,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
                 checkX509Certs(chain);
 
                 PrivateKeyEntry keyEntry = new PrivateKeyEntry();
-                keyEntry.date = new Date();
+                keyEntry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
                 if ((key.getFormat().equals("PKCS#8")) ||
                     (key.getFormat().equals("PKCS8"))) {
@@ -651,7 +672,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
 
             } else if (key instanceof SecretKey) {
                 SecretKeyEntry keyEntry = new SecretKeyEntry();
-                keyEntry.date = new Date();
+                keyEntry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
                 // Encode secret key in a PKCS#8
                 DerOutputStream secretKeyInfo = new DerOutputStream();
@@ -690,7 +711,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
                 entry.attributes.addAll(attributes);
             }
             // set the keyId to current date
-            entry.keyId = ("Time " + (entry.date).getTime()).getBytes(UTF_8);
+            entry.keyId = ("Time " + entry.date.toEpochMilli()).getBytes(UTF_8);
             // set the alias
             entry.alias = alias.toLowerCase(Locale.ENGLISH);
             // add the entry
@@ -745,7 +766,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
         }
 
         PrivateKeyEntry entry = new PrivateKeyEntry();
-        entry.date = new Date();
+        entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
         if (debug != null) {
             debug.println("Setting a protected private key at alias '" +
@@ -753,7 +774,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
         }
 
         // set the keyId to current date
-        entry.keyId = ("Time " + (entry.date).getTime()).getBytes(UTF_8);
+        entry.keyId = ("Time " + entry.date.toEpochMilli()).getBytes(UTF_8);
         // set the alias
         entry.alias = alias.toLowerCase(Locale.ENGLISH);
 
@@ -2411,21 +2432,22 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
                     }
                 }
                 entry.keyId = keyId;
-                // restore date if it exists
+                // restore instant if it exists
                 String keyIdStr = new String(keyId, UTF_8);
-                Date date = null;
+                Instant instant = null;
                 if (keyIdStr.startsWith("Time ")) {
                     try {
-                        date = new Date(
-                                Long.parseLong(keyIdStr.substring(5)));
+                        instant = Instant.ofEpochMilli(
+                                Long.parseLong(keyIdStr.substring(5))
+                        );
                     } catch (Exception e) {
-                        // date has been initialized to null
+                        // instant has been initialized to null
                     }
                 }
-                if (date == null) {
-                    date = new Date();
+                if (instant == null) {
+                    instant = Instant.now().truncatedTo(ChronoUnit.MILLIS);
                 }
-                entry.date = date;
+                entry.date = instant;
 
                 if (bagItem instanceof PrivateKeyEntry) {
                     keyList.add(entry);
diff --git a/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java b/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java
index 342df6c5eeb..163454b55fc 100644
--- a/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java
+++ b/src/java.base/share/classes/sun/security/provider/DomainKeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import java.net.*;
 import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
+import java.time.Instant;
 import java.util.*;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -214,16 +215,32 @@ abstract class DomainKeyStore extends KeyStoreSpi {
      * not exist
      */
     public Date engineGetCreationDate(String alias) {
+        final Instant instant = this.engineGetCreationInstant(alias);
+        return (instant == null) ? null : Date.from(instant);
+    }
+
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @since 27
+     */
+    public Instant engineGetCreationInstant(String alias) {
 
         AbstractMap.SimpleEntry<String, Collection<KeyStore>> pair =
             getKeystoresForReading(alias);
-        Date date = null;
+        Instant instant = null;
 
         try {
             String entryAlias = pair.getKey();
             for (KeyStore keystore : pair.getValue()) {
-                date = keystore.getCreationDate(entryAlias);
-                if (date != null) {
+                instant = keystore.getCreationInstant(entryAlias);
+                if (instant != null) {
                     break;
                 }
             }
@@ -231,7 +248,7 @@ abstract class DomainKeyStore extends KeyStoreSpi {
             throw new IllegalStateException(e);
         }
 
-        return date;
+        return instant;
     }
 
     @Override
diff --git a/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java b/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
index 73ca0c6bf16..f014c2ecbc0 100644
--- a/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
+++ b/src/java.base/share/classes/sun/security/provider/JavaKeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@ import java.security.*;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertificateException;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -100,14 +102,14 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
 
     // Private keys and their supporting certificate chains
     private static class KeyEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation date of this entry
         byte[] protectedPrivKey;
         Certificate[] chain;
     }
 
     // Trusted certificates
     private static class TrustedCertEntry {
-        Date date; // the creation date of this entry
+        Instant date; // the creation date of this entry
         Certificate cert;
     }
 
@@ -236,13 +238,31 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
      * not exist
      */
     public Date engineGetCreationDate(String alias) {
-        Object entry = entries.get(convertAlias(alias));
+        final Instant instant = this.engineGetCreationInstant(alias);
+        return instant == null ? null : Date.from(instant);
+    }
+
+
+
+    /**
+     * Returns the instant that the entry identified by the given alias was
+     * created.
+     *
+     * @param alias the alias name
+     *
+     * @return the instant that the entry identified by the given alias
+     * was created, or {@code null} if the given alias does not exist
+     *
+     * @since 27
+     */
+    public Instant engineGetCreationInstant(String alias) {
+        final Object entry = entries.get(convertAlias(alias));
 
         if (entry != null) {
             if (entry instanceof TrustedCertEntry) {
-                return new Date(((TrustedCertEntry)entry).date.getTime());
+                return ((TrustedCertEntry)entry).date;
             } else {
-                return new Date(((KeyEntry)entry).date.getTime());
+                return((KeyEntry)entry).date;
             }
         } else {
             return null;
@@ -287,7 +307,7 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
         try {
             synchronized(entries) {
                 KeyEntry entry = new KeyEntry();
-                entry.date = new Date();
+                entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
                 // Protect the encoding of the key
                 passwordBytes = convertToBytes(password);
@@ -350,7 +370,7 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
             }
 
             KeyEntry entry = new KeyEntry();
-            entry.date = new Date();
+            entry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
 
             entry.protectedPrivKey = key.clone();
             if ((chain != null) &&
@@ -391,7 +411,7 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
 
             TrustedCertEntry trustedCertEntry = new TrustedCertEntry();
             trustedCertEntry.cert = cert;
-            trustedCertEntry.date = new Date();
+            trustedCertEntry.date = Instant.now().truncatedTo(ChronoUnit.MILLIS);
             entries.put(convertAlias(alias), trustedCertEntry);
         }
     }
@@ -579,7 +599,7 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
                     dos.writeUTF(alias);
 
                     // Write the (entry creation) date
-                    dos.writeLong(((KeyEntry)entry).date.getTime());
+                    dos.writeLong(((KeyEntry)entry).date.toEpochMilli());
 
                     // Write the protected private key
                     dos.writeInt(((KeyEntry)entry).protectedPrivKey.length);
@@ -608,7 +628,9 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
                     dos.writeUTF(alias);
 
                     // Write the (entry creation) date
-                    dos.writeLong(((TrustedCertEntry)entry).date.getTime());
+                    dos.writeLong(
+                            ((TrustedCertEntry)entry).date.toEpochMilli()
+                    );
 
                     // Write the trusted certificate
                     encoded = ((TrustedCertEntry)entry).cert.getEncoded();
@@ -707,7 +729,7 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
                     alias = dis.readUTF();
 
                     // Read the (entry creation) date
-                    entry.date = new Date(dis.readLong());
+                    entry.date = Instant.ofEpochMilli(dis.readLong());
 
                     // Read the private key
                     entry.protectedPrivKey =
@@ -756,7 +778,7 @@ public abstract sealed class JavaKeyStore extends KeyStoreSpi {
                     alias = dis.readUTF();
 
                     // Read the (entry creation) date
-                    entry.date = new Date(dis.readLong());
+                    entry.date = Instant.ofEpochMilli(dis.readLong());
 
                     // Read the trusted certificate
                     if (xVersion == 2) {
diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA.java b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
index 6a578427e51..1e27349a5d0 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -568,6 +568,54 @@ public class ML_DSA {
         return new ML_DSA_KeyPair(sk, pk);
     }
 
+    private static int[][] deepClone(int[][] array) {
+        int[][] clone = new int[array.length][];
+        for (int i = 0; i < array.length; i++) {
+            clone[i] = array[i].clone();
+        }
+        return clone;
+    }
+
+    // This is similar to the generateKeyPairInternal method. Instead of
+    // generating from a seed, it uses stored fields inside the private key
+    // to calculate the public key. It performs several checks during the
+    // calculation to make sure the private key is a valid one. Otherwise,
+    // an IllegalArgumentException is thrown.
+    public ML_DSA_PublicKey privKeyToPubKey(ML_DSA_PrivateKey sk) {
+        // Sample A
+        int[][][] keygenA = generateA(sk.rho); //A is in NTT domain
+
+        // Compute t and tr
+        // make a copy of sk.s1 and modify it. Although we can also
+        // take it out of NTT domain later, it was modified for a while.
+        var s1 = deepClone(sk.s1);
+        mlDsaVectorNtt(s1); //s1 now in NTT domain
+        int[][] As1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        matrixVectorPointwiseMultiply(As1, keygenA, s1);
+
+        mlDsaVectorInverseNtt(As1);
+        int[][] t = vectorAddPos(As1, sk.s2);
+        int[][] t0 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        int[][] t1 = integerMatrixAlloc(mlDsa_k, ML_DSA_N);
+        power2Round(t, t0, t1);
+        if (!Arrays.deepEquals(t0, sk.t0)) {
+            throw new IllegalArgumentException("t0 does not patch");
+        }
+
+        var crHash = new SHAKE256(TR_LEN);
+
+        ML_DSA_PublicKey pk = new ML_DSA_PublicKey(sk.rho, t1);
+        byte[] publicKeyBytes = pkEncode(pk);
+        crHash.update(publicKeyBytes);
+        byte[] tr = crHash.digest();
+        if (!Arrays.equals(tr, sk.tr)) {
+            throw new IllegalArgumentException("tr does not patch");
+        }
+
+        //Encode PK
+        return new ML_DSA_PublicKey(sk.rho, t1);
+    }
+
     public ML_DSA_Signature signInternal(byte[] message, byte[] rnd, byte[] skBytes) {
         //Decode private key and initialize hash function
         ML_DSA_PrivateKey sk = skDecode(skBytes);
diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java b/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
index dffe7c5cdb1..730e253f407 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,35 @@
 package sun.security.provider;
 
 import sun.security.jca.JCAUtil;
+import sun.security.pkcs.NamedPKCS8Key;
+import sun.security.util.KeyChoices;
+import sun.security.x509.NamedX509Key;
+
 import java.security.*;
 import java.security.SecureRandom;
 import java.util.Arrays;
 
 public class ML_DSA_Impls {
 
+    private static final int SEED_LEN = 32;
+
+    public static byte[] seedToExpanded(String pname, byte[] seed) {
+        var impl = new ML_DSA(name2int(pname));
+        var sk = impl.generateKeyPairInternal(seed).privateKey();
+        try {
+            return impl.skEncode(sk);
+        } finally {
+            sk.destroy();
+        }
+    }
+
+    public static NamedX509Key privKeyToPubKey(NamedPKCS8Key npk) {
+        var dsa = new ML_DSA(name2int(npk.getParams().getName()));
+        return new NamedX509Key(npk.getAlgorithm(),
+                npk.getParams().getName(),
+                dsa.pkEncode(dsa.privKeyToPubKey(dsa.skDecode(npk.getExpanded()))));
+    }
+
     public enum Version {
         DRAFT, FINAL
     }
@@ -43,16 +66,16 @@ public class ML_DSA_Impls {
     // --add-exports java.base/sun.security.provider=ALL-UNNAMED
     public static Version version = Version.FINAL;
 
-    static int name2int(String name) {
-        if (name.endsWith("44")) {
+    static int name2int(String pname) {
+        if (pname.endsWith("44")) {
             return 2;
-        } else if (name.endsWith("65")) {
+        } else if (pname.endsWith("65")) {
             return 3;
-        } else if (name.endsWith("87")) {
+        } else if (pname.endsWith("87")) {
             return 5;
         } else {
             // should not happen
-            throw new ProviderException("Unknown name " + name);
+            throw new ProviderException("Unknown name " + pname);
         }
     }
 
@@ -69,20 +92,26 @@ public class ML_DSA_Impls {
         }
 
         @Override
-        protected byte[][] implGenerateKeyPair(String name, SecureRandom sr) {
-            byte[] seed = new byte[32];
-            var r = sr != null ? sr : JCAUtil.getDefSecureRandom();
+        protected byte[][] implGenerateKeyPair(String pname, SecureRandom random) {
+            byte[] seed = new byte[SEED_LEN];
+            var r = random != null ? random : JCAUtil.getDefSecureRandom();
             r.nextBytes(seed);
-            ML_DSA mlDsa = new ML_DSA(name2int(name));
+
+            ML_DSA mlDsa = new ML_DSA(name2int(pname));
             ML_DSA.ML_DSA_KeyPair kp = mlDsa.generateKeyPairInternal(seed);
+            var expanded = mlDsa.skEncode(kp.privateKey());
+
             try {
                 return new byte[][]{
                         mlDsa.pkEncode(kp.publicKey()),
-                        mlDsa.skEncode(kp.privateKey())
+                        KeyChoices.writeToChoice(
+                                KeyChoices.getPreferred("mldsa"),
+                                seed, expanded),
+                        expanded
                 };
             } finally {
                 kp.privateKey().destroy();
-                Arrays.fill(seed, (byte)0);
+                Arrays.fill(seed, (byte) 0);
             }
         }
     }
@@ -109,8 +138,39 @@ public class ML_DSA_Impls {
         public KF() {
             super("ML-DSA", "ML-DSA-44", "ML-DSA-65", "ML-DSA-87");
         }
-        public KF(String name) {
-            super("ML-DSA", name);
+        public KF(String pname) {
+            super("ML-DSA", pname);
+        }
+
+        @Override
+        protected byte[] implExpand(String pname, byte[] input)
+                throws InvalidKeyException {
+            return KeyChoices.choiceToExpanded(pname, SEED_LEN, input,
+                    ML_DSA_Impls::seedToExpanded);
+        }
+
+        @Override
+        protected Key engineTranslateKey(Key key) throws InvalidKeyException {
+            var nk = toNamedKey(key);
+            if (nk instanceof NamedPKCS8Key npk) {
+                var type = KeyChoices.getPreferred("mldsa");
+                if (KeyChoices.typeOfChoice(npk.getRawBytes()) != type) {
+                    var encoding = KeyChoices.choiceToChoice(
+                            type,
+                            npk.getParams().getName(),
+                            SEED_LEN, npk.getRawBytes(),
+                            ML_DSA_Impls::seedToExpanded);
+                    nk = NamedPKCS8Key.internalCreate(
+                            npk.getAlgorithm(),
+                            npk.getParams().getName(),
+                            encoding,
+                            npk.getExpanded().clone());
+                    if (npk != key) { // npk is neither input or output
+                        npk.destroy();
+                    }
+                }
+            }
+            return nk;
         }
     }
 
@@ -134,16 +194,16 @@ public class ML_DSA_Impls {
 
     public sealed static class SIG extends NamedSignature permits SIG2, SIG3, SIG5 {
         public SIG() {
-            super("ML-DSA", "ML-DSA-44", "ML-DSA-65", "ML-DSA-87");
+            super("ML-DSA", new KF());
         }
-        public SIG(String name) {
-            super("ML-DSA", name);
+        public SIG(String pname) {
+            super("ML-DSA", new KF(pname));
         }
 
         @Override
-        protected byte[] implSign(String name, byte[] skBytes,
+        protected byte[] implSign(String pname, byte[] skBytes,
                                   Object sk2, byte[] msg, SecureRandom sr) {
-            var size = name2int(name);
+            var size = name2int(pname);
             var r = sr != null ? sr : JCAUtil.getDefSecureRandom();
             byte[] rnd = new byte[32];
             r.nextBytes(rnd);
@@ -160,10 +220,10 @@ public class ML_DSA_Impls {
         }
 
         @Override
-        protected boolean implVerify(String name, byte[] pkBytes,
+        protected boolean implVerify(String pname, byte[] pkBytes,
                                      Object pk2, byte[] msg, byte[] sigBytes)
                 throws SignatureException {
-            var size = name2int(name);
+            var size = name2int(pname);
             var mlDsa = new ML_DSA(size);
             if (version == Version.FINAL) {
                 // FIPS 204 Algorithm 3 ML-DSA.Verify prepend {0, len(ctx)}
@@ -176,18 +236,18 @@ public class ML_DSA_Impls {
         }
 
         @Override
-        protected Object implCheckPublicKey(String name, byte[] pk)
+        protected Object implCheckPublicKey(String pname, byte[] pk)
             throws InvalidKeyException {
 
-            ML_DSA mlDsa = new ML_DSA(name2int(name));
+            ML_DSA mlDsa = new ML_DSA(name2int(pname));
             return mlDsa.checkPublicKey(pk);
         }
 
         @Override
-        protected Object implCheckPrivateKey(String name, byte[] sk)
+        protected Object implCheckPrivateKey(String pname, byte[] sk)
             throws InvalidKeyException {
 
-            ML_DSA mlDsa = new ML_DSA(name2int(name));
+            ML_DSA mlDsa = new ML_DSA(name2int(pname));
             return mlDsa.checkPrivateKey(sk);
         }
     }
diff --git a/src/java.base/share/classes/sun/security/provider/NamedKEM.java b/src/java.base/share/classes/sun/security/provider/NamedKEM.java
index 2731b3460af..60449396d4d 100644
--- a/src/java.base/share/classes/sun/security/provider/NamedKEM.java
+++ b/src/java.base/share/classes/sun/security/provider/NamedKEM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.NamedParameterSpec;
 import java.util.Arrays;
-import java.util.Objects;
 
 /// A base class for all `KEM` implementations that can be
 /// configured with a named parameter set. See [NamedKeyPairGenerator]
@@ -50,21 +49,19 @@ import java.util.Objects;
 public abstract class NamedKEM implements KEMSpi {
 
     private final String fname; // family name
-    private final String[] pnames; // allowed parameter set name (at least one)
+    private final NamedKeyFactory fac;
 
     /// Creates a new `NamedKEM` object.
     ///
     /// @param fname the family name
-    /// @param pnames the standard parameter set names, at least one is needed.
-    protected NamedKEM(String fname, String... pnames) {
+    /// @param fac the `KeyFactory` used to translate foreign keys and
+    ///         perform key validation
+    protected NamedKEM(String fname, NamedKeyFactory fac) {
         if (fname == null) {
             throw new AssertionError("fname cannot be null");
         }
-        if (pnames == null || pnames.length == 0) {
-            throw new AssertionError("pnames cannot be null or empty");
-        }
         this.fname = fname;
-        this.pnames = pnames;
+        this.fac = fac;
     }
 
     @Override
@@ -76,8 +73,7 @@ public abstract class NamedKEM implements KEMSpi {
                     "The " + fname + " algorithm does not take any parameters");
         }
         // translate also check the key
-        var nk = (NamedX509Key) new NamedKeyFactory(fname, pnames)
-                .engineTranslateKey(publicKey);
+        var nk = (NamedX509Key) fac.toNamedKey(publicKey);
         var pk = nk.getRawBytes();
         return getKeyConsumerImpl(this, nk.getParams(), pk,
                 implCheckPublicKey(nk.getParams().getName(), pk), secureRandom);
@@ -92,16 +88,15 @@ public abstract class NamedKEM implements KEMSpi {
                     "The " + fname + " algorithm does not take any parameters");
         }
         // translate also check the key
-        var nk = (NamedPKCS8Key) new NamedKeyFactory(fname, pnames)
-                .engineTranslateKey(privateKey);
-        var sk = nk.getRawBytes();
+        var nk = (NamedPKCS8Key) fac.toNamedKey(privateKey);
+        var sk = nk.getExpanded();
         return getKeyConsumerImpl(this, nk.getParams(), sk,
                 implCheckPrivateKey(nk.getParams().getName(), sk), null);
     }
 
     // We don't have a flag on whether key is public key or private key.
     // The correct method should always be called.
-    private record KeyConsumerImpl(NamedKEM kem, String name, int sslen,
+    private record KeyConsumerImpl(NamedKEM kem, String pname, int sslen,
             int clen, byte[] key, Object k2, SecureRandom sr)
             implements KEMSpi.EncapsulatorSpi, KEMSpi.DecapsulatorSpi {
         @Override
@@ -110,7 +105,7 @@ public abstract class NamedKEM implements KEMSpi {
             if (encapsulation.length != clen) {
                 throw new DecapsulateException("Invalid key encapsulation message length");
             }
-            var ss = kem.implDecapsulate(name, key, k2, encapsulation);
+            var ss = kem.implDecapsulate(pname, key, k2, encapsulation);
             try {
                 return new SecretKeySpec(ss,
                         from, to - from, algorithm);
@@ -121,7 +116,7 @@ public abstract class NamedKEM implements KEMSpi {
 
         @Override
         public KEM.Encapsulated engineEncapsulate(int from, int to, String algorithm) {
-            var enc = kem.implEncapsulate(name, key, k2, sr);
+            var enc = kem.implEncapsulate(pname, key, k2, sr);
             try {
                 return new KEM.Encapsulated(
                         new SecretKeySpec(enc[1],
@@ -146,46 +141,46 @@ public abstract class NamedKEM implements KEMSpi {
 
     private static KeyConsumerImpl getKeyConsumerImpl(NamedKEM kem,
             NamedParameterSpec nps, byte[] key, Object k2, SecureRandom sr) {
-        String name = nps.getName();
-        return new KeyConsumerImpl(kem, name, kem.implSecretSize(name), kem.implEncapsulationSize(name),
+        String pname = nps.getName();
+        return new KeyConsumerImpl(kem, pname, kem.implSecretSize(pname), kem.implEncapsulationSize(pname),
                 key, k2, sr);
     }
 
     /// User-defined encap function.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param pk public key in raw bytes
     /// @param pk2 parsed public key, `null` if none. See [#implCheckPublicKey].
     /// @param sr SecureRandom object, `null` if not initialized
     /// @return the key encapsulation message and the shared key (in this order)
     /// @throws ProviderException if there is an internal error
-    protected abstract byte[][] implEncapsulate(String name, byte[] pk, Object pk2, SecureRandom sr);
+    protected abstract byte[][] implEncapsulate(String pname, byte[] pk, Object pk2, SecureRandom sr);
 
     /// User-defined decap function.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param sk private key in raw bytes
     /// @param sk2 parsed private key, `null` if none. See [#implCheckPrivateKey].
     /// @param encap the key encapsulation message
     /// @return the shared key
     /// @throws ProviderException if there is an internal error
     /// @throws DecapsulateException if there is another error
-    protected abstract byte[] implDecapsulate(String name, byte[] sk, Object sk2, byte[] encap)
+    protected abstract byte[] implDecapsulate(String pname, byte[] sk, Object sk2, byte[] encap)
             throws DecapsulateException;
 
     /// User-defined function returning shared secret key length.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @return shared secret key length
     /// @throws ProviderException if there is an internal error
-    protected abstract int implSecretSize(String name);
+    protected abstract int implSecretSize(String pname);
 
     /// User-defined function returning key encapsulation message length.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @return key encapsulation message length
     /// @throws ProviderException if there is an internal error
-    protected abstract int implEncapsulationSize(String name);
+    protected abstract int implEncapsulationSize(String pname);
 
     /// User-defined function to validate a public key.
     ///
@@ -196,11 +191,11 @@ public abstract class NamedKEM implements KEMSpi {
     ///
     /// The default implementation returns `null`.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param pk public key in raw bytes
     /// @return a parsed key, `null` if none.
     /// @throws InvalidKeyException if the key is invalid
-    protected Object implCheckPublicKey(String name, byte[] pk) throws InvalidKeyException {
+    protected Object implCheckPublicKey(String pname, byte[] pk) throws InvalidKeyException {
         return null;
     }
 
@@ -213,11 +208,11 @@ public abstract class NamedKEM implements KEMSpi {
     ///
     /// The default implementation returns `null`.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param sk private key in raw bytes
     /// @return a parsed key, `null` if none.
     /// @throws InvalidKeyException if the key is invalid
-    protected Object implCheckPrivateKey(String name, byte[] sk) throws InvalidKeyException {
+    protected Object implCheckPrivateKey(String pname, byte[] sk) throws InvalidKeyException {
         return null;
     }
 }
diff --git a/src/java.base/share/classes/sun/security/provider/NamedKeyFactory.java b/src/java.base/share/classes/sun/security/provider/NamedKeyFactory.java
index 727358dd074..9099f1446ff 100644
--- a/src/java.base/share/classes/sun/security/provider/NamedKeyFactory.java
+++ b/src/java.base/share/classes/sun/security/provider/NamedKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@ import java.security.spec.NamedParameterSpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Arrays;
-import java.util.Objects;
 
 /// A base class for all `KeyFactory` implementations that can be
 /// configured with a named parameter set. See [NamedKeyPairGenerator]
@@ -58,7 +57,7 @@ import java.util.Objects;
 ///
 /// When reading from a RAW format, it needs enough info to derive the
 /// parameter set name.
-public class NamedKeyFactory extends KeyFactorySpi {
+public abstract class NamedKeyFactory extends KeyFactorySpi {
 
     private final String fname; // family name
     private final String[] pnames; // allowed parameter set name (at least one)
@@ -78,92 +77,110 @@ public class NamedKeyFactory extends KeyFactorySpi {
         this.pnames = pnames;
     }
 
-    private String checkName(String name) throws InvalidKeyException  {
-        for (var pname : pnames) {
-            if (pname.equalsIgnoreCase(name)) {
+    private String checkName(String pname) throws InvalidKeyException {
+        for (var n : pnames) {
+            if (n.equalsIgnoreCase(pname)) {
                 // return the stored standard name
-                return pname;
+                return n;
             }
         }
-        throw new InvalidKeyException("Unsupported parameter set name: " + name);
+        throw new InvalidKeyException("Unsupported parameter set name: " + pname);
     }
 
     @Override
     protected PublicKey engineGeneratePublic(KeySpec keySpec)
             throws InvalidKeySpecException {
-        if (keySpec instanceof X509EncodedKeySpec xspec) {
-            try {
-                return fromX509(xspec.getEncoded());
-            } catch (InvalidKeyException e) {
-                throw new InvalidKeySpecException(e);
+        return switch (keySpec) {
+            case X509EncodedKeySpec xspec -> {
+                try {
+                    yield fromX509(xspec.getEncoded());
+                } catch (InvalidKeyException e) {
+                    throw new InvalidKeySpecException(e);
+                }
             }
-        } else if (keySpec instanceof RawKeySpec rks) {
-            if (pnames.length == 1) {
-                return new NamedX509Key(fname, pnames[0], rks.getKeyArr());
-            } else {
-                throw new InvalidKeySpecException("Parameter set name unavailable");
+            case RawKeySpec rks -> {
+                if (pnames.length == 1) {
+                    yield new NamedX509Key(fname, pnames[0], rks.getKeyArr());
+                } else {
+                    throw new InvalidKeySpecException("Parameter set name unavailable");
+                }
             }
-        } else if (keySpec instanceof EncodedKeySpec espec
-                && espec.getFormat().equalsIgnoreCase("RAW")) {
-            if (pnames.length == 1) {
-                return new NamedX509Key(fname, pnames[0], espec.getEncoded());
-            } else {
-                throw new InvalidKeySpecException("Parameter set name unavailable");
+            case EncodedKeySpec espec when espec.getFormat().equalsIgnoreCase("RAW") -> {
+                if (pnames.length == 1) {
+                    yield new NamedX509Key(fname, pnames[0], espec.getEncoded());
+                } else {
+                    throw new InvalidKeySpecException("Parameter set name unavailable");
+                }
             }
-        } else {
-            throw new InvalidKeySpecException("Unsupported keyspec: " + keySpec);
-        }
+            case null -> throw new InvalidKeySpecException(
+                    "keySpec must not be null");
+            default ->
+                    throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                            " not supported.");
+        };
     }
 
     @Override
     protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
             throws InvalidKeySpecException {
-        if (keySpec instanceof PKCS8EncodedKeySpec pspec) {
-            var bytes = pspec.getEncoded();
-            try {
-                return fromPKCS8(bytes);
-            } catch (InvalidKeyException e) {
-                throw new InvalidKeySpecException(e);
-            } finally {
-                Arrays.fill(bytes, (byte) 0);
-            }
-        } else if (keySpec instanceof RawKeySpec rks) {
-            if (pnames.length == 1) {
-                var bytes = rks.getKeyArr();
+        return switch (keySpec) {
+            case PKCS8EncodedKeySpec pspec -> {
+                var bytes = pspec.getEncoded();
                 try {
-                    return new NamedPKCS8Key(fname, pnames[0], bytes);
+                    yield fromPKCS8(bytes);
+                } catch (InvalidKeyException e) {
+                    throw new InvalidKeySpecException(e);
                 } finally {
                     Arrays.fill(bytes, (byte) 0);
                 }
-            } else {
-                throw new InvalidKeySpecException("Parameter set name unavailable");
             }
-        } else if (keySpec instanceof EncodedKeySpec espec
-                && espec.getFormat().equalsIgnoreCase("RAW")) {
-            if (pnames.length == 1) {
-                var bytes = espec.getEncoded();
-                try {
-                    return new NamedPKCS8Key(fname, pnames[0], bytes);
-                } finally {
-                    Arrays.fill(bytes, (byte) 0);
+            case RawKeySpec rks -> {
+                if (pnames.length == 1) {
+                    var raw = rks.getKeyArr();
+                    try {
+                        yield fromRaw(pnames[0], raw);
+                    } catch (InvalidKeyException e) {
+                        throw new InvalidKeySpecException("Invalid key input", e);
+                    }
+                } else {
+                    throw new InvalidKeySpecException("Parameter set name unavailable");
                 }
-            } else {
-                throw new InvalidKeySpecException("Parameter set name unavailable");
             }
-        } else {
-            throw new InvalidKeySpecException("Unsupported keyspec: " + keySpec);
-        }
+            case EncodedKeySpec espec when espec.getFormat().equalsIgnoreCase("RAW") -> {
+                if (pnames.length == 1) {
+                    var raw = espec.getEncoded();
+                    try {
+                        yield fromRaw(pnames[0], raw);
+                    } catch (InvalidKeyException e) {
+                        throw new InvalidKeySpecException("Invalid key input", e);
+                    }
+                } else {
+                    throw new InvalidKeySpecException("Parameter set name unavailable");
+                }
+            }
+            case null -> throw new InvalidKeySpecException(
+                    "keySpec must not be null");
+            default ->
+                    throw new InvalidKeySpecException(keySpec.getClass().getName() +
+                            " not supported.");
+        };
+    }
+
+    private PrivateKey fromRaw(String pname, byte[] raw)
+            throws InvalidKeyException {
+        return NamedPKCS8Key.internalCreate(
+                fname, pname, raw, implExpand(pname, raw));
     }
 
     private PrivateKey fromPKCS8(byte[] bytes)
-            throws InvalidKeyException, InvalidKeySpecException {
-        var k = new NamedPKCS8Key(fname, bytes);
+            throws InvalidKeyException {
+        var k = new NamedPKCS8Key(fname, bytes, this::implExpand);
         checkName(k.getParams().getName());
         return k;
     }
 
     private PublicKey fromX509(byte[] bytes)
-            throws InvalidKeyException, InvalidKeySpecException {
+            throws InvalidKeyException {
         var k = new NamedX509Key(fname, bytes);
         checkName(k.getParams().getName());
         return k;
@@ -184,7 +201,7 @@ public class NamedKeyFactory extends KeyFactorySpi {
     protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
             throws InvalidKeySpecException {
         try {
-            key = engineTranslateKey(key);
+            key = toNamedKey(key);
         } catch (InvalidKeyException e) {
             throw new InvalidKeySpecException(e);
         }
@@ -225,6 +242,12 @@ public class NamedKeyFactory extends KeyFactorySpi {
 
     @Override
     protected Key engineTranslateKey(Key key) throws InvalidKeyException {
+        // The base toNamedKey only makes sure key is translated into a NamedKey.
+        // the key material is still the same as the input.
+        return toNamedKey(key);
+    }
+
+    protected Key toNamedKey(Key key) throws InvalidKeyException {
         if (key == null) {
             throw new InvalidKeyException("Key must not be null");
         }
@@ -242,27 +265,28 @@ public class NamedKeyFactory extends KeyFactorySpi {
         } else if (format.equalsIgnoreCase("RAW")) {
             var kAlg = key.getAlgorithm();
             if (key instanceof AsymmetricKey pk) {
-                String name;
+                String pname;
                 // Three cases that we can find the parameter set name from a RAW key:
                 // 1. getParams() returns one
                 // 2. getAlgorithm() returns param set name (some provider does this)
                 // 3. getAlgorithm() returns family name but this KF is for param set name
                 if (pk.getParams() instanceof NamedParameterSpec nps) {
-                    name = checkName(nps.getName());
+                    pname = checkName(nps.getName());
                 } else {
                     if (kAlg.equalsIgnoreCase(fname)) {
                         if (pnames.length == 1) {
-                            name = pnames[0];
+                            pname = pnames[0];
                         } else {
                             throw new InvalidKeyException("No parameter set info");
                         }
                     } else {
-                        name = checkName(kAlg);
+                        pname = checkName(kAlg);
                     }
                 }
+                var raw = key.getEncoded();
                 return key instanceof PrivateKey
-                        ? new NamedPKCS8Key(fname, name, key.getEncoded())
-                        : new NamedX509Key(fname, name, key.getEncoded());
+                        ? fromRaw(pname, raw)
+                        : new NamedX509Key(fname, pname, raw);
             } else {
                 throw new InvalidKeyException("Unsupported key type: " + key.getClass());
             }
@@ -270,19 +294,26 @@ public class NamedKeyFactory extends KeyFactorySpi {
             var bytes = key.getEncoded();
             try {
                 return fromPKCS8(bytes);
-            } catch (InvalidKeySpecException e) {
-                throw new InvalidKeyException("Invalid PKCS#8 key", e);
             } finally {
                 Arrays.fill(bytes, (byte) 0);
             }
         } else if (format.equalsIgnoreCase("X.509") && key instanceof PublicKey) {
-            try {
-                return fromX509(key.getEncoded());
-            } catch (InvalidKeySpecException e) {
-                throw new InvalidKeyException("Invalid X.509 key", e);
-            }
+            return fromX509(key.getEncoded());
         } else {
             throw new InvalidKeyException("Unsupported key format: " + key.getFormat());
         }
     }
+
+    /// User-defined function to generate the expanded format of
+    /// a [NamedPKCS8Key] from its encoding format.
+    ///
+    /// This method is called when the key factory is constructing a private
+    /// key. The ownership of the result is fully granted to the caller.
+    ///
+    /// @param pname the parameter set name
+    /// @param input the encoding, could be any format
+    /// @return the expanded key, not null
+    /// @throws InvalidKeyException if `input` is invalid
+    protected abstract byte[] implExpand(String pname, byte[] input)
+            throws InvalidKeyException;
 }
diff --git a/src/java.base/share/classes/sun/security/provider/NamedKeyPairGenerator.java b/src/java.base/share/classes/sun/security/provider/NamedKeyPairGenerator.java
index 5be2b2b2a08..6b55924b0fe 100644
--- a/src/java.base/share/classes/sun/security/provider/NamedKeyPairGenerator.java
+++ b/src/java.base/share/classes/sun/security/provider/NamedKeyPairGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@ import java.security.ProviderException;
 import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.NamedParameterSpec;
-import java.util.Objects;
 
 /// A base class for all `KeyPairGenerator` implementations that can be
 /// configured with a named parameter set.
@@ -52,15 +51,21 @@ import java.util.Objects;
 /// with `getAlgorithm` returning the family name, and `getParams` returning
 /// the parameter set name as a [NamedParameterSpec] object.
 ///
-/// An implementation must include a zero-argument public constructor that
-/// calls `super(fname, pnames)`, where `fname` is the family name of the
-/// algorithm and `pnames` are its supported parameter set names. `pnames`
-/// must contain at least one element. For an implementation of
-/// `NamedKeyPairGenerator`, the first element becomes its default parameter
-/// set, i.e. the parameter set to be used in key pair generation unless
+/// A `NamedKeyPairGenerator` or `NamedKeyFactory` implementation must include
+/// a zero-argument public constructor that calls `super(fname, pnames)`, where
+/// `fname` is the family name of the algorithm and `pnames` are its supported
+/// parameter set names. `pnames` must contain at least one element. For an
+/// implementation of `NamedKeyPairGenerator`, the first element becomes its
+/// default parameter set, i.e. the parameter set used by generated keys unless
 /// [#initialize(AlgorithmParameterSpec, java.security.SecureRandom)]
 /// is called on a different parameter set.
 ///
+/// A `NamedKEM` or `NamedSignature` implementation must include a zero-argument
+/// public constructor that calls `super(fname, factory)`, where `fname` is the
+/// family name of the algorithm and `factory` is the `NamedKeyFactory` object
+/// that is used to translate foreign keys. `factory` only recognizes
+/// parameter sets supported by this implementation.
+///
 /// An implementation must implement all abstract methods. For all these
 /// methods, the implementation must relinquish any "ownership" of any input
 /// and output array argument. Precisely, the implementation must not retain
@@ -69,8 +74,8 @@ import java.util.Objects;
 /// array argument and must not retain any reference to an input array argument
 /// after the call.
 ///
-/// Also, an implementation must not keep any extra copy of a private key.
-/// For key generation, the only copy is the one returned in the
+/// Also, an implementation must not keep any extra copy of a private key in
+/// any format. For key generation, the only copy is the one returned in the
 /// [#implGenerateKeyPair] call. For all other methods, it must not make
 /// a copy of the input private key. A `KEM` implementation also must not
 /// keep a copy of the shared secret key, no matter if it's an encapsulator
@@ -84,6 +89,34 @@ import java.util.Objects;
 /// (For example, `implSign`) later. An implementation must not retain
 /// a reference of the parsed key.
 ///
+/// The private key, represented as a byte array when used in `NamedKEM` or
+/// `NamedSignature`, is referred to as its expanded format. For some
+/// algorithms, this format may differ from the
+/// [key material][NamedPKCS8Key#getRawBytes()] inside a PKCS #8 file. For example,
+/// [FIPS 204](https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.204.pdf)
+/// Table 2 defines the ML-DSA-65 private key as a 4032-byte array, which is
+/// used in the ML-DSA.Sign function in Algorithm 2, representing the
+/// expanded format. However, in
+/// [RFC 9881](https://datatracker.ietf.org/doc/html/rfc9881#name-private-key-format),
+/// a private key can be encoded into a CHOICE of three formats, none in the
+/// same as the FIPS 204 format. The choices are defined in
+/// [sun.security.util.KeyChoices]. A `NamedKeyPairGenerator` implementation
+/// should return both the expanded key and a preferred encoding in its
+///  [#implGenerateKeyPair] method.
+///
+/// A `NamedKeyFactory` must override the `implExpand` method to derive
+/// the expanded format from an encoding format, or return `null` if there
+/// is no difference.
+///
+/// Implementations may support multiple encoding formats.
+///
+/// A `NamedKeyFactory` must not modify the encoding when generating a key
+/// from a `KeySpec` object, ensuring that when re-encoded, the key retains
+/// its original encoding format.
+///
+/// A `NamedKeyFactory` can choose a different encoding format when
+/// `translateKey` is called.
+///
 /// When constructing a [NamedX509Key] or [NamedPKCS8Key] object from raw key
 /// bytes, the key bytes are directly referenced within the object, so the
 /// caller must not modify them afterward. Similarly, the key's `getRawBytes`
@@ -105,9 +138,9 @@ import java.util.Objects;
 public abstract class NamedKeyPairGenerator extends KeyPairGeneratorSpi {
 
     private final String fname; // family name
-    private final String[] pnames; // allowed parameter set name (at least one)
+    private final String[] pnames; // allowed parameter set names (at least one)
 
-    protected String name; // init as
+    protected String pname; // parameter set name, if can be determined
     private SecureRandom secureRandom;
 
     /// Creates a new `NamedKeyPairGenerator` object.
@@ -126,22 +159,22 @@ public abstract class NamedKeyPairGenerator extends KeyPairGeneratorSpi {
         this.pnames = pnames;
     }
 
-    private String checkName(String name) throws InvalidAlgorithmParameterException  {
-        for (var pname : pnames) {
-            if (pname.equalsIgnoreCase(name)) {
-                // return the stored standard name
-                return pname;
+    private String checkName(String pname) throws InvalidAlgorithmParameterException {
+        for (var n : pnames) {
+            if (n.equalsIgnoreCase(pname)) {
+                // return the stored standard pname
+                return n;
             }
         }
         throw new InvalidAlgorithmParameterException(
-                "Unsupported parameter set name: " + name);
+                "Unsupported parameter set name: " + pname);
     }
 
     @Override
     public void initialize(AlgorithmParameterSpec params, SecureRandom random)
             throws InvalidAlgorithmParameterException {
         if (params instanceof NamedParameterSpec spec) {
-            name = checkName(spec.getName());
+            pname = checkName(spec.getName());
         } else {
             throw new InvalidAlgorithmParameterException(
                     "Unsupported AlgorithmParameterSpec: " + params);
@@ -161,17 +194,21 @@ public abstract class NamedKeyPairGenerator extends KeyPairGeneratorSpi {
 
     @Override
     public KeyPair generateKeyPair() {
-        String pname = name != null ? name : pnames[0];
-        var keys = implGenerateKeyPair(pname, secureRandom);
-        return new KeyPair(new NamedX509Key(fname, pname, keys[0]),
-                new NamedPKCS8Key(fname, pname, keys[1]));
+        String tmpName = pname != null ? pname : pnames[0];
+        var keys = implGenerateKeyPair(tmpName, secureRandom);
+        return new KeyPair(new NamedX509Key(fname, tmpName, keys[0]),
+                NamedPKCS8Key.internalCreate(fname, tmpName, keys[1],
+                        keys.length == 2 ? null : keys[2]));
     }
 
     /// User-defined key pair generator.
     ///
     /// @param pname parameter set name
     /// @param sr `SecureRandom` object, `null` if not initialized
-    /// @return public key and private key (in this order) in raw bytes
+    /// @return the public key, the private key in its encoding format, and
+    ///         the private key in its expanded format (in this order) in
+    ///         raw bytes. If the expanded format of the private key is the
+    ///         same as its encoding format, the 3rd element must be omitted.
     /// @throws ProviderException if there is an internal error
     protected abstract byte[][] implGenerateKeyPair(String pname, SecureRandom sr);
 }
diff --git a/src/java.base/share/classes/sun/security/provider/NamedSignature.java b/src/java.base/share/classes/sun/security/provider/NamedSignature.java
index 921a39cfc92..07d20828c3c 100644
--- a/src/java.base/share/classes/sun/security/provider/NamedSignature.java
+++ b/src/java.base/share/classes/sun/security/provider/NamedSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ import java.security.SecureRandom;
 import java.security.SignatureException;
 import java.security.SignatureSpi;
 import java.security.spec.AlgorithmParameterSpec;
-import java.util.Objects;
 
 /// A base class for all `Signature` implementations that can be
 /// configured with a named parameter set. See [NamedKeyPairGenerator]
@@ -50,12 +49,12 @@ import java.util.Objects;
 public abstract class NamedSignature extends SignatureSpi {
 
     private final String fname; // family name
-    private final String[] pnames; // allowed parameter set name (at least one)
+    private final NamedKeyFactory fac;
 
     private final ByteArrayOutputStream bout = new ByteArrayOutputStream();
 
     // init with...
-    private String name;
+    private String pname;
     private byte[] secKey;
     private byte[] pubKey;
 
@@ -65,26 +64,23 @@ public abstract class NamedSignature extends SignatureSpi {
     /// Creates a new `NamedSignature` object.
     ///
     /// @param fname the family name
-    /// @param pnames the standard parameter set names, at least one is needed.
-    protected NamedSignature(String fname, String... pnames) {
+    /// @param fac the `KeyFactory` used to translate foreign keys and
+    ///         perform key validation
+    protected NamedSignature(String fname, NamedKeyFactory fac) {
         if (fname == null) {
             throw new AssertionError("fname cannot be null");
         }
-        if (pnames == null || pnames.length == 0) {
-            throw new AssertionError("pnames cannot be null or empty");
-        }
         this.fname = fname;
-        this.pnames = pnames;
+        this.fac = fac;
     }
 
     @Override
     protected void engineInitVerify(PublicKey publicKey) throws InvalidKeyException {
         // translate also check the key
-        var nk = (NamedX509Key) new NamedKeyFactory(fname, pnames)
-                .engineTranslateKey(publicKey);
-        name = nk.getParams().getName();
+        var nk = (NamedX509Key) fac.toNamedKey(publicKey);
+        pname = nk.getParams().getName();
         pubKey = nk.getRawBytes();
-        pk2 = implCheckPublicKey(name, pubKey);
+        pk2 = implCheckPublicKey(pname, pubKey);
         secKey = null;
         bout.reset();
     }
@@ -92,11 +88,10 @@ public abstract class NamedSignature extends SignatureSpi {
     @Override
     protected void engineInitSign(PrivateKey privateKey) throws InvalidKeyException {
         // translate also check the key
-        var nk = (NamedPKCS8Key) new NamedKeyFactory(fname, pnames)
-                .engineTranslateKey(privateKey);
-        name = nk.getParams().getName();
-        secKey = nk.getRawBytes();
-        sk2 = implCheckPrivateKey(name, secKey);
+        var nk = (NamedPKCS8Key) fac.toNamedKey(privateKey);
+        pname = nk.getParams().getName();
+        secKey = nk.getExpanded();
+        sk2 = implCheckPrivateKey(pname, secKey);
         pubKey = null;
         bout.reset();
     }
@@ -116,7 +111,7 @@ public abstract class NamedSignature extends SignatureSpi {
         if (secKey != null) {
             var msg = bout.toByteArray();
             bout.reset();
-            return implSign(name, secKey, sk2, msg, appRandom);
+            return implSign(pname, secKey, sk2, msg, appRandom);
         } else {
             throw new SignatureException("No private key");
         }
@@ -127,21 +122,21 @@ public abstract class NamedSignature extends SignatureSpi {
         if (pubKey != null) {
             var msg = bout.toByteArray();
             bout.reset();
-            return implVerify(name, pubKey, pk2, msg, sig);
+            return implVerify(pname, pubKey, pk2, msg, sig);
         } else {
             throw new SignatureException("No public key");
         }
     }
 
     @Override
-    @SuppressWarnings("deprecation")
+    @Deprecated
     protected void engineSetParameter(String param, Object value)
             throws InvalidParameterException {
         throw new InvalidParameterException("setParameter() not supported");
     }
 
     @Override
-    @SuppressWarnings("deprecation")
+    @Deprecated
     protected Object engineGetParameter(String param) throws InvalidParameterException {
         throw new InvalidParameterException("getParameter() not supported");
     }
@@ -162,7 +157,7 @@ public abstract class NamedSignature extends SignatureSpi {
 
     /// User-defined sign function.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param sk private key in raw bytes
     /// @param sk2 parsed private key, `null` if none. See [#implCheckPrivateKey].
     /// @param msg the message
@@ -170,12 +165,12 @@ public abstract class NamedSignature extends SignatureSpi {
     /// @return the signature
     /// @throws ProviderException if there is an internal error
     /// @throws SignatureException if there is another error
-    protected abstract byte[] implSign(String name, byte[] sk, Object sk2,
+    protected abstract byte[] implSign(String pname, byte[] sk, Object sk2,
             byte[] msg, SecureRandom sr) throws SignatureException;
 
     /// User-defined verify function.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param pk public key in raw bytes
     /// @param pk2 parsed public key, `null` if none. See [#implCheckPublicKey].
     /// @param msg the message
@@ -183,7 +178,7 @@ public abstract class NamedSignature extends SignatureSpi {
     /// @return true if verified
     /// @throws ProviderException if there is an internal error
     /// @throws SignatureException if there is another error
-    protected abstract boolean implVerify(String name, byte[] pk, Object pk2,
+    protected abstract boolean implVerify(String pname, byte[] pk, Object pk2,
             byte[] msg, byte[] sig) throws SignatureException;
 
     /// User-defined function to validate a public key.
@@ -195,11 +190,11 @@ public abstract class NamedSignature extends SignatureSpi {
     ///
     /// The default implementation returns `null`.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param pk public key in raw bytes
     /// @return a parsed key, `null` if none.
     /// @throws InvalidKeyException if the key is invalid
-    protected Object implCheckPublicKey(String name, byte[] pk) throws InvalidKeyException {
+    protected Object implCheckPublicKey(String pname, byte[] pk) throws InvalidKeyException {
         return null;
     }
 
@@ -212,11 +207,11 @@ public abstract class NamedSignature extends SignatureSpi {
     ///
     /// The default implementation returns `null`.
     ///
-    /// @param name parameter name
+    /// @param pname parameter name
     /// @param sk private key in raw bytes
     /// @return a parsed key, `null` if none.
     /// @throws InvalidKeyException if the key is invalid
-    protected Object implCheckPrivateKey(String name, byte[] sk) throws InvalidKeyException {
+    protected Object implCheckPrivateKey(String pname, byte[] sk) throws InvalidKeyException {
         return null;
     }
 }
diff --git a/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java b/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
index 28729a56dbd..3e1fc8db164 100644
--- a/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
+++ b/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLConnection;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
@@ -48,8 +49,11 @@ import java.security.cert.X509CRL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
 
 import sun.security.x509.AccessDescription;
 import sun.security.x509.GeneralNameInterface;
@@ -58,6 +62,8 @@ import sun.security.util.Cache;
 import sun.security.util.Debug;
 import sun.security.util.SecurityProperties;
 
+import javax.security.auth.x500.X500Principal;
+
 /**
  * A <code>CertStore</code> that retrieves <code>Certificates</code> or
  * <code>CRL</code>s from a URI, for example, as specified in an X.509
@@ -182,6 +188,166 @@ class URICertStore extends CertStoreSpi {
         return timeoutVal;
     }
 
+    /**
+     * Enumeration for the allowed schemes we support when following a
+     * URI from an authorityInfoAccess extension on a certificate.
+     */
+    private enum AllowedScheme {
+        HTTP(HttpFtpRuleMatcher.HTTP),
+        HTTPS(HttpFtpRuleMatcher.HTTPS),
+        LDAP(LdapRuleMatcher.LDAP),
+        LDAPS(LdapRuleMatcher.LDAPS),
+        FTP(HttpFtpRuleMatcher.FTP);
+
+        final URIRuleMatcher ruleMatcher;
+
+        AllowedScheme(URIRuleMatcher matcher) {
+            ruleMatcher = matcher;
+        }
+
+        /**
+         * Return an {@code AllowedScheme} based on a case-insensitive match
+         * @param name the scheme name to be matched
+         * @return the {@code AllowedScheme} that corresponds to the
+         *      {@code name} provided, or null if there is no match.
+         */
+        static AllowedScheme nameOf(String name) {
+            if (name == null) {
+                return null;
+            }
+
+            try {
+                return AllowedScheme.valueOf(name.toUpperCase(Locale.ROOT));
+            } catch (IllegalArgumentException _) {
+                return null;
+            }
+        }
+    }
+
+    private static Set<URI> CA_ISS_URI_FILTERS = null;
+    private static final boolean CA_ISS_ALLOW_ANY;
+
+    static {
+        boolean allowAny = false;
+        try {
+            if (Builder.USE_AIA) {
+                CA_ISS_URI_FILTERS = new LinkedHashSet<>();
+                String aiaPropVal = Optional.ofNullable(
+                        SecurityProperties.getOverridableProperty(
+                                "com.sun.security.allowedAIALocations")).
+                        map(String::trim).orElse("");
+                if (aiaPropVal.equalsIgnoreCase("any")) {
+                    allowAny = true;
+                    if (debug != null) {
+                        debug.println("allowedAIALocations: Warning: " +
+                                "Allow-All URI filtering enabled!");
+                    }
+                } else {
+                    // Load all the valid rules from the Security property
+                    if (!aiaPropVal.isEmpty()) {
+                        String[] aiaUriStrs = aiaPropVal.trim().split("\\s+");
+                        addCaIssUriFilters(aiaUriStrs);
+                    }
+
+                    if (CA_ISS_URI_FILTERS.isEmpty()) {
+                        if (debug != null) {
+                            debug.println("allowedAIALocations: Warning: " +
+                                    "No valid filters found. Deny-all URI " +
+                                    "filtering is active.");
+                        }
+                    }
+                }
+            }
+        } finally {
+            CA_ISS_ALLOW_ANY = allowAny;
+        }
+    }
+
+    /**
+     * Populate the filter collection from the list of AIA CA issuer URIs
+     * found in the {@code com.sun.security.allowedAIALocations} security
+     * or system property.
+     *
+     * @param aiaUriStrs array containing String URI filters
+     */
+    private static void addCaIssUriFilters(String[] aiaUriStrs) {
+        for (String aiaStr : aiaUriStrs) {
+            if (aiaStr != null && !aiaStr.isEmpty()) {
+                try {
+                    AllowedScheme scheme;
+                    URI aiaUri = new URI(aiaStr).normalize();
+                    // It must be absolute and non-opaque
+                    if (!aiaUri.isAbsolute() || aiaUri.isOpaque()) {
+                        if (debug != null) {
+                            debug.println("allowedAIALocations: Skipping " +
+                                    "non-absolute or opaque URI " + aiaUri);
+                        }
+                    } else if (aiaUri.getHost() == null) {
+                        // We do not allow rules with URIs that omit a hostname
+                        // or address.
+                        if (debug != null) {
+                            debug.println("allowedAIALocations: Skipping " +
+                                    "URI rule with no hostname or address: " +
+                                    aiaUri);
+                        }
+                    } else if ((scheme = AllowedScheme.nameOf(
+                            aiaUri.getScheme())) != null) {
+                        // When it is an LDAP type, we can check the path
+                        // portion (the DN) for proper structure and reject
+                        // the rule early if it isn't correct.
+                        if (scheme == AllowedScheme.LDAP ||
+                                scheme == AllowedScheme.LDAPS) {
+                            try {
+                                new X500Principal(aiaUri.getPath().
+                                        replaceFirst("^/+", ""));
+                            } catch (IllegalArgumentException iae) {
+                                if (debug != null) {
+                                    debug.println("allowedAIALocations: " +
+                                            "Skipping LDAP rule: " + iae);
+                                }
+                                continue;
+                            }
+                        }
+
+                        // When a URI has a non-null query or fragment
+                        // warn the user upon adding the rule that those
+                        // components will be ignored
+                        if (aiaUri.getQuery() != null) {
+                            if (debug != null) {
+                                debug.println("allowedAIALocations: " +
+                                        "Rule will ignore non-null query");
+                            }
+                        }
+                        if (aiaUri.getFragment() != null) {
+                            if (debug != null) {
+                                debug.println("allowedAIALocations: " +
+                                        "Rule will ignore non-null fragment");
+                            }
+                        }
+
+                        CA_ISS_URI_FILTERS.add(aiaUri);
+                        if (debug != null) {
+                            debug.println("allowedAIALocations: Added " +
+                                    aiaUri + " to URI filters");
+                        }
+                    } else {
+                        if (debug != null) {
+                            debug.println("allowedAIALocations: Disallowed " +
+                                    "filter URI scheme: " +
+                                    aiaUri.getScheme());
+                        }
+                    }
+                } catch (URISyntaxException urise) {
+                    if (debug != null) {
+                        debug.println("allowedAIALocations: Skipping " +
+                                "filter URI entry " + aiaStr +
+                                ": parse failure at index " + urise.getIndex());
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Creates a URICertStore.
      *
@@ -244,6 +410,39 @@ class URICertStore extends CertStoreSpi {
             return null;
         }
         URI uri = ((URIName) gn).getURI();
+
+        // Before performing any instantiation make sure that
+        // the URI passes any filtering rules.  This processing should
+        // only occur if the com.sun.security.enableAIAcaIssuers is true
+        // and the "any" rule has not been specified.
+        if (Builder.USE_AIA && !CA_ISS_ALLOW_ANY) {
+            URI normAIAUri = uri.normalize();
+            AllowedScheme scheme = AllowedScheme.nameOf(normAIAUri.getScheme());
+
+            if (scheme == null) {
+                if (debug != null) {
+                    debug.println("allowedAIALocations: No matching ruleset " +
+                            "for scheme " + normAIAUri.getScheme());
+                }
+                return null;
+            }
+
+            // Go through each of the filter rules and see if any will
+            // make a positive match against the caIssuer URI.  If nothing
+            // matches then we won't instantiate a URICertStore.
+            if (CA_ISS_URI_FILTERS.stream().noneMatch(rule ->
+                    scheme.ruleMatcher.matchRule(rule, normAIAUri))) {
+                if (debug != null) {
+                    debug.println("allowedAIALocations: Warning - " +
+                        "The caIssuer URI " + normAIAUri +
+                        " in the AuthorityInfoAccess extension is denied " +
+                        "access. Use the com.sun.security.allowedAIALocations" +
+                        " security/system property to allow access.");
+                }
+                return null;
+            }
+        }
+
         try {
             return URICertStore.getInstance(new URICertStoreParameters(uri));
         } catch (Exception ex) {
@@ -270,7 +469,7 @@ class URICertStore extends CertStoreSpi {
     @Override
     @SuppressWarnings("unchecked")
     public synchronized Collection<X509Certificate> engineGetCertificates
-        (CertSelector selector) throws CertStoreException {
+            (CertSelector selector) throws CertStoreException {
 
         if (ldap) {
             // caching mechanism, see the class description for more info.
@@ -462,4 +661,159 @@ class URICertStore extends CertStoreSpi {
             super(spi, p, type, params);
         }
     }
+
+    /**
+     * URIRuleMatcher - abstract base class for the rule sets used for
+     * various URI schemes.
+     */
+    static abstract class URIRuleMatcher {
+        protected final int wellKnownPort;
+
+        protected URIRuleMatcher(int port) {
+            wellKnownPort = port;
+        }
+
+        /**
+         * Attempt to match the scheme, host and port between a filter
+         * rule URI and a URI coming from an AIA extension.
+         *
+         * @param filterRule the filter rule to match against
+         * @param caIssuer the AIA URI being compared
+         * @return true if the scheme, host and port numbers match, false if
+         * any of the components do not match. If a port number is omitted in
+         * either the filter rule or AIA URI, the well-known port for that
+         * scheme is used in the comparison.
+         */
+        boolean schemeHostPortCheck(URI filterRule, URI caIssuer) {
+            if (!filterRule.getScheme().equalsIgnoreCase(
+                    caIssuer.getScheme())) {
+                return false;
+            } else if (!filterRule.getHost().equalsIgnoreCase(
+                    caIssuer.getHost())) {
+                return false;
+            } else {
+                try {
+                    // Check for port matching, taking into consideration
+                    // default ports
+                    int fPort = (filterRule.getPort() == -1) ? wellKnownPort :
+                            filterRule.getPort();
+                    int caiPort = (caIssuer.getPort() == -1) ? wellKnownPort :
+                            caIssuer.getPort();
+                    if (fPort != caiPort) {
+                        return false;
+                    }
+                } catch (IllegalArgumentException iae) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * Attempt to match an AIA URI against a specific filter rule.  The
+         * specific rules to apply are implementation dependent.
+         *
+         * @param filterRule the filter rule to match against
+         * @param caIssuer the AIA URI being compared
+         * @return true if all matching rules pass, false if any fail.
+         */
+        abstract boolean matchRule(URI filterRule, URI caIssuer);
+    }
+
+    static class HttpFtpRuleMatcher extends URIRuleMatcher {
+        static final HttpFtpRuleMatcher HTTP = new HttpFtpRuleMatcher(80);
+        static final HttpFtpRuleMatcher HTTPS = new HttpFtpRuleMatcher(443);
+        static final HttpFtpRuleMatcher FTP = new HttpFtpRuleMatcher(21);
+
+        private HttpFtpRuleMatcher(int port) {
+            super(port);
+        }
+
+        @Override
+        boolean matchRule(URI filterRule, URI caIssuer) {
+            // Check for scheme/host/port matching
+            if (!schemeHostPortCheck(filterRule, caIssuer)) {
+                return false;
+            }
+
+            // Check the path component to make sure the filter is at
+            // least a root of the AIA caIssuer URI's path.  It must be
+            // a case-sensitive match for all platforms.
+            if (!isRootOf(filterRule, caIssuer)) {
+                if (debug != null) {
+                    debug.println("allowedAIALocations: Match failed: " +
+                            "AIA URI is not within the rule's path hierarchy.");
+                }
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * Performs a hierarchical containment check, ensuring that the
+         * base URI's path is a root component of the candidate path.  The
+         * path comparison is case-sensitive.  If the base path ends in a
+         * slash (/) then all candidate paths that begin with the base
+         * path are allowed.  If it does not end in a slash, then it is
+         * assumed that the leaf node in the base path is a file component
+         * and both paths must match exactly.
+         *
+         * @param base the URI that contains the root path
+         * @param candidate the URI that contains the path being evaluated
+         * @return true if {@code candidate} is a child path of {@code base},
+         *         false otherwise.
+         */
+        private static boolean isRootOf(URI base, URI candidate) {
+            // Note: The URIs have already been normalized at this point and
+            // HTTP URIs cannot have null paths.  If it's an empty path
+            // then consider the path to be "/".
+            String basePath = Optional.of(base.getPath()).
+                    filter(p -> !p.isEmpty()).orElse("/");
+            String candPath = Optional.of(candidate.getPath()).
+                    filter(p -> !p.isEmpty()).orElse("/");
+            return (basePath.endsWith("/")) ? candPath.startsWith(basePath) :
+                    candPath.equals(basePath);
+        }
+    }
+
+    static class LdapRuleMatcher extends URIRuleMatcher {
+        static final LdapRuleMatcher LDAP = new LdapRuleMatcher(389);
+        static final LdapRuleMatcher LDAPS = new LdapRuleMatcher(636);
+
+        private LdapRuleMatcher(int port) {
+            super(port);
+        }
+
+        @Override
+        boolean matchRule(URI filterRule, URI caIssuer) {
+            // Check for scheme/host/port matching
+            if (!schemeHostPortCheck(filterRule, caIssuer)) {
+                return false;
+            }
+
+            // Obtain the base DN component and compare
+            try {
+                X500Principal filterBaseDn = new X500Principal(
+                        filterRule.getPath().replaceFirst("^/+", ""));
+                X500Principal caIssBaseDn = new X500Principal(
+                        caIssuer.getPath().replaceFirst("^/+", ""));
+                if (!filterBaseDn.equals(caIssBaseDn)) {
+                    if (debug != null) {
+                        debug.println("allowedAIALocations: Match failed: " +
+                                "Base DN mismatch (" + filterBaseDn + " vs " +
+                                caIssBaseDn + ")");
+                    }
+                    return false;
+                }
+            } catch (IllegalArgumentException iae) {
+                if (debug != null) {
+                    debug.println("allowedAIALocations: Match failed on DN: " +
+                            iae);
+                }
+                return false;
+            }
+
+            return true;
+        }
+    }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/Alert.java b/src/java.base/share/classes/sun/security/ssl/Alert.java
index d172206326f..fb06b02a5d4 100644
--- a/src/java.base/share/classes/sun/security/ssl/Alert.java
+++ b/src/java.base/share/classes/sun/security/ssl/Alert.java
@@ -238,7 +238,7 @@ public enum Alert {
             TransportContext tc = (TransportContext)context;
 
             AlertMessage am = new AlertMessage(tc, m);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("Received alert message", am);
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java b/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java
index f03a65c8410..f56b6f39a44 100644
--- a/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/AlpnExtension.java
@@ -157,7 +157,8 @@ final class AlpnExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_ALPN)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn()
+                        && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.info(
                             "Ignore client unavailable extension: " +
                             SSLExtension.CH_ALPN.name);
@@ -170,7 +171,8 @@ final class AlpnExtension {
 
             String[] laps = chc.sslConfig.applicationProtocols;
             if ((laps == null) || (laps.length == 0)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.info(
                             "No available application protocols");
                 }
@@ -183,7 +185,8 @@ final class AlpnExtension {
                 int length = ap.getBytes(alpnCharset).length;
                 if (length == 0) {
                     // log the configuration problem
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.severe(
                                 "Application protocol name cannot be empty");
                     }
@@ -197,7 +200,8 @@ final class AlpnExtension {
                     listLength += (length + 1);
                 } else {
                     // log the configuration problem
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.severe(
                                 "Application protocol name (" + ap +
                                 ") exceeds the size limit (" +
@@ -212,7 +216,8 @@ final class AlpnExtension {
 
                 if (listLength > MAX_AP_LIST_LENGTH) {
                     // log the configuration problem
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.severe(
                                 "The configured application protocols (" +
                                 Arrays.toString(laps) +
@@ -266,7 +271,8 @@ final class AlpnExtension {
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_ALPN)) {
                 shc.applicationProtocol = "";
                 shc.conContext.applicationProtocol = "";
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.info(
                             "Ignore server unavailable extension: " +
                             SSLExtension.CH_ALPN.name);
@@ -288,7 +294,8 @@ final class AlpnExtension {
             if (noAPSelector && noAlpnProtocols) {
                 shc.applicationProtocol = "";
                 shc.conContext.applicationProtocol = "";
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore server unenabled extension: " +
                             SSLExtension.CH_ALPN.name);
@@ -378,7 +385,8 @@ final class AlpnExtension {
                     (AlpnSpec)shc.handshakeExtensions.get(SSLExtension.CH_ALPN);
             if (requestedAlps == null) {
                 // Ignore, this extension was not requested and accepted.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable extension: " +
                             SSLExtension.SH_ALPN.name);
@@ -423,7 +431,8 @@ final class AlpnExtension {
                 // Ignore, no negotiated application layer protocol.
                 shc.applicationProtocol = "";
                 shc.conContext.applicationProtocol = "";
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "Ignore, no negotiated application layer protocol");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
index 2d03d5fef98..1444a77aa90 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
@@ -94,7 +94,8 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
@@ -144,7 +145,8 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
@@ -235,7 +237,8 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
@@ -283,7 +286,8 @@ final class CertSignAlgsExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "signature_algorithms_cert extension");
diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
index dd9b7017390..898c8b3d408 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
@@ -144,7 +144,8 @@ final class CertStatusExtension {
             if (statusType == CertStatusRequestType.OCSP.id) {
                 this.statusRequest = new OCSPStatusRequest(statusType, encoded);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.info(
                         "Unknown certificate status request " +
                         "(status type: " + statusType + ")");
@@ -196,7 +197,8 @@ final class CertStatusExtension {
             if (type == CertStatusRequestType.OCSP.id) {
                 this.statusResponse = new OCSPStatusResponse(type, respData);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.info(
                         "Unknown certificate status response " +
                         "(status type: " + type + ")");
@@ -557,7 +559,8 @@ final class CertStatusExtension {
             }
 
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         SSLExtension.CH_STATUS_REQUEST.name);
@@ -598,7 +601,8 @@ final class CertStatusExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                         SSLExtension.CH_STATUS_REQUEST.name);
                 }
@@ -656,7 +660,8 @@ final class CertStatusExtension {
                     shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST);
             if (spec == null) {
                 // Ignore, no status_request extension requested.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest("Ignore unavailable extension: " +
                         SSLExtension.CH_STATUS_REQUEST.name);
                 }
@@ -666,7 +671,8 @@ final class CertStatusExtension {
 
             // Is it a session resuming?
             if (shc.isResumption) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "No status_request response for session resuming");
                 }
@@ -839,7 +845,8 @@ final class CertStatusExtension {
                     statusRequests.add(
                             new OCSPStatusRequest(statusType, encoded));
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.info(
                                 "Unknown certificate status request " +
                                 "(status type: " + statusType + ")");
@@ -915,7 +922,8 @@ final class CertStatusExtension {
             }
 
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable status_request_v2 extension");
                 }
@@ -957,7 +965,8 @@ final class CertStatusExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable status_request_v2 extension");
                 }
@@ -1017,7 +1026,8 @@ final class CertStatusExtension {
                 shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST_V2);
             if (spec == null) {
                 // Ignore, no status_request_v2 extension requested.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable status_request_v2 extension");
                 }
@@ -1027,7 +1037,8 @@ final class CertStatusExtension {
 
             // Is it a session resuming?
             if (shc.isResumption) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "No status_request_v2 response for session resumption");
                 }
@@ -1112,7 +1123,8 @@ final class CertStatusExtension {
 
             // Stapling needs to be active and have valid data to proceed
             if (shc.stapleParams == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Stapling is disabled for this connection");
                 }
@@ -1121,7 +1133,8 @@ final class CertStatusExtension {
 
             // There needs to be a non-null CertificateEntry to proceed
             if (shc.currentCertEntry == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest("Found null CertificateEntry in context");
                 }
                 return null;
@@ -1140,7 +1153,7 @@ final class CertStatusExtension {
                 if (respBytes == null) {
                     // We're done with this entry.  Clear it from the context
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest("No status response found for " +
                                 x509Cert.getSubjectX500Principal());
                     }
@@ -1149,7 +1162,8 @@ final class CertStatusExtension {
                 }
 
                 // Build a proper response buffer from the stapling information
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest("Found status response for " +
                             x509Cert.getSubjectX500Principal() +
                             ", response length: " + respBytes.length);
@@ -1208,7 +1222,8 @@ final class CertStatusExtension {
                 respList.add(spec.statusResponse.encodedResponse);
                 chc.handshakeSession.setStatusResponses(respList);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest(
                             "Ignoring stapled data on resumed session");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
index 6be84e8f8fa..60f13e9ddad 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
@@ -192,7 +192,8 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
@@ -205,7 +206,8 @@ final class CertificateAuthoritiesExtension {
             X509Certificate[] caCerts =
                     chc.sslContext.getX509TrustManager().getAcceptedIssuers();
             if (caCerts.length == 0) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "No available certificate authorities");
                 }
@@ -216,7 +218,8 @@ final class CertificateAuthoritiesExtension {
             List<byte[]> encodedCAs =
                     CertificateAuthoritiesSpec.getEncodedAuthorities(caCerts);
             if (encodedCAs.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "The number of CAs exceeds the maximum size " +
                             "of the certificate_authorities extension");
@@ -270,7 +273,8 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
@@ -319,7 +323,8 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CR_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
@@ -332,7 +337,8 @@ final class CertificateAuthoritiesExtension {
             X509Certificate[] caCerts =
                     shc.sslContext.getX509TrustManager().getAcceptedIssuers();
             if (caCerts.length == 0) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "No available certificate authorities");
                 }
@@ -343,7 +349,8 @@ final class CertificateAuthoritiesExtension {
             List<byte[]> encodedCAs =
                     CertificateAuthoritiesSpec.getEncodedAuthorities(caCerts);
             if (encodedCAs.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "Too many certificate authorities to use " +
                             "the certificate_authorities extension");
@@ -397,7 +404,8 @@ final class CertificateAuthoritiesExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CR_CERTIFICATE_AUTHORITIES)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable " +
                             "certificate_authorities extension");
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
index 2a2db34cab9..c6897d71aa6 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -265,7 +265,8 @@ final class CertificateMessage {
             shc.handshakeSession.setLocalCertificates(x509Possession.popCerts);
             T12CertificateMessage cm =
                     new T12CertificateMessage(shc, x509Possession.popCerts);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced server Certificate handshake message", cm);
             }
@@ -293,7 +294,8 @@ final class CertificateMessage {
             // an empty cert chain instead.
             if (x509Possession == null) {
                 if (chc.negotiatedProtocol.useTLS10PlusSpec()) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "No X.509 certificate for client authentication, " +
                             "use empty Certificate message instead");
@@ -302,7 +304,8 @@ final class CertificateMessage {
                     x509Possession =
                             new X509Possession(null, new X509Certificate[0]);
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "No X.509 certificate for client authentication, " +
                             "send a no_certificate alert");
@@ -324,7 +327,8 @@ final class CertificateMessage {
             }
             T12CertificateMessage cm =
                     new T12CertificateMessage(chc, x509Possession.popCerts);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced client Certificate handshake message", cm);
             }
@@ -360,13 +364,15 @@ final class CertificateMessage {
 
             T12CertificateMessage cm = new T12CertificateMessage(hc, message);
             if (hc.sslConfig.isClientMode) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Consuming server Certificate handshake message", cm);
                 }
                 onCertificate((ClientHandshakeContext)context, cm);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Consuming client Certificate handshake message", cm);
                 }
@@ -501,7 +507,8 @@ final class CertificateMessage {
             try {
                 thisSubjectAltNames = thisCert.getSubjectAlternativeNames();
             } catch (CertificateParsingException cpe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Attempt to obtain subjectAltNames extension failed!");
                 }
@@ -511,7 +518,8 @@ final class CertificateMessage {
             try {
                 prevSubjectAltNames = prevCert.getSubjectAlternativeNames();
             } catch (CertificateParsingException cpe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Attempt to obtain subjectAltNames extension failed!");
                 }
@@ -980,7 +988,8 @@ final class CertificateMessage {
                 certEnt.extensions.produce(shc, enabledCTExts);
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced server Certificate message", cm);
             }
 
@@ -997,7 +1006,8 @@ final class CertificateMessage {
                 ClientHelloMessage clientHello) {
             if (hc.peerRequestedCertSignSchemes == null ||
                     hc.peerRequestedCertSignSchemes.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "No signature_algorithms(_cert) in ClientHello");
                 }
@@ -1008,20 +1018,27 @@ final class CertificateMessage {
                     .stream()
                     .map(ss -> ss.keyAlgorithm)
                     .distinct()
-                    .filter(ka -> SignatureScheme.getPreferableAlgorithm(   // Don't select a signature scheme unless
-                            hc.algorithmConstraints,                        //  we will be able to produce
-                            hc.peerRequestedSignatureSchemes,               //  a CertificateVerify message later
+                    .filter(ka -> SignatureScheme.getPreferableAlgorithm(
+                            // Don't select a signature scheme unless
+                            // we will be able to produce a
+                            // CertificateVerify message later
+                            hc.algorithmConstraints,
+                            hc.peerRequestedSignatureSchemes,
                             ka, hc.negotiatedProtocol) != null
-                            || SSLLogger.logWarning("ssl,handshake",
-                                    "Unable to produce CertificateVerify for key algorithm: " + ka))
-                    .filter(ka -> X509Authentication.valueOfKeyAlgorithm(ka) != null
-                            || SSLLogger.logWarning("ssl,handshake", "Unsupported key algorithm: " + ka))
+                            || SSLLogger.logWarning(SSLLogger.Opt.HANDSHAKE,
+                                    "Unable to produce CertificateVerify for " +
+                                            "key algorithm: " + ka))
+                    .filter(ka ->
+                            X509Authentication.valueOfKeyAlgorithm(ka) != null
+                            || SSLLogger.logWarning(SSLLogger.Opt.HANDSHAKE,
+                            "Unsupported key algorithm: " + ka))
                     .toArray(String[]::new);
 
             SSLPossession pos = X509Authentication
                     .createPossession(hc, supportedKeyTypes);
             if (pos == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("No available authentication scheme");
                 }
             }
@@ -1034,14 +1051,16 @@ final class CertificateMessage {
             SSLPossession pos = choosePossession(chc, clientHello);
             X509Certificate[] localCerts;
             if (pos == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("No available client authentication scheme");
                 }
                 localCerts = new X509Certificate[0];
             } else {
                 chc.handshakePossessions.add(pos);
                 if (!(pos instanceof X509Possession x509Possession)) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "No X.509 certificate for client authentication");
                     }
@@ -1067,7 +1086,8 @@ final class CertificateMessage {
                 throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "Failed to produce client Certificate message", ce);
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced client Certificate message", cm);
             }
 
@@ -1103,18 +1123,20 @@ final class CertificateMessage {
             if (hc.handshakeConsumers.containsKey(
                     SSLHandshake.ENCRYPTED_EXTENSIONS.id)) {
                 throw hc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
-                                           "Unexpected Certificate handshake message");
+                                   "Unexpected Certificate handshake message");
             }
 
             T13CertificateMessage cm = new T13CertificateMessage(hc, message);
             if (hc.sslConfig.isClientMode) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Consuming server Certificate handshake message", cm);
                 }
                 onConsumeCertificate((ClientHandshakeContext)context, cm);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Consuming client Certificate handshake message", cm);
                 }
@@ -1365,5 +1387,4 @@ final class CertificateMessage {
 
         return alert;
     }
-
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
index a297d9d21b2..039399560cd 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
@@ -297,7 +297,7 @@ final class CertificateRequest {
                     shc.sslContext.getX509TrustManager().getAcceptedIssuers();
             T10CertificateRequestMessage crm = new T10CertificateRequestMessage(
                     shc, caCerts, shc.negotiatedCipherSuite.keyExchange);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced CertificateRequest handshake message", crm);
             }
@@ -360,7 +360,7 @@ final class CertificateRequest {
 
             T10CertificateRequestMessage crm =
                     new T10CertificateRequestMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming CertificateRequest handshake message", crm);
             }
@@ -400,7 +400,8 @@ final class CertificateRequest {
             }
 
             if (clientAlias == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("No available client authentication");
                 }
                 return;
@@ -408,7 +409,8 @@ final class CertificateRequest {
 
             PrivateKey clientPrivateKey = km.getPrivateKey(clientAlias);
             if (clientPrivateKey == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("No available client private key");
                 }
                 return;
@@ -416,7 +418,8 @@ final class CertificateRequest {
 
             X509Certificate[] clientCerts = km.getCertificateChain(clientAlias);
             if ((clientCerts == null) || (clientCerts.length == 0)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("No available client certificate");
                 }
                 return;
@@ -655,7 +658,7 @@ final class CertificateRequest {
             T12CertificateRequestMessage crm = new T12CertificateRequestMessage(
                     shc, caCerts, shc.negotiatedCipherSuite.keyExchange,
                     certReqSignAlgs);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced CertificateRequest handshake message", crm);
             }
@@ -717,7 +720,7 @@ final class CertificateRequest {
 
             T12CertificateRequestMessage crm =
                     new T12CertificateRequestMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming CertificateRequest handshake message", crm);
             }
@@ -784,7 +787,8 @@ final class CertificateRequest {
                 T12CertificateRequestMessage crm) {
             if (hc.peerRequestedCertSignSchemes == null ||
                     hc.peerRequestedCertSignSchemes.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("No signature and hash algorithms " +
                             "in CertificateRequest");
                 }
@@ -804,26 +808,32 @@ final class CertificateRequest {
                     .stream()
                     .map(ss -> ss.keyAlgorithm)
                     .distinct()
-                    .filter(ka -> SignatureScheme.getPreferableAlgorithm(   // Don't select a signature scheme unless
-                            hc.algorithmConstraints,                        //  we will be able to produce
-                            hc.peerRequestedSignatureSchemes,               //  a CertificateVerify message later
+                    // Don't select a signature scheme unless we will be
+                    // able to produce a CertificateVerify message later
+                    .filter(ka -> SignatureScheme.getPreferableAlgorithm(
+                            hc.algorithmConstraints,
+                            hc.peerRequestedSignatureSchemes,
                             ka, hc.negotiatedProtocol) != null
-                            || SSLLogger.logWarning("ssl,handshake",
-                                    "Unable to produce CertificateVerify for key algorithm: " + ka))
+                            || SSLLogger.logWarning(SSLLogger.Opt.HANDSHAKE,
+                                "Unable to produce CertificateVerify for" +
+                                        "key algorithm: " + ka))
                     .filter(ka -> {
                         var xa = X509Authentication.valueOfKeyAlgorithm(ka);
                         // Any auth object will have a set of allowed key types.
-                        // This set should share at least one common algorithm with
-                        // the CR's allowed key types.
-                        return xa != null && !Collections.disjoint(crKeyTypes, Arrays.asList(xa.keyTypes))
-                                || SSLLogger.logWarning("ssl,handshake", "Unsupported key algorithm: " + ka);
+                        // This set should share at least one common
+                        // algorithm with the CR's allowed key types.
+                        return xa != null && !Collections.disjoint(crKeyTypes,
+                                Arrays.asList(xa.keyTypes))
+                                || SSLLogger.logWarning(SSLLogger.Opt.HANDSHAKE,
+                                "Unsupported key algorithm: " + ka);
                     })
                     .toArray(String[]::new);
 
             SSLPossession pos = X509Authentication
                     .createPossession(hc, supportedKeyTypes);
             if (pos == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("No available authentication scheme");
                 }
             }
@@ -933,7 +943,8 @@ final class CertificateRequest {
             SSLExtension[] extTypes = shc.sslConfig.getEnabledExtensions(
                     SSLHandshake.CERTIFICATE_REQUEST, shc.negotiatedProtocol);
             crm.extensions.produce(shc, extTypes);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced CertificateRequest message", crm);
             }
 
@@ -985,7 +996,7 @@ final class CertificateRequest {
 
             T13CertificateRequestMessage crm =
                     new T13CertificateRequestMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming CertificateRequest handshake message", crm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
index c2286f3c422..af1e50d3087 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateStatus.java
@@ -281,7 +281,7 @@ final class CertificateStatus {
                     new CertificateStatusMessage(chc, message);
 
             // Log the message
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming server CertificateStatus handshake message",
                         cst);
@@ -325,7 +325,7 @@ final class CertificateStatus {
 
             // Create the CertificateStatus message from info in the
             CertificateStatusMessage csm = new CertificateStatusMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced server CertificateStatus handshake message", csm);
             }
@@ -358,7 +358,8 @@ final class CertificateStatus {
                 // status_request[_v2] extension.  2) The CertificateStatus
                 // message was not sent.  This means that cert path checking
                 // was deferred, but must happen immediately.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Server did not send CertificateStatus, " +
                             "checking cert chain without status info.");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java b/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
index 18ea2b9c3de..47fdef0136d 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateVerify.java
@@ -248,7 +248,8 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -258,7 +259,7 @@ final class CertificateVerify {
 
             S30CertificateVerifyMessage cvm =
                     new S30CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced CertificateVerify handshake message", cvm);
             }
@@ -300,7 +301,7 @@ final class CertificateVerify {
 
             S30CertificateVerifyMessage cvm =
                     new S30CertificateVerifyMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming CertificateVerify handshake message", cvm);
             }
@@ -503,7 +504,8 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -513,7 +515,7 @@ final class CertificateVerify {
 
             T10CertificateVerifyMessage cvm =
                     new T10CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced CertificateVerify handshake message", cvm);
             }
@@ -555,7 +557,7 @@ final class CertificateVerify {
 
             T10CertificateVerifyMessage cvm =
                     new T10CertificateVerifyMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming CertificateVerify handshake message", cvm);
             }
@@ -754,7 +756,8 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -764,7 +767,7 @@ final class CertificateVerify {
 
             T12CertificateVerifyMessage cvm =
                     new T12CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced CertificateVerify handshake message", cvm);
             }
@@ -806,7 +809,7 @@ final class CertificateVerify {
 
             T12CertificateVerifyMessage cvm =
                     new T12CertificateVerifyMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming CertificateVerify handshake message", cvm);
             }
@@ -1092,7 +1095,8 @@ final class CertificateVerify {
 
             if (x509Possession == null ||
                     x509Possession.popPrivateKey == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "No X.509 credentials negotiated for CertificateVerify");
                 }
@@ -1113,7 +1117,7 @@ final class CertificateVerify {
                 X509Possession x509Possession) throws IOException {
             T13CertificateVerifyMessage cvm =
                     new T13CertificateVerifyMessage(shc, x509Possession);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced server CertificateVerify handshake message", cvm);
             }
@@ -1130,7 +1134,7 @@ final class CertificateVerify {
                 X509Possession x509Possession) throws IOException {
             T13CertificateVerifyMessage cvm =
                     new T13CertificateVerifyMessage(chc, x509Possession);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced client CertificateVerify handshake message", cvm);
             }
@@ -1173,7 +1177,7 @@ final class CertificateVerify {
 
             T13CertificateVerifyMessage cvm =
                     new T13CertificateVerifyMessage(hc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming CertificateVerify handshake message", cvm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java b/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
index d3eac8f13af..2907fc4d7b9 100644
--- a/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
+++ b/src/java.base/share/classes/sun/security/ssl/ChangeCipherSpec.java
@@ -108,7 +108,7 @@ final class ChangeCipherSpec {
                     ") and protocol version (" + hc.negotiatedProtocol + ")");
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced ChangeCipherSpec message");
             }
 
@@ -142,7 +142,7 @@ final class ChangeCipherSpec {
                 throw tc.fatal(Alert.UNEXPECTED_MESSAGE,
                         "Malformed or unexpected ChangeCipherSpec message");
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Consuming ChangeCipherSpec message");
             }
 
@@ -237,7 +237,7 @@ final class ChangeCipherSpec {
                 throw tc.fatal(Alert.UNEXPECTED_MESSAGE,
                         "Malformed or unexpected ChangeCipherSpec message");
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Consuming ChangeCipherSpec message");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ClientHello.java b/src/java.base/share/classes/sun/security/ssl/ClientHello.java
index 421673d625d..2bb1233b4c8 100644
--- a/src/java.base/share/classes/sun/security/ssl/ClientHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ClientHello.java
@@ -431,7 +431,7 @@ final class ClientHello {
                 if (!session.isRejoinable()) {
                     session = null;
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "Can't resume, the session is not rejoinable");
                     }
@@ -444,7 +444,7 @@ final class ClientHello {
                 if (!chc.isNegotiable(sessionSuite)) {
                     session = null;
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "Can't resume, unavailable session cipher suite");
                     }
@@ -457,7 +457,7 @@ final class ClientHello {
                 if (!chc.isNegotiable(sessionVersion)) {
                     session = null;
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "Can't resume, unavailable protocol version");
                     }
@@ -514,7 +514,7 @@ final class ClientHello {
                     session.getIdentificationProtocol();
                 if (!identityAlg.equalsIgnoreCase(sessionIdentityAlg)) {
                     if (SSLLogger.isOn() &&
-                    SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest("Can't resume, endpoint id" +
                             " algorithm does not match, requested: " +
                             identityAlg + ", cached: " + sessionIdentityAlg);
@@ -524,7 +524,8 @@ final class ClientHello {
             }
 
             if (session != null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest("Try resuming session", session);
                 }
 
@@ -548,7 +549,7 @@ final class ClientHello {
                     }
 
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "No new session is allowed, so try to resume " +
                             "the session cipher suite only", sessionSuite);
@@ -634,7 +635,8 @@ final class ClientHello {
                     SSLHandshake.CLIENT_HELLO, chc.activeProtocols);
             chm.extensions.produce(chc, extTypes);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced ClientHello handshake message", chm);
             }
 
@@ -700,7 +702,8 @@ final class ClientHello {
                     //
                     // The HelloVerifyRequest consumer should have updated the
                     // ClientHello handshake message with cookie.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "Produced ClientHello(cookie) handshake message",
                             chc.initialClientHelloMsg);
@@ -734,7 +737,8 @@ final class ClientHello {
                     // TLS 1.3
                     // The HelloRetryRequest consumer should have updated the
                     // ClientHello handshake message with cookie.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "Produced ClientHello(HRR) handshake message",
                             chc.initialClientHelloMsg);
@@ -790,7 +794,7 @@ final class ClientHello {
 
             ClientHelloMessage chm =
                     new ClientHelloMessage(shc, message, enabledExtensions);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Consuming ClientHello handshake message", chm);
             }
 
@@ -820,7 +824,7 @@ final class ClientHello {
                         negotiateProtocol(context, clientHello.clientVersion);
             }
             context.negotiatedProtocol = negotiatedProtocol;
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Negotiated protocol version: " + negotiatedProtocol.name);
             }
@@ -981,7 +985,7 @@ final class ClientHello {
                         (previous != null) && previous.isRejoinable();
                 if (!resumingSession) {
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                                 "Can't resume, " +
                                 "the existing session is not rejoinable");
@@ -994,7 +998,7 @@ final class ClientHello {
                     if (sessionProtocol != shc.negotiatedProtocol) {
                         resumingSession = false;
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake,verbose")) {
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest(
                                 "Can't resume, not the same protocol version");
                         }
@@ -1009,7 +1013,7 @@ final class ClientHello {
                     } catch (SSLPeerUnverifiedException e) {
                         resumingSession = false;
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake,verbose")) {
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest(
                                 "Can't resume, " +
                                 "client authentication is required");
@@ -1024,7 +1028,7 @@ final class ClientHello {
                             (!clientHello.cipherSuites.contains(suite))) {
                         resumingSession = false;
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake,verbose")) {
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest(
                                 "Can't resume, " +
                                 "the session cipher suite is absent");
@@ -1040,7 +1044,7 @@ final class ClientHello {
                         previous.getIdentificationProtocol();
                     if (!identityAlg.equalsIgnoreCase(sessionIdentityAlg)) {
                         if (SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest("Can't resume, endpoint id" +
                             " algorithm does not match, requested: " +
                             identityAlg + ", cached: " + sessionIdentityAlg);
@@ -1055,7 +1059,7 @@ final class ClientHello {
                 shc.resumingSession = resumingSession ? previous : null;
 
                 if (!resumingSession && SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Session not resumed.");
                 }
             }
@@ -1322,7 +1326,7 @@ final class ClientHello {
                         (previous != null) && previous.isRejoinable();
                 if (!resumingSession) {
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "Can't resume, " +
                             "the existing session is not rejoinable");
@@ -1335,7 +1339,7 @@ final class ClientHello {
                     if (sessionProtocol != shc.negotiatedProtocol) {
                         resumingSession = false;
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest(
                                 "Can't resume, not the same protocol version");
                         }
@@ -1351,7 +1355,7 @@ final class ClientHello {
                     } catch (SSLPeerUnverifiedException e) {
                         resumingSession = false;
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake,verbose")) {
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest(
                                 "Can't resume, " +
                                 "client authentication is required");
@@ -1366,7 +1370,7 @@ final class ClientHello {
                             (!clientHello.cipherSuites.contains(suite))) {
                         resumingSession = false;
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake,verbose")) {
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.finest(
                                 "Can't resume, " +
                                 "the session cipher suite is absent");
diff --git a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
index b42cea082e0..e5cb3371d75 100644
--- a/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CookieExtension.java
@@ -117,7 +117,8 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_COOKIE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -154,7 +155,8 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_COOKIE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -218,7 +220,8 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.HRR_COOKIE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -253,7 +256,8 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.HRR_COOKIE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
@@ -280,7 +284,8 @@ public class CookieExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.HRR_COOKIE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable cookie extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
index 53f9896a3e4..63031e2b0db 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
@@ -187,7 +187,7 @@ final class DHClientKeyExchange {
             chc.handshakePossessions.add(dhePossession);
             DHClientKeyExchangeMessage ckem =
                     new DHClientKeyExchangeMessage(chc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced DH ClientKeyExchange handshake message", ckem);
             }
@@ -268,7 +268,7 @@ final class DHClientKeyExchange {
 
             DHClientKeyExchangeMessage ckem =
                     new DHClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming DH ClientKeyExchange handshake message", ckem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
index 7d94598f5cf..afef70a29d5 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java
@@ -481,7 +481,7 @@ final class DHServerKeyExchange {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
             DHServerKeyExchangeMessage skem =
                     new DHServerKeyExchangeMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced DH ServerKeyExchange handshake message", skem);
             }
@@ -512,7 +512,7 @@ final class DHServerKeyExchange {
 
             DHServerKeyExchangeMessage skem =
                     new DHServerKeyExchangeMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming DH ServerKeyExchange handshake message", skem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/DHasKEM.java b/src/java.base/share/classes/sun/security/ssl/DHasKEM.java
new file mode 100644
index 00000000000..763013f280c
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/DHasKEM.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.ssl;
+
+import sun.security.util.ArrayUtil;
+import sun.security.util.CurveDB;
+import sun.security.util.ECUtil;
+import sun.security.util.NamedCurve;
+
+import javax.crypto.DecapsulateException;
+import javax.crypto.KEM;
+import javax.crypto.KEMSpi;
+import javax.crypto.KeyAgreement;
+import javax.crypto.SecretKey;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.*;
+import java.security.interfaces.ECKey;
+import java.security.interfaces.ECPublicKey;
+import java.security.interfaces.XECKey;
+import java.security.interfaces.XECPublicKey;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.ECPoint;
+import java.security.spec.ECPublicKeySpec;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.security.spec.NamedParameterSpec;
+import java.security.spec.XECPublicKeySpec;
+import java.util.Arrays;
+
+/**
+ * The DHasKEM class presents a KEM abstraction layer over traditional
+ * DH-based key exchange, which can be used for either straight
+ * ECDH/XDH or TLS hybrid key exchanges.
+ *
+ * This class can be alongside standard full post-quantum KEMs
+ * when hybrid implementations are required.
+ */
+public class DHasKEM implements KEMSpi {
+
+    @Override
+    public EncapsulatorSpi engineNewEncapsulator(
+            PublicKey publicKey, AlgorithmParameterSpec spec,
+            SecureRandom secureRandom) throws InvalidKeyException {
+        return new Handler(publicKey, null, secureRandom);
+    }
+
+    @Override
+    public DecapsulatorSpi engineNewDecapsulator(PrivateKey privateKey,
+            AlgorithmParameterSpec spec) throws InvalidKeyException {
+        return new Handler(null, privateKey, null);
+    }
+
+    private static final class Handler
+            implements KEMSpi.EncapsulatorSpi, KEMSpi.DecapsulatorSpi {
+        private final PublicKey pkR;
+        private final PrivateKey skR;
+        private final SecureRandom sr;
+        private final Params params;
+
+        Handler(PublicKey pk, PrivateKey sk, SecureRandom sr)
+                throws InvalidKeyException {
+            this.pkR = pk;
+            this.skR = sk;
+            this.sr = sr;
+            this.params = paramsFromKey(pk == null ? sk : pk);
+        }
+
+        @Override
+        public KEM.Encapsulated engineEncapsulate(int from, int to,
+                String algorithm) {
+            KeyPair kpE = params.generateKeyPair(sr);
+            PrivateKey skE = kpE.getPrivate();
+            PublicKey pkE = kpE.getPublic();
+            byte[] pkEm = params.SerializePublicKey(pkE);
+            try {
+                SecretKey dh = params.DH(algorithm, skE, pkR);
+                return new KEM.Encapsulated(
+                        sub(dh, from, to),
+                        pkEm, null);
+            } catch (Exception e) {
+                throw new ProviderException("internal error", e);
+            }
+        }
+
+        @Override
+        public int engineSecretSize() {
+            return params.secretLen;
+        }
+
+        @Override
+        public int engineEncapsulationSize() {
+            return params.publicKeyLen;
+        }
+
+        @Override
+        public SecretKey engineDecapsulate(byte[] encapsulation, int from,
+                int to, String algorithm) throws DecapsulateException {
+            if (encapsulation.length != params.publicKeyLen) {
+                throw new DecapsulateException("incorrect encapsulation size");
+            }
+            try {
+                PublicKey pkE = params.DeserializePublicKey(encapsulation);
+                SecretKey dh = params.DH(algorithm, skR, pkE);
+                return sub(dh, from, to);
+            } catch (IOException | InvalidKeyException e) {
+                throw new DecapsulateException("Cannot decapsulate", e);
+            } catch (Exception e) {
+                throw new ProviderException("internal error", e);
+            }
+        }
+
+        private SecretKey sub(SecretKey key, int from, int to) {
+            if (from == 0 && to == params.secretLen) {
+                return key;
+            }
+
+            // Key slicing should never happen. Otherwise, there might be
+            // a programming error.
+            throw new AssertionError(
+                    "Unexpected key slicing: from=" + from + ", to=" + to);
+        }
+
+        // This KEM is designed to be able to represent every ECDH and XDH
+        private Params paramsFromKey(Key k) throws InvalidKeyException {
+            if (k instanceof ECKey eckey) {
+                if (ECUtil.equals(eckey.getParams(), CurveDB.P_256)) {
+                    return Params.P256;
+                } else if (ECUtil.equals(eckey.getParams(), CurveDB.P_384)) {
+                    return Params.P384;
+                } else if (ECUtil.equals(eckey.getParams(), CurveDB.P_521)) {
+                    return Params.P521;
+                }
+            } else if (k instanceof XECKey xkey
+                    && xkey.getParams() instanceof NamedParameterSpec ns) {
+                if (ns.getName().equalsIgnoreCase(
+                        NamedParameterSpec.X25519.getName())) {
+                    return Params.X25519;
+                } else if (ns.getName().equalsIgnoreCase(
+                        NamedParameterSpec.X448.getName())) {
+                    return Params.X448;
+                }
+            }
+            throw new InvalidKeyException("Unsupported key");
+        }
+    }
+
+    private enum Params {
+
+        P256(32, 2 * 32 + 1,
+                "ECDH", "EC", CurveDB.P_256),
+
+        P384(48, 2 * 48 + 1,
+                "ECDH", "EC", CurveDB.P_384),
+
+        P521(66, 2 * 66 + 1,
+                "ECDH", "EC", CurveDB.P_521),
+
+        X25519(32, 32,
+                "XDH", "XDH", NamedParameterSpec.X25519),
+
+        X448(56, 56,
+                "XDH", "XDH", NamedParameterSpec.X448);
+
+        private final int secretLen;
+        private final int publicKeyLen;
+        private final String kaAlgorithm;
+        private final String keyAlgorithm;
+        private final AlgorithmParameterSpec spec;
+
+        Params(int secretLen, int publicKeyLen, String kaAlgorithm,
+                String keyAlgorithm, AlgorithmParameterSpec spec) {
+            this.spec = spec;
+            this.secretLen = secretLen;
+            this.publicKeyLen = publicKeyLen;
+            this.kaAlgorithm = kaAlgorithm;
+            this.keyAlgorithm = keyAlgorithm;
+        }
+
+        private boolean isEC() {
+            return this == P256 || this == P384 || this == P521;
+        }
+
+        private KeyPair generateKeyPair(SecureRandom sr) {
+            try {
+                KeyPairGenerator g = KeyPairGenerator.getInstance(keyAlgorithm);
+                g.initialize(spec, sr);
+                return g.generateKeyPair();
+            } catch (Exception e) {
+                throw new ProviderException("internal error", e);
+            }
+        }
+
+        private byte[] SerializePublicKey(PublicKey k) {
+            if (isEC()) {
+                ECPoint w = ((ECPublicKey) k).getW();
+                return ECUtil.encodePoint(w, ((NamedCurve) spec).getCurve());
+            } else {
+                byte[] uArray = ((XECPublicKey) k).getU().toByteArray();
+                ArrayUtil.reverse(uArray);
+                return Arrays.copyOf(uArray, publicKeyLen);
+            }
+        }
+
+        private PublicKey DeserializePublicKey(byte[] data) throws
+                IOException, NoSuchAlgorithmException,
+                InvalidKeySpecException {
+            KeySpec keySpec;
+            if (isEC()) {
+                NamedCurve curve = (NamedCurve) this.spec;
+                keySpec = new ECPublicKeySpec(
+                        ECUtil.decodePoint(data, curve.getCurve()), curve);
+            } else {
+                data = data.clone();
+                ArrayUtil.reverse(data);
+                keySpec = new XECPublicKeySpec(
+                        this.spec, new BigInteger(1, data));
+            }
+            return KeyFactory.getInstance(keyAlgorithm).
+                    generatePublic(keySpec);
+        }
+
+        private SecretKey DH(String alg, PrivateKey skE, PublicKey pkR)
+                throws NoSuchAlgorithmException, InvalidKeyException {
+            KeyAgreement ka = KeyAgreement.getInstance(kaAlgorithm);
+            ka.init(skE);
+            ka.doPhase(pkR, true);
+            return ka.generateSecret(alg);
+        }
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
index e880f36e846..91759ae6c4b 100644
--- a/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,7 +125,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             return null;
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
             SSLLogger.fine("Raw read", packet);
         }
 
@@ -150,7 +150,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         int contentLen = ((packet.get() & 0xFF) << 8) |
                           (packet.get() & 0xFF);           // pos: 11, 12
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
             SSLLogger.fine("READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
                     " " + ContentType.nameOf(contentType) + ", length = " +
@@ -162,7 +162,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         if (this.readEpoch > recordEpoch) {
             // Reset the position of the packet buffer.
             packet.position(recLim);
-            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.fine("READ: discard this old record", recordEnS);
             }
             return null;
@@ -181,7 +181,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 packet.position(recLim);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("Premature record (epoch), discard it.");
                 }
 
@@ -223,7 +224,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             plaintextFragment = plaintext.fragment;
             contentType = plaintext.contentType;
         } catch (GeneralSecurityException gse) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("Discard invalid record: " + gse);
             }
 
@@ -241,7 +242,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             // Cleanup the handshake reassembler if necessary.
             if ((reassembler != null) &&
                     (reassembler.handshakeEpoch < recordEpoch)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("Cleanup the handshake reassembler");
                 }
 
@@ -273,7 +275,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 if (hsFrag == null) {
                     // invalid, discard this record
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                                 "Invalid handshake message, discard it.");
                     }
@@ -296,7 +299,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             return pt == null ? null : new Plaintext[] { pt };
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+        if (SSLLogger.isOn() &&
+                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
              SSLLogger.fine("The reassembler is not initialized yet.");
         }
 
@@ -356,7 +360,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
         int remaining = plaintextFragment.remaining();
         if (remaining < handshakeHeaderSize) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("Discard invalid record: " +
                         "too small record to hold a handshake fragment");
             }
@@ -368,7 +372,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         // Fail fast for unknown handshake message.
         byte handshakeType = plaintextFragment.get();       // pos: 0
         if (!SSLHandshake.isKnown(handshakeType)) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("Discard invalid record: " +
                         "unknown handshake type size, Handshake.msg_type = " +
                         (handshakeType & 0xFF));
@@ -404,7 +408,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 ((plaintextFragment.get() & 0xFF) << 8) |
                  (plaintextFragment.get() & 0xFF);          // pos: 9-11
         if ((remaining - handshakeHeaderSize) < fragmentLength) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("Discard invalid record: " +
                         "not a complete handshake fragment in the record");
             }
@@ -748,7 +752,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // It's OK to discard retransmission as the handshake hash
                 // is computed as if each handshake message had been sent
                 // as a single fragment.
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("Have got the full message, discard it.");
                 }
 
@@ -767,9 +772,11 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     }
 
                     // The ranges SHOULD NOT overlap.
-                    if (hole.offset > hsf.fragmentOffset || hole.limit < fragmentLimit) {
+                    if (hole.offset > hsf.fragmentOffset ||
+                            hole.limit < fragmentLimit) {
 
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                             SSLLogger.fine("Discard invalid record: " +
                                 "handshake fragment ranges are overlapping");
                         }
@@ -837,9 +844,11 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 }
                 // Read the random (32 bytes)
                 if (fragmentData.remaining() < 32) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
-                        SSLLogger.fine("Rejected client hello fragment (bad random len) " +
-                                "fo=" + hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
+                        SSLLogger.fine("Rejected client hello fragment" +
+                            "(bad random len) fo=" +
+                            hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
                     }
                     return null;
                 }
@@ -861,9 +870,11 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // Cookie
                 byte[] cookie = Record.getBytes8(fragmentData);
                 if (firstHello && cookie.length != 0) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
-                        SSLLogger.fine("Rejected initial client hello fragment (bad cookie len) " +
-                                "fo=" + hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
+                        SSLLogger.fine("Rejected initial client hello " +
+                            " fragment (bad cookie len) fo=" +
+                            hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
                     }
                     return null;
                 }
@@ -897,9 +908,11 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     }
                 }
             } catch (IOException ioe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("Rejected client hello fragment " +
-                            "fo=" + hsf.fragmentOffset + " fl=" + hsf.fragmentLength);
+                            "fo=" + hsf.fragmentOffset + " fl=" +
+                            hsf.fragmentLength);
                 }
                 return null;
             }
@@ -1029,7 +1042,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             int previousEpoch = nextRecordEpoch - 1;
             if (rf.recordEpoch < previousEpoch) {
                 // Too old to use, discard this record.
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "Too old epoch to use this record, discard it.");
                 }
@@ -1075,7 +1089,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 if (!isDesired) {
                     // Too old to use, discard this retransmitted record
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                                 "Too old retransmission to use, discard it.");
                     }
@@ -1088,7 +1103,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // Previously disordered record for the current epoch.
                 //
                 // Should have been retransmitted. Discard this record.
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "Lagging behind record (sequence), discard it.");
                 }
@@ -1126,7 +1142,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
         Plaintext acquirePlaintext() throws SSLProtocolException {
             if (bufferedFragments.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("No received handshake messages");
                 }
                 return null;
@@ -1147,7 +1164,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                         // Reset the next handshake flight.
                         resetHandshakeFlight(precedingFlight);
 
-                        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                        if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.fine("Received a retransmission flight.");
                         }
 
@@ -1159,7 +1177,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             }
 
             if (!flightIsReady) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "The handshake flight is not ready to use: " +
                             handshakeFlight.handshakeType);
@@ -1244,7 +1263,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             if (readEpoch != rFrag.recordEpoch) {
                 if (readEpoch > rFrag.recordEpoch) {
                     // discard old records
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                                 "Discard old buffered ciphertext fragments.");
                     }
@@ -1256,7 +1276,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     flightIsReady = false;
                 }
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "Not yet ready to decrypt the cached fragments.");
                 }
@@ -1273,7 +1294,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 plaintextFragment = plaintext.fragment;
                 rFrag.contentType = plaintext.contentType;
             } catch (GeneralSecurityException gse) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("Discard invalid record: ", gse);
                 }
 
@@ -1295,7 +1317,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                     if (hsFrag == null) {
                         // invalid, discard this record
-                        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                        if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.fine(
                                     "Invalid handshake fragment, discard it",
                                     plaintextFragment);
@@ -1446,7 +1469,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 if (expectCCSFlight) {
                     // Have the ChangeCipherSpec/Finished flight been received?
                     boolean isReady = hasFinishedMessage();
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                             "Has the final flight been received? " + isReady);
                     }
@@ -1454,7 +1478,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     return isReady;
                 }
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine("No flight is received yet.");
                 }
 
@@ -1467,7 +1492,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 // single handshake message flight
                 boolean isReady = hasCompleted(flightType);
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "Is the handshake message completed? " + isReady);
                 }
@@ -1481,7 +1507,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             if (flightType == SSLHandshake.SERVER_HELLO.id) {
                 // Firstly, check the first flight handshake message.
                 if (!hasCompleted(flightType)) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                             "The ServerHello message is not completed yet.");
                     }
@@ -1493,7 +1520,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 // an abbreviated handshake
                 //
                 if (hasFinishedMessage()) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine("It's an abbreviated handshake.");
                     }
 
@@ -1507,7 +1535,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                         SSLHandshake.SERVER_HELLO_DONE.id);
                 if ((holes == null) || !holes.isEmpty()) {
                     // Not yet got the final message of the flight.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                                 "Not yet got the ServerHelloDone message");
                     }
@@ -1519,7 +1548,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 boolean isReady = hasCompleted(bufferedFragments,
                             handshakeFlight.minMessageSeq,
                             handshakeFlight.maxMessageSeq);
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "Is the ServerHello flight (message " +
                             handshakeFlight.minMessageSeq + "-" +
@@ -1542,7 +1572,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 // Firstly, check the first flight handshake message.
                 if (!hasCompleted(flightType)) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                             "The ClientKeyExchange or client Certificate " +
                             "message is not completed yet.");
@@ -1556,7 +1587,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                     if (needClientVerify(bufferedFragments) &&
                         !hasCompleted(SSLHandshake.CERTIFICATE_VERIFY.id)) {
 
-                        if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                        if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.fine(
                                 "Not yet have the CertificateVerify message");
                         }
@@ -1567,7 +1599,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
 
                 if (!hasFinishedMessage()) {
                     // not yet have the ChangeCipherSpec/Finished messages
-                    if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.fine(
                             "Not yet have the ChangeCipherSpec and " +
                             "Finished messages");
@@ -1580,7 +1613,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
                 boolean isReady = hasCompleted(bufferedFragments,
                             handshakeFlight.minMessageSeq,
                             handshakeFlight.maxMessageSeq);
-                if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                             "Is the ClientKeyExchange flight (message " +
                             handshakeFlight.minMessageSeq + "-" +
@@ -1594,7 +1628,8 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
             //
             // Otherwise, need to receive more handshake messages.
             //
-            if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.fine("Need to receive more handshake messages");
             }
 
@@ -1741,4 +1776,3 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
         }
     }
 }
-
diff --git a/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
index 6bb23b72ef9..c69f00afba1 100644
--- a/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/DTLSOutputRecord.java
@@ -92,7 +92,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     void changeWriteCiphers(SSLWriteCipher writeCipher,
             boolean useChangeCipherSpec) {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "change_cipher_spec message");
             }
@@ -120,7 +120,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     @Override
     void encodeAlert(byte level, byte description) {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "alert message: " + Alert.nameOf(description));
             }
@@ -137,7 +137,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     @Override
     void encodeChangeCipherSpec() {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "change_cipher_spec message");
             }
@@ -154,7 +154,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
     void encodeHandshake(byte[] source,
             int offset, int length) {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                         "handshake message",
                         ByteBuffer.wrap(source, offset, length));
@@ -179,14 +179,14 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
         ByteBuffer[] dsts, int dstsOffset, int dstsLength) throws IOException {
 
         if (isClosed) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data or cached messages");
             }
 
             return null;
         } else if (isCloseWaiting) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data");
             }
@@ -201,7 +201,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
             ByteBuffer destination) throws IOException {
 
         if (writeCipher.authenticator.seqNumOverflow()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine(
                     "sequence number extremely close to overflow " +
                     "(2^64-1 packets). Closing connection.");
@@ -269,7 +269,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
         destination.limit(destination.position());
         destination.position(dstContent);
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
             SSLLogger.fine(
                     "WRITE: " + protocolVersion.name + " " +
                     ContentType.APPLICATION_DATA.name +
@@ -282,7 +282,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
                 dstPos, dstLim, headerSize,
                 protocolVersion);
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
             ByteBuffer temporary = destination.duplicate();
             temporary.limit(temporary.position());
             temporary.position(dstPos);
@@ -497,7 +497,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
             dstBuf.limit(dstBuf.position());
             dstBuf.position(dstContent);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name + " " +
                         ContentType.nameOf(memo.contentType) +
@@ -511,7 +511,7 @@ final class DTLSOutputRecord extends OutputRecord implements DTLSRecord {
                     ProtocolVersion.valueOf(memo.majorVersion,
                             memo.minorVersion));
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 ByteBuffer temporary = dstBuf.duplicate();
                 temporary.limit(temporary.position());
                 temporary.position(dstPos);
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
index a626f6f34d0..00060963d08 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
@@ -199,7 +199,7 @@ final class ECDHClientKeyExchange {
             ECDHClientKeyExchangeMessage cke =
                     new ECDHClientKeyExchangeMessage(
                             chc, sslPossession.encode());
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced ECDH ClientKeyExchange handshake message", cke);
             }
@@ -308,7 +308,7 @@ final class ECDHClientKeyExchange {
             // parse either handshake message containing either EC/XEC.
             ECDHClientKeyExchangeMessage cke =
                     new ECDHClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming ECDH ClientKeyExchange handshake message", cke);
             }
@@ -397,7 +397,7 @@ final class ECDHClientKeyExchange {
                     new ECDHClientKeyExchangeMessage(
                             chc, sslPossession.encode());
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced ECDHE ClientKeyExchange handshake message", cke);
             }
@@ -490,7 +490,7 @@ final class ECDHClientKeyExchange {
             // parse the EC/XEC handshake message
             ECDHClientKeyExchangeMessage cke =
                     new ECDHClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming ECDHE ClientKeyExchange handshake message", cke);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
index 82e888ef98f..9a2c21db05c 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHServerKeyExchange.java
@@ -489,7 +489,7 @@ final class ECDHServerKeyExchange {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
             ECDHServerKeyExchangeMessage skem =
                     new ECDHServerKeyExchangeMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced ECDH ServerKeyExchange handshake message", skem);
             }
@@ -522,7 +522,7 @@ final class ECDHServerKeyExchange {
             // AlgorithmConstraints are checked during decoding
             ECDHServerKeyExchangeMessage skem =
                     new ECDHServerKeyExchangeMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming ECDH ServerKeyExchange handshake message", skem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
index de61e44b258..64d0aea80bb 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECPointFormatsExtension.java
@@ -171,7 +171,8 @@ final class ECPointFormatsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_EC_POINT_FORMATS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable ec_point_formats extension");
                 }
@@ -193,7 +194,7 @@ final class ECPointFormatsExtension {
                 return extData;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Need no ec_point_formats extension");
             }
@@ -221,7 +222,8 @@ final class ECPointFormatsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_EC_POINT_FORMATS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable ec_point_formats extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java b/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
index bc34e6fe113..8379d5f6cab 100644
--- a/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/EncryptedExtensions.java
@@ -134,7 +134,7 @@ final class EncryptedExtensions {
                             SSLHandshake.ENCRYPTED_EXTENSIONS,
                             shc.negotiatedProtocol);
             eem.extensions.produce(shc, extTypes);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced EncryptedExtensions message", eem);
             }
 
@@ -168,7 +168,7 @@ final class EncryptedExtensions {
 
             EncryptedExtensionsMessage eem =
                     new EncryptedExtensionsMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming EncryptedExtensions handshake message", eem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
index a6bedd9e205..91e5fa499db 100644
--- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java
@@ -119,7 +119,8 @@ final class ExtendedMasterSecretExtension {
             if (!chc.sslConfig.isAvailable(CH_EXTENDED_MASTER_SECRET) ||
                     !SSLConfiguration.useExtendedMasterSecret ||
                     !chc.conContext.protocolVersion.useTLS10PlusSpec()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extended_master_secret extension");
                 }
@@ -162,7 +163,8 @@ final class ExtendedMasterSecretExtension {
             if (!shc.sslConfig.isAvailable(CH_EXTENDED_MASTER_SECRET) ||
                     !SSLConfiguration.useExtendedMasterSecret ||
                     !shc.negotiatedProtocol.useTLS10PlusSpec()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                             CH_EXTENDED_MASTER_SECRET.name);
                 }
@@ -182,7 +184,8 @@ final class ExtendedMasterSecretExtension {
                 // with a full handshake.
                 shc.isResumption = false;
                 shc.resumingSession = null;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "abort session resumption which did not use " +
                         "Extended Master Secret extension");
@@ -213,7 +216,8 @@ final class ExtendedMasterSecretExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_EXTENDED_MASTER_SECRET) ||
                     !SSLConfiguration.useExtendedMasterSecret) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                             CH_EXTENDED_MASTER_SECRET.name);
                 }
@@ -252,7 +256,8 @@ final class ExtendedMasterSecretExtension {
                     } else {  // Otherwise, continue with a full handshake.
                         shc.isResumption = false;
                         shc.resumingSession = null;
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                             SSLLogger.fine(
                                 "abort session resumption, " +
                                 "missing Extended Master Secret extension");
diff --git a/src/java.base/share/classes/sun/security/ssl/Finished.java b/src/java.base/share/classes/sun/security/ssl/Finished.java
index 4238ced8f01..bf2d2230719 100644
--- a/src/java.base/share/classes/sun/security/ssl/Finished.java
+++ b/src/java.base/share/classes/sun/security/ssl/Finished.java
@@ -390,7 +390,7 @@ final class Finished {
             // Change write cipher and delivery ChangeCipherSpec message.
             ChangeCipherSpec.t10Producer.produce(chc, message);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced client Finished handshake message", fm);
             }
@@ -453,7 +453,7 @@ final class Finished {
             // Change write cipher and delivery ChangeCipherSpec message.
             ChangeCipherSpec.t10Producer.produce(shc, message);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced server Finished handshake message", fm);
             }
@@ -542,7 +542,7 @@ final class Finished {
         private void onConsumeFinished(ClientHandshakeContext chc,
                 ByteBuffer message) throws IOException {
             FinishedMessage fm = new FinishedMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming server Finished handshake message", fm);
             }
@@ -602,7 +602,7 @@ final class Finished {
             }
 
             FinishedMessage fm = new FinishedMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming client Finished handshake message", fm);
             }
@@ -681,7 +681,7 @@ final class Finished {
             chc.handshakeHash.update();
 
             FinishedMessage fm = new FinishedMessage(chc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced client Finished handshake message", fm);
             }
@@ -778,7 +778,7 @@ final class Finished {
             shc.handshakeHash.update();
 
             FinishedMessage fm = new FinishedMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced server Finished handshake message", fm);
             }
@@ -930,7 +930,7 @@ final class Finished {
             }
 
             FinishedMessage fm = new FinishedMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming server Finished handshake message", fm);
             }
@@ -1073,7 +1073,7 @@ final class Finished {
             }
 
             FinishedMessage fm = new FinishedMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming client Finished handshake message", fm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
index a5f340d5203..54a2650c058 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
@@ -284,14 +284,16 @@ abstract class HandshakeContext implements ConnectionContext {
                         found = true;
                         break;
                     }
-                } else if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                } else if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.fine(
                         "Ignore unsupported cipher suite: " + suite +
                              " for " + protocol.name);
                 }
             }
 
-            if (!found && (SSLLogger.isOn()) && SSLLogger.isOn("handshake")) {
+            if (!found && (SSLLogger.isOn()) &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "No available cipher suite for " + protocol.name);
             }
@@ -335,7 +337,8 @@ abstract class HandshakeContext implements ConnectionContext {
                 }
 
                 if (!isSupported &&
-                        SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                        SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest(
                             "Ignore unsupported cipher suite: " + suite);
                 }
@@ -556,7 +559,8 @@ abstract class HandshakeContext implements ConnectionContext {
                         cachedStatus.put(groupType, groupAvailable);
 
                         if (!groupAvailable &&
-                                SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+                                SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                             SSLLogger.fine(
                                     "No activated named group in " + groupType);
                         }
@@ -570,13 +574,15 @@ abstract class HandshakeContext implements ConnectionContext {
                 }
             }
 
-            if (!retval && SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+            if (!retval && SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.fine("No active named group(s), ignore " + suite);
             }
 
             return retval;
 
-        } else if (SSLLogger.isOn() && SSLLogger.isOn("verbose")) {
+        } else if (SSLLogger.isOn() &&
+                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
             SSLLogger.fine("Ignore disabled cipher suite: " + suite);
         }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
index 61571cfd03b..b46de0514f8 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeOutStream.java
@@ -61,7 +61,7 @@ public class HandshakeOutStream extends ByteArrayOutputStream {
             if (!outputRecord.isClosed()) {
                 outputRecord.encodeHandshake(buf, 0, count);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "handshake messages", ByteBuffer.wrap(buf, 0, count));
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloRequest.java b/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
index b207e1071b0..d2d3b033e80 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloRequest.java
@@ -101,7 +101,7 @@ final class HelloRequest {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             HelloRequestMessage hrm = new HelloRequestMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced HelloRequest handshake message", hrm);
             }
 
@@ -137,7 +137,7 @@ final class HelloRequest {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             HelloRequestMessage hrm = new HelloRequestMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced HelloRequest handshake message", hrm);
             }
 
@@ -177,7 +177,7 @@ final class HelloRequest {
             // be sent by the server at any time.  Please don't clean up this
             // handshake consumer.
             HelloRequestMessage hrm = new HelloRequestMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming HelloRequest handshake message", hrm);
             }
@@ -190,7 +190,8 @@ final class HelloRequest {
                 }
 
                 if (!chc.conContext.secureRenegotiation) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
                                 "Continue with insecure renegotiation");
                     }
@@ -206,7 +207,8 @@ final class HelloRequest {
                 //
                 SSLHandshake.CLIENT_HELLO.produce(context, hrm);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore HelloRequest, handshaking is in progress");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java b/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
index 1922a4339bb..5c0833eef5c 100644
--- a/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/HelloVerifyRequest.java
@@ -140,7 +140,7 @@ final class HelloVerifyRequest {
 
             HelloVerifyRequestMessage hvrm =
                     new HelloVerifyRequestMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced HelloVerifyRequest handshake message", hvrm);
             }
@@ -197,7 +197,7 @@ final class HelloVerifyRequest {
 
             HelloVerifyRequestMessage hvrm =
                     new HelloVerifyRequestMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming HelloVerifyRequest handshake message", hvrm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/Hybrid.java b/src/java.base/share/classes/sun/security/ssl/Hybrid.java
new file mode 100644
index 00000000000..e3e2cfa0b23
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/Hybrid.java
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.ssl;
+
+import sun.security.util.ArrayUtil;
+import sun.security.util.CurveDB;
+import sun.security.util.ECUtil;
+import sun.security.util.RawKeySpec;
+import sun.security.x509.X509Key;
+
+import javax.crypto.DecapsulateException;
+import javax.crypto.KEM;
+import javax.crypto.KEMSpi;
+import javax.crypto.SecretKey;
+import java.math.BigInteger;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.KeyFactorySpi;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyPairGeneratorSpi;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.ProviderException;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.spec.*;
+import java.util.Arrays;
+import java.util.Locale;
+
+// The Hybrid class wraps two underlying algorithms (left and right sides)
+// in a single TLS hybrid named group.
+// It implements:
+// - Hybrid KeyPair generation
+// - Hybrid KeyFactory for decoding concatenated hybrid public keys
+// - Hybrid KEM implementation for performing encapsulation and
+//   decapsulation over two underlying algorithms (traditional
+//   algorithm and post-quantum KEM algorithm)
+
+public class Hybrid {
+
+    public static final NamedParameterSpec X25519_MLKEM768 =
+            new NamedParameterSpec("X25519MLKEM768");
+
+    public static final NamedParameterSpec SECP256R1_MLKEM768 =
+            new NamedParameterSpec("SecP256r1MLKEM768");
+
+    public static final NamedParameterSpec SECP384R1_MLKEM1024 =
+            new NamedParameterSpec("SecP384r1MLKEM1024");
+
+    private static AlgorithmParameterSpec getSpec(String name) {
+        if (name.startsWith("secp")) {
+            return new ECGenParameterSpec(name);
+        } else {
+            return new NamedParameterSpec(name);
+        }
+    }
+
+    private static KeyPairGenerator getKeyPairGenerator(String name) throws
+            NoSuchAlgorithmException {
+        if (name.startsWith("secp")) {
+            name = "EC";
+        }
+        return KeyPairGenerator.getInstance(name);
+    }
+
+    private static KeyFactory getKeyFactory(String name) throws
+            NoSuchAlgorithmException {
+        if (name.startsWith("secp")) {
+            name = "EC";
+        }
+        return KeyFactory.getInstance(name);
+    }
+
+    /**
+     * Returns a KEM instance for each side of the hybrid algorithm.
+     * For traditional key exchange algorithms, we use the DH-based KEM
+     * implementation provided by DHasKEM class.
+     * For ML-KEM post-quantum algorithms, we obtain a KEM instance
+     * with "ML-KEM". This is done to work with 3rd-party providers that
+     * only have "ML-KEM" KEM algorithm.
+     */
+    private static KEM getKEM(String name) throws NoSuchAlgorithmException {
+        if (name.startsWith("secp") || name.equals("X25519")) {
+            return KEM.getInstance("DH", HybridProvider.PROVIDER);
+        } else {
+            return KEM.getInstance("ML-KEM");
+        }
+    }
+
+    public static class KeyPairGeneratorImpl extends KeyPairGeneratorSpi {
+        private final KeyPairGenerator left;
+        private final KeyPairGenerator right;
+        private final AlgorithmParameterSpec leftSpec;
+        private final AlgorithmParameterSpec rightSpec;
+
+        public KeyPairGeneratorImpl(String leftAlg, String rightAlg)
+                throws NoSuchAlgorithmException  {
+            left = getKeyPairGenerator(leftAlg);
+            right = getKeyPairGenerator(rightAlg);
+            leftSpec = getSpec(leftAlg);
+            rightSpec = getSpec(rightAlg);
+        }
+
+        @Override
+        public void initialize(AlgorithmParameterSpec params,
+                SecureRandom random)
+                throws InvalidAlgorithmParameterException {
+            left.initialize(leftSpec, random);
+            right.initialize(rightSpec, random);
+        }
+
+        @Override
+        public void initialize(int keysize, SecureRandom random) {
+            // NO-OP (do nothing)
+        }
+
+        @Override
+        public KeyPair generateKeyPair() {
+            var kp1 = left.generateKeyPair();
+            var kp2 = right.generateKeyPair();
+            return new KeyPair(
+                    new PublicKeyImpl("Hybrid", kp1.getPublic(),
+                            kp2.getPublic()),
+                    new PrivateKeyImpl("Hybrid", kp1.getPrivate(),
+                            kp2.getPrivate()));
+        }
+    }
+
+    public static class KeyFactoryImpl extends KeyFactorySpi {
+        private final KeyFactory left;
+        private final KeyFactory right;
+        private final int leftlen;
+        private final String leftname;
+        private final String rightname;
+
+        public KeyFactoryImpl(String left, String right)
+                throws NoSuchAlgorithmException {
+            this.left = getKeyFactory(left);
+            this.right = getKeyFactory(right);
+            this.leftlen = leftPublicLength(left);
+            this.leftname = left;
+            this.rightname = right;
+        }
+
+        @Override
+        protected PublicKey engineGeneratePublic(KeySpec keySpec)
+                throws InvalidKeySpecException {
+            if (keySpec == null) {
+                throw new InvalidKeySpecException("keySpec must not be null");
+            }
+
+            if (keySpec instanceof RawKeySpec rks) {
+                byte[] key = rks.getKeyArr();
+                if (key == null) {
+                    throw new InvalidKeySpecException(
+                            "RawkeySpec contains null key data");
+                }
+                if (key.length <= leftlen) {
+                    throw new InvalidKeySpecException(
+                            "Hybrid key length " + key.length +
+                            " is too short and its left key length is " +
+                            leftlen);
+                }
+
+                byte[] leftKeyBytes = Arrays.copyOfRange(key, 0, leftlen);
+                byte[] rightKeyBytes = Arrays.copyOfRange(key, leftlen,
+                        key.length);
+                PublicKey leftKey, rightKey;
+
+                try {
+                    if (leftname.startsWith("secp")) {
+                        var curve = CurveDB.lookup(leftname);
+                        var ecSpec = new ECPublicKeySpec(
+                                ECUtil.decodePoint(leftKeyBytes,
+                                curve.getCurve()), curve);
+                        leftKey = left.generatePublic(ecSpec);
+                    } else if (leftname.startsWith("ML-KEM")) {
+                        leftKey = left.generatePublic(new RawKeySpec(
+                                leftKeyBytes));
+                    } else {
+                        throw new InvalidKeySpecException("Unsupported left" +
+                                " algorithm" + leftname);
+                    }
+
+                    if (rightname.equals("X25519")) {
+                        ArrayUtil.reverse(rightKeyBytes);
+                        var xecSpec = new XECPublicKeySpec(
+                                new NamedParameterSpec(rightname),
+                                new BigInteger(1, rightKeyBytes));
+                        rightKey = right.generatePublic(xecSpec);
+                    } else if (rightname.startsWith("ML-KEM")) {
+                        rightKey = right.generatePublic(new RawKeySpec(
+                                rightKeyBytes));
+                    } else {
+                        throw new InvalidKeySpecException("Unsupported right" +
+                                " algorithm: " + rightname);
+                    }
+
+                    return new PublicKeyImpl("Hybrid", leftKey, rightKey);
+                } catch (Exception e) {
+                    throw new InvalidKeySpecException("Failed to decode " +
+                            "hybrid key", e);
+                }
+            }
+
+            throw new InvalidKeySpecException(
+                    "KeySpec type:" +
+                    keySpec.getClass().getName() + " not supported");
+        }
+
+        private static int leftPublicLength(String name) {
+            return switch (name.toLowerCase(Locale.ROOT)) {
+                case "secp256r1" -> 65;
+                case "secp384r1" -> 97;
+                case "ml-kem-768" -> 1184;
+                default -> throw new IllegalArgumentException(
+                        "Unknown named group: " + name);
+            };
+        }
+
+        @Override
+        protected PrivateKey engineGeneratePrivate(KeySpec keySpec) throws
+                InvalidKeySpecException {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected <T extends KeySpec> T engineGetKeySpec(Key key,
+                Class<T> keySpec) throws InvalidKeySpecException {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        protected Key engineTranslateKey(Key key) throws InvalidKeyException {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public static class KEMImpl implements KEMSpi {
+        private final KEM left;
+        private final KEM right;
+
+        public KEMImpl(String left, String right)
+                throws NoSuchAlgorithmException {
+            this.left = getKEM(left);
+            this.right = getKEM(right);
+        }
+
+        @Override
+        public EncapsulatorSpi engineNewEncapsulator(PublicKey publicKey,
+                AlgorithmParameterSpec spec, SecureRandom secureRandom) throws
+                InvalidAlgorithmParameterException, InvalidKeyException {
+            if (publicKey instanceof PublicKeyImpl pk) {
+                return new Handler(left.newEncapsulator(pk.left, secureRandom),
+                        right.newEncapsulator(pk.right, secureRandom),
+                        null, null);
+            }
+            throw new InvalidKeyException();
+        }
+
+        @Override
+        public DecapsulatorSpi engineNewDecapsulator(PrivateKey privateKey,
+                AlgorithmParameterSpec spec)
+                throws InvalidAlgorithmParameterException, InvalidKeyException {
+            if (privateKey instanceof PrivateKeyImpl pk) {
+                return new Handler(null, null, left.newDecapsulator(pk.left),
+                        right.newDecapsulator(pk.right));
+            }
+            throw new InvalidKeyException();
+        }
+    }
+
+    private static byte[] concat(byte[]... inputs) {
+        int outLen = 0;
+        for (byte[] in : inputs) {
+            outLen += in.length;
+        }
+        byte[] out = new byte[outLen];
+        int pos = 0;
+        for (byte[] in : inputs) {
+            System.arraycopy(in, 0, out, pos, in.length);
+            pos += in.length;
+        }
+        return out;
+    }
+
+    private record Handler(KEM.Encapsulator le, KEM.Encapsulator re,
+            KEM.Decapsulator ld, KEM.Decapsulator rd)
+            implements KEMSpi.EncapsulatorSpi, KEMSpi.DecapsulatorSpi {
+        @Override
+        public KEM.Encapsulated engineEncapsulate(int from, int to,
+                String algorithm) {
+            int expectedSecretSize = engineSecretSize();
+            if (!(from == 0 && to == expectedSecretSize)) {
+                throw new IllegalArgumentException(
+                        "Invalid range for encapsulation: from = " + from +
+                        " to = " + to + ", expected total secret size = " +
+                        expectedSecretSize);
+            }
+
+            var left  = le.encapsulate();
+            var right = re.encapsulate();
+            return new KEM.Encapsulated(
+                    new SecretKeyImpl(left.key(), right.key()),
+                    concat(left.encapsulation(), right.encapsulation()),
+                    null);
+        }
+
+        @Override
+        public int engineSecretSize() {
+            if (le != null) {
+                return le.secretSize() + re.secretSize();
+            } else {
+                return ld.secretSize() + rd.secretSize();
+            }
+        }
+
+        @Override
+        public int engineEncapsulationSize() {
+            if (le != null) {
+                return le.encapsulationSize() + re.encapsulationSize();
+            } else {
+                return ld.encapsulationSize() + rd.encapsulationSize();
+            }
+        }
+
+        @Override
+        public SecretKey engineDecapsulate(byte[] encapsulation, int from,
+                int to, String algorithm) throws DecapsulateException {
+            int expectedEncSize = engineEncapsulationSize();
+            if (encapsulation.length != expectedEncSize) {
+                throw new IllegalArgumentException(
+                        "Invalid key encapsulation message length: " +
+                        encapsulation.length +
+                        ", expected = " + expectedEncSize);
+            }
+
+            int expectedSecretSize = engineSecretSize();
+            if (!(from == 0 && to == expectedSecretSize)) {
+                throw new IllegalArgumentException(
+                        "Invalid range for decapsulation: from = " + from +
+                        " to = " + to + ", expected total secret size = " +
+                        expectedSecretSize);
+            }
+
+            var left = Arrays.copyOf(encapsulation, ld.encapsulationSize());
+            var right = Arrays.copyOfRange(encapsulation,
+                    ld.encapsulationSize(), encapsulation.length);
+            return new SecretKeyImpl(
+                    ld.decapsulate(left),
+                    rd.decapsulate(right)
+            );
+        }
+    }
+
+    // Package-private
+    record SecretKeyImpl(SecretKey k1, SecretKey k2)
+            implements SecretKey {
+        @Override
+        public String getAlgorithm() {
+            return "Generic";
+        }
+
+        @Override
+        public String getFormat() {
+            return null;
+        }
+
+        @Override
+        public byte[] getEncoded() {
+            return null;
+        }
+    }
+
+    /**
+     * Hybrid public key combines two underlying public keys (left and right).
+     * Public keys can be transmitted/encoded because the hybrid protocol
+     * requires the public component to be sent.
+     */
+    // Package-private
+    record PublicKeyImpl(String algorithm, PublicKey left,
+            PublicKey right) implements PublicKey {
+        @Override
+        public String getAlgorithm() {
+            return algorithm;
+        }
+
+        // getFormat() returns "RAW" as hybrid key uses RAW concatenation
+        // of underlying encodings.
+        @Override
+        public String getFormat() {
+            return "RAW";
+        }
+
+        // getEncoded() returns the concatenation of the encoded bytes of the
+        // left and right public keys.
+        @Override
+        public byte[] getEncoded() {
+            return concat(onlyKey(left), onlyKey(right));
+        }
+
+        static byte[] onlyKey(PublicKey key) {
+            if (key instanceof X509Key xk) {
+                return xk.getKeyAsBytes();
+            }
+
+            // Fallback for 3rd-party providers
+            if (!"X.509".equalsIgnoreCase(key.getFormat())) {
+                throw new ProviderException("Invalid public key encoding " +
+                        "format");
+            }
+            var xk = new X509Key();
+            try {
+                xk.decode(key.getEncoded());
+            } catch (InvalidKeyException e) {
+                throw new ProviderException("Invalid public key encoding", e);
+            }
+            return xk.getKeyAsBytes();
+        }
+    }
+
+    /**
+     * Hybrid private key combines two underlying private keys (left and right).
+     * It is for internal use only. The private keys should never be exported.
+     */
+    private record PrivateKeyImpl(String algorithm, PrivateKey left,
+            PrivateKey right) implements PrivateKey {
+
+        @Override
+        public String getAlgorithm() {
+            return algorithm;
+        }
+
+        // getFormat() returns null because there is no standard
+        // format for a hybrid private key.
+        @Override
+        public String getFormat() {
+            return null;
+        }
+
+        // getEncoded() returns an empty byte array because there is no
+        // standard encoding format for a hybrid private key.
+        @Override
+        public byte[] getEncoded() {
+            return null;
+        }
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/HybridProvider.java b/src/java.base/share/classes/sun/security/ssl/HybridProvider.java
new file mode 100644
index 00000000000..c77d6f66273
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/HybridProvider.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.ssl;
+
+import java.security.Provider;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+import java.util.Map;
+
+import static sun.security.util.SecurityConstants.PROVIDER_VER;
+
+// This is an internal provider used in the JSSE code for DH-as-KEM
+// and Hybrid KEM support. It doesn't actually get installed in the
+// system's list of security providers that is searched at runtime.
+// JSSE loads this provider internally.
+// It registers Hybrid KeyPairGenerator, KeyFactory, and KEM
+// implementations for hybrid named groups as Provider services.
+
+public class HybridProvider {
+
+    public static final Provider PROVIDER = new ProviderImpl();
+
+    private static final class ProviderImpl extends Provider {
+        @java.io.Serial
+        private static final long serialVersionUID = 0L;
+
+        ProviderImpl() {
+            super("HybridAndDHAsKEM", PROVIDER_VER,
+                    "Hybrid and DHAsKEM provider");
+            put("KEM.DH", DHasKEM.class.getName());
+
+            // Hybrid KeyPairGenerator/KeyFactory/KEM
+
+            // The order of shares in the concatenation for group name
+            // X25519MLKEM768 has been reversed as per the current
+            // draft RFC.
+            var attrs = Map.of("name", "X25519MLKEM768", "left", "ML-KEM-768",
+                    "right", "X25519");
+            putService(new HybridService(this, "KeyPairGenerator",
+                    "X25519MLKEM768",
+                    "sun.security.ssl.Hybrid$KeyPairGeneratorImpl",
+                    null, attrs));
+            putService(new HybridService(this, "KEM",
+                    "X25519MLKEM768",
+                    "sun.security.ssl.Hybrid$KEMImpl",
+                    null, attrs));
+            putService(new HybridService(this, "KeyFactory",
+                    "X25519MLKEM768",
+                    "sun.security.ssl.Hybrid$KeyFactoryImpl",
+                    null, attrs));
+
+            attrs = Map.of("name", "SecP256r1MLKEM768", "left", "secp256r1",
+                    "right", "ML-KEM-768");
+            putService(new HybridService(this, "KeyPairGenerator",
+                    "SecP256r1MLKEM768",
+                    "sun.security.ssl.Hybrid$KeyPairGeneratorImpl",
+                    null, attrs));
+            putService(new HybridService(this, "KEM",
+                    "SecP256r1MLKEM768",
+                    "sun.security.ssl.Hybrid$KEMImpl",
+                    null, attrs));
+            putService(new HybridService(this, "KeyFactory",
+                    "SecP256r1MLKEM768",
+                    "sun.security.ssl.Hybrid$KeyFactoryImpl",
+                    null, attrs));
+
+            attrs = Map.of("name", "SecP384r1MLKEM1024", "left", "secp384r1",
+                    "right", "ML-KEM-1024");
+            putService(new HybridService(this, "KeyPairGenerator",
+                    "SecP384r1MLKEM1024",
+                    "sun.security.ssl.Hybrid$KeyPairGeneratorImpl",
+                    null, attrs));
+            putService(new HybridService(this, "KEM",
+                    "SecP384r1MLKEM1024",
+                    "sun.security.ssl.Hybrid$KEMImpl",
+                    null, attrs));
+            putService(new HybridService(this, "KeyFactory",
+                    "SecP384r1MLKEM1024",
+                    "sun.security.ssl.Hybrid$KeyFactoryImpl",
+                    null, attrs));
+        }
+    }
+
+    private static class HybridService extends Provider.Service {
+
+        HybridService(Provider p, String type, String algo, String cn,
+                      List<String> aliases, Map<String, String> attrs) {
+            super(p, type, algo, cn, aliases, attrs);
+        }
+
+        @Override
+        public Object newInstance(Object ctrParamObj)
+                throws NoSuchAlgorithmException {
+            String type = getType();
+            return switch (type) {
+                case "KeyPairGenerator" -> new Hybrid.KeyPairGeneratorImpl(
+                        getAttribute("left"), getAttribute("right"));
+                case "KeyFactory" -> new Hybrid.KeyFactoryImpl(
+                        getAttribute("left"), getAttribute("right"));
+                case "KEM" -> new Hybrid.KEMImpl(
+                        getAttribute("left"), getAttribute("right"));
+                default -> throw new NoSuchAlgorithmException(
+                        "Unexpected value: " + type);
+            };
+        }
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/JsseJce.java b/src/java.base/share/classes/sun/security/ssl/JsseJce.java
index 3ffc2d84168..1e610eeab1d 100644
--- a/src/java.base/share/classes/sun/security/ssl/JsseJce.java
+++ b/src/java.base/share/classes/sun/security/ssl/JsseJce.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ final class JsseJce {
         static {
             boolean mediator = true;
             try {
-                Signature.getInstance(SIGNATURE_ECDSA);
                 Signature.getInstance(SIGNATURE_RAWECDSA);
                 KeyAgreement.getInstance("ECDH");
                 KeyFactory.getInstance("EC");
diff --git a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
index 623f83f547a..39e82b50435 100644
--- a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
@@ -24,7 +24,10 @@
  */
 package sun.security.ssl;
 
+import sun.security.util.RawKeySpec;
+
 import javax.crypto.KDF;
+import javax.crypto.KEM;
 import javax.crypto.KeyAgreement;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.HKDFParameterSpec;
@@ -32,9 +35,11 @@ import javax.net.ssl.SSLHandshakeException;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.security.KeyFactory;
 import java.security.PrivateKey;
+import java.security.Provider;
 import java.security.PublicKey;
-import java.security.spec.AlgorithmParameterSpec;
+import java.security.SecureRandom;
 import sun.security.util.KeyUtil;
 
 /**
@@ -46,15 +51,32 @@ public class KAKeyDerivation implements SSLKeyDerivation {
     private final HandshakeContext context;
     private final PrivateKey localPrivateKey;
     private final PublicKey peerPublicKey;
+    private final byte[] keyshare;
+    private final Provider provider;
 
+    // Constructor called by Key Agreement
     KAKeyDerivation(String algorithmName,
             HandshakeContext context,
             PrivateKey localPrivateKey,
             PublicKey peerPublicKey) {
+        this(algorithmName, null, context, localPrivateKey,
+                peerPublicKey, null);
+    }
+
+    // When the constructor called by KEM: store the client's public key or the
+    // encapsulated message in keyshare.
+    KAKeyDerivation(String algorithmName,
+                    NamedGroup namedGroup,
+                    HandshakeContext context,
+                    PrivateKey localPrivateKey,
+                    PublicKey peerPublicKey,
+                    byte[] keyshare) {
         this.algorithmName = algorithmName;
         this.context = context;
         this.localPrivateKey = localPrivateKey;
         this.peerPublicKey = peerPublicKey;
+        this.keyshare = keyshare;
+        this.provider = (namedGroup != null) ? namedGroup.getProvider() : null;
     }
 
     @Override
@@ -94,22 +116,15 @@ public class KAKeyDerivation implements SSLKeyDerivation {
         }
     }
 
-    /**
-     * Handle the TLSv1.3 objects, which use the HKDF algorithms.
-     */
-    private SecretKey t13DeriveKey(String type)
-            throws IOException {
-        SecretKey sharedSecret = null;
+    private SecretKey deriveHandshakeSecret(String label,
+            SecretKey sharedSecret)
+            throws GeneralSecurityException, IOException {
         SecretKey earlySecret = null;
         SecretKey saltSecret = null;
-        try {
-            KeyAgreement ka = KeyAgreement.getInstance(algorithmName);
-            ka.init(localPrivateKey);
-            ka.doPhase(peerPublicKey, true);
-            sharedSecret = ka.generateSecret("TlsPremasterSecret");
 
-            CipherSuite.HashAlg hashAlg = context.negotiatedCipherSuite.hashAlg;
-            SSLKeyDerivation kd = context.handshakeKeyDerivation;
+        CipherSuite.HashAlg hashAlg = context.negotiatedCipherSuite.hashAlg;
+        SSLKeyDerivation kd = context.handshakeKeyDerivation;
+        try {
             if (kd == null) {   // No PSK is in use.
                 // If PSK is not in use, Early Secret will still be
                 // HKDF-Extract(0, 0).
@@ -129,12 +144,90 @@ public class KAKeyDerivation implements SSLKeyDerivation {
             // the handshake secret key derivation (below) as it may not
             // work with the "sharedSecret" obj.
             KDF hkdf = KDF.getInstance(hashAlg.hkdfAlgorithm);
-            return hkdf.deriveKey(type, HKDFParameterSpec.ofExtract()
-                    .addSalt(saltSecret).addIKM(sharedSecret).extractOnly());
+            var spec = HKDFParameterSpec.ofExtract().addSalt(saltSecret);
+            if (sharedSecret instanceof Hybrid.SecretKeyImpl hsk) {
+                spec = spec.addIKM(hsk.k1()).addIKM(hsk.k2());
+            } else {
+                spec = spec.addIKM(sharedSecret);
+            }
+
+            return hkdf.deriveKey(label, spec.extractOnly());
+        } finally {
+            KeyUtil.destroySecretKeys(earlySecret, saltSecret);
+        }
+    }
+    /**
+     * This method is called by the server to perform KEM encapsulation.
+     * It uses the client's public key (sent by the client as a keyshare)
+     * to encapsulate a shared secret and returns the encapsulated message.
+     *
+     * Package-private, used from KeyShareExtension.SHKeyShareProducer::
+     * produce().
+     */
+    KEM.Encapsulated encapsulate(String algorithm, SecureRandom random)
+            throws IOException {
+        SecretKey sharedSecret = null;
+
+        if (keyshare == null) {
+            throw new IOException("No keyshare available for KEM " +
+                    "encapsulation");
+        }
+
+        try {
+            KeyFactory kf = (provider != null) ?
+                    KeyFactory.getInstance(algorithmName, provider) :
+                    KeyFactory.getInstance(algorithmName);
+            var pk = kf.generatePublic(new RawKeySpec(keyshare));
+
+            KEM kem = (provider != null) ?
+                    KEM.getInstance(algorithmName, provider) :
+                    KEM.getInstance(algorithmName);
+            KEM.Encapsulator e = kem.newEncapsulator(pk, random);
+            KEM.Encapsulated enc = e.encapsulate();
+            sharedSecret = enc.key();
+
+            SecretKey derived = deriveHandshakeSecret(algorithm, sharedSecret);
+
+            return new KEM.Encapsulated(derived, enc.encapsulation(), null);
         } catch (GeneralSecurityException gse) {
             throw new SSLHandshakeException("Could not generate secret", gse);
         } finally {
-            KeyUtil.destroySecretKeys(sharedSecret, earlySecret, saltSecret);
+            KeyUtil.destroySecretKeys(sharedSecret);
+        }
+    }
+
+    /**
+     * Handle the TLSv1.3 objects, which use the HKDF algorithms.
+     */
+    private SecretKey t13DeriveKey(String type)
+            throws IOException {
+        SecretKey sharedSecret = null;
+
+        try {
+            if (keyshare != null) {
+                // Using KEM: called by the client after receiving the KEM
+                // ciphertext (keyshare) from the server in ServerHello.
+                // The client decapsulates it using its private key.
+                KEM kem = (provider != null)
+                        ? KEM.getInstance(algorithmName, provider)
+                        : KEM.getInstance(algorithmName);
+                var decapsulator = kem.newDecapsulator(localPrivateKey);
+                sharedSecret = decapsulator.decapsulate(
+                        keyshare, 0, decapsulator.secretSize(),
+                        "TlsPremasterSecret");
+            } else {
+                // Using traditional DH-style Key Agreement
+                KeyAgreement ka = KeyAgreement.getInstance(algorithmName);
+                ka.init(localPrivateKey);
+                ka.doPhase(peerPublicKey, true);
+                sharedSecret = ka.generateSecret("TlsPremasterSecret");
+            }
+
+            return deriveHandshakeSecret(type, sharedSecret);
+        } catch (GeneralSecurityException gse) {
+            throw new SSLHandshakeException("Could not generate secret", gse);
+        } finally {
+            KeyUtil.destroySecretKeys(sharedSecret);
         }
     }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/KEMKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/KEMKeyExchange.java
new file mode 100644
index 00000000000..fb8de6cb104
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/KEMKeyExchange.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sun.security.ssl;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.ProviderException;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.spec.NamedParameterSpec;
+import javax.crypto.SecretKey;
+
+import sun.security.ssl.NamedGroup.NamedGroupSpec;
+import sun.security.x509.X509Key;
+
+/**
+ * Specifics for single or hybrid Key exchanges based on KEM
+ */
+final class KEMKeyExchange {
+
+    static final SSLKeyAgreementGenerator kemKAGenerator
+            = new KEMKAGenerator();
+
+    static final class KEMCredentials implements NamedGroupCredentials {
+
+        final NamedGroup namedGroup;
+        // Unlike other credentials, we directly store the key share
+        // value here, no need to convert to a key
+        private final byte[] keyshare;
+
+        KEMCredentials(byte[] keyshare, NamedGroup namedGroup) {
+            this.keyshare = keyshare;
+            this.namedGroup = namedGroup;
+        }
+
+        // For KEM, server performs encapsulation and the resulting
+        // encapsulated message becomes the key_share value sent to
+        // the client. It is not a public key, so no PublicKey object
+        // to return.
+        @Override
+        public PublicKey getPublicKey() {
+            throw new UnsupportedOperationException(
+                    "KEMCredentials stores raw keyshare, not a PublicKey");
+        }
+
+        public byte[] getKeyShare() {
+            return keyshare;
+        }
+
+        @Override
+        public NamedGroup getNamedGroup() {
+            return namedGroup;
+        }
+
+        /**
+         * Instantiates a KEMCredentials object
+         */
+        static KEMCredentials valueOf(NamedGroup namedGroup,
+                byte[] encodedPoint) {
+
+            if (namedGroup.spec != NamedGroupSpec.NAMED_GROUP_KEM) {
+                throw new RuntimeException(
+                        "Credentials decoding: Not KEM named group");
+            }
+
+            if (encodedPoint == null || encodedPoint.length == 0) {
+                return null;
+            }
+
+            return new KEMCredentials(encodedPoint, namedGroup);
+        }
+    }
+
+    private static class KEMPossession implements SSLPossession {
+        private final NamedGroup namedGroup;
+
+        public KEMPossession(NamedGroup ng) {
+            this.namedGroup = ng;
+        }
+        public NamedGroup getNamedGroup() {
+            return namedGroup;
+        }
+    }
+
+    static final class KEMReceiverPossession extends KEMPossession {
+
+        private final PrivateKey privateKey;
+        private final PublicKey publicKey;
+
+        KEMReceiverPossession(NamedGroup namedGroup, SecureRandom random) {
+            super(namedGroup);
+            String algName = null;
+            try {
+                // For KEM: This receiver side (client) generates a key pair.
+                algName = ((NamedParameterSpec)namedGroup.keAlgParamSpec).
+                        getName();
+                Provider provider = namedGroup.getProvider();
+                KeyPairGenerator kpg = (provider != null) ?
+                        KeyPairGenerator.getInstance(algName, provider) :
+                        KeyPairGenerator.getInstance(algName);
+
+                kpg.initialize(namedGroup.keAlgParamSpec, random);
+                KeyPair kp = kpg.generateKeyPair();
+                privateKey = kp.getPrivate();
+                publicKey = kp.getPublic();
+            } catch (GeneralSecurityException e) {
+                throw new RuntimeException(
+                        "Could not generate keypair for algorithm: " +
+                        algName, e);
+            }
+        }
+
+        @Override
+        public byte[] encode() {
+            if (publicKey instanceof X509Key xk) {
+                return xk.getKeyAsBytes();
+            } else if (publicKey instanceof Hybrid.PublicKeyImpl hk) {
+                return hk.getEncoded();
+            }
+            throw new ProviderException("Unsupported key type: " + publicKey);
+        }
+
+        // Package-private
+        PublicKey getPublicKey() {
+            return publicKey;
+        }
+
+        // Package-private
+        PrivateKey getPrivateKey() {
+            return privateKey;
+        }
+    }
+
+    static final class KEMSenderPossession extends KEMPossession {
+
+        private SecretKey key;
+        private final SecureRandom random;
+
+        KEMSenderPossession(NamedGroup namedGroup, SecureRandom random) {
+            super(namedGroup);
+            this.random = random;
+        }
+
+        // Package-private
+        SecureRandom getRandom() {
+            return random;
+        }
+
+        // Package-private
+        SecretKey getKey() {
+            return key;
+        }
+
+        // Package-private
+        void setKey(SecretKey key) {
+            this.key = key;
+        }
+
+        @Override
+        public byte[] encode() {
+            throw new UnsupportedOperationException("encode() not supported");
+        }
+    }
+
+    private static final class KEMKAGenerator
+            implements SSLKeyAgreementGenerator {
+
+        // Prevent instantiation of this class.
+        private KEMKAGenerator() {
+            // blank
+        }
+
+        @Override
+        public SSLKeyDerivation createKeyDerivation(
+                HandshakeContext context) throws IOException {
+            for (SSLPossession poss : context.handshakePossessions) {
+                if (poss instanceof KEMReceiverPossession kposs) {
+                    NamedGroup ng = kposs.getNamedGroup();
+                    for (SSLCredentials cred : context.handshakeCredentials) {
+                        if (cred instanceof KEMCredentials kcred &&
+                                ng.equals(kcred.namedGroup)) {
+                            String name = ((NamedParameterSpec)
+                                    ng.keAlgParamSpec).getName();
+                            return new KAKeyDerivation(name, ng, context,
+                                    kposs.getPrivateKey(), null,
+                                    kcred.getKeyShare());
+                        }
+                    }
+                }
+            }
+            context.conContext.fatal(Alert.HANDSHAKE_FAILURE,
+                    "No suitable KEM key agreement "
+                    + "parameters negotiated");
+            return null;
+        }
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
index 8d785f7515a..67780afea4f 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyShareExtension.java
@@ -27,8 +27,11 @@ package sun.security.ssl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.security.AlgorithmConstraints;
 import java.security.CryptoPrimitive;
 import java.security.GeneralSecurityException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.NamedParameterSpec;
 import java.text.MessageFormat;
 import java.util.*;
 import javax.net.ssl.SSLProtocolException;
@@ -90,7 +93,8 @@ final class KeyShareExtension {
                 Record.putInt16(m, namedGroupId);
                 Record.putBytes16(m, keyExchange);
             } catch (IOException ioe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "Unlikely IOException", ioe);
                 }
@@ -222,7 +226,8 @@ final class KeyShareExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SSLExtension.CH_KEY_SHARE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable key_share extension");
                 }
@@ -237,7 +242,8 @@ final class KeyShareExtension {
                 namedGroups = chc.clientRequestedNamedGroups;
                 if (namedGroups == null || namedGroups.isEmpty()) {
                     // No supported groups.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
                             "Ignore key_share extension, no supported groups");
                     }
@@ -287,7 +293,8 @@ final class KeyShareExtension {
                 NamedGroup ng) {
             SSLKeyExchange ke = SSLKeyExchange.valueOf(ng);
             if (ke == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "No key exchange for named group " + ng.name);
                 }
@@ -297,7 +304,9 @@ final class KeyShareExtension {
                     // update the context
                     chc.handshakePossessions.add(pos);
                     // May need more possession types in the future.
-                    if (pos instanceof NamedGroupPossession) {
+                    if (pos instanceof NamedGroupPossession ||
+                            pos instanceof
+                            KEMKeyExchange.KEMReceiverPossession) {
                         return pos.encode();
                     }
                 }
@@ -323,7 +332,8 @@ final class KeyShareExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (shc.handshakeExtensions.containsKey(SSLExtension.CH_KEY_SHARE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "The key_share extension has been loaded");
                 }
@@ -332,7 +342,8 @@ final class KeyShareExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_KEY_SHARE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable key_share extension");
                 }
@@ -347,7 +358,7 @@ final class KeyShareExtension {
                 if (ng == null || !NamedGroup.isActivatable(shc.sslConfig,
                         shc.algorithmConstraints, ng)) {
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "Ignore unsupported named group: " +
                                 NamedGroup.nameOf(entry.namedGroupId));
@@ -358,28 +369,21 @@ final class KeyShareExtension {
                 try {
                     SSLCredentials kaCred =
                         ng.decodeCredentials(entry.keyExchange);
-                    if (shc.algorithmConstraints != null &&
-                            kaCred instanceof
-                                NamedGroupCredentials namedGroupCredentials) {
-                        if (!shc.algorithmConstraints.permits(
-                                EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                                namedGroupCredentials.getPublicKey())) {
-                            if (SSLLogger.isOn() &&
-                                    SSLLogger.isOn("ssl,handshake")) {
-                                SSLLogger.warning(
+
+                    if (!isCredentialPermitted(shc.algorithmConstraints,
+                            kaCred)) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+                            SSLLogger.warning(
                                     "key share entry of " + ng + " does not " +
-                                    " comply with algorithm constraints");
-                            }
-
-                            kaCred = null;
+                                    "comply with algorithm constraints");
                         }
-                    }
-
-                    if (kaCred != null) {
+                    } else {
                         credentials.add(kaCred);
                     }
                 } catch (GeneralSecurityException ex) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
                                 "Cannot decode named group: " +
                                 NamedGroup.nameOf(entry.namedGroupId));
@@ -513,7 +517,8 @@ final class KeyShareExtension {
         @Override
         public byte[] produce(ConnectionContext context,
                 HandshakeMessage message) throws IOException {
-            // The producing happens in client side only.
+            // The producing happens in server side only.
+
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             // In response to key_share request only
@@ -522,7 +527,8 @@ final class KeyShareExtension {
                             SSLExtension.CH_KEY_SHARE);
             if (kss == null) {
                 // Unlikely, no key_share extension requested.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Ignore, no client key_share extension");
                 }
@@ -531,7 +537,8 @@ final class KeyShareExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.SH_KEY_SHARE)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Ignore, no available server key_share extension");
                 }
@@ -542,7 +549,8 @@ final class KeyShareExtension {
             if ((shc.handshakeCredentials == null) ||
                     shc.handshakeCredentials.isEmpty()) {
                 // Unlikely, HelloRetryRequest should be used earlier.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "No available client key share entries");
                 }
@@ -562,7 +570,8 @@ final class KeyShareExtension {
 
                 SSLKeyExchange ke = SSLKeyExchange.valueOf(ng);
                 if (ke == null) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
                             "No key exchange for named group " + ng.name);
                     }
@@ -571,7 +580,9 @@ final class KeyShareExtension {
 
                 SSLPossession[] poses = ke.createPossessions(shc);
                 for (SSLPossession pos : poses) {
-                    if (!(pos instanceof NamedGroupPossession)) {
+                    if (!(pos instanceof NamedGroupPossession ||
+                            pos instanceof
+                            KEMKeyExchange.KEMSenderPossession)) {
                         // May need more possession types in the future.
                         continue;
                     }
@@ -579,7 +590,34 @@ final class KeyShareExtension {
                     // update the context
                     shc.handshakeKeyExchange = ke;
                     shc.handshakePossessions.add(pos);
-                    keyShare = new KeyShareEntry(ng.id, pos.encode());
+
+                    // For KEM, perform encapsulation using the client’s public
+                    // key (KEMCredentials). The resulting encapsulated message
+                    // becomes the key_share value sent to the client. The
+                    // shared secret derived from encapsulation is stored in
+                    // the KEMSenderPossession for later use in the TLS key
+                    // schedule.
+
+                    // SSLKeyExchange.createPossessions() returns at most one
+                    // key-agreement possession or one KEMSenderPossession
+                    // per handshake.
+                    if (pos instanceof KEMKeyExchange.KEMSenderPossession xp) {
+                        if (cd instanceof KEMKeyExchange.KEMCredentials kcred
+                                && ng.equals(kcred.namedGroup)) {
+                            String name = ((NamedParameterSpec)
+                                    ng.keAlgParamSpec).getName();
+                            KAKeyDerivation handshakeKD = new KAKeyDerivation(
+                                    name, ng, shc, null, null,
+                                    kcred.getKeyShare());
+                            var encaped = handshakeKD.encapsulate(
+                                    "TlsHandshakeSecret", xp.getRandom());
+                            xp.setKey(encaped.key());
+                            keyShare = new KeyShareEntry(ng.id,
+                                    encaped.encapsulation());
+                        }
+                    } else {
+                        keyShare = new KeyShareEntry(ng.id, pos.encode());
+                    }
                     break;
                 }
 
@@ -597,7 +635,8 @@ final class KeyShareExtension {
 
             if (keyShare == null) {
                 // Unlikely, HelloRetryRequest should be used instead earlier.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "No available server key_share extension");
                 }
@@ -663,19 +702,13 @@ final class KeyShareExtension {
             try {
                 SSLCredentials kaCred =
                         ng.decodeCredentials(keyShare.keyExchange);
-                if (chc.algorithmConstraints != null &&
-                        kaCred instanceof
-                                NamedGroupCredentials namedGroupCredentials) {
-                    if (!chc.algorithmConstraints.permits(
-                            EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
-                            namedGroupCredentials.getPublicKey())) {
-                        chc.conContext.fatal(Alert.INSUFFICIENT_SECURITY,
-                            "key share entry of " + ng + " does not " +
-                            " comply with algorithm constraints");
-                    }
-                }
 
-                if (kaCred != null) {
+                if (!isCredentialPermitted(chc.algorithmConstraints,
+                        kaCred)) {
+                    chc.conContext.fatal(Alert.INSUFFICIENT_SECURITY,
+                            "key share entry of " + ng + " does not " +
+                            "comply with algorithm constraints");
+                } else {
                     credentials = kaCred;
                 }
             } catch (GeneralSecurityException ex) {
@@ -696,6 +729,34 @@ final class KeyShareExtension {
         }
     }
 
+    private static boolean isCredentialPermitted(
+            AlgorithmConstraints constraints,
+            SSLCredentials cred) {
+
+        if (constraints == null) return true;
+        if (cred == null) return false;
+
+        if (cred instanceof NamedGroupCredentials namedGroupCred) {
+            if (namedGroupCred instanceof KEMKeyExchange.KEMCredentials
+                    kemCred) {
+                AlgorithmParameterSpec paramSpec = kemCred.getNamedGroup().
+                        keAlgParamSpec;
+                String algName = (paramSpec instanceof NamedParameterSpec nps) ?
+                        nps.getName() : null;
+                return algName != null && constraints.permits(
+                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                        algName,
+                        null);
+            } else {
+                return constraints.permits(
+                        EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
+                        namedGroupCred.getPublicKey());
+            }
+        }
+
+        return true;
+    }
+
     /**
      * The absence processing if the extension is not present in
      * the ServerHello handshake message.
@@ -708,7 +769,7 @@ final class KeyShareExtension {
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
 
             // Cannot use the previous requested key shares anymore.
-            if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "No key_share extension in ServerHello, " +
                         "cleanup the key shares if necessary");
@@ -801,7 +862,8 @@ final class KeyShareExtension {
             for (NamedGroup ng : shc.clientRequestedNamedGroups) {
                 if (NamedGroup.isActivatable(shc.sslConfig,
                         shc.algorithmConstraints, ng)) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "HelloRetryRequest selected named group: " +
                                 ng.name);
diff --git a/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java b/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
index 4e5a9683079..db7ea170a23 100644
--- a/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
+++ b/src/java.base/share/classes/sun/security/ssl/KeyUpdate.java
@@ -191,7 +191,7 @@ final class KeyUpdate {
             // The consuming happens in client side only.
             PostHandshakeContext hc = (PostHandshakeContext)context;
             KeyUpdateMessage km = new KeyUpdateMessage(hc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming KeyUpdate post-handshake message", km);
             }
@@ -235,7 +235,7 @@ final class KeyUpdate {
 
                 rc.baseSecret = nplus1;
                 hc.conContext.inputRecord.changeReadCiphers(rc);
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("KeyUpdate: read key updated");
                 }
             } catch (GeneralSecurityException gse) {
@@ -276,7 +276,7 @@ final class KeyUpdate {
                 return null;
             }
             KeyUpdateMessage km = (KeyUpdateMessage)message;
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced KeyUpdate post-handshake message", km);
             }
@@ -328,7 +328,7 @@ final class KeyUpdate {
             // changeWriteCiphers() implementation.
             wc.baseSecret = nplus1;
             hc.conContext.outputRecord.changeWriteCiphers(wc, km.status.id);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("KeyUpdate: write key updated");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
index a6c376ad962..fc471f77fbc 100644
--- a/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/MaxFragExtension.java
@@ -176,7 +176,8 @@ final class MaxFragExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_MAX_FRAGMENT_LENGTH)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -213,7 +214,8 @@ final class MaxFragExtension {
             } else {
                 // log and ignore, no MFL extension.
                 chc.maxFragmentLength = -1;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "No available max_fragment_length extension can " +
                         "be used for fragment size of " +
@@ -243,7 +245,8 @@ final class MaxFragExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             if (!shc.sslConfig.isAvailable(CH_MAX_FRAGMENT_LENGTH)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -288,7 +291,8 @@ final class MaxFragExtension {
             MaxFragLenSpec spec = (MaxFragLenSpec)
                     shc.handshakeExtensions.get(CH_MAX_FRAGMENT_LENGTH);
             if (spec == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -305,7 +309,8 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
@@ -413,7 +418,8 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
@@ -455,7 +461,8 @@ final class MaxFragExtension {
             MaxFragLenSpec spec = (MaxFragLenSpec)
                     shc.handshakeExtensions.get(CH_MAX_FRAGMENT_LENGTH);
             if (spec == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable max_fragment_length extension");
                 }
@@ -472,7 +479,8 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
@@ -578,7 +586,8 @@ final class MaxFragExtension {
                     // For better interoperability, abort the maximum
                     // fragment length negotiation, rather than terminate
                     // the connection with a fatal alert.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "Abort the maximum fragment length negotiation, " +
                             "may overflow the maximum packet size limit.");
diff --git a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
index 877236ebfad..430408d54b7 100644
--- a/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
+++ b/src/java.base/share/classes/sun/security/ssl/NamedGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,12 @@ import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.ECParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.NamedParameterSpec;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.Set;
 import javax.crypto.KeyAgreement;
 import javax.crypto.spec.DHParameterSpec;
@@ -214,6 +216,39 @@ enum NamedGroup {
             ProtocolVersion.PROTOCOLS_TO_13,
             PredefinedDHParameterSpecs.ffdheParams.get(8192)),
 
+    ML_KEM_512(0x0200, "MLKEM512",
+            NamedGroupSpec.NAMED_GROUP_KEM,
+            ProtocolVersion.PROTOCOLS_OF_13,
+            null),
+
+    ML_KEM_768(0x0201, "MLKEM768",
+            NamedGroupSpec.NAMED_GROUP_KEM,
+            ProtocolVersion.PROTOCOLS_OF_13,
+            null),
+
+    ML_KEM_1024(0x0202, "MLKEM1024",
+            NamedGroupSpec.NAMED_GROUP_KEM,
+            ProtocolVersion.PROTOCOLS_OF_13,
+            null),
+
+    X25519MLKEM768(0x11ec, "X25519MLKEM768",
+            NamedGroupSpec.NAMED_GROUP_KEM,
+            ProtocolVersion.PROTOCOLS_OF_13,
+            Hybrid.X25519_MLKEM768,
+            HybridProvider.PROVIDER),
+
+    SECP256R1MLKEM768(0x11eb, "SecP256r1MLKEM768",
+            NamedGroupSpec.NAMED_GROUP_KEM,
+            ProtocolVersion.PROTOCOLS_OF_13,
+            Hybrid.SECP256R1_MLKEM768,
+            HybridProvider.PROVIDER),
+
+    SECP384R1MLKEM1024(0x11ed, "SecP384r1MLKEM1024",
+            NamedGroupSpec.NAMED_GROUP_KEM,
+            ProtocolVersion.PROTOCOLS_OF_13,
+            Hybrid.SECP384R1_MLKEM1024,
+            HybridProvider.PROVIDER),
+
     // Elliptic Curves (RFC 4492)
     //
     // arbitrary prime and characteristic-2 curves
@@ -234,22 +269,33 @@ enum NamedGroup {
     final AlgorithmParameterSpec keAlgParamSpec;
     final AlgorithmParameters keAlgParams;
     final boolean isAvailable;
+    final Provider defaultProvider;
 
     // performance optimization
     private static final Set<CryptoPrimitive> KEY_AGREEMENT_PRIMITIVE_SET =
         Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.KEY_AGREEMENT));
 
-    // Constructor used for all NamedGroup types
     NamedGroup(int id, String name,
             NamedGroupSpec namedGroupSpec,
             ProtocolVersion[] supportedProtocols,
             AlgorithmParameterSpec keAlgParamSpec) {
+        this(id, name, namedGroupSpec, supportedProtocols, keAlgParamSpec,
+                null);
+    }
+
+    // Constructor used for all NamedGroup types
+    NamedGroup(int id, String name,
+            NamedGroupSpec namedGroupSpec,
+            ProtocolVersion[] supportedProtocols,
+            AlgorithmParameterSpec keAlgParamSpec,
+            Provider defaultProvider) {
         this.id = id;
         this.name = name;
         this.spec = namedGroupSpec;
         this.algorithm = namedGroupSpec.algorithm;
         this.supportedProtocols = supportedProtocols;
         this.keAlgParamSpec = keAlgParamSpec;
+        this.defaultProvider = defaultProvider;
 
         // Check if it is a supported named group.
         AlgorithmParameters algParams = null;
@@ -266,16 +312,29 @@ enum NamedGroup {
         // Check the specific algorithm parameters.
         if (mediator) {
             try {
-                algParams =
-                    AlgorithmParameters.getInstance(namedGroupSpec.algorithm);
-                algParams.init(keAlgParamSpec);
+                // Skip AlgorithmParameters for KEMs (not supported)
+                // Check KEM's availability via KeyFactory
+                if (namedGroupSpec == NamedGroupSpec.NAMED_GROUP_KEM) {
+                    if (defaultProvider == null) {
+                        KeyFactory.getInstance(name);
+                    } else {
+                        KeyFactory.getInstance(name, defaultProvider);
+                    }
+                } else {
+                    // ECDHE or others: use AlgorithmParameters as before
+                    algParams = AlgorithmParameters.getInstance(
+                            namedGroupSpec.algorithm);
+                    algParams.init(keAlgParamSpec);
+                }
             } catch (InvalidParameterSpecException
                     | NoSuchAlgorithmException exp) {
                 if (namedGroupSpec != NamedGroupSpec.NAMED_GROUP_XDH) {
                     mediator = false;
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
-                            "No AlgorithmParameters for " + name, exp);
+                            "No AlgorithmParameters or KeyFactory for " + name,
+                                exp);
                     }
                 } else {
                     // Please remove the following code if the XDH/X25519/X448
@@ -294,7 +353,8 @@ enum NamedGroup {
                         // AlgorithmParameters.getInstance(name);
                     } catch (NoSuchAlgorithmException nsae) {
                         mediator = false;
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                             SSLLogger.warning(
                                 "No AlgorithmParameters for " + name, nsae);
                         }
@@ -307,6 +367,10 @@ enum NamedGroup {
         this.keAlgParams = mediator ? algParams : null;
     }
 
+    Provider getProvider() {
+        return defaultProvider;
+    }
+
     //
     // The next set of methods search & retrieve NamedGroups.
     //
@@ -383,7 +447,7 @@ enum NamedGroup {
             NamedGroup ng = NamedGroup.nameOf(ss);
             if (ng == null || !ng.isAvailable) {
                 if (SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest(
                             "Ignore the named group (" + ss
                                     + "), unsupported or unavailable");
@@ -403,10 +467,9 @@ enum NamedGroup {
             AlgorithmConstraints constraints, NamedGroupSpec type) {
 
         boolean hasFFDHEGroups = false;
-        for (String ng : sslConfig.namedGroups) {
-            NamedGroup namedGroup = NamedGroup.nameOf(ng);
-            if (namedGroup != null &&
-                namedGroup.isAvailable && namedGroup.spec == type) {
+        for (NamedGroup namedGroup :
+                SupportedGroups.getGroupsFromConfig(sslConfig)) {
+            if (namedGroup.isAvailable && namedGroup.spec == type) {
                 if (namedGroup.isPermitted(constraints)) {
                     return true;
                 }
@@ -441,8 +504,8 @@ enum NamedGroup {
     // Is the named group supported?
     static boolean isEnabled(SSLConfiguration sslConfig,
                              NamedGroup namedGroup) {
-        for (String ng : sslConfig.namedGroups) {
-            if (namedGroup.name.equalsIgnoreCase(ng)) {
+        for (NamedGroup ng : SupportedGroups.getGroupsFromConfig(sslConfig)) {
+            if (namedGroup.equals(ng)) {
                 return true;
             }
         }
@@ -456,12 +519,10 @@ enum NamedGroup {
             SSLConfiguration sslConfig,
             ProtocolVersion negotiatedProtocol,
             AlgorithmConstraints constraints, NamedGroupSpec[] types) {
-        for (String name : sslConfig.namedGroups) {
-            NamedGroup ng = NamedGroup.nameOf(name);
-            if (ng != null && ng.isAvailable &&
-                    (NamedGroupSpec.arrayContains(types, ng.spec)) &&
-                    ng.isAvailable(negotiatedProtocol) &&
-                    ng.isPermitted(constraints)) {
+        for (NamedGroup ng : SupportedGroups.getGroupsFromConfig(sslConfig)) {
+            if (ng.isAvailable && NamedGroupSpec.arrayContains(types, ng.spec)
+                    && ng.isAvailable(negotiatedProtocol)
+                    && ng.isPermitted(constraints)) {
                 return ng;
             }
         }
@@ -545,6 +606,10 @@ enum NamedGroup {
         return spec.decodeCredentials(this, encoded);
     }
 
+    SSLPossession createPossession(boolean isClient, SecureRandom random) {
+        return spec.createPossession(this, isClient, random);
+    }
+
     SSLPossession createPossession(SecureRandom random) {
         return spec.createPossession(this, random);
     }
@@ -566,6 +631,11 @@ enum NamedGroup {
 
         SSLKeyDerivation createKeyDerivation(
                 HandshakeContext hc) throws IOException;
+
+        default SSLPossession createPossession(NamedGroup ng, boolean isClient,
+                SecureRandom random) {
+            return createPossession(ng, random);
+        }
     }
 
     enum NamedGroupSpec implements NamedGroupScheme {
@@ -578,6 +648,10 @@ enum NamedGroup {
         // Finite Field Groups (XDH)
         NAMED_GROUP_XDH("XDH", XDHScheme.instance),
 
+        // Post-Quantum Cryptography (PQC) KEM groups
+        // Currently used for hybrid named groups
+        NAMED_GROUP_KEM("KEM", KEMScheme.instance),
+
         // arbitrary prime and curves (ECDHE)
         NAMED_GROUP_ARBITRARY("EC", null),
 
@@ -634,6 +708,15 @@ enum NamedGroup {
             return null;
         }
 
+        public SSLPossession createPossession(
+                NamedGroup ng, boolean isClient, SecureRandom random) {
+            if (scheme != null) {
+                return scheme.createPossession(ng, isClient, random);
+            }
+
+            return null;
+        }
+
         @Override
         public SSLPossession createPossession(
                 NamedGroup ng, SecureRandom random) {
@@ -739,19 +822,129 @@ enum NamedGroup {
         }
     }
 
+    private static class KEMScheme implements NamedGroupScheme {
+        private static final KEMScheme instance = new KEMScheme();
+
+        @Override
+        public byte[] encodePossessionPublicKey(NamedGroupPossession poss) {
+            return poss.encode();
+        }
+
+        @Override
+        public SSLCredentials decodeCredentials(NamedGroup ng,
+                byte[] encoded) throws IOException, GeneralSecurityException {
+            return KEMKeyExchange.KEMCredentials.valueOf(ng, encoded);
+        }
+
+        @Override
+        public SSLPossession createPossession(NamedGroup ng,
+                SecureRandom random) {
+            // Must call createPossession with isClient
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public SSLPossession createPossession(
+                NamedGroup ng, boolean isClient, SecureRandom random) {
+            return isClient
+                    ? new KEMKeyExchange.KEMReceiverPossession(ng, random)
+                    : new KEMKeyExchange.KEMSenderPossession(ng, random);
+        }
+
+        @Override
+        public SSLKeyDerivation createKeyDerivation(
+                HandshakeContext hc) throws IOException {
+            return KEMKeyExchange.kemKAGenerator.createKeyDerivation(hc);
+        }
+    }
+
+    // Inner class encapsulating supported named groups.
     static final class SupportedGroups {
-        // the supported named groups, non-null immutable list
+
+        // Default named groups.
+        private static final NamedGroup[] defaultGroups = new NamedGroup[]{
+                // Hybrid key agreement
+                X25519MLKEM768,
+
+                // Primary XDH (RFC 7748) curves
+                X25519,
+
+                // Primary NIST Suite B curves
+                SECP256_R1,
+                SECP384_R1,
+                SECP521_R1,
+
+                // Secondary XDH curves
+                X448,
+
+                // FFDHE (RFC 7919)
+                FFDHE_2048,
+                FFDHE_3072,
+                FFDHE_4096,
+                FFDHE_6144,
+                FFDHE_8192
+        };
+
+        // Filter default groups names against default constraints.
+        // Those are the values being displayed to the user with
+        // "java -XshowSettings:security:tls" command.
+        private static final String[] defaultNames = Arrays.stream(
+                        defaultGroups)
+                .filter(ng -> ng.isAvailable)
+                .filter(ng -> ng.isPermitted(SSLAlgorithmConstraints.DEFAULT))
+                .map(ng -> ng.name)
+                .toArray(String[]::new);
+
+        private static final NamedGroup[] customizedGroups =
+                getCustomizedNamedGroups();
+
+        // Note: user-passed groups are not being filtered against default
+        // algorithm constraints here. They will be displayed as-is.
+        private static final String[] customizedNames =
+                customizedGroups == null ?
+                        null : Arrays.stream(customizedGroups)
+                        .map(ng -> ng.name)
+                        .toArray(String[]::new);
+
+        // Named group names for SSLConfiguration.
         static final String[] namedGroups;
 
         static {
-            // The value of the System Property defines a list of enabled named
-            // groups in preference order, separated with comma.  For example:
-            //
-            //      jdk.tls.namedGroups="secp521r1, secp256r1, ffdhe2048"
-            //
-            // If the System Property is not defined or the value is empty, the
-            // default groups and preferences will be used.
+            if (customizedNames != null) {
+                namedGroups = customizedNames;
+            } else {
+                if (defaultNames.length == 0) {
+                    SSLLogger.logWarning(SSLLogger.Opt.SSL,
+                            "No default named groups");
+                }
+                namedGroups = defaultNames;
+            }
+        }
+
+        // Avoid the group lookup for default and customized groups.
+        static NamedGroup[] getGroupsFromConfig(SSLConfiguration sslConfig) {
+            if (sslConfig.namedGroups == defaultNames) {
+                return defaultGroups;
+            } else if (sslConfig.namedGroups == customizedNames) {
+                return customizedGroups;
+            } else {
+                return Arrays.stream(sslConfig.namedGroups)
+                        .map(NamedGroup::nameOf)
+                        .filter(Objects::nonNull)
+                        .toArray(NamedGroup[]::new);
+            }
+        }
+
+        // The value of the System Property defines a list of enabled named
+        // groups in preference order, separated with comma.  For example:
+        //
+        //      jdk.tls.namedGroups="secp521r1, secp256r1, ffdhe2048"
+        //
+        // If the System Property is not defined or the value is empty, the
+        // default groups and preferences will be used.
+        private static NamedGroup[] getCustomizedNamedGroups() {
             String property = System.getProperty("jdk.tls.namedGroups");
+
             if (property != null && !property.isEmpty()) {
                 // remove double quote marks from beginning/end of the property
                 if (property.length() > 1 && property.charAt(0) == '"' &&
@@ -760,63 +953,25 @@ enum NamedGroup {
                 }
             }
 
-            ArrayList<String> groupList;
             if (property != null && !property.isEmpty()) {
-                String[] groups = property.split(",");
-                groupList = new ArrayList<>(groups.length);
-                for (String group : groups) {
-                    group = group.trim();
-                    if (!group.isEmpty()) {
-                        NamedGroup namedGroup = nameOf(group);
-                        if (namedGroup != null) {
-                            if (namedGroup.isAvailable) {
-                                groupList.add(namedGroup.name);
-                            }
-                        }   // ignore unknown groups
-                    }
-                }
+                NamedGroup[] ret = Arrays.stream(property.split(","))
+                        .map(String::trim)
+                        .map(NamedGroup::nameOf)
+                        .filter(Objects::nonNull)
+                        .filter(ng -> ng.isAvailable)
+                        .toArray(NamedGroup[]::new);
 
-                if (groupList.isEmpty()) {
+                if (ret.length == 0) {
                     throw new IllegalArgumentException(
                             "System property jdk.tls.namedGroups(" +
-                            property + ") contains no supported named groups");
-                }
-            } else {        // default groups
-                NamedGroup[] groups = new NamedGroup[] {
-
-                        // Primary XDH (RFC 7748) curves
-                        X25519,
-
-                        // Primary NIST Suite B curves
-                        SECP256_R1,
-                        SECP384_R1,
-                        SECP521_R1,
-
-                        // Secondary XDH curves
-                        X448,
-
-                        // FFDHE (RFC 7919)
-                        FFDHE_2048,
-                        FFDHE_3072,
-                        FFDHE_4096,
-                        FFDHE_6144,
-                        FFDHE_8192,
-                    };
-
-                groupList = new ArrayList<>(groups.length);
-                for (NamedGroup group : groups) {
-                    if (group.isAvailable) {
-                        groupList.add(group.name);
-                    }
+                                    property
+                                    + ") contains no supported named groups");
                 }
 
-                if (groupList.isEmpty() &&
-                        SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
-                    SSLLogger.warning("No default named groups");
-                }
+                return ret;
             }
 
-            namedGroups = groupList.toArray(new String[0]);
+            return null;
         }
     }
 }
diff --git a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
index 89b0a72bb32..ae632334de2 100644
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
@@ -202,7 +202,8 @@ final class NewSessionTicket {
 
             this.ticket = Record.getBytes16(m);
             if (ticket.length == 0) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "No ticket in the NewSessionTicket handshake message");
                 }
@@ -329,7 +330,8 @@ final class NewSessionTicket {
             if (hc instanceof ServerHandshakeContext) {
                 // Is this session resumable?
                 if (!hc.handshakeSession.isRejoinable()) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("No session ticket produced: " +
                                 "session is not resumable");
                     }
@@ -347,7 +349,8 @@ final class NewSessionTicket {
                                 SSLExtension.PSK_KEY_EXCHANGE_MODES);
                 if (pkemSpec == null ||
                         !pkemSpec.contains(PskKeyExchangeMode.PSK_DHE_KE)) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("No session ticket produced: " +
                                 "client does not support psk_dhe_ke");
                     }
@@ -358,7 +361,8 @@ final class NewSessionTicket {
                 // Check if we have sent a PSK already, then we know it is
                 // using an allowable PSK exchange key mode.
                 if (!hc.handshakeSession.isPSKable()) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("No session ticket produced: " +
                                 "No session ticket allowed in this session");
                     }
@@ -372,7 +376,8 @@ final class NewSessionTicket {
                 hc.sslContext.engineGetServerSessionContext();
             int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
             if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("No session ticket produced: " +
                             "session timeout is too long");
                 }
@@ -459,7 +464,8 @@ final class NewSessionTicket {
                 if (!nstm.isValid()) {
                     hc.statelessResumption = false;
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("Produced NewSessionTicket stateless " +
                             "post-handshake message", nstm);
                     }
@@ -474,7 +480,8 @@ final class NewSessionTicket {
                     sessionCache.getSessionTimeout(),
                     hc.sslContext.getSecureRandom(), nonce,
                     newId.getId());
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Produced NewSessionTicket " +
                         "post-handshake message", nstm);
                 }
@@ -488,7 +495,7 @@ final class NewSessionTicket {
                 return nstm;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("No NewSessionTicket created");
             }
 
@@ -526,7 +533,8 @@ final class NewSessionTicket {
                     shc.sslContext.engineGetServerSessionContext();
             int sessionTimeoutSeconds = sessionCache.getSessionTimeout();
             if (sessionTimeoutSeconds > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Session timeout is too long. No ticket sent.");
                 }
@@ -540,7 +548,7 @@ final class NewSessionTicket {
             NewSessionTicketMessage nstm = new T12NewSessionTicketMessage(shc,
                     sessionTimeoutSeconds,
                     new SessionTicketSpec().encrypt(shc, sessionCopy));
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced NewSessionTicket stateless handshake message",
                     nstm);
@@ -579,7 +587,7 @@ final class NewSessionTicket {
             HandshakeContext hc = (HandshakeContext)context;
             NewSessionTicketMessage nstm =
                     new T13NewSessionTicketMessage(hc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming NewSessionTicket message", nstm);
             }
@@ -590,7 +598,8 @@ final class NewSessionTicket {
             // discard tickets with timeout 0
             if (nstm.ticketLifetime <= 0 ||
                 nstm.ticketLifetime > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Discarding NewSessionTicket with lifetime " +
                             nstm.ticketLifetime, nstm);
@@ -599,7 +608,8 @@ final class NewSessionTicket {
             }
 
             if (sessionCache.getSessionTimeout() > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Session cache lifetime is too long. " +
                         "Discarding ticket.");
@@ -611,7 +621,8 @@ final class NewSessionTicket {
             SecretKey resumptionMasterSecret =
                     sessionToSave.getResumptionMasterSecret();
             if (resumptionMasterSecret == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Session has no resumption master secret. " +
                             "Ignoring ticket.");
@@ -637,7 +648,7 @@ final class NewSessionTicket {
             sessionCopy.setPskIdentity(nstm.ticket);
             sessionCache.put(sessionCopy, sessionCopy.isPSK());
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("MultiNST PSK (Server): " +
                     Utilities.toHexString(Arrays.copyOf(nstm.ticket, 16)));
             }
@@ -665,7 +676,8 @@ final class NewSessionTicket {
             NewSessionTicketMessage nstm = new T12NewSessionTicketMessage(hc,
                     message);
             if (nstm.ticket.length == 0) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("NewSessionTicket ticket was empty");
                 }
                 return;
@@ -674,7 +686,8 @@ final class NewSessionTicket {
             // discard tickets with timeout 0
             if (nstm.ticketLifetime <= 0 ||
                 nstm.ticketLifetime > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Discarding NewSessionTicket with lifetime " +
                             nstm.ticketLifetime, nstm);
@@ -686,7 +699,8 @@ final class NewSessionTicket {
                     hc.sslContext.engineGetClientSessionContext();
 
             if (sessionCache.getSessionTimeout() > MAX_TICKET_LIFETIME) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Session cache lifetime is too long. " +
                         "Discarding ticket.");
@@ -695,7 +709,7 @@ final class NewSessionTicket {
             }
 
             hc.handshakeSession.setPskIdentity(nstm.ticket);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Consuming NewSessionTicket\n" + nstm);
             }
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
index 416d5d1b5ef..7a188ccf476 100644
--- a/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
@@ -188,7 +188,7 @@ abstract class OutputRecord
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "change_cipher_spec message");
                 }
@@ -222,7 +222,7 @@ abstract class OutputRecord
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "key_update handshake message");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
index b99c0175838..87d97580bcb 100644
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
@@ -341,7 +341,8 @@ final class PreSharedKeyExtension {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SSLExtension.CH_PRE_SHARED_KEY)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable pre_shared_key extension");
                 }
@@ -394,7 +395,7 @@ final class PreSharedKeyExtension {
                         }
                         if (b == null || s == null) {
                             if (SSLLogger.isOn() &&
-                                    SSLLogger.isOn("ssl,handshake")) {
+                                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                                 SSLLogger.fine(
                                         "Stateless session ticket invalid");
                             }
@@ -402,7 +403,8 @@ final class PreSharedKeyExtension {
                     }
 
                     if (s != null && canRejoin(clientHello, shc, s)) {
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                             SSLLogger.fine("Resuming session: ", s);
                         }
 
@@ -436,7 +438,7 @@ final class PreSharedKeyExtension {
         // Check protocol version
         if (result && s.getProtocolVersion() != shc.negotiatedProtocol) {
             if (SSLLogger.isOn() &&
-                SSLLogger.isOn("ssl,handshake,verbose")) {
+                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
 
                 SSLLogger.finest("Can't resume, incorrect protocol version");
             }
@@ -450,7 +452,7 @@ final class PreSharedKeyExtension {
                 s.getPeerPrincipal();
             } catch (SSLPeerUnverifiedException e) {
                 if (SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest(
                         "Can't resume, " +
                         "client authentication is required");
@@ -466,7 +468,8 @@ final class PreSharedKeyExtension {
             if (result &&
                 !shc.localSupportedCertSignAlgs.containsAll(sessionSigAlgs)) {
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Can't resume. Session uses different " +
                         "signature algorithms");
                 }
@@ -481,7 +484,7 @@ final class PreSharedKeyExtension {
             String sessionIdentityAlg = s.getIdentificationProtocol();
             if (!identityAlg.equalsIgnoreCase(sessionIdentityAlg)) {
                 if (SSLLogger.isOn() &&
-                    SSLLogger.isOn("ssl,handshake,verbose")) {
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
 
                     SSLLogger.finest("Can't resume, endpoint id" +
                         " algorithm does not match, requested: " +
@@ -495,7 +498,7 @@ final class PreSharedKeyExtension {
         if (result && (!shc.isNegotiable(s.getSuite()) ||
             !clientHello.cipherSuites.contains(s.getSuite()))) {
             if (SSLLogger.isOn() &&
-                    SSLLogger.isOn("ssl,handshake,verbose")) {
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.finest(
                     "Can't resume, unavailable session cipher suite");
             }
@@ -653,7 +656,8 @@ final class PreSharedKeyExtension {
             // The producing happens in client side only.
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
             if (!chc.isResumption || chc.resumingSession == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("No session to resume.");
                 }
                 return null;
@@ -663,7 +667,8 @@ final class PreSharedKeyExtension {
             Collection<SignatureScheme> sessionSigAlgs =
                 chc.resumingSession.getLocalSupportedSignatureSchemes();
             if (!chc.localSupportedCertSignAlgs.containsAll(sessionSigAlgs)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Existing session uses different " +
                         "signature algorithms");
                 }
@@ -673,7 +678,8 @@ final class PreSharedKeyExtension {
             // The session must have a pre-shared key
             SecretKey psk = chc.resumingSession.getPreSharedKey();
             if (psk == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Existing session has no PSK.");
                 }
                 return null;
@@ -687,7 +693,8 @@ final class PreSharedKeyExtension {
             }
 
             if (chc.pskIdentity == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "PSK has no identity, or identity was already used");
                 }
@@ -699,7 +706,7 @@ final class PreSharedKeyExtension {
                 chc.sslContext.engineGetClientSessionContext();
             sessionCache.remove(chc.resumingSession.getSessionId(), true);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Found resumable session. Preparing PSK message.");
                 SSLLogger.fine(
@@ -836,7 +843,7 @@ final class PreSharedKeyExtension {
         public void absent(ConnectionContext context,
                            HandshakeMessage message) throws IOException {
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                 "Handling pre_shared_key absence.");
             }
@@ -901,7 +908,7 @@ final class PreSharedKeyExtension {
             }
 
             SHPreSharedKeySpec shPsk = new SHPreSharedKeySpec(chc, buffer);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Received pre_shared_key extension: ", shPsk);
             }
@@ -911,7 +918,7 @@ final class PreSharedKeyExtension {
                     "Selected identity index is not in correct range.");
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Resuming session: ", chc.resumingSession);
             }
@@ -925,7 +932,7 @@ final class PreSharedKeyExtension {
                 HandshakeMessage message) throws IOException {
             ClientHandshakeContext chc = (ClientHandshakeContext)context;
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Handling pre_shared_key absence.");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
index 8f5cc000494..42e914fcaf8 100644
--- a/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
+++ b/src/java.base/share/classes/sun/security/ssl/PredefinedDHParameterSpecs.java
@@ -246,7 +246,7 @@ final class PredefinedDHParameterSpecs {
             Matcher spacesMatcher = spacesPattern.matcher(property);
             property = spacesMatcher.replaceAll("");
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("sslctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                 SSLLogger.fine(
                         "The Security Property " +
                         PROPERTY_NAME + ": " + property);
@@ -262,7 +262,8 @@ final class PredefinedDHParameterSpecs {
                     String primeModulus = paramsFinder.group(1);
                     BigInteger p = new BigInteger(primeModulus, 16);
                     if (!p.isProbablePrime(PRIME_CERTAINTY)) {
-                        if (SSLLogger.isOn() && SSLLogger.isOn("sslctx")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                             SSLLogger.fine(
                                 "Prime modulus p in Security Property, " +
                                 PROPERTY_NAME + ", is not a prime: " +
@@ -279,7 +280,8 @@ final class PredefinedDHParameterSpecs {
                     DHParameterSpec spec = new DHParameterSpec(p, g);
                     defaultParams.put(primeLen, spec);
                 }
-            } else if (SSLLogger.isOn() && SSLLogger.isOn("sslctx")) {
+            } else if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                 SSLLogger.fine("Invalid Security Property, " +
                         PROPERTY_NAME + ", definition");
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
index 6c306839b5a..4b641e157a6 100644
--- a/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PskKeyExchangeModesExtension.java
@@ -184,7 +184,8 @@ final class PskKeyExchangeModesExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.PSK_KEY_EXCHANGE_MODES)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable psk_key_exchange_modes extension");
                 }
@@ -216,7 +217,8 @@ final class PskKeyExchangeModesExtension {
                 if (!spec.contains(PskKeyExchangeMode.PSK_DHE_KE)) {
                     shc.isResumption = false;
                     shc.resumingSession = null;
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                             "abort session resumption, " +
                             "no supported psk_dhe_ke PSK key exchange mode");
@@ -247,7 +249,8 @@ final class PskKeyExchangeModesExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.PSK_KEY_EXCHANGE_MODES)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "Ignore unavailable psk_key_exchange_modes extension");
                 }
@@ -287,7 +290,8 @@ final class PskKeyExchangeModesExtension {
             if (shc.isResumption) {     // resumingSession may not be set
                 shc.isResumption = false;
                 shc.resumingSession = null;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "abort session resumption, " +
                             "no supported psk_dhe_ke PSK key exchange mode");
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java
index 7e307ba9d27..3a91906971f 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicEngineOutputRecord.java
@@ -75,14 +75,14 @@ final class QuicEngineOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                             "alert message: " + Alert.nameOf(description));
                 }
                 return;
             }
             if (level == Alert.Level.WARNING.level) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("Suppressing warning-level " +
                             "alert message: " + Alert.nameOf(description));
                 }
@@ -90,7 +90,7 @@ final class QuicEngineOutputRecord extends OutputRecord implements SSLRecord {
             }
 
             if (alert != null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("Suppressing subsequent alert: " +
                             description + ", original: " + alert.id);
                 }
@@ -109,7 +109,7 @@ final class QuicEngineOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                                     "handshake message",
                             ByteBuffer.wrap(source, offset, length));
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java b/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java
index 4613dcf96ff..634396868df 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicKeyManager.java
@@ -244,7 +244,7 @@ sealed abstract class QuicKeyManager
             if (toDiscard == null) {
                 return;
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("discarding keys (keyphase="
                         + toDiscard.writeCipher.getKeyPhase()
                         + ") of " + this.keySpace + " key space");
@@ -389,7 +389,7 @@ sealed abstract class QuicKeyManager
             if (toDiscard == null) {
                 return;
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("discarding keys (keyphase="
                         + toDiscard.writeCipher.getKeyPhase()
                         + ") of " + this.keySpace + " key space");
@@ -570,7 +570,7 @@ sealed abstract class QuicKeyManager
             if (series == null) {
                 return;
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("discarding key (series) of " +
                         this.keySpace + " key space");
             }
@@ -611,7 +611,7 @@ sealed abstract class QuicKeyManager
             if (series.canUseOldDecryptKey(packetNumber)) {
                 final QuicReadCipher oldReadCipher = series.old;
                 assert oldReadCipher != null : "old key is unexpectedly null";
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest("using old read key to decrypt packet: " +
                             packetNumber + ", with incoming key phase: " +
                             keyPhase + ", current key phase: " +
@@ -624,7 +624,7 @@ sealed abstract class QuicKeyManager
                 if (!series.current.usedByBothEndpoints()
                         && series.current.writeCipher.hasEncryptedAny()
                         && oneRttContext.getLargestPeerAckedPN()
-                                >= series.current.writeCipher.lowestEncryptedPktNum()) {
+                            >= series.current.writeCipher.lowestEncryptedPktNum()) {
                     // RFC-9001, section 6.2:
                     // An endpoint that receives an acknowledgment that is
                     // carried in a packet protected with old keys where any
@@ -633,7 +633,7 @@ sealed abstract class QuicKeyManager
                     // KEY_UPDATE_ERROR. This indicates that a peer has
                     // received and acknowledged a packet that initiates a key
                     // update, but has not updated keys in response.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.finest("peer used incorrect key, was" +
                                 " expected to use updated key of" +
                                 " key phase: " + currentKeyPhase +
@@ -646,7 +646,7 @@ sealed abstract class QuicKeyManager
                 }
                 return;
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("detected ONE_RTT key update, current key " +
                         "phase: " + currentKeyPhase
                         + ", incoming key phase: " + keyPhase
@@ -717,7 +717,7 @@ sealed abstract class QuicKeyManager
             }
             final long numEncrypted = cipher.getNumEncrypted();
             if (numEncrypted >= 0.8 * confidentialityLimit) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest("about to reach confidentiality limit, " +
                             "attempting to initiate a 1-RTT key update," +
                             " packet number: " +
@@ -732,7 +732,7 @@ sealed abstract class QuicKeyManager
                             : "key phase of updated key unexpectedly matches " +
                             "the key phase "
                             + cipher.getKeyPhase() + " of current keys";
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.finest(
                                 "1-RTT key update initiated, new key phase: "
                                         + newKeyPhase);
@@ -755,7 +755,7 @@ sealed abstract class QuicKeyManager
                 // current key phase. This ensures that keys are
                 // available to both peers before
                 // another key update can be initiated.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest(
                             "skipping key update initiation because peer " +
                             "hasn't yet sent us a packet encrypted with " +
@@ -803,7 +803,7 @@ sealed abstract class QuicKeyManager
                 // (we avoid timing attacks by not generating
                 // keys during decryption, our key generation
                 // only happens during encryption)
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest("next keys unavailable," +
                             " won't decrypt a packet which appears to be" +
                             " a key update");
@@ -815,7 +815,7 @@ sealed abstract class QuicKeyManager
             // use the next keys to attempt decrypting
             currentKeySeries.next.readCipher.decryptPacket(packetNumber, packet,
                     headerLength, output);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest(
                         "decrypted using next keys for peer-initiated" +
                         " key update; will now switch to new key phase: " +
@@ -1025,14 +1025,14 @@ sealed abstract class QuicKeyManager
                 // update the key series
                 this.keySeries = newSeries;
                 if (oldReadCipher != null) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.finest(
                                 "discarding old read key of key phase: " +
                                 oldReadCipher.getKeyPhase());
                     }
                     oldReadCipher.discard(false);
                 }
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest("discarding write key of key phase: " +
                             writeCipherToDiscard.getKeyPhase());
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
index 18790a58c11..74975fc1e5b 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
@@ -560,7 +560,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
                 // incoming crypto buffer is null. Validate message type,
                 // check if size is available
                 byte messageType = payload.get(payload.position());
-                if (SSLLogger.isOn()) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("Received message of type 0x" +
                             Integer.toHexString(messageType & 0xFF));
                 }
@@ -835,7 +835,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
         final boolean confirmed = HANDSHAKE_STATE_HANDLE.compareAndSet(this,
                 NEED_SEND_HANDSHAKE_DONE, HANDSHAKE_CONFIRMED);
         if (confirmed) {
-            if (SSLLogger.isOn()) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("QuicTLSEngine (server) marked handshake " +
                         "state as HANDSHAKE_CONFIRMED");
             }
@@ -853,7 +853,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
         final boolean confirmed = HANDSHAKE_STATE_HANDLE.compareAndSet(this,
                 NEED_RECV_HANDSHAKE_DONE, HANDSHAKE_CONFIRMED);
         if (confirmed) {
-            if (SSLLogger.isOn()) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine(
                         "QuicTLSEngine (client) received HANDSHAKE_DONE," +
                         " marking state as HANDSHAKE_DONE");
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index ec91cb4509a..53d239c9318 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAClientKeyExchange.java
@@ -190,7 +190,7 @@ final class RSAClientKeyExchange {
                 throw chc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
                         "Cannot generate RSA premaster secret", gse);
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced RSA ClientKeyExchange handshake message", ckem);
             }
@@ -270,7 +270,7 @@ final class RSAClientKeyExchange {
 
             RSAClientKeyExchangeMessage ckem =
                     new RSAClientKeyExchangeMessage(shc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming RSA ClientKeyExchange handshake message", ckem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
index d176d7311d0..d204fddb13c 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAKeyExchange.java
@@ -149,7 +149,8 @@ final class RSAKeyExchange {
                 needFailover = !KeyUtil.isOracleJCEProvider(
                         cipher.getProvider().getName());
             } catch (InvalidKeyException | UnsupportedOperationException iue) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("The Cipher provider "
                             + safeProviderName(cipher)
                             + " caused exception: " + iue.getMessage());
@@ -196,7 +197,8 @@ final class RSAKeyExchange {
             try {
                 return cipher.getProvider().toString();
             } catch (Exception e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Retrieving The Cipher provider name" +
                             " caused exception ", e);
                 }
@@ -204,7 +206,8 @@ final class RSAKeyExchange {
             try {
                 return cipher.toString() + " (provider name not available)";
             } catch (Exception e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Retrieving The Cipher name" +
                             " caused exception ", e);
                 }
@@ -219,7 +222,7 @@ final class RSAKeyExchange {
                 int clientVersion, int serverVersion, byte[] encodedSecret,
                 SecureRandom generator) throws GeneralSecurityException {
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Generating a premaster secret");
             }
 
@@ -234,7 +237,8 @@ final class RSAKeyExchange {
             } catch (InvalidAlgorithmParameterException |
                     NoSuchAlgorithmException iae) {
                 // unlikely to happen, otherwise, must be a provider exception
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("RSA premaster secret generation error", iae);
                 }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
index 4ab1cdf1f93..0c0fec10449 100644
--- a/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/RSAServerKeyExchange.java
@@ -264,7 +264,7 @@ final class RSAServerKeyExchange {
             RSAServerKeyExchangeMessage skem =
                     new RSAServerKeyExchangeMessage(
                             shc, x509Possession, rsaPossession);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Produced RSA ServerKeyExchange handshake message", skem);
             }
@@ -296,7 +296,7 @@ final class RSAServerKeyExchange {
 
             RSAServerKeyExchangeMessage skem =
                     new RSAServerKeyExchangeMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Consuming RSA ServerKeyExchange handshake message", skem);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
index b744914b31d..0d3d8bd039c 100644
--- a/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
@@ -138,7 +138,8 @@ final class RenegoInfoExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_RENEGOTIATION_INFO)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore unavailable renegotiation_info extension");
                 }
@@ -182,7 +183,8 @@ final class RenegoInfoExtension {
                 return extData;
             } else {    // not secure renegotiation
                 if (HandshakeContext.allowUnsafeRenegotiation) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning("Using insecure renegotiation");
                     }
 
@@ -216,7 +218,8 @@ final class RenegoInfoExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_RENEGOTIATION_INFO)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Ignore unavailable extension: " +
                             CH_RENEGOTIATION_INFO.name);
                 }
@@ -280,7 +283,8 @@ final class RenegoInfoExtension {
                 for (int id : clientHello.cipherSuiteIds) {
                     if (id ==
                             CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV.id) {
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                             SSLLogger.finest(
                                 "Safe renegotiation, using the SCSV signaling");
                         }
@@ -294,7 +298,8 @@ final class RenegoInfoExtension {
                         "Failed to negotiate the use of secure renegotiation");
                 }   // otherwise, allow legacy hello message
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("Warning: No renegotiation " +
                         "indication in ClientHello, allow legacy ClientHello");
                 }
@@ -306,13 +311,15 @@ final class RenegoInfoExtension {
                         "Inconsistent secure renegotiation indication");
             } else {    // renegotiation, not secure
                 if (HandshakeContext.allowUnsafeRenegotiation) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning("Using insecure renegotiation");
                     }
                 } else {
                     // Unsafe renegotiation should have been aborted in
                     // earlier processes.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("Terminate insecure renegotiation");
                     }
                     throw shc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
@@ -345,7 +352,8 @@ final class RenegoInfoExtension {
             if (requestedSpec == null && !shc.conContext.secureRenegotiation) {
                 // Ignore, no renegotiation_info extension or SCSV signaling
                 // requested.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable renegotiation_info extension");
                 }
@@ -354,7 +362,8 @@ final class RenegoInfoExtension {
 
             if (!shc.conContext.secureRenegotiation) {
                 // Ignore, no secure renegotiation is negotiated.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "No secure renegotiation has been negotiated");
                 }
@@ -515,7 +524,8 @@ final class RenegoInfoExtension {
                         "Failed to negotiate the use of secure renegotiation");
                 }   // otherwise, allow legacy hello message
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("Warning: No renegotiation " +
                         "indication in ServerHello, allow legacy ServerHello");
                 }
@@ -527,13 +537,15 @@ final class RenegoInfoExtension {
                         "Inconsistent secure renegotiation indication");
             } else {    // renegotiation, not secure
                 if (HandshakeContext.allowUnsafeRenegotiation) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning("Using insecure renegotiation");
                     }
                 } else {
                     // Unsafe renegotiation should have been aborted in
                     // earlier processes.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("Terminate insecure renegotiation");
                     }
                     throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
index 594766ea0fd..d3207a7aa63 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
@@ -454,7 +454,7 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
                                 .equalsIgnoreCase(paramDigestAlg));
 
             } catch (InvalidParameterSpecException e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("Invalid AlgorithmParameters: "
                             + parameters + "; Error: " + e.getMessage());
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
index 5dfa5be3420..9d1d6dabaec 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLCipher.java
@@ -392,7 +392,8 @@ enum SSLCipher {
                 if (values[1].contains(tag[0])) {
                     index = 0;
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.fine("jdk.tls.keyLimits:  Unknown action:  " +
                                 entry);
                     }
@@ -413,13 +414,14 @@ enum SSLCipher {
                             "Length exceeded limits");
                     }
                 } catch (NumberFormatException e) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.fine("jdk.tls.keyLimits:  " + e.getMessage() +
                                 ":  " +  entry);
                     }
                     continue;
                 }
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("jdk.tls.keyLimits:  entry = " + entry +
                             ". " + values[0] + ":" + tag[index] + " = " + size);
                 }
@@ -468,7 +470,7 @@ enum SSLCipher {
             Cipher.getInstance(transformation);
             return true;
         } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("Transformation " + transformation + " is" +
                         " not available.");
             }
@@ -860,7 +862,8 @@ enum SSLCipher {
                         "JCE provider " + cipher.getProvider().getName(), sbe);
                 }
                 pt.position(pos);
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -930,7 +933,8 @@ enum SSLCipher {
                     authenticator.increaseSequenceNumber();
                 }
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.finest(
                         "Padded plaintext before ENCRYPTION", bb.duplicate());
                 }
@@ -1050,7 +1054,8 @@ enum SSLCipher {
                         "JCE provider " + cipher.getProvider().getName(), sbe);
                 }
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Padded plaintext after DECRYPTION",
                             pt.duplicate().position(pos));
@@ -1182,7 +1187,7 @@ enum SSLCipher {
                 int len = addPadding(bb, blockSize);
                 bb.position(pos);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Padded plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -1326,7 +1331,8 @@ enum SSLCipher {
                         "JCE provider " + cipher.getProvider().getName(), sbe);
                 }
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine("Padded plaintext after DECRYPTION",
                         pt.duplicate().position(pos));
                 }
@@ -1478,7 +1484,8 @@ enum SSLCipher {
                 int len = addPadding(bb, blockSize);
                 bb.position(pos);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Padded plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -1650,7 +1657,8 @@ enum SSLCipher {
                 pt.position(pos);
                 pt.limit(pos + len);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -1737,7 +1745,8 @@ enum SSLCipher {
 
                 // DON'T encrypt the nonce for AEAD mode.
                 int len, pos = bb.position();
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -1823,7 +1832,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("KeyLimit read side: algorithm = " +
                             algorithm + ":" + tag[0] +
                             "\ncountdown value = " + keyLimitCountdown);
@@ -1932,7 +1941,8 @@ enum SSLCipher {
                 contentType = pt.get(i);
                 pt.limit(i);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -1984,7 +1994,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("KeyLimit write side: algorithm = "
                             + algorithm + ":" + tag[0] +
                             "\ncountdown value = " + keyLimitCountdown);
@@ -2026,7 +2036,8 @@ enum SSLCipher {
                 cipher.updateAAD(aad);
 
                 int len, pos = bb.position();
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -2182,7 +2193,8 @@ enum SSLCipher {
                 pt.position(pos);
                 pt.limit(pos + len);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -2231,7 +2243,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("algorithm = " + algorithm +
                             ":" + tag[0] + "\ncountdown value = " +
                             keyLimitCountdown);
@@ -2273,7 +2285,8 @@ enum SSLCipher {
 
                 // DON'T encrypt the nonce for AEAD mode.
                 int pos = bb.position();
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
@@ -2450,7 +2463,8 @@ enum SSLCipher {
                 contentType = pt.get(i);
                 pt.limit(i);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext after DECRYPTION", pt.duplicate());
                 }
@@ -2499,7 +2513,7 @@ enum SSLCipher {
 
                 keyLimitCountdown = cipherLimits.getOrDefault(
                     algorithm.toUpperCase(Locale.ENGLISH) + ":" + tag[0], 0L);
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("algorithm = " + algorithm +
                             ":" + tag[0] + "\ncountdown value = " +
                             keyLimitCountdown);
@@ -2541,7 +2555,8 @@ enum SSLCipher {
                 cipher.updateAAD(aad);
 
                 int pos = bb.position();
-                if (SSLLogger.isOn() && SSLLogger.isOn("plaintext")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PLAINTEXT)) {
                     SSLLogger.fine(
                             "Plaintext before ENCRYPTION",
                             bb.duplicate());
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
index ace60e41af9..1cc29e29477 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,9 +64,6 @@ final class SSLConfiguration implements Cloneable {
     // the configured named groups for the "supported_groups" extensions
     String[]                   namedGroups;
 
-    // the maximum protocol version of enabled protocols
-    ProtocolVersion             maximumProtocolVersion;
-
     // Configurations per SSLSocket or SSLEngine instance.
     boolean                     isClientMode;
     boolean                     enableSessionCreation;
@@ -205,7 +202,7 @@ final class SSLConfiguration implements Cloneable {
             nstServerCount > 10) {
             serverNewSessionTicketCount = SERVER_NST_DEFAULT;
             if (nstServerCount != null && SSLLogger.isOn() &&
-                SSLLogger.isOn("ssl,handshake")) {
+                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "jdk.tls.server.newSessionTicketCount defaults to " +
                         SERVER_NST_DEFAULT + " as the property was not " +
@@ -213,7 +210,7 @@ final class SSLConfiguration implements Cloneable {
             }
         } else {
             serverNewSessionTicketCount = nstServerCount;
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "jdk.tls.server.newSessionTicketCount set to " +
                         serverNewSessionTicketCount);
@@ -249,13 +246,6 @@ final class SSLConfiguration implements Cloneable {
                         CustomizedServerSignatureSchemes.signatureSchemes :
                         SupportedSigSchemes.DEFAULT;
         this.namedGroups = NamedGroup.SupportedGroups.namedGroups;
-        this.maximumProtocolVersion = ProtocolVersion.NONE;
-        for (ProtocolVersion pv : enabledProtocols) {
-            if (pv.compareTo(maximumProtocolVersion) > 0) {
-                this.maximumProtocolVersion = pv;
-            }
-        }
-
         // Configurations per SSLSocket or SSLEngine instance.
         this.isClientMode = isClientMode;
         this.enableSessionCreation = true;
@@ -323,13 +313,6 @@ final class SSLConfiguration implements Cloneable {
         sa = params.getProtocols();
         if (sa != null) {
             this.enabledProtocols = ProtocolVersion.namesOf(sa);
-
-            this.maximumProtocolVersion = ProtocolVersion.NONE;
-            for (ProtocolVersion pv : enabledProtocols) {
-                if (pv.compareTo(maximumProtocolVersion) > 0) {
-                    this.maximumProtocolVersion = pv;
-                }
-            }
         }   // otherwise, use the default values
 
         if (params.getNeedClientAuth()) {
@@ -586,7 +569,7 @@ final class SSLConfiguration implements Cloneable {
         String property = System.getProperty(propertyName);
         // this method is called from class initializer; logging here
         // will occasionally pin threads and deadlock if called from a virtual thread
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)
                 && !Thread.currentThread().isVirtual()) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
@@ -615,8 +598,9 @@ final class SSLConfiguration implements Cloneable {
                 if (scheme != null && scheme.isAvailable) {
                     signatureSchemes.add(schemeName);
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")
-                            && !Thread.currentThread().isVirtual()) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSLCTX)
+                                && !Thread.currentThread().isVirtual()) {
                         SSLLogger.fine(
                         "The current installed providers do not " +
                               "support signature scheme: " + schemeName);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
index be324eb0949..a1cc3ee112f 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import java.security.*;
 import java.security.cert.*;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 import javax.net.ssl.*;
 import sun.security.provider.certpath.AlgorithmChecker;
 import sun.security.ssl.SSLAlgorithmConstraints.SIGNATURE_CONSTRAINTS_MODE;
@@ -104,11 +105,11 @@ public abstract class SSLContextImpl extends SSLContextSpi {
          * first connection to time out and fail. Make sure it is
          * primed and ready by getting some initial output from it.
          */
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
             SSLLogger.finest("trigger seeding of SecureRandom");
         }
         secureRandom.nextInt();
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
             SSLLogger.finest("done seeding of SecureRandom");
         }
 
@@ -143,7 +144,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 return (X509ExtendedKeyManager)km;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                 SSLLogger.warning(
                     "X509KeyManager passed to SSLContext.init():  need an " +
                     "X509ExtendedKeyManager for SSLEngine use");
@@ -246,7 +247,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             contextLock.lock();
             try {
                 if (statusResponseManager == null) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                         SSLLogger.finest(
                                 "Initializing StatusResponseManager");
                     }
@@ -365,13 +367,24 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             Collection<CipherSuite> allowedCipherSuites,
             List<ProtocolVersion> protocols) {
         LinkedHashSet<CipherSuite> suites = new LinkedHashSet<>();
+        List<String> disabledSuites = null;
+        List<String> unAvailableSuites = null;
+
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
+            disabledSuites = new ArrayList<>();
+            unAvailableSuites = new ArrayList<>();
+        }
+
         if (protocols != null && (!protocols.isEmpty())) {
             for (CipherSuite suite : allowedCipherSuites) {
                 if (!suite.isAvailable()) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
+                        unAvailableSuites.add(suite.name);
+                    }
                     continue;
                 }
 
-                boolean isSupported = false;
                 for (ProtocolVersion protocol : protocols) {
                     if (!suite.supports(protocol) ||
                             !suite.bulkCipher.isAvailable()) {
@@ -382,27 +395,43 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                             EnumSet.of(CryptoPrimitive.KEY_AGREEMENT),
                             suite.name, null)) {
                         suites.add(suite);
-                        isSupported = true;
                     } else if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,sslctx,verbose")) {
-                        SSLLogger.fine(
-                                "Ignore disabled cipher suite: " + suite.name);
+                            SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
+                        disabledSuites.add(suite.name);
                     }
 
                     break;
                 }
-
-                if (!isSupported && SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,sslctx,verbose")) {
-                    SSLLogger.finest(
-                            "Ignore unsupported cipher suite: " + suite);
-                }
             }
         }
 
+        if(SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
+            logSuites("Ignore disabled cipher suites for protocols: ",
+                    protocols, disabledSuites);
+            logSuites("Ignore unavailable cipher suites for protocols: ",
+                    protocols, unAvailableSuites);
+            logSuites("Available cipher suites for protocols: ",
+                    protocols, suites);
+
+        }
         return new ArrayList<>(suites);
     }
 
+    private static void logSuites(String message,
+                                  List<ProtocolVersion> protocols,
+                                  Collection<?> suites) {
+        if (suites.isEmpty()) {
+            return;
+        }
+        String protocolStr = protocols.stream()
+                .map(pv -> pv.name)
+                .collect(Collectors.joining(", ", "[", "]"));
+        String suiteStr = String.join(", ",
+            suites.stream().map(Object::toString).collect(Collectors.toList()));
+        SSLLogger.finest(message + protocolStr + System.lineSeparator() +
+                Utilities.wrapText("[" + suiteStr + "]", 140));
+    }
+
     /*
      * Get the customized cipher suites specified by the given system property.
      */
@@ -410,7 +439,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             String propertyName) {
 
         String property = System.getProperty(propertyName);
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
                     property + "'");
@@ -437,7 +466,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 try {
                     suite = CipherSuite.nameOf(cipherSuiteNames[i]);
                 } catch (IllegalArgumentException iae) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                         SSLLogger.fine(
                                 "Unknown or unsupported cipher suite name: " +
                                 cipherSuiteNames[i]);
@@ -449,17 +479,22 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 if (suite != null && suite.isAvailable()) {
                     cipherSuites.add(suite);
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
                         SSLLogger.fine(
                                 "The current installed providers do not " +
                                 "support cipher suite: " + cipherSuiteNames[i]);
                     }
                 }
             }
-
+            if (cipherSuites.isEmpty() && SSLLogger.isOn()
+                    && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)) {
+                SSLLogger.fine(
+                        "No cipher suites satisfy property: " + propertyName +
+                                ". Returning empty list");
+            }
             return cipherSuites;
         }
-
         return Collections.emptyList();
     }
 
@@ -527,9 +562,6 @@ public abstract class SSLContextImpl extends SSLContextSpi {
         private static final List<ProtocolVersion> supportedProtocols;
         private static final List<ProtocolVersion> serverDefaultProtocols;
 
-        private static final List<CipherSuite> supportedCipherSuites;
-        private static final List<CipherSuite> serverDefaultCipherSuites;
-
         static {
             supportedProtocols = Arrays.asList(
                 ProtocolVersion.TLS13,
@@ -547,13 +579,15 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 ProtocolVersion.TLS11,
                 ProtocolVersion.TLS10
             });
-
-            supportedCipherSuites = getApplicableSupportedCipherSuites(
-                    supportedProtocols);
-            serverDefaultCipherSuites = getApplicableEnabledCipherSuites(
-                    serverDefaultProtocols, false);
         }
 
+        private static final LazyConstant<List<CipherSuite>>
+                supportedCipherSuites = LazyConstant.of(() ->
+                getApplicableSupportedCipherSuites(supportedProtocols));
+        private static final LazyConstant<List<CipherSuite>>
+                serverDefaultCipherSuites = LazyConstant.of(() ->
+                getApplicableEnabledCipherSuites(serverDefaultProtocols, false));
+
         @Override
         List<ProtocolVersion> getSupportedProtocolVersions() {
             return supportedProtocols;
@@ -561,7 +595,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
 
         @Override
         List<CipherSuite> getSupportedCipherSuites() {
-            return supportedCipherSuites;
+            return supportedCipherSuites.get();
         }
 
         @Override
@@ -571,7 +605,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
 
         @Override
         List<CipherSuite> getServerDefaultCipherSuites() {
-            return serverDefaultCipherSuites;
+            return serverDefaultCipherSuites.get();
         }
 
         @Override
@@ -811,10 +845,18 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 clientDefaultCipherSuites =
                         getApplicableEnabledCipherSuites(
                                 clientDefaultProtocols, true);
-                serverDefaultCipherSuites =
-                        getApplicableEnabledCipherSuites(
-                                serverDefaultProtocols, false);
-
+                // getApplicableEnabledCipherSuites returns same CS List if
+                // no customized CS in use and protocols are same. Can avoid
+                // the getApplicableEnabledCipherSuites call
+                if (clientCustomizedCipherSuites.isEmpty() &&
+                        serverCustomizedCipherSuites.isEmpty() &&
+                        clientDefaultProtocols.equals(serverDefaultProtocols)) {
+                    serverDefaultCipherSuites = clientDefaultCipherSuites;
+                } else {
+                    serverDefaultCipherSuites =
+                            getApplicableEnabledCipherSuites(
+                                    serverDefaultProtocols, false);
+                }
             } else {
                 // unlikely to be used
                 clientDefaultProtocols = null;
@@ -907,7 +949,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 tmMediator = getTrustManagers();
             } catch (Exception e) {
                 reserved = e;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                     SSLLogger.warning(
                             "Failed to load default trust managers", e);
                 }
@@ -919,7 +962,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                     kmMediator = getKeyManagers();
                 } catch (Exception e) {
                     reserved = e;
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                         SSLLogger.warning(
                                 "Failed to load default key managers", e);
                     }
@@ -977,7 +1021,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             String defaultKeyStore = props.get("keyStore");
             String defaultKeyStoreType = props.get("keyStoreType");
             String defaultKeyStoreProvider = props.get("keyStoreProvider");
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                 SSLLogger.fine("keyStore is : " + defaultKeyStore);
                 SSLLogger.fine("keyStore type is : " +
                                         defaultKeyStoreType);
@@ -1007,7 +1051,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
 
                 // Try to initialize key store.
                 if ((defaultKeyStoreType.length()) != 0) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                         SSLLogger.finest("init keystore");
                     }
                     if (defaultKeyStoreProvider.isEmpty()) {
@@ -1030,7 +1075,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
             /*
              * Try to initialize key manager.
              */
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                 SSLLogger.fine("init keymanager of type " +
                     KeyManagerFactory.getDefaultAlgorithm());
             }
@@ -1068,7 +1113,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                     // exception object, which may be not garbage collection
                     // friendly as 'reservedException' is a static filed.
                     reserved = new KeyManagementException(e.getMessage());
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                         SSLLogger.warning(
                                 "Failed to load default SSLContext", e);
                     }
@@ -1097,7 +1143,8 @@ public abstract class SSLContextImpl extends SSLContextSpi {
                 super.engineInit(DefaultManagersHolder.keyManagers,
                         DefaultManagersHolder.trustManagers, null);
             } catch (Exception e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,defaultctx")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.DEFAULTCTX)) {
                     SSLLogger.fine("default context init failed: ", e);
                 }
                 throw e;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index 5e23e6ee37b..5052f9bc9f4 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -330,7 +330,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
             // application data may be discarded accordingly.  As could
             // be an issue for some applications.  This impact can be
             // mitigated by sending the last flight twice.
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.finest("retransmit the last flight messages");
             }
 
@@ -397,7 +397,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
         if ((conContext.handshakeContext == null) &&
                 !conContext.isOutboundClosed() &&
                 !conContext.isBroken) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("trigger key update");
             }
             beginHandshake();
@@ -419,7 +419,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
             !conContext.isOutboundClosed() &&
             !conContext.isInboundClosed() &&
             !conContext.isBroken) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("trigger NST");
             }
             conContext.conSession.updateNST = false;
@@ -612,7 +612,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
         } catch (SSLException ssle) {
             // Need to discard invalid records for DTLS protocols.
             if (sslContext.isDTLS()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                     SSLLogger.finest("Discard invalid DTLS records", ssle);
                 }
 
@@ -780,7 +780,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
                 return;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("Closing inbound of SSLEngine");
             }
 
@@ -819,7 +819,7 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
                 return;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("Closing outbound of SSLEngine");
             }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
index 6e08fc71664..00ca3b06369 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
@@ -172,7 +172,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
             return null;
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
             SSLLogger.fine("Raw read", packet);
         }
 
@@ -209,7 +209,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
         byte minorVersion = packet.get();                  // pos: 2
         int contentLen = Record.getInt16(packet);          // pos: 3, 4
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
             SSLLogger.fine(
                     "READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
@@ -388,7 +388,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
                  * error message, one that's treated as fatal by
                  * clients (Otherwise we'll hang.)
                  */
-                if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                    SSLLogger.fine(
                             "Requested to negotiate unsupported SSLv2!");
                 }
@@ -410,7 +410,8 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
 
             ByteBuffer converted = convertToClientHello(packet);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine(
                         "[Converted] ClientHello", converted);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
index 1c8751e66fe..0ed3755afa4 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
@@ -73,7 +73,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     @Override
     void encodeAlert(byte level, byte description) {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "alert message: " + Alert.nameOf(description));
             }
@@ -91,7 +91,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     void encodeHandshake(byte[] source,
             int offset, int length) {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                         "handshake message",
                         ByteBuffer.wrap(source, offset, length));
@@ -138,7 +138,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     @Override
     void encodeChangeCipherSpec() {
         if (isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "change_cipher_spec message");
             }
@@ -171,14 +171,14 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
         ByteBuffer[] dsts, int dstsOffset, int dstsLength) throws IOException {
 
         if (isClosed) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data or cached messages");
             }
 
             return null;
         } else if (isCloseWaiting) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound has closed, ignore outbound " +
                     "application data");
             }
@@ -193,7 +193,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             ByteBuffer destination) throws IOException {
 
         if (writeCipher.authenticator.seqNumOverflow()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine(
                     "sequence number extremely close to overflow " +
                     "(2^64-1 packets). Closing connection.");
@@ -275,7 +275,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             destination.limit(destination.position());
             destination.position(dstContent);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name + " " +
                         ContentType.APPLICATION_DATA.name +
@@ -288,7 +288,8 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
                     dstPos, dstLim, headerSize,
                     protocolVersion);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 ByteBuffer temporary = destination.duplicate();
                 temporary.limit(temporary.position());
                 temporary.position(dstPos);
@@ -317,7 +318,8 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             //
             // Please don't change the limit of the destination buffer.
             destination.put(SSLRecord.v2NoCipher);
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine("Raw write", SSLRecord.v2NoCipher);
             }
 
@@ -332,13 +334,13 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             //
             // Please don't change the limit of the destination buffer.
             if (SSLLogger.isOn()) {
-                if (SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                      SSLLogger.fine(Thread.currentThread().getName() +
                             ", WRITE: SSLv2 ClientHello message" +
                             ", length = " + v2ClientHello.remaining());
                 }
 
-                if (SSLLogger.isOn("packet")) {
+                if (SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                     SSLLogger.fine("Raw write", v2ClientHello);
                 }
             }
@@ -525,7 +527,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
             dstBuf.limit(dstBuf.position());
             dstBuf.position(dstContent);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name + " " +
                         ContentType.nameOf(memo.contentType) +
@@ -543,7 +545,8 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
                 memo.encodeCipher.dispose();
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 ByteBuffer temporary = dstBuf.duplicate();
                 temporary.limit(temporary.position());
                 temporary.position(dstPos);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
index 47a0d0b0e44..aacb9420748 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
@@ -844,7 +844,7 @@ enum SSLExtension implements SSLStringizer {
         String property = System.getProperty(propertyName);
         // this method is called from class initializer; logging here
         // will occasionally pin threads and deadlock if called from a virtual thread
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,sslctx")
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSLCTX)
                 && !Thread.currentThread().isVirtual()) {
             SSLLogger.fine(
                     "System property " + propertyName + " is set to '" +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
index 66f6293302e..c325890a3b6 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
@@ -93,7 +93,8 @@ final class SSLExtensions {
                     // However, the implementation of the limit is complicated
                     // and inefficient, and may not worthy the maintenance.
                     isSupported = false;
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
                                 "Received buggy supported_groups extension " +
                                 "in the ServerHello handshake message");
@@ -143,7 +144,8 @@ final class SSLExtensions {
                     m.get(extData);
                     logMap.put(extId, extData);
 
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "Ignore unknown or unsupported extension",
                                 toString(extId, extData));
@@ -171,7 +173,8 @@ final class SSLExtensions {
         for (SSLExtension extension : extensions) {
             if (context.negotiatedProtocol != null &&
                     !extension.isAvailable(context.negotiatedProtocol)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unsupported extension: " + extension.name);
                 }
@@ -181,7 +184,8 @@ final class SSLExtensions {
             if (!extMap.containsKey(extension)) {
                 if (extension.onLoadAbsence != null) {
                     extension.absentOnLoad(context, handshakeMessage);
-                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " + extension.name);
                 }
@@ -190,7 +194,8 @@ final class SSLExtensions {
 
 
             if (extension.onLoadConsumer == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "Ignore unsupported extension: " + extension.name);
                 }
@@ -200,7 +205,7 @@ final class SSLExtensions {
             ByteBuffer m = ByteBuffer.wrap(extMap.get(extension));
             extension.consumeOnLoad(context, handshakeMessage, m);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Consumed extension: " + extension.name);
             }
         }
@@ -215,7 +220,8 @@ final class SSLExtensions {
             if (!extMap.containsKey(extension)) {
                 if (extension.onTradeAbsence != null) {
                     extension.absentOnTrade(context, handshakeMessage);
-                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " + extension.name);
                 }
@@ -223,7 +229,8 @@ final class SSLExtensions {
             }
 
             if (extension.onTradeConsumer == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Ignore impact of unsupported extension: " +
                             extension.name);
@@ -232,7 +239,7 @@ final class SSLExtensions {
             }
 
             extension.consumeOnTrade(context, handshakeMessage);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Populated with extension: " + extension.name);
             }
         }
@@ -245,7 +252,8 @@ final class SSLExtensions {
             SSLExtension[] extensions) throws IOException {
         for (SSLExtension extension : extensions) {
             if (extMap.containsKey(extension)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "Ignore, duplicated extension: " +
                             extension.name);
@@ -254,7 +262,8 @@ final class SSLExtensions {
             }
 
             if (extension.networkProducer == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Ignore, no extension producer defined: " +
                             extension.name);
@@ -267,7 +276,8 @@ final class SSLExtensions {
                 extMap.put(extension, encoded);
                 encodedLength += encoded.length + 4; // extension_type (2)
                                                      // extension_data length(2)
-            } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            } else if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 // The extension is not available in the context.
                 SSLLogger.fine(
                         "Ignore, context unavailable extension: " +
@@ -284,7 +294,8 @@ final class SSLExtensions {
             SSLExtension[] extensions) throws IOException {
         for (SSLExtension extension : extensions) {
             if (extension.networkProducer == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Ignore, no extension producer defined: " +
                             extension.name);
@@ -305,7 +316,8 @@ final class SSLExtensions {
                 encodedLength += encoded.length + 4;
                 // extension_type (2)
                 // extension_data length(2)
-            } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            } else if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 // The extension is not available in the context.
                 SSLLogger.fine(
                         "Ignore, context unavailable extension: " +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java
index 22a44590ce3..263308f0659 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -570,7 +570,9 @@ final class SSLKeyExchange implements SSLKeyAgreementGenerator,
 
         @Override
         public SSLPossession createPossession(HandshakeContext hc) {
-            return namedGroup.createPossession(hc.sslContext.getSecureRandom());
+            return namedGroup.createPossession(
+                    hc instanceof ClientHandshakeContext,
+                    hc.sslContext.getSecureRandom());
         }
 
         @Override
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLLogger.java b/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
index 7fa6fbf91b5..786cd01ac05 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,42 +49,90 @@ import static sun.security.ssl.Utilities.LINE_SEP;
 
 /**
  * Implementation of SSL logger.
- *
+ * <p>
  * If the system property "javax.net.debug" is not defined, the debug logging
  * is turned off.  If the system property "javax.net.debug" is defined as
  * empty, the debug logger is specified by System.getLogger("javax.net.ssl"),
  * and applications can customize and configure the logger or use external
  * logging mechanisms.  If the system property "javax.net.debug" is defined
- * and non-empty, a private debug logger implemented in this class is used.
+ * and non-empty, a private debug logger which logs to System.err is used.
  */
 public final class SSLLogger implements System.Logger {
     private static final System.Logger logger;
-    private static final String property;
-    private static final boolean isOn;
+    // High level boolean to track whether logging is active (i.e. all/ssl).
+    // Further checks may be necessary to determine if data is logged.
+    private static final boolean logging;
 
     private final String loggerName;
     private final boolean useCompactFormat;
 
-
     static {
         String p = System.getProperty("javax.net.debug");
         if (p != null) {
             if (p.isEmpty()) {
-                property = "";
                 logger = System.getLogger("javax.net.ssl");
+                Opt.ALL.on = true;
             } else {
-                property = p.toLowerCase(Locale.ENGLISH);
-                if (property.equals("help")) {
+                p = p.toLowerCase(Locale.ENGLISH);
+                if (p.contains("help")) {
+                    // help option calls exit(0)
                     help();
                 }
-
+                // configure expanded logging mode in constructor
                 logger = new SSLLogger("javax.net.ssl", p);
+                if (p.contains("all")) {
+                    Opt.ALL.on = true;
+                } else {
+                    for (Opt o : Opt.values()) {
+                        // deal with special "_" options later
+                        if (o.component.contains("_")) {
+                            continue;
+                        }
+
+                        if (p.contains(o.component)) {
+                            o.on = true;
+                            // remove pattern to avoid it being reused
+                            // e.g. "ssl,sslctx" parsing
+                            p = p.replaceFirst(o.component, "");
+                        }
+                    }
+
+                    // "record" and "handshake" subcomponents allow
+                    // extra configuration options
+                    if (Opt.HANDSHAKE.on && p.contains("verbose")) {
+                        Opt.HANDSHAKE_VERBOSE.on = true;
+                    }
+
+                    if (Opt.RECORD.on) {
+                        if (p.contains("packet")) {
+                            Opt.RECORD_PACKET.on = true;
+                        }
+                        if (p.contains("plaintext")) {
+                            Opt.RECORD_PLAINTEXT.on = true;
+                        }
+                    }
+                    // finally, if only "ssl" component is declared, then
+                    // enable all subcomponents. "ssl" logs all activity
+                    // except for the "data" and "packet" categories
+                    if (Opt.SSL.on &&
+                            EnumSet.allOf(Opt.class)
+                                    .stream()
+                                    .noneMatch(o -> o.on && o.isSubComponent)) {
+                        for (Opt opt : Opt.values()) {
+                            if (opt.isSubComponent) {
+                                opt.on = true;
+                            }
+                        }
+                    }
+                }
             }
-            isOn = true;
+
+            // javax.net.debug would be misconfigured property with respect
+            // to logging if value didn't contain "all" or "ssl"
+            logging = Opt.ALL.on || Opt.SSL.on;
         } else {
-            property = null;
             logger = null;
-            isOn = false;
+            logging = false;
         }
     }
 
@@ -94,52 +142,17 @@ public final class SSLLogger implements System.Logger {
         this.useCompactFormat = !options.contains("expand");
     }
 
-    /**
-     * Return true if the "javax.net.debug" property contains the
-     * debug check points, or System.Logger is used.
-     */
-    public static boolean isOn(String checkPoints) {
-        if (property == null) {              // debugging is turned off
-            return false;
-        } else if (property.isEmpty()) {     // use System.Logger
-            return true;
-        }                                   // use provider logger
-
-        String[] options = checkPoints.split(",");
-        for (String option : options) {
-            option = option.trim();
-            if (!SSLLogger.hasOption(option)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     @ForceInline
     public static boolean isOn() {
-        return isOn;
+        return logging;
     }
 
-    private static boolean hasOption(String option) {
-        option = option.toLowerCase(Locale.ENGLISH);
-        if (property.contains("all")) {
-            return true;
-        } else {
-            // remove first occurrence of "sslctx" since
-            // it interferes with search for "ssl"
-            String modified = property.replaceFirst("sslctx", "");
-            if (modified.contains("ssl")) {
-                // don't enable data and plaintext options by default
-                if (!(option.equals("data")
-                        || option.equals("packet")
-                        || option.equals("plaintext"))) {
-                    return true;
-                }
-            }
-        }
+    /**
+     * Return true if the specific DebugOption is enabled or ALL is enabled
+     */
 
-        return property.contains(option);
+    public static boolean isOn(Opt option) {
+        return Opt.ALL.on || option.on;
     }
 
     public static void severe(String msg, Object... params) {
@@ -188,33 +201,42 @@ public final class SSLLogger implements System.Logger {
     }
 
     private static void help() {
-        System.err.println();
-        System.err.println("help           print the help messages");
-        System.err.println("expand         expand debugging information");
-        System.err.println();
-        System.err.println("all            turn on all debugging");
-        System.err.println("ssl            turn on ssl debugging");
-        System.err.println();
-        System.err.println("The following can be used with ssl:");
-        System.err.println("\trecord       enable per-record tracing");
-        System.err.println("\thandshake    print each handshake message");
-        System.err.println("\tkeygen       print key generation data");
-        System.err.println("\tsession      print session activity");
-        System.err.println("\tdefaultctx   print default SSL initialization");
-        System.err.println("\tsslctx       print SSLContext tracing");
-        System.err.println("\tsessioncache print session cache tracing");
-        System.err.println("\tkeymanager   print key manager tracing");
-        System.err.println("\ttrustmanager print trust manager tracing");
-        System.err.println("\tpluggability print pluggability tracing");
-        System.err.println();
-        System.err.println("\thandshake debugging can be widened with:");
-        System.err.println("\tdata         hex dump of each handshake message");
-        System.err.println("\tverbose      verbose handshake message printing");
-        System.err.println();
-        System.err.println("\trecord debugging can be widened with:");
-        System.err.println("\tplaintext    hex dump of record plaintext");
-        System.err.println("\tpacket       print raw SSL/TLS packets");
-        System.err.println();
+        System.err.printf("%n%-16s %s%n", "help",
+                "print this help message and exit");
+        System.err.printf("%-16s %s%n%n", "expand",
+                "expanded (less compact) output format");
+        System.err.printf("%-16s %s%n", "all", "turn on all debugging");
+        System.err.printf("%-16s %s%n%n", "ssl", "turn on ssl debugging");
+        System.err.printf("The following filters can be used with ssl:%n%n");
+        System.err.printf("    %-14s %s%n", "defaultctx",
+                "print default SSL initialization");
+        System.err.printf("    %-14s %s%n", "handshake",
+                "print each handshake message");
+        System.err.printf("      %-12s   %s%n", "verbose",
+                "verbose handshake message printing (widens handshake)");
+        System.err.printf("    %-14s %s%n", "keymanager",
+                "print key manager tracing");
+        System.err.printf("    %-14s %s%n", "record",
+                "enable per-record tracing");
+        System.err.printf("      %-12s   %s%n", "packet",
+                "print raw SSL/TLS packets (widens record)");
+        System.err.printf("      %-12s   %s%n", "plaintext",
+                "hex dump of record plaintext (widens record)");
+        System.err.printf("    %-14s %s%n", "respmgr",
+                "print OCSP response tracing");
+        System.err.printf("    %-14s %s%n", "session",
+                "print session activity");
+        System.err.printf("    %-14s %s%n", "sessioncache",
+                "print session cache tracing");
+        System.err.printf("    %-14s %s%n", "sslctx",
+                "print SSLContext tracing");
+        System.err.printf("    %-14s %s%n", "trustmanager",
+                "print trust manager tracing");
+        System.err.printf("%nIf \"ssl\" is specified by itself," +
+                " all non-widening filters are enabled.%n");
+        System.err.printf("%nSpecifying \"ssl\" with additional filter" +
+                " options produces general%nSSL debug messages plus just" +
+                " the selected categories.%n%n");
         System.exit(0);
     }
 
@@ -228,8 +250,8 @@ public final class SSLLogger implements System.Logger {
 
     // Logs a warning message and always returns false. This method
     // can be used as an OR Predicate to add a log in a stream filter.
-    public static boolean logWarning(String option, String s) {
-        if (SSLLogger.isOn() && SSLLogger.isOn(option)) {
+    static boolean logWarning(Opt option, String s) {
+        if (SSLLogger.isOn() && option.on) {
             SSLLogger.warning(s);
         }
         return false;
@@ -240,11 +262,6 @@ public final class SSLLogger implements System.Logger {
         return loggerName;
     }
 
-    @Override
-    public boolean isLoggable(Level level) {
-        return level != Level.OFF;
-    }
-
     @Override
     public void log(Level level,
                     ResourceBundle rb, String message, Throwable thrwbl) {
@@ -273,11 +290,59 @@ public final class SSLLogger implements System.Logger {
         }
     }
 
+    @Override
+    public boolean isLoggable(Level level) {
+        return level != Level.OFF;
+    }
+
+    /**
+     * Enum representing possible debug options for JSSE debugging.
+     * <p>
+     * ALL and SSL are considered master components. Entries without an
+     * underscore ("_"), and not ALL or SSL, are subcomponents. Entries
+     * with an underscore ("_") denote options specific to subcomponents.
+     * <p>
+     * Fields:
+     * - 'component': Lowercase name of the option.
+     * - 'isSubComponent': True for subcomponents.
+     * - 'on': Indicates whether the option is enabled. Some rule based logic
+     *         is used to determine value of this field.
+     * <p>
+     * Enabling subcomponents fine-tunes (filters) debug output.
+     */
+    public enum Opt {
+        ALL,
+        DEFAULTCTX,
+        HANDSHAKE,
+        HANDSHAKE_VERBOSE,
+        KEYMANAGER,
+        RECORD,
+        RECORD_PACKET,
+        RECORD_PLAINTEXT,
+        RESPMGR,
+        SESSION,
+        SESSIONCACHE, // placeholder for 8344685
+        SSLCTX,
+        TRUSTMANAGER,
+        SSL; // define ssl last, helps with sslctx matching later.
+
+        final String component;
+        final boolean isSubComponent;
+        boolean on;
+
+        Opt() {
+            this.component = this.toString().toLowerCase(Locale.ENGLISH);
+            this.isSubComponent = !(component.contains("_") ||
+                    component.equals("all") ||
+                    component.equals("ssl"));
+        }
+    }
+
     private static class SSLSimpleFormatter {
         private static final String PATTERN = "yyyy-MM-dd kk:mm:ss.SSS z";
         private static final DateTimeFormatter dateTimeFormat =
                 DateTimeFormatter.ofPattern(PATTERN, Locale.ENGLISH)
-                .withZone(ZoneId.systemDefault());
+                        .withZone(ZoneId.systemDefault());
 
         private static final MessageFormat basicCertFormat = new MessageFormat(
                 """
@@ -293,68 +358,68 @@ public final class SSLLogger implements System.Logger {
                 Locale.ENGLISH);
 
         private static final MessageFormat extendedCertFormat =
-                new MessageFormat(
-                        """
-                                "version"            : "v{0}",
-                                "serial number"      : "{1}",
-                                "signature algorithm": "{2}",
-                                "issuer"             : "{3}",
-                                "not before"         : "{4}",
-                                "not  after"         : "{5}",
-                                "subject"            : "{6}",
-                                "subject public key" : "{7}",
-                                "extensions"         : [
-                                {8}
-                                ]
-                                """,
-                        Locale.ENGLISH);
+            new MessageFormat(
+                    """
+                            "version"            : "v{0}",
+                            "serial number"      : "{1}",
+                            "signature algorithm": "{2}",
+                            "issuer"             : "{3}",
+                            "not before"         : "{4}",
+                            "not  after"         : "{5}",
+                            "subject"            : "{6}",
+                            "subject public key" : "{7}",
+                            "extensions"         : [
+                            {8}
+                            ]
+                            """,
+                Locale.ENGLISH);
 
         private static final MessageFormat messageFormatNoParas =
-                new MessageFormat(
-                        """
-                                '{'
-                                  "logger"      : "{0}",
-                                  "level"       : "{1}",
-                                  "thread id"   : "{2}",
-                                  "thread name" : "{3}",
-                                  "time"        : "{4}",
-                                  "caller"      : "{5}",
-                                  "message"     : "{6}"
-                                '}'
-                                """,
-                        Locale.ENGLISH);
+            new MessageFormat(
+                    """
+                            '{'
+                              "logger"      : "{0}",
+                              "level"       : "{1}",
+                              "thread id"   : "{2}",
+                              "thread name" : "{3}",
+                              "time"        : "{4}",
+                              "caller"      : "{5}",
+                              "message"     : "{6}"
+                            '}'
+                            """,
+                Locale.ENGLISH);
 
         private static final MessageFormat messageCompactFormatNoParas =
-                new MessageFormat(
-                        "{0}|{1}|{2}|{3}|{4}|{5}|{6}" + LINE_SEP,
-                        Locale.ENGLISH);
+            new MessageFormat(
+                "{0}|{1}|{2}|{3}|{4}|{5}|{6}" + LINE_SEP,
+                Locale.ENGLISH);
 
         private static final MessageFormat messageFormatWithParas =
-                new MessageFormat(
-                        """
-                                '{'
-                                  "logger"      : "{0}",
-                                  "level"       : "{1}",
-                                  "thread id"   : "{2}",
-                                  "thread name" : "{3}",
-                                  "time"        : "{4}",
-                                  "caller"      : "{5}",
-                                  "message"     : "{6}",
-                                  "specifics"   : [
-                                {7}
-                                  ]
-                                '}'
-                                """,
-                        Locale.ENGLISH);
+            new MessageFormat(
+                    """
+                            '{'
+                              "logger"      : "{0}",
+                              "level"       : "{1}",
+                              "thread id"   : "{2}",
+                              "thread name" : "{3}",
+                              "time"        : "{4}",
+                              "caller"      : "{5}",
+                              "message"     : "{6}",
+                              "specifics"   : [
+                            {7}
+                              ]
+                            '}'
+                            """,
+                Locale.ENGLISH);
 
         private static final MessageFormat messageCompactFormatWithParas =
-                new MessageFormat(
-                        """
-                                {0}|{1}|{2}|{3}|{4}|{5}|{6} (
-                                {7}
-                                )
-                                """,
-                        Locale.ENGLISH);
+            new MessageFormat(
+                    """
+                            {0}|{1}|{2}|{3}|{4}|{5}|{6} (
+                            {7}
+                            )
+                            """,
+                Locale.ENGLISH);
 
         private static final MessageFormat keyObjectFormat = new MessageFormat(
                 """
@@ -368,7 +433,7 @@ public final class SSLLogger implements System.Logger {
         //     log message
         //     ...
         private static String format(SSLLogger logger, Level level,
-                                     String message, Object... parameters) {
+                    String message, Object ... parameters) {
 
             if (parameters == null || parameters.length == 0) {
                 Object[] messageFields = {
@@ -417,7 +482,7 @@ public final class SSLLogger implements System.Logger {
                 .findFirst().orElse("unknown caller"));
         }
 
-        private static String formatParameters(Object... parameters) {
+        private static String formatParameters(Object ... parameters) {
             StringBuilder builder = new StringBuilder(512);
             boolean isFirst = true;
             for (Object parameter : parameters) {
@@ -427,22 +492,21 @@ public final class SSLLogger implements System.Logger {
                     builder.append("," + LINE_SEP);
                 }
 
-                if (parameter instanceof Throwable) {
-                    builder.append(formatThrowable((Throwable) parameter));
-                } else if (parameter instanceof Certificate) {
-                    builder.append(formatCertificate((Certificate) parameter));
-                } else if (parameter instanceof ByteArrayInputStream) {
+                if (parameter instanceof Throwable t) {
+                    builder.append(formatThrowable(t));
+                } else if (parameter instanceof Certificate c) {
+                    builder.append(formatCertificate(c));
+                } else if (parameter instanceof ByteArrayInputStream bis) {
+                    builder.append(formatByteArrayInputStream(bis));
+                } else if (parameter instanceof ByteBuffer bb) {
+                    builder.append(formatByteBuffer((bb)));
+                } else if (parameter instanceof byte[] bytes) {
                     builder.append(formatByteArrayInputStream(
-                            (ByteArrayInputStream) parameter));
-                } else if (parameter instanceof ByteBuffer) {
-                    builder.append(formatByteBuffer((ByteBuffer) parameter));
-                } else if (parameter instanceof byte[]) {
-                    builder.append(formatByteArrayInputStream(
-                            new ByteArrayInputStream((byte[]) parameter)));
+                        new ByteArrayInputStream(bytes)));
                 } else if (parameter instanceof Map.Entry) {
                     @SuppressWarnings("unchecked")
                     Map.Entry<String, ?> mapParameter =
-                            (Map.Entry<String, ?>) parameter;
+                        (Map.Entry<String, ?>)parameter;
                     builder.append(formatMapEntry(mapParameter));
                 } else {
                     builder.append(formatObject(parameter));
@@ -592,15 +656,15 @@ public final class SSLLogger implements System.Logger {
                 builder.append("      ]");
 
                 formatted = builder.toString();
-            } else if (value instanceof byte[]) {
+            } else if (value instanceof byte[] bytes) {
                 formatted = "\"" + key + "\": \"" +
-                        Utilities.toHexString((byte[]) value) + "\"";
-            } else if (value instanceof Byte) {
+                    Utilities.toHexString((bytes)) + "\"";
+            } else if (value instanceof Byte b) {
                 formatted = "\"" + key + "\": \"" +
-                        HexFormat.of().toHexDigits((byte) value) + "\"";
+                    HexFormat.of().toHexDigits(b) + "\"";
             } else {
                 formatted = "\"" + key + "\": " +
-                        "\"" + value.toString() + "\"";
+                    "\"" + value.toString() + "\"";
             }
 
             return Utilities.indent(formatted);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
index 4de29b7570a..533b7f9a52d 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLMasterKeyDerivation.java
@@ -151,7 +151,8 @@ enum SSLMasterKeyDerivation implements SSLKeyDerivationGenerator {
                 //
                 // For RSA premaster secrets, do not signal a protocol error
                 // due to the Bleichenbacher attack. See comments further down.
-                if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("RSA master secret generation error.", iae);
                 }
                 throw new ProviderException(iae);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
index f713f723ea0..9b35d5a1222 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionContextImpl.java
@@ -339,7 +339,8 @@ final class SSLSessionContextImpl implements SSLSessionContext {
                     if (t < 0 ||
                             t > NewSessionTicket.MAX_TICKET_LIFETIME) {
                         timeout = DEFAULT_SESSION_TIMEOUT;
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                             SSLLogger.warning("Invalid timeout given " +
                                     "jdk.tls.server.sessionTicketTimeout: " + t +
                                     ".  Set to default value " + timeout);
@@ -349,7 +350,8 @@ final class SSLSessionContextImpl implements SSLSessionContext {
                     }
                 } catch (NumberFormatException e) {
                     setSessionTimeout(DEFAULT_SESSION_TIMEOUT);
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.warning("Invalid timeout for " +
                                 "jdk.tls.server.sessionTicketTimeout: " + s +
                                 ".  Set to default value " + timeout);
@@ -363,7 +365,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
 
             if (defaultCacheLimit >= 0) {
                 return defaultCacheLimit;
-            } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            } else if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning(
                     "invalid System Property javax.net.ssl.sessionCacheSize, " +
                     "use the default session cache size (" +
@@ -371,7 +373,7 @@ final class SSLSessionContextImpl implements SSLSessionContext {
             }
         } catch (Exception e) {
             // unlikely, log it for safe
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning(
                     "the System Property javax.net.ssl.sessionCacheSize is " +
                     "not available, use the default value (" +
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index f3a4b964158..af0b8909d30 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -223,7 +223,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.identificationProtocol = hc.sslConfig.identificationProtocol;
         this.boundValues = new ConcurrentHashMap<>();
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SESSION)) {
              SSLLogger.finest("Session initialized:  " + this);
         }
     }
@@ -256,7 +256,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.maximumPacketSize = baseSession.maximumPacketSize;
         this.boundValues = baseSession.boundValues;
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SESSION)) {
              SSLLogger.finest("Session initialized:  " + this);
         }
     }
@@ -455,7 +455,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
 
             if (same) {
                 this.localCerts = ((X509Possession) pos).popCerts;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,session")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SESSION)) {
                     SSLLogger.fine("Restored " + len
                             + " local certificates from session ticket"
                             + " for algorithms " + Arrays.toString(certAlgs));
@@ -463,7 +463,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
             } else {
                 this.localCerts = null;
                 this.invalidated = true;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,session")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SESSION)) {
                     SSLLogger.warning("Local certificates can not be restored "
                             + "from session ticket "
                             + "for algorithms " + Arrays.toString(certAlgs));
@@ -482,7 +482,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         // If there is no getMasterSecret with TLS1.2 or under, do not resume.
         if (!protocolVersion.useTLS13PlusSpec() &&
                 getMasterSecret().getEncoded() == null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.finest("No MasterSecret, cannot make stateless" +
                         " ticket");
             }
@@ -490,7 +490,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         }
 
         if (boundValues != null && boundValues.size() > 0) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.finest("There are boundValues, cannot make" +
                         " stateless ticket");
             }
@@ -862,7 +862,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
     void setSuite(CipherSuite suite) {
        cipherSuite = suite;
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SESSION)) {
              SSLLogger.finest("Negotiating session:  " + this);
        }
     }
@@ -1132,7 +1132,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
                 return;
             }
             invalidated = true;
-            if (SSLLogger.isOn() && SSLLogger.isOn("session")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SESSION)) {
                  SSLLogger.finest("Invalidated session:  " + this);
             }
             for (SSLSessionImpl child : childSessions) {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index ab01a9d85be..f603cc22949 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -370,7 +370,7 @@ public final class SSLSocketImpl
             // start handshaking, if failed, the connection will be closed.
             ensureNegotiated(false);
         } catch (IOException ioe) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.severe("handshake failed", ioe);
             }
 
@@ -573,7 +573,7 @@ public final class SSLSocketImpl
             return;
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.fine("duplex close of SSLSocket");
         }
 
@@ -591,7 +591,7 @@ public final class SSLSocketImpl
             }
         } catch (IOException ioe) {
             // ignore the exception
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("SSLSocket duplex close failed. Debug info only. Exception details:", ioe);
             }
         } finally {
@@ -601,7 +601,7 @@ public final class SSLSocketImpl
                     closeSocket(false);
                 } catch (IOException ioe) {
                     // ignore the exception
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.warning("SSLSocket close failed. Debug info only. Exception details:", ioe);
                     }
                 } finally {
@@ -696,7 +696,8 @@ public final class SSLSocketImpl
                                     "close_notify message cannot be sent.");
                         } else {
                             super.shutdownOutput();
-                            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                            if (SSLLogger.isOn() &&
+                                    SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                                 SSLLogger.warning(
                                     "SSLSocket output duplex close failed: " +
                                     "SO_LINGER timeout, " +
@@ -717,7 +718,8 @@ public final class SSLSocketImpl
                     // failed to send the close_notify message.
                     //
                     conContext.conSession.invalidate();
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.warning(
                                 "Invalidate the session: SO_LINGER timeout, " +
                                 "close_notify message cannot be sent.");
@@ -832,7 +834,7 @@ public final class SSLSocketImpl
             return;
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.fine("close inbound of SSLSocket");
         }
 
@@ -868,7 +870,7 @@ public final class SSLSocketImpl
             return;
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.fine("close outbound of SSLSocket");
         }
         conContext.closeOutbound();
@@ -1027,7 +1029,7 @@ public final class SSLSocketImpl
             // filed is checked here, in case the closing process is
             // still in progress.
             if (hasDepleted) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("The input stream has been depleted");
                 }
 
@@ -1048,7 +1050,8 @@ public final class SSLSocketImpl
 
                 // Double check if the input stream has been depleted.
                 if (hasDepleted) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.fine("The input stream is closing");
                     }
 
@@ -1134,7 +1137,7 @@ public final class SSLSocketImpl
 
         @Override
         public void close() throws IOException {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("Closing input stream");
             }
 
@@ -1142,7 +1145,7 @@ public final class SSLSocketImpl
                 SSLSocketImpl.this.close();
             } catch (IOException ioe) {
                 // ignore the exception
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("input stream close failed. Debug info only. Exception details:", ioe);
                 }
             }
@@ -1218,7 +1221,7 @@ public final class SSLSocketImpl
                 socketInputRecord.deplete(
                     conContext.isNegotiated && (getSoTimeout() > 0));
             } catch (Exception ex) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning(
                         "input stream close depletion failed", ex);
                 }
@@ -1327,7 +1330,7 @@ public final class SSLSocketImpl
 
         @Override
         public void close() throws IOException {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("Closing output stream");
             }
 
@@ -1335,7 +1338,7 @@ public final class SSLSocketImpl
                 SSLSocketImpl.this.close();
             } catch (IOException ioe) {
                 // ignore the exception
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("output stream close failed. Debug info only. Exception details:", ioe);
                 }
             }
@@ -1543,7 +1546,7 @@ public final class SSLSocketImpl
         if ((conContext.handshakeContext == null) &&
                 !conContext.isOutboundClosed() &&
                 !conContext.isBroken) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("trigger key update");
             }
             startHandshake();
@@ -1562,7 +1565,7 @@ public final class SSLSocketImpl
             !conContext.isOutboundClosed() &&
             !conContext.isInboundClosed() &&
             !conContext.isBroken) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("trigger new session ticket");
             }
             conContext.conSession.updateNST = false;
@@ -1670,7 +1673,7 @@ public final class SSLSocketImpl
      * This method never returns normally, it always throws an IOException.
      */
     private void handleException(Exception cause) throws IOException {
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.warning("handling exception", cause);
         }
 
@@ -1747,7 +1750,7 @@ public final class SSLSocketImpl
     @Override
     public void shutdown() throws IOException {
         if (!isClosed()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine("close the underlying socket");
             }
 
@@ -1773,7 +1776,7 @@ public final class SSLSocketImpl
     }
 
     private void closeSocket(boolean selfInitiated) throws IOException {
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.fine("close the SSL connection " +
                 (selfInitiated ? "(initiative)" : "(passive)"));
         }
@@ -1828,7 +1831,7 @@ public final class SSLSocketImpl
     * transport without waiting for the responding close_notify.
     */
     private void waitForClose() throws IOException {
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.fine("wait for close_notify or alert");
         }
 
@@ -1838,7 +1841,8 @@ public final class SSLSocketImpl
                 try {
                     Plaintext plainText = decode(null);
                     // discard and continue
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.finest(
                                 "discard plaintext while waiting for close",
                                 plainText);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
index ce7ab630730..fd9c4b171e7 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
@@ -210,7 +210,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
         int contentLen = ((header[3] & 0xFF) << 8) +
                            (header[4] & 0xFF);          // pos: 3, 4
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
             SSLLogger.fine(
                     "READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
@@ -243,7 +243,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
         readFully(contentLen);
         recordBody.flip();
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
             SSLLogger.fine(
                     "READ: " +
                     ProtocolVersion.nameOf(majorVersion, minorVersion) +
@@ -407,12 +407,12 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
                 os.write(SSLRecord.v2NoCipher);      // SSLv2Hello
 
                 if (SSLLogger.isOn()) {
-                    if (SSLLogger.isOn("record")) {
+                    if (SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                          SSLLogger.fine(
                                 "Requested to negotiate unsupported SSLv2!");
                     }
 
-                    if (SSLLogger.isOn("packet")) {
+                    if (SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                         SSLLogger.fine("Raw write", SSLRecord.v2NoCipher);
                     }
                 }
@@ -445,7 +445,8 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
 
             ByteBuffer converted = convertToClientHello(recordBody);
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine(
                         "[Converted] ClientHello", converted);
             }
@@ -488,13 +489,14 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
     private static int read(InputStream is, byte[] buf, int off, int len)  throws IOException {
         int readLen = is.read(buf, off, len);
         if (readLen < 0) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine("Raw read: EOF");
             }
             throw new EOFException("SSL peer shut down incorrectly");
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
             ByteBuffer bb = ByteBuffer.wrap(buf, off, readLen);
             SSLLogger.fine("Raw read", bb);
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
index e83ad15db22..43f0580550a 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketOutputRecord.java
@@ -55,7 +55,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "alert message: " + Alert.nameOf(description));
                 }
@@ -67,7 +67,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
 
             write(level);
             write(description);
-            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.fine("WRITE: " + protocolVersion.name +
                         " " + ContentType.ALERT.name +
                         "(" + Alert.nameOf(description) + ")" +
@@ -81,7 +81,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             deliverStream.write(buf, 0, count);    // may throw IOException
             deliverStream.flush();                 // may throw IOException
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine("Raw write",
                         (new ByteArrayInputStream(buf, 0, count)));
             }
@@ -99,7 +100,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                             "handshake message",
                             ByteBuffer.wrap(source, offset, length));
@@ -127,7 +128,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                     int limit = v2ClientHello.limit();
                     handshakeHash.deliver(record, 2, (limit - 2));
 
-                    if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                         SSLLogger.fine(
                                 "WRITE: SSLv2 ClientHello message" +
                                 ", length = " + limit);
@@ -141,7 +143,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                     deliverStream.write(record, 0, limit);
                     deliverStream.flush();
 
-                    if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                         SSLLogger.fine("Raw write",
                                 (new ByteArrayInputStream(record, 0, limit)));
                     }
@@ -177,7 +180,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                     return;
                 }
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                     SSLLogger.fine(
                             "WRITE: " + protocolVersion.name +
                             " " + ContentType.HANDSHAKE.name +
@@ -191,7 +194,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 deliverStream.write(buf, 0, count);    // may throw IOException
                 deliverStream.flush();                 // may throw IOException
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                     SSLLogger.fine("Raw write",
                             (new ByteArrayInputStream(buf, 0, count)));
                 }
@@ -212,7 +216,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
         recordLock.lock();
         try {
             if (isClosed()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("outbound has closed, ignore outbound " +
                         "change_cipher_spec message");
                 }
@@ -231,7 +235,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             deliverStream.write(buf, 0, count);        // may throw IOException
             // deliverStream.flush();                  // flush in Finished
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine("Raw write",
                         (new ByteArrayInputStream(buf, 0, count)));
             }
@@ -257,7 +262,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 return;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                 SSLLogger.fine(
                         "WRITE: " + protocolVersion.name +
                         " " + ContentType.HANDSHAKE.name +
@@ -271,7 +276,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             deliverStream.write(buf, 0, count);    // may throw IOException
             deliverStream.flush();                 // may throw IOException
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                 SSLLogger.fine("Raw write",
                         (new ByteArrayInputStream(buf, 0, count)));
             }
@@ -293,7 +299,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
             }
 
             if (writeCipher.authenticator.seqNumOverflow()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine(
                         "sequence number extremely close to overflow " +
                         "(2^64-1 packets). Closing connection.");
@@ -330,7 +336,7 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 count = position;
                 write(source, offset, fragLen);
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("record")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RECORD)) {
                     SSLLogger.fine(
                             "WRITE: " + protocolVersion.name +
                             " " + ContentType.APPLICATION_DATA.name +
@@ -345,7 +351,8 @@ final class SSLSocketOutputRecord extends OutputRecord implements SSLRecord {
                 deliverStream.write(buf, 0, count);    // may throw IOException
                 deliverStream.flush();                 // may throw IOException
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("packet")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RECORD_PACKET)) {
                     SSLLogger.fine("Raw write",
                             (new ByteArrayInputStream(buf, 0, count)));
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
index 9298e016f63..50bff1e6d21 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
@@ -113,7 +113,7 @@ interface SSLTransport {
             // Code to deliver SSLv2 error message for SSL/TLS connections.
             if (!context.sslContext.isDTLS()) {
                 context.outputRecord.encodeV2NoCipher();
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest("may be talking to SSLv2");
                 }
             }
@@ -161,7 +161,8 @@ interface SSLTransport {
                 if (context.handshakeContext != null &&
                     context.handshakeContext.sslConfig.enableRetransmissions &&
                     context.sslContext.isDTLS()) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.finest("retransmitted handshake flight");
                     }
 
@@ -181,7 +182,8 @@ interface SSLTransport {
                 // Note that JDK does not support 0-RTT yet.  Otherwise, it is
                 // needed to check early_data.
                 if (!context.isNegotiated) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,verbose")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning("unexpected application data " +
                             "before handshake completion");
                     }
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHello.java b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
index 76c266a628a..6980c216697 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -365,7 +365,7 @@ final class ServerHello {
                 shc.sslConfig.getEnabledExtensions(
                         SSLHandshake.SERVER_HELLO, shc.negotiatedProtocol);
             shm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced ServerHello handshake message", shm);
             }
 
@@ -440,7 +440,8 @@ final class ServerHello {
                 }
 
                 // The cipher suite has been negotiated.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("use cipher suite " + cs.name);
                 }
 
@@ -453,7 +454,8 @@ final class ServerHello {
                 if (ke != null) {
                     SSLPossession[] hcds = ke.createPossessions(shc);
                     if ((hcds != null) && (hcds.length != 0)) {
-                        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                             SSLLogger.warning(
                                 "use legacy cipher suite " + cs.name);
                         }
@@ -565,12 +567,40 @@ final class ServerHello {
                     clientHello);
             shc.serverHelloRandom = shm.serverRandom;
 
+            // For key derivation, we will either use the traditional Key
+            // Agreement (KA) model or the Key Encapsulation Mechanism (KEM)
+            // model, depending on what key exchange group is used.
+            //
+            // For KA flows, the server first receives the client's share,
+            // then generates its key share, and finally comes here.
+            // However, this is changed for KEM: the server
+            // must perform both actions — derive the secret and generate
+            // the key encapsulation message at the same time during
+            // encapsulation in SHKeyShareProducer.
+            //
+            // Traditional Key Agreement (KA):
+            //   - Both peers generate a key share and exchange it.
+            //   - Each peer computes a shared secret sometime after
+            //     receiving the other's key share.
+            //
+            // Key Encapsulation Mechanism (KEM):
+            //  The client publishes a public key via a KeyShareExtension,
+            //  which the server uses to:
+            //
+            //  - generate the shared secret
+            //  - encapsulate the message which is sent to the client in
+            //    another KeyShareExtension
+            //
+            //  The derived shared secret must be stored in a
+            //  KEMSenderPossession so it can be retrieved for handshake
+            //  traffic secret derivation later.
+
             // Produce extensions for ServerHello handshake message.
             SSLExtension[] serverHelloExtensions =
                     shc.sslConfig.getEnabledExtensions(
                         SSLHandshake.SERVER_HELLO, shc.negotiatedProtocol);
             shm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Produced ServerHello handshake message", shm);
             }
 
@@ -590,9 +620,26 @@ final class ServerHello {
                         "Not negotiated key shares");
             }
 
-            SSLKeyDerivation handshakeKD = ke.createKeyDerivation(shc);
-            SecretKey handshakeSecret = handshakeKD.deriveKey(
-                    "TlsHandshakeSecret");
+            SecretKey handshakeSecret = null;
+
+            // For KEM, the shared secret has already been generated and
+            // stored in the server’s possession (KEMSenderPossession)
+            // during encapsulation in SHKeyShareProducer.
+            //
+            // Only one key share is selected by the server, so at most one
+            // possession will contain the pre-derived shared secret.
+            for (var pos : shc.handshakePossessions) {
+                if (pos instanceof KEMKeyExchange.KEMSenderPossession xp) {
+                    handshakeSecret = xp.getKey();
+                    break;
+                }
+            }
+
+            if (handshakeSecret == null) {
+                SSLKeyDerivation handshakeKD = ke.createKeyDerivation(shc);
+                handshakeSecret = handshakeKD.deriveKey(
+                        "TlsHandshakeSecret");
+            }
 
             SSLTrafficKeyDerivation kdg =
                 SSLTrafficKeyDerivation.valueOf(shc.negotiatedProtocol);
@@ -723,14 +770,16 @@ final class ServerHello {
                 }
 
                 // The cipher suite has been negotiated.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("use cipher suite " + cs.name);
                 }
                 return cs;
             }
 
             if (legacySuite != null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "use legacy cipher suite " + legacySuite.name);
                 }
@@ -783,7 +832,7 @@ final class ServerHello {
                 shc.sslConfig.getEnabledExtensions(
                     SSLHandshake.HELLO_RETRY_REQUEST, shc.negotiatedProtocol);
             hhrm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced HelloRetryRequest handshake message", hhrm);
             }
@@ -845,7 +894,7 @@ final class ServerHello {
                     shc.sslConfig.getEnabledExtensions(
                     SSLHandshake.MESSAGE_HASH, shc.negotiatedProtocol);
             hhrm.extensions.produce(shc, serverHelloExtensions);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Reproduced HelloRetryRequest handshake message", hhrm);
             }
@@ -886,7 +935,7 @@ final class ServerHello {
             }
 
             ServerHelloMessage shm = new ServerHelloMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Consuming ServerHello handshake message", shm);
             }
 
@@ -931,7 +980,7 @@ final class ServerHello {
             }
 
             chc.negotiatedProtocol = serverVersion;
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Negotiated protocol version: " + serverVersion.name);
             }
@@ -986,7 +1035,7 @@ final class ServerHello {
                 chc.conContext.protocolVersion = chc.negotiatedProtocol;
                 chc.conContext.outputRecord.setVersion(chc.negotiatedProtocol);
             }
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                     "Negotiated protocol version: " + serverVersion.name);
             }
@@ -1132,7 +1181,8 @@ final class ServerHello {
                     chc.handshakeSession = new SSLSessionImpl(chc,
                             chc.negotiatedCipherSuite, newId);
 
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine("Locally assigned Session Id: " +
                                 newId.toString());
                     }
@@ -1204,7 +1254,7 @@ final class ServerHello {
     private static void setUpPskKD(HandshakeContext hc,
             SecretKey psk) throws SSLHandshakeException {
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
             SSLLogger.fine("Using PSK to derive early secret");
         }
 
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java b/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
index f38fdb2656b..e188f698f4b 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHelloDone.java
@@ -93,7 +93,7 @@ final class ServerHelloDone {
             ServerHandshakeContext shc = (ServerHandshakeContext)context;
 
             ServerHelloDoneMessage shdm = new ServerHelloDoneMessage(shc);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Produced ServerHelloDone handshake message", shdm);
             }
@@ -147,7 +147,7 @@ final class ServerHelloDone {
 
             ServerHelloDoneMessage shdm =
                     new ServerHelloDoneMessage(chc, message);
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine(
                         "Consuming ServerHelloDone handshake message", shdm);
             }
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 1dbfcdba4df..0e232b17dda 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -216,7 +216,8 @@ final class ServerNameExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_SERVER_NAME)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "Ignore unavailable server_name extension");
                 }
@@ -261,7 +262,7 @@ final class ServerNameExtension {
                 return extData;
             }
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.warning("Unable to indicate server name");
             }
             return null;
@@ -287,7 +288,8 @@ final class ServerNameExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_SERVER_NAME)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " + CH_SERVER_NAME.name);
                 }
@@ -305,7 +307,8 @@ final class ServerNameExtension {
             if (!shc.sslConfig.sniMatchers.isEmpty()) {
                 sni = chooseSni(shc.sslConfig.sniMatchers, spec.serverNames);
                 if (sni != null) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "server name indication (" +
                                 sni + ") is accepted");
@@ -322,7 +325,8 @@ final class ServerNameExtension {
                 // connection with a "missing_extension" alert.
                 //
                 // We do not reject client without SNI extension currently.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                             "no server name matchers, " +
                             "ignore server name indication");
@@ -347,7 +351,8 @@ final class ServerNameExtension {
                     // so don't include the pre-shared key in the
                     // ServerHello handshake message
                     shc.handshakeExtensions.remove(SH_PRE_SHARED_KEY);
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "abort session resumption, " +
                                 "different server name indication used");
@@ -441,7 +446,8 @@ final class ServerNameExtension {
             CHServerNamesSpec spec = (CHServerNamesSpec)
                     shc.handshakeExtensions.get(CH_SERVER_NAME);
             if (spec == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable extension: " + SH_SERVER_NAME.name);
                 }
@@ -451,7 +457,8 @@ final class ServerNameExtension {
             // When resuming a session, the server MUST NOT include a
             // server_name extension in the server hello.
             if (shc.isResumption || shc.negotiatedServerName == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "No expected server name indication response");
                 }
@@ -528,7 +535,8 @@ final class ServerNameExtension {
             CHServerNamesSpec spec = (CHServerNamesSpec)
                     shc.handshakeExtensions.get(CH_SERVER_NAME);
             if (spec == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "Ignore unavailable extension: " + EE_SERVER_NAME.name);
                 }
@@ -538,7 +546,8 @@ final class ServerNameExtension {
             // When resuming a session, the server MUST NOT include a
             // server_name extension in the server hello.
             if (shc.isResumption || shc.negotiatedServerName == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest(
                         "No expected server name indication response");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
index de375cdfd98..e58422073c6 100644
--- a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
@@ -93,7 +93,8 @@ final class SessionTicketExtension {
                 kt = Integer.parseInt(s) * 1000;  // change to ms
                 if (kt < 0 ||
                         kt > NewSessionTicket.MAX_TICKET_LIFETIME) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.warning("Invalid timeout for " +
                                 "jdk.tls.server.statelessKeyTimeout: " +
                                 kt + ".  Set to default value " +
@@ -103,7 +104,7 @@ final class SessionTicketExtension {
                 }
             } catch (NumberFormatException e) {
                 kt = TIMEOUT_DEFAULT;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning("Invalid timeout for " +
                             "jdk.tls.server.statelessKeyTimeout: " + s +
                             ".  Set to default value " + TIMEOUT_DEFAULT +
@@ -253,7 +254,8 @@ final class SessionTicketExtension {
                         Integer.BYTES + iv.length + 1, encrypted.length);
                 return result;
             } catch (Exception e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Encryption failed." + e);
                 }
                 return new byte[0];
@@ -295,7 +297,8 @@ final class SessionTicketExtension {
 
                 return out;
             } catch (Exception e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Decryption failed." + e);
                 }
             }
@@ -310,7 +313,7 @@ final class SessionTicketExtension {
                 gos.write(input, 0, decompressedLen);
                 gos.finish();
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("decompressed bytes: " + decompressedLen
                             + "; compressed bytes: " + baos.size());
                 }
@@ -329,7 +332,7 @@ final class SessionTicketExtension {
                     new ByteArrayInputStream(bytes))) {
                 byte[] out = gis.readAllBytes();
 
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("compressed bytes: " + compressedLen
                             + "; decompressed bytes: " + out.length);
                 }
@@ -395,7 +398,8 @@ final class SessionTicketExtension {
             // If the context does not allow stateless tickets, exit
             if (!((SSLSessionContextImpl)chc.sslContext.
                     engineGetClientSessionContext()).statelessEnabled()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Stateless resumption not supported");
                 }
                 return null;
@@ -407,7 +411,8 @@ final class SessionTicketExtension {
             if (!chc.isResumption || chc.resumingSession == null
                     || chc.resumingSession.getPskIdentity() == null
                     || chc.resumingSession.getProtocolVersion().useTLS13PlusSpec()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Stateless resumption supported");
                 }
                 return new byte[0];
@@ -451,7 +456,8 @@ final class SessionTicketExtension {
             shc.statelessResumption = true;
 
             if (buffer.remaining() == 0) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Client accepts session tickets.");
                 }
                 return;
@@ -463,11 +469,13 @@ final class SessionTicketExtension {
             if (b != null) {
                 shc.resumingSession = new SSLSessionImpl(shc, b);
                 shc.isResumption = true;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Valid stateless session ticket found");
                 }
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine("Invalid stateless session ticket found");
                 }
             }
@@ -547,7 +555,7 @@ final class SessionTicketExtension {
 
             // Disable stateless resumption if server doesn't send the extension.
             if (chc.statelessResumption) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.info(
                             "Server doesn't support stateless resumption");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
index dddeb523516..41ed1b9462b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
@@ -182,7 +182,8 @@ final class SignatureAlgorithmsExtension {
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable signature_algorithms extension");
                 }
@@ -218,7 +219,8 @@ final class SignatureAlgorithmsExtension {
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable signature_algorithms extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
index b91fc17fd29..ba9a6f4fc4e 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
@@ -204,7 +204,8 @@ enum SignatureScheme {
                     NoSuchAlgorithmException | RuntimeException exp) {
                 // Signature.getParameters() may throw RuntimeException.
                 mediator = false;
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                         "RSASSA-PSS signature with " + hash +
                         " is not supported by the underlying providers", exp);
@@ -297,7 +298,8 @@ enum SignatureScheme {
                     Signature.getInstance(algorithm);
                 } catch (Exception e) {
                     mediator = false;
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.warning(
                             "Signature algorithm, " + algorithm +
                             ", is not supported by the underlying providers");
@@ -424,7 +426,7 @@ enum SignatureScheme {
                 if (ss != null) {
                     schemesToCheck.add(ss);
                 } else {
-                    SSLLogger.logWarning("ssl,handshake", "Unavailable "
+                    SSLLogger.logWarning(SSLLogger.Opt.HANDSHAKE, "Unavailable "
                             + "configured signature scheme: " + name);
                 }
             }
@@ -433,7 +435,7 @@ enum SignatureScheme {
         for (SignatureScheme ss: schemesToCheck) {
             if (!ss.isAvailable) {
                 if (SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest(
                         "Ignore unsupported signature scheme: " + ss.name);
                 }
@@ -452,12 +454,12 @@ enum SignatureScheme {
                 if (ss.isPermitted(constraints, scopes)) {
                     supported.add(ss);
                 } else if (SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake,verbose")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                     SSLLogger.finest(
                         "Ignore disabled signature scheme: " + ss.name);
                 }
             } else if (SSLLogger.isOn() &&
-                    SSLLogger.isOn("ssl,handshake,verbose")) {
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.finest(
                     "Ignore inactive signature scheme: " + ss.name);
             }
@@ -476,7 +478,8 @@ enum SignatureScheme {
         for (int ssid : algorithmIds) {
             SignatureScheme ss = SignatureScheme.valueOf(ssid);
             if (ss == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Unsupported signature scheme: " +
                             SignatureScheme.nameOf(ssid));
@@ -486,7 +489,8 @@ enum SignatureScheme {
                     && ss.isAllowed(constraints, protocolVersion, scopes)) {
                 supported.add(ss);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Unsupported signature scheme: " + ss.name);
                 }
@@ -546,7 +550,7 @@ enum SignatureScheme {
                     }
 
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "Ignore the signature algorithm (" + ss +
                             "), unsupported EC parameter spec: " + params);
@@ -575,7 +579,7 @@ enum SignatureScheme {
                     }
 
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake,verbose")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                         SSLLogger.finest(
                             "Ignore the legacy signature algorithm (" + ss +
                             "), unsupported EC parameter spec: " + params);
@@ -661,7 +665,7 @@ enum SignatureScheme {
         } catch (NoSuchAlgorithmException | InvalidKeyException |
                 InvalidAlgorithmParameterException nsae) {
             if (SSLLogger.isOn() &&
-                    SSLLogger.isOn("ssl,handshake,verbose")) {
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.finest(
                     "Ignore unsupported signature algorithm (" +
                     this.name + ")", nsae);
diff --git a/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java b/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java
index d8c4a8ccc3e..2a4dc80eb42 100644
--- a/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/StatusResponseManager.java
@@ -119,13 +119,13 @@ final class StatusResponseManager {
 
         if (cert.getExtensionValue(
                 PKIXExtensions.OCSPNoCheck_Id.toString()) != null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                 SSLLogger.fine(
                     "OCSP NoCheck extension found.  OCSP will be skipped");
             }
             return null;
         } else if (defaultResponder != null && respOverride) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
               SSLLogger.fine(
                     "Responder override: URI is " + defaultResponder);
             }
@@ -165,7 +165,7 @@ final class StatusResponseManager {
         Map<X509Certificate, byte[]> responseMap = new HashMap<>();
         List<OCSPFetchCall> requestList = new ArrayList<>();
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
             SSLLogger.fine(
                 "Beginning check: Type = " + type + ", Chain length = " +
                 chain.length);
@@ -192,7 +192,8 @@ final class StatusResponseManager {
                     requestList.add(new OCSPFetchCall(sInfo, ocspReq));
                 }
             } catch (IOException exc) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine(
                         "Exception during CertId creation: ", exc);
                 }
@@ -219,14 +220,15 @@ final class StatusResponseManager {
                         requestList.add(new OCSPFetchCall(sInfo, ocspReq));
                     }
                 } catch (IOException exc) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                         SSLLogger.fine(
                             "Exception during CertId creation: ", exc);
                     }
                 }
             }
         } else {
-            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                 SSLLogger.fine("Unsupported status request type: " + type);
             }
         }
@@ -257,7 +259,8 @@ final class StatusResponseManager {
                             // that, otherwise just log the ExecutionException
                             Throwable cause = Optional.ofNullable(
                                     exc.getCause()).orElse(exc);
-                            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                            if (SSLLogger.isOn() &&
+                                    SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                                 SSLLogger.fine("Exception during OCSP fetch: " +
                                         cause);
                             }
@@ -267,12 +270,13 @@ final class StatusResponseManager {
                             responseMap.put(info.cert,
                                     info.responseData.ocspBytes);
                         } else if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("respmgr")) {
+                                SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                             SSLLogger.fine(
                                 "Completed task had no response data");
                         }
                     } else {
-                        if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                        if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                             SSLLogger.fine("Found cancelled task");
                         }
                     }
@@ -280,7 +284,8 @@ final class StatusResponseManager {
             } catch (InterruptedException intex) {
                 // Log and reset the interrupted state
                 Thread.currentThread().interrupt();
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine("Interrupt occurred while fetching: " +
                             intex);
                 }
@@ -308,7 +313,8 @@ final class StatusResponseManager {
         for (Extension ext : ocspRequest.extensions) {
             if (ext.getId().equals(
                     PKIXExtensions.OCSPNonce_Id.toString())) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine(
                             "Nonce extension found, skipping cache check");
                 }
@@ -323,14 +329,14 @@ final class StatusResponseManager {
         // and do not return it as a cache hit.
         if (respEntry != null && respEntry.nextUpdate != null &&
                 respEntry.nextUpdate.before(new Date())) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                 SSLLogger.fine(
                     "nextUpdate threshold exceeded, purging from cache");
             }
             respEntry = null;
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
             SSLLogger.fine(
                     "Check cache for SN" + Debug.toString(cid.getSerialNumber())
                         + ": " + (respEntry != null ? "HIT" : "MISS"));
@@ -493,7 +499,7 @@ final class StatusResponseManager {
          */
         @Override
         public StatusInfo call() {
-            if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                 SSLLogger.fine(
                     "Starting fetch for SN " +
                     Debug.toString(statInfo.cid.getSerialNumber()));
@@ -505,13 +511,15 @@ final class StatusResponseManager {
                 if (statInfo.responder == null) {
                     // If we have no URI then there's nothing to do
                     // but return.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                         SSLLogger.fine(
                             "Null URI detected, OCSP fetch aborted");
                     }
                     return statInfo;
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                         SSLLogger.fine(
                             "Attempting fetch from " + statInfo.responder);
                     }
@@ -541,7 +549,8 @@ final class StatusResponseManager {
                         statInfo.cid);
 
                 // Get the response status and act on it appropriately
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine("OCSP Status: " + cacheEntry.status +
                         " (" + respBytes.length + " bytes)");
                 }
@@ -554,7 +563,8 @@ final class StatusResponseManager {
                     addToCache(statInfo.cid, cacheEntry);
                 }
             } catch (IOException ioe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine("Caught exception: ", ioe);
                 }
             }
@@ -573,12 +583,14 @@ final class StatusResponseManager {
             // If no cache lifetime has been set on entries then
             // don't cache this response if there is no nextUpdate field
             if (entry.nextUpdate == null && cacheLifetime == 0) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine("Not caching this OCSP response");
                 }
             } else {
                 responseCache.put(certId, entry);
-                if (SSLLogger.isOn() && SSLLogger.isOn("respmgr")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.RESPMGR)) {
                     SSLLogger.fine(
                         "Added response for SN " +
                         Debug.toString(certId.getSerialNumber()) +
@@ -600,7 +612,7 @@ final class StatusResponseManager {
         // is necessary.  Also, we will only staple if we're doing a full
         // handshake.
         if (!shc.sslContext.isStaplingEnabled(false) || shc.isResumption) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("Staping disabled or is a resumed session");
             }
             return null;
@@ -623,7 +635,8 @@ final class StatusResponseManager {
         // selection yet, only accept a request if the ResponderId field
         // is empty.  Finally, we'll only do this in (D)TLS 1.2 or earlier.
         if (statReqV2 != null && !shc.negotiatedProtocol.useTLS13PlusSpec()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.fine("SH Processing status_request_v2 extension");
             }
             // RFC 6961 stapling
@@ -661,7 +674,7 @@ final class StatusResponseManager {
                 type = CertStatusRequestType.valueOf(req.statusType);
             } else {
                 if (SSLLogger.isOn() &&
-                        SSLLogger.isOn("ssl,handshake")) {
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest("Warning: No suitable request " +
                             "found in the status_request_v2 extension.");
                 }
@@ -678,7 +691,8 @@ final class StatusResponseManager {
         // we will try processing an asserted status_request.
         if ((statReq != null) &&
                 (ext == null || type == null || req == null)) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake,verbose")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE_VERBOSE)) {
                 SSLLogger.fine("SH Processing status_request extension");
             }
             ext = SSLExtension.CH_STATUS_REQUEST;
@@ -692,7 +706,8 @@ final class StatusResponseManager {
                 if (ocspReq.responderIds.isEmpty()) {
                     req = ocspReq;
                 } else {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.finest("Warning: No suitable request " +
                             "found in the status_request extension.");
                     }
@@ -704,7 +719,7 @@ final class StatusResponseManager {
         // find a suitable StatusRequest, then stapling is disabled.
         // The ext, type and req variables must have been set to continue.
         if (type == null || req == null || ext == null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.fine("No suitable status_request or " +
                         "status_request_v2, stapling is disabled");
             }
@@ -721,7 +736,7 @@ final class StatusResponseManager {
         }
 
         if (x509Possession == null) {       // unlikely
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.finest("Warning: no X.509 certificates found.  " +
                         "Stapling is disabled.");
             }
@@ -743,7 +758,8 @@ final class StatusResponseManager {
             responses = statRespMgr.get(fetchType, req, certs,
                     shc.statusRespTimeout, TimeUnit.MILLISECONDS);
             if (!responses.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest("Response manager returned " +
                             responses.size() + " entries.");
                 }
@@ -753,7 +769,7 @@ final class StatusResponseManager {
                     byte[] respDER = responses.get(certs[0]);
                     if (respDER == null || respDER.length == 0) {
                         if (SSLLogger.isOn() &&
-                                SSLLogger.isOn("ssl,handshake")) {
+                                SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                             SSLLogger.finest("Warning: Null or zero-length " +
                                     "response found for leaf certificate. " +
                                     "Stapling is disabled.");
@@ -763,7 +779,8 @@ final class StatusResponseManager {
                 }
                 params = new StaplingParameters(ext, type, req, responses);
             } else {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.finest("Warning: no OCSP responses obtained.  " +
                             "Stapling is disabled.");
                 }
@@ -771,7 +788,7 @@ final class StatusResponseManager {
         } else {
             // This should not happen, but if lazy initialization of the
             // StatusResponseManager doesn't occur we should turn off stapling.
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                 SSLLogger.finest("Warning: lazy initialization " +
                         "of the StatusResponseManager failed.  " +
                         "Stapling is disabled.");
diff --git a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
index 1fa2356d1de..7775a2bca97 100644
--- a/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
@@ -129,8 +129,8 @@ final class SunX509KeyManagerImpl extends X509KeyManagerCertChecking {
             X509Credentials cred = new X509Credentials((PrivateKey) key,
                     (X509Certificate[]) certs);
             credentialsMap.put(alias, cred);
-            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
-                SSLLogger.fine("found key for : " + alias, (Object[]) certs);
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
+                SSLLogger.fine("found key for : " + alias, (Object[])certs);
             }
         }
     }
@@ -315,7 +315,8 @@ final class SunX509KeyManagerImpl extends X509KeyManagerCertChecking {
         }
 
         if (results == null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() &&
+                                SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.fine("KeyMgr: no matching key found");
             }
             return null;
diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
index 67cb37988a1..28e81e52866 100644
--- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java
@@ -164,7 +164,8 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
@@ -177,7 +178,8 @@ final class SupportedGroupsExtension {
             for (String name : chc.sslConfig.namedGroups) {
                 NamedGroup ng = NamedGroup.nameOf(name);
                 if (ng == null) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "Ignore unspecified named group: " + name);
                     }
@@ -193,14 +195,16 @@ final class SupportedGroupsExtension {
                         ng.isSupported(chc.activeCipherSuites) &&
                         ng.isPermitted(chc.algorithmConstraints)) {
                     namedGroups.add(ng);
-                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore inactive or disabled named group: " + ng.name);
                 }
             }
 
             if (namedGroups.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("no available named group");
                 }
 
@@ -244,7 +248,8 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
@@ -319,7 +324,8 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(EE_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
@@ -336,7 +342,7 @@ final class SupportedGroupsExtension {
                 NamedGroup ng = NamedGroup.nameOf(name);
                 if (ng == null) {
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("ssl,handshake")) {
+                            SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                         SSLLogger.fine(
                                 "Ignore unspecified named group: " + name);
                     }
@@ -352,14 +358,16 @@ final class SupportedGroupsExtension {
                         ng.isSupported(shc.activeCipherSuites) &&
                         ng.isPermitted(shc.algorithmConstraints)) {
                     namedGroups.add(ng);
-                } else if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                } else if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore inactive or disabled named group: " + ng.name);
                 }
             }
 
             if (namedGroups.isEmpty()) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning("no available named group");
                 }
 
@@ -399,7 +407,8 @@ final class SupportedGroupsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(EE_SUPPORTED_GROUPS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable supported_groups extension");
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java
index 58597c3008c..90c315a57c5 100644
--- a/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SupportedVersionsExtension.java
@@ -168,7 +168,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(CH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         CH_SUPPORTED_VERSIONS.name);
@@ -216,7 +217,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(CH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         CH_SUPPORTED_VERSIONS.name);
@@ -308,7 +310,8 @@ final class SupportedVersionsExtension {
                     shc.handshakeExtensions.get(CH_SUPPORTED_VERSIONS);
             if (svs == null) {
                 // Unlikely, no key_share extension requested.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.warning(
                             "Ignore unavailable supported_versions extension");
                 }
@@ -317,7 +320,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(SH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         SH_SUPPORTED_VERSIONS.name);
@@ -356,7 +360,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(SH_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         SH_SUPPORTED_VERSIONS.name);
@@ -399,7 +404,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(HRR_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         HRR_SUPPORTED_VERSIONS.name);
@@ -441,7 +447,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!chc.sslConfig.isAvailable(HRR_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "Ignore unavailable extension: " +
                         HRR_SUPPORTED_VERSIONS.name);
@@ -483,7 +490,8 @@ final class SupportedVersionsExtension {
 
             // Is it a supported and enabled extension?
             if (!shc.sslConfig.isAvailable(HRR_SUPPORTED_VERSIONS)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl,handshake")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
                     SSLLogger.fine(
                         "[Reproduce] Ignore unavailable extension: " +
                         HRR_SUPPORTED_VERSIONS.name);
diff --git a/src/java.base/share/classes/sun/security/ssl/TransportContext.java b/src/java.base/share/classes/sun/security/ssl/TransportContext.java
index 980d9c4a6ce..1c68c13bbdc 100644
--- a/src/java.base/share/classes/sun/security/ssl/TransportContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/TransportContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,7 +144,6 @@ final class TransportContext implements ConnectionContext {
 
         // initial security parameters
         this.conSession = new SSLSessionImpl();
-        this.protocolVersion = this.sslConfig.maximumProtocolVersion;
         this.clientVerifyData = emptyByteArray;
         this.serverVerifyData = emptyByteArray;
 
@@ -270,7 +269,7 @@ final class TransportContext implements ConnectionContext {
             try {
                 outputRecord.encodeAlert(Alert.Level.WARNING.level, alert.id);
             } catch (IOException ioe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning(
                         "Warning: failed to send warning alert " + alert, ioe);
                 }
@@ -330,7 +329,7 @@ final class TransportContext implements ConnectionContext {
         // so we'll do it here.
         if (closeReason != null) {
             if (cause == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning(
                             "Closed transport, general or untracked problem");
                 }
@@ -341,7 +340,7 @@ final class TransportContext implements ConnectionContext {
             if (cause instanceof SSLException) {
                 throw (SSLException)cause;
             } else {    // unlikely, but just in case.
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning(
                             "Closed transport, unexpected rethrowing", cause);
                 }
@@ -364,7 +363,7 @@ final class TransportContext implements ConnectionContext {
         }
 
         // shutdown the transport
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.severe("Fatal (" + alert + "): " + diagnostic, cause);
         }
 
@@ -380,7 +379,7 @@ final class TransportContext implements ConnectionContext {
         try {
             inputRecord.close();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("Fatal: input record closure failed", ioe);
             }
 
@@ -411,7 +410,7 @@ final class TransportContext implements ConnectionContext {
             try {
                 outputRecord.encodeAlert(Alert.Level.FATAL.level, alert.id);
             } catch (IOException ioe) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.warning(
                         "Fatal: failed to send fatal alert " + alert, ioe);
                 }
@@ -424,7 +423,7 @@ final class TransportContext implements ConnectionContext {
         try {
             outputRecord.close();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("Fatal: output record closure failed", ioe);
             }
 
@@ -440,7 +439,7 @@ final class TransportContext implements ConnectionContext {
         try {
             transport.shutdown();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("Fatal: transport closure failed", ioe);
             }
 
@@ -526,7 +525,7 @@ final class TransportContext implements ConnectionContext {
                 passiveInboundClose();
             }
         } catch (IOException ioe) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("inbound closure failed", ioe);
             }
         }
@@ -583,7 +582,7 @@ final class TransportContext implements ConnectionContext {
         try {
              initiateOutboundClose();
         } catch (IOException ioe) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.warning("outbound closure failed", ioe);
             }
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
index 8b89fecefa8..584a125710e 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
@@ -48,24 +48,28 @@ abstract class TrustManagerFactoryImpl extends TrustManagerFactorySpi {
                 trustManager = getInstance(TrustStoreManager.getTrustedCerts());
             } catch (SecurityException se) {
                 // eat security exceptions but report other throwables
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine(
                             "SunX509: skip default keystore", se);
                 }
             } catch (Error err) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine(
                         "SunX509: skip default keystore", err);
                 }
                 throw err;
             } catch (RuntimeException re) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine(
                         "SunX509: skip default keystore", re);
                 }
                 throw re;
             } catch (Exception e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine(
                         "SunX509: skip default keystore", e);
                 }
diff --git a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
index a44f3a4e32d..0f0bfa4bfa8 100644
--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java
@@ -108,7 +108,8 @@ final class TrustStoreManager {
             this.storeFile = storeFile;
             this.lastModified = lastModified;
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+            if (SSLLogger.isOn() &&
+                    SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                 SSLLogger.fine(
                     "trustStore is: " + storeName + "\n" +
                     "trustStore type is: " + storeType + "\n" +
@@ -152,7 +153,7 @@ final class TrustStoreManager {
 
                     // Not break, the file is inaccessible.
                     if (SSLLogger.isOn() &&
-                            SSLLogger.isOn("trustmanager")) {
+                            SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                         SSLLogger.fine(
                                 "Inaccessible trust store: " +
                                 fileName);
@@ -267,7 +268,8 @@ final class TrustStoreManager {
                 }
 
                 // Reload a new key store.
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine("Reload the trust store");
                 }
 
@@ -321,7 +323,8 @@ final class TrustStoreManager {
 
                 // Reload the trust store if needed.
                 if (ks == null) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                         SSLLogger.fine("Reload the trust store");
                     }
                     ks = loadKeyStore(descriptor);
@@ -329,12 +332,14 @@ final class TrustStoreManager {
                 }
 
                 // Reload trust certs from the key store.
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine("Reload trust certs");
                 }
 
                 certs = loadTrustedCerts(ks);
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine("Reloaded " + certs.size() + " trust certs");
                 }
 
@@ -355,7 +360,8 @@ final class TrustStoreManager {
                     descriptor.storeFile == null) {
 
                 // No file available, no KeyStore available.
-                if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine("No available key store");
                 }
 
@@ -382,7 +388,8 @@ final class TrustStoreManager {
                     ks.load(bis, password);
                 } catch (FileNotFoundException fnfe) {
                     // No file available, no KeyStore available.
-                    if (SSLLogger.isOn() && SSLLogger.isOn("trustmanager")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                         SSLLogger.fine(
                             "Not available key store: " + descriptor.storeName);
                     }
diff --git a/src/java.base/share/classes/sun/security/ssl/Utilities.java b/src/java.base/share/classes/sun/security/ssl/Utilities.java
index 458551b9d8a..cfd39aecac2 100644
--- a/src/java.base/share/classes/sun/security/ssl/Utilities.java
+++ b/src/java.base/share/classes/sun/security/ssl/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@ final class Utilities {
             SNIServerName serverName = sniList.get(i);
             if (serverName.getType() == StandardConstants.SNI_HOST_NAME) {
                 sniList.set(i, sniHostName);
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                      SSLLogger.fine(
                         "the previous server name in SNI (" + serverName +
                         ") was replaced with (" + sniHostName + ")");
@@ -116,7 +116,7 @@ final class Utilities {
                 return new SNIHostName(hostname);
             } catch (IllegalArgumentException iae) {
                 // don't bother to handle illegal host_name
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                      SSLLogger.fine(hostname + "\" " +
                         "is not a legal HostName for  server name indication");
                 }
@@ -168,6 +168,35 @@ final class Utilities {
         return builder.toString();
     }
 
+    static String wrapText(String text, int maxWidth) {
+        if (text == null || text.isEmpty() || maxWidth <= 0) {
+            return "";
+        }
+        StringBuilder result = new StringBuilder();
+        String[] values = text.split(",\\s*");
+        StringBuilder line = new StringBuilder();
+
+        for (int i = 0; i < values.length; i++) {
+            String value = values[i];
+            // If adding this value would exceed maxWidth
+            if (line.length() > 0) {
+                // +1 for the comma
+                if (line.length() + 1 + value.length() > maxWidth) {
+                    result.append(line).append(LINE_SEP);
+                    line.setLength(0);
+                } else {
+                    line.append(",");
+                }
+            }
+            line.append(value);
+        }
+        // Append any remaining line
+        if (line.length() > 0) {
+            result.append(line);
+        }
+        return result.toString();
+    }
+
     static String byte16HexString(int id) {
         return "0x" + HEX_FORMATTER.toHexDigits((short)id);
     }
diff --git a/src/java.base/share/classes/sun/security/ssl/X509Authentication.java b/src/java.base/share/classes/sun/security/ssl/X509Authentication.java
index 6aedff02c34..bdb2dd7706f 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509Authentication.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509Authentication.java
@@ -201,7 +201,7 @@ enum X509Authentication implements SSLAuthentication {
     private static SSLPossession createClientPossession(
             ClientHandshakeContext chc, String[] keyTypes) {
         X509ExtendedKeyManager km = chc.sslContext.getX509KeyManager();
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.finest("X509KeyManager class: " +
                     km.getClass().getName());
         }
@@ -243,7 +243,7 @@ enum X509Authentication implements SSLAuthentication {
         }
 
         if (clientAlias == null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest("No X.509 cert selected for "
                         + Arrays.toString(keyTypes));
             }
@@ -252,7 +252,7 @@ enum X509Authentication implements SSLAuthentication {
 
         PrivateKey clientPrivateKey = km.getPrivateKey(clientAlias);
         if (clientPrivateKey == null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest(
                         clientAlias + " is not a private key entry");
             }
@@ -261,7 +261,7 @@ enum X509Authentication implements SSLAuthentication {
 
         X509Certificate[] clientCerts = km.getCertificateChain(clientAlias);
         if ((clientCerts == null) || (clientCerts.length == 0)) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.finest(clientAlias +
                         " is a private key entry with no cert chain stored");
             }
@@ -270,7 +270,7 @@ enum X509Authentication implements SSLAuthentication {
 
         String privateKeyAlgorithm = clientPrivateKey.getAlgorithm();
         if (!Arrays.asList(keyTypes).contains(privateKeyAlgorithm)) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine(
                         clientAlias + " private key algorithm " +
                                 privateKeyAlgorithm + " not in request list");
@@ -280,7 +280,7 @@ enum X509Authentication implements SSLAuthentication {
 
         String publicKeyAlgorithm = clientCerts[0].getPublicKey().getAlgorithm();
         if (!privateKeyAlgorithm.equals(publicKeyAlgorithm)) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                 SSLLogger.fine(
                         clientAlias + " private or public key is not of " +
                                 "same algorithm: " +
@@ -296,7 +296,7 @@ enum X509Authentication implements SSLAuthentication {
     private static SSLPossession createServerPossession(
             ServerHandshakeContext shc, String[] keyTypes) {
         X509ExtendedKeyManager km = shc.sslContext.getX509KeyManager();
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
             SSLLogger.finest("X509KeyManager class: " +
                     km.getClass().getName());
         }
@@ -337,7 +337,7 @@ enum X509Authentication implements SSLAuthentication {
             }
 
             if (serverAlias == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest("No X.509 cert selected for " + keyType);
                 }
                 continue;
@@ -345,7 +345,7 @@ enum X509Authentication implements SSLAuthentication {
 
             PrivateKey serverPrivateKey = km.getPrivateKey(serverAlias);
             if (serverPrivateKey == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest(
                             serverAlias + " is not a private key entry");
                 }
@@ -354,7 +354,7 @@ enum X509Authentication implements SSLAuthentication {
 
             X509Certificate[] serverCerts = km.getCertificateChain(serverAlias);
             if ((serverCerts == null) || (serverCerts.length == 0)) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.finest(
                             serverAlias + " is not a certificate entry");
                 }
@@ -364,7 +364,7 @@ enum X509Authentication implements SSLAuthentication {
             PublicKey serverPublicKey = serverCerts[0].getPublicKey();
             if ((!serverPrivateKey.getAlgorithm().equals(keyType))
                     || (!serverPublicKey.getAlgorithm().equals(keyType))) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine(
                             serverAlias + " private or public key is not of " +
                                     keyType + " algorithm");
@@ -379,7 +379,7 @@ enum X509Authentication implements SSLAuthentication {
             if (!shc.negotiatedProtocol.useTLS13PlusSpec() &&
                     keyType.equals("EC")) {
                 if (!(serverPublicKey instanceof ECPublicKey)) {
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.warning(serverAlias +
                                 " public key is not an instance of ECPublicKey");
                     }
@@ -398,7 +398,8 @@ enum X509Authentication implements SSLAuthentication {
                         ((shc.clientRequestedNamedGroups != null) &&
                                 !shc.clientRequestedNamedGroups.contains(namedGroup))) {
 
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                         SSLLogger.warning(
                                 "Unsupported named group (" + namedGroup +
                                         ") used in the " + serverAlias + " certificate");
diff --git a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java
index 2a1f01273bd..6d26558847c 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerCertChecking.java
@@ -116,7 +116,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
         }
 
         if (keyIndex == -1) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.fine("Ignore alias " + alias
                         + ": key algorithm does not match");
             }
@@ -134,7 +134,8 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                 }
             }
             if (!found) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                     SSLLogger.fine(
                             "Ignore alias " + alias
                                     + ": issuers do not match");
@@ -150,7 +151,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                 !conformsToAlgorithmConstraints(constraints, chain,
                         checkType.getValidator())) {
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.fine("Ignore alias " + alias +
                         ": certificate chain does not conform to " +
                         "algorithm constraints");
@@ -219,7 +220,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
             checker.init(false);
         } catch (CertPathValidatorException cpve) {
             // unlikely to happen
-            if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.fine(
                         "Cannot initialize algorithm constraints checker",
                         cpve);
@@ -235,7 +236,8 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                 // We don't care about the unresolved critical extensions.
                 checker.check(cert, Collections.emptySet());
             } catch (CertPathValidatorException cpve) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("keymanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                     SSLLogger.fine("Certificate does not conform to " +
                             "algorithm constraints", cert, cpve);
                 }
@@ -393,7 +395,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                             } catch (IllegalArgumentException iae) {
                                 // unlikely to happen, just in case ...
                                 if (SSLLogger.isOn() &&
-                                        SSLLogger.isOn("keymanager")) {
+                                        SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                                     SSLLogger.fine("Illegal server name: "
                                             + serverName);
                                 }
@@ -409,7 +411,7 @@ abstract class X509KeyManagerCertChecking extends X509ExtendedKeyManager {
                                     cert, idAlgorithm);
                         } catch (CertificateException e) {
                             if (SSLLogger.isOn() &&
-                                    SSLLogger.isOn("keymanager")) {
+                                    SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                                 SSLLogger.fine(
                                         "Certificate identity does not match "
                                                 + "Server Name Indication (SNI): "
diff --git a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
index 72f079db175..be982bfd192 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
@@ -228,7 +228,7 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
                 || (secondDot - firstDot < 2)
                 || (alias.length() - secondDot < 2)) {
 
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.warning("Invalid alias format: " + alias);
             }
             return null;
@@ -255,7 +255,7 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
                  NoSuchAlgorithmException |
                  IndexOutOfBoundsException e) {
             // ignore and only log exception
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.warning("Exception thrown while getting an alias " +
                                   alias + ": " + e);
             }
@@ -296,7 +296,7 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
                     for (EntryStatus status : results) {
                         if (status.checkResult == CheckResult.OK) {
                             if (SSLLogger.isOn()
-                                    && SSLLogger.isOn("ssl,keymanager")) {
+                                    && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                                 SSLLogger.fine("Choosing key: " + status);
                             }
                             return makeAlias(status);
@@ -312,13 +312,13 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
             }
         }
         if (allResults == null) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.fine("No matching key found");
             }
             return null;
         }
         Collections.sort(allResults);
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
             SSLLogger.fine(
                     "No good matching key found, "
                     + "returning best match out of", allResults);
@@ -358,13 +358,13 @@ final class X509KeyManagerImpl extends X509KeyManagerCertChecking {
             }
         }
         if (allResults == null || allResults.isEmpty()) {
-            if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
+            if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
                 SSLLogger.fine("No matching alias found");
             }
             return null;
         }
         Collections.sort(allResults);
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,keymanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.KEYMANAGER)) {
             SSLLogger.fine("Getting aliases", allResults);
         }
         return toAliases(allResults);
diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index 40ee01d284a..209e315b59d 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -74,7 +74,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager {
 
         this.trustedCerts = trustedCerts;
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
             SSLLogger.fine("adding as trusted certificates",
                     (Object[])trustedCerts.toArray(new X509Certificate[0]));
         }
@@ -91,7 +91,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager {
         trustedCerts = v.getTrustedCertificates();
         serverValidator = v;
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
             SSLLogger.fine("adding as trusted certificates",
                     (Object[])trustedCerts.toArray(new X509Certificate[0]));
         }
@@ -294,7 +294,7 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager {
                     null, checkClientTrusted ? null : authType);
         }
 
-        if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
+        if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
             SSLLogger.fine("Found trusted certificate",
                     trustedChain[trustedChain.length - 1]);
         }
@@ -328,7 +328,8 @@ final class X509TrustManagerImpl extends X509ExtendedTrustManager {
                     hostname = new SNIHostName(sniName.getEncoded());
                 } catch (IllegalArgumentException iae) {
                     // unlikely to happen, just in case ...
-                    if (SSLLogger.isOn() && SSLLogger.isOn("ssl,trustmanager")) {
+                    if (SSLLogger.isOn() &&
+                            SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                         SSLLogger.fine("Illegal server name: " + sniName);
                     }
                 }
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 9fb830da338..7f415da5270 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1294,7 +1294,7 @@ public final class Main {
             }
 
             if (alias != null) {
-                doPrintEntry(rb.getString("the.certificate"), alias, out);
+                doPrintEntry(alias, out);
             } else {
                 doPrintEntries(out);
             }
@@ -2177,9 +2177,10 @@ public final class Main {
     /**
      * Prints a single keystore entry.
      */
-    private void doPrintEntry(String label, String alias, PrintStream out)
+    private void doPrintEntry(String alias, PrintStream out)
         throws Exception
     {
+        String label = "<" + alias + ">";
         CertPathConstraintsParameters cpcp;
         if (!keyStore.containsAlias(alias)) {
             MessageFormat form = new MessageFormat
@@ -2631,7 +2632,7 @@ public final class Main {
         List<String> aliases = Collections.list(keyStore.aliases());
         aliases.sort(String::compareTo);
         for (String alias : aliases) {
-            doPrintEntry("<" + alias + ">", alias, out);
+            doPrintEntry(alias, out);
             if (verbose || rfc) {
                 out.println(rb.getString("NEWLINE"));
                 out.println(rb.getString
diff --git a/src/java.base/share/classes/sun/security/util/CryptoAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/CryptoAlgorithmConstraints.java
index a8649106a38..ad3beab350f 100644
--- a/src/java.base/share/classes/sun/security/util/CryptoAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/util/CryptoAlgorithmConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,8 +82,10 @@ public class CryptoAlgorithmConstraints extends AbstractAlgorithmConstraints {
     CryptoAlgorithmConstraints(String propertyName) {
         super(null);
         disabledServices = getAlgorithms(propertyName, true);
-        debug("Before " + Arrays.deepToString(disabledServices.toArray()));
-        for (String dk : disabledServices) {
+        String[] entries = disabledServices.toArray(new String[0]);
+        debug("Before " + Arrays.deepToString(entries));
+
+        for (String dk : entries) {
             int idx = dk.indexOf(".");
             if (idx < 1 || idx == dk.length() - 1) {
                 // wrong syntax: missing "." or empty service or algorithm
diff --git a/src/java.base/share/classes/sun/security/util/DomainName.java b/src/java.base/share/classes/sun/security/util/DomainName.java
index 465c155ab87..82a5179e9b5 100644
--- a/src/java.base/share/classes/sun/security/util/DomainName.java
+++ b/src/java.base/share/classes/sun/security/util/DomainName.java
@@ -192,7 +192,7 @@ class DomainName {
                 }
                 return getRules(tld, new ZipInputStream(pubSuffixStream));
             } catch (IOException e) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine(
                         "cannot parse public suffix data for " + tld +
                          ": " + e.getMessage());
@@ -209,8 +209,8 @@ class DomainName {
                 is = new FileInputStream(f);
             } catch (FileNotFoundException e) { }
             if (is == null) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl") &&
-                        SSLLogger.isOn("trustmanager")) {
+                if (SSLLogger.isOn() &&
+                        SSLLogger.isOn(SSLLogger.Opt.TRUSTMANAGER)) {
                     SSLLogger.fine(
                         "lib/security/public_suffix_list.dat not found");
                 }
@@ -230,7 +230,7 @@ class DomainName {
                 }
             }
             if (!found) {
-                if (SSLLogger.isOn() && SSLLogger.isOn("ssl")) {
+                if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.SSL)) {
                     SSLLogger.fine("Domain " + tld + " not found");
                 }
                 return null;
diff --git a/src/java.base/share/classes/sun/security/util/KeyChoices.java b/src/java.base/share/classes/sun/security/util/KeyChoices.java
new file mode 100644
index 00000000000..da3c611750e
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/KeyChoices.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.util;
+
+import java.security.*;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.function.BiFunction;
+
+/**
+ * The content of an ML-KEM or ML-DSA private key is defined as a CHOICE
+ * among three different representations. For example:
+ * <pre>
+ *  ML-KEM-1024-PrivateKey ::= CHOICE {
+ *       seed [0] OCTET STRING (SIZE (64)),
+ *       expandedKey OCTET STRING (SIZE (3168)),
+ *       both SEQUENCE {
+ *           seed OCTET STRING (SIZE (64)),
+ *           expandedKey OCTET STRING (SIZE (3168))
+ *           }
+ *       }
+ * </pre>
+ * This class supports reading, writing, and converting between them.
+ * <p>
+ * Current code follows draft-ietf-lamps-kyber-certificates-11 and RFC 9881.
+ */
+public final class KeyChoices {
+
+    public enum Type { SEED, EXPANDED_KEY, BOTH }
+
+    private record Choice(Type type, byte[] seed, byte[] expanded) {}
+
+    /**
+     * Gets the preferred choice type for an algorithm, defined as an
+     * overridable security property "jdk.<name>.pkcs8.encoding".
+     *
+     * @param name "mlkem" or "mldsa".
+     * @throws IllegalArgumentException if property is invalid value
+     * @return the type
+     */
+    public static Type getPreferred(String name) {
+        var prop = SecurityProperties.getOverridableProperty(
+                "jdk." + name + ".pkcs8.encoding");
+        if (prop == null) {
+            return Type.SEED;
+        }
+        return switch (prop.toLowerCase(Locale.ROOT)) {
+            case "seed" -> Type.SEED;
+            case "expandedkey" -> Type.EXPANDED_KEY;
+            case "both" -> Type.BOTH;
+            default -> throw new IllegalArgumentException("Unknown format: " + prop);
+        };
+    }
+
+    /**
+     * Writes one of the ML-KEM or ML-DSA private key formats.
+     * <p>
+     * This method does not check the length of the inputs or whether
+     * they match each other. The caller must make sure `seed` and/or
+     * `expanded` are provided if `type` requires any of them.
+     *
+     * @param type     preferred output choice type
+     * @param seed     the seed, could be null
+     * @param expanded the expanded key, could be null
+     * @return         one of the choices
+     */
+    public static byte[] writeToChoice(Type type, byte[] seed, byte[] expanded) {
+        byte[] skOctets;
+        // Ensures using one-byte len in DER
+        assert seed == null || seed.length < 128;
+        // Ensures using two-byte len in DER
+        assert expanded == null || expanded.length > 256 && expanded.length < 60000;
+
+        return switch (type) {
+            case SEED -> {
+                assert seed != null;
+                skOctets = new byte[seed.length + 2];
+                skOctets[0] = (byte)0x80;
+                skOctets[1] = (byte) seed.length;
+                System.arraycopy(seed, 0, skOctets, 2, seed.length);
+                yield skOctets;
+            }
+            case EXPANDED_KEY -> {
+                assert expanded != null;
+                skOctets = new byte[expanded.length + 4];
+                skOctets[0] = 0x04;
+                writeShortLength(skOctets, 1, expanded.length);
+                System.arraycopy(expanded, 0, skOctets, 4, expanded.length);
+                yield skOctets;
+            }
+            case BOTH -> {
+                assert seed != null;
+                assert expanded != null;
+                skOctets = new byte[10 + seed.length + expanded.length];
+                skOctets[0] = 0x30;
+                writeShortLength(skOctets, 1, 6 + seed.length + expanded.length);
+                skOctets[4] = 0x04;
+                skOctets[5] = (byte)seed.length;
+                System.arraycopy(seed, 0, skOctets, 6, seed.length);
+                skOctets[6 + seed.length] = 0x04;
+                writeShortLength(skOctets, 7 + seed.length, expanded.length);
+                System.arraycopy(expanded, 0, skOctets, 10 + seed.length, expanded.length);
+                yield skOctets;
+            }
+        };
+    }
+
+    /**
+     * Gets the type of input.
+     *
+     * @param input input bytes
+     * @return the type
+     * @throws InvalidKeyException if input is invalid
+     */
+    public static Type typeOfChoice(byte[] input) throws InvalidKeyException {
+        if (input.length < 1) {
+            throw new InvalidKeyException("Empty key");
+        }
+        return switch (input[0]) {
+            case (byte) 0x80 -> Type.SEED;
+            case 0x04 -> Type.EXPANDED_KEY;
+            case 0x30 -> Type.BOTH;
+            default -> throw new InvalidKeyException("Wrong tag: " + input[0]);
+        };
+    }
+
+    /**
+     * Splits one of the ML-KEM or ML-DSA private key formats into
+     * seed and expandedKey, if exists.
+     *
+     * @param seedLen correct seed length
+     * @param input input bytes
+     * @return a {@code Choice} object. Byte arrays inside are newly allocated
+     * @throws InvalidKeyException if input is invalid
+     */
+    private static Choice readFromChoice(int seedLen, byte[] input)
+            throws InvalidKeyException {
+        if (input.length < seedLen + 2) {
+            throw new InvalidKeyException("Too short");
+        }
+        return switch (input[0]) {
+            case (byte) 0x80 -> {
+                // 80 SEED_LEN <SEED_LEN of seed>
+                if (input[1] != seedLen && input.length != seedLen + 2) {
+                    throw new InvalidKeyException("Invalid seed");
+                }
+                yield new Choice(Type.SEED,
+                        Arrays.copyOfRange(input, 2, seedLen + 2), null);
+            }
+            case 0x04 -> {
+                // 04 82 nn nn <nn of expandedKey>
+                if (readShortLength(input, 1) != input.length - 4) {
+                    throw new InvalidKeyException("Invalid expandedKey");
+                }
+                yield new Choice(Type.EXPANDED_KEY,
+                        null, Arrays.copyOfRange(input, 4, input.length));
+            }
+            case 0x30 -> {
+                // 30 82 mm mm 04 SEED_LEN <SEED_LEN of seed> 04 82 nn nn <nn of expandedKey>
+                if (input.length < 6 + seedLen + 4) {
+                    throw new InvalidKeyException("Too short");
+                }
+                if (readShortLength(input, 1) != input.length - 4
+                        || input[4] != 0x04
+                        || input[5] != (byte)seedLen
+                        || input[seedLen + 6] != 0x04
+                        || readShortLength(input, seedLen + 7)
+                                != input.length - 10 - seedLen) {
+                    throw new InvalidKeyException("Invalid both");
+                }
+                yield new Choice(Type.BOTH,
+                        Arrays.copyOfRange(input, 6, 6 + seedLen),
+                        Arrays.copyOfRange(input, seedLen + 10, input.length));
+            }
+            default -> throw new InvalidKeyException("Wrong tag: " + input[0]);
+        };
+    }
+
+    /**
+     * Reads from any encoding and write to the specified type.
+     *
+     * @param type preferred output choice type
+     * @param pname parameter set name
+     * @param seedLen seed length
+     * @param input the input encoding
+     * @param expander function to calculate expanded from seed, could be null
+     *                 if there is already expanded in input
+     * @return the preferred encoding
+     * @throws InvalidKeyException if input is invalid or does not have enough
+     *                             information to generate the output
+     */
+    public static byte[] choiceToChoice(Type type, String pname,
+            int seedLen, byte[] input,
+            BiFunction<String, byte[], byte[]> expander)
+            throws InvalidKeyException {
+        var choice = readFromChoice(seedLen, input);
+        try {
+            if (type != Type.EXPANDED_KEY && choice.type == Type.EXPANDED_KEY) {
+                throw new InvalidKeyException(
+                        "key contains not enough info to translate");
+            }
+            var expanded = (choice.expanded == null && type != Type.SEED)
+                    ? expander.apply(pname, choice.seed)
+                    : choice.expanded;
+            return writeToChoice(type, choice.seed, expanded);
+        } finally {
+            if (choice.seed != null) {
+                Arrays.fill(choice.seed, (byte) 0);
+            }
+            if (choice.expanded != null) {
+                Arrays.fill(choice.expanded, (byte) 0);
+            }
+        }
+    }
+
+    /**
+     * Reads from any choice of encoding and return the expanded format.
+     *
+     * @param pname parameter set name
+     * @param seedLen seed length
+     * @param input input encoding
+     * @param expander function to calculate expanded from seed, could be null
+     *                 if there is already expanded in input
+     * @return the expanded key
+     * @throws InvalidKeyException if input is invalid
+     */
+    public static byte[] choiceToExpanded(String pname,
+            int seedLen, byte[] input,
+            BiFunction<String, byte[], byte[]> expander)
+            throws InvalidKeyException {
+        var choice = readFromChoice(seedLen, input);
+        if (choice.type == Type.BOTH) {
+            var calculated = expander.apply(pname, choice.seed);
+            if (!Arrays.equals(choice.expanded, calculated)) {
+                throw new InvalidKeyException("seed and expandedKey do not match");
+            }
+            Arrays.fill(calculated, (byte)0);
+        }
+        try {
+            if (choice.expanded != null) {
+                return choice.expanded;
+            }
+            return expander.apply(pname, choice.seed);
+        } finally {
+            if (choice.seed != null) {
+                Arrays.fill(choice.seed, (byte)0);
+            }
+        }
+    }
+
+    // Reads a 2 bytes length from DER encoding
+    private static int readShortLength(byte[] input, int from)
+            throws InvalidKeyException {
+        if (input[from] != (byte)0x82) {
+            throw new InvalidKeyException("Unexpected length");
+        }
+        return ((input[from + 1] & 0xff) << 8) + (input[from + 2] & 0xff);
+    }
+
+    // Writes a 2 bytes length to DER encoding
+    private static void writeShortLength(byte[] input, int from, int value) {
+        input[from] = (byte)0x82;
+        input[from + 1] = (byte) (value >> 8);
+        input[from + 2] = (byte) (value);
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/x509/NamedX509Key.java b/src/java.base/share/classes/sun/security/x509/NamedX509Key.java
index dc36bd3b9b3..0c3fe2bf121 100644
--- a/src/java.base/share/classes/sun/security/x509/NamedX509Key.java
+++ b/src/java.base/share/classes/sun/security/x509/NamedX509Key.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,8 @@ public final class NamedX509Key extends X509Key {
         setKey(new BitArray(rawBytes.length * 8, rawBytes));
     }
 
-    /// Ctor from family name, and X.509 bytes
+    /// Ctor from family name, and X.509 bytes. Input byte array
+    /// is copied. Caller can modify it after the method call.
     public NamedX509Key(String fname, byte[] encoded) throws InvalidKeyException {
         this.fname = fname;
         decode(encoded);
diff --git a/src/java.base/share/classes/sun/security/x509/X509Key.java b/src/java.base/share/classes/sun/security/x509/X509Key.java
index c83e06f651e..1cfe3f9d95d 100644
--- a/src/java.base/share/classes/sun/security/x509/X509Key.java
+++ b/src/java.base/share/classes/sun/security/x509/X509Key.java
@@ -104,6 +104,10 @@ public class X509Key implements PublicKey, DerEncoder {
         return (BitArray)bitStringKey.clone();
     }
 
+    public byte[] getKeyAsBytes() {
+        return bitStringKey.toByteArray();
+    }
+
     /**
      * Construct X.509 subject public key from a DER value.  If
      * the runtime environment is configured with a specific class for
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index b5cbce413b2..ef4d7285f51 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -1655,3 +1655,73 @@ jdk.tls.alpnCharset=ISO_8859_1
 # withEncryption method.
 #
 jdk.epkcs8.defaultAlgorithm=PBEWithHmacSHA256AndAES_128
+
+#
+# X.509 AuthorityInfoAccess caIssuer URI Filtering
+#
+# This property defines a whitespace-separated list of filters that
+# are applied to URIs found in the authorityInfoAccess extension in
+# X.509 certificates. Any caIssuers URIs in X.509 certificates are only
+# followed when the com.sun.security.enableAIAcaIssuers System property is
+# enabled and the filter allows the URI. By default this property imposes a
+# deny-all ruleset.  This property may be overridden by a System property
+# of the same name.
+#
+# The filters must take the form of absolute, hierarchical URIs as defined by
+# the java.net.URI class. Additionally, only the following protocols are
+# allowed as filters: http, https, ldap and ftp.
+# See RFC 5280, section 4.2.2.1 for details about the types of URIs allowed for
+# the extension and their specific requirements.
+# The filter matching rules are applied to each CA issuer URI as follows:
+# 1. The scheme must match (case-insensitive).
+# 2. A hostname or address must be specified in the filter URI.  It must match
+#    the host or address in the caIssuers URI (case-insensitive).  No name
+#    resolution is performed on hostnames to match IP addresses.
+# 3. The port number must match.  For filter and caIssuer URIs, when a port
+#    number is omitted, the well-known port for that scheme will be used in the
+#    comparison.
+# 4. For hierarchical filesystem schemes (e.g. http[s], ftp):
+#    a. The normalized path portion of the filter URI is matched in a
+#       case-sensitive manner.  If the final component of the path does not end
+#       in a slash (/), it is considered to be a file path component and must
+#       be an exact match of the caIssuer's URI file path component.  If the
+#       final filter component ends in a slash, then it must either match or be
+#       a prefix of the caIssuer's URI path component (e.g. a filter path of
+#       /ab/cd/ will match a caIssuer path of /ab/cd/, /ab/cd/ef and
+#       /ab/cd/ef/ghi).
+#    b. Query strings will be ignored in filter rules and caIssuer URIs.
+#    c. Fragments will be ignored in filter rules and caIssuer URIs.
+# 5. For ldap URIs:
+#    a. The base DN must be an exact match (case-insensitive).
+#    b. Any query string in the rule, if specified, is ignored.
+# 6. A single value "any" (case-insensitive) will create an allow-all rule.
+#
+# As an example, here is a valid filter policy consisting of two rules:
+#    com.sun.security.allowedAIALocations=http://some.company.com/cacert \
+#          ldap://ldap.company.com/dc=company,dc=com?caCertificate;binary
+com.sun.security.allowedAIALocations=
+
+#
+# PKCS #8 encoding format for newly created ML-KEM and ML-DSA private keys
+#
+# draft-ietf-lamps-kyber-certificates-11 and RFC 9881 define three possible formats for a private key:
+# a seed (64 bytes for ML-KEM, 32 bytes for ML-DSA), an expanded private key,
+# or a sequence containing both.
+#
+# The following security properties determine the encoding format used when a
+# new keypair is generated with a KeyPairGenerator, and the output of the
+# translateKey method on an existing key using a ML-KEM or ML-DSA KeyFactory.
+#
+# Valid values for these properties are "seed", "expandedKey", and "both"
+# (case-insensitive). The default is "seed".
+#
+# If a system property of the same name is also specified, it supersedes the
+# security property value defined here.
+#
+# Note: These properties are currently used by the SunJCE (for ML-KEM) and SUN
+# (for ML-DSA) providers in the JDK Reference implementation. They are not
+# guaranteed to be supported by other implementations or third-party security
+# providers.
+#
+#jdk.mlkem.pkcs8.encoding = seed
+#jdk.mldsa.pkcs8.encoding = seed
diff --git a/src/java.base/share/legal/gcc.md b/src/java.base/share/legal/gcc.md
new file mode 100644
index 00000000000..b78ca12caa9
--- /dev/null
+++ b/src/java.base/share/legal/gcc.md
@@ -0,0 +1,2084 @@
+## GCC - libgcc and libstdc++ 14.2.0
+
+### GNU GENERAL PUBLIC LICENSE v3
+
+```
+                       Version 3, 29 June 2007
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+                            Preamble
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+                       TERMS AND CONDITIONS
+  0. Definitions.
+  "This License" refers to version 3 of the GNU General Public License.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+  1. Source Code.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+  The Corresponding Source for a work in source code form is that
+same work.
+  2. Basic Permissions.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+  4. Conveying Verbatim Copies.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+  5. Conveying Modified Source Versions.
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+  6. Conveying Non-Source Forms.
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+  7. Additional Terms.
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+  8. Termination.
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+  9. Acceptance Not Required for Having Copies.
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+  10. Automatic Licensing of Downstream Recipients.
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+  11. Patents.
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+  12. No Surrender of Others' Freedom.
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+  13. Use with the GNU Affero General Public License.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+  14. Revised Versions of this License.
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+  15. Disclaimer of Warranty.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+  16. Limitation of Liability.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+  17. Interpretation of Sections 15 and 16.
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+                     END OF TERMS AND CONDITIONS
+            How to Apply These Terms to Your New Programs
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Also add information on how to contact you by electronic and paper mail.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+```
+
+### GCC RUNTIME LIBRARY EXCEPTION v3.1
+
+```
+Version 3.1, 31 March 2009
+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+This GCC Runtime Library Exception ("Exception") is an additional
+permission under section 7 of the GNU General Public License, version
+3 ("GPLv3"). It applies to a given file (the "Runtime Library") that
+bears a notice placed by the copyright holder of the file stating that
+the file is governed by GPLv3 along with this Exception.
+When you use GCC to compile a program, GCC may combine portions of
+certain GCC header files and runtime libraries with the compiled
+program. The purpose of this Exception is to allow compilation of
+non-GPL (including proprietary) programs to use, in this way, the
+header files and runtime libraries covered by this Exception.
+0. Definitions.
+A file is an "Independent Module" if it either requires the Runtime
+Library for execution after a Compilation Process, or makes use of an
+interface provided by the Runtime Library, but is not otherwise based
+on the Runtime Library.
+"GCC" means a version of the GNU Compiler Collection, with or without
+modifications, governed by version 3 (or a specified later version) of
+the GNU General Public License (GPL) with the option of using any
+subsequent versions published by the FSF.
+"GPL-compatible Software" is software whose conditions of propagation,
+modification and use would permit combination with GCC in accord with
+the license of GCC.
+"Target Code" refers to output from any compiler for a real or virtual
+target processor architecture, in executable form or suitable for
+input to an assembler, loader, linker and/or execution
+phase. Notwithstanding that, Target Code does not include data in any
+format that is used as a compiler intermediate representation, or used
+for producing a compiler intermediate representation.
+The "Compilation Process" transforms code entirely represented in
+non-intermediate languages designed for human-written code, and/or in
+Java Virtual Machine byte code, into Target Code. Thus, for example,
+use of source code generators and preprocessors need not be considered
+part of the Compilation Process, since the Compilation Process can be
+understood as starting with the output of the generators or
+preprocessors.
+A Compilation Process is "Eligible" if it is done using GCC, alone or
+with other GPL-compatible software, or if it is done without using any
+work based on GCC. For example, using non-GPL-compatible Software to
+optimize any GCC intermediate representations would not qualify as an
+Eligible Compilation Process.
+1. Grant of Additional Permission.
+You have permission to propagate a work of Target Code formed by
+combining the Runtime Library with Independent Modules, even if such
+propagation would otherwise violate the terms of GPLv3, provided that
+all Target Code was generated by Eligible Compilation Processes. You
+may then convey such a combination under terms of your choice,
+consistent with the licensing of the Independent Modules.
+2. No Weakening of GCC Copyleft.
+The availability of this Exception does not imply any general
+presumption that third-party software is unaffected by the copyleft
+requirements of the license of GCC.
+```
+
+### GNU GENERAL PUBLIC LICENSE v2
+
+```
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+                            Preamble
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+                            NO WARRANTY
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Also add information on how to contact you by electronic and paper mail.
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+```
+
+### GNU LESSER GENERAL PUBLIC LICENSE v3
+
+```
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+  0. Additional Definitions.
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+  1. Exception to Section 3 of the GNU GPL.
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+  2. Conveying Modified Versions.
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+  3. Object Code Incorporating Material from Library Header Files.
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+  4. Combined Works.
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+   d) Do one of the following:
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+  5. Combined Libraries.
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+  6. Revised Versions of the GNU Lesser General Public License.
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+```
+
+### GNU LESSER GENERAL PUBLIC LICENSE v2.1
+
+```
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+        51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+                            Preamble
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+    a) The modified work must itself be a software library.
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+                            NO WARRANTY
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+Also add information on how to contact you by electronic and paper mail.
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+That's all there is to it!
+```
+
+### GNU Free Documentation License v1.3
+
+```
+                GNU Free Documentation License
+                 Version 1.3, 3 November 2008
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+     <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+0. PREAMBLE
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+1. APPLICABILITY AND DEFINITIONS
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+2. VERBATIM COPYING
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+3. COPYING IN QUANTITY
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+4. MODIFICATIONS
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+5. COMBINING DOCUMENTS
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+6. COLLECTIONS OF DOCUMENTS
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+7. AGGREGATION WITH INDEPENDENT WORKS
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+8. TRANSLATION
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+9. TERMINATION
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+10. FUTURE REVISIONS OF THIS LICENSE
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.  If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+11. RELICENSING
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works.  A
+public wiki that anybody can edit is an example of such a server.  A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+"Incorporate" means to publish or republish a Document, in whole or in
+part, as part of another Document.
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
+(2) were thus incorporated prior to November 1, 2008.
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+ADDENDUM: How to use this License for your documents
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.3
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+```
+
+### The Regents of the University of California
+
+```
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. [rescinded 22 July 1999]
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+```
+
+### The Go Authors
+
+```
+Copyright (c) 2009 The Go Authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
+
+### Apache License v2.0
+
+```
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+   1. Definitions.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+   END OF TERMS AND CONDITIONS
+   APPENDIX: How to apply the Apache License to your work.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+   Copyright [yyyy] [name of copyright owner]
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
+
diff --git a/src/java.base/share/legal/zlib.md b/src/java.base/share/legal/zlib.md
index fcc5457bf5b..c729c4248d4 100644
--- a/src/java.base/share/legal/zlib.md
+++ b/src/java.base/share/legal/zlib.md
@@ -1,9 +1,9 @@
-## zlib v1.3.1
+## zlib v1.3.2
 
 ### zlib License
 <pre>
 
-Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 30661a3f387..8cfccff5abe 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 1994, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ To launch a source-file program:
 :   Specifies the name of the class to be launched. Command-line entries
     following `classname` are the arguments for the main method.
 
-`-jar` *jarfile*
+[`-jar`]{#-jar} *jarfile*
 :   Executes a program encapsulated in a JAR file. The *jarfile* argument is
     the name of a JAR file with a manifest that contains a line in the form
     `Main-Class:`*classname* that defines the class with the
@@ -70,7 +70,7 @@ To launch a source-file program:
     is the source of all user classes, and other class path settings are
     ignored. If you're using JAR files, then see [jar](jar.html).
 
-`-m` or `--module` *module*\[`/`*mainclass*\]
+[`-m`]{#-m} or `--module` *module*\[`/`*mainclass*\]
 :   Executes the main class in a module specified by *mainclass* if it is
     given, or, if it is not given, the value in the *module*. In other words,
     *mainclass* can be used when it is not specified by the module, or to
@@ -370,7 +370,7 @@ the JVM.
 > **Note:** To specify an argument for a long option, you can use either
 `--`*name*`=`*value* or `--`*name* *value*.
 
-`-agentlib:`*libname*\[`=`*options*\]
+[`-agentlib:`]{#-agentlib}*libname*\[`=`*options*\]
 :   Loads the specified native agent library. After the library name, a
     comma-separated list of options specific to the library can be used.
     If the option `-agentlib:foo` is specified, then the JVM attempts to
@@ -393,12 +393,12 @@ the JVM.
 
         >   `-agentlib:jdwp=transport=dt_socket,server=y,address=8000`
 
-`-agentpath:`*pathname*\[`=`*options*\]
+[`-agentpath:`]{#-agentpath}*pathname*\[`=`*options*\]
 :   Loads the native agent library specified by the absolute path name. This
     option is equivalent to `-agentlib` but uses the full path and file name of
     the library.
 
-`--class-path` *classpath*, `-classpath` *classpath*, or `-cp` *classpath*
+[`--class-path`]{#--class-path} *classpath*, `-classpath` *classpath*, or `-cp` *classpath*
 :   Specifies a list of directories, JAR files, and ZIP archives to search
     for class files.
 
@@ -424,15 +424,15 @@ the JVM.
     expanded except by querying the environment, such as by calling
     `System.getenv("CLASSPATH")`.
 
-`--disable-@files`
+[`--disable-@files`]{#--disable-@files}
 :   Can be used anywhere on the command line, including in an argument file, to
     prevent further `@filename` expansion. This option stops expanding
     `@`-argfiles after the option.
 
-`--enable-preview`
+[`--enable-preview`]{#--enable-preview}
 :   Allows classes to depend on [preview features](https://docs.oracle.com/en/java/javase/12/language/index.html#JSLAN-GUID-5A82FE0E-0CA4-4F1F-B075-564874FE2823) of the release.
 
-`--enable-native-access` *module*\[`,`*module*...\]
+[`--enable-native-access`]{#--enable-native-access} *module*\[`,`*module*...\]
 :   Native access involves access to code or data outside the Java runtime.
     This is generally unsafe and, if done incorrectly, might crash the JVM or result
     in memory corruption. Native access can occur as a result of calling a method that
@@ -465,7 +465,7 @@ the JVM.
     run it with `--illegal-native-access=deny` along with any necessary `--enable-native-access`
     options.
 
-`--enable-final-field-mutation` *module*\[,*module*...\]
+[`--enable-final-field-mutation`]{#--enable-final-field-mutation} *module*\[,*module*...\]
 :   Mutation of final fields is possible with the reflection API of the Java Platform.
     However, it compromises safety and performance in all programs.
     This option allows code in the specified modules to mutate final fields by reflection.
@@ -498,13 +498,13 @@ the JVM.
     run it with `--illegal-final-field-mutation=deny` along with any necessary
     `--enable-final-field-mutation` options.
 
-`--finalization=`*value*
+[`--finalization=`]{#--finalization}*value*
 :   Controls whether the JVM performs finalization of objects. Valid values
     are "enabled" and "disabled". Finalization is enabled by default, so the
     value "enabled" does nothing. The value "disabled" disables finalization,
     so that no finalizers are invoked.
 
-`--module-path` *modulepath*... or `-p` *modulepath*
+[`--module-path`]{#--module-path} *modulepath*... or `-p` *modulepath*
 :   Specifies where to find application modules with a list of path elements.
     The elements of a module path can be a file path to a module or a directory
     containing modules. Each module is either a modular JAR or an
@@ -513,7 +513,7 @@ the JVM.
     On Windows, semicolons (`;`) separate path elements in this list;
     on other platforms it is a colon (`:`).
 
-`--upgrade-module-path` *modulepath*...
+[`--upgrade-module-path`]{#--upgrade-module-path} *modulepath*...
 :   Specifies where to find module replacements of upgradeable modules in the
     runtime image with a list of path elements.
     The elements of a module path can be a file path to a module or a directory
@@ -523,33 +523,33 @@ the JVM.
     On Windows, semicolons (`;`) separate path elements in this list;
     on other platforms it is a colon (`:`).
 
-`--add-modules` *module*\[`,`*module*...\]
+[`--add-modules`]{#--add-modules} *module*\[`,`*module*...\]
 :   Specifies the root modules to resolve in addition to the initial module.
     *module* can also be `ALL-DEFAULT`, `ALL-SYSTEM`, and `ALL-MODULE-PATH`.
 
-`--list-modules`
+[`--list-modules`]{#--list-modules}
 :   Lists the observable modules and then exits.
 
-`-d` *module\_name* or `--describe-module` *module\_name*
+[`-d`]{#-d} *module\_name* or `--describe-module` *module\_name*
 :   Describes a specified module and then exits.
 
-`--dry-run`
+[`--dry-run`]{#--dry-run}
 :   Creates the VM but doesn't execute the main method. This `--dry-run` option
     might be useful for validating the command-line options such as the module
     system configuration.
 
-`--validate-modules`
+[`--validate-modules`]{#--validate-modules}
 :   Validates all modules and exit. This option is helpful for finding
     conflicts and other errors with modules on the module path.
 
-`-D`*property*`=`*value*
+[`-D`]{#-D}*property*`=`*value*
 :   Sets a system property value. The *property* variable is a string with no
     spaces that represents the name of the property. The *value* variable is a
     string that represents the value of the property. If *value* is a string
     with spaces, then enclose it in quotation marks (for example
     `-Dfoo="foo bar"`).
 
-`-disableassertions`\[`:`\[*packagename*\]...\|`:`*classname*\] or `-da`\[`:`\[*packagename*\]...\|`:`*classname*\]
+[`-disableassertions`]{#-disableassertions}\[`:`\[*packagename*\]...\|`:`*classname*\] or `-da`\[`:`\[*packagename*\]...\|`:`*classname*\]
 :   Disables assertions. By default, assertions are disabled in all packages
     and classes. With no arguments, `-disableassertions` (`-da`) disables
     assertions in all packages and classes. With the *packagename* argument
@@ -574,10 +574,10 @@ the JVM.
     >   `java -ea:com.wombat.fruitbat... -da:com.wombat.fruitbat.Brickbat
         MyClass`
 
-`-disablesystemassertions` or `-dsa`
+[`-disablesystemassertions`]{#-disablesystemassertions} or `-dsa`
 :   Disables assertions in all system classes.
 
-`-enableassertions`\[`:`\[*packagename*\]...\|`:`*classname*\] or `-ea`\[`:`\[*packagename*\]...\|`:`*classname*\]
+[`-enableassertions`]{#-enableassertions}\[`:`\[*packagename*\]...\|`:`*classname*\] or `-ea`\[`:`\[*packagename*\]...\|`:`*classname*\]
 :   Enables assertions. By default, assertions are disabled in all packages and
     classes. With no arguments, `-enableassertions` (`-ea`) enables assertions
     in all packages and classes. With the *packagename* argument ending in
@@ -604,28 +604,28 @@ the JVM.
     >   `java -ea:com.wombat.fruitbat... -da:com.wombat.fruitbat.Brickbat
         MyClass`
 
-`-enablesystemassertions` or `-esa`
+[`-enablesystemassertions`]{#-enablesystemassertions} or `-esa`
 :   Enables assertions in all system classes.
 
-`-help`, `-h`, or `-?`
+[`-help`]{#-help}, `-h`, or `-?`
 :   Prints the help message to the error stream.
 
-`--help`
+[`--help`]{#--help}
 :   Prints the help message to the output stream.
 
-`-javaagent:`*jarpath*\[`=`*options*\]
+[`-javaagent:`]{#-javaagent_}*jarpath*\[`=`*options*\]
 :   Loads the specified Java programming language agent. See `java.lang.instrument`.
 
-`--show-version`
+[`--show-version`]{#--show-version}
 :   Prints the product version to the output stream and continues.
 
-`-showversion`
+[`-showversion`]{#-showversion}
 :   Prints the product version to the error stream and continues.
 
-`--show-module-resolution`
+[`--show-module-resolution`]{#--show-module-resolution}
 :   Shows module resolution output during startup.
 
-`-splash:`*imagepath*
+[`-splash:`]{#-splash_}*imagepath*
 :   Shows the splash screen with the image specified by *imagepath*. HiDPI
     scaled images are automatically supported and used if available. The
     unscaled image file name, such as `image.ext`, should always be passed as
@@ -639,29 +639,29 @@ the JVM.
 
     See the SplashScreen API documentation for more information.
 
-`-verbose:class`
+[`-verbose:class`]{#-verbose_class}
 :   Displays information about each loaded class.
 
-`-verbose:gc`
+[`-verbose:gc`]{#-verbose_gc}
 :   Displays information about each garbage collection (GC) event.
 
-`-verbose:jni`
+[`-verbose:jni`]{#-verbose_jni}
 :   Displays information about the use of native methods and other Java Native
     Interface (JNI) activity.
 
-`-verbose:module`
+[`-verbose:module`]{#-verbose_module}
 :   Displays information about the modules in use.
 
-`--version`
+[`--version`]{#--version}
 :   Prints product version to the output stream and exits.
 
-`-version`
+[`-version`]{#-version}
 :   Prints product version to the error stream and exits.
 
-`-X`
+[`-X`]{#-X}
 :   Prints the help on extra options to the error stream.
 
-`--help-extra`
+[`--help-extra`]{#--help-extra}
 :   Prints the help on extra options to the output stream.
 
 `@`*argfile*
@@ -688,7 +688,7 @@ the JVM.
 The following `java` options are general purpose options that are specific to
 the Java HotSpot Virtual Machine.
 
-`-Xbatch`
+[`-Xbatch`]{#-Xbatch}
 :   Disables background compilation. By default, the JVM compiles the method as
     a background task, running the method in interpreter mode until the
     background compilation is finished. The `-Xbatch` flag disables background
@@ -696,14 +696,14 @@ the Java HotSpot Virtual Machine.
     task until completed. This option is equivalent to
     `-XX:-BackgroundCompilation`.
 
-`-Xbootclasspath/a:`*directories*\|*zip*\|*JAR-files*
+[`-Xbootclasspath/a:`]{#-Xbootclasspath}*directories*\|*zip*\|*JAR-files*
 :   Specifies a list of directories, JAR files, and ZIP archives to append to
     the end of the default bootstrap class path.
 
     On Windows, semicolons (`;`) separate entities in this list;
     on other platforms it is a colon (`:`).
 
-`-Xcheck:jni`
+[`-Xcheck:jni`]{#-Xcheck_jni}
 :   Performs additional checks for Java Native Interface (JNI) functions.
 
     The following checks are considered indicative of significant problems
@@ -739,22 +739,22 @@ the Java HotSpot Virtual Machine.
 
     Expect a performance degradation when this option is used.
 
-`-Xcomp`
+[`-Xcomp`]{#-Xcomp}
 :   Testing mode to exercise JIT compilers. This option should not be used in production environments.
 
-`-Xdebug`
+[`-Xdebug`]{#-Xdebug}
 :   Does nothing; deprecated for removal in a future release.
 
-`-Xdiag`
+[`-Xdiag`]{#-Xdiag}
 :   Shows additional diagnostic messages.
 
-`-Xint`
+[`-Xint`]{#-Xint}
 :   Runs the application in interpreted-only mode. Compilation to native code
     is disabled, and all bytecode is executed by the interpreter. The
     performance benefits offered by the just-in-time (JIT) compiler aren't
     present in this mode.
 
-`-Xinternalversion`
+[`-Xinternalversion`]{#-Xinternalversion}
 :   Displays more detailed JVM version information than the `-version` option,
     and then exits.
 
@@ -763,11 +763,11 @@ the Java HotSpot Virtual Machine.
     logging framework. See [Enable Logging with the JVM Unified Logging
     Framework].
 
-`-Xmixed`
+[`-Xmixed`]{#-Xmixed}
 :   Executes all bytecode by the interpreter except for hot methods, which are
     compiled to native code. On by default. Use `-Xint` to switch off.
 
-`-Xmn` *size*
+[`-Xmn`]{#-Xmn} *size*
 :   Sets the initial and maximum size (in bytes) of the heap for the young
     generation (nursery) in the generational collectors. Append the letter
     `k` or `K` to indicate kilobytes, `m` or `M` to indicate megabytes, or
@@ -793,7 +793,7 @@ the Java HotSpot Virtual Machine.
     the heap for the young generation, you can use `-XX:NewSize` to set the
     initial size and `-XX:MaxNewSize` to set the maximum size.
 
-`-Xms` *size*
+[`-Xms`]{#-Xms} *size*
 :   Sets the minimum and the initial size (in bytes) of the heap. This value
     must be a multiple of 1024 and greater than 1 MB. Append the letter `k` or
     `K` to indicate kilobytes, `m` or `M` to indicate megabytes, or `g` or `G`
@@ -815,7 +815,7 @@ the Java HotSpot Virtual Machine.
     initial heap size. If it appears after `-Xms` on the command line, then the
     initial heap size gets set to the value specified with `-XX:InitialHeapSize`.
 
-`-Xmx` *size*
+[`-Xmx`]{#-Xmx} *size*
 :   Specifies the maximum size (in bytes) of the heap. This value
     must be a multiple of 1024 and greater than 2 MB. Append the letter `k` or
     `K` to indicate kilobytes, `m` or `M` to indicate megabytes, or `g` or `G`
@@ -832,7 +832,7 @@ the Java HotSpot Virtual Machine.
 
     The `-Xmx` option is equivalent to `-XX:MaxHeapSize`.
 
-`-Xnoclassgc`
+[`-Xnoclassgc`]{#-Xnoclassgc}
 :   Disables garbage collection (GC) of classes. This can save some GC time,
     which shortens interruptions during the application run. When you specify
     `-Xnoclassgc` at startup, the class objects in the application are left
@@ -840,7 +840,7 @@ the Java HotSpot Virtual Machine.
     more memory being permanently occupied which, if not used carefully, throws
     an out-of-memory exception.
 
-`-Xrs`
+[`-Xrs`]{#-Xrs}
 :   Reduces the use of operating system signals by the JVM. Shutdown hooks
     enable the orderly shutdown of a Java application by running user cleanup
     code (such as closing database connections) at shutdown, even if the JVM
@@ -890,7 +890,7 @@ the Java HotSpot Virtual Machine.
     User code is responsible for causing shutdown hooks to run, for example, by
     calling `System.exit()` when the JVM is to be terminated.
 
-`-Xshare:`*mode*
+[`-Xshare:`]{#-Xshare_}*mode*
 :   Sets the class data sharing (CDS) mode.
 
     Possible *mode* arguments for this option include the following:
@@ -910,10 +910,10 @@ the Java HotSpot Virtual Machine.
     `off`
     :   Do not attempt to use shared class data.
 
-`-XshowSettings`
+[`-XshowSettings`]{#-XshowSettings}
 :   Shows all settings and then continues.
 
-`-XshowSettings:`*category*
+[`-XshowSettings:`]{#-XshowSettings_}*category*
 :   Shows settings and continues. Possible *category* arguments for this option
     include the following:
 
@@ -942,7 +942,7 @@ the Java HotSpot Virtual Machine.
     `system`
     :   **Linux only:** Shows host system or container configuration and continues.
 
-`-Xss` *size*
+[`-Xss`]{#-Xss} *size*
 :   Sets the thread stack size (in bytes). Append the letter `k` or `K` to
     indicate KB, `m` or `M` to indicate MB, or `g` or `G` to indicate GB. The
     actual size may be rounded up to a multiple of the system page size as
@@ -970,32 +970,32 @@ the Java HotSpot Virtual Machine.
 
     This option is similar to `-XX:ThreadStackSize`.
 
-`--add-reads` *module*`=`*target-module*(`,`*target-module*)\*
+[`--add-reads`]{#--add-reads} *module*`=`*target-module*(`,`*target-module*)\*
 :   Updates *module* to read the *target-module*, regardless of the module
     declaration. *target-module* can be `ALL-UNNAMED` to read all unnamed
     modules.
 
-`--add-exports` *module*`/`*package*`=`*target-module*(`,`*target-module*)\*
+[`--add-exports`]{#--add-exports} *module*`/`*package*`=`*target-module*(`,`*target-module*)\*
 :   Updates *module* to export *package* to *target-module*, regardless of
     module declaration. *target-module* can be `ALL-UNNAMED` to export to all
     unnamed modules.
 
-`--add-opens` *module*`/`*package*`=`*target-module*(`,`*target-module*)\*
+[`--add-opens`]{#--add-opens} *module*`/`*package*`=`*target-module*(`,`*target-module*)\*
 :   Updates *module* to open *package* to *target-module*, regardless of module
     declaration.
 
-`--limit-modules` *module*\[`,`*module*...\]
+[`--limit-modules`]{#--limit-modules} *module*\[`,`*module*...\]
 :   Specifies the limit of the universe of observable modules.
 
-`--patch-module` *module*`=`*file*(`;`*file*)\*
+[`--patch-module`]{#--patch-module} *module*`=`*file*(`;`*file*)\*
 :   Overrides or augments a module with classes and resources in JAR files or
     directories.
 
-`--source` *version*
+[`--source`]{#--source} *version*
 :   Sets the version of the source in source-file mode.
 
 
-`--sun-misc-unsafe-memory-access=` *value*
+[`--sun-misc-unsafe-memory-access=`]{#--sun-misc-unsafe-memory-access} *value*
 :   Allow or deny usage of unsupported API `sun.misc.Unsafe`. *value* is one of:
 
     `allow`
@@ -1021,20 +1021,20 @@ the Java HotSpot Virtual Machine.
 
 The following extra options are macOS specific.
 
-`-XstartOnFirstThread`
+[`-XstartOnFirstThread`]{#-XstartOnFirstThread}
 :   Runs the `main()` method on the first (AppKit) thread.
 
-`-Xdock:name=`*application\_name*
+[`-Xdock:name=`]{#-Xdock_name}*application\_name*
 :   Overrides the default application name displayed in dock.
 
-`-Xdock:icon=`*path\_to\_icon\_file*
+[`-Xdock:icon=`]{#-Xdock_icon}*path\_to\_icon\_file*
 :   Overrides the default icon displayed in dock.
 
 ## Advanced Options for Java
 
 These `java` options can be used to enable other advanced options.
 
-`-XX:+UnlockDiagnosticVMOptions`
+[`-XX:+UnlockDiagnosticVMOptions`]{#-XX__UnlockDiagnosticVMOptions}
 :   Unlocks the options intended for diagnosing the JVM. By default, this
     option is disabled and diagnostic options aren't available.
 
@@ -1046,7 +1046,7 @@ These `java` options can be used to enable other advanced options.
     of these options may be removed or their behavior changed without any
     warning.
 
-`-XX:+UnlockExperimentalVMOptions`
+[`-XX:+UnlockExperimentalVMOptions`]{#-XX__UnlockExperimentalVMOptions}
 :   Unlocks the options that provide experimental features in the JVM.
     By default, this option is disabled and experimental features aren't available.
 
@@ -1054,7 +1054,7 @@ These `java` options can be used to enable other advanced options.
 
 These `java` options control the runtime behavior of the Java HotSpot VM.
 
-`-XX:ActiveProcessorCount=`*x*
+[`-XX:ActiveProcessorCount=`]{#-XX_ActiveProcessorCount}*x*
 :   Overrides the number of CPUs that the VM will use to calculate the size of
     thread pools it will use for various operations such as Garbage Collection
     and ForkJoinPool.
@@ -1066,7 +1066,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     `-XX:-UseContainerSupport` for a description of enabling and disabling
     container support.
 
-`-XX:AllocateHeapAt=`*path*
+[`-XX:AllocateHeapAt=`]{#-XX_AllocateHeapAt}*path*
 :   Takes a path to the file system and uses memory mapping to allocate the
     object heap on the memory device. Using this option enables the HotSpot VM
     to allocate the Java object heap on an alternative memory device, such as
@@ -1084,7 +1084,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     The existing heap related flags (such as `-Xmx` and `-Xms`) and
     garbage-collection related flags continue to work as before.
 
-`-XX:-CompactStrings`
+[`-XX:-CompactStrings`]{#-XX__CompactStrings}
 :   Disables the Compact Strings feature. By default, this option is enabled.
     When this option is enabled, Java Strings containing only single-byte
     characters are internally represented and stored as
@@ -1107,7 +1107,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
     In both of these scenarios, disabling Compact Strings makes sense.
 
-`-XX:ErrorFile=`*filename*
+[`-XX:ErrorFile=`]{#-XX_ErrorFile}*filename*
 :   Specifies the path and file name to which error data is written when an
     irrecoverable error occurs. By default, this file is created in the current
     working directory and named `hs_err_pid`*pid*`.log` where *pid* is the
@@ -1139,7 +1139,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
         `TMP` environment variable; if that environment variable isn't defined,
         then the value of the `TEMP` environment variable is used.
 
-`-XX:+ExtensiveErrorReports`
+[`-XX:+ExtensiveErrorReports`]{#-XX__ExtensiveErrorReports}
 :   Enables the reporting of more extensive error information in the `ErrorFile`.
     This option can be turned on in environments where maximal information is
     desired - even if the resulting logs may be quite large and/or contain
@@ -1147,7 +1147,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     from release to release, and across different platforms. By default this
     option is disabled.
 
-`-XX:FlightRecorderOptions=`*parameter*`=`*value* (or) `-XX:FlightRecorderOptions:`*parameter*`=`*value*
+[`-XX:FlightRecorderOptions=`]{#-XX_FlightRecorderOptions}*parameter*`=`*value* (or) `-XX:FlightRecorderOptions:`*parameter*`=`*value*
 :   Sets the parameters that control the behavior of JFR. Multiple parameters can be specified
     by separating them with a comma.
 
@@ -1207,7 +1207,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
         4 kilobytes. Overriding this parameter
         could reduce performance and is not recommended.
 
-`-XX:LargePageSizeInBytes=`*size*
+[`-XX:LargePageSizeInBytes=`]{#-XX_LargePageSizeInBytes}*size*
 :   Sets the maximum large page size (in bytes) used by the JVM. The
     *size* argument must be a valid page size supported by the environment
     to have any effect. Append the letter `k` or `K` to indicate kilobytes,
@@ -1221,7 +1221,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
     >   `-XX:LargePageSizeInBytes=1g`
 
-`-XX:MaxDirectMemorySize=`*size*
+[`-XX:MaxDirectMemorySize=`]{#-XX_MaxDirectMemorySize}*size*
 :   Sets the maximum total size (in bytes) of the `java.nio` package,
     direct-buffer allocations. Append the letter `k` or `K` to indicate
     kilobytes, `m` or `M` to indicate megabytes, or `g` or `G` to indicate
@@ -1237,14 +1237,14 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     -XX:MaxDirectMemorySize=1048576
     ```
 
-`-XX:-MaxFDLimit`
+[`-XX:-MaxFDLimit`]{#-XX__MaxFDLimit}
 :   Disables the attempt to set the soft limit for the number of open file
     descriptors to the hard limit. By default, this option is enabled on all
     platforms, but is ignored on Windows. The only time that you may need to
     disable this is on macOS, where its use imposes a maximum of 10240, which
     is lower than the actual system maximum.
 
-`-XX:NativeMemoryTracking=`*mode*
+[`-XX:NativeMemoryTracking=`]{#-XX_NativeMemoryTracking}*mode*
 :   Specifies the mode for tracking JVM native memory usage. Possible *mode*
     arguments for this option include the following:
 
@@ -1261,7 +1261,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
         usage by individual `CallSite`, individual virtual memory region and
         its committed regions.
 
-`-XX:TrimNativeHeapInterval=`*millis*
+[`-XX:TrimNativeHeapInterval=`]{#-XX_TrimNativeHeapInterval}*millis*
 :   Interval, in ms, at which the JVM will trim the native heap. Lower values
     will reclaim memory more eagerly at the cost of higher overhead. A value
     of 0 (default) disables native heap trimming.
@@ -1269,7 +1269,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
     This option is only supported on Linux with GNU C Library (glibc).
 
-`-XX:ObjectAlignmentInBytes=`*alignment*
+[`-XX:ObjectAlignmentInBytes=`]{#-XX_ObjectAlignmentInBytes}*alignment*
 :   Sets the memory alignment of Java objects (in bytes). By default, the value
     is set to 8 bytes. The specified value should be a power of 2, and must be
     within the range of 8 and 256 (inclusive). This option makes it possible to
@@ -1283,7 +1283,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     increases. As a result, you may not realize any benefits from using
     compressed pointers with large Java heap sizes.
 
-`-XX:OnError=`*string*
+[`-XX:OnError=`]{#-XX_OnError}*string*
 :   Sets a custom command or a series of semicolon-separated commands to run
     when an irrecoverable error occurs. If the string contains spaces, then it
     must be enclosed in quotation marks.
@@ -1304,7 +1304,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
         >   `-XX:OnError="userdump.exe %p"`
 
-`-XX:OnOutOfMemoryError=`*string*
+[`-XX:OnOutOfMemoryError=`]{#-XX_OnOutOfMemoryError}*string*
 :   Sets a custom command or a series of semicolon-separated commands to run
     when an `OutOfMemoryError` exception is first thrown by the JVM.
     If the string
@@ -1316,31 +1316,31 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     directly from Java code, nor by the JVM for other types of resource
     exhaustion (such as native thread creation errors).
 
-`-XX:+PrintCommandLineFlags`
+[`-XX:+PrintCommandLineFlags`]{#-XX__PrintCommandLineFlags}
 :   Enables printing of ergonomically selected JVM flags that appeared on the
     command line. It can be useful to know the ergonomic values set by the JVM,
     such as the heap space size and the selected garbage collector. By default,
     this option is disabled and flags aren't printed.
 
-`-XX:+PreserveFramePointer`
+[`-XX:+PreserveFramePointer`]{#-XX__PreserveFramePointer}
 :   Selects between using the RBP register as a general purpose register
     (`-XX:-PreserveFramePointer`) and using the RBP register to hold the frame
     pointer of the currently executing method (`-XX:+PreserveFramePointer`). If
     the frame pointer is available, then external profiling tools (for example,
     Linux perf) can construct more accurate stack traces.
 
-`-XX:+PrintNMTStatistics`
+[`-XX:+PrintNMTStatistics`]{#-XX__PrintNMTStatistics}
 :   Enables printing of collected native memory tracking data at JVM exit when
     native memory tracking is enabled (see `-XX:NativeMemoryTracking`). By
     default, this option is disabled and native memory tracking data isn't
     printed.
 
-`-XX:SharedArchiveFile=`*path*
+[`-XX:SharedArchiveFile=`]{#-XX_SharedArchiveFile}*path*
 :   Specifies the path and name of the class data sharing (CDS) archive file
 
     See [Application Class Data Sharing].
 
-`-XX:+VerifySharedSpaces`
+[`-XX:+VerifySharedSpaces`]{#-XX__VerifySharedSpaces}
 :   If this option is specified, the JVM will load a CDS archive file only if it
     passes an integrity check based on CRC32 checksums. The purpose of this flag is
     to check for unintentional damage to CDS archive files in transmission or storage.
@@ -1348,10 +1348,10 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     ensure that the CDS archive files used by Java applications cannot be modified without
     proper authorization.
 
-`-XX:SharedArchiveConfigFile=`*shared\_config\_file*
+[`-XX:SharedArchiveConfigFile=`]{#-XX_SharedArchiveConfigFile}*shared\_config\_file*
 :   Specifies additional shared data added to the archive file.
 
-`-XX:SharedClassListFile=`*file\_name*
+[`-XX:SharedClassListFile=`]{#-XX_SharedClassListFile}*file\_name*
 :   Specifies the text file that contains the names of the classes to store in
     the class data sharing (CDS) archive. This file contains the full name of
     one class per line, except slashes (`/`) replace dots (`.`). For example,
@@ -1369,7 +1369,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
     See [Application Class Data Sharing].
 
-`-XX:+ShowCodeDetailsInExceptionMessages`
+[`-XX:+ShowCodeDetailsInExceptionMessages`]{#-XX__ShowCodeDetailsInExceptionMessages}
 :   Enables printing of improved `NullPointerException` messages. When an application throws a
     `NullPointerException`, the option enables the JVM to analyze the program's bytecode
     instructions to determine precisely which reference is `null`,
@@ -1378,13 +1378,13 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     and will be printed as the exception message along with
     the method, filename, and line number. By default, this option is enabled.
 
-`-XX:+ShowMessageBoxOnError`
+[`-XX:+ShowMessageBoxOnError`]{#-XX__ShowMessageBoxOnError}
 :   Enables the display of a dialog box when the JVM experiences an
     irrecoverable error. This prevents the JVM from exiting and keeps the
     process active so that you can attach a debugger to it to investigate the
     cause of the error. By default, this option is disabled.
 
-`-XX:StartFlightRecording:`*parameter*`=`*value*
+[`-XX:StartFlightRecording:`]{#-XX_StartFlightRecording_}*parameter*`=`*value*
 :   Starts a JFR recording for the Java application. This option is equivalent
     to the `JFR.start` diagnostic command that starts a recording during
     runtime. `-XX:StartFlightRecording:help` prints available options and
@@ -1503,7 +1503,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     To only see warnings and errors from JFR during startup set
     -Xlog:jfr+startup=warning.
 
-`-XX:ThreadStackSize=`*size*
+[`-XX:ThreadStackSize=`]{#-XX_ThreadStackSize}*size*
 :   Sets the Java thread stack size (in kilobytes). Use of a scaling suffix,
     such as `k`, results in the scaling of the kilobytes value so that
     `-XX:ThreadStackSize=1k` sets the Java thread stack size to 1024\*1024
@@ -1529,7 +1529,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 
     This option is similar to `-Xss`.
 
-`-XX:+UseCompactObjectHeaders`
+[`-XX:+UseCompactObjectHeaders`]{#-XX__UseCompactObjectHeaders}
 :   Enables compact object headers. By default, this option is disabled.
     Enabling this option reduces memory footprint in the Java heap by
     4 bytes per object (on average) and often improves performance.
@@ -1538,7 +1538,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     In a future release it is expected to be enabled by default, and
     eventually will be the only mode of operation.
 
-`-XX:-UseCompressedOops`
+[`-XX:-UseCompressedOops`]{#-XX__UseCompressedOops}
 :   Disables the use of compressed pointers. By default, this option is
     enabled, and compressed pointers are used. This will automatically limit
     the maximum ergonomically determined Java heap size to the maximum amount
@@ -1553,7 +1553,7 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     It's possible to use compressed pointers with Java heap sizes greater than
     32 GB. See the `-XX:ObjectAlignmentInBytes` option.
 
-`-XX:-UseContainerSupport`
+[`-XX:-UseContainerSupport`]{#-XX__UseContainerSupport}
 :   **Linux only:** The VM now provides automatic container detection support, which allows the
     VM to determine the amount of memory and number of processors that are
     available to a Java process running in docker containers. It uses this
@@ -1568,28 +1568,28 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
     information. See [Enable Logging with the JVM Unified Logging Framework]
     for a description of using Unified Logging.
 
-`-XX:+UseLargePages`
+[`-XX:+UseLargePages`]{#-XX__UseLargePages}
 :   Enables the use of large page memory. By default, this option is disabled
     and large page memory isn't used.
 
     See [Large Pages].
 
-`-XX:+UseTransparentHugePages`
+[`-XX:+UseTransparentHugePages`]{#-XX__UseTransparentHugePages}
 :   **Linux only:** Enables the use of large pages that can dynamically grow or
     shrink. This option is disabled by default. You may encounter performance
     problems with transparent huge pages as the OS moves other pages around to
     create huge pages; this option is made available for experimentation.
 
-`-XX:+AllowUserSignalHandlers`
+[`-XX:+AllowUserSignalHandlers`]{#-XX__AllowUserSignalHandlers}
 :   **Non-Windows:** Enables installation of signal handlers by the application. By default,
     this option is disabled and the application isn't allowed to install signal
     handlers.
 
-`-XX:VMOptionsFile=`*filename*
+[`-XX:VMOptionsFile=`]{#-XX_VMOptionsFile}*filename*
 :   Allows user to specify VM options in a file, for example,
     `java -XX:VMOptionsFile=/var/my_vm_options HelloWorld`.
 
-`-XX:UseBranchProtection=`*mode*
+[`-XX:UseBranchProtection=`]{#-XX_UseBranchProtection}*mode*
 :   **Linux AArch64 only:** Specifies the branch protection mode.
     All options other than
     `none` require the VM to have been built with branch protection
@@ -1613,14 +1613,14 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
 These `java` options control the dynamic just-in-time (JIT) compilation
 performed by the Java HotSpot VM.
 
-`-XX:AllocateInstancePrefetchLines=`*lines*
+[`-XX:AllocateInstancePrefetchLines=`]{#-XX_AllocateInstancePrefetchLines}*lines*
 :   Sets the number of lines to prefetch ahead of the instance allocation
     pointer. By default, the number of lines to prefetch is set to 1:
 
     >   `-XX:AllocateInstancePrefetchLines=1`
 
 
-`-XX:AllocatePrefetchDistance=`*size*
+[`-XX:AllocatePrefetchDistance=`]{#-XX_AllocatePrefetchDistance}*size*
 :   Sets the size (in bytes) of the prefetch distance for object allocation.
     Memory about to be written with the value of new objects is prefetched up
     to this distance starting from the address of the last allocated object.
@@ -1636,7 +1636,7 @@ performed by the Java HotSpot VM.
     >   `-XX:AllocatePrefetchDistance=1024`
 
 
-`-XX:AllocatePrefetchInstr=`*instruction*
+[`-XX:AllocatePrefetchInstr=`]{#-XX_AllocatePrefetchInstr}*instruction*
 :   Sets the prefetch instruction to prefetch ahead of the allocation pointer.
     Possible values are from 0 to 3. The actual instructions behind the values
     depend on the platform. By default, the prefetch instruction is set to 0:
@@ -1644,7 +1644,7 @@ performed by the Java HotSpot VM.
     >   `-XX:AllocatePrefetchInstr=0`
 
 
-`-XX:AllocatePrefetchLines=`*lines*
+[`-XX:AllocatePrefetchLines=`]{#-XX_AllocatePrefetchLines}*lines*
 :   Sets the number of cache lines to load after the last object allocation by
     using the prefetch instructions generated in compiled code. The default
     value is 1 if the last allocated object was an instance, and 3 if it was an
@@ -1656,7 +1656,7 @@ performed by the Java HotSpot VM.
     >   `-XX:AllocatePrefetchLines=5`
 
 
-`-XX:AllocatePrefetchStepSize=`*size*
+[`-XX:AllocatePrefetchStepSize=`]{#-XX_AllocatePrefetchStepSize}*size*
 :   Sets the step size (in bytes) for sequential prefetch instructions. Append
     the letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate
     megabytes, `g` or `G` to indicate gigabytes. By default, the step size is
@@ -1665,7 +1665,7 @@ performed by the Java HotSpot VM.
     >   `-XX:AllocatePrefetchStepSize=16`
 
 
-`-XX:AllocatePrefetchStyle=`*style*
+[`-XX:AllocatePrefetchStyle=`]{#-XX_AllocatePrefetchStyle}*style*
 :   Sets the generated code style for prefetch instructions. The *style*
     argument is an integer from 0 to 3:
 
@@ -1684,12 +1684,12 @@ performed by the Java HotSpot VM.
     :   Generate one prefetch instruction per cache line.
 
 
-`-XX:+BackgroundCompilation`
+[`-XX:+BackgroundCompilation`]{#-XX__BackgroundCompilation}
 :   Enables background compilation. This option is enabled by default. To
     disable background compilation, specify `-XX:-BackgroundCompilation` (this
     is equivalent to specifying `-Xbatch`).
 
-`-XX:CICompilerCount=`*threads*
+[`-XX:CICompilerCount=`]{#-XX_CICompilerCount}*threads*
 :   Sets the number of compiler threads to use for compilation.
     By default, the number of compiler threads is selected automatically
     depending on the number of CPUs and memory available for compiled code.
@@ -1697,11 +1697,11 @@ performed by the Java HotSpot VM.
 
     >   `-XX:CICompilerCount=2`
 
-`-XX:+UseDynamicNumberOfCompilerThreads`
+[`-XX:+UseDynamicNumberOfCompilerThreads`]{#-XX__UseDynamicNumberOfCompilerThreads}
 :   Dynamically create compiler thread up to the limit specified by `-XX:CICompilerCount`.
     This option is enabled by default.
 
-`-XX:CompileCommand=`*command*`,`*method*\[`,`*option*\]
+[`-XX:CompileCommand=`]{#-XX_CompileCommand}*command*`,`*method*\[`,`*option*\]
 :   Specifies a *command* to perform on a *method*. For example, to exclude the
     `indexOf()` method of the `String` class from being compiled, use the
     following:
@@ -1800,7 +1800,7 @@ performed by the Java HotSpot VM.
         You can suppress this by specifying the `-XX:CompileCommand=quiet`
         option before other `-XX:CompileCommand` options.
 
-`-XX:CompileCommandFile=`*filename*
+[`-XX:CompileCommandFile=`]{#-XX_CompileCommandFile}*filename*
 :   Sets the file from which JIT compiler commands are read. By default, the
     `.hotspot_compiler` file is used to store commands performed by the JIT
     compiler.
@@ -1814,7 +1814,7 @@ performed by the Java HotSpot VM.
     If you're using commands for the JIT compiler to perform on methods, then
     see the `-XX:CompileCommand` option.
 
-`-XX:CompilerDirectivesFile=`*file*
+[`-XX:CompilerDirectivesFile=`]{#-XX_CompilerDirectivesFile}*file*
 :   Adds directives from a file to the directives stack when a program starts.
     See [Compiler Control](https://docs.oracle.com/en/java/javase/12/vm/compiler-control1.html#GUID-94AD8194-786A-4F19-BFFF-278F8E237F3A).
 
@@ -1822,14 +1822,14 @@ performed by the Java HotSpot VM.
     `-XX:UnlockDiagnosticVMOptions` option that unlocks diagnostic JVM options.
 
 
-`-XX:+CompilerDirectivesPrint`
+[`-XX:+CompilerDirectivesPrint`]{#-XX__CompilerDirectivesPrint}
 :   Prints the directives stack when the program starts or when a new directive
     is added.
 
     The `-XX:+CompilerDirectivesPrint` option has to be used together with the
     `-XX:UnlockDiagnosticVMOptions` option that unlocks diagnostic JVM options.
 
-`-XX:CompileOnly=`*methods*
+[`-XX:CompileOnly=`]{#-XX_CompileOnly}*methods*
 :   Sets the list of methods (separated by commas) to which compilation should
     be restricted. Only the specified methods are compiled.
 
@@ -1841,7 +1841,7 @@ performed by the Java HotSpot VM.
     -XX:CompileCommand=compileonly,methodN
     ```
 
-`-XX:CompileThresholdScaling=`*scale*
+[`-XX:CompileThresholdScaling=`]{#-XX_CompileThresholdScaling}*scale*
 :   Provides unified control of first compilation. This option controls when
     methods are first compiled for both the tiered and the nontiered modes of
     operation. The `CompileThresholdScaling` option has a floating point value
@@ -1851,11 +1851,11 @@ performed by the Java HotSpot VM.
     compilation while values greater than 1.0 delay compilation. Setting
     `CompileThresholdScaling` to 0 is equivalent to disabling compilation.
 
-`-XX:+DoEscapeAnalysis`
+[`-XX:+DoEscapeAnalysis`]{#-XX__DoEscapeAnalysis}
 :   Enables the use of escape analysis. This option is enabled by default. To
     disable the use of escape analysis, specify `-XX:-DoEscapeAnalysis`.
 
-`-XX:InitialCodeCacheSize=`*size*
+[`-XX:InitialCodeCacheSize=`]{#-XX_InitialCodeCacheSize}*size*
 :   Sets the initial code cache size (in bytes). Append the letter `k` or `K`
     to indicate kilobytes, `m` or `M` to indicate megabytes, or `g` or `G` to
     indicate gigabytes. The default value depends on the platform. The initial code
@@ -1865,11 +1865,11 @@ performed by the Java HotSpot VM.
 
     >   `-XX:InitialCodeCacheSize=32k`
 
-`-XX:+Inline`
+[`-XX:+Inline`]{#-XX__Inline}
 :   Enables method inlining. This option is enabled by default to increase
     performance. To disable method inlining, specify `-XX:-Inline`.
 
-`-XX:InlineSmallCode=`*size*
+[`-XX:InlineSmallCode=`]{#-XX_InlineSmallCode}*size*
 :   Sets the maximum code size (in bytes) for already compiled methods
     that may be inlined. This flag only applies to the C2 compiler.
     Append the letter `k` or `K` to indicate kilobytes,
@@ -1879,7 +1879,7 @@ performed by the Java HotSpot VM.
 
     >   `-XX:InlineSmallCode=1000`
 
-`-XX:+LogCompilation`
+[`-XX:+LogCompilation`]{#-XX__LogCompilation}
 :   Enables logging of compilation activity to a file named `hotspot.log` in
     the current working directory. You can specify a different log file path
     and name using the `-XX:LogFile` option.
@@ -1893,7 +1893,7 @@ performed by the Java HotSpot VM.
     `-XX:+PrintCompilation` option.
 
 
-`-XX:FreqInlineSize=`*size*
+[`-XX:FreqInlineSize=`]{#-XX_FreqInlineSize}*size*
 :   Sets the maximum bytecode size (in bytes) of a hot method to be inlined.
     This flag only applies to the C2 compiler. Append
     the letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate
@@ -1903,7 +1903,7 @@ performed by the Java HotSpot VM.
     >   `-XX:FreqInlineSize=325`
 
 
-`-XX:MaxInlineSize=`*size*
+[`-XX:MaxInlineSize=`]{#-XX_MaxInlineSize}*size*
 :   Sets the maximum bytecode size (in bytes) of a cold method to be inlined.
     This flag only applies to the C2 compiler.
     Append the letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate
@@ -1912,7 +1912,7 @@ performed by the Java HotSpot VM.
 
     >   `-XX:MaxInlineSize=35`
 
-`-XX:C1MaxInlineSize=`*size*
+[`-XX:C1MaxInlineSize=`]{#-XX_C1MaxInlineSize}*size*
 :   Sets the maximum bytecode size (in bytes) of a cold method to be inlined.
     This flag only applies to the C1 compiler.
     Append the letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate
@@ -1921,7 +1921,7 @@ performed by the Java HotSpot VM.
 
     >   `-XX:MaxInlineSize=35`
 
-`-XX:MaxTrivialSize=`*size*
+[`-XX:MaxTrivialSize=`]{#-XX_MaxTrivialSize}*size*
 :   Sets the maximum bytecode size (in bytes) of a trivial method to be
     inlined. This flag only applies to the C2 compiler.
     Append the letter `k` or `K` to indicate kilobytes, `m` or `M` to
@@ -1930,7 +1930,7 @@ performed by the Java HotSpot VM.
 
     >   `-XX:MaxTrivialSize=6`
 
-`-XX:C1MaxTrivialSize=`*size*
+[`-XX:C1MaxTrivialSize=`]{#-XX_C1MaxTrivialSize}*size*
 :   Sets the maximum bytecode size (in bytes) of a trivial method to be
     inlined. This flag only applies to the C1 compiler.
     Append the letter `k` or `K` to indicate kilobytes, `m` or `M` to
@@ -1939,14 +1939,14 @@ performed by the Java HotSpot VM.
 
     >   `-XX:MaxTrivialSize=6`
 
-`-XX:MaxNodeLimit=`*nodes*
+[`-XX:MaxNodeLimit=`]{#-XX_MaxNodeLimit}*nodes*
 :   Sets the maximum number of nodes to be used during single method
     compilation. By default the value depends on the features enabled.
     In the following example the maximum number of nodes is set to 100,000:
 
     >   `-XX:MaxNodeLimit=100000`
 
-`-XX:NonNMethodCodeHeapSize=`*size*
+[`-XX:NonNMethodCodeHeapSize=`]{#-XX_NonNMethodCodeHeapSize}*size*
 :   Sets the size in bytes of the code segment containing nonmethod code.
 
     A nonmethod code segment containing nonmethod code, such as compiler
@@ -1954,16 +1954,16 @@ performed by the Java HotSpot VM.
     cache forever. This flag is used only if `-XX:SegmentedCodeCache` is
     enabled.
 
-`-XX:NonProfiledCodeHeapSize=`*size*
+[`-XX:NonProfiledCodeHeapSize=`]{#-XX_NonProfiledCodeHeapSize}*size*
 :   Sets the size in bytes of the code segment containing nonprofiled methods.
     This flag is used only if `-XX:SegmentedCodeCache` is enabled.
 
-`-XX:+OptimizeStringConcat`
+[`-XX:+OptimizeStringConcat`]{#-XX__OptimizeStringConcat}
 :   Enables the optimization of `String` concatenation operations. This option
     is enabled by default. To disable the optimization of `String`
     concatenation operations, specify `-XX:-OptimizeStringConcat`.
 
-`-XX:+PrintAssembly`
+[`-XX:+PrintAssembly`]{#-XX__PrintAssembly}
 :   Enables printing of assembly code for bytecoded and native methods by using
     the external `hsdis-<arch>.so` or `.dll` library. For 64-bit VM on Windows,
     it's `hsdis-amd64.dll`. This lets you to see the generated code, which may
@@ -1973,11 +1973,11 @@ performed by the Java HotSpot VM.
     `-XX:+PrintAssembly` option has to be used together with the
     `-XX:UnlockDiagnosticVMOptions` option that unlocks diagnostic JVM options.
 
-`-XX:ProfiledCodeHeapSize=`*size*
+[`-XX:ProfiledCodeHeapSize=`]{#-XX_ProfiledCodeHeapSize}*size*
 :   Sets the size in bytes of the code segment containing profiled methods.
     This flag is used only if `-XX:SegmentedCodeCache` is enabled.
 
-`-XX:+PrintCompilation`
+[`-XX:+PrintCompilation`]{#-XX__PrintCompilation}
 :   Enables verbose diagnostic output from the JVM by printing a message to the
     console every time a method is compiled. This lets you to see which methods
     actually get compiled. By default, this option is disabled and diagnostic
@@ -1986,7 +1986,7 @@ performed by the Java HotSpot VM.
     You can also log compilation activity to a file by using the
     `-XX:+LogCompilation` option.
 
-`-XX:+PrintInlining`
+[`-XX:+PrintInlining`]{#-XX__PrintInlining}
 :   Enables printing of inlining decisions. This let's you see which methods
     are getting inlined.
 
@@ -1995,7 +1995,7 @@ performed by the Java HotSpot VM.
     `-XX:+UnlockDiagnosticVMOptions` option that unlocks diagnostic JVM
     options.
 
-`-XX:ReservedCodeCacheSize=`*size*
+[`-XX:ReservedCodeCacheSize=`]{#-XX_ReservedCodeCacheSize}*size*
 :   Sets the maximum code cache size (in bytes) for JIT-compiled code. Append
     the letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate
     megabytes, or `g` or `G` to indicate gigabytes. The default maximum code
@@ -2005,7 +2005,7 @@ performed by the Java HotSpot VM.
     size shouldn't be less than the initial code cache size; see the option
     `-XX:InitialCodeCacheSize`.
 
-`-XX:+SegmentedCodeCache`
+[`-XX:+SegmentedCodeCache`]{#-XX__SegmentedCodeCache}
 :   Enables segmentation of the code cache, without which the code cache
     consists of one large segment. With `-XX:+SegmentedCodeCache`, separate
     segments will be used for non-method, profiled method, and non-profiled
@@ -2018,29 +2018,29 @@ performed by the Java HotSpot VM.
     (`-XX:+TieredCompilation` ) and the reserved code cache size
     (`-XX:ReservedCodeCacheSize`) is at least 240 MB.
 
-`-XX:StartAggressiveSweepingAt=`*percent*
+[`-XX:StartAggressiveSweepingAt=`]{#-XX_StartAggressiveSweepingAt}*percent*
 :   Forces stack scanning of active methods to aggressively remove unused code
     when only the given percentage of the code cache is free. The default value
     is 10%.
 
-`-XX:-TieredCompilation`
+[`-XX:-TieredCompilation`]{#-XX__TieredCompilation}
 :   Disables the use of tiered compilation. By default, this option is enabled.
 
-`-XX:UseSSE=`*version*
+[`-XX:UseSSE=`]{#-XX_UseSSE}*version*
 :   Enables the use of SSE instruction set of a specified version.
     Is set by default to the highest supported version available (x86 only).
 
-`-XX:UseAVX=`*version*
+[`-XX:UseAVX=`]{#-XX_UseAVX}*version*
 :   Enables the use of AVX instruction set of a specified version.
     Is set by default to the highest supported version available (x86 only).
 
-`-XX:+UseAES`
+[`-XX:+UseAES`]{#-XX__UseAES}
 :   Enables hardware-based AES intrinsics for hardware that supports it.
     This option is on by default on hardware that has the necessary instructions.
     The `-XX:+UseAES` is used in conjunction with `UseAESIntrinsics`. Flags
     that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseAESIntrinsics`
+[`-XX:+UseAESIntrinsics`]{#-XX__UseAESIntrinsics}
 :   Enables AES intrinsics. Specifying `-XX:+UseAESIntrinsics` is equivalent to
     also enabling `-XX:+UseAES`. To disable hardware-based AES intrinsics,
     specify `-XX:-UseAES -XX:-UseAESIntrinsics`. For example, to enable hardware
@@ -2051,47 +2051,47 @@ performed by the Java HotSpot VM.
     Flags that control intrinsics now require the option
     `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseAESCTRIntrinsics`
+[`-XX:+UseAESCTRIntrinsics`]{#-XX__UseAESCTRIntrinsics}
 :   Analogous to `-XX:+UseAESIntrinsics` enables AES/CTR intrinsics.
 
-`-XX:+UseGHASHIntrinsics`
+[`-XX:+UseGHASHIntrinsics`]{#-XX__UseGHASHIntrinsics}
 :   Controls the use of GHASH intrinsics. Enabled by default on platforms that
     support the corresponding instructions.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseChaCha20Intrinsics`
+[`-XX:+UseChaCha20Intrinsics`]{#-XX__UseChaCha20Intrinsics}
 :   Enable ChaCha20 intrinsics. This option is on by default for supported
     platforms.  To disable ChaCha20 intrinsics, specify
     `-XX:-UseChaCha20Intrinsics`. Flags that control intrinsics now require
     the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UsePoly1305Intrinsics`
+[`-XX:+UsePoly1305Intrinsics`]{#-XX__UsePoly1305Intrinsics}
 :   Enable Poly1305 intrinsics. This option is on by default for supported
     platforms.  To disable Poly1305 intrinsics, specify
     `-XX:-UsePoly1305Intrinsics`. Flags that control intrinsics now require
     the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseBASE64Intrinsics`
+[`-XX:+UseBASE64Intrinsics`]{#-XX__UseBASE64Intrinsics}
 :   Controls the use of accelerated BASE64 encoding routines for `java.util.Base64`.
     Enabled by default on platforms that support it.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseAdler32Intrinsics`
+[`-XX:+UseAdler32Intrinsics`]{#-XX__UseAdler32Intrinsics}
 :   Controls the use of Adler32 checksum algorithm intrinsic for `java.util.zip.Adler32`.
     Enabled by default on platforms that support it.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseCRC32Intrinsics`
+[`-XX:+UseCRC32Intrinsics`]{#-XX__UseCRC32Intrinsics}
 :   Controls the use of CRC32 intrinsics for `java.util.zip.CRC32`.
     Enabled by default on platforms that support it.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseCRC32CIntrinsics`
+[`-XX:+UseCRC32CIntrinsics`]{#-XX__UseCRC32CIntrinsics}
 :   Controls the use of CRC32C intrinsics for `java.util.zip.CRC32C`.
     Enabled by default on platforms that support it.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseSHA`
+[`-XX:+UseSHA`]{#-XX__UseSHA}
 :   Enables hardware-based intrinsics for SHA crypto hash functions for some
     hardware. The `UseSHA` option is used in conjunction with the
     `UseSHA1Intrinsics`, `UseSHA256Intrinsics`, and `UseSHA512Intrinsics`
@@ -2108,26 +2108,26 @@ performed by the Java HotSpot VM.
     disable only a particular SHA intrinsic, use the appropriate corresponding
     option. For example: `-XX:-UseSHA256Intrinsics`.
 
-`-XX:+UseSHA1Intrinsics`
+[`-XX:+UseSHA1Intrinsics`]{#-XX__UseSHA1Intrinsics}
 :   Enables intrinsics for SHA-1 crypto hash function. Flags that control
     intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseSHA256Intrinsics`
+[`-XX:+UseSHA256Intrinsics`]{#-XX__UseSHA256Intrinsics}
 :   Enables intrinsics for SHA-224 and SHA-256 crypto hash functions. Flags
     that control intrinsics now require the option
     `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseSHA512Intrinsics`
+[`-XX:+UseSHA512Intrinsics`]{#-XX__UseSHA512Intrinsics}
 :   Enables intrinsics for SHA-384 and SHA-512 crypto hash functions. Flags
     that control intrinsics now require the option
     `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseMathExactIntrinsics`
+[`-XX:+UseMathExactIntrinsics`]{#-XX__UseMathExactIntrinsics}
 :   Enables intrinsification of various `java.lang.Math.*Exact()` functions.
     Enabled by default.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseMultiplyToLenIntrinsic`
+[`-XX:+UseMultiplyToLenIntrinsic`]{#-XX__UseMultiplyToLenIntrinsic}
 :   Enables intrinsification of `BigInteger.multiplyToLen()`.
     Enabled by default on platforms that support it.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
@@ -2152,44 +2152,44 @@ performed by the Java HotSpot VM.
     Enabled by default on platforms that support it.
     Flags that control intrinsics now require the option `-XX:+UnlockDiagnosticVMOptions`.
 
-`-XX:+UseCMoveUnconditionally`
+[`-XX:+UseCMoveUnconditionally`]{#-XX__UseCMoveUnconditionally}
 :   Generates CMove (scalar and vector) instructions regardless of
     profitability analysis.
 
-`-XX:+UseCodeCacheFlushing`
+[`-XX:+UseCodeCacheFlushing`]{#-XX__UseCodeCacheFlushing}
 :   Enables flushing of the code cache before shutting down the compiler. This
     option is enabled by default. To disable flushing of the code cache before
     shutting down the compiler, specify `-XX:-UseCodeCacheFlushing`.
 
-`-XX:+UseCondCardMark`
+[`-XX:+UseCondCardMark`]{#-XX__UseCondCardMark}
 :   Enables checking if the card is already marked before updating the card
     table. This option is disabled by default. It should be used only on
     machines with multiple sockets, where it increases the performance of Java
     applications that rely on concurrent operations.
 
-`-XX:+UseCountedLoopSafepoints`
+[`-XX:+UseCountedLoopSafepoints`]{#-XX__UseCountedLoopSafepoints}
 :   Keeps safepoints in counted loops. Its default value depends on whether the
     selected garbage collector requires low latency safepoints.
 
-`-XX:LoopStripMiningIter=`*number_of_iterations*
+[`-XX:LoopStripMiningIter=`]{#-XX_LoopStripMiningIter}*number_of_iterations*
 :   Controls the number of iterations in the inner strip mined loop. Strip mining
     transforms counted loops into two level nested loops. Safepoints are kept
     in the outer loop while the inner loop can execute at full speed. This option
     controls the maximum number of iterations in the inner loop. The default value
     is 1,000.
 
-`-XX:LoopStripMiningIterShortLoop=`*number_of_iterations*
+[`-XX:LoopStripMiningIterShortLoop=`]{#-XX_LoopStripMiningIterShortLoop}*number_of_iterations*
 :   Controls loop strip mining optimization. Loops with the number of iterations
     less than specified will not have safepoints in them. Default value is
     1/10th of `-XX:LoopStripMiningIter`.
 
-`-XX:+UseFMA`
+[`-XX:+UseFMA`]{#-XX__UseFMA}
 :   Enables hardware-based FMA intrinsics for hardware where FMA instructions
     are available (such as, Intel and ARM64). FMA intrinsics are
     generated for the `java.lang.Math.fma(`*a*`,` *b*`,` *c*`)` methods that
     calculate the value of `(` *a* `*` *b* `+` *c* `)` expressions.
 
-`-XX:+UseSuperWord`
+[`-XX:+UseSuperWord`]{#-XX__UseSuperWord}
 :   Enables the transformation of scalar operations into superword operations.
     Superword is a vectorization optimization. This option is enabled by
     default. To disable the transformation of scalar operations into superword
@@ -2200,7 +2200,7 @@ performed by the Java HotSpot VM.
 These `java` options provide the ability to gather system information and
 perform extensive debugging.
 
-`-XX:+DisableAttachMechanism`
+[`-XX:+DisableAttachMechanism`]{#-XX__DisableAttachMechanism}
 :   Disables the mechanism that lets tools attach to the JVM. By default, this
     option is disabled, meaning that the attach mechanism is enabled and you
     can use diagnostics and troubleshooting tools such as `jcmd`, `jstack`,
@@ -2211,17 +2211,17 @@ perform extensive debugging.
     supported when using the tools from one JDK version to troubleshoot a
     different JDK version.
 
-`-XX:+DTraceAllocProbes`
+[`-XX:+DTraceAllocProbes`]{#-XX__DTraceAllocProbes}
 :   **Linux and macOS:** Enable `dtrace` tool probes for object allocation.
 
-`-XX:+DTraceMethodProbes`
+[`-XX:+DTraceMethodProbes`]{#-XX__DTraceMethodProbes}
 :   **Linux and macOS:** Enable `dtrace` tool probes for method-entry
     and method-exit.
 
-`-XX:+DTraceMonitorProbes`
+[`-XX:+DTraceMonitorProbes`]{#-XX__DTraceMonitorProbes}
 :   **Linux and macOS:** Enable `dtrace` tool probes for monitor events.
 
-`-XX:+HeapDumpOnOutOfMemoryError`
+[`-XX:+HeapDumpOnOutOfMemoryError`]{#-XX__HeapDumpOnOutOfMemoryError}
 :   Enables the dumping of the Java heap to a file in the current directory by
     using the heap profiler (HPROF) when a `java.lang.OutOfMemoryError`
     exception is thrown by the JVM. You can explicitly set the heap dump file path and
@@ -2233,7 +2233,7 @@ perform extensive debugging.
     directly from Java code, nor by the JVM for other types of resource
     exhaustion (such as native thread creation errors).
 
-`-XX:HeapDumpPath=`*path*
+[`-XX:HeapDumpPath=`]{#-XX_HeapDumpPath}*path*
 :   Sets the path and file name for writing the heap dump provided by the heap
     profiler (HPROF) when the `-XX:+HeapDumpOnOutOfMemoryError` option is set.
     By default, the file is created in the current working directory, and it's
@@ -2253,7 +2253,7 @@ perform extensive debugging.
 
         >   `-XX:HeapDumpPath=C:/log/java/java_heapdump.log`
 
-`-XX:LogFile=`*path*
+[`-XX:LogFile=`]{#-XX_LogFile}*path*
 :   Sets the path and file name to where log data is written. By default, the
     file is created in the current working directory, and it's named
     `hotspot.log`.
@@ -2268,7 +2268,7 @@ perform extensive debugging.
 
         >   `-XX:LogFile=C:/log/java/hotspot.log`
 
-`-XX:+PrintClassHistogram`
+[`-XX:+PrintClassHistogram`]{#-XX__PrintClassHistogram}
 :   Enables printing of a class instance histogram after one of the following
     events:
 
@@ -2282,7 +2282,7 @@ perform extensive debugging.
     the `jcmd` *pid* `GC.class_histogram` command, where *pid* is the current
     Java process identifier.
 
-`-XX:+PrintConcurrentLocks`
+[`-XX:+PrintConcurrentLocks`]{#-XX__PrintConcurrentLocks}
 :   Enables printing of `java.util.concurrent` locks after one of the following
     events:
 
@@ -2296,12 +2296,12 @@ perform extensive debugging.
     `jcmd` *pid* `Thread.print -l` command, where *pid* is the current Java
     process identifier.
 
-`-XX:+PrintFlagsRanges`
+[`-XX:+PrintFlagsRanges`]{#-XX__PrintFlagsRanges}
 :   Prints the range specified and allows automatic testing of the values. See
     [Validate Java Virtual Machine Flag
     Arguments].
 
-`-XX:+PerfDataSaveToFile`
+[`-XX:+PerfDataSaveToFile`]{#-XX__PerfDataSaveToFile}
 :   If enabled, saves [jstat](jstat.html) binary data when the Java application
     exits. This binary data is saved in a file named `hsperfdata_`*pid*, where
     *pid* is the process identifier of the Java application that you ran. Use
@@ -2312,7 +2312,7 @@ perform extensive debugging.
 
     >   `jstat -gc file:///`*path*`/hsperfdata_`*pid*
 
-`-XX:+UsePerfData`
+[`-XX:+UsePerfData`]{#-XX__UsePerfData}
 :   Enables the `perfdata` feature. This option is enabled by default to allow
     JVM monitoring and performance testing. Disabling it suppresses the
     creation of the `hsperfdata_userid` directories. To disable the `perfdata`
@@ -2323,13 +2323,13 @@ perform extensive debugging.
 These `java` options control how garbage collection (GC) is performed by the
 Java HotSpot VM.
 
-`-XX:+AlwaysPreTouch`
+[`-XX:+AlwaysPreTouch`]{#-XX__AlwaysPreTouch}
 :   Requests the VM to touch every page on the Java heap after requesting it from
     the operating system and before handing memory out to the application.
     By default, this option is disabled and all pages are committed as the
     application uses the heap space.
 
-`-XX:ConcGCThreads=`*threads*
+[`-XX:ConcGCThreads=`]{#-XX_ConcGCThreads}*threads*
 :   Sets the number of threads used for concurrent GC. Sets *`threads`* to
     approximately 1/4 of the number of parallel garbage collection threads. The
     default value depends on the number of CPUs available to the JVM.
@@ -2339,24 +2339,24 @@ Java HotSpot VM.
 
     >   `-XX:ConcGCThreads=2`
 
-`-XX:+DisableExplicitGC`
+[`-XX:+DisableExplicitGC`]{#-XX__DisableExplicitGC}
 :   Enables the option that disables processing of calls to the `System.gc()`
     method. This option is disabled by default, meaning that calls to
     `System.gc()` are processed. If processing of calls to `System.gc()` is
     disabled, then the JVM still performs GC when necessary.
 
-`-XX:+ExplicitGCInvokesConcurrent`
+[`-XX:+ExplicitGCInvokesConcurrent`]{#-XX__ExplicitGCInvokesConcurrent}
 :   Enables invoking of concurrent GC by using the `System.gc()` request. This
     option is disabled by default and can be enabled only with the `-XX:+UseG1GC` option.
 
-`-XX:G1AdaptiveIHOPNumInitialSamples=`*number*
+[`-XX:G1AdaptiveIHOPNumInitialSamples=`]{#-XX_G1AdaptiveIHOPNumInitialSamples}*number*
 :   When `-XX:UseAdaptiveIHOP` is enabled, this option sets the number of
     completed marking cycles used to gather samples until G1 adaptively
     determines the optimum value of `-XX:InitiatingHeapOccupancyPercent`. Before,
     G1 uses the value of `-XX:InitiatingHeapOccupancyPercent` directly for
     this purpose. The default value is 3.
 
-`-XX:G1HeapRegionSize=`*size*
+[`-XX:G1HeapRegionSize=`]{#-XX_G1HeapRegionSize}*size*
 :   Sets the size of the regions into which the Java heap is subdivided when
     using the garbage-first (G1) collector. The value is a power of 2 and can
     range from 1 MB to 32 MB. The default region size is determined
@@ -2367,44 +2367,44 @@ Java HotSpot VM.
 
     >   `-XX:G1HeapRegionSize=16m`
 
-`-XX:G1HeapWastePercent=`*percent*
+[`-XX:G1HeapWastePercent=`]{#-XX_G1HeapWastePercent}*percent*
 :   Sets the percentage of heap that you're willing to waste. The Java HotSpot
     VM doesn't initiate the mixed garbage collection cycle when the reclaimable
     percentage is less than the heap waste percentage. The default is 5
     percent.
 
-`-XX:G1MaxNewSizePercent=`*percent*
+[`-XX:G1MaxNewSizePercent=`]{#-XX_G1MaxNewSizePercent}*percent*
 :   Sets the percentage of the heap size to use as the maximum for the young
     generation size. The default value is 60 percent of your Java heap.
 
     This is an experimental flag. This setting replaces the
     `-XX:DefaultMaxNewGenPercent` setting.
 
-`-XX:G1MixedGCCountTarget=`*number*
+[`-XX:G1MixedGCCountTarget=`]{#-XX_G1MixedGCCountTarget}*number*
 :   Sets the target number of mixed garbage collections after a marking cycle
     to collect old regions with at most `G1MixedGCLIveThresholdPercent` live
     data. The default is 8 mixed garbage collections. The goal for mixed
     collections is to be within this target number.
 
-`-XX:G1MixedGCLiveThresholdPercent=`*percent*
+[`-XX:G1MixedGCLiveThresholdPercent=`]{#-XX_G1MixedGCLiveThresholdPercent}*percent*
 :   Sets the occupancy threshold for an old region to be included in a mixed
     garbage collection cycle. The default occupancy is 85 percent.
 
     This is an experimental flag. This setting replaces the
     `-XX:G1OldCSetRegionLiveThresholdPercent` setting.
 
-`-XX:G1NewSizePercent=`*percent*
+[`-XX:G1NewSizePercent=`]{#-XX_G1NewSizePercent}*percent*
 :   Sets the percentage of the heap to use as the minimum for the young
     generation size. The default value is 5 percent of your Java heap.
 
     This is an experimental flag. This setting replaces the
     `-XX:DefaultMinNewGenPercent` setting.
 
-`-XX:G1OldCSetRegionThresholdPercent=`*percent*
+[`-XX:G1OldCSetRegionThresholdPercent=`]{#-XX_G1OldCSetRegionThresholdPercent}*percent*
 :   Sets an upper limit on the number of old regions to be collected during a
     mixed garbage collection cycle. The default is 10 percent of the Java heap.
 
-`-XX:G1ReservePercent=`*percent*
+[`-XX:G1ReservePercent=`]{#-XX_G1ReservePercent}*percent*
 :   Sets the percentage of the heap (0 to 50) that's reserved as a false
     ceiling to reduce the possibility of promotion failure for the G1
     collector. When you increase or decrease the percentage, ensure that you
@@ -2415,7 +2415,7 @@ Java HotSpot VM.
 
     >   `-XX:G1ReservePercent=20`
 
-`-XX:+G1UseAdaptiveIHOP`
+[`-XX:+G1UseAdaptiveIHOP`]{#-XX__G1UseAdaptiveIHOP}
 :   Controls adaptive calculation of the old generation occupancy to start
     background work preparing for an old generation collection. If enabled,
     G1 uses `-XX:InitiatingHeapOccupancyPercent` for the first few times as
@@ -2428,7 +2428,7 @@ Java HotSpot VM.
 
     The default is enabled.
 
-`-XX:InitialHeapSize=`*size*
+[`-XX:InitialHeapSize=`]{#-XX_InitialHeapSize}*size*
 :   Sets the initial size (in bytes) of the memory allocation pool. This value
     must be either 0, or a multiple of 1024 and greater than 1 MB. Append the
     letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate megabytes,
@@ -2452,17 +2452,17 @@ Java HotSpot VM.
     command line, then the initial heap size gets set to the value specified
     with `-Xms`.
 
-`-XX:InitialRAMPercentage=`*percent*
+[`-XX:InitialRAMPercentage=`]{#-XX_InitialRAMPercentage}*percent*
 :   Sets the initial amount of memory that the JVM will use for the Java heap
-    before applying ergonomics heuristics as a percentage of the maximum amount
-    determined as described in the `-XX:MaxRAM` option.
+    before applying ergonomics heuristics as a percentage of the available memory
+    to the JVM process.
 
     The following example shows how to set the percentage of the initial
     amount of memory used for the Java heap:
 
     >   `-XX:InitialRAMPercentage=5`
 
-`-XX:InitialSurvivorRatio=`*ratio*
+[`-XX:InitialSurvivorRatio=`]{#-XX_InitialSurvivorRatio}*ratio*
 :   Sets the initial survivor space ratio used by the throughput garbage
     collector (which is enabled by the `-XX:+UseParallelGC` option). Adaptive
     sizing is enabled by default with the throughput garbage collector by
@@ -2491,7 +2491,7 @@ Java HotSpot VM.
 
     >   `-XX:InitialSurvivorRatio=4`
 
-`-XX:InitiatingHeapOccupancyPercent=`*percent*
+[`-XX:InitiatingHeapOccupancyPercent=`]{#-XX_InitiatingHeapOccupancyPercent}*percent*
 :   Sets the percentage of the old generation occupancy (0 to 100) at which to
     start the first few concurrent marking cycles for the G1 garbage collector.
 
@@ -2506,7 +2506,7 @@ Java HotSpot VM.
 
     >   `-XX:InitiatingHeapOccupancyPercent=75`
 
-`-XX:MaxGCPauseMillis=`*time*
+[`-XX:MaxGCPauseMillis=`]{#-XX_MaxGCPauseMillis}*time*
 :   Sets a target for the maximum GC pause time (in milliseconds). This is a
     soft goal, and the JVM will make its best effort to achieve it. Only G1
     and Parallel support a maximum GC pause time target. For G1, the default
@@ -2517,7 +2517,7 @@ Java HotSpot VM.
 
     >   `-XX:MaxGCPauseMillis=500`
 
-`-XX:MaxHeapSize=`*size*
+[`-XX:MaxHeapSize=`]{#-XX_MaxHeapSize}*size*
 :   Sets the maximum size (in byes) of the memory allocation pool. This value
     must be a multiple of 1024 and greater than 2 MB. Append the letter `k` or
     `K` to indicate kilobytes, `m` or `M` to indicate megabytes, or `g` or `G`
@@ -2537,7 +2537,7 @@ Java HotSpot VM.
 
     The `-XX:MaxHeapSize` option is equivalent to `-Xmx`.
 
-`-XX:MaxHeapFreeRatio=`*percent*
+[`-XX:MaxHeapFreeRatio=`]{#-XX_MaxHeapFreeRatio}*percent*
 :   Sets the maximum allowed percentage of free heap space (0 to 100) after a
     GC event. If free heap space expands above this value, then the heap is
     shrunk. By default, this value is set to 70%.
@@ -2558,7 +2558,7 @@ Java HotSpot VM.
     description of using this option to keep the Java heap small by reducing
     the dynamic footprint for embedded applications.
 
-`-XX:MaxMetaspaceSize=`*size*
+[`-XX:MaxMetaspaceSize=`]{#-XX_MaxMetaspaceSize}*size*
 :   Sets the maximum amount of native memory that can be allocated for class
     metadata. By default, the size isn't limited. The amount of metadata for an
     application depends on the application itself, other running applications,
@@ -2569,15 +2569,14 @@ Java HotSpot VM.
 
     >   `-XX:MaxMetaspaceSize=256m`
 
-`-XX:MaxNewSize=`*size*
+[`-XX:MaxNewSize=`]{#-XX_MaxNewSize}*size*
 :   Sets the maximum size (in bytes) of the heap for the young generation
     (nursery). The default value is set ergonomically.
 
-`-XX:MaxRAMPercentage=`*percent*
+[`-XX:MaxRAMPercentage=`]{#-XX_MaxRAMPercentage}*percent*
 :   Sets the maximum amount of memory that the JVM may use for the Java heap
-    before applying ergonomics heuristics as a percentage of the maximum amount
-    determined as described in the `-XX:MaxRAM` option. The default value is 25
-    percent.
+    before applying ergonomics heuristics as a percentage of the available memory
+    to the JVM process. The default value is 25 percent.
 
     Specifying this option disables automatic use of compressed oops if
     the combined result of this and other options influencing the maximum amount
@@ -2589,18 +2588,18 @@ Java HotSpot VM.
 
     >   `-XX:MaxRAMPercentage=75`
 
-`-XX:MinRAMPercentage=`*percent*
+[`-XX:MinRAMPercentage=`]{#-XX_MinRAMPercentage}*percent*
 :   Sets the maximum amount of memory that the JVM may use for the Java heap
-    before applying ergonomics heuristics as a percentage of the maximum amount
-    determined as described in the `-XX:MaxRAM` option for small heaps. A small
-    heap is a heap of approximately 125 MB. The default value is 50 percent.
+    before applying ergonomics heuristics as a percentage of the available memory
+    to the JVM process for small heaps. A small heap is a heap of approximately
+    125 MB. The default value is 50 percent.
 
     The following example shows how to set the percentage of the maximum amount
     of memory used for the Java heap for small heaps:
 
     >   `-XX:MinRAMPercentage=75`
 
-`-XX:MaxTenuringThreshold=`*threshold*
+[`-XX:MaxTenuringThreshold=`]{#-XX_MaxTenuringThreshold}*threshold*
 :   Sets the maximum tenuring threshold for use in adaptive GC sizing. The
     largest value is 15. The default value is 15 for the parallel (throughput)
     collector.
@@ -2610,13 +2609,13 @@ Java HotSpot VM.
 
     >   `-XX:MaxTenuringThreshold=10`
 
-`-XX:MetaspaceSize=`*size*
+[`-XX:MetaspaceSize=`]{#-XX_MetaspaceSize}*size*
 :   Sets the size of the allocated class metadata space that triggers a garbage
     collection the first time it's exceeded. This threshold for a garbage
     collection is increased or decreased depending on the amount of metadata
     used. The default size depends on the platform.
 
-`-XX:MinHeapFreeRatio=`*percent*
+[`-XX:MinHeapFreeRatio=`]{#-XX_MinHeapFreeRatio}*percent*
 :   Sets the minimum allowed percentage of free heap space (0 to 100) after a
     GC event. If free heap space falls below this value, then the heap is
     expanded. By default, this value is set to 40%.
@@ -2637,7 +2636,7 @@ Java HotSpot VM.
     description of using this option to keep the Java heap small by reducing
     the dynamic footprint for embedded applications.
 
-`-XX:MinHeapSize=`*size*
+[`-XX:MinHeapSize=`]{#-XX_MinHeapSize}*size*
 :   Sets the minimum size (in bytes) of the memory allocation pool. This value
     must be either 0, or a multiple of 1024 and greater than 1 MB. Append the
     letter `k` or `K` to indicate kilobytes, `m` or `M` to indicate megabytes,
@@ -2656,14 +2655,14 @@ Java HotSpot VM.
     If you set this option to 0, then the minimum size is set to the same value
     as the initial size.
 
-`-XX:NewRatio=`*ratio*
+[`-XX:NewRatio=`]{#-XX_NewRatio}*ratio*
 :   Sets the ratio between young and old generation sizes. By default, this
     option is set to 2. The following example shows how to set the young-to-old
     ratio to 1:
 
     >   `-XX:NewRatio=1`
 
-`-XX:NewSize=`*size*
+[`-XX:NewSize=`]{#-XX_NewSize}*size*
 :   Sets the initial size (in bytes) of the heap for the young generation
     (nursery). Append the letter `k` or `K` to indicate kilobytes, `m` or `M`
     to indicate megabytes, or `g` or `G` to indicate gigabytes.
@@ -2687,7 +2686,7 @@ Java HotSpot VM.
 
     The `-XX:NewSize` option is equivalent to `-Xmn`.
 
-`-XX:ParallelGCThreads=`*threads*
+[`-XX:ParallelGCThreads=`]{#-XX_ParallelGCThreads}*threads*
 :   Sets the number of the stop-the-world (STW) worker threads. The default value
     depends on the number of CPUs available to the JVM and the garbage collector
     selected.
@@ -2697,11 +2696,11 @@ Java HotSpot VM.
 
     >   `-XX:ParallelGCThreads=2`
 
-`-XX:+PrintAdaptiveSizePolicy`
+[`-XX:+PrintAdaptiveSizePolicy`]{#-XX__PrintAdaptiveSizePolicy}
 :   Enables printing of information about adaptive-generation sizing. By
     default, this option is disabled.
 
-`-XX:SoftRefLRUPolicyMSPerMB=`*time*
+[`-XX:SoftRefLRUPolicyMSPerMB=`]{#-XX_SoftRefLRUPolicyMSPerMB}*time*
 :   Sets the amount of time (in milliseconds) a softly reachable object is
     kept active on the heap after the last time it was referenced. The default
     value is one second of lifetime per free megabyte in the heap. The
@@ -2718,7 +2717,7 @@ Java HotSpot VM.
 
     `-XX:SoftRefLRUPolicyMSPerMB=2500`
 
-`-XX:-ShrinkHeapInSteps`
+[`-XX:-ShrinkHeapInSteps`]{#-XX__ShrinkHeapInSteps}
 :   Incrementally reduces the Java heap to the target size, specified by the
     option `-XX:MaxHeapFreeRatio`. This option is enabled by default. If
     disabled, then it immediately reduces the Java heap to the target size
@@ -2730,7 +2729,7 @@ Java HotSpot VM.
     `MaxHeapFreeRatio` option to keep the Java heap small by reducing the
     dynamic footprint for embedded applications.
 
-`-XX:StringDeduplicationAgeThreshold=`*threshold*
+[`-XX:StringDeduplicationAgeThreshold=`]{#-XX_StringDeduplicationAgeThreshold}*threshold*
 :   Identifies `String` objects reaching the specified age that are considered
     candidates for deduplication. An object's age is a measure of how many
     times it has survived garbage collection. This is sometimes referred to as
@@ -2741,14 +2740,14 @@ Java HotSpot VM.
     default value for this option is `3`. See the `-XX:+UseStringDeduplication`
     option.
 
-`-XX:SurvivorRatio=`*ratio*
+[`-XX:SurvivorRatio=`]{#-XX_SurvivorRatio}*ratio*
 :   Sets the ratio between eden space size and survivor space size. By default,
     this option is set to 8. The following example shows how to set the
     eden/survivor space ratio to 4:
 
     >   `-XX:SurvivorRatio=4`
 
-`-XX:TargetSurvivorRatio=`*percent*
+[`-XX:TargetSurvivorRatio=`]{#-XX_TargetSurvivorRatio}*percent*
 :   Sets the desired percentage of survivor space (0 to 100) used after young
     garbage collection. By default, this option is set to 50%.
 
@@ -2757,7 +2756,7 @@ Java HotSpot VM.
 
     >   `-XX:TargetSurvivorRatio=30`
 
-`-XX:TLABSize=`*size*
+[`-XX:TLABSize=`]{#-XX_TLABSize}*size*
 :   Sets the initial size (in bytes) of a thread-local allocation buffer
     (TLAB). Append the letter `k` or `K` to indicate kilobytes, `m` or `M` to
     indicate megabytes, or `g` or `G` to indicate gigabytes. If this option is
@@ -2767,13 +2766,13 @@ Java HotSpot VM.
 
     >   `-XX:TLABSize=512k`
 
-`-XX:+UseAdaptiveSizePolicy`
+[`-XX:+UseAdaptiveSizePolicy`]{#-XX__UseAdaptiveSizePolicy}
 :   Enables the use of adaptive generation sizing. This option is enabled by
     default. To disable adaptive generation sizing, specify
     `-XX:-UseAdaptiveSizePolicy` and set the size of the memory allocation pool
     explicitly. See the `-XX:SurvivorRatio` option.
 
-`-XX:+UseG1GC`
+[`-XX:+UseG1GC`]{#-XX__UseG1GC}
 :   Enables the use of the garbage-first (G1) garbage collector. It's a
     server-style garbage collector, targeted for multiprocessor machines with a
     large amount of RAM. This option meets GC pause time goals with high
@@ -2783,7 +2782,7 @@ Java HotSpot VM.
     pause time below 0.5 seconds). By default, this option is enabled and G1 is
     used as the default garbage collector.
 
-`-XX:+UseGCOverheadLimit`
+[`-XX:+UseGCOverheadLimit`]{#-XX__UseGCOverheadLimit}
 :   Enables the use of a policy that limits the proportion of time spent by the
     JVM on GC before an `OutOfMemoryError` exception is thrown. This option is
     enabled, by default, and the parallel GC will throw an `OutOfMemoryError`
@@ -2793,26 +2792,26 @@ Java HotSpot VM.
     little or no progress. To disable this option, specify the option
     `-XX:-UseGCOverheadLimit`.
 
-`-XX:+UseNUMA`
+[`-XX:+UseNUMA`]{#-XX__UseNUMA}
 :   Enables performance optimization of an application on a machine with
     nonuniform memory architecture (NUMA) by increasing the application's use
     of lower latency memory. The default value for this option depends on the
     garbage collector.
 
-`-XX:+UseParallelGC`
+[`-XX:+UseParallelGC`]{#-XX__UseParallelGC}
 :   Enables the use of the parallel scavenge garbage collector (also known as
     the throughput collector) to improve the performance of your application by
     leveraging multiple processors.
 
     By default, this option is disabled and the default collector is used.
 
-`-XX:+UseSerialGC`
+[`-XX:+UseSerialGC`]{#-XX__UseSerialGC}
 :   Enables the use of the serial garbage collector. This is generally the best
     choice for small and simple applications that don't require any special
     functionality from garbage collection. By default, this option is disabled
     and the default collector is used.
 
-`-XX:+UseStringDeduplication`
+[`-XX:+UseStringDeduplication`]{#-XX__UseStringDeduplication}
 :   Enables string deduplication. By default, this option is disabled. To use
     this option, you must enable the garbage-first (G1) garbage collector.
 
@@ -2822,34 +2821,34 @@ Java HotSpot VM.
     character array, identical `String` objects can point to and share the same
     character array.
 
-`-XX:+UseTLAB`
+[`-XX:+UseTLAB`]{#-XX__UseTLAB}
 :   Enables the use of thread-local allocation blocks (TLABs) in the young
     generation space. This option is enabled by default. To disable the use of
     TLABs, specify the option `-XX:-UseTLAB`.
 
-`-XX:+UseZGC`
+[`-XX:+UseZGC`]{#-XX__UseZGC}
 :   Enables the use of the Z garbage collector (ZGC). This is a low latency
     garbage collector, providing max pause times of a few milliseconds, at
     some throughput cost. Pause times are independent of what heap size is
     used. Supports heap sizes from 8MB to 16TB.
 
-`-XX:ZAllocationSpikeTolerance=`*factor*
+[`-XX:ZAllocationSpikeTolerance=`]{#-XX_ZAllocationSpikeTolerance}*factor*
 :   Sets the allocation spike tolerance for ZGC. By default, this option is
     set to 2.0. This factor describes the level of allocation spikes to expect.
     For example, using a factor of 3.0 means the current allocation rate can
     be expected to triple at any time.
 
-`-XX:ZCollectionInterval=`*seconds*
+[`-XX:ZCollectionInterval=`]{#-XX_ZCollectionInterval}*seconds*
 :   Sets the maximum interval (in seconds) between two GC cycles when using
     ZGC. By default, this option is set to 0 (disabled).
 
-`-XX:ZFragmentationLimit=`*percent*
+[`-XX:ZFragmentationLimit=`]{#-XX_ZFragmentationLimit}*percent*
 :   Sets the maximum acceptable heap fragmentation (in percent) for ZGC.
     By default, this option is set to 25. Using a lower value will cause the
     heap to be compacted more aggressively, to reclaim more memory at the cost
     of using more CPU time.
 
-`-XX:+ZProactive`
+[`-XX:+ZProactive`]{#-XX__ZProactive}
 :   Enables proactive GC cycles when using ZGC. By default, this option is
     enabled. ZGC will start a proactive GC cycle if doing so is expected to
     have minimal impact on the running application. This is useful if the
@@ -2857,27 +2856,27 @@ Java HotSpot VM.
     want to keep the heap size down and allow reference processing to happen
     even when there are a lot of free space on the heap.
 
-`-XX:+ZUncommit`
+[`-XX:+ZUncommit`]{#-XX__ZUncommit}
 :   Enables uncommitting of unused heap memory when using ZGC. By default,
     this option is enabled. Uncommitting unused heap memory will lower the
     memory footprint of the JVM, and make that memory available for other
     processes to use.
 
-`-XX:ZUncommitDelay=`*seconds*
+[`-XX:ZUncommitDelay=`]{#-XX_ZUncommitDelay}*seconds*
 :   Sets the amount of time (in seconds) that heap memory must have been
     unused before being uncommitted. By default, this option is set to 300
     (5 minutes). Committing and uncommitting memory are relatively
     expensive operations. Using a lower value will cause heap memory to be
     uncommitted earlier, at the risk of soon having to commit it again.
 
-`-XX:+UseShenandoahGC`
+[`-XX:+UseShenandoahGC`]{#-XX__UseShenandoahGC}
 :   Enables the use of the Shenandoah garbage collector. This is a low pause
     time, concurrent garbage collector. Its pause times are not proportional to
     the size of the heap. Shenandoah garbage collector can work with compressed
     pointers. See `-XX:UseCompressedOops` for further information about
     compressed pointers.
 
-`-XX:ShenandoahGCMode=`*mode*
+[`-XX:ShenandoahGCMode=`]{#-XX_ShenandoahGCMode}*mode*
 :   Sets the GC mode for Shenandoah GC to use. By default, this option is set
     to `satb`. Among other things, this defines which barriers are in use.
     Possible mode values include the following:
@@ -2891,7 +2890,7 @@ Java HotSpot VM.
         generational. Please see [JEP 404](https://openjdk.org/jeps/404) and
         [JEP 521](https://openjdk.org/jeps/521) for its advantages and risks.
 
-`-XX:ShenandoahGCHeuristics=`*heuristics*
+[`-XX:ShenandoahGCHeuristics=`]{#-XX_ShenandoahGCHeuristics}*heuristics*
 :   Sets the heuristics for Shenandoah GC to use. By default, this option is
     set to `adaptive`. This fine-tunes the GC mode selected, by choosing when
     to start the GC, how much to process on each cycle, and what other features
@@ -2916,7 +2915,7 @@ These `java` options are deprecated and might be removed in a future JDK
 release. They're still accepted and acted upon, but a warning is issued when
 they're used.
 
-`-Xloggc:`*filename*
+[`-Xloggc:`]{#-Xloggc_}*filename*
 :   Sets the file to which verbose GC events information should be redirected
     for logging. The `-Xloggc` option overrides `-verbose:gc` if both are given
     with the same java command. `-Xloggc:`*filename* is replaced by
@@ -2927,11 +2926,11 @@ they're used.
 
     `-Xlog:gc:garbage-collection.log`
 
-`-XX:+FlightRecorder`
+[`-XX:+FlightRecorder`]{#-XX__FlightRecorder}
 :   Enables the use of Java Flight Recorder (JFR) during the runtime of the
     application. Since JDK 8u40 this option has not been required to use JFR.
 
-`-XX:+ParallelRefProcEnabled`
+[`-XX:+ParallelRefProcEnabled`]{#-XX__ParallelRefProcEnabled}
 :   Enables parallel reference processing. By default, collectors employing multiple
     threads perform parallel reference processing if the number of parallel threads
     to use is larger than one.
@@ -2939,36 +2938,17 @@ they're used.
     (`-XX:+UseParallelGC` or `-XX:+UseG1GC`). Other collectors employing multiple
     threads always perform reference processing in parallel.
 
-`-XX:MaxRAM=`*size*
-:   Sets the maximum amount of memory that the JVM may use for the Java heap
-    before applying ergonomics heuristics. The default value is the amount of
-    available memory to the JVM process.
-
-    The maximum amount of available memory to the JVM process is the minimum
-    of the machine's physical memory and any constraints set by the environment
-    (e.g. container).
-
-    Specifying this option disables automatic use of compressed oops if
-    the combined result of this and other options influencing the maximum amount
-    of memory is larger than the range of memory addressable by compressed oops.
-    See `-XX:UseCompressedOops` for further information about compressed oops.
-
-    The following example shows how to set the maximum amount of available
-    memory for sizing the Java heap to 2 GB:
-
-    >   `-XX:MaxRAM=2G`
-
-`-XX:+AggressiveHeap`
+[`-XX:+AggressiveHeap`]{#-XX__AggressiveHeap}
 :   Enables Java heap optimization. This sets various parameters to be
     optimal for long-running jobs with intensive memory allocation, based on
     the configuration of the computer (RAM and CPU). By default, the option
     is disabled and the heap sizes are configured less aggressively.
 
-`-XX:+NeverActAsServerClassMachine`
+[`-XX:+NeverActAsServerClassMachine`]{#-XX__NeverActAsServerClassMachine}
 :   Enable the "Client VM emulation" mode which only uses the C1 JIT compiler,
     a 32Mb CodeCache and the Serial GC. The maximum amount of memory that the
-    JVM may use (controlled by the `-XX:MaxRAM=n` flag) is set to 1GB by default.
-    The string "emulated-client" is added to the JVM version string.
+    JVM may use is set to 1GB by default. The string "emulated-client" is added
+    to the JVM version string.
 
     By default the flag is set to `true` only on Windows in 32-bit mode and
     `false` in all other cases.
@@ -2989,7 +2969,7 @@ they're used.
 These `java` options are still accepted but ignored, and a warning is issued
 when they're used.
 
-`--illegal-access=`*parameter*
+[`--illegal-access=`]{#--illegal-access}*parameter*
 :   Controlled _relaxed strong encapsulation_, as defined in [JEP
     261](https://openjdk.org/jeps/261#Relaxed-strong-encapsulation).
     This option was deprecated in JDK 16 by [JEP
@@ -3570,7 +3550,7 @@ Legacy Runtime Flag          Xlog Configuration                     Comment
 
 The following are `-Xlog` examples.
 
-`-Xlog`
+[`-Xlog`]{#-Xlog}
 :   Logs all messages by using the `info` level to `stdout` with `uptime`,
     `levels`, and `tags` decorations. This is equivalent to using:
 
@@ -4075,7 +4055,7 @@ The deployment of the AOT cache is divided into three phases:
 
 The AOT cache can be used with the following command-line options:
 
-`-XX:AOTCache=`*cachefile*
+[`-XX:AOTCache=`]{#-XX_AOTCache}*cachefile*
 :   Specifies the location of the AOT cache. The standard extension for *cachefile* is `.aot`.
     This option cannot be used together with `-XX:AOTCacheOutput`.
 
@@ -4084,13 +4064,13 @@ The AOT cache can be used with the following command-line options:
     The *cachefile* is written by AOT mode `create`.  In that case, this option is
     equivalent to `-XX:AOTCacheOutput=`*cachefile*.
 
-`-XX:AOTCacheOutput=`*cachefile*
+[`-XX:AOTCacheOutput=`]{#-XX_AOTCacheOutput}*cachefile*
 :   Specifies the location of the AOT cache to write. The standard extension for *cachefile* is `.aot`.
     This option cannot be used together with `-XX:AOTCache`.
 
     This option is compatible with `AOTMode` settings of `record`, `create`, or `auto` (the default).
 
-`-XX:AOTConfiguration=`*configfile*
+[`-XX:AOTConfiguration=`]{#-XX_AOTConfiguration}*configfile*
 :   Specifies the AOT Configuration file for the JVM to write to or read from.
     The standard extension for *configfile* is `.aotconfig`.
 
@@ -4098,7 +4078,7 @@ The AOT cache can be used with the following command-line options:
     The *configfile* is read by AOT mode `create`, and written by the other applicable modes.
     If the AOT mode is `auto`, then `AOTCacheOutput` must also be present.
 
-`-XX:AOTMode=`*mode*
+[`-XX:AOTMode=`]{#-XX_AOTMode}*mode*
 :   Specifies the AOT Mode for this run.
     *mode* must be one of the following: `auto`, `off`, `record`, `create`, or `on`.
 
@@ -4170,7 +4150,7 @@ The AOT cache can be used with the following command-line options:
        options are compatible with the AOT cache. An alternative is to run your application with
        `-XX:AOTMode=auto -Xlog:aot` to see if the AOT cache can be used or not.
 
-`-XX:+AOTClassLinking`
+[`-XX:+AOTClassLinking`]{#-XX__AOTClassLinking}
 :   If this option is enabled, the JVM will perform more advanced optimizations (such
     as ahead-of-time resolution of invokedynamic instructions)
     when creating the AOT cache. As a result, the application will see further improvements
diff --git a/src/java.base/share/man/keytool.md b/src/java.base/share/man/keytool.md
index 19ba8c34912..1d70bd2f5f8 100644
--- a/src/java.base/share/man/keytool.md
+++ b/src/java.base/share/man/keytool.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -211,7 +211,7 @@ perform.
 
 ## Commands for Creating or Adding Data to the Keystore
 
-`-gencert`
+[`-gencert`]{#command-gencert}
 :   The following are the available options for the `-gencert` command:
 
     -   {`-rfc`}: Output in RFC (Request For Comment) style
@@ -328,7 +328,7 @@ perform.
 
     >   `keytool -alias e1 -certreq | keytool -alias ca2 -gencert > e1.cert`
 
-`-genkeypair`
+[`-genkeypair`]{#option-genkeypair}
 :   The following are the available options for the `-genkeypair` command:
 
     -   {`-alias` *alias*}: Alias name of the entry to process
@@ -478,7 +478,7 @@ perform.
     specified by `-startdate`, or the current date when `-startdate` isn't
     specified) for which the certificate should be considered valid.
 
-`-genseckey`
+[`-genseckey`]{#command-genseckey}
 :   The following are the available options for the `-genseckey` command:
 
     -   {`-alias` *alias*}: Alias name of the entry to process
@@ -521,7 +521,7 @@ perform.
     the same password that is used for the `-keystore`. The `-keypass` value
     must contain at least six characters.
 
-`-importcert`
+[`-importcert`]{#command-importcert}
 :   The following are the available options for the `-importcert` command:
 
     -   {`-noprompt`}: Do not prompt
@@ -586,7 +586,7 @@ perform.
     entry, then the `keytool` command assumes that you're importing a
     certificate reply.
 
-`-importpass`
+[`-importpass`]{#command-importpass}
 :   The following are the available options for the `-importpass` command:
 
     -   {`-alias` *alias*}: Alias name of the entry to process
@@ -629,7 +629,7 @@ perform.
 
 ## Commands for Importing Contents from Another Keystore
 
-`-importkeystore`
+[`-importkeystore`]{#command-importkeystore}
 :   The following are the available options for the `-importkeystore` command:
 
     -   `-srckeystore` *keystore*: Source keystore name
@@ -724,7 +724,7 @@ perform.
 
 ## Commands for Generating a Certificate Request
 
-`-certreq`
+[`-certreq`]{#command-certreq}
 :   The following are the available options for the `-certreq` command:
 
     -   {`-alias` *alias*}: Alias name of the entry to process
@@ -786,7 +786,7 @@ perform.
 
 ## Commands for Exporting Data
 
-`-exportcert`
+[`-exportcert`]{#command-exportcert}
 :   The following are the available options for the `-exportcert` command:
 
     -   {`-rfc`}: Output in RFC style
@@ -834,7 +834,7 @@ perform.
 
 ## Commands for Displaying Data
 
-`-list`
+[`-list`]{#command-list}
 :   The following are the available options for the `-list` command:
 
     -   {`-rfc`}: Output in RFC style
@@ -881,7 +881,7 @@ perform.
     You can't specify both `-v` and `-rfc` in the same command. Otherwise, an
     error is reported.
 
-`-printcert`
+[`-printcert`]{#command-printcert}
 :   The following are the available options for the `-printcert` command:
 
     -   {`-rfc`}: Output in RFC style
@@ -946,7 +946,7 @@ perform.
     trusted certificate in the user keystore (specified by `-keystore`) or in
     the `cacerts` keystore (if `-trustcacerts` is specified).
 
-`-printcertreq`
+[`-printcertreq`]{#command-printcertreq}
 :   The following are the available options for the `-printcertreq` command:
 
     -   {`-file` *file*}: Input file name
@@ -958,7 +958,7 @@ perform.
     command. The command reads the request from file. If there is no file, then
     the request is read from the standard input.
 
-`-printcrl`
+[`-printcrl`]{#command-printcrl}
 :   The following are the available options for the `-printcrl` command:
 
     -   {`-file crl`}: Input file name
@@ -999,7 +999,7 @@ perform.
 
 ## Commands for Managing the Keystore
 
-`-storepasswd`
+[`-storepasswd`]{#command-storepasswd}
 :   The following are the available options for the `-storepasswd` command:
 
     -   \[`-new` *arg*\]: New password
@@ -1029,7 +1029,7 @@ perform.
     integrity of the keystore contents. The new password is set by `-new` *arg*
     and must contain at least six characters.
 
-`-keypasswd`
+[`-keypasswd`]{#command-keypasswd}
 :   The following are the available options for the `-keypasswd` command:
 
     -   {`-alias` *alias*}: Alias name of the entry to process
@@ -1069,7 +1069,7 @@ perform.
     If the `-new` option isn't provided at the command line, then the user is
     prompted for it.
 
-`-delete`
+[`-delete`]{#command-delete}
 :   The following are the available options for the `-delete` command:
 
     -   \[`-alias` *alias*\]: Alias name of the entry to process
@@ -1101,7 +1101,7 @@ perform.
     keystore. When not provided at the command line, the user is prompted for
     the `alias`.
 
-`-changealias`
+[`-changealias`]{#command-changealias}
 :   The following are the available options for the `-changealias` command:
 
     -   {`-alias` *alias*}: Alias name of the entry to process
@@ -1143,7 +1143,7 @@ perform.
 
 ## Commands for Displaying Security-related Information
 
-`-showinfo`
+[`-showinfo`]{#command-showinfo}
 :   The following are the available options for the `-showinfo` command:
 
     -   {`-tls`}: Displays TLS configuration information
@@ -1185,10 +1185,10 @@ environment or memory usage. For a list of possible interpreter options, enter
 
 These options can appear for all commands operating on a keystore:
 
-`-storetype` *storetype*
+[`-storetype`]{#option-storetype} *storetype*
 :   This qualifier specifies the type of keystore to be instantiated.
 
-`-keystore` *keystore*
+[`-keystore`]{#option-keystore} *keystore*
 :   The keystore location.
 
     If the JKS `storetype` is used and a keystore file doesn't yet exist, then
@@ -1206,13 +1206,13 @@ These options can appear for all commands operating on a keystore:
     if the keystore isn't file-based. For example, when the keystore resides on
     a hardware token device.
 
-`-cacerts` *cacerts*
+[`-cacerts`]{#option-cacerts} *cacerts*
 :   Operates on the *cacerts* keystore . This option is equivalent to
     `-keystore` *path\_to\_cacerts* `-storetype` *type\_of\_cacerts*. An error
     is reported if the `-keystore` or `-storetype` option is used with the
     `-cacerts` option.
 
-`-storepass` \[`:env` \| `:file` \] *argument*
+[`-storepass`]{#option-storepass} \[`:env` \| `:file` \] *argument*
 :   The password that is used to protect the integrity of the keystore.
 
     If the modifier `env` or `file` isn't specified, then the password has the
@@ -1237,22 +1237,22 @@ These options can appear for all commands operating on a keystore:
     a password is not specified, then the integrity of the retrieved
     information can't be verified and a warning is displayed.
 
-`-providername` *name*
+[`-providername`]{#option-providername} *name*
 :   Used to identify a cryptographic service provider's name when listed in the
     security properties file.
 
-`-addprovider` *name*
+[`-addprovider`]{#option-addprovider} *name*
 :   Used to add a security provider by name (such as SunPKCS11) .
 
-`-providerclass` *class*
+[`-providerclass`]{#option-providerclass} *class*
 :   Used to specify the name of a cryptographic service provider's master class
     file when the service provider isn't listed in the security properties
     file.
 
-`-providerpath` *list*
+[`-providerpath`]{#option-providerpath} *list*
 :   Used to specify the provider classpath.
 
-`-providerarg` *arg*
+[`-providerarg`]{#option-providerarg} *arg*
 :   Used with the `-addprovider` or `-providerclass` option to represent an
     optional string input argument for the constructor of *class* name.
 
@@ -1263,7 +1263,7 @@ These options can appear for all commands operating on a keystore:
     following two options, `-srcprotected` and `-destprotected`, are provided
     for the source keystore and the destination keystore respectively.
 
-`-ext` {*name*{`:critical`} {`=`*value*}}
+[`-ext`]{#option-ext} {*name*{`:critical`} {`=`*value*}}
 :   Denotes an X.509 certificate extension. The option can be used in
     `-genkeypair` and `-gencert` to embed extensions into the generated
     certificate, or in `-certreq` to show what extensions are requested in the
@@ -1276,7 +1276,7 @@ These options can appear for all commands operating on a keystore:
     `isCritical` attribute is `true`; otherwise, it is `false`. You can use
     `:c` in place of `:critical`.
 
-`-conf` *file*
+[`-conf`]{#option-conf} *file*
 :   Specifies a pre-configured options file.
 
 ## Pre-configured options file
diff --git a/src/java.base/share/native/libjava/Thread.c b/src/java.base/share/native/libjava/Thread.c
index 4ac30638bc2..15e9614ae73 100644
--- a/src/java.base/share/native/libjava/Thread.c
+++ b/src/java.base/share/native/libjava/Thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ static JNINativeMethod methods[] = {
     {"holdsLock",        "(" OBJ ")Z", (void *)&JVM_HoldsLock},
     {"getThreads",       "()[" THD,    (void *)&JVM_GetAllThreads},
     {"dumpThreads",      "([" THD ")[[" STE, (void *)&JVM_DumpThreads},
-    {"getStackTrace0",   "()" OBJ,     (void *)&JVM_GetStackTrace},
+    {"getStackTrace0",   "()[" STE,    (void *)&JVM_GetStackTrace},
     {"setNativeName",    "(" STR ")V", (void *)&JVM_SetNativeThreadName},
     {"scopedValueCache", "()[" OBJ,    (void *)&JVM_ScopedValueCache},
     {"setScopedValueCache", "([" OBJ ")V",(void *)&JVM_SetScopedValueCache},
diff --git a/src/java.base/share/native/libjimage/endian.cpp b/src/java.base/share/native/libjimage/endian.cpp
index 5e13ffba34e..73d8aefe086 100644
--- a/src/java.base/share/native/libjimage/endian.cpp
+++ b/src/java.base/share/native/libjimage/endian.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -104,6 +104,3 @@ void Endian::set_java(u1* p, u2 x) {
     p[1] = x & 0xff;
 }
 
-Endian* Endian::get_native_handler() {
-    return NativeEndian::get_native();
-}
diff --git a/src/java.base/share/native/libjimage/endian.hpp b/src/java.base/share/native/libjimage/endian.hpp
index 42fbbb0e853..38e566b7524 100644
--- a/src/java.base/share/native/libjimage/endian.hpp
+++ b/src/java.base/share/native/libjimage/endian.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -74,9 +74,6 @@ public:
     // Select an appropriate endian handler.
     static Endian* get_handler(bool big_endian);
 
-    // Return the native endian handler.
-    static Endian* get_native_handler();
-
     // get platform u2 from Java Big endian
     static u2 get_java(u1* x);
     // set platform u2 to Java Big endian
diff --git a/src/java.base/share/native/libjimage/imageDecompressor.cpp b/src/java.base/share/native/libjimage/imageDecompressor.cpp
index 748bbf8203f..4946e645c55 100644
--- a/src/java.base/share/native/libjimage/imageDecompressor.cpp
+++ b/src/java.base/share/native/libjimage/imageDecompressor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -85,10 +85,6 @@ void ImageDecompressor::image_decompressor_init() {
     }
 }
 
-void ImageDecompressor::image_decompressor_close() {
-    delete[] _decompressors;
-}
-
 /*
  * Locate decompressor.
  */
diff --git a/src/java.base/share/native/libjimage/imageDecompressor.hpp b/src/java.base/share/native/libjimage/imageDecompressor.hpp
index 16f354935c3..709e1a3bb21 100644
--- a/src/java.base/share/native/libjimage/imageDecompressor.hpp
+++ b/src/java.base/share/native/libjimage/imageDecompressor.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -105,12 +105,12 @@ private:
 protected:
     ImageDecompressor(const char* name) : _name(name) {
     }
+
     virtual void decompress_resource(u1* data, u1* uncompressed,
         ResourceHeader* header, const ImageStrings* strings) = 0;
 
 public:
     static void image_decompressor_init();
-    static void image_decompressor_close();
     static ImageDecompressor* get_decompressor(const char * decompressor_name) ;
     static void decompress_resource(u1* compressed, u1* uncompressed,
         u8 uncompressed_size, const ImageStrings* strings, Endian* _endian);
@@ -166,6 +166,6 @@ private:
 public:
     SharedStringDecompressor(const char* sym) : ImageDecompressor(sym){}
     void decompress_resource(u1* data, u1* uncompressed, ResourceHeader* header,
-    const ImageStrings* strings);
+        const ImageStrings* strings);
 };
 #endif // LIBJIMAGE_IMAGEDECOMPRESSOR_HPP
diff --git a/src/java.base/share/native/libjimage/imageFile.cpp b/src/java.base/share/native/libjimage/imageFile.cpp
index d97a8f95a60..e2479ba2c9e 100644
--- a/src/java.base/share/native/libjimage/imageFile.cpp
+++ b/src/java.base/share/native/libjimage/imageFile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -180,16 +180,6 @@ void ImageFileReaderTable::remove(ImageFileReader* image) {
     }
 }
 
-// Determine if image entry is in table.
-bool ImageFileReaderTable::contains(ImageFileReader* image) {
-    for (u4 i = 0; i < _count; i++) {
-        if (_table[i] == image) {
-            return true;
-        }
-    }
-    return false;
-}
-
 // Table to manage multiple opens of an image file.
 ImageFileReaderTable ImageFileReader::_reader_table;
 
@@ -261,25 +251,6 @@ void ImageFileReader::close(ImageFileReader *reader) {
     }
 }
 
-// Return an id for the specified ImageFileReader.
-u8 ImageFileReader::reader_to_ID(ImageFileReader *reader) {
-    // ID is just the cloaked reader address.
-    return (u8)reader;
-}
-
-// Validate the image id.
-bool ImageFileReader::id_check(u8 id) {
-    // Make sure the ID is a managed (_reader_table) reader.
-    SimpleCriticalSectionLock cs(&_reader_table_lock);
-    return _reader_table.contains((ImageFileReader*)id);
-}
-
-// Return an id for the specified ImageFileReader.
-ImageFileReader* ImageFileReader::id_to_reader(u8 id) {
-    assert(id_check(id) && "invalid image id");
-    return (ImageFileReader*)id;
-}
-
 // Constructor initializes to a closed state.
 ImageFileReader::ImageFileReader(const char* name, bool big_endian) {
     // Copy the image file name.
@@ -372,23 +343,6 @@ bool ImageFileReader::read_at(u1* data, u8 size, u8 offset) const {
     return (u8)osSupport::read(_fd, (char*)data, size, offset) == size;
 }
 
-// Find the location attributes associated with the path.    Returns true if
-// the location is found, false otherwise.
-bool ImageFileReader::find_location(const char* path, ImageLocation& location) const {
-    // Locate the entry in the index perfect hash table.
-    s4 index = ImageStrings::find(_endian, path, _redirect_table, table_length());
-    // If is found.
-    if (index != ImageStrings::NOT_FOUND) {
-        // Get address of first byte of location attribute stream.
-        u1* data = get_location_data(index);
-        // Expand location attributes.
-        location.set_data(data);
-        // Make sure result is not a false positive.
-        return verify_location(location, path);
-    }
-    return false;
-}
-
 // Find the location index and size associated with the path.
 // Returns the location index and size if the location is found, 0 otherwise.
 u4 ImageFileReader::find_location_index(const char* path, u8 *size) const {
diff --git a/src/java.base/share/native/libjimage/imageFile.hpp b/src/java.base/share/native/libjimage/imageFile.hpp
index 5fb4ea3baaa..a4c8d159efa 100644
--- a/src/java.base/share/native/libjimage/imageFile.hpp
+++ b/src/java.base/share/native/libjimage/imageFile.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -375,9 +375,6 @@ public:
 
     // Remove an image entry from the table.
     void remove(ImageFileReader* image);
-
-    // Determine if image entry is in table.
-    bool contains(ImageFileReader* image);
 };
 
 // Manage the image file.
@@ -445,15 +442,6 @@ public:
     // Close an image file if the file is not in use elsewhere.
     static void close(ImageFileReader *reader);
 
-    // Return an id for the specified ImageFileReader.
-    static u8 reader_to_ID(ImageFileReader *reader);
-
-    // Validate the image id.
-    static bool id_check(u8 id);
-
-    // Return an id for the specified ImageFileReader.
-    static ImageFileReader* id_to_reader(u8 id);
-
     // Open image file for read access.
     bool open();
 
@@ -545,10 +533,6 @@ public:
         return _endian->get(_offsets_table[index]);
     }
 
-    // Find the location attributes associated with the path.    Returns true if
-    // the location is found, false otherwise.
-    bool find_location(const char* path, ImageLocation& location) const;
-
     // Find the location index and size associated with the path.
     // Returns the location index and size if the location is found,
     // ImageFileReader::NOT_FOUND otherwise.
diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
index 6072bff50c6..4621ab588d1 100644
--- a/src/java.base/share/native/libjli/java.c
+++ b/src/java.base/share/native/libjli/java.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1505,6 +1505,7 @@ InitializeJVM(JavaVM **pvm, JNIEnv **penv, InvocationFunctions *ifn)
 
     r = ifn->CreateJavaVM(pvm, (void **)penv, &args);
     JLI_MemFree(options);
+    options = NULL;
     return r == JNI_OK;
 }
 
@@ -2203,6 +2204,7 @@ FreeKnownVMs()
         knownVMs[i].name = NULL;
     }
     JLI_MemFree(knownVMs);
+    knownVMs = NULL;
 }
 
 /*
@@ -2276,8 +2278,9 @@ ShowSplashScreen()
     (void)UnsetEnv(SPLASH_JAR_ENV_ENTRY);
 
     JLI_MemFree(splash_jar_entry);
+    splash_jar_entry = NULL;
     JLI_MemFree(splash_file_entry);
-
+    splash_file_entry = NULL;
 }
 
 static const char* GetFullVersion()
diff --git a/src/java.base/share/native/libzip/zlib/ChangeLog b/src/java.base/share/native/libzip/zlib/ChangeLog
index b801a1031ec..312753edade 100644
--- a/src/java.base/share/native/libzip/zlib/ChangeLog
+++ b/src/java.base/share/native/libzip/zlib/ChangeLog
@@ -1,6 +1,57 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.3.2 (17 Feb 2026)
+- Continued rewrite of CMake build [Vollstrecker]
+- Various portability improvements
+- Various github workflow additions and improvements
+- Check for negative lengths in crc32_combine functions
+- Copy only the initialized window contents in inflateCopy
+- Prevent the use of insecure functions without an explicit request
+- Add compressBound_z and deflateBound_z functions for large values
+- Use atomics to build inflate fixed tables once
+- Add definition of ZLIB_INSECURE to build tests with c89 and c94
+- Add --undefined option to ./configure for UBSan checker
+- Copy only the initialized deflate state in deflateCopy
+- Zero inflate state on allocation
+- Remove untgz from contrib
+- Add _z versions of the compress and uncompress functions
+- Vectorize the CRC-32 calculation on the s390x
+- Set bit 11 of the zip header flags in minizip if UTF-8
+- Update OS/400 support
+- Add a test to configure to check for a working compiler
+- Check for invalid NULL pointer inputs to zlib operations
+- Add --mandir to ./configure to specify manual directory
+- Add LICENSE.Info-Zip to contrib/minizip
+- Remove vstudio projects in lieu of cmake-generated projects
+- Replace strcpy() with memcpy() in contrib/minizip
+
+Changes in 1.3.1.2 (8 Dec 2025)
+- Improve portability to RISC OS
+- Permit compiling contrib/minizip/unzip.c with decryption
+- Enable build of shared library on AIX
+- Make deflateBound() more conservative and handle Z_STREAM_END
+- Add zipAlreadyThere() to minizip zip.c to help avoid duplicates
+- Make z_off_t 64 bits by default
+- Add deflateUsed() function to get the used bits in the last byte
+- Avoid out-of-bounds pointer arithmetic in inflateCopy()
+- Add Haiku to configure for proper LDSHARED settings
+- Add Bazel targets
+- Complete rewrite of CMake build [Vollstrecker]
+- Clarify the use of errnum in gzerror()
+- Note that gzseek() requests are deferred until the next operation
+- Note the use of gzungetc() to run a deferred seek while reading
+- Fix bug in inflatePrime() for 16-bit ints
+- Add a "G" option to force gzip, disabling transparency in gzread()
+- Improve the discrimination between trailing garbage and bad gzip
+- Allow gzflush() to write empty gzip members
+- Remove redundant frees of point list on error in examples/zran.c
+- Clarify the use of inflateGetHeader()
+- Update links to the RFCs
+- Return all available uncompressed data on error in gzread.c
+- Support non-blocking devices in the gz* routines
+- Various other small improvements
+
 Changes in 1.3.1 (22 Jan 2024)
 - Reject overflows of zip header fields in minizip
 - Fix bug in inflateSync() for data held in bit buffer
diff --git a/src/java.base/share/native/libzip/zlib/README b/src/java.base/share/native/libzip/zlib/README
index c5f917540b6..2b1e6f36fe3 100644
--- a/src/java.base/share/native/libzip/zlib/README
+++ b/src/java.base/share/native/libzip/zlib/README
@@ -1,10 +1,10 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.3.1 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
-rfc1952 (gzip format).
+zlib 1.3.2 is a general purpose data compression library.  All the code is
+thread safe (though see the FAQ for caveats).  The data format used by the zlib
+library is described by RFCs (Request for Comments) 1950 to 1952 at
+https://datatracker.ietf.org/doc/html/rfc1950 (zlib format), rfc1951 (deflate
+format) and rfc1952 (gzip format).
 
 All functions of the compression library are documented in the file zlib.h
 (volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
@@ -21,17 +21,17 @@ make_vms.com.
 
 Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
 <info@winimage.com> for the Windows DLL version.  The zlib home page is
-http://zlib.net/ .  Before reporting a problem, please check this site to
+https://zlib.net/ .  Before reporting a problem, please check this site to
 verify that you have the latest version of zlib; otherwise get the latest
 version and check whether the problem still exists or not.
 
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+PLEASE read the zlib FAQ https://zlib.net/zlib_faq.html before asking for help.
 
 Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
-https://marknelson.us/posts/1997/01/01/zlib-engine.html .
+https://zlib.net/nelson/ .
 
-The changes made in version 1.3.1 are documented in the file ChangeLog.
+The changes made in version 1.3.2 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -43,9 +43,9 @@ can be found at https://github.com/pmqs/IO-Compress .
 
 A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
 available in Python 1.5 and later versions, see
-http://docs.python.org/library/zlib.html .
+https://docs.python.org/3/library/zlib.html .
 
-zlib is built into tcl: http://wiki.tcl.tk/4610 .
+zlib is built into tcl: https://wiki.tcl-lang.org/page/zlib .
 
 An experimental package to read and write files in .zip format, written on top
 of zlib by Gilles Vollant <info@winimage.com>, is available in the
@@ -69,9 +69,7 @@ Notes for some targets:
 - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
   other compilers. Use "make test" to check your compiler.
 
-- gzdopen is not supported on RISCOS or BEOS.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
+- For PalmOs, see https://palmzlib.sourceforge.net/
 
 
 Acknowledgments:
@@ -83,7 +81,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2024 Jean-loup Gailly and Mark Adler
+ (C) 1995-2026 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/src/java.base/share/native/libzip/zlib/compress.c b/src/java.base/share/native/libzip/zlib/compress.c
index d7421379673..54346ad2a2f 100644
--- a/src/java.base/share/native/libzip/zlib/compress.c
+++ b/src/java.base/share/native/libzip/zlib/compress.c
@@ -23,7 +23,7 @@
  */
 
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,13 +42,19 @@
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
+
+     The _z versions of the functions take size_t length arguments.
 */
-int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
-                      uLong sourceLen, int level) {
+int ZEXPORT compress2_z(Bytef *dest, z_size_t *destLen, const Bytef *source,
+                        z_size_t sourceLen, int level) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
-    uLong left;
+    z_size_t left;
+
+    if ((sourceLen > 0 && source == NULL) ||
+        destLen == NULL || (*destLen > 0 && dest == NULL))
+        return Z_STREAM_ERROR;
 
     left = *destLen;
     *destLen = 0;
@@ -67,23 +73,36 @@ int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
 
     do {
         if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            stream.avail_out = left > (z_size_t)max ? max : (uInt)left;
             left -= stream.avail_out;
         }
         if (stream.avail_in == 0) {
-            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
+            stream.avail_in = sourceLen > (z_size_t)max ? max :
+                                                          (uInt)sourceLen;
             sourceLen -= stream.avail_in;
         }
         err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
     } while (err == Z_OK);
 
-    *destLen = stream.total_out;
+    *destLen = (z_size_t)(stream.next_out - dest);
     deflateEnd(&stream);
     return err == Z_STREAM_END ? Z_OK : err;
 }
-
+int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                      uLong sourceLen, int level) {
+    int ret;
+    z_size_t got = *destLen;
+    ret = compress2_z(dest, &got, source, sourceLen, level);
+    *destLen = (uLong)got;
+    return ret;
+}
 /* ===========================================================================
  */
+int ZEXPORT compress_z(Bytef *dest, z_size_t *destLen, const Bytef *source,
+                       z_size_t sourceLen) {
+    return compress2_z(dest, destLen, source, sourceLen,
+                       Z_DEFAULT_COMPRESSION);
+}
 int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source,
                      uLong sourceLen) {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
@@ -93,7 +112,12 @@ int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source,
      If the default memLevel or windowBits for deflateInit() is changed, then
    this function needs to be updated.
  */
-uLong ZEXPORT compressBound(uLong sourceLen) {
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
+z_size_t ZEXPORT compressBound_z(z_size_t sourceLen) {
+    z_size_t bound = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+                     (sourceLen >> 25) + 13;
+    return bound < sourceLen ? (z_size_t)-1 : bound;
+}
+uLong ZEXPORT compressBound(uLong sourceLen) {
+    z_size_t bound = compressBound_z(sourceLen);
+    return (uLong)bound != bound ? (uLong)-1 : (uLong)bound;
 }
diff --git a/src/java.base/share/native/libzip/zlib/deflate.c b/src/java.base/share/native/libzip/zlib/deflate.c
index 57fc6802bb8..0ec56ec5691 100644
--- a/src/java.base/share/native/libzip/zlib/deflate.c
+++ b/src/java.base/share/native/libzip/zlib/deflate.c
@@ -23,7 +23,7 @@
  */
 
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -61,7 +61,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
+ *      Available at https://datatracker.ietf.org/doc/html/rfc1951
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -76,7 +76,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.3.2 Copyright 1995-2026 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -194,8 +194,8 @@ local const config configuration_table[10] = {
 #define CLEAR_HASH(s) \
     do { \
         s->head[s->hash_size - 1] = NIL; \
-        zmemzero((Bytef *)s->head, \
-                 (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
+        zmemzero(s->head, (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
+        s->slid = 0; \
     } while (0)
 
 /* ===========================================================================
@@ -219,8 +219,8 @@ local void slide_hash(deflate_state *s) {
         m = *--p;
         *p = (Pos)(m >= wsize ? m - wsize : NIL);
     } while (--n);
-    n = wsize;
 #ifndef FASTEST
+    n = wsize;
     p = &s->prev[n];
     do {
         m = *--p;
@@ -230,6 +230,7 @@ local void slide_hash(deflate_state *s) {
          */
     } while (--n);
 #endif
+    s->slid = 1;
 }
 
 /* ===========================================================================
@@ -283,7 +284,14 @@ local void fill_window(deflate_state *s) {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
         /* Deal with !@#$% 64K limit: */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4127)
+#endif
         if (sizeof(int) <= 2) {
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
             if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
                 more = wsize;
 
@@ -455,6 +463,7 @@ int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
     if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
     s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
     if (s == Z_NULL) return Z_MEM_ERROR;
+    zmemzero(s, sizeof(deflate_state));
     strm->state = (struct internal_state FAR *)s;
     s->strm = strm;
     s->status = INIT_STATE;     /* to pass state test in deflateReset() */
@@ -736,10 +745,23 @@ int ZEXPORT deflateSetHeader(z_streamp strm, gz_headerp head) {
 /* ========================================================================= */
 int ZEXPORT deflatePending(z_streamp strm, unsigned *pending, int *bits) {
     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    if (pending != Z_NULL)
-        *pending = strm->state->pending;
     if (bits != Z_NULL)
         *bits = strm->state->bi_valid;
+    if (pending != Z_NULL) {
+        *pending = (unsigned)strm->state->pending;
+        if (*pending != strm->state->pending) {
+            *pending = (unsigned)-1;
+            return Z_BUF_ERROR;
+        }
+    }
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateUsed(z_streamp strm, int *bits) {
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_used;
     return Z_OK;
 }
 
@@ -855,28 +877,34 @@ int ZEXPORT deflateTune(z_streamp strm, int good_length, int max_lazy,
  *
  * Shifts are used to approximate divisions, for speed.
  */
-uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {
+z_size_t ZEXPORT deflateBound_z(z_streamp strm, z_size_t sourceLen) {
     deflate_state *s;
-    uLong fixedlen, storelen, wraplen;
+    z_size_t fixedlen, storelen, wraplen, bound;
 
     /* upper bound for fixed blocks with 9-bit literals and length 255
        (memLevel == 2, which is the lowest that may not use stored blocks) --
        ~13% overhead plus a small constant */
     fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
                (sourceLen >> 9) + 4;
+    if (fixedlen < sourceLen)
+        fixedlen = (z_size_t)-1;
 
     /* upper bound for stored blocks with length 127 (memLevel == 1) --
        ~4% overhead plus a small constant */
     storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
                (sourceLen >> 11) + 7;
+    if (storelen < sourceLen)
+        storelen = (z_size_t)-1;
 
-    /* if can't get parameters, return larger bound plus a zlib wrapper */
-    if (deflateStateCheck(strm))
-        return (fixedlen > storelen ? fixedlen : storelen) + 6;
+    /* if can't get parameters, return larger bound plus a wrapper */
+    if (deflateStateCheck(strm)) {
+        bound = fixedlen > storelen ? fixedlen : storelen;
+        return bound + 18 < bound ? (z_size_t)-1 : bound + 18;
+    }
 
     /* compute wrapper length */
     s = strm->state;
-    switch (s->wrap) {
+    switch (s->wrap < 0 ? -s->wrap : s->wrap) {
     case 0:                                 /* raw deflate */
         wraplen = 0;
         break;
@@ -906,18 +934,25 @@ uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {
         break;
 #endif
     default:                                /* for compiler happiness */
-        wraplen = 6;
+        wraplen = 18;
     }
 
     /* if not default parameters, return one of the conservative bounds */
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return (s->w_bits <= s->hash_bits && s->level ? fixedlen : storelen) +
-               wraplen;
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7) {
+        bound = s->w_bits <= s->hash_bits && s->level ? fixedlen :
+                                                        storelen;
+        return bound + wraplen < bound ? (z_size_t)-1 : bound + wraplen;
+    }
 
     /* default settings: return tight bound for that case -- ~0.03% overhead
        plus a small constant */
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13 - 6 + wraplen;
+    bound = sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+            (sourceLen >> 25) + 13 - 6 + wraplen;
+    return bound < sourceLen ? (z_size_t)-1 : bound;
+}
+uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen) {
+    z_size_t bound = deflateBound_z(strm, sourceLen);
+    return (uLong)bound != bound ? (uLong)-1 : (uLong)bound;
 }
 
 /* =========================================================================
@@ -941,8 +976,8 @@ local void flush_pending(z_streamp strm) {
     deflate_state *s = strm->state;
 
     _tr_flush_bits(s);
-    len = s->pending;
-    if (len > strm->avail_out) len = strm->avail_out;
+    len = s->pending > strm->avail_out ? strm->avail_out :
+                                         (unsigned)s->pending;
     if (len == 0) return;
 
     zmemcpy(strm->next_out, s->pending_out, len);
@@ -962,8 +997,8 @@ local void flush_pending(z_streamp strm) {
 #define HCRC_UPDATE(beg) \
     do { \
         if (s->gzhead->hcrc && s->pending > (beg)) \
-            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
-                                s->pending - (beg)); \
+            strm->adler = crc32_z(strm->adler, s->pending_buf + (beg), \
+                                  s->pending - (beg)); \
     } while (0)
 
 /* ========================================================================= */
@@ -1097,8 +1132,8 @@ int ZEXPORT deflate(z_streamp strm, int flush) {
                 put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
             }
             if (s->gzhead->hcrc)
-                strm->adler = crc32(strm->adler, s->pending_buf,
-                                    s->pending);
+                strm->adler = crc32_z(strm->adler, s->pending_buf,
+                                      s->pending);
             s->gzindex = 0;
             s->status = EXTRA_STATE;
         }
@@ -1106,9 +1141,9 @@ int ZEXPORT deflate(z_streamp strm, int flush) {
     if (s->status == EXTRA_STATE) {
         if (s->gzhead->extra != Z_NULL) {
             ulg beg = s->pending;   /* start of bytes to update crc */
-            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
+            ulg left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
             while (s->pending + left > s->pending_buf_size) {
-                uInt copy = s->pending_buf_size - s->pending;
+                ulg copy = s->pending_buf_size - s->pending;
                 zmemcpy(s->pending_buf + s->pending,
                         s->gzhead->extra + s->gzindex, copy);
                 s->pending = s->pending_buf_size;
@@ -1319,12 +1354,13 @@ int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
 
     ss = source->state;
 
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy(dest, source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
+    zmemzero(ds, sizeof(deflate_state));
     dest->state = (struct internal_state FAR *) ds;
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    zmemcpy(ds, ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -1337,18 +1373,23 @@ int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
         deflateEnd (dest);
         return Z_MEM_ERROR;
     }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, ds->lit_bufsize * LIT_BUFS);
+    /* following zmemcpy's do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ss->high_water);
+    zmemcpy(ds->prev, ss->prev,
+            (ss->slid || ss->strstart - ss->insert > ds->w_size ? ds->w_size :
+                ss->strstart - ss->insert) * sizeof(Pos));
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    zmemcpy(ds->pending_out, ss->pending_out, ss->pending);
 #ifdef LIT_MEM
     ds->d_buf = (ushf *)(ds->pending_buf + (ds->lit_bufsize << 1));
     ds->l_buf = ds->pending_buf + (ds->lit_bufsize << 2);
+    zmemcpy(ds->d_buf, ss->d_buf, ss->sym_next * sizeof(ush));
+    zmemcpy(ds->l_buf, ss->l_buf, ss->sym_next);
 #else
     ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+    zmemcpy(ds->sym_buf, ss->sym_buf, ss->sym_next);
 #endif
 
     ds->l_desc.dyn_tree = ds->dyn_ltree;
@@ -1371,9 +1412,9 @@ int ZEXPORT deflateCopy(z_streamp dest, z_streamp source) {
  */
 local uInt longest_match(deflate_state *s, IPos cur_match) {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                      /* matched string */
-    register int len;                           /* length of current match */
+    Bytef *scan = s->window + s->strstart;      /* current string */
+    Bytef *match;                               /* matched string */
+    int len;                                    /* length of current match */
     int best_len = (int)s->prev_length;         /* best match length so far */
     int nice_match = s->nice_match;             /* stop if match long enough */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -1388,13 +1429,13 @@ local uInt longest_match(deflate_state *s, IPos cur_match) {
     /* Compare two bytes at a time. Note: this is not always beneficial.
      * Try with and without -DUNALIGNED_OK to check.
      */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan + best_len - 1);
+    Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    ush scan_start = *(ushf*)scan;
+    ush scan_end   = *(ushf*)(scan + best_len - 1);
 #else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len - 1];
-    register Byte scan_end   = scan[best_len];
+    Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    Byte scan_end1  = scan[best_len - 1];
+    Byte scan_end   = scan[best_len];
 #endif
 
     /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
@@ -1518,10 +1559,10 @@ local uInt longest_match(deflate_state *s, IPos cur_match) {
  * Optimized version for FASTEST only
  */
 local uInt longest_match(deflate_state *s, IPos cur_match) {
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    Bytef *scan = s->window + s->strstart;      /* current string */
+    Bytef *match;                               /* matched string */
+    int len;                                    /* length of current match */
+    Bytef *strend = s->window + s->strstart + MAX_MATCH;
 
     /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
      * It is easy to get rid of this optimization if necessary.
@@ -1581,7 +1622,7 @@ local uInt longest_match(deflate_state *s, IPos cur_match) {
 local void check_match(deflate_state *s, IPos start, IPos match, int length) {
     /* check that the match is indeed a match */
     Bytef *back = s->window + (int)match, *here = s->window + start;
-    IPos len = length;
+    IPos len = (IPos)length;
     if (match == (IPos)-1) {
         /* match starts one byte before the current window -- just compare the
            subsequent length-1 bytes */
@@ -1653,13 +1694,14 @@ local block_state deflate_stored(deflate_state *s, int flush) {
      * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
      * large input and output buffers, the stored block size will be larger.
      */
-    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
+    unsigned min_block = (unsigned)(MIN(s->pending_buf_size - 5, s->w_size));
 
     /* Copy as many min_block or larger stored blocks directly to next_out as
      * possible. If flushing, copy the remaining available input to next_out as
      * stored blocks, if there is enough space.
      */
-    unsigned len, left, have, last = 0;
+    int last = 0;
+    unsigned len, left, have;
     unsigned used = s->strm->avail_in;
     do {
         /* Set len to the maximum size block that we can copy directly with the
@@ -1667,12 +1709,12 @@ local block_state deflate_stored(deflate_state *s, int flush) {
          * would be copied from what's left in the window.
          */
         len = MAX_STORED;       /* maximum deflate stored block length */
-        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        have = ((unsigned)s->bi_valid + 42) >> 3;   /* bytes in header */
         if (s->strm->avail_out < have)          /* need room for header */
             break;
             /* maximum stored block length that will fit in avail_out: */
         have = s->strm->avail_out - have;
-        left = s->strstart - s->block_start;    /* bytes left in window */
+        left = (unsigned)(s->strstart - s->block_start);    /* window bytes */
         if (len > (ulg)left + s->strm->avail_in)
             len = left + s->strm->avail_in;     /* limit len to the input */
         if (len > have)
@@ -1695,10 +1737,10 @@ local block_state deflate_stored(deflate_state *s, int flush) {
         _tr_stored_block(s, (char *)0, 0L, last);
 
         /* Replace the lengths in the dummy stored block with len. */
-        s->pending_buf[s->pending - 4] = len;
-        s->pending_buf[s->pending - 3] = len >> 8;
-        s->pending_buf[s->pending - 2] = ~len;
-        s->pending_buf[s->pending - 1] = ~len >> 8;
+        s->pending_buf[s->pending - 4] = (Bytef)len;
+        s->pending_buf[s->pending - 3] = (Bytef)(len >> 8);
+        s->pending_buf[s->pending - 2] = (Bytef)~len;
+        s->pending_buf[s->pending - 1] = (Bytef)(~len >> 8);
 
         /* Write the stored block header bytes. */
         flush_pending(s->strm);
@@ -1769,8 +1811,10 @@ local block_state deflate_stored(deflate_state *s, int flush) {
         s->high_water = s->strstart;
 
     /* If the last block was written to next_out, then done. */
-    if (last)
+    if (last) {
+        s->bi_used = 8;
         return finish_done;
+    }
 
     /* If flushing and all input has been consumed, then done. */
     if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
@@ -1778,7 +1822,7 @@ local block_state deflate_stored(deflate_state *s, int flush) {
         return block_done;
 
     /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart;
+    have = (unsigned)(s->window_size - s->strstart);
     if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
         /* Slide the window down. */
         s->block_start -= s->w_size;
@@ -1805,11 +1849,11 @@ local block_state deflate_stored(deflate_state *s, int flush) {
      * have enough input for a worthy block, or if flushing and there is enough
      * room for the remaining input as a stored block in the pending buffer.
      */
-    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+    have = ((unsigned)s->bi_valid + 42) >> 3;   /* bytes in header */
         /* maximum stored block length that will fit in pending: */
-    have = MIN(s->pending_buf_size - have, MAX_STORED);
+    have = (unsigned)MIN(s->pending_buf_size - have, MAX_STORED);
     min_block = MIN(have, s->w_size);
-    left = s->strstart - s->block_start;
+    left = (unsigned)(s->strstart - s->block_start);
     if (left >= min_block ||
         ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
          s->strm->avail_in == 0 && left <= have)) {
@@ -1822,6 +1866,8 @@ local block_state deflate_stored(deflate_state *s, int flush) {
     }
 
     /* We've done all we can with the available input and output. */
+    if (last)
+        s->bi_used = 8;
     return last ? finish_started : need_more;
 }
 
@@ -1870,7 +1916,7 @@ local block_state deflate_fast(deflate_state *s, int flush) {
             /* longest_match() sets match_start */
         }
         if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
+            check_match(s, s->strstart, s->match_start, (int)s->match_length);
 
             _tr_tally_dist(s, s->strstart - s->match_start,
                            s->match_length - MIN_MATCH, bflush);
@@ -1992,7 +2038,7 @@ local block_state deflate_slow(deflate_state *s, int flush) {
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
 
-            check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
+            check_match(s, s->strstart - 1, s->prev_match, (int)s->prev_length);
 
             _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
@@ -2100,7 +2146,7 @@ local block_state deflate_rle(deflate_state *s, int flush) {
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
         if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+            check_match(s, s->strstart, s->strstart - 1, (int)s->match_length);
 
             _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
 
diff --git a/src/java.base/share/native/libzip/zlib/deflate.h b/src/java.base/share/native/libzip/zlib/deflate.h
index 830d46b8894..5b6246ee3c4 100644
--- a/src/java.base/share/native/libzip/zlib/deflate.h
+++ b/src/java.base/share/native/libzip/zlib/deflate.h
@@ -23,7 +23,7 @@
  */
 
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2024 Jean-loup Gailly
+ * Copyright (C) 1995-2026 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -295,6 +295,9 @@ typedef struct internal_state {
     /* Number of valid bits in bi_buf.  All bits above the last valid bit
      * are always zero.
      */
+    int bi_used;
+    /* Last number of used bits when going to a byte boundary.
+     */
 
     ulg high_water;
     /* High water mark offset in window for initialized bytes -- bytes above
@@ -303,6 +306,9 @@ typedef struct internal_state {
      * updated to the new high water mark.
      */
 
+    int slid;
+    /* True if the hash table has been slid since it was cleared. */
+
 } FAR deflate_state;
 
 /* Output a byte on the stream.
diff --git a/src/java.base/share/native/libzip/zlib/gzguts.h b/src/java.base/share/native/libzip/zlib/gzguts.h
index 8cce2c69d24..0be646016ed 100644
--- a/src/java.base/share/native/libzip/zlib/gzguts.h
+++ b/src/java.base/share/native/libzip/zlib/gzguts.h
@@ -23,7 +23,7 @@
  */
 
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004-2024 Mark Adler
+ * Copyright (C) 2004-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -41,6 +41,18 @@
 #  define ZLIB_INTERNAL
 #endif
 
+#if defined(_WIN32)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  ifndef _CRT_SECURE_NO_WARNINGS
+#    define _CRT_SECURE_NO_WARNINGS
+#  endif
+#  ifndef _CRT_NONSTDC_NO_DEPRECATE
+#    define _CRT_NONSTDC_NO_DEPRECATE
+#  endif
+#endif
+
 #include <stdio.h>
 #include "zlib.h"
 #ifdef STDC
@@ -49,8 +61,8 @@
 #  include <limits.h>
 #endif
 
-#ifndef _POSIX_SOURCE
-#  define _POSIX_SOURCE
+#ifndef _POSIX_C_SOURCE
+#  define _POSIX_C_SOURCE 200112L
 #endif
 #include <fcntl.h>
 
@@ -60,19 +72,13 @@
 
 #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
 #  include <io.h>
+#  include <sys/stat.h>
 #endif
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(WIDECHAR)
 #  define WIDECHAR
 #endif
 
-#ifdef WINAPI_FAMILY
-#  define open _open
-#  define read _read
-#  define write _write
-#  define close _close
-#endif
-
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS
 #endif
@@ -96,33 +102,28 @@
 #endif
 
 #ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
+#  if !defined(NO_vsnprintf) && \
+      (defined(MSDOS) || defined(__TURBOC__) || defined(__SASC) || \
+       defined(VMS) || defined(__OS400) || defined(__MVS__))
 /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
    but for now we just assume it doesn't. */
 #    define NO_vsnprintf
 #  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
 #  ifdef WIN32
 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
+#    if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#      ifndef vsnprintf
+#        define vsnprintf _vsnprintf
 #      endif
 #    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#  ifdef VMS
-#    define NO_vsnprintf
-#  endif
-#  ifdef __OS400__
-#    define NO_vsnprintf
-#  endif
-#  ifdef __MVS__
-#    define NO_vsnprintf
+#  elif !defined(__STDC_VERSION__) || __STDC_VERSION__-0 < 199901L
+/* Otherwise if C89/90, assume no C99 snprintf() or vsnprintf() */
+#    ifndef NO_snprintf
+#      define NO_snprintf
+#    endif
+#    ifndef NO_vsnprintf
+#      define NO_vsnprintf
+#    endif
 #  endif
 #endif
 
@@ -206,7 +207,9 @@ typedef struct {
     unsigned char *out;     /* output buffer (double-sized when reading) */
     int direct;             /* 0 if processing gzip, 1 if transparent */
         /* just for reading */
+    int junk;               /* -1 = start, 1 = junk candidate, 0 = in gzip */
     int how;                /* 0: get header, 1: copy, 2: decompress */
+    int again;              /* true if EAGAIN or EWOULDBLOCK on last i/o */
     z_off64_t start;        /* where the gzip data started, for rewinding */
     int eof;                /* true if end of input file reached */
     int past;               /* true if read requested past end */
@@ -216,7 +219,6 @@ typedef struct {
     int reset;              /* true if a reset is pending after a Z_FINISH */
         /* seek request */
     z_off64_t skip;         /* amount to skip (already rewound if backwards) */
-    int seek;               /* true if seek request pending */
         /* error information */
     int err;                /* error code */
     char *msg;              /* error message */
diff --git a/src/java.base/share/native/libzip/zlib/gzlib.c b/src/java.base/share/native/libzip/zlib/gzlib.c
index 0f4dfae64a0..9489bcc1f12 100644
--- a/src/java.base/share/native/libzip/zlib/gzlib.c
+++ b/src/java.base/share/native/libzip/zlib/gzlib.c
@@ -23,21 +23,21 @@
  */
 
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2024 Mark Adler
+ * Copyright (C) 2004-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-#if defined(_WIN32) && !defined(__BORLANDC__)
+#if defined(__DJGPP__)
+#  define LSEEK llseek
+#elif defined(_WIN32) && !defined(__BORLANDC__) && !defined(UNDER_CE)
 #  define LSEEK _lseeki64
-#else
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#elif defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
 #else
 #  define LSEEK lseek
 #endif
-#endif
 
 #if defined UNDER_CE
 
@@ -76,7 +76,7 @@ char ZLIB_INTERNAL *gz_strwinerror(DWORD error) {
             msgbuf[chars] = 0;
         }
 
-        wcstombs(buf, msgbuf, chars + 1);
+        wcstombs(buf, msgbuf, chars + 1);       /* assumes buf is big enough */
         LocalFree(msgbuf);
     }
     else {
@@ -96,10 +96,12 @@ local void gz_reset(gz_statep state) {
         state->eof = 0;             /* not at end of file */
         state->past = 0;            /* have not read past end yet */
         state->how = LOOK;          /* look for gzip header */
+        state->junk = -1;           /* mark first member */
     }
     else                            /* for writing ... */
         state->reset = 0;           /* no deflateReset pending */
-    state->seek = 0;                /* no seek request pending */
+    state->again = 0;               /* no stalled i/o yet */
+    state->skip = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
     state->x.pos = 0;               /* no uncompressed data yet */
     state->strm.avail_in = 0;       /* no input data yet */
@@ -109,16 +111,13 @@ local void gz_reset(gz_statep state) {
 local gzFile gz_open(const void *path, int fd, const char *mode) {
     gz_statep state;
     z_size_t len;
-    int oflag;
-#ifdef O_CLOEXEC
-    int cloexec = 0;
-#endif
+    int oflag = 0;
 #ifdef O_EXCL
     int exclusive = 0;
 #endif
 
     /* check input */
-    if (path == NULL)
+    if (path == NULL || mode == NULL)
         return NULL;
 
     /* allocate gzFile structure to return */
@@ -127,6 +126,7 @@ local gzFile gz_open(const void *path, int fd, const char *mode) {
         return NULL;
     state->size = 0;            /* no buffers allocated yet */
     state->want = GZBUFSIZE;    /* requested buffer size */
+    state->err = Z_OK;          /* no error yet */
     state->msg = NULL;          /* no error message yet */
 
     /* interpret mode */
@@ -157,7 +157,7 @@ local gzFile gz_open(const void *path, int fd, const char *mode) {
                 break;
 #ifdef O_CLOEXEC
             case 'e':
-                cloexec = 1;
+                oflag |= O_CLOEXEC;
                 break;
 #endif
 #ifdef O_EXCL
@@ -177,6 +177,14 @@ local gzFile gz_open(const void *path, int fd, const char *mode) {
             case 'F':
                 state->strategy = Z_FIXED;
                 break;
+            case 'G':
+                state->direct = -1;
+                break;
+#ifdef O_NONBLOCK
+            case 'N':
+                oflag |= O_NONBLOCK;
+                break;
+#endif
             case 'T':
                 state->direct = 1;
                 break;
@@ -192,22 +200,30 @@ local gzFile gz_open(const void *path, int fd, const char *mode) {
         return NULL;
     }
 
-    /* can't force transparent read */
+    /* direct is 0, 1 if "T", or -1 if "G" (last "G" or "T" wins) */
     if (state->mode == GZ_READ) {
-        if (state->direct) {
+        if (state->direct == 1) {
+            /* can't force a transparent read */
             free(state);
             return NULL;
         }
-        state->direct = 1;      /* for empty file */
+        if (state->direct == 0)
+            /* default when reading is auto-detect of gzip vs. transparent --
+               start with a transparent assumption in case of an empty file */
+            state->direct = 1;
     }
+    else if (state->direct == -1) {
+        /* "G" has no meaning when writing -- disallow it */
+        free(state);
+        return NULL;
+    }
+    /* if reading, direct == 1 for auto-detect, -1 for gzip only; if writing or
+       appending, direct == 0 for gzip, 1 for transparent (copy in to out) */
 
     /* save the path name for error messages */
 #ifdef WIDECHAR
-    if (fd == -2) {
+    if (fd == -2)
         len = wcstombs(NULL, path, 0);
-        if (len == (z_size_t)-1)
-            len = 0;
-    }
     else
 #endif
         len = strlen((const char *)path);
@@ -217,29 +233,29 @@ local gzFile gz_open(const void *path, int fd, const char *mode) {
         return NULL;
     }
 #ifdef WIDECHAR
-    if (fd == -2)
+    if (fd == -2) {
         if (len)
             wcstombs(state->path, path, len + 1);
         else
             *(state->path) = 0;
+    }
     else
 #endif
+    {
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
         (void)snprintf(state->path, len + 1, "%s", (const char *)path);
 #else
         strcpy(state->path, path);
 #endif
+    }
 
     /* compute the flags for open() */
-    oflag =
+    oflag |=
 #ifdef O_LARGEFILE
         O_LARGEFILE |
 #endif
 #ifdef O_BINARY
         O_BINARY |
-#endif
-#ifdef O_CLOEXEC
-        (cloexec ? O_CLOEXEC : 0) |
 #endif
         (state->mode == GZ_READ ?
          O_RDONLY :
@@ -252,11 +268,23 @@ local gzFile gz_open(const void *path, int fd, const char *mode) {
            O_APPEND)));
 
     /* open the file with the appropriate flags (or just use fd) */
-    state->fd = fd > -1 ? fd : (
+    if (fd == -1)
+        state->fd = open((const char *)path, oflag, 0666);
 #ifdef WIDECHAR
-        fd == -2 ? _wopen(path, oflag, 0666) :
+    else if (fd == -2)
+        state->fd = _wopen(path, oflag, _S_IREAD | _S_IWRITE);
 #endif
-        open((const char *)path, oflag, 0666));
+    else {
+#ifdef O_NONBLOCK
+        if (oflag & O_NONBLOCK)
+            fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
+#endif
+#ifdef O_CLOEXEC
+        if (oflag & O_CLOEXEC)
+            fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | O_CLOEXEC);
+#endif
+        state->fd = fd;
+    }
     if (state->fd == -1) {
         free(state->path);
         free(state);
@@ -383,9 +411,10 @@ z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence) {
     /* normalize offset to a SEEK_CUR specification */
     if (whence == SEEK_SET)
         offset -= state->x.pos;
-    else if (state->seek)
-        offset += state->skip;
-    state->seek = 0;
+    else {
+        offset += state->past ? 0 : state->skip;
+        state->skip = 0;
+    }
 
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
@@ -396,7 +425,7 @@ z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence) {
         state->x.have = 0;
         state->eof = 0;
         state->past = 0;
-        state->seek = 0;
+        state->skip = 0;
         gz_error(state, Z_OK, NULL);
         state->strm.avail_in = 0;
         state->x.pos += offset;
@@ -425,10 +454,7 @@ z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence) {
     }
 
     /* request skip (if not zero) */
-    if (offset) {
-        state->seek = 1;
-        state->skip = offset;
-    }
+    state->skip = offset;
     return state->x.pos + offset;
 }
 
@@ -452,7 +478,7 @@ z_off64_t ZEXPORT gztell64(gzFile file) {
         return -1;
 
     /* return position */
-    return state->x.pos + (state->seek ? state->skip : 0);
+    return state->x.pos + (state->past ? 0 : state->skip);
 }
 
 /* -- see zlib.h -- */
@@ -559,7 +585,7 @@ void ZLIB_INTERNAL gz_error(gz_statep state, int err, const char *msg) {
     }
 
     /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
-    if (err != Z_OK && err != Z_BUF_ERROR)
+    if (err != Z_OK && err != Z_BUF_ERROR && !state->again)
         state->x.have = 0;
 
     /* set error code, and if no message, then done */
@@ -596,6 +622,7 @@ unsigned ZLIB_INTERNAL gz_intmax(void) {
     return INT_MAX;
 #else
     unsigned p = 1, q;
+
     do {
         q = p;
         p <<= 1;
diff --git a/src/java.base/share/native/libzip/zlib/gzread.c b/src/java.base/share/native/libzip/zlib/gzread.c
index 7b9c9df5fa1..89144d2e56f 100644
--- a/src/java.base/share/native/libzip/zlib/gzread.c
+++ b/src/java.base/share/native/libzip/zlib/gzread.c
@@ -23,7 +23,7 @@
  */
 
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004-2017 Mark Adler
+ * Copyright (C) 2004-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -32,23 +32,36 @@
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
    state->fd, and update state->eof, state->err, and state->msg as appropriate.
    This function needs to loop on read(), since read() is not guaranteed to
-   read the number of bytes requested, depending on the type of descriptor. */
+   read the number of bytes requested, depending on the type of descriptor. It
+   also needs to loop to manage the fact that read() returns an int. If the
+   descriptor is non-blocking and read() returns with no data in order to avoid
+   blocking, then gz_load() will return 0 if some data has been read, or -1 if
+   no data has been read. Either way, state->again is set true to indicate a
+   non-blocking event. If errno is non-zero on return, then there was an error
+   signaled from read().  *have is set to the number of bytes read. */
 local int gz_load(gz_statep state, unsigned char *buf, unsigned len,
                   unsigned *have) {
     int ret;
     unsigned get, max = ((unsigned)-1 >> 2) + 1;
 
+    state->again = 0;
+    errno = 0;
     *have = 0;
     do {
         get = len - *have;
         if (get > max)
             get = max;
-        ret = read(state->fd, buf + *have, get);
+        ret = (int)read(state->fd, buf + *have, get);
         if (ret <= 0)
             break;
         *have += (unsigned)ret;
     } while (*have < len);
     if (ret < 0) {
+        if (errno == EAGAIN || errno == EWOULDBLOCK) {
+            state->again = 1;
+            if (*have != 0)
+                return 0;
+        }
         gz_error(state, Z_ERRNO, zstrerror());
         return -1;
     }
@@ -74,10 +87,14 @@ local int gz_avail(gz_statep state) {
         if (strm->avail_in) {       /* copy what's there to the start */
             unsigned char *p = state->in;
             unsigned const char *q = strm->next_in;
-            unsigned n = strm->avail_in;
-            do {
-                *p++ = *q++;
-            } while (--n);
+
+            if (q != p) {
+                unsigned n = strm->avail_in;
+
+                do {
+                    *p++ = *q++;
+                } while (--n);
+            }
         }
         if (gz_load(state, state->in + strm->avail_in,
                     state->size - strm->avail_in, &got) == -1)
@@ -128,39 +145,44 @@ local int gz_look(gz_statep state) {
         }
     }
 
-    /* get at least the magic bytes in the input buffer */
-    if (strm->avail_in < 2) {
-        if (gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0)
-            return 0;
-    }
-
-    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
-       a logical dilemma here when considering the case of a partially written
-       gzip file, to wit, if a single 31 byte is written, then we cannot tell
-       whether this is a single-byte file, or just a partially written gzip
-       file -- for here we assume that if a gzip file is being written, then
-       the header will be written in a single operation, so that reading a
-       single byte is sufficient indication that it is not a gzip file) */
-    if (strm->avail_in > 1 &&
-            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+    /* if transparent reading is disabled, which would only be at the start, or
+       if we're looking for a gzip member after the first one, which is not at
+       the start, then proceed directly to look for a gzip member next */
+    if (state->direct == -1 || state->junk == 0) {
         inflateReset(strm);
         state->how = GZIP;
+        state->junk = state->junk != -1;
         state->direct = 0;
         return 0;
     }
 
-    /* no gzip header -- if we were decoding gzip before, then this is trailing
-       garbage.  Ignore the trailing garbage and finish. */
-    if (state->direct == 0) {
-        strm->avail_in = 0;
-        state->eof = 1;
-        state->x.have = 0;
+    /* otherwise we're at the start with auto-detect -- we check to see if the
+       first four bytes could be gzip header in order to decide whether or not
+       this will be a transparent read */
+
+    /* load any header bytes into the input buffer -- if the input is empty,
+       then it's not an error as this is a transparent read of zero bytes */
+    if (gz_avail(state) == -1)
+        return -1;
+    if (strm->avail_in == 0 || (state->again && strm->avail_in < 4))
+        /* if non-blocking input stalled before getting four bytes, then
+           return and wait until a later call has accumulated enough */
+        return 0;
+
+    /* see if this is (likely) gzip input -- if the first four bytes are
+       consistent with a gzip header, then go look for the first gzip member,
+       otherwise proceed to copy the input transparently */
+    if (strm->avail_in > 3 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139 &&
+            strm->next_in[2] == 8 && strm->next_in[3] < 32) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->junk = 1;
+        state->direct = 0;
         return 0;
     }
 
-    /* doing raw i/o, copy any leftover input to output -- this assumes that
+    /* doing raw i/o: copy any leftover input to output -- this assumes that
        the output buffer is larger than the input buffer, which also assures
        space for gzungetc() */
     state->x.next = state->out;
@@ -168,15 +190,17 @@ local int gz_look(gz_statep state) {
     state->x.have = strm->avail_in;
     strm->avail_in = 0;
     state->how = COPY;
-    state->direct = 1;
     return 0;
 }
 
 /* Decompress from input to the provided next_out and avail_out in the state.
    On return, state->x.have and state->x.next point to the just decompressed
-   data.  If the gzip stream completes, state->how is reset to LOOK to look for
-   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
-   on success, -1 on failure. */
+   data. If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted. Returns 0
+   on success, -1 on failure. If EOF is reached when looking for more input to
+   complete the gzip member, then an unexpected end of file error is raised.
+   If there is no more input, but state->again is true, then EOF has not been
+   reached, and no error is raised. */
 local int gz_decomp(gz_statep state) {
     int ret = Z_OK;
     unsigned had;
@@ -186,28 +210,41 @@ local int gz_decomp(gz_statep state) {
     had = strm->avail_out;
     do {
         /* get more input for inflate() */
-        if (strm->avail_in == 0 && gz_avail(state) == -1)
-            return -1;
+        if (strm->avail_in == 0 && gz_avail(state) == -1) {
+            ret = state->err;
+            break;
+        }
         if (strm->avail_in == 0) {
-            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            if (!state->again)
+                gz_error(state, Z_BUF_ERROR, "unexpected end of file");
             break;
         }
 
         /* decompress and handle errors */
         ret = inflate(strm, Z_NO_FLUSH);
+        if (strm->avail_out < had)
+            /* any decompressed data marks this as a real gzip stream */
+            state->junk = 0;
         if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
             gz_error(state, Z_STREAM_ERROR,
                      "internal error: inflate stream corrupt");
-            return -1;
+            break;
         }
         if (ret == Z_MEM_ERROR) {
             gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
+            break;
         }
         if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
+            if (state->junk == 1) {             /* trailing garbage is ok */
+                strm->avail_in = 0;
+                state->eof = 1;
+                state->how = LOOK;
+                ret = Z_OK;
+                break;
+            }
             gz_error(state, Z_DATA_ERROR,
                      strm->msg == NULL ? "compressed data error" : strm->msg);
-            return -1;
+            break;
         }
     } while (strm->avail_out && ret != Z_STREAM_END);
 
@@ -216,11 +253,14 @@ local int gz_decomp(gz_statep state) {
     state->x.next = strm->next_out - state->x.have;
 
     /* if the gzip stream completed successfully, look for another */
-    if (ret == Z_STREAM_END)
+    if (ret == Z_STREAM_END) {
+        state->junk = 0;
         state->how = LOOK;
+        return 0;
+    }
 
-    /* good decompression */
-    return 0;
+    /* return decompression status */
+    return ret != Z_OK ? -1 : 0;
 }
 
 /* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
@@ -251,25 +291,31 @@ local int gz_fetch(gz_statep state) {
             strm->next_out = state->out;
             if (gz_decomp(state) == -1)
                 return -1;
+            break;
+        default:
+            gz_error(state, Z_STREAM_ERROR, "state corrupt");
+            return -1;
         }
     } while (state->x.have == 0 && (!state->eof || strm->avail_in));
     return 0;
 }
 
-/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
-local int gz_skip(gz_statep state, z_off64_t len) {
+/* Skip state->skip (> 0) uncompressed bytes of output.  Return -1 on error, 0
+   on success. */
+local int gz_skip(gz_statep state) {
     unsigned n;
 
     /* skip over len bytes or reach end-of-file, whichever comes first */
-    while (len)
+    do {
         /* skip over whatever is in output buffer */
         if (state->x.have) {
-            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
-                (unsigned)len : state->x.have;
+            n = GT_OFF(state->x.have) ||
+                (z_off64_t)state->x.have > state->skip ?
+                (unsigned)state->skip : state->x.have;
             state->x.have -= n;
             state->x.next += n;
             state->x.pos += n;
-            len -= n;
+            state->skip -= n;
         }
 
         /* output buffer empty -- return if we're at the end of the input */
@@ -282,30 +328,32 @@ local int gz_skip(gz_statep state, z_off64_t len) {
             if (gz_fetch(state) == -1)
                 return -1;
         }
+    } while (state->skip);
     return 0;
 }
 
 /* Read len bytes into buf from file, or less than len up to the end of the
-   input.  Return the number of bytes read.  If zero is returned, either the
-   end of file was reached, or there was an error.  state->err must be
-   consulted in that case to determine which. */
+   input. Return the number of bytes read. If zero is returned, either the end
+   of file was reached, or there was an error. state->err must be consulted in
+   that case to determine which. If there was an error, but some uncompressed
+   bytes were read before the error, then that count is returned. The error is
+   still recorded, and so is deferred until the next call. */
 local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {
     z_size_t got;
     unsigned n;
+    int err;
 
     /* if len is zero, avoid unnecessary operations */
     if (len == 0)
         return 0;
 
     /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return 0;
-    }
+    if (state->skip && gz_skip(state) == -1)
+        return 0;
 
     /* get len bytes to buf, or less than len if at the end */
     got = 0;
+    err = 0;
     do {
         /* set n to the maximum amount of len that fits in an unsigned int */
         n = (unsigned)-1;
@@ -319,37 +367,36 @@ local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {
             memcpy(buf, state->x.next, n);
             state->x.next += n;
             state->x.have -= n;
+            if (state->err != Z_OK)
+                /* caught deferred error from gz_fetch() */
+                err = -1;
         }
 
         /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && state->strm.avail_in == 0) {
-            state->past = 1;        /* tried to read past end */
+        else if (state->eof && state->strm.avail_in == 0)
             break;
-        }
 
         /* need output data -- for small len or new stream load up our output
-           buffer */
+           buffer, so that gzgetc() can be fast */
         else if (state->how == LOOK || n < (state->size << 1)) {
             /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return 0;
+            if (gz_fetch(state) == -1 && state->x.have == 0)
+                /* if state->x.have != 0, error will be caught after copy */
+                err = -1;
             continue;       /* no progress yet -- go back to copy above */
             /* the copy above assures that we will leave with space in the
                output buffer, allowing at least one gzungetc() to succeed */
         }
 
         /* large len -- read directly into user buffer */
-        else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
-                return 0;
-        }
+        else if (state->how == COPY)        /* read directly */
+            err = gz_load(state, (unsigned char *)buf, n, &n);
 
         /* large len -- decompress directly into user buffer */
         else {  /* state->how == GZIP */
             state->strm.avail_out = n;
             state->strm.next_out = (unsigned char *)buf;
-            if (gz_decomp(state) == -1)
-                return 0;
+            err = gz_decomp(state);
             n = state->x.have;
             state->x.have = 0;
         }
@@ -359,7 +406,11 @@ local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {
         buf = (char *)buf + n;
         got += n;
         state->x.pos += n;
-    } while (len);
+    } while (len && !err);
+
+    /* note read past eof */
+    if (len && state->eof)
+        state->past = 1;
 
     /* return number of bytes read into user buffer */
     return got;
@@ -369,16 +420,18 @@ local z_size_t gz_read(gz_statep state, voidp buf, z_size_t len) {
 int ZEXPORT gzread(gzFile file, voidp buf, unsigned len) {
     gz_statep state;
 
-    /* get internal structure */
+    /* get internal structure and check that it's for reading */
     if (file == NULL)
         return -1;
     state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+    if (state->mode != GZ_READ)
         return -1;
 
+    /* check that there was no (serious) error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)
+        return -1;
+    gz_error(state, Z_OK, NULL);
+
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids a flaw in the interface) */
     if ((int)len < 0) {
@@ -390,28 +443,40 @@ int ZEXPORT gzread(gzFile file, voidp buf, unsigned len) {
     len = (unsigned)gz_read(state, buf, len);
 
     /* check for an error */
-    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
+    if (len == 0) {
+        if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+            return -1;
+        if (state->again) {
+            /* non-blocking input stalled after some input was read, but no
+               uncompressed bytes were produced -- let the application know
+               this isn't EOF */
+            gz_error(state, Z_ERRNO, zstrerror());
+            return -1;
+        }
+    }
 
-    /* return the number of bytes read (this is assured to fit in an int) */
+    /* return the number of bytes read */
     return (int)len;
 }
 
 /* -- see zlib.h -- */
-z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems, gzFile file) {
+z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
+                         gzFile file) {
     z_size_t len;
     gz_statep state;
 
-    /* get internal structure */
+    /* get internal structure and check that it's for reading */
     if (file == NULL)
         return 0;
     state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+    if (state->mode != GZ_READ)
         return 0;
 
+    /* check that there was no (serious) error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)
+        return 0;
+    gz_error(state, Z_OK, NULL);
+
     /* compute bytes to read -- error on overflow */
     len = nitems * size;
     if (size && len / size != nitems) {
@@ -433,16 +498,18 @@ int ZEXPORT gzgetc(gzFile file) {
     unsigned char buf[1];
     gz_statep state;
 
-    /* get internal structure */
+    /* get internal structure and check that it's for reading */
     if (file == NULL)
         return -1;
     state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+    if (state->mode != GZ_READ)
         return -1;
 
+    /* check that there was no (serious) error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)
+        return -1;
+    gz_error(state, Z_OK, NULL);
+
     /* try output buffer (no need to check for skip request) */
     if (state->x.have) {
         state->x.have--;
@@ -462,26 +529,25 @@ int ZEXPORT gzgetc_(gzFile file) {
 int ZEXPORT gzungetc(int c, gzFile file) {
     gz_statep state;
 
-    /* get internal structure */
+    /* get internal structure and check that it's for reading */
     if (file == NULL)
         return -1;
     state = (gz_statep)file;
-
-    /* in case this was just opened, set up the input buffer */
-    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
-        (void)gz_look(state);
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+    if (state->mode != GZ_READ)
         return -1;
 
+    /* in case this was just opened, set up the input buffer */
+    if (state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
+
+    /* check that there was no (serious) error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)
+        return -1;
+    gz_error(state, Z_OK, NULL);
+
     /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return -1;
-    }
+    if (state->skip && gz_skip(state) == -1)
+        return -1;
 
     /* can't push EOF */
     if (c < 0)
@@ -507,6 +573,7 @@ int ZEXPORT gzungetc(int c, gzFile file) {
     if (state->x.next == state->out) {
         unsigned char *src = state->out + state->x.have;
         unsigned char *dest = state->out + (state->size << 1);
+
         while (src > state->out)
             *--dest = *--src;
         state->x.next = dest;
@@ -526,32 +593,31 @@ char * ZEXPORT gzgets(gzFile file, char *buf, int len) {
     unsigned char *eol;
     gz_statep state;
 
-    /* check parameters and get internal structure */
+    /* check parameters, get internal structure, and check that it's for
+       reading */
     if (file == NULL || buf == NULL || len < 1)
         return NULL;
     state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+    if (state->mode != GZ_READ)
         return NULL;
 
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return NULL;
-    }
+    /* check that there was no (serious) error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR && !state->again)
+        return NULL;
+    gz_error(state, Z_OK, NULL);
 
-    /* copy output bytes up to new line or len - 1, whichever comes first --
-       append a terminating zero to the string (we don't check for a zero in
-       the contents, let the user worry about that) */
+    /* process a skip request */
+    if (state->skip && gz_skip(state) == -1)
+        return NULL;
+
+    /* copy output up to a new line, len-1 bytes, or there is no more output,
+       whichever comes first */
     str = buf;
     left = (unsigned)len - 1;
     if (left) do {
         /* assure that something is in the output buffer */
         if (state->x.have == 0 && gz_fetch(state) == -1)
-            return NULL;                /* error */
+            break;                      /* error */
         if (state->x.have == 0) {       /* end of file */
             state->past = 1;            /* read past end */
             break;                      /* return what we have */
@@ -572,7 +638,9 @@ char * ZEXPORT gzgets(gzFile file, char *buf, int len) {
         buf += n;
     } while (left && eol == NULL);
 
-    /* return terminated string, or if nothing, end of file */
+    /* append a terminating zero to the string (we don't check for a zero in
+       the contents, let the user worry about that) -- return the terminated
+       string, or if nothing was read, NULL */
     if (buf == str)
         return NULL;
     buf[0] = 0;
@@ -594,7 +662,7 @@ int ZEXPORT gzdirect(gzFile file) {
         (void)gz_look(state);
 
     /* return 1 if transparent, 0 if processing a gzip stream */
-    return state->direct;
+    return state->direct == 1;
 }
 
 /* -- see zlib.h -- */
@@ -602,12 +670,10 @@ int ZEXPORT gzclose_r(gzFile file) {
     int ret, err;
     gz_statep state;
 
-    /* get internal structure */
+    /* get internal structure and check that it's for reading */
     if (file == NULL)
         return Z_STREAM_ERROR;
     state = (gz_statep)file;
-
-    /* check that we're reading */
     if (state->mode != GZ_READ)
         return Z_STREAM_ERROR;
 
diff --git a/src/java.base/share/native/libzip/zlib/gzwrite.c b/src/java.base/share/native/libzip/zlib/gzwrite.c
index 008b03e7021..b11c318d543 100644
--- a/src/java.base/share/native/libzip/zlib/gzwrite.c
+++ b/src/java.base/share/native/libzip/zlib/gzwrite.c
@@ -23,7 +23,7 @@
  */
 
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2019 Mark Adler
+ * Copyright (C) 2004-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -98,9 +98,13 @@ local int gz_comp(gz_statep state, int flush) {
     /* write directly if requested */
     if (state->direct) {
         while (strm->avail_in) {
+            errno = 0;
+            state->again = 0;
             put = strm->avail_in > max ? max : strm->avail_in;
-            writ = write(state->fd, strm->next_in, put);
+            writ = (int)write(state->fd, strm->next_in, put);
             if (writ < 0) {
+                if (errno == EAGAIN || errno == EWOULDBLOCK)
+                    state->again = 1;
                 gz_error(state, Z_ERRNO, zstrerror());
                 return -1;
             }
@@ -112,8 +116,9 @@ local int gz_comp(gz_statep state, int flush) {
 
     /* check for a pending reset */
     if (state->reset) {
-        /* don't start a new gzip member unless there is data to write */
-        if (strm->avail_in == 0)
+        /* don't start a new gzip member unless there is data to write and
+           we're not flushing */
+        if (strm->avail_in == 0 && flush == Z_NO_FLUSH)
             return 0;
         deflateReset(strm);
         state->reset = 0;
@@ -127,10 +132,14 @@ local int gz_comp(gz_statep state, int flush) {
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
             while (strm->next_out > state->x.next) {
+                errno = 0;
+                state->again = 0;
                 put = strm->next_out - state->x.next > (int)max ? max :
                       (unsigned)(strm->next_out - state->x.next);
-                writ = write(state->fd, state->x.next, put);
+                writ = (int)write(state->fd, state->x.next, put);
                 if (writ < 0) {
+                    if (errno == EAGAIN || errno == EWOULDBLOCK)
+                        state->again = 1;
                     gz_error(state, Z_ERRNO, zstrerror());
                     return -1;
                 }
@@ -162,10 +171,12 @@ local int gz_comp(gz_statep state, int flush) {
     return 0;
 }
 
-/* Compress len zeros to output.  Return -1 on a write error or memory
-   allocation failure by gz_comp(), or 0 on success. */
-local int gz_zero(gz_statep state, z_off64_t len) {
-    int first;
+/* Compress state->skip (> 0) zeros to output.  Return -1 on a write error or
+   memory allocation failure by gz_comp(), or 0 on success. state->skip is
+   updated with the number of successfully written zeros, in case there is a
+   stall on a non-blocking write destination. */
+local int gz_zero(gz_statep state) {
+    int first, ret;
     unsigned n;
     z_streamp strm = &(state->strm);
 
@@ -173,29 +184,34 @@ local int gz_zero(gz_statep state, z_off64_t len) {
     if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
         return -1;
 
-    /* compress len zeros (len guaranteed > 0) */
+    /* compress state->skip zeros */
     first = 1;
-    while (len) {
-        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
-            (unsigned)len : state->size;
+    do {
+        n = GT_OFF(state->size) || (z_off64_t)state->size > state->skip ?
+            (unsigned)state->skip : state->size;
         if (first) {
             memset(state->in, 0, n);
             first = 0;
         }
         strm->avail_in = n;
         strm->next_in = state->in;
+        ret = gz_comp(state, Z_NO_FLUSH);
+        n -= strm->avail_in;
         state->x.pos += n;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
+        state->skip -= n;
+        if (ret == -1)
             return -1;
-        len -= n;
-    }
+    } while (state->skip);
     return 0;
 }
 
 /* Write len bytes from buf to file.  Return the number of bytes written.  If
-   the returned value is less than len, then there was an error. */
+   the returned value is less than len, then there was an error. If the error
+   was a non-blocking stall, then the number of bytes consumed is returned.
+   For any other error, 0 is returned. */
 local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
     z_size_t put = len;
+    int ret;
 
     /* if len is zero, avoid unnecessary operations */
     if (len == 0)
@@ -206,16 +222,13 @@ local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
         return 0;
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return 0;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        return 0;
 
     /* for small len, copy to input buffer, otherwise compress directly */
     if (len < state->size) {
         /* copy to input buffer, compress when full */
-        do {
+        for (;;) {
             unsigned have, copy;
 
             if (state->strm.avail_in == 0)
@@ -230,9 +243,11 @@ local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
             state->x.pos += copy;
             buf = (const char *)buf + copy;
             len -= copy;
-            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-        } while (len);
+            if (len == 0)
+                break;
+            if (gz_comp(state, Z_NO_FLUSH) == -1)
+                return state->again ? put - len : 0;
+        }
     }
     else {
         /* consume whatever's left in the input buffer */
@@ -243,13 +258,16 @@ local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) {
         state->strm.next_in = (z_const Bytef *)buf;
         do {
             unsigned n = (unsigned)-1;
+
             if (n > len)
                 n = (unsigned)len;
             state->strm.avail_in = n;
+            ret = gz_comp(state, Z_NO_FLUSH);
+            n -= state->strm.avail_in;
             state->x.pos += n;
-            if (gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
             len -= n;
+            if (ret == -1)
+                return state->again ? put - len : 0;
         } while (len);
     }
 
@@ -266,9 +284,10 @@ int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len) {
         return 0;
     state = (gz_statep)file;
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return 0;
+    gz_error(state, Z_OK, NULL);
 
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids a flaw in the interface) */
@@ -292,9 +311,10 @@ z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size, z_size_t nitems,
         return 0;
     state = (gz_statep)file;
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return 0;
+    gz_error(state, Z_OK, NULL);
 
     /* compute bytes to read -- error on overflow */
     len = nitems * size;
@@ -320,16 +340,14 @@ int ZEXPORT gzputc(gzFile file, int c) {
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return -1;
+    gz_error(state, Z_OK, NULL);
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return -1;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        return -1;
 
     /* try writing to input buffer for speed (state->size == 0 if buffer not
        initialized) */
@@ -362,9 +380,10 @@ int ZEXPORT gzputs(gzFile file, const char *s) {
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return -1;
+    gz_error(state, Z_OK, NULL);
 
     /* write string */
     len = strlen(s);
@@ -373,16 +392,47 @@ int ZEXPORT gzputs(gzFile file, const char *s) {
         return -1;
     }
     put = gz_write(state, s, len);
-    return put < len ? -1 : (int)len;
+    return len && put == 0 ? -1 : (int)put;
 }
 
+#if (((!defined(STDC) && !defined(Z_HAVE_STDARG_H)) || !defined(NO_vsnprintf)) && \
+     (defined(STDC) || defined(Z_HAVE_STDARG_H) || !defined(NO_snprintf))) || \
+    defined(ZLIB_INSECURE)
+/* If the second half of the input buffer is occupied, write out the contents.
+   If there is any input remaining due to a non-blocking stall on write, move
+   it to the start of the buffer. Return true if this did not open up the
+   second half of the buffer.  state->err should be checked after this to
+   handle a gz_comp() error. */
+local int gz_vacate(gz_statep state) {
+    z_streamp strm;
+
+    strm = &(state->strm);
+    if (strm->next_in + strm->avail_in <= state->in + state->size)
+        return 0;
+    (void)gz_comp(state, Z_NO_FLUSH);
+    if (strm->avail_in == 0) {
+        strm->next_in = state->in;
+        return 0;
+    }
+    memmove(state->in, strm->next_in, strm->avail_in);
+    strm->next_in = state->in;
+    return strm->avail_in > state->size;
+}
+#endif
+
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #include <stdarg.h>
 
 /* -- see zlib.h -- */
 int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) {
-    int len;
-    unsigned left;
+#if defined(NO_vsnprintf) && !defined(ZLIB_INSECURE)
+#warning "vsnprintf() not available -- gzprintf() stub returns Z_STREAM_ERROR"
+#warning "you can recompile with ZLIB_INSECURE defined to use vsprintf()"
+    /* prevent use of insecure vsprintf(), unless purposefully requested */
+    (void)file, (void)format, (void)va;
+    return Z_STREAM_ERROR;
+#else
+    int len, ret;
     char *next;
     gz_statep state;
     z_streamp strm;
@@ -393,24 +443,34 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) {
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return Z_STREAM_ERROR;
+    gz_error(state, Z_OK, NULL);
 
     /* make sure we have some buffer space */
     if (state->size == 0 && gz_init(state) == -1)
         return state->err;
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        return state->err;
 
     /* do the printf() into the input buffer, put length in len -- the input
-       buffer is double-sized just for this function, so there is guaranteed to
-       be state->size bytes available after the current contents */
+       buffer is double-sized just for this function, so there should be
+       state->size bytes available after the current contents */
+    ret = gz_vacate(state);
+    if (state->err) {
+        if (ret && state->again) {
+            /* There was a non-blocking stall on write, resulting in the part
+               of the second half of the output buffer being occupied.  Return
+               a Z_BUF_ERROR to let the application know that this gzprintf()
+               needs to be retried. */
+            gz_error(state, Z_BUF_ERROR, "stalled write on gzprintf");
+        }
+        if (!state->again)
+            return state->err;
+    }
     if (strm->avail_in == 0)
         strm->next_in = state->in;
     next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
@@ -436,19 +496,16 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) {
     if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
         return 0;
 
-    /* update buffer and position, compress first half if past that */
+    /* update buffer and position */
     strm->avail_in += (unsigned)len;
     state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memmove(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
+
+    /* write out buffer if more than half is occupied */
+    ret = gz_vacate(state);
+    if (state->err && !state->again)
+        return state->err;
     return len;
+#endif
 }
 
 int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) {
@@ -468,6 +525,17 @@ int ZEXPORTVA gzprintf(gzFile file, const char *format, int a1, int a2, int a3,
                        int a4, int a5, int a6, int a7, int a8, int a9, int a10,
                        int a11, int a12, int a13, int a14, int a15, int a16,
                        int a17, int a18, int a19, int a20) {
+#if defined(NO_snprintf) && !defined(ZLIB_INSECURE)
+#warning "snprintf() not available -- gzprintf() stub returns Z_STREAM_ERROR"
+#warning "you can recompile with ZLIB_INSECURE defined to use sprintf()"
+    /* prevent use of insecure sprintf(), unless purposefully requested */
+    (void)file, (void)format, (void)a1, (void)a2, (void)a3, (void)a4, (void)a5,
+    (void)a6, (void)a7, (void)a8, (void)a9, (void)a10, (void)a11, (void)a12,
+    (void)a13, (void)a14, (void)a15, (void)a16, (void)a17, (void)a18,
+    (void)a19, (void)a20;
+    return Z_STREAM_ERROR;
+#else
+    int ret;
     unsigned len, left;
     char *next;
     gz_statep state;
@@ -483,24 +551,34 @@ int ZEXPORTVA gzprintf(gzFile file, const char *format, int a1, int a2, int a3,
     if (sizeof(int) != sizeof(void *))
         return Z_STREAM_ERROR;
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return Z_STREAM_ERROR;
+    gz_error(state, Z_OK, NULL);
 
     /* make sure we have some buffer space */
     if (state->size == 0 && gz_init(state) == -1)
-        return state->error;
+        return state->err;
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->error;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        return state->err;
 
     /* do the printf() into the input buffer, put length in len -- the input
        buffer is double-sized just for this function, so there is guaranteed to
        be state->size bytes available after the current contents */
+    ret = gz_vacate(state);
+    if (state->err) {
+        if (ret && state->again) {
+            /* There was a non-blocking stall on write, resulting in the part
+               of the second half of the output buffer being occupied.  Return
+               a Z_BUF_ERROR to let the application know that this gzprintf()
+               needs to be retried. */
+            gz_error(state, Z_BUF_ERROR, "stalled write on gzprintf");
+        }
+        if (!state->again)
+            return state->err;
+    }
     if (strm->avail_in == 0)
         strm->next_in = state->in;
     next = (char *)(strm->next_in + strm->avail_in);
@@ -534,16 +612,13 @@ int ZEXPORTVA gzprintf(gzFile file, const char *format, int a1, int a2, int a3,
     /* update buffer and position, compress first half if past that */
     strm->avail_in += len;
     state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memmove(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
+
+    /* write out buffer if more than half is occupied */
+    ret = gz_vacate(state);
+    if (state->err && !state->again)
+        return state->err;
     return (int)len;
+#endif
 }
 
 #endif
@@ -557,20 +632,18 @@ int ZEXPORT gzflush(gzFile file, int flush) {
         return Z_STREAM_ERROR;
     state = (gz_statep)file;
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
+    /* check that we're writing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again))
         return Z_STREAM_ERROR;
+    gz_error(state, Z_OK, NULL);
 
     /* check flush parameter */
     if (flush < 0 || flush > Z_FINISH)
         return Z_STREAM_ERROR;
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        return state->err;
 
     /* compress remaining data with requested flush */
     (void)gz_comp(state, flush);
@@ -588,20 +661,19 @@ int ZEXPORT gzsetparams(gzFile file, int level, int strategy) {
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK || state->direct)
+    /* check that we're compressing and that there's no (serious) error */
+    if (state->mode != GZ_WRITE || (state->err != Z_OK && !state->again) ||
+            state->direct)
         return Z_STREAM_ERROR;
+    gz_error(state, Z_OK, NULL);
 
     /* if no change is requested, then do nothing */
     if (level == state->level && strategy == state->strategy)
         return Z_OK;
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        return state->err;
 
     /* change compression parameters for subsequent input */
     if (state->size) {
@@ -630,11 +702,8 @@ int ZEXPORT gzclose_w(gzFile file) {
         return Z_STREAM_ERROR;
 
     /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            ret = state->err;
-    }
+    if (state->skip && gz_zero(state) == -1)
+        ret = state->err;
 
     /* flush, free memory, and close file */
     if (gz_comp(state, Z_FINISH) == -1)
diff --git a/src/java.base/share/native/libzip/zlib/infback.c b/src/java.base/share/native/libzip/zlib/infback.c
index f680e2cdbdc..0becbb9eb4f 100644
--- a/src/java.base/share/native/libzip/zlib/infback.c
+++ b/src/java.base/share/native/libzip/zlib/infback.c
@@ -23,7 +23,7 @@
  */
 
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2022 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -70,7 +70,7 @@ int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
 #ifdef Z_SOLO
         return Z_STREAM_ERROR;
 #else
-    strm->zfree = zcfree;
+        strm->zfree = zcfree;
 #endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
@@ -87,57 +87,6 @@ int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits,
     return Z_OK;
 }
 
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(struct inflate_state FAR *state) {
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
 /* Macros for inflateBack(): */
 
 /* Load returned state from inflate_fast() */
@@ -317,7 +266,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
                 state->mode = STORED;
                 break;
             case 1:                             /* fixed block */
-                fixedtables(state);
+                inflate_fixed(state);
                 Tracev((stderr, "inflate:     fixed codes block%s\n",
                         state->last ? " (last)" : ""));
                 state->mode = LEN;              /* decode codes */
@@ -327,8 +276,8 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
                         state->last ? " (last)" : ""));
                 state->mode = TABLE;
                 break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
+            default:
+                strm->msg = (z_const char *)"invalid block type";
                 state->mode = BAD;
             }
             DROPBITS(2);
@@ -339,7 +288,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             BYTEBITS();                         /* go to byte boundary */
             NEEDBITS(32);
             if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
+                strm->msg = (z_const char *)"invalid stored block lengths";
                 state->mode = BAD;
                 break;
             }
@@ -377,7 +326,8 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             DROPBITS(4);
 #ifndef PKZIP_BUG_WORKAROUND
             if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
+                strm->msg = (z_const char *)
+                    "too many length or distance symbols";
                 state->mode = BAD;
                 break;
             }
@@ -399,7 +349,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             ret = inflate_table(CODES, state->lens, 19, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
+                strm->msg = (z_const char *)"invalid code lengths set";
                 state->mode = BAD;
                 break;
             }
@@ -422,7 +372,8 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
                         NEEDBITS(here.bits + 2);
                         DROPBITS(here.bits);
                         if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
+                            strm->msg = (z_const char *)
+                                "invalid bit length repeat";
                             state->mode = BAD;
                             break;
                         }
@@ -445,7 +396,8 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
                         DROPBITS(7);
                     }
                     if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
+                        strm->msg = (z_const char *)
+                            "invalid bit length repeat";
                         state->mode = BAD;
                         break;
                     }
@@ -459,7 +411,8 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
 
             /* check for end-of-block code (better have one) */
             if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
+                strm->msg = (z_const char *)
+                    "invalid code -- missing end-of-block";
                 state->mode = BAD;
                 break;
             }
@@ -473,7 +426,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
+                strm->msg = (z_const char *)"invalid literal/lengths set";
                 state->mode = BAD;
                 break;
             }
@@ -482,7 +435,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
             if (ret) {
-                strm->msg = (char *)"invalid distances set";
+                strm->msg = (z_const char *)"invalid distances set";
                 state->mode = BAD;
                 break;
             }
@@ -541,7 +494,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
 
             /* invalid code */
             if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
+                strm->msg = (z_const char *)"invalid literal/length code";
                 state->mode = BAD;
                 break;
             }
@@ -573,7 +526,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             }
             DROPBITS(here.bits);
             if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
+                strm->msg = (z_const char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
@@ -588,7 +541,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
             }
             if (state->offset > state->wsize - (state->whave < state->wsize ?
                                                 left : 0)) {
-                strm->msg = (char *)"invalid distance too far back";
+                strm->msg = (z_const char *)"invalid distance too far back";
                 state->mode = BAD;
                 break;
             }
diff --git a/src/java.base/share/native/libzip/zlib/inffast.c b/src/java.base/share/native/libzip/zlib/inffast.c
index e86dd78d801..1ce89512ec4 100644
--- a/src/java.base/share/native/libzip/zlib/inffast.c
+++ b/src/java.base/share/native/libzip/zlib/inffast.c
@@ -23,7 +23,7 @@
  */
 
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2017 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -179,7 +179,8 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
                 dist += (unsigned)hold & ((1U << op) - 1);
 #ifdef INFLATE_STRICT
                 if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
+                    strm->msg = (z_const char *)
+                        "invalid distance too far back";
                     state->mode = BAD;
                     break;
                 }
@@ -192,8 +193,8 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
                     op = dist - op;             /* distance back in window */
                     if (op > whave) {
                         if (state->sane) {
-                            strm->msg =
-                                (char *)"invalid distance too far back";
+                            strm->msg = (z_const char *)
+                                "invalid distance too far back";
                             state->mode = BAD;
                             break;
                         }
@@ -289,7 +290,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
                 goto dodist;
             }
             else {
-                strm->msg = (char *)"invalid distance code";
+                strm->msg = (z_const char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
@@ -304,7 +305,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
             break;
         }
         else {
-            strm->msg = (char *)"invalid literal/length code";
+            strm->msg = (z_const char *)"invalid literal/length code";
             state->mode = BAD;
             break;
         }
diff --git a/src/java.base/share/native/libzip/zlib/inffixed.h b/src/java.base/share/native/libzip/zlib/inffixed.h
index f0a4ef1c4e8..d234b018c87 100644
--- a/src/java.base/share/native/libzip/zlib/inffixed.h
+++ b/src/java.base/share/native/libzip/zlib/inffixed.h
@@ -22,97 +22,97 @@
  * questions.
  */
 
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
+/* inffixed.h -- table for decoding fixed codes
+ * Generated automatically by makefixed().
+ */
 
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
+/* WARNING: this file should *not* be used by applications.
+   It is part of the implementation of this library and is
+   subject to change. Applications should only use zlib.h.
+ */
 
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
+static const code lenfix[512] = {
+    {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+    {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+    {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+    {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+    {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+    {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+    {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+    {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+    {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+    {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+    {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+    {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+    {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+    {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+    {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+    {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+    {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+    {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+    {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+    {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+    {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+    {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+    {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+    {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+    {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+    {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+    {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+    {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+    {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+    {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+    {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+    {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+    {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+    {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+    {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+    {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+    {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+    {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+    {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+    {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+    {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+    {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+    {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+    {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+    {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+    {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+    {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+    {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+    {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+    {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+    {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+    {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+    {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+    {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+    {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+    {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+    {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+    {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+    {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+    {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+    {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+    {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+    {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+    {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+    {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+    {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+    {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+    {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+    {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+    {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+    {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+    {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+    {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+    {0,9,255}
+};
 
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };
+static const code distfix[32] = {
+    {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+    {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+    {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+    {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+    {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+    {22,5,193},{64,5,0}
+};
diff --git a/src/java.base/share/native/libzip/zlib/inflate.c b/src/java.base/share/native/libzip/zlib/inflate.c
index 3370cfe9565..c548f98f6de 100644
--- a/src/java.base/share/native/libzip/zlib/inflate.c
+++ b/src/java.base/share/native/libzip/zlib/inflate.c
@@ -23,7 +23,7 @@
  */
 
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2022 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -109,12 +109,6 @@
 #include "inflate.h"
 #include "inffast.h"
 
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
 local int inflateStateCheck(z_streamp strm) {
     struct inflate_state FAR *state;
     if (strm == Z_NULL ||
@@ -134,6 +128,7 @@ int ZEXPORT inflateResetKeep(z_streamp strm) {
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
+    strm->data_type = 0;
     if (state->wrap)        /* to support ill-conceived Java test suite */
         strm->adler = state->wrap & 1;
     state->mode = HEAD;
@@ -226,6 +221,7 @@ int ZEXPORT inflateInit2_(z_streamp strm, int windowBits,
     state = (struct inflate_state FAR *)
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
+    zmemzero(state, sizeof(struct inflate_state));
     Tracev((stderr, "inflate: allocated\n"));
     strm->state = (struct internal_state FAR *)state;
     state->strm = strm;
@@ -258,123 +254,11 @@ int ZEXPORT inflatePrime(z_streamp strm, int bits, int value) {
     }
     if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
     value &= (1L << bits) - 1;
-    state->hold += (unsigned)value << state->bits;
+    state->hold += (unsigned long)value << state->bits;
     state->bits += (uInt)bits;
     return Z_OK;
 }
 
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(struct inflate_state FAR *state) {
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed(void)
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-               state.lencode[low].bits, state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
 /*
    Update the window with the last wsize (normally 32K) bytes written before
    returning.  If window does not exist yet, create it.  This is only called
@@ -666,12 +550,12 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             if (
 #endif
                 ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
+                strm->msg = (z_const char *)"incorrect header check";
                 state->mode = BAD;
                 break;
             }
             if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
+                strm->msg = (z_const char *)"unknown compression method";
                 state->mode = BAD;
                 break;
             }
@@ -680,7 +564,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             if (state->wbits == 0)
                 state->wbits = len;
             if (len > 15 || len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
+                strm->msg = (z_const char *)"invalid window size";
                 state->mode = BAD;
                 break;
             }
@@ -696,12 +580,12 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             NEEDBITS(16);
             state->flags = (int)(hold);
             if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
+                strm->msg = (z_const char *)"unknown compression method";
                 state->mode = BAD;
                 break;
             }
             if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
+                strm->msg = (z_const char *)"unknown header flags set";
                 state->mode = BAD;
                 break;
             }
@@ -817,7 +701,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             if (state->flags & 0x0200) {
                 NEEDBITS(16);
                 if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
+                    strm->msg = (z_const char *)"header crc mismatch";
                     state->mode = BAD;
                     break;
                 }
@@ -864,7 +748,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                 state->mode = STORED;
                 break;
             case 1:                             /* fixed block */
-                fixedtables(state);
+                inflate_fixed(state);
                 Tracev((stderr, "inflate:     fixed codes block%s\n",
                         state->last ? " (last)" : ""));
                 state->mode = LEN_;             /* decode codes */
@@ -878,8 +762,8 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                         state->last ? " (last)" : ""));
                 state->mode = TABLE;
                 break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
+            default:
+                strm->msg = (z_const char *)"invalid block type";
                 state->mode = BAD;
             }
             DROPBITS(2);
@@ -888,7 +772,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             BYTEBITS();                         /* go to byte boundary */
             NEEDBITS(32);
             if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
+                strm->msg = (z_const char *)"invalid stored block lengths";
                 state->mode = BAD;
                 break;
             }
@@ -929,7 +813,8 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             DROPBITS(4);
 #ifndef PKZIP_BUG_WORKAROUND
             if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
+                strm->msg = (z_const char *)
+                    "too many length or distance symbols";
                 state->mode = BAD;
                 break;
             }
@@ -947,12 +832,12 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             while (state->have < 19)
                 state->lens[order[state->have++]] = 0;
             state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
+            state->lencode = state->distcode = (const code FAR *)(state->next);
             state->lenbits = 7;
             ret = inflate_table(CODES, state->lens, 19, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
+                strm->msg = (z_const char *)"invalid code lengths set";
                 state->mode = BAD;
                 break;
             }
@@ -976,7 +861,8 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                         NEEDBITS(here.bits + 2);
                         DROPBITS(here.bits);
                         if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
+                            strm->msg = (z_const char *)
+                                "invalid bit length repeat";
                             state->mode = BAD;
                             break;
                         }
@@ -999,7 +885,8 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                         DROPBITS(7);
                     }
                     if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
+                        strm->msg = (z_const char *)
+                            "invalid bit length repeat";
                         state->mode = BAD;
                         break;
                     }
@@ -1013,7 +900,8 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
 
             /* check for end-of-block code (better have one) */
             if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
+                strm->msg = (z_const char *)
+                    "invalid code -- missing end-of-block";
                 state->mode = BAD;
                 break;
             }
@@ -1027,7 +915,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
             if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
+                strm->msg = (z_const char *)"invalid literal/lengths set";
                 state->mode = BAD;
                 break;
             }
@@ -1036,7 +924,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
             if (ret) {
-                strm->msg = (char *)"invalid distances set";
+                strm->msg = (z_const char *)"invalid distances set";
                 state->mode = BAD;
                 break;
             }
@@ -1090,7 +978,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                 break;
             }
             if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
+                strm->msg = (z_const char *)"invalid literal/length code";
                 state->mode = BAD;
                 break;
             }
@@ -1128,7 +1016,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             DROPBITS(here.bits);
             state->back += here.bits;
             if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
+                strm->msg = (z_const char *)"invalid distance code";
                 state->mode = BAD;
                 break;
             }
@@ -1145,7 +1033,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             }
 #ifdef INFLATE_STRICT
             if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
+                strm->msg = (z_const char *)"invalid distance too far back";
                 state->mode = BAD;
                 break;
             }
@@ -1160,7 +1048,8 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                 copy = state->offset - copy;
                 if (copy > state->whave) {
                     if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
+                        strm->msg = (z_const char *)
+                            "invalid distance too far back";
                         state->mode = BAD;
                         break;
                     }
@@ -1219,7 +1108,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
                      state->flags ? hold :
 #endif
                      ZSWAP32(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
+                    strm->msg = (z_const char *)"incorrect data check";
                     state->mode = BAD;
                     break;
                 }
@@ -1233,7 +1122,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
             if (state->wrap && state->flags) {
                 NEEDBITS(32);
                 if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
-                    strm->msg = (char *)"incorrect length check";
+                    strm->msg = (z_const char *)"incorrect length check";
                     state->mode = BAD;
                     break;
                 }
@@ -1464,7 +1353,6 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     struct inflate_state FAR *state;
     struct inflate_state FAR *copy;
     unsigned char FAR *window;
-    unsigned wsize;
 
     /* check input */
     if (inflateStateCheck(source) || dest == Z_NULL)
@@ -1475,6 +1363,7 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     copy = (struct inflate_state FAR *)
            ZALLOC(source, 1, sizeof(struct inflate_state));
     if (copy == Z_NULL) return Z_MEM_ERROR;
+    zmemzero(copy, sizeof(struct inflate_state));
     window = Z_NULL;
     if (state->window != Z_NULL) {
         window = (unsigned char FAR *)
@@ -1486,8 +1375,8 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
     }
 
     /* copy state */
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy(copy, state, sizeof(struct inflate_state));
     copy->strm = dest;
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
@@ -1495,10 +1384,8 @@ int ZEXPORT inflateCopy(z_streamp dest, z_streamp source) {
         copy->distcode = copy->codes + (state->distcode - state->codes);
     }
     copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
+    if (window != Z_NULL)
+        zmemcpy(window, state->window, state->whave);
     copy->window = window;
     dest->state = (struct internal_state FAR *)copy;
     return Z_OK;
diff --git a/src/java.base/share/native/libzip/zlib/inflate.h b/src/java.base/share/native/libzip/zlib/inflate.h
index 2cc56dd7fd4..7828fb5db38 100644
--- a/src/java.base/share/native/libzip/zlib/inflate.h
+++ b/src/java.base/share/native/libzip/zlib/inflate.h
@@ -124,7 +124,7 @@ struct inflate_state {
     unsigned char FAR *window;  /* allocated sliding window, if needed */
         /* bit accumulator */
     unsigned long hold;         /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
+    unsigned bits;              /* number of bits in hold */
         /* for string and stored block copying */
     unsigned length;            /* literal or length of data to copy */
     unsigned offset;            /* distance back to copy string from */
diff --git a/src/java.base/share/native/libzip/zlib/inftrees.c b/src/java.base/share/native/libzip/zlib/inftrees.c
index c4913bc4359..5f5d6b4baef 100644
--- a/src/java.base/share/native/libzip/zlib/inftrees.c
+++ b/src/java.base/share/native/libzip/zlib/inftrees.c
@@ -23,17 +23,31 @@
  */
 
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2024 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+#ifdef BUILDFIXED
+#  define Z_ONCE
+#endif
+
 #include "zutil.h"
 #include "inftrees.h"
+#include "inflate.h"
+
+#ifndef NULL
+#  define NULL 0
+#endif
 
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.3.1 Copyright 1995-2024 Mark Adler ";
+   " inflate 1.3.2 Copyright 1995-2026 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -71,9 +85,9 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     unsigned mask;              /* mask for low root bits */
     code here;                  /* table entry for duplication */
     code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    unsigned match;             /* use base and extra for symbol >= match */
+    const unsigned short FAR *base = NULL;  /* base value table to use */
+    const unsigned short FAR *extra = NULL; /* extra bits table to use */
+    unsigned match = 0;         /* use base and extra for symbol >= match */
     unsigned short count[MAXBITS+1];    /* number of codes of each length */
     unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
@@ -81,7 +95,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 77};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 75};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -199,7 +213,6 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     /* set up for code type */
     switch (type) {
     case CODES:
-        base = extra = work;    /* dummy value--not used */
         match = 20;
         break;
     case LENS:
@@ -207,10 +220,9 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
         extra = lext;
         match = 257;
         break;
-    default:    /* DISTS */
+    case DISTS:
         base = dbase;
         extra = dext;
-        match = 0;
     }
 
     /* initialize state for loop */
@@ -321,3 +333,116 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
     *bits = root;
     return 0;
 }
+
+#ifdef BUILDFIXED
+/*
+  If this is compiled with BUILDFIXED defined, and if inflate will be used in
+  multiple threads, and if atomics are not available, then inflate() must be
+  called with a fixed block (e.g. 0x03 0x00) to initialize the tables and must
+  return before any other threads are allowed to call inflate.
+ */
+
+static code *lenfix, *distfix;
+static code fixed[544];
+
+/* State for z_once(). */
+local z_once_t built = Z_ONCE_INIT;
+
+local void buildtables(void) {
+    unsigned sym, bits;
+    static code *next;
+    unsigned short lens[288], work[288];
+
+    /* literal/length table */
+    sym = 0;
+    while (sym < 144) lens[sym++] = 8;
+    while (sym < 256) lens[sym++] = 9;
+    while (sym < 280) lens[sym++] = 7;
+    while (sym < 288) lens[sym++] = 8;
+    next = fixed;
+    lenfix = next;
+    bits = 9;
+    inflate_table(LENS, lens, 288, &(next), &(bits), work);
+
+    /* distance table */
+    sym = 0;
+    while (sym < 32) lens[sym++] = 5;
+    distfix = next;
+    bits = 5;
+    inflate_table(DISTS, lens, 32, &(next), &(bits), work);
+}
+#else /* !BUILDFIXED */
+#  include "inffixed.h"
+#endif /* BUILDFIXED */
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications if atomics are not available, as it will
+   not be thread-safe.
+ */
+void inflate_fixed(struct inflate_state FAR *state) {
+#ifdef BUILDFIXED
+    z_once(&built, buildtables);
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that will be #include'd above.  Defining MAKEFIXED
+   also defines BUILDFIXED, so the tables are built on the fly.  main() writes
+   those tables to stdout, which would directed to inffixed.h. Compile this
+   along with zutil.c:
+
+       cc -DMAKEFIXED -o fix inftrees.c zutil.c
+       ./fix > inffixed.h
+ */
+int main(void) {
+    unsigned low, size;
+    struct inflate_state state;
+
+    inflate_fixed(&state);
+    puts("/* inffixed.h -- table for decoding fixed codes");
+    puts(" * Generated automatically by makefixed().");
+    puts(" */");
+    puts("");
+    puts("/* WARNING: this file should *not* be used by applications.");
+    puts("   It is part of the implementation of this library and is");
+    puts("   subject to change. Applications should only use zlib.h.");
+    puts(" */");
+    puts("");
+    size = 1U << 9;
+    printf("static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n    ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n};");
+    size = 1U << 5;
+    printf("\nstatic const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n    ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n};");
+    return 0;
+}
+#endif /* MAKEFIXED */
diff --git a/src/java.base/share/native/libzip/zlib/inftrees.h b/src/java.base/share/native/libzip/zlib/inftrees.h
index 3e2e889301d..b9b4fc2fb2b 100644
--- a/src/java.base/share/native/libzip/zlib/inftrees.h
+++ b/src/java.base/share/native/libzip/zlib/inftrees.h
@@ -23,7 +23,7 @@
  */
 
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -84,3 +84,5 @@ typedef enum {
 int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
                                 unsigned codes, code FAR * FAR *table,
                                 unsigned FAR *bits, unsigned short FAR *work);
+struct inflate_state;
+void ZLIB_INTERNAL inflate_fixed(struct inflate_state FAR *state);
diff --git a/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java b/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java
index 3296c5f2fad..dfde58f0122 100644
--- a/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java
+++ b/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java
@@ -1,4 +1,4 @@
-Changes from zlib 1.3.1
+Changes in JDK's in-tree zlib compared to upstream zlib 1.3.2
 
 (1) renamed adler32.c -> zadler32.c, crc32c -> zcrc32.c
 
diff --git a/src/java.base/share/native/libzip/zlib/trees.c b/src/java.base/share/native/libzip/zlib/trees.c
index bbfa9deee5b..cc7b136bcf6 100644
--- a/src/java.base/share/native/libzip/zlib/trees.c
+++ b/src/java.base/share/native/libzip/zlib/trees.c
@@ -23,7 +23,7 @@
  */
 
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2024 Jean-loup Gailly
+ * Copyright (C) 1995-2026 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -136,7 +136,7 @@ local int base_dist[D_CODES];
 
 #else
 #  include "trees.h"
-#endif /* GEN_TREES_H */
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
 
 struct static_tree_desc_s {
     const ct_data *static_tree;  /* static tree or NULL */
@@ -176,7 +176,7 @@ local TCONST static_tree_desc static_bl_desc =
  * IN assertion: 1 <= len <= 15
  */
 local unsigned bi_reverse(unsigned code, int len) {
-    register unsigned res = 0;
+    unsigned res = 0;
     do {
         res |= code & 1;
         code >>= 1, res <<= 1;
@@ -208,10 +208,11 @@ local void bi_windup(deflate_state *s) {
     } else if (s->bi_valid > 0) {
         put_byte(s, (Byte)s->bi_buf);
     }
+    s->bi_used = ((s->bi_valid - 1) & 7) + 1;
     s->bi_buf = 0;
     s->bi_valid = 0;
 #ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent + 7) & ~7;
+    s->bits_sent = (s->bits_sent + 7) & ~(ulg)7;
 #endif
 }
 
@@ -490,6 +491,7 @@ void ZLIB_INTERNAL _tr_init(deflate_state *s) {
 
     s->bi_buf = 0;
     s->bi_valid = 0;
+    s->bi_used = 0;
 #ifdef ZLIB_DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
@@ -748,7 +750,7 @@ local void scan_tree(deflate_state *s, ct_data *tree, int max_code) {
         if (++count < max_count && curlen == nextlen) {
             continue;
         } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
+            s->bl_tree[curlen].Freq += (ush)count;
         } else if (curlen != 0) {
             if (curlen != prevlen) s->bl_tree[curlen].Freq++;
             s->bl_tree[REP_3_6].Freq++;
@@ -841,7 +843,7 @@ local int build_bl_tree(deflate_state *s) {
     }
     /* Update opt_len to include the bit length tree and counts */
     s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+    Tracev((stderr, "\ndyn trees: dyn %lu, stat %lu",
             s->opt_len, s->static_len));
 
     return max_blindex;
@@ -867,13 +869,13 @@ local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
         Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
         send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
     }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+    Tracev((stderr, "\nbl tree: sent %lu", s->bits_sent));
 
     send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1);  /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+    Tracev((stderr, "\nlit tree: sent %lu", s->bits_sent));
 
     send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1);  /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+    Tracev((stderr, "\ndist tree: sent %lu", s->bits_sent));
 }
 
 /* ===========================================================================
@@ -956,7 +958,7 @@ local void compress_block(deflate_state *s, const ct_data *ltree,
             extra = extra_dbits[code];
             if (extra != 0) {
                 dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
+                send_bits(s, (int)dist, extra); /* send the extra bits */
             }
         } /* literal or match pair ? */
 
@@ -1030,11 +1032,11 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
 
         /* Construct the literal and distance trees */
         build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+        Tracev((stderr, "\nlit data: dyn %lu, stat %lu", s->opt_len,
                 s->static_len));
 
         build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+        Tracev((stderr, "\ndist data: dyn %lu, stat %lu", s->opt_len,
                 s->static_len));
         /* At this point, opt_len and static_len are the total bit lengths of
          * the compressed block data, excluding the tree representations.
@@ -1107,7 +1109,7 @@ void ZLIB_INTERNAL _tr_flush_block(deflate_state *s, charf *buf,
 #endif
     }
     Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
-           s->compressed_len - 7*last));
+           s->compressed_len - 7*(ulg)last));
 }
 
 /* ===========================================================================
diff --git a/src/java.base/share/native/libzip/zlib/uncompr.c b/src/java.base/share/native/libzip/zlib/uncompr.c
index 219c1d264d5..25da59461c3 100644
--- a/src/java.base/share/native/libzip/zlib/uncompr.c
+++ b/src/java.base/share/native/libzip/zlib/uncompr.c
@@ -23,7 +23,7 @@
  */
 
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -47,24 +47,24 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
    Z_DATA_ERROR if the input data was corrupted, including if the input data is
    an incomplete zlib stream.
+
+     The _z versions of the functions take size_t length arguments.
 */
-int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
-                        uLong *sourceLen) {
+int ZEXPORT uncompress2_z(Bytef *dest, z_size_t *destLen, const Bytef *source,
+                          z_size_t *sourceLen) {
     z_stream stream;
     int err;
     const uInt max = (uInt)-1;
-    uLong len, left;
-    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
+    z_size_t len, left;
+
+    if (sourceLen == NULL || (*sourceLen > 0 && source == NULL) ||
+        destLen == NULL || (*destLen > 0 && dest == NULL))
+        return Z_STREAM_ERROR;
 
     len = *sourceLen;
-    if (*destLen) {
-        left = *destLen;
-        *destLen = 0;
-    }
-    else {
-        left = 1;
-        dest = buf;
-    }
+    left = *destLen;
+    if (left == 0 && dest == Z_NULL)
+        dest = (Bytef *)&stream.reserved;       /* next_out cannot be NULL */
 
     stream.next_in = (z_const Bytef *)source;
     stream.avail_in = 0;
@@ -80,30 +80,46 @@ int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
 
     do {
         if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            stream.avail_out = left > (z_size_t)max ? max : (uInt)left;
             left -= stream.avail_out;
         }
         if (stream.avail_in == 0) {
-            stream.avail_in = len > (uLong)max ? max : (uInt)len;
+            stream.avail_in = len > (z_size_t)max ? max : (uInt)len;
             len -= stream.avail_in;
         }
         err = inflate(&stream, Z_NO_FLUSH);
     } while (err == Z_OK);
 
-    *sourceLen -= len + stream.avail_in;
-    if (dest != buf)
-        *destLen = stream.total_out;
-    else if (stream.total_out && err == Z_BUF_ERROR)
-        left = 1;
+    /* Set len and left to the unused input data and unused output space. Set
+       *sourceLen to the amount of input consumed. Set *destLen to the amount
+       of data produced. */
+    len += stream.avail_in;
+    left += stream.avail_out;
+    *sourceLen -= len;
+    *destLen -= left;
 
     inflateEnd(&stream);
     return err == Z_STREAM_END ? Z_OK :
            err == Z_NEED_DICT ? Z_DATA_ERROR  :
-           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+           err == Z_BUF_ERROR && len == 0 ? Z_DATA_ERROR :
            err;
 }
-
+int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+                        uLong *sourceLen) {
+    int ret;
+    z_size_t got = *destLen, used = *sourceLen;
+    ret = uncompress2_z(dest, &got, source, &used);
+    *sourceLen = (uLong)used;
+    *destLen = (uLong)got;
+    return ret;
+}
+int ZEXPORT uncompress_z(Bytef *dest, z_size_t *destLen, const Bytef *source,
+                         z_size_t sourceLen) {
+    z_size_t used = sourceLen;
+    return uncompress2_z(dest, destLen, source, &used);
+}
 int ZEXPORT uncompress(Bytef *dest, uLongf *destLen, const Bytef *source,
                        uLong sourceLen) {
-    return uncompress2(dest, destLen, source, &sourceLen);
+    uLong used = sourceLen;
+    return uncompress2(dest, destLen, source, &used);
 }
diff --git a/src/java.base/share/native/libzip/zlib/zconf.h b/src/java.base/share/native/libzip/zlib/zconf.h
index 46204222f5d..d4589739a0a 100644
--- a/src/java.base/share/native/libzip/zlib/zconf.h
+++ b/src/java.base/share/native/libzip/zlib/zconf.h
@@ -23,7 +23,7 @@
  */
 
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -57,7 +57,10 @@
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
+#    define compress_z            z_compress_z
+#    define compress2_z           z_compress2_z
 #    define compressBound         z_compressBound
+#    define compressBound_z       z_compressBound_z
 #  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
@@ -68,6 +71,7 @@
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
+#  define deflateBound_z        z_deflateBound_z
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
 #  define deflateGetDictionary  z_deflateGetDictionary
@@ -83,6 +87,7 @@
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateSetHeader      z_deflateSetHeader
 #  define deflateTune           z_deflateTune
+#  define deflateUsed           z_deflateUsed
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
 #  ifndef Z_SOLO
@@ -152,9 +157,12 @@
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
+#  define inflate_fixed         z_inflate_fixed
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
 #    define uncompress2           z_uncompress2
+#    define uncompress_z          z_uncompress_z
+#    define uncompress2_z         z_uncompress2_z
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -258,10 +266,12 @@
 #  endif
 #endif
 
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
+#ifndef z_const
+#  ifdef ZLIB_CONST
+#    define z_const const
+#  else
+#    define z_const
+#  endif
 #endif
 
 #ifdef Z_SOLO
@@ -457,11 +467,11 @@ typedef uLong FAR uLongf;
    typedef unsigned long z_crc_t;
 #endif
 
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#if HAVE_UNISTD_H-0     /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#if HAVE_STDARG_H-0     /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_STDARG_H
 #endif
 
@@ -494,12 +504,8 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifndef Z_HAVE_UNISTD_H
-#  ifdef __WATCOMC__
-#    define Z_HAVE_UNISTD_H
-#  endif
-#endif
-#ifndef Z_HAVE_UNISTD_H
-#  if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+#  if defined(__WATCOMC__) || defined(__GO32__) || \
+      (defined(_LARGEFILE64_SOURCE) && !defined(_WIN32))
 #    define Z_HAVE_UNISTD_H
 #  endif
 #endif
@@ -534,17 +540,19 @@ typedef uLong FAR uLongf;
 #endif
 
 #ifndef z_off_t
-#  define z_off_t long
+#  define z_off_t long long
 #endif
 
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
+#elif defined(__MINGW32__)
+#  define z_off64_t long long
+#elif defined(_WIN32) && !defined(__GNUC__)
+#  define z_off64_t __int64
+#elif defined(__GO32__)
+#  define z_off64_t offset_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
+#  define z_off64_t z_off_t
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
diff --git a/src/java.base/share/native/libzip/zlib/zcrc32.c b/src/java.base/share/native/libzip/zlib/zcrc32.c
index 3f918f76b7c..133cbe158aa 100644
--- a/src/java.base/share/native/libzip/zlib/zcrc32.c
+++ b/src/java.base/share/native/libzip/zlib/zcrc32.c
@@ -23,7 +23,7 @@
  */
 
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2022 Mark Adler
+ * Copyright (C) 1995-2026 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * This interleaved implementation of a CRC makes use of pipelined multiple
@@ -48,11 +48,18 @@
 #  include <stdio.h>
 #  ifndef DYNAMIC_CRC_TABLE
 #    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
+#  endif
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+#  define Z_ONCE
+#endif
 
 #include "zutil.h"      /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
 
+#ifdef HAVE_S390X_VX
+#  include "contrib/crc32vx/crc32_vx_hooks.h"
+#endif
+
  /*
   A CRC of a message is computed on N braids of words in the message, where
   each word consists of W bytes (4 or 8). If N is 3, for example, then three
@@ -123,7 +130,8 @@
 #endif
 
 /* If available, use the ARM processor CRC32 instruction. */
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && \
+    defined(W) && W == 8
 #  define ARMCRC32
 #endif
 
@@ -176,10 +184,10 @@ local z_word_t byte_swap(z_word_t word) {
   Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
   reflected. For speed, this requires that a not be zero.
  */
-local z_crc_t multmodp(z_crc_t a, z_crc_t b) {
-    z_crc_t m, p;
+local uLong multmodp(uLong a, uLong b) {
+    uLong m, p;
 
-    m = (z_crc_t)1 << 31;
+    m = (uLong)1 << 31;
     p = 0;
     for (;;) {
         if (a & m) {
@@ -195,12 +203,12 @@ local z_crc_t multmodp(z_crc_t a, z_crc_t b) {
 
 /*
   Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
-  initialized.
+  initialized. n must not be negative.
  */
-local z_crc_t x2nmodp(z_off64_t n, unsigned k) {
-    z_crc_t p;
+local uLong x2nmodp(z_off64_t n, unsigned k) {
+    uLong p;
 
-    p = (z_crc_t)1 << 31;           /* x^0 == 1 */
+    p = (uLong)1 << 31;             /* x^0 == 1 */
     while (n) {
         if (n & 1)
             p = multmodp(x2n_table[k & 31], p);
@@ -228,83 +236,8 @@ local z_crc_t FAR crc_table[256];
    local void write_table64(FILE *, const z_word_t FAR *, int);
 #endif /* MAKECRCH */
 
-/*
-  Define a once() function depending on the availability of atomics. If this is
-  compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
-  multiple threads, and if atomics are not available, then get_crc_table() must
-  be called to initialize the tables and must return before any threads are
-  allowed to compute or combine CRCs.
- */
-
-/* Definition of once functionality. */
-typedef struct once_s once_t;
-
-/* Check for the availability of atomics. */
-#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
-    !defined(__STDC_NO_ATOMICS__)
-
-#include <stdatomic.h>
-
-/* Structure for once(), which must be initialized with ONCE_INIT. */
-struct once_s {
-    atomic_flag begun;
-    atomic_int done;
-};
-#define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
-
-/*
-  Run the provided init() function exactly once, even if multiple threads
-  invoke once() at the same time. The state must be a once_t initialized with
-  ONCE_INIT.
- */
-local void once(once_t *state, void (*init)(void)) {
-    if (!atomic_load(&state->done)) {
-        if (atomic_flag_test_and_set(&state->begun))
-            while (!atomic_load(&state->done))
-                ;
-        else {
-            init();
-            atomic_store(&state->done, 1);
-        }
-    }
-}
-
-#else   /* no atomics */
-
-/* Structure for once(), which must be initialized with ONCE_INIT. */
-struct once_s {
-    volatile int begun;
-    volatile int done;
-};
-#define ONCE_INIT {0, 0}
-
-/* Test and set. Alas, not atomic, but tries to minimize the period of
-   vulnerability. */
-local int test_and_set(int volatile *flag) {
-    int was;
-
-    was = *flag;
-    *flag = 1;
-    return was;
-}
-
-/* Run the provided init() function once. This is not thread-safe. */
-local void once(once_t *state, void (*init)(void)) {
-    if (!state->done) {
-        if (test_and_set(&state->begun))
-            while (!state->done)
-                ;
-        else {
-            init();
-            state->done = 1;
-        }
-    }
-}
-
-#endif
-
 /* State for once(). */
-local once_t made = ONCE_INIT;
+local z_once_t made = Z_ONCE_INIT;
 
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -350,7 +283,7 @@ local void make_crc_table(void) {
     p = (z_crc_t)1 << 30;         /* x^1 */
     x2n_table[0] = p;
     for (n = 1; n < 32; n++)
-        x2n_table[n] = p = multmodp(p, p);
+        x2n_table[n] = p = (z_crc_t)multmodp(p, p);
 
 #ifdef W
     /* initialize the braiding tables -- needs x2n_table[] */
@@ -553,11 +486,11 @@ local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) {
     int k;
     z_crc_t i, p, q;
     for (k = 0; k < w; k++) {
-        p = x2nmodp((n * w + 3 - k) << 3, 0);
+        p = (z_crc_t)x2nmodp((n * w + 3 - k) << 3, 0);
         ltl[k][0] = 0;
         big[w - 1 - k][0] = 0;
         for (i = 1; i < 256; i++) {
-            ltl[k][i] = q = multmodp(i << 24, p);
+            ltl[k][i] = q = (z_crc_t)multmodp(i << 24, p);
             big[w - 1 - k][i] = byte_swap(q);
         }
     }
@@ -572,7 +505,7 @@ local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) {
  */
 const z_crc_t FAR * ZEXPORT get_crc_table(void) {
 #ifdef DYNAMIC_CRC_TABLE
-    once(&made, make_crc_table);
+    z_once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
     return (const z_crc_t FAR *)crc_table;
 }
@@ -596,9 +529,8 @@ const z_crc_t FAR * ZEXPORT get_crc_table(void) {
 #define Z_BATCH_ZEROS 0xa10d3d0c    /* computed from Z_BATCH = 3990 */
 #define Z_BATCH_MIN 800             /* fewest words in a final batch */
 
-unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
-                              z_size_t len) {
-    z_crc_t val;
+uLong ZEXPORT crc32_z(uLong crc, const unsigned char FAR *buf, z_size_t len) {
+    uLong val;
     z_word_t crc1, crc2;
     const z_word_t *word;
     z_word_t val0, val1, val2;
@@ -609,7 +541,7 @@ unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
     if (buf == Z_NULL) return 0;
 
 #ifdef DYNAMIC_CRC_TABLE
-    once(&made, make_crc_table);
+    z_once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
 
     /* Pre-condition the CRC */
@@ -664,7 +596,7 @@ unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
         }
         word += 3 * last;
         num -= 3 * last;
-        val = x2nmodp(last, 6);
+        val = x2nmodp((int)last, 6);
         crc = multmodp(val, crc) ^ crc1;
         crc = multmodp(val, crc) ^ crc2;
     }
@@ -715,13 +647,12 @@ local z_word_t crc_word_big(z_word_t data) {
 #endif
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
-                              z_size_t len) {
+uLong ZEXPORT crc32_z(uLong crc, const unsigned char FAR *buf, z_size_t len) {
     /* Return initial CRC, if requested. */
     if (buf == Z_NULL) return 0;
 
 #ifdef DYNAMIC_CRC_TABLE
-    once(&made, make_crc_table);
+    z_once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
 
     /* Pre-condition the CRC */
@@ -1036,28 +967,19 @@ unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
 #endif
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf,
-                            uInt len) {
+uLong ZEXPORT crc32(uLong crc, const unsigned char FAR *buf, uInt len) {
+    #ifdef HAVE_S390X_VX
+    return crc32_z_hook(crc, buf, len);
+    #endif
     return crc32_z(crc, buf, len);
 }
 
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
-#ifdef DYNAMIC_CRC_TABLE
-    once(&made, make_crc_table);
-#endif /* DYNAMIC_CRC_TABLE */
-    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
-    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
-}
-
 /* ========================================================================= */
 uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
+    if (len2 < 0)
+        return 0;
 #ifdef DYNAMIC_CRC_TABLE
-    once(&made, make_crc_table);
+    z_once(&made, make_crc_table);
 #endif /* DYNAMIC_CRC_TABLE */
     return x2nmodp(len2, 3);
 }
@@ -1069,5 +991,17 @@ uLong ZEXPORT crc32_combine_gen(z_off_t len2) {
 
 /* ========================================================================= */
 uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) {
-    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+    if (op == 0)
+        return 0;
+    return multmodp(op, crc1 & 0xffffffff) ^ (crc2 & 0xffffffff);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
+    return crc32_combine_op(crc1, crc2, crc32_combine_gen64(len2));
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
+    return crc32_combine64(crc1, crc2, (z_off64_t)len2);
 }
diff --git a/src/java.base/share/native/libzip/zlib/zlib.h b/src/java.base/share/native/libzip/zlib/zlib.h
index 07496b5f981..90230f4f23f 100644
--- a/src/java.base/share/native/libzip/zlib/zlib.h
+++ b/src/java.base/share/native/libzip/zlib/zlib.h
@@ -23,9 +23,9 @@
  */
 
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.3.1, January 22nd, 2024
+  version 1.3.2, February 17th, 2026
 
-  Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -48,24 +48,28 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  Comments) 1950 to 1952 at https://datatracker.ietf.org/doc/html/rfc1950
   (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
 #ifndef ZLIB_H
 #define ZLIB_H
 
-#include "zconf.h"
+#ifdef ZLIB_BUILD
+#  include <zconf.h>
+#else
+# include "zconf.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.3.1"
-#define ZLIB_VERNUM 0x1310
+#define ZLIB_VERSION "1.3.2"
+#define ZLIB_VERNUM 0x1320
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 3
-#define ZLIB_VER_REVISION 1
+#define ZLIB_VER_REVISION 2
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -465,7 +469,7 @@ ZEXTERN int ZEXPORT inflate(z_streamp strm, int flush);
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
   To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  number of unused bits in the input taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
   decoding the complete header up to just before the first byte of the deflate
@@ -611,18 +615,21 @@ ZEXTERN int ZEXPORT deflateInit2(z_streamp strm,
 
      The strategy parameter is used to tune the compression algorithm.  Use the
    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
+   filter (or predictor), Z_RLE to limit match distances to one (run-length
+   encoding), or Z_HUFFMAN_ONLY to force Huffman encoding only (no string
+   matching).  Filtered data consists mostly of small values with a somewhat
+   random distribution, as produced by the PNG filters.  In this case, the
+   compression algorithm is tuned to compress them better.  The effect of
+   Z_FILTERED is to force more Huffman coding and less string matching than the
+   default; it is intermediate between Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.
+   Z_RLE is almost as fast as Z_HUFFMAN_ONLY, but should give better
+   compression for PNG image data than Huffman only.  The degree of string
+   matching from most to none is: Z_DEFAULT_STRATEGY, Z_FILTERED, Z_RLE, then
+   Z_HUFFMAN_ONLY. The strategy parameter affects the compression ratio but
+   never the correctness of the compressed output, even if it is not set
+   optimally for the given data.  Z_FIXED uses the default string matching, but
+   prevents the use of dynamic Huffman codes, allowing for a simpler decoder
+   for special applications.
 
      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
@@ -782,8 +789,8 @@ ZEXTERN int ZEXPORT deflateTune(z_streamp strm,
    returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
  */
 
-ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm,
-                                   uLong sourceLen);
+ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen);
+ZEXTERN z_size_t ZEXPORT deflateBound_z(z_streamp strm, z_size_t sourceLen);
 /*
      deflateBound() returns an upper bound on the compressed size after
    deflation of sourceLen bytes.  It must be called after deflateInit() or
@@ -795,6 +802,9 @@ ZEXTERN uLong ZEXPORT deflateBound(z_streamp strm,
    to return Z_STREAM_END.  Note that it is possible for the compressed size to
    be larger than the value returned by deflateBound() if flush options other
    than Z_FINISH or Z_NO_FLUSH are used.
+
+     delfateBound_z() is the same, but takes and returns a size_t length.  Note
+   that a long is 32 bits on Windows.
 */
 
 ZEXTERN int ZEXPORT deflatePending(z_streamp strm,
@@ -809,6 +819,21 @@ ZEXTERN int ZEXPORT deflatePending(z_streamp strm,
    or bits are Z_NULL, then those values are not set.
 
      deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.  If an int is 16 bits and memLevel is 9, then
+   it is possible for the number of pending bytes to not fit in an unsigned. In
+   that case Z_BUF_ERROR is returned and *pending is set to the maximum value
+   of an unsigned.
+ */
+
+ZEXTERN int ZEXPORT deflateUsed(z_streamp strm,
+                                int *bits);
+/*
+     deflateUsed() returns in *bits the most recent number of deflate bits used
+   in the last byte when flushing to a byte boundary. The result is in 1..8, or
+   0 if there has not yet been a flush. This helps determine the location of
+   the last bit of a deflate stream.
+
+     deflateUsed returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent.
  */
 
@@ -1011,13 +1036,15 @@ ZEXTERN int ZEXPORT inflatePrime(z_streamp strm,
                                  int bits,
                                  int value);
 /*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
+     This function inserts bits in the inflate input stream.  The intent is to
+   use inflatePrime() to start inflating at a bit position in the middle of a
+   byte.  The provided bits will be used before any bytes are used from
+   next_in.  This function should be used with raw inflate, before the first
+   inflate() call, after inflateInit2() or inflateReset().  It can also be used
+   after an inflate() return indicates the end of a deflate block or header
+   when using Z_BLOCK.  bits must be less than or equal to 16, and that many of
+   the least significant bits of value will be inserted in the input.  The
+   other bits in value can be non-zero, and will be ignored.
 
      If bits is negative, then the input stream bit buffer is emptied.  Then
    inflatePrime() can be called again to put bits in the buffer.  This is used
@@ -1025,7 +1052,15 @@ ZEXTERN int ZEXPORT inflatePrime(z_streamp strm,
    to feeding inflate codes.
 
      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
+   stream state was inconsistent, or if bits is out of range.  If inflate was
+   in the middle of processing a header, trailer, or stored block lengths, then
+   it is possible for there to be only eight bits available in the bit buffer.
+   In that case, bits > 8 is considered out of range.  However, when used as
+   outlined above, there will always be 16 bits available in the buffer for
+   insertion.  As noted in its documentation above, inflate records the number
+   of bits in the bit buffer on return in data_type. 32 minus that is the
+   number of bits available for insertion.  inflatePrime does not update
+   data_type with the new number of bits in buffer.
 */
 
 ZEXTERN long ZEXPORT inflateMark(z_streamp strm);
@@ -1071,20 +1106,22 @@ ZEXTERN int ZEXPORT inflateGetHeader(z_streamp strm,
 
      The text, time, xflags, and os fields are filled in with the gzip header
    contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
+   was valid if done is set to one.)  The extra, name, and comment pointers
+   much each be either Z_NULL or point to space to store that information from
+   the header.  If extra is not Z_NULL, then extra_max contains the maximum
+   number of bytes that can be written to extra.  Once done is true, extra_len
+   contains the actual extra field length, and extra contains the extra field,
+   or that field truncated if extra_max is less than extra_len.  If name is not
+   Z_NULL, then up to name_max characters, including the terminating zero, are
+   written there.  If comment is not Z_NULL, then up to comm_max characters,
+   including the terminating zero, are written there.  The application can tell
+   that the name or comment did not fit in the provided space by the absence of
+   a terminating zero.  If any of extra, name, or comment are not present in
+   the header, then that field's pointer is set to Z_NULL.  This allows the use
+   of deflateSetHeader() with the returned structure to duplicate the header.
+   Note that if those fields initially pointed to allocated memory, then the
+   application will need to save them elsewhere so that they can be eventually
+   freed.
 
      If inflateGetHeader is not used, then the header information is simply
    discarded.  The header is always checked for validity, including the header
@@ -1232,13 +1269,14 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags(void);
      21: FASTEST -- deflate algorithm with only one, lowest compression level
      22,23: 0 (reserved)
 
-    The sprintf variant used by gzprintf (zero is best):
+    The sprintf variant used by gzprintf (all zeros is best):
      24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() is not secure!
      26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+     27: 0 = gzprintf() present, 1 = not -- 1 means gzprintf() returns an error
 
     Remainder:
-     27-31: 0 (reserved)
+     28-31: 0 (reserved)
  */
 
 #ifndef Z_SOLO
@@ -1250,11 +1288,14 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags(void);
    stream-oriented functions.  To simplify the interface, some default options
    are assumed (compression level and memory usage, standard memory allocation
    functions).  The source code of these utility functions can be modified if
-   you need special options.
+   you need special options.  The _z versions of the functions use the size_t
+   type for lengths.  Note that a long is 32 bits on Windows.
 */
 
-ZEXTERN int ZEXPORT compress(Bytef *dest,   uLongf *destLen,
+ZEXTERN int ZEXPORT compress(Bytef *dest, uLongf *destLen,
                              const Bytef *source, uLong sourceLen);
+ZEXTERN int ZEXPORT compress_z(Bytef *dest, z_size_t *destLen,
+                               const Bytef *source, z_size_t sourceLen);
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer.  Upon entry, destLen is the total size
@@ -1268,9 +1309,12 @@ ZEXTERN int ZEXPORT compress(Bytef *dest,   uLongf *destLen,
    buffer.
 */
 
-ZEXTERN int ZEXPORT compress2(Bytef *dest,   uLongf *destLen,
+ZEXTERN int ZEXPORT compress2(Bytef *dest, uLongf *destLen,
                               const Bytef *source, uLong sourceLen,
                               int level);
+ZEXTERN int ZEXPORT compress2_z(Bytef *dest, z_size_t *destLen,
+                                const Bytef *source, z_size_t sourceLen,
+                                int level);
 /*
      Compresses the source buffer into the destination buffer.  The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
@@ -1285,21 +1329,24 @@ ZEXTERN int ZEXPORT compress2(Bytef *dest,   uLongf *destLen,
 */
 
 ZEXTERN uLong ZEXPORT compressBound(uLong sourceLen);
+ZEXTERN z_size_t ZEXPORT compressBound_z(z_size_t sourceLen);
 /*
      compressBound() returns an upper bound on the compressed size after
    compress() or compress2() on sourceLen bytes.  It would be used before a
    compress() or compress2() call to allocate the destination buffer.
 */
 
-ZEXTERN int ZEXPORT uncompress(Bytef *dest,   uLongf *destLen,
+ZEXTERN int ZEXPORT uncompress(Bytef *dest, uLongf *destLen,
                                const Bytef *source, uLong sourceLen);
+ZEXTERN int ZEXPORT uncompress_z(Bytef *dest, z_size_t *destLen,
+                                 const Bytef *source, z_size_t sourceLen);
 /*
      Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
+   the byte length of the source buffer.  On entry, *destLen is the total size
    of the destination buffer, which must be large enough to hold the entire
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
+   mechanism outside the scope of this compression library.)  On exit, *destLen
    is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
@@ -1309,8 +1356,10 @@ ZEXTERN int ZEXPORT uncompress(Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
-ZEXTERN int ZEXPORT uncompress2(Bytef *dest,   uLongf *destLen,
+ZEXTERN int ZEXPORT uncompress2(Bytef *dest, uLongf *destLen,
                                 const Bytef *source, uLong *sourceLen);
+ZEXTERN int ZEXPORT uncompress2_z(Bytef *dest, z_size_t *destLen,
+                                  const Bytef *source, z_size_t *sourceLen);
 /*
      Same as uncompress, except that sourceLen is a pointer, where the
    length of the source is *sourceLen.  On return, *sourceLen is the number of
@@ -1338,13 +1387,17 @@ ZEXTERN gzFile ZEXPORT gzopen(const char *path, const char *mode);
    'R' for run-length encoding as in "wb1R", or 'F' for fixed code compression
    as in "wb9F".  (See the description of deflateInit2 for more information
    about the strategy parameter.)  'T' will request transparent writing or
-   appending with no compression and not using the gzip format.
+   appending with no compression and not using the gzip format. 'T' cannot be
+   used to force transparent reading. Transparent reading is automatically
+   performed if there is no gzip header at the start. Transparent reading can
+   be disabled with the 'G' option, which will instead return an error if there
+   is no gzip header. 'N' will open the file in non-blocking mode.
 
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
+     'a' can be used instead of 'w' to request that the gzip stream that will
+   be written be appended to the file.  '+' will result in an error, since
    reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
+   'x' when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of 'e' when
    reading or writing will set the flag to close the file on an execve() call.
 
      These functions, as well as gzip, will read and decode a sequence of gzip
@@ -1363,14 +1416,22 @@ ZEXTERN gzFile ZEXPORT gzopen(const char *path, const char *mode);
    insufficient memory to allocate the gzFile state, or if an invalid mode was
    specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
    errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
+   file could not be opened. Note that if 'N' is in mode for non-blocking, the
+   open() itself can fail in order to not block. In that case gzopen() will
+   return NULL and errno will be EAGAIN or ENONBLOCK. The call to gzopen() can
+   then be re-tried. If the application would like to block on opening the
+   file, then it can use open() without O_NONBLOCK, and then gzdopen() with the
+   resulting file descriptor and 'N' in the mode, which will set it to non-
+   blocking.
 */
 
 ZEXTERN gzFile ZEXPORT gzdopen(int fd, const char *mode);
 /*
      Associate a gzFile with the file descriptor fd.  File descriptors are
    obtained from calls like open, dup, creat, pipe or fileno (if the file has
-   been previously opened with fopen).  The mode parameter is as in gzopen.
+   been previously opened with fopen).  The mode parameter is as in gzopen. An
+   'e' in mode will set fd's flag to close the file on an execve() call. An 'N'
+   in mode will set fd's non-blocking flag.
 
      The next call of gzclose on the returned gzFile will also close the file
    descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
@@ -1440,10 +1501,16 @@ ZEXTERN int ZEXPORT gzread(gzFile file, voidp buf, unsigned len);
    stream.  Alternatively, gzerror can be used before gzclose to detect this
    case.
 
+     gzread can be used to read a gzip file on a non-blocking device. If the
+   input stalls and there is no uncompressed data to return, then gzread() will
+   return -1, and errno will be EAGAIN or EWOULDBLOCK. gzread() can then be
+   called again.
+
      gzread returns the number of uncompressed bytes actually read, less than
    len for end of file, or -1 for error.  If len is too large to fit in an int,
    then nothing is read, -1 is returned, and the error state is set to
-   Z_STREAM_ERROR.
+   Z_STREAM_ERROR. If some data was read before an error, then that data is
+   returned until exhausted, after which the next call will signal the error.
 */
 
 ZEXTERN z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
@@ -1467,15 +1534,20 @@ ZEXTERN z_size_t ZEXPORT gzfread(voidp buf, z_size_t size, z_size_t nitems,
    multiple of size, then the final partial item is nevertheless read into buf
    and the end-of-file flag is set.  The length of the partial item read is not
    provided, but could be inferred from the result of gztell().  This behavior
-   is the same as the behavior of fread() implementations in common libraries,
-   but it prevents the direct use of gzfread() to read a concurrently written
-   file, resetting and retrying on end-of-file, when size is not 1.
+   is the same as that of fread() implementations in common libraries. This
+   could result in data loss if used with size != 1 when reading a concurrently
+   written file or a non-blocking file. In that case, use size == 1 or gzread()
+   instead.
 */
 
 ZEXTERN int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len);
 /*
      Compress and write the len uncompressed bytes at buf to file. gzwrite
-   returns the number of uncompressed bytes written or 0 in case of error.
+   returns the number of uncompressed bytes written, or 0 in case of error or
+   if len is 0.  If the write destination is non-blocking, then gzwrite() may
+   return a number of bytes written that is not 0 and less than len.
+
+     If len does not fit in an int, then 0 is returned and nothing is written.
 */
 
 ZEXTERN z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size,
@@ -1490,9 +1562,18 @@ ZEXTERN z_size_t ZEXPORT gzfwrite(voidpc buf, z_size_t size,
    if there was an error.  If the multiplication of size and nitems overflows,
    i.e. the product does not fit in a z_size_t, then nothing is written, zero
    is returned, and the error state is set to Z_STREAM_ERROR.
+
+     If writing a concurrently read file or a non-blocking file with size != 1,
+   a partial item could be written, with no way of knowing how much of it was
+   not written, resulting in data loss.  In that case, use size == 1 or
+   gzwrite() instead.
 */
 
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
 ZEXTERN int ZEXPORTVA gzprintf(gzFile file, const char *format, ...);
+#else
+ZEXTERN int ZEXPORTVA gzprintf();
+#endif
 /*
      Convert, format, compress, and write the arguments (...) to file under
    control of the string format, as in fprintf.  gzprintf returns the number of
@@ -1500,11 +1581,19 @@ ZEXTERN int ZEXPORTVA gzprintf(gzFile file, const char *format, ...);
    of error.  The number of uncompressed bytes written is limited to 8191, or
    one less than the buffer size given to gzbuffer().  The caller should assure
    that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   return an error (0) with nothing written.  In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf(),
-   because the secure snprintf() or vsnprintf() functions were not available.
-   This can be determined using zlibCompileFlags().
+   return an error (0) with nothing written.
+
+     In that last case, there may also be a buffer overflow with unpredictable
+   consequences, which is possible only if zlib was compiled with the insecure
+   functions sprintf() or vsprintf(), because the secure snprintf() and
+   vsnprintf() functions were not available. That would only be the case for
+   a non-ANSI C compiler. zlib may have been built without gzprintf() because
+   secure functions were not available and having gzprintf() be insecure was
+   not an option, in which case, gzprintf() returns Z_STREAM_ERROR. All of
+   these possibilities can be determined using zlibCompileFlags().
+
+     If a Z_BUF_ERROR is returned, then nothing was written due to a stall on
+   the non-blocking write destination.
 */
 
 ZEXTERN int ZEXPORT gzputs(gzFile file, const char *s);
@@ -1513,6 +1602,11 @@ ZEXTERN int ZEXPORT gzputs(gzFile file, const char *s);
    the terminating null character.
 
      gzputs returns the number of characters written, or -1 in case of error.
+   The number of characters written may be less than the length of the string
+   if the write destination is non-blocking.
+
+     If the length of the string does not fit in an int, then -1 is returned
+   and nothing is written.
 */
 
 ZEXTERN char * ZEXPORT gzgets(gzFile file, char *buf, int len);
@@ -1525,8 +1619,13 @@ ZEXTERN char * ZEXPORT gzgets(gzFile file, char *buf, int len);
    left untouched.
 
      gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
+   for end-of-file or in case of error. If some data was read before an error,
+   then that data is returned until exhausted, after which the next call will
+   return NULL to signal the error.
+
+     gzgets can be used on a file being concurrently written, and on a non-
+   blocking device, both as for gzread(). However lines may be broken in the
+   middle, leaving it up to the application to reassemble them as needed.
 */
 
 ZEXTERN int ZEXPORT gzputc(gzFile file, int c);
@@ -1537,11 +1636,19 @@ ZEXTERN int ZEXPORT gzputc(gzFile file, int c);
 
 ZEXTERN int ZEXPORT gzgetc(gzFile file);
 /*
-     Read and decompress one byte from file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
+     Read and decompress one byte from file. gzgetc returns this byte or -1 in
+   case of end of file or error. If some data was read before an error, then
+   that data is returned until exhausted, after which the next call will return
+   -1 to signal the error.
+
+     This is implemented as a macro for speed. As such, it does not do all of
+   the checking the other functions do. I.e. it does not check to see if file
+   is NULL, nor whether the structure file points to has been clobbered or not.
+
+     gzgetc can be used to read a gzip file on a non-blocking device. If the
+   input stalls and there is no uncompressed data to return, then gzgetc() will
+   return -1, and errno will be EAGAIN or EWOULDBLOCK. gzread() can then be
+   called again.
 */
 
 ZEXTERN int ZEXPORT gzungetc(int c, gzFile file);
@@ -1554,6 +1661,11 @@ ZEXTERN int ZEXPORT gzungetc(int c, gzFile file);
    output buffer size of pushed characters is allowed.  (See gzbuffer above.)
    The pushed character will be discarded if the stream is repositioned with
    gzseek() or gzrewind().
+
+     gzungetc(-1, file) will force any pending seek to execute. Then gztell()
+   will report the position, even if the requested seek reached end of file.
+   This can be used to determine the number of uncompressed bytes in a gzip
+   file without having to read it into a buffer.
 */
 
 ZEXTERN int ZEXPORT gzflush(gzFile file, int flush);
@@ -1583,7 +1695,8 @@ ZEXTERN z_off_t ZEXPORT gzseek(gzFile file,
      If the file is opened for reading, this function is emulated but can be
    extremely slow.  If the file is opened for writing, only forward seeks are
    supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
+   starting position. For reading or writing, any actual seeking is deferred
+   until the next read or write operation, or close operation when writing.
 
      gzseek returns the resulting offset location as measured in bytes from
    the beginning of the uncompressed stream, or -1 in case of error, in
@@ -1591,7 +1704,7 @@ ZEXTERN z_off_t ZEXPORT gzseek(gzFile file,
    would be before the current position.
 */
 
-ZEXTERN int ZEXPORT    gzrewind(gzFile file);
+ZEXTERN int ZEXPORT gzrewind(gzFile file);
 /*
      Rewind file. This function is supported only for reading.
 
@@ -1599,7 +1712,7 @@ ZEXTERN int ZEXPORT    gzrewind(gzFile file);
 */
 
 /*
-ZEXTERN z_off_t ZEXPORT    gztell(gzFile file);
+ZEXTERN z_off_t ZEXPORT gztell(gzFile file);
 
      Return the starting position for the next gzread or gzwrite on file.
    This position represents a number of bytes in the uncompressed data stream,
@@ -1644,8 +1757,11 @@ ZEXTERN int ZEXPORT gzdirect(gzFile file);
 
      If gzdirect() is used immediately after gzopen() or gzdopen() it will
    cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
+   is a gzip file. Therefore if gzbuffer() is used, it should be called before
+   gzdirect(). If the input is being written concurrently or the device is non-
+   blocking, then gzdirect() may give a different answer once four bytes of
+   input have been accumulated, which is what is needed to confirm or deny a
+   gzip header. Before this, gzdirect() will return true (1).
 
      When writing, gzdirect() returns true (1) if transparent writing was
    requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
@@ -1655,7 +1771,7 @@ ZEXTERN int ZEXPORT gzdirect(gzFile file);
    gzip file reading and decompression, which may not be desired.)
 */
 
-ZEXTERN int ZEXPORT    gzclose(gzFile file);
+ZEXTERN int ZEXPORT gzclose(gzFile file);
 /*
      Flush all pending output for file, if necessary, close file and
    deallocate the (de)compression state.  Note that once file is closed, you
@@ -1683,9 +1799,10 @@ ZEXTERN int ZEXPORT gzclose_w(gzFile file);
 ZEXTERN const char * ZEXPORT gzerror(gzFile file, int *errnum);
 /*
      Return the error message for the last error which occurred on file.
-   errnum is set to zlib error number.  If an error occurred in the file system
-   and not in the compression library, errnum is set to Z_ERRNO and the
-   application may consult errno to get the exact error code.
+   If errnum is not NULL, *errnum is set to zlib error number.  If an error
+   occurred in the file system and not in the compression library, *errnum is
+   set to Z_ERRNO and the application may consult errno to get the exact error
+   code.
 
      The application must not modify the returned string.  Future calls to
    this function may invalidate the previously returned string.  If file is
@@ -1736,7 +1853,8 @@ ZEXTERN uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len);
 ZEXTERN uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf,
                                 z_size_t len);
 /*
-     Same as adler32(), but with a size_t length.
+     Same as adler32(), but with a size_t length.  Note that a long is 32 bits
+   on Windows.
 */
 
 /*
@@ -1772,7 +1890,8 @@ ZEXTERN uLong ZEXPORT crc32(uLong crc, const Bytef *buf, uInt len);
 ZEXTERN uLong ZEXPORT crc32_z(uLong crc, const Bytef *buf,
                               z_size_t len);
 /*
-     Same as crc32(), but with a size_t length.
+     Same as crc32(), but with a size_t length.  Note that a long is 32 bits on
+   Windows.
 */
 
 /*
@@ -1782,14 +1901,14 @@ ZEXTERN uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2);
    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
    check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2. len2 must be non-negative.
+   len2. len2 must be non-negative, otherwise zero is returned.
 */
 
 /*
 ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
 
      Return the operator corresponding to length len2, to be used with
-   crc32_combine_op(). len2 must be non-negative.
+   crc32_combine_op(). len2 must be non-negative, otherwise zero is returned.
 */
 
 ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
@@ -1912,9 +2031,9 @@ ZEXTERN int ZEXPORT gzgetc_(gzFile file);       /* backward compatibility */
      ZEXTERN z_off_t ZEXPORT gzseek64(gzFile, z_off_t, int);
      ZEXTERN z_off_t ZEXPORT gztell64(gzFile);
      ZEXTERN z_off_t ZEXPORT gzoffset64(gzFile);
-     ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
-     ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
-     ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
+     ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+     ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+     ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #  endif
 #else
    ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *);
diff --git a/src/java.base/share/native/libzip/zlib/zutil.c b/src/java.base/share/native/libzip/zlib/zutil.c
index 92dda78497b..c57c162ffde 100644
--- a/src/java.base/share/native/libzip/zlib/zutil.c
+++ b/src/java.base/share/native/libzip/zlib/zutil.c
@@ -23,7 +23,7 @@
  */
 
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2017 Jean-loup Gailly
+ * Copyright (C) 1995-2026 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -110,28 +110,36 @@ uLong ZEXPORT zlibCompileFlags(void) {
     flags += 1L << 21;
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifdef NO_vsnprintf
-    flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
+#   ifdef NO_vsnprintf
+#       ifdef ZLIB_INSECURE
+            flags += 1L << 25;
+#       else
+            flags += 1L << 27;
+#       endif
+#       ifdef HAS_vsprintf_void
+            flags += 1L << 26;
+#       endif
+#   else
+#       ifdef HAS_vsnprintf_void
+            flags += 1L << 26;
+#       endif
+#   endif
 #else
     flags += 1L << 24;
-#  ifdef NO_snprintf
-    flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
+#   ifdef NO_snprintf
+#       ifdef ZLIB_INSECURE
+            flags += 1L << 25;
+#       else
+            flags += 1L << 27;
+#       endif
+#       ifdef HAS_sprintf_void
+            flags += 1L << 26;
+#       endif
+#   else
+#       ifdef HAS_snprintf_void
+            flags += 1L << 26;
+#       endif
+#   endif
 #endif
     return flags;
 }
@@ -166,28 +174,34 @@ const char * ZEXPORT zError(int err) {
 
 #ifndef HAVE_MEMCPY
 
-void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len) {
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
+void ZLIB_INTERNAL zmemcpy(void FAR *dst, const void FAR *src, z_size_t n) {
+    uchf *p = dst;
+    const uchf *q = src;
+    while (n) {
+        *p++ = *q++;
+        n--;
+    }
 }
 
-int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len) {
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+int ZLIB_INTERNAL zmemcmp(const void FAR *s1, const void FAR *s2, z_size_t n) {
+    const uchf *p = s1, *q = s2;
+    while (n) {
+        if (*p++ != *q++)
+            return (int)p[-1] - (int)q[-1];
+        n--;
     }
     return 0;
 }
 
-void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len) {
+void ZLIB_INTERNAL zmemzero(void FAR *b, z_size_t len) {
+    uchf *p = b;
     if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
+    while (len) {
+        *p++ = 0;
+        len--;
+    }
 }
+
 #endif
 
 #ifndef Z_SOLO
diff --git a/src/java.base/share/native/libzip/zlib/zutil.h b/src/java.base/share/native/libzip/zlib/zutil.h
index 2b7e697bef9..b337065875d 100644
--- a/src/java.base/share/native/libzip/zlib/zutil.h
+++ b/src/java.base/share/native/libzip/zlib/zutil.h
@@ -23,7 +23,7 @@
  */
 
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -60,6 +60,10 @@
    define "local" for the non-static meaning of "static", for readability
    (compile with -Dlocal if your debugger can't find static symbols) */
 
+extern const char deflate_copyright[];
+extern const char inflate_copyright[];
+extern const char inflate9_copyright[];
+
 typedef unsigned char  uch;
 typedef uch FAR uchf;
 typedef unsigned short ush;
@@ -72,6 +76,8 @@ typedef unsigned long  ulg;
 #    define Z_U8 unsigned long
 #  elif (ULLONG_MAX == 0xffffffffffffffff)
 #    define Z_U8 unsigned long long
+#  elif (ULONG_LONG_MAX == 0xffffffffffffffff)
+#    define Z_U8 unsigned long long
 #  elif (UINT_MAX == 0xffffffffffffffff)
 #    define Z_U8 unsigned
 #  endif
@@ -87,7 +93,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* To be used only when the state is known to be valid */
 
         /* common constants */
-
+#if MAX_WBITS < 9 || MAX_WBITS > 15
+#  error MAX_WBITS must be in 9..15
+#endif
 #ifndef DEF_WBITS
 #  define DEF_WBITS MAX_WBITS
 #endif
@@ -165,7 +173,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define OS_CODE  7
 #endif
 
-#ifdef __acorn
+#if defined(__acorn) || defined(__riscos)
 #  define OS_CODE 13
 #endif
 
@@ -192,11 +200,10 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && \
-    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off_t);
-    ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off_t);
-    ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off_t);
+#ifndef Z_LARGE64
+   ZEXTERN uLong ZEXPORT adler32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine64(uLong, uLong, z_off64_t);
+   ZEXTERN uLong ZEXPORT crc32_combine_gen64(z_off64_t);
 #endif
 
         /* common defaults */
@@ -235,9 +242,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   void ZLIB_INTERNAL zmemcpy(Bytef* dest, const Bytef* source, uInt len);
-   int ZLIB_INTERNAL zmemcmp(const Bytef* s1, const Bytef* s2, uInt len);
-   void ZLIB_INTERNAL zmemzero(Bytef* dest, uInt len);
+   void ZLIB_INTERNAL zmemcpy(void FAR *, const void FAR *, z_size_t);
+   int ZLIB_INTERNAL zmemcmp(const void FAR *, const void FAR *, z_size_t);
+   void ZLIB_INTERNAL zmemzero(void FAR *, z_size_t);
 #endif
 
 /* Diagnostic functions */
@@ -275,4 +282,74 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
                     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
 
+#ifdef Z_ONCE
+/*
+  Create a local z_once() function depending on the availability of atomics.
+ */
+
+/* Check for the availability of atomics. */
+#if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
+    !defined(__STDC_NO_ATOMICS__)
+
+#include <stdatomic.h>
+typedef struct {
+    atomic_flag begun;
+    atomic_int done;
+} z_once_t;
+#define Z_ONCE_INIT {ATOMIC_FLAG_INIT, 0}
+
+/*
+  Run the provided init() function exactly once, even if multiple threads
+  invoke once() at the same time. The state must be a once_t initialized with
+  Z_ONCE_INIT.
+ */
+local void z_once(z_once_t *state, void (*init)(void)) {
+    if (!atomic_load(&state->done)) {
+        if (atomic_flag_test_and_set(&state->begun))
+            while (!atomic_load(&state->done))
+                ;
+        else {
+            init();
+            atomic_store(&state->done, 1);
+        }
+    }
+}
+
+#else   /* no atomics */
+
+#warning zlib not thread-safe
+
+typedef struct z_once_s {
+    volatile int begun;
+    volatile int done;
+} z_once_t;
+#define Z_ONCE_INIT {0, 0}
+
+/* Test and set. Alas, not atomic, but tries to limit the period of
+   vulnerability. */
+local int test_and_set(int volatile *flag) {
+    int was;
+
+    was = *flag;
+    *flag = 1;
+    return was;
+}
+
+/* Run the provided init() function once. This is not thread-safe. */
+local void z_once(z_once_t *state, void (*init)(void)) {
+    if (!state->done) {
+        if (test_and_set(&state->begun))
+            while (!state->done)
+                ;
+        else {
+            init();
+            state->done = 1;
+        }
+    }
+}
+
+#endif /* ?atomics */
+
+#endif /* Z_ONCE */
+
 #endif /* ZUTIL_H */
diff --git a/src/java.base/unix/classes/sun/nio/ch/NativeThread.java b/src/java.base/unix/classes/sun/nio/ch/NativeThread.java
index 8d0bcea48d9..75cf36d6d52 100644
--- a/src/java.base/unix/classes/sun/nio/ch/NativeThread.java
+++ b/src/java.base/unix/classes/sun/nio/ch/NativeThread.java
@@ -25,6 +25,9 @@
 
 package sun.nio.ch;
 
+import java.util.concurrent.locks.LockSupport;
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 
 // Signalling operations on native threads
 //
@@ -37,45 +40,38 @@ package sun.nio.ch;
 // always returns -1 and the signal(long) method has no effect.
 
 public class NativeThread {
-    private static final long VIRTUAL_THREAD_ID = -1L;
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
+    private NativeThread() { }
 
     /**
-     * Returns the id of the current native thread if the platform can signal
-     * native threads, 0 if the platform can not signal native threads, or
-     * -1L if the current thread is a virtual thread.
-     */
-    public static long current() {
-        if (Thread.currentThread().isVirtual()) {
-            return VIRTUAL_THREAD_ID;
-        } else {
-            return current0();
-        }
-    }
-
-    /**
-     * Signals the given native thread.
+     * Returns the Thread to signal the current thread.
      *
-     * @throws IllegalArgumentException if tid is not a token to a native thread
+     * The first use of this method on a platform thread will capture the thread's
+     * native thread ID.
      */
-    public static void signal(long tid) {
-        if (tid == 0 || tid == VIRTUAL_THREAD_ID)
-            throw new IllegalArgumentException();
-        signal0(tid);
+    public static Thread threadToSignal() {
+        Thread t = Thread.currentThread();
+        if (!t.isVirtual() && JLA.nativeThreadID(t) == 0) {
+            JLA.setThreadNativeID(current0());
+        }
+        return t;
     }
 
     /**
-     * Returns true the tid is the id of a native thread.
+     * Signals the given thread. For a platform thread it sends a signal to the thread.
+     * For a virtual thread it just unparks it.
+     * @throws IllegalStateException if the thread is a platform thread that hasn't set its native ID
      */
-    static boolean isNativeThread(long tid) {
-        return (tid != 0 && tid != VIRTUAL_THREAD_ID);
-    }
-
-    /**
-     * Returns true if tid is -1L.
-     * @see #current()
-     */
-    static boolean isVirtualThread(long tid) {
-        return (tid == VIRTUAL_THREAD_ID);
+    public static void signal(Thread thread) {
+        if (thread.isVirtual()) {
+            LockSupport.unpark(thread);
+        } else {
+            long id = JLA.nativeThreadID(thread);
+            if (id == 0)
+                throw new IllegalStateException("Native thread ID not set");
+            signal0(id);
+        }
     }
 
     /**
diff --git a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
index b073c287bfb..09d280b370c 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
@@ -63,8 +63,8 @@ class SinkChannelImpl
     private static final int ST_CLOSED = 2;
     private int state;
 
-    // ID of native thread doing write, for signalling
-    private long thread;
+    // Thread doing write, for signalling
+    private Thread writerThread;
 
     // True if the channel's socket has been forced into non-blocking mode
     // by a virtual thread. It cannot be reset. When the channel is in
@@ -120,7 +120,7 @@ class SinkChannelImpl
      */
     private boolean tryClose() throws IOException {
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-        if (thread == 0 && !isRegistered()) {
+        if (writerThread == null && !isRegistered()) {
             state = ST_CLOSED;
             nd.close(fd);
             return true;
@@ -152,7 +152,7 @@ class SinkChannelImpl
             assert state < ST_CLOSING;
             state = ST_CLOSING;
             if (!tryClose()) {
-                nd.preClose(fd, thread, 0);
+                nd.preClose(fd, null, writerThread);
             }
         }
     }
@@ -270,7 +270,7 @@ class SinkChannelImpl
         synchronized (stateLock) {
             ensureOpen();
             if (blocking)
-                thread = NativeThread.current();
+                writerThread = NativeThread.threadToSignal();
         }
     }
 
@@ -285,7 +285,7 @@ class SinkChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                thread = 0;
+                writerThread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
diff --git a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
index 571d7f483d2..52188c12b17 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
@@ -63,8 +63,8 @@ class SourceChannelImpl
     private static final int ST_CLOSED = 2;
     private int state;
 
-    // ID of native thread doing read, for signalling
-    private long thread;
+    // Thread doing read, for signalling
+    private Thread readerThread;
 
     // True if the channel's socket has been forced into non-blocking mode
     // by a virtual thread. It cannot be reset. When the channel is in
@@ -120,7 +120,7 @@ class SourceChannelImpl
      */
     private boolean tryClose() throws IOException {
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
-        if (thread == 0 && !isRegistered()) {
+        if (readerThread == null && !isRegistered()) {
             state = ST_CLOSED;
             nd.close(fd);
             return true;
@@ -152,7 +152,7 @@ class SourceChannelImpl
             assert state < ST_CLOSING;
             state = ST_CLOSING;
             if (!tryClose()) {
-                nd.preClose(fd, thread, 0);
+                nd.preClose(fd, readerThread, null);
             }
         }
     }
@@ -269,8 +269,9 @@ class SourceChannelImpl
         }
         synchronized (stateLock) {
             ensureOpen();
-            if (blocking)
-                thread = NativeThread.current();
+            if (blocking) {
+                readerThread = NativeThread.threadToSignal();
+            }
         }
     }
 
@@ -285,7 +286,7 @@ class SourceChannelImpl
     {
         if (blocking) {
             synchronized (stateLock) {
-                thread = 0;
+                readerThread = null;
                 if (state == ST_CLOSING) {
                     tryFinishClose();
                 }
diff --git a/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java
index 4cdd0c400ec..3656b172822 100644
--- a/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java
@@ -36,15 +36,17 @@ abstract class UnixDispatcher extends NativeDispatcher {
         close0(fd);
     }
 
-    private void signalThreads(long reader, long writer) {
-        if (NativeThread.isNativeThread(reader))
+    private void signalThreads(Thread reader, Thread writer) {
+        if (reader != null) {
             NativeThread.signal(reader);
-        if (NativeThread.isNativeThread(writer))
+        }
+        if (writer != null) {
             NativeThread.signal(writer);
+        }
     }
 
     @Override
-    void implPreClose(FileDescriptor fd, long reader, long writer) throws IOException {
+    void implPreClose(FileDescriptor fd, Thread reader, Thread writer) throws IOException {
         if (SUPPORTS_PENDING_SIGNALS) {
             signalThreads(reader, writer);
         }
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
index 77dc1851478..2d72aeb2ee9 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,8 @@ class UnixNativeDispatcher {
                 return buffer;
         }
         NativeBuffers.copyCStringToNativeBuffer(cstr, buffer);
-        buffer.setOwner(path);
+        if (!Thread.currentThread().isVirtual())
+            buffer.setOwner(path);
         return buffer;
     }
 
diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
index 5c0693870e6..bafcd06d9e7 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
@@ -202,21 +202,21 @@ class UnixSecureDirectoryStream
     {
         UnixPath from = getName(fromObj);
         UnixPath to = getName(toObj);
-        if (dir == null)
-            throw new NullPointerException();
-        if (!(dir instanceof UnixSecureDirectoryStream))
+        if (dir != null && !(dir instanceof UnixSecureDirectoryStream))
             throw new ProviderMismatchException();
         UnixSecureDirectoryStream that = (UnixSecureDirectoryStream)dir;
+        int todfd = that != null ? that.dfd : AT_FDCWD;
 
         // lock ordering doesn't matter
         this.ds.readLock().lock();
         try {
-            that.ds.readLock().lock();
+            if (that != null)
+                that.ds.readLock().lock();
             try {
-                if (!this.ds.isOpen() || !that.ds.isOpen())
+                if (!this.ds.isOpen() || (that != null && !that.ds.isOpen()))
                     throw new ClosedDirectoryStreamException();
                 try {
-                    renameat(this.dfd, from.asByteArray(), that.dfd, to.asByteArray());
+                    renameat(this.dfd, from.asByteArray(), todfd, to.asByteArray());
                 } catch (UnixException x) {
                     if (x.errno() == EXDEV) {
                         throw new AtomicMoveNotSupportedException(
@@ -225,7 +225,8 @@ class UnixSecureDirectoryStream
                     x.rethrowAsIOException(from, to);
                 }
             } finally {
-                that.ds.readLock().unlock();
+                if (that != null)
+                    that.ds.readLock().unlock();
             }
         } finally {
             this.ds.readLock().unlock();
diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
index f7531ad5abe..12597fbb650 100644
--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
+++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -729,12 +729,13 @@ Java_java_lang_ProcessImpl_forkAndExec(JNIEnv *env,
 
     if ((fds[0] == -1 && pipe(in)  < 0) ||
         (fds[1] == -1 && pipe(out) < 0) ||
-        (fds[2] == -1 && pipe(err) < 0) ||
+        (fds[2] == -1 && !redirectErrorStream && pipe(err) < 0) || // if not redirecting create the pipe
         (pipe(childenv) < 0) ||
         (pipe(fail) < 0)) {
         throwInternalIOException(env, errno, "Bad file descriptor", mode);
         goto Catch;
     }
+
     c->fds[0] = fds[0];
     c->fds[1] = fds[1];
     c->fds[2] = fds[2];
@@ -764,17 +765,19 @@ Java_java_lang_ProcessImpl_forkAndExec(JNIEnv *env,
     assert(resultPid != 0);
 
     if (resultPid < 0) {
+        char * failMessage = "unknown";
         switch (c->mode) {
           case MODE_VFORK:
-            throwInternalIOException(env, errno, "vfork failed", c->mode);
+            failMessage = "vfork failed";
             break;
           case MODE_FORK:
-            throwInternalIOException(env, errno, "fork failed", c->mode);
+            failMessage = "fork failed";
             break;
           case MODE_POSIX_SPAWN:
-            throwInternalIOException(env, errno, "posix_spawn failed", c->mode);
+            failMessage = "posix_spawn failed";
             break;
         }
+        throwInternalIOException(env, errno, failMessage, c->mode);
         goto Catch;
     }
     close(fail[1]); fail[1] = -1; /* See: WhyCantJohnnyExec  (childproc.c)  */
diff --git a/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
index 9bddbcaede7..e99dfd89411 100644
--- a/src/java.base/unix/native/libnet/Inet4AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet4AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,6 +112,8 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
                     error == EAI_SYSTEM && errno == EINTR);
 
     if (error) {
+        // capture the errno from getaddrinfo
+        const int sys_errno = errno;
 #if defined(MACOSX)
         // If getaddrinfo fails try getifaddrs, see bug 8170910.
         // java_net_spi_InetAddressResolver_LookupPolicy_IPV4_FIRST and no ordering is ok
@@ -122,7 +124,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
         }
 #endif
         // report error
-        NET_ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
+        NET_ThrowUnknownHostExceptionWithGaiError(env, hostname, error, sys_errno);
         goto cleanupAndReturn;
     } else {
         int i = 0;
diff --git a/src/java.base/unix/native/libnet/Inet6AddressImpl.c b/src/java.base/unix/native/libnet/Inet6AddressImpl.c
index 8dce4f9cc6b..e0963c8dc3e 100644
--- a/src/java.base/unix/native/libnet/Inet6AddressImpl.c
+++ b/src/java.base/unix/native/libnet/Inet6AddressImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -231,6 +231,8 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
                                       error == EAI_SYSTEM && errno == EINTR);
 
     if (error) {
+        // capture the errno from getaddrinfo
+        const int sys_errno = errno;
 #if defined(MACOSX)
         // if getaddrinfo fails try getifaddrs
         ret = lookupIfLocalhost(env, hostname, JNI_TRUE, characteristics);
@@ -239,7 +241,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
         }
 #endif
         // report error
-        NET_ThrowUnknownHostExceptionWithGaiError(env, hostname, error);
+        NET_ThrowUnknownHostExceptionWithGaiError(env, hostname, error, sys_errno);
         goto cleanupAndReturn;
     } else {
         int i = 0, inetCount = 0, inet6Count = 0, inetIndex = 0,
diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c
index 1496be5f5c6..f7b690f1032 100644
--- a/src/java.base/unix/native/libnet/net_util_md.c
+++ b/src/java.base/unix/native/libnet/net_util_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,13 +68,14 @@ NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
 void
 NET_ThrowNew(JNIEnv *env, int errorNumber, char *msg) {
     char fullMsg[512];
-    if (!msg) {
-        msg = "no further information";
-    }
     switch(errorNumber) {
     case EBADF:
-        jio_snprintf(fullMsg, sizeof(fullMsg), "socket closed: %s", msg);
-        JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", fullMsg);
+        if (msg == NULL) {
+            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "socket closed");
+        } else {
+            jio_snprintf(fullMsg, sizeof(fullMsg), "socket closed: %s", msg);
+            JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", fullMsg);
+        }
         break;
     default:
         errno = errorNumber;
@@ -177,13 +178,21 @@ jint reuseport_supported(int ipv6_available)
 
 void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
                                                const char* hostname,
-                                               int gai_error)
+                                               int gai_error,
+                                               int sys_errno)
 {
     int size;
     char *buf;
+    const char *sys_errno_string = NULL;
     const char *error_string = gai_strerror(gai_error);
-    if (error_string == NULL)
+    if (error_string == NULL) {
         error_string = "unknown error";
+    }
+    if (gai_error == EAI_SYSTEM) {
+        // EAI_SYSTEM implies that the actual error is stored in the system errno.
+        // Here we get the string representation of that errno.
+        sys_errno_string = strerror(sys_errno);
+    }
     int enhancedExceptions = getEnhancedExceptionsAllowed(env);
     if (enhancedExceptions == ENH_INIT_ERROR && (*env)->ExceptionCheck(env)) {
         return;
@@ -194,16 +203,33 @@ void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
     } else {
         size = 0;
     }
-    size += strlen(error_string) + 3;
-
+    if (sys_errno_string == NULL) {
+        // the 3 is for the additional 3 characters - colon, space and
+        // the NULL termination character, that we will include in the
+        // message of the Exception that we construct
+        size += strlen(error_string) + 3;
+    } else {
+        // the 5 is for the additional 5 characters - 2 colons, 2 spaces and
+        // the NULL termination character, that we will include in the
+        // message of the Exception that we construct
+        size += strlen(error_string) + strlen(sys_errno_string) + 5;
+    }
     buf = (char *) malloc(size);
     if (buf) {
         jstring s;
         int n;
         if (enhancedExceptions == ENH_ENABLED) {
-            n = snprintf(buf, size, "%s: %s", hostname, error_string);
+            if (sys_errno_string == NULL) {
+                n = snprintf(buf, size, "%s: %s", hostname, error_string);
+            } else {
+                n = snprintf(buf, size, "%s: %s: %s", hostname, error_string, sys_errno_string);
+            }
         } else {
-            n = snprintf(buf, size, " %s", error_string);
+            if (sys_errno_string == NULL) {
+                n = snprintf(buf, size, " %s", error_string);
+            } else {
+                n = snprintf(buf, size, " %s: %s", error_string, sys_errno_string);
+            }
         }
         if (n >= 0) {
             s = JNU_NewStringPlatform(env, buf);
diff --git a/src/java.base/unix/native/libnet/net_util_md.h b/src/java.base/unix/native/libnet/net_util_md.h
index dca6e97755a..639cf00515f 100644
--- a/src/java.base/unix/native/libnet/net_util_md.h
+++ b/src/java.base/unix/native/libnet/net_util_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,8 @@ typedef union {
  */
 void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
                                                const char* hostname,
-                                               int gai_error);
+                                               int gai_error,
+                                               int sys_errno);
 void NET_ThrowByNameWithLastError(JNIEnv *env, const char *name,
                                   const char *defaultDetail);
 
diff --git a/src/java.base/unix/native/libnio/ch/IOUtil.c b/src/java.base/unix/native/libnio/ch/IOUtil.c
index dfa99658fa6..3a7693b2ee0 100644
--- a/src/java.base/unix/native/libnio/ch/IOUtil.c
+++ b/src/java.base/unix/native/libnio/ch/IOUtil.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,10 +77,9 @@ configureBlocking(int fd, jboolean blocking)
 }
 
 JNIEXPORT void JNICALL
-Java_sun_nio_ch_IOUtil_configureBlocking(JNIEnv *env, jclass clazz,
-                                         jobject fdo, jboolean blocking)
+Java_sun_nio_ch_IOUtil_configureBlocking(JNIEnv *env, jclass clazz, jint fd, jboolean blocking)
 {
-    if (configureBlocking(fdval(env, fdo), blocking) < 0)
+    if (configureBlocking(fd, blocking) < 0)
         JNU_ThrowIOExceptionWithLastError(env, "Configure blocking failed");
 }
 
diff --git a/src/java.base/windows/classes/java/lang/ProcessImpl.java b/src/java.base/windows/classes/java/lang/ProcessImpl.java
index 1a08aca52e9..26d7afc5363 100644
--- a/src/java.base/windows/classes/java/lang/ProcessImpl.java
+++ b/src/java.base/windows/classes/java/lang/ProcessImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,6 +119,12 @@ final class ProcessImpl extends Process {
                     stdHandles[1] = -1L;
                 } else if (redirects[1] == Redirect.INHERIT) {
                     stdHandles[1] = fdAccess.getHandle(FileDescriptor.out);
+                    if (stdHandles[1] == -1L) {
+                        // FileDescriptor.out has been closed.
+                        f1 = newFileOutputStream(Redirect.DISCARD.file(),
+                                                 Redirect.DISCARD.append());
+                        stdHandles[1] = fdAccess.getHandle(f1.getFD());
+                    }
                 } else if (redirects[1] instanceof ProcessBuilder.RedirectPipeImpl) {
                     stdHandles[1] = fdAccess.getHandle(((ProcessBuilder.RedirectPipeImpl) redirects[1]).getFd());
                     // Force getInputStream to return a null stream,
@@ -134,6 +140,12 @@ final class ProcessImpl extends Process {
                     stdHandles[2] = -1L;
                 } else if (redirects[2] == Redirect.INHERIT) {
                     stdHandles[2] = fdAccess.getHandle(FileDescriptor.err);
+                    if (stdHandles[2] == -1L) {
+                        // FileDescriptor.err has been closed.
+                        f2 = newFileOutputStream(Redirect.DISCARD.file(),
+                                                 Redirect.DISCARD.append());
+                        stdHandles[2] = fdAccess.getHandle(f2.getFD());
+                    }
                 } else if (redirects[2] instanceof ProcessBuilder.RedirectPipeImpl) {
                     stdHandles[2] = fdAccess.getHandle(((ProcessBuilder.RedirectPipeImpl) redirects[2]).getFd());
                 } else {
diff --git a/src/java.base/windows/classes/sun/nio/ch/DefaultPollerProvider.java b/src/java.base/windows/classes/sun/nio/ch/DefaultPollerProvider.java
index abd2f34a229..d1af62fbd73 100644
--- a/src/java.base/windows/classes/sun/nio/ch/DefaultPollerProvider.java
+++ b/src/java.base/windows/classes/sun/nio/ch/DefaultPollerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,11 +30,19 @@ import java.io.IOException;
  * Default PollerProvider for Windows based on wepoll.
  */
 class DefaultPollerProvider extends PollerProvider {
-    DefaultPollerProvider() { }
+    DefaultPollerProvider(Poller.Mode mode) {
+        if (mode != Poller.Mode.SYSTEM_THREADS) {
+            throw new UnsupportedOperationException();
+        }
+        super(mode);
+    }
+
+    DefaultPollerProvider() {
+        this(Poller.Mode.SYSTEM_THREADS);
+    }
 
     @Override
-    int defaultReadPollers(Poller.Mode mode) {
-        assert mode == Poller.Mode.SYSTEM_THREADS;
+    int defaultReadPollers() {
         int ncpus = Runtime.getRuntime().availableProcessors();
         return Math.max(Integer.highestOneBit(ncpus / 8), 1);
     }
@@ -46,13 +54,15 @@ class DefaultPollerProvider extends PollerProvider {
 
     @Override
     Poller readPoller(boolean subPoller) throws IOException {
-        assert !subPoller;
+        if (subPoller)
+            throw new UnsupportedOperationException();
         return new WEPollPoller(true);
     }
 
     @Override
     Poller writePoller(boolean subPoller) throws IOException {
-        assert !subPoller;
+        if (subPoller)
+            throw new UnsupportedOperationException();
         return new WEPollPoller(false);
     }
 }
diff --git a/src/java.base/windows/classes/sun/nio/ch/NativeThread.java b/src/java.base/windows/classes/sun/nio/ch/NativeThread.java
index 1870c95494f..28d8c6303d9 100644
--- a/src/java.base/windows/classes/sun/nio/ch/NativeThread.java
+++ b/src/java.base/windows/classes/sun/nio/ch/NativeThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,47 +25,29 @@
 
 package sun.nio.ch;
 
-
-// Signalling operations on native threads
+import java.util.concurrent.locks.LockSupport;
 
 public class NativeThread {
-    private static final long VIRTUAL_THREAD_ID = -1L;
+    private NativeThread() { }
 
     /**
-     * Returns the id of the current native thread if the platform can signal
-     * native threads, 0 if the platform can not signal native threads, or
-     * -1L if the current thread is a virtual thread.
+     * Returns the Thread to signal the current thread or {@code null} if the current
+     * thread cannot be signalled.
      */
-    public static long current() {
-        if (Thread.currentThread().isVirtual()) {
-            return VIRTUAL_THREAD_ID;
+    public static Thread threadToSignal() {
+        Thread thread = Thread.currentThread();
+        return thread.isVirtual() ? thread : null;
+    }
+
+    /**
+     * Signals the given thread.
+     * @throws UnsupportedOperationException is not supported
+     */
+    public static void signal(Thread thread) {
+        if (thread.isVirtual()) {
+            LockSupport.unpark(thread);
         } else {
-            // no support for signalling threads on Windows
-            return 0;
+            throw new UnsupportedOperationException();
         }
     }
-
-    /**
-     * Signals the given native thread.
-     *
-     * @throws IllegalArgumentException if tid is not a token to a native thread
-     */
-    static void signal(long tid) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns true the tid is the id of a native thread.
-     */
-    static boolean isNativeThread(long tid) {
-        return false;
-    }
-
-    /**
-     * Returns true if tid is -1L.
-     * @see #current()
-     */
-    static boolean isVirtualThread(long tid) {
-        return (tid == VIRTUAL_THREAD_ID);
-    }
 }
diff --git a/src/java.base/windows/classes/sun/nio/ch/WEPollPoller.java b/src/java.base/windows/classes/sun/nio/ch/WEPollPoller.java
index 3db8d67acc6..9f575072f22 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WEPollPoller.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WEPollPoller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,27 +32,41 @@ import static sun.nio.ch.WEPoll.*;
  */
 class WEPollPoller extends Poller {
     private static final int MAX_EVENTS_TO_POLL = 256;
-    private static final int ENOENT = 2;
 
     private final long handle;
     private final int event;
     private final long address;
 
     WEPollPoller(boolean read) throws IOException {
-        this.handle = WEPoll.create();
+        long handle =  WEPoll.create();
+        long address;
+        try {
+            address = WEPoll.allocatePollArray(MAX_EVENTS_TO_POLL);
+        } catch (Throwable e) {
+            WEPoll.close(handle);
+            throw e;
+        }
+
         this.event = (read) ? EPOLLIN : EPOLLOUT;
-        this.address = WEPoll.allocatePollArray(MAX_EVENTS_TO_POLL);
+        this.handle = handle;
+        this.address = address;
     }
 
     @Override
-    void implRegister(int fdVal) throws IOException {
+    void close() {
+        WEPoll.close(handle);
+        WEPoll.freePollArray(address);
+    }
+
+    @Override
+    void implStartPoll(int fdVal) throws IOException {
         int err = WEPoll.ctl(handle, EPOLL_CTL_ADD, fdVal, (event | EPOLLONESHOT));
         if (err != 0)
             throw new IOException("epoll_ctl failed: " + err);
     }
 
     @Override
-    void implDeregister(int fdVal, boolean polled) {
+    void implStopPoll(int fdVal, boolean polled) {
         WEPoll.ctl(handle, EPOLL_CTL_DEL, fdVal, 0);
     }
 
diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
index 8e351b7e0ef..ba1b7b1aa9f 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1085,7 +1085,8 @@ class WindowsNativeDispatcher {
         unsafe.copyMemory(chars, Unsafe.ARRAY_CHAR_BASE_OFFSET, null,
             buffer.address(), (long)stringLengthInBytes);
         unsafe.putChar(buffer.address() + stringLengthInBytes, (char)0);
-        buffer.setOwner(s);
+        if (!Thread.currentThread().isVirtual())
+            buffer.setOwner(s);
         return buffer;
     }
 
diff --git a/src/java.base/windows/native/libnet/net_util_md.c b/src/java.base/windows/native/libnet/net_util_md.c
index bac3d1438ab..5abdd8d4c2e 100644
--- a/src/java.base/windows/native/libnet/net_util_md.c
+++ b/src/java.base/windows/native/libnet/net_util_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,13 +139,6 @@ NET_ThrowNew(JNIEnv *env, int errorNum, char *msg)
         return;
     }
 
-    /*
-     * Default message text if not provided
-     */
-    if (!msg) {
-        msg = "no further information";
-    }
-
     /*
      * Check table for known winsock errors
      */
@@ -163,13 +156,22 @@ NET_ThrowNew(JNIEnv *env, int errorNum, char *msg)
      */
     if (i < table_size) {
         excP = (char *)winsock_errors[i].exc;
-        jio_snprintf(fullMsg, sizeof(fullMsg), "%s: %s",
-                     (char *)winsock_errors[i].errString, msg);
+        if (msg == NULL) {
+            jio_snprintf(fullMsg, sizeof(fullMsg), "%s",
+                         (char *)winsock_errors[i].errString);
+        } else {
+            jio_snprintf(fullMsg, sizeof(fullMsg), "%s: %s",
+                         (char *)winsock_errors[i].errString, msg);
+        }
     } else {
-        jio_snprintf(fullMsg, sizeof(fullMsg),
-                     "Unrecognized Windows Sockets error: %d: %s",
-                     errorNum, msg);
-
+        if (msg == NULL) {
+            jio_snprintf(fullMsg, sizeof(fullMsg),
+                         "Unrecognized Windows Sockets error: %d", errorNum);
+        } else {
+            jio_snprintf(fullMsg, sizeof(fullMsg),
+                         "Unrecognized Windows Sockets error: %d: %s",
+                         errorNum, msg);
+        }
     }
 
     /*
diff --git a/src/java.base/windows/native/libnio/ch/IOUtil.c b/src/java.base/windows/native/libnio/ch/IOUtil.c
index 850c237d9e9..a6b81b7afec 100644
--- a/src/java.base/windows/native/libnio/ch/IOUtil.c
+++ b/src/java.base/windows/native/libnio/ch/IOUtil.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -134,11 +134,10 @@ Java_sun_nio_ch_IOUtil_setfdVal(JNIEnv *env, jclass clazz, jobject fdo, jint val
 
 JNIEXPORT void JNICALL
 Java_sun_nio_ch_IOUtil_configureBlocking(JNIEnv *env, jclass clazz,
-                                        jobject fdo, jboolean blocking)
+                                         jint fd, jboolean blocking)
 {
     u_long argp;
     int result = 0;
-    jint fd = fdval(env, fdo);
 
     if (blocking == JNI_FALSE) {
         argp = SET_NONBLOCKING;
diff --git a/src/java.base/windows/native/libnio/ch/Net.c b/src/java.base/windows/native/libnio/ch/Net.c
index 814f502c48a..adfd67b5017 100644
--- a/src/java.base/windows/native/libnio/ch/Net.c
+++ b/src/java.base/windows/native/libnio/ch/Net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -733,7 +733,7 @@ Java_sun_nio_ch_Net_pollConnect(JNIEnv* env, jclass this, jobject fdo, jlong tim
                 NET_ThrowNew(env, lastError, "getsockopt");
             }
         } else if (optError != NO_ERROR) {
-            NET_ThrowNew(env, optError, "getsockopt");
+            NET_ThrowNew(env, optError, NULL);
         }
         return JNI_FALSE;
     }
diff --git a/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java b/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
index d1b747a8f30..418cace016e 100644
--- a/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
+++ b/src/java.desktop/macosx/classes/com/apple/eawt/_AppEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,11 +59,10 @@ import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.IdentityHashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import sun.awt.AppContext;
+import java.util.Set;
 import sun.awt.SunToolkit;
 
 final class _AppEventHandler {
@@ -480,26 +479,22 @@ final class _AppEventHandler {
     }
 
     abstract static class _AppEventMultiplexor<L> {
-        private final Map<L, AppContext> listenerToAppContext =
-                new IdentityHashMap<L, AppContext>();
+        private final Set<L> listeners = new HashSet<L>();
         boolean nativeListenerRegistered;
 
         // called from AppKit Thread-0
         void dispatch(final _NativeEvent event, final Object... args) {
-            // grab a local ref to the listeners and its contexts as an array of the map's entries
-            final ArrayList<Map.Entry<L, AppContext>> localEntries;
+            // grab a local ref to the listeners as an array
+            final ArrayList<L> localList;
             synchronized (this) {
-                if (listenerToAppContext.size() == 0) {
+                if (listeners.size() == 0) {
                     return;
                 }
-                localEntries = new ArrayList<Map.Entry<L, AppContext>>(listenerToAppContext.size());
-                localEntries.addAll(listenerToAppContext.entrySet());
+                localList = new ArrayList<L>(listeners.size());
+                localList.addAll(listeners);
             }
-
-            for (final Map.Entry<L, AppContext> e : localEntries) {
-                final L listener = e.getKey();
-                final AppContext listenerContext = e.getValue();
-                SunToolkit.invokeLaterOnAppContext(listenerContext, new Runnable() {
+            for (final L listener : localList) {
+                SunToolkit.invokeLater(new Runnable() {
                     public void run() {
                         performOnListener(listener, event);
                     }
@@ -508,7 +503,7 @@ final class _AppEventHandler {
         }
 
         synchronized void addListener(final L listener) {
-            setListenerContext(listener, AppContext.getAppContext());
+            listeners.add(listener);
 
             if (!nativeListenerRegistered) {
                 registerNativeListener();
@@ -517,19 +512,11 @@ final class _AppEventHandler {
         }
 
         synchronized void removeListener(final L listener) {
-            listenerToAppContext.remove(listener);
+            listeners.remove(listener);
         }
 
         abstract void performOnListener(L listener, final _NativeEvent event);
         void registerNativeListener() { }
-
-        private void setListenerContext(L listener, AppContext listenerContext) {
-            if (listenerContext == null) {
-                throw new RuntimeException(
-                        "Attempting to add a listener from a thread group without AppContext");
-            }
-            listenerToAppContext.put(listener, AppContext.getAppContext());
-        }
     }
 
     abstract static class _BooleanAppEventMultiplexor<L, E> extends _AppEventMultiplexor<L> {
@@ -561,22 +548,19 @@ final class _AppEventHandler {
      */
     abstract static class _AppEventDispatcher<H> {
         H _handler;
-        AppContext handlerContext;
 
         // called from AppKit Thread-0
         void dispatch(final _NativeEvent event) {
             // grab a local ref to the handler
             final H localHandler;
-            final AppContext localHandlerContext;
             synchronized (_AppEventDispatcher.this) {
                 localHandler = _handler;
-                localHandlerContext = handlerContext;
             }
 
             if (localHandler == null) {
                 performDefaultAction(event);
             } else {
-                SunToolkit.invokeLaterOnAppContext(localHandlerContext, new Runnable() {
+                SunToolkit.invokeLater(new Runnable() {
                     public void run() {
                         performUsing(localHandler, event);
                     }
@@ -586,22 +570,10 @@ final class _AppEventHandler {
 
         synchronized void setHandler(final H handler) {
             this._handler = handler;
-
-            setHandlerContext(AppContext.getAppContext());
-
         }
 
         void performDefaultAction(final _NativeEvent event) { } // by default, do nothing
         abstract void performUsing(final H handler, final _NativeEvent event);
-
-        protected void setHandlerContext(AppContext ctx) {
-            if (ctx == null) {
-                throw new RuntimeException(
-                        "Attempting to set a handler from a thread group without AppContext");
-            }
-
-            handlerContext = ctx;
-        }
     }
 
     abstract static class _QueuingAppEventDispatcher<H> extends _AppEventDispatcher<H> {
@@ -624,8 +596,6 @@ final class _AppEventHandler {
         synchronized void setHandler(final H handler) {
             this._handler = handler;
 
-            setHandlerContext(AppContext.getAppContext());
-
             // dispatch any events in the queue
             if (queuedEvents != null) {
                 // grab a local ref to the queue, so the real one can be nulled out
diff --git a/src/java.desktop/macosx/classes/sun/font/CStrike.java b/src/java.desktop/macosx/classes/sun/font/CStrike.java
index bffb76fb1ad..f7fa00070ff 100644
--- a/src/java.desktop/macosx/classes/sun/font/CStrike.java
+++ b/src/java.desktop/macosx/classes/sun/font/CStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,7 +174,19 @@ public final class CStrike extends PhysicalStrike {
 
     @Override
     Point2D.Float getGlyphMetrics(final int glyphCode) {
-        return new Point2D.Float(getGlyphAdvance(glyphCode), 0.0f);
+        Point2D.Float metrics = new Point2D.Float();
+        long glyphPtr = getGlyphImagePtr(glyphCode);
+        if (glyphPtr != 0L) {
+            metrics.x = StrikeCache.getGlyphXAdvance(glyphPtr);
+            metrics.y = StrikeCache.getGlyphYAdvance(glyphPtr);
+            /* advance is currently in device space, need to convert back
+             * into user space.
+             * This must not include the translation component. */
+            if (invDevTx != null) {
+                invDevTx.deltaTransform(metrics, metrics);
+            }
+        }
+        return metrics;
     }
 
     @Override
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
index 287de9e1801..0b5e37c5ce5 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,11 +157,6 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
         while (getRunState() < STATE_SHUTDOWN) {
             try {
                 platformRunMessage();
-                if (Thread.currentThread().isInterrupted()) {
-                    if (AppContext.getAppContext().isDisposed()) {
-                        break;
-                    }
-                }
             } catch (Throwable t) {
                 // TODO: log
                 System.err.println("Exception on the toolkit thread");
@@ -456,7 +451,7 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
     public abstract LWCursorManager getCursorManager();
 
     public static void postEvent(AWTEvent event) {
-        postEvent(targetToAppContext(event.getSource()), event);
+        SunToolkit.postEvent(event);
     }
 
     @Override
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
index 11099f6a8e6..634f578df02 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,6 @@ import javax.swing.JComponent;
 
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.ComponentAccessor;
-import sun.awt.AppContext;
 import sun.awt.CGraphicsDevice;
 import sun.awt.DisplayChangedListener;
 import sun.awt.ExtendedKeyCodes;
@@ -1236,9 +1235,7 @@ public class LWWindowPeer
             return false;
         }
 
-        AppContext targetAppContext = AWTAccessor.getComponentAccessor().getAppContext(getTarget());
-        KeyboardFocusManager kfm = AWTAccessor.getKeyboardFocusManagerAccessor()
-                .getCurrentKeyboardFocusManager(targetAppContext);
+        KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
         Window currentActive = kfm.getActiveWindow();
 
 
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
index 4947d1a109e..494995735e6 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1030,13 +1030,19 @@ final class CAccessibility implements PropertyChangeListener {
             }
 
             if (!allowIgnored) {
-                final AccessibleRole role = context.getAccessibleRole();
-                if (role != null && ignoredRoles != null && ignoredRoles.contains(roleKey(role))) {
-                    // Get the child's unignored children.
-                    _addChildren(child, whichChildren, false, childrenAndRoles, ChildrenOperations.COMMON);
-                } else {
-                    childrenAndRoles.add(child);
-                    childrenAndRoles.add(getAccessibleRole(child));
+                // If a Component isn't showing then it should be classified as
+                // "ignored", and we should skip it and its descendants
+                if (isShowing(context)) {
+                    final AccessibleRole role = context.getAccessibleRole();
+                    if (role != null && ignoredRoles != null &&
+                            ignoredRoles.contains(roleKey(role))) {
+                        // Get the child's unignored children.
+                        _addChildren(child, whichChildren, false,
+                                childrenAndRoles, ChildrenOperations.COMMON);
+                    } else {
+                        childrenAndRoles.add(child);
+                        childrenAndRoles.add(getAccessibleRole(child));
+                    }
                 }
             } else {
                 childrenAndRoles.add(child);
@@ -1050,6 +1056,46 @@ final class CAccessibility implements PropertyChangeListener {
         }
     }
 
+    /**
+     * Return false if an AccessibleContext is not showing
+     * <p>
+     * This first checks {@link AccessibleComponent#isShowing()}, if possible.
+     * If there is no AccessibleComponent then this checks the
+     * AccessibleStateSet for {@link AccessibleState#SHOWING}. If there is no
+     * AccessibleStateSet then we assume (given the lack of information) the
+     * AccessibleContext may be visible, and we recursive check its parent if
+     * possible.
+     *
+     * Return false if an AccessibleContext is not showing
+     */
+    private static boolean isShowing(final AccessibleContext context) {
+        AccessibleComponent c = context.getAccessibleComponent();
+        if (c != null) {
+            return c.isShowing();
+        }
+
+        AccessibleStateSet ass = context.getAccessibleStateSet();
+        if (ass != null && ass.contains((AccessibleState.SHOWING))) {
+            return true;
+        } else {
+            // We don't have an AccessibleComponent. And either we don't
+            // have an AccessibleStateSet OR it doesn't include useful
+            // info to determine visibility/showing. So our status is
+            // unknown. When in doubt: assume we're showing and ask our
+            // parent if it is visible/showing.
+        }
+
+        Accessible parent = context.getAccessibleParent();
+        if (parent == null) {
+            return true;
+        }
+        AccessibleContext parentContext = parent.getAccessibleContext();
+        if (parentContext == null) {
+            return true;
+        }
+        return isShowing(parentContext);
+    }
+
     private static native String roleKey(AccessibleRole aRole);
 
     public static Object[] getChildren(final Accessible a, final Component c) {
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
index 30ed1d1bba0..492c32b9703 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ public final class CCheckboxMenuItem extends CMenuItem implements CheckboxMenuIt
             }
         });
         ItemEvent event = new ItemEvent(target, ItemEvent.ITEM_STATE_CHANGED, target.getLabel(), state ? ItemEvent.SELECTED : ItemEvent.DESELECTED);
-        SunToolkit.postEvent(SunToolkit.targetToAppContext(getTarget()), event);
+        SunToolkit.postEvent(event);
     }
 
     public void setIsIndeterminate(final boolean indeterminate) {
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
index c934ec3e234..c81d9f4fd3d 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,7 +136,7 @@ final class CClipboard extends SunClipboard {
     void checkPasteboardAndNotify() {
         if (checkPasteboardWithoutNotification()) {
             notifyChanged();
-            lostOwnershipNow(null);
+            lostOwnershipNow();
         }
     }
 
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java
index a4ec0767298..cc0e253f23b 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,10 @@ import java.awt.peer.DesktopPeer;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.lang.annotation.Native;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 
 /**
@@ -44,6 +47,12 @@ import java.net.URI;
  */
 public final class CDesktopPeer implements DesktopPeer {
 
+    @Native private static final int OPEN = 0;
+    @Native private static final int BROWSE = 1;
+    @Native private static final int EDIT = 2;
+    @Native private static final int PRINT = 3;
+    @Native private static final int MAIL = 4;
+
     @Override
     public boolean isSupported(Action action) {
         return true;
@@ -51,27 +60,27 @@ public final class CDesktopPeer implements DesktopPeer {
 
     @Override
     public void open(File file) throws IOException {
-        this.lsOpenFile(file, false);
+        this.lsOpenFile(file, OPEN);
     }
 
     @Override
     public void edit(File file) throws IOException {
-        this.lsOpenFile(file, false);
+        this.lsOpenFile(file, EDIT);
     }
 
     @Override
     public void print(File file) throws IOException {
-        this.lsOpenFile(file, true);
+        this.lsOpenFile(file, PRINT);
     }
 
     @Override
     public void mail(URI uri) throws IOException {
-        this.lsOpen(uri);
+        this.lsOpen(uri, MAIL);
     }
 
     @Override
     public void browse(URI uri) throws IOException {
-        this.lsOpen(uri);
+        this.lsOpen(uri, BROWSE);
     }
 
     @Override
@@ -162,24 +171,44 @@ public final class CDesktopPeer implements DesktopPeer {
         }
     }
 
-    private void lsOpen(URI uri) throws IOException {
-        int status = _lsOpenURI(uri.toString());
+    private void lsOpen(URI uri, int action) throws IOException {
+        int status = _lsOpenURI(uri.toString(), action);
 
         if (status != 0 /* noErr */) {
-            throw new IOException("Failed to mail or browse " + uri + ". Error code: " + status);
+            String actionString = (action == MAIL) ? "mail" : "browse";
+            throw new IOException("Failed to " + actionString + " " + uri
+                                  + ". Error code: " + status);
         }
     }
 
-    private void lsOpenFile(File file, boolean print) throws IOException {
-        int status = _lsOpenFile(file.getCanonicalPath(), print);
+    private void lsOpenFile(File file, int action) throws IOException {
+        int status = -1;
+        Path tmpFile = null;
+        String tmpTxtPath = null;
 
+        try {
+            if (action == EDIT) {
+                tmpFile = Files.createTempFile("TmpFile", ".txt");
+                tmpTxtPath = tmpFile.toAbsolutePath().toString();
+            }
+            status = _lsOpenFile(file.getCanonicalPath(), action, tmpTxtPath);
+        } catch (Exception e) {
+            throw new IOException("Failed to create tmp file: ", e);
+        } finally {
+            if (tmpFile != null) {
+                Files.deleteIfExists(tmpFile);
+            }
+        }
         if (status != 0 /* noErr */) {
-            throw new IOException("Failed to open, edit or print " + file + ". Error code: " + status);
+            String actionString = (action == OPEN) ? "open"
+                                                   : (action == EDIT) ? "edit" : "print";
+            throw new IOException("Failed to " + actionString + " " + file
+                                  + ". Error code: " + status);
         }
     }
 
-    private static native int _lsOpenURI(String uri);
+    private static native int _lsOpenURI(String uri, int action);
 
-    private static native int _lsOpenFile(String path, boolean print);
+    private static native int _lsOpenFile(String path, int action, String tmpTxtPath);
 
 }
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
index 1eb896bf291..dd0ac6e64f7 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -450,7 +450,7 @@ public final class CInputMethod extends InputMethodAdapter {
                                                       aString.length(),
                                                       theCaret,
                                                       theCaret);
-        LWCToolkit.postEvent(LWCToolkit.targetToAppContext(fAwtFocussedComponent), event);
+        LWCToolkit.postEvent(event);
         fCurrentText = null;
         fCurrentTextAsString = null;
         fCurrentTextLength = 0;
@@ -563,7 +563,7 @@ public final class CInputMethod extends InputMethodAdapter {
                                                       0,
                                                       theCaret,
                                                       visiblePosition);
-        LWCToolkit.postEvent(LWCToolkit.targetToAppContext(fAwtFocussedComponent), event);
+        LWCToolkit.postEvent(event);
 
         if (pressAndHold) selectNextGlyph();
     }
@@ -583,7 +583,7 @@ public final class CInputMethod extends InputMethodAdapter {
                                                       fCurrentTextLength,
                                                       theCaret,
                                                       visiblePosition);
-        LWCToolkit.postEvent(LWCToolkit.targetToAppContext(fAwtFocussedComponent), event);
+        LWCToolkit.postEvent(event);
         fCurrentText = null;
         fCurrentTextAsString = null;
         fCurrentTextLength = 0;
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java
index c4b2640efb8..9e3fcdb0600 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ public class CMenuItem extends CMenuComponent implements MenuItemPeer {
             public void run() {
                 final String cmd = ((MenuItem)getTarget()).getActionCommand();
                 final ActionEvent event = new ActionEvent(getTarget(), ActionEvent.ACTION_PERFORMED, cmd, when, modifiers);
-                SunToolkit.postEvent(SunToolkit.targetToAppContext(getTarget()), event);
+                SunToolkit.postEvent(event);
             }
         });
     }
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
index 979eeb36239..508b1a843ef 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -355,20 +355,9 @@ public final class CPrinterJob extends RasterPrinterJob {
             validateDestination(destinationAttr);
         }
 
-        /* Get the range of pages we are to print. If the
-         * last page to print is unknown, then we print to
-         * the end of the document. Note that firstPage
-         * and lastPage are 0 based page indices.
-         */
-
+        // Note that firstPage is 0 based page index.
         int firstPage = getFirstPage();
-        int lastPage = getLastPage();
-        if(lastPage == Pageable.UNKNOWN_NUMBER_OF_PAGES) {
-            int totalPages = mDocument.getNumberOfPages();
-            if (totalPages != Pageable.UNKNOWN_NUMBER_OF_PAGES) {
-                lastPage = mDocument.getNumberOfPages() - 1;
-            }
-        }
+        int totalPages = mDocument.getNumberOfPages();
 
         try {
             synchronized (this) {
@@ -393,7 +382,7 @@ public final class CPrinterJob extends RasterPrinterJob {
                     try {
                         // Fire off the print rendering loop on the AppKit thread, and don't have
                         //  it wait and block this thread.
-                        if (printLoop(false, firstPage, lastPage)) {
+                        if (printLoop(false, firstPage, totalPages)) {
                             // Start a secondary loop on EDT until printing operation is finished or cancelled
                             printingLoop.enter();
                         }
@@ -407,7 +396,7 @@ public final class CPrinterJob extends RasterPrinterJob {
                     onEventThread = false;
 
                     try {
-                        printLoop(true, firstPage, lastPage);
+                        printLoop(true, firstPage, totalPages);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -417,7 +406,6 @@ public final class CPrinterJob extends RasterPrinterJob {
                 }
                 if (++loopi < prMembers.length) {
                      firstPage = prMembers[loopi][0]-1;
-                     lastPage = prMembers[loopi][1] -1;
                 }
             }  while (loopi < prMembers.length);
         } finally {
@@ -693,7 +681,7 @@ public final class CPrinterJob extends RasterPrinterJob {
         }
     }
 
-    private native boolean printLoop(boolean waitUntilDone, int firstPage, int lastPage) throws PrinterException;
+    private native boolean printLoop(boolean waitUntilDone, int firstPage, int totalPages) throws PrinterException;
 
     private PageFormat getPageFormat(int pageIndex) {
         // This is called from the native side.
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
index 77639a262d5..a25b3177063 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -224,7 +224,7 @@ public final class CTrayIcon extends CFRetainedResource implements TrayIconPeer
     private void postEvent(final AWTEvent event) {
         SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
             public void run() {
-                SunToolkit.postEvent(SunToolkit.targetToAppContext(target), event);
+                SunToolkit.postEvent(event);
             }
         });
     }
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 0e5bfc44bc5..8dad6335548 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,6 @@ import javax.swing.UIManager;
 
 import com.apple.laf.AquaMenuBarUI;
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.CGraphicsDevice;
 import sun.awt.LightweightFrame;
 import sun.awt.PlatformGraphicsInfo;
@@ -700,10 +699,9 @@ public final class LWCToolkit extends LWToolkit {
                         },
                         true);
 
-        AppContext appContext = SunToolkit.targetToAppContext(component);
-        SunToolkit.postEvent(appContext, invocationEvent);
+        SunToolkit.postEvent(invocationEvent);
         // 3746956 - flush events from PostEventQueue to prevent them from getting stuck and causing a deadlock
-        SunToolkit.flushPendingEvents(appContext);
+        SunToolkit.flushPendingEvents();
         doAWTRunLoop(mediator, false);
 
         checkException(invocationEvent);
@@ -715,10 +713,9 @@ public final class LWCToolkit extends LWToolkit {
 
         InvocationEvent invocationEvent = new InvocationEvent(component, event);
 
-        AppContext appContext = SunToolkit.targetToAppContext(component);
-        SunToolkit.postEvent(SunToolkit.targetToAppContext(component), invocationEvent);
+        SunToolkit.postEvent(invocationEvent);
         // 3746956 - flush events from PostEventQueue to prevent them from getting stuck and causing a deadlock
-        SunToolkit.flushPendingEvents(appContext);
+        SunToolkit.flushPendingEvents();
 
         checkException(invocationEvent);
     }
@@ -930,7 +927,6 @@ public final class LWCToolkit extends LWToolkit {
     @Override
     public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) {
         //TODO: FileDialog blocks excluded windows...
-        //TODO: Test: 2 file dialogs, separate AppContexts: a) Dialog 1 blocked, shouldn't be. Frame 4 blocked (shouldn't be).
         return (modalityType == null) ||
             (modalityType == Dialog.ModalityType.MODELESS) ||
             (modalityType == Dialog.ModalityType.DOCUMENT_MODAL) ||
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
index 7555c7990c4..460749c363d 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,27 +27,60 @@
 #import "JNIUtilities.h"
 #import <CoreFoundation/CoreFoundation.h>
 #import <ApplicationServices/ApplicationServices.h>
+#import "sun_lwawt_macosx_CDesktopPeer.h"
 
 /*
  * Class:     sun_lwawt_macosx_CDesktopPeer
  * Method:    _lsOpenURI
- * Signature: (Ljava/lang/String;)I;
+ * Signature: (Ljava/lang/String;I)I
  */
 JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenURI
-(JNIEnv *env, jclass clz, jstring uri)
+(JNIEnv *env, jclass clz, jstring uri, jint action)
 {
-    OSStatus status = noErr;
+    __block OSStatus status = noErr;
 JNI_COCOA_ENTER(env);
 
-    // I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know.
-    // So we use LaunchServices directly.
+    NSURL *urlToOpen = [NSURL URLWithString:JavaStringToNSString(env, uri)];
+    NSURL *appURI = nil;
 
-    NSURL *url = [NSURL URLWithString:JavaStringToNSString(env, uri)];
+    if (action == sun_lwawt_macosx_CDesktopPeer_BROWSE) {
+        // To get the defaultBrowser
+        NSURL *httpsURL = [NSURL URLWithString:@"https://"];
+        NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+        appURI = [workspace URLForApplicationToOpenURL:httpsURL];
+    } else if (action == sun_lwawt_macosx_CDesktopPeer_MAIL) {
+        // To get the default mailer
+        NSURL *mailtoURL = [NSURL URLWithString:@"mailto://"];
+        NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+        appURI = [workspace URLForApplicationToOpenURL:mailtoURL];
+    }
 
-    LSLaunchFlags flags = kLSLaunchDefaults;
+    if (appURI == nil) {
+        return -1;
+    }
 
-    LSApplicationParameters params = {0, flags, NULL, NULL, NULL, NULL, NULL};
-    status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0);
+    // Prepare NSOpenConfig object
+    NSArray<NSURL *> *urls = @[urlToOpen];
+    NSWorkspaceOpenConfiguration *configuration = [NSWorkspaceOpenConfiguration configuration];
+    configuration.activates = YES; // To bring app to foreground
+    configuration.promptsUserIfNeeded = YES; // To allow macOS desktop prompts
+
+    // dispatch semaphores used to wait for the completion handler to update and return status
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC)); // 1 second timeout
+
+    // Asynchronous call to openURL
+    [[NSWorkspace sharedWorkspace] openURLs:urls
+                                    withApplicationAtURL:appURI
+                                    configuration:configuration
+                                    completionHandler:^(NSRunningApplication *app, NSError *error) {
+        if (error) {
+            status = (OSStatus) error.code;
+        }
+        dispatch_semaphore_signal(semaphore);
+    }];
+
+    dispatch_semaphore_wait(semaphore, timeout);
 
 JNI_COCOA_EXIT(env);
     return status;
@@ -56,32 +89,76 @@ JNI_COCOA_EXIT(env);
 /*
  * Class:     sun_lwawt_macosx_CDesktopPeer
  * Method:    _lsOpenFile
- * Signature: (Ljava/lang/String;Z)I;
+ * Signature: (Ljava/lang/String;I;Ljava/lang/String;)I;
  */
 JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenFile
-(JNIEnv *env, jclass clz, jstring jpath, jboolean print)
+(JNIEnv *env, jclass clz, jstring jpath, jint action, jstring jtmpTxtPath)
 {
-    OSStatus status = noErr;
+    __block OSStatus status = noErr;
 JNI_COCOA_ENTER(env);
 
-    // I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know.
-    // So we use LaunchServices directly.
-
     NSString *path  = NormalizedPathNSStringFromJavaString(env, jpath);
-
-    NSURL *url = [NSURL fileURLWithPath:(NSString *)path];
+    NSURL *urlToOpen = [NSURL fileURLWithPath:(NSString *)path];
 
     // This byzantine workaround is necessary, or else directories won't open in Finder
-    url = (NSURL *)CFURLCreateWithFileSystemPath(NULL, (CFStringRef)[url path], kCFURLPOSIXPathStyle, false);
+    urlToOpen = (NSURL *)CFURLCreateWithFileSystemPath(NULL, (CFStringRef)[urlToOpen path],
+                                                        kCFURLPOSIXPathStyle, false);
 
-    LSLaunchFlags flags = kLSLaunchDefaults;
-    if (print) flags |= kLSLaunchAndPrint;
+    NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+    NSURL *appURI = [workspace URLForApplicationToOpenURL:urlToOpen];
+    NSURL *defaultTerminalApp = [workspace URLForApplicationToOpenURL:[NSURL URLWithString:@"file:///bin/sh"]];
 
-    LSApplicationParameters params = {0, flags, NULL, NULL, NULL, NULL, NULL};
-    status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0);
-    [url release];
+    // Prepare NSOpenConfig object
+    NSArray<NSURL *> *urls = @[urlToOpen];
+    NSWorkspaceOpenConfiguration *configuration = [NSWorkspaceOpenConfiguration configuration];
+    configuration.activates = YES; // To bring app to foreground
+    configuration.promptsUserIfNeeded = YES;  // To allow macOS desktop prompts
 
+    // pre-checks for open/print/edit before calling openURLs API
+    if (action == sun_lwawt_macosx_CDesktopPeer_OPEN
+            || action == sun_lwawt_macosx_CDesktopPeer_PRINT) {
+        if (appURI == nil
+            || [[urlToOpen absoluteString] containsString:[appURI absoluteString]]
+            || [[defaultTerminalApp absoluteString] containsString:[appURI absoluteString]]) {
+            [urlToOpen release];
+            return -1;
+        }
+        // Additionally set forPrinting=TRUE for print
+        if (action == sun_lwawt_macosx_CDesktopPeer_PRINT) {
+            configuration.forPrinting = YES;
+        }
+    } else if (action == sun_lwawt_macosx_CDesktopPeer_EDIT) {
+        if (appURI == nil
+            || [[urlToOpen absoluteString] containsString:[appURI absoluteString]]) {
+            [urlToOpen release];
+            return -1;
+        }
+        // for EDIT: if (defaultApp = TerminalApp) then set appURI = DefaultTextEditor
+        if ([[defaultTerminalApp absoluteString] containsString:[appURI absoluteString]]) {
+            NSString *path  = NormalizedPathNSStringFromJavaString(env, jtmpTxtPath);
+            NSURL *tempFilePath = [NSURL fileURLWithPath:(NSString *)path];
+            appURI = [workspace URLForApplicationToOpenURL:tempFilePath];
+        }
+    }
+
+    // dispatch semaphores used to wait for the completion handler to update and return status
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    dispatch_time_t timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC)); // 1 second timeout
+
+    // Asynchronous call - openURLs:withApplicationAtURL
+    [[NSWorkspace sharedWorkspace] openURLs:urls
+                                   withApplicationAtURL:appURI
+                                   configuration:configuration
+                                   completionHandler:^(NSRunningApplication *app, NSError *error) {
+        if (error) {
+            status = (OSStatus) error.code;
+        }
+        dispatch_semaphore_signal(semaphore);
+    }];
+
+    dispatch_semaphore_wait(semaphore, timeout);
+
+    [urlToOpen release];
 JNI_COCOA_EXIT(env);
     return status;
 }
-
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m
index 051588f95bf..fa534fff275 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -270,7 +270,7 @@ JNI_COCOA_ENTER(env);
         NSRect fromRect = NSMakeRect(0, 0, sw, sh);
         NSRect toRect = NSMakeRect(0, 0, dw, dh);
         CImage_CopyNSImageIntoArray(img, dst, fromRect, toRect);
-        (*env)->ReleasePrimitiveArrayCritical(env, buffer, dst, JNI_ABORT);
+        (*env)->ReleasePrimitiveArrayCritical(env, buffer, dst, 0);
     }
 
 JNI_COCOA_EXIT(env);
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
index 9cc0a18564f..555a2746f43 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -656,7 +656,7 @@ JNI_COCOA_EXIT(env);
  * Signature: ()V
  */
 JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPrinterJob_printLoop
-  (JNIEnv *env, jobject jthis, jboolean blocks, jint firstPage, jint lastPage)
+  (JNIEnv *env, jobject jthis, jboolean blocks, jint firstPage, jint totalPages)
 {
     AWT_ASSERT_NOT_APPKIT_THREAD;
 
@@ -672,14 +672,14 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPrinterJob_printLoop
 JNI_COCOA_ENTER(env);
     // Get the first page's PageFormat for setting things up (This introduces
     //  and is a facet of the same problem in Radar 2818593/2708932).
-    jobject page = (*env)->CallObjectMethod(env, jthis, jm_getPageFormat, 0); // AWT_THREADING Safe (!appKit)
+    jobject page = (*env)->CallObjectMethod(env, jthis, jm_getPageFormat, firstPage); // AWT_THREADING Safe (!appKit)
     CHECK_EXCEPTION();
     if (page != NULL) {
         jobject pageFormatArea = (*env)->CallObjectMethod(env, jthis, jm_getPageFormatArea, page); // AWT_THREADING Safe (!appKit)
         CHECK_EXCEPTION();
 
         PrinterView* printerView = [[PrinterView alloc] initWithFrame:JavaToNSRect(env, pageFormatArea) withEnv:env withPrinterJob:jthis];
-        [printerView setFirstPage:firstPage lastPage:lastPage];
+        [printerView setTotalPages:totalPages];
 
         GET_NSPRINTINFO_METHOD_RETURN(NO)
         NSPrintInfo* printInfo = (NSPrintInfo*)jlong_to_ptr((*env)->CallLongMethod(env, jthis, sjm_getNSPrintInfo)); // AWT_THREADING Safe (known object)
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h
index 43472bee920..95a8055cdb0 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,12 @@
     jobject fCurPainter;
     jobject fCurPeekGraphics;
 
-    jint fFirstPage, fLastPage;
+    jint fTotalPages;
 }
 
 - (id)initWithFrame:(NSRect)aRect withEnv:(JNIEnv*)env withPrinterJob:(jobject)printerJob;
 
-- (void)setFirstPage:(jint)firstPage lastPage:(jint)lastPage;
+- (void)setTotalPages:(jint)totalPages;
 
 - (void)releaseReferences:(JNIEnv*)env;
 
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m
index d19948d9f0f..f219e8082b4 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,9 +72,8 @@ static jclass sjc_PAbortEx = NULL;
     }
 }
 
-- (void)setFirstPage:(jint)firstPage lastPage:(jint)lastPage {
-    fFirstPage = firstPage;
-    fLastPage = lastPage;
+- (void)setTotalPages:(jint)totalPages {
+    fTotalPages = totalPages;
 }
 
 - (void)drawRect:(NSRect)aRect
@@ -156,15 +155,15 @@ static jclass sjc_PAbortEx = NULL;
         return NO;
     }
 
-    aRange->location = fFirstPage + 1;
+    aRange->location = 1;
 
-    if (fLastPage == java_awt_print_Pageable_UNKNOWN_NUMBER_OF_PAGES)
+    if (fTotalPages == java_awt_print_Pageable_UNKNOWN_NUMBER_OF_PAGES)
     {
         aRange->length = NSIntegerMax;
     }
     else
     {
-        aRange->length = (fLastPage + 1) - fFirstPage;
+        aRange->length = fTotalPages;
     }
 
     return YES;
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m
index 4e2c1ace969..0f0a395c597 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,7 +132,7 @@ static jobject sAccessibilityClass = NULL;
     [rolesMap setObject:@"ImageAccessibility" forKey:@"icon"];
     [rolesMap setObject:@"ImageAccessibility" forKey:@"desktopicon"];
     [rolesMap setObject:@"SpinboxAccessibility" forKey:@"spinbox"];
-    [rolesMap setObject:@"StaticTextAccessibility" forKey:@"hyperlink"];
+    [rolesMap setObject:@"LinkAccessibility" forKey:@"hyperlink"];
     [rolesMap setObject:@"StaticTextAccessibility" forKey:@"label"];
     [rolesMap setObject:@"RadiobuttonAccessibility" forKey:@"radiobutton"];
     [rolesMap setObject:@"CheckboxAccessibility" forKey:@"checkbox"];
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/LinkAccessibility.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/LinkAccessibility.h
new file mode 100644
index 00000000000..968e96cbb2d
--- /dev/null
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/LinkAccessibility.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef LINK_ACCESSIBILITY
+#define LINK_ACCESSIBILITY
+
+#import "CommonTextAccessibility.h"
+
+#import <AppKit/NSAccessibility.h>
+
+
+@interface LinkAccessibility : CommonTextAccessibility<NSAccessibilityStaticText> {
+
+};
+- (NSAccessibilityRole _Nonnull)accessibilityRole;
+- (NSString * _Nullable)accessibilityAttributedStringForRange:(NSRange)range;
+- (NSString * _Nullable)accessibilityValue;
+- (NSRange)accessibilityVisibleCharacterRange;
+@end
+#endif
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/LinkAccessibility.m
similarity index 50%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java
rename to src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/LinkAccessibility.m
index 667e4cd4a94..0de0237d03e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReturnTypeEntry.java
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/LinkAccessibility.m
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,42 +21,40 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
-package sun.jvm.hotspot.oops;
+#import "LinkAccessibility.h"
 
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
+@implementation LinkAccessibility
 
-// Type entry used for return from a call. A single cell to record the
-// type.
-public class ReturnTypeEntry<K,M> extends TypeEntries<K,M> {
-  static final int cellCount = 1;
-
-  ReturnTypeEntry(MethodDataInterface<K,M> methodData, ProfileData pd, int baseOff) {
-    super(methodData, pd, baseOff);
-  }
-
-  K type() {
-    return validKlass(baseOff);
-  }
-
-  static int staticCellCount() {
-    return cellCount;
-  }
-
-  int typeIndex() {
-    return baseOff;
-  }
-
-  void printDataOn(PrintStream st) {
-    pd.tab(st);
-    printKlass(st, baseOff);
-    st.println();
-  }
+- (NSAccessibilityRole _Nonnull)accessibilityRole
+{
+    return NSAccessibilityLinkRole;
 }
+
+- (NSString * _Nullable)accessibilityAttributedStringForRange:(NSRange)range
+{
+    return [self accessibilityStringForRangeAttribute:range];
+}
+
+- (NSString * _Nullable)accessibilityValue
+{
+    return [self accessibilityValueAttribute];
+}
+
+- (NSRange)accessibilityVisibleCharacterRange
+{
+    return [self accessibilityVisibleCharacterRangeAttribute];
+}
+
+- (NSRect)accessibilityFrame
+{
+    return [super accessibilityFrame];
+}
+
+- (id)accessibilityParent
+{
+    return [super accessibilityParent];
+}
+
+@end
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.h
index ebf314c7394..9a528879a5d 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.h
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,5 +29,6 @@
 @interface NavigableTextAccessibility : CommonComponentAccessibility <NSAccessibilityNavigableStaticText>
 
 @property(readonly) BOOL accessibleIsPasswordText;
+@property BOOL announceEditUpdates;
 
 @end
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.m
index 138d502f10f..8e241e65b96 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/NavigableTextAccessibility.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, JetBrains s.r.o.. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -60,6 +60,22 @@ static jmethodID sjm_getAccessibleEditableText = NULL;
     return [fJavaRole isEqualToString:@"passwordtext"];
 }
 
+- (id)init {
+    self = [super init];
+    if (self) {
+        _announceEditUpdates = YES;
+    }
+    return self;
+}
+
+- (void)suppressEditUpdates {
+    _announceEditUpdates = NO;
+}
+
+- (void)resumeEditUpdates {
+    _announceEditUpdates = YES;
+}
+
 // NSAccessibilityElement protocol methods
 
 - (NSRect)accessibilityFrameForRange:(NSRange)range
@@ -117,6 +133,9 @@ static jmethodID sjm_getAccessibleEditableText = NULL;
 
 - (NSString *)accessibilityStringForRange:(NSRange)range
 {
+    if (!_announceEditUpdates) {
+        return @"";
+    }
     JNIEnv *env = [ThreadUtilities getJNIEnv];
     GET_CACCESSIBLETEXT_CLASS_RETURN(nil);
     DECLARE_STATIC_METHOD_RETURN(jm_getStringForRange, sjc_CAccessibleText, "getStringForRange",
@@ -306,6 +325,12 @@ static jmethodID sjm_getAccessibleEditableText = NULL;
     return [super accessibilityParent];
 }
 
+- (void)postSelectedTextChanged
+{
+    [super postSelectedTextChanged];
+    [self resumeEditUpdates];
+}
+
 /*
 * Other text methods
 - (NSRange)accessibilitySharedCharacterRange;
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SpinboxAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SpinboxAccessibility.m
index 4dac6bd93f9..0cec7f3eb2c 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SpinboxAccessibility.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/SpinboxAccessibility.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
  */
 
 #import "SpinboxAccessibility.h"
+#import "ThreadUtilities.h"
 
 #define INCREMENT 0
 #define DECREMENT 1
@@ -44,7 +45,15 @@
 
 - (id _Nullable)accessibilityValue
 {
-    return [super accessibilityValue];
+    id val = [super accessibilityValue];
+    NSArray *clist = [super accessibilityChildren];
+    for (NSUInteger i = 0; i < [clist count]; i++) {
+        id child = [clist objectAtIndex:i];
+        if ([child conformsToProtocol:@protocol(NSAccessibilityNavigableStaticText)]) {
+            val = [child accessibilityValue];
+        }
+    }
+    return val;
 }
 
 - (BOOL)accessibilityPerformIncrement
@@ -68,4 +77,18 @@
     return [super accessibilityParent];
 }
 
+- (void)postValueChanged
+{
+    AWT_ASSERT_APPKIT_THREAD;
+    NSAccessibilityPostNotification(self, NSAccessibilityValueChangedNotification);
+    NSArray *clist = [super accessibilityChildren];
+    for (NSUInteger i = 0; i < [clist count]; i++) {
+        id child = [clist objectAtIndex:i];
+        if ([child conformsToProtocol:@protocol(NSAccessibilityNavigableStaticText)]) {
+            NSAccessibilityPostNotification(child, NSAccessibilityLayoutChangedNotification);
+            [child suppressEditUpdates];
+        }
+    }
+}
+
 @end
diff --git a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp
index 441a71f5c50..bae16cb0a9c 100644
--- a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp
+++ b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,8 +162,7 @@ void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* cre
                 sampleRate,                 // sample rate
                 DAUDIO_PCM,                 // only accept PCM
                 bits == 8 ? FALSE : TRUE,   // signed
-                bits == 8 ? FALSE           // little-endian for 8bit
-                    : UTIL_IsBigEndianPlatform());
+                FALSE);                     // all supported macOS versions run on LE
         }
     }
     // add default format
@@ -175,7 +174,7 @@ void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* cre
             defSampleRate,                  // sample rate
             DAUDIO_PCM,                     // PCM
             TRUE,                           // signed
-            UTIL_IsBigEndianPlatform());    // native endianness
+            FALSE);                         // native endianness; all supported macOS versions run on LE
     }
 
     TRACE0("<<DAUDIO_GetFormats\n");
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java b/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java
index 552ef870dbe..e4746d13dd9 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/SwingUtilities3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@ import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.RepaintManager;
 
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.swing.MenuItemLayoutHelper;
 import sun.swing.SwingUtilities2;
@@ -69,16 +68,17 @@ public class SwingUtilities3 {
     private static final Object DELEGATE_REPAINT_MANAGER_KEY =
         new StringBuilder("DelegateRepaintManagerKey");
 
+    private static volatile boolean repaintDelegateSet;
+
     /**
       * Registers delegate RepaintManager for {@code JComponent}.
       */
     public static void setDelegateRepaintManager(JComponent component,
                                                 RepaintManager repaintManager) {
-        /* setting up flag in AppContext to speed up lookups in case
+        /* setting up flag to speed up lookups in case
          * there are no delegate RepaintManagers used.
          */
-        AppContext.getAppContext().put(DELEGATE_REPAINT_MANAGER_KEY,
-                                       Boolean.TRUE);
+        repaintDelegateSet = true;
 
         component.putClientProperty(DELEGATE_REPAINT_MANAGER_KEY,
                                     repaintManager);
@@ -126,8 +126,7 @@ public class SwingUtilities3 {
     public static RepaintManager getDelegateRepaintManager(Component
                                                             component) {
         RepaintManager delegate = null;
-        if (Boolean.TRUE == SunToolkit.targetToAppContext(component)
-                                      .get(DELEGATE_REPAINT_MANAGER_KEY)) {
+        if (repaintDelegateSet) {
             while (delegate == null && component != null) {
                 while (component != null
                          && ! (component instanceof JComponent)) {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 24a1997bdc1..5145779a493 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -1421,6 +1421,8 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
         return c.getComponentOrientation().isLeftToRight();
     }
 
+    private native boolean applyThemeIfNeeded();
+
     /**
      * {@inheritDoc}
      */
@@ -1463,6 +1465,21 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
 
         // By default mnemonics are hidden for GTK L&F
         MnemonicHandler.setMnemonicHidden(true);
+
+        if (IS_3) {
+            boolean shouldApplyTheme = false;
+            if (toolkit instanceof UNIXToolkit unixToolkit) {
+                if ("gnome".equals(unixToolkit.getDesktop())) {
+                    int gnomeShellVersion = unixToolkit.getGnomeShellMajorVersion();
+                    shouldApplyTheme = gnomeShellVersion >= 47;
+                }
+            }
+
+            if (shouldApplyTheme && applyThemeIfNeeded()) {
+                GTKEngine.INSTANCE.themeChanged();
+                GTKIconFactory.resetIcons();
+            }
+        }
     }
 
     /**
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
index baeb249eaa8..76d7abdbce6 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
@@ -32,7 +32,6 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.synth.*;
 
-import sun.awt.AppContext;
 import sun.awt.UNIXToolkit;
 import sun.swing.SwingUtilities2;
 import javax.swing.plaf.synth.SynthIcon;
@@ -961,11 +960,11 @@ class GTKStyle extends SynthStyle implements GTKConstants {
 
     static class GTKStockIconInfo {
         private static Map<String,Integer> ICON_TYPE_MAP;
-        private static final Object ICON_SIZE_KEY = new StringBuffer("IconSize");
+
+        private static Dimension[] iconSizesMap;
 
         private static Dimension[] getIconSizesMap() {
-            AppContext appContext = AppContext.getAppContext();
-            Dimension[] iconSizes = (Dimension[])appContext.get(ICON_SIZE_KEY);
+            Dimension[] iconSizes = iconSizesMap;
 
             if (iconSizes == null) {
                 iconSizes = new Dimension[7];
@@ -976,7 +975,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
                 iconSizes[4] = new Dimension(20, 20); // GTK_ICON_SIZE_BUTTON
                 iconSizes[5] = new Dimension(32, 32); // GTK_ICON_SIZE_DND
                 iconSizes[6] = new Dimension(48, 48); // GTK_ICON_SIZE_DIALOG
-                appContext.put(ICON_SIZE_KEY, iconSizes);
+                iconSizesMap = iconSizes;
             }
             return iconSizes;
         }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
index c61b1258894..6a97dd22d75 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,6 +67,7 @@ public class MotifBorders {
             this.lightShadow = lightShadow;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
             g.setColor((isRaised) ? lightShadow : darkShadow);
             g.drawLine(x, y, x+w-1, y);           // top
@@ -77,6 +78,7 @@ public class MotifBorders {
             g.drawLine(x+w-1, y+h-1, x+w-1, y+1); // right
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.set(1, 1, 1, 1);
             return insets;
@@ -99,6 +101,7 @@ public class MotifBorders {
             this.focus = focus;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
             if (c.hasFocus()) {
                 g.setColor(focus);
@@ -109,6 +112,7 @@ public class MotifBorders {
             }
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.set(1, 1, 1, 1);
             return insets;
@@ -130,6 +134,7 @@ public class MotifBorders {
             this.focus = focus;
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
             boolean isPressed = false;
             boolean hasFocus = false;
@@ -187,6 +192,7 @@ public class MotifBorders {
             g.drawLine(bx1+1, by2, bx2, by2);
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             int thickness = (c instanceof JButton && ((JButton)c).isDefaultCapable())? 8 : 2;
             insets.set(thickness, thickness, thickness, thickness);
@@ -202,6 +208,7 @@ public class MotifBorders {
              super(shadow, highlight, darkShadow, focus);
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y,
                             int width, int height) {
             if (c instanceof AbstractButton) {
@@ -223,6 +230,7 @@ public class MotifBorders {
             }
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.set(2, 2, 3, 3);
             return insets;
@@ -236,6 +244,7 @@ public class MotifBorders {
             super(shadow, highlight, darkShadow, focus);
         }
 
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
             if (!(c instanceof JMenuBar)) {
                 return;
@@ -249,6 +258,7 @@ public class MotifBorders {
             }
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             insets.set(6, 6, 6, 6);
             return insets;
@@ -297,6 +307,7 @@ public class MotifBorders {
             return frameShadow;
         }
 
+        @Override
         public Insets getBorderInsets(Component c, Insets newInsets) {
             newInsets.set(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE);
             return newInsets;
@@ -424,6 +435,7 @@ public class MotifBorders {
           * <b>drawTitleBar</b>, <b>drawLeftBorder</b>, <b>drawRightBorder</b> and
           * <b>drawBottomBorder</b>.
           */
+        @Override
         public void paintBorder(Component c, Graphics g,
                             int x, int y, int width, int height) {
             if (isActiveFrame()) {
@@ -487,6 +499,7 @@ public class MotifBorders {
 
         /** Draws the InternalFrameBorder's top border.
          */
+        @Override
         protected boolean drawTopBorder(Component c, Graphics g,
                                     int x, int y, int width, int height) {
             if (super.drawTopBorder(c, g, x, y, width, height) &&
@@ -506,6 +519,7 @@ public class MotifBorders {
 
         /** Draws the InternalFrameBorder's left border.
           */
+        @Override
         protected boolean drawLeftBorder(Component c, Graphics g, int x, int y,
                                      int width, int height) {
             if (super.drawLeftBorder(c, g, x, y, width, height) &&
@@ -525,6 +539,7 @@ public class MotifBorders {
 
         /** Draws the InternalFrameBorder's right border.
           */
+        @Override
         protected boolean drawRightBorder(Component c, Graphics g, int x, int y,
                                       int width, int height) {
             if (super.drawRightBorder(c, g, x, y, width, height) &&
@@ -545,6 +560,7 @@ public class MotifBorders {
 
         /** Draws the InternalFrameBorder's bottom border.
           */
+        @Override
         protected boolean drawBottomBorder(Component c, Graphics g, int x, int y,
                                        int width, int height) {
             if (super.drawBottomBorder(c, g, x, y, width, height) &&
@@ -567,6 +583,7 @@ public class MotifBorders {
         }
 
         // Returns true if the associated internal frame has focus.
+        @Override
         protected boolean isActiveFrame() {
             return frame.isSelected();
         }
@@ -667,6 +684,7 @@ public class MotifBorders {
          * @param width the width of the painted border
          * @param height the height of the painted border
          */
+        @Override
         public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
             if (!(c instanceof JPopupMenu)) {
                 return;
@@ -713,6 +731,7 @@ public class MotifBorders {
          * @param c the component for which this border insets value applies
          * @param insets the object to be reinitialized
          */
+        @Override
         public Insets getBorderInsets(Component c, Insets insets) {
             if (!(c instanceof JPopupMenu)) {
                 return insets;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
index a1a74f1230f..65754efed0d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ public class MotifButtonListener extends BasicButtonListener {
         super(b);
     }
 
+    @Override
     protected void checkOpacity(AbstractButton b) {
         b.setOpaque( false );
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
index 08017a0b2c8..7a11e4a47e9 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicButtonListener;
 import javax.swing.plaf.basic.BasicButtonUI;
 
-import sun.awt.AppContext;
-
 /**
  * MotifButton implementation
  *
@@ -55,25 +53,19 @@ public class MotifButtonUI extends BasicButtonUI {
 
     private boolean defaults_initialized = false;
 
-    private static final Object MOTIF_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new MotifButtonUI();
 
     // ********************************
     //          Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        MotifButtonUI motifButtonUI =
-                (MotifButtonUI) appContext.get(MOTIF_BUTTON_UI_KEY);
-        if (motifButtonUI == null) {
-            motifButtonUI = new MotifButtonUI();
-            appContext.put(MOTIF_BUTTON_UI_KEY, motifButtonUI);
-        }
-        return motifButtonUI;
+        return UI;
     }
 
     // ********************************
     //         Create Listeners
     // ********************************
+    @Override
     protected BasicButtonListener createButtonListener(AbstractButton b){
         return new MotifButtonListener(b);
     }
@@ -81,6 +73,7 @@ public class MotifButtonUI extends BasicButtonUI {
     // ********************************
     //          Install Defaults
     // ********************************
+    @Override
     public void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -90,6 +83,7 @@ public class MotifButtonUI extends BasicButtonUI {
         LookAndFeel.installProperty(b, "opaque", Boolean.FALSE);
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
@@ -106,12 +100,14 @@ public class MotifButtonUI extends BasicButtonUI {
     // ********************************
     //          Paint Methods
     // ********************************
+    @Override
     public void paint(Graphics g, JComponent c) {
         fillContentArea( g, (AbstractButton)c , c.getBackground() );
         super.paint(g,c);
     }
 
     // Overridden to ensure we don't paint icon over button borders.
+    @Override
     protected void paintIcon(Graphics g, JComponent c, Rectangle iconRect) {
         Shape oldClip = g.getClip();
         Rectangle newClip =
@@ -127,10 +123,12 @@ public class MotifButtonUI extends BasicButtonUI {
         g.setClip(oldClip);
     }
 
+    @Override
     protected void paintFocus(Graphics g, AbstractButton b, Rectangle viewRect, Rectangle textRect, Rectangle iconRect){
         // focus painting is handled by the border
     }
 
+    @Override
     protected void paintButtonPressed(Graphics g, AbstractButton b) {
 
         fillContentArea( g, b , selectColor );
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
index bcaf72cbe26..17d66a74bad 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,12 +50,14 @@ public class MotifCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI
         return new MotifCheckBoxMenuItemUI();
     }
 
+    @Override
     protected void installListeners() {
         super.installListeners();
         changeListener = createChangeListener(menuItem);
         menuItem.addChangeListener(changeListener);
     }
 
+    @Override
     protected void uninstallListeners() {
         super.uninstallListeners();
         menuItem.removeChangeListener(changeListener);
@@ -66,23 +68,28 @@ public class MotifCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI
     }
 
     protected class ChangeHandler implements ChangeListener {
+        @Override
         public void stateChanged(ChangeEvent e) {
             JMenuItem c = (JMenuItem)e.getSource();
             LookAndFeel.installProperty(c, "borderPainted", c.isArmed());
         }
     }
 
+    @Override
     protected MouseInputListener createMouseInputListener(JComponent c) {
         return new MouseInputHandler();
     }
 
 
     protected class MouseInputHandler implements MouseInputListener {
+        @Override
         public void mouseClicked(MouseEvent e) {}
+        @Override
         public void mousePressed(MouseEvent e) {
             MenuSelectionManager manager = MenuSelectionManager.defaultManager();
             manager.setSelectedPath(getPath());
         }
+        @Override
         public void mouseReleased(MouseEvent e) {
             MenuSelectionManager manager =
                 MenuSelectionManager.defaultManager();
@@ -99,11 +106,15 @@ public class MotifCheckBoxMenuItemUI extends BasicCheckBoxMenuItemUI
                 manager.processMouseEvent(e);
             }
         }
+        @Override
         public void mouseEntered(MouseEvent e) {}
+        @Override
         public void mouseExited(MouseEvent e) {}
+        @Override
         public void mouseDragged(MouseEvent e) {
             MenuSelectionManager.defaultManager().processMouseEvent(e);
         }
+        @Override
         public void mouseMoved(MouseEvent e) { }
     }
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
index fa06aa6bd02..7017eaf546c 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,6 @@ import javax.swing.JComponent;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
-import sun.awt.AppContext;
-
 /**
  * MotifCheckBox implementation
  *
@@ -39,7 +37,7 @@ import sun.awt.AppContext;
  */
 public class MotifCheckBoxUI extends MotifRadioButtonUI {
 
-    private static final Object MOTIF_CHECK_BOX_UI_KEY = new Object();
+    private static final ComponentUI UI = new MotifCheckBoxUI();
 
     private static final String propertyPrefix = "CheckBox" + ".";
 
@@ -50,16 +48,10 @@ public class MotifCheckBoxUI extends MotifRadioButtonUI {
     //         Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        MotifCheckBoxUI motifCheckBoxUI =
-                (MotifCheckBoxUI) appContext.get(MOTIF_CHECK_BOX_UI_KEY);
-        if (motifCheckBoxUI == null) {
-            motifCheckBoxUI = new MotifCheckBoxUI();
-            appContext.put(MOTIF_CHECK_BOX_UI_KEY, motifCheckBoxUI);
-        }
-        return motifCheckBoxUI;
+        return UI;
     }
 
+    @Override
     public String getPropertyPrefix() {
         return propertyPrefix;
     }
@@ -67,6 +59,7 @@ public class MotifCheckBoxUI extends MotifRadioButtonUI {
     // ********************************
     //          Defaults
     // ********************************
+    @Override
     public void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -75,6 +68,7 @@ public class MotifCheckBoxUI extends MotifRadioButtonUI {
         }
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
index d0cea2ec35b..8a6cb918ae4 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         return new MotifComboBoxUI();
     }
 
+    @Override
     public void installUI(JComponent c) {
         super.installUI(c);
         arrowIcon = new MotifComboBoxArrowIcon(UIManager.getColor("controlHighlight"),
@@ -72,6 +73,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
                                                UIManager.getColor("control"));
     }
 
+    @Override
     public Dimension getMinimumSize( JComponent c ) {
         if ( !isMinimumSizeDirty ) {
             return new Dimension( cachedMinimumSize );
@@ -89,6 +91,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         return size;
     }
 
+    @Override
     protected ComboPopup createPopup() {
         return new MotifComboPopup( comboBox );
     }
@@ -106,10 +109,12 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         /**
          * Motif combo popup should not track the mouse in the list.
          */
+        @Override
         public MouseMotionListener createListMouseMotionListener() {
            return new MouseMotionAdapter() {};
         }
 
+        @Override
         public KeyListener createKeyListener() {
             return super.createKeyListener();
         }
@@ -121,6 +126,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         }
     }
 
+    @Override
     protected void installComponents() {
         if ( comboBox.isEditable() ) {
             addEditor();
@@ -129,11 +135,13 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         comboBox.add( currentValuePane );
     }
 
+    @Override
     protected void uninstallComponents() {
         removeEditor();
         comboBox.removeAll();
     }
 
+    @Override
     public void paint(Graphics g, JComponent c) {
         boolean hasFocus = comboBox.hasFocus();
         Rectangle r;
@@ -180,6 +188,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         currentValuePane.removeAll();
     }
 
+    @Override
     public void paintCurrentValue(Graphics g,Rectangle bounds,boolean hasFocus) {
         ListCellRenderer<Object> renderer = comboBox.getRenderer();
         Component c;
@@ -226,6 +235,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         return b;
     }
 
+    @Override
     protected Rectangle rectangleForCurrentValue() {
         int width = comboBox.getWidth();
         int height = comboBox.getHeight();
@@ -251,11 +261,13 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
             return arrowIcon.getIconWidth() + (3 * HORIZ_MARGIN) + 2;
     }
 
+    @Override
     public void configureEditor() {
         super.configureEditor();
         editor.setBackground( UIManager.getColor( "text" ) );
     }
 
+    @Override
     protected LayoutManager createLayoutManager() {
         return new ComboBoxLayoutManager();
     }
@@ -273,6 +285,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         public ComboBoxLayoutManager() {
             MotifComboBoxUI.this.super();
         }
+        @Override
         public void layoutContainer(Container parent) {
             if ( motifGetEditor() != null ) {
                 Rectangle cvb = rectangleForCurrentValue();
@@ -298,6 +311,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
         }
 
 
+        @Override
         public void paintIcon(Component c, Graphics g, int xo, int yo) {
             int w = getIconWidth();
             int h = getIconHeight();
@@ -322,10 +336,12 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
 
         }
 
+        @Override
         public int getIconWidth() {
             return 11;
         }
 
+        @Override
         public int getIconHeight() {
             return 11;
         }
@@ -336,6 +352,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
      *
      * @since 1.6
      */
+    @Override
     protected PropertyChangeListener createPropertyChangeListener() {
         return new MotifPropertyChangeListener();
     }
@@ -345,6 +362,7 @@ public class MotifComboBoxUI extends BasicComboBoxUI implements Serializable {
      */
     private class MotifPropertyChangeListener
             extends BasicComboBoxUI.PropertyChangeHandler {
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             super.propertyChange(e);
             String propertyName = e.getPropertyName();
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
index b71363d1c0e..872d4992d91 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,6 +74,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
     public MotifDesktopIconUI() {
     }
 
+    @Override
     protected void installDefaults(){
         super.installDefaults();
         setDefaultIcon(UIManager.getIcon("DesktopIcon.icon"));
@@ -94,12 +95,15 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
         JLayeredPane.putLayer(desktopIcon, JLayeredPane.getLayer(frame));
     }
 
+    @Override
     protected void installComponents(){
     }
 
+    @Override
     protected void uninstallComponents(){
     }
 
+    @Override
     protected void installListeners(){
         super.installListeners();
         desktopIconActionListener = createDesktopIconActionListener();
@@ -149,6 +153,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
         return new DesktopIconMouseListener();
     }
 
+    @Override
     protected void uninstallDefaults(){
         super.uninstallDefaults();
         desktopIcon.setLayout(null);
@@ -156,6 +161,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
         desktopIcon.remove(iconLabel);
     }
 
+    @Override
     protected void uninstallListeners(){
         super.uninstallListeners();
         iconButton.removeActionListener(desktopIconActionListener);
@@ -163,6 +169,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
         sysMenuTitlePane.uninstallListeners();
     }
 
+    @Override
     public Dimension getMinimumSize(JComponent c) {
         JInternalFrame iframe = desktopIcon.getInternalFrame();
 
@@ -180,10 +187,12 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
         return new Dimension(w, h);
     }
 
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         return getMinimumSize(c);
     }
 
+    @Override
     public Dimension getMaximumSize(JComponent c){
         return getMinimumSize(c);
     }
@@ -213,26 +222,33 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
 
             // Forward mouse events to titlebar for moves.
             addMouseMotionListener(new MouseMotionListener() {
+                @Override
                 public void mouseDragged(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseMoved(MouseEvent e) {
                     forwardEventToParent(e);
                 }
             });
             addMouseListener(new MouseListener() {
+                @Override
                 public void mouseClicked(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mousePressed(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseReleased(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseEntered(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseExited(MouseEvent e) {
                     forwardEventToParent(e);
                 }
@@ -251,16 +267,19 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
             getParent().dispatchEvent(newEvent);
         }
 
+        @Override
         @SuppressWarnings("deprecation")
         public boolean isFocusTraversable() {
             return false;
         }
 
+        @Override
         public Dimension getMinimumSize() {
             return new Dimension(defaultIcon.getIconWidth() + 1,
                                  LABEL_HEIGHT + LABEL_DIVIDER);
         }
 
+        @Override
         public Dimension getPreferredSize() {
             String title = frame.getTitle();
             FontMetrics fm = frame.getFontMetrics(defaultTitleFont);
@@ -271,6 +290,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
             return new Dimension(w, LABEL_HEIGHT + LABEL_DIVIDER);
         }
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
 
@@ -308,28 +328,35 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
             this.icon = icon;
             // Forward mouse events to titlebar for moves.
             addMouseMotionListener(new MouseMotionListener() {
+                @Override
                 public void mouseDragged(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseMoved(MouseEvent e) {
                     forwardEventToParent(e);
                 }
             });
             addMouseListener(new MouseListener() {
+                @Override
                 public void mouseClicked(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mousePressed(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseReleased(MouseEvent e) {
                     if (!systemMenu.isShowing()) {
                         forwardEventToParent(e);
                     }
                 }
+                @Override
                 public void mouseEntered(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseExited(MouseEvent e) {
                     forwardEventToParent(e);
                 }
@@ -347,6 +374,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
             getParent().dispatchEvent(newEvent);
         }
 
+        @Override
         @SuppressWarnings("deprecation")
         public boolean isFocusTraversable() {
             return false;
@@ -355,6 +383,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
 
 
     protected class DesktopIconActionListener implements ActionListener {
+        @Override
         public void actionPerformed(ActionEvent e){
             systemMenu.show(iconButton, 0, getDesktopIcon().getHeight());
         }
@@ -362,6 +391,7 @@ public class MotifDesktopIconUI extends BasicDesktopIconUI
 
     protected class DesktopIconMouseListener extends MouseAdapter {
         // if we drag or move we should deengage the popup
+        @Override
         public void mousePressed(MouseEvent e){
             if (e.getClickCount() > 1) {
                 try {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
index 50563a971da..66f253be8c1 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
     public MotifDesktopPaneUI() {
     }
 
+    @Override
     protected void installDesktopManager() {
         desktopManager = desktop.getDesktopManager();
         if(desktopManager == null) {
@@ -75,6 +76,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
 ////////////////////////////////////////////////////////////////////////////////////
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     private static class DragPane extends JComponent {
+        @Override
         public void paint(Graphics g) {
             g.setColor(Color.darkGray);
             g.drawRect(0, 0, getWidth()-1, getHeight()-1);
@@ -92,6 +94,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
         int iconWidth, iconHeight;
 
     // PENDING(klobad) this should be optimized
+    @Override
     public void setBoundsForFrame(JComponent f, int newX, int newY,
                         int newWidth, int newHeight) {
         if(!usingDragPane) {
@@ -112,6 +115,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
         }
     }
 
+    @Override
     public void beginDraggingFrame(JComponent f) {
         usingDragPane = false;
         if(f.getParent() instanceof JLayeredPane) {
@@ -125,10 +129,12 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
         }
     }
 
+    @Override
     public void dragFrame(JComponent f, int newX, int newY) {
         setBoundsForFrame(f, newX, newY, f.getWidth(), f.getHeight());
     }
 
+    @Override
     public void endDraggingFrame(JComponent f) {
         if(usingDragPane) {
             layeredPaneForDragPane.remove(dragPane);
@@ -143,6 +149,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
         }
     }
 
+    @Override
     public void beginResizingFrame(JComponent f, int direction) {
         usingDragPane = false;
         if(f.getParent() instanceof JLayeredPane) {
@@ -157,11 +164,13 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
         }
     }
 
+    @Override
     public void resizeFrame(JComponent f, int newX, int newY,
                                 int newWidth, int newHeight) {
         setBoundsForFrame(f, newX, newY, newWidth, newHeight);
     }
 
+    @Override
     public void endResizingFrame(JComponent f) {
         if(usingDragPane) {
             JLayeredPane p = (JLayeredPane)f.getParent();
@@ -172,6 +181,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
         }
     }
 
+        @Override
         public void iconifyFrame(JInternalFrame f) {
             JInternalFrame.JDesktopIcon icon = f.getDesktopIcon();
             Point p = icon.getLocation();
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
index 3367b36f0fd..e0be55c9be7 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@ public class MotifEditorPaneUI extends BasicEditorPaneUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return MotifTextUI.createCaret();
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
index 7d820930415..10a193b1271 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,6 +141,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         super(filechooser);
     }
 
+    @Override
     public String getFileName() {
         if(filenameTextField != null) {
             return filenameTextField.getText();
@@ -149,30 +150,37 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         }
     }
 
+    @Override
     public void setFileName(String filename) {
         if(filenameTextField != null) {
             filenameTextField.setText(filename);
         }
     }
 
+    @Override
     public String getDirectoryName() {
         return pathField.getText();
     }
 
+    @Override
     public void setDirectoryName(String dirname) {
         pathField.setText(dirname);
     }
 
+    @Override
     public void ensureFileIsVisible(JFileChooser fc, File f) {
         // PENDING(jeff)
     }
 
+    @Override
     public void rescanCurrentDirectory(JFileChooser fc) {
         getModel().validateFileCache();
     }
 
+    @Override
     public PropertyChangeListener createPropertyChangeListener(JFileChooser fc) {
         return new PropertyChangeListener() {
+            @Override
             public void propertyChange(PropertyChangeEvent e) {
                 String prop = e.getPropertyName();
                 if(prop.equals(JFileChooser.SELECTED_FILE_CHANGED_PROPERTY)) {
@@ -266,10 +274,12 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         return new MotifFileChooserUI((JFileChooser)c);
     }
 
+    @Override
     public void installUI(JComponent c) {
         super.installUI(c);
     }
 
+    @Override
     public void uninstallUI(JComponent c) {
         c.removePropertyChangeListener(filterComboBoxModel);
         approveButton.removeActionListener(getApproveSelectionAction());
@@ -277,11 +287,13 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         super.uninstallUI(c);
     }
 
+    @Override
     public void installComponents(JFileChooser fc) {
         fc.setLayout(new BorderLayout(10, 10));
         fc.setAlignmentX(JComponent.CENTER_ALIGNMENT);
 
         JPanel interior = new JPanel() {
+            @Override
             public Insets getInsets() {
                 return insets;
             }
@@ -305,6 +317,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         }
 
         JTextField tmp1 = new JTextField(curDirName, 35) {
+            @Override
             public Dimension getMaximumSize() {
                 Dimension d = super.getMaximumSize();
                 d.height = getPreferredSize().height;
@@ -340,6 +353,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         leftPanel.add(l);
 
         JComboBox<FileFilter> tmp2 = new JComboBox<FileFilter>() {
+            @Override
             public Dimension getMaximumSize() {
                 Dimension d = super.getMaximumSize();
                 d.height = getPreferredSize().height;
@@ -417,6 +431,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         interior.add(fileNameLabel);
 
         JTextField tmp3 = new JTextField(35) {
+            @Override
             public Dimension getMaximumSize() {
                 Dimension d = super.getMaximumSize();
                 d.height = getPreferredSize().height;
@@ -441,6 +456,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         buttonPanel.add(Box.createGlue());
 
         JButton tmp4 = new JButton(getApproveButtonText(fc)) {
+            @Override
             public Dimension getMaximumSize() {
                 return new Dimension(MAX_SIZE.width, this.getPreferredSize().height);
             }
@@ -456,6 +472,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         buttonPanel.add(Box.createGlue());
 
         JButton updateButton = new JButton(updateButtonText) {
+            @Override
             public Dimension getMaximumSize() {
                 return new Dimension(MAX_SIZE.width, this.getPreferredSize().height);
             }
@@ -470,6 +487,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         buttonPanel.add(Box.createGlue());
 
         JButton cancelButton = new JButton(cancelButtonText) {
+            @Override
             public Dimension getMaximumSize() {
                 return new Dimension(MAX_SIZE.width, this.getPreferredSize().height);
             }
@@ -484,6 +502,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         buttonPanel.add(Box.createGlue());
 
         JButton helpButton = new JButton(helpButtonText) {
+            @Override
             public Dimension getMaximumSize() {
                 return new Dimension(MAX_SIZE.width, this.getPreferredSize().height);
             }
@@ -520,6 +539,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         }
     }
 
+    @Override
     public void uninstallComponents(JFileChooser fc) {
         fc.removeAll();
         bottomPanel = null;
@@ -528,6 +548,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         }
     }
 
+    @Override
     protected void installStrings(JFileChooser fc) {
         super.installStrings(fc);
 
@@ -555,11 +576,13 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         return SwingUtilities2.getUIDefaultsInt(key, l);
     }
 
+    @Override
     protected void installIcons(JFileChooser fc) {
         // Since motif doesn't have button icons, leave this empty
         // which overrides the supertype icon loading
     }
 
+    @Override
     protected void uninstallIcons(JFileChooser fc) {
         // Since motif doesn't have button icons, leave this empty
         // which overrides the supertype icon loading
@@ -580,6 +603,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         fileList.addListSelectionListener(createListSelectionListener(getFileChooser()));
         fileList.addMouseListener(createDoubleClickListener(getFileChooser(), fileList));
         fileList.addMouseListener(new MouseAdapter() {
+            @Override
             public void mouseClicked(MouseEvent e) {
                 JFileChooser chooser = getFileChooser();
                 if (SwingUtilities.isLeftMouseButton(e) && !chooser.isMultiSelectionEnabled()) {
@@ -650,6 +674,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     protected class FileCellRenderer extends DefaultListCellRenderer  {
+        @Override
         public Component getListCellRendererComponent(JList<?> list, Object value, int index,
                                                       boolean isSelected, boolean cellHasFocus) {
 
@@ -665,6 +690,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     protected class DirectoryCellRenderer extends DefaultListCellRenderer  {
+        @Override
         public Component getListCellRendererComponent(JList<?> list, Object value, int index,
                                                       boolean isSelected, boolean cellHasFocus) {
 
@@ -684,18 +710,22 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             getModel().addListDataListener(this);
         }
 
+        @Override
         public int getSize() {
             return getModel().getDirectories().size();
         }
 
+        @Override
         public File getElementAt(int index) {
             return getModel().getDirectories().elementAt(index);
         }
 
+        @Override
         public void intervalAdded(ListDataEvent e) {
             fireIntervalAdded(this, e.getIndex0(), e.getIndex1());
         }
 
+        @Override
         public void intervalRemoved(ListDataEvent e) {
             fireIntervalRemoved(this, e.getIndex0(), e.getIndex1());
         }
@@ -709,6 +739,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
 
         // PENDING(jeff) - fire the correct interval changed - currently sending
         // out that everything has changed
+        @Override
         public void contentsChanged(ListDataEvent e) {
             fireContentsChanged();
         }
@@ -721,6 +752,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             getModel().addListDataListener(this);
         }
 
+        @Override
         public int getSize() {
             return getModel().getFiles().size();
         }
@@ -733,14 +765,17 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             return getModel().getFiles().indexOf(o);
         }
 
+        @Override
         public File getElementAt(int index) {
             return getModel().getFiles().elementAt(index);
         }
 
+        @Override
         public void intervalAdded(ListDataEvent e) {
             fireIntervalAdded(this, e.getIndex0(), e.getIndex1());
         }
 
+        @Override
         public void intervalRemoved(ListDataEvent e) {
             fireIntervalRemoved(this, e.getIndex0(), e.getIndex1());
         }
@@ -753,6 +788,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         }
 
         // PENDING(jeff) - fire the interval changed
+        @Override
         public void contentsChanged(ListDataEvent e) {
             fireContentsChanged();
         }
@@ -779,6 +815,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
      */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     public class FilterComboBoxRenderer extends DefaultListCellRenderer {
+        @Override
         public Component getListCellRendererComponent(JList<?> list,
             Object value, int index, boolean isSelected,
             boolean cellHasFocus) {
@@ -805,6 +842,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             filters = getFileChooser().getChoosableFileFilters();
         }
 
+        @Override
         public void propertyChange(PropertyChangeEvent e) {
             String prop = e.getPropertyName();
             if(prop.equals(JFileChooser.CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY)) {
@@ -815,6 +853,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             }
         }
 
+        @Override
         public void setSelectedItem(Object filter) {
             if(filter != null) {
                 getFileChooser().setFileFilter((FileFilter) filter);
@@ -822,6 +861,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             }
         }
 
+        @Override
         public Object getSelectedItem() {
             // Ensure that the current filter is in the list.
             // NOTE: we shouldn't have to do this, since JFileChooser adds
@@ -843,6 +883,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             return getFileChooser().getFileFilter();
         }
 
+        @Override
         public int getSize() {
             if(filters != null) {
                 return filters.length;
@@ -851,6 +892,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
             }
         }
 
+        @Override
         public FileFilter getElementAt(int index) {
             if(index > getSize() - 1) {
                 // This shouldn't happen. Try to recover gracefully.
@@ -864,6 +906,7 @@ public class MotifFileChooserUI extends BasicFileChooserUI {
         }
     }
 
+    @Override
     protected JButton getApproveButton(JFileChooser fc) {
         return approveButton;
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
index dac6514f0c4..748c4dc6155 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,7 @@ public class MotifIconFactory implements Serializable
         private Color highlight = UIManager.getColor("controlHighlight");
         private Color lightShadow = UIManager.getColor("controlLightShadow");
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             AbstractButton b = (AbstractButton) c;
             ButtonModel model = b.getModel();
@@ -158,10 +159,12 @@ public class MotifIconFactory implements Serializable
             }
         }
 
+        @Override
         public int getIconWidth() {
             return csize;
         }
 
+        @Override
         public int getIconHeight() {
             return csize;
         }
@@ -258,6 +261,7 @@ public class MotifIconFactory implements Serializable
         private Color highlight = UIManager.getColor("controlHighlight");
         private Color shadow = UIManager.getColor("controlShadow");
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             // fill interior
             AbstractButton b = (AbstractButton) c;
@@ -303,10 +307,12 @@ public class MotifIconFactory implements Serializable
             }
         }
 
+        @Override
         public int getIconWidth() {
             return 14;
         }
 
+        @Override
         public int getIconHeight() {
             return 14;
         }
@@ -315,10 +321,13 @@ public class MotifIconFactory implements Serializable
     @SuppressWarnings("serial") // Same-version serialization only
     private static class MenuItemCheckIcon implements Icon, UIResource, Serializable
     {
+        @Override
         public void paintIcon(Component c,Graphics g, int x, int y)
             {
             }
+        @Override
         public int getIconWidth() { return 0; }
+        @Override
         public int getIconHeight() { return 0; }
     }  // end class MenuItemCheckIcon
 
@@ -326,10 +335,13 @@ public class MotifIconFactory implements Serializable
     @SuppressWarnings("serial") // Same-version serialization only
     private static class MenuItemArrowIcon implements Icon, UIResource, Serializable
     {
+        @Override
         public void paintIcon(Component c,Graphics g, int x, int y)
             {
             }
+        @Override
         public int getIconWidth() { return 0; }
+        @Override
         public int getIconHeight() { return 0; }
     }  // end class MenuItemArrowIcon
 
@@ -340,6 +352,7 @@ public class MotifIconFactory implements Serializable
         private Color shadow = UIManager.getColor("controlShadow");
         private Color highlight = UIManager.getColor("controlHighlight");
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             AbstractButton b = (AbstractButton) c;
             ButtonModel model = b.getModel();
@@ -414,7 +427,9 @@ public class MotifIconFactory implements Serializable
             }
 
         }
+        @Override
         public int getIconWidth() { return 10; }
+        @Override
         public int getIconHeight() { return 10; }
     } // End class MenuArrowIcon
 }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
index b68200c1924..474bd707ce4 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,20 +66,24 @@ public class MotifInternalFrameTitlePane
         super(frame);
     }
 
+    @Override
     protected void installDefaults() {
         setFont(UIManager.getFont("InternalFrame.titleFont"));
         setPreferredSize(new Dimension(100, BUTTON_SIZE));
     }
 
+    @Override
     protected void uninstallListeners() {
         // Get around protected method in superclass
         super.uninstallListeners();
     }
 
+    @Override
     protected PropertyChangeListener createPropertyChangeListener() {
         return this;
     }
 
+    @Override
     protected LayoutManager createLayout() {
         return this;
     }
@@ -88,6 +92,7 @@ public class MotifInternalFrameTitlePane
         return systemMenu;
     }
 
+    @Override
     protected void assembleSystemMenu() {
         systemMenu = new JPopupMenu();
         JMenuItem mi = systemMenu.add(restoreAction);
@@ -106,12 +111,14 @@ public class MotifInternalFrameTitlePane
 
         systemButton = new SystemButton();
         systemButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 systemMenu.show(systemButton, 0, BUTTON_SIZE);
             }
         });
 
         systemButton.addMouseListener(new MouseAdapter() {
+            @Override
             public void mousePressed(MouseEvent evt) {
                 try {
                     frame.setSelected(true);
@@ -137,6 +144,7 @@ public class MotifInternalFrameTitlePane
         }
     }
 
+    @Override
     protected void createButtons() {
         minimizeButton = new MinimizeButton();
         minimizeButton.addActionListener(iconifyAction);
@@ -146,6 +154,7 @@ public class MotifInternalFrameTitlePane
     }
 
 
+    @Override
     protected void addSubComponents() {
         title = new Title(frame.getTitle());
         title.setFont(getFont());
@@ -156,6 +165,7 @@ public class MotifInternalFrameTitlePane
         add(maximizeButton);
     }
 
+    @Override
     public void paintComponent(Graphics g) {
     }
 
@@ -165,9 +175,11 @@ public class MotifInternalFrameTitlePane
         shadow = s;
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
     }
 
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         String prop = evt.getPropertyName();
         JInternalFrame f = (JInternalFrame)evt.getSource();
@@ -194,16 +206,21 @@ public class MotifInternalFrameTitlePane
         enableActions();
     }
 
+    @Override
     public void addLayoutComponent(String name, Component c) {}
+    @Override
     public void removeLayoutComponent(Component c) {}
+    @Override
     public Dimension preferredLayoutSize(Container c)  {
         return minimumLayoutSize(c);
     }
 
+    @Override
     public Dimension minimumLayoutSize(Container c) {
         return new Dimension(100, BUTTON_SIZE);
     }
 
+    @Override
     public void layoutContainer(Container c) {
         int w = getWidth();
         systemButton.setBounds(0, 0, BUTTON_SIZE, BUTTON_SIZE);
@@ -226,6 +243,7 @@ public class MotifInternalFrameTitlePane
         title.setBounds(BUTTON_SIZE, 0, x, BUTTON_SIZE);
     }
 
+    @Override
     protected void showSystemMenu(){
       systemMenu.show(systemButton, 0, BUTTON_SIZE);
     }
@@ -245,23 +263,28 @@ public class MotifInternalFrameTitlePane
             setBorderPainted(false);
         }
 
+        @Override
         @SuppressWarnings("deprecation")
         public boolean isFocusTraversable() {
             return false;
         }
 
+        @Override
         public void requestFocus() {
             // ignore request.
         }
 
+        @Override
         public Dimension getMinimumSize() {
             return buttonDimension;
         }
 
+        @Override
         public Dimension getPreferredSize() {
             return buttonDimension;
         }
 
+        @Override
         public void paintComponent(Graphics g) {
             Dimension d = getSize();
             int maxX = d.width - 1;
@@ -284,6 +307,7 @@ public class MotifInternalFrameTitlePane
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class MinimizeButton extends FrameButton {
+        @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
             g.setColor(highlight);
@@ -297,6 +321,7 @@ public class MotifInternalFrameTitlePane
 
    @SuppressWarnings("serial") // Superclass is not serializable across versions
    private class MaximizeButton extends FrameButton {
+        @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
             int max = BUTTON_SIZE - 5;
@@ -312,9 +337,12 @@ public class MotifInternalFrameTitlePane
 
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     private class SystemButton extends FrameButton {
+        @Override
         public boolean isFocusTraversable() { return false; }
+        @Override
         public void requestFocus() {}
 
+        @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
             g.setColor(highlight);
@@ -339,26 +367,33 @@ public class MotifInternalFrameTitlePane
 
             // Forward mouse events to titlebar for moves.
             addMouseMotionListener(new MouseMotionListener() {
+                @Override
                 public void mouseDragged(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseMoved(MouseEvent e) {
                     forwardEventToParent(e);
                 }
             });
             addMouseListener(new MouseListener() {
+                @Override
                 public void mouseClicked(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mousePressed(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseReleased(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseEntered(MouseEvent e) {
                     forwardEventToParent(e);
                 }
+                @Override
                 public void mouseExited(MouseEvent e) {
                     forwardEventToParent(e);
                 }
@@ -377,6 +412,7 @@ public class MotifInternalFrameTitlePane
             getParent().dispatchEvent(newEvent);
         }
 
+        @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
             if (frame.isSelected()) {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
index 1179df181ab..678686a9b17 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,11 +81,13 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
         super(w);
     }
 
+    @Override
     public void installUI(JComponent c)   {
         super.installUI(c);
         setColors((JInternalFrame)c);
     }
 
+    @Override
     protected void installDefaults() {
         Border frameBorder = frame.getBorder();
         frame.setLayout(internalFrameLayout = createLayoutManager());
@@ -95,6 +97,7 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
     }
 
 
+    @Override
     protected void installKeyboardActions(){
       super.installKeyboardActions();
       // We replace the
@@ -103,6 +106,7 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
     }
 
 
+    @Override
     protected void uninstallDefaults() {
         LookAndFeel.uninstallBorder(frame);
         frame.setLayout(null);
@@ -113,15 +117,18 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
       return frame;
     }
 
+    @Override
     public JComponent createNorthPane(JInternalFrame w) {
         titlePane = new MotifInternalFrameTitlePane(w);
         return titlePane;
     }
 
+    @Override
     public Dimension getMaximumSize(JComponent x) {
         return Toolkit.getDefaultToolkit().getScreenSize();
     }
 
+    @Override
     protected void uninstallKeyboardActions(){
       super.uninstallKeyboardActions();
       if (isKeyBindingRegistered()){
@@ -132,6 +139,7 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
       }
     }
 
+    @Override
     protected void setupMenuOpenKey(){
         super.setupMenuOpenKey();
         ActionMap map = SwingUtilities.getUIActionMap(frame);
@@ -141,9 +149,11 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
             // titlePane ivar in BasicInternalFrameUI, making supers action throw
             // an NPE for us.
             map.put("showSystemMenu", new AbstractAction(){
+                @Override
                 public void actionPerformed(ActionEvent e){
                     titlePane.showSystemMenu();
                 }
+                @Override
                 public boolean isEnabled(){
                     return isKeyBindingActive();
                 }
@@ -151,13 +161,16 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
         }
     }
 
+    @Override
     protected void setupMenuCloseKey(){
         ActionMap map = SwingUtilities.getUIActionMap(frame);
         if (map != null) {
             map.put("hideSystemMenu", new AbstractAction(){
+                @Override
                 public void actionPerformed(ActionEvent e){
                     titlePane.hideSystemMenu();
                 }
+                @Override
                 public boolean isEnabled(){
                     return isKeyBindingActive();
                 }
@@ -184,6 +197,7 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
         if (diActionMap == null) {
             diActionMap = new ActionMapUIResource();
             diActionMap.put("hideSystemMenu", new AbstractAction(){
+                @Override
                 public void actionPerformed(ActionEvent e){
                     JInternalFrame.JDesktopIcon icon = getFrame().
                                      getDesktopIcon();
@@ -191,6 +205,7 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
                                                getUI();
                     micon.hideSystemMenu();
                 }
+                @Override
                 public boolean isEnabled(){
                     return isKeyBindingActive();
                 }
@@ -201,12 +216,14 @@ public class MotifInternalFrameUI extends BasicInternalFrameUI {
 
     /** This method is called when the frame becomes selected.
       */
+    @Override
     protected void activateFrame(JInternalFrame f) {
         super.activateFrame(f);
         setColors(f);
     }
     /** This method is called when the frame is no longer selected.
       */
+    @Override
     protected void deactivateFrame(JInternalFrame f) {
         setColors(f);
         super.deactivateFrame(f);
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
index f19a3c23cb5..89c2e309f9e 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
@@ -29,8 +29,6 @@ import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicLabelUI;
 
-import sun.awt.AppContext;
-
 /**
  * A Motif {@literal L&F} implementation of LabelUI.
  * This merely sets up new default values in MotifLookAndFeel.
@@ -39,16 +37,9 @@ import sun.awt.AppContext;
  */
 public class MotifLabelUI extends BasicLabelUI
 {
-    private static final Object MOTIF_LABEL_UI_KEY = new Object();
+    private static final ComponentUI UI = new MotifLabelUI();
 
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        MotifLabelUI motifLabelUI =
-                (MotifLabelUI) appContext.get(MOTIF_LABEL_UI_KEY);
-        if (motifLabelUI == null) {
-            motifLabelUI = new MotifLabelUI();
-            appContext.put(MOTIF_LABEL_UI_KEY, motifLabelUI);
-        }
-        return motifLabelUI;
+        return UI;
     }
 }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
index aaeb0243ce7..d254443b8d1 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,24 +56,29 @@ import sun.swing.SwingUtilities2;
 @Deprecated(since="13", forRemoval=true)
 public class MotifLookAndFeel extends BasicLookAndFeel
 {
+    @Override
     public String getName() {
         return "CDE/Motif";
     }
 
+    @Override
     public String getID() {
         return "Motif";
     }
 
+    @Override
     public String getDescription() {
         return "The CDE/Motif Look and Feel";
     }
 
 
+    @Override
     public boolean isNativeLookAndFeel() {
         return false;
     }
 
 
+    @Override
     public boolean isSupportedLookAndFeel() {
         return true;
     }
@@ -87,6 +92,7 @@ public class MotifLookAndFeel extends BasicLookAndFeel
      * values, otherwise we create color objects whose values match
      * the default CDE/Motif colors.
      */
+    @Override
     protected void initSystemColorDefaults(UIDefaults table)
     {
         String[] defaultSystemColors = {
@@ -123,6 +129,7 @@ public class MotifLookAndFeel extends BasicLookAndFeel
     }
 
 
+    @Override
     protected void initClassDefaults(UIDefaults table)
     {
         super.initClassDefaults(table);
@@ -178,6 +185,7 @@ public class MotifLookAndFeel extends BasicLookAndFeel
     }
 
 
+    @Override
     protected void initComponentDefaults(UIDefaults table)
     {
         super.initComponentDefaults(table);
@@ -255,36 +263,42 @@ public class MotifLookAndFeel extends BasicLookAndFeel
                                         ));
 
         Object menuItemCheckIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifIconFactory.getMenuItemCheckIcon();
             }
         };
 
         Object menuItemArrowIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifIconFactory.getMenuItemArrowIcon();
             }
         };
 
         Object menuArrowIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifIconFactory.getMenuArrowIcon();
             }
         };
 
         Object checkBoxIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifIconFactory.getCheckBoxIcon();
             }
         };
 
         Object radioButtonIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifIconFactory.getRadioButtonIcon();
             }
         };
 
         Object unselectedTabBackground = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 Color c = table.getColor("control");
                 return new ColorUIResource(Math.max((int)(c.getRed()*.85),0),
@@ -294,6 +308,7 @@ public class MotifLookAndFeel extends BasicLookAndFeel
         };
 
         Object unselectedTabForeground = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 Color c = table.getColor("controlText");
                 return new ColorUIResource(Math.max((int)(c.getRed()*.85),0),
@@ -303,6 +318,7 @@ public class MotifLookAndFeel extends BasicLookAndFeel
         };
 
         Object unselectedTabShadow = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 Color c = table.getColor("control");
                 Color base = new Color(Math.max((int)(c.getRed()*.85),0),
@@ -313,6 +329,7 @@ public class MotifLookAndFeel extends BasicLookAndFeel
         };
 
         Object unselectedTabHighlight = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 Color c = table.getColor("control");
                 Color base = new Color(Math.max((int)(c.getRed()*.85),0),
@@ -462,18 +479,21 @@ public class MotifLookAndFeel extends BasicLookAndFeel
                                                          "icons/TreeClosed.gif");
 
         Object treeLeafIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifTreeCellRenderer.loadLeafIcon();
             }
         };
 
         Object treeExpandedIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifTreeUI.MotifExpandedIcon.createExpandedIcon();
             }
         };
 
         Object treeCollapsedIcon = new UIDefaults.LazyValue() {
+            @Override
             public Object createValue(UIDefaults table) {
                 return MotifTreeUI.MotifCollapsedIcon.createCollapsedIcon();
             }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
index 52116aaf588..50ea704c73a 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,12 +50,14 @@ public class MotifMenuItemUI extends BasicMenuItemUI
         return new MotifMenuItemUI();
     }
 
+    @Override
     protected void installListeners() {
         super.installListeners();
         changeListener = createChangeListener(menuItem);
         menuItem.addChangeListener(changeListener);
     }
 
+    @Override
     protected void uninstallListeners() {
         super.uninstallListeners();
         menuItem.removeChangeListener(changeListener);
@@ -65,12 +67,14 @@ public class MotifMenuItemUI extends BasicMenuItemUI
         return new ChangeHandler();
     }
 
+    @Override
     protected MouseInputListener createMouseInputListener(JComponent c) {
         return new MouseInputHandler();
     }
 
     protected class ChangeHandler implements ChangeListener {
 
+        @Override
         public void stateChanged(ChangeEvent e) {
             JMenuItem c = (JMenuItem)e.getSource();
             LookAndFeel.installProperty(c, "borderPainted",
@@ -79,11 +83,14 @@ public class MotifMenuItemUI extends BasicMenuItemUI
     }
 
     protected class MouseInputHandler implements MouseInputListener {
+        @Override
         public void mouseClicked(MouseEvent e) {}
+        @Override
         public void mousePressed(MouseEvent e) {
             MenuSelectionManager manager = MenuSelectionManager.defaultManager();
             manager.setSelectedPath(getPath());
         }
+        @Override
         public void mouseReleased(MouseEvent e) {
             MenuSelectionManager manager =
                 MenuSelectionManager.defaultManager();
@@ -97,11 +104,15 @@ public class MotifMenuItemUI extends BasicMenuItemUI
                 manager.processMouseEvent(e);
             }
         }
+        @Override
         public void mouseEntered(MouseEvent e) {}
+        @Override
         public void mouseExited(MouseEvent e) {}
+        @Override
         public void mouseDragged(MouseEvent e) {
             MenuSelectionManager.defaultManager().processMouseEvent(e);
         }
+        @Override
         public void mouseMoved(MouseEvent e) { }
     }
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
index 93f4d2c731c..c3f8e7c9ece 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,15 +33,19 @@ import javax.swing.MenuSelectionManager;
  * @author Arnaud Weber
  */
 class MotifMenuMouseListener extends MouseAdapter {
+    @Override
     public void mousePressed(MouseEvent e) {
         MenuSelectionManager.defaultManager().processMouseEvent(e);
     }
+    @Override
     public void mouseReleased(MouseEvent e) {
         MenuSelectionManager.defaultManager().processMouseEvent(e);
     }
+    @Override
     public void mouseEntered(MouseEvent e) {
         MenuSelectionManager.defaultManager().processMouseEvent(e);
     }
+    @Override
     public void mouseExited(MouseEvent e) {
         MenuSelectionManager.defaultManager().processMouseEvent(e);
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
index 22fcd908a11..8171ad8934d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,10 +33,12 @@ import javax.swing.MenuSelectionManager;
  * @author Arnaud Weber
  */
 class MotifMenuMouseMotionListener implements MouseMotionListener {
+    @Override
     public void mouseDragged(MouseEvent e) {
         MenuSelectionManager.defaultManager().processMouseEvent(e);
     }
 
+    @Override
     public void mouseMoved(MouseEvent e) {
         MenuSelectionManager.defaultManager().processMouseEvent(e);
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
index bcee2e666fa..5bf2b1e0503 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ public class MotifMenuUI extends BasicMenuUI
 //      menuItem.removeChangeListener(changeListener);
 //    }
 
+    @Override
     protected ChangeListener createChangeListener(JComponent c) {
         return new MotifChangeHandler((JMenu)c, this);
     }
@@ -76,6 +77,7 @@ public class MotifMenuUI extends BasicMenuUI
         return false;
     }
 
+    @Override
     protected MouseInputListener createMouseInputListener(JComponent c) {
         return new MouseInputHandler();
     }
@@ -86,6 +88,7 @@ public class MotifMenuUI extends BasicMenuUI
         }
 
 
+        @Override
         public void stateChanged(ChangeEvent e) {
             JMenuItem c = (JMenuItem)e.getSource();
             if (c.isArmed() || c.isSelected()) {
@@ -100,7 +103,9 @@ public class MotifMenuUI extends BasicMenuUI
     }
 
     protected class MouseInputHandler implements MouseInputListener {
+        @Override
         public void mouseClicked(MouseEvent e) {}
+        @Override
         public void mousePressed(MouseEvent e) {
             MenuSelectionManager manager = MenuSelectionManager.defaultManager();
             JMenu menu = (JMenu)e.getComponent();
@@ -129,6 +134,7 @@ public class MotifMenuUI extends BasicMenuUI
             }
         }
 
+        @Override
         public void mouseReleased(MouseEvent e) {
             MenuSelectionManager manager =
                 MenuSelectionManager.defaultManager();
@@ -139,11 +145,15 @@ public class MotifMenuUI extends BasicMenuUI
                 manager.processMouseEvent(e);
             }
         }
+        @Override
         public void mouseEntered(MouseEvent e) {}
+        @Override
         public void mouseExited(MouseEvent e) {}
+        @Override
         public void mouseDragged(MouseEvent e) {
             MenuSelectionManager.defaultManager().processMouseEvent(e);
         }
+        @Override
         public void mouseMoved(MouseEvent e) { }
     }
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
index 21e8c0f6747..641d5ec1b99 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,7 @@ public class MotifOptionPaneUI extends BasicOptionPaneUI
      * Creates and returns a Container containing the buttons. The buttons
      * are created by calling <code>getButtons</code>.
      */
+    @Override
     protected Container createButtonArea() {
         Container          b = super.createButtonArea();
 
@@ -69,17 +70,21 @@ public class MotifOptionPaneUI extends BasicOptionPaneUI
     /**
      * Returns null, CDE/Motif does not impose a minimum size.
      */
+    @Override
     public Dimension getMinimumOptionPaneSize() {
         return null;
     }
 
+    @Override
     protected Container createSeparator() {
         return new JPanel() {
 
+            @Override
             public Dimension getPreferredSize() {
                 return new Dimension(10, 2);
             }
 
+            @Override
             public void paint(Graphics g) {
                 int width = getWidth();
                 g.setColor(Color.darkGray);
@@ -95,6 +100,7 @@ public class MotifOptionPaneUI extends BasicOptionPaneUI
      * <code>getIcon</code> to <code>top</code>. This is messaged from
      * <code>createMessageArea</code>
      */
+    @Override
     protected void addIcon(Container top) {
         /* Create the icon. */
         Icon                  sideIcon = getIcon();
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
index 8e1369d7e96..b906329d353 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@ public class MotifPasswordFieldUI extends BasicPasswordFieldUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return MotifTextUI.createCaret();
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
index 164b3227034..5556695429e 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class MotifPopupMenuSeparatorUI extends MotifSeparatorUI
         return new MotifPopupMenuSeparatorUI();
     }
 
+    @Override
     public void paint( Graphics g, JComponent c )
     {
         Dimension s = c.getSize();
@@ -58,6 +59,7 @@ public class MotifPopupMenuSeparatorUI extends MotifSeparatorUI
         g.drawLine( 0, 1, s.width, 1 );
     }
 
+    @Override
     public Dimension getPreferredSize( JComponent c )
     {
         return new Dimension( 0, 2 );
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
index 0986f81f0ff..6012152905a 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ public class MotifPopupMenuUI extends BasicPopupMenuUI {
     /* This has to deal with the fact that the title may be wider than
        the widest child component.
        */
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         LayoutManager layout = c.getLayout();
         Dimension d = layout.preferredLayoutSize(c);
@@ -94,10 +95,12 @@ public class MotifPopupMenuUI extends BasicPopupMenuUI {
 
     protected ChangeListener createChangeListener(JPopupMenu m) {
         return new ChangeListener() {
+            @Override
             public void stateChanged(ChangeEvent e) {}
         };
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public boolean isPopupTrigger(MouseEvent e) {
         return ((e.getID()==MouseEvent.MOUSE_PRESSED)
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
index 1a9d7fa1e91..914c305fa08 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,12 +55,14 @@ public class MotifRadioButtonMenuItemUI extends BasicRadioButtonMenuItemUI
         return new MotifRadioButtonMenuItemUI();
     }
 
+    @Override
     protected void installListeners() {
         super.installListeners();
         changeListener = createChangeListener(menuItem);
         menuItem.addChangeListener(changeListener);
     }
 
+    @Override
     protected void uninstallListeners() {
         super.uninstallListeners();
         menuItem.removeChangeListener(changeListener);
@@ -72,23 +74,28 @@ public class MotifRadioButtonMenuItemUI extends BasicRadioButtonMenuItemUI
 
     @SuppressWarnings("serial") // Same-version serialization only
     protected class ChangeHandler implements ChangeListener, Serializable {
+        @Override
         public void stateChanged(ChangeEvent e) {
             JMenuItem c = (JMenuItem)e.getSource();
             LookAndFeel.installProperty(c, "borderPainted", c.isArmed());
         }
     }
 
+    @Override
     protected MouseInputListener createMouseInputListener(JComponent c) {
         return new MouseInputHandler();
     }
 
 
     protected class MouseInputHandler implements MouseInputListener {
+        @Override
         public void mouseClicked(MouseEvent e) {}
+        @Override
         public void mousePressed(MouseEvent e) {
             MenuSelectionManager manager = MenuSelectionManager.defaultManager();
             manager.setSelectedPath(getPath());
         }
+        @Override
         public void mouseReleased(MouseEvent e) {
             MenuSelectionManager manager =
                 MenuSelectionManager.defaultManager();
@@ -105,11 +112,15 @@ public class MotifRadioButtonMenuItemUI extends BasicRadioButtonMenuItemUI
                 manager.processMouseEvent(e);
             }
         }
+        @Override
         public void mouseEntered(MouseEvent e) {}
+        @Override
         public void mouseExited(MouseEvent e) {}
+        @Override
         public void mouseDragged(MouseEvent e) {
             MenuSelectionManager.defaultManager().processMouseEvent(e);
         }
+        @Override
         public void mouseMoved(MouseEvent e) { }
     }
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
index 58619280493..d78bcb13577 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,6 @@ import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicRadioButtonUI;
 
-import sun.awt.AppContext;
-
 /**
  * RadioButtonUI implementation for MotifRadioButtonUI
  *
@@ -45,7 +43,7 @@ import sun.awt.AppContext;
  */
 public class MotifRadioButtonUI extends BasicRadioButtonUI {
 
-    private static final Object MOTIF_RADIO_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new MotifRadioButtonUI();
 
     protected Color focusColor;
 
@@ -55,19 +53,13 @@ public class MotifRadioButtonUI extends BasicRadioButtonUI {
     //         Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        MotifRadioButtonUI motifRadioButtonUI =
-                (MotifRadioButtonUI) appContext.get(MOTIF_RADIO_BUTTON_UI_KEY);
-        if (motifRadioButtonUI == null) {
-            motifRadioButtonUI = new MotifRadioButtonUI();
-            appContext.put(MOTIF_RADIO_BUTTON_UI_KEY, motifRadioButtonUI);
-        }
-        return motifRadioButtonUI;
+        return UI;
     }
 
     // ********************************
     //          Install Defaults
     // ********************************
+    @Override
     public void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -76,6 +68,7 @@ public class MotifRadioButtonUI extends BasicRadioButtonUI {
         }
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
@@ -92,6 +85,7 @@ public class MotifRadioButtonUI extends BasicRadioButtonUI {
     // ********************************
     //         Paint Methods
     // ********************************
+    @Override
     protected void paintFocus(Graphics g, Rectangle t, Dimension d){
         g.setColor(getFocusColor());
         g.drawRect(0,0,d.width-1,d.height-1);
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
index 5b812ca4c8c..2f5eb9708b3 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class MotifScrollBarButton extends BasicArrowButton
     }
 
 
+    @Override
     public Dimension getPreferredSize() {
         switch (direction) {
         case NORTH:
@@ -76,18 +77,22 @@ public class MotifScrollBarButton extends BasicArrowButton
         }
     }
 
+    @Override
     public Dimension getMinimumSize() {
         return getPreferredSize();
     }
 
+    @Override
     public Dimension getMaximumSize() {
         return getPreferredSize();
     }
 
+    @Override
     public boolean isFocusTraversable() {
         return false;
     }
 
+    @Override
     public void paint(Graphics g)
     {
         int w = getWidth();
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
index 08a283f5e52..48cee86636b 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ public class MotifScrollBarUI extends BasicScrollBarUI
         return new MotifScrollBarUI();
     }
 
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         Insets insets = c.getInsets();
         int dx = insets.left + insets.right;
@@ -61,19 +62,23 @@ public class MotifScrollBarUI extends BasicScrollBarUI
             : new Dimension(dx + 33, dy + 11);
     }
 
+    @Override
     protected JButton createDecreaseButton(int orientation) {
         return new MotifScrollBarButton(orientation);
     }
 
+    @Override
     protected JButton createIncreaseButton(int orientation) {
         return new MotifScrollBarButton(orientation);
     }
 
+    @Override
     public void paintTrack(Graphics g, JComponent c, Rectangle trackBounds)  {
         g.setColor(trackColor);
         g.fillRect(trackBounds.x, trackBounds.y, trackBounds.width, trackBounds.height);
     }
 
+    @Override
     public void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
         if (thumbBounds.isEmpty() || !scrollbar.isEnabled()) {
             return;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
index c8820de17c4..c6afd5ce953 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,22 +64,27 @@ public class MotifSliderUI extends BasicSliderUI {
         return new MotifSliderUI((JSlider)b);
     }
 
+    @Override
     public Dimension getPreferredHorizontalSize() {
         return PREFERRED_HORIZONTAL_SIZE;
     }
 
+    @Override
     public Dimension getPreferredVerticalSize() {
         return PREFERRED_VERTICAL_SIZE;
     }
 
+    @Override
     public Dimension getMinimumHorizontalSize() {
         return MINIMUM_HORIZONTAL_SIZE;
     }
 
+    @Override
     public Dimension getMinimumVerticalSize() {
         return MINIMUM_VERTICAL_SIZE;
     }
 
+    @Override
     protected Dimension getThumbSize() {
         if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
             return new Dimension( 30, 15 );
@@ -89,12 +94,15 @@ public class MotifSliderUI extends BasicSliderUI {
         }
     }
 
+    @Override
     public void paintFocus(Graphics g)  {
     }
 
+    @Override
     public void paintTrack(Graphics g)  {
     }
 
+    @Override
     public void paintThumb(Graphics g)  {
         Rectangle knobBounds = thumbRect;
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
index ba8f0efde4d..21cc1f7c38b 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,6 +84,7 @@ public class MotifSplitPaneDivider extends BasicSplitPaneDivider
      * overrides to hardcode the size of the divider
      * PENDING(jeff) - rewrite JSplitPane so that this isn't needed
      */
+    @Override
     public void setDividerSize(int newSize) {
         Insets          insets = getInsets();
         int             borderSize = 0;
@@ -109,6 +110,7 @@ public class MotifSplitPaneDivider extends BasicSplitPaneDivider
       */
     // PENDING(jeff) - the thumb's location and size is currently hard coded.
     // It should be dynamic.
+    @Override
     public void paint(Graphics g) {
         Color               bgColor = getBackground();
         Dimension           size = getSize();
@@ -179,6 +181,7 @@ public class MotifSplitPaneDivider extends BasicSplitPaneDivider
     /**
       * The minimums size is the same as the preferredSize
       */
+    @Override
     public Dimension getMinimumSize() {
         return getPreferredSize();
     }
@@ -187,6 +190,7 @@ public class MotifSplitPaneDivider extends BasicSplitPaneDivider
      * Sets the SplitPaneUI that is using the receiver. This is completely
      * overridden from super to create a different MouseHandler.
      */
+    @Override
     public void setBasicSplitPaneUI(BasicSplitPaneUI newUI) {
         if (splitPane != null) {
             splitPane.removePropertyChangeListener(this);
@@ -268,6 +272,7 @@ public class MotifSplitPaneDivider extends BasicSplitPaneDivider
      * in.
      */
     private class MotifMouseHandler extends MouseHandler {
+        @Override
         public void mousePressed(MouseEvent e) {
             // Constrain the mouse pressed to the thumb.
             if (e.getSource() == MotifSplitPaneDivider.this &&
@@ -277,6 +282,7 @@ public class MotifSplitPaneDivider extends BasicSplitPaneDivider
             }
         }
 
+        @Override
         public void mouseMoved(MouseEvent e) {
             if (getDragger() != null) {
                 return;
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
index c61a1713c9b..90ce672f5c9 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,7 @@ public class MotifSplitPaneUI extends BasicSplitPaneUI
     /**
       * Creates the default divider.
       */
+    @Override
     public BasicSplitPaneDivider createDefaultDivider() {
         return new MotifSplitPaneDivider(this);
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
index 1c53fc4a179..2b1e9482f9d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
 // UI Installation/De-installation
 
 
+    @Override
     protected void installDefaults() {
         super.installDefaults();
 
@@ -70,6 +71,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
         unselectedTabHighlight = UIManager.getColor("TabbedPane.unselectedTabHighlight");
     }
 
+    @Override
     protected void uninstallDefaults() {
         super.uninstallDefaults();
 
@@ -81,6 +83,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
 
 // UI Rendering
 
+   @Override
    protected void paintContentBorderTopEdge(Graphics g, int tabPlacement,
                                             int selectedIndex,
                                             int x, int y, int w, int h) {
@@ -104,6 +107,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
         }
     }
 
+    @Override
     protected void paintContentBorderBottomEdge(Graphics g, int tabPlacement,
                                                int selectedIndex,
                                                int x, int y, int w, int h) {
@@ -126,6 +130,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
         }
     }
 
+    @Override
     protected void paintContentBorderRightEdge(Graphics g, int tabPlacement,
                                                int selectedIndex,
                                                int x, int y, int w, int h) {
@@ -148,6 +153,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
         }
     }
 
+    @Override
     protected void paintTabBackground(Graphics g,
                                       int tabPlacement, int tabIndex,
                                       int x, int y, int w, int h,
@@ -174,6 +180,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
 
     }
 
+    @Override
     protected void paintTabBorder(Graphics g,
                                   int tabPlacement, int tabIndex,
                                   int x, int y, int w, int h,
@@ -225,6 +232,7 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
 
     }
 
+    @Override
     protected void paintFocusIndicator(Graphics g, int tabPlacement,
                                        Rectangle[] rects, int tabIndex,
                                        Rectangle iconRect, Rectangle textRect,
@@ -263,10 +271,12 @@ public class MotifTabbedPaneUI extends BasicTabbedPaneUI
         }
     }
 
+    @Override
     protected int getTabRunIndent(int tabPlacement, int run) {
         return run*3;
     }
 
+    @Override
     protected int getTabRunOverlay(int tabPlacement) {
         tabRunOverlay = (tabPlacement == LEFT || tabPlacement == RIGHT)?
             (int)Math.round((float)maxTabWidth * .10) :
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
index baddbf3a75d..f71dfe3c30d 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,7 @@ public class MotifTextAreaUI extends BasicTextAreaUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return MotifTextUI.createCaret();
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
index 08437687ebc..8e64aa02a63 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@ public class MotifTextFieldUI extends BasicTextFieldUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return MotifTextUI.createCaret();
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
index e47ad4c60bf..fabbbb204d0 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,7 @@ public class MotifTextPaneUI extends BasicTextPaneUI {
      *
      * @return the caret object
      */
+    @Override
     protected Caret createCaret() {
         return MotifTextUI.createCaret();
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
index b79ef19df8e..6e2e1059176 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ public class MotifTextUI {
          * @param e the focus event
          * @see FocusListener#focusGained
          */
+        @Override
         public void focusGained(FocusEvent e) {
             super.focusGained(e);
             getComponent().repaint();
@@ -88,6 +89,7 @@ public class MotifTextUI {
          * @param e the focus event
          * @see FocusListener#focusLost
          */
+        @Override
         public void focusLost(FocusEvent e) {
             super.focusLost(e);
             getComponent().repaint();
@@ -101,6 +103,7 @@ public class MotifTextUI {
          * @param r  the current location of the caret, does nothing if null
          * @see #paint
          */
+        @Override
         protected void damage(Rectangle r) {
             if (r != null) {
                 x = r.x - IBeamOverhang - 1;
@@ -121,6 +124,7 @@ public class MotifTextUI {
          * @param g the graphics context
          * @see #damage
          */
+        @Override
         @SuppressWarnings("deprecation")
         public void paint(Graphics g) {
             if(isVisible()) {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
index eef60ade9c9..7956023ed06 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicToggleButtonUI;
 
-import sun.awt.AppContext;
-
 /**
  * BasicToggleButton implementation.
  *
@@ -48,7 +46,7 @@ import sun.awt.AppContext;
  */
 public class MotifToggleButtonUI extends BasicToggleButtonUI
 {
-    private static final Object MOTIF_TOGGLE_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new MotifToggleButtonUI();
 
     protected Color selectColor;
 
@@ -58,19 +56,13 @@ public class MotifToggleButtonUI extends BasicToggleButtonUI
     //         Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        MotifToggleButtonUI motifToggleButtonUI =
-                (MotifToggleButtonUI) appContext.get(MOTIF_TOGGLE_BUTTON_UI_KEY);
-        if (motifToggleButtonUI == null) {
-            motifToggleButtonUI = new MotifToggleButtonUI();
-            appContext.put(MOTIF_TOGGLE_BUTTON_UI_KEY, motifToggleButtonUI);
-        }
-        return motifToggleButtonUI;
+        return UI;
     }
 
     // ********************************
     //          Install Defaults
     // ********************************
+    @Override
     public void installDefaults(AbstractButton b) {
         super.installDefaults(b);
         if(!defaults_initialized) {
@@ -80,6 +72,7 @@ public class MotifToggleButtonUI extends BasicToggleButtonUI
         LookAndFeel.installProperty(b, "opaque", Boolean.FALSE);
     }
 
+    @Override
     protected void uninstallDefaults(AbstractButton b) {
         super.uninstallDefaults(b);
         defaults_initialized = false;
@@ -96,6 +89,7 @@ public class MotifToggleButtonUI extends BasicToggleButtonUI
     // ********************************
     //         Paint Methods
     // ********************************
+    @Override
     protected void paintButtonPressed(Graphics g, AbstractButton b) {
         if (b.isContentAreaFilled()) {
             Color oldColor = g.getColor();
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
index 78ec251f05d..b060c62f24b 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,7 @@ public class MotifTreeCellRenderer extends DefaultTreeCellRenderer
             highlight = UIManager.getColor("Tree.iconHighlight");
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             g.setColor(bg);
 
@@ -90,10 +91,12 @@ public class MotifTreeCellRenderer extends DefaultTreeCellRenderer
             g.drawLine(x + 9, y + 8, x + 7, y + 6);
         }
 
+        @Override
         public int getIconWidth() {
             return LEAF_SIZE;
         }
 
+        @Override
         public int getIconHeight() {
             return LEAF_SIZE;
         }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
index 468ef4eb565..11313b9ad12 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,12 +54,14 @@ public class MotifTreeUI extends BasicTreeUI
         super();
     }
 
+    @Override
     public void installUI(JComponent c) {
         super.installUI(c);
     }
 
     // BasicTreeUI overrides
 
+    @Override
     protected void paintVerticalLine( Graphics g, JComponent c, int x, int top, int bottom )
       {
           if (tree.getComponentOrientation().isLeftToRight()) {
@@ -69,6 +71,7 @@ public class MotifTreeUI extends BasicTreeUI
           }
       }
 
+    @Override
     protected void paintHorizontalLine( Graphics g, JComponent c, int y, int left, int right )
       {
           g.fillRect( left, y, right - left + 1, 2 );
@@ -96,6 +99,7 @@ public class MotifTreeUI extends BasicTreeUI
             return new MotifExpandedIcon();
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             g.setColor(highlight);
             g.drawLine(x, y, x+SIZE-1, y);
@@ -113,7 +117,9 @@ public class MotifTreeUI extends BasicTreeUI
             g.drawLine(x+3, y+HALF_SIZE, x+SIZE-4, y+HALF_SIZE);
         }
 
+        @Override
         public int getIconWidth() { return SIZE; }
+        @Override
         public int getIconHeight() { return SIZE; }
     }
 
@@ -126,6 +132,7 @@ public class MotifTreeUI extends BasicTreeUI
             return new MotifCollapsedIcon();
         }
 
+        @Override
         public void paintIcon(Component c, Graphics g, int x, int y) {
             super.paintIcon(c, g, x, y);
             g.drawLine(x + HALF_SIZE-1, y + 3, x + HALF_SIZE-1, y + (SIZE - 4));
@@ -141,6 +148,7 @@ public class MotifTreeUI extends BasicTreeUI
      * Returns the default cell renderer that is used to do the
      * stamping of each node.
      */
+    @Override
     public TreeCellRenderer createDefaultCellRenderer() {
         return new MotifTreeCellRenderer();
     }
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
index ba03798f1fb..a0db2a421d1 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package com.sun.media.sound;
 
+import java.nio.ByteOrder;
 import java.util.StringTokenizer;
 
 /**
@@ -40,12 +41,6 @@ final class Platform {
 
     private static boolean isNativeLibLoaded;
 
-    // SYSTEM CHARACTERISTICS
-    // vary according to hardware architecture
-
-    // intel is little-endian.  sparc is big-endian.
-    private static boolean bigEndian;
-
     static {
         loadLibraries();
     }
@@ -66,7 +61,7 @@ final class Platform {
      * Determine whether the system is big-endian.
      */
     static boolean isBigEndian() {
-        return bigEndian;
+        return ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
     }
 
     /**
@@ -82,9 +77,6 @@ final class Platform {
             if (Printer.err) Printer.err("Couldn't load library "+libName+": "+t.toString());
             isNativeLibLoaded = false;
         }
-        if (isNativeLibLoaded) {
-            bigEndian = nIsBigEndian();
-        }
     }
 
     static boolean isMidiIOEnabled() {
@@ -98,7 +90,4 @@ final class Platform {
     static boolean isDirectAudioEnabled() {
         return isNativeLibLoaded;
     }
-
-    // the following native method is implemented in Platform.c
-    private static native boolean nIsBigEndian();
 }
diff --git a/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java b/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java
index fee1c9a4e19..395c000617b 100644
--- a/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java
+++ b/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import sun.awt.AppContext;
 import sun.swing.SwingAccessor;
 
 /**
@@ -80,11 +79,6 @@ public class AWTKeyStroke implements Serializable {
      */
     private static VKCollection vks;
 
-    //A key for the collection of AWTKeyStrokes within AppContext.
-    private static Object APP_CONTEXT_CACHE_KEY = new Object();
-    //A key within the cache
-    private static AWTKeyStroke APP_CONTEXT_KEYSTROKE_KEY = new AWTKeyStroke();
-
     /**
      * @serial The character value for a keyboard key.
      */
@@ -181,21 +175,19 @@ public class AWTKeyStroke implements Serializable {
     protected static void registerSubclass(Class<?> subclass) {
     }
 
+    private static Map<AWTKeyStroke, AWTKeyStroke> cache;
+    private static AWTKeyStroke cacheKey;
+
     private static synchronized AWTKeyStroke getCachedStroke
         (char keyChar, int keyCode, int modifiers, boolean onKeyRelease)
     {
-        @SuppressWarnings("unchecked")
-        Map<AWTKeyStroke, AWTKeyStroke> cache = (Map)AppContext.getAppContext().get(APP_CONTEXT_CACHE_KEY);
-        AWTKeyStroke cacheKey = (AWTKeyStroke)AppContext.getAppContext().get(APP_CONTEXT_KEYSTROKE_KEY);
 
         if (cache == null) {
             cache = new HashMap<>();
-            AppContext.getAppContext().put(APP_CONTEXT_CACHE_KEY, cache);
         }
 
         if (cacheKey == null) {
             cacheKey = SwingAccessor.getKeyStrokeAccessor().create();
-            AppContext.getAppContext().put(APP_CONTEXT_KEYSTROKE_KEY, cacheKey);
         }
 
         cacheKey.keyChar = keyChar;
@@ -203,11 +195,16 @@ public class AWTKeyStroke implements Serializable {
         cacheKey.modifiers = mapNewModifiers(mapOldModifiers(modifiers));
         cacheKey.onKeyRelease = onKeyRelease;
 
+        /* If there's no hit on the cache, then store this instance in the cache
+         * and null out the var so it isn't over-written.
+         * But if there's a hit, store it in cacheKey so it can be re-used
+         * next time this method is called.
+         */
         AWTKeyStroke stroke = cache.get(cacheKey);
         if (stroke == null) {
             stroke = cacheKey;
             cache.put(stroke, stroke);
-            AppContext.getAppContext().remove(APP_CONTEXT_KEYSTROKE_KEY);
+            cacheKey = null;
         }
         return stroke;
     }
diff --git a/src/java.desktop/share/classes/java/awt/Color.java b/src/java.desktop/share/classes/java/awt/Color.java
index 923afb91866..e129cbae23a 100644
--- a/src/java.desktop/share/classes/java/awt/Color.java
+++ b/src/java.desktop/share/classes/java/awt/Color.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -334,7 +334,7 @@ public class Color implements Paint, java.io.Serializable {
      * The actual color used in rendering depends
      * on finding the best match given the color space
      * available for a given output device.
-     * Alpha is defaulted to 255.
+     * Alpha defaults to 255.
      *
      * @throws IllegalArgumentException if {@code r}, {@code g}
      *        or {@code b} are outside of the range
@@ -378,12 +378,15 @@ public class Color implements Paint, java.io.Serializable {
     }
 
     /**
-     * Creates an opaque sRGB color with the specified combined RGB value
-     * consisting of the red component in bits 16-23, the green component
-     * in bits 8-15, and the blue component in bits 0-7.  The actual color
-     * used in rendering depends on finding the best match given the
-     * color space available for a particular output device.  Alpha is
-     * defaulted to 255.
+     * Creates an opaque sRGB color with the specified RGB value consisting of
+     * <ul>
+     *   <li>the red component in bits 16-23,
+     *   <li>the green component in bits 8-15, and
+     *   <li>the blue component in bits 0-7.
+     * </ul>
+     * The actual color used in rendering depends on finding the best match
+     * given the color space available for a particular output device. Alpha
+     * defaults to 255.
      *
      * @param rgb the combined RGB components
      * @see java.awt.image.ColorModel#getRGBdefault
@@ -397,14 +400,17 @@ public class Color implements Paint, java.io.Serializable {
     }
 
     /**
-     * Creates an sRGB color with the specified combined RGBA value consisting
-     * of the alpha component in bits 24-31, the red component in bits 16-23,
-     * the green component in bits 8-15, and the blue component in bits 0-7.
-     * If the {@code hasalpha} argument is {@code false}, alpha
-     * is defaulted to 255.
+     * Creates an sRGB color with the specified ARGB value consisting of
+     * <ul>
+     *   <li>the alpha component in bits 24-31,
+     *   <li>the red component in bits 16-23,
+     *   <li>the green component in bits 8-15, and
+     *   <li>the blue component in bits 0-7.
+     * </ul>
+     * If the {@code hasAlpha} argument is {@code false}, alpha defaults to 255.
      *
-     * @param rgba the combined RGBA components
-     * @param hasalpha {@code true} if the alpha bits are valid;
+     * @param argb the combined ARGB components
+     * @param hasAlpha {@code true} if the alpha bits are valid;
      *        {@code false} otherwise
      * @see java.awt.image.ColorModel#getRGBdefault
      * @see #getRed
@@ -413,17 +419,17 @@ public class Color implements Paint, java.io.Serializable {
      * @see #getAlpha
      * @see #getRGB
      */
-    public Color(int rgba, boolean hasalpha) {
-        if (hasalpha) {
-            value = rgba;
+    public Color(int argb, boolean hasAlpha) {
+        if (hasAlpha) {
+            value = argb;
         } else {
-            value = 0xff000000 | rgba;
+            value = 0xff000000 | argb;
         }
     }
 
     /**
      * Creates an opaque sRGB color with the specified red, green, and blue
-     * values in the range (0.0 - 1.0).  Alpha is defaulted to 1.0.  The
+     * values in the range (0.0 - 1.0).  Alpha defaults to 1.0.  The
      * actual color used in rendering depends on finding the best
      * match given the color space available for a particular output
      * device.
@@ -570,9 +576,14 @@ public class Color implements Paint, java.io.Serializable {
 
     /**
      * Returns the RGB value representing the color in the default sRGB
-     * {@link ColorModel}.
-     * (Bits 24-31 are alpha, 16-23 are red, 8-15 are green, 0-7 are
-     * blue).
+     * {@link ColorModel}, consisting of
+     * <ul>
+     *   <li>the alpha component in bits 24-31,
+     *   <li>the red component in bits 16-23,
+     *   <li>the green component in bits 8-15, and
+     *   <li>the blue component in bits 0-7.
+     * </ul>
+     *
      * @return the RGB value of the color in the default sRGB
      *         {@code ColorModel}.
      * @see java.awt.image.ColorModel#getRGBdefault
diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java
index e48255aaf00..7f021dcdb85 100644
--- a/src/java.desktop/share/classes/java/awt/Component.java
+++ b/src/java.desktop/share/classes/java/awt/Component.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -7938,7 +7938,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
             (this, temporary, focusedWindowChangeAllowed, time, cause);
         if (!success) {
             KeyboardFocusManager.getCurrentKeyboardFocusManager
-                (appContext).dequeueKeyEvents(time, this);
+                ().dequeueKeyEvents(time, this);
             if (focusLog.isLoggable(PlatformLogger.Level.FINEST)) {
                 focusLog.finest("Peer request failed");
             }
diff --git a/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java b/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
index 8ee336548d2..cf3c849829f 100644
--- a/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
+++ b/src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@ import java.util.ListIterator;
 import java.util.Set;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.awt.TimedWindowEvent;
 import sun.util.logging.PlatformLogger;
@@ -231,9 +230,8 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
         @Serial
         private static final long serialVersionUID = -2924743257508701758L;
 
-        public DefaultKeyboardFocusManagerSentEvent(AWTEvent nested,
-                                                    AppContext toNotify) {
-            super(nested, toNotify);
+        public DefaultKeyboardFocusManagerSentEvent(AWTEvent nested) {
+            super(nested);
         }
         public final void dispatch() {
             KeyboardFocusManager manager =
@@ -260,76 +258,12 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
     }
 
     /**
-     * Sends a synthetic AWTEvent to a Component. If the Component is in
-     * the current AppContext, then the event is immediately dispatched.
-     * If the Component is in a different AppContext, then the event is
-     * posted to the other AppContext's EventQueue, and this method blocks
-     * until the event is handled or target AppContext is disposed.
-     * Returns true if successfully dispatched event, false if failed
-     * to dispatch.
+     * Sends a synthetic AWTEvent to a Component.
      */
     static boolean sendMessage(Component target, AWTEvent e) {
         e.isPosted = true;
-        AppContext myAppContext = AppContext.getAppContext();
-        final AppContext targetAppContext = target.appContext;
-        final SentEvent se =
-            new DefaultKeyboardFocusManagerSentEvent(e, myAppContext);
-
-        if (myAppContext == targetAppContext) {
-            se.dispatch();
-        } else {
-            if (targetAppContext.isDisposed()) {
-                return false;
-            }
-            SunToolkit.postEvent(targetAppContext, se);
-            if (EventQueue.isDispatchThread()) {
-                if (Thread.currentThread() instanceof EventDispatchThread) {
-                    EventDispatchThread edt = (EventDispatchThread)
-                            Thread.currentThread();
-                    edt.pumpEvents(SentEvent.ID, new Conditional() {
-                        public boolean evaluate() {
-                            return !se.dispatched && !targetAppContext.isDisposed();
-                        }
-                    });
-                } else {
-                    if (fxAppThreadIsDispatchThread) {
-                        Thread fxCheckDispatchThread = new Thread() {
-                            @Override
-                            public void run() {
-                                while (!se.dispatched && !targetAppContext.isDisposed()) {
-                                    try {
-                                        Thread.sleep(100);
-                                    } catch (InterruptedException e) {
-                                        break;
-                                    }
-                                }
-                            }
-                        };
-                        fxCheckDispatchThread.start();
-                        try {
-                            // check if event is dispatched or disposed
-                            // but since this user app thread is same as
-                            // dispatch thread in fx when run with
-                            // javafx.embed.singleThread=true
-                            // we do not wait infinitely to avoid deadlock
-                            // as dispatch will ultimately be done by this thread
-                            fxCheckDispatchThread.join(500);
-                        } catch (InterruptedException ex) {
-                        }
-                    }
-                }
-            } else {
-                synchronized (se) {
-                    while (!se.dispatched && !targetAppContext.isDisposed()) {
-                        try {
-                            se.wait(1000);
-                        } catch (InterruptedException ie) {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
+        final SentEvent se = new DefaultKeyboardFocusManagerSentEvent(e);
+        se.dispatch();
         return se.dispatched;
     }
 
@@ -356,7 +290,7 @@ public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
                     // Check that the component awaiting focus belongs to
                     // the current focused window. See 8015454.
                     if (toplevel != null && toplevel.isFocused()) {
-                        SunToolkit.postEvent(AppContext.getAppContext(), new SequencedEvent(e));
+                        SunToolkit.postEvent(new SequencedEvent(e));
                         return true;
                     }
                 }
diff --git a/src/java.desktop/share/classes/java/awt/Font.java b/src/java.desktop/share/classes/java/awt/Font.java
index 0614163fb7f..cb811d5d533 100644
--- a/src/java.desktop/share/classes/java/awt/Font.java
+++ b/src/java.desktop/share/classes/java/awt/Font.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2709,7 +2709,7 @@ public class Font implements java.io.Serializable
                                          int limit,
                                          int flags) {
 
-        GlyphLayout gl = GlyphLayout.get(null); // !!! no custom layout engines
+        GlyphLayout gl = GlyphLayout.get();
         StandardGlyphVector gv = gl.layout(this, frc, text,
                                            start, limit-start, flags, null);
         GlyphLayout.done(gl);
diff --git a/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
index 348d0772cf4..06932d33f8a 100644
--- a/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
+++ b/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@ import java.util.WeakHashMap;
 
 import sun.util.logging.PlatformLogger;
 
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.awt.KeyboardFocusManagerPeerProvider;
 import sun.awt.AWTAccessor;
@@ -127,9 +126,6 @@ public abstract class KeyboardFocusManager
                 public void setMostRecentFocusOwner(Window window, Component component) {
                     KeyboardFocusManager.setMostRecentFocusOwner(window, component);
                 }
-                public KeyboardFocusManager getCurrentKeyboardFocusManager(AppContext ctx) {
-                    return KeyboardFocusManager.getCurrentKeyboardFocusManager(ctx);
-                }
                 public Container getCurrentFocusCycleRoot() {
                     return KeyboardFocusManager.currentFocusCycleRoot;
                 }
@@ -183,53 +179,40 @@ public abstract class KeyboardFocusManager
 
     static final int TRAVERSAL_KEY_LENGTH = DOWN_CYCLE_TRAVERSAL_KEYS + 1;
 
+    private static KeyboardFocusManager manager;
+
     /**
-     * Returns the current KeyboardFocusManager instance for the calling
-     * thread's context.
+     * Returns the current KeyboardFocusManager instance
      *
-     * @return this thread's context's KeyboardFocusManager
+     * @return the current KeyboardFocusManager
      * @see #setCurrentKeyboardFocusManager
      */
-    public static KeyboardFocusManager getCurrentKeyboardFocusManager() {
-        return getCurrentKeyboardFocusManager(AppContext.getAppContext());
-    }
-
-    static synchronized KeyboardFocusManager
-        getCurrentKeyboardFocusManager(AppContext appcontext)
-    {
-        KeyboardFocusManager manager = (KeyboardFocusManager)
-            appcontext.get(KeyboardFocusManager.class);
+    public static synchronized KeyboardFocusManager getCurrentKeyboardFocusManager() {
         if (manager == null) {
             manager = new DefaultKeyboardFocusManager();
-            appcontext.put(KeyboardFocusManager.class, manager);
         }
         return manager;
     }
 
     /**
-     * Sets the current KeyboardFocusManager instance for the calling thread's
-     * context. If null is specified, then the current KeyboardFocusManager
+     * Sets the current KeyboardFocusManager instance.
+     * If null is specified, then the current KeyboardFocusManager
      * is replaced with a new instance of DefaultKeyboardFocusManager.
      *
-     * @param newManager the new KeyboardFocusManager for this thread's context
+     * @param newManager the new KeyboardFocusManager
      * @see #getCurrentKeyboardFocusManager
      * @see DefaultKeyboardFocusManager
      */
     public static void setCurrentKeyboardFocusManager(KeyboardFocusManager newManager) {
 
-        KeyboardFocusManager oldManager = null;
+        KeyboardFocusManager oldManager = manager;
+
+        if (newManager == null) {
+             newManager = new DefaultKeyboardFocusManager();
+        }
 
         synchronized (KeyboardFocusManager.class) {
-            AppContext appcontext = AppContext.getAppContext();
-
-            if (newManager != null) {
-                oldManager = getCurrentKeyboardFocusManager(appcontext);
-
-                appcontext.put(KeyboardFocusManager.class, newManager);
-            } else {
-                oldManager = getCurrentKeyboardFocusManager(appcontext);
-                appcontext.remove(KeyboardFocusManager.class);
-            }
+             manager = newManager;
         }
 
         if (oldManager != null) {
@@ -344,7 +327,7 @@ public abstract class KeyboardFocusManager
     private static java.util.Map<Window, WeakReference<Component>> mostRecentFocusOwners = new WeakHashMap<>();
 
     /*
-     * SequencedEvent which is currently dispatched in AppContext.
+     * SequencedEvent which is currently dispatched.
      */
     transient SequencedEvent currentSequencedEvent = null;
 
@@ -431,13 +414,7 @@ public abstract class KeyboardFocusManager
      */
     public Component getFocusOwner() {
         synchronized (KeyboardFocusManager.class) {
-            if (focusOwner == null) {
-                return null;
-            }
-
-            return (focusOwner.appContext == AppContext.getAppContext())
-                ? focusOwner
-                : null;
+            return focusOwner;
         }
     }
 
@@ -599,42 +576,32 @@ public abstract class KeyboardFocusManager
     }
 
     /**
-     * Returns the permanent focus owner, if the permanent focus owner is in
-     * the same context as the calling thread. The permanent focus owner is
+     * Returns the permanent focus owner. The permanent focus owner is
      * defined as the last Component in an application to receive a permanent
      * FOCUS_GAINED event. The focus owner and permanent focus owner are
      * equivalent unless a temporary focus change is currently in effect. In
      * such a situation, the permanent focus owner will again be the focus
      * owner when the temporary focus change ends.
      *
-     * @return the permanent focus owner, or null if the permanent focus owner
-     *         is not a member of the calling thread's context
+     * @return the permanent focus owner, or null if there is none
      * @see #getGlobalPermanentFocusOwner
      * @see #setGlobalPermanentFocusOwner
      */
     public Component getPermanentFocusOwner() {
         synchronized (KeyboardFocusManager.class) {
-            if (permanentFocusOwner == null) {
-                return null;
-            }
-
-            return (permanentFocusOwner.appContext ==
-                    AppContext.getAppContext())
-                ? permanentFocusOwner
-                : null;
+            return permanentFocusOwner;
         }
     }
 
     /**
-     * Returns the permanent focus owner, even if the calling thread is in a
-     * different context than the permanent focus owner. The permanent focus
+     * Returns the permanent focus owner. The permanent focus
      * owner is defined as the last Component in an application to receive a
      * permanent FOCUS_GAINED event. The focus owner and permanent focus owner
      * are equivalent unless a temporary focus change is currently in effect.
      * In such a situation, the permanent focus owner will again be the focus
      * owner when the temporary focus change ends.
      *
-     * @return the permanent focus owner
+     * @return the permanent focus owner, or null if there is none
      * @see #getPermanentFocusOwner
      * @see #setGlobalPermanentFocusOwner
      */
@@ -701,24 +668,16 @@ public abstract class KeyboardFocusManager
     }
 
     /**
-     * Returns the focused Window, if the focused Window is in the same context
-     * as the calling thread. The focused Window is the Window that is or
-     * contains the focus owner.
+     * Returns the focused Window.
+     * The focused Window is the Window that is or contains the focus owner.
      *
-     * @return the focused Window, or null if the focused Window is not a
-     *         member of the calling thread's context
+     * @return the focused Window, or null if there is none
      * @see #getGlobalFocusedWindow
      * @see #setGlobalFocusedWindow
      */
     public Window getFocusedWindow() {
         synchronized (KeyboardFocusManager.class) {
-            if (focusedWindow == null) {
-                return null;
-            }
-
-            return (focusedWindow.appContext == AppContext.getAppContext())
-                ? focusedWindow
-                : null;
+            return focusedWindow;
         }
     }
 
@@ -785,27 +744,19 @@ public abstract class KeyboardFocusManager
     }
 
     /**
-     * Returns the active Window, if the active Window is in the same context
-     * as the calling thread. Only a Frame or a Dialog can be the active
+     * Returns the active Window. Only a Frame or a Dialog can be the active
      * Window. The native windowing system may denote the active Window or its
      * children with special decorations, such as a highlighted title bar.
      * The active Window is always either the focused Window, or the first
      * Frame or Dialog that is an owner of the focused Window.
      *
-     * @return the active Window, or null if the active Window is not a member
-     *         of the calling thread's context
+     * @return the active Window, or null if there is none
      * @see #getGlobalActiveWindow
      * @see #setGlobalActiveWindow
      */
     public Window getActiveWindow() {
         synchronized (KeyboardFocusManager.class) {
-            if (activeWindow == null) {
-                return null;
-            }
-
-            return (activeWindow.appContext == AppContext.getAppContext())
-                ? activeWindow
-                : null;
+            return activeWindow;
         }
     }
 
@@ -1100,14 +1051,7 @@ public abstract class KeyboardFocusManager
      */
     public Container getCurrentFocusCycleRoot() {
         synchronized (KeyboardFocusManager.class) {
-            if (currentFocusCycleRoot == null) {
-                return null;
-            }
-
-            return (currentFocusCycleRoot.appContext ==
-                    AppContext.getAppContext())
-                ? currentFocusCycleRoot
-                : null;
+            return currentFocusCycleRoot;
         }
     }
 
@@ -2159,7 +2103,7 @@ public abstract class KeyboardFocusManager
             descendant = heavyweight;
         }
 
-        KeyboardFocusManager manager = getCurrentKeyboardFocusManager(SunToolkit.targetToAppContext(descendant));
+        KeyboardFocusManager manager = getCurrentKeyboardFocusManager();
 
         FocusEvent currentFocusOwnerEvent = null;
         FocusEvent newFocusOwnerEvent = null;
@@ -2268,8 +2212,7 @@ public abstract class KeyboardFocusManager
             descendant = heavyweight;
         }
 
-        KeyboardFocusManager manager =
-            getCurrentKeyboardFocusManager(SunToolkit.targetToAppContext(descendant));
+        KeyboardFocusManager manager = getCurrentKeyboardFocusManager();
         KeyboardFocusManager thisManager = getCurrentKeyboardFocusManager();
         Component currentFocusOwner = thisManager.getGlobalFocusOwner();
         Component nativeFocusOwner = thisManager.getNativeFocusOwner();
@@ -2484,16 +2427,6 @@ public abstract class KeyboardFocusManager
         KeyboardFocusManager manager = getCurrentKeyboardFocusManager();
         LinkedList<LightweightFocusRequest> localLightweightRequests = null;
 
-        Component globalFocusOwner = manager.getGlobalFocusOwner();
-        if ((globalFocusOwner != null) &&
-            (globalFocusOwner.appContext != AppContext.getAppContext()))
-        {
-            // The current app context differs from the app context of a focus
-            // owner (and all pending lightweight requests), so we do nothing
-            // now and wait for a next event.
-            return;
-        }
-
         synchronized(heavyweightRequests) {
             if (currentLightweightRequests != null) {
                 clearingCurrentLightweightRequests = true;
diff --git a/src/java.desktop/share/classes/java/awt/MediaTracker.java b/src/java.desktop/share/classes/java/awt/MediaTracker.java
index f77816dc2e7..02310586c97 100644
--- a/src/java.desktop/share/classes/java/awt/MediaTracker.java
+++ b/src/java.desktop/share/classes/java/awt/MediaTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -184,7 +184,7 @@ public class MediaTracker implements java.io.Serializable {
      * @serial
      * @see #MediaTracker(Component)
      */
-    Component target;
+    final Component target;
     /**
      * The head of the list of {@code Images} that is being
      * tracked by the {@code MediaTracker}.
@@ -194,7 +194,7 @@ public class MediaTracker implements java.io.Serializable {
      * @see #removeImage(Image)
      */
     @SuppressWarnings("serial") // Not statically typed as Serializable
-    MediaEntry head;
+    private MediaEntry head;
 
     /**
      * Use serialVersionUID from JDK 1.1 for interoperability.
@@ -864,8 +864,8 @@ public class MediaTracker implements java.io.Serializable {
 }
 
 abstract class MediaEntry {
-    MediaTracker tracker;
-    int ID;
+    final MediaTracker tracker;
+    final int ID;
     MediaEntry next;
 
     int status;
@@ -897,7 +897,7 @@ abstract class MediaEntry {
         return head;
     }
 
-    int getID() {
+    final int getID() {
         return ID;
     }
 
@@ -935,12 +935,12 @@ abstract class MediaEntry {
  * The entry of the list of {@code Images} that is being tracked by the
  * {@code MediaTracker}.
  */
-class ImageMediaEntry extends MediaEntry implements ImageObserver,
+final class ImageMediaEntry extends MediaEntry implements ImageObserver,
 java.io.Serializable {
     @SuppressWarnings("serial") // Not statically typed as Serializable
-    Image image;
-    int width;
-    int height;
+    final Image image;
+    final int width;
+    final int height;
 
     /**
      * Use serialVersionUID from JDK 1.1 for interoperability.
@@ -959,10 +959,12 @@ java.io.Serializable {
         return (image == img && width == w && height == h);
     }
 
+    @Override
     Object getMedia() {
         return image;
     }
 
+    @Override
     synchronized int getStatus(boolean doLoad, boolean doVerify) {
         if (doVerify) {
             int flags = tracker.target.checkImage(image, width, height, null);
@@ -978,6 +980,7 @@ java.io.Serializable {
         return super.getStatus(doLoad, doVerify);
     }
 
+    @Override
     void startLoad() {
         if (tracker.target.prepareImage(image, width, height, this)) {
             setStatus(COMPLETE);
@@ -995,6 +998,7 @@ java.io.Serializable {
         return 0;
     }
 
+    @Override
     public boolean imageUpdate(Image img, int infoflags,
                                int x, int y, int w, int h) {
         if (cancelled) {
diff --git a/src/java.desktop/share/classes/java/awt/MenuComponent.java b/src/java.desktop/share/classes/java/awt/MenuComponent.java
index 1391a397f82..88ebbed96da 100644
--- a/src/java.desktop/share/classes/java/awt/MenuComponent.java
+++ b/src/java.desktop/share/classes/java/awt/MenuComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.ComponentFactory;
 
 /**
@@ -60,12 +59,6 @@ public abstract class MenuComponent implements java.io.Serializable {
     transient volatile MenuComponentPeer peer;
     transient volatile MenuContainer parent;
 
-    /**
-     * The {@code AppContext} of the {@code MenuComponent}.
-     * This is set in the constructor and never changes.
-     */
-    private transient volatile AppContext appContext;
-
     /**
      * The menu component's font. This value can be
      * {@code null} at which point a default will be used.
@@ -116,15 +109,6 @@ public abstract class MenuComponent implements java.io.Serializable {
     static {
         AWTAccessor.setMenuComponentAccessor(
             new AWTAccessor.MenuComponentAccessor() {
-                @Override
-                public AppContext getAppContext(MenuComponent menuComp) {
-                    return menuComp.appContext;
-                }
-                @Override
-                public void setAppContext(MenuComponent menuComp,
-                                          AppContext appContext) {
-                    menuComp.appContext = appContext;
-                }
                 @Override
                 @SuppressWarnings("unchecked")
                 public <T extends MenuComponentPeer> T getPeer(MenuComponent menuComp) {
@@ -154,7 +138,6 @@ public abstract class MenuComponent implements java.io.Serializable {
      */
     public MenuComponent() throws HeadlessException {
         GraphicsEnvironment.checkHeadless();
-        appContext = AppContext.getAppContext();
     }
 
     /**
@@ -428,8 +411,6 @@ public abstract class MenuComponent implements java.io.Serializable {
         GraphicsEnvironment.checkHeadless();
 
         s.defaultReadObject();
-
-        appContext = AppContext.getAppContext();
     }
 
     /*
diff --git a/src/java.desktop/share/classes/java/awt/ModalEventFilter.java b/src/java.desktop/share/classes/java/awt/ModalEventFilter.java
index 7941be89743..93956c34fc5 100644
--- a/src/java.desktop/share/classes/java/awt/ModalEventFilter.java
+++ b/src/java.desktop/share/classes/java/awt/ModalEventFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@ package java.awt;
 
 import java.awt.event.*;
 
-import sun.awt.AppContext;
-
 abstract class ModalEventFilter implements EventFilter {
 
     protected Dialog modalDialog;
@@ -129,20 +127,14 @@ abstract class ModalEventFilter implements EventFilter {
 
     private static class ToolkitModalEventFilter extends ModalEventFilter {
 
-        private AppContext appContext;
-
         ToolkitModalEventFilter(Dialog modalDialog) {
             super(modalDialog);
-            appContext = modalDialog.appContext;
         }
 
         protected FilterAction acceptWindow(Window w) {
             if (w.isModalExcluded(Dialog.ModalExclusionType.TOOLKIT_EXCLUDE)) {
                 return FilterAction.ACCEPT;
             }
-            if (w.appContext != appContext) {
-                return FilterAction.REJECT;
-            }
             while (w != null) {
                 if (w == modalDialog) {
                     return FilterAction.ACCEPT_IMMEDIATELY;
@@ -155,27 +147,21 @@ abstract class ModalEventFilter implements EventFilter {
 
     private static class ApplicationModalEventFilter extends ModalEventFilter {
 
-        private AppContext appContext;
-
         ApplicationModalEventFilter(Dialog modalDialog) {
             super(modalDialog);
-            appContext = modalDialog.appContext;
         }
 
         protected FilterAction acceptWindow(Window w) {
             if (w.isModalExcluded(Dialog.ModalExclusionType.APPLICATION_EXCLUDE)) {
                 return FilterAction.ACCEPT;
             }
-            if (w.appContext == appContext) {
-                while (w != null) {
-                    if (w == modalDialog) {
-                        return FilterAction.ACCEPT_IMMEDIATELY;
-                    }
-                    w = w.getOwner();
+            while (w != null) {
+                if (w == modalDialog) {
+                    return FilterAction.ACCEPT_IMMEDIATELY;
                 }
-                return FilterAction.REJECT;
+                w = w.getOwner();
             }
-            return FilterAction.ACCEPT;
+            return FilterAction.REJECT;
         }
     }
 
diff --git a/src/java.desktop/share/classes/java/awt/Robot.java b/src/java.desktop/share/classes/java/awt/Robot.java
index d887cad4f77..2a489a4cbf5 100644
--- a/src/java.desktop/share/classes/java/awt/Robot.java
+++ b/src/java.desktop/share/classes/java/awt/Robot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -459,6 +459,9 @@ public class Robot {
      * @return  Color of the pixel
      */
     public synchronized Color getPixelColor(int x, int y) {
+        // need to sync the toolkit prior to grabbing the pixels since in some
+        // cases rendering to the screen may be delayed
+        Toolkit.getDefaultToolkit().sync();
         Point point = peer.useAbsoluteCoordinates() ? toDeviceSpaceAbs(x, y)
                                                     : toDeviceSpace(x, y);
         return new Color(peer.getRGBPixel(point.x, point.y));
diff --git a/src/java.desktop/share/classes/java/awt/SystemTray.java b/src/java.desktop/share/classes/java/awt/SystemTray.java
index bf1871765eb..c873d849213 100644
--- a/src/java.desktop/share/classes/java/awt/SystemTray.java
+++ b/src/java.desktop/share/classes/java/awt/SystemTray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import java.beans.PropertyChangeSupport;
 import java.util.Vector;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.HeadlessToolkit;
 import sun.awt.SunToolkit;
 
@@ -213,6 +212,8 @@ public class SystemTray {
         }
     }
 
+    private Vector<TrayIcon> icons;
+
     /**
      * Adds a {@code TrayIcon} to the {@code SystemTray}.
      * The tray icon becomes visible in the system tray once it is
@@ -240,15 +241,10 @@ public class SystemTray {
         }
         TrayIcon[] oldArray;
         TrayIcon[] newArray;
-        Vector<TrayIcon> icons;
         synchronized (this) {
             oldArray = systemTray.getTrayIcons();
-            @SuppressWarnings("unchecked")
-            Vector<TrayIcon> tmp = (Vector<TrayIcon>)AppContext.getAppContext().get(TrayIcon.class);
-            icons = tmp;
             if (icons == null) {
                 icons = new Vector<>(3);
-                AppContext.getAppContext().put(TrayIcon.class, icons);
 
             } else if (icons.contains(trayIcon)) {
                 throw new IllegalArgumentException("adding TrayIcon that is already added");
@@ -291,8 +287,6 @@ public class SystemTray {
         TrayIcon[] newArray;
         synchronized (this) {
             oldArray = systemTray.getTrayIcons();
-            @SuppressWarnings("unchecked")
-            Vector<TrayIcon> icons = (Vector<TrayIcon>)AppContext.getAppContext().get(TrayIcon.class);
             // TrayIcon with no peer is not contained in the array.
             if (icons == null || !icons.remove(trayIcon)) {
                 return;
@@ -320,12 +314,12 @@ public class SystemTray {
      * @see TrayIcon
      */
     public TrayIcon[] getTrayIcons() {
-        @SuppressWarnings("unchecked")
-        Vector<TrayIcon> icons = (Vector<TrayIcon>)AppContext.getAppContext().get(TrayIcon.class);
-        if (icons != null) {
-            return icons.toArray(EMPTY_TRAY_ARRAY);
+        synchronized (this) {
+            if (icons != null) {
+                return icons.toArray(EMPTY_TRAY_ARRAY);
+            }
+            return EMPTY_TRAY_ARRAY;
         }
-        return EMPTY_TRAY_ARRAY;
     }
 
     /**
@@ -374,8 +368,6 @@ public class SystemTray {
      * </tbody>
      * </table>
      * <p>
-     * The {@code listener} listens to property changes only in this context.
-     * <p>
      * If {@code listener} is {@code null}, no exception is thrown
      * and no action is performed.
      *
@@ -398,8 +390,6 @@ public class SystemTray {
      * Removes a {@code PropertyChangeListener} from the listener list
      * for a specific property.
      * <p>
-     * The {@code PropertyChangeListener} must be from this context.
-     * <p>
      * If {@code propertyName} or {@code listener} is {@code null} or invalid,
      * no exception is thrown and no action is taken.
      *
@@ -421,8 +411,6 @@ public class SystemTray {
     /**
      * Returns an array of all the listeners that have been associated
      * with the named property.
-     * <p>
-     * Only the listeners in this context are returned.
      *
      * @param propertyName the specified property
      * @return all of the {@code PropertyChangeListener}s associated with
@@ -461,19 +449,16 @@ public class SystemTray {
         getCurrentChangeSupport().firePropertyChange(propertyName, oldValue, newValue);
     }
 
+    private PropertyChangeSupport changeSupport;
+
     /**
-     * Returns the current PropertyChangeSupport instance for the
-     * calling thread's context.
+     * Returns the current PropertyChangeSupport instance
      *
-     * @return this thread's context's PropertyChangeSupport
+     * @return the current PropertyChangeSupport for this {@code SystemTray}
      */
     private synchronized PropertyChangeSupport getCurrentChangeSupport() {
-        PropertyChangeSupport changeSupport =
-            (PropertyChangeSupport)AppContext.getAppContext().get(SystemTray.class);
-
         if (changeSupport == null) {
             changeSupport = new PropertyChangeSupport(this);
-            AppContext.getAppContext().put(SystemTray.class, changeSupport);
         }
         return changeSupport;
     }
diff --git a/src/java.desktop/share/classes/java/awt/TrayIcon.java b/src/java.desktop/share/classes/java/awt/TrayIcon.java
index b53174ef05e..c72c018867c 100644
--- a/src/java.desktop/share/classes/java/awt/TrayIcon.java
+++ b/src/java.desktop/share/classes/java/awt/TrayIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@ package java.awt;
 
 import java.awt.event.*;
 import java.awt.peer.TrayIconPeer;
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.awt.AWTAccessor;
 import sun.awt.HeadlessToolkit;
@@ -126,7 +125,7 @@ public class TrayIcon {
         if (!SystemTray.isSupported()) {
             throw new UnsupportedOperationException();
         }
-        SunToolkit.insertTargetMapping(this, AppContext.getAppContext());
+        SunToolkit.insertTargetMapping(this);
     }
 
     /**
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java b/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java
index f4a39c43e04..89cde4b0ef0 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,6 +200,7 @@ public class ICC_ColorSpace extends ColorSpace {
      *         the number of components in this {@code ColorSpace}
      * @throws NullPointerException if {@code colorvalue} is {@code null}
      */
+    @Override
     public float[] toRGB(float[] colorvalue) {
         if (this2srgb == null) {
             synchronized (this) {
@@ -249,6 +250,7 @@ public class ICC_ColorSpace extends ColorSpace {
      * @throws ArrayIndexOutOfBoundsException if array length is not at least 3
      * @throws NullPointerException if {@code rgbvalue} is {@code null}
      */
+    @Override
     public float[] fromRGB(float[] rgbvalue) {
         if (srgb2this == null) {
             synchronized (this) {
@@ -378,6 +380,7 @@ public class ICC_ColorSpace extends ColorSpace {
      *         the number of components in this {@code ColorSpace}
      * @throws NullPointerException if {@code colorvalue} is {@code null}
      */
+    @Override
     public float[] toCIEXYZ(float[] colorvalue) {
         if (this2xyz == null) {
             synchronized (this) {
@@ -510,6 +513,7 @@ public class ICC_ColorSpace extends ColorSpace {
      * @throws ArrayIndexOutOfBoundsException if array length is not at least 3
      * @throws NullPointerException if {@code colorvalue} is {@code null}
      */
+    @Override
     public float[] fromCIEXYZ(float[] colorvalue) {
         if (xyz2this == null) {
             synchronized (this) {
@@ -560,6 +564,7 @@ public class ICC_ColorSpace extends ColorSpace {
      *         than {@code numComponents - 1}
      * @since 1.4
      */
+    @Override
     public float getMinValue(int component) {
         rangeCheck(component);
         return minVal[component];
@@ -583,6 +588,7 @@ public class ICC_ColorSpace extends ColorSpace {
      *         than {@code numComponents - 1}
      * @since 1.4
      */
+    @Override
     public float getMaxValue(int component) {
         rangeCheck(component);
         return maxVal[component];
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
index f8de7d1581d..85b4b28b487 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileGray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,6 +100,7 @@ public final class ICC_ProfileGray extends ICC_Profile {
      * @return an array containing the components of the mediaWhitePointTag in
      *         the ICC profile
      */
+    @Override
     public float[] getMediaWhitePoint() {
         return super.getMediaWhitePoint();
     }
diff --git a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
index 1c7fab265ac..9069c898261 100644
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ProfileRGB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,6 +135,7 @@ public final class ICC_ProfileRGB extends ICC_Profile {
      * @return a 3-element {@code float} array containing the x, y, and z
      *         components of the profile's {@code mediaWhitePointTag}
      */
+    @Override
     public float[] getMediaWhitePoint() {
         return super.getMediaWhitePoint();
     }
@@ -186,6 +187,7 @@ public final class ICC_ProfileRGB extends ICC_Profile {
      * @throws ProfileDataException if the profile does not specify the
      *         corresponding TRC as a single gamma value
      */
+    @Override
     public float getGamma(int component) {
         return super.getGamma(toTag(component));
     }
@@ -218,6 +220,7 @@ public final class ICC_ProfileRGB extends ICC_Profile {
      * @throws ProfileDataException if the profile does not specify the
      *         corresponding TRC as a table
      */
+    @Override
     public short[] getTRC(int component) {
         return super.getTRC(toTag(component));
     }
diff --git a/src/java.desktop/share/classes/java/awt/event/FocusEvent.java b/src/java.desktop/share/classes/java/awt/event/FocusEvent.java
index 27da2e8b4bb..e39e9c317b0 100644
--- a/src/java.desktop/share/classes/java/awt/event/FocusEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/FocusEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import java.io.ObjectStreamException;
 import java.io.Serial;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 
 /**
@@ -326,21 +325,14 @@ public class FocusEvent extends ComponentEvent {
      * FOCUS_GAINED event, this is the Component that lost focus. For a
      * FOCUS_LOST event, this is the Component that gained focus. If this
      * focus change occurs with a native application, with a Java application
-     * in a different VM or context, or with no other Component, then null is
+     * in a different VM, or with no other Component, then null is
      * returned.
      *
      * @return the other Component involved in the focus change, or null
      * @since 1.4
      */
     public Component getOppositeComponent() {
-        if (opposite == null) {
-            return null;
-        }
-
-        return (SunToolkit.targetToAppContext(opposite) ==
-                AppContext.getAppContext())
-                ? opposite
-                : null;
+        return opposite;
     }
 
     /**
@@ -407,4 +399,4 @@ public class FocusEvent extends ComponentEvent {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/java.desktop/share/classes/java/awt/geom/Arc2D.java b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
index 6646a14537e..7402dc98691 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package java.awt.geom;
 
+import java.awt.Rectangle;
 import java.io.IOException;
 import java.io.Serial;
 import java.io.Serializable;
@@ -1052,19 +1053,7 @@ public abstract class Arc2D extends RectangularShape {
     }
 
     /**
-     * Returns the high-precision framing rectangle of the arc.  The framing
-     * rectangle contains only the part of this {@code Arc2D} that is
-     * in between the starting and ending angles and contains the pie
-     * wedge, if this {@code Arc2D} has a {@code PIE} closure type.
-     * <p>
-     * This method differs from the
-     * {@link RectangularShape#getBounds() getBounds} in that the
-     * {@code getBounds} method only returns the bounds of the
-     * enclosing ellipse of this {@code Arc2D} without considering
-     * the starting and ending angles of this {@code Arc2D}.
-     *
-     * @return the {@code Rectangle2D} that represents the arc's
-     * framing rectangle.
+     * {@inheritDoc java.awt.Shape}
      * @since 1.2
      */
     public Rectangle2D getBounds2D() {
@@ -1110,6 +1099,15 @@ public abstract class Arc2D extends RectangularShape {
         return makeBounds(x1, y1, x2, y2);
     }
 
+    /**
+     * {@inheritDoc java.awt.Shape}
+     * @since 1.2
+     */
+    @Override
+    public Rectangle getBounds() {
+        return getBounds2D().getBounds();
+    }
+
     /**
      * Constructs a {@code Rectangle2D} of the appropriate precision
      * to hold the parameters calculated to be the framing rectangle
diff --git a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
index d15a8d214aa..4460b0fc101 100644
--- a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -503,7 +503,11 @@ public class ComponentSampleModel extends SampleModel
     }
 
     /** Returns the number of bits per sample for the specified band.
-     *  @param band the specified band
+     * <p>
+     * Since all bands of a {@code ComponentSampleModel} are the same
+     * size, this method ignores the {@code band} parameter and returns
+     * the size of the first (0th) band.
+     *  @param band the specified band (ignored)
      *  @return the number of bits per sample for the specified band.
      */
     public final int getSampleSize(int band) {
diff --git a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
index a79ddf52cd9..d8f97562c6c 100644
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -235,7 +235,11 @@ public class MultiPixelPackedSampleModel extends SampleModel
 
     /**
      * Returns the number of bits per sample for the specified band.
-     * @param band the specified band
+     * <p>
+     * Since {@code MultiPixelPackedSampleModel} has only one band,
+     * this method ignores the {@code band} parameter and returns
+     * the sample size of the single band.
+     * @param band the specified band (ignored)
      * @return the number of bits per sample for the specified band.
      */
     public int getSampleSize(int band) {
diff --git a/src/java.desktop/share/classes/java/awt/image/Raster.java b/src/java.desktop/share/classes/java/awt/image/Raster.java
index 053e7c1eec5..3312a39b693 100644
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -452,6 +452,9 @@ public class Raster {
             throw new IllegalArgumentException("Dimensions (width="+w+
                                                " height="+h+") are too large");
         }
+        if (scanlineStride < 0) {
+            throw new IllegalArgumentException("Scanline stride must be >= 0");
+        }
         if (bankIndices == null) {
             throw new
                 ArrayIndexOutOfBoundsException("Bank indices array is null");
diff --git a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
index d12c151a8fd..2ab226ea227 100644
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -250,7 +250,12 @@ public class SinglePixelPackedSampleModel extends SampleModel
         return bitSizes.clone();
     }
 
-    /** Returns the number of bits per sample for the specified band. */
+    /** Returns the number of bits per sample for the specified band.
+     * @param band the specified band
+     * @return the size of the samples of the specified band.
+     * @throws ArrayIndexOutOfBoundsException if the {@code band} index
+     * is less than zero or greater than or equal to {@code getNumBands()}
+     */
     public int getSampleSize(int band) {
         return bitSizes[band];
     }
diff --git a/src/java.desktop/share/classes/java/beans/BeanDescriptor.java b/src/java.desktop/share/classes/java/beans/BeanDescriptor.java
index e0428abb3b9..f276b6086af 100644
--- a/src/java.desktop/share/classes/java/beans/BeanDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/BeanDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,6 +118,7 @@ public class BeanDescriptor extends FeatureDescriptor {
         customizerClassRef = old.customizerClassRef;
     }
 
+    @Override
     void appendTo(StringBuilder sb) {
         appendTo(sb, "beanClass", this.beanClassRef);
         appendTo(sb, "customizerClass", this.customizerClassRef);
diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index db94f413ccc..de706fe4451 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -340,6 +340,7 @@ class ObjectInputStreamWithLoader extends ObjectInputStream
     /**
      * Use the given ClassLoader rather than using the system class
      */
+    @Override
     @SuppressWarnings("rawtypes")
     protected Class resolveClass(ObjectStreamClass classDesc)
         throws IOException, ClassNotFoundException {
diff --git a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
index 8e4d3f0577c..a305ce81b3c 100644
--- a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
      *
      * @see #DefaultPersistenceDelegate(String[])
      */
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         // Assume the instance is either mutable or a singleton
         // if it has a nullary constructor.
@@ -153,6 +154,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
      *
      * @see #DefaultPersistenceDelegate(String[])
      */
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         int nArgs = constructor.length;
         Class<?> type = oldInstance.getClass();
@@ -393,6 +395,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
      * @see java.beans.Introspector#getBeanInfo
      * @see java.beans.PropertyDescriptor
      */
+    @Override
     protected void initialize(Class<?> type,
                               Object oldInstance, Object newInstance,
                               Encoder out)
diff --git a/src/java.desktop/share/classes/java/beans/EventHandler.java b/src/java.desktop/share/classes/java/beans/EventHandler.java
index cdda3d940d5..60f4e7bafda 100644
--- a/src/java.desktop/share/classes/java/beans/EventHandler.java
+++ b/src/java.desktop/share/classes/java/beans/EventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -415,6 +415,7 @@ public class EventHandler implements InvocationHandler {
      *
      * @see EventHandler
      */
+    @Override
     public Object invoke(final Object proxy, final Method method, final Object[] arguments) {
         String methodName = method.getName();
         if (method.getDeclaringClass() == Object.class)  {
diff --git a/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
index 8826ff27902..5855fabf2e5 100644
--- a/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -536,6 +536,7 @@ public class EventSetDescriptor extends FeatureDescriptor {
         inDefaultEventSet = old.inDefaultEventSet;
     }
 
+    @Override
     void appendTo(StringBuilder sb) {
         appendTo(sb, "unicast", this.unicast);
         appendTo(sb, "inDefaultEventSet", this.inDefaultEventSet);
diff --git a/src/java.desktop/share/classes/java/beans/Expression.java b/src/java.desktop/share/classes/java/beans/Expression.java
index 21e9e4a4dc0..94fbb76fda3 100644
--- a/src/java.desktop/share/classes/java/beans/Expression.java
+++ b/src/java.desktop/share/classes/java/beans/Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,6 +169,7 @@ public class Expression extends Statement {
         this.value = value;
     }
 
+    @Override
     /*pp*/ String instanceName(Object instance) {
         return instance == unbound ? "<unbound>" : super.instanceName(instance);
     }
@@ -176,6 +177,7 @@ public class Expression extends Statement {
     /**
      * Prints the value of this expression using a Java-style syntax.
      */
+    @Override
     public String toString() {
         return instanceName(value) + "=" + super.toString();
     }
diff --git a/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java b/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java
index 0756d39da7a..ea1bc64534e 100644
--- a/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/FeatureDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -406,6 +406,7 @@ public class FeatureDescriptor {
      *
      * @since 1.7
      */
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(getClass().getName());
         sb.append("[name=").append(this.name);
diff --git a/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
index 90c0fb109d2..0886f1fc23d 100644
--- a/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
+++ b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,7 @@ public class IndexedPropertyChangeEvent extends PropertyChangeEvent {
         return index;
     }
 
+    @Override
     void appendTo(StringBuilder sb) {
         sb.append("; index=").append(getIndex());
     }
diff --git a/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
index a46c8ec9d6e..d0a9529e325 100644
--- a/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/IndexedPropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -400,6 +400,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
      *
      * @since 1.4
      */
+    @Override
     public boolean equals(Object obj) {
         // Note: This would be identical to PropertyDescriptor but they don't
         // share the same fields.
@@ -485,6 +486,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
         indexedReadMethodName = old.indexedReadMethodName;
     }
 
+    @Override
     void updateGenericsFor(Class<?> type) {
         super.updateGenericsFor(type);
         try {
@@ -502,6 +504,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
      * @return a hash code value for this object.
      * @since 1.5
      */
+    @Override
     public int hashCode() {
         int result = super.hashCode();
 
@@ -515,6 +518,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor {
         return result;
     }
 
+    @Override
     void appendTo(StringBuilder sb) {
         super.appendTo(sb);
         appendTo(sb, "indexedPropertyType", this.indexedPropertyTypeRef);
diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
index 564021104a7..cce046b8ec0 100644
--- a/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1345,30 +1345,37 @@ class GenericBeanInfo extends SimpleBeanInfo {
         this.targetBeanInfoRef = old.targetBeanInfoRef;
     }
 
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         return properties;
     }
 
+    @Override
     public int getDefaultPropertyIndex() {
         return defaultProperty;
     }
 
+    @Override
     public EventSetDescriptor[] getEventSetDescriptors() {
         return events;
     }
 
+    @Override
     public int getDefaultEventIndex() {
         return defaultEvent;
     }
 
+    @Override
     public MethodDescriptor[] getMethodDescriptors() {
         return methods;
     }
 
+    @Override
     public BeanDescriptor getBeanDescriptor() {
         return beanDescriptor;
     }
 
+    @Override
     public java.awt.Image getIcon(int iconKind) {
         BeanInfo targetBeanInfo = getTargetBeanInfo();
         if (targetBeanInfo != null) {
diff --git a/src/java.desktop/share/classes/java/beans/MetaData.java b/src/java.desktop/share/classes/java/beans/MetaData.java
index 347ac8ad555..baed32af44d 100644
--- a/src/java.desktop/share/classes/java/beans/MetaData.java
+++ b/src/java.desktop/share/classes/java/beans/MetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,10 +66,13 @@ class MetaData {
 static final class NullPersistenceDelegate extends PersistenceDelegate {
     // Note this will be called by all classes when they reach the
     // top of their superclass chain.
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
     }
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) { return null; }
 
+    @Override
     public void writeObject(Object oldInstance, Encoder out) {
     // System.out.println("NullPersistenceDelegate:writeObject " + oldInstance);
     }
@@ -81,10 +84,12 @@ static final class NullPersistenceDelegate extends PersistenceDelegate {
  * @author Sergey A. Malenkov
  */
 static final class EnumPersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance == newInstance;
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Enum<?> e = (Enum<?>) oldInstance;
         return new Expression(e, Enum.class, "valueOf", new Object[]{e.getDeclaringClass(), e.name()});
@@ -92,10 +97,12 @@ static final class EnumPersistenceDelegate extends PersistenceDelegate {
 }
 
 static final class PrimitivePersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         return new Expression(oldInstance, oldInstance.getClass(),
                   "new", new Object[]{oldInstance.toString()});
@@ -103,12 +110,14 @@ static final class PrimitivePersistenceDelegate extends PersistenceDelegate {
 }
 
 static final class ArrayPersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return (newInstance != null &&
                 oldInstance.getClass() == newInstance.getClass() && // Also ensures the subtype is correct.
                 Array.getLength(oldInstance) == Array.getLength(newInstance));
         }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         // System.out.println("instantiate: " + type + " " + oldInstance);
         Class<?> oldClass = oldInstance.getClass();
@@ -117,6 +126,7 @@ static final class ArrayPersistenceDelegate extends PersistenceDelegate {
                                 Array.getLength(oldInstance)});
         }
 
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         int n = Array.getLength(oldInstance);
         for (int i = 0; i < n; i++) {
@@ -144,6 +154,7 @@ static final class ArrayPersistenceDelegate extends PersistenceDelegate {
 }
 
 static final class ProxyPersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Class<?> type = oldInstance.getClass();
         java.lang.reflect.Proxy p = (java.lang.reflect.Proxy)oldInstance;
@@ -180,8 +191,10 @@ static final class ProxyPersistenceDelegate extends PersistenceDelegate {
 
 // Strings
 static final class java_lang_String_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) { return null; }
 
+    @Override
     public void writeObject(Object oldInstance, Encoder out) {
         // System.out.println("NullPersistenceDelegate:writeObject " + oldInstance);
     }
@@ -189,10 +202,12 @@ static final class java_lang_String_PersistenceDelegate extends PersistenceDeleg
 
 // Classes
 static final class java_lang_Class_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Class<?> c = (Class)oldInstance;
         // As of 1.3 it is not possible to call Class.forName("int"),
@@ -223,10 +238,12 @@ static final class java_lang_Class_PersistenceDelegate extends PersistenceDelega
 
 // Fields
 static final class java_lang_reflect_Field_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Field f = (Field)oldInstance;
         return new Expression(oldInstance,
@@ -238,10 +255,12 @@ static final class java_lang_reflect_Field_PersistenceDelegate extends Persisten
 
 // Methods
 static final class java_lang_reflect_Method_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Method m = (Method)oldInstance;
         return new Expression(oldInstance,
@@ -262,6 +281,7 @@ static final class java_lang_reflect_Method_PersistenceDelegate extends Persiste
  * @author Sergey A. Malenkov
  */
 static class java_util_Date_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         if (!super.mutatesTo(oldInstance, newInstance)) {
             return false;
@@ -272,6 +292,7 @@ static class java_util_Date_PersistenceDelegate extends PersistenceDelegate {
         return oldDate.getTime() == newDate.getTime();
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Date date = (Date)oldInstance;
         return new Expression(date, date.getClass(), "new", new Object[] {date.getTime()});
@@ -318,6 +339,7 @@ static final class java_sql_Timestamp_PersistenceDelegate extends java_util_Date
         }
     }
 
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         // assumes oldInstance and newInstance are Timestamps
         int nanos = getNanos(oldInstance);
@@ -349,6 +371,7 @@ delegates to be registered with concrete classes.
  * @author Sergey A. Malenkov
  */
 private abstract static class java_util_Collections extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         if (!super.mutatesTo(oldInstance, newInstance)) {
             return false;
@@ -361,29 +384,34 @@ private abstract static class java_util_Collections extends PersistenceDelegate
         return (oldC.size() == newC.size()) && oldC.containsAll(newC);
     }
 
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         // do not initialize these custom collections in default way
     }
 
     static final class EmptyList_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             return new Expression(oldInstance, Collections.class, "emptyList", null);
         }
     }
 
     static final class EmptySet_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             return new Expression(oldInstance, Collections.class, "emptySet", null);
         }
     }
 
     static final class EmptyMap_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             return new Expression(oldInstance, Collections.class, "emptyMap", null);
         }
     }
 
     static final class SingletonList_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = (List<?>) oldInstance;
             return new Expression(oldInstance, Collections.class, "singletonList", new Object[]{list.get(0)});
@@ -391,6 +419,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SingletonSet_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             Set<?> set = (Set<?>) oldInstance;
             return new Expression(oldInstance, Collections.class, "singleton", new Object[]{set.iterator().next()});
@@ -398,6 +427,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SingletonMap_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             Map<?,?> map = (Map<?,?>) oldInstance;
             Object key = map.keySet().iterator().next();
@@ -406,6 +436,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableCollection_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = new ArrayList<>((Collection<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableCollection", new Object[]{list});
@@ -413,6 +444,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableList_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = new LinkedList<>((Collection<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableList", new Object[]{list});
@@ -420,6 +452,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableRandomAccessList_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = new ArrayList<>((Collection<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableList", new Object[]{list});
@@ -427,6 +460,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableSet_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             Set<?> set = new HashSet<>((Set<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableSet", new Object[]{set});
@@ -434,6 +468,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableSortedSet_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             SortedSet<?> set = new TreeSet<>((SortedSet<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableSortedSet", new Object[]{set});
@@ -441,6 +476,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableMap_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             Map<?,?> map = new HashMap<>((Map<?,?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableMap", new Object[]{map});
@@ -448,6 +484,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class UnmodifiableSortedMap_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             SortedMap<?,?> map = new TreeMap<>((SortedMap<?,?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "unmodifiableSortedMap", new Object[]{map});
@@ -455,6 +492,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedCollection_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = new ArrayList<>((Collection<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedCollection", new Object[]{list});
@@ -462,6 +500,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedList_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = new LinkedList<>((Collection<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedList", new Object[]{list});
@@ -469,6 +508,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedRandomAccessList_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             List<?> list = new ArrayList<>((Collection<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedList", new Object[]{list});
@@ -476,6 +516,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedSet_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             Set<?> set = new HashSet<>((Set<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedSet", new Object[]{set});
@@ -483,6 +524,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedSortedSet_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             SortedSet<?> set = new TreeSet<>((SortedSet<?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedSortedSet", new Object[]{set});
@@ -490,6 +532,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedMap_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             Map<?,?> map = new HashMap<>((Map<?,?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedMap", new Object[]{map});
@@ -497,6 +540,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
     }
 
     static final class SynchronizedSortedMap_PersistenceDelegate extends java_util_Collections {
+        @Override
         protected Expression instantiate(Object oldInstance, Encoder out) {
             SortedMap<?,?> map = new TreeMap<>((SortedMap<?,?>) oldInstance);
             return new Expression(oldInstance, Collections.class, "synchronizedSortedMap", new Object[]{map});
@@ -506,6 +550,7 @@ private abstract static class java_util_Collections extends PersistenceDelegate
 
 // Collection
 static class java_util_Collection_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         java.util.Collection<?> oldO = (java.util.Collection)oldInstance;
         java.util.Collection<?> newO = (java.util.Collection)newInstance;
@@ -521,6 +566,7 @@ static class java_util_Collection_PersistenceDelegate extends DefaultPersistence
 
 // List
 static class java_util_List_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         java.util.List<?> oldO = (java.util.List<?>)oldInstance;
         java.util.List<?> newO = (java.util.List<?>)newInstance;
@@ -556,6 +602,7 @@ static class java_util_List_PersistenceDelegate extends DefaultPersistenceDelega
 
 // Map
 static class java_util_Map_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         // System.out.println("Initializing: " + newInstance);
         java.util.Map<?,?> oldMap = (java.util.Map)oldInstance;
@@ -612,10 +659,12 @@ static final class java_beans_beancontext_BeanContextSupport_PersistenceDelegate
  * @author Sergey A. Malenkov
  */
 static final class java_awt_Insets_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Insets insets = (Insets) oldInstance;
         Object[] args = new Object[] {
@@ -636,10 +685,12 @@ static final class java_awt_Insets_PersistenceDelegate extends PersistenceDelega
  * @author Sergey A. Malenkov
  */
 static final class java_awt_Font_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Font font = (Font) oldInstance;
 
@@ -705,10 +756,12 @@ static final class java_awt_Font_PersistenceDelegate extends PersistenceDelegate
  * @author Sergey A. Malenkov
  */
 static final class java_awt_AWTKeyStroke_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         AWTKeyStroke key = (AWTKeyStroke) oldInstance;
 
@@ -760,10 +813,12 @@ static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
         }
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         throw new RuntimeException("Unrecognized instance: " + oldInstance);
     }
 
+    @Override
     public void writeObject(Object oldInstance, Encoder out) {
         if (out.getAttribute(this) == null) {
             out.setAttribute(this, Boolean.TRUE);
@@ -781,10 +836,12 @@ static final class java_awt_font_TextAttribute_PersistenceDelegate extends Stati
 
 // MenuShortcut
 static final class java_awt_MenuShortcut_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         java.awt.MenuShortcut m = (java.awt.MenuShortcut)oldInstance;
         return new Expression(oldInstance, m.getClass(), "new",
@@ -794,6 +851,7 @@ static final class java_awt_MenuShortcut_PersistenceDelegate extends Persistence
 
 // Component
 static final class java_awt_Component_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Component c = (java.awt.Component)oldInstance;
@@ -841,6 +899,7 @@ static final class java_awt_Component_PersistenceDelegate extends DefaultPersist
 
 // Container
 static final class java_awt_Container_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         // Ignore the children of a JScrollPane.
@@ -876,6 +935,7 @@ static final class java_awt_Container_PersistenceDelegate extends DefaultPersist
 
 // Choice
 static final class java_awt_Choice_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Choice m = (java.awt.Choice)oldInstance;
@@ -888,6 +948,7 @@ static final class java_awt_Choice_PersistenceDelegate extends DefaultPersistenc
 
 // Menu
 static final class java_awt_Menu_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Menu m = (java.awt.Menu)oldInstance;
@@ -900,6 +961,7 @@ static final class java_awt_Menu_PersistenceDelegate extends DefaultPersistenceD
 
 // MenuBar
 static final class java_awt_MenuBar_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.MenuBar m = (java.awt.MenuBar)oldInstance;
@@ -912,6 +974,7 @@ static final class java_awt_MenuBar_PersistenceDelegate extends DefaultPersisten
 
 // List
 static final class java_awt_List_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.List m = (java.awt.List)oldInstance;
@@ -958,6 +1021,7 @@ static final class java_awt_BorderLayout_PersistenceDelegate extends DefaultPers
 
 // CardLayout
 static final class java_awt_CardLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance,
                               Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
@@ -969,6 +1033,7 @@ static final class java_awt_CardLayout_PersistenceDelegate extends DefaultPersis
             }
         }
     }
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return super.mutatesTo(oldInstance, newInstance) && getVector(newInstance).isEmpty();
     }
@@ -979,6 +1044,7 @@ static final class java_awt_CardLayout_PersistenceDelegate extends DefaultPersis
 
 // GridBagLayout
 static final class java_awt_GridBagLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance,
                               Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
@@ -989,6 +1055,7 @@ static final class java_awt_GridBagLayout_PersistenceDelegate extends DefaultPer
             }
         }
     }
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return super.mutatesTo(oldInstance, newInstance) && getHashtable(newInstance).isEmpty();
     }
@@ -1003,6 +1070,7 @@ static final class java_awt_GridBagLayout_PersistenceDelegate extends DefaultPer
 // will be issued before we have added all the children to the JFrame and
 // will appear blank).
 static final class javax_swing_JFrame_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         java.awt.Window oldC = (java.awt.Window)oldInstance;
@@ -1023,6 +1091,7 @@ static final class javax_swing_JFrame_PersistenceDelegate extends DefaultPersist
 
 // DefaultListModel
 static final class javax_swing_DefaultListModel_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         // Note, the "size" property will be set here.
         super.initialize(type, oldInstance, newInstance, out);
@@ -1037,6 +1106,7 @@ static final class javax_swing_DefaultListModel_PersistenceDelegate extends Defa
 
 // DefaultComboBoxModel
 static final class javax_swing_DefaultComboBoxModel_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.DefaultComboBoxModel<?> m = (javax.swing.DefaultComboBoxModel<?>)oldInstance;
@@ -1049,6 +1119,7 @@ static final class javax_swing_DefaultComboBoxModel_PersistenceDelegate extends
 
 // DefaultMutableTreeNode
 static final class javax_swing_tree_DefaultMutableTreeNode_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object
                               newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
@@ -1065,6 +1136,7 @@ static final class javax_swing_tree_DefaultMutableTreeNode_PersistenceDelegate e
 
 // ToolTipManager
 static final class javax_swing_ToolTipManager_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         return new Expression(oldInstance, javax.swing.ToolTipManager.class,
                               "sharedInstance", new Object[]{});
@@ -1073,6 +1145,7 @@ static final class javax_swing_ToolTipManager_PersistenceDelegate extends Persis
 
 // JTabbedPane
 static final class javax_swing_JTabbedPane_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.JTabbedPane p = (javax.swing.JTabbedPane)oldInstance;
@@ -1088,10 +1161,12 @@ static final class javax_swing_JTabbedPane_PersistenceDelegate extends DefaultPe
 
 // Box
 static final class javax_swing_Box_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return super.mutatesTo(oldInstance, newInstance) && getAxis(oldInstance).equals(getAxis(newInstance));
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         return new Expression(oldInstance, oldInstance.getClass(), "new", new Object[] {getAxis(oldInstance)});
     }
@@ -1109,6 +1184,7 @@ static final class javax_swing_Box_PersistenceDelegate extends DefaultPersistenc
 // need to be added to the menu item.
 // Not so for JMenu apparently.
 static final class javax_swing_JMenu_PersistenceDelegate extends DefaultPersistenceDelegate {
+    @Override
     protected void initialize(Class<?> type, Object oldInstance, Object newInstance, Encoder out) {
         super.initialize(type, oldInstance, newInstance, out);
         javax.swing.JMenu m = (javax.swing.JMenu)oldInstance;
@@ -1127,6 +1203,7 @@ static final class javax_swing_JMenu_PersistenceDelegate extends DefaultPersiste
  * @author Sergey A. Malenkov
  */
 static final class javax_swing_border_MatteBorder_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         MatteBorder border = (MatteBorder) oldInstance;
         Insets insets = border.getBorderInsets();
@@ -1169,10 +1246,12 @@ static final class javax_swing_JMenu_PersistenceDelegate extends DefaultPersiste
  * @author Sergey A. Malenkov
  */
 static final class sun_swing_PrintColorUIResource_PersistenceDelegate extends PersistenceDelegate {
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         return oldInstance.equals(newInstance);
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Color color = (Color) oldInstance;
         Object[] args = new Object[] {color.getRGB()};
diff --git a/src/java.desktop/share/classes/java/beans/MethodDescriptor.java b/src/java.desktop/share/classes/java/beans/MethodDescriptor.java
index 00cd3f6db30..a0fef42ff5a 100644
--- a/src/java.desktop/share/classes/java/beans/MethodDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/MethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -221,6 +221,7 @@ public class MethodDescriptor extends FeatureDescriptor {
         }
     }
 
+    @Override
     void appendTo(StringBuilder sb) {
         appendTo(sb, "method", this.methodRef.get());
         if (this.parameterDescriptors != null) {
diff --git a/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java b/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java
index 1badd4bc72a..0db50ff898a 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyChangeEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,6 +161,7 @@ public class PropertyChangeEvent extends EventObject {
      *
      * @since 1.7
      */
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(getClass().getName());
         sb.append("[propertyName=").append(getPropertyName());
diff --git a/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java b/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java
index e8fe197cfd6..024ae551895 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyChangeListenerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@ public class PropertyChangeListenerProxy
      *
      * @param event  the property change event
      */
+    @Override
     public void propertyChange(PropertyChangeEvent event) {
         getListener().propertyChange(event);
     }
diff --git a/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
index edad65444ee..1b28fd4e320 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -566,6 +566,7 @@ public class PropertyChangeSupport implements Serializable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public PropertyChangeListener extract(PropertyChangeListener listener) {
             while (listener instanceof PropertyChangeListenerProxy) {
                 listener = ((PropertyChangeListenerProxy) listener).getListener();
diff --git a/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
index 6f5d5d82832..c678199afc1 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -371,6 +371,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
     /**
      * Overridden to ensure that a super class doesn't take precedent
      */
+    @Override
     void setClass0(Class<?> clz) {
         if (getClass0() != null && clz.isAssignableFrom(getClass0())) {
             // don't replace a subclass with a superclass
@@ -497,6 +498,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
      *
      * @since 1.4
      */
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -712,6 +714,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
      * @return a hash code value for this object.
      * @since 1.5
      */
+    @Override
     public int hashCode() {
         int result = 7;
 
@@ -742,6 +745,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
         return baseName;
     }
 
+    @Override
     void appendTo(StringBuilder sb) {
         appendTo(sb, "bound", this.bound);
         appendTo(sb, "constrained", this.constrained);
diff --git a/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java b/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java
index 6c7140769a3..601d4634e1f 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyEditorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *     the PropertyEditor should create a new object to hold any
      *     modified value.
      */
+    @Override
     public void setValue(Object value) {
         this.value = value;
         firePropertyChange();
@@ -104,6 +105,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *
      * @return The value of the property.
      */
+    @Override
     public Object getValue() {
         return value;
     }
@@ -116,6 +118,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      * @return  True if the class will honor the paintValue method.
      */
 
+    @Override
     public boolean isPaintable() {
         return false;
     }
@@ -131,6 +134,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      * @param gfx  Graphics object to paint into.
      * @param box  Rectangle within graphics object into which we should paint.
      */
+    @Override
     public void paintValue(java.awt.Graphics gfx, java.awt.Rectangle box) {
     }
 
@@ -147,6 +151,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      * @return A fragment of Java code representing an initializer for the
      *          current value.
      */
+    @Override
     public String getJavaInitializationString() {
         return "???";
     }
@@ -163,6 +168,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      * <p>   If a non-null value is returned, then the PropertyEditor should
      *       be prepared to parse that string back in setAsText().
      */
+    @Override
     public String getAsText() {
         return (this.value != null)
                 ? this.value.toString()
@@ -177,6 +183,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *
      * @param text  The string to be parsed.
      */
+    @Override
     public void setAsText(String text) throws java.lang.IllegalArgumentException {
         if (value instanceof String) {
             setValue(text);
@@ -198,6 +205,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *   property cannot be represented as a tagged value.
      *
      */
+    @Override
     public String[] getTags() {
         return null;
     }
@@ -219,6 +227,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *      not supported.
      */
 
+    @Override
     public java.awt.Component getCustomEditor() {
         return null;
     }
@@ -228,6 +237,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *
      * @return  True if the propertyEditor can provide a custom editor.
      */
+    @Override
     public boolean supportsCustomEditor() {
         return false;
     }
@@ -250,6 +260,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *
      * @param listener  the {@link PropertyChangeListener} to add
      */
+    @Override
     public synchronized void addPropertyChangeListener(
                                 PropertyChangeListener listener) {
         if (listeners == null) {
@@ -268,6 +279,7 @@ public class PropertyEditorSupport implements PropertyEditor {
      *
      * @param listener  the {@link PropertyChangeListener} to remove
      */
+    @Override
     public synchronized void removePropertyChangeListener(
                                 PropertyChangeListener listener) {
         if (listeners == null) {
diff --git a/src/java.desktop/share/classes/java/beans/Statement.java b/src/java.desktop/share/classes/java/beans/Statement.java
index 117aef7f22b..2602aed83d7 100644
--- a/src/java.desktop/share/classes/java/beans/Statement.java
+++ b/src/java.desktop/share/classes/java/beans/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,7 @@ public class Statement {
     private static Object[] emptyArray = new Object[]{};
 
     static ExceptionListener defaultExceptionListener = new ExceptionListener() {
+        @Override
         public void exceptionThrown(Exception e) {
             System.err.println(e);
             // e.printStackTrace();
@@ -310,6 +311,7 @@ public class Statement {
     /**
      * Prints the value of this statement using a Java-style syntax.
      */
+    @Override
     public String toString() {
         // Respect a subclass's implementation here.
         Object target = getTarget();
diff --git a/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java b/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java
index b77154c9a3b..dc42799c9f7 100644
--- a/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java
+++ b/src/java.desktop/share/classes/java/beans/ThreadGroupContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ import java.util.WeakHashMap;
 final class ThreadGroupContext {
 
     private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<ThreadGroupContext>() {
+        @Override
         protected ThreadGroupContext create(Object key) {
             return new ThreadGroupContext();
         }
diff --git a/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java b/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
index 4e4ad96ebd8..a09c3f09b3b 100644
--- a/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
+++ b/src/java.desktop/share/classes/java/beans/VetoableChangeListenerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,7 @@ public class VetoableChangeListenerProxy
     * @throws PropertyVetoException if the recipient wishes the property
     *                                  change to be rolled back
     */
+    @Override
     public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException{
         getListener().vetoableChange(event);
     }
diff --git a/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
index cce44ad0355..3ce47142867 100644
--- a/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
+++ b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -555,6 +555,7 @@ public class VetoableChangeSupport implements Serializable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public VetoableChangeListener extract(VetoableChangeListener listener) {
             while (listener instanceof VetoableChangeListenerProxy) {
                 listener = ((VetoableChangeListenerProxy) listener).getListener();
diff --git a/src/java.desktop/share/classes/java/beans/XMLDecoder.java b/src/java.desktop/share/classes/java/beans/XMLDecoder.java
index 3d5fbd3a8ce..32a9ee5953d 100644
--- a/src/java.desktop/share/classes/java/beans/XMLDecoder.java
+++ b/src/java.desktop/share/classes/java/beans/XMLDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,6 +166,7 @@ public class XMLDecoder implements AutoCloseable {
      * This method closes the input stream associated
      * with this stream.
      */
+    @Override
     public void close() {
         if (parsingComplete()) {
             close(this.input.getCharacterStream());
diff --git a/src/java.desktop/share/classes/java/beans/XMLEncoder.java b/src/java.desktop/share/classes/java/beans/XMLEncoder.java
index 646b777e7f7..aec59dad0ad 100644
--- a/src/java.desktop/share/classes/java/beans/XMLEncoder.java
+++ b/src/java.desktop/share/classes/java/beans/XMLEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -321,6 +321,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
      *
      * @see XMLDecoder#readObject
      */
+    @Override
     public void writeObject(Object o) {
         if (internal) {
             super.writeObject(o);
@@ -391,6 +392,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
      *               to the stream.
      * @see java.beans.PersistenceDelegate#initialize
      */
+    @Override
     public void writeStatement(Statement oldStm) {
         // System.out.println("XMLEncoder::writeStatement: " + oldStm);
         boolean internal = this.internal;
@@ -445,6 +447,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
      *               to the stream.
      * @see java.beans.PersistenceDelegate#initialize
      */
+    @Override
     public void writeExpression(Expression oldExp) {
         boolean internal = this.internal;
         this.internal = true;
@@ -502,6 +505,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
         clear();
     }
 
+    @Override
     void clear() {
         super.clear();
         nameGenerator.clear();
@@ -526,6 +530,7 @@ public class XMLEncoder extends Encoder implements AutoCloseable {
      * postamble and then closes the output stream associated
      * with this stream.
      */
+    @Override
     public void close() {
         flush();
         writeln("</java>");
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
index 527a8be9cc0..0f623648f7b 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * property
      * @throws PropertyVetoException if the change is rejected
      */
+    @Override
     public synchronized void setBeanContext(BeanContext bc) throws PropertyVetoException {
         if (bc == beanContext) return;
 
@@ -146,6 +147,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * @return the nesting {@code BeanContext} for
      * this {@code BeanContextChildSupport}.
      */
+    @Override
     public synchronized BeanContext getBeanContext() { return beanContext; }
 
     /**
@@ -159,6 +161,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * @param name The name of the property to listen on
      * @param pcl The {@code PropertyChangeListener} to be added
      */
+    @Override
     public void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
         pcSupport.addPropertyChangeListener(name, pcl);
     }
@@ -176,6 +179,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * @param name The name of the property that was listened on
      * @param pcl The PropertyChangeListener to be removed
      */
+    @Override
     public void removePropertyChangeListener(String name, PropertyChangeListener pcl) {
         pcSupport.removePropertyChangeListener(name, pcl);
     }
@@ -191,6 +195,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * @param name The name of the property to listen on
      * @param vcl The {@code VetoableChangeListener} to be added
      */
+    @Override
     public void addVetoableChangeListener(String name, VetoableChangeListener vcl) {
         vcSupport.addVetoableChangeListener(name, vcl);
     }
@@ -208,6 +213,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * @param name The name of the property that was listened on
      * @param vcl The {@code VetoableChangeListener} to be removed
      */
+    @Override
     public void removeVetoableChangeListener(String name, VetoableChangeListener vcl) {
         vcSupport.removeVetoableChangeListener(name, vcl);
     }
@@ -220,6 +226,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * @param bcsre The {@code BeanContextServiceRevokedEvent} fired as a
      * result of a service being revoked
      */
+    @Override
     public void serviceRevoked(BeanContextServiceRevokedEvent bcsre) { }
 
     /**
@@ -231,6 +238,7 @@ public class BeanContextChildSupport implements BeanContextChild, BeanContextSer
      * result of a service becoming available
      *
      */
+    @Override
     public void serviceAvailable(BeanContextServiceAvailableEvent bcsae) { }
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
index 0e2e4211a9c..17897f6865e 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -131,6 +131,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * call it directly.
      */
 
+    @Override
     public void initialize() {
         super.initialize();
         services     = new HashMap<>(serializable + 1);
@@ -592,6 +593,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * @param peer        the peer if the targetChild and peer are related by BeanContextProxy
      */
 
+    @Override
     protected BCSChild createBCSChild(Object targetChild, Object peer) {
         return new BCSSChild(targetChild, peer);
     }
@@ -655,6 +657,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * @throws NullPointerException if the argument is null
      */
 
+    @Override
     public void addBeanContextServicesListener(BeanContextServicesListener bcsl) {
         if (bcsl == null) throw new NullPointerException("bcsl");
 
@@ -670,6 +673,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * remove a BeanContextServicesListener
      */
 
+    @Override
     public void removeBeanContextServicesListener(BeanContextServicesListener bcsl) {
         if (bcsl == null) throw new NullPointerException("bcsl");
 
@@ -687,6 +691,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * @param bcsp the service provider
      */
 
+    @Override
     public boolean addService(Class<?> serviceClass, BeanContextServiceProvider bcsp) {
         return addService(serviceClass, bcsp, true);
     }
@@ -739,6 +744,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * @param revokeCurrentServicesNow whether or not to revoke the service
      */
 
+    @Override
     public void revokeService(Class<?> serviceClass, BeanContextServiceProvider bcsp, boolean revokeCurrentServicesNow) {
 
         if (serviceClass == null) throw new NullPointerException("serviceClass");
@@ -770,6 +776,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * has a service, which may be delegated
      */
 
+    @Override
     public synchronized boolean hasService(Class<?> serviceClass) {
         if (serviceClass == null) throw new NullPointerException("serviceClass");
 
@@ -807,6 +814,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
             nestingCtxt = bcs;
         }
 
+        @Override
         public Object getService(BeanContextServices bcs, Object requestor, Class<?> serviceClass, Object serviceSelector) {
             Object service = null;
 
@@ -819,14 +827,17 @@ public class      BeanContextServicesSupport extends BeanContextSupport
             return service;
         }
 
+        @Override
         public void releaseService(BeanContextServices bcs, Object requestor, Object service) {
             nestingCtxt.releaseService(bcs, requestor, service);
         }
 
+        @Override
         public Iterator<?> getCurrentServiceSelectors(BeanContextServices bcs, Class<?> serviceClass) {
             return nestingCtxt.getCurrentServiceSelectors(serviceClass);
         }
 
+        @Override
         public void serviceRevoked(BeanContextServiceRevokedEvent bcsre) {
             Iterator<BeanContextSupport.BCSChild> i = bcsChildren(); // get the BCSChild values.
 
@@ -848,6 +859,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * obtain a service which may be delegated
      */
 
+     @Override
      public Object getService(BeanContextChild child, Object requestor, Class<?> serviceClass, Object serviceSelector, BeanContextServiceRevokedListener bcsrl) throws TooManyListenersException {
         if (child        == null) throw new NullPointerException("child");
         if (serviceClass == null) throw new NullPointerException("serviceClass");
@@ -913,6 +925,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * release a service
      */
 
+    @Override
     public void releaseService(BeanContextChild child, Object requestor, Object service) {
         if (child     == null) throw new NullPointerException("child");
         if (requestor == null) throw new NullPointerException("requestor");
@@ -934,6 +947,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * @return an iterator for all the currently registered service classes.
      */
 
+    @Override
     public Iterator<Object> getCurrentServiceClasses() {
         return new BCSIterator(services.keySet().iterator());
     }
@@ -943,6 +957,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * (if any) available for the specified service.
      */
 
+    @Override
     public Iterator<?> getCurrentServiceSelectors(Class<?> serviceClass) {
 
         BCSSServiceProvider bcsssp = services.get(serviceClass);
@@ -960,6 +975,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * own propagation semantics.
      */
 
+     @Override
      public void serviceAvailable(BeanContextServiceAvailableEvent bcssae) {
         synchronized(BeanContext.globalHierarchyLock) {
             if (services.containsKey(bcssae.getServiceClass())) return;
@@ -992,6 +1008,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * own propagation semantics.
      */
 
+    @Override
     public void serviceRevoked(BeanContextServiceRevokedEvent bcssre) {
         synchronized(BeanContext.globalHierarchyLock) {
             if (services.containsKey(bcssre.getServiceClass())) return;
@@ -1040,6 +1057,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * own child removal side-effects.
      */
 
+    @Override
     protected void childJustRemovedHook(Object child, BCSChild bcsc) {
         BCSSChild bcssc = (BCSSChild)bcsc;
 
@@ -1055,6 +1073,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * subclasses may envelope this method to implement their own semantics.
      */
 
+    @Override
     protected synchronized void releaseBeanContextResources() {
         Object[] bcssc;
 
@@ -1081,6 +1100,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * subclasses may envelope this method to implement their own semantics.
      */
 
+    @Override
     protected synchronized void initializeBeanContextResources() {
         super.initializeBeanContextResources();
 
@@ -1167,6 +1187,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * processing that has to occur prior to serialization of the children
      */
 
+    @Override
     protected synchronized void bcsPreSerializationHook(ObjectOutputStream oos) throws IOException {
 
         oos.writeInt(serializable);
@@ -1210,6 +1231,7 @@ public class      BeanContextServicesSupport extends BeanContextSupport
      * processing that has to occur prior to serialization of the children
      */
 
+    @Override
     protected synchronized void bcsPreDeserializationHook(ObjectInputStream ois) throws IOException, ClassNotFoundException {
 
         serializable = ois.readInt();
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
index dbbecb87d7e..3aa77048f8f 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,6 +186,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * identified by the beanName parameter is not found
      * @return the new object
      */
+    @Override
     public Object instantiateChild(String beanName)
            throws IOException, ClassNotFoundException {
         BeanContext bc = getBeanContextPeer();
@@ -199,6 +200,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      *
      * @return number of children
      */
+    @Override
     public int size() {
         synchronized(children) {
             return children.size();
@@ -212,6 +214,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      *
      * @return {@code true} if there are no children, otherwise {@code false}
      */
+    @Override
     public boolean isEmpty() {
         synchronized(children) {
             return children.isEmpty();
@@ -225,6 +228,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @param  o the Object in question
      * @return {@code true} if this object is a child, otherwise {@code false}
      */
+    @Override
     public boolean contains(Object o) {
         synchronized(children) {
             return children.containsKey(o);
@@ -249,6 +253,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * currently nested in this {@code BeanContext}.
      * @return an {@code Iterator} of the nested children
      */
+    @Override
     public Iterator<Object> iterator() {
         synchronized(children) {
             return new BCSIterator(children.keySet().iterator());
@@ -259,6 +264,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * Gets all JavaBean or {@code BeanContext}
      * instances currently nested in this BeanContext.
      */
+    @Override
     public Object[] toArray() {
         synchronized(children) {
             return children.keySet().toArray();
@@ -273,6 +279,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * types that are of interest.
      * @return an array of children
      */
+    @Override
     public Object[] toArray(Object[] arry) {
         synchronized(children) {
             return children.keySet().toArray(arry);
@@ -290,8 +297,11 @@ public class      BeanContextSupport extends BeanContextChildSupport
     protected static final class BCSIterator implements Iterator<Object> {
         BCSIterator(Iterator<?> i) { super(); src = i; }
 
+        @Override
         public boolean hasNext() { return src.hasNext(); }
+        @Override
         public Object       next()    { return src.next();    }
+        @Override
         public void    remove()  { /* do nothing */      }
 
         private Iterator<?> src;
@@ -388,6 +398,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @return true if the child was added successfully.
      * @see #validatePendingAdd
      */
+    @Override
     public boolean add(Object targetChild) {
 
         if (targetChild == null) throw new IllegalArgumentException();
@@ -492,6 +503,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @param targetChild The child objects to remove
      * @see #validatePendingRemove
      */
+    @Override
     public boolean remove(Object targetChild) {
         return remove(targetChild, true);
     }
@@ -579,6 +591,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * in the collection are children of
      * this {@code BeanContext}, false if not.
      */
+    @Override
     @SuppressWarnings("rawtypes")
     public boolean containsAll(Collection c) {
         synchronized(children) {
@@ -596,6 +609,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @throws UnsupportedOperationException thrown unconditionally by this implementation
      * @return this implementation unconditionally throws {@code UnsupportedOperationException}
      */
+    @Override
     @SuppressWarnings("rawtypes")
     public boolean addAll(Collection c) {
         throw new UnsupportedOperationException();
@@ -608,6 +622,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @return this implementation unconditionally throws {@code UnsupportedOperationException}
 
      */
+    @Override
     @SuppressWarnings("rawtypes")
     public boolean removeAll(Collection c) {
         throw new UnsupportedOperationException();
@@ -620,6 +635,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @throws UnsupportedOperationException thrown unconditionally by this implementation
      * @return this implementation unconditionally throws {@code UnsupportedOperationException}
      */
+    @Override
     @SuppressWarnings("rawtypes")
     public boolean retainAll(Collection c) {
         throw new UnsupportedOperationException();
@@ -630,6 +646,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * implementations must synchronized on the hierarchy lock and "children" protected field
      * @throws UnsupportedOperationException thrown unconditionally by this implementation
      */
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
@@ -641,6 +658,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @throws NullPointerException if the argument is null
      */
 
+    @Override
     public void addBeanContextMembershipListener(BeanContextMembershipListener bcml) {
         if (bcml == null) throw new NullPointerException("listener");
 
@@ -659,6 +677,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @throws NullPointerException if the argument is null
      */
 
+    @Override
     public void removeBeanContextMembershipListener(BeanContextMembershipListener bcml) {
         if (bcml == null) throw new NullPointerException("listener");
 
@@ -678,6 +697,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @throws  NullPointerException if the argument is null
      */
 
+    @Override
     public InputStream getResourceAsStream(String name, BeanContextChild bcc) {
         if (name == null) throw new NullPointerException("name");
         if (bcc  == null) throw new NullPointerException("bcc");
@@ -697,6 +717,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @return the requested resource as an InputStream
      */
 
+    @Override
     public URL getResource(String name, BeanContextChild bcc) {
         if (name == null) throw new NullPointerException("name");
         if (bcc  == null) throw new NullPointerException("bcc");
@@ -713,6 +734,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * Sets the new design time value for this {@code BeanContext}.
      * @param dTime the new designTime value
      */
+    @Override
     public synchronized void setDesignTime(boolean dTime) {
         if (designTime != dTime) {
             designTime = dTime;
@@ -728,6 +750,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @return {@code true} if in design time mode,
      * {@code false} if not
      */
+    @Override
     public synchronized boolean isDesignTime() { return designTime; }
 
     /**
@@ -768,6 +791,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * </p>
      * @return {@code true} if the implementor needs a GUI
      */
+    @Override
     public synchronized boolean needsGui() {
         BeanContext bc = getBeanContextPeer();
 
@@ -798,6 +822,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * notify this instance that it may no longer render a GUI.
      */
 
+    @Override
     public synchronized void dontUseGui() {
         if (okToUseGui) {
             okToUseGui = false;
@@ -817,6 +842,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * Notify this instance that it may now render a GUI
      */
 
+    @Override
     public synchronized void okToUseGui() {
         if (!okToUseGui) {
             okToUseGui = true;
@@ -838,6 +864,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * @return is this instance avoiding using its GUI?
      * @see Visibility
      */
+    @Override
     public boolean avoidingGui() {
         return !okToUseGui && needsGui();
     }
@@ -1101,6 +1128,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * subclasses may envelope to monitor veto child property changes.
      */
 
+    @Override
     public void vetoableChange(PropertyChangeEvent pce) throws PropertyVetoException {
         String propertyName = pce.getPropertyName();
         Object source       = pce.getSource();
@@ -1121,6 +1149,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
      * subclasses may envelope to monitor child property changes.
      */
 
+    @Override
     public void propertyChange(PropertyChangeEvent pce) {
         String propertyName = pce.getPropertyName();
         Object source       = pce.getSource();
@@ -1341,6 +1370,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
              * behaved Serializable child.
              */
 
+            @Override
             public void propertyChange(PropertyChangeEvent pce) {
                 BeanContextSupport.this.propertyChange(pce);
             }
@@ -1355,6 +1385,7 @@ public class      BeanContextSupport extends BeanContextChildSupport
              * behaved Serializable child.
              */
 
+            @Override
             public void vetoableChange(PropertyChangeEvent pce) throws PropertyVetoException {
                 BeanContextSupport.this.vetoableChange(pce);
              }
diff --git a/src/java.desktop/share/classes/javax/imageio/ImageIO.java b/src/java.desktop/share/classes/javax/imageio/ImageIO.java
index 8180145a8ea..5d3526df917 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageIO.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageIO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,6 @@ import javax.imageio.spi.ImageTranscoderSpi;
 import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
-import sun.awt.AppContext;
 
 /**
  * A class containing static convenience methods for locating
@@ -108,9 +107,7 @@ public final class ImageIO {
     // ImageInputStreams
 
     /**
-     * A class to hold information about caching.  Each
-     * {@code ThreadGroup} will have its own copy
-     * via the {@code AppContext} mechanism.
+     * A class to hold information about caching.
      */
     static class CacheInfo {
         boolean useCache = true;
@@ -144,17 +141,12 @@ public final class ImageIO {
         }
     }
 
+    private static final CacheInfo info = new CacheInfo();
+
     /**
-     * Returns the {@code CacheInfo} object associated with this
-     * {@code ThreadGroup}.
+     * Returns the {@code CacheInfo} object.
      */
     private static synchronized CacheInfo getCacheInfo() {
-        AppContext context = AppContext.getAppContext();
-        CacheInfo info = (CacheInfo)context.get(CacheInfo.class);
-        if (info == null) {
-            info = new CacheInfo();
-            context.put(CacheInfo.class, info);
-        }
         return info;
     }
 
diff --git a/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java b/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
index 15a7fbbaa00..ee3f6a449b7 100644
--- a/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
+++ b/src/java.desktop/share/classes/javax/print/PrintServiceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import java.util.ServiceLoader;
 
 import javax.print.attribute.AttributeSet;
 
-import sun.awt.AppContext;
 
 /**
  * Implementations of this class provide lookup services for print services
@@ -58,35 +57,14 @@ public abstract class PrintServiceLookup {
     protected PrintServiceLookup() {}
 
     /**
-     * Contains a lists of services.
+     * The list of lookup services.
      */
-    static class Services {
-
-        /**
-         * The list of lookup services.
-         */
-        private ArrayList<PrintServiceLookup> listOfLookupServices = null;
-
-        /**
-         * The list of registered services.
-         */
-        private ArrayList<PrintService> registeredServices = null;
-    }
+    private static ArrayList<PrintServiceLookup> listOfLookupServices = null;
 
     /**
-     * Returns the services from the current appcontext.
-     *
-     * @return the services
+     * The list of registered services.
      */
-    private static Services getServicesForContext() {
-        Services services =
-            (Services)AppContext.getAppContext().get(Services.class);
-        if (services == null) {
-            services = new Services();
-            AppContext.getAppContext().put(Services.class, services);
-        }
-        return services;
-    }
+    private static ArrayList<PrintService> registeredServices = null;
 
     /**
      * Returns the list of lookup services.
@@ -94,7 +72,7 @@ public abstract class PrintServiceLookup {
      * @return the list of lookup services
      */
     private static ArrayList<PrintServiceLookup> getListOfLookupServices() {
-        return getServicesForContext().listOfLookupServices;
+        return listOfLookupServices;
     }
 
     /**
@@ -103,8 +81,7 @@ public abstract class PrintServiceLookup {
      * @return the list of lookup services
      */
     private static ArrayList<PrintServiceLookup> initListOfLookupServices() {
-        ArrayList<PrintServiceLookup> listOfLookupServices = new ArrayList<>();
-        getServicesForContext().listOfLookupServices = listOfLookupServices;
+        listOfLookupServices = new ArrayList<>();
         return listOfLookupServices;
     }
 
@@ -114,7 +91,7 @@ public abstract class PrintServiceLookup {
      * @return the list of registered services
      */
     private static ArrayList<PrintService> getRegisteredServices() {
-        return getServicesForContext().registeredServices;
+        return registeredServices;
     }
 
     /**
@@ -123,8 +100,7 @@ public abstract class PrintServiceLookup {
      * @return the list of registered services
      */
     private static ArrayList<PrintService> initRegisteredServices() {
-        ArrayList<PrintService> registeredServices = new ArrayList<>();
-        getServicesForContext().registeredServices = registeredServices;
+        registeredServices = new ArrayList<>();
         return registeredServices;
     }
 
diff --git a/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java b/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
index 7d696f14a94..2667587e9b2 100644
--- a/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
+++ b/src/java.desktop/share/classes/javax/print/StreamPrintServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,6 @@ import java.util.ServiceLoader;
 
 import javax.print.attribute.PrintRequestAttributeSet;
 
-import sun.awt.AppContext;
-
 /**
  * A {@code StreamPrintServiceFactory} is the factory for
  * {@link StreamPrintService} instances, which can print to an output stream in
@@ -63,24 +61,20 @@ public abstract class StreamPrintServiceFactory {
     static class Services {
 
         /**
-         * The list of factories which will be stored per appcontext.
+         * The list of factories.
          */
         private ArrayList<StreamPrintServiceFactory> listOfFactories = null;
     }
 
+    private static final Services SERVICES = new Services();
+
     /**
-     * Returns the services from the current appcontext.
+     * Returns the singleton Services instance.
      *
      * @return the services
      */
     private static Services getServices() {
-        Services services =
-            (Services)AppContext.getAppContext().get(Services.class);
-        if (services == null) {
-            services = new Services();
-            AppContext.getAppContext().put(Services.class, services);
-        }
-        return services;
+        return SERVICES;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java
index 0481060f73f..25dbb7ddaca 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,6 +114,7 @@ public final class Chromaticity extends EnumSyntax
     /**
      * Returns the string table for class {@code Chromaticity}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable;
     }
@@ -121,6 +122,7 @@ public final class Chromaticity extends EnumSyntax
     /**
      * Returns the enumeration value table for class {@code Chromaticity}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return myEnumValueTable;
     }
@@ -135,6 +137,7 @@ public final class Chromaticity extends EnumSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return Chromaticity.class;
     }
@@ -148,6 +151,7 @@ public final class Chromaticity extends EnumSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "chromaticity";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java
index 6affb3e28dc..8ce2c5eef7c 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/ColorSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,6 +104,7 @@ public final class ColorSupported extends EnumSyntax
     /**
      * Returns the string table for class {@code ColorSupported}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable;
     }
@@ -111,6 +112,7 @@ public final class ColorSupported extends EnumSyntax
     /**
      * Returns the enumeration value table for class {@code ColorSupported}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return myEnumValueTable;
     }
@@ -125,6 +127,7 @@ public final class ColorSupported extends EnumSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return ColorSupported.class;
     }
@@ -138,6 +141,7 @@ public final class ColorSupported extends EnumSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "color-supported";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java
index b1e7f1e89fc..9eeab5d9688 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Compression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,6 +106,7 @@ public class Compression extends EnumSyntax implements DocAttribute {
     /**
      * Returns the string table for class {@code Compression}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable.clone();
     }
@@ -113,6 +114,7 @@ public class Compression extends EnumSyntax implements DocAttribute {
     /**
      * Returns the enumeration value table for class {@code Compression}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return (EnumSyntax[])myEnumValueTable.clone();
     }
@@ -127,6 +129,7 @@ public class Compression extends EnumSyntax implements DocAttribute {
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return Compression.class;
     }
@@ -140,6 +143,7 @@ public class Compression extends EnumSyntax implements DocAttribute {
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "compression";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java
index 33a98c035be..6292cc4c8c2 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Copies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,7 @@ public final class Copies extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this copies
      *         attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return super.equals (object) && object instanceof Copies;
     }
@@ -110,6 +111,7 @@ public final class Copies extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return Copies.class;
     }
@@ -122,6 +124,7 @@ public final class Copies extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "copies";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java
index e7b411d8e55..3c2cf4bb550 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/CopiesSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,6 +105,7 @@ public final class CopiesSupported extends SetOfIntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this copies
      *         supported attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return super.equals (object) && object instanceof CopiesSupported;
     }
@@ -119,6 +120,7 @@ public final class CopiesSupported extends SetOfIntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return CopiesSupported.class;
     }
@@ -132,6 +134,7 @@ public final class CopiesSupported extends SetOfIntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "copies-supported";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
index 4e0a3b27259..a7a31dacd8d 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
      * @return {@code true} if {@code object} is equivalent to this date-time at
      *         completed attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return(super.equals (object) &&
                object instanceof DateTimeAtCompleted);
@@ -105,6 +106,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return DateTimeAtCompleted.class;
     }
@@ -118,6 +120,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "date-time-at-completed";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
index fc09f0672c2..53b85b7cf5c 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,7 @@ public final class DateTimeAtCreation   extends DateTimeSyntax
      * @return {@code true} if {@code object} is equivalent to this date-time at
      *         creation attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return(super.equals (object) &&
                object instanceof DateTimeAtCreation);
@@ -103,6 +104,7 @@ public final class DateTimeAtCreation   extends DateTimeSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return DateTimeAtCreation.class;
     }
@@ -116,6 +118,7 @@ public final class DateTimeAtCreation   extends DateTimeSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "date-time-at-creation";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
index 8b1f3efdc0f..310f3f756c7 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,6 +89,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
      * @return {@code true} if {@code object} is equivalent to this date-time at
      *         processing attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return(super.equals (object) &&
                object instanceof DateTimeAtProcessing);
@@ -104,6 +105,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return DateTimeAtProcessing.class;
     }
@@ -117,6 +119,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "date-time-at-processing";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java
index bc1d240c9c1..655a314b136 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Destination.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,6 +89,7 @@ public final class Destination extends URISyntax
      * @return {@code true} if {@code object} is equivalent to this destination
      *         attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals(object) &&
                 object instanceof Destination);
@@ -104,6 +105,7 @@ public final class Destination extends URISyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return Destination.class;
     }
@@ -117,6 +119,7 @@ public final class Destination extends URISyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "spool-data-destination";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java
index 593e656cf6b..01a410d075b 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogOwner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,7 @@ public final class DialogOwner implements PrintRequestAttribute {
 
     private static class Accessor extends DialogOwnerAccessor {
 
+         @Override
          public long getOwnerID(DialogOwner owner) {
              return owner.getID();
          }
@@ -133,6 +134,7 @@ public final class DialogOwner implements PrintRequestAttribute {
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return DialogOwner.class;
     }
@@ -145,6 +147,7 @@ public final class DialogOwner implements PrintRequestAttribute {
      * {@code "dialog-owner"}.
      *
      */
+    @Override
     public final String getName() {
         return "dialog-owner";
 
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
index ae3195d0280..2cf003060b1 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,6 +98,7 @@ public final class DialogTypeSelection extends EnumSyntax
     /**
      * Returns the string table for class {@code DialogTypeSelection}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable;
     }
@@ -106,6 +107,7 @@ public final class DialogTypeSelection extends EnumSyntax
      * Returns the enumeration value table for class
      * {@code DialogTypeSelection}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return myEnumValueTable;
     }
@@ -120,6 +122,7 @@ public final class DialogTypeSelection extends EnumSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return DialogTypeSelection.class;
     }
@@ -133,6 +136,7 @@ public final class DialogTypeSelection extends EnumSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "dialog-type-selection";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java
index eb2bd7a870d..bd1f574e4ba 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/DocumentName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,7 @@ public final class DocumentName extends TextSyntax implements DocAttribute {
      * @return {@code true} if {@code object} is equivalent to this document
      *         name attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) && object instanceof DocumentName);
     }
@@ -100,6 +101,7 @@ public final class DocumentName extends TextSyntax implements DocAttribute {
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return DocumentName.class;
     }
@@ -113,6 +115,7 @@ public final class DocumentName extends TextSyntax implements DocAttribute {
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "document-name";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java
index b0e4b70c87c..8c8941c76c4 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Fidelity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,7 @@ public final class Fidelity extends EnumSyntax
     /**
      * Returns the string table for class {@code Fidelity}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable;
     }
@@ -108,6 +109,7 @@ public final class Fidelity extends EnumSyntax
     /**
      * Returns the enumeration value table for class {@code Fidelity}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return myEnumValueTable;
     }
@@ -122,6 +124,7 @@ public final class Fidelity extends EnumSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return Fidelity.class;
     }
@@ -135,6 +138,7 @@ public final class Fidelity extends EnumSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "ipp-attribute-fidelity";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java b/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java
index 46d520ecb48..7d9d042b3e7 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -344,6 +344,7 @@ public class Finishings extends EnumSyntax
     /**
      * Returns the string table for class {@code Finishings}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable.clone();
     }
@@ -351,6 +352,7 @@ public class Finishings extends EnumSyntax
     /**
      * Returns the enumeration value table for class {@code Finishings}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return (EnumSyntax[])myEnumValueTable.clone();
     }
@@ -358,6 +360,7 @@ public class Finishings extends EnumSyntax
     /**
      * Returns the lowest integer value used by class {@code Finishings}.
      */
+    @Override
     protected int getOffset() {
         return 3;
     }
@@ -372,6 +375,7 @@ public class Finishings extends EnumSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return Finishings.class;
     }
@@ -385,6 +389,7 @@ public class Finishings extends EnumSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "finishings";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java
index d4e2c2625df..2b9ede6940f 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobHoldUntil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,6 +123,7 @@ public final class JobHoldUntil extends DateTimeSyntax
      * @return {@code true} if {@code object} is equivalent to this job hold
      *         until attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals(object) && object instanceof JobHoldUntil);
     }
@@ -137,6 +138,7 @@ public final class JobHoldUntil extends DateTimeSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobHoldUntil.class;
     }
@@ -150,6 +152,7 @@ public final class JobHoldUntil extends DateTimeSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-hold-until";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java
index ed9600838be..70d7c7e5e46 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,6 +110,7 @@ public final class JobImpressions extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job
      *         impressions attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return super.equals (object) && object instanceof JobImpressions;
     }
@@ -124,6 +125,7 @@ public final class JobImpressions extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobImpressions.class;
     }
@@ -137,6 +139,7 @@ public final class JobImpressions extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-impressions";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
index 4974f9e13c9..e6fdeb93d05 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public final class JobImpressionsCompleted extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job
      *         impressions completed attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return(super.equals (object) &&
                object instanceof JobImpressionsCompleted);
@@ -109,6 +110,7 @@ public final class JobImpressionsCompleted extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobImpressionsCompleted.class;
     }
@@ -122,6 +124,7 @@ public final class JobImpressionsCompleted extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-impressions-completed";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
index 131b19f5ad2..82b3049b8bd 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job
      *         impressions supported attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) &&
                 object instanceof JobImpressionsSupported);
@@ -109,6 +110,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobImpressionsSupported.class;
     }
@@ -122,6 +124,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-impressions-supported";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java
index 454a30a3a28..acd04fab21d 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -159,6 +159,7 @@ public final class JobKOctets   extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job K octets
      *         attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return super.equals(object) && object instanceof JobKOctets;
     }
@@ -173,6 +174,7 @@ public final class JobKOctets   extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobKOctets.class;
     }
@@ -186,6 +188,7 @@ public final class JobKOctets   extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-k-octets";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
index 9acc44f5777..efd9cac2441 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,6 +104,7 @@ public final class JobKOctetsProcessed extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job K octets
      *         processed attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return(super.equals (object) &&
                object instanceof JobKOctetsProcessed);
@@ -119,6 +120,7 @@ public final class JobKOctetsProcessed extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobKOctetsProcessed.class;
     }
@@ -132,6 +134,7 @@ public final class JobKOctetsProcessed extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-k-octets-processed";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
index 032d172d6e2..221328caeb8 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,7 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job K octets
      *         supported attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) &&
                 object instanceof JobKOctetsSupported);
@@ -108,6 +109,7 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobKOctetsSupported.class;
     }
@@ -121,6 +123,7 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-k-octets-supported";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java
index a3720748f68..181bda79826 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,7 @@ public class JobMediaSheets extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job media
      *         sheets attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return super.equals(object) && object instanceof JobMediaSheets;
     }
@@ -115,6 +116,7 @@ public class JobMediaSheets extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobMediaSheets.class;
     }
@@ -128,6 +130,7 @@ public class JobMediaSheets extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-media-sheets";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
index e6f1eb9b4d8..fea87dc8ebd 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job media
      *         sheets completed attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) &&
                 object instanceof JobMediaSheetsCompleted);
@@ -109,6 +110,7 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobMediaSheetsCompleted.class;
     }
@@ -122,6 +124,7 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-media-sheets-completed";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
index a942f277175..8feeafef18a 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job media
      *         sheets supported attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) &&
                 object instanceof JobMediaSheetsSupported);
@@ -109,6 +110,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobMediaSheetsSupported.class;
     }
@@ -122,6 +124,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-media-sheets-supported";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
index cd944103d23..796fe37774c 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public final class JobMessageFromOperator extends TextSyntax
      * @return {@code true} if {@code object} is equivalent to this job message
      *         from operator attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) &&
                 object instanceof JobMessageFromOperator);
@@ -109,6 +110,7 @@ public final class JobMessageFromOperator extends TextSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobMessageFromOperator.class;
     }
@@ -122,6 +124,7 @@ public final class JobMessageFromOperator extends TextSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-message-from-operator";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java
index cceabd8b8f0..4fa9eaee6fd 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,6 +92,7 @@ public final class JobName extends TextSyntax
      * @return {@code true} if {@code object} is equivalent to this job name
      *         attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals(object) && object instanceof JobName);
     }
@@ -105,6 +106,7 @@ public final class JobName extends TextSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobName.class;
     }
@@ -117,6 +119,7 @@ public final class JobName extends TextSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-name";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
index d8dfd56a920..eda27d142f9 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,7 @@ public final class JobOriginatingUserName extends TextSyntax
      * @return {@code true} if {@code object} is equivalent to this job
      *         originating user name attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) &&
                 object instanceof JobOriginatingUserName);
@@ -106,6 +107,7 @@ public final class JobOriginatingUserName extends TextSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobOriginatingUserName.class;
     }
@@ -119,6 +121,7 @@ public final class JobOriginatingUserName extends TextSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-originating-user-name";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java
index 7c77a504673..5ca9990ec13 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobPriority.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,6 +94,7 @@ public final class JobPriority extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job priority
      *         attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals(Object object) {
         return (super.equals (object) && object instanceof JobPriority);
     }
@@ -108,6 +109,7 @@ public final class JobPriority extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobPriority.class;
     }
@@ -121,6 +123,7 @@ public final class JobPriority extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-priority";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
index 6df729a9813..422d823bff7 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,7 @@ public final class JobPrioritySupported extends IntegerSyntax
      * @return {@code true} if {@code object} is equivalent to this job priority
      *         supported attribute, {@code false} otherwise
      */
+    @Override
     public boolean equals (Object object) {
 
         return (super.equals(object) &&
@@ -102,6 +103,7 @@ public final class JobPrioritySupported extends IntegerSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobPrioritySupported.class;
     }
@@ -115,6 +117,7 @@ public final class JobPrioritySupported extends IntegerSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-priority-supported";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java
index 130b8eb27a3..59a31096d2a 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobSheets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,7 @@ public class JobSheets extends EnumSyntax
     /**
      * Returns the string table for class {@code JobSheets}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable.clone();
     }
@@ -108,6 +109,7 @@ public class JobSheets extends EnumSyntax
     /**
      * Returns the enumeration value table for class {@code JobSheets}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return (EnumSyntax[])myEnumValueTable.clone();
     }
@@ -122,6 +124,7 @@ public class JobSheets extends EnumSyntax
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobSheets.class;
     }
@@ -135,6 +138,7 @@ public class JobSheets extends EnumSyntax
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-sheets";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java
index 13499a9b2a7..0b0ba9d3276 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -206,6 +206,7 @@ public class JobState extends EnumSyntax implements PrintJobAttribute {
     /**
      * Returns the string table for class {@code JobState}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable;
     }
@@ -213,6 +214,7 @@ public class JobState extends EnumSyntax implements PrintJobAttribute {
     /**
      * Returns the enumeration value table for class {@code JobState}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return myEnumValueTable;
     }
@@ -227,6 +229,7 @@ public class JobState extends EnumSyntax implements PrintJobAttribute {
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobState.class;
     }
@@ -240,6 +243,7 @@ public class JobState extends EnumSyntax implements PrintJobAttribute {
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-state";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java
index 2f8526cb7b1..aba72ec9c1a 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -436,6 +436,7 @@ public class JobStateReason extends EnumSyntax implements Attribute {
     /**
      * Returns the string table for class {@code JobStateReason}.
      */
+    @Override
     protected String[] getStringTable() {
         return myStringTable.clone();
     }
@@ -443,6 +444,7 @@ public class JobStateReason extends EnumSyntax implements Attribute {
     /**
      * Returns the enumeration value table for class {@code JobStateReason}.
      */
+    @Override
     protected EnumSyntax[] getEnumValueTable() {
         return (EnumSyntax[])myEnumValueTable.clone();
     }
@@ -457,6 +459,7 @@ public class JobStateReason extends EnumSyntax implements Attribute {
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobStateReason.class;
     }
@@ -470,6 +473,7 @@ public class JobStateReason extends EnumSyntax implements Attribute {
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-state-reason";
     }
diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java
index 22b438c02eb..4e3e66d0ea8 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReasons.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -140,6 +140,7 @@ public final class JobStateReasons
      *         class {@link JobStateReason JobStateReason}
      * @since 1.5
      */
+    @Override
     public boolean add(JobStateReason o) {
         if (o == null) {
             throw new NullPointerException();
@@ -157,6 +158,7 @@ public final class JobStateReasons
      * @return printing attribute class (category), an instance of class
      *         {@link Class java.lang.Class}
      */
+    @Override
     public final Class<? extends Attribute> getCategory() {
         return JobStateReasons.class;
     }
@@ -170,6 +172,7 @@ public final class JobStateReasons
      *
      * @return attribute category name
      */
+    @Override
     public final String getName() {
         return "job-state-reasons";
     }
diff --git a/src/java.desktop/share/classes/javax/swing/DebugGraphics.java b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
index 83b44716c04..512b56ee28a 100644
--- a/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
+++ b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1492,14 +1492,12 @@ public class DebugGraphics extends Graphics {
     /** Returns DebugGraphicsInfo, or creates one if none exists.
       */
     static DebugGraphicsInfo info() {
-        DebugGraphicsInfo debugGraphicsInfo = (DebugGraphicsInfo)
-            SwingUtilities.appContextGet(debugGraphicsInfoKey);
-        if (debugGraphicsInfo == null) {
-            debugGraphicsInfo = new DebugGraphicsInfo();
-            SwingUtilities.appContextPut(debugGraphicsInfoKey,
-                                         debugGraphicsInfo);
+        synchronized (DebugGraphicsInfo.class) {
+            if (debugGraphicsInfo == null) {
+                debugGraphicsInfo = new DebugGraphicsInfo();
+            }
+            return debugGraphicsInfo;
         }
-        return debugGraphicsInfo;
     }
-    private static final Class<DebugGraphicsInfo> debugGraphicsInfoKey = DebugGraphicsInfo.class;
+    private static DebugGraphicsInfo debugGraphicsInfo;
 }
diff --git a/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
index aaaa2dfd4a4..707a1766eee 100644
--- a/src/java.desktop/share/classes/javax/swing/ImageIcon.java
+++ b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,9 +53,6 @@ import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
 
-import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
-
 /**
  * An implementation of the Icon interface that paints Icons
  * from Images. Images that are created from a URL, filename or byte array
@@ -110,18 +107,7 @@ public class ImageIcon implements Icon, Serializable, Accessible {
      * @deprecated since 1.8
      */
     @Deprecated
-    protected static final Component component = createComponent();
-
-    private static final Component createComponent() {
-        try {
-            Component component = new Component() {};
-            // 6482575 - clear the appContext field so as not to leak it
-            AWTAccessor.getComponentAccessor().setAppContext(component, null);
-            return component;
-        } catch (Throwable t) {
-            return null;
-        }
-    }
+    protected static final Component component = new Component() {};
 
     /**
      * Do not use this shared media tracker, which is used to load images.
@@ -136,8 +122,6 @@ public class ImageIcon implements Icon, Serializable, Accessible {
      */
     private static int mediaTrackerID;
 
-    private static final Object TRACKER_KEY = new StringBuilder("TRACKER_KEY");
-
     int width = -1;
     int height = -1;
 
@@ -346,24 +330,12 @@ public class ImageIcon implements Icon, Serializable, Accessible {
         }
     }
 
+    private static final MediaTracker MEDIA_TRACKER = new MediaTracker(new Component() {});
     /**
-     * Returns the MediaTracker for the current AppContext, creating a new
-     * MediaTracker if necessary.
+     * Returns the shared MediaTracker.
      */
     private MediaTracker getTracker() {
-        Object trackerObj;
-        AppContext ac = AppContext.getAppContext();
-        // Opt: Only synchronize if trackerObj comes back null?
-        // If null, synchronize, re-check for null, and put new tracker
-        synchronized(ac) {
-            trackerObj = ac.get(TRACKER_KEY);
-            if (trackerObj == null) {
-                Component comp = new Component() {};
-                trackerObj = new MediaTracker(comp);
-                ac.put(TRACKER_KEY, trackerObj);
-            }
-        }
-        return (MediaTracker) trackerObj;
+        return MEDIA_TRACKER;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index f515115bade..6351522ab49 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -4885,8 +4885,7 @@ public abstract class JComponent extends Container implements Serializable,
      * @see RepaintManager#addDirtyRegion
      */
     public void repaint(long tm, int x, int y, int width, int height) {
-        RepaintManager.currentManager(SunToolkit.targetToAppContext(this))
-                      .addDirtyRegion(this, x, y, width, height);
+        RepaintManager.currentManager(this).addDirtyRegion(this, x, y, width, height);
     }
 
 
diff --git a/src/java.desktop/share/classes/javax/swing/JDialog.java b/src/java.desktop/share/classes/javax/swing/JDialog.java
index 99d6385cd7c..a7d8791c72c 100644
--- a/src/java.desktop/share/classes/javax/swing/JDialog.java
+++ b/src/java.desktop/share/classes/javax/swing/JDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,13 +101,6 @@ public class JDialog extends Dialog implements WindowConstants,
                                                RootPaneContainer,
                                TransferHandler.HasGetTransferHandler
 {
-    /**
-     * Key into the AppContext, used to check if should provide decorations
-     * by default.
-     */
-    private static final Object defaultLookAndFeelDecoratedKey =
-            new StringBuffer("JDialog.defaultLookAndFeelDecorated");
-
     private int defaultCloseOperation = HIDE_ON_CLOSE;
 
     /**
@@ -1119,6 +1112,8 @@ public class JDialog extends Dialog implements WindowConstants,
         }
     }
 
+    private static boolean defaultLAFDecorated;
+
     /**
      * Provides a hint as to whether or not newly created {@code JDialog}s
      * should have their Window decorations (such as borders, widgets to
@@ -1144,11 +1139,7 @@ public class JDialog extends Dialog implements WindowConstants,
      * @since 1.4
      */
     public static void setDefaultLookAndFeelDecorated(boolean defaultLookAndFeelDecorated) {
-        if (defaultLookAndFeelDecorated) {
-            SwingUtilities.appContextPut(defaultLookAndFeelDecoratedKey, Boolean.TRUE);
-        } else {
-            SwingUtilities.appContextPut(defaultLookAndFeelDecoratedKey, Boolean.FALSE);
-        }
+        defaultLAFDecorated = defaultLookAndFeelDecorated;
     }
 
     /**
@@ -1160,12 +1151,7 @@ public class JDialog extends Dialog implements WindowConstants,
      * @since 1.4
      */
     public static boolean isDefaultLookAndFeelDecorated() {
-        Boolean defaultLookAndFeelDecorated =
-            (Boolean) SwingUtilities.appContextGet(defaultLookAndFeelDecoratedKey);
-        if (defaultLookAndFeelDecorated == null) {
-            defaultLookAndFeelDecorated = Boolean.FALSE;
-        }
-        return defaultLookAndFeelDecorated.booleanValue();
+        return defaultLAFDecorated;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index 2f8f0f30722..3134b8bace2 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1227,12 +1227,11 @@ public class JEditorPane extends JTextComponent {
      */
     @SuppressWarnings("deprecation")
     public static EditorKit createEditorKitForContentType(String type) {
-        Hashtable<String, EditorKit> kitRegistry = getKitRegistry();
         EditorKit k = kitRegistry.get(type);
         if (k == null) {
             // try to dynamically load the support
-            String classname = getKitTypeRegistry().get(type);
-            ClassLoader loader = getKitLoaderRegistry().get(type);
+            String classname = kitTypeRegistry.get(type);
+            ClassLoader loader = kitLoaderRegistry.get(type);
             try {
                 Class<?> c;
                 if (loader != null) {
@@ -1287,13 +1286,13 @@ public class JEditorPane extends JTextComponent {
      * @param loader the <code>ClassLoader</code> to use to load the name
      */
     public static void registerEditorKitForContentType(String type, String classname, ClassLoader loader) {
-        getKitTypeRegistry().put(type, classname);
+        kitTypeRegistry.put(type, classname);
         if (loader != null) {
-            getKitLoaderRegistry().put(type, loader);
+            kitLoaderRegistry.put(type, loader);
         } else {
-            getKitLoaderRegistry().remove(type);
+            kitLoaderRegistry.remove(type);
         }
-        getKitRegistry().remove(type);
+        kitRegistry.remove(type);
     }
 
     /**
@@ -1306,63 +1305,27 @@ public class JEditorPane extends JTextComponent {
      * @since 1.3
      */
     public static String getEditorKitClassNameForContentType(String type) {
-        return getKitTypeRegistry().get(type);
+        return kitTypeRegistry.get(type);
     }
 
-    private static Hashtable<String, String> getKitTypeRegistry() {
-        loadDefaultKitsIfNecessary();
-        @SuppressWarnings("unchecked")
-        Hashtable<String, String> tmp =
-            (Hashtable)SwingUtilities.appContextGet(kitTypeRegistryKey);
-        return tmp;
-    }
+    private static final Hashtable<String, String> kitTypeRegistry = new Hashtable<>();
+    private static final Hashtable<String, ClassLoader> kitLoaderRegistry = new Hashtable<>();
 
-    private static Hashtable<String, ClassLoader> getKitLoaderRegistry() {
-        loadDefaultKitsIfNecessary();
-        @SuppressWarnings("unchecked")
-        Hashtable<String,  ClassLoader> tmp =
-            (Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey);
-        return tmp;
-    }
+    private static final Hashtable<String, EditorKit> kitRegistry = new Hashtable<>(3);
 
-    private static Hashtable<String, EditorKit> getKitRegistry() {
-        @SuppressWarnings("unchecked")
-        Hashtable<String, EditorKit> ht =
-            (Hashtable)SwingUtilities.appContextGet(kitRegistryKey);
-        if (ht == null) {
-            ht = new Hashtable<>(3);
-            SwingUtilities.appContextPut(kitRegistryKey, ht);
-        }
-        return ht;
-    }
-
-    /**
-     * This is invoked every time the registries are accessed. Loading
-     * is done this way instead of via a static as the static is only
-     * called once when running in an AppContext.
-     */
-    private static void loadDefaultKitsIfNecessary() {
-        if (SwingUtilities.appContextGet(kitTypeRegistryKey) == null) {
-            synchronized(defaultEditorKitMap) {
-                if (defaultEditorKitMap.size() == 0) {
-                    defaultEditorKitMap.put("text/plain",
-                                            "javax.swing.JEditorPane$PlainEditorKit");
-                    defaultEditorKitMap.put("text/html",
-                                            "javax.swing.text.html.HTMLEditorKit");
-                    defaultEditorKitMap.put("text/rtf",
-                                            "javax.swing.text.rtf.RTFEditorKit");
-                    defaultEditorKitMap.put("application/rtf",
-                                            "javax.swing.text.rtf.RTFEditorKit");
-                }
-            }
-            Hashtable<Object, Object> ht = new Hashtable<>();
-            SwingUtilities.appContextPut(kitTypeRegistryKey, ht);
-            ht = new Hashtable<>();
-            SwingUtilities.appContextPut(kitLoaderRegistryKey, ht);
-            for (String key : defaultEditorKitMap.keySet()) {
-                registerEditorKitForContentType(key,defaultEditorKitMap.get(key));
-            }
+    static final Map<String, String> defaultEditorKitMap = new HashMap<String, String>(0);
 
+    static {
+        defaultEditorKitMap.put("text/plain",
+                                "javax.swing.JEditorPane$PlainEditorKit");
+        defaultEditorKitMap.put("text/html",
+                                "javax.swing.text.html.HTMLEditorKit");
+        defaultEditorKitMap.put("text/rtf",
+                                "javax.swing.text.rtf.RTFEditorKit");
+        defaultEditorKitMap.put("application/rtf",
+                                "javax.swing.text.rtf.RTFEditorKit");
+        for (String key : defaultEditorKitMap.keySet()) {
+            registerEditorKitForContentType(key,defaultEditorKitMap.get(key));
         }
     }
 
@@ -1587,16 +1550,6 @@ public class JEditorPane extends JTextComponent {
      */
     private Hashtable<String, EditorKit> typeHandlers;
 
-    /*
-     * Private AppContext keys for this class's static variables.
-     */
-    private static final Object kitRegistryKey =
-        new StringBuffer("JEditorPane.kitRegistry");
-    private static final Object kitTypeRegistryKey =
-        new StringBuffer("JEditorPane.kitTypeRegistry");
-    private static final Object kitLoaderRegistryKey =
-        new StringBuffer("JEditorPane.kitLoaderRegistry");
-
     /**
      * @see #getUIClassID
      * @see #readObject
@@ -1633,8 +1586,6 @@ public class JEditorPane extends JTextComponent {
      */
     public static final String HONOR_DISPLAY_PROPERTIES = "JEditorPane.honorDisplayProperties";
 
-    static final Map<String, String> defaultEditorKitMap = new HashMap<String, String>(0);
-
     /**
      * Returns a string representation of this <code>JEditorPane</code>.
      * This method
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
index 8bde7e18f03..bab215625b9 100644
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -126,13 +126,6 @@ public class JFrame  extends Frame implements WindowConstants,
                                               RootPaneContainer,
                               TransferHandler.HasGetTransferHandler
 {
-    /**
-     * Key into the AppContext, used to check if should provide decorations
-     * by default.
-     */
-    private static final Object defaultLookAndFeelDecoratedKey =
-            new StringBuffer("JFrame.defaultLookAndFeelDecorated");
-
     private int defaultCloseOperation = HIDE_ON_CLOSE;
 
     /**
@@ -755,6 +748,8 @@ public class JFrame  extends Frame implements WindowConstants,
         }
     }
 
+    private static boolean defaultLAFDecorated;
+
     /**
      * Provides a hint as to whether or not newly created <code>JFrame</code>s
      * should have their Window decorations (such as borders, widgets to
@@ -780,11 +775,7 @@ public class JFrame  extends Frame implements WindowConstants,
      * @since 1.4
      */
     public static void setDefaultLookAndFeelDecorated(boolean defaultLookAndFeelDecorated) {
-        if (defaultLookAndFeelDecorated) {
-            SwingUtilities.appContextPut(defaultLookAndFeelDecoratedKey, Boolean.TRUE);
-        } else {
-            SwingUtilities.appContextPut(defaultLookAndFeelDecoratedKey, Boolean.FALSE);
-        }
+        defaultLAFDecorated = defaultLookAndFeelDecorated;
     }
 
 
@@ -797,12 +788,7 @@ public class JFrame  extends Frame implements WindowConstants,
      * @since 1.4
      */
     public static boolean isDefaultLookAndFeelDecorated() {
-        Boolean defaultLookAndFeelDecorated =
-            (Boolean) SwingUtilities.appContextGet(defaultLookAndFeelDecoratedKey);
-        if (defaultLookAndFeelDecorated == null) {
-            defaultLookAndFeelDecorated = Boolean.FALSE;
-        }
-        return defaultLookAndFeelDecorated.booleanValue();
+        return defaultLAFDecorated;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 9611f991025..f3295cd6ad8 100644
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,6 @@ import javax.swing.event.InternalFrameListener;
 import javax.swing.plaf.DesktopIconUI;
 import javax.swing.plaf.InternalFrameUI;
 
-import sun.awt.AppContext;
 import sun.swing.SwingUtilities2;
 
 /**
@@ -237,17 +236,13 @@ public class JInternalFrame extends JComponent implements
     /** Constrained property name indicating that the internal frame is iconified. */
     public static final String IS_ICON_PROPERTY = "icon";
 
-    private static final Object PROPERTY_CHANGE_LISTENER_KEY =
-        new StringBuilder("InternalFramePropertyChangeListener");
+    private static PropertyChangeListener focusListener;
 
     private static void addPropertyChangeListenerIfNecessary() {
-        if (AppContext.getAppContext().get(PROPERTY_CHANGE_LISTENER_KEY) ==
-            null) {
-            PropertyChangeListener focusListener =
-                new FocusPropertyChangeListener();
-
-            AppContext.getAppContext().put(PROPERTY_CHANGE_LISTENER_KEY,
-                focusListener);
+        synchronized (JInternalFrame.class) {
+            if (focusListener == null) {
+                focusListener = new FocusPropertyChangeListener();
+            }
 
             KeyboardFocusManager.getCurrentKeyboardFocusManager().
                 addPropertyChangeListener(focusListener);
diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index 38bde1a97fa..2ecc7cf3b1e 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,12 +112,6 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
      */
     private static final String uiClassID = "PopupMenuUI";
 
-    /**
-     * Key used in AppContext to determine if light way popups are the default.
-     */
-    private static final Object defaultLWPopupEnabledKey =
-        new StringBuffer("JPopupMenu.defaultLWPopupEnabledKey");
-
     /** Bug#4425878-Property javax.swing.adjustPopupLocationToFit introduced */
     static boolean popupPositionFixDisabled =
          System.getProperty("javax.swing.adjustPopupLocationToFit","").equals("false");
@@ -153,6 +147,8 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
     private static final boolean VERBOSE = false; // show reuse hits/misses
     private static final boolean DEBUG =   false;  // show bad params, misc.
 
+    private static boolean defaultLWPopupEnabled = true;
+
     /**
      *  Sets the default value of the <code>lightWeightPopupEnabled</code>
      *  property.
@@ -163,8 +159,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
      *  @see #setLightWeightPopupEnabled
      */
     public static void setDefaultLightWeightPopupEnabled(boolean aFlag) {
-        SwingUtilities.appContextPut(defaultLWPopupEnabledKey,
-                                     Boolean.valueOf(aFlag));
+        defaultLWPopupEnabled = aFlag;
     }
 
     /**
@@ -177,14 +172,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
      *  @see #setDefaultLightWeightPopupEnabled
      */
     public static boolean getDefaultLightWeightPopupEnabled() {
-        Boolean b = (Boolean)
-            SwingUtilities.appContextGet(defaultLWPopupEnabledKey);
-        if (b == null) {
-            SwingUtilities.appContextPut(defaultLWPopupEnabledKey,
-                                         Boolean.TRUE);
-            return true;
-        }
-        return b.booleanValue();
+        return defaultLWPopupEnabled;
     }
 
     /**
@@ -960,7 +948,9 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
             if (oldInvoker != null) {
                 oldInvoker.removePropertyChangeListener("ancestor", propListener);
             }
-            invoker.addPropertyChangeListener("ancestor", propListener);
+            if (invoker != null) {
+                invoker.addPropertyChangeListener("ancestor", propListener);
+            }
             ui.installUI(this);
         }
         invalidate();
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index 6e64b216d58..fa8110d1517 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3191,9 +3191,23 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * (maximum or minimum).
      *
      */
+
     public void doLayout() {
+        boolean prefWidthSet = false;
         TableColumn resizingColumn = getResizingColumn();
-        if (resizingColumn == null) {
+        // doLayout is called for both pack and show
+        // so if initial preferred width is set by user then
+        // it needs to be honoured even if resizingColumn
+        // is set to last column on account of
+        // AUTO_RESIZE_LAST_COLUMN autoResizeMode
+        for (int i = 0; i < columnModel.getColumnCount(); i++) {
+            if (columnModel.getColumn(i).getPreferredWidth() != 75
+                    && columnModel.getColumn(i).getWidth() == 75) {
+                prefWidthSet = true;
+                break;
+            }
+        }
+        if (resizingColumn == null || prefWidthSet) {
             setWidthsFromPreferredWidths(false);
         }
         else {
@@ -6007,6 +6021,8 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
 
         surrendersFocusOnKeystroke = f.get("surrendersFocusOnKeystroke", false);
         editorRemover = (PropertyChangeListener) f.get("editorRemover", null);
+        editingColumn = -1;
+        editingRow = -1;
         columnSelectionAdjusting = f.get("columnSelectionAdjusting", false);
         rowSelectionAdjusting = f.get("rowSelectionAdjusting", false);
         printError = (Throwable) f.get("printError", null);
@@ -6039,6 +6055,9 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * do any Swing-specific pre-serialization configuration.
      */
     void compWriteObjectNotify() {
+        if (isEditing() && !getCellEditor().stopCellEditing()) {
+            getCellEditor().cancelCellEditing();
+        }
         super.compWriteObjectNotify();
         // If ToolTipText != null, then the tooltip has already been
         // unregistered by JComponent.compWriteObjectNotify()
diff --git a/src/java.desktop/share/classes/javax/swing/LayoutStyle.java b/src/java.desktop/share/classes/javax/swing/LayoutStyle.java
index f1c384db6e2..bf84eb2379b 100644
--- a/src/java.desktop/share/classes/javax/swing/LayoutStyle.java
+++ b/src/java.desktop/share/classes/javax/swing/LayoutStyle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@ package javax.swing;
 
 import java.awt.Container;
 import javax.swing.plaf.ComponentUI;
-import sun.awt.AppContext;
 
 /**
  * <code>LayoutStyle</code> provides information about how to position
@@ -40,6 +39,9 @@ import sun.awt.AppContext;
  * @since 1.6
  */
 public abstract class LayoutStyle {
+
+    private static LayoutStyle sharedInstance;
+
     /**
      * Sets the shared instance of <code>LayoutStyle</code>.  Specifying
      * <code>null</code> results in using the <code>LayoutStyle</code> from
@@ -51,10 +53,10 @@ public abstract class LayoutStyle {
     public static void setInstance(LayoutStyle style) {
         synchronized(LayoutStyle.class) {
             if (style == null) {
-                AppContext.getAppContext().remove(LayoutStyle.class);
+                sharedInstance = null;
             }
             else {
-                AppContext.getAppContext().put(LayoutStyle.class, style);
+                sharedInstance = style;
             }
         }
     }
@@ -70,8 +72,7 @@ public abstract class LayoutStyle {
     public static LayoutStyle getInstance() {
         LayoutStyle style;
         synchronized(LayoutStyle.class) {
-            style = (LayoutStyle)AppContext.getAppContext().
-                    get(LayoutStyle.class);
+            style = sharedInstance;
         }
         if (style == null) {
             return UIManager.getLookAndFeel().getLayoutStyle();
diff --git a/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java b/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java
index c84a218b877..ba80fc3bc95 100644
--- a/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java
+++ b/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.util.*;
 import java.awt.event.*;
 import javax.swing.event.*;
 
-import sun.awt.AppContext;
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAccessor.MouseEventAccessor;
 import sun.swing.SwingUtilities2;
@@ -48,8 +47,7 @@ public class MenuSelectionManager {
     private static final boolean VERBOSE = false; // show reuse hits/misses
     private static final boolean DEBUG =   false;  // show bad params, misc.
 
-    private static final StringBuilder MENU_SELECTION_MANAGER_KEY =
-                       new StringBuilder("javax.swing.MenuSelectionManager");
+    private static final MenuSelectionManager DEFAULT_MSM = new MenuSelectionManager();
 
     /**
      * Constructs a {@code MenuSelectionManager}.
@@ -62,23 +60,7 @@ public class MenuSelectionManager {
      * @return a MenuSelectionManager object
      */
     public static MenuSelectionManager defaultManager() {
-        synchronized (MENU_SELECTION_MANAGER_KEY) {
-            AppContext context = AppContext.getAppContext();
-            MenuSelectionManager msm = (MenuSelectionManager)context.get(
-                                                 MENU_SELECTION_MANAGER_KEY);
-            if (msm == null) {
-                msm = new MenuSelectionManager();
-                context.put(MENU_SELECTION_MANAGER_KEY, msm);
-
-                // installing additional listener if found in the AppContext
-                Object o = context.get(SwingUtilities2.MENU_SELECTION_MANAGER_LISTENER_KEY);
-                if (o instanceof ChangeListener listener) {
-                    msm.addChangeListener(listener);
-                }
-            }
-
-            return msm;
-        }
+        return DEFAULT_MSM;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
index 2b274c816b1..208177fc55e 100644
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,13 +80,6 @@ public class PopupFactory {
             }
         });
     }
-    /**
-     * The shared instanceof <code>PopupFactory</code> is per
-     * <code>AppContext</code>. This is the key used in the
-     * <code>AppContext</code> to locate the <code>PopupFactory</code>.
-     */
-    private static final Object SharedInstanceKey =
-        new StringBuffer("PopupFactory.SharedInstanceKey");
 
     /**
      * Max number of items to store in any one particular cache.
@@ -118,6 +111,7 @@ public class PopupFactory {
      */
     public PopupFactory() {}
 
+    static PopupFactory sharedFactory;
     /**
      * Sets the <code>PopupFactory</code> that will be used to obtain
      * <code>Popup</code>s.
@@ -132,7 +126,9 @@ public class PopupFactory {
         if (factory == null) {
             throw new IllegalArgumentException("PopupFactory can not be null");
         }
-        SwingUtilities.appContextPut(SharedInstanceKey, factory);
+        synchronized (PopupFactory.class) {
+            sharedFactory = factory;
+        }
     }
 
     /**
@@ -142,14 +138,12 @@ public class PopupFactory {
      * @return Shared PopupFactory
      */
     public static PopupFactory getSharedInstance() {
-        PopupFactory factory = (PopupFactory)SwingUtilities.appContextGet(
-                         SharedInstanceKey);
-
-        if (factory == null) {
-            factory = new PopupFactory();
-            setSharedInstance(factory);
+        synchronized (PopupFactory.class) {
+            if (sharedFactory == null) {
+                sharedFactory = new PopupFactory();
+            }
+            return sharedFactory;
         }
-        return factory;
     }
 
 
@@ -351,8 +345,6 @@ public class PopupFactory {
      * Popup implementation that uses a Window as the popup.
      */
     private static class HeavyWeightPopup extends Popup {
-        private static final Object heavyWeightPopupCacheKey =
-                 new StringBuffer("PopupFactory.heavyWeightPopupCache");
 
         private volatile boolean isCacheEnabled = true;
 
@@ -434,21 +426,16 @@ public class PopupFactory {
             }
         }
 
+        private static Map<Window, List<HeavyWeightPopup>> cache;
         /**
          * Returns the cache to use for heavy weight popups. Maps from
          * <code>Window</code> to a <code>List</code> of
          * <code>HeavyWeightPopup</code>s.
          */
-        @SuppressWarnings("unchecked")
         private static Map<Window, List<HeavyWeightPopup>> getHeavyWeightPopupCache() {
             synchronized (HeavyWeightPopup.class) {
-                Map<Window, List<HeavyWeightPopup>> cache = (Map<Window, List<HeavyWeightPopup>>)SwingUtilities.appContextGet(
-                                  heavyWeightPopupCacheKey);
-
                 if (cache == null) {
                     cache = new HashMap<>(2);
-                    SwingUtilities.appContextPut(heavyWeightPopupCacheKey,
-                                                 cache);
                 }
                 return cache;
             }
@@ -728,18 +715,17 @@ public class PopupFactory {
             return popup;
         }
 
+        private static List<LightWeightPopup> cache;
         /**
          * Returns the cache to use for heavy weight popups.
          */
-        @SuppressWarnings("unchecked")
         private static List<LightWeightPopup> getLightWeightPopupCache() {
-            List<LightWeightPopup> cache = (List<LightWeightPopup>)SwingUtilities.appContextGet(
-                                   lightWeightPopupCacheKey);
-            if (cache == null) {
-                cache = new ArrayList<>();
-                SwingUtilities.appContextPut(lightWeightPopupCacheKey, cache);
+            synchronized (LightWeightPopup.class) {
+                if (cache == null) {
+                    cache = new ArrayList<>();
+                }
+                return cache;
             }
-            return cache;
         }
 
         /**
@@ -849,8 +835,6 @@ public class PopupFactory {
      * Popup implementation that uses a Panel as the popup.
      */
     private static class MediumWeightPopup extends ContainerPopup {
-        private static final Object mediumWeightPopupCacheKey =
-                             new StringBuffer("PopupFactory.mediumPopupCache");
 
         /** Child of the panel. The contents are added to this. */
         private JRootPane rootPane;
@@ -877,19 +861,18 @@ public class PopupFactory {
             return popup;
         }
 
+        private static List<MediumWeightPopup> cache;
         /**
          * Returns the cache to use for medium weight popups.
          */
         @SuppressWarnings("unchecked")
         private static List<MediumWeightPopup> getMediumWeightPopupCache() {
-            List<MediumWeightPopup> cache = (List<MediumWeightPopup>)SwingUtilities.appContextGet(
-                                    mediumWeightPopupCacheKey);
-
-            if (cache == null) {
-                cache = new ArrayList<>();
-                SwingUtilities.appContextPut(mediumWeightPopupCacheKey, cache);
+            synchronized (MediumWeightPopup.class) {
+                if (cache == null) {
+                    cache = new ArrayList<>();
+                }
+                return cache;
             }
-            return cache;
         }
 
         /**
diff --git a/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
index dcc755cb4bc..db8b13afa22 100644
--- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java
+++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,8 +119,6 @@ public class RepaintManager
      */
     private PaintManager paintManager;
 
-    private static final Object repaintManagerKey = RepaintManager.class;
-
     // Whether or not a VolatileImage should be used for double-buffered painting
     static boolean volatileImageBufferEnabled = true;
     /**
@@ -236,8 +234,10 @@ public class RepaintManager
         }
     }
 
+    private static RepaintManager repaintManager;
+
     /**
-     * Return the RepaintManager for the calling thread given a Component.
+     * Return the RepaintManager given a Component.
      *
      * @param c a Component -- unused in the default implementation, but could
      *          be used by an overridden version to return a different RepaintManager
@@ -249,21 +249,15 @@ public class RepaintManager
         // component is ever used to determine the current
         // RepaintManager, DisplayChangedRunnable will need to be modified
         // accordingly.
-        return currentManager(AppContext.getAppContext());
-    }
 
-    /**
-     * Returns the RepaintManager for the specified AppContext.  If
-     * a RepaintManager has not been created for the specified
-     * AppContext this will return null.
-     */
-    static RepaintManager currentManager(AppContext appContext) {
-        RepaintManager rm = (RepaintManager)appContext.get(repaintManagerKey);
-        if (rm == null) {
-            rm = new RepaintManager(BUFFER_STRATEGY_TYPE);
-            appContext.put(repaintManagerKey, rm);
+        synchronized (RepaintManager.class) {
+            RepaintManager rm = repaintManager;
+            if (rm == null) {
+                rm = new RepaintManager(BUFFER_STRATEGY_TYPE);
+                repaintManager = rm;
+            }
+            return rm;
         }
-        return rm;
     }
 
     /**
@@ -282,16 +276,12 @@ public class RepaintManager
 
 
     /**
-     * Set the RepaintManager that should be used for the calling
-     * thread. <b>aRepaintManager</b> will become the current RepaintManager
-     * for the calling thread's thread group.
+     * Set the RepaintManager.
      * @param aRepaintManager  the RepaintManager object to use
      */
     public static void setCurrentManager(RepaintManager aRepaintManager) {
-        if (aRepaintManager != null) {
-            SwingUtilities.appContextPut(repaintManagerKey, aRepaintManager);
-        } else {
-            SwingUtilities.appContextRemove(repaintManagerKey);
+        synchronized (RepaintManager.class) {
+            repaintManager = aRepaintManager;
         }
     }
 
@@ -373,7 +363,7 @@ public class RepaintManager
 
         // Queue a Runnable to invoke paintDirtyRegions and
         // validateInvalidComponents.
-        scheduleProcessingRunnable(SunToolkit.targetToAppContext(invalidComponent));
+        scheduleProcessingRunnable();
     }
 
 
@@ -460,7 +450,7 @@ public class RepaintManager
 
         // Queue a Runnable to invoke paintDirtyRegions and
         // validateInvalidComponents.
-        scheduleProcessingRunnable(SunToolkit.targetToAppContext(c));
+        scheduleProcessingRunnable();
     }
 
     /**
@@ -530,8 +520,7 @@ public class RepaintManager
     // This is called from the toolkit thread when a native expose is
     // received.
     //
-    void nativeAddDirtyRegion(AppContext appContext, Container c,
-                              int x, int y, int w, int h) {
+    void nativeAddDirtyRegion(Container c, int x, int y, int w, int h) {
         if (w > 0 && h > 0) {
             synchronized(this) {
                 Rectangle dirty = hwDirtyComponents.get(c);
@@ -543,7 +532,7 @@ public class RepaintManager
                                               x, y, w, h, dirty));
                 }
             }
-            scheduleProcessingRunnable(appContext);
+            scheduleProcessingRunnable();
         }
     }
 
@@ -551,8 +540,7 @@ public class RepaintManager
     // This is called from the toolkit thread when awt needs to run a
     // Runnable before we paint.
     //
-    void nativeQueueSurfaceDataRunnable(AppContext appContext,
-                                        final Component c, final Runnable r)
+    void nativeQueueSurfaceDataRunnable(final Component c, final Runnable r)
     {
         synchronized(this) {
             if (runnableList == null) {
@@ -560,7 +548,7 @@ public class RepaintManager
             }
             runnableList.add(r);
         }
-        scheduleProcessingRunnable(appContext);
+        scheduleProcessingRunnable();
     }
 
     /**
@@ -1411,11 +1399,11 @@ public class RepaintManager
         return paintManager;
     }
 
-    private void scheduleProcessingRunnable(AppContext context) {
+    private void scheduleProcessingRunnable() {
         if (processingRunnable.markPending()) {
             Toolkit tk = Toolkit.getDefaultToolkit();
             if (tk instanceof SunToolkit) {
-                SunToolkit.getSystemEventQueueImplPP(context).
+                SunToolkit.getSystemEventQueueImplPP().
                   postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(),
                                                 processingRunnable));
             } else {
@@ -1733,8 +1721,7 @@ public class RepaintManager
     /**
      * Listener installed to detect display changes. When display changes,
      * schedules a callback to notify all RepaintManagers of the display
-     * changes. Only one DisplayChangedHandler is ever installed. The
-     * singleton instance will schedule notification for all AppContexts.
+     * changes. Only one DisplayChangedHandler is ever installed.
      */
     private static final class DisplayChangedHandler implements
                                              DisplayChangedListener {
diff --git a/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
index 4a7b0821a3d..8c904f7d00c 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingPaintEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ import java.awt.Component;
 import java.awt.Container;
 import java.awt.Rectangle;
 import java.awt.event.PaintEvent;
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.awt.event.IgnorePaintEvent;
 
@@ -52,12 +51,10 @@ class SwingPaintEventDispatcher extends sun.awt.PaintEventDispatcher {
     public PaintEvent createPaintEvent(Component component, int x, int y,
                                          int w, int h) {
         if (component instanceof RootPaneContainer) {
-            AppContext appContext = SunToolkit.targetToAppContext(component);
-            RepaintManager rm = RepaintManager.currentManager(appContext);
+            RepaintManager rm = RepaintManager.currentManager(component);
             if (!SHOW_FROM_DOUBLE_BUFFER ||
                   !rm.show((Container)component, x, y, w, h)) {
-                rm.nativeAddDirtyRegion(appContext, (Container)component,
-                                        x, y, w, h);
+                rm.nativeAddDirtyRegion((Container)component, x, y, w, h);
             }
             // For backward compatibility generate an empty paint
             // event.  Not doing this broke parts of Netbeans.
@@ -65,10 +62,8 @@ class SwingPaintEventDispatcher extends sun.awt.PaintEventDispatcher {
                                         new Rectangle(x, y, w, h));
         }
         else if (component instanceof SwingHeavyWeight) {
-            AppContext appContext = SunToolkit.targetToAppContext(component);
-            RepaintManager rm = RepaintManager.currentManager(appContext);
-            rm.nativeAddDirtyRegion(appContext, (Container)component,
-                                    x, y, w, h);
+            RepaintManager rm = RepaintManager.currentManager(component);
+            rm.nativeAddDirtyRegion((Container)component, x, y, w, h);
             return new IgnorePaintEvent(component, PaintEvent.PAINT,
                                         new Rectangle(x, y, w, h));
         }
@@ -81,9 +76,7 @@ class SwingPaintEventDispatcher extends sun.awt.PaintEventDispatcher {
 
     public boolean queueSurfaceDataReplacing(Component c, Runnable r) {
         if (c instanceof RootPaneContainer) {
-            AppContext appContext = SunToolkit.targetToAppContext(c);
-            RepaintManager.currentManager(appContext).
-                    nativeQueueSurfaceDataRunnable(appContext, c, r);
+            RepaintManager.currentManager(c).nativeQueueSurfaceDataRunnable(c, r);
             return true;
         }
         return super.queueSurfaceDataReplacing(c, r);
diff --git a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
index bc6441212de..afe1c444c31 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1899,11 +1899,6 @@ public class SwingUtilities implements SwingConstants
         return null;
     }
 
-
-    // Don't use String, as it's not guaranteed to be unique in a Hashtable.
-    private static final Object sharedOwnerFrameKey =
-       new StringBuffer("SwingUtilities.sharedOwnerFrame");
-
     @SuppressWarnings("serial") // JDK-implementation class
     static class SharedOwnerFrame extends Frame implements WindowListener {
         public void addNotify() {
@@ -1961,6 +1956,7 @@ public class SwingUtilities implements SwingConstants
         }
     }
 
+    private static Frame sharedOwnerFrame;
     /**
      * Returns a toolkit-private, shared, invisible Frame
      * to be the owner for JDialogs and JWindows created with
@@ -1970,14 +1966,12 @@ public class SwingUtilities implements SwingConstants
      * @see java.awt.GraphicsEnvironment#isHeadless
      */
     static Frame getSharedOwnerFrame() throws HeadlessException {
-        Frame sharedOwnerFrame =
-            (Frame)SwingUtilities.appContextGet(sharedOwnerFrameKey);
-        if (sharedOwnerFrame == null) {
-            sharedOwnerFrame = new SharedOwnerFrame();
-            SwingUtilities.appContextPut(sharedOwnerFrameKey,
-                                         sharedOwnerFrame);
+        synchronized (SharedOwnerFrame.class) {
+            if (sharedOwnerFrame == null) {
+                sharedOwnerFrame = new SharedOwnerFrame();
+            }
+            return sharedOwnerFrame;
         }
-        return sharedOwnerFrame;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
index a9e2c6e69bb..4c3d0209823 100644
--- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
+++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
@@ -61,7 +61,6 @@ public final class ToolTipManager extends MouseAdapter implements MouseMotionLis
     JComponent insideComponent;
     MouseEvent mouseEvent;
     boolean showImmediately;
-    private static final Object TOOL_TIP_MANAGER_KEY = new Object();
     transient Popup tipWindow;
     /** The Window tip is being displayed in. This will be non-null if
      * the Window tip is in differs from that of insideComponent's Window.
@@ -394,19 +393,19 @@ public final class ToolTipManager extends MouseAdapter implements MouseMotionLis
         }
     }
 
+    private static ToolTipManager manager;
     /**
      * Returns a shared <code>ToolTipManager</code> instance.
      *
      * @return a shared <code>ToolTipManager</code> object
      */
     public static ToolTipManager sharedInstance() {
-        Object value = SwingUtilities.appContextGet(TOOL_TIP_MANAGER_KEY);
-        if (value instanceof ToolTipManager) {
-            return (ToolTipManager) value;
+        synchronized(ToolTipManager.class) {
+            if (manager == null) {
+                manager = new ToolTipManager();
+            }
+            return manager;
         }
-        ToolTipManager manager = new ToolTipManager();
-        SwingUtilities.appContextPut(TOOL_TIP_MANAGER_KEY, manager);
-        return manager;
     }
 
     // add keylistener here to trigger tip for access
diff --git a/src/java.desktop/share/classes/javax/swing/UIManager.java b/src/java.desktop/share/classes/javax/swing/UIManager.java
index 7a2ae226f33..69063c562e6 100644
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@ import java.util.Objects;
 import sun.awt.AppContext;
 import sun.awt.AWTAccessor;
 
+import sun.swing.SwingAccessor;
 
 /**
  * {@code UIManager} manages the current look and feel, the set of
@@ -233,8 +234,9 @@ public class UIManager implements Serializable
      */
     public UIManager() {}
 
+    private static final LAFState LAF_STATE = new LAFState();
     /**
-     * Return the <code>LAFState</code> object, lazily create one if necessary.
+     * Return the <code>LAFState</code> object.
      * All access to the <code>LAFState</code> fields is done via this method,
      * for example:
      * <pre>
@@ -242,22 +244,18 @@ public class UIManager implements Serializable
      * </pre>
      */
     private static LAFState getLAFState() {
-        LAFState rv = (LAFState)SwingUtilities.appContextGet(
-                SwingUtilities2.LAF_STATE_KEY);
-        if (rv == null) {
-            synchronized (classLock) {
-                rv = (LAFState)SwingUtilities.appContextGet(
-                        SwingUtilities2.LAF_STATE_KEY);
-                if (rv == null) {
-                    SwingUtilities.appContextPut(
-                            SwingUtilities2.LAF_STATE_KEY,
-                            (rv = new LAFState()));
-                }
-            }
+        synchronized (classLock) {
+            return LAF_STATE;
         }
-        return rv;
     }
 
+    static {
+        SwingAccessor.setLAFStateAccessor(UIManager::isLafStateInitialized);
+    }
+
+    private static boolean isLafStateInitialized() {
+        return LAF_STATE.initialized;
+    }
 
     /* Keys used in the <code>swing.properties</code> properties file.
      * See loadUserProperties(), initialize().
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
index c7c036e859f..7846e04b565 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.text.View;
 
-import sun.awt.AppContext;
 import sun.swing.SwingUtilities2;
 
 /**
@@ -88,7 +87,7 @@ public class BasicButtonUI extends ButtonUI{
 
     private static final String propertyPrefix = "Button" + ".";
 
-    private static final Object BASIC_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new BasicButtonUI();
 
     private KeyListener keyListener = null;
 
@@ -107,14 +106,7 @@ public class BasicButtonUI extends ButtonUI{
      * @return an instance of {@code BasicButtonUI}
      */
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        BasicButtonUI buttonUI =
-                (BasicButtonUI) appContext.get(BASIC_BUTTON_UI_KEY);
-        if (buttonUI == null) {
-            buttonUI = new BasicButtonUI();
-            appContext.put(BASIC_BUTTON_UI_KEY, buttonUI);
-        }
-        return buttonUI;
+        return UI;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
index 24af28c94c0..49549521005 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package javax.swing.plaf.basic;
 
-import sun.awt.AppContext;
-
 import javax.swing.*;
 
 import java.awt.*;
@@ -51,7 +49,7 @@ import java.io.Serializable;
  */
 public class BasicCheckBoxUI extends BasicRadioButtonUI {
 
-    private static final Object BASIC_CHECK_BOX_UI_KEY = new Object();
+    private static final ComponentUI UI = new BasicCheckBoxUI();
 
     private static final String propertyPrefix = "CheckBox" + ".";
 
@@ -71,14 +69,7 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI {
      * @return an instance of {@code BasicCheckBoxUI}
      */
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        BasicCheckBoxUI checkboxUI =
-                (BasicCheckBoxUI) appContext.get(BASIC_CHECK_BOX_UI_KEY);
-        if (checkboxUI == null) {
-            checkboxUI = new BasicCheckBoxUI();
-            appContext.put(BASIC_CHECK_BOX_UI_KEY, checkboxUI);
-        }
-        return checkboxUI;
+        return UI;
     }
 
     public String getPropertyPrefix() {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
index 2d1a458e0d7..de3cb1adf75 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@ import javax.swing.text.*;
 import javax.swing.event.*;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
-import sun.awt.AppContext;
 import sun.swing.DefaultLookup;
 import sun.swing.SwingUtilities2;
 import sun.swing.UIAction;
@@ -202,10 +201,6 @@ public class BasicComboBoxUI extends ComboBoxUI {
     // Cached the size that the display needs to render the largest item
     private Dimension cachedDisplaySize = new Dimension( 0, 0 );
 
-    // Key used for lookup of the DefaultListCellRenderer in the AppContext.
-    private static final Object COMBO_UI_LIST_CELL_RENDERER_KEY =
-                        new StringBuffer("DefaultListCellRendererKey");
-
     static final StringBuffer HIDE_POPUP_KEY
                   = new StringBuffer("HidePopupKey");
 
@@ -237,18 +232,10 @@ public class BasicComboBoxUI extends ComboBoxUI {
      */
     public BasicComboBoxUI() {}
 
+    private static final ListCellRenderer<Object> CELL_RENDERER = new DefaultListCellRenderer();
     // Used for calculating the default size.
     private static ListCellRenderer<Object> getDefaultListCellRenderer() {
-        @SuppressWarnings("unchecked")
-        ListCellRenderer<Object> renderer = (ListCellRenderer)AppContext.
-                         getAppContext().get(COMBO_UI_LIST_CELL_RENDERER_KEY);
-
-        if (renderer == null) {
-            renderer = new DefaultListCellRenderer();
-            AppContext.getAppContext().put(COMBO_UI_LIST_CELL_RENDERER_KEY,
-                                           new DefaultListCellRenderer());
-        }
-        return renderer;
+        return CELL_RENDERER;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
index 279de053fd6..04251ca6266 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package javax.swing.plaf.basic;
 import sun.swing.SwingUtilities2;
 import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
-import sun.awt.AppContext;
 
 import javax.swing.*;
 import javax.swing.plaf.*;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
index 12b871d6efd..964ee1cb9c9 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,6 @@ import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.InsetsUIResource;
 import javax.swing.text.DefaultEditorKit;
 
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
@@ -126,11 +125,6 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab
 
     AWTEventHelper invocator = null;
 
-    /*
-     * Listen for our AppContext being disposed
-     */
-    private PropertyChangeListener disposer = null;
-
     /**
      * Constructor for subclasses to call.
      */
@@ -174,18 +168,6 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab
         if (invocator == null) {
             invocator = new AWTEventHelper();
             needsEventHelper = true;
-
-            // Add a PropertyChangeListener to our AppContext so we're alerted
-            // when the AppContext is disposed(), at which time this laf should
-            // be uninitialize()d.
-            disposer = new PropertyChangeListener() {
-                public void propertyChange(PropertyChangeEvent prpChg) {
-                    uninitialize();
-                }
-            };
-            AppContext.getAppContext().addPropertyChangeListener(
-                                                        AppContext.GUI_DISPOSED,
-                                                        disposer);
         }
     }
 
@@ -193,35 +175,21 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab
      * {@inheritDoc}
      */
     public void uninitialize() {
-        AppContext context = AppContext.getAppContext();
-        synchronized (BasicPopupMenuUI.MOUSE_GRABBER_KEY) {
-            Object grabber = context.get(BasicPopupMenuUI.MOUSE_GRABBER_KEY);
-            if (grabber != null) {
-                ((BasicPopupMenuUI.MouseGrabber)grabber).uninstall();
-            }
-        }
-        synchronized (BasicPopupMenuUI.MENU_KEYBOARD_HELPER_KEY) {
-            Object helper =
-                    context.get(BasicPopupMenuUI.MENU_KEYBOARD_HELPER_KEY);
-            if (helper != null) {
-                ((BasicPopupMenuUI.MenuKeyboardHelper)helper).uninstall();
-            }
-        }
+        synchronized (BasicPopupMenuUI.class) {
+            if (BasicPopupMenuUI.mouseGrabber != null) {
+                BasicPopupMenuUI.mouseGrabber.uninstall();
+                BasicPopupMenuUI.mouseGrabber = null;
+             }
+            if (BasicPopupMenuUI.menuKeyboardHelper != null) {
+               BasicPopupMenuUI.menuKeyboardHelper.uninstall();
+               BasicPopupMenuUI.menuKeyboardHelper = null;
+             }
+         }
 
-        if(invocator != null) {
+        if (invocator != null) {
             invocator.run();
             invocator = null;
         }
-
-        if (disposer != null) {
-            // Note that we're likely calling removePropertyChangeListener()
-            // during the course of AppContext.firePropertyChange().
-            // However, EventListenerAggregate has code to safely modify
-            // the list under such circumstances.
-            context.removePropertyChangeListener(AppContext.GUI_DISPOSED,
-                                                 disposer);
-            disposer = null;
-        }
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
index a6d2a448186..8c7ac94b04e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -452,78 +452,54 @@ public class BasicOptionPaneUI extends OptionPaneUI {
             } else if ((nl = s.indexOf('\n')) >= 0) {
                 nll = 1;
             }
-            if (s.contains("<html>")) {
-                /* line break in html text is done by <br> tag
-                 * and not by /n so it's incorrect to address newline
-                 * same as non-html text.
-                 * Text between <html> </html> tags are extracted
-                 * and rendered as JLabel text
-                 */
-                int index1 = s.indexOf("<html>");
-                int index2 = s.indexOf("</html>");
-                String str = "";
-                if (index2 >= 0) {
-                    str = s.substring(index2 + "</html>".length());
-                    s = s.substring(index1, index2 + + "</html>".length());
+            if (nl >= 0) {
+                // break up newlines
+                if (nl == 0) {
+                    JPanel breakPanel = new JPanel() {
+                        public Dimension getPreferredSize() {
+                            Font f = getFont();
+
+                            if (f != null) {
+                                return new Dimension(1, f.getSize() + 2);
+                            }
+                            return new Dimension(0, 0);
+                        }
+                    };
+                    breakPanel.setName("OptionPane.break");
+                    addMessageComponents(container, cons, breakPanel, maxll,
+                                         true);
+                } else {
+                    addMessageComponents(container, cons, s.substring(0, nl),
+                                         maxll, false);
                 }
-                JLabel label;
-                label = new JLabel(s, JLabel.LEADING);
+                // Prevent recursion of more than
+                // 200 successive newlines in a message
+                // and indicate message is truncated via ellipsis
+                if (recursionCount++ > 200) {
+                    recursionCount = 0;
+                    addMessageComponents(container, cons, new String("..."),
+                                         maxll, false);
+                    return;
+                }
+                addMessageComponents(container, cons, s.substring(nl + nll), maxll,
+                                     false);
+
+            } else if (len > maxll) {
+                Container c = Box.createVerticalBox();
+                c.setName("OptionPane.verticalBox");
+                burstStringInto(c, s, maxll);
+                addMessageComponents(container, cons, c, maxll, true);
+
+            } else {
+                JLabel label = new JLabel();
                 if (Boolean.TRUE.equals(
-                    this.optionPane.getClientProperty("html.disable"))) {
+                    optionPane.getClientProperty("html.disable"))) {
                     label.putClientProperty("html.disable", true);
                 }
+                label.setText(s);
                 label.setName("OptionPane.label");
                 configureMessageLabel(label);
                 addMessageComponents(container, cons, label, maxll, true);
-                if (!str.isEmpty()) {
-                    addMessageComponents(container, cons, str, maxll, false);
-                }
-            } else {
-                if (nl >= 0) {
-                    // break up newlines
-                    if (nl == 0) {
-                                JPanel breakPanel = new JPanel() {
-                            public Dimension getPreferredSize() {
-                                Font f = getFont();
-
-                                if (f != null) {
-                                    return new Dimension(1, f.getSize() + 2);
-                                }
-                                return new Dimension(0, 0);
-                            }
-                        };
-                        breakPanel.setName("OptionPane.break");
-                        addMessageComponents(container, cons, breakPanel, maxll,
-                                true);
-                    } else {
-                        addMessageComponents(container, cons, s.substring(0, nl),
-                                maxll, false);
-                    }
-                    // Prevent recursion of more than
-                    // 200 successive newlines in a message
-                    // and indicate message is truncated via ellipsis
-                    if (recursionCount++ > 200) {
-                        recursionCount = 0;
-                        addMessageComponents(container, cons, new String("..."),
-                                maxll, false);
-                        return;
-                    }
-                    addMessageComponents(container, cons, s.substring(nl + nll), maxll,
-                            false);
-
-                } else if (len > maxll) {
-                    Container c = Box.createVerticalBox();
-                    c.setName("OptionPane.verticalBox");
-                    burstStringInto(c, s, maxll);
-                    addMessageComponents(container, cons, c, maxll, true);
-
-                } else {
-                    JLabel label;
-                    label = new JLabel(s, JLabel.LEADING);
-                    label.setName("OptionPane.label");
-                    configureMessageLabel(label);
-                    addMessageComponents(container, cons, label, maxll, true);
-                }
             }
         }
     }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
index 6fab795e36c..8df27d3e3cb 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,6 @@ import java.util.*;
 
 import sun.swing.UIAction;
 
-import sun.awt.AppContext;
-
 /**
  * A Windows L&amp;F implementation of PopupMenuUI.  This implementation
  * is a "combined" view/controller.
@@ -52,10 +50,9 @@ import sun.awt.AppContext;
  * @author Arnaud Weber
  */
 public class BasicPopupMenuUI extends PopupMenuUI {
-    static final StringBuilder MOUSE_GRABBER_KEY = new StringBuilder(
-                   "javax.swing.plaf.basic.BasicPopupMenuUI.MouseGrabber");
-    static final StringBuilder MENU_KEYBOARD_HELPER_KEY = new StringBuilder(
-                   "javax.swing.plaf.basic.BasicPopupMenuUI.MenuKeyboardHelper");
+
+    static MouseGrabber mouseGrabber = new MouseGrabber();
+    static MenuKeyboardHelper menuKeyboardHelper = null;
 
     /**
      * The instance of {@code JPopupMenu}.
@@ -126,23 +123,18 @@ public class BasicPopupMenuUI extends PopupMenuUI {
         }
         popupMenu.addMenuKeyListener(menuKeyListener);
 
-        AppContext context = AppContext.getAppContext();
-        synchronized (MOUSE_GRABBER_KEY) {
-            MouseGrabber mouseGrabber = (MouseGrabber)context.get(
-                                                     MOUSE_GRABBER_KEY);
-            if (mouseGrabber == null) {
-                mouseGrabber = new MouseGrabber();
-                context.put(MOUSE_GRABBER_KEY, mouseGrabber);
-            }
+        synchronized (MouseGrabber.class) {
+           if (mouseGrabber == null) mouseGrabber = new MouseGrabber();
         }
-        synchronized (MENU_KEYBOARD_HELPER_KEY) {
-            MenuKeyboardHelper helper =
-                    (MenuKeyboardHelper)context.get(MENU_KEYBOARD_HELPER_KEY);
+
+        synchronized (BasicPopupMenuUI.class) {
+            MenuKeyboardHelper helper = menuKeyboardHelper;
             if (helper == null) {
                 helper = new MenuKeyboardHelper();
-                context.put(MENU_KEYBOARD_HELPER_KEY, helper);
                 MenuSelectionManager msm = MenuSelectionManager.defaultManager();
                 msm.addChangeListener(helper);
+                menuKeyboardHelper = helper;
+
             }
         }
     }
@@ -768,10 +760,10 @@ public class BasicPopupMenuUI extends PopupMenuUI {
         }
 
         void uninstall() {
-            synchronized (MOUSE_GRABBER_KEY) {
+            synchronized (MouseGrabber.class) {
                 MenuSelectionManager.defaultManager().removeChangeListener(this);
                 ungrabWindow();
-                AppContext.getAppContext().remove(MOUSE_GRABBER_KEY);
+                mouseGrabber = null;
             }
         }
 
@@ -1233,9 +1225,8 @@ public class BasicPopupMenuUI extends PopupMenuUI {
         }
 
         void uninstall() {
-            synchronized (MENU_KEYBOARD_HELPER_KEY) {
+            synchronized (BasicPopupMenuUI.class) {
                 MenuSelectionManager.defaultManager().removeChangeListener(this);
-                AppContext.getAppContext().remove(MENU_KEYBOARD_HELPER_KEY);
             }
         }
     }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
index 9439059e03e..fdc68d3244f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.text.View;
 import sun.swing.SwingUtilities2;
-import sun.awt.AppContext;
 
 /**
  * RadioButtonUI implementation for BasicRadioButtonUI
@@ -39,7 +38,7 @@ import sun.awt.AppContext;
  */
 public class BasicRadioButtonUI extends BasicToggleButtonUI
 {
-    private static final Object BASIC_RADIO_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new BasicRadioButtonUI();
 
     /**
      * The icon.
@@ -66,14 +65,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
      * @return an instance of {@code BasicRadioButtonUI}
      */
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        BasicRadioButtonUI radioButtonUI =
-                (BasicRadioButtonUI) appContext.get(BASIC_RADIO_BUTTON_UI_KEY);
-        if (radioButtonUI == null) {
-            radioButtonUI = new BasicRadioButtonUI();
-            appContext.put(BASIC_RADIO_BUTTON_UI_KEY, radioButtonUI);
-        }
-        return radioButtonUI;
+        return UI;
     }
 
     @Override
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
index 391cfdf0b65..d144b5b7240 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@ import javax.swing.border.Border;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.synth.SynthUI;
 import sun.swing.DefaultLookup;
-import sun.awt.AppContext;
 import sun.swing.SwingUtilities2;
 
 import javax.swing.plaf.basic.DragRecognitionSupport.BeforeDrag;
@@ -2234,24 +2233,19 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
         }
     }
 
+    private static volatile DragListener dragListenerSingleton;
+
     private static DragListener getDragListener() {
         synchronized(DragListener.class) {
-            DragListener listener =
-                (DragListener)AppContext.getAppContext().
-                    get(DragListener.class);
-
-            if (listener == null) {
-                listener = new DragListener();
-                AppContext.getAppContext().put(DragListener.class, listener);
+            if (dragListenerSingleton == null) {
+                dragListenerSingleton = new DragListener();
             }
-
-            return listener;
+            return dragListenerSingleton;
         }
     }
 
     /**
      * Listens for mouse events for the purposes of detecting drag gestures.
-     * BasicTextUI will maintain one of these per AppContext.
      */
     static class DragListener extends MouseInputAdapter
                               implements BeforeDrag {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
index 2b68fe2b4f3..1a7dfe87353 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package javax.swing.plaf.basic;
 
-import sun.awt.AppContext;
-
 import java.awt.*;
 import java.awt.event.*;
 
@@ -44,7 +42,7 @@ import javax.swing.text.View;
  */
 public class BasicToggleButtonUI extends BasicButtonUI {
 
-    private static final Object BASIC_TOGGLE_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new BasicToggleButtonUI();
 
     private static final String propertyPrefix = "ToggleButton" + ".";
 
@@ -64,14 +62,7 @@ public class BasicToggleButtonUI extends BasicButtonUI {
      * @return an instance of {@code BasicToggleButtonUI}
      */
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        BasicToggleButtonUI toggleButtonUI =
-                (BasicToggleButtonUI) appContext.get(BASIC_TOGGLE_BUTTON_UI_KEY);
-        if (toggleButtonUI == null) {
-            toggleButtonUI = new BasicToggleButtonUI();
-            appContext.put(BASIC_TOGGLE_BUTTON_UI_KEY, toggleButtonUI);
-        }
-        return toggleButtonUI;
+        return UI;
     }
 
     protected String getPropertyPrefix() {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
index 8ee862fb0b3..d64267676c3 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ import javax.swing.plaf.*;
 import javax.swing.*;
 import java.awt.*;
 
-import sun.awt.AppContext;
+import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
 
 /**
@@ -153,8 +153,7 @@ public class DefaultMetalTheme extends MetalTheme {
     static int getDefaultFontStyle(int key) {
         if (key != WINDOW_TITLE_FONT) {
             Object boldMetal = null;
-            if (AppContext.getAppContext().get(
-                    SwingUtilities2.LAF_STATE_KEY) != null) {
+            if (SwingAccessor.getLAFStateAccessor().lafStateIsInitialized()) {
                 // Only access the boldMetal key if a look and feel has
                 // been loaded, otherwise we'll trigger loading the look
                 // and feel.
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java
index dddcde10636..65030716d49 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import java.awt.image.*;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
-import sun.awt.AppContext;
 
 /**
  * Implements the bumps used throughout the Metal Look and Feel.
@@ -50,7 +49,7 @@ class MetalBumps implements Icon {
     protected Color shadowColor;
     protected Color backColor;
 
-    private static final Object METAL_BUMPS = new Object();
+    private static final List<BumpBuffer> bumpsList = new ArrayList<BumpBuffer>();
     protected BumpBuffer buffer;
 
     /**
@@ -66,20 +65,14 @@ class MetalBumps implements Icon {
 
     private static BumpBuffer createBuffer(GraphicsConfiguration gc,
                                            Color topColor, Color shadowColor, Color backColor) {
-        AppContext context = AppContext.getAppContext();
-        @SuppressWarnings("unchecked")
-        List<BumpBuffer> buffers = (List<BumpBuffer>) context.get(METAL_BUMPS);
-        if (buffers == null) {
-            buffers = new ArrayList<BumpBuffer>();
-            context.put(METAL_BUMPS, buffers);
-        }
-        for (BumpBuffer buffer : buffers) {
+
+        for (BumpBuffer buffer : bumpsList) {
             if (buffer.hasSameConfiguration(gc, topColor, shadowColor, backColor)) {
                 return buffer;
             }
         }
         BumpBuffer buffer = new BumpBuffer(gc, topColor, shadowColor, backColor);
-        buffers.add(buffer);
+        bumpsList.add(buffer);
         return buffer;
     }
 
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
index c940b4dcead..92b7c3b58f9 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package javax.swing.plaf.metal;
 
 import sun.swing.SwingUtilities2;
-import sun.awt.AppContext;
 
 import javax.swing.*;
 import javax.swing.border.*;
@@ -69,7 +68,7 @@ public class MetalButtonUI extends BasicButtonUI {
      */
     protected Color disabledTextColor;
 
-    private static final Object METAL_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new MetalButtonUI();
 
     // ********************************
     //          Create PLAF
@@ -87,14 +86,7 @@ public class MetalButtonUI extends BasicButtonUI {
      * @return an instance of {@code MetalButtonUI}
      */
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        MetalButtonUI metalButtonUI =
-                (MetalButtonUI) appContext.get(METAL_BUTTON_UI_KEY);
-        if (metalButtonUI == null) {
-            metalButtonUI = new MetalButtonUI();
-            appContext.put(METAL_BUTTON_UI_KEY, metalButtonUI);
-        }
-        return metalButtonUI;
+        return UI;
     }
 
     // ********************************
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
index 558f1987e4d..4809de43a8f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package javax.swing.plaf.metal;
 
-import sun.awt.AppContext;
-
 import javax.swing.*;
 import javax.swing.plaf.basic.BasicCheckBoxUI;
 
@@ -57,7 +55,7 @@ public class MetalCheckBoxUI extends MetalRadioButtonUI {
     // of BasicCheckBoxUI because we want to pick up all the
     // painting changes made in MetalRadioButtonUI.
 
-    private static final Object METAL_CHECK_BOX_UI_KEY = new Object();
+    private static final ComponentUI UI = new MetalCheckBoxUI();
 
     private static final String propertyPrefix = "CheckBox" + ".";
 
@@ -79,14 +77,7 @@ public class MetalCheckBoxUI extends MetalRadioButtonUI {
      * @return a new instance of {@code MetalCheckBoxUI}
      */
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        MetalCheckBoxUI checkboxUI =
-                (MetalCheckBoxUI) appContext.get(METAL_CHECK_BOX_UI_KEY);
-        if (checkboxUI == null) {
-            checkboxUI = new MetalCheckBoxUI();
-            appContext.put(METAL_CHECK_BOX_UI_KEY, checkboxUI);
-        }
-        return checkboxUI;
+        return UI;
     }
 
     public String getPropertyPrefix() {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
index 35fc07de056..1d131c9d294 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package javax.swing.plaf.metal;
 
 import sun.swing.SwingUtilities2;
-import sun.awt.AppContext;
 
 import javax.swing.*;
 import javax.swing.plaf.*;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
index 7b9a23aec5d..7c56c681423 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,6 @@ import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicLookAndFeel;
 import javax.swing.text.DefaultEditorKit;
 
-import sun.awt.AppContext;
 import sun.awt.OSInfo;
 import sun.awt.SunToolkit;
 import sun.swing.DefaultLayoutStyle;
@@ -1600,6 +1599,8 @@ public class MetalLookAndFeel extends BasicLookAndFeel
         super.provideErrorFeedback(component);
     }
 
+    private static MetalTheme currentMetalTheme;
+
     /**
      * Set the theme used by <code>MetalLookAndFeel</code>.
      * <p>
@@ -1629,7 +1630,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
         if (theme == null) {
             throw new NullPointerException("Can't have null theme");
         }
-        AppContext.getAppContext().put( "currentMetalTheme", theme );
+        currentMetalTheme = theme;
     }
 
     /**
@@ -1641,15 +1642,10 @@ public class MetalLookAndFeel extends BasicLookAndFeel
      * @since 1.5
      */
     public static MetalTheme getCurrentTheme() {
-        MetalTheme currentTheme;
-        AppContext context = AppContext.getAppContext();
-        currentTheme = (MetalTheme) context.get( "currentMetalTheme" );
+        MetalTheme currentTheme = currentMetalTheme;
         if (currentTheme == null) {
-            // This will happen in two cases:
-            // . When MetalLookAndFeel is first being initialized.
-            // . When a new AppContext has been created that hasn't
-            //   triggered UIManager to load a LAF. Rather than invoke
-            //   a method on the UIManager, which would trigger the loading
+            //   This will happen when MetalLookAndFeel is first being initialized.
+            //   Rather than invoke a method on the UIManager, which would trigger the loading
             //   of a potentially different LAF, we directly set the
             //   Theme here.
             if (useHighContrastTheme()) {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
index 712046737eb..ddbd7bcc9cb 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package javax.swing.plaf.metal;
 
 import sun.swing.SwingUtilities2;
-import sun.awt.AppContext;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -55,7 +54,7 @@ import javax.swing.text.View;
  */
 public class MetalRadioButtonUI extends BasicRadioButtonUI {
 
-    private static final Object METAL_RADIO_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new MetalRadioButtonUI();
 
     /**
      * The color of the focused radio button.
@@ -90,14 +89,7 @@ public class MetalRadioButtonUI extends BasicRadioButtonUI {
      * @return an instance of {@code MetalRadioButtonUI}
      */
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        MetalRadioButtonUI metalRadioButtonUI =
-                (MetalRadioButtonUI) appContext.get(METAL_RADIO_BUTTON_UI_KEY);
-        if (metalRadioButtonUI == null) {
-            metalRadioButtonUI = new MetalRadioButtonUI();
-            appContext.put(METAL_RADIO_BUTTON_UI_KEY, metalRadioButtonUI);
-        }
-        return metalRadioButtonUI;
+        return UI;
     }
 
     // ********************************
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
index ae8b379a579..4ed6734df1f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -437,6 +437,7 @@ class MetalTitlePane extends JComponent {
      */
     private JMenu createMenu() {
         JMenu menu = new JMenu("");
+        menu.setPreferredSize(new Dimension(IMAGE_WIDTH, IMAGE_HEIGHT));
         if (getWindowDecorationStyle() == JRootPane.FRAME) {
             addMenuItems(menu);
         }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
index 088a54ba6b2..9c944388c4a 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package javax.swing.plaf.metal;
 
 import sun.swing.SwingUtilities2;
-import sun.awt.AppContext;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -57,7 +56,7 @@ import java.io.Serializable;
  */
 public class MetalToggleButtonUI extends BasicToggleButtonUI {
 
-    private static final Object METAL_TOGGLE_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new MetalToggleButtonUI();
 
     /**
      * The color of a focused toggle button.
@@ -92,14 +91,7 @@ public class MetalToggleButtonUI extends BasicToggleButtonUI {
      * @return the {@code MetalToggleButtonUI}.
      */
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        MetalToggleButtonUI metalToggleButtonUI =
-                (MetalToggleButtonUI) appContext.get(METAL_TOGGLE_BUTTON_UI_KEY);
-        if (metalToggleButtonUI == null) {
-            metalToggleButtonUI = new MetalToggleButtonUI();
-            appContext.put(METAL_TOGGLE_BUTTON_UI_KEY, metalToggleButtonUI);
-        }
-        return metalToggleButtonUI;
+        return UI;
     }
 
     // ********************************
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
index 30bed2207e4..d1b7ba143b3 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Effect.java
@@ -24,8 +24,6 @@
  */
 package javax.swing.plaf.nimbus;
 
-import sun.awt.AppContext;
-
 import java.awt.image.BufferedImage;
 import java.lang.ref.SoftReference;
 
@@ -81,13 +79,10 @@ abstract class Effect {
     // =================================================================================================================
     // Static data cache
 
+    private static final ArrayCache ARRAY_CACHE = new ArrayCache();
+
     protected static ArrayCache getArrayCache() {
-        ArrayCache cache = (ArrayCache)AppContext.getAppContext().get(ArrayCache.class);
-        if (cache == null){
-            cache = new ArrayCache();
-            AppContext.getAppContext().put(ArrayCache.class,cache);
-        }
-        return cache;
+        return ARRAY_CACHE;
     }
 
     protected static class ArrayCache {
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java
index 8a1d957b615..1171f64eb23 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/ImagePainter.java
@@ -28,7 +28,6 @@ import java.awt.*;
 import java.lang.ref.WeakReference;
 import java.net.*;
 import javax.swing.*;
-import sun.awt.AppContext;
 import sun.swing.plaf.synth.Paint9Painter;
 
 /**
@@ -41,8 +40,6 @@ import sun.swing.plaf.synth.Paint9Painter;
  * @author Scott Violet
  */
 class ImagePainter extends SynthPainter {
-    private static final StringBuffer CACHE_KEY =
-                               new StringBuffer("SynthCacheKey");
 
     private Image image;
     private Insets sInsets;
@@ -53,22 +50,17 @@ class ImagePainter extends SynthPainter {
     private Paint9Painter imageCache;
     private boolean center;
 
+    private static volatile WeakReference<Paint9Painter> cacheRef;
+
     private static Paint9Painter getPaint9Painter() {
         // A SynthPainter is created per <imagePainter>.  We want the
-        // cache to be shared by all, and we don't use a static because we
-        // don't want it to persist between look and feels.  For that reason
-        // we use a AppContext specific Paint9Painter.  It's backed via
+        // cache to be shared by all. It's held via
         // a WeakRef so that it can go away if the look and feel changes.
-        synchronized(CACHE_KEY) {
-            @SuppressWarnings("unchecked")
-            WeakReference<Paint9Painter> cacheRef =
-                     (WeakReference<Paint9Painter>)AppContext.getAppContext().
-                     get(CACHE_KEY);
+        synchronized(ImagePainter.class) {
             Paint9Painter painter;
             if (cacheRef == null || (painter = cacheRef.get()) == null) {
                 painter = new Paint9Painter(30);
                 cacheRef = new WeakReference<Paint9Painter>(painter);
-                AppContext.getAppContext().put(CACHE_KEY, cacheRef);
             }
             return painter;
         }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java
index 5a59f3bb98d..f8a0800ff8b 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/Region.java
@@ -24,8 +24,6 @@
  */
 package javax.swing.plaf.synth;
 
-import sun.awt.AppContext;
-
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -72,8 +70,6 @@ import javax.swing.UIDefaults;
  * @author Scott Violet
  */
 public class Region {
-    private static final Object UI_TO_REGION_MAP_KEY = new Object();
-    private static final Object LOWER_CASE_NAME_MAP_KEY = new Object();
 
     /**
      * ArrowButton's are special types of buttons that also render a
@@ -425,10 +421,10 @@ public class Region {
      */
     public static final Region VIEWPORT = new Region("Viewport", false);
 
-    private static Map<String, Region> getUItoRegionMap() {
-        AppContext context = AppContext.getAppContext();
-        @SuppressWarnings("unchecked")
-        Map<String, Region> map = (Map<String, Region>) context.get(UI_TO_REGION_MAP_KEY);
+    private static Map<String, Region> regionMap;
+
+    private static synchronized Map<String, Region> getUItoRegionMap() {
+        Map<String, Region> map = regionMap;
         if (map == null) {
             map = new HashMap<String, Region>();
             map.put("ArrowButtonUI", ARROW_BUTTON);
@@ -476,18 +472,18 @@ public class Region {
             map.put("ToolBarSeparatorUI", TOOL_BAR_SEPARATOR);
             map.put("TreeUI", TREE);
             map.put("ViewportUI", VIEWPORT);
-            context.put(UI_TO_REGION_MAP_KEY, map);
+            regionMap = map;
         }
         return map;
     }
 
-    private static Map<Region, String> getLowerCaseNameMap() {
-        AppContext context = AppContext.getAppContext();
-        @SuppressWarnings("unchecked")
-        Map<Region, String> map = (Map<Region, String>) context.get(LOWER_CASE_NAME_MAP_KEY);
+    private static Map<Region, String> lcRegionMap;
+
+    private static synchronized Map<Region, String> getLowerCaseNameMap() {
+        Map<Region, String> map = lcRegionMap;
         if (map == null) {
             map = new HashMap<Region, String>();
-            context.put(LOWER_CASE_NAME_MAP_KEY, map);
+            lcRegionMap = map;
         }
         return map;
     }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
index 3a3d5719605..f0c7a9a1622 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
@@ -25,8 +25,6 @@
 
 package javax.swing.plaf.synth;
 
-import sun.awt.AppContext;
-
 import javax.swing.*;
 import java.awt.*;
 import java.beans.*;
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
index 700e3ed8a38..095d675d3de 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
@@ -60,7 +60,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.InsetsUIResource;
 import javax.swing.plaf.basic.BasicLookAndFeel;
 
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.swing.DefaultLookup;
 import sun.swing.SwingAccessor;
@@ -101,31 +100,13 @@ public class SynthLookAndFeel extends BasicLookAndFeel {
     static final Insets EMPTY_UIRESOURCE_INSETS = new InsetsUIResource(
                                                             0, 0, 0, 0);
 
-    /**
-     * AppContext key to get the current SynthStyleFactory.
-     */
-    private static final Object STYLE_FACTORY_KEY =
-                  new StringBuffer("com.sun.java.swing.plaf.gtk.StyleCache");
+    private static ComponentUI selectedUI;
+    private static int selectedUIStateValue;
 
     /**
-     * AppContext key to get selectedUI.
-     */
-    private static final Object SELECTED_UI_KEY = new StringBuilder("selectedUI");
-
-    /**
-     * AppContext key to get selectedUIState.
-     */
-    private static final Object SELECTED_UI_STATE_KEY = new StringBuilder("selectedUIState");
-
-    /**
-     * The last SynthStyleFactory that was asked for from AppContext
-     * <code>lastContext</code>.
+     * The last SynthStyleFactory that was set.
      */
     private static SynthStyleFactory lastFactory;
-    /**
-     * AppContext lastLAF came from.
-     */
-    private static AppContext lastContext;
 
     /**
      * SynthStyleFactory for the this SynthLookAndFeel.
@@ -141,7 +122,7 @@ public class SynthLookAndFeel extends BasicLookAndFeel {
     private Handler _handler;
 
     static ComponentUI getSelectedUI() {
-        return (ComponentUI) AppContext.getAppContext().get(SELECTED_UI_KEY);
+        return selectedUI;
     }
 
     /**
@@ -182,23 +163,20 @@ public class SynthLookAndFeel extends BasicLookAndFeel {
             }
         }
 
-        AppContext context = AppContext.getAppContext();
-
-        context.put(SELECTED_UI_KEY, uix);
-        context.put(SELECTED_UI_STATE_KEY, Integer.valueOf(selectedUIState));
+        selectedUI = uix;
+        selectedUIStateValue = selectedUIState;
     }
 
     static int getSelectedUIState() {
-        Integer result = (Integer) AppContext.getAppContext().get(SELECTED_UI_STATE_KEY);
-
-        return result == null ? 0 : result.intValue();
+        return selectedUIStateValue;
     }
 
     /**
      * Clears out the selected UI that was last set in setSelectedUI.
      */
     static void resetSelectedUI() {
-        AppContext.getAppContext().remove(SELECTED_UI_KEY);
+        selectedUI = null;
+        selectedUIStateValue = 0;
     }
 
 
@@ -210,12 +188,8 @@ public class SynthLookAndFeel extends BasicLookAndFeel {
      */
     public static void setStyleFactory(SynthStyleFactory cache) {
         // We assume the setter is called BEFORE the getter has been invoked
-        // for a particular AppContext.
         synchronized(SynthLookAndFeel.class) {
-            AppContext context = AppContext.getAppContext();
             lastFactory = cache;
-            lastContext = context;
-            context.put(STYLE_FACTORY_KEY, cache);
         }
     }
 
@@ -226,13 +200,6 @@ public class SynthLookAndFeel extends BasicLookAndFeel {
      */
     public static SynthStyleFactory getStyleFactory() {
         synchronized(SynthLookAndFeel.class) {
-            AppContext context = AppContext.getAppContext();
-
-            if (lastContext == context) {
-                return lastFactory;
-            }
-            lastContext = context;
-            lastFactory = (SynthStyleFactory) context.get(STYLE_FACTORY_KEY);
             return lastFactory;
         }
     }
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index 03e04d1c1a7..59cee1e12ee 100644
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,9 +62,6 @@ import javax.accessibility.*;
 
 import javax.print.attribute.*;
 
-import sun.awt.AppContext;
-
-
 import sun.swing.PrintingStatus;
 import sun.swing.SwingUtilities2;
 import sun.swing.text.TextComponentPrintable;
@@ -1097,22 +1094,16 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
         return getKeymapTable().get(nm);
     }
 
-    private static HashMap<String,Keymap> getKeymapTable() {
-        synchronized (KEYMAP_TABLE) {
-            AppContext appContext = AppContext.getAppContext();
-            @SuppressWarnings("unchecked")
-            HashMap<String,Keymap> keymapTable =
-                (HashMap<String,Keymap>)appContext.get(KEYMAP_TABLE);
-            if (keymapTable == null) {
-                keymapTable = new HashMap<String,Keymap>(17);
-                appContext.put(KEYMAP_TABLE, keymapTable);
-                //initialize default keymap
-                Keymap binding = addKeymap(DEFAULT_KEYMAP, null);
-                binding.setDefaultAction(new
-                                         DefaultEditorKit.DefaultKeyTypedAction());
-            }
-            return keymapTable;
+    private static HashMap<String,Keymap> keymapTable;
+
+    private static synchronized HashMap<String,Keymap> getKeymapTable() {
+        if (keymapTable == null) {
+            keymapTable = new HashMap<String,Keymap>(17);
+            //initialize default keymap
+            Keymap binding = addKeymap(DEFAULT_KEYMAP, null);
+            binding.setDefaultAction(new DefaultEditorKit.DefaultKeyTypedAction());
         }
+        return keymapTable;
     }
 
     /**
@@ -1653,7 +1644,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
     public void removeNotify() {
         super.removeNotify();
         if (getFocusedComponent() == this) {
-            AppContext.getAppContext().remove(FOCUSED_COMPONENT);
+            focusedComponent = null;
         }
     }
 
@@ -4084,13 +4075,14 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
         }
     }
 
+    private static JTextComponent focusedComponent;
+
     /**
      * Returns the JTextComponent that most recently had focus. The returned
      * value may currently have focus.
      */
     static final JTextComponent getFocusedComponent() {
-        return (JTextComponent)AppContext.getAppContext().
-            get(FOCUSED_COMPONENT);
+        return focusedComponent;
     }
 
     @SuppressWarnings("deprecation")
@@ -4105,9 +4097,6 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
         return modifiers;
     }
 
-    private static final Object KEYMAP_TABLE =
-        new StringBuilder("JTextComponent_KeymapTable");
-
     //
     // member variables used for on-the-spot input method
     // editing style support
@@ -4438,9 +4427,6 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
         }
     }
 
-    private static final Object FOCUSED_COMPONENT =
-        new StringBuilder("JTextComponent_FocusedComponent");
-
     /**
      * The default keymap that will be shared by all
      * <code>JTextComponent</code> instances unless they
@@ -4493,8 +4479,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
 
         // --- FocusListener methods -----------------------------------
         public void focusGained(FocusEvent fe) {
-            AppContext.getAppContext().put(FOCUSED_COMPONENT,
-                                           fe.getSource());
+            focusedComponent = (JTextComponent)fe.getSource();
         }
 
         public void focusLost(FocusEvent fe) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java b/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java
index 6801a84da5b..1a4e7315eb4 100644
--- a/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java
+++ b/src/java.desktop/share/classes/javax/swing/text/LayoutQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 package javax.swing.text;
 
 import java.util.Vector;
-import sun.awt.AppContext;
 
 /**
  * A queue of text layout tasks.
@@ -36,11 +35,11 @@ import sun.awt.AppContext;
  */
 public class LayoutQueue {
 
-    private static final Object DEFAULT_QUEUE = new Object();
-
     private Vector<Runnable> tasks;
     private Thread worker;
 
+    private static LayoutQueue defaultQueue;
+
     /**
      * Construct a layout queue.
      */
@@ -53,15 +52,10 @@ public class LayoutQueue {
      * @return the default layout queue
      */
     public static LayoutQueue getDefaultQueue() {
-        AppContext ac = AppContext.getAppContext();
-        synchronized (DEFAULT_QUEUE) {
-            LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
-            if (defaultQueue == null) {
-                defaultQueue = new LayoutQueue();
-                ac.put(DEFAULT_QUEUE, defaultQueue);
-            }
-            return defaultQueue;
+        if (defaultQueue == null) {
+            defaultQueue = new LayoutQueue();
         }
+        return defaultQueue;
     }
 
     /**
@@ -70,9 +64,7 @@ public class LayoutQueue {
      * @param q the new queue.
      */
     public static void setDefaultQueue(LayoutQueue q) {
-        synchronized (DEFAULT_QUEUE) {
-            AppContext.getAppContext().put(DEFAULT_QUEUE, q);
-        }
+        defaultQueue = q;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
index 53ceea32668..b5b75e1067b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,7 +92,6 @@ import javax.swing.text.ViewFactory;
 import javax.swing.text.html.parser.ParserDelegator;
 
 import sun.swing.SwingAccessor;
-import sun.awt.AppContext;
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
@@ -432,11 +431,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
      * @param s a StyleSheet
      */
     public void setStyleSheet(StyleSheet s) {
-        if (s == null) {
-            AppContext.getAppContext().remove(DEFAULT_STYLES_KEY);
-        } else {
-            AppContext.getAppContext().put(DEFAULT_STYLES_KEY, s);
-        }
+        defaultStyles = s;
     }
 
     /**
@@ -448,12 +443,8 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
      * @return the StyleSheet
      */
     public StyleSheet getStyleSheet() {
-        AppContext appContext = AppContext.getAppContext();
-        StyleSheet defaultStyles = (StyleSheet) appContext.get(DEFAULT_STYLES_KEY);
-
         if (defaultStyles == null) {
             defaultStyles = new StyleSheet();
-            appContext.put(DEFAULT_STYLES_KEY, defaultStyles);
             try (InputStream is = HTMLEditorKit.getResourceAsStream(DEFAULT_CSS);
                  InputStreamReader isr = new InputStreamReader(is, ISO_8859_1);
                  Reader r = new BufferedReader(isr))
@@ -692,6 +683,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
     private static final ViewFactory defaultFactory = new HTMLFactory();
 
     MutableAttributeSet input;
+    private static StyleSheet defaultStyles = null;
     private static final Object DEFAULT_STYLES_KEY = new Object();
     private LinkController linkHandler = new LinkController();
     private static Parser defaultParser = null;
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java
index e9999c679eb..d3a4fa76306 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
 
 package javax.swing.text.html.parser;
 
-import sun.awt.AppContext;
-
 import java.io.PrintStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -403,11 +401,6 @@ class DTD implements DTDConstants {
         return name;
     }
 
-    /**
-     * The hashtable key of DTDs in AppContext.
-     */
-    private static final Object DTD_HASH_KEY = new Object();
-
     /**
      * Put a name and appropriate DTD to hashtable.
      *
@@ -415,7 +408,7 @@ class DTD implements DTDConstants {
      * @param dtd the DTD
      */
     public static void putDTDHash(String name, DTD dtd) {
-        getDtdHash().put(name, dtd);
+        DTD_MAP.put(name, dtd);
     }
 
     /**
@@ -430,27 +423,14 @@ class DTD implements DTDConstants {
      */
     public static DTD getDTD(String name) throws IOException {
         name = name.toLowerCase();
-        DTD dtd = getDtdHash().get(name);
+        DTD dtd = DTD_MAP.get(name);
         if (dtd == null)
           dtd = new DTD(name);
 
         return dtd;
     }
 
-    private static Hashtable<String, DTD> getDtdHash() {
-        AppContext appContext = AppContext.getAppContext();
-
-        @SuppressWarnings("unchecked")
-        Hashtable<String, DTD> result = (Hashtable<String, DTD>) appContext.get(DTD_HASH_KEY);
-
-        if (result == null) {
-            result = new Hashtable<String, DTD>();
-
-            appContext.put(DTD_HASH_KEY, result);
-        }
-
-        return result;
-    }
+    private static final Hashtable<String, DTD> DTD_MAP = new Hashtable<String, DTD>();
 
     /**
      * Recreates a DTD from an archived format.
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
index cf8ea622c9b..8dd00373636 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Element.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package javax.swing.text.html.parser;
 import java.io.Serializable;
 import java.util.BitSet;
 import java.util.Map;
-import sun.awt.AppContext;
 
 /**
  * An element as described in a DTD using the ELEMENT construct.
@@ -107,17 +106,14 @@ public final class Element implements DTDConstants, Serializable {
         this.name = name;
         this.index = index;
         if (index > getMaxIndex()) {
-            AppContext.getAppContext().put(MAX_INDEX_KEY, index);
+            maxIndex = index;
         }
     }
 
-    private static final Object MAX_INDEX_KEY = new Object();
+    private static int maxIndex = 0;
 
     static int getMaxIndex() {
-        Integer value = (Integer) AppContext.getAppContext().get(MAX_INDEX_KEY);
-        return (value != null)
-                ? value.intValue()
-                : 0;
+        return maxIndex;
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
index 2d541abc06f..6971f313558 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/ParserDelegator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
  */
 package javax.swing.text.html.parser;
 
-import sun.awt.AppContext;
-
 import javax.swing.text.html.HTMLEditorKit;
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -52,7 +50,8 @@ import java.io.Serializable;
  */
 @SuppressWarnings("serial") // Same-version serialization only
 public class ParserDelegator extends HTMLEditorKit.Parser implements Serializable {
-    private static final Object DTD_KEY = new Object();
+
+    private static DTD dtd = null;
 
     /**
      * Sets the default DTD.
@@ -62,10 +61,6 @@ public class ParserDelegator extends HTMLEditorKit.Parser implements Serializabl
     }
 
     private static synchronized DTD getDefaultDTD() {
-        AppContext appContext = AppContext.getAppContext();
-
-        DTD dtd = (DTD) appContext.get(DTD_KEY);
-
         if (dtd == null) {
             DTD _dtd = null;
             // (PENDING) Hate having to hard code!
@@ -77,10 +72,7 @@ public class ParserDelegator extends HTMLEditorKit.Parser implements Serializabl
                 System.out.println("Throw an exception: could not get default dtd: " + nm);
             }
             dtd = createDTD(_dtd, nm);
-
-            appContext.put(DTD_KEY, dtd);
         }
-
         return dtd;
     }
 
diff --git a/src/java.desktop/share/classes/sun/awt/AWTAccessor.java b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
index 22df71f564d..c74219f7efa 100644
--- a/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
+++ b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -441,11 +441,6 @@ public final class AWTAccessor {
          */
         void setMostRecentFocusOwner(Window window, Component component);
 
-        /**
-         * Returns current KFM of the specified AppContext.
-         */
-        KeyboardFocusManager getCurrentKeyboardFocusManager(AppContext ctx);
-
         /**
          * Return the current focus cycle root
          */
@@ -456,16 +451,6 @@ public final class AWTAccessor {
      * An accessor for the MenuComponent class.
      */
     public interface MenuComponentAccessor {
-        /**
-         * Returns the appContext of the menu component.
-         */
-        AppContext getAppContext(MenuComponent menuComp);
-
-        /**
-         * Sets the appContext of the menu component.
-         */
-        void setAppContext(MenuComponent menuComp, AppContext appContext);
-
         /**
          * Returns the peer of the menu component.
          */
diff --git a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
index 8310b7cb604..ab2ad5dfbf0 100644
--- a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
+++ b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -218,7 +218,7 @@ public abstract class EmbeddedFrame extends Frame
      */
     public boolean dispatchKeyEvent(KeyEvent e) {
 
-        Container currentRoot = AWTAccessor.getKeyboardFocusManagerAccessor()
+        Container currentRoot = KeyboardFocusManager.getCurrentKeyboardFocusManager()
                                     .getCurrentFocusCycleRoot();
 
         // if we are not in EmbeddedFrame's cycle, we should not try to leave.
diff --git a/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index 1f92189a62f..e97b654486f 100644
--- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -333,9 +333,6 @@ public abstract class SunToolkit extends Toolkit
         if (target instanceof Component) {
             AWTAccessor.getComponentAccessor().
                 setAppContext((Component)target, context);
-        } else if (target instanceof MenuComponent) {
-            AWTAccessor.getMenuComponentAccessor().
-                setAppContext((MenuComponent)target, context);
         } else {
             return false;
         }
@@ -351,8 +348,7 @@ public abstract class SunToolkit extends Toolkit
             return AWTAccessor.getComponentAccessor().
                        getAppContext((Component)target);
         } else if (target instanceof MenuComponent) {
-            return AWTAccessor.getMenuComponentAccessor().
-                       getAppContext((MenuComponent)target);
+            return AppContext.getAppContext();
         } else {
             return null;
         }
@@ -414,6 +410,11 @@ public abstract class SunToolkit extends Toolkit
         cont.setFocusTraversalPolicy(defaultPolicy);
     }
 
+    /* This method should be removed at the same time as targetToAppContext() */
+    public static void insertTargetMapping(Object target) {
+        insertTargetMapping(target, AppContext.getAppContext());
+    }
+
     /*
      * Insert a mapping from target to AppContext, for later retrieval
      * via targetToAppContext() above.
@@ -426,6 +427,17 @@ public abstract class SunToolkit extends Toolkit
         }
     }
 
+    public static void postEvent(AWTEvent event) {
+       /* Adding AppContext is temporary to help migrate away from using app contexts
+        * It is used by code which has already been subject to that migration.
+        * However until that is complete, there is a single main app context we
+        * can retrieve to use which would be the same as if the code had
+        * not been migrated.
+        * The overload which accepts the AppContext will eventually be replaced by this.
+        */
+        postEvent(AppContext.getAppContext(), event);
+    }
+
     /*
      * Post an AWTEvent to the Java EventQueue, using the PostEventQueue
      * to avoid possibly calling client code (EventQueueSubclass.postEvent())
@@ -538,6 +550,10 @@ public abstract class SunToolkit extends Toolkit
         postEvent(targetToAppContext(peerEvent.getSource()), peerEvent);
     }
 
+     public static void invokeLater(Runnable dispatcher) {
+         invokeLaterOnAppContext(AppContext.getAppContext(), dispatcher);
+     }
+
     /*
      * Execute a chunk of code on the Java event handler thread. The
      * method takes into account provided AppContext and sets
@@ -1018,8 +1034,7 @@ public abstract class SunToolkit extends Toolkit
         return getSystemEventQueueImplPP();
     }
 
-    // Package private implementation
-    static EventQueue getSystemEventQueueImplPP() {
+    public static EventQueue getSystemEventQueueImplPP() {
         return getSystemEventQueueImplPP(AppContext.getAppContext());
     }
 
diff --git a/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java b/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
index 6c03fa83369..9f247ed7fbd 100644
--- a/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,6 @@ import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
 
-import sun.awt.AppContext;
 import sun.awt.ComponentFactory;
 import sun.awt.SunToolkit;
 import sun.awt.image.ImageRepresentation;
@@ -154,9 +153,9 @@ public abstract class DataTransferer {
             Collections.synchronizedMap(new HashMap<>());
 
     /**
-     * The key used to store pending data conversion requests for an AppContext.
+     * The Runnable for pending data conversion requests.
      */
-    private static final String DATA_CONVERTER_KEY = "DATA_CONVERTER_KEY";
+    private static volatile Runnable dataConverterInstance;
 
     static {
         DataFlavor tJavaTextEncodingFlavor = null;
@@ -1769,13 +1768,9 @@ search:
                 }
             };
 
-            final AppContext appContext = SunToolkit.targetToAppContext(source);
-
             getToolkitThreadBlockedHandler().lock();
 
-            if (appContext != null) {
-                appContext.put(DATA_CONVERTER_KEY, dataConverter);
-            }
+            dataConverterInstance = dataConverter;
 
             SunToolkit.executeOnEventHandlerThread(source, dataConverter);
 
@@ -1783,9 +1778,7 @@ search:
                 getToolkitThreadBlockedHandler().enter();
             }
 
-            if (appContext != null) {
-                appContext.remove(DATA_CONVERTER_KEY);
-            }
+            dataConverterInstance = null;
 
             ret = stack.pop();
         } finally {
@@ -1802,14 +1795,12 @@ search:
 
     public void processDataConversionRequests() {
         if (EventQueue.isDispatchThread()) {
-            AppContext appContext = AppContext.getAppContext();
             getToolkitThreadBlockedHandler().lock();
             try {
-                Runnable dataConverter =
-                    (Runnable)appContext.get(DATA_CONVERTER_KEY);
+                Runnable dataConverter = dataConverterInstance;
                 if (dataConverter != null) {
                     dataConverter.run();
-                    appContext.remove(DATA_CONVERTER_KEY);
+                    dataConverterInstance = null;
                 }
             } finally {
                 getToolkitThreadBlockedHandler().unlock();
diff --git a/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java b/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java
index edffbf59878..bc8071a798b 100644
--- a/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java
+++ b/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,6 @@ import java.util.HashSet;
 
 import java.io.IOException;
 
-import sun.awt.AppContext;
 import sun.awt.PeerEvent;
 import sun.awt.SunToolkit;
 
@@ -60,16 +59,11 @@ import sun.awt.SunToolkit;
  *
  * @since 1.3
  */
-public abstract class SunClipboard extends Clipboard
-    implements PropertyChangeListener {
-
-    private AppContext contentsContext = null;
-
-    private final Object CLIPBOARD_FLAVOR_LISTENER_KEY;
+public abstract class SunClipboard extends Clipboard {
 
     /**
      * A number of {@code FlavorListener}s currently registered
-     * on this clipboard across all {@code AppContext}s.
+     * on this clipboard
      */
     private volatile int numberOfFlavorListeners;
 
@@ -82,7 +76,6 @@ public abstract class SunClipboard extends Clipboard
 
     public SunClipboard(String name) {
         super(name);
-        CLIPBOARD_FLAVOR_LISTENER_KEY = new StringBuffer(name + "_CLIPBOARD_FLAVOR_LISTENER_KEY");
     }
 
     public synchronized void setContents(Transferable contents,
@@ -93,8 +86,6 @@ public abstract class SunClipboard extends Clipboard
             throw new NullPointerException("contents");
         }
 
-        initContext();
-
         final ClipboardOwner oldOwner = this.owner;
         final Transferable oldContents = this.contents;
 
@@ -110,27 +101,6 @@ public abstract class SunClipboard extends Clipboard
         }
     }
 
-    private synchronized void initContext() {
-        final AppContext context = AppContext.getAppContext();
-
-        if (contentsContext != context) {
-            // Need to synchronize on the AppContext to guarantee that it cannot
-            // be disposed after the check, but before the listener is added.
-            synchronized (context) {
-                if (context.isDisposed()) {
-                    throw new IllegalStateException("Can't set contents from disposed AppContext");
-                }
-                context.addPropertyChangeListener
-                    (AppContext.DISPOSED_PROPERTY_NAME, this);
-            }
-            if (contentsContext != null) {
-                contentsContext.removePropertyChangeListener
-                    (AppContext.DISPOSED_PROPERTY_NAME, this);
-            }
-            contentsContext = context;
-        }
-    }
-
     public synchronized Transferable getContents(Object requestor) {
         if (contents != null) {
             return contents;
@@ -140,13 +110,11 @@ public abstract class SunClipboard extends Clipboard
 
 
     /**
-     * @return the contents of this clipboard if it has been set from the same
-     *         AppContext as it is currently retrieved or null otherwise
+     * @return the contents of this clipboard if it has been set or null otherwise
      * @since 1.5
      */
     protected synchronized Transferable getContextContents() {
-        AppContext context = AppContext.getAppContext();
-        return (context == contentsContext) ? contents : null;
+        return contents;
     }
 
 
@@ -248,16 +216,8 @@ public abstract class SunClipboard extends Clipboard
 
     public abstract long getID();
 
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (AppContext.DISPOSED_PROPERTY_NAME.equals(evt.getPropertyName()) &&
-            Boolean.TRUE.equals(evt.getNewValue())) {
-            final AppContext disposedContext = (AppContext)evt.getSource();
-            lostOwnershipLater(disposedContext);
-        }
-    }
-
     protected void lostOwnershipImpl() {
-        lostOwnershipLater(null);
+        lostOwnershipLater();
     }
 
     /**
@@ -270,47 +230,30 @@ public abstract class SunClipboard extends Clipboard
      *        {@code null} if the ownership is lost because another
      *        application acquired ownership.
      */
-    protected void lostOwnershipLater(final AppContext disposedContext) {
-        final AppContext context = this.contentsContext;
-        if (context == null) {
-            return;
-        }
-
-        SunToolkit.postEvent(context, new PeerEvent(this, () -> lostOwnershipNow(disposedContext),
-                                                    PeerEvent.PRIORITY_EVENT));
+    protected void lostOwnershipLater() {
+        SunToolkit.postEvent(new PeerEvent(this, () -> lostOwnershipNow(),
+                                           PeerEvent.PRIORITY_EVENT));
     }
 
-    protected void lostOwnershipNow(final AppContext disposedContext) {
+
+    protected void lostOwnershipNow() {
+
         final SunClipboard sunClipboard = SunClipboard.this;
         ClipboardOwner owner = null;
         Transferable contents = null;
 
         synchronized (sunClipboard) {
-            final AppContext context = sunClipboard.contentsContext;
-
-            if (context == null) {
-                return;
-            }
-
-            if (disposedContext == null || context == disposedContext) {
-                owner = sunClipboard.owner;
-                contents = sunClipboard.contents;
-                sunClipboard.contentsContext = null;
-                sunClipboard.owner = null;
-                sunClipboard.contents = null;
-                sunClipboard.clearNativeContext();
-                context.removePropertyChangeListener
-                        (AppContext.DISPOSED_PROPERTY_NAME, sunClipboard);
-            } else {
-                return;
-            }
+            owner = sunClipboard.owner;
+            contents = sunClipboard.contents;
+            sunClipboard.owner = null;
+            sunClipboard.contents = null;
+            sunClipboard.clearNativeContext();
         }
         if (owner != null) {
             owner.lostOwnership(sunClipboard, contents);
         }
     }
 
-
     protected abstract void clearNativeContext();
 
     protected abstract void setContentsNative(Transferable contents);
@@ -343,11 +286,8 @@ public abstract class SunClipboard extends Clipboard
         if (listener == null) {
             return;
         }
-        AppContext appContext = AppContext.getAppContext();
-        Set<FlavorListener> flavorListeners = getFlavorListeners(appContext);
         if (flavorListeners == null) {
             flavorListeners = new HashSet<>();
-            appContext.put(CLIPBOARD_FLAVOR_LISTENER_KEY, flavorListeners);
         }
         flavorListeners.add(listener);
 
@@ -362,7 +302,6 @@ public abstract class SunClipboard extends Clipboard
         if (listener == null) {
             return;
         }
-        Set<FlavorListener> flavorListeners = getFlavorListeners(AppContext.getAppContext());
         if (flavorListeners == null){
             //else we throw NullPointerException, but it is forbidden
             return;
@@ -373,13 +312,8 @@ public abstract class SunClipboard extends Clipboard
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private Set<FlavorListener> getFlavorListeners(AppContext appContext) {
-        return (Set<FlavorListener>)appContext.get(CLIPBOARD_FLAVOR_LISTENER_KEY);
-    }
-
+    private static Set<FlavorListener> flavorListeners;
     public synchronized FlavorListener[] getFlavorListeners() {
-        Set<FlavorListener> flavorListeners = getFlavorListeners(AppContext.getAppContext());
         return flavorListeners == null ? new FlavorListener[0]
                 : flavorListeners.toArray(new FlavorListener[flavorListeners.size()]);
     }
@@ -394,8 +328,7 @@ public abstract class SunClipboard extends Clipboard
 
     /**
      * Checks change of the {@code DataFlavor}s and, if necessary,
-     * posts notifications on {@code FlavorEvent}s to the
-     * AppContexts' EDTs.
+     * posts notifications on {@code FlavorEvent}s to the EDT's.
      * The parameter {@code formats} is null iff we have just
      * failed to get formats available on the clipboard.
      *
@@ -411,19 +344,13 @@ public abstract class SunClipboard extends Clipboard
         }
         currentFormats = formats;
 
-        for (final AppContext appContext : AppContext.getAppContexts()) {
-            if (appContext == null || appContext.isDisposed()) {
-                continue;
-            }
-            Set<FlavorListener> flavorListeners = getFlavorListeners(appContext);
-            if (flavorListeners != null) {
-                for (FlavorListener listener : flavorListeners) {
-                    if (listener != null) {
-                        PeerEvent peerEvent = new PeerEvent(this,
-                                () -> listener.flavorsChanged(new FlavorEvent(SunClipboard.this)),
-                                PeerEvent.PRIORITY_EVENT);
-                        SunToolkit.postEvent(appContext, peerEvent);
-                    }
+        if (flavorListeners != null) {
+            for (FlavorListener listener : flavorListeners) {
+                if (listener != null) {
+                    PeerEvent peerEvent = new PeerEvent(this,
+                            () -> listener.flavorsChanged(new FlavorEvent(SunClipboard.this)),
+                            PeerEvent.PRIORITY_EVENT);
+                    SunToolkit.postEvent(peerEvent);
                 }
             }
         }
diff --git a/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
index 0da7dbed6ea..c3968f19b60 100644
--- a/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
+++ b/src/java.desktop/share/classes/sun/awt/im/InputMethodManager.java
@@ -35,7 +35,6 @@ import java.awt.PopupMenu;
 import java.awt.Menu;
 import java.awt.MenuItem;
 import java.awt.Toolkit;
-import sun.awt.AppContext;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InvocationEvent;
diff --git a/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java b/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
index 74c7c4d2ce2..986b79edde9 100644
--- a/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageFetcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package sun.awt.image;
 
 import java.util.Vector;
-import sun.awt.AppContext;
 
 /**
   * An ImageFetcher is a thread used to fetch ImageFetchable objects.
@@ -34,10 +33,6 @@ import sun.awt.AppContext;
   * thread may also be used to animate it if necessary, via the
   * startingAnimation() / stoppingAnimation() methods.
   *
-  * There can be up to FetcherInfo.MAX_NUM_FETCHERS_PER_APPCONTEXT
-  * ImageFetcher threads for each AppContext.  A per-AppContext queue
-  * of ImageFetchables is used to track objects to fetch.
-  *
   * @author Jim Graham
   * @author Fred Ecks
   */
@@ -153,7 +148,6 @@ class ImageFetcher extends Thread {
                         info.numWaiting++;
                         info.waitList.wait(end - now);
                     } catch (InterruptedException e) {
-                        // A normal occurrence as an AppContext is disposed
                         return null;
                     } finally {
                         info.numWaiting--;
@@ -280,28 +274,20 @@ class ImageFetcher extends Thread {
        // We need to instantiate a new ImageFetcher thread.
        // First, figure out which ThreadGroup we'll put the
        // new ImageFetcher into
-       final AppContext appContext = AppContext.getAppContext();
-       ThreadGroup threadGroup = appContext.getThreadGroup();
-       ThreadGroup fetcherThreadGroup;
-       if (threadGroup.getParent() != null) {
-           // threadGroup is not the root, so we proceed
-           fetcherThreadGroup = threadGroup;
-       } else {
-           // threadGroup is the root ("system") ThreadGroup.
-           // We instead want to use its child: the "main"
-           // ThreadGroup.  Thus, we start with the current
-           // ThreadGroup, and go up the tree until
-           // threadGroup.getParent().getParent() == null.
-           threadGroup = Thread.currentThread().getThreadGroup();
-           ThreadGroup parent = threadGroup.getParent();
-           while ((parent != null)
-                && (parent.getParent() != null)) {
-                threadGroup = parent;
-                parent = threadGroup.getParent();
-           }
-           fetcherThreadGroup = threadGroup;
+       // We don't want the root ("system") ThreadGroup.
+       // We instead want to use its child: the "main"
+       // ThreadGroup.  Thus, we start with the current
+       // ThreadGroup, and go up the tree until
+       // threadGroup.getParent().getParent() == null.
+       ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
+       ThreadGroup parent = threadGroup.getParent();
+       while ((parent != null)
+            && (parent.getParent() != null)) {
+            threadGroup = parent;
+            parent = threadGroup.getParent();
        }
-       final ThreadGroup fetcherGroup = fetcherThreadGroup;
+       final ThreadGroup fetcherGroup = threadGroup;
+
 
        for (int i = 0; i < info.fetchers.length; i++) {
            if (info.fetchers[i] == null) {
@@ -320,38 +306,27 @@ class ImageFetcher extends Thread {
 }
 
 /**
-  * The FetcherInfo class encapsulates the per-AppContext ImageFetcher
+  * The FetcherInfo class encapsulates the ImageFetcher
   * information.  This includes the array of ImageFetchers, as well as
   * the queue of ImageFetchable objects.
   */
 class FetcherInfo {
-    static final int MAX_NUM_FETCHERS_PER_APPCONTEXT = 4;
+    static final int MAX_NUM_FETCHERS = 4;
+    static final FetcherInfo FETCHER_INFO = new FetcherInfo();
 
-    Thread[] fetchers;
+    final Thread[] fetchers;
     int numFetchers;
     int numWaiting;
-    Vector<ImageFetchable> waitList;
+    final Vector<ImageFetchable> waitList;
 
     private FetcherInfo() {
-        fetchers = new Thread[MAX_NUM_FETCHERS_PER_APPCONTEXT];
+        fetchers = new Thread[MAX_NUM_FETCHERS];
         numFetchers = 0;
         numWaiting = 0;
         waitList = new Vector<>();
     }
 
-    /* The key to put()/get() the FetcherInfo into/from the AppContext. */
-    private static final Object FETCHER_INFO_KEY =
-                                        new StringBuffer("FetcherInfo");
-
     static FetcherInfo getFetcherInfo() {
-        AppContext appContext = AppContext.getAppContext();
-        synchronized(appContext) {
-            FetcherInfo info = (FetcherInfo)appContext.get(FETCHER_INFO_KEY);
-            if (info == null) {
-                info = new FetcherInfo();
-                appContext.put(FETCHER_INFO_KEY, info);
-            }
-            return info;
-        }
+        return FETCHER_INFO;
     }
 }
diff --git a/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java b/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java
index cac9f8baab2..1b7cd41daa9 100644
--- a/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java
+++ b/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,22 +43,25 @@ import static java.lang.Math.multiplyExact;
 /**
  * Parse files of the form:
  *
+ * {@snippet lang=c:
  * #define foo_width w
  * #define foo_height h
  * static char foo_bits[] = {
  * 0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,
  * 0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,0xnn,
  * 0xnn,0xnn,0xnn,0xnn};
+ * }
  *
  * @author James Gosling
  */
 public class XbmImageDecoder extends ImageDecoder {
-    private static byte[] XbmColormap = {(byte) 255, (byte) 255, (byte) 255,
-                                         0, 0, 0};
-    private static int XbmHints = (ImageConsumer.TOPDOWNLEFTRIGHT |
-                                   ImageConsumer.COMPLETESCANLINES |
-                                   ImageConsumer.SINGLEPASS |
-                                   ImageConsumer.SINGLEFRAME);
+    private static final byte[] XbmColormap = {(byte) 255, (byte) 255, (byte) 255,
+                                               0, 0, 0};
+    private static final int XbmHints = (ImageConsumer.TOPDOWNLEFTRIGHT |
+                                         ImageConsumer.COMPLETESCANLINES |
+                                         ImageConsumer.SINGLEPASS |
+                                         ImageConsumer.SINGLEFRAME);
+
     private static final int MAX_XBM_SIZE = 16384;
     private static final int HEADER_SCAN_LIMIT = 100;
 
@@ -92,8 +95,8 @@ public class XbmImageDecoder extends ImageDecoder {
         byte[] raster = null;
         IndexColorModel model = null;
 
-        String matchRegex = "(0[xX])?[0-9a-fA-F]+[\\s+]?[,|};]";
-        String replaceRegex = "(0[xX])|,|[\\s+]|[};]";
+        String matchRegex = "\\s*(0[xX])?((?:(?!,|\\};).)+)(,|\\};)";
+        String replaceRegex = "0[xX]|,|\\s+|\\};";
 
         String line;
         int lineNum = 0;
@@ -110,12 +113,15 @@ public class XbmImageDecoder extends ImageDecoder {
                         error("Error while parsing define statement");
                     }
                     try {
-                        if (!token[2].isBlank() && state == 0) {
-                            W = Integer.parseInt(token[2]);
-                            state = 1; // after width is set
-                        } else if (!token[2].isBlank() && state == 1) {
-                            H = Integer.parseInt(token[2]);
-                            state = 2; // after height is set
+                        if (state < 2) {
+                            if (token[1].endsWith("h")) {
+                                W = Integer.parseInt(token[2]);
+                            } else if (token[1].endsWith("ht")) {
+                                H = Integer.parseInt(token[2]);
+                            }
+                            // After the 1st dimension is set, state becomes 1;
+                            // after the 2nd dimension is set, state becomes 2
+                            ++state;
                         }
                     } catch (NumberFormatException nfe) {
                         // parseInt() can throw NFE
@@ -147,59 +153,81 @@ public class XbmImageDecoder extends ImageDecoder {
                 error("Width or Height of XBM file not defined");
             }
 
+            boolean contFlag = false;
+            StringBuilder sb = new StringBuilder();
+
             // loop to process image data
             while (!aborted && (line = br.readLine()) != null) {
                 lineNum++;
 
-                if (line.contains("[]")) {
-                    Matcher matcher = Pattern.compile(matchRegex).matcher(line);
-                    while (matcher.find()) {
-                        if (y >= H) {
-                            error("Scan size of XBM file exceeds"
-                                    + " the defined width x height");
-                        }
-
-                        int startIndex = matcher.start();
-                        int endIndex = matcher.end();
-                        String hexByte = line.substring(startIndex, endIndex);
-
-                        if (!(hexByte.startsWith("0x")
-                                || hexByte.startsWith("0X"))) {
-                            error("Invalid hexadecimal number at Ln#:" + lineNum
-                                    + " Col#:" + (startIndex + 1));
-                        }
-                        hexByte = hexByte.replaceAll(replaceRegex, "");
-                        if (hexByte.length() != 2) {
-                            error("Invalid hexadecimal number at Ln#:" + lineNum
-                                    + " Col#:" + (startIndex + 1));
-                        }
-
-                        try {
-                            n = Integer.parseInt(hexByte, 16);
-                        } catch (NumberFormatException nfe) {
-                            error("Error parsing hexadecimal at Ln#:" + lineNum
-                                    + " Col#:" + (startIndex + 1));
-                        }
-                        for (int mask = 1; mask <= 0x80; mask <<= 1) {
-                            if (x < W) {
-                                if ((n & mask) != 0)
-                                    raster[x] = 1;
-                                else
-                                    raster[x] = 0;
-                            }
-                            x++;
-                        }
-
-                        if (x >= W) {
-                            int result = setPixels(0, y, W, 1, model, raster, 0, W);
-                            if (result <= 0) {
-                                error("Unexpected error occurred during setPixel()");
-                            }
-                            x = 0;
-                            y++;
-                        }
+                if (!contFlag) {
+                    if (line.contains("[]")) {
+                        contFlag = true;
+                    } else {
+                        continue;
                     }
                 }
+
+                int end = line.indexOf(';');
+                if (end >= 0) {
+                    sb.append(line, 0, end + 1);
+                    break;
+                } else {
+                    sb.append(line).append(System.lineSeparator());
+                }
+            }
+
+            String resultLine = sb.toString();
+            int cutOffIndex = resultLine.indexOf('{');
+            resultLine = resultLine.substring(cutOffIndex + 1);
+
+            Matcher matcher = Pattern.compile(matchRegex).matcher(resultLine);
+            while (matcher.find()) {
+                if (y >= H) {
+                    error("Scan size of XBM file exceeds"
+                            + " the defined width x height");
+                }
+
+                int startIndex = matcher.start();
+                int endIndex = matcher.end();
+                String hexByte = resultLine.substring(startIndex, endIndex);
+                hexByte = hexByte.replaceAll("^\\s+", "");
+
+                if (!(hexByte.startsWith("0x")
+                        || hexByte.startsWith("0X"))) {
+                    error("Invalid hexadecimal number at Ln#:" + lineNum
+                            + " Col#:" + (startIndex + 1));
+                }
+                hexByte = hexByte.replaceAll(replaceRegex, "");
+                if (hexByte.length() != 2) {
+                    error("Invalid hexadecimal number at Ln#:" + lineNum
+                            + " Col#:" + (startIndex + 1));
+                }
+
+                try {
+                    n = Integer.parseInt(hexByte, 16);
+                } catch (NumberFormatException nfe) {
+                    error("Error parsing hexadecimal at Ln#:" + lineNum
+                            + " Col#:" + (startIndex + 1));
+                }
+                for (int mask = 1; mask <= 0x80; mask <<= 1) {
+                    if (x < W) {
+                        if ((n & mask) != 0)
+                            raster[x] = 1;
+                        else
+                            raster[x] = 0;
+                    }
+                    x++;
+                }
+
+                if (x >= W) {
+                    int result = setPixels(0, y, W, 1, model, raster, 0, W);
+                    if (result <= 0) {
+                        error("Unexpected error occurred during setPixel()");
+                    }
+                    x = 0;
+                    y++;
+                }
             }
             imageComplete(ImageConsumer.STATICIMAGEDONE, true);
         }
diff --git a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
index 85c631d6e3e..f3569941321 100644
--- a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
+++ b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -399,7 +399,7 @@ class ExtendedTextSourceLabel implements TextLineComponent, Decoration.Label {
     int start = source.getStart();
     int length = source.getLength();
 
-    GlyphLayout gl = GlyphLayout.get(null); // !!! no custom layout engines
+    GlyphLayout gl = GlyphLayout.get();
     gv = gl.layout(font, frc, context, start, length, flags, null); // ??? use textsource
     GlyphLayout.done(gl);
 
diff --git a/src/java.desktop/share/classes/sun/font/GlyphLayout.java b/src/java.desktop/share/classes/sun/font/GlyphLayout.java
index fe2a8bf2599..5bff127f143 100644
--- a/src/java.desktop/share/classes/sun/font/GlyphLayout.java
+++ b/src/java.desktop/share/classes/sun/font/GlyphLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.WeakHashMap;
 
 import static java.lang.Character.*;
 
@@ -87,7 +87,6 @@ public final class GlyphLayout {
     // cached glyph layout data for reuse
     private static volatile GlyphLayout cache;  // reusable
 
-    private LayoutEngineFactory _lef;  // set when get is called, unset when done is called
     private TextRecord _textRecord;    // the text we're working on, used by iterators
     private ScriptRun _scriptRuns;     // iterator over script runs
     private FontRunIterator _fontRuns; // iterator over physical fonts in a composite
@@ -100,91 +99,10 @@ public final class GlyphLayout {
     private int _typo_flags;
     private int _offset;
 
-    public static final class LayoutEngineKey {
-        private Font2D font;
-        private int script;
-        private int lang;
-
-        LayoutEngineKey() {
-        }
-
-        LayoutEngineKey(Font2D font, int script, int lang) {
-            init(font, script, lang);
-        }
-
-        void init(Font2D font, int script, int lang) {
-            this.font = font;
-            this.script = script;
-            this.lang = lang;
-        }
-
-        LayoutEngineKey copy() {
-            return new LayoutEngineKey(font, script, lang);
-        }
-
-        Font2D font() {
-            return font;
-        }
-
-        int script() {
-            return script;
-        }
-
-        int lang() {
-            return lang;
-        }
-
-        public boolean equals(Object rhs) {
-            if (this == rhs) return true;
-            if (rhs == null) return false;
-            try {
-                LayoutEngineKey that = (LayoutEngineKey)rhs;
-                return this.script == that.script &&
-                       this.lang == that.lang &&
-                       this.font.equals(that.font);
-            }
-            catch (ClassCastException e) {
-                return false;
-            }
-        }
-
-        public int hashCode() {
-            return script ^ lang ^ font.hashCode();
-        }
-    }
-
-    public static interface LayoutEngineFactory {
-        /**
-         * Given a font, script, and language, determine a layout engine to use.
-         */
-        public LayoutEngine getEngine(Font2D font, int script, int lang);
-
-        /**
-         * Given a key, determine a layout engine to use.
-         */
-        public LayoutEngine getEngine(LayoutEngineKey key);
-    }
-
-    public static interface LayoutEngine {
-        /**
-         * Given a strike descriptor, text, rtl flag, and starting point, append information about
-         * glyphs, positions, and character indices to the glyphvector data, and advance the point.
-         *
-         * If the GVData does not have room for the glyphs, throws an IndexOutOfBoundsException and
-         * leave pt and the gvdata unchanged.
-         */
-        public void layout(FontStrikeDesc sd, float[] mat, float ptSize, int gmask,
-                           int baseIndex, TextRecord text, int typo_flags, Point2D.Float pt, GVData data);
-    }
-
     /**
-     * Return a new instance of GlyphLayout, using the provided layout engine factory.
-     * If null, the system layout engine factory will be used.
+     * Return a possibly recycled instance of GlyphLayout
      */
-    public static GlyphLayout get(LayoutEngineFactory lef) {
-        if (lef == null) {
-            lef = SunLayoutEngine.instance();
-        }
+    public static GlyphLayout get() {
         GlyphLayout result = null;
         synchronized(GlyphLayout.class) {
             if (cache != null) {
@@ -195,7 +113,6 @@ public final class GlyphLayout {
         if (result == null) {
             result = new GlyphLayout();
         }
-        result._lef = lef;
         return result;
     }
 
@@ -204,23 +121,16 @@ public final class GlyphLayout {
      * of GlyphLayout objects.
      */
     public static void done(GlyphLayout gl) {
-        gl._lef = null;
         cache = gl; // object reference assignment is thread safe, it says here...
     }
 
     private static final class SDCache {
-        public Font key_font;
-        public FontRenderContext key_frc;
-
         public AffineTransform dtx;
         public AffineTransform gtx;
         public Point2D.Float delta;
         public FontStrikeDesc sd;
 
         private SDCache(Font font, FontRenderContext frc) {
-            key_font = font;
-            key_frc = frc;
-
             // !!! add getVectorTransform and hasVectorTransform to frc?  then
             // we could just skip this work...
 
@@ -261,7 +171,7 @@ public final class GlyphLayout {
         private static final Point2D.Float ZERO_DELTA = new Point2D.Float();
 
         private static
-            SoftReference<ConcurrentHashMap<SDKey, SDCache>> cacheRef;
+            SoftReference<WeakHashMap<SDKey, SDCache>> cacheRef;
 
         private static final class SDKey {
             private final Font font;
@@ -316,7 +226,7 @@ public final class GlyphLayout {
             }
 
             SDKey key = new SDKey(font, frc); // garbage, yuck...
-            ConcurrentHashMap<SDKey, SDCache> cache = null;
+            WeakHashMap<SDKey, SDCache> cache = null;
             SDCache res = null;
             if (cacheRef != null) {
                 cache = cacheRef.get();
@@ -327,13 +237,17 @@ public final class GlyphLayout {
             if (res == null) {
                 res = new SDCache(font, frc);
                 if (cache == null) {
-                    cache = new ConcurrentHashMap<SDKey, SDCache>(10);
+                    cache = new WeakHashMap<SDKey, SDCache>(10);
                     cacheRef = new
-                       SoftReference<ConcurrentHashMap<SDKey, SDCache>>(cache);
-                } else if (cache.size() >= 512) {
-                    cache.clear();
+                       SoftReference<WeakHashMap<SDKey, SDCache>>(cache);
+                } else if (cache.size() >= 128) {
+                    synchronized (SDCache.class) {
+                        cache.clear();
+                    }
+                }
+                synchronized (SDCache.class) {
+                    cache.put(key, res);
                 }
-                cache.put(key, res);
             }
             return res;
         }
@@ -398,8 +312,6 @@ public final class GlyphLayout {
             }
         }
 
-        int lang = -1; // default for now
-
         Font2D font2D = FontUtilities.getFont2D(font);
         if (font2D instanceof FontSubstitution) {
             font2D = ((FontSubstitution)font2D).getCompositeFont2D();
@@ -426,7 +338,7 @@ public final class GlyphLayout {
                     }
                     int gmask = _fontRuns.getGlyphMask();
                     int pos = _fontRuns.getPos();
-                    nextEngineRecord(start, pos, script, lang, pfont, gmask);
+                    nextEngineRecord(start, pos, script, pfont, gmask);
                     start = pos;
                 }
             }
@@ -435,7 +347,7 @@ public final class GlyphLayout {
             while (_scriptRuns.next()) {
                 int limit = _scriptRuns.getScriptLimit();
                 int script = _scriptRuns.getScriptCode();
-                nextEngineRecord(start, limit, script, lang, font2D, 0);
+                nextEngineRecord(start, limit, script, font2D, 0);
                 start = limit;
             }
         }
@@ -508,7 +420,7 @@ public final class GlyphLayout {
         this._gvdata.init(capacity);
     }
 
-    private void nextEngineRecord(int start, int limit, int script, int lang, Font2D font, int gmask) {
+    private void nextEngineRecord(int start, int limit, int script, Font2D font, int gmask) {
         EngineRecord er = null;
         if (_ercount == _erecords.size()) {
             er = new EngineRecord();
@@ -516,7 +428,7 @@ public final class GlyphLayout {
         } else {
             er = _erecords.get(_ercount);
         }
-        er.init(start, limit, font, script, lang, gmask);
+        er.init(start, limit, font, script, gmask);
         ++_ercount;
     }
 
@@ -627,18 +539,18 @@ public final class GlyphLayout {
         private int limit;
         private int gmask;
         private int eflags;
-        private LayoutEngineKey key;
-        private LayoutEngine engine;
+        private Font2D font;
+        private int script;
 
         EngineRecord() {
-            key = new LayoutEngineKey();
         }
 
-        void init(int start, int limit, Font2D font, int script, int lang, int gmask) {
+        void init(int start, int limit, Font2D font, int script, int gmask) {
             this.start = start;
             this.limit = limit;
+            this.font = font;
+            this.script = script;
             this.gmask = gmask;
-            this.key.init(font, script, lang);
             this.eflags = 0;
 
             // only request canonical substitution if we have combining marks
@@ -659,14 +571,12 @@ public final class GlyphLayout {
                     break;
                 }
             }
-
-            this.engine = _lef.getEngine(key); // flags?
         }
 
         void layout() {
             _textRecord.start = start;
             _textRecord.limit = limit;
-            engine.layout(_sd, _mat, ptSize, gmask, start - _offset, _textRecord,
+            SunLayoutEngine.layout(font, script, _sd, _mat, ptSize, gmask, start - _offset, _textRecord,
                           _typo_flags | eflags, _pt, _gvdata);
         }
     }
diff --git a/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java b/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java
index f1d6de7d4bc..99d3987e5fd 100644
--- a/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java
+++ b/src/java.desktop/share/classes/sun/font/SunLayoutEngine.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,126 +37,22 @@ import sun.java2d.DisposerRecord;
 
 import java.awt.geom.Point2D;
 import java.lang.foreign.MemorySegment;
-import java.lang.ref.SoftReference;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.WeakHashMap;
 
-/*
- * different ways to do this
- * 1) each physical font2d keeps a hashtable mapping scripts to layout
- * engines, we query and fill this cache.
- * 2) we keep a mapping independent of font using the key Most likely
- * few fonts will be used, so option 2 seems better
- *
- * Once we know which engine to use for a font, we always know, so we
- * shouldn't have to recheck each time we do layout.  So the cache is
- * ok.
- *
- * Should we reuse engines?  We could instantiate an engine for each
- * font/script pair.  The engine would hold onto the table(s) from the
- * font that it needs.  If we have multiple threads using the same
- * engine, we still need to keep the state separate, so the native
- * engines would still need to be allocated for each call, since they
- * keep their state in themselves.  If they used the passed-in GVData
- * arrays directly (with some checks for space) then since each GVData
- * is different per thread, we could reuse the layout engines.  This
- * still requires a separate layout engine per font, because of the
- * table state in the engine.  If we pushed that out too and passed it
- * in with the native call as well, we'd be ok if the layout engines
- * keep all their process state on the stack, but I don't know if this
- * is true.  Then we'd basically just be down to an engine index which
- * we pass into native and then invoke the engine code (now a
- * procedure call, not an object invocation) based on a switch on the
- * index.  There would be only half a dozen engine objects then, not
- * potentially half a dozen per font.  But we'd have to stack-allocate
- * some state that included the pointer to the required font tables.
- *
- * Seems for now that the way to do things is to come in with a
- * selector and the font.  The selector indicates which engine to use,
- * the engine is stack allocated and initialized with the required
- * font tables (the selector indicates which).  Then layout is called,
- * the contents are copied (or not), and the stack is destroyed on
- * exit. So the association is between the font/script (layout engine
- * desc) and one of a few permanent engine objects, which are
- * handed the key when they need to process something.  In the native
- * case, the engine holds an index, and just passes it together with
- * the key info down to native.  Some default cases are the 'default
- * layout' case that just runs the c2gmapper, this stays in java and
- * just uses the mapper from the font/strike.  Another default case
- * might be the unicode arabic shaper, since this doesn't care about
- * the font (or script or lang?) it wouldn't need to extract this
- * data.  It could be (yikes) ported back to java even to avoid
- * upcalls to check if the font supports a particular unicode
- * character.
- *
- * I'd expect that the majority of scripts use the default mapper for
- * a particular font.  Loading the hashtable with 40 or so keys 30+ of
- * which all map to the same object is unfortunate.  It might be worth
- * instead having a per-font list of 'scripts with non-default
- * engines', e.g. the factory has a hashtable mapping fonts to 'script
- * lists' (the factory has this since the design potentially has other
- * factories, though I admit there's no client for this yet and no
- * public api) and then the script list is queried for the script in
- * question.  it can be preloaded at creation time with all the
- * scripts that don't have default engines-- either a list or a hash
- * table, so a null return from the table means 'default' and not 'i
- * don't know yet'.
- *
- * On the other hand, in most all cases the number of unique
- * script/font combinations will be small, so a flat hashtable should
- * suffice.
- * */
-public final class SunLayoutEngine implements LayoutEngine, LayoutEngineFactory {
+public final class SunLayoutEngine {
+
     static {
         FontManagerNativeLibrary.load();
     }
 
-    private LayoutEngineKey key;
-
-    private static LayoutEngineFactory instance;
-
-    public static LayoutEngineFactory instance() {
-        if (instance == null) {
-            instance = new SunLayoutEngine();
-        }
-        return instance;
-    }
-
     private SunLayoutEngine() {
-        // actually a factory, key is null so layout cannot be called on it
-    }
-
-    public LayoutEngine getEngine(Font2D font, int script, int lang) {
-        return getEngine(new LayoutEngineKey(font, script, lang));
-    }
-
-  // !!! don't need this unless we have more than one sun layout engine...
-    public LayoutEngine getEngine(LayoutEngineKey key) {
-        ConcurrentHashMap<LayoutEngineKey, LayoutEngine> cache = cacheref.get();
-        if (cache == null) {
-            cache = new ConcurrentHashMap<>();
-            cacheref = new SoftReference<>(cache);
-        }
-
-        LayoutEngine e = cache.get(key);
-        if (e == null) {
-            LayoutEngineKey copy = key.copy();
-            e = new SunLayoutEngine(copy);
-            cache.put(copy, e);
-        }
-        return e;
-    }
-    private SoftReference<ConcurrentHashMap<LayoutEngineKey, LayoutEngine>> cacheref =
-        new SoftReference<>(null);
-
-    private SunLayoutEngine(LayoutEngineKey key) {
-        this.key = key;
     }
 
     private static final WeakHashMap<Font2D, FaceRef> facePtr =
             new WeakHashMap<>();
 
-    private long getFacePtr(Font2D font2D) {
+    private static long getFacePtr(Font2D font2D) {
         FaceRef ref;
         synchronized (facePtr) {
             ref = facePtr.computeIfAbsent(font2D, FaceRef::new);
@@ -170,17 +67,16 @@ public final class SunLayoutEngine implements LayoutEngine, LayoutEngineFactory
 
     }
 
-    public void layout(FontStrikeDesc desc, float[] mat, float ptSize, int gmask,
+    public static void layout(Font2D font, int script, FontStrikeDesc desc, float[] mat, float ptSize, int gmask,
                        int baseIndex, TextRecord tr, int typo_flags,
                        Point2D.Float pt, GVData data) {
 
-        Font2D font = key.font();
         FontStrike strike = font.getStrike(desc);
         if (useFFM) {
             MemorySegment face = HBShaper.getFace(font);
             if (face != null) {
                 HBShaper.shape(font, strike, ptSize, mat, face,
-                        tr.text, data, key.script(),
+                        tr.text, data, script,
                         tr.start, tr.limit, baseIndex, pt,
                         typo_flags, gmask);
             }
@@ -188,7 +84,7 @@ public final class SunLayoutEngine implements LayoutEngine, LayoutEngineFactory
             long pFace = getFacePtr(font);
             if (pFace != 0) {
                 shape(font, strike, ptSize, mat, pFace,
-                    tr.text, data, key.script(),
+                    tr.text, data, script,
                     tr.start, tr.limit, baseIndex, pt,
                     typo_flags, gmask);
             }
diff --git a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
index 1bebf379997..9815d657eee 100644
--- a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
+++ b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1898,14 +1898,16 @@ public final class SunGraphics2D
 
     protected void validateCompClip() {
         int origClipState = clipState;
-        if (usrClip == null) {
+        final Shape clip = usrClip;
+
+        if (clip == null) {
             clipState = CLIP_DEVICE;
             clipRegion = devClip;
-        } else if (usrClip instanceof Rectangle2D) {
+        } else if (clip instanceof Rectangle2D rect2d) {
             clipState = CLIP_RECTANGULAR;
-            clipRegion = devClip.getIntersection((Rectangle2D) usrClip);
+            clipRegion = devClip.getIntersection(rect2d);
         } else {
-            PathIterator cpi = usrClip.getPathIterator(null);
+            PathIterator cpi = clip.getPathIterator(null);
             int[] box = new int[4];
             ShapeSpanIterator sr = LoopPipe.getFillSSI(this);
             try {
diff --git a/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java b/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java
index 62d1f119f33..69c4954cac4 100644
--- a/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ package sun.java2d.pipe;
 
 import java.awt.Rectangle;
 import java.awt.Shape;
+
+import sun.java2d.InvalidPipeException;
 import sun.java2d.SunGraphics2D;
 
 /**
@@ -67,7 +69,9 @@ public class SpanClipRenderer implements CompositePipe
     public Object startSequence(SunGraphics2D sg, Shape s, Rectangle devR,
                                 int[] abox) {
         RegionIterator ri = sg.clipRegion.getIterator();
-
+        if (ri.region.isRectangular()) {
+            throw new InvalidPipeException("Invalid clip data");
+        }
         return new SCRcontext(ri, outpipe.startSequence(sg, s, devR, abox));
     }
 
diff --git a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index 754af87b94e..32728efde6c 100644
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1610,6 +1610,11 @@ public abstract class RasterPrinterJob extends PrinterJob {
                 cancelDoc();
             }
 
+        } catch (PrinterException pe) {
+            throw pe;
+        } catch (Throwable printError) {
+            throw (PrinterException)
+                    new PrinterException().initCause(printError.getCause());
         } finally {
             // reset previousPaper in case this job is invoked again.
             previousPaper = null;
diff --git a/src/java.desktop/share/classes/sun/swing/DefaultLookup.java b/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
index d7a7f22eba3..a2ae0921507 100644
--- a/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
+++ b/src/java.desktop/share/classes/sun/swing/DefaultLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.awt.Insets;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
-import sun.awt.AppContext;
 
 /**
  * DefaultLookup provides a way to customize the lookup done by the
@@ -44,17 +43,9 @@ import sun.awt.AppContext;
  * @author Scott Violet
  */
 public class DefaultLookup {
+
     /**
-     * Key used to store DefaultLookup for AppContext.
-     */
-    private static final Object DEFAULT_LOOKUP_KEY = new
-                                        StringBuffer("DefaultLookup");
-    /**
-     * Thread that last asked for a default.
-     */
-    private static Thread currentDefaultThread;
-    /**
-     * DefaultLookup for last thread.
+     * DefaultLookup currently set.
      */
     private static DefaultLookup currentDefaultLookup;
 
@@ -63,28 +54,24 @@ public class DefaultLookup {
      */
     private static boolean isLookupSet;
 
-
     /**
-     * Sets the DefaultLookup instance to use for the current
-     * <code>AppContext</code>. Null implies the UIManager should be
-     * used.
+     * Sets the DefaultLookup instance to use.
+     * Null implies the UIManager should be used.
      */
     public static void setDefaultLookup(DefaultLookup lookup) {
         synchronized(DefaultLookup.class) {
             if (!isLookupSet && lookup == null) {
-                // Null was passed in, and no one has invoked setDefaultLookup
+                // Null was passed in, and no one has previously invoked setDefaultLookup
                 // with a non-null value, we don't need to do anything.
                 return;
             }
             else if (lookup == null) {
-                // null was passed in, but someone has invoked setDefaultLookup
+                // null was passed in, but someone has previously invoked setDefaultLookup
                 // with a non-null value, use an instance of DefaultLookup
                 // which will fallback to UIManager.
                 lookup = new DefaultLookup();
             }
             isLookupSet = true;
-            AppContext.getAppContext().put(DEFAULT_LOOKUP_KEY, lookup);
-            currentDefaultThread = Thread.currentThread();
             currentDefaultLookup = lookup;
         }
     }
@@ -98,27 +85,13 @@ public class DefaultLookup {
             // No one has set a valid DefaultLookup, use UIManager.
             return UIManager.get(key, c.getLocale());
         }
-        Thread thisThread = Thread.currentThread();
         DefaultLookup lookup;
         synchronized(DefaultLookup.class) {
-            // See if we've already cached the DefaultLookup for this thread,
-            // and use it if we have.
-            if (thisThread == currentDefaultThread) {
-                // It is cached, use it.
-                lookup = currentDefaultLookup;
-            }
-            else {
-                // Not cached, get the DefaultLookup to use from the AppContext
-                lookup = (DefaultLookup)AppContext.getAppContext().get(
-                                                   DEFAULT_LOOKUP_KEY);
-                if (lookup == null) {
-                    // Fallback to DefaultLookup, which will redirect to the
-                    // UIManager.
-                    lookup = new DefaultLookup();
-                    AppContext.getAppContext().put(DEFAULT_LOOKUP_KEY, lookup);
-                }
-                // Cache the values to make the next lookup easier.
-                currentDefaultThread = thisThread;
+            lookup = currentDefaultLookup;
+            if (lookup == null) {
+                // Fallback to DefaultLookup, which will redirect to the
+                // UIManager.
+                lookup = new DefaultLookup();
                 currentDefaultLookup = lookup;
             }
         }
diff --git a/src/java.desktop/share/classes/sun/swing/SwingAccessor.java b/src/java.desktop/share/classes/sun/swing/SwingAccessor.java
index 5c561de4a42..563cc038ae9 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingAccessor.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,6 +133,33 @@ public final class SwingAccessor {
         KeyStroke create();
     }
 
+    /**
+     * An accessor for the LAFState class state.
+     */
+    public interface LAFStateAccessor {
+        boolean lafStateIsInitialized();
+    }
+
+    private static LAFStateAccessor lafStateAccessor;
+    /**
+     * Set an accessor object for the LAFState class.
+     */
+    public static void setLAFStateAccessor(LAFStateAccessor accessor) {
+        lafStateAccessor = accessor;
+    }
+
+    /**
+     * Retrieve the accessor object for the LAFState class.
+     */
+    public static LAFStateAccessor getLAFStateAccessor() {
+        var access = lafStateAccessor;
+        if (access == null) {
+            ensureClassInitialized(UIManager.class);
+            access = lafStateAccessor;
+        }
+        return access;
+    }
+
     /**
      * The javax.swing.JComponent class accessor object.
      */
diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index 20a07c608a0..d552bc5c9f2 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,7 +92,6 @@ import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 
 import sun.awt.AWTAccessor;
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.font.FontDesignMetrics;
 import sun.font.FontUtilities;
@@ -120,15 +119,6 @@ import static java.awt.geom.AffineTransform.TYPE_TRANSLATION;
  *
  */
 public class SwingUtilities2 {
-    /**
-     * The {@code AppContext} key for our one {@code LAFState}
-     * instance.
-     */
-    public static final Object LAF_STATE_KEY =
-            new StringBuffer("LookAndFeel State");
-
-    public static final Object MENU_SELECTION_MANAGER_LISTENER_KEY =
-            new StringBuffer("MenuSelectionManager listener key");
 
     // Maintain a cache of CACHE_SIZE fonts and the left side bearing
      // of the characters falling into the range MIN_CHAR_INDEX to
@@ -1250,7 +1240,7 @@ public class SwingUtilities2 {
         return null;
     }
 
-    private static final Object APP_CONTEXT_FRC_CACHE_KEY = new Object();
+    private static final Map<Object, FontRenderContext> cache = new HashMap<>();
 
     private static FontRenderContext getFRCFromCache(AffineTransform tx,
                                                      Object aaHint) {
@@ -1258,15 +1248,6 @@ public class SwingUtilities2 {
             return null;
         }
 
-        @SuppressWarnings("unchecked")
-        Map<Object, FontRenderContext> cache = (Map<Object, FontRenderContext>)
-                AppContext.getAppContext().get(APP_CONTEXT_FRC_CACHE_KEY);
-
-        if (cache == null) {
-            cache = new HashMap<>();
-            AppContext.getAppContext().put(APP_CONTEXT_FRC_CACHE_KEY, cache);
-        }
-
         Object key = (tx == null)
                 ? aaHint
                 : (aaHint == null ? tx : new KeyPair(tx, aaHint));
diff --git a/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java b/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java
index 8af75f98b83..6b33f0786a8 100644
--- a/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java
+++ b/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,8 +42,6 @@ import javax.swing.UIManager;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
 
-import sun.awt.AppContext;
-
 /**
  * Wrapper for a value from the desktop. The value is lazily looked up, and
  * can be accessed using the <code>UIManager.ActiveValue</code> method
@@ -52,8 +50,6 @@ import sun.awt.AppContext;
  * <code>invalidate</code> to force the value to be fetched again.
  */
 public class DesktopProperty implements UIDefaults.ActiveValue {
-    private static final StringBuilder DESKTOP_PROPERTY_UPDATE_PENDING_KEY =
-            new StringBuilder("DesktopPropertyUpdatePending");
 
     /**
      * ReferenceQueue of unreferenced WeakPCLs.
@@ -90,23 +86,6 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
         }
     }
 
-
-    /**
-     * Sets whether or not an updateUI call is pending.
-     */
-    private static synchronized void setUpdatePending(boolean update) {
-        AppContext.getAppContext()
-                .put(DESKTOP_PROPERTY_UPDATE_PENDING_KEY, update);
-    }
-
-    /**
-     * Returns true if a UI update is pending.
-     */
-    private static synchronized boolean isUpdatePending() {
-        return Boolean.TRUE.equals(AppContext.getAppContext()
-                .get(DESKTOP_PROPERTY_UPDATE_PENDING_KEY));
-    }
-
     /**
      * Updates the UIs of all the known Frames.
      */
@@ -202,6 +181,8 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
         value = null;
     }
 
+   private static volatile boolean updatePending;
+
     /**
      * Requests that all components in the GUI hierarchy be updated
      * to reflect dynamic changes in this {@literal look&feel}. This update occurs
@@ -210,14 +191,14 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
      * many desktop properties will change at once.
      */
     protected void updateUI() {
-        if (!isUpdatePending()) {
-            setUpdatePending(true);
+        if (!updatePending) {
+            updatePending = true;
             Runnable uiUpdater = new Runnable() {
                 public void run() {
                     try {
                         updateAllUIs();
                     } finally {
-                        setUpdatePending(false);
+                        updatePending = false;
                     }
                 }
             };
diff --git a/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md
index e0c40705ed6..3aa5ca841d6 100644
--- a/src/java.desktop/share/legal/harfbuzz.md
+++ b/src/java.desktop/share/legal/harfbuzz.md
@@ -1,4 +1,4 @@
-## Harfbuzz 11.2.0
+## Harfbuzz 12.3.2
 
 ### Harfbuzz License
 
diff --git a/src/java.desktop/share/legal/lcms.md b/src/java.desktop/share/legal/lcms.md
index d3bd7d84c8b..20a22ea4db5 100644
--- a/src/java.desktop/share/legal/lcms.md
+++ b/src/java.desktop/share/legal/lcms.md
@@ -1,11 +1,11 @@
-## Little Color Management System (LCMS) v2.17
+## Little Color Management System (LCMS) v2.18
 
 ### LCMS License
 <pre>
 
 MIT License
 
-Copyright (C) 1998-2025 Marti Maria Saguer
+Copyright (C) 1998-2026 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md
index 8899491c6c0..a2ffcca1974 100644
--- a/src/java.desktop/share/legal/libpng.md
+++ b/src/java.desktop/share/legal/libpng.md
@@ -1,4 +1,4 @@
-## libpng v1.6.51
+## libpng v1.6.55
 
 ### libpng License
 <pre>
@@ -9,8 +9,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
-Copyright (C) 1995-2025 The PNG Reference Library Authors.
-Copyright (C) 2018-2025 Cosmin Truta
+Copyright (C) 1995-2026 The PNG Reference Library Authors.
+Copyright (C) 2018-2026 Cosmin Truta
 Copyright (C) 1998-2018 Glenn Randers-Pehrson
 Copyright (C) 1996-1997 Andreas Dilger
 Copyright (C) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -158,6 +158,7 @@ This is the list of PNG Reference Library ("libpng") Contributing
 Authors, for copyright and licensing purposes.
 
  * Adam Richter
+ * Alexander Smorkalov
  * Andreas Dilger
  * Chris Blume
  * Cosmin Truta
@@ -169,6 +170,7 @@ Authors, for copyright and licensing purposes.
  * Guy Eric Schalnat
  * James Yu
  * John Bowler
+ * Joshua Inscoe
  * Kevin Bracey
  * Lucas Chollet
  * Magnus Holmgren
@@ -179,6 +181,7 @@ Authors, for copyright and licensing purposes.
  * Mike Klein
  * Pascal Massimino
  * Paul Schmidt
+ * Petr Simecek
  * Philippe Antoine
  * Qiang Zhou
  * Sam Bushell
@@ -209,6 +212,8 @@ Authors, for copyright and licensing purposes.
     - ZhangLixia (张利霞)
  * Samsung Group
     - Filip Wasil
+ * SpacemiT Hangzhou Technology, Co.
+    - Liang Junzhao (梁俊钊)
 
 The build projects, the build scripts, the test scripts, and other
 files in the "projects", "scripts" and "tests" directories, have
diff --git a/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c b/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c
index 6079b9e76b8..3cb2df0e0e9 100644
--- a/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c
+++ b/src/java.desktop/share/native/libawt/awt/image/awt_ImageRep.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -227,7 +227,7 @@ Java_sun_awt_image_ImageRepresentation_setICMpixels(JNIEnv *env, jclass cls,
     /* Release the locked arrays */
     (*env)->ReleasePrimitiveArrayCritical(env, jlut, srcLUT,  JNI_ABORT);
     (*env)->ReleasePrimitiveArrayCritical(env, jpix, srcData, JNI_ABORT);
-    (*env)->ReleasePrimitiveArrayCritical(env, jdata, dstData, JNI_ABORT);
+    (*env)->ReleasePrimitiveArrayCritical(env, jdata, dstData, 0);
 
     return JNI_TRUE;
 }
@@ -385,7 +385,7 @@ Java_sun_awt_image_ImageRepresentation_setDiffICM(JNIEnv *env, jclass cls,
     }
 
     (*env)->ReleasePrimitiveArrayCritical(env, jpix, srcData, JNI_ABORT);
-    (*env)->ReleasePrimitiveArrayCritical(env, jdata, dstData, JNI_ABORT);
+    (*env)->ReleasePrimitiveArrayCritical(env, jdata, dstData, 0);
 
     return JNI_TRUE;
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh
index 73e6b4c305b..011b5ad5520 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh
@@ -104,7 +104,7 @@ public:
     foreground (foreground_),
     instancer (instancer_)
   {
-    if (font->is_synthetic ())
+    if (font->is_synthetic)
     {
       font = hb_font_create_sub_font (font);
       hb_font_set_synthetic_bold (font, 0, 0, true);
@@ -178,7 +178,10 @@ struct hb_colrv1_closure_context_t :
   { glyphs->add (glyph_id); }
 
   void add_layer_indices (unsigned first_layer_index, unsigned num_of_layers)
-  { layer_indices->add_range (first_layer_index, first_layer_index + num_of_layers - 1); }
+  {
+    if (num_of_layers == 0) return;
+    layer_indices->add_range (first_layer_index, first_layer_index + num_of_layers - 1);
+  }
 
   void add_palette_index (unsigned palette_index)
   { palette_indices->add (palette_index); }
@@ -650,10 +653,10 @@ struct PaintColrLayers
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (this);
     if (unlikely (!out)) return_trace (false);
-    return_trace (c->serializer->check_assign (out->firstLayerIndex, c->plan->colrv1_layers.get (firstLayerIndex),
-                                               HB_SERIALIZE_ERROR_INT_OVERFLOW));
 
-    return_trace (true);
+    uint32_t first_layer_index = numLayers ? c->plan->colrv1_layers.get (firstLayerIndex) : 0;
+    return_trace (c->serializer->check_assign (out->firstLayerIndex, first_layer_index,
+                                               HB_SERIALIZE_ERROR_INT_OVERFLOW));
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -1075,9 +1078,9 @@ struct PaintTranslate
     float ddx = dx + c->instancer (varIdxBase, 0);
     float ddy = dy + c->instancer (varIdxBase, 1);
 
-    bool p1 = c->funcs->push_translate (c->data, ddx, ddy);
+    c->funcs->push_translate (c->data, ddx, ddy);
     c->recurse (this+src);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 14(noVar) or 15 (Var) */
@@ -1124,9 +1127,9 @@ struct PaintScale
     float sx = scaleX.to_float (c->instancer (varIdxBase, 0));
     float sy = scaleY.to_float (c->instancer (varIdxBase, 1));
 
-    bool p1 = c->funcs->push_scale (c->data, sx, sy);
+    c->funcs->push_scale (c->data, sx, sy);
     c->recurse (this+src);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 16 (noVar) or 17(Var) */
@@ -1177,13 +1180,9 @@ struct PaintScaleAroundCenter
     float tCenterX = centerX + c->instancer (varIdxBase, 2);
     float tCenterY = centerY + c->instancer (varIdxBase, 3);
 
-    bool p1 = c->funcs->push_translate (c->data, +tCenterX, +tCenterY);
-    bool p2 = c->funcs->push_scale (c->data, sx, sy);
-    bool p3 = c->funcs->push_translate (c->data, -tCenterX, -tCenterY);
+    c->funcs->push_scale_around_center (c->data, sx, sy, tCenterX, tCenterY);
     c->recurse (this+src);
-    if (p3) c->funcs->pop_transform (c->data);
-    if (p2) c->funcs->pop_transform (c->data);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 18 (noVar) or 19(Var) */
@@ -1228,9 +1227,9 @@ struct PaintScaleUniform
     TRACE_PAINT (this);
     float s = scale.to_float (c->instancer (varIdxBase, 0));
 
-    bool p1 = c->funcs->push_scale (c->data, s, s);
+    c->funcs->push_scale (c->data, s, s);
     c->recurse (this+src);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 20 (noVar) or 21(Var) */
@@ -1278,13 +1277,9 @@ struct PaintScaleUniformAroundCenter
     float tCenterX = centerX + c->instancer (varIdxBase, 1);
     float tCenterY = centerY + c->instancer (varIdxBase, 2);
 
-    bool p1 = c->funcs->push_translate (c->data, +tCenterX, +tCenterY);
-    bool p2 = c->funcs->push_scale (c->data, s, s);
-    bool p3 = c->funcs->push_translate (c->data, -tCenterX, -tCenterY);
+    c->funcs->push_scale_around_center (c->data, s, s, tCenterX, tCenterY);
     c->recurse (this+src);
-    if (p3) c->funcs->pop_transform (c->data);
-    if (p2) c->funcs->pop_transform (c->data);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 22 (noVar) or 23(Var) */
@@ -1328,9 +1323,9 @@ struct PaintRotate
     TRACE_PAINT (this);
     float a = angle.to_float (c->instancer (varIdxBase, 0));
 
-    bool p1 = c->funcs->push_rotate (c->data, a);
+    c->funcs->push_rotate (c->data, a);
     c->recurse (this+src);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 24 (noVar) or 25(Var) */
@@ -1378,13 +1373,9 @@ struct PaintRotateAroundCenter
     float tCenterX = centerX + c->instancer (varIdxBase, 1);
     float tCenterY = centerY + c->instancer (varIdxBase, 2);
 
-    bool p1 = c->funcs->push_translate (c->data, +tCenterX, +tCenterY);
-    bool p2 = c->funcs->push_rotate (c->data, a);
-    bool p3 = c->funcs->push_translate (c->data, -tCenterX, -tCenterY);
+    c->funcs->push_rotate_around_center (c->data, a, tCenterX, tCenterY);
     c->recurse (this+src);
-    if (p3) c->funcs->pop_transform (c->data);
-    if (p2) c->funcs->pop_transform (c->data);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 26 (noVar) or 27(Var) */
@@ -1432,9 +1423,9 @@ struct PaintSkew
     float sx = xSkewAngle.to_float(c->instancer (varIdxBase, 0));
     float sy = ySkewAngle.to_float(c->instancer (varIdxBase, 1));
 
-    bool p1 = c->funcs->push_skew (c->data, sx, sy);
+    c->funcs->push_skew (c->data, sx, sy);
     c->recurse (this+src);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 28(noVar) or 29 (Var) */
@@ -1485,13 +1476,9 @@ struct PaintSkewAroundCenter
     float tCenterX = centerX + c->instancer (varIdxBase, 2);
     float tCenterY = centerY + c->instancer (varIdxBase, 3);
 
-    bool p1 = c->funcs->push_translate (c->data, +tCenterX, +tCenterY);
-    bool p2 = c->funcs->push_skew (c->data, sx, sy);
-    bool p3 = c->funcs->push_translate (c->data, -tCenterX, -tCenterY);
+    c->funcs->push_skew_around_center (c->data, sx, sy, tCenterX, tCenterY);
     c->recurse (this+src);
-    if (p3) c->funcs->pop_transform (c->data);
-    if (p2) c->funcs->pop_transform (c->data);
-    if (p1) c->funcs->pop_transform (c->data);
+    c->funcs->pop_transform (c->data);
   }
 
   HBUINT8               format; /* format = 30(noVar) or 31 (Var) */
@@ -1626,7 +1613,7 @@ struct ClipBox
                const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return_trace (u.format1.subset (c, instancer, VarIdx::NO_VARIATION));
     case 2: return_trace (u.format2.subset (c, instancer));
     default:return_trace (c->default_return_value ());
@@ -1635,7 +1622,7 @@ struct ClipBox
 
   void closurev1 (hb_colrv1_closure_context_t* c) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 2: u.format2.closurev1 (c); return;
     default:return;
     }
@@ -1644,9 +1631,9 @@ struct ClipBox
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
@@ -1657,7 +1644,7 @@ struct ClipBox
                     const ItemVarStoreInstancer &instancer) const
   {
     ClipBoxData clip_box;
-    switch (u.format) {
+    switch (u.format.v) {
     case 1:
       u.format1.get_clip_box (clip_box, instancer);
       break;
@@ -1677,7 +1664,7 @@ struct ClipBox
 
   protected:
   union {
-  HBUINT8               format;         /* Format identifier */
+  struct { HBUINT8 v; } format;         /* Format identifier */
   ClipBoxFormat1        format1;
   ClipBoxFormat2        format2;
   } u;
@@ -1857,9 +1844,9 @@ struct Paint
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.paintformat1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.paintformat2, std::forward<Ts> (ds)...));
     case 3: return_trace (c->dispatch (u.paintformat3, std::forward<Ts> (ds)...));
@@ -1898,7 +1885,7 @@ struct Paint
 
   protected:
   union {
-  HBUINT8                                       format;
+  struct { HBUINT8 v; }                         format;
   PaintColrLayers                               paintformat1;
   NoVariable<PaintSolid>                        paintformat2;
   Variable<PaintSolid>                          paintformat3;
@@ -2073,7 +2060,7 @@ struct delta_set_index_map_subset_plan_t
     outer_bit_count = 1;
     inner_bit_count = 1;
 
-    if (unlikely (!output_map.resize (map_count, false))) return false;
+    if (unlikely (!output_map.resize_dirty (map_count))) return false;
 
     for (unsigned idx = 0; idx < map_count; idx++)
     {
@@ -2693,7 +2680,8 @@ struct COLR
   {
     ItemVarStoreInstancer instancer (get_var_store_ptr (),
                                      get_delta_set_index_map_ptr (),
-                                     hb_array (font->coords, font->num_coords));
+                                     hb_array (font->coords,
+                                               font->has_nonzero_coords ? font->num_coords : 0));
     hb_paint_context_t c (this, funcs, data, font, palette_index, foreground, instancer);
 
     hb_decycler_node_t node (c.glyphs_decycler);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh
index 51fc1b52af4..71417fdf3cf 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh
@@ -307,6 +307,7 @@ struct CPAL
       if (first_color_to_layer_index.has (first_color_record_idx)) continue;
 
       first_color_index_for_layer.push (first_color_record_idx);
+      if (unlikely (!c->serializer->propagate_error (first_color_index_for_layer))) return_trace (false);
       first_color_to_layer_index.set (first_color_record_idx,
                                       first_color_index_for_layer.length - 1);
     }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh
index 35d73c7b858..28678856373 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh
@@ -46,7 +46,7 @@ struct Coverage
 
   protected:
   union {
-  HBUINT16                      format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   CoverageFormat1_3<SmallTypes> format1;
   CoverageFormat2_4<SmallTypes> format2;
 #ifndef HB_NO_BEYOND_64K
@@ -55,7 +55,7 @@ struct Coverage
 #endif
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 
 #ifndef HB_OPTIMIZE_SIZE
   HB_ALWAYS_INLINE
@@ -63,9 +63,9 @@ struct Coverage
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
@@ -86,7 +86,7 @@ struct Coverage
   unsigned int get (hb_codepoint_t k) const { return get_coverage (k); }
   unsigned int get_coverage (hb_codepoint_t glyph_id) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return u.format1.get_coverage (glyph_id);
     case 2: return u.format2.get_coverage (glyph_id);
 #ifndef HB_NO_BEYOND_64K
@@ -97,18 +97,38 @@ struct Coverage
     }
   }
   unsigned int get_coverage (hb_codepoint_t glyph_id,
-                             hb_ot_lookup_cache_t *cache) const
+                             hb_ot_layout_mapping_cache_t *cache) const
   {
     unsigned coverage;
-    if (cache && cache->get (glyph_id, &coverage)) return coverage;
+    if (cache && cache->get (glyph_id, &coverage)) return coverage < cache->MAX_VALUE ? coverage : NOT_COVERED;
     coverage = get_coverage (glyph_id);
-    if (cache) cache->set (glyph_id, coverage);
+    if (cache) {
+      if (coverage == NOT_COVERED)
+        cache->set_unchecked (glyph_id, cache->MAX_VALUE);
+      else if (likely (coverage < cache->MAX_VALUE))
+        cache->set_unchecked (glyph_id, coverage);
+    }
+    return coverage;
+  }
+
+  unsigned int get_coverage_binary (hb_codepoint_t glyph_id,
+                                    hb_ot_layout_binary_cache_t *cache) const
+  {
+    unsigned coverage;
+    if (cache && cache->get (glyph_id, &coverage)) return coverage < cache->MAX_VALUE ? coverage : NOT_COVERED;
+    coverage = get_coverage (glyph_id);
+    if (cache) {
+      if (coverage == NOT_COVERED)
+        cache->set_unchecked (glyph_id, cache->MAX_VALUE);
+      else
+        cache->set_unchecked (glyph_id, 0);
+    }
     return coverage;
   }
 
   unsigned get_population () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return u.format1.get_population ();
     case 2: return u.format2.get_population ();
 #ifndef HB_NO_BEYOND_64K
@@ -140,11 +160,11 @@ struct Coverage
       last = g;
       if (g > max) max = g;
     }
-    u.format = !unsorted && count <= num_ranges * 3 ? 1 : 2;
+    u.format.v = !unsorted && count <= num_ranges * 3 ? 1 : 2;
 
 #ifndef HB_NO_BEYOND_64K
     if (max > 0xFFFFu)
-      u.format += 2;
+      u.format.v += 2;
     if (unlikely (max > 0xFFFFFFu))
 #else
     if (unlikely (max > 0xFFFFu))
@@ -154,7 +174,7 @@ struct Coverage
       return_trace (false);
     }
 
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return_trace (u.format1.serialize (c, glyphs));
     case 2: return_trace (u.format2.serialize (c, glyphs));
@@ -185,7 +205,7 @@ struct Coverage
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return u.format1.intersects (glyphs);
     case 2: return u.format2.intersects (glyphs);
@@ -198,7 +218,7 @@ struct Coverage
   }
   bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return u.format1.intersects_coverage (glyphs, index);
     case 2: return u.format2.intersects_coverage (glyphs, index);
@@ -212,7 +232,7 @@ struct Coverage
 
   unsigned cost () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.cost ();
     case 2: hb_barrier (); return u.format2.cost ();
 #ifndef HB_NO_BEYOND_64K
@@ -228,7 +248,7 @@ struct Coverage
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return u.format1.collect_coverage (glyphs);
     case 2: return u.format2.collect_coverage (glyphs);
@@ -244,7 +264,7 @@ struct Coverage
             hb_requires (hb_is_sink_of (IterableOut, hb_codepoint_t))>
   void intersect_set (const hb_set_t &glyphs, IterableOut&& intersect_glyphs) const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return u.format1.intersect_set (glyphs, intersect_glyphs);
     case 2: return u.format2.intersect_set (glyphs, intersect_glyphs);
@@ -262,7 +282,7 @@ struct Coverage
     iter_t (const Coverage &c_ = Null (Coverage))
     {
       hb_memset (this, 0, sizeof (*this));
-      format = c_.u.format;
+      format = c_.u.format.v;
       switch (format)
       {
       case 1: u.format1.init (c_.u.format1); return;
@@ -332,7 +352,7 @@ struct Coverage
     }
     iter_t __end__ () const
     {
-      iter_t it = {};
+      iter_t it;
       it.format = format;
       switch (format)
       {
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh
index 97ea51089ec..122326e3024 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh
@@ -41,11 +41,11 @@ struct CoverageFormat1_3
 {
   friend struct Coverage;
 
-  protected:
+  public:
   HBUINT16      coverageFormat; /* Format identifier--format = 1 */
   SortedArray16Of<typename Types::HBGlyphID>
                 glyphArray;     /* Array of GlyphIDs--in numerical order */
-  public:
+
   DEFINE_SIZE_ARRAY (4, glyphArray);
 
   private:
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh
index 0c9bd09cbf7..8287c8d4d4d 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh
@@ -40,7 +40,7 @@ struct CoverageFormat2_4
 {
   friend struct Coverage;
 
-  protected:
+  public:
   HBUINT16      coverageFormat; /* Format identifier--format = 2 */
   SortedArray16Of<RangeRecord<Types>>
                 rangeRecord;    /* Array of glyph ranges--ordered by
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh
index ceba37b0619..89e110990bc 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh
@@ -252,7 +252,7 @@ struct CaretValue
                                  hb_codepoint_t glyph_id,
                                  const ItemVariationStore &var_store) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return u.format1.get_caret_value (font, direction);
     case 2: return u.format2.get_caret_value (font, direction, glyph_id);
     case 3: return u.format3.get_caret_value (font, direction, var_store);
@@ -263,9 +263,9 @@ struct CaretValue
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -275,7 +275,7 @@ struct CaretValue
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1:
     case 2:
       return;
@@ -289,9 +289,9 @@ struct CaretValue
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
     case 3: return_trace (u.format3.sanitize (c));
@@ -301,13 +301,13 @@ struct CaretValue
 
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   CaretValueFormat1     format1;
   CaretValueFormat2     format2;
   CaretValueFormat3     format3;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 struct LigGlyph
@@ -519,7 +519,7 @@ struct MarkGlyphSets
 {
   bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return u.format1.covers (set_index, glyph_id);
     default:return false;
     }
@@ -528,7 +528,7 @@ struct MarkGlyphSets
   template <typename set_t>
   void collect_coverage (hb_vector_t<set_t> &sets) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: u.format1.collect_coverage (sets); return;
     default:return;
     }
@@ -537,7 +537,7 @@ struct MarkGlyphSets
   void collect_used_mark_sets (const hb_set_t& glyph_set,
                                hb_set_t& used_mark_sets /* OUT */) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return;
     default:return;
     }
@@ -546,7 +546,7 @@ struct MarkGlyphSets
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return_trace (u.format1.subset (c));
     default:return_trace (false);
     }
@@ -555,9 +555,9 @@ struct MarkGlyphSets
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return_trace (u.format1.sanitize (c));
     default:return_trace (true);
     }
@@ -565,11 +565,11 @@ struct MarkGlyphSets
 
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   MarkGlyphSetsFormat1  format1;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 
@@ -977,7 +977,7 @@ struct GDEF
       }
 
 #ifndef HB_NO_GDEF_CACHE
-      table->get_mark_glyph_sets ().collect_coverage (mark_glyph_set_digests);
+      table->get_mark_glyph_sets ().collect_coverage (mark_glyph_sets);
 #endif
     }
     ~accelerator_t () { table.destroy (); }
@@ -1002,18 +1002,34 @@ struct GDEF
 
     }
 
+    HB_ALWAYS_INLINE
     bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const
     {
       return
 #ifndef HB_NO_GDEF_CACHE
-             mark_glyph_set_digests[set_index].may_have (glyph_id) &&
+             // We can access arrayZ directly because of sanitize_lookup_props() guarantee.
+             mark_glyph_sets.arrayZ[set_index].may_have (glyph_id) &&
 #endif
-             table->mark_set_covers (set_index, glyph_id);
+             table->mark_set_covers (set_index, glyph_id)
+      ;
+    }
+
+    unsigned sanitize_lookup_props (unsigned lookup_props) const
+    {
+#ifndef HB_NO_GDEF_CACHE
+      if (lookup_props & LookupFlag::UseMarkFilteringSet &&
+          (lookup_props >> 16) >= mark_glyph_sets.length)
+      {
+        // Invalid mark filtering set index; unset the flag.
+        lookup_props &= ~LookupFlag::UseMarkFilteringSet;
+      }
+#endif
+      return lookup_props;
     }
 
     hb_blob_ptr_t<GDEF> table;
 #ifndef HB_NO_GDEF_CACHE
-    hb_vector_t<hb_set_digest_t> mark_glyph_set_digests;
+    hb_vector_t<hb_set_digest_t> mark_glyph_sets;
     mutable hb_cache_t<21, 3> glyph_props_cache;
     static_assert (sizeof (glyph_props_cache) == 512, "");
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh
index 7802e397f4c..1938803fa7c 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh
@@ -13,20 +13,20 @@ struct Anchor
 {
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; } format;        /* Format identifier */
   AnchorFormat1         format1;
   AnchorFormat2         format2;
   AnchorFormat3         format3;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
     case 3: return_trace (u.format3.sanitize (c));
@@ -38,7 +38,7 @@ struct Anchor
                    float *x, float *y) const
   {
     *x = *y = 0;
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: u.format1.get_anchor (c, glyph_id, x, y); return;
     case 2: u.format2.get_anchor (c, glyph_id, x, y); return;
     case 3: u.format3.get_anchor (c, glyph_id, x, y); return;
@@ -49,7 +49,7 @@ struct Anchor
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: return_trace (bool (reinterpret_cast<Anchor *> (u.format1.copy (c->serializer))));
     case 2:
       if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
@@ -66,7 +66,7 @@ struct Anchor
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: case 2:
       return;
     case 3:
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh
index 61bd90310a5..c49705bea0e 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh
@@ -37,12 +37,12 @@ struct AnchorFormat3
     *x = font->em_fscale_x (xCoordinate);
     *y = font->em_fscale_y (yCoordinate);
 
-    if ((font->x_ppem || font->num_coords) && xDeviceTable.sanitize (&c->sanitizer, this))
+    if ((font->x_ppem || font->has_nonzero_coords) && xDeviceTable.sanitize (&c->sanitizer, this))
     {
       hb_barrier ();
       *x += (this+xDeviceTable).get_x_delta (font, c->var_store, c->var_store_cache);
     }
-    if ((font->y_ppem || font->num_coords) && yDeviceTable.sanitize (&c->sanitizer, this))
+    if ((font->y_ppem || font->has_nonzero_coords) && yDeviceTable.sanitize (&c->sanitizer, this))
     {
       hb_barrier ();
       *y += (this+yDeviceTable).get_y_delta (font, c->var_store, c->var_store_cache);
@@ -91,10 +91,13 @@ struct AnchorFormat3
       }
     }
 
-    /* in case that all axes are pinned or no variations after instantiation,
-     * both var_idxes will be mapped to HB_OT_LAYOUT_NO_VARIATIONS_INDEX */
-    if (x_varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX &&
-        y_varidx == HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
+
+    bool no_downgrade = (!xDeviceTable.is_null () && !(this+xDeviceTable).is_variation_device ()) ||
+                        x_varidx != HB_OT_LAYOUT_NO_VARIATIONS_INDEX ||
+                        y_varidx != HB_OT_LAYOUT_NO_VARIATIONS_INDEX ||
+                        (!yDeviceTable.is_null () && !(this+yDeviceTable).is_variation_device ());
+
+    if (!no_downgrade)
       return_trace (c->serializer->check_assign (out->format, 1, HB_SERIALIZE_ERROR_INT_OVERFLOW));
 
     if (!c->serializer->embed (xDeviceTable)) return_trace (false);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh
index 9da9fff50ba..128ced6c176 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh
@@ -77,6 +77,13 @@ struct AnchorMatrix
 
     return_trace (true);
   }
+
+  bool offset_is_null (unsigned row, unsigned col, unsigned num_cols) const
+  {
+    if (unlikely (row >= rows || col >= num_cols)) return true;
+    auto &offset = matrixZ[row * num_cols + col];
+    return offset.is_null ();
+  }
 };
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh
index 0105a9b8542..38a29dd9ed5 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePos.hh
@@ -11,7 +11,7 @@ struct CursivePos
 {
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; } format;        /* Format identifier */
   CursivePosFormat1     format1;
   } u;
 
@@ -19,9 +19,9 @@ struct CursivePos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh
index 361aaed658a..f5a09e07d73 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh
@@ -50,8 +50,9 @@ struct EntryExitRecord
   DEFINE_SIZE_STATIC (4);
 };
 
-static void
-reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, unsigned int new_parent) {
+static inline void
+reverse_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction, unsigned int new_parent)
+{
   int chain = pos[i].attach_chain(), type = pos[i].attach_type();
   if (likely (!chain || 0 == (type & ATTACH_TYPE_CURSIVE)))
     return;
@@ -130,7 +131,7 @@ struct CursivePosFormat1
         unlikely (!this_record.entryAnchor.sanitize (&c->sanitizer, this))) return_trace (false);
     hb_barrier ();
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     unsigned unsafe_from;
     if (unlikely (!skippy_iter.prev (&unsafe_from)))
@@ -229,8 +230,13 @@ struct CursivePosFormat1
      */
     reverse_cursive_minor_offset (pos, child, c->direction, parent);
 
-    pos[child].attach_type() = ATTACH_TYPE_CURSIVE;
     pos[child].attach_chain() = (int) parent - (int) child;
+    if (pos[child].attach_chain() != (int) parent - (int) child)
+    {
+      pos[child].attach_chain() = 0;
+      goto overflow;
+    }
+    pos[child].attach_type() = ATTACH_TYPE_CURSIVE;
     buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT;
     if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction)))
       pos[child].y_offset = y_offset;
@@ -256,6 +262,7 @@ struct CursivePosFormat1
                           i, j);
     }
 
+  overflow:
     buffer->idx++;
     return_trace (true);
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh
index ce3f74d8c3b..b80f606f7b5 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/GPOS.hh
@@ -80,9 +80,8 @@ propagate_attachment_offsets (hb_glyph_position_t *pos,
 {
   /* Adjusts offsets of attached glyphs (both cursive and mark) to accumulate
    * offset of glyph they are attached to. */
-  int chain = pos[i].attach_chain(), type = pos[i].attach_type();
-  if (likely (!chain))
-    return;
+  int chain = pos[i].attach_chain();
+  int type = pos[i].attach_type();
 
   pos[i].attach_chain() = 0;
 
@@ -94,7 +93,8 @@ propagate_attachment_offsets (hb_glyph_position_t *pos,
   if (unlikely (!nesting_level))
     return;
 
-  propagate_attachment_offsets (pos, len, j, direction, nesting_level - 1);
+  if (pos[j].attach_chain())
+    propagate_attachment_offsets (pos, len, j, direction, nesting_level - 1);
 
   assert (!!(type & GPOS_impl::ATTACH_TYPE_MARK) ^ !!(type & GPOS_impl::ATTACH_TYPE_CURSIVE));
 
@@ -110,17 +110,37 @@ propagate_attachment_offsets (hb_glyph_position_t *pos,
     pos[i].x_offset += pos[j].x_offset;
     pos[i].y_offset += pos[j].y_offset;
 
-    assert (j < i);
-    if (HB_DIRECTION_IS_FORWARD (direction))
-      for (unsigned int k = j; k < i; k++) {
-        pos[i].x_offset -= pos[k].x_advance;
-        pos[i].y_offset -= pos[k].y_advance;
-      }
-    else
-      for (unsigned int k = j + 1; k < i + 1; k++) {
-        pos[i].x_offset += pos[k].x_advance;
-        pos[i].y_offset += pos[k].y_advance;
-      }
+    // i is the position of the mark; j is the base.
+    if (j < i)
+    {
+      /* This is the common case: mark follows base.
+       * And currently the only way in OpenType. */
+      if (HB_DIRECTION_IS_FORWARD (direction))
+        for (unsigned int k = j; k < i; k++) {
+          pos[i].x_offset -= pos[k].x_advance;
+          pos[i].y_offset -= pos[k].y_advance;
+        }
+      else
+        for (unsigned int k = j + 1; k < i + 1; k++) {
+          pos[i].x_offset += pos[k].x_advance;
+          pos[i].y_offset += pos[k].y_advance;
+        }
+    }
+    else // j > i
+    {
+      /* This can happen with `kerx`: a mark attaching
+       * to a base after it in the logical order. */
+      if (HB_DIRECTION_IS_FORWARD (direction))
+        for (unsigned int k = i; k < j; k++) {
+          pos[i].x_offset += pos[k].x_advance;
+          pos[i].y_offset += pos[k].y_advance;
+        }
+      else
+        for (unsigned int k = i + 1; k < j + 1; k++) {
+          pos[i].x_offset -= pos[k].x_advance;
+          pos[i].y_offset -= pos[k].y_advance;
+        }
+    }
   }
 }
 
@@ -149,8 +169,20 @@ GPOS::position_finish_offsets (hb_font_t *font, hb_buffer_t *buffer)
 
   /* Handle attachments */
   if (buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT)
-    for (unsigned i = 0; i < len; i++)
-      propagate_attachment_offsets (pos, len, i, direction);
+  {
+    auto *pos = buffer->pos;
+    // https://github.com/harfbuzz/harfbuzz/issues/5514
+    if (HB_DIRECTION_IS_FORWARD (direction))
+    {
+      for (unsigned i = 0; i < len; i++)
+        if (pos[i].attach_chain())
+          propagate_attachment_offsets (pos, len, i, direction);
+    } else {
+      for (unsigned i = len; i-- > 0; )
+        if (pos[i].attach_chain())
+          propagate_attachment_offsets (pos, len, i, direction);
+    }
+  }
 
   if (unlikely (font->slant_xy) &&
       HB_DIRECTION_IS_HORIZONTAL (direction))
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh
index eecdb95a95f..113b693dc3e 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/LigatureArray.hh
@@ -19,22 +19,30 @@ struct LigatureArray : List16OfOffset16To<LigatureAttach>
   bool subset (hb_subset_context_t *c,
                Iterator             coverage,
                unsigned             class_count,
-               const hb_map_t      *klass_mapping) const
+               const hb_map_t      *klass_mapping,
+               hb_sorted_vector_t<hb_codepoint_t> &new_coverage /* OUT */) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
+    const hb_map_t &glyph_map = c->plan->glyph_map_gsub;
 
     auto *out = c->serializer->start_embed (this);
     if (unlikely (!c->serializer->extend_min (out)))  return_trace (false);
 
     bool ret = false;
     for (const auto _ : + hb_zip (coverage, *this)
-                  | hb_filter (glyphset, hb_first))
+                        | hb_filter (glyph_map, hb_first))
     {
+      const LigatureAttach& src = (this + _.second);
+      bool non_empty = + hb_range (src.rows * class_count)
+                       | hb_filter ([=] (unsigned index) { return klass_mapping->has (index % class_count); })
+                       | hb_map ([&] (const unsigned index) { return !src.offset_is_null (index / class_count, index % class_count, class_count); })
+                       | hb_any;
+
+      if (!non_empty) continue;
+
       auto *matrix = out->serialize_append (c->serializer);
       if (unlikely (!matrix)) return_trace (false);
 
-      const LigatureAttach& src = (this + _.second);
       auto indexes =
           + hb_range (src.rows * class_count)
           | hb_filter ([=] (unsigned index) { return klass_mapping->has (index % class_count); })
@@ -44,6 +52,9 @@ struct LigatureArray : List16OfOffset16To<LigatureAttach>
                                        this,
                                        src.rows,
                                        indexes);
+
+      hb_codepoint_t new_gid = glyph_map.get (_.first);
+      new_coverage.push (new_gid);
     }
     return_trace (ret);
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh
index abae8f1c607..bddc5e7fe9e 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkArray.hh
@@ -47,10 +47,15 @@ struct MarkArray : Array16Of<MarkRecord>        /* Array of MarkRecords--in Cove
     }
 
     hb_glyph_position_t &o = buffer->cur_pos();
+    o.attach_chain() = (int) glyph_pos - (int) buffer->idx;
+    if (o.attach_chain() != (int) glyph_pos - (int) buffer->idx)
+    {
+      o.attach_chain() = 0;
+      goto overflow;
+    }
+    o.attach_type() = ATTACH_TYPE_MARK;
     o.x_offset = roundf (base_x - mark_x);
     o.y_offset = roundf (base_y - mark_y);
-    o.attach_type() = ATTACH_TYPE_MARK;
-    o.attach_chain() = (int) glyph_pos - (int) buffer->idx;
     buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT;
 
     if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
@@ -60,6 +65,7 @@ struct MarkArray : Array16Of<MarkRecord>        /* Array of MarkRecords--in Cove
                           c->buffer->idx, glyph_pos);
     }
 
+  overflow:
     buffer->idx++;
     return_trace (true);
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh
index b1d1118a86b..65f343bda8b 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePos.hh
@@ -11,7 +11,7 @@ struct MarkBasePos
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   MarkBasePosFormat1_2<SmallTypes>      format1;
 #ifndef HB_NO_BEYOND_64K
   MarkBasePosFormat1_2<MediumTypes>     format2;
@@ -22,9 +22,9 @@ struct MarkBasePos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh
index e633f7a1be1..ad071f327ea 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkBasePosFormat1.hh
@@ -119,7 +119,7 @@ struct MarkBasePosFormat1_2
     /* Now we search backwards for a non-mark glyph.
      * We don't use skippy_iter.prev() to avoid O(n^2) behavior. */
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
 
     if (c->last_base_until > buffer->idx)
@@ -209,19 +209,22 @@ struct MarkBasePosFormat1_2
     ;
 
     new_coverage.reset ();
-    + base_iter
-    | hb_map (hb_first)
-    | hb_map (glyph_map)
-    | hb_sink (new_coverage)
-    ;
-
-    if (!out->baseCoverage.serialize_serialize (c->serializer, new_coverage.iter ()))
-      return_trace (false);
-
     hb_sorted_vector_t<unsigned> base_indexes;
-    for (const unsigned row : + base_iter
-                              | hb_map (hb_second))
+    auto &base_array = (this+baseArray);
+    for (const auto _ : + base_iter)
     {
+      unsigned row = _.second;
+      bool non_empty = + hb_range ((unsigned) classCount)
+                       | hb_filter (klass_mapping)
+                       | hb_map ([&] (const unsigned col) { return !base_array.offset_is_null (row, col, (unsigned) classCount); })
+                       | hb_any
+                       ;
+
+      if (!non_empty) continue;
+
+      hb_codepoint_t new_g = glyph_map.get ( _.first);
+      new_coverage.push (new_g);
+
       + hb_range ((unsigned) classCount)
       | hb_filter (klass_mapping)
       | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; })
@@ -229,8 +232,12 @@ struct MarkBasePosFormat1_2
       ;
     }
 
+    if (!new_coverage) return_trace (false);
+    if (!out->baseCoverage.serialize_serialize (c->serializer, new_coverage.iter ()))
+      return_trace (false);
+
     return_trace (out->baseArray.serialize_subset (c, baseArray, this,
-                                                   base_iter.len (),
+                                                   new_coverage.length,
                                                    base_indexes.iter ()));
   }
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh
index b10102880c0..ee237eb479f 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPos.hh
@@ -11,7 +11,7 @@ struct MarkLigPos
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   MarkLigPosFormat1_2<SmallTypes>       format1;
 #ifndef HB_NO_BEYOND_64K
   MarkLigPosFormat1_2<MediumTypes>      format2;
@@ -22,9 +22,9 @@ struct MarkLigPos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh
index cf4cbae9a3f..509a26c2485 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkLigPosFormat1.hh
@@ -101,7 +101,7 @@ struct MarkLigPosFormat1_2
 
     /* Now we search backwards for a non-mark glyph */
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks);
 
     if (c->last_base_until > buffer->idx)
@@ -200,19 +200,13 @@ struct MarkLigPosFormat1_2
                                                     &klass_mapping)))
       return_trace (false);
 
-    auto new_ligature_coverage =
-    + hb_iter (this + ligatureCoverage)
-    | hb_take ((this + ligatureArray).len)
-    | hb_map_retains_sorting (glyph_map)
-    | hb_filter ([] (hb_codepoint_t glyph) { return glyph != HB_MAP_VALUE_INVALID; })
-    ;
-
-    if (!out->ligatureCoverage.serialize_serialize (c->serializer, new_ligature_coverage))
+    hb_sorted_vector_t<hb_codepoint_t> new_lig_coverage;
+    if (!out->ligatureArray.serialize_subset (c, ligatureArray, this,
+                                              hb_iter (this+ligatureCoverage),
+                                              classCount, &klass_mapping, new_lig_coverage))
       return_trace (false);
 
-    return_trace (out->ligatureArray.serialize_subset (c, ligatureArray, this,
-                                                       hb_iter (this+ligatureCoverage),
-                                                       classCount, &klass_mapping));
+    return_trace (out->ligatureCoverage.serialize_serialize (c->serializer, new_lig_coverage.iter ()));
   }
 
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh
index e0d9eca0280..c06f013cdce 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPos.hh
@@ -11,7 +11,7 @@ struct MarkMarkPos
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   MarkMarkPosFormat1_2<SmallTypes>      format1;
 #ifndef HB_NO_BEYOND_64K
   MarkMarkPosFormat1_2<MediumTypes>     format2;
@@ -22,9 +22,9 @@ struct MarkMarkPos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh
index 6519e79b443..c93dbbb3f06 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh
@@ -100,7 +100,7 @@ struct MarkMarkPosFormat1_2
     if (likely (mark1_index == NOT_COVERED)) return_trace (false);
 
     /* now we search backwards for a suitable mark glyph until a non-mark glyph */
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     skippy_iter.set_lookup_props (c->lookup_props & ~(uint32_t)LookupFlag::IgnoreFlags);
     unsigned unsafe_from;
@@ -196,19 +196,23 @@ struct MarkMarkPosFormat1_2
     ;
 
     new_coverage.reset ();
-    + mark2_iter
-    | hb_map (hb_first)
-    | hb_map (glyph_map)
-    | hb_sink (new_coverage)
-    ;
-
-    if (!out->mark2Coverage.serialize_serialize (c->serializer, new_coverage.iter ()))
-      return_trace (false);
-
     hb_sorted_vector_t<unsigned> mark2_indexes;
-    for (const unsigned row : + mark2_iter
-                              | hb_map (hb_second))
+    auto &mark2_array = (this+mark2Array);
+    for (const auto _ : + mark2_iter)
     {
+      unsigned row = _.second;
+
+      bool non_empty = + hb_range ((unsigned) classCount)
+                       | hb_filter (klass_mapping)
+                       | hb_map ([&] (const unsigned col) { return !mark2_array.offset_is_null (row, col, (unsigned) classCount); })
+                       | hb_any
+                       ;
+
+      if (!non_empty) continue;
+
+      hb_codepoint_t new_g = glyph_map.get ( _.first);
+      new_coverage.push (new_g);
+
       + hb_range ((unsigned) classCount)
       | hb_filter (klass_mapping)
       | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; })
@@ -216,6 +220,10 @@ struct MarkMarkPosFormat1_2
       ;
     }
 
+    if (!new_coverage) return_trace (false);
+    if (!out->mark2Coverage.serialize_serialize (c->serializer, new_coverage.iter ()))
+      return_trace (false);
+
     return_trace (out->mark2Array.serialize_subset (c, mark2Array, this,
                                                     mark2_iter.len (),
                                                     mark2_indexes.iter ()));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh
index e3794ea9ed5..bf7fff7face 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPos.hh
@@ -12,7 +12,7 @@ struct PairPos
 {
   protected:
   union {
-  HBUINT16                      format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   PairPosFormat1_3<SmallTypes>  format1;
   PairPosFormat2_4<SmallTypes>  format2;
 #ifndef HB_NO_BEYOND_64K
@@ -25,9 +25,9 @@ struct PairPos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh
index 2748882f527..1c067bde86f 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh
@@ -103,52 +103,35 @@ struct PairPosFormat1_3
 
   const Coverage &get_coverage () const { return this+coverage; }
 
-  unsigned cache_cost () const
+  struct external_cache_t
   {
-    return (this+coverage).cost ();
-  }
-  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+    hb_ot_layout_mapping_cache_t coverage;
+  };
+  void *external_cache_create () const
   {
-    switch (op)
+    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
+    if (likely (cache))
     {
-      case hb_ot_lookup_cache_op_t::CREATE:
-      {
-        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t));
-        if (likely (cache))
-          cache->clear ();
-        return cache;
-      }
-      case hb_ot_lookup_cache_op_t::ENTER:
-        return (void *) true;
-      case hb_ot_lookup_cache_op_t::LEAVE:
-        return nullptr;
-      case hb_ot_lookup_cache_op_t::DESTROY:
-      {
-        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p;
-        hb_free (cache);
-        return nullptr;
-      }
+      cache->coverage.clear ();
     }
-    return nullptr;
+    return cache;
   }
 
-  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
-  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached) const
+  bool apply (hb_ot_apply_context_t *c, void *external_cache) const
   {
     TRACE_APPLY (this);
 
     hb_buffer_t *buffer = c->buffer;
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr;
-    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache);
+    external_cache_t *cache = (external_cache_t *) external_cache;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
 #else
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
 #endif
     if (index == NOT_COVERED) return_trace (false);
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     unsigned unsafe_to;
     if (unlikely (!skippy_iter.next (&unsafe_to)))
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh
index d85b1ac2c17..ce731450f41 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh
@@ -123,63 +123,39 @@ struct PairPosFormat2_4 : ValueBase
 
   const Coverage &get_coverage () const { return this+coverage; }
 
-  struct pair_pos_cache_t
+  struct external_cache_t
   {
-    hb_ot_lookup_cache_t coverage;
-    hb_ot_lookup_cache_t first;
-    hb_ot_lookup_cache_t second;
+    hb_ot_layout_mapping_cache_t coverage;
+    hb_ot_layout_mapping_cache_t first;
+    hb_ot_layout_mapping_cache_t second;
   };
-
-  unsigned cache_cost () const
+  void *external_cache_create () const
   {
-    return (this+coverage).cost () + (this+classDef1).cost () + (this+classDef2).cost ();
-  }
-  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
-  {
-    switch (op)
+    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
+    if (likely (cache))
     {
-      case hb_ot_lookup_cache_op_t::CREATE:
-      {
-        pair_pos_cache_t *cache = (pair_pos_cache_t *) hb_malloc (sizeof (pair_pos_cache_t));
-        if (likely (cache))
-        {
-          cache->coverage.clear ();
-          cache->first.clear ();
-          cache->second.clear ();
-        }
-        return cache;
-      }
-      case hb_ot_lookup_cache_op_t::ENTER:
-        return (void *) true;
-      case hb_ot_lookup_cache_op_t::LEAVE:
-        return nullptr;
-      case hb_ot_lookup_cache_op_t::DESTROY:
-        {
-          pair_pos_cache_t *cache = (pair_pos_cache_t *) p;
-          hb_free (cache);
-          return nullptr;
-        }
+      cache->coverage.clear ();
+      cache->first.clear ();
+      cache->second.clear ();
     }
-    return nullptr;
+    return cache;
   }
 
-  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
-  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached) const
+  bool apply (hb_ot_apply_context_t *c, void *external_cache) const
   {
     TRACE_APPLY (this);
 
     hb_buffer_t *buffer = c->buffer;
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    pair_pos_cache_t *cache = cached ? (pair_pos_cache_t *) c->lookup_accel->cache : nullptr;
+    external_cache_t *cache = (external_cache_t *) external_cache;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
 #else
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
 #endif
     if (index == NOT_COVERED) return_trace (false);
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
     unsigned unsafe_to;
     if (unlikely (!skippy_iter.next (&unsafe_to)))
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh
index a0243a218c5..30fc1aacda8 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh
@@ -12,7 +12,7 @@ struct SinglePos
 {
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; } format;        /* Format identifier */
   SinglePosFormat1      format1;
   SinglePosFormat2      format2;
   } u;
@@ -41,7 +41,7 @@ struct SinglePos
                   const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map,
                   unsigned newFormat)
   {
-    if (unlikely (!c->extend_min (u.format))) return;
+    if (unlikely (!c->extend_min (u.format.v))) return;
     unsigned format = 2;
     ValueFormat new_format;
     new_format = newFormat;
@@ -49,8 +49,8 @@ struct SinglePos
     if (glyph_val_iter_pairs)
       format = get_format (glyph_val_iter_pairs);
 
-    u.format = format;
-    switch (u.format) {
+    u.format.v = format;
+    switch (u.format.v) {
     case 1: u.format1.serialize (c,
                                  src,
                                  glyph_val_iter_pairs,
@@ -70,9 +70,9 @@ struct SinglePos
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh
index 731d1ffca1a..b961a5139d8 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh
@@ -56,9 +56,14 @@ struct ValueFormat : HBUINT16
                                          * PosTable (may be NULL) */
 #endif
 
-  IntType& operator = (uint16_t i) { v = i; return *this; }
+  NumType& operator = (uint16_t i) { v = i; return *this; }
 
-  unsigned int get_len () const  { return hb_popcount ((unsigned int) *this); }
+  // Note: spec says skip 2 bytes per bit in the valueformat. But reports
+  // from Microsoft developers indicate that only the fields that are
+  // currently defined are counted. We don't expect any new fields to
+  // be added to ValueFormat. As such, we use the faster hb_popcount8
+  // that only processes the lowest 8 bits.
+  unsigned int get_len () const  { return hb_popcount8 ((uint8_t) *this); }
   unsigned int get_size () const { return get_len () * Value::static_size; }
 
   hb_vector_t<unsigned> get_device_table_indices () const {
@@ -111,8 +116,8 @@ struct ValueFormat : HBUINT16
 
     if (!has_device ()) return ret;
 
-    bool use_x_device = font->x_ppem || font->num_coords;
-    bool use_y_device = font->y_ppem || font->num_coords;
+    bool use_x_device = font->x_ppem || font->has_nonzero_coords;
+    bool use_y_device = font->y_ppem || font->has_nonzero_coords;
 
     if (!use_x_device && !use_y_device) return ret;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh
index b5d506f36f9..f13c5e7e251 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSet.hh
@@ -91,6 +91,19 @@ struct AlternateSet
     return alternates.len;
   }
 
+  void
+  collect_alternates (hb_codepoint_t gid,
+                      hb_map_t  *alternate_count /* IN/OUT */,
+                      hb_map_t  *alternate_glyphs /* IN/OUT */) const
+  {
+    + hb_enumerate (alternates)
+    | hb_map ([gid] (hb_pair_t<unsigned, hb_codepoint_t> _) { return hb_pair (gid + (_.first << 24), _.second); })
+    | hb_apply ([&] (const hb_pair_t<hb_codepoint_t, hb_codepoint_t> &p) -> void
+                { _hb_collect_glyph_alternates_add (p.first, p.second,
+                                                    alternate_count, alternate_glyphs); })
+    ;
+  }
+
   template <typename Iterator,
             hb_requires (hb_is_source_of (Iterator, hb_codepoint_t))>
   bool serialize (hb_serialize_context_t *c,
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh
index 8951f5a7a17..a43c75c8f4e 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubst.hh
@@ -12,7 +12,7 @@ struct AlternateSubst
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   AlternateSubstFormat1_2<SmallTypes>   format1;
 #ifndef HB_NO_BEYOND_64K
   AlternateSubstFormat1_2<MediumTypes>  format2;
@@ -23,9 +23,9 @@ struct AlternateSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
@@ -42,10 +42,10 @@ struct AlternateSubst
                   hb_array_t<const HBGlyphID16> alternate_glyphs_list)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
     unsigned int format = 1;
-    u.format = format;
-    switch (u.format) {
+    u.format.v = format;
+    switch (u.format.v) {
     case 1: return_trace (u.format1.serialize (c, glyphs, alternate_len_list, alternate_glyphs_list));
     default:return_trace (false);
     }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh
index 421a6e06627..7a3a2511b7f 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh
@@ -69,6 +69,19 @@ struct AlternateSubstFormat1_2
   { return (this+alternateSet[(this+coverage).get_coverage (gid)])
            .get_alternates (start_offset, alternate_count, alternate_glyphs); }
 
+  void
+  collect_glyph_alternates (hb_map_t  *alternate_count /* IN/OUT */,
+                            hb_map_t  *alternate_glyphs /* IN/OUT */) const
+  {
+    + hb_iter (alternateSet)
+    | hb_map (hb_add (this))
+    | hb_zip (this+coverage)
+    | hb_apply ([&] (const hb_pair_t<const AlternateSet<Types> &, hb_codepoint_t> _) {
+                  _.first.collect_alternates (_.second, alternate_count, alternate_glyphs);
+                })
+    ;
+  }
+
   bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh
index 726da458fac..7bc98d31f32 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh
@@ -44,6 +44,18 @@ struct Ligature
     c->output->add (ligGlyph);
   }
 
+  template <typename set_t>
+  void collect_second (set_t &s) const
+  {
+    if (unlikely (!component.get_length ()))
+    {
+      // A ligature without any components. Anything matches.
+      s = set_t::full ();
+      return;
+    }
+    s.add (component.arrayZ[0]);
+  }
+
   bool would_apply (hb_would_apply_context_t *c) const
   {
     if (c->len != component.lenP1)
@@ -91,15 +103,6 @@ struct Ligature
     unsigned int total_component_count = 0;
 
     if (unlikely (count > HB_MAX_CONTEXT_LENGTH)) return false;
-    unsigned match_positions_stack[4];
-    unsigned *match_positions = match_positions_stack;
-    if (unlikely (count > ARRAY_LENGTH (match_positions_stack)))
-    {
-      match_positions = (unsigned *) hb_malloc (hb_max (count, 1u) * sizeof (unsigned));
-      if (unlikely (!match_positions))
-        return_trace (false);
-    }
-
     unsigned int match_end = 0;
 
     if (likely (!match_input (c, count,
@@ -107,12 +110,9 @@ struct Ligature
                               match_glyph,
                               nullptr,
                               &match_end,
-                              match_positions,
                               &total_component_count)))
     {
       c->buffer->unsafe_to_concat (c->buffer->idx, match_end);
-      if (match_positions != match_positions_stack)
-        hb_free (match_positions);
       return_trace (false);
     }
 
@@ -129,10 +129,10 @@ struct Ligature
       match_end += delta;
       for (unsigned i = 0; i < count; i++)
       {
-        match_positions[i] += delta;
+        c->match_positions[i] += delta;
         if (i)
           *p++ = ',';
-        snprintf (p, sizeof(buf) - (p - buf), "%u", match_positions[i]);
+        snprintf (p, sizeof(buf) - (p - buf), "%u", c->match_positions[i]);
         p += strlen(p);
       }
 
@@ -143,7 +143,6 @@ struct Ligature
 
     ligate_input (c,
                   count,
-                  match_positions,
                   match_end,
                   ligGlyph,
                   total_component_count);
@@ -156,8 +155,6 @@ struct Ligature
                           pos);
     }
 
-    if (match_positions != match_positions_stack)
-      hb_free (match_positions);
     return_trace (true);
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh
index ff0ffce94d7..81c5c2bcfe4 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSet.hh
@@ -11,11 +11,11 @@ namespace GSUB_impl {
 template <typename Types>
 struct LigatureSet
 {
-  protected:
+  public:
   Array16OfOffset16To<Ligature<Types>>
                 ligature;               /* Array LigatureSet tables
                                          * ordered by preference */
-  public:
+
   DEFINE_SIZE_ARRAY (2, ligature);
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -62,6 +62,15 @@ struct LigatureSet
     ;
   }
 
+  template <typename set_t>
+  void collect_seconds (set_t &s) const
+  {
+    + hb_iter (ligature)
+    | hb_map (hb_add (this))
+    | hb_apply ([&s] (const Ligature<Types> &_) { _.collect_second (s); })
+    ;
+  }
+
   bool would_apply (hb_would_apply_context_t *c) const
   {
     return
@@ -72,14 +81,14 @@ struct LigatureSet
     ;
   }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  bool apply (hb_ot_apply_context_t *c, const hb_set_digest_t *seconds = nullptr) const
   {
     TRACE_APPLY (this);
 
     unsigned int num_ligs = ligature.len;
 
 #ifndef HB_NO_OT_RULESETS_FAST_PATH
-    if (HB_OPTIMIZE_SIZE_VAL || num_ligs <= 4)
+    if (HB_OPTIMIZE_SIZE_VAL || num_ligs <= 1)
 #endif
     {
     slow:
@@ -91,21 +100,21 @@ struct LigatureSet
       return_trace (false);
     }
 
-    /* This version is optimized for speed by matching the first component
+    /* This version is optimized for speed by matching the second component
      * of the ligature here, instead of calling into the ligation code.
      *
      * This is replicated in ChainRuleSet and RuleSet. */
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_context;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
     skippy_iter.set_glyph_data ((HBUINT16 *) nullptr);
     unsigned unsafe_to;
-    hb_codepoint_t first = (unsigned) -1;
+    hb_codepoint_t second = (unsigned) -1;
     bool matched = skippy_iter.next (&unsafe_to);
     if (likely (matched))
     {
-      first = c->buffer->info[skippy_iter.idx].codepoint;
+      second = c->buffer->info[skippy_iter.idx].codepoint;
       unsafe_to = skippy_iter.idx + 1;
 
       if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
@@ -118,13 +127,14 @@ struct LigatureSet
     else
       goto slow;
 
+    if (seconds && !seconds->may_have (second))
+      return_trace (false);
     bool unsafe_to_concat = false;
-
     for (unsigned int i = 0; i < num_ligs; i++)
     {
       const auto &lig = this+ligature.arrayZ[i];
       if (unlikely (lig.component.lenP1 <= 1) ||
-          lig.component.arrayZ[0] == first)
+          lig.component.arrayZ[0] == second)
       {
         if (lig.apply (c))
         {
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh
index cffa910295f..22ce9b79d7f 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubst.hh
@@ -12,7 +12,7 @@ struct LigatureSubst
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   LigatureSubstFormat1_2<SmallTypes>    format1;
 #ifndef HB_NO_BEYOND_64K
   LigatureSubstFormat1_2<MediumTypes>   format2;
@@ -23,9 +23,9 @@ struct LigatureSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
@@ -45,10 +45,10 @@ struct LigatureSubst
                   hb_array_t<const HBGlyphID16> component_list /* Starting from second for each ligature */)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
     unsigned int format = 1;
-    u.format = format;
-    switch (u.format) {
+    u.format.v = format;
+    switch (u.format.v) {
     case 1: return_trace (u.format1.serialize (c,
                                                first_glyphs,
                                                ligature_per_first_glyph_count_list,
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh
index 6ae24b33754..909ddca220f 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh
@@ -78,52 +78,44 @@ struct LigatureSubstFormat1_2
     return lig_set.would_apply (c);
   }
 
-  unsigned cache_cost () const
+  struct external_cache_t
   {
-    return (this+coverage).cost ();
-  }
-  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+    hb_ot_layout_mapping_cache_t coverage;
+    hb_set_digest_t seconds;
+  };
+  void *external_cache_create () const
   {
-    switch (op)
+    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
+    if (likely (cache))
     {
-      case hb_ot_lookup_cache_op_t::CREATE:
-      {
-        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t));
-        if (likely (cache))
-          cache->clear ();
-        return cache;
-      }
-      case hb_ot_lookup_cache_op_t::ENTER:
-        return (void *) true;
-      case hb_ot_lookup_cache_op_t::LEAVE:
-        return nullptr;
-      case hb_ot_lookup_cache_op_t::DESTROY:
-      {
-        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p;
-        hb_free (cache);
-        return nullptr;
-      }
+      cache->coverage.clear ();
+
+      cache->seconds.init ();
+      + hb_iter (ligatureSet)
+      | hb_map (hb_add (this))
+      | hb_apply ([cache] (const LigatureSet<Types> &_) { _.collect_seconds (cache->seconds); })
+      ;
     }
-    return nullptr;
+    return cache;
   }
 
-  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
-  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached) const
+  bool apply (hb_ot_apply_context_t *c, void *external_cache) const
   {
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr;
-    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache);
+    external_cache_t *cache = (external_cache_t *) external_cache;
+    const hb_set_digest_t *seconds = cache ? &cache->seconds : nullptr;
+    unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
 #else
-    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
+    const hb_set_digest_t *seconds = nullptr;
+    unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint);
 #endif
     if (index == NOT_COVERED) return_trace (false);
 
     const auto &lig_set = this+ligatureSet[index];
-    return_trace (lig_set.apply (c));
+    return_trace (lig_set.apply (c, seconds));
   }
 
   bool serialize (hb_serialize_context_t *c,
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh
index cf3d754e3cc..8fb663825b5 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubst.hh
@@ -12,7 +12,7 @@ struct MultipleSubst
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   MultipleSubstFormat1_2<SmallTypes>    format1;
 #ifndef HB_NO_BEYOND_64K
   MultipleSubstFormat1_2<MediumTypes>   format2;
@@ -24,9 +24,9 @@ struct MultipleSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
@@ -41,10 +41,10 @@ struct MultipleSubst
                   Iterator it)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
     unsigned int format = 1;
-    u.format = format;
-    switch (u.format) {
+    u.format.v = format;
+    switch (u.format.v) {
     case 1: return_trace (u.format1.serialize (c, it));
     default:return_trace (false);
     }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh
index 5ad463fea79..e33148d770b 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubst.hh
@@ -12,7 +12,7 @@ struct ReverseChainSingleSubst
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   ReverseChainSingleSubstFormat1        format1;
   } u;
 
@@ -20,9 +20,9 @@ struct ReverseChainSingleSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh
index a5e93a98bef..b3295bee16d 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Sequence.hh
@@ -115,7 +115,7 @@ struct Sequence
 
       for (unsigned i = c->buffer->idx - count; i < c->buffer->idx; i++)
       {
-        if (buf < p)
+        if (buf < p && sizeof(buf) - 1u > unsigned (p - buf))
           *p++ = ',';
         snprintf (p, sizeof(buf) - (p - buf), "%u", i);
         p += strlen(p);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh
index b84259e7f00..323eb4d0f90 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubst.hh
@@ -13,7 +13,7 @@ struct SingleSubst
 {
   protected:
   union {
-  HBUINT16                              format;         /* Format identifier */
+  struct { HBUINT16 v; }                format;         /* Format identifier */
   SingleSubstFormat1_3<SmallTypes>      format1;
   SingleSubstFormat2_4<SmallTypes>      format2;
 #ifndef HB_NO_BEYOND_64K
@@ -27,9 +27,9 @@ struct SingleSubst
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
@@ -47,7 +47,7 @@ struct SingleSubst
                   Iterator glyphs)
   {
     TRACE_SERIALIZE (this);
-    if (unlikely (!c->extend_min (u.format))) return_trace (false);
+    if (unlikely (!c->extend_min (u.format.v))) return_trace (false);
     unsigned format = 2;
     unsigned delta = 0;
     if (glyphs)
@@ -71,8 +71,8 @@ struct SingleSubst
       if (!hb_all (++(+glyphs), delta, get_delta)) format += 1;
     }
 
-    u.format = format;
-    switch (u.format) {
+    u.format.v = format;
+    switch (u.format.v) {
     case 1: return_trace (u.format1.serialize (c,
                                                + glyphs
                                                | hb_map_retains_sorting (hb_first),
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh
index be6cd820d28..5ee2c1d1f46 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh
@@ -123,6 +123,21 @@ struct SingleSubstFormat1_3
     return 1;
   }
 
+  void
+  collect_glyph_alternates (hb_map_t  *alternate_count /* IN/OUT */,
+                            hb_map_t  *alternate_glyphs /* IN/OUT */) const
+  {
+    hb_codepoint_t d = deltaGlyphID;
+    hb_codepoint_t mask = get_mask ();
+
+    + hb_iter (this+coverage)
+    | hb_map ([d, mask] (hb_codepoint_t g) { return hb_pair (g, (g + d) & mask); })
+    | hb_apply ([&] (const hb_pair_t<hb_codepoint_t, hb_codepoint_t> &p) -> void
+                { _hb_collect_glyph_alternates_add (p.first, p.second,
+                                                    alternate_count, alternate_glyphs); })
+    ;
+  }
+
   bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh
index e9096460451..0d51d130fee 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh
@@ -100,6 +100,17 @@ struct SingleSubstFormat2_4
     return 1;
   }
 
+  void
+  collect_glyph_alternates (hb_map_t  *alternate_count /* IN/OUT */,
+                            hb_map_t  *alternate_glyphs /* IN/OUT */) const
+  {
+    + hb_zip (this+coverage, substitute)
+    | hb_apply ([&] (const hb_pair_t<hb_codepoint_t, hb_codepoint_t> &p) -> void
+                { _hb_collect_glyph_alternates_add (p.first, p.second,
+                                                    alternate_count, alternate_glyphs); })
+    ;
+  }
+
   bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh
index 527f64114b4..5cf9eb368aa 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh
@@ -29,8 +29,11 @@
 #ifndef OT_LAYOUT_TYPES_HH
 #define OT_LAYOUT_TYPES_HH
 
-using hb_ot_lookup_cache_t = hb_cache_t<15, 8, 7>;
-static_assert (sizeof (hb_ot_lookup_cache_t) == 256, "");
+using hb_ot_layout_mapping_cache_t = hb_cache_t<16, 8, 8>;
+static_assert (sizeof (hb_ot_layout_mapping_cache_t) == 512, "");
+
+using hb_ot_layout_binary_cache_t = hb_cache_t<14, 1, 8>;
+static_assert (sizeof (hb_ot_layout_binary_cache_t) == 256, "");
 
 namespace OT {
 namespace Layout {
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc
new file mode 100644
index 00000000000..f0e7f934579
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.cc
@@ -0,0 +1,421 @@
+#include "VARC.hh"
+
+#ifndef HB_NO_VAR_COMPOSITES
+
+#include "../../../hb-draw.hh"
+#include "../../../hb-ot-layout-common.hh"
+#include "../../../hb-ot-layout-gdef-table.hh"
+
+namespace OT {
+
+//namespace Var {
+
+
+#ifndef HB_NO_DRAW
+
+struct hb_transforming_pen_context_t
+{
+  hb_transform_t<> transform;
+  hb_draw_funcs_t *dfuncs;
+  void *data;
+  hb_draw_state_t *st;
+};
+
+static void
+hb_transforming_pen_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                             void *data,
+                             hb_draw_state_t *st,
+                             float to_x, float to_y,
+                             void *user_data HB_UNUSED)
+{
+  hb_transforming_pen_context_t *c = (hb_transforming_pen_context_t *) data;
+
+  c->transform.transform_point (to_x, to_y);
+
+  c->dfuncs->move_to (c->data, *c->st, to_x, to_y);
+}
+
+static void
+hb_transforming_pen_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                             void *data,
+                             hb_draw_state_t *st,
+                             float to_x, float to_y,
+                             void *user_data HB_UNUSED)
+{
+  hb_transforming_pen_context_t *c = (hb_transforming_pen_context_t *) data;
+
+  c->transform.transform_point (to_x, to_y);
+
+  c->dfuncs->line_to (c->data, *c->st, to_x, to_y);
+}
+
+static void
+hb_transforming_pen_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                                  void *data,
+                                  hb_draw_state_t *st,
+                                  float control_x, float control_y,
+                                  float to_x, float to_y,
+                                  void *user_data HB_UNUSED)
+{
+  hb_transforming_pen_context_t *c = (hb_transforming_pen_context_t *) data;
+
+  c->transform.transform_point (control_x, control_y);
+  c->transform.transform_point (to_x, to_y);
+
+  c->dfuncs->quadratic_to (c->data, *c->st, control_x, control_y, to_x, to_y);
+}
+
+static void
+hb_transforming_pen_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                              void *data,
+                              hb_draw_state_t *st,
+                              float control1_x, float control1_y,
+                              float control2_x, float control2_y,
+                              float to_x, float to_y,
+                              void *user_data HB_UNUSED)
+{
+  hb_transforming_pen_context_t *c = (hb_transforming_pen_context_t *) data;
+
+  c->transform.transform_point (control1_x, control1_y);
+  c->transform.transform_point (control2_x, control2_y);
+  c->transform.transform_point (to_x, to_y);
+
+  c->dfuncs->cubic_to (c->data, *c->st, control1_x, control1_y, control2_x, control2_y, to_x, to_y);
+}
+
+static void
+hb_transforming_pen_close_path (hb_draw_funcs_t *dfuncs HB_UNUSED,
+                                void *data,
+                                hb_draw_state_t *st,
+                                void *user_data HB_UNUSED)
+{
+  hb_transforming_pen_context_t *c = (hb_transforming_pen_context_t *) data;
+
+  c->dfuncs->close_path (c->data, *c->st);
+}
+
+static inline void free_static_transforming_pen_funcs ();
+
+static struct hb_transforming_pen_funcs_lazy_loader_t : hb_draw_funcs_lazy_loader_t<hb_transforming_pen_funcs_lazy_loader_t>
+{
+  static hb_draw_funcs_t *create ()
+  {
+    hb_draw_funcs_t *funcs = hb_draw_funcs_create ();
+
+    hb_draw_funcs_set_move_to_func (funcs, hb_transforming_pen_move_to, nullptr, nullptr);
+    hb_draw_funcs_set_line_to_func (funcs, hb_transforming_pen_line_to, nullptr, nullptr);
+    hb_draw_funcs_set_quadratic_to_func (funcs, hb_transforming_pen_quadratic_to, nullptr, nullptr);
+    hb_draw_funcs_set_cubic_to_func (funcs, hb_transforming_pen_cubic_to, nullptr, nullptr);
+    hb_draw_funcs_set_close_path_func (funcs, hb_transforming_pen_close_path, nullptr, nullptr);
+
+    hb_draw_funcs_make_immutable (funcs);
+
+    hb_atexit (free_static_transforming_pen_funcs);
+
+    return funcs;
+  }
+} static_transforming_pen_funcs;
+
+static inline
+void free_static_transforming_pen_funcs ()
+{
+  static_transforming_pen_funcs.free_instance ();
+}
+
+static hb_draw_funcs_t *
+hb_transforming_pen_get_funcs ()
+{
+  return static_transforming_pen_funcs.get_unconst ();
+}
+
+hb_ubytes_t
+VarComponent::get_path_at (const hb_varc_context_t &c,
+                           hb_codepoint_t parent_gid,
+                           hb_array_t<const int> coords,
+                           hb_transform_t<> total_transform,
+                           hb_ubytes_t total_record,
+                           hb_scalar_cache_t *cache) const
+{
+  const unsigned char *end = total_record.arrayZ + total_record.length;
+  const unsigned char *record = total_record.arrayZ;
+
+  auto &VARC = *c.font->face->table.VARC->table;
+  auto &varStore = &VARC+VARC.varStore;
+
+#define READ_UINT32VAR(name) \
+  HB_STMT_START { \
+    if (unlikely (unsigned (end - record) < HBUINT32VAR::min_size)) return hb_ubytes_t (); \
+    hb_barrier (); \
+    auto &varint = * (const HBUINT32VAR *) record; \
+    unsigned size = varint.get_size (); \
+    if (unlikely (unsigned (end - record) < size)) return hb_ubytes_t (); \
+    name = (uint32_t) varint; \
+    record += size; \
+  } HB_STMT_END
+
+  uint32_t flags;
+  READ_UINT32VAR (flags);
+
+  // gid
+
+  hb_codepoint_t gid = 0;
+  if (flags & (unsigned) flags_t::GID_IS_24BIT)
+  {
+    if (unlikely (unsigned (end - record) < HBGlyphID24::static_size))
+      return hb_ubytes_t ();
+    hb_barrier ();
+    gid = * (const HBGlyphID24 *) record;
+    record += HBGlyphID24::static_size;
+  }
+  else
+  {
+    if (unlikely (unsigned (end - record) < HBGlyphID16::static_size))
+      return hb_ubytes_t ();
+    hb_barrier ();
+    gid = * (const HBGlyphID16 *) record;
+    record += HBGlyphID16::static_size;
+  }
+
+  // Condition
+  bool show = true;
+  if (flags & (unsigned) flags_t::HAVE_CONDITION)
+  {
+    unsigned conditionIndex;
+    READ_UINT32VAR (conditionIndex);
+    const auto &condition = (&VARC+VARC.conditionList)[conditionIndex];
+    auto instancer = MultiItemVarStoreInstancer(&varStore, nullptr, coords, cache);
+    show = condition.evaluate (coords.arrayZ, coords.length, &instancer);
+  }
+
+  // Axis values
+
+  auto &axisIndices = c.scratch.axisIndices;
+  axisIndices.clear ();
+  auto &axisValues = c.scratch.axisValues;
+  axisValues.clear ();
+  if (flags & (unsigned) flags_t::HAVE_AXES)
+  {
+    unsigned axisIndicesIndex;
+    READ_UINT32VAR (axisIndicesIndex);
+    axisIndices.extend ((&VARC+VARC.axisIndicesList)[axisIndicesIndex]);
+    axisValues.resize (axisIndices.length);
+    const HBUINT8 *p = (const HBUINT8 *) record;
+    TupleValues::decompile (p, axisValues, (const HBUINT8 *) end);
+    record = (const unsigned char *) p;
+  }
+
+  // Apply variations if any
+  if (flags & (unsigned) flags_t::AXIS_VALUES_HAVE_VARIATION)
+  {
+    uint32_t axisValuesVarIdx;
+    READ_UINT32VAR (axisValuesVarIdx);
+    if (show && coords && !axisValues.in_error ())
+      varStore.get_delta (axisValuesVarIdx, coords, axisValues.as_array (), cache);
+  }
+
+  auto component_coords = coords;
+  /* Copying coords is expensive; so we have put an arbitrary
+   * limit on the max number of coords for now. */
+  if ((flags & (unsigned) flags_t::RESET_UNSPECIFIED_AXES) ||
+      coords.length > HB_VAR_COMPOSITE_MAX_AXES)
+    component_coords = hb_array (c.font->coords, c.font->num_coords);
+
+  // Transform
+
+  uint32_t transformVarIdx = VarIdx::NO_VARIATION;
+  if (flags & (unsigned) flags_t::TRANSFORM_HAS_VARIATION)
+    READ_UINT32VAR (transformVarIdx);
+
+#define PROCESS_TRANSFORM_COMPONENTS \
+        HB_STMT_START { \
+        PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TRANSLATE_X, translateX); \
+        PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TRANSLATE_Y, translateY); \
+        PROCESS_TRANSFORM_COMPONENT (F4DOT12, HB_PI, HAVE_ROTATION, rotation); \
+        PROCESS_TRANSFORM_COMPONENT (F6DOT10, 1.0f, HAVE_SCALE_X, scaleX); \
+        PROCESS_TRANSFORM_COMPONENT (F6DOT10, 1.0f, HAVE_SCALE_Y, scaleY); \
+        PROCESS_TRANSFORM_COMPONENT (F4DOT12, HB_PI, HAVE_SKEW_X, skewX); \
+        PROCESS_TRANSFORM_COMPONENT (F4DOT12, HB_PI, HAVE_SKEW_Y, skewY); \
+        PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TCENTER_X, tCenterX); \
+        PROCESS_TRANSFORM_COMPONENT (FWORD, 1.0f, HAVE_TCENTER_Y, tCenterY); \
+        } HB_STMT_END
+
+  hb_transform_decomposed_t<> transform;
+
+  // Read transform components
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
+        if (flags & (unsigned) flags_t::flag) \
+        { \
+          static_assert (type::static_size == HBINT16::static_size, ""); \
+          if (unlikely (unsigned (end - record) < HBINT16::static_size)) \
+            return hb_ubytes_t (); \
+          hb_barrier (); \
+          transform.name = mult * * (const HBINT16 *) record; \
+          record += HBINT16::static_size; \
+        }
+  PROCESS_TRANSFORM_COMPONENTS;
+#undef PROCESS_TRANSFORM_COMPONENT
+
+  // Read reserved records
+  unsigned i = flags & (unsigned) flags_t::RESERVED_MASK;
+  while (i)
+  {
+    HB_UNUSED uint32_t discard;
+    READ_UINT32VAR (discard);
+    i &= i - 1;
+  }
+
+  /* Parsing is over now. */
+
+  if (show)
+  {
+    // Only use coord_setter if there's actually any axis overrides.
+    coord_setter_t coord_setter (axisIndices ? component_coords : hb_array<int> ());
+    // Go backwards, to reduce coord_setter vector reallocations.
+    for (unsigned i = axisIndices.length; i; i--)
+      coord_setter[axisIndices[i - 1]] = axisValues[i - 1];
+    if (axisIndices)
+      component_coords = coord_setter.get_coords ();
+
+    // Apply transform variations if any
+    if (transformVarIdx != VarIdx::NO_VARIATION && coords)
+    {
+      float transformValues[9];
+      unsigned numTransformValues = 0;
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
+          if (flags & (unsigned) flags_t::flag) \
+            transformValues[numTransformValues++] = transform.name / mult;
+      PROCESS_TRANSFORM_COMPONENTS;
+#undef PROCESS_TRANSFORM_COMPONENT
+      varStore.get_delta (transformVarIdx, coords, hb_array (transformValues, numTransformValues), cache);
+      numTransformValues = 0;
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
+          if (flags & (unsigned) flags_t::flag) \
+            transform.name = transformValues[numTransformValues++] * mult;
+      PROCESS_TRANSFORM_COMPONENTS;
+#undef PROCESS_TRANSFORM_COMPONENT
+    }
+
+    // Divide them by their divisors
+#define PROCESS_TRANSFORM_COMPONENT(type, mult, flag, name) \
+          if (flags & (unsigned) flags_t::flag) \
+          { \
+            HBINT16 int_v; \
+            int_v = roundf (transform.name); \
+            type typed_v = * (const type *) &int_v; \
+            float float_v = (float) typed_v; \
+            transform.name = float_v; \
+          }
+    PROCESS_TRANSFORM_COMPONENTS;
+#undef PROCESS_TRANSFORM_COMPONENT
+
+    if (!(flags & (unsigned) flags_t::HAVE_SCALE_Y))
+      transform.scaleY = transform.scaleX;
+
+    total_transform.transform (transform.to_transform ());
+    total_transform.scale (c.font->x_mult ? 1.f / c.font->x_multf : 0.f,
+                           c.font->y_mult ? 1.f / c.font->y_multf : 0.f);
+
+    bool same_coords = component_coords.length == coords.length &&
+                       component_coords.arrayZ == coords.arrayZ;
+
+    c.depth_left--;
+    VARC.get_path_at (c, gid,
+                      component_coords, total_transform,
+                      parent_gid,
+                      same_coords ? cache : nullptr);
+    c.depth_left++;
+  }
+
+#undef PROCESS_TRANSFORM_COMPONENTS
+#undef READ_UINT32VAR
+
+  return hb_ubytes_t (record, end - record);
+}
+
+bool
+VARC::get_path_at (const hb_varc_context_t &c,
+                   hb_codepoint_t glyph,
+                   hb_array_t<const int> coords,
+                   hb_transform_t<> transform,
+                   hb_codepoint_t parent_glyph,
+                   hb_scalar_cache_t *parent_cache) const
+{
+  // Don't recurse on the same glyph.
+  unsigned idx = glyph == parent_glyph ?
+                 NOT_COVERED :
+                 (this+coverage).get_coverage (glyph);
+  if (idx == NOT_COVERED)
+  {
+    if (c.draw_session)
+    {
+      // Build a transforming pen to apply the transform.
+      hb_draw_funcs_t *transformer_funcs = hb_transforming_pen_get_funcs ();
+      hb_transforming_pen_context_t context {transform,
+                                             c.draw_session->funcs,
+                                             c.draw_session->draw_data,
+                                             &c.draw_session->st};
+      hb_draw_session_t transformer_session {transformer_funcs, &context};
+      hb_draw_session_t &shape_draw_session = transform.is_identity () ? *c.draw_session : transformer_session;
+
+      if (c.font->face->table.glyf->get_path_at (c.font, glyph, shape_draw_session, coords, c.scratch.glyf_scratch)) return true;
+#ifndef HB_NO_CFF
+      if (c.font->face->table.cff2->get_path_at (c.font, glyph, shape_draw_session, coords)) return true;
+      if (c.font->face->table.cff1->get_path (c.font, glyph, shape_draw_session)) return true; // Doesn't have variations
+#endif
+      return false;
+    }
+    else if (c.extents)
+    {
+      hb_glyph_extents_t glyph_extents;
+      if (!c.font->face->table.glyf->get_extents_at (c.font, glyph, &glyph_extents, coords))
+#ifndef HB_NO_CFF
+      if (!c.font->face->table.cff2->get_extents_at (c.font, glyph, &glyph_extents, coords))
+      if (!c.font->face->table.cff1->get_extents (c.font, glyph, &glyph_extents)) // Doesn't have variations
+#endif
+        return false;
+
+      hb_extents_t<> comp_extents (glyph_extents);
+      transform.transform_extents (comp_extents);
+      c.extents->union_ (comp_extents);
+    }
+    return true;
+  }
+
+  if (c.depth_left <= 0)
+    return true;
+
+  if (c.edges_left <= 0)
+    return true;
+  (c.edges_left)--;
+
+  hb_decycler_node_t node (c.decycler);
+  if (unlikely (!node.visit (glyph)))
+    return true;
+
+  hb_ubytes_t record = (this+glyphRecords)[idx];
+
+  hb_scalar_cache_t static_cache;
+  hb_scalar_cache_t *cache = parent_cache ?
+                                  parent_cache :
+                                  (this+varStore).create_cache (&static_cache);
+
+  transform.scale (c.font->x_multf, c.font->y_multf);
+
+  VarCompositeGlyph::get_path_at (c,
+                                  glyph,
+                                  coords, transform,
+                                  record,
+                                  cache);
+
+  if (cache != parent_cache)
+    (this+varStore).destroy_cache (cache, &static_cache);
+
+  return true;
+}
+
+#endif
+
+//} // namespace Var
+} // namespace OT
+
+#endif
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
index 2ea1b6bca32..6b40f044556 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
@@ -32,7 +32,7 @@ struct hb_varc_context_t
 {
   hb_font_t *font;
   hb_draw_session_t *draw_session;
-  hb_extents_t *extents;
+  hb_extents_t<> *extents;
   mutable hb_decycler_t decycler;
   mutable signed edges_left;
   mutable signed depth_left;
@@ -65,9 +65,9 @@ struct VarComponent
   get_path_at (const hb_varc_context_t &c,
                hb_codepoint_t parent_gid,
                hb_array_t<const int> coords,
-               hb_transform_t transform,
+               hb_transform_t<> transform,
                hb_ubytes_t record,
-               VarRegionList::cache_t *cache = nullptr) const;
+               hb_scalar_cache_t *cache = nullptr) const;
 };
 
 struct VarCompositeGlyph
@@ -76,9 +76,9 @@ struct VarCompositeGlyph
   get_path_at (const hb_varc_context_t &c,
                hb_codepoint_t gid,
                hb_array_t<const int> coords,
-               hb_transform_t transform,
+               hb_transform_t<> transform,
                hb_ubytes_t record,
-               VarRegionList::cache_t *cache)
+               hb_scalar_cache_t *cache)
   {
     while (record)
     {
@@ -104,9 +104,9 @@ struct VARC
   get_path_at (const hb_varc_context_t &c,
                hb_codepoint_t gid,
                hb_array_t<const int> coords,
-               hb_transform_t transform = HB_TRANSFORM_IDENTITY,
+               hb_transform_t<> transform = HB_TRANSFORM_IDENTITY,
                hb_codepoint_t parent_gid = HB_CODEPOINT_INVALID,
-               VarRegionList::cache_t *parent_cache = nullptr) const;
+               hb_scalar_cache_t *parent_cache = nullptr) const;
 
   bool
   get_path (hb_font_t *font,
@@ -129,7 +129,7 @@ struct VARC
   bool
   get_extents (hb_font_t *font,
                hb_codepoint_t gid,
-               hb_extents_t *extents,
+               hb_extents_t<> *extents,
                hb_varc_scratch_t &scratch) const
   {
     hb_varc_context_t c {font,
@@ -194,9 +194,10 @@ struct VARC
                  hb_codepoint_t gid,
                  hb_glyph_extents_t *extents) const
     {
+#ifndef HB_NO_DRAW
       if (!table->has_data ()) return false;
 
-      hb_extents_t f_extents;
+      hb_extents_t<> f_extents;
 
       auto *scratch = acquire_scratch ();
       if (unlikely (!scratch)) return true;
@@ -207,6 +208,9 @@ struct VARC
         *extents = f_extents.to_glyph_extents (font->x_scale < 0, font->y_scale < 0);
 
       return ret;
+#else
+      return false;
+#endif
     }
 
     private:
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh
index 1805df262aa..8f5287e9457 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh
@@ -102,17 +102,15 @@ struct Glyph
     if (unlikely (!points.resize (points.length + PHANTOM_COUNT))) return false;
     hb_array_t<contour_point_t> phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
     {
+      // Duplicated code.
       int lsb = 0;
-      int h_delta = face->table.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb) ?
-                    (int) header->xMin - lsb : 0;
+      face->table.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb);
+      int h_delta = (int) header->xMin - lsb;
       HB_UNUSED int tsb = 0;
-      int v_orig  = (int) header->yMax +
 #ifndef HB_NO_VERTICAL
-                    ((void) face->table.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb), tsb)
-#else
-                    0
+      face->table.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb);
 #endif
-                    ;
+      int v_orig  = (int) header->yMax + tsb;
       unsigned h_adv = face->table.hmtx->get_advance_without_var_unscaled (gid);
       unsigned v_adv =
 #ifndef HB_NO_VERTICAL
@@ -314,6 +312,7 @@ struct Glyph
                    bool use_my_metrics = true,
                    bool phantom_only = false,
                    hb_array_t<const int> coords = hb_array_t<const int> (),
+                   hb_scalar_cache_t *gvar_cache = nullptr,
                    unsigned int depth = 0,
                    unsigned *edge_count = nullptr) const
   {
@@ -328,7 +327,7 @@ struct Glyph
       head_maxp_info->maxComponentDepth = hb_max (head_maxp_info->maxComponentDepth, depth);
     }
 
-    if (!coords)
+    if (!coords && font->has_nonzero_coords)
       coords = hb_array (font->coords, font->num_coords);
 
     contour_point_vector_t &points = type == SIMPLE ? all_points : scratch.comp_points;
@@ -357,17 +356,15 @@ struct Glyph
     if (unlikely (!points.resize (points.length + PHANTOM_COUNT))) return false;
     hb_array_t<contour_point_t> phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
     {
+      // Duplicated code.
       int lsb = 0;
-      int h_delta = glyf_accelerator.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb) ?
-                    (int) header->xMin - lsb : 0;
+      glyf_accelerator.hmtx->get_leading_bearing_without_var_unscaled (gid, &lsb);
+      int h_delta = (int) header->xMin - lsb;
       HB_UNUSED int tsb = 0;
-      int v_orig  = (int) header->yMax +
 #ifndef HB_NO_VERTICAL
-                    ((void) glyf_accelerator.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb), tsb)
-#else
-                    0
+      glyf_accelerator.vmtx->get_leading_bearing_without_var_unscaled (gid, &tsb);
 #endif
-                    ;
+      int v_orig  = (int) header->yMax + tsb;
       unsigned h_adv = glyf_accelerator.hmtx->get_advance_without_var_unscaled (gid);
       unsigned v_adv =
 #ifndef HB_NO_VERTICAL
@@ -383,7 +380,7 @@ struct Glyph
     }
 
 #ifndef HB_NO_VAR
-    if (coords)
+    if (hb_any (coords))
     {
 #ifndef HB_NO_BEYOND_64K
       if (glyf_accelerator.GVAR->has_data ())
@@ -391,6 +388,7 @@ struct Glyph
                                                        coords,
                                                        points.as_array ().sub_array (old_length),
                                                        scratch,
+                                                       gvar_cache,
                                                        phantom_only && type == SIMPLE);
       else
 #endif
@@ -398,6 +396,7 @@ struct Glyph
                                                        coords,
                                                        points.as_array ().sub_array (old_length),
                                                        scratch,
+                                                       gvar_cache,
                                                        phantom_only && type == SIMPLE);
     }
 #endif
@@ -447,6 +446,7 @@ struct Glyph
                                                     use_my_metrics,
                                                     phantom_only,
                                                     coords,
+                                                    gvar_cache,
                                                     depth + 1,
                                                     edge_count)))
         {
@@ -533,7 +533,11 @@ struct Glyph
   bool get_extents_without_var_scaled (hb_font_t *font, const glyf_accelerator_t &glyf_accelerator,
                                        hb_glyph_extents_t *extents) const
   {
-    if (type == EMPTY) return true; /* Empty glyph; zero extents. */
+    if (type == EMPTY)
+    {
+      *extents = {0, 0, 0, 0};
+      return true; /* Empty glyph; zero extents. */
+    }
     return header->get_extents_without_var_scaled (font, glyf_accelerator, gid, extents);
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh
index 601e1303792..507c94f7f3d 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh
@@ -189,7 +189,7 @@ struct SimpleGlyph
 
     unsigned old_length = points.length;
     points.alloc (points.length + num_points + 4); // Allocate for phantom points, to avoid a possible copy
-    if (unlikely (!points.resize (points.length + num_points, false))) return false;
+    if (unlikely (!points.resize_dirty (points.length + num_points))) return false;
     auto points_ = points.as_array ().sub_array (old_length);
     if (!phantom_only)
       hb_memset (points_.arrayZ, 0, sizeof (contour_point_t) * num_points);
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
index d9e5fedfa92..3fe2506bec9 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
@@ -220,7 +220,8 @@ struct glyf_accelerator_t
   template<typename T>
   bool get_points (hb_font_t *font, hb_codepoint_t gid, T consumer,
                    hb_array_t<const int> coords,
-                   hb_glyf_scratch_t &scratch) const
+                   hb_glyf_scratch_t &scratch,
+                   hb_scalar_cache_t *gvar_cache = nullptr) const
   {
     if (gid >= num_glyphs) return false;
 
@@ -228,7 +229,7 @@ struct glyf_accelerator_t
     all_points.resize (0);
 
     bool phantom_only = !consumer.is_consuming_contour_points ();
-    if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, scratch, nullptr, nullptr, nullptr, true, true, phantom_only, coords)))
+    if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, scratch, nullptr, nullptr, nullptr, true, true, phantom_only, coords, gvar_cache)))
       return false;
 
     unsigned count = all_points.length;
@@ -371,28 +372,28 @@ struct glyf_accelerator_t
     contour_point_t *get_phantoms_sink () { return phantoms; }
   };
 
+#ifndef HB_NO_VAR
   unsigned
-  get_advance_with_var_unscaled (hb_font_t *font, hb_codepoint_t gid, bool is_vertical) const
+  get_advance_with_var_unscaled (hb_codepoint_t gid,
+                                 hb_font_t *font,
+                                 bool is_vertical,
+                                  hb_glyf_scratch_t &scratch,
+                                 hb_scalar_cache_t *gvar_cache = nullptr) const
   {
     if (unlikely (gid >= num_glyphs)) return 0;
 
     bool success = false;
 
     contour_point_t phantoms[glyf_impl::PHANTOM_COUNT];
-    if (font->num_coords)
-    {
-      hb_glyf_scratch_t scratch;
-      success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false),
-                            hb_array (font->coords, font->num_coords),
-                            scratch);
-    }
-
+    success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false),
+                          hb_array (font->coords,
+                                    font->has_nonzero_coords ? font->num_coords : 0),
+                          scratch, gvar_cache);
     if (unlikely (!success))
-      return
-#ifndef HB_NO_VERTICAL
-        is_vertical ? vmtx->get_advance_without_var_unscaled (gid) :
-#endif
-        hmtx->get_advance_without_var_unscaled (gid);
+    {
+      unsigned upem = font->face->get_upem ();
+      return is_vertical ? upem : upem / 2;
+    }
 
     float result = is_vertical
                  ? phantoms[glyf_impl::PHANTOM_TOP].y - phantoms[glyf_impl::PHANTOM_BOTTOM].y
@@ -400,40 +401,38 @@ struct glyf_accelerator_t
     return hb_clamp (roundf (result), 0.f, (float) UINT_MAX / 2);
   }
 
-  bool get_leading_bearing_with_var_unscaled (hb_font_t *font, hb_codepoint_t gid, bool is_vertical, int *lsb) const
+  float
+  get_v_origin_with_var_unscaled (hb_codepoint_t gid,
+                                  hb_font_t *font,
+                                  hb_glyf_scratch_t &scratch,
+                                  hb_scalar_cache_t *gvar_cache = nullptr) const
   {
-    if (unlikely (gid >= num_glyphs)) return false;
+    if (unlikely (gid >= num_glyphs)) return 0;
+
+    bool success = false;
 
-    hb_glyph_extents_t extents;
-    hb_glyf_scratch_t scratch;
     contour_point_t phantoms[glyf_impl::PHANTOM_COUNT];
-    if (unlikely (!get_points (font, gid, points_aggregator_t (font, &extents, phantoms, false),
-                               hb_array (font->coords, font->num_coords),
-                               scratch)))
-      return false;
+    success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false),
+                          hb_array (font->coords,
+                                    font->has_nonzero_coords ? font->num_coords : 0),
+                          scratch, gvar_cache);
+    if (unlikely (!success))
+    {
+      return font->face->get_upem ();
+    }
 
-    *lsb = is_vertical
-         ? roundf (phantoms[glyf_impl::PHANTOM_TOP].y) - extents.y_bearing
-         : roundf (phantoms[glyf_impl::PHANTOM_LEFT].x);
-    return true;
+    return phantoms[glyf_impl::PHANTOM_TOP].y;
   }
 #endif
-
-  bool get_leading_bearing_without_var_unscaled (hb_codepoint_t gid, bool is_vertical, int *lsb) const
-  {
-    if (unlikely (gid >= num_glyphs)) return false;
-    if (is_vertical) return false; // TODO Humm, what to do here?
-
-    *lsb = glyph_for_gid (gid).get_header ()->xMin;
-    return true;
-  }
+#endif
 
   public:
 
   bool get_extents (hb_font_t *font,
                     hb_codepoint_t gid,
                     hb_glyph_extents_t *extents) const
-  { return get_extents_at (font, gid, extents, hb_array (font->coords, font->num_coords)); }
+  { return get_extents_at (font, gid, extents, hb_array (font->coords,
+                                                         font->has_nonzero_coords ? font->num_coords : 0)); }
 
   bool get_extents_at (hb_font_t *font,
                        hb_codepoint_t gid,
@@ -445,12 +444,15 @@ struct glyf_accelerator_t
 #ifndef HB_NO_VAR
     if (coords)
     {
-      hb_glyf_scratch_t scratch;
-      return get_points (font,
-                         gid,
-                         points_aggregator_t (font, extents, nullptr, true),
-                         coords,
-                         scratch);
+      hb_glyf_scratch_t *scratch = acquire_scratch ();
+      if (unlikely (!scratch)) return false;
+      bool ret = get_points (font,
+                             gid,
+                             points_aggregator_t (font, extents, nullptr, true),
+                             coords,
+                             *scratch);
+      release_scratch (scratch);
+      return ret;
     }
 #endif
     return glyph_for_gid (gid).get_extents_without_var_scaled (font, *this, extents);
@@ -485,33 +487,20 @@ struct glyf_accelerator_t
   }
 
   bool
-  get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
+  get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session, hb_scalar_cache_t *gvar_cache = nullptr) const
   {
     if (!has_data ()) return false;
 
-    hb_glyf_scratch_t *scratch;
-
-    // Borrow the cached strach buffer.
-    {
-      scratch = cached_scratch.get_acquire ();
-      if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
-      {
-        scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
-        if (unlikely (!scratch))
-          return true;
-      }
-    }
+    hb_glyf_scratch_t *scratch = acquire_scratch ();
+    if (unlikely (!scratch)) return true;
 
     bool ret = get_points (font, gid, glyf_impl::path_builder_t (font, draw_session),
-                           hb_array (font->coords, font->num_coords),
-                           *scratch);
+                           hb_array (font->coords,
+                                     font->has_nonzero_coords ? font->num_coords : 0),
+                           *scratch,
+                            gvar_cache);
 
-    // Put it back.
-    if (!cached_scratch.cmpexch (nullptr, scratch))
-    {
-      scratch->~hb_glyf_scratch_t ();
-      hb_free (scratch);
-    }
+    release_scratch (scratch);
 
     return ret;
   }
@@ -519,12 +508,38 @@ struct glyf_accelerator_t
   bool
   get_path_at (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session,
                hb_array_t<const int> coords,
-               hb_glyf_scratch_t &scratch) const
+               hb_glyf_scratch_t &scratch,
+               hb_scalar_cache_t *gvar_cache = nullptr) const
   {
     if (!has_data ()) return false;
     return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session),
                        coords,
-                       scratch);
+                       scratch,
+                       gvar_cache);
+  }
+
+
+  hb_glyf_scratch_t *acquire_scratch () const
+  {
+    if (!has_data ()) return nullptr;
+    hb_glyf_scratch_t *scratch = cached_scratch.get_acquire ();
+    if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
+    {
+      scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
+      if (unlikely (!scratch))
+        return nullptr;
+    }
+    return scratch;
+  }
+  void release_scratch (hb_glyf_scratch_t *scratch) const
+  {
+    if (!scratch)
+      return;
+    if (!cached_scratch.cmpexch (nullptr, scratch))
+    {
+      scratch->~hb_glyf_scratch_t ();
+      hb_free (scratch);
+    }
   }
 
 #ifndef HB_NO_VAR
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh
index da6378820bb..d1f38b9de8a 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh
@@ -74,7 +74,7 @@ struct ClassDef : public OT::ClassDef
     class_def_link->width = SmallTypes::size;
     class_def_link->objidx = class_def_prime_id;
     class_def_link->position = link_position;
-    class_def_prime_vertex.add_parent (parent_id);
+    class_def_prime_vertex.add_parent (parent_id, false);
 
     return true;
   }
@@ -117,7 +117,7 @@ struct ClassDef : public OT::ClassDef
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::ClassDef::min_size) return false;
     hb_barrier ();
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: return ((ClassDefFormat1*)this)->sanitize (vertex);
     case 2: return ((ClassDefFormat2*)this)->sanitize (vertex);
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh
index 61ca063e345..46c703524d9 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh
@@ -32,29 +32,27 @@
 
 namespace graph {
 
-struct CoverageFormat1 : public OT::Layout::Common::CoverageFormat1_3<SmallTypes>
-{
-  bool sanitize (graph_t::vertex_t& vertex) const
-  {
-    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3<SmallTypes>::min_size;
-    if (vertex_len < min_size) return false;
-    hb_barrier ();
-    return vertex_len >= min_size + glyphArray.get_size () - glyphArray.len.get_size ();
-  }
-};
+static bool sanitize (
+  const OT::Layout::Common::CoverageFormat1_3<OT::Layout::SmallTypes>* thiz,
+  graph_t::vertex_t& vertex
+) {
+  int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+  constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3<OT::Layout::SmallTypes>::min_size;
+  if (vertex_len < min_size) return false;
+  hb_barrier ();
+  return vertex_len >= min_size + thiz->glyphArray.get_size () - thiz->glyphArray.len.get_size ();
+}
 
-struct CoverageFormat2 : public OT::Layout::Common::CoverageFormat2_4<SmallTypes>
-{
-  bool sanitize (graph_t::vertex_t& vertex) const
-  {
-    int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4<SmallTypes>::min_size;
-    if (vertex_len < min_size) return false;
-    hb_barrier ();
-    return vertex_len >= min_size + rangeRecord.get_size () - rangeRecord.len.get_size ();
-  }
-};
+static bool sanitize (
+  const OT::Layout::Common::CoverageFormat2_4<OT::Layout::SmallTypes>* thiz,
+  graph_t::vertex_t& vertex
+) {
+  int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
+  constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4<OT::Layout::SmallTypes>::min_size;
+  if (vertex_len < min_size) return false;
+  hb_barrier ();
+  return vertex_len >= min_size + thiz->rangeRecord.get_size () - thiz->rangeRecord.len.get_size ();
+}
 
 struct Coverage : public OT::Layout::Common::Coverage
 {
@@ -98,11 +96,33 @@ struct Coverage : public OT::Layout::Common::Coverage
     coverage_link->width = SmallTypes::size;
     coverage_link->objidx = coverage_prime_id;
     coverage_link->position = link_position;
-    coverage_prime_vertex.add_parent (parent_id);
+    coverage_prime_vertex.add_parent (parent_id, false);
 
     return (Coverage*) coverage_prime_vertex.obj.head;
   }
 
+  // Filter an existing coverage table to glyphs at indices [start, end) and replace it with the filtered version.
+  static bool filter_coverage (gsubgpos_graph_context_t& c,
+                               unsigned existing_coverage,
+                               unsigned start, unsigned end) {
+    unsigned coverage_size = c.graph.vertices_[existing_coverage].table_size ();
+    auto& coverage_v = c.graph.vertices_[existing_coverage];
+    Coverage* coverage_table = (Coverage*) coverage_v.obj.head;
+    if (!coverage_table || !coverage_table->sanitize (coverage_v))
+      return false;
+
+    auto new_coverage =
+        + hb_zip (coverage_table->iter (), hb_range ())
+        | hb_filter ([&] (hb_pair_t<unsigned, unsigned> p) {
+          return p.second >= start && p.second < end;
+        })
+        | hb_map_retains_sorting (hb_first)
+        ;
+
+    return make_coverage (c, new_coverage, existing_coverage, coverage_size * 2 + 100);
+  }
+
+  // Replace the coverage table at dest obj with one covering 'glyphs'.
   template<typename It>
   static bool make_coverage (gsubgpos_graph_context_t& c,
                              It glyphs,
@@ -141,10 +161,10 @@ struct Coverage : public OT::Layout::Common::Coverage
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::Layout::Common::Coverage::min_size) return false;
     hb_barrier ();
-    switch (u.format)
+    switch (u.format.v)
     {
-    case 1: return ((CoverageFormat1*)this)->sanitize (vertex);
-    case 2: return ((CoverageFormat2*)this)->sanitize (vertex);
+    case 1: return graph::sanitize ((const OT::Layout::Common::CoverageFormat1_3<OT::Layout::SmallTypes>*) this, vertex);
+    case 2: return graph::sanitize ((const OT::Layout::Common::CoverageFormat2_4<OT::Layout::SmallTypes>*) this, vertex);
 #ifndef HB_NO_BEYOND_64K
     // Not currently supported
     case 3:
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/graph.hh
index ed1026f5866..78ae1a9dd5b 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/graph.hh
@@ -50,6 +50,7 @@ struct graph_t
     private:
     unsigned incoming_edges_ = 0;
     unsigned single_parent = (unsigned) -1;
+    bool has_incoming_virtual_edges_ = false;
     hb_hashmap_t<unsigned, unsigned> parents;
     public:
 
@@ -66,6 +67,11 @@ struct graph_t
       return parents.in_error ();
     }
 
+    bool has_incoming_virtual_edges () const
+    {
+      return has_incoming_virtual_edges_;
+    }
+
     bool link_positions_valid (unsigned num_objects, bool removed_nil)
     {
       hb_set_t assigned_bytes;
@@ -121,7 +127,9 @@ struct graph_t
       }
     }
 
-    bool equals (const vertex_t& other,
+    bool equals (unsigned this_index,
+                 unsigned other_index,
+                 const vertex_t& other,
                  const graph_t& graph,
                  const graph_t& other_graph,
                  unsigned depth) const
@@ -129,8 +137,10 @@ struct graph_t
       if (!(as_bytes () == other.as_bytes ()))
       {
         DEBUG_MSG (SUBSET_REPACK, nullptr,
-                   "vertex [%lu] bytes != [%lu] bytes, depth = %u",
+                   "vertex %u [%lu bytes] != %u [%lu bytes], depth = %u",
+                   this_index,
                    (unsigned long) table_size (),
+                   other_index,
                    (unsigned long) other.table_size (),
                    depth);
 
@@ -162,6 +172,7 @@ struct graph_t
       hb_swap (a.single_parent, b.single_parent);
       hb_swap (a.parents, b.parents);
       hb_swap (a.incoming_edges_, b.incoming_edges_);
+      hb_swap (a.has_incoming_virtual_edges_, b.has_incoming_virtual_edges_);
       hb_swap (a.start, b.start);
       hb_swap (a.end, b.end);
       hb_swap (a.priority, b.priority);
@@ -207,13 +218,16 @@ struct graph_t
     void reset_parents ()
     {
       incoming_edges_ = 0;
+      has_incoming_virtual_edges_ = false;
       single_parent = (unsigned) -1;
       parents.reset ();
     }
 
-    void add_parent (unsigned parent_index)
+    void add_parent (unsigned parent_index, bool is_virtual)
     {
       assert (parent_index != (unsigned) -1);
+      has_incoming_virtual_edges_ |= is_virtual;
+
       if (incoming_edges_ == 0)
       {
         single_parent = parent_index;
@@ -408,7 +422,7 @@ struct graph_t
             link_a.bias != link_b.bias)
           return false;
 
-        if (!graph.vertices_[link_a.objidx].equals (
+        if (!graph.vertices_[link_a.objidx].equals (link_a.objidx, link_b.objidx,
                 other_graph.vertices_[link_b.objidx], graph, other_graph, depth + 1))
           return false;
 
@@ -456,8 +470,12 @@ struct graph_t
     num_roots_for_space_.push (1);
     bool removed_nil = false;
     vertices_.alloc (objects.length);
-    vertices_scratch_.alloc (objects.length);
+    ordering_.resize (objects.length);
+    ordering_scratch_.alloc (objects.length);
+
     unsigned count = objects.length;
+    unsigned order = objects.length;
+    unsigned skip = 0;
     for (unsigned i = 0; i < count; i++)
     {
       // If this graph came from a serialization buffer object 0 is the
@@ -465,6 +483,9 @@ struct graph_t
       if (i == 0 && !objects.arrayZ[i])
       {
         removed_nil = true;
+        order--;
+        ordering_.resize(objects.length - 1);
+        skip++;
         continue;
       }
 
@@ -474,6 +495,12 @@ struct graph_t
 
       check_success (v->link_positions_valid (count, removed_nil));
 
+      // To start we set the ordering to match the provided objects
+      // list. Note: objects are provided to us in reverse order (ie.
+      // the last object is the root).
+      unsigned obj_idx = i - skip;
+      ordering_[--order] = obj_idx;
+
       if (!removed_nil) continue;
       // Fix indices to account for removed nil object.
       for (auto& l : v->obj.all_links_writer ()) {
@@ -490,17 +517,20 @@ struct graph_t
 
   bool operator== (const graph_t& other) const
   {
-    return root ().equals (other.root (), *this, other, 0);
+    return root ().equals (root_idx(), other.root_idx(), other.root (), *this, other, 0);
   }
 
   void print () const {
-    for (int i = vertices_.length - 1; i >= 0; i--)
+    for (unsigned id : ordering_)
     {
-      const auto& v = vertices_[i];
-      printf("%d: %u [", i, (unsigned int)v.table_size());
+      const auto& v = vertices_[id];
+      printf("%u: %u [", id, (unsigned int)v.table_size());
       for (const auto &l : v.obj.real_links) {
         printf("%u, ", l.objidx);
       }
+      for (const auto &l : v.obj.virtual_links) {
+        printf("v%u, ", l.objidx);
+      }
       printf("]\n");
     }
   }
@@ -516,6 +546,7 @@ struct graph_t
   {
     return !successful ||
         vertices_.in_error () ||
+        ordering_.in_error() ||
         num_roots_for_space_.in_error ();
   }
 
@@ -526,10 +557,10 @@ struct graph_t
 
   unsigned root_idx () const
   {
-    // Object graphs are in reverse order, the first object is at the end
-    // of the vector. Since the graph is topologically sorted it's safe to
+    // First element of ordering_ is the root.
+    // Since the graph is topologically sorted it's safe to
     // assume the first object has no incoming edges.
-    return vertices_.length - 1;
+    return ordering_[0];
   }
 
   const hb_serialize_context_t::object_t& object (unsigned i) const
@@ -556,7 +587,7 @@ struct graph_t
     link->width = 2;
     link->objidx = child_id;
     link->position = (char*) offset - (char*) v.obj.head;
-    vertices_[child_id].add_parent (parent_id);
+    vertices_[child_id].add_parent (parent_id, false);
   }
 
   /*
@@ -587,55 +618,51 @@ struct graph_t
 
     hb_priority_queue_t<int64_t> queue;
     queue.alloc (vertices_.length);
-    hb_vector_t<vertex_t> &sorted_graph = vertices_scratch_;
-    if (unlikely (!check_success (sorted_graph.resize (vertices_.length)))) return;
-    hb_vector_t<unsigned> id_map;
-    if (unlikely (!check_success (id_map.resize (vertices_.length)))) return;
+    hb_vector_t<unsigned> &new_ordering = ordering_scratch_;
+    if (unlikely (!check_success (new_ordering.resize (vertices_.length)))) return;
 
     hb_vector_t<unsigned> removed_edges;
     if (unlikely (!check_success (removed_edges.resize (vertices_.length)))) return;
     update_parents ();
 
     queue.insert (root ().modified_distance (0), root_idx ());
-    int new_id = root_idx ();
     unsigned order = 1;
+    unsigned pos = 0;
     while (!queue.in_error () && !queue.is_empty ())
     {
       unsigned next_id = queue.pop_minimum().second;
 
-      sorted_graph[new_id] = std::move (vertices_[next_id]);
-      const vertex_t& next = sorted_graph[new_id];
-
-      if (unlikely (!check_success(new_id >= 0))) {
+      if (unlikely (!check_success(pos < new_ordering.length))) {
         // We are out of ids. Which means we've visited a node more than once.
         // This graph contains a cycle which is not allowed.
         DEBUG_MSG (SUBSET_REPACK, nullptr, "Invalid graph. Contains cycle.");
         return;
       }
-
-      id_map[next_id] = new_id--;
+      new_ordering[pos++] = next_id;
+      const vertex_t& next = vertices_[next_id];
 
       for (const auto& link : next.obj.all_links ()) {
         removed_edges[link.objidx]++;
-        if (!(vertices_[link.objidx].incoming_edges () - removed_edges[link.objidx]))
+        const auto& v = vertices_[link.objidx];
+        if (!(v.incoming_edges () - removed_edges[link.objidx]))
           // Add the order that the links were encountered to the priority.
           // This ensures that ties between priorities objects are broken in a consistent
           // way. More specifically this is set up so that if a set of objects have the same
           // distance they'll be added to the topological order in the order that they are
           // referenced from the parent object.
-          queue.insert (vertices_[link.objidx].modified_distance (order++),
+          queue.insert (v.modified_distance (order++),
                         link.objidx);
       }
     }
 
     check_success (!queue.in_error ());
-    check_success (!sorted_graph.in_error ());
+    check_success (!new_ordering.in_error ());
 
-    check_success (remap_all_obj_indices (id_map, &sorted_graph));
-    vertices_ = std::move (sorted_graph);
+    hb_swap (ordering_, new_ordering);
 
-    if (!check_success (new_id == -1))
+    if (!check_success (pos == vertices_.length)) {
       print_orphaned_nodes ();
+    }
   }
 
   /*
@@ -645,8 +672,8 @@ struct graph_t
    */
   void find_space_roots (hb_set_t& visited, hb_set_t& roots)
   {
-    int root_index = (int) root_idx ();
-    for (int i = root_index; i >= 0; i--)
+    unsigned root_index = root_idx ();
+    for (unsigned i : ordering_)
     {
       if (visited.has (i)) continue;
 
@@ -829,7 +856,6 @@ struct graph_t
     if (subgraph.in_error ())
       return false;
 
-    unsigned original_root_idx = root_idx ();
     hb_map_t index_map;
     bool made_changes = false;
     for (auto entry : subgraph.iter ())
@@ -852,14 +878,6 @@ struct graph_t
     if (!made_changes)
       return false;
 
-    if (original_root_idx != root_idx ()
-        && parents.has (original_root_idx))
-    {
-      // If the root idx has changed since parents was determined, update root idx in parents
-      parents.add (root_idx ());
-      parents.del (original_root_idx);
-    }
-
     auto new_subgraph =
         + subgraph.keys ()
         | hb_map([&] (uint32_t node_idx) {
@@ -943,12 +961,14 @@ struct graph_t
   /*
    * Moves the child of old_parent_idx pointed to by old_offset to a new
    * vertex at the new_offset.
+   *
+   * Returns the id of the child node that was moved.
    */
   template<typename O>
-  void move_child (unsigned old_parent_idx,
-                   const O* old_offset,
-                   unsigned new_parent_idx,
-                   const O* new_offset)
+  unsigned move_child (unsigned old_parent_idx,
+                       const O* old_offset,
+                       unsigned new_parent_idx,
+                       const O* new_offset)
   {
     distance_invalid = true;
     positions_invalid = true;
@@ -965,10 +985,56 @@ struct graph_t
     new_link->position = (const char*) new_offset - (const char*) new_v.obj.head;
 
     auto& child = vertices_[child_id];
-    child.add_parent (new_parent_idx);
+    child.add_parent (new_parent_idx, false);
 
     old_v.remove_real_link (child_id, old_offset);
     child.remove_parent (old_parent_idx);
+
+    return child_id;
+  }
+
+  /*
+   * Moves all outgoing links in old parent that have
+   * a link position between [old_post_start, old_pos_end)
+   * to the new parent. Links are placed serially in the new
+   * parent starting at new_pos_start.
+   */
+  template<typename O>
+  void move_children (unsigned old_parent_idx,
+                      unsigned old_pos_start,
+                      unsigned old_pos_end,
+                      unsigned new_parent_idx,
+                      unsigned new_pos_start)
+  {
+    distance_invalid = true;
+    positions_invalid = true;
+
+    auto& old_v = vertices_[old_parent_idx];
+    auto& new_v = vertices_[new_parent_idx];
+
+    hb_vector_t<hb_serialize_context_t::object_t::link_t> old_links;
+    for (const auto& l : old_v.obj.real_links)
+    {
+      if (l.position < old_pos_start || l.position >= old_pos_end)
+      {
+        old_links.push(l);
+        continue;
+      }
+
+      unsigned array_pos = l.position - old_pos_start;
+
+      unsigned child_id = l.objidx;
+      auto* new_link = new_v.obj.real_links.push ();
+      new_link->width = O::static_size;
+      new_link->objidx = child_id;
+      new_link->position = new_pos_start + array_pos;
+
+      auto& child = vertices_[child_id];
+      child.add_parent (new_parent_idx, false);
+      child.remove_parent (old_parent_idx);
+    }
+
+    old_v.obj.real_links = std::move (old_links);
   }
 
   /*
@@ -1000,8 +1066,11 @@ struct graph_t
     distance_invalid = true;
 
     auto* clone = vertices_.push ();
+    unsigned clone_idx = vertices_.length - 1;
+    ordering_.push(clone_idx);
+
     auto& child = vertices_[node_idx];
-    if (vertices_.in_error ()) {
+    if (vertices_.in_error () || ordering_.in_error()) {
       return -1;
     }
 
@@ -1011,51 +1080,23 @@ struct graph_t
     clone->space = child.space;
     clone->reset_parents ();
 
-    unsigned clone_idx = vertices_.length - 2;
     for (const auto& l : child.obj.real_links)
     {
       clone->obj.real_links.push (l);
-      vertices_[l.objidx].add_parent (clone_idx);
+      vertices_[l.objidx].add_parent (clone_idx, false);
     }
     for (const auto& l : child.obj.virtual_links)
     {
       clone->obj.virtual_links.push (l);
-      vertices_[l.objidx].add_parent (clone_idx);
+      vertices_[l.objidx].add_parent (clone_idx, true);
     }
 
     check_success (!clone->obj.real_links.in_error ());
     check_success (!clone->obj.virtual_links.in_error ());
 
-    // The last object is the root of the graph, so swap back the root to the end.
-    // The root's obj idx does change, however since it's root nothing else refers to it.
-    // all other obj idx's will be unaffected.
-    hb_swap (vertices_[vertices_.length - 2], *clone);
-
-    // Since the root moved, update the parents arrays of all children on the root.
-    for (const auto& l : root ().obj.all_links ())
-      vertices_[l.objidx].remap_parent (root_idx () - 1, root_idx ());
-
     return clone_idx;
   }
 
-  /*
-   * Creates a copy of child and re-assigns the link from
-   * parent to the clone. The copy is a shallow copy, objects
-   * linked from child are not duplicated.
-   *
-   * Returns the index of the newly created duplicate.
-   *
-   * If the child_idx only has incoming edges from parent_idx, this
-   * will do nothing and return the original child_idx.
-   */
-  unsigned duplicate_if_shared (unsigned parent_idx, unsigned child_idx)
-  {
-    unsigned new_idx = duplicate (parent_idx, child_idx);
-    if (new_idx == (unsigned) -1) return child_idx;
-    return new_idx;
-  }
-
-
   /*
    * Creates a copy of child and re-assigns the link from
    * parent to the clone. The copy is a shallow copy, objects
@@ -1073,10 +1114,15 @@ struct graph_t
     const auto& child = vertices_[child_idx];
     unsigned links_to_child = child.incoming_edges_from_parent(parent_idx);
 
-    if (child.incoming_edges () <= links_to_child)
+    if (child.incoming_edges () <= links_to_child || child.has_incoming_virtual_edges())
     {
       // Can't duplicate this node, doing so would orphan the original one as all remaining links
       // to child are from parent.
+      //
+      // We don't allow duplication of nodes with incoming virtual edges because we don't track
+      // the number of virtual vs real incoming edges. As a result we can't tell if a node
+      // with virtual edges may end up orphaned by duplication (ie. where one copy is only pointed
+      // to by virtual edges).
       DEBUG_MSG (SUBSET_REPACK, nullptr, "  Not duplicating %u => %u",
                  parent_idx, child_idx);
       return -1;
@@ -1091,12 +1137,15 @@ struct graph_t
     if (parent_idx == clone_idx) parent_idx++;
 
     auto& parent = vertices_[parent_idx];
+    unsigned count = 0;
+    unsigned num_real = parent.obj.real_links.length;
     for (auto& l : parent.obj.all_links_writer ())
     {
+      count++;
       if (l.objidx != child_idx)
         continue;
 
-      reassign_link (l, parent_idx, clone_idx);
+      reassign_link (l, parent_idx, clone_idx, count > num_real);
     }
 
     return clone_idx;
@@ -1129,10 +1178,15 @@ struct graph_t
       links_to_child += child.incoming_edges_from_parent(parent_idx);
     }
 
-    if (child.incoming_edges () <= links_to_child)
+    if (child.incoming_edges () <= links_to_child || child.has_incoming_virtual_edges())
     {
       // Can't duplicate this node, doing so would orphan the original one as all remaining links
       // to child are from parent.
+      //
+      // We don't allow duplication of nodes with incoming virtual edges because we don't track
+      // the number of virtual vs real incoming edges. As a result we can't tell if a node
+      // with virtual edges may end up orphaned by duplication (ie. where one copy is only pointed
+      // to by virtual edges).
       DEBUG_MSG (SUBSET_REPACK, nullptr, "  Not duplicating %u, ..., %u => %u", first_parent, last_parent, child_idx);
       return -1;
     }
@@ -1146,12 +1200,15 @@ struct graph_t
       // duplicate shifts the root node idx, so if parent_idx was root update it.
       if (parent_idx == clone_idx) parent_idx++;
       auto& parent = vertices_[parent_idx];
+      unsigned count = 0;
+      unsigned num_real = parent.obj.real_links.length;
       for (auto& l : parent.obj.all_links_writer ())
       {
+        count++;
         if (l.objidx != child_idx)
           continue;
 
-        reassign_link (l, parent_idx, clone_idx);
+        reassign_link (l, parent_idx, clone_idx, count > num_real);
       }
     }
 
@@ -1168,7 +1225,10 @@ struct graph_t
     distance_invalid = true;
 
     auto* clone = vertices_.push ();
-    if (vertices_.in_error ()) {
+    unsigned clone_idx = vertices_.length - 1;
+    ordering_.push(clone_idx);
+
+    if (vertices_.in_error () || ordering_.in_error()) {
       return -1;
     }
 
@@ -1177,20 +1237,37 @@ struct graph_t
     clone->distance = 0;
     clone->space = 0;
 
-    unsigned clone_idx = vertices_.length - 2;
-
-    // The last object is the root of the graph, so swap back the root to the end.
-    // The root's obj idx does change, however since it's root nothing else refers to it.
-    // all other obj idx's will be unaffected.
-    hb_swap (vertices_[vertices_.length - 2], *clone);
-
-    // Since the root moved, update the parents arrays of all children on the root.
-    for (const auto& l : root ().obj.all_links ())
-      vertices_[l.objidx].remap_parent (root_idx () - 1, root_idx ());
-
     return clone_idx;
   }
 
+  /*
+   * Creates a new child node and remap the old child to it.
+   *
+   * Returns the index of the newly created child.
+   *
+   */
+  unsigned remap_child (unsigned parent_idx, unsigned old_child_idx)
+  {
+    unsigned new_child_idx = duplicate (old_child_idx);
+    if (new_child_idx == (unsigned) -1) return -1;
+
+    auto& parent = vertices_[parent_idx];
+    for (auto& l : parent.obj.real_links)
+    {
+      if (l.objidx != old_child_idx)
+        continue;
+      reassign_link (l, parent_idx, new_child_idx, false);
+    }
+
+    for (auto& l : parent.obj.virtual_links)
+    {
+      if (l.objidx != old_child_idx)
+        continue;
+      reassign_link (l, parent_idx, new_child_idx, true);
+    }
+    return new_child_idx;
+  }
+
   /*
    * Raises the sorting priority of all children.
    */
@@ -1279,6 +1356,7 @@ struct graph_t
     if (!DEBUG_ENABLED(SUBSET_REPACK)) return;
 
     DEBUG_MSG (SUBSET_REPACK, nullptr, "Graph is not fully connected.");
+
     parents_invalid = true;
     update_parents();
 
@@ -1348,7 +1426,8 @@ struct graph_t
     size_t total_size = 0;
     unsigned count = vertices_.length;
     for (unsigned i = 0; i < count; i++) {
-      size_t size = vertices_.arrayZ[i].obj.tail - vertices_.arrayZ[i].obj.head;
+      const auto& obj = vertices_.arrayZ[i].obj;
+      size_t size = obj.tail - obj.head;
       total_size += size;
     }
     return total_size;
@@ -1398,8 +1477,11 @@ struct graph_t
 
     for (unsigned p = 0; p < count; p++)
     {
-      for (auto& l : vertices_.arrayZ[p].obj.all_links ())
-        vertices_[l.objidx].add_parent (p);
+      for (auto& l : vertices_.arrayZ[p].obj.real_links)
+        vertices_[l.objidx].add_parent (p, false);
+
+      for (auto& l : vertices_.arrayZ[p].obj.virtual_links)
+        vertices_[l.objidx].add_parent (p, true);
     }
 
     for (unsigned i = 0; i < count; i++)
@@ -1418,7 +1500,7 @@ struct graph_t
     if (!positions_invalid) return;
 
     unsigned current_pos = 0;
-    for (int i = root_idx (); i >= 0; i--)
+    for (unsigned i : ordering_)
     {
       auto& v = vertices_[i];
       v.start = current_pos;
@@ -1450,11 +1532,11 @@ struct graph_t
     unsigned count = vertices_.length;
     for (unsigned i = 0; i < count; i++)
       vertices_.arrayZ[i].distance = hb_int_max (int64_t);
-    vertices_.tail ().distance = 0;
+    vertices_[root_idx ()].distance = 0;
 
     hb_priority_queue_t<int64_t> queue;
     queue.alloc (count);
-    queue.insert (0, vertices_.length - 1);
+    queue.insert (0, root_idx ());
 
     hb_vector_t<bool> visited;
     visited.resize (vertices_.length);
@@ -1464,22 +1546,23 @@ struct graph_t
       unsigned next_idx = queue.pop_minimum ().second;
       if (visited[next_idx]) continue;
       const auto& next = vertices_[next_idx];
-      int64_t next_distance = vertices_[next_idx].distance;
+      int64_t next_distance = next.distance;
       visited[next_idx] = true;
 
       for (const auto& link : next.obj.all_links ())
       {
         if (visited[link.objidx]) continue;
 
-        const auto& child = vertices_.arrayZ[link.objidx].obj;
+        auto& child_v = vertices_.arrayZ[link.objidx];
+        const auto& child = child_v.obj;
         unsigned link_width = link.width ? link.width : 4; // treat virtual offsets as 32 bits wide
         int64_t child_weight = (child.tail - child.head) +
-                               ((int64_t) 1 << (link_width * 8)) * (vertices_.arrayZ[link.objidx].space + 1);
+                               ((int64_t) 1 << (link_width * 8)) * (child_v.space + 1);
         int64_t child_distance = next_distance + child_weight;
 
-        if (child_distance < vertices_.arrayZ[link.objidx].distance)
+        if (child_distance < child_v.distance)
         {
-          vertices_.arrayZ[link.objidx].distance = child_distance;
+          child_v.distance = child_distance;
           queue.insert (child_distance, link.objidx);
         }
       }
@@ -1502,12 +1585,13 @@ struct graph_t
    */
   void reassign_link (hb_serialize_context_t::object_t::link_t& link,
                       unsigned parent_idx,
-                      unsigned new_idx)
+                      unsigned new_idx,
+                      bool is_virtual)
   {
     unsigned old_idx = link.objidx;
     link.objidx = new_idx;
     vertices_[old_idx].remove_parent (parent_idx);
-    vertices_[new_idx].add_parent (parent_idx);
+    vertices_[new_idx].add_parent (parent_idx, is_virtual);
   }
 
   /*
@@ -1521,36 +1605,21 @@ struct graph_t
     if (!id_map) return;
     for (unsigned i : subgraph)
     {
-      for (auto& link : vertices_[i].obj.all_links_writer ())
+      auto& obj = vertices_[i].obj;
+      unsigned num_real = obj.real_links.length;
+      unsigned count = 0;
+      for (auto& link : obj.all_links_writer ())
       {
+        count++;
         const uint32_t *v;
         if (!id_map.has (link.objidx, &v)) continue;
-        if (only_wide && !(link.width == 4 && !link.is_signed)) continue;
+        if (only_wide && (link.is_signed || (link.width != 4 && link.width != 3))) continue;
 
-        reassign_link (link, i, *v);
+        reassign_link (link, i, *v, count > num_real);
       }
     }
   }
 
-  /*
-   * Updates all objidx's in all links using the provided mapping.
-   */
-  bool remap_all_obj_indices (const hb_vector_t<unsigned>& id_map,
-                              hb_vector_t<vertex_t>* sorted_graph) const
-  {
-    unsigned count = sorted_graph->length;
-    for (unsigned i = 0; i < count; i++)
-    {
-      if (!(*sorted_graph)[i].remap_parents (id_map))
-        return false;
-      for (auto& link : sorted_graph->arrayZ[i].obj.all_links_writer ())
-      {
-        link.objidx = id_map[link.objidx];
-      }
-    }
-    return true;
-  }
-
   /*
    * Finds all nodes in targets that are reachable from start_idx, nodes in visited will be skipped.
    * For this search the graph is treated as being undirected.
@@ -1586,7 +1655,16 @@ struct graph_t
  public:
   // TODO(garretrieger): make private, will need to move most of offset overflow code into graph.
   hb_vector_t<vertex_t> vertices_;
-  hb_vector_t<vertex_t> vertices_scratch_;
+
+  // Specifies the current topological ordering of this graph
+  //
+  // ordering_[pos] = obj index
+  //
+  // specifies that the 'pos'th spot is filled by the object
+  // given by obj index.
+  hb_vector_t<unsigned> ordering_;
+  hb_vector_t<unsigned> ordering_scratch_;
+
  private:
   bool parents_invalid;
   bool distance_invalid;
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh
index b25d538fe3d..8969d007879 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-context.hh
@@ -41,6 +41,7 @@ struct gsubgpos_graph_context_t
   unsigned lookup_list_index;
   hb_hashmap_t<unsigned, graph::Lookup*> lookups;
   hb_hashmap_t<unsigned, unsigned> subtable_to_extension;
+  hb_hashmap_t<unsigned, hb_vector_t<unsigned>> split_subtables;
 
   HB_INTERNAL gsubgpos_graph_context_t (hb_tag_t table_tag_,
                                         graph_t& graph_);
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh
index 7ad2ba430b7..ea6bcd239a0 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh
@@ -27,9 +27,11 @@
 #include "graph.hh"
 #include "../hb-ot-layout-gsubgpos.hh"
 #include "../OT/Layout/GSUB/ExtensionSubst.hh"
+#include "../OT/Layout/GSUB/SubstLookupSubTable.hh"
 #include "gsubgpos-context.hh"
 #include "pairpos-graph.hh"
 #include "markbasepos-graph.hh"
+#include "ligature-graph.hh"
 
 #ifndef GRAPH_GSUBGPOS_GRAPH_HH
 #define GRAPH_GSUBGPOS_GRAPH_HH
@@ -85,6 +87,12 @@ struct Lookup : public OT::Lookup
     return lookupType == extension_type (table_tag);
   }
 
+  bool use_mark_filtering_set () const
+  {
+    unsigned flag = lookupFlag;
+    return flag & 0x0010u;
+  }
+
   bool make_extension (gsubgpos_graph_context_t& c,
                        unsigned this_index)
   {
@@ -120,22 +128,18 @@ struct Lookup : public OT::Lookup
     unsigned type = lookupType;
     bool is_ext = is_extension (c.table_tag);
 
-    if (c.table_tag != HB_OT_TAG_GPOS)
+    if (c.table_tag != HB_OT_TAG_GPOS && c.table_tag != HB_OT_TAG_GSUB)
       return true;
 
-    if (!is_ext &&
-        type != OT::Layout::GPOS_impl::PosLookupSubTable::Type::Pair &&
-        type != OT::Layout::GPOS_impl::PosLookupSubTable::Type::MarkBase)
+    if (!is_ext && !is_supported_gpos_type(type, c) && !is_supported_gsub_type(type, c))
       return true;
 
     hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>> all_new_subtables;
     for (unsigned i = 0; i < subTable.len; i++)
     {
       unsigned subtable_index = c.graph.index_for_offset (this_index, &subTable[i]);
-      unsigned parent_index = this_index;
       if (is_ext) {
         unsigned ext_subtable_index = subtable_index;
-        parent_index = ext_subtable_index;
         ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>* extension =
             (ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>*)
             c.graph.object (ext_subtable_index).head;
@@ -144,26 +148,47 @@ struct Lookup : public OT::Lookup
 
         subtable_index = extension->get_subtable_index (c.graph, ext_subtable_index);
         type = extension->get_lookup_type ();
-        if (type != OT::Layout::GPOS_impl::PosLookupSubTable::Type::Pair
-            && type != OT::Layout::GPOS_impl::PosLookupSubTable::Type::MarkBase)
+        if (!is_supported_gpos_type(type, c) && !is_supported_gsub_type(type, c))
           continue;
       }
 
-      hb_vector_t<unsigned> new_sub_tables;
-      switch (type)
+      hb_vector_t<unsigned>* split_result;
+      if (c.split_subtables.has (subtable_index, &split_result))
       {
-      case 2:
-        new_sub_tables = split_subtable<PairPos> (c, parent_index, subtable_index); break;
-      case 4:
-        new_sub_tables = split_subtable<MarkBasePos> (c, parent_index, subtable_index); break;
-      default:
-        break;
+        if (split_result->length == 0)
+          continue;
+        all_new_subtables.push (hb_pair(i, *split_result));
+      }
+      else
+      {
+        hb_vector_t<unsigned> new_sub_tables;
+
+        if (c.table_tag == HB_OT_TAG_GPOS) {
+          switch (type)
+          {
+          case 2:
+            new_sub_tables = split_subtable<PairPos> (c, subtable_index); break;
+          case 4:
+            new_sub_tables = split_subtable<MarkBasePos> (c, subtable_index); break;
+          default:
+            break;
+          }
+        } else if (c.table_tag == HB_OT_TAG_GSUB) {
+          switch (type)
+          {
+          case 4:
+            new_sub_tables = split_subtable<graph::LigatureSubst> (c, subtable_index); break;
+          default:
+            break;
+          }
+        }
+
+        if (new_sub_tables.in_error ()) return false;
+
+        c.split_subtables.set (subtable_index, new_sub_tables);
+        if (new_sub_tables)
+          all_new_subtables.push (hb_pair (i, std::move (new_sub_tables)));
       }
-      if (new_sub_tables.in_error ()) return false;
-      if (!new_sub_tables) continue;
-      hb_pair_t<unsigned, hb_vector_t<unsigned>>* entry = all_new_subtables.push ();
-      entry->first = i;
-      entry->second = std::move (new_sub_tables);
     }
 
     if (all_new_subtables) {
@@ -175,30 +200,29 @@ struct Lookup : public OT::Lookup
 
   template<typename T>
   hb_vector_t<unsigned> split_subtable (gsubgpos_graph_context_t& c,
-                                        unsigned parent_idx,
                                         unsigned objidx)
   {
     T* sub_table = (T*) c.graph.object (objidx).head;
     if (!sub_table || !sub_table->sanitize (c.graph.vertices_[objidx]))
       return hb_vector_t<unsigned> ();
 
-    return sub_table->split_subtables (c, parent_idx, objidx);
+    return sub_table->split_subtables (c, objidx);
   }
 
   bool add_sub_tables (gsubgpos_graph_context_t& c,
                        unsigned this_index,
                        unsigned type,
-                       hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
+                       const hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
   {
     bool is_ext = is_extension (c.table_tag);
-    auto& v = c.graph.vertices_[this_index];
+    auto* v = &c.graph.vertices_[this_index];
     fix_existing_subtable_links (c, this_index, subtable_ids);
 
     unsigned new_subtable_count = 0;
     for (const auto& p : subtable_ids)
       new_subtable_count += p.second.length;
 
-    size_t new_size = v.table_size ()
+    size_t new_size = v->table_size ()
                       + new_subtable_count * OT::Offset16::static_size;
     char* buffer = (char*) hb_calloc (1, new_size);
     if (!buffer) return false;
@@ -207,10 +231,13 @@ struct Lookup : public OT::Lookup
       hb_free (buffer);
      return false;
     }
-    hb_memcpy (buffer, v.obj.head, v.table_size());
+    hb_memcpy (buffer, v->obj.head, v->table_size());
 
-    v.obj.head = buffer;
-    v.obj.tail = buffer + new_size;
+    if (use_mark_filtering_set ())
+      hb_memcpy (buffer + new_size - 2, v->obj.tail - 2, 2);
+
+    v->obj.head = buffer;
+    v->obj.tail = buffer + new_size;
 
     Lookup* new_lookup = (Lookup*) buffer;
 
@@ -226,21 +253,23 @@ struct Lookup : public OT::Lookup
         if (is_ext)
         {
           unsigned ext_id = create_extension_subtable (c, subtable_id, type);
-          c.graph.vertices_[subtable_id].add_parent (ext_id);
+          c.graph.vertices_[subtable_id].add_parent (ext_id, false);
           subtable_id = ext_id;
+          // the reference to v may have changed on adding a node, so reassign it.
+          v = &c.graph.vertices_[this_index];
         }
 
-        auto* link = v.obj.real_links.push ();
+        auto* link = v->obj.real_links.push ();
         link->width = 2;
         link->objidx = subtable_id;
         link->position = (char*) &new_lookup->subTable[offset_index++] -
                          (char*) new_lookup;
-        c.graph.vertices_[subtable_id].add_parent (this_index);
+        c.graph.vertices_[subtable_id].add_parent (this_index, false);
       }
     }
 
     // Repacker sort order depends on link order, which we've messed up so resort it.
-    v.obj.real_links.qsort ();
+    v->obj.real_links.qsort ();
 
     // The head location of the lookup has changed, invalidating the lookups map entry
     // in the context. Update the map.
@@ -250,17 +279,15 @@ struct Lookup : public OT::Lookup
 
   void fix_existing_subtable_links (gsubgpos_graph_context_t& c,
                                     unsigned this_index,
-                                    hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
+                                    const hb_vector_t<hb_pair_t<unsigned, hb_vector_t<unsigned>>>& subtable_ids)
   {
     auto& v = c.graph.vertices_[this_index];
-    Lookup* lookup = (Lookup*) v.obj.head;
-
     unsigned shift = 0;
     for (const auto& p : subtable_ids)
     {
       unsigned insert_index = p.first + shift;
       unsigned pos_offset = p.second.length * OT::Offset16::static_size;
-      unsigned insert_offset = (char*) &lookup->subTable[insert_index] - (char*) lookup;
+      unsigned insert_offset = Lookup::min_size + insert_index * OT::Offset16::static_size;
       shift += p.second.length;
 
       for (auto& l : v.obj.all_links_writer ())
@@ -326,7 +353,7 @@ struct Lookup : public OT::Lookup
 
     // Make extension point at the subtable.
     auto& ext_vertex = c.graph.vertices_[ext_index];
-    ext_vertex.add_parent (lookup_index);
+    ext_vertex.add_parent (lookup_index, false);
     if (!existing_ext_index)
       subtable_vertex.remap_parent (lookup_index, ext_index);
 
@@ -334,6 +361,19 @@ struct Lookup : public OT::Lookup
   }
 
  private:
+  bool is_supported_gsub_type(unsigned type, gsubgpos_graph_context_t& c) const {
+    return (c.table_tag == HB_OT_TAG_GSUB) && (
+      type == OT::Layout::GSUB_impl::SubstLookupSubTable::Type::Ligature
+    );
+  }
+
+  bool is_supported_gpos_type(unsigned type, gsubgpos_graph_context_t& c) const {
+   return (c.table_tag == HB_OT_TAG_GPOS) && (
+      type == OT::Layout::GPOS_impl::PosLookupSubTable::Type::Pair ||
+      type == OT::Layout::GPOS_impl::PosLookupSubTable::Type::MarkBase
+    );
+  }
+
   unsigned extension_type (hb_tag_t table_tag) const
   {
     switch (table_tag)
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh
index fb4166128a9..6d1a3d4ae4b 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh
@@ -212,7 +212,6 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
-                                         unsigned parent_index,
                                          unsigned this_index)
   {
     hb_set_t visited;
@@ -265,7 +264,7 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
     split_context_t split_context {
       c,
       this,
-      c.graph.duplicate_if_shared (parent_index, this_index),
+      this_index,
       std::move (class_to_info),
       c.graph.vertices_[mark_array_id].position_to_index_map (),
     };
@@ -478,12 +477,11 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
 struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos
 {
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
-                                         unsigned parent_index,
                                          unsigned this_index)
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1:
-      return ((MarkBasePosFormat1*)(&u.format1))->split_subtables (c, parent_index, this_index);
+      return ((MarkBasePosFormat1*)(&u.format1))->split_subtables (c, this_index);
 #ifndef HB_NO_BEYOND_64K
     case 2: HB_FALLTHROUGH;
       // Don't split 24bit MarkBasePos's.
@@ -496,10 +494,10 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos
   bool sanitize (graph_t::vertex_t& vertex) const
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    if (vertex_len < u.format.get_size ()) return false;
+    if (vertex_len < u.format.v.get_size ()) return false;
     hb_barrier ();
 
-    switch (u.format) {
+    switch (u.format.v) {
     case 1:
       return ((MarkBasePosFormat1*)(&u.format1))->sanitize (vertex);
 #ifndef HB_NO_BEYOND_64K
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh
index fd46861de46..85950b63457 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh
@@ -49,7 +49,6 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3<SmallType
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
-                                         unsigned parent_index,
                                          unsigned this_index)
   {
     hb_set_t visited;
@@ -84,7 +83,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3<SmallType
     split_context_t split_context {
       c,
       this,
-      c.graph.duplicate_if_shared (parent_index, this_index),
+      this_index,
     };
 
     return actuate_subtable_split<split_context_t> (split_context, split_points);
@@ -207,7 +206,6 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
   }
 
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
-                                         unsigned parent_index,
                                          unsigned this_index)
   {
     const unsigned base_size = OT::Layout::GPOS_impl::PairPosFormat2_4<SmallTypes>::min_size;
@@ -291,7 +289,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
     split_context_t split_context {
       c,
       this,
-      c.graph.duplicate_if_shared (parent_index, this_index),
+      this_index,
       class1_record_size,
       total_value_len,
       value_1_len,
@@ -423,7 +421,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
     class_def_link->width = SmallTypes::size;
     class_def_link->objidx = class_def_2_id;
     class_def_link->position = 10;
-    graph.vertices_[class_def_2_id].add_parent (pair_pos_prime_id);
+    graph.vertices_[class_def_2_id].add_parent (pair_pos_prime_id, false);
     graph.duplicate (pair_pos_prime_id, class_def_2_id);
 
     return pair_pos_prime_id;
@@ -607,14 +605,13 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
 struct PairPos : public OT::Layout::GPOS_impl::PairPos
 {
   hb_vector_t<unsigned> split_subtables (gsubgpos_graph_context_t& c,
-                                         unsigned parent_index,
                                          unsigned this_index)
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1:
-      return ((PairPosFormat1*)(&u.format1))->split_subtables (c, parent_index, this_index);
+      return ((PairPosFormat1*)(&u.format1))->split_subtables (c, this_index);
     case 2:
-      return ((PairPosFormat2*)(&u.format2))->split_subtables (c, parent_index, this_index);
+      return ((PairPosFormat2*)(&u.format2))->split_subtables (c, this_index);
 #ifndef HB_NO_BEYOND_64K
     case 3: HB_FALLTHROUGH;
     case 4: HB_FALLTHROUGH;
@@ -628,10 +625,10 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos
   bool sanitize (graph_t::vertex_t& vertex) const
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
-    if (vertex_len < u.format.get_size ()) return false;
+    if (vertex_len < u.format.v.get_size ()) return false;
     hb_barrier ();
 
-    switch (u.format) {
+    switch (u.format.v) {
     case 1:
       return ((PairPosFormat1*)(&u.format1))->sanitize (vertex);
     case 2:
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh b/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh
index 06e4bf44d8e..37fac8909e5 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/serialize.hh
@@ -113,7 +113,7 @@ will_overflow (graph_t& graph,
 
   hb_hashmap_t<overflow_record_t*, bool> record_set;
   const auto& vertices = graph.vertices_;
-  for (int parent_idx = vertices.length - 1; parent_idx >= 0; parent_idx--)
+  for (unsigned parent_idx : graph.ordering_)
   {
     // Don't need to check virtual links for overflow
     for (const auto& link : vertices.arrayZ[parent_idx].obj.real_links)
@@ -172,14 +172,16 @@ void print_overflows (graph_t& graph,
 template <typename O> inline void
 serialize_link_of_type (const hb_serialize_context_t::object_t::link_t& link,
                         char* head,
+                        unsigned size,
+                        const hb_vector_t<unsigned>& id_map,
                         hb_serialize_context_t* c)
 {
+  assert(link.position + link.width <= size);
+
   OT::Offset<O>* offset = reinterpret_cast<OT::Offset<O>*> (head + link.position);
   *offset = 0;
   c->add_link (*offset,
-               // serializer has an extra nil object at the start of the
-               // object array. So all id's are +1 of what our id's are.
-               link.objidx + 1,
+               id_map[link.objidx],
                (hb_serialize_context_t::whence_t) link.whence,
                link.bias);
 }
@@ -187,6 +189,8 @@ serialize_link_of_type (const hb_serialize_context_t::object_t::link_t& link,
 inline
 void serialize_link (const hb_serialize_context_t::object_t::link_t& link,
                      char* head,
+                     unsigned size,
+                     const hb_vector_t<unsigned>& id_map,
                      hb_serialize_context_t* c)
 {
   switch (link.width)
@@ -197,21 +201,21 @@ void serialize_link (const hb_serialize_context_t::object_t::link_t& link,
     case 4:
       if (link.is_signed)
       {
-        serialize_link_of_type<OT::HBINT32> (link, head, c);
+        serialize_link_of_type<OT::HBINT32> (link, head, size, id_map, c);
       } else {
-        serialize_link_of_type<OT::HBUINT32> (link, head, c);
+        serialize_link_of_type<OT::HBUINT32> (link, head, size, id_map, c);
       }
       return;
     case 2:
       if (link.is_signed)
       {
-        serialize_link_of_type<OT::HBINT16> (link, head, c);
+        serialize_link_of_type<OT::HBINT16> (link, head, size, id_map, c);
       } else {
-        serialize_link_of_type<OT::HBUINT16> (link, head, c);
+        serialize_link_of_type<OT::HBUINT16> (link, head, size, id_map, c);
       }
       return;
     case 3:
-      serialize_link_of_type<OT::HBUINT24> (link, head, c);
+      serialize_link_of_type<OT::HBUINT24> (link, head, size, id_map, c);
       return;
     default:
       // Unexpected link width.
@@ -237,25 +241,36 @@ inline hb_blob_t* serialize (const graph_t& graph)
 
   c.start_serialize<void> ();
   const auto& vertices = graph.vertices_;
-  for (unsigned i = 0; i < vertices.length; i++) {
+
+  // Objects are placed in the serializer in reverse order since children need
+  // to be inserted before their parents.
+
+  // Maps from our obj id's to the id's used during this serialization.
+  hb_vector_t<unsigned> id_map;
+  id_map.resize(graph.ordering_.length);
+  for (int pos = graph.ordering_.length - 1; pos >= 0; pos--) {
+    unsigned i = graph.ordering_[pos];
     c.push ();
 
-    size_t size = vertices[i].obj.tail - vertices[i].obj.head;
+    auto& v = vertices[i];
+
+    size_t size = v.obj.tail - v.obj.head;
+
     char* start = c.allocate_size <char> (size);
     if (!start) {
       DEBUG_MSG (SUBSET_REPACK, nullptr, "Buffer out of space.");
       return nullptr;
     }
 
-    hb_memcpy (start, vertices[i].obj.head, size);
+    hb_memcpy (start, v.obj.head, size);
 
     // Only real links needs to be serialized.
-    for (const auto& link : vertices[i].obj.real_links)
-      serialize_link (link, start, &c);
+    for (const auto& link : v.obj.real_links)
+      serialize_link (link, start, size, id_map, &c);
 
     // All duplications are already encoded in the graph, so don't
     // enable sharing during packing.
-    c.pop_pack (false);
+    id_map[i] = c.pop_pack (false);
   }
   c.end_serialize ();
 
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh b/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh
index 61fd7c2d2ff..f1f86e332db 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/split-helpers.hh
@@ -49,7 +49,7 @@ hb_vector_t<unsigned> actuate_subtable_split (Context& split_context,
     if (id == (unsigned) -1)
     {
       new_objects.reset ();
-      new_objects.allocated = -1; // mark error
+      new_objects.ensure_error ();
       return new_objects;
     }
     new_objects.push (id);
@@ -58,7 +58,7 @@ hb_vector_t<unsigned> actuate_subtable_split (Context& split_context,
   if (!split_context.shrink (split_points[0]))
   {
     new_objects.reset ();
-    new_objects.allocated = -1; // mark error
+    new_objects.ensure_error ();
   }
 
   return new_objects;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh
index d5a44bf473c..d2ce32616be 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh
@@ -47,8 +47,7 @@ using namespace OT;
 
 struct ankr;
 
-using hb_aat_class_cache_t = hb_cache_t<15, 8, 7>;
-static_assert (sizeof (hb_aat_class_cache_t) == 256, "");
+using hb_aat_class_cache_t = hb_ot_layout_mapping_cache_t;
 
 struct hb_aat_scratch_t
 {
@@ -79,7 +78,10 @@ struct hb_aat_scratch_t
   {
     hb_bit_set_t *s = buffer_glyph_set.get_acquire ();
     if (s && buffer_glyph_set.cmpexch (s, nullptr))
+    {
+      s->clear ();
       return s;
+    }
 
     s = (hb_bit_set_t *) hb_calloc (1, sizeof (hb_bit_set_t));
     if (unlikely (!s))
@@ -124,13 +126,14 @@ struct hb_aat_apply_context_t :
   const OT::GDEF &gdef;
   bool has_glyph_classes;
   const hb_sorted_vector_t<hb_aat_map_t::range_flags_t> *range_flags = nullptr;
+  hb_mask_t subtable_flags = 0;
+  bool buffer_is_reversed = false;
+  // Caches
   bool using_buffer_glyph_set = false;
   hb_bit_set_t *buffer_glyph_set = nullptr;
-  const hb_bit_set_t *left_set = nullptr;
-  const hb_bit_set_t *right_set = nullptr;
-  const hb_bit_set_t *machine_glyph_set = nullptr;
+  const hb_bit_set_t *first_set = nullptr;
+  const hb_bit_set_t *second_set = nullptr;
   hb_aat_class_cache_t *machine_class_cache = nullptr;
-  hb_mask_t subtable_flags = 0;
 
   /* Unused. For debug tracing only. */
   unsigned int lookup_index;
@@ -146,6 +149,12 @@ struct hb_aat_apply_context_t :
 
   void set_lookup_index (unsigned int i) { lookup_index = i; }
 
+  void reverse_buffer ()
+  {
+    buffer->reverse ();
+    buffer_is_reversed = !buffer_is_reversed;
+  }
+
   void setup_buffer_glyph_set ()
   {
     using_buffer_glyph_set = buffer->len >= 4 && buffer_glyph_set;
@@ -156,11 +165,11 @@ struct hb_aat_apply_context_t :
   bool buffer_intersects_machine () const
   {
     if (likely (using_buffer_glyph_set))
-      return buffer_glyph_set->intersects (*machine_glyph_set);
+      return buffer_glyph_set->intersects (*first_set);
 
     // Faster for shorter buffers.
     for (unsigned i = 0; i < buffer->len; i++)
-      if (machine_glyph_set->has (buffer->info[i].codepoint))
+      if (first_set->has (buffer->info[i].codepoint))
         return true;
     return false;
   }
@@ -639,6 +648,23 @@ struct LookupFormat10
     glyphs.add_range (firstGlyph, firstGlyph + glyphCount - 1);
   }
 
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
+    const HBUINT8 *p = valueArrayZ.arrayZ;
+    for (unsigned i = 0; i < glyphCount; i++)
+    {
+      unsigned int v = 0;
+      unsigned int count = valueSize;
+      for (unsigned int j = 0; j < count; j++)
+        v = (v << 8) | *p++;
+      if (filter (v))
+        glyphs.add (firstGlyph + i);
+    }
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -666,7 +692,7 @@ struct Lookup
 {
   const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return u.format0.get_value (glyph_id, num_glyphs);
     case 2: hb_barrier (); return u.format2.get_value (glyph_id);
     case 4: hb_barrier (); return u.format4.get_value (glyph_id);
@@ -678,7 +704,7 @@ struct Lookup
 
   const typename T::type get_value_or_null (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
       /* Format 10 cannot return a pointer. */
       case 10: hb_barrier (); return u.format10.get_value_or_null (glyph_id);
       default:
@@ -690,7 +716,7 @@ struct Lookup
   template <typename set_t>
   void collect_glyphs (set_t &glyphs, unsigned int num_glyphs) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); u.format0.collect_glyphs (glyphs, num_glyphs); return;
     case 2: hb_barrier (); u.format2.collect_glyphs (glyphs); return;
     case 4: hb_barrier (); u.format4.collect_glyphs (glyphs); return;
@@ -703,12 +729,13 @@ struct Lookup
   template <typename set_t, typename filter_t>
   void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); u.format0.collect_glyphs_filtered (glyphs, num_glyphs, filter); return;
     case 2: hb_barrier (); u.format2.collect_glyphs_filtered (glyphs, filter); return;
     case 4: hb_barrier (); u.format4.collect_glyphs_filtered (glyphs, filter); return;
     case 6: hb_barrier (); u.format6.collect_glyphs_filtered (glyphs, filter); return;
     case 8: hb_barrier (); u.format8.collect_glyphs_filtered (glyphs, filter); return;
+    case 10: hb_barrier (); u.format10.collect_glyphs_filtered (glyphs, filter); return;
     default:return;
     }
   }
@@ -724,9 +751,9 @@ struct Lookup
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
     case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
@@ -739,9 +766,9 @@ struct Lookup
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return_trace (u.format0.sanitize (c, base));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c, base));
     case 4: hb_barrier (); return_trace (u.format4.sanitize (c, base));
@@ -754,7 +781,7 @@ struct Lookup
 
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   LookupFormat0<T>      format0;
   LookupFormat2<T>      format2;
   LookupFormat4<T>      format4;
@@ -763,7 +790,7 @@ struct Lookup
   LookupFormat10<T>     format10;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 2);
 
@@ -838,11 +865,6 @@ struct StateTable
     STATE_START_OF_LINE = 1,
   };
 
-  template <typename set_t>
-  void collect_glyphs (set_t &glyphs, unsigned num_glyphs) const
-  {
-    (this+classTable).collect_glyphs (glyphs, num_glyphs);
-  }
   template <typename set_t, typename table_t>
   void collect_initial_glyphs (set_t &glyphs, unsigned num_glyphs, const table_t &table) const
   {
@@ -1082,6 +1104,8 @@ struct SubtableGlyphCoverage
     for (unsigned i = 0; i < subtable_count; i++)
     {
       uint32_t offset = (uint32_t) subtableOffsets[i];
+      // A font file called SFNSDisplay.ttf has value 0xFFFFFFFF in the offsets.
+      // Just ignore it.
       if (offset == 0 || offset == 0xFFFFFFFF)
         continue;
       if (unlikely (!subtableOffsets[i].sanitize (c, this, bytes)))
@@ -1192,11 +1216,24 @@ struct StateTableDriver
     int state = StateTableT::STATE_START_OF_TEXT;
     // If there's only one range, we already checked the flag.
     auto *last_range = ac->range_flags && (ac->range_flags->length > 1) ? &(*ac->range_flags)[0] : nullptr;
+    const bool start_state_safe_to_break_eot =
+      !c->table->is_actionable (machine.get_entry (StateTableT::STATE_START_OF_TEXT, CLASS_END_OF_TEXT));
     for (buffer->idx = 0; buffer->successful;)
     {
-      /* This block is copied in NoncontextualSubtable::apply. Keep in sync. */
-      if (last_range)
+      unsigned int klass = likely (buffer->idx < buffer->len) ?
+                           machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
+                           (unsigned) CLASS_END_OF_TEXT;
+    resume:
+      DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx);
+      const EntryT &entry = machine.get_entry (state, klass);
+      const int next_state = machine.new_state (entry.newState);
+
+      bool is_not_epsilon_transition = !(entry.flags & Flags::DontAdvance);
+      bool is_not_actionable = !c->table->is_actionable (entry);
+
+      if (unlikely (last_range))
       {
+        /* This block is copied in NoncontextualSubtable::apply. Keep in sync. */
         auto *range = last_range;
         if (buffer->idx < buffer->len)
         {
@@ -1211,7 +1248,7 @@ struct StateTableDriver
         }
         if (!(range->flags & ac->subtable_flags))
         {
-          if (buffer->idx == buffer->len || unlikely (!buffer->successful))
+          if (buffer->idx == buffer->len)
             break;
 
           state = StateTableT::STATE_START_OF_TEXT;
@@ -1219,13 +1256,42 @@ struct StateTableDriver
           continue;
         }
       }
+      else
+      {
+        // Fast path for when transitioning from start-state to start-state with
+        // no action and advancing. Do so as long as the class remains the same.
+        // This is common with runs of non-actionable glyphs.
 
-      unsigned int klass = likely (buffer->idx < buffer->len) ?
-                           machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
-                           (unsigned) CLASS_END_OF_TEXT;
-      DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx);
-      const EntryT &entry = machine.get_entry (state, klass);
-      const int next_state = machine.new_state (entry.newState);
+        bool is_null_transition = state == StateTableT::STATE_START_OF_TEXT &&
+                                  next_state == StateTableT::STATE_START_OF_TEXT &&
+                                  start_state_safe_to_break_eot &&
+                                  is_not_actionable &&
+                                  is_not_epsilon_transition &&
+                                  !last_range;
+
+        if (is_null_transition)
+        {
+          unsigned old_klass = klass;
+          do
+          {
+            c->transition (buffer, this, entry);
+
+            if (buffer->idx == buffer->len || !buffer->successful)
+              break;
+
+            (void) buffer->next_glyph ();
+
+            klass = likely (buffer->idx < buffer->len) ?
+                     machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
+                     (unsigned) CLASS_END_OF_TEXT;
+          } while (klass == old_klass);
+
+          if (buffer->idx == buffer->len || !buffer->successful)
+            break;
+
+          goto resume;
+        }
+      }
 
       /* Conditions under which it's guaranteed safe-to-break before current glyph:
        *
@@ -1292,10 +1358,10 @@ struct StateTableDriver
       state = next_state;
       DEBUG_MSG (APPLY, nullptr, "s%d", state);
 
-      if (buffer->idx == buffer->len || unlikely (!buffer->successful))
+      if (buffer->idx == buffer->len)
         break;
 
-      if (!(entry.flags & Flags::DontAdvance) || buffer->max_ops-- <= 0)
+      if (is_not_epsilon_transition || buffer->max_ops-- <= 0)
         (void) buffer->next_glyph ();
     }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh
index ca4f2243346..2a6b813972f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh
@@ -120,12 +120,12 @@ struct KerxSubTableFormat0
   }
 
   template <typename set_t>
-  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  void collect_glyphs (set_t &first_set, set_t &second_set, unsigned num_glyphs) const
   {
     for (const KernPair& pair : pairs)
     {
-      left_set.add (pair.left);
-      right_set.add (pair.right);
+      first_set.add (pair.left);
+      second_set.add (pair.right);
     }
   }
 
@@ -140,7 +140,7 @@ struct KerxSubTableFormat0
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     {
-      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
+      if (!(*c->first_set)[left] || !(*c->second_set)[right]) return 0;
       return table.get_kerning (left, right, c);
     }
   };
@@ -396,10 +396,10 @@ struct KerxSubTableFormat1
   }
 
   template <typename set_t>
-  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  void collect_glyphs (set_t &first_set, set_t &second_set, unsigned num_glyphs) const
   {
-    machine.collect_initial_glyphs (left_set, num_glyphs, *this);
-    //machine.collect_glyphs (right_set, num_glyphs); // right_set is unused for machine kerning
+    machine.collect_initial_glyphs (first_set, num_glyphs, *this);
+    //machine.collect_glyphs (second_set, num_glyphs); // second_set is unused for machine kerning
   }
 
   protected:
@@ -451,10 +451,10 @@ struct KerxSubTableFormat2
   }
 
   template <typename set_t>
-  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  void collect_glyphs (set_t &first_set, set_t &second_set, unsigned num_glyphs) const
   {
-    (this+leftClassTable).collect_glyphs (left_set, num_glyphs);
-    (this+rightClassTable).collect_glyphs (right_set, num_glyphs);
+    (this+leftClassTable).collect_glyphs (first_set, num_glyphs);
+    (this+rightClassTable).collect_glyphs (second_set, num_glyphs);
   }
 
   struct accelerator_t
@@ -468,7 +468,7 @@ struct KerxSubTableFormat2
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     {
-      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
+      if (!(*c->first_set)[left] || !(*c->second_set)[right]) return 0;
       return table.get_kerning (left, right, c);
     }
   };
@@ -629,6 +629,8 @@ struct KerxSubTableFormat4
         }
         o.attach_type() = OT::Layout::GPOS_impl::ATTACH_TYPE_MARK;
         o.attach_chain() = (int) mark - (int) buffer->idx;
+        if (c->buffer_is_reversed)
+          o.attach_chain() = -o.attach_chain();
         buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT;
       }
 
@@ -671,10 +673,10 @@ struct KerxSubTableFormat4
   }
 
   template <typename set_t>
-  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  void collect_glyphs (set_t &first_set, set_t &second_set, unsigned num_glyphs) const
   {
-    machine.collect_initial_glyphs (left_set, num_glyphs, *this);
-    //machine.collect_glyphs (right_set, num_glyphs); // right_set is unused for machine kerning
+    machine.collect_initial_glyphs (first_set, num_glyphs, *this);
+    //machine.collect_glyphs (second_set, num_glyphs); // second_set is unused for machine kerning
   }
 
   protected:
@@ -762,19 +764,19 @@ struct KerxSubTableFormat6
   }
 
   template <typename set_t>
-  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  void collect_glyphs (set_t &first_set, set_t &second_set, unsigned num_glyphs) const
   {
     if (is_long ())
     {
       const auto &t = u.l;
-      (this+t.rowIndexTable).collect_glyphs (left_set, num_glyphs);
-      (this+t.columnIndexTable).collect_glyphs (right_set, num_glyphs);
+      (this+t.rowIndexTable).collect_glyphs (first_set, num_glyphs);
+      (this+t.columnIndexTable).collect_glyphs (second_set, num_glyphs);
     }
     else
     {
       const auto &t = u.s;
-      (this+t.rowIndexTable).collect_glyphs (left_set, num_glyphs);
-      (this+t.columnIndexTable).collect_glyphs (right_set, num_glyphs);
+      (this+t.rowIndexTable).collect_glyphs (first_set, num_glyphs);
+      (this+t.columnIndexTable).collect_glyphs (second_set, num_glyphs);
     }
   }
 
@@ -789,7 +791,7 @@ struct KerxSubTableFormat6
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     {
-      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
+      if (!(*c->first_set)[left] || !(*c->second_set)[right]) return 0;
       return table.get_kerning (left, right, c);
     }
   };
@@ -878,15 +880,15 @@ struct KerxSubTable
   }
 
   template <typename set_t>
-  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  void collect_glyphs (set_t &first_set, set_t &second_set, unsigned num_glyphs) const
   {
     unsigned int subtable_type = get_type ();
     switch (subtable_type) {
-    case 0:     u.format0.collect_glyphs (left_set, right_set, num_glyphs); return;
-    case 1:     u.format1.collect_glyphs (left_set, right_set, num_glyphs); return;
-    case 2:     u.format2.collect_glyphs (left_set, right_set, num_glyphs); return;
-    case 4:     u.format4.collect_glyphs (left_set, right_set, num_glyphs); return;
-    case 6:     u.format6.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 0:     u.format0.collect_glyphs (first_set, second_set, num_glyphs); return;
+    case 1:     u.format1.collect_glyphs (first_set, second_set, num_glyphs); return;
+    case 2:     u.format2.collect_glyphs (first_set, second_set, num_glyphs); return;
+    case 4:     u.format4.collect_glyphs (first_set, second_set, num_glyphs); return;
+    case 6:     u.format6.collect_glyphs (first_set, second_set, num_glyphs); return;
     default:    return;
     }
   }
@@ -923,8 +925,8 @@ struct KerxSubTable
 
 struct kern_subtable_accelerator_data_t
 {
-  hb_bit_set_t left_set;
-  hb_bit_set_t right_set;
+  hb_bit_set_t first_set;
+  hb_bit_set_t second_set;
   mutable hb_aat_class_cache_t class_cache;
 };
 
@@ -1017,9 +1019,8 @@ struct KerxTable
       if (HB_DIRECTION_IS_HORIZONTAL (c->buffer->props.direction) != st->u.header.is_horizontal ())
         goto skip;
 
-      c->left_set = &subtable_accel.left_set;
-      c->right_set = &subtable_accel.right_set;
-      c->machine_glyph_set = &subtable_accel.left_set;
+      c->first_set = &subtable_accel.first_set;
+      c->second_set = &subtable_accel.second_set;
       c->machine_class_cache = &subtable_accel.class_cache;
 
       if (!c->buffer_intersects_machine ())
@@ -1051,8 +1052,8 @@ struct KerxTable
         }
       }
 
-      if (reverse)
-        c->buffer->reverse ();
+      if (reverse != c->buffer_is_reversed)
+        c->reverse_buffer ();
 
       {
         /* See comment in sanitize() for conditional here. */
@@ -1060,15 +1061,14 @@ struct KerxTable
         ret |= st->dispatch (c);
       }
 
-      if (reverse)
-        c->buffer->reverse ();
-
       (void) c->buffer->message (c->font, "end subtable %u", c->lookup_index);
 
     skip:
       st = &StructAfter<SubTable> (*st);
       c->set_lookup_index (c->lookup_index + 1);
     }
+    if (c->buffer_is_reversed)
+      c->reverse_buffer ();
 
     return ret;
   }
@@ -1133,7 +1133,7 @@ struct KerxTable
       if (unlikely (accel_data.subtable_accels.in_error ()))
           return accel_data;
 
-      st->collect_glyphs (subtable_accel.left_set, subtable_accel.right_set, num_glyphs);
+      st->collect_glyphs (subtable_accel.first_set, subtable_accel.second_set, num_glyphs);
       subtable_accel.class_cache.clear ();
 
       st = &StructAfter<SubTable> (*st);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh
index 92b07eec6e5..2cbb86c7566 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh
@@ -487,7 +487,7 @@ struct LigatureSubtable
       if (entry.flags & LigatureEntryT::SetComponent)
       {
         /* Never mark same index twice, in case DontAdvance was used... */
-        if (match_length && match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] == buffer->out_len)
+        if (unlikely (match_length && match_positions[(match_length - 1u) % ARRAY_LENGTH (match_positions)] == buffer->out_len))
           match_length--;
 
         match_positions[match_length++ % ARRAY_LENGTH (match_positions)] = buffer->out_len;
@@ -640,7 +640,7 @@ struct NoncontextualSubtable
     for (unsigned int i = 0; i < count; i++)
     {
       /* This block copied from StateTableDriver::drive. Keep in sync. */
-      if (last_range)
+      if (unlikely (last_range))
       {
         auto *range = last_range;
         {
@@ -1169,15 +1169,15 @@ struct Chain
                    hb_map ([subtable_flags] (const hb_aat_map_t::range_flags_t _) -> bool { return subtable_flags & (_.flags); })))
         goto skip;
 
-      c->subtable_flags = subtable_flags;
-      c->machine_glyph_set = accel ? &accel->subtables[i].glyph_set : &Null(hb_bit_set_t);
-      c->machine_class_cache = accel ? &accel->subtables[i].class_cache : nullptr;
-
       if (!(coverage & ChainSubtable<Types>::AllDirections) &&
           HB_DIRECTION_IS_VERTICAL (c->buffer->props.direction) !=
           bool (coverage & ChainSubtable<Types>::Vertical))
         goto skip;
 
+      c->subtable_flags = subtable_flags;
+      c->first_set = accel ? &accel->subtables[i].glyph_set : &Null(hb_bit_set_t);
+      c->machine_class_cache = accel ? &accel->subtables[i].class_cache : nullptr;
+
       if (!c->buffer_intersects_machine ())
       {
         (void) c->buffer->message (c->font, "skipped chainsubtable %u because no glyph matches", c->lookup_index);
@@ -1219,22 +1219,21 @@ struct Chain
       if (!c->buffer->message (c->font, "start chainsubtable %u", c->lookup_index))
         goto skip;
 
-      if (reverse)
-        c->buffer->reverse ();
+      if (reverse != c->buffer_is_reversed)
+        c->reverse_buffer ();
 
       subtable->apply (c);
 
-      if (reverse)
-        c->buffer->reverse ();
-
       (void) c->buffer->message (c->font, "end chainsubtable %u", c->lookup_index);
 
-      if (unlikely (!c->buffer->successful)) return;
+      if (unlikely (!c->buffer->successful)) break;
 
     skip:
       subtable = &StructAfter<ChainSubtable<Types>> (*subtable);
       c->set_lookup_index (c->lookup_index + 1);
     }
+    if (c->buffer_is_reversed)
+      c->reverse_buffer ();
   }
 
   unsigned int get_size () const { return length; }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh
index 6e250bfdef0..651ffcda01d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh
@@ -78,129 +78,246 @@
 
 
 /*
- * Big-endian integers.
+ * Fixed-endian integers / floats.
  */
 
+
 /* Endian swap, used in Windows related backends */
 static inline constexpr uint16_t hb_uint16_swap (uint16_t v)
 { return (v >> 8) | (v << 8); }
 static inline constexpr uint32_t hb_uint32_swap (uint32_t v)
 { return (hb_uint16_swap (v) << 16) | hb_uint16_swap (v >> 16); }
 
-#ifndef HB_FAST_INT_ACCESS
+template <typename Type>
+struct __attribute__((packed)) hb_packed_t { Type v; };
+
+#ifndef HB_FAST_NUM_ACCESS
+
 #if defined(__OPTIMIZE__) && \
     defined(__BYTE_ORDER) && \
     (__BYTE_ORDER == __BIG_ENDIAN || \
      (__BYTE_ORDER == __LITTLE_ENDIAN && \
       hb_has_builtin(__builtin_bswap16) && \
-      hb_has_builtin(__builtin_bswap32)))
-#define HB_FAST_INT_ACCESS 1
+      hb_has_builtin(__builtin_bswap32) && \
+      hb_has_builtin(__builtin_bswap64)))
+#define HB_FAST_NUM_ACCESS 1
 #else
-#define HB_FAST_INT_ACCESS 0
-#endif
+#define HB_FAST_NUM_ACCESS 0
 #endif
 
-template <typename Type, int Bytes = sizeof (Type)>
-struct BEInt;
-template <typename Type>
-struct BEInt<Type, 1>
+// https://github.com/harfbuzz/harfbuzz/issues/5456
+#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ <= 12)
+#undef HB_FAST_NUM_ACCESS
+#define HB_FAST_NUM_ACCESS 0
+#endif
+
+#endif
+
+template <bool BE, typename Type, int Bytes = sizeof (Type)>
+struct HBInt;
+template <bool BE, typename Type>
+struct HBInt<BE, Type, 1>
 {
   public:
-  BEInt () = default;
-  constexpr BEInt (Type V) : v {uint8_t (V)} {}
+  HBInt () = default;
+  constexpr HBInt (Type V) : v {uint8_t (V)} {}
   constexpr operator Type () const { return v; }
   private: uint8_t v;
 };
-template <typename Type>
-struct BEInt<Type, 2>
+template <bool BE, typename Type>
+struct HBInt<BE, Type, 2>
 {
-  struct __attribute__((packed)) packed_uint16_t { uint16_t v; };
-
   public:
-  BEInt () = default;
+  HBInt () = default;
 
-  BEInt (Type V)
-#if HB_FAST_INT_ACCESS
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-  { ((packed_uint16_t *) v)->v = __builtin_bswap16 (V); }
-#else /* __BYTE_ORDER == __BIG_ENDIAN */
-  { ((packed_uint16_t *) v)->v = V; }
-#endif
+  HBInt (Type V)
+#if HB_FAST_NUM_ACCESS
+  {
+    if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+      ((hb_packed_t<uint16_t> *) v)->v = V;
+    else
+      ((hb_packed_t<uint16_t> *) v)->v = __builtin_bswap16 (V);
+  }
 #else
-    : v {uint8_t ((V >>  8) & 0xFF),
-         uint8_t ((V      ) & 0xFF)} {}
+    : v {BE ? uint8_t ((V >>  8) & 0xFF) : uint8_t ((V      ) & 0xFF),
+         BE ? uint8_t ((V      ) & 0xFF) : uint8_t ((V >>  8) & 0xFF)} {}
 #endif
 
-  constexpr operator Type () const {
-#if HB_FAST_INT_ACCESS
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    return __builtin_bswap16 (((packed_uint16_t *) v)->v);
-#else /* __BYTE_ORDER == __BIG_ENDIAN */
-    return ((packed_uint16_t *) v)->v;
-#endif
+  constexpr operator Type () const
+  {
+#if HB_FAST_NUM_ACCESS
+    return (BE == (__BYTE_ORDER == __BIG_ENDIAN)) ?
+      ((const hb_packed_t<uint16_t> *) v)->v
+    :
+      __builtin_bswap16 (((const hb_packed_t<uint16_t> *) v)->v)
+    ;
 #else
-    return (v[0] <<  8)
-         + (v[1]      );
+    return (BE ? (v[0] <<  8) : (v[0]      ))
+         + (BE ? (v[1]      ) : (v[1] <<  8));
 #endif
   }
   private: uint8_t v[2];
 };
-template <typename Type>
-struct BEInt<Type, 3>
+template <bool BE, typename Type>
+struct HBInt<BE, Type, 3>
 {
   static_assert (!std::is_signed<Type>::value, "");
   public:
-  BEInt () = default;
-  constexpr BEInt (Type V) : v {uint8_t ((V >> 16) & 0xFF),
-                                uint8_t ((V >>  8) & 0xFF),
-                                uint8_t ((V      ) & 0xFF)} {}
+  HBInt () = default;
+  constexpr HBInt (Type V) : v {BE ? uint8_t ((V >> 16) & 0xFF) : uint8_t ((V >> 16) & 0xFF),
+                                BE ? uint8_t ((V >>  8) & 0xFF) : uint8_t ((V >>  8) & 0xFF),
+                                BE ? uint8_t ((V      ) & 0xFF) : uint8_t ((V      ) & 0xFF)} {}
 
-  constexpr operator Type () const { return (v[0] << 16)
-                                          + (v[1] <<  8)
-                                          + (v[2]      ); }
+  constexpr operator Type () const { return (BE ? (v[0] << 16) : (v[0]      ))
+                                          + (BE ? (v[1] <<  8) : (v[1] <<  8))
+                                          + (BE ? (v[2]      ) : (v[2] << 16)); }
   private: uint8_t v[3];
 };
-template <typename Type>
-struct BEInt<Type, 4>
+template <bool BE, typename Type>
+struct HBInt<BE, Type, 4>
 {
-  struct __attribute__((packed)) packed_uint32_t { uint32_t v; };
+  template <bool, typename, int>
+  friend struct HBFloat;
 
   public:
-  BEInt () = default;
+  HBInt () = default;
 
-  BEInt (Type V)
-#if HB_FAST_INT_ACCESS
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-  { ((packed_uint32_t *) v)->v = __builtin_bswap32 (V); }
-#else /* __BYTE_ORDER == __BIG_ENDIAN */
-  { ((packed_uint32_t *) v)->v = V; }
-#endif
+  HBInt (Type V)
+#if HB_FAST_NUM_ACCESS
+  {
+    if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+      ((hb_packed_t<uint32_t> *) v)->v = V;
+    else
+      ((hb_packed_t<uint32_t> *) v)->v = __builtin_bswap32 (V);
+  }
 #else
-    : v {uint8_t ((V >> 24) & 0xFF),
-         uint8_t ((V >> 16) & 0xFF),
-         uint8_t ((V >>  8) & 0xFF),
-         uint8_t ((V      ) & 0xFF)} {}
+    : v {BE ? uint8_t ((V >> 24) & 0xFF) : uint8_t ((V      ) & 0xFF),
+         BE ? uint8_t ((V >> 16) & 0xFF) : uint8_t ((V >>  8) & 0xFF),
+         BE ? uint8_t ((V >>  8) & 0xFF) : uint8_t ((V >> 16) & 0xFF),
+         BE ? uint8_t ((V      ) & 0xFF) : uint8_t ((V >> 24) & 0xFF)} {}
 #endif
 
   constexpr operator Type () const {
-#if HB_FAST_INT_ACCESS
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    return __builtin_bswap32 (((packed_uint32_t *) v)->v);
-#else /* __BYTE_ORDER == __BIG_ENDIAN */
-    return ((packed_uint32_t *) v)->v;
-#endif
+#if HB_FAST_NUM_ACCESS
+    return (BE == (__BYTE_ORDER == __BIG_ENDIAN)) ?
+      ((const hb_packed_t<uint32_t> *) v)->v
+    :
+      __builtin_bswap32 (((const hb_packed_t<uint32_t> *) v)->v)
+    ;
 #else
-    return (v[0] << 24)
-         + (v[1] << 16)
-         + (v[2] <<  8)
-         + (v[3]      );
+    return (BE ? (v[0] << 24) : (v[0]      ))
+         + (BE ? (v[1] << 16) : (v[1] <<  8))
+         + (BE ? (v[2] <<  8) : (v[2] << 16))
+         + (BE ? (v[3]      ) : (v[3] << 24));
 #endif
   }
   private: uint8_t v[4];
 };
+template <bool BE, typename Type>
+struct HBInt<BE, Type, 8>
+{
+  template <bool, typename, int>
+  friend struct HBFloat;
+
+  public:
+  HBInt () = default;
+
+  HBInt (Type V)
+#if HB_FAST_NUM_ACCESS
+  {
+    if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+      ((hb_packed_t<uint64_t> *) v)->v = V;
+    else
+      ((hb_packed_t<uint64_t> *) v)->v = __builtin_bswap64 (V);
+  }
+#else
+    : v {BE ? uint8_t ((V >> 56) & 0xFF) : uint8_t ((V      ) & 0xFF),
+         BE ? uint8_t ((V >> 48) & 0xFF) : uint8_t ((V >>  8) & 0xFF),
+         BE ? uint8_t ((V >> 40) & 0xFF) : uint8_t ((V >> 16) & 0xFF),
+         BE ? uint8_t ((V >> 32) & 0xFF) : uint8_t ((V >> 24) & 0xFF),
+         BE ? uint8_t ((V >> 24) & 0xFF) : uint8_t ((V >> 32) & 0xFF),
+         BE ? uint8_t ((V >> 16) & 0xFF) : uint8_t ((V >> 40) & 0xFF),
+         BE ? uint8_t ((V >>  8) & 0xFF) : uint8_t ((V >> 48) & 0xFF),
+         BE ? uint8_t ((V      ) & 0xFF) : uint8_t ((V >> 56) & 0xFF)} {}
+#endif
+
+  constexpr operator Type () const {
+#if HB_FAST_NUM_ACCESS
+    return (BE == (__BYTE_ORDER == __BIG_ENDIAN)) ?
+      ((const hb_packed_t<uint64_t> *) v)->v
+    :
+      __builtin_bswap64 (((const hb_packed_t<uint64_t> *) v)->v)
+    ;
+#else
+    return (BE ? (uint64_t (v[0]) << 56) : (uint64_t (v[0])      ))
+         + (BE ? (uint64_t (v[1]) << 48) : (uint64_t (v[1]) <<  8))
+         + (BE ? (uint64_t (v[2]) << 40) : (uint64_t (v[2]) << 16))
+         + (BE ? (uint64_t (v[3]) << 32) : (uint64_t (v[3]) << 24))
+         + (BE ? (uint64_t (v[4]) << 24) : (uint64_t (v[4]) << 32))
+         + (BE ? (uint64_t (v[5]) << 16) : (uint64_t (v[5]) << 40))
+         + (BE ? (uint64_t (v[6]) <<  8) : (uint64_t (v[6]) << 48))
+         + (BE ? (uint64_t (v[7])      ) : (uint64_t (v[7]) << 56));
+#endif
+  }
+  private: uint8_t v[8];
+};
 
 /* Floats. */
 
+template <bool BE, typename Type, int Bytes>
+struct HBFloat
+{
+  using IntType = typename std::conditional<Bytes == 4, uint32_t, uint64_t>::type;
+
+  public:
+  HBFloat () = default;
+
+  HBFloat (Type V)
+  {
+#if HB_FAST_NUM_ACCESS
+    {
+      if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+      {
+        ((hb_packed_t<Type> *) v)->v = V;
+        return;
+      }
+    }
+#endif
+
+    union {
+      hb_packed_t<Type> f;
+      hb_packed_t<IntType> i;
+    } u = {{V}};
+
+    const HBInt<BE, IntType> I = u.i.v;
+    for (unsigned i = 0; i < Bytes; i++)
+      v[i] = I.v[i];
+  }
+
+  /* c++14 constexpr */ operator Type () const
+  {
+#if HB_FAST_NUM_ACCESS
+    {
+      if (BE == (__BYTE_ORDER == __BIG_ENDIAN))
+        return ((const hb_packed_t<Type> *) v)->v;
+    }
+#endif
+
+    HBInt<BE, IntType> I;
+    for (unsigned i = 0; i < Bytes; i++)
+      I.v[i] = v[i];
+
+    union {
+      hb_packed_t<IntType> i;
+      hb_packed_t<Type> f;
+    } u = {{I}};
+
+    return u.f.v;
+  }
+  private: uint8_t v[Bytes];
+};
+
+
 /* We want our rounding towards +infinity. */
 static inline double
 _hb_roundf (double x) { return floor (x + .5); }
@@ -210,6 +327,27 @@ _hb_roundf (float x) { return floorf (x + .5f); }
 
 #define roundf(x) _hb_roundf(x)
 
+static inline void
+hb_sincos (float rotation, float &s, float &c)
+{
+#ifdef HAVE_SINCOSF
+  sincosf (rotation, &s, &c);
+#else
+  c = cosf (rotation);
+  s = sinf (rotation);
+#endif
+}
+static inline void
+hb_sincos (double rotation, double &s, double &c)
+{
+#ifdef HAVE_SINCOS
+  sincos (rotation, &s, &c);
+#else
+  c = cos (rotation);
+  s = sin (rotation);
+#endif
+}
+
 
 /* Encodes three unsigned integers in one 64-bit number.  If the inputs have more than 21 bits,
  * values will be truncated / overlap, and might not decode exactly. */
@@ -734,6 +872,17 @@ HB_FUNCOBJ (hb_clamp);
  * Bithacks.
  */
 
+/* Return the number of 1 bits in a uint8_t; faster than hb_popcount() */
+static inline unsigned
+hb_popcount8 (uint8_t v)
+{
+  static const uint8_t popcount4[16] = {
+    0, 1, 1, 2, 1, 2, 2, 3,
+    1, 2, 2, 3, 2, 3, 3, 4
+  };
+  return popcount4[v & 0xF] + popcount4[v >> 4];
+}
+
 /* Return the number of 1 bits in v. */
 template <typename T>
 static inline unsigned int
@@ -1070,6 +1219,7 @@ _hb_cmp_operator (const void *pkey, const void *pval)
 }
 
 template <typename V, typename K, typename ...Ts>
+HB_HOT
 static inline bool
 hb_bsearch_impl (unsigned *pos, /* Out */
                  const K& key,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-alloc-pool.hh b/src/java.desktop/share/native/libharfbuzz/hb-alloc-pool.hh
new file mode 100644
index 00000000000..cb0d7aa7acd
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-alloc-pool.hh
@@ -0,0 +1,105 @@
+/*
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_ALLOC_POOL_HH
+#define HB_ALLOC_POOL_HH
+
+#include "hb-vector.hh"
+
+/* Memory pool for persistent small- to medium-sized allocations.
+ *
+ * Some AI musings on this, not necessarily true:
+ *
+ * This is a very simple implementation, but it's good enough for our
+ * purposes.  It's not thread-safe.  It's not very fast.  It's not
+ * very memory efficient.  It's not very cache efficient.  It's not
+ * very anything efficient.  But it's simple and it works.  And it's
+ * good enough for our purposes.  If you need something more
+ * sophisticated, use a real allocator.  Or use a real language. */
+
+struct hb_alloc_pool_t
+{
+  unsigned ChunkSize = 65536 - 2 * sizeof (void *);
+
+  void *alloc (size_t size, unsigned alignment = 2 * sizeof (void *))
+  {
+    if (unlikely (chunks.in_error ())) return nullptr;
+
+    assert (alignment > 0);
+    assert (alignment <= 2 * sizeof (void *));
+    assert ((alignment & (alignment - 1)) == 0); /* power of two */
+
+    if (size > (ChunkSize) / 4)
+    {
+      /* Big chunk, allocate separately.  */
+      hb_vector_t<char> chunk;
+      if (unlikely (!chunk.resize (size))) return nullptr;
+      void *ret = chunk.arrayZ;
+      chunks.push (std::move (chunk));
+      if (chunks.in_error ()) return nullptr;
+      if (chunks.length > 1)
+      {
+        // Bring back the previous last chunk to the end, so that
+        // we can continue to allocate from it.
+        hb_swap (chunks.arrayZ[chunks.length - 1], chunks.arrayZ[chunks.length - 2]);
+      }
+      return ret;
+    }
+
+    unsigned pad = (unsigned) ((alignment - ((uintptr_t) current_chunk.arrayZ & (alignment - 1))) & (alignment - 1));
+
+    // Small chunk, allocate from the last chunk.
+    if (current_chunk.length < pad + size)
+    {
+      chunks.push ();
+      if (unlikely (chunks.in_error ())) return nullptr;
+      hb_vector_t<char> &chunk = chunks.arrayZ[chunks.length - 1];
+      if (unlikely (!chunk.resize (ChunkSize))) return nullptr;
+      current_chunk = chunk;
+      pad = (unsigned) ((alignment - ((uintptr_t) current_chunk.arrayZ & (alignment - 1))) & (alignment - 1));
+    }
+
+    current_chunk += pad;
+
+    assert (current_chunk.length >= size);
+    void *ret = current_chunk.arrayZ;
+    current_chunk += size;
+    return ret;
+  }
+
+  void discard (void *p_, size_t size)
+  {
+    // Reclaim memory if we can.
+    char *p = (char *) p_;
+    if (current_chunk.arrayZ == p + size && current_chunk.backwards_length >= size)
+      current_chunk -= size;
+  }
+
+  private:
+  hb_vector_t<hb_vector_t<char>> chunks;
+  hb_array_t<char> current_chunk;
+};
+
+
+#endif /* HB_ALLOC_POOL_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-array.hh b/src/java.desktop/share/native/libharfbuzz/hb-array.hh
index d65bbc5c711..71d3bcdf1ea 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-array.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-array.hh
@@ -291,6 +291,13 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
         && (unsigned int) (arrayZ + length - (const char *) p) >= size;
   }
 
+  template <unsigned P = sizeof (Type),
+            hb_enable_if (P == 1)>
+  bool check_end (const void *p) const
+  {
+    return (uintptr_t) (((const char *) p) - arrayZ) <= length;
+  }
+
   /* Only call if you allocated the underlying array using hb_malloc() or similar. */
   void fini ()
   { hb_free ((void *) arrayZ); arrayZ = nullptr; length = 0; }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
index 80bd90e87dc..05aaf5a155e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
@@ -40,7 +40,6 @@
  * Atomic integers and pointers.
  */
 
-
 /* We need external help for these */
 
 #if defined(hb_atomic_int_impl_add) \
@@ -80,27 +79,11 @@ _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
 
 #include <atomic>
 
+#define HB_STL_ATOMIC_IMPL
+
 #define _hb_memory_r_barrier()                  std::atomic_thread_fence(std::memory_order_acquire)
 #define _hb_memory_w_barrier()                  std::atomic_thread_fence(std::memory_order_release)
 
-#define hb_atomic_int_impl_add(AI, V)           (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> *> (AI)->fetch_add ((V), std::memory_order_acq_rel))
-#define hb_atomic_int_impl_set_relaxed(AI, V)   (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> *> (AI)->store ((V), std::memory_order_relaxed))
-#define hb_atomic_int_impl_set(AI, V)           (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> *> (AI)->store ((V), std::memory_order_release))
-#define hb_atomic_int_impl_get_relaxed(AI)      (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> const *> (AI)->load (std::memory_order_relaxed))
-#define hb_atomic_int_impl_get(AI)              (reinterpret_cast<std::atomic<typename std::decay<decltype (*(AI))>::type> const *> (AI)->load (std::memory_order_acquire))
-
-#define hb_atomic_ptr_impl_set_relaxed(P, V)    (reinterpret_cast<std::atomic<void*> *> (P)->store ((V), std::memory_order_relaxed))
-#define hb_atomic_ptr_impl_get_relaxed(P)       (reinterpret_cast<std::atomic<void*> const *> (P)->load (std::memory_order_relaxed))
-#define hb_atomic_ptr_impl_get(P)               (reinterpret_cast<std::atomic<void*> *> (P)->load (std::memory_order_acquire))
-static inline bool
-_hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
-{
-  const void *O = O_; // Need lvalue
-  return reinterpret_cast<std::atomic<const void*> *> (P)->compare_exchange_weak (O, N, std::memory_order_acq_rel, std::memory_order_relaxed);
-}
-#define hb_atomic_ptr_impl_cmpexch(P,O,N)       _hb_atomic_ptr_impl_cmplexch ((const void **) (P), (O), (N))
-
-
 #else /* defined(HB_NO_MT) */
 
 #define hb_atomic_int_impl_add(AI, V)           ((*(AI) += (V)) - (V))
@@ -159,6 +142,76 @@ inline T hb_atomic_int_impl_get (const T *AI)   { T v = *AI; _hb_memory_r_barrie
 inline void *hb_atomic_ptr_impl_get (void ** const P)   { void *v = *P; _hb_memory_r_barrier (); return v; }
 #endif
 
+#ifdef HB_STL_ATOMIC_IMPL
+template <typename T>
+struct hb_atomic_t
+{
+  hb_atomic_t () = default;
+  constexpr hb_atomic_t (T v) : v (v) {}
+  constexpr hb_atomic_t (const hb_atomic_t& o) : v (o.get_relaxed ()) {}
+  constexpr hb_atomic_t (hb_atomic_t&& o) : v (o.get_relaxed ()) { o.set_relaxed ({}); }
+
+  hb_atomic_t &operator= (const hb_atomic_t& o) { set_relaxed (o.get_relaxed ()); return *this; }
+  hb_atomic_t &operator= (hb_atomic_t&& o){ set_relaxed (o.get_relaxed ()); o.set_relaxed ({}); return *this; }
+  hb_atomic_t &operator= (T v_)
+  {
+    set_relaxed (v_);
+    return *this;
+  }
+  operator T () const { return get_relaxed (); }
+
+  void set_relaxed (T v_) { v.store (v_, std::memory_order_relaxed); }
+  void set_release (T v_) { v.store (v_, std::memory_order_release); }
+  T get_relaxed () const { return v.load (std::memory_order_relaxed); }
+  T get_acquire () const { return v.load (std::memory_order_acquire); }
+  T inc () { return v.fetch_add (1, std::memory_order_acq_rel); }
+  T dec () { return v.fetch_add (-1, std::memory_order_acq_rel); }
+
+  int operator++ (int) { return inc (); }
+  int operator-- (int) { return dec (); }
+
+  friend void swap (hb_atomic_t &a, hb_atomic_t &b) noexcept
+  {
+    T v = a.get_acquire ();
+    a.set_relaxed (b.get_acquire ());
+    b.set_relaxed (v);
+  }
+
+  std::atomic<T> v = 0;
+};
+
+template <typename T>
+struct hb_atomic_t<T *>
+{
+  hb_atomic_t () = default;
+  constexpr hb_atomic_t (T *v) : v (v) {}
+  hb_atomic_t (const hb_atomic_t &other) = delete;
+
+  void init (T *v_ = nullptr) { set_relaxed (v_); }
+  void set_relaxed (T *v_) { v.store (v_, std::memory_order_relaxed); }
+  T *get_relaxed () const { return v.load (std::memory_order_relaxed); }
+  T *get_acquire () const { return v.load (std::memory_order_acquire); }
+  bool cmpexch (T *old, T *new_) { return v.compare_exchange_weak (old, new_, std::memory_order_acq_rel, std::memory_order_relaxed); }
+
+  operator bool () const { return get_acquire () != nullptr; }
+  T *operator->() const { return get_acquire (); }
+  template <typename C>
+  operator C * () const
+  {
+    return get_acquire ();
+  }
+
+  friend void swap (hb_atomic_t &a, hb_atomic_t &b) noexcept
+  {
+    T *p = a.get_acquire ();
+    a.set_relaxed (b.get_acquire ());
+    b.set_relaxed (p);
+  }
+
+  std::atomic<T *> v = nullptr;
+};
+
+#else
 
 template <typename T>
 struct hb_atomic_t
@@ -178,7 +231,6 @@ struct hb_atomic_t
 
   int operator ++ (int) { return inc (); }
   int operator -- (int) { return dec (); }
-  long operator |= (long v_) { set_relaxed (get_relaxed () | v_); return *this; }
 
   T v = 0;
 };
@@ -194,7 +246,7 @@ struct hb_atomic_t<T*>
   void set_relaxed (T* v_) { hb_atomic_ptr_impl_set_relaxed (&v, v_); }
   T *get_relaxed () const { return (T *) hb_atomic_ptr_impl_get_relaxed (&v); }
   T *get_acquire () const { return (T *) hb_atomic_ptr_impl_get ((void **) &v); }
-  bool cmpexch (const T *old, T *new_) { return hb_atomic_ptr_impl_cmpexch ((void **) &v, (void *) old, (void *) new_); }
+  bool cmpexch (T *old, T *new_) { return hb_atomic_ptr_impl_cmpexch ((void **) &v, (void *) old, (void *) new_); }
 
   operator bool () const { return get_acquire () != nullptr; }
   T * operator -> () const                    { return get_acquire (); }
@@ -203,6 +255,8 @@ struct hb_atomic_t<T*>
   T *v = nullptr;
 };
 
+#endif
+
 static inline bool hb_barrier ()
 {
   _hb_compiler_memory_r_barrier ();
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bimap.hh b/src/java.desktop/share/native/libharfbuzz/hb-bimap.hh
index f541472544a..f9c0e8870ff 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bimap.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bimap.hh
@@ -176,7 +176,7 @@ struct hb_inc_bimap_t
   {
     hb_codepoint_t  count = get_population ();
     hb_vector_t <hb_codepoint_t> work;
-    if (unlikely (!work.resize (count, false))) return;
+    if (unlikely (!work.resize_dirty  (count))) return;
 
     for (hb_codepoint_t rhs = 0; rhs < count; rhs++)
       work.arrayZ[rhs] = back_map[rhs];
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh
index 9562a9674a5..902db195507 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh
@@ -142,6 +142,7 @@ struct hb_bit_page_t
 
   bool operator [] (hb_codepoint_t g) const { return get (g); }
   bool operator () (hb_codepoint_t g) const { return get (g); }
+  bool has (hb_codepoint_t g) const { return get (g); }
 
   void add_range (hb_codepoint_t a, hb_codepoint_t b)
   {
@@ -290,7 +291,7 @@ struct hb_bit_page_t
     unsigned int j = m & ELT_MASK;
 
     const elt_t vv = v[i] & ~((elt_t (1) << j) - 1);
-    for (const elt_t *p = &vv; i < len (); p = &v[++i])
+    for (const elt_t *p = &vv; i < len (); p = ((const elt_t *) &v[0]) + (++i))
       if (*p)
       {
         *codepoint = i * ELT_BITS + elt_get_min (*p);
@@ -346,6 +347,36 @@ struct hb_bit_page_t
     return 0;
   }
 
+  /*
+   * Iterator implementation.
+   */
+  struct iter_t : hb_iter_with_fallback_t<iter_t, hb_codepoint_t>
+  {
+    static constexpr bool is_sorted_iterator = true;
+    iter_t (const hb_bit_page_t &s_ = Null (hb_bit_page_t), bool init = true) : s (&s_), v (INVALID)
+    {
+      if (init)
+        v = s->get_min ();
+    }
+
+    typedef hb_codepoint_t __item_t__;
+    hb_codepoint_t __item__ () const { return v; }
+    bool __more__ () const { return v != INVALID; }
+    void __next__ () {
+       s->next (&v);
+    }
+    void __prev__ () { s->previous (&v); }
+    iter_t end () const { return iter_t (*s, false); }
+    bool operator != (const iter_t& o) const
+    { return v != o.v; }
+
+    protected:
+    const hb_bit_page_t *s;
+    hb_codepoint_t v;
+  };
+  iter_t iter () const { return iter_t (*this); }
+  operator iter_t () const { return iter (); }
+
   static constexpr hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
 
   typedef unsigned long long elt_t;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh
index 740a2437671..4028dd63531 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh
@@ -368,7 +368,7 @@ struct hb_bit_set_invertible_t
     unsigned __len__ () const { return l; }
     iter_t end () const { return iter_t (*s, false); }
     bool operator != (const iter_t& o) const
-    { return v != o.v || s != o.s; }
+    { return v != o.v; }
 
     protected:
     const hb_bit_set_invertible_t *s;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
index 799c3607599..f86d5750854 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
@@ -91,10 +91,10 @@ struct hb_bit_set_t
     if (pages.length < count && (unsigned) pages.allocated < count && count <= 2)
       exact_size = true; // Most sets are small and local
 
-    if (unlikely (!pages.resize (count, clear, exact_size) ||
-        !page_map.resize (count, clear)))
+    if (unlikely (!pages.resize_full (count, clear, exact_size) ||
+        !page_map.resize_full (count, clear, false)))
     {
-      pages.resize (page_map.length, clear, exact_size);
+      pages.resize_full (page_map.length, clear, exact_size);
       successful = false;
       return false;
     }
@@ -108,10 +108,11 @@ struct hb_bit_set_t
     page_map.alloc (sz);
   }
 
-  void reset ()
+  hb_bit_set_t& reset ()
   {
     successful = true;
     clear ();
+    return *this;
   }
 
   void clear ()
@@ -394,7 +395,7 @@ struct hb_bit_set_t
   {
     if (unlikely (!successful)) return;
     unsigned int count = other.pages.length;
-    if (unlikely (!resize (count, false, exact_size)))
+    if (unlikely (!resize  (count, false, exact_size)))
       return;
     population = other.population;
 
@@ -922,7 +923,7 @@ struct hb_bit_set_t
     unsigned __len__ () const { return l; }
     iter_t end () const { return iter_t (*s, false); }
     bool operator != (const iter_t& o) const
-    { return s != o.s || v != o.v; }
+    { return v != o.v; }
 
     protected:
     const hb_bit_set_t *s;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh
index 9e21beebd34..87c1524df6f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-text-unicode.hh
@@ -32,7 +32,7 @@
 #include "hb.hh"
 
 
-#line 36 "hb-buffer-deserialize-text-unicode.hh"
+#line 33 "hb-buffer-deserialize-text-unicode.hh"
 static const unsigned char _deserialize_text_unicode_trans_keys[] = {
         0u, 0u, 43u, 102u, 48u, 102u, 48u, 124u, 48u, 57u, 62u, 124u, 48u, 124u, 60u, 117u,
         85u, 117u, 85u, 117u, 0
@@ -150,12 +150,12 @@ _hb_buffer_deserialize_text_unicode (hb_buffer_t *buffer,
   hb_glyph_info_t info = {0};
   const hb_glyph_position_t pos = {0};
 
-#line 154 "hb-buffer-deserialize-text-unicode.hh"
+#line 147 "hb-buffer-deserialize-text-unicode.hh"
         {
         cs = deserialize_text_unicode_start;
         }
 
-#line 159 "hb-buffer-deserialize-text-unicode.hh"
+#line 150 "hb-buffer-deserialize-text-unicode.hh"
         {
         int _slen;
         int _trans;
@@ -215,7 +215,7 @@ _resume:
         hb_memset (&info, 0, sizeof (info));
 }
         break;
-#line 219 "hb-buffer-deserialize-text-unicode.hh"
+#line 203 "hb-buffer-deserialize-text-unicode.hh"
         }
 
 _again:
@@ -238,7 +238,7 @@ _again:
         *end_ptr = p;
 }
         break;
-#line 242 "hb-buffer-deserialize-text-unicode.hh"
+#line 224 "hb-buffer-deserialize-text-unicode.hh"
         }
         }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc
index 763172818c4..6787da6f65f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-serialize.cc
@@ -427,7 +427,7 @@ _hb_buffer_serialize_unicode_text (hb_buffer_t *buffer,
  *   #HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES flag is set. Then,
  *   - If #HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS is not set, `=` then #hb_glyph_info_t.cluster.
  *   - If #HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS is not set, the #hb_glyph_position_t in the format:
- *     - If both #hb_glyph_position_t.x_offset and #hb_glyph_position_t.y_offset are not 0, `@x_offset,y_offset`. Then,
+ *     - If #hb_glyph_position_t.x_offset and #hb_glyph_position_t.y_offset are not both 0, `@x_offset,y_offset`. Then,
  *     - `+x_advance`, then `,y_advance` if #hb_glyph_position_t.y_advance is not 0. Then,
  *   - If #HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS is set, the #hb_glyph_extents_t in the format `<x_bearing,y_bearing,width,height>`
  *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
index 56299d9b7e0..0c9190bf6f8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
@@ -163,7 +163,7 @@ buffer_verify_unsafe_to_break (hb_buffer_t  *buffer,
 
     hb_buffer_append (fragment, text_buffer, text_start, text_end);
     if (!hb_shape_full (font, fragment, features, num_features, shapers) ||
-        fragment->successful || fragment->shaping_failed)
+        fragment->successful)
     {
       hb_buffer_destroy (reconstruction);
       hb_buffer_destroy (fragment);
@@ -313,11 +313,11 @@ buffer_verify_unsafe_to_concat (hb_buffer_t        *buffer,
    * Shape the two fragment streams.
    */
   if (!hb_shape_full (font, fragments[0], features, num_features, shapers) ||
-      !fragments[0]->successful || fragments[0]->shaping_failed)
+      !fragments[0]->successful)
     goto out;
 
   if (!hb_shape_full (font, fragments[1], features, num_features, shapers) ||
-      !fragments[1]->successful || fragments[1]->shaping_failed)
+      !fragments[1]->successful)
     goto out;
 
   if (!forward)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
index c0600fd839b..8f6da312cdd 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
@@ -158,14 +158,15 @@ hb_segment_properties_overlay (hb_segment_properties_t *p,
 bool
 hb_buffer_t::enlarge (unsigned int size)
 {
-  if (unlikely (!successful))
-    return false;
   if (unlikely (size > max_len))
   {
     successful = false;
     return false;
   }
 
+  if (unlikely (!successful))
+    return false;
+
   unsigned int new_allocated = allocated;
   hb_glyph_position_t *new_pos = nullptr;
   hb_glyph_info_t *new_info = nullptr;
@@ -226,6 +227,13 @@ hb_buffer_t::shift_forward (unsigned int count)
   assert (have_output);
   if (unlikely (!ensure (len + count))) return false;
 
+  max_ops -= len - idx;
+  if (unlikely (max_ops < 0))
+  {
+    successful = false;
+    return false;
+  }
+
   memmove (info + idx + count, info + idx, (len - idx) * sizeof (info[0]));
   if (idx + count > len)
   {
@@ -297,7 +305,6 @@ hb_buffer_t::clear ()
   props = default_props;
 
   successful = true;
-  shaping_failed = false;
   have_output = false;
   have_positions = false;
 
@@ -320,7 +327,6 @@ hb_buffer_t::enter ()
 {
   deallocate_var_all ();
   serial = 0;
-  shaping_failed = false;
   scratch_flags = HB_BUFFER_SCRATCH_FLAG_DEFAULT;
   unsigned mul;
   if (likely (!hb_unsigned_mul_overflows (len, HB_BUFFER_MAX_LEN_FACTOR, &mul)))
@@ -339,7 +345,6 @@ hb_buffer_t::leave ()
   max_ops = HB_BUFFER_MAX_OPS_DEFAULT;
   deallocate_var_all ();
   serial = 0;
-  // Intentionally not reseting shaping_failed, such that it can be inspected.
 }
 
 
@@ -520,7 +525,19 @@ hb_buffer_t::set_masks (hb_mask_t    value,
   hb_mask_t not_mask = ~mask;
   value &= mask;
 
+  max_ops -= len;
+  if (unlikely (max_ops < 0))
+    successful = false;
+
   unsigned int count = len;
+
+  if (cluster_start == 0 && cluster_end == (unsigned int) -1)
+  {
+    for (unsigned int i = 0; i < count; i++)
+      info[i].mask = (info[i].mask & not_mask) | value;
+    return;
+  }
+
   for (unsigned int i = 0; i < count; i++)
     if (cluster_start <= info[i].cluster && info[i].cluster < cluster_end)
       info[i].mask = (info[i].mask & not_mask) | value;
@@ -536,6 +553,10 @@ hb_buffer_t::merge_clusters_impl (unsigned int start,
     return;
   }
 
+  max_ops -= end - start;
+  if (unlikely (max_ops < 0))
+    successful = false;
+
   unsigned int cluster = info[start].cluster;
 
   for (unsigned int i = start + 1; i < end; i++)
@@ -569,6 +590,10 @@ hb_buffer_t::merge_out_clusters (unsigned int start,
   if (unlikely (end - start < 2))
     return;
 
+  max_ops -= end - start;
+  if (unlikely (max_ops < 0))
+    successful = false;
+
   unsigned int cluster = out_info[start].cluster;
 
   for (unsigned int i = start + 1; i < end; i++)
@@ -726,7 +751,6 @@ DEFINE_NULL_INSTANCE (hb_buffer_t) =
   HB_SEGMENT_PROPERTIES_DEFAULT,
 
   false, /* successful */
-  true, /* shaping_failed */
   false, /* have_output */
   true  /* have_positions */
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
index 81c0f4a72e3..1c46981cc9c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
@@ -32,6 +32,7 @@
 
 #include "hb.hh"
 #include "hb-unicode.hh"
+#include "hb-set-digest.hh"
 
 
 static_assert ((sizeof (hb_glyph_info_t) == 20), "");
@@ -44,14 +45,14 @@ HB_MARK_AS_FLAG_T (hb_buffer_diff_flags_t);
 
 enum hb_buffer_scratch_flags_t {
   HB_BUFFER_SCRATCH_FLAG_DEFAULT                        = 0x00000000u,
-  HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII                  = 0x00000001u,
+  HB_BUFFER_SCRATCH_FLAG_HAS_FRACTION_SLASH             = 0x00000001u,
   HB_BUFFER_SCRATCH_FLAG_HAS_DEFAULT_IGNORABLES         = 0x00000002u,
   HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK             = 0x00000004u,
   HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT            = 0x00000008u,
   HB_BUFFER_SCRATCH_FLAG_HAS_CGJ                        = 0x00000010u,
-  HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS                = 0x00000020u,
-  HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE            = 0x00000040u,
-  HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK= 0x00000080u,
+  HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE            = 0x00000020u,
+  HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK= 0x00000040u,
+  HB_BUFFER_SCRATCH_FLAG_HAS_CONTINUATIONS              = 0x00000080u,
 
   /* Reserved for shapers' internal use. */
   HB_BUFFER_SCRATCH_FLAG_SHAPER0                        = 0x01000000u,
@@ -90,7 +91,6 @@ struct hb_buffer_t
   hb_segment_properties_t props; /* Script, language, direction */
 
   bool successful; /* Allocations successful */
-  bool shaping_failed; /* Shaping failure */
   bool have_output; /* Whether we have an output buffer going on */
   bool have_positions; /* Whether we have positions */
 
@@ -110,6 +110,7 @@ struct hb_buffer_t
   hb_codepoint_t context[2][CONTEXT_LENGTH];
   unsigned int context_len[2];
 
+  hb_set_digest_t digest; /* Manually updated sometimes */
 
   /*
    * Managed by enter / leave
@@ -200,6 +201,12 @@ struct hb_buffer_t
   void collect_codepoints (set_t &d) const
   { d.clear (); d.add_array (&info[0].codepoint, len, sizeof (info[0])); }
 
+  void update_digest ()
+  {
+    digest = hb_set_digest_t ();
+    collect_codepoints (digest);
+  }
+
   HB_INTERNAL void similar (const hb_buffer_t &src);
   HB_INTERNAL void reset ();
   HB_INTERNAL void clear ();
@@ -346,7 +353,7 @@ struct hb_buffer_t
     {
       if (out_info != info || out_len != idx)
       {
-        if (unlikely (!make_room_for (1, 1))) return false;
+        if (unlikely (!ensure (out_len + 1))) return false;
         out_info[out_len] = info[idx];
       }
       out_len++;
@@ -363,7 +370,7 @@ struct hb_buffer_t
     {
       if (out_info != info || out_len != idx)
       {
-        if (unlikely (!make_room_for (n, n))) return false;
+        if (unlikely (!ensure (out_len + n))) return false;
         memmove (out_info + out_len, info + idx, n * sizeof (out_info[0]));
       }
       out_len += n;
@@ -404,22 +411,12 @@ struct hb_buffer_t
   /* Adds glyph flags in mask to infos with clusters between start and end.
    * The start index will be from out-buffer if from_out_buffer is true.
    * If interior is true, then the cluster having the minimum value is skipped. */
-  void _set_glyph_flags (hb_mask_t mask,
-                         unsigned start = 0,
-                         unsigned end = (unsigned) -1,
-                         bool interior = false,
-                         bool from_out_buffer = false)
+  void _set_glyph_flags_impl (hb_mask_t mask,
+                              unsigned start,
+                              unsigned end,
+                              bool interior,
+                              bool from_out_buffer)
   {
-    end = hb_min (end, len);
-
-    if (unlikely (end - start > 255))
-      return;
-
-    if (interior && !from_out_buffer && end - start < 2)
-      return;
-
-    scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS;
-
     if (!from_out_buffer || !have_output)
     {
       if (!interior)
@@ -456,6 +453,25 @@ struct hb_buffer_t
     }
   }
 
+  HB_ALWAYS_INLINE
+  void _set_glyph_flags (hb_mask_t mask,
+                         unsigned start = 0,
+                         unsigned end = (unsigned) -1,
+                         bool interior = false,
+                         bool from_out_buffer = false)
+  {
+    if (unlikely (end != (unsigned) -1 && end - start > 255))
+      return;
+
+    end = hb_min (end, len);
+
+    if (interior && !from_out_buffer && end - start < 2)
+      return;
+
+    _set_glyph_flags_impl (mask, start, end, interior, from_out_buffer);
+  }
+
+
   void unsafe_to_break (unsigned int start = 0, unsigned int end = -1)
   {
     _set_glyph_flags (HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT,
@@ -606,6 +622,10 @@ struct hb_buffer_t
     if (unlikely (start == end))
       return;
 
+    max_ops -= end - start;
+    if (unlikely (max_ops < 0))
+      successful = false;
+
     unsigned cluster_first = infos[start].cluster;
     unsigned cluster_last = infos[end - 1].cluster;
 
@@ -614,10 +634,7 @@ struct hb_buffer_t
     {
       for (unsigned int i = start; i < end; i++)
         if (cluster != infos[i].cluster)
-        {
-          scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS;
           infos[i].mask |= mask;
-        }
       return;
     }
 
@@ -626,18 +643,12 @@ struct hb_buffer_t
     if (cluster == cluster_first)
     {
       for (unsigned int i = end; start < i && infos[i - 1].cluster != cluster_first; i--)
-      {
-        scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS;
         infos[i - 1].mask |= mask;
-      }
     }
     else /* cluster == cluster_last */
     {
       for (unsigned int i = start; i < end && infos[i].cluster != cluster_last; i++)
-      {
-        scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS;
         infos[i].mask |= mask;
-      }
     }
   }
   unsigned
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cache.hh b/src/java.desktop/share/native/libharfbuzz/hb-cache.hh
index 7d09ca89d7f..3609ccecc71 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cache.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cache.hh
@@ -64,17 +64,23 @@ template <unsigned int key_bits=16,
 struct hb_cache_t
 {
   using item_t = typename std::conditional<thread_safe,
-                                           typename std::conditional<key_bits + value_bits - cache_bits <= 16,
-                                                                     hb_atomic_t<unsigned short>,
-                                                                     hb_atomic_t<unsigned int>>::type,
-                                           typename std::conditional<key_bits + value_bits - cache_bits <= 16,
-                                                                     unsigned short,
-                                                                     unsigned int>::type
+                                           typename std::conditional<key_bits + value_bits - cache_bits <= 8,
+                                                                     hb_atomic_t<unsigned char>,
+                                                                     typename std::conditional<key_bits + value_bits - cache_bits <= 16,
+                                                                                               hb_atomic_t<unsigned short>,
+                                                                                               hb_atomic_t<unsigned int>>::type>::type,
+                                           typename std::conditional<key_bits + value_bits - cache_bits <= 8,
+                                                                     unsigned char,
+                                                                     typename std::conditional<key_bits + value_bits - cache_bits <= 16,
+                                                                                               unsigned short,
+                                                                                               unsigned int>::type>::type
                                           >::type;
 
   static_assert ((key_bits >= cache_bits), "");
   static_assert ((key_bits + value_bits <= cache_bits + 8 * sizeof (item_t)), "");
 
+  static constexpr unsigned MAX_VALUE = (1u << value_bits) - 1;
+
   hb_cache_t () { clear (); }
 
   void clear ()
@@ -83,25 +89,32 @@ struct hb_cache_t
       v = -1;
   }
 
+  HB_HOT
   bool get (unsigned int key, unsigned int *value) const
   {
     unsigned int k = key & ((1u<<cache_bits)-1);
     unsigned int v = values[k];
-    if ((key_bits + value_bits - cache_bits == 8 * sizeof (item_t) && v == (unsigned int) -1) ||
+    if ((key_bits + value_bits - cache_bits == 8 * sizeof (item_t) && (item_t) v == (item_t) -1) ||
         (v >> value_bits) != (key >> cache_bits))
       return false;
     *value = v & ((1u<<value_bits)-1);
     return true;
   }
 
-  bool set (unsigned int key, unsigned int value)
+  HB_HOT
+  void set (unsigned int key, unsigned int value)
   {
     if (unlikely ((key >> key_bits) || (value >> value_bits)))
-      return false; /* Overflows */
+      return; /* Overflows */
+    set_unchecked (key, value);
+  }
+
+  HB_HOT
+  void set_unchecked (unsigned int key, unsigned int value)
+  {
     unsigned int k = key & ((1u<<cache_bits)-1);
     unsigned int v = ((key>>cache_bits)<<value_bits) | value;
     values[k] = v;
-    return true;
   }
 
   private:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh
index 0eacdd92ab8..ed4586dc437 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh
@@ -72,12 +72,12 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
   cff2_cs_interp_env_t (const hb_ubytes_t &str, ACC &acc, unsigned int fd,
                         const int *coords_=nullptr, unsigned int num_coords_=0)
     : SUPER (str, acc.globalSubrs, acc.privateDicts[fd].localSubrs),
-      cached_scalars_vector (&acc.cached_scalars_vector)
+      region_count (0), cached_scalars_vector (&acc.cached_scalars_vector)
   {
     coords = coords_;
     num_coords = num_coords_;
     varStore = acc.varStore;
-    do_blend = num_coords && coords && varStore->size;
+    do_blend = num_coords && varStore->size;
     set_ivs (acc.privateDicts[fd].ivs);
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-common.cc
index 5c8546a378c..9eeae358a75 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-common.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-common.cc
@@ -40,43 +40,6 @@
  **/
 
 
-/* hb_options_t */
-
-hb_atomic_t<unsigned> _hb_options;
-
-void
-_hb_options_init ()
-{
-  hb_options_union_t u;
-  u.i = 0;
-  u.opts.initialized = true;
-
-  const char *c = getenv ("HB_OPTIONS");
-  if (c)
-  {
-    while (*c)
-    {
-      const char *p = strchr (c, ':');
-      if (!p)
-        p = c + strlen (c);
-
-#define OPTION(name, symbol) \
-        if (0 == strncmp (c, name, p - c) && strlen (name) == static_cast<size_t>(p - c)) do { u.opts.symbol = true; } while (0)
-
-      OPTION ("uniscribe-bug-compatible", uniscribe_bug_compatible);
-
-#undef OPTION
-
-      c = *p ? p + 1 : p;
-    }
-
-  }
-
-  /* This is idempotent and threadsafe. */
-  _hb_options = u.i;
-}
-
-
 /* hb_tag_t */
 
 /**
@@ -545,8 +508,11 @@ hb_script_to_iso15924_tag (hb_script_t script)
  * Fetches the #hb_direction_t of a script when it is
  * set horizontally. All right-to-left scripts will return
  * #HB_DIRECTION_RTL. All left-to-right scripts will return
- * #HB_DIRECTION_LTR.  Scripts that can be written either
- * horizontally or vertically will return #HB_DIRECTION_INVALID.
+ * #HB_DIRECTION_LTR.
+ *
+ * Scripts that can be written either right-to-left or
+ * left-to-right will return #HB_DIRECTION_INVALID.
+ *
  * Unknown scripts will return #HB_DIRECTION_LTR.
  *
  * Return value: The horizontal #hb_direction_t of @script
@@ -628,6 +594,9 @@ hb_script_get_horizontal_direction (hb_script_t script)
     /* Unicode-16.0 additions */
     case HB_SCRIPT_GARAY:
 
+    /* Unicode-17.0 additions */
+    case HB_SCRIPT_SIDETIC:
+
       return HB_DIRECTION_RTL;
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-config.hh b/src/java.desktop/share/native/libharfbuzz/hb-config.hh
index 3956690da35..c522eeea2ea 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-config.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-config.hh
@@ -38,7 +38,6 @@
 #ifndef HB_EXPERIMENTAL_API
 #define HB_NO_BEYOND_64K
 #define HB_NO_CUBIC_GLYF
-#define HB_NO_VAR_COMPOSITES
 #endif
 
 #ifdef HB_TINY
@@ -91,7 +90,10 @@
 #ifdef HB_MINI
 #define HB_NO_AAT
 #define HB_NO_LEGACY
-#define HB_NO_BORING_EXPANSION
+#define HB_NO_BEYOND_64K
+#define HB_NO_CUBIC_GLYF
+#define HB_NO_VAR_COMPOSITES
+#define HB_NO_VAR_HVF
 #endif
 
 #ifdef __OPTIMIZE_SIZE__
@@ -109,12 +111,6 @@
 
 /* Closure of options. */
 
-#ifdef HB_NO_BORING_EXPANSION
-#define HB_NO_BEYOND_64K
-#define HB_NO_CUBIC_GLYF
-#define HB_NO_VAR_COMPOSITES
-#endif
-
 #ifdef HB_NO_VAR
 #define HB_NO_VAR_COMPOSITES
 #endif
@@ -149,10 +145,6 @@
 #define HB_NO_PAINT
 #endif
 
-#ifdef HB_NO_GETENV
-#define HB_NO_UNISCRIBE_BUG_COMPATIBLE
-#endif
-
 #ifdef HB_NO_LEGACY
 #define HB_NO_CMAP_LEGACY_SUBTABLES
 #define HB_NO_FALLBACK_SHAPE
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-debug.hh b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh
index 1e9a18b9326..87d30d9ded1 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-debug.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-debug.hh
@@ -37,48 +37,6 @@
 #endif
 
 
-/*
- * Global runtime options.
- */
-
-struct hb_options_t
-{
-  bool unused : 1; /* In-case sign bit is here. */
-  bool initialized : 1;
-  bool uniscribe_bug_compatible : 1;
-};
-
-union hb_options_union_t {
-  unsigned i;
-  hb_options_t opts;
-};
-static_assert ((sizeof (hb_atomic_t<unsigned>) >= sizeof (hb_options_union_t)), "");
-
-HB_INTERNAL void
-_hb_options_init ();
-
-extern HB_INTERNAL hb_atomic_t<unsigned> _hb_options;
-
-static inline hb_options_t
-hb_options ()
-{
-#ifdef HB_NO_GETENV
-  return hb_options_t ();
-#endif
-  /* Make a local copy, so we can access bitfield threadsafely. */
-  hb_options_union_t u;
-  u.i = _hb_options;
-
-  if (unlikely (!u.i))
-  {
-    _hb_options_init ();
-    u.i = _hb_options;
-  }
-
-  return u.opts;
-}
-
-
 /*
  * Debug output (needs enabling at compile time.)
  */
@@ -394,6 +352,10 @@ struct hb_no_trace_t {
 #define HB_DEBUG_WASM (HB_DEBUG+0)
 #endif
 
+#ifndef HB_DEBUG_KBTS
+#define HB_DEBUG_KBTS (HB_DEBUG+0)
+#endif
+
 /*
  * With tracing.
  */
@@ -484,7 +446,7 @@ struct hb_no_trace_t {
 
 
 #ifndef HB_BUFFER_MESSAGE_MORE
-#define HB_BUFFER_MESSAGE_MORE (HB_DEBUG+1)
+#define HB_BUFFER_MESSAGE_MORE (HB_DEBUG+0)
 #endif
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
index 927563c4c40..a87a53d0e30 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
@@ -287,7 +287,7 @@ typedef void (*hb_font_get_glyph_shape_func_t) (hb_font_t *font, void *font_data
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
  * Since: 7.0.0
- * XDeprecated: REPLACEME: Use hb_font_draw_glyph_func_or_fail_t instead.
+ * Deprecated: 11.2.0: Use hb_font_draw_glyph_func_or_fail_t instead.
  **/
 typedef void (*hb_font_draw_glyph_func_t) (hb_font_t *font, void *font_data,
                                            hb_codepoint_t glyph,
@@ -308,7 +308,7 @@ typedef void (*hb_font_draw_glyph_func_t) (hb_font_t *font, void *font_data,
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
  * Since: 7.0.0
- * XDeprecated: REPLACEME: Use hb_font_paint_glyph_or_fail_func_t instead.
+ * Deprecated: 11.2.0: Use hb_font_paint_glyph_or_fail_func_t instead.
  */
 typedef hb_bool_t (*hb_font_paint_glyph_func_t) (hb_font_t *font, void *font_data,
                                                  hb_codepoint_t glyph,
@@ -346,7 +346,7 @@ hb_font_funcs_set_glyph_shape_func (hb_font_funcs_t *ffuncs,
  * Sets the implementation function for #hb_font_draw_glyph_func_t.
  *
  * Since: 7.0.0
- * XDeprecated: REPLACEME: Use hb_font_funcs_set_draw_glyph_or_fail_func instead.
+ * Deprecated: 11.2.0: Use hb_font_funcs_set_draw_glyph_or_fail_func instead.
  **/
 HB_DEPRECATED_FOR (hb_font_funcs_set_draw_glyph_or_fail_func)
 HB_EXTERN void
@@ -364,7 +364,7 @@ hb_font_funcs_set_draw_glyph_func (hb_font_funcs_t *ffuncs,
  * Sets the implementation function for #hb_font_paint_glyph_func_t.
  *
  * Since: 7.0.0
- * XDeprecated: REPLACEME: Use hb_font_funcs_set_paint_glyph_or_fail_func() instead.
+ * Deprecated: 11.2.0: Use hb_font_funcs_set_paint_glyph_or_fail_func() instead.
  */
 HB_DEPRECATED_FOR (hb_font_funcs_set_paint_glyph_or_fail_func)
 HB_EXTERN void
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.cc b/src/java.desktop/share/native/libharfbuzz/hb-draw.cc
index 8764ffe7129..c243d12f7ae 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-draw.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.cc
@@ -63,14 +63,14 @@ hb_draw_quadratic_to_nil (hb_draw_funcs_t *dfuncs, void *draw_data,
                           float to_x, float to_y,
                           void *user_data HB_UNUSED)
 {
-#define HB_ONE_THIRD 0.33333333f
+#define HB_TWO_THIRD 0.66666666666666666666666667f
   dfuncs->emit_cubic_to (draw_data, *st,
-                         (st->current_x + 2.f * control_x) * HB_ONE_THIRD,
-                         (st->current_y + 2.f * control_y) * HB_ONE_THIRD,
-                         (to_x + 2.f * control_x) * HB_ONE_THIRD,
-                         (to_y + 2.f * control_y) * HB_ONE_THIRD,
+                         st->current_x + (control_x - st->current_x) * HB_TWO_THIRD,
+                         st->current_y + (control_y - st->current_y) * HB_TWO_THIRD,
+                         to_x + (control_x - to_x) * HB_TWO_THIRD,
+                         to_y + (control_y - to_y) * HB_TWO_THIRD,
                          to_x, to_y);
-#undef HB_ONE_THIRD
+#undef HB_TWO_THIRD
 }
 
 static void
@@ -467,7 +467,7 @@ hb_draw_extents_move_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
                          float to_x, float to_y,
                          void *user_data HB_UNUSED)
 {
-  hb_extents_t *extents = (hb_extents_t *) data;
+  hb_extents_t<> *extents = (hb_extents_t<> *) data;
 
   extents->add_point (to_x, to_y);
 }
@@ -479,7 +479,7 @@ hb_draw_extents_line_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
                          float to_x, float to_y,
                          void *user_data HB_UNUSED)
 {
-  hb_extents_t *extents = (hb_extents_t *) data;
+  hb_extents_t<> *extents = (hb_extents_t<> *) data;
 
   extents->add_point (to_x, to_y);
 }
@@ -492,7 +492,7 @@ hb_draw_extents_quadratic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
                               float to_x, float to_y,
                               void *user_data HB_UNUSED)
 {
-  hb_extents_t *extents = (hb_extents_t *) data;
+  hb_extents_t<> *extents = (hb_extents_t<> *) data;
 
   extents->add_point (control_x, control_y);
   extents->add_point (to_x, to_y);
@@ -507,7 +507,7 @@ hb_draw_extents_cubic_to (hb_draw_funcs_t *dfuncs HB_UNUSED,
                           float to_x, float to_y,
                           void *user_data HB_UNUSED)
 {
-  hb_extents_t *extents = (hb_extents_t *) data;
+  hb_extents_t<> *extents = (hb_extents_t<> *) data;
 
   extents->add_point (control1_x, control1_y);
   extents->add_point (control2_x, control2_y);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc b/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc
index 6b7e1913024..c1feaac6280 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc
@@ -169,8 +169,7 @@ _hb_face_builder_get_table_tags (const hb_face_t *face HB_UNUSED,
 
   if (unlikely (start_offset >= population))
   {
-    if (table_count)
-      *table_count = 0;
+    *table_count = 0;
     return population;
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-face.cc
index 9d59d7c9468..a0f497eea7f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.cc
@@ -84,8 +84,7 @@ hb_face_count (hb_blob_t *blob)
 
   hb_sanitize_context_t c (blob);
 
-  const char *start = hb_blob_get_data (blob, nullptr);
-  auto *ot = reinterpret_cast<OT::OpenTypeFontFile *> (const_cast<char *> (start));
+  auto *ot = blob->as<OT::OpenTypeFontFile> ();
   if (unlikely (!ot->sanitize (&c)))
     return 0;
 
@@ -329,7 +328,7 @@ hb_face_create_from_file_or_fail (const char   *file_name,
   return face;
 }
 
-static struct supported_face_loaders_t {
+static const struct supported_face_loaders_t {
         char name[16];
         hb_face_t * (*from_file) (const char *font_file, unsigned face_index);
         hb_face_t * (*from_blob) (hb_blob_t *blob, unsigned face_index);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-font.cc
index 849855e2c22..6c636e23567 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.cc
@@ -246,7 +246,6 @@ hb_font_get_glyph_v_advance_nil (hb_font_t      *font,
                                  hb_codepoint_t  glyph HB_UNUSED,
                                  void           *user_data HB_UNUSED)
 {
-  /* TODO use font_extents.ascender+descender */
   return -font->y_scale;
 }
 
@@ -352,6 +351,10 @@ hb_font_get_glyph_h_origin_default (hb_font_t      *font,
                                     hb_position_t  *y,
                                     void           *user_data HB_UNUSED)
 {
+  if (font->has_glyph_h_origins_func_set ())
+  {
+    return font->get_glyph_h_origins (1, &glyph, 0, x, 0, y, 0, false);
+  }
   hb_bool_t ret = font->parent->get_glyph_h_origin (glyph, x, y);
   if (ret)
     font->parent_scale_position (x, y);
@@ -366,7 +369,6 @@ hb_font_get_glyph_v_origin_nil (hb_font_t      *font HB_UNUSED,
                                 hb_position_t  *y,
                                 void           *user_data HB_UNUSED)
 {
-  *x = *y = 0;
   return false;
 }
 
@@ -378,12 +380,100 @@ hb_font_get_glyph_v_origin_default (hb_font_t      *font,
                                     hb_position_t  *y,
                                     void           *user_data HB_UNUSED)
 {
+  if (font->has_glyph_v_origins_func_set ())
+  {
+    return font->get_glyph_v_origins (1, &glyph, 0, x, 0, y, 0, false);
+  }
   hb_bool_t ret = font->parent->get_glyph_v_origin (glyph, x, y);
   if (ret)
     font->parent_scale_position (x, y);
   return ret;
 }
 
+#define hb_font_get_glyph_h_origins_nil hb_font_get_glyph_h_origins_default
+
+static hb_bool_t
+hb_font_get_glyph_h_origins_default (hb_font_t *font HB_UNUSED,
+                                     void *font_data HB_UNUSED,
+                                     unsigned int count,
+                                     const hb_codepoint_t *first_glyph HB_UNUSED,
+                                     unsigned glyph_stride HB_UNUSED,
+                                     hb_position_t *first_x,
+                                     unsigned x_stride,
+                                     hb_position_t *first_y,
+                                     unsigned y_stride,
+                                     void *user_data HB_UNUSED)
+{
+  if (font->has_glyph_h_origin_func_set ())
+  {
+    for (unsigned int i = 0; i < count; i++)
+    {
+      font->get_glyph_h_origin (*first_glyph, first_x, first_y, false);
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+      first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+    }
+    return true;
+  }
+
+  hb_bool_t ret = font->parent->get_glyph_h_origins (count,
+                                                     first_glyph, glyph_stride,
+                                                     first_x, x_stride,
+                                                     first_y, y_stride);
+  if (ret)
+  {
+    for (unsigned i = 0; i < count; i++)
+    {
+      font->parent_scale_position (first_x, first_y);
+      first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+      first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+    }
+  }
+  return ret;
+}
+
+#define hb_font_get_glyph_v_origins_nil hb_font_get_glyph_v_origins_default
+
+static hb_bool_t
+hb_font_get_glyph_v_origins_default (hb_font_t *font HB_UNUSED,
+                                     void *font_data HB_UNUSED,
+                                     unsigned int count,
+                                     const hb_codepoint_t *first_glyph HB_UNUSED,
+                                     unsigned glyph_stride HB_UNUSED,
+                                     hb_position_t *first_x,
+                                     unsigned x_stride,
+                                     hb_position_t *first_y,
+                                     unsigned y_stride,
+                                     void *user_data HB_UNUSED)
+{
+  if (font->has_glyph_v_origin_func_set ())
+  {
+    for (unsigned int i = 0; i < count; i++)
+    {
+      font->get_glyph_v_origin (*first_glyph, first_x, first_y, false);
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+      first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+    }
+    return true;
+  }
+
+  hb_bool_t ret = font->parent->get_glyph_v_origins (count,
+                                                     first_glyph, glyph_stride,
+                                                     first_x, x_stride,
+                                                     first_y, y_stride);
+  if (ret)
+  {
+    for (unsigned i = 0; i < count; i++)
+    {
+      font->parent_scale_position (first_x, first_y);
+      first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+      first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+    }
+  }
+  return ret;
+}
+
 static hb_position_t
 hb_font_get_glyph_h_kerning_nil (hb_font_t      *font HB_UNUSED,
                                  void           *font_data HB_UNUSED,
@@ -1256,6 +1346,77 @@ hb_font_get_glyph_v_origin (hb_font_t      *font,
   return font->get_glyph_v_origin (glyph, x, y);
 }
 
+/**
+ * hb_font_get_glyph_h_origins:
+ * @font: #hb_font_t to work upon
+ * @count: The number of glyph IDs in the sequence queried
+ * @first_glyph: The first glyph ID to query
+ * @glyph_stride: The stride between successive glyph IDs
+ * @first_x: (out): The first X coordinate of the origin retrieved
+ * @x_stride: The stride between successive X coordinates
+ * @first_y: (out): The first Y coordinate of the origin retrieved
+ * @y_stride: The stride between successive Y coordinates
+ *
+ * Fetches the (X,Y) coordinates of the origin for requested glyph IDs
+ * in the specified font, for horizontal text segments.
+ *
+ * Return value: `true` if data found, `false` otherwise
+ *
+ * Since: 11.3.0
+ **/
+hb_bool_t
+hb_font_get_glyph_h_origins (hb_font_t      *font,
+                             unsigned int    count,
+                             const hb_codepoint_t *first_glyph,
+                             unsigned int    glyph_stride,
+                             hb_position_t  *first_x,
+                             unsigned int    x_stride,
+                             hb_position_t  *first_y,
+                             unsigned int    y_stride)
+
+{
+  return font->get_glyph_h_origins (count,
+                                    first_glyph, glyph_stride,
+                                    first_x, x_stride,
+                                    first_y, y_stride);
+}
+
+/**
+ * hb_font_get_glyph_v_origins:
+ * @font: #hb_font_t to work upon
+ * @count: The number of glyph IDs in the sequence queried
+ * @first_glyph: The first glyph ID to query
+ * @glyph_stride: The stride between successive glyph IDs
+ * @first_x: (out): The first X coordinate of the origin retrieved
+ * @x_stride: The stride between successive X coordinates
+ * @first_y: (out): The first Y coordinate of the origin retrieved
+ * @y_stride: The stride between successive Y coordinates
+ *
+ * Fetches the (X,Y) coordinates of the origin for requested glyph IDs
+ * in the specified font, for vertical text segments.
+ *
+ * Return value: `true` if data found, `false` otherwise
+ *
+ * Since: 11.3.0
+ **/
+hb_bool_t
+hb_font_get_glyph_v_origins (hb_font_t      *font,
+                             unsigned int    count,
+                             const hb_codepoint_t *first_glyph,
+                             unsigned int    glyph_stride,
+                             hb_position_t  *first_x,
+                             unsigned int    x_stride,
+                             hb_position_t  *first_y,
+                             unsigned int    y_stride)
+
+{
+  return font->get_glyph_v_origins (count,
+                                    first_glyph, glyph_stride,
+                                    first_x, x_stride,
+                                    first_y, y_stride);
+}
+
+
 /**
  * hb_font_get_glyph_h_kerning:
  * @font: #hb_font_t to work upon
@@ -1443,7 +1604,7 @@ hb_font_get_glyph_shape (hb_font_t *font,
  *
  * Return value: `true` if glyph was drawn, `false` otherwise
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  **/
 hb_bool_t
 hb_font_draw_glyph_or_fail (hb_font_t *font,
@@ -1480,7 +1641,7 @@ hb_font_draw_glyph_or_fail (hb_font_t *font,
  *
  * Return value: `true` if glyph was painted, `false` otherwise
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  */
 hb_bool_t
 hb_font_paint_glyph_or_fail (hb_font_t *font,
@@ -1883,6 +2044,7 @@ DEFINE_NULL_INSTANCE (hb_font_t) =
 
   1000, /* x_scale */
   1000, /* y_scale */
+  false, /* is_synthetic */
   0.f, /* x_embolden */
   0.f, /* y_embolden */
   true, /* embolden_in_place */
@@ -1900,6 +2062,7 @@ DEFINE_NULL_INSTANCE (hb_font_t) =
   0, /* ptem */
 
   HB_FONT_NO_VAR_NAMED_INSTANCE, /* instance_index */
+  false, /* has_nonzero_coords */
   0, /* num_coords */
   nullptr, /* coords */
   nullptr, /* design_coords */
@@ -1960,8 +2123,14 @@ hb_font_create (hb_face_t *face)
   hb_font_set_funcs_using (font, nullptr);
 
 #ifndef HB_NO_VAR
-  if (face && face->index >> 16)
-    hb_font_set_var_named_instance (font, (face->index >> 16) - 1);
+  // Initialize variations.
+  if (likely (face))
+  {
+    if (face->index >> 16)
+      hb_font_set_var_named_instance (font, (face->index >> 16) - 1);
+    else
+      hb_font_set_variations (font, nullptr, 0);
+  }
 #endif
 
   return font;
@@ -1979,6 +2148,7 @@ _hb_font_adopt_var_coords (hb_font_t *font,
   font->coords = coords;
   font->design_coords = design_coords;
   font->num_coords = coords_length;
+  font->has_nonzero_coords = hb_any (hb_array (coords, coords_length));
 
   font->changed ();
   font->serial_coords = font->serial;
@@ -2393,7 +2563,7 @@ hb_font_set_funcs_data (hb_font_t         *font,
   font->changed ();
 }
 
-static struct supported_font_funcs_t {
+static const struct supported_font_funcs_t {
         char name[16];
         void (*func) (hb_font_t *);
 } supported_font_funcs[] =
@@ -2450,6 +2620,9 @@ hb_bool_t
 hb_font_set_funcs_using (hb_font_t  *font,
                          const char *name)
 {
+  if (unlikely (hb_object_is_immutable (font)))
+    return false;
+
   bool retry = false;
 
   if (!name || !*name)
@@ -2704,12 +2877,12 @@ hb_font_get_ptem (hb_font_t *font)
  *
  * Return value: `true` if the font is synthetic, `false` otherwise.
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  */
 hb_bool_t
 hb_font_is_synthetic (hb_font_t *font)
 {
-  return font->is_synthetic ();
+  return font->is_synthetic;
 }
 
 /**
@@ -2858,12 +3031,6 @@ hb_font_set_variations (hb_font_t            *font,
   if (hb_object_is_immutable (font))
     return;
 
-  if (!variations_length && font->instance_index == HB_FONT_NO_VAR_NAMED_INSTANCE)
-  {
-    hb_font_set_var_coords_normalized (font, nullptr, 0);
-    return;
-  }
-
   const OT::fvar &fvar = *font->face->table.fvar;
   auto axes = fvar.get_axes ();
   const unsigned coords_length = axes.length;
@@ -2970,7 +3137,6 @@ hb_font_set_variation (hb_font_t *font,
 
   hb_ot_var_normalize_coords (font->face, coords_length, design_coords, normalized);
   _hb_font_adopt_var_coords (font, normalized, design_coords, coords_length);
-
 }
 
 /**
@@ -2991,11 +3157,16 @@ hb_font_set_variation (hb_font_t *font,
 void
 hb_font_set_var_coords_design (hb_font_t    *font,
                                const float  *coords,
-                               unsigned int  coords_length)
+                               unsigned int  input_coords_length)
 {
   if (hb_object_is_immutable (font))
     return;
 
+  const OT::fvar &fvar = *font->face->table.fvar;
+  auto axes = fvar.get_axes ();
+  const unsigned coords_length = axes.length;
+
+  input_coords_length = hb_min (input_coords_length, coords_length);
   int *normalized = coords_length ? (int *) hb_calloc (coords_length, sizeof (int)) : nullptr;
   float *design_coords = coords_length ? (float *) hb_calloc (coords_length, sizeof (float)) : nullptr;
 
@@ -3006,8 +3177,11 @@ hb_font_set_var_coords_design (hb_font_t    *font,
     return;
   }
 
-  if (coords_length)
-    hb_memcpy (design_coords, coords, coords_length * sizeof (font->design_coords[0]));
+  if (input_coords_length)
+    hb_memcpy (design_coords, coords, input_coords_length * sizeof (font->design_coords[0]));
+  // Fill in the rest with default values
+  for (unsigned int i = input_coords_length; i < coords_length; i++)
+    design_coords[i] = axes[i].get_default ();
 
   hb_ot_var_normalize_coords (font->face, coords_length, coords, normalized);
   _hb_font_adopt_var_coords (font, normalized, design_coords, coords_length);
@@ -3072,34 +3246,31 @@ hb_font_get_var_named_instance (hb_font_t *font)
 void
 hb_font_set_var_coords_normalized (hb_font_t    *font,
                                    const int    *coords, /* 2.14 normalized */
-                                   unsigned int  coords_length)
+                                   unsigned int  input_coords_length)
 {
   if (hb_object_is_immutable (font))
     return;
 
+  const OT::fvar &fvar = *font->face->table.fvar;
+  auto axes = fvar.get_axes ();
+  unsigned coords_length = axes.length;
+
+  input_coords_length = hb_min (input_coords_length, coords_length);
   int *copy = coords_length ? (int *) hb_calloc (coords_length, sizeof (coords[0])) : nullptr;
-  int *unmapped = coords_length ? (int *) hb_calloc (coords_length, sizeof (coords[0])) : nullptr;
   float *design_coords = coords_length ? (float *) hb_calloc (coords_length, sizeof (design_coords[0])) : nullptr;
 
-  if (unlikely (coords_length && !(copy && unmapped && design_coords)))
+  if (unlikely (coords_length && !(copy && design_coords)))
   {
     hb_free (copy);
-    hb_free (unmapped);
     hb_free (design_coords);
     return;
   }
 
-  if (coords_length)
-  {
-    hb_memcpy (copy, coords, coords_length * sizeof (coords[0]));
-    hb_memcpy (unmapped, coords, coords_length * sizeof (coords[0]));
-  }
+  if (input_coords_length)
+    hb_memcpy (copy, coords, input_coords_length * sizeof (coords[0]));
 
-  /* Best effort design coords simulation */
-  font->face->table.avar->unmap_coords (unmapped, coords_length);
   for (unsigned int i = 0; i < coords_length; ++i)
-    design_coords[i] = font->face->table.fvar->unnormalize_axis_value (i, unmapped[i]);
-  hb_free (unmapped);
+    design_coords[i] = NAN;
 
   _hb_font_adopt_var_coords (font, copy, design_coords, coords_length);
 }
@@ -3112,8 +3283,8 @@ hb_font_set_var_coords_normalized (hb_font_t    *font,
  * Fetches the list of normalized variation coordinates currently
  * set on a font.
  *
- * Note that this returned array may only contain values for some
- * (or none) of the axes; omitted axes effectively have zero values.
+ * <note>Note that if no variation coordinates are set, this function may
+ * return %NULL.</note>
  *
  * Return value is valid as long as variation coordinates of the font
  * are not modified.
@@ -3140,9 +3311,12 @@ hb_font_get_var_coords_normalized (hb_font_t    *font,
  * Fetches the list of variation coordinates (in design-space units) currently
  * set on a font.
  *
- * Note that this returned array may only contain values for some
- * (or none) of the axes; omitted axes effectively have their default
- * values.
+ * <note>Note that if no variation coordinates are set, this function may
+ * return %NULL.</note>
+ *
+ * <note>If variations have been set on the font using normalized coordinates
+ * (i.e. via hb_font_set_var_coords_normalized()), the design coordinates will
+ * have NaN (Not a Number) values.</note>
  *
  * Return value is valid as long as variation coordinates of the font
  * are not modified.
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.h b/src/java.desktop/share/native/libharfbuzz/hb-font.h
index 4e267ba6a80..2d06b659278 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.h
@@ -97,7 +97,7 @@ hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs);
  * @descender: The depth of typographic descenders.
  * @line_gap: The suggested line-spacing gap.
  *
- * Font-wide extent values, measured in font units.
+ * Font-wide extent values, measured in scaled units.
  *
  * Note that typically @ascender is positive and @descender
  * negative, in coordinate systems that grow up.
@@ -332,7 +332,7 @@ typedef hb_font_get_glyph_advances_func_t hb_font_get_glyph_v_advances_func_t;
  *
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
- * This method should retrieve the (X,Y) coordinates (in font units) of the
+ * This method should retrieve the (X,Y) coordinates (in scaled units) of the
  * origin for a glyph. Each coordinate must be returned in an #hb_position_t
  * output parameter.
  *
@@ -349,7 +349,7 @@ typedef hb_bool_t (*hb_font_get_glyph_origin_func_t) (hb_font_t *font, void *fon
  *
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
- * This method should retrieve the (X,Y) coordinates (in font units) of the
+ * This method should retrieve the (X,Y) coordinates (in scaled units) of the
  * origin for a glyph, for horizontal-direction text segments. Each
  * coordinate must be returned in an #hb_position_t output parameter.
  *
@@ -361,13 +361,72 @@ typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t;
  *
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
- * This method should retrieve the (X,Y) coordinates (in font units) of the
+ * This method should retrieve the (X,Y) coordinates (in scaled units) of the
  * origin for a glyph, for vertical-direction text segments. Each coordinate
  * must be returned in an #hb_position_t output parameter.
  *
  **/
 typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_v_origin_func_t;
 
+/**
+ * hb_font_get_glyph_origins_func_t:
+ * @font: #hb_font_t to work upon
+ * @font_data: @font user data pointer
+ * @first_glyph: The first glyph ID to query
+ * @count: number of glyphs to query
+ * @glyph_stride: The stride between successive glyph IDs
+ * @first_x: (out): The first origin X coordinate retrieved
+ * @x_stride: The stride between successive origin X coordinates
+ * @first_y: (out): The first origin Y coordinate retrieved
+ * @y_stride: The stride between successive origin Y coordinates
+ * @user_data: User data pointer passed by the caller
+ *
+ * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
+ *
+ * This method should retrieve the (X,Y) coordinates (in scaled units) of the
+ * origin for each requested glyph. Each coordinate value must be returned in
+ * an #hb_position_t in the two output parameters.
+ *
+ * Return value: `true` if data found, `false` otherwise
+ *
+ * Since: 11.3.0
+ **/
+typedef hb_bool_t (*hb_font_get_glyph_origins_func_t) (hb_font_t *font, void *font_data,
+                                                       unsigned int count,
+                                                       const hb_codepoint_t *first_glyph,
+                                                       unsigned glyph_stride,
+                                                       hb_position_t *first_x,
+                                                       unsigned x_stride,
+                                                       hb_position_t *first_y,
+                                                       unsigned y_stride,
+                                                       void *user_data);
+
+/**
+ * hb_font_get_glyph_h_origins_func_t:
+ *
+ * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
+ *
+ * This method should retrieve the (X,Y) coordinates (in scaled units) of the
+ * origin for requested glyph, for horizontal-direction text segments. Each
+ * coordinate must be returned in a the x/y #hb_position_t output parameters.
+ *
+ * Since: 11.3.0
+ **/
+typedef hb_font_get_glyph_origins_func_t hb_font_get_glyph_h_origins_func_t;
+
+/**
+ * hb_font_get_glyph_v_origins_func_t:
+ *
+ * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
+ *
+ * This method should retrieve the (X,Y) coordinates (in scaled units) of the
+ * origin for requested glyph, for vertical-direction text segments. Each
+ * coordinate must be returned in a the x/y #hb_position_t output parameters.
+ *
+ * Since: 11.3.0
+ **/
+typedef hb_font_get_glyph_origins_func_t hb_font_get_glyph_v_origins_func_t;
+
 /**
  * hb_font_get_glyph_kerning_func_t:
  * @font: #hb_font_t to work upon
@@ -428,7 +487,7 @@ typedef hb_bool_t (*hb_font_get_glyph_extents_func_t) (hb_font_t *font, void *fo
  *
  * A virtual method for the #hb_font_funcs_t of an #hb_font_t object.
  *
- * This method should retrieve the (X,Y) coordinates (in font units) for a
+ * This method should retrieve the (X,Y) coordinates (in scaled units) for a
  * specified contour point in a glyph. Each coordinate must be returned as
  * an #hb_position_t output parameter.
  *
@@ -498,7 +557,7 @@ typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *
  *
  * Return value: `true` if glyph was drawn, `false` otherwise
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  **/
 typedef hb_bool_t (*hb_font_draw_glyph_or_fail_func_t) (hb_font_t *font, void *font_data,
                                                         hb_codepoint_t glyph,
@@ -520,7 +579,7 @@ typedef hb_bool_t (*hb_font_draw_glyph_or_fail_func_t) (hb_font_t *font, void *f
  *
  * Return value: `true` if glyph was painted, `false` otherwise
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  */
 typedef hb_bool_t (*hb_font_paint_glyph_or_fail_func_t) (hb_font_t *font, void *font_data,
                                                          hb_codepoint_t glyph,
@@ -707,6 +766,38 @@ hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
                                        hb_font_get_glyph_v_origin_func_t func,
                                        void *user_data, hb_destroy_func_t destroy);
 
+/**
+ * hb_font_funcs_set_glyph_h_origins_func:
+ * @ffuncs: A font-function structure
+ * @func: (closure user_data) (destroy destroy) (scope notified): The callback function to assign
+ * @user_data: Data to pass to @func
+ * @destroy: (nullable): The function to call when @user_data is not needed anymore
+ *
+ * Sets the implementation function for #hb_font_get_glyph_h_origins_func_t.
+ *
+ * Since: 11.3.0
+ **/
+HB_EXTERN void
+hb_font_funcs_set_glyph_h_origins_func (hb_font_funcs_t *ffuncs,
+                                        hb_font_get_glyph_h_origins_func_t func,
+                                        void *user_data, hb_destroy_func_t destroy);
+
+/**
+ * hb_font_funcs_set_glyph_v_origins_func:
+ * @ffuncs: A font-function structure
+ * @func: (closure user_data) (destroy destroy) (scope notified): The callback function to assign
+ * @user_data: Data to pass to @func
+ * @destroy: (nullable): The function to call when @user_data is not needed anymore
+ *
+ * Sets the implementation function for #hb_font_get_glyph_v_origins_func_t.
+ *
+ * Since: 11.3.0
+ **/
+HB_EXTERN void
+hb_font_funcs_set_glyph_v_origins_func (hb_font_funcs_t *ffuncs,
+                                        hb_font_get_glyph_v_origins_func_t func,
+                                        void *user_data, hb_destroy_func_t destroy);
+
 /**
  * hb_font_funcs_set_glyph_h_kerning_func:
  * @ffuncs: A font-function structure
@@ -796,7 +887,7 @@ hb_font_funcs_set_glyph_from_name_func (hb_font_funcs_t *ffuncs,
  *
  * Sets the implementation function for #hb_font_draw_glyph_or_fail_func_t.
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  **/
 HB_EXTERN void
 hb_font_funcs_set_draw_glyph_or_fail_func (hb_font_funcs_t *ffuncs,
@@ -812,7 +903,7 @@ hb_font_funcs_set_draw_glyph_or_fail_func (hb_font_funcs_t *ffuncs,
  *
  * Sets the implementation function for #hb_font_paint_glyph_or_fail_func_t.
  *
- * XSince: REPLACEME
+ * Since: 11.2.0
  */
 HB_EXTERN void
 hb_font_funcs_set_paint_glyph_or_fail_func (hb_font_funcs_t *ffuncs,
@@ -876,6 +967,26 @@ hb_font_get_glyph_v_origin (hb_font_t *font,
                             hb_codepoint_t glyph,
                             hb_position_t *x, hb_position_t *y);
 
+HB_EXTERN hb_bool_t
+hb_font_get_glyph_h_origins (hb_font_t *font,
+                             unsigned int count,
+                             const hb_codepoint_t *first_glyph,
+                             unsigned glyph_stride,
+                             hb_position_t *first_x,
+                             unsigned x_stride,
+                             hb_position_t *first_y,
+                             unsigned y_stride);
+
+HB_EXTERN hb_bool_t
+hb_font_get_glyph_v_origins (hb_font_t *font,
+                             unsigned int count,
+                             const hb_codepoint_t *first_glyph,
+                             unsigned glyph_stride,
+                             hb_position_t *first_x,
+                             unsigned x_stride,
+                             hb_position_t *first_y,
+                             unsigned y_stride);
+
 HB_EXTERN hb_position_t
 hb_font_get_glyph_h_kerning (hb_font_t *font,
                              hb_codepoint_t left_glyph, hb_codepoint_t right_glyph);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.hh b/src/java.desktop/share/native/libharfbuzz/hb-font.hh
index 69d8d4b09df..9dd54466d7f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.hh
@@ -55,6 +55,8 @@
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_v_advances) \
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_h_origin) \
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_v_origin) \
+  HB_FONT_FUNC_IMPLEMENT (get_,glyph_h_origins) \
+  HB_FONT_FUNC_IMPLEMENT (get_,glyph_v_origins) \
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_h_kerning) \
   HB_IF_NOT_DEPRECATED (HB_FONT_FUNC_IMPLEMENT (get_,glyph_v_kerning)) \
   HB_FONT_FUNC_IMPLEMENT (get_,glyph_extents) \
@@ -118,6 +120,8 @@ struct hb_font_t
   int32_t x_scale;
   int32_t y_scale;
 
+  bool is_synthetic;
+
   float x_embolden;
   float y_embolden;
   bool embolden_in_place;
@@ -139,6 +143,7 @@ struct hb_font_t
 
   /* Font variation coordinates. */
   unsigned int instance_index;
+  bool has_nonzero_coords;
   unsigned int num_coords;
   int *coords;
   float *design_coords;
@@ -430,21 +435,127 @@ struct hb_font_t
   }
 
   hb_bool_t get_glyph_h_origin (hb_codepoint_t glyph,
-                                hb_position_t *x, hb_position_t *y)
+                                hb_position_t *x, hb_position_t *y,
+                                bool synthetic = true)
   {
     *x = *y = 0;
-    return klass->get.f.glyph_h_origin (this, user_data,
-                                        glyph, x, y,
-                                        !klass->user_data ? nullptr : klass->user_data->glyph_h_origin);
+    bool ret = klass->get.f.glyph_h_origin (this, user_data,
+                                            glyph, x, y,
+                                            !klass->user_data ? nullptr : klass->user_data->glyph_h_origin);
+
+    if (synthetic && ret)
+    {
+      /* Slant is ignored as it does not affect glyph origin */
+
+      /* Embolden */
+      if (!embolden_in_place)
+      {
+        *x += x_scale < 0 ? -x_strength : x_strength;
+        *y += y_scale < 0 ? -y_strength : y_strength;
+      }
+    }
+
+    return ret;
   }
 
   hb_bool_t get_glyph_v_origin (hb_codepoint_t glyph,
-                                hb_position_t *x, hb_position_t *y)
+                                hb_position_t *x, hb_position_t *y,
+                                bool synthetic = true)
   {
     *x = *y = 0;
-    return klass->get.f.glyph_v_origin (this, user_data,
-                                        glyph, x, y,
-                                        !klass->user_data ? nullptr : klass->user_data->glyph_v_origin);
+    bool ret = klass->get.f.glyph_v_origin (this, user_data,
+                                            glyph, x, y,
+                                            !klass->user_data ? nullptr : klass->user_data->glyph_v_origin);
+
+    if (synthetic && ret)
+    {
+      /* Slant is ignored as it does not affect glyph origin */
+
+      /* Embolden */
+      if (!embolden_in_place)
+      {
+        *x += x_scale < 0 ? -x_strength : x_strength;
+        *y += y_scale < 0 ? -y_strength : y_strength;
+      }
+    }
+
+    return ret;
+  }
+
+  hb_bool_t get_glyph_h_origins (unsigned int count,
+                                 const hb_codepoint_t *first_glyph,
+                                 unsigned int glyph_stride,
+                                 hb_position_t *first_x,
+                                 unsigned int x_stride,
+                                 hb_position_t *first_y,
+                                 unsigned int y_stride,
+                                 bool synthetic = true)
+
+  {
+    bool ret = klass->get.f.glyph_h_origins (this, user_data,
+                                             count,
+                                             first_glyph, glyph_stride,
+                                             first_x, x_stride, first_y, y_stride,
+                                             !klass->user_data ? nullptr : klass->user_data->glyph_h_origins);
+
+    if (synthetic && ret)
+    {
+      hb_position_t x_shift = x_scale < 0 ? -x_strength : x_strength;
+      hb_position_t y_shift = y_scale < 0 ? -y_strength : y_strength;
+      for (unsigned i = 0; i < count; i++)
+      {
+        /* Slant is ignored as it does not affect glyph origin */
+
+        /* Embolden */
+        if (!embolden_in_place)
+        {
+          *first_x += x_shift;
+          *first_y += y_shift;
+        }
+        first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+        first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+      }
+    }
+
+    return ret;
+  }
+
+  hb_bool_t get_glyph_v_origins (unsigned int count,
+                                 const hb_codepoint_t *first_glyph,
+                                 unsigned int glyph_stride,
+                                 hb_position_t *first_x,
+                                 unsigned int x_stride,
+                                 hb_position_t *first_y,
+                                 unsigned int y_stride,
+                                 bool synthetic = true)
+
+  {
+    bool ret = klass->get.f.glyph_v_origins (this, user_data,
+                                             count,
+                                             first_glyph, glyph_stride,
+                                             first_x, x_stride, first_y, y_stride,
+                                             !klass->user_data ? nullptr : klass->user_data->glyph_v_origins);
+
+    if (synthetic && is_synthetic && ret)
+    {
+      hb_position_t x_shift = x_scale < 0 ? -x_strength : x_strength;
+      hb_position_t y_shift = y_scale < 0 ? -y_strength : y_strength;
+      for (unsigned i = 0; i < count; i++)
+      {
+        /* Slant is ignored as it does not affect glyph origin */
+
+        /* Embolden */
+        if (!embolden_in_place)
+        {
+          *first_x += x_shift;
+          *first_y += y_shift;
+        }
+        first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+        first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+      }
+    }
+
+    return ret;
   }
 
   hb_position_t get_glyph_h_kerning (hb_codepoint_t left_glyph,
@@ -486,7 +597,7 @@ struct hb_font_t
                                          extents,
                                          !klass->user_data ? nullptr : klass->user_data->glyph_extents);
     }
-    if (!is_synthetic () &&
+    if (!is_synthetic &&
         klass->get.f.glyph_extents (this, user_data,
                                     glyph,
                                     extents,
@@ -496,6 +607,7 @@ struct hb_font_t
     /* Try getting extents from paint(), then draw(), *then* get_extents()
      * and apply synthetic settings in the last case. */
 
+#ifndef HB_NO_PAINT
     hb_paint_extents_context_t paint_extents;
     if (paint_glyph_or_fail (glyph,
                              hb_paint_extents_get_funcs (), &paint_extents,
@@ -504,14 +616,17 @@ struct hb_font_t
       *extents = paint_extents.get_extents ().to_glyph_extents ();
       return true;
     }
+#endif
 
-    hb_extents_t draw_extents;
+#ifndef HB_NO_DRAW
+    hb_extents_t<> draw_extents;
     if (draw_glyph_or_fail (glyph,
                             hb_draw_extents_get_funcs (), &draw_extents))
     {
       *extents = draw_extents.to_glyph_extents ();
       return true;
     }
+#endif
 
     bool ret = klass->get.f.glyph_extents (this, user_data,
                                            glyph,
@@ -575,6 +690,7 @@ struct hb_font_t
                            hb_draw_funcs_t *draw_funcs, void *draw_data,
                            bool synthetic = true)
   {
+#ifndef HB_NO_DRAW
 #ifndef HB_NO_OUTLINE
     bool embolden = x_strength || y_strength;
     bool slanted = slant_xy;
@@ -603,7 +719,13 @@ struct hb_font_t
     // Slant before embolden; produces nicer results.
 
     if (slanted)
+    {
+      hb_position_t xo = 0, yo = 0;
+      get_glyph_h_origin (glyph, &xo, &yo, false);
+      outline.translate (-xo, -yo);
       outline.slant (slant_xy);
+      outline.translate (xo, yo);
+    }
 
     if (embolden)
     {
@@ -618,6 +740,8 @@ struct hb_font_t
 
     return true;
 #endif
+#endif
+    return false;
   }
 
   bool paint_glyph_or_fail (hb_codepoint_t glyph,
@@ -626,6 +750,7 @@ struct hb_font_t
                             hb_color_t foreground,
                             bool synthetic = true)
   {
+#ifndef HB_NO_PAINT
     /* Slant */
     if (synthetic && slant_xy)
       hb_paint_push_transform (paint_funcs, paint_data,
@@ -643,6 +768,8 @@ struct hb_font_t
       hb_paint_pop_transform (paint_funcs, paint_data);
 
     return ret;
+#endif
+    return false;
   }
 
   /* A bit higher-level, and with fallback */
@@ -704,6 +831,28 @@ struct hb_font_t
       get_glyph_v_advances (count, first_glyph, glyph_stride, first_advance, advance_stride);
   }
 
+  void apply_offset (hb_position_t *x, hb_position_t *y,
+                     hb_position_t dx, hb_position_t dy,
+                     signed mult)
+  {
+    assert (mult == -1 || mult == +1);
+
+    *x += dx * mult;
+    *y += dy * mult;
+  }
+  void add_offset (hb_position_t *x, hb_position_t *y,
+                   hb_position_t dx, hb_position_t dy)
+  {
+    *x += dx;
+    *y += dy;
+  }
+  void subtract_offset (hb_position_t *x, hb_position_t *y,
+                        hb_position_t dx, hb_position_t dy)
+  {
+    *x -= dx;
+    *y -= dy;
+  }
+
   void guess_v_origin_minus_h_origin (hb_codepoint_t glyph,
                                       hb_position_t *x, hb_position_t *y)
   {
@@ -714,6 +863,141 @@ struct hb_font_t
     *y = extents.ascender;
   }
 
+  void apply_glyph_h_origins_with_fallback (hb_buffer_t *buf, int mult)
+  {
+    bool has_ascender = false;
+    hb_position_t ascender = 0;
+
+    struct { hb_position_t x, y; } origins[32];
+
+    unsigned int offset = 0;
+    unsigned int count = buf->len;
+    while (offset < count)
+    {
+      unsigned n = hb_min (count - offset, ARRAY_LENGTH (origins));
+      if (!get_glyph_h_origins (n,
+                                &buf->info[offset].codepoint, sizeof (hb_glyph_info_t),
+                                &origins[0].x, sizeof (origins[0]),
+                                &origins[0].y, sizeof (origins[0])))
+      {
+        if (get_glyph_v_origins (n,
+                                  &buf->info[offset].codepoint, sizeof (hb_glyph_info_t),
+                                  &origins[0].x, sizeof (origins[0]),
+                                  &origins[0].y, sizeof (origins[0])))
+        {
+          if (!has_ascender)
+          {
+            hb_font_extents_t extents;
+            get_h_extents_with_fallback (&extents);
+            ascender = extents.ascender;
+            has_ascender = true;
+          }
+
+          /* We got the v_origins, adjust them to h_origins. */
+          for (unsigned j = 0; j < n; j++)
+          {
+            hb_codepoint_t glyph = buf->info[offset + j].codepoint;
+            origins[j].x -= get_glyph_h_advance (glyph) / 2;
+            origins[j].y -= ascender;
+          }
+        }
+        else
+        {
+          for (unsigned j = 0; j < n; j++)
+          {
+            origins[j].x = 0;
+            origins[j].y = 0;
+          }
+        }
+      }
+
+      assert (mult == -1 || mult == +1);
+      if (mult == +1)
+        for (unsigned j = 0; j < n; j++)
+        {
+          hb_glyph_position_t *pos = &buf->pos[offset + j];
+          add_offset (&pos->x_offset, &pos->y_offset,
+                      origins[j].x, origins[j].y);
+        }
+      else /* mult == -1 */
+        for (unsigned j = 0; j < n; j++)
+        {
+          hb_glyph_position_t *pos = &buf->pos[offset + j];
+          subtract_offset (&pos->x_offset, &pos->y_offset,
+                           origins[j].x, origins[j].y);
+        }
+
+      offset += n;
+    }
+  }
+  void apply_glyph_v_origins_with_fallback (hb_buffer_t *buf, int mult)
+  {
+    bool has_ascender = false;
+    hb_position_t ascender = 0;
+
+    struct { hb_position_t x, y; } origins[32];
+
+    unsigned int offset = 0;
+    unsigned int count = buf->len;
+    while (offset < count)
+    {
+      unsigned n = hb_min (count - offset, ARRAY_LENGTH (origins));
+      if (!get_glyph_v_origins (n,
+                                &buf->info[offset].codepoint, sizeof (hb_glyph_info_t),
+                                &origins[0].x, sizeof (origins[0]),
+                                &origins[0].y, sizeof (origins[0])))
+      {
+        if (get_glyph_h_origins (n,
+                                 &buf->info[offset].codepoint, sizeof (hb_glyph_info_t),
+                                 &origins[0].x, sizeof (origins[0]),
+                                 &origins[0].y, sizeof (origins[0])))
+        {
+          if (!has_ascender)
+          {
+            hb_font_extents_t extents;
+            get_h_extents_with_fallback (&extents);
+            ascender = extents.ascender;
+            has_ascender = true;
+          }
+
+          /* We got the h_origins, adjust them to v_origins. */
+          for (unsigned j = 0; j < n; j++)
+          {
+            hb_codepoint_t glyph = buf->info[offset + j].codepoint;
+            origins[j].x += get_glyph_h_advance (glyph) / 2;
+            origins[j].y += ascender;
+          }
+        }
+        else
+        {
+          for (unsigned j = 0; j < n; j++)
+          {
+            origins[j].x = 0;
+            origins[j].y = 0;
+          }
+        }
+      }
+
+      assert (mult == -1 || mult == +1);
+      if (mult == +1)
+        for (unsigned j = 0; j < n; j++)
+        {
+          hb_glyph_position_t *pos = &buf->pos[offset + j];
+          add_offset (&pos->x_offset, &pos->y_offset,
+                      origins[j].x, origins[j].y);
+        }
+      else /* mult == -1 */
+        for (unsigned j = 0; j < n; j++)
+        {
+          hb_glyph_position_t *pos = &buf->pos[offset + j];
+          subtract_offset (&pos->x_offset, &pos->y_offset,
+                           origins[j].x, origins[j].y);
+        }
+
+      offset += n;
+    }
+  }
+
   void get_glyph_h_origin_with_fallback (hb_codepoint_t glyph,
                                          hb_position_t *x, hb_position_t *y)
   {
@@ -722,7 +1006,7 @@ struct hb_font_t
     {
       hb_position_t dx, dy;
       guess_v_origin_minus_h_origin (glyph, &dx, &dy);
-      *x -= dx; *y -= dy;
+      subtract_offset (x, y, dx, dy);
     }
   }
   void get_glyph_v_origin_with_fallback (hb_codepoint_t glyph,
@@ -733,7 +1017,7 @@ struct hb_font_t
     {
       hb_position_t dx, dy;
       guess_v_origin_minus_h_origin (glyph, &dx, &dy);
-      *x += dx; *y += dy;
+      add_offset (x, y, dx, dy);
     }
   }
 
@@ -747,68 +1031,38 @@ struct hb_font_t
       get_glyph_v_origin_with_fallback (glyph, x, y);
   }
 
-  void add_glyph_h_origin (hb_codepoint_t glyph,
-                           hb_position_t *x, hb_position_t *y)
+  void add_glyph_h_origins (hb_buffer_t *buf)
   {
-    hb_position_t origin_x, origin_y;
-
-    get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y);
-
-    *x += origin_x;
-    *y += origin_y;
+    apply_glyph_h_origins_with_fallback (buf, +1);
   }
-  void add_glyph_v_origin (hb_codepoint_t glyph,
-                           hb_position_t *x, hb_position_t *y)
+  void add_glyph_v_origins (hb_buffer_t *buf)
   {
-    hb_position_t origin_x, origin_y;
-
-    get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y);
-
-    *x += origin_x;
-    *y += origin_y;
+    apply_glyph_v_origins_with_fallback (buf, +1);
   }
   void add_glyph_origin_for_direction (hb_codepoint_t glyph,
                                        hb_direction_t direction,
                                        hb_position_t *x, hb_position_t *y)
   {
     hb_position_t origin_x, origin_y;
-
     get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y);
-
-    *x += origin_x;
-    *y += origin_y;
+    add_offset (x, y, origin_x, origin_y);
   }
 
-  void subtract_glyph_h_origin (hb_codepoint_t glyph,
-                                hb_position_t *x, hb_position_t *y)
+  void subtract_glyph_h_origins (hb_buffer_t *buf)
   {
-    hb_position_t origin_x, origin_y;
-
-    get_glyph_h_origin_with_fallback (glyph, &origin_x, &origin_y);
-
-    *x -= origin_x;
-    *y -= origin_y;
+    apply_glyph_h_origins_with_fallback (buf, -1);
   }
-  void subtract_glyph_v_origin (hb_codepoint_t glyph,
-                                hb_position_t *x, hb_position_t *y)
+  void subtract_glyph_v_origins (hb_buffer_t *buf)
   {
-    hb_position_t origin_x, origin_y;
-
-    get_glyph_v_origin_with_fallback (glyph, &origin_x, &origin_y);
-
-    *x -= origin_x;
-    *y -= origin_y;
+    apply_glyph_v_origins_with_fallback (buf, -1);
   }
   void subtract_glyph_origin_for_direction (hb_codepoint_t glyph,
                                             hb_direction_t direction,
                                             hb_position_t *x, hb_position_t *y)
   {
     hb_position_t origin_x, origin_y;
-
     get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y);
-
-    *x -= origin_x;
-    *y -= origin_y;
+    subtract_offset (x, y, origin_x, origin_y);
   }
 
   void get_glyph_kerning_for_direction (hb_codepoint_t first_glyph, hb_codepoint_t second_glyph,
@@ -890,11 +1144,6 @@ struct hb_font_t
     return false;
   }
 
-  bool is_synthetic () const
-  {
-    return x_embolden || y_embolden || slant;
-  }
-
   void changed ()
   {
     float upem = face->get_upem ();
@@ -906,6 +1155,8 @@ struct hb_font_t
     bool y_neg = y_scale < 0;
     y_mult = (y_neg ? -((int64_t) -y_scale << 16) : ((int64_t) y_scale << 16)) / upem;
 
+    is_synthetic =  x_embolden || y_embolden || slant;
+
     x_strength = roundf (abs (x_scale) * x_embolden);
     y_strength = roundf (abs (y_scale) * y_embolden);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-pool.hh b/src/java.desktop/share/native/libharfbuzz/hb-free-pool.hh
similarity index 92%
rename from src/java.desktop/share/native/libharfbuzz/hb-pool.hh
rename to src/java.desktop/share/native/libharfbuzz/hb-free-pool.hh
index 613c78d1973..3acd144a857 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-pool.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-free-pool.hh
@@ -24,12 +24,12 @@
  * Facebook Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_POOL_HH
-#define HB_POOL_HH
+#ifndef HB_FREE_POOL_HH
+#define HB_FREE_POOL_HH
 
 #include "hb.hh"
 
-/* Memory pool for persistent allocation of small objects.
+/* Memory pool for persistent alloc/free of small objects.
  *
  * Some AI musings on this, not necessarily true:
  *
@@ -41,10 +41,10 @@
  * sophisticated, use a real allocator.  Or use a real language. */
 
 template <typename T, unsigned ChunkLen = 32>
-struct hb_pool_t
+struct hb_free_pool_t
 {
-  hb_pool_t () : next (nullptr) {}
-  ~hb_pool_t ()
+  hb_free_pool_t () : next (nullptr) {}
+  ~hb_free_pool_t ()
   {
     next = nullptr;
 
@@ -104,4 +104,4 @@ struct hb_pool_t
 };
 
 
-#endif /* HB_POOL_HH */
+#endif /* HB_FREE_POOL_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
index e9c0e734a53..b90f966c57c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
@@ -143,6 +143,9 @@ _hb_ft_font_destroy (void *data)
 /* hb_font changed, update FT_Face. */
 static void _hb_ft_hb_font_changed (hb_font_t *font, FT_Face ft_face)
 {
+  if (unlikely (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy))
+    return;
+
   hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data;
 
   float x_mult = 1.f, y_mult = 1.f;
@@ -184,12 +187,14 @@ static void _hb_ft_hb_font_changed (hb_font_t *font, FT_Face ft_face)
     FT_Set_Transform (ft_face, &matrix, nullptr);
     ft_font->transform = true;
   }
+  else
+    FT_Set_Transform (ft_face, nullptr, nullptr);
 
 #if defined(HAVE_FT_GET_VAR_BLEND_COORDINATES) && !defined(HB_NO_VAR)
-  unsigned int num_coords;
-  const float *coords = hb_font_get_var_coords_design (font, &num_coords);
-  if (num_coords)
+  if (font->has_nonzero_coords)
   {
+    unsigned int num_coords;
+    const float *coords = hb_font_get_var_coords_design (font, &num_coords);
     FT_Fixed *ft_coords = (FT_Fixed *) hb_calloc (num_coords, sizeof (FT_Fixed));
     if (ft_coords)
     {
@@ -199,6 +204,12 @@ static void _hb_ft_hb_font_changed (hb_font_t *font, FT_Face ft_face)
       hb_free (ft_coords);
     }
   }
+  else if (font->num_coords)
+  {
+    // Some old versions of FreeType crash if we
+    // call this function on non-variable fonts.
+    FT_Set_Var_Design_Coordinates (ft_face, 0, nullptr);
+  }
 #endif
 }
 
@@ -1093,6 +1104,10 @@ _hb_ft_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data
   FT_ULong  length = 0;
   FT_Error error;
 
+  /* In new FreeType, a tag value of 1 loads the SFNT table directory. Reject it. */
+  if (tag == 1)
+    return nullptr;
+
   /* Note: FreeType like HarfBuzz uses the NONE tag for fetching the entire blob */
 
   error = FT_Load_Sfnt_Table (ft_face, tag, 0, nullptr, &length);
@@ -1366,7 +1381,7 @@ hb_ft_font_changed (hb_font_t *font)
 
         for (unsigned int i = 0; i < mm_var->num_axis; ++i)
          {
-          coords[i] = ft_coords[i] >>= 2;
+          coords[i] = (ft_coords[i] + 2) >> 2;
           nonzero = nonzero || coords[i];
          }
 
@@ -1717,7 +1732,12 @@ hb_ft_font_set_funcs (hb_font_t *font)
   ft_face->generic.finalizer = _release_blob;
 
   // And the FT_Library to the blob
-  hb_blob_set_user_data (blob, &ft_library_key, ft_library, destroy_ft_library, true);
+  if (unlikely (!hb_blob_set_user_data (blob, &ft_library_key, ft_library, destroy_ft_library, true)))
+  {
+    DEBUG_MSG (FT, font, "hb_blob_set_user_data() failed");
+    FT_Done_Face (ft_face);
+    return;
+  }
 
   _hb_ft_font_set_funcs (font, ft_face, true);
   hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh b/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
index 795f29f6ab0..0de062df68e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
@@ -26,7 +26,10 @@
 
 #include "hb.hh"
 
+#include "hb-algs.hh"
 
+
+template <typename Float = float>
 struct hb_extents_t
 {
   hb_extents_t () {}
@@ -35,7 +38,7 @@ struct hb_extents_t
                 ymin (hb_min (extents.y_bearing, extents.y_bearing + extents.height)),
                 xmax (hb_max (extents.x_bearing, extents.x_bearing + extents.width)),
                 ymax (hb_max (extents.y_bearing, extents.y_bearing + extents.height)) {}
-  hb_extents_t (float xmin, float ymin, float xmax, float ymax) :
+  hb_extents_t (Float xmin, Float ymin, Float xmax, Float ymax) :
     xmin (xmin), ymin (ymin), xmax (xmax), ymax (ymax) {}
 
   bool is_empty () const { return xmin >= xmax || ymin >= ymax; }
@@ -69,7 +72,7 @@ struct hb_extents_t
   }
 
   void
-  add_point (float x, float y)
+  add_point (Float x, Float y)
   {
     if (unlikely (is_void ()))
     {
@@ -97,62 +100,69 @@ struct hb_extents_t
                                yneg ? y1 - y0 : y0 - y1};
   }
 
-  float xmin = 0.f;
-  float ymin = 0.f;
-  float xmax = -1.f;
-  float ymax = -1.f;
+  Float xmin = 0;
+  Float ymin = 0;
+  Float xmax = -1;
+  Float ymax = -1;
 };
 
+template <typename Float = float>
 struct hb_transform_t
 {
   hb_transform_t () {}
-  hb_transform_t (float xx, float yx,
-                  float xy, float yy,
-                  float x0, float y0) :
+  hb_transform_t (Float xx, Float yx,
+                  Float xy, Float yy,
+                  Float x0, Float y0) :
     xx (xx), yx (yx), xy (xy), yy (yy), x0 (x0), y0 (y0) {}
 
   bool is_identity () const
   {
-    return xx == 1.f && yx == 0.f &&
-           xy == 0.f && yy == 1.f &&
-           x0 == 0.f && y0 == 0.f;
+    return xx == 1 && yx == 0 &&
+           xy == 0 && yy == 1 &&
+           x0 == 0 && y0 == 0;
+  }
+  bool is_translation () const
+  {
+    return xx == 1 && yx == 0 &&
+           xy == 0 && yy == 1;
   }
 
-  void multiply (const hb_transform_t &o)
+  void multiply (const hb_transform_t &o, bool before=false)
   {
-    /* Copied from cairo, with "o" being "a" there and "this" being "b" there. */
-    hb_transform_t r;
-
-    r.xx = o.xx * xx + o.yx * xy;
-    r.yx = o.xx * yx + o.yx * yy;
-
-    r.xy = o.xy * xx + o.yy * xy;
-    r.yy = o.xy * yx + o.yy * yy;
-
-    r.x0 = o.x0 * xx + o.y0 * xy + x0;
-    r.y0 = o.x0 * yx + o.y0 * yy + y0;
-
-    *this = r;
+    // Copied from cairo-matrix.c
+    const hb_transform_t &a = before ? o : *this;
+    const hb_transform_t &b = before ? *this : o;
+    *this = {
+      a.xx * b.xx + a.xy * b.yx,
+      a.yx * b.xx + a.yy * b.yx,
+      a.xx * b.xy + a.xy * b.yy,
+      a.yx * b.xy + a.yy * b.yy,
+      a.xx * b.x0 + a.xy * b.y0 + a.x0,
+      a.yx * b.x0 + a.yy * b.y0 + a.y0
+    };
   }
 
-  void transform_distance (float &dx, float &dy) const
+  HB_ALWAYS_INLINE
+  void transform_distance (Float &dx, Float &dy) const
   {
-    float new_x = xx * dx + xy * dy;
-    float new_y = yx * dx + yy * dy;
+    Float new_x = xx * dx + xy * dy;
+    Float new_y = yx * dx + yy * dy;
     dx = new_x;
     dy = new_y;
   }
 
-  void transform_point (float &x, float &y) const
+  HB_ALWAYS_INLINE
+  void transform_point (Float &x, Float &y) const
   {
-    transform_distance (x, y);
-    x += x0;
-    y += y0;
+    Float new_x = x0 + xx * x + xy * y;
+    Float new_y = y0 + yx * x + yy * y;
+    x = new_x;
+    y = new_y;
   }
 
-  void transform_extents (hb_extents_t &extents) const
+  void transform_extents (hb_extents_t<Float> &extents) const
   {
-    float quad_x[4], quad_y[4];
+    Float quad_x[4], quad_y[4];
 
     quad_x[0] = extents.xmin;
     quad_y[0] = extents.ymin;
@@ -163,7 +173,7 @@ struct hb_transform_t
     quad_x[3] = extents.xmax;
     quad_y[3] = extents.ymax;
 
-    extents = hb_extents_t {};
+    extents = hb_extents_t<Float> {};
     for (unsigned i = 0; i < 4; i++)
     {
       transform_point (quad_x[i], quad_y[i]);
@@ -171,20 +181,36 @@ struct hb_transform_t
     }
   }
 
-  void transform (const hb_transform_t &o) { multiply (o); }
+  void transform (const hb_transform_t &o, bool before=false) { multiply (o, before); }
 
-  void translate (float x, float y)
+  static hb_transform_t translation (Float x, Float y)
   {
-    if (x == 0.f && y == 0.f)
-      return;
+    return {1, 0, 0, 1, x, y};
+  }
+  void translate (Float x, Float y, bool before=false)
+  {
+    if (before)
+    {
+      x0 += x;
+      y0 += y;
+    }
+    else
+    {
+      if (x == 0 && y == 0)
+        return;
 
-    x0 += xx * x + xy * y;
-    y0 += yx * x + yy * y;
+      x0 += xx * x + xy * y;
+      y0 += yx * x + yy * y;
+    }
   }
 
-  void scale (float scaleX, float scaleY)
+  static hb_transform_t scaling (Float scaleX, Float scaleY)
   {
-    if (scaleX == 1.f && scaleY == 1.f)
+    return {scaleX, 0, 0, scaleY, 0, 0};
+  }
+  void scale (Float scaleX, Float scaleY)
+  {
+    if (scaleX == 1 && scaleY == 1)
       return;
 
     xx *= scaleX;
@@ -192,52 +218,94 @@ struct hb_transform_t
     xy *= scaleY;
     yy *= scaleY;
   }
-
-  void rotate (float rotation)
+  static hb_transform_t scaling_around_center (Float scaleX, Float scaleY, Float center_x, Float center_y)
   {
-    if (rotation == 0.f)
+    return {scaleX, 0, 0, scaleY,
+            center_x ? (1 - scaleX) * center_x : 0,
+            center_y ? (1 - scaleY) * center_y : 0};
+  }
+  void scale_around_center (Float scaleX, Float scaleY, Float center_x, Float center_y)
+  {
+    if (scaleX == 1 && scaleY == 1)
       return;
 
+    transform (scaling_around_center (scaleX, scaleY, center_x, center_y));
+  }
+
+  static hb_transform_t rotation (Float radians)
+  {
     // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L240
-    rotation = rotation * HB_PI;
-    float c;
-    float s;
-#ifdef HAVE_SINCOSF
-    sincosf (rotation, &s, &c);
-#else
-    c = cosf (rotation);
-    s = sinf (rotation);
-#endif
-    auto other = hb_transform_t{c, s, -s, c, 0.f, 0.f};
-    transform (other);
+    Float c;
+    Float s;
+    hb_sincos (radians, s, c);
+    return {c, s, -s, c, 0, 0};
   }
-
-  void skew (float skewX, float skewY)
+  void rotate (Float radians, bool before=false)
   {
-    if (skewX == 0.f && skewY == 0.f)
+    if (radians == 0)
       return;
 
-    // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L255
-    skewX = skewX * HB_PI;
-    skewY = skewY * HB_PI;
-    auto other = hb_transform_t{1.f,
-                                skewY ? tanf (skewY) : 0.f,
-                                skewX ? tanf (skewX) : 0.f,
-                                1.f,
-                                0.f, 0.f};
-    transform (other);
+    transform (rotation (radians), before);
   }
 
-  float xx = 1.f;
-  float yx = 0.f;
-  float xy = 0.f;
-  float yy = 1.f;
-  float x0 = 0.f;
-  float y0 = 0.f;
+  static hb_transform_t rotation_around_center (Float radians, Float center_x, Float center_y)
+  {
+    Float s, c;
+    hb_sincos (radians, s, c);
+    return {
+      c, s, -s, c,
+      (1 - c) * center_x + s * center_y,
+      -s * center_x +  (1 - c) * center_y
+    };
+  }
+  void rotate_around_center (Float radians, Float center_x, Float center_y, bool before=false)
+  {
+    if (radians == 0)
+      return;
+
+    transform (rotation_around_center (radians, center_x, center_y), before);
+  }
+
+  static hb_transform_t skewing (Float skewX, Float skewY)
+  {
+    return {1, skewY ? tanf (skewY) : 0, skewX ? tanf (skewX) : 0, 1, 0, 0};
+  }
+  void skew (Float skewX, Float skewY)
+  {
+    if (skewX == 0 && skewY == 0)
+      return;
+
+    transform (skewing (skewX, skewY));
+  }
+  static hb_transform_t skewing_around_center (Float skewX, Float skewY, Float center_x, Float center_y)
+  {
+    skewX = skewX ? tanf (skewX) : 0;
+    skewY = skewY ? tanf (skewY) : 0;
+    return {
+            1, skewY, skewX, 1,
+            center_y ? -skewX * center_y : 0,
+            center_x ? -skewY * center_x : 0
+    };
+  }
+  void skew_around_center (Float skewX, Float skewY, Float center_x, Float center_y)
+  {
+    if (skewX == 0 && skewY == 0)
+            return;
+
+    transform (skewing_around_center (skewX, skewY, center_x, center_y));
+  }
+
+  Float xx = 1;
+  Float yx = 0;
+  Float xy = 0;
+  Float yy = 1;
+  Float x0 = 0;
+  Float y0 = 0;
 };
 
-#define HB_TRANSFORM_IDENTITY hb_transform_t{1.f, 0.f, 0.f, 1.f, 0.f, 0.f}
+#define HB_TRANSFORM_IDENTITY {1, 0, 0, 1, 0, 0}
 
+template <typename Float = float>
 struct hb_bounds_t
 {
   enum status_t {
@@ -247,7 +315,7 @@ struct hb_bounds_t
   };
 
   hb_bounds_t (status_t status = UNBOUNDED) : status (status) {}
-  hb_bounds_t (const hb_extents_t &extents) :
+  hb_bounds_t (const hb_extents_t<Float> &extents) :
     status (extents.is_empty () ? EMPTY : BOUNDED), extents (extents) {}
 
   void union_ (const hb_bounds_t &o)
@@ -281,20 +349,21 @@ struct hb_bounds_t
   }
 
   status_t status;
-  hb_extents_t extents;
+  hb_extents_t<Float> extents;
 };
 
+template <typename Float = float>
 struct hb_transform_decomposed_t
 {
-  float translateX = 0;
-  float translateY = 0;
-  float rotation = 0;  // in degrees, counter-clockwise
-  float scaleX = 1;
-  float scaleY = 1;
-  float skewX = 0;  // in degrees, counter-clockwise
-  float skewY = 0;  // in degrees, counter-clockwise
-  float tCenterX = 0;
-  float tCenterY = 0;
+  Float translateX = 0;
+  Float translateY = 0;
+  Float rotation = 0;  // in radians, counter-clockwise
+  Float scaleX = 1;
+  Float scaleY = 1;
+  Float skewX = 0;  // in radians, counter-clockwise
+  Float skewY = 0;  // in radians, counter-clockwise
+  Float tCenterX = 0;
+  Float tCenterY = 0;
 
   operator bool () const
   {
@@ -305,9 +374,9 @@ struct hb_transform_decomposed_t
            tCenterX || tCenterY;
   }
 
-  hb_transform_t to_transform () const
+  hb_transform_t<Float> to_transform () const
   {
-    hb_transform_t t;
+    hb_transform_t<Float> t;
     t.translate (translateX + tCenterX, translateY + tCenterY);
     t.rotate (rotation);
     t.scale (scaleX, scaleY);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-iter.hh b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh
index 21d9544a74b..661e6771a4a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-iter.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh
@@ -772,8 +772,9 @@ struct hb_iota_iter_t :
   template <typename S2 = S>
   auto
   inc (hb_type_identity<S2> s, hb_priority<1>)
-    -> hb_void_t<decltype (hb_invoke (std::forward<S2> (s), hb_declval<T&> ()))>
-  { v = hb_invoke (std::forward<S2> (s), v); }
+    -> hb_void_t<decltype (hb_invoke (std::forward<hb_type_identity<S2>> (s),
+                                      hb_declval<T&> ()))>
+  { v = hb_invoke (std::forward<hb_type_identity<S2>> (s), v); }
 
   void
   inc (S s, hb_priority<0>)
@@ -972,7 +973,7 @@ struct
                     Proj&& f = hb_identity) const
   {
     for (auto it = hb_iter (c); it; ++it)
-      if (!hb_match (std::forward<Pred> (p), hb_get (std::forward<Proj> (f), *it)))
+      if (!hb_match (p, hb_get (f, *it)))
         return false;
     return true;
   }
@@ -989,7 +990,7 @@ struct
                     Proj&& f = hb_identity) const
   {
     for (auto it = hb_iter (c); it; ++it)
-      if (hb_match (std::forward<Pred> (p), hb_get (std::forward<Proj> (f), *it)))
+      if (hb_match (p, hb_get (f, *it)))
         return true;
     return false;
   }
@@ -1006,7 +1007,7 @@ struct
                     Proj&& f = hb_identity) const
   {
     for (auto it = hb_iter (c); it; ++it)
-      if (hb_match (std::forward<Pred> (p), hb_get (std::forward<Proj> (f), *it)))
+      if (hb_match (p, hb_get (f, *it)))
         return false;
     return true;
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-kern.hh b/src/java.desktop/share/native/libharfbuzz/hb-kern.hh
index 1f2c8d5811b..cf08c16689f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-kern.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-kern.hh
@@ -70,7 +70,7 @@ struct hb_kern_machine_t
         continue;
       }
 
-      skippy_iter.reset (idx);
+      skippy_iter.reset_fast (idx);
       unsigned unsafe_to;
       if (!skippy_iter.next (&unsafe_to))
       {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-limits.hh b/src/java.desktop/share/native/libharfbuzz/hb-limits.hh
index fbc7bbe764e..857e183737f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-limits.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-limits.hh
@@ -29,20 +29,20 @@
 
 
 #ifndef HB_BUFFER_MAX_LEN_FACTOR
-#define HB_BUFFER_MAX_LEN_FACTOR 64
+#define HB_BUFFER_MAX_LEN_FACTOR 256
 #endif
 #ifndef HB_BUFFER_MAX_LEN_MIN
-#define HB_BUFFER_MAX_LEN_MIN 16384
+#define HB_BUFFER_MAX_LEN_MIN 65536
 #endif
 #ifndef HB_BUFFER_MAX_LEN_DEFAULT
 #define HB_BUFFER_MAX_LEN_DEFAULT 0x3FFFFFFF /* Shaping more than a billion chars? Let us know! */
 #endif
 
 #ifndef HB_BUFFER_MAX_OPS_FACTOR
-#define HB_BUFFER_MAX_OPS_FACTOR 1024
+#define HB_BUFFER_MAX_OPS_FACTOR 4096
 #endif
 #ifndef HB_BUFFER_MAX_OPS_MIN
-#define HB_BUFFER_MAX_OPS_MIN 16384
+#define HB_BUFFER_MAX_OPS_MIN 65536
 #endif
 #ifndef HB_BUFFER_MAX_OPS_DEFAULT
 #define HB_BUFFER_MAX_OPS_DEFAULT 0x1FFFFFFF /* Shaping more than a billion operations? Let us know! */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
index ffbb8f3d301..8fa32ea8eaa 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-machinery.hh
@@ -66,13 +66,22 @@ static inline Type& StructAtOffsetUnaligned(void *P, unsigned int offset)
 }
 
 /* StructAfter<T>(X) returns the struct T& that is placed after X.
- * Works with X of variable size also.  X must implement get_size() */
-template<typename Type, typename TObject>
-static inline const Type& StructAfter(const TObject &X)
-{ return StructAtOffset<Type>(&X, X.get_size()); }
-template<typename Type, typename TObject>
-static inline Type& StructAfter(TObject &X)
-{ return StructAtOffset<Type>(&X, X.get_size()); }
+ * Works with X of variable size also.  X must implement get_size().
+ * Any extra arguments are forwarded to get_size, so for example
+ * it can work with UnsizedArrayOf<> as well. */
+template <typename Type, typename TObject, typename ...Ts>
+static inline auto StructAfter(const TObject &X, Ts... args) HB_AUTO_RETURN((
+  StructAtOffset<Type>(&X, X.get_size(std::forward<Ts> (args)...))
+))
+/* The is_const shenanigans is to avoid ambiguous overload with gcc-8.
+ * It disables this path when TObject is const.
+ * See: https://github.com/harfbuzz/harfbuzz/issues/5429 */
+template <typename Type, typename TObject, typename ...Ts>
+static inline auto StructAfter(TObject &X, Ts... args) HB_AUTO_RETURN((
+  sizeof(int[std::is_const<TObject>::value ? -1 : +1]) > 0 ?
+  StructAtOffset<Type>(&X, X.get_size(std::forward<Ts> (args)...))
+  : *reinterpret_cast<Type*> (0)
+))
 
 
 /*
@@ -132,7 +141,6 @@ static inline Type& StructAfter(TObject &X)
   DEFINE_SIZE_ARRAY(size, array)
 
 
-
 /*
  * Lazy loaders.
  *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh
index 76206342f57..4c76622df7a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-map.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-map.hh
@@ -47,11 +47,11 @@ struct hb_hashmap_t
   hb_hashmap_t ()  { init (); }
   ~hb_hashmap_t () { fini (); }
 
-  hb_hashmap_t (const hb_hashmap_t& o) : hb_hashmap_t ()
+  void _copy (const hb_hashmap_t& o)
   {
     if (unlikely (!o.mask)) return;
 
-    if (item_t::is_trivial)
+    if (hb_is_trivially_copy_assignable (item_t))
     {
       items = (item_t *) hb_malloc (sizeof (item_t) * (o.mask + 1));
       if (unlikely (!items))
@@ -70,8 +70,16 @@ struct hb_hashmap_t
 
     alloc (o.population); hb_copy (o, *this);
   }
+
+  hb_hashmap_t (const hb_hashmap_t& o) : hb_hashmap_t () { _copy (o); }
+  hb_hashmap_t& operator= (const hb_hashmap_t& o)
+  {
+    reset ();
+    if (!items) { _copy (o); return *this; }
+    alloc (o.population); hb_copy (o, *this); return *this;
+  }
+
   hb_hashmap_t (hb_hashmap_t&& o)  noexcept : hb_hashmap_t () { hb_swap (*this, o); }
-  hb_hashmap_t& operator= (const hb_hashmap_t& o)  { reset (); alloc (o.population); hb_copy (o, *this); return *this; }
   hb_hashmap_t& operator= (hb_hashmap_t&& o)   noexcept { hb_swap (*this, o); return *this; }
 
   hb_hashmap_t (std::initializer_list<hb_pair_t<K, V>> lst) : hb_hashmap_t ()
@@ -130,10 +138,7 @@ struct hb_hashmap_t
     uint32_t total_hash () const
     { return (hash * 31u) + hb_hash (value); }
 
-    static constexpr bool is_trivial = hb_is_trivially_constructible(K) &&
-                                       hb_is_trivially_destructible(K) &&
-                                       hb_is_trivially_constructible(V) &&
-                                       hb_is_trivially_destructible(V);
+    static constexpr bool is_trivially_constructible = (hb_is_trivially_constructible(K) && hb_is_trivially_constructible(V));
   };
 
   hb_object_header_t header;
@@ -174,19 +179,19 @@ struct hb_hashmap_t
     if (likely (items))
     {
       unsigned size = mask + 1;
-      if (!item_t::is_trivial)
-        for (unsigned i = 0; i < size; i++)
-          items[i].~item_t ();
+      for (unsigned i = 0; i < size; i++)
+        items[i].~item_t ();
       hb_free (items);
       items = nullptr;
     }
     population = occupancy = 0;
   }
 
-  void reset ()
+  hb_hashmap_t& reset ()
   {
     successful = true;
     clear ();
+    return *this;
   }
 
   bool in_error () const { return !successful; }
@@ -197,7 +202,7 @@ struct hb_hashmap_t
 
     if (new_population != 0 && (new_population + new_population / 2) < mask) return true;
 
-    unsigned int power = hb_bit_storage (hb_max ((unsigned) population, new_population) * 2 + 8);
+    unsigned int power = hb_bit_storage (hb_max (hb_max ((unsigned) population, new_population) * 2, 4u));
     unsigned int new_size = 1u << power;
     item_t *new_items = (item_t *) hb_malloc ((size_t) new_size * sizeof (item_t));
     if (unlikely (!new_items))
@@ -205,7 +210,7 @@ struct hb_hashmap_t
       successful = false;
       return false;
     }
-    if (!item_t::is_trivial)
+    if (!item_t::is_trivially_constructible)
       for (auto &_ : hb_iter (new_items, new_size))
         new (&_) item_t ();
     else
@@ -231,9 +236,8 @@ struct hb_hashmap_t
                        std::move (old_items[i].value));
       }
     }
-    if (!item_t::is_trivial)
-      for (unsigned int i = 0; i < old_size; i++)
-        old_items[i].~item_t ();
+    for (unsigned int i = 0; i < old_size; i++)
+      old_items[i].~item_t ();
 
     hb_free (old_items);
 
@@ -335,7 +339,13 @@ struct hb_hashmap_t
   bool has (const K &key, VV **vp = nullptr) const
   {
     if (!items) return false;
-    auto *item = fetch_item (key, hb_hash (key));
+    return has_with_hash (key, hb_hash (key), vp);
+  }
+  template <typename VV=V>
+  bool has_with_hash (const K &key, uint32_t hash, VV **vp = nullptr) const
+  {
+    if (!items) return false;
+    auto *item = fetch_item (key, hash);
     if (item)
     {
       if (vp) *vp = std::addressof (item->value);
@@ -481,10 +491,17 @@ struct hb_hashmap_t
   /* Sink interface. */
   hb_hashmap_t& operator << (const hb_pair_t<K, V>& v)
   { set (v.first, v.second); return *this; }
+  template <typename V2 = V,
+            hb_enable_if (!hb_is_trivially_copyable (V2))>
   hb_hashmap_t& operator << (const hb_pair_t<K, V&&>& v)
   { set (v.first, std::move (v.second)); return *this; }
+  template <typename K2 = K,
+            hb_enable_if (!hb_is_trivially_copyable (K2))>
   hb_hashmap_t& operator << (const hb_pair_t<K&&, V>& v)
   { set (std::move (v.first), v.second); return *this; }
+  template <typename K2 = K, typename V2 = V,
+            hb_enable_if (!hb_is_trivially_copyable (K2) &&
+                          !hb_is_trivially_copyable (V2))>
   hb_hashmap_t& operator << (const hb_pair_t<K&&, V&&>& v)
   { set (std::move (v.first), std::move (v.second)); return *this; }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh b/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh
index 9d2867e4835..07f3ebe0c7d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-number-parser.hh
@@ -31,7 +31,7 @@
 #include "hb.hh"
 
 
-#line 35 "hb-number-parser.hh"
+#line 32 "hb-number-parser.hh"
 static const unsigned char _double_parser_trans_keys[] = {
         0u, 0u, 43u, 57u, 46u, 57u, 48u, 57u, 43u, 57u, 48u, 57u, 48u, 101u, 48u, 57u,
         46u, 101u, 0
@@ -135,12 +135,12 @@ strtod_rl (const char *p, const char **end_ptr /* IN/OUT */)
 
   int cs;
 
-#line 139 "hb-number-parser.hh"
+#line 132 "hb-number-parser.hh"
         {
         cs = double_parser_start;
         }
 
-#line 144 "hb-number-parser.hh"
+#line 135 "hb-number-parser.hh"
         {
         int _slen;
         int _trans;
@@ -198,7 +198,7 @@ _resume:
           exp_overflow = true;
 }
         break;
-#line 202 "hb-number-parser.hh"
+#line 187 "hb-number-parser.hh"
         }
 
 _again:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh
index 382ee2ddaf2..538240b6416 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh
@@ -465,11 +465,11 @@ struct OpenTypeFontFile
     Typ1Tag             = HB_TAG ('t','y','p','1')  /* Obsolete Apple Type1 font in SFNT container */
   };
 
-  hb_tag_t get_tag () const { return u.tag; }
+  hb_tag_t get_tag () const { return u.tag.v; }
 
   unsigned int get_face_count () const
   {
-    switch (u.tag) {
+    switch (u.tag.v) {
     case CFFTag:        /* All the non-collection tags */
     case TrueTag:
     case Typ1Tag:
@@ -483,7 +483,7 @@ struct OpenTypeFontFile
   {
     if (base_offset)
       *base_offset = 0;
-    switch (u.tag) {
+    switch (u.tag.v) {
     /* Note: for non-collection SFNT data we ignore index.  This is because
      * Apple dfont container is a container of SFNT's.  So each SFNT is a
      * non-TTC, but the index is more than zero. */
@@ -512,9 +512,9 @@ struct OpenTypeFontFile
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.tag.sanitize (c))) return_trace (false);
+    if (unlikely (!u.tag.v.sanitize (c))) return_trace (false);
     hb_barrier ();
-    switch (u.tag) {
+    switch (u.tag.v) {
     case CFFTag:        /* All the non-collection tags */
     case TrueTag:
     case Typ1Tag:
@@ -527,13 +527,13 @@ struct OpenTypeFontFile
 
   protected:
   union {
-  Tag                   tag;            /* 4-byte identifier. */
+  struct { Tag v; }     tag;            /* 4-byte identifier. */
   OpenTypeFontFace      fontFace;
   TTCHeader             ttcHeader;
   ResourceForkHeader    rfHeader;
   } u;
   public:
-  DEFINE_SIZE_UNION (4, tag);
+  DEFINE_SIZE_UNION (4, tag.v);
 };
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
index 75d87f11ea5..ad831b66d56 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
@@ -54,35 +54,41 @@ namespace OT {
  */
 
 /* Integer types in big-endian order and no alignment requirement */
-template <typename Type,
+template <bool BE,
+          typename Type,
           unsigned int Size = sizeof (Type)>
-struct IntType
+struct NumType
 {
   typedef Type type;
-
-  IntType () = default;
-  explicit constexpr IntType (Type V) : v {V} {}
-  IntType& operator = (Type i) { v = i; return *this; }
   /* For reason we define cast out operator for signed/unsigned, instead of Type, see:
    * https://github.com/harfbuzz/harfbuzz/pull/2875/commits/09836013995cab2b9f07577a179ad7b024130467 */
-  operator typename std::conditional<std::is_signed<Type>::value, signed, unsigned>::type () const { return v; }
+  typedef typename std::conditional<std::is_integral<Type>::value && sizeof (Type) <= sizeof(int),
+                                     typename std::conditional<std::is_signed<Type>::value, signed, unsigned>::type,
+                                     Type>::type WideType;
 
-  bool operator == (const IntType &o) const { return (Type) v == (Type) o.v; }
-  bool operator != (const IntType &o) const { return !(*this == o); }
+  NumType () = default;
+  explicit constexpr NumType (Type V) : v {V} {}
+  NumType& operator = (Type V) { v = V; return *this; }
 
-  IntType& operator += (unsigned count) { *this = *this + count; return *this; }
-  IntType& operator -= (unsigned count) { *this = *this - count; return *this; }
-  IntType& operator ++ () { *this += 1; return *this; }
-  IntType& operator -- () { *this -= 1; return *this; }
-  IntType operator ++ (int) { IntType c (*this); ++*this; return c; }
-  IntType operator -- (int) { IntType c (*this); --*this; return c; }
+  operator WideType () const { return v; }
 
-  HB_INTERNAL static int cmp (const IntType *a, const IntType *b)
+  bool operator == (const NumType &o) const { return (Type) v == (Type) o.v; }
+  bool operator != (const NumType &o) const { return !(*this == o); }
+
+  NumType& operator += (WideType count) { *this = *this + count; return *this; }
+  NumType& operator -= (WideType count) { *this = *this - count; return *this; }
+  NumType& operator ++ () { *this += 1; return *this; }
+  NumType& operator -- () { *this -= 1; return *this; }
+  NumType operator ++ (int) { NumType c (*this); ++*this; return c; }
+  NumType operator -- (int) { NumType c (*this); --*this; return c; }
+
+  uint32_t hash () const { return hb_array ((const char *) &v, sizeof (v)).hash (); }
+  HB_INTERNAL static int cmp (const NumType *a, const NumType *b)
   { return b->cmp (*a); }
   HB_INTERNAL static int cmp (const void *a, const void *b)
   {
-    IntType *pa = (IntType *) a;
-    IntType *pb = (IntType *) b;
+    NumType *pa = (NumType *) a;
+    NumType *pb = (NumType *) b;
 
     return pb->cmp (*pa);
   }
@@ -99,20 +105,36 @@ struct IntType
     return_trace (c->check_struct (this));
   }
   protected:
-  BEInt<Type, Size> v;
+  typename std::conditional<std::is_integral<Type>::value,
+                            HBInt<BE, Type, Size>,
+                            HBFloat<BE, Type, Size>>::type v;
   public:
   DEFINE_SIZE_STATIC (Size);
 };
 
-typedef IntType<uint8_t>  HBUINT8;      /* 8-bit unsigned integer. */
-typedef IntType<int8_t>   HBINT8;       /* 8-bit signed integer. */
-typedef IntType<uint16_t> HBUINT16;     /* 16-bit unsigned integer. */
-typedef IntType<int16_t>  HBINT16;      /* 16-bit signed integer. */
-typedef IntType<uint32_t> HBUINT32;     /* 32-bit unsigned integer. */
-typedef IntType<int32_t>  HBINT32;      /* 32-bit signed integer. */
+typedef NumType<true, uint8_t>  HBUINT8;        /* 8-bit big-endian unsigned integer. */
+typedef NumType<true, int8_t>   HBINT8;         /* 8-bit big-endian signed integer. */
+typedef NumType<true, uint16_t> HBUINT16;       /* 16-bit big-endian unsigned integer. */
+typedef NumType<true, int16_t>  HBINT16;        /* 16-bit big-endian signed integer. */
+typedef NumType<true, uint32_t> HBUINT32;       /* 32-bit big-endian unsigned integer. */
+typedef NumType<true, int32_t>  HBINT32;        /* 32-bit big-endian signed integer. */
+typedef NumType<true, uint64_t> HBUINT64;       /* 64-bit big-endian unsigned integer. */
+typedef NumType<true, int64_t>  HBINT64;        /* 64-bit big-endian signed integer. */
 /* Note: we cannot defined a signed HBINT24 because there's no corresponding C type.
  * Works for unsigned, but not signed, since we rely on compiler for sign-extension. */
-typedef IntType<uint32_t, 3> HBUINT24;  /* 24-bit unsigned integer. */
+typedef NumType<true, uint32_t, 3> HBUINT24;    /* 24-bit big-endian unsigned integer. */
+
+typedef NumType<false, uint16_t> HBUINT16LE;    /* 16-bit little-endian unsigned integer. */
+typedef NumType<false, int16_t>  HBINT16LE;     /* 16-bit little-endian signed integer. */
+typedef NumType<false, uint32_t> HBUINT32LE;    /* 32-bit little-endian unsigned integer. */
+typedef NumType<false, int32_t>  HBINT32LE;     /* 32-bit little-endian signed integer. */
+typedef NumType<false, uint64_t> HBUINT64LE;    /* 64-bit little-endian unsigned integer. */
+typedef NumType<false, int64_t>  HBINT64LE;     /* 64-bit little-endian signed integer. */
+
+typedef NumType<true,  float>  HBFLOAT32BE;     /* 32-bit little-endian floating point number. */
+typedef NumType<true,  double> HBFLOAT64BE;     /* 64-bit little-endian floating point number. */
+typedef NumType<false, float>  HBFLOAT32LE;     /* 32-bit little-endian floating point number. */
+typedef NumType<false, double> HBFLOAT64LE;     /* 64-bit little-endian floating point number. */
 
 /* 15-bit unsigned number; top bit used for extension. */
 struct HBUINT15 : HBUINT16
@@ -218,7 +240,7 @@ typedef HBUINT16 UFWORD;
 template <typename Type, unsigned fraction_bits>
 struct HBFixed : Type
 {
-  static constexpr float shift = (float) (1 << fraction_bits);
+  static constexpr float mult = 1.f / (1 << fraction_bits);
   static_assert (Type::static_size * 8 > fraction_bits, "");
 
   operator signed () const = delete;
@@ -226,8 +248,8 @@ struct HBFixed : Type
   explicit operator float () const { return to_float (); }
   typename Type::type to_int () const { return Type::v; }
   void set_int (typename Type::type i ) { Type::v = i; }
-  float to_float (float offset = 0) const  { return ((int32_t) Type::v + offset) / shift; }
-  void set_float (float f) { Type::v = roundf (f * shift); }
+  float to_float (float offset = 0) const  { return ((int32_t) Type::v + offset) * mult; }
+  void set_float (float f) { Type::v = roundf (f / mult); }
   public:
   DEFINE_SIZE_STATIC (Type::static_size);
 };
@@ -504,16 +526,9 @@ struct OffsetTo : Offset<OffsetType, has_null>
     return_trace (sanitize_shallow (c, base) &&
                   hb_barrier () &&
                   (this->is_null () ||
-                   c->dispatch (StructAtOffset<Type> (base, *this), std::forward<Ts> (ds)...) ||
-                   neuter (c)));
+                   c->dispatch (StructAtOffset<Type> (base, *this), std::forward<Ts> (ds)...)));
   }
 
-  /* Set the offset to Null */
-  bool neuter (hb_sanitize_context_t *c) const
-  {
-    if (!has_null) return false;
-    return c->try_set (this, 0);
-  }
   DEFINE_SIZE_STATIC (sizeof (OffsetType));
 };
 /* Partial specializations. */
@@ -1481,8 +1496,8 @@ struct TupleValues
     VALUE_RUN_COUNT_MASK = 0x3F
   };
 
-  static unsigned compile (hb_array_t<const int> values, /* IN */
-                           hb_array_t<unsigned char> encoded_bytes /* OUT */)
+  static unsigned compile_unsafe (hb_array_t<const int> values, /* IN */
+                                  unsigned char *encoded_bytes /* OUT */)
   {
     unsigned num_values = values.length;
     unsigned encoded_len = 0;
@@ -1491,24 +1506,23 @@ struct TupleValues
     {
       int val = values.arrayZ[i];
       if (val == 0)
-        encoded_len += encode_value_run_as_zeroes (i, encoded_bytes.sub_array (encoded_len), values);
-      else if (val >= -128 && val <= 127)
-        encoded_len += encode_value_run_as_bytes (i, encoded_bytes.sub_array (encoded_len), values);
-      else if (val >= -32768 && val <= 32767)
-        encoded_len += encode_value_run_as_words (i, encoded_bytes.sub_array (encoded_len), values);
+        encoded_len += encode_value_run_as_zeroes (i, encoded_bytes + encoded_len, values);
+      else if ((int8_t) val == val)
+        encoded_len += encode_value_run_as_bytes (i, encoded_bytes + encoded_len, values);
+      else if ((int16_t) val == val)
+        encoded_len += encode_value_run_as_words (i, encoded_bytes + encoded_len, values);
       else
-        encoded_len += encode_value_run_as_longs (i, encoded_bytes.sub_array (encoded_len), values);
+        encoded_len += encode_value_run_as_longs (i, encoded_bytes + encoded_len, values);
     }
     return encoded_len;
   }
 
   static unsigned encode_value_run_as_zeroes (unsigned& i,
-                                              hb_array_t<unsigned char> encoded_bytes,
+                                              unsigned char *it,
                                               hb_array_t<const int> values)
   {
     unsigned num_values = values.length;
     unsigned run_length = 0;
-    auto it = encoded_bytes.iter ();
     unsigned encoded_len = 0;
     while (i < num_values && values.arrayZ[i] == 0)
     {
@@ -1532,7 +1546,7 @@ struct TupleValues
   }
 
   static unsigned encode_value_run_as_bytes (unsigned &i,
-                                             hb_array_t<unsigned char> encoded_bytes,
+                                             unsigned char *it,
                                              hb_array_t<const int> values)
   {
     unsigned start = i;
@@ -1540,7 +1554,7 @@ struct TupleValues
     while (i < num_values)
     {
       int val = values.arrayZ[i];
-      if (val > 127 || val < -128)
+      if ((int8_t) val != val)
         break;
 
       /* from fonttools: if there're 2 or more zeros in a sequence,
@@ -1553,7 +1567,6 @@ struct TupleValues
     unsigned run_length = i - start;
 
     unsigned encoded_len = 0;
-    auto it = encoded_bytes.iter ();
 
     while (run_length >= 64)
     {
@@ -1561,10 +1574,9 @@ struct TupleValues
       encoded_len++;
 
       for (unsigned j = 0; j < 64; j++)
-      {
-        *it++ = static_cast<char> (values.arrayZ[start + j]);
-        encoded_len++;
-      }
+        it[j] = static_cast<char> (values.arrayZ[start + j]);
+      it += 64;
+      encoded_len += 64;
 
       start += 64;
       run_length -= 64;
@@ -1575,18 +1587,16 @@ struct TupleValues
       *it++ = (VALUES_ARE_BYTES | (run_length - 1));
       encoded_len++;
 
-      while (start < i)
-      {
-        *it++ = static_cast<char> (values.arrayZ[start++]);
-        encoded_len++;
-      }
+      for (unsigned j = 0; j < run_length; j++)
+        it[j] = static_cast<char> (values.arrayZ[start + j]);
+      encoded_len += run_length;
     }
 
     return encoded_len;
   }
 
   static unsigned encode_value_run_as_words (unsigned &i,
-                                             hb_array_t<unsigned char> encoded_bytes,
+                                             unsigned char *it,
                                              hb_array_t<const int> values)
   {
     unsigned start = i;
@@ -1595,22 +1605,24 @@ struct TupleValues
     {
       int val = values.arrayZ[i];
 
-      /* start a new run for a single zero value*/
+      if ((int16_t) val != val)
+        break;
+
+      /* start a new run for a single zero value. */
       if (val == 0) break;
 
-      /* from fonttools: continue word-encoded run if there's only one
+      /* From fonttools: continue word-encoded run if there's only one
        * single value in the range [-128, 127] because it is more compact.
        * Only start a new run when there're 2 continuous such values. */
-      if (val >= -128 && val <= 127 &&
+      if ((int8_t) val == val &&
           i + 1 < num_values &&
-          values.arrayZ[i+1] >= -128 && values.arrayZ[i+1] <= 127)
+          (int8_t) values.arrayZ[i+1] == values.arrayZ[i+1])
         break;
 
       i++;
     }
 
     unsigned run_length = i - start;
-    auto it = encoded_bytes.iter ();
     unsigned encoded_len = 0;
     while (run_length >= 64)
     {
@@ -1647,7 +1659,7 @@ struct TupleValues
   }
 
   static unsigned encode_value_run_as_longs (unsigned &i,
-                                             hb_array_t<unsigned char> encoded_bytes,
+                                             unsigned char *it,
                                              hb_array_t<const int> values)
   {
     unsigned start = i;
@@ -1656,14 +1668,13 @@ struct TupleValues
     {
       int val = values.arrayZ[i];
 
-      if (val >= -32768 && val <= 32767)
+      if ((int16_t) val == val)
         break;
 
       i++;
     }
 
     unsigned run_length = i - start;
-    auto it = encoded_bytes.iter ();
     unsigned encoded_len = 0;
     while (run_length >= 64)
     {
@@ -1704,10 +1715,14 @@ struct TupleValues
   }
 
   template <typename T>
+#ifndef HB_OPTIMIZE_SIZE
+  HB_ALWAYS_INLINE
+#endif
   static bool decompile (const HBUINT8 *&p /* IN/OUT */,
                          hb_vector_t<T> &values /* IN/OUT */,
                          const HBUINT8 *end,
-                         bool consume_all = false)
+                         bool consume_all = false,
+                         unsigned start = 0)
   {
     unsigned i = 0;
     unsigned count = consume_all ? UINT_MAX : values.length;
@@ -1720,19 +1735,24 @@ struct TupleValues
       unsigned run_count = (control & VALUE_RUN_COUNT_MASK) + 1;
       if (consume_all)
       {
-        if (unlikely (!values.resize (values.length + run_count, false)))
+        if (unlikely (!values.resize_dirty  (values.length + run_count)))
           return false;
       }
       unsigned stop = i + run_count;
       if (unlikely (stop > count)) return false;
+
+      unsigned skip = i < start ? hb_min (start - i, run_count) : 0;
+      i += skip;
+
       if ((control & VALUES_SIZE_MASK) == VALUES_ARE_ZEROS)
       {
-        for (; i < stop; i++)
-          values.arrayZ[i] = 0;
+        hb_memset (&values.arrayZ[i], 0, (stop - i) * sizeof (T));
+        i = stop;
       }
       else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_WORDS)
       {
         if (unlikely (p + run_count * HBINT16::static_size > end)) return false;
+        p += skip * HBINT16::static_size;
 #ifndef HB_OPTIMIZE_SIZE
         for (; i + 3 < stop; i += 4)
         {
@@ -1755,6 +1775,7 @@ struct TupleValues
       else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_LONGS)
       {
         if (unlikely (p + run_count * HBINT32::static_size > end)) return false;
+        p += skip * HBINT32::static_size;
         for (; i < stop; i++)
         {
           values.arrayZ[i] = * (const HBINT32 *) p;
@@ -1764,6 +1785,7 @@ struct TupleValues
       else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_BYTES)
       {
         if (unlikely (p + run_count > end)) return false;
+        p += skip * HBINT8::static_size;
 #ifndef HB_OPTIMIZE_SIZE
         for (; i + 3 < stop; i += 4)
         {
@@ -1784,7 +1806,7 @@ struct TupleValues
   {
     iter_t (const unsigned char *p_, unsigned len_)
             : p (p_), endp (p_ + len_)
-    { if (ensure_run ()) read_value (); }
+    { if (likely (ensure_run ())) read_value (); }
 
     private:
     const unsigned char *p;
@@ -1793,10 +1815,14 @@ struct TupleValues
     signed run_count = 0;
     unsigned width = 0;
 
+    HB_ALWAYS_INLINE
     bool ensure_run ()
     {
       if (likely (run_count > 0)) return true;
-
+      return _ensure_run ();
+    }
+    bool _ensure_run ()
+    {
       if (unlikely (p >= endp))
       {
         run_count = 0;
@@ -1886,10 +1912,15 @@ struct TupleValues
     signed run_count = 0;
     unsigned width = 0;
 
+    HB_ALWAYS_INLINE
     bool ensure_run ()
     {
-      if (run_count > 0) return true;
+      if (likely (run_count > 0)) return true;
+      return _ensure_run ();
+    }
 
+    bool _ensure_run ()
+    {
       if (unlikely (p >= end))
       {
         run_count = 0;
@@ -2013,7 +2044,10 @@ struct TupleValues
       }
 
 #ifndef HB_OPTIMIZE_SIZE
-      if (scale == 1.0f)
+      // The following branch is supposed to speed things up by avoiding
+      // the multiplication in _add_to<> if scale is 1.0f.
+      // But in practice it seems to bloat the code and slow things down.
+      if (false && scale == 1.0f)
         _add_to<false> (out);
       else
 #endif
@@ -2038,6 +2072,23 @@ struct TupleList : CFF2Index
 };
 
 
+// Alignment
+
+template <unsigned int alignment>
+struct Align
+{
+  unsigned get_size (const void *base) const
+  {
+    unsigned offset = (const char *) this - (const char *) base;
+    return (alignment - offset) & (alignment - 1);
+  }
+
+  public:
+  DEFINE_SIZE_MIN (0);
+};
+
+
+
 } /* namespace OT */
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh
index 1e3e0be5106..ec018efe645 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh
@@ -79,7 +79,7 @@ struct Dict : UnsizedByteStr
   {
     TRACE_SERIALIZE (this);
     for (unsigned int i = 0; i < dictval.get_count (); i++)
-      if (unlikely (!opszr.serialize (c, dictval[i], std::forward<Ts> (ds)...)))
+      if (unlikely (!opszr.serialize (c, dictval[i], ds...)))
         return_trace (false);
 
     return_trace (true);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-std-str.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-std-str.hh
index 65d56ae18b5..bf56abb975c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-std-str.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-std-str.hh
@@ -30,396 +30,396 @@
 #include "hb.hh"
 #endif
 
-_S(".notdef")
-_S("space")
-_S("exclam")
-_S("quotedbl")
-_S("numbersign")
-_S("dollar")
-_S("percent")
-_S("ampersand")
-_S("quoteright")
-_S("parenleft")
-_S("parenright")
-_S("asterisk")
-_S("plus")
-_S("comma")
-_S("hyphen")
-_S("period")
-_S("slash")
-_S("zero")
-_S("one")
-_S("two")
-_S("three")
-_S("four")
-_S("five")
-_S("six")
-_S("seven")
-_S("eight")
-_S("nine")
-_S("colon")
-_S("semicolon")
-_S("less")
-_S("equal")
-_S("greater")
-_S("question")
-_S("at")
-_S("A")
-_S("B")
-_S("C")
-_S("D")
-_S("E")
-_S("F")
-_S("G")
-_S("H")
-_S("I")
-_S("J")
-_S("K")
-_S("L")
-_S("M")
-_S("N")
-_S("O")
-_S("P")
-_S("Q")
-_S("R")
-_S("S")
-_S("T")
-_S("U")
-_S("V")
-_S("W")
-_S("X")
-_S("Y")
-_S("Z")
-_S("bracketleft")
-_S("backslash")
-_S("bracketright")
-_S("asciicircum")
-_S("underscore")
-_S("quoteleft")
-_S("a")
-_S("b")
-_S("c")
-_S("d")
-_S("e")
-_S("f")
-_S("g")
-_S("h")
-_S("i")
-_S("j")
-_S("k")
-_S("l")
-_S("m")
-_S("n")
-_S("o")
-_S("p")
-_S("q")
-_S("r")
-_S("s")
-_S("t")
-_S("u")
-_S("v")
-_S("w")
-_S("x")
-_S("y")
-_S("z")
-_S("braceleft")
-_S("bar")
-_S("braceright")
-_S("asciitilde")
-_S("exclamdown")
-_S("cent")
-_S("sterling")
-_S("fraction")
-_S("yen")
-_S("florin")
-_S("section")
-_S("currency")
-_S("quotesingle")
-_S("quotedblleft")
-_S("guillemotleft")
-_S("guilsinglleft")
-_S("guilsinglright")
-_S("fi")
-_S("fl")
-_S("endash")
-_S("dagger")
-_S("daggerdbl")
-_S("periodcentered")
-_S("paragraph")
-_S("bullet")
-_S("quotesinglbase")
-_S("quotedblbase")
-_S("quotedblright")
-_S("guillemotright")
-_S("ellipsis")
-_S("perthousand")
-_S("questiondown")
-_S("grave")
-_S("acute")
-_S("circumflex")
-_S("tilde")
-_S("macron")
-_S("breve")
-_S("dotaccent")
-_S("dieresis")
-_S("ring")
-_S("cedilla")
-_S("hungarumlaut")
-_S("ogonek")
-_S("caron")
-_S("emdash")
-_S("AE")
-_S("ordfeminine")
-_S("Lslash")
-_S("Oslash")
-_S("OE")
-_S("ordmasculine")
-_S("ae")
-_S("dotlessi")
-_S("lslash")
-_S("oslash")
-_S("oe")
-_S("germandbls")
-_S("onesuperior")
-_S("logicalnot")
-_S("mu")
-_S("trademark")
-_S("Eth")
-_S("onehalf")
-_S("plusminus")
-_S("Thorn")
-_S("onequarter")
-_S("divide")
-_S("brokenbar")
-_S("degree")
-_S("thorn")
-_S("threequarters")
-_S("twosuperior")
-_S("registered")
-_S("minus")
-_S("eth")
-_S("multiply")
-_S("threesuperior")
-_S("copyright")
-_S("Aacute")
-_S("Acircumflex")
-_S("Adieresis")
-_S("Agrave")
-_S("Aring")
-_S("Atilde")
-_S("Ccedilla")
-_S("Eacute")
-_S("Ecircumflex")
-_S("Edieresis")
-_S("Egrave")
-_S("Iacute")
-_S("Icircumflex")
-_S("Idieresis")
-_S("Igrave")
-_S("Ntilde")
-_S("Oacute")
-_S("Ocircumflex")
-_S("Odieresis")
-_S("Ograve")
-_S("Otilde")
-_S("Scaron")
-_S("Uacute")
-_S("Ucircumflex")
-_S("Udieresis")
-_S("Ugrave")
-_S("Yacute")
-_S("Ydieresis")
-_S("Zcaron")
-_S("aacute")
-_S("acircumflex")
-_S("adieresis")
-_S("agrave")
-_S("aring")
-_S("atilde")
-_S("ccedilla")
-_S("eacute")
-_S("ecircumflex")
-_S("edieresis")
-_S("egrave")
-_S("iacute")
-_S("icircumflex")
-_S("idieresis")
-_S("igrave")
-_S("ntilde")
-_S("oacute")
-_S("ocircumflex")
-_S("odieresis")
-_S("ograve")
-_S("otilde")
-_S("scaron")
-_S("uacute")
-_S("ucircumflex")
-_S("udieresis")
-_S("ugrave")
-_S("yacute")
-_S("ydieresis")
-_S("zcaron")
-_S("exclamsmall")
-_S("Hungarumlautsmall")
-_S("dollaroldstyle")
-_S("dollarsuperior")
-_S("ampersandsmall")
-_S("Acutesmall")
-_S("parenleftsuperior")
-_S("parenrightsuperior")
-_S("twodotenleader")
-_S("onedotenleader")
-_S("zerooldstyle")
-_S("oneoldstyle")
-_S("twooldstyle")
-_S("threeoldstyle")
-_S("fouroldstyle")
-_S("fiveoldstyle")
-_S("sixoldstyle")
-_S("sevenoldstyle")
-_S("eightoldstyle")
-_S("nineoldstyle")
-_S("commasuperior")
-_S("threequartersemdash")
-_S("periodsuperior")
-_S("questionsmall")
-_S("asuperior")
-_S("bsuperior")
-_S("centsuperior")
-_S("dsuperior")
-_S("esuperior")
-_S("isuperior")
-_S("lsuperior")
-_S("msuperior")
-_S("nsuperior")
-_S("osuperior")
-_S("rsuperior")
-_S("ssuperior")
-_S("tsuperior")
-_S("ff")
-_S("ffi")
-_S("ffl")
-_S("parenleftinferior")
-_S("parenrightinferior")
-_S("Circumflexsmall")
-_S("hyphensuperior")
-_S("Gravesmall")
-_S("Asmall")
-_S("Bsmall")
-_S("Csmall")
-_S("Dsmall")
-_S("Esmall")
-_S("Fsmall")
-_S("Gsmall")
-_S("Hsmall")
-_S("Ismall")
-_S("Jsmall")
-_S("Ksmall")
-_S("Lsmall")
-_S("Msmall")
-_S("Nsmall")
-_S("Osmall")
-_S("Psmall")
-_S("Qsmall")
-_S("Rsmall")
-_S("Ssmall")
-_S("Tsmall")
-_S("Usmall")
-_S("Vsmall")
-_S("Wsmall")
-_S("Xsmall")
-_S("Ysmall")
-_S("Zsmall")
-_S("colonmonetary")
-_S("onefitted")
-_S("rupiah")
-_S("Tildesmall")
-_S("exclamdownsmall")
-_S("centoldstyle")
-_S("Lslashsmall")
-_S("Scaronsmall")
-_S("Zcaronsmall")
-_S("Dieresissmall")
-_S("Brevesmall")
-_S("Caronsmall")
-_S("Dotaccentsmall")
-_S("Macronsmall")
-_S("figuredash")
-_S("hypheninferior")
-_S("Ogoneksmall")
-_S("Ringsmall")
-_S("Cedillasmall")
-_S("questiondownsmall")
-_S("oneeighth")
-_S("threeeighths")
-_S("fiveeighths")
-_S("seveneighths")
-_S("onethird")
-_S("twothirds")
-_S("zerosuperior")
-_S("foursuperior")
-_S("fivesuperior")
-_S("sixsuperior")
-_S("sevensuperior")
-_S("eightsuperior")
-_S("ninesuperior")
-_S("zeroinferior")
-_S("oneinferior")
-_S("twoinferior")
-_S("threeinferior")
-_S("fourinferior")
-_S("fiveinferior")
-_S("sixinferior")
-_S("seveninferior")
-_S("eightinferior")
-_S("nineinferior")
-_S("centinferior")
-_S("dollarinferior")
-_S("periodinferior")
-_S("commainferior")
-_S("Agravesmall")
-_S("Aacutesmall")
-_S("Acircumflexsmall")
-_S("Atildesmall")
-_S("Adieresissmall")
-_S("Aringsmall")
-_S("AEsmall")
-_S("Ccedillasmall")
-_S("Egravesmall")
-_S("Eacutesmall")
-_S("Ecircumflexsmall")
-_S("Edieresissmall")
-_S("Igravesmall")
-_S("Iacutesmall")
-_S("Icircumflexsmall")
-_S("Idieresissmall")
-_S("Ethsmall")
-_S("Ntildesmall")
-_S("Ogravesmall")
-_S("Oacutesmall")
-_S("Ocircumflexsmall")
-_S("Otildesmall")
-_S("Odieresissmall")
-_S("OEsmall")
-_S("Oslashsmall")
-_S("Ugravesmall")
-_S("Uacutesmall")
-_S("Ucircumflexsmall")
-_S("Udieresissmall")
-_S("Yacutesmall")
-_S("Thornsmall")
-_S("Ydieresissmall")
-_S("001.000")
-_S("001.001")
-_S("001.002")
-_S("001.003")
-_S("Black")
-_S("Bold")
-_S("Book")
-_S("Light")
-_S("Medium")
-_S("Regular")
-_S("Roman")
-_S("Semibold")
+HB_STR(".notdef")
+HB_STR("space")
+HB_STR("exclam")
+HB_STR("quotedbl")
+HB_STR("numbersign")
+HB_STR("dollar")
+HB_STR("percent")
+HB_STR("ampersand")
+HB_STR("quoteright")
+HB_STR("parenleft")
+HB_STR("parenright")
+HB_STR("asterisk")
+HB_STR("plus")
+HB_STR("comma")
+HB_STR("hyphen")
+HB_STR("period")
+HB_STR("slash")
+HB_STR("zero")
+HB_STR("one")
+HB_STR("two")
+HB_STR("three")
+HB_STR("four")
+HB_STR("five")
+HB_STR("six")
+HB_STR("seven")
+HB_STR("eight")
+HB_STR("nine")
+HB_STR("colon")
+HB_STR("semicolon")
+HB_STR("less")
+HB_STR("equal")
+HB_STR("greater")
+HB_STR("question")
+HB_STR("at")
+HB_STR("A")
+HB_STR("B")
+HB_STR("C")
+HB_STR("D")
+HB_STR("E")
+HB_STR("F")
+HB_STR("G")
+HB_STR("H")
+HB_STR("I")
+HB_STR("J")
+HB_STR("K")
+HB_STR("L")
+HB_STR("M")
+HB_STR("N")
+HB_STR("O")
+HB_STR("P")
+HB_STR("Q")
+HB_STR("R")
+HB_STR("S")
+HB_STR("T")
+HB_STR("U")
+HB_STR("V")
+HB_STR("W")
+HB_STR("X")
+HB_STR("Y")
+HB_STR("Z")
+HB_STR("bracketleft")
+HB_STR("backslash")
+HB_STR("bracketright")
+HB_STR("asciicircum")
+HB_STR("underscore")
+HB_STR("quoteleft")
+HB_STR("a")
+HB_STR("b")
+HB_STR("c")
+HB_STR("d")
+HB_STR("e")
+HB_STR("f")
+HB_STR("g")
+HB_STR("h")
+HB_STR("i")
+HB_STR("j")
+HB_STR("k")
+HB_STR("l")
+HB_STR("m")
+HB_STR("n")
+HB_STR("o")
+HB_STR("p")
+HB_STR("q")
+HB_STR("r")
+HB_STR("s")
+HB_STR("t")
+HB_STR("u")
+HB_STR("v")
+HB_STR("w")
+HB_STR("x")
+HB_STR("y")
+HB_STR("z")
+HB_STR("braceleft")
+HB_STR("bar")
+HB_STR("braceright")
+HB_STR("asciitilde")
+HB_STR("exclamdown")
+HB_STR("cent")
+HB_STR("sterling")
+HB_STR("fraction")
+HB_STR("yen")
+HB_STR("florin")
+HB_STR("section")
+HB_STR("currency")
+HB_STR("quotesingle")
+HB_STR("quotedblleft")
+HB_STR("guillemotleft")
+HB_STR("guilsinglleft")
+HB_STR("guilsinglright")
+HB_STR("fi")
+HB_STR("fl")
+HB_STR("endash")
+HB_STR("dagger")
+HB_STR("daggerdbl")
+HB_STR("periodcentered")
+HB_STR("paragraph")
+HB_STR("bullet")
+HB_STR("quotesinglbase")
+HB_STR("quotedblbase")
+HB_STR("quotedblright")
+HB_STR("guillemotright")
+HB_STR("ellipsis")
+HB_STR("perthousand")
+HB_STR("questiondown")
+HB_STR("grave")
+HB_STR("acute")
+HB_STR("circumflex")
+HB_STR("tilde")
+HB_STR("macron")
+HB_STR("breve")
+HB_STR("dotaccent")
+HB_STR("dieresis")
+HB_STR("ring")
+HB_STR("cedilla")
+HB_STR("hungarumlaut")
+HB_STR("ogonek")
+HB_STR("caron")
+HB_STR("emdash")
+HB_STR("AE")
+HB_STR("ordfeminine")
+HB_STR("Lslash")
+HB_STR("Oslash")
+HB_STR("OE")
+HB_STR("ordmasculine")
+HB_STR("ae")
+HB_STR("dotlessi")
+HB_STR("lslash")
+HB_STR("oslash")
+HB_STR("oe")
+HB_STR("germandbls")
+HB_STR("onesuperior")
+HB_STR("logicalnot")
+HB_STR("mu")
+HB_STR("trademark")
+HB_STR("Eth")
+HB_STR("onehalf")
+HB_STR("plusminus")
+HB_STR("Thorn")
+HB_STR("onequarter")
+HB_STR("divide")
+HB_STR("brokenbar")
+HB_STR("degree")
+HB_STR("thorn")
+HB_STR("threequarters")
+HB_STR("twosuperior")
+HB_STR("registered")
+HB_STR("minus")
+HB_STR("eth")
+HB_STR("multiply")
+HB_STR("threesuperior")
+HB_STR("copyright")
+HB_STR("Aacute")
+HB_STR("Acircumflex")
+HB_STR("Adieresis")
+HB_STR("Agrave")
+HB_STR("Aring")
+HB_STR("Atilde")
+HB_STR("Ccedilla")
+HB_STR("Eacute")
+HB_STR("Ecircumflex")
+HB_STR("Edieresis")
+HB_STR("Egrave")
+HB_STR("Iacute")
+HB_STR("Icircumflex")
+HB_STR("Idieresis")
+HB_STR("Igrave")
+HB_STR("Ntilde")
+HB_STR("Oacute")
+HB_STR("Ocircumflex")
+HB_STR("Odieresis")
+HB_STR("Ograve")
+HB_STR("Otilde")
+HB_STR("Scaron")
+HB_STR("Uacute")
+HB_STR("Ucircumflex")
+HB_STR("Udieresis")
+HB_STR("Ugrave")
+HB_STR("Yacute")
+HB_STR("Ydieresis")
+HB_STR("Zcaron")
+HB_STR("aacute")
+HB_STR("acircumflex")
+HB_STR("adieresis")
+HB_STR("agrave")
+HB_STR("aring")
+HB_STR("atilde")
+HB_STR("ccedilla")
+HB_STR("eacute")
+HB_STR("ecircumflex")
+HB_STR("edieresis")
+HB_STR("egrave")
+HB_STR("iacute")
+HB_STR("icircumflex")
+HB_STR("idieresis")
+HB_STR("igrave")
+HB_STR("ntilde")
+HB_STR("oacute")
+HB_STR("ocircumflex")
+HB_STR("odieresis")
+HB_STR("ograve")
+HB_STR("otilde")
+HB_STR("scaron")
+HB_STR("uacute")
+HB_STR("ucircumflex")
+HB_STR("udieresis")
+HB_STR("ugrave")
+HB_STR("yacute")
+HB_STR("ydieresis")
+HB_STR("zcaron")
+HB_STR("exclamsmall")
+HB_STR("Hungarumlautsmall")
+HB_STR("dollaroldstyle")
+HB_STR("dollarsuperior")
+HB_STR("ampersandsmall")
+HB_STR("Acutesmall")
+HB_STR("parenleftsuperior")
+HB_STR("parenrightsuperior")
+HB_STR("twodotenleader")
+HB_STR("onedotenleader")
+HB_STR("zerooldstyle")
+HB_STR("oneoldstyle")
+HB_STR("twooldstyle")
+HB_STR("threeoldstyle")
+HB_STR("fouroldstyle")
+HB_STR("fiveoldstyle")
+HB_STR("sixoldstyle")
+HB_STR("sevenoldstyle")
+HB_STR("eightoldstyle")
+HB_STR("nineoldstyle")
+HB_STR("commasuperior")
+HB_STR("threequartersemdash")
+HB_STR("periodsuperior")
+HB_STR("questionsmall")
+HB_STR("asuperior")
+HB_STR("bsuperior")
+HB_STR("centsuperior")
+HB_STR("dsuperior")
+HB_STR("esuperior")
+HB_STR("isuperior")
+HB_STR("lsuperior")
+HB_STR("msuperior")
+HB_STR("nsuperior")
+HB_STR("osuperior")
+HB_STR("rsuperior")
+HB_STR("ssuperior")
+HB_STR("tsuperior")
+HB_STR("ff")
+HB_STR("ffi")
+HB_STR("ffl")
+HB_STR("parenleftinferior")
+HB_STR("parenrightinferior")
+HB_STR("Circumflexsmall")
+HB_STR("hyphensuperior")
+HB_STR("Gravesmall")
+HB_STR("Asmall")
+HB_STR("Bsmall")
+HB_STR("Csmall")
+HB_STR("Dsmall")
+HB_STR("Esmall")
+HB_STR("Fsmall")
+HB_STR("Gsmall")
+HB_STR("Hsmall")
+HB_STR("Ismall")
+HB_STR("Jsmall")
+HB_STR("Ksmall")
+HB_STR("Lsmall")
+HB_STR("Msmall")
+HB_STR("Nsmall")
+HB_STR("Osmall")
+HB_STR("Psmall")
+HB_STR("Qsmall")
+HB_STR("Rsmall")
+HB_STR("Ssmall")
+HB_STR("Tsmall")
+HB_STR("Usmall")
+HB_STR("Vsmall")
+HB_STR("Wsmall")
+HB_STR("Xsmall")
+HB_STR("Ysmall")
+HB_STR("Zsmall")
+HB_STR("colonmonetary")
+HB_STR("onefitted")
+HB_STR("rupiah")
+HB_STR("Tildesmall")
+HB_STR("exclamdownsmall")
+HB_STR("centoldstyle")
+HB_STR("Lslashsmall")
+HB_STR("Scaronsmall")
+HB_STR("Zcaronsmall")
+HB_STR("Dieresissmall")
+HB_STR("Brevesmall")
+HB_STR("Caronsmall")
+HB_STR("Dotaccentsmall")
+HB_STR("Macronsmall")
+HB_STR("figuredash")
+HB_STR("hypheninferior")
+HB_STR("Ogoneksmall")
+HB_STR("Ringsmall")
+HB_STR("Cedillasmall")
+HB_STR("questiondownsmall")
+HB_STR("oneeighth")
+HB_STR("threeeighths")
+HB_STR("fiveeighths")
+HB_STR("seveneighths")
+HB_STR("onethird")
+HB_STR("twothirds")
+HB_STR("zerosuperior")
+HB_STR("foursuperior")
+HB_STR("fivesuperior")
+HB_STR("sixsuperior")
+HB_STR("sevensuperior")
+HB_STR("eightsuperior")
+HB_STR("ninesuperior")
+HB_STR("zeroinferior")
+HB_STR("oneinferior")
+HB_STR("twoinferior")
+HB_STR("threeinferior")
+HB_STR("fourinferior")
+HB_STR("fiveinferior")
+HB_STR("sixinferior")
+HB_STR("seveninferior")
+HB_STR("eightinferior")
+HB_STR("nineinferior")
+HB_STR("centinferior")
+HB_STR("dollarinferior")
+HB_STR("periodinferior")
+HB_STR("commainferior")
+HB_STR("Agravesmall")
+HB_STR("Aacutesmall")
+HB_STR("Acircumflexsmall")
+HB_STR("Atildesmall")
+HB_STR("Adieresissmall")
+HB_STR("Aringsmall")
+HB_STR("AEsmall")
+HB_STR("Ccedillasmall")
+HB_STR("Egravesmall")
+HB_STR("Eacutesmall")
+HB_STR("Ecircumflexsmall")
+HB_STR("Edieresissmall")
+HB_STR("Igravesmall")
+HB_STR("Iacutesmall")
+HB_STR("Icircumflexsmall")
+HB_STR("Idieresissmall")
+HB_STR("Ethsmall")
+HB_STR("Ntildesmall")
+HB_STR("Ogravesmall")
+HB_STR("Oacutesmall")
+HB_STR("Ocircumflexsmall")
+HB_STR("Otildesmall")
+HB_STR("Odieresissmall")
+HB_STR("OEsmall")
+HB_STR("Oslashsmall")
+HB_STR("Ugravesmall")
+HB_STR("Uacutesmall")
+HB_STR("Ucircumflexsmall")
+HB_STR("Udieresissmall")
+HB_STR("Yacutesmall")
+HB_STR("Thornsmall")
+HB_STR("Ydieresissmall")
+HB_STR("001.000")
+HB_STR("001.001")
+HB_STR("001.002")
+HB_STR("001.003")
+HB_STR("Black")
+HB_STR("Bold")
+HB_STR("Book")
+HB_STR("Light")
+HB_STR("Medium")
+HB_STR("Regular")
+HB_STR("Roman")
+HB_STR("Semibold")
 
 #endif /* HB_OT_CFF1_STD_STR_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
index 27c4d31b9ce..778167eeb23 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
@@ -326,7 +326,7 @@ struct Charset0
 
   void collect_glyph_to_sid_map (glyph_to_sid_map_t *mapping, unsigned int num_glyphs) const
   {
-    mapping->resize (num_glyphs, false);
+    mapping->resize_dirty  (num_glyphs);
     for (hb_codepoint_t gid = 1; gid < num_glyphs; gid++)
       mapping->arrayZ[gid] = {sids[gid - 1], gid};
   }
@@ -426,7 +426,7 @@ struct Charset1_2 {
 
   void collect_glyph_to_sid_map (glyph_to_sid_map_t *mapping, unsigned int num_glyphs) const
   {
-    mapping->resize (num_glyphs, false);
+    mapping->resize_dirty  (num_glyphs);
     hb_codepoint_t gid = 1;
     if (gid >= num_glyphs)
       return;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc
index b2702106ecc..499bd942cde 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc
@@ -202,7 +202,11 @@ struct cff2_cs_opset_path_t : cff2_cs_opset_t<cff2_cs_opset_path_t, cff2_path_pa
 
 bool OT::cff2::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const
 {
-  return get_path_at (font, glyph, draw_session, hb_array (font->coords, font->num_coords));
+  return get_path_at (font,
+                      glyph,
+                      draw_session,
+                      hb_array (font->coords,
+                                font->has_nonzero_coords ? font->num_coords : 0));
 }
 
 bool OT::cff2::accelerator_t::get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t<const int> coords) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
index 6bf37c062fc..93e9c0a2697 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
@@ -501,10 +501,6 @@ struct CmapSubtableFormat4
     this->length = c->length () - table_initpos;
     if ((long long) this->length != (long long) c->length () - table_initpos)
     {
-      // Length overflowed. Discard the current object before setting the error condition, otherwise
-      // discard is a noop which prevents the higher level code from reverting the serializer to the
-      // pre-error state in cmap4 overflow handling code.
-      c->pop_discard ();
       c->err (HB_SERIALIZE_ERROR_INT_OVERFLOW);
       return;
     }
@@ -701,16 +697,7 @@ struct CmapSubtableFormat4
     hb_barrier ();
 
     if (unlikely (!c->check_range (this, length)))
-    {
-      /* Some broken fonts have too long of a "length" value.
-       * If that is the case, just change the value to truncate
-       * the subtable at the end of the blob. */
-      uint16_t new_length = (uint16_t) hb_min ((uintptr_t) 65535,
-                                               (uintptr_t) (c->end -
-                                                            (char *) this));
-      if (!c->try_set (&length, new_length))
-        return_trace (false);
-    }
+      return_trace (false);
 
     return_trace (16 + 4 * (unsigned int) segCountX2 <= length);
   }
@@ -1500,7 +1487,7 @@ struct CmapSubtable
   bool get_glyph (hb_codepoint_t codepoint,
                   hb_codepoint_t *glyph) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case  0: hb_barrier (); return u.format0 .get_glyph (codepoint, glyph);
     case  4: hb_barrier (); return u.format4 .get_glyph (codepoint, glyph);
     case  6: hb_barrier (); return u.format6 .get_glyph (codepoint, glyph);
@@ -1513,7 +1500,7 @@ struct CmapSubtable
   }
   void collect_unicodes (hb_set_t *out, unsigned int num_glyphs = UINT_MAX) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case  0: hb_barrier (); u.format0 .collect_unicodes (out); return;
     case  4: hb_barrier (); u.format4 .collect_unicodes (out); return;
     case  6: hb_barrier (); u.format6 .collect_unicodes (out); return;
@@ -1529,7 +1516,7 @@ struct CmapSubtable
                         hb_map_t *mapping, /* OUT */
                         unsigned num_glyphs = UINT_MAX) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case  0: hb_barrier (); u.format0 .collect_mapping (unicodes, mapping); return;
     case  4: hb_barrier (); u.format4 .collect_mapping (unicodes, mapping); return;
     case  6: hb_barrier (); u.format6 .collect_mapping (unicodes, mapping); return;
@@ -1543,7 +1530,7 @@ struct CmapSubtable
 
   unsigned get_language () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case  0: hb_barrier (); return u.format0 .get_language ();
     case  4: hb_barrier (); return u.format4 .get_language ();
     case  6: hb_barrier (); return u.format6 .get_language ();
@@ -1574,9 +1561,9 @@ struct CmapSubtable
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case  0: hb_barrier (); return_trace (u.format0 .sanitize (c));
     case  4: hb_barrier (); return_trace (u.format4 .sanitize (c));
     case  6: hb_barrier (); return_trace (u.format6 .sanitize (c));
@@ -1590,7 +1577,7 @@ struct CmapSubtable
 
   public:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   CmapSubtableFormat0   format0;
   CmapSubtableFormat4   format4;
   CmapSubtableFormat6   format6;
@@ -1600,7 +1587,7 @@ struct CmapSubtable
   CmapSubtableFormat14  format14;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 
@@ -1646,7 +1633,7 @@ struct EncodingRecord
       CmapSubtable *cmapsubtable = c->push<CmapSubtable> ();
       unsigned origin_length = c->length ();
       cmapsubtable->serialize (c, it, format, plan, &(base+subtable));
-      if (c->length () - origin_length > 0) *objidx = c->pop_pack ();
+      if (c->length () - origin_length > 0 && !c->in_error()) *objidx = c->pop_pack ();
       else c->pop_discard ();
     }
 
@@ -1683,6 +1670,10 @@ struct SubtableUnicodesCache {
   {
     SubtableUnicodesCache* cache =
         (SubtableUnicodesCache*) hb_malloc (sizeof(SubtableUnicodesCache));
+
+    if (unlikely (!cache))
+      return nullptr;
+
     new (cache) SubtableUnicodesCache (source_table);
     return cache;
   }
@@ -1776,6 +1767,10 @@ struct cmap
     ;
 
     SubtableUnicodesCache* cache = SubtableUnicodesCache::create(source_table);
+
+    if (unlikely (!cache))
+      return nullptr;
+
     for (const EncodingRecord& _ : it)
       cache->set_for(&_); // populate the cache for this encoding record.
 
@@ -1810,7 +1805,7 @@ struct cmap
       if (c->in_error ())
         return false;
 
-      unsigned format = (base+_.subtable).u.format;
+      unsigned format = (base+_.subtable).u.format.v;
       if (format != 4 && format != 12 && format != 14) continue;
 
       const hb_set_t* unicodes_set = unicodes_cache->set_for (&_, local_unicodes_cache);
@@ -1912,7 +1907,7 @@ struct cmap
     + hb_iter (encodingRecord)
     | hb_map (&EncodingRecord::subtable)
     | hb_map (hb_add (this))
-    | hb_filter ([&] (const CmapSubtable& _) { return _.u.format == 14; })
+    | hb_filter ([&] (const CmapSubtable& _) { return _.u.format.v == 14; })
     | hb_apply ([=] (const CmapSubtable& _) { _.u.format14.closure_glyphs (unicodes, glyphset); })
     ;
   }
@@ -1937,7 +1932,7 @@ struct cmap
 
     for (const EncodingRecord& _ : encodingrec_iter)
     {
-      unsigned format = (this + _.subtable).u.format;
+      unsigned format = (this + _.subtable).u.format.v;
       if (format == 12) has_format12 = true;
 
       const EncodingRecord *table = std::addressof (_);
@@ -2025,7 +2020,7 @@ struct cmap
       this->subtable_uvs = &Null (CmapSubtableFormat14);
       {
         const CmapSubtable *st = table->find_subtable (0, 5);
-        if (st && st->u.format == 14)
+        if (st && st->u.format.v == 14)
           subtable_uvs = &st->u.format14;
       }
 
@@ -2069,7 +2064,7 @@ struct cmap
       else
 #endif
       {
-        switch (subtable->u.format) {
+        switch (subtable->u.format.v) {
           /* Accelerate format 4 and format 12. */
           default:
             this->get_glyph_funcZ = get_glyph_from<CmapSubtable>;
@@ -2276,7 +2271,7 @@ struct cmap
         (_.platformID == 0 && _.encodingID == 4) ||
         (_.platformID == 3 && _.encodingID == 1) ||
         (_.platformID == 3 && _.encodingID == 10) ||
-        (cmap + _.subtable).u.format == 14;
+        (cmap + _.subtable).u.format.v == 14;
   }
 
   protected:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
index 0238bb346a9..8add9209f37 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
@@ -37,6 +37,7 @@
 
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-glyf-table.hh"
+#include "hb-ot-var-gvar-table.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-ot-cff1-table.hh"
 #include "hb-ot-hmtx-table.hh"
@@ -64,18 +65,22 @@
 using hb_ot_font_advance_cache_t = hb_cache_t<24, 16>;
 static_assert (sizeof (hb_ot_font_advance_cache_t) == 1024, "");
 
+using hb_ot_font_origin_cache_t = hb_cache_t<20, 20>;
+static_assert (sizeof (hb_ot_font_origin_cache_t) == 1024, "");
+
 struct hb_ot_font_t
 {
   const hb_ot_face_t *ot_face;
 
-  /* h_advance caching */
+  mutable hb_atomic_t<int> cached_serial;
   mutable hb_atomic_t<int> cached_coords_serial;
-  struct advance_cache_t
+
+  struct direction_cache_t
   {
     mutable hb_atomic_t<hb_ot_font_advance_cache_t *> advance_cache;
-    mutable hb_atomic_t<OT::ItemVariationStore::cache_t *> varStore_cache;
+    mutable hb_atomic_t<OT::hb_scalar_cache_t *> varStore_cache;
 
-    ~advance_cache_t ()
+    ~direction_cache_t ()
     {
       clear ();
     }
@@ -116,7 +121,7 @@ struct hb_ot_font_t
         goto retry;
     }
 
-    OT::ItemVariationStore::cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const
+    OT::hb_scalar_cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const
     {
     retry:
       auto *cache = varStore_cache.get_acquire ();
@@ -127,7 +132,7 @@ struct hb_ot_font_t
       else
         goto retry;
     }
-    void release_varStore_cache (OT::ItemVariationStore::cache_t *cache) const
+    void release_varStore_cache (OT::hb_scalar_cache_t *cache) const
     {
       if (!cache)
         return;
@@ -154,17 +159,157 @@ struct hb_ot_font_t
 
   } h, v;
 
+  struct origin_cache_t
+  {
+    mutable hb_atomic_t<hb_ot_font_origin_cache_t *> origin_cache;
+    mutable hb_atomic_t<OT::hb_scalar_cache_t *> varStore_cache;
+
+    ~origin_cache_t ()
+    {
+      clear ();
+    }
+
+    hb_ot_font_origin_cache_t *acquire_origin_cache () const
+    {
+    retry:
+      auto *cache = origin_cache.get_acquire ();
+      if (!cache)
+      {
+        cache = (hb_ot_font_origin_cache_t *) hb_malloc (sizeof (hb_ot_font_origin_cache_t));
+        if (!cache)
+          return nullptr;
+        new (cache) hb_ot_font_origin_cache_t;
+        return cache;
+      }
+      if (origin_cache.cmpexch (cache, nullptr))
+        return cache;
+      else
+        goto retry;
+    }
+    void release_origin_cache (hb_ot_font_origin_cache_t *cache) const
+    {
+      if (!cache)
+        return;
+      if (!origin_cache.cmpexch (nullptr, cache))
+        hb_free (cache);
+    }
+    void clear_origin_cache () const
+    {
+    retry:
+      auto *cache = origin_cache.get_acquire ();
+      if (!cache)
+        return;
+      if (origin_cache.cmpexch (cache, nullptr))
+        hb_free (cache);
+      else
+        goto retry;
+    }
+
+    OT::hb_scalar_cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const
+    {
+    retry:
+      auto *cache = varStore_cache.get_acquire ();
+      if (!cache)
+        return varStore.create_cache ();
+      if (varStore_cache.cmpexch (cache, nullptr))
+        return cache;
+      else
+        goto retry;
+    }
+    void release_varStore_cache (OT::hb_scalar_cache_t *cache) const
+    {
+      if (!cache)
+        return;
+      if (!varStore_cache.cmpexch (nullptr, cache))
+        OT::ItemVariationStore::destroy_cache (cache);
+    }
+    void clear_varStore_cache () const
+    {
+    retry:
+      auto *cache = varStore_cache.get_acquire ();
+      if (!cache)
+        return;
+      if (varStore_cache.cmpexch (cache, nullptr))
+        OT::ItemVariationStore::destroy_cache (cache);
+      else
+        goto retry;
+    }
+
+    void clear () const
+    {
+      clear_origin_cache ();
+      clear_varStore_cache ();
+    }
+  } v_origin;
+
+  struct draw_cache_t
+  {
+    mutable hb_atomic_t<OT::hb_scalar_cache_t *> gvar_cache;
+
+    ~draw_cache_t ()
+    {
+      clear ();
+    }
+
+    OT::hb_scalar_cache_t *acquire_gvar_cache (const OT::gvar_accelerator_t &gvar) const
+    {
+    retry:
+      auto *cache = gvar_cache.get_acquire ();
+      if (!cache)
+        return gvar.create_cache ();
+      if (gvar_cache.cmpexch (cache, nullptr))
+        return cache;
+      else
+        goto retry;
+    }
+    void release_gvar_cache (OT::hb_scalar_cache_t *cache) const
+    {
+      if (!cache)
+        return;
+      if (!gvar_cache.cmpexch (nullptr, cache))
+        OT::gvar_accelerator_t::destroy_cache (cache);
+    }
+    void clear_gvar_cache () const
+    {
+    retry:
+      auto *cache = gvar_cache.get_acquire ();
+      if (!cache)
+        return;
+      if (gvar_cache.cmpexch (cache, nullptr))
+        OT::gvar_accelerator_t::destroy_cache (cache);
+      else
+        goto retry;
+    }
+
+    void clear () const
+    {
+      clear_gvar_cache ();
+    }
+  } draw;
+
   void check_serial (hb_font_t *font) const
   {
     int font_serial = font->serial_coords.get_acquire ();
+    if (cached_serial.get_acquire () != font_serial)
+    {
+      /* These caches are dependent on scale and synthetic settings.
+       * Any change to the font invalidates them. */
+      v_origin.clear ();
 
-    if (cached_coords_serial.get_acquire () == font_serial)
-      return;
+      cached_serial.set_release (font_serial);
+    }
 
-    h.clear ();
-    v.clear ();
+    int font_serial_coords = font->serial_coords.get_acquire ();
+    if (cached_coords_serial.get_acquire () != font_serial_coords)
+    {
+      /* These caches are independent of scale or synthetic settings.
+       * Just variation changes will invalidate them. */
+      h.clear ();
+      v.clear ();
+      draw.clear ();
 
-    cached_coords_serial.set_release (font_serial);
+      cached_coords_serial.set_release (font_serial_coords);
+    }
   }
 };
 
@@ -242,37 +387,59 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
                             unsigned advance_stride,
                             void *user_data HB_UNUSED)
 {
+  // Duplicated in v_advances. Ugly. Keep in sync'ish.
 
   const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   const hb_ot_face_t *ot_face = ot_font->ot_face;
   const OT::hmtx_accelerator_t &hmtx = *ot_face->hmtx;
 
-  ot_font->check_serial (font);
-  const OT::HVAR &HVAR = *hmtx.var_table;
-  const OT::ItemVariationStore &varStore = &HVAR + HVAR.varStore;
-  OT::ItemVariationStore::cache_t *varStore_cache = ot_font->h.acquire_varStore_cache (varStore);
-
-  hb_ot_font_advance_cache_t *advance_cache = nullptr;
-
-  bool use_cache = font->num_coords;
-  if (use_cache)
-  {
-    advance_cache = ot_font->h.acquire_advance_cache ();
-    if (!advance_cache)
-      use_cache = false;
-  }
-
-  if (!use_cache)
+  if (unlikely (!hmtx.has_data ()))
   {
+    hb_position_t advance = font->face->get_upem () / 2;
+    advance = font->em_scale_x (advance);
     for (unsigned int i = 0; i < count; i++)
     {
-      *first_advance = font->em_scale_x (hmtx.get_advance_with_var_unscaled (*first_glyph, font, varStore_cache));
+      *first_advance = advance;
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+    return;
+  }
+
+#ifndef HB_NO_VAR
+  if (!font->has_nonzero_coords)
+  {
+  fallback:
+#else
+  {
+#endif
+    // Just plain htmx data. No need to cache.
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance = font->em_scale_x (hmtx.get_advance_without_var_unscaled (*first_glyph));
       first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
+    return;
   }
-  else
-  { /* Use cache. */
+
+#ifndef HB_NO_VAR
+  /* has_nonzero_coords. */
+
+  ot_font->check_serial (font);
+  hb_ot_font_advance_cache_t *advance_cache = ot_font->h.acquire_advance_cache ();
+  if (!advance_cache)
+  {
+    // malloc failure. Just use the fallback non-variable path.
+    goto fallback;
+  }
+
+  /* If HVAR is present, use it.*/
+  const OT::HVAR &HVAR = *hmtx.var_table;
+  if (HVAR.has_data ())
+  {
+    const OT::ItemVariationStore &varStore = &HVAR + HVAR.varStore;
+    OT::hb_scalar_cache_t *varStore_cache = ot_font->h.acquire_varStore_cache (varStore);
+
     for (unsigned int i = 0; i < count; i++)
     {
       hb_position_t v;
@@ -289,10 +456,49 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
 
+    ot_font->h.release_varStore_cache (varStore_cache);
     ot_font->h.release_advance_cache (advance_cache);
+    return;
   }
 
-  ot_font->h.release_varStore_cache (varStore_cache);
+  const auto &gvar = *ot_face->gvar;
+  if (gvar.has_data ())
+  {
+    const auto &glyf = *ot_face->glyf;
+    auto *scratch = glyf.acquire_scratch ();
+    if (unlikely (!scratch))
+    {
+      ot_font->h.release_advance_cache (advance_cache);
+      goto fallback;
+    }
+    OT::hb_scalar_cache_t *gvar_cache = ot_font->draw.acquire_gvar_cache (gvar);
+
+    for (unsigned int i = 0; i < count; i++)
+    {
+      hb_position_t v;
+      unsigned cv;
+      if (advance_cache->get (*first_glyph, &cv))
+        v = cv;
+      else
+      {
+        v = glyf.get_advance_with_var_unscaled (*first_glyph, font, false, *scratch, gvar_cache);
+        advance_cache->set (*first_glyph, v);
+      }
+      *first_advance = font->em_scale_x (v);
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+
+    ot_font->draw.release_gvar_cache (gvar_cache);
+    glyf.release_scratch (scratch);
+    ot_font->h.release_advance_cache (advance_cache);
+    return;
+  }
+
+  ot_font->h.release_advance_cache (advance_cache);
+  // No HVAR or GVAR.  Just use the fallback non-variable path.
+  goto fallback;
+#endif
 }
 
 #ifndef HB_NO_VERTICAL
@@ -305,99 +511,290 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
                             unsigned advance_stride,
                             void *user_data HB_UNUSED)
 {
+  // Duplicated from h_advances. Ugly. Keep in sync'ish.
+
   const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   const hb_ot_face_t *ot_face = ot_font->ot_face;
   const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
 
-  if (vmtx.has_data ())
+  if (unlikely (!vmtx.has_data ()))
+  {
+    hb_font_extents_t font_extents;
+    font->get_h_extents_with_fallback (&font_extents);
+    hb_position_t advance = font_extents.descender - font_extents.ascender;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance = advance;
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+    return;
+  }
+
+#ifndef HB_NO_VAR
+  if (!font->has_nonzero_coords)
+  {
+  fallback:
+#else
+  {
+#endif
+    // Just plain vtmx data. No need to cache.
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance = font->em_scale_y (- (int) vmtx.get_advance_without_var_unscaled (*first_glyph));
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+    return;
+  }
+
+#ifndef HB_NO_VAR
+  /* has_nonzero_coords. */
+
+  ot_font->check_serial (font);
+  hb_ot_font_advance_cache_t *advance_cache = ot_font->v.acquire_advance_cache ();
+  if (!advance_cache)
+  {
+    // malloc failure. Just use the fallback non-variable path.
+    goto fallback;
+  }
+
+  /* If VVAR is present, use it.*/
+  const OT::VVAR &VVAR = *vmtx.var_table;
+  if (VVAR.has_data ())
   {
-    ot_font->check_serial (font);
-    const OT::VVAR &VVAR = *vmtx.var_table;
     const OT::ItemVariationStore &varStore = &VVAR + VVAR.varStore;
-    OT::ItemVariationStore::cache_t *varStore_cache = ot_font->v.acquire_varStore_cache (varStore);
-    // TODO Use advance_cache.
+    OT::hb_scalar_cache_t *varStore_cache = ot_font->v.acquire_varStore_cache (varStore);
 
     for (unsigned int i = 0; i < count; i++)
     {
-      *first_advance = font->em_scale_y (-(int) vmtx.get_advance_with_var_unscaled (*first_glyph, font, varStore_cache));
+      hb_position_t v;
+      unsigned cv;
+      if (advance_cache->get (*first_glyph, &cv))
+        v = cv;
+      else
+      {
+        v = vmtx.get_advance_with_var_unscaled (*first_glyph, font, varStore_cache);
+        advance_cache->set (*first_glyph, v);
+      }
+      *first_advance = font->em_scale_y (- (int) v);
       first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
 
     ot_font->v.release_varStore_cache (varStore_cache);
+    ot_font->v.release_advance_cache (advance_cache);
+    return;
   }
-  else
+
+  const auto &gvar = *ot_face->gvar;
+  if (gvar.has_data ())
   {
-    hb_font_extents_t font_extents;
-    font->get_h_extents_with_fallback (&font_extents);
-    hb_position_t advance = -(font_extents.ascender - font_extents.descender);
+    const auto &glyf = *ot_face->glyf;
+    auto *scratch = glyf.acquire_scratch ();
+    if (unlikely (!scratch))
+    {
+      ot_font->v.release_advance_cache (advance_cache);
+      goto fallback;
+    }
+    OT::hb_scalar_cache_t *gvar_cache = ot_font->draw.acquire_gvar_cache (gvar);
 
     for (unsigned int i = 0; i < count; i++)
     {
-      *first_advance = advance;
+      hb_position_t v;
+      unsigned cv;
+      if (advance_cache->get (*first_glyph, &cv))
+        v = cv;
+      else
+      {
+        v = glyf.get_advance_with_var_unscaled (*first_glyph, font, true, *scratch, gvar_cache);
+        advance_cache->set (*first_glyph, v);
+      }
+      *first_advance = font->em_scale_y (- (int) v);
       first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
+
+    ot_font->draw.release_gvar_cache (gvar_cache);
+    glyf.release_scratch (scratch);
+    ot_font->v.release_advance_cache (advance_cache);
+    return;
   }
+
+  ot_font->v.release_advance_cache (advance_cache);
+  // No VVAR or GVAR.  Just use the fallback non-variable path.
+  goto fallback;
+#endif
 }
 #endif
 
 #ifndef HB_NO_VERTICAL
+HB_HOT
 static hb_bool_t
-hb_ot_get_glyph_v_origin (hb_font_t *font,
-                          void *font_data,
-                          hb_codepoint_t glyph,
-                          hb_position_t *x,
-                          hb_position_t *y,
-                          void *user_data HB_UNUSED)
+hb_ot_get_glyph_v_origins (hb_font_t *font,
+                           void *font_data,
+                           unsigned int count,
+                           const hb_codepoint_t *first_glyph,
+                           unsigned glyph_stride,
+                           hb_position_t *first_x,
+                           unsigned x_stride,
+                           hb_position_t *first_y,
+                           unsigned y_stride,
+                           void *user_data HB_UNUSED)
 {
   const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   const hb_ot_face_t *ot_face = ot_font->ot_face;
 
-  *x = font->get_glyph_h_advance (glyph) / 2;
-
-  const OT::VORG &VORG = *ot_face->VORG;
-  if (VORG.has_data ())
+  /* First, set all the x values to half the advance width. */
+  font->get_glyph_h_advances (count,
+                              first_glyph, glyph_stride,
+                              first_x, x_stride);
+  for (unsigned i = 0; i < count; i++)
   {
-    float delta = 0;
+    *first_x /= 2;
+    first_x = &StructAtOffsetUnaligned<hb_position_t> (first_x, x_stride);
+  }
 
+  /* The vertical origin business is messy...
+   *
+   * We allocate the cache, then have various code paths that use the cache.
+   * Each one is responsible to free it before returning.
+   */
+  hb_ot_font_origin_cache_t *origin_cache = ot_font->v_origin.acquire_origin_cache ();
+
+  /* If there is VORG, always use it. It uses VVAR for variations if necessary. */
+  const OT::VORG &VORG = *ot_face->VORG;
+  if (origin_cache && VORG.has_data ())
+  {
 #ifndef HB_NO_VAR
-    const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
-    const OT::VVAR &VVAR = *vmtx.var_table;
-    if (font->num_coords)
-      VVAR.get_vorg_delta_unscaled (glyph,
-                                    font->coords, font->num_coords,
-                                    &delta);
+    if (!font->has_nonzero_coords)
 #endif
+    {
+      for (unsigned i = 0; i < count; i++)
+      {
+        hb_position_t origin;
+        unsigned cv;
+        if (origin_cache->get (*first_glyph, &cv))
+          origin = font->y_scale < 0 ? -static_cast<hb_position_t>(cv) : static_cast<hb_position_t>(cv);
+        else
+        {
+          origin = font->em_scalef_y (VORG.get_y_origin (*first_glyph));
+          origin_cache->set (*first_glyph, font->y_scale < 0 ? -origin : origin);
+        }
 
-    *y = font->em_scalef_y (VORG.get_y_origin (glyph) + delta);
+        *first_y = origin;
+
+        first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+        first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+      }
+    }
+#ifndef HB_NO_VAR
+    else
+    {
+      const OT::VVAR &VVAR = *ot_face->vmtx->var_table;
+      const auto &varStore = &VVAR + VVAR.varStore;
+      auto *varStore_cache = ot_font->v_origin.acquire_varStore_cache (varStore);
+      for (unsigned i = 0; i < count; i++)
+      {
+        hb_position_t origin;
+        unsigned cv;
+        if (origin_cache->get (*first_glyph, &cv))
+          origin = font->y_scale < 0 ? -static_cast<hb_position_t>(cv) : static_cast<hb_position_t>(cv);
+        else
+        {
+          origin = font->em_scalef_y (VORG.get_y_origin (*first_glyph) +
+                                      VVAR.get_vorg_delta_unscaled (*first_glyph,
+                                                                    font->coords, font->num_coords,
+                                                                    varStore_cache));
+          origin_cache->set (*first_glyph, font->y_scale < 0 ? -origin : origin);
+        }
+
+        *first_y = origin;
+
+        first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+        first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+      }
+      ot_font->v_origin.release_varStore_cache (varStore_cache);
+    }
+#endif
+    ot_font->v_origin.release_origin_cache (origin_cache);
     return true;
   }
 
-  hb_glyph_extents_t extents = {0};
-
-  if (hb_font_get_glyph_extents (font, glyph, &extents))
+  /* If and only if `vmtx` is present and it's a `glyf` font,
+   * we use the top phantom point, deduced from vmtx,glyf[,gvar]. */
+  const auto &vmtx = *ot_face->vmtx;
+  const auto &glyf = *ot_face->glyf;
+  if (origin_cache && vmtx.has_data() && glyf.has_data ())
   {
-    const OT::vmtx_accelerator_t &vmtx = *ot_face->vmtx;
-    int tsb = 0;
-    if (vmtx.get_leading_bearing_with_var_unscaled (font, glyph, &tsb))
+    auto *scratch = glyf.acquire_scratch ();
+    if (unlikely (!scratch))
     {
-      *y = extents.y_bearing + font->em_scale_y (tsb);
-      return true;
+      ot_font->v_origin.release_origin_cache (origin_cache);
+      return false;
+    }
+    OT::hb_scalar_cache_t *gvar_cache = font->has_nonzero_coords ?
+                                        ot_font->draw.acquire_gvar_cache (*ot_face->gvar) :
+                                        nullptr;
+
+    for (unsigned i = 0; i < count; i++)
+    {
+      hb_position_t origin;
+      unsigned cv;
+      if (origin_cache->get (*first_glyph, &cv))
+        origin = font->y_scale < 0 ? -static_cast<hb_position_t>(cv) : static_cast<hb_position_t>(cv);
+      else
+      {
+        origin = font->em_scalef_y (glyf.get_v_origin_with_var_unscaled (*first_glyph, font, *scratch, gvar_cache));
+        origin_cache->set (*first_glyph, font->y_scale < 0 ? -origin : origin);
+      }
+
+      *first_y = origin;
+
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
     }
 
-    hb_font_extents_t font_extents;
-    font->get_h_extents_with_fallback (&font_extents);
-    hb_position_t advance = font_extents.ascender - font_extents.descender;
-    hb_position_t diff = advance - -extents.height;
-    *y = extents.y_bearing + (diff >> 1);
+    if (gvar_cache)
+      ot_font->draw.release_gvar_cache (gvar_cache);
+    glyf.release_scratch (scratch);
+    ot_font->v_origin.release_origin_cache (origin_cache);
     return true;
   }
 
-  hb_font_extents_t font_extents;
-  font->get_h_extents_with_fallback (&font_extents);
-  *y = font_extents.ascender;
+  /* Otherwise, use glyph extents to center the glyph vertically.
+   * If getting glyph extents failed, just use the font ascender. */
+  if (origin_cache && font->has_glyph_extents_func ())
+  {
+    hb_font_extents_t font_extents;
+    font->get_h_extents_with_fallback (&font_extents);
+    hb_position_t font_advance = font_extents.ascender - font_extents.descender;
 
+    for (unsigned i = 0; i < count; i++)
+    {
+      hb_position_t origin;
+      unsigned cv;
+
+      if (origin_cache->get (*first_glyph, &cv))
+        origin = font->y_scale < 0 ? -static_cast<hb_position_t>(cv) : static_cast<hb_position_t>(cv);
+      else
+      {
+        hb_glyph_extents_t extents = {0};
+        if (likely (font->get_glyph_extents (*first_glyph, &extents)))
+          origin = extents.y_bearing + ((font_advance - -extents.height) >> 1);
+        else
+          origin = font_extents.ascender;
+
+        origin_cache->set (*first_glyph, font->y_scale < 0 ? -origin : origin);
+      }
+
+      *first_y = origin;
+
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_y = &StructAtOffsetUnaligned<hb_position_t> (first_y, y_stride);
+    }
+  }
+
+  ot_font->v_origin.release_origin_cache (origin_cache);
   return true;
 }
 #endif
@@ -498,17 +895,33 @@ hb_ot_draw_glyph_or_fail (hb_font_t *font,
                           hb_draw_funcs_t *draw_funcs, void *draw_data,
                           void *user_data)
 {
+  const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   hb_draw_session_t draw_session {draw_funcs, draw_data};
+  bool ret = false;
+
+  OT::hb_scalar_cache_t *gvar_cache = nullptr;
+  if (font->num_coords)
+  {
+    ot_font->check_serial (font);
+    gvar_cache = ot_font->draw.acquire_gvar_cache (*ot_font->ot_face->gvar);
+  }
+
 #ifndef HB_NO_VAR_COMPOSITES
-  if (font->face->table.VARC->get_path (font, glyph, draw_session)) return true;
+  if (font->face->table.VARC->get_path (font, glyph, draw_session)) { ret = true; goto done; }
 #endif
   // Keep the following in synch with VARC::get_path_at()
-  if (font->face->table.glyf->get_path (font, glyph, draw_session)) return true;
+  if (font->face->table.glyf->get_path (font, glyph, draw_session, gvar_cache)) { ret = true; goto done; }
+
 #ifndef HB_NO_CFF
-  if (font->face->table.cff2->get_path (font, glyph, draw_session)) return true;
-  if (font->face->table.cff1->get_path (font, glyph, draw_session)) return true;
+  if (font->face->table.cff2->get_path (font, glyph, draw_session)) { ret = true; goto done; }
+  if (font->face->table.cff1->get_path (font, glyph, draw_session)) { ret = true; goto done; }
 #endif
-  return false;
+
+done:
+
+  ot_font->draw.release_gvar_cache (gvar_cache);
+
+  return ret;
 }
 #endif
 
@@ -548,12 +961,11 @@ static struct hb_ot_font_funcs_lazy_loader_t : hb_font_funcs_lazy_loader_t<hb_ot
 
     hb_font_funcs_set_font_h_extents_func (funcs, hb_ot_get_font_h_extents, nullptr, nullptr);
     hb_font_funcs_set_glyph_h_advances_func (funcs, hb_ot_get_glyph_h_advances, nullptr, nullptr);
-    //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ot_get_glyph_h_origin, nullptr, nullptr);
 
 #ifndef HB_NO_VERTICAL
     hb_font_funcs_set_font_v_extents_func (funcs, hb_ot_get_font_v_extents, nullptr, nullptr);
     hb_font_funcs_set_glyph_v_advances_func (funcs, hb_ot_get_glyph_v_advances, nullptr, nullptr);
-    hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ot_get_glyph_v_origin, nullptr, nullptr);
+    hb_font_funcs_set_glyph_v_origins_func (funcs, hb_ot_get_glyph_v_origins, nullptr, nullptr);
 #endif
 
 #ifndef HB_NO_DRAW
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
index 67b58b17683..e679e22c7a9 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
@@ -45,16 +45,6 @@
 #define HB_OT_TAG_vmtx HB_TAG('v','m','t','x')
 
 
-HB_INTERNAL bool
-_glyf_get_leading_bearing_with_var_unscaled (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical, int *lsb);
-
-HB_INTERNAL unsigned
-_glyf_get_advance_with_var_unscaled (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical);
-
-HB_INTERNAL bool
-_glyf_get_leading_bearing_without_var_unscaled (hb_face_t *face, hb_codepoint_t gid, bool is_vertical, int *lsb);
-
-
 namespace OT {
 
 
@@ -237,7 +227,7 @@ struct hmtxvmtx
 
     auto it =
     + hb_iter (c->plan->new_to_old_gid_list)
-    | hb_map ([c, &_mtx, mtx_map] (hb_codepoint_pair_t _)
+    | hb_map ([&_mtx, mtx_map] (hb_codepoint_pair_t _)
               {
                 hb_codepoint_t new_gid = _.first;
                 hb_codepoint_t old_gid = _.second;
@@ -246,8 +236,7 @@ struct hmtxvmtx
                 if (!mtx_map->has (new_gid, &v))
                 {
                   int lsb = 0;
-                  if (!_mtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb))
-                    (void) _glyf_get_leading_bearing_without_var_unscaled (c->plan->source, old_gid, !T::is_horizontal, &lsb);
+                  _mtx.get_leading_bearing_without_var_unscaled (old_gid, &lsb);
                   return hb_pair (_mtx.get_advance_without_var_unscaled (old_gid), +lsb);
                 }
                 return *v;
@@ -326,49 +315,23 @@ struct hmtxvmtx
 
     bool has_data () const { return (bool) num_bearings; }
 
-    bool get_leading_bearing_without_var_unscaled (hb_codepoint_t glyph,
+    void get_leading_bearing_without_var_unscaled (hb_codepoint_t glyph,
                                                    int *lsb) const
     {
       if (glyph < num_long_metrics)
       {
         *lsb = table->longMetricZ[glyph].sb;
-        return true;
+        return;
       }
 
       if (unlikely (glyph >= num_bearings))
-        return false;
+      {
+        *lsb = 0;
+        return;
+      }
 
       const FWORD *bearings = (const FWORD *) &table->longMetricZ[num_long_metrics];
       *lsb = bearings[glyph - num_long_metrics];
-      return true;
-    }
-
-    bool get_leading_bearing_with_var_unscaled (hb_font_t *font,
-                                                hb_codepoint_t glyph,
-                                                int *lsb) const
-    {
-      if (!font->num_coords)
-        return get_leading_bearing_without_var_unscaled (glyph, lsb);
-
-#ifndef HB_NO_VAR
-      float delta;
-      if (var_table->get_lsb_delta_unscaled (glyph, font->coords, font->num_coords, &delta) &&
-          get_leading_bearing_without_var_unscaled (glyph, lsb))
-      {
-        *lsb += roundf (delta);
-        return true;
-      }
-
-      // If there's no vmtx data, the phantom points from glyf table are not accurate,
-      // so we cannot take the next path.
-      bool is_vertical = T::tableTag == HB_OT_TAG_vmtx;
-      if (is_vertical && !has_data ())
-        return false;
-
-      return _glyf_get_leading_bearing_with_var_unscaled (font, glyph, is_vertical, lsb);
-#else
-      return false;
-#endif
     }
 
     unsigned int get_advance_without_var_unscaled (hb_codepoint_t glyph) const
@@ -402,27 +365,17 @@ struct hmtxvmtx
       return advances[hb_min (glyph - num_bearings, num_advances - num_bearings - 1)];
     }
 
-    unsigned get_advance_with_var_unscaled (hb_codepoint_t  glyph,
-                                            hb_font_t      *font,
-                                            ItemVariationStore::cache_t *store_cache = nullptr) const
+#ifndef HB_NO_VAR
+    unsigned get_advance_with_var_unscaled (hb_codepoint_t     glyph,
+                                            hb_font_t         *font,
+                                            hb_scalar_cache_t *store_cache = nullptr) const
     {
       unsigned int advance = get_advance_without_var_unscaled (glyph);
-
-#ifndef HB_NO_VAR
-      if (unlikely (glyph >= num_bearings) || !font->num_coords)
-        return advance;
-
-      if (var_table.get_length ())
-        return advance + roundf (var_table->get_advance_delta_unscaled (glyph,
-                                                                        font->coords, font->num_coords,
-                                                                        store_cache));
-
-      unsigned glyf_advance = _glyf_get_advance_with_var_unscaled (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
-      return glyf_advance ? glyf_advance : advance;
-#else
-      return advance;
-#endif
+      return hb_max(0.0f, advance + roundf (var_table->get_advance_delta_unscaled (glyph,
+                                                                      font->coords, font->num_coords,
+                                                                      store_cache)));
     }
+#endif
 
     protected:
     // 0 <= num_long_metrics <= num_bearings <= num_advances <= num_glyphs
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh
index 97d012e58b8..42326adcad2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh
@@ -90,11 +90,11 @@ struct KernSubTableFormat3
   template <typename set_t>
   void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
   {
-    set_t set;
     if (likely (glyphCount))
-      set.add_range (0, glyphCount - 1);
-    left_set.union_ (set);
-    right_set.union_ (set);
+    {
+      left_set.add_range (0, num_glyphs - 1);
+      right_set.add_range (0, num_glyphs - 1);
+    }
   }
 
   protected:
@@ -306,8 +306,8 @@ struct kern
 {
   static constexpr hb_tag_t tableTag = HB_OT_TAG_kern;
 
-  bool     has_data () const { return u.version32; }
-  unsigned get_type () const { return u.major; }
+  bool     has_data () const { return u.version32.v; }
+  unsigned get_type () const { return u.major.v; }
 
   bool has_state_machine () const
   {
@@ -363,7 +363,7 @@ struct kern
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.version32.sanitize (c)) return_trace (false);
+    if (!u.version32.v.sanitize (c)) return_trace (false);
     hb_barrier ();
     return_trace (dispatch (c));
   }
@@ -406,15 +406,15 @@ struct kern
 
   protected:
   union {
-  HBUINT32              version32;
-  HBUINT16              major;
+  struct { HBUINT32 v; }        version32;
+  struct { HBUINT16 v; }        major;
   KernOT                ot;
 #ifndef HB_NO_AAT_SHAPE
   KernAAT               aat;
 #endif
   } u;
   public:
-  DEFINE_SIZE_UNION (4, version32);
+  DEFINE_SIZE_UNION (4, version32.v);
 };
 
 struct kern_accelerator_t : kern::accelerator_t {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh
index 04a79a93a89..b9baaca2a23 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh
@@ -165,13 +165,13 @@ struct BaseCoordFormat3
 
 struct BaseCoord
 {
-  bool has_data () const { return u.format; }
+  bool has_data () const { return u.format.v; }
 
   hb_position_t get_coord (hb_font_t            *font,
                            const ItemVariationStore &var_store,
                            hb_direction_t        direction) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.get_coord (font, direction);
     case 2: hb_barrier (); return u.format2.get_coord (font, direction);
     case 3: hb_barrier (); return u.format3.get_coord (font, var_store, direction);
@@ -181,7 +181,7 @@ struct BaseCoord
 
   void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 3: hb_barrier (); u.format3.collect_variation_indices (varidx_set); return;
     default:return;
     }
@@ -190,9 +190,9 @@ struct BaseCoord
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -203,9 +203,9 @@ struct BaseCoord
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.format.sanitize (c))) return_trace (false);
+    if (unlikely (!u.format.v.sanitize (c))) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
     case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
@@ -215,13 +215,13 @@ struct BaseCoord
 
   protected:
   union {
-  HBUINT16              format;
+  struct { HBUINT16 v; }        format;
   BaseCoordFormat1      format1;
   BaseCoordFormat2      format2;
   BaseCoordFormat3      format3;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 struct FeatMinMaxRecord
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh
index 7ee34185575..dcacc9cb86c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh
@@ -141,6 +141,7 @@ struct hb_subset_layout_context_t :
   const hb_map_t *lookup_index_map;
   const hb_hashmap_t<unsigned, hb::unique_ptr<hb_set_t>> *script_langsys_map;
   const hb_map_t *feature_index_map;
+  const hb_map_t *feature_map_w_duplicates;
   const hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map;
   hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *feature_record_cond_idx_map;
   const hb_set_t *catch_all_record_feature_idxes;
@@ -165,6 +166,7 @@ struct hb_subset_layout_context_t :
       lookup_index_map = &c_->plan->gsub_lookups;
       script_langsys_map = &c_->plan->gsub_langsys;
       feature_index_map = &c_->plan->gsub_features;
+      feature_map_w_duplicates = &c_->plan->gsub_features_w_duplicates;
       feature_substitutes_map = &c_->plan->gsub_feature_substitutes_map;
       feature_record_cond_idx_map = c_->plan->user_axes_location.is_empty () ? nullptr : &c_->plan->gsub_feature_record_cond_idx_map;
       catch_all_record_feature_idxes = &c_->plan->gsub_old_features;
@@ -175,6 +177,7 @@ struct hb_subset_layout_context_t :
       lookup_index_map = &c_->plan->gpos_lookups;
       script_langsys_map = &c_->plan->gpos_langsys;
       feature_index_map = &c_->plan->gpos_features;
+      feature_map_w_duplicates = &c_->plan->gpos_features_w_duplicates;
       feature_substitutes_map = &c_->plan->gpos_feature_substitutes_map;
       feature_record_cond_idx_map = c_->plan->user_axes_location.is_empty () ? nullptr : &c_->plan->gpos_feature_record_cond_idx_map;
       catch_all_record_feature_idxes = &c_->plan->gpos_old_features;
@@ -825,46 +828,9 @@ struct Feature
                  const Record_sanitize_closure_t *closure = nullptr) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c))))
-      return_trace (false);
-    hb_barrier ();
-
-    /* Some earlier versions of Adobe tools calculated the offset of the
-     * FeatureParams subtable from the beginning of the FeatureList table!
-     *
-     * If sanitizing "failed" for the FeatureParams subtable, try it with the
-     * alternative location.  We would know sanitize "failed" if old value
-     * of the offset was non-zero, but it's zeroed now.
-     *
-     * Only do this for the 'size' feature, since at the time of the faulty
-     * Adobe tools, only the 'size' feature had FeatureParams defined.
-     */
-
-    if (likely (featureParams.is_null ()))
-      return_trace (true);
-
-    unsigned int orig_offset = featureParams;
-    if (unlikely (!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE)))
-      return_trace (false);
-    hb_barrier ();
-
-    if (featureParams == 0 && closure &&
-        closure->tag == HB_TAG ('s','i','z','e') &&
-        closure->list_base && closure->list_base < this)
-    {
-      unsigned int new_offset_int = orig_offset -
-                                    (((char *) this) - ((char *) closure->list_base));
-
-      Offset16To<FeatureParams> new_offset;
-      /* Check that it would not overflow. */
-      new_offset = new_offset_int;
-      if (new_offset == new_offset_int &&
-          c->try_set (&featureParams, new_offset_int) &&
-          !featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE))
-        return_trace (false);
-    }
-
-    return_trace (true);
+    return_trace (c->check_struct (this) &&
+                  featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE) &&
+                  lookupIndex.sanitize (c));
   }
 
   Offset16To<FeatureParams>
@@ -1082,15 +1048,15 @@ struct LangSys
     if (unlikely (!c->serializer->extend_min (out))) return_trace (false);
 
     const uint32_t *v;
-    out->reqFeatureIndex = l->feature_index_map->has (reqFeatureIndex, &v) ? *v : 0xFFFFu;
+    out->reqFeatureIndex = l->feature_map_w_duplicates->has (reqFeatureIndex, &v) ? *v : 0xFFFFu;
 
     if (!l->visitFeatureIndex (featureIndex.len))
       return_trace (false);
 
     auto it =
     + hb_iter (featureIndex)
-    | hb_filter (l->feature_index_map)
-    | hb_map (l->feature_index_map)
+    | hb_filter (l->feature_map_w_duplicates)
+    | hb_map (l->feature_map_w_duplicates)
     ;
 
     bool ret = bool (it);
@@ -1337,7 +1303,7 @@ struct Lookup
     TRACE_DISPATCH (this, lookup_type);
     unsigned int count = get_subtable_count ();
     for (unsigned int i = 0; i < count; i++) {
-      typename context_t::return_t r = get_subtable<TSubTable> (i).dispatch (c, lookup_type, std::forward<Ts> (ds)...);
+      typename context_t::return_t r = get_subtable<TSubTable> (i).dispatch (c, lookup_type, ds...);
       if (c->stop_sublookup_iteration (r))
         return_trace (r);
     }
@@ -1387,6 +1353,11 @@ struct Lookup
       {
         unsigned new_flag = lookupFlag;
         new_flag &= ~LookupFlag::UseMarkFilteringSet;
+        // https://github.com/harfbuzz/harfbuzz/issues/5499
+        // If we remove UseMarkFilteringSet flag because the set is now empty,
+        // we need to add IgnoreMarks flag, otherwise the lookup will not
+        // ignore any marks, which changes the behavior.
+        new_flag |= LookupFlag::IgnoreMarks;
         out->lookupFlag = new_flag;
       }
       else
@@ -1425,7 +1396,7 @@ struct Lookup
     if (unlikely (!get_subtables<TSubTable> ().sanitize (c, this, get_type ())))
       return_trace (false);
 
-    if (unlikely (get_type () == TSubTable::Extension && !c->get_edit_count ()))
+    if (unlikely (get_type () == TSubTable::Extension))
     {
       hb_barrier ();
 
@@ -1433,11 +1404,6 @@ struct Lookup
        * have the same type, which shall not be the Extension type
        * itself (but we already checked for that).
        * This is specially important if one has a reverse type!
-       *
-       * We only do this if sanitizer edit_count is zero.  Otherwise,
-       * some of the subtables might have become insane after they
-       * were sanity-checked by the edits of subsequent subtables.
-       * https://bugs.chromium.org/p/chromium/issues/detail?id=960331
        */
       unsigned int type = get_subtable<TSubTable> (0).u.extension.get_type ();
       for (unsigned int i = 1; i < subtables; i++)
@@ -2067,7 +2033,7 @@ struct ClassDef
   unsigned int get (hb_codepoint_t k) const { return get_class (k); }
   unsigned int get_class (hb_codepoint_t glyph_id) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.get_class (glyph_id);
     case 2: hb_barrier (); return u.format2.get_class (glyph_id);
 #ifndef HB_NO_BEYOND_64K
@@ -2078,7 +2044,7 @@ struct ClassDef
     }
   }
   unsigned int get_class (hb_codepoint_t glyph_id,
-                          hb_ot_lookup_cache_t *cache) const
+                          hb_ot_layout_mapping_cache_t *cache) const
   {
     unsigned klass;
     if (cache && cache->get (glyph_id, &klass)) return klass;
@@ -2089,7 +2055,7 @@ struct ClassDef
 
   unsigned get_population () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.get_population ();
     case 2: hb_barrier (); return u.format2.get_population ();
 #ifndef HB_NO_BEYOND_64K
@@ -2142,7 +2108,7 @@ struct ClassDef
 
 #ifndef HB_NO_BEYOND_64K
     if (glyph_max > 0xFFFFu)
-      u.format += 2;
+      u.format.v += 2;
     if (unlikely (glyph_max > 0xFFFFFFu))
 #else
     if (unlikely (glyph_max > 0xFFFFu))
@@ -2152,9 +2118,9 @@ struct ClassDef
       return_trace (false);
     }
 
-    u.format = format;
+    u.format.v = format;
 
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: hb_barrier (); return_trace (u.format1.serialize (c, it));
     case 2: hb_barrier (); return_trace (u.format2.serialize (c, it));
@@ -2173,7 +2139,7 @@ struct ClassDef
                const Coverage* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (u.format1.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
     case 2: hb_barrier (); return_trace (u.format2.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
 #ifndef HB_NO_BEYOND_64K
@@ -2187,9 +2153,9 @@ struct ClassDef
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
 #ifndef HB_NO_BEYOND_64K
@@ -2202,7 +2168,7 @@ struct ClassDef
 
   unsigned cost () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.cost ();
     case 2: hb_barrier (); return u.format2.cost ();
 #ifndef HB_NO_BEYOND_64K
@@ -2218,7 +2184,7 @@ struct ClassDef
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.collect_coverage (glyphs);
     case 2: hb_barrier (); return u.format2.collect_coverage (glyphs);
 #ifndef HB_NO_BEYOND_64K
@@ -2234,7 +2200,7 @@ struct ClassDef
   template <typename set_t>
   bool collect_class (set_t *glyphs, unsigned int klass) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.collect_class (glyphs, klass);
     case 2: hb_barrier (); return u.format2.collect_class (glyphs, klass);
 #ifndef HB_NO_BEYOND_64K
@@ -2247,7 +2213,7 @@ struct ClassDef
 
   bool intersects (const hb_set_t *glyphs) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.intersects (glyphs);
     case 2: hb_barrier (); return u.format2.intersects (glyphs);
 #ifndef HB_NO_BEYOND_64K
@@ -2259,7 +2225,7 @@ struct ClassDef
   }
   bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.intersects_class (glyphs, klass);
     case 2: hb_barrier (); return u.format2.intersects_class (glyphs, klass);
 #ifndef HB_NO_BEYOND_64K
@@ -2272,7 +2238,7 @@ struct ClassDef
 
   void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
     case 2: hb_barrier (); return u.format2.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
 #ifndef HB_NO_BEYOND_64K
@@ -2285,7 +2251,7 @@ struct ClassDef
 
   void intersected_classes (const hb_set_t *glyphs, hb_set_t *intersect_classes) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.intersected_classes (glyphs, intersect_classes);
     case 2: hb_barrier (); return u.format2.intersected_classes (glyphs, intersect_classes);
 #ifndef HB_NO_BEYOND_64K
@@ -2299,7 +2265,7 @@ struct ClassDef
 
   protected:
   union {
-  HBUINT16                      format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   ClassDefFormat1_3<SmallTypes> format1;
   ClassDefFormat2_4<SmallTypes> format2;
 #ifndef HB_NO_BEYOND_64K
@@ -2308,7 +2274,7 @@ struct ClassDef
 #endif
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 template<typename Iterator>
@@ -2326,151 +2292,177 @@ struct delta_row_encoding_t
 {
   /* each byte represents a region, value is one of 0/1/2/4, which means bytes
    * needed for this region */
-  hb_vector_t<uint8_t> chars;
+  struct chars_t : hb_vector_t<uint8_t>
+  {
+    int cmp (const chars_t& other) const
+    {
+      return as_array ().cmp (other.as_array ());
+    }
+
+    hb_pair_t<unsigned, unsigned> get_width ()
+    {
+      unsigned width = 0;
+      unsigned columns = 0;
+      for (unsigned i = 0; i < length; i++)
+      {
+        unsigned v = arrayZ[i];
+        width += v;
+        columns += (v != 0);
+      }
+      return hb_pair (width, columns);
+    }
+
+    HB_HOT
+    hb_pair_t<unsigned, unsigned> combine_width (const chars_t& other) const
+    {
+      unsigned combined_width = 0;
+      unsigned combined_columns = 0;
+      for (unsigned i = 0; i < length; i++)
+      {
+        unsigned v = hb_max (arrayZ[i], other.arrayZ[i]);
+        combined_width += v;
+        combined_columns += (v != 0);
+      }
+      return hb_pair (combined_width, combined_columns);
+    }
+  };
+
+  hb_pair_t<unsigned, unsigned> combine_width (const delta_row_encoding_t& other_encoding) const { return chars.combine_width (other_encoding.chars); }
+
+  // Actual data
+
+  chars_t chars;
   unsigned width = 0;
-  hb_vector_t<uint8_t> columns;
   unsigned overhead = 0;
   hb_vector_t<const hb_vector_t<int>*> items;
 
   delta_row_encoding_t () = default;
-  delta_row_encoding_t (hb_vector_t<uint8_t>&& chars_,
-                        const hb_vector_t<int>* row = nullptr) :
-                        delta_row_encoding_t ()
-
+  delta_row_encoding_t (hb_vector_t<const hb_vector_t<int>*> &&rows, unsigned num_cols)
   {
-    chars = std::move (chars_);
-    width = get_width ();
-    columns = get_columns ();
-    overhead = get_chars_overhead (columns);
-    if (row) items.push (row);
+    assert (rows);
+
+    items = std::move (rows);
+
+    if (unlikely (!chars.resize (num_cols)))
+      return;
+
+    calculate_chars ();
+  }
+
+  void merge (const delta_row_encoding_t& other)
+  {
+    items.alloc (items.length + other.items.length);
+    for (auto &row : other.items)
+      add_row (row);
+
+    // Merge chars
+    assert (chars.length == other.chars.length);
+    for (unsigned i = 0; i < chars.length; i++)
+      chars.arrayZ[i] = hb_max (chars.arrayZ[i], other.chars.arrayZ[i]);
+    chars_changed ();
+  }
+
+  void chars_changed ()
+  {
+    auto _ = chars.get_width ();
+    width = _.first;
+    overhead = get_chars_overhead (_.second);
+  }
+
+  void calculate_chars ()
+  {
+    assert (items);
+
+    bool long_words = false;
+
+    for (auto &row : items)
+    {
+      assert (row->length == chars.length);
+
+      /* 0/1/2 byte encoding */
+      for (unsigned i = 0; i < row->length; i++)
+      {
+        int v =  row->arrayZ[i];
+        if (v == 0)
+          continue;
+        else if (v > 32767 || v < -32768)
+        {
+          long_words = true;
+          chars.arrayZ[i] = hb_max (chars.arrayZ[i], 4);
+        }
+        else if (v > 127 || v < -128)
+          chars.arrayZ[i] = hb_max (chars.arrayZ[i], 2);
+        else
+          chars.arrayZ[i] = hb_max (chars.arrayZ[i], 1);
+      }
+    }
+
+    if (long_words)
+    {
+      // Convert 1s to 2s
+      for (auto &v : chars)
+        if (v == 1)
+          v = 2;
+    }
+
+    chars_changed ();
   }
 
   bool is_empty () const
   { return !items; }
 
-  static hb_vector_t<uint8_t> get_row_chars (const hb_vector_t<int>& row)
-  {
-    hb_vector_t<uint8_t> ret;
-    if (!ret.alloc (row.length)) return ret;
-
-    bool long_words = false;
-
-    /* 0/1/2 byte encoding */
-    for (int i = row.length - 1; i >= 0; i--)
-    {
-      int v =  row.arrayZ[i];
-      if (v == 0)
-        ret.push (0);
-      else if (v > 32767 || v < -32768)
-      {
-        long_words = true;
-        break;
-      }
-      else if (v > 127 || v < -128)
-        ret.push (2);
-      else
-        ret.push (1);
-    }
-
-    if (!long_words)
-      return ret;
-
-    /* redo, 0/2/4 bytes encoding */
-    ret.reset ();
-    for (int i = row.length - 1; i >= 0; i--)
-    {
-      int v =  row.arrayZ[i];
-      if (v == 0)
-        ret.push (0);
-      else if (v > 32767 || v < -32768)
-        ret.push (4);
-      else
-        ret.push (2);
-    }
-    return ret;
-  }
-
-  inline unsigned get_width ()
-  {
-    unsigned ret = + hb_iter (chars)
-                   | hb_reduce (hb_add, 0u)
-                   ;
-    return ret;
-  }
-
-  hb_vector_t<uint8_t> get_columns ()
-  {
-    hb_vector_t<uint8_t> cols;
-    cols.alloc (chars.length);
-    for (auto v : chars)
-    {
-      uint8_t flag = v ? 1 : 0;
-      cols.push (flag);
-    }
-    return cols;
-  }
-
-  static inline unsigned get_chars_overhead (const hb_vector_t<uint8_t>& cols)
+  static inline unsigned get_chars_overhead (unsigned num_columns)
   {
     unsigned c = 4 + 6; // 4 bytes for LOffset, 6 bytes for VarData header
-    unsigned cols_bit_count = 0;
-    for (auto v : cols)
-      if (v) cols_bit_count++;
-    return c + cols_bit_count * 2;
+    return c + num_columns * 2;
   }
 
-  unsigned get_gain () const
+  unsigned get_gain (unsigned additional_bytes_per_rows = 1) const
   {
     int count = items.length;
-    return hb_max (0, (int) overhead - count);
+    return hb_max (0, (int) overhead - count * (int) additional_bytes_per_rows);
   }
 
   int gain_from_merging (const delta_row_encoding_t& other_encoding) const
   {
-    int combined_width = 0;
-    for (unsigned i = 0; i < chars.length; i++)
-      combined_width += hb_max (chars.arrayZ[i], other_encoding.chars.arrayZ[i]);
+    // Back of the envelope calculations to reject early.
+    signed additional_bytes_per_rows = other_encoding.width - width;
+    if (additional_bytes_per_rows > 0)
+    {
+      if (get_gain (additional_bytes_per_rows) == 0)
+        return 0;
+    }
+    else
+    {
+      if (other_encoding.get_gain (-additional_bytes_per_rows) == 0)
+        return 0;
+    }
 
-    hb_vector_t<uint8_t> combined_columns;
-    combined_columns.alloc (columns.length);
-    for (unsigned i = 0; i < columns.length; i++)
-      combined_columns.push (columns.arrayZ[i] | other_encoding.columns.arrayZ[i]);
+    auto pair = combine_width (other_encoding);
+    unsigned combined_width = pair.first;
+    unsigned combined_columns = pair.second;
 
-    int combined_overhead = get_chars_overhead (combined_columns);
-    int combined_gain = (int) overhead + (int) other_encoding.overhead - combined_overhead
-                        - (combined_width - (int) width) * items.length
-                        - (combined_width - (int) other_encoding.width) * other_encoding.items.length;
+    int combined_gain = (int) overhead + (int) other_encoding.overhead;
+    combined_gain -= (combined_width - (int) width) * items.length;
+    combined_gain -= (combined_width - (int) other_encoding.width) * other_encoding.items.length;
+    combined_gain -= get_chars_overhead (combined_columns);
 
     return combined_gain;
   }
 
+  bool add_row (const hb_vector_t<int>* row)
+  { return items.push (row); }
+
   static int cmp (const void *pa, const void *pb)
   {
     const delta_row_encoding_t *a = (const delta_row_encoding_t *)pa;
     const delta_row_encoding_t *b = (const delta_row_encoding_t *)pb;
 
-    int gain_a = a->get_gain ();
-    int gain_b = b->get_gain ();
-
-    if (gain_a != gain_b)
-      return gain_a - gain_b;
-
-    return (b->chars).as_array ().cmp ((a->chars).as_array ());
-  }
-
-  static int cmp_width (const void *pa, const void *pb)
-  {
-    const delta_row_encoding_t *a = (const delta_row_encoding_t *)pa;
-    const delta_row_encoding_t *b = (const delta_row_encoding_t *)pb;
-
     if (a->width != b->width)
       return (int) a->width - (int) b->width;
 
-    return (b->chars).as_array ().cmp ((a->chars).as_array ());
+    return b->chars.cmp (a->chars);
   }
-
-  bool add_row (const hb_vector_t<int>* row)
-  { return items.push (row); }
 };
 
 struct VarRegionAxis
@@ -2548,32 +2540,112 @@ struct SparseVarRegionAxis
   DEFINE_SIZE_STATIC (8);
 };
 
-#define REGION_CACHE_ITEM_CACHE_INVALID INT_MIN
-#define REGION_CACHE_ITEM_MULTIPLIER (float (1 << ((sizeof (int) * 8) - 2)))
-#define REGION_CACHE_ITEM_DIVISOR (1.f / float (1 << ((sizeof (int) * 8) - 2)))
+struct hb_scalar_cache_t
+{
+  private:
+  static constexpr unsigned STATIC_LENGTH = 16;
+  static constexpr int INVALID = INT_MIN;
+  static constexpr float MULTIPLIER = 1 << ((sizeof (int) * 8) - 2);
+  static constexpr float DIVISOR = 1.f / MULTIPLIER;
+
+  public:
+  hb_scalar_cache_t () : length (STATIC_LENGTH) { clear (); }
+
+  hb_scalar_cache_t (const hb_scalar_cache_t&) = delete;
+  hb_scalar_cache_t (hb_scalar_cache_t&&) = delete;
+  hb_scalar_cache_t& operator= (const hb_scalar_cache_t&) = delete;
+  hb_scalar_cache_t& operator= (hb_scalar_cache_t&&) = delete;
+
+  static hb_scalar_cache_t *create (unsigned int count,
+                                    hb_scalar_cache_t *scratch_cache = nullptr)
+  {
+    if (!count) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t);
+
+    if (scratch_cache && count <= scratch_cache->length)
+    {
+      scratch_cache->clear ();
+      return scratch_cache;
+    }
+
+    auto *cache = (hb_scalar_cache_t *) hb_malloc (sizeof (hb_scalar_cache_t) - sizeof (static_values) + sizeof (static_values[0]) * count);
+    if (unlikely (!cache)) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t);
+
+    cache->length = count;
+    cache->clear ();
+
+    return cache;
+  }
+
+  static void destroy (hb_scalar_cache_t *cache,
+                       hb_scalar_cache_t *scratch_cache = nullptr)
+  {
+    if (cache != &Null(hb_scalar_cache_t) && cache != scratch_cache)
+      hb_free (cache);
+  }
+
+  void clear ()
+  {
+    auto *values = &static_values[0];
+    unsigned i = 0;
+#ifndef HB_OPTIMIZE_SIZE
+    for (; i + 3 < length; i += 4)
+    {
+      values[i + 0] = INVALID;
+      values[i + 1] = INVALID;
+      values[i + 2] = INVALID;
+      values[i + 3] = INVALID;
+    }
+#endif
+    for (; i < length; i++)
+      values[i] = INVALID;
+  }
+
+  HB_ALWAYS_INLINE
+  bool get (unsigned i, float *value) const
+  {
+    if (unlikely (i >= length))
+    {
+      *value = 0.f;
+      return true;
+    }
+    auto *values = &static_values[0];
+    auto *cached_value = &values[i];
+    // Super hot. Most common path is that we have a cached value of 0.
+    int v = *cached_value;
+    if (likely (!v))
+    {
+      *value = 0.f;
+      return true;
+    }
+    if (v == INVALID)
+      return false;
+    *value = v * DIVISOR;
+    return true;
+  }
+
+  HB_ALWAYS_INLINE
+  void set (unsigned i, float value)
+  {
+    if (unlikely (i >= length)) return;
+    auto *values = &static_values[0];
+    auto *cached_value = &values[i];
+    *cached_value = roundf(value * MULTIPLIER);
+  }
+
+  private:
+  unsigned length;
+  mutable hb_atomic_t<int> static_values[STATIC_LENGTH];
+};
 
 struct VarRegionList
 {
-  using cache_t = hb_atomic_t<int>;
-
-  float evaluate (unsigned int region_index,
-                  const int *coords, unsigned int coord_len,
-                  cache_t *cache = nullptr) const
+  private:
+  float evaluate_impl (unsigned int region_index,
+                       const int *coords, unsigned int coord_len) const
   {
-    if (unlikely (region_index >= regionCount))
-      return 0.;
-
-    cache_t *cached_value = nullptr;
-    if (cache)
-    {
-      cached_value = &(cache[region_index]);
-      if (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID)
-        return *cached_value * REGION_CACHE_ITEM_DIVISOR;
-    }
-
     const VarRegionAxis *axes = axesZ.arrayZ + (region_index * axisCount);
+    float v = 1.f;
 
-    float v = 1.;
     unsigned int count = axisCount;
     for (unsigned int i = 0; i < count; i++)
     {
@@ -2581,15 +2653,32 @@ struct VarRegionList
       float factor = axes[i].evaluate (coord);
       if (factor == 0.f)
       {
-        if (cache)
-          *cached_value = 0.;
-        return 0.;
+        v = 0.f;
+        break;
       }
       v *= factor;
     }
 
+    return v;
+  }
+
+  public:
+  HB_ALWAYS_INLINE
+  float evaluate (unsigned int region_index,
+                  const int *coords, unsigned int coord_len,
+                  hb_scalar_cache_t *cache = nullptr) const
+  {
+    if (unlikely (region_index >= regionCount))
+      return 0.;
+
+    float v;
+    if (cache && cache->get (region_index, &v))
+      return v;
+
+    v = evaluate_impl (region_index, coords, coord_len);
+
     if (cache)
-      *cached_value = v * REGION_CACHE_ITEM_MULTIPLIER;
+      cache->set (region_index, v);
     return v;
   }
 
@@ -2732,29 +2821,24 @@ struct SparseVariationRegion : Array16Of<SparseVarRegionAxis>
 
 struct SparseVarRegionList
 {
-  using cache_t = hb_atomic_t<int>;
-
+  HB_ALWAYS_INLINE
   float evaluate (unsigned int region_index,
                   const int *coords, unsigned int coord_len,
-                  cache_t *cache = nullptr) const
+                  hb_scalar_cache_t *cache = nullptr) const
   {
     if (unlikely (region_index >= regions.len))
       return 0.;
 
-    cache_t *cached_value = nullptr;
-    if (cache)
-    {
-      cached_value = &(cache[region_index]);
-      if (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID)
-        return *cached_value * REGION_CACHE_ITEM_DIVISOR;
-    }
+    float v;
+    if (cache && cache->get (region_index, &v))
+      return v;
 
     const SparseVariationRegion &region = this+regions[region_index];
 
-    float v = region.evaluate (coords, coord_len);
-
+    v = region.evaluate (coords, coord_len);
     if (cache)
-      *cached_value = v * REGION_CACHE_ITEM_MULTIPLIER;
+      cache->set (region_index, v);
+
     return v;
   }
 
@@ -2792,46 +2876,62 @@ struct VarData
          + itemCount * get_row_size ();
   }
 
-  float get_delta (unsigned int inner,
-                   const int *coords, unsigned int coord_count,
-                   const VarRegionList &regions,
-                   VarRegionList::cache_t *cache = nullptr) const
+  float _get_delta (unsigned int inner,
+                    const int *coords, unsigned int coord_count,
+                    const VarRegionList &regions,
+                    hb_scalar_cache_t *cache = nullptr) const
   {
     if (unlikely (inner >= itemCount))
       return 0.;
+    bool is_long = longWords ();
+    unsigned int count = regionIndices.len;
+    unsigned word_count = wordCount ();
+    unsigned int scount = is_long ? count : word_count;
+    unsigned int lcount = is_long ? word_count : 0;
 
-   unsigned int count = regionIndices.len;
-   bool is_long = longWords ();
-   unsigned word_count = wordCount ();
-   unsigned int scount = is_long ? count : word_count;
-   unsigned int lcount = is_long ? word_count : 0;
+    const HBUINT8 *bytes = get_delta_bytes ();
+    const HBUINT8 *row = bytes + inner * get_row_size ();
 
-   const HBUINT8 *bytes = get_delta_bytes ();
-   const HBUINT8 *row = bytes + inner * get_row_size ();
+    float delta = 0.;
+    unsigned int i = 0;
 
-   float delta = 0.;
-   unsigned int i = 0;
+    const HBINT32 *lcursor = reinterpret_cast<const HBINT32 *> (row);
+    for (; i < lcount; i++)
+    {
+      float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache);
+      if (scalar)
+        delta += scalar * *lcursor;
+      lcursor++;
+    }
+    const HBINT16 *scursor = reinterpret_cast<const HBINT16 *> (lcursor);
+    for (; i < scount; i++)
+    {
+      float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache);
+      if (scalar)
+       delta += scalar * *scursor;
+      scursor++;
+    }
+    const HBINT8 *bcursor = reinterpret_cast<const HBINT8 *> (scursor);
+    for (; i < count; i++)
+    {
+      float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache);
+      if (scalar)
+        delta += scalar * *bcursor;
+      bcursor++;
+    }
 
-   const HBINT32 *lcursor = reinterpret_cast<const HBINT32 *> (row);
-   for (; i < lcount; i++)
-   {
-     float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache);
-     delta += scalar * *lcursor++;
-   }
-   const HBINT16 *scursor = reinterpret_cast<const HBINT16 *> (lcursor);
-   for (; i < scount; i++)
-   {
-     float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache);
-     delta += scalar * *scursor++;
-   }
-   const HBINT8 *bcursor = reinterpret_cast<const HBINT8 *> (scursor);
-   for (; i < count; i++)
-   {
-     float scalar = regions.evaluate (regionIndices.arrayZ[i], coords, coord_count, cache);
-     delta += scalar * *bcursor++;
-   }
+    return delta;
+  }
 
-   return delta;
+  HB_ALWAYS_INLINE
+  float get_delta (unsigned int inner,
+                   const int *coords, unsigned int coord_count,
+                   const VarRegionList &regions,
+                   hb_scalar_cache_t *cache = nullptr) const
+  {
+    unsigned int count = regionIndices.len;
+    if (!count) return 0.f; // This is quite common, so optimize it.
+    return _get_delta (inner, coords, coord_count, regions, cache);
   }
 
   void get_region_scalars (const int *coords, unsigned int coord_count,
@@ -3150,7 +3250,7 @@ struct MultiVarData
                   const int *coords, unsigned int coord_count,
                   const SparseVarRegionList &regions,
                   hb_array_t<float> out,
-                  SparseVarRegionList::cache_t *cache = nullptr) const
+                  hb_scalar_cache_t *cache = nullptr) const
   {
     auto &deltaSets = StructAfter<decltype (deltaSetsX)> (regionIndices);
 
@@ -3187,31 +3287,24 @@ struct MultiVarData
 struct ItemVariationStore
 {
   friend struct item_variations_t;
-  using cache_t = VarRegionList::cache_t;
 
-  cache_t *create_cache () const
+  hb_scalar_cache_t *create_cache () const
   {
 #ifdef HB_NO_VAR
-    return nullptr;
+    return hb_scalar_cache_t::create (0);
 #endif
-    unsigned count = (this+regions).regionCount;
-    if (!count) return nullptr;
-
-    cache_t *cache = (cache_t *) hb_malloc (sizeof (float) * count);
-    if (unlikely (!cache)) return nullptr;
-
-    for (unsigned i = 0; i < count; i++)
-      cache[i] = REGION_CACHE_ITEM_CACHE_INVALID;
-
-    return cache;
+    return hb_scalar_cache_t::create ((this+regions).regionCount);
   }
 
-  static void destroy_cache (cache_t *cache) { hb_free (cache); }
+  static void destroy_cache (hb_scalar_cache_t *cache)
+  {
+    hb_scalar_cache_t::destroy (cache);
+  }
 
   private:
   float get_delta (unsigned int outer, unsigned int inner,
                    const int *coords, unsigned int coord_count,
-                   VarRegionList::cache_t *cache = nullptr) const
+                   hb_scalar_cache_t *cache = nullptr) const
   {
 #ifdef HB_NO_VAR
     return 0.f;
@@ -3229,7 +3322,7 @@ struct ItemVariationStore
   public:
   float get_delta (unsigned int index,
                    const int *coords, unsigned int coord_count,
-                   VarRegionList::cache_t *cache = nullptr) const
+                   hb_scalar_cache_t *cache = nullptr) const
   {
     unsigned int outer = index >> 16;
     unsigned int inner = index & 0xFFFF;
@@ -3237,7 +3330,7 @@ struct ItemVariationStore
   }
   float get_delta (unsigned int index,
                    hb_array_t<const int> coords,
-                   VarRegionList::cache_t *cache = nullptr) const
+                   hb_scalar_cache_t *cache = nullptr) const
   {
     return get_delta (index,
                       coords.arrayZ, coords.length,
@@ -3356,7 +3449,7 @@ struct ItemVariationStore
     for (unsigned i = 0; i < count; i++)
     {
       hb_inc_bimap_t *map = inner_maps.push ();
-      if (!c->propagate_error(inner_maps))
+      if (unlikely (!c->propagate_error(inner_maps)))
         return_trace(nullptr);
       auto &data = this+dataSets[i];
 
@@ -3445,43 +3538,28 @@ struct ItemVariationStore
 
 struct MultiItemVariationStore
 {
-  using cache_t = SparseVarRegionList::cache_t;
-
-  cache_t *create_cache (hb_array_t<cache_t> static_cache = hb_array_t<cache_t> ()) const
+  hb_scalar_cache_t *create_cache (hb_scalar_cache_t *static_cache = nullptr) const
   {
 #ifdef HB_NO_VAR
-    return nullptr;
+    return hb_scalar_cache_t::create (0);
 #endif
     auto &r = this+regions;
     unsigned count = r.regions.len;
 
-    cache_t *cache;
-    if (count <= static_cache.length)
-      cache = static_cache.arrayZ;
-    else
-    {
-      cache = (cache_t *) hb_malloc (sizeof (float) * count);
-      if (unlikely (!cache)) return nullptr;
-    }
-
-    for (unsigned i = 0; i < count; i++)
-      cache[i] = REGION_CACHE_ITEM_CACHE_INVALID;
-
-    return cache;
+    return hb_scalar_cache_t::create (count, static_cache);
   }
 
-  static void destroy_cache (cache_t *cache,
-                             hb_array_t<cache_t> static_cache = hb_array_t<cache_t> ())
+  static void destroy_cache (hb_scalar_cache_t *cache,
+                             hb_scalar_cache_t *static_cache = nullptr)
   {
-    if (cache != static_cache.arrayZ)
-      hb_free (cache);
+    hb_scalar_cache_t::destroy (cache, static_cache);
   }
 
   private:
   void get_delta (unsigned int outer, unsigned int inner,
                   const int *coords, unsigned int coord_count,
                   hb_array_t<float> out,
-                  VarRegionList::cache_t *cache = nullptr) const
+                  hb_scalar_cache_t *cache = nullptr) const
   {
 #ifdef HB_NO_VAR
     return;
@@ -3501,7 +3579,7 @@ struct MultiItemVariationStore
   void get_delta (unsigned int index,
                   const int *coords, unsigned int coord_count,
                   hb_array_t<float> out,
-                  VarRegionList::cache_t *cache = nullptr) const
+                  hb_scalar_cache_t *cache = nullptr) const
   {
     unsigned int outer = index >> 16;
     unsigned int inner = index & 0xFFFF;
@@ -3510,7 +3588,7 @@ struct MultiItemVariationStore
   void get_delta (unsigned int index,
                   hb_array_t<const int> coords,
                   hb_array_t<float> out,
-                  VarRegionList::cache_t *cache = nullptr) const
+                  hb_scalar_cache_t *cache = nullptr) const
   {
     return get_delta (index,
                       coords.arrayZ, coords.length,
@@ -3540,8 +3618,6 @@ struct MultiItemVariationStore
   DEFINE_SIZE_ARRAY_SIZED (8, dataSets);
 };
 
-#undef REGION_CACHE_ITEM_CACHE_INVALID
-
 template <typename MapCountT>
 struct DeltaSetIndexMapFormat01
 {
@@ -3592,13 +3668,19 @@ struct DeltaSetIndexMapFormat01
     return_trace (true);
   }
 
+  HB_ALWAYS_INLINE
   uint32_t map (unsigned int v) const /* Returns 16.16 outer.inner. */
   {
     /* If count is zero, pass value unchanged.  This takes
      * care of direct mapping for advance map. */
     if (!mapCount)
       return v;
+    return _map (v);
+  }
 
+  HB_HOT
+  uint32_t _map (unsigned int v) const /* Returns 16.16 outer.inner. */
+  {
     if (v >= mapCount)
       v = mapCount - 1;
 
@@ -3654,8 +3736,8 @@ struct DeltaSetIndexMap
   {
     TRACE_SERIALIZE (this);
     unsigned length = plan.get_output_map ().length;
-    u.format = length <= 0xFFFF ? 0 : 1;
-    switch (u.format) {
+    u.format.v = length <= 0xFFFF ? 0 : 1;
+    switch (u.format.v) {
     case 0: hb_barrier (); return_trace (u.format0.serialize (c, plan));
     case 1: hb_barrier (); return_trace (u.format1.serialize (c, plan));
     default:return_trace (false);
@@ -3664,7 +3746,7 @@ struct DeltaSetIndexMap
 
   uint32_t map (unsigned v) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return (u.format0.map (v));
     case 1: hb_barrier (); return (u.format1.map (v));
     default:return v;
@@ -3673,7 +3755,7 @@ struct DeltaSetIndexMap
 
   unsigned get_map_count () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return u.format0.get_map_count ();
     case 1: hb_barrier (); return u.format1.get_map_count ();
     default:return 0;
@@ -3682,7 +3764,7 @@ struct DeltaSetIndexMap
 
   unsigned get_width () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return u.format0.get_width ();
     case 1: hb_barrier (); return u.format1.get_width ();
     default:return 0;
@@ -3691,7 +3773,7 @@ struct DeltaSetIndexMap
 
   unsigned get_inner_bit_count () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return u.format0.get_inner_bit_count ();
     case 1: hb_barrier (); return u.format1.get_inner_bit_count ();
     default:return 0;
@@ -3701,9 +3783,9 @@ struct DeltaSetIndexMap
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     default:return_trace (true);
@@ -3713,7 +3795,7 @@ struct DeltaSetIndexMap
   DeltaSetIndexMap* copy (hb_serialize_context_t *c) const
   {
     TRACE_SERIALIZE (this);
-    switch (u.format) {
+    switch (u.format.v) {
     case 0: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format0.copy (c)));
     case 1: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format1.copy (c)));
     default:return_trace (nullptr);
@@ -3722,12 +3804,12 @@ struct DeltaSetIndexMap
 
   protected:
   union {
-  HBUINT8                            format;         /* Format identifier */
+  struct { HBUINT8 v; }             format;         /* Format identifier */
   DeltaSetIndexMapFormat01<HBUINT16> format0;
   DeltaSetIndexMapFormat01<HBUINT32> format1;
   } u;
   public:
-  DEFINE_SIZE_UNION (1, format);
+  DEFINE_SIZE_UNION (1, format.v);
 };
 
 
@@ -3736,7 +3818,7 @@ struct ItemVarStoreInstancer
   ItemVarStoreInstancer (const ItemVariationStore *varStore_,
                          const DeltaSetIndexMap *varIdxMap,
                          hb_array_t<const int> coords,
-                         VarRegionList::cache_t *cache = nullptr) :
+                         hb_scalar_cache_t *cache = nullptr) :
     varStore (varStore_), varIdxMap (varIdxMap), coords (coords), cache (cache)
   {
     if (!varStore)
@@ -3762,7 +3844,7 @@ struct ItemVarStoreInstancer
   const ItemVariationStore *varStore;
   const DeltaSetIndexMap *varIdxMap;
   hb_array_t<const int> coords;
-  VarRegionList::cache_t *cache;
+  hb_scalar_cache_t *cache;
 };
 
 struct MultiItemVarStoreInstancer
@@ -3770,7 +3852,7 @@ struct MultiItemVarStoreInstancer
   MultiItemVarStoreInstancer (const MultiItemVariationStore *varStore,
                               const DeltaSetIndexMap *varIdxMap,
                               hb_array_t<const int> coords,
-                              SparseVarRegionList::cache_t *cache = nullptr) :
+                              hb_scalar_cache_t *cache = nullptr) :
     varStore (varStore), varIdxMap (varIdxMap), coords (coords), cache (cache)
   {
     if (!varStore)
@@ -3803,7 +3885,7 @@ struct MultiItemVarStoreInstancer
   const MultiItemVariationStore *varStore;
   const DeltaSetIndexMap *varIdxMap;
   hb_array_t<const int> coords;
-  SparseVarRegionList::cache_t *cache;
+  hb_scalar_cache_t *cache;
 };
 
 
@@ -4130,7 +4212,7 @@ struct Condition
   bool evaluate (const int *coords, unsigned int coord_len,
                  Instancer *instancer) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.evaluate (coords, coord_len, instancer);
     case 2: hb_barrier (); return u.format2.evaluate (coords, coord_len, instancer);
     case 3: hb_barrier (); return u.format3.evaluate (coords, coord_len, instancer);
@@ -4143,7 +4225,7 @@ struct Condition
   Cond_with_Var_flag_t keep_with_variations (hb_collect_feature_substitutes_with_var_context_t *c,
                                              hb_map_t *condition_map /* OUT */) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.keep_with_variations (c, condition_map);
     // TODO(subset)
     default: c->apply = false; return KEEP_COND_WITH_VAR;
@@ -4153,9 +4235,9 @@ struct Condition
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -4168,9 +4250,9 @@ struct Condition
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
+    if (!u.format.v.sanitize (c)) return_trace (false);
     hb_barrier ();
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
     case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
@@ -4182,7 +4264,7 @@ struct Condition
 
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   ConditionAxisRange    format1;
   ConditionValue        format2;
   ConditionAnd          format3;
@@ -4190,7 +4272,7 @@ struct Condition
   ConditionNegate       format5;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 template <typename Instancer>
@@ -4353,7 +4435,7 @@ struct FeatureTableSubstitutionRecord
     if (unlikely (!s->extend_min (this))) return_trace (false);
 
     uint32_t *new_feature_idx;
-    if (!c->feature_index_map->has (feature_index, &new_feature_idx))
+    if (!c->feature_map_w_duplicates->has (feature_index, &new_feature_idx))
       return_trace (false);
 
     if (!s->check_assign (featureIndex, *new_feature_idx, HB_SERIALIZE_ERROR_INT_OVERFLOW))
@@ -4371,7 +4453,7 @@ struct FeatureTableSubstitutionRecord
   {
     TRACE_SUBSET (this);
     uint32_t *new_feature_index;
-    if (!c->feature_index_map->has (featureIndex, &new_feature_index))
+    if (!c->feature_map_w_duplicates->has (featureIndex, &new_feature_index))
       return_trace (false);
 
     auto *out = c->subset_context->serializer->embed (this);
@@ -4645,7 +4727,7 @@ struct FeatureVariations
 
     int keep_up_to = -1;
     for (int i = varRecords.len - 1; i >= 0; i--) {
-      if (varRecords[i].intersects_features (this, l->feature_index_map)) {
+      if (varRecords[i].intersects_features (this, l->feature_map_w_duplicates)) {
         keep_up_to = i;
         break;
       }
@@ -4783,13 +4865,13 @@ struct VariationDevice
 
   hb_position_t get_x_delta (hb_font_t *font,
                              const ItemVariationStore &store,
-                             ItemVariationStore::cache_t *store_cache = nullptr) const
-  { return !font->num_coords ? 0 : font->em_scalef_x (get_delta (font, store, store_cache)); }
+                             hb_scalar_cache_t *store_cache = nullptr) const
+  { return !font->has_nonzero_coords ? 0 : font->em_scalef_x (get_delta (font, store, store_cache)); }
 
   hb_position_t get_y_delta (hb_font_t *font,
                              const ItemVariationStore &store,
-                             ItemVariationStore::cache_t *store_cache = nullptr) const
-  { return !font->num_coords ? 0 : font->em_scalef_y (get_delta (font, store, store_cache)); }
+                             hb_scalar_cache_t *store_cache = nullptr) const
+  { return !font->has_nonzero_coords ? 0 : font->em_scalef_y (get_delta (font, store, store_cache)); }
 
   VariationDevice* copy (hb_serialize_context_t *c,
                          const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map) const
@@ -4823,9 +4905,9 @@ struct VariationDevice
 
   float get_delta (hb_font_t *font,
                    const ItemVariationStore &store,
-                   ItemVariationStore::cache_t *store_cache = nullptr) const
+                   hb_scalar_cache_t *store_cache = nullptr) const
   {
-    return store.get_delta (varIdx, font->coords, font->num_coords, (ItemVariationStore::cache_t *) store_cache);
+    return store.get_delta (varIdx, font->coords, font->num_coords, store_cache);
   }
 
   protected:
@@ -4850,7 +4932,7 @@ struct Device
 {
   hb_position_t get_x_delta (hb_font_t *font,
                              const ItemVariationStore &store=Null (ItemVariationStore),
-                             ItemVariationStore::cache_t *store_cache = nullptr) const
+                             hb_scalar_cache_t *store_cache = nullptr) const
   {
     switch (u.b.format)
     {
@@ -4868,7 +4950,7 @@ struct Device
   }
   hb_position_t get_y_delta (hb_font_t *font,
                              const ItemVariationStore &store=Null (ItemVariationStore),
-                             ItemVariationStore::cache_t *store_cache = nullptr) const
+                             hb_scalar_cache_t *store_cache = nullptr) const
   {
     switch (u.b.format)
     {
@@ -4954,6 +5036,18 @@ struct Device
     }
   }
 
+  bool is_variation_device () const
+  {
+    switch (u.b.format) {
+#ifndef HB_NO_VAR
+    case 0x8000:
+      return true;
+#endif
+    default:
+      return false;
+    }
+  }
+
   protected:
   union {
   DeviceHeader          b;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh
index 0cfa139a260..f6aabc84ac9 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh
@@ -63,12 +63,20 @@ inline bool PosLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_apply
   c->set_lookup_index (lookup_index);
   c->set_lookup_props (l.get_props ());
 
+  uint32_t stack_match_positions[8];
+  hb_vector_t<uint32_t> saved_match_positions;
+  saved_match_positions.set_storage (stack_match_positions);
+  hb_swap (c->match_positions, saved_match_positions);
+
   bool ret = false;
   auto *accel = gpos->get_accel (lookup_index);
-  ret = accel && accel->apply (c, l.get_subtable_count (), false);
+  ret = accel && accel->apply (c, false);
 
   c->set_lookup_index (saved_lookup_index);
   c->set_lookup_props (saved_lookup_props);
+
+  hb_swap (c->match_positions, saved_match_positions);
+
   return ret;
 }
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh
index fd8a68be02d..8d5e1f18638 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsub-table.hh
@@ -76,12 +76,20 @@ inline bool SubstLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_app
   c->set_lookup_index (lookup_index);
   c->set_lookup_props (l.get_props ());
 
+  uint32_t stack_match_positions[8];
+  hb_vector_t<uint32_t> saved_match_positions;
+  saved_match_positions.set_storage (stack_match_positions);
+  hb_swap (c->match_positions, saved_match_positions);
+
   bool ret = false;
   auto *accel = gsub->get_accel (lookup_index);
-  ret = accel && accel->apply (c, l.get_subtable_count (), false);
+  ret = accel && accel->apply (c, false);
 
   c->set_lookup_index (saved_lookup_index);
   c->set_lookup_props (saved_lookup_props);
+
+  hb_swap (c->match_positions, saved_match_positions);
+
   return ret;
 }
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
index 072e5cdba26..05bbf3395bf 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
@@ -397,303 +397,311 @@ struct hb_collect_coverage_context_t :
   set_t *set;
 };
 
-struct hb_ot_apply_context_t :
-       hb_dispatch_context_t<hb_ot_apply_context_t, bool, HB_DEBUG_APPLY>
+struct matcher_t
 {
-  struct matcher_t
+  typedef bool (*match_func_t) (hb_glyph_info_t &info, unsigned value, const void *data);
+
+  template <typename context_t>
+  void init (const context_t *c, bool context_match = false)
   {
-    typedef bool (*match_func_t) (hb_glyph_info_t &info, unsigned value, const void *data);
+    set_match_func (nullptr, nullptr);
+    lookup_props = c->lookup_props;
+    /* Ignore ZWNJ if we are matching GPOS, or matching GSUB context and asked to. */
+    ignore_zwnj = c->table_index == 1 || (context_match && c->auto_zwnj);
+    /* Ignore ZWJ if we are matching context, or asked to. */
+    ignore_zwj = context_match || c->auto_zwj;
+    /* Ignore hidden glyphs (like CGJ) during GPOS. */
+    ignore_hidden = c->table_index == 1;
+    mask = context_match ? -1 : c->lookup_mask;
+    /* Per syllable matching is only for GSUB. */
+    per_syllable = c->table_index == 0 && c->per_syllable;
+    syllable = 0;
+  }
 
-    void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; }
-    void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; }
-    void set_ignore_hidden (bool ignore_hidden_) { ignore_hidden = ignore_hidden_; }
-    void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; }
-    void set_mask (hb_mask_t mask_) { mask = mask_; }
-    void set_per_syllable (bool per_syllable_) { per_syllable = per_syllable_; }
-    void set_syllable (uint8_t syllable_)  { syllable = per_syllable ? syllable_ : 0; }
-    void set_match_func (match_func_t match_func_,
-                         const void *match_data_)
-    { match_func = match_func_; match_data = match_data_; }
+  void set_match_func (match_func_t match_func_,
+                       const void *match_data_)
+  { match_func = match_func_; match_data = match_data_; }
 
-    enum may_match_t {
-      MATCH_NO,
-      MATCH_YES,
-      MATCH_MAYBE
-    };
-
-#ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
-#endif
-    may_match_t may_match (hb_glyph_info_t &info,
-                           hb_codepoint_t glyph_data) const
-    {
-      if (!(info.mask & mask) ||
-          (syllable && syllable != info.syllable ()))
-        return MATCH_NO;
-
-      if (match_func)
-        return match_func (info, glyph_data, match_data) ? MATCH_YES : MATCH_NO;
-
-      return MATCH_MAYBE;
-    }
-
-    enum may_skip_t {
-      SKIP_NO,
-      SKIP_YES,
-      SKIP_MAYBE
-    };
-
-#ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
-#endif
-    may_skip_t may_skip (const hb_ot_apply_context_t *c,
-                         const hb_glyph_info_t       &info) const
-    {
-      if (!c->check_glyph_property (&info, lookup_props))
-        return SKIP_YES;
-
-      if (unlikely (_hb_glyph_info_is_default_ignorable (&info) &&
-                    (ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) &&
-                    (ignore_zwj || !_hb_glyph_info_is_zwj (&info)) &&
-                    (ignore_hidden || !_hb_glyph_info_is_hidden (&info))))
-        return SKIP_MAYBE;
-
-      return SKIP_NO;
-    }
-
-    protected:
-    unsigned int lookup_props = 0;
-    hb_mask_t mask = -1;
-    bool ignore_zwnj = false;
-    bool ignore_zwj = false;
-    bool ignore_hidden = false;
-    bool per_syllable = false;
-    uint8_t syllable = 0;
-    match_func_t match_func = nullptr;
-    const void *match_data = nullptr;
+  enum may_match_t {
+    MATCH_NO,
+    MATCH_YES,
+    MATCH_MAYBE
   };
 
-  struct skipping_iterator_t
+#ifndef HB_OPTIMIZE_SIZE
+  HB_ALWAYS_INLINE
+#endif
+  may_match_t may_match (hb_glyph_info_t &info,
+                         hb_codepoint_t glyph_data) const
   {
-    void init (hb_ot_apply_context_t *c_, bool context_match = false)
-    {
-      c = c_;
-      end = c->buffer->len;
-      match_glyph_data16 = nullptr;
+    if (!(info.mask & mask) ||
+        (per_syllable && syllable && syllable != info.syllable ()))
+      return MATCH_NO;
+
+    if (match_func)
+      return match_func (info, glyph_data, match_data) ? MATCH_YES : MATCH_NO;
+
+    return MATCH_MAYBE;
+  }
+
+  enum may_skip_t {
+    SKIP_NO,
+    SKIP_YES,
+    SKIP_MAYBE
+  };
+
+  template <typename context_t>
+#ifndef HB_OPTIMIZE_SIZE
+  HB_ALWAYS_INLINE
+#endif
+  may_skip_t may_skip (const context_t *c,
+                       const hb_glyph_info_t &info) const
+  {
+    if (!c->check_glyph_property (&info, lookup_props))
+      return SKIP_YES;
+
+    if (unlikely (_hb_glyph_info_is_default_ignorable (&info) &&
+                  (ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) &&
+                  (ignore_zwj || !_hb_glyph_info_is_zwj (&info)) &&
+                  (ignore_hidden || !_hb_glyph_info_is_hidden (&info))))
+      return SKIP_MAYBE;
+
+    return SKIP_NO;
+  }
+
+  public:
+  unsigned int lookup_props = 0;
+  hb_mask_t mask = -1;
+  bool ignore_zwnj = false;
+  bool ignore_zwj = false;
+  bool ignore_hidden = false;
+  bool per_syllable = false;
+  uint8_t syllable = 0;
+  match_func_t match_func = nullptr;
+  const void *match_data = nullptr;
+};
+
+template <typename context_t>
+struct skipping_iterator_t
+{
+  void init (context_t *c_, bool context_match = false)
+  {
+    c = c_;
+    end = c->buffer->len;
+    match_glyph_data16 = nullptr;
 #ifndef HB_NO_BEYOND_64K
-      match_glyph_data24 = nullptr;
+    match_glyph_data24 = nullptr;
 #endif
-      matcher.set_match_func (nullptr, nullptr);
-      matcher.set_lookup_props (c->lookup_props);
-      /* Ignore ZWNJ if we are matching GPOS, or matching GSUB context and asked to. */
-      matcher.set_ignore_zwnj (c->table_index == 1 || (context_match && c->auto_zwnj));
-      /* Ignore ZWJ if we are matching context, or asked to. */
-      matcher.set_ignore_zwj  (context_match || c->auto_zwj);
-      /* Ignore hidden glyphs (like CGJ) during GPOS. */
-      matcher.set_ignore_hidden (c->table_index == 1);
-      matcher.set_mask (context_match ? -1 : c->lookup_mask);
-      /* Per syllable matching is only for GSUB. */
-      matcher.set_per_syllable (c->table_index == 0 && c->per_syllable);
-      matcher.set_syllable (0);
-    }
-    void set_lookup_props (unsigned int lookup_props)
-    {
-      matcher.set_lookup_props (lookup_props);
-    }
-    void set_match_func (matcher_t::match_func_t match_func_,
-                         const void *match_data_)
-    {
-      matcher.set_match_func (match_func_, match_data_);
-    }
-    void set_glyph_data (const HBUINT16 glyph_data[])
-    {
-      match_glyph_data16 = glyph_data;
+    matcher.init (c, context_match);
+  }
+  void set_lookup_props (unsigned int lookup_props)
+  {
+    matcher.lookup_props = lookup_props;
+  }
+  void set_match_func (matcher_t::match_func_t match_func_,
+                       const void *match_data_)
+  {
+    matcher.set_match_func (match_func_, match_data_);
+  }
+  void set_glyph_data (const HBUINT16 glyph_data[])
+  {
+    match_glyph_data16 = glyph_data;
 #ifndef HB_NO_BEYOND_64K
-      match_glyph_data24 = nullptr;
+    match_glyph_data24 = nullptr;
 #endif
-    }
+  }
 #ifndef HB_NO_BEYOND_64K
-    void set_glyph_data (const HBUINT24 glyph_data[])
-    {
-      match_glyph_data16 = nullptr;
-      match_glyph_data24 = glyph_data;
-    }
+  void set_glyph_data (const HBUINT24 glyph_data[])
+  {
+    match_glyph_data16 = nullptr;
+    match_glyph_data24 = glyph_data;
+  }
 #endif
 
 #ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
+  HB_ALWAYS_INLINE
 #endif
-    void reset (unsigned int start_index_)
-    {
-      idx = start_index_;
-      end = c->buffer->len;
-      matcher.set_syllable (start_index_ == c->buffer->idx ? c->buffer->cur().syllable () : 0);
-    }
-
-#ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
-#endif
-    void reset_fast (unsigned int start_index_)
-    {
-      // Doesn't set end or syllable. Used by GPOS which doesn't care / change.
-      idx = start_index_;
-    }
-
-    void reject ()
-    {
-      backup_glyph_data ();
-    }
-
-    matcher_t::may_skip_t
-#ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
-#endif
-    may_skip (const hb_glyph_info_t &info) const
-    { return matcher.may_skip (c, info); }
-
-    enum match_t {
-      MATCH,
-      NOT_MATCH,
-      SKIP
-    };
-
-#ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
-#endif
-    match_t match (hb_glyph_info_t &info)
-    {
-      matcher_t::may_skip_t skip = matcher.may_skip (c, info);
-      if (unlikely (skip == matcher_t::SKIP_YES))
-        return SKIP;
-
-      matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ());
-      if (match == matcher_t::MATCH_YES ||
-          (match == matcher_t::MATCH_MAYBE &&
-           skip == matcher_t::SKIP_NO))
-        return MATCH;
-
-      if (skip == matcher_t::SKIP_NO)
-        return NOT_MATCH;
-
-      return SKIP;
+  void reset (unsigned int start_index_)
+  {
+    // For GSUB forward iterator
+    idx = start_index_;
+    end = c->buffer->len;
+    matcher.syllable = c->buffer->cur().syllable();
+  }
+  void reset_back (unsigned int start_index_, bool from_out_buffer = false)
+  {
+    // For GSUB backward iterator
+    idx = start_index_;
+    matcher.syllable = c->buffer->cur().syllable();
   }
 
 #ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
+  HB_ALWAYS_INLINE
 #endif
-    bool next (unsigned *unsafe_to = nullptr)
-    {
-      const signed stop = (signed) end - 1;
-      while ((signed) idx < stop)
-      {
-        idx++;
-        switch (match (c->buffer->info[idx]))
-        {
-          case MATCH:
-          {
-            advance_glyph_data ();
-            return true;
-          }
-          case NOT_MATCH:
-          {
-            if (unsafe_to)
-              *unsafe_to = idx + 1;
-            return false;
-          }
-          case SKIP:
-            continue;
-        }
-      }
-      if (unsafe_to)
-        *unsafe_to = end;
-      return false;
-    }
+  void reset_fast (unsigned int start_index_)
+  {
+    // Doesn't set end or syllable. Used by GPOS which doesn't care / change.
+    idx = start_index_;
+  }
+
 #ifndef HB_OPTIMIZE_SIZE
-    HB_ALWAYS_INLINE
+  HB_ALWAYS_INLINE
 #endif
-    bool prev (unsigned *unsafe_from = nullptr)
-    {
-      const unsigned stop = 0;
-      while (idx > stop)
-      {
-        idx--;
-        switch (match (c->buffer->out_info[idx]))
-        {
-          case MATCH:
-          {
-            advance_glyph_data ();
-            return true;
-          }
-          case NOT_MATCH:
-          {
-            if (unsafe_from)
-              *unsafe_from = hb_max (1u, idx) - 1u;
-            return false;
-          }
-          case SKIP:
-            continue;
-        }
-      }
-      if (unsafe_from)
-        *unsafe_from = 0;
-      return false;
-    }
+  matcher_t::may_skip_t may_skip (const hb_glyph_info_t &info) const
+  { return matcher.may_skip (c, info); }
 
-    HB_ALWAYS_INLINE
-    hb_codepoint_t
-    get_glyph_data ()
-    {
-      if (match_glyph_data16) return *match_glyph_data16;
-#ifndef HB_NO_BEYOND_64K
-      else
-      if (match_glyph_data24) return *match_glyph_data24;
-#endif
-      return 0;
-    }
-    HB_ALWAYS_INLINE
-    void
-    advance_glyph_data ()
-    {
-      if (match_glyph_data16) match_glyph_data16++;
-#ifndef HB_NO_BEYOND_64K
-      else
-      if (match_glyph_data24) match_glyph_data24++;
-#endif
-    }
-    void
-    backup_glyph_data ()
-    {
-      if (match_glyph_data16) match_glyph_data16--;
-#ifndef HB_NO_BEYOND_64K
-      else
-      if (match_glyph_data24) match_glyph_data24--;
-#endif
-    }
-
-    unsigned int idx;
-    protected:
-    hb_ot_apply_context_t *c;
-    matcher_t matcher;
-    const HBUINT16 *match_glyph_data16;
-#ifndef HB_NO_BEYOND_64K
-    const HBUINT24 *match_glyph_data24;
-#endif
-
-    unsigned int end;
+  enum match_t {
+    MATCH,
+    NOT_MATCH,
+    SKIP
   };
 
+#ifndef HB_OPTIMIZE_SIZE
+  HB_ALWAYS_INLINE
+#endif
+  match_t match (hb_glyph_info_t &info)
+  {
+    matcher_t::may_skip_t skip = matcher.may_skip (c, info);
+    if (unlikely (skip == matcher_t::SKIP_YES))
+      return SKIP;
 
+    matcher_t::may_match_t match = matcher.may_match (info, get_glyph_data ());
+    if (match == matcher_t::MATCH_YES ||
+        (match == matcher_t::MATCH_MAYBE &&
+         skip == matcher_t::SKIP_NO))
+      return MATCH;
+
+    if (skip == matcher_t::SKIP_NO)
+      return NOT_MATCH;
+
+    return SKIP;
+  }
+
+#ifndef HB_OPTIMIZE_SIZE
+  HB_ALWAYS_INLINE
+#endif
+  bool next (unsigned *unsafe_to = nullptr)
+  {
+    auto *info = c->buffer->info;
+    const signed stop = (signed) end - 1;
+    while ((signed) idx < stop)
+    {
+      idx++;
+      switch (match (info[idx]))
+      {
+        case MATCH:
+        {
+          advance_glyph_data ();
+          return true;
+        }
+        case NOT_MATCH:
+        {
+          if (unsafe_to)
+            *unsafe_to = idx + 1;
+          return false;
+        }
+        case SKIP:
+          continue;
+      }
+    }
+    if (unsafe_to)
+      *unsafe_to = end;
+    return false;
+  }
+#ifndef HB_OPTIMIZE_SIZE
+  HB_ALWAYS_INLINE
+#endif
+  bool prev (unsigned *unsafe_from = nullptr)
+  {
+    auto *out_info = c->buffer->out_info;
+    const unsigned stop = 0;
+    while (idx > stop)
+    {
+      idx--;
+      switch (match (out_info[idx]))
+      {
+        case MATCH:
+        {
+          advance_glyph_data ();
+          return true;
+        }
+        case NOT_MATCH:
+        {
+          if (unsafe_from)
+            *unsafe_from = hb_max (1u, idx) - 1u;
+          return false;
+        }
+        case SKIP:
+          continue;
+      }
+    }
+    if (unsafe_from)
+      *unsafe_from = 0;
+    return false;
+  }
+
+  HB_ALWAYS_INLINE
+  hb_codepoint_t
+  get_glyph_data ()
+  {
+    if (match_glyph_data16) return *match_glyph_data16;
+#ifndef HB_NO_BEYOND_64K
+    else
+    if (match_glyph_data24) return *match_glyph_data24;
+#endif
+    return 0;
+  }
+  HB_ALWAYS_INLINE
+  void
+  advance_glyph_data ()
+  {
+    if (match_glyph_data16) match_glyph_data16++;
+#ifndef HB_NO_BEYOND_64K
+    else
+    if (match_glyph_data24) match_glyph_data24++;
+#endif
+  }
+
+  unsigned int idx;
+  protected:
+  context_t *c;
+  matcher_t matcher;
+  const HBUINT16 *match_glyph_data16;
+#ifndef HB_NO_BEYOND_64K
+  const HBUINT24 *match_glyph_data24;
+#endif
+
+  unsigned int end;
+};
+
+struct hb_ot_apply_context_t :
+       hb_dispatch_context_t<hb_ot_apply_context_t, bool, HB_DEBUG_APPLY>
+{
   const char *get_name () { return "APPLY"; }
   typedef return_t (*recurse_func_t) (hb_ot_apply_context_t *c, unsigned int lookup_index);
+
   template <typename T>
-  return_t dispatch (const T &obj) { return obj.apply (this); }
+  static inline auto apply_ (const T &obj, hb_ot_apply_context_t *c, hb_priority<1>) HB_RETURN (return_t, obj.apply (c, nullptr) )
+  template <typename T>
+  static inline auto apply_ (const T &obj, hb_ot_apply_context_t *c, hb_priority<0>) HB_RETURN (return_t, obj.apply (c) )
+  template <typename T>
+  return_t dispatch (const T &obj) { return apply_(obj, this, hb_prioritize); }
+
   static return_t default_return_value () { return false; }
   bool stop_sublookup_iteration (return_t r) const { return r; }
   return_t recurse (unsigned int sub_lookup_index)
   {
-    if (unlikely (nesting_level_left == 0 || !recurse_func || buffer->max_ops-- <= 0))
+    assert (recurse_func);
+    if (unlikely (nesting_level_left == 0))
     {
-      buffer->shaping_failed = true;
+      buffer->successful = false;
+      return default_return_value ();
+    }
+
+    buffer->max_ops--;
+    if (unlikely (buffer->max_ops < 0))
+    {
+      buffer->successful = false;
       return default_return_value ();
     }
 
@@ -703,7 +711,7 @@ struct hb_ot_apply_context_t :
     return ret;
   }
 
-  skipping_iterator_t iter_input, iter_context;
+  skipping_iterator_t<hb_ot_apply_context_t> iter_input, iter_context;
 
   unsigned int table_index; /* GSUB/GPOS */
   hb_font_t *font;
@@ -715,8 +723,7 @@ struct hb_ot_apply_context_t :
   const GDEF::accelerator_t &gdef_accel;
   const hb_ot_layout_lookup_accelerator_t *lookup_accel = nullptr;
   const ItemVariationStore &var_store;
-  ItemVariationStore::cache_t *var_store_cache;
-  hb_set_digest_t digest;
+  hb_scalar_cache_t *var_store_cache;
 
   hb_direction_t direction;
   hb_mask_t lookup_mask = 1;
@@ -734,11 +741,14 @@ struct hb_ot_apply_context_t :
   signed last_base = -1; // GPOS uses
   unsigned last_base_until = 0; // GPOS uses
 
+  hb_vector_t<uint32_t> match_positions;
+  uint32_t stack_match_positions[8];
+
   hb_ot_apply_context_t (unsigned int table_index_,
                          hb_font_t *font_,
                          hb_buffer_t *buffer_,
                          hb_blob_t *table_blob_,
-                         ItemVariationStore::cache_t *var_store_cache_ = nullptr) :
+                         hb_scalar_cache_t *var_store_cache_ = nullptr) :
                         table_index (table_index_),
                         font (font_), face (font->face), buffer (buffer_),
                         sanitizer (table_blob_),
@@ -762,7 +772,7 @@ struct hb_ot_apply_context_t :
                         has_glyph_classes (gdef.has_glyph_classes ())
   {
     init_iters ();
-    buffer->collect_codepoints (digest);
+    match_positions.set_storage (stack_match_positions);
   }
 
   void init_iters ()
@@ -778,7 +788,11 @@ struct hb_ot_apply_context_t :
   void set_random (bool random_) { random = random_; }
   void set_recurse_func (recurse_func_t func) { recurse_func = func; }
   void set_lookup_index (unsigned int lookup_index_) { lookup_index = lookup_index_; }
-  void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; init_iters (); }
+  void set_lookup_props (unsigned int lookup_props_)
+  {
+    lookup_props = gdef_accel.sanitize_lookup_props (lookup_props_);
+    init_iters ();
+  }
 
   uint32_t random_number ()
   {
@@ -787,7 +801,9 @@ struct hb_ot_apply_context_t :
     return buffer->random_state;
   }
 
-  bool match_properties_mark (hb_codepoint_t  glyph,
+  HB_ALWAYS_INLINE
+  HB_HOT
+  bool match_properties_mark (const hb_glyph_info_t *info,
                               unsigned int    glyph_props,
                               unsigned int    match_props) const
   {
@@ -795,7 +811,7 @@ struct hb_ot_apply_context_t :
      * match_props has the set index.
      */
     if (match_props & LookupFlag::UseMarkFilteringSet)
-      return gdef_accel.mark_set_covers (match_props >> 16, glyph);
+      return gdef_accel.mark_set_covers (match_props >> 16, info->codepoint);
 
     /* The second byte of match_props has the meaning
      * "ignore marks of attachment type different than
@@ -811,7 +827,7 @@ struct hb_ot_apply_context_t :
   HB_ALWAYS_INLINE
 #endif
   bool check_glyph_property (const hb_glyph_info_t *info,
-                             unsigned int  match_props) const
+                             unsigned match_props) const
   {
     unsigned int glyph_props = _hb_glyph_info_get_glyph_props (info);
 
@@ -821,8 +837,8 @@ struct hb_ot_apply_context_t :
     if (glyph_props & match_props & LookupFlag::IgnoreFlags)
       return false;
 
-    if (unlikely (glyph_props & HB_OT_LAYOUT_GLYPH_PROPS_MARK))
-      return match_properties_mark (info->codepoint, glyph_props, match_props);
+    if (glyph_props & HB_OT_LAYOUT_GLYPH_PROPS_MARK)
+      return match_properties_mark (info, glyph_props, match_props);
 
     return true;
   }
@@ -832,7 +848,7 @@ struct hb_ot_apply_context_t :
                           bool ligature = false,
                           bool component = false)
   {
-    digest.add (glyph_index);
+    buffer->digest.add (glyph_index);
 
     if (new_syllables != (unsigned) -1)
       buffer->cur().syllable() = new_syllables;
@@ -890,54 +906,58 @@ struct hb_ot_apply_context_t :
   }
 };
 
-enum class hb_ot_lookup_cache_op_t
+enum class hb_ot_subtable_cache_op_t
 {
-  CREATE,
   ENTER,
   LEAVE,
-  DESTROY,
 };
 
 struct hb_accelerate_subtables_context_t :
        hb_dispatch_context_t<hb_accelerate_subtables_context_t>
 {
-  template <typename Type>
-  static inline bool apply_to (const void *obj, hb_ot_apply_context_t *c)
+  template <typename T>
+  static inline auto apply_ (const T *obj, hb_ot_apply_context_t *c, void *external_cache, hb_priority<1>) HB_RETURN (bool, obj->apply (c, external_cache) )
+  template <typename T>
+  static inline auto apply_ (const T *obj, hb_ot_apply_context_t *c, void *external_cache, hb_priority<0>) HB_RETURN (bool, obj->apply (c) )
+  template <typename T>
+  static inline bool apply_to (const void *obj, hb_ot_apply_context_t *c, void *external_cache)
   {
-    const Type *typed_obj = (const Type *) obj;
-    return typed_obj->apply (c);
+    const T *typed_obj = (const T *) obj;
+    return apply_ (typed_obj, c, external_cache, hb_prioritize);
   }
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
   template <typename T>
-  static inline auto apply_cached_ (const T *obj, hb_ot_apply_context_t *c, hb_priority<1>) HB_RETURN (bool, obj->apply_cached (c) )
+  static inline auto apply_cached_ (const T *obj, hb_ot_apply_context_t *c, void *external_cache, hb_priority<2>) HB_RETURN (bool, obj->apply_cached (c, external_cache) )
   template <typename T>
-  static inline auto apply_cached_ (const T *obj, hb_ot_apply_context_t *c, hb_priority<0>) HB_RETURN (bool, obj->apply (c) )
-  template <typename Type>
-  static inline bool apply_cached_to (const void *obj, hb_ot_apply_context_t *c)
+  static inline auto apply_cached_ (const T *obj, hb_ot_apply_context_t *c, void *external_cache, hb_priority<1>) HB_RETURN (bool, obj->apply (c, external_cache) )
+  template <typename T>
+  static inline auto apply_cached_ (const T *obj, hb_ot_apply_context_t *c, void *external_cache, hb_priority<0>) HB_RETURN (bool, obj->apply (c) )
+  template <typename T>
+  static inline bool apply_cached_to (const void *obj, hb_ot_apply_context_t *c, void *external_cache)
   {
-    const Type *typed_obj = (const Type *) obj;
-    return apply_cached_ (typed_obj, c, hb_prioritize);
+    const T *typed_obj = (const T *) obj;
+    return apply_cached_ (typed_obj, c, external_cache, hb_prioritize);
   }
 
   template <typename T>
-  static inline auto cache_func_ (void *p,
-                                  hb_ot_lookup_cache_op_t op,
-                                  hb_priority<1>) HB_RETURN (void *, T::cache_func (p, op) )
+  static inline auto cache_func_ (hb_ot_apply_context_t *c,
+                                  hb_ot_subtable_cache_op_t op,
+                                  hb_priority<1>) HB_RETURN (bool, T::cache_func (c, op) )
   template <typename T=void>
-  static inline void * cache_func_ (void *p,
-                                    hb_ot_lookup_cache_op_t op HB_UNUSED,
-                                    hb_priority<0>) { return (void *) false; }
+  static inline bool cache_func_ (hb_ot_apply_context_t *c,
+                                  hb_ot_subtable_cache_op_t op HB_UNUSED,
+                                  hb_priority<0>) { return false; }
   template <typename Type>
-  static inline void * cache_func_to (void *p,
-                                      hb_ot_lookup_cache_op_t op)
+  static inline bool cache_func_to (hb_ot_apply_context_t *c,
+                                    hb_ot_subtable_cache_op_t op)
   {
-    return cache_func_<Type> (p, op, hb_prioritize);
+    return cache_func_<Type> (c, op, hb_prioritize);
   }
 #endif
 
-  typedef bool (*hb_apply_func_t) (const void *obj, hb_ot_apply_context_t *c);
-  typedef void * (*hb_cache_func_t) (void *p, hb_ot_lookup_cache_op_t op);
+  typedef bool (*hb_apply_func_t) (const void *obj, hb_ot_apply_context_t *c, void *external_cache);
+  typedef bool (*hb_cache_func_t) (hb_ot_apply_context_t *c, hb_ot_subtable_cache_op_t op);
 
   struct hb_applicable_t
   {
@@ -950,6 +970,7 @@ struct hb_accelerate_subtables_context_t :
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
                , hb_apply_func_t apply_cached_func_
                , hb_cache_func_t cache_func_
+               , void *external_cache_
 #endif
                 )
     {
@@ -958,27 +979,34 @@ struct hb_accelerate_subtables_context_t :
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
       apply_cached_func = apply_cached_func_;
       cache_func = cache_func_;
+      external_cache = external_cache_;
 #endif
       digest.init ();
       obj_.get_coverage ().collect_coverage (&digest);
     }
 
+#ifdef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     bool apply (hb_ot_apply_context_t *c) const
     {
-      return digest.may_have (c->buffer->cur().codepoint) && apply_func (obj, c);
+      return digest.may_have (c->buffer->cur().codepoint) && apply_func (obj, c, nullptr);
+    }
+#else
+    bool apply (hb_ot_apply_context_t *c) const
+    {
+      return digest.may_have (c->buffer->cur().codepoint) && apply_func (obj, c, external_cache);
     }
-#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     bool apply_cached (hb_ot_apply_context_t *c) const
     {
-      return digest.may_have (c->buffer->cur().codepoint) &&  apply_cached_func (obj, c);
+      return digest.may_have (c->buffer->cur().codepoint) &&  apply_cached_func (obj, c, external_cache);
     }
+
     bool cache_enter (hb_ot_apply_context_t *c) const
     {
-      return (bool) cache_func (c, hb_ot_lookup_cache_op_t::ENTER);
+      return cache_func (c, hb_ot_subtable_cache_op_t::ENTER);
     }
     void cache_leave (hb_ot_apply_context_t *c) const
     {
-      cache_func (c, hb_ot_lookup_cache_op_t::LEAVE);
+      cache_func (c, hb_ot_subtable_cache_op_t::LEAVE);
     }
 #endif
 
@@ -988,6 +1016,7 @@ struct hb_accelerate_subtables_context_t :
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     hb_apply_func_t apply_cached_func;
     hb_cache_func_t cache_func;
+    void *external_cache;
 #endif
     hb_set_digest_t digest;
   };
@@ -997,12 +1026,23 @@ struct hb_accelerate_subtables_context_t :
   auto cache_cost (const T &obj, hb_priority<1>) HB_AUTO_RETURN ( obj.cache_cost () )
   template <typename T>
   auto cache_cost (const T &obj, hb_priority<0>) HB_AUTO_RETURN ( 0u )
+
+  template <typename T>
+  auto external_cache_create (const T &obj, hb_priority<1>) HB_AUTO_RETURN ( obj.external_cache_create () )
+  template <typename T>
+  auto external_cache_create (const T &obj, hb_priority<0>) HB_AUTO_RETURN ( nullptr )
 #endif
 
   /* Dispatch interface. */
   template <typename T>
   return_t dispatch (const T &obj)
   {
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    void *external_cache = nullptr;
+    if (i < 8)
+      external_cache = external_cache_create (obj, hb_prioritize);
+#endif
+
     hb_applicable_t *entry = &array[i++];
 
     entry->init (obj,
@@ -1010,6 +1050,7 @@ struct hb_accelerate_subtables_context_t :
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
                  , apply_cached_to<T>
                  , cache_func_to<T>
+                 , external_cache
 #endif
                  );
 
@@ -1023,10 +1064,10 @@ struct hb_accelerate_subtables_context_t :
      * and we allocate the cache opportunity to the costliest subtable.
      */
     unsigned cost = cache_cost (obj, hb_prioritize);
-    if (cost > cache_user_cost)
+    if (cost > subtable_cache_user_cost)
     {
-      cache_user_idx = i - 1;
-      cache_user_cost = cost;
+      subtable_cache_user_idx = i - 1;
+      subtable_cache_user_cost = cost;
     }
 #endif
 
@@ -1041,8 +1082,8 @@ struct hb_accelerate_subtables_context_t :
   unsigned i = 0;
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-  unsigned cache_user_idx = (unsigned) -1;
-  unsigned cache_user_cost = 0;
+  unsigned subtable_cache_user_idx = (unsigned) -1;
+  unsigned subtable_cache_user_cost = 0;
 #endif
 };
 
@@ -1191,38 +1232,50 @@ static inline bool match_class (hb_glyph_info_t &info, unsigned value, const voi
   const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
   return class_def.get_class (info.codepoint) == value;
 }
-static inline bool match_class_cached (hb_glyph_info_t &info, unsigned value, const void *data)
+static inline unsigned get_class_cached (const ClassDef &class_def, hb_glyph_info_t &info)
 {
   unsigned klass = info.syllable();
   if (klass < 255)
-    return klass == value;
-  const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
+    return klass;
   klass = class_def.get_class (info.codepoint);
   if (likely (klass < 255))
     info.syllable() = klass;
-  return klass == value;
+  return klass;
 }
-static inline bool match_class_cached1 (hb_glyph_info_t &info, unsigned value, const void *data)
+static inline bool match_class_cached (hb_glyph_info_t &info, unsigned value, const void *data)
+{
+  const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
+  return get_class_cached (class_def, info) == value;
+}
+static inline unsigned get_class_cached1 (const ClassDef &class_def, hb_glyph_info_t &info)
 {
   unsigned klass = info.syllable() & 0x0F;
   if (klass < 15)
-    return klass == value;
-  const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
+    return klass;
   klass = class_def.get_class (info.codepoint);
   if (likely (klass < 15))
     info.syllable() = (info.syllable() & 0xF0) | klass;
-  return klass == value;
+  return klass;
 }
-static inline bool match_class_cached2 (hb_glyph_info_t &info, unsigned value, const void *data)
+static inline bool match_class_cached1 (hb_glyph_info_t &info, unsigned value, const void *data)
+{
+  const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
+  return get_class_cached1 (class_def, info) == value;
+}
+static inline unsigned get_class_cached2 (const ClassDef &class_def, hb_glyph_info_t &info)
 {
   unsigned klass = (info.syllable() & 0xF0) >> 4;
   if (klass < 15)
-    return klass == value;
-  const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
+    return klass;
   klass = class_def.get_class (info.codepoint);
   if (likely (klass < 15))
     info.syllable() = (info.syllable() & 0x0F) | (klass << 4);
-  return klass == value;
+  return klass;
+}
+static inline bool match_class_cached2 (hb_glyph_info_t &info, unsigned value, const void *data)
+{
+  const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
+  return get_class_cached2 (class_def, info) == value;
 }
 static inline bool match_coverage (hb_glyph_info_t &info, unsigned value, const void *data)
 {
@@ -1261,16 +1314,24 @@ static bool match_input (hb_ot_apply_context_t *c,
                          match_func_t match_func,
                          const void *match_data,
                          unsigned int *end_position,
-                         unsigned int *match_positions,
                          unsigned int *p_total_component_count = nullptr)
 {
   TRACE_APPLY (nullptr);
 
-  if (unlikely (count > HB_MAX_CONTEXT_LENGTH)) return_trace (false);
-
   hb_buffer_t *buffer = c->buffer;
 
-  hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+  if (count == 1)
+  {
+    *end_position = buffer->idx + 1;
+    c->match_positions[0] = buffer->idx;
+    if (p_total_component_count)
+      *p_total_component_count = _hb_glyph_info_get_lig_num_comps (&buffer->cur());
+    return_trace (true);
+  }
+
+  if (unlikely (count > HB_MAX_CONTEXT_LENGTH)) return_trace (false);
+
+  auto &skippy_iter = c->iter_input;
   skippy_iter.reset (buffer->idx);
   skippy_iter.set_match_func (match_func, match_data);
   skippy_iter.set_glyph_data (input);
@@ -1319,7 +1380,10 @@ static bool match_input (hb_ot_apply_context_t *c,
       return_trace (false);
     }
 
-    match_positions[i] = skippy_iter.idx;
+    if (unlikely (i + 1 > c->match_positions.length &&
+                  !c->match_positions.resize_dirty  (i + 1)))
+      return_trace (false);
+    c->match_positions.arrayZ[i] = skippy_iter.idx;
 
     unsigned int this_lig_id = _hb_glyph_info_get_lig_id (&buffer->info[skippy_iter.idx]);
     unsigned int this_lig_comp = _hb_glyph_info_get_lig_comp (&buffer->info[skippy_iter.idx]);
@@ -1349,7 +1413,7 @@ static bool match_input (hb_ot_apply_context_t *c,
             j--;
           }
 
-          if (found && skippy_iter.may_skip (out[j]) == hb_ot_apply_context_t::matcher_t::SKIP_YES)
+          if (found && skippy_iter.may_skip (out[j]) == matcher_t::SKIP_YES)
             ligbase = LIGBASE_MAY_SKIP;
           else
             ligbase = LIGBASE_MAY_NOT_SKIP;
@@ -1379,13 +1443,12 @@ static bool match_input (hb_ot_apply_context_t *c,
     *p_total_component_count = total_component_count;
   }
 
-  match_positions[0] = buffer->idx;
+  c->match_positions.arrayZ[0] = buffer->idx;
 
   return_trace (true);
 }
 static inline bool ligate_input (hb_ot_apply_context_t *c,
                                  unsigned int count, /* Including the first glyph */
-                                 const unsigned int *match_positions, /* Including the first glyph */
                                  unsigned int match_end,
                                  hb_codepoint_t lig_glyph,
                                  unsigned int total_component_count)
@@ -1428,10 +1491,10 @@ static inline bool ligate_input (hb_ot_apply_context_t *c,
    *   https://bugzilla.gnome.org/show_bug.cgi?id=437633
    */
 
-  bool is_base_ligature = _hb_glyph_info_is_base_glyph (&buffer->info[match_positions[0]]);
-  bool is_mark_ligature = _hb_glyph_info_is_mark (&buffer->info[match_positions[0]]);
+  bool is_base_ligature = _hb_glyph_info_is_base_glyph (&buffer->info[c->match_positions.arrayZ[0]]);
+  bool is_mark_ligature = _hb_glyph_info_is_mark (&buffer->info[c->match_positions.arrayZ[0]]);
   for (unsigned int i = 1; i < count; i++)
-    if (!_hb_glyph_info_is_mark (&buffer->info[match_positions[i]]))
+    if (!_hb_glyph_info_is_mark (&buffer->info[c->match_positions.arrayZ[i]]))
     {
       is_base_ligature = false;
       is_mark_ligature = false;
@@ -1457,7 +1520,7 @@ static inline bool ligate_input (hb_ot_apply_context_t *c,
 
   for (unsigned int i = 1; i < count; i++)
   {
-    while (buffer->idx < match_positions[i] && buffer->successful)
+    while (buffer->idx < c->match_positions.arrayZ[i] && buffer->successful)
     {
       if (is_ligature)
       {
@@ -1512,8 +1575,14 @@ static bool match_backtrack (hb_ot_apply_context_t *c,
 {
   TRACE_APPLY (nullptr);
 
-  hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
-  skippy_iter.reset (c->buffer->backtrack_len ());
+  if (!count)
+  {
+    *match_start = c->buffer->backtrack_len ();
+    return_trace (true);
+  }
+
+  auto &skippy_iter = c->iter_context;
+  skippy_iter.reset_back (c->buffer->backtrack_len ());
   skippy_iter.set_match_func (match_func, match_data);
   skippy_iter.set_glyph_data (backtrack);
 
@@ -1545,7 +1614,13 @@ static bool match_lookahead (hb_ot_apply_context_t *c,
 {
   TRACE_APPLY (nullptr);
 
-  hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
+  if (!count)
+  {
+    *end_index = start_index;
+    return_trace (true);
+  }
+
+  auto &skippy_iter = c->iter_context;
   assert (start_index >= 1);
   skippy_iter.reset (start_index - 1);
   skippy_iter.set_match_func (match_func, match_data);
@@ -1696,7 +1771,6 @@ static inline void recurse_lookups (context_t *c,
 
 static inline void apply_lookup (hb_ot_apply_context_t *c,
                                  unsigned int count, /* Including the first glyph */
-                                 unsigned int *match_positions, /* Including the first glyph */
                                  unsigned int lookupCount,
                                  const LookupRecord lookupRecord[], /* Array of LookupRecords--in design order */
                                  unsigned int match_end)
@@ -1704,9 +1778,6 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
   hb_buffer_t *buffer = c->buffer;
   int end;
 
-  unsigned int *match_positions_input = match_positions;
-  unsigned int match_positions_count = count;
-
   /* All positions are distance from beginning of *output* buffer.
    * Adjust. */
   {
@@ -1716,7 +1787,7 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
     int delta = bl - buffer->idx;
     /* Convert positions to new indexing. */
     for (unsigned int j = 0; j < count; j++)
-      match_positions[j] += delta;
+      c->match_positions.arrayZ[j] += delta;
   }
 
   for (unsigned int i = 0; i < lookupCount && buffer->successful; i++)
@@ -1728,10 +1799,10 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
     unsigned int orig_len = buffer->backtrack_len () + buffer->lookahead_len ();
 
     /* This can happen if earlier recursed lookups deleted many entries. */
-    if (unlikely (match_positions[idx] >= orig_len))
+    if (unlikely (c->match_positions.arrayZ[idx] >= orig_len))
       continue;
 
-    if (unlikely (!buffer->move_to (match_positions[idx])))
+    if (unlikely (!buffer->move_to (c->match_positions.arrayZ[idx])))
       break;
 
     if (unlikely (buffer->max_ops <= 0))
@@ -1790,9 +1861,9 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
      */
 
     end += delta;
-    if (end < int (match_positions[idx]))
+    if (end < int (c->match_positions.arrayZ[idx]))
     {
-      /* End might end up being smaller than match_positions[idx] if the recursed
+      /* End might end up being smaller than match_positions.arrayZ[idx] if the recursed
        * lookup ended up removing many items.
        * Just never rewind end beyond start of current position, since that is
        * not possible in the recursed lookup.  Also adjust delta as such.
@@ -1800,8 +1871,8 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
        * https://bugs.chromium.org/p/chromium/issues/detail?id=659496
        * https://github.com/harfbuzz/harfbuzz/issues/1611
        */
-      delta += match_positions[idx] - end;
-      end = match_positions[idx];
+      delta += c->match_positions.arrayZ[idx] - end;
+      end = c->match_positions.arrayZ[idx];
     }
 
     unsigned int next = idx + 1; /* next now is the position after the recursed lookup. */
@@ -1810,27 +1881,9 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
     {
       if (unlikely (delta + count > HB_MAX_CONTEXT_LENGTH))
         break;
-      if (unlikely (delta + count > match_positions_count))
-      {
-        unsigned new_match_positions_count = hb_max (delta + count, hb_max(match_positions_count, 4u) * 1.5);
-        if (match_positions == match_positions_input)
-        {
-          match_positions = (unsigned int *) hb_malloc (new_match_positions_count * sizeof (match_positions[0]));
-          if (unlikely (!match_positions))
-            break;
-          memcpy (match_positions, match_positions_input, count * sizeof (match_positions[0]));
-          match_positions_count = new_match_positions_count;
-        }
-        else
-        {
-          unsigned int *new_match_positions = (unsigned int *) hb_realloc (match_positions, new_match_positions_count * sizeof (match_positions[0]));
-          if (unlikely (!new_match_positions))
-            break;
-          match_positions = new_match_positions;
-          match_positions_count = new_match_positions_count;
-        }
-      }
-
+      if (unlikely (count + delta > c->match_positions.length &&
+                    !c->match_positions.resize_dirty  (count + delta)))
+        return;
     }
     else
     {
@@ -1840,23 +1893,20 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
     }
 
     /* Shift! */
-    memmove (match_positions + next + delta, match_positions + next,
-             (count - next) * sizeof (match_positions[0]));
+    memmove (c->match_positions + next + delta, c->match_positions + next,
+             (count - next) * sizeof (c->match_positions.arrayZ[0]));
     next += delta;
     count += delta;
 
     /* Fill in new entries. */
     for (unsigned int j = idx + 1; j < next; j++)
-      match_positions[j] = match_positions[j - 1] + 1;
+      c->match_positions.arrayZ[j] = c->match_positions.arrayZ[j - 1] + 1;
 
     /* And fixup the rest. */
     for (; next < count; next++)
-      match_positions[next] += delta;
+      c->match_positions.arrayZ[next] += delta;
   }
 
-  if (match_positions != match_positions_input)
-    hb_free (match_positions);
-
   assert (end >= 0);
   (void) buffer->move_to (end);
 }
@@ -1950,34 +2000,25 @@ static inline bool context_would_apply_lookup (hb_would_apply_context_t *c,
 }
 
 template <typename HBUINT>
-HB_ALWAYS_INLINE
-static bool context_apply_lookup (hb_ot_apply_context_t *c,
-                                  unsigned int inputCount, /* Including the first glyph (not matched) */
-                                  const HBUINT input[], /* Array of input values--start with second glyph */
-                                  unsigned int lookupCount,
-                                  const LookupRecord lookupRecord[],
-                                  const ContextApplyLookupContext &lookup_context)
+static inline bool context_apply_lookup (hb_ot_apply_context_t *c,
+                                         unsigned int inputCount, /* Including the first glyph (not matched) */
+                                         const HBUINT input[], /* Array of input values--start with second glyph */
+                                         unsigned int lookupCount,
+                                         const LookupRecord lookupRecord[],
+                                         const ContextApplyLookupContext &lookup_context)
 {
   if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) return false;
-  unsigned match_positions_stack[4];
-  unsigned *match_positions = match_positions_stack;
-  if (unlikely (inputCount > ARRAY_LENGTH (match_positions_stack)))
-  {
-    match_positions = (unsigned *) hb_malloc (hb_max (inputCount, 1u) * sizeof (match_positions[0]));
-    if (unlikely (!match_positions))
-      return false;
-  }
 
   unsigned match_end = 0;
   bool ret = false;
   if (match_input (c,
                    inputCount, input,
                    lookup_context.funcs.match, lookup_context.match_data,
-                   &match_end, match_positions))
+                   &match_end))
   {
     c->buffer->unsafe_to_break (c->buffer->idx, match_end);
     apply_lookup (c,
-                  inputCount, match_positions,
+                  inputCount,
                   lookupCount, lookupRecord,
                   match_end);
     ret = true;
@@ -1988,12 +2029,34 @@ static bool context_apply_lookup (hb_ot_apply_context_t *c,
     ret = false;
   }
 
-  if (unlikely (match_positions != match_positions_stack))
-    hb_free (match_positions);
-
   return ret;
 }
 
+static inline bool context_cache_func (hb_ot_apply_context_t *c, hb_ot_subtable_cache_op_t op)
+{
+  switch (op)
+  {
+    case hb_ot_subtable_cache_op_t::ENTER:
+    {
+      if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
+        return false;
+      auto &info = c->buffer->info;
+      unsigned count = c->buffer->len;
+      for (unsigned i = 0; i < count; i++)
+        info[i].syllable() = 255;
+      c->new_syllables = 255;
+      return true;
+    }
+    case hb_ot_subtable_cache_op_t::LEAVE:
+    {
+      c->new_syllables = (unsigned) -1;
+      HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
+      break;
+    }
+  }
+  return false;
+}
+
 template <typename Types>
 struct Rule
 {
@@ -2209,24 +2272,29 @@ struct RuleSet
      *
      * Replicated from LigatureSet::apply(). */
 
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    /* We use the iter_context instead of iter_input, to avoid skipping
+     * default-ignorables and such.
+     *
+     * Related: https://github.com/harfbuzz/harfbuzz/issues/4813
+     */
+    auto &skippy_iter = c->iter_context;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
     skippy_iter.set_glyph_data ((HBUINT16 *) nullptr);
-    unsigned unsafe_to = (unsigned) -1, unsafe_to1 = 0, unsafe_to2 = 0;
+    unsigned unsafe_to = (unsigned) -1, unsafe_to1, unsafe_to2 = 0;
     hb_glyph_info_t *first = nullptr, *second = nullptr;
     bool matched = skippy_iter.next ();
     if (likely (matched))
     {
-      first = &c->buffer->info[skippy_iter.idx];
-      unsafe_to = skippy_iter.idx + 1;
-
       if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
       {
         /* Can't use the fast path if eg. the next char is a default-ignorable
          * or other skippable. */
         goto slow;
       }
+
+      first = &c->buffer->info[skippy_iter.idx];
+      unsafe_to1 = skippy_iter.idx + 1;
     }
     else
     {
@@ -2242,8 +2310,15 @@ struct RuleSet
       ;
     }
     matched = skippy_iter.next ();
-    if (likely (matched && !skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])))
+    if (likely (matched))
     {
+      if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
+      {
+        /* Can't use the fast path if eg. the next char is a default-ignorable
+         * or other skippable. */
+        goto slow;
+      }
+
       second = &c->buffer->info[skippy_iter.idx];
       unsafe_to2 = skippy_iter.idx + 1;
     }
@@ -2280,6 +2355,15 @@ struct RuleSet
       {
         if (unsafe_to == (unsigned) -1)
           unsafe_to = unsafe_to1;
+
+        // Skip ahead to next possible first glyph match.
+        for (; i + 1 < num_rules; i++)
+        {
+          const auto &r2 = this+rule.arrayZ[i + 1];
+          const auto &input2 = r2.inputZ;
+          if (r2.inputCount <= 1 || input2.arrayZ[0] != input.arrayZ[0])
+            break;
+        }
       }
     }
     if (likely (unsafe_to != (unsigned) -1))
@@ -2622,46 +2706,37 @@ struct ContextFormat2_5
 
   unsigned cache_cost () const
   {
-    unsigned c = (this+classDef).cost () * ruleSet.len;
-    return c >= 4 ? c : 0;
+    return (this+classDef).cost ();
   }
-  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  static bool cache_func (hb_ot_apply_context_t *c, hb_ot_subtable_cache_op_t op)
   {
-    switch (op)
-    {
-      case hb_ot_lookup_cache_op_t::CREATE:
-        return (void *) true;
-      case hb_ot_lookup_cache_op_t::ENTER:
-      {
-        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
-        if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
-          return (void *) false;
-        auto &info = c->buffer->info;
-        unsigned count = c->buffer->len;
-        for (unsigned i = 0; i < count; i++)
-          info[i].syllable() = 255;
-        c->new_syllables = 255;
-        return (void *) true;
-      }
-      case hb_ot_lookup_cache_op_t::LEAVE:
-      {
-        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
-        c->new_syllables = (unsigned) -1;
-        HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
-        return nullptr;
-      }
-      case hb_ot_lookup_cache_op_t::DESTROY:
-        return nullptr;
-    }
-    return nullptr;
+    return context_cache_func (c, op);
   }
 
-  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
-  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached) const
+  struct external_cache_t
+  {
+    hb_ot_layout_binary_cache_t coverage;
+  };
+  void *external_cache_create () const
+  {
+    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
+    if (likely (cache))
+    {
+      cache->coverage.clear ();
+    }
+    return cache;
+  }
+  bool apply_cached (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, true, external_cache); }
+  bool apply (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, false, external_cache); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached, void *external_cache) const
   {
     TRACE_APPLY (this);
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    external_cache_t *cache = (external_cache_t *) external_cache;
+    unsigned int index = (this+coverage).get_coverage_binary (c->buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
+#else
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
+#endif
     if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &class_def = this+classDef;
@@ -2671,10 +2746,7 @@ struct ContextFormat2_5
       &class_def
     };
 
-    if (cached && c->buffer->cur().syllable() < 255)
-      index = c->buffer->cur().syllable ();
-    else
-      index = class_def.get_class (c->buffer->cur().codepoint);
+    index = cached ? get_class_cached (class_def, c->buffer->cur()) : class_def.get_class (c->buffer->cur().codepoint);
     const RuleSet &rule_set = this+ruleSet[index];
     return_trace (rule_set.apply (c, lookup_context));
   }
@@ -2919,9 +2991,9 @@ struct Context
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -2935,7 +3007,7 @@ struct Context
 
   protected:
   union {
-  HBUINT16                      format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   ContextFormat1_4<SmallTypes>  format1;
   ContextFormat2_5<SmallTypes>  format2;
   ContextFormat3                format3;
@@ -3069,27 +3141,18 @@ static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c
 }
 
 template <typename HBUINT>
-HB_ALWAYS_INLINE
-static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
-                                        unsigned int backtrackCount,
-                                        const HBUINT backtrack[],
-                                        unsigned int inputCount, /* Including the first glyph (not matched) */
-                                        const HBUINT input[], /* Array of input values--start with second glyph */
-                                        unsigned int lookaheadCount,
-                                        const HBUINT lookahead[],
-                                        unsigned int lookupCount,
-                                        const LookupRecord lookupRecord[],
-                                        const ChainContextApplyLookupContext &lookup_context)
+static inline bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
+                                               unsigned int backtrackCount,
+                                               const HBUINT backtrack[],
+                                               unsigned int inputCount, /* Including the first glyph (not matched) */
+                                               const HBUINT input[], /* Array of input values--start with second glyph */
+                                               unsigned int lookaheadCount,
+                                               const HBUINT lookahead[],
+                                               unsigned int lookupCount,
+                                               const LookupRecord lookupRecord[],
+                                               const ChainContextApplyLookupContext &lookup_context)
 {
   if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) return false;
-  unsigned match_positions_stack[4];
-  unsigned *match_positions = match_positions_stack;
-  if (unlikely (inputCount > ARRAY_LENGTH (match_positions_stack)))
-  {
-    match_positions = (unsigned *) hb_malloc (hb_max (inputCount, 1u) * sizeof (match_positions[0]));
-    if (unlikely (!match_positions))
-      return false;
-  }
 
   unsigned start_index = c->buffer->out_len;
   unsigned end_index = c->buffer->idx;
@@ -3098,15 +3161,14 @@ static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
   if (!(match_input (c,
                      inputCount, input,
                      lookup_context.funcs.match[1], lookup_context.match_data[1],
-                     &match_end, match_positions) && (end_index = match_end)
+                     &match_end) && (end_index = match_end)
        && match_lookahead (c,
                            lookaheadCount, lookahead,
                            lookup_context.funcs.match[2], lookup_context.match_data[2],
                            match_end, &end_index)))
   {
     c->buffer->unsafe_to_concat (c->buffer->idx, end_index);
-    ret = false;
-    goto done;
+    return false;
   }
 
   if (!match_backtrack (c,
@@ -3115,19 +3177,14 @@ static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
                         &start_index))
   {
     c->buffer->unsafe_to_concat_from_outbuffer (start_index, end_index);
-    ret = false;
-    goto done;
+    return false;
   }
 
   c->buffer->unsafe_to_break_from_outbuffer (start_index, end_index);
   apply_lookup (c,
-                inputCount, match_positions,
+                inputCount,
                 lookupCount, lookupRecord,
                 match_end);
-  done:
-
-  if (unlikely (match_positions != match_positions_stack))
-    hb_free (match_positions);
 
   return ret;
 }
@@ -3411,33 +3468,29 @@ struct ChainRuleSet
      *
      * Replicated from LigatureSet::apply(). */
 
-    /* If the input skippy has non-auto joiners behavior (as in Indic shapers),
-     * skip this fast path, as we don't distinguish between input & lookahead
-     * matching in the fast path.
+    /* We use the iter_context instead of iter_input, to avoid skipping
+     * default-ignorables and such.
      *
-     * https://github.com/harfbuzz/harfbuzz/issues/4813
+     * Related: https://github.com/harfbuzz/harfbuzz/issues/4813
      */
-    if (!c->auto_zwnj || !c->auto_zwj)
-      goto slow;
-
-    hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
+    auto &skippy_iter = c->iter_context;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
     skippy_iter.set_glyph_data ((HBUINT16 *) nullptr);
-    unsigned unsafe_to = (unsigned) -1, unsafe_to1 = 0, unsafe_to2 = 0;
+    unsigned unsafe_to = (unsigned) -1, unsafe_to1, unsafe_to2 = 0;
     hb_glyph_info_t *first = nullptr, *second = nullptr;
     bool matched = skippy_iter.next ();
     if (likely (matched))
     {
-      first = &c->buffer->info[skippy_iter.idx];
-      unsafe_to1 = skippy_iter.idx + 1;
-
       if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
       {
         /* Can't use the fast path if eg. the next char is a default-ignorable
          * or other skippable. */
         goto slow;
       }
+
+      first = &c->buffer->info[skippy_iter.idx];
+      unsafe_to1 = skippy_iter.idx + 1;
     }
     else
     {
@@ -3458,8 +3511,15 @@ struct ChainRuleSet
       ;
     }
     matched = skippy_iter.next ();
-    if (likely (matched && !skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])))
+    if (likely (matched))
     {
+      if (skippy_iter.may_skip (c->buffer->info[skippy_iter.idx]))
+      {
+        /* Can't use the fast path if eg. the next char is a default-ignorable
+         * or other skippable. */
+        goto slow;
+      }
+
       second = &c->buffer->info[skippy_iter.idx];
       unsafe_to2 = skippy_iter.idx + 1;
     }
@@ -3475,7 +3535,7 @@ struct ChainRuleSet
       const auto &input = StructAfter<decltype (r.inputX)> (r.backtrack);
       const auto &lookahead = StructAfter<decltype (r.lookaheadX)> (input);
 
-      unsigned lenP1 = hb_max ((unsigned) input.lenP1, 1u);
+      unsigned lenP1 = input.lenP1;
       if (lenP1 > 1 ?
            (!match_input ||
             match_input (*first, input.arrayZ[0], input_data))
@@ -3483,6 +3543,7 @@ struct ChainRuleSet
            (!lookahead.len || !match_lookahead ||
             match_lookahead (*first, lookahead.arrayZ[0], lookahead_data)))
       {
+        lenP1 = hb_max (lenP1, 1u);
         if (!second ||
             (lenP1 > 2 ?
              (!match_input ||
@@ -3505,6 +3566,18 @@ struct ChainRuleSet
       {
         if (unsafe_to == (unsigned) -1)
           unsafe_to = unsafe_to1;
+
+        if (lenP1 > 1)
+        {
+          // Skip ahead to next possible first glyph match.
+          for (; i + 1 < num_rules; i++)
+          {
+            const auto &r2 = this+rule.arrayZ[i + 1];
+            const auto &input2 = StructAfter<decltype (r2.inputX)> (r2.backtrack);
+            if (input2.lenP1 <= 1 || input2.arrayZ[0] != input.arrayZ[0])
+              break;
+          }
+        }
       }
     }
     if (likely (unsafe_to != (unsigned) -1))
@@ -3873,45 +3946,37 @@ struct ChainContextFormat2_5
 
   unsigned cache_cost () const
   {
-    return (this+lookaheadClassDef).cost () * ruleSet.len;
+    return (this+inputClassDef).cost () + (this+lookaheadClassDef).cost ();
   }
-  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  static bool cache_func (hb_ot_apply_context_t *c, hb_ot_subtable_cache_op_t op)
   {
-    switch (op)
-    {
-      case hb_ot_lookup_cache_op_t::CREATE:
-        return (void *) true;
-      case hb_ot_lookup_cache_op_t::ENTER:
-      {
-        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
-        if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
-          return (void *) false;
-        auto &info = c->buffer->info;
-        unsigned count = c->buffer->len;
-        for (unsigned i = 0; i < count; i++)
-          info[i].syllable() = 255;
-        c->new_syllables = 255;
-        return (void *) true;
-      }
-      case hb_ot_lookup_cache_op_t::LEAVE:
-      {
-        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
-        c->new_syllables = (unsigned) -1;
-        HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
-        return nullptr;
-      }
-      case hb_ot_lookup_cache_op_t::DESTROY:
-        return nullptr;
-    }
-    return nullptr;
+    return context_cache_func (c, op);
   }
 
-  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
-  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
-  bool _apply (hb_ot_apply_context_t *c, bool cached) const
+  struct external_cache_t
+  {
+    hb_ot_layout_binary_cache_t coverage;
+  };
+  void *external_cache_create () const
+  {
+    external_cache_t *cache = (external_cache_t *) hb_malloc (sizeof (external_cache_t));
+    if (likely (cache))
+    {
+      cache->coverage.clear ();
+    }
+    return cache;
+  }
+  bool apply_cached (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, true, external_cache); }
+  bool apply (hb_ot_apply_context_t *c, void *external_cache) const { return _apply (c, false, external_cache); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached, void *external_cache) const
   {
     TRACE_APPLY (this);
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    external_cache_t *cache = (external_cache_t *) external_cache;
+    unsigned int index = (this+coverage).get_coverage_binary (c->buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
+#else
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
+#endif
     if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &backtrack_class_def = this+backtrackClassDef;
@@ -3929,11 +3994,9 @@ struct ChainContextFormat2_5
        &lookahead_class_def}
     };
 
-    // Note: Corresponds to match_class_cached2
-    if (cached && ((c->buffer->cur().syllable() & 0xF0) >> 4) < 15)
-      index = (c->buffer->cur().syllable () & 0xF0) >> 4;
-    else
-      index = input_class_def.get_class (c->buffer->cur().codepoint);
+    index = cached
+         ? get_class_cached2 (input_class_def, c->buffer->cur())
+          : input_class_def.get_class (c->buffer->cur().codepoint);
     const ChainRuleSet &rule_set = this+ruleSet[index];
     return_trace (rule_set.apply (c, lookup_context));
   }
@@ -4261,9 +4324,9 @@ struct ChainContext
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -4277,7 +4340,7 @@ struct ChainContext
 
   protected:
   union {
-  HBUINT16                              format; /* Format identifier */
+  struct { HBUINT16 v; }                format; /* Format identifier */
   ChainContextFormat1_4<SmallTypes>     format1;
   ChainContextFormat2_5<SmallTypes>     format2;
   ChainContextFormat3                   format3;
@@ -4352,7 +4415,7 @@ struct Extension
 {
   unsigned int get_type () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.get_type ();
     default:return 0;
     }
@@ -4360,7 +4423,7 @@ struct Extension
   template <typename X>
   const X& get_subtable () const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.template get_subtable<typename T::SubTable> ();
     default:return Null (typename T::SubTable);
     }
@@ -4372,7 +4435,7 @@ struct Extension
   template <typename ...Ts>
   typename hb_subset_context_t::return_t dispatch (hb_subset_context_t *c, Ts&&... ds) const
   {
-    switch (u.format) {
+    switch (u.format.v) {
     case 1: hb_barrier (); return u.format1.subset (c);
     default: return c->default_return_value ();
     }
@@ -4381,9 +4444,9 @@ struct Extension
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (u.format1.dispatch (c, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
@@ -4391,7 +4454,7 @@ struct Extension
 
   protected:
   union {
-  HBUINT16              format;         /* Format identifier */
+  struct { HBUINT16 v; }        format;         /* Format identifier */
   ExtensionFormat1<T>   format1;
   } u;
 };
@@ -4428,22 +4491,14 @@ struct hb_ot_layout_lookup_accelerator_t
     for (auto& subtable : hb_iter (thiz->subtables, count))
       thiz->digest.union_ (subtable.digest);
 
+    thiz->count = count;
+
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    if (c_accelerate_subtables.cache_user_cost < 4)
-      c_accelerate_subtables.cache_user_idx = (unsigned) -1;
-
-    thiz->cache_user_idx = c_accelerate_subtables.cache_user_idx;
-
-    if (thiz->cache_user_idx != (unsigned) -1)
-    {
-      thiz->cache = thiz->subtables[thiz->cache_user_idx].cache_func (nullptr, hb_ot_lookup_cache_op_t::CREATE);
-      if (!thiz->cache)
-        thiz->cache_user_idx = (unsigned) -1;
-    }
+    thiz->subtable_cache_user_idx = c_accelerate_subtables.subtable_cache_user_idx;
 
     for (unsigned i = 0; i < count; i++)
-      if (i != thiz->cache_user_idx)
-        thiz->subtables[i].apply_cached_func = thiz->subtables[i].apply_func;
+      if (i != thiz->subtable_cache_user_idx)
+       thiz->subtables[i].apply_cached_func = thiz->subtables[i].apply_func;
 #endif
 
     return thiz;
@@ -4452,11 +4507,8 @@ struct hb_ot_layout_lookup_accelerator_t
   void fini ()
   {
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    if (cache)
-    {
-      assert (cache_user_idx != (unsigned) -1);
-      subtables[cache_user_idx].cache_func (cache, hb_ot_lookup_cache_op_t::DESTROY);
-    }
+    for (unsigned i = 0; i < count; i++)
+      hb_free (subtables[i].external_cache);
 #endif
   }
 
@@ -4466,14 +4518,14 @@ struct hb_ot_layout_lookup_accelerator_t
 #ifndef HB_OPTIMIZE_SIZE
   HB_ALWAYS_INLINE
 #endif
-  bool apply (hb_ot_apply_context_t *c, unsigned subtables_count, bool use_cache) const
+  bool apply (hb_ot_apply_context_t *c, bool use_cache) const
   {
     c->lookup_accel = this;
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     if (use_cache)
     {
       return
-      + hb_iter (hb_iter (subtables, subtables_count))
+      + hb_iter (hb_iter (subtables, count))
       | hb_map ([&c] (const hb_accelerate_subtables_context_t::hb_applicable_t &_) { return _.apply_cached (c); })
       | hb_any
       ;
@@ -4482,7 +4534,7 @@ struct hb_ot_layout_lookup_accelerator_t
 #endif
     {
       return
-      + hb_iter (hb_iter (subtables, subtables_count))
+      + hb_iter (hb_iter (subtables, count))
       | hb_map ([&c] (const hb_accelerate_subtables_context_t::hb_applicable_t &_) { return _.apply (c); })
       | hb_any
       ;
@@ -4493,8 +4545,8 @@ struct hb_ot_layout_lookup_accelerator_t
   bool cache_enter (hb_ot_apply_context_t *c) const
   {
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    return cache_user_idx != (unsigned) -1 &&
-           subtables[cache_user_idx].cache_enter (c);
+    return subtable_cache_user_idx != (unsigned) -1 &&
+           subtables[subtable_cache_user_idx].cache_enter (c);
 #else
     return false;
 #endif
@@ -4502,19 +4554,17 @@ struct hb_ot_layout_lookup_accelerator_t
   void cache_leave (hb_ot_apply_context_t *c) const
   {
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-    subtables[cache_user_idx].cache_leave (c);
+    subtables[subtable_cache_user_idx].cache_leave (c);
 #endif
   }
 
 
   hb_set_digest_t digest;
+  private:
+  unsigned count = 0; /* Number of subtables in the array. */
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
-  public:
-  void *cache = nullptr;
-  private:
-  unsigned cache_user_idx = (unsigned) -1;
+  unsigned subtable_cache_user_idx = (unsigned) -1;
 #endif
-  private:
   hb_accelerate_subtables_context_t::hb_applicable_t subtables[HB_VAR_ARRAY];
 };
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
index afe52963201..c73e4dc4b6d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
@@ -343,7 +343,7 @@ hb_ot_layout_get_glyphs_in_class (hb_face_t                  *face,
  * @face: The #hb_face_t to work on
  * @glyph: The #hb_codepoint_t code point to query
  * @start_offset: offset of the first attachment point to retrieve
- * @point_count: (inout) (optional): Input = the maximum number of attachment points to return;
+ * @point_count: (inout) (nullable): Input = the maximum number of attachment points to return;
  *               Output = the actual number of attachment points returned (may be zero)
  * @point_array: (out) (array length=point_count): The array of attachment points found for the query
  *
@@ -373,7 +373,7 @@ hb_ot_layout_get_attach_points (hb_face_t      *face,
  * @direction: The #hb_direction_t text direction to use
  * @glyph: The #hb_codepoint_t code point to query
  * @start_offset: offset of the first caret position to retrieve
- * @caret_count: (inout) (optional): Input = the maximum number of caret positions to return;
+ * @caret_count: (inout) (nullable): Input = the maximum number of caret positions to return;
  *               Output = the actual number of caret positions returned (may be zero)
  * @caret_array: (out) (array length=caret_count): The array of caret positions found for the query
  *
@@ -444,7 +444,7 @@ get_gsubgpos_table (hb_face_t *face,
  * @face: #hb_face_t to work upon
  * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS
  * @start_offset: offset of the first script tag to retrieve
- * @script_count: (inout) (optional): Input = the maximum number of script tags to return;
+ * @script_count: (inout) (nullable): Input = the maximum number of script tags to return;
  *                Output = the actual number of script tags returned (may be zero)
  * @script_tags: (out) (array length=script_count): The array of #hb_tag_t script tags found for the query
  *
@@ -541,8 +541,8 @@ hb_ot_layout_table_choose_script (hb_face_t      *face,
  * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS
  * @script_count: Number of script tags in the array
  * @script_tags: Array of #hb_tag_t script tags
- * @script_index: (out) (optional): The index of the requested script
- * @chosen_script: (out) (optional): #hb_tag_t of the requested script
+ * @script_index: (out) (nullable): The index of the requested script
+ * @chosen_script: (out) (nullable): #hb_tag_t of the requested script
  *
  * Selects an OpenType script for @table_tag from the @script_tags array.
  *
@@ -613,7 +613,7 @@ hb_ot_layout_table_select_script (hb_face_t      *face,
  * @face: #hb_face_t to work upon
  * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS
  * @start_offset: offset of the first feature tag to retrieve
- * @feature_count: (inout) (optional): Input = the maximum number of feature tags to return;
+ * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return;
  *                 Output = the actual number of feature tags returned (may be zero)
  * @feature_tags: (out) (array length=feature_count): Array of feature tags found in the table
  *
@@ -683,7 +683,7 @@ hb_ot_layout_table_find_feature (hb_face_t    *face,
  * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS
  * @script_index: The index of the requested script tag
  * @start_offset: offset of the first language tag to retrieve
- * @language_count: (inout) (optional): Input = the maximum number of language tags to return;
+ * @language_count: (inout) (nullable): Input = the maximum number of language tags to return;
  *                  Output = the actual number of language tags returned (may be zero)
  * @language_tags: (out) (array length=language_count): Array of language tags found in the table
  *
@@ -911,7 +911,7 @@ hb_ot_layout_language_get_required_feature (hb_face_t    *face,
  * @script_index: The index of the requested script tag
  * @language_index: The index of the requested language tag
  * @start_offset: offset of the first feature tag to retrieve
- * @feature_count: (inout) (optional): Input = the maximum number of feature tags to return;
+ * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return;
  *                 Output: the actual number of feature tags returned (may be zero)
  * @feature_indexes: (out) (array length=feature_count): The array of feature indexes found for the query
  *
@@ -947,7 +947,7 @@ hb_ot_layout_language_get_feature_indexes (hb_face_t    *face,
  * @script_index: The index of the requested script tag
  * @language_index: The index of the requested language tag
  * @start_offset: offset of the first feature tag to retrieve
- * @feature_count: (inout) (optional): Input = the maximum number of feature tags to return;
+ * @feature_count: (inout) (nullable): Input = the maximum number of feature tags to return;
  *                 Output = the actual number of feature tags returned (may be zero)
  * @feature_tags: (out) (array length=feature_count): The array of #hb_tag_t feature tags found for the query
  *
@@ -1035,7 +1035,7 @@ hb_ot_layout_language_find_feature (hb_face_t    *face,
  * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS
  * @feature_index: The index of the requested feature
  * @start_offset: offset of the first lookup to retrieve
- * @lookup_count: (inout) (optional): Input = the maximum number of lookups to return;
+ * @lookup_count: (inout) (nullable): Input = the maximum number of lookups to return;
  *                Output = the actual number of lookups returned (may be zero)
  * @lookup_indexes: (out) (array length=lookup_count): The array of lookup indexes found for the query
  *
@@ -1386,10 +1386,10 @@ hb_ot_layout_collect_lookups (hb_face_t      *face,
  * @face: #hb_face_t to work upon
  * @table_tag: #HB_OT_TAG_GSUB or #HB_OT_TAG_GPOS
  * @lookup_index: The index of the feature lookup to query
- * @glyphs_before: (out): Array of glyphs preceding the substitution range
- * @glyphs_input: (out): Array of input glyphs that would be substituted by the lookup
- * @glyphs_after: (out): Array of glyphs following the substitution range
- * @glyphs_output: (out): Array of glyphs that would be the substituted output of the lookup
+ * @glyphs_before: (out) (nullable): Array of glyphs preceding the substitution range
+ * @glyphs_input: (out) (nullable): Array of input glyphs that would be substituted by the lookup
+ * @glyphs_after: (out) (nullable): Array of glyphs following the substitution range
+ * @glyphs_output: (out) (nullable): Array of glyphs that would be the substituted output of the lookup
  *
  * Fetches a list of all glyphs affected by the specified lookup in the
  * specified face's GSUB table or GPOS table.
@@ -1473,7 +1473,7 @@ hb_ot_layout_table_find_feature_variations (hb_face_t    *face,
  * @feature_index: The index of the feature to query
  * @variations_index: The index of the feature variation to query
  * @start_offset: offset of the first lookup to retrieve
- * @lookup_count: (inout) (optional): Input = the maximum number of lookups to return;
+ * @lookup_count: (inout) (nullable): Input = the maximum number of lookups to return;
  *                Output = the actual number of lookups returned (may be zero)
  * @lookup_indexes: (out) (array length=lookup_count): The array of lookups found for the query
  *
@@ -1777,15 +1777,15 @@ hb_ot_layout_get_size_params (hb_face_t       *face,
  * @face: #hb_face_t to work upon
  * @table_tag: table tag to query, "GSUB" or "GPOS".
  * @feature_index: index of feature to query.
- * @label_id: (out) (optional): The ‘name’ table name ID that specifies a string
- *            for a user-interface label for this feature. (May be NULL.)
- * @tooltip_id: (out) (optional): The ‘name’ table name ID that specifies a string
+ * @label_id: (out) (nullable): The ‘name’ table name ID that specifies a string
+ *            for a user-interface label for this feature.
+ * @tooltip_id: (out) (nullable): The ‘name’ table name ID that specifies a string
  *              that an application can use for tooltip text for this
- *              feature. (May be NULL.)
- * @sample_id: (out) (optional): The ‘name’ table name ID that specifies sample text
- *             that illustrates the effect of this feature. (May be NULL.)
- * @num_named_parameters: (out) (optional):  Number of named parameters. (May be zero.)
- * @first_param_id: (out) (optional): The first ‘name’ table name ID used to specify
+ *              feature.
+ * @sample_id: (out) (nullable): The ‘name’ table name ID that specifies sample text
+ *             that illustrates the effect of this feature.
+ * @num_named_parameters: (out) (nullable):  Number of named parameters.
+ * @first_param_id: (out) (nullable): The first ‘name’ table name ID used to specify
  *                  strings for user-interface labels for the feature
  *                  parameters. (Must be zero if numParameters is zero.)
  *
@@ -1852,7 +1852,7 @@ hb_ot_layout_feature_get_name_ids (hb_face_t       *face,
  * @table_tag: table tag to query, "GSUB" or "GPOS".
  * @feature_index: index of feature to query.
  * @start_offset: offset of the first character to retrieve
- * @char_count: (inout) (optional): Input = the maximum number of characters to return;
+ * @char_count: (inout) (nullable): Input = the maximum number of characters to return;
  *              Output = the actual number of characters returned (may be zero)
  * @characters: (out caller-allocates) (array length=char_count): A buffer pointer.
  *              The Unicode codepoints of the characters for which this feature provides
@@ -1915,31 +1915,33 @@ struct GPOSProxy
 
 static inline bool
 apply_forward (OT::hb_ot_apply_context_t *c,
-               const OT::hb_ot_layout_lookup_accelerator_t &accel,
-               unsigned subtable_count)
+               const OT::hb_ot_layout_lookup_accelerator_t &accel)
 {
-  bool use_cache = accel.cache_enter (c);
+  bool use_hot_subtable_cache = accel.cache_enter (c);
 
   bool ret = false;
   hb_buffer_t *buffer = c->buffer;
-  while (buffer->idx < buffer->len && buffer->successful)
+  while (buffer->successful)
   {
-    bool applied = false;
-    auto &cur = buffer->cur();
-    if (accel.digest.may_have (cur.codepoint) &&
-        (cur.mask & c->lookup_mask) &&
-        c->check_glyph_property (&cur, c->lookup_props))
-     {
-       applied = accel.apply (c, subtable_count, use_cache);
-     }
+    hb_glyph_info_t *info = buffer->info;
+    unsigned j = buffer->idx;
+    while (j < buffer->len &&
+           !(accel.digest.may_have (info[j].codepoint) &&
+             (info[j].mask & c->lookup_mask) &&
+             c->check_glyph_property (&info[j], c->lookup_props)))
+      j++;
+    if (unlikely (j > buffer->idx && !buffer->next_glyphs (j - buffer->idx)))
+      break;
+    if (buffer->idx >= buffer->len)
+      break;
 
-    if (applied)
+    if (accel.apply (c, use_hot_subtable_cache))
       ret = true;
     else
       (void) buffer->next_glyph ();
   }
 
-  if (use_cache)
+  if (use_hot_subtable_cache)
     accel.cache_leave (c);
 
   return ret;
@@ -1947,8 +1949,7 @@ apply_forward (OT::hb_ot_apply_context_t *c,
 
 static inline bool
 apply_backward (OT::hb_ot_apply_context_t *c,
-               const OT::hb_ot_layout_lookup_accelerator_t &accel,
-               unsigned subtable_count)
+               const OT::hb_ot_layout_lookup_accelerator_t &accel)
 {
   bool ret = false;
   hb_buffer_t *buffer = c->buffer;
@@ -1958,11 +1959,10 @@ apply_backward (OT::hb_ot_apply_context_t *c,
     if (accel.digest.may_have (cur.codepoint) &&
         (cur.mask & c->lookup_mask) &&
         c->check_glyph_property (&cur, c->lookup_props))
-      ret |= accel.apply (c, subtable_count, false);
+      ret |= accel.apply (c, false);
 
     /* The reverse lookup doesn't "advance" cursor (for good reason). */
     buffer->idx--;
-
   }
   while ((int) buffer->idx >= 0);
   return ret;
@@ -1975,7 +1975,6 @@ apply_string (OT::hb_ot_apply_context_t *c,
               const OT::hb_ot_layout_lookup_accelerator_t &accel)
 {
   hb_buffer_t *buffer = c->buffer;
-  unsigned subtable_count = lookup.get_subtable_count ();
 
   if (unlikely (!buffer->len || !c->lookup_mask))
     return false;
@@ -1991,7 +1990,7 @@ apply_string (OT::hb_ot_apply_context_t *c,
       buffer->clear_output ();
 
     buffer->idx = 0;
-    ret = apply_forward (c, accel, subtable_count);
+    ret = apply_forward (c, accel);
 
     if (!Proxy::always_inplace)
       buffer->sync ();
@@ -2001,7 +2000,7 @@ apply_string (OT::hb_ot_apply_context_t *c,
     /* in-place backward substitution/positioning */
     assert (!buffer->have_output);
     buffer->idx = buffer->len - 1;
-    ret = apply_backward (c, accel, subtable_count);
+    ret = apply_backward (c, accel);
   }
 
   return ret;
@@ -2017,7 +2016,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
   unsigned int i = 0;
 
   auto *font_data = font->data.ot.get ();
-  auto *var_store_cache = font_data == HB_SHAPER_DATA_SUCCEEDED ? nullptr : (OT::ItemVariationStore::cache_t *) font_data;
+  auto *var_store_cache = (OT::hb_scalar_cache_t *) font_data;
 
   OT::hb_ot_apply_context_t c (table_index, font, buffer, proxy.accel.get_blob (), var_store_cache);
   c.set_recurse_func (Proxy::Lookup::template dispatch_recurse_func<OT::hb_ot_apply_context_t>);
@@ -2037,11 +2036,8 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
       if (buffer->messaging () &&
           !buffer->message (font, "start lookup %u feature '%c%c%c%c'", lookup_index, HB_UNTAG (lookup.feature_tag))) continue;
 
-      /* c.digest is a digest of all the current glyphs in the buffer
-       * (plus some past glyphs).
-       *
-       * Only try applying the lookup if there is any overlap. */
-      if (accel->digest.may_intersect (c.digest))
+      /* Only try applying the lookup if there is any overlap. */
+      if (accel->digest.may_intersect (buffer->digest))
       {
         c.set_lookup_index (lookup_index);
         c.set_lookup_mask (lookup.mask, false);
@@ -2067,7 +2063,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
       if (stage->pause_func (plan, font, buffer))
       {
         /* Refresh working buffer digest since buffer changed. */
-        buffer->collect_codepoints (c.digest);
+        buffer->update_digest ();
       }
     }
   }
@@ -2601,6 +2597,7 @@ hb_ot_layout_get_baseline_with_fallback2 (hb_font_t                   *font,
 #endif
 
 
+#ifndef HB_NO_LAYOUT_RARELY_USED
 struct hb_get_glyph_alternates_dispatch_t :
        hb_dispatch_context_t<hb_get_glyph_alternates_dispatch_t, unsigned>
 {
@@ -2620,14 +2617,13 @@ struct hb_get_glyph_alternates_dispatch_t :
   ( _dispatch (obj, hb_prioritize, std::forward<Ts> (ds)...) )
 };
 
-#ifndef HB_NO_LAYOUT_RARELY_USED
 /**
  * hb_ot_layout_lookup_get_glyph_alternates:
  * @face: a face.
  * @lookup_index: index of the feature lookup to query.
  * @glyph: a glyph id.
  * @start_offset: starting offset.
- * @alternate_count: (inout) (optional): Input = the maximum number of alternate glyphs to return;
+ * @alternate_count: (inout) (nullable): Input = the maximum number of alternate glyphs to return;
  *                   Output = the actual number of alternate glyphs returned (may be zero).
  * @alternate_glyphs: (out caller-allocates) (array length=alternate_count): A glyphs buffer.
  *                    Alternate glyphs associated with the glyph id.
@@ -2654,6 +2650,64 @@ hb_ot_layout_lookup_get_glyph_alternates (hb_face_t      *face,
   return ret;
 }
 
+struct hb_collect_glyph_alternates_dispatch_t :
+       hb_dispatch_context_t<hb_collect_glyph_alternates_dispatch_t, bool>
+{
+  static return_t default_return_value () { return false; }
+  bool stop_sublookup_iteration (return_t r) const { return false; }
+
+  private:
+  template <typename T, typename ...Ts> auto
+  _dispatch (const T &obj, hb_priority<1>, Ts&&... ds) HB_AUTO_RETURN
+  ( (obj.collect_glyph_alternates (std::forward<Ts> (ds)...), true) )
+  template <typename T, typename ...Ts> auto
+  _dispatch (const T &obj, hb_priority<0>, Ts&&... ds) HB_AUTO_RETURN
+  ( default_return_value () )
+  public:
+  template <typename T, typename ...Ts> auto
+  dispatch (const T &obj, Ts&&... ds) HB_AUTO_RETURN
+  ( _dispatch (obj, hb_prioritize, std::forward<Ts> (ds)...) )
+};
+
+/**
+ * hb_ot_layout_lookup_collect_glyph_alternates:
+ * @face: a face.
+ * @lookup_index: index of the feature lookup to query.
+ * @alternate_count: (inout): mapping from glyph index to number of alternates for that glyph.
+ * @alternate_glyphs: (inout): mapping from encoded glyph index and alternate index, to alternate glyph ids.
+ *
+ * Collects alternates of glyphs from a given GSUB lookup index.
+ *
+ * For one-to-one GSUB glyph substitutions, this function collects the
+ * substituted glyph.
+ *
+ * For lookups that assign multiple alternates to a glyph, all alternate glyphs are collected.
+ *
+ * For other lookup types, nothing is performed and `false` is returned.
+ *
+ * The `alternate_count` mapping will contain the number of alternates for each glyph id.
+ * Upon entry, this mapping should contain the glyph ids as keys, and the number of alternates
+ * currently known for each glyph id as values.
+ *
+ * The `alternate_glyphs` mapping will contain the alternate glyph ids for each glyph id.
+ * The mapping is encoded in the following way, upon entry and after processing:
+ * If G is the glyph id, and A0, A1, ..., A(n-1) are the alternate glyph ids,
+ * the mapping will contain the following entries: (G + (i << 24)) -> A(i)
+ * for i = 0, 1, ..., n-1 where n is the number of alternates for G as per `alternate_count`.
+ *
+ * Return value: `true` if alternates were collected, `false` otherwise.
+ * Since: 12.1.0
+ */
+HB_EXTERN hb_bool_t
+hb_ot_layout_lookup_collect_glyph_alternates (hb_face_t *face,
+                                              unsigned   lookup_index,
+                                              hb_map_t  *alternate_count /* IN/OUT */,
+                                              hb_map_t  *alternate_glyphs /* IN/OUT */)
+{
+  hb_collect_glyph_alternates_dispatch_t c;
+  const OT::SubstLookup &lookup = face->table.GSUB->table->get_lookup (lookup_index);
+  return lookup.dispatch (&c, alternate_count, alternate_glyphs);
+}
 
 struct hb_position_single_dispatch_t :
        hb_dispatch_context_t<hb_position_single_dispatch_t, bool>
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.h
index 1d9db1105bd..b814c2acda3 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.h
@@ -383,6 +383,12 @@ hb_ot_layout_lookup_get_glyph_alternates (hb_face_t      *face,
                                           unsigned       *alternate_count /* IN/OUT */,
                                           hb_codepoint_t *alternate_glyphs /* OUT */);
 
+HB_EXTERN hb_bool_t
+hb_ot_layout_lookup_collect_glyph_alternates (hb_face_t *face,
+                                              unsigned   lookup_index,
+                                              hb_map_t  *alternate_count /* IN/OUT */,
+                                              hb_map_t  *alternate_glyphs /* IN/OUT */);
+
 HB_EXTERN hb_bool_t
 hb_ot_layout_lookup_would_substitute (hb_face_t            *face,
                                       unsigned int          lookup_index,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
index a68c8421e4c..f669ac7c46d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
@@ -217,8 +217,6 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
 
   if (u >= 0x80u)
   {
-    buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII;
-
     if (unlikely (unicode->is_default_ignorable (u)))
     {
       buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_DEFAULT_IGNORABLES;
@@ -247,6 +245,7 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
 
     if (unlikely (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (gen_cat)))
     {
+      buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_CONTINUATIONS;
       props |= UPROPS_MASK_CONTINUATION;
       props |= unicode->modified_combining_class (u)<<8;
     }
@@ -361,8 +360,9 @@ _hb_glyph_info_unhide (hb_glyph_info_t *info)
 }
 
 static inline void
-_hb_glyph_info_set_continuation (hb_glyph_info_t *info)
+_hb_glyph_info_set_continuation (hb_glyph_info_t *info, hb_buffer_t *buffer)
 {
+  buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_CONTINUATIONS;
   info->unicode_props() |= UPROPS_MASK_CONTINUATION;
 }
 static inline void
@@ -410,18 +410,6 @@ _hb_glyph_info_is_zwj (const hb_glyph_info_t *info)
   return _hb_glyph_info_is_unicode_format (info) && (info->unicode_props() & UPROPS_MASK_Cf_ZWJ);
 }
 static inline bool
-_hb_glyph_info_is_joiner (const hb_glyph_info_t *info)
-{
-  return _hb_glyph_info_is_unicode_format (info) && (info->unicode_props() & (UPROPS_MASK_Cf_ZWNJ|UPROPS_MASK_Cf_ZWJ));
-}
-static inline void
-_hb_glyph_info_flip_joiners (hb_glyph_info_t *info)
-{
-  if (!_hb_glyph_info_is_unicode_format (info))
-    return;
-  info->unicode_props() ^= UPROPS_MASK_Cf_ZWNJ | UPROPS_MASK_Cf_ZWJ;
-}
-static inline bool
 _hb_glyph_info_is_aat_deleted (const hb_glyph_info_t *info)
 {
   return _hb_glyph_info_is_unicode_format (info) && (info->unicode_props() & UPROPS_MASK_Cf_AAT_DELETED);
@@ -657,4 +645,18 @@ _hb_buffer_assert_gsubgpos_vars (hb_buffer_t *buffer)
 #undef lig_props
 #undef glyph_props
 
+static inline void
+_hb_collect_glyph_alternates_add (hb_codepoint_t from,
+                                  hb_codepoint_t to,
+                                  hb_map_t *alternate_count,
+                                  hb_map_t *alternate_glyphs)
+{
+  hb_codepoint_t zero = 0;
+  hb_codepoint_t *i = &zero;
+  alternate_count->has (from, &i);
+  alternate_glyphs->set (from | (*i << 24), to);
+  alternate_count->set (from, *i + 1);
+}
+
+
 #endif /* HB_OT_LAYOUT_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh
index b33e01fd6c9..ad9d7cb03e8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh
@@ -69,6 +69,8 @@ struct MathValueRecord
 
 struct MathConstants
 {
+  friend struct MATH;
+
   MathConstants* copy (hb_serialize_context_t *c) const
   {
     TRACE_SERIALIZE (this);
@@ -1109,8 +1111,8 @@ struct MATH
   {
 #ifndef HB_NO_MATH
     switch HB_CODEPOINT_ENCODE3 (font->face->table.MATH.get_blob ()->length,
-                                 get_constant (HB_OT_MATH_CONSTANT_DISPLAY_OPERATOR_MIN_HEIGHT, font),
-                                 get_constant (HB_OT_MATH_CONSTANT_DELIMITED_SUB_FORMULA_MIN_HEIGHT, font))
+                                 (this+mathConstants).minHeight[1], // displayOperatorMinHeight
+                                 (this+mathConstants).minHeight[0]) // delimitedSubFormulaMinHeight
     {
       /* sha1sum:ab4a4fe054d23061f3c039493d6f665cfda2ecf5  cambria.ttc
        * sha1sum:086855301bff644f9d8827b88491fcf73a6d4cb9  cambria.ttc
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-macroman.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-macroman.hh
index b4df8aaeeab..269b4d3fe45 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-macroman.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-macroman.hh
@@ -31,264 +31,264 @@
 #endif
 
 
-_S(".notdef")
-_S(".null")
-_S("nonmarkingreturn")
-_S("space")
-_S("exclam")
-_S("quotedbl")
-_S("numbersign")
-_S("dollar")
-_S("percent")
-_S("ampersand")
-_S("quotesingle")
-_S("parenleft")
-_S("parenright")
-_S("asterisk")
-_S("plus")
-_S("comma")
-_S("hyphen")
-_S("period")
-_S("slash")
-_S("zero")
-_S("one")
-_S("two")
-_S("three")
-_S("four")
-_S("five")
-_S("six")
-_S("seven")
-_S("eight")
-_S("nine")
-_S("colon")
-_S("semicolon")
-_S("less")
-_S("equal")
-_S("greater")
-_S("question")
-_S("at")
-_S("A")
-_S("B")
-_S("C")
-_S("D")
-_S("E")
-_S("F")
-_S("G")
-_S("H")
-_S("I")
-_S("J")
-_S("K")
-_S("L")
-_S("M")
-_S("N")
-_S("O")
-_S("P")
-_S("Q")
-_S("R")
-_S("S")
-_S("T")
-_S("U")
-_S("V")
-_S("W")
-_S("X")
-_S("Y")
-_S("Z")
-_S("bracketleft")
-_S("backslash")
-_S("bracketright")
-_S("asciicircum")
-_S("underscore")
-_S("grave")
-_S("a")
-_S("b")
-_S("c")
-_S("d")
-_S("e")
-_S("f")
-_S("g")
-_S("h")
-_S("i")
-_S("j")
-_S("k")
-_S("l")
-_S("m")
-_S("n")
-_S("o")
-_S("p")
-_S("q")
-_S("r")
-_S("s")
-_S("t")
-_S("u")
-_S("v")
-_S("w")
-_S("x")
-_S("y")
-_S("z")
-_S("braceleft")
-_S("bar")
-_S("braceright")
-_S("asciitilde")
-_S("Adieresis")
-_S("Aring")
-_S("Ccedilla")
-_S("Eacute")
-_S("Ntilde")
-_S("Odieresis")
-_S("Udieresis")
-_S("aacute")
-_S("agrave")
-_S("acircumflex")
-_S("adieresis")
-_S("atilde")
-_S("aring")
-_S("ccedilla")
-_S("eacute")
-_S("egrave")
-_S("ecircumflex")
-_S("edieresis")
-_S("iacute")
-_S("igrave")
-_S("icircumflex")
-_S("idieresis")
-_S("ntilde")
-_S("oacute")
-_S("ograve")
-_S("ocircumflex")
-_S("odieresis")
-_S("otilde")
-_S("uacute")
-_S("ugrave")
-_S("ucircumflex")
-_S("udieresis")
-_S("dagger")
-_S("degree")
-_S("cent")
-_S("sterling")
-_S("section")
-_S("bullet")
-_S("paragraph")
-_S("germandbls")
-_S("registered")
-_S("copyright")
-_S("trademark")
-_S("acute")
-_S("dieresis")
-_S("notequal")
-_S("AE")
-_S("Oslash")
-_S("infinity")
-_S("plusminus")
-_S("lessequal")
-_S("greaterequal")
-_S("yen")
-_S("mu")
-_S("partialdiff")
-_S("summation")
-_S("product")
-_S("pi")
-_S("integral")
-_S("ordfeminine")
-_S("ordmasculine")
-_S("Omega")
-_S("ae")
-_S("oslash")
-_S("questiondown")
-_S("exclamdown")
-_S("logicalnot")
-_S("radical")
-_S("florin")
-_S("approxequal")
-_S("Delta")
-_S("guillemotleft")
-_S("guillemotright")
-_S("ellipsis")
-_S("nonbreakingspace")
-_S("Agrave")
-_S("Atilde")
-_S("Otilde")
-_S("OE")
-_S("oe")
-_S("endash")
-_S("emdash")
-_S("quotedblleft")
-_S("quotedblright")
-_S("quoteleft")
-_S("quoteright")
-_S("divide")
-_S("lozenge")
-_S("ydieresis")
-_S("Ydieresis")
-_S("fraction")
-_S("currency")
-_S("guilsinglleft")
-_S("guilsinglright")
-_S("fi")
-_S("fl")
-_S("daggerdbl")
-_S("periodcentered")
-_S("quotesinglbase")
-_S("quotedblbase")
-_S("perthousand")
-_S("Acircumflex")
-_S("Ecircumflex")
-_S("Aacute")
-_S("Edieresis")
-_S("Egrave")
-_S("Iacute")
-_S("Icircumflex")
-_S("Idieresis")
-_S("Igrave")
-_S("Oacute")
-_S("Ocircumflex")
-_S("apple")
-_S("Ograve")
-_S("Uacute")
-_S("Ucircumflex")
-_S("Ugrave")
-_S("dotlessi")
-_S("circumflex")
-_S("tilde")
-_S("macron")
-_S("breve")
-_S("dotaccent")
-_S("ring")
-_S("cedilla")
-_S("hungarumlaut")
-_S("ogonek")
-_S("caron")
-_S("Lslash")
-_S("lslash")
-_S("Scaron")
-_S("scaron")
-_S("Zcaron")
-_S("zcaron")
-_S("brokenbar")
-_S("Eth")
-_S("eth")
-_S("Yacute")
-_S("yacute")
-_S("Thorn")
-_S("thorn")
-_S("minus")
-_S("multiply")
-_S("onesuperior")
-_S("twosuperior")
-_S("threesuperior")
-_S("onehalf")
-_S("onequarter")
-_S("threequarters")
-_S("franc")
-_S("Gbreve")
-_S("gbreve")
-_S("Idotaccent")
-_S("Scedilla")
-_S("scedilla")
-_S("Cacute")
-_S("cacute")
-_S("Ccaron")
-_S("ccaron")
-_S("dcroat")
+HB_STR(".notdef")
+HB_STR(".null")
+HB_STR("nonmarkingreturn")
+HB_STR("space")
+HB_STR("exclam")
+HB_STR("quotedbl")
+HB_STR("numbersign")
+HB_STR("dollar")
+HB_STR("percent")
+HB_STR("ampersand")
+HB_STR("quotesingle")
+HB_STR("parenleft")
+HB_STR("parenright")
+HB_STR("asterisk")
+HB_STR("plus")
+HB_STR("comma")
+HB_STR("hyphen")
+HB_STR("period")
+HB_STR("slash")
+HB_STR("zero")
+HB_STR("one")
+HB_STR("two")
+HB_STR("three")
+HB_STR("four")
+HB_STR("five")
+HB_STR("six")
+HB_STR("seven")
+HB_STR("eight")
+HB_STR("nine")
+HB_STR("colon")
+HB_STR("semicolon")
+HB_STR("less")
+HB_STR("equal")
+HB_STR("greater")
+HB_STR("question")
+HB_STR("at")
+HB_STR("A")
+HB_STR("B")
+HB_STR("C")
+HB_STR("D")
+HB_STR("E")
+HB_STR("F")
+HB_STR("G")
+HB_STR("H")
+HB_STR("I")
+HB_STR("J")
+HB_STR("K")
+HB_STR("L")
+HB_STR("M")
+HB_STR("N")
+HB_STR("O")
+HB_STR("P")
+HB_STR("Q")
+HB_STR("R")
+HB_STR("S")
+HB_STR("T")
+HB_STR("U")
+HB_STR("V")
+HB_STR("W")
+HB_STR("X")
+HB_STR("Y")
+HB_STR("Z")
+HB_STR("bracketleft")
+HB_STR("backslash")
+HB_STR("bracketright")
+HB_STR("asciicircum")
+HB_STR("underscore")
+HB_STR("grave")
+HB_STR("a")
+HB_STR("b")
+HB_STR("c")
+HB_STR("d")
+HB_STR("e")
+HB_STR("f")
+HB_STR("g")
+HB_STR("h")
+HB_STR("i")
+HB_STR("j")
+HB_STR("k")
+HB_STR("l")
+HB_STR("m")
+HB_STR("n")
+HB_STR("o")
+HB_STR("p")
+HB_STR("q")
+HB_STR("r")
+HB_STR("s")
+HB_STR("t")
+HB_STR("u")
+HB_STR("v")
+HB_STR("w")
+HB_STR("x")
+HB_STR("y")
+HB_STR("z")
+HB_STR("braceleft")
+HB_STR("bar")
+HB_STR("braceright")
+HB_STR("asciitilde")
+HB_STR("Adieresis")
+HB_STR("Aring")
+HB_STR("Ccedilla")
+HB_STR("Eacute")
+HB_STR("Ntilde")
+HB_STR("Odieresis")
+HB_STR("Udieresis")
+HB_STR("aacute")
+HB_STR("agrave")
+HB_STR("acircumflex")
+HB_STR("adieresis")
+HB_STR("atilde")
+HB_STR("aring")
+HB_STR("ccedilla")
+HB_STR("eacute")
+HB_STR("egrave")
+HB_STR("ecircumflex")
+HB_STR("edieresis")
+HB_STR("iacute")
+HB_STR("igrave")
+HB_STR("icircumflex")
+HB_STR("idieresis")
+HB_STR("ntilde")
+HB_STR("oacute")
+HB_STR("ograve")
+HB_STR("ocircumflex")
+HB_STR("odieresis")
+HB_STR("otilde")
+HB_STR("uacute")
+HB_STR("ugrave")
+HB_STR("ucircumflex")
+HB_STR("udieresis")
+HB_STR("dagger")
+HB_STR("degree")
+HB_STR("cent")
+HB_STR("sterling")
+HB_STR("section")
+HB_STR("bullet")
+HB_STR("paragraph")
+HB_STR("germandbls")
+HB_STR("registered")
+HB_STR("copyright")
+HB_STR("trademark")
+HB_STR("acute")
+HB_STR("dieresis")
+HB_STR("notequal")
+HB_STR("AE")
+HB_STR("Oslash")
+HB_STR("infinity")
+HB_STR("plusminus")
+HB_STR("lessequal")
+HB_STR("greaterequal")
+HB_STR("yen")
+HB_STR("mu")
+HB_STR("partialdiff")
+HB_STR("summation")
+HB_STR("product")
+HB_STR("pi")
+HB_STR("integral")
+HB_STR("ordfeminine")
+HB_STR("ordmasculine")
+HB_STR("Omega")
+HB_STR("ae")
+HB_STR("oslash")
+HB_STR("questiondown")
+HB_STR("exclamdown")
+HB_STR("logicalnot")
+HB_STR("radical")
+HB_STR("florin")
+HB_STR("approxequal")
+HB_STR("Delta")
+HB_STR("guillemotleft")
+HB_STR("guillemotright")
+HB_STR("ellipsis")
+HB_STR("nonbreakingspace")
+HB_STR("Agrave")
+HB_STR("Atilde")
+HB_STR("Otilde")
+HB_STR("OE")
+HB_STR("oe")
+HB_STR("endash")
+HB_STR("emdash")
+HB_STR("quotedblleft")
+HB_STR("quotedblright")
+HB_STR("quoteleft")
+HB_STR("quoteright")
+HB_STR("divide")
+HB_STR("lozenge")
+HB_STR("ydieresis")
+HB_STR("Ydieresis")
+HB_STR("fraction")
+HB_STR("currency")
+HB_STR("guilsinglleft")
+HB_STR("guilsinglright")
+HB_STR("fi")
+HB_STR("fl")
+HB_STR("daggerdbl")
+HB_STR("periodcentered")
+HB_STR("quotesinglbase")
+HB_STR("quotedblbase")
+HB_STR("perthousand")
+HB_STR("Acircumflex")
+HB_STR("Ecircumflex")
+HB_STR("Aacute")
+HB_STR("Edieresis")
+HB_STR("Egrave")
+HB_STR("Iacute")
+HB_STR("Icircumflex")
+HB_STR("Idieresis")
+HB_STR("Igrave")
+HB_STR("Oacute")
+HB_STR("Ocircumflex")
+HB_STR("apple")
+HB_STR("Ograve")
+HB_STR("Uacute")
+HB_STR("Ucircumflex")
+HB_STR("Ugrave")
+HB_STR("dotlessi")
+HB_STR("circumflex")
+HB_STR("tilde")
+HB_STR("macron")
+HB_STR("breve")
+HB_STR("dotaccent")
+HB_STR("ring")
+HB_STR("cedilla")
+HB_STR("hungarumlaut")
+HB_STR("ogonek")
+HB_STR("caron")
+HB_STR("Lslash")
+HB_STR("lslash")
+HB_STR("Scaron")
+HB_STR("scaron")
+HB_STR("Zcaron")
+HB_STR("zcaron")
+HB_STR("brokenbar")
+HB_STR("Eth")
+HB_STR("eth")
+HB_STR("Yacute")
+HB_STR("yacute")
+HB_STR("Thorn")
+HB_STR("thorn")
+HB_STR("minus")
+HB_STR("multiply")
+HB_STR("onesuperior")
+HB_STR("twosuperior")
+HB_STR("threesuperior")
+HB_STR("onehalf")
+HB_STR("onequarter")
+HB_STR("threequarters")
+HB_STR("franc")
+HB_STR("Gbreve")
+HB_STR("gbreve")
+HB_STR("Idotaccent")
+HB_STR("Scedilla")
+HB_STR("scedilla")
+HB_STR("Cacute")
+HB_STR("cacute")
+HB_STR("Ccaron")
+HB_STR("ccaron")
+HB_STR("dcroat")
 
 
 #endif /* HB_OT_POST_MACROMAN_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc
index 2401e18f0e6..c17e7628975 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-fallback.cc
@@ -409,16 +409,13 @@ position_around_base (const hb_ot_shape_plan_t *plan,
 }
 
 static inline void
-position_cluster (const hb_ot_shape_plan_t *plan,
-                  hb_font_t *font,
-                  hb_buffer_t  *buffer,
-                  unsigned int start,
-                  unsigned int end,
-                  bool adjust_offsets_when_zeroing)
+position_cluster_impl (const hb_ot_shape_plan_t *plan,
+                       hb_font_t *font,
+                       hb_buffer_t  *buffer,
+                       unsigned int start,
+                       unsigned int end,
+                       bool adjust_offsets_when_zeroing)
 {
-  if (end - start < 2)
-    return;
-
   /* Find the base glyph */
   hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = start; i < end; i++)
@@ -441,6 +438,20 @@ position_cluster (const hb_ot_shape_plan_t *plan,
     }
 }
 
+static HB_ALWAYS_INLINE void
+position_cluster (const hb_ot_shape_plan_t *plan,
+                  hb_font_t *font,
+                  hb_buffer_t  *buffer,
+                  unsigned int start,
+                  unsigned int end,
+                  bool adjust_offsets_when_zeroing)
+{
+  if (end - start < 2)
+    return;
+
+  position_cluster_impl (plan, font, buffer, start, end, adjust_offsets_when_zeroing);
+}
+
 void
 _hb_ot_shape_fallback_mark_position (const hb_ot_shape_plan_t *plan,
                                      hb_font_t *font,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc
index cb941bc7fbd..508ed6a5076 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc
@@ -78,14 +78,14 @@
 static inline void
 set_glyph (hb_glyph_info_t &info, hb_font_t *font)
 {
-  (void) font->get_nominal_glyph (info.codepoint, &info.glyph_index());
+  (void) font->get_nominal_glyph (info.codepoint, &info.normalizer_glyph_index());
 }
 
 static inline void
 output_char (hb_buffer_t *buffer, hb_codepoint_t unichar, hb_codepoint_t glyph)
 {
   /* This is very confusing indeed. */
-  buffer->cur().glyph_index() = glyph;
+  buffer->cur().normalizer_glyph_index() = glyph;
   (void) buffer->output_glyph (unichar);
   _hb_glyph_info_set_unicode_props (&buffer->prev(), buffer);
 }
@@ -93,7 +93,7 @@ output_char (hb_buffer_t *buffer, hb_codepoint_t unichar, hb_codepoint_t glyph)
 static inline void
 next_char (hb_buffer_t *buffer, hb_codepoint_t glyph)
 {
-  buffer->cur().glyph_index() = glyph;
+  buffer->cur().normalizer_glyph_index() = glyph;
   (void) buffer->next_glyph ();
 }
 
@@ -210,7 +210,7 @@ handle_variation_selector_cluster (const hb_ot_shape_normalize_context_t *c,
   hb_font_t * const font = c->font;
   for (; buffer->idx < end - 1 && buffer->successful;) {
     if (unlikely (buffer->unicode->is_variation_selector (buffer->cur(+1).codepoint))) {
-      if (font->get_variation_glyph (buffer->cur().codepoint, buffer->cur(+1).codepoint, &buffer->cur().glyph_index()))
+      if (font->get_variation_glyph (buffer->cur().codepoint, buffer->cur(+1).codepoint, &buffer->cur().normalizer_glyph_index()))
       {
         hb_codepoint_t unicode = buffer->cur().codepoint;
         (void) buffer->replace_glyphs (2, 1, &unicode);
@@ -342,7 +342,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
         unsigned int done = font->get_nominal_glyphs (end - buffer->idx,
                                                       &buffer->cur().codepoint,
                                                       sizeof (buffer->info[0]),
-                                                      &buffer->cur().glyph_index(),
+                                                      &buffer->cur().normalizer_glyph_index(),
                                                       sizeof (buffer->info[0]));
         if (unlikely (!buffer->next_glyphs (done))) break;
       }
@@ -456,7 +456,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
           buffer->out_len--; /* Remove the second composable. */
           /* Modify starter and carry on. */
           buffer->out_info[starter].codepoint = composed;
-          buffer->out_info[starter].glyph_index() = glyph;
+          buffer->out_info[starter].normalizer_glyph_index() = glyph;
           _hb_glyph_info_set_unicode_props (&buffer->out_info[starter], buffer);
 
           continue;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh
index 9f17bdbb243..138e895e8e1 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh
@@ -32,7 +32,7 @@
 
 
 /* buffer var allocations, used during the normalization process */
-#define glyph_index()   var1.u32
+#define normalizer_glyph_index()        var1.u32
 
 struct hb_ot_shape_plan_t;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc
index 477a7c7fc72..69b188f7aa3 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc
@@ -44,6 +44,7 @@
 #include "hb-ot-face.hh"
 
 #include "hb-set.hh"
+#include "hb-unicode.hh"
 
 #include "hb-aat-layout.hh"
 #include "hb-ot-layout-gdef-table.hh"
@@ -92,7 +93,7 @@ hb_ot_shape_planner_t::hb_ot_shape_planner_t (hb_face_t                     *fac
   shaper = hb_ot_shaper_categorize (props.script, props.direction, map.chosen_script[0]);
 
   script_zero_marks = shaper->zero_width_marks != HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE;
-  script_fallback_mark_positioning = shaper->fallback_position;
+  script_fallback_position = shaper->fallback_position;
 
 #ifndef HB_NO_AAT_SHAPE
   /* https://github.com/harfbuzz/harfbuzz/issues/1528 */
@@ -178,12 +179,12 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
 #endif
 #ifndef HB_NO_OT_KERN
     else if (hb_ot_layout_has_kerning (face))
-      plan.apply_kern = true;
+      plan.apply_kern = script_fallback_position; // Not all shapers apply legacy `kern`
 #endif
     else {}
   }
 
-  plan.apply_fallback_kern = !(plan.apply_gpos || plan.apply_kerx || plan.apply_kern);
+  plan.apply_fallback_kern = script_fallback_position && !(plan.apply_gpos || plan.apply_kerx || plan.apply_kern);
 
   plan.zero_marks = script_zero_marks &&
                     !plan.apply_kerx &&
@@ -203,7 +204,7 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
                                               );
 
   plan.fallback_mark_positioning = plan.adjust_mark_positioning_when_zeroing &&
-                                   script_fallback_mark_positioning;
+                                   script_fallback_position;
 
 #ifndef HB_NO_AAT_SHAPE
   /* If we're using morx shaping, we cancel mark position adjustment because
@@ -425,25 +426,20 @@ _hb_ot_shaper_face_data_destroy (hb_ot_face_data_t *data)
  */
 
 struct hb_ot_font_data_t {
-  OT::ItemVariationStore::cache_t unused; // Just for alignment
+  OT::hb_scalar_cache_t unused; // Just for alignment
 };
 
 hb_ot_font_data_t *
 _hb_ot_shaper_font_data_create (hb_font_t *font)
 {
-  if (!font->num_coords)
-    return (hb_ot_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
-
   const OT::ItemVariationStore &var_store = font->face->table.GDEF->table->get_var_store ();
-  auto *cache = (hb_ot_font_data_t *) var_store.create_cache ();
-  return cache ? cache : (hb_ot_font_data_t *) HB_SHAPER_DATA_SUCCEEDED;
+  return (hb_ot_font_data_t *) var_store.create_cache ();
 }
 
 void
 _hb_ot_shaper_font_data_destroy (hb_ot_font_data_t *data)
 {
-  if (data == HB_SHAPER_DATA_SUCCEEDED) return;
-  OT::ItemVariationStore::destroy_cache ((OT::ItemVariationStore::cache_t *) data);
+  OT::ItemVariationStore::destroy_cache ((OT::hb_scalar_cache_t *) data);
 }
 
 
@@ -488,6 +484,9 @@ hb_set_unicode_props (hb_buffer_t *buffer)
   {
     _hb_glyph_info_set_unicode_props (&info[i], buffer);
 
+    if (info[i].codepoint < 0x80)
+      continue;
+
     unsigned gen_cat = _hb_glyph_info_get_general_category (&info[i]);
     if (FLAG_UNSAFE (gen_cat) &
         (FLAG (HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER) |
@@ -502,7 +501,7 @@ hb_set_unicode_props (hb_buffer_t *buffer)
     if (unlikely (gen_cat == HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL &&
                   hb_in_range<hb_codepoint_t> (info[i].codepoint, 0x1F3FBu, 0x1F3FFu)))
     {
-      _hb_glyph_info_set_continuation (&info[i]);
+      _hb_glyph_info_set_continuation (&info[i], buffer);
     }
     /* Regional_Indicators are hairy as hell...
      * https://github.com/harfbuzz/harfbuzz/issues/2265 */
@@ -510,18 +509,18 @@ hb_set_unicode_props (hb_buffer_t *buffer)
     {
       if (_hb_codepoint_is_regional_indicator (info[i - 1].codepoint) &&
           !_hb_glyph_info_is_continuation (&info[i - 1]))
-        _hb_glyph_info_set_continuation (&info[i]);
+        _hb_glyph_info_set_continuation (&info[i], buffer);
     }
 #ifndef HB_NO_EMOJI_SEQUENCES
     else if (unlikely (_hb_glyph_info_is_zwj (&info[i])))
     {
-      _hb_glyph_info_set_continuation (&info[i]);
+      _hb_glyph_info_set_continuation (&info[i], buffer);
       if (i + 1 < count &&
           _hb_unicode_is_emoji_Extended_Pictographic (info[i + 1].codepoint))
       {
         i++;
         _hb_glyph_info_set_unicode_props (&info[i], buffer);
-        _hb_glyph_info_set_continuation (&info[i]);
+        _hb_glyph_info_set_continuation (&info[i], buffer);
       }
     }
 #endif
@@ -540,7 +539,9 @@ hb_set_unicode_props (hb_buffer_t *buffer)
      * https://github.com/harfbuzz/harfbuzz/issues/3844
      */
     else if (unlikely (hb_in_ranges<hb_codepoint_t> (info[i].codepoint, 0xFF9Eu, 0xFF9Fu, 0xE0020u, 0xE007Fu)))
-      _hb_glyph_info_set_continuation (&info[i]);
+      _hb_glyph_info_set_continuation (&info[i], buffer);
+    else if (unlikely (info[i].codepoint == 0x2044u /* FRACTION SLASH */))
+      buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_FRACTION_SLASH;
   }
 }
 
@@ -576,7 +577,7 @@ hb_insert_dotted_circle (hb_buffer_t *buffer, hb_font_t *font)
 static void
 hb_form_clusters (hb_buffer_t *buffer)
 {
-  if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII))
+  if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_CONTINUATIONS))
     return;
 
   if (HB_BUFFER_CLUSTER_LEVEL_IS_GRAPHEMES (buffer->cluster_level))
@@ -618,14 +619,14 @@ hb_ensure_native_direction (hb_buffer_t *buffer)
     for (unsigned i = 0; i < count; i++)
     {
       auto gc = _hb_glyph_info_get_general_category (&info[i]);
-      if (gc == HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER)
-        found_number = true;
-      else if (HB_UNICODE_GENERAL_CATEGORY_IS_LETTER (gc))
+      if (HB_UNICODE_GENERAL_CATEGORY_IS_LETTER (gc))
       {
         found_letter = true;
         break;
       }
-      else if (_hb_codepoint_is_regional_indicator (info[i].codepoint))
+      else if (gc == HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER)
+        found_number = true;
+      else if (unlikely (_hb_codepoint_is_regional_indicator (info[i].codepoint)))
         found_ri = true;
     }
     if ((found_number || found_ri) && !found_letter)
@@ -651,59 +652,6 @@ hb_ensure_native_direction (hb_buffer_t *buffer)
  * Substitute
  */
 
-#ifndef HB_NO_VERTICAL
-static hb_codepoint_t
-hb_vert_char_for (hb_codepoint_t u)
-{
-  switch (u >> 8)
-  {
-    case 0x20: switch (u) {
-      case 0x2013u: return 0xfe32u; // EN DASH
-      case 0x2014u: return 0xfe31u; // EM DASH
-      case 0x2025u: return 0xfe30u; // TWO DOT LEADER
-      case 0x2026u: return 0xfe19u; // HORIZONTAL ELLIPSIS
-    } break;
-    case 0x30: switch (u) {
-      case 0x3001u: return 0xfe11u; // IDEOGRAPHIC COMMA
-      case 0x3002u: return 0xfe12u; // IDEOGRAPHIC FULL STOP
-      case 0x3008u: return 0xfe3fu; // LEFT ANGLE BRACKET
-      case 0x3009u: return 0xfe40u; // RIGHT ANGLE BRACKET
-      case 0x300au: return 0xfe3du; // LEFT DOUBLE ANGLE BRACKET
-      case 0x300bu: return 0xfe3eu; // RIGHT DOUBLE ANGLE BRACKET
-      case 0x300cu: return 0xfe41u; // LEFT CORNER BRACKET
-      case 0x300du: return 0xfe42u; // RIGHT CORNER BRACKET
-      case 0x300eu: return 0xfe43u; // LEFT WHITE CORNER BRACKET
-      case 0x300fu: return 0xfe44u; // RIGHT WHITE CORNER BRACKET
-      case 0x3010u: return 0xfe3bu; // LEFT BLACK LENTICULAR BRACKET
-      case 0x3011u: return 0xfe3cu; // RIGHT BLACK LENTICULAR BRACKET
-      case 0x3014u: return 0xfe39u; // LEFT TORTOISE SHELL BRACKET
-      case 0x3015u: return 0xfe3au; // RIGHT TORTOISE SHELL BRACKET
-      case 0x3016u: return 0xfe17u; // LEFT WHITE LENTICULAR BRACKET
-      case 0x3017u: return 0xfe18u; // RIGHT WHITE LENTICULAR BRACKET
-    } break;
-    case 0xfe: switch (u) {
-      case 0xfe4fu: return 0xfe34u; // WAVY LOW LINE
-    } break;
-    case 0xff: switch (u) {
-      case 0xff01u: return 0xfe15u; // FULLWIDTH EXCLAMATION MARK
-      case 0xff08u: return 0xfe35u; // FULLWIDTH LEFT PARENTHESIS
-      case 0xff09u: return 0xfe36u; // FULLWIDTH RIGHT PARENTHESIS
-      case 0xff0cu: return 0xfe10u; // FULLWIDTH COMMA
-      case 0xff1au: return 0xfe13u; // FULLWIDTH COLON
-      case 0xff1bu: return 0xfe14u; // FULLWIDTH SEMICOLON
-      case 0xff1fu: return 0xfe16u; // FULLWIDTH QUESTION MARK
-      case 0xff3bu: return 0xfe47u; // FULLWIDTH LEFT SQUARE BRACKET
-      case 0xff3du: return 0xfe48u; // FULLWIDTH RIGHT SQUARE BRACKET
-      case 0xff3fu: return 0xfe33u; // FULLWIDTH LOW LINE
-      case 0xff5bu: return 0xfe37u; // FULLWIDTH LEFT CURLY BRACKET
-      case 0xff5du: return 0xfe38u; // FULLWIDTH RIGHT CURLY BRACKET
-    } break;
-  }
-
-  return u;
-}
-#endif
-
 static inline void
 hb_ot_rotate_chars (const hb_ot_shape_context_t *c)
 {
@@ -729,7 +677,7 @@ hb_ot_rotate_chars (const hb_ot_shape_context_t *c)
   if (HB_DIRECTION_IS_VERTICAL (c->target_direction) && !c->plan->has_vert)
   {
     for (unsigned int i = 0; i < count; i++) {
-      hb_codepoint_t codepoint = hb_vert_char_for (info[i].codepoint);
+      hb_codepoint_t codepoint = hb_unicode_funcs_t::vertical_char_for (info[i].codepoint);
       if (unlikely (codepoint != info[i].codepoint && c->font->has_glyph (codepoint)))
         info[i].codepoint = codepoint;
     }
@@ -744,7 +692,7 @@ hb_ot_shape_setup_masks_fraction (const hb_ot_shape_context_t *c)
   return;
 #endif
 
-  if (!(c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII) ||
+  if (!(c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_FRACTION_SLASH) ||
       !c->plan->has_frac)
     return;
 
@@ -845,7 +793,13 @@ hb_ot_zero_width_default_ignorables (const hb_buffer_t *buffer)
   unsigned int i = 0;
   for (i = 0; i < count; i++)
     if (unlikely (_hb_glyph_info_is_default_ignorable (&info[i])))
-      pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0;
+    {
+      pos[i].x_advance = pos[i].y_advance = 0;
+      if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction))
+        pos[i].x_offset = 0;
+      else
+        pos[i].y_offset = 0;
+    }
 }
 
 static void
@@ -900,11 +854,11 @@ hb_ot_hide_default_ignorables (hb_buffer_t *buffer,
 static inline void
 hb_ot_map_glyphs_fast (hb_buffer_t  *buffer)
 {
-  /* Normalization process sets up glyph_index(), we just copy it. */
+  /* Normalization process sets up normalizer_glyph_index(), we just copy it. */
   unsigned int count = buffer->len;
   hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 0; i < count; i++)
-    info[i].codepoint = info[i].glyph_index();
+    info[i].codepoint = info[i].normalizer_glyph_index();
 
   buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS;
 }
@@ -942,7 +896,7 @@ hb_ot_substitute_default (const hb_ot_shape_context_t *c)
 
   hb_ot_rotate_chars (c);
 
-  HB_BUFFER_ALLOCATE_VAR (buffer, glyph_index);
+  HB_BUFFER_ALLOCATE_VAR (buffer, normalizer_glyph_index);
 
   _hb_ot_shape_normalize (c->plan, buffer, c->font);
 
@@ -954,7 +908,7 @@ hb_ot_substitute_default (const hb_ot_shape_context_t *c)
 
   hb_ot_map_glyphs_fast (buffer);
 
-  HB_BUFFER_DEALLOCATE_VAR (buffer, glyph_index);
+  HB_BUFFER_DEALLOCATE_VAR (buffer, normalizer_glyph_index);
 }
 
 static inline void
@@ -969,11 +923,17 @@ hb_ot_substitute_plan (const hb_ot_shape_context_t *c)
 
 #ifndef HB_NO_AAT_SHAPE
   if (unlikely (c->plan->apply_morx))
+  {
     hb_aat_layout_substitute (c->plan, c->font, c->buffer,
                               c->user_features, c->num_user_features);
+    c->buffer->update_digest ();
+  }
   else
 #endif
+  {
+    c->buffer->update_digest ();
     c->plan->substitute (c->font, buffer);
+  }
 }
 
 static inline void
@@ -1054,23 +1014,16 @@ hb_ot_position_default (const hb_ot_shape_context_t *c)
   {
     c->font->get_glyph_h_advances (count, &info[0].codepoint, sizeof(info[0]),
                                    &pos[0].x_advance, sizeof(pos[0]));
-    /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
-    if (c->font->has_glyph_h_origin_func ())
-      for (unsigned int i = 0; i < count; i++)
-        c->font->subtract_glyph_h_origin (info[i].codepoint,
-                                          &pos[i].x_offset,
-                                          &pos[i].y_offset);
+    // h_origin defaults to zero; only apply it if the font has it.
+    if (c->font->has_glyph_h_origin_func () || c->font->has_glyph_h_origins_func ())
+      c->font->subtract_glyph_h_origins (c->buffer);
   }
   else
   {
     c->font->get_glyph_v_advances (count, &info[0].codepoint, sizeof(info[0]),
                                    &pos[0].y_advance, sizeof(pos[0]));
-    for (unsigned int i = 0; i < count; i++)
-    {
-      c->font->subtract_glyph_v_origin (info[i].codepoint,
-                                        &pos[i].x_offset,
-                                        &pos[i].y_offset);
-    }
+    // v_origin defaults to non-zero; apply even if only fallback is there.
+    c->font->subtract_glyph_v_origins (c->buffer);
   }
   if (c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK)
     _hb_ot_shape_fallback_spaces (c->plan, c->font, c->buffer);
@@ -1079,10 +1032,6 @@ hb_ot_position_default (const hb_ot_shape_context_t *c)
 static inline void
 hb_ot_position_plan (const hb_ot_shape_context_t *c)
 {
-  unsigned int count = c->buffer->len;
-  hb_glyph_info_t *info = c->buffer->info;
-  hb_glyph_position_t *pos = c->buffer->pos;
-
   /* If the font has no GPOS and direction is forward, then when
    * zeroing mark widths, we shift the mark with it, such that the
    * mark is positioned hanging over the previous glyph.  When
@@ -1097,12 +1046,9 @@ hb_ot_position_plan (const hb_ot_shape_context_t *c)
 
   /* We change glyph origin to what GPOS expects (horizontal), apply GPOS, change it back. */
 
-  /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
-  if (c->font->has_glyph_h_origin_func ())
-    for (unsigned int i = 0; i < count; i++)
-      c->font->add_glyph_h_origin (info[i].codepoint,
-                                   &pos[i].x_offset,
-                                   &pos[i].y_offset);
+  // h_origin defaults to zero; only apply it if the font has it.
+  if (c->font->has_glyph_h_origin_func () || c->font->has_glyph_h_origins_func ())
+    c->font->add_glyph_h_origins (c->buffer);
 
   hb_ot_layout_position_start (c->font, c->buffer);
 
@@ -1139,12 +1085,9 @@ hb_ot_position_plan (const hb_ot_shape_context_t *c)
   hb_ot_zero_width_default_ignorables (c->buffer);
   hb_ot_layout_position_finish_offsets (c->font, c->buffer);
 
-  /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
-  if (c->font->has_glyph_h_origin_func ())
-    for (unsigned int i = 0; i < count; i++)
-      c->font->subtract_glyph_h_origin (info[i].codepoint,
-                                        &pos[i].x_offset,
-                                        &pos[i].y_offset);
+  // h_origin defaults to zero; only apply it if the font has it.
+  if (c->font->has_glyph_h_origin_func () || c->font->has_glyph_h_origins_func ())
+    c->font->subtract_glyph_h_origins (c->buffer);
 
   if (c->plan->fallback_mark_positioning)
     _hb_ot_shape_fallback_mark_position (c->plan, c->font, c->buffer,
@@ -1172,8 +1115,33 @@ hb_propagate_flags (hb_buffer_t *buffer)
   /* Propagate cluster-level glyph flags to be the same on all cluster glyphs.
    * Simplifies using them. */
 
-  if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS))
+  hb_mask_t and_mask = HB_GLYPH_FLAG_DEFINED;
+  if ((buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) == 0)
+    and_mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
+
+  hb_glyph_info_t *info = buffer->info;
+
+  if ((buffer->flags & HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL) == 0)
+  {
+    foreach_cluster (buffer, start, end)
+    {
+      if (end - start == 1)
+      {
+        info[start].mask &= and_mask;
+        continue;
+      }
+
+      unsigned int mask = 0;
+      for (unsigned int i = start; i < end; i++)
+        mask |= info[i].mask;
+
+      mask &= and_mask;
+
+      for (unsigned int i = start; i < end; i++)
+        info[i].mask = mask;
+    }
     return;
+  }
 
   /* If we are producing SAFE_TO_INSERT_TATWEEL, then do two things:
    *
@@ -1181,30 +1149,20 @@ hb_propagate_flags (hb_buffer_t *buffer)
    *   are UNSAFE_TO_BREAK, then clear the SAFE_TO_INSERT_TATWEEL,
    * - Any place that is SAFE_TO_INSERT_TATWEEL, is also now UNSAFE_TO_BREAK.
    *
-   * We couldn't make this interaction earlier. It has to be done here.
+   * We couldn't make this interaction earlier. It has to be done this way.
    */
-  bool flip_tatweel = buffer->flags & HB_BUFFER_FLAG_PRODUCE_SAFE_TO_INSERT_TATWEEL;
-
-  bool clear_concat = (buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) == 0;
-
-  hb_glyph_info_t *info = buffer->info;
-
   foreach_cluster (buffer, start, end)
   {
     unsigned int mask = 0;
     for (unsigned int i = start; i < end; i++)
-      mask |= info[i].mask & HB_GLYPH_FLAG_DEFINED;
+      mask |= info[i].mask;
 
-    if (flip_tatweel)
-    {
-      if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
-        mask &= ~HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL;
-      if (mask & HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL)
-        mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
-    }
+    if (mask & HB_GLYPH_FLAG_UNSAFE_TO_BREAK)
+      mask &= ~HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL;
+    if (mask & HB_GLYPH_FLAG_SAFE_TO_INSERT_TATWEEL)
+      mask |= HB_GLYPH_FLAG_UNSAFE_TO_BREAK | HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
 
-    if (clear_concat)
-        mask &= ~HB_GLYPH_FLAG_UNSAFE_TO_CONCAT;
+    mask &= and_mask;
 
     for (unsigned int i = start; i < end; i++)
       info[i].mask = mask;
@@ -1245,8 +1203,6 @@ hb_ot_shape_internal (hb_ot_shape_context_t *c)
   _hb_buffer_deallocate_unicode_vars (c->buffer);
 
   c->buffer->props.direction = c->target_direction;
-
-  c->buffer->leave ();
 }
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
index 068d7192d0d..649acddb414 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
@@ -150,7 +150,7 @@ struct hb_ot_shape_planner_t
   static constexpr bool apply_morx = false;
 #endif
   bool script_zero_marks : 1;
-  bool script_fallback_mark_positioning : 1;
+  bool script_fallback_position : 1;
   const struct hb_ot_shaper_t *shaper;
 
   HB_INTERNAL hb_ot_shape_planner_t (hb_face_t                     *face,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh
index e38686e3ebb..79d3014d3e1 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh
@@ -6,10 +6,10 @@
  *
  * on files with these headers:
  *
- * # ArabicShaping-16.0.0.txt
- * # Date: 2024-07-30
- * # Scripts-16.0.0.txt
- * # Date: 2024-04-30, 21:48:40 GMT
+ * # ArabicShaping-17.0.0.txt
+ * # Date: 2025-08-14
+ * # Scripts-17.0.0.txt
+ * # Date: 2025-07-24, 13:28:55 GMT
  */
 
 #ifndef HB_OT_SHAPER_ARABIC_JOINING_LIST_HH
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh
index 19bd72d4218..5f87995ea9c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh
@@ -6,10 +6,10 @@
  *
  * on files with these headers:
  *
- * # ArabicShaping-16.0.0.txt
- * # Date: 2024-07-30
- * # Blocks-16.0.0.txt
- * # Date: 2024-02-02
+ * # ArabicShaping-17.0.0.txt
+ * # Date: 2025-08-14
+ * # Blocks-17.0.0.txt
+ * # Date: 2025-08-01
  * UnicodeData.txt does not have a header.
  */
 
@@ -80,7 +80,7 @@ static const uint8_t joining_table[] =
   /* Arabic Extended-B */
 
   /* 0860 */                                 R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,R,
-  /* 0880 */ R,R,R,C,C,C,D,U,U,D,D,D,D,D,R,X,U,U,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
+  /* 0880 */ R,R,R,C,C,C,D,U,U,D,D,D,D,D,R,D,U,U,X,X,X,X,X,X,X,X,X,X,X,X,X,X,
 
   /* Arabic Extended-A */
 
@@ -140,9 +140,9 @@ static const uint8_t joining_table[] =
 
   /* Arabic Extended-C */
 
-  /* 10EC0 */     R,D,D,
+  /* 10EC0 */     R,D,D,X,D,D,
 
-#define joining_offset_0x10f30u 1185
+#define joining_offset_0x10f30u 1188
 
   /* Sogdian */
 
@@ -161,14 +161,14 @@ static const uint8_t joining_table[] =
   /* 10FA0 */                                 D,U,D,D,R,R,R,U,D,R,R,D,D,R,D,D,
   /* 10FC0 */ U,D,R,R,D,U,U,U,U,R,D,L,
 
-#define joining_offset_0x110bdu 1341
+#define joining_offset_0x110bdu 1344
 
   /* Kaithi */
 
   /* 110A0 */                                                           U,X,X,
   /* 110C0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,U,
 
-#define joining_offset_0x1e900u 1358
+#define joining_offset_0x1e900u 1361
 
   /* Adlam */
 
@@ -176,7 +176,7 @@ static const uint8_t joining_table[] =
   /* 1E920 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
   /* 1E940 */ D,D,D,D,X,X,X,X,X,X,X,T,
 
-}; /* Table items: 1434; occupancy: 57% */
+}; /* Table items: 1437; occupancy: 58% */
 
 
 static unsigned int
@@ -204,7 +204,7 @@ joining_type (hb_codepoint_t u)
       if (hb_in_range<hb_codepoint_t> (u, 0x10AC0u, 0x10AEFu)) return joining_table[u - 0x10AC0u + joining_offset_0x10ac0u];
       if (hb_in_range<hb_codepoint_t> (u, 0x10B80u, 0x10BAFu)) return joining_table[u - 0x10B80u + joining_offset_0x10b80u];
       if (hb_in_range<hb_codepoint_t> (u, 0x10D00u, 0x10D23u)) return joining_table[u - 0x10D00u + joining_offset_0x10d00u];
-      if (hb_in_range<hb_codepoint_t> (u, 0x10EC2u, 0x10EC4u)) return joining_table[u - 0x10EC2u + joining_offset_0x10ec2u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x10EC2u, 0x10EC7u)) return joining_table[u - 0x10EC2u + joining_offset_0x10ec2u];
       if (hb_in_range<hb_codepoint_t> (u, 0x10F30u, 0x10FCBu)) return joining_table[u - 0x10F30u + joining_offset_0x10f30u];
       break;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc
index 7379bb7f15b..981c0f9224b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc
@@ -654,7 +654,7 @@ postprocess_glyphs_arabic (const hb_ot_shape_plan_t *plan,
 
 /* https://www.unicode.org/reports/tr53/ */
 
-static hb_codepoint_t
+static const hb_codepoint_t
 modifier_combining_marks[] =
 {
   0x0654u, /* ARABIC HAMZA ABOVE */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc
index 5c46ebbc281..5f15aff8b7c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hangul.cc
@@ -427,7 +427,7 @@ const hb_ot_shaper_t _hb_ot_shaper_hangul =
   HB_TAG_NONE, /* gpos_tag */
   HB_OT_SHAPE_NORMALIZATION_MODE_NONE,
   HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
-  false, /* fallback_position */
+  true, /* fallback_position */
 };
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh
index 25e6d85ef80..76c5e83e30f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh
@@ -53,7 +53,7 @@ enum indic_syllable_type_t {
 };
 
 
-#line 57 "hb-ot-shaper-indic-machine.hh"
+#line 54 "hb-ot-shaper-indic-machine.hh"
 #define indic_syllable_machine_ex_A 9u
 #define indic_syllable_machine_ex_C 1u
 #define indic_syllable_machine_ex_CM 16u
@@ -77,7 +77,7 @@ enum indic_syllable_type_t {
 #define indic_syllable_machine_ex_ZWNJ 5u
 
 
-#line 81 "hb-ot-shaper-indic-machine.hh"
+#line 76 "hb-ot-shaper-indic-machine.hh"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
         8u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u,
         8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 4u, 57u,
@@ -1126,7 +1126,7 @@ find_syllables_indic (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 1130 "hb-ot-shaper-indic-machine.hh"
+#line 1119 "hb-ot-shaper-indic-machine.hh"
         {
         cs = indic_syllable_machine_start;
         ts = 0;
@@ -1142,7 +1142,7 @@ find_syllables_indic (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
 
-#line 1146 "hb-ot-shaper-indic-machine.hh"
+#line 1131 "hb-ot-shaper-indic-machine.hh"
         {
         int _slen;
         int _trans;
@@ -1156,7 +1156,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 1160 "hb-ot-shaper-indic-machine.hh"
+#line 1143 "hb-ot-shaper-indic-machine.hh"
         }
 
         _keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -1268,7 +1268,7 @@ _eof_trans:
 #line 117 "hb-ot-shaper-indic-machine.rl"
         {act = 7;}
         break;
-#line 1272 "hb-ot-shaper-indic-machine.hh"
+#line 1232 "hb-ot-shaper-indic-machine.hh"
         }
 
 _again:
@@ -1277,7 +1277,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 1281 "hb-ot-shaper-indic-machine.hh"
+#line 1239 "hb-ot-shaper-indic-machine.hh"
         }
 
         if ( ++p != pe )
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc
index b87c530853b..bf27efee21b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc
@@ -6,12 +6,12 @@
  *
  * on files with these headers:
  *
- * # IndicSyllabicCategory-16.0.0.txt
- * # Date: 2024-04-30, 21:48:21 GMT
- * # IndicPositionalCategory-16.0.0.txt
- * # Date: 2024-04-30, 21:48:21 GMT
- * # Blocks-16.0.0.txt
- * # Date: 2024-02-02
+ * # IndicSyllabicCategory-17.0.0.txt
+ * # Date: 2025-08-01, 04:02:23 GMT
+ * # IndicPositionalCategory-17.0.0.txt
+ * # Date: 2025-07-29, 13:35:52 GMT
+ * # Blocks-17.0.0.txt
+ * # Date: 2025-08-01
  */
 
 #include "hb.hh"
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc
index d78b5670f61..bec802429ab 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic.cc
@@ -296,11 +296,6 @@ struct indic_shape_plan_t
   const indic_config_t *config;
 
   bool is_old_spec;
-#ifndef HB_NO_UNISCRIBE_BUG_COMPATIBLE
-  bool uniscribe_bug_compatible;
-#else
-  static constexpr bool uniscribe_bug_compatible = false;
-#endif
   mutable hb_atomic_t<hb_codepoint_t> virama_glyph;
 
   hb_indic_would_substitute_feature_t rphf;
@@ -327,9 +322,6 @@ data_create_indic (const hb_ot_shape_plan_t *plan)
     }
 
   indic_plan->is_old_spec = indic_plan->config->has_old_spec && ((plan->map.chosen_script[0] & 0x000000FFu) != '2');
-#ifndef HB_NO_UNISCRIBE_BUG_COMPATIBLE
-  indic_plan->uniscribe_bug_compatible = hb_options ().uniscribe_bug_compatible;
-#endif
   indic_plan->virama_glyph = -1;
 
   /* Use zero-context would_substitute() matching for new-spec of the main
@@ -943,17 +935,7 @@ initial_reordering_standalone_cluster (const hb_ot_shape_plan_t *plan,
                                        unsigned int start, unsigned int end)
 {
   /* We treat placeholder/dotted-circle as if they are consonants, so we
-   * should just chain.  Only if not in compatibility mode that is... */
-
-  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
-  if (indic_plan->uniscribe_bug_compatible)
-  {
-    /* For dotted-circle, this is what Uniscribe does:
-     * If dotted-circle is the last glyph, it just does nothing.
-     * Ie. It doesn't form Reph. */
-    if (buffer->info[end - 1].indic_category() == I_Cat(DOTTEDCIRCLE))
-      return;
-  }
+   * should just chain... */
 
   initial_reordering_consonant_syllable (plan, face, buffer, start, end);
 }
@@ -1347,8 +1329,7 @@ final_reordering_syllable_indic (const hb_ot_shape_plan_t *plan,
        * Uniscribe doesn't do this.
        * TEST: U+0930,U+094D,U+0915,U+094B,U+094D
        */
-      if (!indic_plan->uniscribe_bug_compatible &&
-          unlikely (is_halant (info[new_reph_pos])))
+      if (unlikely (is_halant (info[new_reph_pos])))
       {
         for (unsigned int i = base + 1; i < new_reph_pos; i++)
           if (FLAG_UNSAFE (info[i].indic_category()) & (FLAG (I_Cat(M)) | FLAG (I_Cat(MPst))))
@@ -1451,27 +1432,6 @@ final_reordering_syllable_indic (const hb_ot_shape_plan_t *plan,
     else
       buffer->unsafe_to_break (start - 1, start + 1);
   }
-
-
-  /*
-   * Finish off the clusters and go home!
-   */
-  if (indic_plan->uniscribe_bug_compatible)
-  {
-    switch ((hb_tag_t) plan->props.script)
-    {
-      case HB_SCRIPT_TAMIL:
-        break;
-
-      default:
-        /* Uniscribe merges the entire syllable into a single cluster... Except for Tamil.
-         * This means, half forms are submerged into the main consonant's cluster.
-         * This is unnecessary, and makes cursor positioning harder, but that's what
-         * Uniscribe does. */
-        buffer->merge_clusters (start, end);
-        break;
-    }
-  }
 }
 
 
@@ -1501,9 +1461,7 @@ preprocess_text_indic (const hb_ot_shape_plan_t *plan,
                        hb_buffer_t              *buffer,
                        hb_font_t                *font)
 {
-  const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data;
-  if (!indic_plan->uniscribe_bug_compatible)
-    _hb_preprocess_text_vowel_constraints (plan, buffer, font);
+  _hb_preprocess_text_vowel_constraints (plan, buffer, font);
 }
 
 static bool
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer-machine.hh
index e1f657c758a..2442f0341ef 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer-machine.hh
@@ -48,7 +48,7 @@ enum khmer_syllable_type_t {
 };
 
 
-#line 52 "hb-ot-shaper-khmer-machine.hh"
+#line 49 "hb-ot-shaper-khmer-machine.hh"
 #define khmer_syllable_machine_ex_C 1u
 #define khmer_syllable_machine_ex_DOTTEDCIRCLE 11u
 #define khmer_syllable_machine_ex_H 4u
@@ -66,7 +66,7 @@ enum khmer_syllable_type_t {
 #define khmer_syllable_machine_ex_ZWNJ 5u
 
 
-#line 70 "hb-ot-shaper-khmer-machine.hh"
+#line 65 "hb-ot-shaper-khmer-machine.hh"
 static const unsigned char _khmer_syllable_machine_trans_keys[] = {
         5u, 26u, 5u, 26u, 1u, 15u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u,
         5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 5u, 26u, 1u, 15u, 5u, 26u, 5u, 26u,
@@ -294,7 +294,7 @@ find_syllables_khmer (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 298 "hb-ot-shaper-khmer-machine.hh"
+#line 287 "hb-ot-shaper-khmer-machine.hh"
         {
         cs = khmer_syllable_machine_start;
         ts = 0;
@@ -310,7 +310,7 @@ find_syllables_khmer (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
 
-#line 314 "hb-ot-shaper-khmer-machine.hh"
+#line 299 "hb-ot-shaper-khmer-machine.hh"
         {
         int _slen;
         int _trans;
@@ -324,7 +324,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 328 "hb-ot-shaper-khmer-machine.hh"
+#line 311 "hb-ot-shaper-khmer-machine.hh"
         }
 
         _keys = _khmer_syllable_machine_trans_keys + (cs<<1);
@@ -394,7 +394,7 @@ _eof_trans:
 #line 98 "hb-ot-shaper-khmer-machine.rl"
         {act = 3;}
         break;
-#line 398 "hb-ot-shaper-khmer-machine.hh"
+#line 368 "hb-ot-shaper-khmer-machine.hh"
         }
 
 _again:
@@ -403,7 +403,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 407 "hb-ot-shaper-khmer-machine.hh"
+#line 375 "hb-ot-shaper-khmer-machine.hh"
         }
 
         if ( ++p != pe )
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer.cc
index 2a4aed2ab1b..1f5028aa3ee 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-khmer.cc
@@ -141,12 +141,6 @@ override_features_khmer (hb_ot_shape_planner_t *plan)
    * typographical correctness.", hence in overrides... */
   map->enable_feature (HB_TAG('c','l','i','g'));
 
-  /* Uniscribe does not apply 'kern' in Khmer. */
-  if (hb_options ().uniscribe_bug_compatible)
-  {
-    map->disable_feature (HB_TAG('k','e','r','n'));
-  }
-
   map->disable_feature (HB_TAG('l','i','g','a'));
 }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh
index 64eb761b4ea..6e5fce609bc 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh
@@ -50,7 +50,7 @@ enum myanmar_syllable_type_t {
 };
 
 
-#line 54 "hb-ot-shaper-myanmar-machine.hh"
+#line 51 "hb-ot-shaper-myanmar-machine.hh"
 #define myanmar_syllable_machine_ex_A 9u
 #define myanmar_syllable_machine_ex_As 32u
 #define myanmar_syllable_machine_ex_C 1u
@@ -78,7 +78,7 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_ZWNJ 5u
 
 
-#line 82 "hb-ot-shaper-myanmar-machine.hh"
+#line 77 "hb-ot-shaper-myanmar-machine.hh"
 static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
         1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u,
         3u, 57u, 3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u,
@@ -549,7 +549,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 553 "hb-ot-shaper-myanmar-machine.hh"
+#line 542 "hb-ot-shaper-myanmar-machine.hh"
         {
         cs = myanmar_syllable_machine_start;
         ts = 0;
@@ -565,7 +565,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
 
-#line 569 "hb-ot-shaper-myanmar-machine.hh"
+#line 554 "hb-ot-shaper-myanmar-machine.hh"
         {
         int _slen;
         int _trans;
@@ -579,7 +579,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 583 "hb-ot-shaper-myanmar-machine.hh"
+#line 566 "hb-ot-shaper-myanmar-machine.hh"
         }
 
         _keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
@@ -649,7 +649,7 @@ _eof_trans:
 #line 113 "hb-ot-shaper-myanmar-machine.rl"
         {act = 3;}
         break;
-#line 653 "hb-ot-shaper-myanmar-machine.hh"
+#line 623 "hb-ot-shaper-myanmar-machine.hh"
         }
 
 _again:
@@ -658,7 +658,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 662 "hb-ot-shaper-myanmar-machine.hh"
+#line 630 "hb-ot-shaper-myanmar-machine.hh"
         }
 
         if ( ++p != pe )
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc
index a0ea464e775..42fc4bbcc44 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-thai.cc
@@ -163,7 +163,7 @@ thai_pua_shape (hb_codepoint_t u, thai_action_t action, hb_font_t *font)
 }
 
 
-static enum thai_above_state_t
+static const enum thai_above_state_t
 {     /* Cluster above looks like: */
   T0, /*  ⣤                      */
   T1, /*     ⣼                   */
@@ -191,7 +191,7 @@ static const struct thai_above_state_machine_edge_t {
 };
 
 
-static enum thai_below_state_t
+static const enum thai_below_state_t
 {
   B0, /* No descender */
   B1, /* Removable descender */
@@ -334,7 +334,7 @@ preprocess_text_thai (const hb_ot_shape_plan_t *plan,
 
     /* Is SARA AM. Decompose and reorder. */
     (void) buffer->output_glyph (NIKHAHIT_FROM_SARA_AM (u));
-    _hb_glyph_info_set_continuation (&buffer->prev());
+    _hb_glyph_info_set_continuation (&buffer->prev(), buffer);
     if (unlikely (!buffer->replace_glyph (SARA_AA_FROM_SARA_AM (u)))) break;
 
     /* Make Nikhahit be recognized as a ccc=0 mark when zeroing widths. */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh
index 46f66f7d285..22a5356a877 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh
@@ -53,7 +53,7 @@ enum use_syllable_type_t {
 };
 
 
-#line 57 "hb-ot-shaper-use-machine.hh"
+#line 54 "hb-ot-shaper-use-machine.hh"
 #define use_syllable_machine_ex_B 1u
 #define use_syllable_machine_ex_CGJ 6u
 #define use_syllable_machine_ex_CMAbv 31u
@@ -100,7 +100,7 @@ enum use_syllable_type_t {
 #define use_syllable_machine_ex_ZWNJ 14u
 
 
-#line 104 "hb-ot-shaper-use-machine.hh"
+#line 99 "hb-ot-shaper-use-machine.hh"
 static const unsigned char _use_syllable_machine_trans_keys[] = {
         49u, 51u, 0u, 56u, 11u, 56u, 11u, 56u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u,
         14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u,
@@ -929,7 +929,7 @@ find_syllables_use (hb_buffer_t *buffer)
   unsigned int act HB_UNUSED;
   int cs;
 
-#line 933 "hb-ot-shaper-use-machine.hh"
+#line 922 "hb-ot-shaper-use-machine.hh"
         {
         cs = use_syllable_machine_start;
         ts = 0;
@@ -942,7 +942,7 @@ find_syllables_use (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
 
-#line 946 "hb-ot-shaper-use-machine.hh"
+#line 931 "hb-ot-shaper-use-machine.hh"
         {
         int _slen;
         int _trans;
@@ -956,7 +956,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 960 "hb-ot-shaper-use-machine.hh"
+#line 943 "hb-ot-shaper-use-machine.hh"
         }
 
         _keys = _use_syllable_machine_trans_keys + (cs<<1);
@@ -1078,7 +1078,7 @@ _eof_trans:
 #line 181 "hb-ot-shaper-use-machine.rl"
         {act = 9;}
         break;
-#line 1082 "hb-ot-shaper-use-machine.hh"
+#line 1039 "hb-ot-shaper-use-machine.hh"
         }
 
 _again:
@@ -1087,7 +1087,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 1091 "hb-ot-shaper-use-machine.hh"
+#line 1046 "hb-ot-shaper-use-machine.hh"
         }
 
         if ( ++p != pe )
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh
index d3c49949aa8..a69abefdd01 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh
@@ -6,18 +6,18 @@
  *
  * on files with these headers:
  *
- * # IndicSyllabicCategory-16.0.0.txt
- * # Date: 2024-04-30, 21:48:21 GMT
- * # IndicPositionalCategory-16.0.0.txt
- * # Date: 2024-04-30, 21:48:21 GMT
- * # ArabicShaping-16.0.0.txt
- * # Date: 2024-07-30
- * # DerivedCoreProperties-16.0.0.txt
- * # Date: 2024-05-31, 18:09:32 GMT
- * # Blocks-16.0.0.txt
- * # Date: 2024-02-02
- * # Scripts-16.0.0.txt
- * # Date: 2024-04-30, 21:48:40 GMT
+ * # IndicSyllabicCategory-17.0.0.txt
+ * # Date: 2025-08-01, 04:02:23 GMT
+ * # IndicPositionalCategory-17.0.0.txt
+ * # Date: 2025-07-29, 13:35:52 GMT
+ * # ArabicShaping-17.0.0.txt
+ * # Date: 2025-08-14
+ * # DerivedCoreProperties-17.0.0.txt
+ * # Date: 2025-07-30, 23:55:08 GMT
+ * # Blocks-17.0.0.txt
+ * # Date: 2025-08-01
+ * # Scripts-17.0.0.txt
+ * # Date: 2025-07-24, 13:28:55 GMT
  * # Override values For Indic_Syllabic_Category
  * # Not derivable
  * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17
@@ -101,8 +101,9 @@
 
 #ifndef HB_OPTIMIZE_SIZE
 
-static const uint8_t
-hb_use_u8[3345] =
+#include <stdint.h>
+
+static const uint8_t hb_use_u8[3343]=
 {
      16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   57,   58,   59,  195,  211,   62,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
@@ -126,24 +127,24 @@ hb_use_u8[3345] =
      49,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   50,   51,    2,    2,    2,
       2,    2,    2,    2,    2,   52,   53,    2,   54,    2,    2,   55,   56,    2,   57,   58,
      59,   60,   61,   62,   63,   64,   65,   66,   67,   68,   69,    2,   70,   71,   72,   73,
-      2,   74,    2,   75,   76,   77,   78,    2,    2,   79,   80,   81,   82,    2,   83,   84,
-      2,   85,   85,   85,   85,   85,   85,   85,   85,   86,   85,   85,   85,   85,   85,   85,
-     85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
-     85,   85,   85,   85,   85,   85,   85,   85,   87,    2,    2,    2,    2,    2,    2,    2,
+      2,   74,    2,   75,   76,   77,   78,   79,    2,   80,   81,   82,   83,    2,   84,   85,
+      2,   86,   86,   86,   86,   86,   86,   86,   86,   87,   86,   86,   86,   86,   86,   86,
+     86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+     86,   86,   86,   86,   86,   86,   86,   86,   88,    2,    2,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,   88,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,   89,   90,    2,    2,    2,   91,    2,    2,    2,   92,
-     93,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,   94,   94,   94,   95,    2,    2,    2,    2,    2,
+      2,    2,    2,   89,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   90,   91,    2,    2,    2,   92,    2,    2,    2,   93,
+     94,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   95,   95,   95,   96,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    2,    2,   96,   97,    2,    2,    2,    2,    2,
-      2,    2,    2,   98,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,   97,   98,    2,    2,    2,    2,    2,
+      2,    2,    2,   99,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,   99,    2,    2,  100,    2,    2,    2,  101,    2,  102,    2,    2,    2,
-      2,    2,    2,  103,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,  104,  104,  105,  106,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-    104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-    104,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+      2,    2,    2,  100,    2,    2,  101,    2,    2,    2,  102,    2,  103,    2,    2,    2,
+      2,    2,    2,  104,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,  105,  105,  106,  107,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+    105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+    105,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
       0,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    3,    4,
       0,    5,    0,    0,    0,    0,    0,    6,    0,    0,    7,    0,    0,    0,    0,    0,
       0,    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -192,99 +193,99 @@ hb_use_u8[3345] =
      48,   48,   48,   48,   15,   82,   83,   84,   85,   86,   87,    0,    0,    0,    0,   88,
       0,    9,    0,    0,   30,    0,   89,   81,   90,    2,    2,    2,    2,    9,    0,    0,
       0,   42,   42,   91,   92,    2,    2,    2,    2,    2,    2,    2,    2,   13,    9,    0,
-      0,   93,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      9,   22,   80,   45,   22,   94,   61,    0,    0,   95,   96,   95,   95,   97,   98,    0,
-      0,    2,    2,    2,    2,    2,    2,    2,    0,    2,    2,    9,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    2,    0,    0,    2,    2,    2,    2,   29,    0,    0,
-      0,    2,    2,    2,    2,    2,    9,    0,    0,    2,    2,    2,   52,   99,   45,    0,
-      0,    2,    2,  100,  101,  102,  103,   61,   63,  104,   16,   45,   22,   59,   21,   80,
-     48,   48,   76,   11,   11,   11,  105,   46,   40,   11,  106,   74,    2,    2,    2,    2,
-      2,    2,    2,  107,   22,   20,   20,   22,   48,   48,   22,  108,    2,    2,    2,    9,
-      0,    0,    0,    0,    0,    0,  109,  110,  110,  110,  110,    0,    0,    0,    0,    0,
-      0,  106,   74,    2,    2,    2,    2,    2,    2,   60,   61,   59,   25,   22,  111,   61,
-      2,    2,    2,    2,  107,   22,   23,   45,   45,  102,  112,    0,    0,    0,    0,    0,
-      0,    2,    2,   61,   18,   48,   23,  113,  102,  102,  102,  114,  115,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    0,   30,    2,   11,   46,  116,  116,  116,   11,  116,
-    116,   15,  116,  116,  116,   26,    0,   40,    0,    0,    0,  117,   51,   11,    5,    0,
-      0,    0,    0,    0,    0,    0,  118,    0,    0,    0,    0,    0,    0,    0,    6,  119,
-    120,   42,   42,    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  120,  120,
-    121,  120,  120,  120,  120,  120,  120,  120,  120,    0,    0,  122,    0,    0,    0,    0,
-      0,    0,    7,  122,    0,    0,    0,    0,    0,   46,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    9,    0,    0,    0,    0,  123,  123,    0,    0,
-      0,    2,    2,    2,    2,    0,    0,    0,   30,    0,    0,    0,    0,    0,    0,    0,
-    124,    0,  123,  123,    0,    0,    0,    0,    0,    2,   53,    2,  108,    2,   10,    2,
-      2,    2,   65,   19,   16,    0,    0,   31,    0,    2,    2,    0,    0,    0,    0,    0,
-      0,   29,    2,    2,    2,    2,    2,    2,    2,    2,    2,  125,   23,   23,   23,   23,
-     23,   23,   23,  126,    0,    0,    0,    0,    0,   11,   11,   11,   11,   11,   11,   11,
-     11,   11,    2,    0,    0,    0,    0,    0,   52,    2,    2,    2,   22,   22,  127,  116,
-      0,    2,    2,    2,  128,   20,   59,   20,  113,  102,  129,    0,    0,    0,    0,    0,
-      0,   11,  130,    2,    2,    2,    2,    2,    2,    2,  131,   23,   22,   20,   48,  132,
-    133,  134,    0,    0,    0,    0,    0,    0,    0,    2,    2,   52,   30,    2,    2,    2,
-      2,    2,    2,    2,    2,   10,   22,   59,   99,   76,  135,  136,  137,    0,    0,    0,
-      0,    2,  138,    2,    2,    2,    2,  139,    0,   30,    2,   42,    5,    0,   79,   15,
-      2,   53,   22,  140,   52,   53,    2,    2,  105,   10,    9,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,  141,   21,   25,    0,    0,  142,  143,    0,    0,    0,
-      0,    2,   65,   45,   23,   80,   47,  144,    0,   81,   81,   81,   81,   81,   81,   81,
-     81,    0,    0,    0,    0,    0,    0,    0,    6,  120,  120,  120,  120,  121,    0,    0,
-      0,    2,    2,    2,    2,    2,    9,    2,    2,    2,    9,    2,   30,    2,    2,    2,
-      2,    2,   30,    2,    2,    2,   30,    9,    0,  128,   20,   27,   31,    0,    0,  145,
-    146,    2,    2,   30,    2,   30,    2,    2,    2,    2,    2,    2,    0,   14,   37,    0,
-    147,    2,    2,   13,   37,    0,   30,    2,    2,    2,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,   30,    2,    2,    9,    2,    2,   11,   41,    0,    0,    0,
-      0,    2,    2,    2,    0,   27,   22,   22,   30,    2,    2,    2,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   27,   38,    0,    2,    2,    2,  116,  116,  116,  116,
-    116,  148,    2,    9,    0,    0,    0,    0,    0,    2,   14,   14,    0,    0,    0,    0,
-      0,    9,    2,    2,    9,    2,    2,    2,    2,   30,    2,    9,    0,   30,    2,    0,
-      0,  149,  150,  151,    2,    2,    2,    2,    2,    2,    2,    2,    2,   22,   22,   20,
-     20,   20,   22,   22,  134,    0,    0,    0,    0,    0,  152,  152,  152,  152,  152,  152,
-    152,  152,  152,  152,    2,    2,    2,    2,    2,   53,   52,   53,    0,    0,    0,    0,
-    153,   11,   74,    2,    2,    2,    2,    2,    2,   18,   19,   21,   16,   24,   37,    0,
-      0,    0,   31,    0,    0,    0,    0,    0,    0,   11,   49,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,  128,   20,   22,  154,   22,   21,  155,  156,    2,    2,    2,    2,
-      2,    0,    0,   65,  157,    0,    0,    0,    0,    2,   13,    0,    0,    0,    0,    0,
-      0,    2,   65,   25,   20,   20,   20,   22,   22,  108,  158,    0,    0,   56,  159,   31,
-    160,   30,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   23,
-     19,   22,   22,  161,   44,    0,    0,    0,   49,  128,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    9,    9,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,
-     30,    2,    2,    2,    2,    2,    2,    2,   10,   18,   19,   21,   22,  162,   31,    0,
-      0,   11,   11,   30,    2,    2,    2,    9,   30,    9,    2,   30,    2,    2,   58,   17,
-     23,   16,   23,   47,   32,   33,   32,   34,    0,    0,    0,    0,   35,    0,    0,    0,
-      2,    2,   23,    0,   11,   11,   11,   46,    0,   11,   11,   46,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   30,    0,    9,    2,    2,    2,   30,   45,   59,   20,
-     20,   31,   33,   32,   32,   25,  163,   29,  164,  165,   37,    0,    0,    0,    0,    0,
-      0,   12,   26,    0,    0,    0,    0,    0,    0,    2,    2,   65,   25,   20,   20,   20,
-     22,   23,  126,   15,   17,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,    0,
-    166,  167,    0,    0,    0,    0,    0,    0,    0,   18,   19,   20,   20,   66,   99,   25,
-    160,   11,  168,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-     65,   25,   20,   20,    0,   48,   48,   11,  169,   37,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    2,    2,   20,    0,   23,   19,   20,   20,   21,   16,   82,
-    169,   38,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   10,  170,
-     25,   20,   22,   22,  168,    9,    0,    0,    0,    2,    2,    2,    2,    2,    9,   43,
-    136,   23,   22,   20,   76,   21,   22,    0,    0,    2,    2,    2,    9,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    2,   18,   19,   20,   21,   22,  105,  169,   37,    0,
-      0,    2,    2,    2,    9,   30,    0,    2,    2,    2,    2,   30,    9,    2,    2,    2,
-      2,   23,   23,   18,   32,   33,   12,  171,  165,  172,  173,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    0,    2,    2,    2,   65,   25,   20,   20,    0,   22,   23,
-     29,  108,    0,   33,    0,    0,    0,    0,    0,   52,   20,   22,   22,   22,  140,    2,
-      2,    2,  174,  175,   11,   15,  176,   61,  177,    0,    0,    1,  147,    0,    0,    0,
-      0,   52,   20,   22,   16,   19,   20,    2,    2,    2,    2,  158,  158,  158,  178,  178,
-    178,  178,  178,  178,   15,  179,    0,   30,    0,   22,   20,   20,   31,   22,   22,   11,
+      0,    2,    2,    2,    2,    2,    2,    2,    9,   22,   80,   45,   22,   93,   61,    0,
+      0,   94,   95,   94,   94,   96,   97,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+      0,    2,    2,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
+      0,    2,    2,    2,    2,   29,    0,    0,    0,    2,    2,    2,    2,    2,    9,    0,
+      0,    2,    2,    2,   52,   98,   45,    0,    0,    2,    2,   99,  100,  101,  102,   61,
+     63,  103,   16,   45,   22,   59,   21,   80,   48,   48,   76,   11,   11,   11,  104,   46,
+     40,   11,  105,   74,    2,    2,    2,    2,    2,    2,    2,  106,   22,   20,   20,   22,
+     48,   48,   22,  107,    2,    2,    2,    9,    0,    0,    0,    0,    0,    0,  108,  109,
+    109,  109,  109,    0,    0,    0,    0,    0,    0,  105,   74,    2,    2,    2,    2,    2,
+      2,   60,   61,   59,   25,   22,  110,   61,    2,    2,    2,    2,  106,   22,   23,   45,
+     45,  101,  111,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  112,
+    101,  101,  101,  113,  114,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   30,
+      2,   11,   46,  115,  115,  115,   11,  115,  115,   15,  115,  115,  115,   26,    0,   40,
+      0,    0,    0,  116,   51,   11,    5,    0,    0,    0,    0,    0,    0,    0,  117,    0,
+      0,    0,    0,    0,    0,    0,    6,  118,  119,   42,   42,    5,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,  119,  119,  120,  119,  119,  119,  119,  119,  119,  119,
+    119,    0,    0,  121,    0,    0,    0,    0,    0,    0,    7,  121,    0,    0,    0,    0,
+      0,   46,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    9,
+      0,    0,    0,    0,  122,  122,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
+     30,    0,    0,    0,    0,    0,    0,    0,  123,    0,  122,  122,    0,    0,    0,    0,
+      0,    2,   53,    2,  107,    2,   10,    2,    2,    2,   65,   19,   16,    0,    0,   31,
+      0,    2,    2,    0,    0,    0,    0,    0,    0,   29,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,  124,   23,   23,   23,   23,   23,   23,   23,  125,    0,    0,    0,    0,
+      0,   11,   11,   11,   11,   11,   11,   11,   11,   11,    2,    0,    0,    0,    0,    0,
+     52,    2,    2,    2,   22,   22,  126,  115,    0,    2,    2,    2,  127,   20,   59,   20,
+    112,  101,  128,    0,    0,    0,    0,    0,    0,   11,  129,    2,    2,    2,    2,    2,
+      2,    2,  130,   23,   22,   20,   48,  131,  132,  133,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,   52,   30,    2,    2,    2,    2,    2,    2,    2,    2,   10,   22,   59,
+     98,   76,  134,  135,  136,    0,    0,    0,    0,    2,  137,    2,    2,    2,    2,  138,
+      0,   30,    2,   42,    5,    0,   79,   15,    2,  139,   20,   53,  127,  139,    2,    2,
+    140,   10,    9,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  141,   21,
+     25,    0,    0,  142,  143,    0,    0,    0,    0,    2,   65,   45,   23,   80,   47,  144,
+      0,   81,   81,   81,   81,   81,   81,   81,   81,    0,    0,    0,    0,    0,    0,    0,
+      6,  119,  119,  119,  119,  120,    0,    0,    0,    2,    2,    2,    2,    2,    9,    2,
+      2,    2,    9,    2,   30,    2,    2,    2,    2,    2,   30,    2,    2,    2,   30,    9,
+      0,  127,   20,   27,   31,    0,    0,  145,  146,    2,    2,   30,    2,   30,    2,    2,
+      2,    2,    2,    2,    0,   14,   37,    0,  147,    2,    2,   13,   37,    0,   30,    2,
+      2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,
+      9,    2,    2,   11,   41,    0,    0,    0,    0,    2,    2,    2,    0,   27,   22,   22,
+     30,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   27,   38,
+      0,    2,    2,    2,  115,  115,  115,  115,  115,  148,    2,    9,    0,    0,    0,    0,
+      0,    2,   14,   14,    0,    0,    0,    0,    0,    9,    2,    2,    9,    2,    2,    2,
+      2,   30,    2,    9,    0,   30,    2,    0,    0,  149,  150,  151,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,   22,   22,   20,   20,   20,   22,   22,  133,    0,    0,    0,
+      0,    0,  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,    2,    2,    2,    2,
+      2,   53,   52,   53,    0,    0,    0,    0,  153,   11,   74,    2,    2,    2,    2,    2,
+      2,   18,   19,   21,   16,   24,   37,    0,    0,    0,   31,    0,    0,    0,    0,    0,
+      0,   11,   49,    2,    2,    2,    2,    2,    2,    2,    2,    2,  127,   20,   22,  154,
+     22,   21,  155,  156,    2,    2,    2,    2,    2,    0,    0,   65,  157,    0,    0,    0,
+      0,    2,   13,    0,    0,    0,    0,    0,    0,    2,   65,   25,   20,   20,   20,   22,
+     22,  107,  158,    0,    0,   56,  159,   31,  160,   30,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   23,   19,   22,   22,  161,   44,    0,    0,    0,
+     49,  127,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    9,    9,    2,    2,
+     30,    2,    2,    2,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,
+     10,   18,   19,   21,   22,  162,   31,    0,    0,   11,   11,   30,    2,    2,    2,    9,
+     30,    9,    2,   30,    2,    2,   58,   17,   23,   16,   23,   47,   32,   33,   32,   34,
+      0,    0,    0,    0,   35,    0,    0,    0,    2,    2,   23,    0,   11,   11,   11,   46,
+      0,   11,   11,   46,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   30,    0,
+      9,    2,    2,    2,   30,   45,   59,   20,   20,   31,   33,   32,   32,   25,  163,   29,
+    164,  165,   37,    0,    0,    0,    0,    0,    0,   12,   26,    0,    0,    0,    0,    0,
+      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  125,   15,   17,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    0,    0,  166,  167,    0,    0,    0,    0,    0,    0,
+      0,   18,   19,   20,   20,   66,   98,   25,  160,   11,  168,    9,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   65,   25,   20,   20,    0,   48,   48,   11,
+    169,   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   20,
+      0,   23,   19,   20,   20,   21,   16,   82,  169,   38,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   10,  170,   25,   20,   22,   22,  168,    9,    0,    0,
+      0,    2,    2,    2,    2,    2,    9,   43,  135,   23,   22,   20,   76,   21,   22,    0,
+      0,    2,    2,    2,    9,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   18,
+     19,   20,   21,   22,  104,  169,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
+      2,    2,    2,   30,    9,    2,    2,    2,    2,   23,   23,   18,   32,   33,   12,  171,
+    165,  172,  173,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
+      2,   65,   25,   20,   20,    0,   22,   23,   29,  107,    0,   33,    0,    0,    0,    0,
+      0,   52,   20,   22,   22,   22,  139,    2,    2,    2,  174,  140,   11,   15,  175,   61,
+    176,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
+      2,    2,    2,  158,  158,  158,  177,  177,  177,  177,  177,  177,   15,  178,    0,   30,
+      0,   16,   20,   16,   16,    0,    0,    0,    0,   22,   20,   20,   31,   22,   22,   11,
     169,    0,   61,   61,   61,   61,   61,   61,   61,   66,   21,   82,   46,    0,    0,    0,
       0,    2,    2,    2,    9,    2,   30,    2,    2,   52,   22,   22,   31,    0,   38,   22,
-     27,   11,  159,  180,  181,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
+     27,   11,  159,  179,  180,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
       2,    2,    2,    2,    2,    2,   23,   23,   47,   22,   35,   82,   68,    0,    0,    0,
-      0,    2,  182,   66,   47,    0,    0,    0,    0,   11,  183,    2,    2,    2,    2,    2,
+      0,    2,  181,   66,   47,    0,    0,    0,    0,   11,  182,    2,    2,    2,    2,    2,
       2,    2,    2,   23,   22,   20,   31,    0,   48,   16,  143,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,  156,    0,    0,  184,  184,  184,  184,  184,  184,  184,
-    184,  185,  185,  185,  186,  187,  185,  184,  184,  188,  184,  184,  189,  190,  190,  190,
-    190,  190,  190,  190,    0,    0,    0,    0,    0,  184,  184,  184,  184,  184,  191,    0,
-      0,    2,    2,    2,    2,    2,    2,    2,   22,   22,   22,   22,   22,   22,  192,  193,
-    194,   11,   11,   11,   46,    0,    0,    0,    0,   29,   74,    2,    2,    2,    2,    2,
+      0,    2,    2,    2,    2,    2,  156,    0,    0,  183,  183,  183,  183,  183,  183,  183,
+    183,  184,  184,  184,  185,  186,  184,  183,  183,  187,  183,  183,  188,  189,  189,  189,
+    189,  189,  189,  189,    0,    0,    0,    0,    0,  183,  183,  183,  183,  183,  190,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   22,   22,   22,   22,   22,   22,  191,  192,
+    193,   11,   11,   11,   46,    0,    0,    0,    0,   29,   74,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,   65,   47,    0,    2,    2,    2,    2,    2,    9,    0,
-     58,  195,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-     20,   20,   20,   20,   20,    0,    0,    0,   40,  116,   26,    0,    0,    0,    0,    0,
+     58,  194,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+     20,   20,   20,   20,   20,    0,    0,    0,   40,  115,   26,    0,    0,    0,    0,    0,
       0,    0,    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-     30,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  120,  120,  120,  121,    0,
+     30,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  119,  119,  119,  120,    0,
       0,   11,   11,   11,   49,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
       2,    2,    2,    2,    2,    2,    2,    2,   46,    2,    2,    2,    2,    2,    2,   11,
      11,    2,    2,    2,    2,    2,    2,   22,   22,    2,    2,    2,    2,    2,    2,    2,
@@ -300,23 +301,21 @@ hb_use_u8[3345] =
   VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw, MBlw,    B, MBlw, MBlw, VPst,VMPst,VMPst,    B, MBlw,
    VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMBlw,    B,VMPst, VBlw, VPst,  CGJ,  CGJ, VPst,VMAbv,VMAbv,
   FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,
-  CMAbv,CMAbv,    B,   GB,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv,
-   VPre,    B, MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv,
-   VPst,    H,    B,    O,SMAbv,SMAbv,SMAbv, VPst,   IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,
-  CMBlw,VMBlw,VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,
-     SE,    O,    H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,
-  CMAbv, VAbv, MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv,
-   FPst, VBlw,    B,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,
+  CMAbv,CMAbv,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre,    B,
+   MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,
+      B,    O,SMAbv,SMAbv,SMAbv, VPst,   IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,
+  VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,   SE,    O,
+      H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,CMAbv, VAbv,
+   MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv, FPst, VBlw,
+      B, VBlw,VMAbv,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,
      IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,    B,    N,    N,    O,   HN, VPre, VBlw, VAbv,
      IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw, VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,
       O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv,
-   VPst, MPst,    R, MPst,CMBlw,    B,FMBlw, VBlw,VMAbv,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,
-     IS, VBlw,   IS,    R, MBlw,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,
-      J,   HR,    G,    G,   HM,   HM,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O,
-   VBlw,
+   VPst, MPst,    R, MPst,CMBlw,    B,FMBlw,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,
+     IS,    R, MBlw,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,
+      G,    G,   HM,   HM,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
 };
-static const uint16_t
-hb_use_u16[856] =
+static const uint16_t hb_use_u16[864]=
 {
     0,  0,  1,  2,  0,  3,  0,  3,  0,  0,  4,  5,  0,  6,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,
@@ -330,66 +329,65 @@ hb_use_u16[856] =
    73, 74, 75, 76, 77,  0,  0,  0, 10, 10, 78, 79, 80, 81, 82, 83,
    84, 85,  0,  0,  0,  0,  0,  0, 10, 86, 10, 87, 10, 88, 89, 90,
    10, 10, 10, 91, 92, 93,  2,  0, 94,  0, 10, 10, 10, 10, 10, 95,
-   96, 10, 97,  0,  0,  0,  0,  0, 98, 99,100,101, 31, 10,102,103,
-   10, 10,104, 10,105,106,  0,  0, 10,107, 10, 10, 10,108,109,110,
-    2,  2,  0,  0,  0,  0,  0,  0,111, 10, 10,112,113,  2,114,115,
-  116, 10,117, 10, 10, 10,118,119, 10, 10,120,121,122,  0,  0,  0,
-    0,  0,  0,  0,  0,123,124,125,  0,  0,  0,  0,  0,  0,  0,126,
-  127,128,129,  0,  0,  0,130,131,132,  0,  0,  0,  0,  0,  0,133,
-    0,  0,  0,  0,134,  0,  0,  0,  0,  0,  0,  0,  0,  0,135,  0,
-    0,  0,  0, 10, 10, 10,136,137,  0,  0,138,  0,  0,  0,  0,  0,
-  139, 10,140,  0, 10, 10, 10,141,142, 10, 10,143,144,  2,145,146,
-   10, 10,147, 10,148,149,  0,  0,150, 10, 10,151,152,  2,153, 99,
-   10, 10,154,155,156,  2, 10,157, 10, 10, 10,158,159,  0,160,161,
-    0,  0,  0,  0, 10, 10,162,  2,163,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,164,  0,  0,  0,  0,  0,  0,  0,165,
-    0,  0,  0,  0,  0,  0,  0,166,166,167, 34,168,  0,  0,  0,  0,
-  169,170, 10,171, 95,  0,  0,  0,  0,  0,  0,  0, 70, 10,172,  0,
-   10,173,174,  0,  0,  0,  0,  0, 10, 10,175,  2,  9, 10,176, 10,
-  177,  0,  0,  0,  0,  0,  0,  0, 10, 10,178,173,  0,  0,  0,  0,
-    0,  0,  0, 10,179,180,  0, 10,181,  0,  0,182,183,  0,  0,  0,
-  184, 10, 10,185,186,187,188,189,190, 10, 10,191,192,  0,  0,  0,
-  193, 10,194,195,196, 10, 10,197,190, 10, 10,198,199,106,200,103,
-   10, 34,201,202,203,  0,  0,  0,204,205, 95, 10, 10,206,207,  2,
-  208, 21, 22,209,210,211,212,213,214, 10, 10,215,216,217,218,  0,
-   10, 10, 10,219,220,221,222,  0,200, 10, 10,223,224,  2,  0,  0,
-   10, 10,225,226,227,228,  0,  0, 10, 10, 10,229,230,  2,  0,  0,
-   10, 10,231,232,  2, 10,141,  0, 10,233,234,104,235,  0,  0,  0,
-   10, 10,236,237,  0,  0,  0,  0,238,239, 10,240,241,  2,  0,  0,
-    0,  0,242, 10, 10,243,244,  0,245, 10, 10,246,247,248, 10, 10,
-  249,250,  0,  0,  0,  0,  0,  0, 22, 10,225,251,  8, 10, 71, 19,
-   10,252, 74,253,  0,  0,  0,  0,254, 10, 10,255,256,  2,257, 10,
-  258,259,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,260,
-  261, 49, 10,262,263,264,  0,  0,265,265,265,265,265,265,265,265,
-  265,265,265,266,267,268,265,265,265,265,265,265,265,265,265,269,
-   10,270,271,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-   10, 10, 10,272,  0,  0,  0,  0,  0,  0,  0,  0,273, 10,274,  2,
-   10, 10, 10, 10,275,276,277,277,278,279,  0,  0,  0,  0,280,  0,
-   10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,177,  0,281,
-   10, 10, 10, 10, 10, 10,106, 71, 95,282,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,283, 10, 10, 71,284,285,  0,  0,  0,
-    0, 10,286,  0, 10, 10,287,  2,  0,  0,  0,  0,  0, 10,288,  2,
-    0,  0,  0,  0,  0, 10,289,106, 10, 10, 10, 10,290,  2,  0,  0,
-  130,130,130,130,130,130,130,130,163,163,163,163,163,163,163,163,
-  163,163,163,163,163,163,163,130,
+   96, 10, 97,  0,  0,  0,  0,  0, 10, 98, 99,100, 31, 10,101,102,
+   10, 10,103, 10,104,105,  0,  0, 10,106, 10, 10, 10,107,108,109,
+    2,  2,  0,  0,  0,  0,  0,  0,110, 10, 10,111,112,  2,113,114,
+  115, 10,116, 10, 10, 10,117,118, 10, 10,119,120,121,  0,  0,  0,
+    0,  0,  0,  0,  0,122,123,124,  0,  0,  0,  0,  0,  0,  0,125,
+  126,127,128,  0,  0,  0,129,130,131,  0,  0,  0,  0,  0,  0,132,
+    0,  0,  0,  0,133,  0,  0,  0,  0,  0,  0,  0,  0,  0,134,  0,
+    0,  0,  0, 10, 10, 10,135,136,  0,  0,137,  0,  0,  0,  0,  0,
+  138, 10,139,  0, 10, 10, 10,140,141, 10, 10,142,143,  2,144,145,
+   10, 10,146, 10,147,148,  0,  0,149, 10, 10,150,151,  2,152, 98,
+   10, 10,153,154,155,  2, 10,156, 10, 10, 10,157,158,  0,159,160,
+    0,  0,  0,  0, 10, 10,161,  2,162,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,163,  0,  0,  0,  0,  0,  0,  0,164,
+    0,  0,  0,  0,  0,  0,  0,165,165,166, 34,167,  0,  0,  0,  0,
+  168,169, 10,170, 95,  0,  0,  0,  0,  0,  0,  0, 70, 10,171,  0,
+   10,172,173,  0,  0,  0,  0,  0, 10, 10,174,  2,  9, 10,175, 10,
+  176,  0,  0,  0,  0,  0,  0,  0, 10, 10,177,172,  0,  0,  0,  0,
+    0,  0,  0, 10,178,179,  0, 10,180,  0,  0,181,182,  0,  0,  0,
+  183, 10, 10,184,185,186,187,188,189, 10, 10,190,191,  0,  0,  0,
+  192, 10,193,194,195, 10, 10,196,189, 10, 10,197,198,105,199,102,
+   10, 34,200,201,202,  0,  0,  0,203,204, 95, 10, 10,205,206,  2,
+  207, 21, 22,208,209,210,211,212,213, 10, 10,214,215,216,217,  0,
+   10, 10, 10,218,219,220,221,  0,199, 10, 10,222,223,  2,  0,  0,
+   10, 10,224,225,226,227,  0,  0, 10, 10, 10,228,229,  2,  0,  0,
+   10, 10,230,231,  2, 10,140,  0, 10,232,233,103,234,  0,  0,  0,
+   10, 10,235,236,  0,  0,  0,  0,237,238, 10,239,240,  2,  0,  0,
+    0,  0,241, 10, 10,242,243,  0,244, 10, 10,245,246,247, 10, 10,
+  248,249,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,250,  0,
+   22, 10,224,251,  8, 10, 71, 19, 10,252, 74,253,  0,  0,  0,  0,
+  254, 10, 10,255,256,  2,257, 10,258,259,  2,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 10,260,261, 49, 10,262,263,264,  0,  0,
+  265,265,265,265,265,265,265,265,265,265,265,266,267,268,265,265,
+  265,265,265,265,265,265,265,269, 10,270,271,  2,  0,  0,  0,  0,
+    0,  0,  0,  0,  2,  0,  0,  0, 10, 10, 10,272,  0,  0,  0,  0,
+    0,  0,  0,  0,273, 10,274,  2, 10, 10, 10, 10,275,276,277,277,
+  278,279,  0,  0,  0,  0,280,  0, 10, 10, 10, 10, 10, 10, 10, 10,
+   10, 10, 10, 10, 10,176,  0,281, 10, 10, 10, 10, 10, 10,105, 71,
+   95,282,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,283,
+   10, 10, 71,284,285,  0,  0,  0,  0, 10,286,  0, 10, 10,287,  2,
+    0,  0,  0,  0,  0, 10,288,  2,  0,  0,  0,  0,  0, 10,289,105,
+   10, 10, 10, 10,290,  2,  0,  0,129,129,129,129,129,129,129,129,
+  162,162,162,162,162,162,162,162,162,162,162,162,162,162,162,129,
 };
 
-static inline unsigned
-hb_use_b4 (const uint8_t* a, unsigned i)
+static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>1]>>((i&1u)<<2))&15u;
+  return (a[i>>1]>>((i&1)<<2))&15;
 }
-static inline uint_fast8_t
-hb_use_get_category (unsigned u)
+static inline uint8_t hb_use_get_category (unsigned u)
 {
-  return u<921600u?hb_use_u8[2953+(((hb_use_u8[625+(((hb_use_u16[((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>3>>5))<<5)+((u>>1>>3>>3)&31u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
+  return u<921600 ? hb_use_u8[2953u+((hb_use_u8[625u+((hb_use_u16[((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((u)>>1))>>3))>>3))>>5)))<<5)+((((((((u)>>1))>>3))>>3))&31)])<<3)+((((((u)>>1))>>3))&7)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : O;
 }
 
 
 #else
 
-static const uint8_t
-hb_use_u8[3657] =
+#include <stdint.h>
+
+static const uint8_t hb_use_u8[3663]=
 {
      16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   57,   58,   59,  195,  211,   62,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
@@ -405,16 +403,16 @@ hb_use_u8[3657] =
       1,    1,    1,    1,    1,    1,    1,    1,    1,   25,   26,   27,   28,    1,    1,    1,
       1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   29,
      30,    1,    1,    1,    1,    1,   31,    1,    1,    1,    1,   32,   33,    1,   34,   35,
-     36,   37,   38,   39,   40,   41,   42,   43,   44,   45,   46,   47,    1,   48,   49,   50,
-     51,   52,   52,   52,   52,   53,   52,   52,   52,   52,   52,   52,   52,   52,   52,   52,
-     52,   52,   52,   52,   54,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,   55,    1,    1,    1,    1,    1,    1,    1,    1,   56,   57,    1,   58,    1,
-     59,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   60,   61,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   62,    1,    1,
-      1,    1,   63,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,   64,   65,    1,   66,   67,    1,    1,    1,   68,    1,    1,    1,    1,    1,
-      1,   69,   70,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
-     69,    0,    1,    2,    2,    0,    3,    4,    0,    0,    0,    0,    0,    0,    0,    0,
+     36,   37,   38,   39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
+     52,   53,   53,   53,   53,   54,   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
+     53,   53,   53,   53,   55,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,   56,    1,    1,    1,    1,    1,    1,    1,    1,   57,   58,    1,   59,    1,
+     60,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   61,   62,    1,    1,
+      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   63,    1,    1,
+      1,    1,   64,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,   65,   66,    1,   67,   68,    1,    1,    1,   69,    1,    1,    1,    1,    1,
+      1,   70,   71,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
+     70,    0,    1,    2,    2,    0,    3,    4,    0,    0,    0,    0,    0,    0,    0,    0,
       0,    0,    0,    5,    0,    0,    0,    0,    0,    0,    0,    6,    0,    0,    0,    0,
       0,    0,    0,    0,    0,    0,    0,    7,    8,    0,    0,    9,    0,    0,    0,    0,
       0,   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
@@ -438,120 +436,120 @@ hb_use_u8[3657] =
       0,    0,    0,    0,    0,   56,  179,  180,    0,   56,  181,  182,    0,   56,  183,  184,
     185,  186,  187,  188,    0,    0,    0,    0,    0,   56,  189,    0,    0,    0,    0,    0,
       0,  190,  191,  192,    0,    0,  193,  194,  195,  196,  197,  198,   56,  199,    0,    0,
-      0,  200,  201,  202,  203,  204,  205,    0,    0,  206,  207,  208,  209,  210,   67,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,  211,  212,  213,  214,    0,    0,    0,    0,
-      0,  215,  215,  215,  215,  215,  215,  215,  215,  215,  216,  217,  215,  215,  215,  215,
-    215,  215,  215,  215,  215,  215,  215,  215,  218,  219,  220,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,   67,    0,   56,  221,    0,    0,    0,    0,    0,
-      0,    0,    0,  222,  223,    0,    0,    0,    0,   56,   56,  224,  225,  226,    0,    0,
-    227,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,  228,
-    229,   56,   56,   56,  230,  231,    0,    0,    0,    0,    0,    0,  232,    0,    0,    0,
-      0,   56,  233,  234,    0,    0,    0,    0,    0,    0,    0,    0,    0,  101,  235,   56,
-    236,    0,    0,    0,    0,    0,    0,  101,  237,    0,    0,    0,    0,    0,    0,  101,
-    238,   56,   56,  239,    0,    0,    0,    0,    0,  240,  240,  240,  240,  240,  240,  240,
-    240,  241,  241,  241,  241,  241,  241,  241,  242,    0,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    1,    0,    2,    2,    2,    2,    2,    0,    0,
-      0,    0,    0,    0,    0,    0,    3,    4,    0,    5,    0,    0,    0,    0,    0,    6,
-      0,    0,    7,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,    8,    9,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,   10,   11,   11,   11,   11,    0,    0,    0,    9,   12,
-      0,    2,    2,    2,    2,   13,   14,    0,    0,   11,   15,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,   16,   17,   18,   19,   20,   21,   22,   16,   23,   24,
-     25,   12,   26,   27,   20,    2,    2,    2,    2,    2,   20,    0,    2,    2,    2,    2,
-      2,    0,    2,    2,    2,    2,    2,    2,    2,   28,   29,   30,    2,    2,    2,    9,
-     30,    9,   30,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    9,    2,    2,
-      2,    9,    9,    0,    2,    2,    0,   17,   18,   19,   20,   31,   32,   33,   32,   34,
-      0,    0,    0,    0,   35,    0,    0,    2,   30,    2,    0,    0,    0,    0,    0,    9,
-     36,   12,   15,   30,    2,    2,    9,    0,   30,    9,    2,   30,    9,    2,    0,   37,
-     18,   19,   31,    0,   27,   38,   27,   39,    0,   40,    0,    0,    0,   30,    2,    9,
-      9,    0,    0,    0,    2,    2,    2,    2,    2,   41,   42,   43,    0,    0,    0,    0,
-      0,   12,   15,   30,    2,    2,    2,    2,   30,    2,   30,    2,    2,    2,    2,    2,
-      2,    9,    2,   30,    2,    2,    0,   17,   18,   19,   20,   21,   27,   22,   35,   24,
-      0,    0,    0,    0,    0,   30,   41,   41,   44,   12,   29,   30,    2,    2,    2,    9,
-     30,    9,    2,   30,    2,    2,    0,   17,   45,    0,    0,   27,   22,    0,    0,    2,
-     30,   30,    0,    0,    0,    0,    0,    0,    0,    0,   46,   30,    2,    2,    9,    0,
-      2,    9,    2,    2,    0,   30,    9,    9,    2,    0,   30,    9,    0,    2,    9,    0,
-      2,    2,    2,    2,    2,    2,    0,    0,   23,   16,   47,    0,   48,   33,   48,   34,
-      0,    0,    0,    0,   35,    0,    0,    0,    0,   15,   29,   49,    2,    2,    2,    9,
-      2,    9,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    0,   17,
-     22,   16,   23,   47,   22,   38,   22,   39,    0,    0,    0,   27,   31,    2,    9,    0,
-      0,   10,   29,   30,    2,    2,    2,    9,    2,    2,    2,   30,    2,    2,    0,   17,
-     45,    0,    0,   35,   47,    0,    0,    0,    9,   50,   51,    0,    0,    0,    0,    0,
-      0,   11,   29,    2,    2,    2,    2,    9,    2,    2,    2,    2,    2,    2,   52,   53,
-     23,   19,   20,   31,   48,   33,   48,   34,   54,    0,    0,    0,   35,    0,    0,    0,
-     30,   12,   29,   30,    2,    2,    2,    2,    2,    2,    2,    2,    9,    0,    2,    2,
-      2,    2,   30,    2,    2,    2,    2,   30,    0,    2,    2,    2,    9,    0,   55,    0,
-     35,   23,   22,   31,   31,   18,   48,   48,   25,    0,   23,    0,    0,    0,    0,    0,
-      0,    2,    0,    2,    9,    0,    0,    0,    0,    0,    0,    0,    0,   20,    0,    0,
-      0,    2,    2,   56,   56,   57,    0,    0,   18,    2,    2,    2,    2,   30,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    9,    0,   58,   21,   59,   22,   22,   20,   20,
-     46,   21,   11,   31,   11,    2,    2,   60,   61,   61,   61,   61,   61,   62,   61,   61,
-     61,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,   63,
-      0,    0,    0,    0,   64,    0,    0,    0,    0,    2,    2,    2,    2,    2,   65,   45,
-     59,   66,   22,   22,   67,   68,   69,   70,   71,    2,    2,    2,    2,    2,    1,    0,
-      5,    2,    2,    2,   23,   20,    2,    2,   72,   71,   73,   74,   65,   73,   29,   29,
-      2,   52,   22,   53,    2,    2,    2,    2,    2,    2,   75,   76,   77,   29,   29,   78,
-     79,    2,    2,    2,    2,    2,   29,   45,    0,    2,   59,   80,    0,    0,    0,    0,
-     30,    2,   59,   47,    0,    0,    0,    0,    0,    2,   59,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    2,    9,    2,    9,   59,    0,    0,    0,    0,    0,
-      0,    2,    2,   81,   45,   22,   59,   20,   48,   48,   48,   48,   15,   82,   83,   84,
-     85,   86,   87,    0,    0,    0,    0,   88,    0,    9,    0,    0,   30,    0,   89,   81,
-     90,    2,    2,    2,    2,    9,    0,    0,    0,   42,   42,   91,   92,    2,    2,    2,
-      2,    2,    2,    2,    2,   13,    9,    0,    0,   93,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    2,    9,   22,   80,   45,   22,   94,   61,    0,
-      0,   95,   96,   95,   95,   97,   98,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+      0,    0,    0,    0,  200,    0,    0,    0,    0,  201,  202,  203,  204,  205,  206,    0,
+      0,  207,  208,  209,  210,  211,   67,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    212,  213,  214,  215,    0,    0,    0,    0,    0,  216,  216,  216,  216,  216,  216,  216,
+    216,  216,  217,  218,  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,
+    219,  220,  221,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   67,
+      0,   56,  222,    0,    0,    0,    0,    0,    0,    0,    0,  223,  224,    0,    0,    0,
+      0,   56,   56,  225,  226,  227,    0,    0,  228,   56,   56,   56,   56,   56,   56,   56,
+     56,   56,   56,   56,   56,   56,   56,  229,  230,   56,   56,   56,  231,  232,    0,    0,
+      0,    0,    0,    0,  233,    0,    0,    0,    0,   56,  234,  235,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,  101,  236,   56,  237,    0,    0,    0,    0,    0,    0,  101,
+    238,    0,    0,    0,    0,    0,    0,  101,  239,   56,   56,  240,    0,    0,    0,    0,
+      0,  241,  241,  241,  241,  241,  241,  241,  241,  242,  242,  242,  242,  242,  242,  242,
+    243,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+      0,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    3,    4,
+      0,    5,    0,    0,    0,    0,    0,    6,    0,    0,    7,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      8,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   10,   11,
+     11,   11,   11,    0,    0,    0,    9,   12,    0,    2,    2,    2,    2,   13,   14,    0,
+      0,   11,   15,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   16,   17,
+     18,   19,   20,   21,   22,   16,   23,   24,   25,   12,   26,   27,   20,    2,    2,    2,
+      2,    2,   20,    0,    2,    2,    2,    2,    2,    0,    2,    2,    2,    2,    2,    2,
+      2,   28,   29,   30,    2,    2,    2,    9,   30,    9,   30,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    9,    2,    2,    2,    9,    9,    0,    2,    2,    0,   17,
+     18,   19,   20,   31,   32,   33,   32,   34,    0,    0,    0,    0,   35,    0,    0,    2,
+     30,    2,    0,    0,    0,    0,    0,    9,   36,   12,   15,   30,    2,    2,    9,    0,
+     30,    9,    2,   30,    9,    2,    0,   37,   18,   19,   31,    0,   27,   38,   27,   39,
+      0,   40,    0,    0,    0,   30,    2,    9,    9,    0,    0,    0,    2,    2,    2,    2,
+      2,   41,   42,   43,    0,    0,    0,    0,    0,   12,   15,   30,    2,    2,    2,    2,
+     30,    2,   30,    2,    2,    2,    2,    2,    2,    9,    2,   30,    2,    2,    0,   17,
+     18,   19,   20,   21,   27,   22,   35,   24,    0,    0,    0,    0,    0,   30,   41,   41,
+     44,   12,   29,   30,    2,    2,    2,    9,   30,    9,    2,   30,    2,    2,    0,   17,
+     45,    0,    0,   27,   22,    0,    0,    2,   30,   30,    0,    0,    0,    0,    0,    0,
+      0,    0,   46,   30,    2,    2,    9,    0,    2,    9,    2,    2,    0,   30,    9,    9,
+      2,    0,   30,    9,    0,    2,    9,    0,    2,    2,    2,    2,    2,    2,    0,    0,
+     23,   16,   47,    0,   48,   33,   48,   34,    0,    0,    0,    0,   35,    0,    0,    0,
+      0,   15,   29,   49,    2,    2,    2,    9,    2,    9,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    0,   17,   22,   16,   23,   47,   22,   38,   22,   39,
+      0,    0,    0,   27,   31,    2,    9,    0,    0,   10,   29,   30,    2,    2,    2,    9,
+      2,    2,    2,   30,    2,    2,    0,   17,   45,    0,    0,   35,   47,    0,    0,    0,
+      9,   50,   51,    0,    0,    0,    0,    0,    0,   11,   29,    2,    2,    2,    2,    9,
+      2,    2,    2,    2,    2,    2,   52,   53,   23,   19,   20,   31,   48,   33,   48,   34,
+     54,    0,    0,    0,   35,    0,    0,    0,   30,   12,   29,   30,    2,    2,    2,    2,
+      2,    2,    2,    2,    9,    0,    2,    2,    2,    2,   30,    2,    2,    2,    2,   30,
+      0,    2,    2,    2,    9,    0,   55,    0,   35,   23,   22,   31,   31,   18,   48,   48,
+     25,    0,   23,    0,    0,    0,    0,    0,    0,    2,    0,    2,    9,    0,    0,    0,
+      0,    0,    0,    0,    0,   20,    0,    0,    0,    2,    2,   56,   56,   57,    0,    0,
+     18,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,    2,    2,    9,
+      0,   58,   21,   59,   22,   22,   20,   20,   46,   21,   11,   31,   11,    2,    2,   60,
+     61,   61,   61,   61,   61,   62,   61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+     61,   61,   61,   61,   61,   61,   61,   63,    0,    0,    0,    0,   64,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   65,   45,   59,   66,   22,   22,   67,   68,   69,   70,
+     71,    2,    2,    2,    2,    2,    1,    0,    5,    2,    2,    2,   23,   20,    2,    2,
+     72,   71,   73,   74,   65,   73,   29,   29,    2,   52,   22,   53,    2,    2,    2,    2,
+      2,    2,   75,   76,   77,   29,   29,   78,   79,    2,    2,    2,    2,    2,   29,   45,
+      0,    2,   59,   80,    0,    0,    0,    0,   30,    2,   59,   47,    0,    0,    0,    0,
+      0,    2,   59,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    9,
+      2,    9,   59,    0,    0,    0,    0,    0,    0,    2,    2,   81,   45,   22,   59,   20,
+     48,   48,   48,   48,   15,   82,   83,   84,   85,   86,   87,    0,    0,    0,    0,   88,
+      0,    9,    0,    0,   30,    0,   89,   81,   90,    2,    2,    2,    2,    9,    0,    0,
+      0,   42,   42,   91,   92,    2,    2,    2,    2,    2,    2,    2,    2,   13,    9,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,    9,   22,   80,   45,   22,   93,   61,    0,
+      0,   94,   95,   94,   94,   96,   97,    0,    0,    2,    2,    2,    2,    2,    2,    2,
       0,    2,    2,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    0,
       0,    2,    2,    2,    2,   29,    0,    0,    0,    2,    2,    2,    2,    2,    9,    0,
-      0,    2,    2,    2,   52,   99,   45,    0,    0,    2,    2,  100,  101,  102,  103,   61,
-     63,  104,   16,   45,   22,   59,   21,   80,   48,   48,   76,   11,   11,   11,  105,   46,
-     40,   11,  106,   74,    2,    2,    2,    2,    2,    2,    2,  107,   22,   20,   20,   22,
-     48,   48,   22,  108,    2,    2,    2,    9,    0,    0,    0,    0,    0,    0,  109,  110,
-    110,  110,  110,    0,    0,    0,    0,    0,    0,  106,   74,    2,    2,    2,    2,    2,
-      2,   60,   61,   59,   25,   22,  111,   61,    2,    2,    2,    2,  107,   22,   23,   45,
-     45,  102,  112,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  113,
-    102,  102,  102,  114,  115,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   30,
-      2,   11,   46,  116,  116,  116,   11,  116,  116,   15,  116,  116,  116,   26,    0,   40,
-      0,    0,    0,  117,   51,   11,    5,    0,    0,    0,    0,    0,    0,    0,  118,    0,
-      0,    0,    0,    0,    0,    0,    6,  119,  120,   42,   42,    5,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,  120,  120,  121,  120,  120,  120,  120,  120,  120,  120,
-    120,    0,    0,  122,    0,    0,    0,    0,    0,    0,    7,  122,    0,    0,    0,    0,
+      0,    2,    2,    2,   52,   98,   45,    0,    0,    2,    2,   99,  100,  101,  102,   61,
+     63,  103,   16,   45,   22,   59,   21,   80,   48,   48,   76,   11,   11,   11,  104,   46,
+     40,   11,  105,   74,    2,    2,    2,    2,    2,    2,    2,  106,   22,   20,   20,   22,
+     48,   48,   22,  107,    2,    2,    2,    9,    0,    0,    0,    0,    0,    0,  108,  109,
+    109,  109,  109,    0,    0,    0,    0,    0,    0,  105,   74,    2,    2,    2,    2,    2,
+      2,   60,   61,   59,   25,   22,  110,   61,    2,    2,    2,    2,  106,   22,   23,   45,
+     45,  101,  111,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  112,
+    101,  101,  101,  113,  114,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   30,
+      2,   11,   46,  115,  115,  115,   11,  115,  115,   15,  115,  115,  115,   26,    0,   40,
+      0,    0,    0,  116,   51,   11,    5,    0,    0,    0,    0,    0,    0,    0,  117,    0,
+      0,    0,    0,    0,    0,    0,    6,  118,  119,   42,   42,    5,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,  119,  119,  120,  119,  119,  119,  119,  119,  119,  119,
+    119,    0,    0,  121,    0,    0,    0,    0,    0,    0,    7,  121,    0,    0,    0,    0,
       0,   46,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    9,
-      0,    0,    0,    0,  123,  123,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
-     30,    0,    0,    0,    0,    0,    0,    0,  124,    0,  123,  123,    0,    0,    0,    0,
-      0,    2,   53,    2,  108,    2,   10,    2,    2,    2,   65,   19,   16,    0,    0,   31,
+      0,    0,    0,    0,  122,  122,    0,    0,    0,    2,    2,    2,    2,    0,    0,    0,
+     30,    0,    0,    0,    0,    0,    0,    0,  123,    0,  122,  122,    0,    0,    0,    0,
+      0,    2,   53,    2,  107,    2,   10,    2,    2,    2,   65,   19,   16,    0,    0,   31,
       0,    2,    2,    0,    0,    0,    0,    0,    0,   29,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,  125,   23,   23,   23,   23,   23,   23,   23,  126,    0,    0,    0,    0,
+      2,    2,    2,  124,   23,   23,   23,   23,   23,   23,   23,  125,    0,    0,    0,    0,
       0,   11,   11,   11,   11,   11,   11,   11,   11,   11,    2,    0,    0,    0,    0,    0,
-     52,    2,    2,    2,   22,   22,  127,  116,    0,    2,    2,    2,  128,   20,   59,   20,
-    113,  102,  129,    0,    0,    0,    0,    0,    0,   11,  130,    2,    2,    2,    2,    2,
-      2,    2,  131,   23,   22,   20,   48,  132,  133,  134,    0,    0,    0,    0,    0,    0,
+     52,    2,    2,    2,   22,   22,  126,  115,    0,    2,    2,    2,  127,   20,   59,   20,
+    112,  101,  128,    0,    0,    0,    0,    0,    0,   11,  129,    2,    2,    2,    2,    2,
+      2,    2,  130,   23,   22,   20,   48,  131,  132,  133,    0,    0,    0,    0,    0,    0,
       0,    2,    2,   52,   30,    2,    2,    2,    2,    2,    2,    2,    2,   10,   22,   59,
-     99,   76,  135,  136,  137,    0,    0,    0,    0,    2,  138,    2,    2,    2,    2,  139,
-      0,   30,    2,   42,    5,    0,   79,   15,    2,   53,   22,  140,   52,   53,    2,    2,
-    105,   10,    9,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  141,   21,
+     98,   76,  134,  135,  136,    0,    0,    0,    0,    2,  137,    2,    2,    2,    2,  138,
+      0,   30,    2,   42,    5,    0,   79,   15,    2,  139,   20,   53,  127,  139,    2,    2,
+    140,   10,    9,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  141,   21,
      25,    0,    0,  142,  143,    0,    0,    0,    0,    2,   65,   45,   23,   80,   47,  144,
       0,   81,   81,   81,   81,   81,   81,   81,   81,    0,    0,    0,    0,    0,    0,    0,
-      6,  120,  120,  120,  120,  121,    0,    0,    0,    2,    2,    2,    2,    2,    9,    2,
+      6,  119,  119,  119,  119,  120,    0,    0,    0,    2,    2,    2,    2,    2,    9,    2,
       2,    2,    9,    2,   30,    2,    2,    2,    2,    2,   30,    2,    2,    2,   30,    9,
-      0,  128,   20,   27,   31,    0,    0,  145,  146,    2,    2,   30,    2,   30,    2,    2,
+      0,  127,   20,   27,   31,    0,    0,  145,  146,    2,    2,   30,    2,   30,    2,    2,
       2,    2,    2,    2,    0,   14,   37,    0,  147,    2,    2,   13,   37,    0,   30,    2,
       2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,
       9,    2,    2,   11,   41,    0,    0,    0,    0,    2,    2,    2,    0,   27,   22,   22,
      30,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   27,   38,
-      0,    2,    2,    2,  116,  116,  116,  116,  116,  148,    2,    9,    0,    0,    0,    0,
+      0,    2,    2,    2,  115,  115,  115,  115,  115,  148,    2,    9,    0,    0,    0,    0,
       0,    2,   14,   14,    0,    0,    0,    0,    0,    9,    2,    2,    9,    2,    2,    2,
       2,   30,    2,    9,    0,   30,    2,    0,    0,  149,  150,  151,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,   22,   22,   20,   20,   20,   22,   22,  134,    0,    0,    0,
+      2,    2,    2,    2,    2,   22,   22,   20,   20,   20,   22,   22,  133,    0,    0,    0,
       0,    0,  152,  152,  152,  152,  152,  152,  152,  152,  152,  152,    2,    2,    2,    2,
       2,   53,   52,   53,    0,    0,    0,    0,  153,   11,   74,    2,    2,    2,    2,    2,
       2,   18,   19,   21,   16,   24,   37,    0,    0,    0,   31,    0,    0,    0,    0,    0,
-      0,   11,   49,    2,    2,    2,    2,    2,    2,    2,    2,    2,  128,   20,   22,  154,
+      0,   11,   49,    2,    2,    2,    2,    2,    2,    2,    2,    2,  127,   20,   22,  154,
      22,   21,  155,  156,    2,    2,    2,    2,    2,    0,    0,   65,  157,    0,    0,    0,
       0,    2,   13,    0,    0,    0,    0,    0,    0,    2,   65,   25,   20,   20,   20,   22,
-     22,  108,  158,    0,    0,   56,  159,   31,  160,   30,    2,    2,    2,    2,    2,    2,
+     22,  107,  158,    0,    0,   56,  159,   31,  160,   30,    2,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,   23,   19,   22,   22,  161,   44,    0,    0,    0,
-     49,  128,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    9,    9,    2,    2,
+     49,  127,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    9,    9,    2,    2,
      30,    2,    2,    2,    2,    2,    2,    2,   30,    2,    2,    2,    2,    2,    2,    2,
      10,   18,   19,   21,   22,  162,   31,    0,    0,   11,   11,   30,    2,    2,    2,    9,
      30,    9,    2,   30,    2,    2,   58,   17,   23,   16,   23,   47,   32,   33,   32,   34,
@@ -559,70 +557,69 @@ hb_use_u8[3657] =
       0,   11,   11,   46,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   30,    0,
       9,    2,    2,    2,   30,   45,   59,   20,   20,   31,   33,   32,   32,   25,  163,   29,
     164,  165,   37,    0,    0,    0,    0,    0,    0,   12,   26,    0,    0,    0,    0,    0,
-      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  126,   15,   17,    0,    0,    0,
+      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  125,   15,   17,    0,    0,    0,
       0,    2,    2,    2,    2,    2,    0,    0,  166,  167,    0,    0,    0,    0,    0,    0,
-      0,   18,   19,   20,   20,   66,   99,   25,  160,   11,  168,    9,    0,    0,    0,    0,
+      0,   18,   19,   20,   20,   66,   98,   25,  160,   11,  168,    9,    0,    0,    0,    0,
       0,    2,    2,    2,    2,    2,    2,    2,   65,   25,   20,   20,    0,   48,   48,   11,
     169,   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   20,
       0,   23,   19,   20,   20,   21,   16,   82,  169,   38,    0,    0,    0,    0,    0,    0,
       0,    2,    2,    2,    2,    2,   10,  170,   25,   20,   22,   22,  168,    9,    0,    0,
-      0,    2,    2,    2,    2,    2,    9,   43,  136,   23,   22,   20,   76,   21,   22,    0,
+      0,    2,    2,    2,    2,    2,    9,   43,  135,   23,   22,   20,   76,   21,   22,    0,
       0,    2,    2,    2,    9,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   18,
-     19,   20,   21,   22,  105,  169,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
+     19,   20,   21,   22,  104,  169,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
       2,    2,    2,   30,    9,    2,    2,    2,    2,   23,   23,   18,   32,   33,   12,  171,
     165,  172,  173,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
-      2,   65,   25,   20,   20,    0,   22,   23,   29,  108,    0,   33,    0,    0,    0,    0,
-      0,   52,   20,   22,   22,   22,  140,    2,    2,    2,  174,  175,   11,   15,  176,   61,
-    177,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
-      2,    2,    2,  158,  158,  158,  178,  178,  178,  178,  178,  178,   15,  179,    0,   30,
-      0,   22,   20,   20,   31,   22,   22,   11,  169,    0,   61,   61,   61,   61,   61,   61,
-     61,   66,   21,   82,   46,    0,    0,    0,    0,    2,    2,    2,    9,    2,   30,    2,
-      2,   52,   22,   22,   31,    0,   38,   22,   27,   11,  159,  180,  181,    0,    0,    0,
-      0,    2,    2,    2,   30,    9,    2,    2,    2,    2,    2,    2,    2,    2,   23,   23,
-     47,   22,   35,   82,   68,    0,    0,    0,    0,    2,  182,   66,   47,    0,    0,    0,
-      0,   11,  183,    2,    2,    2,    2,    2,    2,    2,    2,   23,   22,   20,   31,    0,
-     48,   16,  143,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  156,    0,
-      0,  184,  184,  184,  184,  184,  184,  184,  184,  185,  185,  185,  186,  187,  185,  184,
-    184,  188,  184,  184,  189,  190,  190,  190,  190,  190,  190,  190,    0,    0,    0,    0,
-      0,  184,  184,  184,  184,  184,  191,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-     22,   22,   22,   22,   22,   22,  192,  193,  194,   11,   11,   11,   46,    0,    0,    0,
-      0,   29,   74,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   65,   47,
-      0,    2,    2,    2,    2,    2,    9,    0,   58,  195,   20,   20,   20,   20,   20,   20,
-     20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,    0,    0,    0,
-     40,  116,   26,    0,    0,    0,    0,    0,    0,    0,    0,    9,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,    2,    2,    2,    0,   58,
-     37,    0,    6,  120,  120,  120,  121,    0,    0,   11,   11,   11,   49,    2,    2,    2,
-      0,    2,    2,    2,    2,    2,    0,    0,    2,    2,    2,    2,    2,    2,    2,    2,
-     46,    2,    2,    2,    2,    2,    2,   11,   11,    2,    2,    2,    2,    2,    2,   22,
-     22,    2,    2,    2,    2,    2,    2,    2,   20,    2,    2,   44,   44,   44,   92,    0,
-      0,    O,    O,    O,   GB,    B,    B,    O,   SB,    O,   SE,   GB,    O,    O,   WJ,FMPst,
-  FMPst,    O,  CGJ,    B,    O,    B,VMAbv,VMAbv,VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,
-  VMPst, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst,
-   VPst, VPst,    H, VPre, VPst,VMBlw,    O,    O, VAbv,   GB,VMAbv,VMPst,VMPst,    O,    B, VBlw,
-      O,    O, VPre, VPre,    O, VPre,    H,    O, VPst,FMAbv,    O,CMBlw,    O, VAbv,    O, VAbv,
-      H,    O,VMBlw,VMAbv,CMAbv,   GB,   GB,    O, MBlw,CMAbv,CMAbv, VPst, VAbv,VMAbv,    O, VPst,
-      O, VPre, VPre,VMAbv,    B,    O,   CS,   CS,VMPst,    B, VAbv, VAbv,    B,    R,    O,  HVM,
-      O,    O,FMBlw,    O,CMAbv,    O,CMBlw, VAbv, VBlw,    B,  SUB,  SUB,  SUB,    O,  SUB,  SUB,
-      O,FMBlw,    O,    B, VPst, VBlw, VPre,VMAbv,VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw, MBlw,
-      B, MBlw, MBlw, VPst,VMPst,VMPst,    B, MBlw, VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMBlw,    B,
-  VMPst, VBlw, VPst,  CGJ,  CGJ, VPst,VMAbv,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,
-  FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,CMAbv,CMAbv,    B,   GB,    B, VAbv,  SUB, FPst,
-   FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre,    B, MPre, MBlw,  SUB, FAbv, FAbv, MAbv,
-    SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,    B,    O,SMAbv,SMAbv,SMAbv, VPst,
-     IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,
-    CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,   SE,    O,    H, MPst, VPst,    H,VMAbv, VAbv,
-  VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,CMAbv, VAbv, MBlw, MPst, MBlw,    H,    O, VBlw,
-   MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv, FPst, VBlw,    B,    B, VPre,    O,VMPst,   IS,
-      O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,   IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,
-      B,    N,    N,    O,   HN, VPre, VBlw, VAbv,   IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw,
-   VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,    O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,
-     CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv, VPst, MPst,    R, MPst,CMBlw,    B,FMBlw, VBlw,
-  VMAbv,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,   IS,    R, MBlw,   GB, VAbv,    R,
-  VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,    G,    G,   HM,   HM,   HM,    G,
-      O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
+      2,   65,   25,   20,   20,    0,   22,   23,   29,  107,    0,   33,    0,    0,    0,    0,
+      0,   52,   20,   22,   22,   22,  139,    2,    2,    2,  174,  140,   11,   15,  175,   61,
+    176,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
+      2,    2,    2,  158,  158,  158,  177,  177,  177,  177,  177,  177,   15,  178,    0,   30,
+      0,   16,   20,   16,   16,    0,    0,    0,    0,   22,   20,   20,   31,   22,   22,   11,
+    169,    0,   61,   61,   61,   61,   61,   61,   61,   66,   21,   82,   46,    0,    0,    0,
+      0,    2,    2,    2,    9,    2,   30,    2,    2,   52,   22,   22,   31,    0,   38,   22,
+     27,   11,  159,  179,  180,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
+      2,    2,    2,    2,    2,    2,   23,   23,   47,   22,   35,   82,   68,    0,    0,    0,
+      0,    2,  181,   66,   47,    0,    0,    0,    0,   11,  182,    2,    2,    2,    2,    2,
+      2,    2,    2,   23,   22,   20,   31,    0,   48,   16,  143,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,  156,    0,    0,  183,  183,  183,  183,  183,  183,  183,
+    183,  184,  184,  184,  185,  186,  184,  183,  183,  187,  183,  183,  188,  189,  189,  189,
+    189,  189,  189,  189,    0,    0,    0,    0,    0,  183,  183,  183,  183,  183,  190,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   22,   22,   22,   22,   22,   22,  191,  192,
+    193,   11,   11,   11,   46,    0,    0,    0,    0,   29,   74,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   65,   47,    0,    2,    2,    2,    2,    2,    9,    0,
+     58,  194,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+     20,   20,   20,   20,   20,    0,    0,    0,   40,  115,   26,    0,    0,    0,    0,    0,
+      0,    0,    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     30,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  119,  119,  119,  120,    0,
+      0,   11,   11,   11,   49,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
+      2,    2,    2,    2,    2,    2,    2,    2,   46,    2,    2,    2,    2,    2,    2,   11,
+     11,    2,    2,    2,    2,    2,    2,   22,   22,    2,    2,    2,    2,    2,    2,    2,
+     20,    2,    2,   44,   44,   44,   92,    0,    0,    O,    O,    O,   GB,    B,    B,    O,
+     SB,    O,   SE,   GB,    O,    O,   WJ,FMPst,FMPst,    O,  CGJ,    B,    O,    B,VMAbv,VMAbv,
+  VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst,
+   VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst,    H, VPre, VPst,VMBlw,    O,    O,
+   VAbv,   GB,VMAbv,VMPst,VMPst,    O,    B, VBlw,    O,    O, VPre, VPre,    O, VPre,    H,    O,
+   VPst,FMAbv,    O,CMBlw,    O, VAbv,    O, VAbv,    H,    O,VMBlw,VMAbv,CMAbv,   GB,   GB,    O,
+   MBlw,CMAbv,CMAbv, VPst, VAbv,VMAbv,    O, VPst,    O, VPre, VPre,VMAbv,    B,    O,   CS,   CS,
+  VMPst,    B, VAbv, VAbv,    B,    R,    O,  HVM,    O,    O,FMBlw,    O,CMAbv,    O,CMBlw, VAbv,
+   VBlw,    B,  SUB,  SUB,  SUB,    O,  SUB,  SUB,    O,FMBlw,    O,    B, VPst, VBlw, VPre,VMAbv,
+  VMBlw,VMPst,   IS, VAbv, MPst, MPre, MBlw, MBlw,    B, MBlw, MBlw, VPst,VMPst,VMPst,    B, MBlw,
+   VPst, VPre, VAbv, VAbv,VMPst,VMPst,VMBlw,    B,VMPst, VBlw, VPst,  CGJ,  CGJ, VPst,VMAbv,VMAbv,
+  FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,
+  CMAbv,CMAbv,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre,    B,
+   MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,
+      B,    O,SMAbv,SMAbv,SMAbv, VPst,   IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,
+  VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,   SE,    O,
+      H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,CMAbv, VAbv,
+   MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv, FPst, VBlw,
+      B, VBlw,VMAbv,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,
+     IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,    B,    N,    N,    O,   HN, VPre, VBlw, VAbv,
+     IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw, VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,
+      O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv,
+   VPst, MPst,    R, MPst,CMBlw,    B,FMBlw,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,
+     IS,    R, MBlw,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,
+      G,    G,   HM,   HM,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
 };
-static const uint16_t
-hb_use_u16[486] =
+static const uint16_t hb_use_u16[488]=
 {
     0,  0,  1,  2,  0,  3,  4,  5,  0,  6,  7,  0,  8,  0,  9, 10,
    11, 12, 10, 13, 14, 10, 10, 15, 16, 17, 18, 19, 20, 21, 22, 23,
@@ -633,43 +630,43 @@ hb_use_u16[486] =
    31, 66, 67, 68, 10, 69, 70, 10, 71, 72, 73, 74, 75, 76, 77,  0,
    10, 10, 78, 79, 80, 81, 82, 83, 84, 85, 10, 86, 10, 87, 10, 88,
    89, 90, 10, 91, 92, 93,  2,  0, 94,  0, 10, 95, 96, 10, 97,  0,
-   98, 99,100,101, 31, 10,102,103,104, 10,105,106, 10,107, 10,108,
-  109,110,  2,  2,111, 10, 10,112,113,  2,114,115,116, 10,117, 10,
-  118,119,120,121,122,  0,  0,123,124,125,  0,126,127,128,129,  0,
-  130,131,132,  0,  0,133,134,  0,135,  0,  0, 10,136,137,138,  0,
-  139, 10,140,  0, 10,141,142, 10, 10,143,144,  2,145,146,147, 10,
-  148,149,150, 10, 10,151,152,  2,153, 99,154,155,156,  2, 10,157,
-   10,158,159,  0,160,161,162,  2,163,  0,  0,164,  0,165,  0,166,
-  166,167, 34,168,169,170, 10,171, 95,  0,172,  0, 10,173,174,  0,
-  175,  2,176, 10,177,  0,178,173,179,180,181,  0,  0,182,183,  0,
-  184, 10, 10,185,186,187,188,189,190, 10, 10,191,192,  0,193, 10,
-  194,195,196, 10, 10,197, 10,198,199,106,200,103, 10, 34,201,202,
-  203,  0,204,205, 95, 10, 10,206,207,  2,208, 21, 22,209,210,211,
-  212,213,214, 10, 10,215,216,217,218,  0, 10,219,220,221,222,  0,
-  200, 10, 10,223,224,  2,225,226,227,228, 10,229,230,  2,231,232,
-    2, 10,141,  0, 10,233,234,104,235,  0,236,237,238,239, 10,240,
-  241,  2,242, 10, 10,243,244,  0,245, 10, 10,246,247,248,249,250,
-   22, 10,225,251,  8, 10, 71, 19, 10,252, 74,253,254, 10, 10,255,
-  256,  2,257, 10,258,259, 10,260,261, 49, 10,262,263,264,265,265,
-  265,266,267,268,265,269, 10,270,271,  2, 10,272,273, 10,274,  2,
-  275,276,277,277,278,279,280,  0, 10,177,  0,281,106, 71, 95,282,
-    0,283, 71,284,285,  0,286,  0,287,  2,288,  2,289,106,290,  2,
-  130,130,163,163,163,130,
+   10, 98, 99,100, 31, 10,101,102,103, 10,104,105, 10,106, 10,107,
+  108,109,  2,  2,110, 10, 10,111,112,  2,113,114,115, 10,116, 10,
+  117,118,119,120,121,  0,  0,122,123,124,  0,125,126,127,128,  0,
+  129,130,131,  0,  0,132,133,  0,134,  0,  0, 10,135,136,137,  0,
+  138, 10,139,  0, 10,140,141, 10, 10,142,143,  2,144,145,146, 10,
+  147,148,149, 10, 10,150,151,  2,152, 98,153,154,155,  2, 10,156,
+   10,157,158,  0,159,160,161,  2,162,  0,  0,163,  0,164,  0,165,
+  165,166, 34,167,168,169, 10,170, 95,  0,171,  0, 10,172,173,  0,
+  174,  2,175, 10,176,  0,177,172,178,179,180,  0,  0,181,182,  0,
+  183, 10, 10,184,185,186,187,188,189, 10, 10,190,191,  0,192, 10,
+  193,194,195, 10, 10,196, 10,197,198,105,199,102, 10, 34,200,201,
+  202,  0,203,204, 95, 10, 10,205,206,  2,207, 21, 22,208,209,210,
+  211,212,213, 10, 10,214,215,216,217,  0, 10,218,219,220,221,  0,
+  199, 10, 10,222,223,  2,224,225,226,227, 10,228,229,  2,230,231,
+    2, 10,140,  0, 10,232,233,103,234,  0,235,236,237,238, 10,239,
+  240,  2,241, 10, 10,242,243,  0,244, 10, 10,245,246,247,248,249,
+  250,  0, 22, 10,224,251,  8, 10, 71, 19, 10,252, 74,253,254, 10,
+   10,255,256,  2,257, 10,258,259, 10,260,261, 49, 10,262,263,264,
+  265,265,265,266,267,268,265,269, 10,270,271,  2, 10,272,273, 10,
+  274,  2,275,276,277,277,278,279,280,  0, 10,176,  0,281,105, 71,
+   95,282,  0,283, 71,284,285,  0,286,  0,287,  2,288,  2,289,105,
+  290,  2,129,129,162,162,162,129,
 };
 
-static inline unsigned
-hb_use_b4 (const uint8_t* a, unsigned i)
+static inline uint8_t hb_use_b4 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>1]>>((i&1u)<<2))&15u;
+  return (a[i>>1]>>((i&1)<<2))&15;
 }
-static inline uint_fast8_t
-hb_use_get_category (unsigned u)
+static inline uint8_t hb_use_get_category (unsigned u)
 {
-  return u<921600u?hb_use_u8[3265+(((hb_use_u8[937+(((hb_use_u16[((hb_use_u8[369+(((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>1>>3>>4))<<4)+((u>>1>>3>>1>>3)&15u))])<<3)+((u>>1>>3>>1)&7u))])<<1)+((u>>1>>3)&1u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
+  return u<921600 ? hb_use_u8[3273u+((hb_use_u8[945u+((hb_use_u16[((hb_use_u8[369u+((hb_use_u8[113u+((hb_use_b4(hb_use_u8,((((((((((u)>>1))>>3))>>1))>>3))>>4)))<<4)+((((((((((u)>>1))>>3))>>1))>>3))&15)])<<3)+((((((((u)>>1))>>3))>>1))&7)])<<1)+((((((u)>>1))>>3))&1)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : O;
 }
 
+
 #endif
 
+
 #undef B
 #undef CGJ
 #undef CS
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc
index 4a112e1c289..bb586a68ce5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc
@@ -10,8 +10,8 @@
  * # Date: 2015-03-12, 21:17:00 GMT [AG]
  * # Date: 2019-11-08, 23:22:00 GMT [AG]
  *
- * # Scripts-16.0.0.txt
- * # Date: 2024-04-30, 21:48:40 GMT
+ * # Scripts-17.0.0.txt
+ * # Date: 2025-07-24, 13:28:55 GMT
  */
 
 #include "hb.hh"
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh
index 48cd5296ffd..9993507e360 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh
@@ -396,6 +396,12 @@ hb_ot_shaper_categorize (hb_script_t script,
     case HB_SCRIPT_TODHRI:
     case HB_SCRIPT_TULU_TIGALARI:
 
+    /* Unicode-17.0 additions */
+    case HB_SCRIPT_BERIA_ERFE:
+    case HB_SCRIPT_SIDETIC:
+    case HB_SCRIPT_TAI_YO:
+    case HB_SCRIPT_TOLONG_SIKI:
+
       /* If the designer designed the font for the 'DFLT' script,
        * (or we ended up arbitrarily pick 'latn'), use the default shaper.
        * Otherwise, use the specific shaper.
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh
index 10165f57b75..28bc23d8f01 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh
@@ -352,7 +352,7 @@ struct AxisValue
 {
   float get_value (unsigned int axis_index) const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: hb_barrier (); return u.format1.get_value ();
     case 2: hb_barrier (); return u.format2.get_value ();
@@ -364,7 +364,7 @@ struct AxisValue
 
   unsigned int get_axis_index () const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: hb_barrier (); return u.format1.get_axis_index ();
     case 2: hb_barrier (); return u.format2.get_axis_index ();
@@ -376,7 +376,7 @@ struct AxisValue
 
   hb_ot_name_id_t get_value_name_id () const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: hb_barrier (); return u.format1.get_value_name_id ();
     case 2: hb_barrier (); return u.format2.get_value_name_id ();
@@ -389,9 +389,9 @@ struct AxisValue
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
-    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
-    TRACE_DISPATCH (this, u.format);
-    switch (u.format) {
+    if (unlikely (!c->may_dispatch (this, &u.format.v))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format.v);
+    switch (u.format.v) {
     case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
     case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
     case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
@@ -403,7 +403,7 @@ struct AxisValue
   bool keep_axis_value (const hb_array_t<const StatAxisRecord> axis_records,
                         hb_hashmap_t<hb_tag_t, Triple> *user_axes_location) const
   {
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: hb_barrier (); return u.format1.keep_axis_value (axis_records, user_axes_location);
     case 2: hb_barrier (); return u.format2.keep_axis_value (axis_records, user_axes_location);
@@ -420,7 +420,7 @@ struct AxisValue
       return_trace (false);
     hb_barrier ();
 
-    switch (u.format)
+    switch (u.format.v)
     {
     case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
     case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
@@ -433,14 +433,14 @@ struct AxisValue
   protected:
   union
   {
-  HBUINT16              format;
+  struct { HBUINT16 v; }        format;
   AxisValueFormat1      format1;
   AxisValueFormat2      format2;
   AxisValueFormat3      format3;
   AxisValueFormat4      format4;
   } u;
   public:
-  DEFINE_SIZE_UNION (2, format);
+  DEFINE_SIZE_UNION (2, format.v);
 };
 
 struct AxisValueOffsetArray: UnsizedArrayOf<Offset16To<AxisValue>>
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh
index 50ddf5f6967..4933e661371 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh
@@ -6,8 +6,8 @@
  *
  * on files with these headers:
  *
- * <meta name="updated_at" content="2024-12-06 06:35 AM" />
- * File-Date: 2025-01-21
+ * <meta name="updated_at" content="2024-12-06T06:35:00Z" />
+ * File-Date: 2025-08-25
  */
 
 #ifndef HB_OT_TAG_TABLE_HH
@@ -704,7 +704,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('g','u','z',' '),     HB_TAG('G','U','Z',' ')},*/     /* Gusii */
   {HB_TAG('g','w','i',' '),     HB_TAG('A','T','H',' ')},       /* Gwichʼin -> Athapaskan */
   {HB_TAG('g','y','n',' '),     HB_TAG('C','P','P',' ')},       /* Guyanese Creole English -> Creoles */
-  {HB_TAG('h','a','a',' '),     HB_TAG('A','T','H',' ')},       /* Han -> Athapaskan */
+  {HB_TAG('h','a','a',' '),     HB_TAG('A','T','H',' ')},       /* Hän -> Athapaskan */
   {HB_TAG('h','a','e',' '),     HB_TAG('O','R','O',' ')},       /* Eastern Oromo -> Oromo */
   {HB_TAG('h','a','i',' '),     HB_TAG('H','A','I','0')},       /* Haida [macrolanguage] */
   {HB_TAG('h','a','k',' '),     HB_TAG('Z','H','S',' ')},       /* Hakka Chinese -> Chinese, Simplified */
@@ -921,7 +921,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','v','t',' '),     HB_TAG('K','R','N',' ')},       /* Lahta Karen -> Karen */
   {HB_TAG('k','v','u',' '),     HB_TAG('K','R','N',' ')},       /* Yinbaw Karen -> Karen */
   {HB_TAG('k','v','y',' '),     HB_TAG('K','R','N',' ')},       /* Yintale Karen -> Karen */
-/*{HB_TAG('k','w','k',' '),     HB_TAG('K','W','K',' ')},*/     /* Kwakiutl -> Kwakʼwala */
+/*{HB_TAG('k','w','k',' '),     HB_TAG('K','W','K',' ')},*/     /* Kwakʼwala */
   {HB_TAG('k','w','w',' '),     HB_TAG('C','P','P',' ')},       /* Kwinti -> Creoles */
   {HB_TAG('k','w','y',' '),     HB_TAG('K','O','N','0')},       /* San Salvador Kongo -> Kongo */
   {HB_TAG('k','x','c',' '),     HB_TAG('K','M','S',' ')},       /* Konso -> Komso */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh
index e26687c34ed..8a9307d6933 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh
@@ -143,10 +143,13 @@ struct AxisValueMap
 
 struct SegmentMaps : Array16Of<AxisValueMap>
 {
-  int map (int value, unsigned int from_offset = 0, unsigned int to_offset = 1) const
+  float map_float (float value, unsigned int from_offset = 0, unsigned int to_offset = 1) const
   {
-#define fromCoord coords[from_offset].to_int ()
-#define toCoord coords[to_offset].to_int ()
+#define fromCoord coords[from_offset].to_float ()
+#define toCoord coords[to_offset].to_float ()
+
+    const auto *map = arrayZ;
+
     /* The following special-cases are not part of OpenType, which requires
      * that at least -1, 0, and +1 must be mapped. But we include these as
      * part of a better error recovery scheme. */
@@ -155,47 +158,98 @@ struct SegmentMaps : Array16Of<AxisValueMap>
       if (!len)
         return value;
       else /* len == 1*/
-        return value - arrayZ[0].fromCoord + arrayZ[0].toCoord;
+        return value - map[0].fromCoord + map[0].toCoord;
     }
 
-    if (value <= arrayZ[0].fromCoord)
-      return value - arrayZ[0].fromCoord + arrayZ[0].toCoord;
+    // At least two mappings now.
 
-    unsigned int i;
-    unsigned int count = len - 1;
-    for (i = 1; i < count && value > arrayZ[i].fromCoord; i++)
-      ;
+    /* CoreText is wild...
+     * PingFangUI avar needs all this special-casing...
+     * So we implement an extended version of the spec here,
+     * which is more robust and more likely to be compatible with
+     * the wild. */
 
-    if (value >= arrayZ[i].fromCoord)
-      return value - arrayZ[i].fromCoord + arrayZ[i].toCoord;
+    unsigned start = 0;
+    unsigned end = len;
+    if (map[start].fromCoord == -1 && map[start].toCoord == -1 && map[start+1].fromCoord == -1)
+      start++;
+    if (map[end-1].fromCoord == +1 && map[end-1].toCoord == +1 && map[end-2].fromCoord == +1)
+      end--;
 
-    if (unlikely (arrayZ[i-1].fromCoord == arrayZ[i].fromCoord))
-      return arrayZ[i-1].toCoord;
+    /* Look for exact match first, and do lots of special-casing. */
+    unsigned i;
+    for (i = start; i < end; i++)
+      if (value == map[i].fromCoord)
+        break;
+    if (i < end)
+    {
+      // There's at least one exact match. See if there are more.
+      unsigned j = i;
+      for (; j + 1 < end; j++)
+        if (value != map[j + 1].fromCoord)
+          break;
+
+      // [i,j] inclusive are all exact matches:
+
+      // If there's only one, return it. This is the only spec-compliant case.
+      if (i == j)
+        return map[i].toCoord;
+      // If there's exactly three, return the middle one.
+      if (i + 2 == j)
+        return map[i + 1].toCoord;
+
+      // Ignore the middle ones. Return the one mapping closer to 0.
+      if (value < 0) return map[j].toCoord;
+      if (value > 0) return map[i].toCoord;
+
+      // Mapping 0? CoreText seems confused. It seems to prefer 0 here...
+      // So we'll just return the smallest one. lol
+      return fabsf (map[i].toCoord) < fabsf (map[j].toCoord) ? map[i].toCoord : map[j].toCoord;
+
+      // Mapping 0? Return one not mapping to 0.
+      if (map[i].toCoord == 0)
+        return map[j].toCoord;
+      else
+        return map[i].toCoord;
+    }
+
+    /* There's at least two and we're not an exact match. Prepare to lerp. */
+
+    // Find the segment we're in.
+    for (i = start; i < end; i++)
+      if (value < map[i].fromCoord)
+        break;
+
+    if (i == 0)
+    {
+      // Value before all segments; Shift.
+      return value - map[0].fromCoord + map[0].toCoord;
+    }
+    if (i == end)
+    {
+      // Value after all segments; Shift.
+      return value - map[end - 1].fromCoord + map[end - 1].toCoord;
+    }
+
+    // Actually interpolate.
+    auto &before = map[i-1];
+    auto &after = map[i];
+    float denom = after.fromCoord - before.fromCoord; // Can't be zero by now.
+    return before.toCoord + ((after.toCoord - before.toCoord) * (value - before.fromCoord)) / denom;
 
-    int denom = arrayZ[i].fromCoord - arrayZ[i-1].fromCoord;
-    return roundf (arrayZ[i-1].toCoord + ((float) (arrayZ[i].toCoord - arrayZ[i-1].toCoord) *
-                                          (value - arrayZ[i-1].fromCoord)) / denom);
 #undef toCoord
 #undef fromCoord
   }
 
-  int unmap (int value) const { return map (value, 1, 0); }
+  float unmap_float (float value) const { return map_float (value, 1, 0); }
 
+
+  // TODO Kill this.
   Triple unmap_axis_range (const Triple& axis_range) const
   {
-    F2DOT14 val, unmapped_val;
-
-    val.set_float (axis_range.minimum);
-    unmapped_val.set_int (unmap (val.to_int ()));
-    float unmapped_min = unmapped_val.to_float ();
-
-    val.set_float (axis_range.middle);
-    unmapped_val.set_int (unmap (val.to_int ()));
-    float unmapped_middle = unmapped_val.to_float ();
-
-    val.set_float (axis_range.maximum);
-    unmapped_val.set_int (unmap (val.to_int ()));
-    float unmapped_max = unmapped_val.to_float ();
+    float unmapped_min = unmap_float (axis_range.minimum);
+    float unmapped_middle = unmap_float (axis_range.middle);
+    float unmapped_max = unmap_float (axis_range.maximum);
 
     return Triple{(double) unmapped_min, (double) unmapped_middle, (double) unmapped_max};
   }
@@ -203,6 +257,11 @@ struct SegmentMaps : Array16Of<AxisValueMap>
   bool subset (hb_subset_context_t *c, hb_tag_t axis_tag) const
   {
     TRACE_SUBSET (this);
+
+    /* This function cannot work on avar2 table (and currently doesn't).
+     * We should instead keep the design coords in the shape plan and use
+     * those. unmap_axis_range needs to be killed. */
+
     /* avar mapped normalized axis range*/
     Triple *axis_range;
     if (!c->plan->axes_location.has (axis_tag, &axis_range))
@@ -304,14 +363,14 @@ struct avar
     return_trace (true);
   }
 
-  void map_coords (int *coords, unsigned int coords_length) const
+  void map_coords_16_16 (int *coords, unsigned int coords_length) const
   {
     unsigned int count = hb_min (coords_length, axisCount);
 
     const SegmentMaps *map = &firstAxisSegmentMaps;
     for (unsigned int i = 0; i < count; i++)
     {
-      coords[i] = map->map (coords[i]);
+      coords[i] = roundf (map->map_float (coords[i] / 65536.f) * 65536.f);
       map = &StructAfter<SegmentMaps> (*map);
     }
 
@@ -329,15 +388,20 @@ struct avar
     const auto &var_store = this+v2.varStore;
     auto *var_store_cache = var_store.create_cache ();
 
+    hb_vector_t<int> coords_2_14;
+    coords_2_14.resize (coords_length);
+    for (unsigned i = 0; i < coords_length; i++)
+      coords_2_14[i] = roundf (coords[i] / 4.f); // 16.16 -> 2.14
+
     hb_vector_t<int> out;
     out.alloc (coords_length);
     for (unsigned i = 0; i < coords_length; i++)
     {
       int v = coords[i];
       uint32_t varidx = varidx_map.map (i);
-      float delta = var_store.get_delta (varidx, coords, coords_length, var_store_cache);
-      v += roundf (delta);
-      v = hb_clamp (v, -(1<<14), +(1<<14));
+      float delta = var_store.get_delta (varidx, coords_2_14.arrayZ, coords_2_14.length, var_store_cache);
+      v += roundf (delta * 4); // 2.14 -> 16.16
+      v = hb_clamp (v, -(1<<16), +(1<<16));
       out.push (v);
     }
     for (unsigned i = 0; i < coords_length; i++)
@@ -347,16 +411,54 @@ struct avar
 #endif
   }
 
-  void unmap_coords (int *coords, unsigned int coords_length) const
+  bool has_v2_data () const { return version.major > 1; }
+
+  // axis normalization is done in 2.14 here
+  // TODO: deprecate this API once fonttools is updated to use 16.16 normalization
+  bool map_coords_2_14 (float *coords, unsigned int coords_length) const
   {
+    hb_vector_t<int> coords_2_14;
+    if (!coords_2_14.resize (coords_length)) return false;
     unsigned int count = hb_min (coords_length, axisCount);
 
     const SegmentMaps *map = &firstAxisSegmentMaps;
     for (unsigned int i = 0; i < count; i++)
     {
-      coords[i] = map->unmap (coords[i]);
+      int v = roundf (map->map_float (coords[i]) * 16384.f);
+      coords_2_14[i] = v;
+      coords[i] = v / 16384.f;
       map = &StructAfter<SegmentMaps> (*map);
     }
+
+#ifndef HB_NO_AVAR2
+    if (version.major < 2)
+      return true;
+    hb_barrier ();
+
+    for (; count < axisCount; count++)
+      map = &StructAfter<SegmentMaps> (*map);
+
+    const auto &v2 = * (const avarV2Tail *) map;
+
+    const auto &varidx_map = this+v2.varIdxMap;
+    const auto &var_store = this+v2.varStore;
+    auto *var_store_cache = var_store.create_cache ();
+
+    for (unsigned i = 0; i < coords_length; i++)
+    {
+      int v = coords_2_14[i];
+      uint32_t varidx = varidx_map.map (i);
+      float delta = var_store.get_delta (varidx, coords_2_14.arrayZ, coords_2_14.length, var_store_cache);
+      v += roundf (delta);
+      v = hb_clamp (v, -(1<<16), +(1<<16));
+      coords[i] = v / 16384.f;
+    }
+
+    OT::ItemVariationStore::destroy_cache (var_store_cache);
+    return true;
+#else
+    return version.major < 2;
+#endif
   }
 
   bool subset (hb_subset_context_t *c) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh
index 72deddef213..d0a4224c9b0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh
@@ -27,24 +27,35 @@
 #define HB_OT_VAR_COMMON_HH
 
 #include "hb-ot-layout-common.hh"
+#include "hb-alloc-pool.hh"
 #include "hb-priority-queue.hh"
 #include "hb-subset-instancer-iup.hh"
 
 
 namespace OT {
 
+using rebase_tent_result_scratch_t = hb_pair_t<rebase_tent_result_t, rebase_tent_result_t>;
 
 /* https://docs.microsoft.com/en-us/typography/opentype/spec/otvarcommonformats#tuplevariationheader */
 struct TupleVariationHeader
 {
   friend struct tuple_delta_t;
-  unsigned get_size (unsigned axis_count) const
-  { return min_size + get_all_tuples (axis_count).get_size (); }
+  unsigned get_size (unsigned axis_count_times_2) const
+  {
+    // This function is super hot in mega-var-fonts with hundreds of masters.
+    unsigned ti = tupleIndex;
+    if (unlikely ((ti & (TupleIndex::EmbeddedPeakTuple | TupleIndex::IntermediateRegion))))
+    {
+      unsigned count = ((ti & TupleIndex::EmbeddedPeakTuple) != 0) + ((ti & TupleIndex::IntermediateRegion) != 0) * 2;
+      return min_size + count * axis_count_times_2;
+    }
+    return min_size;
+  }
 
   unsigned get_data_size () const { return varDataSize; }
 
-  const TupleVariationHeader &get_next (unsigned axis_count) const
-  { return StructAtOffset<TupleVariationHeader> (this, get_size (axis_count)); }
+  const TupleVariationHeader &get_next (unsigned axis_count_times_2) const
+  { return StructAtOffset<TupleVariationHeader> (this, get_size (axis_count_times_2)); }
 
   bool unpack_axis_tuples (unsigned axis_count,
                            const hb_array_t<const F2DOT14> shared_tuples,
@@ -53,7 +64,7 @@ struct TupleVariationHeader
   {
     const F2DOT14 *peak_tuple = nullptr;
     if (has_peak ())
-      peak_tuple = get_peak_tuple (axis_count).arrayZ;
+      peak_tuple = get_peak_tuple (axis_count);
     else
     {
       unsigned int index = get_index ();
@@ -68,8 +79,8 @@ struct TupleVariationHeader
 
     if (has_interm)
     {
-      start_tuple = get_start_tuple (axis_count).arrayZ;
-      end_tuple = get_end_tuple (axis_count).arrayZ;
+      start_tuple = get_start_tuple (axis_count);
+      end_tuple = get_end_tuple (axis_count);
     }
 
     for (unsigned i = 0; i < axis_count; i++)
@@ -98,88 +109,109 @@ struct TupleVariationHeader
     return true;
   }
 
+  HB_ALWAYS_INLINE
   double calculate_scalar (hb_array_t<const int> coords, unsigned int coord_count,
                            const hb_array_t<const F2DOT14> shared_tuples,
-                           const hb_vector_t<hb_pair_t<int,int>> *shared_tuple_active_idx = nullptr) const
+                           hb_scalar_cache_t *shared_tuple_scalar_cache = nullptr) const
   {
+    unsigned tuple_index = tupleIndex;
+
     const F2DOT14 *peak_tuple;
 
-    unsigned start_idx = 0;
-    unsigned end_idx = coord_count;
-    unsigned step = 1;
+    bool has_interm = tuple_index & TupleIndex::IntermediateRegion; // Inlined for performance
 
-    if (has_peak ())
-      peak_tuple = get_peak_tuple (coord_count).arrayZ;
+    if (unlikely (tuple_index & TupleIndex::EmbeddedPeakTuple)) // Inlined for performance
+    {
+      peak_tuple = get_peak_tuple (coord_count);
+      shared_tuple_scalar_cache = nullptr;
+    }
     else
     {
-      unsigned int index = get_index ();
+      unsigned int index = tuple_index & TupleIndex::TupleIndexMask; // Inlined for performance
+
+      float scalar;
+      if (shared_tuple_scalar_cache &&
+          shared_tuple_scalar_cache->get (index, &scalar))
+      {
+        if (has_interm && (scalar != 0 && scalar != 1.f))
+          shared_tuple_scalar_cache = nullptr;
+        else
+          return (double) scalar;
+      }
+
       if (unlikely ((index + 1) * coord_count > shared_tuples.length))
         return 0.0;
-      peak_tuple = shared_tuples.sub_array (coord_count * index, coord_count).arrayZ;
+      peak_tuple = shared_tuples.arrayZ + (coord_count * index);
 
-      if (shared_tuple_active_idx)
-      {
-        if (unlikely (index >= shared_tuple_active_idx->length))
-          return 0.0;
-        auto _ = (*shared_tuple_active_idx).arrayZ[index];
-        if (_.second != -1)
-        {
-          start_idx = _.first;
-          end_idx = _.second + 1;
-          step = _.second - _.first;
-        }
-        else if (_.first != -1)
-        {
-          start_idx = _.first;
-          end_idx = start_idx + 1;
-        }
-      }
     }
 
     const F2DOT14 *start_tuple = nullptr;
     const F2DOT14 *end_tuple = nullptr;
-    bool has_interm = has_intermediate ();
+
     if (has_interm)
     {
-      start_tuple = get_start_tuple (coord_count).arrayZ;
-      end_tuple = get_end_tuple (coord_count).arrayZ;
+      start_tuple = get_start_tuple (coord_count);
+      end_tuple = get_end_tuple (coord_count);
     }
 
     double scalar = 1.0;
-    for (unsigned int i = start_idx; i < end_idx; i += step)
+#ifndef HB_OPTIMIZE_SIZE
+#if HB_FAST_NUM_ACCESS
+    bool skip = coord_count >= 16;
+#endif
+#endif
+    for (unsigned int i = 0; i < coord_count; i++)
     {
+#ifndef HB_OPTIMIZE_SIZE
+#if HB_FAST_NUM_ACCESS
+      if (skip)
+      {
+        while (i + 4 <= coord_count && * (HBUINT64LE *) &peak_tuple[i] == 0)
+          i += 4;
+        while (i < coord_count && peak_tuple[i].to_int () == 0)
+          i += 1;
+        if (i >= coord_count)
+          break;
+      }
+#endif
+#endif
+
       int peak = peak_tuple[i].to_int ();
       if (!peak) continue;
 
       int v = coords[i];
+      if (!v) { scalar = 0.0; break; }
       if (v == peak) continue;
 
       if (has_interm)
       {
+        shared_tuple_scalar_cache = nullptr;
         int start = start_tuple[i].to_int ();
         int end = end_tuple[i].to_int ();
         if (unlikely (start > peak || peak > end ||
                       (start < 0 && end > 0 && peak))) continue;
-        if (v < start || v > end) return 0.0;
+        if (v < start || v > end) { scalar = 0.0; break; }
         if (v < peak)
         { if (peak != start) scalar *= (double) (v - start) / (peak - start); }
         else
         { if (peak != end) scalar *= (double) (end - v) / (end - peak); }
       }
-      else if (!v || v < hb_min (0, peak) || v > hb_max (0, peak)) return 0.0;
+      else if (v < hb_min (0, peak) || v > hb_max (0, peak)) { scalar = 0.0; break; }
       else
         scalar *= (double) v / peak;
     }
+    if (shared_tuple_scalar_cache)
+      shared_tuple_scalar_cache->set (get_index (), scalar);
     return scalar;
   }
 
-  bool           has_peak () const { return tupleIndex & TuppleIndex::EmbeddedPeakTuple; }
-  bool   has_intermediate () const { return tupleIndex & TuppleIndex::IntermediateRegion; }
-  bool has_private_points () const { return tupleIndex & TuppleIndex::PrivatePointNumbers; }
-  unsigned      get_index () const { return tupleIndex & TuppleIndex::TupleIndexMask; }
+  bool           has_peak () const { return tupleIndex & TupleIndex::EmbeddedPeakTuple; }
+  bool   has_intermediate () const { return tupleIndex & TupleIndex::IntermediateRegion; }
+  bool has_private_points () const { return tupleIndex & TupleIndex::PrivatePointNumbers; }
+  unsigned      get_index () const { return tupleIndex & TupleIndex::TupleIndexMask; }
 
   protected:
-  struct TuppleIndex : HBUINT16
+  struct TupleIndex : HBUINT16
   {
     enum Flags {
       EmbeddedPeakTuple   = 0x8000u,
@@ -188,22 +220,24 @@ struct TupleVariationHeader
       TupleIndexMask      = 0x0FFFu
     };
 
-    TuppleIndex& operator = (uint16_t i) { HBUINT16::operator= (i); return *this; }
+    TupleIndex& operator = (uint16_t i) { HBUINT16::operator= (i); return *this; }
     DEFINE_SIZE_STATIC (2);
   };
 
   hb_array_t<const F2DOT14> get_all_tuples (unsigned axis_count) const
   { return StructAfter<UnsizedArrayOf<F2DOT14>> (tupleIndex).as_array ((has_peak () + has_intermediate () * 2) * axis_count); }
-  hb_array_t<const F2DOT14> get_peak_tuple (unsigned axis_count) const
-  { return get_all_tuples (axis_count).sub_array (0, axis_count); }
-  hb_array_t<const F2DOT14> get_start_tuple (unsigned axis_count) const
-  { return get_all_tuples (axis_count).sub_array (has_peak () * axis_count, axis_count); }
-  hb_array_t<const F2DOT14> get_end_tuple (unsigned axis_count) const
-  { return get_all_tuples (axis_count).sub_array (has_peak () * axis_count + axis_count, axis_count); }
+  const F2DOT14* get_all_tuples_base (unsigned axis_count) const
+  { return StructAfter<UnsizedArrayOf<F2DOT14>> (tupleIndex).arrayZ; }
+  const F2DOT14* get_peak_tuple (unsigned axis_count) const
+  { return get_all_tuples_base (axis_count); }
+  const F2DOT14* get_start_tuple (unsigned axis_count) const
+  { return get_all_tuples_base (axis_count) + has_peak () * axis_count; }
+  const F2DOT14* get_end_tuple (unsigned axis_count) const
+  { return get_all_tuples_base (axis_count) + has_peak () * axis_count + axis_count; }
 
   HBUINT16      varDataSize;    /* The size in bytes of the serialized
                                  * data for this tuple variation table. */
-  TuppleIndex   tupleIndex;     /* A packed field. The high 4 bits are flags (see below).
+  TupleIndex    tupleIndex;     /* A packed field. The high 4 bits are flags (see below).
                                    The low 12 bits are an index into a shared tuple
                                    records array. */
   /* UnsizedArrayOf<F2DOT14> peakTuple - optional */
@@ -221,6 +255,21 @@ struct TupleVariationHeader
   DEFINE_SIZE_MIN (4);
 };
 
+struct optimize_scratch_t
+{
+  iup_scratch_t iup;
+  hb_vector_t<bool> opt_indices;
+  hb_vector_t<int> rounded_x_deltas;
+  hb_vector_t<int> rounded_y_deltas;
+  hb_vector_t<float> opt_deltas_x;
+  hb_vector_t<float> opt_deltas_y;
+  hb_vector_t<unsigned char> opt_point_data;
+  hb_vector_t<unsigned char> opt_deltas_data;
+  hb_vector_t<unsigned char> point_data;
+  hb_vector_t<unsigned char> deltas_data;
+  hb_vector_t<int> rounded_deltas;
+};
+
 struct tuple_delta_t
 {
   static constexpr bool realloc_move = true;  // Watch out when adding new members!
@@ -241,11 +290,12 @@ struct tuple_delta_t
   hb_vector_t<unsigned char> compiled_tuple_header;
   hb_vector_t<unsigned char> compiled_deltas;
 
-  /* compiled peak coords, empty for non-gvar tuples */
-  hb_vector_t<char> compiled_peak_coords;
+  hb_vector_t<F2DOT14> compiled_peak_coords;
+  hb_vector_t<F2DOT14> compiled_interm_coords;
 
-  tuple_delta_t () = default;
+  tuple_delta_t (hb_alloc_pool_t *pool = nullptr) {}
   tuple_delta_t (const tuple_delta_t& o) = default;
+  tuple_delta_t& operator = (const tuple_delta_t& o) = default;
 
   friend void swap (tuple_delta_t& a, tuple_delta_t& b) noexcept
   {
@@ -267,6 +317,18 @@ struct tuple_delta_t
     return *this;
   }
 
+  void copy_from (const tuple_delta_t& o, hb_alloc_pool_t *pool = nullptr)
+  {
+    axis_tuples = o.axis_tuples;
+    indices.duplicate_vector_from_pool (pool, o.indices);
+    deltas_x.duplicate_vector_from_pool (pool, o.deltas_x);
+    deltas_y.duplicate_vector_from_pool (pool, o.deltas_y);
+    compiled_tuple_header.duplicate_vector_from_pool (pool, o.compiled_tuple_header);
+    compiled_deltas.duplicate_vector_from_pool (pool, o.compiled_deltas);
+    compiled_peak_coords.duplicate_vector_from_pool (pool, o.compiled_peak_coords);
+    compiled_interm_coords.duplicate_vector_from_pool (pool, o.compiled_interm_coords);
+  }
+
   void remove_axis (hb_tag_t axis_tag)
   { axis_tuples.del (axis_tag); }
 
@@ -321,31 +383,44 @@ struct tuple_delta_t
     return *this;
   }
 
-  hb_vector_t<tuple_delta_t> change_tuple_var_axis_limit (hb_tag_t axis_tag, Triple axis_limit,
-                                                          TripleDistances axis_triple_distances) const
+  void change_tuple_var_axis_limit (hb_tag_t axis_tag, Triple axis_limit,
+                                    TripleDistances axis_triple_distances,
+                                    hb_vector_t<tuple_delta_t>& out,
+                                    rebase_tent_result_scratch_t &scratch,
+                                    hb_alloc_pool_t *pool = nullptr)
   {
-    hb_vector_t<tuple_delta_t> out;
+    // May move *this out.
+
+    out.reset ();
     Triple *tent;
     if (!axis_tuples.has (axis_tag, &tent))
     {
-      out.push (*this);
-      return out;
+      out.push (std::move (*this));
+      return;
     }
 
     if ((tent->minimum < 0.0 && tent->maximum > 0.0) ||
         !(tent->minimum <= tent->middle && tent->middle <= tent->maximum))
-      return out;
+      return;
 
     if (tent->middle == 0.0)
     {
-      out.push (*this);
-      return out;
+      out.push (std::move (*this));
+      return;
     }
 
-    rebase_tent_result_t solutions = rebase_tent (*tent, axis_limit, axis_triple_distances);
-    for (auto &t : solutions)
+    rebase_tent_result_t &solutions = scratch.first;
+    rebase_tent (*tent, axis_limit, axis_triple_distances, solutions, scratch.second);
+    for (unsigned i = 0; i < solutions.length; i++)
     {
-      tuple_delta_t new_var = *this;
+      auto &t = solutions.arrayZ[i];
+
+      tuple_delta_t new_var;
+      if (i < solutions.length - 1)
+        new_var.copy_from (*this, pool);
+      else
+        new_var = std::move (*this);
+
       if (t.second == Triple ())
         new_var.remove_axis (axis_tag);
       else
@@ -354,38 +429,76 @@ struct tuple_delta_t
       new_var *= t.first;
       out.push (std::move (new_var));
     }
-
-    return out;
   }
 
-  bool compile_peak_coords (const hb_map_t& axes_index_map,
-                            const hb_map_t& axes_old_index_tag_map)
+  bool compile_coords (const hb_map_t& axes_index_map,
+                       const hb_map_t& axes_old_index_tag_map,
+                       hb_alloc_pool_t *pool= nullptr)
   {
-    unsigned axis_count = axes_index_map.get_population ();
-    if (unlikely (!compiled_peak_coords.alloc (axis_count * F2DOT14::static_size)))
+    unsigned cur_axis_count = axes_index_map.get_population ();
+    if (pool)
+    {
+      if (unlikely (!compiled_peak_coords.allocate_from_pool (pool, cur_axis_count)))
+        return false;
+    }
+    else if (unlikely (!compiled_peak_coords.resize (cur_axis_count)))
       return false;
 
+    hb_array_t<F2DOT14> start_coords, end_coords;
+
     unsigned orig_axis_count = axes_old_index_tag_map.get_population ();
+    unsigned j = 0;
     for (unsigned i = 0; i < orig_axis_count; i++)
     {
       if (!axes_index_map.has (i))
         continue;
 
       hb_tag_t axis_tag = axes_old_index_tag_map.get (i);
-      Triple *coords;
-      F2DOT14 peak_coord;
+      Triple *coords = nullptr;
       if (axis_tuples.has (axis_tag, &coords))
-        peak_coord.set_float (coords->middle);
-      else
-        peak_coord.set_int (0);
+      {
+        float min_val = coords->minimum;
+        float val = coords->middle;
+        float max_val = coords->maximum;
 
-      /* push F2DOT14 value into char vector */
-      int16_t val = peak_coord.to_int ();
-      compiled_peak_coords.push (static_cast<char> (val >> 8));
-      compiled_peak_coords.push (static_cast<char> (val & 0xFF));
+        compiled_peak_coords.arrayZ[j].set_float (val);
+
+        if (min_val != hb_min (val, 0.f) || max_val != hb_max (val, 0.f))
+        {
+          if (!compiled_interm_coords)
+          {
+            if (pool)
+            {
+              if (unlikely (!compiled_interm_coords.allocate_from_pool (pool, 2 * cur_axis_count)))
+                return false;
+            }
+            else if (unlikely (!compiled_interm_coords.resize (2 * cur_axis_count)))
+              return false;
+            start_coords = compiled_interm_coords.as_array ().sub_array (0, cur_axis_count);
+            end_coords = compiled_interm_coords.as_array ().sub_array (cur_axis_count);
+
+            for (unsigned k = 0; k < j; k++)
+            {
+              signed peak = compiled_peak_coords.arrayZ[k].to_int ();
+              if (!peak) continue;
+              start_coords.arrayZ[k].set_int (hb_min (peak, 0));
+              end_coords.arrayZ[k].set_int (hb_max (peak, 0));
+            }
+          }
+
+        }
+
+        if (compiled_interm_coords)
+        {
+          start_coords.arrayZ[j].set_float (min_val);
+          end_coords.arrayZ[j].set_float (max_val);
+        }
+      }
+
+      j++;
     }
 
-    return !compiled_peak_coords.in_error ();
+    return !compiled_peak_coords.in_error () && !compiled_interm_coords.in_error ();
   }
 
   /* deltas should be compiled already before we compile tuple
@@ -394,7 +507,8 @@ struct tuple_delta_t
   bool compile_tuple_var_header (const hb_map_t& axes_index_map,
                                  unsigned points_data_length,
                                  const hb_map_t& axes_old_index_tag_map,
-                                 const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* shared_tuples_idx_map)
+                                 const hb_hashmap_t<const hb_vector_t<F2DOT14>*, unsigned>* shared_tuples_idx_map,
+                                 hb_alloc_pool_t *pool = nullptr)
   {
     /* compiled_deltas could be empty after iup delta optimization, we can skip
      * compiling this tuple and return true */
@@ -403,7 +517,7 @@ struct tuple_delta_t
     unsigned cur_axis_count = axes_index_map.get_population ();
     /* allocate enough memory: 1 peak + 2 intermediate coords + fixed header size */
     unsigned alloc_len = 3 * cur_axis_count * (F2DOT14::static_size) + 4;
-    if (unlikely (!compiled_tuple_header.resize (alloc_len))) return false;
+    if (unlikely (!compiled_tuple_header.allocate_from_pool (pool, alloc_len, false))) return false;
 
     unsigned flag = 0;
     /* skip the first 4 header bytes: variationDataSize+tupleIndex */
@@ -411,6 +525,9 @@ struct tuple_delta_t
     F2DOT14* end = reinterpret_cast<F2DOT14 *> (compiled_tuple_header.end ());
     hb_array_t<F2DOT14> coords (p, end - p);
 
+    if (!shared_tuples_idx_map)
+      compile_coords (axes_index_map, axes_old_index_tag_map); // non-gvar tuples do not have compiled coords yet
+
     /* encode peak coords */
     unsigned peak_count = 0;
     unsigned *shared_tuple_idx;
@@ -421,16 +538,16 @@ struct tuple_delta_t
     }
     else
     {
-      peak_count = encode_peak_coords(coords, flag, axes_index_map, axes_old_index_tag_map);
+      peak_count = encode_peak_coords(coords, flag);
       if (!peak_count) return false;
     }
 
     /* encode interim coords, it's optional so returned num could be 0 */
-    unsigned interim_count = encode_interm_coords (coords.sub_array (peak_count), flag, axes_index_map, axes_old_index_tag_map);
+    unsigned interim_count = encode_interm_coords (coords.sub_array (peak_count), flag);
 
     /* pointdata length = 0 implies "use shared points" */
     if (points_data_length)
-      flag |= TupleVariationHeader::TuppleIndex::PrivatePointNumbers;
+      flag |= TupleVariationHeader::TupleIndex::PrivatePointNumbers;
 
     unsigned serialized_data_size = points_data_length + compiled_deltas.length;
     TupleVariationHeader *o = reinterpret_cast<TupleVariationHeader *> (compiled_tuple_header.begin ());
@@ -438,105 +555,63 @@ struct tuple_delta_t
     o->tupleIndex = flag;
 
     unsigned total_header_len = 4 + (peak_count + interim_count) * (F2DOT14::static_size);
-    return compiled_tuple_header.resize (total_header_len);
+    compiled_tuple_header.shrink_back_to_pool (pool, total_header_len);
+    return true;
   }
 
   unsigned encode_peak_coords (hb_array_t<F2DOT14> peak_coords,
-                               unsigned& flag,
-                               const hb_map_t& axes_index_map,
-                               const hb_map_t& axes_old_index_tag_map) const
+                               unsigned& flag) const
   {
-    unsigned orig_axis_count = axes_old_index_tag_map.get_population ();
-    auto it = peak_coords.iter ();
-    unsigned count = 0;
-    for (unsigned i = 0; i < orig_axis_count; i++)
-    {
-      if (!axes_index_map.has (i)) /* axis pinned */
-        continue;
-      hb_tag_t axis_tag = axes_old_index_tag_map.get (i);
-      Triple *coords;
-      if (!axis_tuples.has (axis_tag, &coords))
-        (*it).set_int (0);
-      else
-        (*it).set_float (coords->middle);
-      it++;
-      count++;
-    }
-    flag |= TupleVariationHeader::TuppleIndex::EmbeddedPeakTuple;
-    return count;
+    hb_memcpy (&peak_coords[0], &compiled_peak_coords[0], compiled_peak_coords.length * sizeof (compiled_peak_coords[0]));
+    flag |= TupleVariationHeader::TupleIndex::EmbeddedPeakTuple;
+    return compiled_peak_coords.length;
   }
 
   /* if no need to encode intermediate coords, then just return p */
   unsigned encode_interm_coords (hb_array_t<F2DOT14> coords,
-                                 unsigned& flag,
-                                 const hb_map_t& axes_index_map,
-                                 const hb_map_t& axes_old_index_tag_map) const
+                                 unsigned& flag) const
   {
-    unsigned orig_axis_count = axes_old_index_tag_map.get_population ();
-    unsigned cur_axis_count = axes_index_map.get_population ();
-
-    auto start_coords_iter = coords.sub_array (0, cur_axis_count).iter ();
-    auto end_coords_iter = coords.sub_array (cur_axis_count).iter ();
-    bool encode_needed = false;
-    unsigned count = 0;
-    for (unsigned i = 0; i < orig_axis_count; i++)
+    if (compiled_interm_coords)
     {
-      if (!axes_index_map.has (i)) /* axis pinned */
-        continue;
-      hb_tag_t axis_tag = axes_old_index_tag_map.get (i);
-      Triple *coords;
-      float min_val = 0.f, val = 0.f, max_val = 0.f;
-      if (axis_tuples.has (axis_tag, &coords))
-      {
-        min_val = coords->minimum;
-        val = coords->middle;
-        max_val = coords->maximum;
-      }
-
-      (*start_coords_iter).set_float (min_val);
-      (*end_coords_iter).set_float (max_val);
-
-      start_coords_iter++;
-      end_coords_iter++;
-      count += 2;
-      if (min_val != hb_min (val, 0.f) || max_val != hb_max (val, 0.f))
-        encode_needed = true;
+      hb_memcpy (&coords[0], &compiled_interm_coords[0], compiled_interm_coords.length * sizeof (compiled_interm_coords[0]));
+      flag |= TupleVariationHeader::TupleIndex::IntermediateRegion;
     }
-
-    if (encode_needed)
-    {
-      flag |= TupleVariationHeader::TuppleIndex::IntermediateRegion;
-      return count;
-    }
-    return 0;
+    return compiled_interm_coords.length;
   }
 
-  bool compile_deltas ()
-  { return compile_deltas (indices, deltas_x, deltas_y, compiled_deltas); }
+  bool compile_deltas (hb_vector_t<int> &rounded_deltas_scratch,
+                       hb_alloc_pool_t *pool = nullptr)
+  { return compile_deltas (indices, deltas_x, deltas_y, compiled_deltas, rounded_deltas_scratch, pool); }
 
   static bool compile_deltas (hb_array_t<const bool> point_indices,
                               hb_array_t<const float> x_deltas,
                               hb_array_t<const float> y_deltas,
-                              hb_vector_t<unsigned char> &compiled_deltas /* OUT */)
+                              hb_vector_t<unsigned char> &compiled_deltas, /* OUT */
+                              hb_vector_t<int> &rounded_deltas, /* scratch */
+                              hb_alloc_pool_t *pool = nullptr)
   {
-    hb_vector_t<int> rounded_deltas;
-    if (unlikely (!rounded_deltas.alloc (point_indices.length)))
+    if (unlikely (!rounded_deltas.resize_dirty  (point_indices.length)))
       return false;
 
+    unsigned j = 0;
     for (unsigned i = 0; i < point_indices.length; i++)
     {
       if (!point_indices[i]) continue;
-      int rounded_delta = (int) roundf (x_deltas.arrayZ[i]);
-      rounded_deltas.push (rounded_delta);
+      rounded_deltas.arrayZ[j++] = (int) roundf (x_deltas.arrayZ[i]);
     }
+    rounded_deltas.resize (j);
 
     if (!rounded_deltas) return true;
-    /* allocate enough memories 5 * num_deltas */
-    unsigned alloc_len = 5 * rounded_deltas.length;
+    /* Allocate enough memory: this is the correct bound:
+     * Worst case scenario is that each delta has to be encoded in 4 bytes, and there
+     * are runs of 64 items each. Any delta encoded in less than 4 bytes (2, 1, or 0)
+     * is still smaller than the 4-byte encoding even with their control byte.
+     * The initial 2 is to handle length==0, for both x and y deltas. */
+    unsigned alloc_len = 2 + 4 * rounded_deltas.length + (rounded_deltas.length + 63) / 64;
     if (y_deltas)
       alloc_len *= 2;
 
-    if (unlikely (!compiled_deltas.resize (alloc_len))) return false;
+    if (unlikely (!compiled_deltas.allocate_from_pool (pool, alloc_len, false))) return false;
 
     unsigned encoded_len = compile_deltas (compiled_deltas, rounded_deltas);
 
@@ -557,28 +632,30 @@ struct tuple_delta_t
       if (j != rounded_deltas.length) return false;
       encoded_len += compile_deltas (compiled_deltas.as_array ().sub_array (encoded_len), rounded_deltas);
     }
-    return compiled_deltas.resize (encoded_len);
+    compiled_deltas.shrink_back_to_pool (pool, encoded_len);
+    return true;
   }
 
   static unsigned compile_deltas (hb_array_t<unsigned char> encoded_bytes,
                                   hb_array_t<const int> deltas)
   {
-    return TupleValues::compile (deltas, encoded_bytes);
+    return TupleValues::compile_unsafe (deltas, encoded_bytes);
   }
 
-  bool calc_inferred_deltas (const contour_point_vector_t& orig_points)
+  bool calc_inferred_deltas (const contour_point_vector_t& orig_points,
+                             hb_vector_t<unsigned> &scratch)
   {
     unsigned point_count = orig_points.length;
     if (point_count != indices.length)
       return false;
 
     unsigned ref_count = 0;
-    hb_vector_t<unsigned> end_points;
+
+    hb_vector_t<unsigned> &end_points = scratch.reset ();
 
     for (unsigned i = 0; i < point_count; i++)
     {
-      if (indices.arrayZ[i])
-        ref_count++;
+      ref_count += indices.arrayZ[i];
       if (orig_points.arrayZ[i].is_end_point)
         end_points.push (i);
     }
@@ -587,7 +664,7 @@ struct tuple_delta_t
       return true;
     if (unlikely (end_points.in_error ())) return false;
 
-    hb_set_t inferred_idxes;
+    hb_bit_set_t inferred_idxes;
     unsigned start_point = 0;
     for (unsigned end_point : end_points)
     {
@@ -661,6 +738,7 @@ struct tuple_delta_t
 
   bool optimize (const contour_point_vector_t& contour_points,
                  bool is_composite,
+                 optimize_scratch_t &scratch,
                  double tolerance = 0.5 + 1e-10)
   {
     unsigned count = contour_points.length;
@@ -668,22 +746,21 @@ struct tuple_delta_t
         deltas_y.length != count)
       return false;
 
-    hb_vector_t<bool> opt_indices;
-    hb_vector_t<int> rounded_x_deltas, rounded_y_deltas;
+    hb_vector_t<bool> &opt_indices = scratch.opt_indices.reset ();
+    hb_vector_t<int> &rounded_x_deltas = scratch.rounded_x_deltas;
+    hb_vector_t<int> &rounded_y_deltas = scratch.rounded_y_deltas;
 
-    if (unlikely (!rounded_x_deltas.alloc (count) ||
-                  !rounded_y_deltas.alloc (count)))
+    if (unlikely (!rounded_x_deltas.resize_dirty  (count) ||
+                  !rounded_y_deltas.resize_dirty  (count)))
       return false;
 
     for (unsigned i = 0; i < count; i++)
     {
-      int rounded_x_delta = (int) roundf (deltas_x.arrayZ[i]);
-      int rounded_y_delta = (int) roundf (deltas_y.arrayZ[i]);
-      rounded_x_deltas.push (rounded_x_delta);
-      rounded_y_deltas.push (rounded_y_delta);
+      rounded_x_deltas.arrayZ[i] = (int) roundf (deltas_x.arrayZ[i]);
+      rounded_y_deltas.arrayZ[i] = (int) roundf (deltas_y.arrayZ[i]);
     }
 
-    if (!iup_delta_optimize (contour_points, rounded_x_deltas, rounded_y_deltas, opt_indices, tolerance))
+    if (!iup_delta_optimize (contour_points, rounded_x_deltas, rounded_y_deltas, opt_indices, scratch.iup, tolerance))
       return false;
 
     unsigned ref_count = 0;
@@ -692,7 +769,8 @@ struct tuple_delta_t
 
     if (ref_count == count) return true;
 
-    hb_vector_t<float> opt_deltas_x, opt_deltas_y;
+    hb_vector_t<float> &opt_deltas_x = scratch.opt_deltas_x.reset ();
+    hb_vector_t<float> &opt_deltas_y = scratch.opt_deltas_y.reset ();
     bool is_comp_glyph_wo_deltas = (is_composite && ref_count == 0);
     if (is_comp_glyph_wo_deltas)
     {
@@ -705,34 +783,31 @@ struct tuple_delta_t
         opt_indices.arrayZ[i] = false;
     }
 
-    hb_vector_t<unsigned char> opt_point_data;
+    hb_vector_t<unsigned char> &opt_point_data = scratch.opt_point_data.reset ();
     if (!compile_point_set (opt_indices, opt_point_data))
       return false;
-    hb_vector_t<unsigned char> opt_deltas_data;
+    hb_vector_t<unsigned char> &opt_deltas_data = scratch.opt_deltas_data.reset ();
     if (!compile_deltas (opt_indices,
                          is_comp_glyph_wo_deltas ? opt_deltas_x : deltas_x,
                          is_comp_glyph_wo_deltas ? opt_deltas_y : deltas_y,
-                         opt_deltas_data))
+                         opt_deltas_data,
+                         scratch.rounded_deltas))
       return false;
 
-    hb_vector_t<unsigned char> point_data;
+    hb_vector_t<unsigned char> &point_data = scratch.point_data.reset ();
     if (!compile_point_set (indices, point_data))
       return false;
-    hb_vector_t<unsigned char> deltas_data;
-    if (!compile_deltas (indices, deltas_x, deltas_y, deltas_data))
+    hb_vector_t<unsigned char> &deltas_data = scratch.deltas_data.reset ();
+    if (!compile_deltas (indices, deltas_x, deltas_y, deltas_data, scratch.rounded_deltas))
       return false;
 
     if (opt_point_data.length + opt_deltas_data.length < point_data.length + deltas_data.length)
     {
-      indices.fini ();
       indices = std::move (opt_indices);
 
       if (is_comp_glyph_wo_deltas)
       {
-        deltas_x.fini ();
         deltas_x = std::move (opt_deltas_x);
-
-        deltas_y.fini ();
         deltas_y = std::move (opt_deltas_y);
       }
     }
@@ -757,7 +832,7 @@ struct tuple_delta_t
 
     /* allocate enough memories: 2 bytes for count + 3 bytes for each point */
     unsigned num_bytes = 2 + 3 *num_points;
-    if (unlikely (!compiled_points.resize (num_bytes, false)))
+    if (unlikely (!compiled_points.resize_dirty  (num_bytes)))
       return false;
 
     unsigned pos = 0;
@@ -821,7 +896,7 @@ struct tuple_delta_t
       else
         compiled_points.arrayZ[header_pos] = (run_length - 1) | 0x80;
     }
-    return compiled_points.resize (pos, false);
+    return compiled_points.resize_dirty  (pos);
   }
 
   static double infer_delta (double target_val, double prev_val, double next_val, double prev_delta, double next_delta)
@@ -852,15 +927,15 @@ struct TupleVariationData
     return_trace (c->check_struct (this));
   }
 
-  unsigned get_size (unsigned axis_count) const
+  unsigned get_size (unsigned axis_count_times_2) const
   {
     unsigned total_size = min_size;
     unsigned count = tupleVarCount.get_count ();
     const TupleVariationHeader *tuple_var_header = &(get_tuple_var_header());
     for (unsigned i = 0; i < count; i++)
     {
-      total_size += tuple_var_header->get_size (axis_count) + tuple_var_header->get_data_size ();
-      tuple_var_header = &tuple_var_header->get_next (axis_count);
+      total_size += tuple_var_header->get_size (axis_count_times_2) + tuple_var_header->get_data_size ();
+      tuple_var_header = &tuple_var_header->get_next (axis_count_times_2);
     }
 
     return total_size;
@@ -925,8 +1000,12 @@ struct TupleVariationData
                                      const hb_map_t *axes_old_index_tag_map,
                                      const hb_vector_t<unsigned> &shared_indices,
                                      const hb_array_t<const F2DOT14> shared_tuples,
-                                     bool is_composite_glyph)
+                                     hb_alloc_pool_t *pool = nullptr,
+                                     bool is_composite_glyph = false)
     {
+      hb_vector_t<unsigned> private_indices;
+      hb_vector_t<int> deltas_x;
+      hb_vector_t<int> deltas_y;
       do
       {
         const HBUINT8 *p = iterator.get_serialized_data ();
@@ -939,7 +1018,7 @@ struct TupleVariationData
             || axis_tuples.is_empty ())
           return false;
 
-        hb_vector_t<unsigned> private_indices;
+        private_indices.reset ();
         bool has_private_points = iterator.current_tuple->has_private_points ();
         const HBUINT8 *end = p + length;
         if (has_private_points &&
@@ -950,27 +1029,24 @@ struct TupleVariationData
         bool apply_to_all = (indices.length == 0);
         unsigned num_deltas = apply_to_all ? point_count : indices.length;
 
-        hb_vector_t<int> deltas_x;
-
-        if (unlikely (!deltas_x.resize (num_deltas, false) ||
+        if (unlikely (!deltas_x.resize_dirty  (num_deltas) ||
                       !TupleVariationData::decompile_deltas (p, deltas_x, end)))
           return false;
 
-        hb_vector_t<int> deltas_y;
         if (is_gvar)
         {
-          if (unlikely (!deltas_y.resize (num_deltas, false) ||
+          if (unlikely (!deltas_y.resize_dirty  (num_deltas) ||
                         !TupleVariationData::decompile_deltas (p, deltas_y, end)))
             return false;
         }
 
         tuple_delta_t var;
         var.axis_tuples = std::move (axis_tuples);
-        if (unlikely (!var.indices.resize (point_count) ||
-                      !var.deltas_x.resize (point_count, false)))
+        if (unlikely (!var.indices.allocate_from_pool (pool, point_count) ||
+                      !var.deltas_x.allocate_from_pool (pool, point_count, false)))
           return false;
 
-        if (is_gvar && unlikely (!var.deltas_y.resize (point_count, false)))
+        if (is_gvar && unlikely (!var.deltas_y.allocate_from_pool (pool, point_count, false)))
           return false;
 
         for (unsigned i = 0; i < num_deltas; i++)
@@ -1012,8 +1088,8 @@ struct TupleVariationData
         /* In VarData, deltas are organized in rows, convert them into
          * column(region) based tuples, resize deltas_x first */
         tuple_delta_t tuple;
-        if (!tuple.deltas_x.resize (item_count, false) ||
-            !tuple.indices.resize (item_count, false))
+        if (!tuple.deltas_x.resize_dirty  (item_count) ||
+            !tuple.indices.resize_dirty  (item_count))
           return false;
 
         for (unsigned i = 0; i < item_count; i++)
@@ -1041,7 +1117,8 @@ struct TupleVariationData
     }
 
     bool change_tuple_variations_axis_limits (const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location,
-                                              const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances)
+                                              const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances,
+                                              hb_alloc_pool_t *pool = nullptr)
     {
       /* sort axis_tag/axis_limits, make result deterministic */
       hb_vector_t<hb_tag_t> axis_tags;
@@ -1050,6 +1127,10 @@ struct TupleVariationData
       for (auto t : normalized_axes_location.keys ())
         axis_tags.push (t);
 
+      // Reused vectors for reduced malloc pressure.
+      rebase_tent_result_scratch_t scratch;
+      hb_vector_t<tuple_delta_t> out;
+
       axis_tags.qsort (_cmp_axis_tag);
       for (auto axis_tag : axis_tags)
       {
@@ -1061,9 +1142,10 @@ struct TupleVariationData
           axis_triple_distances = axes_triple_distances.get (axis_tag);
 
         hb_vector_t<tuple_delta_t> new_vars;
-        for (const tuple_delta_t& var : tuple_vars)
+        for (tuple_delta_t& var : tuple_vars)
         {
-          hb_vector_t<tuple_delta_t> out = var.change_tuple_var_axis_limit (axis_tag, *axis_limit, axis_triple_distances);
+          // This may move var out.
+          var.change_tuple_var_axis_limit (axis_tag, *axis_limit, axis_triple_distances, out, scratch, pool);
           if (!out) continue;
 
           unsigned new_len = new_vars.length + out.length;
@@ -1074,7 +1156,6 @@ struct TupleVariationData
           for (unsigned i = 0; i < out.length; i++)
             new_vars.push (std::move (out[i]));
         }
-        tuple_vars.fini ();
         tuple_vars = std::move (new_vars);
       }
       return true;
@@ -1085,9 +1166,12 @@ struct TupleVariationData
     bool merge_tuple_variations (contour_point_vector_t* contour_points = nullptr)
     {
       hb_vector_t<tuple_delta_t> new_vars;
+      // The pre-allocation is essential for address stability of pointers
+      // we store in the hashmap.
+      if (unlikely (!new_vars.alloc (tuple_vars.length)))
+        return false;
       hb_hashmap_t<const hb_hashmap_t<hb_tag_t, Triple>*, unsigned> m;
-      unsigned i = 0;
-      for (const tuple_delta_t& var : tuple_vars)
+      for (tuple_delta_t& var : tuple_vars)
       {
         /* if all axes are pinned, drop the tuple variation */
         if (var.axis_tuples.is_empty ())
@@ -1107,13 +1191,17 @@ struct TupleVariationData
         }
         else
         {
-          new_vars.push (var);
-          if (!m.set (&(var.axis_tuples), i))
+          auto *new_var = new_vars.push ();
+          if (unlikely (new_vars.in_error ()))
+            return false;
+          hb_swap (*new_var, var);
+          if (unlikely (!m.set (&(new_var->axis_tuples), new_vars.length - 1)))
             return false;
-          i++;
         }
       }
-      tuple_vars.fini ();
+      m.fini (); // Just in case, since it points into new_vars data.
+                 // Shouldn't be necessary though, since we only move new_vars, not its
+                 // contents.
       tuple_vars = std::move (new_vars);
       return true;
     }
@@ -1173,20 +1261,22 @@ struct TupleVariationData
       }
     }
 
-    bool calc_inferred_deltas (const contour_point_vector_t& contour_points)
+    bool calc_inferred_deltas (const contour_point_vector_t& contour_points,
+                               hb_vector_t<unsigned> &scratch)
     {
       for (tuple_delta_t& var : tuple_vars)
-        if (!var.calc_inferred_deltas (contour_points))
+        if (!var.calc_inferred_deltas (contour_points, scratch))
           return false;
 
       return true;
     }
 
-    bool iup_optimize (const contour_point_vector_t& contour_points)
+    bool iup_optimize (const contour_point_vector_t& contour_points,
+                       optimize_scratch_t &scratch)
     {
       for (tuple_delta_t& var : tuple_vars)
       {
-        if (!var.optimize (contour_points, is_composite))
+        if (!var.optimize (contour_points, is_composite, scratch))
           return false;
       }
       return true;
@@ -1195,16 +1285,21 @@ struct TupleVariationData
     public:
     bool instantiate (const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location,
                       const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances,
+                      optimize_scratch_t &scratch,
+                      hb_alloc_pool_t *pool = nullptr,
                       contour_point_vector_t* contour_points = nullptr,
                       bool optimize = false)
     {
       if (!tuple_vars) return true;
-      if (!change_tuple_variations_axis_limits (normalized_axes_location, axes_triple_distances))
+      if (!change_tuple_variations_axis_limits (normalized_axes_location, axes_triple_distances, pool))
         return false;
       /* compute inferred deltas only for gvar */
       if (contour_points)
-        if (!calc_inferred_deltas (*contour_points))
+      {
+        hb_vector_t<unsigned> scratch;
+        if (!calc_inferred_deltas (*contour_points, scratch))
           return false;
+      }
 
       /* if iup delta opt is on, contour_points can't be null */
       if (optimize && !contour_points)
@@ -1213,7 +1308,7 @@ struct TupleVariationData
       if (!merge_tuple_variations (optimize ? contour_points : nullptr))
         return false;
 
-      if (optimize && !iup_optimize (*contour_points)) return false;
+      if (optimize && !iup_optimize (*contour_points, scratch)) return false;
       return !tuple_vars.in_error ();
     }
 
@@ -1221,7 +1316,8 @@ struct TupleVariationData
                         const hb_map_t& axes_old_index_tag_map,
                         bool use_shared_points,
                         bool is_gvar = false,
-                        const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* shared_tuples_idx_map = nullptr)
+                        const hb_hashmap_t<const hb_vector_t<F2DOT14>*, unsigned>* shared_tuples_idx_map = nullptr,
+                        hb_alloc_pool_t *pool = nullptr)
     {
       // return true for empty glyph
       if (!tuple_vars)
@@ -1241,6 +1337,7 @@ struct TupleVariationData
         if (shared_points_bytes)
           compiled_byte_size += shared_points_bytes->length;
       }
+      hb_vector_t<int> rounded_deltas_scratch;
       // compile delta and tuple var header for each tuple variation
       for (auto& tuple: tuple_vars)
       {
@@ -1254,12 +1351,13 @@ struct TupleVariationData
          * this tuple */
         if (!points_data->length)
           continue;
-        if (!tuple.compile_deltas ())
+        if (!tuple.compile_deltas (rounded_deltas_scratch, pool))
           return false;
 
         unsigned points_data_length = (points_data != shared_points_bytes) ? points_data->length : 0;
         if (!tuple.compile_tuple_var_header (axes_index_map, points_data_length, axes_old_index_tag_map,
-                                             shared_tuples_idx_map))
+                                             shared_tuples_idx_map,
+                                             pool))
           return false;
         compiled_byte_size += tuple.compiled_tuple_header.length + points_data_length + tuple.compiled_deltas.length;
       }
@@ -1330,8 +1428,9 @@ struct TupleVariationData
     {
       var_data_bytes = var_data_bytes_;
       var_data = var_data_bytes_.as<TupleVariationData> ();
-      index = 0;
+      tuples_left = var_data->tupleVarCount.get_count ();
       axis_count = axis_count_;
+      axis_count_times_2 = axis_count_ * 2;
       current_tuple = &var_data->get_tuple_var_header ();
       data_offset = 0;
       table_base = table_base_;
@@ -1349,30 +1448,42 @@ struct TupleVariationData
       return true;
     }
 
-    bool is_valid () const
+    bool is_valid ()
     {
-      return (index < var_data->tupleVarCount.get_count ()) &&
-             var_data_bytes.check_range (current_tuple, TupleVariationHeader::min_size) &&
-             var_data_bytes.check_range (current_tuple, hb_max (current_tuple->get_data_size (),
-                                                                current_tuple->get_size (axis_count)));
+      if (unlikely (tuples_left <= 0))
+        return false;
+
+      current_tuple_size = TupleVariationHeader::min_size;
+      if (unlikely (!var_data_bytes.check_end ((const char *) current_tuple + current_tuple_size)))
+        return false;
+
+      current_tuple_size = current_tuple->get_size (axis_count_times_2);
+      if (unlikely (!var_data_bytes.check_end ((const char *) current_tuple + current_tuple_size)))
+        return false;
+
+      return true;
     }
 
+    HB_ALWAYS_INLINE
     bool move_to_next ()
     {
       data_offset += current_tuple->get_data_size ();
-      current_tuple = &current_tuple->get_next (axis_count);
-      index++;
+      current_tuple = &StructAtOffset<TupleVariationHeader> (current_tuple, current_tuple_size);
+      tuples_left--;
       return is_valid ();
     }
 
+    // TODO: Make it return (sanitized) hb_bytes_t
     const HBUINT8 *get_serialized_data () const
     { return &(table_base+var_data->data) + data_offset; }
 
     private:
+    signed tuples_left;
     const TupleVariationData *var_data;
-    unsigned int index;
     unsigned int axis_count;
+    unsigned int axis_count_times_2;
     unsigned int data_offset;
+    unsigned int current_tuple_size;
     const void *table_base;
 
     public:
@@ -1411,7 +1522,7 @@ struct TupleVariationData
       if (unlikely (p + 1 > end)) return false;
       count = ((count & POINT_RUN_COUNT_MASK) << 8) | *p++;
     }
-    if (unlikely (!points.resize (count, false))) return false;
+    if (unlikely (!points.resize_dirty  (count))) return false;
 
     unsigned n = 0;
     unsigned i = 0;
@@ -1446,12 +1557,14 @@ struct TupleVariationData
   }
 
   template <typename T>
+  HB_ALWAYS_INLINE
   static bool decompile_deltas (const HBUINT8 *&p /* IN/OUT */,
                                 hb_vector_t<T> &deltas /* IN/OUT */,
                                 const HBUINT8 *end,
-                                bool consume_all = false)
+                                bool consume_all = false,
+                                unsigned start = 0)
   {
-    return TupleValues::decompile (p, deltas, end, consume_all);
+    return TupleValues::decompile (p, deltas, end, consume_all, start);
   }
 
   bool has_data () const { return tupleVarCount; }
@@ -1463,6 +1576,7 @@ struct TupleVariationData
                                    const hb_vector_t<unsigned> &shared_indices,
                                    const hb_array_t<const F2DOT14> shared_tuples,
                                    tuple_variations_t& tuple_variations, /* OUT */
+                                   hb_alloc_pool_t *pool = nullptr,
                                    bool is_composite_glyph = false) const
   {
     return tuple_variations.create_from_tuple_var_data (iterator, tupleVarCount,
@@ -1470,6 +1584,7 @@ struct TupleVariationData
                                                         axes_old_index_tag_map,
                                                         shared_indices,
                                                         shared_tuples,
+                                                        pool,
                                                         is_composite_glyph);
   }
 
@@ -1634,8 +1749,9 @@ struct item_variations_t
   bool instantiate_tuple_vars (const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location,
                                const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances)
   {
+    optimize_scratch_t scratch;
     for (tuple_variations_t& tuple_vars : vars)
-      if (!tuple_vars.instantiate (normalized_axes_location, axes_triple_distances))
+      if (!tuple_vars.instantiate (normalized_axes_location, axes_triple_distances, scratch))
         return false;
 
     if (!build_region_list ()) return false;
@@ -1720,30 +1836,28 @@ struct item_variations_t
 
   struct combined_gain_idx_tuple_t
   {
-    int gain;
-    unsigned idx_1;
-    unsigned idx_2;
+    uint64_t encoded;
 
     combined_gain_idx_tuple_t () = default;
-    combined_gain_idx_tuple_t (int gain_, unsigned i, unsigned j)
-        :gain (gain_), idx_1 (i), idx_2 (j) {}
+    combined_gain_idx_tuple_t (unsigned gain, unsigned i, unsigned j)
+        : encoded ((uint64_t (0xFFFFFF - gain) << 40) | (uint64_t (i) << 20) | uint64_t (j))
+    {
+      assert (gain < 0xFFFFFF);
+      assert (i < 0xFFFFFFF && j < 0xFFFFFFF);
+    }
 
     bool operator < (const combined_gain_idx_tuple_t& o)
     {
-      if (gain != o.gain)
-        return gain < o.gain;
-
-      if (idx_1 != o.idx_1)
-        return idx_1 < o.idx_1;
-
-      return idx_2 < o.idx_2;
+      return encoded < o.encoded;
     }
 
     bool operator <= (const combined_gain_idx_tuple_t& o)
     {
-      if (*this < o) return true;
-      return gain == o.gain && idx_1 == o.idx_1 && idx_2 == o.idx_2;
+      return encoded <= o.encoded;
     }
+
+    unsigned idx_1 () const { return (encoded >> 20) & 0xFFFFF; };
+    unsigned idx_2 () const { return encoded & 0xFFFFF; };
   };
 
   bool as_item_varstore (bool optimize=true, bool use_no_variation_idx=true)
@@ -1765,9 +1879,9 @@ struct item_variations_t
     hb_hashmap_t<unsigned, const hb_vector_t<int>*> front_mapping;
     unsigned start_row = 0;
     hb_vector_t<delta_row_encoding_t> encoding_objs;
-    hb_hashmap_t<hb_vector_t<uint8_t>, unsigned> chars_idx_map;
 
     /* delta_rows map, used for filtering out duplicate rows */
+    hb_vector_t<const hb_vector_t<int> *> major_rows;
     hb_hashmap_t<const hb_vector_t<int>*, unsigned> delta_rows_map;
     for (unsigned major = 0; major < vars.length; major++)
     {
@@ -1775,6 +1889,9 @@ struct item_variations_t
        * (row based) delta */
       const tuple_variations_t& tuples = vars[major];
       unsigned num_rows = var_data_num_rows[major];
+
+      if (!num_rows) continue;
+
       for (const tuple_delta_t& tuple: tuples.tuple_vars)
       {
         if (tuple.deltas_x.length != num_rows)
@@ -1789,24 +1906,11 @@ struct item_variations_t
         {
           int rounded_delta = roundf (tuple.deltas_x[i]);
           delta_rows[start_row + i][*col_idx] += rounded_delta;
-          if ((!has_long) && (rounded_delta < -65536 || rounded_delta > 65535))
-            has_long = true;
+          has_long |= rounded_delta < -65536 || rounded_delta > 65535;
         }
       }
 
-      if (!optimize)
-      {
-        /* assemble a delta_row_encoding_t for this subtable, skip optimization so
-         * chars is not initialized, we only need delta rows for serialization */
-        delta_row_encoding_t obj;
-        for (unsigned r = start_row; r < start_row + num_rows; r++)
-          obj.add_row (&(delta_rows.arrayZ[r]));
-
-        encodings.push (std::move (obj));
-        start_row += num_rows;
-        continue;
-      }
-
+      major_rows.reset ();
       for (unsigned minor = 0; minor < num_rows; minor++)
       {
         const hb_vector_t<int>& row = delta_rows[start_row + minor];
@@ -1828,42 +1932,40 @@ struct item_variations_t
         if (!front_mapping.set ((major<<16) + minor, &row))
           return false;
 
-        hb_vector_t<uint8_t> chars = delta_row_encoding_t::get_row_chars (row);
-        if (!chars) return false;
-
         if (delta_rows_map.has (&row))
           continue;
 
         delta_rows_map.set (&row, 1);
-        unsigned *obj_idx;
-        if (chars_idx_map.has (chars, &obj_idx))
-        {
-          delta_row_encoding_t& obj = encoding_objs[*obj_idx];
-          if (!obj.add_row (&row))
-            return false;
-        }
-        else
-        {
-          if (!chars_idx_map.set (chars, encoding_objs.length))
-            return false;
-          delta_row_encoding_t obj (std::move (chars), &row);
-          encoding_objs.push (std::move (obj));
-        }
+
+        major_rows.push (&row);
       }
 
+      if (major_rows)
+        encoding_objs.push (delta_row_encoding_t (std::move (major_rows), num_cols));
+
       start_row += num_rows;
     }
 
     /* return directly if no optimization, maintain original VariationIndex so
      * varidx_map would be empty */
-    if (!optimize) return !encodings.in_error ();
+    if (!optimize)
+    {
+      encodings = std::move (encoding_objs);
+      return !encodings.in_error ();
+    }
 
-    /* sort encoding_objs */
+    /* NOTE: Fonttools instancer always optimizes VarStore from scratch. This
+     * is too costly for large fonts. So, instead, we retain the encodings of
+     * the original VarStore, and just try to combine them if possible. This
+     * is a compromise between optimization and performance and practically
+     * works very well. */
+
+    // This produces slightly smaller results in some cases.
     encoding_objs.qsort ();
 
-    /* main algorithm: repeatedly pick 2 best encodings to combine, and combine
-     * them */
-    hb_priority_queue_t<combined_gain_idx_tuple_t> queue;
+    /* main algorithm: repeatedly pick 2 best encodings to combine, and combine them */
+    using item_t = hb_priority_queue_t<combined_gain_idx_tuple_t>::item_t;
+    hb_vector_t<item_t> queue_items;
     unsigned num_todos = encoding_objs.length;
     for (unsigned i = 0; i < num_todos; i++)
     {
@@ -1871,16 +1973,18 @@ struct item_variations_t
       {
         int combining_gain = encoding_objs.arrayZ[i].gain_from_merging (encoding_objs.arrayZ[j]);
         if (combining_gain > 0)
-          queue.insert (combined_gain_idx_tuple_t (-combining_gain, i, j), 0);
+          queue_items.push (item_t (combined_gain_idx_tuple_t (combining_gain, i, j), 0));
       }
     }
 
-    hb_set_t removed_todo_idxes;
+    hb_priority_queue_t<combined_gain_idx_tuple_t> queue (std::move (queue_items));
+
+    hb_bit_set_t removed_todo_idxes;
     while (queue)
     {
       auto t = queue.pop_minimum ().first;
-      unsigned i = t.idx_1;
-      unsigned j = t.idx_2;
+      unsigned i = t.idx_1 ();
+      unsigned j = t.idx_2 ();
 
       if (removed_todo_idxes.has (i) || removed_todo_idxes.has (j))
         continue;
@@ -1891,40 +1995,36 @@ struct item_variations_t
       removed_todo_idxes.add (i);
       removed_todo_idxes.add (j);
 
-      hb_vector_t<uint8_t> combined_chars;
-      if (!combined_chars.alloc (encoding.chars.length))
-        return false;
-
-      for (unsigned idx = 0; idx < encoding.chars.length; idx++)
-      {
-        uint8_t v = hb_max (encoding.chars.arrayZ[idx], other_encoding.chars.arrayZ[idx]);
-        combined_chars.push (v);
-      }
-
-      delta_row_encoding_t combined_encoding_obj (std::move (combined_chars));
-      for (const auto& row : hb_concat (encoding.items, other_encoding.items))
-        combined_encoding_obj.add_row (row);
+      encoding.merge (other_encoding);
 
       for (unsigned idx = 0; idx < encoding_objs.length; idx++)
       {
         if (removed_todo_idxes.has (idx)) continue;
 
         const delta_row_encoding_t& obj = encoding_objs.arrayZ[idx];
-        if (obj.chars == combined_chars)
+        // In the unlikely event that the same encoding exists already, combine it.
+        if (obj.width == encoding.width && obj.chars == encoding.chars)
         {
+          // This is straight port from fonttools algorithm. I added this branch there
+          // because I thought it can happen. But looks like we never get in here in
+          // practice. I'm not confident enough to remove it though; in theory it can
+          // happen. I think it's just that our tests are not extensive enough to hit
+          // this path.
+
           for (const auto& row : obj.items)
-            combined_encoding_obj.add_row (row);
+            encoding.add_row (row);
 
           removed_todo_idxes.add (idx);
           continue;
         }
 
-        int combined_gain = combined_encoding_obj.gain_from_merging (obj);
+        int combined_gain = encoding.gain_from_merging (obj);
         if (combined_gain > 0)
-          queue.insert (combined_gain_idx_tuple_t (-combined_gain, idx, encoding_objs.length), 0);
+          queue.insert (combined_gain_idx_tuple_t (combined_gain, idx, encoding_objs.length), 0);
       }
 
-      encoding_objs.push (std::move (combined_encoding_obj));
+      auto moved_encoding = std::move (encoding);
+      encoding_objs.push (moved_encoding);
     }
 
     int num_final_encodings = (int) encoding_objs.length - (int) removed_todo_idxes.get_population ();
@@ -1937,9 +2037,6 @@ struct item_variations_t
       encodings.push (std::move (encoding_objs.arrayZ[i]));
     }
 
-    /* sort again based on width, make result deterministic */
-    encodings.qsort (delta_row_encoding_t::cmp_width);
-
     return compile_varidx_map (front_mapping);
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh
index 3dc4ebaebd8..d8f497d5346 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh
@@ -84,7 +84,7 @@ struct cvar
     if (!coords) return true;
     hb_vector_t<unsigned> shared_indices;
     TupleVariationData<>::tuple_iterator_t iterator;
-    unsigned var_data_length = tuple_var_data->get_size (axis_count);
+    unsigned var_data_length = tuple_var_data->get_size (axis_count * 2);
     hb_bytes_t var_data_bytes = hb_bytes_t (reinterpret_cast<const char*> (tuple_var_data), var_data_length);
     if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, base,
                                                  shared_indices, &iterator))
@@ -113,7 +113,7 @@ struct cvar
 
       bool apply_to_all = (indices.length == 0);
       unsigned num_deltas = apply_to_all ? num_cvt_item : indices.length;
-      if (unlikely (!unpacked_deltas.resize (num_deltas, false))) return false;
+      if (unlikely (!unpacked_deltas.resize_dirty  (num_deltas))) return false;
       if (unlikely (!TupleVariationData<>::decompile_deltas (p, unpacked_deltas, end))) return false;
 
       for (unsigned int i = 0; i < num_deltas; i++)
@@ -158,7 +158,8 @@ struct cvar
                                      tuple_variations))
       return_trace (false);
 
-    if (!tuple_variations.instantiate (c->plan->axes_location, c->plan->axes_triple_distances))
+    optimize_scratch_t scratch;
+    if (!tuple_variations.instantiate (c->plan->axes_location, c->plan->axes_triple_distances, scratch))
       return_trace (false);
 
     if (!tuple_variations.compile_bytes (c->plan->axes_index_map, c->plan->axes_old_index_tag_map,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh
index f2725eaa282..74d392de9b7 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh
@@ -179,7 +179,7 @@ struct AxisRecord
 
   hb_tag_t get_axis_tag () const { return axisTag; }
 
-  int normalize_axis_value (float v) const
+  float normalize_axis_value (float v) const
   {
     float min_value, default_value, max_value;
     get_coordinates (min_value, default_value, max_value);
@@ -189,23 +189,9 @@ struct AxisRecord
     if (v == default_value)
       return 0;
     else if (v < default_value)
-      v = (v - default_value) / (default_value - min_value);
+      return (v - default_value) / (default_value - min_value);
     else
-      v = (v - default_value) / (max_value - default_value);
-    return roundf (v * 16384.f);
-  }
-
-  float unnormalize_axis_value (int v) const
-  {
-    float min_value, default_value, max_value;
-    get_coordinates (min_value, default_value, max_value);
-
-    if (v == 0)
-      return default_value;
-    else if (v < 0)
-      return v * (default_value - min_value) / 16384.f + default_value;
-    else
-      return v * (max_value - default_value) / 16384.f + default_value;
+      return (v - default_value) / (max_value - default_value);
   }
 
   hb_ot_name_id_t get_name_id () const { return axisNameID; }
@@ -341,12 +327,9 @@ struct fvar
     return axes.lfind (tag, &i) && ((void) axes[i].get_axis_info (i, info), true);
   }
 
-  int normalize_axis_value (unsigned int axis_index, float v) const
+  float normalize_axis_value (unsigned int axis_index, float v) const
   { return get_axes ()[axis_index].normalize_axis_value (v); }
 
-  float unnormalize_axis_value (unsigned int axis_index, int v) const
-  { return get_axes ()[axis_index].unnormalize_axis_value (v); }
-
   unsigned int get_instance_count () const { return instanceCount; }
 
   hb_ot_name_id_t get_instance_subfamily_name_id (unsigned int instance_index) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh
index 9f9b5be3cbe..7c42f548456 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh
@@ -66,12 +66,14 @@ struct glyph_variations_t
 
   hb_vector_t<tuple_variations_t> glyph_variations;
 
-  hb_vector_t<char> compiled_shared_tuples;
+  hb_vector_t<F2DOT14> compiled_shared_tuples;
   private:
   unsigned shared_tuples_count = 0;
 
   /* shared coords-> index map after instantiation */
-  hb_hashmap_t<const hb_vector_t<char>*, unsigned> shared_tuples_idx_map;
+  hb_hashmap_t<const hb_vector_t<F2DOT14>*, unsigned> shared_tuples_idx_map;
+
+  hb_alloc_pool_t pool;
 
   public:
   unsigned compiled_shared_tuples_count () const
@@ -128,6 +130,7 @@ struct glyph_variations_t
                                           iterator, &(plan->axes_old_index_tag_map),
                                           shared_indices, shared_tuples,
                                           tuple_vars, /* OUT */
+                                          &pool,
                                           is_composite_glyph))
         return false;
       glyph_variations.push (std::move (tuple_vars));
@@ -139,6 +142,7 @@ struct glyph_variations_t
   {
     unsigned count = plan->new_to_old_gid_list.length;
     bool iup_optimize = false;
+    optimize_scratch_t scratch;
     iup_optimize = plan->flags & HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS;
     for (unsigned i = 0; i < count; i++)
     {
@@ -146,7 +150,7 @@ struct glyph_variations_t
       contour_point_vector_t *all_points;
       if (!plan->new_gid_contour_points_map.has (new_gid, &all_points))
         return false;
-      if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, all_points, iup_optimize))
+      if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, scratch, &pool, all_points, iup_optimize))
         return false;
     }
     return true;
@@ -161,7 +165,8 @@ struct glyph_variations_t
       if (!vars.compile_bytes (axes_index_map, axes_old_index_tag_map,
                                true, /* use shared points*/
                                true,
-                               &shared_tuples_idx_map))
+                               &shared_tuples_idx_map,
+                               &pool))
         return false;
 
     return true;
@@ -172,20 +177,21 @@ struct glyph_variations_t
   {
     /* key is pointer to compiled_peak_coords inside each tuple, hashing
      * function will always deref pointers first */
-    hb_hashmap_t<const hb_vector_t<char>*, unsigned> coords_count_map;
+    hb_hashmap_t<const hb_vector_t<F2DOT14>*, unsigned> coords_count_map;
 
     /* count the num of shared coords */
     for (tuple_variations_t& vars: glyph_variations)
     {
       for (tuple_delta_t& var : vars.tuple_vars)
       {
-        if (!var.compile_peak_coords (axes_index_map, axes_old_index_tag_map))
+        if (!var.compile_coords (axes_index_map, axes_old_index_tag_map, &pool))
           return false;
-        unsigned* count;
-        if (coords_count_map.has (&(var.compiled_peak_coords), &count))
-          coords_count_map.set (&(var.compiled_peak_coords), *count + 1);
+        unsigned *count;
+        unsigned hash = hb_hash (&var.compiled_peak_coords);
+        if (coords_count_map.has_with_hash (&(var.compiled_peak_coords), hash, &count))
+          (*count)++;
         else
-          coords_count_map.set (&(var.compiled_peak_coords), 1);
+          coords_count_map.set_with_hash (&(var.compiled_peak_coords), hash, 1);
       }
     }
 
@@ -193,66 +199,45 @@ struct glyph_variations_t
       return false;
 
     /* add only those coords that are used more than once into the vector and sort */
-    hb_vector_t<const hb_vector_t<char>*> shared_coords;
-    if (unlikely (!shared_coords.alloc (coords_count_map.get_population ())))
-      return false;
-
-    for (const auto _ : coords_count_map.iter ())
-    {
-      if (_.second == 1) continue;
-      shared_coords.push (_.first);
-    }
+    hb_vector_t<hb_pair_t<const hb_vector_t<F2DOT14>*, unsigned>> shared_coords {
+      + hb_iter (coords_count_map)
+      | hb_filter ([] (const hb_pair_t<const hb_vector_t<F2DOT14>*, unsigned>& p) { return p.second > 1; })
+    };
+    if (unlikely (shared_coords.in_error ())) return false;
 
     /* no shared tuples: no coords are used more than once */
     if (!shared_coords) return true;
     /* sorting based on the coords frequency first (high to low), then compare
      * the coords bytes */
-    hb_qsort (shared_coords.arrayZ, shared_coords.length, sizeof (hb_vector_t<char>*), _cmp_coords, (void *) (&coords_count_map));
+    shared_coords.qsort (_cmp_coords);
 
     /* build shared_coords->idx map and shared tuples byte array */
 
     shared_tuples_count = hb_min (0xFFFu + 1, shared_coords.length);
-    unsigned len = shared_tuples_count * (shared_coords[0]->length);
+    unsigned len = shared_tuples_count * (shared_coords[0].first->length);
     if (unlikely (!compiled_shared_tuples.alloc (len)))
       return false;
 
     for (unsigned i = 0; i < shared_tuples_count; i++)
     {
-      shared_tuples_idx_map.set (shared_coords[i], i);
+      shared_tuples_idx_map.set (shared_coords[i].first, i);
       /* add a concat() in hb_vector_t? */
-      for (char c : shared_coords[i]->iter ())
+      for (auto c : shared_coords[i].first->iter ())
         compiled_shared_tuples.push (c);
     }
 
     return true;
   }
 
-  static int _cmp_coords (const void *pa, const void *pb, void *arg)
+  static int _cmp_coords (const void *pa, const void *pb)
   {
-    const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* coords_count_map =
-        reinterpret_cast<const hb_hashmap_t<const hb_vector_t<char>*, unsigned>*> (arg);
+    const hb_pair_t<hb_vector_t<F2DOT14> *, unsigned> *a = (const hb_pair_t<hb_vector_t<F2DOT14> *, unsigned> *) pa;
+    const hb_pair_t<hb_vector_t<F2DOT14> *, unsigned> *b = (const hb_pair_t<hb_vector_t<F2DOT14> *, unsigned> *) pb;
 
-    /* shared_coords is hb_vector_t<const hb_vector_t<char>*> so casting pa/pb
-     * to be a pointer to a pointer */
-    const hb_vector_t<char>** a = reinterpret_cast<const hb_vector_t<char>**> (const_cast<void*>(pa));
-    const hb_vector_t<char>** b = reinterpret_cast<const hb_vector_t<char>**> (const_cast<void*>(pb));
+    if (a->second != b->second)
+      return b->second - a->second; // high to low
 
-    bool has_a = coords_count_map->has (*a);
-    bool has_b = coords_count_map->has (*b);
-
-    if (has_a && has_b)
-    {
-      unsigned a_num = coords_count_map->get (*a);
-      unsigned b_num = coords_count_map->get (*b);
-
-      if (a_num != b_num)
-        return b_num - a_num;
-
-      return (*b)->as_array().cmp ((*a)->as_array ());
-    }
-    else if (has_a) return -1;
-    else if (has_b) return 1;
-    else return 0;
+    return b->first->as_array().cmp (a->first->as_array ());
   }
 
   template<typename Iterator,
@@ -402,9 +387,9 @@ struct gvar_GVAR
       out->sharedTuples = 0;
     else
     {
-      hb_array_t<const char> shared_tuples = glyph_vars.compiled_shared_tuples.as_array ().copy (c);
+      hb_array_t<const F2DOT14> shared_tuples = glyph_vars.compiled_shared_tuples.as_array ().copy (c);
       if (!shared_tuples.arrayZ) return_trace (false);
-      out->sharedTuples = shared_tuples.arrayZ - (char *) out;
+      out->sharedTuples = (const char *) shared_tuples.arrayZ - (char *) out;
     }
 
     char *glyph_var_data = c->start_embed<char> ();
@@ -463,10 +448,18 @@ struct gvar_GVAR
     if (it->first == 0 && !(c->plan->flags & HB_SUBSET_FLAGS_NOTDEF_OUTLINE))
       it++;
     unsigned int subset_data_size = 0;
+    unsigned padding_size = 0;
     for (auto &_ : it)
     {
       hb_codepoint_t old_gid = _.second;
-      subset_data_size += get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length;
+      unsigned glyph_data_size = get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length;
+      if (glyph_data_size % 2)
+      {
+        glyph_data_size++;
+        padding_size++;
+      }
+
+      subset_data_size += glyph_data_size;
     }
 
     /* According to the spec: If the short format (Offset16) is used for offsets,
@@ -495,6 +488,8 @@ struct gvar_GVAR
 
     /* This ordering relative to the shared tuples array, which puts the glyphVariationData
        last in the table, is required when HB_SUBSET_FLAGS_IFTB_REQUIREMENTS is set */
+    if (long_offset)
+      subset_data_size -= padding_size;
     char *subset_data = c->serializer->allocate_size<char> (subset_data_size, false);
     if (!subset_data) return_trace (false);
     out->dataZ = subset_data - (char *) out;
@@ -533,8 +528,16 @@ struct gvar_GVAR
                                                             old_gid);
 
       hb_memcpy (subset_data, var_data_bytes.arrayZ, var_data_bytes.length);
-      subset_data += var_data_bytes.length;
-      glyph_offset += var_data_bytes.length;
+      unsigned glyph_data_size = var_data_bytes.length;
+      subset_data += glyph_data_size;
+      glyph_offset += glyph_data_size;
+
+      if (!long_offset && (glyph_data_size % 2))
+      {
+        *subset_data = 0;
+        subset_data++;
+        glyph_offset++;
+      }
 
       if (long_offset)
         ((HBUINT32 *) subset_offsets)[gid] = glyph_offset;
@@ -582,6 +585,17 @@ struct gvar_GVAR
   public:
   struct accelerator_t
   {
+
+    hb_scalar_cache_t *create_cache () const
+    {
+      return hb_scalar_cache_t::create (table->sharedTupleCount);
+    }
+
+    static void destroy_cache (hb_scalar_cache_t *cache)
+    {
+      hb_scalar_cache_t::destroy (cache);
+    }
+
     bool has_data () const { return table->has_data (); }
 
     accelerator_t (hb_face_t *face)
@@ -589,36 +603,6 @@ struct gvar_GVAR
       table = hb_sanitize_context_t ().reference_table<gvar_GVAR> (face);
       /* If sanitize failed, set glyphCount to 0. */
       glyphCount = table->version.to_int () ? face->get_num_glyphs () : 0;
-
-      /* For shared tuples that only have one or two axes active, shared the index
-       * of that axis as a cache. This will speed up caclulate_scalar() a lot
-       * for fonts with lots of axes and many "monovar" or "duovar" tuples. */
-      hb_array_t<const F2DOT14> shared_tuples = (table+table->sharedTuples).as_array (table->sharedTupleCount * table->axisCount);
-      unsigned count = table->sharedTupleCount;
-      if (unlikely (!shared_tuple_active_idx.resize (count, false))) return;
-      unsigned axis_count = table->axisCount;
-      for (unsigned i = 0; i < count; i++)
-      {
-        hb_array_t<const F2DOT14> tuple = shared_tuples.sub_array (axis_count * i, axis_count);
-        int idx1 = -1, idx2 = -1;
-        for (unsigned j = 0; j < axis_count; j++)
-        {
-          const F2DOT14 &peak = tuple.arrayZ[j];
-          if (peak.to_int () != 0)
-          {
-            if (idx1 == -1)
-              idx1 = j;
-            else if (idx2 == -1)
-              idx2 = j;
-            else
-            {
-              idx1 = idx2 = -1;
-              break;
-            }
-          }
-        }
-        shared_tuple_active_idx.arrayZ[i] = {idx1, idx2};
-      }
     }
     ~accelerator_t () { table.destroy (); }
 
@@ -655,6 +639,7 @@ struct gvar_GVAR
                                  hb_array_t<const int> coords,
                                  const hb_array_t<contour_point_t> points,
                                  hb_glyf_scratch_t &scratch,
+                                 hb_scalar_cache_t *gvar_cache = nullptr,
                                  bool phantom_only = false) const
     {
       if (unlikely (glyph >= glyphCount)) return true;
@@ -690,10 +675,12 @@ struct gvar_GVAR
 
       unsigned count = points.length;
       bool flush = false;
+
       do
       {
         float scalar = iterator.current_tuple->calculate_scalar (coords, num_coords, shared_tuples,
-                                                                 &shared_tuple_active_idx);
+                                                                 gvar_cache);
+
         if (scalar == 0.f) continue;
         const HBUINT8 *p = iterator.get_serialized_data ();
         unsigned int length = iterator.current_tuple->get_data_size ();
@@ -702,7 +689,7 @@ struct gvar_GVAR
 
         if (!deltas)
         {
-          if (unlikely (!deltas_vec.resize (count, false))) return false;
+          if (unlikely (!deltas_vec.resize_dirty  (count))) return false;
           deltas = deltas_vec.as_array ();
           hb_memset (deltas.arrayZ + (phantom_only ? count - 4 : 0), 0,
                      (phantom_only ? 4 : count) * sizeof (deltas[0]));
@@ -717,11 +704,12 @@ struct gvar_GVAR
         const hb_array_t<unsigned int> &indices = has_private_points ? private_indices : shared_indices;
 
         bool apply_to_all = (indices.length == 0);
-        unsigned int num_deltas = apply_to_all ? points.length : indices.length;
-        if (unlikely (!x_deltas.resize (num_deltas, false))) return false;
-        if (unlikely (!GlyphVariationData::decompile_deltas (p, x_deltas, end))) return false;
-        if (unlikely (!y_deltas.resize (num_deltas, false))) return false;
-        if (unlikely (!GlyphVariationData::decompile_deltas (p, y_deltas, end))) return false;
+        unsigned num_deltas = apply_to_all ? points.length : indices.length;
+        unsigned start_deltas = (apply_to_all && phantom_only && num_deltas >= 4 ? num_deltas - 4 : 0);
+        if (unlikely (!x_deltas.resize_dirty  (num_deltas))) return false;
+        if (unlikely (!GlyphVariationData::decompile_deltas (p, x_deltas, end, false, start_deltas))) return false;
+        if (unlikely (!y_deltas.resize_dirty  (num_deltas))) return false;
+        if (unlikely (!GlyphVariationData::decompile_deltas (p, y_deltas, end, false, start_deltas))) return false;
 
         if (!apply_to_all)
         {
@@ -884,7 +872,6 @@ struct gvar_GVAR
     private:
     hb_blob_ptr_t<gvar_GVAR> table;
     unsigned glyphCount;
-    hb_vector_t<hb_pair_t<int, int>> shared_tuple_active_idx;
   };
 
   protected:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh
index 40a85a62b78..652d738e7b5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh
@@ -42,57 +42,62 @@ struct index_map_subset_plan_t
     VORG_INDEX
   };
 
-  void init (const DeltaSetIndexMap  &index_map,
+  void init (const DeltaSetIndexMap  *index_map,
              hb_inc_bimap_t          &outer_map,
              hb_vector_t<hb_set_t *> &inner_sets,
              const hb_subset_plan_t  *plan,
              bool bypass_empty = true)
   {
     map_count = 0;
-    outer_bit_count = 0;
-    inner_bit_count = 1;
     max_inners.init ();
     output_map.init ();
 
-    if (bypass_empty && !index_map.get_map_count ()) return;
+    if (bypass_empty && (!index_map || !index_map->get_map_count ())) return;
 
     unsigned int        last_val = (unsigned int)-1;
     hb_codepoint_t      last_gid = HB_CODEPOINT_INVALID;
 
-    outer_bit_count = (index_map.get_width () * 8) - index_map.get_inner_bit_count ();
     max_inners.resize (inner_sets.length);
     for (unsigned i = 0; i < inner_sets.length; i++) max_inners[i] = 0;
 
     /* Search backwards for a map value different from the last map value */
     auto &new_to_old_gid_list = plan->new_to_old_gid_list;
     unsigned count = new_to_old_gid_list.length;
-    for (unsigned j = count; j; j--)
+    if (!index_map)
     {
-      hb_codepoint_t gid = new_to_old_gid_list.arrayZ[j - 1].first;
-      hb_codepoint_t old_gid = new_to_old_gid_list.arrayZ[j - 1].second;
-
-      unsigned int v = index_map.map (old_gid);
-      if (last_gid == HB_CODEPOINT_INVALID)
+      map_count = new_to_old_gid_list.tail ().first + 1;
+    }
+    else
+    {
+      for (unsigned j = count; j; j--)
       {
+        hb_codepoint_t gid = new_to_old_gid_list.arrayZ[j - 1].first;
+        hb_codepoint_t old_gid = new_to_old_gid_list.arrayZ[j - 1].second;
+
+        unsigned int v = index_map->map (old_gid);
+        if (last_gid == HB_CODEPOINT_INVALID)
+        {
         last_val = v;
         last_gid = gid;
         continue;
-      }
-      if (v != last_val)
+        }
+        if (v != last_val)
         break;
 
-      last_gid = gid;
+        last_gid = gid;
+      }
+
+      if (unlikely (last_gid == (hb_codepoint_t)-1)) return;
+      map_count = last_gid + 1;
     }
 
-    if (unlikely (last_gid == (hb_codepoint_t)-1)) return;
-    map_count = last_gid + 1;
     for (auto _ : plan->new_to_old_gid_list)
     {
       hb_codepoint_t gid = _.first;
       if (gid >= map_count) break;
 
       hb_codepoint_t old_gid = _.second;
-      unsigned int v = index_map.map (old_gid);
+      unsigned int v = index_map ? index_map->map (old_gid): old_gid;
       unsigned int outer = v >> 16;
       unsigned int inner = v & 0xFFFF;
       outer_map.add (outer);
@@ -113,6 +118,9 @@ struct index_map_subset_plan_t
               const hb_vector_t<hb_inc_bimap_t> &inner_maps,
               const hb_subset_plan_t *plan)
   {
+    outer_bit_count = 1;
+    inner_bit_count = 1;
+
     for (unsigned int i = 0; i < max_inners.length; i++)
     {
       if (inner_maps[i].get_population () == 0) continue;
@@ -128,9 +136,13 @@ struct index_map_subset_plan_t
 
       if (unlikely (new_gid >= map_count)) break;
 
-      uint32_t v = input_map->map (old_gid);
-      unsigned int outer = v >> 16;
-      output_map.arrayZ[new_gid] = (outer_map[outer] << 16) | (inner_maps[outer][v & 0xFFFF]);
+      uint32_t v = input_map? input_map->map (old_gid) : old_gid;
+      unsigned outer = v >> 16;
+      unsigned new_outer = outer_map[outer];
+      unsigned bit_count = (new_outer == 0) ? 1 : hb_bit_storage (new_outer);
+      outer_bit_count = hb_max (bit_count, outer_bit_count);
+
+      output_map.arrayZ[new_gid] = (new_outer << 16) | (inner_maps[outer][v & 0xFFFF]);
     }
   }
 
@@ -204,8 +216,8 @@ struct hvarvvar_subset_plan_t
     if (unlikely (!index_map_plans.length || !inner_sets.length || !inner_maps.length)) return;
 
     bool retain_adv_map = false;
-    index_map_plans[0].init (*index_maps[0], outer_map, inner_sets, plan, false);
-    if (index_maps[0] == &Null (DeltaSetIndexMap))
+    index_map_plans[0].init (index_maps[0], outer_map, inner_sets, plan, false);
+    if (!index_maps[0])
     {
       retain_adv_map = plan->flags & HB_SUBSET_FLAGS_RETAIN_GIDS;
       outer_map.add (0);
@@ -215,7 +227,7 @@ struct hvarvvar_subset_plan_t
     }
 
     for (unsigned int i = 1; i < index_maps.length; i++)
-      index_map_plans[i].init (*index_maps[i], outer_map, inner_sets, plan);
+      index_map_plans[i].init (index_maps[i], outer_map, inner_sets, plan);
 
     outer_map.sort ();
 
@@ -284,6 +296,8 @@ struct HVARVVAR
   static constexpr hb_tag_t HVARTag = HB_OT_TAG_HVAR;
   static constexpr hb_tag_t VVARTag = HB_OT_TAG_VVAR;
 
+  bool has_data () const { return version.major != 0; }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -301,9 +315,14 @@ struct HVARVVAR
 
   void listup_index_maps (hb_vector_t<const DeltaSetIndexMap *> &index_maps) const
   {
-    index_maps.push (&(this+advMap));
-    index_maps.push (&(this+lsbMap));
-    index_maps.push (&(this+rsbMap));
+    if (advMap) index_maps.push (&(this+advMap));
+    else index_maps.push (nullptr);
+
+    if (lsbMap) index_maps.push (&(this+lsbMap));
+    else index_maps.push (nullptr);
+
+    if (rsbMap) index_maps.push (&(this+rsbMap));
+    else index_maps.push (nullptr);
   }
 
   bool serialize_index_maps (hb_serialize_context_t *c,
@@ -382,9 +401,10 @@ struct HVARVVAR
                                                 hvar_plan.index_map_plans.as_array ()));
   }
 
+  HB_ALWAYS_INLINE
   float get_advance_delta_unscaled (hb_codepoint_t  glyph,
                                     const int *coords, unsigned int coord_count,
-                                    ItemVariationStore::cache_t *store_cache = nullptr) const
+                                    hb_scalar_cache_t *store_cache = nullptr) const
   {
     uint32_t varidx = (this+advMap).map (glyph);
     return (this+varStore).get_delta (varidx,
@@ -392,16 +412,6 @@ struct HVARVVAR
                                       store_cache);
   }
 
-  bool get_lsb_delta_unscaled (hb_codepoint_t glyph,
-                               const int *coords, unsigned int coord_count,
-                               float *lsb) const
-  {
-    if (!lsbMap) return false;
-    uint32_t varidx = (this+lsbMap).map (glyph);
-    *lsb = (this+varStore).get_delta (varidx, coords, coord_count);
-    return true;
-  }
-
   public:
   FixedVersion<>version;        /* Version of the metrics variation table
                                  * initially set to 0x00010000u */
@@ -435,7 +445,8 @@ struct VVAR : HVARVVAR {
   void listup_index_maps (hb_vector_t<const DeltaSetIndexMap *> &index_maps) const
   {
     HVARVVAR::listup_index_maps (index_maps);
-    index_maps.push (&(this+vorgMap));
+    if (vorgMap) index_maps.push (&(this+vorgMap));
+    else index_maps.push (nullptr);
   }
 
   bool serialize_index_maps (hb_serialize_context_t *c,
@@ -454,14 +465,16 @@ struct VVAR : HVARVVAR {
 
   bool subset (hb_subset_context_t *c) const { return HVARVVAR::_subset<VVAR> (c); }
 
-  bool get_vorg_delta_unscaled (hb_codepoint_t glyph,
-                                const int *coords, unsigned int coord_count,
-                                float *delta) const
+  HB_ALWAYS_INLINE
+  float get_vorg_delta_unscaled (hb_codepoint_t glyph,
+                                 const int *coords, unsigned int coord_count,
+                                 hb_scalar_cache_t *store_cache = nullptr) const
   {
-    if (!vorgMap) return false;
+    if (!vorgMap) return 0.f;
     uint32_t varidx = (this+vorgMap).map (glyph);
-    *delta = (this+varStore).get_delta (varidx, coords, coord_count);
-    return true;
+    return (this+varStore).get_delta (varidx,
+                                      coords, coord_count,
+                                      store_cache);
   }
 
   protected:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc
index 8c695c41e24..4d594d587d8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var.cc
@@ -286,10 +286,14 @@ hb_ot_var_normalize_variations (hb_face_t            *face,
     hb_ot_var_axis_info_t info;
     if (hb_ot_var_find_axis_info (face, variations[i].tag, &info) &&
         info.axis_index < coords_length)
-      coords[info.axis_index] = fvar.normalize_axis_value (info.axis_index, variations[i].value);
+      coords[info.axis_index] = roundf (fvar.normalize_axis_value (info.axis_index, variations[i].value) * 65536.0f);
   }
 
-  face->table.avar->map_coords (coords, coords_length);
+  face->table.avar->map_coords_16_16 (coords, coords_length);
+
+  // Round to 2.14
+  for (unsigned i = 0; i < coords_length; i++)
+    coords[i] = (coords[i] + 2) >> 2;
 }
 
 /**
@@ -309,6 +313,10 @@ hb_ot_var_normalize_variations (hb_face_t            *face,
  * Any additional scaling defined in the face's `avar` table is also
  * applied, as described at https://docs.microsoft.com/en-us/typography/opentype/spec/avar
  *
+ * Note: @coords_length must be the same as the number of axes in the face, as
+ * for example returned by hb_ot_var_get_axis_count().
+ * Otherwise, the behavior is undefined.
+ *
  * Since: 1.4.2
  **/
 void
@@ -319,9 +327,13 @@ hb_ot_var_normalize_coords (hb_face_t    *face,
 {
   const OT::fvar &fvar = *face->table.fvar;
   for (unsigned int i = 0; i < coords_length; i++)
-    normalized_coords[i] = fvar.normalize_axis_value (i, design_coords[i]);
+    normalized_coords[i] = roundf (fvar.normalize_axis_value (i, design_coords[i]) * 65536.0f);
 
-  face->table.avar->map_coords (normalized_coords, coords_length);
+  face->table.avar->map_coords_16_16 (normalized_coords, coords_length);
+
+  // Round to 2.14
+  for (unsigned i = 0; i < coords_length; i++)
+    normalized_coords[i] = (normalized_coords[i] + 2) >> 2;
 }
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
index b2300a327da..ff7ce678e4e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
@@ -61,6 +61,7 @@ struct VORG
 
   bool has_data () const { return version.to_int (); }
 
+  HB_ALWAYS_INLINE
   int get_y_origin (hb_codepoint_t glyph) const
   {
     unsigned int i;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-outline.cc b/src/java.desktop/share/native/libharfbuzz/hb-outline.cc
index 85ffc793678..12963fe46e3 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-outline.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-outline.cc
@@ -84,6 +84,15 @@ void hb_outline_t::replay (hb_draw_funcs_t *pen, void *pen_data) const
   }
 }
 
+void hb_outline_t::translate (float dx, float dy)
+{
+  for (auto &p : points)
+  {
+    p.x += dx;
+    p.y += dy;
+  }
+}
+
 void hb_outline_t::slant (float slant_xy)
 {
   for (auto &p : points)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-outline.hh b/src/java.desktop/share/native/libharfbuzz/hb-outline.hh
index c5b68c05dd7..9e394a68d9c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-outline.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-outline.hh
@@ -69,6 +69,7 @@ struct hb_outline_t
 
   HB_INTERNAL void replay (hb_draw_funcs_t *pen, void *pen_data) const;
   HB_INTERNAL float control_area () const;
+  HB_INTERNAL void translate (float dx, float dy);
   HB_INTERNAL void slant (float slant_xy);
   HB_INTERNAL void embolden (float x_strength, float y_strength,
                              float x_shift, float y_shift);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc
index bc08c5a9e14..e867f37f3c5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.cc
@@ -49,7 +49,7 @@ hb_paint_extents_push_transform (hb_paint_funcs_t *funcs HB_UNUSED,
 {
   hb_paint_extents_context_t *c = (hb_paint_extents_context_t *) paint_data;
 
-  c->push_transform (hb_transform_t {xx, yx, xy, yy, dx, dy});
+  c->push_transform (hb_transform_t<> {xx, yx, xy, yy, dx, dy});
 }
 
 static void
@@ -71,7 +71,7 @@ hb_paint_extents_push_clip_glyph (hb_paint_funcs_t *funcs HB_UNUSED,
 {
   hb_paint_extents_context_t *c = (hb_paint_extents_context_t *) paint_data;
 
-  hb_extents_t extents;
+  hb_extents_t<> extents;
   hb_draw_funcs_t *draw_extent_funcs = hb_draw_extents_get_funcs ();
   hb_font_draw_glyph (font, glyph, draw_extent_funcs, &extents);
   c->push_clip (extents);
@@ -85,7 +85,7 @@ hb_paint_extents_push_clip_rectangle (hb_paint_funcs_t *funcs HB_UNUSED,
 {
   hb_paint_extents_context_t *c = (hb_paint_extents_context_t *) paint_data;
 
-  hb_extents_t extents = {xmin, ymin, xmax, ymax};
+  hb_extents_t<> extents = {xmin, ymin, xmax, ymax};
   c->push_clip (extents);
 }
 
@@ -136,10 +136,10 @@ hb_paint_extents_paint_image (hb_paint_funcs_t *funcs HB_UNUSED,
   if (!glyph_extents)
     return false; // Happens with SVG images.
 
-  hb_extents_t extents = {(float) glyph_extents->x_bearing,
-                          (float) glyph_extents->y_bearing + glyph_extents->height,
-                          (float) glyph_extents->x_bearing + glyph_extents->width,
-                          (float) glyph_extents->y_bearing};
+  hb_extents_t<> extents = {(float) glyph_extents->x_bearing,
+                            (float) glyph_extents->y_bearing + glyph_extents->height,
+                            (float) glyph_extents->x_bearing + glyph_extents->width,
+                            (float) glyph_extents->y_bearing};
   c->push_clip (extents);
   c->paint ();
   c->pop_clip ();
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
index 60374eaa2d2..531eb3c7c52 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
@@ -41,9 +41,9 @@ struct hb_paint_extents_context_t
     clips.clear ();
     groups.clear ();
 
-    transforms.push (hb_transform_t{});
-    clips.push (hb_bounds_t{hb_bounds_t::UNBOUNDED});
-    groups.push (hb_bounds_t{hb_bounds_t::EMPTY});
+    transforms.push (hb_transform_t<>{});
+    clips.push (hb_bounds_t<>{hb_bounds_t<>::UNBOUNDED});
+    groups.push (hb_bounds_t<>{hb_bounds_t<>::EMPTY});
   }
 
   hb_paint_extents_context_t ()
@@ -51,19 +51,19 @@ struct hb_paint_extents_context_t
     clear ();
   }
 
-  hb_extents_t get_extents ()
+  hb_extents_t<> get_extents ()
   {
     return groups.tail().extents;
   }
 
   bool is_bounded ()
   {
-    return groups.tail().status != hb_bounds_t::UNBOUNDED;
+    return groups.tail().status != hb_bounds_t<>::UNBOUNDED;
   }
 
-  void push_transform (const hb_transform_t &trans)
+  void push_transform (const hb_transform_t<> &trans)
   {
-    hb_transform_t t = transforms.tail ();
+    hb_transform_t<> t = transforms.tail ();
     t.multiply (trans);
     transforms.push (t);
   }
@@ -73,13 +73,13 @@ struct hb_paint_extents_context_t
     transforms.pop ();
   }
 
-  void push_clip (hb_extents_t extents)
+  void push_clip (hb_extents_t<> extents)
   {
     /* Transform extents and push a new clip. */
-    const hb_transform_t &t = transforms.tail ();
+    const hb_transform_t<> &t = transforms.tail ();
     t.transform_extents (extents);
 
-    auto bounds = hb_bounds_t {extents};
+    auto bounds = hb_bounds_t<> {extents};
     bounds.intersect (clips.tail ());
 
     clips.push (bounds);
@@ -92,19 +92,19 @@ struct hb_paint_extents_context_t
 
   void push_group ()
   {
-    groups.push (hb_bounds_t {hb_bounds_t::EMPTY});
+    groups.push (hb_bounds_t<> {hb_bounds_t<>::EMPTY});
   }
 
   void pop_group (hb_paint_composite_mode_t mode)
   {
-    const hb_bounds_t src_bounds = groups.pop ();
-    hb_bounds_t &backdrop_bounds = groups.tail ();
+    const hb_bounds_t<> src_bounds = groups.pop ();
+    hb_bounds_t<> &backdrop_bounds = groups.tail ();
 
     // https://learn.microsoft.com/en-us/typography/opentype/spec/colr#format-32-paintcomposite
     switch ((int) mode)
     {
       case HB_PAINT_COMPOSITE_MODE_CLEAR:
-        backdrop_bounds.status = hb_bounds_t::EMPTY;
+        backdrop_bounds.status = hb_bounds_t<>::EMPTY;
         break;
       case HB_PAINT_COMPOSITE_MODE_SRC:
       case HB_PAINT_COMPOSITE_MODE_SRC_OUT:
@@ -125,16 +125,16 @@ struct hb_paint_extents_context_t
 
   void paint ()
   {
-    const hb_bounds_t &clip = clips.tail ();
-    hb_bounds_t &group = groups.tail ();
+    const hb_bounds_t<> &clip = clips.tail ();
+    hb_bounds_t<> &group = groups.tail ();
 
     group.union_ (clip);
   }
 
   protected:
-  hb_vector_t<hb_transform_t> transforms;
-  hb_vector_t<hb_bounds_t> clips;
-  hb_vector_t<hb_bounds_t> groups;
+  hb_vector_t<hb_transform_t<>> transforms;
+  hb_vector_t<hb_bounds_t<>> clips;
+  hb_vector_t<hb_bounds_t<>> groups;
 };
 
 HB_INTERNAL hb_paint_funcs_t *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint.hh
index 2abadebab3c..aedbcbdcbe2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.hh
@@ -28,6 +28,7 @@
 #include "hb.hh"
 #include "hb-face.hh"
 #include "hb-font.hh"
+#include "hb-geometry.hh"
 
 #define HB_PAINT_FUNCS_IMPLEMENT_CALLBACKS \
   HB_PAINT_FUNC_IMPLEMENT (push_transform) \
@@ -72,7 +73,11 @@ struct hb_paint_funcs_t
                        float xx, float yx,
                        float xy, float yy,
                        float dx, float dy)
-  { func.push_transform (this, paint_data,
+  {
+    // Handle -0.f to avoid -0.f == 0.f in the transform matrix.
+    if (dx == -0.f) dx = 0.f;
+    if (dy == -0.f) dy = 0.f;
+    func.push_transform (this, paint_data,
                          xx, yx, xy, yy, dx, dy,
                          !user_data ? nullptr : user_data->push_transform); }
   void pop_transform (void *paint_data)
@@ -182,54 +187,59 @@ struct hb_paint_funcs_t
                     0, 0);
   }
 
-  HB_NODISCARD
-  bool push_translate (void *paint_data,
+  void push_transform (void *paint_data, hb_transform_t<float> t)
+  {
+    push_transform (paint_data, t.xx, t.yx, t.xy, t.yy, t.x0, t.y0);
+  }
+
+  void push_translate (void *paint_data,
                        float dx, float dy)
   {
-    if (!dx && !dy)
-      return false;
-
     push_transform (paint_data,
-                    1.f, 0.f, 0.f, 1.f, dx, dy);
-    return true;
+                    hb_transform_t<float>::translation (dx, dy));
   }
 
-  HB_NODISCARD
-  bool push_scale (void *paint_data,
+  void push_scale (void *paint_data,
                    float sx, float sy)
   {
-    if (sx == 1.f && sy == 1.f)
-      return false;
-
     push_transform (paint_data,
-                    sx, 0.f, 0.f, sy, 0.f, 0.f);
-    return true;
+                    hb_transform_t<float>::scaling (sx, sy));
+  }
+  void push_scale_around_center (void *paint_data,
+                                 float sx, float sy,
+                                 float cx, float cy)
+  {
+    push_transform (paint_data,
+                    hb_transform_t<float>::scaling_around_center (sx, sy, cx, cy));
   }
 
-  HB_NODISCARD
-  bool push_rotate (void *paint_data,
+  void push_rotate (void *paint_data,
                     float a)
   {
-    if (!a)
-      return false;
-
-    float cc = cosf (a * HB_PI);
-    float ss = sinf (a * HB_PI);
-    push_transform (paint_data, cc, ss, -ss, cc, 0.f, 0.f);
-    return true;
+    push_transform (paint_data,
+                    hb_transform_t<float>::rotation (a * HB_PI));
   }
 
-  HB_NODISCARD
-  bool push_skew (void *paint_data,
+  void push_rotate_around_center (void *paint_data,
+                                  float a,
+                                  float cx, float cy)
+  {
+    push_transform (paint_data,
+                    hb_transform_t<float>::rotation_around_center (a * HB_PI, cx, cy));
+  }
+
+  void push_skew (void *paint_data,
                   float sx, float sy)
   {
-    if (!sx && !sy)
-      return false;
-
-    float x = tanf (-sx * HB_PI);
-    float y = tanf (+sy * HB_PI);
-    push_transform (paint_data, 1.f, y, x, 1.f, 0.f, 0.f);
-    return true;
+    push_transform (paint_data,
+                    hb_transform_t<float>::skewing (-sx * HB_PI, sy * HB_PI));
+  }
+  void push_skew_around_center (void *paint_data,
+                                float sx, float sy,
+                                float cx, float cy)
+  {
+    push_transform (paint_data,
+                    hb_transform_t<float>::skewing_around_center (-sx * HB_PI, sy * HB_PI, cx, cy));
   }
 };
 DECLARE_NULL_INSTANCE (hb_paint_funcs_t);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh b/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh
index 274d5df4c54..753e86b8ca6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh
@@ -45,12 +45,22 @@
 template <typename K>
 struct hb_priority_queue_t
 {
- private:
+ public:
   typedef hb_pair_t<K, unsigned> item_t;
+
+ private:
   hb_vector_t<item_t> heap;
 
  public:
 
+  hb_priority_queue_t () = default;
+  hb_priority_queue_t (hb_vector_t<item_t>&& other) : heap (std::move (other))
+  {
+    // Heapify the vector.
+    for (int i = (heap.length / 2) - 1; i >= 0; i--)
+      bubble_down (i);
+  }
+
   void reset () { heap.resize (0); }
 
   bool in_error () const { return heap.in_error (); }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh b/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh
index cb4fdeead2e..7d118b52169 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh
@@ -217,11 +217,17 @@ bool _try_isolating_subgraphs (const hb_vector_t<graph::overflow_record_t>& over
   unsigned maximum_to_move = hb_max ((sorted_graph.num_roots_for_space (space) / 2u), 1u);
   if (roots_to_isolate.get_population () > maximum_to_move) {
     // Only move at most half of the roots in a space at a time.
-    unsigned extra = roots_to_isolate.get_population () - maximum_to_move;
-    while (extra--) {
-      uint32_t root = HB_SET_VALUE_INVALID;
-      roots_to_isolate.previous (&root);
-      roots_to_isolate.del (root);
+    //
+    // Note: this was ported from non-stable ids to stable ids. So to retain the same behaviour
+    // with regards to which roots are removed from the set we need to remove them in the topological
+    // order, not the object id order.
+    int extra = roots_to_isolate.get_population () - maximum_to_move;
+    for (unsigned id : sorted_graph.ordering_) {
+      if (!extra) break;
+      if (roots_to_isolate.has(id)) {
+        roots_to_isolate.del(id);
+        extra--;
+      }
     }
   }
 
@@ -266,7 +272,7 @@ bool _resolve_shared_overflow(const hb_vector_t<graph::overflow_record_t>& overf
     result = sorted_graph.duplicate(&parents, r.child);
   }
 
-  if (result == (unsigned) -1) return result;
+  if (result == (unsigned) -1) return false;
 
   if (parents.get_population() > 1) {
     // If the duplicated node has more than one parent pre-emptively raise it's priority to the maximum.
@@ -283,7 +289,7 @@ bool _resolve_shared_overflow(const hb_vector_t<graph::overflow_record_t>& overf
     sorted_graph.vertices_[result].give_max_priority();
   }
 
-  return result;
+  return true;
 }
 
 static inline
@@ -302,8 +308,11 @@ bool _process_overflows (const hb_vector_t<graph::overflow_record_t>& overflows,
     {
       // The child object is shared, we may be able to eliminate the overflow
       // by duplicating it.
-      if (!_resolve_shared_overflow(overflows, i, sorted_graph)) continue;
-      return true;
+      if (_resolve_shared_overflow(overflows, i, sorted_graph))
+        return true;
+
+      // Sometimes we can't duplicate a node which looks shared because it's not actually shared
+      // (eg. all links from the same parent) in this case continue on to other resolution options.
     }
 
     if (child.is_leaf () && !priority_bumped_parents.has (r.parent))
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh b/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh
index 1f8ba32bae2..1e9ee9ba960 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh
@@ -64,9 +64,6 @@
  *
  *   - Cast blob content to T*, call sanitize() method of it,
  *   - If sanitize succeeded, return blob.
- *   - Otherwise, if blob is not writable, try making it writable,
- *     or copy if cannot be made writable in-place,
- *   - Call sanitize() again.  Return blob if sanitize succeeded.
  *   - Return empty blob otherwise.
  *
  *
@@ -98,6 +95,12 @@
  * structure is so complicated that by checking all offsets at sanitize() time,
  * we make the code much simpler in other methods, as offsets and referenced
  * objects do not need to be validated at each use site.
+ *
+ * Note:
+ * Sanitize was named so because it used to try to recover from errors by
+ * modifying the data to make it valid.  This is no longer the case, as it
+ * could make HarfBuzz hallucinate new rules if there was aliasing in the
+ * data.  However, the name stuck.  See: https://behdad.github.io/harfbust/
  */
 
 /* This limits sanitizing time on really broken fonts. */
@@ -120,12 +123,12 @@
 struct hb_sanitize_context_t :
        hb_dispatch_context_t<hb_sanitize_context_t, bool, HB_DEBUG_SANITIZE>
 {
-  hb_sanitize_context_t () :
-        start (nullptr), end (nullptr),
+  hb_sanitize_context_t (const char *start_ = nullptr, const char *end_ = nullptr) :
+        start (start_), end (end_),
         length (0),
         max_ops (0), max_subtables (0),
         recursion_depth (0),
-        writable (false), edit_count (0),
+        writable (false),
         blob (nullptr),
         num_glyphs (65536),
         num_glyphs_set (false),
@@ -212,14 +215,22 @@ struct hb_sanitize_context_t :
 
   void reset_object ()
   {
-    this->start = this->blob->data;
-    this->end = this->start + this->blob->length;
+    if (this->blob)
+    {
+      this->start = this->blob->data;
+      this->end = this->start + this->blob->length;
+    }
     this->length = this->end - this->start;
     assert (this->start <= this->end); /* Must not overflow. */
   }
 
-  void start_processing ()
+  void start_processing (const char *start_ = nullptr, const char *end_ = nullptr)
   {
+    if (start_)
+    {
+      this->start = start_;
+      this->end = end_;
+    }
     reset_object ();
     unsigned m;
     if (unlikely (hb_unsigned_mul_overflows (this->end - this->start, HB_SANITIZE_MAX_OPS_FACTOR, &m)))
@@ -228,7 +239,6 @@ struct hb_sanitize_context_t :
       this->max_ops = hb_clamp (m,
                                 (unsigned) HB_SANITIZE_MAX_OPS_MIN,
                                 (unsigned) HB_SANITIZE_MAX_OPS_MAX);
-    this->edit_count = 0;
     this->debug_depth = 0;
     this->recursion_depth = 0;
 
@@ -241,8 +251,8 @@ struct hb_sanitize_context_t :
   void end_processing ()
   {
     DEBUG_MSG_LEVEL (SANITIZE, this->start, 0, -1,
-                     "end [%p..%p] %u edit requests",
-                     this->start, this->end, this->edit_count);
+                     "end [%p..%p]",
+                     this->start, this->end);
 
     hb_blob_destroy (this->blob);
     this->blob = nullptr;
@@ -250,9 +260,6 @@ struct hb_sanitize_context_t :
     this->length = 0;
   }
 
-  unsigned get_edit_count () { return edit_count; }
-
-
   bool check_ops(unsigned count)
   {
     /* Avoid underflow */
@@ -396,35 +403,6 @@ struct hb_sanitize_context_t :
       return likely (this->check_point ((const char *) obj + obj->min_size));
   }
 
-  bool may_edit (const void *base, unsigned int len)
-  {
-    if (this->edit_count >= HB_SANITIZE_MAX_EDITS)
-      return false;
-
-    const char *p = (const char *) base;
-    this->edit_count++;
-
-    DEBUG_MSG_LEVEL (SANITIZE, p, this->debug_depth+1, 0,
-       "may_edit(%u) [%p..%p] (%u bytes) in [%p..%p] -> %s",
-       this->edit_count,
-       p, p + len, len,
-       this->start, this->end,
-       this->writable ? "GRANTED" : "DENIED");
-
-    return this->writable;
-  }
-
-  template <typename Type, typename ValueType>
-  bool try_set (const Type *obj, const ValueType &v)
-  {
-    if (this->may_edit (obj, hb_static_size (Type)))
-    {
-      * const_cast<Type *> (obj) = v;
-      return true;
-    }
-    return false;
-  }
-
   template <typename Type>
   hb_blob_t *sanitize_blob (hb_blob_t *blob)
   {
@@ -432,7 +410,6 @@ struct hb_sanitize_context_t :
 
     init (blob);
 
-  retry:
     DEBUG_MSG_FUNC (SANITIZE, start, "start");
 
     start_processing ();
@@ -446,36 +423,6 @@ struct hb_sanitize_context_t :
     Type *t = reinterpret_cast<Type *> (const_cast<char *> (start));
 
     sane = t->sanitize (this);
-    if (sane)
-    {
-      if (edit_count)
-      {
-        DEBUG_MSG_FUNC (SANITIZE, start, "passed first round with %u edits; going for second round", edit_count);
-
-        /* sanitize again to ensure no toe-stepping */
-        edit_count = 0;
-        sane = t->sanitize (this);
-        if (edit_count) {
-          DEBUG_MSG_FUNC (SANITIZE, start, "requested %u edits in second round; FAILING", edit_count);
-          sane = false;
-        }
-      }
-    }
-    else
-    {
-      if (edit_count && !writable) {
-        start = hb_blob_get_data_writable (blob, nullptr);
-        end = start + blob->length;
-
-        if (start)
-        {
-          writable = true;
-          /* ok, we made it writable by relocating.  try again */
-          DEBUG_MSG_FUNC (SANITIZE, start, "retry");
-          goto retry;
-        }
-      }
-    }
 
     end_processing ();
 
@@ -506,7 +453,6 @@ struct hb_sanitize_context_t :
   private:
   int recursion_depth;
   bool writable;
-  unsigned int edit_count;
   hb_blob_t *blob;
   unsigned int num_glyphs;
   bool  num_glyphs_set;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-script-list.h b/src/java.desktop/share/native/libharfbuzz/hb-script-list.h
index f811dbc3408..16347b9d84e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-script-list.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-script-list.h
@@ -223,6 +223,10 @@ HB_END_DECLS
  * @HB_SCRIPT_SUNUWAR: `Sunu`, Since: 10.0.0
  * @HB_SCRIPT_TODHRI: `Todr`, Since: 10.0.0
  * @HB_SCRIPT_TULU_TIGALARI: `Tutg`, Since: 10.0.0
+ * @HB_SCRIPT_BERIA_ERFE: `Berf`, Since: 11.5.0
+ * @HB_SCRIPT_SIDETIC: `Sidt`, Since: 11.5.0
+ * @HB_SCRIPT_TAI_YO: `Tayo`, Since: 11.5.0
+ * @HB_SCRIPT_TOLONG_SIKI: `Tols`, Since: 11.5.0
  * @HB_SCRIPT_INVALID: No script set
  *
  * Data type for scripts. Each #hb_script_t's value is an #hb_tag_t corresponding
@@ -461,6 +465,14 @@ typedef enum
   HB_SCRIPT_TODHRI                      = HB_TAG ('T','o','d','r'), /*16.0*/
   HB_SCRIPT_TULU_TIGALARI               = HB_TAG ('T','u','t','g'), /*16.0*/
 
+  /*
+   * Since 11.5.0
+   */
+  HB_SCRIPT_BERIA_ERFE                  = HB_TAG ('B','e','r','f'), /*17.0*/
+  HB_SCRIPT_SIDETIC                     = HB_TAG ('S','i','d','t'), /*17.0*/
+  HB_SCRIPT_TAI_YO                      = HB_TAG ('T','a','y','o'), /*17.0*/
+  HB_SCRIPT_TOLONG_SIKI                 = HB_TAG ('T','o','l','s'), /*17.0*/
+
   /* No script set. */
   HB_SCRIPT_INVALID                     = HB_TAG_NONE,
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh b/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh
index 704d0ffd12b..9fe99c85ea7 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh
@@ -34,7 +34,7 @@
 #include "hb.hh"
 #include "hb-blob.hh"
 #include "hb-map.hh"
-#include "hb-pool.hh"
+#include "hb-free-pool.hh"
 
 #include "hb-subset-serialize.h"
 
@@ -724,7 +724,7 @@ struct hb_serialize_context_t
            hb_requires (hb_is_iterator (Iterator)),
            typename ...Ts>
   void copy_all (Iterator it, Ts&&... ds)
-  { for (decltype (*it) _ : it) copy (_, std::forward<Ts> (ds)...); }
+  { for (decltype (*it) _ : it) copy (_, ds...); }
 
   template <typename Type>
   hb_serialize_context_t& operator << (const Type &obj) & { embed (obj); return *this; }
@@ -794,7 +794,8 @@ struct hb_serialize_context_t
   template <typename T, unsigned Size = sizeof (T)>
   void assign_offset (const object_t* parent, const object_t::link_t &link, unsigned offset)
   {
-    auto &off = * ((BEInt<T, Size> *) (parent->head + link.position));
+    // XXX We should stop assuming big-endian!
+    auto &off = * ((HBInt<true, T, Size> *) (parent->head + link.position));
     assert (0 == off);
     check_assign (off, offset, HB_SERIALIZE_ERROR_OFFSET_OVERFLOW);
   }
@@ -814,7 +815,7 @@ struct hb_serialize_context_t
   }
 
   /* Object memory pool. */
-  hb_pool_t<object_t> object_pool;
+  hb_free_pool_t<object_t> object_pool;
 
   /* Stack of currently under construction objects. */
   object_t *current;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh b/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
index f0416d5fa1d..f8cb0998260 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
@@ -55,11 +55,11 @@
  *   - For each glyph, if it doesn't match the subtable digest,
  *     skip it.
  *
- * The main filter we use is a combination of four bits-pattern
+ * The filter we use is a combination of three bits-pattern
  * filters. A bits-pattern filter checks a number of bits (5 or 6)
- * of the input number (glyph-id in this case) and checks whether
+ * of the input number (glyph-id in most cases) and checks whether
  * its pattern is amongst the patterns of any of the accepted values.
- * The accepted patterns are represented as a "long" integer. The
+ * The accepted patterns are represented as a "long" integer. Each
  * check is done using four bitwise operations only.
  */
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc
index d14f577be00..a36fa14fb28 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-shape.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-shape.cc
@@ -149,14 +149,11 @@ hb_shape_full (hb_font_t          *font,
 
   hb_bool_t res = hb_shape_plan_execute (shape_plan, font, buffer, features, num_features);
 
-  if (buffer->max_ops <= 0)
-    buffer->shaping_failed = true;
-
   hb_shape_plan_destroy (shape_plan);
 
   if (text_buffer)
   {
-    if (res && buffer->successful && !buffer->shaping_failed
+    if (res && buffer->successful
             && text_buffer->successful
             && !buffer->verify (text_buffer,
                                 font,
@@ -199,6 +196,7 @@ hb_shape (hb_font_t           *font,
 
 
 #ifdef HB_EXPERIMENTAL_API
+#ifndef HB_NO_VAR
 
 static float
 buffer_advance (hb_buffer_t *buffer)
@@ -440,7 +438,7 @@ hb_shape_justify (hb_font_t          *font,
 
   return true;
 }
-
+#endif
 #endif
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shaper-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-shaper-list.hh
index f079caf4d35..cb386f26827 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-shaper-list.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-shaper-list.hh
@@ -57,6 +57,14 @@ HB_SHAPER_IMPLEMENT (directwrite)
 HB_SHAPER_IMPLEMENT (coretext)
 #endif
 
+#ifdef HAVE_HARFRUST
+HB_SHAPER_IMPLEMENT (harfrust)
+#endif
+
+#ifdef HAVE_KBTS
+HB_SHAPER_IMPLEMENT (kbts)
+#endif
+
 #ifndef HB_NO_FALLBACK_SHAPE
 HB_SHAPER_IMPLEMENT (fallback) /* <--- This should be last. */
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-static.cc b/src/java.desktop/share/native/libharfbuzz/hb-static.cc
index 4e70e413651..06cc80b5f38 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-static.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-static.cc
@@ -113,27 +113,4 @@ hb_face_t::load_upem () const
   return ret;
 }
 
-
-#ifndef HB_NO_VAR
-bool
-_glyf_get_leading_bearing_with_var_unscaled (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical,
-                                             int *lsb)
-{
-  return font->face->table.glyf->get_leading_bearing_with_var_unscaled (font, glyph, is_vertical, lsb);
-}
-
-unsigned
-_glyf_get_advance_with_var_unscaled (hb_font_t *font, hb_codepoint_t glyph, bool is_vertical)
-{
-  return font->face->table.glyf->get_advance_with_var_unscaled (font, glyph, is_vertical);
-}
-#endif
-
-bool
-_glyf_get_leading_bearing_without_var_unscaled (hb_face_t *face, hb_codepoint_t gid, bool is_vertical, int *lsb)
-{
-  return face->table.glyf->get_leading_bearing_without_var_unscaled (gid, is_vertical, lsb);
-}
-
-
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh b/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh
index 9d00cae6c32..51413b6da44 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-string-array.hh
@@ -45,25 +45,25 @@ static const union HB_STRING_ARRAY_TYPE_NAME {
  * but C++ does not allow that.
  * https://stackoverflow.com/q/28433862
  */
-#define _S(s) char HB_PASTE (str, __LINE__)[sizeof (s)];
+#define HB_STR(s) char HB_PASTE (str, __LINE__)[sizeof (s)];
 #include HB_STRING_ARRAY_LIST
-#undef _S
+#undef HB_STR
   } st;
   char str[HB_VAR_ARRAY];
 }
 HB_STRING_ARRAY_POOL_NAME =
 {
   {
-#define _S(s) s,
+#define HB_STR(s) s,
 #include HB_STRING_ARRAY_LIST
-#undef _S
+#undef HB_STR
   }
 };
 static const unsigned int HB_STRING_ARRAY_OFFS_NAME[] =
 {
-#define _S(s) offsetof (union HB_STRING_ARRAY_TYPE_NAME, st.HB_PASTE(str, __LINE__)),
+#define HB_STR(s) offsetof (union HB_STRING_ARRAY_TYPE_NAME, st.HB_PASTE(str, __LINE__)),
 #include HB_STRING_ARRAY_LIST
-#undef _S
+#undef HB_STR
   sizeof (HB_STRING_ARRAY_TYPE_NAME)
 };
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh
index e7bddaef723..843ad69f2f9 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh
@@ -861,8 +861,7 @@ struct subr_subsetter_t
         {
           // Hack to point vector to static string.
           auto &b = buffArray.arrayZ[last];
-          b.length = 1;
-          b.arrayZ = const_cast<unsigned char *>(endchar_str);
+          b.set_storage (const_cast<unsigned char *>(endchar_str), 1);
         }
 
       last++; // Skip over gid
@@ -877,8 +876,7 @@ struct subr_subsetter_t
       {
         // Hack to point vector to static string.
         auto &b = buffArray.arrayZ[last];
-        b.length = 1;
-        b.arrayZ = const_cast<unsigned char *>(endchar_str);
+        b.set_storage (const_cast<unsigned char *>(endchar_str), 1);
       }
 
     return true;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh
index 01987bd258d..8ee02c07dbe 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh
@@ -26,12 +26,27 @@
 #define HB_SUBSET_INSTANCER_IUP_HH
 
 #include "hb-subset-plan.hh"
+
+struct iup_scratch_t
+{
+  hb_vector_t<unsigned> end_points;
+  hb_vector_t<double> interp_x_deltas;
+  hb_vector_t<double> interp_y_deltas;
+  hb_vector_t<unsigned> costs;
+  hb_vector_t<int> chain;
+  hb_vector_t<bool> rot_indices;
+  hb_vector_t<int> rot_x_deltas;
+  hb_vector_t<int> rot_y_deltas;
+  contour_point_vector_t rot_points;
+};
+
 /* given contour points and deltas, optimize a set of referenced points within error
  * tolerance. Returns optimized referenced point indices */
 HB_INTERNAL bool iup_delta_optimize (const contour_point_vector_t& contour_points,
                                      const hb_vector_t<int>& x_deltas,
                                      const hb_vector_t<int>& y_deltas,
                                      hb_vector_t<bool>& opt_indices, /* OUT */
+                                     iup_scratch_t &scratch,
                                      double tolerance = 0.0);
 
 #endif /* HB_SUBSET_INSTANCER_IUP_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc
index c67fee421c2..15227bdab48 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc
@@ -62,9 +62,10 @@ static inline double supportScalar (double coord, const Triple &tent)
     return  (end - coord) / (end - peak);
 }
 
-static inline rebase_tent_result_t
-_solve (Triple tent, Triple axisLimit, bool negative = false)
+static inline void
+_solve (Triple tent, Triple axisLimit, rebase_tent_result_t &out, bool negative = false)
 {
+  out.reset();
   double axisMin = axisLimit.minimum;
   double axisDef = axisLimit.middle;
   double axisMax = axisLimit.maximum;
@@ -75,14 +76,12 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
   // Mirror the problem such that axisDef <= peak
   if (axisDef > peak)
   {
-    rebase_tent_result_t vec = _solve (_reverse_negate (tent),
-                           _reverse_negate (axisLimit),
-                           !negative);
+    _solve (_reverse_negate (tent), _reverse_negate (axisLimit), out, !negative);
 
-    for (auto &p : vec)
+    for (auto &p : out)
       p = hb_pair (p.first, _reverse_negate (p.second));
 
-    return vec;
+    return;
   }
   // axisDef <= peak
 
@@ -98,7 +97,7 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
    *    axisMin     axisDef    axisMax   lower     upper
    */
   if (axisMax <= lower && axisMax < peak)
-      return rebase_tent_result_t{};  // No overlap
+      return;  // No overlap
 
   /* case 2: Only the peak and outermost bound fall outside the new limit;
    * we keep the deltaset, update peak and outermost bound and scale deltas
@@ -133,18 +132,18 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
     double mult = supportScalar (axisMax, tent);
     tent = Triple{lower, axisMax, axisMax};
 
-    rebase_tent_result_t vec = _solve (tent, axisLimit);
+    _solve (tent, axisLimit, out);
 
-    for (auto &p : vec)
+    for (auto &p : out)
       p = hb_pair (p.first * mult, p.second);
 
-    return vec;
+    return;
   }
 
   // lower <= axisDef <= peak <= axisMax
 
   double gain = supportScalar (axisDef, tent);
-  rebase_tent_result_t out {hb_pair (gain, Triple{})};
+  out.push(hb_pair (gain, Triple{}));
 
   // First, the positive side
 
@@ -362,8 +361,6 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
     out.push (hb_pair (scalar1 - gain, loc1));
     out.push (hb_pair (scalar2 - gain, loc2));
   }
-
-  return out;
 }
 
 static inline TripleDistances _reverse_triple_distances (const TripleDistances &v)
@@ -405,18 +402,21 @@ double renormalizeValue (double v, const Triple &triple,
   return (-v_distance) /total_distance;
 }
 
-rebase_tent_result_t
-rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distances)
+void
+rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distances,
+             rebase_tent_result_t &out,
+             rebase_tent_result_t &scratch)
 {
   assert (-1.0 <= axisLimit.minimum && axisLimit.minimum <= axisLimit.middle && axisLimit.middle <= axisLimit.maximum && axisLimit.maximum <= +1.0);
   assert (-2.0 <= tent.minimum && tent.minimum <= tent.middle && tent.middle <= tent.maximum && tent.maximum <= +2.0);
   assert (tent.middle != 0.0);
 
-  rebase_tent_result_t sols = _solve (tent, axisLimit);
+  rebase_tent_result_t &sols = scratch;
+  _solve (tent, axisLimit, sols);
 
   auto n = [&axisLimit, &axis_triple_distances] (double v) { return renormalizeValue (v, axisLimit, axis_triple_distances); };
 
-  rebase_tent_result_t out;
+  out.reset();
   for (auto &p : sols)
   {
     if (!p.first) continue;
@@ -429,6 +429,4 @@ rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distance
     out.push (hb_pair (p.first,
                        Triple{n (t.minimum), n (t.middle), n (t.maximum)}));
   }
-
-  return out;
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh
index 9764dcc1725..574d58d53d8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh
@@ -42,10 +42,9 @@ struct TripleDistances
   double positive;
 };
 
-struct Triple {
-
-  Triple () :
-    minimum (0.0), middle (0.0), maximum (0.0) {}
+struct Triple
+{
+  Triple () = default;
 
   Triple (double minimum_, double middle_, double maximum_) :
     minimum (minimum_), middle (middle_), maximum (maximum_) {}
@@ -81,10 +80,9 @@ struct Triple {
     return current;
   }
 
-
-  double minimum;
-  double middle;
-  double maximum;
+  double minimum = 0;
+  double middle = 0;
+  double maximum = 0;
 };
 
 using rebase_tent_result_item_t = hb_pair_t<double, Triple>;
@@ -107,8 +105,10 @@ HB_INTERNAL double renormalizeValue (double v, const Triple &triple,
  * If tent value is Triple{}, that is a special deltaset that should
  * be always-enabled (called "gain").
  */
-HB_INTERNAL rebase_tent_result_t rebase_tent (Triple tent,
-                                              Triple axisLimit,
-                                              TripleDistances axis_triple_distances);
+HB_INTERNAL void rebase_tent (Triple tent,
+                              Triple axisLimit,
+                              TripleDistances axis_triple_distances,
+                              rebase_tent_result_t &out,
+                              rebase_tent_result_t &scratch);
 
 #endif /* HB_SUBSET_INSTANCER_SOLVER_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh
index ade8278c40f..398fe81eca9 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh
@@ -81,6 +81,10 @@ HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb::unique_ptr<hb_set_t>>), gpo
 HB_SUBSET_PLAN_MEMBER (hb_map_t, gsub_features)
 HB_SUBSET_PLAN_MEMBER (hb_map_t, gpos_features)
 
+//active features(with duplicates) old index -> new index mapping
+HB_SUBSET_PLAN_MEMBER (hb_map_t, gsub_features_w_duplicates)
+HB_SUBSET_PLAN_MEMBER (hb_map_t, gpos_features_w_duplicates)
+
 //active feature variation records/condition index with variations
 HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb::shared_ptr<hb_set_t>>), gsub_feature_record_cond_idx_map)
 HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb::shared_ptr<hb_set_t>>), gpos_feature_record_cond_idx_map)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
index 3ba726d925e..8c3fd97899b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
@@ -418,7 +418,8 @@ _nameid_closure (hb_subset_plan_t* plan,
                  hb_set_t* drop_tables)
 {
 #ifndef HB_NO_STYLE
-  plan->source->table.STAT->collect_name_ids (&plan->user_axes_location, &plan->name_ids);
+  if (!drop_tables->has (HB_OT_TAG_STAT))
+    plan->source->table.STAT->collect_name_ids (&plan->user_axes_location, &plan->name_ids);
 #endif
 #ifndef HB_NO_VAR
   if (!plan->all_axes_pinned)
@@ -676,7 +677,8 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
     return;
 
 #ifndef HB_NO_VAR
-  normalize_axes_location (face, this);
+  if (!check_success (normalize_axes_location (face, this)))
+      return;
 #endif
 
   _populate_unicodes_to_retain (input->sets.unicodes, input->sets.glyphs, this);
@@ -697,6 +699,15 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
     return;
   }
 
+#ifdef HB_EXPERIMENTAL_API
+  if ((input->flags & HB_SUBSET_FLAGS_RETAIN_GIDS) &&
+      (input->flags & HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS)) {
+    // We've been requested to maintain the num glyphs count from the
+    // input face.
+    _num_output_glyphs = source->get_num_glyphs ();
+  }
+#endif
+
   _create_glyph_map_gsub (
       &_glyphset_gsub,
       glyph_map,
@@ -710,10 +721,10 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
         glyph_map->get(unicode_to_new_gid_list.arrayZ[i].second);
   }
 
-  bounds_width_vec.resize (_num_output_glyphs, false);
+  bounds_width_vec.resize_dirty  (_num_output_glyphs);
   for (auto &v : bounds_width_vec)
     v = 0xFFFFFFFF;
-  bounds_height_vec.resize (_num_output_glyphs, false);
+  bounds_height_vec.resize_dirty  (_num_output_glyphs);
   for (auto &v : bounds_height_vec)
     v = 0xFFFFFFFF;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
index 8a6574365ed..0362ed7292e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
@@ -300,6 +300,7 @@ struct hb_subset_plan_t
 // compile times more reasonable:
 // - hb-subset-plan.cc
 // - hb-subset-plan-layout.cc
+// - hb-subset-plan-var.cc
 //
 // The functions below are those needed to connect the split files
 // above together.
@@ -332,7 +333,7 @@ generate_varstore_inner_maps (const hb_set_t& varidx_set,
                               unsigned subtable_count,
                               hb_vector_t<hb_inc_bimap_t> &inner_maps /* OUT */);
 
-HB_INTERNAL void
+HB_INTERNAL bool
 normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan);
 
 HB_INTERNAL void
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
index 079c94eddfe..51134ed09ce 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
@@ -25,65 +25,19 @@
  */
 
 #include "hb.hh"
+
 #include "hb-open-type.hh"
+#include "hb-open-file.hh"
 
 #include "hb-subset.hh"
-
-#include "hb-open-file.hh"
-#include "hb-ot-cmap-table.hh"
-#include "hb-ot-glyf-table.hh"
-#include "hb-ot-hdmx-table.hh"
-#include "hb-ot-head-table.hh"
-#include "hb-ot-hhea-table.hh"
-#include "hb-ot-hmtx-table.hh"
-#include "hb-ot-maxp-table.hh"
-#include "OT/Color/CBDT/CBDT.hh"
-#include "OT/Color/COLR/COLR.hh"
-#include "OT/Color/CPAL/CPAL.hh"
-#include "OT/Color/sbix/sbix.hh"
-#include "hb-ot-os2-table.hh"
-#include "hb-ot-post-table.hh"
-#include "hb-ot-post-table-v2subset.hh"
-#include "hb-ot-cff1-table.hh"
-#include "hb-ot-cff2-table.hh"
-#include "hb-ot-vorg-table.hh"
-#include "hb-ot-name-table.hh"
-#include "hb-ot-layout-base-table.hh"
-#include "hb-ot-layout-gsub-table.hh"
-#include "hb-ot-layout-gpos-table.hh"
-#include "hb-ot-var-avar-table.hh"
-#include "hb-ot-var-cvar-table.hh"
-#include "hb-ot-var-fvar-table.hh"
-#include "hb-ot-var-gvar-table.hh"
-#include "hb-ot-var-hvar-table.hh"
-#include "hb-ot-var-mvar-table.hh"
-#include "hb-ot-math-table.hh"
-#include "hb-ot-stat-table.hh"
-#include "hb-repacker.hh"
+#include "hb-subset-table.hh"
 #include "hb-subset-accelerator.hh"
 
-using OT::Layout::GSUB;
-using OT::Layout::GPOS;
-
-
-#ifndef HB_NO_SUBSET_CFF
-template<>
-struct hb_subset_plan_t::source_table_loader<const OT::cff1>
-{
-  auto operator () (hb_subset_plan_t *plan)
-  HB_AUTO_RETURN (plan->accelerator ? plan->accelerator->cff1_accel :
-                  plan->inprogress_accelerator ? plan->inprogress_accelerator->cff1_accel :
-                  plan->cff1_accel)
-};
-template<>
-struct hb_subset_plan_t::source_table_loader<const OT::cff2>
-{
-  auto operator () (hb_subset_plan_t *plan)
-  HB_AUTO_RETURN (plan->accelerator ? plan->accelerator->cff2_accel :
-                  plan->inprogress_accelerator ? plan->inprogress_accelerator->cff2_accel :
-                  plan->cff2_accel)
-};
-#endif
+#include "hb-ot-cmap-table.hh"
+#include "hb-ot-var-cvar-table.hh"
+#include "hb-ot-head-table.hh"
+#include "hb-ot-stat-table.hh"
+#include "hb-ot-post-table-v2subset.hh"
 
 
 /**
@@ -116,56 +70,56 @@ hb_user_data_key_t _hb_subset_accelerator_user_data_key = {};
  * if we are unable to list the tables in a face.
  */
 static hb_tag_t known_tables[] {
-  HB_TAG ('a', 'v', 'a', 'r'),
-  HB_OT_TAG_BASE,
-  HB_OT_TAG_CBDT,
-  HB_OT_TAG_CBLC,
-  HB_OT_TAG_CFF1,
-  HB_OT_TAG_CFF2,
-  HB_OT_TAG_cmap,
-  HB_OT_TAG_COLR,
-  HB_OT_TAG_CPAL,
-  HB_TAG ('c', 'v', 'a', 'r'),
-  HB_TAG ('c', 'v', 't', ' '),
-  HB_TAG ('D', 'S', 'I', 'G'),
-  HB_TAG ('E', 'B', 'D', 'T'),
-  HB_TAG ('E', 'B', 'L', 'C'),
-  HB_TAG ('E', 'B', 'S', 'C'),
-  HB_TAG ('f', 'p', 'g', 'm'),
-  HB_TAG ('f', 'v', 'a', 'r'),
-  HB_TAG ('g', 'a', 's', 'p'),
-  HB_OT_TAG_GDEF,
-  HB_OT_TAG_glyf,
-  HB_OT_TAG_GPOS,
-  HB_OT_TAG_GSUB,
-  HB_OT_TAG_gvar,
-  HB_OT_TAG_hdmx,
-  HB_OT_TAG_head,
-  HB_OT_TAG_hhea,
-  HB_OT_TAG_hmtx,
-  HB_OT_TAG_HVAR,
-  HB_OT_TAG_JSTF,
-  HB_TAG ('k', 'e', 'r', 'n'),
-  HB_OT_TAG_loca,
-  HB_TAG ('L', 'T', 'S', 'H'),
-  HB_OT_TAG_MATH,
-  HB_OT_TAG_maxp,
-  HB_TAG ('M', 'E', 'R', 'G'),
-  HB_TAG ('m', 'e', 't', 'a'),
-  HB_TAG ('M', 'V', 'A', 'R'),
-  HB_TAG ('P', 'C', 'L', 'T'),
-  HB_OT_TAG_post,
-  HB_TAG ('p', 'r', 'e', 'p'),
-  HB_OT_TAG_sbix,
-  HB_TAG ('S', 'T', 'A', 'T'),
-  HB_TAG ('S', 'V', 'G', ' '),
-  HB_TAG ('V', 'D', 'M', 'X'),
-  HB_OT_TAG_vhea,
-  HB_OT_TAG_vmtx,
-  HB_OT_TAG_VORG,
-  HB_OT_TAG_VVAR,
-  HB_OT_TAG_name,
-  HB_OT_TAG_OS2
+  HB_TAG('a','v','a','r'),
+  HB_TAG('B','A','S','E'),
+  HB_TAG('C','B','D','T'),
+  HB_TAG('C','B','L','C'),
+  HB_TAG('C','F','F',' '),
+  HB_TAG('C','F','F','2'),
+  HB_TAG('c','m','a','p'),
+  HB_TAG('C','O','L','R'),
+  HB_TAG('C','P','A','L'),
+  HB_TAG('c','v','a','r'),
+  HB_TAG('c','v','t',' '),
+  HB_TAG('D','S','I','G'),
+  HB_TAG('E','B','D','T'),
+  HB_TAG('E','B','L','C'),
+  HB_TAG('E','B','S','C'),
+  HB_TAG('f','p','g','m'),
+  HB_TAG('f','v','a','r'),
+  HB_TAG('g','a','s','p'),
+  HB_TAG('G','D','E','F'),
+  HB_TAG('g','l','y','f'),
+  HB_TAG('G','P','O','S'),
+  HB_TAG('G','S','U','B'),
+  HB_TAG('g','v','a','r'),
+  HB_TAG('h','d','m','x'),
+  HB_TAG('h','e','a','d'),
+  HB_TAG('h','h','e','a'),
+  HB_TAG('h','m','t','x'),
+  HB_TAG('H','V','A','R'),
+  HB_TAG('J','S','T','F'),
+  HB_TAG('k','e','r','n'),
+  HB_TAG('l','o','c','a'),
+  HB_TAG('L','T','S','H'),
+  HB_TAG('M','A','T','H'),
+  HB_TAG('m','a','x','p'),
+  HB_TAG('M','E','R','G'),
+  HB_TAG('m','e','t','a'),
+  HB_TAG('M','V','A','R'),
+  HB_TAG('P','C','L','T'),
+  HB_TAG('p','o','s','t'),
+  HB_TAG('p','r','e','p'),
+  HB_TAG('s','b','i','x'),
+  HB_TAG('S','T','A','T'),
+  HB_TAG('S','V','G',' '),
+  HB_TAG('V','D','M','X'),
+  HB_TAG('v','h','e','a'),
+  HB_TAG('v','m','t','x'),
+  HB_TAG('V','O','R','G'),
+  HB_TAG('V','V','A','R'),
+  HB_TAG('n','a','m','e'),
+  HB_TAG('O','S','/','2')
 };
 
 static bool _table_is_empty (const hb_face_t *face, hb_tag_t tag)
@@ -213,169 +167,6 @@ _get_table_tags (const hb_subset_plan_t* plan,
 }
 
 
-static unsigned
-_plan_estimate_subset_table_size (hb_subset_plan_t *plan,
-                                  unsigned table_len,
-                                  hb_tag_t table_tag)
-{
-  unsigned src_glyphs = plan->source->get_num_glyphs ();
-  unsigned dst_glyphs = plan->glyphset ()->get_population ();
-
-  unsigned bulk = 8192;
-  /* Tables that we want to allocate same space as the source table. For GSUB/GPOS it's
-   * because those are expensive to subset, so giving them more room is fine. */
-  bool same_size = table_tag == HB_OT_TAG_GSUB ||
-                   table_tag == HB_OT_TAG_GPOS ||
-                   table_tag == HB_OT_TAG_name;
-
-  if (plan->flags & HB_SUBSET_FLAGS_RETAIN_GIDS)
-  {
-    if (table_tag == HB_OT_TAG_CFF1)
-    {
-      /* Add some extra room for the CFF charset. */
-      bulk += src_glyphs * 16;
-    }
-    else if (table_tag == HB_OT_TAG_CFF2)
-    {
-      /* Just extra CharString offsets. */
-      bulk += src_glyphs * 4;
-    }
-  }
-
-  if (unlikely (!src_glyphs) || same_size)
-    return bulk + table_len;
-
-  return bulk + (unsigned) (table_len * sqrt ((double) dst_glyphs / src_glyphs));
-}
-
-/*
- * Repack the serialization buffer if any offset overflows exist.
- */
-static hb_blob_t*
-_repack (hb_tag_t tag, const hb_serialize_context_t& c)
-{
-  if (!c.offset_overflow ())
-    return c.copy_blob ();
-
-  hb_blob_t* result = hb_resolve_overflows (c.object_graph (), tag);
-
-  if (unlikely (!result))
-  {
-    DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c offset overflow resolution failed.",
-               HB_UNTAG (tag));
-    return nullptr;
-  }
-
-  return result;
-}
-
-template<typename TableType>
-static
-bool
-_try_subset (const TableType *table,
-             hb_vector_t<char>* buf,
-             hb_subset_context_t* c /* OUT */)
-{
-  c->serializer->start_serialize ();
-  if (c->serializer->in_error ()) return false;
-
-  bool needed = table->subset (c);
-  if (!c->serializer->ran_out_of_room ())
-  {
-    c->serializer->end_serialize ();
-    return needed;
-  }
-
-  unsigned buf_size = buf->allocated;
-  buf_size = buf_size * 2 + 16;
-
-
-
-
-  DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c ran out of room; reallocating to %u bytes.",
-             HB_UNTAG (c->table_tag), buf_size);
-
-  if (unlikely (buf_size > c->source_blob->length * 256 ||
-                !buf->alloc_exact (buf_size)))
-  {
-    DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c failed to reallocate %u bytes.",
-               HB_UNTAG (c->table_tag), buf_size);
-    return needed;
-  }
-
-  c->serializer->reset (buf->arrayZ, buf->allocated);
-  return _try_subset (table, buf, c);
-}
-
-template <typename T>
-static auto _do_destroy (T &t, hb_priority<1>) HB_RETURN (void, t.destroy ())
-
-template <typename T>
-static void _do_destroy (T &t, hb_priority<0>) {}
-
-template<typename TableType>
-static bool
-_subset (hb_subset_plan_t *plan, hb_vector_t<char> &buf)
-{
-  auto &&source_blob = plan->source_table<TableType> ();
-  auto *table = source_blob.get ();
-
-  hb_tag_t tag = TableType::tableTag;
-  hb_blob_t *blob = source_blob.get_blob();
-  if (unlikely (!blob || !blob->data))
-  {
-    DEBUG_MSG (SUBSET, nullptr,
-               "OT::%c%c%c%c::subset sanitize failed on source table.", HB_UNTAG (tag));
-    _do_destroy (source_blob, hb_prioritize);
-    return false;
-  }
-
-  unsigned buf_size = _plan_estimate_subset_table_size (plan, blob->length, TableType::tableTag);
-  DEBUG_MSG (SUBSET, nullptr,
-             "OT::%c%c%c%c initial estimated table size: %u bytes.", HB_UNTAG (tag), buf_size);
-  if (unlikely (!buf.alloc (buf_size)))
-  {
-    DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c failed to allocate %u bytes.", HB_UNTAG (tag), buf_size);
-    _do_destroy (source_blob, hb_prioritize);
-    return false;
-  }
-
-  bool needed = false;
-  hb_serialize_context_t serializer (buf.arrayZ, buf.allocated);
-  {
-    hb_subset_context_t c (blob, plan, &serializer, tag);
-    needed = _try_subset (table, &buf, &c);
-  }
-  _do_destroy (source_blob, hb_prioritize);
-
-  if (serializer.in_error () && !serializer.only_offset_overflow ())
-  {
-    DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c::subset FAILED!", HB_UNTAG (tag));
-    return false;
-  }
-
-  if (!needed)
-  {
-    DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c::subset table subsetted to empty.", HB_UNTAG (tag));
-    return true;
-  }
-
-  bool result = false;
-  hb_blob_t *dest_blob = _repack (tag, serializer);
-  if (dest_blob)
-  {
-    DEBUG_MSG (SUBSET, nullptr,
-               "OT::%c%c%c%c final subset table size: %u bytes.",
-               HB_UNTAG (tag), dest_blob->length);
-    result = plan->add_table (tag, dest_blob);
-    hb_blob_destroy (dest_blob);
-  }
-
-  DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c::subset %s",
-             HB_UNTAG (tag), result ? "success" : "FAILED!");
-  return result;
-}
-
 static bool
 _is_table_present (hb_face_t *source, hb_tag_t tag)
 {
@@ -407,34 +198,34 @@ _should_drop_table (hb_subset_plan_t *plan, hb_tag_t tag)
 
   switch (tag)
   {
-  case HB_TAG ('c','v','a','r'): /* hint table, fallthrough */
+  case HB_TAG('c','v','a','r'): /* hint table, fallthrough */
     return plan->all_axes_pinned || (plan->flags & HB_SUBSET_FLAGS_NO_HINTING);
 
-  case HB_TAG ('c','v','t',' '): /* hint table, fallthrough */
-  case HB_TAG ('f','p','g','m'): /* hint table, fallthrough */
-  case HB_TAG ('p','r','e','p'): /* hint table, fallthrough */
-  case HB_TAG ('h','d','m','x'): /* hint table, fallthrough */
-  case HB_TAG ('V','D','M','X'): /* hint table, fallthrough */
+  case HB_TAG('c','v','t',' '): /* hint table, fallthrough */
+  case HB_TAG('f','p','g','m'): /* hint table, fallthrough */
+  case HB_TAG('p','r','e','p'): /* hint table, fallthrough */
+  case HB_TAG('h','d','m','x'): /* hint table, fallthrough */
+  case HB_TAG('V','D','M','X'): /* hint table, fallthrough */
     return plan->flags & HB_SUBSET_FLAGS_NO_HINTING;
 
 #ifdef HB_NO_SUBSET_LAYOUT
     // Drop Layout Tables if requested.
-  case HB_OT_TAG_GDEF:
-  case HB_OT_TAG_GPOS:
-  case HB_OT_TAG_GSUB:
-  case HB_TAG ('m','o','r','x'):
-  case HB_TAG ('m','o','r','t'):
-  case HB_TAG ('k','e','r','x'):
-  case HB_TAG ('k','e','r','n'):
+  case HB_TAG('G','D','E','F'):
+  case HB_TAG('G','P','O','S'):
+  case HB_TAG('G','S','U','B'):
+  case HB_TAG('m','o','r','x'):
+  case HB_TAG('m','o','r','t'):
+  case HB_TAG('k','e','r','x'):
+  case HB_TAG('k','e','r','n'):
     return true;
 #endif
 
-  case HB_TAG ('a','v','a','r'):
-  case HB_TAG ('f','v','a','r'):
-  case HB_TAG ('g','v','a','r'):
-  case HB_OT_TAG_HVAR:
-  case HB_OT_TAG_VVAR:
-  case HB_TAG ('M','V','A','R'):
+  case HB_TAG('a','v','a','r'):
+  case HB_TAG('f','v','a','r'):
+  case HB_TAG('g','v','a','r'):
+  case HB_TAG('H','V','A','R'):
+  case HB_TAG('V','V','A','R'):
+  case HB_TAG('M','V','A','R'):
     return plan->all_axes_pinned;
 
   default:
@@ -442,15 +233,6 @@ _should_drop_table (hb_subset_plan_t *plan, hb_tag_t tag)
   }
 }
 
-static bool
-_passthrough (hb_subset_plan_t *plan, hb_tag_t tag)
-{
-  hb_blob_t *source_table = hb_face_reference_table (plan->source, tag);
-  bool result = plan->add_table (tag, source_table);
-  hb_blob_destroy (source_table);
-  return result;
-}
-
 static bool
 _dependencies_satisfied (hb_subset_plan_t *plan, hb_tag_t tag,
                          const hb_set_t &subsetted_tags,
@@ -458,13 +240,13 @@ _dependencies_satisfied (hb_subset_plan_t *plan, hb_tag_t tag,
 {
   switch (tag)
   {
-  case HB_OT_TAG_hmtx:
-  case HB_OT_TAG_vmtx:
-  case HB_OT_TAG_maxp:
-  case HB_OT_TAG_OS2:
-    return !plan->normalized_coords || !pending_subset_tags.has (HB_OT_TAG_glyf);
-  case HB_OT_TAG_GPOS:
-    return plan->all_axes_pinned || !pending_subset_tags.has (HB_OT_TAG_GDEF);
+  case HB_TAG('h','m','t','x'):
+  case HB_TAG('v','m','t','x'):
+  case HB_TAG('m','a','x','p'):
+  case HB_TAG('O','S','/','2'):
+    return !plan->normalized_coords || !pending_subset_tags.has (HB_TAG('g','l','y','f'));
+  case HB_TAG('G','P','O','S'):
+    return plan->all_axes_pinned || !pending_subset_tags.has (HB_TAG('G','D','E','F'));
   default:
     return true;
   }
@@ -476,88 +258,48 @@ _subset_table (hb_subset_plan_t *plan,
                hb_tag_t tag)
 {
   if (plan->no_subset_tables.has (tag)) {
-    return _passthrough (plan, tag);
+    return _hb_subset_table_passthrough (plan, tag);
   }
 
   DEBUG_MSG (SUBSET, nullptr, "subset %c%c%c%c", HB_UNTAG (tag));
+
+  bool success;
+  if (_hb_subset_table_layout (plan, buf, tag, &success) ||
+      _hb_subset_table_var (plan, buf, tag, &success) ||
+      _hb_subset_table_cff (plan, buf, tag, &success) ||
+      _hb_subset_table_color (plan, buf, tag, &success) ||
+      _hb_subset_table_other (plan, buf, tag, &success))
+    return success;
+
+
   switch (tag)
   {
-  case HB_OT_TAG_glyf: return _subset<const OT::glyf> (plan, buf);
-  case HB_OT_TAG_hdmx: return _subset<const OT::hdmx> (plan, buf);
-  case HB_OT_TAG_name: return _subset<const OT::name> (plan, buf);
-  case HB_OT_TAG_head:
-    if (_is_table_present (plan->source, HB_OT_TAG_glyf) && !_should_drop_table (plan, HB_OT_TAG_glyf))
+  case HB_TAG('h','e','a','d'):
+    if (_is_table_present (plan->source, HB_TAG('g','l','y','f')) && !_should_drop_table (plan, HB_TAG('g','l','y','f')))
       return true; /* skip head, handled by glyf */
-    return _subset<const OT::head> (plan, buf);
-  case HB_OT_TAG_hhea: return true; /* skip hhea, handled by hmtx */
-  case HB_OT_TAG_hmtx: return _subset<const OT::hmtx> (plan, buf);
-  case HB_OT_TAG_vhea: return true; /* skip vhea, handled by vmtx */
-  case HB_OT_TAG_vmtx: return _subset<const OT::vmtx> (plan, buf);
-  case HB_OT_TAG_maxp: return _subset<const OT::maxp> (plan, buf);
-  case HB_OT_TAG_sbix: return _subset<const OT::sbix> (plan, buf);
-  case HB_OT_TAG_loca: return true; /* skip loca, handled by glyf */
-  case HB_OT_TAG_cmap: return _subset<const OT::cmap> (plan, buf);
-  case HB_OT_TAG_OS2 : return _subset<const OT::OS2 > (plan, buf);
-  case HB_OT_TAG_post: return _subset<const OT::post> (plan, buf);
-  case HB_OT_TAG_COLR: return _subset<const OT::COLR> (plan, buf);
-  case HB_OT_TAG_CPAL: return _subset<const OT::CPAL> (plan, buf);
-  case HB_OT_TAG_CBLC: return _subset<const OT::CBLC> (plan, buf);
-  case HB_OT_TAG_CBDT: return true; /* skip CBDT, handled by CBLC */
-  case HB_OT_TAG_MATH: return _subset<const OT::MATH> (plan, buf);
-  case HB_OT_TAG_BASE: return _subset<const OT::BASE> (plan, buf);
+    return _hb_subset_table<const OT::head> (plan, buf);
 
-#ifndef HB_NO_SUBSET_CFF
-  case HB_OT_TAG_CFF1: return _subset<const OT::cff1> (plan, buf);
-  case HB_OT_TAG_CFF2: return _subset<const OT::cff2> (plan, buf);
-  case HB_OT_TAG_VORG: return _subset<const OT::VORG> (plan, buf);
-#endif
-
-#ifndef HB_NO_SUBSET_LAYOUT
-  case HB_OT_TAG_GDEF: return _subset<const OT::GDEF> (plan, buf);
-  case HB_OT_TAG_GSUB: return _subset<const GSUB> (plan, buf);
-  case HB_OT_TAG_GPOS: return _subset<const GPOS> (plan, buf);
-  case HB_OT_TAG_gvar: return _subset<const OT::gvar> (plan, buf);
-  case HB_OT_TAG_HVAR: return _subset<const OT::HVAR> (plan, buf);
-  case HB_OT_TAG_VVAR: return _subset<const OT::VVAR> (plan, buf);
-#endif
+  case HB_TAG('S','T','A','T'):
+    if (!plan->user_axes_location.is_empty ()) return _hb_subset_table<const OT::STAT> (plan, buf);
+    else return _hb_subset_table_passthrough (plan, tag);
 
+  case HB_TAG('c','v','t',' '):
 #ifndef HB_NO_VAR
-  case HB_OT_TAG_fvar:
-    if (plan->user_axes_location.is_empty ()) return _passthrough (plan, tag);
-    return _subset<const OT::fvar> (plan, buf);
-  case HB_OT_TAG_avar:
-    if (plan->user_axes_location.is_empty ()) return _passthrough (plan, tag);
-    return _subset<const OT::avar> (plan, buf);
-  case HB_OT_TAG_cvar:
-    if (plan->user_axes_location.is_empty ()) return _passthrough (plan, tag);
-    return _subset<const OT::cvar> (plan, buf);
-  case HB_OT_TAG_MVAR:
-    if (plan->user_axes_location.is_empty ()) return _passthrough (plan, tag);
-    return _subset<const OT::MVAR> (plan, buf);
-#endif
-
-  case HB_OT_TAG_STAT:
-    if (!plan->user_axes_location.is_empty ()) return _subset<const OT::STAT> (plan, buf);
-    else return _passthrough (plan, tag);
-
-  case HB_TAG ('c', 'v', 't', ' '):
-#ifndef HB_NO_VAR
-    if (_is_table_present (plan->source, HB_OT_TAG_cvar) &&
+    if (_is_table_present (plan->source, HB_TAG('c','v','a','r')) &&
         plan->normalized_coords && !plan->pinned_at_default)
     {
       auto &cvar = *plan->source->table.cvar;
       return OT::cvar::add_cvt_and_apply_deltas (plan, cvar.get_tuple_var_data (), &cvar);
     }
 #endif
-    return _passthrough (plan, tag);
-
-  default:
-    if (plan->flags & HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED)
-      return _passthrough (plan, tag);
-
-    // Drop table
-    return true;
+    return _hb_subset_table_passthrough (plan, tag);
   }
+
+  if (plan->flags & HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED)
+    return _hb_subset_table_passthrough (plan, tag);
+
+  // Drop table
+  return true;
 }
 
 static void _attach_accelerator_data (hb_subset_plan_t* plan,
@@ -707,108 +449,4 @@ hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan)
 
 end:
   return success ? hb_face_reference (plan->dest) : nullptr;
-}
-
-
-#ifdef HB_EXPERIMENTAL_API
-
-#include "hb-ot-cff1-table.hh"
-
-template<typename accel_t>
-static hb_blob_t* get_charstrings_data(accel_t& accel, hb_codepoint_t glyph_index) {
-  if (!accel.is_valid()) {
-    return hb_blob_get_empty ();
-  }
-
-  hb_ubytes_t bytes = (*accel.charStrings)[glyph_index];
-  if (!bytes) {
-    return hb_blob_get_empty ();
-  }
-
-  hb_blob_t* cff_blob = accel.get_blob();
-  uint32_t length;
-  const char* cff_data = hb_blob_get_data(cff_blob, &length) ;
-
-  long int offset = (const char*) bytes.arrayZ - cff_data;
-  if (offset < 0 || offset > INT32_MAX) {
-    return hb_blob_get_empty ();
-  }
-
-  return hb_blob_create_sub_blob(cff_blob, (uint32_t) offset, bytes.length);
-}
-
-template<typename accel_t>
-static hb_blob_t* get_charstrings_index(accel_t& accel) {
-  if (!accel.is_valid()) {
-    return hb_blob_get_empty ();
-  }
-
-  const char* charstrings_start = (const char*) accel.charStrings;
-  unsigned charstrings_length = accel.charStrings->get_size();
-
-  hb_blob_t* cff_blob = accel.get_blob();
-  uint32_t length;
-  const char* cff_data = hb_blob_get_data(cff_blob, &length) ;
-
-  long int offset = charstrings_start - cff_data;
-  if (offset < 0 || offset > INT32_MAX) {
-    return hb_blob_get_empty ();
-  }
-
-  return hb_blob_create_sub_blob(cff_blob, (uint32_t) offset, charstrings_length);
-}
-
-/**
- * hb_subset_cff_get_charstring_data:
- * @face: A face object
- * @glyph_index: Glyph index to get data for.
- *
- * Returns the raw outline data from the CFF/CFF2 table associated with the given glyph index.
- *
- * XSince: EXPERIMENTAL
- **/
-HB_EXTERN hb_blob_t*
-hb_subset_cff_get_charstring_data(hb_face_t* face, hb_codepoint_t glyph_index) {
-  return get_charstrings_data(*face->table.cff1, glyph_index);
-}
-
-/**
- * hb_subset_cff_get_charstrings_index:
- * @face: A face object
- *
- * Returns the raw CFF CharStrings INDEX from the CFF table.
- *
- * XSince: EXPERIMENTAL
- **/
-HB_EXTERN hb_blob_t*
-hb_subset_cff_get_charstrings_index (hb_face_t* face) {
-  return get_charstrings_index (*face->table.cff1);
-}
-
-/**
- * hb_subset_cff2_get_charstring_data:
- * @face: A face object
- * @glyph_index: Glyph index to get data for.
- *
- * Returns the raw outline data from the CFF/CFF2 table associated with the given glyph index.
- *
- * XSince: EXPERIMENTAL
- **/
-HB_EXTERN hb_blob_t*
-hb_subset_cff2_get_charstring_data(hb_face_t* face, hb_codepoint_t glyph_index) {
-  return get_charstrings_data(*face->table.cff2, glyph_index);
-}
-
-/**
- * hb_subset_cff2_get_charstrings_index:
- * @face: A face object
- *
- * Returns the raw CFF2 CharStrings INDEX from the CFF2 table.
- *
- * XSince: EXPERIMENTAL
- **/
-HB_EXTERN hb_blob_t*
-hb_subset_cff2_get_charstrings_index (hb_face_t* face) {
-  return get_charstrings_index (*face->table.cff2);
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.h b/src/java.desktop/share/native/libharfbuzz/hb-subset.h
index 3eccd25738e..fd2908e8308 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.h
@@ -80,6 +80,10 @@ typedef struct hb_subset_plan_t hb_subset_plan_t;
  * @HB_SUBSET_FLAGS_IFTB_REQUIREMENTS: If set enforce requirements on the output subset
  * to allow it to be used with incremental font transfer IFTB patches. Primarily,
  * this forces all outline data to use long (32 bit) offsets. Since: EXPERIMENTAL
+ * @HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS: If this flag is set along side
+ * HB_SUBSET_FLAGS_RETAIN_GIDS then the number of glyphs in the font won't
+ * be reduced as a result of subsetting. If necessary empty glyphs will be
+ * included at the end of the font to keep the number of glyphs unchanged.
  *
  * List of boolean properties that can be configured on the subset input.
  *
@@ -101,6 +105,7 @@ typedef enum { /*< flags >*/
   HB_SUBSET_FLAGS_NO_BIDI_CLOSURE         =  0x00000800u,
 #ifdef HB_EXPERIMENTAL_API
   HB_SUBSET_FLAGS_IFTB_REQUIREMENTS       =  0x00001000u,
+  HB_SUBSET_FLAGS_RETAIN_NUM_GLYPHS  =  0x00002000u,
 #endif
 } hb_subset_flags_t;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset.hh
index bc7c24c94de..009919764f5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.hh
@@ -70,5 +70,4 @@ struct hb_subset_context_t :
                         table_tag (table_tag_) {}
 };
 
-
 #endif /* HB_SUBSET_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh
index 8731a0bcf8d..868428ab1e7 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh
@@ -2,9 +2,9 @@
 /*
  * The following table is generated by running:
  *
- *   ./gen-ucd-table.py ucd.nounihan.grouped.xml
+ *   ./gen-ucd-table.py ucd.nounihan.grouped.xml hb-script-list.h
  *
- * on file with this description: Unicode 16.0.0
+ * on file with this description: Unicode 17.0.0
  */
 
 #ifndef HB_UCD_TABLE_HH
@@ -12,8 +12,9 @@
 
 #include "hb.hh"
 
-static const hb_script_t
-_hb_ucd_sc_map[172] =
+#include <stdint.h>
+
+static const hb_script_t _hb_ucd_sc_map[176]=
 {
                    HB_SCRIPT_COMMON,              HB_SCRIPT_INHERITED,
                   HB_SCRIPT_UNKNOWN,                 HB_SCRIPT_ARABIC,
@@ -101,1040 +102,805 @@ _hb_ucd_sc_map[172] =
              HB_SCRIPT_GURUNG_KHEMA,              HB_SCRIPT_KIRAT_RAI,
                   HB_SCRIPT_OL_ONAL,                HB_SCRIPT_SUNUWAR,
                    HB_SCRIPT_TODHRI,          HB_SCRIPT_TULU_TIGALARI,
+               HB_SCRIPT_BERIA_ERFE,                HB_SCRIPT_SIDETIC,
+                   HB_SCRIPT_TAI_YO,            HB_SCRIPT_TOLONG_SIKI,
 };
-static const uint16_t
-_hb_ucd_dm1_p0_map[825] =
+static const uint16_t _hb_ucd_dm1_p0_map[825]=
 {
-   0x003Bu, 0x004Bu, 0x0060u, 0x00B4u, 0x00B7u, 0x00C5u, 0x02B9u, 0x0300u,
-   0x0301u, 0x0313u, 0x0385u, 0x0386u, 0x0388u, 0x0389u, 0x038Au, 0x038Cu,
-   0x038Eu, 0x038Fu, 0x0390u, 0x03A9u, 0x03ACu, 0x03ADu, 0x03AEu, 0x03AFu,
-   0x03B0u, 0x03B9u, 0x03CCu, 0x03CDu, 0x03CEu, 0x2002u, 0x2003u, 0x3008u,
-   0x3009u, 0x349Eu, 0x34B9u, 0x34BBu, 0x34DFu, 0x3515u, 0x36EEu, 0x36FCu,
-   0x3781u, 0x382Fu, 0x3862u, 0x387Cu, 0x38C7u, 0x38E3u, 0x391Cu, 0x393Au,
-   0x3A2Eu, 0x3A6Cu, 0x3AE4u, 0x3B08u, 0x3B19u, 0x3B49u, 0x3B9Du, 0x3C18u,
-   0x3C4Eu, 0x3D33u, 0x3D96u, 0x3EACu, 0x3EB8u, 0x3F1Bu, 0x3FFCu, 0x4008u,
-   0x4018u, 0x4039u, 0x4046u, 0x4096u, 0x40E3u, 0x412Fu, 0x4202u, 0x4227u,
-   0x42A0u, 0x4301u, 0x4334u, 0x4359u, 0x43D5u, 0x43D9u, 0x440Bu, 0x446Bu,
-   0x452Bu, 0x455Du, 0x4561u, 0x456Bu, 0x45D7u, 0x45F9u, 0x4635u, 0x46BEu,
-   0x46C7u, 0x4995u, 0x49E6u, 0x4A6Eu, 0x4A76u, 0x4AB2u, 0x4B33u, 0x4BCEu,
-   0x4CCEu, 0x4CEDu, 0x4CF8u, 0x4D56u, 0x4E0Du, 0x4E26u, 0x4E32u, 0x4E38u,
-   0x4E39u, 0x4E3Du, 0x4E41u, 0x4E82u, 0x4E86u, 0x4EAEu, 0x4EC0u, 0x4ECCu,
-   0x4EE4u, 0x4F60u, 0x4F80u, 0x4F86u, 0x4F8Bu, 0x4FAEu, 0x4FBBu, 0x4FBFu,
-   0x5002u, 0x502Bu, 0x507Au, 0x5099u, 0x50CFu, 0x50DAu, 0x50E7u, 0x5140u,
-   0x5145u, 0x514Du, 0x5154u, 0x5164u, 0x5167u, 0x5168u, 0x5169u, 0x516Du,
-   0x5177u, 0x5180u, 0x518Du, 0x5192u, 0x5195u, 0x5197u, 0x51A4u, 0x51ACu,
-   0x51B5u, 0x51B7u, 0x51C9u, 0x51CCu, 0x51DCu, 0x51DEu, 0x51F5u, 0x5203u,
-   0x5207u, 0x5217u, 0x5229u, 0x523Au, 0x523Bu, 0x5246u, 0x5272u, 0x5277u,
-   0x5289u, 0x529Bu, 0x52A3u, 0x52B3u, 0x52C7u, 0x52C9u, 0x52D2u, 0x52DEu,
-   0x52E4u, 0x52F5u, 0x52FAu, 0x5305u, 0x5306u, 0x5317u, 0x533Fu, 0x5349u,
-   0x5351u, 0x535Au, 0x5373u, 0x5375u, 0x537Du, 0x537Fu, 0x53C3u, 0x53CAu,
-   0x53DFu, 0x53E5u, 0x53EBu, 0x53F1u, 0x5406u, 0x540Fu, 0x541Du, 0x5438u,
-   0x5442u, 0x5448u, 0x5468u, 0x549Eu, 0x54A2u, 0x54BDu, 0x54F6u, 0x5510u,
-   0x5553u, 0x5555u, 0x5563u, 0x5584u, 0x5587u, 0x5599u, 0x559Du, 0x55ABu,
-   0x55B3u, 0x55C0u, 0x55C2u, 0x55E2u, 0x5606u, 0x5651u, 0x5668u, 0x5674u,
-   0x56F9u, 0x5716u, 0x5717u, 0x578Bu, 0x57CEu, 0x57F4u, 0x580Du, 0x5831u,
-   0x5832u, 0x5840u, 0x585Au, 0x585Eu, 0x58A8u, 0x58ACu, 0x58B3u, 0x58D8u,
-   0x58DFu, 0x58EEu, 0x58F2u, 0x58F7u, 0x5906u, 0x591Au, 0x5922u, 0x5944u,
-   0x5948u, 0x5951u, 0x5954u, 0x5962u, 0x5973u, 0x59D8u, 0x59ECu, 0x5A1Bu,
-   0x5A27u, 0x5A62u, 0x5A66u, 0x5AB5u, 0x5B08u, 0x5B28u, 0x5B3Eu, 0x5B85u,
-   0x5BC3u, 0x5BD8u, 0x5BE7u, 0x5BEEu, 0x5BF3u, 0x5BFFu, 0x5C06u, 0x5C22u,
-   0x5C3Fu, 0x5C60u, 0x5C62u, 0x5C64u, 0x5C65u, 0x5C6Eu, 0x5C8Du, 0x5CC0u,
-   0x5D19u, 0x5D43u, 0x5D50u, 0x5D6Bu, 0x5D6Eu, 0x5D7Cu, 0x5DB2u, 0x5DBAu,
-   0x5DE1u, 0x5DE2u, 0x5DFDu, 0x5E28u, 0x5E3Du, 0x5E69u, 0x5E74u, 0x5EA6u,
-   0x5EB0u, 0x5EB3u, 0x5EB6u, 0x5EC9u, 0x5ECAu, 0x5ED2u, 0x5ED3u, 0x5ED9u,
-   0x5EECu, 0x5EFEu, 0x5F04u, 0x5F22u, 0x5F53u, 0x5F62u, 0x5F69u, 0x5F6Bu,
-   0x5F8Bu, 0x5F9Au, 0x5FA9u, 0x5FADu, 0x5FCDu, 0x5FD7u, 0x5FF5u, 0x5FF9u,
-   0x6012u, 0x601Cu, 0x6075u, 0x6081u, 0x6094u, 0x60C7u, 0x60D8u, 0x60E1u,
-   0x6108u, 0x6144u, 0x6148u, 0x614Cu, 0x614Eu, 0x6160u, 0x6168u, 0x617Au,
-   0x618Eu, 0x6190u, 0x61A4u, 0x61AFu, 0x61B2u, 0x61DEu, 0x61F2u, 0x61F6u,
-   0x6200u, 0x6210u, 0x621Bu, 0x622Eu, 0x6234u, 0x625Du, 0x62B1u, 0x62C9u,
-   0x62CFu, 0x62D3u, 0x62D4u, 0x62FCu, 0x62FEu, 0x633Du, 0x6350u, 0x6368u,
-   0x637Bu, 0x6383u, 0x63A0u, 0x63A9u, 0x63C4u, 0x63C5u, 0x63E4u, 0x641Cu,
-   0x6422u, 0x6452u, 0x6469u, 0x6477u, 0x647Eu, 0x649Au, 0x649Du, 0x64C4u,
-   0x654Fu, 0x6556u, 0x656Cu, 0x6578u, 0x6599u, 0x65C5u, 0x65E2u, 0x65E3u,
-   0x6613u, 0x6649u, 0x6674u, 0x6688u, 0x6691u, 0x669Cu, 0x66B4u, 0x66C6u,
-   0x66F4u, 0x66F8u, 0x6700u, 0x6717u, 0x671Bu, 0x6721u, 0x674Eu, 0x6753u,
-   0x6756u, 0x675Eu, 0x677Bu, 0x6785u, 0x6797u, 0x67F3u, 0x67FAu, 0x6817u,
-   0x681Fu, 0x6852u, 0x6881u, 0x6885u, 0x688Eu, 0x68A8u, 0x6914u, 0x6942u,
-   0x69A3u, 0x69EAu, 0x6A02u, 0x6A13u, 0x6AA8u, 0x6AD3u, 0x6ADBu, 0x6B04u,
-   0x6B21u, 0x6B54u, 0x6B72u, 0x6B77u, 0x6B79u, 0x6B9Fu, 0x6BAEu, 0x6BBAu,
-   0x6BBBu, 0x6C4Eu, 0x6C67u, 0x6C88u, 0x6CBFu, 0x6CCCu, 0x6CCDu, 0x6CE5u,
-   0x6D16u, 0x6D1Bu, 0x6D1Eu, 0x6D34u, 0x6D3Eu, 0x6D41u, 0x6D69u, 0x6D6Au,
-   0x6D77u, 0x6D78u, 0x6D85u, 0x6DCBu, 0x6DDAu, 0x6DEAu, 0x6DF9u, 0x6E1Au,
-   0x6E2Fu, 0x6E6Eu, 0x6E9Cu, 0x6EBAu, 0x6EC7u, 0x6ECBu, 0x6ED1u, 0x6EDBu,
-   0x6F0Fu, 0x6F22u, 0x6F23u, 0x6F6Eu, 0x6FC6u, 0x6FEBu, 0x6FFEu, 0x701Bu,
-   0x701Eu, 0x7039u, 0x704Au, 0x7070u, 0x7077u, 0x707Du, 0x7099u, 0x70ADu,
-   0x70C8u, 0x70D9u, 0x7145u, 0x7149u, 0x716Eu, 0x719Cu, 0x71CEu, 0x71D0u,
-   0x7210u, 0x721Bu, 0x7228u, 0x722Bu, 0x7235u, 0x7250u, 0x7262u, 0x7280u,
-   0x7295u, 0x72AFu, 0x72C0u, 0x72FCu, 0x732Au, 0x7375u, 0x737Au, 0x7387u,
-   0x738Bu, 0x73A5u, 0x73B2u, 0x73DEu, 0x7406u, 0x7409u, 0x7422u, 0x7447u,
-   0x745Cu, 0x7469u, 0x7471u, 0x7485u, 0x7489u, 0x7498u, 0x74CAu, 0x7506u,
-   0x7524u, 0x753Bu, 0x753Eu, 0x7559u, 0x7565u, 0x7570u, 0x75E2u, 0x7610u,
-   0x761Du, 0x761Fu, 0x7642u, 0x7669u, 0x76CAu, 0x76DBu, 0x76E7u, 0x76F4u,
-   0x7701u, 0x771Eu, 0x771Fu, 0x7740u, 0x774Au, 0x778Bu, 0x77A7u, 0x784Eu,
-   0x786Bu, 0x788Cu, 0x7891u, 0x78CAu, 0x78CCu, 0x78FBu, 0x792Au, 0x793Cu,
-   0x793Eu, 0x7948u, 0x7949u, 0x7950u, 0x7956u, 0x795Du, 0x795Eu, 0x7965u,
-   0x797Fu, 0x798Du, 0x798Eu, 0x798Fu, 0x79AEu, 0x79CAu, 0x79EBu, 0x7A1Cu,
-   0x7A40u, 0x7A4Au, 0x7A4Fu, 0x7A81u, 0x7AB1u, 0x7ACBu, 0x7AEEu, 0x7B20u,
-   0x7BC0u, 0x7BC6u, 0x7BC9u, 0x7C3Eu, 0x7C60u, 0x7C7Bu, 0x7C92u, 0x7CBEu,
-   0x7CD2u, 0x7CD6u, 0x7CE3u, 0x7CE7u, 0x7CE8u, 0x7D00u, 0x7D10u, 0x7D22u,
-   0x7D2Fu, 0x7D5Bu, 0x7D63u, 0x7DA0u, 0x7DBEu, 0x7DC7u, 0x7DF4u, 0x7E02u,
-   0x7E09u, 0x7E37u, 0x7E41u, 0x7E45u, 0x7F3Eu, 0x7F72u, 0x7F79u, 0x7F7Au,
-   0x7F85u, 0x7F95u, 0x7F9Au, 0x7FBDu, 0x7FFAu, 0x8001u, 0x8005u, 0x8046u,
-   0x8060u, 0x806Fu, 0x8070u, 0x807Eu, 0x808Bu, 0x80ADu, 0x80B2u, 0x8103u,
-   0x813Eu, 0x81D8u, 0x81E8u, 0x81EDu, 0x8201u, 0x8204u, 0x8218u, 0x826Fu,
-   0x8279u, 0x828Bu, 0x8291u, 0x829Du, 0x82B1u, 0x82B3u, 0x82BDu, 0x82E5u,
-   0x82E6u, 0x831Du, 0x8323u, 0x8336u, 0x8352u, 0x8353u, 0x8363u, 0x83ADu,
-   0x83BDu, 0x83C9u, 0x83CAu, 0x83CCu, 0x83DCu, 0x83E7u, 0x83EFu, 0x83F1u,
-   0x843Du, 0x8449u, 0x8457u, 0x84EEu, 0x84F1u, 0x84F3u, 0x84FCu, 0x8516u,
-   0x8564u, 0x85CDu, 0x85FAu, 0x8606u, 0x8612u, 0x862Du, 0x863Fu, 0x8650u,
-   0x865Cu, 0x8667u, 0x8669u, 0x8688u, 0x86A9u, 0x86E2u, 0x870Eu, 0x8728u,
-   0x876Bu, 0x8779u, 0x8786u, 0x87BAu, 0x87E1u, 0x8801u, 0x881Fu, 0x884Cu,
-   0x8860u, 0x8863u, 0x88C2u, 0x88CFu, 0x88D7u, 0x88DEu, 0x88E1u, 0x88F8u,
-   0x88FAu, 0x8910u, 0x8941u, 0x8964u, 0x8986u, 0x898Bu, 0x8996u, 0x8AA0u,
-   0x8AAAu, 0x8ABFu, 0x8ACBu, 0x8AD2u, 0x8AD6u, 0x8AEDu, 0x8AF8u, 0x8AFEu,
-   0x8B01u, 0x8B39u, 0x8B58u, 0x8B80u, 0x8B8Au, 0x8C48u, 0x8C55u, 0x8CABu,
-   0x8CC1u, 0x8CC2u, 0x8CC8u, 0x8CD3u, 0x8D08u, 0x8D1Bu, 0x8D77u, 0x8DBCu,
-   0x8DCBu, 0x8DEFu, 0x8DF0u, 0x8ECAu, 0x8ED4u, 0x8F26u, 0x8F2Au, 0x8F38u,
-   0x8F3Bu, 0x8F62u, 0x8F9Eu, 0x8FB0u, 0x8FB6u, 0x9023u, 0x9038u, 0x9072u,
-   0x907Cu, 0x908Fu, 0x9094u, 0x90CEu, 0x90DEu, 0x90F1u, 0x90FDu, 0x9111u,
-   0x911Bu, 0x916Au, 0x9199u, 0x91B4u, 0x91CCu, 0x91CFu, 0x91D1u, 0x9234u,
-   0x9238u, 0x9276u, 0x927Cu, 0x92D7u, 0x92D8u, 0x9304u, 0x934Au, 0x93F9u,
-   0x9415u, 0x958Bu, 0x95ADu, 0x95B7u, 0x962Eu, 0x964Bu, 0x964Du, 0x9675u,
-   0x9678u, 0x967Cu, 0x9686u, 0x96A3u, 0x96B7u, 0x96B8u, 0x96C3u, 0x96E2u,
-   0x96E3u, 0x96F6u, 0x96F7u, 0x9723u, 0x9732u, 0x9748u, 0x9756u, 0x97DBu,
-   0x97E0u, 0x97FFu, 0x980Bu, 0x9818u, 0x9829u, 0x983Bu, 0x985Eu, 0x98E2u,
-   0x98EFu, 0x98FCu, 0x9928u, 0x9929u, 0x99A7u, 0x99C2u, 0x99F1u, 0x99FEu,
-   0x9A6Au, 0x9B12u, 0x9B6Fu, 0x9C40u, 0x9C57u, 0x9CFDu, 0x9D67u, 0x9DB4u,
-   0x9DFAu, 0x9E1Eu, 0x9E7Fu, 0x9E97u, 0x9E9Fu, 0x9EBBu, 0x9ECEu, 0x9EF9u,
-   0x9EFEu, 0x9F05u, 0x9F0Fu, 0x9F16u, 0x9F3Bu, 0x9F43u, 0x9F8Du, 0x9F8Eu,
-   0x9F9Cu,
+   0x003B, 0x004B, 0x0060, 0x00B4, 0x00B7, 0x00C5, 0x02B9, 0x0300,
+   0x0301, 0x0313, 0x0385, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C,
+   0x038E, 0x038F, 0x0390, 0x03A9, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+   0x03B0, 0x03B9, 0x03CC, 0x03CD, 0x03CE, 0x2002, 0x2003, 0x3008,
+   0x3009, 0x349E, 0x34B9, 0x34BB, 0x34DF, 0x3515, 0x36EE, 0x36FC,
+   0x3781, 0x382F, 0x3862, 0x387C, 0x38C7, 0x38E3, 0x391C, 0x393A,
+   0x3A2E, 0x3A6C, 0x3AE4, 0x3B08, 0x3B19, 0x3B49, 0x3B9D, 0x3C18,
+   0x3C4E, 0x3D33, 0x3D96, 0x3EAC, 0x3EB8, 0x3F1B, 0x3FFC, 0x4008,
+   0x4018, 0x4039, 0x4046, 0x4096, 0x40E3, 0x412F, 0x4202, 0x4227,
+   0x42A0, 0x4301, 0x4334, 0x4359, 0x43D5, 0x43D9, 0x440B, 0x446B,
+   0x452B, 0x455D, 0x4561, 0x456B, 0x45D7, 0x45F9, 0x4635, 0x46BE,
+   0x46C7, 0x4995, 0x49E6, 0x4A6E, 0x4A76, 0x4AB2, 0x4B33, 0x4BCE,
+   0x4CCE, 0x4CED, 0x4CF8, 0x4D56, 0x4E0D, 0x4E26, 0x4E32, 0x4E38,
+   0x4E39, 0x4E3D, 0x4E41, 0x4E82, 0x4E86, 0x4EAE, 0x4EC0, 0x4ECC,
+   0x4EE4, 0x4F60, 0x4F80, 0x4F86, 0x4F8B, 0x4FAE, 0x4FBB, 0x4FBF,
+   0x5002, 0x502B, 0x507A, 0x5099, 0x50CF, 0x50DA, 0x50E7, 0x5140,
+   0x5145, 0x514D, 0x5154, 0x5164, 0x5167, 0x5168, 0x5169, 0x516D,
+   0x5177, 0x5180, 0x518D, 0x5192, 0x5195, 0x5197, 0x51A4, 0x51AC,
+   0x51B5, 0x51B7, 0x51C9, 0x51CC, 0x51DC, 0x51DE, 0x51F5, 0x5203,
+   0x5207, 0x5217, 0x5229, 0x523A, 0x523B, 0x5246, 0x5272, 0x5277,
+   0x5289, 0x529B, 0x52A3, 0x52B3, 0x52C7, 0x52C9, 0x52D2, 0x52DE,
+   0x52E4, 0x52F5, 0x52FA, 0x5305, 0x5306, 0x5317, 0x533F, 0x5349,
+   0x5351, 0x535A, 0x5373, 0x5375, 0x537D, 0x537F, 0x53C3, 0x53CA,
+   0x53DF, 0x53E5, 0x53EB, 0x53F1, 0x5406, 0x540F, 0x541D, 0x5438,
+   0x5442, 0x5448, 0x5468, 0x549E, 0x54A2, 0x54BD, 0x54F6, 0x5510,
+   0x5553, 0x5555, 0x5563, 0x5584, 0x5587, 0x5599, 0x559D, 0x55AB,
+   0x55B3, 0x55C0, 0x55C2, 0x55E2, 0x5606, 0x5651, 0x5668, 0x5674,
+   0x56F9, 0x5716, 0x5717, 0x578B, 0x57CE, 0x57F4, 0x580D, 0x5831,
+   0x5832, 0x5840, 0x585A, 0x585E, 0x58A8, 0x58AC, 0x58B3, 0x58D8,
+   0x58DF, 0x58EE, 0x58F2, 0x58F7, 0x5906, 0x591A, 0x5922, 0x5944,
+   0x5948, 0x5951, 0x5954, 0x5962, 0x5973, 0x59D8, 0x59EC, 0x5A1B,
+   0x5A27, 0x5A62, 0x5A66, 0x5AB5, 0x5B08, 0x5B28, 0x5B3E, 0x5B85,
+   0x5BC3, 0x5BD8, 0x5BE7, 0x5BEE, 0x5BF3, 0x5BFF, 0x5C06, 0x5C22,
+   0x5C3F, 0x5C60, 0x5C62, 0x5C64, 0x5C65, 0x5C6E, 0x5C8D, 0x5CC0,
+   0x5D19, 0x5D43, 0x5D50, 0x5D6B, 0x5D6E, 0x5D7C, 0x5DB2, 0x5DBA,
+   0x5DE1, 0x5DE2, 0x5DFD, 0x5E28, 0x5E3D, 0x5E69, 0x5E74, 0x5EA6,
+   0x5EB0, 0x5EB3, 0x5EB6, 0x5EC9, 0x5ECA, 0x5ED2, 0x5ED3, 0x5ED9,
+   0x5EEC, 0x5EFE, 0x5F04, 0x5F22, 0x5F53, 0x5F62, 0x5F69, 0x5F6B,
+   0x5F8B, 0x5F9A, 0x5FA9, 0x5FAD, 0x5FCD, 0x5FD7, 0x5FF5, 0x5FF9,
+   0x6012, 0x601C, 0x6075, 0x6081, 0x6094, 0x60C7, 0x60D8, 0x60E1,
+   0x6108, 0x6144, 0x6148, 0x614C, 0x614E, 0x6160, 0x6168, 0x617A,
+   0x618E, 0x6190, 0x61A4, 0x61AF, 0x61B2, 0x61DE, 0x61F2, 0x61F6,
+   0x6200, 0x6210, 0x621B, 0x622E, 0x6234, 0x625D, 0x62B1, 0x62C9,
+   0x62CF, 0x62D3, 0x62D4, 0x62FC, 0x62FE, 0x633D, 0x6350, 0x6368,
+   0x637B, 0x6383, 0x63A0, 0x63A9, 0x63C4, 0x63C5, 0x63E4, 0x641C,
+   0x6422, 0x6452, 0x6469, 0x6477, 0x647E, 0x649A, 0x649D, 0x64C4,
+   0x654F, 0x6556, 0x656C, 0x6578, 0x6599, 0x65C5, 0x65E2, 0x65E3,
+   0x6613, 0x6649, 0x6674, 0x6688, 0x6691, 0x669C, 0x66B4, 0x66C6,
+   0x66F4, 0x66F8, 0x6700, 0x6717, 0x671B, 0x6721, 0x674E, 0x6753,
+   0x6756, 0x675E, 0x677B, 0x6785, 0x6797, 0x67F3, 0x67FA, 0x6817,
+   0x681F, 0x6852, 0x6881, 0x6885, 0x688E, 0x68A8, 0x6914, 0x6942,
+   0x69A3, 0x69EA, 0x6A02, 0x6A13, 0x6AA8, 0x6AD3, 0x6ADB, 0x6B04,
+   0x6B21, 0x6B54, 0x6B72, 0x6B77, 0x6B79, 0x6B9F, 0x6BAE, 0x6BBA,
+   0x6BBB, 0x6C4E, 0x6C67, 0x6C88, 0x6CBF, 0x6CCC, 0x6CCD, 0x6CE5,
+   0x6D16, 0x6D1B, 0x6D1E, 0x6D34, 0x6D3E, 0x6D41, 0x6D69, 0x6D6A,
+   0x6D77, 0x6D78, 0x6D85, 0x6DCB, 0x6DDA, 0x6DEA, 0x6DF9, 0x6E1A,
+   0x6E2F, 0x6E6E, 0x6E9C, 0x6EBA, 0x6EC7, 0x6ECB, 0x6ED1, 0x6EDB,
+   0x6F0F, 0x6F22, 0x6F23, 0x6F6E, 0x6FC6, 0x6FEB, 0x6FFE, 0x701B,
+   0x701E, 0x7039, 0x704A, 0x7070, 0x7077, 0x707D, 0x7099, 0x70AD,
+   0x70C8, 0x70D9, 0x7145, 0x7149, 0x716E, 0x719C, 0x71CE, 0x71D0,
+   0x7210, 0x721B, 0x7228, 0x722B, 0x7235, 0x7250, 0x7262, 0x7280,
+   0x7295, 0x72AF, 0x72C0, 0x72FC, 0x732A, 0x7375, 0x737A, 0x7387,
+   0x738B, 0x73A5, 0x73B2, 0x73DE, 0x7406, 0x7409, 0x7422, 0x7447,
+   0x745C, 0x7469, 0x7471, 0x7485, 0x7489, 0x7498, 0x74CA, 0x7506,
+   0x7524, 0x753B, 0x753E, 0x7559, 0x7565, 0x7570, 0x75E2, 0x7610,
+   0x761D, 0x761F, 0x7642, 0x7669, 0x76CA, 0x76DB, 0x76E7, 0x76F4,
+   0x7701, 0x771E, 0x771F, 0x7740, 0x774A, 0x778B, 0x77A7, 0x784E,
+   0x786B, 0x788C, 0x7891, 0x78CA, 0x78CC, 0x78FB, 0x792A, 0x793C,
+   0x793E, 0x7948, 0x7949, 0x7950, 0x7956, 0x795D, 0x795E, 0x7965,
+   0x797F, 0x798D, 0x798E, 0x798F, 0x79AE, 0x79CA, 0x79EB, 0x7A1C,
+   0x7A40, 0x7A4A, 0x7A4F, 0x7A81, 0x7AB1, 0x7ACB, 0x7AEE, 0x7B20,
+   0x7BC0, 0x7BC6, 0x7BC9, 0x7C3E, 0x7C60, 0x7C7B, 0x7C92, 0x7CBE,
+   0x7CD2, 0x7CD6, 0x7CE3, 0x7CE7, 0x7CE8, 0x7D00, 0x7D10, 0x7D22,
+   0x7D2F, 0x7D5B, 0x7D63, 0x7DA0, 0x7DBE, 0x7DC7, 0x7DF4, 0x7E02,
+   0x7E09, 0x7E37, 0x7E41, 0x7E45, 0x7F3E, 0x7F72, 0x7F79, 0x7F7A,
+   0x7F85, 0x7F95, 0x7F9A, 0x7FBD, 0x7FFA, 0x8001, 0x8005, 0x8046,
+   0x8060, 0x806F, 0x8070, 0x807E, 0x808B, 0x80AD, 0x80B2, 0x8103,
+   0x813E, 0x81D8, 0x81E8, 0x81ED, 0x8201, 0x8204, 0x8218, 0x826F,
+   0x8279, 0x828B, 0x8291, 0x829D, 0x82B1, 0x82B3, 0x82BD, 0x82E5,
+   0x82E6, 0x831D, 0x8323, 0x8336, 0x8352, 0x8353, 0x8363, 0x83AD,
+   0x83BD, 0x83C9, 0x83CA, 0x83CC, 0x83DC, 0x83E7, 0x83EF, 0x83F1,
+   0x843D, 0x8449, 0x8457, 0x84EE, 0x84F1, 0x84F3, 0x84FC, 0x8516,
+   0x8564, 0x85CD, 0x85FA, 0x8606, 0x8612, 0x862D, 0x863F, 0x8650,
+   0x865C, 0x8667, 0x8669, 0x8688, 0x86A9, 0x86E2, 0x870E, 0x8728,
+   0x876B, 0x8779, 0x8786, 0x87BA, 0x87E1, 0x8801, 0x881F, 0x884C,
+   0x8860, 0x8863, 0x88C2, 0x88CF, 0x88D7, 0x88DE, 0x88E1, 0x88F8,
+   0x88FA, 0x8910, 0x8941, 0x8964, 0x8986, 0x898B, 0x8996, 0x8AA0,
+   0x8AAA, 0x8ABF, 0x8ACB, 0x8AD2, 0x8AD6, 0x8AED, 0x8AF8, 0x8AFE,
+   0x8B01, 0x8B39, 0x8B58, 0x8B80, 0x8B8A, 0x8C48, 0x8C55, 0x8CAB,
+   0x8CC1, 0x8CC2, 0x8CC8, 0x8CD3, 0x8D08, 0x8D1B, 0x8D77, 0x8DBC,
+   0x8DCB, 0x8DEF, 0x8DF0, 0x8ECA, 0x8ED4, 0x8F26, 0x8F2A, 0x8F38,
+   0x8F3B, 0x8F62, 0x8F9E, 0x8FB0, 0x8FB6, 0x9023, 0x9038, 0x9072,
+   0x907C, 0x908F, 0x9094, 0x90CE, 0x90DE, 0x90F1, 0x90FD, 0x9111,
+   0x911B, 0x916A, 0x9199, 0x91B4, 0x91CC, 0x91CF, 0x91D1, 0x9234,
+   0x9238, 0x9276, 0x927C, 0x92D7, 0x92D8, 0x9304, 0x934A, 0x93F9,
+   0x9415, 0x958B, 0x95AD, 0x95B7, 0x962E, 0x964B, 0x964D, 0x9675,
+   0x9678, 0x967C, 0x9686, 0x96A3, 0x96B7, 0x96B8, 0x96C3, 0x96E2,
+   0x96E3, 0x96F6, 0x96F7, 0x9723, 0x9732, 0x9748, 0x9756, 0x97DB,
+   0x97E0, 0x97FF, 0x980B, 0x9818, 0x9829, 0x983B, 0x985E, 0x98E2,
+   0x98EF, 0x98FC, 0x9928, 0x9929, 0x99A7, 0x99C2, 0x99F1, 0x99FE,
+   0x9A6A, 0x9B12, 0x9B6F, 0x9C40, 0x9C57, 0x9CFD, 0x9D67, 0x9DB4,
+   0x9DFA, 0x9E1E, 0x9E7F, 0x9E97, 0x9E9F, 0x9EBB, 0x9ECE, 0x9EF9,
+   0x9EFE, 0x9F05, 0x9F0F, 0x9F16, 0x9F3B, 0x9F43, 0x9F8D, 0x9F8E,
+   0x9F9C,
 };
-static const uint16_t
-_hb_ucd_dm1_p2_map[110] =
+static const uint16_t _hb_ucd_dm1_p2_map[110]=
 {
-   0x0122u, 0x051Cu, 0x0525u, 0x054Bu, 0x063Au, 0x0804u, 0x08DEu, 0x0A2Cu,
-   0x0B63u, 0x14E4u, 0x16A8u, 0x16EAu, 0x19C8u, 0x1B18u, 0x1D0Bu, 0x1DE4u,
-   0x1DE6u, 0x2183u, 0x219Fu, 0x2331u, 0x26D4u, 0x2844u, 0x284Au, 0x2B0Cu,
-   0x2BF1u, 0x300Au, 0x32B8u, 0x335Fu, 0x3393u, 0x339Cu, 0x33C3u, 0x33D5u,
-   0x346Du, 0x36A3u, 0x38A7u, 0x3A8Du, 0x3AFAu, 0x3CBCu, 0x3D1Eu, 0x3ED1u,
-   0x3F5Eu, 0x3F8Eu, 0x4263u, 0x42EEu, 0x43ABu, 0x4608u, 0x4735u, 0x4814u,
-   0x4C36u, 0x4C92u, 0x4FA1u, 0x4FB8u, 0x5044u, 0x50F2u, 0x50F3u, 0x5119u,
-   0x5133u, 0x5249u, 0x541Du, 0x5626u, 0x569Au, 0x56C5u, 0x597Cu, 0x5AA7u,
-   0x5BABu, 0x5C80u, 0x5CD0u, 0x5F86u, 0x61DAu, 0x6228u, 0x6247u, 0x62D9u,
-   0x633Eu, 0x64DAu, 0x6523u, 0x65A8u, 0x67A7u, 0x67B5u, 0x6B3Cu, 0x6C36u,
-   0x6CD5u, 0x6D6Bu, 0x6F2Cu, 0x6FB1u, 0x70D2u, 0x73CAu, 0x7667u, 0x78AEu,
-   0x7966u, 0x7CA8u, 0x7ED3u, 0x7F2Fu, 0x85D2u, 0x85EDu, 0x872Eu, 0x8BFAu,
-   0x8D77u, 0x9145u, 0x91DFu, 0x921Au, 0x940Au, 0x9496u, 0x95B6u, 0x9B30u,
-   0xA0CEu, 0xA105u, 0xA20Eu, 0xA291u, 0xA392u, 0xA600u,
+   0x0122, 0x051C, 0x0525, 0x054B, 0x063A, 0x0804, 0x08DE, 0x0A2C,
+   0x0B63, 0x14E4, 0x16A8, 0x16EA, 0x19C8, 0x1B18, 0x1D0B, 0x1DE4,
+   0x1DE6, 0x2183, 0x219F, 0x2331, 0x26D4, 0x2844, 0x284A, 0x2B0C,
+   0x2BF1, 0x300A, 0x32B8, 0x335F, 0x3393, 0x339C, 0x33C3, 0x33D5,
+   0x346D, 0x36A3, 0x38A7, 0x3A8D, 0x3AFA, 0x3CBC, 0x3D1E, 0x3ED1,
+   0x3F5E, 0x3F8E, 0x4263, 0x42EE, 0x43AB, 0x4608, 0x4735, 0x4814,
+   0x4C36, 0x4C92, 0x4FA1, 0x4FB8, 0x5044, 0x50F2, 0x50F3, 0x5119,
+   0x5133, 0x5249, 0x541D, 0x5626, 0x569A, 0x56C5, 0x597C, 0x5AA7,
+   0x5BAB, 0x5C80, 0x5CD0, 0x5F86, 0x61DA, 0x6228, 0x6247, 0x62D9,
+   0x633E, 0x64DA, 0x6523, 0x65A8, 0x67A7, 0x67B5, 0x6B3C, 0x6C36,
+   0x6CD5, 0x6D6B, 0x6F2C, 0x6FB1, 0x70D2, 0x73CA, 0x7667, 0x78AE,
+   0x7966, 0x7CA8, 0x7ED3, 0x7F2F, 0x85D2, 0x85ED, 0x872E, 0x8BFA,
+   0x8D77, 0x9145, 0x91DF, 0x921A, 0x940A, 0x9496, 0x95B6, 0x9B30,
+   0xA0CE, 0xA105, 0xA20E, 0xA291, 0xA392, 0xA600,
 };
-static const uint32_t
-_hb_ucd_dm2_u32_map[638] =
+static const uint32_t _hb_ucd_dm2_u32_map[638]=
 {
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x003Cu, 0x0338u, 0x226Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x003Du, 0x0338u, 0x2260u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x003Eu, 0x0338u, 0x226Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0300u, 0x00C0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0301u, 0x00C1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0302u, 0x00C2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0303u, 0x00C3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0304u, 0x0100u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0306u, 0x0102u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0307u, 0x0226u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0308u, 0x00C4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0309u, 0x1EA2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x030Au, 0x00C5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x030Cu, 0x01CDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x030Fu, 0x0200u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0311u, 0x0202u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0323u, 0x1EA0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0325u, 0x1E00u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0041u, 0x0328u, 0x0104u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0042u, 0x0307u, 0x1E02u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0042u, 0x0323u, 0x1E04u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0042u, 0x0331u, 0x1E06u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0043u, 0x0301u, 0x0106u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0043u, 0x0302u, 0x0108u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0043u, 0x0307u, 0x010Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0043u, 0x030Cu, 0x010Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0043u, 0x0327u, 0x00C7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0044u, 0x0307u, 0x1E0Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0044u, 0x030Cu, 0x010Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0044u, 0x0323u, 0x1E0Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0044u, 0x0327u, 0x1E10u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0044u, 0x032Du, 0x1E12u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0044u, 0x0331u, 0x1E0Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0300u, 0x00C8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0301u, 0x00C9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0302u, 0x00CAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0303u, 0x1EBCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0304u, 0x0112u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0306u, 0x0114u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0307u, 0x0116u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0308u, 0x00CBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0309u, 0x1EBAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x030Cu, 0x011Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x030Fu, 0x0204u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0311u, 0x0206u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0323u, 0x1EB8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0327u, 0x0228u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0328u, 0x0118u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x032Du, 0x1E18u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0045u, 0x0330u, 0x1E1Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0046u, 0x0307u, 0x1E1Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x0301u, 0x01F4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x0302u, 0x011Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x0304u, 0x1E20u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x0306u, 0x011Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x0307u, 0x0120u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x030Cu, 0x01E6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0047u, 0x0327u, 0x0122u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x0302u, 0x0124u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x0307u, 0x1E22u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x0308u, 0x1E26u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x030Cu, 0x021Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x0323u, 0x1E24u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x0327u, 0x1E28u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0048u, 0x032Eu, 0x1E2Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0300u, 0x00CCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0301u, 0x00CDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0302u, 0x00CEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0303u, 0x0128u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0304u, 0x012Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0306u, 0x012Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0307u, 0x0130u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0308u, 0x00CFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0309u, 0x1EC8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x030Cu, 0x01CFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x030Fu, 0x0208u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0311u, 0x020Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0323u, 0x1ECAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0328u, 0x012Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0049u, 0x0330u, 0x1E2Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Au, 0x0302u, 0x0134u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Bu, 0x0301u, 0x1E30u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Bu, 0x030Cu, 0x01E8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Bu, 0x0323u, 0x1E32u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Bu, 0x0327u, 0x0136u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Bu, 0x0331u, 0x1E34u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Cu, 0x0301u, 0x0139u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Cu, 0x030Cu, 0x013Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Cu, 0x0323u, 0x1E36u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Cu, 0x0327u, 0x013Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Cu, 0x032Du, 0x1E3Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Cu, 0x0331u, 0x1E3Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Du, 0x0301u, 0x1E3Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Du, 0x0307u, 0x1E40u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Du, 0x0323u, 0x1E42u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0300u, 0x01F8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0301u, 0x0143u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0303u, 0x00D1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0307u, 0x1E44u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x030Cu, 0x0147u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0323u, 0x1E46u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0327u, 0x0145u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x032Du, 0x1E4Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Eu, 0x0331u, 0x1E48u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0300u, 0x00D2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0301u, 0x00D3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0302u, 0x00D4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0303u, 0x00D5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0304u, 0x014Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0306u, 0x014Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0307u, 0x022Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0308u, 0x00D6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0309u, 0x1ECEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x030Bu, 0x0150u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x030Cu, 0x01D1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x030Fu, 0x020Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0311u, 0x020Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x031Bu, 0x01A0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0323u, 0x1ECCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x004Fu, 0x0328u, 0x01EAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0050u, 0x0301u, 0x1E54u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0050u, 0x0307u, 0x1E56u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x0301u, 0x0154u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x0307u, 0x1E58u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x030Cu, 0x0158u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x030Fu, 0x0210u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x0311u, 0x0212u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x0323u, 0x1E5Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x0327u, 0x0156u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0052u, 0x0331u, 0x1E5Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x0301u, 0x015Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x0302u, 0x015Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x0307u, 0x1E60u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x030Cu, 0x0160u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x0323u, 0x1E62u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x0326u, 0x0218u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0053u, 0x0327u, 0x015Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x0307u, 0x1E6Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x030Cu, 0x0164u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x0323u, 0x1E6Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x0326u, 0x021Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x0327u, 0x0162u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x032Du, 0x1E70u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0054u, 0x0331u, 0x1E6Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0300u, 0x00D9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0301u, 0x00DAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0302u, 0x00DBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0303u, 0x0168u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0304u, 0x016Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0306u, 0x016Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0308u, 0x00DCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0309u, 0x1EE6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x030Au, 0x016Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x030Bu, 0x0170u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x030Cu, 0x01D3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x030Fu, 0x0214u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0311u, 0x0216u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x031Bu, 0x01AFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0323u, 0x1EE4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0324u, 0x1E72u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0328u, 0x0172u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x032Du, 0x1E76u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0055u, 0x0330u, 0x1E74u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0056u, 0x0303u, 0x1E7Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0056u, 0x0323u, 0x1E7Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0057u, 0x0300u, 0x1E80u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0057u, 0x0301u, 0x1E82u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0057u, 0x0302u, 0x0174u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0057u, 0x0307u, 0x1E86u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0057u, 0x0308u, 0x1E84u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0057u, 0x0323u, 0x1E88u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0058u, 0x0307u, 0x1E8Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0058u, 0x0308u, 0x1E8Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0300u, 0x1EF2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0301u, 0x00DDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0302u, 0x0176u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0303u, 0x1EF8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0304u, 0x0232u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0307u, 0x1E8Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0308u, 0x0178u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0309u, 0x1EF6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0059u, 0x0323u, 0x1EF4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x005Au, 0x0301u, 0x0179u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x005Au, 0x0302u, 0x1E90u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x005Au, 0x0307u, 0x017Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x005Au, 0x030Cu, 0x017Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x005Au, 0x0323u, 0x1E92u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x005Au, 0x0331u, 0x1E94u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0300u, 0x00E0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0301u, 0x00E1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0302u, 0x00E2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0303u, 0x00E3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0304u, 0x0101u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0306u, 0x0103u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0307u, 0x0227u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0308u, 0x00E4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0309u, 0x1EA3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x030Au, 0x00E5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x030Cu, 0x01CEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x030Fu, 0x0201u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0311u, 0x0203u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0323u, 0x1EA1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0325u, 0x1E01u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0061u, 0x0328u, 0x0105u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0062u, 0x0307u, 0x1E03u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0062u, 0x0323u, 0x1E05u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0062u, 0x0331u, 0x1E07u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0063u, 0x0301u, 0x0107u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0063u, 0x0302u, 0x0109u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0063u, 0x0307u, 0x010Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0063u, 0x030Cu, 0x010Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0063u, 0x0327u, 0x00E7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0064u, 0x0307u, 0x1E0Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0064u, 0x030Cu, 0x010Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0064u, 0x0323u, 0x1E0Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0064u, 0x0327u, 0x1E11u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0064u, 0x032Du, 0x1E13u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0064u, 0x0331u, 0x1E0Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0300u, 0x00E8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0301u, 0x00E9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0302u, 0x00EAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0303u, 0x1EBDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0304u, 0x0113u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0306u, 0x0115u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0307u, 0x0117u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0308u, 0x00EBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0309u, 0x1EBBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x030Cu, 0x011Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x030Fu, 0x0205u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0311u, 0x0207u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0323u, 0x1EB9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0327u, 0x0229u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0328u, 0x0119u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x032Du, 0x1E19u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0065u, 0x0330u, 0x1E1Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0066u, 0x0307u, 0x1E1Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x0301u, 0x01F5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x0302u, 0x011Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x0304u, 0x1E21u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x0306u, 0x011Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x0307u, 0x0121u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x030Cu, 0x01E7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0067u, 0x0327u, 0x0123u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x0302u, 0x0125u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x0307u, 0x1E23u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x0308u, 0x1E27u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x030Cu, 0x021Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x0323u, 0x1E25u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x0327u, 0x1E29u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x032Eu, 0x1E2Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0068u, 0x0331u, 0x1E96u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0300u, 0x00ECu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0301u, 0x00EDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0302u, 0x00EEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0303u, 0x0129u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0304u, 0x012Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0306u, 0x012Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0308u, 0x00EFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0309u, 0x1EC9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x030Cu, 0x01D0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x030Fu, 0x0209u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0311u, 0x020Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0323u, 0x1ECBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0328u, 0x012Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0069u, 0x0330u, 0x1E2Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Au, 0x0302u, 0x0135u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Au, 0x030Cu, 0x01F0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Bu, 0x0301u, 0x1E31u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Bu, 0x030Cu, 0x01E9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Bu, 0x0323u, 0x1E33u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Bu, 0x0327u, 0x0137u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Bu, 0x0331u, 0x1E35u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Cu, 0x0301u, 0x013Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Cu, 0x030Cu, 0x013Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Cu, 0x0323u, 0x1E37u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Cu, 0x0327u, 0x013Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Cu, 0x032Du, 0x1E3Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Cu, 0x0331u, 0x1E3Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Du, 0x0301u, 0x1E3Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Du, 0x0307u, 0x1E41u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Du, 0x0323u, 0x1E43u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0300u, 0x01F9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0301u, 0x0144u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0303u, 0x00F1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0307u, 0x1E45u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x030Cu, 0x0148u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0323u, 0x1E47u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0327u, 0x0146u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x032Du, 0x1E4Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Eu, 0x0331u, 0x1E49u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0300u, 0x00F2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0301u, 0x00F3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0302u, 0x00F4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0303u, 0x00F5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0304u, 0x014Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0306u, 0x014Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0307u, 0x022Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0308u, 0x00F6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0309u, 0x1ECFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x030Bu, 0x0151u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x030Cu, 0x01D2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x030Fu, 0x020Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0311u, 0x020Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x031Bu, 0x01A1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0323u, 0x1ECDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x006Fu, 0x0328u, 0x01EBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0070u, 0x0301u, 0x1E55u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0070u, 0x0307u, 0x1E57u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x0301u, 0x0155u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x0307u, 0x1E59u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x030Cu, 0x0159u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x030Fu, 0x0211u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x0311u, 0x0213u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x0323u, 0x1E5Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x0327u, 0x0157u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0072u, 0x0331u, 0x1E5Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x0301u, 0x015Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x0302u, 0x015Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x0307u, 0x1E61u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x030Cu, 0x0161u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x0323u, 0x1E63u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x0326u, 0x0219u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0073u, 0x0327u, 0x015Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x0307u, 0x1E6Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x0308u, 0x1E97u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x030Cu, 0x0165u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x0323u, 0x1E6Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x0326u, 0x021Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x0327u, 0x0163u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x032Du, 0x1E71u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0074u, 0x0331u, 0x1E6Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0300u, 0x00F9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0301u, 0x00FAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0302u, 0x00FBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0303u, 0x0169u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0304u, 0x016Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0306u, 0x016Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0308u, 0x00FCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0309u, 0x1EE7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x030Au, 0x016Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x030Bu, 0x0171u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x030Cu, 0x01D4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x030Fu, 0x0215u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0311u, 0x0217u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x031Bu, 0x01B0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0323u, 0x1EE5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0324u, 0x1E73u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0328u, 0x0173u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x032Du, 0x1E77u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0075u, 0x0330u, 0x1E75u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0076u, 0x0303u, 0x1E7Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0076u, 0x0323u, 0x1E7Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x0300u, 0x1E81u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x0301u, 0x1E83u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x0302u, 0x0175u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x0307u, 0x1E87u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x0308u, 0x1E85u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x030Au, 0x1E98u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0077u, 0x0323u, 0x1E89u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0078u, 0x0307u, 0x1E8Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0078u, 0x0308u, 0x1E8Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0300u, 0x1EF3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0301u, 0x00FDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0302u, 0x0177u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0303u, 0x1EF9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0304u, 0x0233u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0307u, 0x1E8Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0308u, 0x00FFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0309u, 0x1EF7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x030Au, 0x1E99u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0079u, 0x0323u, 0x1EF5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x007Au, 0x0301u, 0x017Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x007Au, 0x0302u, 0x1E91u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x007Au, 0x0307u, 0x017Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x007Au, 0x030Cu, 0x017Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x007Au, 0x0323u, 0x1E93u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x007Au, 0x0331u, 0x1E95u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00A8u, 0x0300u, 0x1FEDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00A8u, 0x0301u, 0x0385u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00A8u, 0x0342u, 0x1FC1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2u, 0x0300u, 0x1EA6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2u, 0x0301u, 0x1EA4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2u, 0x0303u, 0x1EAAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2u, 0x0309u, 0x1EA8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C4u, 0x0304u, 0x01DEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C5u, 0x0301u, 0x01FAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C6u, 0x0301u, 0x01FCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C6u, 0x0304u, 0x01E2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00C7u, 0x0301u, 0x1E08u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00CAu, 0x0300u, 0x1EC0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00CAu, 0x0301u, 0x1EBEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00CAu, 0x0303u, 0x1EC4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00CAu, 0x0309u, 0x1EC2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00CFu, 0x0301u, 0x1E2Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4u, 0x0300u, 0x1ED2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4u, 0x0301u, 0x1ED0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4u, 0x0303u, 0x1ED6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4u, 0x0309u, 0x1ED4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D5u, 0x0301u, 0x1E4Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D5u, 0x0304u, 0x022Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D5u, 0x0308u, 0x1E4Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D6u, 0x0304u, 0x022Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00D8u, 0x0301u, 0x01FEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00DCu, 0x0300u, 0x01DBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00DCu, 0x0301u, 0x01D7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00DCu, 0x0304u, 0x01D5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00DCu, 0x030Cu, 0x01D9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2u, 0x0300u, 0x1EA7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2u, 0x0301u, 0x1EA5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2u, 0x0303u, 0x1EABu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2u, 0x0309u, 0x1EA9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E4u, 0x0304u, 0x01DFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E5u, 0x0301u, 0x01FBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E6u, 0x0301u, 0x01FDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E6u, 0x0304u, 0x01E3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00E7u, 0x0301u, 0x1E09u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00EAu, 0x0300u, 0x1EC1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00EAu, 0x0301u, 0x1EBFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00EAu, 0x0303u, 0x1EC5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00EAu, 0x0309u, 0x1EC3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00EFu, 0x0301u, 0x1E2Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4u, 0x0300u, 0x1ED3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4u, 0x0301u, 0x1ED1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4u, 0x0303u, 0x1ED7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4u, 0x0309u, 0x1ED5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F5u, 0x0301u, 0x1E4Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F5u, 0x0304u, 0x022Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F5u, 0x0308u, 0x1E4Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F6u, 0x0304u, 0x022Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00F8u, 0x0301u, 0x01FFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00FCu, 0x0300u, 0x01DCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00FCu, 0x0301u, 0x01D8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00FCu, 0x0304u, 0x01D6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x00FCu, 0x030Cu, 0x01DAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0102u, 0x0300u, 0x1EB0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0102u, 0x0301u, 0x1EAEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0102u, 0x0303u, 0x1EB4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0102u, 0x0309u, 0x1EB2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0103u, 0x0300u, 0x1EB1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0103u, 0x0301u, 0x1EAFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0103u, 0x0303u, 0x1EB5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0103u, 0x0309u, 0x1EB3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0112u, 0x0300u, 0x1E14u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0112u, 0x0301u, 0x1E16u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0113u, 0x0300u, 0x1E15u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0113u, 0x0301u, 0x1E17u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x014Cu, 0x0300u, 0x1E50u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x014Cu, 0x0301u, 0x1E52u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x014Du, 0x0300u, 0x1E51u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x014Du, 0x0301u, 0x1E53u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x015Au, 0x0307u, 0x1E64u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x015Bu, 0x0307u, 0x1E65u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0160u, 0x0307u, 0x1E66u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0161u, 0x0307u, 0x1E67u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0168u, 0x0301u, 0x1E78u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0169u, 0x0301u, 0x1E79u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x016Au, 0x0308u, 0x1E7Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x016Bu, 0x0308u, 0x1E7Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x017Fu, 0x0307u, 0x1E9Bu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0u, 0x0300u, 0x1EDCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0u, 0x0301u, 0x1EDAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0u, 0x0303u, 0x1EE0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0u, 0x0309u, 0x1EDEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0u, 0x0323u, 0x1EE2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1u, 0x0300u, 0x1EDDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1u, 0x0301u, 0x1EDBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1u, 0x0303u, 0x1EE1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1u, 0x0309u, 0x1EDFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1u, 0x0323u, 0x1EE3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01AFu, 0x0300u, 0x1EEAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01AFu, 0x0301u, 0x1EE8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01AFu, 0x0303u, 0x1EEEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01AFu, 0x0309u, 0x1EECu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01AFu, 0x0323u, 0x1EF0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0u, 0x0300u, 0x1EEBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0u, 0x0301u, 0x1EE9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0u, 0x0303u, 0x1EEFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0u, 0x0309u, 0x1EEDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0u, 0x0323u, 0x1EF1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01B7u, 0x030Cu, 0x01EEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01EAu, 0x0304u, 0x01ECu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x01EBu, 0x0304u, 0x01EDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0226u, 0x0304u, 0x01E0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0227u, 0x0304u, 0x01E1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0228u, 0x0306u, 0x1E1Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0229u, 0x0306u, 0x1E1Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x022Eu, 0x0304u, 0x0230u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x022Fu, 0x0304u, 0x0231u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0292u, 0x030Cu, 0x01EFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0308u, 0x0301u, 0x0000u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0300u, 0x1FBAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0301u, 0x0386u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0304u, 0x1FB9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0306u, 0x1FB8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0313u, 0x1F08u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0314u, 0x1F09u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0391u, 0x0345u, 0x1FBCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0395u, 0x0300u, 0x1FC8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0395u, 0x0301u, 0x0388u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0395u, 0x0313u, 0x1F18u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0395u, 0x0314u, 0x1F19u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0397u, 0x0300u, 0x1FCAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0397u, 0x0301u, 0x0389u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0397u, 0x0313u, 0x1F28u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0397u, 0x0314u, 0x1F29u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0397u, 0x0345u, 0x1FCCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0300u, 0x1FDAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0301u, 0x038Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0304u, 0x1FD9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0306u, 0x1FD8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0308u, 0x03AAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0313u, 0x1F38u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0399u, 0x0314u, 0x1F39u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x039Fu, 0x0300u, 0x1FF8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x039Fu, 0x0301u, 0x038Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x039Fu, 0x0313u, 0x1F48u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x039Fu, 0x0314u, 0x1F49u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A1u, 0x0314u, 0x1FECu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5u, 0x0300u, 0x1FEAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5u, 0x0301u, 0x038Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5u, 0x0304u, 0x1FE9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5u, 0x0306u, 0x1FE8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5u, 0x0308u, 0x03ABu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5u, 0x0314u, 0x1F59u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9u, 0x0300u, 0x1FFAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9u, 0x0301u, 0x038Fu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9u, 0x0313u, 0x1F68u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9u, 0x0314u, 0x1F69u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9u, 0x0345u, 0x1FFCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03ACu, 0x0345u, 0x1FB4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03AEu, 0x0345u, 0x1FC4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0300u, 0x1F70u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0301u, 0x03ACu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0304u, 0x1FB1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0306u, 0x1FB0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0313u, 0x1F00u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0314u, 0x1F01u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0342u, 0x1FB6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1u, 0x0345u, 0x1FB3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5u, 0x0300u, 0x1F72u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5u, 0x0301u, 0x03ADu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5u, 0x0313u, 0x1F10u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5u, 0x0314u, 0x1F11u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7u, 0x0300u, 0x1F74u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7u, 0x0301u, 0x03AEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7u, 0x0313u, 0x1F20u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7u, 0x0314u, 0x1F21u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7u, 0x0342u, 0x1FC6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7u, 0x0345u, 0x1FC3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0300u, 0x1F76u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0301u, 0x03AFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0304u, 0x1FD1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0306u, 0x1FD0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0308u, 0x03CAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0313u, 0x1F30u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0314u, 0x1F31u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9u, 0x0342u, 0x1FD6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03BFu, 0x0300u, 0x1F78u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03BFu, 0x0301u, 0x03CCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03BFu, 0x0313u, 0x1F40u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03BFu, 0x0314u, 0x1F41u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C1u, 0x0313u, 0x1FE4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C1u, 0x0314u, 0x1FE5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0300u, 0x1F7Au),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0301u, 0x03CDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0304u, 0x1FE1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0306u, 0x1FE0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0308u, 0x03CBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0313u, 0x1F50u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0314u, 0x1F51u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5u, 0x0342u, 0x1FE6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9u, 0x0300u, 0x1F7Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9u, 0x0301u, 0x03CEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9u, 0x0313u, 0x1F60u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9u, 0x0314u, 0x1F61u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9u, 0x0342u, 0x1FF6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9u, 0x0345u, 0x1FF3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CAu, 0x0300u, 0x1FD2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CAu, 0x0301u, 0x0390u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CAu, 0x0342u, 0x1FD7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CBu, 0x0300u, 0x1FE2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CBu, 0x0301u, 0x03B0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CBu, 0x0342u, 0x1FE7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03CEu, 0x0345u, 0x1FF4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03D2u, 0x0301u, 0x03D3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x03D2u, 0x0308u, 0x03D4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0406u, 0x0308u, 0x0407u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0410u, 0x0306u, 0x04D0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0410u, 0x0308u, 0x04D2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0413u, 0x0301u, 0x0403u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0415u, 0x0300u, 0x0400u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0415u, 0x0306u, 0x04D6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0415u, 0x0308u, 0x0401u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0416u, 0x0306u, 0x04C1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0416u, 0x0308u, 0x04DCu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0417u, 0x0308u, 0x04DEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0418u, 0x0300u, 0x040Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0418u, 0x0304u, 0x04E2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0418u, 0x0306u, 0x0419u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0418u, 0x0308u, 0x04E4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x041Au, 0x0301u, 0x040Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x041Eu, 0x0308u, 0x04E6u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0423u, 0x0304u, 0x04EEu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0423u, 0x0306u, 0x040Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0423u, 0x0308u, 0x04F0u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0423u, 0x030Bu, 0x04F2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0427u, 0x0308u, 0x04F4u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x042Bu, 0x0308u, 0x04F8u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x042Du, 0x0308u, 0x04ECu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0430u, 0x0306u, 0x04D1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0430u, 0x0308u, 0x04D3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0433u, 0x0301u, 0x0453u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0435u, 0x0300u, 0x0450u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0435u, 0x0306u, 0x04D7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0435u, 0x0308u, 0x0451u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0436u, 0x0306u, 0x04C2u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0436u, 0x0308u, 0x04DDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0437u, 0x0308u, 0x04DFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0438u, 0x0300u, 0x045Du),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0438u, 0x0304u, 0x04E3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0438u, 0x0306u, 0x0439u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0438u, 0x0308u, 0x04E5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x043Au, 0x0301u, 0x045Cu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x043Eu, 0x0308u, 0x04E7u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0443u, 0x0304u, 0x04EFu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0443u, 0x0306u, 0x045Eu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0443u, 0x0308u, 0x04F1u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0443u, 0x030Bu, 0x04F3u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0447u, 0x0308u, 0x04F5u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x044Bu, 0x0308u, 0x04F9u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x044Du, 0x0308u, 0x04EDu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0456u, 0x0308u, 0x0457u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0474u, 0x030Fu, 0x0476u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x0475u, 0x030Fu, 0x0477u),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x04D8u, 0x0308u, 0x04DAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x04D9u, 0x0308u, 0x04DBu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x04E8u, 0x0308u, 0x04EAu),
-   HB_CODEPOINT_ENCODE3_11_7_14 (0x04E9u, 0x0308u, 0x04EBu),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x003C, 0x0338, 0x226E),HB_CODEPOINT_ENCODE3_11_7_14 (0x003D, 0x0338, 0x2260),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x003E, 0x0338, 0x226F),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0300, 0x00C0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0301, 0x00C1),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0302, 0x00C2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0303, 0x00C3),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0304, 0x0100),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0306, 0x0102),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0307, 0x0226),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0308, 0x00C4),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0309, 0x1EA2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x030A, 0x00C5),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x030C, 0x01CD),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x030F, 0x0200),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0311, 0x0202),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0323, 0x1EA0),HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0325, 0x1E00),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0041, 0x0328, 0x0104),HB_CODEPOINT_ENCODE3_11_7_14 (0x0042, 0x0307, 0x1E02),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0042, 0x0323, 0x1E04),HB_CODEPOINT_ENCODE3_11_7_14 (0x0042, 0x0331, 0x1E06),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0043, 0x0301, 0x0106),HB_CODEPOINT_ENCODE3_11_7_14 (0x0043, 0x0302, 0x0108),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0043, 0x0307, 0x010A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0043, 0x030C, 0x010C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0043, 0x0327, 0x00C7),HB_CODEPOINT_ENCODE3_11_7_14 (0x0044, 0x0307, 0x1E0A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0044, 0x030C, 0x010E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0044, 0x0323, 0x1E0C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0044, 0x0327, 0x1E10),HB_CODEPOINT_ENCODE3_11_7_14 (0x0044, 0x032D, 0x1E12),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0044, 0x0331, 0x1E0E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0300, 0x00C8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0301, 0x00C9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0302, 0x00CA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0303, 0x1EBC),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0304, 0x0112),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0306, 0x0114),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0307, 0x0116),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0308, 0x00CB),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0309, 0x1EBA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x030C, 0x011A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x030F, 0x0204),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0311, 0x0206),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0323, 0x1EB8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0327, 0x0228),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0328, 0x0118),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x032D, 0x1E18),HB_CODEPOINT_ENCODE3_11_7_14 (0x0045, 0x0330, 0x1E1A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0046, 0x0307, 0x1E1E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x0301, 0x01F4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x0302, 0x011C),HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x0304, 0x1E20),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x0306, 0x011E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x0307, 0x0120),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x030C, 0x01E6),HB_CODEPOINT_ENCODE3_11_7_14 (0x0047, 0x0327, 0x0122),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x0302, 0x0124),HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x0307, 0x1E22),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x0308, 0x1E26),HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x030C, 0x021E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x0323, 0x1E24),HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x0327, 0x1E28),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0048, 0x032E, 0x1E2A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0300, 0x00CC),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0301, 0x00CD),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0302, 0x00CE),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0303, 0x0128),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0304, 0x012A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0306, 0x012C),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0307, 0x0130),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0308, 0x00CF),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0309, 0x1EC8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x030C, 0x01CF),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x030F, 0x0208),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0311, 0x020A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0323, 0x1ECA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0328, 0x012E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0049, 0x0330, 0x1E2C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004A, 0x0302, 0x0134),HB_CODEPOINT_ENCODE3_11_7_14 (0x004B, 0x0301, 0x1E30),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004B, 0x030C, 0x01E8),HB_CODEPOINT_ENCODE3_11_7_14 (0x004B, 0x0323, 0x1E32),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004B, 0x0327, 0x0136),HB_CODEPOINT_ENCODE3_11_7_14 (0x004B, 0x0331, 0x1E34),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004C, 0x0301, 0x0139),HB_CODEPOINT_ENCODE3_11_7_14 (0x004C, 0x030C, 0x013D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004C, 0x0323, 0x1E36),HB_CODEPOINT_ENCODE3_11_7_14 (0x004C, 0x0327, 0x013B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004C, 0x032D, 0x1E3C),HB_CODEPOINT_ENCODE3_11_7_14 (0x004C, 0x0331, 0x1E3A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004D, 0x0301, 0x1E3E),HB_CODEPOINT_ENCODE3_11_7_14 (0x004D, 0x0307, 0x1E40),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004D, 0x0323, 0x1E42),HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0300, 0x01F8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0301, 0x0143),HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0303, 0x00D1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0307, 0x1E44),HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x030C, 0x0147),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0323, 0x1E46),HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0327, 0x0145),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x032D, 0x1E4A),HB_CODEPOINT_ENCODE3_11_7_14 (0x004E, 0x0331, 0x1E48),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0300, 0x00D2),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0301, 0x00D3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0302, 0x00D4),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0303, 0x00D5),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0304, 0x014C),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0306, 0x014E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0307, 0x022E),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0308, 0x00D6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0309, 0x1ECE),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x030B, 0x0150),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x030C, 0x01D1),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x030F, 0x020C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0311, 0x020E),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x031B, 0x01A0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0323, 0x1ECC),HB_CODEPOINT_ENCODE3_11_7_14 (0x004F, 0x0328, 0x01EA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0050, 0x0301, 0x1E54),HB_CODEPOINT_ENCODE3_11_7_14 (0x0050, 0x0307, 0x1E56),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x0301, 0x0154),HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x0307, 0x1E58),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x030C, 0x0158),HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x030F, 0x0210),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x0311, 0x0212),HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x0323, 0x1E5A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x0327, 0x0156),HB_CODEPOINT_ENCODE3_11_7_14 (0x0052, 0x0331, 0x1E5E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x0301, 0x015A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x0302, 0x015C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x0307, 0x1E60),HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x030C, 0x0160),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x0323, 0x1E62),HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x0326, 0x0218),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0053, 0x0327, 0x015E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x0307, 0x1E6A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x030C, 0x0164),HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x0323, 0x1E6C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x0326, 0x021A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x0327, 0x0162),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x032D, 0x1E70),HB_CODEPOINT_ENCODE3_11_7_14 (0x0054, 0x0331, 0x1E6E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0300, 0x00D9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0301, 0x00DA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0302, 0x00DB),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0303, 0x0168),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0304, 0x016A),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0306, 0x016C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0308, 0x00DC),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0309, 0x1EE6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x030A, 0x016E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x030B, 0x0170),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x030C, 0x01D3),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x030F, 0x0214),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0311, 0x0216),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x031B, 0x01AF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0323, 0x1EE4),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0324, 0x1E72),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0328, 0x0172),HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x032D, 0x1E76),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0055, 0x0330, 0x1E74),HB_CODEPOINT_ENCODE3_11_7_14 (0x0056, 0x0303, 0x1E7C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0056, 0x0323, 0x1E7E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0057, 0x0300, 0x1E80),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0057, 0x0301, 0x1E82),HB_CODEPOINT_ENCODE3_11_7_14 (0x0057, 0x0302, 0x0174),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0057, 0x0307, 0x1E86),HB_CODEPOINT_ENCODE3_11_7_14 (0x0057, 0x0308, 0x1E84),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0057, 0x0323, 0x1E88),HB_CODEPOINT_ENCODE3_11_7_14 (0x0058, 0x0307, 0x1E8A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0058, 0x0308, 0x1E8C),HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0300, 0x1EF2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0301, 0x00DD),HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0302, 0x0176),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0303, 0x1EF8),HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0304, 0x0232),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0307, 0x1E8E),HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0308, 0x0178),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0309, 0x1EF6),HB_CODEPOINT_ENCODE3_11_7_14 (0x0059, 0x0323, 0x1EF4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x005A, 0x0301, 0x0179),HB_CODEPOINT_ENCODE3_11_7_14 (0x005A, 0x0302, 0x1E90),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x005A, 0x0307, 0x017B),HB_CODEPOINT_ENCODE3_11_7_14 (0x005A, 0x030C, 0x017D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x005A, 0x0323, 0x1E92),HB_CODEPOINT_ENCODE3_11_7_14 (0x005A, 0x0331, 0x1E94),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0300, 0x00E0),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0301, 0x00E1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0302, 0x00E2),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0303, 0x00E3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0304, 0x0101),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0306, 0x0103),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0307, 0x0227),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0308, 0x00E4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0309, 0x1EA3),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x030A, 0x00E5),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x030C, 0x01CE),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x030F, 0x0201),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0311, 0x0203),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0323, 0x1EA1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0325, 0x1E01),HB_CODEPOINT_ENCODE3_11_7_14 (0x0061, 0x0328, 0x0105),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0062, 0x0307, 0x1E03),HB_CODEPOINT_ENCODE3_11_7_14 (0x0062, 0x0323, 0x1E05),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0062, 0x0331, 0x1E07),HB_CODEPOINT_ENCODE3_11_7_14 (0x0063, 0x0301, 0x0107),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0063, 0x0302, 0x0109),HB_CODEPOINT_ENCODE3_11_7_14 (0x0063, 0x0307, 0x010B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0063, 0x030C, 0x010D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0063, 0x0327, 0x00E7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0064, 0x0307, 0x1E0B),HB_CODEPOINT_ENCODE3_11_7_14 (0x0064, 0x030C, 0x010F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0064, 0x0323, 0x1E0D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0064, 0x0327, 0x1E11),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0064, 0x032D, 0x1E13),HB_CODEPOINT_ENCODE3_11_7_14 (0x0064, 0x0331, 0x1E0F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0300, 0x00E8),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0301, 0x00E9),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0302, 0x00EA),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0303, 0x1EBD),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0304, 0x0113),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0306, 0x0115),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0307, 0x0117),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0308, 0x00EB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0309, 0x1EBB),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x030C, 0x011B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x030F, 0x0205),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0311, 0x0207),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0323, 0x1EB9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0327, 0x0229),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0328, 0x0119),HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x032D, 0x1E19),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0065, 0x0330, 0x1E1B),HB_CODEPOINT_ENCODE3_11_7_14 (0x0066, 0x0307, 0x1E1F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x0301, 0x01F5),HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x0302, 0x011D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x0304, 0x1E21),HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x0306, 0x011F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x0307, 0x0121),HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x030C, 0x01E7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0067, 0x0327, 0x0123),HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x0302, 0x0125),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x0307, 0x1E23),HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x0308, 0x1E27),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x030C, 0x021F),HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x0323, 0x1E25),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x0327, 0x1E29),HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x032E, 0x1E2B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0068, 0x0331, 0x1E96),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0300, 0x00EC),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0301, 0x00ED),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0302, 0x00EE),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0303, 0x0129),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0304, 0x012B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0306, 0x012D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0308, 0x00EF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0309, 0x1EC9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x030C, 0x01D0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x030F, 0x0209),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0311, 0x020B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0323, 0x1ECB),HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0328, 0x012F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0069, 0x0330, 0x1E2D),HB_CODEPOINT_ENCODE3_11_7_14 (0x006A, 0x0302, 0x0135),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006A, 0x030C, 0x01F0),HB_CODEPOINT_ENCODE3_11_7_14 (0x006B, 0x0301, 0x1E31),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006B, 0x030C, 0x01E9),HB_CODEPOINT_ENCODE3_11_7_14 (0x006B, 0x0323, 0x1E33),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006B, 0x0327, 0x0137),HB_CODEPOINT_ENCODE3_11_7_14 (0x006B, 0x0331, 0x1E35),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006C, 0x0301, 0x013A),HB_CODEPOINT_ENCODE3_11_7_14 (0x006C, 0x030C, 0x013E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006C, 0x0323, 0x1E37),HB_CODEPOINT_ENCODE3_11_7_14 (0x006C, 0x0327, 0x013C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006C, 0x032D, 0x1E3D),HB_CODEPOINT_ENCODE3_11_7_14 (0x006C, 0x0331, 0x1E3B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006D, 0x0301, 0x1E3F),HB_CODEPOINT_ENCODE3_11_7_14 (0x006D, 0x0307, 0x1E41),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006D, 0x0323, 0x1E43),HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0300, 0x01F9),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0301, 0x0144),HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0303, 0x00F1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0307, 0x1E45),HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x030C, 0x0148),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0323, 0x1E47),HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0327, 0x0146),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x032D, 0x1E4B),HB_CODEPOINT_ENCODE3_11_7_14 (0x006E, 0x0331, 0x1E49),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0300, 0x00F2),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0301, 0x00F3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0302, 0x00F4),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0303, 0x00F5),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0304, 0x014D),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0306, 0x014F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0307, 0x022F),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0308, 0x00F6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0309, 0x1ECF),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x030B, 0x0151),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x030C, 0x01D2),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x030F, 0x020D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0311, 0x020F),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x031B, 0x01A1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0323, 0x1ECD),HB_CODEPOINT_ENCODE3_11_7_14 (0x006F, 0x0328, 0x01EB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0070, 0x0301, 0x1E55),HB_CODEPOINT_ENCODE3_11_7_14 (0x0070, 0x0307, 0x1E57),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x0301, 0x0155),HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x0307, 0x1E59),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x030C, 0x0159),HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x030F, 0x0211),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x0311, 0x0213),HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x0323, 0x1E5B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x0327, 0x0157),HB_CODEPOINT_ENCODE3_11_7_14 (0x0072, 0x0331, 0x1E5F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x0301, 0x015B),HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x0302, 0x015D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x0307, 0x1E61),HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x030C, 0x0161),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x0323, 0x1E63),HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x0326, 0x0219),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0073, 0x0327, 0x015F),HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x0307, 0x1E6B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x0308, 0x1E97),HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x030C, 0x0165),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x0323, 0x1E6D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x0326, 0x021B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x0327, 0x0163),HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x032D, 0x1E71),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0074, 0x0331, 0x1E6F),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0300, 0x00F9),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0301, 0x00FA),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0302, 0x00FB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0303, 0x0169),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0304, 0x016B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0306, 0x016D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0308, 0x00FC),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0309, 0x1EE7),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x030A, 0x016F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x030B, 0x0171),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x030C, 0x01D4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x030F, 0x0215),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0311, 0x0217),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x031B, 0x01B0),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0323, 0x1EE5),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0324, 0x1E73),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0328, 0x0173),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x032D, 0x1E77),HB_CODEPOINT_ENCODE3_11_7_14 (0x0075, 0x0330, 0x1E75),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0076, 0x0303, 0x1E7D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0076, 0x0323, 0x1E7F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x0300, 0x1E81),HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x0301, 0x1E83),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x0302, 0x0175),HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x0307, 0x1E87),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x0308, 0x1E85),HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x030A, 0x1E98),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0077, 0x0323, 0x1E89),HB_CODEPOINT_ENCODE3_11_7_14 (0x0078, 0x0307, 0x1E8B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0078, 0x0308, 0x1E8D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0300, 0x1EF3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0301, 0x00FD),HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0302, 0x0177),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0303, 0x1EF9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0304, 0x0233),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0307, 0x1E8F),HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0308, 0x00FF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0309, 0x1EF7),HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x030A, 0x1E99),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0079, 0x0323, 0x1EF5),HB_CODEPOINT_ENCODE3_11_7_14 (0x007A, 0x0301, 0x017A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x007A, 0x0302, 0x1E91),HB_CODEPOINT_ENCODE3_11_7_14 (0x007A, 0x0307, 0x017C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x007A, 0x030C, 0x017E),HB_CODEPOINT_ENCODE3_11_7_14 (0x007A, 0x0323, 0x1E93),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x007A, 0x0331, 0x1E95),HB_CODEPOINT_ENCODE3_11_7_14 (0x00A8, 0x0300, 0x1FED),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00A8, 0x0301, 0x0385),HB_CODEPOINT_ENCODE3_11_7_14 (0x00A8, 0x0342, 0x1FC1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2, 0x0300, 0x1EA6),HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2, 0x0301, 0x1EA4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2, 0x0303, 0x1EAA),HB_CODEPOINT_ENCODE3_11_7_14 (0x00C2, 0x0309, 0x1EA8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00C4, 0x0304, 0x01DE),HB_CODEPOINT_ENCODE3_11_7_14 (0x00C5, 0x0301, 0x01FA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00C6, 0x0301, 0x01FC),HB_CODEPOINT_ENCODE3_11_7_14 (0x00C6, 0x0304, 0x01E2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00C7, 0x0301, 0x1E08),HB_CODEPOINT_ENCODE3_11_7_14 (0x00CA, 0x0300, 0x1EC0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00CA, 0x0301, 0x1EBE),HB_CODEPOINT_ENCODE3_11_7_14 (0x00CA, 0x0303, 0x1EC4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00CA, 0x0309, 0x1EC2),HB_CODEPOINT_ENCODE3_11_7_14 (0x00CF, 0x0301, 0x1E2E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4, 0x0300, 0x1ED2),HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4, 0x0301, 0x1ED0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4, 0x0303, 0x1ED6),HB_CODEPOINT_ENCODE3_11_7_14 (0x00D4, 0x0309, 0x1ED4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00D5, 0x0301, 0x1E4C),HB_CODEPOINT_ENCODE3_11_7_14 (0x00D5, 0x0304, 0x022C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00D5, 0x0308, 0x1E4E),HB_CODEPOINT_ENCODE3_11_7_14 (0x00D6, 0x0304, 0x022A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00D8, 0x0301, 0x01FE),HB_CODEPOINT_ENCODE3_11_7_14 (0x00DC, 0x0300, 0x01DB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00DC, 0x0301, 0x01D7),HB_CODEPOINT_ENCODE3_11_7_14 (0x00DC, 0x0304, 0x01D5),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00DC, 0x030C, 0x01D9),HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2, 0x0300, 0x1EA7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2, 0x0301, 0x1EA5),HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2, 0x0303, 0x1EAB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00E2, 0x0309, 0x1EA9),HB_CODEPOINT_ENCODE3_11_7_14 (0x00E4, 0x0304, 0x01DF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00E5, 0x0301, 0x01FB),HB_CODEPOINT_ENCODE3_11_7_14 (0x00E6, 0x0301, 0x01FD),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00E6, 0x0304, 0x01E3),HB_CODEPOINT_ENCODE3_11_7_14 (0x00E7, 0x0301, 0x1E09),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00EA, 0x0300, 0x1EC1),HB_CODEPOINT_ENCODE3_11_7_14 (0x00EA, 0x0301, 0x1EBF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00EA, 0x0303, 0x1EC5),HB_CODEPOINT_ENCODE3_11_7_14 (0x00EA, 0x0309, 0x1EC3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00EF, 0x0301, 0x1E2F),HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4, 0x0300, 0x1ED3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4, 0x0301, 0x1ED1),HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4, 0x0303, 0x1ED7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00F4, 0x0309, 0x1ED5),HB_CODEPOINT_ENCODE3_11_7_14 (0x00F5, 0x0301, 0x1E4D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00F5, 0x0304, 0x022D),HB_CODEPOINT_ENCODE3_11_7_14 (0x00F5, 0x0308, 0x1E4F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00F6, 0x0304, 0x022B),HB_CODEPOINT_ENCODE3_11_7_14 (0x00F8, 0x0301, 0x01FF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00FC, 0x0300, 0x01DC),HB_CODEPOINT_ENCODE3_11_7_14 (0x00FC, 0x0301, 0x01D8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x00FC, 0x0304, 0x01D6),HB_CODEPOINT_ENCODE3_11_7_14 (0x00FC, 0x030C, 0x01DA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0102, 0x0300, 0x1EB0),HB_CODEPOINT_ENCODE3_11_7_14 (0x0102, 0x0301, 0x1EAE),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0102, 0x0303, 0x1EB4),HB_CODEPOINT_ENCODE3_11_7_14 (0x0102, 0x0309, 0x1EB2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0103, 0x0300, 0x1EB1),HB_CODEPOINT_ENCODE3_11_7_14 (0x0103, 0x0301, 0x1EAF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0103, 0x0303, 0x1EB5),HB_CODEPOINT_ENCODE3_11_7_14 (0x0103, 0x0309, 0x1EB3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0112, 0x0300, 0x1E14),HB_CODEPOINT_ENCODE3_11_7_14 (0x0112, 0x0301, 0x1E16),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0113, 0x0300, 0x1E15),HB_CODEPOINT_ENCODE3_11_7_14 (0x0113, 0x0301, 0x1E17),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x014C, 0x0300, 0x1E50),HB_CODEPOINT_ENCODE3_11_7_14 (0x014C, 0x0301, 0x1E52),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x014D, 0x0300, 0x1E51),HB_CODEPOINT_ENCODE3_11_7_14 (0x014D, 0x0301, 0x1E53),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x015A, 0x0307, 0x1E64),HB_CODEPOINT_ENCODE3_11_7_14 (0x015B, 0x0307, 0x1E65),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0160, 0x0307, 0x1E66),HB_CODEPOINT_ENCODE3_11_7_14 (0x0161, 0x0307, 0x1E67),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0168, 0x0301, 0x1E78),HB_CODEPOINT_ENCODE3_11_7_14 (0x0169, 0x0301, 0x1E79),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x016A, 0x0308, 0x1E7A),HB_CODEPOINT_ENCODE3_11_7_14 (0x016B, 0x0308, 0x1E7B),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x017F, 0x0307, 0x1E9B),HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0, 0x0300, 0x1EDC),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0, 0x0301, 0x1EDA),HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0, 0x0303, 0x1EE0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0, 0x0309, 0x1EDE),HB_CODEPOINT_ENCODE3_11_7_14 (0x01A0, 0x0323, 0x1EE2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1, 0x0300, 0x1EDD),HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1, 0x0301, 0x1EDB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1, 0x0303, 0x1EE1),HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1, 0x0309, 0x1EDF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01A1, 0x0323, 0x1EE3),HB_CODEPOINT_ENCODE3_11_7_14 (0x01AF, 0x0300, 0x1EEA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01AF, 0x0301, 0x1EE8),HB_CODEPOINT_ENCODE3_11_7_14 (0x01AF, 0x0303, 0x1EEE),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01AF, 0x0309, 0x1EEC),HB_CODEPOINT_ENCODE3_11_7_14 (0x01AF, 0x0323, 0x1EF0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0, 0x0300, 0x1EEB),HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0, 0x0301, 0x1EE9),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0, 0x0303, 0x1EEF),HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0, 0x0309, 0x1EED),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01B0, 0x0323, 0x1EF1),HB_CODEPOINT_ENCODE3_11_7_14 (0x01B7, 0x030C, 0x01EE),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x01EA, 0x0304, 0x01EC),HB_CODEPOINT_ENCODE3_11_7_14 (0x01EB, 0x0304, 0x01ED),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0226, 0x0304, 0x01E0),HB_CODEPOINT_ENCODE3_11_7_14 (0x0227, 0x0304, 0x01E1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0228, 0x0306, 0x1E1C),HB_CODEPOINT_ENCODE3_11_7_14 (0x0229, 0x0306, 0x1E1D),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x022E, 0x0304, 0x0230),HB_CODEPOINT_ENCODE3_11_7_14 (0x022F, 0x0304, 0x0231),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0292, 0x030C, 0x01EF),HB_CODEPOINT_ENCODE3_11_7_14 (0x0308, 0x0301, 0x0000),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0300, 0x1FBA),HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0301, 0x0386),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0304, 0x1FB9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0306, 0x1FB8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0313, 0x1F08),HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0314, 0x1F09),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0391, 0x0345, 0x1FBC),HB_CODEPOINT_ENCODE3_11_7_14 (0x0395, 0x0300, 0x1FC8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0395, 0x0301, 0x0388),HB_CODEPOINT_ENCODE3_11_7_14 (0x0395, 0x0313, 0x1F18),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0395, 0x0314, 0x1F19),HB_CODEPOINT_ENCODE3_11_7_14 (0x0397, 0x0300, 0x1FCA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0397, 0x0301, 0x0389),HB_CODEPOINT_ENCODE3_11_7_14 (0x0397, 0x0313, 0x1F28),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0397, 0x0314, 0x1F29),HB_CODEPOINT_ENCODE3_11_7_14 (0x0397, 0x0345, 0x1FCC),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0300, 0x1FDA),HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0301, 0x038A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0304, 0x1FD9),HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0306, 0x1FD8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0308, 0x03AA),HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0313, 0x1F38),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0399, 0x0314, 0x1F39),HB_CODEPOINT_ENCODE3_11_7_14 (0x039F, 0x0300, 0x1FF8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x039F, 0x0301, 0x038C),HB_CODEPOINT_ENCODE3_11_7_14 (0x039F, 0x0313, 0x1F48),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x039F, 0x0314, 0x1F49),HB_CODEPOINT_ENCODE3_11_7_14 (0x03A1, 0x0314, 0x1FEC),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5, 0x0300, 0x1FEA),HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5, 0x0301, 0x038E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5, 0x0304, 0x1FE9),HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5, 0x0306, 0x1FE8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5, 0x0308, 0x03AB),HB_CODEPOINT_ENCODE3_11_7_14 (0x03A5, 0x0314, 0x1F59),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9, 0x0300, 0x1FFA),HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9, 0x0301, 0x038F),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9, 0x0313, 0x1F68),HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9, 0x0314, 0x1F69),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03A9, 0x0345, 0x1FFC),HB_CODEPOINT_ENCODE3_11_7_14 (0x03AC, 0x0345, 0x1FB4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03AE, 0x0345, 0x1FC4),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0300, 0x1F70),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0301, 0x03AC),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0304, 0x1FB1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0306, 0x1FB0),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0313, 0x1F00),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0314, 0x1F01),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0342, 0x1FB6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B1, 0x0345, 0x1FB3),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5, 0x0300, 0x1F72),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5, 0x0301, 0x03AD),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5, 0x0313, 0x1F10),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B5, 0x0314, 0x1F11),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7, 0x0300, 0x1F74),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7, 0x0301, 0x03AE),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7, 0x0313, 0x1F20),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7, 0x0314, 0x1F21),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7, 0x0342, 0x1FC6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B7, 0x0345, 0x1FC3),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0300, 0x1F76),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0301, 0x03AF),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0304, 0x1FD1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0306, 0x1FD0),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0308, 0x03CA),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0313, 0x1F30),HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0314, 0x1F31),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03B9, 0x0342, 0x1FD6),HB_CODEPOINT_ENCODE3_11_7_14 (0x03BF, 0x0300, 0x1F78),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03BF, 0x0301, 0x03CC),HB_CODEPOINT_ENCODE3_11_7_14 (0x03BF, 0x0313, 0x1F40),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03BF, 0x0314, 0x1F41),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C1, 0x0313, 0x1FE4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C1, 0x0314, 0x1FE5),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0300, 0x1F7A),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0301, 0x03CD),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0304, 0x1FE1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0306, 0x1FE0),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0308, 0x03CB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0313, 0x1F50),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0314, 0x1F51),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C5, 0x0342, 0x1FE6),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9, 0x0300, 0x1F7C),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9, 0x0301, 0x03CE),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9, 0x0313, 0x1F60),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9, 0x0314, 0x1F61),HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9, 0x0342, 0x1FF6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03C9, 0x0345, 0x1FF3),HB_CODEPOINT_ENCODE3_11_7_14 (0x03CA, 0x0300, 0x1FD2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03CA, 0x0301, 0x0390),HB_CODEPOINT_ENCODE3_11_7_14 (0x03CA, 0x0342, 0x1FD7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03CB, 0x0300, 0x1FE2),HB_CODEPOINT_ENCODE3_11_7_14 (0x03CB, 0x0301, 0x03B0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03CB, 0x0342, 0x1FE7),HB_CODEPOINT_ENCODE3_11_7_14 (0x03CE, 0x0345, 0x1FF4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x03D2, 0x0301, 0x03D3),HB_CODEPOINT_ENCODE3_11_7_14 (0x03D2, 0x0308, 0x03D4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0406, 0x0308, 0x0407),HB_CODEPOINT_ENCODE3_11_7_14 (0x0410, 0x0306, 0x04D0),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0410, 0x0308, 0x04D2),HB_CODEPOINT_ENCODE3_11_7_14 (0x0413, 0x0301, 0x0403),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0415, 0x0300, 0x0400),HB_CODEPOINT_ENCODE3_11_7_14 (0x0415, 0x0306, 0x04D6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0415, 0x0308, 0x0401),HB_CODEPOINT_ENCODE3_11_7_14 (0x0416, 0x0306, 0x04C1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0416, 0x0308, 0x04DC),HB_CODEPOINT_ENCODE3_11_7_14 (0x0417, 0x0308, 0x04DE),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0418, 0x0300, 0x040D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0418, 0x0304, 0x04E2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0418, 0x0306, 0x0419),HB_CODEPOINT_ENCODE3_11_7_14 (0x0418, 0x0308, 0x04E4),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x041A, 0x0301, 0x040C),HB_CODEPOINT_ENCODE3_11_7_14 (0x041E, 0x0308, 0x04E6),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0423, 0x0304, 0x04EE),HB_CODEPOINT_ENCODE3_11_7_14 (0x0423, 0x0306, 0x040E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0423, 0x0308, 0x04F0),HB_CODEPOINT_ENCODE3_11_7_14 (0x0423, 0x030B, 0x04F2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0427, 0x0308, 0x04F4),HB_CODEPOINT_ENCODE3_11_7_14 (0x042B, 0x0308, 0x04F8),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x042D, 0x0308, 0x04EC),HB_CODEPOINT_ENCODE3_11_7_14 (0x0430, 0x0306, 0x04D1),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0430, 0x0308, 0x04D3),HB_CODEPOINT_ENCODE3_11_7_14 (0x0433, 0x0301, 0x0453),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0435, 0x0300, 0x0450),HB_CODEPOINT_ENCODE3_11_7_14 (0x0435, 0x0306, 0x04D7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0435, 0x0308, 0x0451),HB_CODEPOINT_ENCODE3_11_7_14 (0x0436, 0x0306, 0x04C2),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0436, 0x0308, 0x04DD),HB_CODEPOINT_ENCODE3_11_7_14 (0x0437, 0x0308, 0x04DF),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0438, 0x0300, 0x045D),HB_CODEPOINT_ENCODE3_11_7_14 (0x0438, 0x0304, 0x04E3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0438, 0x0306, 0x0439),HB_CODEPOINT_ENCODE3_11_7_14 (0x0438, 0x0308, 0x04E5),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x043A, 0x0301, 0x045C),HB_CODEPOINT_ENCODE3_11_7_14 (0x043E, 0x0308, 0x04E7),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0443, 0x0304, 0x04EF),HB_CODEPOINT_ENCODE3_11_7_14 (0x0443, 0x0306, 0x045E),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0443, 0x0308, 0x04F1),HB_CODEPOINT_ENCODE3_11_7_14 (0x0443, 0x030B, 0x04F3),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0447, 0x0308, 0x04F5),HB_CODEPOINT_ENCODE3_11_7_14 (0x044B, 0x0308, 0x04F9),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x044D, 0x0308, 0x04ED),HB_CODEPOINT_ENCODE3_11_7_14 (0x0456, 0x0308, 0x0457),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x0474, 0x030F, 0x0476),HB_CODEPOINT_ENCODE3_11_7_14 (0x0475, 0x030F, 0x0477),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x04D8, 0x0308, 0x04DA),HB_CODEPOINT_ENCODE3_11_7_14 (0x04D9, 0x0308, 0x04DB),
+  HB_CODEPOINT_ENCODE3_11_7_14 (0x04E8, 0x0308, 0x04EA),HB_CODEPOINT_ENCODE3_11_7_14 (0x04E9, 0x0308, 0x04EB),
 };
-static const uint64_t
-_hb_ucd_dm2_u64_map[408] =
+static const uint64_t _hb_ucd_dm2_u64_map[408]=
 {
-     HB_CODEPOINT_ENCODE3 (0x05D0u, 0x05B7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D0u, 0x05B8u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05D0u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D1u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05D1u, 0x05BFu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D2u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05D3u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D4u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05D5u, 0x05B9u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D5u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05D6u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D8u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05D9u, 0x05B4u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D9u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05DAu, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05DBu, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05DBu, 0x05BFu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05DCu, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05DEu, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05E0u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05E1u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05E3u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05E4u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05E4u, 0x05BFu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05E6u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05E7u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05E8u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05E9u, 0x05BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05E9u, 0x05C1u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05E9u, 0x05C2u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x05EAu, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05F2u, 0x05B7u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0627u, 0x0653u, 0x0622u),   HB_CODEPOINT_ENCODE3 (0x0627u, 0x0654u, 0x0623u),
-     HB_CODEPOINT_ENCODE3 (0x0627u, 0x0655u, 0x0625u),   HB_CODEPOINT_ENCODE3 (0x0648u, 0x0654u, 0x0624u),
-     HB_CODEPOINT_ENCODE3 (0x064Au, 0x0654u, 0x0626u),   HB_CODEPOINT_ENCODE3 (0x06C1u, 0x0654u, 0x06C2u),
-     HB_CODEPOINT_ENCODE3 (0x06D2u, 0x0654u, 0x06D3u),   HB_CODEPOINT_ENCODE3 (0x06D5u, 0x0654u, 0x06C0u),
-     HB_CODEPOINT_ENCODE3 (0x0915u, 0x093Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0916u, 0x093Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0917u, 0x093Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x091Cu, 0x093Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0921u, 0x093Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0922u, 0x093Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0928u, 0x093Cu, 0x0929u),   HB_CODEPOINT_ENCODE3 (0x092Bu, 0x093Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x092Fu, 0x093Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0930u, 0x093Cu, 0x0931u),
-     HB_CODEPOINT_ENCODE3 (0x0933u, 0x093Cu, 0x0934u),   HB_CODEPOINT_ENCODE3 (0x09A1u, 0x09BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x09A2u, 0x09BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x09AFu, 0x09BCu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x09C7u, 0x09BEu, 0x09CBu),   HB_CODEPOINT_ENCODE3 (0x09C7u, 0x09D7u, 0x09CCu),
-     HB_CODEPOINT_ENCODE3 (0x0A16u, 0x0A3Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0A17u, 0x0A3Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0A1Cu, 0x0A3Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0A2Bu, 0x0A3Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0A32u, 0x0A3Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0A38u, 0x0A3Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0B21u, 0x0B3Cu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0B22u, 0x0B3Cu, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0B47u, 0x0B3Eu, 0x0B4Bu),   HB_CODEPOINT_ENCODE3 (0x0B47u, 0x0B56u, 0x0B48u),
-     HB_CODEPOINT_ENCODE3 (0x0B47u, 0x0B57u, 0x0B4Cu),   HB_CODEPOINT_ENCODE3 (0x0B92u, 0x0BD7u, 0x0B94u),
-     HB_CODEPOINT_ENCODE3 (0x0BC6u, 0x0BBEu, 0x0BCAu),   HB_CODEPOINT_ENCODE3 (0x0BC6u, 0x0BD7u, 0x0BCCu),
-     HB_CODEPOINT_ENCODE3 (0x0BC7u, 0x0BBEu, 0x0BCBu),   HB_CODEPOINT_ENCODE3 (0x0C46u, 0x0C56u, 0x0C48u),
-     HB_CODEPOINT_ENCODE3 (0x0CBFu, 0x0CD5u, 0x0CC0u),   HB_CODEPOINT_ENCODE3 (0x0CC6u, 0x0CC2u, 0x0CCAu),
-     HB_CODEPOINT_ENCODE3 (0x0CC6u, 0x0CD5u, 0x0CC7u),   HB_CODEPOINT_ENCODE3 (0x0CC6u, 0x0CD6u, 0x0CC8u),
-     HB_CODEPOINT_ENCODE3 (0x0CCAu, 0x0CD5u, 0x0CCBu),   HB_CODEPOINT_ENCODE3 (0x0D46u, 0x0D3Eu, 0x0D4Au),
-     HB_CODEPOINT_ENCODE3 (0x0D46u, 0x0D57u, 0x0D4Cu),   HB_CODEPOINT_ENCODE3 (0x0D47u, 0x0D3Eu, 0x0D4Bu),
-     HB_CODEPOINT_ENCODE3 (0x0DD9u, 0x0DCAu, 0x0DDAu),   HB_CODEPOINT_ENCODE3 (0x0DD9u, 0x0DCFu, 0x0DDCu),
-     HB_CODEPOINT_ENCODE3 (0x0DD9u, 0x0DDFu, 0x0DDEu),   HB_CODEPOINT_ENCODE3 (0x0DDCu, 0x0DCAu, 0x0DDDu),
-     HB_CODEPOINT_ENCODE3 (0x0F40u, 0x0FB5u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0F42u, 0x0FB7u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0F4Cu, 0x0FB7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0F51u, 0x0FB7u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0F56u, 0x0FB7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0F5Bu, 0x0FB7u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0F71u, 0x0F72u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0F71u, 0x0F74u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0F71u, 0x0F80u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0F90u, 0x0FB5u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0F92u, 0x0FB7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0F9Cu, 0x0FB7u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0FA1u, 0x0FB7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0FA6u, 0x0FB7u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0FABu, 0x0FB7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x0FB2u, 0x0F80u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x0FB3u, 0x0F80u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x1025u, 0x102Eu, 0x1026u),
-     HB_CODEPOINT_ENCODE3 (0x1B05u, 0x1B35u, 0x1B06u),   HB_CODEPOINT_ENCODE3 (0x1B07u, 0x1B35u, 0x1B08u),
-     HB_CODEPOINT_ENCODE3 (0x1B09u, 0x1B35u, 0x1B0Au),   HB_CODEPOINT_ENCODE3 (0x1B0Bu, 0x1B35u, 0x1B0Cu),
-     HB_CODEPOINT_ENCODE3 (0x1B0Du, 0x1B35u, 0x1B0Eu),   HB_CODEPOINT_ENCODE3 (0x1B11u, 0x1B35u, 0x1B12u),
-     HB_CODEPOINT_ENCODE3 (0x1B3Au, 0x1B35u, 0x1B3Bu),   HB_CODEPOINT_ENCODE3 (0x1B3Cu, 0x1B35u, 0x1B3Du),
-     HB_CODEPOINT_ENCODE3 (0x1B3Eu, 0x1B35u, 0x1B40u),   HB_CODEPOINT_ENCODE3 (0x1B3Fu, 0x1B35u, 0x1B41u),
-     HB_CODEPOINT_ENCODE3 (0x1B42u, 0x1B35u, 0x1B43u),   HB_CODEPOINT_ENCODE3 (0x1E36u, 0x0304u, 0x1E38u),
-     HB_CODEPOINT_ENCODE3 (0x1E37u, 0x0304u, 0x1E39u),   HB_CODEPOINT_ENCODE3 (0x1E5Au, 0x0304u, 0x1E5Cu),
-     HB_CODEPOINT_ENCODE3 (0x1E5Bu, 0x0304u, 0x1E5Du),   HB_CODEPOINT_ENCODE3 (0x1E62u, 0x0307u, 0x1E68u),
-     HB_CODEPOINT_ENCODE3 (0x1E63u, 0x0307u, 0x1E69u),   HB_CODEPOINT_ENCODE3 (0x1EA0u, 0x0302u, 0x1EACu),
-     HB_CODEPOINT_ENCODE3 (0x1EA0u, 0x0306u, 0x1EB6u),   HB_CODEPOINT_ENCODE3 (0x1EA1u, 0x0302u, 0x1EADu),
-     HB_CODEPOINT_ENCODE3 (0x1EA1u, 0x0306u, 0x1EB7u),   HB_CODEPOINT_ENCODE3 (0x1EB8u, 0x0302u, 0x1EC6u),
-     HB_CODEPOINT_ENCODE3 (0x1EB9u, 0x0302u, 0x1EC7u),   HB_CODEPOINT_ENCODE3 (0x1ECCu, 0x0302u, 0x1ED8u),
-     HB_CODEPOINT_ENCODE3 (0x1ECDu, 0x0302u, 0x1ED9u),   HB_CODEPOINT_ENCODE3 (0x1F00u, 0x0300u, 0x1F02u),
-     HB_CODEPOINT_ENCODE3 (0x1F00u, 0x0301u, 0x1F04u),   HB_CODEPOINT_ENCODE3 (0x1F00u, 0x0342u, 0x1F06u),
-     HB_CODEPOINT_ENCODE3 (0x1F00u, 0x0345u, 0x1F80u),   HB_CODEPOINT_ENCODE3 (0x1F01u, 0x0300u, 0x1F03u),
-     HB_CODEPOINT_ENCODE3 (0x1F01u, 0x0301u, 0x1F05u),   HB_CODEPOINT_ENCODE3 (0x1F01u, 0x0342u, 0x1F07u),
-     HB_CODEPOINT_ENCODE3 (0x1F01u, 0x0345u, 0x1F81u),   HB_CODEPOINT_ENCODE3 (0x1F02u, 0x0345u, 0x1F82u),
-     HB_CODEPOINT_ENCODE3 (0x1F03u, 0x0345u, 0x1F83u),   HB_CODEPOINT_ENCODE3 (0x1F04u, 0x0345u, 0x1F84u),
-     HB_CODEPOINT_ENCODE3 (0x1F05u, 0x0345u, 0x1F85u),   HB_CODEPOINT_ENCODE3 (0x1F06u, 0x0345u, 0x1F86u),
-     HB_CODEPOINT_ENCODE3 (0x1F07u, 0x0345u, 0x1F87u),   HB_CODEPOINT_ENCODE3 (0x1F08u, 0x0300u, 0x1F0Au),
-     HB_CODEPOINT_ENCODE3 (0x1F08u, 0x0301u, 0x1F0Cu),   HB_CODEPOINT_ENCODE3 (0x1F08u, 0x0342u, 0x1F0Eu),
-     HB_CODEPOINT_ENCODE3 (0x1F08u, 0x0345u, 0x1F88u),   HB_CODEPOINT_ENCODE3 (0x1F09u, 0x0300u, 0x1F0Bu),
-     HB_CODEPOINT_ENCODE3 (0x1F09u, 0x0301u, 0x1F0Du),   HB_CODEPOINT_ENCODE3 (0x1F09u, 0x0342u, 0x1F0Fu),
-     HB_CODEPOINT_ENCODE3 (0x1F09u, 0x0345u, 0x1F89u),   HB_CODEPOINT_ENCODE3 (0x1F0Au, 0x0345u, 0x1F8Au),
-     HB_CODEPOINT_ENCODE3 (0x1F0Bu, 0x0345u, 0x1F8Bu),   HB_CODEPOINT_ENCODE3 (0x1F0Cu, 0x0345u, 0x1F8Cu),
-     HB_CODEPOINT_ENCODE3 (0x1F0Du, 0x0345u, 0x1F8Du),   HB_CODEPOINT_ENCODE3 (0x1F0Eu, 0x0345u, 0x1F8Eu),
-     HB_CODEPOINT_ENCODE3 (0x1F0Fu, 0x0345u, 0x1F8Fu),   HB_CODEPOINT_ENCODE3 (0x1F10u, 0x0300u, 0x1F12u),
-     HB_CODEPOINT_ENCODE3 (0x1F10u, 0x0301u, 0x1F14u),   HB_CODEPOINT_ENCODE3 (0x1F11u, 0x0300u, 0x1F13u),
-     HB_CODEPOINT_ENCODE3 (0x1F11u, 0x0301u, 0x1F15u),   HB_CODEPOINT_ENCODE3 (0x1F18u, 0x0300u, 0x1F1Au),
-     HB_CODEPOINT_ENCODE3 (0x1F18u, 0x0301u, 0x1F1Cu),   HB_CODEPOINT_ENCODE3 (0x1F19u, 0x0300u, 0x1F1Bu),
-     HB_CODEPOINT_ENCODE3 (0x1F19u, 0x0301u, 0x1F1Du),   HB_CODEPOINT_ENCODE3 (0x1F20u, 0x0300u, 0x1F22u),
-     HB_CODEPOINT_ENCODE3 (0x1F20u, 0x0301u, 0x1F24u),   HB_CODEPOINT_ENCODE3 (0x1F20u, 0x0342u, 0x1F26u),
-     HB_CODEPOINT_ENCODE3 (0x1F20u, 0x0345u, 0x1F90u),   HB_CODEPOINT_ENCODE3 (0x1F21u, 0x0300u, 0x1F23u),
-     HB_CODEPOINT_ENCODE3 (0x1F21u, 0x0301u, 0x1F25u),   HB_CODEPOINT_ENCODE3 (0x1F21u, 0x0342u, 0x1F27u),
-     HB_CODEPOINT_ENCODE3 (0x1F21u, 0x0345u, 0x1F91u),   HB_CODEPOINT_ENCODE3 (0x1F22u, 0x0345u, 0x1F92u),
-     HB_CODEPOINT_ENCODE3 (0x1F23u, 0x0345u, 0x1F93u),   HB_CODEPOINT_ENCODE3 (0x1F24u, 0x0345u, 0x1F94u),
-     HB_CODEPOINT_ENCODE3 (0x1F25u, 0x0345u, 0x1F95u),   HB_CODEPOINT_ENCODE3 (0x1F26u, 0x0345u, 0x1F96u),
-     HB_CODEPOINT_ENCODE3 (0x1F27u, 0x0345u, 0x1F97u),   HB_CODEPOINT_ENCODE3 (0x1F28u, 0x0300u, 0x1F2Au),
-     HB_CODEPOINT_ENCODE3 (0x1F28u, 0x0301u, 0x1F2Cu),   HB_CODEPOINT_ENCODE3 (0x1F28u, 0x0342u, 0x1F2Eu),
-     HB_CODEPOINT_ENCODE3 (0x1F28u, 0x0345u, 0x1F98u),   HB_CODEPOINT_ENCODE3 (0x1F29u, 0x0300u, 0x1F2Bu),
-     HB_CODEPOINT_ENCODE3 (0x1F29u, 0x0301u, 0x1F2Du),   HB_CODEPOINT_ENCODE3 (0x1F29u, 0x0342u, 0x1F2Fu),
-     HB_CODEPOINT_ENCODE3 (0x1F29u, 0x0345u, 0x1F99u),   HB_CODEPOINT_ENCODE3 (0x1F2Au, 0x0345u, 0x1F9Au),
-     HB_CODEPOINT_ENCODE3 (0x1F2Bu, 0x0345u, 0x1F9Bu),   HB_CODEPOINT_ENCODE3 (0x1F2Cu, 0x0345u, 0x1F9Cu),
-     HB_CODEPOINT_ENCODE3 (0x1F2Du, 0x0345u, 0x1F9Du),   HB_CODEPOINT_ENCODE3 (0x1F2Eu, 0x0345u, 0x1F9Eu),
-     HB_CODEPOINT_ENCODE3 (0x1F2Fu, 0x0345u, 0x1F9Fu),   HB_CODEPOINT_ENCODE3 (0x1F30u, 0x0300u, 0x1F32u),
-     HB_CODEPOINT_ENCODE3 (0x1F30u, 0x0301u, 0x1F34u),   HB_CODEPOINT_ENCODE3 (0x1F30u, 0x0342u, 0x1F36u),
-     HB_CODEPOINT_ENCODE3 (0x1F31u, 0x0300u, 0x1F33u),   HB_CODEPOINT_ENCODE3 (0x1F31u, 0x0301u, 0x1F35u),
-     HB_CODEPOINT_ENCODE3 (0x1F31u, 0x0342u, 0x1F37u),   HB_CODEPOINT_ENCODE3 (0x1F38u, 0x0300u, 0x1F3Au),
-     HB_CODEPOINT_ENCODE3 (0x1F38u, 0x0301u, 0x1F3Cu),   HB_CODEPOINT_ENCODE3 (0x1F38u, 0x0342u, 0x1F3Eu),
-     HB_CODEPOINT_ENCODE3 (0x1F39u, 0x0300u, 0x1F3Bu),   HB_CODEPOINT_ENCODE3 (0x1F39u, 0x0301u, 0x1F3Du),
-     HB_CODEPOINT_ENCODE3 (0x1F39u, 0x0342u, 0x1F3Fu),   HB_CODEPOINT_ENCODE3 (0x1F40u, 0x0300u, 0x1F42u),
-     HB_CODEPOINT_ENCODE3 (0x1F40u, 0x0301u, 0x1F44u),   HB_CODEPOINT_ENCODE3 (0x1F41u, 0x0300u, 0x1F43u),
-     HB_CODEPOINT_ENCODE3 (0x1F41u, 0x0301u, 0x1F45u),   HB_CODEPOINT_ENCODE3 (0x1F48u, 0x0300u, 0x1F4Au),
-     HB_CODEPOINT_ENCODE3 (0x1F48u, 0x0301u, 0x1F4Cu),   HB_CODEPOINT_ENCODE3 (0x1F49u, 0x0300u, 0x1F4Bu),
-     HB_CODEPOINT_ENCODE3 (0x1F49u, 0x0301u, 0x1F4Du),   HB_CODEPOINT_ENCODE3 (0x1F50u, 0x0300u, 0x1F52u),
-     HB_CODEPOINT_ENCODE3 (0x1F50u, 0x0301u, 0x1F54u),   HB_CODEPOINT_ENCODE3 (0x1F50u, 0x0342u, 0x1F56u),
-     HB_CODEPOINT_ENCODE3 (0x1F51u, 0x0300u, 0x1F53u),   HB_CODEPOINT_ENCODE3 (0x1F51u, 0x0301u, 0x1F55u),
-     HB_CODEPOINT_ENCODE3 (0x1F51u, 0x0342u, 0x1F57u),   HB_CODEPOINT_ENCODE3 (0x1F59u, 0x0300u, 0x1F5Bu),
-     HB_CODEPOINT_ENCODE3 (0x1F59u, 0x0301u, 0x1F5Du),   HB_CODEPOINT_ENCODE3 (0x1F59u, 0x0342u, 0x1F5Fu),
-     HB_CODEPOINT_ENCODE3 (0x1F60u, 0x0300u, 0x1F62u),   HB_CODEPOINT_ENCODE3 (0x1F60u, 0x0301u, 0x1F64u),
-     HB_CODEPOINT_ENCODE3 (0x1F60u, 0x0342u, 0x1F66u),   HB_CODEPOINT_ENCODE3 (0x1F60u, 0x0345u, 0x1FA0u),
-     HB_CODEPOINT_ENCODE3 (0x1F61u, 0x0300u, 0x1F63u),   HB_CODEPOINT_ENCODE3 (0x1F61u, 0x0301u, 0x1F65u),
-     HB_CODEPOINT_ENCODE3 (0x1F61u, 0x0342u, 0x1F67u),   HB_CODEPOINT_ENCODE3 (0x1F61u, 0x0345u, 0x1FA1u),
-     HB_CODEPOINT_ENCODE3 (0x1F62u, 0x0345u, 0x1FA2u),   HB_CODEPOINT_ENCODE3 (0x1F63u, 0x0345u, 0x1FA3u),
-     HB_CODEPOINT_ENCODE3 (0x1F64u, 0x0345u, 0x1FA4u),   HB_CODEPOINT_ENCODE3 (0x1F65u, 0x0345u, 0x1FA5u),
-     HB_CODEPOINT_ENCODE3 (0x1F66u, 0x0345u, 0x1FA6u),   HB_CODEPOINT_ENCODE3 (0x1F67u, 0x0345u, 0x1FA7u),
-     HB_CODEPOINT_ENCODE3 (0x1F68u, 0x0300u, 0x1F6Au),   HB_CODEPOINT_ENCODE3 (0x1F68u, 0x0301u, 0x1F6Cu),
-     HB_CODEPOINT_ENCODE3 (0x1F68u, 0x0342u, 0x1F6Eu),   HB_CODEPOINT_ENCODE3 (0x1F68u, 0x0345u, 0x1FA8u),
-     HB_CODEPOINT_ENCODE3 (0x1F69u, 0x0300u, 0x1F6Bu),   HB_CODEPOINT_ENCODE3 (0x1F69u, 0x0301u, 0x1F6Du),
-     HB_CODEPOINT_ENCODE3 (0x1F69u, 0x0342u, 0x1F6Fu),   HB_CODEPOINT_ENCODE3 (0x1F69u, 0x0345u, 0x1FA9u),
-     HB_CODEPOINT_ENCODE3 (0x1F6Au, 0x0345u, 0x1FAAu),   HB_CODEPOINT_ENCODE3 (0x1F6Bu, 0x0345u, 0x1FABu),
-     HB_CODEPOINT_ENCODE3 (0x1F6Cu, 0x0345u, 0x1FACu),   HB_CODEPOINT_ENCODE3 (0x1F6Du, 0x0345u, 0x1FADu),
-     HB_CODEPOINT_ENCODE3 (0x1F6Eu, 0x0345u, 0x1FAEu),   HB_CODEPOINT_ENCODE3 (0x1F6Fu, 0x0345u, 0x1FAFu),
-     HB_CODEPOINT_ENCODE3 (0x1F70u, 0x0345u, 0x1FB2u),   HB_CODEPOINT_ENCODE3 (0x1F74u, 0x0345u, 0x1FC2u),
-     HB_CODEPOINT_ENCODE3 (0x1F7Cu, 0x0345u, 0x1FF2u),   HB_CODEPOINT_ENCODE3 (0x1FB6u, 0x0345u, 0x1FB7u),
-     HB_CODEPOINT_ENCODE3 (0x1FBFu, 0x0300u, 0x1FCDu),   HB_CODEPOINT_ENCODE3 (0x1FBFu, 0x0301u, 0x1FCEu),
-     HB_CODEPOINT_ENCODE3 (0x1FBFu, 0x0342u, 0x1FCFu),   HB_CODEPOINT_ENCODE3 (0x1FC6u, 0x0345u, 0x1FC7u),
-     HB_CODEPOINT_ENCODE3 (0x1FF6u, 0x0345u, 0x1FF7u),   HB_CODEPOINT_ENCODE3 (0x1FFEu, 0x0300u, 0x1FDDu),
-     HB_CODEPOINT_ENCODE3 (0x1FFEu, 0x0301u, 0x1FDEu),   HB_CODEPOINT_ENCODE3 (0x1FFEu, 0x0342u, 0x1FDFu),
-     HB_CODEPOINT_ENCODE3 (0x2190u, 0x0338u, 0x219Au),   HB_CODEPOINT_ENCODE3 (0x2192u, 0x0338u, 0x219Bu),
-     HB_CODEPOINT_ENCODE3 (0x2194u, 0x0338u, 0x21AEu),   HB_CODEPOINT_ENCODE3 (0x21D0u, 0x0338u, 0x21CDu),
-     HB_CODEPOINT_ENCODE3 (0x21D2u, 0x0338u, 0x21CFu),   HB_CODEPOINT_ENCODE3 (0x21D4u, 0x0338u, 0x21CEu),
-     HB_CODEPOINT_ENCODE3 (0x2203u, 0x0338u, 0x2204u),   HB_CODEPOINT_ENCODE3 (0x2208u, 0x0338u, 0x2209u),
-     HB_CODEPOINT_ENCODE3 (0x220Bu, 0x0338u, 0x220Cu),   HB_CODEPOINT_ENCODE3 (0x2223u, 0x0338u, 0x2224u),
-     HB_CODEPOINT_ENCODE3 (0x2225u, 0x0338u, 0x2226u),   HB_CODEPOINT_ENCODE3 (0x223Cu, 0x0338u, 0x2241u),
-     HB_CODEPOINT_ENCODE3 (0x2243u, 0x0338u, 0x2244u),   HB_CODEPOINT_ENCODE3 (0x2245u, 0x0338u, 0x2247u),
-     HB_CODEPOINT_ENCODE3 (0x2248u, 0x0338u, 0x2249u),   HB_CODEPOINT_ENCODE3 (0x224Du, 0x0338u, 0x226Du),
-     HB_CODEPOINT_ENCODE3 (0x2261u, 0x0338u, 0x2262u),   HB_CODEPOINT_ENCODE3 (0x2264u, 0x0338u, 0x2270u),
-     HB_CODEPOINT_ENCODE3 (0x2265u, 0x0338u, 0x2271u),   HB_CODEPOINT_ENCODE3 (0x2272u, 0x0338u, 0x2274u),
-     HB_CODEPOINT_ENCODE3 (0x2273u, 0x0338u, 0x2275u),   HB_CODEPOINT_ENCODE3 (0x2276u, 0x0338u, 0x2278u),
-     HB_CODEPOINT_ENCODE3 (0x2277u, 0x0338u, 0x2279u),   HB_CODEPOINT_ENCODE3 (0x227Au, 0x0338u, 0x2280u),
-     HB_CODEPOINT_ENCODE3 (0x227Bu, 0x0338u, 0x2281u),   HB_CODEPOINT_ENCODE3 (0x227Cu, 0x0338u, 0x22E0u),
-     HB_CODEPOINT_ENCODE3 (0x227Du, 0x0338u, 0x22E1u),   HB_CODEPOINT_ENCODE3 (0x2282u, 0x0338u, 0x2284u),
-     HB_CODEPOINT_ENCODE3 (0x2283u, 0x0338u, 0x2285u),   HB_CODEPOINT_ENCODE3 (0x2286u, 0x0338u, 0x2288u),
-     HB_CODEPOINT_ENCODE3 (0x2287u, 0x0338u, 0x2289u),   HB_CODEPOINT_ENCODE3 (0x2291u, 0x0338u, 0x22E2u),
-     HB_CODEPOINT_ENCODE3 (0x2292u, 0x0338u, 0x22E3u),   HB_CODEPOINT_ENCODE3 (0x22A2u, 0x0338u, 0x22ACu),
-     HB_CODEPOINT_ENCODE3 (0x22A8u, 0x0338u, 0x22ADu),   HB_CODEPOINT_ENCODE3 (0x22A9u, 0x0338u, 0x22AEu),
-     HB_CODEPOINT_ENCODE3 (0x22ABu, 0x0338u, 0x22AFu),   HB_CODEPOINT_ENCODE3 (0x22B2u, 0x0338u, 0x22EAu),
-     HB_CODEPOINT_ENCODE3 (0x22B3u, 0x0338u, 0x22EBu),   HB_CODEPOINT_ENCODE3 (0x22B4u, 0x0338u, 0x22ECu),
-     HB_CODEPOINT_ENCODE3 (0x22B5u, 0x0338u, 0x22EDu),   HB_CODEPOINT_ENCODE3 (0x2ADDu, 0x0338u, 0x0000u),
-     HB_CODEPOINT_ENCODE3 (0x3046u, 0x3099u, 0x3094u),   HB_CODEPOINT_ENCODE3 (0x304Bu, 0x3099u, 0x304Cu),
-     HB_CODEPOINT_ENCODE3 (0x304Du, 0x3099u, 0x304Eu),   HB_CODEPOINT_ENCODE3 (0x304Fu, 0x3099u, 0x3050u),
-     HB_CODEPOINT_ENCODE3 (0x3051u, 0x3099u, 0x3052u),   HB_CODEPOINT_ENCODE3 (0x3053u, 0x3099u, 0x3054u),
-     HB_CODEPOINT_ENCODE3 (0x3055u, 0x3099u, 0x3056u),   HB_CODEPOINT_ENCODE3 (0x3057u, 0x3099u, 0x3058u),
-     HB_CODEPOINT_ENCODE3 (0x3059u, 0x3099u, 0x305Au),   HB_CODEPOINT_ENCODE3 (0x305Bu, 0x3099u, 0x305Cu),
-     HB_CODEPOINT_ENCODE3 (0x305Du, 0x3099u, 0x305Eu),   HB_CODEPOINT_ENCODE3 (0x305Fu, 0x3099u, 0x3060u),
-     HB_CODEPOINT_ENCODE3 (0x3061u, 0x3099u, 0x3062u),   HB_CODEPOINT_ENCODE3 (0x3064u, 0x3099u, 0x3065u),
-     HB_CODEPOINT_ENCODE3 (0x3066u, 0x3099u, 0x3067u),   HB_CODEPOINT_ENCODE3 (0x3068u, 0x3099u, 0x3069u),
-     HB_CODEPOINT_ENCODE3 (0x306Fu, 0x3099u, 0x3070u),   HB_CODEPOINT_ENCODE3 (0x306Fu, 0x309Au, 0x3071u),
-     HB_CODEPOINT_ENCODE3 (0x3072u, 0x3099u, 0x3073u),   HB_CODEPOINT_ENCODE3 (0x3072u, 0x309Au, 0x3074u),
-     HB_CODEPOINT_ENCODE3 (0x3075u, 0x3099u, 0x3076u),   HB_CODEPOINT_ENCODE3 (0x3075u, 0x309Au, 0x3077u),
-     HB_CODEPOINT_ENCODE3 (0x3078u, 0x3099u, 0x3079u),   HB_CODEPOINT_ENCODE3 (0x3078u, 0x309Au, 0x307Au),
-     HB_CODEPOINT_ENCODE3 (0x307Bu, 0x3099u, 0x307Cu),   HB_CODEPOINT_ENCODE3 (0x307Bu, 0x309Au, 0x307Du),
-     HB_CODEPOINT_ENCODE3 (0x309Du, 0x3099u, 0x309Eu),   HB_CODEPOINT_ENCODE3 (0x30A6u, 0x3099u, 0x30F4u),
-     HB_CODEPOINT_ENCODE3 (0x30ABu, 0x3099u, 0x30ACu),   HB_CODEPOINT_ENCODE3 (0x30ADu, 0x3099u, 0x30AEu),
-     HB_CODEPOINT_ENCODE3 (0x30AFu, 0x3099u, 0x30B0u),   HB_CODEPOINT_ENCODE3 (0x30B1u, 0x3099u, 0x30B2u),
-     HB_CODEPOINT_ENCODE3 (0x30B3u, 0x3099u, 0x30B4u),   HB_CODEPOINT_ENCODE3 (0x30B5u, 0x3099u, 0x30B6u),
-     HB_CODEPOINT_ENCODE3 (0x30B7u, 0x3099u, 0x30B8u),   HB_CODEPOINT_ENCODE3 (0x30B9u, 0x3099u, 0x30BAu),
-     HB_CODEPOINT_ENCODE3 (0x30BBu, 0x3099u, 0x30BCu),   HB_CODEPOINT_ENCODE3 (0x30BDu, 0x3099u, 0x30BEu),
-     HB_CODEPOINT_ENCODE3 (0x30BFu, 0x3099u, 0x30C0u),   HB_CODEPOINT_ENCODE3 (0x30C1u, 0x3099u, 0x30C2u),
-     HB_CODEPOINT_ENCODE3 (0x30C4u, 0x3099u, 0x30C5u),   HB_CODEPOINT_ENCODE3 (0x30C6u, 0x3099u, 0x30C7u),
-     HB_CODEPOINT_ENCODE3 (0x30C8u, 0x3099u, 0x30C9u),   HB_CODEPOINT_ENCODE3 (0x30CFu, 0x3099u, 0x30D0u),
-     HB_CODEPOINT_ENCODE3 (0x30CFu, 0x309Au, 0x30D1u),   HB_CODEPOINT_ENCODE3 (0x30D2u, 0x3099u, 0x30D3u),
-     HB_CODEPOINT_ENCODE3 (0x30D2u, 0x309Au, 0x30D4u),   HB_CODEPOINT_ENCODE3 (0x30D5u, 0x3099u, 0x30D6u),
-     HB_CODEPOINT_ENCODE3 (0x30D5u, 0x309Au, 0x30D7u),   HB_CODEPOINT_ENCODE3 (0x30D8u, 0x3099u, 0x30D9u),
-     HB_CODEPOINT_ENCODE3 (0x30D8u, 0x309Au, 0x30DAu),   HB_CODEPOINT_ENCODE3 (0x30DBu, 0x3099u, 0x30DCu),
-     HB_CODEPOINT_ENCODE3 (0x30DBu, 0x309Au, 0x30DDu),   HB_CODEPOINT_ENCODE3 (0x30EFu, 0x3099u, 0x30F7u),
-     HB_CODEPOINT_ENCODE3 (0x30F0u, 0x3099u, 0x30F8u),   HB_CODEPOINT_ENCODE3 (0x30F1u, 0x3099u, 0x30F9u),
-     HB_CODEPOINT_ENCODE3 (0x30F2u, 0x3099u, 0x30FAu),   HB_CODEPOINT_ENCODE3 (0x30FDu, 0x3099u, 0x30FEu),
-     HB_CODEPOINT_ENCODE3 (0xFB49u, 0x05C1u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0xFB49u, 0x05C2u, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x105D2u, 0x0307u, 0x105C9u), HB_CODEPOINT_ENCODE3 (0x105DAu, 0x0307u, 0x105E4u),
-  HB_CODEPOINT_ENCODE3 (0x11099u, 0x110BAu, 0x1109Au),HB_CODEPOINT_ENCODE3 (0x1109Bu, 0x110BAu, 0x1109Cu),
-  HB_CODEPOINT_ENCODE3 (0x110A5u, 0x110BAu, 0x110ABu),HB_CODEPOINT_ENCODE3 (0x11131u, 0x11127u, 0x1112Eu),
-  HB_CODEPOINT_ENCODE3 (0x11132u, 0x11127u, 0x1112Fu),HB_CODEPOINT_ENCODE3 (0x11347u, 0x1133Eu, 0x1134Bu),
-  HB_CODEPOINT_ENCODE3 (0x11347u, 0x11357u, 0x1134Cu),HB_CODEPOINT_ENCODE3 (0x11382u, 0x113C9u, 0x11383u),
-  HB_CODEPOINT_ENCODE3 (0x11384u, 0x113BBu, 0x11385u),HB_CODEPOINT_ENCODE3 (0x1138Bu, 0x113C2u, 0x1138Eu),
-  HB_CODEPOINT_ENCODE3 (0x11390u, 0x113C9u, 0x11391u),HB_CODEPOINT_ENCODE3 (0x113C2u, 0x113B8u, 0x113C7u),
-  HB_CODEPOINT_ENCODE3 (0x113C2u, 0x113C2u, 0x113C5u),HB_CODEPOINT_ENCODE3 (0x113C2u, 0x113C9u, 0x113C8u),
-  HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114B0u, 0x114BCu),HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114BAu, 0x114BBu),
-  HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114BDu, 0x114BEu),HB_CODEPOINT_ENCODE3 (0x115B8u, 0x115AFu, 0x115BAu),
-  HB_CODEPOINT_ENCODE3 (0x115B9u, 0x115AFu, 0x115BBu),HB_CODEPOINT_ENCODE3 (0x11935u, 0x11930u, 0x11938u),
-  HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x1611Eu, 0x16121u),HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x1611Fu, 0x16123u),
-  HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x16120u, 0x16125u),HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x16129u, 0x16122u),
-  HB_CODEPOINT_ENCODE3 (0x16121u, 0x1611Fu, 0x16126u),HB_CODEPOINT_ENCODE3 (0x16121u, 0x16120u, 0x16128u),
-  HB_CODEPOINT_ENCODE3 (0x16122u, 0x1611Fu, 0x16127u),HB_CODEPOINT_ENCODE3 (0x16129u, 0x1611Fu, 0x16124u),
-  HB_CODEPOINT_ENCODE3 (0x16D63u, 0x16D67u, 0x16D69u),HB_CODEPOINT_ENCODE3 (0x16D67u, 0x16D67u, 0x16D68u),
-  HB_CODEPOINT_ENCODE3 (0x16D69u, 0x16D67u, 0x16D6Au), HB_CODEPOINT_ENCODE3 (0x1D157u, 0x1D165u, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x1D158u, 0x1D165u, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D16Eu, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D16Fu, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D170u, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D171u, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D172u, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x1D1B9u, 0x1D165u, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D1BAu, 0x1D165u, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x1D1BBu, 0x1D16Eu, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D1BBu, 0x1D16Fu, 0x0000u),
-   HB_CODEPOINT_ENCODE3 (0x1D1BCu, 0x1D16Eu, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D1BCu, 0x1D16Fu, 0x0000u),
+     HB_CODEPOINT_ENCODE3 (0x05D0, 0x05B7, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D0, 0x05B8, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05D0, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D1, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05D1, 0x05BF, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D2, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05D3, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D4, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05D5, 0x05B9, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D5, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05D6, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D8, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05D9, 0x05B4, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05D9, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05DA, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05DB, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05DB, 0x05BF, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05DC, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05DE, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05E0, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05E1, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05E3, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05E4, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05E4, 0x05BF, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05E6, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05E7, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05E8, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05E9, 0x05BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05E9, 0x05C1, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05E9, 0x05C2, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x05EA, 0x05BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x05F2, 0x05B7, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0627, 0x0653, 0x0622),   HB_CODEPOINT_ENCODE3 (0x0627, 0x0654, 0x0623),
+     HB_CODEPOINT_ENCODE3 (0x0627, 0x0655, 0x0625),   HB_CODEPOINT_ENCODE3 (0x0648, 0x0654, 0x0624),
+     HB_CODEPOINT_ENCODE3 (0x064A, 0x0654, 0x0626),   HB_CODEPOINT_ENCODE3 (0x06C1, 0x0654, 0x06C2),
+     HB_CODEPOINT_ENCODE3 (0x06D2, 0x0654, 0x06D3),   HB_CODEPOINT_ENCODE3 (0x06D5, 0x0654, 0x06C0),
+     HB_CODEPOINT_ENCODE3 (0x0915, 0x093C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0916, 0x093C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0917, 0x093C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x091C, 0x093C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0921, 0x093C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0922, 0x093C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0928, 0x093C, 0x0929),   HB_CODEPOINT_ENCODE3 (0x092B, 0x093C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x092F, 0x093C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0930, 0x093C, 0x0931),
+     HB_CODEPOINT_ENCODE3 (0x0933, 0x093C, 0x0934),   HB_CODEPOINT_ENCODE3 (0x09A1, 0x09BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x09A2, 0x09BC, 0x0000),   HB_CODEPOINT_ENCODE3 (0x09AF, 0x09BC, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x09C7, 0x09BE, 0x09CB),   HB_CODEPOINT_ENCODE3 (0x09C7, 0x09D7, 0x09CC),
+     HB_CODEPOINT_ENCODE3 (0x0A16, 0x0A3C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0A17, 0x0A3C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0A1C, 0x0A3C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0A2B, 0x0A3C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0A32, 0x0A3C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0A38, 0x0A3C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0B21, 0x0B3C, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0B22, 0x0B3C, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0B47, 0x0B3E, 0x0B4B),   HB_CODEPOINT_ENCODE3 (0x0B47, 0x0B56, 0x0B48),
+     HB_CODEPOINT_ENCODE3 (0x0B47, 0x0B57, 0x0B4C),   HB_CODEPOINT_ENCODE3 (0x0B92, 0x0BD7, 0x0B94),
+     HB_CODEPOINT_ENCODE3 (0x0BC6, 0x0BBE, 0x0BCA),   HB_CODEPOINT_ENCODE3 (0x0BC6, 0x0BD7, 0x0BCC),
+     HB_CODEPOINT_ENCODE3 (0x0BC7, 0x0BBE, 0x0BCB),   HB_CODEPOINT_ENCODE3 (0x0C46, 0x0C56, 0x0C48),
+     HB_CODEPOINT_ENCODE3 (0x0CBF, 0x0CD5, 0x0CC0),   HB_CODEPOINT_ENCODE3 (0x0CC6, 0x0CC2, 0x0CCA),
+     HB_CODEPOINT_ENCODE3 (0x0CC6, 0x0CD5, 0x0CC7),   HB_CODEPOINT_ENCODE3 (0x0CC6, 0x0CD6, 0x0CC8),
+     HB_CODEPOINT_ENCODE3 (0x0CCA, 0x0CD5, 0x0CCB),   HB_CODEPOINT_ENCODE3 (0x0D46, 0x0D3E, 0x0D4A),
+     HB_CODEPOINT_ENCODE3 (0x0D46, 0x0D57, 0x0D4C),   HB_CODEPOINT_ENCODE3 (0x0D47, 0x0D3E, 0x0D4B),
+     HB_CODEPOINT_ENCODE3 (0x0DD9, 0x0DCA, 0x0DDA),   HB_CODEPOINT_ENCODE3 (0x0DD9, 0x0DCF, 0x0DDC),
+     HB_CODEPOINT_ENCODE3 (0x0DD9, 0x0DDF, 0x0DDE),   HB_CODEPOINT_ENCODE3 (0x0DDC, 0x0DCA, 0x0DDD),
+     HB_CODEPOINT_ENCODE3 (0x0F40, 0x0FB5, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0F42, 0x0FB7, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0F4C, 0x0FB7, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0F51, 0x0FB7, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0F56, 0x0FB7, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0F5B, 0x0FB7, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0F71, 0x0F72, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0F71, 0x0F74, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0F71, 0x0F80, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0F90, 0x0FB5, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0F92, 0x0FB7, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0F9C, 0x0FB7, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0FA1, 0x0FB7, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0FA6, 0x0FB7, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0FAB, 0x0FB7, 0x0000),   HB_CODEPOINT_ENCODE3 (0x0FB2, 0x0F80, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x0FB3, 0x0F80, 0x0000),   HB_CODEPOINT_ENCODE3 (0x1025, 0x102E, 0x1026),
+     HB_CODEPOINT_ENCODE3 (0x1B05, 0x1B35, 0x1B06),   HB_CODEPOINT_ENCODE3 (0x1B07, 0x1B35, 0x1B08),
+     HB_CODEPOINT_ENCODE3 (0x1B09, 0x1B35, 0x1B0A),   HB_CODEPOINT_ENCODE3 (0x1B0B, 0x1B35, 0x1B0C),
+     HB_CODEPOINT_ENCODE3 (0x1B0D, 0x1B35, 0x1B0E),   HB_CODEPOINT_ENCODE3 (0x1B11, 0x1B35, 0x1B12),
+     HB_CODEPOINT_ENCODE3 (0x1B3A, 0x1B35, 0x1B3B),   HB_CODEPOINT_ENCODE3 (0x1B3C, 0x1B35, 0x1B3D),
+     HB_CODEPOINT_ENCODE3 (0x1B3E, 0x1B35, 0x1B40),   HB_CODEPOINT_ENCODE3 (0x1B3F, 0x1B35, 0x1B41),
+     HB_CODEPOINT_ENCODE3 (0x1B42, 0x1B35, 0x1B43),   HB_CODEPOINT_ENCODE3 (0x1E36, 0x0304, 0x1E38),
+     HB_CODEPOINT_ENCODE3 (0x1E37, 0x0304, 0x1E39),   HB_CODEPOINT_ENCODE3 (0x1E5A, 0x0304, 0x1E5C),
+     HB_CODEPOINT_ENCODE3 (0x1E5B, 0x0304, 0x1E5D),   HB_CODEPOINT_ENCODE3 (0x1E62, 0x0307, 0x1E68),
+     HB_CODEPOINT_ENCODE3 (0x1E63, 0x0307, 0x1E69),   HB_CODEPOINT_ENCODE3 (0x1EA0, 0x0302, 0x1EAC),
+     HB_CODEPOINT_ENCODE3 (0x1EA0, 0x0306, 0x1EB6),   HB_CODEPOINT_ENCODE3 (0x1EA1, 0x0302, 0x1EAD),
+     HB_CODEPOINT_ENCODE3 (0x1EA1, 0x0306, 0x1EB7),   HB_CODEPOINT_ENCODE3 (0x1EB8, 0x0302, 0x1EC6),
+     HB_CODEPOINT_ENCODE3 (0x1EB9, 0x0302, 0x1EC7),   HB_CODEPOINT_ENCODE3 (0x1ECC, 0x0302, 0x1ED8),
+     HB_CODEPOINT_ENCODE3 (0x1ECD, 0x0302, 0x1ED9),   HB_CODEPOINT_ENCODE3 (0x1F00, 0x0300, 0x1F02),
+     HB_CODEPOINT_ENCODE3 (0x1F00, 0x0301, 0x1F04),   HB_CODEPOINT_ENCODE3 (0x1F00, 0x0342, 0x1F06),
+     HB_CODEPOINT_ENCODE3 (0x1F00, 0x0345, 0x1F80),   HB_CODEPOINT_ENCODE3 (0x1F01, 0x0300, 0x1F03),
+     HB_CODEPOINT_ENCODE3 (0x1F01, 0x0301, 0x1F05),   HB_CODEPOINT_ENCODE3 (0x1F01, 0x0342, 0x1F07),
+     HB_CODEPOINT_ENCODE3 (0x1F01, 0x0345, 0x1F81),   HB_CODEPOINT_ENCODE3 (0x1F02, 0x0345, 0x1F82),
+     HB_CODEPOINT_ENCODE3 (0x1F03, 0x0345, 0x1F83),   HB_CODEPOINT_ENCODE3 (0x1F04, 0x0345, 0x1F84),
+     HB_CODEPOINT_ENCODE3 (0x1F05, 0x0345, 0x1F85),   HB_CODEPOINT_ENCODE3 (0x1F06, 0x0345, 0x1F86),
+     HB_CODEPOINT_ENCODE3 (0x1F07, 0x0345, 0x1F87),   HB_CODEPOINT_ENCODE3 (0x1F08, 0x0300, 0x1F0A),
+     HB_CODEPOINT_ENCODE3 (0x1F08, 0x0301, 0x1F0C),   HB_CODEPOINT_ENCODE3 (0x1F08, 0x0342, 0x1F0E),
+     HB_CODEPOINT_ENCODE3 (0x1F08, 0x0345, 0x1F88),   HB_CODEPOINT_ENCODE3 (0x1F09, 0x0300, 0x1F0B),
+     HB_CODEPOINT_ENCODE3 (0x1F09, 0x0301, 0x1F0D),   HB_CODEPOINT_ENCODE3 (0x1F09, 0x0342, 0x1F0F),
+     HB_CODEPOINT_ENCODE3 (0x1F09, 0x0345, 0x1F89),   HB_CODEPOINT_ENCODE3 (0x1F0A, 0x0345, 0x1F8A),
+     HB_CODEPOINT_ENCODE3 (0x1F0B, 0x0345, 0x1F8B),   HB_CODEPOINT_ENCODE3 (0x1F0C, 0x0345, 0x1F8C),
+     HB_CODEPOINT_ENCODE3 (0x1F0D, 0x0345, 0x1F8D),   HB_CODEPOINT_ENCODE3 (0x1F0E, 0x0345, 0x1F8E),
+     HB_CODEPOINT_ENCODE3 (0x1F0F, 0x0345, 0x1F8F),   HB_CODEPOINT_ENCODE3 (0x1F10, 0x0300, 0x1F12),
+     HB_CODEPOINT_ENCODE3 (0x1F10, 0x0301, 0x1F14),   HB_CODEPOINT_ENCODE3 (0x1F11, 0x0300, 0x1F13),
+     HB_CODEPOINT_ENCODE3 (0x1F11, 0x0301, 0x1F15),   HB_CODEPOINT_ENCODE3 (0x1F18, 0x0300, 0x1F1A),
+     HB_CODEPOINT_ENCODE3 (0x1F18, 0x0301, 0x1F1C),   HB_CODEPOINT_ENCODE3 (0x1F19, 0x0300, 0x1F1B),
+     HB_CODEPOINT_ENCODE3 (0x1F19, 0x0301, 0x1F1D),   HB_CODEPOINT_ENCODE3 (0x1F20, 0x0300, 0x1F22),
+     HB_CODEPOINT_ENCODE3 (0x1F20, 0x0301, 0x1F24),   HB_CODEPOINT_ENCODE3 (0x1F20, 0x0342, 0x1F26),
+     HB_CODEPOINT_ENCODE3 (0x1F20, 0x0345, 0x1F90),   HB_CODEPOINT_ENCODE3 (0x1F21, 0x0300, 0x1F23),
+     HB_CODEPOINT_ENCODE3 (0x1F21, 0x0301, 0x1F25),   HB_CODEPOINT_ENCODE3 (0x1F21, 0x0342, 0x1F27),
+     HB_CODEPOINT_ENCODE3 (0x1F21, 0x0345, 0x1F91),   HB_CODEPOINT_ENCODE3 (0x1F22, 0x0345, 0x1F92),
+     HB_CODEPOINT_ENCODE3 (0x1F23, 0x0345, 0x1F93),   HB_CODEPOINT_ENCODE3 (0x1F24, 0x0345, 0x1F94),
+     HB_CODEPOINT_ENCODE3 (0x1F25, 0x0345, 0x1F95),   HB_CODEPOINT_ENCODE3 (0x1F26, 0x0345, 0x1F96),
+     HB_CODEPOINT_ENCODE3 (0x1F27, 0x0345, 0x1F97),   HB_CODEPOINT_ENCODE3 (0x1F28, 0x0300, 0x1F2A),
+     HB_CODEPOINT_ENCODE3 (0x1F28, 0x0301, 0x1F2C),   HB_CODEPOINT_ENCODE3 (0x1F28, 0x0342, 0x1F2E),
+     HB_CODEPOINT_ENCODE3 (0x1F28, 0x0345, 0x1F98),   HB_CODEPOINT_ENCODE3 (0x1F29, 0x0300, 0x1F2B),
+     HB_CODEPOINT_ENCODE3 (0x1F29, 0x0301, 0x1F2D),   HB_CODEPOINT_ENCODE3 (0x1F29, 0x0342, 0x1F2F),
+     HB_CODEPOINT_ENCODE3 (0x1F29, 0x0345, 0x1F99),   HB_CODEPOINT_ENCODE3 (0x1F2A, 0x0345, 0x1F9A),
+     HB_CODEPOINT_ENCODE3 (0x1F2B, 0x0345, 0x1F9B),   HB_CODEPOINT_ENCODE3 (0x1F2C, 0x0345, 0x1F9C),
+     HB_CODEPOINT_ENCODE3 (0x1F2D, 0x0345, 0x1F9D),   HB_CODEPOINT_ENCODE3 (0x1F2E, 0x0345, 0x1F9E),
+     HB_CODEPOINT_ENCODE3 (0x1F2F, 0x0345, 0x1F9F),   HB_CODEPOINT_ENCODE3 (0x1F30, 0x0300, 0x1F32),
+     HB_CODEPOINT_ENCODE3 (0x1F30, 0x0301, 0x1F34),   HB_CODEPOINT_ENCODE3 (0x1F30, 0x0342, 0x1F36),
+     HB_CODEPOINT_ENCODE3 (0x1F31, 0x0300, 0x1F33),   HB_CODEPOINT_ENCODE3 (0x1F31, 0x0301, 0x1F35),
+     HB_CODEPOINT_ENCODE3 (0x1F31, 0x0342, 0x1F37),   HB_CODEPOINT_ENCODE3 (0x1F38, 0x0300, 0x1F3A),
+     HB_CODEPOINT_ENCODE3 (0x1F38, 0x0301, 0x1F3C),   HB_CODEPOINT_ENCODE3 (0x1F38, 0x0342, 0x1F3E),
+     HB_CODEPOINT_ENCODE3 (0x1F39, 0x0300, 0x1F3B),   HB_CODEPOINT_ENCODE3 (0x1F39, 0x0301, 0x1F3D),
+     HB_CODEPOINT_ENCODE3 (0x1F39, 0x0342, 0x1F3F),   HB_CODEPOINT_ENCODE3 (0x1F40, 0x0300, 0x1F42),
+     HB_CODEPOINT_ENCODE3 (0x1F40, 0x0301, 0x1F44),   HB_CODEPOINT_ENCODE3 (0x1F41, 0x0300, 0x1F43),
+     HB_CODEPOINT_ENCODE3 (0x1F41, 0x0301, 0x1F45),   HB_CODEPOINT_ENCODE3 (0x1F48, 0x0300, 0x1F4A),
+     HB_CODEPOINT_ENCODE3 (0x1F48, 0x0301, 0x1F4C),   HB_CODEPOINT_ENCODE3 (0x1F49, 0x0300, 0x1F4B),
+     HB_CODEPOINT_ENCODE3 (0x1F49, 0x0301, 0x1F4D),   HB_CODEPOINT_ENCODE3 (0x1F50, 0x0300, 0x1F52),
+     HB_CODEPOINT_ENCODE3 (0x1F50, 0x0301, 0x1F54),   HB_CODEPOINT_ENCODE3 (0x1F50, 0x0342, 0x1F56),
+     HB_CODEPOINT_ENCODE3 (0x1F51, 0x0300, 0x1F53),   HB_CODEPOINT_ENCODE3 (0x1F51, 0x0301, 0x1F55),
+     HB_CODEPOINT_ENCODE3 (0x1F51, 0x0342, 0x1F57),   HB_CODEPOINT_ENCODE3 (0x1F59, 0x0300, 0x1F5B),
+     HB_CODEPOINT_ENCODE3 (0x1F59, 0x0301, 0x1F5D),   HB_CODEPOINT_ENCODE3 (0x1F59, 0x0342, 0x1F5F),
+     HB_CODEPOINT_ENCODE3 (0x1F60, 0x0300, 0x1F62),   HB_CODEPOINT_ENCODE3 (0x1F60, 0x0301, 0x1F64),
+     HB_CODEPOINT_ENCODE3 (0x1F60, 0x0342, 0x1F66),   HB_CODEPOINT_ENCODE3 (0x1F60, 0x0345, 0x1FA0),
+     HB_CODEPOINT_ENCODE3 (0x1F61, 0x0300, 0x1F63),   HB_CODEPOINT_ENCODE3 (0x1F61, 0x0301, 0x1F65),
+     HB_CODEPOINT_ENCODE3 (0x1F61, 0x0342, 0x1F67),   HB_CODEPOINT_ENCODE3 (0x1F61, 0x0345, 0x1FA1),
+     HB_CODEPOINT_ENCODE3 (0x1F62, 0x0345, 0x1FA2),   HB_CODEPOINT_ENCODE3 (0x1F63, 0x0345, 0x1FA3),
+     HB_CODEPOINT_ENCODE3 (0x1F64, 0x0345, 0x1FA4),   HB_CODEPOINT_ENCODE3 (0x1F65, 0x0345, 0x1FA5),
+     HB_CODEPOINT_ENCODE3 (0x1F66, 0x0345, 0x1FA6),   HB_CODEPOINT_ENCODE3 (0x1F67, 0x0345, 0x1FA7),
+     HB_CODEPOINT_ENCODE3 (0x1F68, 0x0300, 0x1F6A),   HB_CODEPOINT_ENCODE3 (0x1F68, 0x0301, 0x1F6C),
+     HB_CODEPOINT_ENCODE3 (0x1F68, 0x0342, 0x1F6E),   HB_CODEPOINT_ENCODE3 (0x1F68, 0x0345, 0x1FA8),
+     HB_CODEPOINT_ENCODE3 (0x1F69, 0x0300, 0x1F6B),   HB_CODEPOINT_ENCODE3 (0x1F69, 0x0301, 0x1F6D),
+     HB_CODEPOINT_ENCODE3 (0x1F69, 0x0342, 0x1F6F),   HB_CODEPOINT_ENCODE3 (0x1F69, 0x0345, 0x1FA9),
+     HB_CODEPOINT_ENCODE3 (0x1F6A, 0x0345, 0x1FAA),   HB_CODEPOINT_ENCODE3 (0x1F6B, 0x0345, 0x1FAB),
+     HB_CODEPOINT_ENCODE3 (0x1F6C, 0x0345, 0x1FAC),   HB_CODEPOINT_ENCODE3 (0x1F6D, 0x0345, 0x1FAD),
+     HB_CODEPOINT_ENCODE3 (0x1F6E, 0x0345, 0x1FAE),   HB_CODEPOINT_ENCODE3 (0x1F6F, 0x0345, 0x1FAF),
+     HB_CODEPOINT_ENCODE3 (0x1F70, 0x0345, 0x1FB2),   HB_CODEPOINT_ENCODE3 (0x1F74, 0x0345, 0x1FC2),
+     HB_CODEPOINT_ENCODE3 (0x1F7C, 0x0345, 0x1FF2),   HB_CODEPOINT_ENCODE3 (0x1FB6, 0x0345, 0x1FB7),
+     HB_CODEPOINT_ENCODE3 (0x1FBF, 0x0300, 0x1FCD),   HB_CODEPOINT_ENCODE3 (0x1FBF, 0x0301, 0x1FCE),
+     HB_CODEPOINT_ENCODE3 (0x1FBF, 0x0342, 0x1FCF),   HB_CODEPOINT_ENCODE3 (0x1FC6, 0x0345, 0x1FC7),
+     HB_CODEPOINT_ENCODE3 (0x1FF6, 0x0345, 0x1FF7),   HB_CODEPOINT_ENCODE3 (0x1FFE, 0x0300, 0x1FDD),
+     HB_CODEPOINT_ENCODE3 (0x1FFE, 0x0301, 0x1FDE),   HB_CODEPOINT_ENCODE3 (0x1FFE, 0x0342, 0x1FDF),
+     HB_CODEPOINT_ENCODE3 (0x2190, 0x0338, 0x219A),   HB_CODEPOINT_ENCODE3 (0x2192, 0x0338, 0x219B),
+     HB_CODEPOINT_ENCODE3 (0x2194, 0x0338, 0x21AE),   HB_CODEPOINT_ENCODE3 (0x21D0, 0x0338, 0x21CD),
+     HB_CODEPOINT_ENCODE3 (0x21D2, 0x0338, 0x21CF),   HB_CODEPOINT_ENCODE3 (0x21D4, 0x0338, 0x21CE),
+     HB_CODEPOINT_ENCODE3 (0x2203, 0x0338, 0x2204),   HB_CODEPOINT_ENCODE3 (0x2208, 0x0338, 0x2209),
+     HB_CODEPOINT_ENCODE3 (0x220B, 0x0338, 0x220C),   HB_CODEPOINT_ENCODE3 (0x2223, 0x0338, 0x2224),
+     HB_CODEPOINT_ENCODE3 (0x2225, 0x0338, 0x2226),   HB_CODEPOINT_ENCODE3 (0x223C, 0x0338, 0x2241),
+     HB_CODEPOINT_ENCODE3 (0x2243, 0x0338, 0x2244),   HB_CODEPOINT_ENCODE3 (0x2245, 0x0338, 0x2247),
+     HB_CODEPOINT_ENCODE3 (0x2248, 0x0338, 0x2249),   HB_CODEPOINT_ENCODE3 (0x224D, 0x0338, 0x226D),
+     HB_CODEPOINT_ENCODE3 (0x2261, 0x0338, 0x2262),   HB_CODEPOINT_ENCODE3 (0x2264, 0x0338, 0x2270),
+     HB_CODEPOINT_ENCODE3 (0x2265, 0x0338, 0x2271),   HB_CODEPOINT_ENCODE3 (0x2272, 0x0338, 0x2274),
+     HB_CODEPOINT_ENCODE3 (0x2273, 0x0338, 0x2275),   HB_CODEPOINT_ENCODE3 (0x2276, 0x0338, 0x2278),
+     HB_CODEPOINT_ENCODE3 (0x2277, 0x0338, 0x2279),   HB_CODEPOINT_ENCODE3 (0x227A, 0x0338, 0x2280),
+     HB_CODEPOINT_ENCODE3 (0x227B, 0x0338, 0x2281),   HB_CODEPOINT_ENCODE3 (0x227C, 0x0338, 0x22E0),
+     HB_CODEPOINT_ENCODE3 (0x227D, 0x0338, 0x22E1),   HB_CODEPOINT_ENCODE3 (0x2282, 0x0338, 0x2284),
+     HB_CODEPOINT_ENCODE3 (0x2283, 0x0338, 0x2285),   HB_CODEPOINT_ENCODE3 (0x2286, 0x0338, 0x2288),
+     HB_CODEPOINT_ENCODE3 (0x2287, 0x0338, 0x2289),   HB_CODEPOINT_ENCODE3 (0x2291, 0x0338, 0x22E2),
+     HB_CODEPOINT_ENCODE3 (0x2292, 0x0338, 0x22E3),   HB_CODEPOINT_ENCODE3 (0x22A2, 0x0338, 0x22AC),
+     HB_CODEPOINT_ENCODE3 (0x22A8, 0x0338, 0x22AD),   HB_CODEPOINT_ENCODE3 (0x22A9, 0x0338, 0x22AE),
+     HB_CODEPOINT_ENCODE3 (0x22AB, 0x0338, 0x22AF),   HB_CODEPOINT_ENCODE3 (0x22B2, 0x0338, 0x22EA),
+     HB_CODEPOINT_ENCODE3 (0x22B3, 0x0338, 0x22EB),   HB_CODEPOINT_ENCODE3 (0x22B4, 0x0338, 0x22EC),
+     HB_CODEPOINT_ENCODE3 (0x22B5, 0x0338, 0x22ED),   HB_CODEPOINT_ENCODE3 (0x2ADD, 0x0338, 0x0000),
+     HB_CODEPOINT_ENCODE3 (0x3046, 0x3099, 0x3094),   HB_CODEPOINT_ENCODE3 (0x304B, 0x3099, 0x304C),
+     HB_CODEPOINT_ENCODE3 (0x304D, 0x3099, 0x304E),   HB_CODEPOINT_ENCODE3 (0x304F, 0x3099, 0x3050),
+     HB_CODEPOINT_ENCODE3 (0x3051, 0x3099, 0x3052),   HB_CODEPOINT_ENCODE3 (0x3053, 0x3099, 0x3054),
+     HB_CODEPOINT_ENCODE3 (0x3055, 0x3099, 0x3056),   HB_CODEPOINT_ENCODE3 (0x3057, 0x3099, 0x3058),
+     HB_CODEPOINT_ENCODE3 (0x3059, 0x3099, 0x305A),   HB_CODEPOINT_ENCODE3 (0x305B, 0x3099, 0x305C),
+     HB_CODEPOINT_ENCODE3 (0x305D, 0x3099, 0x305E),   HB_CODEPOINT_ENCODE3 (0x305F, 0x3099, 0x3060),
+     HB_CODEPOINT_ENCODE3 (0x3061, 0x3099, 0x3062),   HB_CODEPOINT_ENCODE3 (0x3064, 0x3099, 0x3065),
+     HB_CODEPOINT_ENCODE3 (0x3066, 0x3099, 0x3067),   HB_CODEPOINT_ENCODE3 (0x3068, 0x3099, 0x3069),
+     HB_CODEPOINT_ENCODE3 (0x306F, 0x3099, 0x3070),   HB_CODEPOINT_ENCODE3 (0x306F, 0x309A, 0x3071),
+     HB_CODEPOINT_ENCODE3 (0x3072, 0x3099, 0x3073),   HB_CODEPOINT_ENCODE3 (0x3072, 0x309A, 0x3074),
+     HB_CODEPOINT_ENCODE3 (0x3075, 0x3099, 0x3076),   HB_CODEPOINT_ENCODE3 (0x3075, 0x309A, 0x3077),
+     HB_CODEPOINT_ENCODE3 (0x3078, 0x3099, 0x3079),   HB_CODEPOINT_ENCODE3 (0x3078, 0x309A, 0x307A),
+     HB_CODEPOINT_ENCODE3 (0x307B, 0x3099, 0x307C),   HB_CODEPOINT_ENCODE3 (0x307B, 0x309A, 0x307D),
+     HB_CODEPOINT_ENCODE3 (0x309D, 0x3099, 0x309E),   HB_CODEPOINT_ENCODE3 (0x30A6, 0x3099, 0x30F4),
+     HB_CODEPOINT_ENCODE3 (0x30AB, 0x3099, 0x30AC),   HB_CODEPOINT_ENCODE3 (0x30AD, 0x3099, 0x30AE),
+     HB_CODEPOINT_ENCODE3 (0x30AF, 0x3099, 0x30B0),   HB_CODEPOINT_ENCODE3 (0x30B1, 0x3099, 0x30B2),
+     HB_CODEPOINT_ENCODE3 (0x30B3, 0x3099, 0x30B4),   HB_CODEPOINT_ENCODE3 (0x30B5, 0x3099, 0x30B6),
+     HB_CODEPOINT_ENCODE3 (0x30B7, 0x3099, 0x30B8),   HB_CODEPOINT_ENCODE3 (0x30B9, 0x3099, 0x30BA),
+     HB_CODEPOINT_ENCODE3 (0x30BB, 0x3099, 0x30BC),   HB_CODEPOINT_ENCODE3 (0x30BD, 0x3099, 0x30BE),
+     HB_CODEPOINT_ENCODE3 (0x30BF, 0x3099, 0x30C0),   HB_CODEPOINT_ENCODE3 (0x30C1, 0x3099, 0x30C2),
+     HB_CODEPOINT_ENCODE3 (0x30C4, 0x3099, 0x30C5),   HB_CODEPOINT_ENCODE3 (0x30C6, 0x3099, 0x30C7),
+     HB_CODEPOINT_ENCODE3 (0x30C8, 0x3099, 0x30C9),   HB_CODEPOINT_ENCODE3 (0x30CF, 0x3099, 0x30D0),
+     HB_CODEPOINT_ENCODE3 (0x30CF, 0x309A, 0x30D1),   HB_CODEPOINT_ENCODE3 (0x30D2, 0x3099, 0x30D3),
+     HB_CODEPOINT_ENCODE3 (0x30D2, 0x309A, 0x30D4),   HB_CODEPOINT_ENCODE3 (0x30D5, 0x3099, 0x30D6),
+     HB_CODEPOINT_ENCODE3 (0x30D5, 0x309A, 0x30D7),   HB_CODEPOINT_ENCODE3 (0x30D8, 0x3099, 0x30D9),
+     HB_CODEPOINT_ENCODE3 (0x30D8, 0x309A, 0x30DA),   HB_CODEPOINT_ENCODE3 (0x30DB, 0x3099, 0x30DC),
+     HB_CODEPOINT_ENCODE3 (0x30DB, 0x309A, 0x30DD),   HB_CODEPOINT_ENCODE3 (0x30EF, 0x3099, 0x30F7),
+     HB_CODEPOINT_ENCODE3 (0x30F0, 0x3099, 0x30F8),   HB_CODEPOINT_ENCODE3 (0x30F1, 0x3099, 0x30F9),
+     HB_CODEPOINT_ENCODE3 (0x30F2, 0x3099, 0x30FA),   HB_CODEPOINT_ENCODE3 (0x30FD, 0x3099, 0x30FE),
+     HB_CODEPOINT_ENCODE3 (0xFB49, 0x05C1, 0x0000),   HB_CODEPOINT_ENCODE3 (0xFB49, 0x05C2, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x105D2, 0x0307, 0x105C9), HB_CODEPOINT_ENCODE3 (0x105DA, 0x0307, 0x105E4),
+  HB_CODEPOINT_ENCODE3 (0x11099, 0x110BA, 0x1109A),HB_CODEPOINT_ENCODE3 (0x1109B, 0x110BA, 0x1109C),
+  HB_CODEPOINT_ENCODE3 (0x110A5, 0x110BA, 0x110AB),HB_CODEPOINT_ENCODE3 (0x11131, 0x11127, 0x1112E),
+  HB_CODEPOINT_ENCODE3 (0x11132, 0x11127, 0x1112F),HB_CODEPOINT_ENCODE3 (0x11347, 0x1133E, 0x1134B),
+  HB_CODEPOINT_ENCODE3 (0x11347, 0x11357, 0x1134C),HB_CODEPOINT_ENCODE3 (0x11382, 0x113C9, 0x11383),
+  HB_CODEPOINT_ENCODE3 (0x11384, 0x113BB, 0x11385),HB_CODEPOINT_ENCODE3 (0x1138B, 0x113C2, 0x1138E),
+  HB_CODEPOINT_ENCODE3 (0x11390, 0x113C9, 0x11391),HB_CODEPOINT_ENCODE3 (0x113C2, 0x113B8, 0x113C7),
+  HB_CODEPOINT_ENCODE3 (0x113C2, 0x113C2, 0x113C5),HB_CODEPOINT_ENCODE3 (0x113C2, 0x113C9, 0x113C8),
+  HB_CODEPOINT_ENCODE3 (0x114B9, 0x114B0, 0x114BC),HB_CODEPOINT_ENCODE3 (0x114B9, 0x114BA, 0x114BB),
+  HB_CODEPOINT_ENCODE3 (0x114B9, 0x114BD, 0x114BE),HB_CODEPOINT_ENCODE3 (0x115B8, 0x115AF, 0x115BA),
+  HB_CODEPOINT_ENCODE3 (0x115B9, 0x115AF, 0x115BB),HB_CODEPOINT_ENCODE3 (0x11935, 0x11930, 0x11938),
+  HB_CODEPOINT_ENCODE3 (0x1611E, 0x1611E, 0x16121),HB_CODEPOINT_ENCODE3 (0x1611E, 0x1611F, 0x16123),
+  HB_CODEPOINT_ENCODE3 (0x1611E, 0x16120, 0x16125),HB_CODEPOINT_ENCODE3 (0x1611E, 0x16129, 0x16122),
+  HB_CODEPOINT_ENCODE3 (0x16121, 0x1611F, 0x16126),HB_CODEPOINT_ENCODE3 (0x16121, 0x16120, 0x16128),
+  HB_CODEPOINT_ENCODE3 (0x16122, 0x1611F, 0x16127),HB_CODEPOINT_ENCODE3 (0x16129, 0x1611F, 0x16124),
+  HB_CODEPOINT_ENCODE3 (0x16D63, 0x16D67, 0x16D69),HB_CODEPOINT_ENCODE3 (0x16D67, 0x16D67, 0x16D68),
+  HB_CODEPOINT_ENCODE3 (0x16D69, 0x16D67, 0x16D6A), HB_CODEPOINT_ENCODE3 (0x1D157, 0x1D165, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x1D158, 0x1D165, 0x0000), HB_CODEPOINT_ENCODE3 (0x1D15F, 0x1D16E, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x1D15F, 0x1D16F, 0x0000), HB_CODEPOINT_ENCODE3 (0x1D15F, 0x1D170, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x1D15F, 0x1D171, 0x0000), HB_CODEPOINT_ENCODE3 (0x1D15F, 0x1D172, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x1D1B9, 0x1D165, 0x0000), HB_CODEPOINT_ENCODE3 (0x1D1BA, 0x1D165, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x1D1BB, 0x1D16E, 0x0000), HB_CODEPOINT_ENCODE3 (0x1D1BB, 0x1D16F, 0x0000),
+   HB_CODEPOINT_ENCODE3 (0x1D1BC, 0x1D16E, 0x0000), HB_CODEPOINT_ENCODE3 (0x1D1BC, 0x1D16F, 0x0000),
 };
 
 #ifndef HB_OPTIMIZE_SIZE
 
-static const uint8_t
-_hb_ucd_u8[17612] =
+#include <stdint.h>
+
+static const uint8_t _hb_ucd_u8[19868]=
 {
-    0,  1,  2,  3,  4,  5,  5,  5,  5,  5,  6,  5,  5,  7,  8,  9,
-   10, 11, 12, 13, 14, 15, 16,  5, 17, 15, 18, 19, 20, 21, 22, 23,
-    5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 24, 25, 26,  5, 27, 28,
-    5, 29, 30, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   31, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 32,
-    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 33,
     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 17, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-   31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 33, 41, 42, 43, 44, 45,
-   46, 47, 48, 39, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 49, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   50, 17, 17, 17, 51, 17, 52, 53, 54, 55, 56, 57, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 58, 59, 59, 59, 59, 59, 59, 59, 59,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 17, 61, 62, 17, 63, 64, 65,
-   66, 67, 68, 69, 70, 71, 17, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-   81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
-   17, 17, 17, 97, 98, 99,100,100,100,100,100,100,100,100,100,101,
-   17, 17, 17, 17,102, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,103, 17, 17,104,100,100,100,100,100,100,100,100,100,
-  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
-  100,105,100,100,100,100,100,100, 17, 17,106,107,100,108,109,110,
-   17, 17, 17, 17, 17, 17, 17,111, 17, 17, 17, 17,112,113,100,100,
-  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,114,
-   17,115,116,100,100,100,100,100,100,100,100,100,117,100,100,100,
-  100,100,100,100,100,100,100,100,100,100,100,100,118, 39,119,120,
-  121,122,123,124,125,126,127,128, 39, 39,129,100,100,100,100,130,
-  131,132,133,100,134,135,100,136,137,138,100,100,139,140,141,100,
-  142,143,144,145, 39, 39,146,147,148, 39,149,150,100,100,100,100,
-   17, 17, 17, 17, 17, 17,151, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17,152,153, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,154, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,155, 17, 17,156,100,
-  100,100,100,100,100,100,100,100, 17, 17,157,100,100,100,100,100,
-   17, 17, 17,158, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,159,100,100,100,100,100,100,100,100,100,100,100,100,
-  160,161,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,162,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,163,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 27, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   28, 26, 29, 30, 31, 32, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 33, 34, 34, 34, 34,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+   26, 56, 57, 58, 58, 58, 58, 59, 26, 26, 60, 26, 26, 26, 26, 26,
+   26, 61, 26, 62, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   63, 58, 58, 58, 26, 64, 65, 66, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 67, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 68, 69, 70, 58, 58, 58, 58, 71, 58,
+   58, 58, 58, 58, 58, 58, 72, 73, 74, 75, 76, 77, 78, 79, 58, 80,
+   81, 82, 83, 84, 85, 58, 86, 87, 88, 89, 78, 90, 91, 92, 58, 58,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 93, 26, 26, 26, 26, 26, 26, 26, 26, 94, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 95, 26, 26, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 96, 26, 97, 58, 58, 58, 58, 26, 98, 58, 58,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 99, 26, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26, 26, 26, 26, 26,100, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+  101, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,102,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,103,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
     7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
    11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
@@ -1148,496 +914,529 @@ _hb_ucd_u8[17612] =
    34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
    34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
    32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
-   16, 16, 39, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 40,
-   40, 41, 41, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41,
-   40, 40, 42, 41, 41, 41, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41,
-   43, 43, 43, 43, 43, 43, 43, 43, 32, 32, 42, 32, 44, 45, 16, 10,
-   44, 44, 41, 46, 11, 47, 47, 11, 34, 11, 11, 11, 11, 11, 11, 11,
-   11, 48, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
-   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 49, 34, 32, 34, 11,
-   32, 50, 43, 43, 51, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
-   48, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 47, 52,  2,  2,  2,
-   16, 16, 16, 16, 53, 54, 55, 56, 57, 43, 43, 43, 43, 43, 43, 43,
-   43, 43, 43, 43, 43, 43, 43, 58, 59, 60, 43, 59, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44, 62,
-   36, 63, 64, 44, 44, 44, 44, 44, 65, 65, 65,  8,  9, 66,  2, 67,
-   43, 43, 43, 43, 43, 60, 68,  2, 69, 36, 36, 36, 36, 70, 43, 43,
-    7,  7,  7,  7,  7,  2,  2, 36, 71, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 72, 43, 43, 43, 73, 50, 43, 43, 74, 75, 76, 43, 43, 36,
-    7,  7,  7,  7,  7, 36, 77, 78,  2,  2,  2,  2,  2,  2,  2, 79,
-   70, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 80, 62, 36,
-   36, 36, 36, 43, 43, 43, 43, 43, 71, 44, 44, 44, 44, 44, 44, 44,
-    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 70, 43, 43,
-   43, 43, 40, 21,  2, 81, 57, 20, 36, 36, 36, 43, 43, 75, 43, 43,
-   43, 43, 75, 43, 75, 43, 43, 44,  2,  2,  2,  2,  2,  2,  2, 64,
-   36, 36, 36, 36, 70, 43, 44, 64, 36, 36, 36, 36, 36, 61, 44, 44,
-   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 57, 43, 43, 43, 43,
-   36, 36, 36, 36, 83, 43, 43, 43, 43, 84, 43, 43, 43, 43, 43, 43,
-   43, 85, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 85, 71, 86,
-   87, 43, 43, 43, 85, 86, 87, 86, 70, 43, 43, 43, 36, 36, 36, 36,
-   36, 43,  2,  7,  7,  7,  7,  7, 88, 36, 36, 36, 36, 36, 36, 36,
-   70, 86, 62, 36, 36, 36, 61, 62, 61, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 61, 36, 36, 36, 61, 61, 44, 36, 36, 44, 71, 86,
-   87, 43, 80, 89, 90, 89, 87, 61, 44, 44, 44, 89, 44, 44, 36, 62,
-   36, 43, 44,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 56, 63, 80,
-   57, 85, 62, 36, 36, 61, 44, 62, 61, 36, 62, 61, 36, 44, 80, 86,
-   87, 80, 44, 57, 80, 57, 43, 44, 57, 44, 44, 44, 62, 36, 61, 61,
-   44, 44, 44,  7,  7,  7,  7,  7, 43, 36, 70, 64, 44, 44, 44, 44,
-   57, 85, 62, 36, 36, 36, 36, 62, 36, 62, 36, 36, 36, 36, 36, 36,
-   61, 36, 62, 36, 36, 44, 71, 86, 87, 43, 43, 57, 85, 89, 87, 44,
-   61, 44, 44, 44, 44, 44, 44, 44, 66, 44, 44, 44, 62, 43, 43, 43,
-   57, 86, 62, 36, 36, 36, 61, 62, 61, 36, 62, 36, 36, 44, 71, 87,
-   87, 43, 80, 89, 90, 89, 87, 44, 44, 44, 57, 85, 44, 44, 36, 62,
-   78, 27, 27, 27, 44, 44, 44, 44, 44, 71, 62, 36, 36, 61, 44, 36,
-   61, 36, 36, 44, 62, 61, 61, 36, 44, 62, 61, 44, 36, 61, 44, 36,
-   36, 36, 36, 36, 36, 44, 44, 86, 85, 90, 44, 86, 90, 86, 87, 44,
-   61, 44, 44, 89, 44, 44, 44, 44, 27, 91, 67, 67, 56, 92, 44, 44,
-   85, 86, 71, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 44, 71, 43, 85, 86, 90, 43, 80, 43, 43, 44,
-   44, 44, 57, 80, 36, 61, 62, 44, 44, 44, 44, 93, 27, 27, 27, 91,
-   70, 86, 72, 36, 36, 36, 61, 36, 36, 36, 62, 36, 36, 44, 71, 87,
-   86, 86, 90, 85, 90, 86, 43, 44, 44, 44, 89, 90, 44, 44, 62, 61,
-   62, 94, 44, 44, 44, 44, 44, 44, 43, 86, 36, 36, 36, 36, 61, 36,
-   36, 36, 36, 36, 36, 70, 71, 86, 87, 43, 80, 86, 90, 86, 87, 77,
-   44, 44, 36, 94, 27, 27, 27, 95, 27, 27, 27, 27, 91, 36, 36, 36,
-   57, 86, 62, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44, 36, 36, 36,
-   36, 62, 36, 36, 36, 36, 62, 44, 36, 36, 36, 61, 44, 80, 44, 89,
-   86, 43, 80, 80, 86, 86, 86, 86, 44, 86, 64, 44, 44, 44, 44, 44,
-   62, 36, 36, 36, 36, 36, 36, 36, 70, 36, 43, 43, 43, 80, 44, 96,
-   36, 36, 36, 75, 43, 43, 43, 60,  7,  7,  7,  7,  7,  2, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 62, 61, 61, 36, 36, 61, 36, 36,
-   36, 36, 62, 62, 36, 36, 36, 36, 70, 36, 43, 43, 43, 43, 71, 44,
-   36, 36, 61, 81, 43, 43, 43, 80,  7,  7,  7,  7,  7, 44, 36, 36,
-   77, 67,  2,  2,  2,  2,  2,  2,  2, 97, 97, 67, 43, 67, 67, 67,
-    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 50, 50, 50,  4,  4, 86,
-   36, 36, 36, 36, 62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44,
-   57, 43, 43, 43, 43, 43, 43, 85, 43, 43, 60, 43, 36, 36, 70, 43,
-   43, 43, 43, 43, 57, 43, 43, 43, 43, 43, 43, 43, 43, 43, 80, 67,
-   67, 67, 67, 76, 67, 67, 92, 67,  2,  2, 97, 67, 21, 64, 44, 44,
-   36, 36, 36, 36, 36, 94, 87, 43, 85, 43, 43, 43, 87, 85, 87, 71,
-    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 86, 43, 36, 36, 43,
-   71, 86, 98, 94, 86, 86, 86, 36, 70, 43, 71, 36, 36, 36, 36, 36,
-   36, 85, 87, 85, 86, 86, 87, 94,  7,  7,  7,  7,  7, 86, 87, 67,
-   11, 11, 11, 48, 44, 44, 48, 44, 16, 16, 16, 16, 16, 53, 45, 16,
-   36, 36, 36, 36, 61, 36, 36, 44, 36, 36, 36, 61, 61, 36, 36, 44,
-   61, 36, 36, 44, 36, 36, 36, 61, 61, 36, 36, 44, 36, 36, 36, 36,
-   36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 57, 43,
-    2,  2,  2,  2, 99, 27, 27, 27, 27, 27, 27, 27, 27, 27,100, 44,
-   67, 67, 67, 67, 67, 44, 44, 44, 11, 11, 11, 44, 16, 16, 16, 44,
-  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 77, 72,
-  102, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,103,104, 44,
-   36, 36, 36, 36, 36, 63,  2,105,106, 36, 36, 36, 61, 44, 44, 44,
-   36, 43, 85, 44, 44, 44, 44, 62, 36, 43,107, 64, 44, 44, 44, 44,
-   36, 43, 44, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 61, 36,
-   61, 43, 44, 44, 44, 44, 44, 44, 36, 36, 43, 87, 43, 43, 43, 86,
-   86, 86, 86, 85, 87, 43, 43, 43, 43, 43,  2, 88,  2, 66, 70, 44,
-    7,  7,  7,  7,  7, 44, 44, 44, 27, 27, 27, 27, 27, 44, 44, 44,
-    2,  2,  2,108,  2, 59, 43, 84, 36, 83, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 61, 44, 44, 44, 36, 36, 70, 71, 36, 36, 36, 36,
-   36, 36, 36, 36, 70, 61, 44, 44, 36, 36, 36, 44, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 61, 43, 85, 86, 87, 85, 86, 44, 44,
-   86, 85, 86, 86, 87, 43, 44, 44, 92, 44,  2,  7,  7,  7,  7,  7,
-   36, 36, 36, 36, 36, 36, 36, 44, 36, 36, 61, 44, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 44, 44, 36, 36, 36, 36, 36, 44, 44, 44,
-    7,  7,  7,  7,  7,100, 44, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-   36, 36, 36, 70, 85, 87, 44,  2, 36, 36, 94, 85, 43, 43, 43, 80,
-   85, 85, 87, 43, 43, 43, 85, 86, 86, 87, 43, 43, 43, 43, 80, 57,
-    2,  2,  2, 88,  2,  2,  2, 44, 43, 43, 43, 43, 43, 43, 43,109,
-   43, 43, 43, 43, 43, 43, 43, 80, 43, 43, 98, 36, 36, 36, 36, 36,
-   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61,  2,
-   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21,  2,
-   43, 98, 36, 36, 36, 36, 36, 36, 94, 43, 43, 86, 43, 87, 43, 36,
-   36, 36, 36, 85, 43, 86, 87, 87, 43, 86, 44, 44, 44, 44,  2,  2,
-   36, 36, 86, 86, 86, 86, 43, 43, 43, 43, 86, 43, 44, 93,  2,  2,
-    7,  7,  7,  7,  7, 44, 62, 36, 36, 36, 36, 36, 40, 40, 40,  2,
-   16, 16, 16, 16, 34,110, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
-    2,  2,  2,  2, 44, 44, 44, 44, 43, 60, 43, 43, 43, 43, 43, 43,
-   85, 43, 43, 43, 71, 36, 70, 36, 36, 36, 71, 94, 43, 61, 44, 44,
-   16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 45, 16, 16,
-   16, 16, 16, 16, 45, 16, 16, 16, 16, 16, 16, 16, 16,111, 40, 40,
-   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
-   16, 16, 16, 44, 11, 11, 11, 44, 16, 16, 16, 16, 48, 48, 48, 48,
-   16, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16, 16,112,112,112,112,
-   16, 16,110, 16, 11, 11,113,114, 41, 16,110, 16, 11, 11,113, 41,
-   16, 16, 44, 16, 11, 11,115, 41, 16, 16, 16, 16, 11, 11,116, 41,
-   44, 16,110, 16, 11, 11,113,117,118,118,118,118,118,119, 65, 65,
-  120,120,120,  2,121,122,121,122,  2,  2,  2,  2,123, 65, 65,124,
-    2,  2,  2,  2,125,126,  2,127,128,  2,129,130,  2,  2,  2,  2,
-    2,  9,128,  2,  2,  2,  2,131, 65, 65,132, 65, 65, 65, 65, 65,
-  133, 44, 27, 27, 27,  8,129,134, 27, 27, 27, 27, 27,  8,129,104,
-   40, 40, 40, 40, 40, 40, 81, 44, 20, 20, 20, 20, 20, 20, 20, 20,
-  135, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43,136, 51,
-  109, 51,109, 43, 43, 43, 43, 43, 80, 44, 44, 44, 44, 44, 44, 44,
-   67,137, 67,138, 67, 34, 11, 16, 11, 32,138, 67, 49, 11, 11, 67,
-   67, 67,137,137,137, 11, 11,139, 11, 11, 35, 36, 39, 67, 16, 11,
-    8,  8, 49, 16, 16, 26, 67,140, 27, 27, 27, 27, 27, 27, 27, 27,
-  105,105,105,105,105,105,105,105,105,141,142,105,143, 67, 44, 44,
-    8,  8,144, 67, 67,  8, 67, 67,144, 26, 67,144, 67, 67, 67,144,
-   67, 67, 67, 67, 67, 67, 67,  8, 67,144,144, 67, 67, 67, 67, 67,
-   67, 67,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-   67, 67, 67, 67,  4,  4, 67, 67,  8, 67, 67, 67,145,146, 67, 67,
-   67, 67, 67, 67, 67, 67,144, 67, 67, 67, 67, 67, 67, 26,  8,  8,
-    8,  8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,
-    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44,
-   27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27,
-   67, 67, 67, 26, 67, 67, 67, 67, 26, 67, 67, 67, 67, 67, 67, 67,
-   67, 67, 67, 67,  8,  8,  8,  8, 67, 67, 67, 67, 67, 67, 67, 26,
-   67, 67, 67, 67,  4,  4,  4,  4,  4,  4,  4, 27, 27, 27, 27, 27,
-   27, 27, 67, 67, 67, 67, 67, 67,  8,  8,129,147,  8,  8,  8,  8,
-    8,  8,  8,  4,  4,  4,  4,  4,  8,129,148,148,148,148,148,148,
-  148,148,148,148,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  8,  8,
-    8,  8,  8,  8,  8,  8,  4,  8,  8,  8,144, 26,  8,  8,144, 67,
-   67, 67, 44, 67, 67, 67, 67, 67, 67, 67, 67, 55, 67, 67, 67, 67,
-   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 40, 11,
-   32, 32,140, 67, 67,138, 34,149, 43, 32, 44, 44, 93,  2, 99,  2,
-   16, 16, 16,150, 44, 44,150, 44, 36, 36, 36, 36, 44, 44, 44, 52,
-   64, 44, 44, 44, 44, 44, 44, 57, 36, 36, 36, 61, 44, 44, 44, 44,
-   36, 36, 36, 61, 36, 36, 36, 61,  2,121,121,  2,125,126,121,  2,
-    2,  2,  2,  6,  2,108,121,  2,121,  4,  4,  4,  4,  2,  2, 88,
-    2,  2,  2,  2,  2,120,  2,  2,108,151,  2,  2,  2,  2,  2,  2,
-   67,  2,152,148,148,148,153, 44, 67, 67, 67, 67, 67, 55, 67, 67,
-   67, 67, 44, 44, 44, 44, 44, 44, 67, 67, 67, 44, 44, 44, 44, 44,
-    1,  2,154,155,  4,  4,  4,  4,  4, 67,  4,  4,  4,  4,156,157,
-  158,105,105,105,105, 43, 43, 86,159, 40, 40, 67,105,160, 63, 67,
-   36, 36, 36, 61, 57,161,162, 69, 36, 36, 36, 36, 36, 63, 40, 69,
-   44, 44, 62, 36, 36, 36, 36, 36, 67, 27, 27, 67, 67, 67, 67, 67,
-   67, 67, 67, 44, 44, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67, 92,
-   27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27, 27,
-  163, 27, 27, 27, 27, 27, 27, 27, 36, 36, 83, 36, 36, 36, 36, 36,
-   67, 67, 67, 92, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36,164,  2,
-    7,  7,  7,  7,  7, 36, 44, 44, 32, 32, 32, 32, 32, 32, 32, 70,
-   51,165, 43, 43, 43, 43, 43, 88, 32, 32, 32, 32, 32, 32, 40, 43,
-   36, 36, 36,105,105,105,105,105, 43,  2,  2,  2, 44, 44, 44, 44,
-   41, 41, 41,162, 40, 40, 40, 40, 41, 32, 32, 32, 32, 32, 32, 32,
-   16, 32, 32, 32, 32, 32, 32, 32, 45, 16, 16, 16, 34, 34, 34, 32,
-   32, 32, 32, 32, 42,166, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   16, 16, 36, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+   39, 39, 41, 40, 40, 40, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40,
+   42, 42, 42, 42, 42, 42, 42, 42, 32, 32, 41, 32, 43, 44, 16, 10,
+   43, 43, 40, 45, 11, 46, 46, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 47, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 48, 34, 32, 34, 11,
+   32, 49, 42, 42, 50, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   47, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 46, 51,  2,  2,  2,
+   16, 16, 16, 16, 52, 53, 54, 55, 56, 42, 42, 42, 42, 42, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 57, 58, 59, 42, 58, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 61,
+   36, 62, 63, 43, 43, 43, 43, 43, 64, 64, 64,  8,  9, 65,  2, 66,
+   42, 42, 42, 42, 42, 59, 67,  2, 68, 36, 36, 36, 36, 69, 42, 42,
+    7,  7,  7,  7,  7,  2,  2, 36, 70, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 71, 42, 42, 42, 72, 49, 42, 42, 73, 74, 75, 42, 42, 36,
+    7,  7,  7,  7,  7, 36, 76, 77,  2,  2,  2,  2,  2,  2,  2, 78,
+   69, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 79, 61, 36,
+   36, 36, 36, 42, 42, 42, 42, 42, 70, 43, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42,
+   42, 42, 39, 21,  2, 80, 56, 20, 36, 36, 36, 42, 42, 74, 42, 42,
+   42, 42, 74, 42, 74, 42, 42, 43,  2,  2,  2,  2,  2,  2,  2, 63,
+   36, 36, 36, 36, 69, 42, 43, 63, 36, 36, 36, 36, 36, 60, 43, 43,
+   36, 36, 36, 36, 81, 36, 36, 36, 64, 43, 43, 56, 42, 42, 42, 42,
+   36, 36, 36, 36, 82, 42, 42, 42, 42, 83, 42, 42, 42, 42, 42, 42,
+   42, 84, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 84, 70, 85,
+   86, 42, 42, 42, 84, 85, 86, 85, 69, 42, 42, 42, 36, 36, 36, 36,
+   36, 42,  2,  7,  7,  7,  7,  7, 87, 36, 36, 36, 36, 36, 36, 36,
+   69, 85, 61, 36, 36, 36, 60, 61, 60, 61, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 36, 36, 36, 60, 60, 43, 36, 36, 43, 70, 85,
+   86, 42, 79, 88, 89, 88, 86, 60, 43, 43, 43, 88, 43, 43, 36, 61,
+   36, 42, 43,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 55, 62, 79,
+   56, 84, 61, 36, 36, 60, 43, 61, 60, 36, 61, 60, 36, 43, 79, 85,
+   86, 79, 43, 56, 79, 56, 42, 43, 56, 43, 43, 43, 61, 36, 60, 60,
+   43, 43, 43,  7,  7,  7,  7,  7, 42, 36, 69, 63, 43, 43, 43, 43,
+   56, 84, 61, 36, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36,
+   60, 36, 61, 36, 36, 43, 70, 85, 86, 42, 42, 56, 84, 88, 86, 43,
+   60, 43, 43, 43, 43, 43, 43, 43, 65, 43, 43, 43, 61, 42, 42, 42,
+   56, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 43, 70, 86,
+   86, 42, 79, 88, 89, 88, 86, 43, 43, 43, 56, 84, 43, 43, 36, 61,
+   77, 27, 27, 27, 43, 43, 43, 43, 43, 70, 61, 36, 36, 60, 43, 36,
+   60, 36, 36, 43, 61, 60, 60, 36, 43, 61, 60, 43, 36, 60, 43, 36,
+   36, 36, 36, 36, 36, 43, 43, 85, 84, 89, 43, 85, 89, 85, 86, 43,
+   60, 43, 43, 88, 43, 43, 43, 43, 27, 90, 66, 66, 55, 91, 43, 43,
+   84, 85, 70, 36, 36, 36, 60, 36, 60, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 43, 70, 42, 84, 85, 89, 42, 79, 42, 42, 43,
+   43, 43, 56, 79, 36, 60, 36, 43, 43, 43, 43, 92, 27, 27, 27, 90,
+   69, 85, 71, 36, 36, 36, 60, 36, 36, 36, 61, 36, 36, 43, 70, 86,
+   85, 85, 89, 84, 89, 85, 42, 43, 43, 43, 88, 89, 43, 43, 36, 60,
+   61, 93, 43, 43, 43, 43, 43, 43, 42, 85, 36, 36, 36, 36, 60, 36,
+   36, 36, 36, 36, 36, 69, 70, 85, 86, 42, 79, 85, 89, 85, 86, 76,
+   43, 43, 36, 93, 27, 27, 27, 94, 27, 27, 27, 27, 90, 36, 36, 36,
+   56, 85, 61, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 36, 36, 36,
+   36, 61, 36, 36, 36, 36, 61, 43, 36, 36, 36, 60, 43, 79, 43, 88,
+   85, 42, 79, 79, 85, 85, 85, 85, 43, 85, 63, 43, 43, 43, 43, 43,
+   61, 36, 36, 36, 36, 36, 36, 36, 69, 36, 42, 42, 42, 79, 43, 95,
+   36, 36, 36, 74, 42, 42, 42, 59,  7,  7,  7,  7,  7,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 61, 60, 60, 36, 36, 60, 36, 36,
+   36, 36, 61, 61, 36, 36, 36, 36, 69, 36, 42, 42, 42, 42, 70, 43,
+   36, 36, 60, 80, 42, 42, 42, 79,  7,  7,  7,  7,  7, 43, 36, 36,
+   76, 66,  2,  2,  2,  2,  2,  2,  2, 96, 96, 66, 42, 66, 66, 66,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 49, 49, 49,  4,  4, 85,
+   36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43,
+   56, 42, 42, 42, 42, 42, 42, 84, 42, 42, 59, 42, 36, 36, 69, 42,
+   42, 42, 42, 42, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 79, 66,
+   66, 66, 66, 75, 66, 66, 91, 66,  2,  2, 96, 66, 21, 63, 43, 43,
+   36, 36, 36, 36, 36, 93, 86, 42, 84, 42, 42, 42, 86, 84, 86, 70,
+    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 85, 42, 36, 36, 42,
+   70, 85, 97, 93, 85, 85, 85, 36, 69, 42, 70, 36, 36, 36, 36, 36,
+   36, 84, 86, 84, 85, 85, 86, 93,  7,  7,  7,  7,  7, 85, 86, 66,
+   11, 11, 11, 47, 43, 43, 47, 43, 16, 16, 16, 16, 16, 52, 44, 16,
+   36, 36, 36, 36, 60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43,
+   60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43, 36, 36, 36, 36,
+   36, 36, 36, 60, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 56, 42,
+    2,  2,  2,  2, 98, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43,
+   66, 66, 66, 66, 66, 43, 43, 43, 11, 11, 11, 43, 16, 16, 16, 43,
+  100, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 71,
+  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,102,103, 43,
+   36, 36, 36, 36, 36, 62,  2,104,105, 36, 36, 36, 60, 43, 43, 43,
+   36, 42, 84, 43, 43, 43, 43, 61, 36, 42,106, 63, 43, 43, 43, 43,
+   36, 42, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36, 60, 36,
+   60, 42, 43, 43, 43, 43, 43, 43, 36, 36, 42, 86, 42, 42, 42, 85,
+   85, 85, 85, 84, 86, 42, 42, 42, 42, 42,  2, 87,  2, 65, 69, 43,
+    7,  7,  7,  7,  7, 43, 43, 43, 27, 27, 27, 27, 27, 43, 43, 43,
+    2,  2,  2,107,  2, 58, 42, 83, 36, 82, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 43, 43, 43, 36, 36, 69, 70, 36, 36, 36, 36,
+   36, 36, 36, 36, 69, 60, 43, 43, 36, 36, 36, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 60, 42, 84, 85, 86, 84, 85, 43, 43,
+   85, 84, 85, 85, 86, 42, 43, 43, 91, 43,  2,  7,  7,  7,  7,  7,
+   36, 36, 36, 36, 36, 36, 36, 43, 36, 36, 60, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 43, 43, 36, 36, 36, 36, 36, 43, 43, 43,
+    7,  7,  7,  7,  7, 99, 43, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+   36, 36, 36, 69, 84, 86, 43,  2, 36, 36, 93, 84, 42, 42, 42, 79,
+   84, 84, 86, 42, 42, 42, 84, 85, 85, 86, 42, 42, 42, 42, 79, 56,
+    2,  2,  2, 87,  2,  2,  2, 43, 42, 42, 42, 42, 42, 42, 42,108,
+   42, 42, 42, 42, 42, 42, 42, 43, 42, 42, 42, 42, 42, 42, 43, 43,
+   42, 42, 97, 36, 36, 36, 36, 36, 36, 36, 84, 42, 42, 84, 84, 85,
+   85, 84, 97, 36, 36, 36, 60,  2, 96, 66, 66, 66, 66, 49, 42, 42,
+   42, 42, 66, 66, 66, 66, 21,  2, 42, 97, 36, 36, 36, 36, 36, 36,
+   93, 42, 42, 85, 42, 86, 42, 36, 36, 36, 36, 84, 42, 85, 86, 86,
+   42, 85, 43, 43, 43, 43,  2,  2, 36, 36, 85, 85, 85, 85, 42, 42,
+   42, 42, 85, 42, 43, 92,  2,  2,  7,  7,  7,  7,  7, 43, 61, 36,
+   36, 36, 36, 36, 39, 39, 39,  2, 16, 16, 16, 16, 34,109, 43, 43,
+   11, 11, 11, 11, 11, 46, 47, 11,  2,  2,  2,  2, 43, 43, 43, 43,
+   42, 59, 42, 42, 42, 42, 42, 42, 84, 42, 42, 42, 70, 36, 69, 36,
+   36, 36, 70, 93, 42, 60, 43, 43, 16, 16, 16, 16, 16, 16, 39, 39,
+   39, 39, 39, 39, 39, 44, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16,
+   16, 16, 16, 16, 16,110, 39, 39, 32, 32, 32, 16, 16, 16, 16, 32,
+   16, 16, 16, 16, 11, 11, 11, 11, 16, 16, 16, 43, 11, 11, 11, 43,
+   16, 16, 16, 16, 47, 47, 47, 47, 16, 16, 16, 16, 16, 16, 16, 43,
+   16, 16, 16, 16,111,111,111,111, 16, 16,109, 16, 11, 11,112,113,
+   40, 16,109, 16, 11, 11,112, 40, 16, 16, 43, 16, 11, 11,114, 40,
+   16, 16, 16, 16, 11, 11,115, 40, 43, 16,109, 16, 11, 11,112,116,
+  117,117,117,117,117,118, 64, 64,119,119,119,  2,120,121,120,121,
+    2,  2,  2,  2,122, 64, 64,123,  2,  2,  2,  2,124,125,  2,126,
+  127,  2,128,129,  2,  2,  2,  2,  2,  9,127,  2,  2,  2,  2,130,
+   64, 64,131, 64, 64, 64, 64, 64,132, 43, 27, 27, 27,  8,128,133,
+   27, 27, 27, 27, 27,  8,128,103, 39, 39, 39, 39, 39, 39, 80, 43,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 43, 43, 43, 43, 43, 43, 43,
+   42, 42, 42, 42, 42, 42,134, 50,108, 50,108, 42, 42, 42, 42, 42,
+   79, 43, 43, 43, 43, 43, 43, 43, 66,135, 66,136, 66, 34, 11, 16,
+   11, 32,136, 66, 48, 11, 11, 66, 66, 66,135,135,135, 11, 11,137,
+   11, 11, 35, 36,138, 66, 16, 11,  8,  8, 48, 16, 16, 26, 66,139,
+   27, 27, 27, 27, 27, 27, 27, 27,104,104,104,104,104,104,104,104,
+  104,140,141,104,142, 66, 43, 43,  8,  8,143, 66, 66,  8, 66, 66,
+  143, 26, 66,143, 66, 66, 66,143, 66, 66, 66, 66, 66, 66, 66,  8,
+   66,143,143, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8, 66, 66, 66, 66,  4,  4, 66, 66,
+    8, 66, 66, 66,144,145, 66, 66, 66, 66, 66, 66, 66, 66,143, 66,
+   66, 66, 66, 66, 66, 26,  8,  8,  8,  8, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 66,  8,  8,  8, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 91, 43, 43, 27, 27, 27, 27, 27, 27, 66, 66,
+   66, 66, 66, 66, 66, 27, 27, 27, 66, 66, 66, 26, 66, 66, 66, 66,
+   26, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,
+   66, 66, 66, 66, 66, 66, 66, 26, 66, 66, 66, 66,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66,
+    8,  8,128,146,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,128,147,147,147,147,147,147,147,147,147,147,146,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,143, 26,  8,  8,143, 66, 66, 66, 43, 66, 66, 66, 66, 66,
+   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 39, 11,
+   32, 32,139, 66, 66,136, 34,148, 42, 32, 43, 43, 92,  2, 98,  2,
+   16, 16, 16,149, 43, 43,149, 43, 36, 36, 36, 36, 43, 43, 43, 51,
+   63, 43, 43, 43, 43, 43, 43, 56, 36, 36, 36, 60, 43, 43, 43, 43,
+   36, 36, 36, 60, 36, 36, 36, 60,  2,120,120,  2,124,125,120,  2,
+    2,  2,  2,  6,  2,107,120,  2,120,  4,  4,  4,  4,  2,  2, 87,
+    2,  2,  2,  2,  2,119,  2,  2,107,150,  2,  2,  2,  2,  2,  2,
+   66,  2,151,147,147,147,152, 43, 66, 66, 66, 66, 66, 54, 66, 66,
+   66, 66, 43, 43, 43, 43, 43, 43, 66, 66, 66, 43, 43, 43, 43, 43,
+    1,  2,153,154,  4,  4,  4,  4,  4, 66,  4,  4,  4,  4,155,156,
+  157,104,104,104,104, 42, 42, 85,158, 39, 39, 66,104,159, 62, 66,
+   36, 36, 36, 60, 56,160,161, 68, 36, 36, 36, 36, 36, 62, 39, 68,
+   43, 43, 61, 36, 36, 36, 36, 36, 66, 27, 27, 66, 66, 66, 66, 66,
+   66, 66, 66, 43, 43, 43, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91,
+   27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27,
+  162, 27, 27, 27, 27, 27, 27, 27, 36, 36, 82, 36, 36, 36, 36, 36,
+   66, 66, 66, 91, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36,163,  2,
+    7,  7,  7,  7,  7, 36, 43, 43, 32, 32, 32, 32, 32, 32, 32, 69,
+   50,164, 42, 42, 42, 42, 42, 87, 32, 32, 32, 32, 32, 32, 39, 42,
+   36, 36, 36,104,104,104,104,104, 42,  2,  2,  2, 43, 43, 43, 43,
+   40, 40, 40,161, 39, 39, 39, 39, 40, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 44, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 41,165, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
    32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
-   32, 32, 11, 11, 34, 34, 32, 44, 32,150,150, 32, 32, 32, 47, 44,
-   44, 40,167, 35, 40, 35, 36, 36, 36, 71, 36, 71, 36, 70, 36, 36,
-   36, 94, 87, 85, 67, 67, 80, 44, 27, 27, 27, 67,168, 44, 44, 44,
-   36, 36,  2,  2, 44, 44, 44, 44, 86, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 86, 86, 86, 86, 86, 86, 86, 86, 43, 44, 44, 44, 44,  2,
-   43, 36, 36, 36,  2, 72, 72, 70, 36, 36, 36, 43, 43, 43, 43,  2,
-   36, 36, 36, 70, 43, 43, 43, 43, 43, 86, 44, 44, 44, 44, 44, 93,
-   36, 70, 86, 43, 43, 86, 43, 86,107,  2,  2,  2,  2,  2,  2, 52,
-    7,  7,  7,  7,  7, 44, 44,  2, 36, 36, 70, 69, 36, 36, 36, 36,
-    7,  7,  7,  7,  7, 36, 36, 61, 36, 36, 36, 36, 70, 43, 43, 85,
-   87, 85, 87, 80, 44, 44, 44, 44, 36, 70, 36, 36, 36, 36, 85, 44,
-    7,  7,  7,  7,  7, 44,  2,  2, 69, 36, 36, 77, 67, 94, 85, 36,
-   71, 43, 71, 70, 71, 36, 36, 43, 70, 61, 44, 44, 44, 44, 44, 44,
-   44, 44, 44, 44, 44, 62, 83,  2, 36, 36, 36, 36, 36, 94, 43, 86,
-    2, 83,169, 80, 44, 44, 44, 44, 62, 36, 36, 61, 62, 36, 36, 61,
-   62, 36, 36, 61, 44, 44, 44, 44, 16, 16, 16, 16, 16,114, 40, 40,
-   16, 16, 16, 16,111, 41, 44, 44, 36, 94, 87, 86, 85,107, 87, 44,
-   36, 36, 44, 44, 44, 44, 44, 44, 36, 36, 36, 61, 44, 62, 36, 36,
-  170,170,170,170,170,170,170,170,171,171,171,171,171,171,171,171,
-   16, 16, 16,110, 44, 44, 44, 44, 44,150, 16, 16, 44, 44, 62, 71,
-   36, 36, 36, 36,172, 36, 36, 36, 36, 36, 36, 61, 36, 36, 61, 61,
-   36, 62, 61, 36, 36, 36, 36, 36, 36, 41, 41, 41, 41, 41, 41, 41,
-   41,117, 44, 44, 44, 44, 44, 44, 44, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36,148, 44, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 44, 44, 44, 55, 36, 36, 36, 36, 36, 36,168, 67,
-    2,  2,  2,152,130, 44, 44, 44,  6,173,174,148,148,148,148,148,
-  148,148,130,152,130,  2,127,175,  2, 64,  2,  2,156,148,148,130,
-    2,176,  8,177, 66,  2, 44, 44, 36, 36, 61, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 61, 79, 93,  2,  3,  2,  4,  5,  6,  2,
-   16, 16, 16, 16, 16, 17, 18,129,130,  4,  2, 36, 36, 36, 36, 36,
-   69, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 40,
-   44, 36, 36, 36, 44, 36, 36, 36, 44, 36, 36, 36, 44, 36, 61, 44,
-   20,178, 56,135, 26,  8,144, 92, 44, 44, 44, 44, 79, 65, 67, 44,
-   36, 36, 36, 36, 36, 36, 62, 36, 36, 36, 36, 36, 36, 61, 36, 62,
-    2, 64, 44,179, 27, 27, 27, 27, 27, 27, 44, 55, 67, 67, 67, 67,
-  105,105,143, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 27, 67, 92,
-   67, 67, 67, 67, 67, 67, 92, 44, 92, 44, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 67, 50, 44,180, 27, 27, 27, 27, 27, 27, 27,
-   27, 27, 27, 27, 27, 27, 44, 44, 27, 27, 44, 44, 44, 44, 62, 36,
-  155, 36, 36, 36, 36,181, 44, 44, 36, 36, 36, 43, 43, 80, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 93, 36, 36, 44, 44, 36, 36, 36, 36,
-  182,105,105, 44, 44, 44, 44, 44, 11, 11, 11, 11, 16, 16, 16, 16,
-   11, 11, 44, 44, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 44, 44,
-   36, 36, 36, 36, 44, 44, 44, 44, 36, 36, 44, 44, 44, 44, 44, 93,
-   11, 11, 11, 11, 11, 47, 11, 11, 11, 47, 11,150, 16, 16, 16, 16,
-   16,150, 16, 16, 16, 16, 16, 16, 16,150, 16, 16, 16,150,110, 44,
-   40, 40, 40, 52, 40, 40, 40, 40, 81, 40, 40, 40, 40, 81, 44, 44,
-   36, 36, 36, 44, 61, 36, 36, 36, 36, 36, 36, 62, 61, 44, 61, 62,
-   36, 36, 36, 93, 27, 27, 27, 27, 36, 36, 36, 77,163, 27, 27, 27,
-   44, 44, 44,179, 27, 27, 27, 27, 36, 61, 36, 44, 44,179, 27, 27,
-   36, 36, 36, 27, 27, 27, 44, 93, 36, 36, 36, 36, 36, 44, 44, 93,
-   36, 36, 36, 36, 44, 44, 27, 36, 44, 27, 27, 27, 27, 27, 27, 27,
-   70, 43, 57, 80, 44, 44, 43, 43, 36, 36, 62, 36, 62, 36, 36, 36,
-   36, 36, 36, 44, 43, 80, 44, 57, 27, 27, 27, 27,100, 44, 44, 44,
-    2,  2,  2,  2, 64, 44, 44, 44, 36, 36, 36, 36, 36, 36,183, 30,
-   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 78, 36, 36, 36,
-   36, 36, 70, 80, 44,179, 27, 27,  2,  2,  2, 64, 44, 44, 44, 44,
-   36, 36, 36, 44, 93,  2,  2,  2, 36, 36, 36, 44, 27, 27, 27, 27,
-   36, 61, 44, 44, 27, 27, 27, 27, 36, 44, 44, 44, 93,  2, 64, 44,
-   44, 44, 44, 44,179, 27, 27, 27, 11, 47, 44, 44, 44, 44, 44, 44,
-   16,110, 44, 44, 44, 27, 27, 27, 36, 36, 43, 43, 44, 44, 44, 44,
-    7,  7,  7,  7,  7, 36, 36, 69, 11, 11, 11, 44, 57, 43, 43,159,
-   16, 16, 16, 44, 44, 44, 44,  8, 27, 27, 27, 27, 27, 27, 27,100,
-   36, 36, 36, 36, 36, 57,184, 44, 36, 44, 44, 44, 44, 44, 44, 44,
-   44, 36, 61, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 43, 43,
-   27, 27, 27, 95, 44, 44, 44, 44,180, 27, 30,  2,  2, 44, 44, 44,
-   36, 43, 43,  2,  2, 44, 44, 44, 36, 36,183, 27, 27, 27, 44, 44,
-   87, 98, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43,
-   43, 43, 43, 60,  2,  2,  2, 44, 27, 27, 27,  7,  7,  7,  7,  7,
-   71, 70, 71, 44, 44, 44, 44, 57, 86, 87, 43, 85, 87, 60,185,  2,
-    2, 80, 44, 44, 44, 44, 79, 44, 43, 71, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 70, 43, 43, 87, 43, 43, 43, 80,  7,  7,  7,  7,  7,
-    2,  2, 94, 98, 44, 44, 44, 44, 36, 70,  2, 61, 44, 44, 44, 44,
-   36, 94, 86, 43, 43, 43, 43, 85, 98, 36, 63,  2, 59, 43, 60, 87,
-    7,  7,  7,  7,  7, 63, 63,  2,179, 27, 27, 27, 27, 27, 27, 27,
-   27, 27,100, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 86, 87,
-   43, 86, 85, 43,  2,  2,  2, 71, 70, 44, 44, 44, 44, 44, 44, 44,
-   36, 36, 36, 61, 61, 36, 36, 62, 36, 36, 36, 36, 36, 36, 36, 62,
-   36, 36, 36, 36, 63, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 70,
-   86, 87, 43, 43, 43, 80, 44, 44, 43, 86, 62, 36, 36, 36, 61, 62,
-   61, 36, 62, 36, 36, 57, 71, 86, 85, 86, 90, 89, 90, 89, 86, 44,
-   61, 44, 44, 89, 44, 44, 62, 36, 36, 86, 44, 43, 43, 43, 80, 44,
-   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 62, 44, 61,
-   36, 36, 36, 62, 86, 87, 43, 43, 80, 90, 89, 89, 86, 90, 86, 85,
-   71, 71,  2, 93, 64, 44, 44, 44, 57, 80, 44, 44, 44, 44, 44, 44,
-   36, 36, 94, 86, 43, 43, 43, 43, 86, 43, 85, 71, 36, 63,  2,  2,
-    7,  7,  7,  7,  7,  2, 93, 71, 86, 87, 43, 43, 85, 85, 86, 87,
-   85, 43, 36, 72, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 94,
-   86, 43, 43, 44, 86, 86, 43, 87, 60,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2, 36, 36, 43, 44, 86, 87, 43, 43, 43, 85, 87, 87,
-   60,  2, 61, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2,  2, 64, 44,
-   36, 36, 36, 36, 36, 70, 87, 86, 43, 43, 43, 87, 63, 44, 44, 44,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 44, 44, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 61, 57, 87, 86, 43, 43, 87, 43, 43, 44, 44,
-    7,  7,  7,  7,  7, 27,  2, 97, 43, 43, 43, 43, 87, 60, 44, 44,
-   27,100, 44, 44, 44, 44, 44, 62, 36, 36, 36, 61, 62, 44, 36, 36,
-   36, 36, 62, 61, 36, 36, 36, 36, 86, 86, 86, 89, 90, 57, 85, 71,
-   98, 87,  2, 64, 44, 44, 44, 44, 36, 36, 36, 36, 44, 36, 36, 36,
-   94, 86, 43, 43, 44, 43, 86, 86, 71, 72, 90, 44, 44, 44, 44, 44,
-   70, 43, 43, 43, 43, 71, 36, 36, 36, 70, 43, 43, 85, 70, 43, 60,
-    2,  2,  2, 59, 44, 44, 44, 44, 70, 43, 43, 85, 87, 43, 36, 36,
-   36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 85, 43,  2, 72,  2,
-    2, 64, 44, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2, 44, 44, 44,
-   63, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 80, 43, 43, 43, 87,
-   63,  2,  2, 44, 44, 44, 44, 44,  2, 36, 36, 36, 36, 36, 36, 36,
-   44, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 89, 43, 43, 43,
-   85, 43, 87, 80, 44, 44, 44, 44, 36, 36, 36, 61, 36, 62, 36, 36,
-   70, 43, 43, 80, 44, 80, 43, 57, 43, 43, 43, 70, 44, 44, 44, 44,
-   36, 36, 36, 62, 61, 36, 36, 36, 36, 36, 36, 36, 36, 86, 86, 90,
-   43, 89, 87, 87, 61, 44, 44, 44, 36, 70, 85,107, 64, 44, 44, 44,
-   43, 94, 36, 36, 36, 36, 36, 36, 36, 36, 86, 43, 43, 80, 44, 86,
-   85, 60,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  7, 80, 44, 44,
-   27, 27, 91, 67, 67, 67, 56, 20,168, 67, 67, 67, 67, 67, 67, 67,
-   67, 44, 44, 44, 44, 44, 44, 93,105,105,105,105,105,105,105,181,
-    2,  2, 64, 44, 44, 44, 44, 44, 63, 64, 44, 44, 44, 44, 44, 44,
-   65, 65, 65, 65, 65, 65, 65, 65, 71, 36, 36, 70, 43, 43, 43, 43,
-   43, 43, 43, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 43,
-   43, 43, 43, 43, 43, 86, 87, 43, 43, 43, 60, 44, 44, 44, 44, 44,
-   43, 43, 43, 60,  2,  2, 67, 67, 40, 40, 97, 44, 44, 44, 44, 44,
-    7,  7,  7,  7,  7,179, 27, 27, 27, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 44, 44, 62, 36, 40, 69, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 83,164,  2, 27, 27, 27, 30,  2, 64, 44, 44,
-   36, 36, 36, 36, 36, 61, 44, 57, 94, 86, 86, 86, 86, 86, 86, 86,
-   86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 44, 44, 44, 57,
-   43, 74, 40, 40, 40, 40, 40, 40, 40, 88, 80, 44, 44, 44, 44, 44,
-   86, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 62,
-   40, 40, 52, 40, 40, 40, 52, 81, 36, 61, 44, 44, 44, 44, 44, 44,
-   44, 61, 44, 44, 44, 44, 44, 44, 36, 61, 62, 44, 44, 44, 44, 44,
-   44, 44, 36, 36, 44, 44, 44, 44, 36, 36, 36, 36, 36, 44, 50, 60,
-   65, 65, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43, 43, 44,
-   43, 43, 43, 80, 44, 44, 44, 44, 67, 67, 67, 92, 55, 67, 67, 67,
-   67, 67,186, 87, 43, 67,186, 86, 86,187, 65, 65, 65, 84, 43, 43,
-   43, 76, 50, 43, 43, 43, 67, 67, 67, 67, 67, 67, 67, 43, 43, 67,
-   67, 43, 76, 44, 44, 44, 44, 44, 27, 27, 44, 44, 44, 44, 44, 44,
-   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 16, 16, 16,110, 16, 16, 16, 16, 16,
-   11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 47, 11,
-   44, 47, 48, 47, 48, 11, 47, 11, 11, 11, 11, 16, 16,150,150, 16,
-   16, 16,150, 16, 16, 16, 16, 16, 16, 16, 11, 48, 11, 47, 48, 11,
-   11, 11, 47, 11, 11, 11, 47, 16, 16, 16, 16, 16, 11, 48, 11, 47,
-   11, 11, 47, 47, 44, 11, 11, 11, 47, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
-   16, 16, 16, 44, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11,
-   11, 11, 31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33,
-   16, 16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31,
-   16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16,
-   16, 33, 16, 16, 16, 32, 44,  7, 43, 43, 43, 76, 67, 50, 43, 43,
-   43, 43, 43, 43, 43, 43, 76, 67, 67, 67, 50, 67, 67, 67, 67, 67,
-   67, 67, 76, 21,  2,  2, 44, 44, 44, 44, 44, 44, 44, 57, 43, 43,
-   16, 16, 16, 16, 16, 39, 16, 16, 16, 16, 16, 16, 16, 16, 16,110,
-   44, 44,150, 16, 16,110, 44, 44, 43, 43, 43, 80, 43, 43, 43, 43,
-   43, 43, 43, 43, 80, 57, 43, 43, 43, 57, 80, 43, 43, 80, 44, 44,
-   40, 40, 40, 40, 40, 40, 40, 44, 44, 44, 44, 44, 44, 44, 44, 57,
-   43, 43, 43, 74, 40, 40, 40, 44,  7,  7,  7,  7,  7, 44, 44, 77,
-   36, 36, 36, 36, 36, 36, 36, 80, 36, 36, 36, 36, 36, 36, 43, 43,
-    7,  7,  7,  7,  7, 44, 44, 96, 36, 36, 36, 36, 36, 83, 43, 43,
-  188,  7,  7,  7,  7,189, 44, 93, 36, 36, 36, 61, 36, 36, 62, 61,
-   36, 36, 61,179, 27, 27, 27, 27, 16, 16, 43, 43, 43, 74, 44, 44,
-   27, 27, 27, 27, 27, 27,163, 27,190, 27,100, 44, 44, 44, 44, 44,
-   27, 27, 27, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27, 44,
-   36, 36, 62, 36, 36, 36, 36, 36, 62, 61, 61, 62, 62, 36, 36, 36,
-   36, 61, 36, 36, 62, 62, 44, 44, 44, 61, 44, 62, 62, 62, 62, 36,
-   62, 61, 61, 62, 62, 62, 62, 62, 62, 61, 61, 62, 36, 61, 36, 36,
-   36, 61, 36, 36, 62, 36, 61, 61, 36, 36, 36, 36, 36, 62, 36, 36,
-   62, 36, 62, 36, 36, 62, 36, 36,  8, 44, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67,
-   27, 27, 27, 27, 27, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 44,
-   44, 44, 44, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 92, 44, 44, 44, 67, 44, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 25, 41, 41, 67, 67, 67, 67, 44, 44, 67, 67,
-   67, 67, 67, 92, 44, 55, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 92, 44, 44, 44, 67,
-   67, 67, 67, 67, 67, 67, 92, 55, 67, 92, 67, 67, 67, 67, 67, 67,
-   79, 44, 44, 44, 44, 44, 44, 44,171,171,171,171,171,171,171, 44,
-  171,171,171,171,171,171,171,  0,  0,  0, 29, 21, 21, 21, 23, 21,
-   22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
-    9, 22, 21, 18, 24, 16, 24,  5,  5,  5,  5, 22, 25, 18, 25,  0,
-   23, 23, 26, 21, 24, 26,  7, 20, 25,  1, 26, 24, 26, 25, 15, 15,
-   24, 15,  7, 19, 15, 21,  9, 25,  9,  5,  5, 25,  5,  9,  5,  7,
-    7,  7,  9,  8,  8,  5,  7,  5,  6,  6, 24, 24,  6, 24, 12, 12,
-    2,  2,  6,  5,  9, 21,  9,  2,  2,  9, 25,  9, 26, 12, 11, 11,
-    2,  6,  5, 21, 17,  2,  2, 26, 26, 23,  2, 12, 17, 12, 21, 12,
-   12, 21,  7,  2,  2,  7,  7, 21, 21,  2,  1,  1, 21, 23, 26, 26,
-    1, 21,  6,  7,  7, 12, 12,  7, 21,  7, 12,  1, 12,  6,  6, 12,
-   12, 26,  7, 26, 26,  7,  2,  1, 12,  2,  6,  2, 24,  7,  7,  6,
-    1, 12, 12, 10, 10, 10, 10, 12, 21,  6,  2, 10, 10,  2, 15, 26,
-   26,  2,  2, 21,  7, 10, 15,  7,  2, 23, 21, 26, 10,  7, 21, 15,
-   15,  2, 17,  7, 29,  7,  7, 22, 18,  2, 14, 14, 14,  7, 10, 21,
-   17, 21, 11, 12,  5,  2,  5,  6,  8,  8,  8, 24,  5, 24,  2, 24,
-    9, 24, 24,  2, 29, 29, 29,  1, 17, 17, 20, 19, 22, 20, 27, 28,
-    1, 29, 21, 20, 19, 21, 21, 16, 16, 21, 25, 22, 18, 21, 21, 29,
-    1,  2, 15,  6, 18,  6, 23,  2, 12, 11,  9, 26, 26,  9, 26,  5,
-    5, 26, 14,  9,  5, 14, 14, 15, 25, 26, 26, 22, 18, 26, 18, 25,
-   18, 22,  5, 12,  2,  5, 22, 21, 21, 22, 18, 17, 26,  6,  7, 14,
-   17, 22, 18, 18, 26, 14, 17,  6, 14,  6, 12, 24, 24,  6, 26, 15,
-    6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,
-    7, 25, 17, 16, 16, 22, 16, 16, 25, 17, 25,  2, 25, 24,  2, 15,
-   12, 15, 14,  2, 21, 14,  7, 15, 12, 17, 21,  1, 26, 10, 10,  1,
-    7, 13, 13,  2, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    0, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,
+   32, 32, 11, 11, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 46, 43,
+   51, 39,166, 35, 39, 35, 36, 36, 36, 70, 36, 70, 36, 69, 36, 36,
+   36, 93, 86, 84, 66, 66, 79, 43, 27, 27, 27, 66,167, 43, 43, 43,
+   36, 36,  2,  2, 43, 43, 43, 43, 85, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 85, 85, 85, 85, 85, 85, 85, 42, 43, 43, 43, 43,  2,
+   42, 36, 36, 36,  2, 71, 71, 69, 36, 36, 36, 42, 42, 42, 42,  2,
+   36, 36, 36, 69, 42, 42, 42, 42, 42, 85, 43, 43, 43, 43, 43, 92,
+   36, 69, 85, 42, 42, 85, 42, 85,106,  2,  2,  2,  2,  2,  2, 51,
+    7,  7,  7,  7,  7, 43, 43,  2, 36, 36, 69, 68, 36, 36, 36, 36,
+    7,  7,  7,  7,  7, 36, 36, 60, 36, 36, 36, 36, 69, 42, 42, 84,
+   86, 84, 86, 79, 43, 43, 43, 43, 36, 69, 36, 36, 36, 36, 84, 43,
+    7,  7,  7,  7,  7, 43,  2,  2, 68, 36, 36, 76, 66, 93, 84, 36,
+   70, 42, 70, 69, 70, 36, 36, 42, 69, 60, 43, 43, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 61, 82,  2, 36, 36, 36, 36, 36, 93, 42, 85,
+    2, 82,168, 79, 43, 43, 43, 43, 61, 36, 36, 60, 61, 36, 36, 60,
+   61, 36, 36, 60, 43, 43, 43, 43, 16, 16, 16, 16, 16,113, 39, 39,
+   16, 16, 16, 16,110, 40, 43, 43, 36, 93, 86, 85, 84,106, 86, 43,
+   36, 36, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 43, 61, 36, 36,
+  169,169,169,169,169,169,169,169,170,170,170,170,170,170,170,170,
+   16, 16, 16,109, 43, 43, 43, 43, 43,149, 16, 16, 43, 43, 61, 70,
+   36, 36, 36, 36,171, 36, 36, 36, 36, 36, 36, 60, 36, 36, 60, 60,
+   36, 61, 60, 36, 36, 36, 36, 36, 36, 40, 40, 40, 40, 40, 40, 40,
+   40, 22, 66, 66, 66, 66, 66, 66, 66, 77, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36,147, 66, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 66, 66, 66, 66, 36, 36, 36, 36, 36, 36,167, 66,
+    2,  2,  2,151,129, 43, 43, 43,  6,172,173,147,147,147,147,147,
+  147,147,129,151,129,  2,126,174,  2, 63,  2,  2,155,147,147,129,
+    2,175,  8,176, 65,  2, 43, 43, 36, 36, 60, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 60, 78, 92,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,128,129,  4,  2, 36, 36, 36, 36, 36,
+   68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 39,
+   43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 60, 43,
+   20,177, 55,178, 26,  8,143, 91, 43, 43, 43, 43, 78, 64, 66, 43,
+   36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 60, 36, 61,
+    2, 63, 43,179, 27, 27, 27, 27, 27, 27, 43, 54, 66, 66, 66, 66,
+  104,104,142, 27, 90, 66, 66, 66, 66, 66, 66, 66, 66, 27, 66, 91,
+   66, 66, 66, 66, 66, 66, 91, 43, 91, 43, 43, 43, 43, 43, 43, 43,
+   66, 66, 66, 66, 66, 66, 49, 43,180, 27, 27, 27, 27, 27, 27, 27,
+   27, 27, 27, 27, 27, 27, 43, 43, 27, 27, 43, 43, 43, 43, 61, 36,
+  154, 36, 36, 36, 36,181, 43, 43, 36, 36, 36, 42, 42, 79, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 92, 36, 36, 43, 43, 36, 36, 36, 36,
+  182,104,104, 43, 43, 43, 43, 43, 11, 11, 11, 11, 16, 16, 16, 16,
+   11, 11, 43, 43, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 43, 43,
+   36, 36, 36, 36, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43, 43, 92,
+   11, 11, 11, 11, 11, 46, 11, 11, 11, 46, 11,149, 16, 16, 16, 16,
+   16,149, 16, 16, 16, 16, 16, 16, 16,149, 16, 16, 16,149,109, 43,
+   39, 39, 39, 51, 39, 39, 39, 39, 80, 39, 39, 39, 39, 80, 43, 43,
+   36, 36, 36, 43, 60, 36, 36, 36, 36, 36, 36, 61, 60, 43, 60, 61,
+   36, 36, 36, 92, 27, 27, 27, 27, 36, 36, 36, 76,162, 27, 27, 27,
+   43, 43, 43,179, 27, 27, 27, 27, 36, 60, 36, 43, 43,179, 27, 27,
+   36, 36, 36, 27, 27, 27, 43, 92, 36, 36, 36, 36, 36, 43, 43, 92,
+   36, 36, 36, 36, 43, 43, 27, 36, 43, 27, 27, 27, 27, 27, 27, 27,
+   69, 42, 56, 79, 43, 43, 42, 42, 36, 36, 61, 36, 61, 36, 36, 36,
+   36, 36, 36, 43, 42, 79, 43, 56, 27, 27, 27, 27, 99, 43, 43, 43,
+    2,  2,  2,  2, 63, 43, 43, 43, 36, 36, 36, 36, 36, 36,183, 30,
+   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 77, 36, 36, 36,
+   36, 36, 69, 79, 43,179, 27, 27,  2,  2,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 43, 92,  2,  2,  2, 36, 36, 36, 43, 27, 27, 27, 27,
+   36, 60, 43, 43, 27, 27, 27, 27, 36, 43, 43, 43, 92,  2, 63, 43,
+   43, 43, 43, 43,179, 27, 27, 27, 11, 46, 43, 43, 43, 43, 43, 43,
+   16,109, 43, 43, 43, 27, 27, 27, 36, 36, 42, 42, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 68, 11, 11, 11, 43, 56, 42, 42,158,
+   16, 16, 16, 43, 43, 43, 43,  8, 27, 27, 27, 27, 27, 27, 27, 99,
+   36, 36, 36, 36, 36, 56,184, 43, 36, 43, 43, 43, 43, 43, 43, 43,
+   43, 36, 82, 36, 43, 43, 43, 43, 96, 66, 66, 66, 91, 43, 43, 43,
+   43, 43, 43, 43, 43, 42, 42, 42, 27, 27, 27, 94, 43, 43, 43, 43,
+  180, 27, 30,  2,  2, 43, 43, 43, 36, 42, 42,  2,  2, 43, 43, 43,
+   36, 36,183, 27, 27, 27, 43, 43, 86, 97, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 42, 59,  2,  2,  2, 43,
+   27, 27, 27,  7,  7,  7,  7,  7, 70, 69, 70, 43, 43, 43, 43, 56,
+   85, 86, 42, 84, 86, 59,185,  2,  2, 79, 43, 43, 43, 43, 78, 43,
+   42, 70, 36, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42, 86, 42,
+   42, 42, 79,  7,  7,  7,  7,  7,  2,  2, 93, 97, 43, 43, 43, 43,
+   36, 69,  2, 60, 43, 43, 43, 43, 36, 93, 85, 42, 42, 42, 42, 84,
+   97, 36, 62,  2, 58, 42, 59, 86,  7,  7,  7,  7,  7, 62, 62,  2,
+  179, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 85, 86, 42, 85, 84, 42,  2,  2,  2, 70,
+   69, 43, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 60, 36, 36, 61,
+   36, 36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 62, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 69, 85, 86, 42, 42, 42, 79, 43, 43,
+   42, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 56, 70, 85,
+   84, 85, 89, 88, 89, 88, 85, 43, 60, 43, 43, 88, 43, 43, 61, 36,
+   36, 85, 43, 42, 42, 42, 79, 43, 42, 42, 79, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 61, 43, 60, 36, 36, 36, 61, 85, 86, 42, 42,
+   79, 89, 88, 88, 85, 89, 85, 84, 70, 70,  2, 92, 63, 43, 43, 43,
+   56, 79, 43, 43, 43, 43, 43, 43, 36, 36, 93, 85, 42, 42, 42, 42,
+   85, 42, 84, 70, 36, 62,  2,  2,  7,  7,  7,  7,  7,  2, 92, 70,
+   85, 86, 42, 42, 84, 84, 85, 86, 84, 42, 36, 71, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 93, 85, 42, 42, 43, 85, 85, 42, 86,
+   59,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 42, 43,
+   85, 86, 42, 42, 42, 84, 86, 86, 59,  2, 60, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2,  2, 63, 43, 36, 36, 36, 36, 36, 69, 86, 85,
+   42, 42, 42, 86, 62, 43, 43, 43,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 56, 86,
+   85, 42, 42, 86, 42, 42, 43, 43,  7,  7,  7,  7,  7, 27,  2, 96,
+   42, 42, 42, 42, 86, 59, 43, 43, 27, 99, 43, 43, 43, 43, 43, 61,
+   36, 36, 36, 60, 61, 43, 36, 36, 36, 36, 61, 60, 36, 36, 36, 36,
+   85, 85, 85, 88, 89, 56, 84, 70, 97, 86,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 36, 43, 36, 36, 36, 93, 85, 42, 42, 43, 42, 85, 85,
+   70, 71, 89, 43, 43, 43, 43, 43, 69, 42, 42, 42, 42, 70, 36, 36,
+   36, 69, 42, 42, 84, 69, 42, 59,  2,  2,  2, 58, 43, 43, 43, 43,
+   69, 42, 42, 84, 86, 42, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42,
+   42, 42, 42, 84, 42,  2, 71,  2,  2, 63, 43, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2, 43, 43, 43, 84, 42, 84, 84, 43, 43, 43, 43,
+   62, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 42, 42, 42, 86,
+   62,  2,  2, 43, 43, 43, 43, 43,  2, 36, 36, 36, 36, 36, 36, 36,
+   43, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 88, 42, 42, 42,
+   84, 42, 86, 79, 43, 43, 43, 43, 36, 36, 36, 60, 36, 61, 36, 36,
+   69, 42, 42, 79, 43, 79, 42, 56, 42, 42, 42, 69, 43, 43, 43, 43,
+   36, 36, 36, 61, 60, 36, 36, 36, 36, 36, 36, 36, 36, 85, 85, 89,
+   42, 88, 86, 86, 60, 43, 43, 43, 36, 36, 36, 36, 82, 36, 43, 43,
+   36, 69, 84,106, 63, 43, 43, 43, 42, 93, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 42, 42, 79, 43, 85, 84, 59,  2,  2,  2,  2,  2,  2,
+    7,  7,  7,  7,  7, 79, 43, 43, 27, 27, 90, 66, 66, 66, 55, 20,
+  167, 66, 66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 43, 43, 92,
+  104,104,104,104,104,104,104,181,  2,  2, 63, 43, 43, 43, 43, 43,
+   62, 63, 43, 43, 43, 43, 43, 43, 64, 64, 64, 64, 64, 64, 64, 64,
+   70, 36, 36, 69, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 85, 86, 42,
+   42, 42, 59, 43, 43, 43, 43, 43, 42, 42, 42, 59,  2,  2, 66, 66,
+   39, 39, 96, 43, 43, 43, 43, 43,  7,  7,  7,  7,  7,179, 27, 27,
+   27, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 61, 36,
+   39, 68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 82,163,  2,
+   27, 27, 27, 30,  2, 63, 43, 43, 11, 11, 11, 11, 46,149, 16, 16,
+   16, 16, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 43, 56,
+   93, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+   85, 85, 85, 85, 43, 43, 43, 56, 42, 73, 39, 39, 39, 39, 39, 39,
+   39, 87, 79, 43, 43, 43, 43, 43, 85, 39,104,181, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 61, 36, 60, 43, 43, 43, 43, 43, 43,
+   39, 39, 51, 39, 39, 39, 51, 80, 43, 60, 43, 43, 43, 43, 43, 43,
+   36, 60, 61, 43, 43, 43, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 43, 49, 59, 64, 64, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 66, 91, 43, 66, 66, 43, 43, 43, 66, 66, 66,
+  176, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 43, 43, 43, 43,
+   66, 66, 66, 91, 54, 66, 66, 66, 66, 66,186, 86, 42, 66,186, 85,
+   85,187, 64, 64, 64, 83, 42, 42, 42, 75, 49, 42, 42, 42, 66, 66,
+   66, 66, 66, 66, 66, 42, 42, 66, 66, 42, 75, 43, 43, 43, 43, 43,
+   27, 27, 43, 43, 43, 43, 43, 43, 11, 11, 11, 11, 11, 16, 16, 16,
+   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
+   16, 16,109, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 46, 11, 43, 46, 47, 46, 47, 11, 46, 11,
+   11, 11, 11, 16, 16,149,149, 16, 16, 16,149, 16, 16, 16, 16, 16,
+   16, 16, 11, 47, 11, 46, 47, 11, 11, 11, 46, 11, 11, 11, 46, 16,
+   16, 16, 16, 16, 11, 47, 11, 46, 11, 11, 46, 46, 43, 11, 11, 11,
+   46, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
+   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 43, 11, 11, 11, 11,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 43,  7,
+   42, 42, 42, 75, 66, 49, 42, 42, 42, 42, 42, 42, 42, 42, 75, 66,
+   66, 66, 49, 66, 66, 66, 66, 66, 66, 66, 75, 21,  2,  2, 43, 43,
+   43, 43, 43, 43, 43, 56, 42, 42, 16, 16, 16, 16, 16,138, 16, 16,
+   16, 16, 16, 16, 16, 16, 16,109, 43, 43,149, 16, 16,109, 43, 43,
+   42, 42, 42, 79, 42, 42, 42, 42, 42, 42, 42, 42, 79, 56, 42, 42,
+   42, 56, 79, 42, 42, 79, 43, 43, 39, 39, 39, 39, 39, 39, 39, 43,
+   43, 43, 43, 43, 43, 43, 43, 56, 42, 42, 42, 73, 39, 39, 39, 43,
+    7,  7,  7,  7,  7, 43, 43, 76, 36, 36, 36, 36, 36, 36, 36, 79,
+   36, 36, 36, 36, 36, 36, 42, 42,  7,  7,  7,  7,  7, 43, 43, 95,
+   36, 36, 36, 36, 36, 82, 42, 42,188,  7,  7,  7,  7,189, 43, 92,
+   36, 69, 36, 70, 36, 36, 36, 42, 36, 36, 69, 43, 43, 43, 43, 82,
+   36, 36, 36, 60, 36, 36, 61, 60, 36, 36, 60,179, 27, 27, 27, 27,
+   16, 16, 42, 42, 42, 73, 43, 43, 27, 27, 27, 27, 27, 27,162, 27,
+  190, 27, 99, 43, 43, 43, 43, 43, 27, 27, 27, 27, 27, 27, 27,162,
+   27, 27, 27, 27, 27, 27, 27, 43, 36, 36, 61, 36, 36, 36, 36, 36,
+   61, 60, 60, 61, 61, 36, 36, 36, 36, 60, 36, 36, 61, 61, 43, 43,
+   43, 60, 43, 61, 61, 61, 61, 36, 61, 60, 60, 61, 61, 61, 61, 61,
+   61, 60, 60, 61, 36, 60, 36, 36, 36, 60, 36, 36, 61, 36, 60, 60,
+   36, 36, 36, 36, 36, 61, 36, 36, 61, 36, 61, 36, 36, 61, 36, 36,
+    8, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 66, 43, 43,
+   54, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27, 27, 27, 90, 66,
+   66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 66, 66, 66, 66, 66,
+   66, 91, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 91, 43, 43, 43,
+   66, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 25, 40, 40,
+   66, 66, 66, 66, 91, 43, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43,
+    8,  8,  8,  8,176, 43, 43, 43, 66, 66, 66, 66, 66, 91, 43, 66,
+   66, 66, 66, 91, 91, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91, 54,
+   66, 66, 66, 66, 66, 91, 43, 54, 66, 91, 66, 66, 66, 66, 66, 66,
+    7,  7,  7,  7,  7, 91, 43, 43, 78, 43, 43, 43, 43, 43, 43, 43,
+  170,170,170,170,170,170,170, 43,170,170,170,170,170,170,170,  0,
+    0,  0, 29, 21, 21, 21, 23, 21, 22, 18, 21, 25, 21, 17, 13, 13,
+   25, 25, 25, 21, 21,  9,  9,  9,  9, 22, 21, 18, 24, 16, 24,  5,
+    5,  5,  5, 22, 25, 18, 25,  0, 23, 23, 26, 21, 24, 26,  7, 20,
+   25,  1, 26, 24, 26, 25, 15, 15, 24, 15,  7, 19, 15, 21,  9, 25,
+    9,  5,  5, 25,  5,  9,  5,  7,  7,  7,  9,  8,  8,  5,  6,  6,
+   24, 24,  6, 24, 12, 12,  2,  2,  6,  5,  9, 21,  9,  2,  2,  9,
+   25,  9, 26, 12, 11, 11,  2,  6,  5, 21, 17,  2,  2, 26, 26, 23,
+    2, 12, 17, 12, 21, 12, 12, 21,  7,  2,  2,  7,  7, 21, 21,  2,
+    1,  1, 21, 23, 26, 26,  1, 21,  6,  7,  7, 12, 12,  7, 21,  7,
+   12,  1, 12,  6,  6, 12, 12, 26,  7, 26, 26,  7,  2,  1, 12,  2,
+    6,  2, 24,  7,  7,  6,  1, 12, 12, 10, 10, 10, 10, 12, 21,  6,
+    2, 10, 10,  2, 15, 26, 26,  2,  2, 21,  7, 10, 15,  7,  2, 23,
+   21, 26, 10,  7, 21, 15, 15,  2, 17,  7, 29,  7,  7, 22, 18,  2,
+   14, 14, 14,  7, 10, 21, 17, 21, 11, 12,  5,  2,  5,  6,  8,  8,
+    8, 24,  5, 24,  2, 24,  9, 24, 24,  2, 29, 29, 29,  1, 17, 17,
+   20, 19, 22, 20, 27, 28,  1, 29, 21, 20, 19, 21, 21, 16, 16, 21,
+   25, 22, 18, 21, 21, 29,  1,  2, 15,  6, 18,  6, 12, 11,  9, 26,
+   26,  9, 26,  5,  7,  5,  5, 26, 14,  9,  5, 14, 14, 15, 25, 26,
+   26, 22, 18, 26, 18, 25, 18, 22,  5, 12,  2,  5, 22, 21, 21, 22,
+   18, 17, 26,  6,  7, 14, 17, 22, 18, 18, 26, 14, 17,  6, 14,  6,
+   12, 24, 24,  6, 26, 15,  6, 21, 11, 21, 24,  9,  6,  9, 23, 26,
+    6, 10,  4,  4,  3,  3,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,
+   25,  2, 25, 24, 23,  2,  2, 15, 12, 15, 14,  2, 21, 14,  7, 15,
+   12, 17, 21,  1, 26, 10, 10,  1,  7, 13, 13,  2, 23, 15,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0, 14,  0,
+    0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,
+    0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21, 22, 23,
+    0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28,
-   29, 30, 31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35,  0,
+    0,  0,  0, 36,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,
+   43, 44, 45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  0,  0,  0,
+    6,  7,  8,  0,  9,  0, 10, 11,  0,  0, 12, 13, 14, 15, 16,  0,
+    0,  0,  0, 17, 18, 19, 20,  0, 21,  0, 22, 23,  0, 24, 25,  0,
+    0, 24, 26, 27,  0, 24, 26,  0,  0, 24, 26,  0,  0, 24, 26,  0,
+    0,  0, 26,  0,  0, 24, 28,  0,  0, 24, 26,  0,  0, 29, 26,  0,
+    0,  0, 30,  0,  0, 31, 32,  0,  0, 33, 34,  0, 35, 36,  0, 37,
+   38,  0, 39,  0,  0, 40,  0,  0, 41,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 42,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 43, 44,  0,  0,
+    0,  0, 45,  0,  0,  0,  0,  0,  0, 46,  0,  0,  0, 47,  0,  0,
+    0,  0,  0,  0, 48,  0,  0, 49,  0, 50, 51, 52,  0, 53, 54, 55,
+    0, 56,  0, 57,  0, 58,  0,  0,  0,  0, 59, 60,  0,  0,  0,  0,
+    0,  0, 61, 62,  0,  0,  0,  0,  0,  0, 63, 64,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 65,  0,  0,  0, 66,
+    0,  0,  0, 67,  0, 68,  0,  0, 69,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 70, 71,  0,  0, 72,  0,  0,  0,  0,
+    0,  0,  0,  0, 73, 74,  0,  0,  0,  0, 54, 75,  0, 76, 77,  0,
+    0, 78, 79,  0,  0,  0,  0,  0,  0, 80, 81, 82,  0,  0,  0,  0,
+    0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,  0, 83,  0,  0,  0,
+    0,  0,  0,  0,  0, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 85,  0,  0,  0,  0,  0,  0,  0, 86,  0,  0,  0, 87,
+    0,  0,  0,  0, 88, 89,  0,  0,  0,  0,  0, 90,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 91,  0, 92,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 93,  0, 94,  0,  0, 95,  0,
+   96,  0,  0,  0,  0,  0, 73, 97,  0, 98,  0,  0, 99,100,  0, 78,
+    0,  0,101,  0,  0,102,  0,  0,  0,  0,  0,103,  0,104, 26,105,
+    0,  0,106,  0,  0,  0,107,  0,  0,  0,108,  0,  0,  0,  0,  0,
+    0, 66,109,  0,  0, 66,  0,  0,  0,110,  0,  0,  0,111,  0,  0,
+    0,  0,  0,  0,  0, 98,  0,  0,  0,  0,  0,  0,  0,112,113,  0,
+    0,  0,  0, 79,  0, 44,114,  0,115,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,116,  0,
+  117,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,119,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,120,  0,121,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,
-    0,  0,  0,  0,  0,  0, 41, 42, 43,  0, 44,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,
-    0,  0,  4,  5,  6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15,
-   16, 17, 16, 18, 16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19,
-   21, 19,  0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0,
-   34,  0,  0, 35,  0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41,
-   42, 43, 44, 45, 46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,
-    0,  0,  0,  0,  0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,
-    0,  0,  0,  0,  0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59,
-   60, 61, 62, 63,  0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0,
-   67,  0,  0,  0, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 69,  0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,
-    0,  0,  0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0, 76, 77,
-    0, 78, 79,  0,  0, 80, 81,  0, 82, 62,  0, 83, 84,  0,  0, 85,
-   86, 87,  0, 88,  0, 89,  0, 90,  0,  0, 51, 91, 51,  0, 92,  0,
-   93,  0,  0,  0, 81,  0,  0,  0, 94, 95,  0, 96, 97, 98, 99,  0,
-    0,  0,  0,  0, 51,  0,  0,  0,  0,100,101,  0,  0,  0,  0,  0,
-    0,102,  0,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,104,
-  105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,
-    0,  0,  0,  0,111,  0,112,  0,105,  0,  0,  0,  0,  0,113,114,
-    0,  0,  0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,
-    0,118,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,
-    8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0,
-   14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,
-    0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0,
-   28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35,
-   33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,
-    0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,
-    0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,
-    0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,
-    0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,
-    0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,  0, 61,
-   52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,  0, 67,
-    0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0, 77, 78,
-    0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,  0,  0,
-    0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0, 85,  0,
-   52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,  0, 88,
-   57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0, 33,  0,
-    0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0, 93,  0,
-    0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0, 98,  0,
-    0,  0, 99,  0,  0,  0,100,  0,  0,  0,  0,101,102, 93,  0,  0,
-  103,  0,  0,  0, 84,  0,  0,104,  0,  0,  0,105,106,  0,  0,107,
-  108,  0,  0,  0,  0,  0,  0,109,  0,  0,110,  0,  0,  0,  0,111,
-   33,  0,112,113,114, 57,  0,  0,115, 35,  0,  0,116,  0,  0,  0,
-  117,  0,  0,  0,  0,  0,  0,118,  0,  0,119,  0,  0,  0,  0,120,
-   88,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0, 52,121,  0,  0,  0,
-    0,122,  0,  0,123,  0,  0,  0,  0,121,  0,  0,124,  0,  0,  0,
-    0,  0, 79,  0,  0,  0,  0,125,  0,  0,  0,126,  0,  0,  0,127,
-    0,128,  0,  0,  0,  0,129,130,131,  0,132,  0,133,  0,  0,  0,
-  134,135,136,  0, 77,  0,  0,  0,  0,  0, 35,  0,  0,  0,137,  0,
-    0,  0,138,  0,  0,  0,139,  0,  0,140,  0,  0,141,  0,  0,  0,
-    0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,  7,  4,
-    4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,  1,  1,
-   19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26, 27, 28,
-   29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36,
-   37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,  0,  0,
-   43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,  0, 47,
-    0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19, 52,  1,
-    0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21, 35,  1,
-    0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,  0, 59,
-    0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0, 64,  0,
-    0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0, 68,  0,
-    0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,  0,  0,
-    0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,  0,  0,
-    0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0, 83,  0,
-    0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52, 15, 86,
-   36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,
-    0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0,
-   87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1, 21, 92,
-   93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,100,  4,
-   58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,
-    0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,  0, 38,
-    0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,  0,  0,
-   78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,  0,107,
-    1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,  0,108,
-    0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,
-    0,  0, 19, 58,  0,  0,  0, 51,  0,111, 14, 52,112, 41,  0,  0,
-   62,  0,  0, 61,  0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0,
-   62,  0, 89,  0,  0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,
-    0, 38,  1, 58,  1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,
-  115,  0,  0,  0, 55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,
-    0,  0,  0, 79,  0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0,
-   79,  0,  0,  0,  8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,
-    0,  0,  0,117,  0,118,119,120,121,  0,104,  4,122, 49, 23,  0,
-    0,  0, 38, 50, 38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1,
-   48,105, 87,  0,  0,  0,  0,  1,  0,  0,  0,123,  0,  0,  0,112,
-    4,122,  0,  0,  0,  1,124,  0,  0,  0,  0,  0,230,230,230,230,
-  230,232,220,220,220,220,232,216,220,220,220,220,220,202,202,220,
-  220,220,220,202,202,220,220,220,  1,  1,  1,  1,  1,220,220,220,
-  220,230,230,230,230,240,230,220,220,220,230,230,230,220,220,  0,
-  230,230,230,220,220,220,220,230,232,220,220,230,233,234,234,233,
-  234,234,233,230,  0,  0,  0,230,  0,220,230,230,230,230,220,230,
-  230,230,222,220,230,230,220,220,230,222,228,230, 10, 11, 12, 13,
-   14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,
-  230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31,
-   32, 33, 34,230,230,220,220,230,220,230,230,220, 35,  0,  0,  0,
-    0,  0,230,230,230,  0,  0,230,230,  0,220,230,230,220,  0,  0,
-    0, 36,  0,  0,230,220,230,230,220,220,230,220,220,230,220,230,
-  220,230,230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,230,230,
-  230,230,  0,  0,  0,220,220,220,230,220,220,220,230,230,  0,220,
-   27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,
-  230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,
-    9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,107,107,
-  118,118,  9,  0,122,122,122,122,220,220,  0,  0,  0,220,  0,220,
-    0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,
-  130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,
-    0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,
-    0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,  0,220,
-  230,220,  0,220,230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,
+    0,  0,  0,122,  0,  0,  0,  0,123,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,124,
+  125,126,  0,  0,  0,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,128,129,  0,  0,130,  0,  0,  0,  0,121,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,131,  0,132,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,133,  0,  0,  0,  0,
+    0,  0,  0,134,  0,  0,  0,  0,  0,  0,  0,135,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,136,  0,  0,  0,137,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
+    1,  2,  3,  4,  5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13,
+   14, 15, 16, 17, 18,  1,  1,  1,  0,  0,  0,  0, 19,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
+   25, 26, 27, 28, 29, 30,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36,  0,  0,  0,  0,
+   37,  0,  0,  0,  0,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
+    0,  0,  0,  0,  0,  0,  0,  0, 42,  0,  0,  0,  0,  0,  0,  0,
+   43, 36, 44, 45, 21, 45, 46,  0,  0,  0,  0,  0,  0,  0, 19,  1,
+   21,  0,  0, 47,  0,  0,  0,  0,  0, 38, 48,  1,  1, 49, 49, 50,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 51,  0,  0,  0,  0,  0,
+    0, 19, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
+   54, 21, 35,  1,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0, 56,
+   57, 58,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 59,  0,  0,  0, 56,  0, 60,  0,  0,  0,  0,  0,  0,
+    0,  0, 61, 62,  0,  0, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 64,  0,  0,  0, 65,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 66,  0,  0,  0, 67,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 68,  0,  0,  0,  0,  0,  0, 69, 70,  0,  0,  0,  0,  0,
+   71, 72, 73, 74, 75, 76,  0,  0,  0,  0,  0,  0,  0, 77,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 49,  0,  0,  0,  0,
+    0, 80,  0,  0,  0,  0,  0,  0,  0, 62,  0,  0,  0,  0,  0,  0,
+   63,  0,  0, 81,  0,  0, 82,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 83,  0,  0,  0,  0,  0,  0, 19, 84,  0, 62,  0,  0,  0,
+    0, 49,  1, 85,  0,  0,  0,  0,  1, 52, 15, 86, 36, 10, 21,  1,
+    1,  1,  1, 41,  1, 21, 87,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 55,  0,  0,  0, 62,  0,  0,  0,  0,  0,  0,  0,  0, 19, 10,
+    1,  0,  0,  0,  0,  0, 88,  0,  0,  0,  0,  0,  0, 89,  0,  0,
+   88,  0,  0,  0,  0,  0,  0,  0,  0, 78,  0,  0,  0,  0,  0,  0,
+   90,  9, 12,  4, 91,  8, 92, 47,  0, 58, 50,  0, 21,  1, 21, 93,
+   94,  1,  1,  1,  1,  1,  1,  1,  1, 95, 96, 97,  0,  0,  0,  0,
+   98,  1, 99, 58, 81,100,101,  4, 58,  0,  0,  0,  0,  0,  0, 19,
+   50,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 61,  1,  1,  1,  1,
+    1,  1,  1,  1,  0,  0,102,103,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,104,  0,  0,  0,  0, 19,  0,  1,  1, 50,  0,  0,  0,  0,
+    0,  0,  0, 38,  0,  0,  0,  0, 50,  0,  0,  0,  0, 63,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 62,  0,  0,  0,  0,  1,  1,  1,  1,
+   50,  0,  0,  0,  0,  0,105, 68,  0,  0,  0,  0,  0,  0,  0,  0,
+   61,  0,  0,  0,  0,  0,  0,  0, 78,  0,  0,  0, 62,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,106,107, 58, 38, 81,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,108,  1, 14,  4, 12,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 47, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 38, 90,  0,  0,  0,  0,109,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,110, 61,  0,111,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0, 49, 50,  0,  0,  0,  0,  0,  0, 19, 58,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,112, 51,  0,112, 14, 52,
+   84,  0,  0,  0,113, 41,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   62,  0,  0, 61,  0,  0,  0,  0,  0,  0,114,  0, 90,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,114,  0,  0,  0,  0,115,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 78, 55,  0, 38,  1, 58,
+    1, 58,  0,  0,  0,  0,  0, 88, 62,  0,  0,  0, 63, 89,  0,  0,
+    0,  0,  0, 59,116,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,116,  0,  0,  0,  0, 61,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 79, 78,  0,  0,  0,
+    0,  0,  0,  0,  0, 61,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 56,  0, 89, 80,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 61,  0,  0, 79,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 61,
+    0,  0,  0,  0,  0,  0,  0,  0,  8, 92,  0,  0,  0,  0,  0,  0,
+    1, 90,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,118,  0,119,120,121,122,  0,105,  4,123, 49, 23,  0,
+    0,  0,  0,  0,  0,  0, 38, 50,  0,  0,  0,  0, 38, 58,  0,  0,
+    0,  0,  0,  0,  1, 90,  1,  1,  1,  1, 39,  1, 48,106, 90,  0,
+    0,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0, 59,
+    0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  0,124,
+    0,  0,  0,  0,  0,  0,  0,113,  0,  0,  0,  0, 19, 59,  0, 38,
+    0, 81,  0,  0,  0,  0,  0,  0,  4,123,  0,  0,  0,  1,125,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,230,230,230,230,230,232,220,220,
+  220,220,232,216,220,220,220,220,220,202,202,220,220,220,220,202,
+  202,220,220,220,  1,  1,  1,  1,  1,220,220,220,220,230,230,230,
+  230,240,230,220,220,220,230,230,230,220,220,  0,230,230,230,220,
+  220,220,220,230,232,220,220,230,233,234,234,233,234,234,233,230,
+    0,  0,  0,230,  0,220,230,230,230,230,220,230,230,230,222,220,
+  230,230,220,220,230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17,
+   18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18,
+   30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230,
+  230,220,220,230,220,230,230,220, 35,  0,  0,  0,  0,  0,230,230,
+  230,  0,  0,230,230,  0,220,230,230,220,  0,  0,  0, 36,  0,  0,
+  230,220,230,230,220,220,230,220,220,230,220,230,220,230,230,  0,
+    0,220,  0,  0,230,230,  0,230,  0,230,230,230,230,230,  0,  0,
+    0,220,220,220,230,220,220,220,230,230,  0,220, 27, 28, 29,230,
+    7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,230,  0,  0,  0,
+    0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,  9,  0,  0,  0,
+    0,  0,  9,  0,103,103,  9,  0,107,107,107,107,118,118,  9,  0,
+  122,122,122,122,220,220,  0,  0,  0,220,  0,220,  0,216,  0,  0,
+    0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,130,130,  0,  0,
+  130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,  0,  0,  0,  7,
+    0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,  0,228,  0,  0,
+    0,222,230,220,220,  0,  0,  0,230,  0,  0,220,230,220,  0,220,
+  230,230,230,234,  0,  0,  9,  9,  0,  0,  7,  0,230,230,230,  0,
   230,  0,  1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,
   230,230,232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,
     1,  1,  1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,
@@ -1683,63 +1482,81 @@ _hb_ucd_u8[17612] =
     0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 34,  9,  0,  0, 20, 20,
     1, 20, 20,  0,  0,  0,  0,  0,  0,  0, 26, 21,  0,  1,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3, 47, 48,  0,  0,  0,
-    0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-   12, 13, 13, 13, 13, 13, 13, 14, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 15, 16, 17, 18,
-   18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 20, 20, 20, 20, 20, 20,
-   20, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 20, 33,
-   34, 35, 34, 34, 36, 37, 20, 20, 20, 20, 20, 20, 38, 20, 39, 40,
-   41, 41, 41, 41, 41, 42, 43, 44, 20, 20, 20, 20, 20, 20, 20, 45,
-   46, 20, 20, 47, 20, 20, 20, 48, 49, 50, 51, 52, 53, 54, 55, 56,
-   57, 58, 59, 20, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  9, 10, 11, 11, 11, 11, 12, 13,
+   13, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 13, 13, 13,
+   24, 25, 26, 26, 26, 27, 13, 13, 13, 28, 29, 30, 13, 31, 32, 33,
+   34, 35, 36, 37,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7, 38,  7,  7, 39,  7, 40,  7,  7,
+    7, 41, 13, 42,  7,  7, 43,  7,  7,  7, 44, 13, 13, 13, 13, 13,
    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 60, 13, 13,
-   13, 61, 62, 13, 13, 13, 13, 63, 13, 13, 13, 13, 13, 13, 64, 65,
-   20, 20, 66, 20, 13, 13, 13, 13, 67, 13, 13, 13, 68, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20, 20, 69,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 45,  0,  0,  1,  2,  2,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31, 32, 32, 33, 34, 35, 36, 37, 37,
+   37, 37, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+   51, 52,  2,  2, 53, 54, 55, 56, 57, 58, 59, 59, 59, 59, 60, 59,
+   59, 59, 59, 59, 59, 59, 61, 61, 59, 59, 59, 59, 62, 59, 63, 64,
+   65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 59, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 78, 69, 69, 69, 69, 79, 79, 79, 79, 79, 79, 79, 79, 79, 80,
+   81, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 94, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 69, 69, 96, 97, 98, 99, 99, 99,
+  100,101,102,103,104,105,106,107,108,109, 95,110,111,112,113,114,
+  115,116,117,117,118,119,120,121,122,123,124,125,126,127,128,129,
+  130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,
+   95,146,147,148,149, 95,150,151,152,153,154,155,156,157,158,159,
+  160,161, 95,162,163,164,165,165,165,165,165,165,165,166,167,165,
+  168, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,169,170,170,170,170,170,170,170,170,171,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,172,173,173,
+  173,173,174, 95, 95, 95, 95, 95,175, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95,176,176,176,176,177,178,179,180, 95, 95,
+  181, 95,182,183,184,185,186,186,186,186,186,186,186,186,186,186,
+  186,186,186,186,186,186,186,186,186,186,186,186,187,187,187,188,
+  189,190, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,191,192,193,194,195,195,196, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,197,198,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 59,199,
+   59, 59, 59,200,201,202, 59,203,204,205,206,207,208, 95,209,210,
+  211, 59, 59,212, 59,213,214,214,214,214,214,215, 95, 95, 95, 95,
+   95, 95, 95, 95,216, 95,217,218,219, 95, 95,220, 95, 95, 95,221,
+   95,222, 95,223, 95,224,225,226,227, 95, 95, 95, 95, 95,228,229,
+  230, 95,231,232, 95, 95,233,234, 59,235,236, 95, 59, 59, 59, 59,
+   59, 59, 59,237, 59,238,239,240, 59, 59,241,242, 59,243, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,244, 69, 69,245, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,246, 69, 69, 69, 69, 69, 69, 69, 69, 69,247, 69, 69,
+   69, 69,248, 95, 95, 95, 69, 69, 69, 69,249, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69,250, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,251, 95,
+   95, 95, 95, 95, 95, 95,252, 95,253,254,  0,  1,  2,  2,  0,  1,
+    2,  2,  2,  3,  4,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,
    19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
    19,  0,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0, 19, 19,
    19, 19, 19, 19, 19,  0, 19,  0,  0,  0,  0,  0,  0,  0, 19, 19,
@@ -1764,46 +1581,46 @@ _hb_ucd_u8[17612] =
    64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
    90, 90, 90, 90,  2,  2, 90, 90, 90, 90, 90, 90, 90,  2, 95, 95,
    95, 95, 95, 95, 95, 95, 95, 95, 95, 95,  2,  2, 95,  2, 37, 37,
-   37,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,
-    2,  2,  2,  2,  2,  3,  3,  3,  0,  3,  3,  3,  3,  3,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  1,  1,  1,  1,  7,  7,  7,  7,  7,
-    7,  7,  0,  0,  7,  7,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,
-    5,  5,  5,  2,  2,  5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  2,
-    5,  2,  2,  2,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  5,  2,
-    2,  5,  5,  5,  5,  2,  2,  2,  2,  2,  2,  2,  2,  5,  2,  2,
-    2,  2,  5,  5,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  2,  2, 11, 11, 11,  2, 11, 11, 11, 11, 11,
-   11,  2,  2,  2,  2, 11, 11,  2,  2, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11,  2, 11, 11, 11, 11, 11, 11, 11,  2,
-   11, 11,  2, 11, 11,  2, 11, 11,  2,  2, 11,  2, 11, 11, 11,  2,
-    2, 11, 11, 11,  2,  2,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11,
-   11, 11, 11,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,
-   11, 11, 11, 11, 11,  2,  2, 10, 10, 10,  2, 10, 10, 10, 10, 10,
-   10, 10, 10, 10,  2, 10, 10, 10,  2, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10, 10, 10, 10, 10,  2,
-   10, 10,  2, 10, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10, 10, 10,
-    2, 10, 10, 10,  2,  2, 10,  2,  2,  2,  2,  2,  2,  2, 10, 10,
-   10, 10,  2,  2, 10, 10, 10, 10,  2,  2,  2,  2,  2,  2,  2, 10,
-   10, 10, 10, 10, 10, 10,  2, 21, 21, 21,  2, 21, 21, 21, 21, 21,
-   21, 21, 21,  2,  2, 21, 21,  2,  2, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21,  2, 21, 21, 21, 21, 21, 21, 21,  2,
-   21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21, 21, 21,  2,
-    2, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2, 21, 21, 21,  2,  2,
-    2,  2, 21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,  2,
-   22, 22,  2, 22, 22, 22, 22, 22, 22,  2,  2,  2, 22, 22, 22,  2,
-   22, 22, 22, 22,  2,  2,  2, 22, 22,  2, 22,  2, 22, 22,  2,  2,
-    2, 22, 22,  2,  2,  2, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-    2,  2,  2,  2, 22, 22, 22,  2,  2,  2,  2,  2,  2, 22,  2,  2,
-    2,  2,  2,  2, 22, 22, 22, 22, 22,  2,  2,  2,  2,  2, 23, 23,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,  2, 23, 23, 23,  2,
-   23, 23, 23, 23, 23, 23, 23, 23,  2,  2, 23, 23, 23, 23, 23,  2,
-   23, 23, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 23,  2, 23, 23,
-   23,  2,  2, 23,  2,  2, 23, 23, 23, 23,  2,  2, 23, 23,  2,  2,
-    2,  2,  2,  2,  2, 23, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16,  2, 16, 16, 16,  2, 16, 16, 16, 16, 16, 16, 16, 16,
-   16, 16,  2, 16, 16, 16, 16, 16,  2,  2, 16, 16, 16, 16, 16,  2,
-   16, 16, 16, 16,  2,  2,  2,  2,  2,  2,  2, 16, 16,  2, 16, 16,
+   37,  2,  2,  2,  2,  2,  3,  3,  2,  2,  2,  2,  2,  3,  3,  3,
+    0,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  1,
+    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  5,  5,
+    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
+    2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
+    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
+    2,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  2,  2,  2,
+    2,  2,  2,  2,  2,  5,  2,  2,  2,  2,  5,  5,  2,  5,  5,  5,
+    5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2, 11,
+   11, 11,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
+    2, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
+   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
+    2,  2, 11,  2, 11, 11, 11,  2,  2, 11, 11, 11,  2,  2,  2, 11,
+    2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,  2, 11,  2,  2,  2,
+    2,  2,  2,  2, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2, 10,
+   10, 10,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
+    2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
+   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
+    2,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,  2,  2, 10,  2,
+    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
+    2,  2,  2,  2,  2,  2,  2, 10, 10, 10, 10, 10, 10, 10,  2, 21,
+   21, 21,  2, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
+    2, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
+   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
+    2,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21,  2,  2,  2,  2,
+    2,  2,  2, 21, 21, 21,  2,  2,  2,  2, 21, 21,  2, 21, 21, 21,
+   21, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
+   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
+   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2, 22, 22, 22,  2,
+    2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
+   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
+    2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23, 23,  2,  2,  2,  2,
+    2,  2,  2, 23, 23,  2, 23, 23, 23,  2, 23, 23,  2,  2, 23, 23,
+   23, 23,  2,  2, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
+    2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,  2,
+    2,  2,  2, 16, 16,  2,  2,  2,  2,  2, 16, 16, 16,  2, 16, 16,
    16, 16,  2,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2,  2, 20, 20,
    20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,  2, 20, 20, 20,  2,
    20, 20, 20, 20, 20, 20,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20,
@@ -1850,137 +1667,135 @@ _hb_ucd_u8[17612] =
    54, 54,  2,  2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
    91, 91, 91, 91, 91,  2, 91, 91, 91, 91, 91,  2,  2, 91, 91, 91,
     2,  2,  2,  2,  2,  2, 91, 91, 91, 91, 91, 91,  2,  2,  1,  1,
-    1,  1,  1,  1,  1,  2, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
-   62, 62, 62,  2, 62, 62, 76, 76, 76, 76, 76, 76, 76, 76, 93, 93,
-   93, 93, 93, 93, 93, 93, 93, 93, 93, 93,  2,  2,  2,  2,  2,  2,
-    2,  2, 93, 93, 93, 93, 70, 70, 70, 70, 70, 70, 70, 70,  2,  2,
-    2, 70, 70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 73, 73,
-   73, 73, 73, 73, 73, 73,  6,  6,  6,  2,  2,  2,  2,  2,  8,  8,
-    8,  2,  2,  8,  8,  8,  1,  1,  1,  0,  1,  1,  1,  1,  1,  0,
-    1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,
-    0,  0,  1,  0,  0,  0,  1,  1,  0,  2,  2,  2,  2,  2, 19, 19,
-   19, 19, 19, 19,  9,  9,  9,  9,  9,  6, 19, 19, 19, 19, 19, 19,
-   19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19,  9,  9,  9,  9,
-    9, 19, 19, 19, 19, 19,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19,  9,  9,  9,  9,  9,  9,  9,  2,  2,  2,  9,
-    2,  9,  2,  9,  2,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,
-    9,  9,  2,  2,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  2,  2,
-    9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  2,  0,  0,
-    0,  0,  1,  1,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0, 19,
-    2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  0,  0,
-    0,  0,  0,  0,  0,  2, 19, 19, 19, 19, 19,  2,  2,  2,  0,  2,
-    2,  2,  2,  2,  2,  2,  1,  2,  2,  2,  2,  2,  2,  2,  0,  0,
-    0,  0,  0,  0,  9,  0,  0,  0, 19, 19,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 19,  0, 19,  0,  0,  0,  2,  2,  2,  2,  0,  0,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  2, 27, 27,
-   27, 27, 27, 27, 27, 27,  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,
-    0,  0,  0,  0,  2,  0, 56, 56, 56, 56, 56, 56, 56, 56, 55, 55,
-   55, 55,  2,  2,  2,  2,  2, 55, 55, 55, 55, 55, 55, 55, 61, 61,
-   61, 61, 61, 61, 61, 61,  2,  2,  2,  2,  2,  2,  2, 61, 61,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13,  2, 13, 13, 13, 13, 13, 13, 13,
-   13, 13,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13,  2,  2,  0,  0,
-    0,  0,  0, 13,  0, 13,  0, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    1,  1,  1,  1, 12, 12, 13, 13, 13, 13,  0,  0,  0,  0,  2, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15,  2,  2,  1,  1,  0,  0, 15, 15, 15,  0, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17,  0,  0, 17, 17, 17,  2,  2,  2,  2,  2, 26, 26, 26, 26, 26,
-   26, 26, 26, 26, 26, 26,  2, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  0, 12, 12,
-   12, 12, 12, 12, 12,  0, 17, 17, 17, 17, 17, 17, 17,  0, 39, 39,
-   39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,  2,  2,  2, 39, 39,
-   39, 39, 39, 39, 39,  2, 86, 86, 86, 86, 86, 86, 86, 86, 77, 77,
-   77, 77, 77, 77, 77, 77, 77, 77, 77, 77,  2,  2,  2,  2, 79, 79,
-   79, 79, 79, 79, 79, 79,  0,  0, 19, 19, 19, 19, 19, 19,  0,  0,
-    0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2, 19, 19,
-    2, 19,  2, 19, 19, 19,  2,  2, 19, 19, 19, 19, 19, 19, 60, 60,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,  2,  2,  2, 65, 65,
-   65, 65, 65, 65, 65, 65, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
-   75, 75, 75, 75,  2,  2,  2,  2,  2,  2,  2,  2, 75, 75, 75, 75,
-    2,  2,  2,  2,  2,  2, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
-   69, 69, 69, 69,  0, 69, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
-   74, 74,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 74, 12, 12,
-   12, 12, 12,  2,  2,  2, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
-   84, 84, 84, 84,  2,  0, 84, 84,  2,  2,  2,  2, 84, 84, 33, 33,
-   33, 33, 33, 33, 33,  2, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-   68, 68, 68, 68, 68,  2, 68, 68, 68, 68, 68, 68,  2,  2, 68, 68,
-    2,  2, 68, 68, 68, 68, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-   92,  2,  2,  2,  2,  2,  2,  2,  2, 92, 92, 92, 92, 92, 87, 87,
-   87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,  2,  2, 30,
-   30, 30, 30, 30, 30,  2, 19, 19, 19,  0, 19, 19, 19, 19, 19, 19,
-   19, 19, 19,  9, 19, 19, 19, 19,  0,  0,  2,  2,  2,  2, 87, 87,
-   87, 87, 87, 87,  2,  2, 87, 87,  2,  2,  2,  2,  2,  2, 12, 12,
-   12, 12,  2,  2,  2,  2,  2,  2,  2, 12, 12, 12, 12, 12, 13, 13,
-    2,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,
-    2,  4,  4,  4,  4,  4,  2,  2,  2,  2,  2, 14, 14, 14, 14, 14,
-   14, 14, 14, 14, 14,  2, 14, 14, 14, 14, 14,  2, 14,  2, 14, 14,
-    2, 14, 14,  2, 14, 14,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,
-    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  0,  0,  2,  2,
-    3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  3,  1,  1,
-    1,  1,  1,  1,  6,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,
-    0,  0,  2,  2,  2,  2,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,
-    3,  3,  3,  2,  2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0,  2,  2,
-   12, 12, 12, 12, 12, 12,  2,  2, 12, 12, 12,  2,  2,  2,  2,  0,
-    0,  0,  0,  0,  2,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-   49, 49,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49,
-   49,  2, 49, 49,  2, 49, 49, 49, 49, 49, 49, 49,  2,  2, 49, 49,
-   49,  2,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  0,  0,  0,
-    0,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2,  2,  9,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  1,  2,  2, 71, 71,
-   71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,  2,  2,  2, 67, 67,
-   67, 67, 67, 67, 67, 67, 67,  2,  2,  2,  2,  2,  2,  2,  1,  0,
-    0,  0,  0,  0,  0,  0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
-   42, 42,  2,  2,  2,  2,  2,  2,  2,  2,  2, 42, 42, 42, 41, 41,
-   41, 41, 41, 41, 41, 41, 41, 41, 41,  2,  2,  2,  2,  2,118,118,
-  118,118,118,118,118,118,118,118,118,  2,  2,  2,  2,  2, 53, 53,
-   53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,  2, 53, 59, 59,
-   59, 59, 59, 59, 59, 59, 59, 59, 59, 59,  2,  2,  2,  2, 59, 59,
-   59, 59, 59, 59,  2,  2, 40, 40, 40, 40, 40, 40, 40, 40, 51, 51,
-   51, 51, 51, 51, 51, 51, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
-   50, 50, 50, 50,  2,  2, 50, 50,  2,  2,  2,  2,  2,  2,135,135,
-  135,135,135,135,135,135,135,135,135,135,  2,  2,  2,  2,106,106,
-  106,106,106,106,106,106,104,104,104,104,104,104,104,104,104,104,
-  104,104,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,104,161,161,
-  161,161,161,161,161,161,161,161,161,  2,161,161,161,161,161,161,
-  161,  2,161,161,  2,161,161,161,  2,161,161,161,161,161,161,161,
-    2,161,161,  2,  2,  2,170,170,170,170,170,170,170,170,170,170,
-  170,170,  2,  2,  2,  2,110,110,110,110,110,110,110,110,110,110,
-  110,110,110,110,110,  2,110,110,110,110,110,110,  2,  2, 19, 19,
-   19, 19, 19, 19,  2, 19, 19,  2, 19, 19, 19, 19, 19, 19, 19, 19,
-   19,  2,  2,  2,  2,  2, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
-   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-   47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2, 47, 81, 81,
-   81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,  2, 81,120,120,
-  120,120,120,120,120,120,116,116,116,116,116,116,116,116,116,116,
-  116,116,116,116,116,  2,  2,  2,  2,  2,  2,  2,  2,116,128,128,
-  128,128,128,128,128,128,128,128,128,  2,128,128,  2,  2,  2,  2,
-    2,128,128,128,128,128, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-   66, 66,  2,  2,  2, 66, 72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-    2,  2,  2,  2,  2, 72, 98, 98, 98, 98, 98, 98, 98, 98, 97, 97,
-   97, 97, 97, 97, 97, 97,  2,  2,  2,  2, 97, 97, 97, 97,  2,  2,
-   97, 97, 97, 97, 97, 97, 57, 57, 57, 57,  2, 57, 57,  2,  2,  2,
-    2,  2, 57, 57, 57, 57, 57, 57, 57, 57,  2, 57, 57, 57,  2, 57,
-   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
-   57, 57, 57, 57,  2,  2, 57, 57, 57,  2,  2,  2,  2, 57, 57,  2,
-    2,  2,  2,  2,  2,  2, 88, 88, 88, 88, 88, 88, 88, 88,117,117,
-  117,117,117,117,117,117,112,112,112,112,112,112,112,112,112,112,
-  112,112,112,112,112,  2,  2,  2,  2,112,112,112,112,112, 78, 78,
-   78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,  2,  2,  2, 78,
-   78, 78, 78, 78, 78, 78, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
-   83, 83, 83, 83,  2,  2, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-   82,  2,  2,  2,  2,  2,122,122,122,122,122,122,122,122,122,122,
-    2,  2,  2,  2,  2,  2,  2,122,122,122,122,  2,  2,  2,  2,122,
-  122,122,122,122,122,122, 89, 89, 89, 89, 89, 89, 89, 89, 89,  2,
-    2,  2,  2,  2,  2,  2,130,130,130,130,130,130,130,130,130,130,
-  130,  2,  2,  2,  2,  2,  2,  2,130,130,130,130,130,130,144,144,
-  144,144,144,144,144,144,144,144,  2,  2,  2,  2,  2,  2,165,165,
-  165,165,165,165,165,165,165,165,165,165,165,165,  2,  2,  2,165,
-  165,165,165,165,165,165,  2,  2,  2,  2,  2,  2,165,165,156,156,
+    1,  1,  1,  1,  2,  2,  1,  1,  1,  1,  2,  2,  2,  2, 62, 62,
+   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,  2, 62, 62, 76, 76,
+   76, 76, 76, 76, 76, 76, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+   93, 93,  2,  2,  2,  2,  2,  2,  2,  2, 93, 93, 93, 93, 70, 70,
+   70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 70, 70, 70, 70,
+    2,  2,  2, 70, 70, 70, 73, 73, 73, 73, 73, 73, 73, 73,  6,  6,
+    6,  2,  2,  2,  2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,  1,
+    1,  0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,
+    0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
+    0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
+    9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,  9,
+   19, 19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19, 19,  6, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,
+    9,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,  2,  9,  9,  9,
+    9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,  9,
+    9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
+    0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  2, 19, 19,
+   19, 19, 19,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2,  1,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
+   19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  0, 19,  0,
+    0,  0,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  2, 27, 27,
+   27, 27, 27, 27, 27, 27,  0,  0,  0,  0,  2,  2,  0,  0, 56, 56,
+   56, 56, 56, 56, 56, 56, 55, 55, 55, 55,  2,  2,  2,  2,  2, 55,
+   55, 55, 55, 55, 55, 55, 61, 61, 61, 61, 61, 61, 61, 61,  2,  2,
+    2,  2,  2,  2,  2, 61, 61,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  0,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2, 13, 13,
+   13, 13, 13, 13,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0, 13,
+   13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13, 13,
+   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
+    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0, 17, 17, 17,  2,  2,
+    2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,
+    2,  2,  2,  2,  2,  0, 12, 12, 12, 12, 12, 12, 12,  0, 17, 17,
+   17, 17, 17, 17, 17,  0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 39, 39,  2,  2,  2, 39, 39, 39, 39, 39, 39, 39,  2, 86, 86,
+   86, 86, 86, 86, 86, 86, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+   77, 77,  2,  2,  2,  2, 79, 79, 79, 79, 79, 79, 79, 79,  0,  0,
+   19, 19, 19, 19, 19, 19,  0,  0,  0, 19, 19, 19, 19, 19,  2, 19,
+   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 65, 65, 65, 65, 75, 75,
+   75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,  2,  2,  2,  2,
+    2,  2,  2,  2, 75, 75, 75, 75,  2,  2,  2,  2,  2,  2, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,  0, 69, 74, 74,
+   74, 74, 74, 74, 74, 74, 74, 74, 74, 74,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 74, 12, 12, 12, 12, 12,  2,  2,  2, 84, 84,
+   84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,  2,  0, 84, 84,
+    2,  2,  2,  2, 84, 84, 33, 33, 33, 33, 33, 33, 33,  2, 68, 68,
+   68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2, 68, 68,
+   68, 68, 68, 68,  2,  2, 68, 68,  2,  2, 68, 68, 68, 68, 92, 92,
+   92, 92, 92, 92, 92, 92, 92, 92, 92,  2,  2,  2,  2,  2,  2,  2,
+    2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+   87, 87, 87, 87, 87,  2,  2, 30, 30, 30, 30, 30, 30,  2, 19, 19,
+   19,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9, 19, 19, 19, 19,
+    0,  0,  2,  2,  2,  2, 87, 87, 87, 87, 87, 87,  2,  2, 87, 87,
+    2,  2,  2,  2,  2,  2, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,
+    2, 12, 12, 12, 12, 12, 13, 13,  2,  2,  2,  2,  2,  2, 19, 19,
+   19, 19, 19, 19, 19,  2,  2,  2,  2,  4,  4,  4,  4,  4,  2,  2,
+    2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2, 14, 14,
+   14, 14, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14,  3,  3,
+    3,  3,  3,  3,  0,  0,  1,  1,  1,  1,  1,  1,  6,  6,  0,  0,
+    0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  3,  3,
+    3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  2,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
+   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
+   12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49, 49,
+   49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
+   49, 49, 49, 49, 49,  2, 49, 49, 49,  2, 49, 49,  2, 49, 49, 49,
+   49, 49, 49, 49,  2,  2, 49, 49, 49,  2,  2,  2,  2,  2,  0,  0,
+    0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
+    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67,  2,
+    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
+  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+   59, 59,  2,  2,  2,  2, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
+   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 50, 50,
+   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  2,  2, 50, 50,
+    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
+  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,104,104,
+  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
+  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
+    2,161,161,161,161,161,161,161,  2,161,161,  2,  2,  2,170,170,
+  170,170,170,170,170,170,170,170,170,170,  2,  2,  2,  2,110,110,
+  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,110,110,
+  110,110,110,110,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19,  2,
+   19, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2, 47, 47,
+   47, 47, 47, 47,  2,  2, 47,  2, 47, 47, 47, 47, 47, 47, 47, 47,
+   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,  2, 47, 47,  2,
+    2,  2, 47,  2,  2, 47, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+   81, 81, 81, 81,  2, 81,120,120,120,120,120,120,120,120,116,116,
+  116,116,116,116,116,116,116,116,116,116,116,116,116,  2,  2,  2,
+    2,  2,  2,  2,  2,116,128,128,128,128,128,128,128,128,128,128,
+  128,  2,128,128,  2,  2,  2,  2,  2,128,128,128,128,128, 66, 66,
+   66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  2,  2,  2, 66, 72, 72,
+   72, 72, 72, 72, 72, 72, 72, 72,  2,  2,  2,  2,  2, 72,173,173,
+  173,173,173,173,173,173,173,173,  2,  2,  2,  2,  2,  2, 98, 98,
+   98, 98, 98, 98, 98, 98, 97, 97, 97, 97, 97, 97, 97, 97,  2,  2,
+    2,  2, 97, 97, 97, 97,  2,  2, 97, 97, 97, 97, 97, 97, 57, 57,
+   57, 57,  2, 57, 57,  2,  2,  2,  2,  2, 57, 57, 57, 57, 57, 57,
+   57, 57,  2, 57, 57, 57,  2, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,  2,  2, 57, 57,
+   57,  2,  2,  2,  2, 57, 57,  2,  2,  2,  2,  2,  2,  2, 88, 88,
+   88, 88, 88, 88, 88, 88,117,117,117,117,117,117,117,117,112,112,
+  112,112,112,112,112,112,112,112,112,112,112,112,112,  2,  2,  2,
+    2,112,112,112,112,112, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
+   78, 78, 78, 78,  2,  2,  2, 78, 78, 78, 78, 78, 78, 78, 83, 83,
+   83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,  2,  2, 82, 82,
+   82, 82, 82, 82, 82, 82, 82, 82, 82,  2,  2,  2,  2,  2,122,122,
+  122,122,122,122,122,122,122,122,  2,  2,  2,  2,  2,  2,  2,122,
+  122,122,122,  2,  2,  2,  2,122,122,122,122,122,122,122, 89, 89,
+   89, 89, 89, 89, 89, 89, 89,  2,  2,  2,  2,  2,  2,  2,130,130,
+  130,130,130,130,130,130,130,130,130,  2,  2,  2,  2,  2,  2,  2,
+  130,130,130,130,130,130,144,144,144,144,144,144,144,144,144,144,
+    2,  2,  2,  2,  2,  2,165,165,165,165,165,165,165,165,165,165,
+  165,165,165,165,  2,  2,  2,165,165,165,165,165,165,165,  2,  2,
+    2,  2,  2,  2,165,165,  3,  3,  3,  3,  3,  3,  3,  2,156,156,
   156,156,156,156,156,156,156,156,  2,156,156,156,  2,  2,156,156,
-    2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  2,  2,  2,  2,  2,
-    2,  2,  3,  3,  3,  3,147,147,147,147,147,147,147,147,148,148,
+    2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  2,
+    2,  2,  2,  2,  2,  2,147,147,147,147,147,147,147,147,148,148,
   148,148,148,148,148,148,148,148,  2,  2,  2,  2,  2,  2,158,158,
   158,158,158,158,158,158,158,158,  2,  2,  2,  2,  2,  2,153,153,
   153,153,153,153,153,153,153,153,153,153,  2,  2,  2,  2,149,149,
@@ -2039,46 +1854,51 @@ _hb_ucd_u8[17612] =
   143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,143,143,
   143,143,143,143,143,143,143,143,143,143,143,143,143,  2,143,143,
     2,143,143,143,143,143,143,  2,  2,  2,  2,  2,  2,  2,143,143,
-    2,  2,  2,  2,  2,  2,145,145,145,145,145,145,145,145,145,  2,
-    2,  2,  2,  2,  2,  2,163,163,163,163,163,163,163,163,163,  2,
-  163,163,163,163,163,163,163,163,163,  2,  2,  2,163,163,163,163,
-  163,  2,  2,  2,  2,  2, 86,  2,  2,  2,  2,  2,  2,  2, 22, 22,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 22, 63, 63,
-   63, 63, 63, 63, 63, 63, 63, 63,  2,  2,  2,  2,  2,  2, 63, 63,
-   63, 63, 63, 63, 63,  2, 63, 63, 63, 63, 63,  2,  2,  2, 63, 63,
-   63, 63,  2,  2,  2,  2,157,157,157,157,157,157,157,157,157,157,
-  157,  2,  2,  2,  2,  2, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
-   80, 80, 80, 80,  2,  2, 80, 80, 80,  2,  2,  2,  2,  2,127,127,
-  127,127,127,127,127,127,127,127,127,127,127,127,127,  2,166,166,
-  166,166,166,166,166,166,166,166,  2,  2,  2,  2,  2,  2, 79,  2,
-    2,  2,  2,  2,  2,  2,115,115,115,115,115,115,115,115,115,115,
-  115,115,115,115,115,  2,115,115,  2,  2,  2,  2,115,115,159,159,
-  159,159,159,159,159,159,159,159,159,159,159,159,159,  2,159,159,
-    2,  2,  2,  2,  2,  2,103,103,103,103,103,103,103,103,103,103,
-  103,103,103,103,  2,  2,119,119,119,119,119,119,119,119,119,119,
-  119,119,119,119,  2,  2,119,119,  2,119,119,119,119,119,  2,  2,
-    2,  2,  2,119,119,119,167,167,167,167,167,167,167,167,167,167,
-    2,  2,  2,  2,  2,  2,146,146,146,146,146,146,146,146,146,146,
-  146,  2,  2,  2,  2,  2, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+    2,  2,  2,  2,  2,  2,175,175,175,175,175,175,175,175,175,175,
+  175,175,  2,  2,  2,  2,175,175,  2,  2,  2,  2,  2,  2,145,145,
+  145,145,145,145,145,145,145,  2,  2,  2,  2,  2,  2,  2,163,163,
+  163,163,163,163,163,163,163,  2,163,163,163,163,163,163,163,163,
+  163,  2,  2,  2,163,163,163,163,163,  2,  2,  2,  2,  2, 86,  2,
+    2,  2,  2,  2,  2,  2, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63, 63,
+   63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,157,
+  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2, 80, 80,
+   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2,  2, 80, 80,
+   80,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,127,127,127,
+  127,127,127,127,127,  2,166,166,166,166,166,166,166,166,166,166,
+    2,  2,  2,  2,  2,  2, 79,  2,  2,  2,  2,  2,  2,  2,115,115,
+  115,115,115,115,115,115,115,115,115,115,115,115,115,  2,115,115,
+    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,159,159,159,
+  159,159,159,159,159,  2,159,159,  2,  2,  2,  2,  2,  2,103,103,
+  103,103,103,103,103,103,103,103,103,103,103,103,  2,  2,119,119,
+  119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,119,119,
+    2,119,119,119,119,119,  2,  2,  2,  2,  2,119,119,119,167,167,
+  167,167,167,167,167,167,167,167,  2,  2,  2,  2,  2,  2,146,146,
+  146,146,146,146,146,146,146,146,146,  2,  2,  2,  2,  2,172,172,
+  172,172,172,172,172,172,172,  2,  2,172,172,172,172,172,172,172,
+  172,172,  2,  2,  2,  2, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
    99,  2,  2,  2,  2, 99,  2,  2,  2,  2,  2,  2,  2, 99,136,139,
-   13, 13,155,  2,  2,  2,136,136,136,136,136,136,136,136,155,155,
-  155,155,155,155,155,155,155,155,155,155,155,155,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,155,136,  2,  2,  2,  2,  2,  2,  2, 17, 17,
+   13, 13,155,  2,  2,  2, 13, 13, 13, 13, 13, 13, 13,  2,136,136,
+  136,136,136,136,136,136,155,155,155,155,155,155,155,155,155,155,
+  155,155,155,155,  2,  2,  2,  2,  2,  2,  2,  2,  2,155,136,136,
+  136,136,136,136,136,  2,136,136,136,  2,  2,  2,  2,  2, 17, 17,
    17, 17,  2, 17, 17, 17, 17, 17, 17, 17,  2, 17, 17,  2, 17, 15,
    15, 15, 15, 15, 15, 15, 17, 17, 17,  2,  2,  2,  2,  2,  2,  2,
    15,  2,  2,  2,  2,  2, 15, 15, 15,  2,  2, 17,  2,  2,  2,  2,
     2,  2, 17, 17, 17, 17,139,139,139,139,139,139,139,139,139,139,
   139,139,  2,  2,  2,  2,105,105,105,105,105,105,105,105,105,105,
   105,  2,  2,  2,  2,  2,105,105,105,105,105,  2,  2,  2,105,  2,
-    2,  2,  2,  2,  2,  2,105,105,  2,  2,105,105,105,105,  1,  1,
-    1,  1,  1,  1,  2,  2,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,
+    2,  2,  2,  2,  2,  2,105,105,  2,  2,105,105,105,105,  2,  2,
+    0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  2,  2,  2,  1,  1,
+    1,  1,  1,  1,  1,  2,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,
     1,  0,  0,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,
     1,  1,  1,  1,  0,  0,  2,  2,  0,  2,  2,  0,  0,  2,  2,  0,
     0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  2,  0,  0,  0,  0,  0,
-    0,  0,  2,  0,  0,  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,  0,
-    2,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  2,  0,  2,  2,  2,
-    0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,131,131,
+    0,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
+    0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  0,
+    0,  0,  0,  2,  0,  2,  0,  2,  0,  0,  0,  0,  0,  0,131,131,
   131,131,131,131,131,131,131,131,131,131,  2,  2,  2,  2,  2,  2,
     2,131,131,131,131,131,  2,131,131,131,131,131,131,131,  2,  2,
     2,  2,  2, 19, 19, 19, 56, 56, 56, 56, 56, 56, 56,  2, 56,  2,
@@ -2090,7 +1910,9 @@ _hb_ucd_u8[17612] =
   160,160,160,160,160,  2,152,152,152,152,152,152,152,152,152,152,
     2,  2,  2,  2,  2,152,164,164,164,164,164,164,164,164,164,164,
     2,  2,  2,  2,  2,  2,168,168,168,168,168,168,168,168,168,168,
-  168,  2,  2,  2,  2,168, 30, 30, 30, 30,  2, 30, 30,  2,113,113,
+  168,  2,  2,  2,  2,168,174,174,174,174,174,174,174,174,174,174,
+  174,174,174,174,174,  2,174,174,174,174,174,174,  2,  2,  2,  2,
+    2,  2,  2,  2,174,174, 30, 30, 30, 30,  2, 30, 30,  2,113,113,
   113,113,113,113,113,113,113,113,113,113,113,  2,  2,113,113,113,
   113,113,113,113,113,  2,132,132,132,132,132,132,132,132,132,132,
   132,132,  2,  2,  2,  2,132,132,  2,  2,  2,  2,132,132,  3,  3,
@@ -2101,8 +1923,8 @@ _hb_ucd_u8[17612] =
     3,  3,  3,  2,  3,  2,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,
     3,  3,  2,  2,  2,  2,  2,  3,  3,  3,  2,  3,  3,  3,  3,  3,
     2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0, 15,  0,
-    0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  2,  2,
-    2,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  2,  0,  0,  0,
+    0,  2,  2,  2,  2,  2,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,
+    0,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  0,  0,  0,  0,  0,
     0,  0,  0,  2,  2,  0, 13,  2,  2,  2,  2,  2,  2,  2, 13, 13,
    13,  2,  2,  2,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  0,  1,
     2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,  9, 11, 12, 13,
@@ -2186,8 +2008,7 @@ _hb_ucd_u8[17612] =
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
 };
-static const uint16_t
-_hb_ucd_u16[10400] =
+static const uint16_t _hb_ucd_u16[10832]=
 {
      0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
     13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
@@ -2210,27 +2031,29 @@ _hb_ucd_u16[10400] =
     48,  48,  48,  48, 168, 169,  48,  48, 168,  48,  48, 170, 171, 172,  48,  48,
     48, 171,  48,  48,  48, 173, 174, 175,  48, 176,   9,   9,   9,   9,   9, 177,
    178,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
     48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
    194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
     48, 200, 201, 202, 203,  48, 204, 205,  48,  48, 206,  48, 207, 208, 209, 209,
-    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215, 216, 140, 140, 140,
-   217,  48,  48, 218, 219, 160, 220, 221, 222,  48, 223,  64,  48,  48, 224, 225,
-    48,  48, 226, 227, 228,  64,  48, 229, 230,   9,   9, 231, 232, 233, 234, 235,
-    11,  11, 236,  27,  27,  27, 237, 238,  11, 239,  27,  27,  32,  32,  32,  32,
-    13,  13,  13,  13,  13,  13,  13,  13,  13, 240,  13,  13,  13,  13,  13,  13,
-   241, 242, 241, 241, 242, 243, 241, 244, 245, 245, 245, 246, 247, 248, 249, 250,
-   251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 261, 262, 263, 264, 265,
-   266, 267, 268, 269, 270, 271, 272, 272, 273, 274, 275, 209, 276, 277, 209, 278,
-   279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
-   280, 209, 281, 209, 209, 209, 209, 282, 209, 283, 279, 284, 209, 285, 286, 209,
-   209, 209, 176, 140, 287, 140, 271, 271, 271, 288, 209, 209, 209, 209, 289, 271,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 290, 291, 209, 209, 292,
-   209, 209, 209, 209, 209, 209, 293, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 209, 209, 209, 294, 295, 271, 296, 209, 209, 297, 279, 298, 279,
+    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215,  32, 216, 217, 140,
+   218,  48,  48, 219, 220, 160, 221, 222, 223,  48, 224,  64,  48,  48, 225, 226,
+    48,  48, 227, 228, 229,  64,  48, 230, 231,   9,   9, 232, 233, 234, 235, 236,
+    11,  11, 237,  27,  27,  27, 238, 239,  11, 240,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 241,  13,  13,  13,  13,  13,  13,
+   242, 243, 242, 242, 243, 244, 242, 245, 246, 246, 246, 247, 248, 249, 250, 251,
+   252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 262, 263, 264, 265, 266,
+   267, 268, 269, 270, 271, 272, 273, 273, 274, 275, 276, 209, 277, 278, 209, 279,
+   280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+   281, 209, 282, 209, 209, 209, 209, 283, 209, 284, 280, 285, 209, 286, 287, 209,
+   209, 209, 176, 140, 288, 140, 272, 272, 272, 289, 209, 209, 209, 209, 290, 272,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 291, 292, 209, 209, 293,
+   209, 209, 209, 209, 209, 209, 294, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 295, 296, 272, 297, 209, 209, 298, 280, 299, 280,
    209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   279, 279, 279, 279, 279, 279, 279, 279, 299, 300, 279, 279, 279, 301, 279, 302,
-   209, 209, 209, 279, 303, 209, 209, 304, 209, 305, 209, 209, 209, 209, 209, 209,
+   280, 280, 280, 280, 280, 280, 280, 280, 300, 301, 280, 280, 280, 302, 280, 303,
+   280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+   209, 209, 209, 280, 304, 209, 209, 305, 209, 209, 209, 209, 209, 209, 209, 209,
      9,   9,   9,  11,  11,  11, 306, 307,  13,  13,  13,  13,  13,  13, 308, 309,
     11,  11, 310,  48,  48,  48, 311, 312,  48, 313, 314, 314, 314, 314,  32,  32,
    315, 316, 317, 318, 319, 320, 140, 140, 209, 321, 209, 209, 209, 209, 209, 322,
@@ -2238,226 +2061,201 @@ _hb_ucd_u16[10400] =
    324, 325, 326, 327, 136,  48,  48,  48,  48, 328, 178,  48,  48,  48,  48, 329,
    330,  48,  48, 136,  48,  48,  48,  48, 200, 331,  48,  48, 209, 209, 332,  48,
    209, 333, 334, 209, 335, 336, 209, 209, 334, 209, 209, 336, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
     48, 337,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 229,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 230,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
    339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
     31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
    357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
     64,  48, 365,  48, 366, 367,  48, 151,  76,  48,  48, 368, 369, 370, 371, 372,
     48,  48, 373, 374, 375, 376,  48, 377,  48,  48,  48, 378, 379, 380, 381, 382,
    383, 384, 314,  11,  11, 385, 386,  11,  11,  11,  11,  11,  48,  48, 387, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 388,  48, 389,  48,  48, 206,
    390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
    391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
    392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
     32, 404,  32, 405, 406, 407, 408, 409,  48,  48,  48,  48,  48,  48,  48, 410,
    411,   2,   3,   4,   5, 412, 413, 414,  48, 415,  48, 200, 416, 417, 418, 419,
    420,  48, 172, 421, 204, 204, 140, 140,  48,  48,  48,  48,  48,  48,  48,  71,
-   422, 271, 271, 423, 272, 272, 272, 424, 425, 426, 427, 140, 140, 209, 209, 428,
+   422, 272, 272, 423, 273, 273, 273, 424, 425, 426, 427, 140, 140, 209, 209, 428,
    140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
     48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
      9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
     48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445,  48,  48,  48, 388,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48, 313,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
    448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
-    48, 454,  48, 455, 140, 140, 140, 140,  48,  48,  48, 456, 271, 457, 271, 271,
+    48, 454,  48, 455,  48, 207, 140, 140,  48,  48,  48, 456, 272, 457, 272, 272,
    458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
     48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
     48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
     48,  48, 475, 192, 476,   9, 477,  11, 478, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 271, 479,  48,  48, 480, 481, 482, 140, 140, 483,
-    48, 464, 484,  48,  62, 485, 140,  48, 486, 140, 140,  48, 487, 140,  48, 313,
-   488,  48,  48, 489, 490, 457, 491, 492, 222,  48,  48, 493, 494,  48, 196, 192,
-   495,  48, 496, 497, 498,  48,  48, 499, 222,  48,  48, 500, 501, 502, 503, 504,
-    48,  97, 505, 506, 507, 140, 140, 140, 508, 509, 510,  48,  48, 511, 512, 192,
-   513,  83,  84, 514, 515, 516, 517, 518, 519,  48,  48, 520, 521, 522, 523, 140,
-    48,  48,  48, 524, 525, 526, 481, 140,  48,  48,  48, 527, 528, 192, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 529, 530, 531, 532, 140, 140,
-    48,  48,  48, 533, 534, 192, 535, 140,  48,  48, 536, 537, 192, 538, 539, 140,
-    48, 540, 541, 542, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48, 505, 543, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 544,
-   545, 546,  48, 547, 548, 192, 140, 140, 140, 140, 549,  48,  48, 550, 551, 140,
-   552,  48,  48, 553, 554, 555,  48,  48, 556, 557, 558,  48,  48,  48,  48, 196,
-   559, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 560, 192,
-    84,  48, 529, 561, 562, 148, 175, 563,  48, 564, 565, 566, 140, 140, 140, 140,
-   567,  48,  48, 568, 569, 192, 570,  48, 571, 572, 192, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 573,
-   574, 115,  48, 575, 576, 577, 140, 140, 140, 140, 140, 100, 271, 578, 579, 580,
+   140, 140, 140, 140, 140, 140, 272, 479,  48,  48, 480, 481, 482, 483, 140, 484,
+    48, 464, 485,  48,  62, 486, 140,  48, 487, 140, 140,  48, 488, 140,  48, 313,
+   489,  48,  48, 490, 491, 457, 492, 493, 223,  48,  48, 494, 495,  48, 196, 192,
+   496,  48, 497, 498, 499,  48,  48, 500, 223,  48,  48, 501, 502, 503, 504, 505,
+    48,  97, 506, 507, 508, 140, 140, 140, 509, 510, 511,  48,  48, 512, 513, 192,
+   514,  83,  84, 515, 516, 517, 518, 519, 520,  48,  48, 521, 522, 523, 524, 140,
+    48,  48,  48, 525, 526, 527, 481, 140,  48,  48,  48, 528, 529, 192, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 530, 531, 532, 533, 140, 140,
+    48,  48,  48, 534, 535, 192, 536, 140,  48,  48, 537, 538, 192, 539, 540, 140,
+    48, 541, 542, 543, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 506, 544, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 545,
+   546, 547,  48, 548, 549, 192, 140, 140, 140, 140, 550,  48,  48, 551, 552, 140,
+   553,  48,  48, 554, 555, 556,  48,  48, 557, 558, 559,  48,  48,  48,  48, 196,
+   560, 140, 140, 140, 140, 140, 561, 140, 140, 140, 140, 140,  48,  48, 562, 192,
+    84,  48, 530, 563, 564, 148, 175, 565,  48, 566, 567, 568, 140, 140, 140, 140,
+   569,  48,  48, 570, 571, 192, 572,  48, 573, 574, 192,  48,  48, 575, 192, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 576,
+   577, 115,  48, 578, 579, 580, 140, 140, 140, 140, 140, 100, 272, 581, 582, 583,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
-   272, 272, 272, 272, 272, 272, 581, 582,  48,  48,  48,  48,  48,  48,  48,  48,
+   273, 273, 273, 273, 273, 273, 584, 585,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
    140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 583,
-    48,  48,  48, 584, 585, 586,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 586,
+    48,  48,  48, 587, 588, 589,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  71,
     48,  48,  48,  48, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48, 587, 588, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 589,
-    48,  48,  48, 590, 591, 592, 593, 594,  48, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 595,  48, 596, 192, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140,   9,   9,  11,  11, 271, 597, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 598, 599, 600, 600, 601, 602, 140, 140, 140, 140, 603, 604,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 440,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 605,
-   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 606,
-    48,  48, 607, 608, 140, 609, 610,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 590, 591, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 592,
+    48,  48,  48, 593, 594, 595, 596, 597,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 598,  48, 599, 192, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 272, 600,   9, 601,  11, 602, 140, 140,
+    48,  48,  48,  48, 603, 604, 605, 605, 606, 607, 140, 140, 140, 140, 608, 609,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 610,
+    48, 200, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48,  48, 611,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 612,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48, 611, 613, 140, 614, 615,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
-    48,  48,  48,  48,  48,  48,  71, 151, 196, 611, 612, 140, 140, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 192,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140, 140,
-    32,  32, 613,  32, 614, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 616, 617, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 618,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 619, 209, 427, 209, 620,
+    32,  32, 216,  32, 621, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
    209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323,
-   209, 209, 615, 209, 209, 209, 616, 617, 618, 209, 619, 209, 209, 209, 287, 140,
-   209, 209, 209, 209, 620, 140, 140, 140, 140, 140, 140, 140, 271, 621, 271, 621,
-   209, 209, 209, 209, 209, 338, 271, 461, 140, 140, 140, 140, 140, 140, 140, 140,
-     9, 622,  11, 623, 624, 625, 241,   9, 626, 627, 628, 629, 630,   9, 622,  11,
-   631, 632,  11, 633, 634, 635, 636,   9, 637,  11,   9, 622,  11, 623, 624,  11,
-   241,   9, 626, 636,   9, 637,  11,   9, 622,  11, 638,   9, 639, 640, 641, 642,
-    11, 643,   9, 644, 645, 646, 647,  11, 648,   9, 649,  11, 650, 538, 538, 538,
-    32,  32,  32, 651,  32,  32, 652, 653, 654, 655,  45, 140, 140, 140, 140, 140,
-   656, 657, 658, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   659, 660, 661,  27,  27,  27, 662, 140, 663, 140, 140, 140, 140, 140, 140, 140,
-    48,  48, 151, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 666, 140,  48,  48, 667, 668,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 669, 192,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 587, 670,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 671, 200,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 672, 614, 140, 140,
-     9,   9, 626,  11, 673, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 503, 271, 271, 674, 675, 140, 140, 140, 140,
-   503, 271, 676, 677, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   678,  48, 679, 680, 681, 682, 683, 684, 685, 206, 686, 206, 140, 140, 140, 687,
-   209, 209, 688, 209, 209, 209, 209, 209, 209, 322, 333, 689, 689, 689, 209, 323,
-   690, 209, 209, 209, 209, 209, 209, 209, 209, 209, 691, 140, 140, 140, 692, 209,
-   693, 209, 209, 688, 694, 695, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 696,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 697, 426, 426,
-   209, 209, 209, 209, 209, 209, 209, 698, 209, 209, 209, 209, 209, 176, 688, 427,
-   688, 209, 209, 209, 699, 176, 209, 209, 699, 209, 691, 688, 695, 140, 140, 140,
-   209, 209, 209, 209, 209, 322, 691, 426, 700, 209, 209, 209, 701, 702, 176, 694,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 703, 209, 209, 209, 209, 209, 192,
+   209, 209, 622, 209, 209, 209, 623, 624, 625, 209, 626, 209, 209, 209, 288, 140,
+   209, 209, 209, 209, 627, 140, 140, 140, 140, 140, 140, 140, 272, 628, 272, 628,
+   209, 209, 209, 209, 209, 338, 272, 461, 140, 140, 140, 140, 140, 140, 140, 140,
+     9, 629,  11, 630, 631, 632, 242,   9, 633, 634, 635, 636, 637,   9, 629,  11,
+   638, 639,  11, 640, 641, 642, 643,   9, 644,  11,   9, 629,  11, 630, 631,  11,
+   242,   9, 633, 643,   9, 644,  11,   9, 629,  11, 645,   9, 646, 647, 648, 649,
+    11, 650,   9, 651, 652, 653, 654,  11, 655,   9, 656,  11, 657, 539, 539, 539,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+    32,  32,  32, 658,  32,  32, 659, 660, 661, 662,  45, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   663, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   666, 667, 668,  27,  27,  27, 669, 140, 670, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 151, 671, 672, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 673, 140,  48,  48, 674, 675,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 676, 192,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 590, 677,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 200, 678, 679,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 680, 200,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 681, 621, 140, 140,
+     9,   9, 633,  11, 682, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 504, 272, 272, 683, 684, 140, 140, 140, 140,
+   504, 272, 685, 686, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   687,  48, 688, 689, 690, 691, 692, 693, 694, 206, 695, 206, 140, 140, 140, 696,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 697, 209, 209, 209, 209, 209, 209, 322, 333, 698, 698, 698, 209, 323,
+   699, 209, 209, 209, 209, 209, 209, 209, 209, 209, 700, 140, 140, 140, 701, 209,
+   702, 209, 209, 697, 703, 704, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 705,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 706, 426, 426,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 176, 697, 427,
+   697, 209, 209, 209, 707, 176, 209, 209, 707, 209, 700, 697, 704, 708, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 707, 700, 426, 709, 209, 209, 209, 710, 711, 712, 703,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 713, 209, 209, 209, 209, 209, 714,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
-    48,  48,  48, 207,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 481,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100,  48,
     48,  48,  48,  48,  48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140, 140, 140, 140,
-   704, 140, 584, 584, 584, 584, 584, 584, 140, 140, 140, 140, 140, 140, 140, 140,
-    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 705,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 706,
-     0,   1,   2,   3,   4,   4,   4,   4,   4,   4,   5,   6,   7,   8,   9,  10,
-    11,  11,  12,  11,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
-    25,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,
-    41,  42,  43,  44,  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,
-    57,  57,  58,  59,  60,  60,  60,  60,  61,  62,  63,  64,  65,  66,  67,  68,
-    69,  69,  69,  69,  69,  69,  69,  69,  69,  69,  70,  71,  72,  73,  74,  75,
-    76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,
-    92,  93,  94,  95,  96,  97,  98,   7,   4,   4,   4,   4,  99, 100, 101, 102,
-   103, 104, 105, 106, 107, 108, 109,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   110, 111,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   112, 112, 112, 112,   0,   0,   0,   0,   0,   0,   0,   0,   0, 113, 114,   0,
-   115, 116, 117, 118, 119, 120, 121, 122,   0, 123, 124, 125, 126, 126, 126, 127,
-   128, 129, 130, 131, 132,  60, 133, 134, 135, 136,   0, 137, 138, 139,   0,   0,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
-   126, 126, 126, 126, 126, 126, 126,   0, 126, 126, 126, 126, 126, 126, 126, 126,
    140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 141, 142, 143, 143, 143, 143, 144,  11, 145, 146, 147,   4, 148, 149,
-   150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
-    60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,
-    60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60, 166, 167,
-   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-   168, 168, 168, 168, 126, 126, 126, 126, 126, 169, 126, 170, 171, 172,  19, 173,
-    19,  19,  19,  19, 174,  19, 175, 176, 177, 178,  19, 179, 180, 181, 182, 183,
-   184, 185, 186, 187, 188, 189, 190, 191, 168, 168, 192, 193, 194, 195, 196, 197,
-   198, 199, 200, 201, 202, 203, 204, 205, 206, 206, 206, 206, 207, 208, 209, 168,
-   210, 211, 212, 213, 214, 168, 215, 216, 217, 218, 219, 220, 221, 222, 223, 168,
-   224, 225, 226, 227, 228, 229, 230, 168, 168, 231, 232, 233, 234, 235, 236, 237,
-   238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
-   254, 255, 256, 257, 168, 168, 258, 259, 260, 261, 262, 263, 264, 265, 168, 168,
-   266, 168, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 168, 168, 278,
-   279, 280, 281, 168, 282, 283, 284, 168, 168, 168, 168, 285, 286, 287, 288, 289,
-   290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291, 168,
-   290, 292, 290, 290, 290, 293, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 294, 295,
-   296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
-   296, 297, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
-   296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 298,
-   299, 299, 299, 299, 299, 299, 299, 299, 299, 300, 168, 168, 168, 168, 168, 168,
-   168, 168, 168, 168, 301, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-   302, 302, 302, 302, 302, 302, 302, 302, 303, 304, 305, 306, 307, 308, 309, 168,
-   168, 168, 168, 168, 168, 310, 168, 168, 168, 311, 312, 168, 313, 314, 315, 316,
-   317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317,
-   317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 318,
-   317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 319, 319, 319, 319,
-   319, 319, 319, 320, 321, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 322,
-   323, 324, 324, 324, 325, 326, 327, 327, 327, 327, 327, 328, 168, 168, 168, 168,
-   329, 330, 331, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-     0,   0,   0, 332,   0,   0,   0,   0,   0,   0, 333, 168, 334, 335,   0, 336,
-     0,   0,   0, 337, 338, 339, 340, 341, 189, 342, 168, 343,   0, 344, 168, 168,
-     0, 345, 346, 347, 348, 349,   0,   0,   0,   0, 350,   0,   0,   0,   0, 351,
-   352, 352, 352, 352, 352, 352, 352, 352, 352, 352, 353, 168, 168, 168, 168, 168,
-   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 354, 168, 168, 168,
-   355, 356, 357, 168, 358, 359, 168, 168, 168, 168, 360, 361, 168, 168, 168, 168,
-   168, 168, 168, 362, 168, 168, 168, 363, 168, 168, 168, 168, 168, 168, 168, 364,
-   365, 365, 365, 366, 367, 368, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-   168, 369, 370, 168, 371, 168, 168, 168, 372, 373, 374, 375, 168, 168, 168, 168,
-   376,   0, 377, 378,   0,   0, 379, 380, 381, 382, 168, 168,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 383,   0, 384,   0, 385,
-   386, 387, 388, 389,   0,   0,   0,   0,   0, 390, 391, 392,   0,   0, 393, 332,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 394, 126, 126, 126, 126,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 395, 126, 126, 126,
-   396, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 397, 126, 126, 126, 126, 126,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 398,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 399, 168, 168, 168, 168, 168, 168,
-   126, 126, 126, 126, 126, 126, 126, 126, 399, 168, 168, 168, 168, 168, 168, 168,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 400, 126, 126,
-   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 401, 168,
-   402,   0, 168, 168,   7,   7,   7, 403,   0,   1,   2,   3,   4,   4,   4,   4,
+    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   715, 140, 587, 587, 587, 587, 587, 587, 140, 140, 140, 140, 140, 140, 140, 140,
+    32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 716,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 717,
      0,   0,   0,   0,   0,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3,
      0,   0,   0,   0,   0,   4,   0,   4,   2,   2,   5,   2,   2,   2,   5,   2,
-     2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   6,
-     0,   0,   0,   0,   7,   8,   0,   0,   9,   9,   9,   9,   9,   9,   9,   9,
-     9,   9,   9,   9,   9,   9,  10,  11,  12,  13,  14,  14,  15,  14,  14,  14,
-    14,  14,  14,  14,  16,  17,  14,  14,  18,  18,  18,  18,  18,  18,  18,  18,
-    19,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  20,  21,
-    21,  21,  22,  20,  21,  21,  21,  21,  21,  23,  24,  25,  25,  25,  25,  25,
-    25,  26,  25,  25,  25,  27,  28,  26,  29,  30,  31,  32,  31,  31,  31,  31,
-    33,  34,  35,  31,  31,  31,  36,  31,  31,  31,  31,  31,  31,  31,  31,  31,
-    31,  31,  31,  29,  31,  31,  31,  31,  37,  38,  37,  37,  37,  37,  37,  37,
-    37,  39,  31,  31,  31,  31,  31,  31,  40,  40,  40,  40,  40,  40,  41,  26,
-    42,  42,  42,  42,  42,  42,  42,  43,  44,  44,  44,  44,  44,  45,  44,  46,
-    47,  47,  47,  48,  37,  49,  31,  31,  31,  50,  51,  31,  31,  31,  31,  31,
-    31,  31,  31,  31,  52,  31,  31,  31,  53,  53,  53,  53,  53,  53,  53,  53,
-    53,  53,  54,  53,  55,  53,  53,  53,  56,  57,  58,  59,  59,  60,  61,  62,
-    57,  63,  64,  65,  66,  59,  59,  67,  68,  69,  70,  71,  71,  72,  73,  74,
-    69,  75,  76,  77,  78,  71,  79,  26,  80,  81,  82,  83,  83,  84,  85,  86,
-    81,  87,  88,  26,  89,  83,  90,  91,  92,  93,  94,  95,  95,  96,  97,  98,
-    93,  99, 100, 101, 102,  95,  95,  26, 103, 104, 105, 106, 107, 104, 108, 109,
-   104, 105, 110,  26, 111, 108, 108, 112, 113, 114, 115, 113, 113, 115, 113, 116,
-   114, 117, 118, 119, 120, 113, 121, 113, 122, 123, 124, 122, 122, 124, 125, 126,
-   123, 127, 128, 128, 129, 122, 130,  26, 131, 132, 133, 131, 131, 131, 131, 131,
-   132, 133, 134, 131, 135, 131, 131, 131, 136, 137, 138, 139, 137, 137, 140, 141,
-   138, 142, 143, 137, 144, 137, 145,  26, 146, 147, 147, 147, 147, 147, 147, 148,
-   147, 147, 147, 149,  26,  26,  26,  26, 150, 151, 152, 152, 153, 152, 152, 154,
-   155, 156, 152, 157,  26,  26,  26,  26, 158, 158, 158, 158, 158, 158, 158, 158,
-   158, 159, 158, 158, 158, 160, 159, 158, 158, 158, 158, 159, 158, 158, 158, 161,
-   158, 161, 162, 163,  26,  26,  26,  26, 164, 164, 164, 164, 164, 164, 164, 164,
+     2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+     2,   2,   2,   2,   2,   2,   2,   6,   0,   0,   0,   0,   7,   8,   0,   0,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,  10,  11,
+    12,  13,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,  16,  17,  14,  14,
+    18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
+    19,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
+    18,  18,  18,  18,  18,  18,  20,  21,  21,  21,  22,  20,  21,  21,  21,  21,
+    21,  23,  24,  25,  25,  25,  25,  25,  25,  26,  25,  25,  25,  27,  28,  26,
+    29,  30,  31,  32,  31,  31,  31,  31,  33,  34,  35,  31,  31,  31,  36,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  29,  31,  31,  31,  31,
+    37,  38,  37,  37,  37,  37,  37,  37,  37,  39,  31,  31,  31,  31,  31,  31,
+    40,  40,  40,  40,  40,  40,  41,  26,  42,  42,  42,  42,  42,  42,  42,  43,
+    44,  44,  44,  44,  44,  45,  44,  46,  47,  47,  47,  48,  37,  49,  31,  31,
+    31,  31,  50,  31,  31,  31,  31,  31,  31,  31,  31,  31,  51,  31,  31,  31,
+    52,  52,  52,  52,  52,  52,  52,  52,  52,  52,  53,  52,  54,  52,  52,  52,
+    55,  56,  57,  58,  58,  59,  60,  61,  56,  62,  63,  64,  65,  58,  58,  66,
+    67,  68,  69,  70,  70,  71,  72,  73,  68,  74,  75,  76,  77,  70,  78,  26,
+    79,  80,  81,  82,  82,  83,  84,  85,  80,  86,  87,  26,  88,  82,  89,  90,
+    91,  92,  93,  94,  94,  95,  96,  97,  92,  98,  99, 100, 101,  94,  94,  26,
+   102, 103, 104, 105, 106, 103, 107, 108, 103, 104, 109,  26, 110, 107, 107, 111,
+   112, 113, 114, 112, 112, 114, 112, 115, 113, 116, 117, 118, 119, 112, 120, 112,
+   121, 122, 123, 121, 121, 123, 124, 125, 122, 126, 127, 128, 129, 121, 130,  26,
+   131, 132, 133, 131, 131, 131, 131, 131, 132, 133, 134, 131, 135, 131, 131, 131,
+   136, 137, 138, 139, 137, 137, 140, 141, 138, 142, 143, 137, 144, 137, 145,  26,
+   146, 147, 147, 147, 147, 147, 147, 148, 147, 147, 147, 149,  26,  26,  26,  26,
+   150, 151, 152, 152, 153, 152, 152, 154, 155, 156, 152, 157,  26,  26,  26,  26,
+   158, 158, 158, 158, 158, 158, 158, 158, 158, 159, 158, 158, 158, 160, 159, 158,
+   158, 158, 158, 159, 158, 158, 158, 161, 158, 161, 162, 163,  26,  26,  26,  26,
+   164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
    164, 164, 164, 164, 165, 165, 165, 165, 166, 167, 165, 165, 165, 165, 165, 168,
-   169, 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, 170, 170, 170,
-   170, 171, 172, 171, 170, 170, 170, 170, 170, 171, 170, 170, 170, 170, 171, 172,
-   171, 170, 172, 170, 170, 170, 170, 170, 170, 170, 171, 170, 170, 170, 170, 170,
-   170, 170, 170, 173, 170, 170, 170, 174, 170, 170, 170, 175, 176, 176, 176, 176,
-   176, 176, 176, 176, 176, 176, 177, 177, 178, 178, 178, 178, 178, 178, 178, 178,
+   169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+   170, 170, 170, 170, 170, 170, 170, 170, 170, 171, 172, 171, 170, 170, 170, 170,
+   170, 171, 170, 170, 170, 170, 171, 172, 171, 170, 172, 170, 170, 170, 170, 170,
+   170, 170, 171, 170, 170, 170, 170, 170, 170, 170, 170, 173, 170, 170, 170, 174,
+   170, 170, 170, 175, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 177, 177,
+   178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
    179, 179, 179, 180, 181, 181, 181, 181, 181, 181, 181, 181, 181, 182, 181, 183,
    184, 184, 185, 186, 187, 187, 188,  26, 189, 189, 190,  26, 191, 192, 193,  26,
    194, 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, 195, 194, 196, 194, 196,
@@ -2466,165 +2264,215 @@ _hb_ucd_u16[10400] =
    203, 203, 203, 204, 203, 205, 203, 205, 206, 203, 207, 207, 207, 208, 209,  26,
    210, 210, 210, 210, 210, 211, 210, 210, 210, 212, 210, 213, 194, 194, 194, 194,
    214, 214, 214, 215, 216, 216, 216, 216, 216, 216, 216, 217, 216, 216, 216, 218,
-   216, 219, 216, 219, 216, 220,   9,   9,   9, 221,  26,  26,  26,  26,  26,  26,
-   222, 222, 222, 222, 222, 222, 222, 222, 222, 223, 222, 222, 222, 222, 222, 222,
-   224, 224, 224, 224, 224, 224, 224, 224, 225, 225, 225, 225, 225, 225, 226, 227,
-   228, 228, 228, 228, 228, 228, 228, 229, 228, 230, 231, 231, 231, 231, 231, 231,
-    18, 232, 165, 165, 165, 165, 165, 233, 224,  26, 234,   9, 235, 236, 237, 238,
-     2,   2,   2,   2, 239, 240,   2,   2,   2,   2,   2, 241, 242, 243,   2, 244,
-     2,   2,   2,   2,   2,   2,   2, 245,  14,  14, 246, 246,  14,  14,  14,  14,
-   246, 246,  14, 247,  14,  14,  14, 246,  14,  14,  14,  14,  14,  14, 248,  14,
-   248,  14, 249, 250,  14,  14, 251, 252,   0, 253,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 254,   0, 255, 256,   0, 257,   2, 258,   0,   0,   0,   0,
-   259,  26,   9,   9,   9,   9, 260,  26,   0,   0,   0,   0, 261, 262,   4,   0,
-     0, 263,   0,   0,   2,   2,   2,   2,   2, 264,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0, 265,  26,  26,   0, 266,  26,  26,   0,   0,   0,   0,
-   267, 267, 267, 267, 267, 267, 267, 267,   0,   0,   0,   0,   0,   0, 268,   0,
-     0,   0, 269,   0,   0,   0,   0,   0, 270, 270, 270, 270, 270, 270, 270, 270,
-   270, 270, 270, 270,   2,   2,   2,   2,  17,  17,  17,  17,  17,  17,  17,  17,
-    17,  17,  17,  17,  17,  17, 271, 272, 165, 165, 165, 165, 166, 167, 273, 273,
-   273, 273, 273, 273, 273, 274, 275, 274, 170, 170, 172,  26, 172, 172, 172, 172,
-   172, 172, 172, 172,  18,  18,  18,  18,   0,   0,   0, 276,  26,  26,  26,  26,
-   277, 277, 277, 278, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 279,  26,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 280,  26,  26,  26,   0,   0,
-   281,   0,   0,   0, 282, 283,   0, 284, 285, 286, 286, 286, 286, 286, 286, 286,
-   286, 286, 287, 288, 289, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291,
-   292, 293, 293, 293, 293, 293, 294, 169, 169, 295,   0,   0, 293, 293, 293, 293,
-     0,   0,   0,   0, 276, 296, 290, 290, 169, 169, 169, 295,   0,   0,   0,   0,
-     0,   0,   0,   0, 169, 169, 169, 297,   0,   0, 290, 290, 290, 290, 290, 298,
-   290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290,   0,   0,   0,   0,   0,
-   299, 299, 299, 299, 299, 299, 299, 299, 299, 300, 299, 299, 299, 299, 299, 299,
-   301,  26, 302, 302, 302, 302, 302, 302, 303, 303, 303, 303, 303, 303, 303, 303,
-   303, 303, 303, 303, 303, 304,  26,  26,  18,  18,  18,  18, 305, 305, 305, 305,
-   305, 305, 305, 305, 305, 305, 305,  26,   0,   0,   0,   0, 306,   2,   2,   2,
-     2, 307,   2,   2,   2,   2,   2,   2,   2, 308, 309, 258,  26,  26, 310,   2,
-   311, 311, 311, 311, 311, 312,   0, 265, 313, 313, 313, 313, 313, 313, 313,  26,
-   314, 314, 314, 314, 314, 314, 314, 314, 315, 316, 314, 317,  53,  53,  53,  53,
-   318, 318, 318, 318, 318, 319, 320, 320, 320, 320, 321, 322, 169, 169, 169, 323,
-   324, 324, 324, 324, 324, 324, 324, 324, 324, 325, 324, 326, 164, 164, 164, 327,
-   328, 328, 328, 328, 328, 328, 329,  26, 328, 330, 328, 331, 164, 164, 164, 164,
-   332, 332, 332, 332, 332, 332, 332, 332, 333,  26,  26, 334, 335, 335, 336,  26,
-   337, 337, 337,  26, 172, 172,   2,   2,   2,   2,   2, 338, 339, 340, 176, 176,
-   176, 176, 176, 176, 176, 176, 176, 176, 335, 335, 335, 335, 335, 341, 335, 342,
-   169, 169, 169, 169, 343,  26, 169, 169, 295, 344, 169, 169, 169, 169, 169, 343,
-    26,  26,  26,  26,  26,  26,  26,  26, 277, 277, 277, 277, 277, 280, 277, 277,
-   277, 277, 277, 345,  26,  26,  26,  26, 346,  26, 347, 348,  25,  25, 349, 350,
-   351,  25,  31,  31,  31,  31,  31,  31, 352,  26, 353,  31,  31,  31,  31,  31,
-    31,  31,  31,  31,  31,  31,  31, 354,  31,  31, 355,  31,  31,  31,  31,  31,
-    31, 356,  26,  26,  26,  26,  31,  31,   9,   9,   0, 265,   9, 357,   0,   0,
-     0,   0, 358,   0, 257, 359, 360,  31,  31,  31,  31,  31,  31,  31,  31, 361,
-   362,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3, 363, 290, 289, 290,
-   290, 290, 290, 364, 169, 169, 169, 295, 365, 365, 365, 366, 257, 257,  26, 367,
-   368, 369, 368, 368, 370, 368, 368, 371, 368, 372, 368, 372,  26,  26,  26,  26,
-   368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 373,
-   374,   0,   0,   0,   0,   0, 375,   0,  14,  14,  14,  14,  14,  14,  14,  14,
-    14, 252,   0, 376, 377,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0, 378,
-   379, 379, 379, 380, 381, 381, 381, 381, 381, 381, 382,  26, 383,   0,   0, 359,
-   384, 384, 384, 384, 385, 386, 387, 387, 387, 388, 389, 389, 389, 389, 389, 390,
-   391, 391, 391, 392, 393, 393, 393, 393, 394, 393, 395,  26,  26,  26,  26,  26,
-   396, 396, 396, 396, 396, 396, 396, 396, 396, 396, 397, 397, 397, 397, 397, 397,
-   398, 398, 398, 399, 398, 400, 401, 401, 401, 401, 402, 401, 401, 401, 401, 402,
-   403, 403, 403, 403, 403,  26, 404, 404, 404, 404, 404, 404, 405, 406, 407, 408,
-   407, 408, 409, 407, 410, 407, 410, 411, 412, 412, 412, 412, 412, 412, 413,  26,
-   414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 415,  26,
-   414, 414, 416,  26, 414,  26,  26,  26, 417,   2,   2,   2,   2,   2, 418, 419,
-   420, 421, 422, 422, 422, 422, 423, 424, 425, 425, 426, 425, 427, 427, 427, 427,
-   428, 428, 428, 429, 430, 428,  26,  26,  26,  26,  26,  26, 431, 431, 432, 433,
-   434, 434, 434, 435, 436, 436, 436, 437, 438, 438, 438, 438, 439, 439, 439, 440,
-   439, 439, 441, 439, 439, 439, 439, 439, 442, 443, 444, 445, 446, 446, 447, 448,
-   446, 449, 446, 449, 450, 450, 450, 450, 451, 451, 451, 451,  26,  26,  26,  26,
-   452, 452, 452, 452, 453, 454, 453,  26, 455, 455, 455, 455, 455, 455, 456, 457,
-   458, 458, 459, 458, 460, 460, 461, 460, 462, 462, 463, 464,  26, 465,  26,  26,
-   466, 466, 466, 466, 466, 466, 466, 466, 466, 467,  26,  26,  26,  26,  26,  26,
-   468, 468, 468, 468, 468, 468, 469,  26, 468, 468, 468, 468, 468, 468, 469, 470,
-   471, 471, 471, 471, 471,  26, 471, 472, 473, 473, 473, 473, 474, 475, 473, 473,
-   474, 476,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  31,  31,  31,  50,
-   477, 477, 477, 477, 477, 478, 479,  26, 480,  26,  26,  26,  26,  26,  26, 481,
-   482, 482, 482, 482, 482,  26, 483, 483, 483, 483, 483, 484,  26,  26, 485, 485,
-   485, 486,  26,  26,  26,  26, 487, 487, 487, 488,  26,  26, 489, 489, 490,  26,
-   491, 491, 491, 491, 491, 491, 491, 491, 491, 492, 493, 491, 491, 491, 492, 494,
-   495, 495, 495, 495, 495, 495, 495, 495, 496, 497, 498, 498, 498, 499, 498, 500,
-   501, 501, 501, 501, 501, 501, 502, 501, 501,  26, 503, 503, 503, 503, 504,  26,
-   505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 506, 137, 507,  26,
-   508, 508, 509, 508, 508, 508, 508, 508, 510,  26,  26,  26,  26,  26,  26,  26,
-   511, 512, 513, 514, 513, 515, 516, 516, 516, 516, 516, 516, 516, 517, 516, 518,
-   519, 520, 521, 522, 522, 523, 524, 525, 520, 526, 527, 528, 529, 530, 530,  26,
-   531, 532, 531, 531, 531, 531, 533, 531, 534, 535, 533, 536, 537,  26,  26,  26,
-   538, 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, 539, 540,  26,  26,  26,
-   541, 541, 541, 541, 541, 541, 541, 541, 541,  26, 541, 542,  26,  26,  26,  26,
-   543, 543, 543, 543, 543, 543, 544, 543, 543, 543, 543, 544,  26,  26,  26,  26,
-   545, 545, 545, 545, 545, 545, 545, 545, 546,  26, 545, 547, 198, 548,  26,  26,
-   549, 549, 549, 549, 549, 549, 549, 550, 549, 550, 164, 164, 551,  26,  26,  26,
-   552, 552, 552, 553, 552, 554, 552, 552, 555,  26,  26,  26,  26,  26,  26,  26,
-   556, 556, 556, 556, 556, 556, 556, 557,  26,  26,  26,  26, 558, 558, 558, 558,
-   558, 558, 558, 558, 558, 558, 559, 560, 561, 562, 563, 564, 564, 564, 565, 566,
-   561,  26, 564, 567,  26,  26,  26,  26,  26,  26,  26,  26, 568, 569, 568, 568,
-   568, 568, 568, 569, 570,  26,  26,  26, 571, 571, 571, 571, 571, 571, 571, 571,
-   571,  26, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 573,  26, 178, 178,
-   574, 574, 574, 574, 574, 574, 574, 575,  53, 576,  26,  26,  26,  26,  26,  26,
-   577, 577, 577, 577, 578,  26, 577, 578, 579, 580, 579, 579, 579, 579, 581, 579,
-   582,  26, 579, 579, 579, 583, 584, 584, 584, 584, 585, 584, 584, 586, 587,  26,
-   588, 589, 590, 590, 590, 590, 588, 591, 590,  26, 590, 592, 593, 594, 595, 595,
-   595, 596, 597, 598, 595, 599,  26,  26,  26,  26,  26,  26, 600, 600, 600, 601,
-   602, 602, 603, 602, 602, 602, 602, 604, 602, 602, 602, 605,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26, 606,  26, 108, 108, 108, 108, 108, 108, 607, 608,
-   609, 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, 610,  26,  26,  26,  26,
-   609, 609, 609, 609, 609, 611, 612,  26, 613,  26,  26,  26,  26,  26,  26,  26,
-    26,  26, 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, 615,  26,
-   616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 617,  26, 616, 616, 616, 616,
-   616, 616, 616, 616, 616, 616, 616, 618, 619, 619, 619, 619, 619, 619, 619, 619,
-   620,  26,  26,  26,  26,  26,  26,  26, 621, 621, 621, 621, 621, 621, 621, 622,
-   305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 623,
-   624, 624, 624, 625, 624, 626, 627, 627, 627, 627, 627, 627, 627, 627, 627, 628,
-   627, 629, 630, 630, 630, 631, 631,  26, 632, 632, 632, 632, 632, 632, 632, 632,
-   633,  26, 632, 634, 634, 632, 632, 635, 632, 632,  26,  26,  26,  26,  26,  26,
-   636, 636, 636, 636, 636, 636, 636, 637, 638, 638, 638, 638, 638, 638, 638, 638,
-   638, 638, 638, 639,  26,  26,  26,  26, 640, 640, 640, 640, 640, 640, 640, 640,
-   640, 641, 640, 640, 640, 640, 640, 640, 640, 642, 640, 640,  26,  26,  26,  26,
-    26,  26,  26,  26, 643,  26, 345,  26, 644, 644, 644, 644, 644, 644, 644, 644,
-   644, 644, 644, 644, 644, 644, 644,  26, 645, 645, 645, 645, 645, 645, 645, 645,
-   645, 645, 646,  26,  26,  26,  26, 647, 644, 648,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26, 649, 650, 651, 286, 286, 286, 286, 286, 286, 286,
-   286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 652,  26, 653,  26,
-    26,  26, 654,  26, 655,  26, 656, 656, 656, 656, 656, 656, 656, 656, 656, 656,
-   656, 656, 656, 656, 656, 656, 656, 657, 658, 658, 658, 658, 658, 658, 658, 658,
-   658, 658, 658, 658, 658, 659, 658, 660, 658, 661, 658, 662, 359,  26,  26,  26,
-     0,   0,   0,   0,   0,   0,   0, 265,   0,   0,   0,   0,   0,   0, 359,  26,
-     9,   9,   9,   9,   9, 663,   9,   9, 221,  26,   0,   0,   0,   0,   0,   0,
-   359,  26,  26,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0,   0, 276,  26,
-     0,   0,   0,   0, 257, 362,   0,   0,   0,   0,   0,   0, 664, 665,   0, 666,
-   667, 668,   0,   0,   0, 669,   0,   0,   0,   0,   0,   0,   0, 266,  26,  26,
-   246,  26,  26,  26,  26,  26,  26,  26,   0,   0, 359,  26,   0,   0, 359,  26,
-     0,   0, 257,  26,   0,   0,   0, 259,   0,   0, 254,   0,   0,   0,   0,   0,
-     0,   0,   0, 254, 670, 671,   0, 672, 673,   0,   0,   0,   0,   0,   0,   0,
-   269, 674, 254, 254,   0,   0,   0, 675, 676, 677, 678,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 276,   0,   0,   0,   0, 268,   0,   0,   0,   0,   0,   0,
-   679, 679, 679, 679, 679, 679, 679, 679, 679, 680,  26, 681, 682, 679,  26,  26,
-     2,   2,   2, 346, 683, 419,  26,  26, 684, 270, 270, 685, 686, 687,  18,  18,
-    18,  18,  18,  18,  18, 688,  26,  26,  26, 689,  26,  26,  26,  26,  26,  26,
-   690, 690, 690, 690, 690, 691, 690, 692, 690, 693,  26,  26,  26,  26,  26,  26,
-    26,  26, 694, 694, 694, 695,  26,  26, 696, 696, 696, 696, 696, 696, 696, 697,
-    26,  26, 698, 698, 698, 698, 698, 699,  26,  26, 700, 700, 700, 700, 700, 701,
-    26,  26,  26,  26, 172, 702, 170, 172, 703, 703, 703, 703, 703, 703, 703, 703,
-   704, 703, 705,  26,  26,  26,  26,  26, 706, 706, 706, 706, 706, 706, 706, 706,
-   706, 707, 706, 708,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 362,   0,
-     0,   0,   0,   0,   0,   0, 376,  26, 362,   0,   0,   0,   0,   0,   0, 276,
-   709,  31,  31,  31, 710, 711, 712, 713, 714, 715, 710, 716, 710, 712, 712, 717,
-    31, 718,  31, 719, 720, 718,  31, 719,  26,  26,  26,  26,  26,  26, 721,  26,
-     0,   0,   0,   0,   0, 359,   0,   0,   0,   0, 359,  26,   0, 257, 362,   0,
-   362,   0, 362,   0,   0,   0, 276,  26,   0,   0,   0,   0,   0, 276,  26,  26,
-    26,  26,  26,  26, 722,   0,   0,   0, 723,  26,   0,   0,   0,   0,   0, 359,
-     0, 259, 265,  26, 276,  26,  26,  26,   0,   0,   0, 724,   0, 376,   0, 376,
-     0,   0,   0,   0,   0,   0, 257, 725,   0,   0,   0, 265,   0, 359, 259,  26,
-     0, 359,   0,   0,   0,   0,   0,   0,   0,  26,   0, 265,   0,   0,   0,   0,
-     0,  26,   0,   0,   0, 276,   0, 359, 265,  26,  26,  26,  26,  26,  26,  26,
-     0,   0, 359,  26,   0, 276,   0, 376,   0, 726,   0,   0,   0,   0,   0,   0,
-   257, 722,   0, 727,   0, 265,   0, 259,   0,   0, 358,   0,   0,   0,   0,   0,
-   277, 277, 277, 277,  26,  26,  26,  26, 277, 277, 277, 277, 277, 277, 277, 345,
-   277, 277, 277, 280, 277, 277, 277, 277, 277, 277, 277, 277, 345,  26, 277, 277,
-   277, 277, 277, 277, 728,  26, 277, 277, 277, 277, 277, 280,  26,  26,  26,  26,
-   277, 729, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,  26,  26,
-   730,  26,  26,  26,   0,   0,   0,   0,   9,   9,   9,   9,   9,   9,   0,   0,
+   216, 219, 216, 219, 216, 220,   9,   9,   9,   9,   9, 221,   9, 222,  26,  26,
+   223, 223, 223, 223, 223, 223, 223, 223, 223, 224, 223, 223, 223, 223, 223, 223,
+   225, 225, 225, 225, 225, 225, 225, 225, 226, 226, 226, 226, 226, 226, 227, 228,
+   229, 229, 229, 229, 229, 229, 229, 230, 229, 231, 232, 232, 232, 232, 232, 232,
+    18, 233, 165, 165, 165, 165, 165, 234, 225,  26, 235,   9, 236, 237, 238, 239,
+     2,   2,   2,   2, 240, 241,   2,   2,   2,   2,   2, 242, 243, 244,   2, 245,
+     2,   2,   2,   2,   2,   2,   2, 246,   9,   9,   9,   9,   9,   9,   9,   9,
+    14,  14, 247, 247,  14,  14,  14,  14, 247, 247,  14, 248,  14,  14,  14, 247,
+    14,  14,  14,  14,  14,  14, 249,  14, 249,  14, 250, 251,  14,  14, 252, 253,
+     0, 254,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 255,   0, 256, 257,
+     0, 258,   2, 259,   0,   0,   0,   0, 260,  26,   9,   9,   9,   9, 261,  26,
+     0,   0,   0,   0, 262, 263,   4,   0,   0, 264,   0,   0,   2,   2,   2,   2,
+     2, 265,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0, 260,  26,  26,   0, 266,  26,  26,   0,   0,   0,   0,
+   267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 268,   0,
+   269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,   2,   2,   2,   2,
+    17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17, 270, 271,
+   165, 165, 165, 165, 166, 167, 272, 272, 272, 272, 272, 272, 272, 273, 274, 273,
+   170, 170, 172,  26, 172, 172, 172, 172, 172, 172, 172, 172,  18,  18,  18,  18,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 275,  26,  26,  26,  26,
+   276, 276, 276, 277, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 278,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279,  26,  26,  26,   0,   0,
+   280,   0,   0,   0, 281, 282,   0, 283, 284, 285, 285, 285, 285, 285, 285, 285,
+   285, 285, 286, 287, 288, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 290,
+   291, 292, 292, 292, 292, 292, 293, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+   169, 294,   0,   0, 292, 292, 292, 292,   0,   0,   0,   0, 275, 295, 289, 289,
+   169, 169, 169, 294,   0,   0,   0,   0,   0,   0,   0,   0, 169, 169, 169, 296,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 289, 289, 289, 289, 289, 297,
+   289, 289, 289, 289, 289, 289, 289, 289, 289, 289, 289,   0,   0,   0,   0,   0,
+   276, 276, 276, 276, 276, 276, 276, 276,   0,   0,   0,   0,   0,   0,   0,   0,
+   298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+   298, 299, 298, 298, 298, 298, 298, 298, 300,  26, 301, 301, 301, 301, 301, 301,
+   302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+   302, 302, 302, 302, 302, 303,  26,  26,  18,  18,  18,  18,  18,  18,  18,  18,
+    18,  18,  18,  18, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,  26,
+     0,   0,   0,   0, 305,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+     2, 306,   2,   2,   2,   2,   2,   2,   2,   2,   2, 259,  26,  26, 307,   2,
+   308, 308, 308, 308, 308, 309,   0, 260, 310, 310, 310, 310, 310, 310, 310,  26,
+   311, 311, 311, 311, 311, 311, 311, 311, 312, 313, 311, 314,  52,  52,  52,  52,
+   315, 315, 315, 315, 315, 316, 317, 317, 317, 317, 318, 319, 169, 169, 169, 320,
+   321, 321, 321, 321, 321, 321, 321, 321, 321, 322, 321, 323, 164, 164, 164, 324,
+   325, 325, 325, 325, 325, 325, 326,  26, 325, 327, 325, 328, 164, 164, 164, 164,
+   329, 329, 329, 329, 329, 329, 329, 329, 330,  26,  26, 331, 332, 332, 333,  26,
+   334, 334, 334,  26, 172, 172,   2,   2,   2,   2,   2, 335, 336, 337, 176, 176,
+   176, 176, 176, 176, 176, 176, 176, 176, 332, 332, 332, 332, 332, 338, 332, 339,
+   169, 169, 169, 169, 340,  26, 169, 169, 294, 341, 169, 169, 169, 169, 169, 340,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 342,  26,  26,  26,  26,
+   343,  26, 344, 345,  25,  25, 346, 347, 348,  25,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31, 349,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  26,  26,  26,  26,  31,  31,
+     9,   9,   0, 260,   9, 350,   0,   0,   0,   0, 351,   0, 258, 352, 353,  31,
+    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31, 354,
+   355,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3, 356, 289, 288, 289,
+   289, 289, 289, 357, 169, 169, 169, 294, 358, 358, 358, 359, 258, 258,  26, 360,
+   361, 362, 361, 361, 363, 361, 361, 364, 361, 365, 361, 365,  26,  26,  26,  26,
+   361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 361, 366,
+   367,   0,   0,   0,   0,   0, 368,   0,  14,  14,  14,  14,  14,  14,  14,  14,
+    14, 253,   0, 369, 370,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0, 371,
+   372, 372, 372, 373, 374, 374, 374, 374, 374, 374, 375,  26, 376,   0,   0, 352,
+   377, 377, 377, 377, 378, 379, 380, 380, 380, 381, 382, 382, 382, 382, 382, 383,
+   384, 384, 384, 385, 386, 386, 386, 386, 387, 386, 388,  26,  26,  26,  26,  26,
+   389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 390, 390, 390, 390, 390, 390,
+   391, 391, 391, 392, 391, 393, 394, 394, 394, 394, 395, 394, 394, 394, 394, 395,
+   396, 396, 396, 396, 396,  26, 397, 397, 397, 397, 397, 397, 398, 399, 400, 401,
+   400, 401, 402, 400, 403, 400, 403, 404, 405, 405, 405, 405, 405, 405, 406,  26,
+   407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, 407,
+   407, 407, 407, 407, 407, 407, 408,  26, 407, 407, 409,  26, 407,  26,  26,  26,
+   410,   2,   2,   2,   2,   2, 411, 412,  26,  26,  26,  26,  26,  26,  26,  26,
+   413, 414, 415, 415, 415, 415, 416, 417, 418, 418, 419, 418, 420, 420, 420, 420,
+   421, 421, 421, 422, 423, 421,  26,  26,  26,  26,  26,  26, 424, 424, 425, 426,
+   427, 427, 427, 428, 429, 429, 429, 430, 431, 431, 431, 432,  26,  26,  26,  26,
+   433, 433, 433, 433, 434, 434, 434, 435, 434, 434, 436, 434, 434, 434, 434, 434,
+   437, 438, 439, 440, 441, 441, 442, 443, 441, 444, 441, 444, 445, 445, 445, 445,
+   446, 446, 446, 446,  26,  26,  26,  26, 447, 447, 447, 447, 448, 449, 448,  26,
+   450, 450, 450, 450, 450, 450, 451, 452, 453, 453, 454, 453, 455, 455, 456, 455,
+   457, 457, 458, 459,  26, 460,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   461, 461, 461, 461, 461, 461, 461, 461, 461, 462,  26,  26,  26,  26,  26,  26,
+   463, 463, 463, 463, 463, 463, 464,  26, 463, 463, 463, 463, 463, 463, 464, 465,
+   466, 466, 466, 466, 466,  26, 466, 467, 468, 468, 468, 468, 469, 470, 468, 468,
+   469, 471,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  31,  31,  31, 472,
+   473, 473, 473, 473, 473, 474, 475,  26, 476,  26,  31, 477,  26,  26,  26, 476,
+   478, 478, 478, 478, 478,  26, 479, 479, 479, 479, 479, 480,  26,  26, 481, 481,
+   481, 482,  26,  26,  26,  26, 483, 483, 483, 484,  26,  26, 485, 485, 486,  26,
+   487, 487, 487, 487, 487, 487, 487, 487, 487, 488, 489, 487, 487, 487, 488, 490,
+   491, 491, 491, 491, 491, 491, 491, 491, 492, 493, 494, 494, 494, 495, 494, 496,
+   497, 497, 497, 497, 497, 497, 498, 497, 497,  26, 499, 499, 499, 499, 500,  26,
+   501, 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, 501, 502, 137, 503,  26,
+   504, 504, 505, 504, 504, 504, 504, 504, 506,  26,  26,  26,  26,  26,  26,  26,
+   507, 508, 509, 510, 509, 511, 512, 512, 512, 512, 512, 512, 512, 513, 512, 514,
+   515, 516, 517, 518, 518, 519, 520, 521, 516, 522, 523, 524, 525, 526, 526,  26,
+   527, 528, 527, 527, 527, 527, 529, 527, 530, 531, 529, 532, 533,  26,  26,  26,
+   534, 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, 535, 536,  26,  26,  26,
+   537, 537, 537, 537, 537, 537, 537, 537, 537,  26, 537, 538,  26,  26,  26,  26,
+   539, 539, 539, 539, 539, 539, 540, 539, 539, 539, 539, 540,  26,  26,  26,  26,
+   541, 541, 541, 541, 541, 541, 541, 541, 542,  26, 541, 543, 198, 544,  26,  26,
+   545, 545, 545, 545, 545, 545, 545, 546, 545, 546, 164, 164, 547,  26,  26,  26,
+   548, 548, 548, 549, 548, 550, 548, 548, 551,  26,  26,  26,  26,  26,  26,  26,
+   552, 552, 552, 552, 552, 552, 552, 553,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26, 554, 554, 554, 554, 554, 554, 554, 554, 554, 554, 555, 556,
+   557, 558, 559, 560, 560, 560, 561, 562, 557,  26, 560, 563,  26,  26,  26,  26,
+    26,  26,  26,  26, 564, 565, 564, 564, 564, 564, 564, 565, 566,  26,  26,  26,
+   567, 567, 567, 567, 567, 567, 567, 567, 567,  26, 568, 568, 568, 568, 568, 568,
+   568, 568, 568, 568, 569,  26, 178, 178, 570, 570, 570, 570, 570, 570, 570, 571,
+    52, 572,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 501,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26, 573, 573, 573, 573, 574,  26, 573, 574,
+   575, 576, 575, 575, 575, 575, 577, 575, 578,  26, 575, 575, 575, 579, 580, 580,
+   580, 580, 581, 580, 580, 582, 583,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   584, 585, 586, 586, 586, 586, 584, 587, 586,  26, 586, 588, 589, 590, 591, 591,
+   591, 592, 593, 594, 591, 595, 596, 596, 596, 596, 596, 597, 596, 598,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 599, 599, 599, 600,
+   601, 601, 602, 601, 601, 601, 601, 603, 601, 601, 601, 604,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26, 605,  26, 107, 107, 107, 107, 107, 107, 606, 607,
+   608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608,
+   608, 608, 608, 609,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 608, 610, 611,  26,
+   608, 608, 608, 608, 608, 608, 608, 608, 612,  26,  26,  26,  26,  26,  26,  26,
+    26,  26, 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, 614,  26,
+   615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615,
+   615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 616,  26, 615, 615, 615, 615,
+   615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 615, 617,
+   618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618, 618,
+   618, 618, 618, 618, 618, 618, 618, 618, 619,  26,  26,  26,  26,  26,  26,  26,
+   620, 620, 620, 620, 620, 620, 620, 621,  26,  26,  26,  26,  26,  26,  26,  26,
+   304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,
+   304, 304, 304, 304, 304, 304, 304, 622, 623, 623, 623, 624, 623, 625, 626, 626,
+   626, 626, 626, 626, 626, 626, 626, 627, 626, 628, 629, 629, 629, 630, 630,  26,
+   631, 631, 631, 631, 631, 631, 631, 631, 632,  26, 631, 633, 633, 631, 631, 634,
+   631, 631,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26, 635, 635, 635, 635, 635, 635, 635, 636,
+    26,  26,  26,  26,  26,  26,  26,  26, 637, 637, 637, 637, 637, 637, 637, 637,
+   637, 637, 637, 638, 639, 639, 639, 640, 639, 639, 641,  26,  26,  26,  26,  26,
+   642, 642, 642, 642, 642, 642, 642, 642, 642, 643, 642, 642, 642, 642, 642, 642,
+   642, 644, 642, 642,  26,  26,  26,  26,  26,  26,  26,  26, 645,  26, 646,  26,
+   647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647,
+   648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648,
+   648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 649,  26,  26,  26,  26, 650,
+   647, 647, 647, 651,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 647, 652,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 653, 654,
+   655, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285,
+   285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, 285,
+   285, 285, 285, 285, 656,  26, 657,  26,  26,  26, 658,  26, 659,  26, 660, 660,
+   660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660,
+   660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, 661,
+   662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 662, 663, 662, 664,
+   662, 665, 662, 666, 352,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 369,
+     0,   0,   0,   0,   0,   0, 352, 667,   0,   0, 668,  26,   0,   0, 668,  26,
+     9,   9,   9,   9,   9, 221,   9,   9, 669,  26,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0, 352,  26,  26,  26,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 275,  26,
+     0,   0,   0,   0, 258, 355,   0,   0,   0,   0,   0,   0, 670, 671,   0, 672,
+   673, 674,   0,   0,   0, 675,   0,   0,   0,   0,   0,   0,   0, 266,  26,  26,
+    14,  14,  14,  14,  14,  14,  14,  14, 247,  26,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,   0,   0, 352,  26,   0,   0, 352,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 258,  26,   0,   0,   0, 668,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 255,   0,   0,   0,   0,   0,
+     0,   0,   0, 255, 676, 677,   0, 678, 679,   0,   0,   0,   0,   0,   0,   0,
+   680, 681, 255, 255,   0,   0,   0, 682, 683, 667, 684,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 275,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0, 268,   0,   0,   0,   0,   0,   0,
+   685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685, 685,
+   685, 686,  26, 687, 688, 685,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+     2,   2,   2, 343, 689, 412,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   690, 269, 269, 691, 692, 693,  18,  18,  18,  18,  18,  18,  18, 694,  26,  26,
+    26, 695,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   696, 696, 696, 696, 696, 697, 696, 698, 696, 699,  26,  26,  26,  26,  26,  26,
+    26,  26, 700, 700, 700, 701,  26,  26, 702, 702, 702, 702, 702, 702, 702, 703,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 704, 704, 704, 704, 704, 705,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 706, 706, 706, 706, 706, 707,
+    26,  26,  26,  26,  26,  26,  26,  26, 708, 708, 708, 709, 708, 708, 710, 711,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 172, 712, 170, 172,
+   713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713, 713,
+   713, 713, 713, 713, 713, 713, 713, 713, 714, 713, 715,  26,  26,  26,  26,  26,
+   716, 716, 716, 716, 716, 716, 716, 716, 716, 717, 716, 718,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 355,   0,
+     0,   0,   0,   0,   0,   0, 369,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   355,   0,   0,   0,   0,   0,   0, 275,  26,  26,  26,  26,  26,  26,  26,  26,
+   719,  31,  31,  31, 720, 721, 722, 723, 724, 725, 720, 726, 720, 722, 722, 727,
+    31, 728,  31, 729, 730, 728,  31, 729,  26,  26,  26,  26,  26,  26, 731,  26,
+     0,   0,   0,   0,   0, 352,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0, 352,  26,   0, 258, 355,   0, 355,   0, 355,   0,   0,   0, 275,  26,
+     0,   0,   0,   0,   0, 275,  26,  26,  26,  26,  26,  26, 732,   0,   0,   0,
+   733,  26,   0,   0,   0,   0,   0, 352,   0, 668, 260,  26, 275,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 734,   0, 369,   0, 369,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 260,   0, 352, 668,  26,
+     0, 352,   0,   0,   0,   0,   0,   0,   0,  26,   0, 260,   0,   0,   0,   0,
+     0,  26,   0,   0,   0, 275,   0, 352, 260,  26,   0, 668,  26,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  26,   0, 275,   0, 369,
+     0, 735,   0,   0,   0,   0,   0,   0, 258, 736,   0, 737,   0, 367,   0, 668,
+     0,   0, 351,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 266,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,  26,  26,  26,  26,
+   276, 276, 276, 279, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 279, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 738,  26, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 279,  26,  26,  26,  26,
+   276, 276, 276, 279,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 739, 276, 276, 276, 276, 276, 276,
+   276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 276, 342,
+   740,  26,  26,  26,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,
+     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
      0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
@@ -2840,8 +2688,7 @@ _hb_ucd_u16[10400] =
    789, 928, 792,  95, 796, 797, 798, 800,  96, 929, 802, 804, 806,  97,  98, 807,
    930,  99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935,   0,   0,
 };
-static const int16_t
-_hb_ucd_i16[196] =
+static const int16_t _hb_ucd_i16[196]=
 {
       0,    0,    0,    0,    1,   -1,    0,    0,    2,    0,   -2,    0,    0,    0,    0,    2,
       0,   -2,    0,    0,    0,    0,    0,   16,    0,    0,    0,  -16,    0,    0,    1,   -1,
@@ -2858,47 +2705,42 @@ _hb_ucd_i16[196] =
      -1,    0,    1,   -1,
 };
 
-static inline uint_fast8_t
-_hb_ucd_gc (unsigned u)
+static inline uint8_t _hb_ucd_gc (unsigned u)
 {
-  return u<1114110u?_hb_ucd_u8[6472+(((_hb_ucd_u8[816+(((_hb_ucd_u16[((_hb_ucd_u8[272+(((_hb_ucd_u8[u>>1>>3>>4>>4])<<4)+((u>>1>>3>>4)&15u))])<<4)+((u>>1>>3)&15u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
+  return u<1114110 ? _hb_ucd_u8[7920u+((_hb_ucd_u8[2176u+((_hb_ucd_u16[((_hb_ucd_u8[((((((u)>>1))>>3))>>5)])<<5)+((((((u)>>1))>>3))&31)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : 2;
 }
-static inline uint_fast8_t
-_hb_ucd_ccc (unsigned u)
+static inline uint8_t _hb_ucd_ccc (unsigned u)
 {
-  return u<125259u?_hb_ucd_u8[8504+(((_hb_ucd_u8[7936+(((_hb_ucd_u8[7460+(((_hb_ucd_u8[7100+(((_hb_ucd_u8[6854+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
+  return u<125259 ? _hb_ucd_u8[10388u+((_hb_ucd_u8[9284u+((_hb_ucd_u8[8548u+((_hb_ucd_u8[8302u+((((((u)>>2))>>3))>>4)])<<4)+((((((u)>>2))>>3))&15)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)] : 0;
 }
-static inline unsigned
-_hb_ucd_b4 (const uint8_t* a, unsigned i)
+static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>1]>>((i&1u)<<2))&15u;
+  return (a[i>>1]>>((i&1)<<2))&15;
 }
-static inline int_fast16_t
-_hb_ucd_bmg (unsigned u)
+static inline int16_t _hb_ucd_bmg (unsigned u)
 {
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9252+(((_hb_ucd_u8[9132+(((_hb_ucd_b4(9004+_hb_ucd_u8,u>>2>>3>>3))<<3)+((u>>2>>3)&7u))])<<3)+((u>>2)&7u))])<<2)+((u)&3u)]:0;
+  return u<65380 ? _hb_ucd_i16[((_hb_ucd_u8[11140u+((_hb_ucd_u8[11020u+((_hb_ucd_b4(_hb_ucd_u8+10892u,((((((u)>>2))>>3))>>3)))<<3)+((((((u)>>2))>>3))&7)])<<3)+((((u)>>2))&7)])<<2)+((u)&3)] : 0;
 }
-static inline uint_fast8_t
-_hb_ucd_sc (unsigned u)
+static inline uint8_t _hb_ucd_sc (unsigned u)
 {
-  return u<918000u?_hb_ucd_u8[10486+(((_hb_ucd_u16[3744+(((_hb_ucd_u16[2624+(((_hb_ucd_u8[9588+(u>>3>>3>>4)])<<4)+((u>>3>>3)&15u))])<<3)+((u>>3)&7u))])<<3)+((u)&7u))]:2;
+  return u<918000 ? _hb_ucd_u8[12662u+((_hb_ucd_u16[3328u+((_hb_ucd_u8[11926u+((_hb_ucd_u8[11476u+((((((u)>>3))>>4))>>4)])<<4)+((((((u)>>3))>>4))&15)])<<4)+((((u)>>3))&15)])<<3)+((u)&7)] : 2;
 }
-static inline uint_fast16_t
-_hb_ucd_dm (unsigned u)
+static inline uint16_t _hb_ucd_dm (unsigned u)
 {
-  return u<195102u?_hb_ucd_u16[6976+(((_hb_ucd_u8[16716+(((_hb_ucd_u8[16334+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+  return u<195102 ? _hb_ucd_u16[7408u+((_hb_ucd_u8[18972u+((_hb_ucd_u8[18590u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)] : 0;
 }
 
 
 #elif !defined(HB_NO_UCD_UNASSIGNED)
 
-static const uint8_t
-_hb_ucd_u8[17524] =
+#include <stdint.h>
+
+static const uint8_t _hb_ucd_u8[14800]=
 {
     0,  1,  2,  3,  4,  5,  5,  5,  5,  5,  6,  5,  5,  7,  8,  9,
    10, 11, 12, 13, 14, 15, 16,  5, 17, 15, 18, 19, 20, 21, 22, 23,
     5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 24, 25, 26,  5, 27, 28,
-    5, 29, 30, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    5, 29,  5, 30, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
@@ -2929,23 +2771,23 @@ _hb_ucd_u8[17524] =
    17, 17, 17,103, 17, 17,104,100,100,100,100,100,100,100,100,100,
   100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
   100,105,100,100,100,100,100,100, 17, 17,106,107,100,108,109,110,
-   17, 17, 17, 17, 17, 17, 17,111, 17, 17, 17, 17,112,113,100,100,
-  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,114,
-   17,115,116,100,100,100,100,100,100,100,100,100,117,100,100,100,
-  100,100,100,100,100,100,100,100,100,100,100,100,118, 39,119,120,
-  121,122,123,124,125,126,127,128, 39, 39,129,100,100,100,100,130,
-  131,132,133,100,134,135,100,136,137,138,100,100,139,140,141,100,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,111,112,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,113,
+   17,114,115,100,100,100,100,100,100,100,100,100,116,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,117, 39,118,119,
+  120,121,122,123,124,125,126,127, 39, 39,128,100,100,100,100,129,
+  130,131,132,100,133,134,135,136,137,138,100,100,139,140,141,100,
   142,143,144,145, 39, 39,146,147,148, 39,149,150,100,100,100,100,
    17, 17, 17, 17, 17, 17,151, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17,152,153, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,154, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,155, 17, 17,156,100,
-  100,100,100,100,100,100,100,100, 17, 17,157,100,100,100,100,100,
-   17, 17, 17,158, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,159,100,100,100,100,100,100,100,100,100,100,100,100,
-  160,161,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+   17, 17, 17, 17, 17, 17, 17, 17,152, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,153, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,154, 17, 17,155,100,
+  100,100,100,100,100,100,100,100, 17, 17,156,100,100,100,100,100,
+   17, 17, 17,157, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17,158,100,100,100,100,100,100,100,100,100,100,100,
+  159,160,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,161,
    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,162,
-   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,163,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
     7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
    11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
@@ -2959,409 +2801,415 @@ _hb_ucd_u8[17524] =
    34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
    34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
    32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
-   16, 16, 39, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 40,
-   40, 41, 41, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41,
-   40, 40, 42, 41, 41, 41, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41,
-   43, 43, 43, 43, 43, 43, 43, 43, 32, 32, 42, 32, 44, 45, 16, 10,
-   44, 44, 41, 46, 11, 47, 47, 11, 34, 11, 11, 11, 11, 11, 11, 11,
-   11, 48, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
-   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 49, 34, 32, 34, 11,
-   32, 50, 43, 43, 51, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
-   48, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 47, 52,  2,  2,  2,
-   16, 16, 16, 16, 53, 54, 55, 56, 57, 43, 43, 43, 43, 43, 43, 43,
-   43, 43, 43, 43, 43, 43, 43, 58, 59, 60, 43, 59, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44, 62,
-   36, 63, 64, 44, 44, 44, 44, 44, 65, 65, 65,  8,  9, 66,  2, 67,
-   43, 43, 43, 43, 43, 60, 68,  2, 69, 36, 36, 36, 36, 70, 43, 43,
-    7,  7,  7,  7,  7,  2,  2, 36, 71, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 72, 43, 43, 43, 73, 50, 43, 43, 74, 75, 76, 43, 43, 36,
-    7,  7,  7,  7,  7, 36, 77, 78,  2,  2,  2,  2,  2,  2,  2, 79,
-   70, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 80, 62, 36,
-   36, 36, 36, 43, 43, 43, 43, 43, 71, 44, 44, 44, 44, 44, 44, 44,
-    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 70, 43, 43,
-   43, 43, 40, 21,  2, 81, 57, 20, 36, 36, 36, 43, 43, 75, 43, 43,
-   43, 43, 75, 43, 75, 43, 43, 44,  2,  2,  2,  2,  2,  2,  2, 64,
-   36, 36, 36, 36, 70, 43, 44, 64, 36, 36, 36, 36, 36, 61, 44, 44,
-   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 57, 43, 43, 43, 43,
-   36, 36, 36, 36, 83, 43, 43, 43, 43, 84, 43, 43, 43, 43, 43, 43,
-   43, 85, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 85, 71, 86,
-   87, 43, 43, 43, 85, 86, 87, 86, 70, 43, 43, 43, 36, 36, 36, 36,
-   36, 43,  2,  7,  7,  7,  7,  7, 88, 36, 36, 36, 36, 36, 36, 36,
-   70, 86, 62, 36, 36, 36, 61, 62, 61, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 61, 36, 36, 36, 61, 61, 44, 36, 36, 44, 71, 86,
-   87, 43, 80, 89, 90, 89, 87, 61, 44, 44, 44, 89, 44, 44, 36, 62,
-   36, 43, 44,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 56, 63, 80,
-   57, 85, 62, 36, 36, 61, 44, 62, 61, 36, 62, 61, 36, 44, 80, 86,
-   87, 80, 44, 57, 80, 57, 43, 44, 57, 44, 44, 44, 62, 36, 61, 61,
-   44, 44, 44,  7,  7,  7,  7,  7, 43, 36, 70, 64, 44, 44, 44, 44,
-   57, 85, 62, 36, 36, 36, 36, 62, 36, 62, 36, 36, 36, 36, 36, 36,
-   61, 36, 62, 36, 36, 44, 71, 86, 87, 43, 43, 57, 85, 89, 87, 44,
-   61, 44, 44, 44, 44, 44, 44, 44, 66, 44, 44, 44, 62, 43, 43, 43,
-   57, 86, 62, 36, 36, 36, 61, 62, 61, 36, 62, 36, 36, 44, 71, 87,
-   87, 43, 80, 89, 90, 89, 87, 44, 44, 44, 57, 85, 44, 44, 36, 62,
-   78, 27, 27, 27, 44, 44, 44, 44, 44, 71, 62, 36, 36, 61, 44, 36,
-   61, 36, 36, 44, 62, 61, 61, 36, 44, 62, 61, 44, 36, 61, 44, 36,
-   36, 36, 36, 36, 36, 44, 44, 86, 85, 90, 44, 86, 90, 86, 87, 44,
-   61, 44, 44, 89, 44, 44, 44, 44, 27, 91, 67, 67, 56, 92, 44, 44,
-   85, 86, 71, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 44, 71, 43, 85, 86, 90, 43, 80, 43, 43, 44,
-   44, 44, 57, 80, 36, 61, 62, 44, 44, 44, 44, 93, 27, 27, 27, 91,
-   70, 86, 72, 36, 36, 36, 61, 36, 36, 36, 62, 36, 36, 44, 71, 87,
-   86, 86, 90, 85, 90, 86, 43, 44, 44, 44, 89, 90, 44, 44, 62, 61,
-   62, 94, 44, 44, 44, 44, 44, 44, 43, 86, 36, 36, 36, 36, 61, 36,
-   36, 36, 36, 36, 36, 70, 71, 86, 87, 43, 80, 86, 90, 86, 87, 77,
-   44, 44, 36, 94, 27, 27, 27, 95, 27, 27, 27, 27, 91, 36, 36, 36,
-   57, 86, 62, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44, 36, 36, 36,
-   36, 62, 36, 36, 36, 36, 62, 44, 36, 36, 36, 61, 44, 80, 44, 89,
-   86, 43, 80, 80, 86, 86, 86, 86, 44, 86, 64, 44, 44, 44, 44, 44,
-   62, 36, 36, 36, 36, 36, 36, 36, 70, 36, 43, 43, 43, 80, 44, 96,
-   36, 36, 36, 75, 43, 43, 43, 60,  7,  7,  7,  7,  7,  2, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 62, 61, 61, 36, 36, 61, 36, 36,
-   36, 36, 62, 62, 36, 36, 36, 36, 70, 36, 43, 43, 43, 43, 71, 44,
-   36, 36, 61, 81, 43, 43, 43, 80,  7,  7,  7,  7,  7, 44, 36, 36,
-   77, 67,  2,  2,  2,  2,  2,  2,  2, 97, 97, 67, 43, 67, 67, 67,
-    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 50, 50, 50,  4,  4, 86,
-   36, 36, 36, 36, 62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 44,
-   57, 43, 43, 43, 43, 43, 43, 85, 43, 43, 60, 43, 36, 36, 70, 43,
-   43, 43, 43, 43, 57, 43, 43, 43, 43, 43, 43, 43, 43, 43, 80, 67,
-   67, 67, 67, 76, 67, 67, 92, 67,  2,  2, 97, 67, 21, 64, 44, 44,
-   36, 36, 36, 36, 36, 94, 87, 43, 85, 43, 43, 43, 87, 85, 87, 71,
-    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 86, 43, 36, 36, 43,
-   71, 86, 98, 94, 86, 86, 86, 36, 70, 43, 71, 36, 36, 36, 36, 36,
-   36, 85, 87, 85, 86, 86, 87, 94,  7,  7,  7,  7,  7, 86, 87, 67,
-   11, 11, 11, 48, 44, 44, 48, 44, 16, 16, 16, 16, 16, 53, 45, 16,
-   36, 36, 36, 36, 61, 36, 36, 44, 36, 36, 36, 61, 61, 36, 36, 44,
-   61, 36, 36, 44, 36, 36, 36, 61, 61, 36, 36, 44, 36, 36, 36, 36,
-   36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 61, 57, 43,
-    2,  2,  2,  2, 99, 27, 27, 27, 27, 27, 27, 27, 27, 27,100, 44,
-   67, 67, 67, 67, 67, 44, 44, 44, 11, 11, 11, 44, 16, 16, 16, 44,
-  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 77, 72,
-  102, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,103,104, 44,
-   36, 36, 36, 36, 36, 63,  2,105,106, 36, 36, 36, 61, 44, 44, 44,
-   36, 43, 85, 44, 44, 44, 44, 62, 36, 43,107, 64, 44, 44, 44, 44,
-   36, 43, 44, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 61, 36,
-   61, 43, 44, 44, 44, 44, 44, 44, 36, 36, 43, 87, 43, 43, 43, 86,
-   86, 86, 86, 85, 87, 43, 43, 43, 43, 43,  2, 88,  2, 66, 70, 44,
-    7,  7,  7,  7,  7, 44, 44, 44, 27, 27, 27, 27, 27, 44, 44, 44,
-    2,  2,  2,108,  2, 59, 43, 84, 36, 83, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 61, 44, 44, 44, 36, 36, 70, 71, 36, 36, 36, 36,
-   36, 36, 36, 36, 70, 61, 44, 44, 36, 36, 36, 44, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 61, 43, 85, 86, 87, 85, 86, 44, 44,
-   86, 85, 86, 86, 87, 43, 44, 44, 92, 44,  2,  7,  7,  7,  7,  7,
-   36, 36, 36, 36, 36, 36, 36, 44, 36, 36, 61, 44, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 44, 44, 36, 36, 36, 36, 36, 44, 44, 44,
-    7,  7,  7,  7,  7,100, 44, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-   36, 36, 36, 70, 85, 87, 44,  2, 36, 36, 94, 85, 43, 43, 43, 80,
-   85, 85, 87, 43, 43, 43, 85, 86, 86, 87, 43, 43, 43, 43, 80, 57,
-    2,  2,  2, 88,  2,  2,  2, 44, 43, 43, 43, 43, 43, 43, 43,109,
-   43, 43, 43, 43, 43, 43, 43, 80, 43, 43, 98, 36, 36, 36, 36, 36,
-   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61,  2,
-   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21,  2,
-   43, 98, 36, 36, 36, 36, 36, 36, 94, 43, 43, 86, 43, 87, 43, 36,
-   36, 36, 36, 85, 43, 86, 87, 87, 43, 86, 44, 44, 44, 44,  2,  2,
-   36, 36, 86, 86, 86, 86, 43, 43, 43, 43, 86, 43, 44, 93,  2,  2,
-    7,  7,  7,  7,  7, 44, 62, 36, 36, 36, 36, 36, 40, 40, 40,  2,
-   16, 16, 16, 16, 34,110, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
-    2,  2,  2,  2, 44, 44, 44, 44, 43, 60, 43, 43, 43, 43, 43, 43,
-   85, 43, 43, 43, 71, 36, 70, 36, 36, 36, 71, 94, 43, 61, 44, 44,
-   16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 45, 16, 16,
-   16, 16, 16, 16, 45, 16, 16, 16, 16, 16, 16, 16, 16,111, 40, 40,
-   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
-   16, 16, 16, 44, 11, 11, 11, 44, 16, 16, 16, 16, 48, 48, 48, 48,
-   16, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16, 16,112,112,112,112,
-   16, 16,110, 16, 11, 11,113,114, 41, 16,110, 16, 11, 11,113, 41,
-   16, 16, 44, 16, 11, 11,115, 41, 16, 16, 16, 16, 11, 11,116, 41,
-   44, 16,110, 16, 11, 11,113,117,118,118,118,118,118,119, 65, 65,
-  120,120,120,  2,121,122,121,122,  2,  2,  2,  2,123, 65, 65,124,
-    2,  2,  2,  2,125,126,  2,127,128,  2,129,130,  2,  2,  2,  2,
-    2,  9,128,  2,  2,  2,  2,131, 65, 65,132, 65, 65, 65, 65, 65,
-  133, 44, 27, 27, 27,  8,129,134, 27, 27, 27, 27, 27,  8,129,104,
-   40, 40, 40, 40, 40, 40, 81, 44, 20, 20, 20, 20, 20, 20, 20, 20,
-  135, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43,136, 51,
-  109, 51,109, 43, 43, 43, 43, 43, 80, 44, 44, 44, 44, 44, 44, 44,
-   67,137, 67,138, 67, 34, 11, 16, 11, 32,138, 67, 49, 11, 11, 67,
-   67, 67,137,137,137, 11, 11,139, 11, 11, 35, 36, 39, 67, 16, 11,
-    8,  8, 49, 16, 16, 26, 67,140, 27, 27, 27, 27, 27, 27, 27, 27,
-  105,105,105,105,105,105,105,105,105,141,142,105,143, 67, 44, 44,
-    8,  8,144, 67, 67,  8, 67, 67,144, 26, 67,144, 67, 67, 67,144,
-   67, 67, 67, 67, 67, 67, 67,  8, 67,144,144, 67, 67, 67, 67, 67,
-   67, 67,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-   67, 67, 67, 67,  4,  4, 67, 67,  8, 67, 67, 67,145,146, 67, 67,
-   67, 67, 67, 67, 67, 67,144, 67, 67, 67, 67, 67, 67, 26,  8,  8,
-    8,  8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,
-    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44,
-   27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27,
-   67, 67, 67, 26, 67, 67, 67, 67, 26, 67, 67, 67, 67, 67, 67, 67,
-   67, 67, 67, 67,  8,  8,  8,  8, 67, 67, 67, 67, 67, 67, 67, 26,
-   67, 67, 67, 67,  4,  4,  4,  4,  4,  4,  4, 27, 27, 27, 27, 27,
-   27, 27, 67, 67, 67, 67, 67, 67,  8,  8,129,147,  8,  8,  8,  8,
-    8,  8,  8,  4,  4,  4,  4,  4,  8,129,148,148,148,148,148,148,
-  148,148,148,148,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  8,  8,
-    8,  8,  8,  8,  8,  8,  4,  8,  8,  8,144, 26,  8,  8,144, 67,
-   67, 67, 44, 67, 67, 67, 67, 67, 67, 67, 67, 55, 67, 67, 67, 67,
-   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 40, 11,
-   32, 32,140, 67, 67,138, 34,149, 43, 32, 44, 44, 93,  2, 99,  2,
-   16, 16, 16,150, 44, 44,150, 44, 36, 36, 36, 36, 44, 44, 44, 52,
-   64, 44, 44, 44, 44, 44, 44, 57, 36, 36, 36, 61, 44, 44, 44, 44,
-   36, 36, 36, 61, 36, 36, 36, 61,  2,121,121,  2,125,126,121,  2,
-    2,  2,  2,  6,  2,108,121,  2,121,  4,  4,  4,  4,  2,  2, 88,
-    2,  2,  2,  2,  2,120,  2,  2,108,151,  2,  2,  2,  2,  2,  2,
-   67,  2,152,148,148,148,153, 44, 67, 67, 67, 67, 67, 55, 67, 67,
-   67, 67, 44, 44, 44, 44, 44, 44, 67, 67, 67, 44, 44, 44, 44, 44,
-    1,  2,154,155,  4,  4,  4,  4,  4, 67,  4,  4,  4,  4,156,157,
-  158,105,105,105,105, 43, 43, 86,159, 40, 40, 67,105,160, 63, 67,
-   36, 36, 36, 61, 57,161,162, 69, 36, 36, 36, 36, 36, 63, 40, 69,
-   44, 44, 62, 36, 36, 36, 36, 36, 67, 27, 27, 67, 67, 67, 67, 67,
-   67, 67, 67, 44, 44, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67, 92,
-   27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27, 27,
-  163, 27, 27, 27, 27, 27, 27, 27, 36, 36, 83, 36, 36, 36, 36, 36,
-   67, 67, 67, 92, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36,164,  2,
-    7,  7,  7,  7,  7, 36, 44, 44, 32, 32, 32, 32, 32, 32, 32, 70,
-   51,165, 43, 43, 43, 43, 43, 88, 32, 32, 32, 32, 32, 32, 40, 43,
-   36, 36, 36,105,105,105,105,105, 43,  2,  2,  2, 44, 44, 44, 44,
-   41, 41, 41,162, 40, 40, 40, 40, 41, 32, 32, 32, 32, 32, 32, 32,
-   16, 32, 32, 32, 32, 32, 32, 32, 45, 16, 16, 16, 34, 34, 34, 32,
-   32, 32, 32, 32, 42,166, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   16, 16, 36, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+   39, 39, 41, 40, 40, 40, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40,
+   42, 42, 42, 42, 42, 42, 42, 42, 32, 32, 41, 32, 43, 44, 16, 10,
+   43, 43, 40, 45, 11, 46, 46, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 47, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 48, 34, 32, 34, 11,
+   32, 49, 42, 42, 50, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   47, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 46, 51,  2,  2,  2,
+   16, 16, 16, 16, 52, 53, 54, 55, 56, 42, 42, 42, 42, 42, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 57, 58, 59, 42, 58, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 61,
+   36, 62, 63, 43, 43, 43, 43, 43, 64, 64, 64,  8,  9, 65,  2, 66,
+   42, 42, 42, 42, 42, 59, 67,  2, 68, 36, 36, 36, 36, 69, 42, 42,
+    7,  7,  7,  7,  7,  2,  2, 36, 70, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 71, 42, 42, 42, 72, 49, 42, 42, 73, 74, 75, 42, 42, 36,
+    7,  7,  7,  7,  7, 36, 76, 77,  2,  2,  2,  2,  2,  2,  2, 78,
+   69, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 79, 61, 36,
+   36, 36, 36, 42, 42, 42, 42, 42, 70, 43, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42,
+   42, 42, 39, 21,  2, 80, 56, 20, 36, 36, 36, 42, 42, 74, 42, 42,
+   42, 42, 74, 42, 74, 42, 42, 43,  2,  2,  2,  2,  2,  2,  2, 63,
+   36, 36, 36, 36, 69, 42, 43, 63, 36, 36, 36, 36, 36, 60, 43, 43,
+   36, 36, 36, 36, 81, 36, 36, 36, 64, 43, 43, 56, 42, 42, 42, 42,
+   36, 36, 36, 36, 82, 42, 42, 42, 42, 83, 42, 42, 42, 42, 42, 42,
+   42, 84, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 84, 70, 85,
+   86, 42, 42, 42, 84, 85, 86, 85, 69, 42, 42, 42, 36, 36, 36, 36,
+   36, 42,  2,  7,  7,  7,  7,  7, 87, 36, 36, 36, 36, 36, 36, 36,
+   69, 85, 61, 36, 36, 36, 60, 61, 60, 61, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 36, 36, 36, 60, 60, 43, 36, 36, 43, 70, 85,
+   86, 42, 79, 88, 89, 88, 86, 60, 43, 43, 43, 88, 43, 43, 36, 61,
+   36, 42, 43,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 55, 62, 79,
+   56, 84, 61, 36, 36, 60, 43, 61, 60, 36, 61, 60, 36, 43, 79, 85,
+   86, 79, 43, 56, 79, 56, 42, 43, 56, 43, 43, 43, 61, 36, 60, 60,
+   43, 43, 43,  7,  7,  7,  7,  7, 42, 36, 69, 63, 43, 43, 43, 43,
+   56, 84, 61, 36, 36, 36, 36, 61, 36, 61, 36, 36, 36, 36, 36, 36,
+   60, 36, 61, 36, 36, 43, 70, 85, 86, 42, 42, 56, 84, 88, 86, 43,
+   60, 43, 43, 43, 43, 43, 43, 43, 65, 43, 43, 43, 61, 42, 42, 42,
+   56, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 43, 70, 86,
+   86, 42, 79, 88, 89, 88, 86, 43, 43, 43, 56, 84, 43, 43, 36, 61,
+   77, 27, 27, 27, 43, 43, 43, 43, 43, 70, 61, 36, 36, 60, 43, 36,
+   60, 36, 36, 43, 61, 60, 60, 36, 43, 61, 60, 43, 36, 60, 43, 36,
+   36, 36, 36, 36, 36, 43, 43, 85, 84, 89, 43, 85, 89, 85, 86, 43,
+   60, 43, 43, 88, 43, 43, 43, 43, 27, 90, 66, 66, 55, 91, 43, 43,
+   84, 85, 70, 36, 36, 36, 60, 36, 60, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 43, 70, 42, 84, 85, 89, 42, 79, 42, 42, 43,
+   43, 43, 56, 79, 36, 60, 36, 43, 43, 43, 43, 92, 27, 27, 27, 90,
+   69, 85, 71, 36, 36, 36, 60, 36, 36, 36, 61, 36, 36, 43, 70, 86,
+   85, 85, 89, 84, 89, 85, 42, 43, 43, 43, 88, 89, 43, 43, 36, 60,
+   61, 93, 43, 43, 43, 43, 43, 43, 42, 85, 36, 36, 36, 36, 60, 36,
+   36, 36, 36, 36, 36, 69, 70, 85, 86, 42, 79, 85, 89, 85, 86, 76,
+   43, 43, 36, 93, 27, 27, 27, 94, 27, 27, 27, 27, 90, 36, 36, 36,
+   56, 85, 61, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43, 36, 36, 36,
+   36, 61, 36, 36, 36, 36, 61, 43, 36, 36, 36, 60, 43, 79, 43, 88,
+   85, 42, 79, 79, 85, 85, 85, 85, 43, 85, 63, 43, 43, 43, 43, 43,
+   61, 36, 36, 36, 36, 36, 36, 36, 69, 36, 42, 42, 42, 79, 43, 95,
+   36, 36, 36, 74, 42, 42, 42, 59,  7,  7,  7,  7,  7,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 61, 60, 60, 36, 36, 60, 36, 36,
+   36, 36, 61, 61, 36, 36, 36, 36, 69, 36, 42, 42, 42, 42, 70, 43,
+   36, 36, 60, 80, 42, 42, 42, 79,  7,  7,  7,  7,  7, 43, 36, 36,
+   76, 66,  2,  2,  2,  2,  2,  2,  2, 96, 96, 66, 42, 66, 66, 66,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 49, 49, 49,  4,  4, 85,
+   36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 43,
+   56, 42, 42, 42, 42, 42, 42, 84, 42, 42, 59, 42, 36, 36, 69, 42,
+   42, 42, 42, 42, 56, 42, 42, 42, 42, 42, 42, 42, 42, 42, 79, 66,
+   66, 66, 66, 75, 66, 66, 91, 66,  2,  2, 96, 66, 21, 63, 43, 43,
+   36, 36, 36, 36, 36, 93, 86, 42, 84, 42, 42, 42, 86, 84, 86, 70,
+    7,  7,  7,  7,  7,  2,  2,  2, 36, 36, 36, 85, 42, 36, 36, 42,
+   70, 85, 97, 93, 85, 85, 85, 36, 69, 42, 70, 36, 36, 36, 36, 36,
+   36, 84, 86, 84, 85, 85, 86, 93,  7,  7,  7,  7,  7, 85, 86, 66,
+   11, 11, 11, 47, 43, 43, 47, 43, 16, 16, 16, 16, 16, 52, 44, 16,
+   36, 36, 36, 36, 60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43,
+   60, 36, 36, 43, 36, 36, 36, 60, 60, 36, 36, 43, 36, 36, 36, 36,
+   36, 36, 36, 60, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 56, 42,
+    2,  2,  2,  2, 98, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43,
+   66, 66, 66, 66, 66, 43, 43, 43, 11, 11, 11, 43, 16, 16, 16, 43,
+  100, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 71,
+  101, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,102,103, 43,
+   36, 36, 36, 36, 36, 62,  2,104,105, 36, 36, 36, 60, 43, 43, 43,
+   36, 42, 84, 43, 43, 43, 43, 61, 36, 42,106, 63, 43, 43, 43, 43,
+   36, 42, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36, 60, 36,
+   60, 42, 43, 43, 43, 43, 43, 43, 36, 36, 42, 86, 42, 42, 42, 85,
+   85, 85, 85, 84, 86, 42, 42, 42, 42, 42,  2, 87,  2, 65, 69, 43,
+    7,  7,  7,  7,  7, 43, 43, 43, 27, 27, 27, 27, 27, 43, 43, 43,
+    2,  2,  2,107,  2, 58, 42, 83, 36, 82, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 60, 43, 43, 43, 36, 36, 69, 70, 36, 36, 36, 36,
+   36, 36, 36, 36, 69, 60, 43, 43, 36, 36, 36, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 60, 42, 84, 85, 86, 84, 85, 43, 43,
+   85, 84, 85, 85, 86, 42, 43, 43, 91, 43,  2,  7,  7,  7,  7,  7,
+   36, 36, 36, 36, 36, 36, 36, 43, 36, 36, 60, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 43, 43, 36, 36, 36, 36, 36, 43, 43, 43,
+    7,  7,  7,  7,  7, 99, 43, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+   36, 36, 36, 69, 84, 86, 43,  2, 36, 36, 93, 84, 42, 42, 42, 79,
+   84, 84, 86, 42, 42, 42, 84, 85, 85, 86, 42, 42, 42, 42, 79, 56,
+    2,  2,  2, 87,  2,  2,  2, 43, 42, 42, 42, 42, 42, 42, 42,108,
+   42, 42, 42, 42, 42, 42, 42, 43, 42, 42, 42, 42, 42, 42, 43, 43,
+   42, 42, 97, 36, 36, 36, 36, 36, 36, 36, 84, 42, 42, 84, 84, 85,
+   85, 84, 97, 36, 36, 36, 60,  2, 96, 66, 66, 66, 66, 49, 42, 42,
+   42, 42, 66, 66, 66, 66, 21,  2, 42, 97, 36, 36, 36, 36, 36, 36,
+   93, 42, 42, 85, 42, 86, 42, 36, 36, 36, 36, 84, 42, 85, 86, 86,
+   42, 85, 43, 43, 43, 43,  2,  2, 36, 36, 85, 85, 85, 85, 42, 42,
+   42, 42, 85, 42, 43, 92,  2,  2,  7,  7,  7,  7,  7, 43, 61, 36,
+   36, 36, 36, 36, 39, 39, 39,  2, 16, 16, 16, 16, 34,109, 43, 43,
+   11, 11, 11, 11, 11, 46, 47, 11,  2,  2,  2,  2, 43, 43, 43, 43,
+   42, 59, 42, 42, 42, 42, 42, 42, 84, 42, 42, 42, 70, 36, 69, 36,
+   36, 36, 70, 93, 42, 60, 43, 43, 16, 16, 16, 16, 16, 16, 39, 39,
+   39, 39, 39, 39, 39, 44, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16,
+   16, 16, 16, 16, 16,110, 39, 39, 32, 32, 32, 16, 16, 16, 16, 32,
+   16, 16, 16, 16, 11, 11, 11, 11, 16, 16, 16, 43, 11, 11, 11, 43,
+   16, 16, 16, 16, 47, 47, 47, 47, 16, 16, 16, 16, 16, 16, 16, 43,
+   16, 16, 16, 16,111,111,111,111, 16, 16,109, 16, 11, 11,112,113,
+   40, 16,109, 16, 11, 11,112, 40, 16, 16, 43, 16, 11, 11,114, 40,
+   16, 16, 16, 16, 11, 11,115, 40, 43, 16,109, 16, 11, 11,112,116,
+  117,117,117,117,117,118, 64, 64,119,119,119,  2,120,121,120,121,
+    2,  2,  2,  2,122, 64, 64,123,  2,  2,  2,  2,124,125,  2,126,
+  127,  2,128,129,  2,  2,  2,  2,  2,  9,127,  2,  2,  2,  2,130,
+   64, 64,131, 64, 64, 64, 64, 64,132, 43, 27, 27, 27,  8,128,133,
+   27, 27, 27, 27, 27,  8,128,103, 39, 39, 39, 39, 39, 39, 80, 43,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 43, 43, 43, 43, 43, 43, 43,
+   42, 42, 42, 42, 42, 42,134, 50,108, 50,108, 42, 42, 42, 42, 42,
+   79, 43, 43, 43, 43, 43, 43, 43, 66,135, 66,136, 66, 34, 11, 16,
+   11, 32,136, 66, 48, 11, 11, 66, 66, 66,135,135,135, 11, 11,137,
+   11, 11, 35, 36,138, 66, 16, 11,  8,  8, 48, 16, 16, 26, 66,139,
+   27, 27, 27, 27, 27, 27, 27, 27,104,104,104,104,104,104,104,104,
+  104,140,141,104,142, 66, 43, 43,  8,  8,143, 66, 66,  8, 66, 66,
+  143, 26, 66,143, 66, 66, 66,143, 66, 66, 66, 66, 66, 66, 66,  8,
+   66,143,143, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8, 66, 66, 66, 66,  4,  4, 66, 66,
+    8, 66, 66, 66,144,145, 66, 66, 66, 66, 66, 66, 66, 66,143, 66,
+   66, 66, 66, 66, 66, 26,  8,  8,  8,  8, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 66,  8,  8,  8, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 66, 66, 66, 91, 43, 43, 27, 27, 27, 27, 27, 27, 66, 66,
+   66, 66, 66, 66, 66, 27, 27, 27, 66, 66, 66, 26, 66, 66, 66, 66,
+   26, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  8,  8,  8,  8,
+   66, 66, 66, 66, 66, 66, 66, 26, 66, 66, 66, 66,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66,
+    8,  8,128,146,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,128,147,147,147,147,147,147,147,147,147,147,146,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,143, 26,  8,  8,143, 66, 66, 66, 43, 66, 66, 66, 66, 66,
+   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 39, 11,
+   32, 32,139, 66, 66,136, 34,148, 42, 32, 43, 43, 92,  2, 98,  2,
+   16, 16, 16,149, 43, 43,149, 43, 36, 36, 36, 36, 43, 43, 43, 51,
+   63, 43, 43, 43, 43, 43, 43, 56, 36, 36, 36, 60, 43, 43, 43, 43,
+   36, 36, 36, 60, 36, 36, 36, 60,  2,120,120,  2,124,125,120,  2,
+    2,  2,  2,  6,  2,107,120,  2,120,  4,  4,  4,  4,  2,  2, 87,
+    2,  2,  2,  2,  2,119,  2,  2,107,150,  2,  2,  2,  2,  2,  2,
+   66,  2,151,147,147,147,152, 43, 66, 66, 66, 66, 66, 54, 66, 66,
+   66, 66, 43, 43, 43, 43, 43, 43, 66, 66, 66, 43, 43, 43, 43, 43,
+    1,  2,153,154,  4,  4,  4,  4,  4, 66,  4,  4,  4,  4,155,156,
+  157,104,104,104,104, 42, 42, 85,158, 39, 39, 66,104,159, 62, 66,
+   36, 36, 36, 60, 56,160,161, 68, 36, 36, 36, 36, 36, 62, 39, 68,
+   43, 43, 61, 36, 36, 36, 36, 36, 66, 27, 27, 66, 66, 66, 66, 66,
+   66, 66, 66, 43, 43, 43, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91,
+   27, 27, 27, 27, 27, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27,
+  162, 27, 27, 27, 27, 27, 27, 27, 36, 36, 82, 36, 36, 36, 36, 36,
+   66, 66, 66, 91, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36,163,  2,
+    7,  7,  7,  7,  7, 36, 43, 43, 32, 32, 32, 32, 32, 32, 32, 69,
+   50,164, 42, 42, 42, 42, 42, 87, 32, 32, 32, 32, 32, 32, 39, 42,
+   36, 36, 36,104,104,104,104,104, 42,  2,  2,  2, 43, 43, 43, 43,
+   40, 40, 40,161, 39, 39, 39, 39, 40, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 44, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 41,165, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
    32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
-   32, 32, 11, 11, 34, 34, 32, 44, 32,150,150, 32, 32, 32, 47, 44,
-   44, 40,167, 35, 40, 35, 36, 36, 36, 71, 36, 71, 36, 70, 36, 36,
-   36, 94, 87, 85, 67, 67, 80, 44, 27, 27, 27, 67,168, 44, 44, 44,
-   36, 36,  2,  2, 44, 44, 44, 44, 86, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 86, 86, 86, 86, 86, 86, 86, 86, 43, 44, 44, 44, 44,  2,
-   43, 36, 36, 36,  2, 72, 72, 70, 36, 36, 36, 43, 43, 43, 43,  2,
-   36, 36, 36, 70, 43, 43, 43, 43, 43, 86, 44, 44, 44, 44, 44, 93,
-   36, 70, 86, 43, 43, 86, 43, 86,107,  2,  2,  2,  2,  2,  2, 52,
-    7,  7,  7,  7,  7, 44, 44,  2, 36, 36, 70, 69, 36, 36, 36, 36,
-    7,  7,  7,  7,  7, 36, 36, 61, 36, 36, 36, 36, 70, 43, 43, 85,
-   87, 85, 87, 80, 44, 44, 44, 44, 36, 70, 36, 36, 36, 36, 85, 44,
-    7,  7,  7,  7,  7, 44,  2,  2, 69, 36, 36, 77, 67, 94, 85, 36,
-   71, 43, 71, 70, 71, 36, 36, 43, 70, 61, 44, 44, 44, 44, 44, 44,
-   44, 44, 44, 44, 44, 62, 83,  2, 36, 36, 36, 36, 36, 94, 43, 86,
-    2, 83,169, 80, 44, 44, 44, 44, 62, 36, 36, 61, 62, 36, 36, 61,
-   62, 36, 36, 61, 44, 44, 44, 44, 16, 16, 16, 16, 16,114, 40, 40,
-   16, 16, 16, 16,111, 41, 44, 44, 36, 94, 87, 86, 85,107, 87, 44,
-   36, 36, 44, 44, 44, 44, 44, 44, 36, 36, 36, 61, 44, 62, 36, 36,
-  170,170,170,170,170,170,170,170,171,171,171,171,171,171,171,171,
-   16, 16, 16,110, 44, 44, 44, 44, 44,150, 16, 16, 44, 44, 62, 71,
-   36, 36, 36, 36,172, 36, 36, 36, 36, 36, 36, 61, 36, 36, 61, 61,
-   36, 62, 61, 36, 36, 36, 36, 36, 36, 41, 41, 41, 41, 41, 41, 41,
-   41,117, 44, 44, 44, 44, 44, 44, 44, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36,148, 44, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 44, 44, 44, 55, 36, 36, 36, 36, 36, 36,168, 67,
-    2,  2,  2,152,130, 44, 44, 44,  6,173,174,148,148,148,148,148,
-  148,148,130,152,130,  2,127,175,  2, 64,  2,  2,156,148,148,130,
-    2,176,  8,177, 66,  2, 44, 44, 36, 36, 61, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 61, 79, 93,  2,  3,  2,  4,  5,  6,  2,
-   16, 16, 16, 16, 16, 17, 18,129,130,  4,  2, 36, 36, 36, 36, 36,
-   69, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 40,
-   44, 36, 36, 36, 44, 36, 36, 36, 44, 36, 36, 36, 44, 36, 61, 44,
-   20,178, 56,135, 26,  8,144, 92, 44, 44, 44, 44, 79, 65, 67, 44,
-   36, 36, 36, 36, 36, 36, 62, 36, 36, 36, 36, 36, 36, 61, 36, 62,
-    2, 64, 44,179, 27, 27, 27, 27, 27, 27, 44, 55, 67, 67, 67, 67,
-  105,105,143, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 27, 67, 92,
-   67, 67, 67, 67, 67, 67, 92, 44, 92, 44, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 67, 50, 44,180, 27, 27, 27, 27, 27, 27, 27,
-   27, 27, 27, 27, 27, 27, 44, 44, 27, 27, 44, 44, 44, 44, 62, 36,
-  155, 36, 36, 36, 36,181, 44, 44, 36, 36, 36, 43, 43, 80, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 93, 36, 36, 44, 44, 36, 36, 36, 36,
-  182,105,105, 44, 44, 44, 44, 44, 11, 11, 11, 11, 16, 16, 16, 16,
-   11, 11, 44, 44, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 44, 44,
-   36, 36, 36, 36, 44, 44, 44, 44, 36, 36, 44, 44, 44, 44, 44, 93,
-   11, 11, 11, 11, 11, 47, 11, 11, 11, 47, 11,150, 16, 16, 16, 16,
-   16,150, 16, 16, 16, 16, 16, 16, 16,150, 16, 16, 16,150,110, 44,
-   40, 40, 40, 52, 40, 40, 40, 40, 81, 40, 40, 40, 40, 81, 44, 44,
-   36, 36, 36, 44, 61, 36, 36, 36, 36, 36, 36, 62, 61, 44, 61, 62,
-   36, 36, 36, 93, 27, 27, 27, 27, 36, 36, 36, 77,163, 27, 27, 27,
-   44, 44, 44,179, 27, 27, 27, 27, 36, 61, 36, 44, 44,179, 27, 27,
-   36, 36, 36, 27, 27, 27, 44, 93, 36, 36, 36, 36, 36, 44, 44, 93,
-   36, 36, 36, 36, 44, 44, 27, 36, 44, 27, 27, 27, 27, 27, 27, 27,
-   70, 43, 57, 80, 44, 44, 43, 43, 36, 36, 62, 36, 62, 36, 36, 36,
-   36, 36, 36, 44, 43, 80, 44, 57, 27, 27, 27, 27,100, 44, 44, 44,
-    2,  2,  2,  2, 64, 44, 44, 44, 36, 36, 36, 36, 36, 36,183, 30,
-   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 78, 36, 36, 36,
-   36, 36, 70, 80, 44,179, 27, 27,  2,  2,  2, 64, 44, 44, 44, 44,
-   36, 36, 36, 44, 93,  2,  2,  2, 36, 36, 36, 44, 27, 27, 27, 27,
-   36, 61, 44, 44, 27, 27, 27, 27, 36, 44, 44, 44, 93,  2, 64, 44,
-   44, 44, 44, 44,179, 27, 27, 27, 11, 47, 44, 44, 44, 44, 44, 44,
-   16,110, 44, 44, 44, 27, 27, 27, 36, 36, 43, 43, 44, 44, 44, 44,
-    7,  7,  7,  7,  7, 36, 36, 69, 11, 11, 11, 44, 57, 43, 43,159,
-   16, 16, 16, 44, 44, 44, 44,  8, 27, 27, 27, 27, 27, 27, 27,100,
-   36, 36, 36, 36, 36, 57,184, 44, 36, 44, 44, 44, 44, 44, 44, 44,
-   44, 36, 61, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 43, 43,
-   27, 27, 27, 95, 44, 44, 44, 44,180, 27, 30,  2,  2, 44, 44, 44,
-   36, 43, 43,  2,  2, 44, 44, 44, 36, 36,183, 27, 27, 27, 44, 44,
-   87, 98, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43,
-   43, 43, 43, 60,  2,  2,  2, 44, 27, 27, 27,  7,  7,  7,  7,  7,
-   71, 70, 71, 44, 44, 44, 44, 57, 86, 87, 43, 85, 87, 60,185,  2,
-    2, 80, 44, 44, 44, 44, 79, 44, 43, 71, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 70, 43, 43, 87, 43, 43, 43, 80,  7,  7,  7,  7,  7,
-    2,  2, 94, 98, 44, 44, 44, 44, 36, 70,  2, 61, 44, 44, 44, 44,
-   36, 94, 86, 43, 43, 43, 43, 85, 98, 36, 63,  2, 59, 43, 60, 87,
-    7,  7,  7,  7,  7, 63, 63,  2,179, 27, 27, 27, 27, 27, 27, 27,
-   27, 27,100, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 86, 87,
-   43, 86, 85, 43,  2,  2,  2, 71, 70, 44, 44, 44, 44, 44, 44, 44,
-   36, 36, 36, 61, 61, 36, 36, 62, 36, 36, 36, 36, 36, 36, 36, 62,
-   36, 36, 36, 36, 63, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 70,
-   86, 87, 43, 43, 43, 80, 44, 44, 43, 86, 62, 36, 36, 36, 61, 62,
-   61, 36, 62, 36, 36, 57, 71, 86, 85, 86, 90, 89, 90, 89, 86, 44,
-   61, 44, 44, 89, 44, 44, 62, 36, 36, 86, 44, 43, 43, 43, 80, 44,
-   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 62, 44, 61,
-   36, 36, 36, 62, 86, 87, 43, 43, 80, 90, 89, 89, 86, 90, 86, 85,
-   71, 71,  2, 93, 64, 44, 44, 44, 57, 80, 44, 44, 44, 44, 44, 44,
-   36, 36, 94, 86, 43, 43, 43, 43, 86, 43, 85, 71, 36, 63,  2,  2,
-    7,  7,  7,  7,  7,  2, 93, 71, 86, 87, 43, 43, 85, 85, 86, 87,
-   85, 43, 36, 72, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 94,
-   86, 43, 43, 44, 86, 86, 43, 87, 60,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2, 36, 36, 43, 44, 86, 87, 43, 43, 43, 85, 87, 87,
-   60,  2, 61, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2,  2, 64, 44,
-   36, 36, 36, 36, 36, 70, 87, 86, 43, 43, 43, 87, 63, 44, 44, 44,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 44, 44, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 61, 57, 87, 86, 43, 43, 87, 43, 43, 44, 44,
-    7,  7,  7,  7,  7, 27,  2, 97, 43, 43, 43, 43, 87, 60, 44, 44,
-   27,100, 44, 44, 44, 44, 44, 62, 36, 36, 36, 61, 62, 44, 36, 36,
-   36, 36, 62, 61, 36, 36, 36, 36, 86, 86, 86, 89, 90, 57, 85, 71,
-   98, 87,  2, 64, 44, 44, 44, 44, 36, 36, 36, 36, 44, 36, 36, 36,
-   94, 86, 43, 43, 44, 43, 86, 86, 71, 72, 90, 44, 44, 44, 44, 44,
-   70, 43, 43, 43, 43, 71, 36, 36, 36, 70, 43, 43, 85, 70, 43, 60,
-    2,  2,  2, 59, 44, 44, 44, 44, 70, 43, 43, 85, 87, 43, 36, 36,
-   36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 85, 43,  2, 72,  2,
-    2, 64, 44, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2, 44, 44, 44,
-   63, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 80, 43, 43, 43, 87,
-   63,  2,  2, 44, 44, 44, 44, 44,  2, 36, 36, 36, 36, 36, 36, 36,
-   44, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 89, 43, 43, 43,
-   85, 43, 87, 80, 44, 44, 44, 44, 36, 36, 36, 61, 36, 62, 36, 36,
-   70, 43, 43, 80, 44, 80, 43, 57, 43, 43, 43, 70, 44, 44, 44, 44,
-   36, 36, 36, 62, 61, 36, 36, 36, 36, 36, 36, 36, 36, 86, 86, 90,
-   43, 89, 87, 87, 61, 44, 44, 44, 36, 70, 85,107, 64, 44, 44, 44,
-   43, 94, 36, 36, 36, 36, 36, 36, 36, 36, 86, 43, 43, 80, 44, 86,
-   85, 60,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  7, 80, 44, 44,
-   27, 27, 91, 67, 67, 67, 56, 20,168, 67, 67, 67, 67, 67, 67, 67,
-   67, 44, 44, 44, 44, 44, 44, 93,105,105,105,105,105,105,105,181,
-    2,  2, 64, 44, 44, 44, 44, 44, 63, 64, 44, 44, 44, 44, 44, 44,
-   65, 65, 65, 65, 65, 65, 65, 65, 71, 36, 36, 70, 43, 43, 43, 43,
-   43, 43, 43, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 43,
-   43, 43, 43, 43, 43, 86, 87, 43, 43, 43, 60, 44, 44, 44, 44, 44,
-   43, 43, 43, 60,  2,  2, 67, 67, 40, 40, 97, 44, 44, 44, 44, 44,
-    7,  7,  7,  7,  7,179, 27, 27, 27, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 44, 44, 62, 36, 40, 69, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 83,164,  2, 27, 27, 27, 30,  2, 64, 44, 44,
-   36, 36, 36, 36, 36, 61, 44, 57, 94, 86, 86, 86, 86, 86, 86, 86,
-   86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 44, 44, 44, 57,
-   43, 74, 40, 40, 40, 40, 40, 40, 40, 88, 80, 44, 44, 44, 44, 44,
-   86, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 62,
-   40, 40, 52, 40, 40, 40, 52, 81, 36, 61, 44, 44, 44, 44, 44, 44,
-   44, 61, 44, 44, 44, 44, 44, 44, 36, 61, 62, 44, 44, 44, 44, 44,
-   44, 44, 36, 36, 44, 44, 44, 44, 36, 36, 36, 36, 36, 44, 50, 60,
-   65, 65, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43, 43, 44,
-   43, 43, 43, 80, 44, 44, 44, 44, 67, 67, 67, 92, 55, 67, 67, 67,
-   67, 67,186, 87, 43, 67,186, 86, 86,187, 65, 65, 65, 84, 43, 43,
-   43, 76, 50, 43, 43, 43, 67, 67, 67, 67, 67, 67, 67, 43, 43, 67,
-   67, 43, 76, 44, 44, 44, 44, 44, 27, 27, 44, 44, 44, 44, 44, 44,
-   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 16, 16, 16,110, 16, 16, 16, 16, 16,
-   11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 47, 11,
-   44, 47, 48, 47, 48, 11, 47, 11, 11, 11, 11, 16, 16,150,150, 16,
-   16, 16,150, 16, 16, 16, 16, 16, 16, 16, 11, 48, 11, 47, 48, 11,
-   11, 11, 47, 11, 11, 11, 47, 16, 16, 16, 16, 16, 11, 48, 11, 47,
-   11, 11, 47, 47, 44, 11, 11, 11, 47, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
-   16, 16, 16, 44, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11,
-   11, 11, 31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33,
-   16, 16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31,
-   16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16,
-   16, 33, 16, 16, 16, 32, 44,  7, 43, 43, 43, 76, 67, 50, 43, 43,
-   43, 43, 43, 43, 43, 43, 76, 67, 67, 67, 50, 67, 67, 67, 67, 67,
-   67, 67, 76, 21,  2,  2, 44, 44, 44, 44, 44, 44, 44, 57, 43, 43,
-   16, 16, 16, 16, 16, 39, 16, 16, 16, 16, 16, 16, 16, 16, 16,110,
-   44, 44,150, 16, 16,110, 44, 44, 43, 43, 43, 80, 43, 43, 43, 43,
-   43, 43, 43, 43, 80, 57, 43, 43, 43, 57, 80, 43, 43, 80, 44, 44,
-   40, 40, 40, 40, 40, 40, 40, 44, 44, 44, 44, 44, 44, 44, 44, 57,
-   43, 43, 43, 74, 40, 40, 40, 44,  7,  7,  7,  7,  7, 44, 44, 77,
-   36, 36, 36, 36, 36, 36, 36, 80, 36, 36, 36, 36, 36, 36, 43, 43,
-    7,  7,  7,  7,  7, 44, 44, 96, 36, 36, 36, 36, 36, 83, 43, 43,
-  188,  7,  7,  7,  7,189, 44, 93, 36, 36, 36, 61, 36, 36, 62, 61,
-   36, 36, 61,179, 27, 27, 27, 27, 16, 16, 43, 43, 43, 74, 44, 44,
-   27, 27, 27, 27, 27, 27,163, 27,190, 27,100, 44, 44, 44, 44, 44,
-   27, 27, 27, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27, 44,
-   36, 36, 62, 36, 36, 36, 36, 36, 62, 61, 61, 62, 62, 36, 36, 36,
-   36, 61, 36, 36, 62, 62, 44, 44, 44, 61, 44, 62, 62, 62, 62, 36,
-   62, 61, 61, 62, 62, 62, 62, 62, 62, 61, 61, 62, 36, 61, 36, 36,
-   36, 61, 36, 36, 62, 36, 61, 61, 36, 36, 36, 36, 36, 62, 36, 36,
-   62, 36, 62, 36, 36, 62, 36, 36,  8, 44, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67,
-   27, 27, 27, 27, 27, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 44,
-   44, 44, 44, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 92, 44, 44, 44, 67, 44, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 25, 41, 41, 67, 67, 67, 67, 44, 44, 67, 67,
-   67, 67, 67, 92, 44, 55, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 92, 44, 44, 44, 67,
-   67, 67, 67, 67, 67, 67, 92, 55, 67, 92, 67, 67, 67, 67, 67, 67,
-   79, 44, 44, 44, 44, 44, 44, 44,171,171,171,171,171,171,171, 44,
-  171,171,171,171,171,171,171,  0,  0,  0, 29, 21, 21, 21, 23, 21,
-   22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
-    9, 22, 21, 18, 24, 16, 24,  5,  5,  5,  5, 22, 25, 18, 25,  0,
-   23, 23, 26, 21, 24, 26,  7, 20, 25,  1, 26, 24, 26, 25, 15, 15,
-   24, 15,  7, 19, 15, 21,  9, 25,  9,  5,  5, 25,  5,  9,  5,  7,
-    7,  7,  9,  8,  8,  5,  7,  5,  6,  6, 24, 24,  6, 24, 12, 12,
-    2,  2,  6,  5,  9, 21,  9,  2,  2,  9, 25,  9, 26, 12, 11, 11,
-    2,  6,  5, 21, 17,  2,  2, 26, 26, 23,  2, 12, 17, 12, 21, 12,
-   12, 21,  7,  2,  2,  7,  7, 21, 21,  2,  1,  1, 21, 23, 26, 26,
-    1, 21,  6,  7,  7, 12, 12,  7, 21,  7, 12,  1, 12,  6,  6, 12,
-   12, 26,  7, 26, 26,  7,  2,  1, 12,  2,  6,  2, 24,  7,  7,  6,
-    1, 12, 12, 10, 10, 10, 10, 12, 21,  6,  2, 10, 10,  2, 15, 26,
-   26,  2,  2, 21,  7, 10, 15,  7,  2, 23, 21, 26, 10,  7, 21, 15,
-   15,  2, 17,  7, 29,  7,  7, 22, 18,  2, 14, 14, 14,  7, 10, 21,
-   17, 21, 11, 12,  5,  2,  5,  6,  8,  8,  8, 24,  5, 24,  2, 24,
-    9, 24, 24,  2, 29, 29, 29,  1, 17, 17, 20, 19, 22, 20, 27, 28,
-    1, 29, 21, 20, 19, 21, 21, 16, 16, 21, 25, 22, 18, 21, 21, 29,
-    1,  2, 15,  6, 18,  6, 23,  2, 12, 11,  9, 26, 26,  9, 26,  5,
-    5, 26, 14,  9,  5, 14, 14, 15, 25, 26, 26, 22, 18, 26, 18, 25,
-   18, 22,  5, 12,  2,  5, 22, 21, 21, 22, 18, 17, 26,  6,  7, 14,
-   17, 22, 18, 18, 26, 14, 17,  6, 14,  6, 12, 24, 24,  6, 26, 15,
-    6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,
-    7, 25, 17, 16, 16, 22, 16, 16, 25, 17, 25,  2, 25, 24,  2, 15,
-   12, 15, 14,  2, 21, 14,  7, 15, 12, 17, 21,  1, 26, 10, 10,  1,
-    7, 13, 13,  2, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    0, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,
+   32, 32, 11, 11, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 46, 43,
+   51, 39,166, 35, 39, 35, 36, 36, 36, 70, 36, 70, 36, 69, 36, 36,
+   36, 93, 86, 84, 66, 66, 79, 43, 27, 27, 27, 66,167, 43, 43, 43,
+   36, 36,  2,  2, 43, 43, 43, 43, 85, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 85, 85, 85, 85, 85, 85, 85, 42, 43, 43, 43, 43,  2,
+   42, 36, 36, 36,  2, 71, 71, 69, 36, 36, 36, 42, 42, 42, 42,  2,
+   36, 36, 36, 69, 42, 42, 42, 42, 42, 85, 43, 43, 43, 43, 43, 92,
+   36, 69, 85, 42, 42, 85, 42, 85,106,  2,  2,  2,  2,  2,  2, 51,
+    7,  7,  7,  7,  7, 43, 43,  2, 36, 36, 69, 68, 36, 36, 36, 36,
+    7,  7,  7,  7,  7, 36, 36, 60, 36, 36, 36, 36, 69, 42, 42, 84,
+   86, 84, 86, 79, 43, 43, 43, 43, 36, 69, 36, 36, 36, 36, 84, 43,
+    7,  7,  7,  7,  7, 43,  2,  2, 68, 36, 36, 76, 66, 93, 84, 36,
+   70, 42, 70, 69, 70, 36, 36, 42, 69, 60, 43, 43, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 61, 82,  2, 36, 36, 36, 36, 36, 93, 42, 85,
+    2, 82,168, 79, 43, 43, 43, 43, 61, 36, 36, 60, 61, 36, 36, 60,
+   61, 36, 36, 60, 43, 43, 43, 43, 16, 16, 16, 16, 16,113, 39, 39,
+   16, 16, 16, 16,110, 40, 43, 43, 36, 93, 86, 85, 84,106, 86, 43,
+   36, 36, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 43, 61, 36, 36,
+  169,169,169,169,169,169,169,169,170,170,170,170,170,170,170,170,
+   16, 16, 16,109, 43, 43, 43, 43, 43,149, 16, 16, 43, 43, 61, 70,
+   36, 36, 36, 36,171, 36, 36, 36, 36, 36, 36, 60, 36, 36, 60, 60,
+   36, 61, 60, 36, 36, 36, 36, 36, 36, 40, 40, 40, 40, 40, 40, 40,
+   40, 22, 66, 66, 66, 66, 66, 66, 66, 77, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36,147, 66, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 66, 66, 66, 66, 36, 36, 36, 36, 36, 36,167, 66,
+    2,  2,  2,151,129, 43, 43, 43,  6,172,173,147,147,147,147,147,
+  147,147,129,151,129,  2,126,174,  2, 63,  2,  2,155,147,147,129,
+    2,175,  8,176, 65,  2, 43, 43, 36, 36, 60, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 60, 78, 92,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,128,129,  4,  2, 36, 36, 36, 36, 36,
+   68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 39,
+   43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 36, 36, 43, 36, 60, 43,
+   20,177, 55,178, 26,  8,143, 91, 43, 43, 43, 43, 78, 64, 66, 43,
+   36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 36, 36, 60, 36, 61,
+    2, 63, 43,179, 27, 27, 27, 27, 27, 27, 43, 54, 66, 66, 66, 66,
+  104,104,142, 27, 90, 66, 66, 66, 66, 66, 66, 66, 66, 27, 66, 91,
+   66, 66, 66, 66, 66, 66, 91, 43, 91, 43, 43, 43, 43, 43, 43, 43,
+   66, 66, 66, 66, 66, 66, 49, 43,180, 27, 27, 27, 27, 27, 27, 27,
+   27, 27, 27, 27, 27, 27, 43, 43, 27, 27, 43, 43, 43, 43, 61, 36,
+  154, 36, 36, 36, 36,181, 43, 43, 36, 36, 36, 42, 42, 79, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 92, 36, 36, 43, 43, 36, 36, 36, 36,
+  182,104,104, 43, 43, 43, 43, 43, 11, 11, 11, 11, 16, 16, 16, 16,
+   11, 11, 43, 43, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 43, 43,
+   36, 36, 36, 36, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43, 43, 92,
+   11, 11, 11, 11, 11, 46, 11, 11, 11, 46, 11,149, 16, 16, 16, 16,
+   16,149, 16, 16, 16, 16, 16, 16, 16,149, 16, 16, 16,149,109, 43,
+   39, 39, 39, 51, 39, 39, 39, 39, 80, 39, 39, 39, 39, 80, 43, 43,
+   36, 36, 36, 43, 60, 36, 36, 36, 36, 36, 36, 61, 60, 43, 60, 61,
+   36, 36, 36, 92, 27, 27, 27, 27, 36, 36, 36, 76,162, 27, 27, 27,
+   43, 43, 43,179, 27, 27, 27, 27, 36, 60, 36, 43, 43,179, 27, 27,
+   36, 36, 36, 27, 27, 27, 43, 92, 36, 36, 36, 36, 36, 43, 43, 92,
+   36, 36, 36, 36, 43, 43, 27, 36, 43, 27, 27, 27, 27, 27, 27, 27,
+   69, 42, 56, 79, 43, 43, 42, 42, 36, 36, 61, 36, 61, 36, 36, 36,
+   36, 36, 36, 43, 42, 79, 43, 56, 27, 27, 27, 27, 99, 43, 43, 43,
+    2,  2,  2,  2, 63, 43, 43, 43, 36, 36, 36, 36, 36, 36,183, 30,
+   36, 36, 36, 36, 36, 36,183, 27, 36, 36, 36, 36, 77, 36, 36, 36,
+   36, 36, 69, 79, 43,179, 27, 27,  2,  2,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 43, 92,  2,  2,  2, 36, 36, 36, 43, 27, 27, 27, 27,
+   36, 60, 43, 43, 27, 27, 27, 27, 36, 43, 43, 43, 92,  2, 63, 43,
+   43, 43, 43, 43,179, 27, 27, 27, 11, 46, 43, 43, 43, 43, 43, 43,
+   16,109, 43, 43, 43, 27, 27, 27, 36, 36, 42, 42, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 68, 11, 11, 11, 43, 56, 42, 42,158,
+   16, 16, 16, 43, 43, 43, 43,  8, 27, 27, 27, 27, 27, 27, 27, 99,
+   36, 36, 36, 36, 36, 56,184, 43, 36, 43, 43, 43, 43, 43, 43, 43,
+   43, 36, 82, 36, 43, 43, 43, 43, 96, 66, 66, 66, 91, 43, 43, 43,
+   43, 43, 43, 43, 43, 42, 42, 42, 27, 27, 27, 94, 43, 43, 43, 43,
+  180, 27, 30,  2,  2, 43, 43, 43, 36, 42, 42,  2,  2, 43, 43, 43,
+   36, 36,183, 27, 27, 27, 43, 43, 86, 97, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 42, 59,  2,  2,  2, 43,
+   27, 27, 27,  7,  7,  7,  7,  7, 70, 69, 70, 43, 43, 43, 43, 56,
+   85, 86, 42, 84, 86, 59,185,  2,  2, 79, 43, 43, 43, 43, 78, 43,
+   42, 70, 36, 36, 36, 36, 36, 36, 36, 36, 36, 69, 42, 42, 86, 42,
+   42, 42, 79,  7,  7,  7,  7,  7,  2,  2, 93, 97, 43, 43, 43, 43,
+   36, 69,  2, 60, 43, 43, 43, 43, 36, 93, 85, 42, 42, 42, 42, 84,
+   97, 36, 62,  2, 58, 42, 59, 86,  7,  7,  7,  7,  7, 62, 62,  2,
+  179, 27, 27, 27, 27, 27, 27, 27, 27, 27, 99, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 85, 86, 42, 85, 84, 42,  2,  2,  2, 70,
+   69, 43, 43, 43, 43, 43, 43, 43, 36, 36, 36, 60, 60, 36, 36, 61,
+   36, 36, 36, 36, 36, 36, 36, 61, 36, 36, 36, 36, 62, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 69, 85, 86, 42, 42, 42, 79, 43, 43,
+   42, 85, 61, 36, 36, 36, 60, 61, 60, 36, 61, 36, 36, 56, 70, 85,
+   84, 85, 89, 88, 89, 88, 85, 43, 60, 43, 43, 88, 43, 43, 61, 36,
+   36, 85, 43, 42, 42, 42, 79, 43, 42, 42, 79, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 61, 43, 60, 36, 36, 36, 61, 85, 86, 42, 42,
+   79, 89, 88, 88, 85, 89, 85, 84, 70, 70,  2, 92, 63, 43, 43, 43,
+   56, 79, 43, 43, 43, 43, 43, 43, 36, 36, 93, 85, 42, 42, 42, 42,
+   85, 42, 84, 70, 36, 62,  2,  2,  7,  7,  7,  7,  7,  2, 92, 70,
+   85, 86, 42, 42, 84, 84, 85, 86, 84, 42, 36, 71, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 93, 85, 42, 42, 43, 85, 85, 42, 86,
+   59,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 42, 43,
+   85, 86, 42, 42, 42, 84, 86, 86, 59,  2, 60, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2,  2, 63, 43, 36, 36, 36, 36, 36, 69, 86, 85,
+   42, 42, 42, 86, 62, 43, 43, 43,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 56, 86,
+   85, 42, 42, 86, 42, 42, 43, 43,  7,  7,  7,  7,  7, 27,  2, 96,
+   42, 42, 42, 42, 86, 59, 43, 43, 27, 99, 43, 43, 43, 43, 43, 61,
+   36, 36, 36, 60, 61, 43, 36, 36, 36, 36, 61, 60, 36, 36, 36, 36,
+   85, 85, 85, 88, 89, 56, 84, 70, 97, 86,  2, 63, 43, 43, 43, 43,
+   36, 36, 36, 36, 43, 36, 36, 36, 93, 85, 42, 42, 43, 42, 85, 85,
+   70, 71, 89, 43, 43, 43, 43, 43, 69, 42, 42, 42, 42, 70, 36, 36,
+   36, 69, 42, 42, 84, 69, 42, 59,  2,  2,  2, 58, 43, 43, 43, 43,
+   69, 42, 42, 84, 86, 42, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42,
+   42, 42, 42, 84, 42,  2, 71,  2,  2, 63, 43, 43, 43, 43, 43, 43,
+    2,  2,  2,  2,  2, 43, 43, 43, 84, 42, 84, 84, 43, 43, 43, 43,
+   62, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 42, 42, 42, 86,
+   62,  2,  2, 43, 43, 43, 43, 43,  2, 36, 36, 36, 36, 36, 36, 36,
+   43, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 88, 42, 42, 42,
+   84, 42, 86, 79, 43, 43, 43, 43, 36, 36, 36, 60, 36, 61, 36, 36,
+   69, 42, 42, 79, 43, 79, 42, 56, 42, 42, 42, 69, 43, 43, 43, 43,
+   36, 36, 36, 61, 60, 36, 36, 36, 36, 36, 36, 36, 36, 85, 85, 89,
+   42, 88, 86, 86, 60, 43, 43, 43, 36, 36, 36, 36, 82, 36, 43, 43,
+   36, 69, 84,106, 63, 43, 43, 43, 42, 93, 36, 36, 36, 36, 36, 36,
+   36, 36, 85, 42, 42, 79, 43, 85, 84, 59,  2,  2,  2,  2,  2,  2,
+    7,  7,  7,  7,  7, 79, 43, 43, 27, 27, 90, 66, 66, 66, 55, 20,
+  167, 66, 66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 43, 43, 92,
+  104,104,104,104,104,104,104,181,  2,  2, 63, 43, 43, 43, 43, 43,
+   62, 63, 43, 43, 43, 43, 43, 43, 64, 64, 64, 64, 64, 64, 64, 64,
+   70, 36, 36, 69, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 85, 86, 42,
+   42, 42, 59, 43, 43, 43, 43, 43, 42, 42, 42, 59,  2,  2, 66, 66,
+   39, 39, 96, 43, 43, 43, 43, 43,  7,  7,  7,  7,  7,179, 27, 27,
+   27, 61, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 61, 36,
+   39, 68, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 82,163,  2,
+   27, 27, 27, 30,  2, 63, 43, 43, 11, 11, 11, 11, 46,149, 16, 16,
+   16, 16, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 60, 43, 56,
+   93, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+   85, 85, 85, 85, 43, 43, 43, 56, 42, 73, 39, 39, 39, 39, 39, 39,
+   39, 87, 79, 43, 43, 43, 43, 43, 85, 39,104,181, 43, 43, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 61, 36, 60, 43, 43, 43, 43, 43, 43,
+   39, 39, 51, 39, 39, 39, 51, 80, 43, 60, 43, 43, 43, 43, 43, 43,
+   36, 60, 61, 43, 43, 43, 43, 43, 43, 43, 36, 36, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 43, 49, 59, 64, 64, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 66, 91, 43, 66, 66, 43, 43, 43, 66, 66, 66,
+  176, 43, 43, 43, 43, 43, 43, 43, 42, 42, 42, 79, 43, 43, 43, 43,
+   66, 66, 66, 91, 54, 66, 66, 66, 66, 66,186, 86, 42, 66,186, 85,
+   85,187, 64, 64, 64, 83, 42, 42, 42, 75, 49, 42, 42, 42, 66, 66,
+   66, 66, 66, 66, 66, 42, 42, 66, 66, 42, 75, 43, 43, 43, 43, 43,
+   27, 27, 43, 43, 43, 43, 43, 43, 11, 11, 11, 11, 11, 16, 16, 16,
+   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
+   16, 16,109, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 46, 11, 43, 46, 47, 46, 47, 11, 46, 11,
+   11, 11, 11, 16, 16,149,149, 16, 16, 16,149, 16, 16, 16, 16, 16,
+   16, 16, 11, 47, 11, 46, 47, 11, 11, 11, 46, 11, 11, 11, 46, 16,
+   16, 16, 16, 16, 11, 47, 11, 46, 11, 11, 46, 46, 43, 11, 11, 11,
+   46, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
+   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 43, 11, 11, 11, 11,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 43,  7,
+   42, 42, 42, 75, 66, 49, 42, 42, 42, 42, 42, 42, 42, 42, 75, 66,
+   66, 66, 49, 66, 66, 66, 66, 66, 66, 66, 75, 21,  2,  2, 43, 43,
+   43, 43, 43, 43, 43, 56, 42, 42, 16, 16, 16, 16, 16,138, 16, 16,
+   16, 16, 16, 16, 16, 16, 16,109, 43, 43,149, 16, 16,109, 43, 43,
+   42, 42, 42, 79, 42, 42, 42, 42, 42, 42, 42, 42, 79, 56, 42, 42,
+   42, 56, 79, 42, 42, 79, 43, 43, 39, 39, 39, 39, 39, 39, 39, 43,
+   43, 43, 43, 43, 43, 43, 43, 56, 42, 42, 42, 73, 39, 39, 39, 43,
+    7,  7,  7,  7,  7, 43, 43, 76, 36, 36, 36, 36, 36, 36, 36, 79,
+   36, 36, 36, 36, 36, 36, 42, 42,  7,  7,  7,  7,  7, 43, 43, 95,
+   36, 36, 36, 36, 36, 82, 42, 42,188,  7,  7,  7,  7,189, 43, 92,
+   36, 69, 36, 70, 36, 36, 36, 42, 36, 36, 69, 43, 43, 43, 43, 82,
+   36, 36, 36, 60, 36, 36, 61, 60, 36, 36, 60,179, 27, 27, 27, 27,
+   16, 16, 42, 42, 42, 73, 43, 43, 27, 27, 27, 27, 27, 27,162, 27,
+  190, 27, 99, 43, 43, 43, 43, 43, 27, 27, 27, 27, 27, 27, 27,162,
+   27, 27, 27, 27, 27, 27, 27, 43, 36, 36, 61, 36, 36, 36, 36, 36,
+   61, 60, 60, 61, 61, 36, 36, 36, 36, 60, 36, 36, 61, 61, 43, 43,
+   43, 60, 43, 61, 61, 61, 61, 36, 61, 60, 60, 61, 61, 61, 61, 61,
+   61, 60, 60, 61, 36, 60, 36, 36, 36, 60, 36, 36, 61, 36, 60, 60,
+   36, 36, 36, 36, 36, 61, 36, 36, 61, 36, 61, 36, 36, 61, 36, 36,
+    8, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 66, 43, 43,
+   54, 66, 66, 66, 66, 66, 66, 66, 27, 27, 27, 27, 27, 27, 90, 66,
+   66, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43, 66, 66, 66, 66, 66,
+   66, 91, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 91, 43, 43, 43,
+   66, 43, 43, 43, 43, 43, 43, 43, 66, 66, 66, 66, 66, 25, 40, 40,
+   66, 66, 66, 66, 91, 43, 66, 66, 66, 66, 66, 66, 43, 43, 43, 43,
+    8,  8,  8,  8,176, 43, 43, 43, 66, 66, 66, 66, 66, 91, 43, 66,
+   66, 66, 66, 91, 91, 43, 54, 66, 66, 66, 66, 66, 66, 66, 91, 54,
+   66, 66, 66, 66, 66, 91, 43, 54, 66, 91, 66, 66, 66, 66, 66, 66,
+    7,  7,  7,  7,  7, 91, 43, 43, 78, 43, 43, 43, 43, 43, 43, 43,
+  170,170,170,170,170,170,170, 43,170,170,170,170,170,170,170,  0,
+    0,  0, 29, 21, 21, 21, 23, 21, 22, 18, 21, 25, 21, 17, 13, 13,
+   25, 25, 25, 21, 21,  9,  9,  9,  9, 22, 21, 18, 24, 16, 24,  5,
+    5,  5,  5, 22, 25, 18, 25,  0, 23, 23, 26, 21, 24, 26,  7, 20,
+   25,  1, 26, 24, 26, 25, 15, 15, 24, 15,  7, 19, 15, 21,  9, 25,
+    9,  5,  5, 25,  5,  9,  5,  7,  7,  7,  9,  8,  8,  5,  6,  6,
+   24, 24,  6, 24, 12, 12,  2,  2,  6,  5,  9, 21,  9,  2,  2,  9,
+   25,  9, 26, 12, 11, 11,  2,  6,  5, 21, 17,  2,  2, 26, 26, 23,
+    2, 12, 17, 12, 21, 12, 12, 21,  7,  2,  2,  7,  7, 21, 21,  2,
+    1,  1, 21, 23, 26, 26,  1, 21,  6,  7,  7, 12, 12,  7, 21,  7,
+   12,  1, 12,  6,  6, 12, 12, 26,  7, 26, 26,  7,  2,  1, 12,  2,
+    6,  2, 24,  7,  7,  6,  1, 12, 12, 10, 10, 10, 10, 12, 21,  6,
+    2, 10, 10,  2, 15, 26, 26,  2,  2, 21,  7, 10, 15,  7,  2, 23,
+   21, 26, 10,  7, 21, 15, 15,  2, 17,  7, 29,  7,  7, 22, 18,  2,
+   14, 14, 14,  7, 10, 21, 17, 21, 11, 12,  5,  2,  5,  6,  8,  8,
+    8, 24,  5, 24,  2, 24,  9, 24, 24,  2, 29, 29, 29,  1, 17, 17,
+   20, 19, 22, 20, 27, 28,  1, 29, 21, 20, 19, 21, 21, 16, 16, 21,
+   25, 22, 18, 21, 21, 29,  1,  2, 15,  6, 18,  6, 12, 11,  9, 26,
+   26,  9, 26,  5,  7,  5,  5, 26, 14,  9,  5, 14, 14, 15, 25, 26,
+   26, 22, 18, 26, 18, 25, 18, 22,  5, 12,  2,  5, 22, 21, 21, 22,
+   18, 17, 26,  6,  7, 14, 17, 22, 18, 18, 26, 14, 17,  6, 14,  6,
+   12, 24, 24,  6, 26, 15,  6, 21, 11, 21, 24,  9,  6,  9, 23, 26,
+    6, 10,  4,  4,  3,  3,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,
+   25,  2, 25, 24, 23,  2,  2, 15, 12, 15, 14,  2, 21, 14,  7, 15,
+   12, 17, 21,  1, 26, 10, 10,  1,  7, 13, 13,  2, 23, 15,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0, 14,  0,
+    0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,
+    0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21, 22, 23,
+    0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28,
-   29, 30, 31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35,  0,
+    0,  0,  0, 36,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,
-    0,  0,  0,  0,  0,  0, 41, 42, 43,  0, 44,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,
-    0,  0,  4,  5,  6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15,
-   16, 17, 16, 18, 16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19,
-   21, 19,  0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0,
-   34,  0,  0, 35,  0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41,
-   42, 43, 44, 45, 46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,
-    0,  0,  0,  0,  0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,
-    0,  0,  0,  0,  0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59,
-   60, 61, 62, 63,  0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0,
-   67,  0,  0,  0, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 69,  0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,
-    0,  0,  0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0, 76, 77,
-    0, 78, 79,  0,  0, 80, 81,  0, 82, 62,  0, 83, 84,  0,  0, 85,
-   86, 87,  0, 88,  0, 89,  0, 90,  0,  0, 51, 91, 51,  0, 92,  0,
-   93,  0,  0,  0, 81,  0,  0,  0, 94, 95,  0, 96, 97, 98, 99,  0,
-    0,  0,  0,  0, 51,  0,  0,  0,  0,100,101,  0,  0,  0,  0,  0,
-    0,102,  0,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,104,
-  105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,
-    0,  0,  0,  0,111,  0,112,  0,105,  0,  0,  0,  0,  0,113,114,
-    0,  0,  0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,
-    0,118,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,
+   43, 44, 45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  0,  0,  0,  3,  0,  0,  0,  4,  5,  6,  7,  0,  8,
+    9, 10,  0, 11, 12, 13, 14, 15, 16, 17, 16, 18, 16, 19, 16, 19,
+   16, 19,  0, 19, 16, 20, 16, 19, 21, 19,  0, 22, 23, 24, 25, 26,
+   27, 28, 29, 30, 31,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 33,  0,  0,  0,  0,  0,  0, 34,  0,  0, 35,  0,  0, 36,  0,
+   37,  0,  0,  0, 38, 39, 40, 41, 42, 43, 44, 45, 46,  0,  0, 47,
+    0,  0,  0, 48,  0,  0,  0, 49,  0,  0,  0,  0,  0,  0,  0, 50,
+    0, 51,  0, 52, 53,  0, 54,  0,  0,  0,  0,  0,  0, 55, 56, 57,
+    0,  0,  0,  0, 58,  0,  0, 59, 60, 61, 62, 63,  0,  0, 64, 65,
+    0,  0,  0, 66,  0,  0,  0,  0, 67,  0,  0,  0, 68,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  0,  0,  0, 70,
+    0, 71,  0,  0, 72,  0,  0, 73,  0,  0,  0,  0,  0,  0,  0,  0,
+   74, 75,  0,  0,  0,  0, 76, 77,  0, 78, 79,  0,  0, 80, 81,  0,
+   82, 62,  0, 83, 84,  0,  0, 85, 86, 87,  0, 88,  0, 89,  0, 90,
+    0,  0, 51, 91, 51,  0, 92,  0, 93,  0,  0,  0, 81,  0,  0,  0,
+   94, 95,  0, 96, 97, 98, 99,  0,  0,  0,  0,  0, 51,  0,  0,  0,
+    0,100,101,  0,  0,  0,  0,  0,  0,102,  0,  0,  0,  0,  0,  0,
+  103,  0,  0,  0,  0,  0,  0,104,105,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,106,  0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,108,109,  0,  0,110,  0,  0,  0,  0,  0,  0,111,  0,112,  0,
+  105,  0,  0,  0,  0,  0,113,114,  0,  0,  0,  0,  0,  0,  0,115,
+    0,  0,  0,116,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,118,
+    0,119,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,
     8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0,
    14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,
     0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0,
@@ -3371,560 +3219,384 @@ _hb_ucd_u8[17524] =
     0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,
     0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,
     0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,
-    0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,  0, 61,
-   52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,  0, 67,
-    0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0, 77, 78,
-    0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,  0,  0,
-    0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0, 85,  0,
-   52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,  0, 88,
-   57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0, 33,  0,
-    0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0, 93,  0,
-    0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0, 98,  0,
-    0,  0, 99,  0,  0,  0,100,  0,  0,  0,  0,101,102, 93,  0,  0,
-  103,  0,  0,  0, 84,  0,  0,104,  0,  0,  0,105,106,  0,  0,107,
-  108,  0,  0,  0,  0,  0,  0,109,  0,  0,110,  0,  0,  0,  0,111,
-   33,  0,112,113,114, 57,  0,  0,115, 35,  0,  0,116,  0,  0,  0,
-  117,  0,  0,  0,  0,  0,  0,118,  0,  0,119,  0,  0,  0,  0,120,
-   88,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0, 52,121,  0,  0,  0,
-    0,122,  0,  0,123,  0,  0,  0,  0,121,  0,  0,124,  0,  0,  0,
-    0,  0, 79,  0,  0,  0,  0,125,  0,  0,  0,126,  0,  0,  0,127,
-    0,128,  0,  0,  0,  0,129,130,131,  0,132,  0,133,  0,  0,  0,
-  134,135,136,  0, 77,  0,  0,  0,  0,  0, 35,  0,  0,  0,137,  0,
-    0,  0,138,  0,  0,  0,139,  0,  0,140,  0,  0,141,  0,  0,  0,
-    0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,  7,  4,
-    4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,  1,  1,
-   19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26, 27, 28,
-   29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36,
-   37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,  0,  0,
-   43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,  0, 47,
-    0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19, 52,  1,
-    0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21, 35,  1,
-    0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,  0, 59,
-    0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0, 64,  0,
-    0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0, 68,  0,
-    0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,  0,  0,
-    0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,  0,  0,
-    0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0, 83,  0,
-    0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52, 15, 86,
-   36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,
-    0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0,
-   87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1, 21, 92,
-   93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,100,  4,
-   58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,
-    0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,  0, 38,
-    0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,  0,  0,
-   78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,  0,107,
-    1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,  0,108,
-    0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,
-    0,  0, 19, 58,  0,  0,  0, 51,  0,111, 14, 52,112, 41,  0,  0,
-   62,  0,  0, 61,  0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0,
-   62,  0, 89,  0,  0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,
-    0, 38,  1, 58,  1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,
-  115,  0,  0,  0, 55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,
-    0,  0,  0, 79,  0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0,
-   79,  0,  0,  0,  8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,
-    0,  0,  0,117,  0,118,119,120,121,  0,104,  4,122, 49, 23,  0,
-    0,  0, 38, 50, 38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1,
-   48,105, 87,  0,  0,  0,  0,  1,  0,  0,  0,123,  0,  0,  0,112,
-    4,122,  0,  0,  0,  1,124,  0,  0,  0,  0,  0,230,230,230,230,
-  230,232,220,220,220,220,232,216,220,220,220,220,220,202,202,220,
-  220,220,220,202,202,220,220,220,  1,  1,  1,  1,  1,220,220,220,
-  220,230,230,230,230,240,230,220,220,220,230,230,230,220,220,  0,
-  230,230,230,220,220,220,220,230,232,220,220,230,233,234,234,233,
-  234,234,233,230,  0,  0,  0,230,  0,220,230,230,230,230,220,230,
-  230,230,222,220,230,230,220,220,230,222,228,230, 10, 11, 12, 13,
-   14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,
-  230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31,
-   32, 33, 34,230,230,220,220,230,220,230,230,220, 35,  0,  0,  0,
-    0,  0,230,230,230,  0,  0,230,230,  0,220,230,230,220,  0,  0,
-    0, 36,  0,  0,230,220,230,230,220,220,230,220,220,230,220,230,
-  220,230,230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,230,230,
-  230,230,  0,  0,  0,220,220,220,230,220,220,220,230,230,  0,220,
-   27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,
-  230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,
-    9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,107,107,
-  118,118,  9,  0,122,122,122,122,220,220,  0,  0,  0,220,  0,220,
-    0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,
-  130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,
-    0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,
-    0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,  0,220,
-  230,220,  0,220,230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,
-  230,  0,  1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,
-  230,230,232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,
-    1,  1,  1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,
-  232,222,224,224,  0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,
-  220,  0,  0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,
-    0,230,220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,
-    0,  7,  9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,
-    0,216,216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,
-  220,220,220,  0,232,232,220,230,230,230,  7,  0, 16, 17, 17, 33,
-   17, 49, 17, 17, 84, 97,135,145, 26, 17, 17, 17, 17, 17, 17, 17,
+    0,  0, 57, 58,  0,  0,  0, 59, 60, 61, 62,  0,  0,  0,  0, 63,
+   52,  0, 64, 65,  0,  0, 66,  0,  0,  0, 67, 68,  0,  0,  0, 69,
+    0, 70, 71, 72, 73, 74,  1, 75,  0, 76, 77, 78,  0,  0, 79, 80,
+    0,  0,  0, 81,  0,  0,  1,  1,  0,  0, 82,  0,  0, 83,  0,  0,
+    0,  0, 79, 84,  0, 85,  0,  0,  0,  0,  0, 80, 86,  0, 87,  0,
+   52,  0,  1, 80,  0,  0, 88,  0,  0, 89,  0,  0,  0,  0,  0, 90,
+   57,  0,  0,  0,  0,  0,  0, 91, 92,  0,  0, 86,  0,  0, 33,  0,
+    0, 93,  0,  0,  0,  0, 94,  0,  0,  0,  0, 49,  0,  0, 95,  0,
+    0,  0,  0, 96, 97,  0,  0, 98,  0,  0, 99,  0,  0,  0,100,  0,
+    0,  0,101,  0,  0,  0,102,  0,  0,  0,  0,103,104, 95,  0,  0,
+  105,  0,  0,  0, 86,  0,  0,106,  0,  0,  0,107,108,  0,  0,109,
+  110,  0,  0,  0,  0,  0,  0,111,  0,  0,112,  0,  0,  0,  0,113,
+   33,  0,114,115,116, 57,  0,  0,117, 35,  0,  0,118,  0,  0,  0,
+  119,  0,  0,  0,  0,  0,  0,120,  0,  0,121,  0,  0,  0,  0,122,
+   90,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0, 52,123,  0,  0,  0,
+    0,124,  0,  0,125,  0,  0,  0,  0,123,  0,  0,126,  0,  0,  0,
+    0,  0, 81,  0,  0,  0,  0,127,  0,  0,  0,128,  0,  0,  0,129,
+    0,130,  0,  0,  0,  0,131,132,133,  0,134,  0,135,  0,  0,  0,
+  136,137,138,  0, 79,  0,  0,  0,  0,  0, 35,  0,  0,  0,139,  0,
+    0,  0,140,  0,  0,  0,141,  0,  0,  0,142,143,  0,144,  0,  0,
+  145,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,
+    5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17,
+   18,  1,  1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
+   25, 26, 27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33,
+   34, 35,  1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
+   42,  0,  0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1,
+   21,  0,  0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,
+    0, 19, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
+   54, 21, 35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,
+    0,  0,  0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,
+    0,  0, 64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,
+    0,  0, 68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,
+    0, 77,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,
+    0, 80,  0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,
+    0,  0, 83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,
+    1, 52, 15, 86, 36, 10, 21,  1,  1,  1,  1, 41,  1, 21, 87,  0,
+    0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,  0,  0, 88,  0,
+    0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0, 90,  9, 12,  4,
+   91,  8, 92, 47,  0, 58, 50,  0, 21,  1, 21, 93, 94,  1,  1,  1,
+    1, 95, 96, 97, 98,  1, 99, 58, 81,100,101,  4, 58,  0,  0,  0,
+    0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,  0,  0,102,103,
+    0,  0,104,  0,  0,  1,  1, 50,  0,  0,  0, 38,  0, 63,  0,  0,
+    0,  0,  0, 62,  0,  0,105, 68, 61,  0,  0,  0, 78,  0,  0,  0,
+  106,107, 58, 38, 81,  0,  0,  0,  0,  0,  0,108,  1, 14,  4, 12,
+   84,  0,  0,  0,  0, 38, 90,  0,  0,  0,  0,109,  0,  0,110, 61,
+    0,111,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,  0,  0, 19, 58,
+    0,  0,112, 51,  0,112, 14, 52,113, 41,  0,  0, 62,  0,  0, 61,
+    0,  0,114,  0, 90,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,
+    0,114,  0,  0,  0,  0,115,  0,  0,  0, 78, 55,  0, 38,  1, 58,
+    1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,116,  0,  0,  0,
+   55,  0,  0,  0,  0,116,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,
+    0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,
+    8, 92,  0,  0,  1, 90,  0,  0,117,  0,  0,  0,  0,  0,  0,118,
+    0,119,120,121,122,  0,105,  4,123, 49, 23,  0,  0,  0, 38, 50,
+   38, 58,  0,  0,  1, 90,  1,  1,  1,  1, 39,  1, 48,106, 90,  0,
+    0,  0,  0,  1,  0,  0,  0,124,  0,  0,  0,113, 19, 59,  0, 38,
+    0, 81,  0,  0,  4,123,  0,  0,  0,  1,125,  0,  0,  0,  0,  0,
+  230,230,230,230,230,232,220,220,220,220,232,216,220,220,220,220,
+  220,202,202,220,220,220,220,202,202,220,220,220,  1,  1,  1,  1,
+    1,220,220,220,220,230,230,230,230,240,230,220,220,220,230,230,
+  230,220,220,  0,230,230,230,220,220,220,220,230,232,220,220,230,
+  233,234,234,233,234,234,233,230,  0,  0,  0,230,  0,220,230,230,
+  230,230,220,230,230,230,222,220,230,230,220,220,230,222,228,230,
+   10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,
+    0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27,
+   28, 29, 30, 31, 32, 33, 34,230,230,220,220,230,220,230,230,220,
+   35,  0,  0,  0,  0,  0,230,230,230,  0,  0,230,230,  0,220,230,
+  230,220,  0,  0,  0, 36,  0,  0,230,220,230,230,220,220,230,220,
+  220,230,220,230,220,230,230,  0,  0,220,  0,  0,230,230,  0,230,
+    0,230,230,230,230,230,  0,  0,  0,220,220,220,230,220,220,220,
+  230,230,  0,220, 27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,
+    0,230,220,230,230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,
+    0,  0,  0,  9,  9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,
+  107,107,107,107,118,118,  9,  0,122,122,122,122,220,220,  0,  0,
+    0,220,  0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,
+    0,  0,130,130,130,130,  0,  0,130,  0,230,230,  9,  0,230,230,
+    0,  0,220,  0,  0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,
+    0,230,  0,  0,  0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,
+  230,  0,  0,220,230,220,  0,220,230,230,230,234,  0,  0,  9,  9,
+    0,  0,  7,  0,230,230,230,  0,230,  0,  1,  1,  1,  0,  0,  0,
+  230,234,214,220,202,230,230,230,230,230,232,228,228,220,218,230,
+  233,220,230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,
+  220,230,  1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,
+    0,  0,  0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,
+    0,220,  0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,
+    0,  0,230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,
+    6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,
+    0,226,216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,
+  230,230,  7,  0, 16, 17, 17, 33, 17, 49, 17, 17, 84, 97,135,145,
+   26, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,177,  0,  1,  2,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    4,  3,  3,  3,  3,  3,  5,  3,  3,  3,  3,  3,  6,  7,  8,  3,
-    3,  3,  3,  3,  9, 10, 11, 12, 13,  3,  3,  3,  3,  3,  3,  3,
-    3, 14,  3, 15,  3,  3,  3,  3,  3,  3, 16, 17, 18, 19, 20, 21,
-    3,  3,  3, 22, 23, 24,  3,  3,  3,  3,  3,  3, 25,  3,  3,  3,
-    3,  3,  3,  3,  3, 26,  3,  3, 27, 28,  0,  1,  0,  0,  0,  0,
-    0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0,  3,  0,  0,  0,  0,
-    0,  4,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  8,  9,  0,  0,  0,  0,  0,  0,  9,  0,  9,  0,  0,
-    0,  0,  0,  0,  0, 10, 11, 12, 13,  0,  0, 14, 15, 16,  6,  0,
-   17, 18, 19, 19, 19, 20, 21, 22, 23, 24, 19, 25,  0, 26, 27, 19,
-   19, 28, 29, 30,  0, 31,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,
-    0, 19, 28,  0, 32, 33,  9, 34, 35, 19,  0,  0, 36, 37, 38, 39,
-   40, 19,  0, 41, 42, 43, 44, 31,  0,  1, 45, 42,  0,  0,  0,  0,
-    0, 32, 14, 14,  0,  0,  0,  0, 14,  0,  0, 46, 47, 47, 47, 47,
-   48, 49, 47, 47, 47, 47, 50, 51, 52, 53, 43, 21,  0,  0,  0,  0,
-    0,  0,  0, 54,  6, 55,  0, 14, 19,  1,  0,  0,  0,  0, 56, 57,
-    0,  0,  0,  0,  0, 19, 58, 31,  0,  0,  0,  0,  0,  0,  0, 59,
-   14,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0, 60,
-   61,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  2,  3,
-    0,  4,  5,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  1,  1,  0,
-    0,  8,  9,  0,  8,  9,  0,  0,  0,  0,  8,  9, 10, 11, 12,  0,
-    0,  0, 13,  0,  0,  0,  0, 14, 15, 16, 17,  0,  0,  0,  1,  0,
-    0, 18, 19,  0,  0,  0, 20,  0,  0,  0,  1,  1,  1,  1,  0,  1,
-    1,  1,  1,  1,  1,  1,  0,  8, 21,  9,  0,  0, 22,  0,  0,  0,
-    0,  1,  0, 23, 24, 25,  0,  0, 26,  0,  0,  0,  8, 21, 27,  0,
-    1,  0,  0,  1,  1,  1,  1,  0,  1, 28, 29, 30,  0, 31, 32, 20,
-    1,  1,  0,  0,  0,  8, 21,  9,  1,  4,  5,  0,  0,  0, 33,  9,
-    0,  1,  1,  1,  0,  8, 21, 21, 21, 21, 34,  1, 35, 21, 21, 21,
-    9, 36,  0,  0, 37, 38,  1,  0, 39,  0,  0,  0,  1,  0,  1,  0,
-    0,  0,  0,  8, 21,  9,  1,  0,  0,  0, 40,  0,  8, 21, 21, 21,
-   21, 21, 21, 21, 21,  9,  0,  1,  1,  1,  1,  8, 21, 21, 21,  9,
-    0,  0,  0, 41,  0, 42, 43,  0,  0,  0,  1, 44,  0,  0,  0, 45,
-    8,  9,  1,  0,  0,  0,  8, 21, 21, 21,  9,  0,  1,  0,  1,  1,
-    8, 21, 21,  9,  0,  4,  5,  8,  9,  1,  0,  0,  0,  1,  2,  3,
-    4,  5,  5,  5,  5,  5,  6,  7,  7,  8,  9, 10, 11, 12, 13, 14,
-   15,  9, 16, 17, 18,  9, 19, 20, 21, 22, 23, 24,  5,  5,  5,  5,
-    5,  5,  5,  5,  5,  5, 25, 26, 27,  5, 28, 29,  5, 30, 31,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 32,  0,  0,  1,
-    2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17,
-   18, 19, 20, 20, 21, 22, 23, 24, 25, 26, 27, 28,  1, 29, 30, 31,
-   32, 32, 33, 32, 32, 32, 34, 32, 32, 35, 36, 37, 38, 39, 40, 41,
-   42, 43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45, 44, 44, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 46, 46,
-   46, 46, 47, 48, 49, 50, 51, 52, 53, 54, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 56, 44, 57, 58, 59, 60, 61, 62, 63, 64,
-   65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-   81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 95,
-   95, 96, 97, 98, 56, 56, 56, 56, 56, 56, 56, 56, 56, 99,100,100,
-  100,100,101,100,100,100,100,100,100,100,100,100,100,100,100,100,
-  100,102,103,103,104, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,105,
-   56, 56, 56, 56, 56, 56,106,106,107,108, 56,109,110,111,112,112,
-  112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
-  112,112,112,112,112,113,112,112,112,114,115,116, 56, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,117,118,119,
-  120, 56, 56, 56, 56, 56, 56, 56, 56, 56,121, 56, 56, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 56, 56, 56, 56,122, 32,123,124,125,126,
-  127,128,129,130,131,132,133,133,134, 56, 56, 56, 56,135,136,137,
-  138, 56,139,140, 56,141,142,143, 56, 56,144,145,146, 56,147,148,
-  149, 32, 32, 32,150,151,152, 32,153,154, 56, 56, 56, 56, 44, 44,
-   44, 44, 44, 44,155, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44, 44, 44, 44, 44,156,157, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,158, 44, 44, 44,
-   44, 44, 44, 44, 44, 44, 44, 44, 44,159, 44, 44,160, 56, 56, 56,
-   56, 56, 56, 56, 56, 56, 44, 44,161, 56, 56, 56, 56, 56, 44, 44,
-   44,162, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44,163, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,164,165,
-    0,  1,  0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,  0,  0,
-   19,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,  0, 19,  0,
-    0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,
-   26, 26,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  9,  9,
-    9,  9,  0,  9,  9,  9,  2,  2,  9,  9,  9,  9,  0,  9,  2,  2,
-    2,  2,  9,  0,  9,  0,  9,  9,  9,  2,  9,  2,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,
-   55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,  6,  6,
-    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  2,  4,  4,  4,  2,  2,  4,  4,  4,  2, 14,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,  2,
-    2,  2,  2,  2,  2,  2, 14, 14, 14,  2,  2,  2,  2, 14, 14, 14,
-   14, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,
-    3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  0,  3,  3,  3,  0,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  1,  3,
-    3,  3,  3,  3,  3,  3, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-   37, 37, 37, 37,  2, 37, 37, 37, 37,  2,  2, 37, 37, 37, 38, 38,
-   38, 38, 38, 38, 38, 38, 38, 38,  2,  2,  2,  2,  2,  2, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90,
-   90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,  2,  2, 90, 90,
-   90, 90, 90, 90, 90,  2, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
-   95, 95,  2,  2, 95,  2, 37, 37, 37,  2,  2,  2,  2,  2,  3,  3,
-    3,  3,  3,  3,  3,  2,  3,  3,  2,  2,  2,  2,  2,  3,  3,  3,
-    0,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  1,
-    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  5,  5,
-    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
-    2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
-    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
-    2,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  2,  2,  2,
-    2,  2,  2,  2,  2,  5,  2,  2,  2,  2,  5,  5,  2,  5,  5,  5,
-    5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2, 11,
-   11, 11,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
-    2, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
-   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
-    2,  2, 11,  2, 11, 11, 11,  2,  2, 11, 11, 11,  2,  2,  2, 11,
-    2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,  2, 11,  2,  2,  2,
-    2,  2,  2,  2, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2, 10,
-   10, 10,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
-    2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
-   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
-    2,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,  2,  2, 10,  2,
-    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
-    2,  2,  2,  2,  2,  2,  2, 10, 10, 10, 10, 10, 10, 10,  2, 21,
-   21, 21,  2, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
-    2, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
-   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
-    2,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21,  2,  2,  2,  2,
-    2,  2,  2, 21, 21, 21,  2,  2,  2,  2, 21, 21,  2, 21, 21, 21,
-   21, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
-   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
-   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2, 22, 22, 22,  2,
-    2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
-   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
-    2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23, 23,  2,  2,  2,  2,
-    2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2, 23,  2,  2, 23, 23,
-   23, 23,  2,  2, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 16, 16,
-   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
-   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
-    2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,  2,
-    2,  2,  2, 16, 16,  2, 16, 16, 16, 16,  2,  2, 16, 16,  2, 16,
-   16, 16,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20,  2, 20, 20, 20,  2, 20, 20, 20, 20, 20, 20,  2,  2,
-    2,  2, 20, 20, 20, 20, 20, 20, 20, 20,  2,  2, 20, 20,  2, 36,
-   36, 36,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36, 36, 36, 36, 36,
-    2, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,  2,
-   36,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,
-    2,  2,  2,  2, 36, 36,  2,  2, 36, 36, 36,  2,  2,  2,  2, 24,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24,  2,  2,  2,  2,  0, 24, 24, 24, 24,  2,  2,  2,  2,  2, 18,
-   18,  2, 18,  2, 18, 18, 18, 18, 18,  2, 18, 18, 18, 18, 18, 18,
-   18, 18, 18, 18, 18, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,
-   18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18,
-   18, 18, 18, 18, 18,  2, 18, 18,  2,  2, 18, 18, 18, 18, 25, 25,
-   25, 25, 25, 25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25,  2,  2,  2, 25, 25, 25, 25, 25,  2, 25, 25, 25, 25,
-   25, 25, 25,  0,  0,  0,  0, 25, 25,  2,  2,  2,  2,  2, 33, 33,
-   33, 33, 33, 33, 33, 33,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  2,  8,  2,  2,  2,  2,  2,  8,  2,  2,  8,  8,
-    8,  0,  8,  8,  8,  8, 12, 12, 12, 12, 12, 12, 12, 12, 30, 30,
-   30, 30, 30, 30, 30, 30, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
-   30, 30, 30, 30, 30,  2, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30,
-   30, 30, 30,  2,  2,  2, 30, 30,  2,  2,  2,  2,  2,  2, 29, 29,
-   29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,  2,  2, 28, 28,
-   28, 28, 28, 28, 28, 28, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34,  2,  2,  2, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35,  0,  0,  0, 35, 35, 35,  2,  2,  2,  2,  2,  2,  2, 45, 45,
-   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44, 44, 44,  0,  0,  2, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-   43, 43,  2,  2,  2,  2, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
-   46, 46, 46,  2, 46, 46, 46,  2, 46, 46,  2,  2,  2,  2, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,  2,  2, 31, 31,
-    2,  2,  2,  2,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32,  2,  2,  2,  2,  2,  2, 32,  2,
-    2,  2,  2,  2,  2,  2, 32, 32, 32,  2,  2,  2,  2,  2, 28, 28,
-   28, 28, 28, 28,  2,  2, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-   48, 48, 48, 48, 48,  2, 48, 48, 48, 48,  2,  2,  2,  2, 48,  2,
-    2,  2, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-   52, 52, 52, 52,  2,  2, 52, 52, 52, 52, 52,  2,  2,  2, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58,  2,  2,  2,  2, 58, 58,
-    2,  2,  2,  2,  2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54, 54,
-   54, 54, 54, 54, 54, 54, 54, 54, 54, 54,  2,  2, 54, 54, 91, 91,
-   91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,  2, 91, 91,
-   91, 91, 91,  2,  2, 91, 91, 91,  2,  2,  2,  2,  2,  2, 91, 91,
-   91, 91, 91, 91,  2,  2,  1,  1,  1,  1,  1,  1,  1,  2, 62, 62,
-   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,  2, 62, 62, 76, 76,
-   76, 76, 76, 76, 76, 76, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-   93, 93,  2,  2,  2,  2,  2,  2,  2,  2, 93, 93, 93, 93, 70, 70,
-   70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 70, 70, 70, 70,
-    2,  2,  2, 70, 70, 70, 73, 73, 73, 73, 73, 73, 73, 73,  6,  6,
-    6,  2,  2,  2,  2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,  1,
-    1,  0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,
-    0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
-    0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
-    9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,  9,
-   19, 19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19, 19,  6, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,
-    9,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,  2,  9,  9,  9,
-    9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,  9,
-    9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
-    0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  2, 19, 19,
-   19, 19, 19,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  2,  1,  2,
-    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
-   19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  0, 19,  0,
-    0,  0,  2,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2,  0,  0,
-    0,  2,  2,  2,  2,  2, 27, 27, 27, 27, 27, 27, 27, 27,  0,  0,
-    0,  0,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0, 56, 56,
-   56, 56, 56, 56, 56, 56, 55, 55, 55, 55,  2,  2,  2,  2,  2, 55,
-   55, 55, 55, 55, 55, 55, 61, 61, 61, 61, 61, 61, 61, 61,  2,  2,
-    2,  2,  2,  2,  2, 61, 61,  2,  2,  2,  2,  2,  2,  2,  0,  0,
-    0,  0,  0,  0,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2, 13, 13,
-   13, 13, 13, 13,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0, 13,
-   13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13, 13,
-   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
+   17, 17, 17,177,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  4,  3,  3,  3,  3,  3,  5,  3,
+    3,  3,  3,  3,  6,  7,  8,  3,  3,  3,  3,  3,  9, 10, 11, 12,
+   13,  3,  3,  3,  3,  3,  3,  3,  3, 14,  3, 15,  3,  3,  3,  3,
+    3,  3, 16, 17, 18, 19, 20, 21,  3,  3,  3, 22, 23, 24,  3,  3,
+    3,  3,  3,  3, 25,  3,  3,  3,  3,  3,  3,  3,  3, 26,  3,  3,
+   27, 28,  0,  1,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,
+    0,  0,  0,  3,  0,  0,  0,  0,  0,  4,  0,  5,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  7,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,
+    0,  0,  0,  9,  0,  9,  0,  0,  0,  0,  0,  0,  0, 10, 11, 12,
+   13,  0,  0, 14, 15, 16,  6,  0, 17, 18, 19, 19, 19, 20, 21, 22,
+   23, 24, 19, 25,  0, 26, 27, 19, 19, 28, 29, 30,  0, 31,  0,  0,
+    0,  8,  0,  0,  0,  0,  0,  0,  0, 19, 28,  0, 32, 33,  9, 34,
+   35, 19,  0,  0, 36, 37, 38, 39, 40, 19,  0, 41, 42, 43, 44, 31,
+    0,  1, 45, 42,  0,  0,  0,  0,  0, 32, 14, 14,  0,  0,  0,  0,
+   14,  0,  0, 46, 47, 47, 47, 47, 48, 49, 47, 47, 47, 47, 50, 51,
+   52, 53, 43, 21,  0,  0,  0,  0,  0,  0,  0, 54,  6, 55,  0, 14,
+   19,  1,  0,  0,  0,  0, 56, 57,  0,  0,  0,  0,  0, 19, 58, 31,
+    0,  0,  0,  0,  0,  0,  0, 59, 14,  0,  0,  0,  0,  1,  0,  2,
+    0,  0,  0,  3,  0,  0,  0, 60, 61,  0,  0,  0,  0,  0,  0,  0,
+    1,  0,  0,  0,  0,  0,  2,  3,  0,  4,  5,  0,  0,  6,  0,  0,
+    0,  7,  0,  0,  0,  1,  1,  0,  0,  8,  9,  0,  8,  9,  0,  0,
+    0,  0,  8,  9, 10, 11, 12,  0,  0,  0, 13,  0,  0,  0,  0, 14,
+   15, 16, 17,  0,  0,  0,  1,  0,  0, 18, 19,  0,  0,  0, 20,  0,
+    0,  0,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,  8,
+   21,  9,  0,  0, 22,  0,  0,  0,  0,  1,  0, 23, 24, 25,  0,  0,
+   26,  0,  0,  0,  8, 21, 27,  0,  1,  0,  0,  1,  1,  1,  1,  0,
+    1, 28, 29, 30,  0, 31, 32, 20,  1,  1,  0,  0,  0,  8, 21,  9,
+    1,  4,  5,  0,  0,  0, 33,  9,  0,  1,  1,  1,  0,  8, 21, 21,
+   21, 21, 34,  1, 35, 21, 21, 21,  9, 36,  0,  0, 37, 38,  1,  0,
+   39,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  8, 21,  9,  1,  0,
+    0,  0, 40,  0,  8, 21, 21, 21, 21, 21, 21, 21, 21,  9,  0,  1,
+    1,  1,  1,  8, 21, 21, 21,  9,  0,  0,  0, 41,  0, 42, 43,  0,
+    0,  0,  1, 44,  0,  0,  0, 45,  8,  9,  1,  0,  0,  0,  8, 21,
+   21, 21,  9,  0,  1,  0,  1,  1,  8, 21, 21,  9,  0,  4,  5,  8,
+    9,  1,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  9, 10, 11, 11, 11, 11, 12, 13,
+   13, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 13, 13, 13,
+   24, 25, 26, 26, 26, 27, 13, 13, 13, 28, 29, 30, 13, 31, 32, 33,
+   34, 35, 36, 37,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7, 38,  7,  7, 39,  7, 40,  7,  7,
+    7, 41, 13, 42,  7,  7, 43,  7,  7,  7, 44, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 45,  0,  0,  1,  2,  2,  2,  3,  4,  5,  6,  7,
+    8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+   24, 25, 26, 27, 28, 29, 30, 31, 32, 32, 33, 34, 35, 36, 37, 37,
+   37, 37, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+   51, 52,  2,  2, 53, 54, 55, 56, 57, 58, 59, 59, 59, 59, 60, 59,
+   59, 59, 59, 59, 59, 59, 61, 61, 59, 59, 59, 59, 62, 59, 63, 64,
+   65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 59, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 78, 69, 69, 69, 69, 79, 79, 79, 79, 79, 79, 79, 79, 79, 80,
+   81, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 94, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 69, 69, 96, 97, 98, 99, 99, 99,
+  100,101,102,103,104,105,106,107,108,109, 95,110,111,112,113,114,
+  115,116,117,117,118,119,120,121,122,123,124,125,126,127,128,129,
+  130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,
+   95,146,147,148,149, 95,150,151,152,153,154,155,156,157,158,159,
+  160,161, 95,162,163,164,165,165,165,165,165,165,165,166,167,165,
+  168, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,169,170,170,170,170,170,170,170,170,171,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,
+  170,170,170,170,170,170,170,170,170,170,170,170,170,172,173,173,
+  173,173,174, 95, 95, 95, 95, 95,175, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95,176,176,176,176,177,178,179,180, 95, 95,
+  181, 95,182,183,184,185,186,186,186,186,186,186,186,186,186,186,
+  186,186,186,186,186,186,186,186,186,186,186,186,187,187,187,188,
+  189,190, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95,191,192,193,194,195,195,196, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,197,198,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 59,199,
+   59, 59, 59,200,201,202, 59,203,204,205,206,207,208, 95,209,210,
+  211, 59, 59,212, 59,213,214,214,214,214,214,215, 95, 95, 95, 95,
+   95, 95, 95, 95,216, 95,217,218,219, 95, 95,220, 95, 95, 95,221,
+   95,222, 95,223, 95,224,225,226,227, 95, 95, 95, 95, 95,228,229,
+  230, 95,231,232, 95, 95,233,234, 59,235,236, 95, 59, 59, 59, 59,
+   59, 59, 59,237, 59,238,239,240, 59, 59,241,242, 59,243, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,244, 69, 69,245, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
+   69, 69, 69,246, 69, 69, 69, 69, 69, 69, 69, 69, 69,247, 69, 69,
+   69, 69,248, 95, 95, 95, 69, 69, 69, 69,249, 95, 95, 95, 95, 95,
+   95, 95, 95, 95, 95, 95, 69, 69, 69, 69, 69, 69,250, 69, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,251, 95,
+   95, 95, 95, 95, 95, 95,252, 95,253,254,  0,  1,  2,  2,  0,  1,
+    2,  2,  2,  3,  4,  5,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,
+   19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,  0,  0,
+   26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  2,  2,
+    9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,  9,
+    9,  2,  9,  2,  9,  9,  9,  9,  2,  9,  9,  9, 55, 55, 55, 55,
+   55, 55,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+   14,  2,  2,  2,  2, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,
+    3,  3,  0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,
+    3,  3,  1,  3,  3,  3, 37, 37, 37, 37, 37, 37,  2, 37, 37, 37,
+   37,  2,  2, 37, 37, 37, 38, 38, 38, 38, 38, 38,  2,  2, 64, 64,
+   64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90,
+    2,  2, 90, 90, 90,  2, 95, 95, 95, 95,  2,  2, 95,  2,  3,  3,
+    2,  2,  2,  2,  2,  3,  3,  3,  0,  3,  7,  7,  7,  7,  7,  1,
+    1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,  2,  5,
+    5,  5,  5,  2,  2,  5,  5,  2,  5,  5,  5,  2,  5,  2,  2,  2,
+    5,  5,  5,  5,  2,  2,  5,  5,  5,  2,  2,  2,  2,  5,  5,  5,
+    2,  5,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
+    2, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
+    2,  2,  2, 11,  2,  2, 11,  2, 11,  2,  2,  2, 11, 11,  2, 10,
+   10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10,
+    2,  2, 10,  2,  2,  2,  2,  2, 10, 10,  2, 21, 21, 21, 21, 21,
+   21, 21, 21,  2,  2, 21, 21,  2, 21, 21, 21, 21,  2,  2, 21, 21,
+    2, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
+   22,  2, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2,
+    2, 22, 22,  2,  2,  2, 22, 22, 22, 22, 23, 23, 23, 23, 23,  2,
+   23, 23, 23, 23,  2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2,  2,
+   23, 23,  2,  2,  2, 23, 16, 16, 16, 16, 16,  2, 16, 16,  2, 16,
+   16, 16, 16, 16,  2,  2,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2,
+   16, 16, 20, 20, 20, 20, 20,  2, 20, 20,  2,  2, 20, 20,  2, 36,
+   36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36,
+    2, 36,  2, 36,  2,  2,  2,  2, 36,  2,  2,  2,  2, 36, 36,  2,
+   36,  2, 36,  2,  2,  2,  2, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+   24,  2,  2,  2,  2,  0,  2, 18, 18,  2, 18,  2, 18, 18, 18, 18,
+   18,  2, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,  2,  2, 18,  2,
+   18,  2, 25, 25, 25, 25,  2, 25, 25, 25, 25,  2,  2,  2, 25,  2,
+   25, 25, 25,  0,  0,  0,  0, 25, 25,  2, 33, 33, 33, 33,  8,  8,
+    8,  8,  8,  8,  2,  8,  2,  8,  2,  2,  8,  8,  8,  0, 12, 12,
+   12, 12, 30, 30, 30, 30, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
+   30,  2,  2, 30, 30, 30, 30,  2,  2,  2, 29, 29, 29, 29, 29, 29,
+    2,  2, 28, 28, 28, 28, 34, 34, 34, 34, 34,  2,  2,  2, 35, 35,
+   35, 35, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,  2,  2, 45, 45,
+   45, 45, 45, 45,  2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44,  0,
+    0,  2, 43, 43, 43, 43, 46, 46, 46, 46, 46,  2, 46, 46, 31, 31,
+   31, 31, 31, 31,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
+   32, 32, 32, 32,  2,  2, 32,  2,  2,  2, 32, 32, 32,  2, 28, 28,
+    2,  2, 48, 48, 48, 48, 48, 48, 48,  2, 48,  2,  2,  2, 52, 52,
+   52, 52, 52, 52,  2,  2, 52,  2,  2,  2, 58, 58, 58, 58, 58, 58,
+    2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54, 54, 54, 54,  2,  2,
+   54, 54, 91, 91, 91, 91, 91, 91, 91,  2, 91,  2,  2, 91, 91, 91,
+    2,  2,  1,  1,  2,  2, 62, 62, 62, 62, 62,  2, 62, 62, 76, 76,
+   76, 76, 93, 93, 93, 93, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70,
+    2,  2,  2, 70, 70, 70, 73, 73, 73, 73,  6,  6,  6,  2,  8,  8,
+    8,  2,  2,  8,  8,  8,  1,  1,  1,  0,  1,  0,  1,  1,  1,  0,
+    0,  0,  0,  1,  0,  0,  1,  1,  0,  2, 19, 19,  9,  9,  9,  9,
+    9,  6, 19,  9,  9,  9,  9,  9, 19, 19,  9,  9,  9, 19,  6, 19,
+   19, 19, 19, 19, 19,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,
+    9,  9,  1,  1,  0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,
+    0, 19,  0,  0,  0,  2, 19,  2,  2,  2,  0,  0,  2,  2,  1,  2,
+    2,  2,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27,  2,  2,
+    0,  0, 56, 56, 56, 56,  2, 55, 55, 55, 61, 61, 61, 61,  2,  2,
+    2, 61, 61,  2,  2,  2, 13, 13, 13, 13, 13, 13,  2, 13, 13, 13,
+    2,  2,  0, 13,  0, 13,  0, 13, 13, 13, 13, 13,  1,  1,  1,  1,
+   12, 12,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
     1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0, 17, 17, 17,  2,  2,
-    2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,
-    2,  2,  2,  2,  2,  0, 12, 12, 12, 12, 12, 12, 12,  0, 17, 17,
-   17, 17, 17, 17, 17,  0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-   39, 39, 39,  2,  2,  2, 39, 39, 39, 39, 39, 39, 39,  2, 86, 86,
-   86, 86, 86, 86, 86, 86, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
-   77, 77,  2,  2,  2,  2, 79, 79, 79, 79, 79, 79, 79, 79,  0,  0,
-   19, 19, 19, 19, 19, 19,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19,  2,  2, 19, 19,  2, 19,  2, 19, 19, 19,  2,  2,
-   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-   60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 65, 65, 65, 65, 75, 75,
-   75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,  2,  2,  2,  2,
-    2,  2,  2,  2, 75, 75, 75, 75,  2,  2,  2,  2,  2,  2, 69, 69,
-   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,  0, 69, 74, 74,
-   74, 74, 74, 74, 74, 74, 74, 74, 74, 74,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 74, 12, 12, 12, 12, 12,  2,  2,  2, 84, 84,
-   84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,  2,  0, 84, 84,
-    2,  2,  2,  2, 84, 84, 33, 33, 33, 33, 33, 33, 33,  2, 68, 68,
-   68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2, 68, 68,
-   68, 68, 68, 68,  2,  2, 68, 68,  2,  2, 68, 68, 68, 68, 92, 92,
-   92, 92, 92, 92, 92, 92, 92, 92, 92,  2,  2,  2,  2,  2,  2,  2,
-    2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
-   87, 87, 87, 87, 87,  2,  2, 30, 30, 30, 30, 30, 30,  2, 19, 19,
-   19,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9, 19, 19, 19, 19,
-    0,  0,  2,  2,  2,  2, 87, 87, 87, 87, 87, 87,  2,  2, 87, 87,
-    2,  2,  2,  2,  2,  2, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,
-    2, 12, 12, 12, 12, 12, 13, 13,  2,  2,  2,  2,  2,  2, 19, 19,
-   19, 19, 19, 19, 19,  2,  2,  2,  2,  4,  4,  4,  4,  4,  2,  2,
-    2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2, 14, 14,
-   14, 14, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14,  3,  3,
-    3,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  0,  0,  2,  2,  3,  3,  3,  3,  3,  3,  2,  2,
-    2,  2,  2,  2,  2,  3,  1,  1,  1,  1,  1,  1,  6,  6,  0,  0,
-    0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  3,  3,
-    3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  2,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
-   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
-   12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49, 49,
-   49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
-   49, 49, 49, 49, 49,  2, 49, 49, 49,  2, 49, 49,  2, 49, 49, 49,
-   49, 49, 49, 49,  2,  2, 49, 49, 49,  2,  2,  2,  2,  2,  0,  0,
-    0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
-    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  0,  0,
-    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67,  2,
-    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42, 42,
-   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
-    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
-  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-   59, 59,  2,  2,  2,  2, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
-   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 50, 50,
-   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  2,  2, 50, 50,
-    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
-  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,104,104,
-  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
-  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
-    2,161,161,161,161,161,161,161,  2,161,161,  2,  2,  2,170,170,
-  170,170,170,170,170,170,170,170,170,170,  2,  2,  2,  2,110,110,
-  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,110,110,
-  110,110,110,110,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19,  2,
-   19, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2, 47, 47,
-   47, 47, 47, 47,  2,  2, 47,  2, 47, 47, 47, 47, 47, 47, 47, 47,
-   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,  2, 47, 47,  2,
-    2,  2, 47,  2,  2, 47, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
-   81, 81, 81, 81,  2, 81,120,120,120,120,120,120,120,120,116,116,
-  116,116,116,116,116,116,116,116,116,116,116,116,116,  2,  2,  2,
-    2,  2,  2,  2,  2,116,128,128,128,128,128,128,128,128,128,128,
-  128,  2,128,128,  2,  2,  2,  2,  2,128,128,128,128,128, 66, 66,
-   66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  2,  2,  2, 66, 72, 72,
-   72, 72, 72, 72, 72, 72, 72, 72,  2,  2,  2,  2,  2, 72, 98, 98,
-   98, 98, 98, 98, 98, 98, 97, 97, 97, 97, 97, 97, 97, 97,  2,  2,
-    2,  2, 97, 97, 97, 97,  2,  2, 97, 97, 97, 97, 97, 97, 57, 57,
-   57, 57,  2, 57, 57,  2,  2,  2,  2,  2, 57, 57, 57, 57, 57, 57,
-   57, 57,  2, 57, 57, 57,  2, 57, 57, 57, 57, 57, 57, 57, 57, 57,
-   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,  2,  2, 57, 57,
-   57,  2,  2,  2,  2, 57, 57,  2,  2,  2,  2,  2,  2,  2, 88, 88,
-   88, 88, 88, 88, 88, 88,117,117,117,117,117,117,117,117,112,112,
-  112,112,112,112,112,112,112,112,112,112,112,112,112,  2,  2,  2,
-    2,112,112,112,112,112, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
-   78, 78, 78, 78,  2,  2,  2, 78, 78, 78, 78, 78, 78, 78, 83, 83,
-   83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,  2,  2, 82, 82,
-   82, 82, 82, 82, 82, 82, 82, 82, 82,  2,  2,  2,  2,  2,122,122,
-  122,122,122,122,122,122,122,122,  2,  2,  2,  2,  2,  2,  2,122,
-  122,122,122,  2,  2,  2,  2,122,122,122,122,122,122,122, 89, 89,
-   89, 89, 89, 89, 89, 89, 89,  2,  2,  2,  2,  2,  2,  2,130,130,
-  130,130,130,130,130,130,130,130,130,  2,  2,  2,  2,  2,  2,  2,
-  130,130,130,130,130,130,144,144,144,144,144,144,144,144,144,144,
-    2,  2,  2,  2,  2,  2,165,165,165,165,165,165,165,165,165,165,
-  165,165,165,165,  2,  2,  2,165,165,165,165,165,165,165,  2,  2,
-    2,  2,  2,  2,165,165,156,156,156,156,156,156,156,156,156,156,
-    2,156,156,156,  2,  2,156,156,  2,  2,  2,  2,  2,  2,  2,  2,
-    3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,147,147,
-  147,147,147,147,147,147,148,148,148,148,148,148,148,148,148,148,
-    2,  2,  2,  2,  2,  2,158,158,158,158,158,158,158,158,158,158,
-    2,  2,  2,  2,  2,  2,153,153,153,153,153,153,153,153,153,153,
-  153,153,  2,  2,  2,  2,149,149,149,149,149,149,149,149,149,149,
-  149,149,149,149,149,  2, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-   94, 94, 94, 94,  2,  2,  2,  2, 94, 94, 94, 94, 94, 94,  2,  2,
-    2,  2,  2,  2,  2, 94, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
-   85,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 85,  2,  2,101,101,
-  101,101,101,101,101,101,101,  2,  2,  2,  2,  2,  2,  2,101,101,
-    2,  2,  2,  2,  2,  2, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96,  2, 96, 96,111,111,111,111,111,111,111,111,111,111,
-  111,111,111,111,111,  2,100,100,100,100,100,100,100,100,  2, 36,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,108,108,
-  108,108,108,108,108,108,108,108,  2,108,108,108,108,108,108,108,
-    2,  2,  2,  2,  2,  2,129,129,129,129,129,129,129,  2,129,  2,
-  129,129,129,129,  2,129,129,129,129,129,129,129,129,129,129,129,
-  129,129,129,129,  2,129,129,129,  2,  2,  2,  2,  2,  2,109,109,
-  109,109,109,109,109,109,109,109,109,  2,  2,  2,  2,  2,109,109,
-    2,  2,  2,  2,  2,  2,107,107,107,107,  2,107,107,107,107,107,
-  107,107,107,  2,  2,107,107,  2,  2,107,107,107,107,107,107,107,
-  107,107,107,107,107,107,107,  2,107,107,107,107,107,107,107,  2,
-  107,107,  2,107,107,107,107,107,  2,  1,107,107,107,107,107,  2,
-    2,107,107,107,  2,  2,107,  2,  2,  2,  2,  2,  2,107,  2,  2,
-    2,  2,  2,107,107,107,107,107,107,107,  2,  2,107,107,107,107,
-  107,107,107,  2,  2,  2,171,171,171,171,171,171,171,171,171,171,
-    2,171,  2,  2,171,  2,171,171,171,171,171,171,  2,171,171,  2,
-  171,  2,  2,171,  2,171,171,171,171,  2,171,171,171,171,171,  2,
-    2,  2,  2,  2,  2,  2,  2,171,171,  2,  2,  2,  2,  2,137,137,
-  137,137,137,137,137,137,137,137,137,137,  2,137,137,137,137,137,
-    2,  2,  2,  2,  2,  2,124,124,124,124,124,124,124,124,124,124,
-    2,  2,  2,  2,  2,  2,123,123,123,123,123,123,123,123,123,123,
-  123,123,123,123,  2,  2,114,114,114,114,114,114,114,114,114,114,
-  114,114,114,  2,  2,  2,114,114,  2,  2,  2,  2,  2,  2, 32, 32,
-   32, 32, 32,  2,  2,  2,102,102,102,102,102,102,102,102,102,102,
-    2,  2,  2,  2,  2,  2, 33, 33, 33, 33,  2,  2,  2,  2,126,126,
-  126,126,126,126,126,126,126,126,126,  2,  2,126,126,126,126,126,
-  126,126,  2,  2,  2,  2,126,126,126,126,126,126,126,  2,142,142,
-  142,142,142,142,142,142,142,142,142,142,  2,  2,  2,  2,125,125,
-  125,125,125,125,125,125,125,125,125,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,125,154,154,154,154,154,154,154,  2,  2,154,
-    2,  2,154,154,154,154,154,154,154,154,  2,154,154,  2,154,154,
-  154,154,154,154,154,154,154,154,154,154,154,154,  2,154,154,  2,
-    2,154,154,154,154,154,154,154,  2,  2,  2,  2,  2,  2,150,150,
-  150,150,150,150,150,150,  2,  2,150,150,150,150,150,150,150,150,
-  150,150,150,  2,  2,  2,141,141,141,141,141,141,141,141,140,140,
-  140,140,140,140,140,140,140,140,140,  2,  2,  2,  2,  2,121,121,
-  121,121,121,121,121,121,121,  2,  2,  2,  2,  2,  2,  2,  7,  7,
-    2,  2,  2,  2,  2,  2,169,169,169,169,169,169,169,169,169,169,
-    2,  2,  2,  2,  2,  2,133,133,133,133,133,133,133,133,133,  2,
-  133,133,133,133,133,133,133,133,133,133,133,133,133,  2,133,133,
-  133,133,133,133,  2,  2,133,133,133,133,133,  2,  2,  2,134,134,
-  134,134,134,134,134,134,  2,  2,134,134,134,134,134,134,  2,134,
-  134,134,134,134,134,134,134,134,134,134,134,134,134,  2,138,138,
-  138,138,138,138,138,  2,138,138,  2,138,138,138,138,138,138,138,
-  138,138,138,138,138,138,  2,  2,138,  2,138,138,  2,138,138,138,
-    2,  2,  2,  2,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
-  143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
-  143,143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,  2,
-    2,  2,  2,  2,  2,  2,143,143,  2,  2,  2,  2,  2,  2,145,145,
-  145,145,145,145,145,145,145,  2,  2,  2,  2,  2,  2,  2,163,163,
-  163,163,163,163,163,163,163,  2,163,163,163,163,163,163,163,163,
-  163,  2,  2,  2,163,163,163,163,163,  2,  2,  2,  2,  2, 86,  2,
-    2,  2,  2,  2,  2,  2, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63, 63,
-   63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,157,
-  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2, 80, 80,
-   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2,  2, 80, 80,
-   80,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,127,127,127,
-  127,127,127,127,127,  2,166,166,166,166,166,166,166,166,166,166,
-    2,  2,  2,  2,  2,  2, 79,  2,  2,  2,  2,  2,  2,  2,115,115,
-  115,115,115,115,115,115,115,115,115,115,115,115,115,  2,115,115,
-    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,159,159,159,
-  159,159,159,159,159,  2,159,159,  2,  2,  2,  2,  2,  2,103,103,
-  103,103,103,103,103,103,103,103,103,103,103,103,  2,  2,119,119,
-  119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,119,119,
-    2,119,119,119,119,119,  2,  2,  2,  2,  2,119,119,119,167,167,
-  167,167,167,167,167,167,167,167,  2,  2,  2,  2,  2,  2,146,146,
-  146,146,146,146,146,146,146,146,146,  2,  2,  2,  2,  2, 99, 99,
-   99, 99, 99, 99, 99, 99, 99, 99, 99,  2,  2,  2,  2, 99,  2,  2,
-    2,  2,  2,  2,  2, 99,136,139, 13, 13,155,  2,  2,  2,136,136,
-  136,136,136,136,136,136,155,155,155,155,155,155,155,155,155,155,
-  155,155,155,155,  2,  2,  2,  2,  2,  2,  2,  2,  2,155,136,  2,
-    2,  2,  2,  2,  2,  2, 17, 17, 17, 17,  2, 17, 17, 17, 17, 17,
-   17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 15, 15, 15, 15, 17, 17,
-   17,  2,  2,  2,  2,  2,  2,  2, 15,  2,  2,  2,  2,  2, 15, 15,
-   15,  2,  2, 17,  2,  2,  2,  2,  2,  2, 17, 17, 17, 17,139,139,
-  139,139,139,139,139,139,139,139,139,139,  2,  2,  2,  2,105,105,
-  105,105,105,105,105,105,105,105,105,  2,  2,  2,  2,  2,105,105,
-  105,105,105,  2,  2,  2,105,  2,  2,  2,  2,  2,  2,  2,105,105,
-    2,  2,105,105,105,105,  1,  1,  1,  1,  1,  1,  2,  2,  0,  0,
-    0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,
-    1,  1,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  2,  2,
-    0,  2,  2,  0,  0,  2,  2,  0,  0,  0,  0,  2,  0,  0,  0,  0,
-    2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,
-    0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  0,
-    0,  0,  0,  2,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,
-    0,  0,  0,  0,  0,  0,131,131,131,131,131,131,131,131,131,131,
-  131,131,  2,  2,  2,  2,  2,  2,  2,131,131,131,131,131,  2,131,
-  131,131,131,131,131,131,  2,  2,  2,  2,  2, 19, 19, 19, 56, 56,
-   56, 56, 56, 56, 56,  2, 56,  2,  2, 56, 56, 56, 56, 56, 56, 56,
-    2, 56, 56,  2, 56, 56, 56, 56, 56,  2,  2,  2,  2,  2,  6,  6,
-    6,  6,  6,  6,  2,  2,  2,  2,  2,  2,  2,  2,  2,  6,151,151,
-  151,151,151,151,151,151,151,151,151,151,151,  2,  2,  2,151,151,
-  151,151,151,151,  2,  2,151,151,  2,  2,  2,  2,151,151,160,160,
-  160,160,160,160,160,160,160,160,160,160,160,160,160,  2,152,152,
-  152,152,152,152,152,152,152,152,  2,  2,  2,  2,  2,152,164,164,
-  164,164,164,164,164,164,164,164,  2,  2,  2,  2,  2,  2,168,168,
-  168,168,168,168,168,168,168,168,168,  2,  2,  2,  2,168, 30, 30,
-   30, 30,  2, 30, 30,  2,113,113,113,113,113,113,113,113,113,113,
-  113,113,113,  2,  2,113,113,113,113,113,113,113,113,  2,132,132,
-  132,132,132,132,132,132,132,132,132,132,  2,  2,  2,  2,132,132,
-    2,  2,  2,  2,132,132,  3,  3,  3,  3,  2,  3,  3,  3,  2,  3,
-    3,  2,  3,  2,  2,  3,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  2,  3,  3,  3,  3,  2,  3,  2,  3,  2,  2,  2,  2,  2,  2,
-    3,  2,  2,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  2,  3,
-    2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  3,  2,  3,  2,  3,  3,
-    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  3,
-    3,  3,  2,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  0,  0, 15,  0,  0,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,
-    2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2,  0, 13,  2,
-    2,  2,  2,  2,  2,  2, 13, 13, 13,  2,  2,  2,  2,  2,  2,  0,
-    2,  2,  2,  2,  2,  2,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    9,  9,  9, 10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,
+   17,  0,  2, 26, 26, 26, 26, 26, 26, 26,  2, 12, 12, 12, 12, 12,
+   12,  2, 12, 12, 12,  0, 39, 39, 39, 39, 39,  2,  2,  2, 39, 39,
+   39,  2, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79,  2, 19,
+   19, 19, 60, 60, 60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 75, 75,
+   75, 75, 75, 75,  2,  2,  2,  2, 75, 75, 69, 69, 69, 69, 69, 69,
+    0, 69, 74, 74, 74, 74,  2,  2,  2, 74, 12,  2,  2,  2, 84, 84,
+   84, 84, 84, 84,  2,  0, 84, 84,  2,  2,  2,  2, 84, 84, 33, 33,
+   33,  2, 68, 68, 68, 68, 68, 68, 68,  2, 68, 68,  2,  2, 92, 92,
+   92, 92, 92, 92, 92,  2,  2,  2,  2, 92, 87, 87, 87, 87, 87, 87,
+   87,  2, 19,  9, 19, 19, 19, 19,  0,  0, 87, 87,  2,  2,  2,  2,
+    2, 12, 19, 19, 19,  2,  2,  2,  2,  4, 14,  2, 14,  2, 14, 14,
+    2, 14, 14,  2, 14, 14,  3,  3,  0,  0,  1,  1,  6,  6,  3,  2,
+    3,  3,  3,  2,  2,  0,  2,  0,  0,  0,  0,  0, 17, 17, 17, 17,
+    0,  0,  2,  2, 12, 12, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
+   49,  2, 49, 49,  2, 49, 49, 49,  2,  2,  0,  2,  2,  2,  9,  2,
+    2,  2,  0,  1,  2,  2, 71, 71, 71, 71, 71,  2,  2,  2, 67, 67,
+   67, 67, 67,  2,  2,  2, 42, 42, 42, 42,  2, 42, 42, 42, 41, 41,
+   41, 41, 41, 41, 41,  2,118,118,118,118,118,118,118,  2, 53, 53,
+   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
+   40, 40, 51, 51, 51, 51, 50, 50, 50, 50, 50, 50,  2,  2,135,135,
+  135,135,106,106,106,106,104,104,104,104,  2,  2,  2,104,161,161,
+  161,161,161,161,161,  2,161,161,  2,161,161,  2,  2,  2,170,170,
+  170,170,110,110,110,110,110,110,110,  2,110,110,  2,  2, 19, 19,
+    2, 19, 19,  2, 19, 19, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
+   47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2, 47, 81, 81,
+   81, 81, 81, 81,  2, 81,120,120,120,120,116,116,116,116,116,116,
+  116,  2,  2,  2,  2,116,128,128,128,128,128,128,128,  2,128,128,
+    2,  2,  2,  2,  2,128, 66, 66, 66, 66,  2,  2,  2, 66, 72, 72,
+   72, 72, 72, 72,  2,  2,  2,  2,  2, 72,173,173,173,173,173,173,
+    2,  2, 98, 98, 98, 98, 97, 97, 97, 97,  2,  2, 97, 97, 57, 57,
+   57, 57,  2, 57, 57,  2,  2, 57, 57, 57, 57, 57,  2,  2, 57, 57,
+   57,  2,  2,  2,  2, 57, 57,  2,  2,  2, 88, 88, 88, 88,117,117,
+  117,117,112,112,112,112,112,112,112,  2,  2,  2,  2,112, 78, 78,
+   78, 78, 78, 78,  2,  2,  2, 78, 78, 78, 83, 83, 83, 83, 83, 83,
+    2,  2, 82, 82, 82, 82, 82, 82, 82,  2,122,122,122,122,122,122,
+    2,  2,  2,122,122,122,122,  2,  2,  2, 89, 89, 89, 89, 89,  2,
+    2,  2,130,130,130,130,130,130,130,  2,  2,  2,130,130,144,144,
+  144,144,144,144,  2,  2,165,165,165,165,165,165,  2,  2,  2,165,
+  165,165,  2,  2,165,165,  3,  3,  3,  2,156,156,156,156,156,156,
+    2,156,156,156,  2,  2,  2,  2,  3,  3,  3,  2,  2,  2,147,147,
+  147,147,148,148,148,148,148,148,  2,  2,158,158,158,158,158,158,
+    2,  2,153,153,153,153,149,149,149,149,149,149,149,  2, 94, 94,
+   94, 94, 94, 94,  2,  2,  2,  2, 94, 94,  2,  2,  2, 94, 85, 85,
+   85, 85, 85, 85, 85,  2,  2, 85,  2,  2,101,101,101,101,101,  2,
+    2,  2,101,101,  2,  2, 96, 96, 96, 96, 96,  2, 96, 96,111,111,
+  111,111,111,111,111,  2,100,100,100,100,108,108,108,108,108,108,
+    2,108,108,108,  2,  2,129,129,129,129,129,129,129,  2,129,  2,
+  129,129,129,129,  2,129,129,129,  2,  2,109,109,109,109,109,109,
+  109,  2,109,109,  2,  2,107,107,107,107,  2,107,107,107,107,  2,
+    2,107,107,  2,107,107,107,107,  2,  1,107,107,  2,  2,107,  2,
+    2,  2,  2,  2,  2,107,  2,  2,107,107,171,171,171,171,171,171,
+    2,171,  2,  2,171,  2,171,  2,171,  2,  2,171,  2,171,171,171,
+  171,  2,171,  2,  2,  2,  2,171,171,  2,137,137,137,137,  2,137,
+  137,137,137,137,  2,  2,124,124,124,124,124,124,  2,  2,123,123,
+  123,123,123,123,  2,  2,114,114,114,114,114,  2,  2,  2,114,114,
+    2,  2,102,102,102,102,102,102,  2,  2,126,126,126,126,126,126,
+  126,  2,  2,126,126,126,142,142,142,142,125,125,125,125,125,125,
+  125,  2,  2,  2,  2,125,154,154,154,154,154,154,154,  2,  2,154,
+    2,  2,  2,154,154,  2,154,154,  2,154,154,  2,  2,154,154,154,
+    2,  2,150,150,150,150,  2,  2,150,150,150,  2,  2,  2,141,141,
+  141,141,140,140,140,140,140,140,140,  2,121,121,121,121,121,  2,
+    2,  2,  7,  7,  2,  2,169,169,169,169,169,169,  2,  2,133,133,
+  133,133,133,  2,133,133,133,133,133,  2,133,133,  2,  2,133,  2,
+    2,  2,134,134,134,134,  2,  2,134,134,  2,134,134,134,134,134,
+  134,  2,138,138,138,138,138,138,138,  2,138,138,  2,138,  2,  2,
+  138,  2,138,138,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
+  143,143,143,143,143,  2,143,  2,  2,  2,143,143,  2,  2,175,175,
+  175,175,175,175,  2,  2,145,145,145,145,145,  2,  2,  2,163,163,
+  163,163,163,  2,163,163,163,163,163,  2,  2,  2,163,163, 86,  2,
+    2,  2, 63, 63, 63, 63, 63, 63,  2,  2, 63, 63, 63,  2, 63,  2,
+    2,  2,157,157,157,157,157,157,157,  2, 80, 80, 80, 80, 80, 80,
+    2,  2, 80, 80, 80,  2,127,127,127,127,127,127,127,  2,166,166,
+  166,166,166,166,  2,  2, 79,  2,  2,  2,115,115,115,115,115,115,
+  115,  2,115,115,  2,  2,  2,  2,115,115,159,159,159,159,159,159,
+  159,  2,159,159,  2,  2,103,103,103,103,103,103,  2,  2,119,119,
+  119,119,119,119,  2,  2,119,119,  2,119,  2,119,119,119,167,167,
+  167,167,167,167,  2,  2,146,146,146,146,146,146,146,  2,172,172,
+  172,172,172,  2,  2,172, 99, 99, 99, 99, 99, 99, 99,  2,  2,  2,
+    2, 99,136,139, 13, 13,155,  2,  2,  2, 13, 13, 13,  2,136,136,
+  136,136,155,155,155,155,155,155,  2,  2,  2,  2,  2,155,136,136,
+  136,  2,  2, 17, 17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 17, 17,
+   17,  2,  2,  2, 15,  2,  2, 17,  2,  2,139,139,139,139,105,105,
+  105,105,105,105,105,  2,105,  2,  2,  2,105,105,  2,  2,  1,  1,
+    1,  2,  0,  0,  0,  1,  0,  1,  1,  1,  0,  0,  1,  1,  2,  2,
+    0,  2,  2,  0,  0,  2,  0,  0,  2,  0,  0,  2,  0,  2,131,131,
+  131,131,  2,  2,  2,131,  2,131,131,131, 56, 56, 56,  2, 56,  2,
+    2, 56, 56, 56,  2, 56, 56,  2, 56, 56,  6,  6,  2,  2,  2,  2,
+    2,  6,151,151,151,151,151,  2,  2,  2,151,151,  2,  2,  2,  2,
+  151,151,160,160,160,160,160,160,160,  2,152,152,152,152,152,152,
+    2,  2,  2,  2,  2,152,164,164,164,164,164,164,  2,  2,168,168,
+  168,168,168,168,168,  2,  2,  2,  2,168,174,174,174,174,174,174,
+  174,  2,174,174,  2,  2,  2,  2,174,174,  2, 30, 30,  2,113,113,
+  113,113,113,  2,  2,113,113,113,113,  2,132,132,132,132,132,132,
+    2,  2,  2,  2,132,132,  2,  3,  3,  3,  2,  3,  3,  2,  3,  2,
+    2,  3,  2,  3,  2,  3,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,
+    2,  3, 15,  0,  0,  2,  0,  2,  2,  0, 13,  2,  2,  2,  2,  0,
+    2,  2,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,
+    9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9, 16, 17,  9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20,
-   21,  9, 22,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,
+    9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20, 21,  9, 22,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,
+    9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
@@ -3933,67 +3605,65 @@ _hb_ucd_u8[17524] =
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9, 26, 27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14,
-   15, 16, 17, 18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28,
-   29, 30,  0,  0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0,
-   36, 37, 38, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   41, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 26, 27,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18,
+   19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0,
+   31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0,
-   46, 47,  0,  0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0,
-   53,  0,  0,  0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0,
-   55,  0,  0,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,
-    0, 57,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,
-    0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,
+    0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,
+    0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,
+    0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,
+    0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
-   83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
-   99,100,101,102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,
-  107,  0,  0,  0,108,  0,109,  0,110,  0,111,112,113,  0,114,  0,
-    0,  0,115,  0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+   87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,
+  103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,  0,  0,
+  108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,115,  0,
+    0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,117,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,118,119,120,121,  0,122,123,124,
-  125,126,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,128,129,130,131,132,133,134,135,136,137,138,139,
-  140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,
-  156,157,  0,  0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,  0,127,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  162,  0,163,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,
-    0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,  0,  0,
+    0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,
-  170,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,  0,163,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,  0,  0,  0,  0,
+    0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,170,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,
+    0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,
-  179,  0,  0,  0,180,181,182,183,184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    1,  2,  3,  4,
+    0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,179,  0,  0,  0,
+  180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,
+  196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,
+  212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
 };
-static const uint16_t
-_hb_ucd_u16[9668] =
+static const uint16_t _hb_ucd_u16[10904]=
 {
      0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
     13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
@@ -4020,23 +3690,23 @@ _hb_ucd_u16[9668] =
     48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
    194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
     48, 200, 201, 202, 203,  48, 204, 205,  48,  48, 206,  48, 207, 208, 209, 209,
-    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215, 216, 140, 140, 140,
-   217,  48,  48, 218, 219, 160, 220, 221, 222,  48, 223,  64,  48,  48, 224, 225,
-    48,  48, 226, 227, 228,  64,  48, 229, 230,   9,   9, 231, 232, 233, 234, 235,
-    11,  11, 236,  27,  27,  27, 237, 238,  11, 239,  27,  27,  32,  32,  32,  32,
-    13,  13,  13,  13,  13,  13,  13,  13,  13, 240,  13,  13,  13,  13,  13,  13,
-   241, 242, 241, 241, 242, 243, 241, 244, 245, 245, 245, 246, 247, 248, 249, 250,
-   251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 261, 262, 263, 264, 265,
-   266, 267, 268, 269, 270, 271, 272, 272, 273, 274, 275, 209, 276, 277, 209, 278,
-   279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
-   280, 209, 281, 209, 209, 209, 209, 282, 209, 283, 279, 284, 209, 285, 286, 209,
-   209, 209, 176, 140, 287, 140, 271, 271, 271, 288, 209, 209, 209, 209, 289, 271,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 290, 291, 209, 209, 292,
-   209, 209, 209, 209, 209, 209, 293, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 209, 209, 209, 294, 295, 271, 296, 209, 209, 297, 279, 298, 279,
+    48, 210,  48,  48,  48, 211, 212, 213, 192, 192, 214, 215,  32, 216, 217, 140,
+   218,  48,  48, 219, 220, 160, 221, 222, 223,  48, 224,  64,  48,  48, 225, 226,
+    48,  48, 227, 228, 229,  64,  48, 230, 231,   9,   9, 232, 233, 234, 235, 236,
+    11,  11, 237,  27,  27,  27, 238, 239,  11, 240,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 241,  13,  13,  13,  13,  13,  13,
+   242, 243, 242, 242, 243, 244, 242, 245, 246, 246, 246, 247, 248, 249, 250, 251,
+   252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 262, 263, 264, 265, 266,
+   267, 268, 269, 270, 271, 272, 273, 273, 274, 275, 276, 209, 277, 278, 209, 279,
+   280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+   281, 209, 282, 209, 209, 209, 209, 283, 209, 284, 280, 285, 209, 286, 287, 209,
+   209, 209, 176, 140, 288, 140, 272, 272, 272, 289, 209, 209, 209, 209, 290, 272,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 291, 292, 209, 209, 293,
+   209, 209, 209, 209, 209, 209, 294, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 295, 296, 272, 297, 209, 209, 298, 280, 299, 280,
    209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
-   279, 279, 279, 279, 279, 279, 279, 279, 299, 300, 279, 279, 279, 301, 279, 302,
-   209, 209, 209, 279, 303, 209, 209, 304, 209, 305, 209, 209, 209, 209, 209, 209,
+   280, 280, 280, 280, 280, 280, 280, 280, 300, 301, 280, 280, 280, 302, 280, 303,
+   209, 209, 209, 280, 304, 209, 209, 305, 209, 209, 209, 209, 209, 209, 209, 209,
      9,   9,   9,  11,  11,  11, 306, 307,  13,  13,  13,  13,  13,  13, 308, 309,
     11,  11, 310,  48,  48,  48, 311, 312,  48, 313, 314, 314, 314, 314,  32,  32,
    315, 316, 317, 318, 319, 320, 140, 140, 209, 321, 209, 209, 209, 209, 209, 322,
@@ -4046,7 +3716,7 @@ _hb_ucd_u16[9668] =
    209, 333, 334, 209, 335, 336, 209, 209, 334, 209, 209, 336, 209, 209, 209, 209,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
     48, 337,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 229,
+    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 230,
    339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
     31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
    357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
@@ -4062,1560 +3732,407 @@ _hb_ucd_u16[9668] =
     32, 404,  32, 405, 406, 407, 408, 409,  48,  48,  48,  48,  48,  48,  48, 410,
    411,   2,   3,   4,   5, 412, 413, 414,  48, 415,  48, 200, 416, 417, 418, 419,
    420,  48, 172, 421, 204, 204, 140, 140,  48,  48,  48,  48,  48,  48,  48,  71,
-   422, 271, 271, 423, 272, 272, 272, 424, 425, 426, 427, 140, 140, 209, 209, 428,
+   422, 272, 272, 423, 273, 273, 273, 424, 425, 426, 427, 140, 140, 209, 209, 428,
    140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
     48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
      9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
     48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445,  48,  48,  48, 388,
     48,  48,  48, 313,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
    448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
-    48, 454,  48, 455, 140, 140, 140, 140,  48,  48,  48, 456, 271, 457, 271, 271,
+    48, 454,  48, 455,  48, 207, 140, 140,  48,  48,  48, 456, 272, 457, 272, 272,
    458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
     48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
     48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
     48,  48, 475, 192, 476,   9, 477,  11, 478, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 271, 479,  48,  48, 480, 481, 482, 140, 140, 483,
-    48, 464, 484,  48,  62, 485, 140,  48, 486, 140, 140,  48, 487, 140,  48, 313,
-   488,  48,  48, 489, 490, 457, 491, 492, 222,  48,  48, 493, 494,  48, 196, 192,
-   495,  48, 496, 497, 498,  48,  48, 499, 222,  48,  48, 500, 501, 502, 503, 504,
-    48,  97, 505, 506, 507, 140, 140, 140, 508, 509, 510,  48,  48, 511, 512, 192,
-   513,  83,  84, 514, 515, 516, 517, 518, 519,  48,  48, 520, 521, 522, 523, 140,
-    48,  48,  48, 524, 525, 526, 481, 140,  48,  48,  48, 527, 528, 192, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 529, 530, 531, 532, 140, 140,
-    48,  48,  48, 533, 534, 192, 535, 140,  48,  48, 536, 537, 192, 538, 539, 140,
-    48, 540, 541, 542, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48, 505, 543, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 544,
-   545, 546,  48, 547, 548, 192, 140, 140, 140, 140, 549,  48,  48, 550, 551, 140,
-   552,  48,  48, 553, 554, 555,  48,  48, 556, 557, 558,  48,  48,  48,  48, 196,
-   559, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 560, 192,
-    84,  48, 529, 561, 562, 148, 175, 563,  48, 564, 565, 566, 140, 140, 140, 140,
-   567,  48,  48, 568, 569, 192, 570,  48, 571, 572, 192, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 573,
-   574, 115,  48, 575, 576, 577, 140, 140, 140, 140, 140, 100, 271, 578, 579, 580,
+   140, 140, 140, 140, 140, 140, 272, 479,  48,  48, 480, 481, 482, 483, 140, 484,
+    48, 464, 485,  48,  62, 486, 140,  48, 487, 140, 140,  48, 488, 140,  48, 313,
+   489,  48,  48, 490, 491, 457, 492, 493, 223,  48,  48, 494, 495,  48, 196, 192,
+   496,  48, 497, 498, 499,  48,  48, 500, 223,  48,  48, 501, 502, 503, 504, 505,
+    48,  97, 506, 507, 508, 140, 140, 140, 509, 510, 511,  48,  48, 512, 513, 192,
+   514,  83,  84, 515, 516, 517, 518, 519, 520,  48,  48, 521, 522, 523, 524, 140,
+    48,  48,  48, 525, 526, 527, 481, 140,  48,  48,  48, 528, 529, 192, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 530, 531, 532, 533, 140, 140,
+    48,  48,  48, 534, 535, 192, 536, 140,  48,  48, 537, 538, 192, 539, 540, 140,
+    48, 541, 542, 543, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 506, 544, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 545,
+   546, 547,  48, 548, 549, 192, 140, 140, 140, 140, 550,  48,  48, 551, 552, 140,
+   553,  48,  48, 554, 555, 556,  48,  48, 557, 558, 559,  48,  48,  48,  48, 196,
+   560, 140, 140, 140, 140, 140, 561, 140, 140, 140, 140, 140,  48,  48, 562, 192,
+    84,  48, 530, 563, 564, 148, 175, 565,  48, 566, 567, 568, 140, 140, 140, 140,
+   569,  48,  48, 570, 571, 192, 572,  48, 573, 574, 192,  48,  48, 575, 192, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 576,
+   577, 115,  48, 578, 579, 580, 140, 140, 140, 140, 140, 100, 272, 581, 582, 583,
     48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
-   272, 272, 272, 272, 272, 272, 581, 582,  48,  48,  48,  48,  48,  48,  48,  48,
+   273, 273, 273, 273, 273, 273, 584, 585,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
    140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 583,
-    48,  48,  48, 584, 585, 586,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 586,
+    48,  48,  48, 587, 588, 589,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  71,
     48,  48,  48,  48, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48, 587, 588, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 589,
-    48,  48,  48, 590, 591, 592, 593, 594,  48, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 595,  48, 596, 192, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140,   9,   9,  11,  11, 271, 597, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 598, 599, 600, 600, 601, 602, 140, 140, 140, 140, 603, 604,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 440,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 605,
-   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 606,
-    48,  48, 607, 608, 140, 609, 610,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48, 590, 591, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 592,
+    48,  48,  48, 593, 594, 595, 596, 597,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 598,  48, 599, 192, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 272, 600,   9, 601,  11, 602, 140, 140,
+    48,  48,  48,  48, 603, 604, 605, 605, 606, 607, 140, 140, 140, 140, 608, 609,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 610,
+    48, 200, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48,  48, 611,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 612,
+    48,  48, 611, 613, 140, 614, 615,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
-    48,  48,  48,  48,  48,  48,  71, 151, 196, 611, 612, 140, 140, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 192,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140, 140,
-    32,  32, 613,  32, 614, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 616, 617, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 618,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 619, 209, 427, 209, 620,
+    32,  32, 216,  32, 621, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
    209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323,
-   209, 209, 615, 209, 209, 209, 616, 617, 618, 209, 619, 209, 209, 209, 287, 140,
-   209, 209, 209, 209, 620, 140, 140, 140, 140, 140, 140, 140, 271, 621, 271, 621,
-   209, 209, 209, 209, 209, 338, 271, 461, 140, 140, 140, 140, 140, 140, 140, 140,
-     9, 622,  11, 623, 624, 625, 241,   9, 626, 627, 628, 629, 630,   9, 622,  11,
-   631, 632,  11, 633, 634, 635, 636,   9, 637,  11,   9, 622,  11, 623, 624,  11,
-   241,   9, 626, 636,   9, 637,  11,   9, 622,  11, 638,   9, 639, 640, 641, 642,
-    11, 643,   9, 644, 645, 646, 647,  11, 648,   9, 649,  11, 650, 538, 538, 538,
-    32,  32,  32, 651,  32,  32, 652, 653, 654, 655,  45, 140, 140, 140, 140, 140,
-   656, 657, 658, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   659, 660, 661,  27,  27,  27, 662, 140, 663, 140, 140, 140, 140, 140, 140, 140,
-    48,  48, 151, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 666, 140,  48,  48, 667, 668,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 669, 192,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 587, 670,
-   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 671, 200,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 672, 614, 140, 140,
-     9,   9, 626,  11, 673, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140, 140, 140, 140, 503, 271, 271, 674, 675, 140, 140, 140, 140,
-   503, 271, 676, 677, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   678,  48, 679, 680, 681, 682, 683, 684, 685, 206, 686, 206, 140, 140, 140, 687,
-   209, 209, 688, 209, 209, 209, 209, 209, 209, 322, 333, 689, 689, 689, 209, 323,
-   690, 209, 209, 209, 209, 209, 209, 209, 209, 209, 691, 140, 140, 140, 692, 209,
-   693, 209, 209, 688, 694, 695, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 696,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 697, 426, 426,
-   209, 209, 209, 209, 209, 209, 209, 698, 209, 209, 209, 209, 209, 176, 688, 427,
-   688, 209, 209, 209, 699, 176, 209, 209, 699, 209, 691, 688, 695, 140, 140, 140,
-   209, 209, 209, 209, 209, 322, 691, 426, 700, 209, 209, 209, 701, 702, 176, 694,
-   209, 209, 209, 209, 209, 209, 209, 209, 209, 703, 209, 209, 209, 209, 209, 192,
+   209, 209, 622, 209, 209, 209, 623, 624, 625, 209, 626, 209, 209, 209, 288, 140,
+   209, 209, 209, 209, 627, 140, 140, 140, 140, 140, 140, 140, 272, 628, 272, 628,
+   209, 209, 209, 209, 209, 338, 272, 461, 140, 140, 140, 140, 140, 140, 140, 140,
+     9, 629,  11, 630, 631, 632, 242,   9, 633, 634, 635, 636, 637,   9, 629,  11,
+   638, 639,  11, 640, 641, 642, 643,   9, 644,  11,   9, 629,  11, 630, 631,  11,
+   242,   9, 633, 643,   9, 644,  11,   9, 629,  11, 645,   9, 646, 647, 648, 649,
+    11, 650,   9, 651, 652, 653, 654,  11, 655,   9, 656,  11, 657, 539, 539, 539,
+    32,  32,  32, 658,  32,  32, 659, 660, 661, 662,  45, 140, 140, 140, 140, 140,
+   663, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   666, 667, 668,  27,  27,  27, 669, 140, 670, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 151, 671, 672, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 673, 140,  48,  48, 674, 675,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 676, 192,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 590, 677,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 200, 678, 679,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 680, 200,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 681, 621, 140, 140,
+     9,   9, 633,  11, 682, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 504, 272, 272, 683, 684, 140, 140, 140, 140,
+   504, 272, 685, 686, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   687,  48, 688, 689, 690, 691, 692, 693, 694, 206, 695, 206, 140, 140, 140, 696,
+   209, 209, 697, 209, 209, 209, 209, 209, 209, 322, 333, 698, 698, 698, 209, 323,
+   699, 209, 209, 209, 209, 209, 209, 209, 209, 209, 700, 140, 140, 140, 701, 209,
+   702, 209, 209, 697, 703, 704, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 705,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 706, 426, 426,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 176, 697, 427,
+   697, 209, 209, 209, 707, 176, 209, 209, 707, 209, 700, 697, 704, 708, 140, 140,
+   209, 209, 209, 209, 209, 707, 700, 426, 709, 209, 209, 209, 710, 711, 712, 703,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 713, 209, 209, 209, 209, 209, 714,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
-    48,  48,  48, 207,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 481,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100,  48,
     48,  48,  48,  48,  48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
     48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
     48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140, 140, 140, 140,
-   704, 140, 584, 584, 584, 584, 584, 584, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140, 140, 140,
+   715, 140, 587, 587, 587, 587, 587, 587, 140, 140, 140, 140, 140, 140, 140, 140,
     32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 705,
-   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 706,
-     0,   0,   1,   1,   0,   2,   3,   3,   4,   4,   4,   4,   4,   4,   4,   4,
-     4,   4,   4,   4,   4,   5,   0,   6,   7,   7,   7,   8,   9,  10,  11,  12,
-    13,  13,  13,  13,  14,  13,  13,  13,  13,  15,  16,  17,  18,  19,  20,  21,
-    22,  23,  24,  25,  23,  23,  26,  23,  27,  28,  29,  23,  30,  31,  32,  33,
-    34,  35,  36,  37,  38,  23,  23,  39,  40,  40,  41,  42,  43,  44,  45,  46,
-    47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,
-    63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,
-    79,  80,  81,  82,  83,  84,  85,  82,  86,  86,  87,  88,  89,  90,  91,  82,
-    92,  92,  92,  92,  92,  93,  94,  95,  96,  96,  96,  96,  96,  96,  96,  96,
-    97,  97,  98,  97,  99, 100, 101,  97, 102,  97, 103, 104, 105, 106, 106, 107,
-   108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 109, 110, 110, 111,
-   112, 113, 114, 115, 116, 116, 117, 118, 119, 120, 120, 121, 120, 122, 108, 123,
-   124, 125, 126, 127, 128, 129, 130, 116, 131, 132, 133, 134, 135, 136, 137,  82,
-   138, 138, 139, 138, 140, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
-     4, 151, 152, 153,   4, 154,   7,   7, 155,  11, 156, 157,  11, 158, 159, 160,
-   161,   0,   0, 162, 163,   0, 164, 165,   0, 166, 167,   4, 168,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0, 169, 170,   0,   0,   0,   0,   0,
-   171, 171, 171, 171, 171, 171, 171, 171,   0,   0,   0, 172, 173,   0,   0,   0,
-   174, 174, 174,   4, 175, 175, 175, 176,  93, 177, 178, 179, 180, 181, 181,  13,
-     0,   0, 182,  82, 183, 184, 184, 185, 184, 184, 184, 184, 184, 184, 186, 187,
-   188, 189, 190, 191, 192, 193, 194, 195, 196, 197,  96,  96, 198, 199,   0, 200,
-   201,   0,   0, 202,   0,   0, 203, 204, 194, 194, 205,   0,   0,   0,   0,   0,
-   184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184,   0,   0,
-   206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 207, 206, 208, 209,
-   210, 210, 210, 210, 210, 210, 210, 210, 210, 211,  13,  13,  13, 212, 212, 213,
-     0, 214,   4,   4, 215,   4, 216, 217, 218, 219, 220, 221, 222, 222, 223,  40,
-   224, 225, 226, 227, 228, 228, 229, 230, 231, 232, 233,  92, 234, 234, 235, 236,
-   237, 238, 239, 240, 106, 106, 241, 242,  96,  96,  96,  96,  96, 243, 244, 245,
-    82,  82,  82,  82,  82,  82,  82,  82, 184, 184, 184, 246, 184, 184, 247,  82,
-   248, 249, 250,  23,  23,  23, 251,  23,  23,  23,  23,  23,  23,  23,  23,  23,
-    23, 252,  23,  23, 253,  23, 254, 255, 256, 257, 258, 259,  23,  23,  23, 260,
-   261,   1,   1, 262, 263, 201, 264, 265, 266, 267, 268,  82, 269, 269, 269, 270,
-   271, 272,  11,  11, 273, 274, 187, 275,  82,  82,  82,  82, 276, 277, 278, 279,
-   280, 281, 282, 283, 284, 285, 286,  82, 287, 287, 288, 289, 290, 291, 292, 293,
-   294, 295, 296, 297, 298, 299, 300, 301, 302, 302, 302, 302, 302, 302, 302, 302,
-   302, 303, 304, 305, 306, 307,  82,  82, 308, 309, 310, 311, 312, 313,  82, 314,
-   315, 316,  82,  82, 317, 318, 319, 320, 321, 322, 323, 324, 325,  82, 326, 327,
-   328, 329, 330, 331, 332, 333,  82,  82, 334, 334, 335,  82, 336, 337, 336, 338,
-   339, 340, 341, 342, 343,  82,  82,  82,  82,  82,  82, 344, 345, 346, 347, 348,
-   349, 350, 351, 352, 353, 354, 355, 356, 357, 357, 358, 359, 360, 360, 361, 362,
-   363, 364, 365, 366, 367, 367, 367, 368, 369, 370, 371,  82, 372, 373, 374, 375,
-   376, 377, 378, 379, 380, 381, 382, 383, 384, 384, 385, 386, 387, 387, 388,  82,
-    82,  82,  82,  82, 389, 390, 391,  82, 392, 392, 393, 394, 395, 396, 397, 398,
-   399, 400, 401,  82,  82,  82,  82,  82, 402, 403,  82,  82,  82, 404, 404, 405,
-   406, 407, 408,  82,  82, 409, 410, 411, 412, 412, 413, 414, 414, 415, 416, 417,
-   418,  82,  82,  82,  82,  82, 419, 420, 421, 422, 423, 424, 425, 426,  82,  82,
-   427, 428, 429, 430, 431, 432,  82,  82,  82,  82,  82,  82,  82,  82,  82, 433,
-   434, 435, 436,  82,  82, 437, 438, 439, 440, 440, 440, 440, 440, 440, 440, 440,
-   440, 440, 440, 440, 441,  82,  82,  82, 440, 440, 440, 442, 440, 440, 440, 440,
-   440, 440, 443,  82,  82,  82,  82,  82,  82,  82,  82,  82, 444, 445, 445, 446,
-   447, 447, 447, 447, 447, 447, 447, 447, 447, 447, 448, 447, 447, 447, 447, 447,
-   447, 447, 447, 447, 447, 447, 447, 449, 450, 450, 450, 450, 450, 450, 450, 450,
-   450, 450, 451,  82,  82,  82,  82,  82, 452, 453,  82,  82,  82,  82,  82,  82,
-   212, 212, 212, 212, 212, 212, 212, 212, 212, 454, 455, 456, 457, 458, 459, 460,
-   461, 461, 462, 463, 464,  82,  82,  82,  82,  82, 465, 466,  82,  82,  82,  82,
-    82,  82, 467, 467, 468,  82,  82,  82, 469, 469, 470, 469, 471,  82,  82, 472,
-   473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 474,
-   475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 476, 477,
-   478,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82, 479,
-   480, 191, 191, 191, 191, 191, 191, 191, 191, 481, 482, 483, 484, 484, 484, 484,
-   484, 484, 484, 484, 484, 484, 484, 485, 486, 486, 486, 487, 488, 489,  82,  82,
-     0,   0,   0,   0,   0,   0,   0, 490,   0,   0,   0,   0,   0, 491,  82,  82,
-     7, 492, 493,   0,   0,   0, 489,  82,   0,   0,   0,   0,   0,   0,   0, 494,
-     0, 495,   0, 496, 497, 498,   0, 170,  11,  11, 499,  82,  82,  82, 491, 491,
-     0,   0, 500, 501,  82,  82,  82,  82,   0,   0, 502,   0, 503, 504, 505,   0,
-   506, 507, 508,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 509,   0,   0,
-     0,   0,   0,   0,   0,   0, 510,   0, 511, 511, 511, 511, 511, 511, 511, 511,
-   511, 511, 511, 511, 512, 513,  82,  82, 514, 515,  82,  82,  82,  82,  82,  82,
-   516, 517,  13, 518, 519,  82,  82,  82, 520, 521, 522,  82,  82,  82,  82,  82,
-    82,  82,  82,  82, 523, 524, 525, 526,  82,  82,  82,  82,  82,  82, 527, 528,
-    82,  82,  82,  82,  82,  82, 529, 530,  82,  82,  82,  82,  82,  82,  82, 531,
-   532, 532, 532, 532, 532, 532, 533,  82, 534, 534, 535,  82,  82,  82,  82,  82,
-    82,  82,  82, 536,   0, 537,  82,  82, 261, 182,  82,  82,  82,  82,  82,  82,
-   538, 539, 540, 541, 542, 543,  82, 544,   0, 545,   0,   0, 491, 546, 547, 494,
-     0,   0,   0,   0,   0, 548,  82, 549, 550, 551, 552, 553,  82,  82,  82,  82,
-     0,   0,   0,   0,   0,   0, 554, 555,   0,   0,   0, 556,   0,   0, 490, 557,
-   545,   0, 558,   0, 559, 560, 561,  82,   0,   0, 491, 562, 563,   0, 564, 565,
-     0,   0,   0,   0, 258,   0,   0, 490, 184, 184, 184, 184, 184, 184, 184,  82,
-   184, 247, 184, 184, 184, 184, 184, 184, 566, 184, 184, 184, 184, 184, 184, 184,
-   184, 184, 184, 184, 184, 567, 184, 184, 184, 184, 184, 184, 184, 184, 184, 568,
-   184, 184, 566,  82,  82,  82,  82,  82, 566,  82,  82,  82,  82,  82,  82,  82,
-   184, 184, 569, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 570,  82,  82,
-   571,   0,   0,   0,  82,  82,  82,  82,   7,   7,   7,   7,   7,   7,   7, 572,
-     0,   0,   0,   0,   1,   2,   2,   3,   0,   4,   0,   4,   2,   2,   5,   2,
-     2,   2,   2,   2,   2,   2,   2,   6,   7,   8,   0,   0,   9,   9,   9,   9,
-     9,   9,  10,  11,  12,  13,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,
-    16,  17,  14,  14,  18,  18,  18,  18,  19,  18,  18,  18,  18,  18,  20,  21,
-    21,  21,  22,  20,  21,  21,  21,  21,  21,  23,  24,  25,  25,  25,  25,  25,
-    25,  26,  25,  25,  25,  27,  28,  26,  29,  30,  31,  32,  31,  31,  31,  31,
-    33,  34,  35,  31,  31,  31,  36,  31,  31,  31,  31,  29,  37,  38,  37,  37,
-    37,  37,  37,  37,  37,  39,  31,  31,  40,  40,  40,  40,  40,  40,  41,  26,
-    42,  42,  42,  42,  42,  42,  42,  43,  44,  44,  44,  44,  44,  45,  44,  46,
-    47,  47,  47,  48,  37,  49,  31,  31,  31,  50,  51,  31,  52,  31,  31,  31,
-    53,  53,  53,  53,  53,  53,  54,  53,  55,  53,  53,  53,  56,  57,  58,  59,
-    59,  60,  61,  62,  57,  63,  64,  65,  66,  59,  59,  67,  68,  69,  70,  71,
-    71,  72,  73,  74,  69,  75,  76,  77,  78,  71,  79,  26,  80,  81,  82,  83,
-    83,  84,  85,  86,  81,  87,  88,  26,  89,  83,  90,  91,  92,  93,  94,  95,
-    95,  96,  97,  98,  93,  99, 100, 101, 102,  95,  95,  26, 103, 104, 105, 106,
-   107, 104, 108, 109, 104, 105, 110,  26, 111, 108, 108, 112, 113, 114, 115, 113,
-   113, 115, 113, 116, 114, 117, 118, 119, 120, 113, 121, 113, 122, 123, 124, 122,
-   122, 124, 125, 126, 123, 127, 128, 128, 129, 122, 130,  26, 131, 132, 133, 131,
-   131, 131, 131, 131, 132, 133, 134, 131, 135, 131, 131, 131, 136, 137, 138, 139,
-   137, 137, 140, 141, 138, 142, 143, 137, 144, 137, 145,  26, 146, 147, 147, 147,
-   147, 147, 147, 148, 147, 147, 147, 149,  26,  26,  26,  26, 150, 151, 152, 152,
-   153, 152, 152, 154, 155, 156, 152, 157, 158, 158, 158, 158, 158, 159, 158, 158,
-   158, 160, 159, 158, 158, 158, 158, 159, 158, 158, 158, 161, 158, 161, 162, 163,
-   164, 164, 164, 164, 165, 165, 165, 165, 166, 167, 165, 165, 165, 165, 165, 168,
-   169, 169, 169, 169, 170, 170, 170, 170, 170, 171, 172, 171, 170, 171, 170, 170,
-   170, 170, 171, 172, 171, 170, 172, 170, 170, 170, 171, 170, 170, 170, 170, 173,
-   170, 170, 170, 174, 170, 170, 170, 175, 176, 176, 176, 176, 176, 176, 177, 177,
-   178, 178, 178, 178, 179, 179, 179, 180, 181, 181, 181, 181, 181, 182, 181, 183,
-   184, 184, 185, 186, 187, 187, 188,  26, 189, 189, 190,  26, 191, 192, 193,  26,
-   194, 194, 194, 194, 194, 194, 194, 195, 194, 196, 194, 196, 197, 198, 198, 199,
-   198, 198, 198, 198, 198, 198, 198, 200, 198, 201, 178, 178, 178, 178, 202,  26,
-   203, 203, 203, 204, 203, 205, 203, 205, 206, 203, 207, 207, 207, 208, 209,  26,
-   210, 210, 210, 210, 210, 211, 210, 210, 210, 212, 210, 213, 214, 214, 214, 215,
-   216, 216, 216, 216, 216, 216, 216, 217, 216, 216, 216, 218, 216, 219, 216, 219,
-   216, 220,   9,   9,   9, 221,  26,  26, 222, 222, 222, 222, 222, 223, 222, 222,
-   224, 224, 224, 224, 225, 225, 225, 225, 225, 225, 226, 227, 228, 228, 228, 228,
-   228, 228, 228, 229, 228, 230, 231, 231, 231, 231, 231, 231,  18, 232, 165, 165,
-   165, 165, 165, 233, 224,  26, 234,   9, 235, 236, 237, 238, 239, 240,   2,   2,
-     2,   2,   2, 241, 242, 243,   2, 244,   2,   2,   2, 245,  14,  14, 246, 246,
-   246, 246,  14, 247,  14,  14,  14, 246,  14,  14, 248,  14, 248,  14, 249, 250,
-    14,  14, 251, 252,   0, 253,   0,   0, 254,   0, 255, 256,   0, 257,   2, 258,
-   259,  26,   9,   9,   9,   9, 260,  26, 261, 262,   4,   0,   0, 263,   0,   0,
-     2, 264,   0,   0,   0, 265,  26,  26,   0, 266,  26,  26, 267, 267, 267, 267,
-     0,   0, 268,   0,   0,   0, 269,   0, 270, 270, 270, 270,  17,  17,  17,  17,
-    17,  17, 271, 272, 166, 167, 273, 273, 273, 273, 273, 273, 273, 274, 275, 274,
-   170, 170, 172,  26, 172, 172, 172, 172,   0,   0,   0, 276, 277, 277, 277, 278,
-   277, 277, 277, 277, 277, 277, 279,  26, 277, 277, 280,  26,  26,  26,   0,   0,
-   281,   0,   0,   0, 282, 283,   0, 284, 285, 286, 286, 286, 286, 286, 286, 286,
-   286, 286, 287, 288, 289, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291,
-   292, 293, 293, 293, 293, 293, 294, 169, 169, 295,   0,   0, 293, 293, 293, 293,
-   276, 296, 290, 290, 169, 169, 169, 295, 169, 169, 169, 297,   0,   0, 290, 290,
-   290, 290, 290, 298, 290, 290, 290,   0, 299, 299, 299, 299, 299, 300, 299, 299,
-   301,  26, 302, 302, 302, 302, 302, 302, 303, 303, 303, 303, 303, 304,  26,  26,
-   305, 305, 305, 305, 305, 305, 305,  26, 306,   2,   2,   2,   2, 307,   2,   2,
-     2, 308, 309, 258,  26,  26, 310,   2, 311, 311, 311, 311, 311, 312,   0, 265,
-   313, 313, 313, 313, 313, 313, 313,  26, 314, 314, 314, 314, 315, 316, 314, 317,
-   318, 318, 318, 318, 318, 319, 320, 320, 320, 320, 321, 322, 169, 169, 169, 323,
-   324, 324, 324, 324, 324, 325, 324, 326, 164, 164, 164, 327, 328, 328, 328, 328,
-   328, 328, 329,  26, 328, 330, 328, 331, 332, 332, 332, 332, 333,  26,  26, 334,
-   335, 335, 336,  26, 337, 337, 337,  26, 172, 172,   2,   2,   2,   2,   2, 338,
-   339, 340, 176, 176, 335, 335, 335, 335, 335, 341, 335, 342, 343,  26, 169, 169,
-   295, 344, 169, 169, 169, 169, 169, 343, 277, 280, 277, 277, 277, 277, 277, 345,
-   346,  26, 347, 348,  25,  25, 349, 350, 351,  25,  31,  31, 352,  26, 353,  31,
-    31,  31,  31, 354,  31,  31, 355,  31,  31, 356,  26,  26,  26,  26,  31,  31,
-     9,   9,   0, 265,   9, 357,   0,   0,   0,   0, 358,   0, 257, 359, 360,  31,
-    31,  31,  31, 361, 362,   0,   0,   0, 363, 290, 289, 290, 290, 290, 290, 364,
-   365, 365, 365, 366, 257, 257,  26, 367, 368, 369, 368, 368, 370, 368, 368, 371,
-   368, 372, 368, 372, 368, 368, 368, 368, 368, 368, 368, 373, 374,   0,   0,   0,
-     0,   0, 375,   0,  14, 252,   0, 376, 377,  26,  26,  26,   0,   0,   0, 378,
-   379, 379, 379, 380, 381, 381, 381, 381, 381, 381, 382,  26, 383,   0,   0, 359,
-   384, 384, 384, 384, 385, 386, 387, 387, 387, 388, 389, 389, 389, 389, 389, 390,
-   391, 391, 391, 392, 393, 393, 393, 393, 394, 393, 395,  26, 396, 396, 396, 396,
-   396, 396, 397, 397, 397, 397, 397, 397, 398, 398, 398, 399, 398, 400, 401, 401,
-   401, 401, 402, 401, 401, 401, 401, 402, 403, 403, 403, 403, 403,  26, 404, 404,
-   404, 404, 404, 404, 405, 406, 407, 408, 407, 408, 409, 407, 410, 407, 410, 411,
-   412, 412, 412, 412, 412, 412, 413,  26, 414, 414, 414, 414, 414, 414, 415,  26,
-   414, 414, 416,  26, 414,  26,  26,  26, 417,   2,   2,   2,   2,   2, 418, 419,
-   420, 421, 422, 422, 422, 422, 423, 424, 425, 425, 426, 425, 427, 427, 427, 427,
-   428, 428, 428, 429, 430, 428,  26,  26, 431, 431, 432, 433, 434, 434, 434, 435,
-   436, 436, 436, 437, 438, 438, 438, 438, 439, 439, 439, 440, 439, 439, 441, 439,
-   439, 439, 439, 439, 442, 443, 444, 445, 446, 446, 447, 448, 446, 449, 446, 449,
-   450, 450, 450, 450, 451, 451, 451, 451, 452, 452, 452, 452, 453, 454, 453,  26,
-   455, 455, 455, 455, 455, 455, 456, 457, 458, 458, 459, 458, 460, 460, 461, 460,
-   462, 462, 463, 464,  26, 465,  26,  26, 466, 466, 466, 466, 466, 467,  26,  26,
-   468, 468, 468, 468, 468, 468, 469,  26, 468, 468, 469, 470, 471, 471, 471, 471,
-   471,  26, 471, 472, 473, 473, 473, 473, 474, 475, 473, 473, 474, 476,  26,  26,
-    31,  31,  31,  50, 477, 477, 477, 477, 477, 478, 479,  26, 480,  26,  26,  26,
-    26,  26,  26, 481, 482, 482, 482, 482, 482,  26, 483, 483, 483, 483, 483, 484,
-    26,  26, 485, 485, 485, 486,  26,  26,  26,  26, 487, 487, 487, 488,  26,  26,
-   489, 489, 490,  26, 491, 491, 491, 491, 491, 492, 493, 491, 491, 491, 492, 494,
-   495, 495, 495, 495, 496, 497, 498, 498, 498, 499, 498, 500, 501, 501, 501, 501,
-   501, 501, 502, 501, 501,  26, 503, 503, 503, 503, 504,  26, 505, 505, 505, 505,
-   506, 137, 507,  26, 508, 508, 509, 508, 508, 508, 508, 508, 510,  26,  26,  26,
-   511, 512, 513, 514, 513, 515, 516, 516, 516, 516, 516, 516, 516, 517, 516, 518,
-   519, 520, 521, 522, 522, 523, 524, 525, 520, 526, 527, 528, 529, 530, 530,  26,
-   531, 532, 531, 531, 531, 531, 533, 531, 534, 535, 533, 536, 537,  26,  26,  26,
-   538, 538, 538, 538, 538, 538, 538, 539, 540,  26,  26,  26, 541, 541, 541, 541,
-   541,  26, 541, 542, 543, 543, 543, 543, 543, 543, 544, 543, 543, 543, 543, 544,
-   545, 545, 545, 545, 546,  26, 545, 547, 198, 548,  26,  26, 549, 549, 549, 549,
-   549, 549, 549, 550, 549, 550, 164, 164, 551,  26,  26,  26, 552, 552, 552, 553,
-   552, 554, 552, 552, 555,  26,  26,  26, 556, 556, 556, 556, 556, 556, 556, 557,
-   558, 558, 558, 558, 558, 558, 559, 560, 561, 562, 563, 564, 564, 564, 565, 566,
-   561,  26, 564, 567, 568, 569, 568, 568, 568, 568, 568, 569, 570,  26,  26,  26,
-   571, 571, 571, 571, 571,  26, 572, 572, 572, 572, 572, 572, 573,  26, 178, 178,
-   574, 574, 574, 574, 574, 574, 574, 575,  53, 576,  26,  26, 577, 577, 577, 577,
-   578,  26, 577, 578, 579, 580, 579, 579, 579, 579, 581, 579, 582,  26, 579, 579,
-   579, 583, 584, 584, 584, 584, 585, 584, 584, 586, 587,  26, 588, 589, 590, 590,
-   590, 590, 588, 591, 590,  26, 590, 592, 593, 594, 595, 595, 595, 596, 597, 598,
-   595, 599,  26,  26, 600, 600, 600, 601, 602, 602, 603, 602, 602, 602, 602, 604,
-   602, 602, 602, 605,  26,  26, 606,  26, 108, 108, 108, 108, 108, 108, 607, 608,
-   609, 609, 609, 609, 609, 609, 609, 610, 609, 611, 612,  26, 613,  26,  26,  26,
-    26,  26, 614, 614, 614, 614, 614, 614, 614, 614, 615,  26, 616, 616, 616, 616,
-   616, 616, 617,  26, 616, 616, 616, 618, 619, 619, 619, 619, 620,  26,  26,  26,
-   621, 621, 621, 621, 621, 621, 621, 622, 305, 305, 305, 623, 624, 624, 624, 625,
-   624, 626, 627, 627, 627, 627, 627, 627, 627, 627, 627, 628, 627, 629, 630, 630,
-   630, 631, 631,  26, 632, 632, 632, 632, 633,  26, 632, 634, 634, 632, 632, 635,
-   632, 632,  26,  26, 636, 636, 636, 636, 636, 636, 636, 637, 638, 638, 638, 638,
-   638, 638, 638, 639, 640, 640, 640, 640, 640, 641, 640, 640, 640, 642, 640, 640,
-   643,  26, 345,  26, 644, 644, 644, 644, 644, 644, 644,  26, 645, 645, 645, 645,
-   645, 645, 646,  26,  26,  26,  26, 647, 644, 648,  26,  26,  26,  26, 649, 650,
-   651, 286, 286, 286, 652,  26, 653,  26,  26,  26, 654,  26, 655,  26, 656, 656,
-   656, 656, 656, 656, 656, 656, 656, 657, 658, 658, 658, 658, 658, 659, 658, 660,
-   658, 661, 658, 662, 359,  26,  26,  26,   0,   0,   0, 265,   0,   0, 359,  26,
-     9, 663,   9,   9, 221,  26,   0,   0,   0,   0, 276,  26, 257, 362,   0,   0,
-   664, 665,   0, 666, 667, 668,   0,   0,   0, 669,   0,   0, 246,  26,  26,  26,
-     0,   0, 257,  26,   0,   0,   0, 259,   0,   0, 254,   0,   0,   0,   0, 254,
-   670, 671,   0, 672, 673,   0,   0,   0, 269, 674, 254, 254,   0,   0,   0, 675,
-   676, 677, 678,   0, 276,   0,   0,   0,   0, 268,   0,   0, 679, 679, 679, 679,
-   679, 680,  26, 681, 682, 679,  26,  26,   2,   2,   2, 346, 683, 419,  26,  26,
-   684, 270, 270, 685, 686, 687,  18,  18,  18, 688,  26,  26,  26, 689,  26,  26,
-   690, 690, 690, 690, 690, 691, 690, 692, 690, 693,  26,  26,  26,  26, 694, 694,
-   694, 695,  26,  26, 696, 696, 696, 696, 696, 696, 696, 697,  26,  26, 698, 698,
-   698, 698, 698, 699,  26,  26, 700, 700, 700, 700, 700, 701, 172, 702, 170, 172,
-   703, 703, 703, 703, 704, 703, 705,  26, 706, 706, 706, 706, 706, 707, 706, 708,
-    26,  26, 362,   0,   0,   0, 376,  26, 709,  31,  31,  31, 710, 711, 712, 713,
-   714, 715, 710, 716, 710, 712, 712, 717,  31, 718,  31, 719, 720, 718,  31, 719,
-    26,  26, 721,  26,   0, 359,   0,   0,   0, 257, 362,   0, 362,   0, 362,   0,
-     0, 276,  26,  26, 722,   0,   0,   0, 723,  26,   0,   0,   0,   0,   0, 359,
-     0, 259, 265,  26, 276,  26,  26,  26,   0,   0,   0, 724,   0, 376,   0, 376,
-     0,   0, 257, 725,   0, 359, 259,  26,   0,  26,   0, 265,   0,  26,   0,   0,
-     0, 276,   0, 359, 265,  26,  26,  26,   0, 276,   0, 376,   0, 726,   0,   0,
-   257, 722,   0, 727,   0, 265,   0, 259, 277, 277, 277, 280, 345,  26, 277, 277,
-   728,  26, 277, 277, 277, 729, 277, 277, 277, 277,  26,  26, 730,  26,  26,  26,
-     9,   9,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,
-  1001,1002,1003,1008,   0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,
-  1086,1110,   0,   0,1124,1125,1126,1127,1131,1133,   0,1147,1154,1155,1156,1161,
-  1187,1188,1189,1193,   0,1219,1226,1227,1228,1229,1233,   0,   0,1267,1268,1269,
-  1273,1298,   0,1303, 943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145,
-   961,1146, 964,1149,   0,   0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163,
-   988,1173, 990,1175, 991,1176, 993,1178, 994,1179,   0,   0,1004,1190,1005,1191,
-  1006,1192,1014,1199,1007,   0,   0,   0,1016,1201,1020,1206,   0,1022,1208,1025,
-  1211,1023,1209,   0,   0,   0,   0,1032,1218,1037,1223,1035,1221,   0,   0,   0,
-  1044,1230,1045,1231,1049,1235,   0,   0,1058,1244,1064,1250,1060,1246,1066,1252,
-  1067,1253,1072,1258,1069,1255,1077,1264,1074,1261,   0,   0,1083,1270,1084,1271,
-  1085,1272,1088,1275,1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,
-  1309,1121,1310,   0,1053,1239,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1093,1280,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0, 949,1134,1010,1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,
-  1366,   0,1320,1347,1418,1419,1323,1350,   0,   0, 992,1177,1018,1204,1055,1241,
-  1416,1417,1415,1424,1202,   0,   0,   0, 987,1172,   0,   0,1031,1217,1321,1348,
-  1322,1349,1338,1365, 950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,
-  1051,1237,1052,1238,1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263,
-     0,   0, 997,1182,   0,   0,   0,   0,   0,   0, 945,1130, 982,1167,1337,1364,
-  1335,1362,1046,1232,1422,1423,1113,1301,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   8,   9,   0,  10,1425,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,1314,1427,   5,1434,1438,1443,   0,
-  1450,   0,1455,1461,1514,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1446,1458,
-  1468,1476,1480,1486,1517,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1489,1503,
-  1494,1500,1508,   0,   0,   0,   0,1520,1521,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1526,1528,   0,1525,   0,   0,   0,1522,   0,   0,   0,   0,
-  1536,1532,1539,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1534,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1556,   0,   0,
-     0,   0,   0,   0,1548,1550,   0,1547,   0,   0,   0,1567,   0,   0,   0,   0,
-  1558,1554,1561,   0,   0,   0,   0,   0,   0,   0,1568,1569,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1529,1551,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1523,1545,1524,1546,   0,   0,1527,1549,   0,   0,1570,1571,
-  1530,1552,1531,1553,   0,   0,1533,1555,1535,1557,1537,1559,   0,   0,1572,1573,
-  1544,1566,1538,1560,1540,1562,1541,1563,1542,1564,   0,   0,1543,1565,   0,   0,
-     0,   0,   0,   0,   0,   0,1606,1607,1609,1608,1610,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1613,   0,1611,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1612,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1620,   0,   0,
-     0,   0,   0,   0,   0,1623,   0,   0,1624,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1614,1615,1616,1617,
-  1618,1619,1621,1622,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1628,
-  1629,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1625,1626,   0,1627,   0,   0,   0,1634,   0,   0,1635,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1630,1631,1632,
-     0,   0,1633,   0,   0,   0,   0,   0,   0,   0,   0,   0,1639,   0,   0,1638,
-  1640,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1636,1637,   0,   0,   0,   0,   0,   0,1641,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1642,1644,
-  1643,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1645,   0,   0,   0,
-     0,   0,   0,   0,1646,   0,   0,   0,   0,   0,   0,1648,1649,   0,1647,1650,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1651,1653,
-  1652,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1654,   0,
-  1655,1657,1656,   0,   0,   0,   0,1659,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1660,   0,   0,   0,   0,1661,   0,   0,   0,   0,1662,   0,   0,   0,   0,
-  1663,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1658,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1664,   0,1665,1673,   0,1674,   0,   0,   0,
-     0,   0,   0,   0,   0,1666,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1668,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1669,   0,   0,   0,   0,1670,   0,   0,   0,   0,1671,   0,   0,   0,   0,
-  1672,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1667,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1675,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1676,   0,1677,   0,1678,   0,
-  1679,   0,1680,   0,   0,   0,1681,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1682,
-     0,1683,   0,   0,1684,1685,   0,1686,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148,
-   965,1150, 968,1153, 966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,
-  1420,1421, 986,1171, 989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,
-  1015,1200,1329,1356,1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,
-  1026,1212,1028,1214,1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,
-  1334,1361,1336,1363,1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,
-  1689,1690,1065,1251,1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,
-  1075,1262,1079,1266,1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,
-  1099,1286,1100,1287,1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,
-  1108,1296,1114,1302,1119,1308,1122,1311,1123,1312,1186,1260,1293,1305,   0,1394,
-     0,   0,   0,   0, 952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,
-  1693,1695,1371,1375,1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162,
-   972,1157,1326,1353,1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,
-  1054,1240,1048,1234,1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,
-  1395,1400,1398,1403,1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,
-  1408,1413,1407,1412,1409,1414,1109,1297,1117,1306,1116,1304,1112,1300,   0,   0,
-     0,   0,   0,   0,1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,
-  1716,1720,1717,1721,1477,1478,1729,1731,1730,1732,   0,   0,1435,1436,1733,1735,
-  1734,1736,   0,   0,1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,
-  1752,1756,1753,1757,1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,
-  1772,1775,1773,1776,1495,1496,1777,1779,1778,1780,   0,   0,1451,1452,1781,1783,
-  1782,1784,   0,   0,1504,1505,1785,1788,1786,1789,1787,1790,   0,1459,   0,1791,
-     0,1792,   0,1793,1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,
-  1809,1813,1810,1814,1467,  21,1475,  22,1479,  23,1485,  24,1493,  27,1499,  28,
-  1507,  29,   0,   0,1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,
-  1725,1726,1727,1728,1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,
-  1761,1762,1763,1764,1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,
-  1818,1819,1820,1821,1470,1469,1822,1474,1465,   0,1473,1825,1429,1428,1426,  12,
-  1432,   0,  26,   0,   0,1315,1823,1484,1466,   0,1483,1829,1433,  13,1437,  14,
-  1441,1826,1827,1828,1488,1487,1513,  19,   0,   0,1492,1515,1445,1444,1442,  15,
-     0,1831,1832,1833,1502,1501,1516,  25,1497,1498,1506,1518,1457,1456,1454,  17,
-  1453,1313,  11,   3,   0,   0,1824,1512,1519,   0,1511,1830,1449,  16,1460,  18,
-  1464,   4,   0,   0,  30,  31,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  20,   0,   0,   0,   2,   6,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1834,1835,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1836,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1837,1839,1838,   0,   0,   0,   0,1840,   0,   0,   0,   0,1841,   0,   0,
-  1842,   0,   0,   0,   0,   0,   0,   0,1843,   0,1844,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1845,   0,   0,1846,   0,   0,1847,   0,1848,   0,   0,
-     0,   0,   0,   0, 937,   0,1850,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1849, 936, 938,1851,1852,   0,   0,1853,1854,   0,   0,1855,1856,   0,   0,
-     0,   0,   0,   0,1857,1858,   0,   0,1861,1862,   0,   0,1863,1864,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1867,1868,1869,1870,1859,1860,1865,1866,   0,   0,   0,   0,   0,   0,1871,1872,
-  1873,1874,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  32,  33,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1875,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1877,   0,1878,   0,1879,   0,1880,   0,1881,   0,1882,   0,1883,   0,1884,   0,
-  1885,   0,1886,   0,1887,   0,1888,   0,   0,1889,   0,1890,   0,1891,   0,   0,
-     0,   0,   0,   0,1892,1893,   0,1894,1895,   0,1896,1897,   0,1898,1899,   0,
-  1900,1901,   0,   0,   0,   0,   0,   0,1876,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1902,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1904,   0,1905,   0,1906,   0,1907,   0,1908,   0,1909,   0,1910,   0,1911,   0,
-  1912,   0,1913,   0,1914,   0,1915,   0,   0,1916,   0,1917,   0,1918,   0,   0,
-     0,   0,   0,   0,1919,1920,   0,1921,1922,   0,1923,1924,   0,1925,1926,   0,
-  1927,1928,   0,   0,   0,   0,   0,   0,1903,   0,   0,1929,1930,1931,1932,   0,
-     0,   0,1933,   0, 710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205,
-   241, 336, 524, 601, 663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108,
-   180, 416, 482, 662, 810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492,
-   740, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538,
-   553, 588, 642, 758, 811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267,
-   412, 445, 457, 585, 594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345,
-   411, 704, 105, 259, 313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183,
-   228, 529, 650, 697, 424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580,
-   624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384,
-   420, 730, 287, 330, 337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759,
-   154, 163, 198, 473, 683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280,
-   314, 499, 506, 603, 608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126,
-   260, 265, 373, 411, 479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451,
-   502, 516, 537, 583, 791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496,
-   771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175,
-   452, 191, 480, 510, 659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471,
-   707, 111, 636, 156, 153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295,
-   128, 210,   0,   0, 227,   0, 379,   0,   0, 150, 493, 525, 544, 551, 552, 556,
-   783, 576, 604,   0, 661,   0, 703,   0,   0, 735, 743,   0,   0,   0, 793, 794,
-   795, 808, 741, 773, 118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268,
-   270, 317, 327, 329, 335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539,
-   545, 547, 546, 548, 549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607,
-   620, 625, 625, 651, 690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315,
-   869, 623,   0,   0, 102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212,
-   227, 231, 240, 243, 250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335,
-   341, 357, 360, 362, 370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465,
-   477, 535, 485, 490, 493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541,
-   565, 569, 574, 586, 591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699,
-   705, 704, 702, 706, 709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787,
-   790, 802, 825, 848, 847, 857,  55,  65,  66, 883, 892, 916, 822, 824,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,1586,   0,1605,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1602,1603,
-  1934,1935,1574,1575,1576,1577,1579,1580,1581,1583,1584,   0,1585,1587,1588,1589,
-  1591,   0,1592,   0,1593,1594,   0,1595,1596,   0,1598,1599,1600,1601,1604,1582,
-  1578,1590,1597,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1937,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,
-  1939,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1940,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1941,1942,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1943,
-  1944,   0,   0,   0,   0,   0,   0,1945,   0,1946,   0,   0,   0,   0,   0,   0,
-     0,   0,1947,   0,   0,1948,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1950,   0,1949,1951,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1953,
-  1952,   0,1954,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1955,1956,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1957,   0,   0,   0,
-     0,   0,   0,   0,   0,1958,1961,1959,1965,1960,1962,1964,1963,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1967,1966,1968,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1969,1970,1971,1972,1973,1974,1975,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1976,
-  1977,1978,1980,1979,1981,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125,
-    34, 830, 130, 131, 132, 137, 827,  35, 133, 139, 829, 142, 143, 112, 144, 145,
-   924, 151, 152,  37, 157, 158, 159, 160,  38, 165, 166, 169, 171, 172, 173, 174,
-   176, 177, 178, 179, 181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189,
-   196, 192, 194, 195, 197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218,
-   213, 219, 214, 216, 153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236,
-   237, 238, 239, 244, 836, 837, 247, 248, 249, 246, 251,  39,  40, 253, 255, 255,
-   838, 257, 258, 259, 261, 839, 262, 263, 301, 264,  41, 266, 270, 272, 271, 841,
-   274, 842, 277, 276, 278, 281, 282,  42, 283, 284, 285, 286,  43, 843,  44, 289,
-   290, 291, 293, 934, 298, 845, 845, 621, 300, 300,  45, 852, 894, 302, 304,  46,
-   306, 309, 310, 312, 316,  48,  47, 317, 846, 318, 323, 324, 325, 324, 328, 329,
-   333, 331, 332, 334, 335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352,
-   354, 359, 850, 361, 358, 356,  49, 363, 365, 367, 364,  50, 369, 371, 851, 376,
-   386, 378,  53, 381,  52,  51, 140, 141, 387, 382, 614,  78, 388, 389, 390, 394,
-   392, 856,  54, 399, 396, 402, 404, 858, 405, 401, 407,  55, 408, 409, 410, 413,
-   859, 415,  56, 417, 860, 418,  57, 419, 422, 424, 425, 861, 840, 862, 426, 863,
-   429, 431, 427, 433, 437, 441, 438, 439, 442, 443, 864, 436, 449, 450,  58, 454,
-   453, 865, 447, 460, 866, 867, 461, 466, 465, 464,  59, 467, 470, 469, 472, 828,
-   475, 868, 478, 870, 483, 485, 486, 871, 488, 489, 872, 873, 495, 497,  60, 498,
-    61,  61, 504, 505, 507, 508, 511,  62, 513, 874, 515, 875, 518, 844, 520, 876,
-   877, 878,  63,  64, 528, 880, 879, 881, 882, 530, 531, 531, 533,  66, 534,  67,
-    68, 884, 536, 538, 541,  69, 885, 549, 886, 887, 556, 559,  70, 561, 562, 563,
-   888, 889, 889, 567,  71, 890, 570, 571,  72, 891, 577,  73, 581, 579, 582, 893,
-   587,  74, 590, 592, 596,  75, 895, 896,  76, 897, 600, 898, 602, 605, 607, 899,
-   900, 609, 901, 611, 853,  77, 615, 616,  79, 617, 252, 902, 903, 854, 855, 621,
-   622, 731,  80, 627, 626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640,
-   635, 641, 646, 651, 638, 643, 644, 645, 905, 907, 906,  81, 653, 654, 656, 911,
-   657, 908,  82,  83, 909, 910,  84, 664, 665, 666, 667, 669, 668, 671, 670, 674,
-   672, 673, 675,  85, 677, 678,  86, 681, 682, 912, 685, 686,  87, 689,  36, 913,
-   914,  88,  89, 696, 702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720,
-   723, 832, 725, 728, 918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760,
-   761, 921, 762,  90, 764, 922,  91, 775, 279, 780, 923, 925,  92,  93, 785, 926,
-    94, 927, 787, 787, 789, 928, 792,  95, 796, 797, 798, 800,  96, 929, 802, 804,
-   806,  97,  98, 807, 930,  99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820,
-   821, 935,   0,   0,
-};
-static const int16_t
-_hb_ucd_i16[92] =
-{
-      0,    0,    1,   -1,    2,    0,   -2,    0,    0,    2,    0,   -2,    0,   16,    0,  -16,
-      0,    1,   -1,    0,    3,    3,    3,   -3,   -3,   -3,    0, 2016,    0, 2527, 1923, 1914,
-   1918,    0, 2250,    0,    0,  138,    0,    7,   -7,    0,   -1,    1, 1824,    0, 2104,    0,
-   2108, 2106,    0, 2106, 1316,    0,   -1, -138,    8,    8,    8,    0,    7,    7,   -8,   -8,
-     -8,   -7,-1316,    1,   -1,    3,   -3,    1,    0,-1914,-1918,    0,    0,-1923,-1824,    0,
-      0,-2016,-2104,    0,    0,-2106,-2108,-2106,-2250,    0,-2527,    0,
-};
-
-static inline uint_fast8_t
-_hb_ucd_gc (unsigned u)
-{
-  return u<1114110u?_hb_ucd_u8[6472+(((_hb_ucd_u8[816+(((_hb_ucd_u16[((_hb_ucd_u8[272+(((_hb_ucd_u8[u>>1>>3>>4>>4])<<4)+((u>>1>>3>>4)&15u))])<<4)+((u>>1>>3)&15u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
-}
-static inline uint_fast8_t
-_hb_ucd_ccc (unsigned u)
-{
-  return u<125259u?_hb_ucd_u8[8504+(((_hb_ucd_u8[7936+(((_hb_ucd_u8[7460+(((_hb_ucd_u8[7100+(((_hb_ucd_u8[6854+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
-}
-static inline unsigned
-_hb_ucd_b4 (const uint8_t* a, unsigned i)
-{
-  return (a[i>>1]>>((i&1u)<<2))&15u;
-}
-static inline int_fast16_t
-_hb_ucd_bmg (unsigned u)
-{
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9396+(((_hb_ucd_u8[9164+(((_hb_ucd_u8[9068+(((_hb_ucd_b4(9004+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
-}
-static inline uint_fast8_t
-_hb_ucd_sc (unsigned u)
-{
-  return u<918000u?_hb_ucd_u8[10398+(((_hb_ucd_u16[3952+(((_hb_ucd_u16[2624+(((_hb_ucd_u8[9870+(((_hb_ucd_u8[9644+(u>>3>>2>>3>>4)])<<4)+((u>>3>>2>>3)&15u))])<<3)+((u>>3>>2)&7u))])<<2)+((u>>3)&3u))])<<3)+((u)&7u))]:2;
-}
-static inline uint_fast16_t
-_hb_ucd_dm (unsigned u)
-{
-  return u<195102u?_hb_ucd_u16[6244+(((_hb_ucd_u8[16628+(((_hb_ucd_u8[16246+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
-}
-
-
-#else
-
-static const uint8_t
-_hb_ucd_u8[13730] =
-{
-    0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  9, 10,  7,  7,  7,  7,  7, 11, 12, 12, 12, 13,
-   14, 15, 16, 17, 18, 19, 20,  7, 21, 22, 22, 22, 23, 24,  7,  7,
-    7, 25, 22, 22, 22, 26, 27, 28, 22, 29, 30, 31, 32, 33, 34, 35,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 21, 22, 36,
-    7,  7,  7,  7, 37, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   38, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 34, 34, 34, 35, 36, 37, 34, 34, 34, 38, 39, 40, 41,
-   42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
-   58, 59, 60, 61, 62, 62, 63, 64, 65, 66, 67, 68, 69, 67, 70, 71,
-   67, 67, 62, 72, 62, 62, 73, 67, 74, 75, 76, 77, 78, 67, 67, 67,
-   79, 80, 34, 81, 82, 83, 67, 67, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 84, 34, 34, 34, 34,
-   85, 34, 34, 34, 34, 34, 34, 34, 34, 86, 34, 34, 87, 88, 89, 90,
-   91, 92, 93, 94, 95, 96, 97, 98, 34, 34, 34, 34, 34, 34, 34, 34,
-   99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
-  100,100, 34, 34, 34, 34,101,102, 34, 34,103,104,105,106,107,108,
-   34, 34,109,110,111,112,113,114,115,116,117,118, 34, 34, 34,119,
-  120,121,122,123,124,125,126,127, 34,128,129,130,131,132,133,134,
-  135,136,137,138,139,140,141,142,143,144,111,145,146,147,148,111,
-  149,150,151,152,153,154,155,156,157,158,159,160,111,161,162,163,
-   34, 34, 34, 34, 34, 34, 34, 34,164, 34, 34,111,111,111,111,111,
-  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,165,
-   34, 34, 34, 34, 34, 34, 34, 34,166, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,
-  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-  111,111,167,111,111,111,111,111,111,111,111,111,111,111,111,111,
-   34, 34, 34, 34,168,169,170, 34,111,111,171,111,172,173,174,175,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,111,
-  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,119,
-   34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,
-  111,111,111,111,111,111,111,111, 34,176,111,111,111,111,111,111,
-  111,111,111,111,111,111,111,111, 67,177, 67, 67, 67, 67,178, 67,
-   67, 67,179,180,181,131, 65,111,182,183,184,185,186,187,188,189,
-   67, 67, 67, 67,190,191,111,111,111,111,111,111,111,111,192,111,
-  193,194,195,111,111,196,111,111,111,197,111,198,111,111,111, 34,
-   34,199,200,111,111,111,111,111,131,201,202,111, 34,203,111,111,
-   67, 67,204, 67, 67,111, 67,205, 67, 67, 67, 67, 67, 67, 67, 67,
-   67, 67, 67, 67, 67, 67, 67,177,111,111,111,111,111,111,111,111,
-   34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,111,
-   34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,
-  206,111,194,194,111,111,111,111,111,111,111,111,111,111,111,111,
-    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
-    7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 17, 18, 19,  1, 20, 20, 21, 22, 23, 24, 25,
-   26, 27, 15,  2, 28, 29, 27, 30, 11, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 31, 11, 11, 11, 32, 16, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 33, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 34, 34, 34, 34, 34, 34, 34, 34, 16, 32, 32, 32,
-   32, 32, 32, 32, 11, 34, 34, 16, 34, 32, 32, 11, 34, 11, 16, 11,
-   11, 34, 32, 11, 32, 16, 11, 34, 32, 32, 32, 11, 34, 16, 32, 11,
-   34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
-   34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
-   32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
-   16, 16, 39, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 40,
-   40, 41, 41, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41,
-   40, 40, 42, 41, 41, 41, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41,
-   43, 43, 43, 43, 43, 43, 43, 43, 32, 32, 42, 32, 16, 44, 16, 10,
-   41, 41, 41, 45, 11, 11, 11, 11, 34, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
-   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 46, 34, 32, 34, 11,
-   32, 47, 43, 43, 48, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
-   11, 11, 11, 11, 49,  2,  2,  2, 16, 16, 16, 16, 50, 51, 52, 53,
-   54, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 55,
-   56, 57, 43, 56, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36, 36, 36,
-   36, 58,  2,  2,  2,  2,  2,  2, 59, 59, 59,  8,  9, 60,  2, 61,
-   43, 43, 43, 43, 43, 57, 62,  2, 63, 36, 36, 36, 36, 64, 43, 43,
-    7,  7,  7,  7,  7,  2,  2, 36, 65, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 66, 43, 43, 43, 67, 47, 43, 43, 68, 69, 70, 43, 43, 36,
-    7,  7,  7,  7,  7, 36, 71, 72,  2,  2,  2,  2,  2,  2,  2, 73,
-   64, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 65, 36,
-   36, 36, 36, 43, 43, 43, 43, 43,  7,  7,  7,  7,  7, 36, 36, 36,
-   36, 36, 36, 36, 36, 64, 43, 43, 43, 43, 40, 21,  2, 40, 69, 20,
-   36, 36, 36, 43, 43, 69, 43, 43, 43, 43, 69, 43, 69, 43, 43, 43,
-    2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 36, 36, 64, 43, 43,  2,
-   36, 36, 36, 36, 74, 36, 36, 36, 59, 59, 59, 75, 43, 43, 43, 43,
-   36, 36, 36, 36, 76, 43, 43, 43, 43, 75, 43, 43, 43, 43, 43, 43,
-   43, 77, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 77, 65, 78,
-   79, 43, 43, 43, 77, 78, 79, 78, 64, 43, 43, 43, 36, 36, 36, 36,
-   36, 43,  2,  7,  7,  7,  7,  7, 80, 36, 36, 36, 36, 36, 36, 36,
-   64, 78, 81, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 65, 78,
-   79, 43, 43, 77, 78, 78, 79, 36, 36, 36, 36, 82, 78, 78, 36, 36,
-   36, 43, 43,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 53, 58, 43,
-   43, 77, 81, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 78,
-   79, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 65, 36, 36, 36,
-   36, 36, 36,  7,  7,  7,  7,  7, 43, 36, 64,  2,  2,  2,  2,  2,
-   79, 43, 43, 43, 77, 78, 79, 43, 60, 20, 20, 20, 83, 43, 43, 43,
-   43, 78, 81, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 65, 79,
-   79, 43, 43, 77, 78, 78, 79, 43, 43, 43, 43, 77, 78, 78, 36, 36,
-   72, 27, 27, 27, 27, 27, 27, 27, 43, 65, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36, 78, 77, 78, 78, 78, 78, 78, 79, 43,
-   36, 36, 36, 82, 78, 78, 78, 78, 78, 78, 78,  7,  7,  7,  7,  7,
-   27, 84, 61, 61, 53, 61, 61, 61, 77, 78, 65, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 65, 43, 77, 78, 78, 43, 43, 43, 43, 43,
-   43, 43, 43, 43, 36, 36, 36, 36,  7,  7,  7, 85, 27, 27, 27, 84,
-   64, 78, 66, 36, 36, 36, 36, 36, 78, 78, 78, 77, 78, 78, 43, 43,
-   43, 43, 77, 78, 78, 78, 81, 36, 86, 82, 78, 78, 78, 78, 78, 78,
-   43, 78, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 65, 78,
-   79, 43, 43, 78, 78, 78, 79, 71, 61, 61, 36, 82, 27, 27, 27, 87,
-   27, 27, 27, 27, 84, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 77,
-   78, 43, 43, 43, 78, 78, 78, 78,  7, 78,  2,  2,  2,  2,  2,  2,
-   64, 36, 43, 43, 43, 43, 43, 88, 36, 36, 36, 69, 43, 43, 43, 57,
-    7,  7,  7,  7,  7,  2,  2,  2, 64, 36, 43, 43, 43, 43, 65, 36,
-   36, 36, 36, 40, 43, 43, 43, 43,  7,  7,  7,  7,  7,  7, 36, 36,
-   71, 61,  2,  2,  2,  2,  2,  2,  2, 89, 89, 61, 43, 61, 61, 61,
-    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 47, 47, 47,  4,  4, 78,
-   64, 43, 43, 43, 43, 43, 43, 77, 43, 43, 57, 43, 36, 36, 64, 43,
-   43, 43, 43, 43, 43, 43, 43, 61, 61, 61, 61, 70, 61, 61, 61, 61,
-    2,  2, 89, 61, 21,  2,  2,  2, 36, 36, 36, 36, 36, 82, 79, 43,
-   77, 43, 43, 43, 79, 77, 79, 65, 36, 36, 36, 78, 43, 36, 36, 43,
-   65, 78, 81, 82, 78, 78, 78, 36, 64, 43, 65, 36, 36, 36, 36, 36,
-   36, 77, 79, 77, 78, 78, 79, 82,  7,  7,  7,  7,  7, 78, 79, 61,
-   16, 16, 16, 16, 16, 50, 44, 16, 36, 36, 36, 36, 36, 36, 64, 43,
-    2,  2,  2,  2, 90, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-   61, 61, 61, 61, 61, 61, 61, 61, 11, 11, 11, 11, 16, 16, 16, 16,
-   91, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 71, 66,
-   92, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 93, 94, 94,
-   36, 36, 36, 36, 36, 58,  2, 95, 96, 36, 36, 36, 36, 36, 36, 36,
-   36, 43, 77, 78, 78, 78, 78, 81, 36, 43, 97,  2,  2,  2,  2,  2,
-   36, 43, 43, 43, 43, 43, 43, 43, 36, 36, 43, 79, 43, 43, 43, 78,
-   78, 78, 78, 77, 79, 43, 43, 43, 43, 43,  2, 80,  2, 60, 64, 43,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2, 98,  2, 56, 43, 75,
-   36, 76, 36, 36, 36, 36, 36, 36, 36, 36, 64, 65, 36, 36, 36, 36,
-   36, 36, 36, 36, 64, 36, 36, 36, 43, 77, 78, 79, 77, 78, 78, 78,
-   78, 77, 78, 78, 79, 43, 43, 43, 61, 61,  2,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7, 27, 27, 61, 36, 36, 36, 64, 77, 79, 43,  2,
-   36, 36, 82, 77, 43, 43, 43, 43, 77, 77, 79, 43, 43, 43, 77, 78,
-   78, 79, 43, 43, 43, 43, 43, 43,  2,  2,  2, 80,  2,  2,  2,  2,
-   43, 43, 43, 43, 43, 43, 43, 99, 43, 43, 81, 36, 36, 36, 36, 36,
-   36, 36, 77, 43, 43, 77, 77, 78, 78, 77, 81, 36, 36, 36, 36,  2,
-   89, 61, 61, 61, 61, 47, 43, 43, 43, 43, 61, 61, 61, 61, 21,  2,
-   43, 81, 36, 36, 36, 36, 36, 36, 82, 43, 43, 78, 43, 79, 43, 36,
-   36, 36, 36, 77, 43, 78, 79, 79, 43, 78, 78, 78, 78, 78,  2,  2,
-   36, 36, 78, 78, 78, 78, 43, 43, 43, 43, 78, 43, 43, 57,  2,  2,
-    7,  7,  7,  7,  7,  7, 86, 36, 36, 36, 36, 36, 40, 40, 40,  2,
-   16, 16, 16, 16, 34, 16, 16, 16, 43, 57, 43, 43, 43, 43, 43, 43,
-   77, 43, 43, 43, 65, 36, 64, 36, 36, 36, 65, 82, 43, 36, 36, 36,
-   16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 44, 16, 16,
-   16, 16, 16, 16, 44, 16, 16, 16, 16, 16, 16, 16, 16,100, 40, 40,
-   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
-   16, 16, 16, 16, 34, 11, 11, 11, 16, 16, 16, 16,101,101,101,101,
-   16, 16, 16, 16, 11, 11,102,103, 41, 16, 16, 16, 11, 11,102, 41,
-   16, 16, 16, 16, 11, 11,104, 41,105,105,105,105,105,106, 59, 59,
-   51, 51, 51,  2,107,108,107,108,  2,  2,  2,  2,109, 59, 59,110,
-    2,  2,  2,  2,111,112,  2,113,114,  2,115,116,  2,  2,  2,  2,
-    2,  9,114,  2,  2,  2,  2,117, 59, 59, 59, 59, 59, 59, 59, 59,
-  118, 40, 27, 27, 27,  8,115,119, 27, 27, 27, 27, 27,  8,115, 94,
-   20, 20, 20, 20, 20, 20, 20, 20, 43, 43, 43, 43, 43, 43,120, 48,
-   99, 48, 99, 43, 43, 43, 43, 43, 61,121, 61,122, 61, 34, 11, 16,
-   11, 32,122, 61, 46, 11, 11, 61, 61, 61,121,121,121, 11, 11,123,
-   11, 11, 35, 36, 39, 61, 16, 11,  8,  8, 46, 16, 16, 26, 61,124,
-   95, 95, 95, 95, 95, 95, 95, 95, 95,125,126, 95,127, 61, 61, 61,
-    8,  8,128, 61, 61,  8, 61, 61,128, 26, 61,128, 61, 61, 61,128,
-   61, 61, 61, 61, 61, 61, 61,  8, 61,128,128, 61, 61, 61, 61, 61,
-   61, 61,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-   61, 61, 61, 61,  4,  4, 61, 61,  8, 61, 61, 61,129,130, 61, 61,
-   61, 61, 61, 61, 61, 61,128, 61, 61, 61, 61, 61, 61, 26,  8,  8,
-    8,  8, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,  8,  8,
-    8, 61, 61, 61, 61, 61, 61, 61, 27, 27, 27, 27, 27, 27, 61, 61,
-   61, 61, 61, 61, 61, 27, 27, 27, 61, 61, 61, 26, 61, 61, 61, 61,
-   26, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,  8,  8,  8,  8,
-   61, 61, 61, 61, 61, 61, 61, 26, 61, 61, 61, 61,  4,  4,  4,  4,
-    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 61, 61, 61, 61, 61, 61,
-    8,  8,115,131,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
-    8,115,132,132,132,132,132,132,132,132,132,132,131,  8,  8,  8,
-    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
-    8,  8,128, 26,  8,  8,128, 61, 32, 11, 32, 34, 34, 34, 34, 11,
-   32, 32, 34, 16, 16, 16, 40, 11, 32, 32,124, 61, 61,122, 34,133,
-   43, 32, 16, 16, 50,  2, 90,  2, 36, 36, 36, 36, 36, 36, 36, 76,
-    2,  2,  2,  2,  2,  2,  2, 56,  2,107,107,  2,111,112,107,  2,
-    2,  2,  2,  6,  2, 98,107,  2,107,  4,  4,  4,  4,  2,  2, 80,
-    2,  2,  2,  2,  2, 51,  2,  2, 98,134,  2,  2,  2,  2,  2,  2,
-   61,  2,135,132,132,132,136, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-    1,  2,137,138,  4,  4,  4,  4,  4, 61,  4,  4,  4,  4,139, 94,
-  140, 95, 95, 95, 95, 43, 43, 78,141, 40, 40, 61, 95,142, 58, 61,
-   72, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64,143,144, 63,
-   36, 36, 36, 36, 36, 58, 40, 63, 61, 27, 27, 61, 61, 61, 61, 61,
-   27, 27, 27, 27, 27, 61, 61, 61, 61, 61, 61, 61, 27, 27, 27, 27,
-  145, 27, 27, 27, 27, 27, 27, 27, 36, 36, 76, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36,146,  2, 32, 32, 32, 32, 32, 32, 32, 64,
-   48,147, 43, 43, 43, 43, 43, 80, 32, 32, 32, 32, 32, 32, 40, 43,
-   36, 36, 36, 95, 95, 95, 95, 95, 43,  2,  2,  2,  2,  2,  2,  2,
-   41, 41, 41,144, 40, 40, 40, 40, 41, 32, 32, 32, 32, 32, 32, 32,
-   16, 32, 32, 32, 32, 32, 32, 32, 44, 16, 16, 16, 34, 34, 34, 32,
-   32, 32, 32, 32, 42,148, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
-   32, 32, 11, 11, 34, 34, 32, 16, 32, 16, 16, 32, 32, 32, 11, 11,
-   11, 40,149, 35, 40, 35, 36, 36, 36, 65, 36, 65, 36, 64, 36, 36,
-   36, 82, 79, 77, 61, 61, 43, 43, 27, 27, 27, 61,150, 61, 61, 61,
-   36, 36,  2,  2,  2,  2,  2,  2, 78, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 78, 78, 78, 78, 78, 78, 78, 78, 43, 43, 43, 43, 43,  2,
-   43, 36, 36, 36,  2, 66, 66, 64, 36, 36, 36, 43, 43, 43, 43,  2,
-   36, 36, 36, 64, 43, 43, 43, 43, 43, 78, 78, 78, 78, 78, 78, 97,
-   36, 64, 78, 43, 43, 78, 43, 78, 97,  2,  2,  2,  2,  2,  2, 80,
-    7,  7,  7,  7,  7,  7,  7,  2, 36, 36, 64, 63, 36, 36, 36, 36,
-   36, 36, 36, 36, 64, 43, 43, 77, 79, 77, 79, 43, 43, 43, 43, 43,
-   36, 64, 36, 36, 36, 36, 77, 78,  7,  7,  7,  7,  7,  7,  2,  2,
-   63, 36, 36, 71, 61, 82, 77, 36, 65, 43, 65, 64, 65, 36, 36, 43,
-   36, 36, 36, 36, 36, 36, 76,  2, 36, 36, 36, 36, 36, 82, 43, 78,
-    2, 76,151, 43, 43, 43, 43, 43, 16, 16, 16, 16, 16,103, 40, 40,
-   16, 16, 16, 16,100, 41, 41, 41, 36, 82, 79, 78, 77, 97, 79, 43,
-  152,152,152,152,152,152,152,152,153,153,153,153,153,153,153,153,
-   16, 16, 16, 16, 16, 16, 35, 65, 36, 36, 36, 36,154, 36, 36, 36,
-   36, 41, 41, 41, 41, 41, 41, 41, 41, 74, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36,132, 36, 36, 36, 36, 36, 36, 36, 71,
-   36, 36, 36, 36, 36, 36,150, 61,  2,  2,  2,135,116,  2,  2,  2,
-    6,155,156,132,132,132,132,132,132,132,116,135,116,  2,113,157,
-    2,  2,  2,  2,139,132,132,116,  2,158,  8,  8, 60,  2,  2,  2,
-   36, 36, 36, 36, 36, 36, 36,159,  2,  2,  3,  2,  4,  5,  6,  2,
-   16, 16, 16, 16, 16, 17, 18,115,116,  4,  2, 36, 36, 36, 36, 36,
-   63, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 40,
-   20,160, 53, 20, 26,  8,128, 61, 61, 61, 61, 61,161, 59, 61, 61,
-    2,  2,  2, 90, 27, 27, 27, 27, 27, 27, 27, 84, 61, 61, 61, 61,
-   95, 95,127, 27, 84, 61, 61, 61, 61, 61, 61, 61, 61, 27, 61, 61,
-   61, 61, 61, 61, 61, 61, 47, 43,162,162,162,162,162,162,162,162,
-  163, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 87, 36,
-  138, 36, 36, 36, 36, 95, 95, 95, 36, 36, 36, 36, 36, 36, 36, 58,
-  164, 95, 95, 95, 95, 95, 95, 95, 11, 11, 11, 32, 16, 16, 16, 16,
-   36, 36, 36, 58, 27, 27, 27, 27, 36, 36, 36, 71,145, 27, 27, 27,
-   36, 36, 36,165, 27, 27, 27, 27, 36, 36, 36, 36, 36,165, 27, 27,
-   36, 36, 36, 27, 27, 27, 27, 30, 36, 36, 36, 36, 36, 36, 27, 36,
-   64, 43, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 43, 43, 43, 43,
-   36, 36, 36, 36, 36, 36,165, 30, 36, 36, 36, 36, 36, 36,165, 27,
-   36, 36, 36, 36, 72, 36, 36, 36, 36, 36, 64, 43, 43,163, 27, 27,
-   36, 36, 36, 36, 58,  2,  2,  2, 36, 36, 36, 36, 27, 27, 27, 27,
-   16, 16, 16, 16, 16, 27, 27, 27, 36, 36, 43, 43, 43, 43, 43, 43,
-    7,  7,  7,  7,  7, 36, 36, 63, 11, 11, 11, 11,166, 43, 43,141,
-   16, 16, 16, 16, 16, 16, 16,  8, 36, 36, 36, 36, 36, 64,167, 51,
-   36, 36, 36, 36, 36, 36, 43, 43, 27, 27, 27, 87, 36, 36, 36, 36,
-  163, 27, 30,  2,  2,  2,  2,  2, 36, 43, 43,  2,  2,  2,  2,  2,
-   36, 36,165, 27, 27, 27, 27, 27, 79, 81, 36, 36, 36, 36, 36, 36,
-   43, 43, 43, 57,  2,  2,  2,  2,  2, 27, 27, 27, 27, 27, 27, 27,
-   27, 27, 27,  7,  7,  7,  7,  7, 65, 64, 65, 36, 36, 36, 36, 64,
-   78, 79, 43, 77, 79, 57, 73,  2,  2, 43, 43, 43, 43, 43, 67, 59,
-   36, 36, 36, 64, 43, 43, 79, 43, 43, 43, 43,  7,  7,  7,  7,  7,
-    2,  2, 82, 81, 36, 36, 36, 36, 36, 64,  2, 36, 36, 36, 36, 36,
-   36, 82, 78, 43, 43, 43, 43, 77, 81, 36, 58,  2, 56, 43, 57, 79,
-    7,  7,  7,  7,  7, 58, 58,  2, 90, 27, 27, 27, 27, 27, 27, 27,
-   36, 36, 36, 36, 36, 36, 78, 79, 43, 78, 77, 43,  2,  2,  2, 65,
-   36, 36, 36, 36, 36, 36, 36, 64, 77, 78, 78, 78, 78, 78, 78, 78,
-   36, 36, 36, 82, 78, 78, 81, 36, 36, 78, 78, 43, 43, 43, 43, 43,
-   36, 36, 36, 36, 78, 79, 43, 43, 43, 78, 78, 78, 78, 78, 78, 77,
-   65, 65,  2,  2,  2,  2,  2,  2, 56, 43, 43, 43, 43, 43, 43, 43,
-   36, 36, 82, 78, 43, 43, 43, 43, 78, 43, 77, 65, 36, 58,  2,  2,
-    7,  7,  7,  7,  7,  2,  2, 65, 78, 79, 43, 43, 77, 77, 78, 79,
-   77, 43, 36, 66, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 82,
-   78, 43, 43, 43, 78, 78, 43, 79, 57,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2, 36, 36, 43, 43, 78, 79, 43, 43, 43, 77, 79, 79,
-   57,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 79, 78,
-   43, 43, 43, 79, 58,  2,  2,  2, 36, 36, 36, 36, 36, 36, 64, 79,
-   78, 43, 43, 79, 43, 43, 43, 43,  7,  7,  7,  7,  7, 27,  2, 89,
-   43, 43, 43, 43, 79, 57,  2,  2, 27, 27, 27, 27, 27, 27, 27, 87,
-   78, 78, 78, 78, 78, 79, 77, 65, 81, 79,  2,  2,  2,  2,  2,  2,
-   82, 78, 43, 43, 43, 43, 78, 78, 65, 66, 78, 78, 78, 78, 78, 78,
-   78, 78, 78, 78, 78, 78, 78, 78, 64, 43, 43, 43, 43, 65, 36, 36,
-   36, 64, 43, 43, 77, 64, 43, 57,  2,  2,  2, 56, 43, 43, 43, 43,
-   64, 43, 43, 77, 79, 43, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43,
-   43, 43, 43, 77, 43,  2, 66,  2, 58,  2,  2,  2,  2,  2,  2,  2,
-   43, 43, 43, 43, 43, 43, 43, 79,  2, 36, 36, 36, 36, 36, 36, 36,
-   43, 43, 43, 43, 77, 43, 43, 43, 77, 43, 79, 43, 43, 43, 43, 43,
-   43, 43, 43, 64, 43, 43, 43, 43, 36, 36, 36, 36, 36, 78, 78, 78,
-   43, 77, 79, 79, 36, 36, 36, 36, 36, 64, 77, 97,  2,  2,  2,  2,
-   43, 82, 36, 36, 36, 36, 36, 36, 36, 36, 78, 43, 43, 43, 43, 78,
-   77, 57,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  7, 43, 43, 43,
-   27, 27, 84, 61, 61, 61, 53, 20,150, 61, 61, 61, 61, 61, 61, 61,
-   61, 61, 61, 61, 61, 61, 61, 21, 65, 36, 36, 64, 43, 43, 43, 43,
-   36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 78, 79, 43,
-   43, 43, 57,  2,  2,  2,  2,  2, 43, 43, 43, 57,  2,  2, 61, 61,
-   40, 40, 89, 61, 61, 61, 61, 61,  7,  7,  7,  7,  7,168, 27, 27,
-   27, 87, 36, 36, 36, 36, 36, 36, 40, 63, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 76,146,  2, 27, 27, 27, 30,  2,  2,  2,  2,
-   82, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 79,
-   43, 68, 40, 40, 40, 40, 40, 40, 40, 80, 43, 43, 43, 43, 43, 43,
-   36, 36, 36, 36, 36, 36, 47, 57, 61, 61,169, 79, 43, 61,169, 78,
-   78,170, 59, 59, 59, 75, 43, 43, 43, 70, 47, 43, 43, 43, 61, 61,
-   61, 61, 61, 61, 61, 43, 43, 61, 61, 43, 70, 61, 61, 61, 61, 61,
-   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 16, 11, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
-   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
-   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
-   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
-   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 16,  7,
-   43, 43, 43, 70, 61, 47, 43, 43, 43, 43, 43, 43, 43, 43, 70, 61,
-   61, 61, 47, 61, 61, 61, 61, 61, 61, 61, 70, 21,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 56, 43, 43, 16, 16, 16, 16, 16, 39, 16, 16,
-   43, 43, 43, 68, 40, 40, 40, 40,  7,  7,  7,  7,  7,  7,  7, 71,
-    7,  7,  7,  7,  7,  7,  7,171, 36, 36, 36, 36, 36, 76, 43, 43,
-  172,  7,  7,  7,  7,  7,  7, 85, 16, 16, 43, 43, 43, 68, 40, 40,
-   27, 27, 27, 27, 27, 27,145, 27,173, 27, 27, 27, 27, 27, 27, 27,
-   27, 27, 27, 27, 27, 27, 27,145, 27, 27, 27, 27, 27, 27, 84, 61,
-   61, 61, 61, 61, 61, 25, 41, 41,  0,  0, 29, 21, 21, 21, 23, 21,
-   22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
-    9, 22, 21, 18, 24, 16, 24,  5,  5,  5,  5, 22, 25, 18, 25,  0,
-   23, 23, 26, 21, 24, 26,  7, 20, 25,  1, 26, 24, 26, 25, 15, 15,
-   24, 15,  7, 19, 15, 21,  9, 25,  9,  5,  5, 25,  5,  9,  5,  7,
-    7,  7,  9,  8,  8,  5,  7,  5,  6,  6, 24, 24,  6, 24, 12, 12,
-    6,  5,  9, 21, 25,  9, 26, 12, 11, 11,  9,  6,  5, 21, 17, 17,
-   17, 26, 26, 23, 23, 12, 17, 12, 21, 12, 12, 21,  7, 21,  1,  1,
-   21, 23, 26, 26,  1, 21,  6,  7,  7, 12, 12,  7, 21,  7, 12,  1,
-   12,  6,  6, 12, 12, 26,  7, 26, 26,  7, 21,  1, 24,  7,  1, 12,
-    7,  6, 12, 10, 10, 10, 10, 12, 21,  6, 10,  7,  7, 10, 23,  7,
-   15, 26, 13, 21, 13,  7, 15,  7, 12, 23, 21, 26, 21, 15, 17,  7,
-   29,  7,  7, 22, 18, 18, 14, 14, 14,  7, 10, 21, 17, 21, 11, 12,
-    5,  6,  8,  8,  8, 24,  5, 24,  9, 24, 29, 29, 29,  1, 20, 19,
-   22, 20, 27, 28,  1, 29, 21, 20, 19, 21, 21, 16, 16, 21, 25, 22,
-   18, 21, 21, 29, 15,  6, 18,  6, 12, 11,  9, 26, 26,  9, 26,  5,
-    5, 26, 14,  9,  5, 14, 14, 15, 25, 26, 26, 22, 18, 26, 18, 25,
-   18, 22,  5, 12, 22, 21, 21, 22, 18, 17, 26,  6,  7, 14, 17, 22,
-   26, 14, 17,  6, 14,  6, 12, 24, 24,  6, 26, 15,  6, 21, 11, 21,
-   24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,  7, 25, 17, 16,
-   16, 22, 16, 16, 25, 17,  7,  1, 25, 24, 26,  1,  2,  2, 12, 15,
-   21, 14,  7, 15,  9, 12, 12, 17, 13, 15, 26, 10, 10,  1, 13, 23,
-    7, 13, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10,
-   11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30,
-   31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,  0,  0,
-    0,  0,  0,  0, 41, 42, 43,  0, 44,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,  0,  0,
-    4,  5,  6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15, 16, 17,
-   16, 18, 16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19, 21, 19,
-    0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 34,  0,
-    0, 35,  0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41, 42, 43,
-   44, 45, 46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,  0,  0,
-    0,  0,  0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,  0,  0,
-    0,  0,  0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59, 60, 61,
-   62, 63,  0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0, 67,  0,
-    0,  0, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 69,  0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,  0,  0,
-    0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0, 76, 77,  0, 78,
-   79,  0,  0, 80, 81,  0, 82, 62,  0, 83, 84,  0,  0, 85, 86, 87,
-    0, 88,  0, 89,  0, 90,  0,  0, 51, 91, 51,  0, 92,  0, 93,  0,
-    0,  0, 81,  0,  0,  0, 94, 95,  0, 96, 97, 98, 99,  0,  0,  0,
-    0,  0, 51,  0,  0,  0,  0,100,101,  0,  0,  0,  0,  0,  0,102,
-    0,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,104,105,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,  0,  0,
-    0,  0,111,  0,112,  0,105,  0,  0,  0,  0,  0,113,114,  0,  0,
-    0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,  0,118,
-    0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,  8,  0,
-    0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0, 14, 15,
-    0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,  0,  0,
-   22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0, 28, 29,
-   30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35, 33,  0,
-    0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,  0,  0,
-    0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0, 43,
-    0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,  0,  0,
-    0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,  0, 53,
-    0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,  0,  0,
-   57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,  0, 61, 52,  0,
-   62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,  0, 67,  0, 68,
-   69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0, 77, 78,  0,  0,
-    0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,  0,  0,  0,  0,
-   77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0, 85,  0, 52,  0,
-    1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,  0, 88, 57,  0,
-    0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0, 33,  0,  0, 91,
-    0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0, 93,  0,  0,  0,
-    0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0, 98,  0,  0,  0,
-   99,  0,  0,  0,100,  0,  0,  0,  0,101,102, 93,  0,  0,103,  0,
-    0,  0, 84,  0,  0,104,  0,  0,  0,105,106,  0,  0,107,108,  0,
-    0,  0,  0,  0,  0,109,  0,  0,110,  0,  0,  0,  0,111, 33,  0,
-  112,113,114, 57,  0,  0,115, 35,  0,  0,116,  0,  0,  0,117,  0,
-    0,  0,  0,  0,  0,118,  0,  0,119,  0,  0,  0,  0,120, 88,  0,
-    0,  0,  0,  0, 57,  0,  0,  0,  0, 52,121,  0,  0,  0,  0,122,
-    0,  0,123,  0,  0,  0,  0,121,  0,  0,124,  0,  0,  0,  0,  0,
-   79,  0,  0,  0,  0,125,  0,  0,  0,126,  0,  0,  0,127,  0,128,
-    0,  0,  0,  0,129,130,131,  0,132,  0,133,  0,  0,  0,134,135,
-  136,  0, 77,  0,  0,  0,  0,  0, 35,  0,  0,  0,137,  0,  0,  0,
-  138,  0,  0,  0,139,  0,  0,140,  0,  0,141,  0,  0,  0,  0,  0,
-    0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,  7,  4,  4,  8,
-    9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,  1,  1, 19,  1,
-    0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26, 27, 28, 29, 30,
-    0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36, 37,  0,
-    0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,  0,  0, 43, 36,
-   44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,  0, 47,  0, 38,
-   48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19, 52,  1,  0,  0,
-   38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21, 35,  1,  0,  0,
-    0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,  0, 59,  0, 60,
-    0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0, 64,  0,  0,  0,
-   65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0, 68,  0,  0, 69,
-   70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,  0,  0,  0, 78,
-   79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,  0,  0,  0, 62,
-    0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0, 83,  0,  0, 19,
-   84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52, 15, 86, 36, 10,
-   21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,  0,  0,
-   88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0, 87,  9,
-   12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1, 21, 92, 93,  1,
-    1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,100,  4, 58,  0,
-    0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,  0,  0,
-  101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,  0, 38,  0, 63,
-    0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,  0,  0, 78,  0,
-    0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,  0,107,  1, 14,
-    4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,  0,108,  0,  0,
-  109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,  0,  0,
-   19, 58,  0,  0,  0, 51,  0,111, 14, 52,112, 41,  0,  0, 62,  0,
-    0, 61,  0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0, 62,  0,
-   89,  0,  0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,  0, 38,
-    1, 58,  1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,115,  0,
-    0,  0, 55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,  0,  0,
-    0, 79,  0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,
-    0,  0,  8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,  0,  0,
-    0,117,  0,118,119,120,121,  0,104,  4,122, 49, 23,  0,  0,  0,
-   38, 50, 38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1, 48,105,
-   87,  0,  0,  0,  0,  1,  0,  0,  0,123,  0,  0,  0,112,  4,122,
-    0,  0,  0,  1,124,  0,  0,  0,  0,  0,230,230,230,230,230,232,
-  220,220,220,220,232,216,220,220,220,220,220,202,202,220,220,220,
-  220,202,202,220,220,220,  1,  1,  1,  1,  1,220,220,220,220,230,
-  230,230,230,240,230,220,220,220,230,230,230,220,220,  0,230,230,
-  230,220,220,220,220,230,232,220,220,230,233,234,234,233,234,234,
-  233,230,  0,  0,  0,230,  0,220,230,230,230,230,220,230,230,230,
-  222,220,230,230,220,220,230,222,228,230, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,
-    0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33,
-   34,230,230,220,220,230,220,230,230,220, 35,  0,  0,  0,  0,  0,
-  230,230,230,  0,  0,230,230,  0,220,230,230,220,  0,  0,  0, 36,
-    0,  0,230,220,230,230,220,220,230,220,220,230,220,230,220,230,
-  230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,230,230,230,230,
-    0,  0,  0,220,220,220,230,220,220,220,230,230,  0,220, 27, 28,
-   29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,230,  0,
-    0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,  9,  0,
-    0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,107,107,118,118,
-    9,  0,122,122,122,122,220,220,  0,  0,  0,220,  0,220,  0,216,
-    0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,130,130,
-    0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,  0,  0,
-    0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,  0,228,
-    0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,  0,220,230,220,
-    0,220,230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,230,  0,
-    1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,230,230,
-  232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,  1,  1,
-    1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,232,222,
-  224,224,  0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,220,  0,
-    0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,  0,230,
-  220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,  0,  7,
-    9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,  0,216,
-  216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,220,220,
-  220,  0,232,232,220,230,230,230,  7,  0, 16, 17, 17, 33, 17, 49,
-   17, 17, 84, 97,135,145, 26, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17,177,  0,  1,  2,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  4,  3,
-    3,  3,  3,  3,  5,  3,  3,  3,  3,  3,  6,  7,  8,  3,  3,  3,
-    3,  3,  9, 10, 11, 12, 13,  3,  3,  3,  3,  3,  3,  3,  3, 14,
-    3, 15,  3,  3,  3,  3,  3,  3, 16, 17, 18, 19, 20, 21,  3,  3,
-    3, 22, 23, 24,  3,  3,  3,  3,  3,  3, 25,  3,  3,  3,  3,  3,
-    3,  3,  3, 26,  3,  3, 27, 28,  0,  1,  0,  0,  0,  0,  0,  1,
-    0,  2,  0,  0,  0,  3,  0,  0,  0,  3,  0,  0,  0,  0,  0,  4,
-    0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  8,  9,  0,  0,  0,  0,  0,  0,  9,  0,  9,  0,  0,  0,  0,
-    0,  0,  0, 10, 11, 12, 13,  0,  0, 14, 15, 16,  6,  0, 17, 18,
-   19, 19, 19, 20, 21, 22, 23, 24, 19, 25,  0, 26, 27, 19, 19, 28,
-   29, 30,  0, 31,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 19,
-   28,  0, 32, 33,  9, 34, 35, 19,  0,  0, 36, 37, 38, 39, 40, 19,
-    0, 41, 42, 43, 44, 31,  0,  1, 45, 42,  0,  0,  0,  0,  0, 32,
-   14, 14,  0,  0,  0,  0, 14,  0,  0, 46, 47, 47, 47, 47, 48, 49,
-   47, 47, 47, 47, 50, 51, 52, 53, 43, 21,  0,  0,  0,  0,  0,  0,
-    0, 54,  6, 55,  0, 14, 19,  1,  0,  0,  0,  0, 56, 57,  0,  0,
-    0,  0,  0, 19, 58, 31,  0,  0,  0,  0,  0,  0,  0, 59, 14,  0,
-    0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0, 60, 61,  0,
-    0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  2,  3,  0,  4,
-    5,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  1,  1,  0,  0,  8,
-    9,  0,  8,  9,  0,  0,  0,  0,  8,  9, 10, 11, 12,  0,  0,  0,
-   13,  0,  0,  0,  0, 14, 15, 16, 17,  0,  0,  0,  1,  0,  0, 18,
-   19,  0,  0,  0, 20,  0,  0,  0,  1,  1,  1,  1,  0,  1,  1,  1,
-    1,  1,  1,  1,  0,  8, 21,  9,  0,  0, 22,  0,  0,  0,  0,  1,
-    0, 23, 24, 25,  0,  0, 26,  0,  0,  0,  8, 21, 27,  0,  1,  0,
-    0,  1,  1,  1,  1,  0,  1, 28, 29, 30,  0, 31, 32, 20,  1,  1,
-    0,  0,  0,  8, 21,  9,  1,  4,  5,  0,  0,  0, 33,  9,  0,  1,
-    1,  1,  0,  8, 21, 21, 21, 21, 34,  1, 35, 21, 21, 21,  9, 36,
-    0,  0, 37, 38,  1,  0, 39,  0,  0,  0,  1,  0,  1,  0,  0,  0,
-    0,  8, 21,  9,  1,  0,  0,  0, 40,  0,  8, 21, 21, 21, 21, 21,
-   21, 21, 21,  9,  0,  1,  1,  1,  1,  8, 21, 21, 21,  9,  0,  0,
-    0, 41,  0, 42, 43,  0,  0,  0,  1, 44,  0,  0,  0, 45,  8,  9,
-    1,  0,  0,  0,  8, 21, 21, 21,  9,  0,  1,  0,  1,  1,  8, 21,
-   21,  9,  0,  4,  5,  8,  9,  1,  0,  0,  0,  1,  2,  3,  3,  4,
-    5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  3,  3,  3,  3,  3,  3,
-    3, 15,  3, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18,  0,  0,  1,  2,  3,
-    4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17,
-   18, 17, 19, 20, 21, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 24, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 25, 25, 26, 27,
-   28, 29, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-   30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 52, 53, 31,
-   31, 31, 31, 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 57,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 58, 31, 31, 31,
-   59, 60, 61, 62, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-   63, 64, 65, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 66, 67, 68, 31, 31, 31, 31, 69, 31, 31, 31, 31, 31,
-   31, 31, 17, 70, 71, 72, 17, 17, 73, 74, 31, 75, 76, 77, 78, 79,
-   80, 31, 81, 82, 17, 83, 17, 17, 17, 17, 31, 31, 23, 23, 23, 23,
-   23, 23, 23, 84, 31, 31, 31, 31, 23, 84, 31, 31, 23, 23, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 85,  0,  0,  1,
-    0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,  1,  2,  3,
-    4,  4,  4,  4,  4,  4,  5,  6,  7,  8,  9, 10, 11, 11, 12, 11,
-   13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 19, 27,
-   28, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36,
-   37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 42, 43, 44, 44, 45, 46,
-   47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 49, 50, 51, 51, 51, 51,
-   51, 51, 51, 51, 51, 51, 52, 53, 54, 55, 56, 56, 57, 58, 59, 51,
-   60, 61, 62, 63, 64, 65, 66,  7, 67, 67, 68, 69, 70, 71, 72, 73,
-   74, 75, 76,  7,  4,  4,  4,  4, 77, 77, 77, 77, 78, 79, 80, 81,
-   82, 83, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85, 85, 85, 85,
-    0,  0,  0,  0, 86, 87, 88, 88, 89, 90, 48, 91,  0,  0, 92, 92,
-   92, 92, 92, 93, 94, 95, 96, 97, 98, 47, 99,100,101,102,  0,103,
-  104,105,  0,  0, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-   92, 92, 92,  0,106,106,106,106,106,106,106,106,106,106,106,107,
-  108,108,108,108,108, 11,109,110,111,  4,112,  4,113,114,115,116,
-  117,118,119,120,121,122,123,124,125,126, 50,127, 47, 47, 47, 47,
-   47, 47, 47, 47,128,128,128,128,128,128,128,128,128,128,128,128,
-   92, 92, 92, 92, 92, 92, 92, 92,129,130, 19, 19, 19, 19, 19, 19,
-  131, 19, 19, 19,132,133, 19,134,135,136,137,101,138,138,138,138,
-    0, 77,139,140,128,128,141,142,143,144,145,146,147,148,149,150,
-  151,152,153,154,155,155,155,155,155,155,  4,  4,156,157,158,159,
-  160,161,162,163,164,165,166,167,168,169,170,170,171,171,172,172,
-  173,174,174,174, 19, 19,175,176,177,178,179,180,181,181,182,183,
-  184,185,186,187,188,188,189,190,191,192,193,193,194,194,195,195,
-  128,128,196,196,197,198,199,200,201,201,128,128,202,202,203,203,
-  204,204,205,205,206,207,208,209, 28, 28,210,210,211,212,213,213,
-  214,215,216,216,128,128,217,217,218,218,219, 34,220,220,220,220,
-  220,220,220,220,220,220,220,220,220,220,128,128,128,128,128,128,
-  128,128,221,221,222,222,222,222,222,222,222,222,223,223,223,223,
-  223,223,223,223,223,223,128,128,128,128,128,128,128,128,128,128,
-  224,224,128,128,110,110,110,110,110,110,110,110,110,225,226,227,
-  228,228,228,228,128,128,128,128,229,229,128,128,230,230,230,230,
-  231,231,231,232,233,233,233,233,233,233,233,233,233,233,233,233,
-  234,234,234,234,234,234,234,234,233,233,128,128,128,128,128,128,
-  128,128,104,104,235,236,236,236,237,238,239,239,239,239,239,239,
-  128,128,128,128,240,240,241,  0,128,128,128,128,  0,  0,  0,  0,
-    7,242,  0,  0,  0,  0,  0,  0,  0,243,244,  0, 77, 77,  0,  0,
-    0,  0,128,128,245,245,245,245,245,245,245,245,245,245,245,245,
-  128,128,128,128,128,128,128,128,  4,  4,128,128,246, 11, 11, 11,
-  247,247,128,128,128,128,248,249,128,128,128,128,128,128,250,250,
-  128,128,251,251,128,128,128,128,128,128, 48, 48,252,252,252,252,
-  253,253,128,128,  0,  0,  0,  0,  0,  0,128,128, 19, 19, 19, 19,
-  128,128,128,128,254,  0,128,128,  0,  0,  0,  0, 92, 92,128,128,
-  128,128,128,128,  0,  0,128,128,  7,  7,  7,  7,  0,  0,  0,  0,
-    1,  2,  1,  2,  0,  0,  3,  3,  4,  5,  4,  5,  4,  4,  4,  4,
-    4,  4,  4,  6,  0,  0,  7,  0,  8,  8,  8,  8,  8,  8,  8,  9,
-   10, 11, 11, 11, 11, 11, 12, 11, 13, 13, 13, 13, 14, 13, 13, 13,
-   13, 13, 13, 15, 16, 16, 16, 16, 16, 17, 18, 18, 18, 18, 18, 18,
-   19, 20, 21, 21, 22, 23, 21, 24, 21, 21, 21, 21, 21, 25, 21, 21,
-   26, 26, 26, 26, 26, 21, 21, 21, 27, 27, 27, 27, 28, 28, 28, 28,
-   29, 29, 29, 29, 30, 30, 26, 21, 21, 21, 31, 21, 32, 32, 32, 32,
-   32, 33, 34, 32, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37, 37, 37,
-   38, 38, 38, 38, 39, 39, 39, 39, 40, 40, 40, 40, 41, 41, 41, 41,
-   42, 42, 42, 42, 43, 43, 43, 43, 44, 44, 44, 45, 44, 44, 44, 44,
-   46, 46, 46, 46, 47, 47, 47, 47, 47, 48, 47, 47, 49, 49, 49, 49,
-   49, 49, 50, 50, 50, 50, 50, 51, 52, 52, 52, 52, 53, 53, 53, 53,
-   53, 53, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 56, 56, 57, 57,
-   57, 57, 58, 57, 59, 59, 60, 61, 62, 62, 63, 63, 64, 64, 64, 64,
-   65, 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, 55, 67, 67, 67, 67,
-   67, 68, 68, 68, 69, 69, 69, 69, 69, 69, 64, 64, 70, 70, 71, 71,
-   71, 71, 71, 71, 71, 71, 71,  8, 72, 72, 72, 72, 73, 73, 73, 73,
-   74, 74, 74, 74, 75, 75, 75, 75, 75, 76, 76, 76, 13, 50, 50, 50,
-   73, 77, 78, 79,  4,  4, 80,  4,  4, 81, 82, 83,  4,  4,  4, 84,
-   11, 11, 11, 11, 85,  0,  0,  0,  0,  0,  0, 86,  0,  4,  0,  0,
-    0,  8,  8,  8,  0,  0, 87, 88, 89,  0,  4,  4,  6,  0,  0,  0,
-   90, 90, 90, 90, 91, 91, 91, 91, 91, 91,  4,  4, 92, 92, 92, 92,
-   50, 50, 50, 93, 93, 93, 93, 93, 53, 53, 13, 13, 94, 94, 94, 94,
-   94, 94, 94,  0, 95,  0, 96, 97, 98, 99, 99, 99, 99,100,101,102,
-  102,102,102,103,104,104,104,105, 52,  0,104,104,  0,  0,  0,102,
-   52, 52,  0,  0,  0,  0, 52,106,  0,102,102,107,102,102,102,102,
-  102,108,  0,  0,109,109,109,109,109,110,110,110,111,111,111,111,
-   13, 13,112,112,112,112,112,112,  0,  0,113,  4,114,  4,  4,  4,
-  115,115,115,  0,116,116,116,116,117,117,117,117,117,117, 32, 32,
-  118,118,119,120,120,120, 52, 52,121,121,121,121,122,121, 49, 49,
-  123,123,123,123,123,123, 49, 49,124,124,124,124,124,124,125,125,
-   53, 53, 53,  4,  4,126,127, 54,125,125,125,125,128,128,128,128,
-    4,129, 18, 18, 18, 21, 21, 21, 21, 21, 21,130,  8,  0,131,  0,
-    0,  0,  0, 21, 21, 21, 21,132,  0,  0,  1,  2,  1,  2,133,101,
-  102,134, 52, 52,135,135,135,135, 11,  0, 11, 11, 11,  0,  0,136,
-  137,137,138,138,138,138,139,  0,140,140,140,141,141,142,142,142,
-  143,143,144,144,144,144,144,144,145,145,145,145,145,146,146,146,
-  147,147,147,148,148,148,148,148,149,149,149,150,150,150,150,151,
-  151,151,151,151,152,152,152,152,153,153,153,153,154,154,154,154,
-  155,155,156,156,157,157,157,157,157,157,158,158,159,159,160,160,
-  160,160,160,160,161,161,162,162,162,162,162,162,163,163,163,163,
-  163,163,164,164,165,165,165,165,166,166,166,166,167,167,167,167,
-  168,168,169,169,170,170,170,170,171,171,171,171,172,172,172,172,
-  173,173,173,173,174,174,174,174,175,175,175,175,176, 21, 21, 21,
-  177,177,177,178,178,178,178,179,179,179,179,180,180,180,181,181,
-  182,182,182,182,183,183,183,183,183,184,184,184,185,185,185,185,
-  185,186,186,186,187,187,187,187,187,187,188, 43,189,189,189,189,
-  190,190,190,191,191,191,191,191,192,192,192,193,192,192,192,192,
-  194,194,194,194,195,195,195,195,196,196,196,196,197,197,197,197,
-  198,198,198,198,198,198, 66, 66,199,199,199,199,199, 49, 49, 49,
-  200,200,200,200,201,201,201,201,202,202,202,202,203,203,203,203,
-  204,204,204,204,205,205,205,205,205,206,206,206,206,206,206, 55,
-  207,207,207,207,208,208,208,208,209,209,209,209,209,209,209,210,
-  210,210,210,210,211,211,211,211,211,211,212,212,212,212,212,212,
-  213,213,213,213,214,214,214,214,110,110,110,110,215,215,215,215,
-  216,216,216,216,217,217,217,217,218,218,218,218,219,219,219,219,
-  220,220,220,221,221,221,221,221,221,222,222,222,223,223,223,223,
-  224,224,224,224,225,225,225,225,226,226,226,226,226,226,227, 94,
-  228,228,228,228,229,229,229,229,230, 99, 99, 99, 99, 99, 99, 99,
-   99, 99,102,231, 99,232,102,233,233,233,233,233,234,234,234,234,
-  234,234,  0,  0,  8,  0,  0,  0,  0,  0,235,236,237,  0,238,  0,
-  239,239,239,239, 91, 91, 91, 13,240,240,240,240,241,241,241,241,
-  242,242,242,242,243,243,243,243,244,244,244,244,245,245,245,245,
-  246,246,246,246,247,  0,  0,  0,  0,  0,  0,  0,  1,  2,  2,  2,
-    2,  2,  3,  0,  0,  0,  4,  0,  2,  2,  2,  2,  2,  3,  2,  2,
-    2,  2,  5,  0,  2,  5,  6,  0,  7,  7,  7,  7,  8,  9,  8, 10,
-    8, 11,  8,  8,  8,  8,  8,  8, 12, 13, 13, 13, 14, 14, 14, 14,
-   14, 15, 14, 14, 16, 17, 17, 17, 17, 17, 17, 17, 18, 19, 19, 19,
-   19, 19, 19, 19, 20, 21, 20, 22, 20, 20, 23, 23, 20, 20, 20, 20,
-   22, 20, 24,  7,  7, 25, 20, 20, 26, 20, 20, 20, 20, 20, 20, 21,
-   27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30,
-   31, 31, 31, 31, 32, 20, 20, 20, 33, 33, 33, 33, 34, 35, 33, 33,
-   33, 36, 33, 33, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39,
-   40, 40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43,
-   44, 44, 44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 47,
-   48, 48, 48, 48, 49, 49, 49, 49, 49, 50, 51, 49, 52, 52, 52, 52,
-   53, 53, 53, 53, 53, 53, 54, 53, 55, 55, 55, 55, 56, 56, 56, 56,
-   57, 57, 57, 57, 58, 58, 58, 58, 59, 59, 59, 59, 60, 60, 60, 60,
-   60, 60, 61, 62, 63, 63, 63, 63, 64, 64, 64, 64, 64, 65,  0,  0,
-   66, 66, 66, 66, 67, 67, 67, 67, 68, 68, 68, 68, 69, 70, 71, 71,
-   71, 71, 71, 71, 72, 72, 72, 72, 73, 73, 73, 73, 74, 74, 74, 74,
-   75, 75, 75, 75, 76, 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78,
-   79, 79, 79, 79, 80, 80, 80, 80, 81, 81, 81, 81, 82,  7,  7,  7,
-   83,  7, 84, 85,  0, 84, 86,  0,  2, 87, 88,  2,  2,  2,  2, 89,
-   90, 87, 91,  2,  2,  2, 92,  2,  2,  2,  2, 93,  0,  0,  0, 86,
-    1,  0,  0, 94,  0, 95, 96,  0,  4,  0,  0,  0,  0,  0,  0,  4,
-   97, 97, 97, 97, 98, 98, 98, 98, 13, 13, 13, 13, 99, 99, 99, 99,
-  100,100,100,100,  0,101,  0,  0,102,100,103,104,  0,  0,100,  0,
-  105,106,106,106,106,106,106,106,106,106,107,105,108,109,109,109,
-  109,109,109,109,109,109,110,108,111,111,111,111,112, 55, 55, 55,
-   55, 55, 55,113,109,109,109,110,109,109,  0,  0,114,114,114,114,
-  115,115,115,115,116,116,116,116,117,117,117,117, 96,  2,  2,  2,
-    2,  2, 94,  2,118,118,118,118,119,119,119,119,120,120,120,120,
-  121,121,121,121,121,121,121,122,123,123,123,123,124,124,124,124,
-  124,124,124,125,126,126,126,126,127,127,127,127,128,128,128,128,
-    2,  2,  3,  2,  2,129,130,  0,131,131,131,131,132, 17, 17, 18,
-   20, 20, 20,133,  7,  7,  7,134, 20, 20, 20, 23,  0,135,109,109,
-  109,109,109,136,137,137,137,137,  0,  0,  0,138,139,139,139,139,
-  140,140,140,140, 84,  0,  0,  0,141,141,141,141,142,142,142,142,
-  143,143,143,143,144,144,144,144,145,145,145,145,146,146,146,146,
-  147,147,147,147,148,148,148,148,149,149,149,149,150,150,150,150,
-  151,151,151,151,152,152,152,152,153,153,153,153,154,154,154,154,
-  155,155,155,155,156,156,156,156,157,157,157,157,158,158,158,158,
-  159,159,159,159,160,160,160,160,161,161,161,161,162,162,162,162,
-  163,163,163,163,164,164,164,164,165,165,165,165,166,166,166,166,
-  167,167,167,167,168,168,168,168,169,169,169,169,170,170,170,170,
-  171,171,171,171,172,172,172,172,173,173,173,173,174,174,174,174,
-  175,175,175,175,176,176,176,176,177, 20, 20, 20,178,178,178,178,
-  179,179,179,179,180,180,180,180,181,181,181,181,182,182,182,182,
-  183,183,183,183,184,184,184,184,185,185,185,185,186,186,186,186,
-  187,187,187,187,188,188,188,188,189, 45, 45, 45,190,190,190,190,
-  191,191,191,191,192,192,192,192,193,193,193,193,193,193,194,193,
-  195,195,195,195,196,196,196,196,197,197,197,197,198,198,198,198,
-  199,199,199,199,200,200,200,200,201,201,201,201,202,202,202,202,
-  203,203,203,203,204,204,204,204,205,205,205,205,206,206,206,206,
-  207,207,207,207,208,208,208,208,209,209,209,209,210,210,210,210,
-  211,211,211,211,212,212,212,212,213,213,213,213,214,214,214,214,
-  215,215,215,215,216,216,216,216,217,217,217,217,218,218,218,218,
-  219,219,219,219,220,220,220,220,221,221,221,221,222,222,222,222,
-  223,223,223,223,224,224,224,224,225,225,225,225,226,226,226,226,
-  227,227,227,227,228,229,229,229,230,230,230,230,229,229,229,229,
-  231,106,106,106,232,106,106,106,106,233,109,109,234,234,234,234,
-  235,235,235,235,  0,236, 86,  0,  0,  0,236,  7, 82,138,  7,  0,
-    0,  0,237, 86,238,238,238,238,239,239,239,239,240,240,240,240,
-  241,241,241,241,242,242,242,242,243,243,243,243,244,244,244,244,
-  245,245,245,245,246,  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,
-    0,  0, 26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,
-    9,  9,  0,  9,  9,  0,  9,  0,  9,  9, 55, 55, 55, 55, 55, 55,
-    6,  6,  6,  6,  6,  1,  1,  6,  6,  4,  4,  4,  4,  4,  4,  4,
-    4, 14, 14, 14, 14, 14, 14, 14,  3,  3,  3,  3,  3,  0,  3,  3,
-    0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,  3,  3,
-    1,  3,  3,  3, 37, 37, 37, 37, 38, 38, 38, 38, 64, 64, 64, 64,
-   90, 90, 90, 90, 95, 95, 95, 95,  3,  3,  0,  3,  7,  7,  7,  7,
-    7,  1,  1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,
-   11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 22, 22, 22, 22,
-   23, 23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36,
-   24, 24, 24, 24, 24, 24, 24,  0, 18, 18, 18, 18, 25, 25, 25, 25,
-   25,  0,  0,  0,  0, 25, 25, 25, 33, 33, 33, 33,  8,  8,  8,  8,
-    8,  8,  8,  0, 12, 12, 12, 12, 30, 30, 30, 30, 29, 29, 29, 29,
-   28, 28, 28, 28, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,  0,
-    0,  0, 35, 35, 45, 45, 45, 45, 44, 44, 44, 44, 44,  0,  0,  0,
-   43, 43, 43, 43, 46, 46, 46, 46, 31, 31, 31, 31, 32, 32,  0,  0,
-   32,  0, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 52, 52, 52, 52,
-   58, 58, 58, 58, 54, 54, 54, 54, 91, 91, 91, 91, 62, 62, 62, 62,
-   76, 76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70, 73, 73, 73, 73,
-    1,  1,  1,  0,  1,  0,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,
-    1,  1,  0,  0, 19, 19,  9,  9,  9,  9,  9,  6, 19,  9,  9,  9,
-    9,  9, 19, 19,  9,  9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,
-    0,  0,  0, 19,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27,
-   56, 56, 56, 56, 61, 61, 61, 61, 13, 13, 13, 13,  0, 13,  0, 13,
-    0, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,  0, 15, 15, 15,
-   15, 15, 15, 15, 15,  1,  1,  0,  0, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,  0, 26, 26, 26, 26, 26, 12, 12, 12, 12, 12, 12,  0,
-   39, 39, 39, 39, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79,
-   60, 60, 60, 60, 65, 65, 65, 65, 75, 75, 75, 75, 69, 69, 69, 69,
-   69, 69,  0, 69, 74, 74, 74, 74, 84, 84, 84, 84, 84, 84, 84,  0,
-   68, 68, 68, 68, 92, 92, 92, 92, 87, 87, 87, 87, 19,  9, 19, 19,
-   19, 19,  0,  0,  2,  2,  2,  2, 19, 19, 19,  4,  3,  3,  0,  0,
-    1,  1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0, 49, 49, 49, 49,
-    0,  1,  1,  1, 71, 71, 71, 71, 67, 67, 67, 67, 42, 42, 42, 42,
-   41, 41, 41, 41,118,118,118,118, 53, 53, 53, 53, 59, 59, 59, 59,
-   40, 40, 40, 40, 51, 51, 51, 51, 50, 50, 50, 50,135,135,135,135,
-  106,106,106,106,104,104,104,104,161,161,161,161,170,170,170,170,
-  110,110,110,110, 47, 47, 47, 47, 81, 81, 81, 81,120,120,120,120,
-  116,116,116,116,128,128,128,128, 66, 66, 66, 66, 72, 72, 72, 72,
-   98, 98, 98, 98, 97, 97, 97, 97, 57, 57, 57, 57, 88, 88, 88, 88,
-  117,117,117,117,112,112,112,112, 78, 78, 78, 78, 83, 83, 83, 83,
-   82, 82, 82, 82,122,122,122,122, 89, 89, 89, 89,130,130,130,130,
-  144,144,144,144,165,165,165,165,156,156,156,156,156,156,  3,  3,
-  147,147,147,147,148,148,148,148,158,158,158,158,153,153,153,153,
-  149,149,149,149, 94, 94, 94, 94, 85, 85, 85, 85,101,101,101,101,
-   96, 96, 96, 96,111,111,111,111,100,100,100,100,100, 36, 36, 36,
-  108,108,108,108,129,129,129,129,109,109,109,109,107,107,107,107,
-  107,107,107,  1,171,171,171,171,137,137,137,137,124,124,124,124,
-  123,123,123,123,114,114,114,114,102,102,102,102,126,126,126,126,
-  142,142,142,142,125,125,125,125,154,154,154,154,150,150,150,150,
-  141,141,141,141,140,140,140,140,121,121,121,121,169,169,169,169,
-  133,133,133,133,134,134,134,134,138,138,138,138,143,143,143,143,
-  145,145,145,145,163,163,163,163, 63, 63, 63, 63,157,157,157,157,
-   80, 80, 80, 80,127,127,127,127,166,166,166,166,115,115,115,115,
-  159,159,159,159,103,103,103,103,119,119,119,119,167,167,167,167,
-  146,146,146,146, 99, 99, 99, 99,136,139, 13, 13,155,155,155,155,
-  136,136,136,136, 17, 15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17,
-  139,139,139,139,105,105,105,105,  0,  0,  0,  1,  0,  0,  1,  1,
-  131,131,131,131,151,151,151,151,160,160,160,160,152,152,152,152,
-  164,164,164,164,168,168,168,168,113,113,113,113,132,132,132,132,
-   15,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,
-    9, 10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-   16, 17,  9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20, 21,  9,
-   22,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-   26, 27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
-    3,  4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16,
-   17, 18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,
-    0,  0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37,
-   38, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,
-    0,  0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,
-    0,  0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,
-    0,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,
-    0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
-   85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,
-  101,102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,
-    0,  0,108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,
-  115,  0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,
-    0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,128,129,130,131,132,133,134,135,136,137,138,139,140,141,
-  142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,
-    0,  0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,  0,
-  163,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,  0,  0,
-    0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,170,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,179,  0,
-    0,  0,180,181,182,183,184,185,186,187,188,189,190,191,192,193,
-  194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,
-  210,211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
-    3,  4,
-};
-static const uint16_t
-_hb_ucd_u16[5080] =
-{
-     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
-    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
-    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
-    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
-     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
-    13,  13,  13,  35,   9,  42,  11,  11,  43,  44,  32,  45,  46,  47,  47,  48,
-    49,  50,  47,  47,  51,  32,  52,  53,  47,  47,  47,  47,  47,  54,  55,  56,
-    57,  58,  47,  32,  59,  47,  47,  47,  47,  47,  60,  53,  61,  47,  62,  63,
-    47,  64,  65,  66,  47,  67,  47,  47,  68,  69,  47,  47,  70,  32,  71,  32,
-    72,  47,  47,  73,  74,  75,  76,  77,  78,  47,  47,  79,  80,  81,  82,  83,
-    84,  47,  47,  85,  86,  87,  88,  89,  84,  47,  47,  79,  90,  47,  82,  91,
-    92,  47,  47,  93,  94,  95,  82,  96,  97,  47,  47,  98,  99, 100, 101, 102,
-   103,  47,  47, 104, 105, 106,  82, 107, 108,  47,  47,  93, 109, 110,  82, 111,
-   112,  47,  47, 113, 114, 115,  82, 116,  92,  47,  47,  47, 117, 118, 101, 119,
-    47,  47,  47, 120, 121, 122,  66,  66,  47,  47,  47, 123, 124, 125,  47,  47,
-   126, 127, 128, 129,  47,  47,  47, 130, 131,  32,  32, 132, 133, 134,  66,  66,
-    47,  47, 135, 136, 122, 137, 138, 139, 140, 141,   9,   9,   9,  11,  11, 142,
-    47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47, 143, 144, 145,
-    47, 146,   9,   9,   9,   9,   9, 147, 148,  47,  47,  47,  47,  47,  47,  47,
-    47,  47,  47,  47,  47,  47, 149,  47, 150, 151,  47,  47,  47,  47, 152, 153,
-    47, 154,  47, 155,  47, 156,  47, 156,  47,  47,  47, 157, 158, 159, 160, 145,
-   161, 160,  47,  47, 162,  47,  47,  47, 163,  47, 164,  47,  47,  47,  47,  47,
-    47,  47, 165, 166, 167,  47,  47,  47,  47,  47,  47,  47,  47, 168, 146, 146,
-    47, 169,  47,  47,  47, 170, 171, 172, 160, 160, 173, 174,  32,  32,  32,  32,
-   175,  47,  47, 176, 177, 122, 178, 179, 180,  47, 181,  61,  47,  47, 182, 183,
-    47,  47, 184, 185, 186,  61,  47, 187, 188,   9,   9,   9,  66, 189, 190, 191,
-    11,  11, 192,  27,  27,  27, 193, 194,  11, 195,  27,  27,  32,  32,  32,  32,
-    13,  13,  13,  13,  13,  13,  13,  13,  13, 196,  13,  13,  13,  13,  13,  13,
-   197, 197, 197, 197, 197, 198, 197,  11, 199, 199, 199, 200, 201, 202, 202, 201,
-   203, 204, 205, 206, 207, 208, 209, 210, 211,  27, 212, 212, 212, 213, 214,  32,
-   215, 216, 217, 218, 219, 145, 220, 220, 221, 222, 223, 146, 224, 225, 146, 226,
-   227, 227, 227, 227, 227, 227, 227, 227, 228, 146, 229, 146, 146, 146, 146, 230,
-   146, 231, 227, 232, 146, 233, 234, 146, 146, 146, 146, 146, 146, 146, 145, 145,
-   145, 235, 146, 146, 146, 146, 236, 145, 146, 146, 146, 146, 146, 146, 146, 146,
-   146, 146, 146, 237, 238, 146, 146, 239, 146, 146, 146, 146, 146, 146, 240, 146,
-   146, 146, 146, 146, 146, 146, 241, 242, 145, 243, 146, 146, 244, 227, 245, 227,
-   246, 247, 227, 227, 227, 248, 227, 249, 146, 146, 146, 227, 250, 146, 146, 146,
-     9,   9,   9,  11,  11,  11, 251, 252,  13,  13,  13,  13,  13,  13, 253, 254,
-    11,  11,  11,  47,  47,  47, 255, 256,  47,  47,  47,  47,  47,  47,  32,  32,
-   257, 258, 259, 260, 261, 262, 263, 263, 264, 265, 266, 267, 268,  47,  47,  47,
-    47, 269, 148,  47,  47,  47,  47, 270,  47, 271,  47,  47, 146, 146, 146,  47,
-   146, 146, 272, 146, 273, 274, 146, 146, 272, 146, 146, 274, 146, 146, 146, 146,
-    47,  47,  47,  47, 146, 146, 146, 146,  47, 275,  47,  47,  47,  47,  47,  47,
-    47, 146, 146, 146, 146,  47,  47, 187, 276,  47,  61,  47,  13,  13, 277, 278,
-    13, 279,  47,  47,  47,  47, 280, 281,  31, 282, 283, 284,  13,  13,  13, 285,
-   286, 287, 288, 289, 290, 291,   9, 292, 293,  47, 294, 295,  47,  47,  47, 296,
-   297,  47,  47, 298, 299, 160,  32, 300,  61,  47, 301,  47, 302, 303,  47,  47,
-    72,  47,  47, 304, 305, 306, 307,  61,  47,  47, 308, 309, 310, 311,  47, 312,
-    47,  47,  47, 313,  58, 314, 315, 316,  47,  47,  47,  11,  11, 317, 318,  11,
-    11,  11,  11,  11,  47,  47, 319, 160, 320, 320, 320, 320, 320, 320, 320, 320,
-   321, 321, 321, 321, 321, 321, 321, 321,  11, 322, 323,  47,  47,  47,  47,  47,
-    47,  47,  47, 324,  31, 325,  47,  47,  47,  47,  47, 326, 146,  47,  47,  47,
-    47,  47,  47,  47, 327, 146, 146, 328,  32, 329,  32, 330, 331, 332, 333,  47,
-    47,  47,  47,  47,  47,  47,  47, 334, 335,   2,   3,   4,   5, 336, 337, 338,
-    47, 339,  47,  47,  47,  47, 340, 341, 342, 145, 145, 343, 220, 220, 220, 344,
-   345, 146, 146, 146, 146, 146, 146, 346, 347, 347, 347, 347, 347, 347, 347, 347,
-    47,  47,  47,  47,  47,  47, 348, 145,  47,  47, 349,  47, 350,  47,  47,  60,
-    47, 351,  47,  47,  47, 352, 220, 220,   9,   9, 147,  11,  11,  47,  47,  47,
-    47,  47, 160,   9,   9, 147,  11,  11,  47,  47,  47,  47,  47,  47, 351,   9,
-     9, 353,  11,  11,  47,  47,  47,  47,  27,  27,  27,  27,  27,  27,  27,  27,
-    47,  47,  47,  47,  47, 354,  47, 355,  47,  47, 356, 145, 145, 145,  47, 357,
-    47, 358,  47, 351,  66,  66,  66,  66,  47,  47,  47, 359, 145, 145, 145, 145,
-   360,  47,  47, 361, 145,  66,  47, 362,  47, 363, 145, 145, 364,  47, 365,  66,
-    47,  47,  47, 366,  47, 367,  47, 367,  47, 366, 144, 145, 145, 145, 145, 145,
-     9,   9,   9,   9,  11,  11,  11, 368,  47,  47, 369, 160, 370,   9, 371,  11,
-   372, 227, 227, 227, 227, 227, 227, 227, 145, 145, 145, 145, 145, 145, 145, 145,
-    47,  47, 373,  47,  47,  47,  47, 374,  47, 363, 375,  47,  60, 376,  66,  47,
-   377,  66,  66,  47, 378, 145,  47,  47, 379,  47,  47, 361, 380, 381, 382, 383,
-   180,  47,  47, 384, 385,  47,  47, 160,  97,  47, 386, 387, 388,  47,  47, 389,
-   180,  47,  47, 390, 391, 392, 393, 145,  47,  47, 394, 395, 360,  32,  32,  32,
-    47,  47, 366,  47,  47, 396, 172, 160,  92,  47,  47, 113, 397, 398, 399,  32,
-    47,  47,  47, 400, 401, 402, 403,  32,  47,  47,  47, 404, 405, 406,  47,  47,
-    47,  47,  47, 407, 408, 160, 160, 160,  47,  47, 409, 410, 411, 412,  32,  32,
-    47,  47,  47, 413, 414, 160,  66,  66,  47,  47, 415, 416, 160, 160, 160, 160,
-    47, 417, 418, 419,  47,  47,  47,  47,  47,  47, 394, 420,  66,  66,  66,  66,
-     9,   9,   9,   9,  11,  11, 128, 421,  47,  47,  47, 422, 423, 160, 160, 160,
-    47,  47,  47,  47,  47, 424, 425, 426, 427,  47,  47, 428, 429, 430,  47,  47,
-   431, 432,  66,  47,  47,  47,  47,  47,  66,  66,  66,  66,  66,  66,  66,  66,
-    47,  47,  47,  47,  47,  47, 433, 160,  47,  47, 409, 434, 433, 128, 145, 435,
-    47, 156, 436, 437,  32,  32,  32,  32,  47,  47,  47, 360, 438, 160,  47,  47,
-   439, 440, 160, 160, 160, 160, 160, 160,  47,  47,  47,  47,  47,  47,  47, 441,
-   442,  47,  47, 443, 444, 445,  32,  32,  47,  47,  47,  47, 145, 446, 447, 448,
-   220, 220, 220, 220, 220, 220, 220,  66,  47,  47,  47,  47,  47,  47,  47, 433,
-    47,  47,  47, 209, 449,  32,  47,  47,  47, 450, 451, 160, 160, 160, 160, 160,
-    47,  47,  47,  47,  47,  47, 306,  47,  47,  47,  47,  47, 160,  47,  47, 452,
-    47,  47,  47, 453, 454, 455, 456,  47,  27,  27,  27,  27, 457,  47, 458, 160,
-     9,   9,   9,   9,   9,   9,  11,  11, 145, 459,  66,  66,  66,  66,  66,  66,
-    47,  47,  47,  47, 396, 460, 426, 426, 461, 462,  27,  27,  27,  27, 463, 426,
-    47, 464, 209, 209, 209, 209, 209, 209, 146, 146, 146, 146, 146, 146, 146, 160,
-    32,  32,  32,  32,  32, 146, 146, 146, 146, 146, 146, 146, 146, 146, 465, 466,
-   467, 146, 468, 146, 146, 146, 146, 146, 146, 146, 146, 146, 469, 146, 146, 146,
-     9, 470,  11, 471, 472,  11, 197,   9, 473, 474,   9, 475,  11,   9, 470,  11,
-   471, 472,  11, 197,   9, 473, 474,   9, 475,  11,   9, 470,  11, 471, 472,  11,
-   197,   9, 473, 474,   9, 475,  11,   9, 470,  11, 197,   9, 476, 477, 478, 479,
-    11, 480,   9, 481, 482, 483, 484,  11, 485,   9, 486,  11, 487, 160, 160, 160,
-    32,  32,  32, 488,  32,  32, 489, 490, 491, 492,  32,  32,  32,  32,  32,  32,
-   493,  11,  11,  11,  11,  11,  11,  11,  32,  32,  32,  27,  27,  27,  27,  27,
-    32,  32,  32,  32,  32,  32,  32,  32,  47,  47,  47, 494, 495, 146, 146, 146,
-    47,  47, 450,  32,  47,  47, 374, 496,  47,  47,  47,  47,  47,  47, 497, 160,
-    47,  47,  47,  47,  47,  47, 450, 498,  47,  47,  47,  47, 356,  32,  32,  32,
-     9,   9, 473,  11, 499, 306,  66,  66, 145, 145, 500, 501, 145, 145, 145, 145,
-   145, 145, 502, 145, 145, 145, 145, 145,  47,  47,  47,  47,  47,  47,  47, 227,
-   503, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 504,
-   209, 209, 209, 209, 209, 209, 209, 209,   0,   0,   0,   0,   0,   0,   0,   0,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 716,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 717,
+     0,   0,   0,   0,   1,   2,   1,   2,   0,   0,   3,   3,   4,   5,   4,   5,
+     4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   6,   0,   0,   7,   0,
+     8,   8,   8,   8,   8,   8,   8,   9,  10,  11,  12,  11,  11,  11,  13,  11,
+    14,  14,  14,  14,  14,  14,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,
+    14,  14,  14,  16,  17,  18,  17,  17,  19,  20,  21,  21,  22,  21,  23,  24,
+    25,  26,  27,  27,  28,  29,  27,  30,  27,  27,  27,  27,  27,  31,  27,  27,
+    32,  33,  33,  33,  34,  27,  27,  27,  35,  35,  35,  36,  37,  37,  37,  38,
+    39,  39,  40,  41,  42,  43,  44,  27,  27,  45,  27,  27,  27,  27,  46,  27,
+    47,  47,  47,  47,  47,  48,  49,  47,  50,  51,  52,  53,  54,  55,  56,  57,
+    58,  59,  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,
+    74,  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+    90,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104, 105,
+   106, 107, 108, 108, 109, 110, 111, 108, 112, 113, 114, 115, 116, 117, 118, 119,
+   120, 121, 121, 122, 121, 123, 124, 124, 125, 126, 127, 128, 129, 130, 124, 124,
+   131, 131, 131, 131, 132, 131, 133, 134, 131, 132, 131, 135, 135, 136, 124, 124,
+   137, 137, 137, 137, 137, 137, 137, 137, 137, 137, 138, 138, 139, 138, 138, 140,
+   141, 141, 141, 141, 141, 141, 141, 141, 142, 142, 142, 142, 143, 144, 142, 142,
+   143, 142, 142, 145, 146, 147, 142, 142, 142, 146, 142, 142, 142, 148, 142, 149,
+   142, 150, 151, 151, 151, 151, 151, 152, 153, 153, 153, 153, 153, 153, 153, 153,
+   154, 155, 156, 156, 156, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+   167, 167, 167, 167, 167, 168, 169, 169, 170, 171, 172, 172, 172, 172, 172, 173,
+   172, 172, 174, 153, 153, 153, 153, 175, 176, 177, 178, 178, 179, 180, 181, 182,
+   183, 183, 184, 183, 185, 186, 167, 167, 187, 188, 189, 189, 189, 190, 189, 191,
+   192, 192, 193,   8,   8, 194, 195, 124, 196, 196, 196, 196, 197, 196, 196, 196,
+   198, 198, 198, 198, 199, 199, 199, 200, 201, 201, 201, 202, 203, 204, 204, 204,
+   205, 138, 138, 206, 207, 208, 209, 210,   4,   4, 211,   4,   4, 212, 213, 214,
+     4,   4,   4, 215,   8,   8,   8,   8,  11, 216,  11,  11, 216, 217,  11, 218,
+    11,  11,  11, 219, 219, 220,  11, 221, 222,   0,   0,   0,   0,   0, 223, 224,
+   225, 226,   0,   0, 227,   8,   8, 228,   0,   0, 229, 230, 231,   0,   4,   4,
+   232,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0, 233, 124, 234, 124,   0,   0, 235, 235, 235, 235, 235, 235, 235, 235,
+     0,   0,   0,   0,   0,   0,   0, 236, 237, 237, 237, 237, 237, 237,   4,   4,
+   238, 238, 238, 238, 238, 238, 238, 239, 138, 138, 139, 240, 240, 240, 241, 242,
+   142, 243, 244, 244, 244, 244,  14,  14,   0,   0,   0,   0,   0, 245, 124, 124,
+   246, 247, 246, 246, 246, 246, 246, 248, 246, 246, 246, 246, 246, 246, 246, 246,
+   246, 246, 246, 246, 246, 249, 124,   0, 250,   0, 251, 252, 253, 254, 254, 254,
+   254, 255, 256, 257, 257, 257, 257, 258, 259, 260, 260, 261, 141, 141, 141, 141,
+   262,   0, 260, 260,   0,   0, 263, 257, 141, 262,   0,   0,   0,   0, 141, 264,
+     0,   0,   0,   0,   0, 257, 257, 265, 257, 257, 257, 257, 257, 266,   0,   0,
+   246, 246, 246, 246,   0,   0,   0,   0, 267, 267, 267, 267, 267, 267, 267, 267,
+   268, 267, 267, 267, 269, 270, 270, 270, 271, 271, 271, 271, 271, 271, 271, 271,
+   271, 271, 272, 124,  14,  14,  14,  14,  14,  14, 273, 273, 273, 273, 273, 274,
+     0,   0, 275,   4,   4,   4,   4,   4, 276,   4,   4,   4,   4, 226, 124, 277,
+   278, 278, 279, 233, 280, 280, 280, 281, 282, 282, 282, 282, 283, 284,  47,  47,
+   285, 285, 286, 287, 287, 288, 141, 289, 290, 290, 290, 290, 291, 292, 137, 293,
+   294, 294, 294, 295, 296, 297, 137, 137, 298, 298, 298, 298, 299, 300, 301, 302,
+   303, 304, 244,   4,   4, 305, 306, 151, 151, 151, 151, 151, 301, 301, 307, 308,
+   141, 141, 309, 141, 310, 141, 141, 311, 124, 124, 124, 124, 124, 124, 124, 124,
+   246, 246, 246, 246, 246, 246, 312, 246, 246, 246, 246, 246, 246, 313, 124, 124,
+   314, 315,  21, 316, 317,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,
+    27,  27,  27, 318,  27,  27,  27,  27,  27,  27,  27,  27,  27, 124, 124,  27,
+     8, 233, 319,   0,   0, 320, 321, 322,  27,  27,  27,  27,  27,  27,  27, 323,
+   324,   0,   1,   2,   1,   2, 325, 256, 257, 326, 141, 262, 327, 328, 329, 330,
+   331, 332, 333, 334, 335, 335, 124, 124, 332, 332, 332, 332, 332, 332, 332, 336,
+   337,   0,   0, 338,  11,  11,  11,  11, 339, 340, 341, 124, 124,   0,   0, 342,
+   343, 344, 345, 345, 345, 346, 347, 348, 349, 349, 350, 351, 352, 353, 353, 354,
+   355, 356, 357, 357, 358, 359, 124, 124, 360, 360, 360, 360, 360, 361, 361, 361,
+   362, 363, 364, 365, 365, 366, 365, 367, 368, 368, 369, 370, 370, 370, 371, 372,
+   372, 373, 374, 375, 376, 376, 376, 377, 378, 378, 378, 378, 378, 378, 378, 378,
+   378, 378, 378, 379, 378, 380, 381, 124, 382,   4,   4, 383, 124, 124, 124, 124,
+   384, 385, 385, 386, 387, 388, 389, 389, 390, 391, 392, 124, 124, 124, 393, 394,
+   395, 396, 397, 398, 399, 400, 124, 124, 401, 401, 402, 403, 402, 404, 402, 402,
+   405, 406, 407, 408, 409, 409, 410, 410, 411, 411, 124, 124, 412, 412, 413, 414,
+   415, 415, 415, 416, 417, 418, 419, 420, 421, 422, 423, 124, 124, 124, 124, 124,
+   424, 424, 424, 424, 425, 124, 124, 124, 426, 426, 426, 427, 426, 426, 426, 428,
+   429, 429, 430, 431, 432, 432, 433, 432, 434, 124, 124, 124, 124, 124, 124, 124,
+   124, 124, 124, 124, 124, 124,  27, 435, 436, 436, 437, 438, 439, 440, 124, 441,
+   442, 442, 443, 444, 444, 445, 124, 446, 447, 124, 124, 448, 449, 124, 450, 451,
+   452, 452, 452, 452, 453, 454, 452, 455, 456, 456, 456, 456, 457, 458, 459, 460,
+   461, 461, 461, 462, 463, 464, 464, 465, 466, 466, 466, 466, 466, 466, 467, 468,
+   469, 470, 469, 469, 471, 124, 124, 124, 472, 473, 474, 475, 475, 475, 476, 477,
+   478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 487, 488, 489, 490, 491, 124,
+   492, 492, 492, 492, 492, 493, 494, 124, 495, 495, 495, 495, 496, 497, 124, 124,
+   498, 498, 498, 499, 498, 500, 124, 124, 501, 501, 501, 501, 502, 503, 504, 124,
+   505, 505, 505, 506, 506, 137, 507, 124, 508, 509, 510, 508, 511, 124, 124, 124,
+   512, 512, 512, 513, 124, 124, 124, 124, 124, 124, 514, 514, 514, 514, 514, 515,
+   516, 517, 518, 519, 520, 521, 124, 124, 124, 124, 522, 523, 523, 522, 524, 124,
+   525, 525, 525, 525, 526, 527, 527, 527, 527, 527, 528, 153, 529, 529, 529, 530,
+   531, 124, 124, 124, 124, 124, 532, 124, 124, 124, 124, 124, 533, 533, 534, 535,
+   536, 537, 537, 538, 539, 537, 540, 541, 541, 542, 543, 544, 124, 124, 124, 124,
+   545, 546, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 555, 556, 557, 124,
+   124, 124, 124, 124, 124, 124, 558, 559, 560, 561, 560, 562, 560, 563, 124, 124,
+   124, 124, 124, 564, 565, 565, 565, 566, 567, 567, 567, 567, 567, 567, 567, 567,
+   567, 568, 124, 124, 124, 124, 124, 124, 567, 567, 567, 567, 567, 567, 569, 570,
+   567, 567, 567, 567, 571, 124, 124, 124, 124, 572, 572, 572, 572, 572, 572, 573,
+   574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, 575, 574, 574,
+   574, 574, 574, 574, 574, 574, 574, 576, 577, 577, 577, 577, 577, 577, 577, 577,
+   577, 577, 577, 577, 578, 124, 124, 124, 579, 579, 579, 580, 124, 124, 124, 124,
+   273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 581, 582, 583, 584, 585,
+   585, 585, 585, 586, 587, 588, 589, 590, 591, 591, 591, 591, 592, 593, 594, 595,
+   591, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 596, 596, 596, 597,
+   124, 124, 124, 124, 598, 598, 598, 598, 598, 599, 600, 601, 600, 602, 124, 124,
+   603, 603, 603, 603, 604, 603, 603, 603, 605, 603, 124, 124, 124, 124, 606, 607,
+   608, 608, 608, 608, 608, 608, 608, 608, 609, 609, 609, 609, 609, 609, 609, 609,
+   609, 609, 609, 609, 609, 610, 124, 611, 608, 612, 124, 124, 124, 124, 124, 124,
+   608, 608, 608, 608, 608, 608, 608, 613, 124, 124, 124, 124, 124, 124, 124, 614,
+   615, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+   254, 254, 616, 617, 124, 618, 619, 620, 620, 620, 620, 620, 620, 620, 620, 620,
+   620, 620, 620, 620, 620, 620, 620, 621, 622, 622, 622, 622, 622, 622, 623, 624,
+   625, 626, 627, 124, 124, 124, 124, 124,   0,   0,   0,   0,   0,   0,   0, 340,
+     0,   0,   0, 628,   0, 629,   0, 629,   8,   8, 194,   8, 630,   0,   0,   0,
+     0,   0,   0,   0, 627, 124, 124, 124,   0,   0,   0,   0,   0,   0,   0, 631,
+     0,   0, 632,   0,   0,   0, 633, 634, 635,   0, 636,   0,   0,   0, 234, 124,
+    11,  11,  11,  11, 637, 124, 124, 124, 124, 124, 124, 124,   0, 627,   0, 627,
+     0,   0,   0,   0,   0, 638,   0, 639,   0,   0,   0,   0,   0, 223,   0,   0,
+     0, 640, 641, 642, 643,   0,   0,   0, 644, 645,   0, 646, 647, 648,   0,   0,
+     0,   0, 649,   0,   0,   0,   0,   0,   0,   0,   0,   0, 650,   0,   0,   0,
+   651, 651, 651, 651, 651, 651, 651, 651, 652, 653, 654, 124, 124, 124, 124, 124,
+     4, 655, 656, 124, 124, 124, 124, 124, 657, 658, 659,  14,  14,  14, 660, 124,
+   661, 124, 124, 124, 124, 124, 124, 124, 662, 662, 663, 664, 665, 124, 124, 124,
+   124, 666, 667, 124, 668, 668, 668, 669, 124, 124, 124, 124, 124, 670, 670, 671,
+   124, 124, 124, 124, 124, 672, 672, 673, 124, 124, 124, 124, 674, 675, 674, 676,
+   124, 124, 124, 124, 124, 124, 677, 678, 679, 679, 679, 679, 679, 679, 679, 679,
+   679, 679, 679, 679, 680, 681, 124, 124, 682, 682, 682, 682, 683, 684, 124, 124,
+   124, 124, 124, 124, 124, 124, 124, 324,   0,   0,   0, 685, 124, 124, 124, 124,
+   324,   0,   0, 245, 124, 124, 124, 124, 686,  27, 687, 688, 689, 690, 691, 692,
+   693, 694, 695, 694, 124, 124, 124, 696,   0,   0, 348,   0,   0,   0,   0,   0,
+     0, 627, 225, 324, 324, 324,   0, 631,   0,   0, 245, 124, 124, 124, 697,   0,
+   698,   0,   0, 348, 639, 227, 631, 124,   0,   0,   0,   0,   0, 699, 340, 340,
+     0,   0,   0,   0,   0, 233, 348, 629, 348,   0,   0,   0, 700, 233,   0,   0,
+   700,   0, 245, 348, 227, 639, 124, 124,   0,   0,   0,   0,   0, 700, 245, 340,
+   701,   0,   0,   0, 702, 703, 704, 639,   0, 320,   0,   0,   0,   0,   0, 234,
+   246, 246, 246, 246, 246, 246, 124, 124, 246, 312, 246, 246, 246, 246, 246, 246,
+   246, 246, 312, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 705, 246,
+   246, 246, 246, 246, 246, 312, 124, 124, 246, 312, 124, 124, 124, 124, 124, 124,
+   246, 246, 246, 246, 706, 246, 246, 246, 246, 246, 246, 246, 246, 246, 246, 313,
+   707, 124,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,   8,   8,
+     8,   8,   8,   8,   8,   8,   8,   0,   0,   0,   0,   0,   1,   2,   2,   2,
+     2,   2,   3,   0,   0,   0,   4,   0,   2,   2,   2,   2,   2,   3,   2,   2,
+     2,   2,   5,   0,   2,   5,   6,   0,   7,   7,   7,   7,   8,   9,  10,  11,
+    12,  13,  14,  15,   8,   8,   8,   8,  16,   8,   8,   8,  17,  18,  18,  18,
+    19,  19,  19,  19,  19,  20,  19,  19,  21,  22,  22,  22,  22,  22,  22,  22,
+    22,  23,  21,  22,  22,  22,  23,  21,  24,  25,  25,  25,  25,  25,  25,  25,
+    25,  25,  12,  12,  25,  25,  26,  27,  25,  28,  12,  12,  29,  30,  29,  31,
+    29,  29,  32,  32,  29,  29,  29,  29,  31,  29,  33,   7,   7,  34,  29,  29,
+    35,  29,  29,  29,  29,  29,  29,  30,  36,  36,  36,  37,  36,  36,  36,  36,
+    36,  36,  38,  39,  40,  40,  40,  40,  41,  12,  12,  12,  42,  42,  42,  42,
+    42,  42,  43,  44,  45,  45,  45,  45,  45,  45,  45,  46,  45,  45,  45,  47,
+    48,  48,  48,  48,  48,  48,  48,  49,  36,  36,  38,  12,  50,  51,  29,  29,
+    52,  29,  29,  29,  53,  53,  53,  53,  54,  55,  53,  53,  53,  56,  53,  53,
+    57,  58,  57,  59,  59,  57,  57,  57,  57,  57,  60,  57,  61,  62,  63,  57,
+    57,  59,  59,  64,  12,  65,  12,  66,  57,  62,  57,  57,  57,  57,  57,  64,
+    67,  67,  68,  69,  70,  71,  71,  71,  71,  71,  72,  71,  72,  73,  74,  72,
+    68,  69,  70,  74,  75,  12,  67,  76,  12,  77,  71,  71,  71,  68,  12,  12,
+    78,  78,  79,  80,  80,  79,  79,  79,  79,  79,  81,  79,  81,  78,  82,  79,
+    79,  80,  80,  82,  83,  12,  12,  12,  79,  84,  79,  79,  82,  12,  78,  79,
+    85,  85,  86,  87,  87,  86,  86,  86,  86,  86,  88,  86,  88,  85,  89,  86,
+    86,  87,  87,  89,  12,  85,  12,  90,  86,  91,  86,  86,  86,  86,  12,  12,
+    92,  93,  94,  92,  95,  96,  97,  95,  98,  99,  94,  92, 100, 100,  96,  92,
+    94,  92,  95,  96,  99,  98,  12,  12,  12,  92, 100, 100, 100, 100,  94,  12,
+   101, 101, 101, 102, 102, 101, 101, 101, 101, 101, 102, 101, 101, 101, 103, 101,
+   101, 102, 102, 103,  12, 104, 105, 103, 101, 106, 101, 101,  12, 107, 101, 101,
+   108, 108, 108, 109, 109, 108, 108, 108, 108, 108, 109, 108, 108, 110, 111, 108,
+   108, 109, 109, 111,  12, 112,  12, 113, 108, 114, 108, 108, 110,  12,  12,  12,
+   115, 115, 115, 116, 116, 115, 115, 115, 115, 115, 115, 115, 115, 116, 116, 115,
+    12, 115, 115, 115, 115, 117, 115, 115, 118, 118, 119, 119, 119, 120, 121, 119,
+   119, 119, 119, 119, 122, 119, 119, 123, 119, 120, 124, 125, 119, 126, 119, 119,
+    12, 121, 119, 119, 121, 127,  12,  12, 128, 129, 129, 129, 129, 129, 129, 129,
+   129, 129, 130, 131, 129, 129, 129,  12,  12,  12,  12,  12, 132, 133, 134, 135,
+   135, 135, 135, 135, 135, 136, 135, 135, 135, 135, 135, 137, 135, 138, 135, 134,
+   135, 135, 137, 135, 139, 139, 139, 139, 139, 139, 140, 139, 139, 139, 139, 141,
+   140, 139, 139, 139, 139, 139, 139, 142, 139, 143, 144,  12, 145, 145, 145, 145,
+   146, 146, 146, 146, 146, 147,  12, 148, 146, 146, 149, 146, 150, 150, 150, 150,
+   151, 151, 151, 151, 151, 151, 152, 153, 151, 154, 152, 153, 152, 153, 151, 154,
+   152, 153, 151, 151, 151, 154, 151, 151, 151, 151, 154, 155, 151, 151, 151, 156,
+   151, 151, 153,  12, 157, 157, 157, 157, 157, 158, 157, 158, 159, 159, 159, 159,
+   160, 160, 160, 160, 160, 160, 160, 161, 162, 162, 162, 162, 162, 162, 163, 164,
+   162, 162, 165,  12, 166, 166, 166, 166, 166, 167,  12, 168, 169, 169, 169, 169,
+   169, 170,  12,  12, 171, 171, 171, 171, 171,  12,  12,  12, 172, 172, 172, 173,
+   173,  12,  12,  12, 174, 174, 174, 174, 174, 174, 174, 175, 174, 174, 175,  12,
+   176, 177, 178, 178, 178, 178, 179,  12, 178, 178, 178, 178, 178, 178, 180,  12,
+   178, 178, 181,  12, 159, 182,  12,  12, 183, 183, 183, 183, 183, 183, 183, 184,
+   183, 183, 183,  12, 185, 183, 183, 183, 186, 186, 186, 186, 186, 186, 186, 187,
+   186, 188,  12,  12, 189, 189, 189, 189, 189, 189, 189,  12, 189, 189, 190,  12,
+   189, 189, 191, 192, 193, 193, 193, 193, 193, 193, 193, 194, 195, 195, 195, 195,
+   195, 195, 195, 196, 195, 195, 195, 197, 195, 195, 198,  12, 195, 195, 195, 198,
+     7,   7,   7, 199,   7,   7,   7,  12, 200, 200, 200, 200, 200, 200, 200, 201,
+   202, 202, 202, 202, 203, 203, 203, 203, 203,  12,  12, 203, 204, 204, 204, 204,
+   204, 204, 205, 204, 204, 204, 206, 207, 208, 208, 208, 208,  19,  19, 209,  12,
+   146, 146, 210, 211, 202, 202,  12,  12, 212,   7,   7,   7, 213,   7, 214, 215,
+     0, 214, 216,  12,   2, 217, 218,   2,   2,   2,   2, 219, 220, 217, 221,   2,
+     2,   2, 222,   2,   2,   2,   2, 223,   8, 224,   8, 224,   8,   8, 225, 225,
+     8,   8,   8, 224,   8,  15,   8,   8,   8,  10,   8, 226,  10,  15,   8,  14,
+     0,   0,   0, 227,   0, 228,   0,   0, 229,   0,   0, 230,   0,   0,   0, 231,
+     2,   2,   2, 232, 233,  12,  12,  12, 234,  12,  12,  12,   0, 235, 236,   0,
+     4,   0,   0,   0,   0,   0,   0,   4,   2,   2,   5,  12,   0,   0, 233,  12,
+     0,   0, 231,  12, 237, 237, 237, 237,   0, 238,   0,   0, 239, 239, 239, 239,
+    18,  18,  18,  18,  18,  12, 240,  18, 241, 241, 241, 241, 241, 241,  12, 242,
+   243,  12,  12, 242, 151, 154,  12,  12, 151, 154, 151, 154,   0,   0,   0, 233,
+   244, 244, 244, 244, 244, 244, 245, 244, 244,  12,  12,  12, 244, 246,  12,  12,
+     0, 247,   0,   0, 248, 244, 249, 250,   0,   0, 244,   0, 251, 252, 252, 252,
+   252, 252, 252, 252, 252, 253, 254, 255, 256, 257, 257, 257, 257, 257, 257, 257,
+   257, 257, 258, 256,  12, 259, 260, 260, 260, 260, 260, 260, 261, 150, 150, 150,
+   150, 150, 150, 262,   0, 233,  12, 131, 150, 150, 150, 263, 257, 257, 257, 258,
+   257, 257,   0,   0, 264, 264, 264, 264, 264, 264, 264, 265, 264, 266,  12,  12,
+   267, 267, 267, 267, 268, 268, 268, 268, 268, 268, 268,  12, 269, 269, 269, 269,
+   269, 269,  12,  12, 236,   2,   2,   2,   2,   2, 230,   2, 270,   2,   2,   2,
+   271, 271, 271, 271, 271, 271, 271, 272, 273, 273, 273, 273, 273, 273,  12,  12,
+   274, 274, 274, 274, 274, 275,  12, 276, 274, 274, 275,  12, 277, 277, 277, 277,
+   277, 277, 277, 278, 279, 279, 279, 279, 279,  12,  12, 280, 150, 150, 150, 281,
+   282, 282, 282, 282, 282, 282, 282, 283, 282, 282, 284, 285, 145, 145, 145, 286,
+   287, 287, 287, 287, 287, 288,  12,  12, 287, 287, 287, 289, 287, 287, 289, 287,
+   290, 290, 290, 290, 291,  12,  12,  12,  12,  12, 292, 290, 293, 293, 293, 293,
+   293, 294,  12,  12, 155, 154, 155, 154, 155, 154,  12,  12,   2,   2,   3,   2,
+     2, 295, 296,  12, 293, 293, 293, 297, 293, 293, 297,  12, 150,  12,  12,  12,
+   150, 262, 298, 150, 150, 150, 150,  12, 244, 244, 244, 246, 244, 244, 246,  12,
+     2, 299,  12,  12, 300,  22,  12,  24,  25,  26,  25, 301, 302, 303,  25,  25,
+    29,  29,  29, 304,   7,   7,   7, 305, 231,   0,   0,   0,   0, 231,   0,  12,
+    29, 306,  29,  29,  29,  29,  29, 307, 308,   0,   0,   0,   0, 309, 257, 257,
+   257, 257, 257, 310, 311, 150, 311, 150, 311, 150, 311, 281,   0, 231,   0, 231,
+    12,  12, 308, 233, 312, 312, 312, 313, 312, 312, 312, 312, 312, 314, 312, 312,
+   312, 312, 314, 315, 312, 312, 312, 316, 312, 312, 314,  12, 231, 131,   0,   0,
+     0, 131,   0,   0,   8,   8,   8,  14,   0,   0,   0, 317, 318,  12,  12,  12,
+     0,   0,   0, 319, 320, 320, 320, 320, 320, 320, 320, 321, 322, 322, 322, 322,
+   323,  12,  12,  12, 214,   0,   0,   0,   0,   0,   0,  12, 324, 324, 324, 324,
+   324,  12,  12, 325, 326, 326, 326, 326, 326, 326, 327,  12, 328, 328, 328, 328,
+   328, 328, 329,  12, 330, 330, 330, 330, 330, 330, 330, 331, 332, 332, 332, 332,
+   332,  12, 332, 332, 332, 333,  12,  12, 334, 334, 334, 334, 335, 335, 335, 335,
+   336, 336, 336, 336, 336, 336, 336, 337, 336, 336, 337,  12, 338, 338, 338, 338,
+   338,  12, 338, 338, 338, 338, 338,  12, 339, 339, 339, 339, 339, 339,  12,  12,
+   340, 340, 340, 340, 340,  12,  12, 341, 342, 342, 343, 342, 343, 344, 342, 342,
+   344, 342, 342, 342, 344, 342, 344, 345, 346, 346, 346, 346, 346,  12,  12,  12,
+   347, 347, 347, 347, 347, 348,  12,  12, 347, 349,  12,  12, 347, 347,  12,  12,
+     2, 350,   2,   2, 351,   2, 299,  12, 352, 353, 354, 352, 352, 352, 352, 352,
+   352, 355, 356, 357, 358, 358, 358, 358, 358, 359, 358, 358, 360, 360, 360, 360,
+   361, 361, 361, 361, 361, 361, 361, 362,  12, 363, 361, 361, 364, 364, 364, 364,
+   365, 366, 367, 364, 368, 368, 368, 368, 368, 368, 368, 369, 370, 370, 370, 370,
+   370, 370, 371, 372, 373, 373, 373, 373, 373, 373, 374,  12, 375, 375, 375, 375,
+   376, 376, 376, 376, 376, 376,  12, 376, 377, 376, 376, 376, 378, 379,  12, 378,
+   378, 380, 380, 378, 378, 378, 378, 378, 378, 381, 382, 383, 378, 378, 384,  12,
+   385, 385, 385, 385, 386, 386, 386, 386, 387, 387, 387, 387, 387, 388, 389, 387,
+   387, 388,  12,  12, 390, 390, 390, 390, 390, 391, 392, 390, 393, 393, 393, 393,
+   393, 394, 393, 393, 395, 395, 395, 395, 396,  12, 395, 395, 397, 397, 397, 397,
+   398,  12, 399, 400,  12,  12, 399, 397, 401, 401, 401, 401, 401, 401, 402,  12,
+   403, 403, 403, 403, 404,  12,  12,  12, 404,  12, 405, 403, 406, 406, 406, 406,
+   406, 406,  12,  12, 406, 406, 407,  12, 408, 408, 408, 408, 408, 409, 410, 408,
+   408, 409,  12, 411,  29,  29,  29, 412, 413, 413, 413, 413, 413, 413, 414, 415,
+   415,  12,  12,  12, 416,  29,  12,  12,  29,  29, 417,  12,  12,  12, 416,  29,
+   418, 418, 418, 418, 418, 418,  12,  12, 419, 419, 419, 419, 419, 419, 420,  12,
+   421, 421, 421, 421, 421, 421, 422,  12, 423, 423, 423, 423, 423, 423, 423,  12,
+   424, 424, 424, 424, 424, 425,  12,  12, 426, 426, 426, 426, 426, 426, 426, 427,
+   428, 426, 426, 426, 426, 427,  12, 429, 430, 430, 430, 430, 431,  12,  12, 432,
+   433, 433, 433, 433, 433, 433, 434,  12, 433, 433, 435,  12, 436, 436, 436, 436,
+   436, 437, 436, 436, 436, 436,  12,  12, 438, 438, 438, 438, 438, 439,  12,  12,
+   440, 440, 440, 440, 118, 119, 119, 119, 119, 127,  12,  12, 441, 441, 441, 441,
+   442, 441, 441, 441, 443,  12,  12,  12, 444, 445, 446, 447, 444, 444, 444, 447,
+   444, 444, 448,  12, 449, 449, 449, 449, 449, 449, 450,  12, 449, 449, 451,  12,
+   452, 453, 452, 454, 454, 452, 452, 452, 452, 452, 455, 452, 455, 453, 456, 452,
+   452, 454, 454, 457, 458, 459,  12, 453, 452, 460, 452, 458, 452, 458,  12,  12,
+   461, 461, 462, 463, 461, 461, 461, 461, 461, 462, 461, 461, 464, 465, 466, 461,
+   461, 462, 467,  12, 468,  12,  12,  12, 469, 469, 469, 469, 469, 469, 469, 470,
+   471,  12,  12,  12, 472, 472, 472, 472, 472, 472,  12,  12, 472, 472, 473,  12,
+   474, 474, 474, 474, 474, 475, 474, 474, 474, 474, 474, 475, 476, 476, 476, 476,
+   476, 477,  12,  12, 476, 476, 478,  12, 178, 178, 178, 180, 479, 479, 479, 479,
+   479, 479, 480,  12, 145,  12,  12,  12, 481, 481, 481, 481, 481, 481, 482, 483,
+   481, 481, 481,  12, 481, 482,  12,  12, 484, 484, 484, 484, 484, 484, 484,  12,
+   485, 485, 485, 485, 486,  12,  12, 487, 488, 489, 490, 488, 488, 491, 488, 488,
+   488, 488, 488, 488, 488, 492, 493, 488, 488, 489,  12,  12, 488, 488, 494,  12,
+   495, 495, 496, 495, 495, 495, 495, 495, 495, 497,  12,  12, 498, 498, 498, 498,
+   498, 498,  12,  12, 499, 499, 499, 499, 500,  12,  12,  12, 501, 501, 501, 501,
+   501, 501, 502,  12,  53,  53, 503,  12, 440, 440,  12,  12, 504, 504, 504, 504,
+   505,  12,  12,  12, 504, 504, 505,  12, 506, 506, 507, 506, 506, 506, 506, 506,
+   506, 508, 506, 506, 506, 509,  12,  12, 506, 506, 506, 510, 511, 511, 511, 511,
+   512, 511, 511, 511, 511, 511, 513, 511, 511, 514,  12,  12, 515, 516, 517, 515,
+   515, 515, 515, 515, 515, 516, 518, 517, 515, 515,  12,  12, 515, 515, 519,  12,
+   520, 521, 522, 520, 520, 520, 520, 520, 520, 520, 520, 523, 521, 520, 524,  12,
+   520, 520, 525,  12, 526, 526, 526, 526, 526, 526, 526,  12, 526, 526, 527,  12,
+   528, 528, 528, 528, 528, 528, 529,  12, 530, 530, 530, 530, 531, 530, 530, 530,
+   530, 530, 532, 533, 530, 530, 532,  12, 534,  12,  12,  12, 100, 100, 100, 100,
+    96,  12,  12,  98, 535, 535, 535, 535, 535, 535, 536,  12, 535, 535, 535, 537,
+   535, 538,  12,  12, 535,  12,  12,  12, 539, 539, 539, 539, 540,  12,  12,  12,
+   541, 541, 541, 541, 541, 542,  12,  12, 541, 541, 543,  12, 544, 544, 544, 544,
+   544, 545,  12,  12, 546, 546, 546, 546, 546, 546, 547,  12, 269, 269, 548,  12,
+   549, 549, 549, 549, 549, 549, 549, 550, 549, 549, 551, 552, 553, 553, 553, 553,
+   553, 553, 553, 554, 553, 553, 555,  12, 556, 556, 556, 556, 556, 556, 556, 557,
+   556, 557,  12,  12, 558, 558, 558, 558, 558, 559,  12,  12, 558, 558, 560, 558,
+   560, 558, 558, 558, 558, 558,  12, 561, 562, 562, 562, 562, 562, 562, 563,  12,
+   564, 564, 564, 564, 564, 564, 565,  12, 566, 566, 566, 566, 566, 566, 567, 566,
+   566,  12,  12,  12, 568, 568, 568, 568, 568, 568, 569, 570, 568, 568,  12, 570,
+   571, 572,  12,  12, 244, 573,  12,  12, 574, 574, 574, 574, 575, 575, 575, 575,
+   575, 576,  12,  12,  12,  12,  12, 577, 574, 574, 574, 578, 578,  12,  12,  12,
+   257, 579, 257, 580, 581, 252, 252, 252, 582,  12,  12,  12, 583,  12,  12,  12,
+   253, 584,  12,  12,  12, 257,  12,  12, 585, 585, 585, 585, 585, 585, 585,  12,
+   586, 586, 586, 586, 586, 586, 587,  12, 586, 586, 586, 588, 586, 586, 588,  12,
+   586, 586, 589, 586,   0,  12,  12,  12,   0,  12, 238,   0, 317,  12,  12,  12,
+     7, 590,  12,  12,   0, 233,  12,  12,   0, 231, 308,   0,   0, 591, 227,   0,
+     0,   0, 591,   7, 212, 592,   7,   0,   0,   0, 593, 227,   8, 224,  12,  12,
+     0, 231,  12,  12,   0,   0, 317,  12,   0,   0,   0, 228, 594, 595, 308, 228,
+     0,   0, 596, 308,   0, 308,   0,   0,   0, 596, 231, 308,   0, 228,   0, 228,
+     0,   0, 596, 231,   0, 597, 238,   0, 228,   0,   0,   0,   0, 233,   0,   0,
+     0,   0,   0, 238, 598, 598, 598, 598, 598, 598, 598,  12,  12,  12, 599, 598,
+   600, 598, 598, 598,   2,   2,   2, 299,  12, 270, 299,  12, 239, 601, 239, 239,
+   239, 239, 602, 239, 603, 604, 601,  12,  19,  19,  19, 605,  12,  12,  12, 606,
+   607, 607, 607, 607, 607, 607, 607, 608, 607, 607, 607, 609, 607, 607, 609, 610,
+   611, 611, 611, 611, 611, 611, 611, 612, 613, 613, 613, 613, 613, 613, 614, 615,
+   616, 616, 616, 616, 616, 616, 617,  12, 618, 618, 618, 618, 618, 618, 619, 620,
+   621, 621, 621, 621, 621, 621, 621, 622, 621, 623,  12, 624, 151, 154, 151, 625,
+   151, 151, 151, 154, 626, 626, 626, 626, 626, 627, 626, 626, 626, 628,  12,  12,
+   629, 629, 629, 629, 629, 629, 629,  12, 629, 629, 630, 631,   0, 317,  12,  12,
+    29, 632,  29,  29, 633, 634, 632,  29, 412,  29, 635,  12, 636,  51, 635, 632,
+   633, 634, 635, 635, 633, 634, 412,  29, 412,  29, 632, 637,  29,  29, 638,  29,
+    29,  29,  29,  12, 632, 632, 638,  29,  50,  12,  12,  12,  12, 238,   0,   0,
+   639,  12,  12,  12,   0,   0, 317,   0,   0,   0,  12,  12,   0,   0, 231, 238,
+     0, 231, 317, 308,   0,   0,   0, 640,   0,   0, 231, 131, 641,  12,  12,  12,
+   244, 244, 573,  12, 642,  12,  12,  12,   0,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0, 939, 940, 941, 942, 946, 948,   0, 962,
    969, 970, 971, 976,1001,1002,1003,1008,   0,1033,1040,1041,1042,1043,1047,   0,
      0,1080,1081,1082,1086,1110,   0,   0,1124,1125,1126,1127,1131,1133,   0,1147,
@@ -5831,8 +4348,7 @@ _hb_ucd_u16[5080] =
     96, 929, 802, 804, 806,  97,  98, 807, 930,  99, 931, 932, 933, 814, 100, 816,
    817, 818, 819, 820, 821, 935,   0,   0,
 };
-static const int16_t
-_hb_ucd_i16[92] =
+static const int16_t _hb_ucd_i16[92]=
 {
       0,    0,    1,   -1,    2,    0,   -2,    0,    0,    2,    0,   -2,    0,   16,    0,  -16,
       0,    1,   -1,    0,    3,    3,    3,   -3,   -3,   -3,    0, 2016,    0, 2527, 1923, 1914,
@@ -5842,40 +4358,1271 @@ _hb_ucd_i16[92] =
       0,-2016,-2104,    0,    0,-2106,-2108,-2106,-2250,    0,-2527,    0,
 };
 
-static inline uint_fast8_t
-_hb_ucd_gc (unsigned u)
+static inline uint8_t _hb_ucd_gc (unsigned u)
 {
-  return u<1114112u?_hb_ucd_u8[5208+(((_hb_ucd_u8[1168+(((_hb_ucd_u16[((_hb_ucd_u8[544+(((_hb_ucd_u8[u>>1>>3>>3>>4])<<4)+((u>>1>>3>>3)&15u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
+  return u<1114110 ? _hb_ucd_u8[6560u+((_hb_ucd_u8[816u+((_hb_ucd_u16[((_hb_ucd_u8[272u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>4))>>4)])<<4)+((((((((u)>>1))>>3))>>4))&15)])<<4)+((((((u)>>1))>>3))&15)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : 2;
 }
-static inline uint_fast8_t
-_hb_ucd_ccc (unsigned u)
+static inline uint8_t _hb_ucd_ccc (unsigned u)
 {
-  return u<125259u?_hb_ucd_u8[7206+(((_hb_ucd_u8[6638+(((_hb_ucd_u8[6162+(((_hb_ucd_u8[5802+(((_hb_ucd_u8[5556+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
+  return u<125259 ? _hb_ucd_u8[8620u+((_hb_ucd_u8[8036u+((_hb_ucd_u8[7556u+((_hb_ucd_u8[7188u+((_hb_ucd_u8[6942u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 0;
 }
-static inline unsigned
-_hb_ucd_b4 (const uint8_t* a, unsigned i)
+static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>1]>>((i&1u)<<2))&15u;
+  return (a[i>>1]>>((i&1)<<2))&15;
 }
-static inline int_fast16_t
-_hb_ucd_bmg (unsigned u)
+static inline int16_t _hb_ucd_bmg (unsigned u)
 {
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[8098+(((_hb_ucd_u8[7866+(((_hb_ucd_u8[7770+(((_hb_ucd_b4(7706+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
+  return u<65380 ? _hb_ucd_i16[((_hb_ucd_u8[9516u+((_hb_ucd_u8[9284u+((_hb_ucd_u8[9188u+((_hb_ucd_b4(_hb_ucd_u8+9124u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)])<<3)+((((((u)>>1))>>2))&7)])<<2)+((((u)>>1))&3)])<<1)+((u)&1)] : 0;
 }
-static inline uint_fast8_t
-_hb_ucd_sc (unsigned u)
+static inline uint8_t _hb_ucd_sc (unsigned u)
 {
-  return u<918016u?_hb_ucd_u8[11464+(((_hb_ucd_u8[10472+(((_hb_ucd_u8[9452+(((_hb_ucd_u8[8764+(((_hb_ucd_u8[8460+(((_hb_ucd_u8[8346+(u>>2>>2>>2>>3>>4)])<<4)+((u>>2>>2>>2>>3)&15u))])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:2;
+  return u<918000 ? _hb_ucd_u8[10950u+((_hb_ucd_u16[4648u+((_hb_ucd_u16[2608u+((_hb_ucd_u8[10214u+((_hb_ucd_u8[9764u+((((((((u)>>2))>>2))>>3))>>4)])<<4)+((((((((u)>>2))>>2))>>3))&15)])<<3)+((((((u)>>2))>>2))&7)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 2;
 }
-static inline uint_fast16_t
-_hb_ucd_dm (unsigned u)
+static inline uint16_t _hb_ucd_dm (unsigned u)
 {
-  return u<195102u?_hb_ucd_u16[1656+(((_hb_ucd_u8[12834+(((_hb_ucd_u8[12452+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+  return u<195102 ? _hb_ucd_u16[7480u+((_hb_ucd_u8[13904u+((_hb_ucd_u8[13522u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)] : 0;
 }
 
+
+#else
+
+#include <stdint.h>
+
+static const uint8_t _hb_ucd_u8[13937]=
+{
+    0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  9, 10,  7,  7,  7,  7,  7, 11, 12, 12, 12, 13,
+   14, 15, 16, 17, 18, 19, 20,  7, 21, 22, 22, 22, 23, 24,  7,  7,
+    7, 25, 22, 22, 22, 26, 27, 28, 22, 29, 30, 31, 32, 33, 34, 35,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 21, 22, 36,
+    7,  7,  7,  7,  7,  7, 37, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   38, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 34, 34, 34, 35, 36, 37, 34, 34, 34, 38, 39, 40, 41,
+   42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+   58, 59, 60, 61, 62, 62, 63, 64, 65, 66, 67, 68, 69, 67, 70, 71,
+   67, 67, 62, 72, 62, 62, 73, 67, 74, 75, 76, 77, 78, 67, 67, 67,
+   79, 80, 34, 81, 82, 83, 67, 67, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 84, 34, 34, 34, 34,
+   85, 34, 34, 34, 34, 34, 34, 34, 34, 86, 34, 34, 87, 88, 89, 90,
+   91, 92, 93, 94, 95, 96, 97, 98, 34, 34, 34, 34, 34, 34, 34, 34,
+   99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+  100,100, 34, 34, 34, 34,101,102, 34, 34,103,104,105,106,107,108,
+   34, 34,109,110,111,112,113,114,115,116,117,118, 34, 34, 34,119,
+  120,121,122,123,124,125,126,127, 34,128,129,130,131,132,133,134,
+  135,136,137,138,139,140,141,142,143,144,111,145,146,147,148,111,
+  149,150,151,152,153,154,155,156,157,158,159,160,111,161,162,163,
+   34, 34, 34, 34, 34, 34, 34, 34,164, 34, 34,111,111,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,165,
+   34, 34, 34, 34, 34, 34, 34, 34,166, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
+  111,111,167,111,111,111,111,111,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34,168,169,170, 34,111,111,171,111,172,173,174,175,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,119,
+   34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,
+  111,111,111,111,111,111,111,111, 34,176,111,111,111,111,111,111,
+  111,111,111,111,111,111,111,111, 67,177, 67, 67, 67,178,179, 67,
+   67, 67,180,181,182,131, 65,111,183,184,185,186,187,188,189,190,
+   67, 67, 67, 67,191,192,111,111,111,111,111,111,111,111,193,111,
+  194,195,196,111,111,197,111,111,111,198,111,199,111,200,111, 34,
+   34,201,202,111,111,111,111,111,131,203,204,111, 34,205,111,111,
+   67, 67,206, 67, 67,111, 67,207, 67, 67, 67, 67, 67, 67, 67, 67,
+   67,208, 67, 67, 67, 67, 67,177,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,
+  209,111,195,195,111,111,111,111,111,111,111,111,111,111,111,111,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
+    7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 17, 18, 19,  1, 20, 20, 21, 22, 23, 24, 25,
+   26, 27, 15,  2, 28, 29, 27, 30, 11, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 31, 11, 11, 11, 32, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 33, 16, 16, 16, 16, 32, 32, 32, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 34, 34, 34, 34, 34, 34, 34, 34, 16, 32, 32, 32,
+   32, 32, 32, 32, 11, 34, 34, 16, 34, 32, 32, 11, 34, 11, 16, 11,
+   11, 34, 32, 11, 32, 16, 11, 34, 32, 32, 32, 11, 34, 16, 32, 11,
+   34, 11, 34, 34, 32, 35, 32, 16, 36, 36, 37, 34, 38, 37, 34, 34,
+   34, 34, 34, 34, 34, 34, 16, 32, 34, 38, 32, 11, 32, 32, 32, 32,
+   32, 32, 16, 16, 16, 11, 34, 32, 34, 34, 11, 32, 32, 32, 32, 32,
+   16, 16, 36, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40,
+   39, 39, 41, 40, 40, 40, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40,
+   42, 42, 42, 42, 42, 42, 42, 42, 32, 32, 41, 32, 16, 43, 16, 10,
+   40, 40, 40, 44, 11, 11, 11, 11, 34, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 34,
+   16, 11, 32, 16, 32, 32, 32, 32, 16, 16, 32, 45, 34, 32, 34, 11,
+   32, 46, 42, 42, 47, 32, 32, 32, 11, 34, 34, 34, 34, 34, 34, 16,
+   11, 11, 11, 11, 48,  2,  2,  2, 16, 16, 16, 16, 49, 50, 51, 52,
+   53, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 54,
+   55, 56, 42, 55, 42, 42, 42, 42, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 57,  2,  2,  2,  2,  2,  2, 58, 58, 58,  8,  9, 59,  2, 60,
+   42, 42, 42, 42, 42, 56, 61,  2, 62, 36, 36, 36, 36, 63, 42, 42,
+    7,  7,  7,  7,  7,  2,  2, 36, 64, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 65, 42, 42, 42, 66, 46, 42, 42, 67, 68, 69, 42, 42, 36,
+    7,  7,  7,  7,  7, 36, 70, 71,  2,  2,  2,  2,  2,  2,  2, 72,
+   63, 36, 36, 36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 64, 36,
+   36, 36, 36, 42, 42, 42, 42, 42,  7,  7,  7,  7,  7, 36, 36, 36,
+   36, 36, 36, 36, 36, 63, 42, 42, 42, 42, 39, 21,  2, 39, 68, 20,
+   36, 36, 36, 42, 42, 68, 42, 42, 42, 42, 68, 42, 68, 42, 42, 42,
+    2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 36, 36, 63, 42, 42,  2,
+   36, 36, 36, 36, 73, 36, 36, 36, 58, 58, 58, 74, 42, 42, 42, 42,
+   36, 36, 36, 36, 75, 42, 42, 42, 42, 74, 42, 42, 42, 42, 42, 42,
+   42, 76, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 76, 64, 77,
+   78, 42, 42, 42, 76, 77, 78, 77, 63, 42, 42, 42, 36, 36, 36, 36,
+   36, 42,  2,  7,  7,  7,  7,  7, 79, 36, 36, 36, 36, 36, 36, 36,
+   63, 77, 80, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 77,
+   78, 42, 42, 76, 77, 77, 78, 36, 36, 36, 36, 81, 77, 77, 36, 36,
+   36, 42, 42,  7,  7,  7,  7,  7, 36, 20, 27, 27, 27, 52, 57, 42,
+   42, 76, 80, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 42, 77,
+   78, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 64, 36, 36, 36,
+   36, 36, 36,  7,  7,  7,  7,  7, 42, 36, 63,  2,  2,  2,  2,  2,
+   78, 42, 42, 42, 76, 77, 78, 42, 59, 20, 20, 20, 82, 42, 42, 42,
+   42, 77, 80, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 78,
+   78, 42, 42, 76, 77, 77, 78, 42, 42, 42, 42, 76, 77, 77, 36, 36,
+   71, 27, 27, 27, 27, 27, 27, 27, 42, 64, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36, 77, 76, 77, 77, 77, 77, 77, 78, 42,
+   36, 36, 36, 81, 77, 77, 77, 77, 77, 77, 77,  7,  7,  7,  7,  7,
+   27, 83, 60, 60, 52, 60, 60, 60, 76, 77, 64, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 64, 42, 76, 77, 77, 42, 42, 42, 42, 42,
+   42, 42, 42, 42, 36, 36, 36, 36,  7,  7,  7, 84, 27, 27, 27, 83,
+   63, 77, 65, 36, 36, 36, 36, 36, 77, 77, 77, 76, 77, 77, 42, 42,
+   42, 42, 76, 77, 77, 77, 36, 36, 85, 81, 77, 77, 77, 77, 77, 77,
+   42, 77, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 63, 64, 77,
+   78, 42, 42, 77, 77, 77, 78, 70, 60, 60, 36, 81, 27, 27, 27, 86,
+   27, 27, 27, 27, 83, 36, 36, 36, 36, 36, 36, 36, 36, 42, 42, 76,
+   77, 42, 42, 42, 77, 77, 77, 77,  7, 77,  2,  2,  2,  2,  2,  2,
+   63, 36, 42, 42, 42, 42, 42, 87, 36, 36, 36, 68, 42, 42, 42, 56,
+    7,  7,  7,  7,  7,  2,  2,  2, 63, 36, 42, 42, 42, 42, 64, 36,
+   36, 36, 36, 39, 42, 42, 42, 42,  7,  7,  7,  7,  7,  7, 36, 36,
+   70, 60,  2,  2,  2,  2,  2,  2,  2, 88, 88, 60, 42, 60, 60, 60,
+    7,  7,  7,  7,  7, 27, 27, 27, 27, 27, 46, 46, 46,  4,  4, 77,
+   63, 42, 42, 42, 42, 42, 42, 76, 42, 42, 56, 42, 36, 36, 63, 42,
+   42, 42, 42, 42, 42, 42, 42, 60, 60, 60, 60, 69, 60, 60, 60, 60,
+    2,  2, 88, 60, 21,  2,  2,  2, 36, 36, 36, 36, 36, 81, 78, 42,
+   76, 42, 42, 42, 78, 76, 78, 64, 36, 36, 36, 77, 42, 36, 36, 42,
+   64, 77, 80, 81, 77, 77, 77, 36, 63, 42, 64, 36, 36, 36, 36, 36,
+   36, 76, 78, 76, 77, 77, 78, 81,  7,  7,  7,  7,  7, 77, 78, 60,
+   16, 16, 16, 16, 16, 49, 43, 16, 36, 36, 36, 36, 36, 36, 63, 42,
+    2,  2,  2,  2, 89, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+   60, 60, 60, 60, 60, 60, 60, 60, 11, 11, 11, 11, 16, 16, 16, 16,
+   90, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 70, 65,
+   91, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 92, 93, 93,
+   36, 36, 36, 36, 36, 57,  2, 94, 95, 36, 36, 36, 36, 36, 36, 36,
+   36, 42, 76, 77, 77, 77, 77, 80, 36, 42, 96,  2,  2,  2,  2,  2,
+   36, 42, 42, 42, 42, 42, 42, 42, 36, 36, 42, 78, 42, 42, 42, 77,
+   77, 77, 77, 76, 78, 42, 42, 42, 42, 42,  2, 79,  2, 59, 63, 42,
+    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2, 97,  2, 55, 42, 74,
+   36, 75, 36, 36, 36, 36, 36, 36, 36, 36, 63, 64, 36, 36, 36, 36,
+   36, 36, 36, 36, 63, 36, 36, 36, 42, 76, 77, 78, 76, 77, 77, 77,
+   77, 76, 77, 77, 78, 42, 42, 42, 60, 60,  2,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7, 27, 27, 60, 36, 36, 36, 63, 76, 78, 42,  2,
+   36, 36, 81, 76, 42, 42, 42, 42, 76, 76, 78, 42, 42, 42, 76, 77,
+   77, 78, 42, 42, 42, 42, 42, 42,  2,  2,  2, 79,  2,  2,  2,  2,
+   42, 42, 42, 42, 42, 42, 42, 98, 42, 42, 80, 36, 36, 36, 36, 36,
+   36, 36, 76, 42, 42, 76, 76, 77, 77, 76, 80, 36, 36, 36, 36,  2,
+   88, 60, 60, 60, 60, 46, 42, 42, 42, 42, 60, 60, 60, 60, 21,  2,
+   42, 80, 36, 36, 36, 36, 36, 36, 81, 42, 42, 77, 42, 78, 42, 36,
+   36, 36, 36, 76, 42, 77, 78, 78, 42, 77, 77, 77, 77, 77,  2,  2,
+   36, 36, 77, 77, 77, 77, 42, 42, 42, 42, 77, 42, 42, 56,  2,  2,
+    7,  7,  7,  7,  7,  7, 85, 36, 36, 36, 36, 36, 39, 39, 39,  2,
+   16, 16, 16, 16, 34, 16, 16, 16, 42, 56, 42, 42, 42, 42, 42, 42,
+   76, 42, 42, 42, 64, 36, 63, 36, 36, 36, 64, 81, 42, 36, 36, 36,
+   16, 16, 16, 16, 16, 16, 39, 39, 39, 39, 39, 39, 39, 43, 16, 16,
+   16, 16, 16, 16, 43, 16, 16, 16, 16, 16, 16, 16, 16, 99, 39, 39,
+   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
+   16, 16, 16, 16, 34, 11, 11, 11, 16, 16, 16, 16,100,100,100,100,
+   16, 16, 16, 16, 11, 11,101,102, 40, 16, 16, 16, 11, 11,101, 40,
+   16, 16, 16, 16, 11, 11,103, 40,104,104,104,104,104,105, 58, 58,
+   50, 50, 50,  2,106,107,106,107,  2,  2,  2,  2,108, 58, 58,109,
+    2,  2,  2,  2,110,111,  2,112,113,  2,114,115,  2,  2,  2,  2,
+    2,  9,113,  2,  2,  2,  2,116, 58, 58, 58, 58, 58, 58, 58, 58,
+  117, 39, 27, 27, 27,  8,114,118, 27, 27, 27, 27, 27,  8,114, 93,
+   20, 20, 20, 20, 20, 20, 20, 20, 42, 42, 42, 42, 42, 42,119, 47,
+   98, 47, 98, 42, 42, 42, 42, 42, 60,120, 60,121, 60, 34, 11, 16,
+   11, 32,121, 60, 45, 11, 11, 60, 60, 60,120,120,120, 11, 11,122,
+   11, 11, 35, 36,123, 60, 16, 11,  8,  8, 45, 16, 16, 26, 60,124,
+   94, 94, 94, 94, 94, 94, 94, 94, 94,125,126, 94,127, 60, 60, 60,
+    8,  8,128, 60, 60,  8, 60, 60,128, 26, 60,128, 60, 60, 60,128,
+   60, 60, 60, 60, 60, 60, 60,  8, 60,128,128, 60, 60, 60, 60, 60,
+   60, 60,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+   60, 60, 60, 60,  4,  4, 60, 60,  8, 60, 60, 60,129,130, 60, 60,
+   60, 60, 60, 60, 60, 60,128, 60, 60, 60, 60, 60, 60, 26,  8,  8,
+    8,  8, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,  8,  8,
+    8, 60, 60, 60, 60, 60, 60, 60, 27, 27, 27, 27, 27, 27, 60, 60,
+   60, 60, 60, 60, 60, 27, 27, 27, 60, 60, 60, 26, 60, 60, 60, 60,
+   26, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,  8,  8,  8,  8,
+   60, 60, 60, 60, 60, 60, 60, 26, 60, 60, 60, 60,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 60, 60, 60, 60, 60, 60,
+    8,  8,114,131,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,114,132,132,132,132,132,132,132,132,132,132,131,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,128, 26,  8,  8,128, 60, 32, 11, 32, 34, 34, 34, 34, 11,
+   32, 32, 34, 16, 16, 16, 39, 11, 32, 32,124, 60, 60,121, 34,133,
+   42, 32, 16, 16, 49,  2, 89,  2, 36, 36, 36, 36, 36, 36, 36, 75,
+    2,  2,  2,  2,  2,  2,  2, 55,  2,106,106,  2,110,111,106,  2,
+    2,  2,  2,  6,  2, 97,106,  2,106,  4,  4,  4,  4,  2,  2, 79,
+    2,  2,  2,  2,  2, 50,  2,  2, 97,134,  2,  2,  2,  2,  2,  2,
+   60,  2,135,132,132,132,136, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+    1,  2,137,138,  4,  4,  4,  4,  4, 60,  4,  4,  4,  4,139, 93,
+  140, 94, 94, 94, 94, 42, 42, 77,141, 39, 39, 60, 94,142, 57, 60,
+   71, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 63,143,144, 62,
+   36, 36, 36, 36, 36, 57, 39, 62, 60, 27, 27, 60, 60, 60, 60, 60,
+   27, 27, 27, 27, 27, 60, 60, 60, 60, 60, 60, 60, 27, 27, 27, 27,
+  145, 27, 27, 27, 27, 27, 27, 27, 36, 36, 75, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36,146,  2, 32, 32, 32, 32, 32, 32, 32, 63,
+   47,147, 42, 42, 42, 42, 42, 79, 32, 32, 32, 32, 32, 32, 39, 42,
+   36, 36, 36, 94, 94, 94, 94, 94, 42,  2,  2,  2,  2,  2,  2,  2,
+   40, 40, 40,144, 39, 39, 39, 39, 40, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 43, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 41,148, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
+   32, 32, 11, 11, 34, 34, 32, 32, 32, 32, 32, 32, 32, 32, 11, 11,
+   48, 39,149, 35, 39, 35, 36, 36, 36, 64, 36, 64, 36, 63, 36, 36,
+   36, 81, 78, 76, 60, 60, 42, 42, 27, 27, 27, 60,150, 60, 60, 60,
+   36, 36,  2,  2,  2,  2,  2,  2, 77, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 77, 77, 77, 77, 77, 77, 77, 77, 42, 42, 42, 42, 42,  2,
+   42, 36, 36, 36,  2, 65, 65, 63, 36, 36, 36, 42, 42, 42, 42,  2,
+   36, 36, 36, 63, 42, 42, 42, 42, 42, 77, 77, 77, 77, 77, 77, 96,
+   36, 63, 77, 42, 42, 77, 42, 77, 96,  2,  2,  2,  2,  2,  2, 79,
+    7,  7,  7,  7,  7,  7,  7,  2, 36, 36, 63, 62, 36, 36, 36, 36,
+   36, 36, 36, 36, 63, 42, 42, 76, 78, 76, 78, 42, 42, 42, 42, 42,
+   36, 63, 36, 36, 36, 36, 76, 77,  7,  7,  7,  7,  7,  7,  2,  2,
+   62, 36, 36, 70, 60, 81, 76, 36, 64, 42, 64, 63, 64, 36, 36, 42,
+   36, 36, 36, 36, 36, 36, 75,  2, 36, 36, 36, 36, 36, 81, 42, 77,
+    2, 75,151, 42, 42, 42, 42, 42, 16, 16, 16, 16, 16,102, 39, 39,
+   16, 16, 16, 16, 99, 40, 40, 40, 36, 81, 78, 77, 76, 96, 78, 42,
+  152,152,152,152,152,152,152,152,153,153,153,153,153,153,153,153,
+   16, 16, 16, 16, 16, 16, 35, 64, 36, 36, 36, 36,154, 36, 36, 36,
+   36, 40, 40, 40, 40, 40, 40, 40, 40, 22, 60, 60, 60, 60, 60, 60,
+   60, 71, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,132,
+   60, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 60, 60, 60, 60,
+   36, 36, 36, 36, 36, 36,150, 60,  2,  2,  2,135,115,  2,  2,  2,
+    6,155,156,132,132,132,132,132,132,132,115,135,115,  2,112,157,
+    2,  2,  2,  2,139,132,132,115,  2,158,  8,  8, 59,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 36,159,  2,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,114,115,  4,  2, 36, 36, 36, 36, 36,
+   62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 39,
+   20,160, 52, 20, 26,  8,128, 60, 60, 60, 60, 60,161, 58, 60, 60,
+    2,  2,  2, 89, 27, 27, 27, 27, 27, 27, 27, 83, 60, 60, 60, 60,
+   94, 94,127, 27, 83, 60, 60, 60, 60, 60, 60, 60, 60, 27, 60, 60,
+   60, 60, 60, 60, 60, 60, 46, 42,162,162,162,162,162,162,162,162,
+  163, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 86, 36,
+  138, 36, 36, 36, 36, 94, 94, 94, 36, 36, 36, 36, 36, 36, 36, 57,
+  164, 94, 94, 94, 94, 94, 94, 94, 11, 11, 11, 32, 16, 16, 16, 16,
+   36, 36, 36, 57, 27, 27, 27, 27, 36, 36, 36, 70,145, 27, 27, 27,
+   36, 36, 36,165, 27, 27, 27, 27, 36, 36, 36, 36, 36,165, 27, 27,
+   36, 36, 36, 27, 27, 27, 27, 30, 36, 36, 36, 36, 36, 36, 27, 36,
+   63, 42, 42, 42, 42, 42, 42, 42, 36, 36, 36, 36, 42, 42, 42, 42,
+   36, 36, 36, 36, 36, 36,165, 30, 36, 36, 36, 36, 36, 36,165, 27,
+   36, 36, 36, 36, 71, 36, 36, 36, 36, 36, 63, 42, 42,163, 27, 27,
+   36, 36, 36, 36, 57,  2,  2,  2, 36, 36, 36, 36, 27, 27, 27, 27,
+   16, 16, 16, 16, 16, 27, 27, 27, 36, 36, 42, 42, 42, 42, 42, 42,
+    7,  7,  7,  7,  7, 36, 36, 62, 11, 11, 11, 11,166, 42, 42,141,
+   16, 16, 16, 16, 16, 16, 16,  8, 36, 36, 36, 36, 36, 63,167, 50,
+   88, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 42, 42, 42,
+   27, 27, 27, 86, 36, 36, 36, 36,163, 27, 30,  2,  2,  2,  2,  2,
+   36, 42, 42,  2,  2,  2,  2,  2, 36, 36,165, 27, 27, 27, 27, 27,
+   78, 80, 36, 36, 36, 36, 36, 36, 42, 42, 42, 56,  2,  2,  2,  2,
+    2, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,  7,  7,  7,  7,  7,
+   64, 63, 64, 36, 36, 36, 36, 63, 77, 78, 42, 76, 78, 56, 72,  2,
+    2, 42, 42, 42, 42, 42, 66, 58, 36, 36, 36, 63, 42, 42, 78, 42,
+   42, 42, 42,  7,  7,  7,  7,  7,  2,  2, 81, 80, 36, 36, 36, 36,
+   36, 63,  2, 36, 36, 36, 36, 36, 36, 81, 77, 42, 42, 42, 42, 76,
+   80, 36, 57,  2, 55, 42, 56, 78,  7,  7,  7,  7,  7, 57, 57,  2,
+   89, 27, 27, 27, 27, 27, 27, 27, 36, 36, 36, 36, 36, 36, 77, 78,
+   42, 77, 76, 42,  2,  2,  2, 64, 36, 36, 36, 36, 36, 36, 36, 63,
+   76, 77, 77, 77, 77, 77, 77, 77, 36, 36, 36, 81, 77, 77, 80, 36,
+   36, 77, 77, 42, 42, 42, 42, 42, 36, 36, 36, 36, 77, 78, 42, 42,
+   42, 77, 77, 77, 77, 77, 77, 76, 64, 64,  2,  2,  2,  2,  2,  2,
+   55, 42, 42, 42, 42, 42, 42, 42, 36, 36, 81, 77, 42, 42, 42, 42,
+   77, 42, 76, 64, 36, 57,  2,  2,  7,  7,  7,  7,  7,  2,  2, 64,
+   77, 78, 42, 42, 76, 76, 77, 78, 76, 42, 36, 65, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36, 81, 77, 42, 42, 42, 77, 77, 42, 78,
+   56,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 42, 42,
+   77, 78, 42, 42, 42, 76, 78, 78, 56,  2, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 63, 78, 77, 42, 42, 42, 78, 57,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 63, 78, 77, 42, 42, 78, 42, 42, 42, 42,
+    7,  7,  7,  7,  7, 27,  2, 88, 42, 42, 42, 42, 78, 56,  2,  2,
+   27, 27, 27, 27, 27, 27, 27, 86, 77, 77, 77, 77, 77, 78, 76, 64,
+   80, 78,  2,  2,  2,  2,  2,  2, 81, 77, 42, 42, 42, 42, 77, 77,
+   64, 65, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+   63, 42, 42, 42, 42, 64, 36, 36, 36, 63, 42, 42, 76, 63, 42, 56,
+    2,  2,  2, 55, 42, 42, 42, 42, 63, 42, 42, 76, 78, 42, 36, 36,
+   36, 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, 76, 42,  2, 65,  2,
+   76, 42, 76, 76, 77, 77, 77, 77, 57,  2,  2,  2,  2,  2,  2,  2,
+   42, 42, 42, 42, 42, 42, 42, 78,  2, 36, 36, 36, 36, 36, 36, 36,
+   42, 42, 42, 42, 76, 42, 42, 42, 76, 42, 78, 42, 42, 42, 42, 42,
+   42, 42, 42, 63, 42, 42, 42, 42, 36, 36, 36, 36, 36, 77, 77, 77,
+   42, 76, 78, 78, 36, 36, 36, 36, 36, 36, 36, 36, 75, 36, 36, 36,
+   36, 63, 76, 96,  2,  2,  2,  2, 42, 81, 36, 36, 36, 36, 36, 36,
+   36, 36, 77, 42, 42, 42, 42, 77, 76, 56,  2,  2,  2,  2,  2,  2,
+    7,  7,  7,  7,  7, 42, 42, 42, 27, 27, 83, 60, 60, 60, 52, 20,
+  150, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 21,
+   64, 36, 36, 63, 42, 42, 42, 42, 36, 36, 36, 36, 36, 36, 36, 42,
+   42, 42, 42, 42, 42, 77, 78, 42, 42, 42, 56,  2,  2,  2,  2,  2,
+   42, 42, 42, 56,  2,  2, 60, 60, 39, 39, 88, 60, 60, 60, 60, 60,
+    7,  7,  7,  7,  7,168, 27, 27, 27, 86, 36, 36, 36, 36, 36, 36,
+   39, 62, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 75,146,  2,
+   27, 27, 27, 30,  2,  2,  2,  2, 11, 11, 11, 11, 11, 32, 16, 16,
+   81, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 78,
+   42, 67, 39, 39, 39, 39, 39, 39, 39, 79, 42, 42, 42, 42, 42, 42,
+   77, 39, 94, 94, 94, 94, 94, 94, 36, 36, 36, 36, 36, 36, 46, 56,
+    7,  7,  7,  7,  7, 60, 60, 60, 60, 60,169, 78, 42, 60,169, 77,
+   77,170, 58, 58, 58, 74, 42, 42, 42, 69, 46, 42, 42, 42, 60, 60,
+   60, 60, 60, 60, 60, 42, 42, 60, 60, 42, 69, 60, 60, 60, 60, 60,
+   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 16,  7,
+   42, 42, 42, 69, 60, 46, 42, 42, 42, 42, 42, 42, 42, 42, 69, 60,
+   60, 60, 46, 60, 60, 60, 60, 60, 60, 60, 69, 21,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 55, 42, 42, 16, 16, 16, 16, 16,123, 16, 16,
+   42, 42, 42, 67, 39, 39, 39, 39,  7,  7,  7,  7,  7,  7,  7, 70,
+   36, 36, 36, 36, 36, 36, 42, 42,  7,  7,  7,  7,  7,  7,  7,171,
+   36, 36, 36, 36, 36, 75, 42, 42,172,  7,  7,  7,  7,  7,  7, 84,
+   36, 63, 36, 64, 36, 36, 36, 42, 36, 36, 63, 42, 42, 42, 42, 75,
+   16, 16, 42, 42, 42, 67, 39, 39, 27, 27, 27, 27, 27, 27,145, 27,
+  173, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,145,
+   27, 27, 27, 27, 27, 27, 83, 60, 60, 60, 60, 60, 60, 25, 40, 40,
+    0,  0, 29, 21, 21, 21, 23, 21, 22, 18, 21, 25, 21, 17, 13, 13,
+   25, 25, 25, 21, 21,  9,  9,  9,  9, 22, 21, 18, 24, 16, 24,  5,
+    5,  5,  5, 22, 25, 18, 25,  0, 23, 23, 26, 21, 24, 26,  7, 20,
+   25,  1, 26, 24, 26, 25, 15, 15, 24, 15,  7, 19, 15, 21,  9, 25,
+    9,  5,  5, 25,  5,  9,  5,  7,  7,  7,  9,  8,  8,  5,  6,  6,
+   24, 24,  6, 24, 12, 12,  6,  5,  9, 21, 25,  9, 26, 12, 11, 11,
+    9,  6,  5, 21, 17, 17, 17, 26, 26, 23, 23, 12, 17, 12, 21, 12,
+   12, 21,  7, 21,  1,  1, 21, 23, 26, 26,  1, 21,  6,  7,  7, 12,
+   12,  7, 21,  7, 12,  1, 12,  6,  6, 12, 12, 26,  7, 26, 26,  7,
+   21,  1, 24,  7,  1, 12,  7,  6, 12, 10, 10, 10, 10, 12, 21,  6,
+   10,  7,  7, 10, 23,  7, 15, 26, 13, 21, 13,  7, 15,  7, 12, 23,
+   21, 26, 21, 15, 17,  7, 29,  7,  7, 22, 18, 18, 14, 14, 14,  7,
+   10, 21, 17, 21, 11, 12,  5,  6,  8,  8,  8, 24,  5, 24,  9, 24,
+   29, 29, 29,  1, 20, 19, 22, 20, 27, 28,  1, 29, 21, 20, 19, 21,
+   21, 16, 16, 21, 25, 22, 18, 21, 21, 29, 15,  6, 18,  6, 12, 11,
+    9, 26, 26,  9, 26,  5,  7,  5,  5, 26, 14,  9,  5, 14, 14, 15,
+   25, 26, 26, 22, 18, 26, 18, 25, 18, 22,  5, 12, 22, 21, 21, 22,
+   18, 17, 26,  6,  7, 14, 17, 22, 26, 14, 17,  6, 14,  6, 12, 24,
+   24,  6, 26, 15,  6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,
+    4,  4,  3,  3,  7, 25, 17, 16, 16, 22, 16, 16, 25, 17,  7,  1,
+   25, 24, 26,  1,  2,  2, 12, 15, 21, 14,  7, 15,  9, 12, 12, 17,
+   13, 15, 26, 10, 10,  1, 13, 23,  7, 13, 23, 15,  0,  1,  2,  3,
+    4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0, 14,  0,  0,  0,
+    0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17,
+   18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21, 22, 23,  0,  0,
+    0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 35,  0,  0,  0,
+    0, 36,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42, 43, 44,
+   45,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
+    0,  0,  0,  0,  3,  0,  0,  0,  4,  5,  6,  7,  0,  8,  9, 10,
+    0, 11, 12, 13, 14, 15, 16, 17, 16, 18, 16, 19, 16, 19, 16, 19,
+    0, 19, 16, 20, 16, 19, 21, 19,  0, 22, 23, 24, 25, 26, 27, 28,
+   29, 30, 31,  0, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 33,
+    0,  0,  0,  0,  0,  0, 34,  0,  0, 35,  0,  0, 36,  0, 37,  0,
+    0,  0, 38, 39, 40, 41, 42, 43, 44, 45, 46,  0,  0, 47,  0,  0,
+    0, 48,  0,  0,  0, 49,  0,  0,  0,  0,  0,  0,  0, 50,  0, 51,
+    0, 52, 53,  0, 54,  0,  0,  0,  0,  0,  0, 55, 56, 57,  0,  0,
+    0,  0, 58,  0,  0, 59, 60, 61, 62, 63,  0,  0, 64, 65,  0,  0,
+    0, 66,  0,  0,  0,  0, 67,  0,  0,  0, 68,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  0,  0,  0, 70,  0, 71,
+    0,  0, 72,  0,  0, 73,  0,  0,  0,  0,  0,  0,  0,  0, 74, 75,
+    0,  0,  0,  0, 76, 77,  0, 78, 79,  0,  0, 80, 81,  0, 82, 62,
+    0, 83, 84,  0,  0, 85, 86, 87,  0, 88,  0, 89,  0, 90,  0,  0,
+   51, 91, 51,  0, 92,  0, 93,  0,  0,  0, 81,  0,  0,  0, 94, 95,
+    0, 96, 97, 98, 99,  0,  0,  0,  0,  0, 51,  0,  0,  0,  0,100,
+  101,  0,  0,  0,  0,  0,  0,102,  0,  0,  0,  0,  0,  0,103,  0,
+    0,  0,  0,  0,  0,104,105,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,106,  0,  0,107,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,108,
+  109,  0,  0,110,  0,  0,  0,  0,  0,  0,111,  0,112,  0,105,  0,
+    0,  0,  0,  0,113,114,  0,  0,  0,  0,  0,  0,  0,115,  0,  0,
+    0,116,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,118,  0,119,
+    0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,  8,  0,
+    0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0, 14, 15,
+    0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,  0,  0,
+   22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0, 28, 29,
+   30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35, 33,  0,
+    0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,  0,  0,
+    0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0, 43,
+    0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,  0,  0,
+    0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,  0, 53,
+    0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,  0,  0,
+   57, 58,  0,  0,  0, 59, 60, 61, 62,  0,  0,  0,  0, 63, 52,  0,
+   64, 65,  0,  0, 66,  0,  0,  0, 67, 68,  0,  0,  0, 69,  0, 70,
+   71, 72, 73, 74,  1, 75,  0, 76, 77, 78,  0,  0, 79, 80,  0,  0,
+    0, 81,  0,  0,  1,  1,  0,  0, 82,  0,  0, 83,  0,  0,  0,  0,
+   79, 84,  0, 85,  0,  0,  0,  0,  0, 80, 86,  0, 87,  0, 52,  0,
+    1, 80,  0,  0, 88,  0,  0, 89,  0,  0,  0,  0,  0, 90, 57,  0,
+    0,  0,  0,  0,  0, 91, 92,  0,  0, 86,  0,  0, 33,  0,  0, 93,
+    0,  0,  0,  0, 94,  0,  0,  0,  0, 49,  0,  0, 95,  0,  0,  0,
+    0, 96, 97,  0,  0, 98,  0,  0, 99,  0,  0,  0,100,  0,  0,  0,
+  101,  0,  0,  0,102,  0,  0,  0,  0,103,104, 95,  0,  0,105,  0,
+    0,  0, 86,  0,  0,106,  0,  0,  0,107,108,  0,  0,109,110,  0,
+    0,  0,  0,  0,  0,111,  0,  0,112,  0,  0,  0,  0,113, 33,  0,
+  114,115,116, 57,  0,  0,117, 35,  0,  0,118,  0,  0,  0,119,  0,
+    0,  0,  0,  0,  0,120,  0,  0,121,  0,  0,  0,  0,122, 90,  0,
+    0,  0,  0,  0, 57,  0,  0,  0,  0, 52,123,  0,  0,  0,  0,124,
+    0,  0,125,  0,  0,  0,  0,123,  0,  0,126,  0,  0,  0,  0,  0,
+   81,  0,  0,  0,  0,127,  0,  0,  0,128,  0,  0,  0,129,  0,130,
+    0,  0,  0,  0,131,132,133,  0,134,  0,135,  0,  0,  0,136,137,
+  138,  0, 79,  0,  0,  0,  0,  0, 35,  0,  0,  0,139,  0,  0,  0,
+  140,  0,  0,  0,141,  0,  0,  0,142,143,  0,144,  0,  0,145,  0,
+    0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,
+    7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,
+    1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26,
+   27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,
+    1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,
+    0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,
+    0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19,
+   52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21,
+   35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,
+    0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0,
+   64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0,
+   68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,
+    0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,
+    0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0,
+   83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52,
+   15, 86, 36, 10, 21,  1,  1,  1,  1, 41,  1, 21, 87,  0,  0, 55,
+    0,  0,  0,  0, 19, 10,  1,  0,  0,  0,  0,  0, 88,  0,  0, 89,
+    0,  0, 88,  0,  0,  0,  0, 78,  0,  0, 90,  9, 12,  4, 91,  8,
+   92, 47,  0, 58, 50,  0, 21,  1, 21, 93, 94,  1,  1,  1,  1, 95,
+   96, 97, 98,  1, 99, 58, 81,100,101,  4, 58,  0,  0,  0,  0,  0,
+    0, 19, 50,  0,  0,  0,  0,  0,  0, 61,  0,  0,102,103,  0,  0,
+  104,  0,  0,  1,  1, 50,  0,  0,  0, 38,  0, 63,  0,  0,  0,  0,
+    0, 62,  0,  0,105, 68, 61,  0,  0,  0, 78,  0,  0,  0,106,107,
+   58, 38, 81,  0,  0,  0,  0,  0,  0,108,  1, 14,  4, 12, 84,  0,
+    0,  0,  0, 38, 90,  0,  0,  0,  0,109,  0,  0,110, 61,  0,111,
+    0,  0,  0,  1,  0,  0,  0,  0, 49, 50,  0,  0, 19, 58,  0,  0,
+  112, 51,  0,112, 14, 52,113, 41,  0,  0, 62,  0,  0, 61,  0,  0,
+  114,  0, 90,  0,  0,  0, 61, 62,  0,  0, 62,  0, 89,  0,  0,114,
+    0,  0,  0,  0,115,  0,  0,  0, 78, 55,  0, 38,  1, 58,  1, 58,
+    0,  0,  0,  0,  0, 88, 63, 89,  0,  0,116,  0,  0,  0, 55,  0,
+    0,  0,  0,116,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,  0, 61,
+    0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,  8, 92,
+    0,  0,  1, 90,  0,  0,117,  0,  0,  0,  0,  0,  0,118,  0,119,
+  120,121,122,  0,105,  4,123, 49, 23,  0,  0,  0, 38, 50, 38, 58,
+    0,  0,  1, 90,  1,  1,  1,  1, 39,  1, 48,106, 90,  0,  0,  0,
+    0,  1,  0,  0,  0,124,  0,  0,  0,113, 19, 59,  0, 38,  0, 81,
+    0,  0,  4,123,  0,  0,  0,  1,125,  0,  0,  0,  0,  0,230,230,
+  230,230,230,232,220,220,220,220,232,216,220,220,220,220,220,202,
+  202,220,220,220,220,202,202,220,220,220,  1,  1,  1,  1,  1,220,
+  220,220,220,230,230,230,230,240,230,220,220,220,230,230,230,220,
+  220,  0,230,230,230,220,220,220,220,230,232,220,220,230,233,234,
+  234,233,234,234,233,230,  0,  0,  0,230,  0,220,230,230,230,230,
+  220,230,230,230,222,220,230,230,220,220,230,222,228,230, 10, 11,
+   12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24,
+   25,  0,230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29,
+   30, 31, 32, 33, 34,230,230,220,220,230,220,230,230,220, 35,  0,
+    0,  0,  0,  0,230,230,230,  0,  0,230,230,  0,220,230,230,220,
+    0,  0,  0, 36,  0,  0,230,220,230,230,220,220,230,220,220,230,
+  220,230,220,230,230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,
+  230,230,230,230,  0,  0,  0,220,220,220,230,220,220,220,230,230,
+    0,220, 27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,
+  220,230,230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,
+    0,  9,  9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,
+  107,107,118,118,  9,  0,122,122,122,122,220,220,  0,  0,  0,220,
+    0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,
+  130,130,130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,
+  220,  0,  0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,
+    0,  0,  0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,
+    0,220,230,220,  0,220,230,230,230,234,  0,  0,  9,  9,  0,  0,
+    7,  0,230,230,230,  0,230,  0,  1,  1,  1,  0,  0,  0,230,234,
+  214,220,202,230,230,230,230,230,232,228,228,220,218,230,233,220,
+  230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,220,230,
+    1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,  0,  0,
+    0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,  0,220,
+    0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,  0,  0,
+  230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,  6,  6,
+    0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,  0,226,
+  216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,230,230,
+    7,  0, 16, 17, 17, 33, 17, 49, 17, 17, 84, 97,135,145, 26, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17,177,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  4,  3,  3,  3,  3,  3,  5,  3,  3,  3,
+    3,  3,  6,  7,  8,  3,  3,  3,  3,  3,  9, 10, 11, 12, 13,  3,
+    3,  3,  3,  3,  3,  3,  3, 14,  3, 15,  3,  3,  3,  3,  3,  3,
+   16, 17, 18, 19, 20, 21,  3,  3,  3, 22, 23, 24,  3,  3,  3,  3,
+    3,  3, 25,  3,  3,  3,  3,  3,  3,  3,  3, 26,  3,  3, 27, 28,
+    0,  1,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,
+    0,  3,  0,  0,  0,  0,  0,  4,  0,  5,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  7,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,  0,  0,
+    0,  9,  0,  9,  0,  0,  0,  0,  0,  0,  0, 10, 11, 12, 13,  0,
+    0, 14, 15, 16,  6,  0, 17, 18, 19, 19, 19, 20, 21, 22, 23, 24,
+   19, 25,  0, 26, 27, 19, 19, 28, 29, 30,  0, 31,  0,  0,  0,  8,
+    0,  0,  0,  0,  0,  0,  0, 19, 28,  0, 32, 33,  9, 34, 35, 19,
+    0,  0, 36, 37, 38, 39, 40, 19,  0, 41, 42, 43, 44, 31,  0,  1,
+   45, 42,  0,  0,  0,  0,  0, 32, 14, 14,  0,  0,  0,  0, 14,  0,
+    0, 46, 47, 47, 47, 47, 48, 49, 47, 47, 47, 47, 50, 51, 52, 53,
+   43, 21,  0,  0,  0,  0,  0,  0,  0, 54,  6, 55,  0, 14, 19,  1,
+    0,  0,  0,  0, 56, 57,  0,  0,  0,  0,  0, 19, 58, 31,  0,  0,
+    0,  0,  0,  0,  0, 59, 14,  0,  0,  0,  0,  1,  0,  2,  0,  0,
+    0,  3,  0,  0,  0, 60, 61,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+    0,  0,  0,  0,  2,  3,  0,  4,  5,  0,  0,  6,  0,  0,  0,  7,
+    0,  0,  0,  1,  1,  0,  0,  8,  9,  0,  8,  9,  0,  0,  0,  0,
+    8,  9, 10, 11, 12,  0,  0,  0, 13,  0,  0,  0,  0, 14, 15, 16,
+   17,  0,  0,  0,  1,  0,  0, 18, 19,  0,  0,  0, 20,  0,  0,  0,
+    1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,  8, 21,  9,
+    0,  0, 22,  0,  0,  0,  0,  1,  0, 23, 24, 25,  0,  0, 26,  0,
+    0,  0,  8, 21, 27,  0,  1,  0,  0,  1,  1,  1,  1,  0,  1, 28,
+   29, 30,  0, 31, 32, 20,  1,  1,  0,  0,  0,  8, 21,  9,  1,  4,
+    5,  0,  0,  0, 33,  9,  0,  1,  1,  1,  0,  8, 21, 21, 21, 21,
+   34,  1, 35, 21, 21, 21,  9, 36,  0,  0, 37, 38,  1,  0, 39,  0,
+    0,  0,  1,  0,  1,  0,  0,  0,  0,  8, 21,  9,  1,  0,  0,  0,
+   40,  0,  8, 21, 21, 21, 21, 21, 21, 21, 21,  9,  0,  1,  1,  1,
+    1,  8, 21, 21, 21,  9,  0,  0,  0, 41,  0, 42, 43,  0,  0,  0,
+    1, 44,  0,  0,  0, 45,  8,  9,  1,  0,  0,  0,  8, 21, 21, 21,
+    9,  0,  1,  0,  1,  1,  8, 21, 21,  9,  0,  4,  5,  8,  9,  1,
+    0,  0, 16, 50, 84,118,136,152,186,187,187,187,187,187,187,187,
+  187,187,187,187,187,187,187,187,187,187,187,187,187,187, 12,  0,
+    1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 13, 13, 13,
+   13, 13, 14, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 15, 16, 17, 18, 18, 18, 18, 18, 18,
+   18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 21, 22,
+   23, 24, 25, 26, 27, 28, 29, 30, 31, 19, 32, 33, 33, 33, 33, 33,
+   34, 19, 19, 19, 19, 19, 19, 35, 19, 36, 37, 38, 38, 38, 38, 38,
+   38, 39, 40, 19, 19, 19, 19, 19, 19, 19, 41, 42, 19, 19, 43, 19,
+   19, 19, 44, 45,  9, 46, 47, 48, 49, 50, 51, 52,  9,  9, 19, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 53, 19, 19, 53, 19, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 54, 19, 19, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 55,
+    0,  0,  1,  0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,
+    1,  2,  2,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+   15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+   31, 32, 32, 33, 33, 33, 34, 35, 35, 35, 35, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,  2,  2, 51, 51, 52,
+   53, 54, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 57,
+   57, 56, 56, 56, 56, 56, 56, 58, 59, 60, 61, 56, 62, 62, 63, 64,
+   65, 66, 67, 68, 69, 70, 56, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+   62, 62, 71, 62, 62, 62, 62, 72, 72, 72, 72, 72, 72, 72, 72, 72,
+   73, 74, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 32,
+   32, 32, 32, 32, 32, 32, 32, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+   87, 62, 62, 62, 62, 88, 89, 89, 89, 90, 89, 91, 92, 93, 94, 95,
+   95, 96, 97, 87, 98, 99,100,101,102,103,104,105,105,105,  2,106,
+  107,108,109,110,111,112,113,114,115,116,117, 89,118,119,120,121,
+  122,123,124,125,126,127,128,129,130, 87,131,132,133,134, 87,135,
+  136,137,138,139,140,141,142,143,144,145,146, 87,147,148,149,150,
+  150,150,150,150,150,150,150,150,150,150, 87, 87, 87, 87, 87, 87,
+   87, 87, 87, 87, 87, 87,151,152,152,152,152,152,152,152,152,153,
+  153,153,153,153, 87, 87, 87, 87, 87,154, 87, 87, 87, 87, 87,155,
+  155,155,155,156,157,158,158, 87, 87,159, 87,160,161,162,163,164,
+  164,164,164,164,164,164,164,164,164,164,164,164,164,165,165,165,
+  165,164,164, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,166,167,
+  168,169,170,170,170, 87, 87,171,172, 87, 87, 87, 87, 87, 87, 56,
+   56, 56, 56, 56, 56,173, 56, 56, 56,174,175, 51, 56, 56, 87,176,
+  176,176,176,176,176, 87, 87, 87, 87, 87, 87, 87, 87,  2, 87,177,
+    6,178, 87, 87,179, 87, 87, 87,180, 87,181, 87,182, 87, 33,183,
+  183,184, 87, 87, 87, 87, 87, 56, 56, 56, 87, 89, 89, 87, 87, 56,
+   56, 56, 56,185, 87, 56, 56, 62, 62, 62, 62, 62, 87, 87, 87, 62,
+   87, 87, 87, 87, 87, 87, 87, 56, 87,186,186,  0,  1,  2,  2,  0,
+    0,  0,  0,  1,  2,  1,  2,  0,  0,  3,  3,  4,  5,  4,  5,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  6,  0,  0,  7,  0,  8,
+    8,  8,  8,  8,  8,  8,  9, 10, 11, 11, 11, 11, 11, 12, 11, 13,
+   13, 13, 13, 13, 13, 13, 13, 14, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 15, 16, 16, 16, 16, 16, 17, 18, 18, 18, 18, 18, 18, 19,
+   20, 21, 21, 22, 23, 21, 24, 21, 21, 21, 21, 21, 25, 21, 21, 26,
+   26, 26, 26, 26, 21, 21, 21, 27, 27, 27, 27, 28, 28, 28, 28, 29,
+   29, 29, 29, 30, 30, 26, 21, 21, 21, 21, 21, 21, 21, 31, 21, 32,
+   32, 32, 32, 32, 33, 34, 32, 35, 35, 35, 35, 35, 35, 35, 35, 36,
+   36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 38,
+   38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39, 40,
+   40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, 41, 42,
+   42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43, 43, 43, 43, 44,
+   44, 44, 45, 44, 44, 44, 44, 46, 46, 46, 46, 46, 46, 46, 46, 47,
+   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 47, 47, 49,
+   49, 49, 49, 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, 50, 51, 52,
+   52, 52, 52, 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+   53, 54, 54, 54, 54, 54, 54, 55, 55, 55, 55, 55, 55, 55, 55, 56,
+   56, 57, 57, 57, 57, 58, 57, 59, 59, 60, 61, 62, 62, 63, 63, 64,
+   64, 64, 64, 64, 64, 64, 64, 65, 66, 66, 66, 66, 66, 66, 66, 66,
+   66, 66, 55, 55, 55, 55, 55, 67, 67, 67, 67, 67, 68, 68, 68, 69,
+   69, 69, 69, 69, 69, 64, 64, 70, 70, 71, 71, 71, 71, 71, 71, 71,
+   71, 71,  8,  8,  8,  8,  8, 72, 72, 72, 72, 72, 72, 72, 72, 73,
+   73, 73, 73, 74, 74, 74, 74, 75, 75, 75, 75, 75, 76, 76, 76, 13,
+   50, 50, 50, 73, 77, 78, 79,  4,  4, 80,  4,  4, 81, 82, 83,  4,
+    4,  4, 84,  8,  8,  8,  8, 11, 11, 11, 11, 11, 11, 11, 11, 85,
+    0,  0,  0,  0,  0,  0, 86,  0,  4,  0,  0,  0,  8,  8,  8,  0,
+    0, 87, 88, 89,  0,  4,  4,  6,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 90, 90, 90, 90, 90, 90, 90, 90, 91,
+   91, 91, 91, 91, 91,  4,  4, 92, 92, 92, 92, 92, 92, 92, 92, 50,
+   50, 50, 93, 93, 93, 93, 93, 53, 53, 53, 53, 53, 53, 13, 13, 94,
+   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,  0, 95,
+    0, 96, 97, 98, 99, 99, 99, 99,100,101,102,102,102,102,103,104,
+  104,104,105, 52, 52, 52, 52, 52,  0,104,104,  0,  0,  0,102, 52,
+   52,  0,  0,  0,  0, 52,106,  0,  0,  0,  0,  0,102,102,107,102,
+  102,102,102,102,108,  0,  0, 94, 94, 94, 94,  0,  0,  0,  0,109,
+  109,109,109,109,109,109,109,109,109,109,109,109,110,110,110,111,
+  111,111,111,111,111,111,111,111,111,111,111, 13, 13, 13, 13, 13,
+   13,112,112,112,112,112,112,  0,  0,113,  4,  4,  4,  4,  4,114,
+    4,  4,  4,  4,  4,  4,  4,115,115,115,  0,116,116,116,116,117,
+  117,117,117,117,117, 32, 32,118,118,119,120,120,120, 52, 52,121,
+  121,121,121,122,121, 49, 49,123,123,123,123,123,123, 49, 49,124,
+  124,124,124,124,124,125,125, 53, 53, 53,  4,  4,126,127, 54, 54,
+   54, 54, 54,125,125,125,125,128,128,128,128,128,128,128,128,  4,
+  129, 18, 18, 18, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+   21, 21,130, 21, 21, 21, 21,  8,  0,131,  0,  0,  0,  0, 21, 21,
+   21, 21, 21, 21, 21, 21,132,  0,  0,  1,  2,  1,  2,133,101,102,
+  134, 52, 52, 52, 52,  0,  0,135,135,135,135,135,135,135,135,  0,
+    0,  0,  0, 11, 11, 11, 11, 11,  0, 11, 11, 11,  0,  0,136,137,
+  137,138,138,138,138,139,  0,140,140,140,141,141,142,142,142,143,
+  143,144,144,144,144,144,144,145,145,145,145,145,146,146,146,147,
+  147,147,148,148,148,148,148,149,149,149,150,150,150,150,151,151,
+  151,151,151,152,152,152,152,153,153,153,153,153,153,153,153,154,
+  154,154,154,155,155,156,156,157,157,157,157,157,157,158,158,159,
+  159,160,160,161,161,161,161,162,162,163,163,163,163,163,163,164,
+  164,164,164,164,164,165,165,166,166,166,166,167,167,167,167,168,
+  168,168,168,169,169,170,170,171,171,171,171,171,171,171,171,172,
+  172,172,172,172,172,172,172,173,173,173,173,173,173,173,173,174,
+  174,174,174,175,175,175,175,175,175,175,175,175,175,175,175,176,
+  176,176,176,177, 21, 21, 21,178,178,178,179,179,179,179,180,180,
+  180,180,181,181,181,182,182,183,183,183,183,183,183,183,183,184,
+  184,184,184,184,185,185,185,186,186,186,186,186,187,187,187,188,
+  188,188,188,188,188,189, 43,190,190,190,190,190,190,190,190,191,
+  191,191,192,192,192,192,192,193,193,193,194,193,193,193,193,195,
+  195,195,195,195,195,195,195,196,196,196,196,196,196,196,196,197,
+  197,197,197,197,197,197,197,198,198,198,198,198,198,198,198,199,
+  199,199,199,199,199, 66, 66,200,200,200,200,200, 49, 49, 49,201,
+  201,201,201,201,201,201,201,202,202,202,202,202,202,202,202,203,
+  203,203,203,203,203,203,203,204,204,204,204,204,204,204,204,205,
+  205,205,205,205,205,205,205,206,206,206,206,206,207,207,207,207,
+  207,207, 55,208,208,208,208, 32, 32, 32, 32, 32, 32,188,188,209,
+  209,209,209,209,209,209,209,210,210,210,210,210,210,210,211,211,
+  211,211,211,211,211,211,211,212,212,212,212,212,212,213,213,213,
+  213,213,214,214,214,214,214,215,215,215,215,215,215,215,215,216,
+  216,216,216,216,216,216,216,110,110,110,110, 39, 39, 39, 39,217,
+  217,217,217,217,217,217,217,218,218,218,218,218,218,218,218,219,
+  219,219,219,219,219,219,219,220,220,220,220,220,220,220,220,221,
+  221,221,221,221,221,221,221,112,112,112,112,112,112,112,112,112,
+  112,112,112,222,222,222,223,223,223,223,223,223,224,224,224,225,
+  225,225,225,225,225,225,225,226,226,226,226,226,226,226,226,227,
+  227,227,227,227,227,227,227,227,227,228,228,228,228,228,228,229,
+  229,229,229,229,229,229,229,229,229,229,229,229,229,230, 94,231,
+  231,231,231,231,231,231,231,232,232,232,232,232,232,232,232,102,
+  102,102,102,102,102,102,102,233, 99, 99, 99, 99, 99, 99, 99, 99,
+   99, 99, 99, 99, 99, 99, 99, 99, 99,102,234, 99,235,102,236,236,
+  236,236,236,236,236,236,236,237,237,237,237,237,237,237,237,237,
+  237,  0,  0,  0,  0,  0,  0,  8,  8,  8,  8,  8,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,238,239,240,  0,241,  0,  0,  0,  0,  0,242,
+  242,242,242,242,242,242,242, 91, 91, 91, 13, 13, 13, 13, 13,243,
+  243,243,243,243,243,243,243,244,244,244,244,245,245,245,245,246,
+  246,246,246,246,246,246,246,247,247,247,247,247,247,247,247,248,
+  248,248,248,248,248,248,248,249,249,249,249,249,249,249,249,250,
+  250,250,250,250,250,250,250,251,  0,  0,  0,  0,  0,  0,  0,  8,
+    8,  8,  8,  8,  8,  8,  8,  0,  0,  0,  0,  1,  2,  2,  2,  2,
+    2,  3,  0,  0,  0,  4,  0,  2,  2,  2,  2,  2,  3,  2,  2,  2,
+    2,  5,  0,  2,  5,  6,  0,  7,  7,  7,  7,  8,  9,  8, 10,  8,
+   11,  8,  8,  8,  8,  8,  8, 12, 13, 13, 13, 14, 14, 14, 14, 14,
+   15, 14, 14, 16, 17, 17, 17, 17, 17, 17, 17, 18, 19, 19, 19, 19,
+   19, 19, 19, 20, 21, 20, 22, 20, 20, 23, 23, 20, 20, 20, 20, 22,
+   20, 24,  7,  7, 25, 20, 20, 26, 20, 20, 20, 20, 20, 20, 21, 27,
+   27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31,
+   31, 31, 31, 32, 20, 20, 20, 33, 33, 33, 33, 34, 35, 33, 33, 33,
+   36, 33, 33, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 39, 39, 40,
+   40, 40, 40, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 43, 44,
+   44, 44, 44, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 47, 48,
+   48, 48, 48, 49, 49, 49, 49, 49, 50, 51, 49, 52, 52, 52, 52, 53,
+   53, 53, 53, 53, 53, 54, 53, 55, 55, 55, 55, 56, 56, 56, 56, 57,
+   57, 57, 57, 58, 58, 58, 58, 59, 59, 59, 59, 60, 60, 60, 60, 60,
+   60, 61, 62, 63, 63, 63, 63, 64, 64, 64, 64, 64, 65,  0,  0, 66,
+   66, 66, 66, 67, 67, 67, 67, 68, 68, 68, 68, 69, 70, 71, 71, 71,
+   71, 71, 71, 72, 72, 72, 72, 73, 73, 73, 73, 74, 74, 74, 74, 75,
+   75, 75, 75, 76, 76, 76, 76, 77, 77, 77, 77, 78, 78, 78, 78, 79,
+   79, 79, 79, 80, 80, 80, 80, 81, 81, 81, 81, 82,  7,  7,  7, 83,
+    7, 84, 85,  0, 84, 86,  0,  2, 87, 88,  2,  2,  2,  2, 89, 90,
+   87, 91,  2,  2,  2, 92,  2,  2,  2,  2, 93,  0,  0,  0, 86,  1,
+    0,  0, 94,  0, 95, 96,  0,  4,  0,  0,  0,  0,  0,  0,  4, 97,
+   97, 97, 97, 98, 98, 98, 98, 13, 13, 13, 13, 99, 99, 99, 99,100,
+  100,100,100,  0,101,  0,  0,102,100,103,104,  0,  0,100,  0,105,
+  106,106,106,106,106,106,106,106,106,107,105,108,109,109,109,109,
+  109,109,109,109,109,110,108,111,111,111,111,112, 55, 55, 55, 55,
+   55, 55,113,109,109,109,110,109,109,  0,  0,114,114,114,114,115,
+  115,115,115,116,116,116,116,117,117,117,117, 96,  2,  2,  2,  2,
+    2, 94,  2,118,118,118,118,119,119,119,119,120,120,120,120,121,
+  121,121,121,121,121,121,122,123,123,123,123,124,124,124,124,124,
+  124,124,125,126,126,126,126,127,127,127,127,128,128,128,128,  2,
+    2,  3,  2,  2,129,130,  0,131,131,131,131,132, 17, 17, 18, 20,
+   20, 20,133,  7,  7,  7,134, 20, 20, 20, 23,  0,135,109,109,109,
+  109,109,136,137,137,137,137,  0,  0,  0,138,139,139,139,139,140,
+  140,140,140, 84,  0,  0,  0,141,141,141,141,142,142,142,142,143,
+  143,143,143,144,144,144,144,145,145,145,145,146,146,146,146,147,
+  147,147,147,148,148,148,148,149,149,149,149,150,150,150,150,151,
+  151,151,151,152,152,152,152,153,153,153,153,154,154,154,154,155,
+  155,155,155,156,156,156,156,157,157,157,157,158,158,158,158,159,
+  159,159,159,160,160,160,160,161,161,161,161,162,162,162,162,163,
+  163,163,163,164,164,164,164,165,165,165,165,166,166,166,166,167,
+  167,167,167,168,168,168,168,169,169,169,169,170,170,170,170,171,
+  171,171,171,172,172,172,172,173,173,173,173,174,174,174,174,175,
+  175,175,175,176,176,176,176,177,177,177,177,178, 20, 20, 20,179,
+  179,179,179,180,180,180,180,181,181,181,181,182,182,182,182,183,
+  183,183,183,184,184,184,184,185,185,185,185,186,186,186,186,187,
+  187,187,187,188,188,188,188,189,189,189,189,190, 45, 45, 45,191,
+  191,191,191,192,192,192,192,193,193,193,193,194,194,194,194,194,
+  194,195,194,196,196,196,196,197,197,197,197,198,198,198,198,199,
+  199,199,199,200,200,200,200,201,201,201,201,202,202,202,202,203,
+  203,203,203,204,204,204,204,205,205,205,205,206,206,206,206,207,
+  207,207,207,208,208,208,208,209,209,209,209,210,210,210,210,211,
+  211,211,211,212,212,212,212,213,213,213,213,214,214,214,214,215,
+  215,215,215,216,216,216,216,217,217,217,217,218,218,218,218,219,
+  219,219,219,220,220,220,220,221,221,221,221,222,222,222,222,223,
+  223,223,223,224,224,224,224,225,225,225,225,226,226,226,226,227,
+  227,227,227,228,228,228,228,229,229,229,229,230,230,230,230,231,
+  232,232,232,233,233,233,233,232,232,232,232,234,106,106,106,235,
+  106,106,106,106,236,109,109,237,237,237,237,238,238,238,238,  0,
+  239, 86,  0,  0,  0,239,  7, 82,138,  7,  0,  0,  0,240, 86,241,
+  241,241,241,242,242,242,242,243,243,243,243,244,244,244,244,245,
+  245,245,245,246,246,246,246,247,247,247,247,248,248,248,248,249,
+  249,249,249,250,  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19,
+   19, 19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,  0,
+    0, 26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  9,
+    9,  0,  9,  9,  0,  9,  0,  9,  9, 55, 55, 55, 55, 55, 55,  6,
+    6,  6,  6,  6,  1,  1,  6,  6,  4,  4,  4,  4,  4,  4,  4,  4,
+   14, 14, 14, 14, 14, 14, 14,  3,  3,  3,  3,  3,  0,  3,  3,  0,
+    3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,  3,  3,  1,
+    3,  3,  3, 37, 37, 37, 37, 38, 38, 38, 38, 64, 64, 64, 64, 90,
+   90, 90, 90, 95, 95, 95, 95,  3,  3,  0,  3,  7,  7,  7,  7,  7,
+    1,  1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5, 11,
+   11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 22, 22, 22, 22, 23,
+   23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36, 24,
+   24, 24, 24, 24, 24, 24,  0, 18, 18, 18, 18, 25, 25, 25, 25, 25,
+    0,  0,  0,  0, 25, 25, 25, 33, 33, 33, 33,  8,  8,  8,  8,  8,
+    8,  8,  0, 12, 12, 12, 12, 30, 30, 30, 30, 29, 29, 29, 29, 28,
+   28, 28, 28, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,  0,  0,
+    0, 35, 35, 45, 45, 45, 45, 44, 44, 44, 44, 44,  0,  0,  0, 43,
+   43, 43, 43, 46, 46, 46, 46, 31, 31, 31, 31, 32, 32,  0,  0, 32,
+    0, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 52, 52, 52, 52, 58,
+   58, 58, 58, 54, 54, 54, 54, 91, 91, 91, 91, 62, 62, 62, 62, 76,
+   76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70, 73, 73, 73, 73,  1,
+    1,  1,  0,  1,  0,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,  1,
+    1,  0,  0, 19, 19,  9,  9,  9,  9,  9,  6, 19,  9,  9,  9,  9,
+    9, 19, 19,  9,  9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,  0,
+    0,  0, 19,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27, 56,
+   56, 56, 56, 61, 61, 61, 61, 13, 13, 13, 13,  0, 13,  0, 13,  0,
+   13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,  0, 15, 15, 15, 15,
+   15, 15, 15, 15,  1,  1,  0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17,  0, 26, 26, 26, 26, 26, 12, 12, 12, 12, 12, 12,  0, 39,
+   39, 39, 39, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79, 60,
+   60, 60, 60, 65, 65, 65, 65, 75, 75, 75, 75, 69, 69, 69, 69, 69,
+   69,  0, 69, 74, 74, 74, 74, 84, 84, 84, 84, 84, 84, 84,  0, 68,
+   68, 68, 68, 92, 92, 92, 92, 87, 87, 87, 87, 19,  9, 19, 19, 19,
+   19,  0,  0,  2,  2,  2,  2, 19, 19, 19,  4,  3,  3,  0,  0,  1,
+    1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0, 49, 49, 49, 49,  0,
+    1,  1,  1, 71, 71, 71, 71, 67, 67, 67, 67, 42, 42, 42, 42, 41,
+   41, 41, 41,118,118,118,118, 53, 53, 53, 53, 59, 59, 59, 59, 40,
+   40, 40, 40, 51, 51, 51, 51, 50, 50, 50, 50,135,135,135,135,106,
+  106,106,106,104,104,104,104,161,161,161,161,170,170,170,170,110,
+  110,110,110, 47, 47, 47, 47, 81, 81, 81, 81,120,120,120,120,116,
+  116,116,116,128,128,128,128, 66, 66, 66, 66, 72, 72, 72, 72,173,
+  173,173,173, 98, 98, 98, 98, 97, 97, 97, 97, 57, 57, 57, 57, 88,
+   88, 88, 88,117,117,117,117,112,112,112,112, 78, 78, 78, 78, 83,
+   83, 83, 83, 82, 82, 82, 82,122,122,122,122, 89, 89, 89, 89,130,
+  130,130,130,144,144,144,144,165,165,165,165,156,156,156,156,156,
+  156,  3,  3,147,147,147,147,148,148,148,148,158,158,158,158,153,
+  153,153,153,149,149,149,149, 94, 94, 94, 94, 85, 85, 85, 85,101,
+  101,101,101, 96, 96, 96, 96,111,111,111,111,100,100,100,100,100,
+   36, 36, 36,108,108,108,108,129,129,129,129,109,109,109,109,107,
+  107,107,107,107,107,107,  1,171,171,171,171,137,137,137,137,124,
+  124,124,124,123,123,123,123,114,114,114,114,102,102,102,102,126,
+  126,126,126,142,142,142,142,125,125,125,125,154,154,154,154,150,
+  150,150,150,141,141,141,141,140,140,140,140,121,121,121,121,169,
+  169,169,169,133,133,133,133,134,134,134,134,138,138,138,138,143,
+  143,143,143,175,175,175,175,145,145,145,145,163,163,163,163, 63,
+   63, 63, 63,157,157,157,157, 80, 80, 80, 80,127,127,127,127,166,
+  166,166,166,115,115,115,115,159,159,159,159,103,103,103,103,119,
+  119,119,119,167,167,167,167,146,146,146,146,172,172,172,172, 99,
+   99, 99, 99,136,139, 13, 13,155,155,155,155,136,136,136,136, 17,
+   15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17,139,139,139,139,105,
+  105,105,105,  0,  0,  0,  1,  0,  0,  1,  1,131,131,131,131,151,
+  151,151,151,160,160,160,160,152,152,152,152,164,164,164,164,168,
+  168,168,168,174,174,174,174,113,113,113,113,132,132,132,132, 15,
+    0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9,
+   10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16,
+   17,  9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20, 21,  9, 22,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 26,
+   27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
+    4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17,
+   18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,
+    0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38,
+   39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,
+    0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,
+    0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,
+    0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,
+    0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+   86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,
+  102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,  0,
+    0,108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,115,
+    0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,  0,
+  127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,
+  143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,  0,
+    0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,  0,163,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,  0,  0,  0,
+    0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,170,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,179,  0,  0,
+    0,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,
+  195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,
+  211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
+    4,
+};
+static const uint16_t _hb_ucd_u16[5104]=
+{
+     0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
+    13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
+    13,  13,  13,  24,  25,  11,  11,  11,  11,  26,  11,  27,  28,  29,  30,  31,
+    32,  32,  32,  32,  32,  32,  32,  33,  34,  35,  36,  11,  37,  38,  13,  39,
+     9,   9,   9,  11,  11,  11,  13,  13,  40,  13,  13,  13,  41,  13,  13,  13,
+    13,  13,  13,  35,   9,  42,  11,  11,  43,  44,  32,  45,  46,  47,  47,  48,
+    49,  50,  47,  47,  51,  32,  52,  53,  47,  47,  47,  47,  47,  54,  55,  56,
+    57,  58,  47,  32,  59,  47,  47,  47,  47,  47,  60,  53,  61,  47,  62,  63,
+    47,  64,  65,  66,  47,  67,  47,  47,  68,  69,  47,  47,  70,  32,  71,  32,
+    72,  47,  47,  73,  74,  75,  76,  77,  78,  47,  47,  79,  80,  81,  82,  83,
+    84,  47,  47,  85,  86,  87,  88,  89,  84,  47,  47,  79,  90,  47,  82,  91,
+    92,  47,  47,  93,  94,  95,  82,  96,  97,  47,  47,  98,  99, 100, 101, 102,
+   103,  47,  47, 104, 105, 106,  82, 107, 108,  47,  47,  93, 109, 110,  82, 111,
+   112,  47,  47, 113, 114, 115,  82, 116,  92,  47,  47,  47, 117, 118, 101, 119,
+    47,  47,  47, 120, 121, 122,  66,  66,  47,  47,  47, 123, 124, 125,  47,  47,
+   126, 127, 128, 129,  47,  47,  47, 130, 131,  32,  32, 132, 133, 134,  66,  66,
+    47,  47, 135, 136, 122, 137, 138, 139, 140, 141,   9,   9,   9,  11,  11, 142,
+    47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47,  47, 143, 144, 145,
+    47, 146,   9,   9,   9,   9,   9, 147, 148,  47,  47,  47,  47,  47,  47,  47,
+    47,  47,  47,  47,  47,  47, 149,  47, 150, 151,  47,  47,  47,  47, 152, 153,
+    47, 154,  47, 155,  47, 156,  47, 156,  47,  47,  47, 157, 158, 159, 160, 145,
+   161, 160,  47,  47, 162,  47,  47,  47, 163,  47, 164,  47,  47,  47,  47,  47,
+    47,  47, 165, 166, 167,  47,  47,  47,  47,  47,  47,  47,  47, 168, 146, 146,
+    47, 169,  47,  47,  47, 170, 171, 172, 160, 160, 173, 174,  32,  32,  32,  32,
+   175,  47,  47, 176, 177, 122, 178, 179, 180,  47, 181,  61,  47,  47, 182, 183,
+    47,  47, 184, 185, 186,  61,  47, 187, 188,   9,   9,   9,  66, 189, 190, 191,
+    11,  11, 192,  27,  27,  27, 193, 194,  11, 195,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 196,  13,  13,  13,  13,  13,  13,
+   197, 197, 197, 197, 197, 198, 197,  11, 199, 199, 199, 200, 201, 202, 202, 201,
+   203, 204, 205, 206, 207, 208, 209, 210, 211,  27, 212, 212, 212, 213, 214,  32,
+   215, 216, 217, 218, 219, 145, 220, 220, 221, 222, 223, 146, 224, 225, 146, 226,
+   227, 227, 227, 227, 227, 227, 227, 227, 228, 146, 229, 146, 146, 146, 146, 230,
+   146, 231, 227, 232, 146, 233, 234, 146, 146, 146, 146, 146, 146, 146, 145, 145,
+   145, 235, 146, 146, 146, 146, 236, 145, 146, 146, 146, 146, 146, 146, 146, 146,
+   146, 146, 146, 237, 238, 146, 146, 239, 146, 146, 146, 146, 146, 146, 240, 146,
+   146, 146, 146, 146, 146, 146, 241, 242, 145, 243, 146, 146, 244, 227, 245, 227,
+   246, 247, 227, 227, 227, 248, 227, 249, 146, 146, 146, 227, 250, 146, 146, 146,
+     9,   9,   9,  11,  11,  11, 251, 252,  13,  13,  13,  13,  13,  13, 253, 254,
+    11,  11,  11,  47,  47,  47, 255, 256,  47,  47,  47,  47,  47,  47,  32,  32,
+   257, 258, 259, 260, 261, 262, 263, 263, 264, 265, 266, 267, 268,  47,  47,  47,
+    47, 269, 148,  47,  47,  47,  47, 270,  47, 271,  47,  47, 146, 146, 146,  47,
+   146, 146, 272, 146, 273, 274, 146, 146, 272, 146, 146, 274, 146, 146, 146, 146,
+    47,  47,  47,  47, 146, 146, 146, 146,  47, 275,  47,  47,  47,  47,  47,  47,
+    47, 146, 146, 146, 146,  47,  47, 187, 276,  47,  61,  47,  13,  13, 277, 278,
+    13, 279,  47,  47,  47,  47, 280, 281,  31, 282, 283, 284,  13,  13,  13, 285,
+   286, 287, 288, 289, 290, 291,   9, 292, 293,  47, 294, 295,  47,  47,  47, 296,
+   297,  47,  47, 298, 299, 160,  32, 300,  61,  47, 301,  47, 302, 303,  47,  47,
+    72,  47,  47, 304, 305, 306, 307,  61,  47,  47, 308, 309, 310, 311,  47, 312,
+    47,  47,  47, 313,  58, 314, 315, 316,  47,  47,  47,  11,  11, 317, 318,  11,
+    11,  11,  11,  11,  47,  47, 319, 160, 320, 320, 320, 320, 320, 320, 320, 320,
+   321, 321, 321, 321, 321, 321, 321, 321,  11, 322, 323,  47,  47,  47,  47,  47,
+    47,  47,  47, 324, 325, 326,  47,  47,  47,  47,  47, 327, 146,  47,  47,  47,
+    47, 328,  47,  47, 329, 146, 146, 330,  32, 331,  32, 332, 333, 334, 335,  47,
+    47,  47,  47,  47,  47,  47,  47, 336, 337,   2,   3,   4,   5, 338, 339, 340,
+    47, 341,  47,  47,  47,  47, 342, 343, 344, 145, 145, 345, 220, 220, 220, 346,
+   347, 146, 146, 146, 146, 146, 146, 348, 349, 349, 349, 349, 349, 349, 349, 349,
+    47,  47,  47,  47,  47,  47, 350, 145,  47,  47, 351,  47, 352,  47,  47,  60,
+    47, 353,  47,  47,  47, 354, 220, 220,   9,   9, 147,  11,  11,  47,  47,  47,
+    47,  47, 160,   9,   9, 147,  11,  11,  47,  47,  47,  47,  47,  47, 353,   9,
+     9, 355,  11,  11,  47,  47,  47,  47,  27,  27,  27,  27,  27,  27,  27,  27,
+    47,  47,  47,  47,  47, 356,  47, 357,  47,  47, 358, 145, 145, 145,  47, 359,
+    47, 360,  47, 353,  47,  47,  47,  47,  47,  47,  47, 361, 145, 145, 145, 145,
+   362,  47,  47, 363, 145,  66,  47, 364,  47, 365, 145, 145, 366,  47, 367,  66,
+    47,  47,  47, 368,  47, 369,  47, 369,  47, 368, 144, 145, 145, 145, 145, 145,
+     9,   9,   9,   9,  11,  11,  11, 370,  47,  47, 371, 160, 372,   9, 373,  11,
+   374, 227, 227, 227, 227, 227, 227, 227, 145, 145, 145, 145, 145, 145, 145, 145,
+    47,  47, 375,  47, 275, 376, 146, 377,  47, 365, 378,  47,  60, 379,  66,  47,
+   380,  66,  66,  47, 381, 145,  47,  47, 382,  47,  47, 363, 383, 384, 385, 386,
+   180,  47,  47, 387, 388,  47,  47, 160,  97,  47, 389, 390, 391,  47,  47, 392,
+   180,  47,  47, 393, 394, 395, 396, 145,  47,  47, 397, 398, 362,  32,  32,  32,
+    47,  47, 368,  47,  47, 399, 172, 160,  92,  47,  47, 113, 400, 401, 402,  32,
+    47,  47,  47, 403, 404, 405, 406,  32,  47,  47,  47, 407, 408, 409,  47,  47,
+    47,  47,  47, 410, 411, 160, 160, 160,  47,  47, 412, 413, 414, 415,  32,  32,
+    47,  47,  47, 416, 417, 160,  66,  66,  47,  47, 418, 419, 160, 160, 160, 160,
+    47, 420, 421, 422,  47,  47,  47,  47,  47,  47, 397, 423,  66,  66,  66,  66,
+     9,   9,   9,   9,  11,  11, 128, 424,  47,  47,  47, 425, 426, 160, 160, 160,
+    47,  47,  47,  47,  47, 427, 428, 429, 430,  47,  47, 431, 432, 433,  47,  47,
+   434, 435,  66,  47,  47,  47,  47,  47,  66,  66,  66,  66,  66,  66, 436, 429,
+    47,  47,  47,  47,  47,  47, 437, 160,  47,  47, 412, 438, 437, 128, 145, 439,
+    47, 156, 440, 441,  32,  32,  32,  32,  47,  47,  47, 362, 442, 160,  47,  47,
+   443, 444, 160,  47,  47, 445, 160, 160,  47,  47,  47,  47,  47,  47,  47, 446,
+   447,  47,  47, 448, 449, 450,  32,  32,  47,  47,  47,  47, 145, 451, 452, 453,
+   220, 220, 220, 220, 220, 220, 220,  66,  47,  47,  47,  47,  47,  47,  47, 437,
+    47,  47,  47, 209, 454,  32,  47,  47,  47, 455, 456, 160, 160, 160, 160, 160,
+    47,  47,  47,  47,  47,  47, 306,  47,  47,  47,  47,  47, 160,  47,  47, 457,
+    47,  47,  47, 458, 459, 460, 461,  47,  27,  27,  27,  27, 462,  47, 463, 160,
+     9,   9,   9,   9,   9,   9,  11,  11, 145, 464,   9, 465,  11,  11,  11,  11,
+    47,  47,  47,  47, 399, 466, 429, 429, 467, 468,  27,  27,  27,  27, 469, 470,
+    47, 471, 209, 209, 209, 209, 209, 209, 146, 146, 146, 146, 146, 146, 146, 472,
+   146, 146, 146, 146, 146, 146, 146, 227,  32,  32,  32,  32,  32, 146, 146, 146,
+   146, 146, 146, 146, 146, 146, 473, 474, 475, 146, 476, 146, 146, 146, 146, 146,
+   146, 146, 146, 146, 477, 146, 146, 146,   9, 478,  11, 479, 480,  11, 197,   9,
+   481, 482,   9, 483,  11,   9, 478,  11, 479, 480,  11, 197,   9, 481, 482,   9,
+   483,  11,   9, 478,  11, 479, 480,  11, 197,   9, 481, 482,   9, 483,  11,   9,
+   478,  11, 197,   9, 484, 485, 486, 487,  11, 488,   9, 489, 490, 491, 492,  11,
+   493,   9, 494,  11, 495, 160, 160, 160,  32,  32,  32, 496,  32,  32, 497, 498,
+   499, 500,  32,  32,  32,  32,  32,  32, 501,  11,  11,  11,  11,  11,  11,  11,
+    32,  32,  32,  27,  27,  27,  27,  27,  32,  32,  32,  32,  32,  32,  32,  32,
+    47,  47,  47, 502, 503, 146, 146, 146,  47,  47, 455,  32,  47,  47, 504, 505,
+    47,  47,  47,  47,  47,  47, 506, 160,  47,  47,  47,  47,  47,  47, 455, 507,
+    47,  47,  47,  47,  47,  47, 508, 509,  47,  47,  47,  47, 358,  32,  32,  32,
+     9,   9, 481,  11, 510, 306,  66,  66, 145, 145, 511, 512, 145, 145, 145, 145,
+   145, 145, 513, 145, 145, 145, 145, 145,  47,  47,  47,  47,  47,  47,  47, 227,
+   514, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 515,
+   146, 146, 146, 146, 146, 227, 227, 227, 209, 209, 209, 209, 209, 209, 209, 209,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
+     0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
+  1124,1125,1126,1127,1131,1133,   0,1147,1154,1155,1156,1161,1187,1188,1189,1193,
+     0,1219,1226,1227,1228,1229,1233,   0,   0,1267,1268,1269,1273,1298,   0,1303,
+   943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149,
+     0,   0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175,
+   991,1176, 993,1178, 994,1179,   0,   0,1004,1190,1005,1191,1006,1192,1014,1199,
+  1007,   0,   0,   0,1016,1201,1020,1206,   0,1022,1208,1025,1211,1023,1209,   0,
+     0,   0,   0,1032,1218,1037,1223,1035,1221,   0,   0,   0,1044,1230,1045,1231,
+  1049,1235,   0,   0,1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258,
+  1069,1255,1077,1264,1074,1261,   0,   0,1083,1270,1084,1271,1085,1272,1088,1275,
+  1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310,   0,
+  1053,1239,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1093,
+  1280,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 949,1134,1010,
+  1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,1366,   0,1320,1347,
+  1418,1419,1323,1350,   0,   0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424,
+  1202,   0,   0,   0, 987,1172,   0,   0,1031,1217,1321,1348,1322,1349,1338,1365,
+   950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238,
+  1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263,   0,   0, 997,1182,
+     0,   0,   0,   0,   0,   0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232,
+  1422,1423,1113,1301,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     8,   9,   0,  10,1425,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,
+     0,   0,   0,   0,   0,1314,1427,   5,1434,1438,1443,   0,1450,   0,1455,1461,
+  1514,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1446,1458,1468,1476,1480,1486,
+  1517,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1489,1503,1494,1500,1508,   0,
+     0,   0,   0,1520,1521,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1526,1528,   0,1525,   0,   0,   0,1522,   0,   0,   0,   0,1536,1532,1539,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1534,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1556,   0,   0,   0,   0,   0,   0,
+  1548,1550,   0,1547,   0,   0,   0,1567,   0,   0,   0,   0,1558,1554,1561,   0,
+     0,   0,   0,   0,   0,   0,1568,1569,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1529,1551,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1523,1545,1524,1546,   0,   0,1527,1549,   0,   0,1570,1571,1530,1552,1531,1553,
+     0,   0,1533,1555,1535,1557,1537,1559,   0,   0,1572,1573,1544,1566,1538,1560,
+  1540,1562,1541,1563,1542,1564,   0,   0,1543,1565,   0,   0,   0,   0,   0,   0,
+     0,   0,1606,1607,1609,1608,1610,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1613,   0,1611,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1612,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1620,   0,   0,   0,   0,   0,   0,
+     0,1623,   0,   0,1624,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1614,1615,1616,1617,1618,1619,1621,1622,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1628,1629,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1625,1626,   0,1627,
+     0,   0,   0,1634,   0,   0,1635,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1630,1631,1632,   0,   0,1633,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1639,   0,   0,1638,1640,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1636,1637,   0,   0,
+     0,   0,   0,   0,1641,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1642,1644,1643,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1645,   0,   0,   0,   0,   0,   0,   0,
+  1646,   0,   0,   0,   0,   0,   0,1648,1649,   0,1647,1650,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1651,1653,1652,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1654,   0,1655,1657,1656,   0,
+     0,   0,   0,1659,   0,   0,   0,   0,   0,   0,   0,   0,   0,1660,   0,   0,
+     0,   0,1661,   0,   0,   0,   0,1662,   0,   0,   0,   0,1663,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1658,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1664,   0,1665,1673,   0,1674,   0,   0,   0,   0,   0,   0,   0,
+     0,1666,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1668,   0,   0,   0,   0,   0,   0,   0,   0,   0,1669,   0,   0,
+     0,   0,1670,   0,   0,   0,   0,1671,   0,   0,   0,   0,1672,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1667,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1675,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1676,   0,1677,   0,1678,   0,1679,   0,1680,   0,
+     0,   0,1681,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1682,   0,1683,   0,   0,
+  1684,1685,   0,1686,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153,
+   966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171,
+   989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356,
+  1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214,
+  1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363,
+  1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251,
+  1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266,
+  1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287,
+  1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302,
+  1119,1308,1122,1311,1123,1312,1186,1260,1293,1305,   0,1394,   0,   0,   0,   0,
+   952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375,
+  1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353,
+  1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234,
+  1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403,
+  1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412,
+  1409,1414,1109,1297,1117,1306,1116,1304,1112,1300,   0,   0,   0,   0,   0,   0,
+  1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721,
+  1477,1478,1729,1731,1730,1732,   0,   0,1435,1436,1733,1735,1734,1736,   0,   0,
+  1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757,
+  1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776,
+  1495,1496,1777,1779,1778,1780,   0,   0,1451,1452,1781,1783,1782,1784,   0,   0,
+  1504,1505,1785,1788,1786,1789,1787,1790,   0,1459,   0,1791,   0,1792,   0,1793,
+  1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814,
+  1467,  21,1475,  22,1479,  23,1485,  24,1493,  27,1499,  28,1507,  29,   0,   0,
+  1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728,
+  1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764,
+  1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821,
+  1470,1469,1822,1474,1465,   0,1473,1825,1429,1428,1426,  12,1432,   0,  26,   0,
+     0,1315,1823,1484,1466,   0,1483,1829,1433,  13,1437,  14,1441,1826,1827,1828,
+  1488,1487,1513,  19,   0,   0,1492,1515,1445,1444,1442,  15,   0,1831,1832,1833,
+  1502,1501,1516,  25,1497,1498,1506,1518,1457,1456,1454,  17,1453,1313,  11,   3,
+     0,   0,1824,1512,1519,   0,1511,1830,1449,  16,1460,  18,1464,   4,   0,   0,
+    30,  31,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,  20,   0,   0,   0,   2,   6,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1834,1835,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1836,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1837,1839,1838,
+     0,   0,   0,   0,1840,   0,   0,   0,   0,1841,   0,   0,1842,   0,   0,   0,
+     0,   0,   0,   0,1843,   0,1844,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1845,   0,   0,1846,   0,   0,1847,   0,1848,   0,   0,   0,   0,   0,   0,
+   937,   0,1850,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1849, 936, 938,
+  1851,1852,   0,   0,1853,1854,   0,   0,1855,1856,   0,   0,   0,   0,   0,   0,
+  1857,1858,   0,   0,1861,1862,   0,   0,1863,1864,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1867,1868,1869,1870,
+  1859,1860,1865,1866,   0,   0,   0,   0,   0,   0,1871,1872,1873,1874,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,  32,  33,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1875,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1877,   0,1878,   0,
+  1879,   0,1880,   0,1881,   0,1882,   0,1883,   0,1884,   0,1885,   0,1886,   0,
+  1887,   0,1888,   0,   0,1889,   0,1890,   0,1891,   0,   0,   0,   0,   0,   0,
+  1892,1893,   0,1894,1895,   0,1896,1897,   0,1898,1899,   0,1900,1901,   0,   0,
+     0,   0,   0,   0,1876,   0,   0,   0,   0,   0,   0,   0,   0,   0,1902,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1904,   0,1905,   0,
+  1906,   0,1907,   0,1908,   0,1909,   0,1910,   0,1911,   0,1912,   0,1913,   0,
+  1914,   0,1915,   0,   0,1916,   0,1917,   0,1918,   0,   0,   0,   0,   0,   0,
+  1919,1920,   0,1921,1922,   0,1923,1924,   0,1925,1926,   0,1927,1928,   0,   0,
+     0,   0,   0,   0,1903,   0,   0,1929,1930,1931,1932,   0,   0,   0,1933,   0,
+   710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601,
+   663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662,
+   810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168,
+   368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758,
+   811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585,
+   594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259,
+   313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697,
+   424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170,
+   193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330,
+   337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473,
+   683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603,
+   608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411,
+   479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583,
+   791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269,
+   377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510,
+   659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156,
+   153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295, 128, 210,   0,   0,
+   227,   0, 379,   0,   0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604,   0,
+   661,   0, 703,   0,   0, 735, 743,   0,   0,   0, 793, 794, 795, 808, 741, 773,
+   118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329,
+   335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548,
+   549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651,
+   690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315, 869, 623,   0,   0,
+   102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243,
+   250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362,
+   370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490,
+   493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586,
+   591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706,
+   709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848,
+   847, 857,  55,  65,  66, 883, 892, 916, 822, 824,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1586,   0,1605,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1602,1603,1934,1935,1574,1575,
+  1576,1577,1579,1580,1581,1583,1584,   0,1585,1587,1588,1589,1591,   0,1592,   0,
+  1593,1594,   0,1595,1596,   0,1598,1599,1600,1601,1604,1582,1578,1590,1597,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1937,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,1939,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1940,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1941,1942,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1943,1944,   0,   0,   0,
+     0,   0,   0,1945,   0,1946,   0,   0,   0,   0,   0,   0,   0,   0,1947,   0,
+     0,1948,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1950,   0,1949,1951,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1953,1952,   0,1954,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1955,1956,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1957,   0,   0,   0,   0,   0,   0,   0,
+     0,1958,1961,1959,1965,1960,1962,1964,1963,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1967,1966,1968,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1969,1970,
+  1971,1972,1973,1974,1975,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1976,1977,1978,1980,1979,
+  1981,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125,  34, 830, 130, 131,
+   132, 137, 827,  35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152,  37,
+   157, 158, 159, 160,  38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179,
+   181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195,
+   197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216,
+   153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244,
+   836, 837, 247, 248, 249, 246, 251,  39,  40, 253, 255, 255, 838, 257, 258, 259,
+   261, 839, 262, 263, 301, 264,  41, 266, 270, 272, 271, 841, 274, 842, 277, 276,
+   278, 281, 282,  42, 283, 284, 285, 286,  43, 843,  44, 289, 290, 291, 293, 934,
+   298, 845, 845, 621, 300, 300,  45, 852, 894, 302, 304,  46, 306, 309, 310, 312,
+   316,  48,  47, 317, 846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334,
+   335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361,
+   358, 356,  49, 363, 365, 367, 364,  50, 369, 371, 851, 376, 386, 378,  53, 381,
+    52,  51, 140, 141, 387, 382, 614,  78, 388, 389, 390, 394, 392, 856,  54, 399,
+   396, 402, 404, 858, 405, 401, 407,  55, 408, 409, 410, 413, 859, 415,  56, 417,
+   860, 418,  57, 419, 422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433,
+   437, 441, 438, 439, 442, 443, 864, 436, 449, 450,  58, 454, 453, 865, 447, 460,
+   866, 867, 461, 466, 465, 464,  59, 467, 470, 469, 472, 828, 475, 868, 478, 870,
+   483, 485, 486, 871, 488, 489, 872, 873, 495, 497,  60, 498,  61,  61, 504, 505,
+   507, 508, 511,  62, 513, 874, 515, 875, 518, 844, 520, 876, 877, 878,  63,  64,
+   528, 880, 879, 881, 882, 530, 531, 531, 533,  66, 534,  67,  68, 884, 536, 538,
+   541,  69, 885, 549, 886, 887, 556, 559,  70, 561, 562, 563, 888, 889, 889, 567,
+    71, 890, 570, 571,  72, 891, 577,  73, 581, 579, 582, 893, 587,  74, 590, 592,
+   596,  75, 895, 896,  76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611,
+   853,  77, 615, 616,  79, 617, 252, 902, 903, 854, 855, 621, 622, 731,  80, 627,
+   626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651,
+   638, 643, 644, 645, 905, 907, 906,  81, 653, 654, 656, 911, 657, 908,  82,  83,
+   909, 910,  84, 664, 665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675,  85,
+   677, 678,  86, 681, 682, 912, 685, 686,  87, 689,  36, 913, 914,  88,  89, 696,
+   702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728,
+   918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762,  90,
+   764, 922,  91, 775, 279, 780, 923, 925,  92,  93, 785, 926,  94, 927, 787, 787,
+   789, 928, 792,  95, 796, 797, 798, 800,  96, 929, 802, 804, 806,  97,  98, 807,
+   930,  99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820, 821, 935,   0,   0,
+};
+static const int16_t _hb_ucd_i16[92]=
+{
+      0,    0,    1,   -1,    2,    0,   -2,    0,    0,    2,    0,   -2,    0,   16,    0,  -16,
+      0,    1,   -1,    0,    3,    3,    3,   -3,   -3,   -3,    0, 2016,    0, 2527, 1923, 1914,
+   1918,    0, 2250,    0,    0,  138,    0,    7,   -7,    0,   -1,    1, 1824,    0, 2104,    0,
+   2108, 2106,    0, 2106, 1316,    0,   -1, -138,    8,    8,    8,    0,    7,    7,   -8,   -8,
+     -8,   -7,-1316,    1,   -1,    3,   -3,    1,    0,-1914,-1918,    0,    0,-1923,-1824,    0,
+      0,-2016,-2104,    0,    0,-2106,-2108,-2106,-2250,    0,-2527,    0,
+};
+
+static inline uint8_t _hb_ucd_gc (unsigned u)
+{
+  return u<1114112 ? _hb_ucd_u8[5296u+((_hb_ucd_u8[1168u+((_hb_ucd_u16[((_hb_ucd_u8[544u+((_hb_ucd_u8[((((((((u)>>1))>>3))>>3))>>4)])<<4)+((((((((u)>>1))>>3))>>3))&15)])<<3)+((((((u)>>1))>>3))&7)])<<3)+((((u)>>1))&7)])<<1)+((u)&1)] : 2;
+}
+static inline uint8_t _hb_ucd_ccc (unsigned u)
+{
+  return u<125259 ? _hb_ucd_u8[7322u+((_hb_ucd_u8[6738u+((_hb_ucd_u8[6258u+((_hb_ucd_u8[5890u+((_hb_ucd_u8[5644u+((((((((u)>>2))>>2))>>2))>>3)])<<3)+((((((((u)>>2))>>2))>>2))&7)])<<2)+((((((u)>>2))>>2))&3)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 0;
+}
+static inline uint8_t _hb_ucd_b4 (const uint8_t* a, unsigned i)
+{
+  return (a[i>>1]>>((i&1)<<2))&15;
+}
+static inline int16_t _hb_ucd_bmg (unsigned u)
+{
+  return u<65380 ? _hb_ucd_i16[((_hb_ucd_u8[8218u+((_hb_ucd_u8[7986u+((_hb_ucd_u8[7890u+((_hb_ucd_b4(_hb_ucd_u8+7826u,((((((((u)>>1))>>2))>>3))>>3)))<<3)+((((((((u)>>1))>>2))>>3))&7)])<<3)+((((((u)>>1))>>2))&7)])<<2)+((((u)>>1))&3)])<<1)+((u)&1)] : 0;
+}
+static inline uint8_t _hb_ucd_sc (unsigned u)
+{
+  return u<918016 ? _hb_ucd_u8[11655u+((_hb_ucd_u8[10647u+((_hb_ucd_u8[9151u+((_hb_ucd_u8[8703u+((_hb_ucd_u8[8495u+((_hb_ucd_b4(_hb_ucd_u8+8466u,((((((((((u)>>2))>>2))>>3))>>3))>>4)))<<4)+((((((((((u)>>2))>>2))>>3))>>3))&15)])<<3)+((((((((u)>>2))>>2))>>3))&7)])<<3)+((((((u)>>2))>>2))&7)])<<2)+((((u)>>2))&3)])<<2)+((u)&3)] : 2;
+}
+static inline uint16_t _hb_ucd_dm (unsigned u)
+{
+  return u<195102 ? _hb_ucd_u16[1680u+((_hb_ucd_u8[13041u+((_hb_ucd_u8[12659u+((((u)>>4))>>5)])<<5)+((((u)>>4))&31)])<<4)+((u)&15)] : 0;
+}
+
+
 #endif
 
-
 #endif /* HB_UCD_TABLE_HH */
 
 /* == End of generated table == */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh
index 4bc8d64c28f..711dd9b6571 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh
@@ -7,13 +7,13 @@
  * on file with this header:
  *
  * # emoji-data.txt
- * # Date: 2024-05-01, 21:25:24 GMT
- * # © 2024 Unicode®, Inc.
+ * # Date: 2025-07-25, 17:54:31 GMT
+ * # © 2025 Unicode®, Inc.
  * # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
  * # For terms of use and license, see https://www.unicode.org/terms_of_use.html
  * #
  * # Emoji Data for UTS #51
- * # Used with Emoji Version 16.0 and subsequent minor revisions (if any)
+ * # Version: 17.0
  * #
  * # For documentation and usage, see https://www.unicode.org/reports/tr51
  */
@@ -23,54 +23,62 @@
 
 #include "hb-unicode.hh"
 
-static const uint8_t
-_hb_emoji_u8[464] =
+#include <stdint.h>
+
+static const uint8_t _hb_emoji_u8[624]=
 {
    16, 17, 17, 17, 50, 20, 21, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,118,152,
-    0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    2,  0,  3,  4,  0,  0,  5,  6,  0,  7,  0,  8,  9, 10, 11, 12,
-    0,  0, 13,  0,  0,  0, 14,  0, 15,  0,  0,  0,  0, 16,  0,  0,
-   17, 17, 18, 19, 20, 17, 17, 21, 17, 17, 22, 17, 23, 17, 24, 25,
-   26, 27, 28, 17, 17, 17,  0,  0, 17, 17, 17, 17, 17, 17, 17, 29,
-    0,  0,  0,  0,  0,  1,  0,  0,  0,  2,  3,  0,  0,  4,  0,  0,
-    5,  6,  0,  0,  7,  8,  0,  0,  8,  0,  9, 10,  0,  0, 11,  0,
-    0, 12, 13, 14, 15, 16, 16, 16, 17, 16, 16, 16, 18, 19, 20, 21,
-   22, 23,  0,  0,  0, 24,  0,  0, 25,  0, 26,  0,  0, 27,  0,  0,
-   28,  0,  0,  0, 16, 16, 16, 16, 29,  9,  0, 30, 31, 32, 16, 33,
-   34, 35, 36, 16, 16, 16, 16, 37, 16, 38, 39, 16, 16, 16, 40,  0,
-    0,  0,  0, 41,  0,  0, 42, 16, 43,  0, 44,  0, 45, 46, 16, 16,
-   47, 48, 49, 16, 16, 16, 16, 38,  0,  0,  0,  0,  0, 66,  0,  0,
-    0,  0,  0, 16,  0,  2,  0,  0,  4,  0,  0,  2,  0,  0,240,  3,
-    0,  6,  0,  0,  0,  0,  0, 12,  0,  1,  0,  0,  0,128,  0,  0,
-    0,254, 15,  7,  4,  0,  0,  0,  0, 12, 64,  0,  1,  0,  0,  0,
-    0,  0,  0,120,191,255,247,255,255,255,255,255, 63,  0,255,255,
-   63,255, 87, 32,  2,  1, 24,  0,144, 80,184,  0,248,  0,  0,  0,
-    0,  0,224,  0,  2,  0,  1,128,  0,  0, 48,  0,224,  0,  0, 24,
-    0,  0, 33,  0,  0,  0,  1, 32,  0,  0,128,  2,  0,224,  0,  0,
-    0,240,  3,192,  0, 64,254,  7,  0,224,255,255, 63,  0,  0,  0,
-  254,255,  0,  4,  0,128,252,247,  0,254,255,255,255,255,255,  7,
-  255,255,255, 63,192,255,255,255,255,255,  0,  0,  0,  0,240,255,
-    0,  0,224,255,  0,240,  0,  0,  0,255,  0,252,  0,255,  0,  0,
-    0,192,255,255,  0,240,255,255,255,255,255,247,191,255,255,255,
+    0,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    2,  3,  0,  0,  4,  0,  5,  0,  0,  0,  0,  0,  6,  0,  0,  7,
+    0,  0,  0,  8,  0,  0,  9, 10, 11, 12, 13, 14, 15, 16, 17,  0,
+    0,  0,  0,  0, 18,  0,  0,  0,  0,  0,  0,  0, 19, 20,  0,  0,
+   21,  0,  0,  0,  0,  0,  0,  0,  0,  0, 22,  0,  0,  0,  0,  0,
+   23,  0, 24, 25,  0, 26, 27, 28, 29, 30, 31, 31, 32, 31, 33, 34,
+   31, 31, 31, 35, 36, 37, 38, 39, 31, 40, 31, 41,  0,  0,  0, 42,
+   43, 44, 45, 46, 47, 48, 31, 31,  0, 49, 31, 31,  0,  0,  0,  0,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 36,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 66,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 16,  0,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  4,  0,  0,  2,  0,  0,240,  3,  0,  6,  0,  0,
+    0,  0,  0, 12,  0,  1,  0,  0,  0,128,  0,  0,  0,254, 15,  7,
+    4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 12, 64,  0,
+    1,  0,  0,  0,  0,  0,  0,120, 31, 64, 50, 33, 77,196,  0,  7,
+    5,255, 15,128,105,  1,  0,200,  0,  0,252, 26,131, 12,  3, 96,
+   48,193, 26,  0,  0,  6,191, 39, 36,191, 84, 32,  2,  1, 24,  0,
+  144, 80,184,  0, 24,  0,  0,  0,  0,  0,224,  0,  2,  0,  1,128,
+    0,  0,  0,  0,  0,  0, 48,  0,224,  0,  0, 24,  0,  0,  0,  0,
+    0,  0, 33,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1, 32,
+    0,  0,128,  2,  0,  0,  0,  0, 16,  0,  0,  0,  0,240,  0,  0,
+    0,  0,240,255,  0,128,  1,  0,  1,128,  1,  0,  0,  0,192,255,
+    0,  0,  0,  0,  0,  0,  3,192,  0, 64,254,  7,  0,192,255,255,
+  255,255,255,255, 63,  0,  0,  0,254,255,  0,  4,  0,128,252,247,
+    0,254,255,255,192,255,255,255,255,255,255,255,255,255,255,255,
+  255,255,255,255,243,255,255,255,255,255,207,206,255,255,255,255,
+  255,255,255,255,255,255,185,  7,255,255,255,255,255,255,255,191,
+  255,255,255,255,255,255,255, 63,  0,126,255,255,255,128,249,  7,
+  128, 60, 97,  0, 48,  1,  6, 16, 28,  0, 14,112, 10,129,  8,252,
+  255,255,  0,  0,  0,  0,  0,  0, 63,248,231,255, 63,250,249,255,
+    0,  0,  0,252,255,255,255,255,  0,240,  0,  0,  0,  0,  0,  0,
+    0,255,  0,252,  0,  0,  0,  0,  0,255,  0,  0,  0,192,  0,240,
+  252,255,  0,254,255,255,255,255,  0,240,255,255,255,255,255,247,
+  191,255,255,255,255,255,255,255,  0,  0,  0,255,  0,192,255,255,
 };
 
-static inline unsigned
-_hb_emoji_b4 (const uint8_t* a, unsigned i)
+static inline uint8_t _hb_emoji_b4 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>1]>>((i&1u)<<2))&15u;
+  return (a[i>>1]>>((i&1)<<2))&15;
 }
-static inline unsigned
-_hb_emoji_b1 (const uint8_t* a, unsigned i)
+static inline uint8_t _hb_emoji_b1 (const uint8_t* a, unsigned i)
 {
-  return (a[i>>3]>>((i&7u)<<0))&1u;
+  return (a[i>>3]>>((i&7)<<0))&1;
 }
-static inline uint_fast8_t
-_hb_emoji_is_Extended_Pictographic (unsigned u)
+static inline uint8_t _hb_emoji_is_Extended_Pictographic (unsigned u)
 {
-  return u<131070u?_hb_emoji_b1(264+_hb_emoji_u8,((_hb_emoji_u8[144+(((_hb_emoji_u8[64+(((_hb_emoji_b4(_hb_emoji_u8,u>>5>>2>>3))<<3)+((u>>5>>2)&7u))])<<2)+((u>>5)&3u))])<<5)+((u)&31u)):0;
+  return u<131070 ? _hb_emoji_b1(_hb_emoji_u8+224u,((_hb_emoji_u8[64u+((_hb_emoji_b4(_hb_emoji_u8,((((u)>>6))>>4)))<<4)+((((u)>>6))&15)])<<6)+((u)&63)) : 0;
 }
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh
index 924105001d7..9e6f89365fe 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-unicode.hh
@@ -241,6 +241,57 @@ HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
     }
   }
 
+  static hb_codepoint_t
+  vertical_char_for (hb_codepoint_t u)
+  {
+    switch (u >> 8)
+    {
+      case 0x20: switch (u) {
+        case 0x2013u: return 0xfe32u; // EN DASH
+        case 0x2014u: return 0xfe31u; // EM DASH
+        case 0x2025u: return 0xfe30u; // TWO DOT LEADER
+        case 0x2026u: return 0xfe19u; // HORIZONTAL ELLIPSIS
+      } break;
+      case 0x30: switch (u) {
+        case 0x3001u: return 0xfe11u; // IDEOGRAPHIC COMMA
+        case 0x3002u: return 0xfe12u; // IDEOGRAPHIC FULL STOP
+        case 0x3008u: return 0xfe3fu; // LEFT ANGLE BRACKET
+        case 0x3009u: return 0xfe40u; // RIGHT ANGLE BRACKET
+        case 0x300au: return 0xfe3du; // LEFT DOUBLE ANGLE BRACKET
+        case 0x300bu: return 0xfe3eu; // RIGHT DOUBLE ANGLE BRACKET
+        case 0x300cu: return 0xfe41u; // LEFT CORNER BRACKET
+        case 0x300du: return 0xfe42u; // RIGHT CORNER BRACKET
+        case 0x300eu: return 0xfe43u; // LEFT WHITE CORNER BRACKET
+        case 0x300fu: return 0xfe44u; // RIGHT WHITE CORNER BRACKET
+        case 0x3010u: return 0xfe3bu; // LEFT BLACK LENTICULAR BRACKET
+        case 0x3011u: return 0xfe3cu; // RIGHT BLACK LENTICULAR BRACKET
+        case 0x3014u: return 0xfe39u; // LEFT TORTOISE SHELL BRACKET
+        case 0x3015u: return 0xfe3au; // RIGHT TORTOISE SHELL BRACKET
+        case 0x3016u: return 0xfe17u; // LEFT WHITE LENTICULAR BRACKET
+        case 0x3017u: return 0xfe18u; // RIGHT WHITE LENTICULAR BRACKET
+      } break;
+      case 0xfe: switch (u) {
+        case 0xfe4fu: return 0xfe34u; // WAVY LOW LINE
+      } break;
+      case 0xff: switch (u) {
+        case 0xff01u: return 0xfe15u; // FULLWIDTH EXCLAMATION MARK
+        case 0xff08u: return 0xfe35u; // FULLWIDTH LEFT PARENTHESIS
+        case 0xff09u: return 0xfe36u; // FULLWIDTH RIGHT PARENTHESIS
+        case 0xff0cu: return 0xfe10u; // FULLWIDTH COMMA
+        case 0xff1au: return 0xfe13u; // FULLWIDTH COLON
+        case 0xff1bu: return 0xfe14u; // FULLWIDTH SEMICOLON
+        case 0xff1fu: return 0xfe16u; // FULLWIDTH QUESTION MARK
+        case 0xff3bu: return 0xfe47u; // FULLWIDTH LEFT SQUARE BRACKET
+        case 0xff3du: return 0xfe48u; // FULLWIDTH RIGHT SQUARE BRACKET
+        case 0xff3fu: return 0xfe33u; // FULLWIDTH LOW LINE
+        case 0xff5bu: return 0xfe37u; // FULLWIDTH LEFT CURLY BRACKET
+        case 0xff5du: return 0xfe38u; // FULLWIDTH RIGHT CURLY BRACKET
+      } break;
+    }
+
+    return u;
+  }
+
   struct {
 #define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_func_t name;
     HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-utf.hh b/src/java.desktop/share/native/libharfbuzz/hb-utf.hh
index 7fd3bf8828b..3891fb331af 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-utf.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-utf.hh
@@ -37,7 +37,7 @@ struct hb_utf8_t
   typedef uint8_t codepoint_t;
   static constexpr unsigned max_len = 4;
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   next (const codepoint_t *text,
         const codepoint_t *end,
         hb_codepoint_t *unicode,
@@ -106,7 +106,7 @@ struct hb_utf8_t
     return text;
   }
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   prev (const codepoint_t *text,
         const codepoint_t *start,
         hb_codepoint_t *unicode,
@@ -185,7 +185,7 @@ struct hb_utf16_xe_t
   typedef TCodepoint codepoint_t;
   static constexpr unsigned max_len = 2;
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   next (const codepoint_t *text,
         const codepoint_t *end,
         hb_codepoint_t *unicode,
@@ -217,7 +217,7 @@ struct hb_utf16_xe_t
     return text;
   }
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   prev (const codepoint_t *text,
         const codepoint_t *start,
         hb_codepoint_t *unicode,
@@ -294,7 +294,7 @@ struct hb_utf32_xe_t
   typedef TCodepoint codepoint_t;
   static constexpr unsigned max_len = 1;
 
-  static const TCodepoint *
+  static inline const TCodepoint *
   next (const TCodepoint *text,
         const TCodepoint *end HB_UNUSED,
         hb_codepoint_t *unicode,
@@ -306,7 +306,7 @@ struct hb_utf32_xe_t
     return text;
   }
 
-  static const TCodepoint *
+  static inline const TCodepoint *
   prev (const TCodepoint *text,
         const TCodepoint *start HB_UNUSED,
         hb_codepoint_t *unicode,
@@ -353,7 +353,7 @@ struct hb_latin1_t
   typedef uint8_t codepoint_t;
   static constexpr unsigned max_len = 1;
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   next (const codepoint_t *text,
         const codepoint_t *end HB_UNUSED,
         hb_codepoint_t *unicode,
@@ -363,7 +363,7 @@ struct hb_latin1_t
     return text;
   }
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   prev (const codepoint_t *text,
         const codepoint_t *start HB_UNUSED,
         hb_codepoint_t *unicode,
@@ -405,7 +405,7 @@ struct hb_ascii_t
   typedef uint8_t codepoint_t;
   static constexpr unsigned max_len = 1;
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   next (const codepoint_t *text,
         const codepoint_t *end HB_UNUSED,
         hb_codepoint_t *unicode,
@@ -417,7 +417,7 @@ struct hb_ascii_t
     return text;
   }
 
-  static const codepoint_t *
+  static inline const codepoint_t *
   prev (const codepoint_t *text,
         const codepoint_t *start HB_UNUSED,
         hb_codepoint_t *unicode,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
index cd27da96648..b650ca9f066 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
@@ -32,6 +32,12 @@
 #include "hb-meta.hh"
 #include "hb-null.hh"
 
+// Change to 1 to force inline vector allocs, to see callsite in malloc-stats tool.
+#if 0
+#define HB_ALWAYS_INLINE_VECTOR_ALLOCS HB_ALWAYS_INLINE
+#else
+#define HB_ALWAYS_INLINE_VECTOR_ALLOCS
+#endif
 
 template <typename Type,
           bool sorted=false>
@@ -45,6 +51,7 @@ struct hb_vector_t
   using c_array_t = typename std::conditional<sorted, hb_sorted_array_t<const Type>, hb_array_t<const Type>>::type;
 
   hb_vector_t () = default;
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   hb_vector_t (std::initializer_list<Type> lst) : hb_vector_t ()
   {
     alloc (lst.size (), true);
@@ -57,18 +64,21 @@ struct hb_vector_t
   {
     extend (o);
   }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   hb_vector_t (const hb_vector_t &o) : hb_vector_t ()
   {
     alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o.as_array ());
   }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   hb_vector_t (array_t o) : hb_vector_t ()
   {
     alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   hb_vector_t (c_array_t o) : hb_vector_t ()
   {
     alloc_exact (o.length);
@@ -84,8 +94,29 @@ struct hb_vector_t
   }
   ~hb_vector_t () { fini (); }
 
+  template <unsigned n>
+  void
+  set_storage (Type (&array)[n])
+  { set_storage (array, n); }
+  void
+  set_storage (hb_array_t<Type> array)
+  { set_storage (array.arrayZ, array.length); }
+  template <typename T = Type,
+            hb_enable_if (hb_is_trivially_constructible(T) &&
+                          hb_is_trivially_destructible(T))>
+  void
+  set_storage (Type *array, unsigned n)
+  {
+    assert (allocated == 0);
+    assert (length == 0);
+
+    arrayZ = array;
+    length = n;
+  }
+
   template <typename Iterable,
             hb_requires (hb_is_iterable (Iterable))>
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   void extend (const Iterable &o)
   {
     auto iter = hb_iter (o);
@@ -106,12 +137,14 @@ struct hb_vector_t
         push_has_room (*iter++);
     }
   }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   void extend (array_t o)
   {
     alloc (length + o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   void extend (c_array_t o)
   {
     alloc (length + o.length);
@@ -136,10 +169,7 @@ struct hb_vector_t
 
   void fini ()
   {
-    /* We allow a hack to make the vector point to a foreign array
-     * by the user. In that case length/arrayZ are non-zero but
-     * allocated is zero. Don't free anything. */
-    if (allocated)
+    if (is_owned ())
     {
       shrink_vector (0);
       hb_free (arrayZ);
@@ -147,11 +177,13 @@ struct hb_vector_t
     init ();
   }
 
-  void reset ()
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  hb_vector_t &reset ()
   {
     if (unlikely (in_error ()))
       reset_error ();
     resize (0);
+    return *this;
   }
 
   friend void swap (hb_vector_t& a, hb_vector_t& b) noexcept
@@ -237,13 +269,16 @@ struct hb_vector_t
   Type * operator  + (unsigned int i) { return arrayZ + i; }
   const Type * operator  + (unsigned int i) const { return arrayZ + i; }
 
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   Type *push ()
   {
     if (unlikely (!resize (length + 1)))
       return std::addressof (Crap (Type));
     return std::addressof (arrayZ[length - 1]);
   }
-  template <typename... Args> Type *push (Args&&... args)
+  template <typename... Args>
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  Type *push (Args&&... args)
   {
     if (unlikely ((int) length >= allocated && !alloc (length + 1)))
       // If push failed to allocate then don't copy v, since this may cause
@@ -253,13 +288,20 @@ struct hb_vector_t
 
     return push_has_room (std::forward<Args> (args)...);
   }
-  template <typename... Args> Type *push_has_room (Args&&... args)
+  template <typename... Args>
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  Type *push_has_room (Args&&... args)
   {
     /* Emplace. */
     Type *p = std::addressof (arrayZ[length++]);
     return new (p) Type (std::forward<Args> (args)...);
   }
 
+  bool is_owned () const
+  {
+    return allocated != 0 && allocated != -1;
+  }
+
   bool in_error () const { return allocated < 0; }
   void set_error ()
   {
@@ -271,27 +313,40 @@ struct hb_vector_t
     assert (allocated < 0);
     allocated = -(allocated + 1);
   }
+  void ensure_error ()
+  {
+    if (!in_error ())
+      set_error ();
+  }
 
-  template <typename T = Type,
-            hb_enable_if (hb_is_trivially_copy_assignable(T))>
   Type *
-  realloc_vector (unsigned new_allocated, hb_priority<0>)
+  _realloc (unsigned new_allocated)
   {
     if (!new_allocated)
     {
-      hb_free (arrayZ);
+      if (is_owned ())
+        hb_free (arrayZ);
       return nullptr;
     }
+    if (!allocated && arrayZ)
+    {
+      /* If we have a non-null arrayZ but allocated is 0, then we are
+       * reallocating from a foreign array. */
+      Type *new_array = (Type *) hb_malloc (new_allocated * sizeof (Type));
+      if (unlikely (!new_array))
+        return nullptr;
+      hb_memcpy ((void *) new_array, (const void *) arrayZ, length * sizeof (Type));
+      return new_array;
+    }
     return (Type *) hb_realloc (arrayZ, new_allocated * sizeof (Type));
   }
-  template <typename T = Type,
-            hb_enable_if (!hb_is_trivially_copy_assignable(T))>
   Type *
-  realloc_vector (unsigned new_allocated, hb_priority<0>)
+  _malloc_move (unsigned new_allocated)
   {
     if (!new_allocated)
     {
-      hb_free (arrayZ);
+      if (is_owned ())
+        hb_free (arrayZ);
       return nullptr;
     }
     Type *new_array = (Type *) hb_malloc (new_allocated * sizeof (Type));
@@ -303,22 +358,33 @@ struct hb_vector_t
         new_array[i] = std::move (arrayZ[i]);
         arrayZ[i].~Type ();
       }
-      hb_free (arrayZ);
+      if (is_owned ())
+        hb_free (arrayZ);
     }
     return new_array;
   }
+
+  template <typename T = Type,
+            hb_enable_if (hb_is_trivially_copy_assignable(T))>
+  Type *
+  realloc_vector (unsigned new_allocated, hb_priority<0>)
+  {
+    return _realloc (new_allocated);
+  }
+  template <typename T = Type,
+            hb_enable_if (!hb_is_trivially_copy_assignable(T))>
+  Type *
+  realloc_vector (unsigned new_allocated, hb_priority<0>)
+  {
+    return _malloc_move (new_allocated);
+  }
   /* Specialization for types that can be moved using realloc(). */
   template <typename T = Type,
             hb_enable_if (T::realloc_move)>
   Type *
   realloc_vector (unsigned new_allocated, hb_priority<1>)
   {
-    if (!new_allocated)
-    {
-      hb_free (arrayZ);
-      return nullptr;
-    }
-    return (Type *) hb_realloc (arrayZ, new_allocated * sizeof (Type));
+    return _realloc (new_allocated);
   }
 
   template <typename T = Type,
@@ -353,7 +419,6 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<Type> other)
   {
-    assert ((int) (length + other.length) <= allocated);
     hb_memcpy ((void *) (arrayZ + length), (const void *) other.arrayZ, other.length * item_size);
     length += other.length;
   }
@@ -362,7 +427,6 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    assert ((int) (length + other.length) <= allocated);
     hb_memcpy ((void *) (arrayZ + length), (const void *) other.arrayZ, other.length * item_size);
     length += other.length;
   }
@@ -372,7 +436,6 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    assert ((int) (length + other.length) <= allocated);
     for (unsigned i = 0; i < other.length; i++)
       new (std::addressof (arrayZ[length + i])) Type (other.arrayZ[i]);
     length += other.length;
@@ -385,7 +448,6 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    assert ((int) (length + other.length) <= allocated);
     for (unsigned i = 0; i < other.length; i++)
     {
       new (std::addressof (arrayZ[length + i])) Type ();
@@ -398,12 +460,12 @@ struct hb_vector_t
   shrink_vector (unsigned size)
   {
     assert (size <= length);
-    if (!std::is_trivially_destructible<Type>::value)
+    if (!hb_is_trivially_destructible(Type))
     {
       unsigned count = length - size;
-      Type *p = arrayZ + length - 1;
+      Type *p = arrayZ + length;
       while (count--)
-        p--->~Type ();
+        (--p)->~Type ();
     }
     length = size;
   }
@@ -416,6 +478,7 @@ struct hb_vector_t
   }
 
   /* Allocate for size but don't adjust length. */
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   bool alloc (unsigned int size, bool exact=false)
   {
     if (unlikely (in_error ()))
@@ -471,17 +534,64 @@ struct hb_vector_t
 
     return true;
   }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   bool alloc_exact (unsigned int size)
   {
     return alloc (size, true);
   }
 
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
   void clear ()
   {
     resize (0);
   }
 
-  bool resize (int size_, bool initialize = true, bool exact = false)
+  template <typename allocator_t>
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  bool allocate_from_pool (allocator_t *allocator, unsigned size, unsigned int initialize = true)
+  {
+    if (allocator)
+    {
+      assert (!length && !allocated);
+      arrayZ = (Type *) allocator->alloc (size * sizeof (Type), alignof (Type));
+      if (unlikely (!arrayZ))
+      {
+        set_error ();
+        return false;
+      }
+      if (initialize)
+        grow_vector (size, hb_prioritize);
+      else
+        length = size;
+      return true;
+    }
+    return resize_full ((int) size, initialize, true);
+  }
+
+  template <typename allocator_t>
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  bool duplicate_vector_from_pool (allocator_t *allocator, const hb_vector_t &other)
+  {
+    if (unlikely (!allocate_from_pool (allocator, other.length, false)))
+      return false;
+    length = 0;
+    copy_array (other.as_array ());
+    return true;
+  }
+
+  template <typename allocator_t>
+  void shrink_back_to_pool (allocator_t *allocator, int size)
+  {
+    unsigned orig_length = length;
+
+    shrink (size, false);
+
+    if (allocator && !is_owned ())
+      allocator->discard (arrayZ + length, (orig_length - length) * sizeof (Type));
+  }
+
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  bool resize_full (int size_, bool initialize, bool exact)
   {
     unsigned int size = size_ < 0 ? 0u : (unsigned int) size_;
     if (!alloc (size, exact))
@@ -501,9 +611,20 @@ struct hb_vector_t
     length = size;
     return true;
   }
-  bool resize_exact (int size_, bool initialize = true)
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  bool resize (int size_)
   {
-    return resize (size_, initialize, true);
+    return resize_full (size_, true, false);
+  }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  bool resize_dirty (int size_)
+  {
+    return resize_full (size_, false, false);
+  }
+  HB_ALWAYS_INLINE_VECTOR_ALLOCS
+  bool resize_exact (int size_)
+  {
+    return resize_full (size_, true, true);
   }
 
   Type pop ()
@@ -544,7 +665,7 @@ struct hb_vector_t
 
     shrink_vector (size);
 
-    if (shrink_memory)
+    if (is_owned () && shrink_memory)
       alloc_exact (size); /* To force shrinking memory if needed. */
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-version.h b/src/java.desktop/share/native/libharfbuzz/hb-version.h
index e41286d2d8c..c673d1e3612 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-version.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-version.h
@@ -41,26 +41,26 @@ HB_BEGIN_DECLS
  *
  * The major component of the library version available at compile-time.
  */
-#define HB_VERSION_MAJOR 11
+#define HB_VERSION_MAJOR 12
 /**
  * HB_VERSION_MINOR:
  *
  * The minor component of the library version available at compile-time.
  */
-#define HB_VERSION_MINOR 2
+#define HB_VERSION_MINOR 3
 /**
  * HB_VERSION_MICRO:
  *
  * The micro component of the library version available at compile-time.
  */
-#define HB_VERSION_MICRO 0
+#define HB_VERSION_MICRO 2
 
 /**
  * HB_VERSION_STRING:
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "11.2.0"
+#define HB_VERSION_STRING "12.3.2"
 
 /**
  * HB_VERSION_ATLEAST:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb.hh b/src/java.desktop/share/native/libharfbuzz/hb.hh
index 8c430e5770d..7582abaa933 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb.hh
@@ -89,7 +89,6 @@
 #pragma GCC diagnostic error   "-Wstring-conversion"
 #pragma GCC diagnostic error   "-Wswitch-enum"
 #pragma GCC diagnostic error   "-Wtautological-overlap-compare"
-#pragma GCC diagnostic error   "-Wuninitialized"
 #pragma GCC diagnostic error   "-Wunneeded-internal-declaration"
 #pragma GCC diagnostic error   "-Wunused"
 #pragma GCC diagnostic error   "-Wunused-local-typedefs"
@@ -110,11 +109,21 @@
 #pragma GCC diagnostic warning "-Wformat-signedness"
 #pragma GCC diagnostic warning "-Wignored-pragma-optimize"
 #pragma GCC diagnostic warning "-Wlogical-op"
-#pragma GCC diagnostic warning "-Wmaybe-uninitialized"
 #pragma GCC diagnostic warning "-Wmissing-format-attribute"
+#pragma GCC diagnostic warning "-Wpessimizing-move"
 #pragma GCC diagnostic warning "-Wundef"
 #pragma GCC diagnostic warning "-Wunsafe-loop-optimizations"
 #pragma GCC diagnostic warning "-Wunused-but-set-variable"
+#ifdef __clang__
+// The following are too buggy on gcc
+// https://github.com/harfbuzz/harfbuzz/issues/5589
+// https://github.com/harfbuzz/harfbuzz/pull/5367
+#pragma GCC diagnostic warning "-Wmaybe-uninitialized"
+#pragma GCC diagnostic warning "-Wuninitialized"
+#else
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wuninitialized"
+#endif
 #endif
 
 /* Ignored currently, but should be fixed at some point. */
@@ -136,6 +145,7 @@
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wpacked" // Erratic impl in clang
 #pragma GCC diagnostic ignored "-Wrange-loop-analysis" // https://github.com/harfbuzz/harfbuzz/issues/2834
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
@@ -239,6 +249,8 @@
 // clang defines it so no need.
 #ifdef __has_builtin
 #define hb_has_builtin __has_builtin
+#elif defined(_MSC_VER)
+#define hb_has_builtin(x) 0
 #else
 #define hb_has_builtin(x) ((defined(__GNUC__) && __GNUC__ >= 5))
 #endif
@@ -314,6 +326,10 @@
 #endif
 #endif
 
+#ifndef HB_HOT
+#define HB_HOT __attribute__((hot))
+#endif
+
 /*
  * Borrowed from https://bugzilla.mozilla.org/show_bug.cgi?id=1215411
  * HB_FALLTHROUGH is an annotation to suppress compiler warnings about switch
@@ -553,4 +569,13 @@ extern "C" void  hb_free_impl(void *ptr);
 #include "hb-vector.hh" // Requires: hb-array hb-null
 #include "hb-object.hh" // Requires: hb-atomic hb-mutex hb-vector
 
+
+/* Our src/test-*.cc use hb_assert(), such that it's not compiled out under NDEBUG.
+ * https://github.com/harfbuzz/harfbuzz/issues/5418 */
+#define hb_always_assert(x) \
+        HB_STMT_START { \
+          if (!(x)) { fprintf(stderr, "Assertion failed: %s, at %s:%d\n", #x, __FILE__, __LINE__); abort(); } \
+        } HB_STMT_END
+
+
 #endif /* HB_HH */
diff --git a/src/java.desktop/share/native/libjsound/Utilities.c b/src/java.desktop/share/native/libjsound/Utilities.c
index 6e92813d53c..50ca18c0259 100644
--- a/src/java.desktop/share/native/libjsound/Utilities.c
+++ b/src/java.desktop/share/native/libjsound/Utilities.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,6 @@
 
 #include "Utilities.h"
 
-
-int UTIL_IsBigEndianPlatform() {
-#ifdef _LITTLE_ENDIAN
-    return 0;
-#else
-    return 1;
-#endif
-}
-
 void ThrowJavaMessageException(JNIEnv *e, const char *exClass, const char *msg) {
     jclass newExcCls;
 
diff --git a/src/java.desktop/share/native/libjsound/Utilities.h b/src/java.desktop/share/native/libjsound/Utilities.h
index fbecab1e005..7cb0dcbdd4c 100644
--- a/src/java.desktop/share/native/libjsound/Utilities.h
+++ b/src/java.desktop/share/native/libjsound/Utilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,6 @@
 #include "SoundDefs.h"
 #include "Configure.h"          // put flags for debug msgs etc. here
 
-// return 1 if this platform is big endian, or 0 for little endian
-int UTIL_IsBigEndianPlatform();
-
-
 // ERROR PRINTS
 #ifdef USE_ERROR
 #define ERROR0(string)                        { fprintf(stdout, (string)); fflush(stdout); }
diff --git a/src/java.desktop/share/native/liblcms/cmsalpha.c b/src/java.desktop/share/native/liblcms/cmsalpha.c
index 2e50b65be24..bcedbde938e 100644
--- a/src/java.desktop/share/native/liblcms/cmsalpha.c
+++ b/src/java.desktop/share/native/liblcms/cmsalpha.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -406,7 +406,7 @@ int FormatterPos(cmsUInt32Number frm)
 static
 cmsFormatterAlphaFn _cmsGetFormatterAlpha(cmsContext id, cmsUInt32Number in, cmsUInt32Number out)
 {
-static cmsFormatterAlphaFn FormattersAlpha[6][6] = {
+static const cmsFormatterAlphaFn FormattersAlpha[6][6] = {
 
        /* from 8 */  { copy8,       from8to16,   from8to16SE,   from8toHLF,   from8toFLT,    from8toDBL    },
        /* from 16*/  { from16to8,   copy16,      from16to16,    from16toHLF,  from16toFLT,   from16toDBL   },
diff --git a/src/java.desktop/share/native/liblcms/cmscam02.c b/src/java.desktop/share/native/liblcms/cmscam02.c
index 45ef4eef970..168ef597032 100644
--- a/src/java.desktop/share/native/liblcms/cmscam02.c
+++ b/src/java.desktop/share/native/liblcms/cmscam02.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -285,27 +285,32 @@ CAM02COLOR InverseCorrelates(CAM02COLOR clr, cmsCIECAM02* pMod)
            (clr.J / 100.0),
            (1.0 / (pMod->c * pMod->z)));
 
-    p1 = e / t;
     p2 = (clr.A / pMod->Nbb) + 0.305;
-    p3 = 21.0 / 20.0;
 
-    hr = clr.h * d2r;
-
-    if (fabs(sin(hr)) >= fabs(cos(hr))) {
-        p4 = p1 / sin(hr);
-        clr.b = (p2 * (2.0 + p3) * (460.0 / 1403.0)) /
-            (p4 + (2.0 + p3) * (220.0 / 1403.0) *
-            (cos(hr) / sin(hr)) - (27.0 / 1403.0) +
-            p3 * (6300.0 / 1403.0));
-        clr.a = clr.b * (cos(hr) / sin(hr));
+    if ( t <= 0.0 ) {     // special case from spec notes, avoid divide by zero
+        clr.a = clr.b = 0.0;
     }
     else {
-        p5 = p1 / cos(hr);
-        clr.a = (p2 * (2.0 + p3) * (460.0 / 1403.0)) /
-            (p5 + (2.0 + p3) * (220.0 / 1403.0) -
-            ((27.0 / 1403.0) - p3 * (6300.0 / 1403.0)) *
-            (sin(hr) / cos(hr)));
-        clr.b = clr.a * (sin(hr) / cos(hr));
+        hr = clr.h * d2r;
+        p1 = e / t;
+        p3 = 21.0 / 20.0;
+
+        if (fabs(sin(hr)) >= fabs(cos(hr))) {
+            p4 = p1 / sin(hr);
+            clr.b = (p2 * (2.0 + p3) * (460.0 / 1403.0)) /
+                (p4 + (2.0 + p3) * (220.0 / 1403.0) *
+                (cos(hr) / sin(hr)) - (27.0 / 1403.0) +
+                p3 * (6300.0 / 1403.0));
+            clr.a = clr.b * (cos(hr) / sin(hr));
+        }
+        else {
+            p5 = p1 / cos(hr);
+            clr.a = (p2 * (2.0 + p3) * (460.0 / 1403.0)) /
+                (p5 + (2.0 + p3) * (220.0 / 1403.0) -
+                ((27.0 / 1403.0) - p3 * (6300.0 / 1403.0)) *
+                (sin(hr) / cos(hr)));
+            clr.b = clr.a * (sin(hr) / cos(hr));
+        }
     }
 
     clr.RGBpa[0] = ((460.0 / 1403.0) * p2) +
diff --git a/src/java.desktop/share/native/liblcms/cmscgats.c b/src/java.desktop/share/native/liblcms/cmscgats.c
index 3e62d064c3f..e8a75c7355f 100644
--- a/src/java.desktop/share/native/liblcms/cmscgats.c
+++ b/src/java.desktop/share/native/liblcms/cmscgats.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -295,7 +295,7 @@ typedef struct {
         WRITEMODE as;      // How is supposed to be written
     } PROPERTY;
 
-static PROPERTY PredefinedProperties[] = {
+static const PROPERTY PredefinedProperties[] = {
 
         {"NUMBER_OF_FIELDS", WRITE_UNCOOKED},    // Required - NUMBER OF FIELDS
         {"NUMBER_OF_SETS",   WRITE_UNCOOKED},    // Required - NUMBER OF SETS
@@ -458,7 +458,7 @@ cmsBool StringAppend(string* s, char c)
         new_ptr = (char*) AllocChunk(s->it8, s->max);
         if (new_ptr == NULL) return FALSE;
 
-        if (new_ptr != NULL && s->begin != NULL)
+        if (s->begin != NULL)
             memcpy(new_ptr, s->begin, s->len);
 
         s->begin = new_ptr;
@@ -899,6 +899,11 @@ void InSymbol(cmsIT8* it8)
                     sign = -1;
                     NextCh(it8);
                 }
+                else
+                    if (it8->ch == '+') {
+                        sign = +1;
+                        NextCh(it8);
+                    }
 
                 it8->inum = 0;
                 it8->sy   = SINUM;
@@ -3206,7 +3211,7 @@ cmsBool ParseCube(cmsIT8* cube, cmsStage** Shaper, cmsStage** CLUT, char title[]
 
                 int nodes = lut_size * lut_size * lut_size;
 
-                cmsFloat32Number* lut_table = _cmsMalloc(cube->ContextID, nodes * 3 * sizeof(cmsFloat32Number));
+                cmsFloat32Number* lut_table = (cmsFloat32Number*) _cmsMalloc(cube->ContextID, nodes * 3 * sizeof(cmsFloat32Number));
                 if (lut_table == NULL) return FALSE;
 
                 for (i = 0; i < nodes; i++) {
diff --git a/src/java.desktop/share/native/liblcms/cmscnvrt.c b/src/java.desktop/share/native/liblcms/cmscnvrt.c
index 9f8619cb9da..c66dbcbebad 100644
--- a/src/java.desktop/share/native/liblcms/cmscnvrt.c
+++ b/src/java.desktop/share/native/liblcms/cmscnvrt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmserr.c b/src/java.desktop/share/native/liblcms/cmserr.c
index d421c550d32..877beb9ca6a 100644
--- a/src/java.desktop/share/native/liblcms/cmserr.c
+++ b/src/java.desktop/share/native/liblcms/cmserr.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsgamma.c b/src/java.desktop/share/native/liblcms/cmsgamma.c
index 773858b0c1f..bace6ab02e2 100644
--- a/src/java.desktop/share/native/liblcms/cmsgamma.c
+++ b/src/java.desktop/share/native/liblcms/cmsgamma.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -1187,6 +1187,7 @@ cmsBool smooth2(cmsContext ContextID, cmsFloat32Number w[], cmsFloat32Number y[]
     cmsFloat32Number *c, *d, *e;
     cmsBool st;
 
+    if (m < 4 || lambda < MATRIX_DET_TOLERANCE) return FALSE;
 
     c = (cmsFloat32Number*) _cmsCalloc(ContextID, MAX_NODES_IN_CURVE, sizeof(cmsFloat32Number));
     d = (cmsFloat32Number*) _cmsCalloc(ContextID, MAX_NODES_IN_CURVE, sizeof(cmsFloat32Number));
diff --git a/src/java.desktop/share/native/liblcms/cmsgmt.c b/src/java.desktop/share/native/liblcms/cmsgmt.c
index 03ac70202a5..1b023dcc299 100644
--- a/src/java.desktop/share/native/liblcms/cmsgmt.c
+++ b/src/java.desktop/share/native/liblcms/cmsgmt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmshalf.c b/src/java.desktop/share/native/liblcms/cmshalf.c
index 7e5f7a3c7e0..e1fb1d55488 100644
--- a/src/java.desktop/share/native/liblcms/cmshalf.c
+++ b/src/java.desktop/share/native/liblcms/cmshalf.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsintrp.c b/src/java.desktop/share/native/liblcms/cmsintrp.c
index 43c47429c3c..23e59a229a9 100644
--- a/src/java.desktop/share/native/liblcms/cmsintrp.c
+++ b/src/java.desktop/share/native/liblcms/cmsintrp.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -984,9 +984,9 @@ void Eval4Inputs(CMSREGISTER const cmsUInt16Number Input[],
                                 c1 = c2 = c3 = 0;
                             }
 
-        Rest = c1 * rx + c2 * ry + c3 * rz;
+        Rest = c1 * rx + c2 * ry + c3 * rz + 0x8001;
 
-        Tmp1[OutChan] = (cmsUInt16Number)(c0 + ROUND_FIXED_TO_INT(_cmsToFixedDomain(Rest)));
+        Tmp1[OutChan] = (cmsUInt16Number)c0 + ((Rest + (Rest >> 16)) >> 16);
     }
 
 
@@ -1048,9 +1048,9 @@ void Eval4Inputs(CMSREGISTER const cmsUInt16Number Input[],
                                 c1 = c2 = c3 = 0;
                             }
 
-        Rest = c1 * rx + c2 * ry + c3 * rz;
+        Rest = c1 * rx + c2 * ry + c3 * rz + 0x8001;
 
-        Tmp2[OutChan] = (cmsUInt16Number) (c0 + ROUND_FIXED_TO_INT(_cmsToFixedDomain(Rest)));
+        Tmp2[OutChan] = (cmsUInt16Number) c0 + ((Rest + (Rest >> 16)) >> 16);
     }
 
 
diff --git a/src/java.desktop/share/native/liblcms/cmsio0.c b/src/java.desktop/share/native/liblcms/cmsio0.c
index 5258b7939d2..5a4f09af5bc 100644
--- a/src/java.desktop/share/native/liblcms/cmsio0.c
+++ b/src/java.desktop/share/native/liblcms/cmsio0.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -685,6 +685,7 @@ void _cmsDeleteTagByPos(_cmsICCPROFILE* Icc, int i)
         // Free previous version
         if (Icc ->TagSaveAsRaw[i]) {
             _cmsFree(Icc ->ContextID, Icc ->TagPtrs[i]);
+            Icc->TagSaveAsRaw[i] = FALSE;
         }
         else {
             cmsTagTypeHandler* TypeHandler = Icc ->TagTypeHandlers[i];
@@ -1605,6 +1606,8 @@ void freeOneTag(_cmsICCPROFILE* Icc, cmsUInt32Number i)
         else
             _cmsFree(Icc->ContextID, Icc->TagPtrs[i]);
     }
+
+    Icc->TagPtrs[i] = NULL;
 }
 
 // Closes a profile freeing any involved resources
@@ -1847,8 +1850,11 @@ cmsBool CMSEXPORT cmsWriteTag(cmsHPROFILE hProfile, cmsTagSignature sig, const v
 
     if (!_cmsNewTag(Icc, sig, &i)) goto Error;
 
-    // This is not raw
-    Icc ->TagSaveAsRaw[i] = FALSE;
+    // This cannot be RAW
+    if (Icc->TagSaveAsRaw[i]) {
+        cmsSignalError(Icc->ContextID, cmsERROR_ALREADY_DEFINED, "Tag  '%x' was already saved as RAW", sig);
+        goto Error;
+    }
 
     // This is not a link
     Icc ->TagLinked[i] = (cmsTagSignature) 0;
diff --git a/src/java.desktop/share/native/liblcms/cmsio1.c b/src/java.desktop/share/native/liblcms/cmsio1.c
index 48772c7cbde..463f1192c2a 100644
--- a/src/java.desktop/share/native/liblcms/cmsio1.c
+++ b/src/java.desktop/share/native/liblcms/cmsio1.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -1012,7 +1012,13 @@ const cmsMLU* GetInfo(cmsHPROFILE hProfile, cmsInfoType Info)
     switch (Info) {
 
     case cmsInfoDescription:
-        sig = cmsSigProfileDescriptionTag;
+        /**
+        * Add for MacOS, which uses propiertary tags for description
+        */
+        if (cmsIsTag(hProfile, cmsSigProfileDescriptionMLTag))
+            sig = cmsSigProfileDescriptionMLTag;
+        else
+            sig = cmsSigProfileDescriptionTag;
         break;
 
     case cmsInfoManufacturer:
diff --git a/src/java.desktop/share/native/liblcms/cmslut.c b/src/java.desktop/share/native/liblcms/cmslut.c
index 3cf4e8cac5a..28220eae667 100644
--- a/src/java.desktop/share/native/liblcms/cmslut.c
+++ b/src/java.desktop/share/native/liblcms/cmslut.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsmd5.c b/src/java.desktop/share/native/liblcms/cmsmd5.c
index d9b9a4e5260..f18300ebace 100644
--- a/src/java.desktop/share/native/liblcms/cmsmd5.c
+++ b/src/java.desktop/share/native/liblcms/cmsmd5.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsmtrx.c b/src/java.desktop/share/native/liblcms/cmsmtrx.c
index 841da662a10..1db000752e3 100644
--- a/src/java.desktop/share/native/liblcms/cmsmtrx.c
+++ b/src/java.desktop/share/native/liblcms/cmsmtrx.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsnamed.c b/src/java.desktop/share/native/liblcms/cmsnamed.c
index 451bfe9f34d..acdaabc3ec2 100644
--- a/src/java.desktop/share/native/liblcms/cmsnamed.c
+++ b/src/java.desktop/share/native/liblcms/cmsnamed.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -303,7 +303,7 @@ cmsUInt32Number encodeUTF8(char* out, const wchar_t* in, cmsUInt32Number max_wch
     cmsUInt32Number size = 0;
     cmsUInt32Number len_w = 0;
 
-    while (*in && len_w < max_wchars)
+    while (len_w < max_wchars && *in)
     {
         if (*in >= 0xd800 && *in <= 0xdbff)
             codepoint = ((*in - 0xd800) << 10) + 0x10000;
@@ -1071,17 +1071,17 @@ cmsSEQ* CMSEXPORT cmsDupProfileSequenceDescription(const cmsSEQ* pseq)
     if (pseq == NULL)
         return NULL;
 
-    NewSeq = (cmsSEQ*) _cmsMalloc(pseq -> ContextID, sizeof(cmsSEQ));
+    NewSeq = (cmsSEQ*)_cmsMallocZero(pseq->ContextID, sizeof(cmsSEQ));
     if (NewSeq == NULL) return NULL;
 
+    NewSeq->ContextID = pseq->ContextID;
 
-    NewSeq -> seq      = (cmsPSEQDESC*) _cmsCalloc(pseq ->ContextID, pseq ->n, sizeof(cmsPSEQDESC));
-    if (NewSeq ->seq == NULL) goto Error;
+    NewSeq->seq = (cmsPSEQDESC*)_cmsCalloc(pseq->ContextID, pseq->n, sizeof(cmsPSEQDESC));
+    if (NewSeq->seq == NULL) goto Error;
 
-    NewSeq -> ContextID = pseq ->ContextID;
-    NewSeq -> n        = pseq ->n;
+    NewSeq->n = pseq->n;
 
-    for (i=0; i < pseq->n; i++) {
+    for (i = 0; i < pseq->n; i++) {
 
         memmove(&NewSeq ->seq[i].attributes, &pseq ->seq[i].attributes, sizeof(cmsUInt64Number));
 
diff --git a/src/java.desktop/share/native/liblcms/cmsopt.c b/src/java.desktop/share/native/liblcms/cmsopt.c
index 767008e68c5..9e71426a332 100644
--- a/src/java.desktop/share/native/liblcms/cmsopt.c
+++ b/src/java.desktop/share/native/liblcms/cmsopt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -698,11 +698,16 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3
     if (ColorSpace == (cmsColorSpaceSignature)0 ||
         OutputColorSpace == (cmsColorSpaceSignature)0) return FALSE;
 
-    nGridPoints = _cmsReasonableGridpointsByColorspace(ColorSpace, *dwFlags);
-
     // For empty LUTs, 2 points are enough
     if (cmsPipelineStageCount(*Lut) == 0)
         nGridPoints = 2;
+    else
+    {
+        nGridPoints = _cmsReasonableGridpointsByColorspace(ColorSpace, *dwFlags);
+
+        // Lab16 as input cannot be optimized by a CLUT due to centering issues, thanks to Mike Chaney for discovering this.
+        if (!(*dwFlags & cmsFLAGS_FORCE_CLUT) && (ColorSpace == cmsSigLabData) && (T_BYTES(*InputFormat) == 2)) return FALSE;
+    }
 
     Src = *Lut;
 
@@ -813,6 +818,11 @@ Error:
             Dest ->OutputChannels,
             DataSetOut);
 
+        if (p16 == NULL) {
+            cmsPipelineFree(Dest);
+            return FALSE;
+        }
+
         _cmsPipelineSetOptimizationParameters(Dest, PrelinEval16, (void*) p16, PrelinOpt16free, Prelin16dup);
     }
 
diff --git a/src/java.desktop/share/native/liblcms/cmspack.c b/src/java.desktop/share/native/liblcms/cmspack.c
index d430e73051d..b740567af3b 100644
--- a/src/java.desktop/share/native/liblcms/cmspack.c
+++ b/src/java.desktop/share/native/liblcms/cmspack.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmspcs.c b/src/java.desktop/share/native/liblcms/cmspcs.c
index 5f1b1f0d8e6..8c33057721e 100644
--- a/src/java.desktop/share/native/liblcms/cmspcs.c
+++ b/src/java.desktop/share/native/liblcms/cmspcs.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsplugin.c b/src/java.desktop/share/native/liblcms/cmsplugin.c
index aaad39f52b0..a943c9f4dd9 100644
--- a/src/java.desktop/share/native/liblcms/cmsplugin.c
+++ b/src/java.desktop/share/native/liblcms/cmsplugin.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -522,7 +522,7 @@ cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...)
     va_start(args, frm);
 
     len = vsnprintf((char*) Buffer, 2047, frm, args);
-    if (len < 0) {
+    if (len < 0 || len >= 2047) {
         va_end(args);
         return FALSE;   // Truncated, which is a fatal error for us
     }
diff --git a/src/java.desktop/share/native/liblcms/cmsps2.c b/src/java.desktop/share/native/liblcms/cmsps2.c
index 476817e9c1a..80f7c8084ae 100644
--- a/src/java.desktop/share/native/liblcms/cmsps2.c
+++ b/src/java.desktop/share/native/liblcms/cmsps2.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmssamp.c b/src/java.desktop/share/native/liblcms/cmssamp.c
index ca5c4a9d693..c54a0d4ea72 100644
--- a/src/java.desktop/share/native/liblcms/cmssamp.c
+++ b/src/java.desktop/share/native/liblcms/cmssamp.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -152,9 +152,12 @@ cmsBool  BlackPointAsDarkerColorant(cmsHPROFILE    hInput,
     // Convert black to Lab
     cmsDoTransform(xform, Black, &Lab, 1);
 
-    // Force it to be neutral, check for inconsistencies
-    Lab.a = Lab.b = 0;
-    if (Lab.L > 50 || Lab.L < 0) Lab.L = 0;
+    if (Lab.L > 95)
+        Lab.L = 0;  // for synthetical negative profiles
+    else if (Lab.L < 0)
+        Lab.L = 0;
+    else if (Lab.L > 50)
+        Lab.L = 50;
 
     // Free the resources
     cmsDeleteTransform(xform);
@@ -352,7 +355,7 @@ cmsFloat64Number RootOfLeastSquaresFitQuadraticCurve(int n, cmsFloat64Number x[]
     if (fabs(a) < 1.0E-10) {
 
         if (fabs(b) < 1.0E-10) return 0;
-        return cmsmin(0, cmsmax(50, -c/b ));
+        return cmsmax(0, cmsmin(50, -c/b ));
     }
     else {
 
diff --git a/src/java.desktop/share/native/liblcms/cmssm.c b/src/java.desktop/share/native/liblcms/cmssm.c
index e2a810a2669..b79cd85488b 100644
--- a/src/java.desktop/share/native/liblcms/cmssm.c
+++ b/src/java.desktop/share/native/liblcms/cmssm.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmstypes.c b/src/java.desktop/share/native/liblcms/cmstypes.c
index 22514f88226..eab74940cd0 100644
--- a/src/java.desktop/share/native/liblcms/cmstypes.c
+++ b/src/java.desktop/share/native/liblcms/cmstypes.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -4786,7 +4786,6 @@ cmsBool ReadMPEElem(struct _cms_typehandler_struct* self,
 
     return TRUE;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
     cmsUNUSED_PARAMETER(n);
 }
 
@@ -4894,9 +4893,11 @@ cmsBool Type_MPE_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, v
                  goto Error;
         }
 
+         Before = io ->Tell(io);
+
         if (!_cmsWriteUInt32Number(io, ElementSig)) goto Error;
         if (!_cmsWriteUInt32Number(io, 0)) goto Error;
-        Before = io ->Tell(io);
+
         if (!TypeHandler ->WritePtr(self, io, Elem, 1)) goto Error;
         if (!_cmsWriteAlignment(io)) goto Error;
 
@@ -5645,9 +5646,7 @@ void* Type_VideoSignal_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER*
 {
     cmsVideoSignalType* cicp = NULL;
 
-    if (SizeOfTag != 8) return NULL;
-
-    if (!_cmsReadUInt32Number(io, NULL)) return NULL;
+    if (SizeOfTag != 4) return NULL;
 
     cicp = (cmsVideoSignalType*)_cmsCalloc(self->ContextID, 1, sizeof(cmsVideoSignalType));
     if (cicp == NULL) return NULL;
@@ -5671,7 +5670,6 @@ cmsBool Type_VideoSignal_Write(struct _cms_typehandler_struct* self, cmsIOHANDLE
 {
     cmsVideoSignalType* cicp = (cmsVideoSignalType*)Ptr;
 
-    if (!_cmsWriteUInt32Number(io, 0)) return FALSE;
     if (!_cmsWriteUInt8Number(io, cicp->ColourPrimaries)) return FALSE;
     if (!_cmsWriteUInt8Number(io, cicp->TransferCharacteristics)) return FALSE;
     if (!_cmsWriteUInt8Number(io, cicp->MatrixCoefficients)) return FALSE;
@@ -5744,11 +5742,11 @@ void Type_MHC2_Free(struct _cms_typehandler_struct* self, void* Ptr)
 
 void* Type_MHC2_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
 {
-    cmsMHC2Type* mhc2 = _cmsDupMem(self->ContextID, Ptr, sizeof(cmsMHC2Type));
+    cmsMHC2Type* mhc2 = (cmsMHC2Type*)_cmsDupMem(self->ContextID, Ptr, sizeof(cmsMHC2Type));
 
-    mhc2->RedCurve = _cmsDupMem(self->ContextID,   mhc2->RedCurve, mhc2->CurveEntries*sizeof(cmsFloat64Number));
-    mhc2->GreenCurve = _cmsDupMem(self->ContextID, mhc2->GreenCurve, mhc2->CurveEntries * sizeof(cmsFloat64Number));
-    mhc2->BlueCurve = _cmsDupMem(self->ContextID,  mhc2->BlueCurve, mhc2->CurveEntries * sizeof(cmsFloat64Number));
+    mhc2->RedCurve = (cmsFloat64Number*) _cmsDupMem(self->ContextID,   mhc2->RedCurve, mhc2->CurveEntries*sizeof(cmsFloat64Number));
+    mhc2->GreenCurve = (cmsFloat64Number*) _cmsDupMem(self->ContextID, mhc2->GreenCurve, mhc2->CurveEntries * sizeof(cmsFloat64Number));
+    mhc2->BlueCurve = (cmsFloat64Number*) _cmsDupMem(self->ContextID,  mhc2->BlueCurve, mhc2->CurveEntries * sizeof(cmsFloat64Number));
 
     if (mhc2->RedCurve == NULL ||
         mhc2->GreenCurve == NULL ||
@@ -5786,7 +5784,6 @@ cmsBool Type_MHC2_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
     cmsUInt32Number MatrixOffset;
     cmsUInt32Number OffsetRedTable, OffsetGreenTable, OffsetBlueTable;
 
-    if (!_cmsWriteUInt32Number(io, 0)) return FALSE;
     if (!_cmsWriteUInt32Number(io, mhc2->CurveEntries)) return FALSE;
 
     if (!_cmsWrite15Fixed16Number(io, mhc2->MinLuminance)) return FALSE;
@@ -5811,10 +5808,20 @@ cmsBool Type_MHC2_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io,
     }
 
     OffsetRedTable = io->Tell(io) - BaseOffset;
+
+    if(!_cmsWriteUInt32Number(io, cmsSigS15Fixed16ArrayType)) return FALSE;
+    if(!_cmsWriteUInt32Number(io, 0)) return FALSE;
+
     if (!WriteDoubles(io, mhc2->CurveEntries, mhc2->RedCurve)) return FALSE;
+
     OffsetGreenTable = io->Tell(io) - BaseOffset;
+    if (!_cmsWriteUInt32Number(io, cmsSigS15Fixed16ArrayType)) return FALSE;
+    if (!_cmsWriteUInt32Number(io, 0)) return FALSE;
     if (!WriteDoubles(io, mhc2->CurveEntries, mhc2->GreenCurve)) return FALSE;
+
     OffsetBlueTable = io->Tell(io) - BaseOffset;
+    if (!_cmsWriteUInt32Number(io, cmsSigS15Fixed16ArrayType)) return FALSE;
+    if (!_cmsWriteUInt32Number(io, 0)) return FALSE;
     if (!WriteDoubles(io, mhc2->CurveEntries, mhc2->BlueCurve)) return FALSE;
 
     if (!io->Seek(io, TablesOffsetPos)) return FALSE;
@@ -5858,8 +5865,6 @@ void* Type_MHC2_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms
     cmsUInt32Number MatrixOffset;
     cmsUInt32Number OffsetRedTable, OffsetGreenTable, OffsetBlueTable;
 
-    if (!_cmsReadUInt32Number(io, NULL)) return NULL;
-
     mhc2 = (cmsMHC2Type*)_cmsCalloc(self->ContextID, 1, sizeof(cmsMHC2Type));
     if (mhc2 == NULL) return NULL;
 
@@ -5890,9 +5895,10 @@ void* Type_MHC2_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms
         if (!ReadDoublesAt(io, BaseOffset + MatrixOffset, 3*4, &mhc2->XYZ2XYZmatrix[0][0])) goto Error;
     }
 
-    if (!ReadDoublesAt(io, BaseOffset + OffsetRedTable, mhc2->CurveEntries, mhc2->RedCurve)) goto Error;
-    if (!ReadDoublesAt(io, BaseOffset + OffsetGreenTable, mhc2->CurveEntries, mhc2->GreenCurve)) goto Error;
-    if (!ReadDoublesAt(io, BaseOffset + OffsetBlueTable, mhc2->CurveEntries, mhc2->BlueCurve)) goto Error;
+    // Skip sf32 tag and filler (8bytes)
+    if (!ReadDoublesAt(io, BaseOffset + OffsetRedTable + 8, mhc2->CurveEntries, mhc2->RedCurve)) goto Error;
+    if (!ReadDoublesAt(io, BaseOffset + OffsetGreenTable + 8, mhc2->CurveEntries, mhc2->GreenCurve)) goto Error;
+    if (!ReadDoublesAt(io, BaseOffset + OffsetBlueTable + 8, mhc2->CurveEntries, mhc2->BlueCurve)) goto Error;
 
     // Success
     *nItems = 1;
diff --git a/src/java.desktop/share/native/liblcms/cmsvirt.c b/src/java.desktop/share/native/liblcms/cmsvirt.c
index 1ef86dae054..0dfc6e947a5 100644
--- a/src/java.desktop/share/native/liblcms/cmsvirt.c
+++ b/src/java.desktop/share/native/liblcms/cmsvirt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -400,7 +400,7 @@ int InkLimitingSampler(CMSREGISTER const cmsUInt16Number In[], CMSREGISTER cmsUI
     SumCMY   = (cmsFloat64Number) In[0]  + In[1] + In[2];
     SumCMYK  = SumCMY + In[3];
 
-    if (SumCMYK > InkLimit) {
+    if (SumCMYK > InkLimit && SumCMY > 0) {
 
         Ratio = 1 - ((SumCMYK - InkLimit) / SumCMY);
         if (Ratio < 0)
@@ -513,16 +513,20 @@ cmsHPROFILE CMSEXPORT cmsCreateLab2ProfileTHR(cmsContext ContextID, const cmsCIE
     cmsSetColorSpace(hProfile,  cmsSigLabData);
     cmsSetPCS(hProfile,         cmsSigLabData);
 
-    if (!SetTextTags(hProfile, L"Lab identity built-in")) return NULL;
+    if (!SetTextTags(hProfile, L"Lab identity built-in"))
+        goto Error;
 
     // An identity LUT is all we need
     LUT = cmsPipelineAlloc(ContextID, 3, 3);
-    if (LUT == NULL) goto Error;
+    if (LUT == NULL)
+        goto Error;
 
     if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCLut(ContextID, 3)))
         goto Error;
 
-    if (!cmsWriteTag(hProfile, cmsSigAToB0Tag, LUT)) goto Error;
+    if (!cmsWriteTag(hProfile, cmsSigAToB0Tag, LUT))
+        goto Error;
+
     cmsPipelineFree(LUT);
 
     return hProfile;
@@ -550,8 +554,14 @@ cmsHPROFILE CMSEXPORT cmsCreateLab4ProfileTHR(cmsContext ContextID, const cmsCIE
 {
     cmsHPROFILE hProfile;
     cmsPipeline* LUT = NULL;
+    cmsCIEXYZ xyz;
 
-    hProfile = cmsCreateRGBProfileTHR(ContextID, WhitePoint == NULL ? cmsD50_xyY() : WhitePoint, NULL, NULL);
+    if (WhitePoint == NULL)
+        xyz = *cmsD50_XYZ();
+    else
+        cmsxyY2XYZ(&xyz, WhitePoint);
+
+    hProfile = cmsCreateRGBProfileTHR(ContextID, NULL, NULL, NULL);
     if (hProfile == NULL) return NULL;
 
     cmsSetProfileVersion(hProfile, 4.4);
@@ -560,6 +570,7 @@ cmsHPROFILE CMSEXPORT cmsCreateLab4ProfileTHR(cmsContext ContextID, const cmsCIE
     cmsSetColorSpace(hProfile,  cmsSigLabData);
     cmsSetPCS(hProfile,         cmsSigLabData);
 
+    if (!cmsWriteTag(hProfile, cmsSigMediaWhitePointTag, &xyz)) goto Error;
     if (!SetTextTags(hProfile, L"Lab identity built-in")) goto Error;
 
     // An empty LUTs is all we need
@@ -929,25 +940,24 @@ cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
 
     for (i=0; i < MAX_INPUT_DIMENSIONS; i++) Dimensions[i] = nLUTPoints;
     CLUT = cmsStageAllocCLut16bitGranular(ContextID, Dimensions, 3, 3, NULL);
-    if (CLUT == NULL) goto Error;
-
-
-    if (!cmsStageSampleCLut16bit(CLUT, bchswSampler, (void*) &bchsw, 0)) {
-
-        // Shouldn't reach here
+    if (CLUT == NULL)
         goto Error;
-    }
 
-    if (!cmsPipelineInsertStage(Pipeline, cmsAT_END, CLUT)) {
+    if (!cmsStageSampleCLut16bit(CLUT, bchswSampler, (void*) &bchsw, 0))
+        goto Error;
+
+    if (!cmsPipelineInsertStage(Pipeline, cmsAT_END, CLUT))
         goto Error;
-    }
 
     // Create tags
-    if (!SetTextTags(hICC, L"BCHS built-in")) return NULL;
+    if (!SetTextTags(hICC, L"BCHS built-in"))
+        goto Error;
 
-    cmsWriteTag(hICC, cmsSigMediaWhitePointTag, (void*) cmsD50_XYZ());
+    if (!cmsWriteTag(hICC, cmsSigMediaWhitePointTag, (void*)cmsD50_XYZ()))
+        goto Error;
 
-    cmsWriteTag(hICC, cmsSigAToB0Tag, (void*) Pipeline);
+    if (!cmsWriteTag(hICC, cmsSigAToB0Tag, (void*)Pipeline))
+        goto Error;
 
     // Pipeline is already on virtual profile
     cmsPipelineFree(Pipeline);
diff --git a/src/java.desktop/share/native/liblcms/cmswtpnt.c b/src/java.desktop/share/native/liblcms/cmswtpnt.c
index ebba2cd6a97..f6337765c0c 100644
--- a/src/java.desktop/share/native/liblcms/cmswtpnt.c
+++ b/src/java.desktop/share/native/liblcms/cmswtpnt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsxform.c b/src/java.desktop/share/native/liblcms/cmsxform.c
index 1eb3eecbf18..b5dd302b973 100644
--- a/src/java.desktop/share/native/liblcms/cmsxform.c
+++ b/src/java.desktop/share/native/liblcms/cmsxform.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -1101,6 +1101,8 @@ cmsBool  IsProperColorSpace(cmsColorSpaceSignature Check, cmsUInt32Number dwForm
     int Space1 = (int) T_COLORSPACE(dwFormat);
     int Space2 = _cmsLCMScolorSpace(Check);
 
+    if (dwFormat == 0) return TRUE; // Bypass used by linkicc
+
     if (Space1 == PT_ANY) return (T_CHANNELS(dwFormat) == cmsChannelsOf(Check));
     if (Space1 == Space2) return TRUE;
 
@@ -1183,6 +1185,11 @@ cmsHTRANSFORM CMSEXPORT cmsCreateExtendedTransform(cmsContext ContextID,
         if (hGamutProfile == NULL) dwFlags &= ~cmsFLAGS_GAMUTCHECK;
     }
 
+    if ((dwFlags & cmsFLAGS_GAMUTCHECK) && (nGamutPCSposition <= 0 || nGamutPCSposition >= nProfiles - 1)) {
+        cmsSignalError(ContextID, cmsERROR_RANGE, "Wrong gamut PCS position '%d'", nGamutPCSposition);
+        return NULL;
+    }
+
     // On floating point transforms, inhibit cache
     if (_cmsFormatterIsFloat(InputFormat) || _cmsFormatterIsFloat(OutputFormat))
         dwFlags |= cmsFLAGS_NOCACHE;
diff --git a/src/java.desktop/share/native/liblcms/lcms2.h b/src/java.desktop/share/native/liblcms/lcms2.h
index 5ba09661308..17a52384721 100644
--- a/src/java.desktop/share/native/liblcms/lcms2.h
+++ b/src/java.desktop/share/native/liblcms/lcms2.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2025 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -52,7 +52,7 @@
 //
 //---------------------------------------------------------------------------------
 //
-// Version 2.17
+// Version 2.18
 //
 
 #ifndef _lcms2_H
@@ -116,7 +116,7 @@ extern "C" {
 #endif
 
 // Version/release
-#define LCMS_VERSION        2170
+#define LCMS_VERSION        2180
 
 // I will give the chance of redefining basic types for compilers that are not fully C99 compliant
 #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED
diff --git a/src/java.desktop/share/native/liblcms/lcms2_internal.h b/src/java.desktop/share/native/liblcms/lcms2_internal.h
index d14c0dd823e..6bfe67e5350 100644
--- a/src/java.desktop/share/native/liblcms/lcms2_internal.h
+++ b/src/java.desktop/share/native/liblcms/lcms2_internal.h
@@ -30,7 +30,7 @@
 
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/lcms2_plugin.h b/src/java.desktop/share/native/liblcms/lcms2_plugin.h
index bdfc76f6bf5..85de9bc56d5 100644
--- a/src/java.desktop/share/native/liblcms/lcms2_plugin.h
+++ b/src/java.desktop/share/native/liblcms/lcms2_plugin.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2024 Marti Maria Saguer
+//  Copyright (c) 1998-2026 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c
index fa9a186d6d7..bc2df9b0b1a 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,7 @@
 #include "mlib_ImageCheck.h"
 #include "mlib_SysMath.h"
 #include "mlib_ImageConv.h"
+#include "safe_math.h"
 
 /***************************************************************/
 static void mlib_ImageConvMxNMulAdd_F32(mlib_f32       *dst,
@@ -272,6 +273,9 @@ mlib_status mlib_convMxNext_f32(mlib_image       *dst,
   mlib_s32 nch = mlib_ImageGetChannels(dst);
   mlib_s32 i, j, j1, k;
 
+  if (!SAFE_TO_MULT(3, wid_e) || !SAFE_TO_ADD(3 * wid_e, m)) {
+    return MLIB_FAILURE;
+  }
   if (3 * wid_e + m > 1024) {
     dsa = mlib_malloc((3 * wid_e + m) * sizeof(mlib_d64));
 
@@ -629,6 +633,9 @@ mlib_status mlib_convMxNext_d64(mlib_image       *dst,
   mlib_s32 nch = mlib_ImageGetChannels(dst);
   mlib_s32 i, j, j1, k;
 
+  if (!SAFE_TO_MULT(3, wid_e) || !SAFE_TO_ADD(3 * wid_e, m)) {
+    return MLIB_FAILURE;
+  }
   if (3 * wid_e + m > 1024) {
     dsa = mlib_malloc((3 * wid_e + m) * sizeof(mlib_d64));
 
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c
index ee15935dcfe..5869b0a54af 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,6 +82,7 @@
 
 #include "mlib_image.h"
 #include "mlib_ImageConv.h"
+#include "safe_math.h"
 
 /***************************************************************/
 static void mlib_ImageConvMxNMulAdd_S32(mlib_d64       *dst,
@@ -229,6 +230,9 @@ mlib_status mlib_convMxNext_s32(mlib_image       *dst,
 
   /* internal buffer */
 
+  if (!SAFE_TO_MULT(3, wid_e) || !SAFE_TO_ADD(3 * wid_e, m)) {
+    return MLIB_FAILURE;
+  }
   if (3 * wid_e + m > 1024) {
     dsa = mlib_malloc((3 * wid_e + m) * sizeof(mlib_d64));
 
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
index 57486b1cae5..00469d25719 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "mlib_image.h"
 #include "mlib_ImageConv.h"
 #include "mlib_c_ImageConv.h"
+#include "safe_math.h"
 
 /*
  * This define switches between functions of different data types
@@ -260,8 +261,14 @@ static mlib_status mlib_ImageConv1xN_ext(mlib_image       *dst,
   if (max_hsize > hgt) max_hsize = hgt;
 
   shgt = hgt + (n - 1);
+  if (!SAFE_TO_ADD(max_hsize, (n - 1))) {
+    return MLIB_FAILURE;
+  }
   smax_hsize = max_hsize + (n - 1);
 
+  if (!SAFE_TO_ADD(smax_hsize, 1) || !SAFE_TO_MULT(2, (smax_hsize + 1))) {
+    return MLIB_FAILURE;
+  }
   bsize = 2 * (smax_hsize + 1);
 
   if (bsize > BUFF_SIZE) {
@@ -509,8 +516,16 @@ mlib_status CONV_FUNC_MxN
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_ADD(wid, (m - 1))) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   swid = wid + (m - 1);
 
+  if (!SAFE_TO_MULT((n + 3), swid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 3)*swid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
@@ -919,8 +934,14 @@ mlib_status CONV_FUNC_MxN_I
   chan1 = nchannel;
   chan2 = chan1 + chan1;
 
+  if (!SAFE_TO_ADD(wid, (m - 1))) {
+    return MLIB_FAILURE;
+  }
   swid = wid + (m - 1);
 
+  if (!SAFE_TO_MULT((n + 2), swid)) {
+    return MLIB_FAILURE;
+  }
   bsize = (n + 2)*swid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
index 3b6985b7876..2e035d12453 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 
 #include "mlib_image.h"
 #include "mlib_c_ImageConv.h"
+#include "safe_math.h"
 
 /*
   This define switches between functions of different data types
@@ -466,6 +467,10 @@ mlib_status CONV_FUNC(MxN)(mlib_image       *dst,
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_MULT((n + 3), wid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 3)*wid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
index 380ed044878..bb264d9dcd2 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 
 #include "mlib_image.h"
 #include "mlib_ImageConv.h"
+#include "safe_math.h"
 
 /***************************************************************/
 #define CACHE_SIZE (64*1024)
@@ -335,6 +336,10 @@ mlib_status CONV_FUNC(MxN)(mlib_image       *dst,
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_MULT((n + 2), wid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 2)*wid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
index c8b58e6f138..136d5a2b814 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "mlib_image.h"
 #include "mlib_ImageConv.h"
 #include "mlib_c_ImageConv.h"
+#include "safe_math.h"
 
 /*
  * This define switches between functions of different data types
@@ -245,8 +246,14 @@ static mlib_status mlib_ImageConv1xN_ext(mlib_image       *dst,
   if (max_hsize > hgt) max_hsize = hgt;
 
   shgt = hgt + (n - 1);
+  if (!SAFE_TO_ADD(max_hsize, (n - 1))) {
+    return MLIB_FAILURE;
+  }
   smax_hsize = max_hsize + (n - 1);
 
+  if (!SAFE_TO_ADD(smax_hsize, 1) || !SAFE_TO_MULT(2, (smax_hsize + 1))) {
+    return MLIB_FAILURE;
+  }
   bsize = 2 * (smax_hsize + 1);
 
   if (bsize > BUFF_SIZE) {
@@ -494,8 +501,16 @@ mlib_status CONV_FUNC_MxN
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_ADD(wid, (m - 1))) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   swid = wid + (m - 1);
 
+  if (!SAFE_TO_MULT((n + 3), swid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 3)*swid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
@@ -904,8 +919,14 @@ mlib_status CONV_FUNC_MxN_I
   chan1 = nchannel;
   chan2 = chan1 + chan1;
 
+  if (!SAFE_TO_ADD(wid, (m - 1))) {
+    return MLIB_FAILURE;
+  }
   swid = wid + (m - 1);
 
+  if (!SAFE_TO_MULT((n + 2), swid)) {
+    return MLIB_FAILURE;
+  }
   bsize = (n + 2)*swid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
index f65fda45c58..c144404b0f4 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "mlib_image.h"
 #include "mlib_ImageConv.h"
 #include "mlib_c_ImageConv.h"
+#include "safe_math.h"
 
 /*
   This define switches between functions of different data types
@@ -467,6 +468,10 @@ mlib_status CONV_FUNC(MxN)(mlib_image       *dst,
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_MULT((n + 3), wid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 3)*wid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
index b2757979a84..81a06f2fc28 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 #include "mlib_image.h"
 #include "mlib_ImageConv.h"
 #include "mlib_c_ImageConv.h"
+#include "safe_math.h"
 
 /*
  * This define switches between functions of different data types
@@ -270,8 +271,14 @@ static mlib_status mlib_ImageConv1xN_ext(mlib_image       *dst,
   if (max_hsize > hgt) max_hsize = hgt;
 
   shgt = hgt + (n - 1);
+  if (!SAFE_TO_ADD(max_hsize, (n - 1))) {
+    return MLIB_FAILURE;
+  }
   smax_hsize = max_hsize + (n - 1);
 
+  if (!SAFE_TO_ADD(smax_hsize, 1) || !SAFE_TO_MULT(2, (smax_hsize + 1))) {
+    return MLIB_FAILURE;
+  }
   bsize = 2 * (smax_hsize + 1);
 
   if (bsize > BUFF_SIZE) {
@@ -519,8 +526,16 @@ mlib_status CONV_FUNC_MxN
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_ADD(wid, (m - 1))) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   swid = wid + (m - 1);
 
+  if (!SAFE_TO_MULT((n + 3), swid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 3)*swid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
@@ -927,8 +942,14 @@ mlib_status CONV_FUNC_MxN_I
   chan1 = nchannel;
   chan2 = chan1 + chan1;
 
+  if (!SAFE_TO_ADD(wid, (m - 1))) {
+    return MLIB_FAILURE;
+  }
   swid = wid + (m - 1);
 
+  if (!SAFE_TO_MULT((n + 2), swid)) {
+    return MLIB_FAILURE;
+  }
   bsize = (n + 2)*swid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
index a3234cf8959..49412c7d7ef 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 
 #include "mlib_image.h"
 #include "mlib_c_ImageConv.h"
+#include "safe_math.h"
 
 /*
   This define switches between functions of different data types
@@ -466,6 +467,10 @@ mlib_status CONV_FUNC(MxN)(mlib_image       *dst,
     FREE_AND_RETURN_STATUS;
   }
 
+  if (!SAFE_TO_MULT((n + 3), wid)) {
+    status = MLIB_FAILURE;
+    FREE_AND_RETURN_STATUS;
+  }
   bsize = (n + 3)*wid;
 
   if ((bsize > BUFF_SIZE) || (n > MAX_N)) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c
index 2e77c20aa57..cfd5e3e671e 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,7 @@
 
 #include "mlib_image.h"
 #include "mlib_ImageLookUp.h"
+#include "safe_math.h"
 
 /***************************************************************/
 #define MAX_WIDTH  512
@@ -302,6 +303,9 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(const mlib_u8 *src,
   mlib_u8  *buff = (mlib_u8*)buff_lcl, *buffs;
   mlib_u32 val0, val1;
 
+  if (!SAFE_TO_MULT(xsize, 2)) {
+    return MLIB_FAILURE;
+  }
   size = xsize * 2;
 
   if (size > MAX_WIDTH) {
@@ -440,6 +444,9 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(const mlib_u8 *src,
   mlib_u8  *buff = (mlib_u8*)buff_lcl, *buffs;
   mlib_u32 l0, h0, v0, l1, h1, v1, l2, h2, v2;
 
+  if (!SAFE_TO_MULT(3, xsize)) {
+    return MLIB_FAILURE;
+  }
   size = 3 * xsize;
 
   if (size > MAX_WIDTH) {
@@ -583,6 +590,9 @@ mlib_status mlib_ImageLookUp_Bit_U8_4(const mlib_u8 *src,
   mlib_u8  *buff = (mlib_u8*)buff_lcl, *buffs;
   mlib_u32 l, h;
 
+  if (!SAFE_TO_MULT(xsize, 4)) {
+    return MLIB_FAILURE;
+  }
   size = xsize * 4;
 
   if (size > MAX_WIDTH) {
diff --git a/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c b/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c
index a6f4cfdd36e..72adc212af6 100644
--- a/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c
+++ b/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,6 +101,11 @@ mlib_status mlib_AffineEdges(mlib_affine_param *param,
     return MLIB_FAILURE;
   }
 
+  int intSize = sizeof(mlib_s32);
+  if (!SAFE_TO_MULT(dstHeight, intSize) ||
+      !SAFE_TO_ADD(dstHeight * intSize, 7)) {
+    return MLIB_FAILURE;
+  }
   bsize0 = (dstHeight * sizeof(mlib_s32) + 7) & ~7;
 
   if (lineAddr == NULL) {
@@ -109,6 +114,10 @@ mlib_status mlib_AffineEdges(mlib_affine_param *param,
 
   param->buff_malloc = NULL;
 
+  if (!SAFE_TO_MULT(4, bsize0) || !SAFE_TO_ADD(4 * bsize0, bsize1)) {
+    return MLIB_FAILURE;
+  }
+
   if ((4 * bsize0 + bsize1) > buff_size) {
     buff = param->buff_malloc = mlib_malloc(4 * bsize0 + bsize1);
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
index 2478fd0fc08..af9fcff6eb3 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
@@ -5988,7 +5988,7 @@ Version 1.6.32rc01 [August 18, 2017]
 
 Version 1.6.32rc02 [August 22, 2017]
   Added contrib/oss-fuzz directory which contains files used by the oss-fuzz
-    project (https://github.com/google/oss-fuzz/tree/master/projects/libpng).
+    project <https://github.com/google/oss-fuzz/tree/master/projects/libpng>.
 
 Version 1.6.32 [August 24, 2017]
   No changes.
@@ -6304,7 +6304,40 @@ Version 1.6.51 [November 21, 2025]
   Added GitHub Actions workflows for automated testing.
   Performed various refactorings and cleanups.
 
+Version 1.6.52 [December 3, 2025]
+  Fixed CVE-2025-66293 (high severity):
+    Out-of-bounds read in `png_image_read_composite`.
+    (Reported by flyfish101 <flyfish101@users.noreply.github.com>.)
+  Fixed the Paeth filter handling in the RISC-V RVV implementation.
+    (Reported by Filip Wasil; fixed by Liang Junzhao.)
+  Improved the performance of the RISC-V RVV implementation.
+    (Contributed by Liang Junzhao.)
+  Added allocation failure fuzzing to oss-fuzz.
+    (Contributed by Philippe Antoine.)
+
+Version 1.6.53 [December 5, 2025]
+  Fixed a build failure on RISC-V RVV caused by a misspelled intrinsic.
+    (Contributed by Alexander Smorkalov.)
+  Fixed a build failure with CMake 4.1 or newer, on Windows, when using
+    Visual C++ without MASM installed.
+
+Version 1.6.54 [January 12, 2026]
+  Fixed CVE-2026-22695 (medium severity):
+    Heap buffer over-read in `png_image_read_direct_scaled`.
+    (Reported and fixed by Petr Simecek.)
+  Fixed CVE-2026-22801 (medium severity):
+    Integer truncation causing heap buffer over-read in `png_image_write_*`.
+  Implemented various improvements in oss-fuzz.
+    (Contributed by Philippe Antoine.)
+
+Version 1.6.55 [February 9, 2026]
+  Fixed CVE-2026-25646 (high severity):
+    Heap buffer overflow in `png_set_quantize`.
+    (Reported and fixed by Joshua Inscoe.)
+  Resolved an oss-fuzz build issue involving nalloc.
+    (Contributed by Philippe Antoine.)
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
 Subscription is required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+<https://lists.sourceforge.net/lists/listinfo/png-mng-implement>
 to subscribe.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
index ea6df986cb6..1b765ae9f96 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2025 The PNG Reference Library Authors.
- * Copyright (c) 2018-2025 Cosmin Truta.
+ * Copyright (c) 1995-2026 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2026 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README
index 5ea329ee3da..6e0d1e33137 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/README
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.51
+README for libpng version 1.6.55
 ================================
 
 See the note about version numbers near the top of `png.h`.
@@ -24,14 +24,14 @@ for more things than just PNG files.  You can use zlib as a drop-in
 replacement for `fread()` and `fwrite()`, if you are so inclined.
 
 zlib should be available at the same place that libpng is, or at
-https://zlib.net .
+<https://zlib.net>.
 
 You may also want a copy of the PNG specification.  It is available
 as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find
-these at http://www.libpng.org/pub/png/pngdocs.html .
+these at <http://www.libpng.org/pub/png/pngdocs.html>.
 
-This code is currently being archived at https://libpng.sourceforge.io
-in the download area, and at http://libpng.download/src .
+This code is currently being archived at <https://libpng.sourceforge.io>
+in the download area, and at <http://libpng.download/src>.
 
 This release, based in a large way on Glenn's, Guy's and Andreas'
 earlier work, was created and will be supported by myself and the PNG
@@ -39,12 +39,12 @@ development group.
 
 Send comments, corrections and commendations to `png-mng-implement`
 at `lists.sourceforge.net`.  (Subscription is required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+<https://lists.sourceforge.net/lists/listinfo/png-mng-implement>
 to subscribe.)
 
 Send general questions about the PNG specification to `png-mng-misc`
 at `lists.sourceforge.net`.  (Subscription is required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-misc
+<https://lists.sourceforge.net/lists/listinfo/png-mng-misc>
 to subscribe.)
 
 Historical notes
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
index 7d85e7c8d5f..955fda8dd7e 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2025 Cosmin Truta
+ * Copyright (c) 2018-2026 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -42,7 +42,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_51 Your_png_h_is_not_version_1_6_51;
+typedef png_libpng_version_1_6_55 Your_png_h_is_not_version_1_6_55;
 
 /* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
  * corresponding macro definitions.  This causes a compile time failure if
@@ -130,7 +130,8 @@ png_sig_cmp(png_const_bytep sig, size_t start, size_t num_to_check)
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 /* Function to allocate memory for zlib */
 PNG_FUNCTION(voidpf /* PRIVATE */,
-png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
+png_zalloc,(voidpf png_ptr, uInt items, uInt size),
+    PNG_ALLOCATED)
 {
    png_alloc_size_t num_bytes = size;
 
@@ -286,7 +287,8 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
 PNG_FUNCTION(png_structp /* PRIVATE */,
 png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
+    png_malloc_ptr malloc_fn, png_free_ptr free_fn),
+    PNG_ALLOCATED)
 {
    png_struct create_struct;
 #  ifdef PNG_SETJMP_SUPPORTED
@@ -390,7 +392,8 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
 
 /* Allocate the memory for an info_struct for the application. */
 PNG_FUNCTION(png_infop,PNGAPI
-png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED)
+png_create_info_struct,(png_const_structrp png_ptr),
+    PNG_ALLOCATED)
 {
    png_inforp info_ptr;
 
@@ -846,8 +849,8 @@ png_get_copyright(png_const_structrp png_ptr)
    return PNG_STRING_COPYRIGHT
 #else
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.51" PNG_STRING_NEWLINE \
-      "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
+      "libpng version 1.6.55" PNG_STRING_NEWLINE \
+      "Copyright (c) 2018-2026 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
@@ -2286,8 +2289,8 @@ PNG_FP_End:
 int
 png_check_fp_string(png_const_charp string, size_t size)
 {
-   int        state=0;
-   size_t char_index=0;
+   int state = 0;
+   size_t char_index = 0;
 
    if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
       (char_index == size || string[char_index] == 0))
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
index d39ff73552c..e95c0444399 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
@@ -29,9 +29,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.51
+ * libpng version 1.6.55
  *
- * Copyright (c) 2018-2025 Cosmin Truta
+ * Copyright (c) 2018-2026 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -43,7 +43,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.51, November 2025:
+ *   libpng versions 1.6.36, December 2018, through 1.6.55, February 2026:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -55,8 +55,8 @@
  * PNG Reference Library License version 2
  * ---------------------------------------
  *
- *  * Copyright (c) 1995-2025 The PNG Reference Library Authors.
- *  * Copyright (c) 2018-2025 Cosmin Truta.
+ *  * Copyright (c) 1995-2026 The PNG Reference Library Authors.
+ *  * Copyright (c) 2018-2026 Cosmin Truta.
  *  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  *  * Copyright (c) 1996-1997 Andreas Dilger.
  *  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -267,7 +267,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.51                  16    10651  16.so.16.51[.0]
+ *    1.6.55                  16    10655  16.so.16.55[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -303,7 +303,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.51"
+#define PNG_LIBPNG_VER_STRING "1.6.55"
 #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
 /* The versions of shared library builds should stay in sync, going forward */
@@ -314,7 +314,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 51
+#define PNG_LIBPNG_VER_RELEASE 55
 
 /* This should be zero for a public release, or non-zero for a
  * development version.
@@ -345,7 +345,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10651 /* 1.6.51 */
+#define PNG_LIBPNG_VER 10655 /* 1.6.55 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -455,7 +455,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_51;
+typedef char *png_libpng_version_1_6_55;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -814,17 +814,22 @@ typedef png_row_info * * png_row_infopp;
  * modify the buffer it is passed. The 'read' function, on the other hand, is
  * expected to return the read data in the buffer.
  */
-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, size_t));
-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
-    int));
-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32,
-    int));
+typedef PNG_CALLBACK(void, *png_error_ptr,
+   (png_structp, png_const_charp));
+typedef PNG_CALLBACK(void, *png_rw_ptr,
+   (png_structp, png_bytep, size_t));
+typedef PNG_CALLBACK(void, *png_flush_ptr,
+   (png_structp));
+typedef PNG_CALLBACK(void, *png_read_status_ptr,
+   (png_structp, png_uint_32, int));
+typedef PNG_CALLBACK(void, *png_write_status_ptr,
+   (png_structp, png_uint_32, int));
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
-typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
+typedef PNG_CALLBACK(void, *png_progressive_info_ptr,
+   (png_structp, png_infop));
+typedef PNG_CALLBACK(void, *png_progressive_end_ptr,
+   (png_structp, png_infop));
 
 /* The following callback receives png_uint_32 row_number, int pass for the
  * png_bytep data of the row.  When transforming an interlaced image the
@@ -836,19 +841,19 @@ typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
  * find the output pixel (x,y) given an interlaced sub-image pixel
  * (row,col,pass).  (See below for these macros.)
  */
-typedef PNG_CALLBACK(void, *png_progressive_row_ptr, (png_structp, png_bytep,
-    png_uint_32, int));
+typedef PNG_CALLBACK(void, *png_progressive_row_ptr,
+   (png_structp, png_bytep, png_uint_32, int));
 #endif
 
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-typedef PNG_CALLBACK(void, *png_user_transform_ptr, (png_structp, png_row_infop,
-    png_bytep));
+typedef PNG_CALLBACK(void, *png_user_transform_ptr,
+   (png_structp, png_row_infop, png_bytep));
 #endif
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
-    png_unknown_chunkp));
+typedef PNG_CALLBACK(int, *png_user_chunk_ptr,
+   (png_structp, png_unknown_chunkp));
 #endif
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 /* not used anywhere */
@@ -906,9 +911,10 @@ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), (jmp_buf, int), typedef);
  * ignores the first argument) should be completely compatible with the
  * following.
  */
-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,
-    png_alloc_size_t));
-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
+typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr,
+   (png_structp, png_alloc_size_t));
+typedef PNG_CALLBACK(void, *png_free_ptr,
+   (png_structp, png_voidp));
 
 /* Section 4: exported functions
  * Here are the function definitions most commonly used.  This is not
@@ -940,20 +946,22 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
  */
 
 /* Returns the version number of the library */
-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
+PNG_EXPORT(1, png_uint_32, png_access_version_number,
+   (void));
 
 /* Tell lib we have already handled the first <num_bytes> magic bytes.
  * Handling more than 8 bytes from the beginning of the file is an error.
  */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
+PNG_EXPORT(2, void, png_set_sig_bytes,
+   (png_structrp png_ptr, int num_bytes));
 
 /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
  * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
  * signature, and non-zero otherwise.  Having num_to_check == 0 or
  * start > 7 will always fail (i.e. return non-zero).
  */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
-    size_t num_to_check));
+PNG_EXPORT(3, int, png_sig_cmp,
+   (png_const_bytep sig, size_t start, size_t num_to_check));
 
 /* Simple signature checking function.  This is the same as calling
  * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0).
@@ -962,21 +970,21 @@ PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
 
 /* Allocate and initialize png_ptr struct for reading, and any other memory. */
 PNG_EXPORTA(4, png_structp, png_create_read_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),
-    PNG_ALLOCATED);
+   (png_const_charp user_png_ver,
+    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn),
+   PNG_ALLOCATED);
 
 /* Allocate and initialize png_ptr struct for writing, and any other memory */
 PNG_EXPORTA(5, png_structp, png_create_write_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn),
-    PNG_ALLOCATED);
+   (png_const_charp user_png_ver,
+    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn),
+   PNG_ALLOCATED);
 
 PNG_EXPORT(6, size_t, png_get_compression_buffer_size,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
-    size_t size));
+PNG_EXPORT(7, void, png_set_compression_buffer_size,
+   (png_structrp png_ptr, size_t size));
 
 /* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
  * match up.
@@ -989,8 +997,8 @@ PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
  * allocated by the library - the call will return NULL on a mismatch
  * indicating an ABI mismatch.
  */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
+PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn,
+   (png_structrp png_ptr, png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
 #  define png_jmpbuf(png_ptr) \
       (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))
 #else
@@ -1002,67 +1010,77 @@ PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
  * will use it; otherwise it will call PNG_ABORT().  This function was
  * added in libpng-1.5.0.
  */
-PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),
-    PNG_NORETURN);
+PNG_EXPORTA(9, void, png_longjmp,
+   (png_const_structrp png_ptr, int val),
+   PNG_NORETURN);
 
 #ifdef PNG_READ_SUPPORTED
 /* Reset the compression stream */
-PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);
+PNG_EXPORTA(10, int, png_reset_zstream,
+   (png_structrp png_ptr),
+   PNG_DEPRECATED);
 #endif
 
 /* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
 #ifdef PNG_USER_MEM_SUPPORTED
 PNG_EXPORTA(11, png_structp, png_create_read_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
+   (png_const_charp user_png_ver,
+    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn,
     png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
+   PNG_ALLOCATED);
 PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
+   (png_const_charp user_png_ver,
+    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn,
     png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
+   PNG_ALLOCATED);
 #endif
 
 /* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
+PNG_EXPORT(13, void, png_write_sig,
+   (png_structrp png_ptr));
 
 /* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, size_t length));
+PNG_EXPORT(14, void, png_write_chunk,
+   (png_structrp png_ptr,
+    png_const_bytep chunk_name, png_const_bytep data, size_t length));
 
 /* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
+PNG_EXPORT(15, void, png_write_chunk_start,
+   (png_structrp png_ptr,
     png_const_bytep chunk_name, png_uint_32 length));
 
 /* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
+PNG_EXPORT(16, void, png_write_chunk_data,
+   (png_structrp png_ptr,
     png_const_bytep data, size_t length));
 
 /* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
+PNG_EXPORT(17, void, png_write_chunk_end,
+   (png_structrp png_ptr));
 
 /* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
-    PNG_ALLOCATED);
+PNG_EXPORTA(18, png_infop, png_create_info_struct,
+   (png_const_structrp png_ptr),
+   PNG_ALLOCATED);
 
 /* DEPRECATED: this function allowed init structures to be created using the
  * default allocation method (typically malloc).  Use is deprecated in 1.6.0 and
  * the API will be removed in the future.
  */
-PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
-    size_t png_info_struct_size), PNG_DEPRECATED);
+PNG_EXPORTA(19, void, png_info_init_3,
+   (png_infopp info_ptr, size_t png_info_struct_size),
+   PNG_DEPRECATED);
 
 /* Writes all the PNG information before the image. */
 PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
+   (png_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(21, void, png_write_info,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
+   (png_structrp png_ptr, png_const_inforp info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the information before the actual image data. */
 PNG_EXPORT(22, void, png_read_info,
-    (png_structrp png_ptr, png_inforp info_ptr));
+   (png_structrp png_ptr, png_inforp info_ptr));
 #endif
 
 #ifdef PNG_TIME_RFC1123_SUPPORTED
@@ -1072,45 +1090,54 @@ PNG_EXPORT(22, void, png_read_info,
     */
 #if PNG_LIBPNG_VER < 10700
 /* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */
-PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
-    png_const_timep ptime),PNG_DEPRECATED);
+PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123,
+   (png_structrp png_ptr, png_const_timep ptime),
+   PNG_DEPRECATED);
 #endif
-PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],
-    png_const_timep ptime));
+PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer,
+   (char out[29], png_const_timep ptime));
 #endif
 
 #ifdef PNG_CONVERT_tIME_SUPPORTED
 /* Convert from a struct tm to png_time */
-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-    const struct tm * ttime));
+PNG_EXPORT(24, void, png_convert_from_struct_tm,
+   (png_timep ptime, const struct tm * ttime));
 
 /* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
+PNG_EXPORT(25, void, png_convert_from_time_t,
+   (png_timep ptime, time_t ttime));
 #endif /* CONVERT_tIME */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));
+PNG_EXPORT(26, void, png_set_expand,
+   (png_structrp png_ptr));
+PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8,
+   (png_structrp png_ptr));
+PNG_EXPORT(28, void, png_set_palette_to_rgb,
+   (png_structrp png_ptr));
+PNG_EXPORT(29, void, png_set_tRNS_to_alpha,
+   (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
 /* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
  * of a tRNS chunk if present.
  */
-PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));
+PNG_EXPORT(221, void, png_set_expand_16,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));
+PNG_EXPORT(30, void, png_set_bgr,
+   (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
 /* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
+PNG_EXPORT(31, void, png_set_gray_to_rgb,
+   (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
@@ -1120,18 +1147,20 @@ PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
 #define PNG_ERROR_ACTION_ERROR 3
 #define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
 
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,
+PNG_FP_EXPORT(32, void, png_set_rgb_to_gray,
+   (png_structrp png_ptr,
     int error_action, double red, double green))
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,
+PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed,
+   (png_structrp png_ptr,
     int error_action, png_fixed_point red, png_fixed_point green))
 
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp
-    png_ptr));
+PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status,
+   (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
+PNG_EXPORT(35, void, png_build_grayscale_palette,
+   (int bit_depth, png_colorp palette));
 #endif
 
 #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
@@ -1176,10 +1205,10 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
 #define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */
 #define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */
 
-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,
-    double output_gamma))
-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
-    int mode, png_fixed_point output_gamma))
+PNG_FP_EXPORT(227, void, png_set_alpha_mode,
+   (png_structrp png_ptr, int mode, double output_gamma))
+PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed,
+   (png_structrp png_ptr, int mode, png_fixed_point output_gamma))
 #endif
 
 #if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
@@ -1269,51 +1298,57 @@ PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
  */
 
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));
+PNG_EXPORT(36, void, png_set_strip_alpha,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));
+PNG_EXPORT(37, void, png_set_swap_alpha,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));
+PNG_EXPORT(38, void, png_set_invert_alpha,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
 /* Add a filler byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
-    int flags));
+PNG_EXPORT(39, void, png_set_filler,
+   (png_structrp png_ptr, png_uint_32 filler, int flags));
 /* The values of the PNG_FILLER_ defines should NOT be changed */
 #  define PNG_FILLER_BEFORE 0
 #  define PNG_FILLER_AFTER 1
 /* Add an alpha byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
-    png_uint_32 filler, int flags));
+PNG_EXPORT(40, void, png_set_add_alpha,
+   (png_structrp png_ptr, png_uint_32 filler, int flags));
 #endif /* READ_FILLER || WRITE_FILLER */
 
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
 /* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));
+PNG_EXPORT(41, void, png_set_swap,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
 /* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));
+PNG_EXPORT(42, void, png_set_packing,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
     defined(PNG_WRITE_PACKSWAP_SUPPORTED)
 /* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));
+PNG_EXPORT(43, void, png_set_packswap,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
 /* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
-    true_bits));
+PNG_EXPORT(44, void, png_set_shift,
+   (png_structrp png_ptr, png_const_color_8p true_bits));
 #endif
 
 #if defined(PNG_READ_INTERLACING_SUPPORTED) || \
@@ -1324,12 +1359,14 @@ PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
  * necessary to call png_read_row or png_read_rows png_get_image_height
  * times for each pass.
 */
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));
+PNG_EXPORT(45, int, png_set_interlace_handling,
+   (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
 /* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
+PNG_EXPORT(46, void, png_set_invert_mono,
+   (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
@@ -1338,10 +1375,12 @@ PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
  * read.  Doing so will result in unexpected behavior and possible warnings or
  * errors if the PNG file contains a bKGD chunk.
  */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,
+PNG_FP_EXPORT(47, void, png_set_background,
+   (png_structrp png_ptr,
     png_const_color_16p background_color, int background_gamma_code,
     int need_expand, double background_gamma))
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
+PNG_FIXED_EXPORT(215, void, png_set_background_fixed,
+   (png_structrp png_ptr,
     png_const_color_16p background_color, int background_gamma_code,
     int need_expand, png_fixed_point background_gamma))
 #endif
@@ -1354,20 +1393,23 @@ PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
 
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
 /* Scale a 16-bit depth file down to 8-bit, accurately. */
-PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));
+PNG_EXPORT(229, void, png_set_scale_16,
+   (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
 #define PNG_READ_16_TO_8_SUPPORTED /* Name prior to 1.5.4 */
 /* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
+PNG_EXPORT(48, void, png_set_strip_16,
+   (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
 /* Turn on quantizing, and reduce the palette to the number of colors
  * available.
  */
-PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
+PNG_EXPORT(49, void, png_set_quantize,
+   (png_structrp png_ptr,
     png_colorp palette, int num_palette, int maximum_colors,
     png_const_uint_16p histogram, int full_quantize));
 #endif
@@ -1389,82 +1431,92 @@ PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
  * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value
  * is the inverse of a 'screen gamma' value.
  */
-PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,
+PNG_FP_EXPORT(50, void, png_set_gamma,
+   (png_structrp png_ptr,
     double screen_gamma, double override_file_gamma))
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,
+PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed,
+   (png_structrp png_ptr,
     png_fixed_point screen_gamma, png_fixed_point override_file_gamma))
 #endif
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 /* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));
+PNG_EXPORT(51, void, png_set_flush,
+   (png_structrp png_ptr, int nrows));
 /* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));
+PNG_EXPORT(52, void, png_write_flush,
+   (png_structrp png_ptr));
 #endif
 
 /* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));
+PNG_EXPORT(53, void, png_start_read_image,
+   (png_structrp png_ptr));
 
 /* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,
-    png_inforp info_ptr));
+PNG_EXPORT(54, void, png_read_update_info,
+   (png_structrp png_ptr, png_inforp info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,
+PNG_EXPORT(55, void, png_read_rows,
+   (png_structrp png_ptr, png_bytepp row,
     png_bytepp display_row, png_uint_32 num_rows));
 #endif
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,
-    png_bytep display_row));
+PNG_EXPORT(56, void, png_read_row,
+   (png_structrp png_ptr, png_bytep row, png_bytep display_row));
 #endif
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));
+PNG_EXPORT(57, void, png_read_image,
+   (png_structrp png_ptr, png_bytepp image));
 #endif
 
 /* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
-    png_const_bytep row));
+PNG_EXPORT(58, void, png_write_row,
+   (png_structrp png_ptr, png_const_bytep row));
 
 /* Write a few rows of image data: (*row) is not written; however, the type
  * is declared as writeable to maintain compatibility with previous versions
  * of libpng and to allow the 'display_row' array from read_rows to be passed
  * unchanged to write_rows.
  */
-PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
+PNG_EXPORT(59, void, png_write_rows,
+   (png_structrp png_ptr, png_bytepp row, png_uint_32 num_rows));
 
 /* Write the image data */
-PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));
+PNG_EXPORT(60, void, png_write_image,
+   (png_structrp png_ptr, png_bytepp image));
 
 /* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,
-    png_inforp info_ptr));
+PNG_EXPORT(61, void, png_write_end,
+   (png_structrp png_ptr, png_inforp info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));
+PNG_EXPORT(62, void, png_read_end,
+   (png_structrp png_ptr, png_inforp info_ptr));
 #endif
 
 /* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,
-    png_infopp info_ptr_ptr));
+PNG_EXPORT(63, void, png_destroy_info_struct,
+   (png_const_structrp png_ptr, png_infopp info_ptr_ptr));
 
 /* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr,
+PNG_EXPORT(64, void, png_destroy_read_struct,
+   (png_structpp png_ptr_ptr,
     png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
 
 /* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr));
+PNG_EXPORT(65, void, png_destroy_write_struct,
+   (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
 
 /* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
-    int ancil_action));
+PNG_EXPORT(66, void, png_set_crc_action,
+   (png_structrp png_ptr, int crit_action, int ancil_action));
 
 /* Values for png_set_crc_action() say how to handle CRC errors in
  * ancillary and critical chunks, and whether to use the data contained
@@ -1494,8 +1546,8 @@ PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
 /* Set the filtering method(s) used by libpng.  Currently, the only valid
  * value for "method" is 0.
  */
-PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
-    int filters));
+PNG_EXPORT(67, void, png_set_filter,
+   (png_structrp png_ptr, int method, int filters));
 #endif /* WRITE */
 
 /* Flags for png_set_filter() to say which filters to use.  The flags
@@ -1524,11 +1576,14 @@ PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
 
 #ifdef PNG_WRITE_SUPPORTED
 #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,
-    int heuristic_method, int num_weights, png_const_doublep filter_weights,
+PNG_FP_EXPORT(68, void, png_set_filter_heuristics,
+   (png_structrp png_ptr,
+    int heuristic_method, int num_weights,
+    png_const_doublep filter_weights,
     png_const_doublep filter_costs))
 PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structrp png_ptr, int heuristic_method, int num_weights,
+   (png_structrp png_ptr,
+    int heuristic_method, int num_weights,
     png_const_fixed_point_p filter_weights,
     png_const_fixed_point_p filter_costs))
 #endif /* WRITE_WEIGHTED_FILTER */
@@ -1547,44 +1602,44 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
  * these values may not correspond directly to the zlib compression levels.
  */
 #ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,
-    int level));
+PNG_EXPORT(69, void, png_set_compression_level,
+   (png_structrp png_ptr, int level));
 
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
+PNG_EXPORT(70, void, png_set_compression_mem_level,
+   (png_structrp png_ptr, int mem_level));
 
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,
-    int strategy));
+PNG_EXPORT(71, void, png_set_compression_strategy,
+   (png_structrp png_ptr, int strategy));
 
 /* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
  * smaller value of window_bits if it can do so safely.
  */
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,
-    int window_bits));
+PNG_EXPORT(72, void, png_set_compression_window_bits,
+   (png_structrp png_ptr, int window_bits));
 
-PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,
-    int method));
+PNG_EXPORT(73, void, png_set_compression_method,
+   (png_structrp png_ptr, int method));
 #endif /* WRITE_CUSTOMIZE_COMPRESSION */
 
 #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
 /* Also set zlib parameters for compressing non-IDAT chunks */
-PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,
-    int level));
+PNG_EXPORT(222, void, png_set_text_compression_level,
+   (png_structrp png_ptr, int level));
 
-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
+PNG_EXPORT(223, void, png_set_text_compression_mem_level,
+   (png_structrp png_ptr, int mem_level));
 
-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,
-    int strategy));
+PNG_EXPORT(224, void, png_set_text_compression_strategy,
+   (png_structrp png_ptr, int strategy));
 
 /* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
  * smaller value of window_bits if it can do so safely.
  */
 PNG_EXPORT(225, void, png_set_text_compression_window_bits,
-    (png_structrp png_ptr, int window_bits));
+   (png_structrp png_ptr, int window_bits));
 
-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
-    int method));
+PNG_EXPORT(226, void, png_set_text_compression_method,
+   (png_structrp png_ptr, int method));
 #endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
 #endif /* WRITE */
 
@@ -1599,7 +1654,8 @@ PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
 
 #ifdef PNG_STDIO_SUPPORTED
 /* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, FILE *fp));
+PNG_EXPORT(74, void, png_init_io,
+   (png_structrp png_ptr, FILE *fp));
 #endif
 
 /* Replace the (error and abort), and warning functions with user
@@ -1610,11 +1666,13 @@ PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, FILE *fp));
  * default function will be used.
  */
 
-PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,
+PNG_EXPORT(75, void, png_set_error_fn,
+   (png_structrp png_ptr,
     png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
 
 /* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
+PNG_EXPORT(76, png_voidp, png_get_error_ptr,
+   (png_const_structrp png_ptr));
 
 /* Replace the default data output functions with a user supplied one(s).
  * If buffered output is not used, then output_flush_fn can be set to NULL.
@@ -1626,47 +1684,54 @@ PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
  * default flush function, which uses the standard *FILE structure, will
  * be used.
  */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,
+PNG_EXPORT(77, void, png_set_write_fn,
+   (png_structrp png_ptr,
+    png_voidp io_ptr,
     png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
 
 /* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr read_data_fn));
+PNG_EXPORT(78, void, png_set_read_fn,
+   (png_structrp png_ptr,
+    png_voidp io_ptr, png_rw_ptr read_data_fn));
 
 /* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));
+PNG_EXPORT(79, png_voidp, png_get_io_ptr,
+   (png_const_structrp png_ptr));
 
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,
-    png_read_status_ptr read_row_fn));
+PNG_EXPORT(80, void, png_set_read_status_fn,
+   (png_structrp png_ptr, png_read_status_ptr read_row_fn));
 
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,
-    png_write_status_ptr write_row_fn));
+PNG_EXPORT(81, void, png_set_write_status_fn,
+   (png_structrp png_ptr, png_write_status_ptr write_row_fn));
 
 #ifdef PNG_USER_MEM_SUPPORTED
 /* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+PNG_EXPORT(82, void, png_set_mem_fn,
+   (png_structrp png_ptr,
+    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
 /* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));
+PNG_EXPORT(83, png_voidp, png_get_mem_ptr,
+   (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr read_user_transform_fn));
+PNG_EXPORT(84, void, png_set_read_user_transform_fn,
+   (png_structrp png_ptr, png_user_transform_ptr read_user_transform_fn));
 #endif
 
 #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr write_user_transform_fn));
+PNG_EXPORT(85, void, png_set_write_user_transform_fn,
+   (png_structrp png_ptr, png_user_transform_ptr write_user_transform_fn));
 #endif
 
 #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,
-    png_voidp user_transform_ptr, int user_transform_depth,
-    int user_transform_channels));
+PNG_EXPORT(86, void, png_set_user_transform_info,
+   (png_structrp png_ptr,
+    png_voidp user_transform_ptr,
+    int user_transform_depth, int user_transform_channels));
 /* Return the user pointer associated with the user transform functions */
 PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
@@ -1681,8 +1746,10 @@ PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
  * find the output pixel (x,y) given an interlaced sub-image pixel
  * (row,col,pass).  (See below for these macros.)
  */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
+PNG_EXPORT(217, png_uint_32, png_get_current_row_number,
+   (png_const_structrp));
+PNG_EXPORT(218, png_byte, png_get_current_pass_number,
+   (png_const_structrp));
 #endif
 
 #ifdef PNG_READ_USER_CHUNKS_SUPPORTED
@@ -1705,28 +1772,32 @@ PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
  * See "INTERACTION WITH USER CHUNK CALLBACKS" below for important notes about
  * how this behavior will change in libpng 1.7
  */
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
+PNG_EXPORT(88, void, png_set_read_user_chunk_fn,
+   (png_structrp png_ptr,
     png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
 #endif
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));
+PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr,
+   (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 /* Sets the function callbacks for the push reader, and a pointer to a
  * user-defined structure available to the callback functions.
  */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,
+PNG_EXPORT(90, void, png_set_progressive_read_fn,
+   (png_structrp png_ptr,
     png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
     png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
 
 /* Returns the user pointer associated with the push read functions */
 PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 
 /* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
+PNG_EXPORT(92, void, png_process_data,
+   (png_structrp png_ptr,
     png_inforp info_ptr, png_bytep buffer, size_t buffer_size));
 
 /* A function which may be called *only* within png_process_data to stop the
@@ -1736,7 +1807,8 @@ PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
  * 'save' is set to true the routine will first save all the pending data and
  * will always return 0.
  */
-PNG_EXPORT(219, size_t, png_process_data_pause, (png_structrp, int save));
+PNG_EXPORT(219, size_t, png_process_data_pause,
+   (png_structrp, int save));
 
 /* A function which may be called *only* outside (after) a call to
  * png_process_data.  It returns the number of bytes of data to skip in the
@@ -1744,45 +1816,53 @@ PNG_EXPORT(219, size_t, png_process_data_pause, (png_structrp, int save));
  * application must skip than number of bytes of input data and pass the
  * following data to the next call to png_process_data.
  */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
+PNG_EXPORT(220, png_uint_32, png_process_data_skip,
+   (png_structrp));
 
 /* Function that combines rows.  'new_row' is a flag that should come from
  * the callback and be non-NULL if anything needs to be done; the library
  * stores its own version of the new data internally and ignores the passed
  * in value.
  */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
+PNG_EXPORT(93, void, png_progressive_combine_row,
+   (png_const_structrp png_ptr,
     png_bytep old_row, png_const_bytep new_row));
 #endif /* PROGRESSIVE_READ */
 
-PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
+PNG_EXPORTA(94, png_voidp, png_malloc,
+   (png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED);
 /* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
+PNG_EXPORTA(95, png_voidp, png_calloc,
+   (png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED);
 
 /* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
+PNG_EXPORTA(96, png_voidp, png_malloc_warn,
+   (png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED);
 
 /* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
+PNG_EXPORT(97, void, png_free,
+   (png_const_structrp png_ptr, png_voidp ptr));
 
 /* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 free_me, int num));
+PNG_EXPORT(98, void, png_free_data,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_uint_32 free_me, int num));
 
 /* Reassign the responsibility for freeing existing data, whether allocated
  * by libpng or by the application; this works on the png_info structure passed
  * in, without changing the state for other png_info structures.
  */
-PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int freer, png_uint_32 mask));
+PNG_EXPORT(99, void, png_data_freer,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    int freer, png_uint_32 mask));
 
 /* Assignments for png_data_freer */
 #define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
+#define PNG_SET_WILL_FREE_DATA     1
+#define PNG_USER_WILL_FREE_DATA    2
 /* Flags for png_ptr->free_me and info_ptr->free_me */
 #define PNG_FREE_HIST 0x0008U
 #define PNG_FREE_ICCP 0x0010U
@@ -1802,36 +1882,42 @@ PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
 #define PNG_FREE_MUL  0x4220U /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
 
 #ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);
-PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,
-    png_voidp ptr), PNG_DEPRECATED);
+PNG_EXPORTA(100, png_voidp, png_malloc_default,
+   (png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED PNG_DEPRECATED);
+PNG_EXPORTA(101, void, png_free_default,
+   (png_const_structrp png_ptr, png_voidp ptr),
+   PNG_DEPRECATED);
 #endif
 
 #ifdef PNG_ERROR_TEXT_SUPPORTED
 /* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
+PNG_EXPORTA(102, void, png_error,
+   (png_const_structrp png_ptr, png_const_charp error_message),
+   PNG_NORETURN);
 
 /* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
+PNG_EXPORTA(103, void, png_chunk_error,
+   (png_const_structrp png_ptr, png_const_charp error_message),
+   PNG_NORETURN);
 
 #else
 /* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);
+PNG_EXPORTA(104, void, png_err,
+   (png_const_structrp png_ptr),
+   PNG_NORETURN);
 #  define png_error(s1,s2) png_err(s1)
 #  define png_chunk_error(s1,s2) png_err(s1)
 #endif
 
 #ifdef PNG_WARNINGS_SUPPORTED
 /* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
+PNG_EXPORT(105, void, png_warning,
+   (png_const_structrp png_ptr, png_const_charp warning_message));
 
 /* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
+PNG_EXPORT(106, void, png_chunk_warning,
+   (png_const_structrp png_ptr, png_const_charp warning_message));
 #else
 #  define png_warning(s1,s2) ((void)(s1))
 #  define png_chunk_warning(s1,s2) ((void)(s1))
@@ -1840,17 +1926,17 @@ PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 /* Benign error in libpng.  Can continue, but may have a problem.
  * User can choose whether to handle as a fatal error or as a warning. */
-PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
+PNG_EXPORT(107, void, png_benign_error,
+   (png_const_structrp png_ptr, png_const_charp warning_message));
 
 #ifdef PNG_READ_SUPPORTED
 /* Same, chunk name is prepended to message (only during read) */
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
+PNG_EXPORT(108, void, png_chunk_benign_error,
+   (png_const_structrp png_ptr, png_const_charp warning_message));
 #endif
 
 PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structrp png_ptr, int allowed));
+   (png_structrp png_ptr, int allowed));
 #else
 #  ifdef PNG_ALLOW_BENIGN_ERRORS
 #    define png_benign_error png_warning
@@ -1874,169 +1960,181 @@ PNG_EXPORT(109, void, png_set_benign_errors,
  * png_info_struct.
  */
 /* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 flag));
+PNG_EXPORT(110, png_uint_32, png_get_valid,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr, png_uint_32 flag));
 
 /* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, size_t, png_get_rowbytes, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(111, size_t, png_get_rowbytes,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* Returns row_pointers, which is an array of pointers to scanlines that was
  * returned from png_read_png().
  */
-PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(112, png_bytepp, png_get_rows,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Set row_pointers, which is an array of pointers to scanlines for use
  * by png_write_png().
  */
-PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytepp row_pointers));
+PNG_EXPORT(113, void, png_set_rows,
+   (png_const_structrp png_ptr, png_inforp info_ptr, png_bytepp row_pointers));
 #endif
 
 /* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(114, png_byte, png_get_channels,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(115, png_uint_32, png_get_image_width,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(116, png_uint_32, png_get_image_height,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(117, png_byte, png_get_bit_depth,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(118, png_byte, png_get_color_type,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(119, png_byte, png_get_filter_type,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(120, png_byte, png_get_interlace_type,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(121, png_byte, png_get_compression_type,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns image resolution in pixels per meter, from pHYs chunk data. */
 PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns pixel aspect ratio, computed from pHYs chunk data.  */
 PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
+   (png_const_structrp png_ptr, png_const_inforp info_ptr))
 PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
+   (png_const_structrp png_ptr, png_const_inforp info_ptr))
 
 /* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
 PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 #endif /* EASY_ACCESS */
 
 #ifdef PNG_READ_SUPPORTED
 /* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
+PNG_EXPORT(130, png_const_bytep, png_get_signature,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 #endif
 
 #ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_16p *background));
+PNG_EXPORT(131, png_uint_32, png_get_bKGD,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_color_16p *background));
 #endif
 
 #ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_16p background));
+PNG_EXPORT(132, void, png_set_bKGD,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_color_16p background));
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,
-    double *red_y, double *green_x, double *green_y, double *blue_x,
-    double *blue_y))
-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,
-    double *green_X, double *green_Y, double *green_Z, double *blue_X,
-    double *blue_Y, double *blue_Z))
+PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    double *white_x, double *white_y,
+    double *red_x, double *red_y,
+    double *green_x, double *green_y,
+    double *blue_x, double *blue_y))
+PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    double *red_X, double *red_Y, double *red_Z,
+    double *green_X, double *green_Y, double *green_Z,
+    double *blue_X, double *blue_Y, double *blue_Z))
 PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_white_x, png_fixed_point *int_white_y,
     png_fixed_point *int_red_x, png_fixed_point *int_red_y,
     png_fixed_point *int_green_x, png_fixed_point *int_green_y,
     png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))
 PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
+    png_fixed_point *int_red_Z,
+    png_fixed_point *int_green_X, png_fixed_point *int_green_Y,
+    png_fixed_point *int_green_Z,
     png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
     png_fixed_point *int_blue_Z))
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
-    double white_x, double white_y, double red_x, double red_y, double green_x,
-    double green_y, double blue_x, double blue_y))
-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double red_X, double red_Y, double red_Z,
-    double green_X, double green_Y, double green_Z, double blue_X,
-    double blue_Y, double blue_Z))
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y))
-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
+PNG_FP_EXPORT(135, void, png_set_cHRM,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    double white_x, double white_y,
+    double red_x, double red_y,
+    double green_x, double green_y,
+    double blue_x, double blue_y))
+PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    double red_X, double red_Y, double red_Z,
+    double green_X, double green_Y, double green_Z,
+    double blue_X, double blue_Y, double blue_Z))
+PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_fixed_point int_white_x, png_fixed_point int_white_y,
+    png_fixed_point int_red_x, png_fixed_point int_red_y,
+    png_fixed_point int_green_x, png_fixed_point int_green_y,
+    png_fixed_point int_blue_x, png_fixed_point int_blue_y))
+PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_fixed_point int_red_X, png_fixed_point int_red_Y,
+    png_fixed_point int_red_Z,
+    png_fixed_point int_green_X, png_fixed_point int_green_Y,
+    png_fixed_point int_green_Z,
     png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
     png_fixed_point int_blue_Z))
 #endif
 
 #ifdef PNG_cICP_SUPPORTED
-PNG_EXPORT(250, png_uint_32, png_get_cICP, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_bytep colour_primaries,
-    png_bytep transfer_function, png_bytep matrix_coefficients,
-    png_bytep video_full_range_flag));
+PNG_EXPORT(250, png_uint_32, png_get_cICP,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_bytep colour_primaries, png_bytep transfer_function,
+    png_bytep matrix_coefficients, png_bytep video_full_range_flag));
 #endif
 
 #ifdef PNG_cICP_SUPPORTED
-PNG_EXPORT(251, void, png_set_cICP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_byte colour_primaries,
-    png_byte transfer_function, png_byte matrix_coefficients,
-    png_byte video_full_range_flag));
+PNG_EXPORT(251, void, png_set_cICP,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_byte colour_primaries, png_byte transfer_function,
+    png_byte matrix_coefficients, png_byte video_full_range_flag));
 #endif
 
 #ifdef PNG_cLLI_SUPPORTED
-PNG_FP_EXPORT(252, png_uint_32, png_get_cLLI, (png_const_structrp png_ptr,
-         png_const_inforp info_ptr, double *maximum_content_light_level,
-         double *maximum_frame_average_light_level))
+PNG_FP_EXPORT(252, png_uint_32, png_get_cLLI,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    double *maximum_content_light_level,
+    double *maximum_frame_average_light_level))
 PNG_FIXED_EXPORT(253, png_uint_32, png_get_cLLI_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
     /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
      * 100,000 as in the case of png_fixed_point.
      */
@@ -2045,11 +2143,12 @@ PNG_FIXED_EXPORT(253, png_uint_32, png_get_cLLI_fixed,
 #endif
 
 #ifdef PNG_cLLI_SUPPORTED
-PNG_FP_EXPORT(254, void, png_set_cLLI, (png_const_structrp png_ptr,
-         png_inforp info_ptr, double maximum_content_light_level,
-         double maximum_frame_average_light_level))
-PNG_FIXED_EXPORT(255, void, png_set_cLLI_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
+PNG_FP_EXPORT(254, void, png_set_cLLI,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    double maximum_content_light_level,
+    double maximum_frame_average_light_level))
+PNG_FIXED_EXPORT(255, void, png_set_cLLI_fixed,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
     /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
      * 100,000 as in the case of png_fixed_point.
      */
@@ -2058,64 +2157,73 @@ PNG_FIXED_EXPORT(255, void, png_set_cLLI_fixed, (png_const_structrp png_ptr,
 #endif
 
 #ifdef PNG_eXIf_SUPPORTED
-PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep *exif));
-PNG_EXPORT(247, void, png_set_eXIf, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep exif));
+PNG_EXPORT(246, png_uint_32, png_get_eXIf,
+   (png_const_structrp png_ptr, png_inforp info_ptr, png_bytep *exif));
+PNG_EXPORT(247, void, png_set_eXIf,
+   (png_const_structrp png_ptr, png_inforp info_ptr, png_bytep exif));
 
-PNG_EXPORT(248, png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif));
-PNG_EXPORT(249, void, png_set_eXIf_1, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 num_exif, png_bytep exif));
+PNG_EXPORT(248, png_uint_32, png_get_eXIf_1,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_uint_32 *num_exif, png_bytep *exif));
+PNG_EXPORT(249, void, png_set_eXIf_1,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_uint_32 num_exif, png_bytep exif));
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *file_gamma))
+PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    double *file_gamma))
 PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_file_gamma))
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double file_gamma))
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_file_gamma))
+PNG_FP_EXPORT(139, void, png_set_gAMA,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    double file_gamma))
+PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_fixed_point int_file_gamma))
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_16p *hist));
-PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_uint_16p hist));
+PNG_EXPORT(141, png_uint_32, png_get_hIST,
+   (png_const_structrp png_ptr, png_inforp info_ptr, png_uint_16p *hist));
+PNG_EXPORT(142, void, png_set_hIST,
+   (png_const_structrp png_ptr, png_inforp info_ptr, png_const_uint_16p hist));
 #endif
 
-PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,
-    int *bit_depth, int *color_type, int *interlace_method,
-    int *compression_method, int *filter_method));
+PNG_EXPORT(143, png_uint_32, png_get_IHDR,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_uint_32 *width, png_uint_32 *height,
+    int *bit_depth, int *color_type,
+    int *interlace_method, int *compression_method, int *filter_method));
 
-PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_method, int compression_method,
-    int filter_method));
+PNG_EXPORT(144, void, png_set_IHDR,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_uint_32 width, png_uint_32 height,
+    int bit_depth, int color_type,
+    int interlace_method, int compression_method, int filter_method));
 
 #ifdef PNG_mDCV_SUPPORTED
-PNG_FP_EXPORT(256, png_uint_32, png_get_mDCV, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr,
+PNG_FP_EXPORT(256, png_uint_32, png_get_mDCV,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
     /* The chromaticities of the mastering display.  As cHRM, but independent of
      * the encoding endpoints in cHRM, or cICP, or iCCP.  These values will
      * always be in the range 0 to 1.3107.
      */
-    double *white_x, double *white_y, double *red_x, double *red_y,
-    double *green_x, double *green_y, double *blue_x, double *blue_y,
+    double *white_x, double *white_y,
+    double *red_x, double *red_y,
+    double *green_x, double *green_y,
+    double *blue_x, double *blue_y,
     /* Mastering display luminance in cd/m2 (nits). */
     double *mastering_display_maximum_luminance,
     double *mastering_display_minimum_luminance))
 
 PNG_FIXED_EXPORT(257, png_uint_32, png_get_mDCV_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_white_x, png_fixed_point *int_white_y,
     png_fixed_point *int_red_x, png_fixed_point *int_red_y,
     png_fixed_point *int_green_x, png_fixed_point *int_green_y,
@@ -2128,19 +2236,21 @@ PNG_FIXED_EXPORT(257, png_uint_32, png_get_mDCV_fixed,
 #endif
 
 #ifdef PNG_mDCV_SUPPORTED
-PNG_FP_EXPORT(258, void, png_set_mDCV, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
+PNG_FP_EXPORT(258, void, png_set_mDCV,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
     /* The chromaticities of the mastering display.  As cHRM, but independent of
      * the encoding endpoints in cHRM, or cICP, or iCCP.
      */
-    double white_x, double white_y, double red_x, double red_y, double green_x,
-    double green_y, double blue_x, double blue_y,
+    double white_x, double white_y,
+    double red_x, double red_y,
+    double green_x, double green_y,
+    double blue_x, double blue_y,
     /* Mastering display luminance in cd/m2 (nits). */
     double mastering_display_maximum_luminance,
     double mastering_display_minimum_luminance))
 
-PNG_FIXED_EXPORT(259, void, png_set_mDCV_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
+PNG_FIXED_EXPORT(259, void, png_set_mDCV_fixed,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
     /* The admissible range of these values is not the full range of a PNG
      * fixed point value.  Negative values cannot be encoded and the maximum
      * value is about 1.3 */
@@ -2156,95 +2266,107 @@ PNG_FIXED_EXPORT(259, void, png_set_mDCV_fixed, (png_const_structrp png_ptr,
 #endif
 
 #ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
-   png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
-   int *unit_type));
+PNG_EXPORT(145, png_uint_32, png_get_oFFs,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));
 #endif
 
 #ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,
-    int unit_type));
+PNG_EXPORT(146, void, png_set_oFFs,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_int_32 offset_x, png_int_32 offset_y, int unit_type));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,
-    png_int_32 *X1, int *type, int *nparams, png_charp *units,
-    png_charpp *params));
+PNG_EXPORT(147, png_uint_32, png_get_pCAL,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+    int *type, int *nparams, png_charp *units, png_charpp *params));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,
+PNG_EXPORT(148, void, png_set_pCAL,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_charp purpose, png_int_32 X0, png_int_32 X1,
     int type, int nparams, png_const_charp units, png_charpp params));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
+PNG_EXPORT(149, png_uint_32, png_get_pHYs,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+PNG_EXPORT(150, void, png_set_pHYs,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_uint_32 res_x, png_uint_32 res_y, int unit_type));
 #endif
 
-PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,
-   png_inforp info_ptr, png_colorp *palette, int *num_palette));
+PNG_EXPORT(151, png_uint_32, png_get_PLTE,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_colorp *palette, int *num_palette));
 
-PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_colorp palette, int num_palette));
+PNG_EXPORT(152, void, png_set_PLTE,
+   (png_structrp png_ptr, png_inforp info_ptr,
+    png_const_colorp palette, int num_palette));
 
 #ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_8p *sig_bit));
+PNG_EXPORT(153, png_uint_32, png_get_sBIT,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_color_8p *sig_bit));
 #endif
 
 #ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_8p sig_bit));
+PNG_EXPORT(154, void, png_set_sBIT,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_color_8p sig_bit));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *file_srgb_intent));
+PNG_EXPORT(155, png_uint_32, png_get_sRGB,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    int *file_srgb_intent));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
+PNG_EXPORT(156, void, png_set_sRGB,
+   (png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent));
+PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM,
+   (png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent));
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charpp name, int *compression_type,
+PNG_EXPORT(158, png_uint_32, png_get_iCCP,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_charpp name, int *compression_type,
     png_bytepp profile, png_uint_32 *proflen));
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp name, int compression_type,
+PNG_EXPORT(159, void, png_set_iCCP,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_charp name, int compression_type,
     png_const_bytep profile, png_uint_32 proflen));
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_sPLT_tpp entries));
+PNG_EXPORT(160, int, png_get_sPLT,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_sPLT_tpp entries));
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));
+PNG_EXPORT(161, void, png_set_sPLT,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_sPLT_tp entries, int nentries));
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED
 /* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_textp *text_ptr, int *num_text));
+PNG_EXPORT(162, int, png_get_text,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_textp *text_ptr, int *num_text));
 #endif
 
 /* Note while png_set_text() will accept a structure whose text,
@@ -2255,35 +2377,41 @@ PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
  */
 
 #ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_textp text_ptr, int num_text));
+PNG_EXPORT(163, void, png_set_text,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_textp text_ptr, int num_text));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_timep *mod_time));
+PNG_EXPORT(164, png_uint_32, png_get_tIME,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_timep *mod_time));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_timep mod_time));
+PNG_EXPORT(165, void, png_set_tIME,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_timep mod_time));
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,
+PNG_EXPORT(166, png_uint_32, png_get_tRNS,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_bytep *trans_alpha, int *num_trans,
     png_color_16p *trans_color));
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,
+PNG_EXPORT(167, void, png_set_tRNS,
+   (png_structrp png_ptr, png_inforp info_ptr,
+    png_const_bytep trans_alpha, int num_trans,
     png_const_color_16p trans_color));
 #endif
 
 #ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *unit, double *width, double *height))
+PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    int *unit, double *width, double *height))
 #if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
    defined(PNG_FLOATING_POINT_SUPPORTED)
 /* NOTE: this API is currently implemented using floating point arithmetic,
@@ -2292,21 +2420,22 @@ PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
  * is highly recommended that png_get_sCAL_s be used instead.
  */
 PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_fixed_point *width, png_fixed_point *height))
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    int *unit, png_fixed_point *width, png_fixed_point *height))
 #endif
 PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_charpp swidth, png_charpp sheight));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    int *unit, png_charpp swidth, png_charpp sheight));
 
-PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit, double width, double height))
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
-   png_inforp info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height))
-PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit,
-    png_const_charp swidth, png_const_charp sheight));
+PNG_FP_EXPORT(170, void, png_set_sCAL,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    int unit, double width, double height))
+PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    int unit, png_fixed_point width, png_fixed_point height))
+PNG_EXPORT(171, void, png_set_sCAL_s,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    int unit, png_const_charp swidth, png_const_charp sheight));
 #endif /* sCAL */
 
 #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
@@ -2409,7 +2538,8 @@ PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
  *    be processed by libpng.
  */
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
+PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
+   (png_structrp png_ptr,
     int keep, png_const_bytep chunk_list, int num_chunks));
 #endif /* HANDLE_AS_UNKNOWN */
 
@@ -2417,14 +2547,14 @@ PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
  * the result is therefore true (non-zero) if special handling is required,
  * false for the default handling.
  */
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
-    png_const_bytep chunk_name));
+PNG_EXPORT(173, int, png_handle_as_unknown,
+   (png_const_structrp png_ptr, png_const_bytep chunk_name));
 #endif /* SET_UNKNOWN_CHUNKS */
 
 #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
+PNG_EXPORT(174, void, png_set_unknown_chunks,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_unknown_chunkp unknowns, int num_unknowns));
    /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added
     * unknowns to the location currently stored in the png_struct.  This is
     * invariably the wrong value on write.  To fix this call the following API
@@ -2435,43 +2565,47 @@ PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
     */
 
 PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    int chunk, int location));
 
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_unknown_chunkpp entries));
+PNG_EXPORT(176, int, png_get_unknown_chunks,
+   (png_const_structrp png_ptr, png_inforp info_ptr,
+    png_unknown_chunkpp entries));
 #endif
 
 /* Png_free_data() will turn off the "valid" flag for anything it frees.
  * If you need to turn it off for a chunk that your application has freed,
  * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
  */
-PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int mask));
+PNG_EXPORT(177, void, png_set_invalid,
+   (png_const_structrp png_ptr, png_inforp info_ptr, int mask));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* The "params" pointer is currently not used and is for future expansion. */
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,
+PNG_EXPORT(178, void, png_read_png,
+   (png_structrp png_ptr, png_inforp info_ptr,
     int transforms, png_voidp params));
 #endif
 #ifdef PNG_WRITE_SUPPORTED
-PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,
+PNG_EXPORT(179, void, png_write_png,
+   (png_structrp png_ptr, png_inforp info_ptr,
     int transforms, png_voidp params));
 #endif
 #endif
 
 PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
-    png_uint_32 mng_features_permitted));
+PNG_EXPORT(184, png_uint_32, png_permit_mng_features,
+   (png_structrp png_ptr, png_uint_32 mng_features_permitted));
 #endif
 
 /* For use in png_set_keep_unknown, added to version 1.2.6 */
@@ -2485,71 +2619,74 @@ PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
  * messages before passing them to the error or warning handler.
  */
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,
-    png_uint_32 strip_mode));
+PNG_EXPORT(185, void, png_set_strip_error_numbers,
+   (png_structrp png_ptr, png_uint_32 strip_mode));
 #endif
 
 /* Added in libpng-1.2.6 */
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,
+PNG_EXPORT(186, void, png_set_user_limits,
+   (png_structrp png_ptr,
     png_uint_32 user_width_max, png_uint_32 user_height_max));
 PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 /* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,
-    png_uint_32 user_chunk_cache_max));
+PNG_EXPORT(189, void, png_set_chunk_cache_max,
+   (png_structrp png_ptr, png_uint_32 user_chunk_cache_max));
 PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 /* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
+PNG_EXPORT(191, void, png_set_chunk_malloc_max,
+   (png_structrp png_ptr, png_alloc_size_t user_chunk_cache_max));
 PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 #endif
 
 #if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
 PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
+   (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
+   (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
 PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
+   (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #endif
 
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr))
+PNG_FP_EXPORT(197, float, png_get_y_offset_inches,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
 PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
+   (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #endif
 
 #  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
+PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi,
+   (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
 #  endif /* pHYs */
 #endif  /* INCH_CONVERSIONS */
 
 /* Added in libpng-1.4.0 */
 #ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));
+PNG_EXPORT(199, png_uint_32, png_get_io_state,
+   (png_const_structrp png_ptr));
 
 /* Removed from libpng 1.6; use png_get_io_chunk_type. */
-PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),
-    PNG_DEPRECATED)
+PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name,
+   (png_structrp png_ptr),
+   PNG_DEPRECATED)
 
 PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structrp png_ptr));
+   (png_const_structrp png_ptr));
 
 /* The flags returned by png_get_io_state() are the following: */
 #  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
@@ -2674,21 +2811,26 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
 #endif /* READ_COMPOSITE_NODIV */
 
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
+PNG_EXPORT(201, png_uint_32, png_get_uint_32,
+   (png_const_bytep buf));
+PNG_EXPORT(202, png_uint_16, png_get_uint_16,
+   (png_const_bytep buf));
+PNG_EXPORT(203, png_int_32, png_get_int_32,
+   (png_const_bytep buf));
 #endif
 
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,
-    png_const_bytep buf));
+PNG_EXPORT(204, png_uint_32, png_get_uint_31,
+   (png_const_structrp png_ptr, png_const_bytep buf));
 /* No png_get_int_16 -- may be added if there's a real need for it. */
 
 /* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
 #ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));
+PNG_EXPORT(205, void, png_save_uint_32,
+   (png_bytep buf, png_uint_32 i));
 #endif
 #ifdef PNG_SAVE_INT_32_SUPPORTED
-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
+PNG_EXPORT(206, void, png_save_int_32,
+   (png_bytep buf, png_int_32 i));
 #endif
 
 /* Place a 16-bit number into a buffer in PNG byte order.
@@ -2696,7 +2838,8 @@ PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
  * just to avoid potential problems on pre-ANSI C compilers.
  */
 #ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
+PNG_EXPORT(207, void, png_save_uint_16,
+   (png_bytep buf, unsigned int i));
 /* No png_save_int_16 -- may be added if there's a real need for it. */
 #endif
 
@@ -2743,10 +2886,10 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
 
 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
 PNG_EXPORT(242, void, png_set_check_for_invalid_index,
-    (png_structrp png_ptr, int allowed));
+   (png_structrp png_ptr, int allowed));
 #  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(243, int, png_get_palette_max,
+   (png_const_structp png_ptr, png_const_infop info_ptr));
 #  endif
 #endif /* CHECK_FOR_INVALID_INDEX */
 
@@ -3110,24 +3253,25 @@ typedef struct
  * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)
  */
 #ifdef PNG_STDIO_SUPPORTED
-PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
-   const char *file_name));
+PNG_EXPORT(234, int, png_image_begin_read_from_file,
+   (png_imagep image, const char *file_name));
    /* The named file is opened for read and the image header is filled in
     * from the PNG header in the file.
     */
 
-PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-   FILE *file));
+PNG_EXPORT(235, int, png_image_begin_read_from_stdio,
+   (png_imagep image, FILE *file));
    /* The PNG header is read from the stdio FILE object. */
 #endif /* STDIO */
 
-PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
-   png_const_voidp memory, size_t size));
+PNG_EXPORT(236, int, png_image_begin_read_from_memory,
+   (png_imagep image, png_const_voidp memory, size_t size));
    /* The PNG header is read from the given memory buffer. */
 
-PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
-   png_const_colorp background, void *buffer, png_int_32 row_stride,
-   void *colormap));
+PNG_EXPORT(237, int, png_image_finish_read,
+   (png_imagep image,
+    png_const_colorp background, void *buffer, png_int_32 row_stride,
+    void *colormap));
    /* Finish reading the image into the supplied buffer and clean up the
     * png_image structure.
     *
@@ -3160,7 +3304,8 @@ PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
     * written to the colormap; this may be less than the original value.
     */
 
-PNG_EXPORT(238, void, png_image_free, (png_imagep image));
+PNG_EXPORT(238, void, png_image_free,
+   (png_imagep image));
    /* Free any data allocated by libpng in image->opaque, setting the pointer to
     * NULL.  May be called at any time after the structure is initialized.
     */
@@ -3184,14 +3329,16 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
  * colormap_entries: set to the number of entries in the color-map (0 to 256)
  */
 #ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
-   const char *file, int convert_to_8bit, const void *buffer,
-   png_int_32 row_stride, const void *colormap));
+PNG_EXPORT(239, int, png_image_write_to_file,
+   (png_imagep image,
+    const char *file, int convert_to_8bit, const void *buffer,
+    png_int_32 row_stride, const void *colormap));
    /* Write the image to the named file. */
 
-PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
-   int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
-   const void *colormap));
+PNG_EXPORT(240, int, png_image_write_to_stdio,
+   (png_imagep image,
+    FILE *file, int convert_to_8_bit, const void *buffer,
+    png_int_32 row_stride, const void *colormap));
    /* Write the image to the given FILE object. */
 #endif /* SIMPLIFIED_WRITE_STDIO */
 
@@ -3216,9 +3363,11 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
  * notices) you need to use one of the other APIs.
  */
 
-PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
-   png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8_bit,
-   const void *buffer, png_int_32 row_stride, const void *colormap));
+PNG_EXPORT(245, int, png_image_write_to_memory,
+   (png_imagep image,
+    void *memory, png_alloc_size_t * PNG_RESTRICT memory_bytes,
+    int convert_to_8_bit,
+    const void *buffer, png_int_32 row_stride, const void *colormap));
    /* Write the image to the given memory buffer.  The function both writes the
     * whole PNG data stream to *memory and updates *memory_bytes with the count
     * of bytes written.
@@ -3394,7 +3543,7 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
  * one to use is one more than this.)
  */
 #ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(259);
+   PNG_EXPORT_LAST_ORDINAL(259);
 #endif
 
 #ifdef __cplusplus
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
index 4bc5f7bb468..b957f8b5061 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
@@ -29,9 +29,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.51
+ * libpng version 1.6.55
  *
- * Copyright (c) 2018-2025 Cosmin Truta
+ * Copyright (c) 2018-2026 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
index 44c86ebfef9..324d1951a52 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
@@ -78,7 +78,8 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message),
 }
 #else
 PNG_FUNCTION(void,PNGAPI
-png_err,(png_const_structrp png_ptr),PNG_NORETURN)
+png_err,(png_const_structrp png_ptr),
+    PNG_NORETURN)
 {
    /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
     * erroneously as '\0', instead of the empty string "".  This was
@@ -405,8 +406,8 @@ static const char png_digit[16] = {
 };
 
 static void /* PRIVATE */
-png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
-    error_message)
+png_format_buffer(png_const_structrp png_ptr, png_charp buffer,
+    png_const_charp error_message)
 {
    png_uint_32 chunk_name = png_ptr->chunk_name;
    int iout = 0, ishift = 24;
@@ -485,8 +486,8 @@ png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)
 #ifdef PNG_READ_SUPPORTED
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 void PNGAPI
-png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
-    error_message)
+png_chunk_benign_error(png_const_structrp png_ptr,
+    png_const_charp error_message)
 {
    if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
       png_chunk_warning(png_ptr, error_message);
@@ -543,7 +544,8 @@ png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
 #ifdef PNG_ERROR_TEXT_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 PNG_FUNCTION(void,
-png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
+png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),
+    PNG_NORETURN)
 {
 #  define fixed_message "fixed point overflow in "
 #  define fixed_message_ln ((sizeof fixed_message)-1)
@@ -696,7 +698,8 @@ png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
 }
 
 PNG_FUNCTION(void,PNGAPI
-png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
+png_longjmp,(png_const_structrp png_ptr, int val),
+    PNG_NORETURN)
 {
 #ifdef PNG_SETJMP_SUPPORTED
    if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
index ed2e7f886f5..a5bdcd1b524 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
@@ -151,8 +151,8 @@ png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
-   info_ptr)
+png_get_x_pixels_per_meter(png_const_structrp png_ptr,
+    png_const_inforp info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
    png_debug(1, "in png_get_x_pixels_per_meter");
@@ -172,8 +172,8 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
-    info_ptr)
+png_get_y_pixels_per_meter(png_const_structrp png_ptr,
+    png_const_inforp info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
    png_debug(1, "in png_get_y_pixels_per_meter");
@@ -215,8 +215,8 @@ png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
-   info_ptr)
+png_get_pixel_aspect_ratio(png_const_structrp png_ptr,
+    png_const_inforp info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
    png_debug(1, "in png_get_pixel_aspect_ratio");
@@ -766,7 +766,6 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
    }
 
    return 0;
-
 }
 #endif
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
index 4cfae474751..ae1ab462072 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
@@ -31,9 +31,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  */
-/* libpng version 1.6.51 */
+/* libpng version 1.6.55 */
 
-/* Copyright (c) 2018-2025 Cosmin Truta */
+/* Copyright (c) 2018-2026 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
index 12b71bcbc02..8ec703616ec 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
@@ -75,7 +75,8 @@ png_destroy_png_struct(png_structrp png_ptr)
  * have the ability to do that.
  */
 PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+png_calloc,(png_const_structrp png_ptr, png_alloc_size_t size),
+    PNG_ALLOCATED)
 {
    png_voidp ret;
 
@@ -147,7 +148,8 @@ png_malloc_array_checked(png_const_structrp png_ptr, int nelements,
 
 PNG_FUNCTION(png_voidp /* PRIVATE */,
 png_malloc_array,(png_const_structrp png_ptr, int nelements,
-    size_t element_size),PNG_ALLOCATED)
+    size_t element_size),
+    PNG_ALLOCATED)
 {
    if (nelements <= 0 || element_size == 0)
       png_error(png_ptr, "internal error: array alloc");
@@ -157,7 +159,8 @@ png_malloc_array,(png_const_structrp png_ptr, int nelements,
 
 PNG_FUNCTION(png_voidp /* PRIVATE */,
 png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,
-    int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)
+    int old_elements, int add_elements, size_t element_size),
+    PNG_ALLOCATED)
 {
    /* These are internal errors: */
    if (add_elements <= 0 || element_size == 0 || old_elements < 0 ||
@@ -196,7 +199,8 @@ png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,
  * function png_malloc_default is also provided.
  */
 PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+png_malloc,(png_const_structrp png_ptr, png_alloc_size_t size),
+    PNG_ALLOCATED)
 {
    png_voidp ret;
 
@@ -270,7 +274,8 @@ png_free(png_const_structrp png_ptr, png_voidp ptr)
 }
 
 PNG_FUNCTION(void,PNGAPI
-png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)
+png_free_default,(png_const_structrp png_ptr, png_voidp ptr),
+    PNG_DEPRECATED)
 {
    if (png_ptr == NULL || ptr == NULL)
       return;
@@ -284,8 +289,8 @@ png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)
  * of allocating and freeing memory.
  */
 void PNGAPI
-png_set_mem_fn(png_structrp png_ptr, png_voidp mem_ptr, png_malloc_ptr
-  malloc_fn, png_free_ptr free_fn)
+png_set_mem_fn(png_structrp png_ptr, png_voidp mem_ptr,
+    png_malloc_ptr malloc_fn, png_free_ptr free_fn)
 {
    if (png_ptr != NULL)
    {
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
index dcd005efb34..ee91f58d4ba 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
@@ -1104,15 +1104,17 @@ extern "C" {
  */
 /* Zlib support */
 #define PNG_UNEXPECTED_ZLIB_RETURN (-7)
-PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),
+PNG_INTERNAL_FUNCTION(void, png_zstream_error,
+   (png_structrp png_ptr, int ret),
    PNG_EMPTY);
    /* Used by the zlib handling functions to ensure that z_stream::msg is always
     * set before they return.
     */
 
 #ifdef PNG_WRITE_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
-   png_compression_bufferp *list),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_free_buffer_list,
+   (png_structrp png_ptr, png_compression_bufferp *list),
+   PNG_EMPTY);
    /* Free the buffer list used by the compressed write code. */
 #endif
 
@@ -1124,22 +1126,25 @@ PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
    (defined(PNG_sCAL_SUPPORTED) && \
    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,
-   double fp, png_const_charp text),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_fixed_point, png_fixed,
+   (png_const_structrp png_ptr, double fp, png_const_charp text),
+   PNG_EMPTY);
 #endif
 
 #if defined(PNG_FLOATING_POINT_SUPPORTED) && \
    !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
    (defined(PNG_cLLI_SUPPORTED) || defined(PNG_mDCV_SUPPORTED))
-PNG_INTERNAL_FUNCTION(png_uint_32,png_fixed_ITU,(png_const_structrp png_ptr,
-   double fp, png_const_charp text),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_uint_32, png_fixed_ITU,
+   (png_const_structrp png_ptr, double fp, png_const_charp text),
+   PNG_EMPTY);
 #endif
 
 /* Check the user version string for compatibility, returns false if the version
  * numbers aren't compatible.
  */
-PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
-   png_const_charp user_png_ver),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_user_version_check,
+   (png_structrp png_ptr, png_const_charp user_png_ver),
+   PNG_EMPTY);
 
 #ifdef PNG_READ_SUPPORTED /* should only be used on read */
 /* Security: read limits on the largest allocations while reading a PNG.  This
@@ -1164,24 +1169,28 @@ PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
  * does, however, call the application provided allocator and that could call
  * png_error (although that would be a bug in the application implementation.)
  */
-PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_base,(png_const_structrp png_ptr,
-   png_alloc_size_t size),PNG_ALLOCATED);
+PNG_INTERNAL_FUNCTION(png_voidp, png_malloc_base,
+   (png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED);
 
 #if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
    defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
 /* Internal array allocator, outputs no error or warning messages on failure,
  * just returns NULL.
  */
-PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_array,(png_const_structrp png_ptr,
-   int nelements, size_t element_size),PNG_ALLOCATED);
+PNG_INTERNAL_FUNCTION(png_voidp, png_malloc_array,
+   (png_const_structrp png_ptr, int nelements, size_t element_size),
+   PNG_ALLOCATED);
 
 /* The same but an existing array is extended by add_elements.  This function
  * also memsets the new elements to 0 and copies the old elements.  The old
  * array is not freed or altered.
  */
-PNG_INTERNAL_FUNCTION(png_voidp,png_realloc_array,(png_const_structrp png_ptr,
-   png_const_voidp array, int old_elements, int add_elements,
-   size_t element_size),PNG_ALLOCATED);
+PNG_INTERNAL_FUNCTION(png_voidp, png_realloc_array,
+   (png_const_structrp png_ptr,
+    png_const_voidp array, int old_elements, int add_elements,
+    size_t element_size),
+   PNG_ALLOCATED);
 #endif /* text, sPLT or unknown chunks */
 
 /* Magic to create a struct when there is no struct to call the user supplied
@@ -1190,84 +1199,106 @@ PNG_INTERNAL_FUNCTION(png_voidp,png_realloc_array,(png_const_structrp png_ptr,
  * restriction so libpng has to assume that the 'free' handler, at least, might
  * call png_error.
  */
-PNG_INTERNAL_FUNCTION(png_structp,png_create_png_struct,
-   (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn,
-    png_free_ptr free_fn),PNG_ALLOCATED);
+PNG_INTERNAL_FUNCTION(png_structp, png_create_png_struct,
+   (png_const_charp user_png_ver,
+    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn,
+    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
+   PNG_ALLOCATED);
 
 /* Free memory from internal libpng struct */
-PNG_INTERNAL_FUNCTION(void,png_destroy_png_struct,(png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(void, png_destroy_png_struct,
+   (png_structrp png_ptr),
    PNG_EMPTY);
 
 /* Free an allocated jmp_buf (always succeeds) */
-PNG_INTERNAL_FUNCTION(void,png_free_jmpbuf,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_free_jmpbuf,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 
 /* Function to allocate memory for zlib.  PNGAPI is disallowed. */
-PNG_INTERNAL_FUNCTION(voidpf,png_zalloc,(voidpf png_ptr, uInt items, uInt size),
+PNG_INTERNAL_FUNCTION(voidpf, png_zalloc,
+   (voidpf png_ptr, uInt items, uInt size),
    PNG_ALLOCATED);
 
 /* Function to free memory for zlib.  PNGAPI is disallowed. */
-PNG_INTERNAL_FUNCTION(void,png_zfree,(voidpf png_ptr, voidpf ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_zfree,
+   (voidpf png_ptr, voidpf ptr),
+   PNG_EMPTY);
 
 /* Next four functions are used internally as callbacks.  PNGCBAPI is required
  * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3, changed to
  * PNGCBAPI at 1.5.0
  */
 
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_read_data,(png_structp png_ptr,
-    png_bytep data, size_t length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void PNGCBAPI, png_default_read_data,
+   (png_structp png_ptr, png_bytep data, size_t length),
+   PNG_EMPTY);
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_push_fill_buffer,(png_structp png_ptr,
-    png_bytep buffer, size_t length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void PNGCBAPI, png_push_fill_buffer,
+   (png_structp png_ptr, png_bytep buffer, size_t length),
+   PNG_EMPTY);
 #endif
 
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_write_data,(png_structp png_ptr,
-    png_bytep data, size_t length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void PNGCBAPI, png_default_write_data,
+   (png_structp png_ptr, png_bytep data, size_t length),
+   PNG_EMPTY);
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 #  ifdef PNG_STDIO_SUPPORTED
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_flush,(png_structp png_ptr),
+PNG_INTERNAL_FUNCTION(void PNGCBAPI, png_default_flush,
+   (png_structp png_ptr),
    PNG_EMPTY);
 #  endif
 #endif
 
 /* Reset the CRC variable */
-PNG_INTERNAL_FUNCTION(void,png_reset_crc,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_reset_crc,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 
 /* Write the "data" buffer to whatever output you are using */
-PNG_INTERNAL_FUNCTION(void,png_write_data,(png_structrp png_ptr,
-    png_const_bytep data, size_t length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_data,
+   (png_structrp png_ptr, png_const_bytep data, size_t length),
+   PNG_EMPTY);
 
 /* Read and check the PNG file signature */
-PNG_INTERNAL_FUNCTION(void,png_read_sig,(png_structrp png_ptr,
-   png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_sig,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
 
 /* Read the chunk header (length + type name) */
-PNG_INTERNAL_FUNCTION(png_uint_32,png_read_chunk_header,(png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(png_uint_32, png_read_chunk_header,
+   (png_structrp png_ptr),
    PNG_EMPTY);
 
 /* Read data from whatever input you are using into the "data" buffer */
-PNG_INTERNAL_FUNCTION(void,png_read_data,(png_structrp png_ptr, png_bytep data,
-    size_t length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_data,
+   (png_structrp png_ptr, png_bytep data, size_t length),
+   PNG_EMPTY);
 
 /* Read bytes into buf, and update png_ptr->crc */
-PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
-    png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_crc_read,
+   (png_structrp png_ptr, png_bytep buf, png_uint_32 length),
+   PNG_EMPTY);
 
 /* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
-PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,
-   png_uint_32 skip),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_crc_finish,
+   (png_structrp png_ptr, png_uint_32 skip),
+   PNG_EMPTY);
 
 /* Calculate the CRC over a section of data.  Note that we are only
  * passing a maximum of 64K on systems that have this as a memory limit,
  * since this is the maximum buffer size we can specify.
  */
-PNG_INTERNAL_FUNCTION(void,png_calculate_crc,(png_structrp png_ptr,
-   png_const_bytep ptr, size_t length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_calculate_crc,
+   (png_structrp png_ptr, png_const_bytep ptr, size_t length),
+   PNG_EMPTY);
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_flush,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 #endif
 
 /* Write various chunks */
@@ -1275,68 +1306,86 @@ PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);
 /* Write the IHDR chunk, and update the png_struct with the necessary
  * information.
  */
-PNG_INTERNAL_FUNCTION(void,png_write_IHDR,(png_structrp png_ptr,
-   png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
-   int compression_method, int filter_method, int interlace_method),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_write_PLTE,(png_structrp png_ptr,
-   png_const_colorp palette, png_uint_32 num_pal),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_compress_IDAT,(png_structrp png_ptr,
-   png_const_bytep row_data, png_alloc_size_t row_data_length, int flush),
+PNG_INTERNAL_FUNCTION(void, png_write_IHDR,
+   (png_structrp png_ptr,
+    png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
+    int compression_method, int filter_method, int interlace_method),
    PNG_EMPTY);
 
-PNG_INTERNAL_FUNCTION(void,png_write_IEND,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_PLTE,
+   (png_structrp png_ptr,
+    png_const_colorp palette, png_uint_32 num_pal),
+   PNG_EMPTY);
+
+PNG_INTERNAL_FUNCTION(void, png_compress_IDAT,
+   (png_structrp png_ptr,
+    png_const_bytep row_data, png_alloc_size_t row_data_length, int flush),
+   PNG_EMPTY);
+
+PNG_INTERNAL_FUNCTION(void, png_write_IEND,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 
 #ifdef PNG_WRITE_gAMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_gAMA_fixed,(png_structrp png_ptr,
-    png_fixed_point file_gamma),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_gAMA_fixed,
+   (png_structrp png_ptr, png_fixed_point file_gamma),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_sBIT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sBIT,(png_structrp png_ptr,
-    png_const_color_8p sbit, int color_type),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_sBIT,
+   (png_structrp png_ptr, png_const_color_8p sbit, int color_type),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_cHRM_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,
-    const png_xy *xy), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_cHRM_fixed,
+   (png_structrp png_ptr, const png_xy *xy),
+   PNG_EMPTY);
    /* The xy value must have been previously validated */
 #endif
 
 #ifdef PNG_WRITE_cICP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_cICP,(png_structrp png_ptr,
+PNG_INTERNAL_FUNCTION(void, png_write_cICP,
+   (png_structrp png_ptr,
     png_byte colour_primaries, png_byte transfer_function,
-    png_byte matrix_coefficients, png_byte video_full_range_flag), PNG_EMPTY);
+    png_byte matrix_coefficients, png_byte video_full_range_flag),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_cLLI_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_cLLI_fixed,(png_structrp png_ptr,
-   png_uint_32 maxCLL, png_uint_32 maxFALL), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_cLLI_fixed,
+   (png_structrp png_ptr, png_uint_32 maxCLL, png_uint_32 maxFALL),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_mDCV_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_mDCV_fixed,(png_structrp png_ptr,
-   png_uint_16 red_x, png_uint_16 red_y,
-   png_uint_16 green_x, png_uint_16 green_y,
-   png_uint_16 blue_x, png_uint_16 blue_y,
-   png_uint_16 white_x, png_uint_16 white_y,
-   png_uint_32 maxDL, png_uint_32 minDL), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_mDCV_fixed,
+   (png_structrp png_ptr,
+    png_uint_16 red_x, png_uint_16 red_y,
+    png_uint_16 green_x, png_uint_16 green_y,
+    png_uint_16 blue_x, png_uint_16 blue_y,
+    png_uint_16 white_x, png_uint_16 white_y,
+    png_uint_32 maxDL, png_uint_32 minDL),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
-    int intent),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_sRGB,
+   (png_structrp png_ptr, int intent),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_eXIf_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_eXIf,(png_structrp png_ptr,
-    png_bytep exif, int num_exif),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_eXIf,
+   (png_structrp png_ptr, png_bytep exif, int num_exif),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
-   png_const_charp name, png_const_bytep profile, png_uint_32 proflen),
+PNG_INTERNAL_FUNCTION(void, png_write_iCCP,
+   (png_structrp png_ptr,
+    png_const_charp name, png_const_bytep profile, png_uint_32 proflen),
    PNG_EMPTY);
    /* Writes a previously 'set' profile.  The profile argument is **not**
     * compressed.
@@ -1344,82 +1393,106 @@ PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
 #endif
 
 #ifdef PNG_WRITE_sPLT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sPLT,(png_structrp png_ptr,
-    png_const_sPLT_tp palette),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_sPLT,
+   (png_structrp png_ptr, png_const_sPLT_tp palette),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_tRNS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_tRNS,(png_structrp png_ptr,
+PNG_INTERNAL_FUNCTION(void, png_write_tRNS,
+   (png_structrp png_ptr,
     png_const_bytep trans, png_const_color_16p values, int number,
-    int color_type),PNG_EMPTY);
+    int color_type),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_bKGD_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_bKGD,(png_structrp png_ptr,
-    png_const_color_16p values, int color_type),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_bKGD,
+   (png_structrp png_ptr, png_const_color_16p values, int color_type),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_hIST_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_hIST,(png_structrp png_ptr,
-    png_const_uint_16p hist, int num_hist),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_hIST,
+   (png_structrp png_ptr, png_const_uint_16p hist, int num_hist),
+   PNG_EMPTY);
 #endif
 
 /* Chunks that have keywords */
 #ifdef PNG_WRITE_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr,
-   png_const_charp key, png_const_charp text, size_t text_len),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_tEXt,
+   (png_structrp png_ptr,
+    png_const_charp key, png_const_charp text, size_t text_len),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_zTXt,(png_structrp png_ptr, png_const_charp
-    key, png_const_charp text, int compression),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_zTXt,
+   (png_structrp png_ptr,
+    png_const_charp key, png_const_charp text, int compression),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_iTXt,(png_structrp png_ptr,
+PNG_INTERNAL_FUNCTION(void, png_write_iTXt,
+   (png_structrp png_ptr,
     int compression, png_const_charp key, png_const_charp lang,
-    png_const_charp lang_key, png_const_charp text),PNG_EMPTY);
+    png_const_charp lang_key, png_const_charp text),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */
-PNG_INTERNAL_FUNCTION(int,png_set_text_2,(png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_textp text_ptr, int num_text),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_set_text_2,
+   (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_textp text_ptr, int num_text),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_oFFs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_oFFs,(png_structrp png_ptr,
-    png_int_32 x_offset, png_int_32 y_offset, int unit_type),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_oFFs,
+   (png_structrp png_ptr,
+    png_int_32 x_offset, png_int_32 y_offset, int unit_type),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_pCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_pCAL,(png_structrp png_ptr,
-    png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
-    png_const_charp units, png_charpp params),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_pCAL,
+   (png_structrp png_ptr,
+    png_charp purpose, png_int_32 X0, png_int_32 X1,
+    int type, int nparams, png_const_charp units, png_charpp params),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_pHYs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_pHYs,(png_structrp png_ptr,
+PNG_INTERNAL_FUNCTION(void, png_write_pHYs,
+   (png_structrp png_ptr,
     png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
-    int unit_type),PNG_EMPTY);
+    int unit_type),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_tIME_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_tIME,(png_structrp png_ptr,
-    png_const_timep mod_time),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_tIME,
+   (png_structrp png_ptr, png_const_timep mod_time),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_sCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sCAL_s,(png_structrp png_ptr,
-    int unit, png_const_charp width, png_const_charp height),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_sCAL_s,
+   (png_structrp png_ptr,
+    int unit, png_const_charp width, png_const_charp height),
+   PNG_EMPTY);
 #endif
 
 /* Called when finished processing a row of data */
-PNG_INTERNAL_FUNCTION(void,png_write_finish_row,(png_structrp png_ptr),
-    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_finish_row,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 
 /* Internal use only.   Called before first row of data */
-PNG_INTERNAL_FUNCTION(void,png_write_start_row,(png_structrp png_ptr),
-    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_start_row,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 
 /* Combine a row of data, dealing with alpha, etc. if requested.  'row' is an
  * array of png_ptr->width pixels.  If the image is not interlaced or this
@@ -1447,8 +1520,9 @@ PNG_INTERNAL_FUNCTION(void,png_write_start_row,(png_structrp png_ptr),
 #ifndef PNG_USE_COMPILE_TIME_MASKS
 #  define PNG_USE_COMPILE_TIME_MASKS 1
 #endif
-PNG_INTERNAL_FUNCTION(void,png_combine_row,(png_const_structrp png_ptr,
-    png_bytep row, int display),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_combine_row,
+   (png_const_structrp png_ptr, png_bytep row, int display),
+   PNG_EMPTY);
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
 /* Expand an interlaced row: the 'row_info' describes the pass data that has
@@ -1457,170 +1531,230 @@ PNG_INTERNAL_FUNCTION(void,png_combine_row,(png_const_structrp png_ptr,
  * the pixels are *replicated* to the intervening space.  This is essential for
  * the correct operation of png_combine_row, above.
  */
-PNG_INTERNAL_FUNCTION(void,png_do_read_interlace,(png_row_infop row_info,
-    png_bytep row, int pass, png_uint_32 transformations),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_read_interlace,
+   (png_row_infop row_info,
+    png_bytep row, int pass, png_uint_32 transformations),
+   PNG_EMPTY);
 #endif
 
 /* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
 /* Grab pixels out of a row for an interlaced pass */
-PNG_INTERNAL_FUNCTION(void,png_do_write_interlace,(png_row_infop row_info,
-    png_bytep row, int pass),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_write_interlace,
+   (png_row_infop row_info, png_bytep row, int pass),
+   PNG_EMPTY);
 #endif
 
 /* Unfilter a row: check the filter value before calling this, there is no point
  * calling it for PNG_FILTER_VALUE_NONE.
  */
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row,(png_structrp pp, png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row, int filter),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row,
+   (png_structrp pp, png_row_infop row_info,
+    png_bytep row, png_const_bytep prev_row, int filter),
+   PNG_EMPTY);
 
 #if PNG_ARM_NEON_OPT > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_neon,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_up_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_neon,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 #if PNG_MIPS_MSA_IMPLEMENTATION == 1
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_up_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_msa,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 #if PNG_MIPS_MMI_IMPLEMENTATION > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_mmi,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_mmi,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_mmi,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_mmi,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_mmi,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_mmi,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_mmi,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_up_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_mmi,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 #if PNG_POWERPC_VSX_OPT > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_vsx,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_up_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_vsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 #if PNG_INTEL_SSE_IMPLEMENTATION > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_sse2,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_sse2,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_sse2,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_sse2,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_sse2,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_sse2,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 #if PNG_LOONGARCH_LSX_IMPLEMENTATION == 1
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_lsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_up_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_lsx,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 #if PNG_RISCV_RVV_IMPLEMENTATION == 1
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_rvv,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_up_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub3_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_sub4_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg3_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_avg4_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth3_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_filter_row_paeth4_rvv,
+   (png_row_infop row_info, png_bytep row, png_const_bytep prev_row),
+   PNG_EMPTY);
 #endif
 
 /* Choose the best filter to use and filter the row data */
-PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
-    png_row_infop row_info),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_write_find_filter,
+   (png_structrp png_ptr, png_row_infop row_info),
+   PNG_EMPTY);
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,
-   png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_IDAT_data,
+   (png_structrp png_ptr, png_bytep output, png_alloc_size_t avail_out),
+   PNG_EMPTY);
    /* Read 'avail_out' bytes of data from the IDAT stream.  If the output buffer
     * is NULL the function checks, instead, for the end of the stream.  In this
     * case a benign error will be issued if the stream end is not found or if
     * extra data has to be consumed.
     */
-PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(void, png_read_finish_IDAT,
+   (png_structrp png_ptr),
    PNG_EMPTY);
    /* This cleans up when the IDAT LZ stream does not end when the last image
     * byte is read; there is still some pending input.
     */
 
-PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(void, png_read_finish_row,
+   (png_structrp png_ptr),
    PNG_EMPTY);
    /* Finish a row while reading, dealing with interlacing passes, etc. */
 #endif /* SEQUENTIAL_READ */
 
 /* Initialize the row buffers, etc. */
-PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_start_row,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 
 #if ZLIB_VERNUM >= 0x1240
-PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),
-      PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_zlib_inflate,
+   (png_structrp png_ptr, int flush),
+   PNG_EMPTY);
 #  define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush)
 #else /* Zlib < 1.2.4 */
 #  define PNG_INFLATE(pp, flush) inflate(&(pp)->zstream, flush)
@@ -1628,38 +1762,44 @@ PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
 /* Optional call to update the users info structure */
-PNG_INTERNAL_FUNCTION(void,png_read_transform_info,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_transform_info,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
 #endif
 
 /* Shared transform functions, defined in pngtran.c */
 #if defined(PNG_WRITE_FILLER_SUPPORTED) || \
     defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_strip_channel,(png_row_infop row_info,
-    png_bytep row, int at_start),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_strip_channel,
+   (png_row_infop row_info, png_bytep row, int at_start),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_16BIT_SUPPORTED
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_swap,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_swap,
+   (png_row_infop row_info, png_bytep row),
+   PNG_EMPTY);
 #endif
 #endif
 
 #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
     defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_packswap,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_packswap,
+   (png_row_infop row_info, png_bytep row),
+   PNG_EMPTY);
 #endif
 
 #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_invert,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_invert,
+   (png_row_infop row_info, png_bytep row),
+   PNG_EMPTY);
 #endif
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_bgr,
+   (png_row_infop row_info, png_bytep row),
+   PNG_EMPTY);
 #endif
 
 /* The following decodes the appropriate chunks, and does error correction,
@@ -1680,25 +1820,27 @@ typedef enum
    handled_ok          /* known, supported and handled without error */
 } png_handle_result_code;
 
-PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_unknown,
-    (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length, int keep),
-    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_handle_result_code, png_handle_unknown,
+   (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length, int keep),
+   PNG_EMPTY);
    /* This is the function that gets called for unknown chunks.  The 'keep'
     * argument is either non-zero for a known chunk that has been set to be
     * handled as unknown or zero for an unknown chunk.  By default the function
     * just skips the chunk or errors out if it is critical.
     */
 
-PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_chunk,
-    (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_handle_result_code, png_handle_chunk,
+   (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),
+   PNG_EMPTY);
    /* This handles the current chunk png_ptr->chunk_name with unread
     * data[length] and returns one of the above result codes.
     */
 
 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
     defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
-    (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_chunk_unknown_handling,
+   (png_const_structrp png_ptr, png_uint_32 chunk_name),
+   PNG_EMPTY);
    /* Exactly as the API png_handle_as_unknown() except that the argument is a
     * 32-bit chunk name, not a string.
     */
@@ -1706,93 +1848,122 @@ PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
 
 /* Handle the transformations for reading and writing */
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_do_read_transformations,(png_structrp png_ptr,
-   png_row_infop row_info),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_read_transformations,
+   (png_structrp png_ptr, png_row_infop row_info),
+   PNG_EMPTY);
 #endif
 #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_do_write_transformations,(png_structrp png_ptr,
-   png_row_infop row_info),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_write_transformations,
+   (png_structrp png_ptr, png_row_infop row_info),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_init_read_transformations,(png_structrp png_ptr),
-    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_init_read_transformations,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_read_chunk,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_sig,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_check_crc,(png_structrp png_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_save_buffer,(png_structrp png_ptr),
-    PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_restore_buffer,(png_structrp png_ptr,
-    png_bytep buffer, size_t buffer_length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_IDAT,(png_structrp png_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
-    png_bytep buffer, size_t buffer_length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
-    PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,
-   png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
-   png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_have_row,(png_structrp png_ptr,
-    png_bytep row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_end,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),
-    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_read_chunk,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_read_sig,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_check_crc,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_save_buffer,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_restore_buffer,
+   (png_structrp png_ptr, png_bytep buffer, size_t buffer_length),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_read_IDAT,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_process_IDAT_data,
+   (png_structrp png_ptr, png_bytep buffer, size_t buffer_length),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_process_row,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_have_info,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_have_end,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_have_row,
+   (png_structrp png_ptr, png_bytep row),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_push_read_end,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_process_some_data,
+   (png_structrp png_ptr, png_inforp info_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_read_push_finish_row,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
 #endif /* PROGRESSIVE_READ */
 
 #ifdef PNG_iCCP_SUPPORTED
 /* Routines for checking parts of an ICC profile. */
 #ifdef PNG_READ_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
-   png_const_charp name, png_uint_32 profile_length), PNG_EMPTY);
-#endif /* READ_iCCP */
-PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
-   png_const_charp name, png_uint_32 profile_length,
-   png_const_bytep profile /* first 132 bytes only */, int color_type),
+PNG_INTERNAL_FUNCTION(int, png_icc_check_length,
+   (png_const_structrp png_ptr,
+    png_const_charp name, png_uint_32 profile_length),
+   PNG_EMPTY);
+#endif /* READ_iCCP */
+PNG_INTERNAL_FUNCTION(int, png_icc_check_header,
+   (png_const_structrp png_ptr,
+    png_const_charp name, png_uint_32 profile_length,
+    png_const_bytep profile /* first 132 bytes only */, int color_type),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_icc_check_tag_table,
+   (png_const_structrp png_ptr,
+    png_const_charp name, png_uint_32 profile_length,
+    png_const_bytep profile /* header plus whole tag table */),
    PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
-   png_const_charp name, png_uint_32 profile_length,
-   png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
 #endif /* iCCP */
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_set_rgb_coefficients, (png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(void, png_set_rgb_coefficients,
+   (png_structrp png_ptr),
    PNG_EMPTY);
    /* Set the rgb_to_gray coefficients from the cHRM Y values (if unset) */
 #endif /* READ_RGB_TO_GRAY */
 
 /* Added at libpng version 1.4.0 */
-PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_check_IHDR,
+   (png_const_structrp png_ptr,
+    png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
+    int interlace_type, int compression_type, int filter_type),
+   PNG_EMPTY);
 
 /* Added at libpng version 1.5.10 */
 #if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
     defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_check_palette_indexes,
-   (png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_do_check_palette_indexes,
+   (png_structrp png_ptr, png_row_infop row_info),
+   PNG_EMPTY);
 #endif
 
 #if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_fixed_error,(png_const_structrp png_ptr,
-   png_const_charp name),PNG_NORETURN);
+PNG_INTERNAL_FUNCTION(void, png_fixed_error,
+   (png_const_structrp png_ptr, png_const_charp name),
+   PNG_NORETURN);
 #endif
 
 /* Puts 'string' into 'buffer' at buffer[pos], taking care never to overwrite
  * the end.  Always leaves the buffer nul terminated.  Never errors out (and
  * there is no error code.)
  */
-PNG_INTERNAL_FUNCTION(size_t,png_safecat,(png_charp buffer, size_t bufsize,
-   size_t pos, png_const_charp string),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(size_t, png_safecat,
+   (png_charp buffer, size_t bufsize, size_t pos, png_const_charp string),
+   PNG_EMPTY);
 
 /* Various internal functions to handle formatted warning messages, currently
  * only implemented for warnings.
@@ -1803,8 +1974,9 @@ PNG_INTERNAL_FUNCTION(size_t,png_safecat,(png_charp buffer, size_t bufsize,
  * Returns the pointer to the start of the formatted string.  This utility only
  * does unsigned values.
  */
-PNG_INTERNAL_FUNCTION(png_charp,png_format_number,(png_const_charp start,
-   png_charp end, int format, png_alloc_size_t number),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_charp, png_format_number,
+   (png_const_charp start, png_charp end, int format, png_alloc_size_t number),
+   PNG_EMPTY);
 
 /* Convenience macro that takes an array: */
 #define PNG_FORMAT_NUMBER(buffer,format,number) \
@@ -1836,23 +2008,26 @@ PNG_INTERNAL_FUNCTION(png_charp,png_format_number,(png_const_charp start,
 typedef char png_warning_parameters[PNG_WARNING_PARAMETER_COUNT][
    PNG_WARNING_PARAMETER_SIZE];
 
-PNG_INTERNAL_FUNCTION(void,png_warning_parameter,(png_warning_parameters p,
-   int number, png_const_charp string),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_warning_parameter,
+   (png_warning_parameters p, int number, png_const_charp string),
+   PNG_EMPTY);
    /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
     * including the trailing '\0'.
     */
-PNG_INTERNAL_FUNCTION(void,png_warning_parameter_unsigned,
+PNG_INTERNAL_FUNCTION(void, png_warning_parameter_unsigned,
    (png_warning_parameters p, int number, int format, png_alloc_size_t value),
    PNG_EMPTY);
    /* Use png_alloc_size_t because it is an unsigned type as big as any we
     * need to output.  Use the following for a signed value.
     */
-PNG_INTERNAL_FUNCTION(void,png_warning_parameter_signed,
+PNG_INTERNAL_FUNCTION(void, png_warning_parameter_signed,
    (png_warning_parameters p, int number, int format, png_int_32 value),
    PNG_EMPTY);
 
-PNG_INTERNAL_FUNCTION(void,png_formatted_warning,(png_const_structrp png_ptr,
-   png_warning_parameters p, png_const_charp message),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_formatted_warning,
+   (png_const_structrp png_ptr,
+    png_warning_parameters p, png_const_charp message),
+   PNG_EMPTY);
    /* 'message' follows the X/Open approach of using @1, @2 to insert
     * parameters previously supplied using the above functions.  Errors in
     * specifying the parameters will simply result in garbage substitutions.
@@ -1874,14 +2049,16 @@ PNG_INTERNAL_FUNCTION(void,png_formatted_warning,(png_const_structrp png_ptr,
  * If benign errors aren't supported they end up as the corresponding base call
  * (png_warning or png_error.)
  */
-PNG_INTERNAL_FUNCTION(void,png_app_warning,(png_const_structrp png_ptr,
-   png_const_charp message),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_app_warning,
+   (png_const_structrp png_ptr, png_const_charp message),
+   PNG_EMPTY);
    /* The application provided invalid parameters to an API function or called
     * an API function at the wrong time, libpng can completely recover.
     */
 
-PNG_INTERNAL_FUNCTION(void,png_app_error,(png_const_structrp png_ptr,
-   png_const_charp message),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_app_error,
+   (png_const_structrp png_ptr, png_const_charp message),
+   PNG_EMPTY);
    /* As above but libpng will ignore the call, or attempt some other partial
     * recovery from the error.
     */
@@ -1890,8 +2067,9 @@ PNG_INTERNAL_FUNCTION(void,png_app_error,(png_const_structrp png_ptr,
 #  define png_app_error(pp,s) png_error(pp,s)
 #endif
 
-PNG_INTERNAL_FUNCTION(void,png_chunk_report,(png_const_structrp png_ptr,
-   png_const_charp message, int error),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_chunk_report,
+   (png_const_structrp png_ptr, png_const_charp message, int error),
+   PNG_EMPTY);
    /* Report a recoverable issue in chunk data.  On read this is used to report
     * a problem found while reading a particular chunk and the
     * png_chunk_benign_error or png_chunk_warning function is used as
@@ -1917,14 +2095,17 @@ PNG_INTERNAL_FUNCTION(void,png_chunk_report,(png_const_structrp png_ptr,
 #define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_ascii_from_fp,(png_const_structrp png_ptr,
-   png_charp ascii, size_t size, double fp, unsigned int precision),
+PNG_INTERNAL_FUNCTION(void, png_ascii_from_fp,
+   (png_const_structrp png_ptr,
+    png_charp ascii, size_t size, double fp, unsigned int precision),
    PNG_EMPTY);
 #endif /* FLOATING_POINT */
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
-   png_charp ascii, size_t size, png_fixed_point fp),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_ascii_from_fixed,
+   (png_const_structrp png_ptr,
+    png_charp ascii, size_t size, png_fixed_point fp),
+   PNG_EMPTY);
 #endif /* FIXED_POINT */
 #endif /* sCAL */
 
@@ -2016,8 +2197,9 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
  * that omits the last character (i.e. set the size to the index of
  * the problem character.)  This has not been tested within libpng.
  */
-PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
-   size_t size, int *statep, size_t *whereami),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_check_fp_number,
+   (png_const_charp string, size_t size, int *statep, size_t *whereami),
+   PNG_EMPTY);
 
 /* This is the same but it checks a complete string and returns true
  * only if it just contains a floating point number.  As of 1.5.4 this
@@ -2025,8 +2207,9 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
  * it was valid (otherwise it returns 0.)  This can be used for testing
  * for negative or zero values using the sticky flag.
  */
-PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
-   size_t size),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_check_fp_string,
+   (png_const_charp string, size_t size),
+   PNG_EMPTY);
 #endif /* pCAL || sCAL */
 
 #if defined(PNG_READ_GAMMA_SUPPORTED) ||\
@@ -2039,14 +2222,17 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
  * for overflow, true (1) if no overflow, in which case *res
  * holds the result.
  */
-PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,
-   png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_muldiv,
+   (png_fixed_point_p res, png_fixed_point a,
+    png_int_32 multiplied_by, png_int_32 divided_by),
+   PNG_EMPTY);
 
 /* Calculate a reciprocal - used for gamma values.  This returns
  * 0 if the argument is 0 in order to maintain an undefined value;
  * there are no warnings.
  */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
+PNG_INTERNAL_FUNCTION(png_fixed_point, png_reciprocal,
+   (png_fixed_point a),
    PNG_EMPTY);
 #endif
 
@@ -2055,11 +2241,13 @@ PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
  * values.  Accuracy is suitable for gamma calculations but this is
  * not exact - use png_muldiv for that.  Only required at present on read.
  */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,
-   png_fixed_point b),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_fixed_point, png_reciprocal2,
+   (png_fixed_point a, png_fixed_point b),
+   PNG_EMPTY);
 
 /* Return true if the gamma value is significantly different from 1.0 */
-PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
+PNG_INTERNAL_FUNCTION(int, png_gamma_significant,
+   (png_fixed_point gamma_value),
    PNG_EMPTY);
 
 /* PNGv3: 'resolve' the file gamma according to the new PNGv3 rules for colour
@@ -2070,8 +2258,9 @@ PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
  * transforms.  For this reason a gamma specified by png_set_gamma always takes
  * precedence.
  */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_resolve_file_gamma,
-   (png_const_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_fixed_point, png_resolve_file_gamma,
+   (png_const_structrp png_ptr),
+   PNG_EMPTY);
 
 /* Internal fixed point gamma correction.  These APIs are called as
  * required to convert single values - they don't need to be fast,
@@ -2080,37 +2269,45 @@ PNG_INTERNAL_FUNCTION(png_fixed_point,png_resolve_file_gamma,
  * While the input is an 'unsigned' value it must actually be the
  * correct bit value - 0..255 or 0..65535 as required.
  */
-PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_correct,(png_structrp png_ptr,
-   unsigned int value, png_fixed_point gamma_value),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_16bit_correct,(unsigned int value,
-   png_fixed_point gamma_value),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(png_byte,png_gamma_8bit_correct,(unsigned int value,
-   png_fixed_point gamma_value),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(png_uint_16, png_gamma_correct,
+   (png_structrp png_ptr, unsigned int value, png_fixed_point gamma_value),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_uint_16, png_gamma_16bit_correct,
+   (unsigned int value, png_fixed_point gamma_value),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_byte, png_gamma_8bit_correct,
+   (unsigned int value, png_fixed_point gamma_value),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_destroy_gamma_table,
+   (png_structrp png_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_build_gamma_table,
+   (png_structrp png_ptr, int bit_depth),
    PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,
-   int bit_depth),PNG_EMPTY);
 #endif /* READ_GAMMA */
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 /* Set the RGB coefficients if not already set by png_set_rgb_to_gray */
-PNG_INTERNAL_FUNCTION(void,png_set_rgb_coefficients,(png_structrp png_ptr),
+PNG_INTERNAL_FUNCTION(void, png_set_rgb_coefficients,
+   (png_structrp png_ptr),
    PNG_EMPTY);
 #endif
 
 #if defined(PNG_cHRM_SUPPORTED) || defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-PNG_INTERNAL_FUNCTION(int,png_XYZ_from_xy,(png_XYZ *XYZ, const png_xy *xy),
+PNG_INTERNAL_FUNCTION(int, png_XYZ_from_xy,
+   (png_XYZ *XYZ, const png_xy *xy),
    PNG_EMPTY);
 #endif /* cHRM || READ_RGB_TO_GRAY */
 
 #ifdef PNG_COLORSPACE_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_xy_from_XYZ,(png_xy *xy, const png_XYZ *XYZ),
+PNG_INTERNAL_FUNCTION(int, png_xy_from_XYZ,
+   (png_xy *xy, const png_XYZ *XYZ),
    PNG_EMPTY);
 #endif
 
 /* SIMPLIFIED READ/WRITE SUPPORT */
 #if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
 /* The internal structure that png_image::opaque points to. */
 typedef struct png_control
 {
@@ -2138,28 +2335,34 @@ typedef struct png_control
  * errors that might occur.  Returns true on success, false on failure (either
  * of the function or as a result of a png_error.)
  */
-PNG_INTERNAL_CALLBACK(void,png_safe_error,(png_structp png_ptr,
-   png_const_charp error_message),PNG_NORETURN);
+PNG_INTERNAL_CALLBACK(void, png_safe_error,
+   (png_structp png_ptr, png_const_charp error_message),
+   PNG_NORETURN);
 
 #ifdef PNG_WARNINGS_SUPPORTED
-PNG_INTERNAL_CALLBACK(void,png_safe_warning,(png_structp png_ptr,
-   png_const_charp warning_message),PNG_EMPTY);
+PNG_INTERNAL_CALLBACK(void, png_safe_warning,
+   (png_structp png_ptr, png_const_charp warning_message),
+   PNG_EMPTY);
 #else
 #  define png_safe_warning 0/*dummy argument*/
 #endif
 
-PNG_INTERNAL_FUNCTION(int,png_safe_execute,(png_imagep image,
-   int (*function)(png_voidp), png_voidp arg),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_safe_execute,
+   (png_imagep image, int (*function)(png_voidp), png_voidp arg),
+   PNG_EMPTY);
 
 /* Utility to log an error; this also cleans up the png_image; the function
  * always returns 0 (false).
  */
-PNG_INTERNAL_FUNCTION(int,png_image_error,(png_imagep image,
-   png_const_charp error_message),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int, png_image_error,
+   (png_imagep image, png_const_charp error_message),
+   PNG_EMPTY);
 
 #ifndef PNG_SIMPLIFIED_READ_SUPPORTED
 /* png_image_free is used by the write code but not exported */
-PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, png_image_free,
+   (png_imagep image),
+   PNG_EMPTY);
 #endif /* !SIMPLIFIED_READ */
 
 #endif /* SIMPLIFIED READ/WRITE */
@@ -2170,8 +2373,9 @@ PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY);
  * the generic code is used.
  */
 #ifdef PNG_FILTER_OPTIMIZATIONS
-PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
-   unsigned int bpp), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS,
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
    /* Just declare the optimization that will be used */
 #else
    /* List *all* the possible optimizations here - this branch is required if
@@ -2180,37 +2384,44 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
     */
 #  if PNG_ARM_NEON_OPT > 0
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
 #endif
 
 #if PNG_MIPS_MSA_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_mips,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
 #endif
 
 #  if PNG_MIPS_MMI_IMPLEMENTATION > 0
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_mips,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
 #  endif
 
 #  if PNG_INTEL_SSE_IMPLEMENTATION > 0
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
 #  endif
 #endif
 
 #if PNG_LOONGARCH_LSX_OPT > 0
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_lsx,
-    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
 #endif
 
 #  if PNG_RISCV_RVV_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_rvv,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+   (png_structp png_ptr, unsigned int bpp),
+   PNG_EMPTY);
 #endif
 
-PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
-   png_const_charp key, png_bytep new_key), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword,
+   (png_structrp png_ptr, png_const_charp key, png_bytep new_key),
+   PNG_EMPTY);
 
 #if PNG_ARM_NEON_IMPLEMENTATION == 1
 PNG_INTERNAL_FUNCTION(void,
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
index b53668a09ce..79fd9ad6a82 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2025 Cosmin Truta
+ * Copyright (c) 2018-2026 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -52,7 +52,8 @@
 /* Create a PNG structure for reading, and allocate any memory needed. */
 PNG_FUNCTION(png_structp,PNGAPI
 png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
+    png_error_ptr error_fn, png_error_ptr warn_fn),
+    PNG_ALLOCATED)
 {
 #ifndef PNG_USER_MEM_SUPPORTED
    png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
@@ -68,7 +69,8 @@ png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
 PNG_FUNCTION(png_structp,PNGAPI
 png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
+    png_malloc_ptr malloc_fn, png_free_ptr free_fn),
+    PNG_ALLOCATED)
 {
    png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
        error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
@@ -548,7 +550,6 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
 
    if (png_ptr->read_row_fn != NULL)
       (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-
 }
 #endif /* SEQUENTIAL_READ */
 
@@ -896,7 +897,7 @@ png_set_read_status_fn(png_structrp png_ptr, png_read_status_ptr read_row_fn)
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 void PNGAPI
 png_read_png(png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, voidp params)
+    int transforms, png_voidp params)
 {
    png_debug(1, "in png_read_png");
 
@@ -1133,19 +1134,20 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
 
 typedef struct
 {
-   /* Arguments: */
+   /* Arguments */
    png_imagep image;
-   png_voidp  buffer;
+   png_voidp buffer;
    png_int_32 row_stride;
-   png_voidp  colormap;
+   png_voidp colormap;
    png_const_colorp background;
-   /* Local variables: */
-   png_voidp       local_row;
-   png_voidp       first_row;
-   ptrdiff_t       row_bytes;           /* step between rows */
-   int             file_encoding;       /* E_ values above */
-   png_fixed_point gamma_to_linear;     /* For P_FILE, reciprocal of gamma */
-   int             colormap_processing; /* PNG_CMAP_ values above */
+
+   /* Instance variables */
+   png_voidp local_row;
+   png_voidp first_row;
+   ptrdiff_t row_step;              /* step between rows */
+   int file_encoding;               /* E_ values above */
+   png_fixed_point gamma_to_linear; /* For P_FILE, reciprocal of gamma */
+   int colormap_processing;         /* PNG_CMAP_ values above */
 } png_image_read_control;
 
 /* Do all the *safe* initialization - 'safe' means that png_error won't be
@@ -2866,17 +2868,17 @@ png_image_read_and_map(png_voidp argument)
    }
 
    {
-      png_uint_32  height = image->height;
-      png_uint_32  width = image->width;
-      int          proc = display->colormap_processing;
-      png_bytep    first_row = png_voidcast(png_bytep, display->first_row);
-      ptrdiff_t    step_row = display->row_bytes;
+      png_uint_32 height = image->height;
+      png_uint_32 width = image->width;
+      int proc = display->colormap_processing;
+      png_bytep first_row = png_voidcast(png_bytep, display->first_row);
+      ptrdiff_t row_step = display->row_step;
       int pass;
 
       for (pass = 0; pass < passes; ++pass)
       {
-         unsigned int     startx, stepx, stepy;
-         png_uint_32      y;
+         unsigned int startx, stepx, stepy;
+         png_uint_32 y;
 
          if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
          {
@@ -2900,7 +2902,7 @@ png_image_read_and_map(png_voidp argument)
          for (; y<height; y += stepy)
          {
             png_bytep inrow = png_voidcast(png_bytep, display->local_row);
-            png_bytep outrow = first_row + y * step_row;
+            png_bytep outrow = first_row + y * row_step;
             png_const_bytep end_row = outrow + width;
 
             /* Read read the libpng data into the temporary buffer. */
@@ -3109,20 +3111,20 @@ png_image_read_colormapped(png_voidp argument)
     */
    {
       png_voidp first_row = display->buffer;
-      ptrdiff_t row_bytes = display->row_stride;
+      ptrdiff_t row_step = display->row_stride;
 
-      /* The following expression is designed to work correctly whether it gives
-       * a signed or an unsigned result.
+      /* The following adjustment is to ensure that calculations are correct,
+       * regardless whether row_step is positive or negative.
        */
-      if (row_bytes < 0)
+      if (row_step < 0)
       {
          char *ptr = png_voidcast(char*, first_row);
-         ptr += (image->height-1) * (-row_bytes);
+         ptr += (image->height-1) * (-row_step);
          first_row = png_voidcast(png_voidp, ptr);
       }
 
       display->first_row = first_row;
-      display->row_bytes = row_bytes;
+      display->row_step = row_step;
    }
 
    if (passes == 0)
@@ -3140,17 +3142,17 @@ png_image_read_colormapped(png_voidp argument)
 
    else
    {
-      png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
+      ptrdiff_t row_step = display->row_step;
 
       while (--passes >= 0)
       {
-         png_uint_32      y = image->height;
-         png_bytep        row = png_voidcast(png_bytep, display->first_row);
+         png_uint_32 y = image->height;
+         png_bytep row = png_voidcast(png_bytep, display->first_row);
 
          for (; y > 0; --y)
          {
             png_read_row(png_ptr, row, NULL);
-            row += row_bytes;
+            row += row_step;
          }
       }
 
@@ -3166,9 +3168,11 @@ png_image_read_direct_scaled(png_voidp argument)
        argument);
    png_imagep image = display->image;
    png_structrp png_ptr = image->opaque->png_ptr;
+   png_inforp info_ptr = image->opaque->info_ptr;
    png_bytep local_row = png_voidcast(png_bytep, display->local_row);
    png_bytep first_row = png_voidcast(png_bytep, display->first_row);
-   ptrdiff_t row_bytes = display->row_bytes;
+   ptrdiff_t row_step = display->row_step;
+   size_t row_bytes = png_get_rowbytes(png_ptr, info_ptr);
    int passes;
 
    /* Handle interlacing. */
@@ -3197,9 +3201,14 @@ png_image_read_direct_scaled(png_voidp argument)
          /* Read into local_row (gets transformed 8-bit data). */
          png_read_row(png_ptr, local_row, NULL);
 
-         /* Copy from local_row to user buffer. */
-         memcpy(output_row, local_row, (size_t)row_bytes);
-         output_row += row_bytes;
+         /* Copy from local_row to user buffer.
+          * Use row_bytes (i.e. the actual size in bytes of the row data) for
+          * copying into output_row. Use row_step for advancing output_row,
+          * to respect the caller's stride for padding or negative (bottom-up)
+          * layouts.
+          */
+         memcpy(output_row, local_row, row_bytes);
+         output_row += row_step;
       }
    }
 
@@ -3231,17 +3240,18 @@ png_image_read_composite(png_voidp argument)
    }
 
    {
-      png_uint_32  height = image->height;
-      png_uint_32  width = image->width;
-      ptrdiff_t    step_row = display->row_bytes;
+      png_uint_32 height = image->height;
+      png_uint_32 width = image->width;
+      ptrdiff_t row_step = display->row_step;
       unsigned int channels =
           (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
+      int optimize_alpha = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
       int pass;
 
       for (pass = 0; pass < passes; ++pass)
       {
-         unsigned int     startx, stepx, stepy;
-         png_uint_32      y;
+         unsigned int startx, stepx, stepy;
+         png_uint_32 y;
 
          if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
          {
@@ -3273,7 +3283,7 @@ png_image_read_composite(png_voidp argument)
             png_read_row(png_ptr, inrow, NULL);
 
             outrow = png_voidcast(png_bytep, display->first_row);
-            outrow += y * step_row;
+            outrow += y * row_step;
             end_row = outrow + width * channels;
 
             /* Now do the composition on each pixel in this row. */
@@ -3292,20 +3302,44 @@ png_image_read_composite(png_voidp argument)
 
                      if (alpha < 255) /* else just use component */
                      {
-                        /* This is PNG_OPTIMIZED_ALPHA, the component value
-                         * is a linear 8-bit value.  Combine this with the
-                         * current outrow[c] value which is sRGB encoded.
-                         * Arithmetic here is 16-bits to preserve the output
-                         * values correctly.
-                         */
-                        component *= 257*255; /* =65535 */
-                        component += (255-alpha)*png_sRGB_table[outrow[c]];
+                        if (optimize_alpha != 0)
+                        {
+                           /* This is PNG_OPTIMIZED_ALPHA, the component value
+                            * is a linear 8-bit value.  Combine this with the
+                            * current outrow[c] value which is sRGB encoded.
+                            * Arithmetic here is 16-bits to preserve the output
+                            * values correctly.
+                            */
+                           component *= 257*255; /* =65535 */
+                           component += (255-alpha)*png_sRGB_table[outrow[c]];
 
-                        /* So 'component' is scaled by 255*65535 and is
-                         * therefore appropriate for the sRGB to linear
-                         * conversion table.
-                         */
-                        component = PNG_sRGB_FROM_LINEAR(component);
+                           /* Clamp to the valid range to defend against
+                            * unforeseen cases where the data might be sRGB
+                            * instead of linear premultiplied.
+                            * (Belt-and-suspenders for CVE-2025-66293.)
+                            */
+                           if (component > 255*65535)
+                              component = 255*65535;
+
+                           /* So 'component' is scaled by 255*65535 and is
+                            * therefore appropriate for the sRGB-to-linear
+                            * conversion table.
+                            */
+                           component = PNG_sRGB_FROM_LINEAR(component);
+                        }
+                        else
+                        {
+                           /* Compositing was already done on the palette
+                            * entries.  The data is sRGB premultiplied on black.
+                            * Composite with the background in sRGB space.
+                            * This is not gamma-correct, but matches what was
+                            * done to the palette.
+                            */
+                           png_uint_32 background = outrow[c];
+                           component += ((255-alpha) * background + 127) / 255;
+                           if (component > 255)
+                              component = 255;
+                        }
                      }
 
                      outrow[c] = (png_byte)component;
@@ -3394,12 +3428,12 @@ png_image_read_background(png_voidp argument)
           */
          {
             png_bytep first_row = png_voidcast(png_bytep, display->first_row);
-            ptrdiff_t step_row = display->row_bytes;
+            ptrdiff_t row_step = display->row_step;
 
             for (pass = 0; pass < passes; ++pass)
             {
-               unsigned int     startx, stepx, stepy;
-               png_uint_32      y;
+               unsigned int startx, stepx, stepy;
+               png_uint_32 y;
 
                if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
                {
@@ -3426,7 +3460,7 @@ png_image_read_background(png_voidp argument)
                   {
                      png_bytep inrow = png_voidcast(png_bytep,
                          display->local_row);
-                     png_bytep outrow = first_row + y * step_row;
+                     png_bytep outrow = first_row + y * row_step;
                      png_const_bytep end_row = outrow + width;
 
                      /* Read the row, which is packed: */
@@ -3471,7 +3505,7 @@ png_image_read_background(png_voidp argument)
                   {
                      png_bytep inrow = png_voidcast(png_bytep,
                          display->local_row);
-                     png_bytep outrow = first_row + y * step_row;
+                     png_bytep outrow = first_row + y * row_step;
                      png_const_bytep end_row = outrow + width;
 
                      /* Read the row, which is packed: */
@@ -3517,9 +3551,9 @@ png_image_read_background(png_voidp argument)
             png_uint_16p first_row = png_voidcast(png_uint_16p,
                 display->first_row);
             /* The division by two is safe because the caller passed in a
-             * stride which was multiplied by 2 (below) to get row_bytes.
+             * stride which was multiplied by 2 (below) to get row_step.
              */
-            ptrdiff_t    step_row = display->row_bytes / 2;
+            ptrdiff_t row_step = display->row_step / 2;
             unsigned int preserve_alpha = (image->format &
                 PNG_FORMAT_FLAG_ALPHA) != 0;
             unsigned int outchannels = 1U+preserve_alpha;
@@ -3533,8 +3567,8 @@ png_image_read_background(png_voidp argument)
 
             for (pass = 0; pass < passes; ++pass)
             {
-               unsigned int     startx, stepx, stepy;
-               png_uint_32      y;
+               unsigned int startx, stepx, stepy;
+               png_uint_32 y;
 
                /* The 'x' start and step are adjusted to output components here.
                 */
@@ -3561,7 +3595,7 @@ png_image_read_background(png_voidp argument)
                for (; y<height; y += stepy)
                {
                   png_const_uint_16p inrow;
-                  png_uint_16p outrow = first_row + y*step_row;
+                  png_uint_16p outrow = first_row + y * row_step;
                   png_uint_16p end_row = outrow + width * outchannels;
 
                   /* Read the row, which is packed: */
@@ -3998,23 +4032,23 @@ png_image_read_direct(png_voidp argument)
     */
    {
       png_voidp first_row = display->buffer;
-      ptrdiff_t row_bytes = display->row_stride;
+      ptrdiff_t row_step = display->row_stride;
 
       if (linear != 0)
-         row_bytes *= 2;
+         row_step *= 2;
 
-      /* The following expression is designed to work correctly whether it gives
-       * a signed or an unsigned result.
+      /* The following adjustment is to ensure that calculations are correct,
+       * regardless whether row_step is positive or negative.
        */
-      if (row_bytes < 0)
+      if (row_step < 0)
       {
          char *ptr = png_voidcast(char*, first_row);
-         ptr += (image->height-1) * (-row_bytes);
+         ptr += (image->height - 1) * (-row_step);
          first_row = png_voidcast(png_voidp, ptr);
       }
 
       display->first_row = first_row;
-      display->row_bytes = row_bytes;
+      display->row_step = row_step;
    }
 
    if (do_local_compose != 0)
@@ -4063,17 +4097,17 @@ png_image_read_direct(png_voidp argument)
 
    else
    {
-      png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
+      ptrdiff_t row_step = display->row_step;
 
       while (--passes >= 0)
       {
-         png_uint_32      y = image->height;
-         png_bytep        row = png_voidcast(png_bytep, display->first_row);
+         png_uint_32 y = image->height;
+         png_bytep row = png_voidcast(png_bytep, display->first_row);
 
          for (; y > 0; --y)
          {
             png_read_row(png_ptr, row, NULL);
-            row += row_bytes;
+            row += row_step;
          }
       }
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
index a19615f49fe..fcce80da1cb 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2025 Cosmin Truta
+ * Copyright (c) 2018-2026 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -737,8 +737,8 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
                          break;
 
                      t->next = hash[d];
-                     t->left = (png_byte)i;
-                     t->right = (png_byte)j;
+                     t->left = png_ptr->palette_to_index[i];
+                     t->right = png_ptr->palette_to_index[j];
                      hash[d] = t;
                   }
                }
@@ -1149,8 +1149,8 @@ png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red,
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 void PNGAPI
-png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
-    read_user_transform_fn)
+png_set_read_user_transform_fn(png_structrp png_ptr,
+    png_user_transform_ptr read_user_transform_fn)
 {
    png_debug(1, "in png_set_read_user_transform_fn");
 
@@ -1872,6 +1872,7 @@ png_init_read_transformations(png_structrp png_ptr)
              * transformations elsewhere.
              */
             png_ptr->transformations &= ~(PNG_COMPOSE | PNG_GAMMA);
+            png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
          } /* color_type == PNG_COLOR_TYPE_PALETTE */
 
          /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
index 07d53cb2c76..01bb0c8bedc 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
@@ -2415,7 +2415,7 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 static png_handle_result_code /* PRIVATE */
 png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_text  text_info;
+   png_text text_info;
    png_bytep buffer;
    png_charp key;
    png_charp text;
@@ -2488,8 +2488,8 @@ static png_handle_result_code /* PRIVATE */
 png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_const_charp errmsg = NULL;
-   png_bytep       buffer;
-   png_uint_32     keyword_length;
+   png_bytep buffer;
+   png_uint_32 keyword_length;
 
    png_debug(1, "in png_handle_zTXt");
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
index 2350057e70e..b9f6cb5d437 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngtrans.c
@@ -831,8 +831,8 @@ png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
 void PNGAPI
-png_set_user_transform_info(png_structrp png_ptr, png_voidp
-   user_transform_ptr, int user_transform_depth, int user_transform_channels)
+png_set_user_transform_info(png_structrp png_ptr, png_voidp user_transform_ptr,
+    int user_transform_depth, int user_transform_channels)
 {
    png_debug(1, "in png_set_user_transform_info");
 
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
index a7130fa7fe9..560e114982f 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@ import java.util.Iterator;
 import sun.awt.AWTAccessor;
 import sun.util.logging.PlatformLogger;
 
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 
 import sun.awt.dnd.SunDropTargetContextPeer;
@@ -55,20 +54,14 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer {
 
     private static final Unsafe unsafe = XlibWrapper.unsafe;
 
-    /*
-     * A key to store a peer instance for an AppContext.
-     */
-    private static final Object DTCP_KEY = "DropTargetContextPeer";
-
     private XDropTargetContextPeer() {}
 
-    static XDropTargetContextPeer getPeer(AppContext appContext) {
+    private static XDropTargetContextPeer peer;
+
+    static XDropTargetContextPeer getPeer() {
         synchronized (_globalLock) {
-            XDropTargetContextPeer peer =
-                (XDropTargetContextPeer)appContext.get(DTCP_KEY);
             if (peer == null) {
                 peer = new XDropTargetContextPeer();
-                appContext.put(DTCP_KEY, peer);
             }
 
             return peer;
@@ -261,17 +254,11 @@ final class XDropTargetContextPeer extends SunDropTargetContextPeer {
                                                  int eventID) {
             Object target = xwindow.getTarget();
 
-            // The Every component is associated with some AppContext.
             assert target instanceof Component;
 
             Component component = (Component)target;
 
-            AppContext appContext = SunToolkit.targetToAppContext(target);
-
-            // Every component is associated with some AppContext.
-            assert appContext != null;
-
-            XDropTargetContextPeer peer = XDropTargetContextPeer.getPeer(appContext);
+            XDropTargetContextPeer peer = XDropTargetContextPeer.getPeer();
 
             peer.postDropTargetEvent(component, x, y, dropAction, actions, formats,
                                      nativeCtxt, eventID,
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
index bc1b3ac9f4b..f5bb47db50c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedCanvasPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -338,7 +338,7 @@ public final class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusLi
 //             Rectangle my_bounds = getBounds();
 //             setBounds(my_bounds.x, my_bounds.y, bounds.width, bounds.height, SET_BOUNDS);
         }
-        XToolkit.postEvent(XToolkit.targetToAppContext(target), new ComponentEvent(target, ComponentEvent.COMPONENT_RESIZED));
+        XToolkit.postEvent(new ComponentEvent(target, ComponentEvent.COMPONENT_RESIZED));
     }
 
     void focusNext() {
@@ -735,9 +735,7 @@ public final class XEmbedCanvasPeer extends XCanvasPeer implements WindowFocusLi
             xembedLog.finest("     Drop target=" + target.getDropTarget());
         }
         if (target.getDropTarget() instanceof XEmbedDropTarget) {
-            AppContext appContext = XToolkit.targetToAppContext(getTarget());
-            XDropTargetContextPeer peer =
-                XDropTargetContextPeer.getPeer(appContext);
+            XDropTargetContextPeer peer = XDropTargetContextPeer.getPeer();
             peer.forwardEventToEmbedded(xembed.handle, ctxt, eventID);
             return true;
         } else {
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
index f7a40312fe7..e93b311633d 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@ import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Map;
 
-import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.awt.UNIXToolkit;
 
@@ -91,8 +90,6 @@ final class XSelection {
     private Map<Long, DataFlavor> formatMap = null;
     /* The formats supported by the current owner was set. */
     private long[] formats = null;
-    /* The AppContext in which the current owner was set. */
-    private AppContext appContext = null;
     // The X server time of the last XConvertSelection() call;
     // protected with 'lock' and awtLock.
     private static long lastRequestServerTime;
@@ -148,7 +145,6 @@ final class XSelection {
         this.contents = contents;
         this.formatMap = formatMap;
         this.formats = formats;
-        this.appContext = AppContext.getAppContext();
         this.ownershipTime = time;
 
         XToolkit.awtLock();
@@ -469,7 +465,6 @@ final class XSelection {
         contents = null;
         formatMap = null;
         formats = null;
-        appContext = null;
         ownershipTime = 0;
     }
 
@@ -483,7 +478,7 @@ final class XSelection {
         int count = 0;
 
         try {
-            SunToolkit.insertTargetMapping(this, appContext);
+            SunToolkit.insertTargetMapping(this);
 
             byteData = DataTransferer.getInstance().convertData(this,
                                                                 contents,
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
index 473b638cb74..82423a75d0c 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ package sun.awt.X11;
 import java.awt.*;
 import java.awt.peer.SystemTrayPeer;
 import sun.awt.SunToolkit;
-import sun.awt.AppContext;
 import sun.awt.AWTAccessor;
 import sun.awt.UNIXToolkit;
 import sun.util.logging.PlatformLogger;
@@ -183,7 +182,7 @@ public final class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListene
                         .firePropertyChange(target, propertyName, oldValue, newValue);
                 }
             };
-        invokeOnEachAppContext(runnable);
+        SunToolkit.invokeLater(runnable);
     }
 
     private void createTrayPeers() {
@@ -198,7 +197,7 @@ public final class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListene
                     }
                 }
             };
-        invokeOnEachAppContext(runnable);
+        SunToolkit.invokeLater(runnable);
     }
 
     private void removeTrayPeers() {
@@ -210,13 +209,6 @@ public final class XSystemTrayPeer implements SystemTrayPeer, XMSelectionListene
                     }
                 }
             };
-        invokeOnEachAppContext(runnable);
+        SunToolkit.invokeLater(runnable);
     }
-
-    private void invokeOnEachAppContext(Runnable runnable) {
-        for (AppContext appContext : AppContext.getAppContexts()) {
-            SunToolkit.invokeLaterOnAppContext(appContext, runnable);
-        }
-    }
-
 }
diff --git a/src/java.desktop/unix/classes/sun/print/AttributeClass.java b/src/java.desktop/unix/classes/sun/print/AttributeClass.java
index 10d0714a059..3db6e310dd2 100644
--- a/src/java.desktop/unix/classes/sun/print/AttributeClass.java
+++ b/src/java.desktop/unix/classes/sun/print/AttributeClass.java
@@ -174,6 +174,30 @@ public final class AttributeClass {
 
     }
 
+    /**
+     * Returns 3 int values.
+     * xres, yres, resolution as either dpi or dpcm
+     * The resolution is just a single byte of data.
+     */
+    public int[] getIntResolutionValue() {
+        int[] res = {0, 0, 0};
+        byte[] bufArray = (byte[])myValue;
+        if (bufArray != null) {
+            int nBytes = 4; // 32-bit signed integer
+            for (int j=0; j<2; j++) { // 2 set of integers
+                byte[] intBytes = new byte[nBytes];
+                // REMIND: # bytes should be 8
+                for (int i=0; i< nBytes; i++) {
+                    //+ 1 because the 1st byte is length
+                    intBytes[i] = bufArray[i+(4*j)+1];
+                }
+                res[j] = convertToInt(intBytes);
+            }
+            res[2] = (int)bufArray[9];
+        }
+        return res;
+    }
+
     /**
      * Returns String value.
      */
diff --git a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
index 2bf326fca57..8a3b872b107 100644
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,7 +141,7 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
     private MediaSizeName[] mediaSizeNames;
     private CustomMediaSizeName[] customMediaSizeNames;
     private int defaultMediaIndex;
-    private int[] rawResolutions = null;
+    private int[] ppdResolutions = null;
     private PrinterResolution[] printerResolutions = null;
     private boolean isCupsPrinter;
     private boolean init;
@@ -205,8 +205,7 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
         OrientationRequested.PORTRAIT,
         new PageRanges(1),
         //PresentationDirection,
-                 // CUPS does not supply printer-resolution attribute
-        //new PrinterResolution(300, 300, PrinterResolution.DPI),
+        new PrinterResolution(300, 300, PrinterResolution.DPI),
         //PrintQuality.NORMAL,
         new RequestingUserName("", Locale.getDefault()),
         //SheetCollate.UNCOLLATED, //CUPS has no sheet collate?
@@ -467,7 +466,9 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
                                 : getSupportedOutputBins();
                         customMediaSizeNames = cps.getCustomMediaSizeNames();
                         defaultMediaIndex = cps.getDefaultMediaIndex();
-                        rawResolutions = cps.getRawResolutions();
+                        if (ppdResolutions == null) {
+                            ppdResolutions = cps.getRawResolutions();
+                        }
                     }
                     urlConnection.disconnect();
                     init = true;
@@ -821,14 +822,7 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
                 }
             }
         } else if (category == PrinterResolution.class) {
-            PrinterResolution[] supportedRes = getPrintResolutions();
-            if (supportedRes == null) {
-                return null;
-            }
-            PrinterResolution []arr =
-                new PrinterResolution[supportedRes.length];
-            System.arraycopy(supportedRes, 0, arr, 0, supportedRes.length);
-            return arr;
+            return getPrintResolutions();
         } else if (category == OutputBin.class) {
             return Arrays.copyOf(outputBins, outputBins.length);
         }
@@ -1137,8 +1131,6 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
             catList.add(Chromaticity.class);
         }
 
-        // CUPS does not report printer resolution via IPP but it
-        // may be gleaned from the PPD.
         PrinterResolution[] supportedRes = getPrintResolutions();
         if (supportedRes != null && (supportedRes.length > 0)) {
             catList.add(PrinterResolution.class);
@@ -1264,7 +1256,6 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
         }
     }
 
-
     @Override
     public synchronized PrintServiceAttributeSet getAttributes() {
         if (!init) {
@@ -1684,9 +1675,7 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
         } else if (category == PrinterResolution.class) {
              PrinterResolution[] supportedRes = getPrintResolutions();
              if ((supportedRes != null) && (supportedRes.length > 0)) {
-                return supportedRes[0];
-             } else {
-                 return new PrinterResolution(300, 300, PrinterResolution.DPI);
+                 return supportedRes[0];
              }
         } else if (category == OutputBin.class) {
             if (attribClass != null) {
@@ -1697,26 +1686,40 @@ public final class IPPPrintService implements PrintService, SunPrinterJobService
         return null;
     }
 
+    /* Called only from contexts that have called initAttributes().
+     * Try IPP first, and if that produces nothing, fall back to the PPD
+    */
     private PrinterResolution[] getPrintResolutions() {
+        int[] rawResolutions = null;
         if (printerResolutions == null) {
-            if (rawResolutions == null) {
-              printerResolutions = new PrinterResolution[0];
-            } else {
-                int numRes = rawResolutions.length / 2;
-                PrinterResolution[] pres = new PrinterResolution[numRes];
-                for (int i=0; i < numRes; i++) {
-                    pres[i] =  new PrinterResolution(rawResolutions[i*2],
-                                                     rawResolutions[i*2+1],
-                                                     PrinterResolution.DPI);
-                }
-                printerResolutions = pres;
+            AttributeClass attribClass = (getAttMap != null) ?
+                getAttMap.get("printer-resolution-supported")
+                : null;
+            if (attribClass != null) {
+                rawResolutions = attribClass.getIntResolutionValue();
             }
+            if (rawResolutions == null) {
+                rawResolutions = ppdResolutions;
+            }
+            if (rawResolutions == null) {
+               rawResolutions = new int[] { 300, 300, 3 } ;
+            }
+            int numRes = rawResolutions.length / 3;
+            PrinterResolution[] pres = new PrinterResolution[numRes];
+            for (int i = 0; i < numRes; i++) {
+                int units = (rawResolutions[i*3+2] == 4) ? PrinterResolution.DPCM : PrinterResolution.DPI;
+                pres[i] = new PrinterResolution(rawResolutions[i*3],
+                                                rawResolutions[i*3+1],
+                                                units);
+            }
+            printerResolutions = pres;
         }
-        return printerResolutions;
+        return printerResolutions.clone();
     }
 
     private boolean isSupportedResolution(PrinterResolution res) {
-        PrinterResolution[] supportedRes = getPrintResolutions();
+        PrinterResolution[] supportedRes =
+            (PrinterResolution[])getSupportedAttributeValues(PrinterResolution.class, null, null);
         if (supportedRes != null) {
             for (int i=0; i<supportedRes.length; i++) {
                 if (res.equals(supportedRes[i])) {
diff --git a/src/java.desktop/unix/native/common/awt/CUPSfuncs.c b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
index 7c60d824067..1d5b024da3b 100644
--- a/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
+++ b/src/java.desktop/unix/native/common/awt/CUPSfuncs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,8 @@ typedef ppd_file_t* (*fn_ppdOpenFile)(const char *);
 typedef void (*fn_ppdClose)(ppd_file_t *);
 typedef ppd_option_t* (*fn_ppdFindOption)(ppd_file_t *, const char *);
 typedef ppd_size_t* (*fn_ppdPageSize)(ppd_file_t *, char *);
+typedef ppd_attr_t* (*fn_ppdFindAttr)(ppd_file_t *, const char *name, const char *spec);
+typedef ppd_attr_t* (*fn_ppdFindNextAttr)(ppd_file_t *, const char *name, const char *spec);
 
 fn_cupsServer j2d_cupsServer;
 fn_ippPort j2d_ippPort;
@@ -64,6 +66,8 @@ fn_cupsFreeDests j2d_cupsFreeDests;
 fn_ppdOpenFile j2d_ppdOpenFile;
 fn_ppdClose j2d_ppdClose;
 fn_ppdFindOption j2d_ppdFindOption;
+fn_ppdFindAttr j2d_ppdFindAttr;
+fn_ppdFindNextAttr j2d_ppdFindNextAttr;
 fn_ppdPageSize j2d_ppdPageSize;
 
 
@@ -152,6 +156,18 @@ Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env,
     return JNI_FALSE;
   }
 
+  j2d_ppdFindAttr = (fn_ppdFindAttr)dlsym(handle, "ppdFindAttr");
+  if (j2d_ppdFindAttr == NULL) {
+    dlclose(handle);
+    return JNI_FALSE;
+  }
+
+  j2d_ppdFindNextAttr = (fn_ppdFindNextAttr)dlsym(handle, "ppdFindNextAttr");
+  if (j2d_ppdFindNextAttr == NULL) {
+    dlclose(handle);
+    return JNI_FALSE;
+  }
+
   j2d_ppdPageSize = (fn_ppdPageSize)dlsym(handle, "ppdPageSize");
   if (j2d_ppdPageSize == NULL) {
     dlclose(handle);
@@ -636,6 +652,9 @@ Java_sun_print_CUPSPrinter_getResolutions(JNIEnv *env,
         return;
     }
 
+    // IPP value of 3 means DPI, 4 means dpcm
+    jobject dpi = (*env)->NewObject(env, intCls, intCtr, 3);
+    CHECK_NULL(dpi);
 
     // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file.
     // unlink() must be called to remove the file after using it.
@@ -672,6 +691,7 @@ Java_sun_print_CUPSPrinter_getResolutions(JNIEnv *env,
           CHECK_NULL(ryObj);
           (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, rxObj);
           (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, ryObj);
+          (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, dpi);
         }
 
         for (i = 0; i < resolution->num_choices; i++) {
@@ -700,6 +720,41 @@ Java_sun_print_CUPSPrinter_getResolutions(JNIEnv *env,
               CHECK_NULL(ryObj);
               (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, rxObj);
               (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, ryObj);
+              (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, dpi);
+            }
+        }
+
+    } else {
+        ppd_attr_t *defresolution = j2d_ppdFindAttr(ppd, "DefaultResolution", NULL);
+        if (defresolution == NULL) {
+            defresolution = j2d_ppdFindAttr(ppd, "Resolution", NULL);
+        }
+        if (defresolution != NULL) {
+            int matches = sscanf(defresolution->value, "%dx%ddpi", &defx, &defy);
+            if (matches == 2) {
+                if (defx <= 0 || defy <= 0) {
+                    defx = 0;
+                    defy = 0;
+                }
+            } else {
+                matches = sscanf(defresolution->value, "%ddpi", &defx);
+                if (matches == 1) {
+                    if (defx <= 0) {
+                       defx = 0;
+                    } else {
+                       defy = defx;
+                    }
+                }
+            }
+            if (defx > 0) {
+              jobject rxObj, ryObj;
+              rxObj = (*env)->NewObject(env, intCls, intCtr, defx);
+              CHECK_NULL(rxObj);
+              ryObj = (*env)->NewObject(env, intCls, intCtr, defy);
+              CHECK_NULL(ryObj);
+              (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, rxObj);
+              (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, ryObj);
+              (*env)->CallBooleanMethod(env, arrayList, arrListAddMID, dpi);
             }
         }
     }
diff --git a/src/java.desktop/unix/native/common/awt/utility/rect.h b/src/java.desktop/unix/native/common/awt/utility/rect.h
index ceea38f4349..91b5a17ec58 100644
--- a/src/java.desktop/unix/native/common/awt/utility/rect.h
+++ b/src/java.desktop/unix/native/common/awt/utility/rect.h
@@ -28,7 +28,7 @@
 #ifndef _AWT_RECT_H
 #define _AWT_RECT_H
 
-#ifndef MACOSX
+#if !defined(HEADLESS) && !defined(MACOSX)
 #include <X11/Xlib.h>
 typedef XRectangle RECT_T;
 #else
@@ -39,7 +39,7 @@ typedef struct {
     int width;
     int height;
 } RECT_T;
-#endif /* !MACOSX */
+#endif /* !HEADLESS && !MACOSX */
 
 #define RECT_EQ_X(r1,r2)        ((r1).x==(r2).x && (r1).width==(r2).width)
 
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
index 03dba969e8d..6ed23ca7541 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
@@ -602,6 +602,9 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
             fp_g_uuid_string_is_valid = //since: 2.52
                     dl_symbol("g_uuid_string_is_valid");
             fp_g_variant_print = dl_symbol("g_variant_print"); // since 2.24
+
+            fp_g_settings_new = dl_symbol("g_settings_new"); // since 2.26
+            fp_g_settings_get_string = dl_symbol("g_settings_get_string"); // since 2.26
         }
         fp_g_string_printf = dl_symbol("g_string_printf");
         fp_g_strconcat = dl_symbol("g_strconcat");
@@ -2987,6 +2990,37 @@ static GdkWindow* gtk3_get_window(void *widget) {
     return fp_gtk_widget_get_window((GtkWidget*)widget);
 }
 
+static gboolean apply_theme_if_needed() {
+    if (!glib_version_2_68) {
+        return FALSE;
+    }
+
+    GSettings *settings = fp_g_settings_new("org.gnome.desktop.interface");
+    if (!settings) {
+        return FALSE;
+    }
+
+    static gboolean wasDark = FALSE;
+
+    gchar *scheme = fp_g_settings_get_string(settings, "color-scheme");
+    const gboolean isDark = strcmp(scheme, "prefer-dark") == 0;
+
+    fp_g_free(scheme);
+    fp_g_object_unref(settings);
+
+    if (wasDark ^ isDark) {
+        GtkSettings* gtkSettings = fp_gtk_settings_get_default();
+        if (!gtkSettings) {
+            return FALSE;
+        }
+        fp_g_object_set(gtkSettings, "gtk-application-prefer-dark-theme", isDark, NULL);
+        wasDark = isDark;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void gtk3_init(GtkApi* gtk) {
     gtk->version = GTK_3;
 
@@ -2996,6 +3030,8 @@ static void gtk3_init(GtkApi* gtk) {
     gtk->gtk_check_version = fp_gtk_check_version;
     gtk->get_setting = &gtk3_get_setting;
 
+    gtk->apply_theme_if_needed = &apply_theme_if_needed;
+
     gtk->paint_arrow = &gtk3_paint_arrow;
     gtk->paint_box = &gtk3_paint_box;
     gtk->paint_box_gap = &gtk3_paint_box_gap;
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
index d3a83677dd6..637a3198e43 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
@@ -193,6 +193,7 @@ typedef void GtkMenuShell;
 typedef void GtkWidgetClass;
 typedef void PangoFontDescription;
 typedef void GtkSettings;
+typedef void GSettings;
 typedef void GtkStyleProvider;
 typedef void cairo_pattern_t;
 typedef void cairo_t;
@@ -633,6 +634,10 @@ static char* (*fp_pango_font_description_to_string)(
         const PangoFontDescription* fd);
 static GtkSettings* (*fp_gtk_settings_get_default)();
 static GtkSettings* (*fp_gtk_widget_get_settings)(GtkWidget *widget);
+
+static GSettings *(*fp_g_settings_new)(const gchar *schema_id);
+static gchar *(*fp_g_settings_get_string)(GSettings *settings, const gchar *key);
+
 static GType        (*fp_gtk_border_get_type)();
 static void (*fp_gtk_arrow_set)(GtkWidget* arrow,
                                 GtkArrowType arrow_type,
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
index 39be6a735d7..37422094202 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
@@ -541,6 +541,8 @@ typedef struct GtkApi {
                                 guint required_micro);
     jobject (*get_setting)(JNIEnv *env, Setting property);
 
+    gboolean (*apply_theme_if_needed)();
+
     void (*paint_arrow)(WidgetType widget_type, GtkStateType state_type,
         GtkShadowType shadow_type, const gchar *detail,
         gint x, gint y, gint width, gint height,
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c b/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c
index bb5c799f008..3b7b2880316 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c
@@ -388,3 +388,17 @@ Java_com_sun_java_swing_plaf_gtk_GTKEngine_nativeSetRangeValue(
     gtk->set_range_value(widget_type, value, min, max, visible);
     gtk->gdk_threads_leave();
 }
+
+/*
+ * Class:     com_sun_java_swing_plaf_gtk_GTKLookAndFeel
+ * Method:    applyThemeIfNeeded
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_com_sun_java_swing_plaf_gtk_GTKLookAndFeel_applyThemeIfNeeded(JNIEnv *env, jobject this) {
+    gtk->gdk_threads_enter();
+    const gboolean result = gtk->apply_theme_if_needed();
+    gtk->gdk_threads_leave();
+
+    return result;
+}
diff --git a/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c b/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
index 0ea86e3e9b3..ebb3e32890e 100644
--- a/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
+++ b/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -339,7 +339,7 @@ Java_sun_java2d_xr_XRBackendNative_createPixmap(JNIEnv *env, jobject this,
 JNIEXPORT jint JNICALL
 Java_sun_java2d_xr_XRBackendNative_createPictureNative
  (JNIEnv *env, jclass cls, jint drawable, jlong formatPtr) {
-  XRenderPictureAttributes pict_attr;
+  XRenderPictureAttributes pict_attr = {0};
   return XRenderCreatePicture(awt_display, (Drawable) drawable,
                               (XRenderPictFormat *) jlong_to_ptr(formatPtr),
                                0, &pict_attr);
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
index 4fb843543e3..06574d17641 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/AnimationController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,8 +39,6 @@ import com.sun.java.swing.plaf.windows.TMSchema.Part;
 import com.sun.java.swing.plaf.windows.TMSchema.Prop;
 import com.sun.java.swing.plaf.windows.XPStyle.Skin;
 
-import sun.awt.AppContext;
-
 /**
  * A class to help mimic Vista theme animations.  The only kind of
  * animation it handles for now is 'transition' animation (this seems
@@ -68,8 +66,7 @@ final class AnimationController implements ActionListener, PropertyChangeListene
                         Boolean.getBoolean("swing.disablevistaanimation");
 
 
-    private static final Object ANIMATION_CONTROLLER_KEY =
-        new StringBuilder("ANIMATION_CONTROLLER_KEY");
+    private static AnimationController animationController;
 
     private final Map<JComponent, Map<Part, AnimationState>> animationStateMap =
             new WeakHashMap<JComponent, Map<Part, AnimationState>>();
@@ -80,13 +77,10 @@ final class AnimationController implements ActionListener, PropertyChangeListene
         new javax.swing.Timer(1000/30, this);
 
     private static synchronized AnimationController getAnimationController() {
-        AppContext appContext = AppContext.getAppContext();
-        Object obj = appContext.get(ANIMATION_CONTROLLER_KEY);
-        if (obj == null) {
-            obj = new AnimationController();
-            appContext.put(ANIMATION_CONTROLLER_KEY, obj);
+        if (animationController == null) {
+            animationController = new AnimationController();
         }
-        return (AnimationController) obj;
+        return animationController;
     }
 
     private AnimationController() {
@@ -316,8 +310,7 @@ final class AnimationController implements ActionListener, PropertyChangeListene
         timer.stop();
         UIManager.removePropertyChangeListener(this);
         synchronized (AnimationController.class) {
-            AppContext.getAppContext()
-                .put(ANIMATION_CONTROLLER_KEY, null);
+            animationController = null;
         }
     }
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
index 0c86bd33e10..ee07276aa30 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,8 +47,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicButtonUI;
 import javax.swing.plaf.basic.BasicGraphicsUtils;
 
-import sun.awt.AppContext;
-
 import static com.sun.java.swing.plaf.windows.TMSchema.Part;
 import static com.sun.java.swing.plaf.windows.TMSchema.State;
 import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
@@ -69,20 +67,13 @@ public final class WindowsButtonUI extends BasicButtonUI
 
     private boolean defaults_initialized = false;
 
-    private static final Object WINDOWS_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new WindowsButtonUI();
 
     // ********************************
     //          Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        WindowsButtonUI windowsButtonUI =
-                (WindowsButtonUI) appContext.get(WINDOWS_BUTTON_UI_KEY);
-        if (windowsButtonUI == null) {
-            windowsButtonUI = new WindowsButtonUI();
-            appContext.put(WINDOWS_BUTTON_UI_KEY, windowsButtonUI);
-        }
-        return windowsButtonUI;
+        return UI;
     }
 
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
index 3c869efc97b..7cb2490fd76 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,6 @@ import javax.swing.JComponent;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
-import sun.awt.AppContext;
-
 /**
  * Windows check box.
  *
@@ -43,7 +41,7 @@ public final class WindowsCheckBoxUI extends WindowsRadioButtonUI
     // of BasicCheckBoxUI because we want to pick up all the
     // painting changes made in WindowsRadioButtonUI.
 
-    private static final Object WINDOWS_CHECK_BOX_UI_KEY = new Object();
+    private static final ComponentUI UI = new WindowsCheckBoxUI();
 
     private static final String propertyPrefix = "CheckBox" + ".";
 
@@ -53,14 +51,7 @@ public final class WindowsCheckBoxUI extends WindowsRadioButtonUI
     //          Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        WindowsCheckBoxUI windowsCheckBoxUI =
-                (WindowsCheckBoxUI) appContext.get(WINDOWS_CHECK_BOX_UI_KEY);
-        if (windowsCheckBoxUI == null) {
-            windowsCheckBoxUI = new WindowsCheckBoxUI();
-            appContext.put(WINDOWS_CHECK_BOX_UI_KEY, windowsCheckBoxUI);
-        }
-        return windowsCheckBoxUI;
+        return UI;
     }
 
 
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
index 915a361a3a1..91c2cbcd61d 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -905,10 +905,46 @@ public final class WindowsIconFactory implements Serializable
                         XPStyle xp = XPStyle.getXP();
                         if (xp != null) {
                             Skin skin = xp.getSkin(c, part);
-                            if (icon == null || icon.getIconHeight() <= 16) {
-                                skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
+                            if (WindowsGraphicsUtils.isLeftToRight(c)) {
+                                if (icon == null || icon.getIconHeight() <= 16) {
+                                    skin.paintSkin(g, x + OFFSET, y + OFFSET, state);
+                                } else {
+                                    skin.paintSkin(g, x + OFFSET, y + icon.getIconHeight() / 2, state);
+                                }
                             } else {
-                                skin.paintSkin(g, x + OFFSET, y + icon.getIconHeight() / 2, state);
+                                if (icon == null) {
+                                    skin.paintSkin(g, x + 4 * OFFSET, y + OFFSET, state);
+                                } else {
+                                    int ycoord = (icon.getIconHeight() <= 16)
+                                                  ? y + OFFSET
+                                                  : (y + icon.getIconHeight() / 2);
+                                    if (icon.getIconWidth() <= 8) {
+                                        skin.paintSkin(g, x + OFFSET, ycoord, state);
+                                    } else if (icon.getIconWidth() <= 16) {
+                                        if (menuItem.getText().isEmpty()) {
+                                            skin.paintSkin(g,
+                                                (menuItem.getAccelerator() != null)
+                                                 ? (x + 2 * OFFSET) : (x + 3 * OFFSET),
+                                                ycoord, state);
+                                        } else {
+                                            skin.paintSkin(g,
+                                                (type == JRadioButtonMenuItem.class)
+                                                 ? (x + 4 * OFFSET) : (x + 3 * OFFSET),
+                                                ycoord, state);
+                                        }
+                                    } else {
+                                        if (menuItem.getText().isEmpty()
+                                            || menuItem.getAccelerator() != null) {
+                                            skin.paintSkin(g,
+                                                (type == JRadioButtonMenuItem.class)
+                                                 ? (x + 3 * OFFSET) : (x + 4 * OFFSET),
+                                                ycoord, state);
+                                        } else {
+                                            skin.paintSkin(g, x + 7 * OFFSET,
+                                                           ycoord, state);
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
index 403468af0af..4283f743b97 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@ import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicLabelUI;
 
-import sun.awt.AppContext;
 import sun.swing.MnemonicHandler;
 import sun.swing.SwingUtilities2;
 
@@ -43,20 +42,13 @@ import sun.swing.SwingUtilities2;
  */
 public final class WindowsLabelUI extends BasicLabelUI {
 
-    private static final Object WINDOWS_LABEL_UI_KEY = new Object();
+    private static final ComponentUI UI = new WindowsLabelUI();
 
     // ********************************
     //          Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        WindowsLabelUI windowsLabelUI =
-                (WindowsLabelUI) appContext.get(WINDOWS_LABEL_UI_KEY);
-        if (windowsLabelUI == null) {
-            windowsLabelUI = new WindowsLabelUI();
-            appContext.put(WINDOWS_LABEL_UI_KEY, windowsLabelUI);
-        }
-        return windowsLabelUI;
+        return UI;
     }
 
     @Override
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
index 61f760d63c4..d15bc93a628 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -238,6 +238,15 @@ public final class WindowsMenuItemUI extends BasicMenuItemUI {
         SwingUtilities3.paintAccText(g, lh, lr, disabledForeground,
                                      acceleratorSelectionForeground,
                                      acceleratorForeground);
+        if (lh.getCheckIcon() != null && lh.useCheckAndArrow()) {
+            Rectangle rect = lr.getArrowRect();
+            if (menuItem.getComponentOrientation().isLeftToRight()) {
+                rect.x += lh.getAfterCheckIconGap();
+            } else {
+                rect.x -= lh.getAfterCheckIconGap();
+            }
+            lr.setArrowRect(rect);
+        }
         SwingUtilities3.paintArrowIcon(g, lh, lr, foreground);
 
         // Restore original graphics font and color
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
index 2a784a470a4..c62a9ec8586 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,12 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicGraphicsUtils;
 import javax.swing.plaf.basic.BasicRadioButtonUI;
 
-import sun.awt.AppContext;
-
 /**
  * Windows rendition of the component.
  */
 public class WindowsRadioButtonUI extends BasicRadioButtonUI
 {
-    private static final Object WINDOWS_RADIO_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new WindowsRadioButtonUI();
 
     protected int dashedRectGapX;
     protected int dashedRectGapY;
@@ -60,14 +58,7 @@ public class WindowsRadioButtonUI extends BasicRadioButtonUI
     //          Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        AppContext appContext = AppContext.getAppContext();
-        WindowsRadioButtonUI windowsRadioButtonUI =
-                (WindowsRadioButtonUI) appContext.get(WINDOWS_RADIO_BUTTON_UI_KEY);
-        if (windowsRadioButtonUI == null) {
-            windowsRadioButtonUI = new WindowsRadioButtonUI();
-            appContext.put(WINDOWS_RADIO_BUTTON_UI_KEY, windowsRadioButtonUI);
-        }
-        return windowsRadioButtonUI;
+        return UI;
     }
 
     // ********************************
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
index 5e94ebdb2cc..67eb5c1d6a0 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicGraphicsUtils;
 import javax.swing.plaf.basic.BasicToggleButtonUI;
 
-import sun.awt.AppContext;
-
 /**
  * A Windows toggle button.
  *
@@ -54,19 +52,12 @@ public final class WindowsToggleButtonUI extends BasicToggleButtonUI
 
     protected Color focusColor;
 
-    private static final Object WINDOWS_TOGGLE_BUTTON_UI_KEY = new Object();
+    private static final ComponentUI UI = new WindowsToggleButtonUI();
 
     private boolean defaults_initialized = false;
 
     public static ComponentUI createUI(JComponent b) {
-        AppContext appContext = AppContext.getAppContext();
-        WindowsToggleButtonUI windowsToggleButtonUI =
-                (WindowsToggleButtonUI) appContext.get(WINDOWS_TOGGLE_BUTTON_UI_KEY);
-        if (windowsToggleButtonUI == null) {
-            windowsToggleButtonUI = new WindowsToggleButtonUI();
-            appContext.put(WINDOWS_TOGGLE_BUTTON_UI_KEY, windowsToggleButtonUI);
-        }
-        return windowsToggleButtonUI;
+        return UI;
     }
 
 
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
index 1b3fb9a85e9..00ad60c8bb3 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WComponentPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -902,7 +902,7 @@ public abstract class WComponentPeer extends WObjectPeer
      */
     void postEvent(AWTEvent event) {
         preprocessPostEvent(event);
-        WToolkit.postEvent(WToolkit.targetToAppContext(target), event);
+        WToolkit.postEvent(event);
     }
 
     void preprocessPostEvent(AWTEvent event) {}
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
index 788c1477265..e5b628dd74b 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,9 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import javax.swing.event.EventListenerList;
 
 import sun.awt.shell.ShellFolder;
@@ -50,9 +53,11 @@ import sun.awt.shell.ShellFolder;
  */
 final class WDesktopPeer implements DesktopPeer {
     /* Constants for the operation verbs */
-    private static String ACTION_OPEN_VERB = "open";
-    private static String ACTION_EDIT_VERB = "edit";
-    private static String ACTION_PRINT_VERB = "print";
+    private static final String ACTION_OPEN_VERB = "open";
+    private static final String ACTION_EDIT_VERB = "edit";
+    private static final String ACTION_PRINT_VERB = "print";
+    private static final String ACTION_BROWSE_VERB = "browse";
+    private static final String ACTION_MAIL_VERB = "mail";
 
     private static native void init();
 
@@ -95,12 +100,12 @@ final class WDesktopPeer implements DesktopPeer {
 
     @Override
     public void mail(URI uri) throws IOException {
-        this.ShellExecute(uri, ACTION_OPEN_VERB);
+        this.ShellExecute(uri, ACTION_MAIL_VERB);
     }
 
     @Override
     public void browse(URI uri) throws IOException {
-        this.ShellExecute(uri, ACTION_OPEN_VERB);
+        this.launchUriInBrowser(uri);
     }
 
     private void ShellExecute(File file, String verb) throws IOException {
@@ -121,6 +126,42 @@ final class WDesktopPeer implements DesktopPeer {
         }
     }
 
+    private void launchUriInBrowser(URI uri) throws IOException {
+        String defaultBrowser = getDefaultBrowser();
+        if (defaultBrowser == null) {
+            throw new IOException("Failed to get default browser");
+        }
+
+        List<String> cmdLineTokens = getCmdLineTokens(uri, defaultBrowser);
+        try {
+            ProcessBuilder pb = new ProcessBuilder(cmdLineTokens);
+            pb.start();
+        }  catch (Exception e) {
+            throw new IOException("Error launching Browser: ", e);
+        }
+    }
+
+    private static List<String> getCmdLineTokens(URI uri, String defaultBrowser) {
+        if (defaultBrowser.contains("%1")) {
+            defaultBrowser = defaultBrowser.replace("%1", uri.toString());
+        } else {
+            defaultBrowser = defaultBrowser + " " + uri.toString();
+        }
+
+        List<String> cmdLineTokens = new ArrayList<>();
+        int firstIndex = defaultBrowser.indexOf("\"");
+        int secondIndex = defaultBrowser.indexOf("\"", firstIndex + 1);
+
+        if (firstIndex == 0 && secondIndex != firstIndex) {
+            cmdLineTokens.add(defaultBrowser.substring(firstIndex, secondIndex + 1));
+            defaultBrowser = defaultBrowser.substring(secondIndex + 1).trim();
+        }
+        cmdLineTokens.addAll(Arrays.asList(defaultBrowser.split(" ")));
+        return cmdLineTokens;
+    }
+
+    private static native String getDefaultBrowser();
+
     private static native String ShellExecute(String fileOrUri, String verb);
 
     private static final EventListenerList listenerList = new EventListenerList();
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index 9a74a1c25f7..0bd44d8ca85 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -238,8 +238,7 @@ public final class WEmbeddedFrame extends EmbeddedFrame {
                     peer.emulateActivation(true);
                 }
             };
-            WToolkit.postEvent(WToolkit.targetToAppContext(this),
-                               new InvocationEvent(this, r));
+            WToolkit.postEvent(new InvocationEvent(this, r));
         }
     }
 
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
index a9237e21ff6..50ad23fabcd 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -602,7 +602,7 @@ final class WInputMethod extends InputMethodAdapter
                                                       commitedTextLength,
                                                       TextHitInfo.leading(caretPos),
                                                       TextHitInfo.leading(visiblePos));
-        WToolkit.postEvent(WToolkit.targetToAppContext(source), event);
+        WToolkit.postEvent(event);
     }
 
     public void inquireCandidatePosition()
@@ -641,8 +641,7 @@ final class WInputMethod extends InputMethodAdapter
                 openCandidateWindow(awtFocussedComponentPeer, x, y);
             }
         };
-        WToolkit.postEvent(WToolkit.targetToAppContext(source),
-                           new InvocationEvent(source, r));
+        WToolkit.postEvent(new InvocationEvent(source, r));
     }
 
     // java.awt.Toolkit#getNativeContainer() is not available
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
index 4abb9fa84ae..2594bd38a7d 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WMenuItemPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,7 +123,7 @@ class WMenuItemPeer extends WObjectPeer implements MenuItemPeer {
      * Post an event. Queue it for execution by the callback thread.
      */
     void postEvent(AWTEvent event) {
-        WToolkit.postEvent(WToolkit.targetToAppContext(target), event);
+        WToolkit.postEvent(event);
     }
 
     native void create(WMenuPeer parent);
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
index 01be8587685..1da9db3a35b 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1733,6 +1733,10 @@ public final class WPrinterJob extends RasterPrinterJob
             if (isRangeSet) {
                 attributes.add(new PageRanges(from, to));
                 setPageRange(from, to);
+            } else {
+                attributes.remove(PageRanges.class);
+                setPageRange(Pageable.UNKNOWN_NUMBER_OF_PAGES,
+                             Pageable.UNKNOWN_NUMBER_OF_PAGES);
             }
             defaultCopies = false;
             attributes.add(new Copies(copies));
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
index 0fdc4c6005b..4ed3e6b7e68 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,7 +123,6 @@ import javax.swing.text.JTextComponent;
 
 import sun.awt.AWTAccessor;
 import sun.awt.AWTAutoShutdown;
-import sun.awt.AppContext;
 import sun.awt.DisplayChangedListener;
 import sun.awt.LightweightFrame;
 import sun.awt.SunToolkit;
@@ -777,20 +776,7 @@ public final class WToolkit extends SunToolkit implements Runnable {
                 ((DisplayChangedListener) lge).displayChanged();
             }
         };
-        if (AppContext.getAppContext() != null) {
-            // Common case, standalone application
-            EventQueue.invokeLater(runnable);
-        } else {
-            if (displayChangeExecutor == null) {
-                // No synchronization, called on the Toolkit thread only
-                displayChangeExecutor = Executors.newFixedThreadPool(1, r -> {
-                    Thread t = Executors.defaultThreadFactory().newThread(r);
-                    t.setDaemon(true);
-                    return t;
-                });
-            }
-            displayChangeExecutor.submit(runnable);
-        }
+        EventQueue.invokeLater(runnable);
     }
 
     /**
@@ -910,17 +896,7 @@ public final class WToolkit extends SunToolkit implements Runnable {
         }
 
         updateXPStyleEnabled(props.get(XPSTYLE_THEME_ACTIVE));
-
-        if (AppContext.getAppContext() == null) {
-            // We cannot post the update to any EventQueue. Listeners will
-            // be called on EDTs by DesktopPropertyChangeSupport
-            updateProperties(props);
-        } else {
-            // Cannot update on Toolkit thread.
-            // DesktopPropertyChangeSupport will call listeners on Toolkit
-            // thread if it has AppContext (standalone mode)
-            EventQueue.invokeLater(() -> updateProperties(props));
-        }
+        EventQueue.invokeLater(() -> updateProperties(props));
     }
 
     private synchronized void updateProperties(final Map<String, Object> props) {
diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
index 7cf92292a32..5c04803669d 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,7 +181,7 @@ final class WTrayIconPeer extends WObjectPeer implements TrayIconPeer {
     }
 
     void postEvent(AWTEvent event) {
-        WToolkit.postEvent(WToolkit.targetToAppContext(target), event);
+        WToolkit.postEvent(event);
     }
 
     native void create();
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
index ba79523249c..ba69fa75f73 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,12 @@
 #include <float.h>
 #include <shlobj.h>
 #include "awt_Toolkit.h"
+#include <Windows.h>
+#include <shlwapi.h>  // for AssocQueryStringW
+#include <wchar.h>
+#include <cwchar>
+#include <string.h>
+#include <winsafer.h> // for SaferiIsExecutableFileType
 
 #define BUFFER_LIMIT   MAX_PATH+1
 
@@ -78,14 +84,25 @@ JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
     LPCWSTR fileOrUri_c = JNU_GetStringPlatformChars(env, fileOrUri_j, NULL);
     CHECK_NULL_RETURN(fileOrUri_c, NULL);
     LPCWSTR verb_c = JNU_GetStringPlatformChars(env, verb_j, NULL);
+
     if (verb_c == NULL) {
         JNU_ReleaseStringPlatformChars(env, fileOrUri_j, fileOrUri_c);
         return NULL;
     }
+    if (wcscmp(verb_c, L"open") == 0) {
+        BOOL isExecutable = SaferiIsExecutableFileType(fileOrUri_c, FALSE);
+        if (isExecutable) {
+            JNU_ReleaseStringPlatformChars(env, fileOrUri_j, fileOrUri_c);
+            JNU_ReleaseStringPlatformChars(env, verb_j, verb_c);
+            return env->NewStringUTF("Unsupported URI content");
+        }
+    }
+    // set action verb for mail() to open before calling ShellExecute
+    LPCWSTR actionVerb = wcscmp(verb_c, L"mail") == 0 ? L"open" : verb_c;
 
     // 6457572: ShellExecute possibly changes FPU control word - saving it here
     unsigned oldcontrol87 = _control87(0, 0);
-    HINSTANCE retval = ::ShellExecute(NULL, verb_c, fileOrUri_c, NULL, NULL,
+    HINSTANCE retval = ::ShellExecute(NULL, actionVerb, fileOrUri_c, NULL, NULL,
                                       SW_SHOWNORMAL);
     DWORD error = ::GetLastError();
     _control87(oldcontrol87, 0xffffffff);
@@ -113,10 +130,38 @@ JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_ShellExecute
             return errmsg;
         }
     }
-
     return NULL;
 }
 
+/*
+ * Class:     sun_awt_windows_WDesktopPeer
+ * Method:    getDefaultBrowser
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_sun_awt_windows_WDesktopPeer_getDefaultBrowser
+(JNIEnv *env, jclass cls)
+{
+    LPCWSTR fileExtension = L"https";
+    WCHAR defaultBrowser_c [MAX_PATH];
+    DWORD cchBuffer = MAX_PATH;
+
+    // Use AssocQueryString to get the default browser
+    HRESULT hr = AssocQueryStringW(
+        ASSOCF_NONE,            // No special flags
+        ASSOCSTR_COMMAND,       // Request the command string
+        fileExtension,          // File extension
+        NULL,                   // pszExtra (optional)
+        defaultBrowser_c,       // Output buffer - result
+        &cchBuffer              // Size of the output buffer
+    );
+
+    if (FAILED(hr)) {
+        return NULL;
+    }
+
+    return JNU_NewStringPlatform(env, defaultBrowser_c);
+}
+
 /*
  * Class:     sun_awt_windows_WDesktopPeer
  * Method:    moveToTrash
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
index e679eb88dd2..19a38bcaa2d 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1632,7 +1632,7 @@ void AwtFrame::_NotifyModalBlocked(void *param)
         }
     }
 
-    if ((f != NULL) && ::IsWindow(f->GetHWnd()))
+    if (::IsWindow(f->GetHWnd()))
     {
         // get an HWND of the toplevel window this embedded frame is within
         HWND fHWnd = f->GetHWnd();
diff --git a/src/java.logging/share/classes/java/util/logging/Logger.java b/src/java.logging/share/classes/java/util/logging/Logger.java
index f40e419c2ca..dce0f69fa96 100644
--- a/src/java.logging/share/classes/java/util/logging/Logger.java
+++ b/src/java.logging/share/classes/java/util/logging/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2358,8 +2358,9 @@ public class Logger {
 
         synchronized (treeLock) {
 
-            // Remove ourself from any previous parent.
+            // Remove ourselves from any previous parent.
             LogManager.LoggerWeakRef ref = null;
+            Logger parent = this.parent;
             if (parent != null) {
                 // assert parent.kids != null;
                 for (Iterator<LogManager.LoggerWeakRef> iter = parent.kids.iterator(); iter.hasNext(); ) {
@@ -2372,11 +2373,11 @@ public class Logger {
                         ref = null;
                     }
                 }
-                // We have now removed ourself from our parents' kids.
+                // We have now removed ourselves from our parents' kids.
             }
 
             // Set our new parent.
-            parent = newParent;
+            this.parent = parent = newParent;
             if (parent.kids == null) {
                 parent.kids = new ArrayList<>(2);
             }
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java b/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
index 6eebaf4d6eb..dcb739a8697 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -523,7 +523,15 @@ public final class Connection implements Runnable {
     void abandonRequest(LdapRequest ldr, Control[] reqCtls) {
         // Remove from queue
         removeRequest(ldr);
-
+        // an optimistic check to avoid having to construct the BER
+        // messages for the "abandon request". we repeat
+        // this check later when holding the lock, before actually
+        // writing out the "abandon request", and that check actually
+        // determines whether or not the "abandon request" is actually
+        // sent
+        if (!ldr.shouldAbandonRequest()) {
+            return;
+        }
         BerEncoder ber = new BerEncoder(256);
         int abandonMsgId = getMsgId();
 
@@ -547,6 +555,9 @@ public final class Connection implements Runnable {
 
             lock.lock();
             try {
+                if (!ldr.shouldAbandonRequest()) {
+                    return;
+                }
                 outStream.write(ber.getBuf(), 0, ber.getDataLen());
                 outStream.flush();
             } finally {
@@ -680,7 +691,7 @@ public final class Connection implements Runnable {
             if (nparent) {
                 LdapRequest ldr = pendingRequests;
                 while (ldr != null) {
-                    ldr.close();
+                    ldr.connectionClosed();
                     ldr = ldr.next;
                 }
             }
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java
index 2fdd685376c..a8694ed3c7a 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 
 final class LdapRequest {
 
-    private static final BerDecoder CLOSED_MARKER = new BerDecoder(new byte[]{}, -1, 0);
+    private static final BerDecoder CONN_CLOSED_MARKER = new BerDecoder(new byte[]{}, -1, 0);
     private static final BerDecoder CANCELLED_MARKER = new BerDecoder(new byte[]{}, -1, 0);
     private static final String CLOSE_MSG = "LDAP connection has been closed";
 
@@ -44,7 +44,7 @@ final class LdapRequest {
     private final boolean pauseAfterReceipt;
 
     private volatile boolean cancelled;
-    private volatile boolean closed;
+    private volatile boolean connectionClosed;
     private volatile boolean completed;
 
     LdapRequest(int msgId, boolean pause, int replyQueueCapacity) {
@@ -62,9 +62,22 @@ final class LdapRequest {
         replies.offer(CANCELLED_MARKER);
     }
 
-    void close() {
-        closed = true;
-        replies.offer(CLOSED_MARKER);
+    /*
+     * Invoked when the connection on which this (pending) request was made
+     * is closed.
+     */
+    void connectionClosed() {
+        connectionClosed = true;
+        replies.offer(CONN_CLOSED_MARKER);
+    }
+
+    /**
+     * {@return true if an "abandon request" may be sent for this request, false otherwise}
+     */
+    boolean shouldAbandonRequest() {
+        // if the connection to which this request belonged was closed, then
+        // don't send any further "abandon request" message
+        return !connectionClosed;
     }
 
     boolean addReplyBer(BerDecoder ber) {
@@ -73,7 +86,7 @@ final class LdapRequest {
         // this is merely a best effort basis check and if we do add the reply
         // due to a race, that's OK since the replies queue would have necessary
         // markers for cancelled/closed state and those will be detected by getReplyBer().
-        if (cancelled || closed) {
+        if (cancelled || connectionClosed) {
             return false;
         }
         // if the request is not already completed, check if the reply being added
@@ -127,7 +140,7 @@ final class LdapRequest {
                 throw new CommunicationException("Request: " + msgId +
                         " cancelled");
             }
-            if (closed) {
+            if (connectionClosed) {
                 throw new IOException(CLOSE_MSG);
             }
         }
@@ -146,7 +159,7 @@ final class LdapRequest {
             throw new CommunicationException("Request: " + msgId +
                 " cancelled");
         }
-        if (result == CLOSED_MARKER) {
+        if (result == CONN_CLOSED_MARKER) {
             throw new IOException(CLOSE_MSG);
         }
         return result;
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
index 30d64fc8611..8787df8c498 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,10 @@ import java.io.OutputStream;
 class SaslOutputStream extends FilterOutputStream {
     private static final boolean debug = false;
 
-    private byte[] lenBuf = new byte[4];  // buffer for storing length
+    private final byte[] lenBuf = new byte[4];  // buffer for storing length
     private int rawSendSize = 65536;
-    private SaslClient sc;
+    private final SaslClient sc;
+    private boolean closed;
 
     SaslOutputStream(SaslClient sc, OutputStream out) throws SaslException {
         super(out);
@@ -60,8 +61,9 @@ class SaslOutputStream extends FilterOutputStream {
 
     // Override this method to call write(byte[], int, int) counterpart
     // super.write(int) simply calls out.write(int)
-
+    @Override
     public void write(int b) throws IOException {
+        ensureOpen();
         byte[] buffer = new byte[1];
         buffer[0] = (byte)b;
         write(buffer, 0, 1);
@@ -71,7 +73,9 @@ class SaslOutputStream extends FilterOutputStream {
      * Override this method to "wrap" the outgoing buffer before
      * writing it to the underlying output stream.
      */
+    @Override
     public void write(byte[] buffer, int offset, int total) throws IOException {
+        ensureOpen();
         int count;
         byte[] wrappedToken;
 
@@ -101,7 +105,12 @@ class SaslOutputStream extends FilterOutputStream {
         }
     }
 
+    @Override
     public void close() throws IOException {
+        if (closed) {
+            return;
+        }
+        closed = true;
         SaslException save = null;
         try {
             sc.dispose();  // Dispose of SaslClient's state
@@ -121,8 +130,7 @@ class SaslOutputStream extends FilterOutputStream {
      * Encodes an integer into 4 bytes in network byte order in the buffer
      * supplied.
      */
-    private static void intToNetworkByteOrder(int num, byte[] buf, int start,
-        int count) {
+    private static void intToNetworkByteOrder(int num, byte[] buf, int start, int count) {
         if (count > 4) {
             throw new IllegalArgumentException("Cannot handle more than 4 bytes");
         }
@@ -132,4 +140,10 @@ class SaslOutputStream extends FilterOutputStream {
             num >>>= 8;
         }
     }
+
+    private void ensureOpen() throws IOException {
+        if (closed) {
+            throw new IOException("stream closed");
+        }
+    }
 }
diff --git a/src/java.naming/share/classes/javax/naming/InitialContext.java b/src/java.naming/share/classes/javax/naming/InitialContext.java
index f2ab1676f4e..a66e843e641 100644
--- a/src/java.naming/share/classes/javax/naming/InitialContext.java
+++ b/src/java.naming/share/classes/javax/naming/InitialContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ import com.sun.naming.internal.ResourceManager;
  * @see Context
  * @see NamingManager#setInitialContextFactoryBuilder
  *      NamingManager.setInitialContextFactoryBuilder
- * @since 1.3, JNDI 1.1
+ * @since 1.3
  */
 
 public class InitialContext implements Context {
diff --git a/src/java.net.http/share/classes/java/net/http/package-info.java b/src/java.net.http/share/classes/java/net/http/package-info.java
index 1b8395c2706..ce954404c81 100644
--- a/src/java.net.http/share/classes/java/net/http/package-info.java
+++ b/src/java.net.http/share/classes/java/net/http/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,6 +68,8 @@
  * <p> Unless otherwise stated, {@code null} parameter values will cause methods
  * of all classes in this package to throw {@code NullPointerException}.
  *
+ * @see java.net.http/
+ *
  * @spec https://www.rfc-editor.org/info/rfc9114
  *      RFC 9114: HTTP/3
  * @spec https://www.rfc-editor.org/info/rfc7540
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
index 72a47eca42c..006c4b30bea 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Exchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -473,11 +473,10 @@ class Http1Exchange<T> extends ExchangeImpl<T> {
 
     @Override
     Http1ResponseBodySubscriber<T> createResponseSubscriber(BodyHandler<T> handler, ResponseInfo response) {
-        BodySubscriber<T> subscriber = handler.apply(response);
         var cancelTimerOnTermination =
                 cancelTimerOnResponseBodySubscriberTermination(
                         exchange.request().isWebSocket(), response.statusCode());
-        return new Http1ResponseBodySubscriber<>(subscriber, cancelTimerOnTermination, this);
+        return new Http1ResponseBodySubscriber<>(handler.apply(response), cancelTimerOnTermination, this);
     }
 
     @Override
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
index 671874b8fb5..670b8cf3c25 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -384,6 +384,7 @@ class MultiExchange<T> implements Cancelable {
     private CompletableFuture<HttpResponse<T>> handleNoBody(Response r, Exchange<T> exch) {
         BodySubscriber<T> bs = responseHandler.apply(new ResponseInfoImpl(r.statusCode(),
                 r.headers(), r.version()));
+        Objects.requireNonNull(bs, "BodyHandler returned a null BodySubscriber");
         bs.onSubscribe(new NullSubscription());
         bs.onComplete();
         CompletionStage<T> cs = ResponseSubscribers.getBodyAsync(executor, bs);
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java
index f1c1f6f2d2a..86a93f67dcd 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/HttpBodySubscriberWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,7 @@ public class HttpBodySubscriberWrapper<T> implements TrustedSubscriber<T> {
     volatile SubscriptionWrapper subscription;
     volatile Throwable withError;
     public HttpBodySubscriberWrapper(BodySubscriber<T> userSubscriber) {
+        Objects.requireNonNull(userSubscriber, "BodySubscriber");
         this.userSubscriber = userSubscriber;
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnIdManager.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnIdManager.java
index 065d045b57c..2bc759a920a 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnIdManager.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnIdManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
@@ -276,6 +277,28 @@ final class PeerConnIdManager {
         }
     }
 
+    /**
+     * {@return the list of stateless reset tokens associated with active peer connection IDs}
+     */
+    public List<byte[]> activeResetTokens() {
+        lock.lock();
+        try {
+            // we only support one active connection ID at the time
+            PeerConnectionId cid = peerConnectionIds.get(activeConnIdSeq);
+            byte[] statelessResetToken = null;
+            if (cid != null) {
+                statelessResetToken = cid.getStatelessResetToken();
+            }
+            if (statelessResetToken != null) {
+                return List.of(statelessResetToken);
+            } else {
+                return List.of();
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
     /**
      * {@return the active peer connection ID}
      */
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnectionId.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnectionId.java
index 0c6f946d1a2..b822480c2a5 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnectionId.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/PeerConnectionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,8 +72,13 @@ public final class PeerConnectionId extends QuicConnectionId {
     }
 
     private static ByteBuffer cloneBuffer(ByteBuffer src) {
+        // we make a copy of the bytes and create a new
+        // ByteBuffer here because we do not want to retain
+        // the memory that was allocated for the original
+        // ByteBuffer, which could ba a slice of a larger
+        // buffer, such as the whole datagram payload.
         final byte[] idBytes = new byte[src.remaining()];
-        src.get(idBytes);
+        src.get(src.position(), idBytes);
         return ByteBuffer.wrap(idBytes);
     }
 
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
index 580bbe23d31..41b814a551c 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -703,7 +703,9 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
             return;
         }
         if (debug.on()) {
-            debug.log("scheduleForDecryption: %d bytes", received);
+            debug.log("scheduleForDecryption: %s bytes [idbytes: %s(%s,%s)]",
+                    received, datagram.destConnId().getClass().getSimpleName(),
+                    datagram.destConnId().position(), datagram.destConnId().limit());
         }
         endpoint.buffer(received);
         incoming.add(datagram);
@@ -1246,7 +1248,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
             final PacketSpace space = packetSpace(PacketNumberSpace.APPLICATION);
             final int maxDatagramSize = getMaxDatagramSize();
             final QuicConnectionId peerConnectionId = peerConnectionId();
-            final int dstIdLength = peerConnectionId().length();
+            final int dstIdLength = peerConnectionId.length();
             if (!canSend()) {
                 return false;
             }
@@ -1747,6 +1749,11 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
         return localConnIdManager.connectionIds();
     }
 
+    @Override
+    public List<byte[]> activeResetTokens() {
+        return peerConnIdManager.activeResetTokens();
+    }
+
     LocalConnIdManager localConnectionIdManager() {
         return localConnIdManager;
     }
@@ -1842,6 +1849,10 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
                                     header.destinationId().toHexString(),
                                     Utils.asHexString(destConnId));
                         }
+                        assert packetIndex > 1 :
+                                "first long packet CID does not match itself %s(%s,%s)"
+                                        .formatted(destConnId.getClass().getSimpleName(),
+                                                destConnId.position(), destConnId.limit());
                         return;
                     }
                     var peekedVersion = header.version();
@@ -1913,6 +1924,10 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
                                             " wrong connection id (%s vs %s)",
                                     packetIndex, Utils.asHexString(cid), Utils.asHexString(destConnId));
                         }
+                        assert packetIndex > 1 : "first short packet CID does not match itself %s(%s,%s)"
+                                        .formatted(destConnId.getClass().getSimpleName(),
+                                                destConnId.position(), destConnId.limit());
+
                         return;
                     }
 
@@ -1929,6 +1944,9 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
             if (debug.on()) {
                 debug.log("Failed to process incoming packet", t);
             }
+            if (t instanceof AssertionError) {
+                this.terminator.terminate(TerminationCause.forException(t));
+            }
         }
     }
 
@@ -2453,7 +2471,7 @@ public class QuicConnectionImpl extends QuicConnection implements QuicPacketRece
                 }
                 return;
             }
-            final QuicConnectionId currentPeerConnId = this.peerConnIdManager.getPeerConnId();
+            final QuicConnectionId currentPeerConnId = peerConnectionId();
             if (rt.sourceId().equals(currentPeerConnId)) {
                 if (debug.on()) {
                     debug.log("Invalid retry, same connection ID");
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
index 91b4a678a23..ef342d4cb56 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1572,14 +1572,14 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
     private void dropPeerIssuedResetTokensFor(QuicPacketReceiver connection) {
         // remove references to this connection from the map which holds the peer issued
         // reset tokens
-        peerIssuedResetTokens.values().removeIf(conn -> connection == conn);
+        connection.activeResetTokens().forEach(this::forgetStatelessResetToken);
     }
 
-    // remap peer issued stateless token from connection `from` to connection `to`
-    private void remapPeerIssuedResetToken(QuicPacketReceiver from, QuicPacketReceiver to) {
-        assert from != null;
-        assert to != null;
-        peerIssuedResetTokens.replaceAll((tok, c) -> c == from ? to : c);
+    // remap peer issued stateless tokens to connection `newReceiver`
+    private void remapPeerIssuedResetToken(QuicPacketReceiver newReceiver) {
+        assert newReceiver != null;
+        newReceiver.activeResetTokens().forEach(resetToken ->
+                associateStatelessResetToken(resetToken, newReceiver));
     }
 
     public void draining(final QuicConnectionImpl connection) {
@@ -1588,9 +1588,10 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
 
         final long idleTimeout = connection.peerPtoMs() * 3; // 3 PTO
         connection.localConnectionIdManager().close();
-        DrainingConnection draining = new DrainingConnection(connection.connectionIds(), idleTimeout);
+        DrainingConnection draining = new DrainingConnection(connection.connectionIds(),
+                connection.activeResetTokens(), idleTimeout);
         // we can ignore stateless reset in the draining state.
-        remapPeerIssuedResetToken(connection, draining);
+        remapPeerIssuedResetToken(draining);
 
         connection.connectionIds().forEach((id) ->
                 connections.compute(id, (i, r) -> remapDraining(i, r, draining)));
@@ -1626,8 +1627,9 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
 
         final long idleTimeout = connection.peerPtoMs() * 3; // 3 PTO
         connection.localConnectionIdManager().close();
-        var closingConnection = new ClosingConnection(connection.connectionIds(), idleTimeout, datagram);
-        remapPeerIssuedResetToken(connection, closingConnection);
+        var closingConnection = new ClosingConnection(connection.connectionIds(),
+                connection.activeResetTokens(), idleTimeout, datagram);
+        remapPeerIssuedResetToken(closingConnection);
 
         connection.connectionIds().forEach((id) ->
                 connections.compute(id, (i, r) -> remapClosing(i, r, closingConnection)));
@@ -1745,6 +1747,7 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
         // an instance of this class)
         final static long NO_IDLE_TIMEOUT = 2000;
         final List<QuicConnectionId> localConnectionIds;
+        private final List<byte[]> activeResetTokens;
         final long maxIdleTimeMs;
         final long id;
         int more = 1;
@@ -1752,7 +1755,8 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
         volatile Deadline deadline;
         volatile Deadline updatedDeadline;
 
-        ClosedConnection(List<QuicConnectionId> localConnectionIds, long maxIdleTimeMs) {
+        ClosedConnection(List<QuicConnectionId> localConnectionIds, List<byte[]> activeResetTokens, long maxIdleTimeMs) {
+            this.activeResetTokens = activeResetTokens;
             this.id = QuicTimerQueue.newEventId();
             this.maxIdleTimeMs = maxIdleTimeMs == 0 ? NO_IDLE_TIMEOUT : maxIdleTimeMs;
             this.deadline = Deadline.MAX;
@@ -1765,6 +1769,11 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
             return localConnectionIds;
         }
 
+        @Override
+        public List<byte[]> activeResetTokens() {
+            return activeResetTokens;
+        }
+
         @Override
         public final void processIncoming(SocketAddress source, ByteBuffer destConnId, HeadersType headersType, ByteBuffer buffer) {
             Deadline updated = updatedDeadline;
@@ -1868,9 +1877,9 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
 
         final ByteBuffer closePacket;
 
-        ClosingConnection(List<QuicConnectionId> localConnIdManager, long maxIdleTimeMs,
+        ClosingConnection(List<QuicConnectionId> localConnectionIds, List<byte[]> activeResetTokens, long maxIdleTimeMs,
                           ByteBuffer closePacket) {
-            super(localConnIdManager, maxIdleTimeMs);
+            super(localConnectionIds, activeResetTokens, maxIdleTimeMs);
             this.closePacket = Objects.requireNonNull(closePacket);
         }
 
@@ -1903,8 +1912,8 @@ public abstract sealed class QuicEndpoint implements AutoCloseable
      */
     final class DrainingConnection extends ClosedConnection {
 
-        DrainingConnection(List<QuicConnectionId> localConnIdManager, long maxIdleTimeMs) {
-            super(localConnIdManager, maxIdleTimeMs);
+        DrainingConnection(List<QuicConnectionId> localConnectionIds, List<byte[]> activeResetTokens, long maxIdleTimeMs) {
+            super(localConnectionIds, activeResetTokens, maxIdleTimeMs);
         }
 
         @Override
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacketReceiver.java b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacketReceiver.java
index 6652b44de3a..72f622731f3 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacketReceiver.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/quic/QuicPacketReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,11 @@ public interface QuicPacketReceiver {
      */
     List<QuicConnectionId> connectionIds();
 
+    /**
+     * {@return a list of active peer stateless reset tokens for this connection)
+     */
+    List<byte[]> activeResetTokens();
+
     /**
      * {@return the initial connection id assigned by the peer}
      * On the client side, this is always {@link Optional#empty()}.
diff --git a/src/java.net.http/share/classes/module-info.java b/src/java.net.http/share/classes/module-info.java
index 48f23953ad0..fdfd1bf7e0d 100644
--- a/src/java.net.http/share/classes/module-info.java
+++ b/src/java.net.http/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
  */
 
 /**
- * Defines the HTTP Client and WebSocket APIs.
+ * Defines the {@linkplain java.net.http HTTP Client and WebSocket APIs}.
  * <p>
  * <b id="httpclientprops">System properties used by the java.net.http API</b>
  * <p>
@@ -144,15 +144,21 @@
  * The value for HTTP/2 and HTTP/3 can be overridden with the
  * {@code jdk.httpclient.keepalive.timeout.h2} and {@code jdk.httpclient.keepalive.timeout.h3}
  * properties respectively. The value specified for HTTP/2 acts as default value for HTTP/3.
+ * If the provided value is negative, the default value is used.
+ * A value of 0 is valid and has no special meaning other than the connection is closed
+ * when it becomes idle.
  * </li>
  * <li><p><b>{@systemProperty jdk.httpclient.keepalive.timeout.h2}</b> (default: see
- * below)<br>The number of seconds to keep idle HTTP/2 connections alive. If not set, then the
- * {@code jdk.httpclient.keepalive.timeout} setting is used.
+ * below)<br>The number of seconds to keep idle HTTP/2 connections alive. If not set, or negative,
+ * then the {@code jdk.httpclient.keepalive.timeout} setting is used.
+ * A value of 0 is valid and has no special meaning other than the connection is closed
+ * when it becomes idle.
  * </li>
  * <li><p><b>{@systemProperty jdk.httpclient.keepalive.timeout.h3}</b> (default: see
- * below)<br>The number of seconds to keep idle HTTP/3 connections alive. If not set, then the
- * {@code jdk.httpclient.keepalive.timeout.h2} setting is used.
- * </li>
+ * below)<br>The number of seconds to keep idle HTTP/3 connections alive. If not set,
+ * or negative, then the {@code jdk.httpclient.keepalive.timeout.h2} setting is used.
+ * A value of 0 is valid and has no special meaning other than the connection is closed
+ * when it becomes idle.
  * <li><p><b>{@systemProperty jdk.httpclient.maxframesize}</b> (default: 16384 or 16kB)<br>
  * The HTTP/2 client maximum frame size in bytes. The server is not permitted to send a frame
  * larger than this.
diff --git a/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java b/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
index ab6664b9d8f..a4475c8bd1e 100644
--- a/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
+++ b/src/java.rmi/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ import java.net.Socket;
 import java.rmi.server.RMIClientSocketFactory;
 import java.util.StringTokenizer;
 import javax.net.SocketFactory;
+import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
@@ -119,6 +120,16 @@ public class SslRMIClientSocketFactory
         //
         final SSLSocket sslSocket = (SSLSocket)
             sslSocketFactory.createSocket(host, port);
+
+        if (Boolean.parseBoolean(
+                System.getProperty("jdk.rmi.ssl.client.enableEndpointIdentification", "true"))) {
+            SSLParameters params = sslSocket.getSSLParameters();
+            if (params == null) {
+                params = new SSLParameters();
+            }
+            params.setEndpointIdentificationAlgorithm("HTTPS");
+            sslSocket.setSSLParameters(params);
+        }
         // Set the SSLSocket Enabled Cipher Suites
         //
         final String enabledCipherSuites =
diff --git a/src/java.security.jgss/windows/man/kinit.md b/src/java.security.jgss/windows/man/kinit.md
index 130bf7b007a..a32d6634e74 100644
--- a/src/java.security.jgss/windows/man/kinit.md
+++ b/src/java.security.jgss/windows/man/kinit.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -79,34 +79,34 @@ will compromise your password.
 You can specify one of the following commands. After the command, specify the
 options for it.
 
-`-A`
+[`-A`]{#option-A}
 :   Doesn't include addresses.
 
-`-f`
+[`-f`]{#option-f}
 :   Issues a forwardable ticket.
 
-`-p`
+[`-p`]{#option-p}
 :   Issues a proxiable ticket.
 
-`-c` *cache\_name*
+[`-c`]{#option-c} *cache\_name*
 :   The cache name (for example, `FILE:D:\temp\mykrb5cc`).
 
-`-l` *lifetime*
+[`-l`]{#option-l} *lifetime*
 :   Sets the lifetime of a ticket. The value can be one of "h:m[:s]",
     "NdNhNmNs", and "N". See the [MIT krb5 Time Duration definition](
     http://web.mit.edu/kerberos/krb5-1.17/doc/basic/date_format.html#duration)
     for more information.
 
-`-r` *renewable\_time*
+[`-r`]{#option-r} *renewable\_time*
 :   Sets the total lifetime that a ticket can be renewed.
 
-`-R`
+[`-R`]{#option-R}
 :   Renews a ticket.
 
-`-k`
+[`-k`]{#option-k}
 :   Uses keytab
 
-`-t` *keytab\_filename*
+[`-t`]{#option-t} *keytab\_filename*
 :   The keytab name (for example, `D:\winnt\profiles\duke\krb5.keytab`).
 
 *principal*
diff --git a/src/java.security.jgss/windows/man/klist.md b/src/java.security.jgss/windows/man/klist.md
index 67c84e65dec..c4874f7dc67 100644
--- a/src/java.security.jgss/windows/man/klist.md
+++ b/src/java.security.jgss/windows/man/klist.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ the contents of the credentials cache or keytab using the `klist` tool. The
 
 ## Commands
 
-`-c`
+[`-c`]{#option-c}
 :   Specifies that the credential cache is to be listed.
 
     The following are the options for credential cache entries:
@@ -62,7 +62,7 @@ the contents of the credentials cache or keytab using the `klist` tool. The
     `-n`
     :   If the `-a` option is specified, don't reverse resolve addresses.
 
-`-k`
+[`-k`]{#option-k}
 :   Specifies that key tab is to be listed.
 
     List the keytab entries. The following are the options for keytab entries:
diff --git a/src/java.security.jgss/windows/man/ktab.md b/src/java.security.jgss/windows/man/ktab.md
index d6817ab81cf..36e09d56e3e 100644
--- a/src/java.security.jgss/windows/man/ktab.md
+++ b/src/java.security.jgss/windows/man/ktab.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -72,12 +72,12 @@ send a keytab file over a network in the clear.
 
 ## Commands and Options
 
-`-l` \[`-e`\] \[`-t`\]
+[`-l`]{#command-l} \[`-e`\] \[`-t`\]
 :   Lists the keytab name and entries. When `-e` is specified, the encryption
     type for each entry is displayed. When `-t` is specified, the timestamp for
     each entry is displayed.
 
-`-a` *principal\_name* \[*password*\] \[`-n` *kvno*\] \[`-s` *salt* \| `-f`\] \[`-append`\]
+[`-a`]{#command-a} *principal\_name* \[*password*\] \[`-n` *kvno*\] \[`-s` *salt* \| `-f`\] \[`-append`\]
 :   Adds new key entries to the keytab for the given principal name with an
     optional *password*. If a *kvno* is specified, new keys' Key Version
     Numbers equal to the value, otherwise, automatically incrementing the Key
@@ -90,7 +90,7 @@ send a keytab file over a network in the clear.
     on the command line or in a script.** This tool will prompt for a password
     if it isn't specified.
 
-`-d` *principal\_name* \[`-f`\] \[`-e` *etype*\] \[*kvno* \| `all`\| `old`\]
+[`-d`]{#command-d} *principal\_name* \[`-f`\] \[`-e` *etype*\] \[*kvno* \| `all`\| `old`\]
 :   Deletes key entries from the keytab for the specified principal. No changes
     are made to the Kerberos database.
 
@@ -115,7 +115,7 @@ send a keytab file over a network in the clear.
 
 This option can be used with the `-l`, `-a` or `-d` commands.
 
-`-k` *keytab name*
+[`-k`]{#option-k} *keytab name*
 :   Specifies the keytab name and path with the `FILE:` prefix.
 
 ## Examples
diff --git a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
index af8870ecf64..4a1cd3aba78 100644
--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,13 @@ package sun.tools.attach;
 
 import com.sun.tools.attach.AgentLoadException;
 import com.sun.tools.attach.AttachNotSupportedException;
+import com.sun.tools.attach.AttachOperationFailedException;
 import com.sun.tools.attach.spi.AttachProvider;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,6 +43,9 @@ import java.util.regex.Pattern;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import sun.jvmstat.monitor.MonitoredHost;
+import sun.jvmstat.monitor.MonitorException;
+
 /*
  * Linux implementation of HotSpotVirtualMachine
  */
@@ -228,7 +233,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
 
     // Return the socket file for the given process.
     private File findSocketFile(long pid, long ns_pid) throws AttachNotSupportedException, IOException {
-        return new File(findTargetProcessTmpDirectory(pid, ns_pid), ".java_pid" + ns_pid);
+        return new File(findTargetProcessTmpDirectory(pid), ".java_pid" + ns_pid);
     }
 
     // On Linux a simple handshake is used to start the attach mechanism
@@ -243,39 +248,68 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
             // Do not canonicalize the file path, or we will fail to attach to a VM in a container.
             f.createNewFile();
         } catch (IOException _) {
-            f = new File(findTargetProcessTmpDirectory(pid, ns_pid), fn.toString());
+            f = new File(findTargetProcessTmpDirectory(pid), fn.toString());
             f.createNewFile();
         }
         return f;
     }
 
-    private String findTargetProcessTmpDirectory(long pid, long ns_pid) throws AttachNotSupportedException, IOException {
-        final var procPidRoot = PROC.resolve(Long.toString(pid)).resolve(ROOT_TMP);
+    private String findTargetProcessTmpDirectory(long pid) throws IOException {
+        final var tmpOnProcPidRoot = PROC.resolve(Long.toString(pid)).resolve(ROOT_TMP);
 
         /* We need to handle at least 4 different cases:
-         * 1. Caller and target processes share PID namespace and root filesystem (host to host or container to
-         *    container with both /tmp mounted between containers).
-         * 2. Caller and target processes share PID namespace and root filesystem but the target process has elevated
-         *    privileges (host to host).
-         * 3. Caller and target processes share PID namespace but NOT root filesystem (container to container).
-         * 4. Caller and target processes share neither PID namespace nor root filesystem (host to container)
+         * 1. Caller and target processes share PID namespace and root
+         *    filesystem (host to host or container to container with both /tmp
+         *    mounted between containers).
+         * 2. Caller and target processes share PID namespace and root
+         *    filesystem but the target process has elevated privileges
+         *    (host to host).
+         * 3. Caller and target processes share PID namespace but NOT root
+         *    filesystem (container to container).
+         * 4. Caller and target processes share neither PID namespace nor root
+         *    filesystem (host to container)
          *
-         * if target is elevated, we cant use /proc/<pid>/... so we have to fallback to /tmp, but that may not be shared
-         * with the target/attachee process, we can try, except in the case where the ns_pid also exists in this pid ns
-         * which is ambiguous, if we share /tmp with the intended target, the attach will succeed, if we do not,
-         * then we will potentially attempt to attach to some arbitrary process with the same pid (in this pid ns)
-         * as that of the intended target (in its * pid ns).
-         *
-         * so in that case we should prehaps throw - or risk sending SIGQUIT to some arbitrary process... which could kill it
-         *
-         * however we can also check the target pid's signal masks to see if it catches SIGQUIT and only do so if in
-         * fact it does ... this reduces the risk of killing an innocent process in the current ns as opposed to
-         * attaching to the actual target JVM ... c.f: checkCatchesAndSendQuitTo() below.
-         *
-         * note that if pid == ns_pid we are in a shared pid ns with the target and may (potentially) share /tmp
+         * if target is elevated, we cant use /proc/<pid>/... so we have to
+         * fallback to /tmp, but that may not be shared with the target/attachee
+         * process, so we should check whether /tmp on both is same. This method
+         * would throw AttachOperationFailedException if they are different
+         * because we cannot make a connection with target VM.
          */
 
-        return (Files.isWritable(procPidRoot) ? procPidRoot : TMPDIR).toString();
+        try {
+            if (Files.isWritable(tmpOnProcPidRoot)) {
+                return tmpOnProcPidRoot.toString();
+            } else if (Files.isSameFile(tmpOnProcPidRoot, TMPDIR)) {
+                return TMPDIR.toString();
+            } else {
+                throw new AttachOperationFailedException("Unable to access the filesystem of the target process");
+            }
+        } catch (IOException ioe) {
+            try {
+                boolean found = MonitoredHost.getMonitoredHost("//localhost")
+                                             .activeVms()
+                                             .stream()
+                                             .anyMatch(i -> pid == i.intValue());
+                if (found) {
+                    // We can use /tmp because target process is on same host
+                    // even if we cannot access /proc/<PID>/root.
+                    // The process with capsh/setcap would fall this pattern.
+                    return TMPDIR.toString();
+                }
+                // Throw original IOE if target process not found on localhost.
+                throw ioe;
+            } catch (URISyntaxException e) {
+                // URISyntaxException is defined as a checked exception at
+                // MonitoredHost.getMonitoredHost() if the URI string poorly
+                // formed. However "//localhost" is hard-coded at here, so the
+                // exception should not happen.
+                throw new AssertionError("Unexpected exception", e);
+            } catch (MonitorException e) {
+                // Other exceptions (happened at MonitoredHost) would be wrapped
+                // with AttachOperationFailedException.
+                throw new AttachOperationFailedException("Unable to find target proces", e);
+            }
+        }
     }
 
     // Return the inner most namespaced PID if there is one,
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
index 382c8a57b26..050c1030bf6 100644
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java
index cbc4410907c..3f26c02c304 100644
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/AttachOperationFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,4 +50,18 @@ public class AttachOperationFailedException extends IOException {
     public AttachOperationFailedException(String message) {
         super(message);
     }
+
+    /**
+     * Constructs an <code>AttachOperationFailedException</code> with
+     * the specified cause.
+     *
+     * @param   message the detail message.
+     * @param   cause   the cause of this exception.
+     *
+     * @since 27
+     */
+    public AttachOperationFailedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
 }
diff --git a/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
index 4fc0b2796ee..e4eb2feab9d 100644
--- a/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
+++ b/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -309,7 +309,7 @@ public class EUC_JP
 
             try {
                 if (enc0201.isASCIICompatible()) {
-                    int n = JLA.uncheckedEncodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
+                    int n = JLA.encodeASCII(sa, sp, da, dp, Math.min(dl - dp, sl - sp));
                     sp += n;
                     dp += n;
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
index 845203c8735..152883b4930 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
@@ -266,6 +266,13 @@ public interface Tree {
          */
         PRIMITIVE_TYPE(PrimitiveTypeTree.class),
 
+        /**
+         * Used for instances of {@link VarTypeTree}.
+         *
+         * @since 27
+         */
+        VAR_TYPE(VarTypeTree.class),
+
         /**
          * Used for instances of {@link ReturnTree}.
          */
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
index a2a33ccf8eb..f2a067971d1 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
@@ -498,6 +498,15 @@ public interface TreeVisitor<R,P> {
      */
     R visitPrimitiveType(PrimitiveTypeTree node, P p);
 
+    /**
+     * Visits a {@code VarTypeTree} node.
+     * @param node the node being visited
+     * @param p a parameter value
+     * @return a result value
+     * @since 27
+     */
+    R visitVarType(VarTypeTree node, P p);
+
     /**
      * Visits a {@code TypeParameterTree} node.
      * @param node the node being visited
diff --git a/src/java.desktop/share/native/libjsound/Platform.c b/src/jdk.compiler/share/classes/com/sun/source/tree/VarTypeTree.java
similarity index 69%
rename from src/java.desktop/share/native/libjsound/Platform.c
rename to src/jdk.compiler/share/classes/com/sun/source/tree/VarTypeTree.java
index ecb389c89b7..bfe13ebdce1 100644
--- a/src/java.desktop/share/native/libjsound/Platform.c
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/VarTypeTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,21 +23,14 @@
  * questions.
  */
 
+package com.sun.source.tree;
 
-#include "Utilities.h"
-// Platform.java includes
-#include "com_sun_media_sound_Platform.h"
+import javax.lang.model.type.TypeKind;
 
-/*
- * Declare library specific JNI_Onload entry if static build
+/**
+ * A tree node for a {@code var} contextual keyword used as a type.
+ *
+ * @since 27
  */
-DEF_STATIC_JNI_OnLoad
-
-/*
- * Class:     com_sun_media_sound_Platform
- * Method:    nIsBigEndian
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_com_sun_media_sound_Platform_nIsBigEndian(JNIEnv *env, jclass clss) {
-    return UTIL_IsBigEndianPlatform();
+public interface VarTypeTree extends Tree {
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
index a1191b2f8e6..11dc41577be 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
@@ -65,10 +65,13 @@ public interface VariableTree extends StatementTree {
      */
     ExpressionTree getNameExpression();
 
-    /**
-     * Returns the type of the variable being declared.
-     * @return the type
-     */
+    /// {@return the type of the variable being declared.}
+    ///
+    /// @apiNote
+    /// The type of the variable can be one of the following:
+    /// - if the variable is declared using {@code var}, then the returned value is a {@link VarTypeTree},
+    /// - if the variable is a lambda parameter declared without a type (i.e. relying on type inferrence), then the returned value is {@code null},
+    /// - otherwise, the variable is declared with an explicit type, and the returned value is that type.
     Tree getType();
 
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
index 77305d56b1e..917df861b70 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
@@ -803,6 +803,21 @@ public class SimpleTreeVisitor <R,P> implements TreeVisitor<R,P> {
         return defaultAction(node, p);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation calls {@code defaultAction}.
+     *
+     * @param node {@inheritDoc}
+     * @param p {@inheritDoc}
+     * @return  the result of {@code defaultAction}
+     * @since 27
+     */
+    @Override
+    public R visitVarType(VarTypeTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
index 29e81c206e0..ca8b785d8cb 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
@@ -939,6 +939,21 @@ public class TreeScanner<R,P> implements TreeVisitor<R,P> {
         return null;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation returns {@code null}.
+     *
+     * @param node  {@inheritDoc}
+     * @param p  {@inheritDoc}
+     * @return the result of scanning
+     * @since 27
+     */
+    @Override
+    public R visitVarType(VarTypeTree node, P p) {
+        return null;
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
index 65ce640ef76..bc597876778 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
@@ -91,6 +91,8 @@ public class JavacTaskImpl extends BasicJavacTask {
 
     @Override @DefinedBy(Api.COMPILER)
     public Boolean call() {
+        if (used.get())
+            throw new IllegalStateException();
         return doCall().isOK();
     }
 
@@ -207,7 +209,6 @@ public class JavacTaskImpl extends BasicJavacTask {
             // init JavaCompiler and queues
             compiler = JavaCompiler.instance(context);
             compiler.keepComments = true;
-            compiler.genEndPos = true;
             notYetEntered = new HashMap<>();
             if (forParse) {
                 compiler.initProcessAnnotations(processors, args.getFileObjects(), args.getClassNames());
@@ -245,6 +246,8 @@ public class JavacTaskImpl extends BasicJavacTask {
 
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Iterable<? extends CompilationUnitTree> parse() {
+        if (used.get())
+            throw new IllegalStateException();
         Pair<Iterable<? extends CompilationUnitTree>, Throwable> result =  invocationHelper(this::parseInternal);
         if (result.snd == null) {
             return result.fst;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 22ee2393a02..6bc5d358b6f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -114,7 +114,6 @@ import com.sun.tools.javac.tree.DCTree.DCParam;
 import com.sun.tools.javac.tree.DCTree.DCReference;
 import com.sun.tools.javac.tree.DocCommentTable;
 import com.sun.tools.javac.tree.DocTreeMaker;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCBlock;
 import com.sun.tools.javac.tree.JCTree.JCCatch;
@@ -240,8 +239,7 @@ public class JavacTrees extends DocTrees {
 
                 @Override @DefinedBy(Api.COMPILER_TREE)
                 public long getEndPosition(CompilationUnitTree file, Tree tree) {
-                    EndPosTable endPosTable = ((JCCompilationUnit) file).endPositions;
-                    return TreeInfo.getEndPos((JCTree) tree, endPosTable);
+                    return TreeInfo.getEndPos((JCTree) tree);
                 }
 
                 @Override @DefinedBy(Api.COMPILER_TREE)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
index 5b59e47027e..ac1bcc84194 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,12 +156,22 @@ public class Flags {
     @Use({FlagTarget.CLASS})
     public static final int IMPLICIT_CLASS    = 1<<19;
 
+    /** Variable with implicit/inferred type.
+     */
+    @Use(FlagTarget.VARIABLE)
+    public static final int VAR_VARIABLE     = 1<<19;
+
     /** Flag is set for compiler-generated anonymous method symbols
      *  that `own' an initializer block.
      */
     @Use({FlagTarget.METHOD})
     public static final int BLOCK            = 1<<20;
 
+    /** A parameter of a lambda function.
+     */
+    @Use(FlagTarget.VARIABLE)
+    public static final int LAMBDA_PARAMETER     = 1<<20;
+
     /** Flag is set for ClassSymbols that are being compiled from source.
      */
     @Use({FlagTarget.CLASS})
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/LintMapper.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/LintMapper.java
index 06caa70d478..4f33bb92b41 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/LintMapper.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/LintMapper.java
@@ -35,7 +35,6 @@ import java.util.function.Consumer;
 
 import javax.tools.JavaFileObject;
 
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.TreeInfo;
@@ -134,9 +133,9 @@ public class LintMapper {
      * @param sourceFile source file
      * @param tree top-level declaration (class, package, or module)
      */
-    public void calculateLints(JavaFileObject sourceFile, JCTree tree, EndPosTable endPositions) {
+    public void calculateLints(JavaFileObject sourceFile, JCTree tree) {
         Assert.check(rootLint != null);
-        fileInfoMap.get(sourceFile).afterAttr(tree, endPositions);
+        fileInfoMap.get(sourceFile).afterAttr(tree);
     }
 
     /**
@@ -184,15 +183,15 @@ public class LintMapper {
             rootRange = new LintRange(rootLint);
             for (JCTree decl : tree.defs) {
                 if (isTopLevelDecl(decl))
-                    unmappedDecls.add(new Span(decl, tree.endPositions));
+                    unmappedDecls.add(new Span(decl));
             }
         }
 
         // After attribution: Discard the span from "unmappedDecls" and populate the declaration's subtree under "rootRange"
-        void afterAttr(JCTree tree, EndPosTable endPositions) {
+        void afterAttr(JCTree tree) {
             for (Iterator<Span> i = unmappedDecls.iterator(); i.hasNext(); ) {
                 if (i.next().contains(tree.pos())) {
-                    rootRange.populateSubtree(tree, endPositions);
+                    rootRange.populateSubtree(tree);
                     i.remove();
                     return;
                 }
@@ -225,8 +224,8 @@ public class LintMapper {
 
         static final Span MAXIMAL = new Span(Integer.MIN_VALUE, Integer.MAX_VALUE);
 
-        Span(JCTree tree, EndPosTable endPositions) {
-            this(TreeInfo.getStartPos(tree), TreeInfo.getEndPos(tree, endPositions));
+        Span(JCTree tree) {
+            this(TreeInfo.getStartPos(tree), TreeInfo.getEndPos(tree));
         }
 
         boolean contains(DiagnosticPosition pos) {
@@ -256,8 +255,8 @@ public class LintMapper {
         }
 
         // Create a node representing the given declaration and its corresponding Lint configuration
-        LintRange(JCTree tree, EndPosTable endPositions, Lint lint) {
-            this(new Span(tree, endPositions), lint, new LinkedList<>());
+        LintRange(JCTree tree, Lint lint) {
+            this(new Span(tree), lint, new LinkedList<>());
         }
 
         // Find the most specific node in this tree (including me) that contains the given position, if any
@@ -277,7 +276,7 @@ public class LintMapper {
 
         // Populate a sparse subtree corresponding to the given nested declaration.
         // Only when the Lint configuration differs from the parent is a node added.
-        void populateSubtree(JCTree tree, EndPosTable endPositions) {
+        void populateSubtree(JCTree tree) {
             new TreeScanner() {
 
                 private LintRange currentNode = LintRange.this;
@@ -320,7 +319,7 @@ public class LintMapper {
 
                     // Add a new node here and proceed
                     final LintRange previousNode = currentNode;
-                    currentNode = new LintRange(tree, endPositions, newLint);
+                    currentNode = new LintRange(tree, newLint);
                     previousNode.children.add(currentNode);
                     try {
                         recursor.accept(tree);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
index 84a823f785f..cf5e5ca83f5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -272,6 +272,7 @@ public enum Source {
         CASE_NULL(JDK21, Fragments.FeatureCaseNull, DiagKind.NORMAL),
         PATTERN_SWITCH(JDK21, Fragments.FeaturePatternSwitch, DiagKind.PLURAL),
         REDUNDANT_STRICTFP(JDK17),
+        TYPE_ANNOTATIONS_ON_VAR_LAMBDA_PARAMETER(MIN, JDK19),
         UNCONDITIONAL_PATTERN_IN_INSTANCEOF(JDK21, Fragments.FeatureUnconditionalPatternsInInstanceof, DiagKind.PLURAL),
         RECORD_PATTERNS(JDK21, Fragments.FeatureDeconstructionPatterns, DiagKind.PLURAL),
         IMPLICIT_CLASSES(JDK25, Fragments.FeatureImplicitClasses, DiagKind.PLURAL),
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 3f3eb1f9623..9ffab9fd961 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -1436,7 +1436,7 @@ public class Types {
                     return visit(s, t);
 
                 return s.hasTag(ARRAY)
-                    && containsTypeEquivalent(t.elemtype, elemtype(s));
+                    && visit(t.elemtype, elemtype(s));
             }
 
             @Override
@@ -2858,13 +2858,17 @@ public class Types {
             hasSameArgs(t, erasure(s)) || hasSameArgs(erasure(t), s);
     }
 
-    public boolean overridesObjectMethod(TypeSymbol origin, Symbol msym) {
+    public Symbol overriddenObjectMethod(TypeSymbol origin, Symbol msym) {
         for (Symbol sym : syms.objectType.tsym.members().getSymbolsByName(msym.name)) {
             if (msym.overrides(sym, origin, Types.this, true)) {
-                return true;
+                return sym;
             }
         }
-        return false;
+        return null;
+    }
+
+    public boolean overridesObjectMethod(TypeSymbol origin, Symbol msym) {
+        return overriddenObjectMethod(origin, msym) != null;
     }
 
     /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
index f45e8500000..fb5576a82e1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Analyzer.java
@@ -370,7 +370,6 @@ public class Analyzer {
          */
         JCVariableDecl rewriteVarType(JCVariableDecl oldTree) {
             JCVariableDecl newTree = copier.copy(oldTree);
-            newTree.vartype = null;
             return newTree;
         }
 
@@ -751,7 +750,6 @@ public class Analyzer {
             if (oldLambda.paramKind == ParameterKind.IMPLICIT) {
                 //reset implicit lambda parameters (whose type might have been set during attr)
                 newLambda.paramKind = ParameterKind.IMPLICIT;
-                newLambda.params.forEach(p -> p.vartype = null);
             }
             return newLambda;
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index cc21113882f..83b684e1225 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -680,10 +680,7 @@ public class Attr extends JCTree.Visitor {
             }
             matchBindings = matchBindingsComputer.finishBindings(tree,
                                                                  matchBindings);
-            if (tree == breakTree &&
-                    resultInfo.checkContext.deferredAttrContext().mode == AttrMode.CHECK) {
-                breakTreeFound(copyEnv(env));
-            }
+            checkBreakTree(tree, env);
             return result;
         } catch (CompletionFailure ex) {
             tree.type = syms.errType;
@@ -694,6 +691,13 @@ public class Attr extends JCTree.Visitor {
         }
     }
 
+    private void checkBreakTree(JCTree tree, Env<AttrContext> env) {
+        if (tree == breakTree &&
+                resultInfo.checkContext.deferredAttrContext().mode == AttrMode.CHECK) {
+            breakTreeFound(copyEnv(env));
+        }
+    }
+
     protected void breakTreeFound(Env<AttrContext> env) {
         throw new BreakAttr(env);
     }
@@ -1259,18 +1263,18 @@ public class Attr extends JCTree.Visitor {
                 // parameters have already been entered
                 env.info.scope.enter(tree.sym);
             } else {
-                if (tree.isImplicitlyTyped() && (tree.getModifiers().flags & PARAMETER) == 0) {
+                if (tree.isImplicitlyTyped() && (tree.getModifiers().flags & PARAMETER) == 0 && tree.type == null) {
                     if (tree.init == null) {
                         //cannot use 'var' without initializer
                         log.error(tree, Errors.CantInferLocalVarType(tree.name, Fragments.LocalMissingInit));
-                        tree.vartype = make.at(tree.pos()).Erroneous();
+                        tree.type = syms.errType;
                     } else {
                         Fragment msg = canInferLocalVarType(tree);
                         if (msg != null) {
                             //cannot use 'var' with initializer which require an explicit target
                             //(e.g. lambda, method reference, array initializer).
                             log.error(tree, Errors.CantInferLocalVarType(tree.name, msg));
-                            tree.vartype = make.at(tree.pos()).Erroneous();
+                            tree.type = syms.errType;
                         }
                     }
                 }
@@ -1319,7 +1323,7 @@ public class Attr extends JCTree.Visitor {
                     }
                 }
                 if (tree.isImplicitlyTyped()) {
-                    setSyntheticVariableType(tree, v.type);
+                    setupImplicitlyTypedVariable(tree, v.type);
                 }
             }
             result = tree.type = v.type;
@@ -1593,7 +1597,8 @@ public class Attr extends JCTree.Visitor {
             }
             if (tree.var.isImplicitlyTyped()) {
                 Type inferredType = chk.checkLocalVarType(tree.var, elemtype, tree.var.name);
-                setSyntheticVariableType(tree.var, inferredType);
+                tree.var.type = inferredType;
+                setupImplicitlyTypedVariable(tree.var, inferredType);
             }
             attribStat(tree.var, loopEnv);
             chk.checkType(tree.expr.pos(), elemtype, tree.var.sym.type);
@@ -2762,8 +2767,7 @@ public class Attr extends JCTree.Visitor {
             clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
                                                  ((JCIdent) clazzid).name);
 
-            EndPosTable endPosTable = this.env.toplevel.endPositions;
-            endPosTable.storeEnd(clazzid1, clazzid.getEndPosition(endPosTable));
+            clazzid1.endpos = clazzid.getEndPosition();
             if (clazz.hasTag(ANNOTATED_TYPE)) {
                 JCAnnotatedType annoType = (JCAnnotatedType) clazz;
                 List<JCAnnotation> annos = annoType.annotations;
@@ -2814,6 +2818,8 @@ public class Attr extends JCTree.Visitor {
             checkNewInnerClass(tree.pos(), env, clazztype, false);
         }
 
+        checkBreakTree(tree.clazz, localEnv);
+
         // Attribute constructor arguments.
         ListBuffer<Type> argtypesBuf = new ListBuffer<>();
         final KindSelector pkind =
@@ -3218,8 +3224,10 @@ public class Attr extends JCTree.Visitor {
                     Type argType = arityMismatch ?
                             syms.errType :
                             actuals.head;
-                    if (params.head.isImplicitlyTyped()) {
-                        setSyntheticVariableType(params.head, argType);
+                    if (params.head.type == null &&
+                        params.head.isImplicitlyTyped()) { //error recovery
+                        params.head.type = argType;
+                        setupImplicitlyTypedVariable(params.head, argType);
                     }
                     params.head.sym = null;
                     actuals = actuals.isEmpty() ?
@@ -3251,10 +3259,8 @@ public class Attr extends JCTree.Visitor {
                 attribTree(that.getBody(), localEnv, bodyResultInfo);
             } else {
                 JCBlock body = (JCBlock)that.body;
-                if (body == breakTree &&
-                        resultInfo.checkContext.deferredAttrContext().mode == AttrMode.CHECK) {
-                    breakTreeFound(copyEnv(localEnv));
-                }
+
+                checkBreakTree(body, localEnv);
                 attribStats(body.stats, localEnv);
             }
 
@@ -3439,7 +3445,7 @@ public class Attr extends JCTree.Visitor {
                     JCLambda lambda = (JCLambda)tree;
                     List<Type> argtypes = List.nil();
                     for (JCVariableDecl param : lambda.params) {
-                        argtypes = param.vartype != null && param.vartype.type != null ?
+                        argtypes = !param.isImplicitlyTyped() && param.vartype.type != null ?
                                 argtypes.append(param.vartype.type) :
                                 argtypes.append(syms.errType);
                     }
@@ -4000,7 +4006,10 @@ public class Attr extends JCTree.Visitor {
             chk.checkCastable(tree.rhs.pos(),
                               operator.type.getReturnType(),
                               owntype);
-            chk.checkLossOfPrecision(tree.rhs.pos(), operand, owntype);
+            switch (tree.getTag()) {
+            case SL_ASG, SR_ASG, USR_ASG -> { }     // we only use (at most) the lower 6 bits, so any integral type is OK
+            default -> chk.checkLossOfPrecision(tree.rhs.pos(), operand, owntype);
+            }
             chk.checkOutOfRangeShift(tree.rhs.pos(), operator, operand);
         }
         result = check(tree, owntype, KindSelector.VAL, resultInfo);
@@ -4212,23 +4221,24 @@ public class Attr extends JCTree.Visitor {
 
     public void visitBindingPattern(JCBindingPattern tree) {
         Type type;
-        if (tree.var.vartype != null) {
+        if (!tree.var.isImplicitlyTyped()) {
             type = attribType(tree.var.vartype, env);
         } else {
             type = resultInfo.pt;
         }
         tree.type = tree.var.type = type;
-        BindingSymbol v = new BindingSymbol(tree.var.mods.flags, tree.var.name, type, env.info.scope.owner);
+        BindingSymbol v = new BindingSymbol(tree.var.mods.flags | tree.var.declKind.additionalSymbolFlags,
+                                            tree.var.name, type, env.info.scope.owner);
         v.pos = tree.pos;
         tree.var.sym = v;
         if (chk.checkUnique(tree.var.pos(), v, env.info.scope)) {
             chk.checkTransparentVar(tree.var.pos(), v, env.info.scope);
         }
-        chk.validate(tree.var.vartype, env, true);
         if (tree.var.isImplicitlyTyped()) {
-            setSyntheticVariableType(tree.var, type == Type.noType ? syms.errType
-                                                                   : type);
+            setupImplicitlyTypedVariable(tree.var, type == Type.noType ? syms.errType
+                                                      : type);
         }
+        chk.validate(tree.var.vartype, env, true);
         annotate.annotateLater(tree.var.mods.annotations, env, v);
         if (!tree.var.isImplicitlyTyped()) {
             annotate.queueScanTreeAndTypeAnnotate(tree.var.vartype, env, v);
@@ -4247,7 +4257,7 @@ public class Attr extends JCTree.Visitor {
     public void visitRecordPattern(JCRecordPattern tree) {
         Type site;
 
-        if (tree.deconstructor == null) {
+        if (tree.deconstructor.hasTag(VARTYPE)) {
             log.error(tree.pos(), Errors.DeconstructionPatternVarNotAllowed);
             tree.record = syms.errSymbol;
             site = tree.type = types.createErrorType(tree.record.type);
@@ -4263,10 +4273,11 @@ public class Attr extends JCTree.Visitor {
             }
             tree.type = tree.deconstructor.type = type;
             site = types.capture(tree.type);
+            chk.validate(tree.deconstructor, env, true);
         }
 
         List<Type> expectedRecordTypes;
-        if (site.tsym.kind == Kind.TYP && ((ClassSymbol) site.tsym).isRecord()) {
+        if (site.tsym instanceof ClassSymbol clazz && clazz.isRecord()) {
             ClassSymbol record = (ClassSymbol) site.tsym;
             expectedRecordTypes = record.getRecordComponents()
                                         .stream()
@@ -4308,7 +4319,6 @@ public class Attr extends JCTree.Visitor {
         } finally {
             localEnv.info.scope.leave();
         }
-        chk.validate(tree.deconstructor, env, true);
         result = tree.type;
         matchBindings = new MatchBindings(outBindings.toList(), List.nil());
     }
@@ -5311,7 +5321,7 @@ public class Attr extends JCTree.Visitor {
         annotate.flush();
 
         // Now that this tree is attributed, we can calculate the Lint configuration everywhere within it
-        lintMapper.calculateLints(env.toplevel.sourcefile, env.tree, env.toplevel.endPositions);
+        lintMapper.calculateLints(env.toplevel.sourcefile, env.tree);
     }
 
     public void attribPackage(DiagnosticPosition pos, PackageSymbol p) {
@@ -5388,7 +5398,8 @@ public class Attr extends JCTree.Visitor {
 
         Type st = types.supertype(c.type);
         if ((c.flags_field & Flags.COMPOUND) == 0 &&
-            (c.flags_field & Flags.SUPER_OWNER_ATTRIBUTED) == 0) {
+            (c.flags_field & Flags.SUPER_OWNER_ATTRIBUTED) == 0 &&
+            breakTree == null) {
             // First, attribute superclass.
             if (st.hasTag(CLASS))
                 attribClass((ClassSymbol)st.tsym);
@@ -5723,15 +5734,20 @@ public class Attr extends JCTree.Visitor {
         return types.capture(type);
     }
 
-    private void setSyntheticVariableType(JCVariableDecl tree, Type type) {
-        if (type.isErroneous()) {
-            tree.vartype = make.at(tree.pos()).Erroneous();
-        } else if (tree.declaredUsingVar()) {
-            Assert.check(tree.typePos != Position.NOPOS);
-            tree.vartype = make.at(tree.typePos).Type(type);
-        } else {
-            tree.vartype = make.at(tree.pos()).Type(type);
+    private void setupImplicitlyTypedVariable(JCVariableDecl tree, Type type) {
+        Assert.check(tree.isImplicitlyTyped());
+
+        type.complete();
+
+        if (tree.vartype == null) {
+            return ;
         }
+
+        Assert.check(tree.vartype.hasTag(VARTYPE));
+
+        JCVarType vartype = (JCVarType) tree.vartype;
+
+        vartype.type = type;
     }
 
     public void validateTypeAnnotations(JCTree tree, boolean sigOnly) {
@@ -6060,9 +6076,6 @@ public class Attr extends JCTree.Visitor {
                 that.sym = new VarSymbol(0, that.name, that.type, syms.noSymbol);
                 that.sym.adr = 0;
             }
-            if (that.vartype == null) {
-                that.vartype = make.at(Position.NOPOS).Erroneous();
-            }
             super.visitVarDef(that);
         }
 
@@ -6137,6 +6150,11 @@ public class Attr extends JCTree.Visitor {
                         syms.noSymbol);
             }
         }
+
+        @Override
+        public void visitVarType(JCVarType that) {
+            initTypeIfNeeded(that);
+        }
     }
     // </editor-fold>
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrRecover.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrRecover.java
index 716345fa077..092035c84dd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrRecover.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrRecover.java
@@ -117,11 +117,6 @@ public class AttrRecover {
                             ? formals.head : ((ArrayType) formals.head).elemtype;
                     if (arg.hasTag(JCTree.Tag.LAMBDA)) {
                         final JCTree.JCLambda lambda = (JCLambda) arg;
-                        if (lambda.paramKind == JCLambda.ParameterKind.IMPLICIT) {
-                            for (JCVariableDecl var : lambda.params) {
-                                var.vartype = null; //reset type
-                            }
-                        }
                         if (types.isFunctionalInterface(formal)) {
                             Type functionalType = types.findDescriptorType(formal);
                             boolean voidCompatible = functionalType.getReturnType().hasTag(TypeTag.VOID);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index 94b14f3122f..0af30be4671 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3544,7 +3544,10 @@ public class Check {
                 if (s.kind == PCK)
                     applicableTargets.add(names.PACKAGE);
             } else if (target == names.TYPE_USE) {
-                if (s.kind == VAR && s.owner.kind == MTH && s.type.hasTag(NONE)) {
+                if (s.kind == VAR &&
+                    (s.flags() & Flags.VAR_VARIABLE) != 0 &&
+                    (!Feature.TYPE_ANNOTATIONS_ON_VAR_LAMBDA_PARAMETER.allowedInSource(source) ||
+                     ((s.flags() & Flags.LAMBDA_PARAMETER) == 0))) {
                     //cannot type annotate implicitly typed locals
                     continue;
                 } else if (s.kind == TYP || s.kind == VAR ||
@@ -5632,8 +5635,8 @@ public class Check {
             }
             case JCVariableDecl variableDecl -> {
                 if (variableDecl.vartype != null &&
-                        (variableDecl.sym.flags_field & RECORD) == 0 ||
-                        (variableDecl.sym.flags_field & ~(Flags.PARAMETER | RECORD | GENERATED_MEMBER)) != 0) {
+                        ((variableDecl.sym.flags_field & RECORD) == 0 ||
+                         (variableDecl.sym.flags_field & ~(Flags.PARAMETER | RECORD | GENERATED_MEMBER)) != 0)) {
                     /* we don't want to warn twice so if this variable is a compiler generated parameter of
                      * a canonical record constructor, we don't want to issue a warning as we will warn the
                      * corresponding compiler generated private record field anyways
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
index bbc330832f3..2a0bab1e330 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,11 +41,17 @@ import com.sun.tools.javac.code.Kinds.Kind;
 import com.sun.tools.javac.code.Type.TypeVar;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.SequencedSet;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.groupingBy;
+import static com.sun.tools.javac.code.Flags.RECORD;
 
 /** A class to compute exhaustiveness of set of switch cases.
  *
@@ -55,6 +61,14 @@ import static java.util.stream.Collectors.groupingBy;
  *  deletion without notice.</b>
  */
 public class ExhaustivenessComputer {
+    private static final long DEFAULT_MAX_BASE_CHECKS = 4_000_000;
+
+    //when baseChecks is set to a value different that this, the checks
+    //will be counter, and if too many will happen, the process will be stopped
+    //when baseChecks is set to this value, there's no counting, and the
+    //process will not continue as long as needed
+    private static final long NO_BASE_CHECKS_COUNTING = -1;
+
     protected static final Context.Key<ExhaustivenessComputer> exhaustivenessKey = new Context.Key<>();
 
     private final Symtab syms;
@@ -62,6 +76,8 @@ public class ExhaustivenessComputer {
     private final Check chk;
     private final Infer infer;
     private final Map<Pair<Type, Type>, Boolean> isSubtypeCache = new HashMap<>();
+    private final long maxBaseChecks;
+    private long baseChecks = NO_BASE_CHECKS_COUNTING;
 
     public static ExhaustivenessComputer instance(Context context) {
         ExhaustivenessComputer instance = context.get(exhaustivenessKey);
@@ -77,9 +93,22 @@ public class ExhaustivenessComputer {
         types = Types.instance(context);
         chk = Check.instance(context);
         infer = Infer.instance(context);
+        Options options = Options.instance(context);
+        String baseChecks = options.get("exhaustivityMaxBaseChecks");
+        long computedMaxBaseChecks = DEFAULT_MAX_BASE_CHECKS;
+
+        if (baseChecks != null) {
+            try {
+                computedMaxBaseChecks = Long.parseLong(baseChecks);
+            } catch (NumberFormatException _) {
+                //ignore invalid values and use the default maximum number of checks
+            }
+        }
+
+        maxBaseChecks = computedMaxBaseChecks;
     }
 
-    public boolean exhausts(JCExpression selector, List<JCCase> cases) {
+    public ExhaustivenessResult exhausts(JCExpression selector, List<JCCase> cases) {
         Set<PatternDescription> patternSet = new HashSet<>();
         Map<Symbol, Set<Symbol>> enum2Constants = new HashMap<>();
         Set<Object> booleanLiterals = new HashSet<>(Set.of(0, 1));
@@ -113,7 +142,7 @@ public class ExhaustivenessComputer {
         }
 
         if (types.unboxedTypeOrType(selector.type).hasTag(TypeTag.BOOLEAN) && booleanLiterals.isEmpty()) {
-            return true;
+            return ExhaustivenessResult.ofExhaustive();
         }
 
         for (Entry<Symbol, Set<Symbol>> e : enum2Constants.entrySet()) {
@@ -121,47 +150,77 @@ public class ExhaustivenessComputer {
                 patternSet.add(new BindingPattern(e.getKey().type));
             }
         }
-        Set<PatternDescription> patterns = patternSet;
-        Set<Set<PatternDescription>> seenFallback = new HashSet<>();
-        boolean useHashes = true;
         try {
-            boolean repeat = true;
-            while (repeat) {
-                Set<PatternDescription> updatedPatterns;
-                updatedPatterns = reduceBindingPatterns(selector.type, patterns);
-                updatedPatterns = reduceNestedPatterns(updatedPatterns, useHashes);
-                updatedPatterns = reduceRecordPatterns(updatedPatterns);
-                updatedPatterns = removeCoveredRecordPatterns(updatedPatterns);
-                repeat = !updatedPatterns.equals(patterns);
-                if (checkCovered(selector.type, patterns)) {
-                    return true;
-                }
-                if (!repeat) {
-                    //there may be situation like:
-                    //class B permits S1, S2
-                    //patterns: R(S1, B), R(S2, S2)
-                    //this might be joined to R(B, S2), as B could be rewritten to S2
-                    //but hashing in reduceNestedPatterns will not allow that
-                    //disable the use of hashing, and use subtyping in
-                    //reduceNestedPatterns to handle situations like this:
-                    repeat = useHashes && seenFallback.add(updatedPatterns);
-                    useHashes = false;
-                } else {
-                    //if a reduction happened, make sure hashing in reduceNestedPatterns
-                    //is enabled, as the hashing speeds up the process significantly:
-                    useHashes = true;
-                }
-                patterns = updatedPatterns;
+            CoverageResult coveredResult = computeCoverage(selector.type, patternSet, PatternEquivalence.STRICT);
+            if (coveredResult.covered()) {
+                return ExhaustivenessResult.ofExhaustive();
             }
-            return checkCovered(selector.type, patterns);
+
+            Set<PatternDescription> details =
+                    this.computeMissingPatternDescriptions(selector.type, coveredResult.incompletePatterns())
+                        .stream()
+                        .flatMap(pd -> {
+                            if (pd instanceof BindingPattern bp && enum2Constants.containsKey(bp.type.tsym)) {
+                                Symbol enumType = bp.type.tsym;
+                                return enum2Constants.get(enumType).stream().map(c -> new EnumConstantPattern(bp.type, c.name));
+                            } else {
+                                return Stream.of(pd);
+                            }
+                        })
+                        .collect(Collectors.toSet());
+
+            return ExhaustivenessResult.ofDetails(details);
         } catch (CompletionFailure cf) {
             chk.completionError(selector.pos(), cf);
-            return true; //error recovery
-        } finally {
-            isSubtypeCache.clear();
+            return ExhaustivenessResult.ofExhaustive(); //error recovery
         }
     }
 
+    /* Given the set of patterns, runs the reductions of it as long as possible.
+     * If the (reduced) set of patterns covers the given selector type, returns
+     * covered == true, and incompletePatterns == null.
+     * If the (reduced) set of patterns does not cover the given selector type,
+     * returns covered == false, and incompletePatterns == the reduced set of patterns.
+     */
+    private CoverageResult computeCoverage(Type selectorType, Set<PatternDescription> patterns, PatternEquivalence patternEquivalence) {
+        Set<PatternDescription> updatedPatterns;
+        Set<Set<PatternDescription>> seenPatterns = new HashSet<>();
+        boolean useHashes = true;
+        boolean repeat = true;
+        do {
+            updatedPatterns = reduceBindingPatterns(selectorType, patterns);
+            updatedPatterns = reduceNestedPatterns(updatedPatterns, useHashes, patternEquivalence);
+            updatedPatterns = reduceRecordPatterns(updatedPatterns);
+            updatedPatterns = removeCoveredRecordPatterns(updatedPatterns);
+            repeat = !updatedPatterns.equals(patterns);
+            if (checkCovered(selectorType, patterns)) {
+                return new CoverageResult(true, null);
+            }
+            if (!repeat) {
+                //there may be situation like:
+                //class B permits S1, S2
+                //patterns: R(S1, B), R(S2, S2)
+                //this might be joined to R(B, S2), as B could be rewritten to S2
+                //but hashing in reduceNestedPatterns will not allow that
+                //disable the use of hashing, and use subtyping in
+                //reduceNestedPatterns to handle situations like this:
+                repeat = useHashes && seenPatterns.add(updatedPatterns);
+                useHashes = false;
+            } else {
+                //if a reduction happened, make sure hashing in reduceNestedPatterns
+                //is enabled, as the hashing speeds up the process significantly:
+                useHashes = true;
+            }
+            patterns = updatedPatterns;
+        } while (repeat);
+        if (checkCovered(selectorType, patterns)) {
+            return new CoverageResult(true, null);
+        }
+        return new CoverageResult(false, patterns);
+    }
+
+    private record CoverageResult(boolean covered, Set<PatternDescription> incompletePatterns) {}
+
     private boolean checkCovered(Type seltype, Iterable<PatternDescription> patterns) {
         for (Type seltypeComponent : components(seltype)) {
             for (PatternDescription pd : patterns) {
@@ -215,6 +274,7 @@ public class ExhaustivenessComputer {
                     if (clazz.isSealed() && clazz.isAbstract() &&
                         //if a binding pattern for clazz already exists, no need to analyze it again:
                         !existingBindings.contains(clazz)) {
+                        ListBuffer<PatternDescription> bindings = new ListBuffer<>();
                         //do not reduce to types unrelated to the selector type:
                         Type clazzType = clazz.type;
                         if (components(selectorType).stream()
@@ -222,16 +282,7 @@ public class ExhaustivenessComputer {
                             continue;
                         }
 
-                        Set<Symbol> permitted = allPermittedSubTypes(clazz, csym -> {
-                            Type instantiated;
-                            if (csym.type.allparams().isEmpty()) {
-                                instantiated = csym.type;
-                            } else {
-                                instantiated = infer.instantiatePatternType(selectorType, csym);
-                            }
-
-                            return instantiated != null && types.isCastable(selectorType, instantiated);
-                        });
+                        Set<Symbol> permitted = allPermittedSubTypes(clazz, isApplicableSubtypePredicate(selectorType));
 
                         //the set of pending permitted subtypes needed to cover clazz:
                         Set<Symbol> pendingPermitted = new HashSet<>(permitted);
@@ -263,7 +314,7 @@ public class ExhaustivenessComputer {
                         }
 
                         if (pendingPermitted.isEmpty()) {
-                            toAdd.add(new BindingPattern(clazz.type));
+                            toAdd.add(new BindingPattern(clazz.type, Set.of()));
                         }
                     }
                 }
@@ -304,6 +355,49 @@ public class ExhaustivenessComputer {
         return permitted;
     }
 
+    private <C extends TypeSymbol> Predicate<C> isApplicableSubtypePredicate(Type targetType) {
+        return csym -> {
+            Type instantiated = instantiatePatternType(targetType, csym);
+
+            return instantiated != null && types.isCastable(targetType, instantiated);
+        };
+    }
+
+    private Type instantiatePatternType(Type targetType, TypeSymbol csym) {
+        if (csym.type.allparams().isEmpty()) {
+            return csym.type;
+        } else {
+            return infer.instantiatePatternType(targetType, csym);
+        }
+    }
+
+    private Set<ClassSymbol> leafPermittedSubTypes(TypeSymbol root, Predicate<ClassSymbol> accept) {
+        Set<ClassSymbol> permitted = new HashSet<>();
+        List<ClassSymbol> permittedSubtypesClosure = baseClasses(root);
+
+        while (permittedSubtypesClosure.nonEmpty()) {
+            ClassSymbol current = permittedSubtypesClosure.head;
+
+            permittedSubtypesClosure = permittedSubtypesClosure.tail;
+
+            current.complete();
+
+            if (current.isSealed() && current.isAbstract()) {
+                for (Type t : current.getPermittedSubclasses()) {
+                    ClassSymbol csym = (ClassSymbol) t.tsym;
+
+                    if (accept.test(csym)) {
+                        permittedSubtypesClosure = permittedSubtypesClosure.prepend(csym);
+                    }
+                }
+            } else {
+                permitted.add(current);
+            }
+        }
+
+        return permitted;
+    }
+
     private List<ClassSymbol> baseClasses(TypeSymbol root) {
         if (root instanceof ClassSymbol clazz) {
             return List.of(clazz);
@@ -336,7 +430,8 @@ public class ExhaustivenessComputer {
      *            as pattern hashes cannot be used to speed up the matching process
      */
     private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> patterns,
-                                                         boolean useHashes) {
+                                                         boolean useHashes,
+                                                         PatternEquivalence patternEquivalence) {
         /* implementation note:
          * finding a sub-set of patterns that only differ in a single
          * column is time-consuming task, so this method speeds it up by:
@@ -386,13 +481,13 @@ public class ExhaustivenessComputer {
                             RecordPattern rpOther = candidatesArr[nextCandidate];
 
                             if (rpOne.recordType.tsym == rpOther.recordType.tsym &&
-                                nestedComponentsEquivalent(rpOne, rpOther, mismatchingCandidate, useHashes)) {
+                                nestedComponentsEquivalent(rpOne, rpOther, mismatchingCandidate, useHashes, patternEquivalence)) {
                                 join.append(rpOther);
                             }
                         }
 
                         var nestedPatterns = join.stream().map(rp -> rp.nested[mismatchingCandidateFin]).collect(Collectors.toSet());
-                        var updatedPatterns = reduceNestedPatterns(nestedPatterns, useHashes);
+                        var updatedPatterns = reduceNestedPatterns(nestedPatterns, useHashes, patternEquivalence);
 
                         updatedPatterns = reduceRecordPatterns(updatedPatterns);
                         updatedPatterns = removeCoveredRecordPatterns(updatedPatterns);
@@ -403,16 +498,11 @@ public class ExhaustivenessComputer {
                                 current.removeAll(join);
                             }
 
-                            for (PatternDescription nested : updatedPatterns) {
-                                PatternDescription[] newNested =
-                                        Arrays.copyOf(rpOne.nested, rpOne.nested.length);
-                                newNested[mismatchingCandidateFin] = nested;
-                                RecordPattern nue = new RecordPattern(rpOne.recordType(),
-                                                                rpOne.fullComponentTypes(),
-                                                                newNested,
-                                                                new HashSet<>(join));
-                                current.add(nue);
-                            }
+                            generatePatternsWithReplacedNestedPattern(rpOne,
+                                                                      mismatchingCandidateFin,
+                                                                      updatedPatterns,
+                                                                      Set.copyOf(join),
+                                                                      current::add);
                         }
                     }
                 }
@@ -434,11 +524,32 @@ public class ExhaustivenessComputer {
      * - it's type is a supertype of the existing pattern's type
      * - it was produced by a reduction from a record pattern that is equivalent to
      *   the existing pattern
+     * - only if PatternEquivalence is LOOSE and the type is the same of the type
+     *   of an existing record pattern (the binding pattern may stand in place of
+     *   a record pattern). This is only used to compute the missing patterns that
+     *   would make the original pattern set exhaustive.
+     *
+     * For example, having (with mismatchingCandidate == 0):
+     * existing: R(A _, Box(var _)) {}
+     * cadidate: R(B _, Box(var _)) {}
+     * these are always equivalent; as all nested patterns except of
+     * component 0 are exactly equivalent
+     *
+     * existing: R(A _, SubtypeOfBox _) {}
+     * cadidate: R(A _, Box _) {}
+     * this is only equivalent when useHashes == false; Box _ could be replaced
+     * with a more specific SubtypeOfBox _
+     *
+     * existing: R(A _, Box(var _)) {}
+     * cadidate: R(A _, Box _) {}
+     * this is only equivalent when useHashes == false and patternEquivalence == LOOSE;
+     * Box _ is accepted in place of the more specific record pattern
      */
     private boolean nestedComponentsEquivalent(RecordPattern existing,
                                                RecordPattern candidate,
                                                int mismatchingCandidate,
-                                               boolean useHashes) {
+                                               boolean useHashes,
+                                               PatternEquivalence patternEquivalence) {
         NEXT_NESTED:
         for (int i = 0; i < existing.nested.length; i++) {
             if (i != mismatchingCandidate) {
@@ -457,22 +568,28 @@ public class ExhaustivenessComputer {
                             return false;
                         }
                     } else if (existing.nested[i] instanceof RecordPattern nestedExisting) {
-                        java.util.List<PatternDescription> pendingReplacedPatterns =
-                                new ArrayList<>(nestedCandidate.sourcePatterns());
+                        if (patternEquivalence == PatternEquivalence.LOOSE) {
+                            if (!isSubtypeErasure(nestedExisting.recordType(), nestedCandidate.type)) {
+                                return false;
+                            }
+                        } else {
+                            java.util.List<PatternDescription> pendingReplacedPatterns =
+                                    new ArrayList<>(nestedCandidate.sourcePatterns());
 
-                        while (!pendingReplacedPatterns.isEmpty()) {
-                            PatternDescription currentReplaced = pendingReplacedPatterns.removeLast();
+                            while (!pendingReplacedPatterns.isEmpty()) {
+                                PatternDescription currentReplaced = pendingReplacedPatterns.removeLast();
 
-                            if (nestedExisting.equals(currentReplaced)) {
-                                //candidate.nested[i] is substitutable for existing.nested[i]
-                                //continue with the next nested pattern:
-                                continue NEXT_NESTED;
+                                if (nestedExisting.equals(currentReplaced)) {
+                                    //candidate.nested[i] is substitutable for existing.nested[i]
+                                    //continue with the next nested pattern:
+                                    continue NEXT_NESTED;
+                                }
+
+                                pendingReplacedPatterns.addAll(currentReplaced.sourcePatterns());
                             }
 
-                            pendingReplacedPatterns.addAll(currentReplaced.sourcePatterns());
+                            return false;
                         }
-
-                        return false;
                     } else {
                         return false;
                     }
@@ -563,6 +680,8 @@ public class ExhaustivenessComputer {
     }
 
     private boolean isBpCovered(Type componentType, PatternDescription newNested) {
+        reportCheck();
+
         if (newNested instanceof BindingPattern bp) {
             Type seltype = types.erasure(componentType);
             Type pattype = types.erasure(bp.type);
@@ -574,9 +693,18 @@ public class ExhaustivenessComputer {
         return false;
     }
 
-    sealed interface PatternDescription {
+    protected void reportCheck() {
+        if (baseChecks != NO_BASE_CHECKS_COUNTING &&
+            ++baseChecks > maxBaseChecks) {
+            throw new TooManyChecksException(null);
+        }
+    }
+
+    public sealed interface PatternDescription {
+        public Type type();
         public Set<PatternDescription> sourcePatterns();
     }
+
     public PatternDescription makePatternDescription(Type selectorType, JCPattern pattern) {
         if (pattern instanceof JCBindingPattern binding) {
             Type type = !selectorType.isPrimitive() && types.isSubtype(selectorType, binding.type)
@@ -586,9 +714,7 @@ public class ExhaustivenessComputer {
             Type[] componentTypes;
 
             if (!record.type.isErroneous()) {
-                componentTypes = ((ClassSymbol) record.type.tsym).getRecordComponents()
-                        .map(r -> types.memberType(record.type, r))
-                        .toArray(s -> new Type[s]);
+                componentTypes = instantiatedComponentTypes(record.type);
             }
             else {
                 componentTypes = record.nested.map(t -> types.createErrorType(t.type)).toArray(s -> new Type[s]);;
@@ -611,7 +737,7 @@ public class ExhaustivenessComputer {
             throw Assert.error();
         }
     }
-    record BindingPattern(Type type, Set<PatternDescription> sourcePatterns) implements PatternDescription {
+    public record BindingPattern(Type type, Set<PatternDescription> sourcePatterns) implements PatternDescription {
 
         public BindingPattern(Type type) {
             this(type, Set.of());
@@ -631,7 +757,7 @@ public class ExhaustivenessComputer {
             return type.tsym + " _";
         }
     }
-    record RecordPattern(Type recordType, int _hashCode, Type[] fullComponentTypes, PatternDescription[] nested, Set<PatternDescription> sourcePatterns) implements PatternDescription {
+    public record RecordPattern(Type recordType, int _hashCode, Type[] fullComponentTypes, PatternDescription[] nested, Set<PatternDescription> sourcePatterns) implements PatternDescription {
 
         public RecordPattern(Type recordType, Type[] fullComponentTypes, PatternDescription[] nested) {
             this(recordType, fullComponentTypes, nested, Set.of());
@@ -673,5 +799,450 @@ public class ExhaustivenessComputer {
                     .map(pd -> pd.toString())
                     .collect(Collectors.joining(", ")) + ")";
         }
+
+        @Override
+        public Type type() {
+            return recordType;
+        }
+    }
+
+    public record EnumConstantPattern(Type enumType, Name enumConstant) implements PatternDescription {
+
+        @Override
+        public Type type() {
+            return enumType();
+        }
+
+        @Override
+        public Set<PatternDescription> sourcePatterns() {
+            return Set.of();
+        }
+        public String toString() {
+            return enumType() + "." + enumConstant();
+        }
+    }
+
+    public record ExhaustivenessResult(boolean exhaustive, Set<PatternDescription> notExhaustiveDetails) {
+        public static ExhaustivenessResult ofExhaustive() {
+            return new ExhaustivenessResult(true, null);
+        }
+        public static ExhaustivenessResult ofDetails(Set<PatternDescription> notExhaustiveDetails) {
+            return new ExhaustivenessResult(false, notExhaustiveDetails != null ? notExhaustiveDetails : Set.of());
+        }
+    }
+
+    //computation of missing patterns:
+    protected Set<PatternDescription> computeMissingPatternDescriptions(Type selectorType,
+                                                                        Set<PatternDescription> incompletePatterns) {
+        if (maxBaseChecks == 0) {
+            return Set.of();
+        }
+        try {
+            baseChecks = 0;
+            PatternDescription defaultPattern = new BindingPattern(selectorType);
+            return expandMissingPatternDescriptions(selectorType,
+                                                    selectorType,
+                                                    defaultPattern,
+                                                    incompletePatterns,
+                                                    Set.of(defaultPattern));
+        } catch (TooManyChecksException ex) {
+            return ex.missingPatterns != null ? ex.missingPatterns : Set.of();
+        } finally {
+            baseChecks = NO_BASE_CHECKS_COUNTING;
+        }
+    }
+
+    private Set<PatternDescription> expandMissingPatternDescriptions(Type selectorType,
+                                                                     Type targetType,
+                                                                     PatternDescription toExpand,
+                                                                     Set<? extends PatternDescription> basePatterns,
+                                                                     Set<PatternDescription> inMissingPatterns) {
+        try {
+            return doExpandMissingPatternDescriptions(selectorType, targetType,
+                                                      toExpand, basePatterns,
+                                                      inMissingPatterns);
+        } catch (TooManyChecksException ex) {
+            if (ex.missingPatterns == null) {
+                ex = new TooManyChecksException(inMissingPatterns);
+            }
+            throw ex;
+        }
+    }
+
+    private Set<PatternDescription> doExpandMissingPatternDescriptions(Type selectorType,
+                                                                       Type targetType,
+                                                                       PatternDescription toExpand,
+                                                                       Set<? extends PatternDescription> basePatterns,
+                                                                       Set<PatternDescription> inMissingPatterns) {
+        if (toExpand instanceof BindingPattern bp) {
+            if (bp.type.tsym.isSealed()) {
+                //try to replace binding patterns for sealed types with all their immediate permitted applicable types:
+                List<Type> permitted = ((ClassSymbol) bp.type.tsym).getPermittedSubclasses();
+                Set<PatternDescription> applicableDirectPermittedPatterns =
+                        permitted.stream()
+                                 .map(type -> type.tsym)
+                                 .filter(isApplicableSubtypePredicate(targetType))
+                                 .map(csym -> new BindingPattern(types.erasure(csym.type)))
+                                 .collect(Collectors.toCollection(LinkedHashSet::new));
+
+                //remove the permitted subtypes that are not needed to achieve exhaustivity
+                boolean reduced =
+                        removeUnnecessaryPatterns(selectorType, bp, basePatterns, inMissingPatterns, applicableDirectPermittedPatterns);
+
+                if (!reduced && !hasMatchingRecordPattern(basePatterns, inMissingPatterns, toExpand)) {
+                    //if all immediate permitted subtypes are needed
+                    //give up, and simply use the current pattern:
+                    return inMissingPatterns;
+                }
+
+                Set<PatternDescription> currentMissingPatterns =
+                        replace(inMissingPatterns, toExpand, applicableDirectPermittedPatterns);
+
+                //try to recursively expand on each viable pattern:
+                for (PatternDescription viable : applicableDirectPermittedPatterns) {
+                    currentMissingPatterns = expandMissingPatternDescriptions(selectorType, targetType,
+                                                                              viable, basePatterns,
+                                                                              currentMissingPatterns);
+                }
+
+                return currentMissingPatterns;
+            } else if ((bp.type.tsym.flags_field & Flags.RECORD) != 0 &&
+                       //only expand record types into record patterns if there's a chance it may change the outcome
+                       //i.e. there is a record pattern in at the spot in the original base patterns:
+                       hasMatchingRecordPattern(basePatterns, inMissingPatterns, toExpand)) {
+                //if there is a binding pattern at a place where the original based patterns
+                //have a record pattern, try to expand the binding pattern into a record pattern
+                //create all possible combinations of record pattern components:
+                Type[] componentTypes = instantiatedComponentTypes(bp.type);
+                List<List<Type>> combinatorialNestedTypes = List.of(List.nil());
+
+                for (Type componentType : componentTypes) {
+                    List<Type> applicableLeafPermittedSubtypes;
+
+                    if (componentType.tsym.isSealed()) {
+                        applicableLeafPermittedSubtypes =
+                                leafPermittedSubTypes(componentType.tsym,
+                                                      isApplicableSubtypePredicate(componentType))
+                                    .stream()
+                                    .map(csym -> instantiatePatternType(componentType, csym))
+                                    .collect(List.collector());
+                    } else {
+                        applicableLeafPermittedSubtypes = List.of(componentType);
+                    }
+
+                    List<List<Type>> newCombinatorialNestedTypes = List.nil();
+
+                    for (List<Type> existing : combinatorialNestedTypes) {
+                        for (Type nue : applicableLeafPermittedSubtypes) {
+                            newCombinatorialNestedTypes = newCombinatorialNestedTypes.prepend(existing.append(nue));
+                        }
+                    }
+
+                    combinatorialNestedTypes = newCombinatorialNestedTypes;
+                }
+
+                Set<PatternDescription> combinatorialPatterns =
+                        combinatorialNestedTypes.stream()
+                                                .map(combination -> new RecordPattern(bp.type,
+                                                                                      componentTypes,
+                                                                                      combination.map(BindingPattern::new)
+                                                                                                 .toArray(PatternDescription[]::new)))
+                                                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+                removeUnnecessaryPatterns(selectorType, bp, basePatterns, inMissingPatterns, combinatorialPatterns);
+
+                CoverageResult coverageResult = computeCoverage(targetType, combinatorialPatterns, PatternEquivalence.LOOSE);
+
+                if (!coverageResult.covered()) {
+                    //use the partially merged/combined patterns:
+                    combinatorialPatterns = coverageResult.incompletePatterns();
+                }
+
+                //combine sealed subtypes into the supertype, if all is covered.
+                //but preserve more specific record types in positions where there are record patterns in the original patterns
+                //this is particularly important for the case where the sealed supertype only has one permitted type, the record
+                //the base type could be used instead of the record otherwise, which would produce less specific missing pattern:
+                Set<PatternDescription> sortedCandidates =
+                        partialSortPattern(combinatorialPatterns, basePatterns, replace(inMissingPatterns, toExpand, combinatorialPatterns));
+
+                removeUnnecessaryPatterns(selectorType, bp, basePatterns, inMissingPatterns, sortedCandidates);
+
+                Set<PatternDescription> currentMissingPatterns =
+                        replace(inMissingPatterns, toExpand, sortedCandidates);
+
+                for (PatternDescription addedPattern : sortedCandidates) {
+                    if (addedPattern instanceof RecordPattern addedRP) {
+                        for (int c = 0; c < addedRP.nested.length; c++) {
+                            currentMissingPatterns = expandMissingPatternDescriptions(selectorType,
+                                                                                      addedRP.fullComponentTypes[c],
+                                                                                      addedRP.nested[c],
+                                                                                      basePatterns,
+                                                                                      currentMissingPatterns);
+                        }
+                    }
+                }
+
+                return currentMissingPatterns;
+            }
+        }
+        return inMissingPatterns;
+    }
+
+    /*
+     * Inside any pattern in {@code in}, in any nesting depth, replace
+     * pattern {@code what} with patterns {@code to}.
+     */
+    private Set<PatternDescription> replace(Iterable<? extends PatternDescription> in,
+                                            PatternDescription what,
+                                            Collection<? extends PatternDescription> to) {
+        Set<PatternDescription> result = new HashSet<>();
+
+        for (PatternDescription pd : in) {
+            Collection<? extends PatternDescription> replaced = replace(pd, what, to);
+            if (replaced != null) {
+                result.addAll(replaced);
+            } else {
+                result.add(pd);
+            }
+        }
+
+        return result;
+    }
+    //where:
+        //null: no change
+        private Collection<? extends PatternDescription> replace(PatternDescription in,
+                                                                 PatternDescription what,
+                                                                 Collection<? extends PatternDescription> to) {
+            if (in == what) {
+                return to;
+            } else if (in instanceof RecordPattern rp) {
+                for (int c = 0; c < rp.nested.length; c++) {
+                    Collection<? extends PatternDescription> replaced = replace(rp.nested[c], what, to);
+                    if (replaced != null) {
+                        Set<PatternDescription> withReplaced = new HashSet<>();
+
+                        generatePatternsWithReplacedNestedPattern(rp, c, replaced, Set.of(), withReplaced::add);
+
+                        return replace(withReplaced, what, to);
+                    }
+                }
+                return null;
+            } else {
+                return null; //binding patterns have no children
+            }
+        }
+
+    /* Out of "candidates" remove patterns that are not necessary to achieve exhaustiveness.
+     * Note that iteration order of "candidates" is important - if the set contains
+     * two pattern, out of which either, but not both, is needed to achieve exhaustiveness,
+     * the first one in the iteration order will be removed.
+     */
+    private boolean removeUnnecessaryPatterns(Type selectorType,
+                                              PatternDescription toExpand,
+                                              Set<? extends PatternDescription> basePatterns,
+                                              Set<PatternDescription> inMissingPatterns,
+                                              Set<PatternDescription> candidates) {
+        boolean reduced = false;
+
+        for (Iterator<PatternDescription> it = candidates.iterator(); it.hasNext(); ) {
+            PatternDescription current = it.next();
+            Set<PatternDescription> reducedAdded = new HashSet<>(candidates);
+
+            reducedAdded.remove(current);
+
+            Set<PatternDescription> combinedPatterns =
+                    Stream.concat(basePatterns.stream(),
+                                  replace(inMissingPatterns, toExpand, reducedAdded).stream())
+                          .collect(Collectors.toSet());
+
+            if (computeCoverage(selectorType, combinedPatterns, PatternEquivalence.LOOSE).covered()) {
+                it.remove();
+                reduced = true;
+            }
+        }
+
+        return reduced;
+    }
+    /*
+     * Sort patterns so that those that are preferred for removal are in front
+     * of those that are preferred to remain (when there's a choice).
+     */
+    private SequencedSet<PatternDescription> partialSortPattern(Set<PatternDescription> candidates,
+                                                                Set<? extends PatternDescription> basePatterns,
+                                                                Set<PatternDescription> missingPatterns) {
+        SequencedSet<PatternDescription> sortedCandidates = new LinkedHashSet<>();
+
+        while (!candidates.isEmpty()) {
+            PatternDescription mostSpecific = null;
+            for (PatternDescription current : candidates) {
+                if (mostSpecific == null ||
+                    shouldAppearBefore(current, mostSpecific, basePatterns, missingPatterns)) {
+                    mostSpecific = current;
+                }
+            }
+            sortedCandidates.add(mostSpecific);
+            candidates.remove(mostSpecific);
+        }
+        return sortedCandidates;
+    }
+    //where:
+        //true iff pd1 should appear before pd2
+        //false otherwise
+        private boolean shouldAppearBefore(PatternDescription pd1,
+                                           PatternDescription pd2,
+                                           Set<? extends PatternDescription> basePatterns,
+                                           Set<? extends PatternDescription> missingPatterns) {
+            if (pd1 instanceof RecordPattern rp1 && pd2 instanceof RecordPattern rp2) {
+                for (int c = 0; c < rp1.nested.length; c++) {
+                    if (shouldAppearBefore((BindingPattern) rp1.nested[c],
+                                           (BindingPattern) rp2.nested[c],
+                                           basePatterns,
+                                           missingPatterns)) {
+                        return true;
+                    }
+                }
+            } else if (pd1 instanceof BindingPattern bp1 && pd2 instanceof BindingPattern bp2) {
+                Type t1 = bp1.type();
+                Type t2 = bp2.type();
+                boolean t1IsImportantRecord =
+                        (t1.tsym.flags_field & RECORD) != 0 &&
+                        hasMatchingRecordPattern(basePatterns, missingPatterns, bp1);
+                boolean t2IsImportantRecord =
+                        (t2.tsym.flags_field & RECORD) != 0 &&
+                        hasMatchingRecordPattern(basePatterns, missingPatterns, bp2);
+                if (t1IsImportantRecord && !t2IsImportantRecord) {
+                    return false;
+                }
+                if (!t1IsImportantRecord && t2IsImportantRecord) {
+                    return true;
+                }
+                if (!types.isSameType(t1, t2) && types.isSubtype(t1, t2)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+    /*
+     * Do the {@code basePatterns} have a record pattern at a place that corresponds to
+     * position of pattern {@code query} inside {@code missingPatterns}?
+     */
+    private boolean hasMatchingRecordPattern(Set<? extends PatternDescription> basePatterns,
+                                             Set<? extends PatternDescription> missingPatterns,
+                                             PatternDescription query) {
+        PatternDescription root = findRootContaining(missingPatterns, query);
+
+        if (root == null) {
+            return false;
+        }
+        return basePatternsHaveRecordPatternOnThisSpot(basePatterns, root, query);
+    }
+    //where:
+        private PatternDescription findRootContaining(Set<? extends PatternDescription> rootPatterns,
+                                                      PatternDescription added) {
+            for (PatternDescription pd : rootPatterns) {
+                if (isUnderRoot(pd, added)) {
+                    return pd;
+                }
+            }
+
+            return null;
+        }
+
+        private boolean basePatternsHaveRecordPatternOnThisSpot(Set<? extends PatternDescription> basePatterns,
+                                                                PatternDescription rootPattern,
+                                                                PatternDescription added) {
+            if (rootPattern == added) {
+                return basePatterns.stream().anyMatch(pd -> pd instanceof RecordPattern);
+            }
+            if (!(rootPattern instanceof RecordPattern rootPatternRecord)) {
+                return false;
+            }
+            int index = -1;
+            for (int c = 0; c < rootPatternRecord.nested.length; c++) {
+                if (isUnderRoot(rootPatternRecord.nested[c], added)) {
+                    index = c;
+                    break;
+                }
+            }
+            // 'index' must be one of rootPatternRecord.nested; if not, `isUnderRoot` is inconsistent.
+            Assert.check(index != (-1));
+
+            int indexFin = index;
+            Set<PatternDescription> filteredBasePatterns =
+                    basePatterns.stream()
+                                .filter(pd -> pd instanceof RecordPattern)
+                                .map(rp -> (RecordPattern) rp)
+                                .filter(rp -> types.isSameType(rp.recordType(), rootPatternRecord.recordType()))
+                                .map(rp -> rp.nested[indexFin])
+                                .collect(Collectors.toSet());
+
+            return basePatternsHaveRecordPatternOnThisSpot(filteredBasePatterns, rootPatternRecord.nested[index], added);
+        }
+
+        private boolean isUnderRoot(PatternDescription root, PatternDescription searchFor) {
+            if (root == searchFor) {
+                return true;
+            } else if (root instanceof RecordPattern rp) {
+                for (int c = 0; c < rp.nested.length; c++) {
+                    if (isUnderRoot(rp.nested[c], searchFor)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+    /*
+     * Using {@code basePattern} as a starting point, generate new {@code
+     * RecordPattern}s, such that all corresponding components but one, are the
+     * same. The component described by the {@code replaceComponent} index is
+     * replaced with all {@code PatternDescription}s taken from {@code
+     * updatedNestedPatterns} and the resulting {@code RecordPatterns}s are sent
+     * to {@code target}.
+     */
+    private void generatePatternsWithReplacedNestedPattern(RecordPattern basePattern,
+                                                           int replaceComponent,
+                                                           Iterable<? extends PatternDescription> updatedNestedPatterns,
+                                                           Set<PatternDescription> sourcePatterns,
+                                                           Consumer<RecordPattern> target) {
+        for (PatternDescription nested : updatedNestedPatterns) {
+            PatternDescription[] newNested =
+                    Arrays.copyOf(basePattern.nested, basePattern.nested.length);
+            newNested[replaceComponent] = nested;
+            target.accept(new RecordPattern(basePattern.recordType(),
+                                            basePattern.fullComponentTypes(),
+                                            newNested,
+                                            sourcePatterns));
+        }
+    }
+
+    /* For a given record type, return the record's component types, with their
+     * types instatiated according to the exact record type.
+     */
+    private Type[] instantiatedComponentTypes(Type recordType) {
+        Type[] componentTypes = ((ClassSymbol) recordType.tsym).getRecordComponents()
+                .map(r -> types.memberType(recordType, r))
+                .toArray(s -> new Type[s]);
+        return componentTypes;
+    }
+
+    /* The strictness of determining the equivalent of patterns, used in
+     * nestedComponentsEquivalent.
+     */
+    private enum PatternEquivalence {
+        STRICT,
+        LOOSE;
+    }
+
+    protected static class TooManyChecksException extends RuntimeException {
+        private static final long serialVersionUID = 0L;
+        private transient final Set<PatternDescription> missingPatterns;
+
+        public TooManyChecksException(Set<PatternDescription> missingPatterns) {
+            super(null, null, false, false);
+            this.missingPatterns = missingPatterns;
+        }
     }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index e74aed6a357..cbcb474a37f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,9 +50,15 @@ import static com.sun.tools.javac.code.Flags.BLOCK;
 import static com.sun.tools.javac.code.Kinds.Kind.*;
 import static com.sun.tools.javac.code.TypeTag.BOOLEAN;
 import static com.sun.tools.javac.code.TypeTag.VOID;
+import com.sun.tools.javac.comp.ExhaustivenessComputer.BindingPattern;
+import com.sun.tools.javac.comp.ExhaustivenessComputer.EnumConstantPattern;
+import com.sun.tools.javac.comp.ExhaustivenessComputer.ExhaustivenessResult;
+import com.sun.tools.javac.comp.ExhaustivenessComputer.PatternDescription;
+import com.sun.tools.javac.comp.ExhaustivenessComputer.RecordPattern;
 import com.sun.tools.javac.resources.CompilerProperties.Fragments;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import com.sun.tools.javac.util.JCDiagnostic.Fragment;
+import java.util.Arrays;
 
 /** This pass implements dataflow analysis for Java programs though
  *  different AST visitor steps. Liveness analysis (see AliveAnalyzer) checks that
@@ -696,9 +702,18 @@ public class Flow {
             tree.isExhaustive = tree.hasUnconditionalPattern ||
                                 TreeInfo.isErrorEnumSwitch(tree.selector, tree.cases);
             if (exhaustiveSwitch) {
-                tree.isExhaustive |= exhaustiveness.exhausts(tree.selector, tree.cases);
                 if (!tree.isExhaustive) {
-                    log.error(tree, Errors.NotExhaustiveStatement);
+                    ExhaustivenessResult exhaustivenessResult = exhaustiveness.exhausts(tree.selector, tree.cases);
+
+                    tree.isExhaustive = exhaustivenessResult.exhaustive();
+
+                    if (!tree.isExhaustive) {
+                        if (exhaustivenessResult.notExhaustiveDetails().isEmpty()) {
+                            log.error(tree, Errors.NotExhaustiveStatement);
+                        } else {
+                            logNotExhaustiveError(tree.pos(), exhaustivenessResult, Errors.NotExhaustiveStatementDetails);
+                        }
+                    }
                 }
             }
             if (!tree.hasUnconditionalPattern && !exhaustiveSwitch) {
@@ -735,16 +750,54 @@ public class Flow {
                 TreeInfo.isErrorEnumSwitch(tree.selector, tree.cases)) {
                 tree.isExhaustive = true;
             } else {
-                tree.isExhaustive = exhaustiveness.exhausts(tree.selector, tree.cases);
+                ExhaustivenessResult exhaustivenessResult = exhaustiveness.exhausts(tree.selector, tree.cases);
+
+                tree.isExhaustive = exhaustivenessResult.exhaustive();
+
+                if (!tree.isExhaustive) {
+                    if (exhaustivenessResult.notExhaustiveDetails().isEmpty()) {
+                        log.error(tree, Errors.NotExhaustive);
+                    } else {
+                        logNotExhaustiveError(tree.pos(), exhaustivenessResult, Errors.NotExhaustiveDetails);
+                    }
+                }
             }
 
-            if (!tree.isExhaustive) {
-                log.error(tree, Errors.NotExhaustive);
-            }
             alive = prevAlive;
             alive = alive.or(resolveYields(tree, prevPendingExits));
         }
 
+        private void logNotExhaustiveError(DiagnosticPosition pos,
+                                           ExhaustivenessResult exhaustivenessResult,
+                                           Error errorKey) {
+            List<JCDiagnostic> details =
+                    exhaustivenessResult.notExhaustiveDetails()
+                                       .stream()
+                                       .map(this::patternToDiagnostic)
+                                       .sorted((d1, d2) -> d1.toString()
+                                                             .compareTo(d2.toString()))
+                                       .collect(List.collector());
+            JCDiagnostic main = diags.error(null, log.currentSource(), pos, errorKey);
+            JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, details);
+            log.report(d);
+        }
+
+        private JCDiagnostic patternToDiagnostic(PatternDescription desc) {
+            Type patternType = types.erasure(desc.type());
+            return diags.fragment(switch (desc) {
+                case BindingPattern _ ->
+                    Fragments.BindingPattern(patternType);
+                case RecordPattern rp ->
+                    Fragments.RecordPattern(patternType,
+                                            Arrays.stream(rp.nested())
+                                                  .map(this::patternToDiagnostic)
+                                                  .toList());
+                case EnumConstantPattern ep ->
+                    Fragments.EnumConstantPattern(patternType,
+                                                  ep.enumConstant());
+            });
+        }
+
         public void visitTry(JCTry tree) {
             ListBuffer<PendingExit> prevPendingExits = pendingExits;
             pendingExits = new ListBuffer<>();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 22cb796870b..40628709dfe 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -142,6 +142,9 @@ public class LambdaToMethod extends TreeTranslator {
     /** dump statistics about lambda code generation */
     private final boolean dumpLambdaToMethodStats;
 
+    /** dump statistics about lambda deserialization code generation */
+    private final boolean dumpLambdaDeserializationStats;
+
     /** force serializable representation, for stress testing **/
     private final boolean forceSerializable;
 
@@ -187,6 +190,7 @@ public class LambdaToMethod extends TreeTranslator {
         transTypes = TransTypes.instance(context);
         Options options = Options.instance(context);
         dumpLambdaToMethodStats = options.isSet("debug.dumpLambdaToMethodStats");
+        dumpLambdaDeserializationStats = options.isSet("debug.dumpLambdaDeserializationStats");
         attr = Attr.instance(context);
         forceSerializable = options.isSet("forceSerializable");
         boolean lineDebugInfo =
@@ -697,25 +701,28 @@ public class LambdaToMethod extends TreeTranslator {
                 rs.resolveConstructor(null, attrEnv, ctype, TreeInfo.types(args), List.nil()));
     }
 
-    private void addDeserializationCase(MethodHandleSymbol refSym, Type targetType, MethodSymbol samSym,
+    private void addDeserializationCase(MethodHandleSymbol refSym, Type targetType, MethodSymbol samSym, Type samType,
                                         DiagnosticPosition pos, List<LoadableConstant> staticArgs, MethodType indyType) {
         String functionalInterfaceClass = classSig(targetType);
         String functionalInterfaceMethodName = samSym.getSimpleName().toString();
         String functionalInterfaceMethodSignature = typeSig(types.erasure(samSym.type));
-        Symbol baseMethod = refSym.baseSymbol();
-        Symbol origMethod = baseMethod.baseSymbol();
-        if (baseMethod != origMethod && origMethod.owner == syms.objectType.tsym) {
-            //the implementation method is a java.lang.Object method transferred to an
-            //interface that does not declare it. Runtime will refer to this method as to
-            //a java.lang.Object method, so do the same:
-            refSym = ((MethodSymbol) origMethod).asHandle();
+        if (refSym.enclClass().isInterface()) {
+            Symbol baseMethod = types.overriddenObjectMethod(refSym.enclClass(), refSym);
+            if (baseMethod != null) {
+                // The implementation method is a java.lang.Object method, runtime will resolve this method to
+                // a java.lang.Object method, so do the same.
+                // This case can be removed if JDK-8172817 is fixed.
+                refSym = ((MethodSymbol) baseMethod).asHandle();
+            }
         }
         String implClass = classSig(types.erasure(refSym.owner.type));
         String implMethodName = refSym.getQualifiedName().toString();
         String implMethodSignature = typeSig(types.erasure(refSym.type));
+        String instantiatedMethodType = typeSig(types.erasure(samType));
 
+        int implMethodKind = refSym.referenceKind();
         JCExpression kindTest = eqTest(syms.intType, deserGetter("getImplMethodKind", syms.intType),
-                make.Literal(refSym.referenceKind()));
+                make.Literal(implMethodKind));
         ListBuffer<JCExpression> serArgs = new ListBuffer<>();
         int i = 0;
         for (Type t : indyType.getParameterTypes()) {
@@ -725,13 +732,14 @@ public class LambdaToMethod extends TreeTranslator {
             ++i;
         }
         JCStatement stmt = make.If(
-                deserTest(deserTest(deserTest(deserTest(deserTest(
-                                                        kindTest,
-                                                        "getFunctionalInterfaceClass", functionalInterfaceClass),
-                                                "getFunctionalInterfaceMethodName", functionalInterfaceMethodName),
-                                        "getFunctionalInterfaceMethodSignature", functionalInterfaceMethodSignature),
-                                "getImplClass", implClass),
-                        "getImplMethodSignature", implMethodSignature),
+                deserTest(deserTest(deserTest(deserTest(deserTest(deserTest(
+                                                                kindTest,
+                                                                "getFunctionalInterfaceClass", functionalInterfaceClass),
+                                                        "getFunctionalInterfaceMethodName", functionalInterfaceMethodName),
+                                                "getFunctionalInterfaceMethodSignature", functionalInterfaceMethodSignature),
+                                        "getImplClass", implClass),
+                                "getImplMethodSignature", implMethodSignature),
+                        "getInstantiatedMethodType", instantiatedMethodType),
                 make.Return(makeIndyCall(
                         pos,
                         syms.lambdaMetafactory,
@@ -743,16 +751,17 @@ public class LambdaToMethod extends TreeTranslator {
             stmts = new ListBuffer<>();
             kInfo.deserializeCases.put(implMethodName, stmts);
         }
-        /* **
-        System.err.printf("+++++++++++++++++\n");
-        System.err.printf("*functionalInterfaceClass: '%s'\n", functionalInterfaceClass);
-        System.err.printf("*functionalInterfaceMethodName: '%s'\n", functionalInterfaceMethodName);
-        System.err.printf("*functionalInterfaceMethodSignature: '%s'\n", functionalInterfaceMethodSignature);
-        System.err.printf("*implMethodKind: %d\n", implMethodKind);
-        System.err.printf("*implClass: '%s'\n", implClass);
-        System.err.printf("*implMethodName: '%s'\n", implMethodName);
-        System.err.printf("*implMethodSignature: '%s'\n", implMethodSignature);
-        ****/
+        if (dumpLambdaDeserializationStats) {
+            log.note(pos, Notes.LambdaDeserializationStat(
+                    functionalInterfaceClass,
+                    functionalInterfaceMethodName,
+                    functionalInterfaceMethodSignature,
+                    implMethodKind,
+                    implClass,
+                    implMethodName,
+                    implMethodSignature,
+                    instantiatedMethodType));
+        }
         stmts.append(stmt);
     }
 
@@ -813,10 +822,11 @@ public class LambdaToMethod extends TreeTranslator {
                                                  List<JCExpression> indy_args) {
         //determine the static bsm args
         MethodSymbol samSym = (MethodSymbol) types.findDescriptorSymbol(tree.target.tsym);
+        MethodType samType = typeToMethodType(tree.getDescriptorType(types));
         List<LoadableConstant> staticArgs = List.of(
                 typeToMethodType(samSym.type),
                 refSym.asHandle(),
-                typeToMethodType(tree.getDescriptorType(types)));
+                samType);
 
         //computed indy arg types
         ListBuffer<Type> indy_args_types = new ListBuffer<>();
@@ -880,7 +890,7 @@ public class LambdaToMethod extends TreeTranslator {
                 int prevPos = make.pos;
                 try {
                     make.at(kInfo.clazz);
-                    addDeserializationCase(refSym, tree.type, samSym,
+                    addDeserializationCase(refSym, tree.type, samSym, samType,
                             tree, staticArgs, indyType);
                 } finally {
                     make.at(prevPos);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 2db3435a382..be603ffc9ca 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -48,7 +48,6 @@ import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.code.Type.*;
 
 import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.tree.EndPosTable;
 
 import static com.sun.tools.javac.code.Flags.*;
 import static com.sun.tools.javac.code.Flags.BLOCK;
@@ -156,10 +155,6 @@ public class Lower extends TreeTranslator {
      */
     Env<AttrContext> attrEnv;
 
-    /** A hash table mapping syntax trees to their ending source positions.
-     */
-    EndPosTable endPosTable;
-
 /* ************************************************************************
  * Global mappings
  *************************************************************************/
@@ -2059,8 +2054,8 @@ public class Lower extends TreeTranslator {
         } else {
             make_at(tree.pos());
             T result = super.translate(tree);
-            if (endPosTable != null && result != tree) {
-                endPosTable.replaceTree(tree, result);
+            if (result != null && result != tree) {
+                result.endpos = tree.endpos;
             }
             return result;
         }
@@ -3697,11 +3692,12 @@ public class Lower extends TreeTranslator {
             if (tree.var.type.isPrimitive())
                 vardefinit = make.TypeCast(types.cvarUpperBound(iteratorTarget), vardefinit);
             else
-                vardefinit = make.TypeCast(tree.var.type, vardefinit);
+                vardefinit = transTypes.coerce(attrEnv, vardefinit, tree.var.type);
             JCVariableDecl indexDef = (JCVariableDecl)make.VarDef(tree.var.mods,
                                                   tree.var.name,
                                                   tree.var.vartype,
-                                                  vardefinit).setType(tree.var.type);
+                                                  vardefinit,
+                                                  tree.var.declKind).setType(tree.var.type);
             indexDef.sym = tree.var.sym;
             JCBlock body = make.Block(0, List.of(indexDef, tree.body));
             body.bracePos = TreeInfo.endPos(tree.body);
@@ -4352,7 +4348,6 @@ public class Lower extends TreeTranslator {
         try {
             attrEnv = env;
             this.make = make;
-            endPosTable = env.toplevel.endPositions;
             currentClass = null;
             currentRestype = null;
             currentMethodDef = null;
@@ -4382,7 +4377,6 @@ public class Lower extends TreeTranslator {
             // note that recursive invocations of this method fail hard
             attrEnv = null;
             this.make = null;
-            endPosTable = null;
             currentClass = null;
             currentRestype = null;
             currentMethodDef = null;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index d63ba1677d6..cb0e6d4676b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ public class MemberEnter extends JCTree.Visitor {
         ListBuffer<Type> argbuf = new ListBuffer<>();
         for (List<JCVariableDecl> l = params; l.nonEmpty(); l = l.tail) {
             memberEnter(l.head, env);
-            argbuf.append(l.head.vartype.type);
+            argbuf.append(l.head.sym.type);
         }
 
         // Attribute result type, if one is given.
@@ -276,12 +276,16 @@ public class MemberEnter extends JCTree.Visitor {
             tree.vartype.type = atype.makeVarargs();
         }
         WriteableScope enclScope = enter.enterScope(env);
-        Type vartype = tree.isImplicitlyTyped()
-                ? env.info.scope.owner.kind == MTH ? Type.noType : syms.errType
-                : tree.vartype.type;
+        Type vartype = switch (tree.declKind) {
+            case IMPLICIT -> tree.type;
+            case EXPLICIT -> tree.vartype.type;
+            case VAR -> tree.type != null ? tree.type
+                                          : env.info.scope.owner.kind == MTH ? Type.noType
+                                                                             : syms.errType;
+        };
         Name name = tree.name;
         VarSymbol v = new VarSymbol(0, name, vartype, enclScope.owner);
-        v.flags_field = chk.checkFlags(tree.mods.flags, v, tree);
+        v.flags_field = chk.checkFlags(tree.mods.flags | tree.declKind.additionalSymbolFlags, v, tree);
         tree.sym = v;
         if (tree.init != null) {
             v.flags_field |= HASINIT;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
index bbc12f1fe80..4890b749a90 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TreeDiffer.java
@@ -93,6 +93,7 @@ import com.sun.tools.javac.tree.JCTree.JCTypeParameter;
 import com.sun.tools.javac.tree.JCTree.JCTypeUnion;
 import com.sun.tools.javac.tree.JCTree.JCUnary;
 import com.sun.tools.javac.tree.JCTree.JCUses;
+import com.sun.tools.javac.tree.JCTree.JCVarType;
 import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
 import com.sun.tools.javac.tree.JCTree.JCWhileLoop;
 import com.sun.tools.javac.tree.JCTree.JCWildcard;
@@ -631,6 +632,11 @@ public class TreeDiffer extends TreeScanner {
         result = tree.typetag == that.typetag;
     }
 
+    @Override
+    public void visitVarType(JCVarType tree) {
+        result = true;
+    }
+
     @Override
     public void visitTypeIntersection(JCTypeIntersection tree) {
         JCTypeIntersection that = (JCTypeIntersection) parameter;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java
index 2cd4142c748..3092d16469d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java
@@ -32,7 +32,6 @@ import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.tree.JCTree.*;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.JCSwitchExpression;
 
 /** This class contains the CharacterRangeTable for some method
@@ -57,10 +56,6 @@ implements CRTFlags {
      */
     private Map<Object,SourceRange> positions = new HashMap<>();
 
-    /** The object for ending positions stored in the parser.
-     */
-    private EndPosTable endPosTable;
-
     /** The tree of the method this table is intended for.
      *  We should traverse this tree to get source ranges.
      */
@@ -68,9 +63,8 @@ implements CRTFlags {
 
     /** Constructor
      */
-    public CRTable(JCTree.JCMethodDecl tree, EndPosTable endPosTable) {
+    public CRTable(JCTree.JCMethodDecl tree) {
         this.methodTree = tree;
-        this.endPosTable = endPosTable;
     }
 
     /** Create a new CRTEntry and add it to the entries.
@@ -584,7 +578,7 @@ implements CRTFlags {
          */
         public int endPos(JCTree tree) {
             if (tree == null) return Position.NOPOS;
-            return TreeInfo.getEndPos(tree, endPosTable);
+            return TreeInfo.getEndPos(tree);
         }
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
index e40a2fbfcea..688ea1bd720 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
@@ -45,7 +45,6 @@ import com.sun.tools.javac.code.Type.*;
 import com.sun.tools.javac.jvm.Code.*;
 import com.sun.tools.javac.jvm.Items.*;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.*;
 
 import static com.sun.tools.javac.code.Flags.*;
@@ -162,11 +161,6 @@ public class Gen extends JCTree.Visitor {
      */
     private int nerrs = 0;
 
-    /** An object containing mappings of syntax trees to their
-     *  ending source positions.
-     */
-    EndPosTable endPosTable;
-
     boolean inCondSwitchExpression;
     Chain switchExpressionTrueChain;
     Chain switchExpressionFalseChain;
@@ -455,7 +449,7 @@ public class Gen extends JCTree.Visitor {
                         JCStatement init = make.at(vdef.pos()).
                             Assignment(sym, vdef.init);
                         initCode.append(init);
-                        endPosTable.replaceTree(vdef, init);
+                        init.endpos = vdef.endpos;
                         initTAs.addAll(getAndRemoveNonFieldTAs(sym));
                     } else if (sym.getConstValue() == null) {
                         // Initialize class (static) variables only if
@@ -463,7 +457,7 @@ public class Gen extends JCTree.Visitor {
                         JCStatement init = make.at(vdef.pos).
                             Assignment(sym, vdef.init);
                         clinitCode.append(init);
-                        endPosTable.replaceTree(vdef, init);
+                        init.endpos = vdef.endpos;
                         clinitTAs.addAll(getAndRemoveNonFieldTAs(sym));
                     } else {
                         checkStringConstant(vdef.init.pos(), sym.getConstValue());
@@ -1027,8 +1021,7 @@ public class Gen extends JCTree.Visitor {
                                         varDebugInfo,
                                         stackMap,
                                         debugCode,
-                                        genCrt ? new CRTable(tree, env.toplevel.endPositions)
-                                               : null,
+                                        genCrt ? new CRTable(tree) : null,
                                         syms,
                                         types,
                                         poolWriter);
@@ -2478,7 +2471,6 @@ public class Gen extends JCTree.Visitor {
             attrEnv = env;
             ClassSymbol c = cdef.sym;
             this.toplevel = env.toplevel;
-            this.endPosTable = toplevel.endPositions;
             /* method normalizeDefs() can add references to external classes into the constant pool
              */
             cdef.defs = normalizeDefs(cdef.defs, c);
@@ -2508,7 +2500,6 @@ public class Gen extends JCTree.Visitor {
             attrEnv = null;
             this.env = null;
             toplevel = null;
-            endPosTable = null;
             nerrs = 0;
             qualifiedSymbolCache.clear();
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
index af7d79d4195..e8ab1b9349c 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,17 +181,17 @@ public final class SourceLauncher {
         ProgramDescriptor program = context.getProgramDescriptor();
 
         // 1. Find a main method in the first class and if there is one - invoke it
-        Class<?> firstClass;
+        Class<?> mainClass;
         String firstClassName = program.qualifiedTypeNames().getFirst();
         ClassLoader loader = context.newClassLoaderFor(parentLoader, firstClassName);
         Thread.currentThread().setContextClassLoader(loader);
         try {
-            firstClass = Class.forName(firstClassName, false, loader);
+            mainClass = Class.forName(firstClassName, false, loader);
         } catch (ClassNotFoundException e) {
             throw new Fault(Errors.CantFindClass(firstClassName));
         }
 
-        Method mainMethod = MethodFinder.findMainMethod(firstClass);
+        Method mainMethod = MethodFinder.findMainMethod(mainClass);
         if (mainMethod == null) {
             // 2. If the first class doesn't have a main method, look for a class with a matching name
             var compilationUnitName = program.fileObject().getFile().getFileName().toString();
@@ -206,22 +206,18 @@ public final class SourceLauncher {
                     .findFirst()
                     .orElseThrow(() -> new Fault(Errors.CantFindClass(expectedName)));
 
-            Class<?> actualClass;
             try {
-                actualClass = Class.forName(actualName, false, firstClass.getClassLoader());
+                mainClass = Class.forName(actualName, false, mainClass.getClassLoader());
             } catch (ClassNotFoundException ignore) {
                 throw new Fault(Errors.CantFindClass(actualName));
             }
-            mainMethod = MethodFinder.findMainMethod(actualClass);
+            mainMethod = MethodFinder.findMainMethod(mainClass);
             if (mainMethod == null) {
                 throw new Fault(Errors.CantFindMainMethod(actualName));
             }
         }
 
-        // selected main method instance points back to its declaring class
-        Class<?> mainClass = mainMethod.getDeclaringClass();
         String mainClassName = mainClass.getName();
-
         var isStatic = Modifier.isStatic(mainMethod.getModifiers());
 
         Object instance = null;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 2469dc9e031..94292d9a348 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -438,8 +438,6 @@ public class JavaCompiler {
         sourceOutput  = options.isSet(PRINTSOURCE); // used to be -s
         lineDebugInfo = options.isUnset(G_CUSTOM) ||
                         options.isSet(G_CUSTOM, "lines");
-        genEndPos     = options.isSet(XJCOV) ||
-                        context.get(DiagnosticListener.class) != null;
         devVerbose    = options.isSet("dev");
         processPcks   = options.isSet("process.packages");
         werrorAny     = options.isSet(WERROR) || options.isSet(WERROR_CUSTOM, Option.LINT_CUSTOM_ALL);
@@ -504,10 +502,6 @@ public class JavaCompiler {
      */
     public boolean lineDebugInfo;
 
-    /** Switch: should we store the ending positions?
-     */
-    public boolean genEndPos;
-
     /** Switch: should we debug ignored exceptions
      */
     protected boolean devVerbose;
@@ -655,9 +649,8 @@ public class JavaCompiler {
                 TaskEvent e = new TaskEvent(TaskEvent.Kind.PARSE, filename);
                 taskListener.started(e);
                 keepComments = true;
-                genEndPos = true;
             }
-            Parser parser = parserFactory.newParser(content, keepComments(), genEndPos,
+            Parser parser = parserFactory.newParser(content, keepComments(),
                                 lineDebugInfo, filename.isNameCompatible("module-info", Kind.SOURCE));
             tree = parser.parseCompilationUnit();
             if (verbose) {
@@ -697,10 +690,7 @@ public class JavaCompiler {
     public JCTree.JCCompilationUnit parse(JavaFileObject filename) {
         JavaFileObject prev = log.useSource(filename);
         try {
-            JCTree.JCCompilationUnit t = parse(filename, readSource(filename));
-            if (t.endPositions != null)
-                log.setEndPosTable(filename, t.endPositions);
-            return t;
+            return parse(filename, readSource(filename));
         } finally {
             log.useSource(prev);
         }
@@ -1162,7 +1152,6 @@ public class JavaCompiler {
                 options.put("parameters", "parameters");
                 reader.saveParameterNames = true;
                 keepComments = true;
-                genEndPos = true;
                 if (!taskListener.isEmpty())
                     taskListener.started(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING));
                 deferredDiagnosticHandler = log.new DeferredDiagnosticHandler();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index f40cb0fb6b7..babe372e7dc 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -33,7 +33,6 @@ import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.resources.CompilerProperties.LintWarnings;
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.*;
 
@@ -1215,7 +1214,7 @@ public class JavaTokenizer extends UnicodeReader {
             this.cs = cs;
             this.pos = new SimpleDiagnosticPosition(pos) {
                 @Override
-                public int getEndPosition(EndPosTable endPosTable) {
+                public int getEndPosition() {
                     return endPos;
                 }
             };
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index d3539b53541..df5da5cb954 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,8 +110,7 @@ public class JavacParser implements Parser {
     /** The name table. */
     private Names names;
 
-    /** End position mappings container */
-    protected final AbstractEndPosTable endPosTable;
+    protected int errorEndPos = Position.NOPOS;
 
     /** A map associating "other nearby documentation comments"
      *  with the preferred documentation comment for a declaration. */
@@ -167,9 +166,8 @@ public class JavacParser implements Parser {
     protected JavacParser(ParserFactory fac,
                           Lexer S,
                           boolean keepDocComments,
-                          boolean keepLineMap,
-                          boolean keepEndPositions) {
-        this(fac, S, keepDocComments, keepLineMap, keepEndPositions, false);
+                          boolean keepLineMap) {
+        this(fac, S, keepDocComments, keepLineMap, false);
 
     }
     /** Construct a parser from a given scanner, tree factory and log.
@@ -179,7 +177,6 @@ public class JavacParser implements Parser {
                      Lexer S,
                      boolean keepDocComments,
                      boolean keepLineMap,
-                     boolean keepEndPositions,
                      boolean parseModuleInfo) {
         this.S = S;
         nextToken(); // prime the pump
@@ -194,7 +191,6 @@ public class JavacParser implements Parser {
         this.docComments = newDocCommentTable(keepDocComments, fac);
         this.keepLineMap = keepLineMap;
         this.errorTree = F.Erroneous();
-        this.endPosTable = newEndPosTable(keepEndPositions);
         this.allowYieldStatement = Feature.SWITCH_EXPRESSION.allowedInSource(source);
         this.allowRecords = Feature.RECORDS.allowedInSource(source);
         this.allowSealedTypes = Feature.SEALED_CLASSES.allowedInSource(source);
@@ -218,19 +214,12 @@ public class JavacParser implements Parser {
         this.parseModuleInfo = false;
         this.docComments = parser.docComments;
         this.errorTree = F.Erroneous();
-        this.endPosTable = newEndPosTable(false);
         this.allowYieldStatement = Feature.SWITCH_EXPRESSION.allowedInSource(source);
         this.allowRecords = Feature.RECORDS.allowedInSource(source);
         this.allowSealedTypes = Feature.SEALED_CLASSES.allowedInSource(source);
         updateUnexpectedTopLevelDefinitionStartError(false);
     }
 
-    protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
-        return  keepEndPositions
-                ? new SimpleEndPosTable()
-                : new MinimalEndPosTable();
-    }
-
     protected DocCommentTable newDocCommentTable(boolean keepDocComments, ParserFactory fac) {
         return keepDocComments ? new LazyDocCommentTable(fac) : null;
     }
@@ -271,16 +260,11 @@ public class JavacParser implements Parser {
     /** When terms are parsed, the mode determines which is expected:
      *     mode = EXPR        : an expression
      *     mode = TYPE        : a type
-     *     mode = NOPARAMS    : no parameters allowed for type
-     *     mode = TYPEARG     : type argument
-     *     mode |= NOLAMBDA   : lambdas are not allowed
+     *     mode = NOLAMBDA    : lambdas are not allowed
      */
     protected static final int EXPR          = 1 << 0;
     protected static final int TYPE          = 1 << 1;
-    protected static final int NOPARAMS      = 1 << 2;
-    protected static final int TYPEARG       = 1 << 3;
-    protected static final int DIAMOND       = 1 << 4;
-    protected static final int NOLAMBDA      = 1 << 5;
+    protected static final int NOLAMBDA      = 1 << 2;
 
     protected void setMode(int mode) {
         this.mode = mode;
@@ -672,7 +656,7 @@ public class JavacParser implements Parser {
         var src = log.currentSource();
         return c.getStyle() == Comment.CommentStyle.JAVADOC_LINE &&
                 c.getPos().getStartPosition() == 0 &&
-                src.getLineNumber(pos.getEndPosition(src.getEndPosTable())) == 1;
+                src.getLineNumber(pos.getEndPosition()) == 1;
     }
 
     /**
@@ -686,23 +670,26 @@ public class JavacParser implements Parser {
 /* -------- source positions ------- */
 
     protected void setErrorEndPos(int errPos) {
-        endPosTable.setErrorEndPos(errPos);
+        if (errPos > errorEndPos) {
+            errorEndPos = errPos;
+        }
     }
 
     /**
      * Store ending position for a tree, the value of which is the greater of
-     * last error position in {@link #endPosTable} and the given ending position.
+     * {@link #errorEndPos} and the given ending position.
      * @param tree tree node
      * @param endpos the ending position to associate with {@code tree}
      * @return {@code tree}
      */
     protected <T extends JCTree> T storeEnd(T tree, int endpos) {
-        return endPosTable.storeEnd(tree, endpos);
+        tree.endpos = Math.max(endpos, errorEndPos);
+        return tree;
     }
 
     /**
      * Store current token's ending position for a tree, the value of which
-     * will be the greater of last error position in {@link #endPosTable}
+     * will be the greater of {@link #errorEndPos}
      * and the ending position of the current token.
      * @param tree tree node
      */
@@ -712,7 +699,7 @@ public class JavacParser implements Parser {
 
     /**
      * Store current token's ending position for a tree, the value of which
-     * will be the greater of last error position in {@link #endPosTable}
+     * will be the greater of {@link #errorEndPos}
      * and the ending position of the previous token.
      * @param tree tree node
      */
@@ -738,7 +725,7 @@ public class JavacParser implements Parser {
      * @param tree  The tree node
      */
     public int getEndPos(JCTree tree) {
-        return endPosTable.getEndPos(tree);
+        return tree.endpos;
     }
 
 
@@ -990,13 +977,11 @@ public class JavacParser implements Parser {
             pattern = toP(F.at(token.pos).AnyPattern());
         }
         else {
-            int varTypePos = Position.NOPOS;
             if (parsedType == null) {
                 boolean var = token.kind == IDENTIFIER && token.name() == names.var;
                 e = unannotatedType(allowVar, TYPE | NOLAMBDA);
                 if (var) {
-                    varTypePos = e.pos;
-                    e = null;
+                    e = replaceTypeWithVar(e);
                 }
             } else {
                 e = parsedType;
@@ -1034,12 +1019,9 @@ public class JavacParser implements Parser {
                     name = names.empty;
                 }
                 JCVariableDecl var = toP(F.at(varPos).VarDef(mods, name, e, null,
-                  varTypePos != Position.NOPOS ? JCVariableDecl.DeclKind.VAR : JCVariableDecl.DeclKind.EXPLICIT,
-                  varTypePos));
-                if (e == null) {
-                    if (var.name == names.underscore && !allowVar) {
-                        log.error(DiagnosticFlag.SYNTAX, varPos, Errors.UseOfUnderscoreNotAllowed);
-                    }
+                  e.hasTag(VARTYPE) ? JCVariableDecl.DeclKind.VAR : JCVariableDecl.DeclKind.EXPLICIT));
+                if (var.name == names.underscore && !allowVar) {
+                    log.error(DiagnosticFlag.SYNTAX, varPos, Errors.UseOfUnderscoreNotAllowed);
                 }
                 pattern = toP(F.at(pos).BindingPattern(var));
             }
@@ -1274,7 +1256,7 @@ public class JavacParser implements Parser {
                                             JCAnnotation typeAnno = F.at(decl.pos)
                                                                      .TypeAnnotation(decl.annotationType,
                                                                                       decl.args);
-                                            endPosTable.replaceTree(decl, typeAnno);
+                                            typeAnno.endpos = decl.endpos;
                                             return typeAnno;
                                         });
                             type = insertAnnotationsToMostInner(type, typeAnnos, false);
@@ -1363,7 +1345,7 @@ public class JavacParser implements Parser {
             } else {
                 JCExpression t = F.at(litBuf.first().getStartPosition()).Literal(TypeTag.CLASS,
                         litBuf.stream().map(lit -> (String)lit.getValue()).collect(Collectors.joining()));
-                storeEnd(t, litBuf.last().getEndPosition(endPosTable));
+                storeEnd(t, litBuf.last().getEndPosition());
                 opStack.prepend(t);
                 return true;
             }
@@ -1439,12 +1421,6 @@ public class JavacParser implements Parser {
         int startMode = mode;
         List<JCExpression> typeArgs = typeArgumentsOpt(EXPR);
         switch (token.kind) {
-        case QUES:
-            if (isMode(TYPE) && isMode(TYPEARG) && !isMode(NOPARAMS)) {
-                selectTypeMode();
-                return typeArgument();
-            } else
-                return illegal();
         case PLUSPLUS: case SUBSUB: case BANG: case TILDE: case PLUS: case SUB:
             if (typeArgs == null && isMode(EXPR)) {
                 TokenKind tk = token.kind;
@@ -1522,7 +1498,7 @@ public class JavacParser implements Parser {
             if (isMode(EXPR)) {
                 selectExprMode();
                 nextToken();
-                if (token.kind == LT) typeArgs = typeArguments(false);
+                if (token.kind == LT) typeArgs = typeArguments();
                 t = creator(pos, typeArgs);
                 typeArgs = null;
             } else return illegal();
@@ -1625,7 +1601,6 @@ public class JavacParser implements Parser {
                             return illegal();
                         }
                         int prevmode = mode;
-                        setMode(mode & ~NOPARAMS);
                         typeArgs = typeArgumentsOpt(EXPR);
                         setMode(prevmode);
                         if (isMode(EXPR)) {
@@ -1653,7 +1628,7 @@ public class JavacParser implements Parser {
                                 selectExprMode();
                                 int pos1 = token.pos;
                                 nextToken();
-                                if (token.kind == LT) typeArgs = typeArguments(false);
+                                if (token.kind == LT) typeArgs = typeArguments();
                                 t = innerCreator(pos1, typeArgs, t);
                                 typeArgs = null;
                                 break loop;
@@ -1666,7 +1641,7 @@ public class JavacParser implements Parser {
                         }
                         // typeArgs saved for next loop iteration.
                         t = toP(F.at(pos).Select(t, ident()));
-                        if (token.pos <= endPosTable.errorEndPos &&
+                        if (token.pos <= errorEndPos &&
                             token.kind == MONKEYS_AT) {
                             //error recovery, case like:
                             //int i = expr.<missing-ident>
@@ -1704,7 +1679,7 @@ public class JavacParser implements Parser {
                                 nextToken();
                                 selectTypeMode();
                                 t = toP(F.at(token.pos).Select(t, ident()));
-                                t = typeArgumentsOpt(t);
+                                t = typeApplyOpt(t);
                             }
                             t = bracketsOpt(t);
                             if (token.kind != COLCOL) {
@@ -1721,7 +1696,7 @@ public class JavacParser implements Parser {
                 }
             }
             if (typeArgs != null) illegal();
-            t = typeArgumentsOpt(t);
+            t = typeApplyOpt(t);
             break;
         case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT:
         case DOUBLE: case BOOLEAN:
@@ -1880,7 +1855,7 @@ public class JavacParser implements Parser {
                     selectExprMode();
                     int pos2 = token.pos;
                     nextToken();
-                    if (token.kind == LT) typeArgs = typeArguments(false);
+                    if (token.kind == LT) typeArgs = typeArguments();
                     t = innerCreator(pos2, typeArgs, t);
                     typeArgs = null;
                 } else {
@@ -1890,7 +1865,7 @@ public class JavacParser implements Parser {
                         tyannos = typeAnnotationsOpt();
                     }
                     t = toP(F.at(pos1).Select(t, ident(true)));
-                    if (token.pos <= endPosTable.errorEndPos &&
+                    if (token.pos <= errorEndPos &&
                         token.kind == MONKEYS_AT) {
                         //error recovery, case like:
                         //int i = expr.<missing-ident>
@@ -1900,7 +1875,7 @@ public class JavacParser implements Parser {
                     if (tyannos != null && tyannos.nonEmpty()) {
                         t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
                     }
-                    t = argumentsOpt(typeArgs, typeArgumentsOpt(t));
+                    t = argumentsOpt(typeArgs, typeApplyOpt(t));
                     typeArgs = null;
                 }
             } else if (isMode(EXPR) && token.kind == COLCOL) {
@@ -2198,8 +2173,7 @@ public class JavacParser implements Parser {
                         && restrictedTypeName(param.vartype, true) != null) {
                     checkSourceLevel(param.pos, Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS);
                     param.declKind = JCVariableDecl.DeclKind.VAR;
-                    param.typePos = TreeInfo.getStartPos(param.vartype);
-                    param.vartype = null;
+                    param.vartype = replaceTypeWithVar(param.vartype);
                 }
             }
         }
@@ -2302,7 +2276,7 @@ public class JavacParser implements Parser {
         } else {
             int pos = token.pos;
             accept(DOT);
-            typeArgs = (token.kind == LT) ? typeArguments(false) : null;
+            typeArgs = (token.kind == LT) ? typeArguments() : null;
             t = toP(F.at(pos).Select(t, ident()));
             t = argumentsOpt(typeArgs, t);
         }
@@ -2373,12 +2347,11 @@ public class JavacParser implements Parser {
 
     /**  TypeArgumentsOpt = [ TypeArguments ]
      */
-    JCExpression typeArgumentsOpt(JCExpression t) {
+    JCExpression typeApplyOpt(JCExpression t) {
         if (token.kind == LT &&
-            isMode(TYPE) &&
-            !isMode(NOPARAMS)) {
+            isMode(TYPE)) {
             selectTypeMode();
-            return typeArguments(t, false);
+            return typeApply(t);
         } else {
             return t;
         }
@@ -2389,12 +2362,11 @@ public class JavacParser implements Parser {
 
     List<JCExpression> typeArgumentsOpt(int useMode) {
         if (token.kind == LT) {
-            if (!isMode(useMode) ||
-                isMode(NOPARAMS)) {
+            if (!isMode(useMode)) {
                 illegal();
             }
             setMode(useMode);
-            return typeArguments(false);
+            return typeArguments();
         }
         return null;
     }
@@ -2404,35 +2376,29 @@ public class JavacParser implements Parser {
      *  TypeArguments  = "<" TypeArgument {"," TypeArgument} ">"
      *  }
      */
-    List<JCExpression> typeArguments(boolean diamondAllowed) {
+    List<JCExpression> typeArguments() {
         if (token.kind == LT) {
             nextToken();
-            if (token.kind == GT && diamondAllowed) {
-                setMode(mode | DIAMOND);
+            ListBuffer<JCExpression> args = new ListBuffer<>();
+            args.append(!isMode(EXPR) ? typeArgument() : parseType());
+            while (token.kind == COMMA) {
                 nextToken();
-                return List.nil();
-            } else {
-                ListBuffer<JCExpression> args = new ListBuffer<>();
                 args.append(!isMode(EXPR) ? typeArgument() : parseType());
-                while (token.kind == COMMA) {
-                    nextToken();
-                    args.append(!isMode(EXPR) ? typeArgument() : parseType());
-                }
-                switch (token.kind) {
-
-                case GTGTGTEQ: case GTGTEQ: case GTEQ:
-                case GTGTGT: case GTGT:
-                    token = S.split();
-                    break;
-                case GT:
-                    nextToken();
-                    break;
-                default:
-                    args.append(syntaxError(token.pos, Errors.Expected2(GT, COMMA)));
-                    break;
-                }
-                return args.toList();
             }
+            switch (token.kind) {
+
+            case GTGTGTEQ: case GTGTEQ: case GTEQ:
+            case GTGTGT: case GTGT:
+                token = S.split();
+                break;
+            case GT:
+                nextToken();
+                break;
+            default:
+                args.append(syntaxError(token.pos, Errors.Expected2(GT, COMMA)));
+                break;
+            }
+            return args.toList();
         } else {
             return List.of(syntaxError(token.pos, Errors.Expected(LT)));
         }
@@ -2480,12 +2446,23 @@ public class JavacParser implements Parser {
         return result;
     }
 
-    JCTypeApply typeArguments(JCExpression t, boolean diamondAllowed) {
+    JCTypeApply typeApply(JCExpression t) {
         int pos = token.pos;
-        List<JCExpression> args = typeArguments(diamondAllowed);
+        List<JCExpression> args = typeArguments();
         return toP(F.at(pos).TypeApply(t, args));
     }
 
+    JCTypeApply typeApplyOrDiamond(JCExpression t) {
+        if (peekToken(GT)) {
+            int pos = token.pos;
+            accept(LT);
+            accept(GT);
+            return toP(F.at(pos).TypeApply(t, List.nil()));
+        } else {
+            return typeApply(t);
+        }
+    }
+
     /**
      * BracketsOpt = { [Annotations] "[" "]" }*
      *
@@ -2542,7 +2519,7 @@ public class JavacParser implements Parser {
             int pos = token.pos;
             nextToken();
             accept(CLASS);
-            if (token.pos == endPosTable.errorEndPos) {
+            if (token.pos == errorEndPos) {
                 // error recovery
                 Name name;
                 if (LAX_IDENTIFIER.test(token.kind)) {
@@ -2585,7 +2562,7 @@ public class JavacParser implements Parser {
         selectExprMode();
         List<JCExpression> typeArgs = null;
         if (token.kind == LT) {
-            typeArgs = typeArguments(false);
+            typeArgs = typeArguments();
         }
         Name refName;
         ReferenceMode refMode;
@@ -2622,15 +2599,13 @@ public class JavacParser implements Parser {
 
         int prevmode = mode;
         selectTypeMode();
-        boolean diamondFound = false;
         int lastTypeargsPos = -1;
         if (token.kind == LT) {
             lastTypeargsPos = token.pos;
-            t = typeArguments(t, true);
-            diamondFound = isMode(DIAMOND);
+            t = typeApplyOrDiamond(t);
         }
         while (token.kind == DOT) {
-            if (diamondFound) {
+            if (TreeInfo.isDiamond(t)) {
                 //cannot select after a diamond
                 illegal();
             }
@@ -2645,8 +2620,7 @@ public class JavacParser implements Parser {
 
             if (token.kind == LT) {
                 lastTypeargsPos = token.pos;
-                t = typeArguments(t, true);
-                diamondFound = isMode(DIAMOND);
+                t = typeApplyOrDiamond(t);
             }
         }
         setMode(prevmode);
@@ -2657,7 +2631,7 @@ public class JavacParser implements Parser {
             }
 
             JCExpression e = arrayCreatorRest(newpos, t);
-            if (diamondFound) {
+            if (TreeInfo.isDiamond(t)) {
                 reportSyntaxError(lastTypeargsPos, Errors.CannotCreateArrayWithDiamond);
                 return toP(F.at(newpos).Erroneous(List.of(e)));
             }
@@ -2702,7 +2676,7 @@ public class JavacParser implements Parser {
 
         if (token.kind == LT) {
             int prevmode = mode;
-            t = typeArguments(t, true);
+            t = typeApplyOrDiamond(t);
             setMode(prevmode);
         }
         return classCreatorRest(newpos, encl, typeArgs, t);
@@ -2879,7 +2853,7 @@ public class JavacParser implements Parser {
                 // error recovery
                 if (token.pos == lastErrPos)
                     return stats.toList();
-                if (token.pos <= endPosTable.errorEndPos) {
+                if (token.pos <= errorEndPos) {
                     skip(false, true, true, true);
                     lastErrPos = token.pos;
                 }
@@ -3812,7 +3786,6 @@ public class JavacParser implements Parser {
      */
     JCVariableDecl variableDeclaratorRest(int pos, JCModifiers mods, JCExpression type, Name name,
                                   boolean reqInit, Comment dc, boolean localDecl, boolean compound) {
-        boolean declaredUsingVar = false;
         JCExpression init = null;
         type = bracketsOpt(type);
 
@@ -3838,7 +3811,6 @@ public class JavacParser implements Parser {
             syntaxError(token.pos, Errors.Expected(EQ));
         }
 
-        int varTypePos = Position.NOPOS;
         JCTree elemType = TreeInfo.innermostType(type, true);
         if (elemType.hasTag(IDENT)) {
             Name typeName = ((JCIdent) elemType).name;
@@ -3849,21 +3821,27 @@ public class JavacParser implements Parser {
                     //error - 'var' and arrays
                     reportSyntaxError(elemType.pos, Errors.RestrictedTypeNotAllowedArray(typeName));
                 } else {
-                    declaredUsingVar = true;
-                    varTypePos = elemType.pos;
+                    type = replaceTypeWithVar(type);
+
                     if (compound)
                         //error - 'var' in compound local var decl
                         reportSyntaxError(elemType.pos, Errors.RestrictedTypeNotAllowedCompound(typeName));
-                    //implicit type
-                    type = null;
                 }
             }
         }
         JCVariableDecl result = toP(F.at(pos).VarDef(mods, name, type, init,
-          declaredUsingVar ? JCVariableDecl.DeclKind.VAR : JCVariableDecl.DeclKind.EXPLICIT, varTypePos));
+          type.hasTag(VARTYPE) ? JCVariableDecl.DeclKind.VAR : JCVariableDecl.DeclKind.EXPLICIT));
         return attach(result, dc);
     }
 
+    JCExpression replaceTypeWithVar(JCExpression type) {
+        JCVarType varType = F.at(type).VarType();
+
+        varType.endpos = type.endpos;
+
+        return varType;
+    }
+
     Name restrictedTypeName(JCExpression e, boolean shouldWarn) {
         switch (e.getTag()) {
             case IDENT:
@@ -3922,7 +3900,7 @@ public class JavacParser implements Parser {
         if (allowThisIdent ||
             !lambdaParameter ||
             LAX_IDENTIFIER.test(token.kind) ||
-            mods.flags != Flags.PARAMETER ||
+            (mods.flags & ~(Flags.PARAMETER | Flags.LAMBDA_PARAMETER)) != 0 ||
             mods.annotations.nonEmpty()) {
             JCExpression pn;
             if (token.kind == UNDERSCORE && (catchParameter || lambdaParameter)) {
@@ -3974,11 +3952,10 @@ public class JavacParser implements Parser {
             name = names.empty;
         }
 
-        boolean declaredUsingVar = type != null && type.hasTag(IDENT) && ((JCIdent)type).name == names.var;
+        boolean declaredUsingVar = type != null && type.hasTag(VARTYPE);
         JCVariableDecl.DeclKind declKind = declaredUsingVar ? JCVariableDecl.DeclKind.VAR :
           type != null ? JCVariableDecl.DeclKind.EXPLICIT : JCVariableDecl.DeclKind.IMPLICIT;
-        int typePos = type != null ? type.pos : pos;
-        return toP(F.at(pos).VarDef(mods, name, type, null, declKind, typePos));
+        return toP(F.at(pos).VarDef(mods, name, type, null, declKind));
     }
 
     /** Resources = Resource { ";" Resources }
@@ -4057,7 +4034,7 @@ public class JavacParser implements Parser {
         boolean firstTypeDecl = true;   // have we seen a class, enum, or interface declaration yet?
         boolean isImplicitClass = false;
         OUTER: while (token.kind != EOF) {
-            if (token.pos <= endPosTable.errorEndPos) {
+            if (token.pos <= errorEndPos) {
                 // error recovery
                 skip(firstTypeDecl, false, false, false);
                 if (token.kind == EOF)
@@ -4168,7 +4145,6 @@ public class JavacParser implements Parser {
             toplevel.docComments = docComments;
         if (keepLineMap)
             toplevel.lineMap = S.getLineMap();
-        toplevel.endPositions = this.endPosTable;
         return toplevel;
     }
 
@@ -4445,12 +4421,13 @@ public class JavacParser implements Parser {
                 JCMethodDecl methDef = (JCMethodDecl) def;
                 if (methDef.name == names.init && methDef.params.isEmpty() && (methDef.mods.flags & Flags.COMPACT_RECORD_CONSTRUCTOR) != 0) {
                     ListBuffer<JCVariableDecl> tmpParams = new ListBuffer<>();
+                    TreeCopier<Void> copier = new TreeCopier<>(F);
                     for (JCVariableDecl param : headerFields) {
                         tmpParams.add(F.at(param)
                                 // we will get flags plus annotations from the record component
                                 .VarDef(F.Modifiers(Flags.PARAMETER | Flags.GENERATED_MEMBER | Flags.MANDATED | param.mods.flags & Flags.VARARGS,
-                                        param.mods.annotations),
-                                param.name, param.vartype, null));
+                                        copier.copy(param.mods.annotations)),
+                                param.name, copier.copy(param.vartype), null));
                     }
                     methDef.params = tmpParams.toList();
                 }
@@ -4588,7 +4565,7 @@ public class JavacParser implements Parser {
                     hasStructuralErrors = true;
                 }
                 defs.append(enumeratorDeclaration(enumName));
-                if (token.pos <= endPosTable.errorEndPos) {
+                if (token.pos <= errorEndPos) {
                     // error recovery
                    skip(false, true, true, false);
                 } else {
@@ -4611,7 +4588,7 @@ public class JavacParser implements Parser {
                 wasError = false;
                 defs.appendList(classOrInterfaceOrRecordBodyDeclaration(null, enumName,
                                                                 false, false));
-                if (token.pos <= endPosTable.errorEndPos) {
+                if (token.pos <= errorEndPos) {
                     // error recovery
                    skip(false, true, true, false);
                 }
@@ -4708,7 +4685,7 @@ public class JavacParser implements Parser {
      */
     List<JCTree> classInterfaceOrRecordBody(Name className, boolean isInterface, boolean isRecord) {
         accept(LBRACE);
-        if (token.pos <= endPosTable.errorEndPos) {
+        if (token.pos <= errorEndPos) {
             // error recovery
             skip(false, true, false, false);
             if (token.kind == LBRACE)
@@ -4719,7 +4696,7 @@ public class JavacParser implements Parser {
         ListBuffer<JCTree> defs = new ListBuffer<>();
         while (token.kind != RBRACE && token.kind != EOF) {
             defs.appendList(classOrInterfaceOrRecordBodyDeclaration(null, className, isInterface, isRecord));
-            if (token.pos <= endPosTable.errorEndPos) {
+            if (token.pos <= errorEndPos) {
                // error recovery
                skip(false, true, true, false);
             }
@@ -5079,7 +5056,7 @@ public class JavacParser implements Parser {
             boolean unclosedParameterList;
             if (!isRecord || name != names.init || token.kind == LPAREN) {
                 params = formalParameters();
-                unclosedParameterList = token.pos == endPosTable.errorEndPos;
+                unclosedParameterList = token.pos == errorEndPos;
                 if (!isVoid) type = bracketsOpt(type);
                 if (token.kind == THROWS) {
                     nextToken();
@@ -5105,7 +5082,7 @@ public class JavacParser implements Parser {
                     defaultValue = null;
                     accept(SEMI, tk -> Errors.Expected2(LBRACE, SEMI));
                 }
-                if (token.pos <= endPosTable.errorEndPos) {
+                if (token.pos <= errorEndPos) {
                     // error recovery
                     // look if there is a probable missing opening brace,
                     // and if yes, parse as a block
@@ -5426,7 +5403,19 @@ public class JavacParser implements Parser {
      *  LastFormalParameter = { FINAL | '@' Annotation } Type '...' Ident | FormalParameter
      */
     protected JCVariableDecl formalParameter(boolean lambdaParameter, boolean recordComponent) {
-        JCModifiers mods = !recordComponent ? optFinal(Flags.PARAMETER) : modifiersOpt();
+        JCModifiers mods;
+
+        if (recordComponent) {
+            mods = modifiersOpt();
+            /* it could be that the user added a javadoc with the @deprecated tag, when analyzing this
+             * javadoc, javac will set the DEPRECATED flag. This is correct in most cases but not for
+             * record components and thus should be removed in that case. Any javadoc applied to
+             * record components is ignored
+             */
+            mods.flags &= ~Flags.DEPRECATED;
+        } else {
+            mods = optFinal(Flags.PARAMETER | (lambdaParameter ? Flags.LAMBDA_PARAMETER : 0));
+        }
         if (recordComponent && mods.flags != 0) {
             log.error(mods.pos, Errors.RecordCantDeclareFieldModifiers);
         }
@@ -5457,7 +5446,7 @@ public class JavacParser implements Parser {
     }
 
     protected JCVariableDecl implicitParameter() {
-        JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER);
+        JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER | Flags.LAMBDA_PARAMETER);
         return variableDeclaratorId(mods, null, false, true, false);
     }
 
@@ -5643,70 +5632,4 @@ public class JavacParser implements Parser {
             unexpectedTopLevelDefinitionStartError = Errors.Expected3(CLASS, INTERFACE, ENUM);
         }
     }
-
-    /**
-     * A straightforward {@link EndPosTable} implementation.
-     */
-    protected static class SimpleEndPosTable extends AbstractEndPosTable {
-
-        private final IntHashTable endPosMap = new IntHashTable();
-
-        @Override
-        public <T extends JCTree> T storeEnd(T tree, int endpos) {
-            endPosMap.put(tree, Math.max(endpos, errorEndPos));
-            return tree;
-        }
-
-        @Override
-        public int getEndPos(JCTree tree) {
-            int value = endPosMap.get(tree);
-            // As long as Position.NOPOS==-1, this just returns value.
-            return (value == -1) ? Position.NOPOS : value;
-        }
-
-        @Override
-        public int replaceTree(JCTree oldTree, JCTree newTree) {
-            int pos = endPosMap.remove(oldTree);
-            if (pos != -1 && newTree != null) {
-                storeEnd(newTree, pos);
-            }
-            return pos;
-        }
-    }
-
-    /**
-     * A minimal implementation that only stores what's required.
-     */
-    protected static class MinimalEndPosTable extends SimpleEndPosTable {
-
-        @Override
-        public <T extends JCTree> T storeEnd(T tree, int endpos) {
-            switch (tree.getTag()) {
-            case MODULEDEF:
-            case PACKAGEDEF:
-            case CLASSDEF:
-            case METHODDEF:
-            case VARDEF:
-                break;
-            default:
-                return tree;
-            }
-            return super.storeEnd(tree, endpos);
-        }
-    }
-
-    protected abstract static class AbstractEndPosTable implements EndPosTable {
-
-        /**
-         * Store the last error position.
-         */
-        public int errorEndPos = Position.NOPOS;
-
-        @Override
-        public void setErrorEndPos(int errPos) {
-            if (errPos > errorEndPos) {
-                errorEndPos = errPos;
-            }
-        }
-    }
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index f9e187315ba..d06dd2cacda 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -28,7 +28,6 @@ package com.sun.tools.javac.parser;
 import java.util.Locale;
 
 import com.sun.tools.javac.api.JavacTrees;
-import com.sun.tools.javac.code.Lint;
 import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.tree.DocTreeMaker;
@@ -89,13 +88,9 @@ public class ParserFactory {
         this.trees = JavacTrees.instance(context);
     }
 
-    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
-        return newParser(input, keepDocComments, keepEndPos, keepLineMap, false);
-    }
-
-    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap, boolean parseModuleInfo) {
+    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepLineMap, boolean parseModuleInfo) {
         Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
-        return new JavacParser(this, lexer, keepDocComments, keepLineMap, keepEndPos, parseModuleInfo);
+        return new JavacParser(this, lexer, keepDocComments, keepLineMap, parseModuleInfo);
     }
 
     public JavacTrees getTrees() {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 95a7546e2b3..915d7f8a8d8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -1476,6 +1476,26 @@ compiler.err.not.exhaustive=\
 compiler.err.not.exhaustive.statement=\
     the switch statement does not cover all possible input values
 
+compiler.err.not.exhaustive.details=\
+    the switch expression does not cover all possible input values\n\
+    missing patterns:
+
+compiler.err.not.exhaustive.statement.details=\
+    the switch statement does not cover all possible input values\n\
+    missing patterns:
+
+# 0: type
+compiler.misc.binding.pattern=\
+    {0} _
+
+# 0: type, 1: list of diagnostic
+compiler.misc.record.pattern=\
+    {0}({1})
+
+# 0: type, 1: name
+compiler.misc.enum.constant.pattern=\
+    {0}.{1}
+
 compiler.err.initializer.must.be.able.to.complete.normally=\
     initializer must be able to complete normally
 
@@ -1701,6 +1721,18 @@ compiler.note.mref.stat.1=\
     alternate metafactory = {0}\n\
     bridge method = {1}
 
+# 0: string, 1: string, 2: string, 3: number, 4: string, 5: string, 6: string, 7: string
+compiler.note.lambda.deserialization.stat=\
+    Generating lambda deserialization\n\
+    functionalInterfaceClass: {0}\n\
+    functionalInterfaceMethodName: {1}\n\
+    functionalInterfaceMethodSignature:{2}\n\
+    implMethodKind: {3}\n\
+    implClass: {4}\n\
+    implMethodName: {5}\n\
+    implMethodSignature: {6}\n\
+    instantiatedMethodType: {7}
+
 compiler.note.note=\
     Note:\u0020
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 861f371632d..900557a29da 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -292,7 +292,7 @@ compiler.err.annotation.decl.not.allowed.here=此处不允许批注接口声明
 compiler.err.cant.inherit.from.final=无法从最终{0}进行继承
 
 # 0: symbol or name
-compiler.err.cant.ref.before.ctor.called=对 {0} 的引用只能在显式调用构造器后显示
+compiler.err.cant.ref.before.ctor.called=对 {0} 的引用只能在显式调用构造器后出现
 
 # 0: symbol or name
 compiler.err.cant.assign.initialized.before.ctor.called=对初始化字段 ''{0}'' 的分配只能在显式调用构造器后显示
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
index 0ea1796a8e6..3ae7ab1690e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_ja.properties
@@ -60,7 +60,7 @@ javac.opt.target=指定されたJava SEリリースに適したクラス・フ
 javac.opt.release=指定されたJava SEリリースに対してコンパイルします。サポートされているリリース: \n    {0}
 javac.opt.source=指定されたJava SEリリースとソースの互換性を保持します。サポートされているリリース: \n    {0}
 javac.opt.Werror=警告が発生した場合にコンパイルを終了します
-javac.opt.arg.Werror=<key>(,<key>)*
+javac.opt.arg.Werror=<キー>(,<キー>)*
 javac.opt.Werror.custom=コンパイルを終了する警告のlintカテゴリを\nコンマで区切って指定します。\n指定したカテゴリを除外するには、キーの前に''-''を指定します。\nサポートされているキーを表示するには--help-lintを使用します。
 javac.opt.A=注釈プロセッサに渡されるオプション
 javac.opt.implicit=暗黙的に参照されるファイルについてクラス・ファイルを生成するかどうかを指定する
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
index 0cbfac7e778..447d0d26239 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
@@ -60,7 +60,7 @@ javac.opt.target=生成适合指定的 Java SE 发行版的类文件。支持的
 javac.opt.release=为指定的 Java SE 发行版编译。支持的发行版：{0}
 javac.opt.source=提供与指定的 Java SE 发行版的源兼容性。支持的发行版：{0}
 javac.opt.Werror=出现任何警告时终止编译
-javac.opt.arg.Werror=<key>(,<key>)*
+javac.opt.arg.Werror=<键>(,<键>)*
 javac.opt.Werror.custom=指定出现警告时应终止编译的 lint 类别，\n以逗号分隔。\n在关键字前面加上 ''-'' 可排除指定的类别。\n使用 --help-lint 可查看支持的关键字。
 javac.opt.A=传递给批注处理程序的选项
 javac.opt.implicit=指定是否为隐式引用文件生成类文件
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
index a999786f119..023e5c74b3a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DCTree.java
@@ -305,7 +305,7 @@ public abstract class DCTree implements DocTree {
             }
 
             @Override
-            public int getEndPosition(EndPosTable endPosTable) {
+            public int getEndPosition() {
                 return comment.getSourcePos(end);
             }
         };
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java
deleted file mode 100644
index 83fe402c0a7..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/EndPosTable.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.tree;
-
-import com.sun.tools.javac.util.Position;
-
-/**
- * Specifies the methods to access a mappings of syntax trees to end positions.
- *
- * <p>
- * Implementations <b>must</b> store end positions for at least these node types:
- * <ul>
- *  <li>{@link JCTree.JCModuleDecl}
- *  <li>{@link JCTree.JCPackageDecl}
- *  <li>{@link JCTree.JCClassDecl}
- *  <li>{@link JCTree.JCMethodDecl}
- *  <li>{@link JCTree.JCVariableDecl}
- * </ul>
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk.  This code and its internal interfaces are subject to change
- * or deletion without notice.</b></p>
- */
-public interface EndPosTable {
-
-    /**
-     * This method will return the end position of a given tree, otherwise a
-     * Positions.NOPOS will be returned.
-     * @param tree JCTree
-     * @return position of the source tree or Positions.NOPOS for non-existent mapping
-     */
-    int getEndPos(JCTree tree);
-
-    /**
-     * Store ending position for a tree, the value of which is the greater of
-     * last error position and the given ending position.
-     * @param tree The tree.
-     * @param endpos The ending position to associate with the tree.
-     * @return the {@code tree}
-     */
-    <T extends JCTree> T storeEnd(T tree, int endpos);
-
-    /**
-     * Set the error position during the parsing phases, the value of which
-     * will be set only if it is greater than the last stored error position.
-     * @param errPos The error position
-     */
-    void setErrorEndPos(int errPos);
-
-    /**
-     * Give an old tree and a new tree, the old tree will be replaced with
-     * the new tree, the position of the new tree will be that of the old
-     * tree.
-     * @param oldtree a JCTree to be replaced
-     * @param newtree a JCTree to be replaced with, or null to just remove {@code oldtree}
-     * @return position of the old tree or Positions.NOPOS for non-existent mapping
-     */
-    int replaceTree(JCTree oldtree, JCTree newtree);
-}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
index 6501fd5d96c..f0a8b6034df 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -277,6 +277,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
          */
         TYPEIDENT,
 
+        /** 'var' type.
+         */
+        VARTYPE,
+
         /** Array types, of type TypeArray.
          */
         TYPEARRAY,
@@ -431,6 +435,10 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
      */
     public int pos;
 
+    /* The (encoded) end position in the source file. @see util.Position.
+     */
+    public int endpos = Position.NOPOS;
+
     /* The type of this node.
      */
     public Type type;
@@ -514,8 +522,8 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
     }
 
     // for default DiagnosticPosition
-    public int getEndPosition(EndPosTable endPosTable) {
-        return noNoPos(TreeInfo.getEndPos(this, endPosTable));
+    public int getEndPosition() {
+        return noNoPos(TreeInfo.getEndPos(this));
     }
 
     private int noNoPos(int position) {
@@ -552,9 +560,6 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         /** A table that stores all documentation comments indexed by the tree
          * nodes they refer to. defined only if option -s is set. */
         public DocCommentTable docComments = null;
-        /* An object encapsulating ending positions of source ranges indexed by
-         * the tree nodes they belong to. Defined only if option -Xjcov is set. */
-        public EndPosTable endPositions = null;
         protected JCCompilationUnit(List<JCTree> defs) {
             this.defs = defs;
         }
@@ -1011,9 +1016,16 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
     public static class JCVariableDecl extends JCStatement implements VariableTree {
 
         public enum DeclKind {
-            EXPLICIT,       // "SomeType name"
-            IMPLICIT,       // "name"
-            VAR,            // "var name"
+            EXPLICIT(0),                        // "SomeType name"
+            IMPLICIT(Flags.VAR_VARIABLE),       // "name"
+            VAR(Flags.VAR_VARIABLE),            // "var name"
+            ;
+
+            public final long additionalSymbolFlags;
+
+            private DeclKind(long additionalSymbolFlags) {
+                this.additionalSymbolFlags = additionalSymbolFlags;
+            }
         }
 
         /** variable modifiers */
@@ -1030,15 +1042,13 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public VarSymbol sym;
         /** how the variable's type was declared */
         public DeclKind declKind;
-        /** a source code position to use for "vartype" when null (can happen if declKind != EXPLICIT) */
-        public int typePos;
 
         protected JCVariableDecl(JCModifiers mods,
                          Name name,
                          JCExpression vartype,
                          JCExpression init,
                          VarSymbol sym) {
-            this(mods, name, vartype, init, sym, DeclKind.EXPLICIT, Position.NOPOS);
+            this(mods, name, vartype, init, sym, DeclKind.EXPLICIT);
         }
 
         protected JCVariableDecl(JCModifiers mods,
@@ -1046,21 +1056,19 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
                                  JCExpression vartype,
                                  JCExpression init,
                                  VarSymbol sym,
-                                 DeclKind declKind,
-                                 int typePos) {
+                                 DeclKind declKind) {
             this.mods = mods;
             this.name = name;
             this.vartype = vartype;
             this.init = init;
             this.sym = sym;
             this.declKind = declKind;
-            this.typePos = typePos;
         }
 
         protected JCVariableDecl(JCModifiers mods,
                          JCExpression nameexpr,
                          JCExpression vartype) {
-            this(mods, null, vartype, null, null, DeclKind.EXPLICIT, Position.NOPOS);
+            this(mods, null, vartype, null, null, DeclKind.EXPLICIT);
             this.nameexpr = nameexpr;
             if (nameexpr.hasTag(Tag.IDENT)) {
                 this.name = ((JCIdent)nameexpr).name;
@@ -1070,8 +1078,9 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             }
         }
 
+        @DefinedBy(Api.COMPILER_TREE)
         public boolean isImplicitlyTyped() {
-            return vartype == null;
+            return declKind != DeclKind.EXPLICIT;
         }
 
         public boolean declaredUsingVar() {
@@ -2039,7 +2048,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
             this.params = params;
             this.body = body;
             if (params.isEmpty() ||
-                params.head.vartype != null) {
+                !params.head.isImplicitlyTyped()) {
                 paramKind = ParameterKind.EXPLICIT;
             } else {
                 paramKind = ParameterKind.IMPLICIT;
@@ -2819,6 +2828,24 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         }
     }
 
+    public static class JCVarType extends JCExpression implements VarTypeTree {
+        public JCVarType() {}
+        @Override
+        public void accept(Visitor v) { v.visitVarType(this); }
+
+        @DefinedBy(Api.COMPILER_TREE)
+        public Kind getKind() { return Kind.VAR_TYPE; }
+
+        @Override @DefinedBy(Api.COMPILER_TREE)
+        public <R,D> R accept(TreeVisitor<R,D> v, D d) {
+            return v.visitVarType(this, d);
+        }
+        @Override
+        public Tag getTag() {
+            return VARTYPE;
+        }
+    }
+
     /**
      * An array type, A[]
      */
@@ -3596,6 +3623,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition {
         public void visitIdent(JCIdent that)                 { visitTree(that); }
         public void visitLiteral(JCLiteral that)             { visitTree(that); }
         public void visitTypeIdent(JCPrimitiveTypeTree that) { visitTree(that); }
+        public void visitVarType(JCVarType that)             { visitTree(that); }
         public void visitTypeArray(JCArrayTypeTree that)     { visitTree(that); }
         public void visitTypeApply(JCTypeApply that)         { visitTree(that); }
         public void visitTypeUnion(JCTypeUnion that)         { visitTree(that); }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
index d953663a6d7..c22dfd61637 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java
@@ -1529,6 +1529,15 @@ public class Pretty extends JCTree.Visitor {
         }
     }
 
+    @Override
+    public void visitVarType(JCVarType that) {
+        try {
+            print("var");
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
     public void visitTypeArray(JCArrayTypeTree tree) {
         try {
             printBaseElementType(tree);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
index 9efc6a9d895..95e2976f14e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java
@@ -480,6 +480,12 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
         return M.at(t.pos).TypeIdent(t.typetag);
     }
 
+    @DefinedBy(Api.COMPILER_TREE)
+    public JCTree visitVarType(VarTypeTree node, P p) {
+        JCVarType t = (JCVarType) node;
+        return M.at(t.pos).VarType();
+    }
+
     @DefinedBy(Api.COMPILER_TREE)
     public JCTree visitTypeParameter(TypeParameterTree node, P p) {
         JCTypeParameter t = (JCTypeParameter) node;
@@ -551,7 +557,7 @@ public class TreeCopier<P> implements TreeVisitor<JCTree,P> {
         JCExpression vartype = copy(t.vartype, p);
         if (t.nameexpr == null) {
             JCExpression init = copy(t.init, p);
-            return M.at(t.pos).VarDef(mods, t.name, vartype, init, t.declKind, t.typePos);
+            return M.at(t.pos).VarDef(mods, t.name, vartype, init, t.declKind);
         } else {
             JCExpression nameexpr = copy(t.nameexpr, p);
             return M.at(t.pos).ReceiverVarDef(mods, nameexpr, vartype);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 3f73bfd2296..ffb259c6a8b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -31,7 +31,6 @@ import com.sun.source.tree.Tree;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Symbol.RecordComponent;
-import com.sun.tools.javac.comp.AttrContext;
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*;
@@ -622,8 +621,6 @@ public class TreeInfo {
                     return node.mods.pos;
                 } else if (node.vartype != null) {
                     return getStartPos(node.vartype);
-                } else if (node.typePos != Position.NOPOS) {
-                    return node.typePos;
                 }
                 break;
             }
@@ -647,18 +644,13 @@ public class TreeInfo {
 
     /** The end position of given tree, given  a table of end positions generated by the parser
      */
-    public static int getEndPos(JCTree tree, EndPosTable endPosTable) {
+    public static int getEndPos(JCTree tree) {
         if (tree == null)
             return Position.NOPOS;
 
-        if (endPosTable == null) {
-            // fall back on limited info in the tree
-            return endPos(tree);
-        }
-
-        int mapPos = endPosTable.getEndPos(tree);
-        if (mapPos != Position.NOPOS)
-            return mapPos;
+        int endpos = tree.endpos;
+        if (endpos != Position.NOPOS)
+            return endpos;
 
         switch(tree.getTag()) {
             case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG:
@@ -678,57 +670,57 @@ public class TreeInfo {
             case COMPL:
             case PREINC:
             case PREDEC:
-                return getEndPos(((JCOperatorExpression) tree).getOperand(RIGHT), endPosTable);
+                return getEndPos(((JCOperatorExpression) tree).getOperand(RIGHT));
             case CASE:
-                return getEndPos(((JCCase) tree).stats.last(), endPosTable);
+                return getEndPos(((JCCase) tree).stats.last());
             case CATCH:
-                return getEndPos(((JCCatch) tree).body, endPosTable);
+                return getEndPos(((JCCatch) tree).body);
             case CONDEXPR:
-                return getEndPos(((JCConditional) tree).falsepart, endPosTable);
+                return getEndPos(((JCConditional) tree).falsepart);
             case FORLOOP:
-                return getEndPos(((JCForLoop) tree).body, endPosTable);
+                return getEndPos(((JCForLoop) tree).body);
             case FOREACHLOOP:
-                return getEndPos(((JCEnhancedForLoop) tree).body, endPosTable);
+                return getEndPos(((JCEnhancedForLoop) tree).body);
             case IF: {
                 JCIf node = (JCIf)tree;
                 if (node.elsepart == null) {
-                    return getEndPos(node.thenpart, endPosTable);
+                    return getEndPos(node.thenpart);
                 } else {
-                    return getEndPos(node.elsepart, endPosTable);
+                    return getEndPos(node.elsepart);
                 }
             }
             case LABELLED:
-                return getEndPos(((JCLabeledStatement) tree).body, endPosTable);
+                return getEndPos(((JCLabeledStatement) tree).body);
             case MODIFIERS:
-                return getEndPos(((JCModifiers) tree).annotations.last(), endPosTable);
+                return getEndPos(((JCModifiers) tree).annotations.last());
             case SYNCHRONIZED:
-                return getEndPos(((JCSynchronized) tree).body, endPosTable);
+                return getEndPos(((JCSynchronized) tree).body);
             case TOPLEVEL:
-                return getEndPos(((JCCompilationUnit) tree).defs.last(), endPosTable);
+                return getEndPos(((JCCompilationUnit) tree).defs.last());
             case TRY: {
                 JCTry node = (JCTry)tree;
                 if (node.finalizer != null) {
-                    return getEndPos(node.finalizer, endPosTable);
+                    return getEndPos(node.finalizer);
                 } else if (!node.catchers.isEmpty()) {
-                    return getEndPos(node.catchers.last(), endPosTable);
+                    return getEndPos(node.catchers.last());
                 } else {
-                    return getEndPos(node.body, endPosTable);
+                    return getEndPos(node.body);
                 }
             }
             case WILDCARD:
-                return getEndPos(((JCWildcard) tree).inner, endPosTable);
+                return getEndPos(((JCWildcard) tree).inner);
             case TYPECAST:
-                return getEndPos(((JCTypeCast) tree).expr, endPosTable);
+                return getEndPos(((JCTypeCast) tree).expr);
             case TYPETEST:
-                return getEndPos(((JCInstanceOf) tree).pattern, endPosTable);
+                return getEndPos(((JCInstanceOf) tree).pattern);
             case WHILELOOP:
-                return getEndPos(((JCWhileLoop) tree).body, endPosTable);
+                return getEndPos(((JCWhileLoop) tree).body);
             case ANNOTATED_TYPE:
-                return getEndPos(((JCAnnotatedType) tree).underlyingType, endPosTable);
+                return getEndPos(((JCAnnotatedType) tree).underlyingType);
             case ERRONEOUS: {
                 JCErroneous node = (JCErroneous)tree;
                 if (node.errs != null && node.errs.nonEmpty())
-                    return getEndPos(node.errs.last(), endPosTable);
+                    return getEndPos(node.errs.last());
             }
         }
         return Position.NOPOS;
@@ -745,8 +737,8 @@ public class TreeInfo {
             public JCTree getTree() { return tree; }
             public int getStartPosition() { return TreeInfo.getStartPos(tree); }
             public int getPreferredPosition() { return endPos; }
-            public int getEndPosition(EndPosTable endPosTable) {
-                return TreeInfo.getEndPos(tree, endPosTable);
+            public int getEndPosition() {
+                return TreeInfo.getEndPos(tree);
             }
         };
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
index 0e71df99bdc..77391493ad2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
@@ -238,8 +238,8 @@ public class TreeMaker implements JCTree.Factory {
     }
 
     public JCVariableDecl VarDef(JCModifiers mods, Name name, JCExpression vartype, JCExpression init,
-      JCVariableDecl.DeclKind declKind, int typePos) {
-        JCVariableDecl tree = new JCVariableDecl(mods, name, vartype, init, null, declKind, typePos);
+      JCVariableDecl.DeclKind declKind) {
+        JCVariableDecl tree = new JCVariableDecl(mods, name, vartype, init, null, declKind);
         tree.pos = pos;
         return tree;
     }
@@ -566,6 +566,12 @@ public class TreeMaker implements JCTree.Factory {
         return tree;
     }
 
+    public JCVarType VarType() {
+        JCVarType tree = new JCVarType();
+        tree.pos = pos;
+        return tree;
+    }
+
     public JCArrayTypeTree TypeArray(JCExpression elemtype) {
         JCArrayTypeTree tree = new JCArrayTypeTree(elemtype);
         tree.pos = pos;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
index b9ae35da9df..0d1216217c8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java
@@ -361,6 +361,9 @@ public class TreeScanner extends Visitor {
     public void visitTypeIdent(JCPrimitiveTypeTree tree) {
     }
 
+    public void visitVarType(JCVarType tree) {
+    }
+
     public void visitTypeArray(JCArrayTypeTree tree) {
         scan(tree.elemtype);
     }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
index 63778fb42ff..5b06e76bf33 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
@@ -418,6 +418,10 @@ public class TreeTranslator extends JCTree.Visitor {
         result = tree;
     }
 
+    public void visitVarType(JCVarType tree) {
+        result = tree;
+    }
+
     public void visitTypeArray(JCArrayTypeTree tree) {
         tree.elemtype = translate(tree.elemtype);
         result = tree;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
index baae3101811..3339900733f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
@@ -31,7 +31,6 @@ import java.nio.CharBuffer;
 import javax.tools.JavaFileObject;
 
 import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.tree.EndPosTable;
 
 import static com.sun.tools.javac.util.LayoutCharacters.*;
 
@@ -127,16 +126,6 @@ public class DiagnosticSource {
         }
     }
 
-    public EndPosTable getEndPosTable() {
-        return endPosTable;
-    }
-
-    public void setEndPosTable(EndPosTable t) {
-        if (endPosTable != null && endPosTable != t)
-            throw new IllegalStateException("endPosTable already set");
-        endPosTable = t;
-    }
-
     /** Find the line in the buffer that contains the current position
      * @param pos      Character offset into the buffer
      */
@@ -197,8 +186,6 @@ public class DiagnosticSource {
     /** The underlying file object. */
     protected JavaFileObject fileObject;
 
-    protected EndPosTable endPosTable;
-
     /** A soft reference to the content of the file object. */
     protected SoftReference<char[]> refBuf;
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java
deleted file mode 100644
index 409dc703d60..00000000000
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/IntHashTable.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.javac.util;
-
-/**
- * A hash table that maps Object to int.
- *
- * This is a custom hash table optimised for the Object {@literal ->} int
- * maps. This is done to avoid unnecessary object allocation in the image set.
- *
- * @author Charles Turner
- * @author Per Bothner
- */
-public class IntHashTable {
-    private static final int DEFAULT_INITIAL_SIZE = 64;
-    protected Object[] objs; // the domain set
-    protected int[] ints; // the image set
-    protected int mask; // used to clip int's into the domain
-    protected int num_bindings; // the number of mappings (including DELETED)
-    private static final Object DELETED = new Object();
-
-    /**
-     * Construct an Object {@literal ->} int hash table.
-     *
-     * The default size of the hash table is 64 mappings.
-     */
-    public IntHashTable() {
-        objs = new Object[DEFAULT_INITIAL_SIZE];
-        ints = new int[DEFAULT_INITIAL_SIZE];
-        mask = DEFAULT_INITIAL_SIZE - 1;
-    }
-
-    /**
-     * Construct an Object {@literal ->} int hash table with a specified amount of mappings.
-     * @param capacity The number of default mappings in this hash table.
-     */
-    public IntHashTable(int capacity) {
-        int log2Size = 4;
-        while (capacity > (1 << log2Size)) {
-            log2Size++;
-        }
-        capacity = 1 << log2Size;
-        objs = new Object[capacity];
-        ints = new int[capacity];
-        mask = capacity - 1;
-    }
-
-    /**
-     * Compute the hash code of a given object.
-     *
-     * @param key The object whose hash code is to be computed.
-     * @return zero if the object is null, otherwise the identityHashCode
-     */
-    protected int hash(Object key) {
-        return System.identityHashCode(key);
-    }
-
-    /**
-     * Find either the index of a key's value, or the index of an available space.
-     *
-     * @param key The key to whose index you want to find.
-     * @return Either the index of the key's value, or an index pointing to
-     * unoccupied space.
-     */
-    protected int lookup(Object key) {
-        Object node;
-        int hash = hash(key);
-        int hash1 = hash ^ (hash >>> 15);
-        int hash2 = (hash ^ (hash << 6)) | 1; //ensure coprimeness
-        int deleted = -1;
-        for (int i = hash1 & mask;; i = (i + hash2) & mask) {
-            node = objs[i];
-            if (node == key)
-                return i;
-            if (node == null)
-                return deleted >= 0 ? deleted : i;
-            if (node == DELETED && deleted < 0)
-                deleted = i;
-        }
-    }
-
-    /**
-     * Return the value to which the specified key is mapped.
-     *
-     * @param key The key to whose value you want to find.
-     * @return A non-negative integer if the value is found.
-     *         Otherwise, it is -1.
-     */
-    public int get(Object key) {
-        int index = lookup(key);
-        Object node = objs[index];
-        return node == null || node == DELETED ? -1 : ints[index];
-    }
-
-    /**
-     * Associates the specified key with the specified value in this map.
-     *
-     * @param key key with which the specified value is to be associated.
-     * @param value value to be associated with the specified key.
-     * @return previous value associated with specified key, or -1 if there was
-     * no mapping for key.
-     */
-    public int put(Object key, int value) {
-        int index = lookup(key);
-        Object old = objs[index];
-        if (old == null || old == DELETED) {
-            objs[index] = key;
-            ints[index] = value;
-            if (old != DELETED)
-                num_bindings++;
-            if (3 * num_bindings >= 2 * objs.length)
-                rehash();
-            return -1;
-        } else { // update existing mapping
-            int oldValue = ints[index];
-            ints[index] = value;
-            return oldValue;
-        }
-    }
-
-    /**
-     * Remove the mapping(key and value) of the specified key.
-     *
-     * @param key the key to whose value you want to remove.
-     * @return the removed value associated with the specified key,
-     *         or -1 if there was no mapping for the specified key.
-     */
-    public int remove(Object key) {
-        int index = lookup(key);
-        Object old = objs[index];
-        if (old == null || old == DELETED)
-            return -1;
-        objs[index] = DELETED;
-        return ints[index];
-    }
-
-    /**
-     * Expand the hash table when it exceeds the load factor.
-     *
-     * Rehash the existing objects.
-     */
-    protected void rehash() {
-        Object[] oldObjsTable = objs;
-        int[] oldIntsTable = ints;
-        int newCapacity = oldObjsTable.length << 1;
-        objs = new Object[newCapacity];
-        ints = new int[newCapacity];
-        mask = newCapacity - 1;
-        num_bindings = 0; // this is recomputed below
-        Object key;
-        for (int i = oldIntsTable.length; --i >= 0;) {
-            key = oldObjsTable[i];
-            if (key != null && key != DELETED)
-                put(key, oldIntsTable[i]);
-        }
-    }
-
-    /**
-     * Removes all mappings from this map.
-     */
-    public void clear() {
-        for (int i = objs.length; --i >= 0;) {
-            objs[i] = null;
-        }
-        num_bindings = 0;
-    }
-}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
index c9f529eae55..328183c0cb3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
@@ -38,7 +38,6 @@ import javax.tools.JavaFileObject;
 import com.sun.tools.javac.api.DiagnosticFormatter;
 import com.sun.tools.javac.code.Lint.LintCategory;
 import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.util.DefinedBy.Api;
 
@@ -364,10 +363,8 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
         /** Get the position within the file that most accurately defines the
          *  location for the diagnostic. */
         int getPreferredPosition();
-        /** If there is a tree node, and if endPositions are available, get
-         *  the end position of the tree node. Otherwise, just returns the
-         *  same as getPreferredPosition(). */
-        int getEndPosition(EndPosTable endPosTable);
+        /** If there is a tree node, get the end position of the tree node. */
+        int getEndPosition();
         /** Get the position that determines which Lint configuration applies. */
         default int getLintPosition() {
             return getStartPosition();
@@ -389,8 +386,8 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
                     return orig.getPreferredPosition();
                 }
                 @Override
-                public int getEndPosition(EndPosTable endPosTable) {
-                    return orig.getEndPosition(endPosTable);
+                public int getEndPosition() {
+                    return orig.getEndPosition();
                 }
                 @Override
                 public int getLintPosition() {
@@ -421,7 +418,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
             return pos;
         }
 
-        public int getEndPosition(EndPosTable endPosTable) {
+        public int getEndPosition() {
             return pos;
         }
 
@@ -747,7 +744,7 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
     }
 
     protected int getIntEndPosition() {
-        return (position == null ? Position.NOPOS : position.getEndPosition(source.getEndPosTable()));
+        return (position == null ? Position.NOPOS : position.getEndPosition());
     }
 
     @DefinedBy(Api.COMPILER)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
index a4109a35ccb..b061d2283a0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java
@@ -55,7 +55,6 @@ import com.sun.tools.javac.comp.AttrContext;
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.main.Main;
 import com.sun.tools.javac.main.Option;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.TreeInfo;
@@ -594,11 +593,6 @@ public class Log extends AbstractLog {
         return diagListener != null;
     }
 
-    public void setEndPosTable(JavaFileObject name, EndPosTable endPosTable) {
-        Assert.checkNonNull(name);
-        getSource(name).setEndPosTable(endPosTable);
-    }
-
     /** Return current sourcefile.
      */
     public JavaFileObject currentSourceFile() {
diff --git a/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt
index 29ecd9f0304..9166b505c51 100644
--- a/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.base-Q.sym.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -429,6 +429,10 @@ innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/Obj
 innerclass innerClass java/util/AbstractMap$SimpleImmutableEntry outerClass java/util/AbstractMap innerClassName SimpleImmutableEntry flags 9
 innerclass innerClass java/util/concurrent/ConcurrentHashMap$CollectionView outerClass java/util/concurrent/ConcurrentHashMap innerClassName CollectionView flags 408
 
+class name java/util/concurrent/CopyOnWriteArraySet
+header extends java/util/AbstractSet implements java/io/Serializable flags 21 signature <E:Ljava/lang/Object;>Ljava/util/AbstractSet<TE;>;Ljava/io/Serializable;
+innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
+
 class name java/util/concurrent/StructuredTaskScope
 -method name open descriptor (Ljava/util/concurrent/StructuredTaskScope$Joiner;Ljava/util/function/Function;)Ljava/util/concurrent/StructuredTaskScope;
 method name open descriptor (Ljava/util/concurrent/StructuredTaskScope$Joiner;Ljava/util/function/UnaryOperator;)Ljava/util/concurrent/StructuredTaskScope; flags 9 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>(Ljava/util/concurrent/StructuredTaskScope$Joiner<-TT;+TR;>;Ljava/util/function/UnaryOperator<Ljava/util/concurrent/StructuredTaskScope$Configuration;>;)Ljava/util/concurrent/StructuredTaskScope<TT;TR;>;
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java
index 9c923b76215..39827af42e5 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Cipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1198,7 +1198,9 @@ final class P11Cipher extends CipherSpi {
     }
 
     private void handleException(PKCS11Exception e)
-            throws ShortBufferException, IllegalBlockSizeException {
+            throws ShortBufferException, IllegalBlockSizeException,
+            BadPaddingException {
+
         if (e.match(CKR_BUFFER_TOO_SMALL)) {
             throw (ShortBufferException)
                     (new ShortBufferException().initCause(e));
@@ -1206,6 +1208,9 @@ final class P11Cipher extends CipherSpi {
                 e.match(CKR_ENCRYPTED_DATA_LEN_RANGE)) {
             throw (IllegalBlockSizeException)
                     (new IllegalBlockSizeException(e.toString()).initCause(e));
+        } else if (e.match(CKR_ENCRYPTED_DATA_INVALID)) {
+            throw (BadPaddingException)
+                    (new BadPaddingException(e.toString()).initCause(e));
         }
     }
 
diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c
index d969fabffd0..052c7011860 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -184,9 +184,12 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
 
     if (directIn != 0) {
       inBufP = (CK_BYTE_PTR) jlong_to_ptr(directIn);
-    } else {
+    } else if (jIn != NULL) {
       inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
+      // may happen if out of memory
       if (inBufP == NULL) { return 0; }
+    } else {
+      inBufP = NULL;
     }
 
     if (directOut != 0) {
@@ -194,7 +197,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
     } else {
       outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
       if (outBufP == NULL) {
-        if (directIn == 0) {
+        if (directIn == 0 && inBufP != NULL) {
           (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
         }
         return 0;
@@ -208,7 +211,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt
                                     (CK_BYTE_PTR)(outBufP + jOutOfs),
                                     &ckEncryptedLen);
 
-    if (directIn == 0) {
+    if (directIn == 0 && inBufP != NULL) {
         (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
     }
     if (directOut == 0) {
@@ -251,9 +254,12 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
 
     if (directIn != 0) {
       inBufP = (CK_BYTE_PTR) jlong_to_ptr(directIn);
-    } else {
+    } else if (jIn != NULL) {
       inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
+      // may happen if out of memory
       if (inBufP == NULL) { return 0; }
+    } else {
+      inBufP = NULL;
     }
 
     if (directOut != 0) {
@@ -261,7 +267,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
     } else {
       outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
       if (outBufP == NULL) {
-        if (directIn == 0) {
+        if (directIn == 0 && inBufP != NULL) {
           (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
         }
         return 0;
@@ -275,7 +281,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate
                                           (CK_BYTE_PTR)(outBufP + jOutOfs),
                                           &ckEncryptedPartLen);
 
-    if (directIn == 0) {
+    if (directIn == 0 && inBufP != NULL) {
         (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
     }
     if (directOut == 0) {
@@ -462,9 +468,12 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
 
     if (directIn != 0) {
       inBufP = (CK_BYTE_PTR) jlong_to_ptr(directIn);
-    } else {
+    } else if (jIn != NULL) {
       inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
+      // may happen if out of memory
       if (inBufP == NULL) { return 0; }
+    } else {
+      inBufP = NULL;
     }
 
     if (directOut != 0) {
@@ -472,7 +481,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
     } else {
       outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
       if (outBufP == NULL) {
-        if (directIn == 0) {
+        if (directIn == 0 && inBufP != NULL) {
           (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
         }
         return 0;
@@ -485,7 +494,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt
                                     (CK_BYTE_PTR)(outBufP + jOutOfs),
                                     &ckOutLen);
 
-    if (directIn == 0) {
+    if (directIn == 0 && inBufP != NULL) {
         (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
     }
     if (directOut == 0) {
@@ -528,9 +537,12 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
 
     if (directIn != 0) {
       inBufP = (CK_BYTE_PTR) jlong_to_ptr(directIn);
-    } else {
+    } else if (jIn != NULL) {
       inBufP = (*env)->GetPrimitiveArrayCritical(env, jIn, NULL);
+      // may happen if out of memory
       if (inBufP == NULL) { return 0; }
+    } else {
+      inBufP = NULL;
     }
 
     if (directOut != 0) {
@@ -538,7 +550,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
     } else {
       outBufP = (*env)->GetPrimitiveArrayCritical(env, jOut, NULL);
       if (outBufP == NULL) {
-        if (directIn == 0) {
+        if (directIn == 0 && inBufP != NULL) {
           (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
         }
         return 0;
@@ -551,7 +563,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate
                                           (CK_BYTE_PTR)(outBufP + jOutOfs),
                                           &ckDecryptedPartLen);
 
-    if (directIn == 0) {
+    if (directIn == 0 && inBufP != NULL) {
         (*env)->ReleasePrimitiveArrayCritical(env, jIn, inBufP, JNI_ABORT);
     }
     if (directOut == 0) {
diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c
index e9bcf597a03..f61b8a5fb49 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -100,6 +100,12 @@ Java_sun_security_pkcs11_wrapper_PKCS11_initializeLibrary
 #ifndef NO_CALLBACKS
     if (notifyListLock == NULL) {
         notifyListLock = createLockObject(env);
+
+        /* Return immediately if lock creation failed or an exception is pending. */
+        if (notifyListLock == NULL || (*env)->ExceptionCheck(env)) {
+            TRACE0("DEBUG: createLockObject failed, aborting initialization\n");
+            return;
+        }
     }
 #endif
 
diff --git a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c
index f2e1a46565d..e540f3b5ed9 100644
--- a/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c
+++ b/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  */
 
 /* Copyright  (c) 2002 Graz University of Technology. All rights reserved.
@@ -929,6 +929,11 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DeriveKey
     rv = (*ckpFunctions->C_DeriveKey)(ckSessionHandle, ckpMechanism, ckBaseKeyHandle,
                  ckpAttributes, ckAttributesLength, phKey);
 
+    /* If derivation failed, do not attempt copy-back */
+    if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) {
+        goto cleanup;
+    }
+
     jKeyHandle = ckLongToJLong(ckKeyHandle);
 
     switch (ckpMechanism->mechanism) {
@@ -956,8 +961,9 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DeriveKey
         // empty
         break;
     }
-    if (ckAssertReturnValueOK(env, rv) != CK_ASSERT_OK) {
-        jKeyHandle =0L;
+    /* Do not continue if any copy-back operation raised an exception */
+    if ((*env)->ExceptionCheck(env)) {
+        goto cleanup;
     }
 
 cleanup:
diff --git a/src/jdk.hotspot.agent/doc/clhsdb.html b/src/jdk.hotspot.agent/doc/clhsdb.html
index bd436f1dfef..cfe6453b736 100644
--- a/src/jdk.hotspot.agent/doc/clhsdb.html
+++ b/src/jdk.hotspot.agent/doc/clhsdb.html
@@ -57,7 +57,6 @@ Available commands:
   pmap <font color="red">show Solaris pmap-like output</font>
   print expression <font color="red">print given Klass*, Method* or arbitrary address</font>
   printas type expression <font color="red">print given address as given HotSpot type. eg. print JavaThread &lt;address&gt;</font>
-  printmdo -a | expression <font color="red">print method data oop</font>
   printstatics [ type ] <font color="red">print static fields of given HotSpot type (or all types if none specified)</font>
   pstack [-v] [-l] <font color="red">show mixed mode stack trace for all Java, non-Java threads. -v is verbose mode. -l includes info on owned java.util.concurrent locks.</font>
   quit <font color="red">quit CLHSDB tool</font>
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/DwarfParser.cpp b/src/jdk.hotspot.agent/linux/native/libsaproc/DwarfParser.cpp
index 8df08c49e09..62dbc84f88c 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/DwarfParser.cpp
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/DwarfParser.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2021, NTT DATA.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -205,7 +205,7 @@ extern "C"
 JNIEXPORT jint JNICALL Java_sun_jvm_hotspot_debugger_linux_amd64_DwarfParser_getReturnAddressOffsetFromCFA
   (JNIEnv *env, jobject this_obj) {
   DwarfParser *parser = reinterpret_cast<DwarfParser *>(get_dwarf_context(env, this_obj));
-  return parser->get_ra_cfa_offset();
+  return parser->get_offset_from_cfa(RA);
 }
 
 /*
@@ -217,18 +217,5 @@ extern "C"
 JNIEXPORT jint JNICALL Java_sun_jvm_hotspot_debugger_linux_amd64_DwarfParser_getBasePointerOffsetFromCFA
   (JNIEnv *env, jobject this_obj) {
   DwarfParser *parser = reinterpret_cast<DwarfParser *>(get_dwarf_context(env, this_obj));
-  return parser->get_bp_cfa_offset();
+  return parser->get_offset_from_cfa(RBP);
 }
-
-/*
- * Class:     sun_jvm_hotspot_debugger_linux_amd64_DwarfParser
- * Method:    isBPOffsetAvailable
- * Signature: ()Z
- */
-extern "C"
-JNIEXPORT jboolean JNICALL Java_sun_jvm_hotspot_debugger_linux_amd64_DwarfParser_isBPOffsetAvailable
-  (JNIEnv *env, jobject this_obj) {
-  DwarfParser *parser = reinterpret_cast<DwarfParser *>(get_dwarf_context(env, this_obj));
-  return parser->is_bp_offset_available();
-}
-
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.cpp b/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.cpp
index a0c54230530..459e3cc57e9 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.cpp
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, NTT DATA.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,32 @@
  */
 
 #include <cstring>
+#include <stack>
 
 #include "dwarf.hpp"
 #include "libproc_impl.h"
 
+DwarfParser::DwarfParser(lib_info *lib) : _lib(lib),
+                                          _buf(NULL),
+                                          _encoding(0),
+                                          _code_factor(0),
+                                          _data_factor(0),
+                                          _current_pc(0L) {
+  init_state(_initial_state);
+  init_state(_state);
+}
+
+void DwarfParser::init_state(struct DwarfState& st) {
+  st.cfa_reg = MAX_VALUE;
+  st.return_address_reg = MAX_VALUE;
+  st.cfa_offset = 0;
+
+  st.offset_from_cfa.clear();
+  for (int reg = 0; reg < MAX_VALUE; reg++) {
+    st.offset_from_cfa[static_cast<enum DWARF_Register>(reg)] = INT_MAX;
+  }
+}
+
 /* from read_leb128() in dwarf.c in binutils */
 uintptr_t DwarfParser::read_leb(bool sign) {
   uintptr_t result = 0L;
@@ -82,7 +104,7 @@ bool DwarfParser::process_cie(unsigned char *start_of_entry, uint32_t id) {
 
   _code_factor = read_leb(false);
   _data_factor = static_cast<int>(read_leb(true));
-  _return_address_reg = static_cast<enum DWARF_Register>(*_buf++);
+  enum DWARF_Register initial_ra = static_cast<enum DWARF_Register>(*_buf++);
 
   if (strpbrk(augmentation_string, "LP") != NULL) {
     // Language personality routine (P) and Language Specific Data Area (LSDA:L)
@@ -99,15 +121,12 @@ bool DwarfParser::process_cie(unsigned char *start_of_entry, uint32_t id) {
 
   // Clear state
   _current_pc = 0L;
-  _cfa_reg = RSP;
-  _return_address_reg = RA;
-  _cfa_offset = 0;
-  _ra_cfa_offset = 0;
-  _bp_cfa_offset = 0;
-  _bp_offset_available = false;
+  init_state(_state);
+  _state.return_address_reg = initial_ra;
 
   parse_dwarf_instructions(0L, static_cast<uintptr_t>(-1L), end);
 
+  _initial_state = _state;
   _buf = orig_pos;
   return true;
 }
@@ -115,12 +134,7 @@ bool DwarfParser::process_cie(unsigned char *start_of_entry, uint32_t id) {
 void DwarfParser::parse_dwarf_instructions(uintptr_t begin, uintptr_t pc, const unsigned char *end) {
   uintptr_t operand1;
   _current_pc = begin;
-
-  /* for remember state */
-  enum DWARF_Register rem_cfa_reg = MAX_VALUE;
-  int rem_cfa_offset = 0;
-  int rem_ra_cfa_offset = 0;
-  int rem_bp_cfa_offset = 0;
+  std::stack<struct DwarfState> remember_state;
 
   while ((_buf < end) && (_current_pc < pc)) {
     unsigned char op = *_buf++;
@@ -139,22 +153,17 @@ void DwarfParser::parse_dwarf_instructions(uintptr_t begin, uintptr_t pc, const
         }
         break;
       case 0x0c: // DW_CFA_def_cfa
-        _cfa_reg = static_cast<enum DWARF_Register>(read_leb(false));
-        _cfa_offset = read_leb(false);
+        _state.cfa_reg = static_cast<enum DWARF_Register>(read_leb(false));
+        _state.cfa_offset = read_leb(false);
         break;
       case 0x80: {// DW_CFA_offset
         operand1 = read_leb(false);
         enum DWARF_Register reg = static_cast<enum DWARF_Register>(opa);
-        if (reg == RBP) {
-          _bp_cfa_offset = operand1 * _data_factor;
-          _bp_offset_available = true;
-        } else if (reg == RA) {
-          _ra_cfa_offset = operand1 * _data_factor;
-        }
+        _state.offset_from_cfa[reg] = operand1 * _data_factor;
         break;
       }
       case 0xe:  // DW_CFA_def_cfa_offset
-        _cfa_offset = read_leb(false);
+        _state.cfa_offset = read_leb(false);
         break;
       case 0x40: // DW_CFA_advance_loc
         if (_current_pc != 0L) {
@@ -184,22 +193,30 @@ void DwarfParser::parse_dwarf_instructions(uintptr_t begin, uintptr_t pc, const
         }
         break;
       }
-      case 0x0d: {// DW_CFA_def_cfa_register
-        _cfa_reg = static_cast<enum DWARF_Register>(read_leb(false));
+      case 0x07: { // DW_CFA_undefined
+        enum DWARF_Register reg = static_cast<enum DWARF_Register>(read_leb(false));
+        _state.offset_from_cfa[reg] = INT_MAX;
         break;
       }
+      case 0x0d: // DW_CFA_def_cfa_register
+        _state.cfa_reg = static_cast<enum DWARF_Register>(read_leb(false));
+        break;
       case 0x0a: // DW_CFA_remember_state
-        rem_cfa_reg = _cfa_reg;
-        rem_cfa_offset = _cfa_offset;
-        rem_ra_cfa_offset = _ra_cfa_offset;
-        rem_bp_cfa_offset = _bp_cfa_offset;
+        remember_state.push(_state);
         break;
       case 0x0b: // DW_CFA_restore_state
-        _cfa_reg = rem_cfa_reg;
-        _cfa_offset = rem_cfa_offset;
-        _ra_cfa_offset = rem_ra_cfa_offset;
-        _bp_cfa_offset = rem_bp_cfa_offset;
+        if (remember_state.empty()) {
+          print_debug("DWARF Error: DW_CFA_restore_state with empty stack.\n");
+          return;
+        }
+        _state = remember_state.top();
+        remember_state.pop();
         break;
+      case 0xc0: {// DW_CFA_restore
+        enum DWARF_Register reg = static_cast<enum DWARF_Register>(opa);
+        _state.offset_from_cfa[reg] = _initial_state.offset_from_cfa[reg];
+        break;
+      }
       default:
         print_debug("DWARF: Unknown opcode: 0x%x\n", op);
         return;
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.hpp b/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.hpp
index a047ffae247..0a38c9a0f2e 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.hpp
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/dwarf.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, NTT DATA.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
 #ifndef _DWARF_HPP_
 #define _DWARF_HPP_
 
+#include <map>
+
 #include "libproc_impl.h"
 
 /*
@@ -55,6 +57,13 @@ enum DWARF_Register {
   MAX_VALUE
 };
 
+struct DwarfState {
+  enum DWARF_Register cfa_reg;
+  enum DWARF_Register return_address_reg;
+  int cfa_offset;
+  std::map<enum DWARF_Register, int> offset_from_cfa;
+};
+
 /*
  * DwarfParser finds out CFA (Canonical Frame Address) from DWARF in ELF binary.
  * Also Return Address (RA) and Base Pointer (BP) are calculated from CFA.
@@ -64,17 +73,14 @@ class DwarfParser {
     const lib_info *_lib;
     unsigned char *_buf;
     unsigned char _encoding;
-    enum DWARF_Register _cfa_reg;
-    enum DWARF_Register _return_address_reg;
     unsigned int _code_factor;
     int _data_factor;
 
     uintptr_t _current_pc;
-    int _cfa_offset;
-    int _ra_cfa_offset;
-    int _bp_cfa_offset;
-    bool _bp_offset_available;
+    struct DwarfState _initial_state;
+    struct DwarfState _state;
 
+    void init_state(struct DwarfState& st);
     uintptr_t read_leb(bool sign);
     uint64_t get_entry_length();
     bool process_cie(unsigned char *start_of_entry, uint32_t id);
@@ -83,26 +89,12 @@ class DwarfParser {
     unsigned int get_pc_range();
 
   public:
-    DwarfParser(lib_info *lib) : _lib(lib),
-                                 _buf(NULL),
-                                 _encoding(0),
-                                 _cfa_reg(RSP),
-                                 _return_address_reg(RA),
-                                 _code_factor(0),
-                                 _data_factor(0),
-                                 _current_pc(0L),
-                                 _cfa_offset(0),
-                                 _ra_cfa_offset(0),
-                                 _bp_cfa_offset(0),
-                                 _bp_offset_available(false) {};
-
+    DwarfParser(lib_info *lib);
     ~DwarfParser() {}
     bool process_dwarf(const uintptr_t pc);
-    enum DWARF_Register get_cfa_register() { return _cfa_reg; }
-    int get_cfa_offset() { return _cfa_offset; }
-    int get_ra_cfa_offset() { return _ra_cfa_offset; }
-    int get_bp_cfa_offset() { return _bp_cfa_offset; }
-    bool is_bp_offset_available() { return _bp_offset_available; }
+    enum DWARF_Register get_cfa_register() { return _state.cfa_reg; }
+    int get_cfa_offset() { return _state.cfa_offset; }
+    int get_offset_from_cfa(enum DWARF_Register reg) { return _state.offset_from_cfa[reg]; }
 
     bool is_in(long pc) {
       return (_lib->exec_start <= pc) && (pc < _lib->exec_end);
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c
index 74563aa0d6c..e2681be73fe 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -187,9 +187,8 @@ static bool fill_addr_info(lib_info* lib) {
   lib->exec_end = (uintptr_t)-1L;
   for (ph = phbuf, cnt = 0; cnt < ehdr.e_phnum; cnt++, ph++) {
     if (ph->p_type == PT_LOAD) {
-      uintptr_t unaligned_start = lib->base + ph->p_vaddr;
-      uintptr_t aligned_start = align_down(unaligned_start, ph->p_align);
-      uintptr_t aligned_end = align_up(unaligned_start + ph->p_memsz, ph->p_align);
+      uintptr_t aligned_start = lib->base + align_down(ph->p_vaddr, ph->p_align);
+      uintptr_t aligned_end = aligned_start + align_up(ph->p_memsz, ph->p_align);
       if ((lib->end == (uintptr_t)-1L) || (lib->end < aligned_end)) {
         lib->end = aligned_end;
       }
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h
index 42a6212510c..62b1b4d0d6b 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,9 @@ struct core_data {
    // part of the class sharing workaround
    int                classes_jsa_fd; // file descriptor of class share archive
    uintptr_t          dynamic_addr;  // address of dynamic section of a.out
+   uintptr_t          vdso_addr;     // address of vDSO
+   off_t              vdso_offset;   // offset of vDSO in core
+   size_t             vdso_size;     // size of vDSO
    uintptr_t          ld_base_addr;  // base address of ld.so
    size_t             num_maps;  // number of maps.
    map_info*          maps;      // maps in a linked list
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
index 899d42152d1..6298f569aaf 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <elf.h>
 #include <link.h>
 #include <errno.h>
+#include <sys/sendfile.h>
+#include <sys/utsname.h>
 #include "libproc_impl.h"
 #include "ps_core_common.h"
 #include "proc_service.h"
@@ -285,6 +288,8 @@ static bool core_handle_note(struct ps_prochandle* ph, ELF_PHDR* note_phdr) {
             // We will adjust it in read_exec_segments().
             ph->core->dynamic_addr = auxv->a_un.a_val;
             break;
+          } else if (auxv->a_type == AT_SYSINFO_EHDR) {
+            ph->core->vdso_addr = auxv->a_un.a_val;
           }
           auxv++;
         }
@@ -350,6 +355,10 @@ static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) {
                   print_error("failed to add map info\n");
                   goto err;
                }
+               if (core_php->p_vaddr == ph->core->vdso_addr) {
+                  ph->core->vdso_offset = core_php->p_offset;
+                  ph->core->vdso_size = core_php->p_memsz;
+               }
             }
             break;
          }
@@ -413,10 +422,18 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li
         if (target_vaddr > existing_map->vaddr) {
             lib_memsz += target_vaddr - existing_map->vaddr;
         }
+        uint64_t aligned_lib_memsz = ROUNDUP(lib_memsz, page_size);
+        size_t aligned_segment_sz = ROUNDUP(lib_php->p_memsz, page_size);
 
+        if (target_vaddr == ph->core->vdso_addr) {
+          // We can overwrite with entire vDSO because vDSO on memory is
+          // entire ELF binary.
+          aligned_lib_memsz = ROUNDUP(existing_map->memsz, page_size);
+          aligned_segment_sz = aligned_lib_memsz;
+        }
         if ((existing_map->memsz != page_size) &&
             (existing_map->fd != lib_fd) &&
-            (ROUNDUP(existing_map->memsz, page_size) != ROUNDUP(lib_memsz, page_size))) {
+            (ROUNDUP(existing_map->memsz, page_size) != aligned_lib_memsz)) {
 
           print_error("address conflict @ 0x%lx (existing map size = %ld, size = %ld, flags = %d)\n",
                         target_vaddr, existing_map->memsz, lib_php->p_memsz, lib_php->p_flags);
@@ -425,11 +442,11 @@ static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* li
 
         /* replace PT_LOAD segment with library segment */
         print_debug("overwrote with new address mapping (memsz %ld -> %ld)\n",
-                     existing_map->memsz, ROUNDUP(lib_php->p_memsz, page_size));
+                     existing_map->memsz, aligned_segment_sz);
 
         existing_map->fd = lib_fd;
         existing_map->offset = lib_php->p_offset;
-        existing_map->memsz = ROUNDUP(lib_php->p_memsz, page_size);
+        existing_map->memsz = aligned_segment_sz;
       }
     }
 
@@ -593,6 +610,44 @@ static uintptr_t calc_prelinked_load_address(struct ps_prochandle* ph, int lib_f
   return load_addr;
 }
 
+// Check for vDSO binary in kernel directory (/lib/modules/<version>/vdso),
+// rewrite the given lib_name string if found.
+// Otherwise copy vDSO memory in coredump to temporal file generated by tmpfile().
+// Returns FD for vDSO (should be closed by caller), or -1 on error.
+static int handle_vdso(struct ps_prochandle* ph, char* lib_name, size_t lib_name_len) {
+  int lib_fd;
+  struct utsname uts;
+  uname(&uts);
+
+  // Check vDSO binary first (for referring debuginfo if possible).
+  char *vdso_path = (char*)malloc(lib_name_len);
+  snprintf(vdso_path, lib_name_len, "/lib/modules/%s/vdso/vdso64.so", uts.release);
+  lib_fd = pathmap_open(vdso_path);
+  if (lib_fd != -1) {
+    print_debug("replace vDSO: %s -> %s\n", lib_name, vdso_path);
+    strncpy(lib_name, vdso_path, lib_name_len);
+  } else {
+    // Copy vDSO memory segment from core to temporal memory
+    // if vDSO binary is not available.
+    FILE* tmpf = tmpfile();
+    if (tmpf == NULL) {
+      print_debug("can't create tmpfile for vDSO (%d)\n", errno);
+      lib_fd = -1;
+    } else {
+      lib_fd = fileno(tmpf);
+      off_t ofs = ph->core->vdso_offset;
+      if (sendfile(lib_fd, ph->core->core_fd, &ofs, ph->core->vdso_size) == -1) {
+        print_debug("can't copy vDSO (%d)\n", errno);
+        fclose(tmpf);
+        lib_fd = -1;
+      }
+    }
+  }
+
+  free(vdso_path);
+  return lib_fd;
+}
+
 // read shared library info from runtime linker's data structures.
 // This work is done by librtlb_db in Solaris
 static bool read_shared_lib_info(struct ps_prochandle* ph) {
@@ -687,9 +742,14 @@ static bool read_shared_lib_info(struct ps_prochandle* ph) {
          // it will fail later.
       }
 
-      if (lib_name[0] != '\0') {
-         // ignore empty lib names
-         lib_fd = pathmap_open(lib_name);
+      if (lib_name[0] != '\0') { // ignore empty lib names
+         // We can use lib_base_diff to compare with vdso_addr
+         // because base address of vDSO should be 0.
+         if (lib_base_diff == ph->core->vdso_addr) {
+           lib_fd = handle_vdso(ph, lib_name, sizeof(lib_name));
+         } else {
+           lib_fd = pathmap_open(lib_name);
+         }
 
          if (lib_fd < 0) {
             print_debug("can't open shared object %s\n", lib_name);
diff --git a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c
index 07cbb46d045..c8f3fb2ed4c 100644
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -550,14 +550,33 @@ uintptr_t search_symbol(struct symtab* symtab, uintptr_t base,
   return (uintptr_t) NULL;
 }
 
+static bool is_in(uintptr_t offset, struct elf_symbol* sym) {
+  if (sym->size == 0 && offset == sym->offset) {
+    // offset points to the top of the symbol.
+    // Some functions have size 0. For example, __restore_rt() (signal trampoline
+    // in glibc) would be detected as out of the function incorrectly, even if it
+    // points to the top of the instruction address, because the size of
+    // __restore_rt() is 0 (you can see this with "readelf -s libc.so.6" when
+    // debug symbols are available).
+    // Hence we need to treat this as a special case if the function size is 0,
+    // only the exact symbol address should be treated as inside.
+    return true;
+  } else if (offset >= sym->offset && offset < sym->offset + sym->size) {
+    // offset is in address range of the symbol
+    return true;
+  }
+
+  // offset is out of address range of the symbol
+  return false;
+}
+
 const char* nearest_symbol(struct symtab* symtab, uintptr_t offset,
                            uintptr_t* poffset) {
   int n = 0;
   if (!symtab) return NULL;
   for (; n < symtab->num_symbols; n++) {
      struct elf_symbol* sym = &(symtab->symbols[n]);
-     if (sym->name != NULL &&
-         offset >= sym->offset && offset < sym->offset + sym->size) {
+     if (sym->name != NULL && is_in(offset, sym)) {
         if (poffset) *poffset = (offset - sym->offset);
         return sym->name;
      }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
index 01b9a4a447e..74335f78888 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,6 @@ import sun.jvm.hotspot.oops.InstanceKlass;
 import sun.jvm.hotspot.oops.Klass;
 import sun.jvm.hotspot.oops.Metadata;
 import sun.jvm.hotspot.oops.Method;
-import sun.jvm.hotspot.oops.MethodData;
 import sun.jvm.hotspot.oops.Oop;
 import sun.jvm.hotspot.oops.RawHeapVisitor;
 import sun.jvm.hotspot.oops.Symbol;
@@ -860,44 +859,8 @@ public class CommandProcessor {
                 }
             }
         },
-        new Command("printmdo", "printmdo [ -a | expression ]", false) {
-            // Print every MDO in the heap or the one referenced by expression.
-            public void doit(Tokens t) {
-                if (t.countTokens() != 1) {
-                    usage();
-                } else {
-                    String s = t.nextToken();
-                    if (s.equals("-a")) {
-                        ClassLoaderDataGraph cldg = VM.getVM().getClassLoaderDataGraph();
-                        cldg.classesDo(new ClassLoaderDataGraph.ClassVisitor() {
-                                public void visit(Klass k) {
-                                    if (k instanceof InstanceKlass) {
-                                        MethodArray methods = ((InstanceKlass)k).getMethods();
-                                        for (int i = 0; i < methods.length(); i++) {
-                                            Method m = methods.at(i);
-                                            MethodData mdo = m.getMethodData();
-                                            if (mdo != null) {
-                                                out.println("MethodData " + mdo.getAddress() + " for " +
-                                                    "method " + m.getMethodHolder().getName().asString() + "." +
-                                                    m.getName().asString() +
-                                                            m.getSignature().asString() + "@" + m.getAddress());
-                                                mdo.printDataOn(out);
-                                    }
-                                }
-                                    }
-                                }
-                            }
-                            );
-                    } else {
-                        Address a = VM.getVM().getDebugger().parseAddress(s);
-                        MethodData mdo = (MethodData) Metadata.instantiateWrapperFor(a);
-                        mdo.printDataOn(out);
-                    }
-                }
-            }
-        },
         new Command("printall", "printall", false) {
-            // Print every MDO in the heap or the one referenced by expression.
+            // Print every Method for every class loaded.
             public void doit(Tokens t) {
                 if (t.countTokens() != 0) {
                     usage();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java
index 44b407edaca..7ce46799495 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/classfile/ClassLoaderData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,12 +44,14 @@ public class ClassLoaderData extends VMObject {
   private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
     Type type      = db.lookupType("ClassLoaderData");
     classLoaderFieldOffset = type.getAddressField("_class_loader").getOffset();
+    theNullClassLoaderDataField = type.getAddressField("_the_null_class_loader_data");
     nextField = type.getAddressField("_next");
     klassesField = new MetadataField(type.getAddressField("_klasses"), 0);
     hasClassMirrorHolderField = new CIntField(type.getCIntegerField("_has_class_mirror_holder"), 0);
   }
 
   private static long classLoaderFieldOffset;
+  private static AddressField theNullClassLoaderDataField;
   private static AddressField nextField;
   private static MetadataField  klassesField;
   private static CIntField hasClassMirrorHolderField;
@@ -75,6 +77,10 @@ public class ClassLoaderData extends VMObject {
     return hasClassMirrorHolderField.getValue(this) != 0;
   }
 
+  public static ClassLoaderData theNullClassLoaderData() {
+    return instantiateWrapperFor(theNullClassLoaderDataField.getValue());
+  }
+
   public ClassLoaderData next() {
     return instantiateWrapperFor(nextField.getValue(getAddress()));
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
index e3543503216..15f6615421c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -81,11 +81,7 @@ class LinuxCDebugger implements CDebugger {
     String cpu = dbg.getCPU();
     if (cpu.equals("amd64")) {
        AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
-       Address sp  = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
-       if (sp == null) return null;
-       Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
-       if (pc == null) return null;
-       return LinuxAMD64CFrame.getTopFrame(dbg, sp, pc, context);
+       return LinuxAMD64CFrame.getTopFrame(dbg, context);
     }  else if (cpu.equals("ppc64")) {
         PPC64ThreadContext context = (PPC64ThreadContext) thread.getContext();
         Address sp = context.getRegisterAsAddress(PPC64ThreadContext.SP);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java
index 1106d846eca..a53b8a0a282 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,14 @@ import sun.jvm.hotspot.debugger.cdbg.*;
     by the architecture-specific subpackages. */
 
 public interface LinuxDebugger extends JVMDebugger {
+  // SIGHANDLER_NAMES holds the name of signal handler.
+  public static final List<String> SIGHANDLER_NAMES = List.of(
+    // For AMD64
+    //   - sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c in glibc
+    //   - gdb/amd64-linux-tdep.c in GDB
+    "__restore_rt"
+  );
+
   public String       addressValueToString(long address) throws DebuggerException;
   public boolean      readJBoolean(long address) throws DebuggerException;
   public byte         readJByte(long address) throws DebuggerException;
@@ -52,6 +60,7 @@ public interface LinuxDebugger extends JVMDebugger {
   public long[]       getThreadIntegerRegisterSet(int lwp_id) throws DebuggerException;
   public long         getAddressValue(Address addr) throws DebuggerException;
   public Address      findLibPtrByAddress(Address pc);
+  public boolean      isSignalTrampoline(Address pc);
 
   // For LinuxCDebugger
   public List<ThreadProxy> getThreadList();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
index 261df12c8f1..9a75511e44d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,12 @@ public class LinuxDebuggerLocal extends DebuggerBase implements LinuxDebugger {
                          : new LinuxAddress(this, ptr);
     }
 
+    @Override
+    public boolean isSignalTrampoline(Address pc) {
+      var sym = lookup(getAddressValue(pc));
+      return sym == null ? false : SIGHANDLER_NAMES.contains(sym.getName());
+    }
+
     // Note on Linux threads are really processes. When target process is
     // attached by a serviceability agent thread, only that thread can do
     // ptrace operations on the target. This is because from kernel's point
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/DwarfParser.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/DwarfParser.java
index 3b63ee0a21e..53351c918d3 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/DwarfParser.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/DwarfParser.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, NTT DATA.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,9 +66,15 @@ public class DwarfParser {
     processDwarf0(pc.asLongValue());
   }
 
+  /**
+   * @return true if BP offset is declared in DWARF instructions.
+   */
+  public boolean isBPOffsetAvailable() {
+    return getBasePointerOffsetFromCFA() != Integer.MAX_VALUE;
+  }
+
   public native int getCFARegister();
   public native int getCFAOffset();
   public native int getReturnAddressOffsetFromCFA();
   public native int getBasePointerOffsetFromCFA();
-  public native boolean isBPOffsetAvailable();
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java
index 612203634f3..4d3d9d5998d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,12 @@
 
 package sun.jvm.hotspot.debugger.linux.amd64;
 
+import java.util.function.Function;
+
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.linux.*;
+import sun.jvm.hotspot.debugger.linux.amd64.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
 import sun.jvm.hotspot.runtime.*;
@@ -34,9 +37,12 @@ import sun.jvm.hotspot.runtime.amd64.*;
 
 public final class LinuxAMD64CFrame extends BasicCFrame {
 
-   public static LinuxAMD64CFrame getTopFrame(LinuxDebugger dbg, Address rsp, Address rip, ThreadContext context) {
+   private static LinuxAMD64CFrame getFrameFromReg(LinuxDebugger dbg, Function<Integer, Address> getreg) {
+      Address rip = getreg.apply(AMD64ThreadContext.RIP);
+      Address rsp = getreg.apply(AMD64ThreadContext.RSP);
+      Address rbp = getreg.apply(AMD64ThreadContext.RBP);
       Address libptr = dbg.findLibPtrByAddress(rip);
-      Address cfa = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
+      Address cfa = null;
       DwarfParser dwarf = null;
 
       if (libptr != null) { // Native frame
@@ -47,41 +53,47 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
           // DWARF processing should succeed when the frame is native
           // but it might fail if Common Information Entry (CIE) has language
           // personality routine and/or Language Specific Data Area (LSDA).
-          return new LinuxAMD64CFrame(dbg, rsp, cfa, rip, dwarf, true);
+          return new LinuxAMD64CFrame(dbg, rsp, rbp, cfa, rip, dwarf, true);
         }
 
-        cfa = context.getRegisterAsAddress(dwarf.getCFARegister())
-                     .addOffsetTo(dwarf.getCFAOffset());
+        cfa = getreg.apply(dwarf.getCFARegister())
+                    .addOffsetTo(dwarf.getCFAOffset());
       }
 
-      return (cfa == null) ? null
-                           : new LinuxAMD64CFrame(dbg, rsp, cfa, rip, dwarf);
+      return (rbp == null && cfa == null)
+        ? null
+        : new LinuxAMD64CFrame(dbg, rsp, rbp, cfa, rip, dwarf);
    }
 
-   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address cfa, Address rip, DwarfParser dwarf) {
-      this(dbg, rsp, cfa, rip, dwarf, false);
+   public static LinuxAMD64CFrame getTopFrame(LinuxDebugger dbg, ThreadContext context) {
+      return getFrameFromReg(dbg, context::getRegisterAsAddress);
    }
 
-   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame) {
-      this(dbg, rsp, cfa, rip, dwarf, finalFrame, false);
+   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address rbp, Address cfa, Address rip, DwarfParser dwarf) {
+      this(dbg, rsp, rbp, cfa, rip, dwarf, false);
    }
 
-   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address cfa, Address rip, DwarfParser dwarf, boolean finalFrame, boolean use1ByteBeforeToLookup) {
+   private LinuxAMD64CFrame(LinuxDebugger dbg, Address rsp, Address rbp, Address cfa, Address rip, DwarfParser dwarf, boolean use1ByteBeforeToLookup) {
       super(dbg.getCDebugger());
       this.rsp = rsp;
+      this.rbp = rbp;
       this.cfa = cfa;
       this.rip = rip;
       this.dbg = dbg;
       this.dwarf = dwarf;
-      this.finalFrame = finalFrame;
       this.use1ByteBeforeToLookup = use1ByteBeforeToLookup;
    }
 
    // override base class impl to avoid ELF parsing
    public ClosestSymbol closestSymbolToPC() {
       Address symAddr = use1ByteBeforeToLookup ? pc().addOffsetTo(-1) : pc();
-      // try native lookup in debugger.
-      return dbg.lookup(dbg.getAddressValue(symAddr));
+      var sym = dbg.lookup(dbg.getAddressValue(symAddr));
+
+      // Returns a special symbol if the address is signal handler,
+      // otherwise returns closest symbol generated by LinuxDebugger.
+      return dbg.isSignalTrampoline(symAddr)
+        ? new ClosestSymbol(sym.getName() + " <signal trampoline>", 0)
+        : sym;
    }
 
    public Address pc() {
@@ -89,77 +101,74 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
    }
 
    public Address localVariableBase() {
-      return cfa;
+      return (dwarf != null && dwarf.isBPOffsetAvailable())
+        ? cfa.addOffsetTo(dwarf.getBasePointerOffsetFromCFA())
+        : rbp;
    }
 
-   private Address getNextPC(boolean useDwarf) {
+   private Address getNextPC() {
      try {
-       long offs = useDwarf ? dwarf.getReturnAddressOffsetFromCFA()
-                            : ADDRESS_SIZE;
-       return cfa.getAddressAt(offs);
+       return dwarf == null
+         ? rbp.getAddressAt(ADDRESS_SIZE) // Java frame
+         : cfa.getAddressAt(dwarf.getReturnAddressOffsetFromCFA()); // Native frame
      } catch (UnmappedAddressException | UnalignedAddressException e) {
        return null;
      }
    }
 
-   private boolean isValidFrame(Address nextCFA, boolean isNative) {
-     // CFA should never be null.
-     // nextCFA must be greater than current CFA, if frame is native.
-     // Java interpreter frames can share the CFA (frame pointer).
-     return nextCFA != null &&
-         (!isNative || (isNative && nextCFA.greaterThan(cfa)));
+   private boolean isValidFrame(Address nextCFA, Address nextRBP) {
+     // Both CFA and RBP must not be null.
+     if (nextCFA == null && nextRBP == null) {
+       return false;
+     }
+
+     // RBP must not be null if CFA is null - it happens between Java frame and Native frame.
+     // We cannot validate RBP value because it might be used as GPR. Thus returns true
+     // if RBP is not null.
+     if (nextCFA == null && nextRBP != null) {
+       return true;
+     }
+
+     // nextCFA must be greater than current CFA.
+     if (nextCFA != null && nextCFA.greaterThanOrEqual(cfa)) {
+       return true;
+     }
+
+     // Otherwise, the frame is not valid.
+     return false;
    }
 
    private Address getNextRSP() {
-     // next RSP should be previous slot of return address.
-     var bp = dwarf == null ? cfa.addOffsetTo(ADDRESS_SIZE) // top of BP points callser BP
-                            : cfa.addOffsetTo(dwarf.getReturnAddressOffsetFromCFA());
-     return bp.addOffsetTo(ADDRESS_SIZE);
+     return dwarf == null ? rbp.addOffsetTo(2 * ADDRESS_SIZE) // Java frame - skip saved BP and RA
+                          : cfa.addOffsetTo(dwarf.getReturnAddressOffsetFromCFA())
+                               .addOffsetTo(ADDRESS_SIZE); // Native frame
    }
 
-   private Address getNextCFA(DwarfParser nextDwarf, ThreadContext context, Address senderFP, Address senderPC) {
-     Address nextCFA;
-     boolean isNative = false;
-
-     if (senderFP == null) {
-       senderFP = cfa.getAddressAt(0);  // RBP by default
+   private Address getNextRBP(Address senderFP) {
+     if (senderFP != null) {
+       return senderFP;
+     } else if (dwarf == null) { // Current frame is Java
+       return rbp.getAddressAt(0);
+     } else { // Current frame is Native
+       return dwarf.isBPOffsetAvailable()
+         ? cfa.getAddressAt(dwarf.getBasePointerOffsetFromCFA())
+         : rbp;
      }
+   }
 
-     if (VM.getVM().getCodeCache().contains(senderPC)) { // Next frame is Java
-       nextCFA = (dwarf == null) ? senderFP // Current frame is Java
-                                 : cfa.getAddressAt(dwarf.getBasePointerOffsetFromCFA()); // Current frame is Native
-     } else { // Next frame is Native
-       if (VM.getVM().getCodeCache().contains(pc())) { // Current frame is Java
-         nextCFA = senderFP.addOffsetTo(-nextDwarf.getBasePointerOffsetFromCFA());
-       } else { // Current frame is Native
-         if (nextDwarf == null) { // maybe runtime entrypoint (_start())
-           throw new DebuggerException("nextDwarf is null even though native call");
-         }
-
-         isNative = true;
-         int nextCFAReg = nextDwarf.getCFARegister();
-         if (nextCFAReg == AMD64ThreadContext.RBP) {
-           Address rbp = dwarf.isBPOffsetAvailable() ? cfa.addOffsetTo(dwarf.getBasePointerOffsetFromCFA())
-                                                     : context.getRegisterAsAddress(AMD64ThreadContext.RBP);
-           Address nextRBP = rbp.getAddressAt(0);
-           nextCFA = nextRBP.addOffsetTo(-nextDwarf.getBasePointerOffsetFromCFA());
-         } else if (nextCFAReg == AMD64ThreadContext.RSP) {
-           nextCFA = getNextRSP().addOffsetTo(nextDwarf.getCFAOffset());
-         } else {
-           throw new DebuggerException("Unsupported CFA register: " + nextCFAReg);
-         }
-       }
-     }
-
-     // Sanity check for next CFA address
-     try {
-       nextCFA.getAddressAt(0);
-     } catch (Exception e) {
-       // return null if next CFA address is invalid
+   private Address getNextCFA(DwarfParser nextDwarf, Address senderFP, Address senderPC) {
+     if (nextDwarf == null) { // Next frame is Java
+       // CFA is not available on Java frame
        return null;
      }
 
-     return isValidFrame(nextCFA, isNative) ? nextCFA : null;
+     // Next frame is Native
+     int nextCFAReg = nextDwarf.getCFARegister();
+     return switch(nextCFAReg){
+       case AMD64ThreadContext.RBP -> getNextRBP(senderFP).addOffsetTo(nextDwarf.getCFAOffset());
+       case AMD64ThreadContext.RSP -> getNextRSP().addOffsetTo(nextDwarf.getCFAOffset());
+       default -> throw new DebuggerException("Unsupported CFA register: " + nextCFAReg);
+     };
    }
 
    @Override
@@ -169,8 +178,10 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
 
    @Override
    public CFrame sender(ThreadProxy th, Address sp, Address fp, Address pc) {
-     if (finalFrame) {
-       return null;
+     if (dbg.isSignalTrampoline(pc())) {
+       // RSP points signal context
+       //   https://github.com/torvalds/linux/blob/v6.17/arch/x86/kernel/signal.c#L94
+       return getFrameFromReg(dbg, r -> LinuxAMD64ThreadContext.getRegFromSignalTrampoline(this.rsp, r.intValue()));
      }
 
      ThreadContext context = th.getContext();
@@ -179,8 +190,7 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
      if (nextRSP == null) {
        return null;
      }
-
-     Address nextPC = pc != null ? pc : getNextPC(dwarf != null);
+     Address nextPC = pc != null ? pc : getNextPC();
      if (nextPC == null) {
        return null;
      }
@@ -203,11 +213,23 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
        }
      }
 
+     Address nextRBP = getNextRBP(fp);
+
      try {
-       Address nextCFA = getNextCFA(nextDwarf, context, fp, nextPC);
-       return new LinuxAMD64CFrame(dbg, nextRSP, nextCFA, nextPC, nextDwarf, false, fallback);
-     } catch (DebuggerException _) {
-       return null;
+       Address nextCFA = getNextCFA(nextDwarf, fp, nextPC);
+       return isValidFrame(nextCFA, nextRBP)
+         ? new LinuxAMD64CFrame(dbg, nextRSP, nextRBP, nextCFA, nextPC, nextDwarf, fallback)
+         : null;
+     } catch (DebuggerException e) {
+       if (dbg.isSignalTrampoline(nextPC)) {
+         // We can through the caller frame if it is signal trampoline.
+         // getNextCFA() might fail because DwarfParser cannot find out CFA register.
+         return new LinuxAMD64CFrame(dbg, nextRSP, nextRBP, null, nextPC, nextDwarf, fallback);
+       }
+
+       // Rethrow the original exception if getNextCFA() failed
+       // and the caller is not signal trampoline.
+       throw e;
      }
    }
 
@@ -231,16 +253,16 @@ public final class LinuxAMD64CFrame extends BasicCFrame {
 
    @Override
    public Frame toFrame() {
-     return new AMD64Frame(rsp, cfa, rip);
+     return new AMD64Frame(rsp, localVariableBase(), rip);
    }
 
    // package/class internals only
    private static final int ADDRESS_SIZE = 8;
    private Address rsp;
+   private Address rbp;
    private Address rip;
    private Address cfa;
    private LinuxDebugger dbg;
    private DwarfParser dwarf;
-   private boolean finalFrame;
    private boolean use1ByteBeforeToLookup;
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java
index 3884bab796b..8b2a7301cf2 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package sun.jvm.hotspot.debugger.linux.amd64;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.linux.*;
+import sun.jvm.hotspot.runtime.*;
 
 public class LinuxAMD64ThreadContext extends AMD64ThreadContext {
   private LinuxDebugger debugger;
@@ -43,4 +44,23 @@ public class LinuxAMD64ThreadContext extends AMD64ThreadContext {
   public Address getRegisterAsAddress(int index) {
     return debugger.newAddress(getRegister(index));
   }
+
+  public static Address getRegFromSignalTrampoline(Address sp, int index) {
+    // ucontext_t is located at top of stack.
+    // See definition of rt_sigframe in arch/x86/include/asm/sigframe.h
+    // in Linux Kernel.
+    Address addrUCMContext = sp.addOffsetTo(40); // offsetof(ucontext_t, uc_mcontext) = 40
+    Address addrGRegs = addrUCMContext; // gregs is located at top of ucontext_t
+
+    // They are from sys/ucontext.h
+    final int REG_RBP = 10;
+    final int REG_RSP = 15;
+    final int REG_RIP = 16;
+    return switch(index) {
+      case AMD64ThreadContext.RBP -> addrGRegs.getAddressAt(REG_RBP * VM.getVM().getAddressSize());
+      case AMD64ThreadContext.RSP -> addrGRegs.getAddressAt(REG_RSP * VM.getVM().getAddressSize());
+      case AMD64ThreadContext.RIP -> addrGRegs.getAddressAt(REG_RIP * VM.getVM().getAddressSize());
+      default -> throw new IllegalArgumentException("Unsupported register index: " + index);
+    };
+  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java
index 64bdb8c1c72..04f374de80e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.windows.amd64.*;
+import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.utilities.AddressOps;
 
 class WindbgCDebugger implements CDebugger {
@@ -66,14 +67,35 @@ class WindbgCDebugger implements CDebugger {
     return null;
   }
 
+  private JavaThread mapThreadProxyToJavaThread(ThreadProxy thread) {
+    var threads = VM.getVM().getThreads();
+    for (int i = 0; i < threads.getNumberOfThreads(); i++) {
+      var jt = threads.getJavaThreadAt(i);
+      if (thread.equals(jt.getThreadProxy())) {
+        return jt;
+      }
+    }
+
+    // not found
+    return null;
+  }
+
   public CFrame topFrameForThread(ThreadProxy thread) throws DebuggerException {
     if (dbg.getCPU().equals("amd64")) {
       AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
+
+      // rbp is not needed null check because it could be used as GPR by compiler (cl.exe) option.
       Address rbp = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
-      if (rbp == null) return null;
+
+      Address rsp = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+      if (rsp == null) return null;
       Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
       if (pc == null) return null;
-      return new WindowsAMD64CFrame(dbg, rbp, pc);
+
+      // get JavaThread as the owner from ThreadProxy
+      JavaThread ownerThread = mapThreadProxyToJavaThread(thread);
+
+      return new WindowsAMD64CFrame(dbg, ownerThread, rsp, rbp, pc);
     } else {
       // unsupported CPU!
       return null;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
index 46edb2f55b2..82dc28515d3 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,4 +85,8 @@ public interface WindbgDebugger extends JVMDebugger {
   //   public ThreadProxy getThreadForIdentifierAddress(Address addr);
 
   public int getAddressSize();
+
+  public static record SenderRegs(Address nextSP, Address nextFP, Address nextPC) {};
+
+  public SenderRegs getSenderRegs(Address sp, Address fp, Address pc);
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
index 9ed05b31319..4864b94fd86 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -229,6 +229,12 @@ public class WindbgDebuggerLocal extends DebuggerBase implements WindbgDebugger
     return lookupByAddress0(address);
   }
 
+  public synchronized SenderRegs getSenderRegs(Address sp, Address fp, Address pc) {
+    // sp and pc should not be null, but fp might be null because it could be used as GPR.
+    long[] rawSenderRegs = getSenderRegs0(sp.asLongValue(), fp == null ? 0L : fp.asLongValue(), pc.asLongValue());
+    return rawSenderRegs == null ? null : new SenderRegs(newAddress(rawSenderRegs[0]), newAddress(rawSenderRegs[1]), newAddress(rawSenderRegs[2]));
+  }
+
   /** From the Debugger interface */
   public MachineDescription getMachineDescription() {
     return machDesc;
@@ -644,6 +650,7 @@ public class WindbgDebuggerLocal extends DebuggerBase implements WindbgDebugger
   private native String consoleExecuteCommand0(String cmd);
   private native long lookupByName0(String objName, String symName);
   private native ClosestSymbol lookupByAddress0(long address);
+  private native long[] getSenderRegs0(long sp, long fp, long pc);
 
   // helper called lookupByAddress0
   private ClosestSymbol createClosestSymbol(String symbol, long diff) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java
index 69ad04da51b..b004a84fff4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windows/amd64/WindowsAMD64CFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,43 +29,74 @@ import sun.jvm.hotspot.debugger.amd64.*;
 import sun.jvm.hotspot.debugger.cdbg.*;
 import sun.jvm.hotspot.debugger.cdbg.basic.*;
 import sun.jvm.hotspot.debugger.windbg.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.amd64.*;
 
 public class WindowsAMD64CFrame extends BasicCFrame {
+  private JavaThread ownerThread;
+  private Address rsp;
   private Address rbp;
   private Address pc;
 
-  private static final int ADDRESS_SIZE = 8;
-
   /** Constructor for topmost frame */
-  public WindowsAMD64CFrame(WindbgDebugger dbg, Address rbp, Address pc) {
+  public WindowsAMD64CFrame(WindbgDebugger dbg, JavaThread ownerThread, Address rsp, Address rbp, Address pc) {
     super(dbg.getCDebugger());
+    this.ownerThread = ownerThread;
+    this.rsp = rsp;
     this.rbp = rbp;
     this.pc  = pc;
     this.dbg = dbg;
   }
 
+  @Override
   public CFrame sender(ThreadProxy thread) {
-    AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
-    Address rsp = context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+    return sender(thread, null, null, null);
+  }
 
-    if ( (rbp == null) || rbp.lessThan(rsp) ) {
-      return null;
-    }
+  @Override
+  public CFrame sender(ThreadProxy th, Address nextSP, Address nextFP, Address nextPC) {
+    if (nextSP == null && nextPC == null) {
+      // GetStackTrace() by Windows Debug API would unwind frame with given SP, FP, and PC.
+      // However it would not work for dynamic generated code like CodeBlob because
+      // HotSpot would not register unwind info like RtlAddFunctionTable().
+      // Thus SA should check whether current PC is in CodeCache at first when nextPC is null.
+      var cb = VM.getVM().getCodeCache().findBlob(pc);
+      if (cb != null) {
+        if (cb.getFrameSize() > 0) {
+          nextSP = rsp.addOffsetTo(cb.getFrameSize());
+          nextPC = nextSP.getAddressAt(-1 * VM.getVM().getAddressSize());
 
-    // Check alignment of rbp
-    if ( dbg.getAddressValue(rbp) % ADDRESS_SIZE != 0) {
+          // Set nextFP to null when PreserveFramePointer is disabled because We could not find out
+          // frame pointer of sender frame - it might be omitted.
+          nextFP = VM.getVM().getCommandLineBooleanFlag("PreserveFramePointer") ? rsp.getAddressAt(0) : null;
+        } else {
+          // Use Frame (AMD64Frame) to access slots on stack.
+          var frame = toFrame();
+          nextSP = frame.getSenderSP();
+          nextPC = frame.getSenderPC();
+          nextFP = frame.getLink();
+        }
+        return new WindowsAMD64CFrame(dbg, ownerThread, nextSP, nextFP, nextPC);
+      }
+
+      WindbgDebugger.SenderRegs senderRegs = dbg.getSenderRegs(rsp, rbp, pc);
+      if (senderRegs == null) {
         return null;
-    }
+      }
 
-    Address nextRBP = rbp.getAddressAt( 0 * ADDRESS_SIZE);
-    if (nextRBP == null || nextRBP.lessThanOrEqual(rbp)) {
-      return null;
+      if (senderRegs.nextSP() == null || senderRegs.nextSP().lessThanOrEqual(rsp)) {
+        return null;
+      }
+      nextSP = senderRegs.nextSP();
+
+      if (senderRegs.nextPC() == null) {
+        return null;
+      }
+      nextPC = senderRegs.nextPC();
+
+      nextFP = senderRegs.nextFP();
     }
-    Address nextPC  = rbp.getAddressAt( 1 * ADDRESS_SIZE);
-    if (nextPC == null) {
-      return null;
-    }
-    return new WindowsAMD64CFrame(dbg, nextRBP, nextPC);
+    return new WindowsAMD64CFrame(dbg, ownerThread, nextSP, nextFP, nextPC);
   }
 
   public Address pc() {
@@ -76,5 +107,21 @@ public class WindowsAMD64CFrame extends BasicCFrame {
     return rbp;
   }
 
+  @Override
+  public Frame toFrame() {
+    // Find the top of JavaVFrame related to this CFrame. The Windows  GetStackTrace DbgHelp API
+    // cannot get FP for java frames.
+    for (JavaVFrame vf = ownerThread.getLastJavaVFrameDbg(); vf != null; vf = vf.javaSender()) {
+      Frame f = vf.getFrame();
+      if (f.getSP().equals(rsp) && f.getPC().equals(pc)) {
+        return f;
+      } else if (f.getSP().greaterThanOrEqual(rsp)) {
+        return f;
+      }
+    }
+
+    return new AMD64Frame(rsp, localVariableBase(), pc);
+  }
+
   private WindbgDebugger dbg;
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java
index 75d9589a74f..fda97b4f337 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@ public class OopMapCacheEntry {
 
   Method method()        { return method; }
   int bci()              { return bci; }
-  int numberOfEntries()  { return maskSize; }
+  public int numberOfEntries() { return maskSize; }
   boolean entryAt(int offset) {
     return mask.at(offset);
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
index 94200e31b7e..12b614e7fa8 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ public class FileMapInfo {
   private static Address rwRegionEndAddress;
   private static Address vtablesIndex;
   private static Address mapped_base_address;
+  private static long metadataOffsetShift;
 
   // HashMap created by mapping the vTable addresses in the rw region with
   // the corresponding metadata type.
@@ -97,10 +98,15 @@ public class FileMapInfo {
     headerObj = VMObjectFactory.newObject(FileMapHeader.class, header);
 
     // char* mapped_base_address = header->_mapped_base_address
-    // size_t cloned_vtable_offset = header->_cloned_vtable_offset
+    // narrowPtr cloned_vtable_narrowPtr = header->_cloned_vtables
+    // size_t cloned_vtable_offset = AOTCompressedPointers::get_byte_offset(cloned_vtable_narrowPtr);
     // CppVtableInfo** vtablesIndex = mapped_base_address + cloned_vtable_offset;
     mapped_base_address = get_AddressField(FileMapHeader_type, header, "_mapped_base_address");
-    long cloned_vtable_offset = get_CIntegerField(FileMapHeader_type, header, "_cloned_vtables_offset");
+    long cloned_vtable_narrowPtr = get_CIntegerField(FileMapHeader_type, header, "_cloned_vtables");
+    // narrowPtr stores scaled offset units (byte_offset >> MetadataOffsetShift).
+    // Apply the left shift to convert back to byte offset.
+    metadataOffsetShift = db.lookupIntConstant("AOTCompressedPointers::MetadataOffsetShift").longValue();
+    long cloned_vtable_offset = cloned_vtable_narrowPtr << metadataOffsetShift;
     vtablesIndex = mapped_base_address.addOffsetTo(cloned_vtable_offset);
 
     // CDSFileMapRegion* rw_region = &header->_region[rw];
@@ -174,9 +180,9 @@ public class FileMapInfo {
 
       // vtablesIndex points to to an array like this:
       // long info[] = {
-      //   offset of the CppVtableInfo for ConstantPool,
-      //   offset of the CppVtableInfo for InstanceKlass,
-      //   offset of the CppVtableInfo for InstanceClassLoaderKlass,
+      //   narrowPtr of the CppVtableInfo for ConstantPool,
+      //   narrowPtr of the CppVtableInfo for InstanceKlass,
+      //   narrowPtr of the CppVtableInfo for InstanceClassLoaderKlass,
       //   ...
       // };
       //
@@ -187,8 +193,8 @@ public class FileMapInfo {
       // };
       //
       // The loop below computes the following
-      //     CppVtableInfo* t_ConstantPool  = mapped_base_address + info[0];
-      //     CppVtableInfo* t_InstanceKlass = mapped_base_address + info[1];
+      //     CppVtableInfo* t_ConstantPool  = mapped_base_address + (info[0] << metadataOffsetShift);
+      //     CppVtableInfo* t_InstanceKlass = mapped_base_address + (info[1] << metadataOffsetShift);
       //     ...
       //
       // If we have the following objects
@@ -201,21 +207,21 @@ public class FileMapInfo {
       //
       // To get an idea what these address look like, do this:
       //
-      // $ java -Xlog:cds+vtables=debug -XX:+UnlockDiagnosticVMOptions -XX:ArchiveRelocationMode=0 --version
-      // [0.002s][debug][cds,vtables] Copying  14 vtable entries for ConstantPool to 0x800000018
-      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceKlass to 0x800000090
-      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceClassLoaderKlass to 0x8000001e0
-      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceMirrorKlass to 0x800000330
-      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceRefKlass to 0x800000480
-      // [0.002s][debug][cds,vtables] Copying  41 vtable entries for InstanceStackChunkKlass to 0x8000005d0
-      // [0.002s][debug][cds,vtables] Copying  14 vtable entries for Method to 0x800000720
-      // [0.002s][debug][cds,vtables] Copying  42 vtable entries for ObjArrayKlass to 0x800000798
-      // [0.002s][debug][cds,vtables] Copying  42 vtable entries for TypeArrayKlass to 0x8000008f0
-      // java 23-internal 2024-09-17
+      // $ java -Xlog:aot+vtables=debug -XX:+UnlockDiagnosticVMOptions -XX:ArchiveRelocationMode=0 --version
+      // [0.002s][debug][aot,vtables] Copying  14 vtable entries for ConstantPool to 0x800000018
+      // [0.002s][debug][aot,vtables] Copying  41 vtable entries for InstanceKlass to 0x800000090
+      // [0.002s][debug][aot,vtables] Copying  41 vtable entries for InstanceClassLoaderKlass to 0x8000001e0
+      // [0.002s][debug][aot,vtables] Copying  41 vtable entries for InstanceMirrorKlass to 0x800000330
+      // [0.002s][debug][aot,vtables] Copying  41 vtable entries for InstanceRefKlass to 0x800000480
+      // [0.002s][debug][aot,vtables] Copying  41 vtable entries for InstanceStackChunkKlass to 0x8000005d0
+      // [0.002s][debug][aot,vtables] Copying  14 vtable entries for Method to 0x800000720
+      // [0.002s][debug][aot,vtables] Copying  42 vtable entries for ObjArrayKlass to 0x800000798
+      // [0.002s][debug][aot,vtables] Copying  42 vtable entries for TypeArrayKlass to 0x8000008f0
       // ...
 
       for (int i=0; i < metadataTypeArray.length; i++) {
-        long vtable_offset = vtablesIndex.getJLongAt(i * addressSize); // long offset = _index[i]
+        long narrowPtr = vtablesIndex.getJLongAt(i * addressSize);
+        long vtable_offset = narrowPtr << metadataOffsetShift;
 
         // CppVtableInfo* t = the address of the CppVtableInfo for the i-th table
         Address vtableInfoAddress = mapped_base_address.addOffsetTo(vtable_offset);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java
deleted file mode 100644
index 0eaa3faa74a..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayData.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// ArrayData
-//
-// A ArrayData is a base class for accessing profiling data which does
-// not have a statically known size.  It consists of an array length
-// and an array start.
-abstract class ArrayData extends ProfileData {
-
-  static final int arrayLenOffSet = 0;
-  static final int arrayStartOffSet = 1;
-
-  int arrayUintAt(int index) {
-    int aindex = index + arrayStartOffSet;
-    return uintAt(aindex);
-  }
-  int arrayIntAt(int index) {
-    int aindex = index + arrayStartOffSet;
-    return intAt(aindex);
-  }
-
-  // Code generation support for subclasses.
-  static int arrayElementOffset(int index) {
-    return cellOffset(arrayStartOffSet + index);
-  }
-
-  ArrayData(DataLayout layout) {
-    super(layout);
-  }
-
-  static int staticCellCount() {
-    return -1;
-  }
-
-  int arrayLen() {
-    return intAt(arrayLenOffSet);
-  }
-
-  public int cellCount() {
-    return arrayLen() + 1;
-  }
-
-  // Code generation support
-  static int arrayLenOffset() {
-    return cellOffset(arrayLenOffSet);
-  }
-  static int arrayStartOffset() {
-    return cellOffset(arrayStartOffSet);
-  }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java
deleted file mode 100644
index fa48a7c9b16..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BitData.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// BitData
-//
-// A BitData holds a flag or two in its header.
-public class BitData extends ProfileData {
-
-  // nullSeen:
-  //  saw a null operand (cast/aastore/instanceof)
-  static final int nullSeenFlag              = DataLayout.firstFlag + 0;
-  static final int bitCellCount = 0;
-
-  public BitData(DataLayout layout) {
-    super(layout);
-  }
-
-  static int staticCellCount() {
-    return bitCellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  // Accessor
-
-  // The nullSeen flag bit is specially known to the interpreter.
-  // Consulting it allows the compiler to avoid setting up nullCheck traps.
-  boolean nullSeen()     { return flagAt(nullSeenFlag); }
-
-  // Code generation support
-  // static int nullSeenByteConstant() {
-  //   return flagNumberToByteConstant(nullSeenFlag);
-  // }
-
-  static int bitDataSize() {
-    return cellOffset(bitCellCount);
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "BitData");
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java
deleted file mode 100644
index 5f27437289c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/BranchData.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// BranchData
-//
-// A BranchData is used to access profiling data for a two-way branch.
-// It consists of taken and notTaken counts as well as a data displacement
-// for the taken case.
-public class BranchData extends JumpData {
-
-  static final int notTakenOffSet = jumpCellCount;
-  static final int branchCellCount = notTakenOffSet + 1;
-
-  public BranchData(DataLayout layout) {
-    super(layout);
-    //assert(layout.tag() == DataLayout.branchDataTag, "wrong type");
-  }
-
-  static int staticCellCount() {
-    return branchCellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  // Direct accessor
-  int notTaken() {
-    return uintAt(notTakenOffSet);
-  }
-
-  // Code generation support
-  static int notTakenOffset() {
-    return cellOffset(notTakenOffSet);
-  }
-  static int branchDataSize() {
-    return cellOffset(branchCellCount);
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "BranchData");
-    st.println("taken(" + taken() + ") displacement(" + displacement() + ")");
-    tab(st);
-    st.println("not taken(" + notTaken() + ")");
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java
deleted file mode 100644
index a0eb02946b3..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CallTypeData.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// CallTypeData
-//
-// A CallTypeData is used to access profiling information about a non
-// virtual call for which we collect type information about arguments
-// and return value.
-public class CallTypeData<K,M> extends CounterData implements CallTypeDataInterface<K> {
-  final TypeStackSlotEntries<K,M> args;
-  final ReturnTypeEntry<K,M> ret;
-
-  int cellCountGlobalOffset() {
-    return CounterData.staticCellCount() + TypeEntriesAtCall.cellCountLocalOffset();
-  }
-
-  int cellCountNoHeader() {
-    return uintAt(cellCountGlobalOffset());
-  }
-
-  public CallTypeData(MethodDataInterface<K,M> methodData, DataLayout layout) {
-    super(layout);
-    args = new TypeStackSlotEntries<K,M>(methodData, this, CounterData.staticCellCount()+TypeEntriesAtCall.headerCellCount(), numberOfArguments());
-    ret = new ReturnTypeEntry<K,M>(methodData, this, cellCount() - ReturnTypeEntry.staticCellCount());
-  }
-
-  static int staticCellCount() {
-    return -1;
-  }
-
-  public int cellCount() {
-    return CounterData.staticCellCount() +
-      TypeEntriesAtCall.headerCellCount() +
-      intAt(cellCountGlobalOffset());
-  }
-
-  public int numberOfArguments() {
-    return cellCountNoHeader() / TypeStackSlotEntries.perArgCount();
-  }
-
-  public boolean hasArguments() {
-    return cellCountNoHeader() >= TypeStackSlotEntries.perArgCount();
-  }
-
-  public K argumentType(int i) {
-    return args.type(i);
-  }
-
-  public boolean hasReturn() {
-    return (cellCountNoHeader() % TypeStackSlotEntries.perArgCount()) != 0;
-  }
-
-  public K returnType() {
-    return ret.type();
-  }
-
-  public int argumentTypeIndex(int i) {
-    return args.typeIndex(i);
-  }
-
-  public int returnTypeIndex() {
-    return ret.typeIndex();
-  }
-
-  public void printDataOn(PrintStream st) {
-    super.printDataOn(st);
-    if (hasArguments()) {
-      tab(st);
-      st.print("argument types");
-      args.printDataOn(st);
-    }
-    if (hasReturn()) {
-      tab(st);
-      st.print("return type");
-      ret.printDataOn(st);
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
index 3a4ea5546a1..9d19a1d7df1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,13 +253,16 @@ public class ConstantPool extends Metadata implements ClassConstants {
     return res;
   }
 
+  private int invokedynamicBootstrapRefIndexAt(int indyIndex) {
+    return getCache().getIndyEntryAt(indyIndex).getConstantPoolIndex();
+  }
+
   // Translate index, which could be CPCache index or Indy index, to a constant pool index
   public int to_cp_index(int index, int code) {
     Assert.that(getCache() != null, "'index' is a rewritten index so this class must have been rewritten");
     switch(code) {
       case Bytecodes._invokedynamic:
-        int poolIndex = getCache().getIndyEntryAt(index).getConstantPoolIndex();
-        return invokeDynamicNameAndTypeRefIndexAt(poolIndex);
+        return invokedynamicBootstrapRefIndexAt(index);
       case Bytecodes._getfield:
       case Bytecodes._getstatic:
       case Bytecodes._putfield:
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java
deleted file mode 100644
index f803c71e02b..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CounterData.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// CounterData
-//
-// A CounterData corresponds to a simple counter.
-public class CounterData extends BitData {
-
-  static final int countOff = 0;
-  static final int counterCellCount = 1;
-
-  public CounterData(DataLayout layout) {
-    super(layout);
-  }
-
-  static int staticCellCount() {
-    return counterCellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  // Direct accessor
-  int count() {
-    return uintAt(countOff);
-  }
-
-  // Code generation support
-  static int countOffset() {
-    return cellOffset(countOff);
-  }
-  static int counterDataSize() {
-    return cellOffset(counterCellCount);
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "CounterData");
-    st.println("count(" + count() + ")");
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java
deleted file mode 100644
index d627c66839b..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/DataLayout.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-public class DataLayout {
-  public static final int noTag = 0;
-  public static final int bitDataTag = 1;
-  public static final int counterDataTag = 2;
-  public static final int jumpDataTag= 3;
-  public static final int receiverTypeDataTag = 4;
-  public static final int virtualCallDataTag = 5;
-  public static final int retDataTag = 6;
-  public static final int branchDataTag = 7;
-  public static final int multiBranchDataTag = 8;
-  public static final int argInfoDataTag = 9;
-  public static final int callTypeDataTag = 10;
-  public static final int virtualCallTypeDataTag = 11;
-  public static final int parametersTypeDataTag = 12;
-  public static final int speculativeTrapDataTag = 13;
-
-  // The trap state breaks down as [recompile:1 | reason:31].
-  // This further breakdown is defined in deoptimization.cpp.
-  // See Deoptimization.trapStateReason for an assert that
-  // trapBits is big enough to hold reasons < reasonRecordedLimit.
-  //
-  // The trapState is collected only if ProfileTraps is true.
-  public static final int trapBits = 1+31;  // 31: enough to distinguish [0..reasonRecordedLimit].
-  public static final int trapMask = Bits.rightNBits(trapBits);
-  public static final int firstFlag = 0;
-
-  private Address data;
-
-  private int offset;
-
-  public DataLayout(MethodData d, int o) {
-    data = d.getAddress();
-    offset = o;
-  }
-
-  public DataLayout(Address d, int o) {
-    data = d;
-    offset = o;
-  }
-
-  public int dp() { return offset; }
-
-  private int getU11(int at) {
-    return data.getJByteAt(offset + at) & 0xff;
-  }
-
-  private int getU22(int at) {
-    return data.getJShortAt(offset + at) & 0xffff;
-  }
-
-  long cellAt(int index) {
-    return data.getCIntegerAt(offset + cellOffset(index), MethodData.cellSize, false);
-  }
-
-  public Address addressAt(int index) {
-    return data.getAddressAt(offset + cellOffset(index));
-  }
-
-  // Every data layout begins with a header.  This header
-  // contains a tag, which is used to indicate the size/layout
-  // of the data, 8 bits of flags, which can be used in any way,
-  // 32 bits of trap history (none/one reason/many reasons),
-  // and a bci, which is used to tie this piece of data to a
-  // specific bci in the bytecodes.
-  // union {
-  //   u8 _bits;
-  //   struct {
-  //     u1 _tag;
-  //     u1 _flags;
-  //     u2 _bci;
-  //     u4 _traps;
-  //   } _struct;
-  // } _header;
-
-  // Some types of data layouts need a length field.
-  static boolean needsArrayLen(int tag) {
-    return (tag == multiBranchDataTag);
-  }
-
-  public static final int counterIncrement = 1;
-
-  // Size computation
-  static int headerSizeInBytes() {
-    return MethodData.cellSize * headerSizeInCells();
-  }
-  static int headerSizeInCells() {
-      return VM.getVM().isLP64() ? 1 : 2;
-  }
-
-  public static int computeSizeInBytes(int cellCount) {
-    return headerSizeInBytes() + cellCount * MethodData.cellSize;
-  }
-
-  // Initialization
-  // void initialize(int tag, int bci, int cellCount);
-
-  // Accessors
-  public int tag() {
-    return getU11(0);
-  }
-
-  // Return a few bits of trap state.  Range is [0..trapMask].
-  // The state tells if traps with zero, one, or many reasons have occurred.
-  // It also tells whether zero or many recompilations have occurred.
-  // The associated trap histogram in the MDO itself tells whether
-  // traps are common or not.  If a BCI shows that a trap X has
-  // occurred, and the MDO shows N occurrences of X, we make the
-  // simplifying assumption that all N occurrences can be blamed
-  // on that BCI.
-  int trapState() {
-    return data.getJIntAt(offset+4);
-  }
-
-  int flags() {
-    return getU11(1);
-  }
-
-  int bci() {
-    return getU22(2);
-  }
-
-  boolean flagAt(int flagNumber) {
-    // assert(flagNumber < flagLimit, "oob");
-    return (flags() & (0x1 << flagNumber)) != 0;
-  }
-
-  // Low-level support for code generation.
-  static int headerOffset() {
-    return 0;
-  }
-  static int tagOffset() {
-    return 0;
-  }
-  static int flagsOffset() {
-    return 1;
-  }
-  static int bciOffset() {
-    return 2;
-  }
-  public static int cellOffset(int index) {
-    return (headerSizeInCells() + index) * MethodData.cellSize;
-  }
-  // // Return a value which, when or-ed as a byte into _flags, sets the flag.
-  // static int flagNumberToByteConstant(int flagNumber) {
-  //   assert(0 <= flagNumber && flagNumber < flagLimit, "oob");
-  //   DataLayout temp; temp.setHeader(0);
-  //   temp.setFlagAt(flagNumber);
-  //   return temp._header._struct._flags;
-  // }
-  // // Return a value which, when or-ed as a word into _header, sets the flag.
-  // static intptrT flagMaskToHeaderMask(int byteConstant) {
-  //   DataLayout temp; temp.setHeader(0);
-  //   temp._header._struct._flags = byteConstant;
-  //   return temp._header._bits;
-  // }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java
deleted file mode 100644
index 008a6ee7164..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/JumpData.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// JumpData
-//
-// A JumpData is used to access profiling information for a direct
-// branch.  It is a counter, used for counting the number of branches,
-// plus a data displacement, used for realigning the data pointer to
-// the corresponding target bci.
-public class JumpData extends ProfileData {
-  static final int   takenOffSet = 0;
-  static final int     displacementOffSet = 1;
-  static final int     jumpCellCount = 2;
-
-  public JumpData(DataLayout layout) {
-    super(layout);
-    //assert(layout.tag() == DataLayout.jumpDataTag ||
-    //       layout.tag() == DataLayout.branchDataTag, "wrong type");
-  }
-
-  static int staticCellCount() {
-    return jumpCellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  // Direct accessor
-  int taken() {
-    return uintAt(takenOffSet);
-  }
-
-  int displacement() {
-    return intAt(displacementOffSet);
-  }
-
-  // Code generation support
-  static int takenOffset() {
-    return cellOffset(takenOffSet);
-  }
-
-  static int displacementOffset() {
-    return cellOffset(displacementOffSet);
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "JumpData");
-    st.println("taken(" + taken() + ") displacement(" + displacement() + ")");
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java
index dfbd67ae805..1ba1f817c5c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,6 @@ public abstract class Metadata extends VMObject {
     metadataConstructor.addMapping("TypeArrayKlass", TypeArrayKlass.class);
     metadataConstructor.addMapping("ObjArrayKlass", ObjArrayKlass.class);
     metadataConstructor.addMapping("Method", Method.class);
-    metadataConstructor.addMapping("MethodData", MethodData.class);
     metadataConstructor.addMapping("ConstMethod", ConstMethod.class);
     metadataConstructor.addMapping("ConstantPool", ConstantPool.class);
     metadataConstructor.addMapping("ConstantPoolCache", ConstantPoolCache.class);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java
index 75dec8edbd1..d16fa61a6b4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,6 @@ public class Method extends Metadata {
   private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
     type                       = db.lookupType("Method");
     constMethod                = type.getAddressField("_constMethod");
-    methodData                 = type.getAddressField("_method_data");
     methodCounters             = type.getAddressField("_method_counters");
     accessFlags                = new CIntField(type.getCIntegerField("_access_flags"), 0);
     code                       = type.getAddressField("_code");
@@ -82,7 +81,6 @@ public class Method extends Metadata {
 
   // Fields
   private static AddressField  constMethod;
-  private static AddressField  methodData;
   private static AddressField  methodCounters;
   private static CIntField accessFlags;
   private static CIntField vtableIndex;
@@ -126,10 +124,6 @@ public class Method extends Metadata {
   public U1Array      getStackMapData()               {
     return getConstMethod().getStackMapData();
   }
-  public MethodData   getMethodData()                 {
-    Address addr = methodData.getValue(getAddress());
-    return VMObjectFactory.newObject(MethodData.class, addr);
-  }
   public MethodCounters getMethodCounters()           {
     Address addr = methodCounters.getValue(getAddress());
     return VMObjectFactory.newObject(MethodCounters.class, addr);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
index a7c2e2bccb7..fd804085c7b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,92 +35,7 @@ import sun.jvm.hotspot.utilities.Observer;
 
 // A MethodData provides interpreter profiling information
 
-public class MethodData extends Metadata implements MethodDataInterface<Klass,Method> {
-  static int TypeProfileWidth = 2;
-  static int BciProfileWidth = 2;
-  static int CompileThreshold;
-
-  static int Reason_many;                 // indicates presence of several reasons
-  static int Reason_none;                 // indicates absence of a relevant deopt.
-  static int Reason_LIMIT;
-  static int Reason_RECORDED_LIMIT;       // some are not recorded per bc
-
-  private static String[] trapReasonName;
-
-  static String trapReasonName(int reason) {
-    if (reason == Reason_many)  return "many";
-    if (reason < Reason_LIMIT)
-      return trapReasonName[reason];
-    return "reason" + reason;
-  }
-
-
-  static int trapStateReason(int trapState) {
-    // This assert provides the link between the width of DataLayout.trapBits
-    // and the encoding of "recorded" reasons.  It ensures there are enough
-    // bits to store all needed reasons in the per-BCI MDO profile.
-    // assert(dsReasonMask >= reasonRecordedLimit, "enough bits");
-    int recompileBit = (trapState & dsRecompileBit);
-    trapState -= recompileBit;
-    if (trapState == dsReasonMask) {
-      return Reason_many;
-    } else {
-      // assert((int)reasonNone == 0, "state=0 => Reason_none");
-      return trapState;
-    }
-  }
-
-
-  static final int dsReasonMask   = DataLayout.trapMask >> 1;
-  static final int dsRecompileBit = DataLayout.trapMask - dsReasonMask;
-
-  static boolean trapStateIsRecompiled(int trapState) {
-    return (trapState & dsRecompileBit) != 0;
-  }
-
-  static boolean reasonIsRecordedPerBytecode(int reason) {
-    return reason > Reason_none && reason < Reason_RECORDED_LIMIT;
-  }
-  static int trapStateAddReason(int trapState, int reason) {
-    // assert(reasonIsRecordedPerBytecode((DeoptReason)reason) || reason == reasonMany, "valid reason");
-    int recompileBit = (trapState & dsRecompileBit);
-    trapState -= recompileBit;
-    if (trapState == dsReasonMask) {
-      return trapState + recompileBit;     // already at state lattice bottom
-    } else if (trapState == reason) {
-      return trapState + recompileBit;     // the condition is already true
-    } else if (trapState == 0) {
-      return reason + recompileBit;          // no condition has yet been true
-    } else {
-      return dsReasonMask + recompileBit;  // fall to state lattice bottom
-    }
-  }
-  static int trapStateSetRecompiled(int trapState, boolean z) {
-    if (z)  return trapState |  dsRecompileBit;
-    else    return trapState & ~dsRecompileBit;
-  }
-
-  static String formatTrapState(int trapState) {
-    int reason      = trapStateReason(trapState);
-    boolean     recompFlag = trapStateIsRecompiled(trapState);
-    // Re-encode the state from its decoded components.
-    int decodedState = 0;
-    if (reasonIsRecordedPerBytecode(reason) || reason == Reason_many)
-      decodedState = trapStateAddReason(decodedState, reason);
-    if (recompFlag)
-      decodedState = trapStateSetRecompiled(decodedState, recompFlag);
-    // If the state re-encodes properly, format it symbolically.
-    // Because this routine is used for debugging and diagnostics,
-    // be robust even if the state is a strange value.
-    if (decodedState != trapState) {
-      // Random buggy state that doesn't decode??
-      return "#" + trapState;
-    } else {
-      return trapReasonName(reason) + (recompFlag ? " recompiled" : "");
-    }
-  }
-
-
+public class MethodData extends Metadata {
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -132,96 +47,17 @@ public class MethodData extends Metadata implements MethodDataInterface<Klass,Me
 
   private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
     Type type      = db.lookupType("MethodData");
-    baseOffset     = type.getSize();
-
-    size           = new CIntField(type.getCIntegerField("_size"), 0);
     method         = new MetadataField(type.getAddressField("_method"), 0);
-
-    VM.Flag[] flags = VM.getVM().getCommandLineFlags();
-    for (int f = 0; f < flags.length; f++) {
-      VM.Flag flag = flags[f];
-      if (flag.getName().equals("TypeProfileWidth")) {
-        TypeProfileWidth = (int)flag.getIntx();
-      } else if (flag.getName().equals("BciProfileWidth")) {
-        BciProfileWidth = (int)flag.getIntx();
-      } else if (flag.getName().equals("CompileThreshold")) {
-        CompileThreshold = (int)flag.getIntx();
-      }
-    }
-
-    cellSize = (int)VM.getVM().getAddressSize();
-
-    dataSize     = new CIntField(type.getCIntegerField("_data_size"), 0);
-    data         = type.getAddressField("_data[0]");
-
-    parametersTypeDataDi = new CIntField(type.getCIntegerField("_parameters_type_data_di"), 0);
-
-    sizeofMethodDataOopDesc = (int)type.getSize();
-
-    Reason_many            = db.lookupIntConstant("Deoptimization::Reason_many").intValue();
-    Reason_none            = db.lookupIntConstant("Deoptimization::Reason_none").intValue();
-    Reason_LIMIT           = db.lookupIntConstant("Deoptimization::Reason_LIMIT").intValue();
-    Reason_RECORDED_LIMIT  = db.lookupIntConstant("Deoptimization::Reason_RECORDED_LIMIT").intValue();
-
-    trapReasonName = new String[Reason_LIMIT];
-
-    // Find Deopt reasons
-    Iterator i = db.getIntConstants();
-    String prefix = "Deoptimization::Reason_";
-    while (i.hasNext()) {
-      String name = (String)i.next();
-      if (name.startsWith(prefix)) {
-        // Strip prefix
-        if (!name.endsWith("Reason_many") &&
-            !name.endsWith("Reason_LIMIT") &&
-            !name.endsWith("Reason_RECORDED_LIMIT")) {
-          String trimmed = name.substring(prefix.length());
-          int value = db.lookupIntConstant(name).intValue();
-          if (trapReasonName[value] != null) {
-            throw new InternalError("duplicate reasons: " + trapReasonName[value] + " " + trimmed);
-          }
-          trapReasonName[value] = trimmed;
-        }
-      }
-    }
-    for (int index = 0; index < trapReasonName.length; index++) {
-      if (trapReasonName[index] == null) {
-        throw new InternalError("missing reason for " + index);
-      }
-    }
   }
 
+  private static MetadataField  method;
+
   public MethodData(Address addr) {
     super(addr);
   }
 
-  public Klass getKlassAtAddress(Address addr) {
-    return (Klass)Metadata.instantiateWrapperFor(addr);
-  }
-
-  public Method getMethodAtAddress(Address addr) {
-    return (Method)Metadata.instantiateWrapperFor(addr);
-  }
-
-  public void printKlassValueOn(Klass klass, PrintStream st) {
-    klass.printValueOn(st);
-  }
-
-  public void printMethodValueOn(Method method, PrintStream st) {
-    method.printValueOn(st);
-  }
-
   public boolean isMethodData()        { return true; }
 
-  private static long baseOffset;
-  private static CIntField size;
-  private static MetadataField  method;
-  private static CIntField dataSize;
-  private static AddressField data;
-  private static CIntField parametersTypeDataDi;
-  public static int sizeofMethodDataOopDesc;
-  public static int cellSize;
-
   public Method getMethod() {
     return (Method) method.getValue(this);
   }
@@ -234,209 +70,5 @@ public class MethodData extends Metadata implements MethodDataInterface<Klass,Me
   public void iterateFields(MetadataVisitor visitor) {
     super.iterateFields(visitor);
     visitor.doMetadata(method, true);
-    visitor.doCInt(size, true);
   }
-
-  int dataSize() {
-    if (dataSize == null) {
-      return 0;
-    } else {
-      return (int)dataSize.getValue(getAddress());
-    }
-  }
-
-  int sizeInBytes() {
-    if (size == null) {
-      return 0;
-    } else {
-      return (int)size.getValue(getAddress());
-    }
-  }
-
-  int size() {
-    return (int)alignSize(VM.getVM().alignUp(sizeInBytes(), VM.getVM().getBytesPerWord())/VM.getVM().getBytesPerWord());
-  }
-
-  ParametersTypeData<Klass,Method> parametersTypeData() {
-    int di = (int)parametersTypeDataDi.getValue(getAddress());
-    if (di == -1 || di == -2) {
-      return null;
-    }
-    DataLayout dataLayout = new DataLayout(this, di + (int)data.getOffset());
-    return new ParametersTypeData<Klass,Method>(this, dataLayout);
-  }
-
-  boolean outOfBounds(int dataIndex) {
-    return dataIndex >= dataSize();
-  }
-
-  ProfileData dataAt(int dataIndex) {
-    if (outOfBounds(dataIndex)) {
-      return null;
-    }
-    DataLayout dataLayout = new DataLayout(this, dataIndex + (int)data.getOffset());
-
-    switch (dataLayout.tag()) {
-    case DataLayout.noTag:
-    default:
-      throw new InternalError(dataIndex + " " + dataSize() + " " + dataLayout.tag());
-    case DataLayout.bitDataTag:
-      return new BitData(dataLayout);
-    case DataLayout.counterDataTag:
-      return new CounterData(dataLayout);
-    case DataLayout.jumpDataTag:
-      return new JumpData(dataLayout);
-    case DataLayout.receiverTypeDataTag:
-      return new ReceiverTypeData<Klass,Method>(this, dataLayout);
-    case DataLayout.virtualCallDataTag:
-      return new VirtualCallData<Klass,Method>(this, dataLayout);
-    case DataLayout.retDataTag:
-      return new RetData(dataLayout);
-    case DataLayout.branchDataTag:
-      return new BranchData(dataLayout);
-    case DataLayout.multiBranchDataTag:
-      return new MultiBranchData(dataLayout);
-    case DataLayout.callTypeDataTag:
-      return new CallTypeData<Klass,Method>(this, dataLayout);
-    case DataLayout.virtualCallTypeDataTag:
-      return new VirtualCallTypeData<Klass,Method>(this, dataLayout);
-    case DataLayout.parametersTypeDataTag:
-      return new ParametersTypeData<Klass,Method>(this, dataLayout);
-    }
-  }
-
-  int dpToDi(int dp) {
-    // this in an offset from the base of the MDO, so convert to offset into _data
-    return dp - (int)data.getOffset();
-  }
-
-  int firstDi() { return 0; }
-  public ProfileData firstData() { return dataAt(firstDi()); }
-  public ProfileData nextData(ProfileData current) {
-    int currentIndex = dpToDi(current.dp());
-    int nextIndex = currentIndex + current.sizeInBytes();
-    return dataAt(nextIndex);
-  }
-  boolean isValid(ProfileData current) { return current != null; }
-
-  DataLayout limitDataPosition() {
-    return new DataLayout(this, dataSize() + (int)data.getOffset());
-  }
-
-  DataLayout extraDataBase() {
-    return limitDataPosition();
-  }
-
-  DataLayout extraDataLimit() {
-    return new DataLayout(this, sizeInBytes());
-  }
-
-  public static int extraNbCells(DataLayout dataLayout) {
-    int nbCells = 0;
-    switch(dataLayout.tag()) {
-    case DataLayout.bitDataTag:
-    case DataLayout.noTag:
-      nbCells = BitData.staticCellCount();
-      break;
-    case DataLayout.speculativeTrapDataTag:
-      nbCells = SpeculativeTrapData.staticCellCount();
-      break;
-    default:
-      throw new InternalError("unexpected tag " +  dataLayout.tag());
-    }
-    return nbCells;
-  }
-
-  DataLayout nextExtra(DataLayout dataLayout) {
-    return new DataLayout(this, dataLayout.dp() + DataLayout.computeSizeInBytes(extraNbCells(dataLayout)));
-  }
-
-  public void printDataOn(PrintStream st) {
-    if (parametersTypeData() != null) {
-      parametersTypeData().printDataOn(st);
-    }
-    ProfileData data = firstData();
-    for ( ; isValid(data); data = nextData(data)) {
-      st.print(dpToDi(data.dp()));
-      st.print(" ");
-      // st->fillTo(6);
-      data.printDataOn(st);
-    }
-    st.println("--- Extra data:");
-    DataLayout dp    = extraDataBase();
-    DataLayout end   = extraDataLimit();
-    for (;; dp = nextExtra(dp)) {
-      switch(dp.tag()) {
-      case DataLayout.noTag:
-        continue;
-      case DataLayout.bitDataTag:
-        data = new BitData(dp);
-        break;
-      case DataLayout.speculativeTrapDataTag:
-        data = new SpeculativeTrapData<Klass,Method>(this, dp);
-        break;
-      case DataLayout.argInfoDataTag:
-        data = new ArgInfoData(dp);
-        dp = end; // ArgInfoData is at the end of extra data section.
-        break;
-      default:
-        throw new InternalError("unexpected tag " +  dp.tag());
-      }
-      st.print(dpToDi(data.dp()));
-      st.print(" ");
-      data.printDataOn(st);
-      if (dp == end) return;
-    }
-  }
-
-  private byte[] fetchDataAt(Address base, long offset, long size) {
-    byte[] result = new byte[(int)size];
-    for (int i = 0; i < size; i++) {
-      result[i] = base.getJByteAt(offset + i);
-    }
-    return result;
-  }
-
-  public byte[] orig() {
-    // fetch the orig MethodData data between header and dataSize
-    return fetchDataAt(getAddress(), 0, sizeofMethodDataOopDesc);
-  }
-
-  public long[] data() {
-    // Read the data as an array of intptr_t elements
-    Address base = getAddress();
-    long offset = data.getOffset();
-    int elements = dataSize() / cellSize;
-    long[] result = new long[elements];
-    for (int i = 0; i < elements; i++) {
-      Address value = base.getAddressAt(offset + i * MethodData.cellSize);
-      if (value != null) {
-        result[i] = value.minus(null);
-      }
-    }
-    return result;
-  }
-
-  // Get a measure of how much mileage the method has on it.
-  int mileageOf(Method method) {
-    long mileage = 0;
-    long iic = method.interpreterInvocationCount();
-    if (mileage < iic)  mileage = iic;
-
-    long ic = method.getInvocationCount();
-    long bc = method.getBackedgeCount();
-
-    long icval = ic >> 3;
-    if ((ic & 4) != 0) icval += CompileThreshold;
-    if (mileage < icval)  mileage = icval;
-    long bcval = bc >> 3;
-    if ((bc & 4) != 0) bcval += CompileThreshold;
-    if (mileage < bcval)  mileage = bcval;
-    return (int)mileage;
-  }
-
-  public int currentMileage() {
-    return 20000;
-  }
-
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java
deleted file mode 100644
index 089de318adf..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// MultiBranchData
-//
-// A MultiBranchData is used to access profiling information for
-// a multi-way branch (*switch bytecodes).  It consists of a series
-// of (count, displacement) pairs, which count the number of times each
-// case was taken and specify the data displacement for each branch target.
-public class MultiBranchData extends ArrayData {
-  static final int   defaultCountOffSet = 0;
-  static final int     defaultDisaplacementOffSet = 1;
-  static final int     caseArrayStart = 2;
-  static final int   relativeCountOffSet = 0;
-  static final int     relativeDisplacementOffSet = 1;
-  static final int     perCaseCellCount = 2;
-
-  public MultiBranchData(DataLayout layout) {
-    super(layout);
-    //assert(layout.tag() == DataLayout.multiBranchDataTag, "wrong type");
-  }
-
-  // static int computeCellCount(BytecodeStream stream);
-
-  int numberOfCases() {
-    int alen = arrayLen() - 2; // get rid of default case here.
-    //assert(alen % perCaseCellCount == 0, "must be even");
-    return (alen / perCaseCellCount);
-  }
-
-  int defaultCount() {
-    return arrayUintAt(defaultCountOffSet);
-  }
-  int defaultDisplacement() {
-    return arrayIntAt(defaultDisaplacementOffSet);
-  }
-
-  int countAt(int index) {
-    return arrayUintAt(caseArrayStart +
-                         index * perCaseCellCount +
-                         relativeCountOffSet);
-  }
-  int displacementAt(int index) {
-    return arrayIntAt(caseArrayStart +
-                        index * perCaseCellCount +
-                        relativeDisplacementOffSet);
-  }
-
-  // Code generation support
-  static int defaultCountOffset() {
-    return arrayElementOffset(defaultCountOffSet);
-  }
-  static int defaultDisplacementOffset() {
-    return arrayElementOffset(defaultDisaplacementOffSet);
-  }
-  static int caseCountOffset(int index) {
-    return caseArrayOffset() +
-      (perCaseSize() * index) +
-      relativeCountOffset();
-  }
-  static int caseArrayOffset() {
-    return arrayElementOffset(caseArrayStart);
-  }
-  static int perCaseSize() {
-    return (perCaseCellCount) * MethodData.cellSize;
-  }
-  static int relativeCountOffset() {
-    return (relativeCountOffSet) * MethodData.cellSize;
-  }
-  static int relativeDisplacementOffset() {
-    return (relativeDisplacementOffSet) * MethodData.cellSize;
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "MultiBranchData");
-    st.println("default_count(" + defaultCount() + ") displacement(" + defaultDisplacement() + ")");
-    int cases = numberOfCases();
-    for (int i = 0; i < cases; i++) {
-      tab(st);
-      st.println("count(" + countAt(i) + ") displacement(" + displacementAt(i) + ")");
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java
deleted file mode 100644
index d6ea749576a..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ParametersTypeData.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// ParametersTypeData
-//
-// A ParametersTypeData is used to access profiling information about
-// types of parameters to a method
-public class ParametersTypeData<K,M> extends ArrayData {
-  final TypeStackSlotEntries<K,M> parameters;
-
-  static int stackSlotLocalOffset(int i) {
-    return arrayStartOffSet + TypeStackSlotEntries.stackSlotLocalOffset(i);
-  }
-
-  static int typeLocalOffset(int i) {
-    return arrayStartOffSet + TypeStackSlotEntries.typeLocalOffset(i);
-  }
-
-  public ParametersTypeData(MethodDataInterface<K,M> methodData, DataLayout layout) {
-    super(layout);
-    parameters = new TypeStackSlotEntries<K,M>(methodData, this, 1, numberOfParameters());
-  }
-
-  public int numberOfParameters() {
-    return arrayLen() / TypeStackSlotEntries.perArgCount();
-  }
-
-  int stackSlot(int i) {
-    return parameters.stackSlot(i);
-  }
-
-  public K type(int i) {
-    return parameters.type(i);
-  }
-
-  public static int typeIndex(int i) {
-    return typeLocalOffset(i);
-  }
-
-  public void printDataOn(PrintStream st) {
-    st.print("parameter types");
-    parameters.printDataOn(st);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java
deleted file mode 100644
index 29a127b6a49..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ProfileData.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-public abstract class ProfileData {
-  // This is a pointer to a section of profiling data.
-  private DataLayout _data;
-
-  public DataLayout data() { return _data; }
-
-  // How many cells are in this?
-  public abstract int cellCount();
-
-
-  // Return the size of this data.
-  public int sizeInBytes() {
-    return DataLayout.computeSizeInBytes(cellCount());
-  }
-
-  public int dp() {
-    return data().dp();
-  }
-
-  // Low-level accessors for underlying data
-  long intptrAt(int index) {
-    //assert(0 <= index && index < cellCount(), "oob");
-    return data().cellAt(index);
-  }
-  int intAt(int index) {
-    return (int)intptrAt(index);
-  }
-  int uintAt(int index) {
-    return (int)intptrAt(index);
-  }
-  public Address addressAt(int index) {
-    return data().addressAt(index);
-  }
-
-  boolean flagAt(int flagNumber) {
-    return data().flagAt(flagNumber);
-  }
-
-  // two convenient imports for use by subclasses:
-  public static int cellOffset(int index) {
-    return DataLayout.cellOffset(index);
-  }
-
-  public ProfileData(DataLayout data) {
-    _data = data;
-  }
-
-  // Constructor for invalid ProfileData.
-  ProfileData() {
-    _data = null;
-  }
-
-  int bci() {
-    return data().bci();
-  }
-
-  int trapState() {
-    return data().trapState();
-  }
-  public abstract void printDataOn(PrintStream st);
-
-  void tab(PrintStream st) {
-    st.print("\t");
-  }
-
-  void printShared(PrintStream st, String name) {
-    st.print("bci: " + bci());
-    // st.fillTo(tabWidthOne);
-    st.print(" " +  name + " ");
-    tab(st);
-    int trap = trapState();
-    if (trap != 0) {
-      st.print("trap(" + MethodData.formatTrapState(trap) + ") ");
-    }
-    int flags = data().flags();
-    if (flags != 0)
-      st.print("flags(" + flags + ") ");
-  }
-
-  public String toString() {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    PrintStream ps = new PrintStream(baos);
-    try {
-      printDataOn(ps);
-    } finally {
-      ps.close();
-    }
-    return baos.toString();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java
deleted file mode 100644
index 758566c5611..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// ReceiverTypeData
-//
-// A ReceiverTypeData is used to access profiling information about a
-// dynamic type check.  It consists of a counter which counts the total times
-// that the check is reached, and a series of (Klass, count) pairs
-// which are used to store a type profile for the receiver of the check.
-public class ReceiverTypeData<K,M> extends CounterData {
-  static final int nonProfiledCountOffset = counterCellCount;
-  static final int receiver0Offset;
-  static final int count0Offset;
-  static final int receiverTypeRowCellCount;
-  static {
-    receiver0Offset = counterCellCount;
-    count0Offset = receiver0Offset + 1;
-    receiverTypeRowCellCount = (count0Offset + 1) - receiver0Offset;
-  }
-  final MethodDataInterface<K,M> methodData;
-
-  public ReceiverTypeData(MethodDataInterface<K,M> methodData, DataLayout layout) {
-    super(layout);
-    this.methodData = methodData;
-    //assert(layout.tag() == DataLayout.receiverTypeDataTag ||
-    //       layout.tag() == DataLayout.virtualCallDataTag, "wrong type");
-  }
-
-  boolean isReceivertypedata() { return true; }
-
-  static int staticCellCount() {
-    int cellCount = counterCellCount + MethodData.TypeProfileWidth * receiverTypeRowCellCount;
-    return cellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  // Direct accessors
-  public static int rowLimit() {
-    return MethodData.TypeProfileWidth;
-  }
-  public static int receiverCellIndex(int row) {
-    return receiver0Offset + row * receiverTypeRowCellCount;
-  }
-  public static int receiverCountCellIndex(int row) {
-    return count0Offset + row * receiverTypeRowCellCount;
-  }
-
-  // Get the receiver at row.  The 'unchecked' version is needed by parallel old
-  // gc; it does not assert the receiver is a klass.  During compaction of the
-  // perm gen, the klass may already have moved, so the isKlass() predicate
-  // would fail.  The 'normal' version should be used whenever possible.
-  K receiverUnchecked(int row) {
-    //assert(row < rowLimit(), "oob");
-    Address recv = addressAt(receiverCellIndex(row));
-    return methodData.getKlassAtAddress(recv);
-  }
-
-  public K receiver(int row) {
-    K recv = receiverUnchecked(row);
-    //assert(recv == NULL || ((oop)recv).isKlass(), "wrong type");
-    return recv;
-  }
-
-  public int receiverCount(int row) {
-    //assert(row < rowLimit(), "oob");
-    return uintAt(receiverCountCellIndex(row));
-  }
-
-  // Code generation support
-  static int receiverOffset(int row) {
-    return cellOffset(receiverCellIndex(row));
-  }
-  static int receiverCountOffset(int row) {
-    return cellOffset(receiverCountCellIndex(row));
-  }
-  static int receiverTypeDataSize() {
-    return cellOffset(staticCellCount());
-  }
-
-  void printReceiverDataOn(PrintStream st) {
-    int row;
-    int entries = 0;
-    for (row = 0; row < rowLimit(); row++) {
-      if (receiver(row) != null)  entries++;
-    }
-    st.println("count(" + count() + ") entries(" + entries + ")");
-    for (row = 0; row < rowLimit(); row++) {
-      if (receiver(row) != null) {
-        tab(st);
-        methodData.printKlassValueOn(receiver(row), st);
-        st.println("(" + receiverCount(row) + ")");
-      }
-    }
-  }
-  public void printDataOn(PrintStream st) {
-    printShared(st, "ReceiverTypeData");
-    printReceiverDataOn(st);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java
deleted file mode 100644
index 5ecd60bcb8e..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/RetData.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// RetData
-//
-// A RetData is used to access profiling information for a ret bytecode.
-// It is composed of a count of the number of times that the ret has
-// been executed, followed by a series of triples of the form
-// (bci, count, di) which count the number of times that some bci was the
-// target of the ret and cache a corresponding data displacement.
-public class RetData extends CounterData {
-
-  static final int   bci0Offset = counterCellCount;
-  static final int     count0Offset = bci0Offset + 1;
-  static final int     displacement0Offset = count0Offset + 1;
-  static final int     retRowCellCount = (displacement0Offset + 1) - bci0Offset;
-
-  public RetData(DataLayout layout) {
-    super(layout);
-    //assert(layout.tag() == DataLayout.retDataTag, "wrong type");
-  }
-
-  static final int noBci = -1; // value of bci when bci1/2 are not in use.
-
-  static int staticCellCount() {
-    return counterCellCount + MethodData.BciProfileWidth * retRowCellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  static int rowLimit() {
-    return MethodData.BciProfileWidth;
-  }
-  static int bciCellIndex(int row) {
-    return bci0Offset + row * retRowCellCount;
-  }
-  static int bciCountCellIndex(int row) {
-    return count0Offset + row * retRowCellCount;
-  }
-  static int bciDisplacementCellIndex(int row) {
-    return displacement0Offset + row * retRowCellCount;
-  }
-
-  // Direct accessors
-  int bci(int row) {
-    return intAt(bciCellIndex(row));
-  }
-  int bciCount(int row) {
-    return uintAt(bciCountCellIndex(row));
-  }
-  int bciDisplacement(int row) {
-    return intAt(bciDisplacementCellIndex(row));
-  }
-
-  // Code generation support
-  static int bciOffset(int row) {
-    return cellOffset(bciCellIndex(row));
-  }
-  static int bciCountOffset(int row) {
-    return cellOffset(bciCountCellIndex(row));
-  }
-  static int bciDisplacementOffset(int row) {
-    return cellOffset(bciDisplacementCellIndex(row));
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "RetData");
-    int row;
-    int entries = 0;
-    for (row = 0; row < rowLimit(); row++) {
-      if (bci(row) != noBci)  entries++;
-    }
-    st.println("count(" + count() + ") entries(" + entries + ")");
-    for (row = 0; row < rowLimit(); row++) {
-      if (bci(row) != noBci) {
-        tab(st);
-        st.println(" bci(" + bci(row) + ": count(" + bciCount(row) + ") displacement(" + bciDisplacement(row) + "))");
-      }
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java
deleted file mode 100644
index 76e531d1dea..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/SpeculativeTrapData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// SpeculativeTrapData
-//
-// A SpeculativeTrapData is used to record traps due to type
-// speculation. It records the root of the compilation.
-public class SpeculativeTrapData<K, M> extends ProfileData {
-  static final int speculativeTrapMethod = 0;
-  static final int speculativeTrapCellCount = 1;
-  final MethodDataInterface<K, M> methodData;
-
-  public SpeculativeTrapData(MethodDataInterface<K,M> methodData, DataLayout layout) {
-    super(layout);
-    this.methodData = methodData;
-  }
-
-  static int staticCellCount() {
-    return speculativeTrapCellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  public M method() {
-    return methodData.getMethodAtAddress(addressAt(speculativeTrapMethod));
-  }
-
-  public static int methodIndex() {
-    return speculativeTrapMethod;
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "SpeculativeTrapData");
-    tab(st);
-    methodData.printMethodValueOn(method(), st);
-    st.println();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java
deleted file mode 100644
index 16ba553a838..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntries.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// Entries in a ProfileData object to record types: it can either be
-// none (no profile), unknown (conflicting profile data) or a klass if
-// a single one is seen. Whether a null reference was seen is also
-// recorded. No counter is associated with the type and a single type
-// is tracked (unlike VirtualCallData).
-public abstract class TypeEntries<K,M> {
-  static final int nullSeen = 1;
-  static final int typeMask = ~nullSeen;
-  static final int typeUnknown = 2;
-  static final int statusBits = nullSeen | typeUnknown;
-  static final int typeKlassMask = ~statusBits;
-
-  final ProfileData pd;
-  final int baseOff;
-  final MethodDataInterface<K,M> methodData;
-
-  boolean wasNullSeen(int index) {
-    long v = pd.intptrAt(index);
-    return (v & nullSeen) != 0;
-  }
-
-  boolean isTypeUnknown(int index) {
-    long v = pd.intptrAt(index);
-    return (v & typeUnknown) != 0;
-  }
-
-  boolean isTypeNone(int index) {
-    long v = pd.intptrAt(index);
-    return (v & typeMask) == 0;
-  }
-
-  K validKlass(int index) {
-    if (!isTypeNone(index) &&
-        !isTypeUnknown(index)) {
-      return methodData.getKlassAtAddress(pd.addressAt(index).andWithMask(typeKlassMask));
-    } else {
-      return null;
-    }
-  }
-
-  void printKlass(PrintStream st, int index) {
-    if (isTypeNone(index)) {
-      st.print("none");
-    } else if (isTypeUnknown(index)) {
-      st.print("unknown");
-    } else {
-      methodData.printKlassValueOn(validKlass(index), st);
-    }
-    if (wasNullSeen(index)) {
-      st.print(" (null seen)");
-    }
-  }
-
-  TypeEntries(MethodDataInterface<K,M> methodData, ProfileData pd, int baseOff) {
-    this.pd = pd;
-    this.baseOff = baseOff;
-    this.methodData = methodData;
-  }
-
-  long intptrAt(int index) {
-    return pd.intptrAt(index);
-  }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java
deleted file mode 100644
index 2891f91c69e..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeEntriesAtCall.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// Entries to collect type information at a call: contains arguments
-// (TypeStackSlotEntries), a return type (ReturnTypeEntry) and a
-// number of cells.
-public abstract class TypeEntriesAtCall {
-
-  static int stackSlotLocalOffset(int i) {
-    return headerCellCount() + TypeStackSlotEntries.stackSlotLocalOffset(i);
-  }
-
-  static int argumentTypeLocalOffset(int i) {
-    return headerCellCount() + TypeStackSlotEntries.typeLocalOffset(i);
-  }
-
-  static int headerCellCount() {
-    return 1;
-  }
-
-  static int cellCountLocalOffset() {
-    return 0;
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java
deleted file mode 100644
index 9efff34a4c3..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/TypeStackSlotEntries.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// Type entries used for arguments passed at a call and parameters on
-// method entry. 2 cells per entry: one for the type encoded as in
-// TypeEntries and one initialized with the stack slot where the
-// profiled object is to be found so that the interpreter can locate
-// it quickly.
-public class TypeStackSlotEntries<K,M> extends TypeEntries<K,M> {
-  static final int stackSlotEntry = 0;
-  static final int typeEntry = 1;
-  static final int perArgCellCount = 2;
-
-  int stackSlotOffset(int i) {
-    return baseOff + stackSlotLocalOffset(i);
-  }
-
-  final int numberOfEntries;
-
-  int typeOffsetInCells(int i) {
-    return baseOff + typeLocalOffset(i);
-  }
-
-  TypeStackSlotEntries(MethodDataInterface<K,M> methodData, ProfileData pd, int baseOff, int nbEntries) {
-    super(methodData, pd, baseOff);
-    numberOfEntries = nbEntries;
-  }
-
-  static int stackSlotLocalOffset(int i) {
-    return i * perArgCellCount + stackSlotEntry;
-  }
-
-  static int typeLocalOffset(int i) {
-    return i * perArgCellCount + typeEntry;
-  }
-
-  int stackSlot(int i) {
-    return pd.uintAt(stackSlotOffset(i));
-  }
-
-  K type(int i) {
-    return validKlass(typeOffsetInCells(i));
-  }
-
-  static int perArgCount() {
-    return perArgCellCount;
-  }
-
-  int typeIndex(int i) {
-    return typeOffsetInCells(i);
-  }
-
-  void printDataOn(PrintStream st) {
-    for (int i = 0; i < numberOfEntries; i++) {
-      pd.tab(st);
-      st.print(i + ": stack(" + stackSlot(i)+ ") ");
-      printKlass(st, typeOffsetInCells(i));
-      st.println();
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java
deleted file mode 100644
index 2d303d8606d..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// VirtualCallData
-//
-// A VirtualCallData is used to access profiling information about a
-// call.  For now, it has nothing more than a ReceiverTypeData.
-public class VirtualCallData<K,M> extends ReceiverTypeData<K,M> {
-  public VirtualCallData(MethodDataInterface<K,M> methodData, DataLayout layout) {
-    super(methodData, layout);
-    //assert(layout.tag() == DataLayout.virtualCallDataTag, "wrong type");
-  }
-
-  static int staticCellCount() {
-    // At this point we could add more profile state, e.g., for arguments.
-    // But for now it's the same size as the base record type.
-    int cellCount = ReceiverTypeData.staticCellCount();
-    return cellCount;
-  }
-
-  public int cellCount() {
-    return staticCellCount();
-  }
-
-  // Direct accessors
-  static int virtualCallDataSize() {
-    return cellOffset(staticCellCount());
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "VirtualCallData");
-    printReceiverDataOn(st);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java
deleted file mode 100644
index 483d0d54ee2..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/VirtualCallTypeData.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.oops;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-
-// VirtualCallTypeData
-//
-// A VirtualCallTypeData is used to access profiling information about
-// a virtual call for which we collect type information about
-// arguments and return value.
-public class VirtualCallTypeData<K,M> extends VirtualCallData<K,M> implements CallTypeDataInterface<K> {
-  final TypeStackSlotEntries<K,M> args;
-  final ReturnTypeEntry<K,M> ret;
-
-  int cellCountGlobalOffset() {
-    return VirtualCallData.staticCellCount() + TypeEntriesAtCall.cellCountLocalOffset();
-  }
-
-  int cellCountNoHeader() {
-    return uintAt(cellCountGlobalOffset());
-  }
-
-  public VirtualCallTypeData(MethodDataInterface<K,M> methodData, DataLayout layout) {
-    super(methodData, layout);
-    args = new TypeStackSlotEntries<K,M>(methodData, this, VirtualCallData.staticCellCount()+TypeEntriesAtCall.headerCellCount(), numberOfArguments());
-    ret = new ReturnTypeEntry<K,M>(methodData, this, cellCount() - ReturnTypeEntry.staticCellCount());
-  }
-
-  static int staticCellCount() {
-    return -1;
-  }
-
-  public int cellCount() {
-    return VirtualCallData.staticCellCount() +
-      TypeEntriesAtCall.headerCellCount() +
-      intAt(cellCountGlobalOffset());
-  }
-
-  public int numberOfArguments() {
-    return cellCountNoHeader() / TypeStackSlotEntries.perArgCount();
-  }
-
-  public boolean hasArguments() {
-    return cellCountNoHeader() >= TypeStackSlotEntries.perArgCount();
-  }
-
-  public K argumentType(int i) {
-    return args.type(i);
-  }
-
-  public boolean hasReturn() {
-    return (cellCountNoHeader() % TypeStackSlotEntries.perArgCount()) != 0;
-  }
-
-  public K returnType() {
-    return ret.type();
-  }
-
-  public int argumentTypeIndex(int i) {
-    return args.typeIndex(i);
-  }
-
-  public int returnTypeIndex() {
-    return ret.typeIndex();
-  }
-
-  public void printDataOn(PrintStream st) {
-    super.printDataOn(st);
-    if (hasArguments()) {
-      tab(st);
-      st.print("argument types");
-      args.printDataOn(st);
-    }
-    if (hasReturn()) {
-      tab(st);
-      st.print("return type");
-      ret.printDataOn(st);
-    }
-  }
-};
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java
index 75750548ef5..ae9c048f9d7 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,21 +37,18 @@ public class InterpretedVFrame extends JavaVFrame {
   }
 
   public StackValueCollection getLocals() {
-    Method m = getMethod();
-
-    int length = (int) m.getMaxLocals();
-
-    if (m.isNative()) {
-      // If the method is native, getMaxLocals is not telling the truth.
-      // maxlocals then equals the size of parameters
-      length = (int) m.getSizeOfParameters();
-    }
-
-    StackValueCollection result = new StackValueCollection(length);
-
     // Get oopmap describing oops and int for current bci
     OopMapCacheEntry oopMask = getMethod().getMaskFor(getBCI());
 
+    // If the method is native, method()->max_locals() is not telling the truth.
+    // For our purposes, max locals instead equals the size of parameters.
+    Method method = getMethod();
+    int maxLocals = method.isNative() ? (int)method.getSizeOfParameters() : (int)method.getMaxLocals();
+
+    int length = maxLocals;
+
+    StackValueCollection result = new StackValueCollection(length);
+
     // handle locals
     for(int i = 0; i < length; i++) {
       // Find stack location
@@ -74,26 +71,27 @@ public class InterpretedVFrame extends JavaVFrame {
   }
 
   public StackValueCollection getExpressions() {
-    int length = getFrame().getInterpreterFrameExpressionStackSize();
-
-    if (getMethod().isNative()) {
-      // If the method is native, there is no expression stack
-      length = 0;
-    }
-
-    int nofLocals = (int) getMethod().getMaxLocals();
-    StackValueCollection result = new StackValueCollection(length);
-
     // Get oopmap describing oops and int for current bci
     OopMapCacheEntry oopMask = getMethod().getMaskFor(getBCI());
 
+    int maskLen = oopMask.numberOfEntries();
+
+    // If the method is native, method()->max_locals() is not telling the truth.
+    // For our purposes, max locals instead equals the size of parameters.
+    Method method = getMethod();
+    int maxLocals = method.isNative() ? (int)method.getSizeOfParameters() : (int)method.getMaxLocals();
+
+    int length = maskLen - maxLocals;
+
+    StackValueCollection result = new StackValueCollection(length);
+
     for(int i = 0; i < length; i++) {
       // Find stack location
       Address addr = addressOfExpressionStackAt(i);
 
       // Depending on oop/int put it in the right package
       StackValue sv;
-      if (oopMask.isOop(i + nofLocals)) {
+      if (oopMask.isOop(i + maxLocals)) {
         // oop value
         sv = new StackValue(addr.getOopHandleAt(0), 0);
       } else {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
index 22bc02a06d9..d2e05c6f84d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
@@ -39,7 +39,7 @@ public class Thread extends VMObject {
   private static AddressField currentWaitingMonitorField;
   private static AddressField osThreadField;
 
-  private static JLongField allocatedBytesField;
+  private static CIntegerField allocatedBytesField;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -60,7 +60,7 @@ public class Thread extends VMObject {
     tlabFieldOffset    = typeThread.getField("_tlab").getOffset();
     currentPendingMonitorField = typeJavaThread.getAddressField("_current_pending_monitor");
     currentWaitingMonitorField = typeJavaThread.getAddressField("_current_waiting_monitor");
-    allocatedBytesField = typeThread.getJLongField("_allocated_bytes");
+    allocatedBytesField = typeThread.getCIntegerField("_allocated_bytes");
   }
 
   public Thread(Address addr) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java
index 51f40fad12b..80ea272ea2c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,6 +121,9 @@ public abstract class AbstractHeapGraphWriter implements HeapGraphWriter {
                 // write JNI global handles
                 writeGlobalJNIHandles();
 
+                // write classes in null class loader data
+                writeStickyClasses();
+
         } catch (RuntimeException re) {
             handleRuntimeException(re);
         }
@@ -168,6 +171,9 @@ public abstract class AbstractHeapGraphWriter implements HeapGraphWriter {
         }
     }
 
+    protected void writeStickyClasses() throws IOException {
+    }
+
     protected void writeGlobalJNIHandle(Address handleAddr) throws IOException {
     }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
index 72861d9c30d..2745e1f0783 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -888,6 +888,16 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
         out.writeInt(index);
         out.writeInt(DUMMY_STACK_TRACE_ID);
         writeLocalJNIHandles(jt, index);
+
+        int depth = 0;
+        var jvf = jt.getLastJavaVFrameDbg();
+        while (jvf != null) {
+            writeStackRefs(index, depth, jvf.getLocals());
+            writeStackRefs(index, depth, jvf.getExpressions());
+
+            depth++;
+            jvf = jvf.javaSender();
+        }
     }
 
     protected void writeLocalJNIHandles(JavaThread jt, int index) throws IOException {
@@ -926,6 +936,23 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
         }
     }
 
+    protected void writeStackRefs(int threadIndex, int frameIndex, StackValueCollection values) throws IOException {
+        for (int index = 0; index < values.size(); index++) {
+            if (values.get(index).getType() == BasicType.getTObject()) {
+                OopHandle oopHandle = values.oopHandleAt(index);
+                Oop oop = objectHeap.newOop(oopHandle);
+                if (oop != null) {
+                    int size = BYTE_SIZE + OBJ_ID_SIZE + INT_SIZE * 2;
+                    writeHeapRecordPrologue(size);
+                    out.writeByte((byte) HPROF_GC_ROOT_JAVA_FRAME);
+                    writeObjectID(oop);
+                    out.writeInt(threadIndex);
+                    out.writeInt(frameIndex);
+                }
+            }
+        }
+    }
+
     protected void writeGlobalJNIHandle(Address handleAddr) throws IOException {
         OopHandle oopHandle = handleAddr.getOopHandleAt(0);
         Oop oop = objectHeap.newOop(oopHandle);
@@ -940,6 +967,22 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
         }
     }
 
+    @Override
+    protected void writeStickyClasses() throws IOException {
+        ClassLoaderData.theNullClassLoaderData().classesDo(k -> {
+            if (k instanceof InstanceKlass) {
+                try {
+                    int size = 1 + (int)VM.getVM().getAddressSize();
+                    writeHeapRecordPrologue(size);
+                    out.writeByte((byte)HPROF_GC_ROOT_STICKY_CLASS);
+                    writeClassID(k);
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+            }
+        });
+    }
+
     protected void writeObjectArray(ObjArray array) throws IOException {
         int headerSize = getArrayHeaderSize(true);
         final int length = calculateArrayMaxLength(array.getLength(),
@@ -1277,6 +1320,10 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
         writeObjectID(address);
     }
 
+    private void writeClassID(Klass k) throws IOException {
+        writeObjectID(k.getJavaMirror());
+    }
+
     private void writeSymbolID(Symbol sym) throws IOException {
         assert names.contains(sym);
         long address = (sym != null) ? getAddressValue(sym.getAddress()) : getAddressValue(null);
diff --git a/src/jdk.hotspot.agent/share/man/jhsdb.md b/src/jdk.hotspot.agent/share/man/jhsdb.md
index 4c6be775ece..f329a2fea6f 100644
--- a/src/jdk.hotspot.agent/share/man/jhsdb.md
+++ b/src/jdk.hotspot.agent/share/man/jhsdb.md
@@ -119,20 +119,20 @@ The `jhsdb` tool can be launched in any one of the following modes:
 
 ## Options for the debugd Mode
 
-`--serverid` *server-id*
+[`--serverid`]{#debugd-option--serverid} *server-id*
 :   An optional unique ID for this debug server. This is required if multiple
     debug servers are run on the same machine.
 
-`--rmiport` *port*
+[`--rmiport`]{#debugd-option--rmiport} *port*
 :   Sets the port number to which the RMI connector is bound. If not specified
     a random available port is used.
 
-`--registryport` *port*
+[`--registryport`]{#debugd-option--registryport} *port*
 :   Sets the RMI registry port. This option overrides the system property
     'sun.jvm.hotspot.rmi.port'. If not specified, the system property is used.
     If the system property is not set, the default port 1099 is used.
 
-`--hostname` *hostname*
+[`--hostname`]{#debugd-option--hostname} *hostname*
 :   Sets the hostname the RMI connector is bound. The value could be a hostname
     or an IPv4/IPv6 address. This option overrides the system property
     'java.rmi.server.hostname'. If not specified, the system property is used.
@@ -140,10 +140,10 @@ The `jhsdb` tool can be launched in any one of the following modes:
 
 ## Options for the jinfo Mode
 
-`--flags`
+[`--flags`]{#jinfo-option--flags}
 :   Prints the VM flags.
 
-`--sysprops`
+[`--sysprops`]{#jinfo-option--sysprops}
 :   Prints the Java system properties.
 
 no option
@@ -154,33 +154,33 @@ no option
 no option
 :   Prints the same information as Solaris `pmap`.
 
-`--heap`
+[`--heap`]{#jmap-option--heap}
 :   Prints the `java` heap summary.
 
-`--binaryheap`
+[`--binaryheap`]{#jmap-option--binaryheap}
 :   Dumps the `java` heap in `hprof` binary format.
 
-`--dumpfile` *name*
+[`--dumpfile`]{#jmap-option--dumpfile} *name*
 :   The name of the dumpfile.
 
-`--histo`
+[`--histo`]{#jmap-option--histo}
 :   Prints the histogram of `java` object heap.
 
-`--clstats`
+[`--clstats`]{#jmap-option--clstats}
 :   Prints the class loader statistics.
 
-`--finalizerinfo`
+[`--finalizerinfo`]{#jmap-option--finalizerinfo}
 :   Prints the information on objects awaiting finalization.
 
 ## Options for the jstack Mode
 
-`--locks`
+[`--locks`]{#jstack-option--locks}
 :   Prints the `java.util.concurrent` locks information.
 
-`--mixed`
+[`--mixed`]{#jstack-option--mixed}
 :   Attempts to print both `java` and native frames if the platform allows it.
 
 ## Options for the jsnap Mode
 
-`--all`
+[`--all`]{#jsnap-option--all}
 :   Prints all performance counters.
diff --git a/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
index f2994c0d827..0c16400bf3b 100644
--- a/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
+++ b/src/jdk.hotspot.agent/windows/native/libsaproc/sawindbg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -906,3 +906,40 @@ JNIEXPORT jobject JNICALL Java_sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLoc
   CHECK_EXCEPTION_(0);
   return res;
 }
+
+/*
+ * Class:     sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal
+ * Method:    getSenderRegs0
+ * Signature: (JJJ)[J
+ */
+JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_windbg_WindbgDebuggerLocal_getSenderRegs0
+    (JNIEnv *env, jobject obj, jlong sp, jlong fp, jlong pc) {
+  IDebugControl* ptrIDebugControl = (IDebugControl*)env->GetLongField(obj, ptrIDebugControl_ID);
+  CHECK_EXCEPTION_(nullptr);
+
+  // GetStackTrace() returns call frames from specified fp, sp, and pc.
+  // The top of frame would point current frame, hence we refer 2nd frame
+  // as a sender and get registers from it.
+  DEBUG_STACK_FRAME frames[2];
+  ULONG filled;
+  HRESULT dbg_result = ptrIDebugControl->GetStackTrace(fp, sp, pc, frames, 2, &filled);
+  if (dbg_result != S_OK || filled != 2) {
+    return nullptr;
+  }
+
+  jlongArray result = env->NewLongArray(3);
+  CHECK_EXCEPTION_(nullptr);
+  if (result == nullptr) {
+    return nullptr;
+  }
+
+  jlong regs[] = {
+    static_cast<jlong>(frames[1].StackOffset),
+    static_cast<jlong>(frames[1].FrameOffset),
+    static_cast<jlong>(frames[1].InstructionOffset)
+  };
+  env->SetLongArrayRegion(result, 0, 3, regs);
+  CHECK_EXCEPTION_(nullptr);
+
+  return result;
+}
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
index 2decd48c806..9389aae8691 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/Headers.java
@@ -36,6 +36,7 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import sun.net.httpserver.UnmodifiableHeaders;
+import sun.net.httpserver.Utils;
 
 /**
  * HTTP request and response headers are represented by this class which
@@ -216,8 +217,13 @@ public class Headers implements Map<String, List<String>> {
 
     @Override
     public List<String> put(String key, List<String> value) {
+        // checkHeader is called in this class to fail fast
+        // It also must be called in sendResponseHeaders because
+        // Headers instances internal state can be modified
+        // external to these methods.
+        Utils.checkHeader(key, false);
         for (String v : value)
-            checkValue(v);
+            Utils.checkHeader(v, true);
         return map.put(normalize(key), value);
     }
 
@@ -229,7 +235,8 @@ public class Headers implements Map<String, List<String>> {
      * @param value the value to add to the header
      */
     public void add(String key, String value) {
-        checkValue(value);
+        Utils.checkHeader(key, false);
+        Utils.checkHeader(value, true);
         String k = normalize(key);
         List<String> l = map.get(k);
         if (l == null) {
@@ -239,30 +246,6 @@ public class Headers implements Map<String, List<String>> {
         l.add(value);
     }
 
-    private static void checkValue(String value) {
-        int len = value.length();
-        for (int i=0; i<len; i++) {
-            char c = value.charAt(i);
-            if (c == '\r') {
-                // is allowed if it is followed by \n and a whitespace char
-                if (i >= len - 2) {
-                    throw new IllegalArgumentException("Illegal CR found in header");
-                }
-                char c1 = value.charAt(i+1);
-                char c2 = value.charAt(i+2);
-                if (c1 != '\n') {
-                    throw new IllegalArgumentException("Illegal char found after CR in header");
-                }
-                if (c2 != ' ' && c2 != '\t') {
-                    throw new IllegalArgumentException("No whitespace found after CRLF in header");
-                }
-                i+=2;
-            } else if (c == '\n') {
-                throw new IllegalArgumentException("Illegal LF found in header");
-            }
-        }
-    }
-
     /**
      * Sets the given {@code value} as the sole header value for the given
      * {@code key}. If the mapping does not already exist, then it is created.
@@ -304,7 +287,7 @@ public class Headers implements Map<String, List<String>> {
     public void replaceAll(BiFunction<? super String, ? super List<String>, ? extends List<String>> function) {
         var f = function.andThen(values -> {
             Objects.requireNonNull(values);
-            values.forEach(Headers::checkValue);
+            values.forEach(value -> Utils.checkHeader(value, true));
             return values;
         });
         Map.super.replaceAll(f);
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
index a0271fed146..fb10ecb0755 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ import java.util.concurrent.Executor;
  *
  * <p>The following table shows some request URIs and which, if any context they would
  * match with:
- * <table class="striped"><caption style="display:none">description</caption>
+ * <table class="striped" style="text-align:left"><caption style="display:none">description</caption>
  *      <thead>
  *          <tr>
  *              <th scope="col"><i>Request URI</i></th>
@@ -278,10 +278,20 @@ public abstract class HttpServer {
      * <p>The class overview describes how incoming request URIs are
      * <a href="#mapping_description">mapped</a> to HttpContext instances.
      *
-     * @apiNote The path should generally, but is not required to, end with '/'.
-     * If the path does not end with '/', eg such as with {@code "/foo"} then
-     * this would match requests with a path of {@code "/foobar"} or
-     * {@code "/foo/bar"}.
+     * @apiNote
+     * The path should generally, but is not required to, end with {@code /}.
+     * If the path does not end with {@code /}, e.g., such as with {@code /foo},
+     * then some implementations may use <em>string prefix matching</em> where
+     * this context path matches request paths {@code /foo},
+     * {@code /foo/bar}, or {@code /foobar}. Others may use <em>path prefix
+     * matching</em> where {@code /foo} matches request paths {@code /foo} and
+     * {@code /foo/bar}, but not {@code /foobar}.
+     *
+     * @implNote
+     * By default, the JDK built-in implementation uses path prefix matching.
+     * String prefix matching can be enabled using the
+     * {@link jdk.httpserver/##sun.net.httpserver.pathMatcher sun.net.httpserver.pathMatcher}
+     * system property.
      *
      * @param path the root URI path to associate the context with
      * @param handler the handler to invoke for incoming requests
@@ -289,6 +299,8 @@ public abstract class HttpServer {
      * already exists for this path
      * @throws NullPointerException if either path, or handler are {@code null}
      * @return an instance of {@code HttpContext}
+     *
+     * @see jdk.httpserver/##sun.net.httpserver.pathMatcher sun.net.httpserver.pathMatcher
      */
     public abstract HttpContext createContext(String path, HttpHandler handler);
 
@@ -308,16 +320,28 @@ public abstract class HttpServer {
      * <p>The class overview describes how incoming request URIs are
      * <a href="#mapping_description">mapped</a> to {@code HttpContext} instances.
      *
-     * @apiNote The path should generally, but is not required to, end with '/'.
-     * If the path does not end with '/', eg such as with {@code "/foo"} then
-     * this would match requests with a path of {@code "/foobar"} or
-     * {@code "/foo/bar"}.
+     * @apiNote
+     * The path should generally, but is not required to, end with {@code /}.
+     * If the path does not end with {@code /}, e.g., such as with {@code /foo},
+     * then some implementations may use <em>string prefix matching</em> where
+     * this context path matches request paths {@code /foo},
+     * {@code /foo/bar}, or {@code /foobar}. Others may use <em>path prefix
+     * matching</em> where {@code /foo} matches request paths
+     * {@code /foo} and {@code /foo/bar}, but not {@code /foobar}.
+     *
+     * @implNote
+     * By default, the JDK built-in implementation uses path prefix matching.
+     * String prefix matching can be enabled using the
+     * {@link jdk.httpserver/##sun.net.httpserver.pathMatcher sun.net.httpserver.pathMatcher}
+     * system property.
      *
      * @param path the root URI path to associate the context with
      * @throws IllegalArgumentException if path is invalid, or if a context
      * already exists for this path
      * @throws NullPointerException if path is {@code null}
      * @return an instance of {@code HttpContext}
+     *
+     * @see jdk.httpserver/##sun.net.httpserver.pathMatcher sun.net.httpserver.pathMatcher
      */
     public abstract HttpContext createContext(String path);
 
diff --git a/src/jdk.httpserver/share/classes/module-info.java b/src/jdk.httpserver/share/classes/module-info.java
index ac147582b14..0a0e77c628f 100644
--- a/src/jdk.httpserver/share/classes/module-info.java
+++ b/src/jdk.httpserver/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,35 @@ import com.sun.net.httpserver.*;
  * <li><p><b>{@systemProperty sun.net.httpserver.nodelay}</b> (default: false)<br>
  * Boolean value, which if true, sets the {@link java.net.StandardSocketOptions#TCP_NODELAY TCP_NODELAY}
  * socket option on all incoming connections.
- * </li></ul>
+ * </li>
+ * <li>
+ * <p><b>{@systemProperty sun.net.httpserver.pathMatcher}</b> (default:
+ * {@code pathPrefix})<br/>
+ *
+ * The path matching scheme used to route requests to context handlers.
+ * The property can be configured with one of the following values:</p>
+ *
+ * <blockquote>
+ * <dl>
+ * <dt>{@code pathPrefix} (default)</dt>
+ * <dd>The request path must begin with the context path and all matching path
+ * segments must be identical. For instance, the context path {@code /foo}
+ * would match request paths {@code /foo}, {@code /foo/}, and {@code /foo/bar},
+ * but not {@code /foobar}.</dd>
+ * <dt>{@code stringPrefix}</dt>
+ * <dd>The request path string must begin with the context path string. For
+ * instance, the context path {@code /foo} would match request paths
+ * {@code /foo}, {@code /foo/}, {@code /foo/bar}, and {@code /foobar}.
+ * </dd>
+ * </dl>
+ * </blockquote>
+ *
+ * <p>In case of a blank or invalid value, the default will be used.</p>
+ *
+ * <p>This property and the ability to restore the string prefix matching
+ * behavior may be removed in a future release.</p>
+ * </li>
+ * </ul>
  *
  * @apiNote The API and SPI in this module are designed and implemented to support a minimal
  * HTTP server and simple HTTP semantics primarily.
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
index fd1a940c0a5..0af59f1d1a7 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,9 +154,7 @@ class ChunkedOutputStream extends FilterOutputStream
         } finally {
             closed = true;
         }
-
-        Event e = new Event.WriteFinished(t);
-        t.getHttpContext().getServerImpl().addEvent(e);
+        t.postExchangeFinished(true);
     }
 
     public void flush() throws IOException {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
index 96b55575928..6393ca34798 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ContextList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,22 @@
 package sun.net.httpserver;
 
 import java.util.*;
+import java.util.function.BiPredicate;
 
 class ContextList {
 
+    private static final System.Logger LOGGER = System.getLogger(ContextList.class.getName());
+
     private final LinkedList<HttpContextImpl> list = new LinkedList<>();
 
     public synchronized void add(HttpContextImpl ctx) {
+        assert ctx != null;
+        // `findContext(String protocol, String path, ContextPathMatcher matcher)`
+        // expects the protocol to be lower-cased using ROOT locale, hence:
+        assert ctx.getProtocol().equals(ctx.getProtocol().toLowerCase(Locale.ROOT));
         assert ctx.getPath() != null;
+        // `ContextPathMatcher` expects context paths to be non-empty:
+        assert !ctx.getPath().isEmpty();
         if (contains(ctx)) {
             throw new IllegalArgumentException("cannot add context to list");
         }
@@ -40,21 +49,25 @@ class ContextList {
     }
 
     boolean contains(HttpContextImpl ctx) {
-        return findContext(ctx.getProtocol(), ctx.getPath(), true) != null;
+        return findContext(ctx.getProtocol(), ctx.getPath(), ContextPathMatcher.EXACT) != null;
     }
 
     public synchronized int size() {
         return list.size();
     }
 
-   /* initially contexts are located only by protocol:path.
-    * Context with longest prefix matches (currently case-sensitive)
+   /**
+    * {@return the context with the longest case-sensitive prefix match}
+    *
+    * @param protocol the request protocol
+    * @param path the request path
     */
-    synchronized HttpContextImpl findContext(String protocol, String path) {
-        return findContext(protocol, path, false);
+    HttpContextImpl findContext(String protocol, String path) {
+        var matcher = ContextPathMatcher.ofConfiguredPrefixPathMatcher();
+        return findContext(protocol, path, matcher);
     }
 
-    synchronized HttpContextImpl findContext(String protocol, String path, boolean exact) {
+    private synchronized HttpContextImpl findContext(String protocol, String path, ContextPathMatcher matcher) {
         protocol = protocol.toLowerCase(Locale.ROOT);
         String longest = "";
         HttpContextImpl lc = null;
@@ -63,9 +76,7 @@ class ContextList {
                 continue;
             }
             String cpath = ctx.getPath();
-            if (exact && !cpath.equals(path)) {
-                continue;
-            } else if (!exact && !path.startsWith(cpath)) {
+            if (!matcher.test(cpath, path)) {
                 continue;
             }
             if (cpath.length() > longest.length()) {
@@ -76,10 +87,174 @@ class ContextList {
         return lc;
     }
 
+    private enum ContextPathMatcher implements BiPredicate<String, String> {
+
+        /**
+         * Tests if both the request path and the context path are identical.
+         */
+        EXACT(String::equals),
+
+        /**
+         * Tests <em>string prefix matches</em> where the request path string
+         * starts with the context path string.
+         *
+         * <h3>Examples</h3>
+         *
+         * <table>
+         * <thead>
+         * <tr>
+         *   <th rowspan="2">Context path</th>
+         *   <th colspan="4">Request path</th>
+         * </tr>
+         * <tr>
+         *     <th>/foo</th>
+         *     <th>/foo/</th>
+         *     <th>/foo/bar</th>
+         *     <th>/foobar</th>
+         * </tr>
+         * </thead>
+         * <tbody>
+         * <tr>
+         *   <td>/</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         * </tr>
+         * <tr>
+         *   <td>/foo</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         * </tr>
+         * <tr>
+         *   <td>/foo/</td>
+         *   <td>N</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>N</td>
+         * </tr>
+         * </tbody>
+         * </table>
+         */
+        STRING_PREFIX((contextPath, requestPath) -> requestPath.startsWith(contextPath)),
+
+        /**
+         * Tests <em>path prefix matches</em> where path segments must have an
+         * exact match.
+         *
+         * <h3>Examples</h3>
+         *
+         * <table>
+         * <thead>
+         * <tr>
+         *   <th rowspan="2">Context path</th>
+         *   <th colspan="4">Request path</th>
+         * </tr>
+         * <tr>
+         *     <th>/foo</th>
+         *     <th>/foo/</th>
+         *     <th>/foo/bar</th>
+         *     <th>/foobar</th>
+         * </tr>
+         * </thead>
+         * <tbody>
+         * <tr>
+         *   <td>/</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         * </tr>
+         * <tr>
+         *   <td>/foo</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>N</td>
+         * </tr>
+         * <tr>
+         *   <td>/foo/</td>
+         *   <td>N</td>
+         *   <td>Y</td>
+         *   <td>Y</td>
+         *   <td>N</td>
+         * </tr>
+         * </tbody>
+         * </table>
+         */
+        PATH_PREFIX((contextPath, requestPath) -> {
+
+            // Fast-path for `/`
+            if ("/".equals(contextPath)) {
+                return true;
+            }
+
+            // Does the request path prefix match?
+            if (requestPath.startsWith(contextPath)) {
+
+                // Is it an exact match?
+                int contextPathLength = contextPath.length();
+                if (requestPath.length() == contextPathLength) {
+                    return true;
+                }
+
+                // Is it a path-prefix match?
+                assert contextPathLength > 0;
+                return
+                        // Case 1: The request path starts with the context
+                        // path, but the context path has an extra path
+                        // separator suffix. For instance, the context path is
+                        // `/foo/` and the request path is `/foo/bar`.
+                        contextPath.charAt(contextPathLength - 1) == '/' ||
+                                // Case 2: The request path starts with the
+                                // context path, but the request path has an
+                                // extra path separator suffix. For instance,
+                                // context path is `/foo` and the request path
+                                // is `/foo/` or `/foo/bar`.
+                                requestPath.charAt(contextPathLength) == '/';
+
+            }
+
+            return false;
+
+        });
+
+        private final BiPredicate<String, String> predicate;
+
+        ContextPathMatcher(BiPredicate<String, String> predicate) {
+            this.predicate = predicate;
+        }
+
+        @Override
+        public boolean test(String contextPath, String requestPath) {
+            return predicate.test(contextPath, requestPath);
+        }
+
+        private static ContextPathMatcher ofConfiguredPrefixPathMatcher() {
+            var propertyName = "sun.net.httpserver.pathMatcher";
+            var propertyValueDefault = "pathPrefix";
+            var propertyValue = System.getProperty(propertyName, propertyValueDefault);
+            return switch (propertyValue) {
+                case "pathPrefix" -> ContextPathMatcher.PATH_PREFIX;
+                case "stringPrefix" -> ContextPathMatcher.STRING_PREFIX;
+                default -> {
+                    LOGGER.log(
+                            System.Logger.Level.WARNING,
+                            "System property \"{}\" contains an invalid value: \"{}\". Falling back to the default: \"{}\"",
+                            propertyName, propertyValue, propertyValueDefault);
+                    yield ContextPathMatcher.PATH_PREFIX;
+                }
+            };
+        }
+
+    }
+
     public synchronized void remove(String protocol, String path)
         throws IllegalArgumentException
     {
-        HttpContextImpl ctx = findContext(protocol, path, true);
+        HttpContextImpl ctx = findContext(protocol, path, ContextPathMatcher.EXACT);
         if (ctx == null) {
             throw new IllegalArgumentException("cannot remove element from list");
         }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
index 18c2535492b..41ce83596b7 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,13 +47,15 @@ abstract sealed class Event {
     }
 
     /**
-     * Event indicating that writing is finished for a given exchange.
+     * Event indicating that the exchange is finished,
+     * without having necessarily read the complete
+     * request or sent the complete response.
+     * Typically, this event is posted when invoking
+     * the filter chain throws an exception.
      */
-    static final class WriteFinished extends Event {
-        WriteFinished(ExchangeImpl t) {
+    static final class ExchangeFinished extends Event {
+        ExchangeFinished(ExchangeImpl t) {
             super(Objects.requireNonNull(t));
-            assert !t.writefinished;
-            t.writefinished = true;
         }
     }
 }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
index 8da98cdcfa5..57296842db2 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,10 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
-import java.text.*;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 import com.sun.net.httpserver.*;
 import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
@@ -46,7 +46,7 @@ class ExchangeImpl {
     Headers reqHdrs, rspHdrs;
     Request req;
     String method;
-    boolean writefinished;
+    private boolean writefinished;
     URI uri;
     HttpConnection connection;
     long reqContentLen;
@@ -87,6 +87,19 @@ class ExchangeImpl {
     HttpPrincipal principal;
     ServerImpl server;
 
+    // Used to control that ServerImpl::endExchange is called
+    // exactly once for this exchange. ServerImpl::endExchange decrements
+    // the refcount that was incremented by calling ServerImpl::startExchange
+    // in this ExchangeImpl constructor.
+    private final AtomicBoolean ended = new AtomicBoolean();
+
+    // Used to ensure that the Event.ExchangeFinished is posted only
+    // once for this exchange. The Event.ExchangeFinished is what will
+    // eventually cause the ServerImpl::finishedLatch to be triggered,
+    // once the number of active exchanges reaches 0 and ServerImpl::stop
+    // has been requested.
+    private final AtomicBoolean finished = new AtomicBoolean();
+
     ExchangeImpl(
         String m, URI u, Request req, long len, HttpConnection connection
     ) throws IOException {
@@ -107,6 +120,55 @@ class ExchangeImpl {
         server.startExchange();
     }
 
+    /**
+     * When true, writefinished indicates that all bytes expected
+     * by the client have been written to the response body
+     * outputstream, and that the response body outputstream has
+     * been closed. When all bytes have also been pulled from
+     * the request body input stream, this makes it possible to
+     * reuse the connection for the next request.
+     */
+    synchronized boolean writefinished() {
+        return writefinished;
+    }
+
+    /**
+     * Calls ServerImpl::endExchange if not already called for this
+     * exchange. ServerImpl::endExchange must be called exactly once
+     * per exchange, and this method ensures that it is not called
+     * more than once for this exchange.
+     * @return the new (or current) value of the exchange count.
+     */
+    int endExchange() {
+        // only call server.endExchange(); once per exchange
+        if (ended.compareAndSet(false, true)) {
+            return server.endExchange();
+        }
+        return server.getExchangeCount();
+    }
+
+    /**
+     * Posts the ExchangeFinished event if not already posted.
+     * If `writefinished` is true, marks the exchange as {@link
+     * #writefinished()} so that the connection can be reused.
+     * @param writefinished whether all bytes expected by the
+     *                      client have been writen out to the
+     *                      response body output stream.
+     */
+    void postExchangeFinished(boolean writefinished) {
+        // only post ExchangeFinished once per exchange
+        if (finished.compareAndSet(false, true)) {
+            if (writefinished) {
+                synchronized (this) {
+                    assert this.writefinished == false;
+                    this.writefinished = true;
+                }
+            }
+            Event e = new Event.ExchangeFinished(this);
+            getHttpContext().getServerImpl().addEvent(e);
+        }
+    }
+
     public Headers getRequestHeaders() {
         return reqHdrs;
     }
@@ -140,7 +202,7 @@ class ExchangeImpl {
         /* close the underlying connection if,
          * a) the streams not set up yet, no response can be sent, or
          * b) if the wrapper output stream is not set up, or
-         * c) if the close of the input/outpu stream fails
+         * c) if the close of the input/output stream fails
          */
         try {
             if (uis_orig == null || uos == null) {
@@ -157,6 +219,8 @@ class ExchangeImpl {
             uos.close();
         } catch (IOException e) {
             connection.close();
+        } finally {
+            postExchangeFinished(false);
         }
     }
 
@@ -207,6 +271,8 @@ class ExchangeImpl {
         return uos_orig;
     }
 
+    private static final byte[] CRLF = new byte[] {0x0D, 0x0A};
+
     public void sendResponseHeaders(int rCode, long contentLen)
     throws IOException
     {
@@ -215,10 +281,11 @@ class ExchangeImpl {
             throw new IOException("headers already sent");
         }
         this.rcode = rCode;
-        String statusLine = "HTTP/1.1 " + rCode + Code.msg(rCode) + "\r\n";
+        String statusLine = "HTTP/1.1 " + rCode + Code.msg(rCode);
         ByteArrayOutputStream tmpout = new ByteArrayOutputStream();
         PlaceholderOutputStream o = getPlaceholderResponseBody();
-        tmpout.write(bytes(statusLine, 0), 0, statusLine.length());
+        tmpout.write(bytes(statusLine, false, 0), 0, statusLine.length());
+        tmpout.write(CRLF);
         boolean noContentToSend = false; // assume there is content
         boolean noContentLengthHeader = false; // must not send Content-length is set
         rspHdrs.set("Date", FORMATTER.format(Instant.now()));
@@ -305,11 +372,11 @@ class ExchangeImpl {
             List<String> values = entry.getValue();
             for (String val : values) {
                 int i = key.length();
-                buf = bytes(key, 2);
+                buf = bytes(key, true, 2);
                 buf[i++] = ':';
                 buf[i++] = ' ';
                 os.write(buf, 0, i);
-                buf = bytes(val, 2);
+                buf = bytes(val, false, 2);
                 i = val.length();
                 buf[i++] = '\r';
                 buf[i++] = '\n';
@@ -327,8 +394,14 @@ class ExchangeImpl {
      * Make sure that at least "extra" bytes are free at end
      * of rspbuf. Reallocate rspbuf if not big enough.
      * caller must check return value to see if rspbuf moved
+     *
+     * Header values are supposed to be limited to 7-bit ASCII
+     * but 8-bit has to be allowed (for ISO_8859_1). For efficiency
+     * we just down cast 16 bit Java chars to byte. We don't allow
+     * any character that can't be encoded in 8 bits.
      */
-    private byte[] bytes(String s, int extra) {
+    private byte[] bytes(String s, boolean isKey, int extra) throws IOException {
+        Utils.checkHeader(s, !isKey);
         int slen = s.length();
         if (slen+extra > rspbuf.length) {
             int diff = slen + extra - rspbuf.length;
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
index 95de03d27fa..e9dbd93bb12 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,8 +94,7 @@ class FixedLengthOutputStream extends FilterOutputStream
                 is.close();
             } catch (IOException e) {}
         }
-        Event e = new Event.WriteFinished(t);
-        t.getHttpContext().getServerImpl().addEvent(e);
+        t.postExchangeFinished(true);
     }
 
     // flush is a pass-through
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index e8c8d336e03..94fe78b9c64 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -419,7 +419,8 @@ class ServerImpl {
             // Stopping marking the state as finished if stop is requested,
             // termination is in progress and exchange count is 0
             if (r instanceof Event.StopRequested) {
-                logger.log(Level.TRACE, "Handling Stop Requested Event");
+                logger.log(Level.TRACE, "Handling {0} event",
+                        r.getClass().getSimpleName());
 
                 // checking if terminating is set to true
                 final boolean terminatingCopy = terminating;
@@ -437,10 +438,11 @@ class ServerImpl {
             HttpConnection c = t.getConnection();
 
             try {
-                if (r instanceof Event.WriteFinished) {
+                if (r instanceof Event.ExchangeFinished) {
 
-                    logger.log(Level.TRACE, "Write Finished");
-                    int exchanges = endExchange();
+                    logger.log(Level.TRACE, "Handling {0} event",
+                                r.getClass().getSimpleName());
+                    int exchanges = t.endExchange();
                     if (terminating && exchanges == 0 && reqConnections.isEmpty()) {
                         finishedLatch.countDown();
                     }
@@ -842,68 +844,77 @@ class ServerImpl {
                 tx = new ExchangeImpl(
                     method, uri, req, clen, connection
                 );
-                String chdr = headers.getFirst("Connection");
-                Headers rheaders = tx.getResponseHeaders();
+                try {
 
-                if (chdr != null && chdr.equalsIgnoreCase("close")) {
-                    tx.close = true;
-                }
-                if (version.equalsIgnoreCase("http/1.0")) {
-                    tx.http10 = true;
-                    if (chdr == null) {
+                    String chdr = headers.getFirst("Connection");
+                    Headers rheaders = tx.getResponseHeaders();
+
+                    if (chdr != null && chdr.equalsIgnoreCase("close")) {
                         tx.close = true;
-                        rheaders.set("Connection", "close");
-                    } else if (chdr.equalsIgnoreCase("keep-alive")) {
-                        rheaders.set("Connection", "keep-alive");
-                        int idleSeconds = (int) (ServerConfig.getIdleIntervalMillis() / 1000);
-                        String val = "timeout=" + idleSeconds;
-                        rheaders.set("Keep-Alive", val);
                     }
-                }
+                    if (version.equalsIgnoreCase("http/1.0")) {
+                        tx.http10 = true;
+                        if (chdr == null) {
+                            tx.close = true;
+                            rheaders.set("Connection", "close");
+                        } else if (chdr.equalsIgnoreCase("keep-alive")) {
+                            rheaders.set("Connection", "keep-alive");
+                            int idleSeconds = (int) (ServerConfig.getIdleIntervalMillis() / 1000);
+                            String val = "timeout=" + idleSeconds;
+                            rheaders.set("Keep-Alive", val);
+                        }
+                    }
 
-                if (newconnection) {
-                    connection.setParameters(
-                        rawin, rawout, chan, engine, sslStreams,
-                        sslContext, protocol, ctx, rawin
-                    );
-                }
-                /* check if client sent an Expect 100 Continue.
-                 * In that case, need to send an interim response.
-                 * In future API may be modified to allow app to
-                 * be involved in this process.
-                 */
-                String exp = headers.getFirst("Expect");
-                if (exp != null && exp.equalsIgnoreCase("100-continue")) {
-                    logReply(100, requestLine, null);
-                    sendReply(
-                        Code.HTTP_CONTINUE, false, null
-                    );
-                }
-                /* uf is the list of filters seen/set by the user.
-                 * sf is the list of filters established internally
-                 * and which are not visible to the user. uc and sc
-                 * are the corresponding Filter.Chains.
-                 * They are linked together by a LinkHandler
-                 * so that they can both be invoked in one call.
-                 */
-                final List<Filter> sf = ctx.getSystemFilters();
-                final List<Filter> uf = ctx.getFilters();
+                    if (newconnection) {
+                        connection.setParameters(
+                                rawin, rawout, chan, engine, sslStreams,
+                                sslContext, protocol, ctx, rawin
+                        );
+                    }
+                    /* check if client sent an Expect 100 Continue.
+                     * In that case, need to send an interim response.
+                     * In future API may be modified to allow app to
+                     * be involved in this process.
+                     */
+                    String exp = headers.getFirst("Expect");
+                    if (exp != null && exp.equalsIgnoreCase("100-continue")) {
+                        logReply(100, requestLine, null);
+                        sendReply(
+                                Code.HTTP_CONTINUE, false, null
+                        );
+                    }
+                    /* uf is the list of filters seen/set by the user.
+                     * sf is the list of filters established internally
+                     * and which are not visible to the user. uc and sc
+                     * are the corresponding Filter.Chains.
+                     * They are linked together by a LinkHandler
+                     * so that they can both be invoked in one call.
+                     */
+                    final List<Filter> sf = ctx.getSystemFilters();
+                    final List<Filter> uf = ctx.getFilters();
 
-                final Filter.Chain sc = new Filter.Chain(sf, ctx.getHandler());
-                final Filter.Chain uc = new Filter.Chain(uf, new LinkHandler(sc));
+                    final Filter.Chain sc = new Filter.Chain(sf, ctx.getHandler());
+                    final Filter.Chain uc = new Filter.Chain(uf, new LinkHandler(sc));
 
-                /* set up the two stream references */
-                tx.getRequestBody();
-                tx.getResponseBody();
-                if (https) {
-                    uc.doFilter(new HttpsExchangeImpl(tx));
-                } else {
-                    uc.doFilter(new HttpExchangeImpl(tx));
+                    /* set up the two stream references */
+                    tx.getRequestBody();
+                    tx.getResponseBody();
+                    if (https) {
+                        uc.doFilter(new HttpsExchangeImpl(tx));
+                    } else {
+                        uc.doFilter(new HttpExchangeImpl(tx));
+                    }
+                } catch (Throwable t) {
+                    // release the exchange.
+                    logger.log(Level.TRACE, "ServerImpl.Exchange", t);
+                    if (!tx.writefinished()) {
+                        closeConnection(connection);
+                    }
+                    tx.postExchangeFinished(false);
                 }
-
             } catch (Exception e) {
                 logger.log(Level.TRACE, "ServerImpl.Exchange", e);
-                if (tx == null || !tx.writefinished) {
+                if (tx == null || !tx.writefinished()) {
                     closeConnection(connection);
                 }
             } catch (Throwable t) {
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
index ecda32ecc31..9e1f949321a 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,8 +75,7 @@ class UndefLengthOutputStream extends FilterOutputStream
                 is.close();
             } catch (IOException e) {}
         }
-        Event e = new Event.WriteFinished(t);
-        t.getHttpContext().getServerImpl().addEvent(e);
+        t.postExchangeFinished(true);
     }
 
     // flush is a pass-through
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/Utils.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Utils.java
index 43dadb84a90..41834172f27 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/Utils.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/Utils.java
@@ -88,4 +88,37 @@ public class Utils {
         }
         return true;
     }
+
+    /* Throw IAE if illegal character found.  isValue is true if String is
+     * a value. Otherwise it is header name
+     */
+    public static void checkHeader(String str, boolean isValue) {
+        int len = str.length();
+        for (int i=0; i<len; i++) {
+            char c = str.charAt(i);
+            if (c == '\r') {
+                if (!isValue) {
+                    throw new IllegalArgumentException("Illegal CR found in header");
+                }
+                // is allowed if it is followed by \n and a whitespace char
+                if (i >= len - 2) {
+                    throw new IllegalArgumentException("Illegal CR found in header");
+                }
+                char c1 = str.charAt(i+1);
+                char c2 = str.charAt(i+2);
+                if (c1 != '\n') {
+                    throw new IllegalArgumentException("Illegal char found after CR in header");
+                }
+                if (c2 != ' ' && c2 != '\t') {
+                    throw new IllegalArgumentException("No whitespace found after CRLF in header");
+                }
+                i+=2;
+            } else if (c == '\n') {
+                throw new IllegalArgumentException("Illegal LF found in header");
+            } else if (c > 255) {
+                throw new IllegalArgumentException("Illegal character found in header");
+            }
+        }
+    }
+
 }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java
index 30297b24db0..5b762edfd3b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ abstract class AbstractMask<E> extends VectorMask<E> {
         int laneCount = vsp.laneCount();
         i = VectorIntrinsics.checkFromIndexSize(i, laneCount, bits.length);
         VectorSupport.store(
-            vsp.maskType(), vsp.elementType(), laneCount,
+            vsp.maskType(), vsp.laneTypeOrdinal(), laneCount,
             bits, (long) i + Unsafe.ARRAY_BOOLEAN_BASE_OFFSET, false,
             this, bits, i,
             (c, idx, s) -> System.arraycopy(s.getBits(), 0, c, (int) idx, s.length()));
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
index 19ee4bb0074..075400a0d4a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ abstract class AbstractShuffle<E> extends VectorShuffle<E> {
     @ForceInline
     final AbstractVector<?> toBitsVectorTemplate() {
         AbstractSpecies<?> dsp = vspecies().asIntegral();
-        Class<?> etype = dsp.elementType();
+        int etype = dsp.laneTypeOrdinal();
         Class<?> rvtype = dsp.dummyVector().getClass();
         return VectorSupport.convert(VectorSupport.VECTOR_OP_REINTERPRET,
                                      getClass(), etype, length(),
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java
index bdc72c64ce5..6c834077387 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,6 +144,20 @@ abstract class AbstractSpecies<E> extends jdk.internal.vm.vector.VectorSupport.V
         return (Class<E>) laneType.elementType;
     }
 
+    @ForceInline
+    @SuppressWarnings("unchecked")
+    //NOT FINAL: SPECIALIZED
+    int laneTypeOrdinal() {
+        return laneType.ordinal();
+    }
+
+    @ForceInline
+    @SuppressWarnings("unchecked")
+    //NOT FINAL: SPECIALIZED
+    Class<E> carrierType() {
+        return (Class<E>) laneType.carrierType;
+    }
+
     // FIXME: appeal to general method (see https://bugs.openjdk.org/browse/JDK-6176992)
     // replace usages of this method and remove
     @ForceInline
@@ -320,7 +334,7 @@ abstract class AbstractSpecies<E> extends jdk.internal.vm.vector.VectorSupport.V
         return makeDummyVector();
     }
     private AbstractVector<E> makeDummyVector() {
-        Object za = Array.newInstance(elementType(), laneCount);
+        Object za = Array.newInstance(carrierType(), laneCount);
         return dummyVector = vectorFactory.apply(za);
         // This is the only use of vectorFactory.
         // All other factory requests are routed
@@ -415,8 +429,7 @@ abstract class AbstractSpecies<E> extends jdk.internal.vm.vector.VectorSupport.V
     Object iotaArray() {
         // Create an iota array.  It's OK if this is really slow,
         // because it happens only once per species.
-        Object ia = Array.newInstance(laneType.elementType,
-                                      laneCount);
+        Object ia = Array.newInstance(carrierType(), laneCount);
         assert(ia.getClass() == laneType.arrayType);
         checkValue(laneCount-1);  // worst case
         for (int i = 0; i < laneCount; i++) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
index 350931cd443..80260c2bd30 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,6 +84,9 @@ abstract class AbstractVector<E> extends Vector<E> {
     /*package-private*/
     abstract AbstractSpecies<E> vspecies();
 
+    /*package-private*/
+    abstract int laneTypeOrdinal();
+
     @Override
     @ForceInline
     public final VectorSpecies<E> species() {
@@ -182,7 +185,44 @@ abstract class AbstractVector<E> extends Vector<E> {
     final AbstractVector<?> asVectorRawTemplate(LaneType laneType) {
         // NOTE:  This assumes that convert0('X')
         // respects REGISTER_ENDIAN order.
-        return convert0('X', vspecies().withLanes(laneType));
+        return convert0('X', vspecies().withLanes(laneType)).swapIfNeeded(vspecies());
+    }
+
+    @ForceInline
+    protected static <T> VectorShuffle<T> normalizeSubLanesForSpecies(AbstractSpecies<T> targetSpecies, int subLanesPerSrc) {
+        final int lanes = targetSpecies.laneCount();
+
+        if ((lanes % subLanesPerSrc) != 0) {
+            throw new IllegalArgumentException("laneCount " + lanes + " not divisible by subLanesPerSrc " + subLanesPerSrc);
+        }
+
+        // Each group corresponds to one source lane.
+        // For each group, reverse the lanes inside that group.
+        final int groups = lanes / subLanesPerSrc;
+        int[] map = new int[lanes];
+        for (int g = 0; g < groups; ++g) {
+            int base = g * subLanesPerSrc;
+            for (int j = 0; j < subLanesPerSrc; ++j) {
+                 map[base + j] = base + (subLanesPerSrc - 1 - j);
+            }
+        }
+        return VectorShuffle.fromArray(targetSpecies, map, 0);
+    }
+
+    @ForceInline
+    protected final int subLanesToSwap(AbstractSpecies<?> srcSpecies) {
+        if (java.nio.ByteOrder.nativeOrder() != ByteOrder.BIG_ENDIAN) {
+            return -1;
+        }
+        int sBytes = srcSpecies.elementSize();
+        int tBytes = vspecies().elementSize();
+
+        // No lane reordering needed for same size or widening reinterprets
+        if (sBytes == tBytes || (sBytes % tBytes) != 0) {
+            return -1;
+        }
+        int subLanesPerSrc = sBytes / tBytes;
+        return subLanesPerSrc;
     }
 
     /*package-private*/
@@ -199,9 +239,9 @@ abstract class AbstractVector<E> extends Vector<E> {
     /*package-private*/
     @ForceInline
     final <F> VectorShuffle<F> bitsToShuffleTemplate(AbstractSpecies<F> dsp) {
-        Class<?> etype = vspecies().elementType();
+        int etype = vspecies().laneTypeOrdinal();
         Class<?> dvtype = dsp.shuffleType();
-        Class<?> dtype = dsp.asIntegral().elementType();
+        int dtype = dsp.asIntegral().laneTypeOrdinal();
         int dlength = dsp.dummyVector().length();
         return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
                                      getClass(), etype, length(),
@@ -242,6 +282,9 @@ abstract class AbstractVector<E> extends Vector<E> {
     /*package-private*/
     abstract AbstractVector<E> maybeSwap(ByteOrder bo);
 
+    /*package-private*/
+    abstract AbstractVector<?> swapIfNeeded(AbstractSpecies<?> srcSpecies);
+
     /*package-private*/
     @ForceInline
     VectorShuffle<Byte> swapBytesShuffle() {
@@ -722,10 +765,10 @@ abstract class AbstractVector<E> extends Vector<E> {
     AbstractVector<F> convert0(char kind, AbstractSpecies<F> rsp) {
         // Derive some JIT-time constants:
         Class<?> vtype;
-        Class<?> etype;   // fill in after switch (constant)
+        int etype;        // fill in after switch (constant)
         int vlength;      // fill in after switch (mark type profile?)
         Class<?> rvtype;  // fill in after switch (mark type profile)
-        Class<?> rtype;
+        int rtype;
         int rlength;
         switch (kind) {
         case 'Z':  // lane-wise size change, maybe with sign clip
@@ -733,9 +776,9 @@ abstract class AbstractVector<E> extends Vector<E> {
             AbstractSpecies<?> vsp = this.vspecies();
             AbstractSpecies<?> vspi = vsp.asIntegral();
             AbstractVector<?> biti = vspi == vsp ? this : this.convert0('X', vspi);
-            rtype = rspi.elementType();
+            rtype = rspi.laneTypeOrdinal();
             rlength = rspi.laneCount();
-            etype = vspi.elementType();
+            etype = vspi.laneTypeOrdinal();
             vlength = vspi.laneCount();
             rvtype = rspi.dummyVector().getClass();
             vtype = vspi.dummyVector().getClass();
@@ -747,9 +790,9 @@ abstract class AbstractVector<E> extends Vector<E> {
                     AbstractVector::defaultUCast);
             return (rspi == rsp ? bitv.check0(rsp) : bitv.convert0('X', rsp));
         case 'C':  // lane-wise cast (but not identity)
-            rtype = rsp.elementType();
+            rtype = rsp.laneTypeOrdinal();
             rlength = rsp.laneCount();
-            etype = this.elementType(); // (profile)
+            etype = this.vspecies().laneTypeOrdinal(); // (profile)
             vlength = this.length();  // (profile)
             rvtype = rsp.dummyVector().getClass();  // (profile)
             vtype = this.getClass();
@@ -759,9 +802,9 @@ abstract class AbstractVector<E> extends Vector<E> {
                     this, rsp,
                     AbstractVector::defaultCast);
         case 'X':  // reinterpret cast, not lane-wise if lane sizes differ
-            rtype = rsp.elementType();
+            rtype = rsp.laneTypeOrdinal();
             rlength = rsp.laneCount();
-            etype = this.elementType(); // (profile)
+            etype = this.vspecies().laneTypeOrdinal(); // (profile)
             vlength = this.length();  // (profile)
             rvtype = rsp.dummyVector().getClass();  // (profile)
             vtype = this.getClass();
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
index 08406fef518..846032cb5c6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
     static final ValueLayout.OfByte ELEMENT_LAYOUT = ValueLayout.JAVA_BYTE.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = LT_BYTE;
+
+    static final int LANEBITS_TYPE_ORDINAL = LT_BYTE;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -80,8 +84,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -573,7 +577,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     @ForceInline
     public static ByteVector zero(VectorSpecies<Byte> species) {
         ByteSpecies vsp = (ByteSpecies) species;
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), byte.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                                 0, MODE_BROADCAST, vsp,
                                 ((bits_, s_) -> s_.rvOp(i -> bits_)));
     }
@@ -695,7 +699,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, byte.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, ByteVector::unaryOperations));
     }
@@ -723,7 +727,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, byte.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, ByteVector::unaryOperations));
     }
@@ -796,7 +800,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, byte.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, ByteVector::binaryOperations));
     }
@@ -847,7 +851,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, byte.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, ByteVector::binaryOperations));
     }
@@ -1034,7 +1038,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), null, byte.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, e, null,
             BIN_INT_IMPL.find(op, opc, ByteVector::broadcastIntOperations));
     }
@@ -1055,7 +1059,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), maskClass, byte.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, e, m,
             BIN_INT_IMPL.find(op, opc, ByteVector::broadcastIntOperations));
     }
@@ -1132,7 +1136,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, byte.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, ByteVector::ternaryOperations));
     }
@@ -1172,7 +1176,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, byte.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, ByteVector::ternaryOperations));
     }
@@ -2070,7 +2074,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, byte.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Byte> m
@@ -2092,7 +2096,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, byte.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Byte> cmpM
@@ -2223,7 +2227,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     blendTemplate(Class<M> maskType, ByteVector v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, byte.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2240,7 +2244,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), byte.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2432,7 +2436,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, byte.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2459,7 +2463,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, byte.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2485,7 +2489,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         VectorMask<Byte> valid = shuffle.laneIsValid();
         ByteVector r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, byte.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2493,7 +2497,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
                 }));
         ByteVector r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, byte.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2543,7 +2547,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (ByteVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        byte.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -2562,7 +2566,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (ByteVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        byte.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -2577,7 +2581,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     /*package-private*/
     @ForceInline
     final ByteVector selectFromTemplate(ByteVector v) {
-        return (ByteVector)VectorSupport.selectFromOp(getClass(), null, byte.class,
+        return (ByteVector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -2597,7 +2601,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector selectFromTemplate(ByteVector v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return (ByteVector)VectorSupport.selectFromOp(getClass(), masktype, byte.class,
+        return (ByteVector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -2615,7 +2619,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     /*package-private*/
     @ForceInline
     final ByteVector selectFromTemplate(ByteVector v1, ByteVector v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), byte.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -2835,7 +2839,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, byte.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, ByteVector::reductionOperations)));
     }
@@ -2853,7 +2857,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, byte.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, ByteVector::reductionOperations)));
     }
@@ -2873,9 +2877,9 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             case VECTOR_OP_MAX: return (v, m) ->
                     toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (byte) Math.max(a, b)));
             case VECTOR_OP_UMIN: return (v, m) ->
-                    toBits(v.rOp(MAX_OR_INF, m, (i, a, b) -> (byte) VectorMath.minUnsigned(a, b)));
+                    toBits(v.rOp(UMAX_VALUE, m, (i, a, b) -> (byte) VectorMath.minUnsigned(a, b)));
             case VECTOR_OP_UMAX: return (v, m) ->
-                    toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (byte) VectorMath.maxUnsigned(a, b)));
+                    toBits(v.rOp(UMIN_VALUE, m, (i, a, b) -> (byte) VectorMath.maxUnsigned(a, b)));
             case VECTOR_OP_SUADD: return (v, m) ->
                     toBits(v.rOp((byte)0, m, (i, a, b) -> (byte) VectorMath.addSaturatingUnsigned(a, b)));
             case VECTOR_OP_AND: return (v, m) ->
@@ -2890,6 +2894,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
     private static final byte MIN_OR_INF = Byte.MIN_VALUE;
     private static final byte MAX_OR_INF = Byte.MAX_VALUE;
+    private static final byte UMIN_VALUE = (byte)0;   // Minimum unsigned value
+    private static final byte UMAX_VALUE = (byte)-1;  // Maximum unsigned value
 
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op);
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op,
@@ -3143,7 +3149,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
 
         return VectorSupport.loadWithMap(
-            vectorType, null, byte.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, vix2, vix3, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3478,7 +3484,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         offset = checkFromIndexSize(offset, length(), a.length);
         ByteSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3632,7 +3638,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         ByteSpecies vsp = vspecies();
         ByteVector normalized = this.and((byte) 1);
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false,
             normalized,
             a, offset,
@@ -3845,7 +3851,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector fromArray0Template(byte[] a, int offset) {
         ByteSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3862,7 +3868,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         m.check(species());
         ByteSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3918,7 +3924,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         }
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, byte.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, vix2, vix3, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -3935,7 +3941,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector fromBooleanArray0Template(boolean[] a, int offset) {
         ByteSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3952,7 +3958,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         m.check(species());
         ByteSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3966,7 +3972,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     ByteVector fromMemorySegment0Template(MemorySegment ms, long offset) {
         ByteSpecies vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, ByteVector::memorySegmentGet);
@@ -3982,7 +3988,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         ByteSpecies vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, ByteVector::memorySegmentGet);
@@ -4000,7 +4006,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     void intoArray0Template(byte[] a, int offset) {
         ByteSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -4017,7 +4023,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         m.check(species());
         ByteSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -4036,7 +4042,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         ByteSpecies vsp = vspecies();
         ByteVector normalized = this.and((byte) 1);
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false,
             normalized, m, a, offset,
             (arr, off, v, vm)
@@ -4049,7 +4055,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         ByteSpecies vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -4066,7 +4072,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         ByteSpecies vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -4099,6 +4105,13 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    ByteVector swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+        return this;
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_BYTE_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -4279,7 +4292,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         final ByteVector broadcastBits(long bits) {
             return (ByteVector)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, byte.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -4461,13 +4474,13 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         @Override
         @ForceInline
         public final ByteVector zero() {
-            if ((Class<?>) vectorType() == ByteMaxVector.class)
-                return ByteMaxVector.ZERO;
+            if ((Class<?>) vectorType() == ByteVectorMax.class)
+                return ByteVectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return Byte64Vector.ZERO;
-                case 128: return Byte128Vector.ZERO;
-                case 256: return Byte256Vector.ZERO;
-                case 512: return Byte512Vector.ZERO;
+                case 64: return ByteVector64.ZERO;
+                case 128: return ByteVector128.ZERO;
+                case 256: return ByteVector256.ZERO;
+                case 512: return ByteVector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -4475,13 +4488,13 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         @Override
         @ForceInline
         public final ByteVector iota() {
-            if ((Class<?>) vectorType() == ByteMaxVector.class)
-                return ByteMaxVector.IOTA;
+            if ((Class<?>) vectorType() == ByteVectorMax.class)
+                return ByteVectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return Byte64Vector.IOTA;
-                case 128: return Byte128Vector.IOTA;
-                case 256: return Byte256Vector.IOTA;
-                case 512: return Byte512Vector.IOTA;
+                case 64: return ByteVector64.IOTA;
+                case 128: return ByteVector128.IOTA;
+                case 256: return ByteVector256.IOTA;
+                case 512: return ByteVector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -4490,13 +4503,13 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         @Override
         @ForceInline
         public final VectorMask<Byte> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == ByteMaxVector.class)
-                return ByteMaxVector.ByteMaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == ByteVectorMax.class)
+                return ByteVectorMax.ByteMaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return Byte64Vector.Byte64Mask.maskAll(bit);
-                case 128: return Byte128Vector.Byte128Mask.maskAll(bit);
-                case 256: return Byte256Vector.Byte256Mask.maskAll(bit);
-                case 512: return Byte512Vector.Byte512Mask.maskAll(bit);
+                case 64: return ByteVector64.ByteMask64.maskAll(bit);
+                case 128: return ByteVector128.ByteMask128.maskAll(bit);
+                case 256: return ByteVector256.ByteMask256.maskAll(bit);
+                case 512: return ByteVector512.ByteMask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -4524,42 +4537,42 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     /** Species representing {@link ByteVector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<Byte> SPECIES_64
         = new ByteSpecies(VectorShape.S_64_BIT,
-                            Byte64Vector.class,
-                            Byte64Vector.Byte64Mask.class,
-                            Byte64Vector.Byte64Shuffle.class,
-                            Byte64Vector::new);
+                            ByteVector64.class,
+                            ByteVector64.ByteMask64.class,
+                            ByteVector64.ByteShuffle64.class,
+                            ByteVector64::new);
 
     /** Species representing {@link ByteVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<Byte> SPECIES_128
         = new ByteSpecies(VectorShape.S_128_BIT,
-                            Byte128Vector.class,
-                            Byte128Vector.Byte128Mask.class,
-                            Byte128Vector.Byte128Shuffle.class,
-                            Byte128Vector::new);
+                            ByteVector128.class,
+                            ByteVector128.ByteMask128.class,
+                            ByteVector128.ByteShuffle128.class,
+                            ByteVector128::new);
 
     /** Species representing {@link ByteVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<Byte> SPECIES_256
         = new ByteSpecies(VectorShape.S_256_BIT,
-                            Byte256Vector.class,
-                            Byte256Vector.Byte256Mask.class,
-                            Byte256Vector.Byte256Shuffle.class,
-                            Byte256Vector::new);
+                            ByteVector256.class,
+                            ByteVector256.ByteMask256.class,
+                            ByteVector256.ByteShuffle256.class,
+                            ByteVector256::new);
 
     /** Species representing {@link ByteVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<Byte> SPECIES_512
         = new ByteSpecies(VectorShape.S_512_BIT,
-                            Byte512Vector.class,
-                            Byte512Vector.Byte512Mask.class,
-                            Byte512Vector.Byte512Shuffle.class,
-                            Byte512Vector::new);
+                            ByteVector512.class,
+                            ByteVector512.ByteMask512.class,
+                            ByteVector512.ByteShuffle512.class,
+                            ByteVector512::new);
 
     /** Species representing {@link ByteVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<Byte> SPECIES_MAX
         = new ByteSpecies(VectorShape.S_Max_BIT,
-                            ByteMaxVector.class,
-                            ByteMaxVector.ByteMaxMask.class,
-                            ByteMaxVector.ByteMaxShuffle.class,
-                            ByteMaxVector::new);
+                            ByteVectorMax.class,
+                            ByteVectorMax.ByteMaskMax.class,
+                            ByteVectorMax.ByteShuffleMax.class,
+                            ByteVectorMax::new);
 
     /**
      * Preferred species for {@link ByteVector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector128.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector128.java
index 3569ed00f1f..c38e8d0f8a0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector128.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Byte128Vector extends ByteVector {
+final class ByteVector128 extends ByteVector {
     static final ByteSpecies VSPECIES =
         (ByteSpecies) ByteVector.SPECIES_128;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Byte128Vector> VCLASS = Byte128Vector.class;
+    static final Class<ByteVector128> VCLASS = ByteVector128.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Byte> CTYPE = byte.class; // carrier type used by the JVM
+
     static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-    Byte128Vector(byte[] v) {
+    ByteVector128(byte[] v) {
         super(v);
     }
 
-    // For compatibility as Byte128Vector::new,
+    // For compatibility as ByteVector128::new,
     // stored into species.vectorFactory.
-    Byte128Vector(Object v) {
+    ByteVector128(Object v) {
         this((byte[]) v);
     }
 
-    static final Byte128Vector ZERO = new Byte128Vector(new byte[VLENGTH]);
-    static final Byte128Vector IOTA = new Byte128Vector(VSPECIES.iotaArray());
+    static final ByteVector128 ZERO = new ByteVector128(new byte[VLENGTH]);
+    static final ByteVector128 IOTA = new ByteVector128(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Byte128Vector extends ByteVector {
     @Override
     public final Class<Byte> elementType() { return byte.class; }
 
+    @ForceInline
+    final Class<Byte> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Byte.SIZE; }
@@ -119,55 +124,62 @@ final class Byte128Vector extends ByteVector {
         return (byte[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Byte128Vector broadcast(byte e) {
-        return (Byte128Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector128 broadcast(byte e) {
+        return (ByteVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte128Vector broadcast(long e) {
-        return (Byte128Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector128 broadcast(long e) {
+        return (ByteVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Byte128Mask maskFromArray(boolean[] bits) {
-        return new Byte128Mask(bits);
+    ByteMask128 maskFromArray(boolean[] bits) {
+        return new ByteMask128(bits);
     }
 
     @Override
     @ForceInline
-    Byte128Shuffle iotaShuffle() { return Byte128Shuffle.IOTA; }
+    ByteShuffle128 iotaShuffle() { return ByteShuffle128.IOTA; }
 
     @Override
     @ForceInline
-    Byte128Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Byte128Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
+    ByteShuffle128 iotaShuffle(int start, int step, boolean wrap) {
+        return (ByteShuffle128) iotaShuffleTemplate((byte) start, (byte) step, wrap);
     }
 
     @Override
     @ForceInline
-    Byte128Shuffle shuffleFromArray(int[] indices, int i) { return new Byte128Shuffle(indices, i); }
+    ByteShuffle128 shuffleFromArray(int[] indices, int i) { return new ByteShuffle128(indices, i); }
 
     @Override
     @ForceInline
-    Byte128Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Byte128Shuffle(fn); }
+    ByteShuffle128 shuffleFromOp(IntUnaryOperator fn) { return new ByteShuffle128(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Byte128Vector vectorFactory(byte[] vec) {
-        return new Byte128Vector(vec);
+    ByteVector128 vectorFactory(byte[] vec) {
+        return new ByteVector128(vec);
     }
 
     @ForceInline
     final @Override
-    Byte128Vector asByteVectorRaw() {
-        return (Byte128Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector128 asByteVectorRaw() {
+        return (ByteVector128) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Byte128Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte128Vector uOp(FUnOp f) {
-        return (Byte128Vector) super.uOpTemplate(f);  // specialize
+    ByteVector128 uOp(FUnOp f) {
+        return (ByteVector128) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte128Vector uOp(VectorMask<Byte> m, FUnOp f) {
-        return (Byte128Vector)
-            super.uOpTemplate((Byte128Mask)m, f);  // specialize
+    ByteVector128 uOp(VectorMask<Byte> m, FUnOp f) {
+        return (ByteVector128)
+            super.uOpTemplate((ByteMask128)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Byte128Vector bOp(Vector<Byte> v, FBinOp f) {
-        return (Byte128Vector) super.bOpTemplate((Byte128Vector)v, f);  // specialize
+    ByteVector128 bOp(Vector<Byte> v, FBinOp f) {
+        return (ByteVector128) super.bOpTemplate((ByteVector128)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte128Vector bOp(Vector<Byte> v,
+    ByteVector128 bOp(Vector<Byte> v,
                      VectorMask<Byte> m, FBinOp f) {
-        return (Byte128Vector)
-            super.bOpTemplate((Byte128Vector)v, (Byte128Mask)m,
+        return (ByteVector128)
+            super.bOpTemplate((ByteVector128)v, (ByteMask128)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Byte128Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte128Vector tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
-        return (Byte128Vector)
-            super.tOpTemplate((Byte128Vector)v1, (Byte128Vector)v2,
+    ByteVector128 tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
+        return (ByteVector128)
+            super.tOpTemplate((ByteVector128)v1, (ByteVector128)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte128Vector tOp(Vector<Byte> v1, Vector<Byte> v2,
+    ByteVector128 tOp(Vector<Byte> v1, Vector<Byte> v2,
                      VectorMask<Byte> m, FTriOp f) {
-        return (Byte128Vector)
-            super.tOpTemplate((Byte128Vector)v1, (Byte128Vector)v2,
-                              (Byte128Mask)m, f);  // specialize
+        return (ByteVector128)
+            super.tOpTemplate((ByteVector128)v1, (ByteVector128)v2,
+                              (ByteMask128)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Byte128Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public Byte128Vector lanewise(Unary op) {
-        return (Byte128Vector) super.lanewiseTemplate(op);  // specialize
+    public ByteVector128 lanewise(Unary op) {
+        return (ByteVector128) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector lanewise(Unary op, VectorMask<Byte> m) {
-        return (Byte128Vector) super.lanewiseTemplate(op, Byte128Mask.class, (Byte128Mask) m);  // specialize
+    public ByteVector128 lanewise(Unary op, VectorMask<Byte> m) {
+        return (ByteVector128) super.lanewiseTemplate(op, ByteMask128.class, (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector lanewise(Binary op, Vector<Byte> v) {
-        return (Byte128Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ByteVector128 lanewise(Binary op, Vector<Byte> v) {
+        return (ByteVector128) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte128Vector) super.lanewiseTemplate(op, Byte128Mask.class, v, (Byte128Mask) m);  // specialize
+    public ByteVector128 lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector128) super.lanewiseTemplate(op, ByteMask128.class, v, (ByteMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte128Vector
+    @ForceInline ByteVector128
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Byte128Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ByteVector128) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte128Vector
+    @ForceInline ByteVector128
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Byte> m) {
-        return (Byte128Vector) super.lanewiseShiftTemplate(op, Byte128Mask.class, e, (Byte128Mask) m);  // specialize
+        return (ByteVector128) super.lanewiseShiftTemplate(op, ByteMask128.class, e, (ByteMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Byte128Vector
+    ByteVector128
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2) {
-        return (Byte128Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ByteVector128) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte128Vector
+    ByteVector128
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2, VectorMask<Byte> m) {
-        return (Byte128Vector) super.lanewiseTemplate(op, Byte128Mask.class, v1, v2, (Byte128Mask) m);  // specialize
+        return (ByteVector128) super.lanewiseTemplate(op, ByteMask128.class, v1, v2, (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte128Vector addIndex(int scale) {
-        return (Byte128Vector) super.addIndexTemplate(scale);  // specialize
+    ByteVector128 addIndex(int scale) {
+        return (ByteVector128) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Byte128Vector extends ByteVector {
     @ForceInline
     public final byte reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Byte> m) {
-        return super.reduceLanesTemplate(op, Byte128Mask.class, (Byte128Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ByteMask128.class, (ByteMask128) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Byte128Vector extends ByteVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Byte> m) {
-        return (long) super.reduceLanesTemplate(op, Byte128Mask.class, (Byte128Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ByteMask128.class, (ByteMask128) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Byte128Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public final Byte128Shuffle toShuffle() {
-        return (Byte128Shuffle) toShuffle(vspecies(), false);
+    public final ByteShuffle128 toShuffle() {
+        return (ByteShuffle128) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Byte128Mask test(Test op) {
-        return super.testTemplate(Byte128Mask.class, op);  // specialize
+    public final ByteMask128 test(Test op) {
+        return super.testTemplate(ByteMask128.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte128Mask test(Test op, VectorMask<Byte> m) {
-        return super.testTemplate(Byte128Mask.class, op, (Byte128Mask) m);  // specialize
+    public final ByteMask128 test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(ByteMask128.class, op, (ByteMask128) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Byte128Mask compare(Comparison op, Vector<Byte> v) {
-        return super.compareTemplate(Byte128Mask.class, op, v);  // specialize
+    public final ByteMask128 compare(Comparison op, Vector<Byte> v) {
+        return super.compareTemplate(ByteMask128.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte128Mask compare(Comparison op, byte s) {
-        return super.compareTemplate(Byte128Mask.class, op, s);  // specialize
+    public final ByteMask128 compare(Comparison op, byte s) {
+        return super.compareTemplate(ByteMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte128Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Byte128Mask.class, op, s);  // specialize
+    public final ByteMask128 compare(Comparison op, long s) {
+        return super.compareTemplate(ByteMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte128Mask compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
-        return super.compareTemplate(Byte128Mask.class, op, v, (Byte128Mask) m);
+    public final ByteMask128 compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
+        return super.compareTemplate(ByteMask128.class, op, v, (ByteMask128) m);
     }
 
 
     @Override
     @ForceInline
-    public Byte128Vector blend(Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte128Vector)
-            super.blendTemplate(Byte128Mask.class,
-                                (Byte128Vector) v,
-                                (Byte128Mask) m);  // specialize
+    public ByteVector128 blend(Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector128)
+            super.blendTemplate(ByteMask128.class,
+                                (ByteVector128) v,
+                                (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector slice(int origin, Vector<Byte> v) {
-        return (Byte128Vector) super.sliceTemplate(origin, v);  // specialize
+    public ByteVector128 slice(int origin, Vector<Byte> v) {
+        return (ByteVector128) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector slice(int origin) {
-        return (Byte128Vector) super.sliceTemplate(origin);  // specialize
+    public ByteVector128 slice(int origin) {
+        return (ByteVector128) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector unslice(int origin, Vector<Byte> w, int part) {
-        return (Byte128Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ByteVector128 unslice(int origin, Vector<Byte> w, int part) {
+        return (ByteVector128) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
-        return (Byte128Vector)
-            super.unsliceTemplate(Byte128Mask.class,
+    public ByteVector128 unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
+        return (ByteVector128)
+            super.unsliceTemplate(ByteMask128.class,
                                   origin, w, part,
-                                  (Byte128Mask) m);  // specialize
+                                  (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector unslice(int origin) {
-        return (Byte128Vector) super.unsliceTemplate(origin);  // specialize
+    public ByteVector128 unslice(int origin) {
+        return (ByteVector128) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector rearrange(VectorShuffle<Byte> s) {
-        return (Byte128Vector)
-            super.rearrangeTemplate(Byte128Shuffle.class,
-                                    (Byte128Shuffle) s);  // specialize
+    public ByteVector128 rearrange(VectorShuffle<Byte> s) {
+        return (ByteVector128)
+            super.rearrangeTemplate(ByteShuffle128.class,
+                                    (ByteShuffle128) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector rearrange(VectorShuffle<Byte> shuffle,
+    public ByteVector128 rearrange(VectorShuffle<Byte> shuffle,
                                   VectorMask<Byte> m) {
-        return (Byte128Vector)
-            super.rearrangeTemplate(Byte128Shuffle.class,
-                                    Byte128Mask.class,
-                                    (Byte128Shuffle) shuffle,
-                                    (Byte128Mask) m);  // specialize
+        return (ByteVector128)
+            super.rearrangeTemplate(ByteShuffle128.class,
+                                    ByteMask128.class,
+                                    (ByteShuffle128) shuffle,
+                                    (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector rearrange(VectorShuffle<Byte> s,
+    public ByteVector128 rearrange(VectorShuffle<Byte> s,
                                   Vector<Byte> v) {
-        return (Byte128Vector)
-            super.rearrangeTemplate(Byte128Shuffle.class,
-                                    (Byte128Shuffle) s,
-                                    (Byte128Vector) v);  // specialize
+        return (ByteVector128)
+            super.rearrangeTemplate(ByteShuffle128.class,
+                                    (ByteShuffle128) s,
+                                    (ByteVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector compress(VectorMask<Byte> m) {
-        return (Byte128Vector)
-            super.compressTemplate(Byte128Mask.class,
-                                   (Byte128Mask) m);  // specialize
+    public ByteVector128 compress(VectorMask<Byte> m) {
+        return (ByteVector128)
+            super.compressTemplate(ByteMask128.class,
+                                   (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector expand(VectorMask<Byte> m) {
-        return (Byte128Vector)
-            super.expandTemplate(Byte128Mask.class,
-                                   (Byte128Mask) m);  // specialize
+    public ByteVector128 expand(VectorMask<Byte> m) {
+        return (ByteVector128)
+            super.expandTemplate(ByteMask128.class,
+                                   (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector selectFrom(Vector<Byte> v) {
-        return (Byte128Vector)
-            super.selectFromTemplate((Byte128Vector) v);  // specialize
+    public ByteVector128 selectFrom(Vector<Byte> v) {
+        return (ByteVector128)
+            super.selectFromTemplate((ByteVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector selectFrom(Vector<Byte> v,
+    public ByteVector128 selectFrom(Vector<Byte> v,
                                    VectorMask<Byte> m) {
-        return (Byte128Vector)
-            super.selectFromTemplate((Byte128Vector) v,
-                                     Byte128Mask.class, (Byte128Mask) m);  // specialize
+        return (ByteVector128)
+            super.selectFromTemplate((ByteVector128) v,
+                                     ByteMask128.class, (ByteMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte128Vector selectFrom(Vector<Byte> v1,
+    public ByteVector128 selectFrom(Vector<Byte> v1,
                                    Vector<Byte> v2) {
-        return (Byte128Vector)
-            super.selectFromTemplate((Byte128Vector) v1, (Byte128Vector) v2);  // specialize
+        return (ByteVector128)
+            super.selectFromTemplate((ByteVector128) v1, (ByteVector128) v2);  // specialize
     }
 
     @ForceInline
@@ -541,7 +553,7 @@ final class Byte128Vector extends ByteVector {
     @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     byte[] vecarr = vec.vec();
@@ -551,7 +563,7 @@ final class Byte128Vector extends ByteVector {
 
     @ForceInline
     @Override
-    public Byte128Vector withLane(int i, byte e) {
+    public ByteVector128 withLane(int i, byte e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -574,9 +586,9 @@ final class Byte128Vector extends ByteVector {
     }
 
     @ForceInline
-    public Byte128Vector withLaneHelper(int i, byte e) {
+    public ByteVector128 withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     byte[] res = v.vec().clone();
@@ -587,19 +599,20 @@ final class Byte128Vector extends ByteVector {
 
     // Mask
 
-    static final class Byte128Mask extends AbstractMask<Byte> {
+    static final class ByteMask128 extends AbstractMask<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte128Mask(boolean[] bits) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteMask128(boolean[] bits) {
             this(bits, 0);
         }
 
-        Byte128Mask(boolean[] bits, int offset) {
+        ByteMask128(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Byte128Mask(boolean val) {
+        ByteMask128(boolean val) {
             super(prepare(val));
         }
 
@@ -632,31 +645,31 @@ final class Byte128Vector extends ByteVector {
         }
 
         @Override
-        Byte128Mask uOp(MUnOp f) {
+        ByteMask128 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Byte128Mask(res);
+            return new ByteMask128(res);
         }
 
         @Override
-        Byte128Mask bOp(VectorMask<Byte> m, MBinOp f) {
+        ByteMask128 bOp(VectorMask<Byte> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Byte128Mask)m).getBits();
+            boolean[] mbits = ((ByteMask128)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Byte128Mask(res);
+            return new ByteMask128(res);
         }
 
         @ForceInline
         @Override
         public final
-        Byte128Vector toVector() {
-            return (Byte128Vector) super.toVectorTemplate();  // specialize
+        ByteVector128 toVector() {
+            return (ByteVector128) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -680,8 +693,8 @@ final class Byte128Vector extends ByteVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -689,25 +702,25 @@ final class Byte128Vector extends ByteVector {
         @Override
         @ForceInline
         /*package-private*/
-        Byte128Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Byte128Mask) VectorSupport.indexPartiallyInUpperRange(
-                Byte128Mask.class, byte.class, VLENGTH, offset, limit,
-                (o, l) -> (Byte128Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ByteMask128 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ByteMask128) VectorSupport.indexPartiallyInUpperRange(
+                ByteMask128.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ByteMask128) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Byte128Mask not() {
+        public ByteMask128 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Byte128Mask compress() {
-            return (Byte128Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Byte128Vector.class, Byte128Mask.class, ETYPE, VLENGTH, null, this,
+        public ByteMask128 compress() {
+            return (ByteMask128)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ByteVector128.class, ByteMask128.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -716,30 +729,30 @@ final class Byte128Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public Byte128Mask and(VectorMask<Byte> mask) {
+        public ByteMask128 and(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte128Mask m = (Byte128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Byte128Mask.class, null, byte.class, VLENGTH,
+            ByteMask128 m = (ByteMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ByteMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Byte128Mask or(VectorMask<Byte> mask) {
+        public ByteMask128 or(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte128Mask m = (Byte128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Byte128Mask.class, null, byte.class, VLENGTH,
+            ByteMask128 m = (ByteMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ByteMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Byte128Mask xor(VectorMask<Byte> mask) {
+        public ByteMask128 xor(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte128Mask m = (Byte128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Byte128Mask.class, null, byte.class, VLENGTH,
+            ByteMask128 m = (ByteMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ByteMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -749,21 +762,21 @@ final class Byte128Vector extends ByteVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Byte128Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Byte128Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Byte128Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -773,7 +786,7 @@ final class Byte128Vector extends ByteVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Byte128Mask.class, byte.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -783,7 +796,7 @@ final class Byte128Vector extends ByteVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Byte128Mask.class, byte.class, VLENGTH,
+            return VectorSupport.extract(ByteMask128.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -792,48 +805,49 @@ final class Byte128Vector extends ByteVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Byte128Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Byte128Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ByteMask128)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Byte128Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Byte128Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ByteMask128)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Byte128Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Byte128Mask.class, byte.class, VLENGTH,
+        static ByteMask128 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ByteMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Byte128Mask  TRUE_MASK = new Byte128Mask(true);
-        private static final Byte128Mask FALSE_MASK = new Byte128Mask(false);
+        private static final ByteMask128  TRUE_MASK = new ByteMask128(true);
+        private static final ByteMask128 FALSE_MASK = new ByteMask128(false);
 
     }
 
     // Shuffle
 
-    static final class Byte128Shuffle extends AbstractShuffle<Byte> {
+    static final class ByteShuffle128 extends AbstractShuffle<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte128Shuffle(byte[] indices) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteShuffle128(byte[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Byte128Shuffle(int[] indices, int i) {
+        ByteShuffle128(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Byte128Shuffle(IntUnaryOperator fn) {
+        ByteShuffle128(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -853,23 +867,23 @@ final class Byte128Vector extends ByteVector {
             assert(VLENGTH < Byte.MAX_VALUE);
             assert(Byte.MIN_VALUE <= -VLENGTH);
         }
-        static final Byte128Shuffle IOTA = new Byte128Shuffle(IDENTITY);
+        static final ByteShuffle128 IOTA = new ByteShuffle128(IDENTITY);
 
         @Override
         @ForceInline
-        public Byte128Vector toVector() {
+        public ByteVector128 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Byte128Vector toBitsVector() {
-            return (Byte128Vector) super.toBitsVectorTemplate();
+        ByteVector128 toBitsVector() {
+            return (ByteVector128) super.toBitsVectorTemplate();
         }
 
         @Override
-        Byte128Vector toBitsVector0() {
-            return ((Byte128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ByteVector128 toBitsVector0() {
+            return ((ByteVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -918,30 +932,30 @@ final class Byte128Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public final Byte128Mask laneIsValid() {
-            return (Byte128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ByteMask128 laneIsValid() {
+            return (ByteMask128) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Byte128Shuffle rearrange(VectorShuffle<Byte> shuffle) {
-            Byte128Shuffle concreteShuffle = (Byte128Shuffle) shuffle;
-            return (Byte128Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ByteShuffle128 rearrange(VectorShuffle<Byte> shuffle) {
+            ByteShuffle128 concreteShuffle = (ByteShuffle128) shuffle;
+            return (ByteShuffle128) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Byte128Shuffle wrapIndexes() {
-            Byte128Vector v = toBitsVector();
+        public final ByteShuffle128 wrapIndexes() {
+            ByteVector128 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Byte128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ByteVector128) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Byte128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ByteVector128) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Byte128Shuffle) v.toShuffle(vspecies(), false);
+            return (ByteShuffle128) v.toShuffle(vspecies(), false);
         }
 
         private static byte[] prepare(int[] indices, int offset) {
@@ -992,14 +1006,14 @@ final class Byte128Vector extends ByteVector {
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromArray0Template(Byte128Mask.class, a, offset, (Byte128Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ByteMask128.class, a, offset, (ByteMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
-        return super.fromArray0Template(Byte128Mask.class, a, offset, indexMap, mapOffset, (Byte128Mask) m);
+        return super.fromArray0Template(ByteMask128.class, a, offset, indexMap, mapOffset, (ByteMask128) m);
     }
 
 
@@ -1014,7 +1028,7 @@ final class Byte128Vector extends ByteVector {
     @Override
     final
     ByteVector fromBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromBooleanArray0Template(Byte128Mask.class, a, offset, (Byte128Mask) m, offsetInRange);  // specialize
+        return super.fromBooleanArray0Template(ByteMask128.class, a, offset, (ByteMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1028,7 +1042,7 @@ final class Byte128Vector extends ByteVector {
     @Override
     final
     ByteVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Byte128Mask.class, ms, offset, (Byte128Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ByteMask128.class, ms, offset, (ByteMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1042,7 +1056,7 @@ final class Byte128Vector extends ByteVector {
     @Override
     final
     void intoArray0(byte[] a, int offset, VectorMask<Byte> m) {
-        super.intoArray0Template(Byte128Mask.class, a, offset, (Byte128Mask) m);
+        super.intoArray0Template(ByteMask128.class, a, offset, (ByteMask128) m);
     }
 
 
@@ -1050,14 +1064,14 @@ final class Byte128Vector extends ByteVector {
     @Override
     final
     void intoBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m) {
-        super.intoBooleanArray0Template(Byte128Mask.class, a, offset, (Byte128Mask) m);
+        super.intoBooleanArray0Template(ByteMask128.class, a, offset, (ByteMask128) m);
     }
 
     @ForceInline
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m) {
-        super.intoMemorySegment0Template(Byte128Mask.class, ms, offset, (Byte128Mask) m);
+        super.intoMemorySegment0Template(ByteMask128.class, ms, offset, (ByteMask128) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector256.java
similarity index 67%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector256.java
index 70a3306731e..0eec0c56e37 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Byte256Vector extends ByteVector {
+final class ByteVector256 extends ByteVector {
     static final ByteSpecies VSPECIES =
         (ByteSpecies) ByteVector.SPECIES_256;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Byte256Vector> VCLASS = Byte256Vector.class;
+    static final Class<ByteVector256> VCLASS = ByteVector256.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Byte> CTYPE = byte.class; // carrier type used by the JVM
+
     static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-    Byte256Vector(byte[] v) {
+    ByteVector256(byte[] v) {
         super(v);
     }
 
-    // For compatibility as Byte256Vector::new,
+    // For compatibility as ByteVector256::new,
     // stored into species.vectorFactory.
-    Byte256Vector(Object v) {
+    ByteVector256(Object v) {
         this((byte[]) v);
     }
 
-    static final Byte256Vector ZERO = new Byte256Vector(new byte[VLENGTH]);
-    static final Byte256Vector IOTA = new Byte256Vector(VSPECIES.iotaArray());
+    static final ByteVector256 ZERO = new ByteVector256(new byte[VLENGTH]);
+    static final ByteVector256 IOTA = new ByteVector256(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Byte256Vector extends ByteVector {
     @Override
     public final Class<Byte> elementType() { return byte.class; }
 
+    @ForceInline
+    final Class<Byte> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Byte.SIZE; }
@@ -119,55 +124,62 @@ final class Byte256Vector extends ByteVector {
         return (byte[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Byte256Vector broadcast(byte e) {
-        return (Byte256Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector256 broadcast(byte e) {
+        return (ByteVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte256Vector broadcast(long e) {
-        return (Byte256Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector256 broadcast(long e) {
+        return (ByteVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Byte256Mask maskFromArray(boolean[] bits) {
-        return new Byte256Mask(bits);
+    ByteMask256 maskFromArray(boolean[] bits) {
+        return new ByteMask256(bits);
     }
 
     @Override
     @ForceInline
-    Byte256Shuffle iotaShuffle() { return Byte256Shuffle.IOTA; }
+    ByteShuffle256 iotaShuffle() { return ByteShuffle256.IOTA; }
 
     @Override
     @ForceInline
-    Byte256Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Byte256Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
+    ByteShuffle256 iotaShuffle(int start, int step, boolean wrap) {
+        return (ByteShuffle256) iotaShuffleTemplate((byte) start, (byte) step, wrap);
     }
 
     @Override
     @ForceInline
-    Byte256Shuffle shuffleFromArray(int[] indices, int i) { return new Byte256Shuffle(indices, i); }
+    ByteShuffle256 shuffleFromArray(int[] indices, int i) { return new ByteShuffle256(indices, i); }
 
     @Override
     @ForceInline
-    Byte256Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Byte256Shuffle(fn); }
+    ByteShuffle256 shuffleFromOp(IntUnaryOperator fn) { return new ByteShuffle256(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Byte256Vector vectorFactory(byte[] vec) {
-        return new Byte256Vector(vec);
+    ByteVector256 vectorFactory(byte[] vec) {
+        return new ByteVector256(vec);
     }
 
     @ForceInline
     final @Override
-    Byte256Vector asByteVectorRaw() {
-        return (Byte256Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector256 asByteVectorRaw() {
+        return (ByteVector256) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Byte256Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte256Vector uOp(FUnOp f) {
-        return (Byte256Vector) super.uOpTemplate(f);  // specialize
+    ByteVector256 uOp(FUnOp f) {
+        return (ByteVector256) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte256Vector uOp(VectorMask<Byte> m, FUnOp f) {
-        return (Byte256Vector)
-            super.uOpTemplate((Byte256Mask)m, f);  // specialize
+    ByteVector256 uOp(VectorMask<Byte> m, FUnOp f) {
+        return (ByteVector256)
+            super.uOpTemplate((ByteMask256)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Byte256Vector bOp(Vector<Byte> v, FBinOp f) {
-        return (Byte256Vector) super.bOpTemplate((Byte256Vector)v, f);  // specialize
+    ByteVector256 bOp(Vector<Byte> v, FBinOp f) {
+        return (ByteVector256) super.bOpTemplate((ByteVector256)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte256Vector bOp(Vector<Byte> v,
+    ByteVector256 bOp(Vector<Byte> v,
                      VectorMask<Byte> m, FBinOp f) {
-        return (Byte256Vector)
-            super.bOpTemplate((Byte256Vector)v, (Byte256Mask)m,
+        return (ByteVector256)
+            super.bOpTemplate((ByteVector256)v, (ByteMask256)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Byte256Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte256Vector tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
-        return (Byte256Vector)
-            super.tOpTemplate((Byte256Vector)v1, (Byte256Vector)v2,
+    ByteVector256 tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
+        return (ByteVector256)
+            super.tOpTemplate((ByteVector256)v1, (ByteVector256)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte256Vector tOp(Vector<Byte> v1, Vector<Byte> v2,
+    ByteVector256 tOp(Vector<Byte> v1, Vector<Byte> v2,
                      VectorMask<Byte> m, FTriOp f) {
-        return (Byte256Vector)
-            super.tOpTemplate((Byte256Vector)v1, (Byte256Vector)v2,
-                              (Byte256Mask)m, f);  // specialize
+        return (ByteVector256)
+            super.tOpTemplate((ByteVector256)v1, (ByteVector256)v2,
+                              (ByteMask256)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Byte256Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public Byte256Vector lanewise(Unary op) {
-        return (Byte256Vector) super.lanewiseTemplate(op);  // specialize
+    public ByteVector256 lanewise(Unary op) {
+        return (ByteVector256) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector lanewise(Unary op, VectorMask<Byte> m) {
-        return (Byte256Vector) super.lanewiseTemplate(op, Byte256Mask.class, (Byte256Mask) m);  // specialize
+    public ByteVector256 lanewise(Unary op, VectorMask<Byte> m) {
+        return (ByteVector256) super.lanewiseTemplate(op, ByteMask256.class, (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector lanewise(Binary op, Vector<Byte> v) {
-        return (Byte256Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ByteVector256 lanewise(Binary op, Vector<Byte> v) {
+        return (ByteVector256) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte256Vector) super.lanewiseTemplate(op, Byte256Mask.class, v, (Byte256Mask) m);  // specialize
+    public ByteVector256 lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector256) super.lanewiseTemplate(op, ByteMask256.class, v, (ByteMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte256Vector
+    @ForceInline ByteVector256
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Byte256Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ByteVector256) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte256Vector
+    @ForceInline ByteVector256
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Byte> m) {
-        return (Byte256Vector) super.lanewiseShiftTemplate(op, Byte256Mask.class, e, (Byte256Mask) m);  // specialize
+        return (ByteVector256) super.lanewiseShiftTemplate(op, ByteMask256.class, e, (ByteMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Byte256Vector
+    ByteVector256
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2) {
-        return (Byte256Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ByteVector256) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte256Vector
+    ByteVector256
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2, VectorMask<Byte> m) {
-        return (Byte256Vector) super.lanewiseTemplate(op, Byte256Mask.class, v1, v2, (Byte256Mask) m);  // specialize
+        return (ByteVector256) super.lanewiseTemplate(op, ByteMask256.class, v1, v2, (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte256Vector addIndex(int scale) {
-        return (Byte256Vector) super.addIndexTemplate(scale);  // specialize
+    ByteVector256 addIndex(int scale) {
+        return (ByteVector256) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Byte256Vector extends ByteVector {
     @ForceInline
     public final byte reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Byte> m) {
-        return super.reduceLanesTemplate(op, Byte256Mask.class, (Byte256Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ByteMask256.class, (ByteMask256) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Byte256Vector extends ByteVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Byte> m) {
-        return (long) super.reduceLanesTemplate(op, Byte256Mask.class, (Byte256Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ByteMask256.class, (ByteMask256) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Byte256Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public final Byte256Shuffle toShuffle() {
-        return (Byte256Shuffle) toShuffle(vspecies(), false);
+    public final ByteShuffle256 toShuffle() {
+        return (ByteShuffle256) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Byte256Mask test(Test op) {
-        return super.testTemplate(Byte256Mask.class, op);  // specialize
+    public final ByteMask256 test(Test op) {
+        return super.testTemplate(ByteMask256.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte256Mask test(Test op, VectorMask<Byte> m) {
-        return super.testTemplate(Byte256Mask.class, op, (Byte256Mask) m);  // specialize
+    public final ByteMask256 test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(ByteMask256.class, op, (ByteMask256) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Byte256Mask compare(Comparison op, Vector<Byte> v) {
-        return super.compareTemplate(Byte256Mask.class, op, v);  // specialize
+    public final ByteMask256 compare(Comparison op, Vector<Byte> v) {
+        return super.compareTemplate(ByteMask256.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte256Mask compare(Comparison op, byte s) {
-        return super.compareTemplate(Byte256Mask.class, op, s);  // specialize
+    public final ByteMask256 compare(Comparison op, byte s) {
+        return super.compareTemplate(ByteMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte256Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Byte256Mask.class, op, s);  // specialize
+    public final ByteMask256 compare(Comparison op, long s) {
+        return super.compareTemplate(ByteMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte256Mask compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
-        return super.compareTemplate(Byte256Mask.class, op, v, (Byte256Mask) m);
+    public final ByteMask256 compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
+        return super.compareTemplate(ByteMask256.class, op, v, (ByteMask256) m);
     }
 
 
     @Override
     @ForceInline
-    public Byte256Vector blend(Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte256Vector)
-            super.blendTemplate(Byte256Mask.class,
-                                (Byte256Vector) v,
-                                (Byte256Mask) m);  // specialize
+    public ByteVector256 blend(Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector256)
+            super.blendTemplate(ByteMask256.class,
+                                (ByteVector256) v,
+                                (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector slice(int origin, Vector<Byte> v) {
-        return (Byte256Vector) super.sliceTemplate(origin, v);  // specialize
+    public ByteVector256 slice(int origin, Vector<Byte> v) {
+        return (ByteVector256) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector slice(int origin) {
-        return (Byte256Vector) super.sliceTemplate(origin);  // specialize
+    public ByteVector256 slice(int origin) {
+        return (ByteVector256) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector unslice(int origin, Vector<Byte> w, int part) {
-        return (Byte256Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ByteVector256 unslice(int origin, Vector<Byte> w, int part) {
+        return (ByteVector256) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
-        return (Byte256Vector)
-            super.unsliceTemplate(Byte256Mask.class,
+    public ByteVector256 unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
+        return (ByteVector256)
+            super.unsliceTemplate(ByteMask256.class,
                                   origin, w, part,
-                                  (Byte256Mask) m);  // specialize
+                                  (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector unslice(int origin) {
-        return (Byte256Vector) super.unsliceTemplate(origin);  // specialize
+    public ByteVector256 unslice(int origin) {
+        return (ByteVector256) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector rearrange(VectorShuffle<Byte> s) {
-        return (Byte256Vector)
-            super.rearrangeTemplate(Byte256Shuffle.class,
-                                    (Byte256Shuffle) s);  // specialize
+    public ByteVector256 rearrange(VectorShuffle<Byte> s) {
+        return (ByteVector256)
+            super.rearrangeTemplate(ByteShuffle256.class,
+                                    (ByteShuffle256) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector rearrange(VectorShuffle<Byte> shuffle,
+    public ByteVector256 rearrange(VectorShuffle<Byte> shuffle,
                                   VectorMask<Byte> m) {
-        return (Byte256Vector)
-            super.rearrangeTemplate(Byte256Shuffle.class,
-                                    Byte256Mask.class,
-                                    (Byte256Shuffle) shuffle,
-                                    (Byte256Mask) m);  // specialize
+        return (ByteVector256)
+            super.rearrangeTemplate(ByteShuffle256.class,
+                                    ByteMask256.class,
+                                    (ByteShuffle256) shuffle,
+                                    (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector rearrange(VectorShuffle<Byte> s,
+    public ByteVector256 rearrange(VectorShuffle<Byte> s,
                                   Vector<Byte> v) {
-        return (Byte256Vector)
-            super.rearrangeTemplate(Byte256Shuffle.class,
-                                    (Byte256Shuffle) s,
-                                    (Byte256Vector) v);  // specialize
+        return (ByteVector256)
+            super.rearrangeTemplate(ByteShuffle256.class,
+                                    (ByteShuffle256) s,
+                                    (ByteVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector compress(VectorMask<Byte> m) {
-        return (Byte256Vector)
-            super.compressTemplate(Byte256Mask.class,
-                                   (Byte256Mask) m);  // specialize
+    public ByteVector256 compress(VectorMask<Byte> m) {
+        return (ByteVector256)
+            super.compressTemplate(ByteMask256.class,
+                                   (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector expand(VectorMask<Byte> m) {
-        return (Byte256Vector)
-            super.expandTemplate(Byte256Mask.class,
-                                   (Byte256Mask) m);  // specialize
+    public ByteVector256 expand(VectorMask<Byte> m) {
+        return (ByteVector256)
+            super.expandTemplate(ByteMask256.class,
+                                   (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector selectFrom(Vector<Byte> v) {
-        return (Byte256Vector)
-            super.selectFromTemplate((Byte256Vector) v);  // specialize
+    public ByteVector256 selectFrom(Vector<Byte> v) {
+        return (ByteVector256)
+            super.selectFromTemplate((ByteVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector selectFrom(Vector<Byte> v,
+    public ByteVector256 selectFrom(Vector<Byte> v,
                                    VectorMask<Byte> m) {
-        return (Byte256Vector)
-            super.selectFromTemplate((Byte256Vector) v,
-                                     Byte256Mask.class, (Byte256Mask) m);  // specialize
+        return (ByteVector256)
+            super.selectFromTemplate((ByteVector256) v,
+                                     ByteMask256.class, (ByteMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte256Vector selectFrom(Vector<Byte> v1,
+    public ByteVector256 selectFrom(Vector<Byte> v1,
                                    Vector<Byte> v2) {
-        return (Byte256Vector)
-            super.selectFromTemplate((Byte256Vector) v1, (Byte256Vector) v2);  // specialize
+        return (ByteVector256)
+            super.selectFromTemplate((ByteVector256) v1, (ByteVector256) v2);  // specialize
     }
 
     @ForceInline
@@ -557,7 +569,7 @@ final class Byte256Vector extends ByteVector {
     @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     byte[] vecarr = vec.vec();
@@ -567,7 +579,7 @@ final class Byte256Vector extends ByteVector {
 
     @ForceInline
     @Override
-    public Byte256Vector withLane(int i, byte e) {
+    public ByteVector256 withLane(int i, byte e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -606,9 +618,9 @@ final class Byte256Vector extends ByteVector {
     }
 
     @ForceInline
-    public Byte256Vector withLaneHelper(int i, byte e) {
+    public ByteVector256 withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     byte[] res = v.vec().clone();
@@ -619,19 +631,20 @@ final class Byte256Vector extends ByteVector {
 
     // Mask
 
-    static final class Byte256Mask extends AbstractMask<Byte> {
+    static final class ByteMask256 extends AbstractMask<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte256Mask(boolean[] bits) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteMask256(boolean[] bits) {
             this(bits, 0);
         }
 
-        Byte256Mask(boolean[] bits, int offset) {
+        ByteMask256(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Byte256Mask(boolean val) {
+        ByteMask256(boolean val) {
             super(prepare(val));
         }
 
@@ -664,31 +677,31 @@ final class Byte256Vector extends ByteVector {
         }
 
         @Override
-        Byte256Mask uOp(MUnOp f) {
+        ByteMask256 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Byte256Mask(res);
+            return new ByteMask256(res);
         }
 
         @Override
-        Byte256Mask bOp(VectorMask<Byte> m, MBinOp f) {
+        ByteMask256 bOp(VectorMask<Byte> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Byte256Mask)m).getBits();
+            boolean[] mbits = ((ByteMask256)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Byte256Mask(res);
+            return new ByteMask256(res);
         }
 
         @ForceInline
         @Override
         public final
-        Byte256Vector toVector() {
-            return (Byte256Vector) super.toVectorTemplate();  // specialize
+        ByteVector256 toVector() {
+            return (ByteVector256) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -712,8 +725,8 @@ final class Byte256Vector extends ByteVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -721,25 +734,25 @@ final class Byte256Vector extends ByteVector {
         @Override
         @ForceInline
         /*package-private*/
-        Byte256Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Byte256Mask) VectorSupport.indexPartiallyInUpperRange(
-                Byte256Mask.class, byte.class, VLENGTH, offset, limit,
-                (o, l) -> (Byte256Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ByteMask256 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ByteMask256) VectorSupport.indexPartiallyInUpperRange(
+                ByteMask256.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ByteMask256) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Byte256Mask not() {
+        public ByteMask256 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Byte256Mask compress() {
-            return (Byte256Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Byte256Vector.class, Byte256Mask.class, ETYPE, VLENGTH, null, this,
+        public ByteMask256 compress() {
+            return (ByteMask256)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ByteVector256.class, ByteMask256.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -748,30 +761,30 @@ final class Byte256Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public Byte256Mask and(VectorMask<Byte> mask) {
+        public ByteMask256 and(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte256Mask m = (Byte256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Byte256Mask.class, null, byte.class, VLENGTH,
+            ByteMask256 m = (ByteMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ByteMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Byte256Mask or(VectorMask<Byte> mask) {
+        public ByteMask256 or(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte256Mask m = (Byte256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Byte256Mask.class, null, byte.class, VLENGTH,
+            ByteMask256 m = (ByteMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ByteMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Byte256Mask xor(VectorMask<Byte> mask) {
+        public ByteMask256 xor(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte256Mask m = (Byte256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Byte256Mask.class, null, byte.class, VLENGTH,
+            ByteMask256 m = (ByteMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ByteMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -781,21 +794,21 @@ final class Byte256Vector extends ByteVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Byte256Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Byte256Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Byte256Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -805,7 +818,7 @@ final class Byte256Vector extends ByteVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Byte256Mask.class, byte.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -815,7 +828,7 @@ final class Byte256Vector extends ByteVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Byte256Mask.class, byte.class, VLENGTH,
+            return VectorSupport.extract(ByteMask256.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -824,48 +837,49 @@ final class Byte256Vector extends ByteVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Byte256Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Byte256Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ByteMask256)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Byte256Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Byte256Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ByteMask256)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Byte256Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Byte256Mask.class, byte.class, VLENGTH,
+        static ByteMask256 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ByteMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Byte256Mask  TRUE_MASK = new Byte256Mask(true);
-        private static final Byte256Mask FALSE_MASK = new Byte256Mask(false);
+        private static final ByteMask256  TRUE_MASK = new ByteMask256(true);
+        private static final ByteMask256 FALSE_MASK = new ByteMask256(false);
 
     }
 
     // Shuffle
 
-    static final class Byte256Shuffle extends AbstractShuffle<Byte> {
+    static final class ByteShuffle256 extends AbstractShuffle<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte256Shuffle(byte[] indices) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteShuffle256(byte[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Byte256Shuffle(int[] indices, int i) {
+        ByteShuffle256(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Byte256Shuffle(IntUnaryOperator fn) {
+        ByteShuffle256(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -885,23 +899,23 @@ final class Byte256Vector extends ByteVector {
             assert(VLENGTH < Byte.MAX_VALUE);
             assert(Byte.MIN_VALUE <= -VLENGTH);
         }
-        static final Byte256Shuffle IOTA = new Byte256Shuffle(IDENTITY);
+        static final ByteShuffle256 IOTA = new ByteShuffle256(IDENTITY);
 
         @Override
         @ForceInline
-        public Byte256Vector toVector() {
+        public ByteVector256 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Byte256Vector toBitsVector() {
-            return (Byte256Vector) super.toBitsVectorTemplate();
+        ByteVector256 toBitsVector() {
+            return (ByteVector256) super.toBitsVectorTemplate();
         }
 
         @Override
-        Byte256Vector toBitsVector0() {
-            return ((Byte256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ByteVector256 toBitsVector0() {
+            return ((ByteVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -950,30 +964,30 @@ final class Byte256Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public final Byte256Mask laneIsValid() {
-            return (Byte256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ByteMask256 laneIsValid() {
+            return (ByteMask256) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Byte256Shuffle rearrange(VectorShuffle<Byte> shuffle) {
-            Byte256Shuffle concreteShuffle = (Byte256Shuffle) shuffle;
-            return (Byte256Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ByteShuffle256 rearrange(VectorShuffle<Byte> shuffle) {
+            ByteShuffle256 concreteShuffle = (ByteShuffle256) shuffle;
+            return (ByteShuffle256) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Byte256Shuffle wrapIndexes() {
-            Byte256Vector v = toBitsVector();
+        public final ByteShuffle256 wrapIndexes() {
+            ByteVector256 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Byte256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ByteVector256) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Byte256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ByteVector256) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Byte256Shuffle) v.toShuffle(vspecies(), false);
+            return (ByteShuffle256) v.toShuffle(vspecies(), false);
         }
 
         private static byte[] prepare(int[] indices, int offset) {
@@ -1024,14 +1038,14 @@ final class Byte256Vector extends ByteVector {
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromArray0Template(Byte256Mask.class, a, offset, (Byte256Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ByteMask256.class, a, offset, (ByteMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
-        return super.fromArray0Template(Byte256Mask.class, a, offset, indexMap, mapOffset, (Byte256Mask) m);
+        return super.fromArray0Template(ByteMask256.class, a, offset, indexMap, mapOffset, (ByteMask256) m);
     }
 
 
@@ -1046,7 +1060,7 @@ final class Byte256Vector extends ByteVector {
     @Override
     final
     ByteVector fromBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromBooleanArray0Template(Byte256Mask.class, a, offset, (Byte256Mask) m, offsetInRange);  // specialize
+        return super.fromBooleanArray0Template(ByteMask256.class, a, offset, (ByteMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1060,7 +1074,7 @@ final class Byte256Vector extends ByteVector {
     @Override
     final
     ByteVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Byte256Mask.class, ms, offset, (Byte256Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ByteMask256.class, ms, offset, (ByteMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1074,7 +1088,7 @@ final class Byte256Vector extends ByteVector {
     @Override
     final
     void intoArray0(byte[] a, int offset, VectorMask<Byte> m) {
-        super.intoArray0Template(Byte256Mask.class, a, offset, (Byte256Mask) m);
+        super.intoArray0Template(ByteMask256.class, a, offset, (ByteMask256) m);
     }
 
 
@@ -1082,14 +1096,14 @@ final class Byte256Vector extends ByteVector {
     @Override
     final
     void intoBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m) {
-        super.intoBooleanArray0Template(Byte256Mask.class, a, offset, (Byte256Mask) m);
+        super.intoBooleanArray0Template(ByteMask256.class, a, offset, (ByteMask256) m);
     }
 
     @ForceInline
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m) {
-        super.intoMemorySegment0Template(Byte256Mask.class, ms, offset, (Byte256Mask) m);
+        super.intoMemorySegment0Template(ByteMask256.class, ms, offset, (ByteMask256) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector512.java
similarity index 69%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector512.java
index a093fe18289..138319b60d4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Byte512Vector extends ByteVector {
+final class ByteVector512 extends ByteVector {
     static final ByteSpecies VSPECIES =
         (ByteSpecies) ByteVector.SPECIES_512;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Byte512Vector> VCLASS = Byte512Vector.class;
+    static final Class<ByteVector512> VCLASS = ByteVector512.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Byte> CTYPE = byte.class; // carrier type used by the JVM
+
     static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-    Byte512Vector(byte[] v) {
+    ByteVector512(byte[] v) {
         super(v);
     }
 
-    // For compatibility as Byte512Vector::new,
+    // For compatibility as ByteVector512::new,
     // stored into species.vectorFactory.
-    Byte512Vector(Object v) {
+    ByteVector512(Object v) {
         this((byte[]) v);
     }
 
-    static final Byte512Vector ZERO = new Byte512Vector(new byte[VLENGTH]);
-    static final Byte512Vector IOTA = new Byte512Vector(VSPECIES.iotaArray());
+    static final ByteVector512 ZERO = new ByteVector512(new byte[VLENGTH]);
+    static final ByteVector512 IOTA = new ByteVector512(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Byte512Vector extends ByteVector {
     @Override
     public final Class<Byte> elementType() { return byte.class; }
 
+    @ForceInline
+    final Class<Byte> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Byte.SIZE; }
@@ -119,55 +124,62 @@ final class Byte512Vector extends ByteVector {
         return (byte[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Byte512Vector broadcast(byte e) {
-        return (Byte512Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector512 broadcast(byte e) {
+        return (ByteVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte512Vector broadcast(long e) {
-        return (Byte512Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector512 broadcast(long e) {
+        return (ByteVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Byte512Mask maskFromArray(boolean[] bits) {
-        return new Byte512Mask(bits);
+    ByteMask512 maskFromArray(boolean[] bits) {
+        return new ByteMask512(bits);
     }
 
     @Override
     @ForceInline
-    Byte512Shuffle iotaShuffle() { return Byte512Shuffle.IOTA; }
+    ByteShuffle512 iotaShuffle() { return ByteShuffle512.IOTA; }
 
     @Override
     @ForceInline
-    Byte512Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Byte512Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
+    ByteShuffle512 iotaShuffle(int start, int step, boolean wrap) {
+        return (ByteShuffle512) iotaShuffleTemplate((byte) start, (byte) step, wrap);
     }
 
     @Override
     @ForceInline
-    Byte512Shuffle shuffleFromArray(int[] indices, int i) { return new Byte512Shuffle(indices, i); }
+    ByteShuffle512 shuffleFromArray(int[] indices, int i) { return new ByteShuffle512(indices, i); }
 
     @Override
     @ForceInline
-    Byte512Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Byte512Shuffle(fn); }
+    ByteShuffle512 shuffleFromOp(IntUnaryOperator fn) { return new ByteShuffle512(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Byte512Vector vectorFactory(byte[] vec) {
-        return new Byte512Vector(vec);
+    ByteVector512 vectorFactory(byte[] vec) {
+        return new ByteVector512(vec);
     }
 
     @ForceInline
     final @Override
-    Byte512Vector asByteVectorRaw() {
-        return (Byte512Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector512 asByteVectorRaw() {
+        return (ByteVector512) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Byte512Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte512Vector uOp(FUnOp f) {
-        return (Byte512Vector) super.uOpTemplate(f);  // specialize
+    ByteVector512 uOp(FUnOp f) {
+        return (ByteVector512) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte512Vector uOp(VectorMask<Byte> m, FUnOp f) {
-        return (Byte512Vector)
-            super.uOpTemplate((Byte512Mask)m, f);  // specialize
+    ByteVector512 uOp(VectorMask<Byte> m, FUnOp f) {
+        return (ByteVector512)
+            super.uOpTemplate((ByteMask512)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Byte512Vector bOp(Vector<Byte> v, FBinOp f) {
-        return (Byte512Vector) super.bOpTemplate((Byte512Vector)v, f);  // specialize
+    ByteVector512 bOp(Vector<Byte> v, FBinOp f) {
+        return (ByteVector512) super.bOpTemplate((ByteVector512)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte512Vector bOp(Vector<Byte> v,
+    ByteVector512 bOp(Vector<Byte> v,
                      VectorMask<Byte> m, FBinOp f) {
-        return (Byte512Vector)
-            super.bOpTemplate((Byte512Vector)v, (Byte512Mask)m,
+        return (ByteVector512)
+            super.bOpTemplate((ByteVector512)v, (ByteMask512)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Byte512Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte512Vector tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
-        return (Byte512Vector)
-            super.tOpTemplate((Byte512Vector)v1, (Byte512Vector)v2,
+    ByteVector512 tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
+        return (ByteVector512)
+            super.tOpTemplate((ByteVector512)v1, (ByteVector512)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte512Vector tOp(Vector<Byte> v1, Vector<Byte> v2,
+    ByteVector512 tOp(Vector<Byte> v1, Vector<Byte> v2,
                      VectorMask<Byte> m, FTriOp f) {
-        return (Byte512Vector)
-            super.tOpTemplate((Byte512Vector)v1, (Byte512Vector)v2,
-                              (Byte512Mask)m, f);  // specialize
+        return (ByteVector512)
+            super.tOpTemplate((ByteVector512)v1, (ByteVector512)v2,
+                              (ByteMask512)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Byte512Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public Byte512Vector lanewise(Unary op) {
-        return (Byte512Vector) super.lanewiseTemplate(op);  // specialize
+    public ByteVector512 lanewise(Unary op) {
+        return (ByteVector512) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector lanewise(Unary op, VectorMask<Byte> m) {
-        return (Byte512Vector) super.lanewiseTemplate(op, Byte512Mask.class, (Byte512Mask) m);  // specialize
+    public ByteVector512 lanewise(Unary op, VectorMask<Byte> m) {
+        return (ByteVector512) super.lanewiseTemplate(op, ByteMask512.class, (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector lanewise(Binary op, Vector<Byte> v) {
-        return (Byte512Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ByteVector512 lanewise(Binary op, Vector<Byte> v) {
+        return (ByteVector512) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte512Vector) super.lanewiseTemplate(op, Byte512Mask.class, v, (Byte512Mask) m);  // specialize
+    public ByteVector512 lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector512) super.lanewiseTemplate(op, ByteMask512.class, v, (ByteMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte512Vector
+    @ForceInline ByteVector512
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Byte512Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ByteVector512) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte512Vector
+    @ForceInline ByteVector512
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Byte> m) {
-        return (Byte512Vector) super.lanewiseShiftTemplate(op, Byte512Mask.class, e, (Byte512Mask) m);  // specialize
+        return (ByteVector512) super.lanewiseShiftTemplate(op, ByteMask512.class, e, (ByteMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Byte512Vector
+    ByteVector512
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2) {
-        return (Byte512Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ByteVector512) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte512Vector
+    ByteVector512
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2, VectorMask<Byte> m) {
-        return (Byte512Vector) super.lanewiseTemplate(op, Byte512Mask.class, v1, v2, (Byte512Mask) m);  // specialize
+        return (ByteVector512) super.lanewiseTemplate(op, ByteMask512.class, v1, v2, (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte512Vector addIndex(int scale) {
-        return (Byte512Vector) super.addIndexTemplate(scale);  // specialize
+    ByteVector512 addIndex(int scale) {
+        return (ByteVector512) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Byte512Vector extends ByteVector {
     @ForceInline
     public final byte reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Byte> m) {
-        return super.reduceLanesTemplate(op, Byte512Mask.class, (Byte512Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ByteMask512.class, (ByteMask512) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Byte512Vector extends ByteVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Byte> m) {
-        return (long) super.reduceLanesTemplate(op, Byte512Mask.class, (Byte512Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ByteMask512.class, (ByteMask512) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Byte512Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public final Byte512Shuffle toShuffle() {
-        return (Byte512Shuffle) toShuffle(vspecies(), false);
+    public final ByteShuffle512 toShuffle() {
+        return (ByteShuffle512) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Byte512Mask test(Test op) {
-        return super.testTemplate(Byte512Mask.class, op);  // specialize
+    public final ByteMask512 test(Test op) {
+        return super.testTemplate(ByteMask512.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte512Mask test(Test op, VectorMask<Byte> m) {
-        return super.testTemplate(Byte512Mask.class, op, (Byte512Mask) m);  // specialize
+    public final ByteMask512 test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(ByteMask512.class, op, (ByteMask512) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Byte512Mask compare(Comparison op, Vector<Byte> v) {
-        return super.compareTemplate(Byte512Mask.class, op, v);  // specialize
+    public final ByteMask512 compare(Comparison op, Vector<Byte> v) {
+        return super.compareTemplate(ByteMask512.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte512Mask compare(Comparison op, byte s) {
-        return super.compareTemplate(Byte512Mask.class, op, s);  // specialize
+    public final ByteMask512 compare(Comparison op, byte s) {
+        return super.compareTemplate(ByteMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte512Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Byte512Mask.class, op, s);  // specialize
+    public final ByteMask512 compare(Comparison op, long s) {
+        return super.compareTemplate(ByteMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte512Mask compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
-        return super.compareTemplate(Byte512Mask.class, op, v, (Byte512Mask) m);
+    public final ByteMask512 compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
+        return super.compareTemplate(ByteMask512.class, op, v, (ByteMask512) m);
     }
 
 
     @Override
     @ForceInline
-    public Byte512Vector blend(Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte512Vector)
-            super.blendTemplate(Byte512Mask.class,
-                                (Byte512Vector) v,
-                                (Byte512Mask) m);  // specialize
+    public ByteVector512 blend(Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector512)
+            super.blendTemplate(ByteMask512.class,
+                                (ByteVector512) v,
+                                (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector slice(int origin, Vector<Byte> v) {
-        return (Byte512Vector) super.sliceTemplate(origin, v);  // specialize
+    public ByteVector512 slice(int origin, Vector<Byte> v) {
+        return (ByteVector512) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector slice(int origin) {
-        return (Byte512Vector) super.sliceTemplate(origin);  // specialize
+    public ByteVector512 slice(int origin) {
+        return (ByteVector512) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector unslice(int origin, Vector<Byte> w, int part) {
-        return (Byte512Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ByteVector512 unslice(int origin, Vector<Byte> w, int part) {
+        return (ByteVector512) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
-        return (Byte512Vector)
-            super.unsliceTemplate(Byte512Mask.class,
+    public ByteVector512 unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
+        return (ByteVector512)
+            super.unsliceTemplate(ByteMask512.class,
                                   origin, w, part,
-                                  (Byte512Mask) m);  // specialize
+                                  (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector unslice(int origin) {
-        return (Byte512Vector) super.unsliceTemplate(origin);  // specialize
+    public ByteVector512 unslice(int origin) {
+        return (ByteVector512) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector rearrange(VectorShuffle<Byte> s) {
-        return (Byte512Vector)
-            super.rearrangeTemplate(Byte512Shuffle.class,
-                                    (Byte512Shuffle) s);  // specialize
+    public ByteVector512 rearrange(VectorShuffle<Byte> s) {
+        return (ByteVector512)
+            super.rearrangeTemplate(ByteShuffle512.class,
+                                    (ByteShuffle512) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector rearrange(VectorShuffle<Byte> shuffle,
+    public ByteVector512 rearrange(VectorShuffle<Byte> shuffle,
                                   VectorMask<Byte> m) {
-        return (Byte512Vector)
-            super.rearrangeTemplate(Byte512Shuffle.class,
-                                    Byte512Mask.class,
-                                    (Byte512Shuffle) shuffle,
-                                    (Byte512Mask) m);  // specialize
+        return (ByteVector512)
+            super.rearrangeTemplate(ByteShuffle512.class,
+                                    ByteMask512.class,
+                                    (ByteShuffle512) shuffle,
+                                    (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector rearrange(VectorShuffle<Byte> s,
+    public ByteVector512 rearrange(VectorShuffle<Byte> s,
                                   Vector<Byte> v) {
-        return (Byte512Vector)
-            super.rearrangeTemplate(Byte512Shuffle.class,
-                                    (Byte512Shuffle) s,
-                                    (Byte512Vector) v);  // specialize
+        return (ByteVector512)
+            super.rearrangeTemplate(ByteShuffle512.class,
+                                    (ByteShuffle512) s,
+                                    (ByteVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector compress(VectorMask<Byte> m) {
-        return (Byte512Vector)
-            super.compressTemplate(Byte512Mask.class,
-                                   (Byte512Mask) m);  // specialize
+    public ByteVector512 compress(VectorMask<Byte> m) {
+        return (ByteVector512)
+            super.compressTemplate(ByteMask512.class,
+                                   (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector expand(VectorMask<Byte> m) {
-        return (Byte512Vector)
-            super.expandTemplate(Byte512Mask.class,
-                                   (Byte512Mask) m);  // specialize
+    public ByteVector512 expand(VectorMask<Byte> m) {
+        return (ByteVector512)
+            super.expandTemplate(ByteMask512.class,
+                                   (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector selectFrom(Vector<Byte> v) {
-        return (Byte512Vector)
-            super.selectFromTemplate((Byte512Vector) v);  // specialize
+    public ByteVector512 selectFrom(Vector<Byte> v) {
+        return (ByteVector512)
+            super.selectFromTemplate((ByteVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector selectFrom(Vector<Byte> v,
+    public ByteVector512 selectFrom(Vector<Byte> v,
                                    VectorMask<Byte> m) {
-        return (Byte512Vector)
-            super.selectFromTemplate((Byte512Vector) v,
-                                     Byte512Mask.class, (Byte512Mask) m);  // specialize
+        return (ByteVector512)
+            super.selectFromTemplate((ByteVector512) v,
+                                     ByteMask512.class, (ByteMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte512Vector selectFrom(Vector<Byte> v1,
+    public ByteVector512 selectFrom(Vector<Byte> v1,
                                    Vector<Byte> v2) {
-        return (Byte512Vector)
-            super.selectFromTemplate((Byte512Vector) v1, (Byte512Vector) v2);  // specialize
+        return (ByteVector512)
+            super.selectFromTemplate((ByteVector512) v1, (ByteVector512) v2);  // specialize
     }
 
     @ForceInline
@@ -589,7 +601,7 @@ final class Byte512Vector extends ByteVector {
     @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     byte[] vecarr = vec.vec();
@@ -599,7 +611,7 @@ final class Byte512Vector extends ByteVector {
 
     @ForceInline
     @Override
-    public Byte512Vector withLane(int i, byte e) {
+    public ByteVector512 withLane(int i, byte e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -670,9 +682,9 @@ final class Byte512Vector extends ByteVector {
     }
 
     @ForceInline
-    public Byte512Vector withLaneHelper(int i, byte e) {
+    public ByteVector512 withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     byte[] res = v.vec().clone();
@@ -683,19 +695,20 @@ final class Byte512Vector extends ByteVector {
 
     // Mask
 
-    static final class Byte512Mask extends AbstractMask<Byte> {
+    static final class ByteMask512 extends AbstractMask<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte512Mask(boolean[] bits) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteMask512(boolean[] bits) {
             this(bits, 0);
         }
 
-        Byte512Mask(boolean[] bits, int offset) {
+        ByteMask512(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Byte512Mask(boolean val) {
+        ByteMask512(boolean val) {
             super(prepare(val));
         }
 
@@ -728,31 +741,31 @@ final class Byte512Vector extends ByteVector {
         }
 
         @Override
-        Byte512Mask uOp(MUnOp f) {
+        ByteMask512 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Byte512Mask(res);
+            return new ByteMask512(res);
         }
 
         @Override
-        Byte512Mask bOp(VectorMask<Byte> m, MBinOp f) {
+        ByteMask512 bOp(VectorMask<Byte> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Byte512Mask)m).getBits();
+            boolean[] mbits = ((ByteMask512)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Byte512Mask(res);
+            return new ByteMask512(res);
         }
 
         @ForceInline
         @Override
         public final
-        Byte512Vector toVector() {
-            return (Byte512Vector) super.toVectorTemplate();  // specialize
+        ByteVector512 toVector() {
+            return (ByteVector512) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -776,8 +789,8 @@ final class Byte512Vector extends ByteVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -785,25 +798,25 @@ final class Byte512Vector extends ByteVector {
         @Override
         @ForceInline
         /*package-private*/
-        Byte512Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Byte512Mask) VectorSupport.indexPartiallyInUpperRange(
-                Byte512Mask.class, byte.class, VLENGTH, offset, limit,
-                (o, l) -> (Byte512Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ByteMask512 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ByteMask512) VectorSupport.indexPartiallyInUpperRange(
+                ByteMask512.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ByteMask512) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Byte512Mask not() {
+        public ByteMask512 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Byte512Mask compress() {
-            return (Byte512Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Byte512Vector.class, Byte512Mask.class, ETYPE, VLENGTH, null, this,
+        public ByteMask512 compress() {
+            return (ByteMask512)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ByteVector512.class, ByteMask512.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -812,30 +825,30 @@ final class Byte512Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public Byte512Mask and(VectorMask<Byte> mask) {
+        public ByteMask512 and(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte512Mask m = (Byte512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Byte512Mask.class, null, byte.class, VLENGTH,
+            ByteMask512 m = (ByteMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ByteMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Byte512Mask or(VectorMask<Byte> mask) {
+        public ByteMask512 or(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte512Mask m = (Byte512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Byte512Mask.class, null, byte.class, VLENGTH,
+            ByteMask512 m = (ByteMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ByteMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Byte512Mask xor(VectorMask<Byte> mask) {
+        public ByteMask512 xor(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte512Mask m = (Byte512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Byte512Mask.class, null, byte.class, VLENGTH,
+            ByteMask512 m = (ByteMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ByteMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -845,21 +858,21 @@ final class Byte512Vector extends ByteVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Byte512Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Byte512Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Byte512Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -869,7 +882,7 @@ final class Byte512Vector extends ByteVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Byte512Mask.class, byte.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -879,7 +892,7 @@ final class Byte512Vector extends ByteVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Byte512Mask.class, byte.class, VLENGTH,
+            return VectorSupport.extract(ByteMask512.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -888,48 +901,49 @@ final class Byte512Vector extends ByteVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Byte512Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Byte512Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ByteMask512)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Byte512Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Byte512Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ByteMask512)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Byte512Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Byte512Mask.class, byte.class, VLENGTH,
+        static ByteMask512 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ByteMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Byte512Mask  TRUE_MASK = new Byte512Mask(true);
-        private static final Byte512Mask FALSE_MASK = new Byte512Mask(false);
+        private static final ByteMask512  TRUE_MASK = new ByteMask512(true);
+        private static final ByteMask512 FALSE_MASK = new ByteMask512(false);
 
     }
 
     // Shuffle
 
-    static final class Byte512Shuffle extends AbstractShuffle<Byte> {
+    static final class ByteShuffle512 extends AbstractShuffle<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte512Shuffle(byte[] indices) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteShuffle512(byte[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Byte512Shuffle(int[] indices, int i) {
+        ByteShuffle512(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Byte512Shuffle(IntUnaryOperator fn) {
+        ByteShuffle512(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -949,23 +963,23 @@ final class Byte512Vector extends ByteVector {
             assert(VLENGTH < Byte.MAX_VALUE);
             assert(Byte.MIN_VALUE <= -VLENGTH);
         }
-        static final Byte512Shuffle IOTA = new Byte512Shuffle(IDENTITY);
+        static final ByteShuffle512 IOTA = new ByteShuffle512(IDENTITY);
 
         @Override
         @ForceInline
-        public Byte512Vector toVector() {
+        public ByteVector512 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Byte512Vector toBitsVector() {
-            return (Byte512Vector) super.toBitsVectorTemplate();
+        ByteVector512 toBitsVector() {
+            return (ByteVector512) super.toBitsVectorTemplate();
         }
 
         @Override
-        Byte512Vector toBitsVector0() {
-            return ((Byte512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ByteVector512 toBitsVector0() {
+            return ((ByteVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -1014,30 +1028,30 @@ final class Byte512Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public final Byte512Mask laneIsValid() {
-            return (Byte512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ByteMask512 laneIsValid() {
+            return (ByteMask512) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Byte512Shuffle rearrange(VectorShuffle<Byte> shuffle) {
-            Byte512Shuffle concreteShuffle = (Byte512Shuffle) shuffle;
-            return (Byte512Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ByteShuffle512 rearrange(VectorShuffle<Byte> shuffle) {
+            ByteShuffle512 concreteShuffle = (ByteShuffle512) shuffle;
+            return (ByteShuffle512) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Byte512Shuffle wrapIndexes() {
-            Byte512Vector v = toBitsVector();
+        public final ByteShuffle512 wrapIndexes() {
+            ByteVector512 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Byte512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ByteVector512) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Byte512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ByteVector512) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Byte512Shuffle) v.toShuffle(vspecies(), false);
+            return (ByteShuffle512) v.toShuffle(vspecies(), false);
         }
 
         private static byte[] prepare(int[] indices, int offset) {
@@ -1088,14 +1102,14 @@ final class Byte512Vector extends ByteVector {
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromArray0Template(Byte512Mask.class, a, offset, (Byte512Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ByteMask512.class, a, offset, (ByteMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
-        return super.fromArray0Template(Byte512Mask.class, a, offset, indexMap, mapOffset, (Byte512Mask) m);
+        return super.fromArray0Template(ByteMask512.class, a, offset, indexMap, mapOffset, (ByteMask512) m);
     }
 
 
@@ -1110,7 +1124,7 @@ final class Byte512Vector extends ByteVector {
     @Override
     final
     ByteVector fromBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromBooleanArray0Template(Byte512Mask.class, a, offset, (Byte512Mask) m, offsetInRange);  // specialize
+        return super.fromBooleanArray0Template(ByteMask512.class, a, offset, (ByteMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1124,7 +1138,7 @@ final class Byte512Vector extends ByteVector {
     @Override
     final
     ByteVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Byte512Mask.class, ms, offset, (Byte512Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ByteMask512.class, ms, offset, (ByteMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1138,7 +1152,7 @@ final class Byte512Vector extends ByteVector {
     @Override
     final
     void intoArray0(byte[] a, int offset, VectorMask<Byte> m) {
-        super.intoArray0Template(Byte512Mask.class, a, offset, (Byte512Mask) m);
+        super.intoArray0Template(ByteMask512.class, a, offset, (ByteMask512) m);
     }
 
 
@@ -1146,14 +1160,14 @@ final class Byte512Vector extends ByteVector {
     @Override
     final
     void intoBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m) {
-        super.intoBooleanArray0Template(Byte512Mask.class, a, offset, (Byte512Mask) m);
+        super.intoBooleanArray0Template(ByteMask512.class, a, offset, (ByteMask512) m);
     }
 
     @ForceInline
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m) {
-        super.intoMemorySegment0Template(Byte512Mask.class, ms, offset, (Byte512Mask) m);
+        super.intoMemorySegment0Template(ByteMask512.class, ms, offset, (ByteMask512) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector64.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector64.java
index cd75ee9f610..d7c7c78534b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Byte64Vector extends ByteVector {
+final class ByteVector64 extends ByteVector {
     static final ByteSpecies VSPECIES =
         (ByteSpecies) ByteVector.SPECIES_64;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Byte64Vector> VCLASS = Byte64Vector.class;
+    static final Class<ByteVector64> VCLASS = ByteVector64.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Byte> CTYPE = byte.class; // carrier type used by the JVM
+
     static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-    Byte64Vector(byte[] v) {
+    ByteVector64(byte[] v) {
         super(v);
     }
 
-    // For compatibility as Byte64Vector::new,
+    // For compatibility as ByteVector64::new,
     // stored into species.vectorFactory.
-    Byte64Vector(Object v) {
+    ByteVector64(Object v) {
         this((byte[]) v);
     }
 
-    static final Byte64Vector ZERO = new Byte64Vector(new byte[VLENGTH]);
-    static final Byte64Vector IOTA = new Byte64Vector(VSPECIES.iotaArray());
+    static final ByteVector64 ZERO = new ByteVector64(new byte[VLENGTH]);
+    static final ByteVector64 IOTA = new ByteVector64(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Byte64Vector extends ByteVector {
     @Override
     public final Class<Byte> elementType() { return byte.class; }
 
+    @ForceInline
+    final Class<Byte> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Byte.SIZE; }
@@ -119,55 +124,62 @@ final class Byte64Vector extends ByteVector {
         return (byte[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Byte64Vector broadcast(byte e) {
-        return (Byte64Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector64 broadcast(byte e) {
+        return (ByteVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte64Vector broadcast(long e) {
-        return (Byte64Vector) super.broadcastTemplate(e);  // specialize
+    public final ByteVector64 broadcast(long e) {
+        return (ByteVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Byte64Mask maskFromArray(boolean[] bits) {
-        return new Byte64Mask(bits);
+    ByteMask64 maskFromArray(boolean[] bits) {
+        return new ByteMask64(bits);
     }
 
     @Override
     @ForceInline
-    Byte64Shuffle iotaShuffle() { return Byte64Shuffle.IOTA; }
+    ByteShuffle64 iotaShuffle() { return ByteShuffle64.IOTA; }
 
     @Override
     @ForceInline
-    Byte64Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Byte64Shuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
+    ByteShuffle64 iotaShuffle(int start, int step, boolean wrap) {
+        return (ByteShuffle64) iotaShuffleTemplate((byte) start, (byte) step, wrap);
     }
 
     @Override
     @ForceInline
-    Byte64Shuffle shuffleFromArray(int[] indices, int i) { return new Byte64Shuffle(indices, i); }
+    ByteShuffle64 shuffleFromArray(int[] indices, int i) { return new ByteShuffle64(indices, i); }
 
     @Override
     @ForceInline
-    Byte64Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Byte64Shuffle(fn); }
+    ByteShuffle64 shuffleFromOp(IntUnaryOperator fn) { return new ByteShuffle64(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Byte64Vector vectorFactory(byte[] vec) {
-        return new Byte64Vector(vec);
+    ByteVector64 vectorFactory(byte[] vec) {
+        return new ByteVector64(vec);
     }
 
     @ForceInline
     final @Override
-    Byte64Vector asByteVectorRaw() {
-        return (Byte64Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector64 asByteVectorRaw() {
+        return (ByteVector64) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Byte64Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte64Vector uOp(FUnOp f) {
-        return (Byte64Vector) super.uOpTemplate(f);  // specialize
+    ByteVector64 uOp(FUnOp f) {
+        return (ByteVector64) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte64Vector uOp(VectorMask<Byte> m, FUnOp f) {
-        return (Byte64Vector)
-            super.uOpTemplate((Byte64Mask)m, f);  // specialize
+    ByteVector64 uOp(VectorMask<Byte> m, FUnOp f) {
+        return (ByteVector64)
+            super.uOpTemplate((ByteMask64)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Byte64Vector bOp(Vector<Byte> v, FBinOp f) {
-        return (Byte64Vector) super.bOpTemplate((Byte64Vector)v, f);  // specialize
+    ByteVector64 bOp(Vector<Byte> v, FBinOp f) {
+        return (ByteVector64) super.bOpTemplate((ByteVector64)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte64Vector bOp(Vector<Byte> v,
+    ByteVector64 bOp(Vector<Byte> v,
                      VectorMask<Byte> m, FBinOp f) {
-        return (Byte64Vector)
-            super.bOpTemplate((Byte64Vector)v, (Byte64Mask)m,
+        return (ByteVector64)
+            super.bOpTemplate((ByteVector64)v, (ByteMask64)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Byte64Vector extends ByteVector {
 
     @ForceInline
     final @Override
-    Byte64Vector tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
-        return (Byte64Vector)
-            super.tOpTemplate((Byte64Vector)v1, (Byte64Vector)v2,
+    ByteVector64 tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
+        return (ByteVector64)
+            super.tOpTemplate((ByteVector64)v1, (ByteVector64)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Byte64Vector tOp(Vector<Byte> v1, Vector<Byte> v2,
+    ByteVector64 tOp(Vector<Byte> v1, Vector<Byte> v2,
                      VectorMask<Byte> m, FTriOp f) {
-        return (Byte64Vector)
-            super.tOpTemplate((Byte64Vector)v1, (Byte64Vector)v2,
-                              (Byte64Mask)m, f);  // specialize
+        return (ByteVector64)
+            super.tOpTemplate((ByteVector64)v1, (ByteVector64)v2,
+                              (ByteMask64)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Byte64Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public Byte64Vector lanewise(Unary op) {
-        return (Byte64Vector) super.lanewiseTemplate(op);  // specialize
+    public ByteVector64 lanewise(Unary op) {
+        return (ByteVector64) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector lanewise(Unary op, VectorMask<Byte> m) {
-        return (Byte64Vector) super.lanewiseTemplate(op, Byte64Mask.class, (Byte64Mask) m);  // specialize
+    public ByteVector64 lanewise(Unary op, VectorMask<Byte> m) {
+        return (ByteVector64) super.lanewiseTemplate(op, ByteMask64.class, (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector lanewise(Binary op, Vector<Byte> v) {
-        return (Byte64Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ByteVector64 lanewise(Binary op, Vector<Byte> v) {
+        return (ByteVector64) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte64Vector) super.lanewiseTemplate(op, Byte64Mask.class, v, (Byte64Mask) m);  // specialize
+    public ByteVector64 lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector64) super.lanewiseTemplate(op, ByteMask64.class, v, (ByteMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte64Vector
+    @ForceInline ByteVector64
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Byte64Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ByteVector64) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Byte64Vector
+    @ForceInline ByteVector64
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Byte> m) {
-        return (Byte64Vector) super.lanewiseShiftTemplate(op, Byte64Mask.class, e, (Byte64Mask) m);  // specialize
+        return (ByteVector64) super.lanewiseShiftTemplate(op, ByteMask64.class, e, (ByteMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Byte64Vector
+    ByteVector64
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2) {
-        return (Byte64Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ByteVector64) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte64Vector
+    ByteVector64
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2, VectorMask<Byte> m) {
-        return (Byte64Vector) super.lanewiseTemplate(op, Byte64Mask.class, v1, v2, (Byte64Mask) m);  // specialize
+        return (ByteVector64) super.lanewiseTemplate(op, ByteMask64.class, v1, v2, (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Byte64Vector addIndex(int scale) {
-        return (Byte64Vector) super.addIndexTemplate(scale);  // specialize
+    ByteVector64 addIndex(int scale) {
+        return (ByteVector64) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Byte64Vector extends ByteVector {
     @ForceInline
     public final byte reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Byte> m) {
-        return super.reduceLanesTemplate(op, Byte64Mask.class, (Byte64Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ByteMask64.class, (ByteMask64) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Byte64Vector extends ByteVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Byte> m) {
-        return (long) super.reduceLanesTemplate(op, Byte64Mask.class, (Byte64Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ByteMask64.class, (ByteMask64) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Byte64Vector extends ByteVector {
 
     @Override
     @ForceInline
-    public final Byte64Shuffle toShuffle() {
-        return (Byte64Shuffle) toShuffle(vspecies(), false);
+    public final ByteShuffle64 toShuffle() {
+        return (ByteShuffle64) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Byte64Mask test(Test op) {
-        return super.testTemplate(Byte64Mask.class, op);  // specialize
+    public final ByteMask64 test(Test op) {
+        return super.testTemplate(ByteMask64.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte64Mask test(Test op, VectorMask<Byte> m) {
-        return super.testTemplate(Byte64Mask.class, op, (Byte64Mask) m);  // specialize
+    public final ByteMask64 test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(ByteMask64.class, op, (ByteMask64) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Byte64Mask compare(Comparison op, Vector<Byte> v) {
-        return super.compareTemplate(Byte64Mask.class, op, v);  // specialize
+    public final ByteMask64 compare(Comparison op, Vector<Byte> v) {
+        return super.compareTemplate(ByteMask64.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte64Mask compare(Comparison op, byte s) {
-        return super.compareTemplate(Byte64Mask.class, op, s);  // specialize
+    public final ByteMask64 compare(Comparison op, byte s) {
+        return super.compareTemplate(ByteMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte64Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Byte64Mask.class, op, s);  // specialize
+    public final ByteMask64 compare(Comparison op, long s) {
+        return super.compareTemplate(ByteMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Byte64Mask compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
-        return super.compareTemplate(Byte64Mask.class, op, v, (Byte64Mask) m);
+    public final ByteMask64 compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
+        return super.compareTemplate(ByteMask64.class, op, v, (ByteMask64) m);
     }
 
 
     @Override
     @ForceInline
-    public Byte64Vector blend(Vector<Byte> v, VectorMask<Byte> m) {
-        return (Byte64Vector)
-            super.blendTemplate(Byte64Mask.class,
-                                (Byte64Vector) v,
-                                (Byte64Mask) m);  // specialize
+    public ByteVector64 blend(Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVector64)
+            super.blendTemplate(ByteMask64.class,
+                                (ByteVector64) v,
+                                (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector slice(int origin, Vector<Byte> v) {
-        return (Byte64Vector) super.sliceTemplate(origin, v);  // specialize
+    public ByteVector64 slice(int origin, Vector<Byte> v) {
+        return (ByteVector64) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector slice(int origin) {
-        return (Byte64Vector) super.sliceTemplate(origin);  // specialize
+    public ByteVector64 slice(int origin) {
+        return (ByteVector64) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector unslice(int origin, Vector<Byte> w, int part) {
-        return (Byte64Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ByteVector64 unslice(int origin, Vector<Byte> w, int part) {
+        return (ByteVector64) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
-        return (Byte64Vector)
-            super.unsliceTemplate(Byte64Mask.class,
+    public ByteVector64 unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
+        return (ByteVector64)
+            super.unsliceTemplate(ByteMask64.class,
                                   origin, w, part,
-                                  (Byte64Mask) m);  // specialize
+                                  (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector unslice(int origin) {
-        return (Byte64Vector) super.unsliceTemplate(origin);  // specialize
+    public ByteVector64 unslice(int origin) {
+        return (ByteVector64) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector rearrange(VectorShuffle<Byte> s) {
-        return (Byte64Vector)
-            super.rearrangeTemplate(Byte64Shuffle.class,
-                                    (Byte64Shuffle) s);  // specialize
+    public ByteVector64 rearrange(VectorShuffle<Byte> s) {
+        return (ByteVector64)
+            super.rearrangeTemplate(ByteShuffle64.class,
+                                    (ByteShuffle64) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector rearrange(VectorShuffle<Byte> shuffle,
+    public ByteVector64 rearrange(VectorShuffle<Byte> shuffle,
                                   VectorMask<Byte> m) {
-        return (Byte64Vector)
-            super.rearrangeTemplate(Byte64Shuffle.class,
-                                    Byte64Mask.class,
-                                    (Byte64Shuffle) shuffle,
-                                    (Byte64Mask) m);  // specialize
+        return (ByteVector64)
+            super.rearrangeTemplate(ByteShuffle64.class,
+                                    ByteMask64.class,
+                                    (ByteShuffle64) shuffle,
+                                    (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector rearrange(VectorShuffle<Byte> s,
+    public ByteVector64 rearrange(VectorShuffle<Byte> s,
                                   Vector<Byte> v) {
-        return (Byte64Vector)
-            super.rearrangeTemplate(Byte64Shuffle.class,
-                                    (Byte64Shuffle) s,
-                                    (Byte64Vector) v);  // specialize
+        return (ByteVector64)
+            super.rearrangeTemplate(ByteShuffle64.class,
+                                    (ByteShuffle64) s,
+                                    (ByteVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector compress(VectorMask<Byte> m) {
-        return (Byte64Vector)
-            super.compressTemplate(Byte64Mask.class,
-                                   (Byte64Mask) m);  // specialize
+    public ByteVector64 compress(VectorMask<Byte> m) {
+        return (ByteVector64)
+            super.compressTemplate(ByteMask64.class,
+                                   (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector expand(VectorMask<Byte> m) {
-        return (Byte64Vector)
-            super.expandTemplate(Byte64Mask.class,
-                                   (Byte64Mask) m);  // specialize
+    public ByteVector64 expand(VectorMask<Byte> m) {
+        return (ByteVector64)
+            super.expandTemplate(ByteMask64.class,
+                                   (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector selectFrom(Vector<Byte> v) {
-        return (Byte64Vector)
-            super.selectFromTemplate((Byte64Vector) v);  // specialize
+    public ByteVector64 selectFrom(Vector<Byte> v) {
+        return (ByteVector64)
+            super.selectFromTemplate((ByteVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector selectFrom(Vector<Byte> v,
+    public ByteVector64 selectFrom(Vector<Byte> v,
                                    VectorMask<Byte> m) {
-        return (Byte64Vector)
-            super.selectFromTemplate((Byte64Vector) v,
-                                     Byte64Mask.class, (Byte64Mask) m);  // specialize
+        return (ByteVector64)
+            super.selectFromTemplate((ByteVector64) v,
+                                     ByteMask64.class, (ByteMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Byte64Vector selectFrom(Vector<Byte> v1,
+    public ByteVector64 selectFrom(Vector<Byte> v1,
                                    Vector<Byte> v2) {
-        return (Byte64Vector)
-            super.selectFromTemplate((Byte64Vector) v1, (Byte64Vector) v2);  // specialize
+        return (ByteVector64)
+            super.selectFromTemplate((ByteVector64) v1, (ByteVector64) v2);  // specialize
     }
 
     @ForceInline
@@ -533,7 +545,7 @@ final class Byte64Vector extends ByteVector {
     @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     byte[] vecarr = vec.vec();
@@ -543,7 +555,7 @@ final class Byte64Vector extends ByteVector {
 
     @ForceInline
     @Override
-    public Byte64Vector withLane(int i, byte e) {
+    public ByteVector64 withLane(int i, byte e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -558,9 +570,9 @@ final class Byte64Vector extends ByteVector {
     }
 
     @ForceInline
-    public Byte64Vector withLaneHelper(int i, byte e) {
+    public ByteVector64 withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     byte[] res = v.vec().clone();
@@ -571,19 +583,20 @@ final class Byte64Vector extends ByteVector {
 
     // Mask
 
-    static final class Byte64Mask extends AbstractMask<Byte> {
+    static final class ByteMask64 extends AbstractMask<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte64Mask(boolean[] bits) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteMask64(boolean[] bits) {
             this(bits, 0);
         }
 
-        Byte64Mask(boolean[] bits, int offset) {
+        ByteMask64(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Byte64Mask(boolean val) {
+        ByteMask64(boolean val) {
             super(prepare(val));
         }
 
@@ -616,31 +629,31 @@ final class Byte64Vector extends ByteVector {
         }
 
         @Override
-        Byte64Mask uOp(MUnOp f) {
+        ByteMask64 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Byte64Mask(res);
+            return new ByteMask64(res);
         }
 
         @Override
-        Byte64Mask bOp(VectorMask<Byte> m, MBinOp f) {
+        ByteMask64 bOp(VectorMask<Byte> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Byte64Mask)m).getBits();
+            boolean[] mbits = ((ByteMask64)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Byte64Mask(res);
+            return new ByteMask64(res);
         }
 
         @ForceInline
         @Override
         public final
-        Byte64Vector toVector() {
-            return (Byte64Vector) super.toVectorTemplate();  // specialize
+        ByteVector64 toVector() {
+            return (ByteVector64) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -664,8 +677,8 @@ final class Byte64Vector extends ByteVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -673,25 +686,25 @@ final class Byte64Vector extends ByteVector {
         @Override
         @ForceInline
         /*package-private*/
-        Byte64Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Byte64Mask) VectorSupport.indexPartiallyInUpperRange(
-                Byte64Mask.class, byte.class, VLENGTH, offset, limit,
-                (o, l) -> (Byte64Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ByteMask64 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ByteMask64) VectorSupport.indexPartiallyInUpperRange(
+                ByteMask64.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ByteMask64) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Byte64Mask not() {
+        public ByteMask64 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Byte64Mask compress() {
-            return (Byte64Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Byte64Vector.class, Byte64Mask.class, ETYPE, VLENGTH, null, this,
+        public ByteMask64 compress() {
+            return (ByteMask64)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ByteVector64.class, ByteMask64.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -700,30 +713,30 @@ final class Byte64Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public Byte64Mask and(VectorMask<Byte> mask) {
+        public ByteMask64 and(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte64Mask m = (Byte64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Byte64Mask.class, null, byte.class, VLENGTH,
+            ByteMask64 m = (ByteMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ByteMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Byte64Mask or(VectorMask<Byte> mask) {
+        public ByteMask64 or(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte64Mask m = (Byte64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Byte64Mask.class, null, byte.class, VLENGTH,
+            ByteMask64 m = (ByteMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ByteMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Byte64Mask xor(VectorMask<Byte> mask) {
+        public ByteMask64 xor(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            Byte64Mask m = (Byte64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Byte64Mask.class, null, byte.class, VLENGTH,
+            ByteMask64 m = (ByteMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ByteMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -733,21 +746,21 @@ final class Byte64Vector extends ByteVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Byte64Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Byte64Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Byte64Mask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -757,7 +770,7 @@ final class Byte64Vector extends ByteVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Byte64Mask.class, byte.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -767,7 +780,7 @@ final class Byte64Vector extends ByteVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Byte64Mask.class, byte.class, VLENGTH,
+            return VectorSupport.extract(ByteMask64.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -776,48 +789,49 @@ final class Byte64Vector extends ByteVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Byte64Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Byte64Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ByteMask64)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Byte64Mask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Byte64Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ByteMask64)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Byte64Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Byte64Mask.class, byte.class, VLENGTH,
+        static ByteMask64 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ByteMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Byte64Mask  TRUE_MASK = new Byte64Mask(true);
-        private static final Byte64Mask FALSE_MASK = new Byte64Mask(false);
+        private static final ByteMask64  TRUE_MASK = new ByteMask64(true);
+        private static final ByteMask64 FALSE_MASK = new ByteMask64(false);
 
     }
 
     // Shuffle
 
-    static final class Byte64Shuffle extends AbstractShuffle<Byte> {
+    static final class ByteShuffle64 extends AbstractShuffle<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        Byte64Shuffle(byte[] indices) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteShuffle64(byte[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Byte64Shuffle(int[] indices, int i) {
+        ByteShuffle64(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Byte64Shuffle(IntUnaryOperator fn) {
+        ByteShuffle64(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -837,23 +851,23 @@ final class Byte64Vector extends ByteVector {
             assert(VLENGTH < Byte.MAX_VALUE);
             assert(Byte.MIN_VALUE <= -VLENGTH);
         }
-        static final Byte64Shuffle IOTA = new Byte64Shuffle(IDENTITY);
+        static final ByteShuffle64 IOTA = new ByteShuffle64(IDENTITY);
 
         @Override
         @ForceInline
-        public Byte64Vector toVector() {
+        public ByteVector64 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Byte64Vector toBitsVector() {
-            return (Byte64Vector) super.toBitsVectorTemplate();
+        ByteVector64 toBitsVector() {
+            return (ByteVector64) super.toBitsVectorTemplate();
         }
 
         @Override
-        Byte64Vector toBitsVector0() {
-            return ((Byte64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ByteVector64 toBitsVector0() {
+            return ((ByteVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -902,30 +916,30 @@ final class Byte64Vector extends ByteVector {
 
         @Override
         @ForceInline
-        public final Byte64Mask laneIsValid() {
-            return (Byte64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ByteMask64 laneIsValid() {
+            return (ByteMask64) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Byte64Shuffle rearrange(VectorShuffle<Byte> shuffle) {
-            Byte64Shuffle concreteShuffle = (Byte64Shuffle) shuffle;
-            return (Byte64Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ByteShuffle64 rearrange(VectorShuffle<Byte> shuffle) {
+            ByteShuffle64 concreteShuffle = (ByteShuffle64) shuffle;
+            return (ByteShuffle64) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Byte64Shuffle wrapIndexes() {
-            Byte64Vector v = toBitsVector();
+        public final ByteShuffle64 wrapIndexes() {
+            ByteVector64 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Byte64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ByteVector64) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Byte64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ByteVector64) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Byte64Shuffle) v.toShuffle(vspecies(), false);
+            return (ByteShuffle64) v.toShuffle(vspecies(), false);
         }
 
         private static byte[] prepare(int[] indices, int offset) {
@@ -976,14 +990,14 @@ final class Byte64Vector extends ByteVector {
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromArray0Template(Byte64Mask.class, a, offset, (Byte64Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ByteMask64.class, a, offset, (ByteMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
-        return super.fromArray0Template(Byte64Mask.class, a, offset, indexMap, mapOffset, (Byte64Mask) m);
+        return super.fromArray0Template(ByteMask64.class, a, offset, indexMap, mapOffset, (ByteMask64) m);
     }
 
 
@@ -998,7 +1012,7 @@ final class Byte64Vector extends ByteVector {
     @Override
     final
     ByteVector fromBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromBooleanArray0Template(Byte64Mask.class, a, offset, (Byte64Mask) m, offsetInRange);  // specialize
+        return super.fromBooleanArray0Template(ByteMask64.class, a, offset, (ByteMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1012,7 +1026,7 @@ final class Byte64Vector extends ByteVector {
     @Override
     final
     ByteVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Byte64Mask.class, ms, offset, (Byte64Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ByteMask64.class, ms, offset, (ByteMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1026,7 +1040,7 @@ final class Byte64Vector extends ByteVector {
     @Override
     final
     void intoArray0(byte[] a, int offset, VectorMask<Byte> m) {
-        super.intoArray0Template(Byte64Mask.class, a, offset, (Byte64Mask) m);
+        super.intoArray0Template(ByteMask64.class, a, offset, (ByteMask64) m);
     }
 
 
@@ -1034,14 +1048,14 @@ final class Byte64Vector extends ByteVector {
     @Override
     final
     void intoBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m) {
-        super.intoBooleanArray0Template(Byte64Mask.class, a, offset, (Byte64Mask) m);
+        super.intoBooleanArray0Template(ByteMask64.class, a, offset, (ByteMask64) m);
     }
 
     @ForceInline
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m) {
-        super.intoMemorySegment0Template(Byte64Mask.class, ms, offset, (Byte64Mask) m);
+        super.intoMemorySegment0Template(ByteMask64.class, ms, offset, (ByteMask64) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVectorMax.java
similarity index 64%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVectorMax.java
index 3ac62409a95..636aa83893a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVectorMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class ByteMaxVector extends ByteVector {
+final class ByteVectorMax extends ByteVector {
     static final ByteSpecies VSPECIES =
         (ByteSpecies) ByteVector.SPECIES_MAX;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<ByteMaxVector> VCLASS = ByteMaxVector.class;
+    static final Class<ByteVectorMax> VCLASS = ByteVectorMax.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Byte> CTYPE = byte.class; // carrier type used by the JVM
+
     static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-    ByteMaxVector(byte[] v) {
+    ByteVectorMax(byte[] v) {
         super(v);
     }
 
-    // For compatibility as ByteMaxVector::new,
+    // For compatibility as ByteVectorMax::new,
     // stored into species.vectorFactory.
-    ByteMaxVector(Object v) {
+    ByteVectorMax(Object v) {
         this((byte[]) v);
     }
 
-    static final ByteMaxVector ZERO = new ByteMaxVector(new byte[VLENGTH]);
-    static final ByteMaxVector IOTA = new ByteMaxVector(VSPECIES.iotaArray());
+    static final ByteVectorMax ZERO = new ByteVectorMax(new byte[VLENGTH]);
+    static final ByteVectorMax IOTA = new ByteVectorMax(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class ByteMaxVector extends ByteVector {
     @Override
     public final Class<Byte> elementType() { return byte.class; }
 
+    @ForceInline
+    final Class<Byte> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Byte.SIZE; }
@@ -119,55 +124,62 @@ final class ByteMaxVector extends ByteVector {
         return (byte[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final ByteMaxVector broadcast(byte e) {
-        return (ByteMaxVector) super.broadcastTemplate(e);  // specialize
+    public final ByteVectorMax broadcast(byte e) {
+        return (ByteVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ByteMaxVector broadcast(long e) {
-        return (ByteMaxVector) super.broadcastTemplate(e);  // specialize
+    public final ByteVectorMax broadcast(long e) {
+        return (ByteVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    ByteMaxMask maskFromArray(boolean[] bits) {
-        return new ByteMaxMask(bits);
+    ByteMaskMax maskFromArray(boolean[] bits) {
+        return new ByteMaskMax(bits);
     }
 
     @Override
     @ForceInline
-    ByteMaxShuffle iotaShuffle() { return ByteMaxShuffle.IOTA; }
+    ByteShuffleMax iotaShuffle() { return ByteShuffleMax.IOTA; }
 
     @Override
     @ForceInline
-    ByteMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (ByteMaxShuffle) iotaShuffleTemplate((byte) start, (byte) step, wrap);
+    ByteShuffleMax iotaShuffle(int start, int step, boolean wrap) {
+        return (ByteShuffleMax) iotaShuffleTemplate((byte) start, (byte) step, wrap);
     }
 
     @Override
     @ForceInline
-    ByteMaxShuffle shuffleFromArray(int[] indices, int i) { return new ByteMaxShuffle(indices, i); }
+    ByteShuffleMax shuffleFromArray(int[] indices, int i) { return new ByteShuffleMax(indices, i); }
 
     @Override
     @ForceInline
-    ByteMaxShuffle shuffleFromOp(IntUnaryOperator fn) { return new ByteMaxShuffle(fn); }
+    ByteShuffleMax shuffleFromOp(IntUnaryOperator fn) { return new ByteShuffleMax(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    ByteMaxVector vectorFactory(byte[] vec) {
-        return new ByteMaxVector(vec);
+    ByteVectorMax vectorFactory(byte[] vec) {
+        return new ByteVectorMax(vec);
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector asByteVectorRaw() {
-        return (ByteMaxVector) super.asByteVectorRawTemplate();  // specialize
+    ByteVectorMax asByteVectorRaw() {
+        return (ByteVectorMax) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class ByteMaxVector extends ByteVector {
 
     @ForceInline
     final @Override
-    ByteMaxVector uOp(FUnOp f) {
-        return (ByteMaxVector) super.uOpTemplate(f);  // specialize
+    ByteVectorMax uOp(FUnOp f) {
+        return (ByteVectorMax) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector uOp(VectorMask<Byte> m, FUnOp f) {
-        return (ByteMaxVector)
-            super.uOpTemplate((ByteMaxMask)m, f);  // specialize
+    ByteVectorMax uOp(VectorMask<Byte> m, FUnOp f) {
+        return (ByteVectorMax)
+            super.uOpTemplate((ByteMaskMax)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    ByteMaxVector bOp(Vector<Byte> v, FBinOp f) {
-        return (ByteMaxVector) super.bOpTemplate((ByteMaxVector)v, f);  // specialize
+    ByteVectorMax bOp(Vector<Byte> v, FBinOp f) {
+        return (ByteVectorMax) super.bOpTemplate((ByteVectorMax)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector bOp(Vector<Byte> v,
+    ByteVectorMax bOp(Vector<Byte> v,
                      VectorMask<Byte> m, FBinOp f) {
-        return (ByteMaxVector)
-            super.bOpTemplate((ByteMaxVector)v, (ByteMaxMask)m,
+        return (ByteVectorMax)
+            super.bOpTemplate((ByteVectorMax)v, (ByteMaskMax)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class ByteMaxVector extends ByteVector {
 
     @ForceInline
     final @Override
-    ByteMaxVector tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
-        return (ByteMaxVector)
-            super.tOpTemplate((ByteMaxVector)v1, (ByteMaxVector)v2,
+    ByteVectorMax tOp(Vector<Byte> v1, Vector<Byte> v2, FTriOp f) {
+        return (ByteVectorMax)
+            super.tOpTemplate((ByteVectorMax)v1, (ByteVectorMax)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector tOp(Vector<Byte> v1, Vector<Byte> v2,
+    ByteVectorMax tOp(Vector<Byte> v1, Vector<Byte> v2,
                      VectorMask<Byte> m, FTriOp f) {
-        return (ByteMaxVector)
-            super.tOpTemplate((ByteMaxVector)v1, (ByteMaxVector)v2,
-                              (ByteMaxMask)m, f);  // specialize
+        return (ByteVectorMax)
+            super.tOpTemplate((ByteVectorMax)v1, (ByteVectorMax)v2,
+                              (ByteMaskMax)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class ByteMaxVector extends ByteVector {
 
     @Override
     @ForceInline
-    public ByteMaxVector lanewise(Unary op) {
-        return (ByteMaxVector) super.lanewiseTemplate(op);  // specialize
+    public ByteVectorMax lanewise(Unary op) {
+        return (ByteVectorMax) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector lanewise(Unary op, VectorMask<Byte> m) {
-        return (ByteMaxVector) super.lanewiseTemplate(op, ByteMaxMask.class, (ByteMaxMask) m);  // specialize
+    public ByteVectorMax lanewise(Unary op, VectorMask<Byte> m) {
+        return (ByteVectorMax) super.lanewiseTemplate(op, ByteMaskMax.class, (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector lanewise(Binary op, Vector<Byte> v) {
-        return (ByteMaxVector) super.lanewiseTemplate(op, v);  // specialize
+    public ByteVectorMax lanewise(Binary op, Vector<Byte> v) {
+        return (ByteVectorMax) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
-        return (ByteMaxVector) super.lanewiseTemplate(op, ByteMaxMask.class, v, (ByteMaxMask) m);  // specialize
+    public ByteVectorMax lanewise(Binary op, Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVectorMax) super.lanewiseTemplate(op, ByteMaskMax.class, v, (ByteMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline ByteMaxVector
+    @ForceInline ByteVectorMax
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (ByteMaxVector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ByteVectorMax) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline ByteMaxVector
+    @ForceInline ByteVectorMax
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Byte> m) {
-        return (ByteMaxVector) super.lanewiseShiftTemplate(op, ByteMaxMask.class, e, (ByteMaxMask) m);  // specialize
+        return (ByteVectorMax) super.lanewiseShiftTemplate(op, ByteMaskMax.class, e, (ByteMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    ByteMaxVector
+    ByteVectorMax
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2) {
-        return (ByteMaxVector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ByteVectorMax) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    ByteMaxVector
+    ByteVectorMax
     lanewise(Ternary op, Vector<Byte> v1, Vector<Byte> v2, VectorMask<Byte> m) {
-        return (ByteMaxVector) super.lanewiseTemplate(op, ByteMaxMask.class, v1, v2, (ByteMaxMask) m);  // specialize
+        return (ByteVectorMax) super.lanewiseTemplate(op, ByteMaskMax.class, v1, v2, (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    ByteMaxVector addIndex(int scale) {
-        return (ByteMaxVector) super.addIndexTemplate(scale);  // specialize
+    ByteVectorMax addIndex(int scale) {
+        return (ByteVectorMax) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class ByteMaxVector extends ByteVector {
     @ForceInline
     public final byte reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Byte> m) {
-        return super.reduceLanesTemplate(op, ByteMaxMask.class, (ByteMaxMask) m);  // specialized
+        return super.reduceLanesTemplate(op, ByteMaskMax.class, (ByteMaskMax) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class ByteMaxVector extends ByteVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Byte> m) {
-        return (long) super.reduceLanesTemplate(op, ByteMaxMask.class, (ByteMaxMask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ByteMaskMax.class, (ByteMaskMax) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class ByteMaxVector extends ByteVector {
 
     @Override
     @ForceInline
-    public final ByteMaxShuffle toShuffle() {
-        return (ByteMaxShuffle) toShuffle(vspecies(), false);
+    public final ByteShuffleMax toShuffle() {
+        return (ByteShuffleMax) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final ByteMaxMask test(Test op) {
-        return super.testTemplate(ByteMaxMask.class, op);  // specialize
+    public final ByteMaskMax test(Test op) {
+        return super.testTemplate(ByteMaskMax.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ByteMaxMask test(Test op, VectorMask<Byte> m) {
-        return super.testTemplate(ByteMaxMask.class, op, (ByteMaxMask) m);  // specialize
+    public final ByteMaskMax test(Test op, VectorMask<Byte> m) {
+        return super.testTemplate(ByteMaskMax.class, op, (ByteMaskMax) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final ByteMaxMask compare(Comparison op, Vector<Byte> v) {
-        return super.compareTemplate(ByteMaxMask.class, op, v);  // specialize
+    public final ByteMaskMax compare(Comparison op, Vector<Byte> v) {
+        return super.compareTemplate(ByteMaskMax.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ByteMaxMask compare(Comparison op, byte s) {
-        return super.compareTemplate(ByteMaxMask.class, op, s);  // specialize
+    public final ByteMaskMax compare(Comparison op, byte s) {
+        return super.compareTemplate(ByteMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ByteMaxMask compare(Comparison op, long s) {
-        return super.compareTemplate(ByteMaxMask.class, op, s);  // specialize
+    public final ByteMaskMax compare(Comparison op, long s) {
+        return super.compareTemplate(ByteMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ByteMaxMask compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
-        return super.compareTemplate(ByteMaxMask.class, op, v, (ByteMaxMask) m);
+    public final ByteMaskMax compare(Comparison op, Vector<Byte> v, VectorMask<Byte> m) {
+        return super.compareTemplate(ByteMaskMax.class, op, v, (ByteMaskMax) m);
     }
 
 
     @Override
     @ForceInline
-    public ByteMaxVector blend(Vector<Byte> v, VectorMask<Byte> m) {
-        return (ByteMaxVector)
-            super.blendTemplate(ByteMaxMask.class,
-                                (ByteMaxVector) v,
-                                (ByteMaxMask) m);  // specialize
+    public ByteVectorMax blend(Vector<Byte> v, VectorMask<Byte> m) {
+        return (ByteVectorMax)
+            super.blendTemplate(ByteMaskMax.class,
+                                (ByteVectorMax) v,
+                                (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector slice(int origin, Vector<Byte> v) {
-        return (ByteMaxVector) super.sliceTemplate(origin, v);  // specialize
+    public ByteVectorMax slice(int origin, Vector<Byte> v) {
+        return (ByteVectorMax) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector slice(int origin) {
-        return (ByteMaxVector) super.sliceTemplate(origin);  // specialize
+    public ByteVectorMax slice(int origin) {
+        return (ByteVectorMax) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector unslice(int origin, Vector<Byte> w, int part) {
-        return (ByteMaxVector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ByteVectorMax unslice(int origin, Vector<Byte> w, int part) {
+        return (ByteVectorMax) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
-        return (ByteMaxVector)
-            super.unsliceTemplate(ByteMaxMask.class,
+    public ByteVectorMax unslice(int origin, Vector<Byte> w, int part, VectorMask<Byte> m) {
+        return (ByteVectorMax)
+            super.unsliceTemplate(ByteMaskMax.class,
                                   origin, w, part,
-                                  (ByteMaxMask) m);  // specialize
+                                  (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector unslice(int origin) {
-        return (ByteMaxVector) super.unsliceTemplate(origin);  // specialize
+    public ByteVectorMax unslice(int origin) {
+        return (ByteVectorMax) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector rearrange(VectorShuffle<Byte> s) {
-        return (ByteMaxVector)
-            super.rearrangeTemplate(ByteMaxShuffle.class,
-                                    (ByteMaxShuffle) s);  // specialize
+    public ByteVectorMax rearrange(VectorShuffle<Byte> s) {
+        return (ByteVectorMax)
+            super.rearrangeTemplate(ByteShuffleMax.class,
+                                    (ByteShuffleMax) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector rearrange(VectorShuffle<Byte> shuffle,
+    public ByteVectorMax rearrange(VectorShuffle<Byte> shuffle,
                                   VectorMask<Byte> m) {
-        return (ByteMaxVector)
-            super.rearrangeTemplate(ByteMaxShuffle.class,
-                                    ByteMaxMask.class,
-                                    (ByteMaxShuffle) shuffle,
-                                    (ByteMaxMask) m);  // specialize
+        return (ByteVectorMax)
+            super.rearrangeTemplate(ByteShuffleMax.class,
+                                    ByteMaskMax.class,
+                                    (ByteShuffleMax) shuffle,
+                                    (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector rearrange(VectorShuffle<Byte> s,
+    public ByteVectorMax rearrange(VectorShuffle<Byte> s,
                                   Vector<Byte> v) {
-        return (ByteMaxVector)
-            super.rearrangeTemplate(ByteMaxShuffle.class,
-                                    (ByteMaxShuffle) s,
-                                    (ByteMaxVector) v);  // specialize
+        return (ByteVectorMax)
+            super.rearrangeTemplate(ByteShuffleMax.class,
+                                    (ByteShuffleMax) s,
+                                    (ByteVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector compress(VectorMask<Byte> m) {
-        return (ByteMaxVector)
-            super.compressTemplate(ByteMaxMask.class,
-                                   (ByteMaxMask) m);  // specialize
+    public ByteVectorMax compress(VectorMask<Byte> m) {
+        return (ByteVectorMax)
+            super.compressTemplate(ByteMaskMax.class,
+                                   (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector expand(VectorMask<Byte> m) {
-        return (ByteMaxVector)
-            super.expandTemplate(ByteMaxMask.class,
-                                   (ByteMaxMask) m);  // specialize
+    public ByteVectorMax expand(VectorMask<Byte> m) {
+        return (ByteVectorMax)
+            super.expandTemplate(ByteMaskMax.class,
+                                   (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector selectFrom(Vector<Byte> v) {
-        return (ByteMaxVector)
-            super.selectFromTemplate((ByteMaxVector) v);  // specialize
+    public ByteVectorMax selectFrom(Vector<Byte> v) {
+        return (ByteVectorMax)
+            super.selectFromTemplate((ByteVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector selectFrom(Vector<Byte> v,
+    public ByteVectorMax selectFrom(Vector<Byte> v,
                                    VectorMask<Byte> m) {
-        return (ByteMaxVector)
-            super.selectFromTemplate((ByteMaxVector) v,
-                                     ByteMaxMask.class, (ByteMaxMask) m);  // specialize
+        return (ByteVectorMax)
+            super.selectFromTemplate((ByteVectorMax) v,
+                                     ByteMaskMax.class, (ByteMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ByteMaxVector selectFrom(Vector<Byte> v1,
+    public ByteVectorMax selectFrom(Vector<Byte> v1,
                                    Vector<Byte> v2) {
-        return (ByteMaxVector)
-            super.selectFromTemplate((ByteMaxVector) v1, (ByteMaxVector) v2);  // specialize
+        return (ByteVectorMax)
+            super.selectFromTemplate((ByteVectorMax) v1, (ByteVectorMax) v2);  // specialize
     }
 
     @ForceInline
@@ -526,7 +538,7 @@ final class ByteMaxVector extends ByteVector {
     @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     byte[] vecarr = vec.vec();
@@ -536,7 +548,7 @@ final class ByteMaxVector extends ByteVector {
 
     @ForceInline
     @Override
-    public ByteMaxVector withLane(int i, byte e) {
+    public ByteVectorMax withLane(int i, byte e) {
         if (i < 0 || i >= VLENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
         }
@@ -544,9 +556,9 @@ final class ByteMaxVector extends ByteVector {
     }
 
     @ForceInline
-    public ByteMaxVector withLaneHelper(int i, byte e) {
+    public ByteVectorMax withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     byte[] res = v.vec().clone();
@@ -557,19 +569,20 @@ final class ByteMaxVector extends ByteVector {
 
     // Mask
 
-    static final class ByteMaxMask extends AbstractMask<Byte> {
+    static final class ByteMaskMax extends AbstractMask<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        ByteMaxMask(boolean[] bits) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteMaskMax(boolean[] bits) {
             this(bits, 0);
         }
 
-        ByteMaxMask(boolean[] bits, int offset) {
+        ByteMaskMax(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        ByteMaxMask(boolean val) {
+        ByteMaskMax(boolean val) {
             super(prepare(val));
         }
 
@@ -602,31 +615,31 @@ final class ByteMaxVector extends ByteVector {
         }
 
         @Override
-        ByteMaxMask uOp(MUnOp f) {
+        ByteMaskMax uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new ByteMaxMask(res);
+            return new ByteMaskMax(res);
         }
 
         @Override
-        ByteMaxMask bOp(VectorMask<Byte> m, MBinOp f) {
+        ByteMaskMax bOp(VectorMask<Byte> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((ByteMaxMask)m).getBits();
+            boolean[] mbits = ((ByteMaskMax)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new ByteMaxMask(res);
+            return new ByteMaskMax(res);
         }
 
         @ForceInline
         @Override
         public final
-        ByteMaxVector toVector() {
-            return (ByteMaxVector) super.toVectorTemplate();  // specialize
+        ByteVectorMax toVector() {
+            return (ByteVectorMax) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -650,8 +663,8 @@ final class ByteMaxVector extends ByteVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -659,25 +672,25 @@ final class ByteMaxVector extends ByteVector {
         @Override
         @ForceInline
         /*package-private*/
-        ByteMaxMask indexPartiallyInUpperRange(long offset, long limit) {
-            return (ByteMaxMask) VectorSupport.indexPartiallyInUpperRange(
-                ByteMaxMask.class, byte.class, VLENGTH, offset, limit,
-                (o, l) -> (ByteMaxMask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ByteMaskMax indexPartiallyInUpperRange(long offset, long limit) {
+            return (ByteMaskMax) VectorSupport.indexPartiallyInUpperRange(
+                ByteMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ByteMaskMax) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public ByteMaxMask not() {
+        public ByteMaskMax not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public ByteMaxMask compress() {
-            return (ByteMaxMask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                ByteMaxVector.class, ByteMaxMask.class, ETYPE, VLENGTH, null, this,
+        public ByteMaskMax compress() {
+            return (ByteMaskMax)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ByteVectorMax.class, ByteMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -686,30 +699,30 @@ final class ByteMaxVector extends ByteVector {
 
         @Override
         @ForceInline
-        public ByteMaxMask and(VectorMask<Byte> mask) {
+        public ByteMaskMax and(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            ByteMaxMask m = (ByteMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, ByteMaxMask.class, null, byte.class, VLENGTH,
+            ByteMaskMax m = (ByteMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ByteMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public ByteMaxMask or(VectorMask<Byte> mask) {
+        public ByteMaskMax or(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            ByteMaxMask m = (ByteMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, ByteMaxMask.class, null, byte.class, VLENGTH,
+            ByteMaskMax m = (ByteMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ByteMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public ByteMaxMask xor(VectorMask<Byte> mask) {
+        public ByteMaskMax xor(VectorMask<Byte> mask) {
             Objects.requireNonNull(mask);
-            ByteMaxMask m = (ByteMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, ByteMaxMask.class, null, byte.class, VLENGTH,
+            ByteMaskMax m = (ByteMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ByteMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -719,21 +732,21 @@ final class ByteMaxVector extends ByteVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ByteMaxMask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ByteMaxMask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ByteMaxMask.class, byte.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -743,7 +756,7 @@ final class ByteMaxVector extends ByteVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ByteMaxMask.class, byte.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -753,7 +766,7 @@ final class ByteMaxVector extends ByteVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(ByteMaxMask.class, byte.class, VLENGTH,
+            return VectorSupport.extract(ByteMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -762,48 +775,49 @@ final class ByteMaxVector extends ByteVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, ByteMaxMask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((ByteMaxMask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ByteMaskMax)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, ByteMaxMask.class, byte.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((ByteMaxMask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ByteMaskMax)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static ByteMaxMask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(ByteMaxMask.class, byte.class, VLENGTH,
+        static ByteMaskMax maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ByteMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final ByteMaxMask  TRUE_MASK = new ByteMaxMask(true);
-        private static final ByteMaxMask FALSE_MASK = new ByteMaxMask(false);
+        private static final ByteMaskMax  TRUE_MASK = new ByteMaskMax(true);
+        private static final ByteMaskMax FALSE_MASK = new ByteMaskMax(false);
 
     }
 
     // Shuffle
 
-    static final class ByteMaxShuffle extends AbstractShuffle<Byte> {
+    static final class ByteShuffleMax extends AbstractShuffle<Byte> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Byte> ETYPE = byte.class; // used by the JVM
 
-        ByteMaxShuffle(byte[] indices) {
+        static final Class<Byte> CTYPE = byte.class; // used by the JVM
+
+        ByteShuffleMax(byte[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        ByteMaxShuffle(int[] indices, int i) {
+        ByteShuffleMax(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        ByteMaxShuffle(IntUnaryOperator fn) {
+        ByteShuffleMax(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -823,23 +837,23 @@ final class ByteMaxVector extends ByteVector {
             assert(VLENGTH < Byte.MAX_VALUE);
             assert(Byte.MIN_VALUE <= -VLENGTH);
         }
-        static final ByteMaxShuffle IOTA = new ByteMaxShuffle(IDENTITY);
+        static final ByteShuffleMax IOTA = new ByteShuffleMax(IDENTITY);
 
         @Override
         @ForceInline
-        public ByteMaxVector toVector() {
+        public ByteVectorMax toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        ByteMaxVector toBitsVector() {
-            return (ByteMaxVector) super.toBitsVectorTemplate();
+        ByteVectorMax toBitsVector() {
+            return (ByteVectorMax) super.toBitsVectorTemplate();
         }
 
         @Override
-        ByteMaxVector toBitsVector0() {
-            return ((ByteMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ByteVectorMax toBitsVector0() {
+            return ((ByteVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -888,30 +902,30 @@ final class ByteMaxVector extends ByteVector {
 
         @Override
         @ForceInline
-        public final ByteMaxMask laneIsValid() {
-            return (ByteMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ByteMaskMax laneIsValid() {
+            return (ByteMaskMax) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final ByteMaxShuffle rearrange(VectorShuffle<Byte> shuffle) {
-            ByteMaxShuffle concreteShuffle = (ByteMaxShuffle) shuffle;
-            return (ByteMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ByteShuffleMax rearrange(VectorShuffle<Byte> shuffle) {
+            ByteShuffleMax concreteShuffle = (ByteShuffleMax) shuffle;
+            return (ByteShuffleMax) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final ByteMaxShuffle wrapIndexes() {
-            ByteMaxVector v = toBitsVector();
+        public final ByteShuffleMax wrapIndexes() {
+            ByteVectorMax v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (ByteMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ByteVectorMax) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (ByteMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ByteVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (ByteMaxShuffle) v.toShuffle(vspecies(), false);
+            return (ByteShuffleMax) v.toShuffle(vspecies(), false);
         }
 
         private static byte[] prepare(int[] indices, int offset) {
@@ -962,14 +976,14 @@ final class ByteMaxVector extends ByteVector {
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromArray0Template(ByteMaxMask.class, a, offset, (ByteMaxMask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ByteMaskMax.class, a, offset, (ByteMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ByteVector fromArray0(byte[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Byte> m) {
-        return super.fromArray0Template(ByteMaxMask.class, a, offset, indexMap, mapOffset, (ByteMaxMask) m);
+        return super.fromArray0Template(ByteMaskMax.class, a, offset, indexMap, mapOffset, (ByteMaskMax) m);
     }
 
 
@@ -984,7 +998,7 @@ final class ByteMaxVector extends ByteVector {
     @Override
     final
     ByteVector fromBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromBooleanArray0Template(ByteMaxMask.class, a, offset, (ByteMaxMask) m, offsetInRange);  // specialize
+        return super.fromBooleanArray0Template(ByteMaskMax.class, a, offset, (ByteMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -998,7 +1012,7 @@ final class ByteMaxVector extends ByteVector {
     @Override
     final
     ByteVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(ByteMaxMask.class, ms, offset, (ByteMaxMask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ByteMaskMax.class, ms, offset, (ByteMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1012,7 +1026,7 @@ final class ByteMaxVector extends ByteVector {
     @Override
     final
     void intoArray0(byte[] a, int offset, VectorMask<Byte> m) {
-        super.intoArray0Template(ByteMaxMask.class, a, offset, (ByteMaxMask) m);
+        super.intoArray0Template(ByteMaskMax.class, a, offset, (ByteMaskMax) m);
     }
 
 
@@ -1020,14 +1034,14 @@ final class ByteMaxVector extends ByteVector {
     @Override
     final
     void intoBooleanArray0(boolean[] a, int offset, VectorMask<Byte> m) {
-        super.intoBooleanArray0Template(ByteMaxMask.class, a, offset, (ByteMaxMask) m);
+        super.intoBooleanArray0Template(ByteMaskMax.class, a, offset, (ByteMaskMax) m);
     }
 
     @ForceInline
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Byte> m) {
-        super.intoMemorySegment0Template(ByteMaxMask.class, ms, offset, (ByteMaxMask) m);
+        super.intoMemorySegment0Template(ByteMaskMax.class, ms, offset, (ByteMaskMax) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
index 786cd089ebe..5e7c97dc56d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ public abstract class DoubleVector extends AbstractVector<Double> {
 
     static final ValueLayout.OfDouble ELEMENT_LAYOUT = ValueLayout.JAVA_DOUBLE.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = LT_DOUBLE;
+
+    static final int LANEBITS_TYPE_ORDINAL = LT_LONG;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -80,8 +84,8 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -562,7 +566,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     @ForceInline
     public static DoubleVector zero(VectorSpecies<Double> species) {
         DoubleSpecies vsp = (DoubleSpecies) species;
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), double.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                         toBits(0.0f), MODE_BROADCAST, vsp,
                         ((bits_, s_) -> s_.rvOp(i -> bits_)));
     }
@@ -684,7 +688,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, double.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, DoubleVector::unaryOperations));
     }
@@ -712,7 +716,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, double.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, DoubleVector::unaryOperations));
     }
@@ -720,7 +724,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     @ForceInline
     final
     DoubleVector unaryMathOp(VectorOperators.Unary op) {
-        return VectorMathLibrary.unaryMathOp(op, opCode(op), species(), DoubleVector::unaryOperations,
+        return VectorMathLibrary.unaryMathOp(op, opCode(op), vspecies(), DoubleVector::unaryOperations,
                                              this);
     }
 
@@ -801,7 +805,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, double.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, DoubleVector::binaryOperations));
     }
@@ -839,7 +843,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, double.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, DoubleVector::binaryOperations));
     }
@@ -847,7 +851,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     @ForceInline
     final
     DoubleVector binaryMathOp(VectorOperators.Binary op, DoubleVector that) {
-        return VectorMathLibrary.binaryMathOp(op, opCode(op), species(), DoubleVector::binaryOperations,
+        return VectorMathLibrary.binaryMathOp(op, opCode(op), vspecies(), DoubleVector::binaryOperations,
                                               this, that);
     }
 
@@ -1021,7 +1025,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         tother.check(this);
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, double.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, DoubleVector::ternaryOperations));
     }
@@ -1056,7 +1060,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
 
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, double.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, DoubleVector::ternaryOperations));
     }
@@ -1928,7 +1932,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, double.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Double> m
@@ -1950,7 +1954,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, double.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Double> cmpM
@@ -2077,7 +2081,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     blendTemplate(Class<M> maskType, DoubleVector v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, double.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2094,7 +2098,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), double.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2286,7 +2290,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     DoubleVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, double.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2313,7 +2317,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, double.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2339,7 +2343,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         VectorMask<Double> valid = shuffle.laneIsValid();
         DoubleVector r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, double.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2347,7 +2351,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
                 }));
         DoubleVector r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, double.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2391,7 +2395,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     DoubleVector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (DoubleVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        double.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -2410,7 +2414,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     DoubleVector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (DoubleVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        double.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -2425,7 +2429,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     /*package-private*/
     @ForceInline
     final DoubleVector selectFromTemplate(DoubleVector v) {
-        return (DoubleVector)VectorSupport.selectFromOp(getClass(), null, double.class,
+        return (DoubleVector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -2445,7 +2449,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     DoubleVector selectFromTemplate(DoubleVector v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return (DoubleVector)VectorSupport.selectFromOp(getClass(), masktype, double.class,
+        return (DoubleVector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -2463,7 +2467,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     /*package-private*/
     @ForceInline
     final DoubleVector selectFromTemplate(DoubleVector v1, DoubleVector v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), double.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -2661,7 +2665,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, double.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, DoubleVector::reductionOperations)));
     }
@@ -2679,7 +2683,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, double.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, DoubleVector::reductionOperations)));
     }
@@ -2917,7 +2921,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         // Index vector: vix[0:n] = k -> offset + indexMap[mapOffset + k]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For DoubleMaxVector,  if vector length is non-power-of-two or
+            // For DoubleVectorMax,  if vector length is non-power-of-two or
             // 2048 bits, indexShape of Double species is S_MAX_BIT.
             // Assume that vector length is 2048, then the lane count of Double
             // vector is 32. When converting Double species to int species,
@@ -2925,7 +2929,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -2936,7 +2940,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, null, double.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3119,7 +3123,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         offset = checkFromIndexSize(offset, length(), a.length);
         DoubleSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3208,14 +3212,14 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         // Index vector: vix[0:n] = i -> offset + indexMap[mo + i]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For DoubleMaxVector,  if vector length  is 2048 bits, indexShape
+            // For DoubleVectorMax,  if vector length  is 2048 bits, indexShape
             // of Double species is S_MAX_BIT. and the lane count of Double
             // vector is 32. When converting Double species to int species,
             // indexShape is still S_MAX_BIT, but the lane count of int vector
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3227,7 +3231,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), null, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, null,
@@ -3354,7 +3358,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     DoubleVector fromArray0Template(double[] a, int offset) {
         DoubleSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3371,7 +3375,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         m.check(species());
         DoubleSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3402,7 +3406,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         // Index vector: vix[0:n] = k -> offset + indexMap[mapOffset + k]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For DoubleMaxVector,  if vector length is non-power-of-two or
+            // For DoubleVectorMax,  if vector length is non-power-of-two or
             // 2048 bits, indexShape of Double species is S_MAX_BIT.
             // Assume that vector length is 2048, then the lane count of Double
             // vector is 32. When converting Double species to int species,
@@ -3410,7 +3414,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3422,7 +3426,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, double.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -3439,7 +3443,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     DoubleVector fromMemorySegment0Template(MemorySegment ms, long offset) {
         DoubleSpecies vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, DoubleVector::memorySegmentGet);
@@ -3455,7 +3459,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         DoubleSpecies vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, DoubleVector::memorySegmentGet);
@@ -3473,7 +3477,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     void intoArray0Template(double[] a, int offset) {
         DoubleSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -3490,7 +3494,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         m.check(species());
         DoubleSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -3518,14 +3522,14 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         // Index vector: vix[0:n] = i -> offset + indexMap[mo + i]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For DoubleMaxVector,  if vector length  is 2048 bits, indexShape
+            // For DoubleVectorMax,  if vector length  is 2048 bits, indexShape
             // of Double species is S_MAX_BIT. and the lane count of Double
             // vector is 32. When converting Double species to int species,
             // indexShape is still S_MAX_BIT, but the lane count of int vector
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3538,7 +3542,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, m,
@@ -3557,7 +3561,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         DoubleSpecies vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -3574,7 +3578,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         DoubleSpecies vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -3612,6 +3616,18 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    DoubleVector swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+        int subLanesPerSrc = subLanesToSwap(srcSpecies);
+        if (subLanesPerSrc < 0) {
+            return this;
+        }
+        VectorShuffle<Double> shuffle = normalizeSubLanesForSpecies(this.vspecies(), subLanesPerSrc);
+        return (DoubleVector) this.rearrange(shuffle);
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_DOUBLE_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -3778,7 +3794,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         final DoubleVector broadcastBits(long bits) {
             return (DoubleVector)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, double.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -3960,13 +3976,13 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         @Override
         @ForceInline
         public final DoubleVector zero() {
-            if ((Class<?>) vectorType() == DoubleMaxVector.class)
-                return DoubleMaxVector.ZERO;
+            if ((Class<?>) vectorType() == DoubleVectorMax.class)
+                return DoubleVectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return Double64Vector.ZERO;
-                case 128: return Double128Vector.ZERO;
-                case 256: return Double256Vector.ZERO;
-                case 512: return Double512Vector.ZERO;
+                case 64: return DoubleVector64.ZERO;
+                case 128: return DoubleVector128.ZERO;
+                case 256: return DoubleVector256.ZERO;
+                case 512: return DoubleVector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -3974,13 +3990,13 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         @Override
         @ForceInline
         public final DoubleVector iota() {
-            if ((Class<?>) vectorType() == DoubleMaxVector.class)
-                return DoubleMaxVector.IOTA;
+            if ((Class<?>) vectorType() == DoubleVectorMax.class)
+                return DoubleVectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return Double64Vector.IOTA;
-                case 128: return Double128Vector.IOTA;
-                case 256: return Double256Vector.IOTA;
-                case 512: return Double512Vector.IOTA;
+                case 64: return DoubleVector64.IOTA;
+                case 128: return DoubleVector128.IOTA;
+                case 256: return DoubleVector256.IOTA;
+                case 512: return DoubleVector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -3989,13 +4005,13 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         @Override
         @ForceInline
         public final VectorMask<Double> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == DoubleMaxVector.class)
-                return DoubleMaxVector.DoubleMaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == DoubleVectorMax.class)
+                return DoubleVectorMax.DoubleMaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return Double64Vector.Double64Mask.maskAll(bit);
-                case 128: return Double128Vector.Double128Mask.maskAll(bit);
-                case 256: return Double256Vector.Double256Mask.maskAll(bit);
-                case 512: return Double512Vector.Double512Mask.maskAll(bit);
+                case 64: return DoubleVector64.DoubleMask64.maskAll(bit);
+                case 128: return DoubleVector128.DoubleMask128.maskAll(bit);
+                case 256: return DoubleVector256.DoubleMask256.maskAll(bit);
+                case 512: return DoubleVector512.DoubleMask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -4023,42 +4039,42 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     /** Species representing {@link DoubleVector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<Double> SPECIES_64
         = new DoubleSpecies(VectorShape.S_64_BIT,
-                            Double64Vector.class,
-                            Double64Vector.Double64Mask.class,
-                            Double64Vector.Double64Shuffle.class,
-                            Double64Vector::new);
+                            DoubleVector64.class,
+                            DoubleVector64.DoubleMask64.class,
+                            DoubleVector64.DoubleShuffle64.class,
+                            DoubleVector64::new);
 
     /** Species representing {@link DoubleVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<Double> SPECIES_128
         = new DoubleSpecies(VectorShape.S_128_BIT,
-                            Double128Vector.class,
-                            Double128Vector.Double128Mask.class,
-                            Double128Vector.Double128Shuffle.class,
-                            Double128Vector::new);
+                            DoubleVector128.class,
+                            DoubleVector128.DoubleMask128.class,
+                            DoubleVector128.DoubleShuffle128.class,
+                            DoubleVector128::new);
 
     /** Species representing {@link DoubleVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<Double> SPECIES_256
         = new DoubleSpecies(VectorShape.S_256_BIT,
-                            Double256Vector.class,
-                            Double256Vector.Double256Mask.class,
-                            Double256Vector.Double256Shuffle.class,
-                            Double256Vector::new);
+                            DoubleVector256.class,
+                            DoubleVector256.DoubleMask256.class,
+                            DoubleVector256.DoubleShuffle256.class,
+                            DoubleVector256::new);
 
     /** Species representing {@link DoubleVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<Double> SPECIES_512
         = new DoubleSpecies(VectorShape.S_512_BIT,
-                            Double512Vector.class,
-                            Double512Vector.Double512Mask.class,
-                            Double512Vector.Double512Shuffle.class,
-                            Double512Vector::new);
+                            DoubleVector512.class,
+                            DoubleVector512.DoubleMask512.class,
+                            DoubleVector512.DoubleShuffle512.class,
+                            DoubleVector512::new);
 
     /** Species representing {@link DoubleVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<Double> SPECIES_MAX
         = new DoubleSpecies(VectorShape.S_Max_BIT,
-                            DoubleMaxVector.class,
-                            DoubleMaxVector.DoubleMaxMask.class,
-                            DoubleMaxVector.DoubleMaxShuffle.class,
-                            DoubleMaxVector::new);
+                            DoubleVectorMax.class,
+                            DoubleVectorMax.DoubleMaskMax.class,
+                            DoubleVectorMax.DoubleShuffleMax.class,
+                            DoubleVectorMax::new);
 
     /**
      * Preferred species for {@link DoubleVector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector128.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector128.java
index eaf77d59a23..1140d377e9b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector128.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Double128Vector extends DoubleVector {
+final class DoubleVector128 extends DoubleVector {
     static final DoubleSpecies VSPECIES =
         (DoubleSpecies) DoubleVector.SPECIES_128;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Double128Vector> VCLASS = Double128Vector.class;
+    static final Class<DoubleVector128> VCLASS = DoubleVector128.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Double> CTYPE = double.class; // carrier type used by the JVM
+
     static final Class<Double> ETYPE = double.class; // used by the JVM
 
-    Double128Vector(double[] v) {
+    DoubleVector128(double[] v) {
         super(v);
     }
 
-    // For compatibility as Double128Vector::new,
+    // For compatibility as DoubleVector128::new,
     // stored into species.vectorFactory.
-    Double128Vector(Object v) {
+    DoubleVector128(Object v) {
         this((double[]) v);
     }
 
-    static final Double128Vector ZERO = new Double128Vector(new double[VLENGTH]);
-    static final Double128Vector IOTA = new Double128Vector(VSPECIES.iotaArray());
+    static final DoubleVector128 ZERO = new DoubleVector128(new double[VLENGTH]);
+    static final DoubleVector128 IOTA = new DoubleVector128(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Double128Vector extends DoubleVector {
     @Override
     public final Class<Double> elementType() { return double.class; }
 
+    @ForceInline
+    final Class<Double> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Double.SIZE; }
@@ -119,55 +124,62 @@ final class Double128Vector extends DoubleVector {
         return (double[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Double128Vector broadcast(double e) {
-        return (Double128Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector128 broadcast(double e) {
+        return (DoubleVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double128Vector broadcast(long e) {
-        return (Double128Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector128 broadcast(long e) {
+        return (DoubleVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Double128Mask maskFromArray(boolean[] bits) {
-        return new Double128Mask(bits);
+    DoubleMask128 maskFromArray(boolean[] bits) {
+        return new DoubleMask128(bits);
     }
 
     @Override
     @ForceInline
-    Double128Shuffle iotaShuffle() { return Double128Shuffle.IOTA; }
+    DoubleShuffle128 iotaShuffle() { return DoubleShuffle128.IOTA; }
 
     @Override
     @ForceInline
-    Double128Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Double128Shuffle) iotaShuffleTemplate(start, step, wrap);
+    DoubleShuffle128 iotaShuffle(int start, int step, boolean wrap) {
+        return (DoubleShuffle128) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Double128Shuffle shuffleFromArray(int[] indices, int i) { return new Double128Shuffle(indices, i); }
+    DoubleShuffle128 shuffleFromArray(int[] indices, int i) { return new DoubleShuffle128(indices, i); }
 
     @Override
     @ForceInline
-    Double128Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Double128Shuffle(fn); }
+    DoubleShuffle128 shuffleFromOp(IntUnaryOperator fn) { return new DoubleShuffle128(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Double128Vector vectorFactory(double[] vec) {
-        return new Double128Vector(vec);
+    DoubleVector128 vectorFactory(double[] vec) {
+        return new DoubleVector128(vec);
     }
 
     @ForceInline
     final @Override
-    Byte128Vector asByteVectorRaw() {
-        return (Byte128Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector128 asByteVectorRaw() {
+        return (ByteVector128) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Double128Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double128Vector uOp(FUnOp f) {
-        return (Double128Vector) super.uOpTemplate(f);  // specialize
+    DoubleVector128 uOp(FUnOp f) {
+        return (DoubleVector128) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double128Vector uOp(VectorMask<Double> m, FUnOp f) {
-        return (Double128Vector)
-            super.uOpTemplate((Double128Mask)m, f);  // specialize
+    DoubleVector128 uOp(VectorMask<Double> m, FUnOp f) {
+        return (DoubleVector128)
+            super.uOpTemplate((DoubleMask128)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Double128Vector bOp(Vector<Double> v, FBinOp f) {
-        return (Double128Vector) super.bOpTemplate((Double128Vector)v, f);  // specialize
+    DoubleVector128 bOp(Vector<Double> v, FBinOp f) {
+        return (DoubleVector128) super.bOpTemplate((DoubleVector128)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double128Vector bOp(Vector<Double> v,
+    DoubleVector128 bOp(Vector<Double> v,
                      VectorMask<Double> m, FBinOp f) {
-        return (Double128Vector)
-            super.bOpTemplate((Double128Vector)v, (Double128Mask)m,
+        return (DoubleVector128)
+            super.bOpTemplate((DoubleVector128)v, (DoubleMask128)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Double128Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double128Vector tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
-        return (Double128Vector)
-            super.tOpTemplate((Double128Vector)v1, (Double128Vector)v2,
+    DoubleVector128 tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
+        return (DoubleVector128)
+            super.tOpTemplate((DoubleVector128)v1, (DoubleVector128)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double128Vector tOp(Vector<Double> v1, Vector<Double> v2,
+    DoubleVector128 tOp(Vector<Double> v1, Vector<Double> v2,
                      VectorMask<Double> m, FTriOp f) {
-        return (Double128Vector)
-            super.tOpTemplate((Double128Vector)v1, (Double128Vector)v2,
-                              (Double128Mask)m, f);  // specialize
+        return (DoubleVector128)
+            super.tOpTemplate((DoubleVector128)v1, (DoubleVector128)v2,
+                              (DoubleMask128)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Double128Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public Double128Vector lanewise(Unary op) {
-        return (Double128Vector) super.lanewiseTemplate(op);  // specialize
+    public DoubleVector128 lanewise(Unary op) {
+        return (DoubleVector128) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector lanewise(Unary op, VectorMask<Double> m) {
-        return (Double128Vector) super.lanewiseTemplate(op, Double128Mask.class, (Double128Mask) m);  // specialize
+    public DoubleVector128 lanewise(Unary op, VectorMask<Double> m) {
+        return (DoubleVector128) super.lanewiseTemplate(op, DoubleMask128.class, (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector lanewise(Binary op, Vector<Double> v) {
-        return (Double128Vector) super.lanewiseTemplate(op, v);  // specialize
+    public DoubleVector128 lanewise(Binary op, Vector<Double> v) {
+        return (DoubleVector128) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
-        return (Double128Vector) super.lanewiseTemplate(op, Double128Mask.class, v, (Double128Mask) m);  // specialize
+    public DoubleVector128 lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector128) super.lanewiseTemplate(op, DoubleMask128.class, v, (DoubleMask128) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Double128Vector extends DoubleVector {
     @Override
     @ForceInline
     public final
-    Double128Vector
+    DoubleVector128
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2) {
-        return (Double128Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (DoubleVector128) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double128Vector
+    DoubleVector128
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2, VectorMask<Double> m) {
-        return (Double128Vector) super.lanewiseTemplate(op, Double128Mask.class, v1, v2, (Double128Mask) m);  // specialize
+        return (DoubleVector128) super.lanewiseTemplate(op, DoubleMask128.class, v1, v2, (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double128Vector addIndex(int scale) {
-        return (Double128Vector) super.addIndexTemplate(scale);  // specialize
+    DoubleVector128 addIndex(int scale) {
+        return (DoubleVector128) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Double128Vector extends DoubleVector {
     @ForceInline
     public final double reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Double> m) {
-        return super.reduceLanesTemplate(op, Double128Mask.class, (Double128Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, DoubleMask128.class, (DoubleMask128) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Double128Vector extends DoubleVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Double> m) {
-        return (long) super.reduceLanesTemplate(op, Double128Mask.class, (Double128Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, DoubleMask128.class, (DoubleMask128) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Double128Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public final Double128Shuffle toShuffle() {
-        return (Double128Shuffle) toShuffle(vspecies(), false);
+    public final DoubleShuffle128 toShuffle() {
+        return (DoubleShuffle128) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Double128Mask test(Test op) {
-        return super.testTemplate(Double128Mask.class, op);  // specialize
+    public final DoubleMask128 test(Test op) {
+        return super.testTemplate(DoubleMask128.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double128Mask test(Test op, VectorMask<Double> m) {
-        return super.testTemplate(Double128Mask.class, op, (Double128Mask) m);  // specialize
+    public final DoubleMask128 test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(DoubleMask128.class, op, (DoubleMask128) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Double128Mask compare(Comparison op, Vector<Double> v) {
-        return super.compareTemplate(Double128Mask.class, op, v);  // specialize
+    public final DoubleMask128 compare(Comparison op, Vector<Double> v) {
+        return super.compareTemplate(DoubleMask128.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double128Mask compare(Comparison op, double s) {
-        return super.compareTemplate(Double128Mask.class, op, s);  // specialize
+    public final DoubleMask128 compare(Comparison op, double s) {
+        return super.compareTemplate(DoubleMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double128Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Double128Mask.class, op, s);  // specialize
+    public final DoubleMask128 compare(Comparison op, long s) {
+        return super.compareTemplate(DoubleMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double128Mask compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
-        return super.compareTemplate(Double128Mask.class, op, v, (Double128Mask) m);
+    public final DoubleMask128 compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
+        return super.compareTemplate(DoubleMask128.class, op, v, (DoubleMask128) m);
     }
 
 
     @Override
     @ForceInline
-    public Double128Vector blend(Vector<Double> v, VectorMask<Double> m) {
-        return (Double128Vector)
-            super.blendTemplate(Double128Mask.class,
-                                (Double128Vector) v,
-                                (Double128Mask) m);  // specialize
+    public DoubleVector128 blend(Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector128)
+            super.blendTemplate(DoubleMask128.class,
+                                (DoubleVector128) v,
+                                (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector slice(int origin, Vector<Double> v) {
-        return (Double128Vector) super.sliceTemplate(origin, v);  // specialize
+    public DoubleVector128 slice(int origin, Vector<Double> v) {
+        return (DoubleVector128) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector slice(int origin) {
-        return (Double128Vector) super.sliceTemplate(origin);  // specialize
+    public DoubleVector128 slice(int origin) {
+        return (DoubleVector128) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector unslice(int origin, Vector<Double> w, int part) {
-        return (Double128Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public DoubleVector128 unslice(int origin, Vector<Double> w, int part) {
+        return (DoubleVector128) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
-        return (Double128Vector)
-            super.unsliceTemplate(Double128Mask.class,
+    public DoubleVector128 unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
+        return (DoubleVector128)
+            super.unsliceTemplate(DoubleMask128.class,
                                   origin, w, part,
-                                  (Double128Mask) m);  // specialize
+                                  (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector unslice(int origin) {
-        return (Double128Vector) super.unsliceTemplate(origin);  // specialize
+    public DoubleVector128 unslice(int origin) {
+        return (DoubleVector128) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector rearrange(VectorShuffle<Double> s) {
-        return (Double128Vector)
-            super.rearrangeTemplate(Double128Shuffle.class,
-                                    (Double128Shuffle) s);  // specialize
+    public DoubleVector128 rearrange(VectorShuffle<Double> s) {
+        return (DoubleVector128)
+            super.rearrangeTemplate(DoubleShuffle128.class,
+                                    (DoubleShuffle128) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector rearrange(VectorShuffle<Double> shuffle,
+    public DoubleVector128 rearrange(VectorShuffle<Double> shuffle,
                                   VectorMask<Double> m) {
-        return (Double128Vector)
-            super.rearrangeTemplate(Double128Shuffle.class,
-                                    Double128Mask.class,
-                                    (Double128Shuffle) shuffle,
-                                    (Double128Mask) m);  // specialize
+        return (DoubleVector128)
+            super.rearrangeTemplate(DoubleShuffle128.class,
+                                    DoubleMask128.class,
+                                    (DoubleShuffle128) shuffle,
+                                    (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector rearrange(VectorShuffle<Double> s,
+    public DoubleVector128 rearrange(VectorShuffle<Double> s,
                                   Vector<Double> v) {
-        return (Double128Vector)
-            super.rearrangeTemplate(Double128Shuffle.class,
-                                    (Double128Shuffle) s,
-                                    (Double128Vector) v);  // specialize
+        return (DoubleVector128)
+            super.rearrangeTemplate(DoubleShuffle128.class,
+                                    (DoubleShuffle128) s,
+                                    (DoubleVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector compress(VectorMask<Double> m) {
-        return (Double128Vector)
-            super.compressTemplate(Double128Mask.class,
-                                   (Double128Mask) m);  // specialize
+    public DoubleVector128 compress(VectorMask<Double> m) {
+        return (DoubleVector128)
+            super.compressTemplate(DoubleMask128.class,
+                                   (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector expand(VectorMask<Double> m) {
-        return (Double128Vector)
-            super.expandTemplate(Double128Mask.class,
-                                   (Double128Mask) m);  // specialize
+    public DoubleVector128 expand(VectorMask<Double> m) {
+        return (DoubleVector128)
+            super.expandTemplate(DoubleMask128.class,
+                                   (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector selectFrom(Vector<Double> v) {
-        return (Double128Vector)
-            super.selectFromTemplate((Double128Vector) v);  // specialize
+    public DoubleVector128 selectFrom(Vector<Double> v) {
+        return (DoubleVector128)
+            super.selectFromTemplate((DoubleVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector selectFrom(Vector<Double> v,
+    public DoubleVector128 selectFrom(Vector<Double> v,
                                    VectorMask<Double> m) {
-        return (Double128Vector)
-            super.selectFromTemplate((Double128Vector) v,
-                                     Double128Mask.class, (Double128Mask) m);  // specialize
+        return (DoubleVector128)
+            super.selectFromTemplate((DoubleVector128) v,
+                                     DoubleMask128.class, (DoubleMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double128Vector selectFrom(Vector<Double> v1,
+    public DoubleVector128 selectFrom(Vector<Double> v1,
                                    Vector<Double> v2) {
-        return (Double128Vector)
-            super.selectFromTemplate((Double128Vector) v1, (Double128Vector) v2);  // specialize
+        return (DoubleVector128)
+            super.selectFromTemplate((DoubleVector128) v1, (DoubleVector128) v2);  // specialize
     }
 
     @ForceInline
@@ -516,7 +528,7 @@ final class Double128Vector extends DoubleVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      double[] vecarr = vec.vec();
@@ -526,7 +538,7 @@ final class Double128Vector extends DoubleVector {
 
     @ForceInline
     @Override
-    public Double128Vector withLane(int i, double e) {
+    public DoubleVector128 withLane(int i, double e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -535,9 +547,9 @@ final class Double128Vector extends DoubleVector {
     }
 
     @ForceInline
-    public Double128Vector withLaneHelper(int i, double e) {
+    public DoubleVector128 withLaneHelper(int i, double e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Double.doubleToRawLongBits(e),
                                 (v, ix, bits) -> {
                                     double[] res = v.vec().clone();
@@ -548,19 +560,20 @@ final class Double128Vector extends DoubleVector {
 
     // Mask
 
-    static final class Double128Mask extends AbstractMask<Double> {
+    static final class DoubleMask128 extends AbstractMask<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Double> ETYPE = double.class; // used by the JVM
 
-        Double128Mask(boolean[] bits) {
+        static final Class<Double> CTYPE = double.class; // used by the JVM
+
+        DoubleMask128(boolean[] bits) {
             this(bits, 0);
         }
 
-        Double128Mask(boolean[] bits, int offset) {
+        DoubleMask128(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Double128Mask(boolean val) {
+        DoubleMask128(boolean val) {
             super(prepare(val));
         }
 
@@ -593,31 +606,31 @@ final class Double128Vector extends DoubleVector {
         }
 
         @Override
-        Double128Mask uOp(MUnOp f) {
+        DoubleMask128 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Double128Mask(res);
+            return new DoubleMask128(res);
         }
 
         @Override
-        Double128Mask bOp(VectorMask<Double> m, MBinOp f) {
+        DoubleMask128 bOp(VectorMask<Double> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Double128Mask)m).getBits();
+            boolean[] mbits = ((DoubleMask128)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Double128Mask(res);
+            return new DoubleMask128(res);
         }
 
         @ForceInline
         @Override
         public final
-        Double128Vector toVector() {
-            return (Double128Vector) super.toVectorTemplate();  // specialize
+        DoubleVector128 toVector() {
+            return (DoubleVector128) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -641,8 +654,8 @@ final class Double128Vector extends DoubleVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -650,25 +663,25 @@ final class Double128Vector extends DoubleVector {
         @Override
         @ForceInline
         /*package-private*/
-        Double128Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Double128Mask) VectorSupport.indexPartiallyInUpperRange(
-                Double128Mask.class, double.class, VLENGTH, offset, limit,
-                (o, l) -> (Double128Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        DoubleMask128 indexPartiallyInUpperRange(long offset, long limit) {
+            return (DoubleMask128) VectorSupport.indexPartiallyInUpperRange(
+                DoubleMask128.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (DoubleMask128) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Double128Mask not() {
+        public DoubleMask128 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Double128Mask compress() {
-            return (Double128Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Double128Vector.class, Double128Mask.class, ETYPE, VLENGTH, null, this,
+        public DoubleMask128 compress() {
+            return (DoubleMask128)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                DoubleVector128.class, DoubleMask128.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -677,30 +690,30 @@ final class Double128Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public Double128Mask and(VectorMask<Double> mask) {
+        public DoubleMask128 and(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double128Mask m = (Double128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Double128Mask.class, null, long.class, VLENGTH,
+            DoubleMask128 m = (DoubleMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, DoubleMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Double128Mask or(VectorMask<Double> mask) {
+        public DoubleMask128 or(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double128Mask m = (Double128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Double128Mask.class, null, long.class, VLENGTH,
+            DoubleMask128 m = (DoubleMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, DoubleMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Double128Mask xor(VectorMask<Double> mask) {
+        public DoubleMask128 xor(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double128Mask m = (Double128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Double128Mask.class, null, long.class, VLENGTH,
+            DoubleMask128 m = (DoubleMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, DoubleMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -710,21 +723,21 @@ final class Double128Vector extends DoubleVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Double128Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Double128Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Double128Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -734,7 +747,7 @@ final class Double128Vector extends DoubleVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Double128Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -744,7 +757,7 @@ final class Double128Vector extends DoubleVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Double128Mask.class, double.class, VLENGTH,
+            return VectorSupport.extract(DoubleMask128.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -753,48 +766,49 @@ final class Double128Vector extends DoubleVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Double128Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Double128Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((DoubleMask128)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Double128Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Double128Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((DoubleMask128)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Double128Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Double128Mask.class, long.class, VLENGTH,
+        static DoubleMask128 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(DoubleMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Double128Mask  TRUE_MASK = new Double128Mask(true);
-        private static final Double128Mask FALSE_MASK = new Double128Mask(false);
+        private static final DoubleMask128  TRUE_MASK = new DoubleMask128(true);
+        private static final DoubleMask128 FALSE_MASK = new DoubleMask128(false);
 
     }
 
     // Shuffle
 
-    static final class Double128Shuffle extends AbstractShuffle<Double> {
+    static final class DoubleShuffle128 extends AbstractShuffle<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Double128Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        DoubleShuffle128(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Double128Shuffle(int[] indices, int i) {
+        DoubleShuffle128(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Double128Shuffle(IntUnaryOperator fn) {
+        DoubleShuffle128(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -814,23 +828,23 @@ final class Double128Vector extends DoubleVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Double128Shuffle IOTA = new Double128Shuffle(IDENTITY);
+        static final DoubleShuffle128 IOTA = new DoubleShuffle128(IDENTITY);
 
         @Override
         @ForceInline
-        public Double128Vector toVector() {
-            return (Double128Vector) toBitsVector().castShape(vspecies(), 0);
+        public DoubleVector128 toVector() {
+            return (DoubleVector128) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Long128Vector toBitsVector() {
-            return (Long128Vector) super.toBitsVectorTemplate();
+        LongVector128 toBitsVector() {
+            return (LongVector128) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long128Vector toBitsVector0() {
-            return ((Long128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector128 toBitsVector0() {
+            return ((LongVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -902,30 +916,30 @@ final class Double128Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public final Double128Mask laneIsValid() {
-            return (Double128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final DoubleMask128 laneIsValid() {
+            return (DoubleMask128) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Double128Shuffle rearrange(VectorShuffle<Double> shuffle) {
-            Double128Shuffle concreteShuffle = (Double128Shuffle) shuffle;
-            return (Double128Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_128))
+        public final DoubleShuffle128 rearrange(VectorShuffle<Double> shuffle) {
+            DoubleShuffle128 concreteShuffle = (DoubleShuffle128) shuffle;
+            return (DoubleShuffle128) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_128))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Double128Shuffle wrapIndexes() {
-            Long128Vector v = toBitsVector();
+        public final DoubleShuffle128 wrapIndexes() {
+            LongVector128 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector128) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector128) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Double128Shuffle) v.toShuffle(vspecies(), false);
+            return (DoubleShuffle128) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -976,14 +990,14 @@ final class Double128Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromArray0Template(Double128Mask.class, a, offset, (Double128Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(DoubleMask128.class, a, offset, (DoubleMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        return super.fromArray0Template(Double128Mask.class, a, offset, indexMap, mapOffset, (Double128Mask) m);
+        return super.fromArray0Template(DoubleMask128.class, a, offset, indexMap, mapOffset, (DoubleMask128) m);
     }
 
 
@@ -999,7 +1013,7 @@ final class Double128Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Double128Mask.class, ms, offset, (Double128Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(DoubleMask128.class, ms, offset, (DoubleMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1013,14 +1027,14 @@ final class Double128Vector extends DoubleVector {
     @Override
     final
     void intoArray0(double[] a, int offset, VectorMask<Double> m) {
-        super.intoArray0Template(Double128Mask.class, a, offset, (Double128Mask) m);
+        super.intoArray0Template(DoubleMask128.class, a, offset, (DoubleMask128) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        super.intoArray0Template(Double128Mask.class, a, offset, indexMap, mapOffset, (Double128Mask) m);
+        super.intoArray0Template(DoubleMask128.class, a, offset, indexMap, mapOffset, (DoubleMask128) m);
     }
 
 
@@ -1028,7 +1042,7 @@ final class Double128Vector extends DoubleVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m) {
-        super.intoMemorySegment0Template(Double128Mask.class, ms, offset, (Double128Mask) m);
+        super.intoMemorySegment0Template(DoubleMask128.class, ms, offset, (DoubleMask128) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector256.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector256.java
index cf9c8794ce4..59b7913cfcb 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Double256Vector extends DoubleVector {
+final class DoubleVector256 extends DoubleVector {
     static final DoubleSpecies VSPECIES =
         (DoubleSpecies) DoubleVector.SPECIES_256;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Double256Vector> VCLASS = Double256Vector.class;
+    static final Class<DoubleVector256> VCLASS = DoubleVector256.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Double> CTYPE = double.class; // carrier type used by the JVM
+
     static final Class<Double> ETYPE = double.class; // used by the JVM
 
-    Double256Vector(double[] v) {
+    DoubleVector256(double[] v) {
         super(v);
     }
 
-    // For compatibility as Double256Vector::new,
+    // For compatibility as DoubleVector256::new,
     // stored into species.vectorFactory.
-    Double256Vector(Object v) {
+    DoubleVector256(Object v) {
         this((double[]) v);
     }
 
-    static final Double256Vector ZERO = new Double256Vector(new double[VLENGTH]);
-    static final Double256Vector IOTA = new Double256Vector(VSPECIES.iotaArray());
+    static final DoubleVector256 ZERO = new DoubleVector256(new double[VLENGTH]);
+    static final DoubleVector256 IOTA = new DoubleVector256(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Double256Vector extends DoubleVector {
     @Override
     public final Class<Double> elementType() { return double.class; }
 
+    @ForceInline
+    final Class<Double> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Double.SIZE; }
@@ -119,55 +124,62 @@ final class Double256Vector extends DoubleVector {
         return (double[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Double256Vector broadcast(double e) {
-        return (Double256Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector256 broadcast(double e) {
+        return (DoubleVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double256Vector broadcast(long e) {
-        return (Double256Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector256 broadcast(long e) {
+        return (DoubleVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Double256Mask maskFromArray(boolean[] bits) {
-        return new Double256Mask(bits);
+    DoubleMask256 maskFromArray(boolean[] bits) {
+        return new DoubleMask256(bits);
     }
 
     @Override
     @ForceInline
-    Double256Shuffle iotaShuffle() { return Double256Shuffle.IOTA; }
+    DoubleShuffle256 iotaShuffle() { return DoubleShuffle256.IOTA; }
 
     @Override
     @ForceInline
-    Double256Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Double256Shuffle) iotaShuffleTemplate(start, step, wrap);
+    DoubleShuffle256 iotaShuffle(int start, int step, boolean wrap) {
+        return (DoubleShuffle256) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Double256Shuffle shuffleFromArray(int[] indices, int i) { return new Double256Shuffle(indices, i); }
+    DoubleShuffle256 shuffleFromArray(int[] indices, int i) { return new DoubleShuffle256(indices, i); }
 
     @Override
     @ForceInline
-    Double256Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Double256Shuffle(fn); }
+    DoubleShuffle256 shuffleFromOp(IntUnaryOperator fn) { return new DoubleShuffle256(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Double256Vector vectorFactory(double[] vec) {
-        return new Double256Vector(vec);
+    DoubleVector256 vectorFactory(double[] vec) {
+        return new DoubleVector256(vec);
     }
 
     @ForceInline
     final @Override
-    Byte256Vector asByteVectorRaw() {
-        return (Byte256Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector256 asByteVectorRaw() {
+        return (ByteVector256) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Double256Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double256Vector uOp(FUnOp f) {
-        return (Double256Vector) super.uOpTemplate(f);  // specialize
+    DoubleVector256 uOp(FUnOp f) {
+        return (DoubleVector256) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double256Vector uOp(VectorMask<Double> m, FUnOp f) {
-        return (Double256Vector)
-            super.uOpTemplate((Double256Mask)m, f);  // specialize
+    DoubleVector256 uOp(VectorMask<Double> m, FUnOp f) {
+        return (DoubleVector256)
+            super.uOpTemplate((DoubleMask256)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Double256Vector bOp(Vector<Double> v, FBinOp f) {
-        return (Double256Vector) super.bOpTemplate((Double256Vector)v, f);  // specialize
+    DoubleVector256 bOp(Vector<Double> v, FBinOp f) {
+        return (DoubleVector256) super.bOpTemplate((DoubleVector256)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double256Vector bOp(Vector<Double> v,
+    DoubleVector256 bOp(Vector<Double> v,
                      VectorMask<Double> m, FBinOp f) {
-        return (Double256Vector)
-            super.bOpTemplate((Double256Vector)v, (Double256Mask)m,
+        return (DoubleVector256)
+            super.bOpTemplate((DoubleVector256)v, (DoubleMask256)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Double256Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double256Vector tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
-        return (Double256Vector)
-            super.tOpTemplate((Double256Vector)v1, (Double256Vector)v2,
+    DoubleVector256 tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
+        return (DoubleVector256)
+            super.tOpTemplate((DoubleVector256)v1, (DoubleVector256)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double256Vector tOp(Vector<Double> v1, Vector<Double> v2,
+    DoubleVector256 tOp(Vector<Double> v1, Vector<Double> v2,
                      VectorMask<Double> m, FTriOp f) {
-        return (Double256Vector)
-            super.tOpTemplate((Double256Vector)v1, (Double256Vector)v2,
-                              (Double256Mask)m, f);  // specialize
+        return (DoubleVector256)
+            super.tOpTemplate((DoubleVector256)v1, (DoubleVector256)v2,
+                              (DoubleMask256)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Double256Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public Double256Vector lanewise(Unary op) {
-        return (Double256Vector) super.lanewiseTemplate(op);  // specialize
+    public DoubleVector256 lanewise(Unary op) {
+        return (DoubleVector256) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector lanewise(Unary op, VectorMask<Double> m) {
-        return (Double256Vector) super.lanewiseTemplate(op, Double256Mask.class, (Double256Mask) m);  // specialize
+    public DoubleVector256 lanewise(Unary op, VectorMask<Double> m) {
+        return (DoubleVector256) super.lanewiseTemplate(op, DoubleMask256.class, (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector lanewise(Binary op, Vector<Double> v) {
-        return (Double256Vector) super.lanewiseTemplate(op, v);  // specialize
+    public DoubleVector256 lanewise(Binary op, Vector<Double> v) {
+        return (DoubleVector256) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
-        return (Double256Vector) super.lanewiseTemplate(op, Double256Mask.class, v, (Double256Mask) m);  // specialize
+    public DoubleVector256 lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector256) super.lanewiseTemplate(op, DoubleMask256.class, v, (DoubleMask256) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Double256Vector extends DoubleVector {
     @Override
     @ForceInline
     public final
-    Double256Vector
+    DoubleVector256
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2) {
-        return (Double256Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (DoubleVector256) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double256Vector
+    DoubleVector256
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2, VectorMask<Double> m) {
-        return (Double256Vector) super.lanewiseTemplate(op, Double256Mask.class, v1, v2, (Double256Mask) m);  // specialize
+        return (DoubleVector256) super.lanewiseTemplate(op, DoubleMask256.class, v1, v2, (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double256Vector addIndex(int scale) {
-        return (Double256Vector) super.addIndexTemplate(scale);  // specialize
+    DoubleVector256 addIndex(int scale) {
+        return (DoubleVector256) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Double256Vector extends DoubleVector {
     @ForceInline
     public final double reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Double> m) {
-        return super.reduceLanesTemplate(op, Double256Mask.class, (Double256Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, DoubleMask256.class, (DoubleMask256) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Double256Vector extends DoubleVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Double> m) {
-        return (long) super.reduceLanesTemplate(op, Double256Mask.class, (Double256Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, DoubleMask256.class, (DoubleMask256) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Double256Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public final Double256Shuffle toShuffle() {
-        return (Double256Shuffle) toShuffle(vspecies(), false);
+    public final DoubleShuffle256 toShuffle() {
+        return (DoubleShuffle256) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Double256Mask test(Test op) {
-        return super.testTemplate(Double256Mask.class, op);  // specialize
+    public final DoubleMask256 test(Test op) {
+        return super.testTemplate(DoubleMask256.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double256Mask test(Test op, VectorMask<Double> m) {
-        return super.testTemplate(Double256Mask.class, op, (Double256Mask) m);  // specialize
+    public final DoubleMask256 test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(DoubleMask256.class, op, (DoubleMask256) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Double256Mask compare(Comparison op, Vector<Double> v) {
-        return super.compareTemplate(Double256Mask.class, op, v);  // specialize
+    public final DoubleMask256 compare(Comparison op, Vector<Double> v) {
+        return super.compareTemplate(DoubleMask256.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double256Mask compare(Comparison op, double s) {
-        return super.compareTemplate(Double256Mask.class, op, s);  // specialize
+    public final DoubleMask256 compare(Comparison op, double s) {
+        return super.compareTemplate(DoubleMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double256Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Double256Mask.class, op, s);  // specialize
+    public final DoubleMask256 compare(Comparison op, long s) {
+        return super.compareTemplate(DoubleMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double256Mask compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
-        return super.compareTemplate(Double256Mask.class, op, v, (Double256Mask) m);
+    public final DoubleMask256 compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
+        return super.compareTemplate(DoubleMask256.class, op, v, (DoubleMask256) m);
     }
 
 
     @Override
     @ForceInline
-    public Double256Vector blend(Vector<Double> v, VectorMask<Double> m) {
-        return (Double256Vector)
-            super.blendTemplate(Double256Mask.class,
-                                (Double256Vector) v,
-                                (Double256Mask) m);  // specialize
+    public DoubleVector256 blend(Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector256)
+            super.blendTemplate(DoubleMask256.class,
+                                (DoubleVector256) v,
+                                (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector slice(int origin, Vector<Double> v) {
-        return (Double256Vector) super.sliceTemplate(origin, v);  // specialize
+    public DoubleVector256 slice(int origin, Vector<Double> v) {
+        return (DoubleVector256) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector slice(int origin) {
-        return (Double256Vector) super.sliceTemplate(origin);  // specialize
+    public DoubleVector256 slice(int origin) {
+        return (DoubleVector256) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector unslice(int origin, Vector<Double> w, int part) {
-        return (Double256Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public DoubleVector256 unslice(int origin, Vector<Double> w, int part) {
+        return (DoubleVector256) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
-        return (Double256Vector)
-            super.unsliceTemplate(Double256Mask.class,
+    public DoubleVector256 unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
+        return (DoubleVector256)
+            super.unsliceTemplate(DoubleMask256.class,
                                   origin, w, part,
-                                  (Double256Mask) m);  // specialize
+                                  (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector unslice(int origin) {
-        return (Double256Vector) super.unsliceTemplate(origin);  // specialize
+    public DoubleVector256 unslice(int origin) {
+        return (DoubleVector256) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector rearrange(VectorShuffle<Double> s) {
-        return (Double256Vector)
-            super.rearrangeTemplate(Double256Shuffle.class,
-                                    (Double256Shuffle) s);  // specialize
+    public DoubleVector256 rearrange(VectorShuffle<Double> s) {
+        return (DoubleVector256)
+            super.rearrangeTemplate(DoubleShuffle256.class,
+                                    (DoubleShuffle256) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector rearrange(VectorShuffle<Double> shuffle,
+    public DoubleVector256 rearrange(VectorShuffle<Double> shuffle,
                                   VectorMask<Double> m) {
-        return (Double256Vector)
-            super.rearrangeTemplate(Double256Shuffle.class,
-                                    Double256Mask.class,
-                                    (Double256Shuffle) shuffle,
-                                    (Double256Mask) m);  // specialize
+        return (DoubleVector256)
+            super.rearrangeTemplate(DoubleShuffle256.class,
+                                    DoubleMask256.class,
+                                    (DoubleShuffle256) shuffle,
+                                    (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector rearrange(VectorShuffle<Double> s,
+    public DoubleVector256 rearrange(VectorShuffle<Double> s,
                                   Vector<Double> v) {
-        return (Double256Vector)
-            super.rearrangeTemplate(Double256Shuffle.class,
-                                    (Double256Shuffle) s,
-                                    (Double256Vector) v);  // specialize
+        return (DoubleVector256)
+            super.rearrangeTemplate(DoubleShuffle256.class,
+                                    (DoubleShuffle256) s,
+                                    (DoubleVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector compress(VectorMask<Double> m) {
-        return (Double256Vector)
-            super.compressTemplate(Double256Mask.class,
-                                   (Double256Mask) m);  // specialize
+    public DoubleVector256 compress(VectorMask<Double> m) {
+        return (DoubleVector256)
+            super.compressTemplate(DoubleMask256.class,
+                                   (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector expand(VectorMask<Double> m) {
-        return (Double256Vector)
-            super.expandTemplate(Double256Mask.class,
-                                   (Double256Mask) m);  // specialize
+    public DoubleVector256 expand(VectorMask<Double> m) {
+        return (DoubleVector256)
+            super.expandTemplate(DoubleMask256.class,
+                                   (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector selectFrom(Vector<Double> v) {
-        return (Double256Vector)
-            super.selectFromTemplate((Double256Vector) v);  // specialize
+    public DoubleVector256 selectFrom(Vector<Double> v) {
+        return (DoubleVector256)
+            super.selectFromTemplate((DoubleVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector selectFrom(Vector<Double> v,
+    public DoubleVector256 selectFrom(Vector<Double> v,
                                    VectorMask<Double> m) {
-        return (Double256Vector)
-            super.selectFromTemplate((Double256Vector) v,
-                                     Double256Mask.class, (Double256Mask) m);  // specialize
+        return (DoubleVector256)
+            super.selectFromTemplate((DoubleVector256) v,
+                                     DoubleMask256.class, (DoubleMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double256Vector selectFrom(Vector<Double> v1,
+    public DoubleVector256 selectFrom(Vector<Double> v1,
                                    Vector<Double> v2) {
-        return (Double256Vector)
-            super.selectFromTemplate((Double256Vector) v1, (Double256Vector) v2);  // specialize
+        return (DoubleVector256)
+            super.selectFromTemplate((DoubleVector256) v1, (DoubleVector256) v2);  // specialize
     }
 
     @ForceInline
@@ -518,7 +530,7 @@ final class Double256Vector extends DoubleVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      double[] vecarr = vec.vec();
@@ -528,7 +540,7 @@ final class Double256Vector extends DoubleVector {
 
     @ForceInline
     @Override
-    public Double256Vector withLane(int i, double e) {
+    public DoubleVector256 withLane(int i, double e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -539,9 +551,9 @@ final class Double256Vector extends DoubleVector {
     }
 
     @ForceInline
-    public Double256Vector withLaneHelper(int i, double e) {
+    public DoubleVector256 withLaneHelper(int i, double e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Double.doubleToRawLongBits(e),
                                 (v, ix, bits) -> {
                                     double[] res = v.vec().clone();
@@ -552,19 +564,20 @@ final class Double256Vector extends DoubleVector {
 
     // Mask
 
-    static final class Double256Mask extends AbstractMask<Double> {
+    static final class DoubleMask256 extends AbstractMask<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Double> ETYPE = double.class; // used by the JVM
 
-        Double256Mask(boolean[] bits) {
+        static final Class<Double> CTYPE = double.class; // used by the JVM
+
+        DoubleMask256(boolean[] bits) {
             this(bits, 0);
         }
 
-        Double256Mask(boolean[] bits, int offset) {
+        DoubleMask256(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Double256Mask(boolean val) {
+        DoubleMask256(boolean val) {
             super(prepare(val));
         }
 
@@ -597,31 +610,31 @@ final class Double256Vector extends DoubleVector {
         }
 
         @Override
-        Double256Mask uOp(MUnOp f) {
+        DoubleMask256 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Double256Mask(res);
+            return new DoubleMask256(res);
         }
 
         @Override
-        Double256Mask bOp(VectorMask<Double> m, MBinOp f) {
+        DoubleMask256 bOp(VectorMask<Double> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Double256Mask)m).getBits();
+            boolean[] mbits = ((DoubleMask256)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Double256Mask(res);
+            return new DoubleMask256(res);
         }
 
         @ForceInline
         @Override
         public final
-        Double256Vector toVector() {
-            return (Double256Vector) super.toVectorTemplate();  // specialize
+        DoubleVector256 toVector() {
+            return (DoubleVector256) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -645,8 +658,8 @@ final class Double256Vector extends DoubleVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -654,25 +667,25 @@ final class Double256Vector extends DoubleVector {
         @Override
         @ForceInline
         /*package-private*/
-        Double256Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Double256Mask) VectorSupport.indexPartiallyInUpperRange(
-                Double256Mask.class, double.class, VLENGTH, offset, limit,
-                (o, l) -> (Double256Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        DoubleMask256 indexPartiallyInUpperRange(long offset, long limit) {
+            return (DoubleMask256) VectorSupport.indexPartiallyInUpperRange(
+                DoubleMask256.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (DoubleMask256) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Double256Mask not() {
+        public DoubleMask256 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Double256Mask compress() {
-            return (Double256Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Double256Vector.class, Double256Mask.class, ETYPE, VLENGTH, null, this,
+        public DoubleMask256 compress() {
+            return (DoubleMask256)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                DoubleVector256.class, DoubleMask256.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -681,30 +694,30 @@ final class Double256Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public Double256Mask and(VectorMask<Double> mask) {
+        public DoubleMask256 and(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double256Mask m = (Double256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Double256Mask.class, null, long.class, VLENGTH,
+            DoubleMask256 m = (DoubleMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, DoubleMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Double256Mask or(VectorMask<Double> mask) {
+        public DoubleMask256 or(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double256Mask m = (Double256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Double256Mask.class, null, long.class, VLENGTH,
+            DoubleMask256 m = (DoubleMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, DoubleMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Double256Mask xor(VectorMask<Double> mask) {
+        public DoubleMask256 xor(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double256Mask m = (Double256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Double256Mask.class, null, long.class, VLENGTH,
+            DoubleMask256 m = (DoubleMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, DoubleMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -714,21 +727,21 @@ final class Double256Vector extends DoubleVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Double256Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Double256Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Double256Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -738,7 +751,7 @@ final class Double256Vector extends DoubleVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Double256Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -748,7 +761,7 @@ final class Double256Vector extends DoubleVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Double256Mask.class, double.class, VLENGTH,
+            return VectorSupport.extract(DoubleMask256.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -757,48 +770,49 @@ final class Double256Vector extends DoubleVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Double256Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Double256Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((DoubleMask256)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Double256Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Double256Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((DoubleMask256)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Double256Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Double256Mask.class, long.class, VLENGTH,
+        static DoubleMask256 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(DoubleMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Double256Mask  TRUE_MASK = new Double256Mask(true);
-        private static final Double256Mask FALSE_MASK = new Double256Mask(false);
+        private static final DoubleMask256  TRUE_MASK = new DoubleMask256(true);
+        private static final DoubleMask256 FALSE_MASK = new DoubleMask256(false);
 
     }
 
     // Shuffle
 
-    static final class Double256Shuffle extends AbstractShuffle<Double> {
+    static final class DoubleShuffle256 extends AbstractShuffle<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Double256Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        DoubleShuffle256(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Double256Shuffle(int[] indices, int i) {
+        DoubleShuffle256(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Double256Shuffle(IntUnaryOperator fn) {
+        DoubleShuffle256(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -818,23 +832,23 @@ final class Double256Vector extends DoubleVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Double256Shuffle IOTA = new Double256Shuffle(IDENTITY);
+        static final DoubleShuffle256 IOTA = new DoubleShuffle256(IDENTITY);
 
         @Override
         @ForceInline
-        public Double256Vector toVector() {
-            return (Double256Vector) toBitsVector().castShape(vspecies(), 0);
+        public DoubleVector256 toVector() {
+            return (DoubleVector256) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Long256Vector toBitsVector() {
-            return (Long256Vector) super.toBitsVectorTemplate();
+        LongVector256 toBitsVector() {
+            return (LongVector256) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long256Vector toBitsVector0() {
-            return ((Long256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector256 toBitsVector0() {
+            return ((LongVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -906,30 +920,30 @@ final class Double256Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public final Double256Mask laneIsValid() {
-            return (Double256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final DoubleMask256 laneIsValid() {
+            return (DoubleMask256) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Double256Shuffle rearrange(VectorShuffle<Double> shuffle) {
-            Double256Shuffle concreteShuffle = (Double256Shuffle) shuffle;
-            return (Double256Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_256))
+        public final DoubleShuffle256 rearrange(VectorShuffle<Double> shuffle) {
+            DoubleShuffle256 concreteShuffle = (DoubleShuffle256) shuffle;
+            return (DoubleShuffle256) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_256))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Double256Shuffle wrapIndexes() {
-            Long256Vector v = toBitsVector();
+        public final DoubleShuffle256 wrapIndexes() {
+            LongVector256 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector256) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector256) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Double256Shuffle) v.toShuffle(vspecies(), false);
+            return (DoubleShuffle256) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -980,14 +994,14 @@ final class Double256Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromArray0Template(Double256Mask.class, a, offset, (Double256Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(DoubleMask256.class, a, offset, (DoubleMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        return super.fromArray0Template(Double256Mask.class, a, offset, indexMap, mapOffset, (Double256Mask) m);
+        return super.fromArray0Template(DoubleMask256.class, a, offset, indexMap, mapOffset, (DoubleMask256) m);
     }
 
 
@@ -1003,7 +1017,7 @@ final class Double256Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Double256Mask.class, ms, offset, (Double256Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(DoubleMask256.class, ms, offset, (DoubleMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1017,14 +1031,14 @@ final class Double256Vector extends DoubleVector {
     @Override
     final
     void intoArray0(double[] a, int offset, VectorMask<Double> m) {
-        super.intoArray0Template(Double256Mask.class, a, offset, (Double256Mask) m);
+        super.intoArray0Template(DoubleMask256.class, a, offset, (DoubleMask256) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        super.intoArray0Template(Double256Mask.class, a, offset, indexMap, mapOffset, (Double256Mask) m);
+        super.intoArray0Template(DoubleMask256.class, a, offset, indexMap, mapOffset, (DoubleMask256) m);
     }
 
 
@@ -1032,7 +1046,7 @@ final class Double256Vector extends DoubleVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m) {
-        super.intoMemorySegment0Template(Double256Mask.class, ms, offset, (Double256Mask) m);
+        super.intoMemorySegment0Template(DoubleMask256.class, ms, offset, (DoubleMask256) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector512.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector512.java
index a7a86c25841..8ed21953394 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Double512Vector extends DoubleVector {
+final class DoubleVector512 extends DoubleVector {
     static final DoubleSpecies VSPECIES =
         (DoubleSpecies) DoubleVector.SPECIES_512;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Double512Vector> VCLASS = Double512Vector.class;
+    static final Class<DoubleVector512> VCLASS = DoubleVector512.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Double> CTYPE = double.class; // carrier type used by the JVM
+
     static final Class<Double> ETYPE = double.class; // used by the JVM
 
-    Double512Vector(double[] v) {
+    DoubleVector512(double[] v) {
         super(v);
     }
 
-    // For compatibility as Double512Vector::new,
+    // For compatibility as DoubleVector512::new,
     // stored into species.vectorFactory.
-    Double512Vector(Object v) {
+    DoubleVector512(Object v) {
         this((double[]) v);
     }
 
-    static final Double512Vector ZERO = new Double512Vector(new double[VLENGTH]);
-    static final Double512Vector IOTA = new Double512Vector(VSPECIES.iotaArray());
+    static final DoubleVector512 ZERO = new DoubleVector512(new double[VLENGTH]);
+    static final DoubleVector512 IOTA = new DoubleVector512(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Double512Vector extends DoubleVector {
     @Override
     public final Class<Double> elementType() { return double.class; }
 
+    @ForceInline
+    final Class<Double> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Double.SIZE; }
@@ -119,55 +124,62 @@ final class Double512Vector extends DoubleVector {
         return (double[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Double512Vector broadcast(double e) {
-        return (Double512Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector512 broadcast(double e) {
+        return (DoubleVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double512Vector broadcast(long e) {
-        return (Double512Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector512 broadcast(long e) {
+        return (DoubleVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Double512Mask maskFromArray(boolean[] bits) {
-        return new Double512Mask(bits);
+    DoubleMask512 maskFromArray(boolean[] bits) {
+        return new DoubleMask512(bits);
     }
 
     @Override
     @ForceInline
-    Double512Shuffle iotaShuffle() { return Double512Shuffle.IOTA; }
+    DoubleShuffle512 iotaShuffle() { return DoubleShuffle512.IOTA; }
 
     @Override
     @ForceInline
-    Double512Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Double512Shuffle) iotaShuffleTemplate(start, step, wrap);
+    DoubleShuffle512 iotaShuffle(int start, int step, boolean wrap) {
+        return (DoubleShuffle512) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Double512Shuffle shuffleFromArray(int[] indices, int i) { return new Double512Shuffle(indices, i); }
+    DoubleShuffle512 shuffleFromArray(int[] indices, int i) { return new DoubleShuffle512(indices, i); }
 
     @Override
     @ForceInline
-    Double512Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Double512Shuffle(fn); }
+    DoubleShuffle512 shuffleFromOp(IntUnaryOperator fn) { return new DoubleShuffle512(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Double512Vector vectorFactory(double[] vec) {
-        return new Double512Vector(vec);
+    DoubleVector512 vectorFactory(double[] vec) {
+        return new DoubleVector512(vec);
     }
 
     @ForceInline
     final @Override
-    Byte512Vector asByteVectorRaw() {
-        return (Byte512Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector512 asByteVectorRaw() {
+        return (ByteVector512) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Double512Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double512Vector uOp(FUnOp f) {
-        return (Double512Vector) super.uOpTemplate(f);  // specialize
+    DoubleVector512 uOp(FUnOp f) {
+        return (DoubleVector512) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double512Vector uOp(VectorMask<Double> m, FUnOp f) {
-        return (Double512Vector)
-            super.uOpTemplate((Double512Mask)m, f);  // specialize
+    DoubleVector512 uOp(VectorMask<Double> m, FUnOp f) {
+        return (DoubleVector512)
+            super.uOpTemplate((DoubleMask512)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Double512Vector bOp(Vector<Double> v, FBinOp f) {
-        return (Double512Vector) super.bOpTemplate((Double512Vector)v, f);  // specialize
+    DoubleVector512 bOp(Vector<Double> v, FBinOp f) {
+        return (DoubleVector512) super.bOpTemplate((DoubleVector512)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double512Vector bOp(Vector<Double> v,
+    DoubleVector512 bOp(Vector<Double> v,
                      VectorMask<Double> m, FBinOp f) {
-        return (Double512Vector)
-            super.bOpTemplate((Double512Vector)v, (Double512Mask)m,
+        return (DoubleVector512)
+            super.bOpTemplate((DoubleVector512)v, (DoubleMask512)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Double512Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double512Vector tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
-        return (Double512Vector)
-            super.tOpTemplate((Double512Vector)v1, (Double512Vector)v2,
+    DoubleVector512 tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
+        return (DoubleVector512)
+            super.tOpTemplate((DoubleVector512)v1, (DoubleVector512)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double512Vector tOp(Vector<Double> v1, Vector<Double> v2,
+    DoubleVector512 tOp(Vector<Double> v1, Vector<Double> v2,
                      VectorMask<Double> m, FTriOp f) {
-        return (Double512Vector)
-            super.tOpTemplate((Double512Vector)v1, (Double512Vector)v2,
-                              (Double512Mask)m, f);  // specialize
+        return (DoubleVector512)
+            super.tOpTemplate((DoubleVector512)v1, (DoubleVector512)v2,
+                              (DoubleMask512)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Double512Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public Double512Vector lanewise(Unary op) {
-        return (Double512Vector) super.lanewiseTemplate(op);  // specialize
+    public DoubleVector512 lanewise(Unary op) {
+        return (DoubleVector512) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector lanewise(Unary op, VectorMask<Double> m) {
-        return (Double512Vector) super.lanewiseTemplate(op, Double512Mask.class, (Double512Mask) m);  // specialize
+    public DoubleVector512 lanewise(Unary op, VectorMask<Double> m) {
+        return (DoubleVector512) super.lanewiseTemplate(op, DoubleMask512.class, (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector lanewise(Binary op, Vector<Double> v) {
-        return (Double512Vector) super.lanewiseTemplate(op, v);  // specialize
+    public DoubleVector512 lanewise(Binary op, Vector<Double> v) {
+        return (DoubleVector512) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
-        return (Double512Vector) super.lanewiseTemplate(op, Double512Mask.class, v, (Double512Mask) m);  // specialize
+    public DoubleVector512 lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector512) super.lanewiseTemplate(op, DoubleMask512.class, v, (DoubleMask512) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Double512Vector extends DoubleVector {
     @Override
     @ForceInline
     public final
-    Double512Vector
+    DoubleVector512
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2) {
-        return (Double512Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (DoubleVector512) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double512Vector
+    DoubleVector512
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2, VectorMask<Double> m) {
-        return (Double512Vector) super.lanewiseTemplate(op, Double512Mask.class, v1, v2, (Double512Mask) m);  // specialize
+        return (DoubleVector512) super.lanewiseTemplate(op, DoubleMask512.class, v1, v2, (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double512Vector addIndex(int scale) {
-        return (Double512Vector) super.addIndexTemplate(scale);  // specialize
+    DoubleVector512 addIndex(int scale) {
+        return (DoubleVector512) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Double512Vector extends DoubleVector {
     @ForceInline
     public final double reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Double> m) {
-        return super.reduceLanesTemplate(op, Double512Mask.class, (Double512Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, DoubleMask512.class, (DoubleMask512) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Double512Vector extends DoubleVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Double> m) {
-        return (long) super.reduceLanesTemplate(op, Double512Mask.class, (Double512Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, DoubleMask512.class, (DoubleMask512) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Double512Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public final Double512Shuffle toShuffle() {
-        return (Double512Shuffle) toShuffle(vspecies(), false);
+    public final DoubleShuffle512 toShuffle() {
+        return (DoubleShuffle512) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Double512Mask test(Test op) {
-        return super.testTemplate(Double512Mask.class, op);  // specialize
+    public final DoubleMask512 test(Test op) {
+        return super.testTemplate(DoubleMask512.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double512Mask test(Test op, VectorMask<Double> m) {
-        return super.testTemplate(Double512Mask.class, op, (Double512Mask) m);  // specialize
+    public final DoubleMask512 test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(DoubleMask512.class, op, (DoubleMask512) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Double512Mask compare(Comparison op, Vector<Double> v) {
-        return super.compareTemplate(Double512Mask.class, op, v);  // specialize
+    public final DoubleMask512 compare(Comparison op, Vector<Double> v) {
+        return super.compareTemplate(DoubleMask512.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double512Mask compare(Comparison op, double s) {
-        return super.compareTemplate(Double512Mask.class, op, s);  // specialize
+    public final DoubleMask512 compare(Comparison op, double s) {
+        return super.compareTemplate(DoubleMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double512Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Double512Mask.class, op, s);  // specialize
+    public final DoubleMask512 compare(Comparison op, long s) {
+        return super.compareTemplate(DoubleMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double512Mask compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
-        return super.compareTemplate(Double512Mask.class, op, v, (Double512Mask) m);
+    public final DoubleMask512 compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
+        return super.compareTemplate(DoubleMask512.class, op, v, (DoubleMask512) m);
     }
 
 
     @Override
     @ForceInline
-    public Double512Vector blend(Vector<Double> v, VectorMask<Double> m) {
-        return (Double512Vector)
-            super.blendTemplate(Double512Mask.class,
-                                (Double512Vector) v,
-                                (Double512Mask) m);  // specialize
+    public DoubleVector512 blend(Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector512)
+            super.blendTemplate(DoubleMask512.class,
+                                (DoubleVector512) v,
+                                (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector slice(int origin, Vector<Double> v) {
-        return (Double512Vector) super.sliceTemplate(origin, v);  // specialize
+    public DoubleVector512 slice(int origin, Vector<Double> v) {
+        return (DoubleVector512) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector slice(int origin) {
-        return (Double512Vector) super.sliceTemplate(origin);  // specialize
+    public DoubleVector512 slice(int origin) {
+        return (DoubleVector512) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector unslice(int origin, Vector<Double> w, int part) {
-        return (Double512Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public DoubleVector512 unslice(int origin, Vector<Double> w, int part) {
+        return (DoubleVector512) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
-        return (Double512Vector)
-            super.unsliceTemplate(Double512Mask.class,
+    public DoubleVector512 unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
+        return (DoubleVector512)
+            super.unsliceTemplate(DoubleMask512.class,
                                   origin, w, part,
-                                  (Double512Mask) m);  // specialize
+                                  (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector unslice(int origin) {
-        return (Double512Vector) super.unsliceTemplate(origin);  // specialize
+    public DoubleVector512 unslice(int origin) {
+        return (DoubleVector512) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector rearrange(VectorShuffle<Double> s) {
-        return (Double512Vector)
-            super.rearrangeTemplate(Double512Shuffle.class,
-                                    (Double512Shuffle) s);  // specialize
+    public DoubleVector512 rearrange(VectorShuffle<Double> s) {
+        return (DoubleVector512)
+            super.rearrangeTemplate(DoubleShuffle512.class,
+                                    (DoubleShuffle512) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector rearrange(VectorShuffle<Double> shuffle,
+    public DoubleVector512 rearrange(VectorShuffle<Double> shuffle,
                                   VectorMask<Double> m) {
-        return (Double512Vector)
-            super.rearrangeTemplate(Double512Shuffle.class,
-                                    Double512Mask.class,
-                                    (Double512Shuffle) shuffle,
-                                    (Double512Mask) m);  // specialize
+        return (DoubleVector512)
+            super.rearrangeTemplate(DoubleShuffle512.class,
+                                    DoubleMask512.class,
+                                    (DoubleShuffle512) shuffle,
+                                    (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector rearrange(VectorShuffle<Double> s,
+    public DoubleVector512 rearrange(VectorShuffle<Double> s,
                                   Vector<Double> v) {
-        return (Double512Vector)
-            super.rearrangeTemplate(Double512Shuffle.class,
-                                    (Double512Shuffle) s,
-                                    (Double512Vector) v);  // specialize
+        return (DoubleVector512)
+            super.rearrangeTemplate(DoubleShuffle512.class,
+                                    (DoubleShuffle512) s,
+                                    (DoubleVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector compress(VectorMask<Double> m) {
-        return (Double512Vector)
-            super.compressTemplate(Double512Mask.class,
-                                   (Double512Mask) m);  // specialize
+    public DoubleVector512 compress(VectorMask<Double> m) {
+        return (DoubleVector512)
+            super.compressTemplate(DoubleMask512.class,
+                                   (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector expand(VectorMask<Double> m) {
-        return (Double512Vector)
-            super.expandTemplate(Double512Mask.class,
-                                   (Double512Mask) m);  // specialize
+    public DoubleVector512 expand(VectorMask<Double> m) {
+        return (DoubleVector512)
+            super.expandTemplate(DoubleMask512.class,
+                                   (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector selectFrom(Vector<Double> v) {
-        return (Double512Vector)
-            super.selectFromTemplate((Double512Vector) v);  // specialize
+    public DoubleVector512 selectFrom(Vector<Double> v) {
+        return (DoubleVector512)
+            super.selectFromTemplate((DoubleVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector selectFrom(Vector<Double> v,
+    public DoubleVector512 selectFrom(Vector<Double> v,
                                    VectorMask<Double> m) {
-        return (Double512Vector)
-            super.selectFromTemplate((Double512Vector) v,
-                                     Double512Mask.class, (Double512Mask) m);  // specialize
+        return (DoubleVector512)
+            super.selectFromTemplate((DoubleVector512) v,
+                                     DoubleMask512.class, (DoubleMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double512Vector selectFrom(Vector<Double> v1,
+    public DoubleVector512 selectFrom(Vector<Double> v1,
                                    Vector<Double> v2) {
-        return (Double512Vector)
-            super.selectFromTemplate((Double512Vector) v1, (Double512Vector) v2);  // specialize
+        return (DoubleVector512)
+            super.selectFromTemplate((DoubleVector512) v1, (DoubleVector512) v2);  // specialize
     }
 
     @ForceInline
@@ -522,7 +534,7 @@ final class Double512Vector extends DoubleVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      double[] vecarr = vec.vec();
@@ -532,7 +544,7 @@ final class Double512Vector extends DoubleVector {
 
     @ForceInline
     @Override
-    public Double512Vector withLane(int i, double e) {
+    public DoubleVector512 withLane(int i, double e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -547,9 +559,9 @@ final class Double512Vector extends DoubleVector {
     }
 
     @ForceInline
-    public Double512Vector withLaneHelper(int i, double e) {
+    public DoubleVector512 withLaneHelper(int i, double e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Double.doubleToRawLongBits(e),
                                 (v, ix, bits) -> {
                                     double[] res = v.vec().clone();
@@ -560,19 +572,20 @@ final class Double512Vector extends DoubleVector {
 
     // Mask
 
-    static final class Double512Mask extends AbstractMask<Double> {
+    static final class DoubleMask512 extends AbstractMask<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Double> ETYPE = double.class; // used by the JVM
 
-        Double512Mask(boolean[] bits) {
+        static final Class<Double> CTYPE = double.class; // used by the JVM
+
+        DoubleMask512(boolean[] bits) {
             this(bits, 0);
         }
 
-        Double512Mask(boolean[] bits, int offset) {
+        DoubleMask512(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Double512Mask(boolean val) {
+        DoubleMask512(boolean val) {
             super(prepare(val));
         }
 
@@ -605,31 +618,31 @@ final class Double512Vector extends DoubleVector {
         }
 
         @Override
-        Double512Mask uOp(MUnOp f) {
+        DoubleMask512 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Double512Mask(res);
+            return new DoubleMask512(res);
         }
 
         @Override
-        Double512Mask bOp(VectorMask<Double> m, MBinOp f) {
+        DoubleMask512 bOp(VectorMask<Double> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Double512Mask)m).getBits();
+            boolean[] mbits = ((DoubleMask512)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Double512Mask(res);
+            return new DoubleMask512(res);
         }
 
         @ForceInline
         @Override
         public final
-        Double512Vector toVector() {
-            return (Double512Vector) super.toVectorTemplate();  // specialize
+        DoubleVector512 toVector() {
+            return (DoubleVector512) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -653,8 +666,8 @@ final class Double512Vector extends DoubleVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -662,25 +675,25 @@ final class Double512Vector extends DoubleVector {
         @Override
         @ForceInline
         /*package-private*/
-        Double512Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Double512Mask) VectorSupport.indexPartiallyInUpperRange(
-                Double512Mask.class, double.class, VLENGTH, offset, limit,
-                (o, l) -> (Double512Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        DoubleMask512 indexPartiallyInUpperRange(long offset, long limit) {
+            return (DoubleMask512) VectorSupport.indexPartiallyInUpperRange(
+                DoubleMask512.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (DoubleMask512) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Double512Mask not() {
+        public DoubleMask512 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Double512Mask compress() {
-            return (Double512Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Double512Vector.class, Double512Mask.class, ETYPE, VLENGTH, null, this,
+        public DoubleMask512 compress() {
+            return (DoubleMask512)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                DoubleVector512.class, DoubleMask512.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -689,30 +702,30 @@ final class Double512Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public Double512Mask and(VectorMask<Double> mask) {
+        public DoubleMask512 and(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double512Mask m = (Double512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Double512Mask.class, null, long.class, VLENGTH,
+            DoubleMask512 m = (DoubleMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, DoubleMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Double512Mask or(VectorMask<Double> mask) {
+        public DoubleMask512 or(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double512Mask m = (Double512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Double512Mask.class, null, long.class, VLENGTH,
+            DoubleMask512 m = (DoubleMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, DoubleMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Double512Mask xor(VectorMask<Double> mask) {
+        public DoubleMask512 xor(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double512Mask m = (Double512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Double512Mask.class, null, long.class, VLENGTH,
+            DoubleMask512 m = (DoubleMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, DoubleMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -722,21 +735,21 @@ final class Double512Vector extends DoubleVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Double512Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Double512Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Double512Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -746,7 +759,7 @@ final class Double512Vector extends DoubleVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Double512Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -756,7 +769,7 @@ final class Double512Vector extends DoubleVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Double512Mask.class, double.class, VLENGTH,
+            return VectorSupport.extract(DoubleMask512.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -765,48 +778,49 @@ final class Double512Vector extends DoubleVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Double512Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Double512Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((DoubleMask512)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Double512Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Double512Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((DoubleMask512)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Double512Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Double512Mask.class, long.class, VLENGTH,
+        static DoubleMask512 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(DoubleMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Double512Mask  TRUE_MASK = new Double512Mask(true);
-        private static final Double512Mask FALSE_MASK = new Double512Mask(false);
+        private static final DoubleMask512  TRUE_MASK = new DoubleMask512(true);
+        private static final DoubleMask512 FALSE_MASK = new DoubleMask512(false);
 
     }
 
     // Shuffle
 
-    static final class Double512Shuffle extends AbstractShuffle<Double> {
+    static final class DoubleShuffle512 extends AbstractShuffle<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Double512Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        DoubleShuffle512(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Double512Shuffle(int[] indices, int i) {
+        DoubleShuffle512(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Double512Shuffle(IntUnaryOperator fn) {
+        DoubleShuffle512(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -826,23 +840,23 @@ final class Double512Vector extends DoubleVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Double512Shuffle IOTA = new Double512Shuffle(IDENTITY);
+        static final DoubleShuffle512 IOTA = new DoubleShuffle512(IDENTITY);
 
         @Override
         @ForceInline
-        public Double512Vector toVector() {
-            return (Double512Vector) toBitsVector().castShape(vspecies(), 0);
+        public DoubleVector512 toVector() {
+            return (DoubleVector512) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Long512Vector toBitsVector() {
-            return (Long512Vector) super.toBitsVectorTemplate();
+        LongVector512 toBitsVector() {
+            return (LongVector512) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long512Vector toBitsVector0() {
-            return ((Long512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector512 toBitsVector0() {
+            return ((LongVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -914,30 +928,30 @@ final class Double512Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public final Double512Mask laneIsValid() {
-            return (Double512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final DoubleMask512 laneIsValid() {
+            return (DoubleMask512) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Double512Shuffle rearrange(VectorShuffle<Double> shuffle) {
-            Double512Shuffle concreteShuffle = (Double512Shuffle) shuffle;
-            return (Double512Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_512))
+        public final DoubleShuffle512 rearrange(VectorShuffle<Double> shuffle) {
+            DoubleShuffle512 concreteShuffle = (DoubleShuffle512) shuffle;
+            return (DoubleShuffle512) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_512))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Double512Shuffle wrapIndexes() {
-            Long512Vector v = toBitsVector();
+        public final DoubleShuffle512 wrapIndexes() {
+            LongVector512 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector512) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector512) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Double512Shuffle) v.toShuffle(vspecies(), false);
+            return (DoubleShuffle512) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -988,14 +1002,14 @@ final class Double512Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromArray0Template(Double512Mask.class, a, offset, (Double512Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(DoubleMask512.class, a, offset, (DoubleMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        return super.fromArray0Template(Double512Mask.class, a, offset, indexMap, mapOffset, (Double512Mask) m);
+        return super.fromArray0Template(DoubleMask512.class, a, offset, indexMap, mapOffset, (DoubleMask512) m);
     }
 
 
@@ -1011,7 +1025,7 @@ final class Double512Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Double512Mask.class, ms, offset, (Double512Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(DoubleMask512.class, ms, offset, (DoubleMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1025,14 +1039,14 @@ final class Double512Vector extends DoubleVector {
     @Override
     final
     void intoArray0(double[] a, int offset, VectorMask<Double> m) {
-        super.intoArray0Template(Double512Mask.class, a, offset, (Double512Mask) m);
+        super.intoArray0Template(DoubleMask512.class, a, offset, (DoubleMask512) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        super.intoArray0Template(Double512Mask.class, a, offset, indexMap, mapOffset, (Double512Mask) m);
+        super.intoArray0Template(DoubleMask512.class, a, offset, indexMap, mapOffset, (DoubleMask512) m);
     }
 
 
@@ -1040,7 +1054,7 @@ final class Double512Vector extends DoubleVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m) {
-        super.intoMemorySegment0Template(Double512Mask.class, ms, offset, (Double512Mask) m);
+        super.intoMemorySegment0Template(DoubleMask512.class, ms, offset, (DoubleMask512) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector64.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector64.java
index df6b627cc18..7e1a8cf768d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Double64Vector extends DoubleVector {
+final class DoubleVector64 extends DoubleVector {
     static final DoubleSpecies VSPECIES =
         (DoubleSpecies) DoubleVector.SPECIES_64;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Double64Vector> VCLASS = Double64Vector.class;
+    static final Class<DoubleVector64> VCLASS = DoubleVector64.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Double> CTYPE = double.class; // carrier type used by the JVM
+
     static final Class<Double> ETYPE = double.class; // used by the JVM
 
-    Double64Vector(double[] v) {
+    DoubleVector64(double[] v) {
         super(v);
     }
 
-    // For compatibility as Double64Vector::new,
+    // For compatibility as DoubleVector64::new,
     // stored into species.vectorFactory.
-    Double64Vector(Object v) {
+    DoubleVector64(Object v) {
         this((double[]) v);
     }
 
-    static final Double64Vector ZERO = new Double64Vector(new double[VLENGTH]);
-    static final Double64Vector IOTA = new Double64Vector(VSPECIES.iotaArray());
+    static final DoubleVector64 ZERO = new DoubleVector64(new double[VLENGTH]);
+    static final DoubleVector64 IOTA = new DoubleVector64(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Double64Vector extends DoubleVector {
     @Override
     public final Class<Double> elementType() { return double.class; }
 
+    @ForceInline
+    final Class<Double> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Double.SIZE; }
@@ -119,55 +124,62 @@ final class Double64Vector extends DoubleVector {
         return (double[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Double64Vector broadcast(double e) {
-        return (Double64Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector64 broadcast(double e) {
+        return (DoubleVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double64Vector broadcast(long e) {
-        return (Double64Vector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVector64 broadcast(long e) {
+        return (DoubleVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Double64Mask maskFromArray(boolean[] bits) {
-        return new Double64Mask(bits);
+    DoubleMask64 maskFromArray(boolean[] bits) {
+        return new DoubleMask64(bits);
     }
 
     @Override
     @ForceInline
-    Double64Shuffle iotaShuffle() { return Double64Shuffle.IOTA; }
+    DoubleShuffle64 iotaShuffle() { return DoubleShuffle64.IOTA; }
 
     @Override
     @ForceInline
-    Double64Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Double64Shuffle) iotaShuffleTemplate(start, step, wrap);
+    DoubleShuffle64 iotaShuffle(int start, int step, boolean wrap) {
+        return (DoubleShuffle64) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Double64Shuffle shuffleFromArray(int[] indices, int i) { return new Double64Shuffle(indices, i); }
+    DoubleShuffle64 shuffleFromArray(int[] indices, int i) { return new DoubleShuffle64(indices, i); }
 
     @Override
     @ForceInline
-    Double64Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Double64Shuffle(fn); }
+    DoubleShuffle64 shuffleFromOp(IntUnaryOperator fn) { return new DoubleShuffle64(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Double64Vector vectorFactory(double[] vec) {
-        return new Double64Vector(vec);
+    DoubleVector64 vectorFactory(double[] vec) {
+        return new DoubleVector64(vec);
     }
 
     @ForceInline
     final @Override
-    Byte64Vector asByteVectorRaw() {
-        return (Byte64Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector64 asByteVectorRaw() {
+        return (ByteVector64) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Double64Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double64Vector uOp(FUnOp f) {
-        return (Double64Vector) super.uOpTemplate(f);  // specialize
+    DoubleVector64 uOp(FUnOp f) {
+        return (DoubleVector64) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double64Vector uOp(VectorMask<Double> m, FUnOp f) {
-        return (Double64Vector)
-            super.uOpTemplate((Double64Mask)m, f);  // specialize
+    DoubleVector64 uOp(VectorMask<Double> m, FUnOp f) {
+        return (DoubleVector64)
+            super.uOpTemplate((DoubleMask64)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Double64Vector bOp(Vector<Double> v, FBinOp f) {
-        return (Double64Vector) super.bOpTemplate((Double64Vector)v, f);  // specialize
+    DoubleVector64 bOp(Vector<Double> v, FBinOp f) {
+        return (DoubleVector64) super.bOpTemplate((DoubleVector64)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double64Vector bOp(Vector<Double> v,
+    DoubleVector64 bOp(Vector<Double> v,
                      VectorMask<Double> m, FBinOp f) {
-        return (Double64Vector)
-            super.bOpTemplate((Double64Vector)v, (Double64Mask)m,
+        return (DoubleVector64)
+            super.bOpTemplate((DoubleVector64)v, (DoubleMask64)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Double64Vector extends DoubleVector {
 
     @ForceInline
     final @Override
-    Double64Vector tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
-        return (Double64Vector)
-            super.tOpTemplate((Double64Vector)v1, (Double64Vector)v2,
+    DoubleVector64 tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
+        return (DoubleVector64)
+            super.tOpTemplate((DoubleVector64)v1, (DoubleVector64)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Double64Vector tOp(Vector<Double> v1, Vector<Double> v2,
+    DoubleVector64 tOp(Vector<Double> v1, Vector<Double> v2,
                      VectorMask<Double> m, FTriOp f) {
-        return (Double64Vector)
-            super.tOpTemplate((Double64Vector)v1, (Double64Vector)v2,
-                              (Double64Mask)m, f);  // specialize
+        return (DoubleVector64)
+            super.tOpTemplate((DoubleVector64)v1, (DoubleVector64)v2,
+                              (DoubleMask64)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Double64Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public Double64Vector lanewise(Unary op) {
-        return (Double64Vector) super.lanewiseTemplate(op);  // specialize
+    public DoubleVector64 lanewise(Unary op) {
+        return (DoubleVector64) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector lanewise(Unary op, VectorMask<Double> m) {
-        return (Double64Vector) super.lanewiseTemplate(op, Double64Mask.class, (Double64Mask) m);  // specialize
+    public DoubleVector64 lanewise(Unary op, VectorMask<Double> m) {
+        return (DoubleVector64) super.lanewiseTemplate(op, DoubleMask64.class, (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector lanewise(Binary op, Vector<Double> v) {
-        return (Double64Vector) super.lanewiseTemplate(op, v);  // specialize
+    public DoubleVector64 lanewise(Binary op, Vector<Double> v) {
+        return (DoubleVector64) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
-        return (Double64Vector) super.lanewiseTemplate(op, Double64Mask.class, v, (Double64Mask) m);  // specialize
+    public DoubleVector64 lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector64) super.lanewiseTemplate(op, DoubleMask64.class, v, (DoubleMask64) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Double64Vector extends DoubleVector {
     @Override
     @ForceInline
     public final
-    Double64Vector
+    DoubleVector64
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2) {
-        return (Double64Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (DoubleVector64) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double64Vector
+    DoubleVector64
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2, VectorMask<Double> m) {
-        return (Double64Vector) super.lanewiseTemplate(op, Double64Mask.class, v1, v2, (Double64Mask) m);  // specialize
+        return (DoubleVector64) super.lanewiseTemplate(op, DoubleMask64.class, v1, v2, (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Double64Vector addIndex(int scale) {
-        return (Double64Vector) super.addIndexTemplate(scale);  // specialize
+    DoubleVector64 addIndex(int scale) {
+        return (DoubleVector64) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Double64Vector extends DoubleVector {
     @ForceInline
     public final double reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Double> m) {
-        return super.reduceLanesTemplate(op, Double64Mask.class, (Double64Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, DoubleMask64.class, (DoubleMask64) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Double64Vector extends DoubleVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Double> m) {
-        return (long) super.reduceLanesTemplate(op, Double64Mask.class, (Double64Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, DoubleMask64.class, (DoubleMask64) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Double64Vector extends DoubleVector {
 
     @Override
     @ForceInline
-    public final Double64Shuffle toShuffle() {
-        return (Double64Shuffle) toShuffle(vspecies(), false);
+    public final DoubleShuffle64 toShuffle() {
+        return (DoubleShuffle64) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Double64Mask test(Test op) {
-        return super.testTemplate(Double64Mask.class, op);  // specialize
+    public final DoubleMask64 test(Test op) {
+        return super.testTemplate(DoubleMask64.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double64Mask test(Test op, VectorMask<Double> m) {
-        return super.testTemplate(Double64Mask.class, op, (Double64Mask) m);  // specialize
+    public final DoubleMask64 test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(DoubleMask64.class, op, (DoubleMask64) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Double64Mask compare(Comparison op, Vector<Double> v) {
-        return super.compareTemplate(Double64Mask.class, op, v);  // specialize
+    public final DoubleMask64 compare(Comparison op, Vector<Double> v) {
+        return super.compareTemplate(DoubleMask64.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double64Mask compare(Comparison op, double s) {
-        return super.compareTemplate(Double64Mask.class, op, s);  // specialize
+    public final DoubleMask64 compare(Comparison op, double s) {
+        return super.compareTemplate(DoubleMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double64Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Double64Mask.class, op, s);  // specialize
+    public final DoubleMask64 compare(Comparison op, long s) {
+        return super.compareTemplate(DoubleMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Double64Mask compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
-        return super.compareTemplate(Double64Mask.class, op, v, (Double64Mask) m);
+    public final DoubleMask64 compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
+        return super.compareTemplate(DoubleMask64.class, op, v, (DoubleMask64) m);
     }
 
 
     @Override
     @ForceInline
-    public Double64Vector blend(Vector<Double> v, VectorMask<Double> m) {
-        return (Double64Vector)
-            super.blendTemplate(Double64Mask.class,
-                                (Double64Vector) v,
-                                (Double64Mask) m);  // specialize
+    public DoubleVector64 blend(Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVector64)
+            super.blendTemplate(DoubleMask64.class,
+                                (DoubleVector64) v,
+                                (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector slice(int origin, Vector<Double> v) {
-        return (Double64Vector) super.sliceTemplate(origin, v);  // specialize
+    public DoubleVector64 slice(int origin, Vector<Double> v) {
+        return (DoubleVector64) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector slice(int origin) {
-        return (Double64Vector) super.sliceTemplate(origin);  // specialize
+    public DoubleVector64 slice(int origin) {
+        return (DoubleVector64) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector unslice(int origin, Vector<Double> w, int part) {
-        return (Double64Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public DoubleVector64 unslice(int origin, Vector<Double> w, int part) {
+        return (DoubleVector64) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
-        return (Double64Vector)
-            super.unsliceTemplate(Double64Mask.class,
+    public DoubleVector64 unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
+        return (DoubleVector64)
+            super.unsliceTemplate(DoubleMask64.class,
                                   origin, w, part,
-                                  (Double64Mask) m);  // specialize
+                                  (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector unslice(int origin) {
-        return (Double64Vector) super.unsliceTemplate(origin);  // specialize
+    public DoubleVector64 unslice(int origin) {
+        return (DoubleVector64) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector rearrange(VectorShuffle<Double> s) {
-        return (Double64Vector)
-            super.rearrangeTemplate(Double64Shuffle.class,
-                                    (Double64Shuffle) s);  // specialize
+    public DoubleVector64 rearrange(VectorShuffle<Double> s) {
+        return (DoubleVector64)
+            super.rearrangeTemplate(DoubleShuffle64.class,
+                                    (DoubleShuffle64) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector rearrange(VectorShuffle<Double> shuffle,
+    public DoubleVector64 rearrange(VectorShuffle<Double> shuffle,
                                   VectorMask<Double> m) {
-        return (Double64Vector)
-            super.rearrangeTemplate(Double64Shuffle.class,
-                                    Double64Mask.class,
-                                    (Double64Shuffle) shuffle,
-                                    (Double64Mask) m);  // specialize
+        return (DoubleVector64)
+            super.rearrangeTemplate(DoubleShuffle64.class,
+                                    DoubleMask64.class,
+                                    (DoubleShuffle64) shuffle,
+                                    (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector rearrange(VectorShuffle<Double> s,
+    public DoubleVector64 rearrange(VectorShuffle<Double> s,
                                   Vector<Double> v) {
-        return (Double64Vector)
-            super.rearrangeTemplate(Double64Shuffle.class,
-                                    (Double64Shuffle) s,
-                                    (Double64Vector) v);  // specialize
+        return (DoubleVector64)
+            super.rearrangeTemplate(DoubleShuffle64.class,
+                                    (DoubleShuffle64) s,
+                                    (DoubleVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector compress(VectorMask<Double> m) {
-        return (Double64Vector)
-            super.compressTemplate(Double64Mask.class,
-                                   (Double64Mask) m);  // specialize
+    public DoubleVector64 compress(VectorMask<Double> m) {
+        return (DoubleVector64)
+            super.compressTemplate(DoubleMask64.class,
+                                   (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector expand(VectorMask<Double> m) {
-        return (Double64Vector)
-            super.expandTemplate(Double64Mask.class,
-                                   (Double64Mask) m);  // specialize
+    public DoubleVector64 expand(VectorMask<Double> m) {
+        return (DoubleVector64)
+            super.expandTemplate(DoubleMask64.class,
+                                   (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector selectFrom(Vector<Double> v) {
-        return (Double64Vector)
-            super.selectFromTemplate((Double64Vector) v);  // specialize
+    public DoubleVector64 selectFrom(Vector<Double> v) {
+        return (DoubleVector64)
+            super.selectFromTemplate((DoubleVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector selectFrom(Vector<Double> v,
+    public DoubleVector64 selectFrom(Vector<Double> v,
                                    VectorMask<Double> m) {
-        return (Double64Vector)
-            super.selectFromTemplate((Double64Vector) v,
-                                     Double64Mask.class, (Double64Mask) m);  // specialize
+        return (DoubleVector64)
+            super.selectFromTemplate((DoubleVector64) v,
+                                     DoubleMask64.class, (DoubleMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Double64Vector selectFrom(Vector<Double> v1,
+    public DoubleVector64 selectFrom(Vector<Double> v1,
                                    Vector<Double> v2) {
-        return (Double64Vector)
-            super.selectFromTemplate((Double64Vector) v1, (Double64Vector) v2);  // specialize
+        return (DoubleVector64)
+            super.selectFromTemplate((DoubleVector64) v1, (DoubleVector64) v2);  // specialize
     }
 
     @ForceInline
@@ -515,7 +527,7 @@ final class Double64Vector extends DoubleVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      double[] vecarr = vec.vec();
@@ -525,7 +537,7 @@ final class Double64Vector extends DoubleVector {
 
     @ForceInline
     @Override
-    public Double64Vector withLane(int i, double e) {
+    public DoubleVector64 withLane(int i, double e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             default: throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
@@ -533,9 +545,9 @@ final class Double64Vector extends DoubleVector {
     }
 
     @ForceInline
-    public Double64Vector withLaneHelper(int i, double e) {
+    public DoubleVector64 withLaneHelper(int i, double e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Double.doubleToRawLongBits(e),
                                 (v, ix, bits) -> {
                                     double[] res = v.vec().clone();
@@ -546,19 +558,20 @@ final class Double64Vector extends DoubleVector {
 
     // Mask
 
-    static final class Double64Mask extends AbstractMask<Double> {
+    static final class DoubleMask64 extends AbstractMask<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Double> ETYPE = double.class; // used by the JVM
 
-        Double64Mask(boolean[] bits) {
+        static final Class<Double> CTYPE = double.class; // used by the JVM
+
+        DoubleMask64(boolean[] bits) {
             this(bits, 0);
         }
 
-        Double64Mask(boolean[] bits, int offset) {
+        DoubleMask64(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Double64Mask(boolean val) {
+        DoubleMask64(boolean val) {
             super(prepare(val));
         }
 
@@ -591,31 +604,31 @@ final class Double64Vector extends DoubleVector {
         }
 
         @Override
-        Double64Mask uOp(MUnOp f) {
+        DoubleMask64 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Double64Mask(res);
+            return new DoubleMask64(res);
         }
 
         @Override
-        Double64Mask bOp(VectorMask<Double> m, MBinOp f) {
+        DoubleMask64 bOp(VectorMask<Double> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Double64Mask)m).getBits();
+            boolean[] mbits = ((DoubleMask64)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Double64Mask(res);
+            return new DoubleMask64(res);
         }
 
         @ForceInline
         @Override
         public final
-        Double64Vector toVector() {
-            return (Double64Vector) super.toVectorTemplate();  // specialize
+        DoubleVector64 toVector() {
+            return (DoubleVector64) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -639,8 +652,8 @@ final class Double64Vector extends DoubleVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -648,25 +661,25 @@ final class Double64Vector extends DoubleVector {
         @Override
         @ForceInline
         /*package-private*/
-        Double64Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Double64Mask) VectorSupport.indexPartiallyInUpperRange(
-                Double64Mask.class, double.class, VLENGTH, offset, limit,
-                (o, l) -> (Double64Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        DoubleMask64 indexPartiallyInUpperRange(long offset, long limit) {
+            return (DoubleMask64) VectorSupport.indexPartiallyInUpperRange(
+                DoubleMask64.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (DoubleMask64) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Double64Mask not() {
+        public DoubleMask64 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Double64Mask compress() {
-            return (Double64Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Double64Vector.class, Double64Mask.class, ETYPE, VLENGTH, null, this,
+        public DoubleMask64 compress() {
+            return (DoubleMask64)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                DoubleVector64.class, DoubleMask64.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -675,30 +688,30 @@ final class Double64Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public Double64Mask and(VectorMask<Double> mask) {
+        public DoubleMask64 and(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double64Mask m = (Double64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Double64Mask.class, null, long.class, VLENGTH,
+            DoubleMask64 m = (DoubleMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, DoubleMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Double64Mask or(VectorMask<Double> mask) {
+        public DoubleMask64 or(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double64Mask m = (Double64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Double64Mask.class, null, long.class, VLENGTH,
+            DoubleMask64 m = (DoubleMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, DoubleMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Double64Mask xor(VectorMask<Double> mask) {
+        public DoubleMask64 xor(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            Double64Mask m = (Double64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Double64Mask.class, null, long.class, VLENGTH,
+            DoubleMask64 m = (DoubleMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, DoubleMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -708,21 +721,21 @@ final class Double64Vector extends DoubleVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Double64Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Double64Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Double64Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -732,7 +745,7 @@ final class Double64Vector extends DoubleVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Double64Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -742,7 +755,7 @@ final class Double64Vector extends DoubleVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Double64Mask.class, double.class, VLENGTH,
+            return VectorSupport.extract(DoubleMask64.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -751,48 +764,49 @@ final class Double64Vector extends DoubleVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Double64Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Double64Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((DoubleMask64)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Double64Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Double64Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((DoubleMask64)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Double64Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Double64Mask.class, long.class, VLENGTH,
+        static DoubleMask64 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(DoubleMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Double64Mask  TRUE_MASK = new Double64Mask(true);
-        private static final Double64Mask FALSE_MASK = new Double64Mask(false);
+        private static final DoubleMask64  TRUE_MASK = new DoubleMask64(true);
+        private static final DoubleMask64 FALSE_MASK = new DoubleMask64(false);
 
     }
 
     // Shuffle
 
-    static final class Double64Shuffle extends AbstractShuffle<Double> {
+    static final class DoubleShuffle64 extends AbstractShuffle<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Double64Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        DoubleShuffle64(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Double64Shuffle(int[] indices, int i) {
+        DoubleShuffle64(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Double64Shuffle(IntUnaryOperator fn) {
+        DoubleShuffle64(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -812,23 +826,23 @@ final class Double64Vector extends DoubleVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Double64Shuffle IOTA = new Double64Shuffle(IDENTITY);
+        static final DoubleShuffle64 IOTA = new DoubleShuffle64(IDENTITY);
 
         @Override
         @ForceInline
-        public Double64Vector toVector() {
-            return (Double64Vector) toBitsVector().castShape(vspecies(), 0);
+        public DoubleVector64 toVector() {
+            return (DoubleVector64) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Long64Vector toBitsVector() {
-            return (Long64Vector) super.toBitsVectorTemplate();
+        LongVector64 toBitsVector() {
+            return (LongVector64) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long64Vector toBitsVector0() {
-            return ((Long64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector64 toBitsVector0() {
+            return ((LongVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -900,30 +914,30 @@ final class Double64Vector extends DoubleVector {
 
         @Override
         @ForceInline
-        public final Double64Mask laneIsValid() {
-            return (Double64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final DoubleMask64 laneIsValid() {
+            return (DoubleMask64) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Double64Shuffle rearrange(VectorShuffle<Double> shuffle) {
-            Double64Shuffle concreteShuffle = (Double64Shuffle) shuffle;
-            return (Double64Shuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_64))
+        public final DoubleShuffle64 rearrange(VectorShuffle<Double> shuffle) {
+            DoubleShuffle64 concreteShuffle = (DoubleShuffle64) shuffle;
+            return (DoubleShuffle64) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_64))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Double64Shuffle wrapIndexes() {
-            Long64Vector v = toBitsVector();
+        public final DoubleShuffle64 wrapIndexes() {
+            LongVector64 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector64) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector64) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Double64Shuffle) v.toShuffle(vspecies(), false);
+            return (DoubleShuffle64) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -974,14 +988,14 @@ final class Double64Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromArray0Template(Double64Mask.class, a, offset, (Double64Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(DoubleMask64.class, a, offset, (DoubleMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        return super.fromArray0Template(Double64Mask.class, a, offset, indexMap, mapOffset, (Double64Mask) m);
+        return super.fromArray0Template(DoubleMask64.class, a, offset, indexMap, mapOffset, (DoubleMask64) m);
     }
 
 
@@ -997,7 +1011,7 @@ final class Double64Vector extends DoubleVector {
     @Override
     final
     DoubleVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Double64Mask.class, ms, offset, (Double64Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(DoubleMask64.class, ms, offset, (DoubleMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1011,14 +1025,14 @@ final class Double64Vector extends DoubleVector {
     @Override
     final
     void intoArray0(double[] a, int offset, VectorMask<Double> m) {
-        super.intoArray0Template(Double64Mask.class, a, offset, (Double64Mask) m);
+        super.intoArray0Template(DoubleMask64.class, a, offset, (DoubleMask64) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        super.intoArray0Template(Double64Mask.class, a, offset, indexMap, mapOffset, (Double64Mask) m);
+        super.intoArray0Template(DoubleMask64.class, a, offset, indexMap, mapOffset, (DoubleMask64) m);
     }
 
 
@@ -1026,7 +1040,7 @@ final class Double64Vector extends DoubleVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m) {
-        super.intoMemorySegment0Template(Double64Mask.class, ms, offset, (Double64Mask) m);
+        super.intoMemorySegment0Template(DoubleMask64.class, ms, offset, (DoubleMask64) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVectorMax.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVectorMax.java
index 47be1f609d8..46c090e066e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVectorMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class DoubleMaxVector extends DoubleVector {
+final class DoubleVectorMax extends DoubleVector {
     static final DoubleSpecies VSPECIES =
         (DoubleSpecies) DoubleVector.SPECIES_MAX;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<DoubleMaxVector> VCLASS = DoubleMaxVector.class;
+    static final Class<DoubleVectorMax> VCLASS = DoubleVectorMax.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Double> CTYPE = double.class; // carrier type used by the JVM
+
     static final Class<Double> ETYPE = double.class; // used by the JVM
 
-    DoubleMaxVector(double[] v) {
+    DoubleVectorMax(double[] v) {
         super(v);
     }
 
-    // For compatibility as DoubleMaxVector::new,
+    // For compatibility as DoubleVectorMax::new,
     // stored into species.vectorFactory.
-    DoubleMaxVector(Object v) {
+    DoubleVectorMax(Object v) {
         this((double[]) v);
     }
 
-    static final DoubleMaxVector ZERO = new DoubleMaxVector(new double[VLENGTH]);
-    static final DoubleMaxVector IOTA = new DoubleMaxVector(VSPECIES.iotaArray());
+    static final DoubleVectorMax ZERO = new DoubleVectorMax(new double[VLENGTH]);
+    static final DoubleVectorMax IOTA = new DoubleVectorMax(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class DoubleMaxVector extends DoubleVector {
     @Override
     public final Class<Double> elementType() { return double.class; }
 
+    @ForceInline
+    final Class<Double> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Double.SIZE; }
@@ -119,55 +124,62 @@ final class DoubleMaxVector extends DoubleVector {
         return (double[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final DoubleMaxVector broadcast(double e) {
-        return (DoubleMaxVector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVectorMax broadcast(double e) {
+        return (DoubleVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final DoubleMaxVector broadcast(long e) {
-        return (DoubleMaxVector) super.broadcastTemplate(e);  // specialize
+    public final DoubleVectorMax broadcast(long e) {
+        return (DoubleVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    DoubleMaxMask maskFromArray(boolean[] bits) {
-        return new DoubleMaxMask(bits);
+    DoubleMaskMax maskFromArray(boolean[] bits) {
+        return new DoubleMaskMax(bits);
     }
 
     @Override
     @ForceInline
-    DoubleMaxShuffle iotaShuffle() { return DoubleMaxShuffle.IOTA; }
+    DoubleShuffleMax iotaShuffle() { return DoubleShuffleMax.IOTA; }
 
     @Override
     @ForceInline
-    DoubleMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (DoubleMaxShuffle) iotaShuffleTemplate(start, step, wrap);
+    DoubleShuffleMax iotaShuffle(int start, int step, boolean wrap) {
+        return (DoubleShuffleMax) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    DoubleMaxShuffle shuffleFromArray(int[] indices, int i) { return new DoubleMaxShuffle(indices, i); }
+    DoubleShuffleMax shuffleFromArray(int[] indices, int i) { return new DoubleShuffleMax(indices, i); }
 
     @Override
     @ForceInline
-    DoubleMaxShuffle shuffleFromOp(IntUnaryOperator fn) { return new DoubleMaxShuffle(fn); }
+    DoubleShuffleMax shuffleFromOp(IntUnaryOperator fn) { return new DoubleShuffleMax(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    DoubleMaxVector vectorFactory(double[] vec) {
-        return new DoubleMaxVector(vec);
+    DoubleVectorMax vectorFactory(double[] vec) {
+        return new DoubleVectorMax(vec);
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector asByteVectorRaw() {
-        return (ByteMaxVector) super.asByteVectorRawTemplate();  // specialize
+    ByteVectorMax asByteVectorRaw() {
+        return (ByteVectorMax) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class DoubleMaxVector extends DoubleVector {
 
     @ForceInline
     final @Override
-    DoubleMaxVector uOp(FUnOp f) {
-        return (DoubleMaxVector) super.uOpTemplate(f);  // specialize
+    DoubleVectorMax uOp(FUnOp f) {
+        return (DoubleVectorMax) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    DoubleMaxVector uOp(VectorMask<Double> m, FUnOp f) {
-        return (DoubleMaxVector)
-            super.uOpTemplate((DoubleMaxMask)m, f);  // specialize
+    DoubleVectorMax uOp(VectorMask<Double> m, FUnOp f) {
+        return (DoubleVectorMax)
+            super.uOpTemplate((DoubleMaskMax)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    DoubleMaxVector bOp(Vector<Double> v, FBinOp f) {
-        return (DoubleMaxVector) super.bOpTemplate((DoubleMaxVector)v, f);  // specialize
+    DoubleVectorMax bOp(Vector<Double> v, FBinOp f) {
+        return (DoubleVectorMax) super.bOpTemplate((DoubleVectorMax)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    DoubleMaxVector bOp(Vector<Double> v,
+    DoubleVectorMax bOp(Vector<Double> v,
                      VectorMask<Double> m, FBinOp f) {
-        return (DoubleMaxVector)
-            super.bOpTemplate((DoubleMaxVector)v, (DoubleMaxMask)m,
+        return (DoubleVectorMax)
+            super.bOpTemplate((DoubleVectorMax)v, (DoubleMaskMax)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class DoubleMaxVector extends DoubleVector {
 
     @ForceInline
     final @Override
-    DoubleMaxVector tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
-        return (DoubleMaxVector)
-            super.tOpTemplate((DoubleMaxVector)v1, (DoubleMaxVector)v2,
+    DoubleVectorMax tOp(Vector<Double> v1, Vector<Double> v2, FTriOp f) {
+        return (DoubleVectorMax)
+            super.tOpTemplate((DoubleVectorMax)v1, (DoubleVectorMax)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    DoubleMaxVector tOp(Vector<Double> v1, Vector<Double> v2,
+    DoubleVectorMax tOp(Vector<Double> v1, Vector<Double> v2,
                      VectorMask<Double> m, FTriOp f) {
-        return (DoubleMaxVector)
-            super.tOpTemplate((DoubleMaxVector)v1, (DoubleMaxVector)v2,
-                              (DoubleMaxMask)m, f);  // specialize
+        return (DoubleVectorMax)
+            super.tOpTemplate((DoubleVectorMax)v1, (DoubleVectorMax)v2,
+                              (DoubleMaskMax)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class DoubleMaxVector extends DoubleVector {
 
     @Override
     @ForceInline
-    public DoubleMaxVector lanewise(Unary op) {
-        return (DoubleMaxVector) super.lanewiseTemplate(op);  // specialize
+    public DoubleVectorMax lanewise(Unary op) {
+        return (DoubleVectorMax) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector lanewise(Unary op, VectorMask<Double> m) {
-        return (DoubleMaxVector) super.lanewiseTemplate(op, DoubleMaxMask.class, (DoubleMaxMask) m);  // specialize
+    public DoubleVectorMax lanewise(Unary op, VectorMask<Double> m) {
+        return (DoubleVectorMax) super.lanewiseTemplate(op, DoubleMaskMax.class, (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector lanewise(Binary op, Vector<Double> v) {
-        return (DoubleMaxVector) super.lanewiseTemplate(op, v);  // specialize
+    public DoubleVectorMax lanewise(Binary op, Vector<Double> v) {
+        return (DoubleVectorMax) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
-        return (DoubleMaxVector) super.lanewiseTemplate(op, DoubleMaxMask.class, v, (DoubleMaxMask) m);  // specialize
+    public DoubleVectorMax lanewise(Binary op, Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVectorMax) super.lanewiseTemplate(op, DoubleMaskMax.class, v, (DoubleMaskMax) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class DoubleMaxVector extends DoubleVector {
     @Override
     @ForceInline
     public final
-    DoubleMaxVector
+    DoubleVectorMax
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2) {
-        return (DoubleMaxVector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (DoubleVectorMax) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    DoubleMaxVector
+    DoubleVectorMax
     lanewise(Ternary op, Vector<Double> v1, Vector<Double> v2, VectorMask<Double> m) {
-        return (DoubleMaxVector) super.lanewiseTemplate(op, DoubleMaxMask.class, v1, v2, (DoubleMaxMask) m);  // specialize
+        return (DoubleVectorMax) super.lanewiseTemplate(op, DoubleMaskMax.class, v1, v2, (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    DoubleMaxVector addIndex(int scale) {
-        return (DoubleMaxVector) super.addIndexTemplate(scale);  // specialize
+    DoubleVectorMax addIndex(int scale) {
+        return (DoubleVectorMax) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class DoubleMaxVector extends DoubleVector {
     @ForceInline
     public final double reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Double> m) {
-        return super.reduceLanesTemplate(op, DoubleMaxMask.class, (DoubleMaxMask) m);  // specialized
+        return super.reduceLanesTemplate(op, DoubleMaskMax.class, (DoubleMaskMax) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class DoubleMaxVector extends DoubleVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Double> m) {
-        return (long) super.reduceLanesTemplate(op, DoubleMaxMask.class, (DoubleMaxMask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, DoubleMaskMax.class, (DoubleMaskMax) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class DoubleMaxVector extends DoubleVector {
 
     @Override
     @ForceInline
-    public final DoubleMaxShuffle toShuffle() {
-        return (DoubleMaxShuffle) toShuffle(vspecies(), false);
+    public final DoubleShuffleMax toShuffle() {
+        return (DoubleShuffleMax) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final DoubleMaxMask test(Test op) {
-        return super.testTemplate(DoubleMaxMask.class, op);  // specialize
+    public final DoubleMaskMax test(Test op) {
+        return super.testTemplate(DoubleMaskMax.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final DoubleMaxMask test(Test op, VectorMask<Double> m) {
-        return super.testTemplate(DoubleMaxMask.class, op, (DoubleMaxMask) m);  // specialize
+    public final DoubleMaskMax test(Test op, VectorMask<Double> m) {
+        return super.testTemplate(DoubleMaskMax.class, op, (DoubleMaskMax) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final DoubleMaxMask compare(Comparison op, Vector<Double> v) {
-        return super.compareTemplate(DoubleMaxMask.class, op, v);  // specialize
+    public final DoubleMaskMax compare(Comparison op, Vector<Double> v) {
+        return super.compareTemplate(DoubleMaskMax.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final DoubleMaxMask compare(Comparison op, double s) {
-        return super.compareTemplate(DoubleMaxMask.class, op, s);  // specialize
+    public final DoubleMaskMax compare(Comparison op, double s) {
+        return super.compareTemplate(DoubleMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final DoubleMaxMask compare(Comparison op, long s) {
-        return super.compareTemplate(DoubleMaxMask.class, op, s);  // specialize
+    public final DoubleMaskMax compare(Comparison op, long s) {
+        return super.compareTemplate(DoubleMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final DoubleMaxMask compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
-        return super.compareTemplate(DoubleMaxMask.class, op, v, (DoubleMaxMask) m);
+    public final DoubleMaskMax compare(Comparison op, Vector<Double> v, VectorMask<Double> m) {
+        return super.compareTemplate(DoubleMaskMax.class, op, v, (DoubleMaskMax) m);
     }
 
 
     @Override
     @ForceInline
-    public DoubleMaxVector blend(Vector<Double> v, VectorMask<Double> m) {
-        return (DoubleMaxVector)
-            super.blendTemplate(DoubleMaxMask.class,
-                                (DoubleMaxVector) v,
-                                (DoubleMaxMask) m);  // specialize
+    public DoubleVectorMax blend(Vector<Double> v, VectorMask<Double> m) {
+        return (DoubleVectorMax)
+            super.blendTemplate(DoubleMaskMax.class,
+                                (DoubleVectorMax) v,
+                                (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector slice(int origin, Vector<Double> v) {
-        return (DoubleMaxVector) super.sliceTemplate(origin, v);  // specialize
+    public DoubleVectorMax slice(int origin, Vector<Double> v) {
+        return (DoubleVectorMax) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector slice(int origin) {
-        return (DoubleMaxVector) super.sliceTemplate(origin);  // specialize
+    public DoubleVectorMax slice(int origin) {
+        return (DoubleVectorMax) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector unslice(int origin, Vector<Double> w, int part) {
-        return (DoubleMaxVector) super.unsliceTemplate(origin, w, part);  // specialize
+    public DoubleVectorMax unslice(int origin, Vector<Double> w, int part) {
+        return (DoubleVectorMax) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
-        return (DoubleMaxVector)
-            super.unsliceTemplate(DoubleMaxMask.class,
+    public DoubleVectorMax unslice(int origin, Vector<Double> w, int part, VectorMask<Double> m) {
+        return (DoubleVectorMax)
+            super.unsliceTemplate(DoubleMaskMax.class,
                                   origin, w, part,
-                                  (DoubleMaxMask) m);  // specialize
+                                  (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector unslice(int origin) {
-        return (DoubleMaxVector) super.unsliceTemplate(origin);  // specialize
+    public DoubleVectorMax unslice(int origin) {
+        return (DoubleVectorMax) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector rearrange(VectorShuffle<Double> s) {
-        return (DoubleMaxVector)
-            super.rearrangeTemplate(DoubleMaxShuffle.class,
-                                    (DoubleMaxShuffle) s);  // specialize
+    public DoubleVectorMax rearrange(VectorShuffle<Double> s) {
+        return (DoubleVectorMax)
+            super.rearrangeTemplate(DoubleShuffleMax.class,
+                                    (DoubleShuffleMax) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector rearrange(VectorShuffle<Double> shuffle,
+    public DoubleVectorMax rearrange(VectorShuffle<Double> shuffle,
                                   VectorMask<Double> m) {
-        return (DoubleMaxVector)
-            super.rearrangeTemplate(DoubleMaxShuffle.class,
-                                    DoubleMaxMask.class,
-                                    (DoubleMaxShuffle) shuffle,
-                                    (DoubleMaxMask) m);  // specialize
+        return (DoubleVectorMax)
+            super.rearrangeTemplate(DoubleShuffleMax.class,
+                                    DoubleMaskMax.class,
+                                    (DoubleShuffleMax) shuffle,
+                                    (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector rearrange(VectorShuffle<Double> s,
+    public DoubleVectorMax rearrange(VectorShuffle<Double> s,
                                   Vector<Double> v) {
-        return (DoubleMaxVector)
-            super.rearrangeTemplate(DoubleMaxShuffle.class,
-                                    (DoubleMaxShuffle) s,
-                                    (DoubleMaxVector) v);  // specialize
+        return (DoubleVectorMax)
+            super.rearrangeTemplate(DoubleShuffleMax.class,
+                                    (DoubleShuffleMax) s,
+                                    (DoubleVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector compress(VectorMask<Double> m) {
-        return (DoubleMaxVector)
-            super.compressTemplate(DoubleMaxMask.class,
-                                   (DoubleMaxMask) m);  // specialize
+    public DoubleVectorMax compress(VectorMask<Double> m) {
+        return (DoubleVectorMax)
+            super.compressTemplate(DoubleMaskMax.class,
+                                   (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector expand(VectorMask<Double> m) {
-        return (DoubleMaxVector)
-            super.expandTemplate(DoubleMaxMask.class,
-                                   (DoubleMaxMask) m);  // specialize
+    public DoubleVectorMax expand(VectorMask<Double> m) {
+        return (DoubleVectorMax)
+            super.expandTemplate(DoubleMaskMax.class,
+                                   (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector selectFrom(Vector<Double> v) {
-        return (DoubleMaxVector)
-            super.selectFromTemplate((DoubleMaxVector) v);  // specialize
+    public DoubleVectorMax selectFrom(Vector<Double> v) {
+        return (DoubleVectorMax)
+            super.selectFromTemplate((DoubleVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector selectFrom(Vector<Double> v,
+    public DoubleVectorMax selectFrom(Vector<Double> v,
                                    VectorMask<Double> m) {
-        return (DoubleMaxVector)
-            super.selectFromTemplate((DoubleMaxVector) v,
-                                     DoubleMaxMask.class, (DoubleMaxMask) m);  // specialize
+        return (DoubleVectorMax)
+            super.selectFromTemplate((DoubleVectorMax) v,
+                                     DoubleMaskMax.class, (DoubleMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public DoubleMaxVector selectFrom(Vector<Double> v1,
+    public DoubleVectorMax selectFrom(Vector<Double> v1,
                                    Vector<Double> v2) {
-        return (DoubleMaxVector)
-            super.selectFromTemplate((DoubleMaxVector) v1, (DoubleMaxVector) v2);  // specialize
+        return (DoubleVectorMax)
+            super.selectFromTemplate((DoubleVectorMax) v1, (DoubleVectorMax) v2);  // specialize
     }
 
     @ForceInline
@@ -514,7 +526,7 @@ final class DoubleMaxVector extends DoubleVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      double[] vecarr = vec.vec();
@@ -524,7 +536,7 @@ final class DoubleMaxVector extends DoubleVector {
 
     @ForceInline
     @Override
-    public DoubleMaxVector withLane(int i, double e) {
+    public DoubleVectorMax withLane(int i, double e) {
         if (i < 0 || i >= VLENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
         }
@@ -532,9 +544,9 @@ final class DoubleMaxVector extends DoubleVector {
     }
 
     @ForceInline
-    public DoubleMaxVector withLaneHelper(int i, double e) {
+    public DoubleVectorMax withLaneHelper(int i, double e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Double.doubleToRawLongBits(e),
                                 (v, ix, bits) -> {
                                     double[] res = v.vec().clone();
@@ -545,19 +557,20 @@ final class DoubleMaxVector extends DoubleVector {
 
     // Mask
 
-    static final class DoubleMaxMask extends AbstractMask<Double> {
+    static final class DoubleMaskMax extends AbstractMask<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Double> ETYPE = double.class; // used by the JVM
 
-        DoubleMaxMask(boolean[] bits) {
+        static final Class<Double> CTYPE = double.class; // used by the JVM
+
+        DoubleMaskMax(boolean[] bits) {
             this(bits, 0);
         }
 
-        DoubleMaxMask(boolean[] bits, int offset) {
+        DoubleMaskMax(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        DoubleMaxMask(boolean val) {
+        DoubleMaskMax(boolean val) {
             super(prepare(val));
         }
 
@@ -590,31 +603,31 @@ final class DoubleMaxVector extends DoubleVector {
         }
 
         @Override
-        DoubleMaxMask uOp(MUnOp f) {
+        DoubleMaskMax uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new DoubleMaxMask(res);
+            return new DoubleMaskMax(res);
         }
 
         @Override
-        DoubleMaxMask bOp(VectorMask<Double> m, MBinOp f) {
+        DoubleMaskMax bOp(VectorMask<Double> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((DoubleMaxMask)m).getBits();
+            boolean[] mbits = ((DoubleMaskMax)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new DoubleMaxMask(res);
+            return new DoubleMaskMax(res);
         }
 
         @ForceInline
         @Override
         public final
-        DoubleMaxVector toVector() {
-            return (DoubleMaxVector) super.toVectorTemplate();  // specialize
+        DoubleVectorMax toVector() {
+            return (DoubleVectorMax) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -638,8 +651,8 @@ final class DoubleMaxVector extends DoubleVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -647,25 +660,25 @@ final class DoubleMaxVector extends DoubleVector {
         @Override
         @ForceInline
         /*package-private*/
-        DoubleMaxMask indexPartiallyInUpperRange(long offset, long limit) {
-            return (DoubleMaxMask) VectorSupport.indexPartiallyInUpperRange(
-                DoubleMaxMask.class, double.class, VLENGTH, offset, limit,
-                (o, l) -> (DoubleMaxMask) TRUE_MASK.indexPartiallyInRange(o, l));
+        DoubleMaskMax indexPartiallyInUpperRange(long offset, long limit) {
+            return (DoubleMaskMax) VectorSupport.indexPartiallyInUpperRange(
+                DoubleMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (DoubleMaskMax) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public DoubleMaxMask not() {
+        public DoubleMaskMax not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public DoubleMaxMask compress() {
-            return (DoubleMaxMask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                DoubleMaxVector.class, DoubleMaxMask.class, ETYPE, VLENGTH, null, this,
+        public DoubleMaskMax compress() {
+            return (DoubleMaskMax)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                DoubleVectorMax.class, DoubleMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -674,30 +687,30 @@ final class DoubleMaxVector extends DoubleVector {
 
         @Override
         @ForceInline
-        public DoubleMaxMask and(VectorMask<Double> mask) {
+        public DoubleMaskMax and(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            DoubleMaxMask m = (DoubleMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, DoubleMaxMask.class, null, long.class, VLENGTH,
+            DoubleMaskMax m = (DoubleMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, DoubleMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public DoubleMaxMask or(VectorMask<Double> mask) {
+        public DoubleMaskMax or(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            DoubleMaxMask m = (DoubleMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, DoubleMaxMask.class, null, long.class, VLENGTH,
+            DoubleMaskMax m = (DoubleMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, DoubleMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public DoubleMaxMask xor(VectorMask<Double> mask) {
+        public DoubleMaskMax xor(VectorMask<Double> mask) {
             Objects.requireNonNull(mask);
-            DoubleMaxMask m = (DoubleMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, DoubleMaxMask.class, null, long.class, VLENGTH,
+            DoubleMaskMax m = (DoubleMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, DoubleMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -707,21 +720,21 @@ final class DoubleMaxVector extends DoubleVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, DoubleMaxMask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, DoubleMaxMask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, DoubleMaxMask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -731,7 +744,7 @@ final class DoubleMaxVector extends DoubleVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, DoubleMaxMask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -741,7 +754,7 @@ final class DoubleMaxVector extends DoubleVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(DoubleMaxMask.class, double.class, VLENGTH,
+            return VectorSupport.extract(DoubleMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -750,48 +763,49 @@ final class DoubleMaxVector extends DoubleVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, DoubleMaxMask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((DoubleMaxMask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((DoubleMaskMax)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, DoubleMaxMask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((DoubleMaxMask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((DoubleMaskMax)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static DoubleMaxMask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(DoubleMaxMask.class, long.class, VLENGTH,
+        static DoubleMaskMax maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(DoubleMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final DoubleMaxMask  TRUE_MASK = new DoubleMaxMask(true);
-        private static final DoubleMaxMask FALSE_MASK = new DoubleMaxMask(false);
+        private static final DoubleMaskMax  TRUE_MASK = new DoubleMaskMax(true);
+        private static final DoubleMaskMax FALSE_MASK = new DoubleMaskMax(false);
 
     }
 
     // Shuffle
 
-    static final class DoubleMaxShuffle extends AbstractShuffle<Double> {
+    static final class DoubleShuffleMax extends AbstractShuffle<Double> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        DoubleMaxShuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        DoubleShuffleMax(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        DoubleMaxShuffle(int[] indices, int i) {
+        DoubleShuffleMax(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        DoubleMaxShuffle(IntUnaryOperator fn) {
+        DoubleShuffleMax(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -811,23 +825,23 @@ final class DoubleMaxVector extends DoubleVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final DoubleMaxShuffle IOTA = new DoubleMaxShuffle(IDENTITY);
+        static final DoubleShuffleMax IOTA = new DoubleShuffleMax(IDENTITY);
 
         @Override
         @ForceInline
-        public DoubleMaxVector toVector() {
-            return (DoubleMaxVector) toBitsVector().castShape(vspecies(), 0);
+        public DoubleVectorMax toVector() {
+            return (DoubleVectorMax) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        LongMaxVector toBitsVector() {
-            return (LongMaxVector) super.toBitsVectorTemplate();
+        LongVectorMax toBitsVector() {
+            return (LongVectorMax) super.toBitsVectorTemplate();
         }
 
         @Override
-        LongMaxVector toBitsVector0() {
-            return ((LongMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVectorMax toBitsVector0() {
+            return ((LongVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -899,30 +913,30 @@ final class DoubleMaxVector extends DoubleVector {
 
         @Override
         @ForceInline
-        public final DoubleMaxMask laneIsValid() {
-            return (DoubleMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final DoubleMaskMax laneIsValid() {
+            return (DoubleMaskMax) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final DoubleMaxShuffle rearrange(VectorShuffle<Double> shuffle) {
-            DoubleMaxShuffle concreteShuffle = (DoubleMaxShuffle) shuffle;
-            return (DoubleMaxShuffle) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_MAX))
+        public final DoubleShuffleMax rearrange(VectorShuffle<Double> shuffle) {
+            DoubleShuffleMax concreteShuffle = (DoubleShuffleMax) shuffle;
+            return (DoubleShuffleMax) toBitsVector().rearrange(concreteShuffle.cast(LongVector.SPECIES_MAX))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final DoubleMaxShuffle wrapIndexes() {
-            LongMaxVector v = toBitsVector();
+        public final DoubleShuffleMax wrapIndexes() {
+            LongVectorMax v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (LongMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVectorMax) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (LongMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (DoubleMaxShuffle) v.toShuffle(vspecies(), false);
+            return (DoubleShuffleMax) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -973,14 +987,14 @@ final class DoubleMaxVector extends DoubleVector {
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromArray0Template(DoubleMaxMask.class, a, offset, (DoubleMaxMask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(DoubleMaskMax.class, a, offset, (DoubleMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     DoubleVector fromArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        return super.fromArray0Template(DoubleMaxMask.class, a, offset, indexMap, mapOffset, (DoubleMaxMask) m);
+        return super.fromArray0Template(DoubleMaskMax.class, a, offset, indexMap, mapOffset, (DoubleMaskMax) m);
     }
 
 
@@ -996,7 +1010,7 @@ final class DoubleMaxVector extends DoubleVector {
     @Override
     final
     DoubleVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(DoubleMaxMask.class, ms, offset, (DoubleMaxMask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(DoubleMaskMax.class, ms, offset, (DoubleMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1010,14 +1024,14 @@ final class DoubleMaxVector extends DoubleVector {
     @Override
     final
     void intoArray0(double[] a, int offset, VectorMask<Double> m) {
-        super.intoArray0Template(DoubleMaxMask.class, a, offset, (DoubleMaxMask) m);
+        super.intoArray0Template(DoubleMaskMax.class, a, offset, (DoubleMaskMax) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(double[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Double> m) {
-        super.intoArray0Template(DoubleMaxMask.class, a, offset, indexMap, mapOffset, (DoubleMaxMask) m);
+        super.intoArray0Template(DoubleMaskMax.class, a, offset, indexMap, mapOffset, (DoubleMaskMax) m);
     }
 
 
@@ -1025,7 +1039,7 @@ final class DoubleMaxVector extends DoubleVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Double> m) {
-        super.intoMemorySegment0Template(DoubleMaxMask.class, ms, offset, (DoubleMaxMask) m);
+        super.intoMemorySegment0Template(DoubleMaskMax.class, ms, offset, (DoubleMaskMax) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
index b481d5a51d7..5862a295fa3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ public abstract class FloatVector extends AbstractVector<Float> {
 
     static final ValueLayout.OfFloat ELEMENT_LAYOUT = ValueLayout.JAVA_FLOAT.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = LT_FLOAT;
+
+    static final int LANEBITS_TYPE_ORDINAL = LT_INT;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -80,8 +84,8 @@ public abstract class FloatVector extends AbstractVector<Float> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -562,7 +566,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     @ForceInline
     public static FloatVector zero(VectorSpecies<Float> species) {
         FloatSpecies vsp = (FloatSpecies) species;
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), float.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                         toBits(0.0f), MODE_BROADCAST, vsp,
                         ((bits_, s_) -> s_.rvOp(i -> bits_)));
     }
@@ -684,7 +688,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, float.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, FloatVector::unaryOperations));
     }
@@ -712,7 +716,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, float.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, FloatVector::unaryOperations));
     }
@@ -720,7 +724,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     @ForceInline
     final
     FloatVector unaryMathOp(VectorOperators.Unary op) {
-        return VectorMathLibrary.unaryMathOp(op, opCode(op), species(), FloatVector::unaryOperations,
+        return VectorMathLibrary.unaryMathOp(op, opCode(op), vspecies(), FloatVector::unaryOperations,
                                              this);
     }
 
@@ -801,7 +805,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, float.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, FloatVector::binaryOperations));
     }
@@ -839,7 +843,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, float.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, FloatVector::binaryOperations));
     }
@@ -847,7 +851,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     @ForceInline
     final
     FloatVector binaryMathOp(VectorOperators.Binary op, FloatVector that) {
-        return VectorMathLibrary.binaryMathOp(op, opCode(op), species(), FloatVector::binaryOperations,
+        return VectorMathLibrary.binaryMathOp(op, opCode(op), vspecies(), FloatVector::binaryOperations,
                                               this, that);
     }
 
@@ -1021,7 +1025,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         tother.check(this);
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, float.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, FloatVector::ternaryOperations));
     }
@@ -1056,7 +1060,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
 
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, float.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, FloatVector::ternaryOperations));
     }
@@ -1940,7 +1944,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, float.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Float> m
@@ -1962,7 +1966,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, float.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Float> cmpM
@@ -2089,7 +2093,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     blendTemplate(Class<M> maskType, FloatVector v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, float.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2106,7 +2110,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), float.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2298,7 +2302,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     FloatVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, float.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2325,7 +2329,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, float.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2351,7 +2355,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         VectorMask<Float> valid = shuffle.laneIsValid();
         FloatVector r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, float.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2359,7 +2363,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
                 }));
         FloatVector r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, float.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2403,7 +2407,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     FloatVector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (FloatVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        float.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -2422,7 +2426,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     FloatVector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (FloatVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        float.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -2437,7 +2441,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     /*package-private*/
     @ForceInline
     final FloatVector selectFromTemplate(FloatVector v) {
-        return (FloatVector)VectorSupport.selectFromOp(getClass(), null, float.class,
+        return (FloatVector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -2457,7 +2461,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     FloatVector selectFromTemplate(FloatVector v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return (FloatVector)VectorSupport.selectFromOp(getClass(), masktype, float.class,
+        return (FloatVector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -2475,7 +2479,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     /*package-private*/
     @ForceInline
     final FloatVector selectFromTemplate(FloatVector v1, FloatVector v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), float.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -2681,7 +2685,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, float.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, FloatVector::reductionOperations)));
     }
@@ -2699,7 +2703,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, float.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, FloatVector::reductionOperations)));
     }
@@ -2942,7 +2946,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, null, float.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3125,7 +3129,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         offset = checkFromIndexSize(offset, length(), a.length);
         FloatSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3214,7 +3218,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), null, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, null,
@@ -3341,7 +3345,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     FloatVector fromArray0Template(float[] a, int offset) {
         FloatSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3358,7 +3362,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         m.check(species());
         FloatSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3391,7 +3395,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, float.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -3408,7 +3412,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     FloatVector fromMemorySegment0Template(MemorySegment ms, long offset) {
         FloatSpecies vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, FloatVector::memorySegmentGet);
@@ -3424,7 +3428,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         FloatSpecies vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, FloatVector::memorySegmentGet);
@@ -3442,7 +3446,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     void intoArray0Template(float[] a, int offset) {
         FloatSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -3459,7 +3463,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         m.check(species());
         FloatSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -3488,7 +3492,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, m,
@@ -3507,7 +3511,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         FloatSpecies vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -3524,7 +3528,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         FloatSpecies vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -3562,6 +3566,18 @@ public abstract class FloatVector extends AbstractVector<Float> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    FloatVector swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+        int subLanesPerSrc = subLanesToSwap(srcSpecies);
+        if (subLanesPerSrc < 0) {
+            return this;
+        }
+        VectorShuffle<Float> shuffle = normalizeSubLanesForSpecies(this.vspecies(), subLanesPerSrc);
+        return (FloatVector) this.rearrange(shuffle);
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_FLOAT_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -3728,7 +3744,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
         final FloatVector broadcastBits(long bits) {
             return (FloatVector)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, float.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -3910,13 +3926,13 @@ public abstract class FloatVector extends AbstractVector<Float> {
         @Override
         @ForceInline
         public final FloatVector zero() {
-            if ((Class<?>) vectorType() == FloatMaxVector.class)
-                return FloatMaxVector.ZERO;
+            if ((Class<?>) vectorType() == FloatVectorMax.class)
+                return FloatVectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return Float64Vector.ZERO;
-                case 128: return Float128Vector.ZERO;
-                case 256: return Float256Vector.ZERO;
-                case 512: return Float512Vector.ZERO;
+                case 64: return FloatVector64.ZERO;
+                case 128: return FloatVector128.ZERO;
+                case 256: return FloatVector256.ZERO;
+                case 512: return FloatVector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -3924,13 +3940,13 @@ public abstract class FloatVector extends AbstractVector<Float> {
         @Override
         @ForceInline
         public final FloatVector iota() {
-            if ((Class<?>) vectorType() == FloatMaxVector.class)
-                return FloatMaxVector.IOTA;
+            if ((Class<?>) vectorType() == FloatVectorMax.class)
+                return FloatVectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return Float64Vector.IOTA;
-                case 128: return Float128Vector.IOTA;
-                case 256: return Float256Vector.IOTA;
-                case 512: return Float512Vector.IOTA;
+                case 64: return FloatVector64.IOTA;
+                case 128: return FloatVector128.IOTA;
+                case 256: return FloatVector256.IOTA;
+                case 512: return FloatVector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -3939,13 +3955,13 @@ public abstract class FloatVector extends AbstractVector<Float> {
         @Override
         @ForceInline
         public final VectorMask<Float> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == FloatMaxVector.class)
-                return FloatMaxVector.FloatMaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == FloatVectorMax.class)
+                return FloatVectorMax.FloatMaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return Float64Vector.Float64Mask.maskAll(bit);
-                case 128: return Float128Vector.Float128Mask.maskAll(bit);
-                case 256: return Float256Vector.Float256Mask.maskAll(bit);
-                case 512: return Float512Vector.Float512Mask.maskAll(bit);
+                case 64: return FloatVector64.FloatMask64.maskAll(bit);
+                case 128: return FloatVector128.FloatMask128.maskAll(bit);
+                case 256: return FloatVector256.FloatMask256.maskAll(bit);
+                case 512: return FloatVector512.FloatMask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -3973,42 +3989,42 @@ public abstract class FloatVector extends AbstractVector<Float> {
     /** Species representing {@link FloatVector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<Float> SPECIES_64
         = new FloatSpecies(VectorShape.S_64_BIT,
-                            Float64Vector.class,
-                            Float64Vector.Float64Mask.class,
-                            Float64Vector.Float64Shuffle.class,
-                            Float64Vector::new);
+                            FloatVector64.class,
+                            FloatVector64.FloatMask64.class,
+                            FloatVector64.FloatShuffle64.class,
+                            FloatVector64::new);
 
     /** Species representing {@link FloatVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<Float> SPECIES_128
         = new FloatSpecies(VectorShape.S_128_BIT,
-                            Float128Vector.class,
-                            Float128Vector.Float128Mask.class,
-                            Float128Vector.Float128Shuffle.class,
-                            Float128Vector::new);
+                            FloatVector128.class,
+                            FloatVector128.FloatMask128.class,
+                            FloatVector128.FloatShuffle128.class,
+                            FloatVector128::new);
 
     /** Species representing {@link FloatVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<Float> SPECIES_256
         = new FloatSpecies(VectorShape.S_256_BIT,
-                            Float256Vector.class,
-                            Float256Vector.Float256Mask.class,
-                            Float256Vector.Float256Shuffle.class,
-                            Float256Vector::new);
+                            FloatVector256.class,
+                            FloatVector256.FloatMask256.class,
+                            FloatVector256.FloatShuffle256.class,
+                            FloatVector256::new);
 
     /** Species representing {@link FloatVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<Float> SPECIES_512
         = new FloatSpecies(VectorShape.S_512_BIT,
-                            Float512Vector.class,
-                            Float512Vector.Float512Mask.class,
-                            Float512Vector.Float512Shuffle.class,
-                            Float512Vector::new);
+                            FloatVector512.class,
+                            FloatVector512.FloatMask512.class,
+                            FloatVector512.FloatShuffle512.class,
+                            FloatVector512::new);
 
     /** Species representing {@link FloatVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<Float> SPECIES_MAX
         = new FloatSpecies(VectorShape.S_Max_BIT,
-                            FloatMaxVector.class,
-                            FloatMaxVector.FloatMaxMask.class,
-                            FloatMaxVector.FloatMaxShuffle.class,
-                            FloatMaxVector::new);
+                            FloatVectorMax.class,
+                            FloatVectorMax.FloatMaskMax.class,
+                            FloatVectorMax.FloatShuffleMax.class,
+                            FloatVectorMax::new);
 
     /**
      * Preferred species for {@link FloatVector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector128.java
similarity index 62%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector128.java
index fdfd234cb47..1e3867e84fc 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector128.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Float128Vector extends FloatVector {
+final class FloatVector128 extends FloatVector {
     static final FloatSpecies VSPECIES =
         (FloatSpecies) FloatVector.SPECIES_128;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Float128Vector> VCLASS = Float128Vector.class;
+    static final Class<FloatVector128> VCLASS = FloatVector128.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Float> CTYPE = float.class; // carrier type used by the JVM
+
     static final Class<Float> ETYPE = float.class; // used by the JVM
 
-    Float128Vector(float[] v) {
+    FloatVector128(float[] v) {
         super(v);
     }
 
-    // For compatibility as Float128Vector::new,
+    // For compatibility as FloatVector128::new,
     // stored into species.vectorFactory.
-    Float128Vector(Object v) {
+    FloatVector128(Object v) {
         this((float[]) v);
     }
 
-    static final Float128Vector ZERO = new Float128Vector(new float[VLENGTH]);
-    static final Float128Vector IOTA = new Float128Vector(VSPECIES.iotaArray());
+    static final FloatVector128 ZERO = new FloatVector128(new float[VLENGTH]);
+    static final FloatVector128 IOTA = new FloatVector128(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Float128Vector extends FloatVector {
     @Override
     public final Class<Float> elementType() { return float.class; }
 
+    @ForceInline
+    final Class<Float> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Float.SIZE; }
@@ -119,55 +124,62 @@ final class Float128Vector extends FloatVector {
         return (float[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Float128Vector broadcast(float e) {
-        return (Float128Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector128 broadcast(float e) {
+        return (FloatVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float128Vector broadcast(long e) {
-        return (Float128Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector128 broadcast(long e) {
+        return (FloatVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Float128Mask maskFromArray(boolean[] bits) {
-        return new Float128Mask(bits);
+    FloatMask128 maskFromArray(boolean[] bits) {
+        return new FloatMask128(bits);
     }
 
     @Override
     @ForceInline
-    Float128Shuffle iotaShuffle() { return Float128Shuffle.IOTA; }
+    FloatShuffle128 iotaShuffle() { return FloatShuffle128.IOTA; }
 
     @Override
     @ForceInline
-    Float128Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Float128Shuffle) iotaShuffleTemplate(start, step, wrap);
+    FloatShuffle128 iotaShuffle(int start, int step, boolean wrap) {
+        return (FloatShuffle128) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Float128Shuffle shuffleFromArray(int[] indices, int i) { return new Float128Shuffle(indices, i); }
+    FloatShuffle128 shuffleFromArray(int[] indices, int i) { return new FloatShuffle128(indices, i); }
 
     @Override
     @ForceInline
-    Float128Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Float128Shuffle(fn); }
+    FloatShuffle128 shuffleFromOp(IntUnaryOperator fn) { return new FloatShuffle128(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Float128Vector vectorFactory(float[] vec) {
-        return new Float128Vector(vec);
+    FloatVector128 vectorFactory(float[] vec) {
+        return new FloatVector128(vec);
     }
 
     @ForceInline
     final @Override
-    Byte128Vector asByteVectorRaw() {
-        return (Byte128Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector128 asByteVectorRaw() {
+        return (ByteVector128) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Float128Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float128Vector uOp(FUnOp f) {
-        return (Float128Vector) super.uOpTemplate(f);  // specialize
+    FloatVector128 uOp(FUnOp f) {
+        return (FloatVector128) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float128Vector uOp(VectorMask<Float> m, FUnOp f) {
-        return (Float128Vector)
-            super.uOpTemplate((Float128Mask)m, f);  // specialize
+    FloatVector128 uOp(VectorMask<Float> m, FUnOp f) {
+        return (FloatVector128)
+            super.uOpTemplate((FloatMask128)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Float128Vector bOp(Vector<Float> v, FBinOp f) {
-        return (Float128Vector) super.bOpTemplate((Float128Vector)v, f);  // specialize
+    FloatVector128 bOp(Vector<Float> v, FBinOp f) {
+        return (FloatVector128) super.bOpTemplate((FloatVector128)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float128Vector bOp(Vector<Float> v,
+    FloatVector128 bOp(Vector<Float> v,
                      VectorMask<Float> m, FBinOp f) {
-        return (Float128Vector)
-            super.bOpTemplate((Float128Vector)v, (Float128Mask)m,
+        return (FloatVector128)
+            super.bOpTemplate((FloatVector128)v, (FloatMask128)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Float128Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float128Vector tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
-        return (Float128Vector)
-            super.tOpTemplate((Float128Vector)v1, (Float128Vector)v2,
+    FloatVector128 tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
+        return (FloatVector128)
+            super.tOpTemplate((FloatVector128)v1, (FloatVector128)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float128Vector tOp(Vector<Float> v1, Vector<Float> v2,
+    FloatVector128 tOp(Vector<Float> v1, Vector<Float> v2,
                      VectorMask<Float> m, FTriOp f) {
-        return (Float128Vector)
-            super.tOpTemplate((Float128Vector)v1, (Float128Vector)v2,
-                              (Float128Mask)m, f);  // specialize
+        return (FloatVector128)
+            super.tOpTemplate((FloatVector128)v1, (FloatVector128)v2,
+                              (FloatMask128)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Float128Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public Float128Vector lanewise(Unary op) {
-        return (Float128Vector) super.lanewiseTemplate(op);  // specialize
+    public FloatVector128 lanewise(Unary op) {
+        return (FloatVector128) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector lanewise(Unary op, VectorMask<Float> m) {
-        return (Float128Vector) super.lanewiseTemplate(op, Float128Mask.class, (Float128Mask) m);  // specialize
+    public FloatVector128 lanewise(Unary op, VectorMask<Float> m) {
+        return (FloatVector128) super.lanewiseTemplate(op, FloatMask128.class, (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector lanewise(Binary op, Vector<Float> v) {
-        return (Float128Vector) super.lanewiseTemplate(op, v);  // specialize
+    public FloatVector128 lanewise(Binary op, Vector<Float> v) {
+        return (FloatVector128) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
-        return (Float128Vector) super.lanewiseTemplate(op, Float128Mask.class, v, (Float128Mask) m);  // specialize
+    public FloatVector128 lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector128) super.lanewiseTemplate(op, FloatMask128.class, v, (FloatMask128) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Float128Vector extends FloatVector {
     @Override
     @ForceInline
     public final
-    Float128Vector
+    FloatVector128
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2) {
-        return (Float128Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (FloatVector128) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float128Vector
+    FloatVector128
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2, VectorMask<Float> m) {
-        return (Float128Vector) super.lanewiseTemplate(op, Float128Mask.class, v1, v2, (Float128Mask) m);  // specialize
+        return (FloatVector128) super.lanewiseTemplate(op, FloatMask128.class, v1, v2, (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float128Vector addIndex(int scale) {
-        return (Float128Vector) super.addIndexTemplate(scale);  // specialize
+    FloatVector128 addIndex(int scale) {
+        return (FloatVector128) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Float128Vector extends FloatVector {
     @ForceInline
     public final float reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Float> m) {
-        return super.reduceLanesTemplate(op, Float128Mask.class, (Float128Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, FloatMask128.class, (FloatMask128) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Float128Vector extends FloatVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Float> m) {
-        return (long) super.reduceLanesTemplate(op, Float128Mask.class, (Float128Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, FloatMask128.class, (FloatMask128) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Float128Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public final Float128Shuffle toShuffle() {
-        return (Float128Shuffle) toShuffle(vspecies(), false);
+    public final FloatShuffle128 toShuffle() {
+        return (FloatShuffle128) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Float128Mask test(Test op) {
-        return super.testTemplate(Float128Mask.class, op);  // specialize
+    public final FloatMask128 test(Test op) {
+        return super.testTemplate(FloatMask128.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float128Mask test(Test op, VectorMask<Float> m) {
-        return super.testTemplate(Float128Mask.class, op, (Float128Mask) m);  // specialize
+    public final FloatMask128 test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(FloatMask128.class, op, (FloatMask128) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Float128Mask compare(Comparison op, Vector<Float> v) {
-        return super.compareTemplate(Float128Mask.class, op, v);  // specialize
+    public final FloatMask128 compare(Comparison op, Vector<Float> v) {
+        return super.compareTemplate(FloatMask128.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float128Mask compare(Comparison op, float s) {
-        return super.compareTemplate(Float128Mask.class, op, s);  // specialize
+    public final FloatMask128 compare(Comparison op, float s) {
+        return super.compareTemplate(FloatMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float128Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Float128Mask.class, op, s);  // specialize
+    public final FloatMask128 compare(Comparison op, long s) {
+        return super.compareTemplate(FloatMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float128Mask compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
-        return super.compareTemplate(Float128Mask.class, op, v, (Float128Mask) m);
+    public final FloatMask128 compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
+        return super.compareTemplate(FloatMask128.class, op, v, (FloatMask128) m);
     }
 
 
     @Override
     @ForceInline
-    public Float128Vector blend(Vector<Float> v, VectorMask<Float> m) {
-        return (Float128Vector)
-            super.blendTemplate(Float128Mask.class,
-                                (Float128Vector) v,
-                                (Float128Mask) m);  // specialize
+    public FloatVector128 blend(Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector128)
+            super.blendTemplate(FloatMask128.class,
+                                (FloatVector128) v,
+                                (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector slice(int origin, Vector<Float> v) {
-        return (Float128Vector) super.sliceTemplate(origin, v);  // specialize
+    public FloatVector128 slice(int origin, Vector<Float> v) {
+        return (FloatVector128) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector slice(int origin) {
-        return (Float128Vector) super.sliceTemplate(origin);  // specialize
+    public FloatVector128 slice(int origin) {
+        return (FloatVector128) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector unslice(int origin, Vector<Float> w, int part) {
-        return (Float128Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public FloatVector128 unslice(int origin, Vector<Float> w, int part) {
+        return (FloatVector128) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
-        return (Float128Vector)
-            super.unsliceTemplate(Float128Mask.class,
+    public FloatVector128 unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
+        return (FloatVector128)
+            super.unsliceTemplate(FloatMask128.class,
                                   origin, w, part,
-                                  (Float128Mask) m);  // specialize
+                                  (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector unslice(int origin) {
-        return (Float128Vector) super.unsliceTemplate(origin);  // specialize
+    public FloatVector128 unslice(int origin) {
+        return (FloatVector128) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector rearrange(VectorShuffle<Float> s) {
-        return (Float128Vector)
-            super.rearrangeTemplate(Float128Shuffle.class,
-                                    (Float128Shuffle) s);  // specialize
+    public FloatVector128 rearrange(VectorShuffle<Float> s) {
+        return (FloatVector128)
+            super.rearrangeTemplate(FloatShuffle128.class,
+                                    (FloatShuffle128) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector rearrange(VectorShuffle<Float> shuffle,
+    public FloatVector128 rearrange(VectorShuffle<Float> shuffle,
                                   VectorMask<Float> m) {
-        return (Float128Vector)
-            super.rearrangeTemplate(Float128Shuffle.class,
-                                    Float128Mask.class,
-                                    (Float128Shuffle) shuffle,
-                                    (Float128Mask) m);  // specialize
+        return (FloatVector128)
+            super.rearrangeTemplate(FloatShuffle128.class,
+                                    FloatMask128.class,
+                                    (FloatShuffle128) shuffle,
+                                    (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector rearrange(VectorShuffle<Float> s,
+    public FloatVector128 rearrange(VectorShuffle<Float> s,
                                   Vector<Float> v) {
-        return (Float128Vector)
-            super.rearrangeTemplate(Float128Shuffle.class,
-                                    (Float128Shuffle) s,
-                                    (Float128Vector) v);  // specialize
+        return (FloatVector128)
+            super.rearrangeTemplate(FloatShuffle128.class,
+                                    (FloatShuffle128) s,
+                                    (FloatVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector compress(VectorMask<Float> m) {
-        return (Float128Vector)
-            super.compressTemplate(Float128Mask.class,
-                                   (Float128Mask) m);  // specialize
+    public FloatVector128 compress(VectorMask<Float> m) {
+        return (FloatVector128)
+            super.compressTemplate(FloatMask128.class,
+                                   (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector expand(VectorMask<Float> m) {
-        return (Float128Vector)
-            super.expandTemplate(Float128Mask.class,
-                                   (Float128Mask) m);  // specialize
+    public FloatVector128 expand(VectorMask<Float> m) {
+        return (FloatVector128)
+            super.expandTemplate(FloatMask128.class,
+                                   (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector selectFrom(Vector<Float> v) {
-        return (Float128Vector)
-            super.selectFromTemplate((Float128Vector) v);  // specialize
+    public FloatVector128 selectFrom(Vector<Float> v) {
+        return (FloatVector128)
+            super.selectFromTemplate((FloatVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector selectFrom(Vector<Float> v,
+    public FloatVector128 selectFrom(Vector<Float> v,
                                    VectorMask<Float> m) {
-        return (Float128Vector)
-            super.selectFromTemplate((Float128Vector) v,
-                                     Float128Mask.class, (Float128Mask) m);  // specialize
+        return (FloatVector128)
+            super.selectFromTemplate((FloatVector128) v,
+                                     FloatMask128.class, (FloatMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float128Vector selectFrom(Vector<Float> v1,
+    public FloatVector128 selectFrom(Vector<Float> v1,
                                    Vector<Float> v2) {
-        return (Float128Vector)
-            super.selectFromTemplate((Float128Vector) v1, (Float128Vector) v2);  // specialize
+        return (FloatVector128)
+            super.selectFromTemplate((FloatVector128) v1, (FloatVector128) v2);  // specialize
     }
 
     @ForceInline
@@ -518,7 +530,7 @@ final class Float128Vector extends FloatVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      float[] vecarr = vec.vec();
@@ -528,7 +540,7 @@ final class Float128Vector extends FloatVector {
 
     @ForceInline
     @Override
-    public Float128Vector withLane(int i, float e) {
+    public FloatVector128 withLane(int i, float e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -539,9 +551,9 @@ final class Float128Vector extends FloatVector {
     }
 
     @ForceInline
-    public Float128Vector withLaneHelper(int i, float e) {
+    public FloatVector128 withLaneHelper(int i, float e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Float.floatToRawIntBits(e),
                                 (v, ix, bits) -> {
                                     float[] res = v.vec().clone();
@@ -552,19 +564,20 @@ final class Float128Vector extends FloatVector {
 
     // Mask
 
-    static final class Float128Mask extends AbstractMask<Float> {
+    static final class FloatMask128 extends AbstractMask<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Float> ETYPE = float.class; // used by the JVM
 
-        Float128Mask(boolean[] bits) {
+        static final Class<Float> CTYPE = float.class; // used by the JVM
+
+        FloatMask128(boolean[] bits) {
             this(bits, 0);
         }
 
-        Float128Mask(boolean[] bits, int offset) {
+        FloatMask128(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Float128Mask(boolean val) {
+        FloatMask128(boolean val) {
             super(prepare(val));
         }
 
@@ -597,31 +610,31 @@ final class Float128Vector extends FloatVector {
         }
 
         @Override
-        Float128Mask uOp(MUnOp f) {
+        FloatMask128 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Float128Mask(res);
+            return new FloatMask128(res);
         }
 
         @Override
-        Float128Mask bOp(VectorMask<Float> m, MBinOp f) {
+        FloatMask128 bOp(VectorMask<Float> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Float128Mask)m).getBits();
+            boolean[] mbits = ((FloatMask128)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Float128Mask(res);
+            return new FloatMask128(res);
         }
 
         @ForceInline
         @Override
         public final
-        Float128Vector toVector() {
-            return (Float128Vector) super.toVectorTemplate();  // specialize
+        FloatVector128 toVector() {
+            return (FloatVector128) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -645,8 +658,8 @@ final class Float128Vector extends FloatVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -654,25 +667,25 @@ final class Float128Vector extends FloatVector {
         @Override
         @ForceInline
         /*package-private*/
-        Float128Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Float128Mask) VectorSupport.indexPartiallyInUpperRange(
-                Float128Mask.class, float.class, VLENGTH, offset, limit,
-                (o, l) -> (Float128Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        FloatMask128 indexPartiallyInUpperRange(long offset, long limit) {
+            return (FloatMask128) VectorSupport.indexPartiallyInUpperRange(
+                FloatMask128.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (FloatMask128) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Float128Mask not() {
+        public FloatMask128 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Float128Mask compress() {
-            return (Float128Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Float128Vector.class, Float128Mask.class, ETYPE, VLENGTH, null, this,
+        public FloatMask128 compress() {
+            return (FloatMask128)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                FloatVector128.class, FloatMask128.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -681,30 +694,30 @@ final class Float128Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public Float128Mask and(VectorMask<Float> mask) {
+        public FloatMask128 and(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float128Mask m = (Float128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Float128Mask.class, null, int.class, VLENGTH,
+            FloatMask128 m = (FloatMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, FloatMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Float128Mask or(VectorMask<Float> mask) {
+        public FloatMask128 or(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float128Mask m = (Float128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Float128Mask.class, null, int.class, VLENGTH,
+            FloatMask128 m = (FloatMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, FloatMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Float128Mask xor(VectorMask<Float> mask) {
+        public FloatMask128 xor(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float128Mask m = (Float128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Float128Mask.class, null, int.class, VLENGTH,
+            FloatMask128 m = (FloatMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, FloatMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -714,21 +727,21 @@ final class Float128Vector extends FloatVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Float128Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Float128Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Float128Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -738,7 +751,7 @@ final class Float128Vector extends FloatVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Float128Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -748,7 +761,7 @@ final class Float128Vector extends FloatVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Float128Mask.class, float.class, VLENGTH,
+            return VectorSupport.extract(FloatMask128.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -757,48 +770,49 @@ final class Float128Vector extends FloatVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Float128Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Float128Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((FloatMask128)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Float128Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Float128Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((FloatMask128)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Float128Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Float128Mask.class, int.class, VLENGTH,
+        static FloatMask128 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(FloatMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Float128Mask  TRUE_MASK = new Float128Mask(true);
-        private static final Float128Mask FALSE_MASK = new Float128Mask(false);
+        private static final FloatMask128  TRUE_MASK = new FloatMask128(true);
+        private static final FloatMask128 FALSE_MASK = new FloatMask128(false);
 
     }
 
     // Shuffle
 
-    static final class Float128Shuffle extends AbstractShuffle<Float> {
+    static final class FloatShuffle128 extends AbstractShuffle<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Float128Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        FloatShuffle128(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Float128Shuffle(int[] indices, int i) {
+        FloatShuffle128(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Float128Shuffle(IntUnaryOperator fn) {
+        FloatShuffle128(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -818,23 +832,23 @@ final class Float128Vector extends FloatVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Float128Shuffle IOTA = new Float128Shuffle(IDENTITY);
+        static final FloatShuffle128 IOTA = new FloatShuffle128(IDENTITY);
 
         @Override
         @ForceInline
-        public Float128Vector toVector() {
-            return (Float128Vector) toBitsVector().castShape(vspecies(), 0);
+        public FloatVector128 toVector() {
+            return (FloatVector128) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Int128Vector toBitsVector() {
-            return (Int128Vector) super.toBitsVectorTemplate();
+        IntVector128 toBitsVector() {
+            return (IntVector128) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int128Vector toBitsVector0() {
-            return ((Int128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector128 toBitsVector0() {
+            return ((IntVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -857,30 +871,30 @@ final class Float128Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public final Float128Mask laneIsValid() {
-            return (Float128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final FloatMask128 laneIsValid() {
+            return (FloatMask128) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Float128Shuffle rearrange(VectorShuffle<Float> shuffle) {
-            Float128Shuffle concreteShuffle = (Float128Shuffle) shuffle;
-            return (Float128Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_128))
+        public final FloatShuffle128 rearrange(VectorShuffle<Float> shuffle) {
+            FloatShuffle128 concreteShuffle = (FloatShuffle128) shuffle;
+            return (FloatShuffle128) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_128))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Float128Shuffle wrapIndexes() {
-            Int128Vector v = toBitsVector();
+        public final FloatShuffle128 wrapIndexes() {
+            IntVector128 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector128) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector128) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Float128Shuffle) v.toShuffle(vspecies(), false);
+            return (FloatShuffle128) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -931,14 +945,14 @@ final class Float128Vector extends FloatVector {
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromArray0Template(Float128Mask.class, a, offset, (Float128Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(FloatMask128.class, a, offset, (FloatMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        return super.fromArray0Template(Float128Mask.class, a, offset, indexMap, mapOffset, (Float128Mask) m);
+        return super.fromArray0Template(FloatMask128.class, a, offset, indexMap, mapOffset, (FloatMask128) m);
     }
 
 
@@ -954,7 +968,7 @@ final class Float128Vector extends FloatVector {
     @Override
     final
     FloatVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Float128Mask.class, ms, offset, (Float128Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(FloatMask128.class, ms, offset, (FloatMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -968,14 +982,14 @@ final class Float128Vector extends FloatVector {
     @Override
     final
     void intoArray0(float[] a, int offset, VectorMask<Float> m) {
-        super.intoArray0Template(Float128Mask.class, a, offset, (Float128Mask) m);
+        super.intoArray0Template(FloatMask128.class, a, offset, (FloatMask128) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        super.intoArray0Template(Float128Mask.class, a, offset, indexMap, mapOffset, (Float128Mask) m);
+        super.intoArray0Template(FloatMask128.class, a, offset, indexMap, mapOffset, (FloatMask128) m);
     }
 
 
@@ -983,7 +997,7 @@ final class Float128Vector extends FloatVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m) {
-        super.intoMemorySegment0Template(Float128Mask.class, ms, offset, (Float128Mask) m);
+        super.intoMemorySegment0Template(FloatMask128.class, ms, offset, (FloatMask128) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector256.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector256.java
index 2543382ca14..f267025972d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Float256Vector extends FloatVector {
+final class FloatVector256 extends FloatVector {
     static final FloatSpecies VSPECIES =
         (FloatSpecies) FloatVector.SPECIES_256;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Float256Vector> VCLASS = Float256Vector.class;
+    static final Class<FloatVector256> VCLASS = FloatVector256.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Float> CTYPE = float.class; // carrier type used by the JVM
+
     static final Class<Float> ETYPE = float.class; // used by the JVM
 
-    Float256Vector(float[] v) {
+    FloatVector256(float[] v) {
         super(v);
     }
 
-    // For compatibility as Float256Vector::new,
+    // For compatibility as FloatVector256::new,
     // stored into species.vectorFactory.
-    Float256Vector(Object v) {
+    FloatVector256(Object v) {
         this((float[]) v);
     }
 
-    static final Float256Vector ZERO = new Float256Vector(new float[VLENGTH]);
-    static final Float256Vector IOTA = new Float256Vector(VSPECIES.iotaArray());
+    static final FloatVector256 ZERO = new FloatVector256(new float[VLENGTH]);
+    static final FloatVector256 IOTA = new FloatVector256(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Float256Vector extends FloatVector {
     @Override
     public final Class<Float> elementType() { return float.class; }
 
+    @ForceInline
+    final Class<Float> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Float.SIZE; }
@@ -119,55 +124,62 @@ final class Float256Vector extends FloatVector {
         return (float[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Float256Vector broadcast(float e) {
-        return (Float256Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector256 broadcast(float e) {
+        return (FloatVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float256Vector broadcast(long e) {
-        return (Float256Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector256 broadcast(long e) {
+        return (FloatVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Float256Mask maskFromArray(boolean[] bits) {
-        return new Float256Mask(bits);
+    FloatMask256 maskFromArray(boolean[] bits) {
+        return new FloatMask256(bits);
     }
 
     @Override
     @ForceInline
-    Float256Shuffle iotaShuffle() { return Float256Shuffle.IOTA; }
+    FloatShuffle256 iotaShuffle() { return FloatShuffle256.IOTA; }
 
     @Override
     @ForceInline
-    Float256Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Float256Shuffle) iotaShuffleTemplate(start, step, wrap);
+    FloatShuffle256 iotaShuffle(int start, int step, boolean wrap) {
+        return (FloatShuffle256) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Float256Shuffle shuffleFromArray(int[] indices, int i) { return new Float256Shuffle(indices, i); }
+    FloatShuffle256 shuffleFromArray(int[] indices, int i) { return new FloatShuffle256(indices, i); }
 
     @Override
     @ForceInline
-    Float256Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Float256Shuffle(fn); }
+    FloatShuffle256 shuffleFromOp(IntUnaryOperator fn) { return new FloatShuffle256(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Float256Vector vectorFactory(float[] vec) {
-        return new Float256Vector(vec);
+    FloatVector256 vectorFactory(float[] vec) {
+        return new FloatVector256(vec);
     }
 
     @ForceInline
     final @Override
-    Byte256Vector asByteVectorRaw() {
-        return (Byte256Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector256 asByteVectorRaw() {
+        return (ByteVector256) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Float256Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float256Vector uOp(FUnOp f) {
-        return (Float256Vector) super.uOpTemplate(f);  // specialize
+    FloatVector256 uOp(FUnOp f) {
+        return (FloatVector256) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float256Vector uOp(VectorMask<Float> m, FUnOp f) {
-        return (Float256Vector)
-            super.uOpTemplate((Float256Mask)m, f);  // specialize
+    FloatVector256 uOp(VectorMask<Float> m, FUnOp f) {
+        return (FloatVector256)
+            super.uOpTemplate((FloatMask256)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Float256Vector bOp(Vector<Float> v, FBinOp f) {
-        return (Float256Vector) super.bOpTemplate((Float256Vector)v, f);  // specialize
+    FloatVector256 bOp(Vector<Float> v, FBinOp f) {
+        return (FloatVector256) super.bOpTemplate((FloatVector256)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float256Vector bOp(Vector<Float> v,
+    FloatVector256 bOp(Vector<Float> v,
                      VectorMask<Float> m, FBinOp f) {
-        return (Float256Vector)
-            super.bOpTemplate((Float256Vector)v, (Float256Mask)m,
+        return (FloatVector256)
+            super.bOpTemplate((FloatVector256)v, (FloatMask256)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Float256Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float256Vector tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
-        return (Float256Vector)
-            super.tOpTemplate((Float256Vector)v1, (Float256Vector)v2,
+    FloatVector256 tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
+        return (FloatVector256)
+            super.tOpTemplate((FloatVector256)v1, (FloatVector256)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float256Vector tOp(Vector<Float> v1, Vector<Float> v2,
+    FloatVector256 tOp(Vector<Float> v1, Vector<Float> v2,
                      VectorMask<Float> m, FTriOp f) {
-        return (Float256Vector)
-            super.tOpTemplate((Float256Vector)v1, (Float256Vector)v2,
-                              (Float256Mask)m, f);  // specialize
+        return (FloatVector256)
+            super.tOpTemplate((FloatVector256)v1, (FloatVector256)v2,
+                              (FloatMask256)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Float256Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public Float256Vector lanewise(Unary op) {
-        return (Float256Vector) super.lanewiseTemplate(op);  // specialize
+    public FloatVector256 lanewise(Unary op) {
+        return (FloatVector256) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector lanewise(Unary op, VectorMask<Float> m) {
-        return (Float256Vector) super.lanewiseTemplate(op, Float256Mask.class, (Float256Mask) m);  // specialize
+    public FloatVector256 lanewise(Unary op, VectorMask<Float> m) {
+        return (FloatVector256) super.lanewiseTemplate(op, FloatMask256.class, (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector lanewise(Binary op, Vector<Float> v) {
-        return (Float256Vector) super.lanewiseTemplate(op, v);  // specialize
+    public FloatVector256 lanewise(Binary op, Vector<Float> v) {
+        return (FloatVector256) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
-        return (Float256Vector) super.lanewiseTemplate(op, Float256Mask.class, v, (Float256Mask) m);  // specialize
+    public FloatVector256 lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector256) super.lanewiseTemplate(op, FloatMask256.class, v, (FloatMask256) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Float256Vector extends FloatVector {
     @Override
     @ForceInline
     public final
-    Float256Vector
+    FloatVector256
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2) {
-        return (Float256Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (FloatVector256) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float256Vector
+    FloatVector256
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2, VectorMask<Float> m) {
-        return (Float256Vector) super.lanewiseTemplate(op, Float256Mask.class, v1, v2, (Float256Mask) m);  // specialize
+        return (FloatVector256) super.lanewiseTemplate(op, FloatMask256.class, v1, v2, (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float256Vector addIndex(int scale) {
-        return (Float256Vector) super.addIndexTemplate(scale);  // specialize
+    FloatVector256 addIndex(int scale) {
+        return (FloatVector256) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Float256Vector extends FloatVector {
     @ForceInline
     public final float reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Float> m) {
-        return super.reduceLanesTemplate(op, Float256Mask.class, (Float256Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, FloatMask256.class, (FloatMask256) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Float256Vector extends FloatVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Float> m) {
-        return (long) super.reduceLanesTemplate(op, Float256Mask.class, (Float256Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, FloatMask256.class, (FloatMask256) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Float256Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public final Float256Shuffle toShuffle() {
-        return (Float256Shuffle) toShuffle(vspecies(), false);
+    public final FloatShuffle256 toShuffle() {
+        return (FloatShuffle256) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Float256Mask test(Test op) {
-        return super.testTemplate(Float256Mask.class, op);  // specialize
+    public final FloatMask256 test(Test op) {
+        return super.testTemplate(FloatMask256.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float256Mask test(Test op, VectorMask<Float> m) {
-        return super.testTemplate(Float256Mask.class, op, (Float256Mask) m);  // specialize
+    public final FloatMask256 test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(FloatMask256.class, op, (FloatMask256) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Float256Mask compare(Comparison op, Vector<Float> v) {
-        return super.compareTemplate(Float256Mask.class, op, v);  // specialize
+    public final FloatMask256 compare(Comparison op, Vector<Float> v) {
+        return super.compareTemplate(FloatMask256.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float256Mask compare(Comparison op, float s) {
-        return super.compareTemplate(Float256Mask.class, op, s);  // specialize
+    public final FloatMask256 compare(Comparison op, float s) {
+        return super.compareTemplate(FloatMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float256Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Float256Mask.class, op, s);  // specialize
+    public final FloatMask256 compare(Comparison op, long s) {
+        return super.compareTemplate(FloatMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float256Mask compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
-        return super.compareTemplate(Float256Mask.class, op, v, (Float256Mask) m);
+    public final FloatMask256 compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
+        return super.compareTemplate(FloatMask256.class, op, v, (FloatMask256) m);
     }
 
 
     @Override
     @ForceInline
-    public Float256Vector blend(Vector<Float> v, VectorMask<Float> m) {
-        return (Float256Vector)
-            super.blendTemplate(Float256Mask.class,
-                                (Float256Vector) v,
-                                (Float256Mask) m);  // specialize
+    public FloatVector256 blend(Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector256)
+            super.blendTemplate(FloatMask256.class,
+                                (FloatVector256) v,
+                                (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector slice(int origin, Vector<Float> v) {
-        return (Float256Vector) super.sliceTemplate(origin, v);  // specialize
+    public FloatVector256 slice(int origin, Vector<Float> v) {
+        return (FloatVector256) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector slice(int origin) {
-        return (Float256Vector) super.sliceTemplate(origin);  // specialize
+    public FloatVector256 slice(int origin) {
+        return (FloatVector256) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector unslice(int origin, Vector<Float> w, int part) {
-        return (Float256Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public FloatVector256 unslice(int origin, Vector<Float> w, int part) {
+        return (FloatVector256) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
-        return (Float256Vector)
-            super.unsliceTemplate(Float256Mask.class,
+    public FloatVector256 unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
+        return (FloatVector256)
+            super.unsliceTemplate(FloatMask256.class,
                                   origin, w, part,
-                                  (Float256Mask) m);  // specialize
+                                  (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector unslice(int origin) {
-        return (Float256Vector) super.unsliceTemplate(origin);  // specialize
+    public FloatVector256 unslice(int origin) {
+        return (FloatVector256) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector rearrange(VectorShuffle<Float> s) {
-        return (Float256Vector)
-            super.rearrangeTemplate(Float256Shuffle.class,
-                                    (Float256Shuffle) s);  // specialize
+    public FloatVector256 rearrange(VectorShuffle<Float> s) {
+        return (FloatVector256)
+            super.rearrangeTemplate(FloatShuffle256.class,
+                                    (FloatShuffle256) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector rearrange(VectorShuffle<Float> shuffle,
+    public FloatVector256 rearrange(VectorShuffle<Float> shuffle,
                                   VectorMask<Float> m) {
-        return (Float256Vector)
-            super.rearrangeTemplate(Float256Shuffle.class,
-                                    Float256Mask.class,
-                                    (Float256Shuffle) shuffle,
-                                    (Float256Mask) m);  // specialize
+        return (FloatVector256)
+            super.rearrangeTemplate(FloatShuffle256.class,
+                                    FloatMask256.class,
+                                    (FloatShuffle256) shuffle,
+                                    (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector rearrange(VectorShuffle<Float> s,
+    public FloatVector256 rearrange(VectorShuffle<Float> s,
                                   Vector<Float> v) {
-        return (Float256Vector)
-            super.rearrangeTemplate(Float256Shuffle.class,
-                                    (Float256Shuffle) s,
-                                    (Float256Vector) v);  // specialize
+        return (FloatVector256)
+            super.rearrangeTemplate(FloatShuffle256.class,
+                                    (FloatShuffle256) s,
+                                    (FloatVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector compress(VectorMask<Float> m) {
-        return (Float256Vector)
-            super.compressTemplate(Float256Mask.class,
-                                   (Float256Mask) m);  // specialize
+    public FloatVector256 compress(VectorMask<Float> m) {
+        return (FloatVector256)
+            super.compressTemplate(FloatMask256.class,
+                                   (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector expand(VectorMask<Float> m) {
-        return (Float256Vector)
-            super.expandTemplate(Float256Mask.class,
-                                   (Float256Mask) m);  // specialize
+    public FloatVector256 expand(VectorMask<Float> m) {
+        return (FloatVector256)
+            super.expandTemplate(FloatMask256.class,
+                                   (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector selectFrom(Vector<Float> v) {
-        return (Float256Vector)
-            super.selectFromTemplate((Float256Vector) v);  // specialize
+    public FloatVector256 selectFrom(Vector<Float> v) {
+        return (FloatVector256)
+            super.selectFromTemplate((FloatVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector selectFrom(Vector<Float> v,
+    public FloatVector256 selectFrom(Vector<Float> v,
                                    VectorMask<Float> m) {
-        return (Float256Vector)
-            super.selectFromTemplate((Float256Vector) v,
-                                     Float256Mask.class, (Float256Mask) m);  // specialize
+        return (FloatVector256)
+            super.selectFromTemplate((FloatVector256) v,
+                                     FloatMask256.class, (FloatMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float256Vector selectFrom(Vector<Float> v1,
+    public FloatVector256 selectFrom(Vector<Float> v1,
                                    Vector<Float> v2) {
-        return (Float256Vector)
-            super.selectFromTemplate((Float256Vector) v1, (Float256Vector) v2);  // specialize
+        return (FloatVector256)
+            super.selectFromTemplate((FloatVector256) v1, (FloatVector256) v2);  // specialize
     }
 
     @ForceInline
@@ -522,7 +534,7 @@ final class Float256Vector extends FloatVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      float[] vecarr = vec.vec();
@@ -532,7 +544,7 @@ final class Float256Vector extends FloatVector {
 
     @ForceInline
     @Override
-    public Float256Vector withLane(int i, float e) {
+    public FloatVector256 withLane(int i, float e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -547,9 +559,9 @@ final class Float256Vector extends FloatVector {
     }
 
     @ForceInline
-    public Float256Vector withLaneHelper(int i, float e) {
+    public FloatVector256 withLaneHelper(int i, float e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Float.floatToRawIntBits(e),
                                 (v, ix, bits) -> {
                                     float[] res = v.vec().clone();
@@ -560,19 +572,20 @@ final class Float256Vector extends FloatVector {
 
     // Mask
 
-    static final class Float256Mask extends AbstractMask<Float> {
+    static final class FloatMask256 extends AbstractMask<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Float> ETYPE = float.class; // used by the JVM
 
-        Float256Mask(boolean[] bits) {
+        static final Class<Float> CTYPE = float.class; // used by the JVM
+
+        FloatMask256(boolean[] bits) {
             this(bits, 0);
         }
 
-        Float256Mask(boolean[] bits, int offset) {
+        FloatMask256(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Float256Mask(boolean val) {
+        FloatMask256(boolean val) {
             super(prepare(val));
         }
 
@@ -605,31 +618,31 @@ final class Float256Vector extends FloatVector {
         }
 
         @Override
-        Float256Mask uOp(MUnOp f) {
+        FloatMask256 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Float256Mask(res);
+            return new FloatMask256(res);
         }
 
         @Override
-        Float256Mask bOp(VectorMask<Float> m, MBinOp f) {
+        FloatMask256 bOp(VectorMask<Float> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Float256Mask)m).getBits();
+            boolean[] mbits = ((FloatMask256)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Float256Mask(res);
+            return new FloatMask256(res);
         }
 
         @ForceInline
         @Override
         public final
-        Float256Vector toVector() {
-            return (Float256Vector) super.toVectorTemplate();  // specialize
+        FloatVector256 toVector() {
+            return (FloatVector256) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -653,8 +666,8 @@ final class Float256Vector extends FloatVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -662,25 +675,25 @@ final class Float256Vector extends FloatVector {
         @Override
         @ForceInline
         /*package-private*/
-        Float256Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Float256Mask) VectorSupport.indexPartiallyInUpperRange(
-                Float256Mask.class, float.class, VLENGTH, offset, limit,
-                (o, l) -> (Float256Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        FloatMask256 indexPartiallyInUpperRange(long offset, long limit) {
+            return (FloatMask256) VectorSupport.indexPartiallyInUpperRange(
+                FloatMask256.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (FloatMask256) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Float256Mask not() {
+        public FloatMask256 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Float256Mask compress() {
-            return (Float256Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Float256Vector.class, Float256Mask.class, ETYPE, VLENGTH, null, this,
+        public FloatMask256 compress() {
+            return (FloatMask256)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                FloatVector256.class, FloatMask256.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -689,30 +702,30 @@ final class Float256Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public Float256Mask and(VectorMask<Float> mask) {
+        public FloatMask256 and(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float256Mask m = (Float256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Float256Mask.class, null, int.class, VLENGTH,
+            FloatMask256 m = (FloatMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, FloatMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Float256Mask or(VectorMask<Float> mask) {
+        public FloatMask256 or(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float256Mask m = (Float256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Float256Mask.class, null, int.class, VLENGTH,
+            FloatMask256 m = (FloatMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, FloatMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Float256Mask xor(VectorMask<Float> mask) {
+        public FloatMask256 xor(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float256Mask m = (Float256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Float256Mask.class, null, int.class, VLENGTH,
+            FloatMask256 m = (FloatMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, FloatMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -722,21 +735,21 @@ final class Float256Vector extends FloatVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Float256Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Float256Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Float256Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -746,7 +759,7 @@ final class Float256Vector extends FloatVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Float256Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -756,7 +769,7 @@ final class Float256Vector extends FloatVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Float256Mask.class, float.class, VLENGTH,
+            return VectorSupport.extract(FloatMask256.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -765,48 +778,49 @@ final class Float256Vector extends FloatVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Float256Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Float256Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((FloatMask256)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Float256Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Float256Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((FloatMask256)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Float256Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Float256Mask.class, int.class, VLENGTH,
+        static FloatMask256 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(FloatMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Float256Mask  TRUE_MASK = new Float256Mask(true);
-        private static final Float256Mask FALSE_MASK = new Float256Mask(false);
+        private static final FloatMask256  TRUE_MASK = new FloatMask256(true);
+        private static final FloatMask256 FALSE_MASK = new FloatMask256(false);
 
     }
 
     // Shuffle
 
-    static final class Float256Shuffle extends AbstractShuffle<Float> {
+    static final class FloatShuffle256 extends AbstractShuffle<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Float256Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        FloatShuffle256(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Float256Shuffle(int[] indices, int i) {
+        FloatShuffle256(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Float256Shuffle(IntUnaryOperator fn) {
+        FloatShuffle256(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -826,23 +840,23 @@ final class Float256Vector extends FloatVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Float256Shuffle IOTA = new Float256Shuffle(IDENTITY);
+        static final FloatShuffle256 IOTA = new FloatShuffle256(IDENTITY);
 
         @Override
         @ForceInline
-        public Float256Vector toVector() {
-            return (Float256Vector) toBitsVector().castShape(vspecies(), 0);
+        public FloatVector256 toVector() {
+            return (FloatVector256) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Int256Vector toBitsVector() {
-            return (Int256Vector) super.toBitsVectorTemplate();
+        IntVector256 toBitsVector() {
+            return (IntVector256) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int256Vector toBitsVector0() {
-            return ((Int256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector256 toBitsVector0() {
+            return ((IntVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -865,30 +879,30 @@ final class Float256Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public final Float256Mask laneIsValid() {
-            return (Float256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final FloatMask256 laneIsValid() {
+            return (FloatMask256) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Float256Shuffle rearrange(VectorShuffle<Float> shuffle) {
-            Float256Shuffle concreteShuffle = (Float256Shuffle) shuffle;
-            return (Float256Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_256))
+        public final FloatShuffle256 rearrange(VectorShuffle<Float> shuffle) {
+            FloatShuffle256 concreteShuffle = (FloatShuffle256) shuffle;
+            return (FloatShuffle256) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_256))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Float256Shuffle wrapIndexes() {
-            Int256Vector v = toBitsVector();
+        public final FloatShuffle256 wrapIndexes() {
+            IntVector256 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector256) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector256) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Float256Shuffle) v.toShuffle(vspecies(), false);
+            return (FloatShuffle256) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -939,14 +953,14 @@ final class Float256Vector extends FloatVector {
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromArray0Template(Float256Mask.class, a, offset, (Float256Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(FloatMask256.class, a, offset, (FloatMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        return super.fromArray0Template(Float256Mask.class, a, offset, indexMap, mapOffset, (Float256Mask) m);
+        return super.fromArray0Template(FloatMask256.class, a, offset, indexMap, mapOffset, (FloatMask256) m);
     }
 
 
@@ -962,7 +976,7 @@ final class Float256Vector extends FloatVector {
     @Override
     final
     FloatVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Float256Mask.class, ms, offset, (Float256Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(FloatMask256.class, ms, offset, (FloatMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -976,14 +990,14 @@ final class Float256Vector extends FloatVector {
     @Override
     final
     void intoArray0(float[] a, int offset, VectorMask<Float> m) {
-        super.intoArray0Template(Float256Mask.class, a, offset, (Float256Mask) m);
+        super.intoArray0Template(FloatMask256.class, a, offset, (FloatMask256) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        super.intoArray0Template(Float256Mask.class, a, offset, indexMap, mapOffset, (Float256Mask) m);
+        super.intoArray0Template(FloatMask256.class, a, offset, indexMap, mapOffset, (FloatMask256) m);
     }
 
 
@@ -991,7 +1005,7 @@ final class Float256Vector extends FloatVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m) {
-        super.intoMemorySegment0Template(Float256Mask.class, ms, offset, (Float256Mask) m);
+        super.intoMemorySegment0Template(FloatMask256.class, ms, offset, (FloatMask256) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector512.java
similarity index 64%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector512.java
index 627b1e0a237..439e26f0d89 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Float512Vector extends FloatVector {
+final class FloatVector512 extends FloatVector {
     static final FloatSpecies VSPECIES =
         (FloatSpecies) FloatVector.SPECIES_512;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Float512Vector> VCLASS = Float512Vector.class;
+    static final Class<FloatVector512> VCLASS = FloatVector512.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Float> CTYPE = float.class; // carrier type used by the JVM
+
     static final Class<Float> ETYPE = float.class; // used by the JVM
 
-    Float512Vector(float[] v) {
+    FloatVector512(float[] v) {
         super(v);
     }
 
-    // For compatibility as Float512Vector::new,
+    // For compatibility as FloatVector512::new,
     // stored into species.vectorFactory.
-    Float512Vector(Object v) {
+    FloatVector512(Object v) {
         this((float[]) v);
     }
 
-    static final Float512Vector ZERO = new Float512Vector(new float[VLENGTH]);
-    static final Float512Vector IOTA = new Float512Vector(VSPECIES.iotaArray());
+    static final FloatVector512 ZERO = new FloatVector512(new float[VLENGTH]);
+    static final FloatVector512 IOTA = new FloatVector512(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Float512Vector extends FloatVector {
     @Override
     public final Class<Float> elementType() { return float.class; }
 
+    @ForceInline
+    final Class<Float> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Float.SIZE; }
@@ -119,55 +124,62 @@ final class Float512Vector extends FloatVector {
         return (float[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Float512Vector broadcast(float e) {
-        return (Float512Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector512 broadcast(float e) {
+        return (FloatVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float512Vector broadcast(long e) {
-        return (Float512Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector512 broadcast(long e) {
+        return (FloatVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Float512Mask maskFromArray(boolean[] bits) {
-        return new Float512Mask(bits);
+    FloatMask512 maskFromArray(boolean[] bits) {
+        return new FloatMask512(bits);
     }
 
     @Override
     @ForceInline
-    Float512Shuffle iotaShuffle() { return Float512Shuffle.IOTA; }
+    FloatShuffle512 iotaShuffle() { return FloatShuffle512.IOTA; }
 
     @Override
     @ForceInline
-    Float512Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Float512Shuffle) iotaShuffleTemplate(start, step, wrap);
+    FloatShuffle512 iotaShuffle(int start, int step, boolean wrap) {
+        return (FloatShuffle512) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Float512Shuffle shuffleFromArray(int[] indices, int i) { return new Float512Shuffle(indices, i); }
+    FloatShuffle512 shuffleFromArray(int[] indices, int i) { return new FloatShuffle512(indices, i); }
 
     @Override
     @ForceInline
-    Float512Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Float512Shuffle(fn); }
+    FloatShuffle512 shuffleFromOp(IntUnaryOperator fn) { return new FloatShuffle512(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Float512Vector vectorFactory(float[] vec) {
-        return new Float512Vector(vec);
+    FloatVector512 vectorFactory(float[] vec) {
+        return new FloatVector512(vec);
     }
 
     @ForceInline
     final @Override
-    Byte512Vector asByteVectorRaw() {
-        return (Byte512Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector512 asByteVectorRaw() {
+        return (ByteVector512) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Float512Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float512Vector uOp(FUnOp f) {
-        return (Float512Vector) super.uOpTemplate(f);  // specialize
+    FloatVector512 uOp(FUnOp f) {
+        return (FloatVector512) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float512Vector uOp(VectorMask<Float> m, FUnOp f) {
-        return (Float512Vector)
-            super.uOpTemplate((Float512Mask)m, f);  // specialize
+    FloatVector512 uOp(VectorMask<Float> m, FUnOp f) {
+        return (FloatVector512)
+            super.uOpTemplate((FloatMask512)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Float512Vector bOp(Vector<Float> v, FBinOp f) {
-        return (Float512Vector) super.bOpTemplate((Float512Vector)v, f);  // specialize
+    FloatVector512 bOp(Vector<Float> v, FBinOp f) {
+        return (FloatVector512) super.bOpTemplate((FloatVector512)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float512Vector bOp(Vector<Float> v,
+    FloatVector512 bOp(Vector<Float> v,
                      VectorMask<Float> m, FBinOp f) {
-        return (Float512Vector)
-            super.bOpTemplate((Float512Vector)v, (Float512Mask)m,
+        return (FloatVector512)
+            super.bOpTemplate((FloatVector512)v, (FloatMask512)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Float512Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float512Vector tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
-        return (Float512Vector)
-            super.tOpTemplate((Float512Vector)v1, (Float512Vector)v2,
+    FloatVector512 tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
+        return (FloatVector512)
+            super.tOpTemplate((FloatVector512)v1, (FloatVector512)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float512Vector tOp(Vector<Float> v1, Vector<Float> v2,
+    FloatVector512 tOp(Vector<Float> v1, Vector<Float> v2,
                      VectorMask<Float> m, FTriOp f) {
-        return (Float512Vector)
-            super.tOpTemplate((Float512Vector)v1, (Float512Vector)v2,
-                              (Float512Mask)m, f);  // specialize
+        return (FloatVector512)
+            super.tOpTemplate((FloatVector512)v1, (FloatVector512)v2,
+                              (FloatMask512)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Float512Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public Float512Vector lanewise(Unary op) {
-        return (Float512Vector) super.lanewiseTemplate(op);  // specialize
+    public FloatVector512 lanewise(Unary op) {
+        return (FloatVector512) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector lanewise(Unary op, VectorMask<Float> m) {
-        return (Float512Vector) super.lanewiseTemplate(op, Float512Mask.class, (Float512Mask) m);  // specialize
+    public FloatVector512 lanewise(Unary op, VectorMask<Float> m) {
+        return (FloatVector512) super.lanewiseTemplate(op, FloatMask512.class, (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector lanewise(Binary op, Vector<Float> v) {
-        return (Float512Vector) super.lanewiseTemplate(op, v);  // specialize
+    public FloatVector512 lanewise(Binary op, Vector<Float> v) {
+        return (FloatVector512) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
-        return (Float512Vector) super.lanewiseTemplate(op, Float512Mask.class, v, (Float512Mask) m);  // specialize
+    public FloatVector512 lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector512) super.lanewiseTemplate(op, FloatMask512.class, v, (FloatMask512) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Float512Vector extends FloatVector {
     @Override
     @ForceInline
     public final
-    Float512Vector
+    FloatVector512
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2) {
-        return (Float512Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (FloatVector512) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float512Vector
+    FloatVector512
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2, VectorMask<Float> m) {
-        return (Float512Vector) super.lanewiseTemplate(op, Float512Mask.class, v1, v2, (Float512Mask) m);  // specialize
+        return (FloatVector512) super.lanewiseTemplate(op, FloatMask512.class, v1, v2, (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float512Vector addIndex(int scale) {
-        return (Float512Vector) super.addIndexTemplate(scale);  // specialize
+    FloatVector512 addIndex(int scale) {
+        return (FloatVector512) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Float512Vector extends FloatVector {
     @ForceInline
     public final float reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Float> m) {
-        return super.reduceLanesTemplate(op, Float512Mask.class, (Float512Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, FloatMask512.class, (FloatMask512) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Float512Vector extends FloatVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Float> m) {
-        return (long) super.reduceLanesTemplate(op, Float512Mask.class, (Float512Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, FloatMask512.class, (FloatMask512) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Float512Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public final Float512Shuffle toShuffle() {
-        return (Float512Shuffle) toShuffle(vspecies(), false);
+    public final FloatShuffle512 toShuffle() {
+        return (FloatShuffle512) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Float512Mask test(Test op) {
-        return super.testTemplate(Float512Mask.class, op);  // specialize
+    public final FloatMask512 test(Test op) {
+        return super.testTemplate(FloatMask512.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float512Mask test(Test op, VectorMask<Float> m) {
-        return super.testTemplate(Float512Mask.class, op, (Float512Mask) m);  // specialize
+    public final FloatMask512 test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(FloatMask512.class, op, (FloatMask512) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Float512Mask compare(Comparison op, Vector<Float> v) {
-        return super.compareTemplate(Float512Mask.class, op, v);  // specialize
+    public final FloatMask512 compare(Comparison op, Vector<Float> v) {
+        return super.compareTemplate(FloatMask512.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float512Mask compare(Comparison op, float s) {
-        return super.compareTemplate(Float512Mask.class, op, s);  // specialize
+    public final FloatMask512 compare(Comparison op, float s) {
+        return super.compareTemplate(FloatMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float512Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Float512Mask.class, op, s);  // specialize
+    public final FloatMask512 compare(Comparison op, long s) {
+        return super.compareTemplate(FloatMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float512Mask compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
-        return super.compareTemplate(Float512Mask.class, op, v, (Float512Mask) m);
+    public final FloatMask512 compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
+        return super.compareTemplate(FloatMask512.class, op, v, (FloatMask512) m);
     }
 
 
     @Override
     @ForceInline
-    public Float512Vector blend(Vector<Float> v, VectorMask<Float> m) {
-        return (Float512Vector)
-            super.blendTemplate(Float512Mask.class,
-                                (Float512Vector) v,
-                                (Float512Mask) m);  // specialize
+    public FloatVector512 blend(Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector512)
+            super.blendTemplate(FloatMask512.class,
+                                (FloatVector512) v,
+                                (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector slice(int origin, Vector<Float> v) {
-        return (Float512Vector) super.sliceTemplate(origin, v);  // specialize
+    public FloatVector512 slice(int origin, Vector<Float> v) {
+        return (FloatVector512) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector slice(int origin) {
-        return (Float512Vector) super.sliceTemplate(origin);  // specialize
+    public FloatVector512 slice(int origin) {
+        return (FloatVector512) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector unslice(int origin, Vector<Float> w, int part) {
-        return (Float512Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public FloatVector512 unslice(int origin, Vector<Float> w, int part) {
+        return (FloatVector512) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
-        return (Float512Vector)
-            super.unsliceTemplate(Float512Mask.class,
+    public FloatVector512 unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
+        return (FloatVector512)
+            super.unsliceTemplate(FloatMask512.class,
                                   origin, w, part,
-                                  (Float512Mask) m);  // specialize
+                                  (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector unslice(int origin) {
-        return (Float512Vector) super.unsliceTemplate(origin);  // specialize
+    public FloatVector512 unslice(int origin) {
+        return (FloatVector512) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector rearrange(VectorShuffle<Float> s) {
-        return (Float512Vector)
-            super.rearrangeTemplate(Float512Shuffle.class,
-                                    (Float512Shuffle) s);  // specialize
+    public FloatVector512 rearrange(VectorShuffle<Float> s) {
+        return (FloatVector512)
+            super.rearrangeTemplate(FloatShuffle512.class,
+                                    (FloatShuffle512) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector rearrange(VectorShuffle<Float> shuffle,
+    public FloatVector512 rearrange(VectorShuffle<Float> shuffle,
                                   VectorMask<Float> m) {
-        return (Float512Vector)
-            super.rearrangeTemplate(Float512Shuffle.class,
-                                    Float512Mask.class,
-                                    (Float512Shuffle) shuffle,
-                                    (Float512Mask) m);  // specialize
+        return (FloatVector512)
+            super.rearrangeTemplate(FloatShuffle512.class,
+                                    FloatMask512.class,
+                                    (FloatShuffle512) shuffle,
+                                    (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector rearrange(VectorShuffle<Float> s,
+    public FloatVector512 rearrange(VectorShuffle<Float> s,
                                   Vector<Float> v) {
-        return (Float512Vector)
-            super.rearrangeTemplate(Float512Shuffle.class,
-                                    (Float512Shuffle) s,
-                                    (Float512Vector) v);  // specialize
+        return (FloatVector512)
+            super.rearrangeTemplate(FloatShuffle512.class,
+                                    (FloatShuffle512) s,
+                                    (FloatVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector compress(VectorMask<Float> m) {
-        return (Float512Vector)
-            super.compressTemplate(Float512Mask.class,
-                                   (Float512Mask) m);  // specialize
+    public FloatVector512 compress(VectorMask<Float> m) {
+        return (FloatVector512)
+            super.compressTemplate(FloatMask512.class,
+                                   (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector expand(VectorMask<Float> m) {
-        return (Float512Vector)
-            super.expandTemplate(Float512Mask.class,
-                                   (Float512Mask) m);  // specialize
+    public FloatVector512 expand(VectorMask<Float> m) {
+        return (FloatVector512)
+            super.expandTemplate(FloatMask512.class,
+                                   (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector selectFrom(Vector<Float> v) {
-        return (Float512Vector)
-            super.selectFromTemplate((Float512Vector) v);  // specialize
+    public FloatVector512 selectFrom(Vector<Float> v) {
+        return (FloatVector512)
+            super.selectFromTemplate((FloatVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector selectFrom(Vector<Float> v,
+    public FloatVector512 selectFrom(Vector<Float> v,
                                    VectorMask<Float> m) {
-        return (Float512Vector)
-            super.selectFromTemplate((Float512Vector) v,
-                                     Float512Mask.class, (Float512Mask) m);  // specialize
+        return (FloatVector512)
+            super.selectFromTemplate((FloatVector512) v,
+                                     FloatMask512.class, (FloatMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float512Vector selectFrom(Vector<Float> v1,
+    public FloatVector512 selectFrom(Vector<Float> v1,
                                    Vector<Float> v2) {
-        return (Float512Vector)
-            super.selectFromTemplate((Float512Vector) v1, (Float512Vector) v2);  // specialize
+        return (FloatVector512)
+            super.selectFromTemplate((FloatVector512) v1, (FloatVector512) v2);  // specialize
     }
 
     @ForceInline
@@ -530,7 +542,7 @@ final class Float512Vector extends FloatVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      float[] vecarr = vec.vec();
@@ -540,7 +552,7 @@ final class Float512Vector extends FloatVector {
 
     @ForceInline
     @Override
-    public Float512Vector withLane(int i, float e) {
+    public FloatVector512 withLane(int i, float e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -563,9 +575,9 @@ final class Float512Vector extends FloatVector {
     }
 
     @ForceInline
-    public Float512Vector withLaneHelper(int i, float e) {
+    public FloatVector512 withLaneHelper(int i, float e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Float.floatToRawIntBits(e),
                                 (v, ix, bits) -> {
                                     float[] res = v.vec().clone();
@@ -576,19 +588,20 @@ final class Float512Vector extends FloatVector {
 
     // Mask
 
-    static final class Float512Mask extends AbstractMask<Float> {
+    static final class FloatMask512 extends AbstractMask<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Float> ETYPE = float.class; // used by the JVM
 
-        Float512Mask(boolean[] bits) {
+        static final Class<Float> CTYPE = float.class; // used by the JVM
+
+        FloatMask512(boolean[] bits) {
             this(bits, 0);
         }
 
-        Float512Mask(boolean[] bits, int offset) {
+        FloatMask512(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Float512Mask(boolean val) {
+        FloatMask512(boolean val) {
             super(prepare(val));
         }
 
@@ -621,31 +634,31 @@ final class Float512Vector extends FloatVector {
         }
 
         @Override
-        Float512Mask uOp(MUnOp f) {
+        FloatMask512 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Float512Mask(res);
+            return new FloatMask512(res);
         }
 
         @Override
-        Float512Mask bOp(VectorMask<Float> m, MBinOp f) {
+        FloatMask512 bOp(VectorMask<Float> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Float512Mask)m).getBits();
+            boolean[] mbits = ((FloatMask512)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Float512Mask(res);
+            return new FloatMask512(res);
         }
 
         @ForceInline
         @Override
         public final
-        Float512Vector toVector() {
-            return (Float512Vector) super.toVectorTemplate();  // specialize
+        FloatVector512 toVector() {
+            return (FloatVector512) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -669,8 +682,8 @@ final class Float512Vector extends FloatVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -678,25 +691,25 @@ final class Float512Vector extends FloatVector {
         @Override
         @ForceInline
         /*package-private*/
-        Float512Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Float512Mask) VectorSupport.indexPartiallyInUpperRange(
-                Float512Mask.class, float.class, VLENGTH, offset, limit,
-                (o, l) -> (Float512Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        FloatMask512 indexPartiallyInUpperRange(long offset, long limit) {
+            return (FloatMask512) VectorSupport.indexPartiallyInUpperRange(
+                FloatMask512.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (FloatMask512) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Float512Mask not() {
+        public FloatMask512 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Float512Mask compress() {
-            return (Float512Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Float512Vector.class, Float512Mask.class, ETYPE, VLENGTH, null, this,
+        public FloatMask512 compress() {
+            return (FloatMask512)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                FloatVector512.class, FloatMask512.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -705,30 +718,30 @@ final class Float512Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public Float512Mask and(VectorMask<Float> mask) {
+        public FloatMask512 and(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float512Mask m = (Float512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Float512Mask.class, null, int.class, VLENGTH,
+            FloatMask512 m = (FloatMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, FloatMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Float512Mask or(VectorMask<Float> mask) {
+        public FloatMask512 or(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float512Mask m = (Float512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Float512Mask.class, null, int.class, VLENGTH,
+            FloatMask512 m = (FloatMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, FloatMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Float512Mask xor(VectorMask<Float> mask) {
+        public FloatMask512 xor(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float512Mask m = (Float512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Float512Mask.class, null, int.class, VLENGTH,
+            FloatMask512 m = (FloatMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, FloatMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -738,21 +751,21 @@ final class Float512Vector extends FloatVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Float512Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Float512Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Float512Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -762,7 +775,7 @@ final class Float512Vector extends FloatVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Float512Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -772,7 +785,7 @@ final class Float512Vector extends FloatVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Float512Mask.class, float.class, VLENGTH,
+            return VectorSupport.extract(FloatMask512.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -781,48 +794,49 @@ final class Float512Vector extends FloatVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Float512Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Float512Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((FloatMask512)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Float512Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Float512Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((FloatMask512)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Float512Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Float512Mask.class, int.class, VLENGTH,
+        static FloatMask512 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(FloatMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Float512Mask  TRUE_MASK = new Float512Mask(true);
-        private static final Float512Mask FALSE_MASK = new Float512Mask(false);
+        private static final FloatMask512  TRUE_MASK = new FloatMask512(true);
+        private static final FloatMask512 FALSE_MASK = new FloatMask512(false);
 
     }
 
     // Shuffle
 
-    static final class Float512Shuffle extends AbstractShuffle<Float> {
+    static final class FloatShuffle512 extends AbstractShuffle<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Float512Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        FloatShuffle512(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Float512Shuffle(int[] indices, int i) {
+        FloatShuffle512(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Float512Shuffle(IntUnaryOperator fn) {
+        FloatShuffle512(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -842,23 +856,23 @@ final class Float512Vector extends FloatVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Float512Shuffle IOTA = new Float512Shuffle(IDENTITY);
+        static final FloatShuffle512 IOTA = new FloatShuffle512(IDENTITY);
 
         @Override
         @ForceInline
-        public Float512Vector toVector() {
-            return (Float512Vector) toBitsVector().castShape(vspecies(), 0);
+        public FloatVector512 toVector() {
+            return (FloatVector512) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Int512Vector toBitsVector() {
-            return (Int512Vector) super.toBitsVectorTemplate();
+        IntVector512 toBitsVector() {
+            return (IntVector512) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int512Vector toBitsVector0() {
-            return ((Int512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector512 toBitsVector0() {
+            return ((IntVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -881,30 +895,30 @@ final class Float512Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public final Float512Mask laneIsValid() {
-            return (Float512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final FloatMask512 laneIsValid() {
+            return (FloatMask512) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Float512Shuffle rearrange(VectorShuffle<Float> shuffle) {
-            Float512Shuffle concreteShuffle = (Float512Shuffle) shuffle;
-            return (Float512Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_512))
+        public final FloatShuffle512 rearrange(VectorShuffle<Float> shuffle) {
+            FloatShuffle512 concreteShuffle = (FloatShuffle512) shuffle;
+            return (FloatShuffle512) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_512))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Float512Shuffle wrapIndexes() {
-            Int512Vector v = toBitsVector();
+        public final FloatShuffle512 wrapIndexes() {
+            IntVector512 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector512) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector512) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Float512Shuffle) v.toShuffle(vspecies(), false);
+            return (FloatShuffle512) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -955,14 +969,14 @@ final class Float512Vector extends FloatVector {
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromArray0Template(Float512Mask.class, a, offset, (Float512Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(FloatMask512.class, a, offset, (FloatMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        return super.fromArray0Template(Float512Mask.class, a, offset, indexMap, mapOffset, (Float512Mask) m);
+        return super.fromArray0Template(FloatMask512.class, a, offset, indexMap, mapOffset, (FloatMask512) m);
     }
 
 
@@ -978,7 +992,7 @@ final class Float512Vector extends FloatVector {
     @Override
     final
     FloatVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Float512Mask.class, ms, offset, (Float512Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(FloatMask512.class, ms, offset, (FloatMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -992,14 +1006,14 @@ final class Float512Vector extends FloatVector {
     @Override
     final
     void intoArray0(float[] a, int offset, VectorMask<Float> m) {
-        super.intoArray0Template(Float512Mask.class, a, offset, (Float512Mask) m);
+        super.intoArray0Template(FloatMask512.class, a, offset, (FloatMask512) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        super.intoArray0Template(Float512Mask.class, a, offset, indexMap, mapOffset, (Float512Mask) m);
+        super.intoArray0Template(FloatMask512.class, a, offset, indexMap, mapOffset, (FloatMask512) m);
     }
 
 
@@ -1007,7 +1021,7 @@ final class Float512Vector extends FloatVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m) {
-        super.intoMemorySegment0Template(Float512Mask.class, ms, offset, (Float512Mask) m);
+        super.intoMemorySegment0Template(FloatMask512.class, ms, offset, (FloatMask512) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector64.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector64.java
index 3360fdb537a..9e81a52d27b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Float64Vector extends FloatVector {
+final class FloatVector64 extends FloatVector {
     static final FloatSpecies VSPECIES =
         (FloatSpecies) FloatVector.SPECIES_64;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Float64Vector> VCLASS = Float64Vector.class;
+    static final Class<FloatVector64> VCLASS = FloatVector64.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Float> CTYPE = float.class; // carrier type used by the JVM
+
     static final Class<Float> ETYPE = float.class; // used by the JVM
 
-    Float64Vector(float[] v) {
+    FloatVector64(float[] v) {
         super(v);
     }
 
-    // For compatibility as Float64Vector::new,
+    // For compatibility as FloatVector64::new,
     // stored into species.vectorFactory.
-    Float64Vector(Object v) {
+    FloatVector64(Object v) {
         this((float[]) v);
     }
 
-    static final Float64Vector ZERO = new Float64Vector(new float[VLENGTH]);
-    static final Float64Vector IOTA = new Float64Vector(VSPECIES.iotaArray());
+    static final FloatVector64 ZERO = new FloatVector64(new float[VLENGTH]);
+    static final FloatVector64 IOTA = new FloatVector64(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Float64Vector extends FloatVector {
     @Override
     public final Class<Float> elementType() { return float.class; }
 
+    @ForceInline
+    final Class<Float> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Float.SIZE; }
@@ -119,55 +124,62 @@ final class Float64Vector extends FloatVector {
         return (float[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Float64Vector broadcast(float e) {
-        return (Float64Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector64 broadcast(float e) {
+        return (FloatVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float64Vector broadcast(long e) {
-        return (Float64Vector) super.broadcastTemplate(e);  // specialize
+    public final FloatVector64 broadcast(long e) {
+        return (FloatVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Float64Mask maskFromArray(boolean[] bits) {
-        return new Float64Mask(bits);
+    FloatMask64 maskFromArray(boolean[] bits) {
+        return new FloatMask64(bits);
     }
 
     @Override
     @ForceInline
-    Float64Shuffle iotaShuffle() { return Float64Shuffle.IOTA; }
+    FloatShuffle64 iotaShuffle() { return FloatShuffle64.IOTA; }
 
     @Override
     @ForceInline
-    Float64Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Float64Shuffle) iotaShuffleTemplate(start, step, wrap);
+    FloatShuffle64 iotaShuffle(int start, int step, boolean wrap) {
+        return (FloatShuffle64) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Float64Shuffle shuffleFromArray(int[] indices, int i) { return new Float64Shuffle(indices, i); }
+    FloatShuffle64 shuffleFromArray(int[] indices, int i) { return new FloatShuffle64(indices, i); }
 
     @Override
     @ForceInline
-    Float64Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Float64Shuffle(fn); }
+    FloatShuffle64 shuffleFromOp(IntUnaryOperator fn) { return new FloatShuffle64(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Float64Vector vectorFactory(float[] vec) {
-        return new Float64Vector(vec);
+    FloatVector64 vectorFactory(float[] vec) {
+        return new FloatVector64(vec);
     }
 
     @ForceInline
     final @Override
-    Byte64Vector asByteVectorRaw() {
-        return (Byte64Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector64 asByteVectorRaw() {
+        return (ByteVector64) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Float64Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float64Vector uOp(FUnOp f) {
-        return (Float64Vector) super.uOpTemplate(f);  // specialize
+    FloatVector64 uOp(FUnOp f) {
+        return (FloatVector64) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float64Vector uOp(VectorMask<Float> m, FUnOp f) {
-        return (Float64Vector)
-            super.uOpTemplate((Float64Mask)m, f);  // specialize
+    FloatVector64 uOp(VectorMask<Float> m, FUnOp f) {
+        return (FloatVector64)
+            super.uOpTemplate((FloatMask64)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Float64Vector bOp(Vector<Float> v, FBinOp f) {
-        return (Float64Vector) super.bOpTemplate((Float64Vector)v, f);  // specialize
+    FloatVector64 bOp(Vector<Float> v, FBinOp f) {
+        return (FloatVector64) super.bOpTemplate((FloatVector64)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float64Vector bOp(Vector<Float> v,
+    FloatVector64 bOp(Vector<Float> v,
                      VectorMask<Float> m, FBinOp f) {
-        return (Float64Vector)
-            super.bOpTemplate((Float64Vector)v, (Float64Mask)m,
+        return (FloatVector64)
+            super.bOpTemplate((FloatVector64)v, (FloatMask64)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Float64Vector extends FloatVector {
 
     @ForceInline
     final @Override
-    Float64Vector tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
-        return (Float64Vector)
-            super.tOpTemplate((Float64Vector)v1, (Float64Vector)v2,
+    FloatVector64 tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
+        return (FloatVector64)
+            super.tOpTemplate((FloatVector64)v1, (FloatVector64)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Float64Vector tOp(Vector<Float> v1, Vector<Float> v2,
+    FloatVector64 tOp(Vector<Float> v1, Vector<Float> v2,
                      VectorMask<Float> m, FTriOp f) {
-        return (Float64Vector)
-            super.tOpTemplate((Float64Vector)v1, (Float64Vector)v2,
-                              (Float64Mask)m, f);  // specialize
+        return (FloatVector64)
+            super.tOpTemplate((FloatVector64)v1, (FloatVector64)v2,
+                              (FloatMask64)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class Float64Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public Float64Vector lanewise(Unary op) {
-        return (Float64Vector) super.lanewiseTemplate(op);  // specialize
+    public FloatVector64 lanewise(Unary op) {
+        return (FloatVector64) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector lanewise(Unary op, VectorMask<Float> m) {
-        return (Float64Vector) super.lanewiseTemplate(op, Float64Mask.class, (Float64Mask) m);  // specialize
+    public FloatVector64 lanewise(Unary op, VectorMask<Float> m) {
+        return (FloatVector64) super.lanewiseTemplate(op, FloatMask64.class, (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector lanewise(Binary op, Vector<Float> v) {
-        return (Float64Vector) super.lanewiseTemplate(op, v);  // specialize
+    public FloatVector64 lanewise(Binary op, Vector<Float> v) {
+        return (FloatVector64) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
-        return (Float64Vector) super.lanewiseTemplate(op, Float64Mask.class, v, (Float64Mask) m);  // specialize
+    public FloatVector64 lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector64) super.lanewiseTemplate(op, FloatMask64.class, v, (FloatMask64) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class Float64Vector extends FloatVector {
     @Override
     @ForceInline
     public final
-    Float64Vector
+    FloatVector64
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2) {
-        return (Float64Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (FloatVector64) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float64Vector
+    FloatVector64
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2, VectorMask<Float> m) {
-        return (Float64Vector) super.lanewiseTemplate(op, Float64Mask.class, v1, v2, (Float64Mask) m);  // specialize
+        return (FloatVector64) super.lanewiseTemplate(op, FloatMask64.class, v1, v2, (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Float64Vector addIndex(int scale) {
-        return (Float64Vector) super.addIndexTemplate(scale);  // specialize
+    FloatVector64 addIndex(int scale) {
+        return (FloatVector64) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class Float64Vector extends FloatVector {
     @ForceInline
     public final float reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Float> m) {
-        return super.reduceLanesTemplate(op, Float64Mask.class, (Float64Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, FloatMask64.class, (FloatMask64) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class Float64Vector extends FloatVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Float> m) {
-        return (long) super.reduceLanesTemplate(op, Float64Mask.class, (Float64Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, FloatMask64.class, (FloatMask64) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class Float64Vector extends FloatVector {
 
     @Override
     @ForceInline
-    public final Float64Shuffle toShuffle() {
-        return (Float64Shuffle) toShuffle(vspecies(), false);
+    public final FloatShuffle64 toShuffle() {
+        return (FloatShuffle64) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Float64Mask test(Test op) {
-        return super.testTemplate(Float64Mask.class, op);  // specialize
+    public final FloatMask64 test(Test op) {
+        return super.testTemplate(FloatMask64.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float64Mask test(Test op, VectorMask<Float> m) {
-        return super.testTemplate(Float64Mask.class, op, (Float64Mask) m);  // specialize
+    public final FloatMask64 test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(FloatMask64.class, op, (FloatMask64) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Float64Mask compare(Comparison op, Vector<Float> v) {
-        return super.compareTemplate(Float64Mask.class, op, v);  // specialize
+    public final FloatMask64 compare(Comparison op, Vector<Float> v) {
+        return super.compareTemplate(FloatMask64.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float64Mask compare(Comparison op, float s) {
-        return super.compareTemplate(Float64Mask.class, op, s);  // specialize
+    public final FloatMask64 compare(Comparison op, float s) {
+        return super.compareTemplate(FloatMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float64Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Float64Mask.class, op, s);  // specialize
+    public final FloatMask64 compare(Comparison op, long s) {
+        return super.compareTemplate(FloatMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Float64Mask compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
-        return super.compareTemplate(Float64Mask.class, op, v, (Float64Mask) m);
+    public final FloatMask64 compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
+        return super.compareTemplate(FloatMask64.class, op, v, (FloatMask64) m);
     }
 
 
     @Override
     @ForceInline
-    public Float64Vector blend(Vector<Float> v, VectorMask<Float> m) {
-        return (Float64Vector)
-            super.blendTemplate(Float64Mask.class,
-                                (Float64Vector) v,
-                                (Float64Mask) m);  // specialize
+    public FloatVector64 blend(Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVector64)
+            super.blendTemplate(FloatMask64.class,
+                                (FloatVector64) v,
+                                (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector slice(int origin, Vector<Float> v) {
-        return (Float64Vector) super.sliceTemplate(origin, v);  // specialize
+    public FloatVector64 slice(int origin, Vector<Float> v) {
+        return (FloatVector64) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector slice(int origin) {
-        return (Float64Vector) super.sliceTemplate(origin);  // specialize
+    public FloatVector64 slice(int origin) {
+        return (FloatVector64) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector unslice(int origin, Vector<Float> w, int part) {
-        return (Float64Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public FloatVector64 unslice(int origin, Vector<Float> w, int part) {
+        return (FloatVector64) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
-        return (Float64Vector)
-            super.unsliceTemplate(Float64Mask.class,
+    public FloatVector64 unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
+        return (FloatVector64)
+            super.unsliceTemplate(FloatMask64.class,
                                   origin, w, part,
-                                  (Float64Mask) m);  // specialize
+                                  (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector unslice(int origin) {
-        return (Float64Vector) super.unsliceTemplate(origin);  // specialize
+    public FloatVector64 unslice(int origin) {
+        return (FloatVector64) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector rearrange(VectorShuffle<Float> s) {
-        return (Float64Vector)
-            super.rearrangeTemplate(Float64Shuffle.class,
-                                    (Float64Shuffle) s);  // specialize
+    public FloatVector64 rearrange(VectorShuffle<Float> s) {
+        return (FloatVector64)
+            super.rearrangeTemplate(FloatShuffle64.class,
+                                    (FloatShuffle64) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector rearrange(VectorShuffle<Float> shuffle,
+    public FloatVector64 rearrange(VectorShuffle<Float> shuffle,
                                   VectorMask<Float> m) {
-        return (Float64Vector)
-            super.rearrangeTemplate(Float64Shuffle.class,
-                                    Float64Mask.class,
-                                    (Float64Shuffle) shuffle,
-                                    (Float64Mask) m);  // specialize
+        return (FloatVector64)
+            super.rearrangeTemplate(FloatShuffle64.class,
+                                    FloatMask64.class,
+                                    (FloatShuffle64) shuffle,
+                                    (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector rearrange(VectorShuffle<Float> s,
+    public FloatVector64 rearrange(VectorShuffle<Float> s,
                                   Vector<Float> v) {
-        return (Float64Vector)
-            super.rearrangeTemplate(Float64Shuffle.class,
-                                    (Float64Shuffle) s,
-                                    (Float64Vector) v);  // specialize
+        return (FloatVector64)
+            super.rearrangeTemplate(FloatShuffle64.class,
+                                    (FloatShuffle64) s,
+                                    (FloatVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector compress(VectorMask<Float> m) {
-        return (Float64Vector)
-            super.compressTemplate(Float64Mask.class,
-                                   (Float64Mask) m);  // specialize
+    public FloatVector64 compress(VectorMask<Float> m) {
+        return (FloatVector64)
+            super.compressTemplate(FloatMask64.class,
+                                   (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector expand(VectorMask<Float> m) {
-        return (Float64Vector)
-            super.expandTemplate(Float64Mask.class,
-                                   (Float64Mask) m);  // specialize
+    public FloatVector64 expand(VectorMask<Float> m) {
+        return (FloatVector64)
+            super.expandTemplate(FloatMask64.class,
+                                   (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector selectFrom(Vector<Float> v) {
-        return (Float64Vector)
-            super.selectFromTemplate((Float64Vector) v);  // specialize
+    public FloatVector64 selectFrom(Vector<Float> v) {
+        return (FloatVector64)
+            super.selectFromTemplate((FloatVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector selectFrom(Vector<Float> v,
+    public FloatVector64 selectFrom(Vector<Float> v,
                                    VectorMask<Float> m) {
-        return (Float64Vector)
-            super.selectFromTemplate((Float64Vector) v,
-                                     Float64Mask.class, (Float64Mask) m);  // specialize
+        return (FloatVector64)
+            super.selectFromTemplate((FloatVector64) v,
+                                     FloatMask64.class, (FloatMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Float64Vector selectFrom(Vector<Float> v1,
+    public FloatVector64 selectFrom(Vector<Float> v1,
                                    Vector<Float> v2) {
-        return (Float64Vector)
-            super.selectFromTemplate((Float64Vector) v1, (Float64Vector) v2);  // specialize
+        return (FloatVector64)
+            super.selectFromTemplate((FloatVector64) v1, (FloatVector64) v2);  // specialize
     }
 
     @ForceInline
@@ -516,7 +528,7 @@ final class Float64Vector extends FloatVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      float[] vecarr = vec.vec();
@@ -526,7 +538,7 @@ final class Float64Vector extends FloatVector {
 
     @ForceInline
     @Override
-    public Float64Vector withLane(int i, float e) {
+    public FloatVector64 withLane(int i, float e) {
         switch(i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -535,9 +547,9 @@ final class Float64Vector extends FloatVector {
     }
 
     @ForceInline
-    public Float64Vector withLaneHelper(int i, float e) {
+    public FloatVector64 withLaneHelper(int i, float e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Float.floatToRawIntBits(e),
                                 (v, ix, bits) -> {
                                     float[] res = v.vec().clone();
@@ -548,19 +560,20 @@ final class Float64Vector extends FloatVector {
 
     // Mask
 
-    static final class Float64Mask extends AbstractMask<Float> {
+    static final class FloatMask64 extends AbstractMask<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Float> ETYPE = float.class; // used by the JVM
 
-        Float64Mask(boolean[] bits) {
+        static final Class<Float> CTYPE = float.class; // used by the JVM
+
+        FloatMask64(boolean[] bits) {
             this(bits, 0);
         }
 
-        Float64Mask(boolean[] bits, int offset) {
+        FloatMask64(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Float64Mask(boolean val) {
+        FloatMask64(boolean val) {
             super(prepare(val));
         }
 
@@ -593,31 +606,31 @@ final class Float64Vector extends FloatVector {
         }
 
         @Override
-        Float64Mask uOp(MUnOp f) {
+        FloatMask64 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Float64Mask(res);
+            return new FloatMask64(res);
         }
 
         @Override
-        Float64Mask bOp(VectorMask<Float> m, MBinOp f) {
+        FloatMask64 bOp(VectorMask<Float> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Float64Mask)m).getBits();
+            boolean[] mbits = ((FloatMask64)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Float64Mask(res);
+            return new FloatMask64(res);
         }
 
         @ForceInline
         @Override
         public final
-        Float64Vector toVector() {
-            return (Float64Vector) super.toVectorTemplate();  // specialize
+        FloatVector64 toVector() {
+            return (FloatVector64) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -641,8 +654,8 @@ final class Float64Vector extends FloatVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -650,25 +663,25 @@ final class Float64Vector extends FloatVector {
         @Override
         @ForceInline
         /*package-private*/
-        Float64Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Float64Mask) VectorSupport.indexPartiallyInUpperRange(
-                Float64Mask.class, float.class, VLENGTH, offset, limit,
-                (o, l) -> (Float64Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        FloatMask64 indexPartiallyInUpperRange(long offset, long limit) {
+            return (FloatMask64) VectorSupport.indexPartiallyInUpperRange(
+                FloatMask64.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (FloatMask64) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Float64Mask not() {
+        public FloatMask64 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Float64Mask compress() {
-            return (Float64Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Float64Vector.class, Float64Mask.class, ETYPE, VLENGTH, null, this,
+        public FloatMask64 compress() {
+            return (FloatMask64)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                FloatVector64.class, FloatMask64.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -677,30 +690,30 @@ final class Float64Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public Float64Mask and(VectorMask<Float> mask) {
+        public FloatMask64 and(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float64Mask m = (Float64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Float64Mask.class, null, int.class, VLENGTH,
+            FloatMask64 m = (FloatMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, FloatMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Float64Mask or(VectorMask<Float> mask) {
+        public FloatMask64 or(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float64Mask m = (Float64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Float64Mask.class, null, int.class, VLENGTH,
+            FloatMask64 m = (FloatMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, FloatMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Float64Mask xor(VectorMask<Float> mask) {
+        public FloatMask64 xor(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            Float64Mask m = (Float64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Float64Mask.class, null, int.class, VLENGTH,
+            FloatMask64 m = (FloatMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, FloatMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -710,21 +723,21 @@ final class Float64Vector extends FloatVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Float64Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Float64Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Float64Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -734,7 +747,7 @@ final class Float64Vector extends FloatVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Float64Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -744,7 +757,7 @@ final class Float64Vector extends FloatVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Float64Mask.class, float.class, VLENGTH,
+            return VectorSupport.extract(FloatMask64.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -753,48 +766,49 @@ final class Float64Vector extends FloatVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Float64Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Float64Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((FloatMask64)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Float64Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Float64Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((FloatMask64)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Float64Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Float64Mask.class, int.class, VLENGTH,
+        static FloatMask64 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(FloatMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Float64Mask  TRUE_MASK = new Float64Mask(true);
-        private static final Float64Mask FALSE_MASK = new Float64Mask(false);
+        private static final FloatMask64  TRUE_MASK = new FloatMask64(true);
+        private static final FloatMask64 FALSE_MASK = new FloatMask64(false);
 
     }
 
     // Shuffle
 
-    static final class Float64Shuffle extends AbstractShuffle<Float> {
+    static final class FloatShuffle64 extends AbstractShuffle<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Float64Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        FloatShuffle64(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Float64Shuffle(int[] indices, int i) {
+        FloatShuffle64(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Float64Shuffle(IntUnaryOperator fn) {
+        FloatShuffle64(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -814,23 +828,23 @@ final class Float64Vector extends FloatVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Float64Shuffle IOTA = new Float64Shuffle(IDENTITY);
+        static final FloatShuffle64 IOTA = new FloatShuffle64(IDENTITY);
 
         @Override
         @ForceInline
-        public Float64Vector toVector() {
-            return (Float64Vector) toBitsVector().castShape(vspecies(), 0);
+        public FloatVector64 toVector() {
+            return (FloatVector64) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        Int64Vector toBitsVector() {
-            return (Int64Vector) super.toBitsVectorTemplate();
+        IntVector64 toBitsVector() {
+            return (IntVector64) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int64Vector toBitsVector0() {
-            return ((Int64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector64 toBitsVector0() {
+            return ((IntVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -853,30 +867,30 @@ final class Float64Vector extends FloatVector {
 
         @Override
         @ForceInline
-        public final Float64Mask laneIsValid() {
-            return (Float64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final FloatMask64 laneIsValid() {
+            return (FloatMask64) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Float64Shuffle rearrange(VectorShuffle<Float> shuffle) {
-            Float64Shuffle concreteShuffle = (Float64Shuffle) shuffle;
-            return (Float64Shuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_64))
+        public final FloatShuffle64 rearrange(VectorShuffle<Float> shuffle) {
+            FloatShuffle64 concreteShuffle = (FloatShuffle64) shuffle;
+            return (FloatShuffle64) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_64))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Float64Shuffle wrapIndexes() {
-            Int64Vector v = toBitsVector();
+        public final FloatShuffle64 wrapIndexes() {
+            IntVector64 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector64) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector64) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Float64Shuffle) v.toShuffle(vspecies(), false);
+            return (FloatShuffle64) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -927,14 +941,14 @@ final class Float64Vector extends FloatVector {
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromArray0Template(Float64Mask.class, a, offset, (Float64Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(FloatMask64.class, a, offset, (FloatMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        return super.fromArray0Template(Float64Mask.class, a, offset, indexMap, mapOffset, (Float64Mask) m);
+        return super.fromArray0Template(FloatMask64.class, a, offset, indexMap, mapOffset, (FloatMask64) m);
     }
 
 
@@ -950,7 +964,7 @@ final class Float64Vector extends FloatVector {
     @Override
     final
     FloatVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Float64Mask.class, ms, offset, (Float64Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(FloatMask64.class, ms, offset, (FloatMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -964,14 +978,14 @@ final class Float64Vector extends FloatVector {
     @Override
     final
     void intoArray0(float[] a, int offset, VectorMask<Float> m) {
-        super.intoArray0Template(Float64Mask.class, a, offset, (Float64Mask) m);
+        super.intoArray0Template(FloatMask64.class, a, offset, (FloatMask64) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        super.intoArray0Template(Float64Mask.class, a, offset, indexMap, mapOffset, (Float64Mask) m);
+        super.intoArray0Template(FloatMask64.class, a, offset, indexMap, mapOffset, (FloatMask64) m);
     }
 
 
@@ -979,7 +993,7 @@ final class Float64Vector extends FloatVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m) {
-        super.intoMemorySegment0Template(Float64Mask.class, ms, offset, (Float64Mask) m);
+        super.intoMemorySegment0Template(FloatMask64.class, ms, offset, (FloatMask64) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVectorMax.java
similarity index 62%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVectorMax.java
index 4a72661ce8b..4813f153544 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVectorMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class FloatMaxVector extends FloatVector {
+final class FloatVectorMax extends FloatVector {
     static final FloatSpecies VSPECIES =
         (FloatSpecies) FloatVector.SPECIES_MAX;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<FloatMaxVector> VCLASS = FloatMaxVector.class;
+    static final Class<FloatVectorMax> VCLASS = FloatVectorMax.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Float> CTYPE = float.class; // carrier type used by the JVM
+
     static final Class<Float> ETYPE = float.class; // used by the JVM
 
-    FloatMaxVector(float[] v) {
+    FloatVectorMax(float[] v) {
         super(v);
     }
 
-    // For compatibility as FloatMaxVector::new,
+    // For compatibility as FloatVectorMax::new,
     // stored into species.vectorFactory.
-    FloatMaxVector(Object v) {
+    FloatVectorMax(Object v) {
         this((float[]) v);
     }
 
-    static final FloatMaxVector ZERO = new FloatMaxVector(new float[VLENGTH]);
-    static final FloatMaxVector IOTA = new FloatMaxVector(VSPECIES.iotaArray());
+    static final FloatVectorMax ZERO = new FloatVectorMax(new float[VLENGTH]);
+    static final FloatVectorMax IOTA = new FloatVectorMax(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class FloatMaxVector extends FloatVector {
     @Override
     public final Class<Float> elementType() { return float.class; }
 
+    @ForceInline
+    final Class<Float> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Float.SIZE; }
@@ -119,55 +124,62 @@ final class FloatMaxVector extends FloatVector {
         return (float[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final FloatMaxVector broadcast(float e) {
-        return (FloatMaxVector) super.broadcastTemplate(e);  // specialize
+    public final FloatVectorMax broadcast(float e) {
+        return (FloatVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final FloatMaxVector broadcast(long e) {
-        return (FloatMaxVector) super.broadcastTemplate(e);  // specialize
+    public final FloatVectorMax broadcast(long e) {
+        return (FloatVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    FloatMaxMask maskFromArray(boolean[] bits) {
-        return new FloatMaxMask(bits);
+    FloatMaskMax maskFromArray(boolean[] bits) {
+        return new FloatMaskMax(bits);
     }
 
     @Override
     @ForceInline
-    FloatMaxShuffle iotaShuffle() { return FloatMaxShuffle.IOTA; }
+    FloatShuffleMax iotaShuffle() { return FloatShuffleMax.IOTA; }
 
     @Override
     @ForceInline
-    FloatMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (FloatMaxShuffle) iotaShuffleTemplate(start, step, wrap);
+    FloatShuffleMax iotaShuffle(int start, int step, boolean wrap) {
+        return (FloatShuffleMax) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    FloatMaxShuffle shuffleFromArray(int[] indices, int i) { return new FloatMaxShuffle(indices, i); }
+    FloatShuffleMax shuffleFromArray(int[] indices, int i) { return new FloatShuffleMax(indices, i); }
 
     @Override
     @ForceInline
-    FloatMaxShuffle shuffleFromOp(IntUnaryOperator fn) { return new FloatMaxShuffle(fn); }
+    FloatShuffleMax shuffleFromOp(IntUnaryOperator fn) { return new FloatShuffleMax(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    FloatMaxVector vectorFactory(float[] vec) {
-        return new FloatMaxVector(vec);
+    FloatVectorMax vectorFactory(float[] vec) {
+        return new FloatVectorMax(vec);
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector asByteVectorRaw() {
-        return (ByteMaxVector) super.asByteVectorRawTemplate();  // specialize
+    ByteVectorMax asByteVectorRaw() {
+        return (ByteVectorMax) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class FloatMaxVector extends FloatVector {
 
     @ForceInline
     final @Override
-    FloatMaxVector uOp(FUnOp f) {
-        return (FloatMaxVector) super.uOpTemplate(f);  // specialize
+    FloatVectorMax uOp(FUnOp f) {
+        return (FloatVectorMax) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    FloatMaxVector uOp(VectorMask<Float> m, FUnOp f) {
-        return (FloatMaxVector)
-            super.uOpTemplate((FloatMaxMask)m, f);  // specialize
+    FloatVectorMax uOp(VectorMask<Float> m, FUnOp f) {
+        return (FloatVectorMax)
+            super.uOpTemplate((FloatMaskMax)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    FloatMaxVector bOp(Vector<Float> v, FBinOp f) {
-        return (FloatMaxVector) super.bOpTemplate((FloatMaxVector)v, f);  // specialize
+    FloatVectorMax bOp(Vector<Float> v, FBinOp f) {
+        return (FloatVectorMax) super.bOpTemplate((FloatVectorMax)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    FloatMaxVector bOp(Vector<Float> v,
+    FloatVectorMax bOp(Vector<Float> v,
                      VectorMask<Float> m, FBinOp f) {
-        return (FloatMaxVector)
-            super.bOpTemplate((FloatMaxVector)v, (FloatMaxMask)m,
+        return (FloatVectorMax)
+            super.bOpTemplate((FloatVectorMax)v, (FloatMaskMax)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class FloatMaxVector extends FloatVector {
 
     @ForceInline
     final @Override
-    FloatMaxVector tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
-        return (FloatMaxVector)
-            super.tOpTemplate((FloatMaxVector)v1, (FloatMaxVector)v2,
+    FloatVectorMax tOp(Vector<Float> v1, Vector<Float> v2, FTriOp f) {
+        return (FloatVectorMax)
+            super.tOpTemplate((FloatVectorMax)v1, (FloatVectorMax)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    FloatMaxVector tOp(Vector<Float> v1, Vector<Float> v2,
+    FloatVectorMax tOp(Vector<Float> v1, Vector<Float> v2,
                      VectorMask<Float> m, FTriOp f) {
-        return (FloatMaxVector)
-            super.tOpTemplate((FloatMaxVector)v1, (FloatMaxVector)v2,
-                              (FloatMaxMask)m, f);  // specialize
+        return (FloatVectorMax)
+            super.tOpTemplate((FloatVectorMax)v1, (FloatVectorMax)v2,
+                              (FloatMaskMax)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,26 +274,26 @@ final class FloatMaxVector extends FloatVector {
 
     @Override
     @ForceInline
-    public FloatMaxVector lanewise(Unary op) {
-        return (FloatMaxVector) super.lanewiseTemplate(op);  // specialize
+    public FloatVectorMax lanewise(Unary op) {
+        return (FloatVectorMax) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector lanewise(Unary op, VectorMask<Float> m) {
-        return (FloatMaxVector) super.lanewiseTemplate(op, FloatMaxMask.class, (FloatMaxMask) m);  // specialize
+    public FloatVectorMax lanewise(Unary op, VectorMask<Float> m) {
+        return (FloatVectorMax) super.lanewiseTemplate(op, FloatMaskMax.class, (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector lanewise(Binary op, Vector<Float> v) {
-        return (FloatMaxVector) super.lanewiseTemplate(op, v);  // specialize
+    public FloatVectorMax lanewise(Binary op, Vector<Float> v) {
+        return (FloatVectorMax) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
-        return (FloatMaxVector) super.lanewiseTemplate(op, FloatMaxMask.class, v, (FloatMaxMask) m);  // specialize
+    public FloatVectorMax lanewise(Binary op, Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVectorMax) super.lanewiseTemplate(op, FloatMaskMax.class, v, (FloatMaskMax) m);  // specialize
     }
 
 
@@ -289,24 +301,24 @@ final class FloatMaxVector extends FloatVector {
     @Override
     @ForceInline
     public final
-    FloatMaxVector
+    FloatVectorMax
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2) {
-        return (FloatMaxVector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (FloatVectorMax) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    FloatMaxVector
+    FloatVectorMax
     lanewise(Ternary op, Vector<Float> v1, Vector<Float> v2, VectorMask<Float> m) {
-        return (FloatMaxVector) super.lanewiseTemplate(op, FloatMaxMask.class, v1, v2, (FloatMaxMask) m);  // specialize
+        return (FloatVectorMax) super.lanewiseTemplate(op, FloatMaskMax.class, v1, v2, (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    FloatMaxVector addIndex(int scale) {
-        return (FloatMaxVector) super.addIndexTemplate(scale);  // specialize
+    FloatVectorMax addIndex(int scale) {
+        return (FloatVectorMax) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -321,7 +333,7 @@ final class FloatMaxVector extends FloatVector {
     @ForceInline
     public final float reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Float> m) {
-        return super.reduceLanesTemplate(op, FloatMaxMask.class, (FloatMaxMask) m);  // specialized
+        return super.reduceLanesTemplate(op, FloatMaskMax.class, (FloatMaskMax) m);  // specialized
     }
 
     @Override
@@ -334,7 +346,7 @@ final class FloatMaxVector extends FloatVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Float> m) {
-        return (long) super.reduceLanesTemplate(op, FloatMaxMask.class, (FloatMaxMask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, FloatMaskMax.class, (FloatMaskMax) m);  // specialized
     }
 
     @Override
@@ -345,160 +357,160 @@ final class FloatMaxVector extends FloatVector {
 
     @Override
     @ForceInline
-    public final FloatMaxShuffle toShuffle() {
-        return (FloatMaxShuffle) toShuffle(vspecies(), false);
+    public final FloatShuffleMax toShuffle() {
+        return (FloatShuffleMax) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final FloatMaxMask test(Test op) {
-        return super.testTemplate(FloatMaxMask.class, op);  // specialize
+    public final FloatMaskMax test(Test op) {
+        return super.testTemplate(FloatMaskMax.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final FloatMaxMask test(Test op, VectorMask<Float> m) {
-        return super.testTemplate(FloatMaxMask.class, op, (FloatMaxMask) m);  // specialize
+    public final FloatMaskMax test(Test op, VectorMask<Float> m) {
+        return super.testTemplate(FloatMaskMax.class, op, (FloatMaskMax) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final FloatMaxMask compare(Comparison op, Vector<Float> v) {
-        return super.compareTemplate(FloatMaxMask.class, op, v);  // specialize
+    public final FloatMaskMax compare(Comparison op, Vector<Float> v) {
+        return super.compareTemplate(FloatMaskMax.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final FloatMaxMask compare(Comparison op, float s) {
-        return super.compareTemplate(FloatMaxMask.class, op, s);  // specialize
+    public final FloatMaskMax compare(Comparison op, float s) {
+        return super.compareTemplate(FloatMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final FloatMaxMask compare(Comparison op, long s) {
-        return super.compareTemplate(FloatMaxMask.class, op, s);  // specialize
+    public final FloatMaskMax compare(Comparison op, long s) {
+        return super.compareTemplate(FloatMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final FloatMaxMask compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
-        return super.compareTemplate(FloatMaxMask.class, op, v, (FloatMaxMask) m);
+    public final FloatMaskMax compare(Comparison op, Vector<Float> v, VectorMask<Float> m) {
+        return super.compareTemplate(FloatMaskMax.class, op, v, (FloatMaskMax) m);
     }
 
 
     @Override
     @ForceInline
-    public FloatMaxVector blend(Vector<Float> v, VectorMask<Float> m) {
-        return (FloatMaxVector)
-            super.blendTemplate(FloatMaxMask.class,
-                                (FloatMaxVector) v,
-                                (FloatMaxMask) m);  // specialize
+    public FloatVectorMax blend(Vector<Float> v, VectorMask<Float> m) {
+        return (FloatVectorMax)
+            super.blendTemplate(FloatMaskMax.class,
+                                (FloatVectorMax) v,
+                                (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector slice(int origin, Vector<Float> v) {
-        return (FloatMaxVector) super.sliceTemplate(origin, v);  // specialize
+    public FloatVectorMax slice(int origin, Vector<Float> v) {
+        return (FloatVectorMax) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector slice(int origin) {
-        return (FloatMaxVector) super.sliceTemplate(origin);  // specialize
+    public FloatVectorMax slice(int origin) {
+        return (FloatVectorMax) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector unslice(int origin, Vector<Float> w, int part) {
-        return (FloatMaxVector) super.unsliceTemplate(origin, w, part);  // specialize
+    public FloatVectorMax unslice(int origin, Vector<Float> w, int part) {
+        return (FloatVectorMax) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
-        return (FloatMaxVector)
-            super.unsliceTemplate(FloatMaxMask.class,
+    public FloatVectorMax unslice(int origin, Vector<Float> w, int part, VectorMask<Float> m) {
+        return (FloatVectorMax)
+            super.unsliceTemplate(FloatMaskMax.class,
                                   origin, w, part,
-                                  (FloatMaxMask) m);  // specialize
+                                  (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector unslice(int origin) {
-        return (FloatMaxVector) super.unsliceTemplate(origin);  // specialize
+    public FloatVectorMax unslice(int origin) {
+        return (FloatVectorMax) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector rearrange(VectorShuffle<Float> s) {
-        return (FloatMaxVector)
-            super.rearrangeTemplate(FloatMaxShuffle.class,
-                                    (FloatMaxShuffle) s);  // specialize
+    public FloatVectorMax rearrange(VectorShuffle<Float> s) {
+        return (FloatVectorMax)
+            super.rearrangeTemplate(FloatShuffleMax.class,
+                                    (FloatShuffleMax) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector rearrange(VectorShuffle<Float> shuffle,
+    public FloatVectorMax rearrange(VectorShuffle<Float> shuffle,
                                   VectorMask<Float> m) {
-        return (FloatMaxVector)
-            super.rearrangeTemplate(FloatMaxShuffle.class,
-                                    FloatMaxMask.class,
-                                    (FloatMaxShuffle) shuffle,
-                                    (FloatMaxMask) m);  // specialize
+        return (FloatVectorMax)
+            super.rearrangeTemplate(FloatShuffleMax.class,
+                                    FloatMaskMax.class,
+                                    (FloatShuffleMax) shuffle,
+                                    (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector rearrange(VectorShuffle<Float> s,
+    public FloatVectorMax rearrange(VectorShuffle<Float> s,
                                   Vector<Float> v) {
-        return (FloatMaxVector)
-            super.rearrangeTemplate(FloatMaxShuffle.class,
-                                    (FloatMaxShuffle) s,
-                                    (FloatMaxVector) v);  // specialize
+        return (FloatVectorMax)
+            super.rearrangeTemplate(FloatShuffleMax.class,
+                                    (FloatShuffleMax) s,
+                                    (FloatVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector compress(VectorMask<Float> m) {
-        return (FloatMaxVector)
-            super.compressTemplate(FloatMaxMask.class,
-                                   (FloatMaxMask) m);  // specialize
+    public FloatVectorMax compress(VectorMask<Float> m) {
+        return (FloatVectorMax)
+            super.compressTemplate(FloatMaskMax.class,
+                                   (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector expand(VectorMask<Float> m) {
-        return (FloatMaxVector)
-            super.expandTemplate(FloatMaxMask.class,
-                                   (FloatMaxMask) m);  // specialize
+    public FloatVectorMax expand(VectorMask<Float> m) {
+        return (FloatVectorMax)
+            super.expandTemplate(FloatMaskMax.class,
+                                   (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector selectFrom(Vector<Float> v) {
-        return (FloatMaxVector)
-            super.selectFromTemplate((FloatMaxVector) v);  // specialize
+    public FloatVectorMax selectFrom(Vector<Float> v) {
+        return (FloatVectorMax)
+            super.selectFromTemplate((FloatVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector selectFrom(Vector<Float> v,
+    public FloatVectorMax selectFrom(Vector<Float> v,
                                    VectorMask<Float> m) {
-        return (FloatMaxVector)
-            super.selectFromTemplate((FloatMaxVector) v,
-                                     FloatMaxMask.class, (FloatMaxMask) m);  // specialize
+        return (FloatVectorMax)
+            super.selectFromTemplate((FloatVectorMax) v,
+                                     FloatMaskMax.class, (FloatMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public FloatMaxVector selectFrom(Vector<Float> v1,
+    public FloatVectorMax selectFrom(Vector<Float> v1,
                                    Vector<Float> v2) {
-        return (FloatMaxVector)
-            super.selectFromTemplate((FloatMaxVector) v1, (FloatMaxVector) v2);  // specialize
+        return (FloatVectorMax)
+            super.selectFromTemplate((FloatVectorMax) v1, (FloatVectorMax) v2);  // specialize
     }
 
     @ForceInline
@@ -514,7 +526,7 @@ final class FloatMaxVector extends FloatVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      float[] vecarr = vec.vec();
@@ -524,7 +536,7 @@ final class FloatMaxVector extends FloatVector {
 
     @ForceInline
     @Override
-    public FloatMaxVector withLane(int i, float e) {
+    public FloatVectorMax withLane(int i, float e) {
         if (i < 0 || i >= VLENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
         }
@@ -532,9 +544,9 @@ final class FloatMaxVector extends FloatVector {
     }
 
     @ForceInline
-    public FloatMaxVector withLaneHelper(int i, float e) {
+    public FloatVectorMax withLaneHelper(int i, float e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)Float.floatToRawIntBits(e),
                                 (v, ix, bits) -> {
                                     float[] res = v.vec().clone();
@@ -545,19 +557,20 @@ final class FloatMaxVector extends FloatVector {
 
     // Mask
 
-    static final class FloatMaxMask extends AbstractMask<Float> {
+    static final class FloatMaskMax extends AbstractMask<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Float> ETYPE = float.class; // used by the JVM
 
-        FloatMaxMask(boolean[] bits) {
+        static final Class<Float> CTYPE = float.class; // used by the JVM
+
+        FloatMaskMax(boolean[] bits) {
             this(bits, 0);
         }
 
-        FloatMaxMask(boolean[] bits, int offset) {
+        FloatMaskMax(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        FloatMaxMask(boolean val) {
+        FloatMaskMax(boolean val) {
             super(prepare(val));
         }
 
@@ -590,31 +603,31 @@ final class FloatMaxVector extends FloatVector {
         }
 
         @Override
-        FloatMaxMask uOp(MUnOp f) {
+        FloatMaskMax uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new FloatMaxMask(res);
+            return new FloatMaskMax(res);
         }
 
         @Override
-        FloatMaxMask bOp(VectorMask<Float> m, MBinOp f) {
+        FloatMaskMax bOp(VectorMask<Float> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((FloatMaxMask)m).getBits();
+            boolean[] mbits = ((FloatMaskMax)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new FloatMaxMask(res);
+            return new FloatMaskMax(res);
         }
 
         @ForceInline
         @Override
         public final
-        FloatMaxVector toVector() {
-            return (FloatMaxVector) super.toVectorTemplate();  // specialize
+        FloatVectorMax toVector() {
+            return (FloatVectorMax) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -638,8 +651,8 @@ final class FloatMaxVector extends FloatVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -647,25 +660,25 @@ final class FloatMaxVector extends FloatVector {
         @Override
         @ForceInline
         /*package-private*/
-        FloatMaxMask indexPartiallyInUpperRange(long offset, long limit) {
-            return (FloatMaxMask) VectorSupport.indexPartiallyInUpperRange(
-                FloatMaxMask.class, float.class, VLENGTH, offset, limit,
-                (o, l) -> (FloatMaxMask) TRUE_MASK.indexPartiallyInRange(o, l));
+        FloatMaskMax indexPartiallyInUpperRange(long offset, long limit) {
+            return (FloatMaskMax) VectorSupport.indexPartiallyInUpperRange(
+                FloatMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (FloatMaskMax) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public FloatMaxMask not() {
+        public FloatMaskMax not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public FloatMaxMask compress() {
-            return (FloatMaxMask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                FloatMaxVector.class, FloatMaxMask.class, ETYPE, VLENGTH, null, this,
+        public FloatMaskMax compress() {
+            return (FloatMaskMax)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                FloatVectorMax.class, FloatMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -674,30 +687,30 @@ final class FloatMaxVector extends FloatVector {
 
         @Override
         @ForceInline
-        public FloatMaxMask and(VectorMask<Float> mask) {
+        public FloatMaskMax and(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            FloatMaxMask m = (FloatMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, FloatMaxMask.class, null, int.class, VLENGTH,
+            FloatMaskMax m = (FloatMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, FloatMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public FloatMaxMask or(VectorMask<Float> mask) {
+        public FloatMaskMax or(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            FloatMaxMask m = (FloatMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, FloatMaxMask.class, null, int.class, VLENGTH,
+            FloatMaskMax m = (FloatMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, FloatMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public FloatMaxMask xor(VectorMask<Float> mask) {
+        public FloatMaskMax xor(VectorMask<Float> mask) {
             Objects.requireNonNull(mask);
-            FloatMaxMask m = (FloatMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, FloatMaxMask.class, null, int.class, VLENGTH,
+            FloatMaskMax m = (FloatMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, FloatMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -707,21 +720,21 @@ final class FloatMaxVector extends FloatVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, FloatMaxMask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, FloatMaxMask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, FloatMaxMask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -731,7 +744,7 @@ final class FloatMaxVector extends FloatVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, FloatMaxMask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -741,7 +754,7 @@ final class FloatMaxVector extends FloatVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(FloatMaxMask.class, float.class, VLENGTH,
+            return VectorSupport.extract(FloatMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -750,48 +763,49 @@ final class FloatMaxVector extends FloatVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, FloatMaxMask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((FloatMaxMask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((FloatMaskMax)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, FloatMaxMask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((FloatMaxMask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((FloatMaskMax)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static FloatMaxMask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(FloatMaxMask.class, int.class, VLENGTH,
+        static FloatMaskMax maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(FloatMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final FloatMaxMask  TRUE_MASK = new FloatMaxMask(true);
-        private static final FloatMaxMask FALSE_MASK = new FloatMaxMask(false);
+        private static final FloatMaskMax  TRUE_MASK = new FloatMaskMax(true);
+        private static final FloatMaskMax FALSE_MASK = new FloatMaskMax(false);
 
     }
 
     // Shuffle
 
-    static final class FloatMaxShuffle extends AbstractShuffle<Float> {
+    static final class FloatShuffleMax extends AbstractShuffle<Float> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        FloatMaxShuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        FloatShuffleMax(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        FloatMaxShuffle(int[] indices, int i) {
+        FloatShuffleMax(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        FloatMaxShuffle(IntUnaryOperator fn) {
+        FloatShuffleMax(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -811,23 +825,23 @@ final class FloatMaxVector extends FloatVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final FloatMaxShuffle IOTA = new FloatMaxShuffle(IDENTITY);
+        static final FloatShuffleMax IOTA = new FloatShuffleMax(IDENTITY);
 
         @Override
         @ForceInline
-        public FloatMaxVector toVector() {
-            return (FloatMaxVector) toBitsVector().castShape(vspecies(), 0);
+        public FloatVectorMax toVector() {
+            return (FloatVectorMax) toBitsVector().castShape(vspecies(), 0);
         }
 
         @Override
         @ForceInline
-        IntMaxVector toBitsVector() {
-            return (IntMaxVector) super.toBitsVectorTemplate();
+        IntVectorMax toBitsVector() {
+            return (IntVectorMax) super.toBitsVectorTemplate();
         }
 
         @Override
-        IntMaxVector toBitsVector0() {
-            return ((IntMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVectorMax toBitsVector0() {
+            return ((IntVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -850,30 +864,30 @@ final class FloatMaxVector extends FloatVector {
 
         @Override
         @ForceInline
-        public final FloatMaxMask laneIsValid() {
-            return (FloatMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final FloatMaskMax laneIsValid() {
+            return (FloatMaskMax) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final FloatMaxShuffle rearrange(VectorShuffle<Float> shuffle) {
-            FloatMaxShuffle concreteShuffle = (FloatMaxShuffle) shuffle;
-            return (FloatMaxShuffle) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_MAX))
+        public final FloatShuffleMax rearrange(VectorShuffle<Float> shuffle) {
+            FloatShuffleMax concreteShuffle = (FloatShuffleMax) shuffle;
+            return (FloatShuffleMax) toBitsVector().rearrange(concreteShuffle.cast(IntVector.SPECIES_MAX))
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final FloatMaxShuffle wrapIndexes() {
-            IntMaxVector v = toBitsVector();
+        public final FloatShuffleMax wrapIndexes() {
+            IntVectorMax v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (IntMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVectorMax) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (IntMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (FloatMaxShuffle) v.toShuffle(vspecies(), false);
+            return (FloatShuffleMax) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -924,14 +938,14 @@ final class FloatMaxVector extends FloatVector {
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromArray0Template(FloatMaxMask.class, a, offset, (FloatMaxMask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(FloatMaskMax.class, a, offset, (FloatMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     FloatVector fromArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        return super.fromArray0Template(FloatMaxMask.class, a, offset, indexMap, mapOffset, (FloatMaxMask) m);
+        return super.fromArray0Template(FloatMaskMax.class, a, offset, indexMap, mapOffset, (FloatMaskMax) m);
     }
 
 
@@ -947,7 +961,7 @@ final class FloatMaxVector extends FloatVector {
     @Override
     final
     FloatVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(FloatMaxMask.class, ms, offset, (FloatMaxMask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(FloatMaskMax.class, ms, offset, (FloatMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -961,14 +975,14 @@ final class FloatMaxVector extends FloatVector {
     @Override
     final
     void intoArray0(float[] a, int offset, VectorMask<Float> m) {
-        super.intoArray0Template(FloatMaxMask.class, a, offset, (FloatMaxMask) m);
+        super.intoArray0Template(FloatMaskMax.class, a, offset, (FloatMaskMax) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(float[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Float> m) {
-        super.intoArray0Template(FloatMaxMask.class, a, offset, indexMap, mapOffset, (FloatMaxMask) m);
+        super.intoArray0Template(FloatMaskMax.class, a, offset, indexMap, mapOffset, (FloatMaskMax) m);
     }
 
 
@@ -976,7 +990,7 @@ final class FloatMaxVector extends FloatVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Float> m) {
-        super.intoMemorySegment0Template(FloatMaxMask.class, ms, offset, (FloatMaxMask) m);
+        super.intoMemorySegment0Template(FloatMaskMax.class, ms, offset, (FloatMaskMax) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
index 43356b9ea6c..445c4dfb006 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
     static final ValueLayout.OfInt ELEMENT_LAYOUT = ValueLayout.JAVA_INT.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = LT_INT;
+
+    static final int LANEBITS_TYPE_ORDINAL = LT_INT;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -80,8 +84,8 @@ public abstract class IntVector extends AbstractVector<Integer> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -573,7 +577,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     @ForceInline
     public static IntVector zero(VectorSpecies<Integer> species) {
         IntSpecies vsp = (IntSpecies) species;
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), int.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                                 0, MODE_BROADCAST, vsp,
                                 ((bits_, s_) -> s_.rvOp(i -> bits_)));
     }
@@ -695,7 +699,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, int.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, IntVector::unaryOperations));
     }
@@ -723,7 +727,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, int.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, IntVector::unaryOperations));
     }
@@ -796,7 +800,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, int.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, IntVector::binaryOperations));
     }
@@ -847,7 +851,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, int.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, IntVector::binaryOperations));
     }
@@ -1038,7 +1042,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), null, int.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, e, null,
             BIN_INT_IMPL.find(op, opc, IntVector::broadcastIntOperations));
     }
@@ -1059,7 +1063,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), maskClass, int.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, e, m,
             BIN_INT_IMPL.find(op, opc, IntVector::broadcastIntOperations));
     }
@@ -1135,7 +1139,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, int.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, IntVector::ternaryOperations));
     }
@@ -1175,7 +1179,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, int.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, IntVector::ternaryOperations));
     }
@@ -2055,7 +2059,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, int.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Integer> m
@@ -2077,7 +2081,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, int.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Integer> cmpM
@@ -2208,7 +2212,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     blendTemplate(Class<M> maskType, IntVector v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, int.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2225,7 +2229,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), int.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2417,7 +2421,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     IntVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, int.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2444,7 +2448,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, int.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2470,7 +2474,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         VectorMask<Integer> valid = shuffle.laneIsValid();
         IntVector r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, int.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2478,7 +2482,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
                 }));
         IntVector r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, int.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2528,7 +2532,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     IntVector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (IntVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        int.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -2547,7 +2551,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     IntVector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (IntVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        int.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -2562,7 +2566,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     /*package-private*/
     @ForceInline
     final IntVector selectFromTemplate(IntVector v) {
-        return (IntVector)VectorSupport.selectFromOp(getClass(), null, int.class,
+        return (IntVector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -2582,7 +2586,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     IntVector selectFromTemplate(IntVector v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return (IntVector)VectorSupport.selectFromOp(getClass(), masktype, int.class,
+        return (IntVector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -2600,7 +2604,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     /*package-private*/
     @ForceInline
     final IntVector selectFromTemplate(IntVector v1, IntVector v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), int.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -2820,7 +2824,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, int.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, IntVector::reductionOperations)));
     }
@@ -2838,7 +2842,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, int.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, IntVector::reductionOperations)));
     }
@@ -2858,9 +2862,9 @@ public abstract class IntVector extends AbstractVector<Integer> {
             case VECTOR_OP_MAX: return (v, m) ->
                     toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (int) Math.max(a, b)));
             case VECTOR_OP_UMIN: return (v, m) ->
-                    toBits(v.rOp(MAX_OR_INF, m, (i, a, b) -> (int) VectorMath.minUnsigned(a, b)));
+                    toBits(v.rOp(UMAX_VALUE, m, (i, a, b) -> (int) VectorMath.minUnsigned(a, b)));
             case VECTOR_OP_UMAX: return (v, m) ->
-                    toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (int) VectorMath.maxUnsigned(a, b)));
+                    toBits(v.rOp(UMIN_VALUE, m, (i, a, b) -> (int) VectorMath.maxUnsigned(a, b)));
             case VECTOR_OP_SUADD: return (v, m) ->
                     toBits(v.rOp((int)0, m, (i, a, b) -> (int) VectorMath.addSaturatingUnsigned(a, b)));
             case VECTOR_OP_AND: return (v, m) ->
@@ -2875,6 +2879,8 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
     private static final int MIN_OR_INF = Integer.MIN_VALUE;
     private static final int MAX_OR_INF = Integer.MAX_VALUE;
+    private static final int UMIN_VALUE = (int)0;   // Minimum unsigned value
+    private static final int UMAX_VALUE = (int)-1;  // Maximum unsigned value
 
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op);
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op,
@@ -3098,7 +3104,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, null, int.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3281,7 +3287,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         offset = checkFromIndexSize(offset, length(), a.length);
         IntSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3370,7 +3376,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), null, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, null,
@@ -3497,7 +3503,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     IntVector fromArray0Template(int[] a, int offset) {
         IntSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3514,7 +3520,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         m.check(species());
         IntSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3547,7 +3553,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, int.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -3564,7 +3570,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     IntVector fromMemorySegment0Template(MemorySegment ms, long offset) {
         IntSpecies vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, IntVector::memorySegmentGet);
@@ -3580,7 +3586,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         IntSpecies vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, IntVector::memorySegmentGet);
@@ -3598,7 +3604,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     void intoArray0Template(int[] a, int offset) {
         IntSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -3615,7 +3621,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         m.check(species());
         IntSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -3644,7 +3650,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, m,
@@ -3663,7 +3669,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         IntSpecies vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -3680,7 +3686,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         IntSpecies vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -3718,6 +3724,18 @@ public abstract class IntVector extends AbstractVector<Integer> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    IntVector swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+        int subLanesPerSrc = subLanesToSwap(srcSpecies);
+        if (subLanesPerSrc < 0) {
+            return this;
+        }
+        VectorShuffle<Integer> shuffle = normalizeSubLanesForSpecies(this.vspecies(), subLanesPerSrc);
+        return (IntVector) this.rearrange(shuffle);
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_INT_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -3884,7 +3902,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
         final IntVector broadcastBits(long bits) {
             return (IntVector)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, int.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -4066,13 +4084,13 @@ public abstract class IntVector extends AbstractVector<Integer> {
         @Override
         @ForceInline
         public final IntVector zero() {
-            if ((Class<?>) vectorType() == IntMaxVector.class)
-                return IntMaxVector.ZERO;
+            if ((Class<?>) vectorType() == IntVectorMax.class)
+                return IntVectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return Int64Vector.ZERO;
-                case 128: return Int128Vector.ZERO;
-                case 256: return Int256Vector.ZERO;
-                case 512: return Int512Vector.ZERO;
+                case 64: return IntVector64.ZERO;
+                case 128: return IntVector128.ZERO;
+                case 256: return IntVector256.ZERO;
+                case 512: return IntVector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -4080,13 +4098,13 @@ public abstract class IntVector extends AbstractVector<Integer> {
         @Override
         @ForceInline
         public final IntVector iota() {
-            if ((Class<?>) vectorType() == IntMaxVector.class)
-                return IntMaxVector.IOTA;
+            if ((Class<?>) vectorType() == IntVectorMax.class)
+                return IntVectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return Int64Vector.IOTA;
-                case 128: return Int128Vector.IOTA;
-                case 256: return Int256Vector.IOTA;
-                case 512: return Int512Vector.IOTA;
+                case 64: return IntVector64.IOTA;
+                case 128: return IntVector128.IOTA;
+                case 256: return IntVector256.IOTA;
+                case 512: return IntVector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -4095,13 +4113,13 @@ public abstract class IntVector extends AbstractVector<Integer> {
         @Override
         @ForceInline
         public final VectorMask<Integer> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == IntMaxVector.class)
-                return IntMaxVector.IntMaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == IntVectorMax.class)
+                return IntVectorMax.IntMaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return Int64Vector.Int64Mask.maskAll(bit);
-                case 128: return Int128Vector.Int128Mask.maskAll(bit);
-                case 256: return Int256Vector.Int256Mask.maskAll(bit);
-                case 512: return Int512Vector.Int512Mask.maskAll(bit);
+                case 64: return IntVector64.IntMask64.maskAll(bit);
+                case 128: return IntVector128.IntMask128.maskAll(bit);
+                case 256: return IntVector256.IntMask256.maskAll(bit);
+                case 512: return IntVector512.IntMask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -4129,42 +4147,42 @@ public abstract class IntVector extends AbstractVector<Integer> {
     /** Species representing {@link IntVector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<Integer> SPECIES_64
         = new IntSpecies(VectorShape.S_64_BIT,
-                            Int64Vector.class,
-                            Int64Vector.Int64Mask.class,
-                            Int64Vector.Int64Shuffle.class,
-                            Int64Vector::new);
+                            IntVector64.class,
+                            IntVector64.IntMask64.class,
+                            IntVector64.IntShuffle64.class,
+                            IntVector64::new);
 
     /** Species representing {@link IntVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<Integer> SPECIES_128
         = new IntSpecies(VectorShape.S_128_BIT,
-                            Int128Vector.class,
-                            Int128Vector.Int128Mask.class,
-                            Int128Vector.Int128Shuffle.class,
-                            Int128Vector::new);
+                            IntVector128.class,
+                            IntVector128.IntMask128.class,
+                            IntVector128.IntShuffle128.class,
+                            IntVector128::new);
 
     /** Species representing {@link IntVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<Integer> SPECIES_256
         = new IntSpecies(VectorShape.S_256_BIT,
-                            Int256Vector.class,
-                            Int256Vector.Int256Mask.class,
-                            Int256Vector.Int256Shuffle.class,
-                            Int256Vector::new);
+                            IntVector256.class,
+                            IntVector256.IntMask256.class,
+                            IntVector256.IntShuffle256.class,
+                            IntVector256::new);
 
     /** Species representing {@link IntVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<Integer> SPECIES_512
         = new IntSpecies(VectorShape.S_512_BIT,
-                            Int512Vector.class,
-                            Int512Vector.Int512Mask.class,
-                            Int512Vector.Int512Shuffle.class,
-                            Int512Vector::new);
+                            IntVector512.class,
+                            IntVector512.IntMask512.class,
+                            IntVector512.IntShuffle512.class,
+                            IntVector512::new);
 
     /** Species representing {@link IntVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<Integer> SPECIES_MAX
         = new IntSpecies(VectorShape.S_Max_BIT,
-                            IntMaxVector.class,
-                            IntMaxVector.IntMaxMask.class,
-                            IntMaxVector.IntMaxShuffle.class,
-                            IntMaxVector::new);
+                            IntVectorMax.class,
+                            IntVectorMax.IntMaskMax.class,
+                            IntVectorMax.IntShuffleMax.class,
+                            IntVectorMax::new);
 
     /**
      * Preferred species for {@link IntVector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector128.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector128.java
index edf45b8772a..cc8f31a4bc2 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector128.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Int128Vector extends IntVector {
+final class IntVector128 extends IntVector {
     static final IntSpecies VSPECIES =
         (IntSpecies) IntVector.SPECIES_128;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Int128Vector> VCLASS = Int128Vector.class;
+    static final Class<IntVector128> VCLASS = IntVector128.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Integer> CTYPE = int.class; // carrier type used by the JVM
+
     static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-    Int128Vector(int[] v) {
+    IntVector128(int[] v) {
         super(v);
     }
 
-    // For compatibility as Int128Vector::new,
+    // For compatibility as IntVector128::new,
     // stored into species.vectorFactory.
-    Int128Vector(Object v) {
+    IntVector128(Object v) {
         this((int[]) v);
     }
 
-    static final Int128Vector ZERO = new Int128Vector(new int[VLENGTH]);
-    static final Int128Vector IOTA = new Int128Vector(VSPECIES.iotaArray());
+    static final IntVector128 ZERO = new IntVector128(new int[VLENGTH]);
+    static final IntVector128 IOTA = new IntVector128(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Int128Vector extends IntVector {
     @Override
     public final Class<Integer> elementType() { return int.class; }
 
+    @ForceInline
+    final Class<Integer> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Integer.SIZE; }
@@ -119,55 +124,62 @@ final class Int128Vector extends IntVector {
         return (int[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Int128Vector broadcast(int e) {
-        return (Int128Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector128 broadcast(int e) {
+        return (IntVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int128Vector broadcast(long e) {
-        return (Int128Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector128 broadcast(long e) {
+        return (IntVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Int128Mask maskFromArray(boolean[] bits) {
-        return new Int128Mask(bits);
+    IntMask128 maskFromArray(boolean[] bits) {
+        return new IntMask128(bits);
     }
 
     @Override
     @ForceInline
-    Int128Shuffle iotaShuffle() { return Int128Shuffle.IOTA; }
+    IntShuffle128 iotaShuffle() { return IntShuffle128.IOTA; }
 
     @Override
     @ForceInline
-    Int128Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Int128Shuffle) iotaShuffleTemplate(start, step, wrap);
+    IntShuffle128 iotaShuffle(int start, int step, boolean wrap) {
+        return (IntShuffle128) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Int128Shuffle shuffleFromArray(int[] indices, int i) { return new Int128Shuffle(indices, i); }
+    IntShuffle128 shuffleFromArray(int[] indices, int i) { return new IntShuffle128(indices, i); }
 
     @Override
     @ForceInline
-    Int128Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Int128Shuffle(fn); }
+    IntShuffle128 shuffleFromOp(IntUnaryOperator fn) { return new IntShuffle128(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Int128Vector vectorFactory(int[] vec) {
-        return new Int128Vector(vec);
+    IntVector128 vectorFactory(int[] vec) {
+        return new IntVector128(vec);
     }
 
     @ForceInline
     final @Override
-    Byte128Vector asByteVectorRaw() {
-        return (Byte128Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector128 asByteVectorRaw() {
+        return (ByteVector128) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Int128Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int128Vector uOp(FUnOp f) {
-        return (Int128Vector) super.uOpTemplate(f);  // specialize
+    IntVector128 uOp(FUnOp f) {
+        return (IntVector128) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int128Vector uOp(VectorMask<Integer> m, FUnOp f) {
-        return (Int128Vector)
-            super.uOpTemplate((Int128Mask)m, f);  // specialize
+    IntVector128 uOp(VectorMask<Integer> m, FUnOp f) {
+        return (IntVector128)
+            super.uOpTemplate((IntMask128)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Int128Vector bOp(Vector<Integer> v, FBinOp f) {
-        return (Int128Vector) super.bOpTemplate((Int128Vector)v, f);  // specialize
+    IntVector128 bOp(Vector<Integer> v, FBinOp f) {
+        return (IntVector128) super.bOpTemplate((IntVector128)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int128Vector bOp(Vector<Integer> v,
+    IntVector128 bOp(Vector<Integer> v,
                      VectorMask<Integer> m, FBinOp f) {
-        return (Int128Vector)
-            super.bOpTemplate((Int128Vector)v, (Int128Mask)m,
+        return (IntVector128)
+            super.bOpTemplate((IntVector128)v, (IntMask128)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Int128Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int128Vector tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
-        return (Int128Vector)
-            super.tOpTemplate((Int128Vector)v1, (Int128Vector)v2,
+    IntVector128 tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
+        return (IntVector128)
+            super.tOpTemplate((IntVector128)v1, (IntVector128)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int128Vector tOp(Vector<Integer> v1, Vector<Integer> v2,
+    IntVector128 tOp(Vector<Integer> v1, Vector<Integer> v2,
                      VectorMask<Integer> m, FTriOp f) {
-        return (Int128Vector)
-            super.tOpTemplate((Int128Vector)v1, (Int128Vector)v2,
-                              (Int128Mask)m, f);  // specialize
+        return (IntVector128)
+            super.tOpTemplate((IntVector128)v1, (IntVector128)v2,
+                              (IntMask128)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Int128Vector extends IntVector {
 
     @Override
     @ForceInline
-    public Int128Vector lanewise(Unary op) {
-        return (Int128Vector) super.lanewiseTemplate(op);  // specialize
+    public IntVector128 lanewise(Unary op) {
+        return (IntVector128) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector lanewise(Unary op, VectorMask<Integer> m) {
-        return (Int128Vector) super.lanewiseTemplate(op, Int128Mask.class, (Int128Mask) m);  // specialize
+    public IntVector128 lanewise(Unary op, VectorMask<Integer> m) {
+        return (IntVector128) super.lanewiseTemplate(op, IntMask128.class, (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector lanewise(Binary op, Vector<Integer> v) {
-        return (Int128Vector) super.lanewiseTemplate(op, v);  // specialize
+    public IntVector128 lanewise(Binary op, Vector<Integer> v) {
+        return (IntVector128) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int128Vector) super.lanewiseTemplate(op, Int128Mask.class, v, (Int128Mask) m);  // specialize
+    public IntVector128 lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector128) super.lanewiseTemplate(op, IntMask128.class, v, (IntMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int128Vector
+    @ForceInline IntVector128
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Int128Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (IntVector128) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int128Vector
+    @ForceInline IntVector128
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Integer> m) {
-        return (Int128Vector) super.lanewiseShiftTemplate(op, Int128Mask.class, e, (Int128Mask) m);  // specialize
+        return (IntVector128) super.lanewiseShiftTemplate(op, IntMask128.class, e, (IntMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Int128Vector
+    IntVector128
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2) {
-        return (Int128Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (IntVector128) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int128Vector
+    IntVector128
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2, VectorMask<Integer> m) {
-        return (Int128Vector) super.lanewiseTemplate(op, Int128Mask.class, v1, v2, (Int128Mask) m);  // specialize
+        return (IntVector128) super.lanewiseTemplate(op, IntMask128.class, v1, v2, (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int128Vector addIndex(int scale) {
-        return (Int128Vector) super.addIndexTemplate(scale);  // specialize
+    IntVector128 addIndex(int scale) {
+        return (IntVector128) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Int128Vector extends IntVector {
     @ForceInline
     public final int reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Integer> m) {
-        return super.reduceLanesTemplate(op, Int128Mask.class, (Int128Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, IntMask128.class, (IntMask128) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Int128Vector extends IntVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Integer> m) {
-        return (long) super.reduceLanesTemplate(op, Int128Mask.class, (Int128Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, IntMask128.class, (IntMask128) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Int128Vector extends IntVector {
 
     @Override
     @ForceInline
-    public final Int128Shuffle toShuffle() {
-        return (Int128Shuffle) toShuffle(vspecies(), false);
+    public final IntShuffle128 toShuffle() {
+        return (IntShuffle128) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Int128Mask test(Test op) {
-        return super.testTemplate(Int128Mask.class, op);  // specialize
+    public final IntMask128 test(Test op) {
+        return super.testTemplate(IntMask128.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int128Mask test(Test op, VectorMask<Integer> m) {
-        return super.testTemplate(Int128Mask.class, op, (Int128Mask) m);  // specialize
+    public final IntMask128 test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(IntMask128.class, op, (IntMask128) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Int128Mask compare(Comparison op, Vector<Integer> v) {
-        return super.compareTemplate(Int128Mask.class, op, v);  // specialize
+    public final IntMask128 compare(Comparison op, Vector<Integer> v) {
+        return super.compareTemplate(IntMask128.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int128Mask compare(Comparison op, int s) {
-        return super.compareTemplate(Int128Mask.class, op, s);  // specialize
+    public final IntMask128 compare(Comparison op, int s) {
+        return super.compareTemplate(IntMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int128Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Int128Mask.class, op, s);  // specialize
+    public final IntMask128 compare(Comparison op, long s) {
+        return super.compareTemplate(IntMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int128Mask compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
-        return super.compareTemplate(Int128Mask.class, op, v, (Int128Mask) m);
+    public final IntMask128 compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
+        return super.compareTemplate(IntMask128.class, op, v, (IntMask128) m);
     }
 
 
     @Override
     @ForceInline
-    public Int128Vector blend(Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int128Vector)
-            super.blendTemplate(Int128Mask.class,
-                                (Int128Vector) v,
-                                (Int128Mask) m);  // specialize
+    public IntVector128 blend(Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector128)
+            super.blendTemplate(IntMask128.class,
+                                (IntVector128) v,
+                                (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector slice(int origin, Vector<Integer> v) {
-        return (Int128Vector) super.sliceTemplate(origin, v);  // specialize
+    public IntVector128 slice(int origin, Vector<Integer> v) {
+        return (IntVector128) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector slice(int origin) {
-        return (Int128Vector) super.sliceTemplate(origin);  // specialize
+    public IntVector128 slice(int origin) {
+        return (IntVector128) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector unslice(int origin, Vector<Integer> w, int part) {
-        return (Int128Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public IntVector128 unslice(int origin, Vector<Integer> w, int part) {
+        return (IntVector128) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
-        return (Int128Vector)
-            super.unsliceTemplate(Int128Mask.class,
+    public IntVector128 unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
+        return (IntVector128)
+            super.unsliceTemplate(IntMask128.class,
                                   origin, w, part,
-                                  (Int128Mask) m);  // specialize
+                                  (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector unslice(int origin) {
-        return (Int128Vector) super.unsliceTemplate(origin);  // specialize
+    public IntVector128 unslice(int origin) {
+        return (IntVector128) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector rearrange(VectorShuffle<Integer> s) {
-        return (Int128Vector)
-            super.rearrangeTemplate(Int128Shuffle.class,
-                                    (Int128Shuffle) s);  // specialize
+    public IntVector128 rearrange(VectorShuffle<Integer> s) {
+        return (IntVector128)
+            super.rearrangeTemplate(IntShuffle128.class,
+                                    (IntShuffle128) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector rearrange(VectorShuffle<Integer> shuffle,
+    public IntVector128 rearrange(VectorShuffle<Integer> shuffle,
                                   VectorMask<Integer> m) {
-        return (Int128Vector)
-            super.rearrangeTemplate(Int128Shuffle.class,
-                                    Int128Mask.class,
-                                    (Int128Shuffle) shuffle,
-                                    (Int128Mask) m);  // specialize
+        return (IntVector128)
+            super.rearrangeTemplate(IntShuffle128.class,
+                                    IntMask128.class,
+                                    (IntShuffle128) shuffle,
+                                    (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector rearrange(VectorShuffle<Integer> s,
+    public IntVector128 rearrange(VectorShuffle<Integer> s,
                                   Vector<Integer> v) {
-        return (Int128Vector)
-            super.rearrangeTemplate(Int128Shuffle.class,
-                                    (Int128Shuffle) s,
-                                    (Int128Vector) v);  // specialize
+        return (IntVector128)
+            super.rearrangeTemplate(IntShuffle128.class,
+                                    (IntShuffle128) s,
+                                    (IntVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector compress(VectorMask<Integer> m) {
-        return (Int128Vector)
-            super.compressTemplate(Int128Mask.class,
-                                   (Int128Mask) m);  // specialize
+    public IntVector128 compress(VectorMask<Integer> m) {
+        return (IntVector128)
+            super.compressTemplate(IntMask128.class,
+                                   (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector expand(VectorMask<Integer> m) {
-        return (Int128Vector)
-            super.expandTemplate(Int128Mask.class,
-                                   (Int128Mask) m);  // specialize
+    public IntVector128 expand(VectorMask<Integer> m) {
+        return (IntVector128)
+            super.expandTemplate(IntMask128.class,
+                                   (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector selectFrom(Vector<Integer> v) {
-        return (Int128Vector)
-            super.selectFromTemplate((Int128Vector) v);  // specialize
+    public IntVector128 selectFrom(Vector<Integer> v) {
+        return (IntVector128)
+            super.selectFromTemplate((IntVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector selectFrom(Vector<Integer> v,
+    public IntVector128 selectFrom(Vector<Integer> v,
                                    VectorMask<Integer> m) {
-        return (Int128Vector)
-            super.selectFromTemplate((Int128Vector) v,
-                                     Int128Mask.class, (Int128Mask) m);  // specialize
+        return (IntVector128)
+            super.selectFromTemplate((IntVector128) v,
+                                     IntMask128.class, (IntMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int128Vector selectFrom(Vector<Integer> v1,
+    public IntVector128 selectFrom(Vector<Integer> v1,
                                    Vector<Integer> v2) {
-        return (Int128Vector)
-            super.selectFromTemplate((Int128Vector) v1, (Int128Vector) v2);  // specialize
+        return (IntVector128)
+            super.selectFromTemplate((IntVector128) v1, (IntVector128) v2);  // specialize
     }
 
     @ForceInline
@@ -529,7 +541,7 @@ final class Int128Vector extends IntVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     int[] vecarr = vec.vec();
@@ -539,7 +551,7 @@ final class Int128Vector extends IntVector {
 
     @ForceInline
     @Override
-    public Int128Vector withLane(int i, int e) {
+    public IntVector128 withLane(int i, int e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -550,9 +562,9 @@ final class Int128Vector extends IntVector {
     }
 
     @ForceInline
-    public Int128Vector withLaneHelper(int i, int e) {
+    public IntVector128 withLaneHelper(int i, int e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     int[] res = v.vec().clone();
@@ -563,19 +575,20 @@ final class Int128Vector extends IntVector {
 
     // Mask
 
-    static final class Int128Mask extends AbstractMask<Integer> {
+    static final class IntMask128 extends AbstractMask<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int128Mask(boolean[] bits) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntMask128(boolean[] bits) {
             this(bits, 0);
         }
 
-        Int128Mask(boolean[] bits, int offset) {
+        IntMask128(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Int128Mask(boolean val) {
+        IntMask128(boolean val) {
             super(prepare(val));
         }
 
@@ -608,31 +621,31 @@ final class Int128Vector extends IntVector {
         }
 
         @Override
-        Int128Mask uOp(MUnOp f) {
+        IntMask128 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Int128Mask(res);
+            return new IntMask128(res);
         }
 
         @Override
-        Int128Mask bOp(VectorMask<Integer> m, MBinOp f) {
+        IntMask128 bOp(VectorMask<Integer> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Int128Mask)m).getBits();
+            boolean[] mbits = ((IntMask128)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Int128Mask(res);
+            return new IntMask128(res);
         }
 
         @ForceInline
         @Override
         public final
-        Int128Vector toVector() {
-            return (Int128Vector) super.toVectorTemplate();  // specialize
+        IntVector128 toVector() {
+            return (IntVector128) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -656,8 +669,8 @@ final class Int128Vector extends IntVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -665,25 +678,25 @@ final class Int128Vector extends IntVector {
         @Override
         @ForceInline
         /*package-private*/
-        Int128Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Int128Mask) VectorSupport.indexPartiallyInUpperRange(
-                Int128Mask.class, int.class, VLENGTH, offset, limit,
-                (o, l) -> (Int128Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        IntMask128 indexPartiallyInUpperRange(long offset, long limit) {
+            return (IntMask128) VectorSupport.indexPartiallyInUpperRange(
+                IntMask128.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (IntMask128) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Int128Mask not() {
+        public IntMask128 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Int128Mask compress() {
-            return (Int128Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Int128Vector.class, Int128Mask.class, ETYPE, VLENGTH, null, this,
+        public IntMask128 compress() {
+            return (IntMask128)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                IntVector128.class, IntMask128.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -692,30 +705,30 @@ final class Int128Vector extends IntVector {
 
         @Override
         @ForceInline
-        public Int128Mask and(VectorMask<Integer> mask) {
+        public IntMask128 and(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int128Mask m = (Int128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Int128Mask.class, null, int.class, VLENGTH,
+            IntMask128 m = (IntMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, IntMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Int128Mask or(VectorMask<Integer> mask) {
+        public IntMask128 or(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int128Mask m = (Int128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Int128Mask.class, null, int.class, VLENGTH,
+            IntMask128 m = (IntMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, IntMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Int128Mask xor(VectorMask<Integer> mask) {
+        public IntMask128 xor(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int128Mask m = (Int128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Int128Mask.class, null, int.class, VLENGTH,
+            IntMask128 m = (IntMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, IntMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -725,21 +738,21 @@ final class Int128Vector extends IntVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Int128Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Int128Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Int128Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -749,7 +762,7 @@ final class Int128Vector extends IntVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Int128Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -759,7 +772,7 @@ final class Int128Vector extends IntVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Int128Mask.class, int.class, VLENGTH,
+            return VectorSupport.extract(IntMask128.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -768,48 +781,49 @@ final class Int128Vector extends IntVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Int128Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Int128Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((IntMask128)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Int128Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Int128Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((IntMask128)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Int128Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Int128Mask.class, int.class, VLENGTH,
+        static IntMask128 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(IntMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Int128Mask  TRUE_MASK = new Int128Mask(true);
-        private static final Int128Mask FALSE_MASK = new Int128Mask(false);
+        private static final IntMask128  TRUE_MASK = new IntMask128(true);
+        private static final IntMask128 FALSE_MASK = new IntMask128(false);
 
     }
 
     // Shuffle
 
-    static final class Int128Shuffle extends AbstractShuffle<Integer> {
+    static final class IntShuffle128 extends AbstractShuffle<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int128Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntShuffle128(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Int128Shuffle(int[] indices, int i) {
+        IntShuffle128(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Int128Shuffle(IntUnaryOperator fn) {
+        IntShuffle128(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -829,23 +843,23 @@ final class Int128Vector extends IntVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Int128Shuffle IOTA = new Int128Shuffle(IDENTITY);
+        static final IntShuffle128 IOTA = new IntShuffle128(IDENTITY);
 
         @Override
         @ForceInline
-        public Int128Vector toVector() {
+        public IntVector128 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Int128Vector toBitsVector() {
-            return (Int128Vector) super.toBitsVectorTemplate();
+        IntVector128 toBitsVector() {
+            return (IntVector128) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int128Vector toBitsVector0() {
-            return ((Int128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector128 toBitsVector0() {
+            return ((IntVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -868,30 +882,30 @@ final class Int128Vector extends IntVector {
 
         @Override
         @ForceInline
-        public final Int128Mask laneIsValid() {
-            return (Int128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final IntMask128 laneIsValid() {
+            return (IntMask128) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Int128Shuffle rearrange(VectorShuffle<Integer> shuffle) {
-            Int128Shuffle concreteShuffle = (Int128Shuffle) shuffle;
-            return (Int128Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final IntShuffle128 rearrange(VectorShuffle<Integer> shuffle) {
+            IntShuffle128 concreteShuffle = (IntShuffle128) shuffle;
+            return (IntShuffle128) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Int128Shuffle wrapIndexes() {
-            Int128Vector v = toBitsVector();
+        public final IntShuffle128 wrapIndexes() {
+            IntVector128 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector128) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector128) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Int128Shuffle) v.toShuffle(vspecies(), false);
+            return (IntShuffle128) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -942,14 +956,14 @@ final class Int128Vector extends IntVector {
     @Override
     final
     IntVector fromArray0(int[] a, int offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromArray0Template(Int128Mask.class, a, offset, (Int128Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(IntMask128.class, a, offset, (IntMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     IntVector fromArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        return super.fromArray0Template(Int128Mask.class, a, offset, indexMap, mapOffset, (Int128Mask) m);
+        return super.fromArray0Template(IntMask128.class, a, offset, indexMap, mapOffset, (IntMask128) m);
     }
 
 
@@ -965,7 +979,7 @@ final class Int128Vector extends IntVector {
     @Override
     final
     IntVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Int128Mask.class, ms, offset, (Int128Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(IntMask128.class, ms, offset, (IntMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -979,14 +993,14 @@ final class Int128Vector extends IntVector {
     @Override
     final
     void intoArray0(int[] a, int offset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int128Mask.class, a, offset, (Int128Mask) m);
+        super.intoArray0Template(IntMask128.class, a, offset, (IntMask128) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int128Mask.class, a, offset, indexMap, mapOffset, (Int128Mask) m);
+        super.intoArray0Template(IntMask128.class, a, offset, indexMap, mapOffset, (IntMask128) m);
     }
 
 
@@ -994,7 +1008,7 @@ final class Int128Vector extends IntVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m) {
-        super.intoMemorySegment0Template(Int128Mask.class, ms, offset, (Int128Mask) m);
+        super.intoMemorySegment0Template(IntMask128.class, ms, offset, (IntMask128) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector256.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector256.java
index bb86ede05e1..0630cd958f2 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Int256Vector extends IntVector {
+final class IntVector256 extends IntVector {
     static final IntSpecies VSPECIES =
         (IntSpecies) IntVector.SPECIES_256;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Int256Vector> VCLASS = Int256Vector.class;
+    static final Class<IntVector256> VCLASS = IntVector256.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Integer> CTYPE = int.class; // carrier type used by the JVM
+
     static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-    Int256Vector(int[] v) {
+    IntVector256(int[] v) {
         super(v);
     }
 
-    // For compatibility as Int256Vector::new,
+    // For compatibility as IntVector256::new,
     // stored into species.vectorFactory.
-    Int256Vector(Object v) {
+    IntVector256(Object v) {
         this((int[]) v);
     }
 
-    static final Int256Vector ZERO = new Int256Vector(new int[VLENGTH]);
-    static final Int256Vector IOTA = new Int256Vector(VSPECIES.iotaArray());
+    static final IntVector256 ZERO = new IntVector256(new int[VLENGTH]);
+    static final IntVector256 IOTA = new IntVector256(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Int256Vector extends IntVector {
     @Override
     public final Class<Integer> elementType() { return int.class; }
 
+    @ForceInline
+    final Class<Integer> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Integer.SIZE; }
@@ -119,55 +124,62 @@ final class Int256Vector extends IntVector {
         return (int[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Int256Vector broadcast(int e) {
-        return (Int256Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector256 broadcast(int e) {
+        return (IntVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int256Vector broadcast(long e) {
-        return (Int256Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector256 broadcast(long e) {
+        return (IntVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Int256Mask maskFromArray(boolean[] bits) {
-        return new Int256Mask(bits);
+    IntMask256 maskFromArray(boolean[] bits) {
+        return new IntMask256(bits);
     }
 
     @Override
     @ForceInline
-    Int256Shuffle iotaShuffle() { return Int256Shuffle.IOTA; }
+    IntShuffle256 iotaShuffle() { return IntShuffle256.IOTA; }
 
     @Override
     @ForceInline
-    Int256Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Int256Shuffle) iotaShuffleTemplate(start, step, wrap);
+    IntShuffle256 iotaShuffle(int start, int step, boolean wrap) {
+        return (IntShuffle256) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Int256Shuffle shuffleFromArray(int[] indices, int i) { return new Int256Shuffle(indices, i); }
+    IntShuffle256 shuffleFromArray(int[] indices, int i) { return new IntShuffle256(indices, i); }
 
     @Override
     @ForceInline
-    Int256Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Int256Shuffle(fn); }
+    IntShuffle256 shuffleFromOp(IntUnaryOperator fn) { return new IntShuffle256(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Int256Vector vectorFactory(int[] vec) {
-        return new Int256Vector(vec);
+    IntVector256 vectorFactory(int[] vec) {
+        return new IntVector256(vec);
     }
 
     @ForceInline
     final @Override
-    Byte256Vector asByteVectorRaw() {
-        return (Byte256Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector256 asByteVectorRaw() {
+        return (ByteVector256) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Int256Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int256Vector uOp(FUnOp f) {
-        return (Int256Vector) super.uOpTemplate(f);  // specialize
+    IntVector256 uOp(FUnOp f) {
+        return (IntVector256) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int256Vector uOp(VectorMask<Integer> m, FUnOp f) {
-        return (Int256Vector)
-            super.uOpTemplate((Int256Mask)m, f);  // specialize
+    IntVector256 uOp(VectorMask<Integer> m, FUnOp f) {
+        return (IntVector256)
+            super.uOpTemplate((IntMask256)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Int256Vector bOp(Vector<Integer> v, FBinOp f) {
-        return (Int256Vector) super.bOpTemplate((Int256Vector)v, f);  // specialize
+    IntVector256 bOp(Vector<Integer> v, FBinOp f) {
+        return (IntVector256) super.bOpTemplate((IntVector256)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int256Vector bOp(Vector<Integer> v,
+    IntVector256 bOp(Vector<Integer> v,
                      VectorMask<Integer> m, FBinOp f) {
-        return (Int256Vector)
-            super.bOpTemplate((Int256Vector)v, (Int256Mask)m,
+        return (IntVector256)
+            super.bOpTemplate((IntVector256)v, (IntMask256)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Int256Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int256Vector tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
-        return (Int256Vector)
-            super.tOpTemplate((Int256Vector)v1, (Int256Vector)v2,
+    IntVector256 tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
+        return (IntVector256)
+            super.tOpTemplate((IntVector256)v1, (IntVector256)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int256Vector tOp(Vector<Integer> v1, Vector<Integer> v2,
+    IntVector256 tOp(Vector<Integer> v1, Vector<Integer> v2,
                      VectorMask<Integer> m, FTriOp f) {
-        return (Int256Vector)
-            super.tOpTemplate((Int256Vector)v1, (Int256Vector)v2,
-                              (Int256Mask)m, f);  // specialize
+        return (IntVector256)
+            super.tOpTemplate((IntVector256)v1, (IntVector256)v2,
+                              (IntMask256)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Int256Vector extends IntVector {
 
     @Override
     @ForceInline
-    public Int256Vector lanewise(Unary op) {
-        return (Int256Vector) super.lanewiseTemplate(op);  // specialize
+    public IntVector256 lanewise(Unary op) {
+        return (IntVector256) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector lanewise(Unary op, VectorMask<Integer> m) {
-        return (Int256Vector) super.lanewiseTemplate(op, Int256Mask.class, (Int256Mask) m);  // specialize
+    public IntVector256 lanewise(Unary op, VectorMask<Integer> m) {
+        return (IntVector256) super.lanewiseTemplate(op, IntMask256.class, (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector lanewise(Binary op, Vector<Integer> v) {
-        return (Int256Vector) super.lanewiseTemplate(op, v);  // specialize
+    public IntVector256 lanewise(Binary op, Vector<Integer> v) {
+        return (IntVector256) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int256Vector) super.lanewiseTemplate(op, Int256Mask.class, v, (Int256Mask) m);  // specialize
+    public IntVector256 lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector256) super.lanewiseTemplate(op, IntMask256.class, v, (IntMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int256Vector
+    @ForceInline IntVector256
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Int256Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (IntVector256) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int256Vector
+    @ForceInline IntVector256
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Integer> m) {
-        return (Int256Vector) super.lanewiseShiftTemplate(op, Int256Mask.class, e, (Int256Mask) m);  // specialize
+        return (IntVector256) super.lanewiseShiftTemplate(op, IntMask256.class, e, (IntMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Int256Vector
+    IntVector256
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2) {
-        return (Int256Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (IntVector256) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int256Vector
+    IntVector256
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2, VectorMask<Integer> m) {
-        return (Int256Vector) super.lanewiseTemplate(op, Int256Mask.class, v1, v2, (Int256Mask) m);  // specialize
+        return (IntVector256) super.lanewiseTemplate(op, IntMask256.class, v1, v2, (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int256Vector addIndex(int scale) {
-        return (Int256Vector) super.addIndexTemplate(scale);  // specialize
+    IntVector256 addIndex(int scale) {
+        return (IntVector256) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Int256Vector extends IntVector {
     @ForceInline
     public final int reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Integer> m) {
-        return super.reduceLanesTemplate(op, Int256Mask.class, (Int256Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, IntMask256.class, (IntMask256) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Int256Vector extends IntVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Integer> m) {
-        return (long) super.reduceLanesTemplate(op, Int256Mask.class, (Int256Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, IntMask256.class, (IntMask256) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Int256Vector extends IntVector {
 
     @Override
     @ForceInline
-    public final Int256Shuffle toShuffle() {
-        return (Int256Shuffle) toShuffle(vspecies(), false);
+    public final IntShuffle256 toShuffle() {
+        return (IntShuffle256) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Int256Mask test(Test op) {
-        return super.testTemplate(Int256Mask.class, op);  // specialize
+    public final IntMask256 test(Test op) {
+        return super.testTemplate(IntMask256.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int256Mask test(Test op, VectorMask<Integer> m) {
-        return super.testTemplate(Int256Mask.class, op, (Int256Mask) m);  // specialize
+    public final IntMask256 test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(IntMask256.class, op, (IntMask256) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Int256Mask compare(Comparison op, Vector<Integer> v) {
-        return super.compareTemplate(Int256Mask.class, op, v);  // specialize
+    public final IntMask256 compare(Comparison op, Vector<Integer> v) {
+        return super.compareTemplate(IntMask256.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int256Mask compare(Comparison op, int s) {
-        return super.compareTemplate(Int256Mask.class, op, s);  // specialize
+    public final IntMask256 compare(Comparison op, int s) {
+        return super.compareTemplate(IntMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int256Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Int256Mask.class, op, s);  // specialize
+    public final IntMask256 compare(Comparison op, long s) {
+        return super.compareTemplate(IntMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int256Mask compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
-        return super.compareTemplate(Int256Mask.class, op, v, (Int256Mask) m);
+    public final IntMask256 compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
+        return super.compareTemplate(IntMask256.class, op, v, (IntMask256) m);
     }
 
 
     @Override
     @ForceInline
-    public Int256Vector blend(Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int256Vector)
-            super.blendTemplate(Int256Mask.class,
-                                (Int256Vector) v,
-                                (Int256Mask) m);  // specialize
+    public IntVector256 blend(Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector256)
+            super.blendTemplate(IntMask256.class,
+                                (IntVector256) v,
+                                (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector slice(int origin, Vector<Integer> v) {
-        return (Int256Vector) super.sliceTemplate(origin, v);  // specialize
+    public IntVector256 slice(int origin, Vector<Integer> v) {
+        return (IntVector256) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector slice(int origin) {
-        return (Int256Vector) super.sliceTemplate(origin);  // specialize
+    public IntVector256 slice(int origin) {
+        return (IntVector256) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector unslice(int origin, Vector<Integer> w, int part) {
-        return (Int256Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public IntVector256 unslice(int origin, Vector<Integer> w, int part) {
+        return (IntVector256) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
-        return (Int256Vector)
-            super.unsliceTemplate(Int256Mask.class,
+    public IntVector256 unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
+        return (IntVector256)
+            super.unsliceTemplate(IntMask256.class,
                                   origin, w, part,
-                                  (Int256Mask) m);  // specialize
+                                  (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector unslice(int origin) {
-        return (Int256Vector) super.unsliceTemplate(origin);  // specialize
+    public IntVector256 unslice(int origin) {
+        return (IntVector256) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector rearrange(VectorShuffle<Integer> s) {
-        return (Int256Vector)
-            super.rearrangeTemplate(Int256Shuffle.class,
-                                    (Int256Shuffle) s);  // specialize
+    public IntVector256 rearrange(VectorShuffle<Integer> s) {
+        return (IntVector256)
+            super.rearrangeTemplate(IntShuffle256.class,
+                                    (IntShuffle256) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector rearrange(VectorShuffle<Integer> shuffle,
+    public IntVector256 rearrange(VectorShuffle<Integer> shuffle,
                                   VectorMask<Integer> m) {
-        return (Int256Vector)
-            super.rearrangeTemplate(Int256Shuffle.class,
-                                    Int256Mask.class,
-                                    (Int256Shuffle) shuffle,
-                                    (Int256Mask) m);  // specialize
+        return (IntVector256)
+            super.rearrangeTemplate(IntShuffle256.class,
+                                    IntMask256.class,
+                                    (IntShuffle256) shuffle,
+                                    (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector rearrange(VectorShuffle<Integer> s,
+    public IntVector256 rearrange(VectorShuffle<Integer> s,
                                   Vector<Integer> v) {
-        return (Int256Vector)
-            super.rearrangeTemplate(Int256Shuffle.class,
-                                    (Int256Shuffle) s,
-                                    (Int256Vector) v);  // specialize
+        return (IntVector256)
+            super.rearrangeTemplate(IntShuffle256.class,
+                                    (IntShuffle256) s,
+                                    (IntVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector compress(VectorMask<Integer> m) {
-        return (Int256Vector)
-            super.compressTemplate(Int256Mask.class,
-                                   (Int256Mask) m);  // specialize
+    public IntVector256 compress(VectorMask<Integer> m) {
+        return (IntVector256)
+            super.compressTemplate(IntMask256.class,
+                                   (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector expand(VectorMask<Integer> m) {
-        return (Int256Vector)
-            super.expandTemplate(Int256Mask.class,
-                                   (Int256Mask) m);  // specialize
+    public IntVector256 expand(VectorMask<Integer> m) {
+        return (IntVector256)
+            super.expandTemplate(IntMask256.class,
+                                   (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector selectFrom(Vector<Integer> v) {
-        return (Int256Vector)
-            super.selectFromTemplate((Int256Vector) v);  // specialize
+    public IntVector256 selectFrom(Vector<Integer> v) {
+        return (IntVector256)
+            super.selectFromTemplate((IntVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector selectFrom(Vector<Integer> v,
+    public IntVector256 selectFrom(Vector<Integer> v,
                                    VectorMask<Integer> m) {
-        return (Int256Vector)
-            super.selectFromTemplate((Int256Vector) v,
-                                     Int256Mask.class, (Int256Mask) m);  // specialize
+        return (IntVector256)
+            super.selectFromTemplate((IntVector256) v,
+                                     IntMask256.class, (IntMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int256Vector selectFrom(Vector<Integer> v1,
+    public IntVector256 selectFrom(Vector<Integer> v1,
                                    Vector<Integer> v2) {
-        return (Int256Vector)
-            super.selectFromTemplate((Int256Vector) v1, (Int256Vector) v2);  // specialize
+        return (IntVector256)
+            super.selectFromTemplate((IntVector256) v1, (IntVector256) v2);  // specialize
     }
 
     @ForceInline
@@ -533,7 +545,7 @@ final class Int256Vector extends IntVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     int[] vecarr = vec.vec();
@@ -543,7 +555,7 @@ final class Int256Vector extends IntVector {
 
     @ForceInline
     @Override
-    public Int256Vector withLane(int i, int e) {
+    public IntVector256 withLane(int i, int e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -558,9 +570,9 @@ final class Int256Vector extends IntVector {
     }
 
     @ForceInline
-    public Int256Vector withLaneHelper(int i, int e) {
+    public IntVector256 withLaneHelper(int i, int e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     int[] res = v.vec().clone();
@@ -571,19 +583,20 @@ final class Int256Vector extends IntVector {
 
     // Mask
 
-    static final class Int256Mask extends AbstractMask<Integer> {
+    static final class IntMask256 extends AbstractMask<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int256Mask(boolean[] bits) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntMask256(boolean[] bits) {
             this(bits, 0);
         }
 
-        Int256Mask(boolean[] bits, int offset) {
+        IntMask256(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Int256Mask(boolean val) {
+        IntMask256(boolean val) {
             super(prepare(val));
         }
 
@@ -616,31 +629,31 @@ final class Int256Vector extends IntVector {
         }
 
         @Override
-        Int256Mask uOp(MUnOp f) {
+        IntMask256 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Int256Mask(res);
+            return new IntMask256(res);
         }
 
         @Override
-        Int256Mask bOp(VectorMask<Integer> m, MBinOp f) {
+        IntMask256 bOp(VectorMask<Integer> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Int256Mask)m).getBits();
+            boolean[] mbits = ((IntMask256)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Int256Mask(res);
+            return new IntMask256(res);
         }
 
         @ForceInline
         @Override
         public final
-        Int256Vector toVector() {
-            return (Int256Vector) super.toVectorTemplate();  // specialize
+        IntVector256 toVector() {
+            return (IntVector256) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -664,8 +677,8 @@ final class Int256Vector extends IntVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -673,25 +686,25 @@ final class Int256Vector extends IntVector {
         @Override
         @ForceInline
         /*package-private*/
-        Int256Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Int256Mask) VectorSupport.indexPartiallyInUpperRange(
-                Int256Mask.class, int.class, VLENGTH, offset, limit,
-                (o, l) -> (Int256Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        IntMask256 indexPartiallyInUpperRange(long offset, long limit) {
+            return (IntMask256) VectorSupport.indexPartiallyInUpperRange(
+                IntMask256.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (IntMask256) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Int256Mask not() {
+        public IntMask256 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Int256Mask compress() {
-            return (Int256Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Int256Vector.class, Int256Mask.class, ETYPE, VLENGTH, null, this,
+        public IntMask256 compress() {
+            return (IntMask256)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                IntVector256.class, IntMask256.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -700,30 +713,30 @@ final class Int256Vector extends IntVector {
 
         @Override
         @ForceInline
-        public Int256Mask and(VectorMask<Integer> mask) {
+        public IntMask256 and(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int256Mask m = (Int256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Int256Mask.class, null, int.class, VLENGTH,
+            IntMask256 m = (IntMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, IntMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Int256Mask or(VectorMask<Integer> mask) {
+        public IntMask256 or(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int256Mask m = (Int256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Int256Mask.class, null, int.class, VLENGTH,
+            IntMask256 m = (IntMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, IntMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Int256Mask xor(VectorMask<Integer> mask) {
+        public IntMask256 xor(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int256Mask m = (Int256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Int256Mask.class, null, int.class, VLENGTH,
+            IntMask256 m = (IntMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, IntMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -733,21 +746,21 @@ final class Int256Vector extends IntVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Int256Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Int256Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Int256Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -757,7 +770,7 @@ final class Int256Vector extends IntVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Int256Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -767,7 +780,7 @@ final class Int256Vector extends IntVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Int256Mask.class, int.class, VLENGTH,
+            return VectorSupport.extract(IntMask256.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -776,48 +789,49 @@ final class Int256Vector extends IntVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Int256Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Int256Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((IntMask256)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Int256Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Int256Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((IntMask256)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Int256Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Int256Mask.class, int.class, VLENGTH,
+        static IntMask256 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(IntMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Int256Mask  TRUE_MASK = new Int256Mask(true);
-        private static final Int256Mask FALSE_MASK = new Int256Mask(false);
+        private static final IntMask256  TRUE_MASK = new IntMask256(true);
+        private static final IntMask256 FALSE_MASK = new IntMask256(false);
 
     }
 
     // Shuffle
 
-    static final class Int256Shuffle extends AbstractShuffle<Integer> {
+    static final class IntShuffle256 extends AbstractShuffle<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int256Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntShuffle256(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Int256Shuffle(int[] indices, int i) {
+        IntShuffle256(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Int256Shuffle(IntUnaryOperator fn) {
+        IntShuffle256(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -837,23 +851,23 @@ final class Int256Vector extends IntVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Int256Shuffle IOTA = new Int256Shuffle(IDENTITY);
+        static final IntShuffle256 IOTA = new IntShuffle256(IDENTITY);
 
         @Override
         @ForceInline
-        public Int256Vector toVector() {
+        public IntVector256 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Int256Vector toBitsVector() {
-            return (Int256Vector) super.toBitsVectorTemplate();
+        IntVector256 toBitsVector() {
+            return (IntVector256) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int256Vector toBitsVector0() {
-            return ((Int256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector256 toBitsVector0() {
+            return ((IntVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -876,30 +890,30 @@ final class Int256Vector extends IntVector {
 
         @Override
         @ForceInline
-        public final Int256Mask laneIsValid() {
-            return (Int256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final IntMask256 laneIsValid() {
+            return (IntMask256) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Int256Shuffle rearrange(VectorShuffle<Integer> shuffle) {
-            Int256Shuffle concreteShuffle = (Int256Shuffle) shuffle;
-            return (Int256Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final IntShuffle256 rearrange(VectorShuffle<Integer> shuffle) {
+            IntShuffle256 concreteShuffle = (IntShuffle256) shuffle;
+            return (IntShuffle256) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Int256Shuffle wrapIndexes() {
-            Int256Vector v = toBitsVector();
+        public final IntShuffle256 wrapIndexes() {
+            IntVector256 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector256) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector256) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Int256Shuffle) v.toShuffle(vspecies(), false);
+            return (IntShuffle256) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -950,14 +964,14 @@ final class Int256Vector extends IntVector {
     @Override
     final
     IntVector fromArray0(int[] a, int offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromArray0Template(Int256Mask.class, a, offset, (Int256Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(IntMask256.class, a, offset, (IntMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     IntVector fromArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        return super.fromArray0Template(Int256Mask.class, a, offset, indexMap, mapOffset, (Int256Mask) m);
+        return super.fromArray0Template(IntMask256.class, a, offset, indexMap, mapOffset, (IntMask256) m);
     }
 
 
@@ -973,7 +987,7 @@ final class Int256Vector extends IntVector {
     @Override
     final
     IntVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Int256Mask.class, ms, offset, (Int256Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(IntMask256.class, ms, offset, (IntMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -987,14 +1001,14 @@ final class Int256Vector extends IntVector {
     @Override
     final
     void intoArray0(int[] a, int offset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int256Mask.class, a, offset, (Int256Mask) m);
+        super.intoArray0Template(IntMask256.class, a, offset, (IntMask256) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int256Mask.class, a, offset, indexMap, mapOffset, (Int256Mask) m);
+        super.intoArray0Template(IntMask256.class, a, offset, indexMap, mapOffset, (IntMask256) m);
     }
 
 
@@ -1002,7 +1016,7 @@ final class Int256Vector extends IntVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m) {
-        super.intoMemorySegment0Template(Int256Mask.class, ms, offset, (Int256Mask) m);
+        super.intoMemorySegment0Template(IntMask256.class, ms, offset, (IntMask256) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector512.java
similarity index 64%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector512.java
index 16d3b673da0..92eb5a0f2d2 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Int512Vector extends IntVector {
+final class IntVector512 extends IntVector {
     static final IntSpecies VSPECIES =
         (IntSpecies) IntVector.SPECIES_512;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Int512Vector> VCLASS = Int512Vector.class;
+    static final Class<IntVector512> VCLASS = IntVector512.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Integer> CTYPE = int.class; // carrier type used by the JVM
+
     static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-    Int512Vector(int[] v) {
+    IntVector512(int[] v) {
         super(v);
     }
 
-    // For compatibility as Int512Vector::new,
+    // For compatibility as IntVector512::new,
     // stored into species.vectorFactory.
-    Int512Vector(Object v) {
+    IntVector512(Object v) {
         this((int[]) v);
     }
 
-    static final Int512Vector ZERO = new Int512Vector(new int[VLENGTH]);
-    static final Int512Vector IOTA = new Int512Vector(VSPECIES.iotaArray());
+    static final IntVector512 ZERO = new IntVector512(new int[VLENGTH]);
+    static final IntVector512 IOTA = new IntVector512(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Int512Vector extends IntVector {
     @Override
     public final Class<Integer> elementType() { return int.class; }
 
+    @ForceInline
+    final Class<Integer> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Integer.SIZE; }
@@ -119,55 +124,62 @@ final class Int512Vector extends IntVector {
         return (int[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Int512Vector broadcast(int e) {
-        return (Int512Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector512 broadcast(int e) {
+        return (IntVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int512Vector broadcast(long e) {
-        return (Int512Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector512 broadcast(long e) {
+        return (IntVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Int512Mask maskFromArray(boolean[] bits) {
-        return new Int512Mask(bits);
+    IntMask512 maskFromArray(boolean[] bits) {
+        return new IntMask512(bits);
     }
 
     @Override
     @ForceInline
-    Int512Shuffle iotaShuffle() { return Int512Shuffle.IOTA; }
+    IntShuffle512 iotaShuffle() { return IntShuffle512.IOTA; }
 
     @Override
     @ForceInline
-    Int512Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Int512Shuffle) iotaShuffleTemplate(start, step, wrap);
+    IntShuffle512 iotaShuffle(int start, int step, boolean wrap) {
+        return (IntShuffle512) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Int512Shuffle shuffleFromArray(int[] indices, int i) { return new Int512Shuffle(indices, i); }
+    IntShuffle512 shuffleFromArray(int[] indices, int i) { return new IntShuffle512(indices, i); }
 
     @Override
     @ForceInline
-    Int512Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Int512Shuffle(fn); }
+    IntShuffle512 shuffleFromOp(IntUnaryOperator fn) { return new IntShuffle512(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Int512Vector vectorFactory(int[] vec) {
-        return new Int512Vector(vec);
+    IntVector512 vectorFactory(int[] vec) {
+        return new IntVector512(vec);
     }
 
     @ForceInline
     final @Override
-    Byte512Vector asByteVectorRaw() {
-        return (Byte512Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector512 asByteVectorRaw() {
+        return (ByteVector512) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Int512Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int512Vector uOp(FUnOp f) {
-        return (Int512Vector) super.uOpTemplate(f);  // specialize
+    IntVector512 uOp(FUnOp f) {
+        return (IntVector512) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int512Vector uOp(VectorMask<Integer> m, FUnOp f) {
-        return (Int512Vector)
-            super.uOpTemplate((Int512Mask)m, f);  // specialize
+    IntVector512 uOp(VectorMask<Integer> m, FUnOp f) {
+        return (IntVector512)
+            super.uOpTemplate((IntMask512)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Int512Vector bOp(Vector<Integer> v, FBinOp f) {
-        return (Int512Vector) super.bOpTemplate((Int512Vector)v, f);  // specialize
+    IntVector512 bOp(Vector<Integer> v, FBinOp f) {
+        return (IntVector512) super.bOpTemplate((IntVector512)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int512Vector bOp(Vector<Integer> v,
+    IntVector512 bOp(Vector<Integer> v,
                      VectorMask<Integer> m, FBinOp f) {
-        return (Int512Vector)
-            super.bOpTemplate((Int512Vector)v, (Int512Mask)m,
+        return (IntVector512)
+            super.bOpTemplate((IntVector512)v, (IntMask512)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Int512Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int512Vector tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
-        return (Int512Vector)
-            super.tOpTemplate((Int512Vector)v1, (Int512Vector)v2,
+    IntVector512 tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
+        return (IntVector512)
+            super.tOpTemplate((IntVector512)v1, (IntVector512)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int512Vector tOp(Vector<Integer> v1, Vector<Integer> v2,
+    IntVector512 tOp(Vector<Integer> v1, Vector<Integer> v2,
                      VectorMask<Integer> m, FTriOp f) {
-        return (Int512Vector)
-            super.tOpTemplate((Int512Vector)v1, (Int512Vector)v2,
-                              (Int512Mask)m, f);  // specialize
+        return (IntVector512)
+            super.tOpTemplate((IntVector512)v1, (IntVector512)v2,
+                              (IntMask512)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Int512Vector extends IntVector {
 
     @Override
     @ForceInline
-    public Int512Vector lanewise(Unary op) {
-        return (Int512Vector) super.lanewiseTemplate(op);  // specialize
+    public IntVector512 lanewise(Unary op) {
+        return (IntVector512) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector lanewise(Unary op, VectorMask<Integer> m) {
-        return (Int512Vector) super.lanewiseTemplate(op, Int512Mask.class, (Int512Mask) m);  // specialize
+    public IntVector512 lanewise(Unary op, VectorMask<Integer> m) {
+        return (IntVector512) super.lanewiseTemplate(op, IntMask512.class, (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector lanewise(Binary op, Vector<Integer> v) {
-        return (Int512Vector) super.lanewiseTemplate(op, v);  // specialize
+    public IntVector512 lanewise(Binary op, Vector<Integer> v) {
+        return (IntVector512) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int512Vector) super.lanewiseTemplate(op, Int512Mask.class, v, (Int512Mask) m);  // specialize
+    public IntVector512 lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector512) super.lanewiseTemplate(op, IntMask512.class, v, (IntMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int512Vector
+    @ForceInline IntVector512
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Int512Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (IntVector512) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int512Vector
+    @ForceInline IntVector512
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Integer> m) {
-        return (Int512Vector) super.lanewiseShiftTemplate(op, Int512Mask.class, e, (Int512Mask) m);  // specialize
+        return (IntVector512) super.lanewiseShiftTemplate(op, IntMask512.class, e, (IntMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Int512Vector
+    IntVector512
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2) {
-        return (Int512Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (IntVector512) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int512Vector
+    IntVector512
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2, VectorMask<Integer> m) {
-        return (Int512Vector) super.lanewiseTemplate(op, Int512Mask.class, v1, v2, (Int512Mask) m);  // specialize
+        return (IntVector512) super.lanewiseTemplate(op, IntMask512.class, v1, v2, (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int512Vector addIndex(int scale) {
-        return (Int512Vector) super.addIndexTemplate(scale);  // specialize
+    IntVector512 addIndex(int scale) {
+        return (IntVector512) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Int512Vector extends IntVector {
     @ForceInline
     public final int reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Integer> m) {
-        return super.reduceLanesTemplate(op, Int512Mask.class, (Int512Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, IntMask512.class, (IntMask512) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Int512Vector extends IntVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Integer> m) {
-        return (long) super.reduceLanesTemplate(op, Int512Mask.class, (Int512Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, IntMask512.class, (IntMask512) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Int512Vector extends IntVector {
 
     @Override
     @ForceInline
-    public final Int512Shuffle toShuffle() {
-        return (Int512Shuffle) toShuffle(vspecies(), false);
+    public final IntShuffle512 toShuffle() {
+        return (IntShuffle512) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Int512Mask test(Test op) {
-        return super.testTemplate(Int512Mask.class, op);  // specialize
+    public final IntMask512 test(Test op) {
+        return super.testTemplate(IntMask512.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int512Mask test(Test op, VectorMask<Integer> m) {
-        return super.testTemplate(Int512Mask.class, op, (Int512Mask) m);  // specialize
+    public final IntMask512 test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(IntMask512.class, op, (IntMask512) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Int512Mask compare(Comparison op, Vector<Integer> v) {
-        return super.compareTemplate(Int512Mask.class, op, v);  // specialize
+    public final IntMask512 compare(Comparison op, Vector<Integer> v) {
+        return super.compareTemplate(IntMask512.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int512Mask compare(Comparison op, int s) {
-        return super.compareTemplate(Int512Mask.class, op, s);  // specialize
+    public final IntMask512 compare(Comparison op, int s) {
+        return super.compareTemplate(IntMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int512Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Int512Mask.class, op, s);  // specialize
+    public final IntMask512 compare(Comparison op, long s) {
+        return super.compareTemplate(IntMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int512Mask compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
-        return super.compareTemplate(Int512Mask.class, op, v, (Int512Mask) m);
+    public final IntMask512 compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
+        return super.compareTemplate(IntMask512.class, op, v, (IntMask512) m);
     }
 
 
     @Override
     @ForceInline
-    public Int512Vector blend(Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int512Vector)
-            super.blendTemplate(Int512Mask.class,
-                                (Int512Vector) v,
-                                (Int512Mask) m);  // specialize
+    public IntVector512 blend(Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector512)
+            super.blendTemplate(IntMask512.class,
+                                (IntVector512) v,
+                                (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector slice(int origin, Vector<Integer> v) {
-        return (Int512Vector) super.sliceTemplate(origin, v);  // specialize
+    public IntVector512 slice(int origin, Vector<Integer> v) {
+        return (IntVector512) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector slice(int origin) {
-        return (Int512Vector) super.sliceTemplate(origin);  // specialize
+    public IntVector512 slice(int origin) {
+        return (IntVector512) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector unslice(int origin, Vector<Integer> w, int part) {
-        return (Int512Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public IntVector512 unslice(int origin, Vector<Integer> w, int part) {
+        return (IntVector512) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
-        return (Int512Vector)
-            super.unsliceTemplate(Int512Mask.class,
+    public IntVector512 unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
+        return (IntVector512)
+            super.unsliceTemplate(IntMask512.class,
                                   origin, w, part,
-                                  (Int512Mask) m);  // specialize
+                                  (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector unslice(int origin) {
-        return (Int512Vector) super.unsliceTemplate(origin);  // specialize
+    public IntVector512 unslice(int origin) {
+        return (IntVector512) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector rearrange(VectorShuffle<Integer> s) {
-        return (Int512Vector)
-            super.rearrangeTemplate(Int512Shuffle.class,
-                                    (Int512Shuffle) s);  // specialize
+    public IntVector512 rearrange(VectorShuffle<Integer> s) {
+        return (IntVector512)
+            super.rearrangeTemplate(IntShuffle512.class,
+                                    (IntShuffle512) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector rearrange(VectorShuffle<Integer> shuffle,
+    public IntVector512 rearrange(VectorShuffle<Integer> shuffle,
                                   VectorMask<Integer> m) {
-        return (Int512Vector)
-            super.rearrangeTemplate(Int512Shuffle.class,
-                                    Int512Mask.class,
-                                    (Int512Shuffle) shuffle,
-                                    (Int512Mask) m);  // specialize
+        return (IntVector512)
+            super.rearrangeTemplate(IntShuffle512.class,
+                                    IntMask512.class,
+                                    (IntShuffle512) shuffle,
+                                    (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector rearrange(VectorShuffle<Integer> s,
+    public IntVector512 rearrange(VectorShuffle<Integer> s,
                                   Vector<Integer> v) {
-        return (Int512Vector)
-            super.rearrangeTemplate(Int512Shuffle.class,
-                                    (Int512Shuffle) s,
-                                    (Int512Vector) v);  // specialize
+        return (IntVector512)
+            super.rearrangeTemplate(IntShuffle512.class,
+                                    (IntShuffle512) s,
+                                    (IntVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector compress(VectorMask<Integer> m) {
-        return (Int512Vector)
-            super.compressTemplate(Int512Mask.class,
-                                   (Int512Mask) m);  // specialize
+    public IntVector512 compress(VectorMask<Integer> m) {
+        return (IntVector512)
+            super.compressTemplate(IntMask512.class,
+                                   (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector expand(VectorMask<Integer> m) {
-        return (Int512Vector)
-            super.expandTemplate(Int512Mask.class,
-                                   (Int512Mask) m);  // specialize
+    public IntVector512 expand(VectorMask<Integer> m) {
+        return (IntVector512)
+            super.expandTemplate(IntMask512.class,
+                                   (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector selectFrom(Vector<Integer> v) {
-        return (Int512Vector)
-            super.selectFromTemplate((Int512Vector) v);  // specialize
+    public IntVector512 selectFrom(Vector<Integer> v) {
+        return (IntVector512)
+            super.selectFromTemplate((IntVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector selectFrom(Vector<Integer> v,
+    public IntVector512 selectFrom(Vector<Integer> v,
                                    VectorMask<Integer> m) {
-        return (Int512Vector)
-            super.selectFromTemplate((Int512Vector) v,
-                                     Int512Mask.class, (Int512Mask) m);  // specialize
+        return (IntVector512)
+            super.selectFromTemplate((IntVector512) v,
+                                     IntMask512.class, (IntMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int512Vector selectFrom(Vector<Integer> v1,
+    public IntVector512 selectFrom(Vector<Integer> v1,
                                    Vector<Integer> v2) {
-        return (Int512Vector)
-            super.selectFromTemplate((Int512Vector) v1, (Int512Vector) v2);  // specialize
+        return (IntVector512)
+            super.selectFromTemplate((IntVector512) v1, (IntVector512) v2);  // specialize
     }
 
     @ForceInline
@@ -541,7 +553,7 @@ final class Int512Vector extends IntVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     int[] vecarr = vec.vec();
@@ -551,7 +563,7 @@ final class Int512Vector extends IntVector {
 
     @ForceInline
     @Override
-    public Int512Vector withLane(int i, int e) {
+    public IntVector512 withLane(int i, int e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -574,9 +586,9 @@ final class Int512Vector extends IntVector {
     }
 
     @ForceInline
-    public Int512Vector withLaneHelper(int i, int e) {
+    public IntVector512 withLaneHelper(int i, int e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     int[] res = v.vec().clone();
@@ -587,19 +599,20 @@ final class Int512Vector extends IntVector {
 
     // Mask
 
-    static final class Int512Mask extends AbstractMask<Integer> {
+    static final class IntMask512 extends AbstractMask<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int512Mask(boolean[] bits) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntMask512(boolean[] bits) {
             this(bits, 0);
         }
 
-        Int512Mask(boolean[] bits, int offset) {
+        IntMask512(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Int512Mask(boolean val) {
+        IntMask512(boolean val) {
             super(prepare(val));
         }
 
@@ -632,31 +645,31 @@ final class Int512Vector extends IntVector {
         }
 
         @Override
-        Int512Mask uOp(MUnOp f) {
+        IntMask512 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Int512Mask(res);
+            return new IntMask512(res);
         }
 
         @Override
-        Int512Mask bOp(VectorMask<Integer> m, MBinOp f) {
+        IntMask512 bOp(VectorMask<Integer> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Int512Mask)m).getBits();
+            boolean[] mbits = ((IntMask512)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Int512Mask(res);
+            return new IntMask512(res);
         }
 
         @ForceInline
         @Override
         public final
-        Int512Vector toVector() {
-            return (Int512Vector) super.toVectorTemplate();  // specialize
+        IntVector512 toVector() {
+            return (IntVector512) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -680,8 +693,8 @@ final class Int512Vector extends IntVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -689,25 +702,25 @@ final class Int512Vector extends IntVector {
         @Override
         @ForceInline
         /*package-private*/
-        Int512Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Int512Mask) VectorSupport.indexPartiallyInUpperRange(
-                Int512Mask.class, int.class, VLENGTH, offset, limit,
-                (o, l) -> (Int512Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        IntMask512 indexPartiallyInUpperRange(long offset, long limit) {
+            return (IntMask512) VectorSupport.indexPartiallyInUpperRange(
+                IntMask512.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (IntMask512) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Int512Mask not() {
+        public IntMask512 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Int512Mask compress() {
-            return (Int512Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Int512Vector.class, Int512Mask.class, ETYPE, VLENGTH, null, this,
+        public IntMask512 compress() {
+            return (IntMask512)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                IntVector512.class, IntMask512.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -716,30 +729,30 @@ final class Int512Vector extends IntVector {
 
         @Override
         @ForceInline
-        public Int512Mask and(VectorMask<Integer> mask) {
+        public IntMask512 and(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int512Mask m = (Int512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Int512Mask.class, null, int.class, VLENGTH,
+            IntMask512 m = (IntMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, IntMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Int512Mask or(VectorMask<Integer> mask) {
+        public IntMask512 or(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int512Mask m = (Int512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Int512Mask.class, null, int.class, VLENGTH,
+            IntMask512 m = (IntMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, IntMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Int512Mask xor(VectorMask<Integer> mask) {
+        public IntMask512 xor(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int512Mask m = (Int512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Int512Mask.class, null, int.class, VLENGTH,
+            IntMask512 m = (IntMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, IntMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -749,21 +762,21 @@ final class Int512Vector extends IntVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Int512Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Int512Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Int512Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -773,7 +786,7 @@ final class Int512Vector extends IntVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Int512Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -783,7 +796,7 @@ final class Int512Vector extends IntVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Int512Mask.class, int.class, VLENGTH,
+            return VectorSupport.extract(IntMask512.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -792,48 +805,49 @@ final class Int512Vector extends IntVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Int512Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Int512Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((IntMask512)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Int512Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Int512Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((IntMask512)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Int512Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Int512Mask.class, int.class, VLENGTH,
+        static IntMask512 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(IntMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Int512Mask  TRUE_MASK = new Int512Mask(true);
-        private static final Int512Mask FALSE_MASK = new Int512Mask(false);
+        private static final IntMask512  TRUE_MASK = new IntMask512(true);
+        private static final IntMask512 FALSE_MASK = new IntMask512(false);
 
     }
 
     // Shuffle
 
-    static final class Int512Shuffle extends AbstractShuffle<Integer> {
+    static final class IntShuffle512 extends AbstractShuffle<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int512Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntShuffle512(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Int512Shuffle(int[] indices, int i) {
+        IntShuffle512(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Int512Shuffle(IntUnaryOperator fn) {
+        IntShuffle512(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -853,23 +867,23 @@ final class Int512Vector extends IntVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Int512Shuffle IOTA = new Int512Shuffle(IDENTITY);
+        static final IntShuffle512 IOTA = new IntShuffle512(IDENTITY);
 
         @Override
         @ForceInline
-        public Int512Vector toVector() {
+        public IntVector512 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Int512Vector toBitsVector() {
-            return (Int512Vector) super.toBitsVectorTemplate();
+        IntVector512 toBitsVector() {
+            return (IntVector512) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int512Vector toBitsVector0() {
-            return ((Int512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector512 toBitsVector0() {
+            return ((IntVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -892,30 +906,30 @@ final class Int512Vector extends IntVector {
 
         @Override
         @ForceInline
-        public final Int512Mask laneIsValid() {
-            return (Int512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final IntMask512 laneIsValid() {
+            return (IntMask512) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Int512Shuffle rearrange(VectorShuffle<Integer> shuffle) {
-            Int512Shuffle concreteShuffle = (Int512Shuffle) shuffle;
-            return (Int512Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final IntShuffle512 rearrange(VectorShuffle<Integer> shuffle) {
+            IntShuffle512 concreteShuffle = (IntShuffle512) shuffle;
+            return (IntShuffle512) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Int512Shuffle wrapIndexes() {
-            Int512Vector v = toBitsVector();
+        public final IntShuffle512 wrapIndexes() {
+            IntVector512 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector512) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector512) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Int512Shuffle) v.toShuffle(vspecies(), false);
+            return (IntShuffle512) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -966,14 +980,14 @@ final class Int512Vector extends IntVector {
     @Override
     final
     IntVector fromArray0(int[] a, int offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromArray0Template(Int512Mask.class, a, offset, (Int512Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(IntMask512.class, a, offset, (IntMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     IntVector fromArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        return super.fromArray0Template(Int512Mask.class, a, offset, indexMap, mapOffset, (Int512Mask) m);
+        return super.fromArray0Template(IntMask512.class, a, offset, indexMap, mapOffset, (IntMask512) m);
     }
 
 
@@ -989,7 +1003,7 @@ final class Int512Vector extends IntVector {
     @Override
     final
     IntVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Int512Mask.class, ms, offset, (Int512Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(IntMask512.class, ms, offset, (IntMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1003,14 +1017,14 @@ final class Int512Vector extends IntVector {
     @Override
     final
     void intoArray0(int[] a, int offset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int512Mask.class, a, offset, (Int512Mask) m);
+        super.intoArray0Template(IntMask512.class, a, offset, (IntMask512) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int512Mask.class, a, offset, indexMap, mapOffset, (Int512Mask) m);
+        super.intoArray0Template(IntMask512.class, a, offset, indexMap, mapOffset, (IntMask512) m);
     }
 
 
@@ -1018,7 +1032,7 @@ final class Int512Vector extends IntVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m) {
-        super.intoMemorySegment0Template(Int512Mask.class, ms, offset, (Int512Mask) m);
+        super.intoMemorySegment0Template(IntMask512.class, ms, offset, (IntMask512) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector64.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector64.java
index d55364a8d67..c3f92285034 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Int64Vector extends IntVector {
+final class IntVector64 extends IntVector {
     static final IntSpecies VSPECIES =
         (IntSpecies) IntVector.SPECIES_64;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Int64Vector> VCLASS = Int64Vector.class;
+    static final Class<IntVector64> VCLASS = IntVector64.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Integer> CTYPE = int.class; // carrier type used by the JVM
+
     static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-    Int64Vector(int[] v) {
+    IntVector64(int[] v) {
         super(v);
     }
 
-    // For compatibility as Int64Vector::new,
+    // For compatibility as IntVector64::new,
     // stored into species.vectorFactory.
-    Int64Vector(Object v) {
+    IntVector64(Object v) {
         this((int[]) v);
     }
 
-    static final Int64Vector ZERO = new Int64Vector(new int[VLENGTH]);
-    static final Int64Vector IOTA = new Int64Vector(VSPECIES.iotaArray());
+    static final IntVector64 ZERO = new IntVector64(new int[VLENGTH]);
+    static final IntVector64 IOTA = new IntVector64(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Int64Vector extends IntVector {
     @Override
     public final Class<Integer> elementType() { return int.class; }
 
+    @ForceInline
+    final Class<Integer> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Integer.SIZE; }
@@ -119,55 +124,62 @@ final class Int64Vector extends IntVector {
         return (int[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Int64Vector broadcast(int e) {
-        return (Int64Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector64 broadcast(int e) {
+        return (IntVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int64Vector broadcast(long e) {
-        return (Int64Vector) super.broadcastTemplate(e);  // specialize
+    public final IntVector64 broadcast(long e) {
+        return (IntVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Int64Mask maskFromArray(boolean[] bits) {
-        return new Int64Mask(bits);
+    IntMask64 maskFromArray(boolean[] bits) {
+        return new IntMask64(bits);
     }
 
     @Override
     @ForceInline
-    Int64Shuffle iotaShuffle() { return Int64Shuffle.IOTA; }
+    IntShuffle64 iotaShuffle() { return IntShuffle64.IOTA; }
 
     @Override
     @ForceInline
-    Int64Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Int64Shuffle) iotaShuffleTemplate(start, step, wrap);
+    IntShuffle64 iotaShuffle(int start, int step, boolean wrap) {
+        return (IntShuffle64) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Int64Shuffle shuffleFromArray(int[] indices, int i) { return new Int64Shuffle(indices, i); }
+    IntShuffle64 shuffleFromArray(int[] indices, int i) { return new IntShuffle64(indices, i); }
 
     @Override
     @ForceInline
-    Int64Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Int64Shuffle(fn); }
+    IntShuffle64 shuffleFromOp(IntUnaryOperator fn) { return new IntShuffle64(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Int64Vector vectorFactory(int[] vec) {
-        return new Int64Vector(vec);
+    IntVector64 vectorFactory(int[] vec) {
+        return new IntVector64(vec);
     }
 
     @ForceInline
     final @Override
-    Byte64Vector asByteVectorRaw() {
-        return (Byte64Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector64 asByteVectorRaw() {
+        return (ByteVector64) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Int64Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int64Vector uOp(FUnOp f) {
-        return (Int64Vector) super.uOpTemplate(f);  // specialize
+    IntVector64 uOp(FUnOp f) {
+        return (IntVector64) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int64Vector uOp(VectorMask<Integer> m, FUnOp f) {
-        return (Int64Vector)
-            super.uOpTemplate((Int64Mask)m, f);  // specialize
+    IntVector64 uOp(VectorMask<Integer> m, FUnOp f) {
+        return (IntVector64)
+            super.uOpTemplate((IntMask64)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Int64Vector bOp(Vector<Integer> v, FBinOp f) {
-        return (Int64Vector) super.bOpTemplate((Int64Vector)v, f);  // specialize
+    IntVector64 bOp(Vector<Integer> v, FBinOp f) {
+        return (IntVector64) super.bOpTemplate((IntVector64)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int64Vector bOp(Vector<Integer> v,
+    IntVector64 bOp(Vector<Integer> v,
                      VectorMask<Integer> m, FBinOp f) {
-        return (Int64Vector)
-            super.bOpTemplate((Int64Vector)v, (Int64Mask)m,
+        return (IntVector64)
+            super.bOpTemplate((IntVector64)v, (IntMask64)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Int64Vector extends IntVector {
 
     @ForceInline
     final @Override
-    Int64Vector tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
-        return (Int64Vector)
-            super.tOpTemplate((Int64Vector)v1, (Int64Vector)v2,
+    IntVector64 tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
+        return (IntVector64)
+            super.tOpTemplate((IntVector64)v1, (IntVector64)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Int64Vector tOp(Vector<Integer> v1, Vector<Integer> v2,
+    IntVector64 tOp(Vector<Integer> v1, Vector<Integer> v2,
                      VectorMask<Integer> m, FTriOp f) {
-        return (Int64Vector)
-            super.tOpTemplate((Int64Vector)v1, (Int64Vector)v2,
-                              (Int64Mask)m, f);  // specialize
+        return (IntVector64)
+            super.tOpTemplate((IntVector64)v1, (IntVector64)v2,
+                              (IntMask64)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Int64Vector extends IntVector {
 
     @Override
     @ForceInline
-    public Int64Vector lanewise(Unary op) {
-        return (Int64Vector) super.lanewiseTemplate(op);  // specialize
+    public IntVector64 lanewise(Unary op) {
+        return (IntVector64) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector lanewise(Unary op, VectorMask<Integer> m) {
-        return (Int64Vector) super.lanewiseTemplate(op, Int64Mask.class, (Int64Mask) m);  // specialize
+    public IntVector64 lanewise(Unary op, VectorMask<Integer> m) {
+        return (IntVector64) super.lanewiseTemplate(op, IntMask64.class, (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector lanewise(Binary op, Vector<Integer> v) {
-        return (Int64Vector) super.lanewiseTemplate(op, v);  // specialize
+    public IntVector64 lanewise(Binary op, Vector<Integer> v) {
+        return (IntVector64) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int64Vector) super.lanewiseTemplate(op, Int64Mask.class, v, (Int64Mask) m);  // specialize
+    public IntVector64 lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector64) super.lanewiseTemplate(op, IntMask64.class, v, (IntMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int64Vector
+    @ForceInline IntVector64
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Int64Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (IntVector64) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Int64Vector
+    @ForceInline IntVector64
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Integer> m) {
-        return (Int64Vector) super.lanewiseShiftTemplate(op, Int64Mask.class, e, (Int64Mask) m);  // specialize
+        return (IntVector64) super.lanewiseShiftTemplate(op, IntMask64.class, e, (IntMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Int64Vector
+    IntVector64
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2) {
-        return (Int64Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (IntVector64) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int64Vector
+    IntVector64
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2, VectorMask<Integer> m) {
-        return (Int64Vector) super.lanewiseTemplate(op, Int64Mask.class, v1, v2, (Int64Mask) m);  // specialize
+        return (IntVector64) super.lanewiseTemplate(op, IntMask64.class, v1, v2, (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Int64Vector addIndex(int scale) {
-        return (Int64Vector) super.addIndexTemplate(scale);  // specialize
+    IntVector64 addIndex(int scale) {
+        return (IntVector64) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Int64Vector extends IntVector {
     @ForceInline
     public final int reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Integer> m) {
-        return super.reduceLanesTemplate(op, Int64Mask.class, (Int64Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, IntMask64.class, (IntMask64) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Int64Vector extends IntVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Integer> m) {
-        return (long) super.reduceLanesTemplate(op, Int64Mask.class, (Int64Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, IntMask64.class, (IntMask64) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Int64Vector extends IntVector {
 
     @Override
     @ForceInline
-    public final Int64Shuffle toShuffle() {
-        return (Int64Shuffle) toShuffle(vspecies(), false);
+    public final IntShuffle64 toShuffle() {
+        return (IntShuffle64) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Int64Mask test(Test op) {
-        return super.testTemplate(Int64Mask.class, op);  // specialize
+    public final IntMask64 test(Test op) {
+        return super.testTemplate(IntMask64.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int64Mask test(Test op, VectorMask<Integer> m) {
-        return super.testTemplate(Int64Mask.class, op, (Int64Mask) m);  // specialize
+    public final IntMask64 test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(IntMask64.class, op, (IntMask64) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Int64Mask compare(Comparison op, Vector<Integer> v) {
-        return super.compareTemplate(Int64Mask.class, op, v);  // specialize
+    public final IntMask64 compare(Comparison op, Vector<Integer> v) {
+        return super.compareTemplate(IntMask64.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int64Mask compare(Comparison op, int s) {
-        return super.compareTemplate(Int64Mask.class, op, s);  // specialize
+    public final IntMask64 compare(Comparison op, int s) {
+        return super.compareTemplate(IntMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int64Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Int64Mask.class, op, s);  // specialize
+    public final IntMask64 compare(Comparison op, long s) {
+        return super.compareTemplate(IntMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Int64Mask compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
-        return super.compareTemplate(Int64Mask.class, op, v, (Int64Mask) m);
+    public final IntMask64 compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
+        return super.compareTemplate(IntMask64.class, op, v, (IntMask64) m);
     }
 
 
     @Override
     @ForceInline
-    public Int64Vector blend(Vector<Integer> v, VectorMask<Integer> m) {
-        return (Int64Vector)
-            super.blendTemplate(Int64Mask.class,
-                                (Int64Vector) v,
-                                (Int64Mask) m);  // specialize
+    public IntVector64 blend(Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVector64)
+            super.blendTemplate(IntMask64.class,
+                                (IntVector64) v,
+                                (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector slice(int origin, Vector<Integer> v) {
-        return (Int64Vector) super.sliceTemplate(origin, v);  // specialize
+    public IntVector64 slice(int origin, Vector<Integer> v) {
+        return (IntVector64) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector slice(int origin) {
-        return (Int64Vector) super.sliceTemplate(origin);  // specialize
+    public IntVector64 slice(int origin) {
+        return (IntVector64) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector unslice(int origin, Vector<Integer> w, int part) {
-        return (Int64Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public IntVector64 unslice(int origin, Vector<Integer> w, int part) {
+        return (IntVector64) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
-        return (Int64Vector)
-            super.unsliceTemplate(Int64Mask.class,
+    public IntVector64 unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
+        return (IntVector64)
+            super.unsliceTemplate(IntMask64.class,
                                   origin, w, part,
-                                  (Int64Mask) m);  // specialize
+                                  (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector unslice(int origin) {
-        return (Int64Vector) super.unsliceTemplate(origin);  // specialize
+    public IntVector64 unslice(int origin) {
+        return (IntVector64) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector rearrange(VectorShuffle<Integer> s) {
-        return (Int64Vector)
-            super.rearrangeTemplate(Int64Shuffle.class,
-                                    (Int64Shuffle) s);  // specialize
+    public IntVector64 rearrange(VectorShuffle<Integer> s) {
+        return (IntVector64)
+            super.rearrangeTemplate(IntShuffle64.class,
+                                    (IntShuffle64) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector rearrange(VectorShuffle<Integer> shuffle,
+    public IntVector64 rearrange(VectorShuffle<Integer> shuffle,
                                   VectorMask<Integer> m) {
-        return (Int64Vector)
-            super.rearrangeTemplate(Int64Shuffle.class,
-                                    Int64Mask.class,
-                                    (Int64Shuffle) shuffle,
-                                    (Int64Mask) m);  // specialize
+        return (IntVector64)
+            super.rearrangeTemplate(IntShuffle64.class,
+                                    IntMask64.class,
+                                    (IntShuffle64) shuffle,
+                                    (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector rearrange(VectorShuffle<Integer> s,
+    public IntVector64 rearrange(VectorShuffle<Integer> s,
                                   Vector<Integer> v) {
-        return (Int64Vector)
-            super.rearrangeTemplate(Int64Shuffle.class,
-                                    (Int64Shuffle) s,
-                                    (Int64Vector) v);  // specialize
+        return (IntVector64)
+            super.rearrangeTemplate(IntShuffle64.class,
+                                    (IntShuffle64) s,
+                                    (IntVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector compress(VectorMask<Integer> m) {
-        return (Int64Vector)
-            super.compressTemplate(Int64Mask.class,
-                                   (Int64Mask) m);  // specialize
+    public IntVector64 compress(VectorMask<Integer> m) {
+        return (IntVector64)
+            super.compressTemplate(IntMask64.class,
+                                   (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector expand(VectorMask<Integer> m) {
-        return (Int64Vector)
-            super.expandTemplate(Int64Mask.class,
-                                   (Int64Mask) m);  // specialize
+    public IntVector64 expand(VectorMask<Integer> m) {
+        return (IntVector64)
+            super.expandTemplate(IntMask64.class,
+                                   (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector selectFrom(Vector<Integer> v) {
-        return (Int64Vector)
-            super.selectFromTemplate((Int64Vector) v);  // specialize
+    public IntVector64 selectFrom(Vector<Integer> v) {
+        return (IntVector64)
+            super.selectFromTemplate((IntVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector selectFrom(Vector<Integer> v,
+    public IntVector64 selectFrom(Vector<Integer> v,
                                    VectorMask<Integer> m) {
-        return (Int64Vector)
-            super.selectFromTemplate((Int64Vector) v,
-                                     Int64Mask.class, (Int64Mask) m);  // specialize
+        return (IntVector64)
+            super.selectFromTemplate((IntVector64) v,
+                                     IntMask64.class, (IntMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Int64Vector selectFrom(Vector<Integer> v1,
+    public IntVector64 selectFrom(Vector<Integer> v1,
                                    Vector<Integer> v2) {
-        return (Int64Vector)
-            super.selectFromTemplate((Int64Vector) v1, (Int64Vector) v2);  // specialize
+        return (IntVector64)
+            super.selectFromTemplate((IntVector64) v1, (IntVector64) v2);  // specialize
     }
 
     @ForceInline
@@ -527,7 +539,7 @@ final class Int64Vector extends IntVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     int[] vecarr = vec.vec();
@@ -537,7 +549,7 @@ final class Int64Vector extends IntVector {
 
     @ForceInline
     @Override
-    public Int64Vector withLane(int i, int e) {
+    public IntVector64 withLane(int i, int e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -546,9 +558,9 @@ final class Int64Vector extends IntVector {
     }
 
     @ForceInline
-    public Int64Vector withLaneHelper(int i, int e) {
+    public IntVector64 withLaneHelper(int i, int e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     int[] res = v.vec().clone();
@@ -559,19 +571,20 @@ final class Int64Vector extends IntVector {
 
     // Mask
 
-    static final class Int64Mask extends AbstractMask<Integer> {
+    static final class IntMask64 extends AbstractMask<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int64Mask(boolean[] bits) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntMask64(boolean[] bits) {
             this(bits, 0);
         }
 
-        Int64Mask(boolean[] bits, int offset) {
+        IntMask64(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Int64Mask(boolean val) {
+        IntMask64(boolean val) {
             super(prepare(val));
         }
 
@@ -604,31 +617,31 @@ final class Int64Vector extends IntVector {
         }
 
         @Override
-        Int64Mask uOp(MUnOp f) {
+        IntMask64 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Int64Mask(res);
+            return new IntMask64(res);
         }
 
         @Override
-        Int64Mask bOp(VectorMask<Integer> m, MBinOp f) {
+        IntMask64 bOp(VectorMask<Integer> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Int64Mask)m).getBits();
+            boolean[] mbits = ((IntMask64)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Int64Mask(res);
+            return new IntMask64(res);
         }
 
         @ForceInline
         @Override
         public final
-        Int64Vector toVector() {
-            return (Int64Vector) super.toVectorTemplate();  // specialize
+        IntVector64 toVector() {
+            return (IntVector64) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -652,8 +665,8 @@ final class Int64Vector extends IntVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -661,25 +674,25 @@ final class Int64Vector extends IntVector {
         @Override
         @ForceInline
         /*package-private*/
-        Int64Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Int64Mask) VectorSupport.indexPartiallyInUpperRange(
-                Int64Mask.class, int.class, VLENGTH, offset, limit,
-                (o, l) -> (Int64Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        IntMask64 indexPartiallyInUpperRange(long offset, long limit) {
+            return (IntMask64) VectorSupport.indexPartiallyInUpperRange(
+                IntMask64.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (IntMask64) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Int64Mask not() {
+        public IntMask64 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Int64Mask compress() {
-            return (Int64Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Int64Vector.class, Int64Mask.class, ETYPE, VLENGTH, null, this,
+        public IntMask64 compress() {
+            return (IntMask64)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                IntVector64.class, IntMask64.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -688,30 +701,30 @@ final class Int64Vector extends IntVector {
 
         @Override
         @ForceInline
-        public Int64Mask and(VectorMask<Integer> mask) {
+        public IntMask64 and(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int64Mask m = (Int64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Int64Mask.class, null, int.class, VLENGTH,
+            IntMask64 m = (IntMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, IntMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Int64Mask or(VectorMask<Integer> mask) {
+        public IntMask64 or(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int64Mask m = (Int64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Int64Mask.class, null, int.class, VLENGTH,
+            IntMask64 m = (IntMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, IntMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Int64Mask xor(VectorMask<Integer> mask) {
+        public IntMask64 xor(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            Int64Mask m = (Int64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Int64Mask.class, null, int.class, VLENGTH,
+            IntMask64 m = (IntMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, IntMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -721,21 +734,21 @@ final class Int64Vector extends IntVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Int64Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Int64Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Int64Mask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -745,7 +758,7 @@ final class Int64Vector extends IntVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Int64Mask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -755,7 +768,7 @@ final class Int64Vector extends IntVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Int64Mask.class, int.class, VLENGTH,
+            return VectorSupport.extract(IntMask64.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -764,48 +777,49 @@ final class Int64Vector extends IntVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Int64Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Int64Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((IntMask64)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Int64Mask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Int64Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((IntMask64)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Int64Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Int64Mask.class, int.class, VLENGTH,
+        static IntMask64 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(IntMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Int64Mask  TRUE_MASK = new Int64Mask(true);
-        private static final Int64Mask FALSE_MASK = new Int64Mask(false);
+        private static final IntMask64  TRUE_MASK = new IntMask64(true);
+        private static final IntMask64 FALSE_MASK = new IntMask64(false);
 
     }
 
     // Shuffle
 
-    static final class Int64Shuffle extends AbstractShuffle<Integer> {
+    static final class IntShuffle64 extends AbstractShuffle<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        Int64Shuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntShuffle64(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Int64Shuffle(int[] indices, int i) {
+        IntShuffle64(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Int64Shuffle(IntUnaryOperator fn) {
+        IntShuffle64(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -825,23 +839,23 @@ final class Int64Vector extends IntVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final Int64Shuffle IOTA = new Int64Shuffle(IDENTITY);
+        static final IntShuffle64 IOTA = new IntShuffle64(IDENTITY);
 
         @Override
         @ForceInline
-        public Int64Vector toVector() {
+        public IntVector64 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Int64Vector toBitsVector() {
-            return (Int64Vector) super.toBitsVectorTemplate();
+        IntVector64 toBitsVector() {
+            return (IntVector64) super.toBitsVectorTemplate();
         }
 
         @Override
-        Int64Vector toBitsVector0() {
-            return ((Int64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVector64 toBitsVector0() {
+            return ((IntVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -864,30 +878,30 @@ final class Int64Vector extends IntVector {
 
         @Override
         @ForceInline
-        public final Int64Mask laneIsValid() {
-            return (Int64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final IntMask64 laneIsValid() {
+            return (IntMask64) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Int64Shuffle rearrange(VectorShuffle<Integer> shuffle) {
-            Int64Shuffle concreteShuffle = (Int64Shuffle) shuffle;
-            return (Int64Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final IntShuffle64 rearrange(VectorShuffle<Integer> shuffle) {
+            IntShuffle64 concreteShuffle = (IntShuffle64) shuffle;
+            return (IntShuffle64) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Int64Shuffle wrapIndexes() {
-            Int64Vector v = toBitsVector();
+        public final IntShuffle64 wrapIndexes() {
+            IntVector64 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Int64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVector64) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Int64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVector64) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Int64Shuffle) v.toShuffle(vspecies(), false);
+            return (IntShuffle64) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -938,14 +952,14 @@ final class Int64Vector extends IntVector {
     @Override
     final
     IntVector fromArray0(int[] a, int offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromArray0Template(Int64Mask.class, a, offset, (Int64Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(IntMask64.class, a, offset, (IntMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     IntVector fromArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        return super.fromArray0Template(Int64Mask.class, a, offset, indexMap, mapOffset, (Int64Mask) m);
+        return super.fromArray0Template(IntMask64.class, a, offset, indexMap, mapOffset, (IntMask64) m);
     }
 
 
@@ -961,7 +975,7 @@ final class Int64Vector extends IntVector {
     @Override
     final
     IntVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Int64Mask.class, ms, offset, (Int64Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(IntMask64.class, ms, offset, (IntMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -975,14 +989,14 @@ final class Int64Vector extends IntVector {
     @Override
     final
     void intoArray0(int[] a, int offset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int64Mask.class, a, offset, (Int64Mask) m);
+        super.intoArray0Template(IntMask64.class, a, offset, (IntMask64) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        super.intoArray0Template(Int64Mask.class, a, offset, indexMap, mapOffset, (Int64Mask) m);
+        super.intoArray0Template(IntMask64.class, a, offset, indexMap, mapOffset, (IntMask64) m);
     }
 
 
@@ -990,7 +1004,7 @@ final class Int64Vector extends IntVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m) {
-        super.intoMemorySegment0Template(Int64Mask.class, ms, offset, (Int64Mask) m);
+        super.intoMemorySegment0Template(IntMask64.class, ms, offset, (IntMask64) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVectorMax.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVectorMax.java
index 0a1cd45eb93..8d3c251536c 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVectorMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class IntMaxVector extends IntVector {
+final class IntVectorMax extends IntVector {
     static final IntSpecies VSPECIES =
         (IntSpecies) IntVector.SPECIES_MAX;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<IntMaxVector> VCLASS = IntMaxVector.class;
+    static final Class<IntVectorMax> VCLASS = IntVectorMax.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Integer> CTYPE = int.class; // carrier type used by the JVM
+
     static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-    IntMaxVector(int[] v) {
+    IntVectorMax(int[] v) {
         super(v);
     }
 
-    // For compatibility as IntMaxVector::new,
+    // For compatibility as IntVectorMax::new,
     // stored into species.vectorFactory.
-    IntMaxVector(Object v) {
+    IntVectorMax(Object v) {
         this((int[]) v);
     }
 
-    static final IntMaxVector ZERO = new IntMaxVector(new int[VLENGTH]);
-    static final IntMaxVector IOTA = new IntMaxVector(VSPECIES.iotaArray());
+    static final IntVectorMax ZERO = new IntVectorMax(new int[VLENGTH]);
+    static final IntVectorMax IOTA = new IntVectorMax(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class IntMaxVector extends IntVector {
     @Override
     public final Class<Integer> elementType() { return int.class; }
 
+    @ForceInline
+    final Class<Integer> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Integer.SIZE; }
@@ -119,55 +124,62 @@ final class IntMaxVector extends IntVector {
         return (int[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final IntMaxVector broadcast(int e) {
-        return (IntMaxVector) super.broadcastTemplate(e);  // specialize
+    public final IntVectorMax broadcast(int e) {
+        return (IntVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final IntMaxVector broadcast(long e) {
-        return (IntMaxVector) super.broadcastTemplate(e);  // specialize
+    public final IntVectorMax broadcast(long e) {
+        return (IntVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    IntMaxMask maskFromArray(boolean[] bits) {
-        return new IntMaxMask(bits);
+    IntMaskMax maskFromArray(boolean[] bits) {
+        return new IntMaskMax(bits);
     }
 
     @Override
     @ForceInline
-    IntMaxShuffle iotaShuffle() { return IntMaxShuffle.IOTA; }
+    IntShuffleMax iotaShuffle() { return IntShuffleMax.IOTA; }
 
     @Override
     @ForceInline
-    IntMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (IntMaxShuffle) iotaShuffleTemplate(start, step, wrap);
+    IntShuffleMax iotaShuffle(int start, int step, boolean wrap) {
+        return (IntShuffleMax) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    IntMaxShuffle shuffleFromArray(int[] indices, int i) { return new IntMaxShuffle(indices, i); }
+    IntShuffleMax shuffleFromArray(int[] indices, int i) { return new IntShuffleMax(indices, i); }
 
     @Override
     @ForceInline
-    IntMaxShuffle shuffleFromOp(IntUnaryOperator fn) { return new IntMaxShuffle(fn); }
+    IntShuffleMax shuffleFromOp(IntUnaryOperator fn) { return new IntShuffleMax(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    IntMaxVector vectorFactory(int[] vec) {
-        return new IntMaxVector(vec);
+    IntVectorMax vectorFactory(int[] vec) {
+        return new IntVectorMax(vec);
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector asByteVectorRaw() {
-        return (ByteMaxVector) super.asByteVectorRawTemplate();  // specialize
+    ByteVectorMax asByteVectorRaw() {
+        return (ByteVectorMax) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class IntMaxVector extends IntVector {
 
     @ForceInline
     final @Override
-    IntMaxVector uOp(FUnOp f) {
-        return (IntMaxVector) super.uOpTemplate(f);  // specialize
+    IntVectorMax uOp(FUnOp f) {
+        return (IntVectorMax) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    IntMaxVector uOp(VectorMask<Integer> m, FUnOp f) {
-        return (IntMaxVector)
-            super.uOpTemplate((IntMaxMask)m, f);  // specialize
+    IntVectorMax uOp(VectorMask<Integer> m, FUnOp f) {
+        return (IntVectorMax)
+            super.uOpTemplate((IntMaskMax)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    IntMaxVector bOp(Vector<Integer> v, FBinOp f) {
-        return (IntMaxVector) super.bOpTemplate((IntMaxVector)v, f);  // specialize
+    IntVectorMax bOp(Vector<Integer> v, FBinOp f) {
+        return (IntVectorMax) super.bOpTemplate((IntVectorMax)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    IntMaxVector bOp(Vector<Integer> v,
+    IntVectorMax bOp(Vector<Integer> v,
                      VectorMask<Integer> m, FBinOp f) {
-        return (IntMaxVector)
-            super.bOpTemplate((IntMaxVector)v, (IntMaxMask)m,
+        return (IntVectorMax)
+            super.bOpTemplate((IntVectorMax)v, (IntMaskMax)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class IntMaxVector extends IntVector {
 
     @ForceInline
     final @Override
-    IntMaxVector tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
-        return (IntMaxVector)
-            super.tOpTemplate((IntMaxVector)v1, (IntMaxVector)v2,
+    IntVectorMax tOp(Vector<Integer> v1, Vector<Integer> v2, FTriOp f) {
+        return (IntVectorMax)
+            super.tOpTemplate((IntVectorMax)v1, (IntVectorMax)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    IntMaxVector tOp(Vector<Integer> v1, Vector<Integer> v2,
+    IntVectorMax tOp(Vector<Integer> v1, Vector<Integer> v2,
                      VectorMask<Integer> m, FTriOp f) {
-        return (IntMaxVector)
-            super.tOpTemplate((IntMaxVector)v1, (IntMaxVector)v2,
-                              (IntMaxMask)m, f);  // specialize
+        return (IntVectorMax)
+            super.tOpTemplate((IntVectorMax)v1, (IntVectorMax)v2,
+                              (IntMaskMax)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class IntMaxVector extends IntVector {
 
     @Override
     @ForceInline
-    public IntMaxVector lanewise(Unary op) {
-        return (IntMaxVector) super.lanewiseTemplate(op);  // specialize
+    public IntVectorMax lanewise(Unary op) {
+        return (IntVectorMax) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector lanewise(Unary op, VectorMask<Integer> m) {
-        return (IntMaxVector) super.lanewiseTemplate(op, IntMaxMask.class, (IntMaxMask) m);  // specialize
+    public IntVectorMax lanewise(Unary op, VectorMask<Integer> m) {
+        return (IntVectorMax) super.lanewiseTemplate(op, IntMaskMax.class, (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector lanewise(Binary op, Vector<Integer> v) {
-        return (IntMaxVector) super.lanewiseTemplate(op, v);  // specialize
+    public IntVectorMax lanewise(Binary op, Vector<Integer> v) {
+        return (IntVectorMax) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
-        return (IntMaxVector) super.lanewiseTemplate(op, IntMaxMask.class, v, (IntMaxMask) m);  // specialize
+    public IntVectorMax lanewise(Binary op, Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVectorMax) super.lanewiseTemplate(op, IntMaskMax.class, v, (IntMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline IntMaxVector
+    @ForceInline IntVectorMax
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (IntMaxVector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (IntVectorMax) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline IntMaxVector
+    @ForceInline IntVectorMax
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Integer> m) {
-        return (IntMaxVector) super.lanewiseShiftTemplate(op, IntMaxMask.class, e, (IntMaxMask) m);  // specialize
+        return (IntVectorMax) super.lanewiseShiftTemplate(op, IntMaskMax.class, e, (IntMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    IntMaxVector
+    IntVectorMax
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2) {
-        return (IntMaxVector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (IntVectorMax) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    IntMaxVector
+    IntVectorMax
     lanewise(Ternary op, Vector<Integer> v1, Vector<Integer> v2, VectorMask<Integer> m) {
-        return (IntMaxVector) super.lanewiseTemplate(op, IntMaxMask.class, v1, v2, (IntMaxMask) m);  // specialize
+        return (IntVectorMax) super.lanewiseTemplate(op, IntMaskMax.class, v1, v2, (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    IntMaxVector addIndex(int scale) {
-        return (IntMaxVector) super.addIndexTemplate(scale);  // specialize
+    IntVectorMax addIndex(int scale) {
+        return (IntVectorMax) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class IntMaxVector extends IntVector {
     @ForceInline
     public final int reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Integer> m) {
-        return super.reduceLanesTemplate(op, IntMaxMask.class, (IntMaxMask) m);  // specialized
+        return super.reduceLanesTemplate(op, IntMaskMax.class, (IntMaskMax) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class IntMaxVector extends IntVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Integer> m) {
-        return (long) super.reduceLanesTemplate(op, IntMaxMask.class, (IntMaxMask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, IntMaskMax.class, (IntMaskMax) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class IntMaxVector extends IntVector {
 
     @Override
     @ForceInline
-    public final IntMaxShuffle toShuffle() {
-        return (IntMaxShuffle) toShuffle(vspecies(), false);
+    public final IntShuffleMax toShuffle() {
+        return (IntShuffleMax) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final IntMaxMask test(Test op) {
-        return super.testTemplate(IntMaxMask.class, op);  // specialize
+    public final IntMaskMax test(Test op) {
+        return super.testTemplate(IntMaskMax.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final IntMaxMask test(Test op, VectorMask<Integer> m) {
-        return super.testTemplate(IntMaxMask.class, op, (IntMaxMask) m);  // specialize
+    public final IntMaskMax test(Test op, VectorMask<Integer> m) {
+        return super.testTemplate(IntMaskMax.class, op, (IntMaskMax) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final IntMaxMask compare(Comparison op, Vector<Integer> v) {
-        return super.compareTemplate(IntMaxMask.class, op, v);  // specialize
+    public final IntMaskMax compare(Comparison op, Vector<Integer> v) {
+        return super.compareTemplate(IntMaskMax.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final IntMaxMask compare(Comparison op, int s) {
-        return super.compareTemplate(IntMaxMask.class, op, s);  // specialize
+    public final IntMaskMax compare(Comparison op, int s) {
+        return super.compareTemplate(IntMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final IntMaxMask compare(Comparison op, long s) {
-        return super.compareTemplate(IntMaxMask.class, op, s);  // specialize
+    public final IntMaskMax compare(Comparison op, long s) {
+        return super.compareTemplate(IntMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final IntMaxMask compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
-        return super.compareTemplate(IntMaxMask.class, op, v, (IntMaxMask) m);
+    public final IntMaskMax compare(Comparison op, Vector<Integer> v, VectorMask<Integer> m) {
+        return super.compareTemplate(IntMaskMax.class, op, v, (IntMaskMax) m);
     }
 
 
     @Override
     @ForceInline
-    public IntMaxVector blend(Vector<Integer> v, VectorMask<Integer> m) {
-        return (IntMaxVector)
-            super.blendTemplate(IntMaxMask.class,
-                                (IntMaxVector) v,
-                                (IntMaxMask) m);  // specialize
+    public IntVectorMax blend(Vector<Integer> v, VectorMask<Integer> m) {
+        return (IntVectorMax)
+            super.blendTemplate(IntMaskMax.class,
+                                (IntVectorMax) v,
+                                (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector slice(int origin, Vector<Integer> v) {
-        return (IntMaxVector) super.sliceTemplate(origin, v);  // specialize
+    public IntVectorMax slice(int origin, Vector<Integer> v) {
+        return (IntVectorMax) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector slice(int origin) {
-        return (IntMaxVector) super.sliceTemplate(origin);  // specialize
+    public IntVectorMax slice(int origin) {
+        return (IntVectorMax) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector unslice(int origin, Vector<Integer> w, int part) {
-        return (IntMaxVector) super.unsliceTemplate(origin, w, part);  // specialize
+    public IntVectorMax unslice(int origin, Vector<Integer> w, int part) {
+        return (IntVectorMax) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
-        return (IntMaxVector)
-            super.unsliceTemplate(IntMaxMask.class,
+    public IntVectorMax unslice(int origin, Vector<Integer> w, int part, VectorMask<Integer> m) {
+        return (IntVectorMax)
+            super.unsliceTemplate(IntMaskMax.class,
                                   origin, w, part,
-                                  (IntMaxMask) m);  // specialize
+                                  (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector unslice(int origin) {
-        return (IntMaxVector) super.unsliceTemplate(origin);  // specialize
+    public IntVectorMax unslice(int origin) {
+        return (IntVectorMax) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector rearrange(VectorShuffle<Integer> s) {
-        return (IntMaxVector)
-            super.rearrangeTemplate(IntMaxShuffle.class,
-                                    (IntMaxShuffle) s);  // specialize
+    public IntVectorMax rearrange(VectorShuffle<Integer> s) {
+        return (IntVectorMax)
+            super.rearrangeTemplate(IntShuffleMax.class,
+                                    (IntShuffleMax) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector rearrange(VectorShuffle<Integer> shuffle,
+    public IntVectorMax rearrange(VectorShuffle<Integer> shuffle,
                                   VectorMask<Integer> m) {
-        return (IntMaxVector)
-            super.rearrangeTemplate(IntMaxShuffle.class,
-                                    IntMaxMask.class,
-                                    (IntMaxShuffle) shuffle,
-                                    (IntMaxMask) m);  // specialize
+        return (IntVectorMax)
+            super.rearrangeTemplate(IntShuffleMax.class,
+                                    IntMaskMax.class,
+                                    (IntShuffleMax) shuffle,
+                                    (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector rearrange(VectorShuffle<Integer> s,
+    public IntVectorMax rearrange(VectorShuffle<Integer> s,
                                   Vector<Integer> v) {
-        return (IntMaxVector)
-            super.rearrangeTemplate(IntMaxShuffle.class,
-                                    (IntMaxShuffle) s,
-                                    (IntMaxVector) v);  // specialize
+        return (IntVectorMax)
+            super.rearrangeTemplate(IntShuffleMax.class,
+                                    (IntShuffleMax) s,
+                                    (IntVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector compress(VectorMask<Integer> m) {
-        return (IntMaxVector)
-            super.compressTemplate(IntMaxMask.class,
-                                   (IntMaxMask) m);  // specialize
+    public IntVectorMax compress(VectorMask<Integer> m) {
+        return (IntVectorMax)
+            super.compressTemplate(IntMaskMax.class,
+                                   (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector expand(VectorMask<Integer> m) {
-        return (IntMaxVector)
-            super.expandTemplate(IntMaxMask.class,
-                                   (IntMaxMask) m);  // specialize
+    public IntVectorMax expand(VectorMask<Integer> m) {
+        return (IntVectorMax)
+            super.expandTemplate(IntMaskMax.class,
+                                   (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector selectFrom(Vector<Integer> v) {
-        return (IntMaxVector)
-            super.selectFromTemplate((IntMaxVector) v);  // specialize
+    public IntVectorMax selectFrom(Vector<Integer> v) {
+        return (IntVectorMax)
+            super.selectFromTemplate((IntVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector selectFrom(Vector<Integer> v,
+    public IntVectorMax selectFrom(Vector<Integer> v,
                                    VectorMask<Integer> m) {
-        return (IntMaxVector)
-            super.selectFromTemplate((IntMaxVector) v,
-                                     IntMaxMask.class, (IntMaxMask) m);  // specialize
+        return (IntVectorMax)
+            super.selectFromTemplate((IntVectorMax) v,
+                                     IntMaskMax.class, (IntMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public IntMaxVector selectFrom(Vector<Integer> v1,
+    public IntVectorMax selectFrom(Vector<Integer> v1,
                                    Vector<Integer> v2) {
-        return (IntMaxVector)
-            super.selectFromTemplate((IntMaxVector) v1, (IntMaxVector) v2);  // specialize
+        return (IntVectorMax)
+            super.selectFromTemplate((IntVectorMax) v1, (IntVectorMax) v2);  // specialize
     }
 
     @ForceInline
@@ -526,7 +538,7 @@ final class IntMaxVector extends IntVector {
     @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     int[] vecarr = vec.vec();
@@ -536,7 +548,7 @@ final class IntMaxVector extends IntVector {
 
     @ForceInline
     @Override
-    public IntMaxVector withLane(int i, int e) {
+    public IntVectorMax withLane(int i, int e) {
         if (i < 0 || i >= VLENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
         }
@@ -544,9 +556,9 @@ final class IntMaxVector extends IntVector {
     }
 
     @ForceInline
-    public IntMaxVector withLaneHelper(int i, int e) {
+    public IntVectorMax withLaneHelper(int i, int e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     int[] res = v.vec().clone();
@@ -557,19 +569,20 @@ final class IntMaxVector extends IntVector {
 
     // Mask
 
-    static final class IntMaxMask extends AbstractMask<Integer> {
+    static final class IntMaskMax extends AbstractMask<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        IntMaxMask(boolean[] bits) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntMaskMax(boolean[] bits) {
             this(bits, 0);
         }
 
-        IntMaxMask(boolean[] bits, int offset) {
+        IntMaskMax(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        IntMaxMask(boolean val) {
+        IntMaskMax(boolean val) {
             super(prepare(val));
         }
 
@@ -602,31 +615,31 @@ final class IntMaxVector extends IntVector {
         }
 
         @Override
-        IntMaxMask uOp(MUnOp f) {
+        IntMaskMax uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new IntMaxMask(res);
+            return new IntMaskMax(res);
         }
 
         @Override
-        IntMaxMask bOp(VectorMask<Integer> m, MBinOp f) {
+        IntMaskMax bOp(VectorMask<Integer> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((IntMaxMask)m).getBits();
+            boolean[] mbits = ((IntMaskMax)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new IntMaxMask(res);
+            return new IntMaskMax(res);
         }
 
         @ForceInline
         @Override
         public final
-        IntMaxVector toVector() {
-            return (IntMaxVector) super.toVectorTemplate();  // specialize
+        IntVectorMax toVector() {
+            return (IntVectorMax) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -650,8 +663,8 @@ final class IntMaxVector extends IntVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -659,25 +672,25 @@ final class IntMaxVector extends IntVector {
         @Override
         @ForceInline
         /*package-private*/
-        IntMaxMask indexPartiallyInUpperRange(long offset, long limit) {
-            return (IntMaxMask) VectorSupport.indexPartiallyInUpperRange(
-                IntMaxMask.class, int.class, VLENGTH, offset, limit,
-                (o, l) -> (IntMaxMask) TRUE_MASK.indexPartiallyInRange(o, l));
+        IntMaskMax indexPartiallyInUpperRange(long offset, long limit) {
+            return (IntMaskMax) VectorSupport.indexPartiallyInUpperRange(
+                IntMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (IntMaskMax) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public IntMaxMask not() {
+        public IntMaskMax not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public IntMaxMask compress() {
-            return (IntMaxMask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                IntMaxVector.class, IntMaxMask.class, ETYPE, VLENGTH, null, this,
+        public IntMaskMax compress() {
+            return (IntMaskMax)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                IntVectorMax.class, IntMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -686,30 +699,30 @@ final class IntMaxVector extends IntVector {
 
         @Override
         @ForceInline
-        public IntMaxMask and(VectorMask<Integer> mask) {
+        public IntMaskMax and(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            IntMaxMask m = (IntMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, IntMaxMask.class, null, int.class, VLENGTH,
+            IntMaskMax m = (IntMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, IntMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public IntMaxMask or(VectorMask<Integer> mask) {
+        public IntMaskMax or(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            IntMaxMask m = (IntMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, IntMaxMask.class, null, int.class, VLENGTH,
+            IntMaskMax m = (IntMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, IntMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public IntMaxMask xor(VectorMask<Integer> mask) {
+        public IntMaskMax xor(VectorMask<Integer> mask) {
             Objects.requireNonNull(mask);
-            IntMaxMask m = (IntMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, IntMaxMask.class, null, int.class, VLENGTH,
+            IntMaskMax m = (IntMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, IntMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -719,21 +732,21 @@ final class IntMaxVector extends IntVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, IntMaxMask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, IntMaxMask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, IntMaxMask.class, int.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -743,7 +756,7 @@ final class IntMaxVector extends IntVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, IntMaxMask.class, int.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -753,7 +766,7 @@ final class IntMaxVector extends IntVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(IntMaxMask.class, int.class, VLENGTH,
+            return VectorSupport.extract(IntMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -762,28 +775,28 @@ final class IntMaxVector extends IntVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, IntMaxMask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_ne, IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((IntMaxMask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((IntMaskMax)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, IntMaxMask.class, int.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((IntMaxMask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((IntMaskMax)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static IntMaxMask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(IntMaxMask.class, int.class, VLENGTH,
+        static IntMaskMax maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(IntMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final IntMaxMask  TRUE_MASK = new IntMaxMask(true);
-        private static final IntMaxMask FALSE_MASK = new IntMaxMask(false);
+        private static final IntMaskMax  TRUE_MASK = new IntMaskMax(true);
+        private static final IntMaskMax FALSE_MASK = new IntMaskMax(false);
 
 
         static boolean[] maskLowerHalf() {
@@ -795,26 +808,27 @@ final class IntMaxVector extends IntVector {
             return a;
         }
 
-        static final IntMaxMask LOWER_HALF_TRUE_MASK = new IntMaxMask(maskLowerHalf());
+        static final IntMaskMax LOWER_HALF_TRUE_MASK = new IntMaskMax(maskLowerHalf());
     }
 
     // Shuffle
 
-    static final class IntMaxShuffle extends AbstractShuffle<Integer> {
+    static final class IntShuffleMax extends AbstractShuffle<Integer> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Integer> ETYPE = int.class; // used by the JVM
 
-        IntMaxShuffle(int[] indices) {
+        static final Class<Integer> CTYPE = int.class; // used by the JVM
+
+        IntShuffleMax(int[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        IntMaxShuffle(int[] indices, int i) {
+        IntShuffleMax(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        IntMaxShuffle(IntUnaryOperator fn) {
+        IntShuffleMax(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -834,23 +848,23 @@ final class IntMaxVector extends IntVector {
             assert(VLENGTH < Integer.MAX_VALUE);
             assert(Integer.MIN_VALUE <= -VLENGTH);
         }
-        static final IntMaxShuffle IOTA = new IntMaxShuffle(IDENTITY);
+        static final IntShuffleMax IOTA = new IntShuffleMax(IDENTITY);
 
         @Override
         @ForceInline
-        public IntMaxVector toVector() {
+        public IntVectorMax toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        IntMaxVector toBitsVector() {
-            return (IntMaxVector) super.toBitsVectorTemplate();
+        IntVectorMax toBitsVector() {
+            return (IntVectorMax) super.toBitsVectorTemplate();
         }
 
         @Override
-        IntMaxVector toBitsVector0() {
-            return ((IntMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        IntVectorMax toBitsVector0() {
+            return ((IntVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -873,30 +887,30 @@ final class IntMaxVector extends IntVector {
 
         @Override
         @ForceInline
-        public final IntMaxMask laneIsValid() {
-            return (IntMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final IntMaskMax laneIsValid() {
+            return (IntMaskMax) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final IntMaxShuffle rearrange(VectorShuffle<Integer> shuffle) {
-            IntMaxShuffle concreteShuffle = (IntMaxShuffle) shuffle;
-            return (IntMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+        public final IntShuffleMax rearrange(VectorShuffle<Integer> shuffle) {
+            IntShuffleMax concreteShuffle = (IntShuffleMax) shuffle;
+            return (IntShuffleMax) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final IntMaxShuffle wrapIndexes() {
-            IntMaxVector v = toBitsVector();
+        public final IntShuffleMax wrapIndexes() {
+            IntVectorMax v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (IntMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (IntVectorMax) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (IntMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (IntVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (IntMaxShuffle) v.toShuffle(vspecies(), false);
+            return (IntShuffleMax) v.toShuffle(vspecies(), false);
         }
 
         private static int[] prepare(int[] indices, int offset) {
@@ -947,14 +961,14 @@ final class IntMaxVector extends IntVector {
     @Override
     final
     IntVector fromArray0(int[] a, int offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromArray0Template(IntMaxMask.class, a, offset, (IntMaxMask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(IntMaskMax.class, a, offset, (IntMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     IntVector fromArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        return super.fromArray0Template(IntMaxMask.class, a, offset, indexMap, mapOffset, (IntMaxMask) m);
+        return super.fromArray0Template(IntMaskMax.class, a, offset, indexMap, mapOffset, (IntMaskMax) m);
     }
 
 
@@ -970,7 +984,7 @@ final class IntMaxVector extends IntVector {
     @Override
     final
     IntVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(IntMaxMask.class, ms, offset, (IntMaxMask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(IntMaskMax.class, ms, offset, (IntMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -984,14 +998,14 @@ final class IntMaxVector extends IntVector {
     @Override
     final
     void intoArray0(int[] a, int offset, VectorMask<Integer> m) {
-        super.intoArray0Template(IntMaxMask.class, a, offset, (IntMaxMask) m);
+        super.intoArray0Template(IntMaskMax.class, a, offset, (IntMaskMax) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(int[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Integer> m) {
-        super.intoArray0Template(IntMaxMask.class, a, offset, indexMap, mapOffset, (IntMaxMask) m);
+        super.intoArray0Template(IntMaskMax.class, a, offset, indexMap, mapOffset, (IntMaskMax) m);
     }
 
 
@@ -999,7 +1013,7 @@ final class IntMaxVector extends IntVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Integer> m) {
-        super.intoMemorySegment0Template(IntMaxMask.class, ms, offset, (IntMaxMask) m);
+        super.intoMemorySegment0Template(IntMaskMax.class, ms, offset, (IntMaskMax) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LaneType.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LaneType.java
index 53fa773555f..c18bbce1f34 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LaneType.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LaneType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,12 +35,12 @@ import static jdk.incubator.vector.VectorIntrinsics.*;
  * It caches all sorts of goodies that we can't put on java.lang.Class.
  */
 enum LaneType {
-    FLOAT(float.class, Float.class, float[].class, 'F', 24, Float.SIZE, T_FLOAT),
-    DOUBLE(double.class, Double.class, double[].class, 'F', 53, Double.SIZE, T_DOUBLE),
-    BYTE(byte.class, Byte.class, byte[].class, 'I', -1, Byte.SIZE, T_BYTE),
-    SHORT(short.class, Short.class, short[].class, 'I', -1, Short.SIZE, T_SHORT),
-    INT(int.class, Integer.class, int[].class, 'I', -1, Integer.SIZE, T_INT),
-    LONG(long.class, Long.class, long[].class, 'I', -1, Long.SIZE, T_LONG);
+    FLOAT(float.class, Float.class, float[].class, 'F', 24, Float.SIZE, float.class),
+    DOUBLE(double.class, Double.class, double[].class, 'F', 53, Double.SIZE, double.class),
+    BYTE(byte.class, Byte.class, byte[].class, 'I', -1, Byte.SIZE, byte.class),
+    SHORT(short.class, Short.class, short[].class, 'I', -1, Short.SIZE, short.class),
+    INT(int.class, Integer.class, int[].class, 'I', -1, Integer.SIZE, int.class),
+    LONG(long.class, Long.class, long[].class, 'I', -1, Long.SIZE, long.class);
 
     LaneType(Class<?> elementType,
              Class<?> genericElementType,
@@ -48,7 +48,7 @@ enum LaneType {
              char elementKind,
              int elementPrecision,
              int elementSize,
-             int basicType) {
+             Class<?> carrierType) {
         if (elementPrecision <= 0)
             elementPrecision += elementSize;
         this.elementType = elementType;
@@ -67,12 +67,9 @@ enum LaneType {
         // report that condition also.
         this.typeChar = genericElementType.getSimpleName().charAt(0);
         assert("FDBSIL".indexOf(typeChar) == ordinal()) : this;
-        // Same as in JVMS, org.objectweb.asm.Opcodes, etc.:
-        this.basicType = basicType;
-        assert(basicType ==
-               ( (elementSizeLog2 - /*lg(Byte.SIZE)*/ 3)
-                 | (elementKind == 'F' ? 4 : 8))) : this;
-        assert("....zcFDBSILoav..".charAt(basicType) == typeChar);
+        this.carrierType = carrierType;
+        assert(carrierType.isPrimitive());
+
     }
 
     final Class<?> elementType;
@@ -85,7 +82,7 @@ enum LaneType {
     final int switchKey;  // 1+ordinal(), which is non-zero
     final String printName;
     final char typeChar; // one of "BSILFD"
-    final int basicType;  // lg(size/8) | (kind=='F'?4:kind=='I'?8)
+    final Class<?> carrierType;
 
     private @Stable LaneType asIntegral;
     private @Stable LaneType asFloating;
@@ -194,8 +191,8 @@ enum LaneType {
 
     /*package-private*/
     @ForceInline
-    static LaneType ofBasicType(int bt) {
-        return ENUM_FROM_BT[bt].check();
+    static LaneType ofLaneTypeOrdinal(int lo) {
+        return ENUM_VALUES[lo].check();
     }
 
     /*package-private*/
@@ -207,13 +204,11 @@ enum LaneType {
     @Stable private static final LaneType[] ENUM_VALUES;
     @Stable private static final LaneType[] ENUM_FROM_SK;
     @Stable private static final LaneType[] ENUM_FROM_C0;
-    @Stable private static final LaneType[] ENUM_FROM_BT;
-    private static final int C0_MASK = 0x0F, BT_MASK = 0x0F;
+    private static final int C0_MASK = 0x0F;
     static {
         LaneType[] values = values().clone();
         LaneType[] valuesByKey = new LaneType[1+values.length];
         LaneType[] valuesByC0  = new LaneType[C0_MASK+1];
-        LaneType[] valuesByBT  = new LaneType[BT_MASK+1];
         for (int ord = 0; ord < values.length; ord++) {
             int key = 1+ord;
             LaneType value = values[ord];
@@ -229,8 +224,6 @@ enum LaneType {
             c0 &= C0_MASK;
             assert(valuesByC0[c0] == null);
             valuesByC0[c0] = value;
-            assert(valuesByBT[value.basicType] == null);
-            valuesByBT[value.basicType] = value;
             // set up asIntegral
             if (value.elementKind == 'I') {
                 value.asIntegral = value;
@@ -276,15 +269,14 @@ enum LaneType {
         ENUM_VALUES = values;
         ENUM_FROM_SK = valuesByKey;
         ENUM_FROM_C0 = valuesByC0;
-        ENUM_FROM_BT = valuesByBT;
     }
 
     static {
-        assert(ofBasicType(T_FLOAT) == FLOAT);
-        assert(ofBasicType(T_DOUBLE) == DOUBLE);
-        assert(ofBasicType(T_BYTE) == BYTE);
-        assert(ofBasicType(T_SHORT) == SHORT);
-        assert(ofBasicType(T_INT) == INT);
-        assert(ofBasicType(T_LONG) == LONG);
+        assert(ofLaneTypeOrdinal(LT_FLOAT) == FLOAT);
+        assert(ofLaneTypeOrdinal(LT_DOUBLE) == DOUBLE);
+        assert(ofLaneTypeOrdinal(LT_BYTE) == BYTE);
+        assert(ofLaneTypeOrdinal(LT_SHORT) == SHORT);
+        assert(ofLaneTypeOrdinal(LT_INT) == INT);
+        assert(ofLaneTypeOrdinal(LT_LONG) == LONG);
     }
 }
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
index 8947343ff30..7ba0af6c139 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ public abstract class LongVector extends AbstractVector<Long> {
 
     static final ValueLayout.OfLong ELEMENT_LAYOUT = ValueLayout.JAVA_LONG.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = LT_LONG;
+
+    static final int LANEBITS_TYPE_ORDINAL = LT_LONG;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -80,8 +84,8 @@ public abstract class LongVector extends AbstractVector<Long> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -573,7 +577,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     @ForceInline
     public static LongVector zero(VectorSpecies<Long> species) {
         LongSpecies vsp = (LongSpecies) species;
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), long.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                                 0, MODE_BROADCAST, vsp,
                                 ((bits_, s_) -> s_.rvOp(i -> bits_)));
     }
@@ -653,7 +657,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, long.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, LongVector::unaryOperations));
     }
@@ -681,7 +685,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, long.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, LongVector::unaryOperations));
     }
@@ -754,7 +758,7 @@ public abstract class LongVector extends AbstractVector<Long> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, long.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, LongVector::binaryOperations));
     }
@@ -805,7 +809,7 @@ public abstract class LongVector extends AbstractVector<Long> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, long.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, LongVector::binaryOperations));
     }
@@ -951,7 +955,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), null, long.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, e, null,
             BIN_INT_IMPL.find(op, opc, LongVector::broadcastIntOperations));
     }
@@ -972,7 +976,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), maskClass, long.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, e, m,
             BIN_INT_IMPL.find(op, opc, LongVector::broadcastIntOperations));
     }
@@ -1048,7 +1052,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, long.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, LongVector::ternaryOperations));
     }
@@ -1088,7 +1092,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, long.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, LongVector::ternaryOperations));
     }
@@ -1968,7 +1972,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, long.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Long> m
@@ -1990,7 +1994,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, long.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Long> cmpM
@@ -2095,7 +2099,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     blendTemplate(Class<M> maskType, LongVector v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, long.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2112,7 +2116,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), long.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2283,7 +2287,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     LongVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, long.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2310,7 +2314,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, long.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2336,7 +2340,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         VectorMask<Long> valid = shuffle.laneIsValid();
         LongVector r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, long.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2344,7 +2348,7 @@ public abstract class LongVector extends AbstractVector<Long> {
                 }));
         LongVector r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, long.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2394,7 +2398,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     LongVector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (LongVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        long.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -2413,7 +2417,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     LongVector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (LongVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        long.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -2428,7 +2432,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     /*package-private*/
     @ForceInline
     final LongVector selectFromTemplate(LongVector v) {
-        return (LongVector)VectorSupport.selectFromOp(getClass(), null, long.class,
+        return (LongVector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -2448,7 +2452,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     LongVector selectFromTemplate(LongVector v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return (LongVector)VectorSupport.selectFromOp(getClass(), masktype, long.class,
+        return (LongVector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -2466,7 +2470,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     /*package-private*/
     @ForceInline
     final LongVector selectFromTemplate(LongVector v1, LongVector v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), long.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -2686,7 +2690,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, long.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, LongVector::reductionOperations)));
     }
@@ -2704,7 +2708,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, long.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, LongVector::reductionOperations)));
     }
@@ -2724,9 +2728,9 @@ public abstract class LongVector extends AbstractVector<Long> {
             case VECTOR_OP_MAX: return (v, m) ->
                     toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (long) Math.max(a, b)));
             case VECTOR_OP_UMIN: return (v, m) ->
-                    toBits(v.rOp(MAX_OR_INF, m, (i, a, b) -> (long) VectorMath.minUnsigned(a, b)));
+                    toBits(v.rOp(UMAX_VALUE, m, (i, a, b) -> (long) VectorMath.minUnsigned(a, b)));
             case VECTOR_OP_UMAX: return (v, m) ->
-                    toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (long) VectorMath.maxUnsigned(a, b)));
+                    toBits(v.rOp(UMIN_VALUE, m, (i, a, b) -> (long) VectorMath.maxUnsigned(a, b)));
             case VECTOR_OP_SUADD: return (v, m) ->
                     toBits(v.rOp((long)0, m, (i, a, b) -> (long) VectorMath.addSaturatingUnsigned(a, b)));
             case VECTOR_OP_AND: return (v, m) ->
@@ -2741,6 +2745,8 @@ public abstract class LongVector extends AbstractVector<Long> {
 
     private static final long MIN_OR_INF = Long.MIN_VALUE;
     private static final long MAX_OR_INF = Long.MAX_VALUE;
+    private static final long UMIN_VALUE = (long)0;   // Minimum unsigned value
+    private static final long UMAX_VALUE = (long)-1;  // Maximum unsigned value
 
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op);
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op,
@@ -2958,7 +2964,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         // Index vector: vix[0:n] = k -> offset + indexMap[mapOffset + k]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For LongMaxVector,  if vector length is non-power-of-two or
+            // For LongVectorMax,  if vector length is non-power-of-two or
             // 2048 bits, indexShape of Long species is S_MAX_BIT.
             // Assume that vector length is 2048, then the lane count of Long
             // vector is 32. When converting Long species to int species,
@@ -2966,7 +2972,7 @@ public abstract class LongVector extends AbstractVector<Long> {
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -2977,7 +2983,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, null, long.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3160,7 +3166,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         offset = checkFromIndexSize(offset, length(), a.length);
         LongSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3249,14 +3255,14 @@ public abstract class LongVector extends AbstractVector<Long> {
         // Index vector: vix[0:n] = i -> offset + indexMap[mo + i]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For LongMaxVector,  if vector length  is 2048 bits, indexShape
+            // For LongVectorMax,  if vector length  is 2048 bits, indexShape
             // of Long species is S_MAX_BIT. and the lane count of Long
             // vector is 32. When converting Long species to int species,
             // indexShape is still S_MAX_BIT, but the lane count of int vector
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3268,7 +3274,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), null, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, null,
@@ -3395,7 +3401,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     LongVector fromArray0Template(long[] a, int offset) {
         LongSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3412,7 +3418,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         m.check(species());
         LongSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3443,7 +3449,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         // Index vector: vix[0:n] = k -> offset + indexMap[mapOffset + k]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For LongMaxVector,  if vector length is non-power-of-two or
+            // For LongVectorMax,  if vector length is non-power-of-two or
             // 2048 bits, indexShape of Long species is S_MAX_BIT.
             // Assume that vector length is 2048, then the lane count of Long
             // vector is 32. When converting Long species to int species,
@@ -3451,7 +3457,7 @@ public abstract class LongVector extends AbstractVector<Long> {
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3463,7 +3469,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, long.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -3480,7 +3486,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     LongVector fromMemorySegment0Template(MemorySegment ms, long offset) {
         LongSpecies vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, LongVector::memorySegmentGet);
@@ -3496,7 +3502,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         LongSpecies vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, LongVector::memorySegmentGet);
@@ -3514,7 +3520,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     void intoArray0Template(long[] a, int offset) {
         LongSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -3531,7 +3537,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         m.check(species());
         LongSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -3559,14 +3565,14 @@ public abstract class LongVector extends AbstractVector<Long> {
         // Index vector: vix[0:n] = i -> offset + indexMap[mo + i]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For LongMaxVector,  if vector length  is 2048 bits, indexShape
+            // For LongVectorMax,  if vector length  is 2048 bits, indexShape
             // of Long species is S_MAX_BIT. and the lane count of Long
             // vector is 32. When converting Long species to int species,
             // indexShape is still S_MAX_BIT, but the lane count of int vector
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3579,7 +3585,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, m,
@@ -3598,7 +3604,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         LongSpecies vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -3615,7 +3621,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         LongSpecies vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -3653,6 +3659,18 @@ public abstract class LongVector extends AbstractVector<Long> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    LongVector swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+        int subLanesPerSrc = subLanesToSwap(srcSpecies);
+        if (subLanesPerSrc < 0) {
+            return this;
+        }
+        VectorShuffle<Long> shuffle = normalizeSubLanesForSpecies(this.vspecies(), subLanesPerSrc);
+        return (LongVector) this.rearrange(shuffle);
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_LONG_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -3819,7 +3837,7 @@ public abstract class LongVector extends AbstractVector<Long> {
         final LongVector broadcastBits(long bits) {
             return (LongVector)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, long.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -3992,13 +4010,13 @@ public abstract class LongVector extends AbstractVector<Long> {
         @Override
         @ForceInline
         public final LongVector zero() {
-            if ((Class<?>) vectorType() == LongMaxVector.class)
-                return LongMaxVector.ZERO;
+            if ((Class<?>) vectorType() == LongVectorMax.class)
+                return LongVectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return Long64Vector.ZERO;
-                case 128: return Long128Vector.ZERO;
-                case 256: return Long256Vector.ZERO;
-                case 512: return Long512Vector.ZERO;
+                case 64: return LongVector64.ZERO;
+                case 128: return LongVector128.ZERO;
+                case 256: return LongVector256.ZERO;
+                case 512: return LongVector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -4006,13 +4024,13 @@ public abstract class LongVector extends AbstractVector<Long> {
         @Override
         @ForceInline
         public final LongVector iota() {
-            if ((Class<?>) vectorType() == LongMaxVector.class)
-                return LongMaxVector.IOTA;
+            if ((Class<?>) vectorType() == LongVectorMax.class)
+                return LongVectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return Long64Vector.IOTA;
-                case 128: return Long128Vector.IOTA;
-                case 256: return Long256Vector.IOTA;
-                case 512: return Long512Vector.IOTA;
+                case 64: return LongVector64.IOTA;
+                case 128: return LongVector128.IOTA;
+                case 256: return LongVector256.IOTA;
+                case 512: return LongVector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -4021,13 +4039,13 @@ public abstract class LongVector extends AbstractVector<Long> {
         @Override
         @ForceInline
         public final VectorMask<Long> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == LongMaxVector.class)
-                return LongMaxVector.LongMaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == LongVectorMax.class)
+                return LongVectorMax.LongMaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return Long64Vector.Long64Mask.maskAll(bit);
-                case 128: return Long128Vector.Long128Mask.maskAll(bit);
-                case 256: return Long256Vector.Long256Mask.maskAll(bit);
-                case 512: return Long512Vector.Long512Mask.maskAll(bit);
+                case 64: return LongVector64.LongMask64.maskAll(bit);
+                case 128: return LongVector128.LongMask128.maskAll(bit);
+                case 256: return LongVector256.LongMask256.maskAll(bit);
+                case 512: return LongVector512.LongMask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -4055,42 +4073,42 @@ public abstract class LongVector extends AbstractVector<Long> {
     /** Species representing {@link LongVector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<Long> SPECIES_64
         = new LongSpecies(VectorShape.S_64_BIT,
-                            Long64Vector.class,
-                            Long64Vector.Long64Mask.class,
-                            Long64Vector.Long64Shuffle.class,
-                            Long64Vector::new);
+                            LongVector64.class,
+                            LongVector64.LongMask64.class,
+                            LongVector64.LongShuffle64.class,
+                            LongVector64::new);
 
     /** Species representing {@link LongVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<Long> SPECIES_128
         = new LongSpecies(VectorShape.S_128_BIT,
-                            Long128Vector.class,
-                            Long128Vector.Long128Mask.class,
-                            Long128Vector.Long128Shuffle.class,
-                            Long128Vector::new);
+                            LongVector128.class,
+                            LongVector128.LongMask128.class,
+                            LongVector128.LongShuffle128.class,
+                            LongVector128::new);
 
     /** Species representing {@link LongVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<Long> SPECIES_256
         = new LongSpecies(VectorShape.S_256_BIT,
-                            Long256Vector.class,
-                            Long256Vector.Long256Mask.class,
-                            Long256Vector.Long256Shuffle.class,
-                            Long256Vector::new);
+                            LongVector256.class,
+                            LongVector256.LongMask256.class,
+                            LongVector256.LongShuffle256.class,
+                            LongVector256::new);
 
     /** Species representing {@link LongVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<Long> SPECIES_512
         = new LongSpecies(VectorShape.S_512_BIT,
-                            Long512Vector.class,
-                            Long512Vector.Long512Mask.class,
-                            Long512Vector.Long512Shuffle.class,
-                            Long512Vector::new);
+                            LongVector512.class,
+                            LongVector512.LongMask512.class,
+                            LongVector512.LongShuffle512.class,
+                            LongVector512::new);
 
     /** Species representing {@link LongVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<Long> SPECIES_MAX
         = new LongSpecies(VectorShape.S_Max_BIT,
-                            LongMaxVector.class,
-                            LongMaxVector.LongMaxMask.class,
-                            LongMaxVector.LongMaxShuffle.class,
-                            LongMaxVector::new);
+                            LongVectorMax.class,
+                            LongVectorMax.LongMaskMax.class,
+                            LongVectorMax.LongShuffleMax.class,
+                            LongVectorMax::new);
 
     /**
      * Preferred species for {@link LongVector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector128.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector128.java
index 5a47153837a..f8dad12ff89 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector128.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Long128Vector extends LongVector {
+final class LongVector128 extends LongVector {
     static final LongSpecies VSPECIES =
         (LongSpecies) LongVector.SPECIES_128;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Long128Vector> VCLASS = Long128Vector.class;
+    static final Class<LongVector128> VCLASS = LongVector128.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Long> CTYPE = long.class; // carrier type used by the JVM
+
     static final Class<Long> ETYPE = long.class; // used by the JVM
 
-    Long128Vector(long[] v) {
+    LongVector128(long[] v) {
         super(v);
     }
 
-    // For compatibility as Long128Vector::new,
+    // For compatibility as LongVector128::new,
     // stored into species.vectorFactory.
-    Long128Vector(Object v) {
+    LongVector128(Object v) {
         this((long[]) v);
     }
 
-    static final Long128Vector ZERO = new Long128Vector(new long[VLENGTH]);
-    static final Long128Vector IOTA = new Long128Vector(VSPECIES.iotaArray());
+    static final LongVector128 ZERO = new LongVector128(new long[VLENGTH]);
+    static final LongVector128 IOTA = new LongVector128(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Long128Vector extends LongVector {
     @Override
     public final Class<Long> elementType() { return long.class; }
 
+    @ForceInline
+    final Class<Long> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Long.SIZE; }
@@ -119,50 +124,57 @@ final class Long128Vector extends LongVector {
         return (long[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Long128Vector broadcast(long e) {
-        return (Long128Vector) super.broadcastTemplate(e);  // specialize
+    public final LongVector128 broadcast(long e) {
+        return (LongVector128) super.broadcastTemplate(e);  // specialize
     }
 
 
     @Override
     @ForceInline
-    Long128Mask maskFromArray(boolean[] bits) {
-        return new Long128Mask(bits);
+    LongMask128 maskFromArray(boolean[] bits) {
+        return new LongMask128(bits);
     }
 
     @Override
     @ForceInline
-    Long128Shuffle iotaShuffle() { return Long128Shuffle.IOTA; }
+    LongShuffle128 iotaShuffle() { return LongShuffle128.IOTA; }
 
     @Override
     @ForceInline
-    Long128Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Long128Shuffle) iotaShuffleTemplate(start, step, wrap);
+    LongShuffle128 iotaShuffle(int start, int step, boolean wrap) {
+        return (LongShuffle128) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Long128Shuffle shuffleFromArray(int[] indices, int i) { return new Long128Shuffle(indices, i); }
+    LongShuffle128 shuffleFromArray(int[] indices, int i) { return new LongShuffle128(indices, i); }
 
     @Override
     @ForceInline
-    Long128Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Long128Shuffle(fn); }
+    LongShuffle128 shuffleFromOp(IntUnaryOperator fn) { return new LongShuffle128(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Long128Vector vectorFactory(long[] vec) {
-        return new Long128Vector(vec);
+    LongVector128 vectorFactory(long[] vec) {
+        return new LongVector128(vec);
     }
 
     @ForceInline
     final @Override
-    Byte128Vector asByteVectorRaw() {
-        return (Byte128Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector128 asByteVectorRaw() {
+        return (ByteVector128) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -175,31 +187,31 @@ final class Long128Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long128Vector uOp(FUnOp f) {
-        return (Long128Vector) super.uOpTemplate(f);  // specialize
+    LongVector128 uOp(FUnOp f) {
+        return (LongVector128) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long128Vector uOp(VectorMask<Long> m, FUnOp f) {
-        return (Long128Vector)
-            super.uOpTemplate((Long128Mask)m, f);  // specialize
+    LongVector128 uOp(VectorMask<Long> m, FUnOp f) {
+        return (LongVector128)
+            super.uOpTemplate((LongMask128)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Long128Vector bOp(Vector<Long> v, FBinOp f) {
-        return (Long128Vector) super.bOpTemplate((Long128Vector)v, f);  // specialize
+    LongVector128 bOp(Vector<Long> v, FBinOp f) {
+        return (LongVector128) super.bOpTemplate((LongVector128)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long128Vector bOp(Vector<Long> v,
+    LongVector128 bOp(Vector<Long> v,
                      VectorMask<Long> m, FBinOp f) {
-        return (Long128Vector)
-            super.bOpTemplate((Long128Vector)v, (Long128Mask)m,
+        return (LongVector128)
+            super.bOpTemplate((LongVector128)v, (LongMask128)m,
                               f);  // specialize
     }
 
@@ -207,19 +219,19 @@ final class Long128Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long128Vector tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
-        return (Long128Vector)
-            super.tOpTemplate((Long128Vector)v1, (Long128Vector)v2,
+    LongVector128 tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
+        return (LongVector128)
+            super.tOpTemplate((LongVector128)v1, (LongVector128)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long128Vector tOp(Vector<Long> v1, Vector<Long> v2,
+    LongVector128 tOp(Vector<Long> v1, Vector<Long> v2,
                      VectorMask<Long> m, FTriOp f) {
-        return (Long128Vector)
-            super.tOpTemplate((Long128Vector)v1, (Long128Vector)v2,
-                              (Long128Mask)m, f);  // specialize
+        return (LongVector128)
+            super.tOpTemplate((LongVector128)v1, (LongVector128)v2,
+                              (LongMask128)m, f);  // specialize
     }
 
     @ForceInline
@@ -257,64 +269,64 @@ final class Long128Vector extends LongVector {
 
     @Override
     @ForceInline
-    public Long128Vector lanewise(Unary op) {
-        return (Long128Vector) super.lanewiseTemplate(op);  // specialize
+    public LongVector128 lanewise(Unary op) {
+        return (LongVector128) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector lanewise(Unary op, VectorMask<Long> m) {
-        return (Long128Vector) super.lanewiseTemplate(op, Long128Mask.class, (Long128Mask) m);  // specialize
+    public LongVector128 lanewise(Unary op, VectorMask<Long> m) {
+        return (LongVector128) super.lanewiseTemplate(op, LongMask128.class, (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector lanewise(Binary op, Vector<Long> v) {
-        return (Long128Vector) super.lanewiseTemplate(op, v);  // specialize
+    public LongVector128 lanewise(Binary op, Vector<Long> v) {
+        return (LongVector128) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
-        return (Long128Vector) super.lanewiseTemplate(op, Long128Mask.class, v, (Long128Mask) m);  // specialize
+    public LongVector128 lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector128) super.lanewiseTemplate(op, LongMask128.class, v, (LongMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long128Vector
+    @ForceInline LongVector128
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Long128Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (LongVector128) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long128Vector
+    @ForceInline LongVector128
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Long> m) {
-        return (Long128Vector) super.lanewiseShiftTemplate(op, Long128Mask.class, e, (Long128Mask) m);  // specialize
+        return (LongVector128) super.lanewiseShiftTemplate(op, LongMask128.class, e, (LongMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Long128Vector
+    LongVector128
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2) {
-        return (Long128Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (LongVector128) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long128Vector
+    LongVector128
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2, VectorMask<Long> m) {
-        return (Long128Vector) super.lanewiseTemplate(op, Long128Mask.class, v1, v2, (Long128Mask) m);  // specialize
+        return (LongVector128) super.lanewiseTemplate(op, LongMask128.class, v1, v2, (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long128Vector addIndex(int scale) {
-        return (Long128Vector) super.addIndexTemplate(scale);  // specialize
+    LongVector128 addIndex(int scale) {
+        return (LongVector128) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -329,7 +341,7 @@ final class Long128Vector extends LongVector {
     @ForceInline
     public final long reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Long> m) {
-        return super.reduceLanesTemplate(op, Long128Mask.class, (Long128Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, LongMask128.class, (LongMask128) m);  // specialized
     }
 
     @Override
@@ -342,7 +354,7 @@ final class Long128Vector extends LongVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Long> m) {
-        return (long) super.reduceLanesTemplate(op, Long128Mask.class, (Long128Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, LongMask128.class, (LongMask128) m);  // specialized
     }
 
     @Override
@@ -353,155 +365,155 @@ final class Long128Vector extends LongVector {
 
     @Override
     @ForceInline
-    public final Long128Shuffle toShuffle() {
-        return (Long128Shuffle) toShuffle(vspecies(), false);
+    public final LongShuffle128 toShuffle() {
+        return (LongShuffle128) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Long128Mask test(Test op) {
-        return super.testTemplate(Long128Mask.class, op);  // specialize
+    public final LongMask128 test(Test op) {
+        return super.testTemplate(LongMask128.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long128Mask test(Test op, VectorMask<Long> m) {
-        return super.testTemplate(Long128Mask.class, op, (Long128Mask) m);  // specialize
+    public final LongMask128 test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(LongMask128.class, op, (LongMask128) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Long128Mask compare(Comparison op, Vector<Long> v) {
-        return super.compareTemplate(Long128Mask.class, op, v);  // specialize
+    public final LongMask128 compare(Comparison op, Vector<Long> v) {
+        return super.compareTemplate(LongMask128.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long128Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Long128Mask.class, op, s);  // specialize
+    public final LongMask128 compare(Comparison op, long s) {
+        return super.compareTemplate(LongMask128.class, op, s);  // specialize
     }
 
 
     @Override
     @ForceInline
-    public final Long128Mask compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
-        return super.compareTemplate(Long128Mask.class, op, v, (Long128Mask) m);
+    public final LongMask128 compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
+        return super.compareTemplate(LongMask128.class, op, v, (LongMask128) m);
     }
 
 
     @Override
     @ForceInline
-    public Long128Vector blend(Vector<Long> v, VectorMask<Long> m) {
-        return (Long128Vector)
-            super.blendTemplate(Long128Mask.class,
-                                (Long128Vector) v,
-                                (Long128Mask) m);  // specialize
+    public LongVector128 blend(Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector128)
+            super.blendTemplate(LongMask128.class,
+                                (LongVector128) v,
+                                (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector slice(int origin, Vector<Long> v) {
-        return (Long128Vector) super.sliceTemplate(origin, v);  // specialize
+    public LongVector128 slice(int origin, Vector<Long> v) {
+        return (LongVector128) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector slice(int origin) {
-        return (Long128Vector) super.sliceTemplate(origin);  // specialize
+    public LongVector128 slice(int origin) {
+        return (LongVector128) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector unslice(int origin, Vector<Long> w, int part) {
-        return (Long128Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public LongVector128 unslice(int origin, Vector<Long> w, int part) {
+        return (LongVector128) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
-        return (Long128Vector)
-            super.unsliceTemplate(Long128Mask.class,
+    public LongVector128 unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
+        return (LongVector128)
+            super.unsliceTemplate(LongMask128.class,
                                   origin, w, part,
-                                  (Long128Mask) m);  // specialize
+                                  (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector unslice(int origin) {
-        return (Long128Vector) super.unsliceTemplate(origin);  // specialize
+    public LongVector128 unslice(int origin) {
+        return (LongVector128) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector rearrange(VectorShuffle<Long> s) {
-        return (Long128Vector)
-            super.rearrangeTemplate(Long128Shuffle.class,
-                                    (Long128Shuffle) s);  // specialize
+    public LongVector128 rearrange(VectorShuffle<Long> s) {
+        return (LongVector128)
+            super.rearrangeTemplate(LongShuffle128.class,
+                                    (LongShuffle128) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector rearrange(VectorShuffle<Long> shuffle,
+    public LongVector128 rearrange(VectorShuffle<Long> shuffle,
                                   VectorMask<Long> m) {
-        return (Long128Vector)
-            super.rearrangeTemplate(Long128Shuffle.class,
-                                    Long128Mask.class,
-                                    (Long128Shuffle) shuffle,
-                                    (Long128Mask) m);  // specialize
+        return (LongVector128)
+            super.rearrangeTemplate(LongShuffle128.class,
+                                    LongMask128.class,
+                                    (LongShuffle128) shuffle,
+                                    (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector rearrange(VectorShuffle<Long> s,
+    public LongVector128 rearrange(VectorShuffle<Long> s,
                                   Vector<Long> v) {
-        return (Long128Vector)
-            super.rearrangeTemplate(Long128Shuffle.class,
-                                    (Long128Shuffle) s,
-                                    (Long128Vector) v);  // specialize
+        return (LongVector128)
+            super.rearrangeTemplate(LongShuffle128.class,
+                                    (LongShuffle128) s,
+                                    (LongVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector compress(VectorMask<Long> m) {
-        return (Long128Vector)
-            super.compressTemplate(Long128Mask.class,
-                                   (Long128Mask) m);  // specialize
+    public LongVector128 compress(VectorMask<Long> m) {
+        return (LongVector128)
+            super.compressTemplate(LongMask128.class,
+                                   (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector expand(VectorMask<Long> m) {
-        return (Long128Vector)
-            super.expandTemplate(Long128Mask.class,
-                                   (Long128Mask) m);  // specialize
+    public LongVector128 expand(VectorMask<Long> m) {
+        return (LongVector128)
+            super.expandTemplate(LongMask128.class,
+                                   (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector selectFrom(Vector<Long> v) {
-        return (Long128Vector)
-            super.selectFromTemplate((Long128Vector) v);  // specialize
+    public LongVector128 selectFrom(Vector<Long> v) {
+        return (LongVector128)
+            super.selectFromTemplate((LongVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector selectFrom(Vector<Long> v,
+    public LongVector128 selectFrom(Vector<Long> v,
                                    VectorMask<Long> m) {
-        return (Long128Vector)
-            super.selectFromTemplate((Long128Vector) v,
-                                     Long128Mask.class, (Long128Mask) m);  // specialize
+        return (LongVector128)
+            super.selectFromTemplate((LongVector128) v,
+                                     LongMask128.class, (LongMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long128Vector selectFrom(Vector<Long> v1,
+    public LongVector128 selectFrom(Vector<Long> v1,
                                    Vector<Long> v2) {
-        return (Long128Vector)
-            super.selectFromTemplate((Long128Vector) v1, (Long128Vector) v2);  // specialize
+        return (LongVector128)
+            super.selectFromTemplate((LongVector128) v1, (LongVector128) v2);  // specialize
     }
 
     @ForceInline
@@ -517,7 +529,7 @@ final class Long128Vector extends LongVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     long[] vecarr = vec.vec();
@@ -527,7 +539,7 @@ final class Long128Vector extends LongVector {
 
     @ForceInline
     @Override
-    public Long128Vector withLane(int i, long e) {
+    public LongVector128 withLane(int i, long e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -536,9 +548,9 @@ final class Long128Vector extends LongVector {
     }
 
     @ForceInline
-    public Long128Vector withLaneHelper(int i, long e) {
+    public LongVector128 withLaneHelper(int i, long e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     long[] res = v.vec().clone();
@@ -549,19 +561,20 @@ final class Long128Vector extends LongVector {
 
     // Mask
 
-    static final class Long128Mask extends AbstractMask<Long> {
+    static final class LongMask128 extends AbstractMask<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long128Mask(boolean[] bits) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongMask128(boolean[] bits) {
             this(bits, 0);
         }
 
-        Long128Mask(boolean[] bits, int offset) {
+        LongMask128(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Long128Mask(boolean val) {
+        LongMask128(boolean val) {
             super(prepare(val));
         }
 
@@ -594,31 +607,31 @@ final class Long128Vector extends LongVector {
         }
 
         @Override
-        Long128Mask uOp(MUnOp f) {
+        LongMask128 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Long128Mask(res);
+            return new LongMask128(res);
         }
 
         @Override
-        Long128Mask bOp(VectorMask<Long> m, MBinOp f) {
+        LongMask128 bOp(VectorMask<Long> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Long128Mask)m).getBits();
+            boolean[] mbits = ((LongMask128)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Long128Mask(res);
+            return new LongMask128(res);
         }
 
         @ForceInline
         @Override
         public final
-        Long128Vector toVector() {
-            return (Long128Vector) super.toVectorTemplate();  // specialize
+        LongVector128 toVector() {
+            return (LongVector128) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -642,8 +655,8 @@ final class Long128Vector extends LongVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -651,25 +664,25 @@ final class Long128Vector extends LongVector {
         @Override
         @ForceInline
         /*package-private*/
-        Long128Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Long128Mask) VectorSupport.indexPartiallyInUpperRange(
-                Long128Mask.class, long.class, VLENGTH, offset, limit,
-                (o, l) -> (Long128Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        LongMask128 indexPartiallyInUpperRange(long offset, long limit) {
+            return (LongMask128) VectorSupport.indexPartiallyInUpperRange(
+                LongMask128.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (LongMask128) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Long128Mask not() {
+        public LongMask128 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Long128Mask compress() {
-            return (Long128Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Long128Vector.class, Long128Mask.class, ETYPE, VLENGTH, null, this,
+        public LongMask128 compress() {
+            return (LongMask128)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                LongVector128.class, LongMask128.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -678,30 +691,30 @@ final class Long128Vector extends LongVector {
 
         @Override
         @ForceInline
-        public Long128Mask and(VectorMask<Long> mask) {
+        public LongMask128 and(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long128Mask m = (Long128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Long128Mask.class, null, long.class, VLENGTH,
+            LongMask128 m = (LongMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, LongMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Long128Mask or(VectorMask<Long> mask) {
+        public LongMask128 or(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long128Mask m = (Long128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Long128Mask.class, null, long.class, VLENGTH,
+            LongMask128 m = (LongMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, LongMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Long128Mask xor(VectorMask<Long> mask) {
+        public LongMask128 xor(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long128Mask m = (Long128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Long128Mask.class, null, long.class, VLENGTH,
+            LongMask128 m = (LongMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, LongMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -711,21 +724,21 @@ final class Long128Vector extends LongVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Long128Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Long128Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Long128Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -735,7 +748,7 @@ final class Long128Vector extends LongVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Long128Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -745,7 +758,7 @@ final class Long128Vector extends LongVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Long128Mask.class, long.class, VLENGTH,
+            return VectorSupport.extract(LongMask128.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -754,48 +767,49 @@ final class Long128Vector extends LongVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Long128Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Long128Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((LongMask128)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Long128Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Long128Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((LongMask128)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Long128Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Long128Mask.class, long.class, VLENGTH,
+        static LongMask128 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(LongMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Long128Mask  TRUE_MASK = new Long128Mask(true);
-        private static final Long128Mask FALSE_MASK = new Long128Mask(false);
+        private static final LongMask128  TRUE_MASK = new LongMask128(true);
+        private static final LongMask128 FALSE_MASK = new LongMask128(false);
 
     }
 
     // Shuffle
 
-    static final class Long128Shuffle extends AbstractShuffle<Long> {
+    static final class LongShuffle128 extends AbstractShuffle<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long128Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongShuffle128(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Long128Shuffle(int[] indices, int i) {
+        LongShuffle128(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Long128Shuffle(IntUnaryOperator fn) {
+        LongShuffle128(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -815,23 +829,23 @@ final class Long128Vector extends LongVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Long128Shuffle IOTA = new Long128Shuffle(IDENTITY);
+        static final LongShuffle128 IOTA = new LongShuffle128(IDENTITY);
 
         @Override
         @ForceInline
-        public Long128Vector toVector() {
+        public LongVector128 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Long128Vector toBitsVector() {
-            return (Long128Vector) super.toBitsVectorTemplate();
+        LongVector128 toBitsVector() {
+            return (LongVector128) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long128Vector toBitsVector0() {
-            return ((Long128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector128 toBitsVector0() {
+            return ((LongVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -903,30 +917,30 @@ final class Long128Vector extends LongVector {
 
         @Override
         @ForceInline
-        public final Long128Mask laneIsValid() {
-            return (Long128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final LongMask128 laneIsValid() {
+            return (LongMask128) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Long128Shuffle rearrange(VectorShuffle<Long> shuffle) {
-            Long128Shuffle concreteShuffle = (Long128Shuffle) shuffle;
-            return (Long128Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final LongShuffle128 rearrange(VectorShuffle<Long> shuffle) {
+            LongShuffle128 concreteShuffle = (LongShuffle128) shuffle;
+            return (LongShuffle128) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Long128Shuffle wrapIndexes() {
-            Long128Vector v = toBitsVector();
+        public final LongShuffle128 wrapIndexes() {
+            LongVector128 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector128) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector128) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Long128Shuffle) v.toShuffle(vspecies(), false);
+            return (LongShuffle128) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -977,14 +991,14 @@ final class Long128Vector extends LongVector {
     @Override
     final
     LongVector fromArray0(long[] a, int offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromArray0Template(Long128Mask.class, a, offset, (Long128Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(LongMask128.class, a, offset, (LongMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     LongVector fromArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        return super.fromArray0Template(Long128Mask.class, a, offset, indexMap, mapOffset, (Long128Mask) m);
+        return super.fromArray0Template(LongMask128.class, a, offset, indexMap, mapOffset, (LongMask128) m);
     }
 
 
@@ -1000,7 +1014,7 @@ final class Long128Vector extends LongVector {
     @Override
     final
     LongVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Long128Mask.class, ms, offset, (Long128Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(LongMask128.class, ms, offset, (LongMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1014,14 +1028,14 @@ final class Long128Vector extends LongVector {
     @Override
     final
     void intoArray0(long[] a, int offset, VectorMask<Long> m) {
-        super.intoArray0Template(Long128Mask.class, a, offset, (Long128Mask) m);
+        super.intoArray0Template(LongMask128.class, a, offset, (LongMask128) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        super.intoArray0Template(Long128Mask.class, a, offset, indexMap, mapOffset, (Long128Mask) m);
+        super.intoArray0Template(LongMask128.class, a, offset, indexMap, mapOffset, (LongMask128) m);
     }
 
 
@@ -1029,7 +1043,7 @@ final class Long128Vector extends LongVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m) {
-        super.intoMemorySegment0Template(Long128Mask.class, ms, offset, (Long128Mask) m);
+        super.intoMemorySegment0Template(LongMask128.class, ms, offset, (LongMask128) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector256.java
similarity index 66%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector256.java
index 9c3ff7627cc..144e2c1c64d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Long256Vector extends LongVector {
+final class LongVector256 extends LongVector {
     static final LongSpecies VSPECIES =
         (LongSpecies) LongVector.SPECIES_256;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Long256Vector> VCLASS = Long256Vector.class;
+    static final Class<LongVector256> VCLASS = LongVector256.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Long> CTYPE = long.class; // carrier type used by the JVM
+
     static final Class<Long> ETYPE = long.class; // used by the JVM
 
-    Long256Vector(long[] v) {
+    LongVector256(long[] v) {
         super(v);
     }
 
-    // For compatibility as Long256Vector::new,
+    // For compatibility as LongVector256::new,
     // stored into species.vectorFactory.
-    Long256Vector(Object v) {
+    LongVector256(Object v) {
         this((long[]) v);
     }
 
-    static final Long256Vector ZERO = new Long256Vector(new long[VLENGTH]);
-    static final Long256Vector IOTA = new Long256Vector(VSPECIES.iotaArray());
+    static final LongVector256 ZERO = new LongVector256(new long[VLENGTH]);
+    static final LongVector256 IOTA = new LongVector256(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Long256Vector extends LongVector {
     @Override
     public final Class<Long> elementType() { return long.class; }
 
+    @ForceInline
+    final Class<Long> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Long.SIZE; }
@@ -119,50 +124,57 @@ final class Long256Vector extends LongVector {
         return (long[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Long256Vector broadcast(long e) {
-        return (Long256Vector) super.broadcastTemplate(e);  // specialize
+    public final LongVector256 broadcast(long e) {
+        return (LongVector256) super.broadcastTemplate(e);  // specialize
     }
 
 
     @Override
     @ForceInline
-    Long256Mask maskFromArray(boolean[] bits) {
-        return new Long256Mask(bits);
+    LongMask256 maskFromArray(boolean[] bits) {
+        return new LongMask256(bits);
     }
 
     @Override
     @ForceInline
-    Long256Shuffle iotaShuffle() { return Long256Shuffle.IOTA; }
+    LongShuffle256 iotaShuffle() { return LongShuffle256.IOTA; }
 
     @Override
     @ForceInline
-    Long256Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Long256Shuffle) iotaShuffleTemplate(start, step, wrap);
+    LongShuffle256 iotaShuffle(int start, int step, boolean wrap) {
+        return (LongShuffle256) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Long256Shuffle shuffleFromArray(int[] indices, int i) { return new Long256Shuffle(indices, i); }
+    LongShuffle256 shuffleFromArray(int[] indices, int i) { return new LongShuffle256(indices, i); }
 
     @Override
     @ForceInline
-    Long256Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Long256Shuffle(fn); }
+    LongShuffle256 shuffleFromOp(IntUnaryOperator fn) { return new LongShuffle256(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Long256Vector vectorFactory(long[] vec) {
-        return new Long256Vector(vec);
+    LongVector256 vectorFactory(long[] vec) {
+        return new LongVector256(vec);
     }
 
     @ForceInline
     final @Override
-    Byte256Vector asByteVectorRaw() {
-        return (Byte256Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector256 asByteVectorRaw() {
+        return (ByteVector256) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -175,31 +187,31 @@ final class Long256Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long256Vector uOp(FUnOp f) {
-        return (Long256Vector) super.uOpTemplate(f);  // specialize
+    LongVector256 uOp(FUnOp f) {
+        return (LongVector256) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long256Vector uOp(VectorMask<Long> m, FUnOp f) {
-        return (Long256Vector)
-            super.uOpTemplate((Long256Mask)m, f);  // specialize
+    LongVector256 uOp(VectorMask<Long> m, FUnOp f) {
+        return (LongVector256)
+            super.uOpTemplate((LongMask256)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Long256Vector bOp(Vector<Long> v, FBinOp f) {
-        return (Long256Vector) super.bOpTemplate((Long256Vector)v, f);  // specialize
+    LongVector256 bOp(Vector<Long> v, FBinOp f) {
+        return (LongVector256) super.bOpTemplate((LongVector256)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long256Vector bOp(Vector<Long> v,
+    LongVector256 bOp(Vector<Long> v,
                      VectorMask<Long> m, FBinOp f) {
-        return (Long256Vector)
-            super.bOpTemplate((Long256Vector)v, (Long256Mask)m,
+        return (LongVector256)
+            super.bOpTemplate((LongVector256)v, (LongMask256)m,
                               f);  // specialize
     }
 
@@ -207,19 +219,19 @@ final class Long256Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long256Vector tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
-        return (Long256Vector)
-            super.tOpTemplate((Long256Vector)v1, (Long256Vector)v2,
+    LongVector256 tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
+        return (LongVector256)
+            super.tOpTemplate((LongVector256)v1, (LongVector256)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long256Vector tOp(Vector<Long> v1, Vector<Long> v2,
+    LongVector256 tOp(Vector<Long> v1, Vector<Long> v2,
                      VectorMask<Long> m, FTriOp f) {
-        return (Long256Vector)
-            super.tOpTemplate((Long256Vector)v1, (Long256Vector)v2,
-                              (Long256Mask)m, f);  // specialize
+        return (LongVector256)
+            super.tOpTemplate((LongVector256)v1, (LongVector256)v2,
+                              (LongMask256)m, f);  // specialize
     }
 
     @ForceInline
@@ -257,64 +269,64 @@ final class Long256Vector extends LongVector {
 
     @Override
     @ForceInline
-    public Long256Vector lanewise(Unary op) {
-        return (Long256Vector) super.lanewiseTemplate(op);  // specialize
+    public LongVector256 lanewise(Unary op) {
+        return (LongVector256) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector lanewise(Unary op, VectorMask<Long> m) {
-        return (Long256Vector) super.lanewiseTemplate(op, Long256Mask.class, (Long256Mask) m);  // specialize
+    public LongVector256 lanewise(Unary op, VectorMask<Long> m) {
+        return (LongVector256) super.lanewiseTemplate(op, LongMask256.class, (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector lanewise(Binary op, Vector<Long> v) {
-        return (Long256Vector) super.lanewiseTemplate(op, v);  // specialize
+    public LongVector256 lanewise(Binary op, Vector<Long> v) {
+        return (LongVector256) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
-        return (Long256Vector) super.lanewiseTemplate(op, Long256Mask.class, v, (Long256Mask) m);  // specialize
+    public LongVector256 lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector256) super.lanewiseTemplate(op, LongMask256.class, v, (LongMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long256Vector
+    @ForceInline LongVector256
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Long256Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (LongVector256) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long256Vector
+    @ForceInline LongVector256
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Long> m) {
-        return (Long256Vector) super.lanewiseShiftTemplate(op, Long256Mask.class, e, (Long256Mask) m);  // specialize
+        return (LongVector256) super.lanewiseShiftTemplate(op, LongMask256.class, e, (LongMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Long256Vector
+    LongVector256
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2) {
-        return (Long256Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (LongVector256) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long256Vector
+    LongVector256
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2, VectorMask<Long> m) {
-        return (Long256Vector) super.lanewiseTemplate(op, Long256Mask.class, v1, v2, (Long256Mask) m);  // specialize
+        return (LongVector256) super.lanewiseTemplate(op, LongMask256.class, v1, v2, (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long256Vector addIndex(int scale) {
-        return (Long256Vector) super.addIndexTemplate(scale);  // specialize
+    LongVector256 addIndex(int scale) {
+        return (LongVector256) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -329,7 +341,7 @@ final class Long256Vector extends LongVector {
     @ForceInline
     public final long reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Long> m) {
-        return super.reduceLanesTemplate(op, Long256Mask.class, (Long256Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, LongMask256.class, (LongMask256) m);  // specialized
     }
 
     @Override
@@ -342,7 +354,7 @@ final class Long256Vector extends LongVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Long> m) {
-        return (long) super.reduceLanesTemplate(op, Long256Mask.class, (Long256Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, LongMask256.class, (LongMask256) m);  // specialized
     }
 
     @Override
@@ -353,155 +365,155 @@ final class Long256Vector extends LongVector {
 
     @Override
     @ForceInline
-    public final Long256Shuffle toShuffle() {
-        return (Long256Shuffle) toShuffle(vspecies(), false);
+    public final LongShuffle256 toShuffle() {
+        return (LongShuffle256) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Long256Mask test(Test op) {
-        return super.testTemplate(Long256Mask.class, op);  // specialize
+    public final LongMask256 test(Test op) {
+        return super.testTemplate(LongMask256.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long256Mask test(Test op, VectorMask<Long> m) {
-        return super.testTemplate(Long256Mask.class, op, (Long256Mask) m);  // specialize
+    public final LongMask256 test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(LongMask256.class, op, (LongMask256) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Long256Mask compare(Comparison op, Vector<Long> v) {
-        return super.compareTemplate(Long256Mask.class, op, v);  // specialize
+    public final LongMask256 compare(Comparison op, Vector<Long> v) {
+        return super.compareTemplate(LongMask256.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long256Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Long256Mask.class, op, s);  // specialize
+    public final LongMask256 compare(Comparison op, long s) {
+        return super.compareTemplate(LongMask256.class, op, s);  // specialize
     }
 
 
     @Override
     @ForceInline
-    public final Long256Mask compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
-        return super.compareTemplate(Long256Mask.class, op, v, (Long256Mask) m);
+    public final LongMask256 compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
+        return super.compareTemplate(LongMask256.class, op, v, (LongMask256) m);
     }
 
 
     @Override
     @ForceInline
-    public Long256Vector blend(Vector<Long> v, VectorMask<Long> m) {
-        return (Long256Vector)
-            super.blendTemplate(Long256Mask.class,
-                                (Long256Vector) v,
-                                (Long256Mask) m);  // specialize
+    public LongVector256 blend(Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector256)
+            super.blendTemplate(LongMask256.class,
+                                (LongVector256) v,
+                                (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector slice(int origin, Vector<Long> v) {
-        return (Long256Vector) super.sliceTemplate(origin, v);  // specialize
+    public LongVector256 slice(int origin, Vector<Long> v) {
+        return (LongVector256) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector slice(int origin) {
-        return (Long256Vector) super.sliceTemplate(origin);  // specialize
+    public LongVector256 slice(int origin) {
+        return (LongVector256) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector unslice(int origin, Vector<Long> w, int part) {
-        return (Long256Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public LongVector256 unslice(int origin, Vector<Long> w, int part) {
+        return (LongVector256) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
-        return (Long256Vector)
-            super.unsliceTemplate(Long256Mask.class,
+    public LongVector256 unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
+        return (LongVector256)
+            super.unsliceTemplate(LongMask256.class,
                                   origin, w, part,
-                                  (Long256Mask) m);  // specialize
+                                  (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector unslice(int origin) {
-        return (Long256Vector) super.unsliceTemplate(origin);  // specialize
+    public LongVector256 unslice(int origin) {
+        return (LongVector256) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector rearrange(VectorShuffle<Long> s) {
-        return (Long256Vector)
-            super.rearrangeTemplate(Long256Shuffle.class,
-                                    (Long256Shuffle) s);  // specialize
+    public LongVector256 rearrange(VectorShuffle<Long> s) {
+        return (LongVector256)
+            super.rearrangeTemplate(LongShuffle256.class,
+                                    (LongShuffle256) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector rearrange(VectorShuffle<Long> shuffle,
+    public LongVector256 rearrange(VectorShuffle<Long> shuffle,
                                   VectorMask<Long> m) {
-        return (Long256Vector)
-            super.rearrangeTemplate(Long256Shuffle.class,
-                                    Long256Mask.class,
-                                    (Long256Shuffle) shuffle,
-                                    (Long256Mask) m);  // specialize
+        return (LongVector256)
+            super.rearrangeTemplate(LongShuffle256.class,
+                                    LongMask256.class,
+                                    (LongShuffle256) shuffle,
+                                    (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector rearrange(VectorShuffle<Long> s,
+    public LongVector256 rearrange(VectorShuffle<Long> s,
                                   Vector<Long> v) {
-        return (Long256Vector)
-            super.rearrangeTemplate(Long256Shuffle.class,
-                                    (Long256Shuffle) s,
-                                    (Long256Vector) v);  // specialize
+        return (LongVector256)
+            super.rearrangeTemplate(LongShuffle256.class,
+                                    (LongShuffle256) s,
+                                    (LongVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector compress(VectorMask<Long> m) {
-        return (Long256Vector)
-            super.compressTemplate(Long256Mask.class,
-                                   (Long256Mask) m);  // specialize
+    public LongVector256 compress(VectorMask<Long> m) {
+        return (LongVector256)
+            super.compressTemplate(LongMask256.class,
+                                   (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector expand(VectorMask<Long> m) {
-        return (Long256Vector)
-            super.expandTemplate(Long256Mask.class,
-                                   (Long256Mask) m);  // specialize
+    public LongVector256 expand(VectorMask<Long> m) {
+        return (LongVector256)
+            super.expandTemplate(LongMask256.class,
+                                   (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector selectFrom(Vector<Long> v) {
-        return (Long256Vector)
-            super.selectFromTemplate((Long256Vector) v);  // specialize
+    public LongVector256 selectFrom(Vector<Long> v) {
+        return (LongVector256)
+            super.selectFromTemplate((LongVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector selectFrom(Vector<Long> v,
+    public LongVector256 selectFrom(Vector<Long> v,
                                    VectorMask<Long> m) {
-        return (Long256Vector)
-            super.selectFromTemplate((Long256Vector) v,
-                                     Long256Mask.class, (Long256Mask) m);  // specialize
+        return (LongVector256)
+            super.selectFromTemplate((LongVector256) v,
+                                     LongMask256.class, (LongMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long256Vector selectFrom(Vector<Long> v1,
+    public LongVector256 selectFrom(Vector<Long> v1,
                                    Vector<Long> v2) {
-        return (Long256Vector)
-            super.selectFromTemplate((Long256Vector) v1, (Long256Vector) v2);  // specialize
+        return (LongVector256)
+            super.selectFromTemplate((LongVector256) v1, (LongVector256) v2);  // specialize
     }
 
     @ForceInline
@@ -519,7 +531,7 @@ final class Long256Vector extends LongVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     long[] vecarr = vec.vec();
@@ -529,7 +541,7 @@ final class Long256Vector extends LongVector {
 
     @ForceInline
     @Override
-    public Long256Vector withLane(int i, long e) {
+    public LongVector256 withLane(int i, long e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -540,9 +552,9 @@ final class Long256Vector extends LongVector {
     }
 
     @ForceInline
-    public Long256Vector withLaneHelper(int i, long e) {
+    public LongVector256 withLaneHelper(int i, long e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     long[] res = v.vec().clone();
@@ -553,19 +565,20 @@ final class Long256Vector extends LongVector {
 
     // Mask
 
-    static final class Long256Mask extends AbstractMask<Long> {
+    static final class LongMask256 extends AbstractMask<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long256Mask(boolean[] bits) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongMask256(boolean[] bits) {
             this(bits, 0);
         }
 
-        Long256Mask(boolean[] bits, int offset) {
+        LongMask256(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Long256Mask(boolean val) {
+        LongMask256(boolean val) {
             super(prepare(val));
         }
 
@@ -598,31 +611,31 @@ final class Long256Vector extends LongVector {
         }
 
         @Override
-        Long256Mask uOp(MUnOp f) {
+        LongMask256 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Long256Mask(res);
+            return new LongMask256(res);
         }
 
         @Override
-        Long256Mask bOp(VectorMask<Long> m, MBinOp f) {
+        LongMask256 bOp(VectorMask<Long> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Long256Mask)m).getBits();
+            boolean[] mbits = ((LongMask256)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Long256Mask(res);
+            return new LongMask256(res);
         }
 
         @ForceInline
         @Override
         public final
-        Long256Vector toVector() {
-            return (Long256Vector) super.toVectorTemplate();  // specialize
+        LongVector256 toVector() {
+            return (LongVector256) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -646,8 +659,8 @@ final class Long256Vector extends LongVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -655,25 +668,25 @@ final class Long256Vector extends LongVector {
         @Override
         @ForceInline
         /*package-private*/
-        Long256Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Long256Mask) VectorSupport.indexPartiallyInUpperRange(
-                Long256Mask.class, long.class, VLENGTH, offset, limit,
-                (o, l) -> (Long256Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        LongMask256 indexPartiallyInUpperRange(long offset, long limit) {
+            return (LongMask256) VectorSupport.indexPartiallyInUpperRange(
+                LongMask256.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (LongMask256) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Long256Mask not() {
+        public LongMask256 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Long256Mask compress() {
-            return (Long256Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Long256Vector.class, Long256Mask.class, ETYPE, VLENGTH, null, this,
+        public LongMask256 compress() {
+            return (LongMask256)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                LongVector256.class, LongMask256.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -682,30 +695,30 @@ final class Long256Vector extends LongVector {
 
         @Override
         @ForceInline
-        public Long256Mask and(VectorMask<Long> mask) {
+        public LongMask256 and(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long256Mask m = (Long256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Long256Mask.class, null, long.class, VLENGTH,
+            LongMask256 m = (LongMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, LongMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Long256Mask or(VectorMask<Long> mask) {
+        public LongMask256 or(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long256Mask m = (Long256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Long256Mask.class, null, long.class, VLENGTH,
+            LongMask256 m = (LongMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, LongMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Long256Mask xor(VectorMask<Long> mask) {
+        public LongMask256 xor(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long256Mask m = (Long256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Long256Mask.class, null, long.class, VLENGTH,
+            LongMask256 m = (LongMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, LongMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -715,21 +728,21 @@ final class Long256Vector extends LongVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Long256Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Long256Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Long256Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -739,7 +752,7 @@ final class Long256Vector extends LongVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Long256Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -749,7 +762,7 @@ final class Long256Vector extends LongVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Long256Mask.class, long.class, VLENGTH,
+            return VectorSupport.extract(LongMask256.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -758,48 +771,49 @@ final class Long256Vector extends LongVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Long256Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Long256Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((LongMask256)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Long256Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Long256Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((LongMask256)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Long256Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Long256Mask.class, long.class, VLENGTH,
+        static LongMask256 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(LongMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Long256Mask  TRUE_MASK = new Long256Mask(true);
-        private static final Long256Mask FALSE_MASK = new Long256Mask(false);
+        private static final LongMask256  TRUE_MASK = new LongMask256(true);
+        private static final LongMask256 FALSE_MASK = new LongMask256(false);
 
     }
 
     // Shuffle
 
-    static final class Long256Shuffle extends AbstractShuffle<Long> {
+    static final class LongShuffle256 extends AbstractShuffle<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long256Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongShuffle256(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Long256Shuffle(int[] indices, int i) {
+        LongShuffle256(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Long256Shuffle(IntUnaryOperator fn) {
+        LongShuffle256(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -819,23 +833,23 @@ final class Long256Vector extends LongVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Long256Shuffle IOTA = new Long256Shuffle(IDENTITY);
+        static final LongShuffle256 IOTA = new LongShuffle256(IDENTITY);
 
         @Override
         @ForceInline
-        public Long256Vector toVector() {
+        public LongVector256 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Long256Vector toBitsVector() {
-            return (Long256Vector) super.toBitsVectorTemplate();
+        LongVector256 toBitsVector() {
+            return (LongVector256) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long256Vector toBitsVector0() {
-            return ((Long256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector256 toBitsVector0() {
+            return ((LongVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -907,30 +921,30 @@ final class Long256Vector extends LongVector {
 
         @Override
         @ForceInline
-        public final Long256Mask laneIsValid() {
-            return (Long256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final LongMask256 laneIsValid() {
+            return (LongMask256) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Long256Shuffle rearrange(VectorShuffle<Long> shuffle) {
-            Long256Shuffle concreteShuffle = (Long256Shuffle) shuffle;
-            return (Long256Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final LongShuffle256 rearrange(VectorShuffle<Long> shuffle) {
+            LongShuffle256 concreteShuffle = (LongShuffle256) shuffle;
+            return (LongShuffle256) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Long256Shuffle wrapIndexes() {
-            Long256Vector v = toBitsVector();
+        public final LongShuffle256 wrapIndexes() {
+            LongVector256 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector256) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector256) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Long256Shuffle) v.toShuffle(vspecies(), false);
+            return (LongShuffle256) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -981,14 +995,14 @@ final class Long256Vector extends LongVector {
     @Override
     final
     LongVector fromArray0(long[] a, int offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromArray0Template(Long256Mask.class, a, offset, (Long256Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(LongMask256.class, a, offset, (LongMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     LongVector fromArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        return super.fromArray0Template(Long256Mask.class, a, offset, indexMap, mapOffset, (Long256Mask) m);
+        return super.fromArray0Template(LongMask256.class, a, offset, indexMap, mapOffset, (LongMask256) m);
     }
 
 
@@ -1004,7 +1018,7 @@ final class Long256Vector extends LongVector {
     @Override
     final
     LongVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Long256Mask.class, ms, offset, (Long256Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(LongMask256.class, ms, offset, (LongMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1018,14 +1032,14 @@ final class Long256Vector extends LongVector {
     @Override
     final
     void intoArray0(long[] a, int offset, VectorMask<Long> m) {
-        super.intoArray0Template(Long256Mask.class, a, offset, (Long256Mask) m);
+        super.intoArray0Template(LongMask256.class, a, offset, (LongMask256) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        super.intoArray0Template(Long256Mask.class, a, offset, indexMap, mapOffset, (Long256Mask) m);
+        super.intoArray0Template(LongMask256.class, a, offset, indexMap, mapOffset, (LongMask256) m);
     }
 
 
@@ -1033,7 +1047,7 @@ final class Long256Vector extends LongVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m) {
-        super.intoMemorySegment0Template(Long256Mask.class, ms, offset, (Long256Mask) m);
+        super.intoMemorySegment0Template(LongMask256.class, ms, offset, (LongMask256) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector512.java
similarity index 66%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector512.java
index 30d29c3cd03..b49d0c7c147 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Long512Vector extends LongVector {
+final class LongVector512 extends LongVector {
     static final LongSpecies VSPECIES =
         (LongSpecies) LongVector.SPECIES_512;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Long512Vector> VCLASS = Long512Vector.class;
+    static final Class<LongVector512> VCLASS = LongVector512.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Long> CTYPE = long.class; // carrier type used by the JVM
+
     static final Class<Long> ETYPE = long.class; // used by the JVM
 
-    Long512Vector(long[] v) {
+    LongVector512(long[] v) {
         super(v);
     }
 
-    // For compatibility as Long512Vector::new,
+    // For compatibility as LongVector512::new,
     // stored into species.vectorFactory.
-    Long512Vector(Object v) {
+    LongVector512(Object v) {
         this((long[]) v);
     }
 
-    static final Long512Vector ZERO = new Long512Vector(new long[VLENGTH]);
-    static final Long512Vector IOTA = new Long512Vector(VSPECIES.iotaArray());
+    static final LongVector512 ZERO = new LongVector512(new long[VLENGTH]);
+    static final LongVector512 IOTA = new LongVector512(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Long512Vector extends LongVector {
     @Override
     public final Class<Long> elementType() { return long.class; }
 
+    @ForceInline
+    final Class<Long> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Long.SIZE; }
@@ -119,50 +124,57 @@ final class Long512Vector extends LongVector {
         return (long[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Long512Vector broadcast(long e) {
-        return (Long512Vector) super.broadcastTemplate(e);  // specialize
+    public final LongVector512 broadcast(long e) {
+        return (LongVector512) super.broadcastTemplate(e);  // specialize
     }
 
 
     @Override
     @ForceInline
-    Long512Mask maskFromArray(boolean[] bits) {
-        return new Long512Mask(bits);
+    LongMask512 maskFromArray(boolean[] bits) {
+        return new LongMask512(bits);
     }
 
     @Override
     @ForceInline
-    Long512Shuffle iotaShuffle() { return Long512Shuffle.IOTA; }
+    LongShuffle512 iotaShuffle() { return LongShuffle512.IOTA; }
 
     @Override
     @ForceInline
-    Long512Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Long512Shuffle) iotaShuffleTemplate(start, step, wrap);
+    LongShuffle512 iotaShuffle(int start, int step, boolean wrap) {
+        return (LongShuffle512) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Long512Shuffle shuffleFromArray(int[] indices, int i) { return new Long512Shuffle(indices, i); }
+    LongShuffle512 shuffleFromArray(int[] indices, int i) { return new LongShuffle512(indices, i); }
 
     @Override
     @ForceInline
-    Long512Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Long512Shuffle(fn); }
+    LongShuffle512 shuffleFromOp(IntUnaryOperator fn) { return new LongShuffle512(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Long512Vector vectorFactory(long[] vec) {
-        return new Long512Vector(vec);
+    LongVector512 vectorFactory(long[] vec) {
+        return new LongVector512(vec);
     }
 
     @ForceInline
     final @Override
-    Byte512Vector asByteVectorRaw() {
-        return (Byte512Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector512 asByteVectorRaw() {
+        return (ByteVector512) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -175,31 +187,31 @@ final class Long512Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long512Vector uOp(FUnOp f) {
-        return (Long512Vector) super.uOpTemplate(f);  // specialize
+    LongVector512 uOp(FUnOp f) {
+        return (LongVector512) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long512Vector uOp(VectorMask<Long> m, FUnOp f) {
-        return (Long512Vector)
-            super.uOpTemplate((Long512Mask)m, f);  // specialize
+    LongVector512 uOp(VectorMask<Long> m, FUnOp f) {
+        return (LongVector512)
+            super.uOpTemplate((LongMask512)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Long512Vector bOp(Vector<Long> v, FBinOp f) {
-        return (Long512Vector) super.bOpTemplate((Long512Vector)v, f);  // specialize
+    LongVector512 bOp(Vector<Long> v, FBinOp f) {
+        return (LongVector512) super.bOpTemplate((LongVector512)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long512Vector bOp(Vector<Long> v,
+    LongVector512 bOp(Vector<Long> v,
                      VectorMask<Long> m, FBinOp f) {
-        return (Long512Vector)
-            super.bOpTemplate((Long512Vector)v, (Long512Mask)m,
+        return (LongVector512)
+            super.bOpTemplate((LongVector512)v, (LongMask512)m,
                               f);  // specialize
     }
 
@@ -207,19 +219,19 @@ final class Long512Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long512Vector tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
-        return (Long512Vector)
-            super.tOpTemplate((Long512Vector)v1, (Long512Vector)v2,
+    LongVector512 tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
+        return (LongVector512)
+            super.tOpTemplate((LongVector512)v1, (LongVector512)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long512Vector tOp(Vector<Long> v1, Vector<Long> v2,
+    LongVector512 tOp(Vector<Long> v1, Vector<Long> v2,
                      VectorMask<Long> m, FTriOp f) {
-        return (Long512Vector)
-            super.tOpTemplate((Long512Vector)v1, (Long512Vector)v2,
-                              (Long512Mask)m, f);  // specialize
+        return (LongVector512)
+            super.tOpTemplate((LongVector512)v1, (LongVector512)v2,
+                              (LongMask512)m, f);  // specialize
     }
 
     @ForceInline
@@ -257,64 +269,64 @@ final class Long512Vector extends LongVector {
 
     @Override
     @ForceInline
-    public Long512Vector lanewise(Unary op) {
-        return (Long512Vector) super.lanewiseTemplate(op);  // specialize
+    public LongVector512 lanewise(Unary op) {
+        return (LongVector512) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector lanewise(Unary op, VectorMask<Long> m) {
-        return (Long512Vector) super.lanewiseTemplate(op, Long512Mask.class, (Long512Mask) m);  // specialize
+    public LongVector512 lanewise(Unary op, VectorMask<Long> m) {
+        return (LongVector512) super.lanewiseTemplate(op, LongMask512.class, (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector lanewise(Binary op, Vector<Long> v) {
-        return (Long512Vector) super.lanewiseTemplate(op, v);  // specialize
+    public LongVector512 lanewise(Binary op, Vector<Long> v) {
+        return (LongVector512) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
-        return (Long512Vector) super.lanewiseTemplate(op, Long512Mask.class, v, (Long512Mask) m);  // specialize
+    public LongVector512 lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector512) super.lanewiseTemplate(op, LongMask512.class, v, (LongMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long512Vector
+    @ForceInline LongVector512
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Long512Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (LongVector512) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long512Vector
+    @ForceInline LongVector512
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Long> m) {
-        return (Long512Vector) super.lanewiseShiftTemplate(op, Long512Mask.class, e, (Long512Mask) m);  // specialize
+        return (LongVector512) super.lanewiseShiftTemplate(op, LongMask512.class, e, (LongMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Long512Vector
+    LongVector512
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2) {
-        return (Long512Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (LongVector512) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long512Vector
+    LongVector512
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2, VectorMask<Long> m) {
-        return (Long512Vector) super.lanewiseTemplate(op, Long512Mask.class, v1, v2, (Long512Mask) m);  // specialize
+        return (LongVector512) super.lanewiseTemplate(op, LongMask512.class, v1, v2, (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long512Vector addIndex(int scale) {
-        return (Long512Vector) super.addIndexTemplate(scale);  // specialize
+    LongVector512 addIndex(int scale) {
+        return (LongVector512) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -329,7 +341,7 @@ final class Long512Vector extends LongVector {
     @ForceInline
     public final long reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Long> m) {
-        return super.reduceLanesTemplate(op, Long512Mask.class, (Long512Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, LongMask512.class, (LongMask512) m);  // specialized
     }
 
     @Override
@@ -342,7 +354,7 @@ final class Long512Vector extends LongVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Long> m) {
-        return (long) super.reduceLanesTemplate(op, Long512Mask.class, (Long512Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, LongMask512.class, (LongMask512) m);  // specialized
     }
 
     @Override
@@ -353,155 +365,155 @@ final class Long512Vector extends LongVector {
 
     @Override
     @ForceInline
-    public final Long512Shuffle toShuffle() {
-        return (Long512Shuffle) toShuffle(vspecies(), false);
+    public final LongShuffle512 toShuffle() {
+        return (LongShuffle512) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Long512Mask test(Test op) {
-        return super.testTemplate(Long512Mask.class, op);  // specialize
+    public final LongMask512 test(Test op) {
+        return super.testTemplate(LongMask512.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long512Mask test(Test op, VectorMask<Long> m) {
-        return super.testTemplate(Long512Mask.class, op, (Long512Mask) m);  // specialize
+    public final LongMask512 test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(LongMask512.class, op, (LongMask512) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Long512Mask compare(Comparison op, Vector<Long> v) {
-        return super.compareTemplate(Long512Mask.class, op, v);  // specialize
+    public final LongMask512 compare(Comparison op, Vector<Long> v) {
+        return super.compareTemplate(LongMask512.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long512Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Long512Mask.class, op, s);  // specialize
+    public final LongMask512 compare(Comparison op, long s) {
+        return super.compareTemplate(LongMask512.class, op, s);  // specialize
     }
 
 
     @Override
     @ForceInline
-    public final Long512Mask compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
-        return super.compareTemplate(Long512Mask.class, op, v, (Long512Mask) m);
+    public final LongMask512 compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
+        return super.compareTemplate(LongMask512.class, op, v, (LongMask512) m);
     }
 
 
     @Override
     @ForceInline
-    public Long512Vector blend(Vector<Long> v, VectorMask<Long> m) {
-        return (Long512Vector)
-            super.blendTemplate(Long512Mask.class,
-                                (Long512Vector) v,
-                                (Long512Mask) m);  // specialize
+    public LongVector512 blend(Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector512)
+            super.blendTemplate(LongMask512.class,
+                                (LongVector512) v,
+                                (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector slice(int origin, Vector<Long> v) {
-        return (Long512Vector) super.sliceTemplate(origin, v);  // specialize
+    public LongVector512 slice(int origin, Vector<Long> v) {
+        return (LongVector512) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector slice(int origin) {
-        return (Long512Vector) super.sliceTemplate(origin);  // specialize
+    public LongVector512 slice(int origin) {
+        return (LongVector512) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector unslice(int origin, Vector<Long> w, int part) {
-        return (Long512Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public LongVector512 unslice(int origin, Vector<Long> w, int part) {
+        return (LongVector512) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
-        return (Long512Vector)
-            super.unsliceTemplate(Long512Mask.class,
+    public LongVector512 unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
+        return (LongVector512)
+            super.unsliceTemplate(LongMask512.class,
                                   origin, w, part,
-                                  (Long512Mask) m);  // specialize
+                                  (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector unslice(int origin) {
-        return (Long512Vector) super.unsliceTemplate(origin);  // specialize
+    public LongVector512 unslice(int origin) {
+        return (LongVector512) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector rearrange(VectorShuffle<Long> s) {
-        return (Long512Vector)
-            super.rearrangeTemplate(Long512Shuffle.class,
-                                    (Long512Shuffle) s);  // specialize
+    public LongVector512 rearrange(VectorShuffle<Long> s) {
+        return (LongVector512)
+            super.rearrangeTemplate(LongShuffle512.class,
+                                    (LongShuffle512) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector rearrange(VectorShuffle<Long> shuffle,
+    public LongVector512 rearrange(VectorShuffle<Long> shuffle,
                                   VectorMask<Long> m) {
-        return (Long512Vector)
-            super.rearrangeTemplate(Long512Shuffle.class,
-                                    Long512Mask.class,
-                                    (Long512Shuffle) shuffle,
-                                    (Long512Mask) m);  // specialize
+        return (LongVector512)
+            super.rearrangeTemplate(LongShuffle512.class,
+                                    LongMask512.class,
+                                    (LongShuffle512) shuffle,
+                                    (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector rearrange(VectorShuffle<Long> s,
+    public LongVector512 rearrange(VectorShuffle<Long> s,
                                   Vector<Long> v) {
-        return (Long512Vector)
-            super.rearrangeTemplate(Long512Shuffle.class,
-                                    (Long512Shuffle) s,
-                                    (Long512Vector) v);  // specialize
+        return (LongVector512)
+            super.rearrangeTemplate(LongShuffle512.class,
+                                    (LongShuffle512) s,
+                                    (LongVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector compress(VectorMask<Long> m) {
-        return (Long512Vector)
-            super.compressTemplate(Long512Mask.class,
-                                   (Long512Mask) m);  // specialize
+    public LongVector512 compress(VectorMask<Long> m) {
+        return (LongVector512)
+            super.compressTemplate(LongMask512.class,
+                                   (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector expand(VectorMask<Long> m) {
-        return (Long512Vector)
-            super.expandTemplate(Long512Mask.class,
-                                   (Long512Mask) m);  // specialize
+    public LongVector512 expand(VectorMask<Long> m) {
+        return (LongVector512)
+            super.expandTemplate(LongMask512.class,
+                                   (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector selectFrom(Vector<Long> v) {
-        return (Long512Vector)
-            super.selectFromTemplate((Long512Vector) v);  // specialize
+    public LongVector512 selectFrom(Vector<Long> v) {
+        return (LongVector512)
+            super.selectFromTemplate((LongVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector selectFrom(Vector<Long> v,
+    public LongVector512 selectFrom(Vector<Long> v,
                                    VectorMask<Long> m) {
-        return (Long512Vector)
-            super.selectFromTemplate((Long512Vector) v,
-                                     Long512Mask.class, (Long512Mask) m);  // specialize
+        return (LongVector512)
+            super.selectFromTemplate((LongVector512) v,
+                                     LongMask512.class, (LongMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long512Vector selectFrom(Vector<Long> v1,
+    public LongVector512 selectFrom(Vector<Long> v1,
                                    Vector<Long> v2) {
-        return (Long512Vector)
-            super.selectFromTemplate((Long512Vector) v1, (Long512Vector) v2);  // specialize
+        return (LongVector512)
+            super.selectFromTemplate((LongVector512) v1, (LongVector512) v2);  // specialize
     }
 
     @ForceInline
@@ -523,7 +535,7 @@ final class Long512Vector extends LongVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     long[] vecarr = vec.vec();
@@ -533,7 +545,7 @@ final class Long512Vector extends LongVector {
 
     @ForceInline
     @Override
-    public Long512Vector withLane(int i, long e) {
+    public LongVector512 withLane(int i, long e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -548,9 +560,9 @@ final class Long512Vector extends LongVector {
     }
 
     @ForceInline
-    public Long512Vector withLaneHelper(int i, long e) {
+    public LongVector512 withLaneHelper(int i, long e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     long[] res = v.vec().clone();
@@ -561,19 +573,20 @@ final class Long512Vector extends LongVector {
 
     // Mask
 
-    static final class Long512Mask extends AbstractMask<Long> {
+    static final class LongMask512 extends AbstractMask<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long512Mask(boolean[] bits) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongMask512(boolean[] bits) {
             this(bits, 0);
         }
 
-        Long512Mask(boolean[] bits, int offset) {
+        LongMask512(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Long512Mask(boolean val) {
+        LongMask512(boolean val) {
             super(prepare(val));
         }
 
@@ -606,31 +619,31 @@ final class Long512Vector extends LongVector {
         }
 
         @Override
-        Long512Mask uOp(MUnOp f) {
+        LongMask512 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Long512Mask(res);
+            return new LongMask512(res);
         }
 
         @Override
-        Long512Mask bOp(VectorMask<Long> m, MBinOp f) {
+        LongMask512 bOp(VectorMask<Long> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Long512Mask)m).getBits();
+            boolean[] mbits = ((LongMask512)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Long512Mask(res);
+            return new LongMask512(res);
         }
 
         @ForceInline
         @Override
         public final
-        Long512Vector toVector() {
-            return (Long512Vector) super.toVectorTemplate();  // specialize
+        LongVector512 toVector() {
+            return (LongVector512) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -654,8 +667,8 @@ final class Long512Vector extends LongVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -663,25 +676,25 @@ final class Long512Vector extends LongVector {
         @Override
         @ForceInline
         /*package-private*/
-        Long512Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Long512Mask) VectorSupport.indexPartiallyInUpperRange(
-                Long512Mask.class, long.class, VLENGTH, offset, limit,
-                (o, l) -> (Long512Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        LongMask512 indexPartiallyInUpperRange(long offset, long limit) {
+            return (LongMask512) VectorSupport.indexPartiallyInUpperRange(
+                LongMask512.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (LongMask512) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Long512Mask not() {
+        public LongMask512 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Long512Mask compress() {
-            return (Long512Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Long512Vector.class, Long512Mask.class, ETYPE, VLENGTH, null, this,
+        public LongMask512 compress() {
+            return (LongMask512)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                LongVector512.class, LongMask512.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -690,30 +703,30 @@ final class Long512Vector extends LongVector {
 
         @Override
         @ForceInline
-        public Long512Mask and(VectorMask<Long> mask) {
+        public LongMask512 and(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long512Mask m = (Long512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Long512Mask.class, null, long.class, VLENGTH,
+            LongMask512 m = (LongMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, LongMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Long512Mask or(VectorMask<Long> mask) {
+        public LongMask512 or(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long512Mask m = (Long512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Long512Mask.class, null, long.class, VLENGTH,
+            LongMask512 m = (LongMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, LongMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Long512Mask xor(VectorMask<Long> mask) {
+        public LongMask512 xor(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long512Mask m = (Long512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Long512Mask.class, null, long.class, VLENGTH,
+            LongMask512 m = (LongMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, LongMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -723,21 +736,21 @@ final class Long512Vector extends LongVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Long512Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Long512Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Long512Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -747,7 +760,7 @@ final class Long512Vector extends LongVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Long512Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -757,7 +770,7 @@ final class Long512Vector extends LongVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Long512Mask.class, long.class, VLENGTH,
+            return VectorSupport.extract(LongMask512.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -766,48 +779,49 @@ final class Long512Vector extends LongVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Long512Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Long512Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((LongMask512)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Long512Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Long512Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((LongMask512)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Long512Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Long512Mask.class, long.class, VLENGTH,
+        static LongMask512 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(LongMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Long512Mask  TRUE_MASK = new Long512Mask(true);
-        private static final Long512Mask FALSE_MASK = new Long512Mask(false);
+        private static final LongMask512  TRUE_MASK = new LongMask512(true);
+        private static final LongMask512 FALSE_MASK = new LongMask512(false);
 
     }
 
     // Shuffle
 
-    static final class Long512Shuffle extends AbstractShuffle<Long> {
+    static final class LongShuffle512 extends AbstractShuffle<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long512Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongShuffle512(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Long512Shuffle(int[] indices, int i) {
+        LongShuffle512(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Long512Shuffle(IntUnaryOperator fn) {
+        LongShuffle512(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -827,23 +841,23 @@ final class Long512Vector extends LongVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Long512Shuffle IOTA = new Long512Shuffle(IDENTITY);
+        static final LongShuffle512 IOTA = new LongShuffle512(IDENTITY);
 
         @Override
         @ForceInline
-        public Long512Vector toVector() {
+        public LongVector512 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Long512Vector toBitsVector() {
-            return (Long512Vector) super.toBitsVectorTemplate();
+        LongVector512 toBitsVector() {
+            return (LongVector512) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long512Vector toBitsVector0() {
-            return ((Long512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector512 toBitsVector0() {
+            return ((LongVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -915,30 +929,30 @@ final class Long512Vector extends LongVector {
 
         @Override
         @ForceInline
-        public final Long512Mask laneIsValid() {
-            return (Long512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final LongMask512 laneIsValid() {
+            return (LongMask512) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Long512Shuffle rearrange(VectorShuffle<Long> shuffle) {
-            Long512Shuffle concreteShuffle = (Long512Shuffle) shuffle;
-            return (Long512Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final LongShuffle512 rearrange(VectorShuffle<Long> shuffle) {
+            LongShuffle512 concreteShuffle = (LongShuffle512) shuffle;
+            return (LongShuffle512) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Long512Shuffle wrapIndexes() {
-            Long512Vector v = toBitsVector();
+        public final LongShuffle512 wrapIndexes() {
+            LongVector512 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector512) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector512) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Long512Shuffle) v.toShuffle(vspecies(), false);
+            return (LongShuffle512) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -989,14 +1003,14 @@ final class Long512Vector extends LongVector {
     @Override
     final
     LongVector fromArray0(long[] a, int offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromArray0Template(Long512Mask.class, a, offset, (Long512Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(LongMask512.class, a, offset, (LongMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     LongVector fromArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        return super.fromArray0Template(Long512Mask.class, a, offset, indexMap, mapOffset, (Long512Mask) m);
+        return super.fromArray0Template(LongMask512.class, a, offset, indexMap, mapOffset, (LongMask512) m);
     }
 
 
@@ -1012,7 +1026,7 @@ final class Long512Vector extends LongVector {
     @Override
     final
     LongVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Long512Mask.class, ms, offset, (Long512Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(LongMask512.class, ms, offset, (LongMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1026,14 +1040,14 @@ final class Long512Vector extends LongVector {
     @Override
     final
     void intoArray0(long[] a, int offset, VectorMask<Long> m) {
-        super.intoArray0Template(Long512Mask.class, a, offset, (Long512Mask) m);
+        super.intoArray0Template(LongMask512.class, a, offset, (LongMask512) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        super.intoArray0Template(Long512Mask.class, a, offset, indexMap, mapOffset, (Long512Mask) m);
+        super.intoArray0Template(LongMask512.class, a, offset, indexMap, mapOffset, (LongMask512) m);
     }
 
 
@@ -1041,7 +1055,7 @@ final class Long512Vector extends LongVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m) {
-        super.intoMemorySegment0Template(Long512Mask.class, ms, offset, (Long512Mask) m);
+        super.intoMemorySegment0Template(LongMask512.class, ms, offset, (LongMask512) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector64.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector64.java
index 518baa168ec..5e8451695bc 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Long64Vector extends LongVector {
+final class LongVector64 extends LongVector {
     static final LongSpecies VSPECIES =
         (LongSpecies) LongVector.SPECIES_64;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Long64Vector> VCLASS = Long64Vector.class;
+    static final Class<LongVector64> VCLASS = LongVector64.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Long> CTYPE = long.class; // carrier type used by the JVM
+
     static final Class<Long> ETYPE = long.class; // used by the JVM
 
-    Long64Vector(long[] v) {
+    LongVector64(long[] v) {
         super(v);
     }
 
-    // For compatibility as Long64Vector::new,
+    // For compatibility as LongVector64::new,
     // stored into species.vectorFactory.
-    Long64Vector(Object v) {
+    LongVector64(Object v) {
         this((long[]) v);
     }
 
-    static final Long64Vector ZERO = new Long64Vector(new long[VLENGTH]);
-    static final Long64Vector IOTA = new Long64Vector(VSPECIES.iotaArray());
+    static final LongVector64 ZERO = new LongVector64(new long[VLENGTH]);
+    static final LongVector64 IOTA = new LongVector64(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Long64Vector extends LongVector {
     @Override
     public final Class<Long> elementType() { return long.class; }
 
+    @ForceInline
+    final Class<Long> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Long.SIZE; }
@@ -119,50 +124,57 @@ final class Long64Vector extends LongVector {
         return (long[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Long64Vector broadcast(long e) {
-        return (Long64Vector) super.broadcastTemplate(e);  // specialize
+    public final LongVector64 broadcast(long e) {
+        return (LongVector64) super.broadcastTemplate(e);  // specialize
     }
 
 
     @Override
     @ForceInline
-    Long64Mask maskFromArray(boolean[] bits) {
-        return new Long64Mask(bits);
+    LongMask64 maskFromArray(boolean[] bits) {
+        return new LongMask64(bits);
     }
 
     @Override
     @ForceInline
-    Long64Shuffle iotaShuffle() { return Long64Shuffle.IOTA; }
+    LongShuffle64 iotaShuffle() { return LongShuffle64.IOTA; }
 
     @Override
     @ForceInline
-    Long64Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Long64Shuffle) iotaShuffleTemplate(start, step, wrap);
+    LongShuffle64 iotaShuffle(int start, int step, boolean wrap) {
+        return (LongShuffle64) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    Long64Shuffle shuffleFromArray(int[] indices, int i) { return new Long64Shuffle(indices, i); }
+    LongShuffle64 shuffleFromArray(int[] indices, int i) { return new LongShuffle64(indices, i); }
 
     @Override
     @ForceInline
-    Long64Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Long64Shuffle(fn); }
+    LongShuffle64 shuffleFromOp(IntUnaryOperator fn) { return new LongShuffle64(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Long64Vector vectorFactory(long[] vec) {
-        return new Long64Vector(vec);
+    LongVector64 vectorFactory(long[] vec) {
+        return new LongVector64(vec);
     }
 
     @ForceInline
     final @Override
-    Byte64Vector asByteVectorRaw() {
-        return (Byte64Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector64 asByteVectorRaw() {
+        return (ByteVector64) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -175,31 +187,31 @@ final class Long64Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long64Vector uOp(FUnOp f) {
-        return (Long64Vector) super.uOpTemplate(f);  // specialize
+    LongVector64 uOp(FUnOp f) {
+        return (LongVector64) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long64Vector uOp(VectorMask<Long> m, FUnOp f) {
-        return (Long64Vector)
-            super.uOpTemplate((Long64Mask)m, f);  // specialize
+    LongVector64 uOp(VectorMask<Long> m, FUnOp f) {
+        return (LongVector64)
+            super.uOpTemplate((LongMask64)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Long64Vector bOp(Vector<Long> v, FBinOp f) {
-        return (Long64Vector) super.bOpTemplate((Long64Vector)v, f);  // specialize
+    LongVector64 bOp(Vector<Long> v, FBinOp f) {
+        return (LongVector64) super.bOpTemplate((LongVector64)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long64Vector bOp(Vector<Long> v,
+    LongVector64 bOp(Vector<Long> v,
                      VectorMask<Long> m, FBinOp f) {
-        return (Long64Vector)
-            super.bOpTemplate((Long64Vector)v, (Long64Mask)m,
+        return (LongVector64)
+            super.bOpTemplate((LongVector64)v, (LongMask64)m,
                               f);  // specialize
     }
 
@@ -207,19 +219,19 @@ final class Long64Vector extends LongVector {
 
     @ForceInline
     final @Override
-    Long64Vector tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
-        return (Long64Vector)
-            super.tOpTemplate((Long64Vector)v1, (Long64Vector)v2,
+    LongVector64 tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
+        return (LongVector64)
+            super.tOpTemplate((LongVector64)v1, (LongVector64)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Long64Vector tOp(Vector<Long> v1, Vector<Long> v2,
+    LongVector64 tOp(Vector<Long> v1, Vector<Long> v2,
                      VectorMask<Long> m, FTriOp f) {
-        return (Long64Vector)
-            super.tOpTemplate((Long64Vector)v1, (Long64Vector)v2,
-                              (Long64Mask)m, f);  // specialize
+        return (LongVector64)
+            super.tOpTemplate((LongVector64)v1, (LongVector64)v2,
+                              (LongMask64)m, f);  // specialize
     }
 
     @ForceInline
@@ -257,64 +269,64 @@ final class Long64Vector extends LongVector {
 
     @Override
     @ForceInline
-    public Long64Vector lanewise(Unary op) {
-        return (Long64Vector) super.lanewiseTemplate(op);  // specialize
+    public LongVector64 lanewise(Unary op) {
+        return (LongVector64) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector lanewise(Unary op, VectorMask<Long> m) {
-        return (Long64Vector) super.lanewiseTemplate(op, Long64Mask.class, (Long64Mask) m);  // specialize
+    public LongVector64 lanewise(Unary op, VectorMask<Long> m) {
+        return (LongVector64) super.lanewiseTemplate(op, LongMask64.class, (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector lanewise(Binary op, Vector<Long> v) {
-        return (Long64Vector) super.lanewiseTemplate(op, v);  // specialize
+    public LongVector64 lanewise(Binary op, Vector<Long> v) {
+        return (LongVector64) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
-        return (Long64Vector) super.lanewiseTemplate(op, Long64Mask.class, v, (Long64Mask) m);  // specialize
+    public LongVector64 lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector64) super.lanewiseTemplate(op, LongMask64.class, v, (LongMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long64Vector
+    @ForceInline LongVector64
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Long64Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (LongVector64) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Long64Vector
+    @ForceInline LongVector64
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Long> m) {
-        return (Long64Vector) super.lanewiseShiftTemplate(op, Long64Mask.class, e, (Long64Mask) m);  // specialize
+        return (LongVector64) super.lanewiseShiftTemplate(op, LongMask64.class, e, (LongMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Long64Vector
+    LongVector64
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2) {
-        return (Long64Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (LongVector64) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long64Vector
+    LongVector64
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2, VectorMask<Long> m) {
-        return (Long64Vector) super.lanewiseTemplate(op, Long64Mask.class, v1, v2, (Long64Mask) m);  // specialize
+        return (LongVector64) super.lanewiseTemplate(op, LongMask64.class, v1, v2, (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Long64Vector addIndex(int scale) {
-        return (Long64Vector) super.addIndexTemplate(scale);  // specialize
+    LongVector64 addIndex(int scale) {
+        return (LongVector64) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -329,7 +341,7 @@ final class Long64Vector extends LongVector {
     @ForceInline
     public final long reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Long> m) {
-        return super.reduceLanesTemplate(op, Long64Mask.class, (Long64Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, LongMask64.class, (LongMask64) m);  // specialized
     }
 
     @Override
@@ -342,7 +354,7 @@ final class Long64Vector extends LongVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Long> m) {
-        return (long) super.reduceLanesTemplate(op, Long64Mask.class, (Long64Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, LongMask64.class, (LongMask64) m);  // specialized
     }
 
     @Override
@@ -353,155 +365,155 @@ final class Long64Vector extends LongVector {
 
     @Override
     @ForceInline
-    public final Long64Shuffle toShuffle() {
-        return (Long64Shuffle) toShuffle(vspecies(), false);
+    public final LongShuffle64 toShuffle() {
+        return (LongShuffle64) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Long64Mask test(Test op) {
-        return super.testTemplate(Long64Mask.class, op);  // specialize
+    public final LongMask64 test(Test op) {
+        return super.testTemplate(LongMask64.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long64Mask test(Test op, VectorMask<Long> m) {
-        return super.testTemplate(Long64Mask.class, op, (Long64Mask) m);  // specialize
+    public final LongMask64 test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(LongMask64.class, op, (LongMask64) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Long64Mask compare(Comparison op, Vector<Long> v) {
-        return super.compareTemplate(Long64Mask.class, op, v);  // specialize
+    public final LongMask64 compare(Comparison op, Vector<Long> v) {
+        return super.compareTemplate(LongMask64.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Long64Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Long64Mask.class, op, s);  // specialize
+    public final LongMask64 compare(Comparison op, long s) {
+        return super.compareTemplate(LongMask64.class, op, s);  // specialize
     }
 
 
     @Override
     @ForceInline
-    public final Long64Mask compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
-        return super.compareTemplate(Long64Mask.class, op, v, (Long64Mask) m);
+    public final LongMask64 compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
+        return super.compareTemplate(LongMask64.class, op, v, (LongMask64) m);
     }
 
 
     @Override
     @ForceInline
-    public Long64Vector blend(Vector<Long> v, VectorMask<Long> m) {
-        return (Long64Vector)
-            super.blendTemplate(Long64Mask.class,
-                                (Long64Vector) v,
-                                (Long64Mask) m);  // specialize
+    public LongVector64 blend(Vector<Long> v, VectorMask<Long> m) {
+        return (LongVector64)
+            super.blendTemplate(LongMask64.class,
+                                (LongVector64) v,
+                                (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector slice(int origin, Vector<Long> v) {
-        return (Long64Vector) super.sliceTemplate(origin, v);  // specialize
+    public LongVector64 slice(int origin, Vector<Long> v) {
+        return (LongVector64) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector slice(int origin) {
-        return (Long64Vector) super.sliceTemplate(origin);  // specialize
+    public LongVector64 slice(int origin) {
+        return (LongVector64) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector unslice(int origin, Vector<Long> w, int part) {
-        return (Long64Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public LongVector64 unslice(int origin, Vector<Long> w, int part) {
+        return (LongVector64) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
-        return (Long64Vector)
-            super.unsliceTemplate(Long64Mask.class,
+    public LongVector64 unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
+        return (LongVector64)
+            super.unsliceTemplate(LongMask64.class,
                                   origin, w, part,
-                                  (Long64Mask) m);  // specialize
+                                  (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector unslice(int origin) {
-        return (Long64Vector) super.unsliceTemplate(origin);  // specialize
+    public LongVector64 unslice(int origin) {
+        return (LongVector64) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector rearrange(VectorShuffle<Long> s) {
-        return (Long64Vector)
-            super.rearrangeTemplate(Long64Shuffle.class,
-                                    (Long64Shuffle) s);  // specialize
+    public LongVector64 rearrange(VectorShuffle<Long> s) {
+        return (LongVector64)
+            super.rearrangeTemplate(LongShuffle64.class,
+                                    (LongShuffle64) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector rearrange(VectorShuffle<Long> shuffle,
+    public LongVector64 rearrange(VectorShuffle<Long> shuffle,
                                   VectorMask<Long> m) {
-        return (Long64Vector)
-            super.rearrangeTemplate(Long64Shuffle.class,
-                                    Long64Mask.class,
-                                    (Long64Shuffle) shuffle,
-                                    (Long64Mask) m);  // specialize
+        return (LongVector64)
+            super.rearrangeTemplate(LongShuffle64.class,
+                                    LongMask64.class,
+                                    (LongShuffle64) shuffle,
+                                    (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector rearrange(VectorShuffle<Long> s,
+    public LongVector64 rearrange(VectorShuffle<Long> s,
                                   Vector<Long> v) {
-        return (Long64Vector)
-            super.rearrangeTemplate(Long64Shuffle.class,
-                                    (Long64Shuffle) s,
-                                    (Long64Vector) v);  // specialize
+        return (LongVector64)
+            super.rearrangeTemplate(LongShuffle64.class,
+                                    (LongShuffle64) s,
+                                    (LongVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector compress(VectorMask<Long> m) {
-        return (Long64Vector)
-            super.compressTemplate(Long64Mask.class,
-                                   (Long64Mask) m);  // specialize
+    public LongVector64 compress(VectorMask<Long> m) {
+        return (LongVector64)
+            super.compressTemplate(LongMask64.class,
+                                   (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector expand(VectorMask<Long> m) {
-        return (Long64Vector)
-            super.expandTemplate(Long64Mask.class,
-                                   (Long64Mask) m);  // specialize
+    public LongVector64 expand(VectorMask<Long> m) {
+        return (LongVector64)
+            super.expandTemplate(LongMask64.class,
+                                   (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector selectFrom(Vector<Long> v) {
-        return (Long64Vector)
-            super.selectFromTemplate((Long64Vector) v);  // specialize
+    public LongVector64 selectFrom(Vector<Long> v) {
+        return (LongVector64)
+            super.selectFromTemplate((LongVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector selectFrom(Vector<Long> v,
+    public LongVector64 selectFrom(Vector<Long> v,
                                    VectorMask<Long> m) {
-        return (Long64Vector)
-            super.selectFromTemplate((Long64Vector) v,
-                                     Long64Mask.class, (Long64Mask) m);  // specialize
+        return (LongVector64)
+            super.selectFromTemplate((LongVector64) v,
+                                     LongMask64.class, (LongMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Long64Vector selectFrom(Vector<Long> v1,
+    public LongVector64 selectFrom(Vector<Long> v1,
                                    Vector<Long> v2) {
-        return (Long64Vector)
-            super.selectFromTemplate((Long64Vector) v1, (Long64Vector) v2);  // specialize
+        return (LongVector64)
+            super.selectFromTemplate((LongVector64) v1, (LongVector64) v2);  // specialize
     }
 
     @ForceInline
@@ -516,7 +528,7 @@ final class Long64Vector extends LongVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     long[] vecarr = vec.vec();
@@ -526,7 +538,7 @@ final class Long64Vector extends LongVector {
 
     @ForceInline
     @Override
-    public Long64Vector withLane(int i, long e) {
+    public LongVector64 withLane(int i, long e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             default: throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
@@ -534,9 +546,9 @@ final class Long64Vector extends LongVector {
     }
 
     @ForceInline
-    public Long64Vector withLaneHelper(int i, long e) {
+    public LongVector64 withLaneHelper(int i, long e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     long[] res = v.vec().clone();
@@ -547,19 +559,20 @@ final class Long64Vector extends LongVector {
 
     // Mask
 
-    static final class Long64Mask extends AbstractMask<Long> {
+    static final class LongMask64 extends AbstractMask<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long64Mask(boolean[] bits) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongMask64(boolean[] bits) {
             this(bits, 0);
         }
 
-        Long64Mask(boolean[] bits, int offset) {
+        LongMask64(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Long64Mask(boolean val) {
+        LongMask64(boolean val) {
             super(prepare(val));
         }
 
@@ -592,31 +605,31 @@ final class Long64Vector extends LongVector {
         }
 
         @Override
-        Long64Mask uOp(MUnOp f) {
+        LongMask64 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Long64Mask(res);
+            return new LongMask64(res);
         }
 
         @Override
-        Long64Mask bOp(VectorMask<Long> m, MBinOp f) {
+        LongMask64 bOp(VectorMask<Long> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Long64Mask)m).getBits();
+            boolean[] mbits = ((LongMask64)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Long64Mask(res);
+            return new LongMask64(res);
         }
 
         @ForceInline
         @Override
         public final
-        Long64Vector toVector() {
-            return (Long64Vector) super.toVectorTemplate();  // specialize
+        LongVector64 toVector() {
+            return (LongVector64) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -640,8 +653,8 @@ final class Long64Vector extends LongVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -649,25 +662,25 @@ final class Long64Vector extends LongVector {
         @Override
         @ForceInline
         /*package-private*/
-        Long64Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Long64Mask) VectorSupport.indexPartiallyInUpperRange(
-                Long64Mask.class, long.class, VLENGTH, offset, limit,
-                (o, l) -> (Long64Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        LongMask64 indexPartiallyInUpperRange(long offset, long limit) {
+            return (LongMask64) VectorSupport.indexPartiallyInUpperRange(
+                LongMask64.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (LongMask64) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Long64Mask not() {
+        public LongMask64 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Long64Mask compress() {
-            return (Long64Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Long64Vector.class, Long64Mask.class, ETYPE, VLENGTH, null, this,
+        public LongMask64 compress() {
+            return (LongMask64)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                LongVector64.class, LongMask64.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -676,30 +689,30 @@ final class Long64Vector extends LongVector {
 
         @Override
         @ForceInline
-        public Long64Mask and(VectorMask<Long> mask) {
+        public LongMask64 and(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long64Mask m = (Long64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Long64Mask.class, null, long.class, VLENGTH,
+            LongMask64 m = (LongMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, LongMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Long64Mask or(VectorMask<Long> mask) {
+        public LongMask64 or(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long64Mask m = (Long64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Long64Mask.class, null, long.class, VLENGTH,
+            LongMask64 m = (LongMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, LongMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Long64Mask xor(VectorMask<Long> mask) {
+        public LongMask64 xor(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            Long64Mask m = (Long64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Long64Mask.class, null, long.class, VLENGTH,
+            LongMask64 m = (LongMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, LongMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -709,21 +722,21 @@ final class Long64Vector extends LongVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Long64Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Long64Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Long64Mask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -733,7 +746,7 @@ final class Long64Vector extends LongVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Long64Mask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -743,7 +756,7 @@ final class Long64Vector extends LongVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Long64Mask.class, long.class, VLENGTH,
+            return VectorSupport.extract(LongMask64.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -752,48 +765,49 @@ final class Long64Vector extends LongVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Long64Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Long64Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((LongMask64)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Long64Mask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Long64Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((LongMask64)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Long64Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Long64Mask.class, long.class, VLENGTH,
+        static LongMask64 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(LongMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Long64Mask  TRUE_MASK = new Long64Mask(true);
-        private static final Long64Mask FALSE_MASK = new Long64Mask(false);
+        private static final LongMask64  TRUE_MASK = new LongMask64(true);
+        private static final LongMask64 FALSE_MASK = new LongMask64(false);
 
     }
 
     // Shuffle
 
-    static final class Long64Shuffle extends AbstractShuffle<Long> {
+    static final class LongShuffle64 extends AbstractShuffle<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        Long64Shuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongShuffle64(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Long64Shuffle(int[] indices, int i) {
+        LongShuffle64(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Long64Shuffle(IntUnaryOperator fn) {
+        LongShuffle64(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -813,23 +827,23 @@ final class Long64Vector extends LongVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final Long64Shuffle IOTA = new Long64Shuffle(IDENTITY);
+        static final LongShuffle64 IOTA = new LongShuffle64(IDENTITY);
 
         @Override
         @ForceInline
-        public Long64Vector toVector() {
+        public LongVector64 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Long64Vector toBitsVector() {
-            return (Long64Vector) super.toBitsVectorTemplate();
+        LongVector64 toBitsVector() {
+            return (LongVector64) super.toBitsVectorTemplate();
         }
 
         @Override
-        Long64Vector toBitsVector0() {
-            return ((Long64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVector64 toBitsVector0() {
+            return ((LongVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -901,30 +915,30 @@ final class Long64Vector extends LongVector {
 
         @Override
         @ForceInline
-        public final Long64Mask laneIsValid() {
-            return (Long64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final LongMask64 laneIsValid() {
+            return (LongMask64) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Long64Shuffle rearrange(VectorShuffle<Long> shuffle) {
-            Long64Shuffle concreteShuffle = (Long64Shuffle) shuffle;
-            return (Long64Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final LongShuffle64 rearrange(VectorShuffle<Long> shuffle) {
+            LongShuffle64 concreteShuffle = (LongShuffle64) shuffle;
+            return (LongShuffle64) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Long64Shuffle wrapIndexes() {
-            Long64Vector v = toBitsVector();
+        public final LongShuffle64 wrapIndexes() {
+            LongVector64 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Long64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVector64) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Long64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVector64) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Long64Shuffle) v.toShuffle(vspecies(), false);
+            return (LongShuffle64) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -975,14 +989,14 @@ final class Long64Vector extends LongVector {
     @Override
     final
     LongVector fromArray0(long[] a, int offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromArray0Template(Long64Mask.class, a, offset, (Long64Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(LongMask64.class, a, offset, (LongMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     LongVector fromArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        return super.fromArray0Template(Long64Mask.class, a, offset, indexMap, mapOffset, (Long64Mask) m);
+        return super.fromArray0Template(LongMask64.class, a, offset, indexMap, mapOffset, (LongMask64) m);
     }
 
 
@@ -998,7 +1012,7 @@ final class Long64Vector extends LongVector {
     @Override
     final
     LongVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Long64Mask.class, ms, offset, (Long64Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(LongMask64.class, ms, offset, (LongMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1012,14 +1026,14 @@ final class Long64Vector extends LongVector {
     @Override
     final
     void intoArray0(long[] a, int offset, VectorMask<Long> m) {
-        super.intoArray0Template(Long64Mask.class, a, offset, (Long64Mask) m);
+        super.intoArray0Template(LongMask64.class, a, offset, (LongMask64) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        super.intoArray0Template(Long64Mask.class, a, offset, indexMap, mapOffset, (Long64Mask) m);
+        super.intoArray0Template(LongMask64.class, a, offset, indexMap, mapOffset, (LongMask64) m);
     }
 
 
@@ -1027,7 +1041,7 @@ final class Long64Vector extends LongVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m) {
-        super.intoMemorySegment0Template(Long64Mask.class, ms, offset, (Long64Mask) m);
+        super.intoMemorySegment0Template(LongMask64.class, ms, offset, (LongMask64) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVectorMax.java
similarity index 65%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVectorMax.java
index 3d981c37ae2..3469da8f2f4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVectorMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class LongMaxVector extends LongVector {
+final class LongVectorMax extends LongVector {
     static final LongSpecies VSPECIES =
         (LongSpecies) LongVector.SPECIES_MAX;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<LongMaxVector> VCLASS = LongMaxVector.class;
+    static final Class<LongVectorMax> VCLASS = LongVectorMax.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Long> CTYPE = long.class; // carrier type used by the JVM
+
     static final Class<Long> ETYPE = long.class; // used by the JVM
 
-    LongMaxVector(long[] v) {
+    LongVectorMax(long[] v) {
         super(v);
     }
 
-    // For compatibility as LongMaxVector::new,
+    // For compatibility as LongVectorMax::new,
     // stored into species.vectorFactory.
-    LongMaxVector(Object v) {
+    LongVectorMax(Object v) {
         this((long[]) v);
     }
 
-    static final LongMaxVector ZERO = new LongMaxVector(new long[VLENGTH]);
-    static final LongMaxVector IOTA = new LongMaxVector(VSPECIES.iotaArray());
+    static final LongVectorMax ZERO = new LongVectorMax(new long[VLENGTH]);
+    static final LongVectorMax IOTA = new LongVectorMax(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class LongMaxVector extends LongVector {
     @Override
     public final Class<Long> elementType() { return long.class; }
 
+    @ForceInline
+    final Class<Long> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Long.SIZE; }
@@ -119,50 +124,57 @@ final class LongMaxVector extends LongVector {
         return (long[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final LongMaxVector broadcast(long e) {
-        return (LongMaxVector) super.broadcastTemplate(e);  // specialize
+    public final LongVectorMax broadcast(long e) {
+        return (LongVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
 
     @Override
     @ForceInline
-    LongMaxMask maskFromArray(boolean[] bits) {
-        return new LongMaxMask(bits);
+    LongMaskMax maskFromArray(boolean[] bits) {
+        return new LongMaskMax(bits);
     }
 
     @Override
     @ForceInline
-    LongMaxShuffle iotaShuffle() { return LongMaxShuffle.IOTA; }
+    LongShuffleMax iotaShuffle() { return LongShuffleMax.IOTA; }
 
     @Override
     @ForceInline
-    LongMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (LongMaxShuffle) iotaShuffleTemplate(start, step, wrap);
+    LongShuffleMax iotaShuffle(int start, int step, boolean wrap) {
+        return (LongShuffleMax) iotaShuffleTemplate(start, step, wrap);
     }
 
     @Override
     @ForceInline
-    LongMaxShuffle shuffleFromArray(int[] indices, int i) { return new LongMaxShuffle(indices, i); }
+    LongShuffleMax shuffleFromArray(int[] indices, int i) { return new LongShuffleMax(indices, i); }
 
     @Override
     @ForceInline
-    LongMaxShuffle shuffleFromOp(IntUnaryOperator fn) { return new LongMaxShuffle(fn); }
+    LongShuffleMax shuffleFromOp(IntUnaryOperator fn) { return new LongShuffleMax(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    LongMaxVector vectorFactory(long[] vec) {
-        return new LongMaxVector(vec);
+    LongVectorMax vectorFactory(long[] vec) {
+        return new LongVectorMax(vec);
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector asByteVectorRaw() {
-        return (ByteMaxVector) super.asByteVectorRawTemplate();  // specialize
+    ByteVectorMax asByteVectorRaw() {
+        return (ByteVectorMax) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -175,31 +187,31 @@ final class LongMaxVector extends LongVector {
 
     @ForceInline
     final @Override
-    LongMaxVector uOp(FUnOp f) {
-        return (LongMaxVector) super.uOpTemplate(f);  // specialize
+    LongVectorMax uOp(FUnOp f) {
+        return (LongVectorMax) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    LongMaxVector uOp(VectorMask<Long> m, FUnOp f) {
-        return (LongMaxVector)
-            super.uOpTemplate((LongMaxMask)m, f);  // specialize
+    LongVectorMax uOp(VectorMask<Long> m, FUnOp f) {
+        return (LongVectorMax)
+            super.uOpTemplate((LongMaskMax)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    LongMaxVector bOp(Vector<Long> v, FBinOp f) {
-        return (LongMaxVector) super.bOpTemplate((LongMaxVector)v, f);  // specialize
+    LongVectorMax bOp(Vector<Long> v, FBinOp f) {
+        return (LongVectorMax) super.bOpTemplate((LongVectorMax)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    LongMaxVector bOp(Vector<Long> v,
+    LongVectorMax bOp(Vector<Long> v,
                      VectorMask<Long> m, FBinOp f) {
-        return (LongMaxVector)
-            super.bOpTemplate((LongMaxVector)v, (LongMaxMask)m,
+        return (LongVectorMax)
+            super.bOpTemplate((LongVectorMax)v, (LongMaskMax)m,
                               f);  // specialize
     }
 
@@ -207,19 +219,19 @@ final class LongMaxVector extends LongVector {
 
     @ForceInline
     final @Override
-    LongMaxVector tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
-        return (LongMaxVector)
-            super.tOpTemplate((LongMaxVector)v1, (LongMaxVector)v2,
+    LongVectorMax tOp(Vector<Long> v1, Vector<Long> v2, FTriOp f) {
+        return (LongVectorMax)
+            super.tOpTemplate((LongVectorMax)v1, (LongVectorMax)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    LongMaxVector tOp(Vector<Long> v1, Vector<Long> v2,
+    LongVectorMax tOp(Vector<Long> v1, Vector<Long> v2,
                      VectorMask<Long> m, FTriOp f) {
-        return (LongMaxVector)
-            super.tOpTemplate((LongMaxVector)v1, (LongMaxVector)v2,
-                              (LongMaxMask)m, f);  // specialize
+        return (LongVectorMax)
+            super.tOpTemplate((LongVectorMax)v1, (LongVectorMax)v2,
+                              (LongMaskMax)m, f);  // specialize
     }
 
     @ForceInline
@@ -257,64 +269,64 @@ final class LongMaxVector extends LongVector {
 
     @Override
     @ForceInline
-    public LongMaxVector lanewise(Unary op) {
-        return (LongMaxVector) super.lanewiseTemplate(op);  // specialize
+    public LongVectorMax lanewise(Unary op) {
+        return (LongVectorMax) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector lanewise(Unary op, VectorMask<Long> m) {
-        return (LongMaxVector) super.lanewiseTemplate(op, LongMaxMask.class, (LongMaxMask) m);  // specialize
+    public LongVectorMax lanewise(Unary op, VectorMask<Long> m) {
+        return (LongVectorMax) super.lanewiseTemplate(op, LongMaskMax.class, (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector lanewise(Binary op, Vector<Long> v) {
-        return (LongMaxVector) super.lanewiseTemplate(op, v);  // specialize
+    public LongVectorMax lanewise(Binary op, Vector<Long> v) {
+        return (LongVectorMax) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
-        return (LongMaxVector) super.lanewiseTemplate(op, LongMaxMask.class, v, (LongMaxMask) m);  // specialize
+    public LongVectorMax lanewise(Binary op, Vector<Long> v, VectorMask<Long> m) {
+        return (LongVectorMax) super.lanewiseTemplate(op, LongMaskMax.class, v, (LongMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline LongMaxVector
+    @ForceInline LongVectorMax
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (LongMaxVector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (LongVectorMax) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline LongMaxVector
+    @ForceInline LongVectorMax
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Long> m) {
-        return (LongMaxVector) super.lanewiseShiftTemplate(op, LongMaxMask.class, e, (LongMaxMask) m);  // specialize
+        return (LongVectorMax) super.lanewiseShiftTemplate(op, LongMaskMax.class, e, (LongMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    LongMaxVector
+    LongVectorMax
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2) {
-        return (LongMaxVector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (LongVectorMax) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    LongMaxVector
+    LongVectorMax
     lanewise(Ternary op, Vector<Long> v1, Vector<Long> v2, VectorMask<Long> m) {
-        return (LongMaxVector) super.lanewiseTemplate(op, LongMaxMask.class, v1, v2, (LongMaxMask) m);  // specialize
+        return (LongVectorMax) super.lanewiseTemplate(op, LongMaskMax.class, v1, v2, (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    LongMaxVector addIndex(int scale) {
-        return (LongMaxVector) super.addIndexTemplate(scale);  // specialize
+    LongVectorMax addIndex(int scale) {
+        return (LongVectorMax) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -329,7 +341,7 @@ final class LongMaxVector extends LongVector {
     @ForceInline
     public final long reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Long> m) {
-        return super.reduceLanesTemplate(op, LongMaxMask.class, (LongMaxMask) m);  // specialized
+        return super.reduceLanesTemplate(op, LongMaskMax.class, (LongMaskMax) m);  // specialized
     }
 
     @Override
@@ -342,7 +354,7 @@ final class LongMaxVector extends LongVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Long> m) {
-        return (long) super.reduceLanesTemplate(op, LongMaxMask.class, (LongMaxMask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, LongMaskMax.class, (LongMaskMax) m);  // specialized
     }
 
     @Override
@@ -353,155 +365,155 @@ final class LongMaxVector extends LongVector {
 
     @Override
     @ForceInline
-    public final LongMaxShuffle toShuffle() {
-        return (LongMaxShuffle) toShuffle(vspecies(), false);
+    public final LongShuffleMax toShuffle() {
+        return (LongShuffleMax) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final LongMaxMask test(Test op) {
-        return super.testTemplate(LongMaxMask.class, op);  // specialize
+    public final LongMaskMax test(Test op) {
+        return super.testTemplate(LongMaskMax.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final LongMaxMask test(Test op, VectorMask<Long> m) {
-        return super.testTemplate(LongMaxMask.class, op, (LongMaxMask) m);  // specialize
+    public final LongMaskMax test(Test op, VectorMask<Long> m) {
+        return super.testTemplate(LongMaskMax.class, op, (LongMaskMax) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final LongMaxMask compare(Comparison op, Vector<Long> v) {
-        return super.compareTemplate(LongMaxMask.class, op, v);  // specialize
+    public final LongMaskMax compare(Comparison op, Vector<Long> v) {
+        return super.compareTemplate(LongMaskMax.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final LongMaxMask compare(Comparison op, long s) {
-        return super.compareTemplate(LongMaxMask.class, op, s);  // specialize
+    public final LongMaskMax compare(Comparison op, long s) {
+        return super.compareTemplate(LongMaskMax.class, op, s);  // specialize
     }
 
 
     @Override
     @ForceInline
-    public final LongMaxMask compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
-        return super.compareTemplate(LongMaxMask.class, op, v, (LongMaxMask) m);
+    public final LongMaskMax compare(Comparison op, Vector<Long> v, VectorMask<Long> m) {
+        return super.compareTemplate(LongMaskMax.class, op, v, (LongMaskMax) m);
     }
 
 
     @Override
     @ForceInline
-    public LongMaxVector blend(Vector<Long> v, VectorMask<Long> m) {
-        return (LongMaxVector)
-            super.blendTemplate(LongMaxMask.class,
-                                (LongMaxVector) v,
-                                (LongMaxMask) m);  // specialize
+    public LongVectorMax blend(Vector<Long> v, VectorMask<Long> m) {
+        return (LongVectorMax)
+            super.blendTemplate(LongMaskMax.class,
+                                (LongVectorMax) v,
+                                (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector slice(int origin, Vector<Long> v) {
-        return (LongMaxVector) super.sliceTemplate(origin, v);  // specialize
+    public LongVectorMax slice(int origin, Vector<Long> v) {
+        return (LongVectorMax) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector slice(int origin) {
-        return (LongMaxVector) super.sliceTemplate(origin);  // specialize
+    public LongVectorMax slice(int origin) {
+        return (LongVectorMax) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector unslice(int origin, Vector<Long> w, int part) {
-        return (LongMaxVector) super.unsliceTemplate(origin, w, part);  // specialize
+    public LongVectorMax unslice(int origin, Vector<Long> w, int part) {
+        return (LongVectorMax) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
-        return (LongMaxVector)
-            super.unsliceTemplate(LongMaxMask.class,
+    public LongVectorMax unslice(int origin, Vector<Long> w, int part, VectorMask<Long> m) {
+        return (LongVectorMax)
+            super.unsliceTemplate(LongMaskMax.class,
                                   origin, w, part,
-                                  (LongMaxMask) m);  // specialize
+                                  (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector unslice(int origin) {
-        return (LongMaxVector) super.unsliceTemplate(origin);  // specialize
+    public LongVectorMax unslice(int origin) {
+        return (LongVectorMax) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector rearrange(VectorShuffle<Long> s) {
-        return (LongMaxVector)
-            super.rearrangeTemplate(LongMaxShuffle.class,
-                                    (LongMaxShuffle) s);  // specialize
+    public LongVectorMax rearrange(VectorShuffle<Long> s) {
+        return (LongVectorMax)
+            super.rearrangeTemplate(LongShuffleMax.class,
+                                    (LongShuffleMax) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector rearrange(VectorShuffle<Long> shuffle,
+    public LongVectorMax rearrange(VectorShuffle<Long> shuffle,
                                   VectorMask<Long> m) {
-        return (LongMaxVector)
-            super.rearrangeTemplate(LongMaxShuffle.class,
-                                    LongMaxMask.class,
-                                    (LongMaxShuffle) shuffle,
-                                    (LongMaxMask) m);  // specialize
+        return (LongVectorMax)
+            super.rearrangeTemplate(LongShuffleMax.class,
+                                    LongMaskMax.class,
+                                    (LongShuffleMax) shuffle,
+                                    (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector rearrange(VectorShuffle<Long> s,
+    public LongVectorMax rearrange(VectorShuffle<Long> s,
                                   Vector<Long> v) {
-        return (LongMaxVector)
-            super.rearrangeTemplate(LongMaxShuffle.class,
-                                    (LongMaxShuffle) s,
-                                    (LongMaxVector) v);  // specialize
+        return (LongVectorMax)
+            super.rearrangeTemplate(LongShuffleMax.class,
+                                    (LongShuffleMax) s,
+                                    (LongVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector compress(VectorMask<Long> m) {
-        return (LongMaxVector)
-            super.compressTemplate(LongMaxMask.class,
-                                   (LongMaxMask) m);  // specialize
+    public LongVectorMax compress(VectorMask<Long> m) {
+        return (LongVectorMax)
+            super.compressTemplate(LongMaskMax.class,
+                                   (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector expand(VectorMask<Long> m) {
-        return (LongMaxVector)
-            super.expandTemplate(LongMaxMask.class,
-                                   (LongMaxMask) m);  // specialize
+    public LongVectorMax expand(VectorMask<Long> m) {
+        return (LongVectorMax)
+            super.expandTemplate(LongMaskMax.class,
+                                   (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector selectFrom(Vector<Long> v) {
-        return (LongMaxVector)
-            super.selectFromTemplate((LongMaxVector) v);  // specialize
+    public LongVectorMax selectFrom(Vector<Long> v) {
+        return (LongVectorMax)
+            super.selectFromTemplate((LongVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector selectFrom(Vector<Long> v,
+    public LongVectorMax selectFrom(Vector<Long> v,
                                    VectorMask<Long> m) {
-        return (LongMaxVector)
-            super.selectFromTemplate((LongMaxVector) v,
-                                     LongMaxMask.class, (LongMaxMask) m);  // specialize
+        return (LongVectorMax)
+            super.selectFromTemplate((LongVectorMax) v,
+                                     LongMaskMax.class, (LongMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public LongMaxVector selectFrom(Vector<Long> v1,
+    public LongVectorMax selectFrom(Vector<Long> v1,
                                    Vector<Long> v2) {
-        return (LongMaxVector)
-            super.selectFromTemplate((LongMaxVector) v1, (LongMaxVector) v2);  // specialize
+        return (LongVectorMax)
+            super.selectFromTemplate((LongVectorMax) v1, (LongVectorMax) v2);  // specialize
     }
 
     @ForceInline
@@ -516,7 +528,7 @@ final class LongMaxVector extends LongVector {
     @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     long[] vecarr = vec.vec();
@@ -526,7 +538,7 @@ final class LongMaxVector extends LongVector {
 
     @ForceInline
     @Override
-    public LongMaxVector withLane(int i, long e) {
+    public LongVectorMax withLane(int i, long e) {
         if (i < 0 || i >= VLENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
         }
@@ -534,9 +546,9 @@ final class LongMaxVector extends LongVector {
     }
 
     @ForceInline
-    public LongMaxVector withLaneHelper(int i, long e) {
+    public LongVectorMax withLaneHelper(int i, long e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     long[] res = v.vec().clone();
@@ -547,19 +559,20 @@ final class LongMaxVector extends LongVector {
 
     // Mask
 
-    static final class LongMaxMask extends AbstractMask<Long> {
+    static final class LongMaskMax extends AbstractMask<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        LongMaxMask(boolean[] bits) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongMaskMax(boolean[] bits) {
             this(bits, 0);
         }
 
-        LongMaxMask(boolean[] bits, int offset) {
+        LongMaskMax(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        LongMaxMask(boolean val) {
+        LongMaskMax(boolean val) {
             super(prepare(val));
         }
 
@@ -592,31 +605,31 @@ final class LongMaxVector extends LongVector {
         }
 
         @Override
-        LongMaxMask uOp(MUnOp f) {
+        LongMaskMax uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new LongMaxMask(res);
+            return new LongMaskMax(res);
         }
 
         @Override
-        LongMaxMask bOp(VectorMask<Long> m, MBinOp f) {
+        LongMaskMax bOp(VectorMask<Long> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((LongMaxMask)m).getBits();
+            boolean[] mbits = ((LongMaskMax)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new LongMaxMask(res);
+            return new LongMaskMax(res);
         }
 
         @ForceInline
         @Override
         public final
-        LongMaxVector toVector() {
-            return (LongMaxVector) super.toVectorTemplate();  // specialize
+        LongVectorMax toVector() {
+            return (LongVectorMax) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -640,8 +653,8 @@ final class LongMaxVector extends LongVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -649,25 +662,25 @@ final class LongMaxVector extends LongVector {
         @Override
         @ForceInline
         /*package-private*/
-        LongMaxMask indexPartiallyInUpperRange(long offset, long limit) {
-            return (LongMaxMask) VectorSupport.indexPartiallyInUpperRange(
-                LongMaxMask.class, long.class, VLENGTH, offset, limit,
-                (o, l) -> (LongMaxMask) TRUE_MASK.indexPartiallyInRange(o, l));
+        LongMaskMax indexPartiallyInUpperRange(long offset, long limit) {
+            return (LongMaskMax) VectorSupport.indexPartiallyInUpperRange(
+                LongMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (LongMaskMax) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public LongMaxMask not() {
+        public LongMaskMax not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public LongMaxMask compress() {
-            return (LongMaxMask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                LongMaxVector.class, LongMaxMask.class, ETYPE, VLENGTH, null, this,
+        public LongMaskMax compress() {
+            return (LongMaskMax)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                LongVectorMax.class, LongMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -676,30 +689,30 @@ final class LongMaxVector extends LongVector {
 
         @Override
         @ForceInline
-        public LongMaxMask and(VectorMask<Long> mask) {
+        public LongMaskMax and(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            LongMaxMask m = (LongMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, LongMaxMask.class, null, long.class, VLENGTH,
+            LongMaskMax m = (LongMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, LongMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public LongMaxMask or(VectorMask<Long> mask) {
+        public LongMaskMax or(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            LongMaxMask m = (LongMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, LongMaxMask.class, null, long.class, VLENGTH,
+            LongMaskMax m = (LongMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, LongMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public LongMaxMask xor(VectorMask<Long> mask) {
+        public LongMaskMax xor(VectorMask<Long> mask) {
             Objects.requireNonNull(mask);
-            LongMaxMask m = (LongMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, LongMaxMask.class, null, long.class, VLENGTH,
+            LongMaskMax m = (LongMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, LongMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -709,21 +722,21 @@ final class LongMaxVector extends LongVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, LongMaxMask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, LongMaxMask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, LongMaxMask.class, long.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -733,7 +746,7 @@ final class LongMaxVector extends LongVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, LongMaxMask.class, long.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -743,7 +756,7 @@ final class LongMaxVector extends LongVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(LongMaxMask.class, long.class, VLENGTH,
+            return VectorSupport.extract(LongMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -752,48 +765,49 @@ final class LongMaxVector extends LongVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, LongMaxMask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_ne, LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((LongMaxMask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((LongMaskMax)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, LongMaxMask.class, long.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((LongMaxMask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((LongMaskMax)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static LongMaxMask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(LongMaxMask.class, long.class, VLENGTH,
+        static LongMaskMax maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(LongMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final LongMaxMask  TRUE_MASK = new LongMaxMask(true);
-        private static final LongMaxMask FALSE_MASK = new LongMaxMask(false);
+        private static final LongMaskMax  TRUE_MASK = new LongMaskMax(true);
+        private static final LongMaskMax FALSE_MASK = new LongMaskMax(false);
 
     }
 
     // Shuffle
 
-    static final class LongMaxShuffle extends AbstractShuffle<Long> {
+    static final class LongShuffleMax extends AbstractShuffle<Long> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Long> ETYPE = long.class; // used by the JVM
 
-        LongMaxShuffle(long[] indices) {
+        static final Class<Long> CTYPE = long.class; // used by the JVM
+
+        LongShuffleMax(long[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        LongMaxShuffle(int[] indices, int i) {
+        LongShuffleMax(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        LongMaxShuffle(IntUnaryOperator fn) {
+        LongShuffleMax(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -813,23 +827,23 @@ final class LongMaxVector extends LongVector {
             assert(VLENGTH < Long.MAX_VALUE);
             assert(Long.MIN_VALUE <= -VLENGTH);
         }
-        static final LongMaxShuffle IOTA = new LongMaxShuffle(IDENTITY);
+        static final LongShuffleMax IOTA = new LongShuffleMax(IDENTITY);
 
         @Override
         @ForceInline
-        public LongMaxVector toVector() {
+        public LongVectorMax toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        LongMaxVector toBitsVector() {
-            return (LongMaxVector) super.toBitsVectorTemplate();
+        LongVectorMax toBitsVector() {
+            return (LongVectorMax) super.toBitsVectorTemplate();
         }
 
         @Override
-        LongMaxVector toBitsVector0() {
-            return ((LongMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        LongVectorMax toBitsVector0() {
+            return ((LongVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -901,30 +915,30 @@ final class LongMaxVector extends LongVector {
 
         @Override
         @ForceInline
-        public final LongMaxMask laneIsValid() {
-            return (LongMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final LongMaskMax laneIsValid() {
+            return (LongMaskMax) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final LongMaxShuffle rearrange(VectorShuffle<Long> shuffle) {
-            LongMaxShuffle concreteShuffle = (LongMaxShuffle) shuffle;
-            return (LongMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+        public final LongShuffleMax rearrange(VectorShuffle<Long> shuffle) {
+            LongShuffleMax concreteShuffle = (LongShuffleMax) shuffle;
+            return (LongShuffleMax) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final LongMaxShuffle wrapIndexes() {
-            LongMaxVector v = toBitsVector();
+        public final LongShuffleMax wrapIndexes() {
+            LongVectorMax v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (LongMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (LongVectorMax) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (LongMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (LongVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (LongMaxShuffle) v.toShuffle(vspecies(), false);
+            return (LongShuffleMax) v.toShuffle(vspecies(), false);
         }
 
         private static long[] prepare(int[] indices, int offset) {
@@ -975,14 +989,14 @@ final class LongMaxVector extends LongVector {
     @Override
     final
     LongVector fromArray0(long[] a, int offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromArray0Template(LongMaxMask.class, a, offset, (LongMaxMask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(LongMaskMax.class, a, offset, (LongMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     LongVector fromArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        return super.fromArray0Template(LongMaxMask.class, a, offset, indexMap, mapOffset, (LongMaxMask) m);
+        return super.fromArray0Template(LongMaskMax.class, a, offset, indexMap, mapOffset, (LongMaskMax) m);
     }
 
 
@@ -998,7 +1012,7 @@ final class LongMaxVector extends LongVector {
     @Override
     final
     LongVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(LongMaxMask.class, ms, offset, (LongMaxMask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(LongMaskMax.class, ms, offset, (LongMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1012,14 +1026,14 @@ final class LongMaxVector extends LongVector {
     @Override
     final
     void intoArray0(long[] a, int offset, VectorMask<Long> m) {
-        super.intoArray0Template(LongMaxMask.class, a, offset, (LongMaxMask) m);
+        super.intoArray0Template(LongMaskMax.class, a, offset, (LongMaskMax) m);
     }
 
     @ForceInline
     @Override
     final
     void intoArray0(long[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Long> m) {
-        super.intoArray0Template(LongMaxMask.class, a, offset, indexMap, mapOffset, (LongMaxMask) m);
+        super.intoArray0Template(LongMaskMax.class, a, offset, indexMap, mapOffset, (LongMaskMax) m);
     }
 
 
@@ -1027,7 +1041,7 @@ final class LongMaxVector extends LongVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Long> m) {
-        super.intoMemorySegment0Template(LongMaxMask.class, ms, offset, (LongMaxMask) m);
+        super.intoMemorySegment0Template(LongMaskMax.class, ms, offset, (LongMaskMax) m);
     }
 
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
index e222c6d25f3..7ba465706e8 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
     static final ValueLayout.OfShort ELEMENT_LAYOUT = ValueLayout.JAVA_SHORT.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = LT_SHORT;
+
+    static final int LANEBITS_TYPE_ORDINAL = LT_SHORT;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -80,8 +84,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -573,7 +577,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     @ForceInline
     public static ShortVector zero(VectorSpecies<Short> species) {
         ShortSpecies vsp = (ShortSpecies) species;
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), short.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                                 0, MODE_BROADCAST, vsp,
                                 ((bits_, s_) -> s_.rvOp(i -> bits_)));
     }
@@ -695,7 +699,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, short.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, ShortVector::unaryOperations));
     }
@@ -723,7 +727,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, short.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, ShortVector::unaryOperations));
     }
@@ -796,7 +800,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, short.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, ShortVector::binaryOperations));
     }
@@ -847,7 +851,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, short.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, ShortVector::binaryOperations));
     }
@@ -1034,7 +1038,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), null, short.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, e, null,
             BIN_INT_IMPL.find(op, opc, ShortVector::broadcastIntOperations));
     }
@@ -1055,7 +1059,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), maskClass, short.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, e, m,
             BIN_INT_IMPL.find(op, opc, ShortVector::broadcastIntOperations));
     }
@@ -1132,7 +1136,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, short.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, ShortVector::ternaryOperations));
     }
@@ -1172,7 +1176,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, short.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, ShortVector::ternaryOperations));
     }
@@ -2071,7 +2075,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, short.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Short> m
@@ -2093,7 +2097,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, short.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<Short> cmpM
@@ -2224,7 +2228,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     blendTemplate(Class<M> maskType, ShortVector v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, short.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2241,7 +2245,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), short.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2433,7 +2437,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, short.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2460,7 +2464,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, short.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2486,7 +2490,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         VectorMask<Short> valid = shuffle.laneIsValid();
         ShortVector r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, short.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2494,7 +2498,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
                 }));
         ShortVector r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, short.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2544,7 +2548,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (ShortVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        short.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -2563,7 +2567,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return (ShortVector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        short.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -2578,7 +2582,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     /*package-private*/
     @ForceInline
     final ShortVector selectFromTemplate(ShortVector v) {
-        return (ShortVector)VectorSupport.selectFromOp(getClass(), null, short.class,
+        return (ShortVector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -2598,7 +2602,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector selectFromTemplate(ShortVector v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return (ShortVector)VectorSupport.selectFromOp(getClass(), masktype, short.class,
+        return (ShortVector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -2616,7 +2620,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     /*package-private*/
     @ForceInline
     final ShortVector selectFromTemplate(ShortVector v1, ShortVector v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), short.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -2836,7 +2840,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, short.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, ShortVector::reductionOperations)));
     }
@@ -2854,7 +2858,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, short.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, ShortVector::reductionOperations)));
     }
@@ -2874,9 +2878,9 @@ public abstract class ShortVector extends AbstractVector<Short> {
             case VECTOR_OP_MAX: return (v, m) ->
                     toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (short) Math.max(a, b)));
             case VECTOR_OP_UMIN: return (v, m) ->
-                    toBits(v.rOp(MAX_OR_INF, m, (i, a, b) -> (short) VectorMath.minUnsigned(a, b)));
+                    toBits(v.rOp(UMAX_VALUE, m, (i, a, b) -> (short) VectorMath.minUnsigned(a, b)));
             case VECTOR_OP_UMAX: return (v, m) ->
-                    toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> (short) VectorMath.maxUnsigned(a, b)));
+                    toBits(v.rOp(UMIN_VALUE, m, (i, a, b) -> (short) VectorMath.maxUnsigned(a, b)));
             case VECTOR_OP_SUADD: return (v, m) ->
                     toBits(v.rOp((short)0, m, (i, a, b) -> (short) VectorMath.addSaturatingUnsigned(a, b)));
             case VECTOR_OP_AND: return (v, m) ->
@@ -2891,6 +2895,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
     private static final short MIN_OR_INF = Short.MIN_VALUE;
     private static final short MAX_OR_INF = Short.MAX_VALUE;
+    private static final short UMIN_VALUE = (short)0;   // Minimum unsigned value
+    private static final short UMAX_VALUE = (short)-1;  // Maximum unsigned value
 
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op);
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op,
@@ -3135,7 +3141,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
 
         return VectorSupport.loadWithMap(
-            vectorType, null, short.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3468,7 +3474,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         offset = checkFromIndexSize(offset, length(), a.length);
         ShortSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3617,7 +3623,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         offset = checkFromIndexSize(offset, length(), a.length);
         ShortSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, charArrayAddress(a, offset), false,
             this,
             a, offset,
@@ -3822,7 +3828,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector fromArray0Template(short[] a, int offset) {
         ShortSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3839,7 +3845,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         m.check(species());
         ShortSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3886,7 +3892,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         }
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, short.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -3902,7 +3908,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector fromCharArray0Template(char[] a, int offset) {
         ShortSpecies vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, charArrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -3919,7 +3925,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         m.check(species());
         ShortSpecies vsp = vspecies();
         return VectorSupport.loadMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 a, charArrayAddress(a, offset), false, m, offsetInRange,
                 a, offset, vsp,
                 (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -3934,7 +3940,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     ShortVector fromMemorySegment0Template(MemorySegment ms, long offset) {
         ShortSpecies vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, ShortVector::memorySegmentGet);
@@ -3950,7 +3956,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         ShortSpecies vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, ShortVector::memorySegmentGet);
@@ -3968,7 +3974,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     void intoArray0Template(short[] a, int offset) {
         ShortSpecies vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -3985,7 +3991,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         m.check(species());
         ShortSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -4000,7 +4006,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         ShortSpecies vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -4017,7 +4023,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         ShortSpecies vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -4035,7 +4041,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         m.check(species());
         ShortSpecies vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, charArrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -4072,6 +4078,18 @@ public abstract class ShortVector extends AbstractVector<Short> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    ShortVector swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+        int subLanesPerSrc = subLanesToSwap(srcSpecies);
+        if (subLanesPerSrc < 0) {
+            return this;
+        }
+        VectorShuffle<Short> shuffle = normalizeSubLanesForSpecies(this.vspecies(), subLanesPerSrc);
+        return (ShortVector) this.rearrange(shuffle);
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_SHORT_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -4255,7 +4273,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
         final ShortVector broadcastBits(long bits) {
             return (ShortVector)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, short.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -4437,13 +4455,13 @@ public abstract class ShortVector extends AbstractVector<Short> {
         @Override
         @ForceInline
         public final ShortVector zero() {
-            if ((Class<?>) vectorType() == ShortMaxVector.class)
-                return ShortMaxVector.ZERO;
+            if ((Class<?>) vectorType() == ShortVectorMax.class)
+                return ShortVectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return Short64Vector.ZERO;
-                case 128: return Short128Vector.ZERO;
-                case 256: return Short256Vector.ZERO;
-                case 512: return Short512Vector.ZERO;
+                case 64: return ShortVector64.ZERO;
+                case 128: return ShortVector128.ZERO;
+                case 256: return ShortVector256.ZERO;
+                case 512: return ShortVector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -4451,13 +4469,13 @@ public abstract class ShortVector extends AbstractVector<Short> {
         @Override
         @ForceInline
         public final ShortVector iota() {
-            if ((Class<?>) vectorType() == ShortMaxVector.class)
-                return ShortMaxVector.IOTA;
+            if ((Class<?>) vectorType() == ShortVectorMax.class)
+                return ShortVectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return Short64Vector.IOTA;
-                case 128: return Short128Vector.IOTA;
-                case 256: return Short256Vector.IOTA;
-                case 512: return Short512Vector.IOTA;
+                case 64: return ShortVector64.IOTA;
+                case 128: return ShortVector128.IOTA;
+                case 256: return ShortVector256.IOTA;
+                case 512: return ShortVector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -4466,13 +4484,13 @@ public abstract class ShortVector extends AbstractVector<Short> {
         @Override
         @ForceInline
         public final VectorMask<Short> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == ShortMaxVector.class)
-                return ShortMaxVector.ShortMaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == ShortVectorMax.class)
+                return ShortVectorMax.ShortMaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return Short64Vector.Short64Mask.maskAll(bit);
-                case 128: return Short128Vector.Short128Mask.maskAll(bit);
-                case 256: return Short256Vector.Short256Mask.maskAll(bit);
-                case 512: return Short512Vector.Short512Mask.maskAll(bit);
+                case 64: return ShortVector64.ShortMask64.maskAll(bit);
+                case 128: return ShortVector128.ShortMask128.maskAll(bit);
+                case 256: return ShortVector256.ShortMask256.maskAll(bit);
+                case 512: return ShortVector512.ShortMask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -4500,42 +4518,42 @@ public abstract class ShortVector extends AbstractVector<Short> {
     /** Species representing {@link ShortVector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<Short> SPECIES_64
         = new ShortSpecies(VectorShape.S_64_BIT,
-                            Short64Vector.class,
-                            Short64Vector.Short64Mask.class,
-                            Short64Vector.Short64Shuffle.class,
-                            Short64Vector::new);
+                            ShortVector64.class,
+                            ShortVector64.ShortMask64.class,
+                            ShortVector64.ShortShuffle64.class,
+                            ShortVector64::new);
 
     /** Species representing {@link ShortVector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<Short> SPECIES_128
         = new ShortSpecies(VectorShape.S_128_BIT,
-                            Short128Vector.class,
-                            Short128Vector.Short128Mask.class,
-                            Short128Vector.Short128Shuffle.class,
-                            Short128Vector::new);
+                            ShortVector128.class,
+                            ShortVector128.ShortMask128.class,
+                            ShortVector128.ShortShuffle128.class,
+                            ShortVector128::new);
 
     /** Species representing {@link ShortVector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<Short> SPECIES_256
         = new ShortSpecies(VectorShape.S_256_BIT,
-                            Short256Vector.class,
-                            Short256Vector.Short256Mask.class,
-                            Short256Vector.Short256Shuffle.class,
-                            Short256Vector::new);
+                            ShortVector256.class,
+                            ShortVector256.ShortMask256.class,
+                            ShortVector256.ShortShuffle256.class,
+                            ShortVector256::new);
 
     /** Species representing {@link ShortVector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<Short> SPECIES_512
         = new ShortSpecies(VectorShape.S_512_BIT,
-                            Short512Vector.class,
-                            Short512Vector.Short512Mask.class,
-                            Short512Vector.Short512Shuffle.class,
-                            Short512Vector::new);
+                            ShortVector512.class,
+                            ShortVector512.ShortMask512.class,
+                            ShortVector512.ShortShuffle512.class,
+                            ShortVector512::new);
 
     /** Species representing {@link ShortVector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<Short> SPECIES_MAX
         = new ShortSpecies(VectorShape.S_Max_BIT,
-                            ShortMaxVector.class,
-                            ShortMaxVector.ShortMaxMask.class,
-                            ShortMaxVector.ShortMaxShuffle.class,
-                            ShortMaxVector::new);
+                            ShortVectorMax.class,
+                            ShortVectorMax.ShortMaskMax.class,
+                            ShortVectorMax.ShortShuffleMax.class,
+                            ShortVectorMax::new);
 
     /**
      * Preferred species for {@link ShortVector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector128.java
similarity index 64%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector128.java
index 60f22eb5fb9..e989cdbdbea 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector128.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Short128Vector extends ShortVector {
+final class ShortVector128 extends ShortVector {
     static final ShortSpecies VSPECIES =
         (ShortSpecies) ShortVector.SPECIES_128;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Short128Vector> VCLASS = Short128Vector.class;
+    static final Class<ShortVector128> VCLASS = ShortVector128.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Short> CTYPE = short.class; // carrier type used by the JVM
+
     static final Class<Short> ETYPE = short.class; // used by the JVM
 
-    Short128Vector(short[] v) {
+    ShortVector128(short[] v) {
         super(v);
     }
 
-    // For compatibility as Short128Vector::new,
+    // For compatibility as ShortVector128::new,
     // stored into species.vectorFactory.
-    Short128Vector(Object v) {
+    ShortVector128(Object v) {
         this((short[]) v);
     }
 
-    static final Short128Vector ZERO = new Short128Vector(new short[VLENGTH]);
-    static final Short128Vector IOTA = new Short128Vector(VSPECIES.iotaArray());
+    static final ShortVector128 ZERO = new ShortVector128(new short[VLENGTH]);
+    static final ShortVector128 IOTA = new ShortVector128(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Short128Vector extends ShortVector {
     @Override
     public final Class<Short> elementType() { return short.class; }
 
+    @ForceInline
+    final Class<Short> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Short.SIZE; }
@@ -119,55 +124,62 @@ final class Short128Vector extends ShortVector {
         return (short[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Short128Vector broadcast(short e) {
-        return (Short128Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector128 broadcast(short e) {
+        return (ShortVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short128Vector broadcast(long e) {
-        return (Short128Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector128 broadcast(long e) {
+        return (ShortVector128) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Short128Mask maskFromArray(boolean[] bits) {
-        return new Short128Mask(bits);
+    ShortMask128 maskFromArray(boolean[] bits) {
+        return new ShortMask128(bits);
     }
 
     @Override
     @ForceInline
-    Short128Shuffle iotaShuffle() { return Short128Shuffle.IOTA; }
+    ShortShuffle128 iotaShuffle() { return ShortShuffle128.IOTA; }
 
     @Override
     @ForceInline
-    Short128Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Short128Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
+    ShortShuffle128 iotaShuffle(int start, int step, boolean wrap) {
+        return (ShortShuffle128) iotaShuffleTemplate((short) start, (short) step, wrap);
     }
 
     @Override
     @ForceInline
-    Short128Shuffle shuffleFromArray(int[] indices, int i) { return new Short128Shuffle(indices, i); }
+    ShortShuffle128 shuffleFromArray(int[] indices, int i) { return new ShortShuffle128(indices, i); }
 
     @Override
     @ForceInline
-    Short128Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Short128Shuffle(fn); }
+    ShortShuffle128 shuffleFromOp(IntUnaryOperator fn) { return new ShortShuffle128(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Short128Vector vectorFactory(short[] vec) {
-        return new Short128Vector(vec);
+    ShortVector128 vectorFactory(short[] vec) {
+        return new ShortVector128(vec);
     }
 
     @ForceInline
     final @Override
-    Byte128Vector asByteVectorRaw() {
-        return (Byte128Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector128 asByteVectorRaw() {
+        return (ByteVector128) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Short128Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short128Vector uOp(FUnOp f) {
-        return (Short128Vector) super.uOpTemplate(f);  // specialize
+    ShortVector128 uOp(FUnOp f) {
+        return (ShortVector128) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short128Vector uOp(VectorMask<Short> m, FUnOp f) {
-        return (Short128Vector)
-            super.uOpTemplate((Short128Mask)m, f);  // specialize
+    ShortVector128 uOp(VectorMask<Short> m, FUnOp f) {
+        return (ShortVector128)
+            super.uOpTemplate((ShortMask128)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Short128Vector bOp(Vector<Short> v, FBinOp f) {
-        return (Short128Vector) super.bOpTemplate((Short128Vector)v, f);  // specialize
+    ShortVector128 bOp(Vector<Short> v, FBinOp f) {
+        return (ShortVector128) super.bOpTemplate((ShortVector128)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short128Vector bOp(Vector<Short> v,
+    ShortVector128 bOp(Vector<Short> v,
                      VectorMask<Short> m, FBinOp f) {
-        return (Short128Vector)
-            super.bOpTemplate((Short128Vector)v, (Short128Mask)m,
+        return (ShortVector128)
+            super.bOpTemplate((ShortVector128)v, (ShortMask128)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Short128Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short128Vector tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
-        return (Short128Vector)
-            super.tOpTemplate((Short128Vector)v1, (Short128Vector)v2,
+    ShortVector128 tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
+        return (ShortVector128)
+            super.tOpTemplate((ShortVector128)v1, (ShortVector128)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short128Vector tOp(Vector<Short> v1, Vector<Short> v2,
+    ShortVector128 tOp(Vector<Short> v1, Vector<Short> v2,
                      VectorMask<Short> m, FTriOp f) {
-        return (Short128Vector)
-            super.tOpTemplate((Short128Vector)v1, (Short128Vector)v2,
-                              (Short128Mask)m, f);  // specialize
+        return (ShortVector128)
+            super.tOpTemplate((ShortVector128)v1, (ShortVector128)v2,
+                              (ShortMask128)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Short128Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public Short128Vector lanewise(Unary op) {
-        return (Short128Vector) super.lanewiseTemplate(op);  // specialize
+    public ShortVector128 lanewise(Unary op) {
+        return (ShortVector128) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector lanewise(Unary op, VectorMask<Short> m) {
-        return (Short128Vector) super.lanewiseTemplate(op, Short128Mask.class, (Short128Mask) m);  // specialize
+    public ShortVector128 lanewise(Unary op, VectorMask<Short> m) {
+        return (ShortVector128) super.lanewiseTemplate(op, ShortMask128.class, (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector lanewise(Binary op, Vector<Short> v) {
-        return (Short128Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ShortVector128 lanewise(Binary op, Vector<Short> v) {
+        return (ShortVector128) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
-        return (Short128Vector) super.lanewiseTemplate(op, Short128Mask.class, v, (Short128Mask) m);  // specialize
+    public ShortVector128 lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector128) super.lanewiseTemplate(op, ShortMask128.class, v, (ShortMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short128Vector
+    @ForceInline ShortVector128
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Short128Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ShortVector128) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short128Vector
+    @ForceInline ShortVector128
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Short> m) {
-        return (Short128Vector) super.lanewiseShiftTemplate(op, Short128Mask.class, e, (Short128Mask) m);  // specialize
+        return (ShortVector128) super.lanewiseShiftTemplate(op, ShortMask128.class, e, (ShortMask128) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Short128Vector
+    ShortVector128
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2) {
-        return (Short128Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ShortVector128) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short128Vector
+    ShortVector128
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2, VectorMask<Short> m) {
-        return (Short128Vector) super.lanewiseTemplate(op, Short128Mask.class, v1, v2, (Short128Mask) m);  // specialize
+        return (ShortVector128) super.lanewiseTemplate(op, ShortMask128.class, v1, v2, (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short128Vector addIndex(int scale) {
-        return (Short128Vector) super.addIndexTemplate(scale);  // specialize
+    ShortVector128 addIndex(int scale) {
+        return (ShortVector128) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Short128Vector extends ShortVector {
     @ForceInline
     public final short reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Short> m) {
-        return super.reduceLanesTemplate(op, Short128Mask.class, (Short128Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ShortMask128.class, (ShortMask128) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Short128Vector extends ShortVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Short> m) {
-        return (long) super.reduceLanesTemplate(op, Short128Mask.class, (Short128Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ShortMask128.class, (ShortMask128) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Short128Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public final Short128Shuffle toShuffle() {
-        return (Short128Shuffle) toShuffle(vspecies(), false);
+    public final ShortShuffle128 toShuffle() {
+        return (ShortShuffle128) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Short128Mask test(Test op) {
-        return super.testTemplate(Short128Mask.class, op);  // specialize
+    public final ShortMask128 test(Test op) {
+        return super.testTemplate(ShortMask128.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short128Mask test(Test op, VectorMask<Short> m) {
-        return super.testTemplate(Short128Mask.class, op, (Short128Mask) m);  // specialize
+    public final ShortMask128 test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(ShortMask128.class, op, (ShortMask128) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Short128Mask compare(Comparison op, Vector<Short> v) {
-        return super.compareTemplate(Short128Mask.class, op, v);  // specialize
+    public final ShortMask128 compare(Comparison op, Vector<Short> v) {
+        return super.compareTemplate(ShortMask128.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short128Mask compare(Comparison op, short s) {
-        return super.compareTemplate(Short128Mask.class, op, s);  // specialize
+    public final ShortMask128 compare(Comparison op, short s) {
+        return super.compareTemplate(ShortMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short128Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Short128Mask.class, op, s);  // specialize
+    public final ShortMask128 compare(Comparison op, long s) {
+        return super.compareTemplate(ShortMask128.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short128Mask compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
-        return super.compareTemplate(Short128Mask.class, op, v, (Short128Mask) m);
+    public final ShortMask128 compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
+        return super.compareTemplate(ShortMask128.class, op, v, (ShortMask128) m);
     }
 
 
     @Override
     @ForceInline
-    public Short128Vector blend(Vector<Short> v, VectorMask<Short> m) {
-        return (Short128Vector)
-            super.blendTemplate(Short128Mask.class,
-                                (Short128Vector) v,
-                                (Short128Mask) m);  // specialize
+    public ShortVector128 blend(Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector128)
+            super.blendTemplate(ShortMask128.class,
+                                (ShortVector128) v,
+                                (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector slice(int origin, Vector<Short> v) {
-        return (Short128Vector) super.sliceTemplate(origin, v);  // specialize
+    public ShortVector128 slice(int origin, Vector<Short> v) {
+        return (ShortVector128) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector slice(int origin) {
-        return (Short128Vector) super.sliceTemplate(origin);  // specialize
+    public ShortVector128 slice(int origin) {
+        return (ShortVector128) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector unslice(int origin, Vector<Short> w, int part) {
-        return (Short128Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ShortVector128 unslice(int origin, Vector<Short> w, int part) {
+        return (ShortVector128) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
-        return (Short128Vector)
-            super.unsliceTemplate(Short128Mask.class,
+    public ShortVector128 unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
+        return (ShortVector128)
+            super.unsliceTemplate(ShortMask128.class,
                                   origin, w, part,
-                                  (Short128Mask) m);  // specialize
+                                  (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector unslice(int origin) {
-        return (Short128Vector) super.unsliceTemplate(origin);  // specialize
+    public ShortVector128 unslice(int origin) {
+        return (ShortVector128) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector rearrange(VectorShuffle<Short> s) {
-        return (Short128Vector)
-            super.rearrangeTemplate(Short128Shuffle.class,
-                                    (Short128Shuffle) s);  // specialize
+    public ShortVector128 rearrange(VectorShuffle<Short> s) {
+        return (ShortVector128)
+            super.rearrangeTemplate(ShortShuffle128.class,
+                                    (ShortShuffle128) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector rearrange(VectorShuffle<Short> shuffle,
+    public ShortVector128 rearrange(VectorShuffle<Short> shuffle,
                                   VectorMask<Short> m) {
-        return (Short128Vector)
-            super.rearrangeTemplate(Short128Shuffle.class,
-                                    Short128Mask.class,
-                                    (Short128Shuffle) shuffle,
-                                    (Short128Mask) m);  // specialize
+        return (ShortVector128)
+            super.rearrangeTemplate(ShortShuffle128.class,
+                                    ShortMask128.class,
+                                    (ShortShuffle128) shuffle,
+                                    (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector rearrange(VectorShuffle<Short> s,
+    public ShortVector128 rearrange(VectorShuffle<Short> s,
                                   Vector<Short> v) {
-        return (Short128Vector)
-            super.rearrangeTemplate(Short128Shuffle.class,
-                                    (Short128Shuffle) s,
-                                    (Short128Vector) v);  // specialize
+        return (ShortVector128)
+            super.rearrangeTemplate(ShortShuffle128.class,
+                                    (ShortShuffle128) s,
+                                    (ShortVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector compress(VectorMask<Short> m) {
-        return (Short128Vector)
-            super.compressTemplate(Short128Mask.class,
-                                   (Short128Mask) m);  // specialize
+    public ShortVector128 compress(VectorMask<Short> m) {
+        return (ShortVector128)
+            super.compressTemplate(ShortMask128.class,
+                                   (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector expand(VectorMask<Short> m) {
-        return (Short128Vector)
-            super.expandTemplate(Short128Mask.class,
-                                   (Short128Mask) m);  // specialize
+    public ShortVector128 expand(VectorMask<Short> m) {
+        return (ShortVector128)
+            super.expandTemplate(ShortMask128.class,
+                                   (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector selectFrom(Vector<Short> v) {
-        return (Short128Vector)
-            super.selectFromTemplate((Short128Vector) v);  // specialize
+    public ShortVector128 selectFrom(Vector<Short> v) {
+        return (ShortVector128)
+            super.selectFromTemplate((ShortVector128) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector selectFrom(Vector<Short> v,
+    public ShortVector128 selectFrom(Vector<Short> v,
                                    VectorMask<Short> m) {
-        return (Short128Vector)
-            super.selectFromTemplate((Short128Vector) v,
-                                     Short128Mask.class, (Short128Mask) m);  // specialize
+        return (ShortVector128)
+            super.selectFromTemplate((ShortVector128) v,
+                                     ShortMask128.class, (ShortMask128) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short128Vector selectFrom(Vector<Short> v1,
+    public ShortVector128 selectFrom(Vector<Short> v1,
                                    Vector<Short> v2) {
-        return (Short128Vector)
-            super.selectFromTemplate((Short128Vector) v1, (Short128Vector) v2);  // specialize
+        return (ShortVector128)
+            super.selectFromTemplate((ShortVector128) v1, (ShortVector128) v2);  // specialize
     }
 
     @ForceInline
@@ -533,7 +545,7 @@ final class Short128Vector extends ShortVector {
     @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     short[] vecarr = vec.vec();
@@ -543,7 +555,7 @@ final class Short128Vector extends ShortVector {
 
     @ForceInline
     @Override
-    public Short128Vector withLane(int i, short e) {
+    public ShortVector128 withLane(int i, short e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -558,9 +570,9 @@ final class Short128Vector extends ShortVector {
     }
 
     @ForceInline
-    public Short128Vector withLaneHelper(int i, short e) {
+    public ShortVector128 withLaneHelper(int i, short e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     short[] res = v.vec().clone();
@@ -571,19 +583,20 @@ final class Short128Vector extends ShortVector {
 
     // Mask
 
-    static final class Short128Mask extends AbstractMask<Short> {
+    static final class ShortMask128 extends AbstractMask<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short128Mask(boolean[] bits) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortMask128(boolean[] bits) {
             this(bits, 0);
         }
 
-        Short128Mask(boolean[] bits, int offset) {
+        ShortMask128(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Short128Mask(boolean val) {
+        ShortMask128(boolean val) {
             super(prepare(val));
         }
 
@@ -616,31 +629,31 @@ final class Short128Vector extends ShortVector {
         }
 
         @Override
-        Short128Mask uOp(MUnOp f) {
+        ShortMask128 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Short128Mask(res);
+            return new ShortMask128(res);
         }
 
         @Override
-        Short128Mask bOp(VectorMask<Short> m, MBinOp f) {
+        ShortMask128 bOp(VectorMask<Short> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Short128Mask)m).getBits();
+            boolean[] mbits = ((ShortMask128)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Short128Mask(res);
+            return new ShortMask128(res);
         }
 
         @ForceInline
         @Override
         public final
-        Short128Vector toVector() {
-            return (Short128Vector) super.toVectorTemplate();  // specialize
+        ShortVector128 toVector() {
+            return (ShortVector128) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -664,8 +677,8 @@ final class Short128Vector extends ShortVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -673,25 +686,25 @@ final class Short128Vector extends ShortVector {
         @Override
         @ForceInline
         /*package-private*/
-        Short128Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Short128Mask) VectorSupport.indexPartiallyInUpperRange(
-                Short128Mask.class, short.class, VLENGTH, offset, limit,
-                (o, l) -> (Short128Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ShortMask128 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ShortMask128) VectorSupport.indexPartiallyInUpperRange(
+                ShortMask128.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ShortMask128) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Short128Mask not() {
+        public ShortMask128 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Short128Mask compress() {
-            return (Short128Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Short128Vector.class, Short128Mask.class, ETYPE, VLENGTH, null, this,
+        public ShortMask128 compress() {
+            return (ShortMask128)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ShortVector128.class, ShortMask128.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -700,30 +713,30 @@ final class Short128Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public Short128Mask and(VectorMask<Short> mask) {
+        public ShortMask128 and(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short128Mask m = (Short128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Short128Mask.class, null, short.class, VLENGTH,
+            ShortMask128 m = (ShortMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ShortMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Short128Mask or(VectorMask<Short> mask) {
+        public ShortMask128 or(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short128Mask m = (Short128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Short128Mask.class, null, short.class, VLENGTH,
+            ShortMask128 m = (ShortMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ShortMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Short128Mask xor(VectorMask<Short> mask) {
+        public ShortMask128 xor(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short128Mask m = (Short128Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Short128Mask.class, null, short.class, VLENGTH,
+            ShortMask128 m = (ShortMask128)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ShortMask128.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -733,21 +746,21 @@ final class Short128Vector extends ShortVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Short128Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Short128Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Short128Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -757,7 +770,7 @@ final class Short128Vector extends ShortVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Short128Mask.class, short.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -767,7 +780,7 @@ final class Short128Vector extends ShortVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Short128Mask.class, short.class, VLENGTH,
+            return VectorSupport.extract(ShortMask128.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -776,48 +789,49 @@ final class Short128Vector extends ShortVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Short128Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Short128Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ShortMask128)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Short128Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Short128Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ShortMask128)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Short128Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Short128Mask.class, short.class, VLENGTH,
+        static ShortMask128 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ShortMask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Short128Mask  TRUE_MASK = new Short128Mask(true);
-        private static final Short128Mask FALSE_MASK = new Short128Mask(false);
+        private static final ShortMask128  TRUE_MASK = new ShortMask128(true);
+        private static final ShortMask128 FALSE_MASK = new ShortMask128(false);
 
     }
 
     // Shuffle
 
-    static final class Short128Shuffle extends AbstractShuffle<Short> {
+    static final class ShortShuffle128 extends AbstractShuffle<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short128Shuffle(short[] indices) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortShuffle128(short[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Short128Shuffle(int[] indices, int i) {
+        ShortShuffle128(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Short128Shuffle(IntUnaryOperator fn) {
+        ShortShuffle128(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -837,23 +851,23 @@ final class Short128Vector extends ShortVector {
             assert(VLENGTH < Short.MAX_VALUE);
             assert(Short.MIN_VALUE <= -VLENGTH);
         }
-        static final Short128Shuffle IOTA = new Short128Shuffle(IDENTITY);
+        static final ShortShuffle128 IOTA = new ShortShuffle128(IDENTITY);
 
         @Override
         @ForceInline
-        public Short128Vector toVector() {
+        public ShortVector128 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Short128Vector toBitsVector() {
-            return (Short128Vector) super.toBitsVectorTemplate();
+        ShortVector128 toBitsVector() {
+            return (ShortVector128) super.toBitsVectorTemplate();
         }
 
         @Override
-        Short128Vector toBitsVector0() {
-            return ((Short128Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ShortVector128 toBitsVector0() {
+            return ((ShortVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -890,30 +904,30 @@ final class Short128Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public final Short128Mask laneIsValid() {
-            return (Short128Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ShortMask128 laneIsValid() {
+            return (ShortMask128) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Short128Shuffle rearrange(VectorShuffle<Short> shuffle) {
-            Short128Shuffle concreteShuffle = (Short128Shuffle) shuffle;
-            return (Short128Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ShortShuffle128 rearrange(VectorShuffle<Short> shuffle) {
+            ShortShuffle128 concreteShuffle = (ShortShuffle128) shuffle;
+            return (ShortShuffle128) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Short128Shuffle wrapIndexes() {
-            Short128Vector v = toBitsVector();
+        public final ShortShuffle128 wrapIndexes() {
+            ShortVector128 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Short128Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ShortVector128) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Short128Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ShortVector128) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Short128Shuffle) v.toShuffle(vspecies(), false);
+            return (ShortShuffle128) v.toShuffle(vspecies(), false);
         }
 
         private static short[] prepare(int[] indices, int offset) {
@@ -964,14 +978,14 @@ final class Short128Vector extends ShortVector {
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromArray0Template(Short128Mask.class, a, offset, (Short128Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ShortMask128.class, a, offset, (ShortMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
-        return super.fromArray0Template(Short128Mask.class, a, offset, indexMap, mapOffset, (Short128Mask) m);
+        return super.fromArray0Template(ShortMask128.class, a, offset, indexMap, mapOffset, (ShortMask128) m);
     }
 
     @ForceInline
@@ -985,7 +999,7 @@ final class Short128Vector extends ShortVector {
     @Override
     final
     ShortVector fromCharArray0(char[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromCharArray0Template(Short128Mask.class, a, offset, (Short128Mask) m, offsetInRange);  // specialize
+        return super.fromCharArray0Template(ShortMask128.class, a, offset, (ShortMask128) m, offsetInRange);  // specialize
     }
 
 
@@ -1000,7 +1014,7 @@ final class Short128Vector extends ShortVector {
     @Override
     final
     ShortVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Short128Mask.class, ms, offset, (Short128Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ShortMask128.class, ms, offset, (ShortMask128) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1014,7 +1028,7 @@ final class Short128Vector extends ShortVector {
     @Override
     final
     void intoArray0(short[] a, int offset, VectorMask<Short> m) {
-        super.intoArray0Template(Short128Mask.class, a, offset, (Short128Mask) m);
+        super.intoArray0Template(ShortMask128.class, a, offset, (ShortMask128) m);
     }
 
 
@@ -1023,14 +1037,14 @@ final class Short128Vector extends ShortVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m) {
-        super.intoMemorySegment0Template(Short128Mask.class, ms, offset, (Short128Mask) m);
+        super.intoMemorySegment0Template(ShortMask128.class, ms, offset, (ShortMask128) m);
     }
 
     @ForceInline
     @Override
     final
     void intoCharArray0(char[] a, int offset, VectorMask<Short> m) {
-        super.intoCharArray0Template(Short128Mask.class, a, offset, (Short128Mask) m);
+        super.intoCharArray0Template(ShortMask128.class, a, offset, (ShortMask128) m);
     }
 
     // End of specialized low-level memory operations.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector256.java
similarity index 64%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector256.java
index 14c415afac2..c74188e22f5 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Short256Vector extends ShortVector {
+final class ShortVector256 extends ShortVector {
     static final ShortSpecies VSPECIES =
         (ShortSpecies) ShortVector.SPECIES_256;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Short256Vector> VCLASS = Short256Vector.class;
+    static final Class<ShortVector256> VCLASS = ShortVector256.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Short> CTYPE = short.class; // carrier type used by the JVM
+
     static final Class<Short> ETYPE = short.class; // used by the JVM
 
-    Short256Vector(short[] v) {
+    ShortVector256(short[] v) {
         super(v);
     }
 
-    // For compatibility as Short256Vector::new,
+    // For compatibility as ShortVector256::new,
     // stored into species.vectorFactory.
-    Short256Vector(Object v) {
+    ShortVector256(Object v) {
         this((short[]) v);
     }
 
-    static final Short256Vector ZERO = new Short256Vector(new short[VLENGTH]);
-    static final Short256Vector IOTA = new Short256Vector(VSPECIES.iotaArray());
+    static final ShortVector256 ZERO = new ShortVector256(new short[VLENGTH]);
+    static final ShortVector256 IOTA = new ShortVector256(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Short256Vector extends ShortVector {
     @Override
     public final Class<Short> elementType() { return short.class; }
 
+    @ForceInline
+    final Class<Short> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Short.SIZE; }
@@ -119,55 +124,62 @@ final class Short256Vector extends ShortVector {
         return (short[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Short256Vector broadcast(short e) {
-        return (Short256Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector256 broadcast(short e) {
+        return (ShortVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short256Vector broadcast(long e) {
-        return (Short256Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector256 broadcast(long e) {
+        return (ShortVector256) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Short256Mask maskFromArray(boolean[] bits) {
-        return new Short256Mask(bits);
+    ShortMask256 maskFromArray(boolean[] bits) {
+        return new ShortMask256(bits);
     }
 
     @Override
     @ForceInline
-    Short256Shuffle iotaShuffle() { return Short256Shuffle.IOTA; }
+    ShortShuffle256 iotaShuffle() { return ShortShuffle256.IOTA; }
 
     @Override
     @ForceInline
-    Short256Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Short256Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
+    ShortShuffle256 iotaShuffle(int start, int step, boolean wrap) {
+        return (ShortShuffle256) iotaShuffleTemplate((short) start, (short) step, wrap);
     }
 
     @Override
     @ForceInline
-    Short256Shuffle shuffleFromArray(int[] indices, int i) { return new Short256Shuffle(indices, i); }
+    ShortShuffle256 shuffleFromArray(int[] indices, int i) { return new ShortShuffle256(indices, i); }
 
     @Override
     @ForceInline
-    Short256Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Short256Shuffle(fn); }
+    ShortShuffle256 shuffleFromOp(IntUnaryOperator fn) { return new ShortShuffle256(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Short256Vector vectorFactory(short[] vec) {
-        return new Short256Vector(vec);
+    ShortVector256 vectorFactory(short[] vec) {
+        return new ShortVector256(vec);
     }
 
     @ForceInline
     final @Override
-    Byte256Vector asByteVectorRaw() {
-        return (Byte256Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector256 asByteVectorRaw() {
+        return (ByteVector256) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Short256Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short256Vector uOp(FUnOp f) {
-        return (Short256Vector) super.uOpTemplate(f);  // specialize
+    ShortVector256 uOp(FUnOp f) {
+        return (ShortVector256) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short256Vector uOp(VectorMask<Short> m, FUnOp f) {
-        return (Short256Vector)
-            super.uOpTemplate((Short256Mask)m, f);  // specialize
+    ShortVector256 uOp(VectorMask<Short> m, FUnOp f) {
+        return (ShortVector256)
+            super.uOpTemplate((ShortMask256)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Short256Vector bOp(Vector<Short> v, FBinOp f) {
-        return (Short256Vector) super.bOpTemplate((Short256Vector)v, f);  // specialize
+    ShortVector256 bOp(Vector<Short> v, FBinOp f) {
+        return (ShortVector256) super.bOpTemplate((ShortVector256)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short256Vector bOp(Vector<Short> v,
+    ShortVector256 bOp(Vector<Short> v,
                      VectorMask<Short> m, FBinOp f) {
-        return (Short256Vector)
-            super.bOpTemplate((Short256Vector)v, (Short256Mask)m,
+        return (ShortVector256)
+            super.bOpTemplate((ShortVector256)v, (ShortMask256)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Short256Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short256Vector tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
-        return (Short256Vector)
-            super.tOpTemplate((Short256Vector)v1, (Short256Vector)v2,
+    ShortVector256 tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
+        return (ShortVector256)
+            super.tOpTemplate((ShortVector256)v1, (ShortVector256)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short256Vector tOp(Vector<Short> v1, Vector<Short> v2,
+    ShortVector256 tOp(Vector<Short> v1, Vector<Short> v2,
                      VectorMask<Short> m, FTriOp f) {
-        return (Short256Vector)
-            super.tOpTemplate((Short256Vector)v1, (Short256Vector)v2,
-                              (Short256Mask)m, f);  // specialize
+        return (ShortVector256)
+            super.tOpTemplate((ShortVector256)v1, (ShortVector256)v2,
+                              (ShortMask256)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Short256Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public Short256Vector lanewise(Unary op) {
-        return (Short256Vector) super.lanewiseTemplate(op);  // specialize
+    public ShortVector256 lanewise(Unary op) {
+        return (ShortVector256) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector lanewise(Unary op, VectorMask<Short> m) {
-        return (Short256Vector) super.lanewiseTemplate(op, Short256Mask.class, (Short256Mask) m);  // specialize
+    public ShortVector256 lanewise(Unary op, VectorMask<Short> m) {
+        return (ShortVector256) super.lanewiseTemplate(op, ShortMask256.class, (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector lanewise(Binary op, Vector<Short> v) {
-        return (Short256Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ShortVector256 lanewise(Binary op, Vector<Short> v) {
+        return (ShortVector256) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
-        return (Short256Vector) super.lanewiseTemplate(op, Short256Mask.class, v, (Short256Mask) m);  // specialize
+    public ShortVector256 lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector256) super.lanewiseTemplate(op, ShortMask256.class, v, (ShortMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short256Vector
+    @ForceInline ShortVector256
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Short256Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ShortVector256) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short256Vector
+    @ForceInline ShortVector256
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Short> m) {
-        return (Short256Vector) super.lanewiseShiftTemplate(op, Short256Mask.class, e, (Short256Mask) m);  // specialize
+        return (ShortVector256) super.lanewiseShiftTemplate(op, ShortMask256.class, e, (ShortMask256) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Short256Vector
+    ShortVector256
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2) {
-        return (Short256Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ShortVector256) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short256Vector
+    ShortVector256
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2, VectorMask<Short> m) {
-        return (Short256Vector) super.lanewiseTemplate(op, Short256Mask.class, v1, v2, (Short256Mask) m);  // specialize
+        return (ShortVector256) super.lanewiseTemplate(op, ShortMask256.class, v1, v2, (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short256Vector addIndex(int scale) {
-        return (Short256Vector) super.addIndexTemplate(scale);  // specialize
+    ShortVector256 addIndex(int scale) {
+        return (ShortVector256) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Short256Vector extends ShortVector {
     @ForceInline
     public final short reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Short> m) {
-        return super.reduceLanesTemplate(op, Short256Mask.class, (Short256Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ShortMask256.class, (ShortMask256) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Short256Vector extends ShortVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Short> m) {
-        return (long) super.reduceLanesTemplate(op, Short256Mask.class, (Short256Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ShortMask256.class, (ShortMask256) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Short256Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public final Short256Shuffle toShuffle() {
-        return (Short256Shuffle) toShuffle(vspecies(), false);
+    public final ShortShuffle256 toShuffle() {
+        return (ShortShuffle256) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Short256Mask test(Test op) {
-        return super.testTemplate(Short256Mask.class, op);  // specialize
+    public final ShortMask256 test(Test op) {
+        return super.testTemplate(ShortMask256.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short256Mask test(Test op, VectorMask<Short> m) {
-        return super.testTemplate(Short256Mask.class, op, (Short256Mask) m);  // specialize
+    public final ShortMask256 test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(ShortMask256.class, op, (ShortMask256) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Short256Mask compare(Comparison op, Vector<Short> v) {
-        return super.compareTemplate(Short256Mask.class, op, v);  // specialize
+    public final ShortMask256 compare(Comparison op, Vector<Short> v) {
+        return super.compareTemplate(ShortMask256.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short256Mask compare(Comparison op, short s) {
-        return super.compareTemplate(Short256Mask.class, op, s);  // specialize
+    public final ShortMask256 compare(Comparison op, short s) {
+        return super.compareTemplate(ShortMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short256Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Short256Mask.class, op, s);  // specialize
+    public final ShortMask256 compare(Comparison op, long s) {
+        return super.compareTemplate(ShortMask256.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short256Mask compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
-        return super.compareTemplate(Short256Mask.class, op, v, (Short256Mask) m);
+    public final ShortMask256 compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
+        return super.compareTemplate(ShortMask256.class, op, v, (ShortMask256) m);
     }
 
 
     @Override
     @ForceInline
-    public Short256Vector blend(Vector<Short> v, VectorMask<Short> m) {
-        return (Short256Vector)
-            super.blendTemplate(Short256Mask.class,
-                                (Short256Vector) v,
-                                (Short256Mask) m);  // specialize
+    public ShortVector256 blend(Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector256)
+            super.blendTemplate(ShortMask256.class,
+                                (ShortVector256) v,
+                                (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector slice(int origin, Vector<Short> v) {
-        return (Short256Vector) super.sliceTemplate(origin, v);  // specialize
+    public ShortVector256 slice(int origin, Vector<Short> v) {
+        return (ShortVector256) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector slice(int origin) {
-        return (Short256Vector) super.sliceTemplate(origin);  // specialize
+    public ShortVector256 slice(int origin) {
+        return (ShortVector256) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector unslice(int origin, Vector<Short> w, int part) {
-        return (Short256Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ShortVector256 unslice(int origin, Vector<Short> w, int part) {
+        return (ShortVector256) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
-        return (Short256Vector)
-            super.unsliceTemplate(Short256Mask.class,
+    public ShortVector256 unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
+        return (ShortVector256)
+            super.unsliceTemplate(ShortMask256.class,
                                   origin, w, part,
-                                  (Short256Mask) m);  // specialize
+                                  (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector unslice(int origin) {
-        return (Short256Vector) super.unsliceTemplate(origin);  // specialize
+    public ShortVector256 unslice(int origin) {
+        return (ShortVector256) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector rearrange(VectorShuffle<Short> s) {
-        return (Short256Vector)
-            super.rearrangeTemplate(Short256Shuffle.class,
-                                    (Short256Shuffle) s);  // specialize
+    public ShortVector256 rearrange(VectorShuffle<Short> s) {
+        return (ShortVector256)
+            super.rearrangeTemplate(ShortShuffle256.class,
+                                    (ShortShuffle256) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector rearrange(VectorShuffle<Short> shuffle,
+    public ShortVector256 rearrange(VectorShuffle<Short> shuffle,
                                   VectorMask<Short> m) {
-        return (Short256Vector)
-            super.rearrangeTemplate(Short256Shuffle.class,
-                                    Short256Mask.class,
-                                    (Short256Shuffle) shuffle,
-                                    (Short256Mask) m);  // specialize
+        return (ShortVector256)
+            super.rearrangeTemplate(ShortShuffle256.class,
+                                    ShortMask256.class,
+                                    (ShortShuffle256) shuffle,
+                                    (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector rearrange(VectorShuffle<Short> s,
+    public ShortVector256 rearrange(VectorShuffle<Short> s,
                                   Vector<Short> v) {
-        return (Short256Vector)
-            super.rearrangeTemplate(Short256Shuffle.class,
-                                    (Short256Shuffle) s,
-                                    (Short256Vector) v);  // specialize
+        return (ShortVector256)
+            super.rearrangeTemplate(ShortShuffle256.class,
+                                    (ShortShuffle256) s,
+                                    (ShortVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector compress(VectorMask<Short> m) {
-        return (Short256Vector)
-            super.compressTemplate(Short256Mask.class,
-                                   (Short256Mask) m);  // specialize
+    public ShortVector256 compress(VectorMask<Short> m) {
+        return (ShortVector256)
+            super.compressTemplate(ShortMask256.class,
+                                   (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector expand(VectorMask<Short> m) {
-        return (Short256Vector)
-            super.expandTemplate(Short256Mask.class,
-                                   (Short256Mask) m);  // specialize
+    public ShortVector256 expand(VectorMask<Short> m) {
+        return (ShortVector256)
+            super.expandTemplate(ShortMask256.class,
+                                   (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector selectFrom(Vector<Short> v) {
-        return (Short256Vector)
-            super.selectFromTemplate((Short256Vector) v);  // specialize
+    public ShortVector256 selectFrom(Vector<Short> v) {
+        return (ShortVector256)
+            super.selectFromTemplate((ShortVector256) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector selectFrom(Vector<Short> v,
+    public ShortVector256 selectFrom(Vector<Short> v,
                                    VectorMask<Short> m) {
-        return (Short256Vector)
-            super.selectFromTemplate((Short256Vector) v,
-                                     Short256Mask.class, (Short256Mask) m);  // specialize
+        return (ShortVector256)
+            super.selectFromTemplate((ShortVector256) v,
+                                     ShortMask256.class, (ShortMask256) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short256Vector selectFrom(Vector<Short> v1,
+    public ShortVector256 selectFrom(Vector<Short> v1,
                                    Vector<Short> v2) {
-        return (Short256Vector)
-            super.selectFromTemplate((Short256Vector) v1, (Short256Vector) v2);  // specialize
+        return (ShortVector256)
+            super.selectFromTemplate((ShortVector256) v1, (ShortVector256) v2);  // specialize
     }
 
     @ForceInline
@@ -541,7 +553,7 @@ final class Short256Vector extends ShortVector {
     @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     short[] vecarr = vec.vec();
@@ -551,7 +563,7 @@ final class Short256Vector extends ShortVector {
 
     @ForceInline
     @Override
-    public Short256Vector withLane(int i, short e) {
+    public ShortVector256 withLane(int i, short e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -574,9 +586,9 @@ final class Short256Vector extends ShortVector {
     }
 
     @ForceInline
-    public Short256Vector withLaneHelper(int i, short e) {
+    public ShortVector256 withLaneHelper(int i, short e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     short[] res = v.vec().clone();
@@ -587,19 +599,20 @@ final class Short256Vector extends ShortVector {
 
     // Mask
 
-    static final class Short256Mask extends AbstractMask<Short> {
+    static final class ShortMask256 extends AbstractMask<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short256Mask(boolean[] bits) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortMask256(boolean[] bits) {
             this(bits, 0);
         }
 
-        Short256Mask(boolean[] bits, int offset) {
+        ShortMask256(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Short256Mask(boolean val) {
+        ShortMask256(boolean val) {
             super(prepare(val));
         }
 
@@ -632,31 +645,31 @@ final class Short256Vector extends ShortVector {
         }
 
         @Override
-        Short256Mask uOp(MUnOp f) {
+        ShortMask256 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Short256Mask(res);
+            return new ShortMask256(res);
         }
 
         @Override
-        Short256Mask bOp(VectorMask<Short> m, MBinOp f) {
+        ShortMask256 bOp(VectorMask<Short> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Short256Mask)m).getBits();
+            boolean[] mbits = ((ShortMask256)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Short256Mask(res);
+            return new ShortMask256(res);
         }
 
         @ForceInline
         @Override
         public final
-        Short256Vector toVector() {
-            return (Short256Vector) super.toVectorTemplate();  // specialize
+        ShortVector256 toVector() {
+            return (ShortVector256) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -680,8 +693,8 @@ final class Short256Vector extends ShortVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -689,25 +702,25 @@ final class Short256Vector extends ShortVector {
         @Override
         @ForceInline
         /*package-private*/
-        Short256Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Short256Mask) VectorSupport.indexPartiallyInUpperRange(
-                Short256Mask.class, short.class, VLENGTH, offset, limit,
-                (o, l) -> (Short256Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ShortMask256 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ShortMask256) VectorSupport.indexPartiallyInUpperRange(
+                ShortMask256.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ShortMask256) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Short256Mask not() {
+        public ShortMask256 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Short256Mask compress() {
-            return (Short256Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Short256Vector.class, Short256Mask.class, ETYPE, VLENGTH, null, this,
+        public ShortMask256 compress() {
+            return (ShortMask256)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ShortVector256.class, ShortMask256.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -716,30 +729,30 @@ final class Short256Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public Short256Mask and(VectorMask<Short> mask) {
+        public ShortMask256 and(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short256Mask m = (Short256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Short256Mask.class, null, short.class, VLENGTH,
+            ShortMask256 m = (ShortMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ShortMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Short256Mask or(VectorMask<Short> mask) {
+        public ShortMask256 or(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short256Mask m = (Short256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Short256Mask.class, null, short.class, VLENGTH,
+            ShortMask256 m = (ShortMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ShortMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Short256Mask xor(VectorMask<Short> mask) {
+        public ShortMask256 xor(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short256Mask m = (Short256Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Short256Mask.class, null, short.class, VLENGTH,
+            ShortMask256 m = (ShortMask256)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ShortMask256.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -749,21 +762,21 @@ final class Short256Vector extends ShortVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Short256Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Short256Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Short256Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -773,7 +786,7 @@ final class Short256Vector extends ShortVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Short256Mask.class, short.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -783,7 +796,7 @@ final class Short256Vector extends ShortVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Short256Mask.class, short.class, VLENGTH,
+            return VectorSupport.extract(ShortMask256.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -792,48 +805,49 @@ final class Short256Vector extends ShortVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Short256Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Short256Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ShortMask256)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Short256Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Short256Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ShortMask256)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Short256Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Short256Mask.class, short.class, VLENGTH,
+        static ShortMask256 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ShortMask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Short256Mask  TRUE_MASK = new Short256Mask(true);
-        private static final Short256Mask FALSE_MASK = new Short256Mask(false);
+        private static final ShortMask256  TRUE_MASK = new ShortMask256(true);
+        private static final ShortMask256 FALSE_MASK = new ShortMask256(false);
 
     }
 
     // Shuffle
 
-    static final class Short256Shuffle extends AbstractShuffle<Short> {
+    static final class ShortShuffle256 extends AbstractShuffle<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short256Shuffle(short[] indices) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortShuffle256(short[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Short256Shuffle(int[] indices, int i) {
+        ShortShuffle256(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Short256Shuffle(IntUnaryOperator fn) {
+        ShortShuffle256(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -853,23 +867,23 @@ final class Short256Vector extends ShortVector {
             assert(VLENGTH < Short.MAX_VALUE);
             assert(Short.MIN_VALUE <= -VLENGTH);
         }
-        static final Short256Shuffle IOTA = new Short256Shuffle(IDENTITY);
+        static final ShortShuffle256 IOTA = new ShortShuffle256(IDENTITY);
 
         @Override
         @ForceInline
-        public Short256Vector toVector() {
+        public ShortVector256 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Short256Vector toBitsVector() {
-            return (Short256Vector) super.toBitsVectorTemplate();
+        ShortVector256 toBitsVector() {
+            return (ShortVector256) super.toBitsVectorTemplate();
         }
 
         @Override
-        Short256Vector toBitsVector0() {
-            return ((Short256Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ShortVector256 toBitsVector0() {
+            return ((ShortVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -906,30 +920,30 @@ final class Short256Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public final Short256Mask laneIsValid() {
-            return (Short256Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ShortMask256 laneIsValid() {
+            return (ShortMask256) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Short256Shuffle rearrange(VectorShuffle<Short> shuffle) {
-            Short256Shuffle concreteShuffle = (Short256Shuffle) shuffle;
-            return (Short256Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ShortShuffle256 rearrange(VectorShuffle<Short> shuffle) {
+            ShortShuffle256 concreteShuffle = (ShortShuffle256) shuffle;
+            return (ShortShuffle256) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Short256Shuffle wrapIndexes() {
-            Short256Vector v = toBitsVector();
+        public final ShortShuffle256 wrapIndexes() {
+            ShortVector256 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Short256Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ShortVector256) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Short256Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ShortVector256) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Short256Shuffle) v.toShuffle(vspecies(), false);
+            return (ShortShuffle256) v.toShuffle(vspecies(), false);
         }
 
         private static short[] prepare(int[] indices, int offset) {
@@ -980,14 +994,14 @@ final class Short256Vector extends ShortVector {
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromArray0Template(Short256Mask.class, a, offset, (Short256Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ShortMask256.class, a, offset, (ShortMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
-        return super.fromArray0Template(Short256Mask.class, a, offset, indexMap, mapOffset, (Short256Mask) m);
+        return super.fromArray0Template(ShortMask256.class, a, offset, indexMap, mapOffset, (ShortMask256) m);
     }
 
     @ForceInline
@@ -1001,7 +1015,7 @@ final class Short256Vector extends ShortVector {
     @Override
     final
     ShortVector fromCharArray0(char[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromCharArray0Template(Short256Mask.class, a, offset, (Short256Mask) m, offsetInRange);  // specialize
+        return super.fromCharArray0Template(ShortMask256.class, a, offset, (ShortMask256) m, offsetInRange);  // specialize
     }
 
 
@@ -1016,7 +1030,7 @@ final class Short256Vector extends ShortVector {
     @Override
     final
     ShortVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Short256Mask.class, ms, offset, (Short256Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ShortMask256.class, ms, offset, (ShortMask256) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1030,7 +1044,7 @@ final class Short256Vector extends ShortVector {
     @Override
     final
     void intoArray0(short[] a, int offset, VectorMask<Short> m) {
-        super.intoArray0Template(Short256Mask.class, a, offset, (Short256Mask) m);
+        super.intoArray0Template(ShortMask256.class, a, offset, (ShortMask256) m);
     }
 
 
@@ -1039,14 +1053,14 @@ final class Short256Vector extends ShortVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m) {
-        super.intoMemorySegment0Template(Short256Mask.class, ms, offset, (Short256Mask) m);
+        super.intoMemorySegment0Template(ShortMask256.class, ms, offset, (ShortMask256) m);
     }
 
     @ForceInline
     @Override
     final
     void intoCharArray0(char[] a, int offset, VectorMask<Short> m) {
-        super.intoCharArray0Template(Short256Mask.class, a, offset, (Short256Mask) m);
+        super.intoCharArray0Template(ShortMask256.class, a, offset, (ShortMask256) m);
     }
 
     // End of specialized low-level memory operations.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector512.java
similarity index 66%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector512.java
index c92979302a6..46b5d652200 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector512.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Short512Vector extends ShortVector {
+final class ShortVector512 extends ShortVector {
     static final ShortSpecies VSPECIES =
         (ShortSpecies) ShortVector.SPECIES_512;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Short512Vector> VCLASS = Short512Vector.class;
+    static final Class<ShortVector512> VCLASS = ShortVector512.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Short> CTYPE = short.class; // carrier type used by the JVM
+
     static final Class<Short> ETYPE = short.class; // used by the JVM
 
-    Short512Vector(short[] v) {
+    ShortVector512(short[] v) {
         super(v);
     }
 
-    // For compatibility as Short512Vector::new,
+    // For compatibility as ShortVector512::new,
     // stored into species.vectorFactory.
-    Short512Vector(Object v) {
+    ShortVector512(Object v) {
         this((short[]) v);
     }
 
-    static final Short512Vector ZERO = new Short512Vector(new short[VLENGTH]);
-    static final Short512Vector IOTA = new Short512Vector(VSPECIES.iotaArray());
+    static final ShortVector512 ZERO = new ShortVector512(new short[VLENGTH]);
+    static final ShortVector512 IOTA = new ShortVector512(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Short512Vector extends ShortVector {
     @Override
     public final Class<Short> elementType() { return short.class; }
 
+    @ForceInline
+    final Class<Short> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Short.SIZE; }
@@ -119,55 +124,62 @@ final class Short512Vector extends ShortVector {
         return (short[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Short512Vector broadcast(short e) {
-        return (Short512Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector512 broadcast(short e) {
+        return (ShortVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short512Vector broadcast(long e) {
-        return (Short512Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector512 broadcast(long e) {
+        return (ShortVector512) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Short512Mask maskFromArray(boolean[] bits) {
-        return new Short512Mask(bits);
+    ShortMask512 maskFromArray(boolean[] bits) {
+        return new ShortMask512(bits);
     }
 
     @Override
     @ForceInline
-    Short512Shuffle iotaShuffle() { return Short512Shuffle.IOTA; }
+    ShortShuffle512 iotaShuffle() { return ShortShuffle512.IOTA; }
 
     @Override
     @ForceInline
-    Short512Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Short512Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
+    ShortShuffle512 iotaShuffle(int start, int step, boolean wrap) {
+        return (ShortShuffle512) iotaShuffleTemplate((short) start, (short) step, wrap);
     }
 
     @Override
     @ForceInline
-    Short512Shuffle shuffleFromArray(int[] indices, int i) { return new Short512Shuffle(indices, i); }
+    ShortShuffle512 shuffleFromArray(int[] indices, int i) { return new ShortShuffle512(indices, i); }
 
     @Override
     @ForceInline
-    Short512Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Short512Shuffle(fn); }
+    ShortShuffle512 shuffleFromOp(IntUnaryOperator fn) { return new ShortShuffle512(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Short512Vector vectorFactory(short[] vec) {
-        return new Short512Vector(vec);
+    ShortVector512 vectorFactory(short[] vec) {
+        return new ShortVector512(vec);
     }
 
     @ForceInline
     final @Override
-    Byte512Vector asByteVectorRaw() {
-        return (Byte512Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector512 asByteVectorRaw() {
+        return (ByteVector512) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Short512Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short512Vector uOp(FUnOp f) {
-        return (Short512Vector) super.uOpTemplate(f);  // specialize
+    ShortVector512 uOp(FUnOp f) {
+        return (ShortVector512) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short512Vector uOp(VectorMask<Short> m, FUnOp f) {
-        return (Short512Vector)
-            super.uOpTemplate((Short512Mask)m, f);  // specialize
+    ShortVector512 uOp(VectorMask<Short> m, FUnOp f) {
+        return (ShortVector512)
+            super.uOpTemplate((ShortMask512)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Short512Vector bOp(Vector<Short> v, FBinOp f) {
-        return (Short512Vector) super.bOpTemplate((Short512Vector)v, f);  // specialize
+    ShortVector512 bOp(Vector<Short> v, FBinOp f) {
+        return (ShortVector512) super.bOpTemplate((ShortVector512)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short512Vector bOp(Vector<Short> v,
+    ShortVector512 bOp(Vector<Short> v,
                      VectorMask<Short> m, FBinOp f) {
-        return (Short512Vector)
-            super.bOpTemplate((Short512Vector)v, (Short512Mask)m,
+        return (ShortVector512)
+            super.bOpTemplate((ShortVector512)v, (ShortMask512)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Short512Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short512Vector tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
-        return (Short512Vector)
-            super.tOpTemplate((Short512Vector)v1, (Short512Vector)v2,
+    ShortVector512 tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
+        return (ShortVector512)
+            super.tOpTemplate((ShortVector512)v1, (ShortVector512)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short512Vector tOp(Vector<Short> v1, Vector<Short> v2,
+    ShortVector512 tOp(Vector<Short> v1, Vector<Short> v2,
                      VectorMask<Short> m, FTriOp f) {
-        return (Short512Vector)
-            super.tOpTemplate((Short512Vector)v1, (Short512Vector)v2,
-                              (Short512Mask)m, f);  // specialize
+        return (ShortVector512)
+            super.tOpTemplate((ShortVector512)v1, (ShortVector512)v2,
+                              (ShortMask512)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Short512Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public Short512Vector lanewise(Unary op) {
-        return (Short512Vector) super.lanewiseTemplate(op);  // specialize
+    public ShortVector512 lanewise(Unary op) {
+        return (ShortVector512) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector lanewise(Unary op, VectorMask<Short> m) {
-        return (Short512Vector) super.lanewiseTemplate(op, Short512Mask.class, (Short512Mask) m);  // specialize
+    public ShortVector512 lanewise(Unary op, VectorMask<Short> m) {
+        return (ShortVector512) super.lanewiseTemplate(op, ShortMask512.class, (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector lanewise(Binary op, Vector<Short> v) {
-        return (Short512Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ShortVector512 lanewise(Binary op, Vector<Short> v) {
+        return (ShortVector512) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
-        return (Short512Vector) super.lanewiseTemplate(op, Short512Mask.class, v, (Short512Mask) m);  // specialize
+    public ShortVector512 lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector512) super.lanewiseTemplate(op, ShortMask512.class, v, (ShortMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short512Vector
+    @ForceInline ShortVector512
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Short512Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ShortVector512) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short512Vector
+    @ForceInline ShortVector512
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Short> m) {
-        return (Short512Vector) super.lanewiseShiftTemplate(op, Short512Mask.class, e, (Short512Mask) m);  // specialize
+        return (ShortVector512) super.lanewiseShiftTemplate(op, ShortMask512.class, e, (ShortMask512) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Short512Vector
+    ShortVector512
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2) {
-        return (Short512Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ShortVector512) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short512Vector
+    ShortVector512
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2, VectorMask<Short> m) {
-        return (Short512Vector) super.lanewiseTemplate(op, Short512Mask.class, v1, v2, (Short512Mask) m);  // specialize
+        return (ShortVector512) super.lanewiseTemplate(op, ShortMask512.class, v1, v2, (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short512Vector addIndex(int scale) {
-        return (Short512Vector) super.addIndexTemplate(scale);  // specialize
+    ShortVector512 addIndex(int scale) {
+        return (ShortVector512) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Short512Vector extends ShortVector {
     @ForceInline
     public final short reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Short> m) {
-        return super.reduceLanesTemplate(op, Short512Mask.class, (Short512Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ShortMask512.class, (ShortMask512) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Short512Vector extends ShortVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Short> m) {
-        return (long) super.reduceLanesTemplate(op, Short512Mask.class, (Short512Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ShortMask512.class, (ShortMask512) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Short512Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public final Short512Shuffle toShuffle() {
-        return (Short512Shuffle) toShuffle(vspecies(), false);
+    public final ShortShuffle512 toShuffle() {
+        return (ShortShuffle512) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Short512Mask test(Test op) {
-        return super.testTemplate(Short512Mask.class, op);  // specialize
+    public final ShortMask512 test(Test op) {
+        return super.testTemplate(ShortMask512.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short512Mask test(Test op, VectorMask<Short> m) {
-        return super.testTemplate(Short512Mask.class, op, (Short512Mask) m);  // specialize
+    public final ShortMask512 test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(ShortMask512.class, op, (ShortMask512) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Short512Mask compare(Comparison op, Vector<Short> v) {
-        return super.compareTemplate(Short512Mask.class, op, v);  // specialize
+    public final ShortMask512 compare(Comparison op, Vector<Short> v) {
+        return super.compareTemplate(ShortMask512.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short512Mask compare(Comparison op, short s) {
-        return super.compareTemplate(Short512Mask.class, op, s);  // specialize
+    public final ShortMask512 compare(Comparison op, short s) {
+        return super.compareTemplate(ShortMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short512Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Short512Mask.class, op, s);  // specialize
+    public final ShortMask512 compare(Comparison op, long s) {
+        return super.compareTemplate(ShortMask512.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short512Mask compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
-        return super.compareTemplate(Short512Mask.class, op, v, (Short512Mask) m);
+    public final ShortMask512 compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
+        return super.compareTemplate(ShortMask512.class, op, v, (ShortMask512) m);
     }
 
 
     @Override
     @ForceInline
-    public Short512Vector blend(Vector<Short> v, VectorMask<Short> m) {
-        return (Short512Vector)
-            super.blendTemplate(Short512Mask.class,
-                                (Short512Vector) v,
-                                (Short512Mask) m);  // specialize
+    public ShortVector512 blend(Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector512)
+            super.blendTemplate(ShortMask512.class,
+                                (ShortVector512) v,
+                                (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector slice(int origin, Vector<Short> v) {
-        return (Short512Vector) super.sliceTemplate(origin, v);  // specialize
+    public ShortVector512 slice(int origin, Vector<Short> v) {
+        return (ShortVector512) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector slice(int origin) {
-        return (Short512Vector) super.sliceTemplate(origin);  // specialize
+    public ShortVector512 slice(int origin) {
+        return (ShortVector512) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector unslice(int origin, Vector<Short> w, int part) {
-        return (Short512Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ShortVector512 unslice(int origin, Vector<Short> w, int part) {
+        return (ShortVector512) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
-        return (Short512Vector)
-            super.unsliceTemplate(Short512Mask.class,
+    public ShortVector512 unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
+        return (ShortVector512)
+            super.unsliceTemplate(ShortMask512.class,
                                   origin, w, part,
-                                  (Short512Mask) m);  // specialize
+                                  (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector unslice(int origin) {
-        return (Short512Vector) super.unsliceTemplate(origin);  // specialize
+    public ShortVector512 unslice(int origin) {
+        return (ShortVector512) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector rearrange(VectorShuffle<Short> s) {
-        return (Short512Vector)
-            super.rearrangeTemplate(Short512Shuffle.class,
-                                    (Short512Shuffle) s);  // specialize
+    public ShortVector512 rearrange(VectorShuffle<Short> s) {
+        return (ShortVector512)
+            super.rearrangeTemplate(ShortShuffle512.class,
+                                    (ShortShuffle512) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector rearrange(VectorShuffle<Short> shuffle,
+    public ShortVector512 rearrange(VectorShuffle<Short> shuffle,
                                   VectorMask<Short> m) {
-        return (Short512Vector)
-            super.rearrangeTemplate(Short512Shuffle.class,
-                                    Short512Mask.class,
-                                    (Short512Shuffle) shuffle,
-                                    (Short512Mask) m);  // specialize
+        return (ShortVector512)
+            super.rearrangeTemplate(ShortShuffle512.class,
+                                    ShortMask512.class,
+                                    (ShortShuffle512) shuffle,
+                                    (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector rearrange(VectorShuffle<Short> s,
+    public ShortVector512 rearrange(VectorShuffle<Short> s,
                                   Vector<Short> v) {
-        return (Short512Vector)
-            super.rearrangeTemplate(Short512Shuffle.class,
-                                    (Short512Shuffle) s,
-                                    (Short512Vector) v);  // specialize
+        return (ShortVector512)
+            super.rearrangeTemplate(ShortShuffle512.class,
+                                    (ShortShuffle512) s,
+                                    (ShortVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector compress(VectorMask<Short> m) {
-        return (Short512Vector)
-            super.compressTemplate(Short512Mask.class,
-                                   (Short512Mask) m);  // specialize
+    public ShortVector512 compress(VectorMask<Short> m) {
+        return (ShortVector512)
+            super.compressTemplate(ShortMask512.class,
+                                   (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector expand(VectorMask<Short> m) {
-        return (Short512Vector)
-            super.expandTemplate(Short512Mask.class,
-                                   (Short512Mask) m);  // specialize
+    public ShortVector512 expand(VectorMask<Short> m) {
+        return (ShortVector512)
+            super.expandTemplate(ShortMask512.class,
+                                   (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector selectFrom(Vector<Short> v) {
-        return (Short512Vector)
-            super.selectFromTemplate((Short512Vector) v);  // specialize
+    public ShortVector512 selectFrom(Vector<Short> v) {
+        return (ShortVector512)
+            super.selectFromTemplate((ShortVector512) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector selectFrom(Vector<Short> v,
+    public ShortVector512 selectFrom(Vector<Short> v,
                                    VectorMask<Short> m) {
-        return (Short512Vector)
-            super.selectFromTemplate((Short512Vector) v,
-                                     Short512Mask.class, (Short512Mask) m);  // specialize
+        return (ShortVector512)
+            super.selectFromTemplate((ShortVector512) v,
+                                     ShortMask512.class, (ShortMask512) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short512Vector selectFrom(Vector<Short> v1,
+    public ShortVector512 selectFrom(Vector<Short> v1,
                                    Vector<Short> v2) {
-        return (Short512Vector)
-            super.selectFromTemplate((Short512Vector) v1, (Short512Vector) v2);  // specialize
+        return (ShortVector512)
+            super.selectFromTemplate((ShortVector512) v1, (ShortVector512) v2);  // specialize
     }
 
     @ForceInline
@@ -557,7 +569,7 @@ final class Short512Vector extends ShortVector {
     @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     short[] vecarr = vec.vec();
@@ -567,7 +579,7 @@ final class Short512Vector extends ShortVector {
 
     @ForceInline
     @Override
-    public Short512Vector withLane(int i, short e) {
+    public ShortVector512 withLane(int i, short e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -606,9 +618,9 @@ final class Short512Vector extends ShortVector {
     }
 
     @ForceInline
-    public Short512Vector withLaneHelper(int i, short e) {
+    public ShortVector512 withLaneHelper(int i, short e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     short[] res = v.vec().clone();
@@ -619,19 +631,20 @@ final class Short512Vector extends ShortVector {
 
     // Mask
 
-    static final class Short512Mask extends AbstractMask<Short> {
+    static final class ShortMask512 extends AbstractMask<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short512Mask(boolean[] bits) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortMask512(boolean[] bits) {
             this(bits, 0);
         }
 
-        Short512Mask(boolean[] bits, int offset) {
+        ShortMask512(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Short512Mask(boolean val) {
+        ShortMask512(boolean val) {
             super(prepare(val));
         }
 
@@ -664,31 +677,31 @@ final class Short512Vector extends ShortVector {
         }
 
         @Override
-        Short512Mask uOp(MUnOp f) {
+        ShortMask512 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Short512Mask(res);
+            return new ShortMask512(res);
         }
 
         @Override
-        Short512Mask bOp(VectorMask<Short> m, MBinOp f) {
+        ShortMask512 bOp(VectorMask<Short> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Short512Mask)m).getBits();
+            boolean[] mbits = ((ShortMask512)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Short512Mask(res);
+            return new ShortMask512(res);
         }
 
         @ForceInline
         @Override
         public final
-        Short512Vector toVector() {
-            return (Short512Vector) super.toVectorTemplate();  // specialize
+        ShortVector512 toVector() {
+            return (ShortVector512) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -712,8 +725,8 @@ final class Short512Vector extends ShortVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -721,25 +734,25 @@ final class Short512Vector extends ShortVector {
         @Override
         @ForceInline
         /*package-private*/
-        Short512Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Short512Mask) VectorSupport.indexPartiallyInUpperRange(
-                Short512Mask.class, short.class, VLENGTH, offset, limit,
-                (o, l) -> (Short512Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ShortMask512 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ShortMask512) VectorSupport.indexPartiallyInUpperRange(
+                ShortMask512.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ShortMask512) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Short512Mask not() {
+        public ShortMask512 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Short512Mask compress() {
-            return (Short512Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Short512Vector.class, Short512Mask.class, ETYPE, VLENGTH, null, this,
+        public ShortMask512 compress() {
+            return (ShortMask512)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ShortVector512.class, ShortMask512.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -748,30 +761,30 @@ final class Short512Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public Short512Mask and(VectorMask<Short> mask) {
+        public ShortMask512 and(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short512Mask m = (Short512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Short512Mask.class, null, short.class, VLENGTH,
+            ShortMask512 m = (ShortMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ShortMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Short512Mask or(VectorMask<Short> mask) {
+        public ShortMask512 or(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short512Mask m = (Short512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Short512Mask.class, null, short.class, VLENGTH,
+            ShortMask512 m = (ShortMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ShortMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Short512Mask xor(VectorMask<Short> mask) {
+        public ShortMask512 xor(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short512Mask m = (Short512Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Short512Mask.class, null, short.class, VLENGTH,
+            ShortMask512 m = (ShortMask512)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ShortMask512.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -781,21 +794,21 @@ final class Short512Vector extends ShortVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Short512Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Short512Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Short512Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -805,7 +818,7 @@ final class Short512Vector extends ShortVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Short512Mask.class, short.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -815,7 +828,7 @@ final class Short512Vector extends ShortVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Short512Mask.class, short.class, VLENGTH,
+            return VectorSupport.extract(ShortMask512.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -824,48 +837,49 @@ final class Short512Vector extends ShortVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Short512Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Short512Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ShortMask512)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Short512Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Short512Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ShortMask512)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Short512Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Short512Mask.class, short.class, VLENGTH,
+        static ShortMask512 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ShortMask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Short512Mask  TRUE_MASK = new Short512Mask(true);
-        private static final Short512Mask FALSE_MASK = new Short512Mask(false);
+        private static final ShortMask512  TRUE_MASK = new ShortMask512(true);
+        private static final ShortMask512 FALSE_MASK = new ShortMask512(false);
 
     }
 
     // Shuffle
 
-    static final class Short512Shuffle extends AbstractShuffle<Short> {
+    static final class ShortShuffle512 extends AbstractShuffle<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short512Shuffle(short[] indices) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortShuffle512(short[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Short512Shuffle(int[] indices, int i) {
+        ShortShuffle512(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Short512Shuffle(IntUnaryOperator fn) {
+        ShortShuffle512(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -885,23 +899,23 @@ final class Short512Vector extends ShortVector {
             assert(VLENGTH < Short.MAX_VALUE);
             assert(Short.MIN_VALUE <= -VLENGTH);
         }
-        static final Short512Shuffle IOTA = new Short512Shuffle(IDENTITY);
+        static final ShortShuffle512 IOTA = new ShortShuffle512(IDENTITY);
 
         @Override
         @ForceInline
-        public Short512Vector toVector() {
+        public ShortVector512 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Short512Vector toBitsVector() {
-            return (Short512Vector) super.toBitsVectorTemplate();
+        ShortVector512 toBitsVector() {
+            return (ShortVector512) super.toBitsVectorTemplate();
         }
 
         @Override
-        Short512Vector toBitsVector0() {
-            return ((Short512Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ShortVector512 toBitsVector0() {
+            return ((ShortVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -938,30 +952,30 @@ final class Short512Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public final Short512Mask laneIsValid() {
-            return (Short512Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ShortMask512 laneIsValid() {
+            return (ShortMask512) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Short512Shuffle rearrange(VectorShuffle<Short> shuffle) {
-            Short512Shuffle concreteShuffle = (Short512Shuffle) shuffle;
-            return (Short512Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ShortShuffle512 rearrange(VectorShuffle<Short> shuffle) {
+            ShortShuffle512 concreteShuffle = (ShortShuffle512) shuffle;
+            return (ShortShuffle512) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Short512Shuffle wrapIndexes() {
-            Short512Vector v = toBitsVector();
+        public final ShortShuffle512 wrapIndexes() {
+            ShortVector512 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Short512Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ShortVector512) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Short512Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ShortVector512) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Short512Shuffle) v.toShuffle(vspecies(), false);
+            return (ShortShuffle512) v.toShuffle(vspecies(), false);
         }
 
         private static short[] prepare(int[] indices, int offset) {
@@ -1012,14 +1026,14 @@ final class Short512Vector extends ShortVector {
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromArray0Template(Short512Mask.class, a, offset, (Short512Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ShortMask512.class, a, offset, (ShortMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
-        return super.fromArray0Template(Short512Mask.class, a, offset, indexMap, mapOffset, (Short512Mask) m);
+        return super.fromArray0Template(ShortMask512.class, a, offset, indexMap, mapOffset, (ShortMask512) m);
     }
 
     @ForceInline
@@ -1033,7 +1047,7 @@ final class Short512Vector extends ShortVector {
     @Override
     final
     ShortVector fromCharArray0(char[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromCharArray0Template(Short512Mask.class, a, offset, (Short512Mask) m, offsetInRange);  // specialize
+        return super.fromCharArray0Template(ShortMask512.class, a, offset, (ShortMask512) m, offsetInRange);  // specialize
     }
 
 
@@ -1048,7 +1062,7 @@ final class Short512Vector extends ShortVector {
     @Override
     final
     ShortVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Short512Mask.class, ms, offset, (Short512Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ShortMask512.class, ms, offset, (ShortMask512) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1062,7 +1076,7 @@ final class Short512Vector extends ShortVector {
     @Override
     final
     void intoArray0(short[] a, int offset, VectorMask<Short> m) {
-        super.intoArray0Template(Short512Mask.class, a, offset, (Short512Mask) m);
+        super.intoArray0Template(ShortMask512.class, a, offset, (ShortMask512) m);
     }
 
 
@@ -1071,14 +1085,14 @@ final class Short512Vector extends ShortVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m) {
-        super.intoMemorySegment0Template(Short512Mask.class, ms, offset, (Short512Mask) m);
+        super.intoMemorySegment0Template(ShortMask512.class, ms, offset, (ShortMask512) m);
     }
 
     @ForceInline
     @Override
     final
     void intoCharArray0(char[] a, int offset, VectorMask<Short> m) {
-        super.intoCharArray0Template(Short512Mask.class, a, offset, (Short512Mask) m);
+        super.intoCharArray0Template(ShortMask512.class, a, offset, (ShortMask512) m);
     }
 
     // End of specialized low-level memory operations.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector64.java
similarity index 64%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector64.java
index b454989b45f..66ff3efe522 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class Short64Vector extends ShortVector {
+final class ShortVector64 extends ShortVector {
     static final ShortSpecies VSPECIES =
         (ShortSpecies) ShortVector.SPECIES_64;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<Short64Vector> VCLASS = Short64Vector.class;
+    static final Class<ShortVector64> VCLASS = ShortVector64.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Short> CTYPE = short.class; // carrier type used by the JVM
+
     static final Class<Short> ETYPE = short.class; // used by the JVM
 
-    Short64Vector(short[] v) {
+    ShortVector64(short[] v) {
         super(v);
     }
 
-    // For compatibility as Short64Vector::new,
+    // For compatibility as ShortVector64::new,
     // stored into species.vectorFactory.
-    Short64Vector(Object v) {
+    ShortVector64(Object v) {
         this((short[]) v);
     }
 
-    static final Short64Vector ZERO = new Short64Vector(new short[VLENGTH]);
-    static final Short64Vector IOTA = new Short64Vector(VSPECIES.iotaArray());
+    static final ShortVector64 ZERO = new ShortVector64(new short[VLENGTH]);
+    static final ShortVector64 IOTA = new ShortVector64(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class Short64Vector extends ShortVector {
     @Override
     public final Class<Short> elementType() { return short.class; }
 
+    @ForceInline
+    final Class<Short> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Short.SIZE; }
@@ -119,55 +124,62 @@ final class Short64Vector extends ShortVector {
         return (short[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final Short64Vector broadcast(short e) {
-        return (Short64Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector64 broadcast(short e) {
+        return (ShortVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short64Vector broadcast(long e) {
-        return (Short64Vector) super.broadcastTemplate(e);  // specialize
+    public final ShortVector64 broadcast(long e) {
+        return (ShortVector64) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    Short64Mask maskFromArray(boolean[] bits) {
-        return new Short64Mask(bits);
+    ShortMask64 maskFromArray(boolean[] bits) {
+        return new ShortMask64(bits);
     }
 
     @Override
     @ForceInline
-    Short64Shuffle iotaShuffle() { return Short64Shuffle.IOTA; }
+    ShortShuffle64 iotaShuffle() { return ShortShuffle64.IOTA; }
 
     @Override
     @ForceInline
-    Short64Shuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (Short64Shuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
+    ShortShuffle64 iotaShuffle(int start, int step, boolean wrap) {
+        return (ShortShuffle64) iotaShuffleTemplate((short) start, (short) step, wrap);
     }
 
     @Override
     @ForceInline
-    Short64Shuffle shuffleFromArray(int[] indices, int i) { return new Short64Shuffle(indices, i); }
+    ShortShuffle64 shuffleFromArray(int[] indices, int i) { return new ShortShuffle64(indices, i); }
 
     @Override
     @ForceInline
-    Short64Shuffle shuffleFromOp(IntUnaryOperator fn) { return new Short64Shuffle(fn); }
+    ShortShuffle64 shuffleFromOp(IntUnaryOperator fn) { return new ShortShuffle64(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    Short64Vector vectorFactory(short[] vec) {
-        return new Short64Vector(vec);
+    ShortVector64 vectorFactory(short[] vec) {
+        return new ShortVector64(vec);
     }
 
     @ForceInline
     final @Override
-    Byte64Vector asByteVectorRaw() {
-        return (Byte64Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector64 asByteVectorRaw() {
+        return (ByteVector64) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class Short64Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short64Vector uOp(FUnOp f) {
-        return (Short64Vector) super.uOpTemplate(f);  // specialize
+    ShortVector64 uOp(FUnOp f) {
+        return (ShortVector64) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short64Vector uOp(VectorMask<Short> m, FUnOp f) {
-        return (Short64Vector)
-            super.uOpTemplate((Short64Mask)m, f);  // specialize
+    ShortVector64 uOp(VectorMask<Short> m, FUnOp f) {
+        return (ShortVector64)
+            super.uOpTemplate((ShortMask64)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    Short64Vector bOp(Vector<Short> v, FBinOp f) {
-        return (Short64Vector) super.bOpTemplate((Short64Vector)v, f);  // specialize
+    ShortVector64 bOp(Vector<Short> v, FBinOp f) {
+        return (ShortVector64) super.bOpTemplate((ShortVector64)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short64Vector bOp(Vector<Short> v,
+    ShortVector64 bOp(Vector<Short> v,
                      VectorMask<Short> m, FBinOp f) {
-        return (Short64Vector)
-            super.bOpTemplate((Short64Vector)v, (Short64Mask)m,
+        return (ShortVector64)
+            super.bOpTemplate((ShortVector64)v, (ShortMask64)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class Short64Vector extends ShortVector {
 
     @ForceInline
     final @Override
-    Short64Vector tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
-        return (Short64Vector)
-            super.tOpTemplate((Short64Vector)v1, (Short64Vector)v2,
+    ShortVector64 tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
+        return (ShortVector64)
+            super.tOpTemplate((ShortVector64)v1, (ShortVector64)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    Short64Vector tOp(Vector<Short> v1, Vector<Short> v2,
+    ShortVector64 tOp(Vector<Short> v1, Vector<Short> v2,
                      VectorMask<Short> m, FTriOp f) {
-        return (Short64Vector)
-            super.tOpTemplate((Short64Vector)v1, (Short64Vector)v2,
-                              (Short64Mask)m, f);  // specialize
+        return (ShortVector64)
+            super.tOpTemplate((ShortVector64)v1, (ShortVector64)v2,
+                              (ShortMask64)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class Short64Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public Short64Vector lanewise(Unary op) {
-        return (Short64Vector) super.lanewiseTemplate(op);  // specialize
+    public ShortVector64 lanewise(Unary op) {
+        return (ShortVector64) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector lanewise(Unary op, VectorMask<Short> m) {
-        return (Short64Vector) super.lanewiseTemplate(op, Short64Mask.class, (Short64Mask) m);  // specialize
+    public ShortVector64 lanewise(Unary op, VectorMask<Short> m) {
+        return (ShortVector64) super.lanewiseTemplate(op, ShortMask64.class, (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector lanewise(Binary op, Vector<Short> v) {
-        return (Short64Vector) super.lanewiseTemplate(op, v);  // specialize
+    public ShortVector64 lanewise(Binary op, Vector<Short> v) {
+        return (ShortVector64) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
-        return (Short64Vector) super.lanewiseTemplate(op, Short64Mask.class, v, (Short64Mask) m);  // specialize
+    public ShortVector64 lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector64) super.lanewiseTemplate(op, ShortMask64.class, v, (ShortMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short64Vector
+    @ForceInline ShortVector64
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (Short64Vector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ShortVector64) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline Short64Vector
+    @ForceInline ShortVector64
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Short> m) {
-        return (Short64Vector) super.lanewiseShiftTemplate(op, Short64Mask.class, e, (Short64Mask) m);  // specialize
+        return (ShortVector64) super.lanewiseShiftTemplate(op, ShortMask64.class, e, (ShortMask64) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    Short64Vector
+    ShortVector64
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2) {
-        return (Short64Vector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ShortVector64) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short64Vector
+    ShortVector64
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2, VectorMask<Short> m) {
-        return (Short64Vector) super.lanewiseTemplate(op, Short64Mask.class, v1, v2, (Short64Mask) m);  // specialize
+        return (ShortVector64) super.lanewiseTemplate(op, ShortMask64.class, v1, v2, (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    Short64Vector addIndex(int scale) {
-        return (Short64Vector) super.addIndexTemplate(scale);  // specialize
+    ShortVector64 addIndex(int scale) {
+        return (ShortVector64) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class Short64Vector extends ShortVector {
     @ForceInline
     public final short reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Short> m) {
-        return super.reduceLanesTemplate(op, Short64Mask.class, (Short64Mask) m);  // specialized
+        return super.reduceLanesTemplate(op, ShortMask64.class, (ShortMask64) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class Short64Vector extends ShortVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Short> m) {
-        return (long) super.reduceLanesTemplate(op, Short64Mask.class, (Short64Mask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ShortMask64.class, (ShortMask64) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class Short64Vector extends ShortVector {
 
     @Override
     @ForceInline
-    public final Short64Shuffle toShuffle() {
-        return (Short64Shuffle) toShuffle(vspecies(), false);
+    public final ShortShuffle64 toShuffle() {
+        return (ShortShuffle64) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final Short64Mask test(Test op) {
-        return super.testTemplate(Short64Mask.class, op);  // specialize
+    public final ShortMask64 test(Test op) {
+        return super.testTemplate(ShortMask64.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short64Mask test(Test op, VectorMask<Short> m) {
-        return super.testTemplate(Short64Mask.class, op, (Short64Mask) m);  // specialize
+    public final ShortMask64 test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(ShortMask64.class, op, (ShortMask64) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final Short64Mask compare(Comparison op, Vector<Short> v) {
-        return super.compareTemplate(Short64Mask.class, op, v);  // specialize
+    public final ShortMask64 compare(Comparison op, Vector<Short> v) {
+        return super.compareTemplate(ShortMask64.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short64Mask compare(Comparison op, short s) {
-        return super.compareTemplate(Short64Mask.class, op, s);  // specialize
+    public final ShortMask64 compare(Comparison op, short s) {
+        return super.compareTemplate(ShortMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short64Mask compare(Comparison op, long s) {
-        return super.compareTemplate(Short64Mask.class, op, s);  // specialize
+    public final ShortMask64 compare(Comparison op, long s) {
+        return super.compareTemplate(ShortMask64.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final Short64Mask compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
-        return super.compareTemplate(Short64Mask.class, op, v, (Short64Mask) m);
+    public final ShortMask64 compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
+        return super.compareTemplate(ShortMask64.class, op, v, (ShortMask64) m);
     }
 
 
     @Override
     @ForceInline
-    public Short64Vector blend(Vector<Short> v, VectorMask<Short> m) {
-        return (Short64Vector)
-            super.blendTemplate(Short64Mask.class,
-                                (Short64Vector) v,
-                                (Short64Mask) m);  // specialize
+    public ShortVector64 blend(Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVector64)
+            super.blendTemplate(ShortMask64.class,
+                                (ShortVector64) v,
+                                (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector slice(int origin, Vector<Short> v) {
-        return (Short64Vector) super.sliceTemplate(origin, v);  // specialize
+    public ShortVector64 slice(int origin, Vector<Short> v) {
+        return (ShortVector64) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector slice(int origin) {
-        return (Short64Vector) super.sliceTemplate(origin);  // specialize
+    public ShortVector64 slice(int origin) {
+        return (ShortVector64) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector unslice(int origin, Vector<Short> w, int part) {
-        return (Short64Vector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ShortVector64 unslice(int origin, Vector<Short> w, int part) {
+        return (ShortVector64) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
-        return (Short64Vector)
-            super.unsliceTemplate(Short64Mask.class,
+    public ShortVector64 unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
+        return (ShortVector64)
+            super.unsliceTemplate(ShortMask64.class,
                                   origin, w, part,
-                                  (Short64Mask) m);  // specialize
+                                  (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector unslice(int origin) {
-        return (Short64Vector) super.unsliceTemplate(origin);  // specialize
+    public ShortVector64 unslice(int origin) {
+        return (ShortVector64) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector rearrange(VectorShuffle<Short> s) {
-        return (Short64Vector)
-            super.rearrangeTemplate(Short64Shuffle.class,
-                                    (Short64Shuffle) s);  // specialize
+    public ShortVector64 rearrange(VectorShuffle<Short> s) {
+        return (ShortVector64)
+            super.rearrangeTemplate(ShortShuffle64.class,
+                                    (ShortShuffle64) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector rearrange(VectorShuffle<Short> shuffle,
+    public ShortVector64 rearrange(VectorShuffle<Short> shuffle,
                                   VectorMask<Short> m) {
-        return (Short64Vector)
-            super.rearrangeTemplate(Short64Shuffle.class,
-                                    Short64Mask.class,
-                                    (Short64Shuffle) shuffle,
-                                    (Short64Mask) m);  // specialize
+        return (ShortVector64)
+            super.rearrangeTemplate(ShortShuffle64.class,
+                                    ShortMask64.class,
+                                    (ShortShuffle64) shuffle,
+                                    (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector rearrange(VectorShuffle<Short> s,
+    public ShortVector64 rearrange(VectorShuffle<Short> s,
                                   Vector<Short> v) {
-        return (Short64Vector)
-            super.rearrangeTemplate(Short64Shuffle.class,
-                                    (Short64Shuffle) s,
-                                    (Short64Vector) v);  // specialize
+        return (ShortVector64)
+            super.rearrangeTemplate(ShortShuffle64.class,
+                                    (ShortShuffle64) s,
+                                    (ShortVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector compress(VectorMask<Short> m) {
-        return (Short64Vector)
-            super.compressTemplate(Short64Mask.class,
-                                   (Short64Mask) m);  // specialize
+    public ShortVector64 compress(VectorMask<Short> m) {
+        return (ShortVector64)
+            super.compressTemplate(ShortMask64.class,
+                                   (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector expand(VectorMask<Short> m) {
-        return (Short64Vector)
-            super.expandTemplate(Short64Mask.class,
-                                   (Short64Mask) m);  // specialize
+    public ShortVector64 expand(VectorMask<Short> m) {
+        return (ShortVector64)
+            super.expandTemplate(ShortMask64.class,
+                                   (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector selectFrom(Vector<Short> v) {
-        return (Short64Vector)
-            super.selectFromTemplate((Short64Vector) v);  // specialize
+    public ShortVector64 selectFrom(Vector<Short> v) {
+        return (ShortVector64)
+            super.selectFromTemplate((ShortVector64) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector selectFrom(Vector<Short> v,
+    public ShortVector64 selectFrom(Vector<Short> v,
                                    VectorMask<Short> m) {
-        return (Short64Vector)
-            super.selectFromTemplate((Short64Vector) v,
-                                     Short64Mask.class, (Short64Mask) m);  // specialize
+        return (ShortVector64)
+            super.selectFromTemplate((ShortVector64) v,
+                                     ShortMask64.class, (ShortMask64) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public Short64Vector selectFrom(Vector<Short> v1,
+    public ShortVector64 selectFrom(Vector<Short> v1,
                                    Vector<Short> v2) {
-        return (Short64Vector)
-            super.selectFromTemplate((Short64Vector) v1, (Short64Vector) v2);  // specialize
+        return (ShortVector64)
+            super.selectFromTemplate((ShortVector64) v1, (ShortVector64) v2);  // specialize
     }
 
     @ForceInline
@@ -529,7 +541,7 @@ final class Short64Vector extends ShortVector {
     @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     short[] vecarr = vec.vec();
@@ -539,7 +551,7 @@ final class Short64Vector extends ShortVector {
 
     @ForceInline
     @Override
-    public Short64Vector withLane(int i, short e) {
+    public ShortVector64 withLane(int i, short e) {
         switch (i) {
             case 0: return withLaneHelper(0, e);
             case 1: return withLaneHelper(1, e);
@@ -550,9 +562,9 @@ final class Short64Vector extends ShortVector {
     }
 
     @ForceInline
-    public Short64Vector withLaneHelper(int i, short e) {
+    public ShortVector64 withLaneHelper(int i, short e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     short[] res = v.vec().clone();
@@ -563,19 +575,20 @@ final class Short64Vector extends ShortVector {
 
     // Mask
 
-    static final class Short64Mask extends AbstractMask<Short> {
+    static final class ShortMask64 extends AbstractMask<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short64Mask(boolean[] bits) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortMask64(boolean[] bits) {
             this(bits, 0);
         }
 
-        Short64Mask(boolean[] bits, int offset) {
+        ShortMask64(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        Short64Mask(boolean val) {
+        ShortMask64(boolean val) {
             super(prepare(val));
         }
 
@@ -608,31 +621,31 @@ final class Short64Vector extends ShortVector {
         }
 
         @Override
-        Short64Mask uOp(MUnOp f) {
+        ShortMask64 uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new Short64Mask(res);
+            return new ShortMask64(res);
         }
 
         @Override
-        Short64Mask bOp(VectorMask<Short> m, MBinOp f) {
+        ShortMask64 bOp(VectorMask<Short> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((Short64Mask)m).getBits();
+            boolean[] mbits = ((ShortMask64)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new Short64Mask(res);
+            return new ShortMask64(res);
         }
 
         @ForceInline
         @Override
         public final
-        Short64Vector toVector() {
-            return (Short64Vector) super.toVectorTemplate();  // specialize
+        ShortVector64 toVector() {
+            return (ShortVector64) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -656,8 +669,8 @@ final class Short64Vector extends ShortVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -665,25 +678,25 @@ final class Short64Vector extends ShortVector {
         @Override
         @ForceInline
         /*package-private*/
-        Short64Mask indexPartiallyInUpperRange(long offset, long limit) {
-            return (Short64Mask) VectorSupport.indexPartiallyInUpperRange(
-                Short64Mask.class, short.class, VLENGTH, offset, limit,
-                (o, l) -> (Short64Mask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ShortMask64 indexPartiallyInUpperRange(long offset, long limit) {
+            return (ShortMask64) VectorSupport.indexPartiallyInUpperRange(
+                ShortMask64.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ShortMask64) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public Short64Mask not() {
+        public ShortMask64 not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public Short64Mask compress() {
-            return (Short64Mask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                Short64Vector.class, Short64Mask.class, ETYPE, VLENGTH, null, this,
+        public ShortMask64 compress() {
+            return (ShortMask64)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ShortVector64.class, ShortMask64.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -692,30 +705,30 @@ final class Short64Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public Short64Mask and(VectorMask<Short> mask) {
+        public ShortMask64 and(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short64Mask m = (Short64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, Short64Mask.class, null, short.class, VLENGTH,
+            ShortMask64 m = (ShortMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ShortMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Short64Mask or(VectorMask<Short> mask) {
+        public ShortMask64 or(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short64Mask m = (Short64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, Short64Mask.class, null, short.class, VLENGTH,
+            ShortMask64 m = (ShortMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ShortMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public Short64Mask xor(VectorMask<Short> mask) {
+        public ShortMask64 xor(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            Short64Mask m = (Short64Mask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, Short64Mask.class, null, short.class, VLENGTH,
+            ShortMask64 m = (ShortMask64)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ShortMask64.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -725,21 +738,21 @@ final class Short64Vector extends ShortVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, Short64Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, Short64Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, Short64Mask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -749,7 +762,7 @@ final class Short64Vector extends ShortVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, Short64Mask.class, short.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -759,7 +772,7 @@ final class Short64Vector extends ShortVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(Short64Mask.class, short.class, VLENGTH,
+            return VectorSupport.extract(ShortMask64.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -768,48 +781,49 @@ final class Short64Vector extends ShortVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, Short64Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((Short64Mask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ShortMask64)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, Short64Mask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((Short64Mask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ShortMask64)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static Short64Mask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(Short64Mask.class, short.class, VLENGTH,
+        static ShortMask64 maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ShortMask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final Short64Mask  TRUE_MASK = new Short64Mask(true);
-        private static final Short64Mask FALSE_MASK = new Short64Mask(false);
+        private static final ShortMask64  TRUE_MASK = new ShortMask64(true);
+        private static final ShortMask64 FALSE_MASK = new ShortMask64(false);
 
     }
 
     // Shuffle
 
-    static final class Short64Shuffle extends AbstractShuffle<Short> {
+    static final class ShortShuffle64 extends AbstractShuffle<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        Short64Shuffle(short[] indices) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortShuffle64(short[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        Short64Shuffle(int[] indices, int i) {
+        ShortShuffle64(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        Short64Shuffle(IntUnaryOperator fn) {
+        ShortShuffle64(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -829,23 +843,23 @@ final class Short64Vector extends ShortVector {
             assert(VLENGTH < Short.MAX_VALUE);
             assert(Short.MIN_VALUE <= -VLENGTH);
         }
-        static final Short64Shuffle IOTA = new Short64Shuffle(IDENTITY);
+        static final ShortShuffle64 IOTA = new ShortShuffle64(IDENTITY);
 
         @Override
         @ForceInline
-        public Short64Vector toVector() {
+        public ShortVector64 toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        Short64Vector toBitsVector() {
-            return (Short64Vector) super.toBitsVectorTemplate();
+        ShortVector64 toBitsVector() {
+            return (ShortVector64) super.toBitsVectorTemplate();
         }
 
         @Override
-        Short64Vector toBitsVector0() {
-            return ((Short64Vector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ShortVector64 toBitsVector0() {
+            return ((ShortVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -882,30 +896,30 @@ final class Short64Vector extends ShortVector {
 
         @Override
         @ForceInline
-        public final Short64Mask laneIsValid() {
-            return (Short64Mask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ShortMask64 laneIsValid() {
+            return (ShortMask64) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final Short64Shuffle rearrange(VectorShuffle<Short> shuffle) {
-            Short64Shuffle concreteShuffle = (Short64Shuffle) shuffle;
-            return (Short64Shuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ShortShuffle64 rearrange(VectorShuffle<Short> shuffle) {
+            ShortShuffle64 concreteShuffle = (ShortShuffle64) shuffle;
+            return (ShortShuffle64) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final Short64Shuffle wrapIndexes() {
-            Short64Vector v = toBitsVector();
+        public final ShortShuffle64 wrapIndexes() {
+            ShortVector64 v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (Short64Vector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ShortVector64) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (Short64Vector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ShortVector64) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (Short64Shuffle) v.toShuffle(vspecies(), false);
+            return (ShortShuffle64) v.toShuffle(vspecies(), false);
         }
 
         private static short[] prepare(int[] indices, int offset) {
@@ -956,14 +970,14 @@ final class Short64Vector extends ShortVector {
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromArray0Template(Short64Mask.class, a, offset, (Short64Mask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ShortMask64.class, a, offset, (ShortMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
-        return super.fromArray0Template(Short64Mask.class, a, offset, indexMap, mapOffset, (Short64Mask) m);
+        return super.fromArray0Template(ShortMask64.class, a, offset, indexMap, mapOffset, (ShortMask64) m);
     }
 
     @ForceInline
@@ -977,7 +991,7 @@ final class Short64Vector extends ShortVector {
     @Override
     final
     ShortVector fromCharArray0(char[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromCharArray0Template(Short64Mask.class, a, offset, (Short64Mask) m, offsetInRange);  // specialize
+        return super.fromCharArray0Template(ShortMask64.class, a, offset, (ShortMask64) m, offsetInRange);  // specialize
     }
 
 
@@ -992,7 +1006,7 @@ final class Short64Vector extends ShortVector {
     @Override
     final
     ShortVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(Short64Mask.class, ms, offset, (Short64Mask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ShortMask64.class, ms, offset, (ShortMask64) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1006,7 +1020,7 @@ final class Short64Vector extends ShortVector {
     @Override
     final
     void intoArray0(short[] a, int offset, VectorMask<Short> m) {
-        super.intoArray0Template(Short64Mask.class, a, offset, (Short64Mask) m);
+        super.intoArray0Template(ShortMask64.class, a, offset, (ShortMask64) m);
     }
 
 
@@ -1015,14 +1029,14 @@ final class Short64Vector extends ShortVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m) {
-        super.intoMemorySegment0Template(Short64Mask.class, ms, offset, (Short64Mask) m);
+        super.intoMemorySegment0Template(ShortMask64.class, ms, offset, (ShortMask64) m);
     }
 
     @ForceInline
     @Override
     final
     void intoCharArray0(char[] a, int offset, VectorMask<Short> m) {
-        super.intoCharArray0Template(Short64Mask.class, a, offset, (Short64Mask) m);
+        super.intoCharArray0Template(ShortMask64.class, a, offset, (ShortMask64) m);
     }
 
     // End of specialized low-level memory operations.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVectorMax.java
similarity index 63%
rename from src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
rename to src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVectorMax.java
index bea14b7d5fd..b9a9b85126b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVectorMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,33 +41,35 @@ import static jdk.incubator.vector.VectorOperators.*;
 // -- This file was mechanically generated: Do not edit! -- //
 
 @SuppressWarnings("cast")  // warning: redundant cast
-final class ShortMaxVector extends ShortVector {
+final class ShortVectorMax extends ShortVector {
     static final ShortSpecies VSPECIES =
         (ShortSpecies) ShortVector.SPECIES_MAX;
 
     static final VectorShape VSHAPE =
         VSPECIES.vectorShape();
 
-    static final Class<ShortMaxVector> VCLASS = ShortMaxVector.class;
+    static final Class<ShortVectorMax> VCLASS = ShortVectorMax.class;
 
     static final int VSIZE = VSPECIES.vectorBitSize();
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<Short> CTYPE = short.class; // carrier type used by the JVM
+
     static final Class<Short> ETYPE = short.class; // used by the JVM
 
-    ShortMaxVector(short[] v) {
+    ShortVectorMax(short[] v) {
         super(v);
     }
 
-    // For compatibility as ShortMaxVector::new,
+    // For compatibility as ShortVectorMax::new,
     // stored into species.vectorFactory.
-    ShortMaxVector(Object v) {
+    ShortVectorMax(Object v) {
         this((short[]) v);
     }
 
-    static final ShortMaxVector ZERO = new ShortMaxVector(new short[VLENGTH]);
-    static final ShortMaxVector IOTA = new ShortMaxVector(VSPECIES.iotaArray());
+    static final ShortVectorMax ZERO = new ShortVectorMax(new short[VLENGTH]);
+    static final ShortVectorMax IOTA = new ShortVectorMax(VSPECIES.iotaArray());
 
     static {
         // Warm up a few species caches.
@@ -92,6 +94,9 @@ final class ShortMaxVector extends ShortVector {
     @Override
     public final Class<Short> elementType() { return short.class; }
 
+    @ForceInline
+    final Class<Short> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return Short.SIZE; }
@@ -119,55 +124,62 @@ final class ShortMaxVector extends ShortVector {
         return (short[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
     @ForceInline
-    public final ShortMaxVector broadcast(short e) {
-        return (ShortMaxVector) super.broadcastTemplate(e);  // specialize
+    public final ShortVectorMax broadcast(short e) {
+        return (ShortVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ShortMaxVector broadcast(long e) {
-        return (ShortMaxVector) super.broadcastTemplate(e);  // specialize
+    public final ShortVectorMax broadcast(long e) {
+        return (ShortVectorMax) super.broadcastTemplate(e);  // specialize
     }
 
     @Override
     @ForceInline
-    ShortMaxMask maskFromArray(boolean[] bits) {
-        return new ShortMaxMask(bits);
+    ShortMaskMax maskFromArray(boolean[] bits) {
+        return new ShortMaskMax(bits);
     }
 
     @Override
     @ForceInline
-    ShortMaxShuffle iotaShuffle() { return ShortMaxShuffle.IOTA; }
+    ShortShuffleMax iotaShuffle() { return ShortShuffleMax.IOTA; }
 
     @Override
     @ForceInline
-    ShortMaxShuffle iotaShuffle(int start, int step, boolean wrap) {
-        return (ShortMaxShuffle) iotaShuffleTemplate((short) start, (short) step, wrap);
+    ShortShuffleMax iotaShuffle(int start, int step, boolean wrap) {
+        return (ShortShuffleMax) iotaShuffleTemplate((short) start, (short) step, wrap);
     }
 
     @Override
     @ForceInline
-    ShortMaxShuffle shuffleFromArray(int[] indices, int i) { return new ShortMaxShuffle(indices, i); }
+    ShortShuffleMax shuffleFromArray(int[] indices, int i) { return new ShortShuffleMax(indices, i); }
 
     @Override
     @ForceInline
-    ShortMaxShuffle shuffleFromOp(IntUnaryOperator fn) { return new ShortMaxShuffle(fn); }
+    ShortShuffleMax shuffleFromOp(IntUnaryOperator fn) { return new ShortShuffleMax(fn); }
 
     // Make a vector of the same species but the given elements:
     @ForceInline
     final @Override
-    ShortMaxVector vectorFactory(short[] vec) {
-        return new ShortMaxVector(vec);
+    ShortVectorMax vectorFactory(short[] vec) {
+        return new ShortVectorMax(vec);
     }
 
     @ForceInline
     final @Override
-    ByteMaxVector asByteVectorRaw() {
-        return (ByteMaxVector) super.asByteVectorRawTemplate();  // specialize
+    ByteVectorMax asByteVectorRaw() {
+        return (ByteVectorMax) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -180,31 +192,31 @@ final class ShortMaxVector extends ShortVector {
 
     @ForceInline
     final @Override
-    ShortMaxVector uOp(FUnOp f) {
-        return (ShortMaxVector) super.uOpTemplate(f);  // specialize
+    ShortVectorMax uOp(FUnOp f) {
+        return (ShortVectorMax) super.uOpTemplate(f);  // specialize
     }
 
     @ForceInline
     final @Override
-    ShortMaxVector uOp(VectorMask<Short> m, FUnOp f) {
-        return (ShortMaxVector)
-            super.uOpTemplate((ShortMaxMask)m, f);  // specialize
+    ShortVectorMax uOp(VectorMask<Short> m, FUnOp f) {
+        return (ShortVectorMax)
+            super.uOpTemplate((ShortMaskMax)m, f);  // specialize
     }
 
     // Binary operator
 
     @ForceInline
     final @Override
-    ShortMaxVector bOp(Vector<Short> v, FBinOp f) {
-        return (ShortMaxVector) super.bOpTemplate((ShortMaxVector)v, f);  // specialize
+    ShortVectorMax bOp(Vector<Short> v, FBinOp f) {
+        return (ShortVectorMax) super.bOpTemplate((ShortVectorMax)v, f);  // specialize
     }
 
     @ForceInline
     final @Override
-    ShortMaxVector bOp(Vector<Short> v,
+    ShortVectorMax bOp(Vector<Short> v,
                      VectorMask<Short> m, FBinOp f) {
-        return (ShortMaxVector)
-            super.bOpTemplate((ShortMaxVector)v, (ShortMaxMask)m,
+        return (ShortVectorMax)
+            super.bOpTemplate((ShortVectorMax)v, (ShortMaskMax)m,
                               f);  // specialize
     }
 
@@ -212,19 +224,19 @@ final class ShortMaxVector extends ShortVector {
 
     @ForceInline
     final @Override
-    ShortMaxVector tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
-        return (ShortMaxVector)
-            super.tOpTemplate((ShortMaxVector)v1, (ShortMaxVector)v2,
+    ShortVectorMax tOp(Vector<Short> v1, Vector<Short> v2, FTriOp f) {
+        return (ShortVectorMax)
+            super.tOpTemplate((ShortVectorMax)v1, (ShortVectorMax)v2,
                               f);  // specialize
     }
 
     @ForceInline
     final @Override
-    ShortMaxVector tOp(Vector<Short> v1, Vector<Short> v2,
+    ShortVectorMax tOp(Vector<Short> v1, Vector<Short> v2,
                      VectorMask<Short> m, FTriOp f) {
-        return (ShortMaxVector)
-            super.tOpTemplate((ShortMaxVector)v1, (ShortMaxVector)v2,
-                              (ShortMaxMask)m, f);  // specialize
+        return (ShortVectorMax)
+            super.tOpTemplate((ShortVectorMax)v1, (ShortVectorMax)v2,
+                              (ShortMaskMax)m, f);  // specialize
     }
 
     @ForceInline
@@ -262,64 +274,64 @@ final class ShortMaxVector extends ShortVector {
 
     @Override
     @ForceInline
-    public ShortMaxVector lanewise(Unary op) {
-        return (ShortMaxVector) super.lanewiseTemplate(op);  // specialize
+    public ShortVectorMax lanewise(Unary op) {
+        return (ShortVectorMax) super.lanewiseTemplate(op);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector lanewise(Unary op, VectorMask<Short> m) {
-        return (ShortMaxVector) super.lanewiseTemplate(op, ShortMaxMask.class, (ShortMaxMask) m);  // specialize
+    public ShortVectorMax lanewise(Unary op, VectorMask<Short> m) {
+        return (ShortVectorMax) super.lanewiseTemplate(op, ShortMaskMax.class, (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector lanewise(Binary op, Vector<Short> v) {
-        return (ShortMaxVector) super.lanewiseTemplate(op, v);  // specialize
+    public ShortVectorMax lanewise(Binary op, Vector<Short> v) {
+        return (ShortVectorMax) super.lanewiseTemplate(op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
-        return (ShortMaxVector) super.lanewiseTemplate(op, ShortMaxMask.class, v, (ShortMaxMask) m);  // specialize
+    public ShortVectorMax lanewise(Binary op, Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVectorMax) super.lanewiseTemplate(op, ShortMaskMax.class, v, (ShortMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline ShortMaxVector
+    @ForceInline ShortVectorMax
     lanewiseShift(VectorOperators.Binary op, int e) {
-        return (ShortMaxVector) super.lanewiseShiftTemplate(op, e);  // specialize
+        return (ShortVectorMax) super.lanewiseShiftTemplate(op, e);  // specialize
     }
 
     /*package-private*/
     @Override
-    @ForceInline ShortMaxVector
+    @ForceInline ShortVectorMax
     lanewiseShift(VectorOperators.Binary op, int e, VectorMask<Short> m) {
-        return (ShortMaxVector) super.lanewiseShiftTemplate(op, ShortMaxMask.class, e, (ShortMaxMask) m);  // specialize
+        return (ShortVectorMax) super.lanewiseShiftTemplate(op, ShortMaskMax.class, e, (ShortMaskMax) m);  // specialize
     }
 
     /*package-private*/
     @Override
     @ForceInline
     public final
-    ShortMaxVector
+    ShortVectorMax
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2) {
-        return (ShortMaxVector) super.lanewiseTemplate(op, v1, v2);  // specialize
+        return (ShortVectorMax) super.lanewiseTemplate(op, v1, v2);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    ShortMaxVector
+    ShortVectorMax
     lanewise(Ternary op, Vector<Short> v1, Vector<Short> v2, VectorMask<Short> m) {
-        return (ShortMaxVector) super.lanewiseTemplate(op, ShortMaxMask.class, v1, v2, (ShortMaxMask) m);  // specialize
+        return (ShortVectorMax) super.lanewiseTemplate(op, ShortMaskMax.class, v1, v2, (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
     public final
-    ShortMaxVector addIndex(int scale) {
-        return (ShortMaxVector) super.addIndexTemplate(scale);  // specialize
+    ShortVectorMax addIndex(int scale) {
+        return (ShortVectorMax) super.addIndexTemplate(scale);  // specialize
     }
 
     // Type specific horizontal reductions
@@ -334,7 +346,7 @@ final class ShortMaxVector extends ShortVector {
     @ForceInline
     public final short reduceLanes(VectorOperators.Associative op,
                                     VectorMask<Short> m) {
-        return super.reduceLanesTemplate(op, ShortMaxMask.class, (ShortMaxMask) m);  // specialized
+        return super.reduceLanesTemplate(op, ShortMaskMax.class, (ShortMaskMax) m);  // specialized
     }
 
     @Override
@@ -347,7 +359,7 @@ final class ShortMaxVector extends ShortVector {
     @ForceInline
     public final long reduceLanesToLong(VectorOperators.Associative op,
                                         VectorMask<Short> m) {
-        return (long) super.reduceLanesTemplate(op, ShortMaxMask.class, (ShortMaxMask) m);  // specialized
+        return (long) super.reduceLanesTemplate(op, ShortMaskMax.class, (ShortMaskMax) m);  // specialized
     }
 
     @Override
@@ -358,160 +370,160 @@ final class ShortMaxVector extends ShortVector {
 
     @Override
     @ForceInline
-    public final ShortMaxShuffle toShuffle() {
-        return (ShortMaxShuffle) toShuffle(vspecies(), false);
+    public final ShortShuffleMax toShuffle() {
+        return (ShortShuffleMax) toShuffle(vspecies(), false);
     }
 
     // Specialized unary testing
 
     @Override
     @ForceInline
-    public final ShortMaxMask test(Test op) {
-        return super.testTemplate(ShortMaxMask.class, op);  // specialize
+    public final ShortMaskMax test(Test op) {
+        return super.testTemplate(ShortMaskMax.class, op);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ShortMaxMask test(Test op, VectorMask<Short> m) {
-        return super.testTemplate(ShortMaxMask.class, op, (ShortMaxMask) m);  // specialize
+    public final ShortMaskMax test(Test op, VectorMask<Short> m) {
+        return super.testTemplate(ShortMaskMax.class, op, (ShortMaskMax) m);  // specialize
     }
 
     // Specialized comparisons
 
     @Override
     @ForceInline
-    public final ShortMaxMask compare(Comparison op, Vector<Short> v) {
-        return super.compareTemplate(ShortMaxMask.class, op, v);  // specialize
+    public final ShortMaskMax compare(Comparison op, Vector<Short> v) {
+        return super.compareTemplate(ShortMaskMax.class, op, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ShortMaxMask compare(Comparison op, short s) {
-        return super.compareTemplate(ShortMaxMask.class, op, s);  // specialize
+    public final ShortMaskMax compare(Comparison op, short s) {
+        return super.compareTemplate(ShortMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ShortMaxMask compare(Comparison op, long s) {
-        return super.compareTemplate(ShortMaxMask.class, op, s);  // specialize
+    public final ShortMaskMax compare(Comparison op, long s) {
+        return super.compareTemplate(ShortMaskMax.class, op, s);  // specialize
     }
 
     @Override
     @ForceInline
-    public final ShortMaxMask compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
-        return super.compareTemplate(ShortMaxMask.class, op, v, (ShortMaxMask) m);
+    public final ShortMaskMax compare(Comparison op, Vector<Short> v, VectorMask<Short> m) {
+        return super.compareTemplate(ShortMaskMax.class, op, v, (ShortMaskMax) m);
     }
 
 
     @Override
     @ForceInline
-    public ShortMaxVector blend(Vector<Short> v, VectorMask<Short> m) {
-        return (ShortMaxVector)
-            super.blendTemplate(ShortMaxMask.class,
-                                (ShortMaxVector) v,
-                                (ShortMaxMask) m);  // specialize
+    public ShortVectorMax blend(Vector<Short> v, VectorMask<Short> m) {
+        return (ShortVectorMax)
+            super.blendTemplate(ShortMaskMax.class,
+                                (ShortVectorMax) v,
+                                (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector slice(int origin, Vector<Short> v) {
-        return (ShortMaxVector) super.sliceTemplate(origin, v);  // specialize
+    public ShortVectorMax slice(int origin, Vector<Short> v) {
+        return (ShortVectorMax) super.sliceTemplate(origin, v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector slice(int origin) {
-        return (ShortMaxVector) super.sliceTemplate(origin);  // specialize
+    public ShortVectorMax slice(int origin) {
+        return (ShortVectorMax) super.sliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector unslice(int origin, Vector<Short> w, int part) {
-        return (ShortMaxVector) super.unsliceTemplate(origin, w, part);  // specialize
+    public ShortVectorMax unslice(int origin, Vector<Short> w, int part) {
+        return (ShortVectorMax) super.unsliceTemplate(origin, w, part);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
-        return (ShortMaxVector)
-            super.unsliceTemplate(ShortMaxMask.class,
+    public ShortVectorMax unslice(int origin, Vector<Short> w, int part, VectorMask<Short> m) {
+        return (ShortVectorMax)
+            super.unsliceTemplate(ShortMaskMax.class,
                                   origin, w, part,
-                                  (ShortMaxMask) m);  // specialize
+                                  (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector unslice(int origin) {
-        return (ShortMaxVector) super.unsliceTemplate(origin);  // specialize
+    public ShortVectorMax unslice(int origin) {
+        return (ShortVectorMax) super.unsliceTemplate(origin);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector rearrange(VectorShuffle<Short> s) {
-        return (ShortMaxVector)
-            super.rearrangeTemplate(ShortMaxShuffle.class,
-                                    (ShortMaxShuffle) s);  // specialize
+    public ShortVectorMax rearrange(VectorShuffle<Short> s) {
+        return (ShortVectorMax)
+            super.rearrangeTemplate(ShortShuffleMax.class,
+                                    (ShortShuffleMax) s);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector rearrange(VectorShuffle<Short> shuffle,
+    public ShortVectorMax rearrange(VectorShuffle<Short> shuffle,
                                   VectorMask<Short> m) {
-        return (ShortMaxVector)
-            super.rearrangeTemplate(ShortMaxShuffle.class,
-                                    ShortMaxMask.class,
-                                    (ShortMaxShuffle) shuffle,
-                                    (ShortMaxMask) m);  // specialize
+        return (ShortVectorMax)
+            super.rearrangeTemplate(ShortShuffleMax.class,
+                                    ShortMaskMax.class,
+                                    (ShortShuffleMax) shuffle,
+                                    (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector rearrange(VectorShuffle<Short> s,
+    public ShortVectorMax rearrange(VectorShuffle<Short> s,
                                   Vector<Short> v) {
-        return (ShortMaxVector)
-            super.rearrangeTemplate(ShortMaxShuffle.class,
-                                    (ShortMaxShuffle) s,
-                                    (ShortMaxVector) v);  // specialize
+        return (ShortVectorMax)
+            super.rearrangeTemplate(ShortShuffleMax.class,
+                                    (ShortShuffleMax) s,
+                                    (ShortVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector compress(VectorMask<Short> m) {
-        return (ShortMaxVector)
-            super.compressTemplate(ShortMaxMask.class,
-                                   (ShortMaxMask) m);  // specialize
+    public ShortVectorMax compress(VectorMask<Short> m) {
+        return (ShortVectorMax)
+            super.compressTemplate(ShortMaskMax.class,
+                                   (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector expand(VectorMask<Short> m) {
-        return (ShortMaxVector)
-            super.expandTemplate(ShortMaxMask.class,
-                                   (ShortMaxMask) m);  // specialize
+    public ShortVectorMax expand(VectorMask<Short> m) {
+        return (ShortVectorMax)
+            super.expandTemplate(ShortMaskMax.class,
+                                   (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector selectFrom(Vector<Short> v) {
-        return (ShortMaxVector)
-            super.selectFromTemplate((ShortMaxVector) v);  // specialize
+    public ShortVectorMax selectFrom(Vector<Short> v) {
+        return (ShortVectorMax)
+            super.selectFromTemplate((ShortVectorMax) v);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector selectFrom(Vector<Short> v,
+    public ShortVectorMax selectFrom(Vector<Short> v,
                                    VectorMask<Short> m) {
-        return (ShortMaxVector)
-            super.selectFromTemplate((ShortMaxVector) v,
-                                     ShortMaxMask.class, (ShortMaxMask) m);  // specialize
+        return (ShortVectorMax)
+            super.selectFromTemplate((ShortVectorMax) v,
+                                     ShortMaskMax.class, (ShortMaskMax) m);  // specialize
     }
 
     @Override
     @ForceInline
-    public ShortMaxVector selectFrom(Vector<Short> v1,
+    public ShortVectorMax selectFrom(Vector<Short> v1,
                                    Vector<Short> v2) {
-        return (ShortMaxVector)
-            super.selectFromTemplate((ShortMaxVector) v1, (ShortMaxVector) v2);  // specialize
+        return (ShortVectorMax)
+            super.selectFromTemplate((ShortVectorMax) v1, (ShortVectorMax) v2);  // specialize
     }
 
     @ForceInline
@@ -526,7 +538,7 @@ final class ShortMaxVector extends ShortVector {
     @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     short[] vecarr = vec.vec();
@@ -536,7 +548,7 @@ final class ShortMaxVector extends ShortVector {
 
     @ForceInline
     @Override
-    public ShortMaxVector withLane(int i, short e) {
+    public ShortVectorMax withLane(int i, short e) {
         if (i < 0 || i >= VLENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + VLENGTH);
         }
@@ -544,9 +556,9 @@ final class ShortMaxVector extends ShortVector {
     }
 
     @ForceInline
-    public ShortMaxVector withLaneHelper(int i, short e) {
+    public ShortVectorMax withLaneHelper(int i, short e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     short[] res = v.vec().clone();
@@ -557,19 +569,20 @@ final class ShortMaxVector extends ShortVector {
 
     // Mask
 
-    static final class ShortMaxMask extends AbstractMask<Short> {
+    static final class ShortMaskMax extends AbstractMask<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        ShortMaxMask(boolean[] bits) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortMaskMax(boolean[] bits) {
             this(bits, 0);
         }
 
-        ShortMaxMask(boolean[] bits, int offset) {
+        ShortMaskMax(boolean[] bits, int offset) {
             super(prepare(bits, offset));
         }
 
-        ShortMaxMask(boolean val) {
+        ShortMaskMax(boolean val) {
             super(prepare(val));
         }
 
@@ -602,31 +615,31 @@ final class ShortMaxVector extends ShortVector {
         }
 
         @Override
-        ShortMaxMask uOp(MUnOp f) {
+        ShortMaskMax uOp(MUnOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i]);
             }
-            return new ShortMaxMask(res);
+            return new ShortMaskMax(res);
         }
 
         @Override
-        ShortMaxMask bOp(VectorMask<Short> m, MBinOp f) {
+        ShortMaskMax bOp(VectorMask<Short> m, MBinOp f) {
             boolean[] res = new boolean[vspecies().laneCount()];
             boolean[] bits = getBits();
-            boolean[] mbits = ((ShortMaxMask)m).getBits();
+            boolean[] mbits = ((ShortMaskMax)m).getBits();
             for (int i = 0; i < res.length; i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
-            return new ShortMaxMask(res);
+            return new ShortMaskMax(res);
         }
 
         @ForceInline
         @Override
         public final
-        ShortMaxVector toVector() {
-            return (ShortMaxVector) super.toVectorTemplate();  // specialize
+        ShortVectorMax toVector() {
+            return (ShortVectorMax) super.toVectorTemplate();  // specialize
         }
 
         /**
@@ -650,8 +663,8 @@ final class ShortMaxVector extends ShortVector {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -659,25 +672,25 @@ final class ShortMaxVector extends ShortVector {
         @Override
         @ForceInline
         /*package-private*/
-        ShortMaxMask indexPartiallyInUpperRange(long offset, long limit) {
-            return (ShortMaxMask) VectorSupport.indexPartiallyInUpperRange(
-                ShortMaxMask.class, short.class, VLENGTH, offset, limit,
-                (o, l) -> (ShortMaxMask) TRUE_MASK.indexPartiallyInRange(o, l));
+        ShortMaskMax indexPartiallyInUpperRange(long offset, long limit) {
+            return (ShortMaskMax) VectorSupport.indexPartiallyInUpperRange(
+                ShortMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
+                (o, l) -> (ShortMaskMax) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
         // Unary operations
 
         @Override
         @ForceInline
-        public ShortMaxMask not() {
+        public ShortMaskMax not() {
             return xor(maskAll(true));
         }
 
         @Override
         @ForceInline
-        public ShortMaxMask compress() {
-            return (ShortMaxMask)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                ShortMaxVector.class, ShortMaxMask.class, ETYPE, VLENGTH, null, this,
+        public ShortMaskMax compress() {
+            return (ShortMaskMax)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
+                ShortVectorMax.class, ShortMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -686,30 +699,30 @@ final class ShortMaxVector extends ShortVector {
 
         @Override
         @ForceInline
-        public ShortMaxMask and(VectorMask<Short> mask) {
+        public ShortMaskMax and(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            ShortMaxMask m = (ShortMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, ShortMaxMask.class, null, short.class, VLENGTH,
+            ShortMaskMax m = (ShortMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_AND, ShortMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public ShortMaxMask or(VectorMask<Short> mask) {
+        public ShortMaskMax or(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            ShortMaxMask m = (ShortMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, ShortMaxMask.class, null, short.class, VLENGTH,
+            ShortMaskMax m = (ShortMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_OR, ShortMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
 
         @Override
         @ForceInline
-        public ShortMaxMask xor(VectorMask<Short> mask) {
+        public ShortMaskMax xor(VectorMask<Short> mask) {
             Objects.requireNonNull(mask);
-            ShortMaxMask m = (ShortMaxMask)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, ShortMaxMask.class, null, short.class, VLENGTH,
+            ShortMaskMax m = (ShortMaskMax)mask;
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, ShortMaskMax.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -719,21 +732,21 @@ final class ShortMaxVector extends ShortVector {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ShortMaxMask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ShortMaxMask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ShortMaxMask.class, short.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -743,7 +756,7 @@ final class ShortMaxVector extends ShortVector {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ShortMaxMask.class, short.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -753,7 +766,7 @@ final class ShortMaxVector extends ShortVector {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract(ShortMaxMask.class, short.class, VLENGTH,
+            return VectorSupport.extract(ShortMaskMax.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -762,48 +775,49 @@ final class ShortMaxVector extends ShortVector {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, ShortMaxMask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_ne, ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> anyTrueHelper(((ShortMaxMask)m).getBits()));
+                                         (m, __) -> anyTrueHelper(((ShortMaskMax)m).getBits()));
         }
 
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, ShortMaxMask.class, short.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
-                                         (m, __) -> allTrueHelper(((ShortMaxMask)m).getBits()));
+                                         (m, __) -> allTrueHelper(((ShortMaskMax)m).getBits()));
         }
 
         @ForceInline
         /*package-private*/
-        static ShortMaxMask maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced(ShortMaxMask.class, short.class, VLENGTH,
+        static ShortMaskMax maskAll(boolean bit) {
+            return VectorSupport.fromBitsCoerced(ShortMaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
-        private static final ShortMaxMask  TRUE_MASK = new ShortMaxMask(true);
-        private static final ShortMaxMask FALSE_MASK = new ShortMaxMask(false);
+        private static final ShortMaskMax  TRUE_MASK = new ShortMaskMax(true);
+        private static final ShortMaskMax FALSE_MASK = new ShortMaskMax(false);
 
     }
 
     // Shuffle
 
-    static final class ShortMaxShuffle extends AbstractShuffle<Short> {
+    static final class ShortShuffleMax extends AbstractShuffle<Short> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<Short> ETYPE = short.class; // used by the JVM
 
-        ShortMaxShuffle(short[] indices) {
+        static final Class<Short> CTYPE = short.class; // used by the JVM
+
+        ShortShuffleMax(short[] indices) {
             super(indices);
             assert(VLENGTH == indices.length);
             assert(indicesInRange(indices));
         }
 
-        ShortMaxShuffle(int[] indices, int i) {
+        ShortShuffleMax(int[] indices, int i) {
             this(prepare(indices, i));
         }
 
-        ShortMaxShuffle(IntUnaryOperator fn) {
+        ShortShuffleMax(IntUnaryOperator fn) {
             this(prepare(fn));
         }
 
@@ -823,23 +837,23 @@ final class ShortMaxVector extends ShortVector {
             assert(VLENGTH < Short.MAX_VALUE);
             assert(Short.MIN_VALUE <= -VLENGTH);
         }
-        static final ShortMaxShuffle IOTA = new ShortMaxShuffle(IDENTITY);
+        static final ShortShuffleMax IOTA = new ShortShuffleMax(IDENTITY);
 
         @Override
         @ForceInline
-        public ShortMaxVector toVector() {
+        public ShortVectorMax toVector() {
             return toBitsVector();
         }
 
         @Override
         @ForceInline
-        ShortMaxVector toBitsVector() {
-            return (ShortMaxVector) super.toBitsVectorTemplate();
+        ShortVectorMax toBitsVector() {
+            return (ShortVectorMax) super.toBitsVectorTemplate();
         }
 
         @Override
-        ShortMaxVector toBitsVector0() {
-            return ((ShortMaxVector) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
+        ShortVectorMax toBitsVector0() {
+            return ((ShortVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices());
         }
 
         @Override
@@ -876,30 +890,30 @@ final class ShortMaxVector extends ShortVector {
 
         @Override
         @ForceInline
-        public final ShortMaxMask laneIsValid() {
-            return (ShortMaxMask) toBitsVector().compare(VectorOperators.GE, 0)
+        public final ShortMaskMax laneIsValid() {
+            return (ShortMaskMax) toBitsVector().compare(VectorOperators.GE, 0)
                     .cast(vspecies());
         }
 
         @ForceInline
         @Override
-        public final ShortMaxShuffle rearrange(VectorShuffle<Short> shuffle) {
-            ShortMaxShuffle concreteShuffle = (ShortMaxShuffle) shuffle;
-            return (ShortMaxShuffle) toBitsVector().rearrange(concreteShuffle)
+        public final ShortShuffleMax rearrange(VectorShuffle<Short> shuffle) {
+            ShortShuffleMax concreteShuffle = (ShortShuffleMax) shuffle;
+            return (ShortShuffleMax) toBitsVector().rearrange(concreteShuffle)
                     .toShuffle(vspecies(), false);
         }
 
         @ForceInline
         @Override
-        public final ShortMaxShuffle wrapIndexes() {
-            ShortMaxVector v = toBitsVector();
+        public final ShortShuffleMax wrapIndexes() {
+            ShortVectorMax v = toBitsVector();
             if ((length() & (length() - 1)) == 0) {
-                v = (ShortMaxVector) v.lanewise(VectorOperators.AND, length() - 1);
+                v = (ShortVectorMax) v.lanewise(VectorOperators.AND, length() - 1);
             } else {
-                v = (ShortMaxVector) v.blend(v.lanewise(VectorOperators.ADD, length()),
+                v = (ShortVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()),
                             v.compare(VectorOperators.LT, 0));
             }
-            return (ShortMaxShuffle) v.toShuffle(vspecies(), false);
+            return (ShortShuffleMax) v.toShuffle(vspecies(), false);
         }
 
         private static short[] prepare(int[] indices, int offset) {
@@ -950,14 +964,14 @@ final class ShortMaxVector extends ShortVector {
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromArray0Template(ShortMaxMask.class, a, offset, (ShortMaxMask) m, offsetInRange);  // specialize
+        return super.fromArray0Template(ShortMaskMax.class, a, offset, (ShortMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
     @Override
     final
     ShortVector fromArray0(short[] a, int offset, int[] indexMap, int mapOffset, VectorMask<Short> m) {
-        return super.fromArray0Template(ShortMaxMask.class, a, offset, indexMap, mapOffset, (ShortMaxMask) m);
+        return super.fromArray0Template(ShortMaskMax.class, a, offset, indexMap, mapOffset, (ShortMaskMax) m);
     }
 
     @ForceInline
@@ -971,7 +985,7 @@ final class ShortMaxVector extends ShortVector {
     @Override
     final
     ShortVector fromCharArray0(char[] a, int offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromCharArray0Template(ShortMaxMask.class, a, offset, (ShortMaxMask) m, offsetInRange);  // specialize
+        return super.fromCharArray0Template(ShortMaskMax.class, a, offset, (ShortMaskMax) m, offsetInRange);  // specialize
     }
 
 
@@ -986,7 +1000,7 @@ final class ShortMaxVector extends ShortVector {
     @Override
     final
     ShortVector fromMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m, int offsetInRange) {
-        return super.fromMemorySegment0Template(ShortMaxMask.class, ms, offset, (ShortMaxMask) m, offsetInRange);  // specialize
+        return super.fromMemorySegment0Template(ShortMaskMax.class, ms, offset, (ShortMaskMax) m, offsetInRange);  // specialize
     }
 
     @ForceInline
@@ -1000,7 +1014,7 @@ final class ShortMaxVector extends ShortVector {
     @Override
     final
     void intoArray0(short[] a, int offset, VectorMask<Short> m) {
-        super.intoArray0Template(ShortMaxMask.class, a, offset, (ShortMaxMask) m);
+        super.intoArray0Template(ShortMaskMax.class, a, offset, (ShortMaskMax) m);
     }
 
 
@@ -1009,14 +1023,14 @@ final class ShortMaxVector extends ShortVector {
     @Override
     final
     void intoMemorySegment0(MemorySegment ms, long offset, VectorMask<Short> m) {
-        super.intoMemorySegment0Template(ShortMaxMask.class, ms, offset, (ShortMaxMask) m);
+        super.intoMemorySegment0Template(ShortMaskMax.class, ms, offset, (ShortMaskMax) m);
     }
 
     @ForceInline
     @Override
     final
     void intoCharArray0(char[] a, int offset, VectorMask<Short> m) {
-        super.intoCharArray0Template(ShortMaxMask.class, a, offset, (ShortMaxMask) m);
+        super.intoCharArray0Template(ShortMaskMax.class, a, offset, (ShortMaskMax) m);
     }
 
     // End of specialized low-level memory operations.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
index eb231597e85..13ee9e27e0d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,7 +207,7 @@ public abstract class VectorMask<E> extends jdk.internal.vm.vector.VectorSupport
         int laneCount = vsp.laneCount();
         offset = VectorIntrinsics.checkFromIndexSize(offset, laneCount, bits.length);
         return VectorSupport.load(
-                vsp.maskType(), vsp.elementType(), laneCount,
+                vsp.maskType(), vsp.laneTypeOrdinal(), laneCount,
                 bits, (long) offset + Unsafe.ARRAY_BOOLEAN_BASE_OFFSET, false,
                 bits, offset, vsp,
                 (c, idx, s)
@@ -240,7 +240,7 @@ public abstract class VectorMask<E> extends jdk.internal.vm.vector.VectorSupport
     public static <E> VectorMask<E> fromLong(VectorSpecies<E> species, long bits) {
         AbstractSpecies<E> vsp = (AbstractSpecies<E>) species;
         bits = bits & (0xFFFFFFFFFFFFFFFFL >>> (64 - vsp.laneCount()));
-        return VectorSupport.fromBitsCoerced(vsp.maskType(), vsp.elementType(), vsp.laneCount(), bits,
+        return VectorSupport.fromBitsCoerced(vsp.maskType(), vsp.laneTypeOrdinal(), vsp.laneCount(), bits,
                                              VectorSupport.MODE_BITS_COERCED_LONG_TO_MASK, vsp,
                                              (m, s) -> {
                                                  if (m == (m >> 1)) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
index ecd03ab9124..1c1cfcc78c7 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,8 +139,8 @@ import static jdk.internal.vm.vector.Utils.debug;
         public String symbolName(Operator op, VectorSpecies<?> vspecies) {
             String suffix = suffix(vspecies);
             String elemType = (vspecies.elementType() == float.class ? "f" : "");
-            boolean isFloat64Vector = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // Float64Vector or FloatMaxVector
-            int vlen = (isFloat64Vector ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
+            boolean isFloatVector64 = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // FloatVector64 or FloatVectorMax
+            int vlen = (isFloatVector64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
             return String.format("__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
         }
 
@@ -211,8 +211,8 @@ import static jdk.internal.vm.vector.Utils.debug;
 
         @Override
         public String symbolName(Operator op, VectorSpecies<?> vspecies) {
-            boolean isFloat64Vector = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // Float64Vector or FloatMaxVector
-            int vlen = (isFloat64Vector ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
+            boolean isFloatVector64 = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // FloatVector64 or FloatVectorMax
+            int vlen = (isFloatVector64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
             boolean isShapeAgnostic = isRISCV64() || (isAARCH64() && vspecies.vectorBitSize() > 128);
             return String.format("%s%s%s_%s%s", op.operatorName(),
                                  (vspecies.elementType() == float.class ? "f" : "d"),
@@ -283,7 +283,7 @@ import static jdk.internal.vm.vector.Utils.debug;
     @ForceInline
     /*package-private*/ static
     <E, V extends Vector<E>>
-    V unaryMathOp(Unary op, int opc, VectorSpecies<E> vspecies,
+    V unaryMathOp(Unary op, int opc, AbstractSpecies<E> vspecies,
                   IntFunction<VectorSupport.UnaryOperation<V,?>> implSupplier,
                   V v) {
         var entry = lookup(op, opc, vspecies, implSupplier);
@@ -293,7 +293,7 @@ import static jdk.internal.vm.vector.Utils.debug;
             @SuppressWarnings({"unchecked"})
             Class<V> vt = (Class<V>)vspecies.vectorType();
             return VectorSupport.libraryUnaryOp(
-                    entry.entry.address(), vt, vspecies.elementType(), vspecies.length(), entry.name,
+                    entry.entry.address(), vt, vspecies.laneTypeOrdinal(), vspecies.length(), entry.name,
                     v,
                     entry.impl);
         } else {
@@ -304,7 +304,7 @@ import static jdk.internal.vm.vector.Utils.debug;
     @ForceInline
     /*package-private*/ static
     <E, V extends Vector<E>>
-    V binaryMathOp(Binary op, int opc, VectorSpecies<E> vspecies,
+    V binaryMathOp(Binary op, int opc, AbstractSpecies<E> vspecies,
                    IntFunction<VectorSupport.BinaryOperation<V,?>> implSupplier,
                    V v1, V v2) {
         var entry = lookup(op, opc, vspecies, implSupplier);
@@ -314,7 +314,7 @@ import static jdk.internal.vm.vector.Utils.debug;
             @SuppressWarnings({"unchecked"})
             Class<V> vt = (Class<V>)vspecies.vectorType();
             return VectorSupport.libraryBinaryOp(
-                    entry.entry.address(), vt, vspecies.elementType(), vspecies.length(), entry.name,
+                    entry.entry.address(), vt, vspecies.laneTypeOrdinal(), vspecies.length(), entry.name,
                     v1, v2,
                     entry.impl);
         } else {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
index 34ab05046e0..84009c55ac9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -817,8 +817,8 @@ public abstract class VectorOperators {
 
     private static <E,F> ConversionImpl<E,F>
     convert(String name, char kind, Class<E> dom, Class<F> ran, int opCode, int flags) {
-        int domran = ((LaneType.of(dom).basicType << VO_DOM_SHIFT) +
-                      (LaneType.of(ran).basicType << VO_RAN_SHIFT));
+        int domran = ((LaneType.of(dom).ordinal() << VO_DOM_SHIFT) +
+                      (LaneType.of(ran).ordinal() << VO_RAN_SHIFT));
         if (opCode >= 0) {
             if ((opCode & VO_DOM_RAN_MASK) == 0) {
                 opCode += domran;
@@ -945,10 +945,10 @@ public abstract class VectorOperators {
 
         @ForceInline
         /*package-private*/
-        boolean compatibleWith(LaneType laneType) {
-            if (laneType.elementKind == 'F') {
+        boolean compatibleWith(LaneType type) {
+            if (type.elementKind == 'F') {
                 return !opKind(VO_NOFP);
-            } else if (laneType.elementKind == 'I') {
+            } else if (type.elementKind == 'I') {
                 return !opKind(VO_ONLYFP);
             } else {
                 throw new AssertionError();
@@ -1077,8 +1077,8 @@ public abstract class VectorOperators {
             String name;
             Class<?> domType = dom.elementType;
             Class<?> ranType = ran.elementType;
-            int domCode = (dom.basicType << VO_DOM_SHIFT);
-            int ranCode = (ran.basicType << VO_RAN_SHIFT);
+            int domCode = (dom.ordinal() << VO_DOM_SHIFT);
+            int ranCode = (ran.ordinal() << VO_RAN_SHIFT);
             int opCode = domCode + ranCode;
             switch (kind) {
             case 'I':
@@ -1156,16 +1156,16 @@ public abstract class VectorOperators {
                 switch (conv.kind) {
                 case 'W':
                     int domCode = (opc >> VO_DOM_SHIFT) & 0xF;
-                    dom = LaneType.ofBasicType(domCode);
+                    dom = LaneType.ofLaneTypeOrdinal(domCode);
                     break;
                 case 'N':
                     int ranCode = (opc >> VO_RAN_SHIFT) & 0xF;
-                    ran = LaneType.ofBasicType(ranCode);
+                    ran = LaneType.ofLaneTypeOrdinal(ranCode);
                     break;
                 }
                 assert((opc & VO_DOM_RAN_MASK) ==
-                       ((dom.basicType << VO_DOM_SHIFT) +
-                        (ran.basicType << VO_RAN_SHIFT)));
+                       ((dom.ordinal() << VO_DOM_SHIFT) +
+                        (ran.ordinal() << VO_RAN_SHIFT)));
                 ConversionImpl<?,?>[] cache = cacheOf(conv.kind, dom);
                 int ranKey = ran.switchKey;
                 if (cache[ranKey] != conv) {
@@ -1233,12 +1233,12 @@ public abstract class VectorOperators {
                 break;
             case 'W':
                 doc = "In-place widen {@code _domVal} inside _ran to {@code (_ran)_domVal}";
-                LaneType logdom = LaneType.ofBasicType(domran >> VO_DOM_SHIFT & 0xF);
+                LaneType logdom = LaneType.ofLaneTypeOrdinal(domran >> VO_DOM_SHIFT & 0xF);
                 doc = doc.replace("_dom", logdom.elementType.getSimpleName());
                 break;
             case 'N':
                 doc = "In-place narrow {@code _domVal} to {@code (_ran)_domVal} inside _dom";
-                LaneType logran = LaneType.ofBasicType(domran >> VO_RAN_SHIFT & 0xF);
+                LaneType logran = LaneType.ofLaneTypeOrdinal(domran >> VO_RAN_SHIFT & 0xF);
                 doc = doc.replace("_ran", logran.elementType.getSimpleName());
                 break;
             default:
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
index f6e36450ce0..84b58ef789a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -250,8 +250,8 @@ public enum VectorShape {
     private static VectorShape computePreferredShape() {
         int prefBitSize = Integer.MAX_VALUE;
         for (LaneType type : LaneType.values()) {
-            Class<?> etype = type.elementType;
-            prefBitSize = Math.min(prefBitSize, getMaxVectorBitSize(etype));
+            Class<?> ctype = type.carrierType;
+            prefBitSize = Math.min(prefBitSize, getMaxVectorBitSize(ctype));
         }
         // If these assertions fail, we must reconsider our API portability assumptions.
         assert(prefBitSize >= Double.SIZE && prefBitSize < Integer.MAX_VALUE / Long.SIZE);
@@ -264,16 +264,16 @@ public enum VectorShape {
     /**
      * Returns the maximum vector bit size for a given element type.
      *
-     * @param etype the element type.
+     * @param ctype the carrier type.
      * @return the maximum vector bit.
      */
      /*package-private*/
-    static int getMaxVectorBitSize(Class<?> etype) {
+    static int getMaxVectorBitSize(Class<?> ctype) {
         // VectorSupport.getMaxLaneCount may return -1 if C2 is not enabled,
         // or a value smaller than the S_64_BIT.vectorBitSize / elementSizeInBits if MaxVectorSize < 16
         // If so default to S_64_BIT
-        int maxLaneCount = VectorSupport.getMaxLaneCount(etype);
-        int elementSizeInBits = LaneType.of(etype).elementSize;
+        int maxLaneCount = VectorSupport.getMaxLaneCount(ctype);
+        int elementSizeInBits = LaneType.of(ctype).elementSize;
         return Math.max(maxLaneCount * elementSizeInBits, S_64_BIT.vectorBitSize);
     }
 
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
index f7d987fd280..d6763c2c03a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,10 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 
     static final ValueLayout.Of$Type$ ELEMENT_LAYOUT = ValueLayout.JAVA_$TYPE$.withByteAlignment(1);
 
+    static final int LANE_TYPE_ORDINAL = $laneType$;
+
+    static final int LANEBITS_TYPE_ORDINAL = $lanebitsType$;
+
     @ForceInline
     static int opCode(Operator op) {
         return VectorOperators.opCode(op, VO_OPCODE_VALID, FORBID_OPCODE_KIND);
@@ -84,8 +88,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     // The various shape-specific subclasses
     // also specialize them by wrapping
     // them in a call like this:
-    //    return (Byte128Vector)
-    //       super.bOp((Byte128Vector) o);
+    //    return (ByteVector128)
+    //       super.bOp((ByteVector128) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
     // into a sharply-typed and size-specific
@@ -588,11 +592,11 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     public static $abstractvectortype$ zero(VectorSpecies<$Boxtype$> species) {
         $Type$Species vsp = ($Type$Species) species;
 #if[FP]
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), $type$.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                         toBits(0.0f), MODE_BROADCAST, vsp,
                         ((bits_, s_) -> s_.rvOp(i -> bits_)));
 #else[FP]
-        return VectorSupport.fromBitsCoerced(vsp.vectorType(), $type$.class, species.length(),
+        return VectorSupport.fromBitsCoerced(vsp.vectorType(), LANE_TYPE_ORDINAL, species.length(),
                                 0, MODE_BROADCAST, vsp,
                                 ((bits_, s_) -> s_.rvOp(i -> bits_)));
 #end[FP]
@@ -724,7 +728,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), null, $type$.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             UN_IMPL.find(op, opc, $abstractvectortype$::unaryOperations));
     }
@@ -759,7 +763,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         }
         int opc = opCode(op);
         return VectorSupport.unaryOp(
-            opc, getClass(), maskClass, $type$.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             UN_IMPL.find(op, opc, $abstractvectortype$::unaryOperations));
     }
@@ -903,7 +907,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), null, $type$.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, null,
             BIN_IMPL.find(op, opc, $abstractvectortype$::binaryOperations));
     }
@@ -970,7 +974,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 
         int opc = opCode(op);
         return VectorSupport.binaryOp(
-            opc, getClass(), maskClass, $type$.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, m,
             BIN_IMPL.find(op, opc, $abstractvectortype$::binaryOperations));
     }
@@ -1198,7 +1202,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), null, $type$.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, e, null,
             BIN_INT_IMPL.find(op, opc, $abstractvectortype$::broadcastIntOperations));
     }
@@ -1219,7 +1223,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         e &= SHIFT_MASK;
         int opc = opCode(op);
         return VectorSupport.broadcastInt(
-            opc, getClass(), maskClass, $type$.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, e, m,
             BIN_INT_IMPL.find(op, opc, $abstractvectortype$::broadcastIntOperations));
     }
@@ -1303,7 +1307,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 #end[BITWISE]
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), null, $type$.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, that, tother, null,
             TERN_IMPL.find(op, opc, $abstractvectortype$::ternaryOperations));
     }
@@ -1345,7 +1349,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 #end[BITWISE]
         int opc = opCode(op);
         return VectorSupport.ternaryOp(
-            opc, getClass(), maskClass, $type$.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, that, tother, m,
             TERN_IMPL.find(op, opc, $abstractvectortype$::ternaryOperations));
     }
@@ -2477,7 +2481,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         that.check(this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, $type$.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, null,
             (cond, v0, v1, m1) -> {
                 AbstractMask<$Boxtype$> m
@@ -2499,7 +2503,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         m.check(maskType, this);
         int opc = opCode(op);
         return VectorSupport.compare(
-            opc, getClass(), maskType, $type$.class, length(),
+            opc, getClass(), maskType, laneTypeOrdinal(), length(),
             this, that, m,
             (cond, v0, v1, m1) -> {
                 AbstractMask<$Boxtype$> cmpM
@@ -2634,7 +2638,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     blendTemplate(Class<M> maskType, $abstractvectortype$ v, M m) {
         v.check(this);
         return VectorSupport.blend(
-            getClass(), maskType, $type$.class, length(),
+            getClass(), maskType, laneTypeOrdinal(), length(),
             this, v, m,
             (v0, v1, m_) -> v0.bOp(v1, m_, (i, a, b) -> b));
     }
@@ -2651,7 +2655,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         // make sure VLENGTH*scale doesn't overflow:
         vsp.checkScale(scale);
         return VectorSupport.indexVector(
-            getClass(), $type$.class, length(),
+            getClass(), laneTypeOrdinal(), length(),
             this, scale, vsp,
             (v, scale_, s)
             -> {
@@ -2865,7 +2869,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $abstractvectortype$ rearrangeTemplate(Class<S> shuffletype, S shuffle) {
         Objects.requireNonNull(shuffle);
         return VectorSupport.rearrangeOp(
-            getClass(), shuffletype, null, $type$.class, length(),
+            getClass(), shuffletype, null, laneTypeOrdinal(), length(),
             this, shuffle, null,
             (v1, s_, m_) -> v1.uOp((i, a) -> {
                 int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2892,7 +2896,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         Objects.requireNonNull(shuffle);
         m.check(masktype, this);
         return VectorSupport.rearrangeOp(
-                   getClass(), shuffletype, masktype, $type$.class, length(),
+                   getClass(), shuffletype, masktype, laneTypeOrdinal(), length(),
                    this, shuffle, m,
                    (v1, s_, m_) -> v1.uOp((i, a) -> {
                         int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2918,7 +2922,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         VectorMask<$Boxtype$> valid = shuffle.laneIsValid();
         $abstractvectortype$ r0 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, $type$.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 this, shuffle, null,
                 (v0, s_, m_) -> v0.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v0.length());
@@ -2926,7 +2930,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                 }));
         $abstractvectortype$ r1 =
             VectorSupport.rearrangeOp(
-                getClass(), shuffletype, null, $type$.class, length(),
+                getClass(), shuffletype, null, laneTypeOrdinal(), length(),
                 v, shuffle, null,
                 (v1, s_, m_) -> v1.uOp((i, a) -> {
                     int ei = Integer.remainderUnsigned(s_.laneSource(i), v1.length());
@@ -2988,7 +2992,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $Type$Vector compressTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return ($Type$Vector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_COMPRESS, getClass(), masktype,
-                                                        $type$.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> compressHelper(v1, m1));
     }
 
@@ -3007,7 +3011,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $Type$Vector expandTemplate(Class<M> masktype, M m) {
       m.check(masktype, this);
       return ($Type$Vector) VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_EXPAND, getClass(), masktype,
-                                                        $type$.class, length(), this, m,
+                                                        laneTypeOrdinal(), length(), this, m,
                                                         (v1, m1) -> expandHelper(v1, m1));
     }
 
@@ -3022,7 +3026,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /*package-private*/
     @ForceInline
     final $abstractvectortype$ selectFromTemplate($abstractvectortype$ v) {
-        return ($Type$Vector)VectorSupport.selectFromOp(getClass(), null, $type$.class,
+        return ($Type$Vector)VectorSupport.selectFromOp(getClass(), null, laneTypeOrdinal(),
                                                         length(), this, v, null,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle()));
@@ -3042,7 +3046,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $abstractvectortype$ selectFromTemplate($abstractvectortype$ v,
                                             Class<M> masktype, M m) {
         m.check(masktype, this);
-        return ($Type$Vector)VectorSupport.selectFromOp(getClass(), masktype, $type$.class,
+        return ($Type$Vector)VectorSupport.selectFromOp(getClass(), masktype, laneTypeOrdinal(),
                                                         length(), this, v, m,
                                                         (v1, v2, _m) ->
                                                          v2.rearrange(v1.toShuffle(), _m));
@@ -3060,7 +3064,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /*package-private*/
     @ForceInline
     final $abstractvectortype$ selectFromTemplate($abstractvectortype$ v1, $abstractvectortype$ v2) {
-        return VectorSupport.selectFromTwoVectorOp(getClass(), $type$.class, length(), this, v1, v2,
+        return VectorSupport.selectFromTwoVectorOp(getClass(), laneTypeOrdinal(), length(), this, v1, v2,
                                                    (vec1, vec2, vec3) -> selectFromTwoVectorHelper(vec1, vec2, vec3));
     }
 
@@ -3409,7 +3413,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), maskClass, $type$.class, length(),
+            opc, getClass(), maskClass, laneTypeOrdinal(), length(),
             this, m,
             REDUCE_IMPL.find(op, opc, $abstractvectortype$::reductionOperations)));
     }
@@ -3427,7 +3431,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         }
         int opc = opCode(op);
         return fromBits(VectorSupport.reductionCoerced(
-            opc, getClass(), null, $type$.class, length(),
+            opc, getClass(), null, laneTypeOrdinal(), length(),
             this, null,
             REDUCE_IMPL.find(op, opc, $abstractvectortype$::reductionOperations)));
     }
@@ -3448,9 +3452,9 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
                     toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> ($type$) Math.max(a, b)));
 #if[!FP]
             case VECTOR_OP_UMIN: return (v, m) ->
-                    toBits(v.rOp(MAX_OR_INF, m, (i, a, b) -> ($type$) VectorMath.minUnsigned(a, b)));
+                    toBits(v.rOp(UMAX_VALUE, m, (i, a, b) -> ($type$) VectorMath.minUnsigned(a, b)));
             case VECTOR_OP_UMAX: return (v, m) ->
-                    toBits(v.rOp(MIN_OR_INF, m, (i, a, b) -> ($type$) VectorMath.maxUnsigned(a, b)));
+                    toBits(v.rOp(UMIN_VALUE, m, (i, a, b) -> ($type$) VectorMath.maxUnsigned(a, b)));
             case VECTOR_OP_SUADD: return (v, m) ->
                     toBits(v.rOp(($type$)0, m, (i, a, b) -> ($type$) VectorMath.addSaturatingUnsigned(a, b)));
 #end[!FP]
@@ -3472,6 +3476,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 #else[FP]
     private static final $type$ MIN_OR_INF = $Boxtype$.MIN_VALUE;
     private static final $type$ MAX_OR_INF = $Boxtype$.MAX_VALUE;
+    private static final $type$ UMIN_VALUE = ($type$)0;   // Minimum unsigned value
+    private static final $type$ UMAX_VALUE = ($type$)-1;  // Maximum unsigned value
 #end[FP]
 
     public @Override abstract long reduceLanesToLong(VectorOperators.Associative op);
@@ -3787,7 +3793,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         }
 
         return VectorSupport.loadWithMap(
-            vectorType, null, $type$.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, vix2, vix3, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3795,7 +3801,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             s.vOp(n -> c[idx + iMap[idy+n]]));
 #else[byte]
         return VectorSupport.loadWithMap(
-            vectorType, null, $type$.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -3823,7 +3829,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         // Index vector: vix[0:n] = k -> offset + indexMap[mapOffset + k]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For $Type$MaxVector,  if vector length is non-power-of-two or
+            // For $Type$VectorMax,  if vector length is non-power-of-two or
             // 2048 bits, indexShape of $Type$ species is S_MAX_BIT.
             // Assume that vector length is 2048, then the lane count of $Type$
             // vector is 32. When converting $Type$ species to int species,
@@ -3831,7 +3837,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -3848,7 +3854,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, null, $type$.class, vsp.laneCount(),
+            vectorType, null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, null,
             a, offset, indexMap, mapOffset, vsp,
@@ -4347,7 +4353,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         offset = checkFromIndexSize(offset, length(), a.length);
         $Type$Species vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this,
             a, offset,
@@ -4449,14 +4455,14 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         // Index vector: vix[0:n] = i -> offset + indexMap[mo + i]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For $Type$MaxVector,  if vector length  is 2048 bits, indexShape
+            // For $Type$VectorMax,  if vector length  is 2048 bits, indexShape
             // of $Type$ species is S_MAX_BIT. and the lane count of $Type$
             // vector is 32. When converting $Type$ species to int species,
             // indexShape is still S_MAX_BIT, but the lane count of int vector
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -4474,7 +4480,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), null, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), null, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, null,
@@ -4567,7 +4573,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         offset = checkFromIndexSize(offset, length(), a.length);
         $Type$Species vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, charArrayAddress(a, offset), false,
             this,
             a, offset,
@@ -4729,7 +4735,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         $Type$Species vsp = vspecies();
         ByteVector normalized = this.and((byte) 1);
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false,
             normalized,
             a, offset,
@@ -4943,7 +4949,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $abstractvectortype$ fromArray0Template($type$[] a, int offset) {
         $Type$Species vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -4960,7 +4966,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         m.check(species());
         $Type$Species vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -5018,7 +5024,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         }
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, $type$.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, vix2, vix3, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -5026,7 +5032,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             s.vOp(vm, n -> c[idx + iMap[idy+n]]));
 #else[byte]
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, $type$.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             lsp.vectorType(), lsp.length(),
             a, ARRAY_BASE, vix0, vix1, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -5055,7 +5061,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         // Index vector: vix[0:n] = k -> offset + indexMap[mapOffset + k]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For $Type$MaxVector,  if vector length is non-power-of-two or
+            // For $Type$VectorMax,  if vector length is non-power-of-two or
             // 2048 bits, indexShape of $Type$ species is S_MAX_BIT.
             // Assume that vector length is 2048, then the lane count of $Type$
             // vector is 32. When converting $Type$ species to int species,
@@ -5063,7 +5069,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -5081,7 +5087,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorSupport.loadWithMap(
-            vectorType, maskClass, $type$.class, vsp.laneCount(),
+            vectorType, maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, ARRAY_BASE, vix, null, null, null, m,
             a, offset, indexMap, mapOffset, vsp,
@@ -5099,7 +5105,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $abstractvectortype$ fromCharArray0Template(char[] a, int offset) {
         $Type$Species vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, charArrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -5116,7 +5122,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         m.check(species());
         $Type$Species vsp = vspecies();
         return VectorSupport.loadMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 a, charArrayAddress(a, offset), false, m, offsetInRange,
                 a, offset, vsp,
                 (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -5133,7 +5139,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $abstractvectortype$ fromBooleanArray0Template(boolean[] a, int offset) {
         $Type$Species vsp = vspecies();
         return VectorSupport.load(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false,
             a, offset, vsp,
             (arr, off, s) -> s.ldOp(arr, (int) off,
@@ -5150,7 +5156,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         m.check(species());
         $Type$Species vsp = vspecies();
         return VectorSupport.loadMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false, m, offsetInRange,
             a, offset, vsp,
             (arr, off, s, vm) -> s.ldOp(arr, (int) off, vm,
@@ -5165,7 +5171,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     $abstractvectortype$ fromMemorySegment0Template(MemorySegment ms, long offset) {
         $Type$Species vsp = vspecies();
         return ScopedMemoryAccess.loadFromMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, vsp,
                 (msp, off, s) -> {
                     return s.ldLongOp((MemorySegment) msp, off, $abstractvectortype$::memorySegmentGet);
@@ -5181,7 +5187,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         $Type$Species vsp = vspecies();
         m.check(vsp);
         return ScopedMemoryAccess.loadFromMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 (AbstractMemorySegmentImpl) ms, offset, m, vsp, offsetInRange,
                 (msp, off, s, vm) -> {
                     return s.ldLongOp((MemorySegment) msp, off, vm, $abstractvectortype$::memorySegmentGet);
@@ -5199,7 +5205,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     void intoArray0Template($type$[] a, int offset) {
         $Type$Species vsp = vspecies();
         VectorSupport.store(
-            vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, a, offset,
             (arr, off, v)
@@ -5216,7 +5222,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         m.check(species());
         $Type$Species vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, arrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -5246,14 +5252,14 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         // Index vector: vix[0:n] = i -> offset + indexMap[mo + i]
         IntVector vix;
         if (isp.laneCount() != vsp.laneCount()) {
-            // For $Type$MaxVector,  if vector length  is 2048 bits, indexShape
+            // For $Type$VectorMax,  if vector length  is 2048 bits, indexShape
             // of $Type$ species is S_MAX_BIT. and the lane count of $Type$
             // vector is 32. When converting $Type$ species to int species,
             // indexShape is still S_MAX_BIT, but the lane count of int vector
             // is 64. So when loading index vector (IntVector), only lower half
             // of index data is needed.
             vix = IntVector
-                .fromArray(isp, indexMap, mapOffset, IntMaxVector.IntMaxMask.LOWER_HALF_TRUE_MASK)
+                .fromArray(isp, indexMap, mapOffset, IntVectorMax.IntMaskMax.LOWER_HALF_TRUE_MASK)
                 .add(offset);
         } else {
             vix = IntVector
@@ -5272,7 +5278,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorSupport.storeWithMap(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             isp.vectorType(), isp.length(),
             a, arrayAddress(a, 0), vix,
             this, m,
@@ -5297,7 +5303,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         $Type$Species vsp = vspecies();
         ByteVector normalized = this.and((byte) 1);
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, booleanArrayAddress(a, offset), false,
             normalized, m, a, offset,
             (arr, off, v, vm)
@@ -5311,7 +5317,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     void intoMemorySegment0(MemorySegment ms, long offset) {
         $Type$Species vsp = vspecies();
         ScopedMemoryAccess.storeIntoMemorySegment(
-                vsp.vectorType(), vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v) -> {
@@ -5328,7 +5334,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         $Type$Species vsp = vspecies();
         m.check(vsp);
         ScopedMemoryAccess.storeIntoMemorySegmentMasked(
-                vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+                vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
                 this, m,
                 (AbstractMemorySegmentImpl) ms, offset,
                 (msp, off, v, vm) -> {
@@ -5347,7 +5353,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         m.check(species());
         $Type$Species vsp = vspecies();
         VectorSupport.storeMasked(
-            vsp.vectorType(), maskClass, vsp.elementType(), vsp.laneCount(),
+            vsp.vectorType(), maskClass, LANE_TYPE_ORDINAL, vsp.laneCount(),
             a, charArrayAddress(a, offset), false,
             this, m, a, offset,
             (arr, off, v, vm)
@@ -5387,6 +5393,22 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         return this;
     }
 
+    @Override
+    @ForceInline
+    final
+    $abstractvectortype$ swapIfNeeded(AbstractSpecies<?> srcSpecies) {
+#if[byte]
+        return this;
+#else[byte]
+        int subLanesPerSrc = subLanesToSwap(srcSpecies);
+        if (subLanesPerSrc < 0) {
+            return this;
+        }
+        VectorShuffle<$Boxtype$> shuffle = normalizeSubLanesForSpecies(this.vspecies(), subLanesPerSrc);
+        return ($abstractvectortype$) this.rearrange(shuffle);
+#end[byte]
+    }
+
     static final int ARRAY_SHIFT =
         31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_$TYPE$_INDEX_SCALE);
     static final long ARRAY_BASE =
@@ -5602,7 +5624,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         final $abstractvectortype$ broadcastBits(long bits) {
             return ($abstractvectortype$)
                 VectorSupport.fromBitsCoerced(
-                    vectorType, $type$.class, laneCount,
+                    vectorType, laneTypeOrdinal(), laneCount,
                     bits, MODE_BROADCAST, this,
                     (bits_, s_) -> s_.rvOp(i -> bits_));
         }
@@ -5791,13 +5813,13 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         @Override
         @ForceInline
         public final $abstractvectortype$ zero() {
-            if ((Class<?>) vectorType() == $Type$MaxVector.class)
-                return $Type$MaxVector.ZERO;
+            if ((Class<?>) vectorType() == $Type$VectorMax.class)
+                return $Type$VectorMax.ZERO;
             switch (vectorBitSize()) {
-                case 64: return $Type$64Vector.ZERO;
-                case 128: return $Type$128Vector.ZERO;
-                case 256: return $Type$256Vector.ZERO;
-                case 512: return $Type$512Vector.ZERO;
+                case 64: return $Type$Vector64.ZERO;
+                case 128: return $Type$Vector128.ZERO;
+                case 256: return $Type$Vector256.ZERO;
+                case 512: return $Type$Vector512.ZERO;
             }
             throw new AssertionError();
         }
@@ -5805,13 +5827,13 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         @Override
         @ForceInline
         public final $abstractvectortype$ iota() {
-            if ((Class<?>) vectorType() == $Type$MaxVector.class)
-                return $Type$MaxVector.IOTA;
+            if ((Class<?>) vectorType() == $Type$VectorMax.class)
+                return $Type$VectorMax.IOTA;
             switch (vectorBitSize()) {
-                case 64: return $Type$64Vector.IOTA;
-                case 128: return $Type$128Vector.IOTA;
-                case 256: return $Type$256Vector.IOTA;
-                case 512: return $Type$512Vector.IOTA;
+                case 64: return $Type$Vector64.IOTA;
+                case 128: return $Type$Vector128.IOTA;
+                case 256: return $Type$Vector256.IOTA;
+                case 512: return $Type$Vector512.IOTA;
             }
             throw new AssertionError();
         }
@@ -5820,13 +5842,13 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         @Override
         @ForceInline
         public final VectorMask<$Boxtype$> maskAll(boolean bit) {
-            if ((Class<?>) vectorType() == $Type$MaxVector.class)
-                return $Type$MaxVector.$Type$MaxMask.maskAll(bit);
+            if ((Class<?>) vectorType() == $Type$VectorMax.class)
+                return $Type$VectorMax.$Type$MaskMax.maskAll(bit);
             switch (vectorBitSize()) {
-                case 64: return $Type$64Vector.$Type$64Mask.maskAll(bit);
-                case 128: return $Type$128Vector.$Type$128Mask.maskAll(bit);
-                case 256: return $Type$256Vector.$Type$256Mask.maskAll(bit);
-                case 512: return $Type$512Vector.$Type$512Mask.maskAll(bit);
+                case 64: return $Type$Vector64.$Type$Mask64.maskAll(bit);
+                case 128: return $Type$Vector128.$Type$Mask128.maskAll(bit);
+                case 256: return $Type$Vector256.$Type$Mask256.maskAll(bit);
+                case 512: return $Type$Vector512.$Type$Mask512.maskAll(bit);
             }
             throw new AssertionError();
         }
@@ -5854,42 +5876,42 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /** Species representing {@link $Type$Vector}s of {@link VectorShape#S_64_BIT VectorShape.S_64_BIT}. */
     public static final VectorSpecies<$Boxtype$> SPECIES_64
         = new $Type$Species(VectorShape.S_64_BIT,
-                            $Type$64Vector.class,
-                            $Type$64Vector.$Type$64Mask.class,
-                            $Type$64Vector.$Type$64Shuffle.class,
-                            $Type$64Vector::new);
+                            $Type$Vector64.class,
+                            $Type$Vector64.$Type$Mask64.class,
+                            $Type$Vector64.$Type$Shuffle64.class,
+                            $Type$Vector64::new);
 
     /** Species representing {@link $Type$Vector}s of {@link VectorShape#S_128_BIT VectorShape.S_128_BIT}. */
     public static final VectorSpecies<$Boxtype$> SPECIES_128
         = new $Type$Species(VectorShape.S_128_BIT,
-                            $Type$128Vector.class,
-                            $Type$128Vector.$Type$128Mask.class,
-                            $Type$128Vector.$Type$128Shuffle.class,
-                            $Type$128Vector::new);
+                            $Type$Vector128.class,
+                            $Type$Vector128.$Type$Mask128.class,
+                            $Type$Vector128.$Type$Shuffle128.class,
+                            $Type$Vector128::new);
 
     /** Species representing {@link $Type$Vector}s of {@link VectorShape#S_256_BIT VectorShape.S_256_BIT}. */
     public static final VectorSpecies<$Boxtype$> SPECIES_256
         = new $Type$Species(VectorShape.S_256_BIT,
-                            $Type$256Vector.class,
-                            $Type$256Vector.$Type$256Mask.class,
-                            $Type$256Vector.$Type$256Shuffle.class,
-                            $Type$256Vector::new);
+                            $Type$Vector256.class,
+                            $Type$Vector256.$Type$Mask256.class,
+                            $Type$Vector256.$Type$Shuffle256.class,
+                            $Type$Vector256::new);
 
     /** Species representing {@link $Type$Vector}s of {@link VectorShape#S_512_BIT VectorShape.S_512_BIT}. */
     public static final VectorSpecies<$Boxtype$> SPECIES_512
         = new $Type$Species(VectorShape.S_512_BIT,
-                            $Type$512Vector.class,
-                            $Type$512Vector.$Type$512Mask.class,
-                            $Type$512Vector.$Type$512Shuffle.class,
-                            $Type$512Vector::new);
+                            $Type$Vector512.class,
+                            $Type$Vector512.$Type$Mask512.class,
+                            $Type$Vector512.$Type$Shuffle512.class,
+                            $Type$Vector512::new);
 
     /** Species representing {@link $Type$Vector}s of {@link VectorShape#S_Max_BIT VectorShape.S_Max_BIT}. */
     public static final VectorSpecies<$Boxtype$> SPECIES_MAX
         = new $Type$Species(VectorShape.S_Max_BIT,
-                            $Type$MaxVector.class,
-                            $Type$MaxVector.$Type$MaxMask.class,
-                            $Type$MaxVector.$Type$MaxShuffle.class,
-                            $Type$MaxVector::new);
+                            $Type$VectorMax.class,
+                            $Type$VectorMax.$Type$MaskMax.class,
+                            $Type$VectorMax.$Type$ShuffleMax.class,
+                            $Type$VectorMax::new);
 
     /**
      * Preferred species for {@link $Type$Vector}s.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
index fa502e3f29a..bbf02f9c6cd 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,6 +54,8 @@ final class $vectortype$ extends $abstractvectortype$ {
 
     static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM
 
+    static final Class<$Carriertype$> CTYPE = $carriertype$.class; // carrier type used by the JVM
+
     static final Class<$Boxtype$> ETYPE = $type$.class; // used by the JVM
 
     $vectortype$($type$[] v) {
@@ -92,6 +94,9 @@ final class $vectortype$ extends $abstractvectortype$ {
     @Override
     public final Class<$Boxtype$> elementType() { return $type$.class; }
 
+    @ForceInline
+    final Class<$Carriertype$> carrierType() { return CTYPE; }
+
     @ForceInline
     @Override
     public final int elementSize() { return $Boxtype$.SIZE; }
@@ -119,6 +124,13 @@ final class $vectortype$ extends $abstractvectortype$ {
         return ($type$[])getPayload();
     }
 
+    /*package-private*/
+    @ForceInline
+    final @Override
+    int laneTypeOrdinal() {
+        return LANE_TYPE_ORDINAL;
+    }
+
     // Virtualized constructors
 
     @Override
@@ -176,8 +188,8 @@ final class $vectortype$ extends $abstractvectortype$ {
 
     @ForceInline
     final @Override
-    Byte$bits$Vector asByteVectorRaw() {
-        return (Byte$bits$Vector) super.asByteVectorRawTemplate();  // specialize
+    ByteVector$bits$ asByteVectorRaw() {
+        return (ByteVector$bits$) super.asByteVectorRawTemplate();  // specialize
     }
 
     @ForceInline
@@ -577,7 +589,7 @@ final class $vectortype$ extends $abstractvectortype$ {
     @ForceInline
     public $bitstype$ laneHelper(int i) {
         return ($bitstype$) VectorSupport.extract(
-                     VCLASS, ETYPE, VLENGTH,
+                     VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                      this, i,
                      (vec, ix) -> {
                      $type$[] vecarr = vec.vec();
@@ -627,7 +639,7 @@ final class $vectortype$ extends $abstractvectortype$ {
     @ForceInline
     public $vectortype$ withLaneHelper(int i, $type$ e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)$Type$.$type$ToRaw$Bitstype$Bits(e),
                                 (v, ix, bits) -> {
                                     $type$[] res = v.vec().clone();
@@ -730,7 +742,7 @@ final class $vectortype$ extends $abstractvectortype$ {
     @ForceInline
     public $type$ laneHelper(int i) {
         return ($type$) VectorSupport.extract(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
                                     $type$[] vecarr = vec.vec();
@@ -832,7 +844,7 @@ final class $vectortype$ extends $abstractvectortype$ {
     @ForceInline
     public $vectortype$ withLaneHelper(int i, $type$ e) {
         return VectorSupport.insert(
-                                VCLASS, ETYPE, VLENGTH,
+                                VCLASS, LANE_TYPE_ORDINAL, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
                                     $type$[] res = v.vec().clone();
@@ -846,7 +858,8 @@ final class $vectortype$ extends $abstractvectortype$ {
 
     static final class $masktype$ extends AbstractMask<$Boxtype$> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<$Boxtype$> ETYPE = $type$.class; // used by the JVM
+
+        static final Class<$Carriertype$> CTYPE = $carriertype$.class; // used by the JVM
 
         $masktype$(boolean[] bits) {
             this(bits, 0);
@@ -937,8 +950,8 @@ final class $vectortype$ extends $abstractvectortype$ {
                 throw new IllegalArgumentException("VectorMask length and species length differ");
 
             return VectorSupport.convert(VectorSupport.VECTOR_OP_CAST,
-                this.getClass(), ETYPE, VLENGTH,
-                species.maskType(), species.elementType(), VLENGTH,
+                this.getClass(), LANE_TYPE_ORDINAL, VLENGTH,
+                species.maskType(), species.laneTypeOrdinal(), VLENGTH,
                 this, species,
                 (m, s) -> s.maskFactory(m.toArray()).check(s));
         }
@@ -948,7 +961,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         /*package-private*/
         $masktype$ indexPartiallyInUpperRange(long offset, long limit) {
             return ($masktype$) VectorSupport.indexPartiallyInUpperRange(
-                $masktype$.class, $type$.class, VLENGTH, offset, limit,
+                $masktype$.class, LANE_TYPE_ORDINAL, VLENGTH, offset, limit,
                 (o, l) -> ($masktype$) TRUE_MASK.indexPartiallyInRange(o, l));
         }
 
@@ -964,7 +977,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         @ForceInline
         public $masktype$ compress() {
             return ($masktype$)VectorSupport.compressExpandOp(VectorSupport.VECTOR_OP_MASK_COMPRESS,
-                $vectortype$.class, $masktype$.class, ETYPE, VLENGTH, null, this,
+                $vectortype$.class, $masktype$.class, LANE_TYPE_ORDINAL, VLENGTH, null, this,
                 (v1, m1) -> VSPECIES.iota().compare(VectorOperators.LT, m1.trueCount()));
         }
 
@@ -976,7 +989,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         public $masktype$ and(VectorMask<$Boxtype$> mask) {
             Objects.requireNonNull(mask);
             $masktype$ m = ($masktype$)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_AND, $masktype$.class, null, $bitstype$.class, VLENGTH,
+            return VectorSupport.binaryOp(VECTOR_OP_AND, $masktype$.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
@@ -986,7 +999,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         public $masktype$ or(VectorMask<$Boxtype$> mask) {
             Objects.requireNonNull(mask);
             $masktype$ m = ($masktype$)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_OR, $masktype$.class, null, $bitstype$.class, VLENGTH,
+            return VectorSupport.binaryOp(VECTOR_OP_OR, $masktype$.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a | b));
         }
@@ -996,7 +1009,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         public $masktype$ xor(VectorMask<$Boxtype$> mask) {
             Objects.requireNonNull(mask);
             $masktype$ m = ($masktype$)mask;
-            return VectorSupport.binaryOp(VECTOR_OP_XOR, $masktype$.class, null, $bitstype$.class, VLENGTH,
+            return VectorSupport.binaryOp(VECTOR_OP_XOR, $masktype$.class, null, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                           this, m, null,
                                           (m1, m2, vm) -> m1.bOp(m2, (i, a, b) -> a ^ b));
         }
@@ -1006,21 +1019,21 @@ final class $vectortype$ extends $abstractvectortype$ {
         @Override
         @ForceInline
         public int trueCount() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, $masktype$.class, $bitstype$.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TRUECOUNT, $masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> trueCountHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int firstTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, $masktype$.class, $bitstype$.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_FIRSTTRUE, $masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> firstTrueHelper(m.getBits()));
         }
 
         @Override
         @ForceInline
         public int lastTrue() {
-            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, $masktype$.class, $bitstype$.class, VLENGTH, this,
+            return (int) VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_LASTTRUE, $masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> lastTrueHelper(m.getBits()));
         }
 
@@ -1030,7 +1043,7 @@ final class $vectortype$ extends $abstractvectortype$ {
             if (length() > Long.SIZE) {
                 throw new UnsupportedOperationException("too many lanes for one long");
             }
-            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, $masktype$.class, $bitstype$.class, VLENGTH, this,
+            return VectorSupport.maskReductionCoerced(VECTOR_OP_MASK_TOLONG, $masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH, this,
                                                       (m) -> toLongHelper(m.getBits()));
         }
 
@@ -1040,7 +1053,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         @ForceInline
         public boolean laneIsSet(int i) {
             Objects.checkIndex(i, length());
-            return VectorSupport.extract($masktype$.class, $type$.class, VLENGTH,
+            return VectorSupport.extract($masktype$.class, LANE_TYPE_ORDINAL, VLENGTH,
                                          this, i, (m, idx) -> (m.getBits()[idx] ? 1L : 0L)) == 1L;
         }
 
@@ -1049,7 +1062,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         @Override
         @ForceInline
         public boolean anyTrue() {
-            return VectorSupport.test(BT_ne, $masktype$.class, $bitstype$.class, VLENGTH,
+            return VectorSupport.test(BT_ne, $masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
                                          (m, __) -> anyTrueHelper((($masktype$)m).getBits()));
         }
@@ -1057,7 +1070,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         @Override
         @ForceInline
         public boolean allTrue() {
-            return VectorSupport.test(BT_overflow, $masktype$.class, $bitstype$.class, VLENGTH,
+            return VectorSupport.test(BT_overflow, $masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                          this, vspecies().maskAll(true),
                                          (m, __) -> allTrueHelper((($masktype$)m).getBits()));
         }
@@ -1065,7 +1078,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         @ForceInline
         /*package-private*/
         static $masktype$ maskAll(boolean bit) {
-            return VectorSupport.fromBitsCoerced($masktype$.class, $bitstype$.class, VLENGTH,
+            return VectorSupport.fromBitsCoerced($masktype$.class, LANEBITS_TYPE_ORDINAL, VLENGTH,
                                                  (bit ? -1 : 0), MODE_BROADCAST, null,
                                                  (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK));
         }
@@ -1085,7 +1098,7 @@ final class $vectortype$ extends $abstractvectortype$ {
 
 #end[intAndMax]
 #if[intAndMax]
-        static final IntMaxMask LOWER_HALF_TRUE_MASK = new IntMaxMask(maskLowerHalf());
+        static final IntMaskMax LOWER_HALF_TRUE_MASK = new IntMaskMax(maskLowerHalf());
 #end[intAndMax]
     }
 
@@ -1093,7 +1106,8 @@ final class $vectortype$ extends $abstractvectortype$ {
 
     static final class $shuffletype$ extends AbstractShuffle<$Boxtype$> {
         static final int VLENGTH = VSPECIES.laneCount();    // used by the JVM
-        static final Class<$Boxbitstype$> ETYPE = $bitstype$.class; // used by the JVM
+
+        static final Class<$Boxbitstype$> CTYPE = $bitstype$.class; // used by the JVM
 
         $shuffletype$($bitstype$[] indices) {
             super(indices);
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh
index 6841a47c757..a8a7ea83625 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/gen-src.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -72,26 +72,35 @@ do
   fptype=$type
   Fptype=$Type
   Boxfptype=$Boxtype
+  carriertype=$type
+  Carriertype=$Type
 
   case $type in
     byte)
       Wideboxtype=Integer
       sizeInBytes=1
+      laneType=LT_BYTE
+      lanebitsType=LT_BYTE
       args="$args -KbyteOrShort"
       ;;
     short)
       Wideboxtype=Integer
       sizeInBytes=2
+      laneType=LT_SHORT
+      lanebitsType=LT_SHORT
       args="$args -KbyteOrShort"
       ;;
     int)
       Boxtype=Integer
+      Carriertype=Integer
       Wideboxtype=Integer
       Boxbitstype=Integer
       fptype=float
       Fptype=Float
       Boxfptype=Float
       sizeInBytes=4
+      laneType=LT_INT
+      lanebitsType=LT_INT
       args="$args -KintOrLong -KintOrFP -KintOrFloat"
       ;;
     long)
@@ -99,6 +108,8 @@ do
       Fptype=Double
       Boxfptype=Double
       sizeInBytes=8
+      laneType=LT_LONG
+      lanebitsType=LT_LONG
       args="$args -KintOrLong -KlongOrDouble"
       ;;
     float)
@@ -107,6 +118,8 @@ do
       Bitstype=Int
       Boxbitstype=Integer
       sizeInBytes=4
+      laneType=LT_FLOAT
+      lanebitsType=LT_INT
       args="$args -KintOrFP -KintOrFloat"
       ;;
     double)
@@ -115,17 +128,20 @@ do
       Bitstype=Long
       Boxbitstype=Long
       sizeInBytes=8
+      laneType=LT_DOUBLE
+      lanebitsType=LT_LONG
       args="$args -KintOrFP -KlongOrDouble"
       ;;
   esac
 
-  args="$args -K$kind -DBoxtype=$Boxtype -DWideboxtype=$Wideboxtype"
+  args="$args -K$kind -DlaneType=$laneType -DlanebitsType=$lanebitsType -DBoxtype=$Boxtype -DWideboxtype=$Wideboxtype"
   args="$args -Dbitstype=$bitstype -DBitstype=$Bitstype -DBoxbitstype=$Boxbitstype"
   args="$args -Dfptype=$fptype -DFptype=$Fptype -DBoxfptype=$Boxfptype"
   args="$args -DsizeInBytes=$sizeInBytes"
+  args="$args -Dcarriertype=$carriertype -DCarriertype=$Carriertype"
 
   abstractvectortype=${typeprefix}${Type}Vector
-  abstractbitsvectortype=${typeprefix}${Bitstype}Vector
+  abstractbitsvectortype=${typeprefix}Vector${Bitstype}
   abstractfpvectortype=${typeprefix}${Fptype}Vector
   args="$args -Dabstractvectortype=$abstractvectortype -Dabstractbitsvectortype=$abstractbitsvectortype -Dabstractfpvectortype=$abstractfpvectortype"
   case $abstractvectortype in
@@ -146,11 +162,11 @@ do
   old_args="$args"
   for bits in 64 128 256 512 Max
   do
-    vectortype=${typeprefix}${Type}${bits}Vector
-    masktype=${typeprefix}${Type}${bits}Mask
-    shuffletype=${typeprefix}${Type}${bits}Shuffle
-    bitsvectortype=${typeprefix}${Bitstype}${bits}Vector
-    fpvectortype=${typeprefix}${Fptype}${bits}Vector
+    vectortype=${typeprefix}${Type}Vector${bits}
+    masktype=${typeprefix}${Type}Mask${bits}
+    shuffletype=${typeprefix}${Type}Shuffle${bits}
+    bitsvectortype=${typeprefix}${Bitstype}Vector${bits}
+    fpvectortype=${typeprefix}${Fptype}Vector${bits}
     vectorindexbits=$((bits * 4 / sizeInBytes))
 
     numLanes=$((bits / (sizeInBytes * 8)))
@@ -173,7 +189,7 @@ do
     if [[ "${bits}" == "Max" ]]; then
         vectorindextype="vix.getClass()"
     else
-        vectorindextype="Int${vectorindexbits}Vector.class"
+        vectorindextype="IntVector${vectorindexbits}.class"
     fi;
 
     BITS=$bits
@@ -187,7 +203,7 @@ do
     Shape=S_${bits}_BIT
     args="$old_args"
     args="$args -K$lanes -K$bits"
-    if [[ "${vectortype}" == "IntMaxVector" ]]; then
+    if [[ "${vectortype}" == "IntVectorMax" ]]; then
       args="$args -KintAndMax"
     fi
     bitargs="$args -Dbits=$bits -DBITS=$BITS -Dvectortype=$vectortype -Dmasktype=$masktype -Dshuffletype=$shuffletype -Dbitsvectortype=$bitsvectortype -Dfpvectortype=$fpvectortype -Dvectorindextype=$vectorindextype -Dshape=$shape -DShape=$Shape"
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
index be694eeb1bc..c6f6f012543 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,8 @@ import java.util.function.Function;
 import java.util.function.IntSupplier;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
@@ -100,6 +102,7 @@ final class Validator {
         this.zf = zf;
         this.zis = zis;
         checkModuleDescriptor(MODULE_INFO);
+        checkAutomaticModuleName();
     }
 
     static boolean validate(Main main, File zipFile) throws IOException {
@@ -453,6 +456,36 @@ final class Validator {
         });
     }
 
+    /**
+     * Checks whether an Automatic-Module-Name entry is valid
+     * and also verifies it to the name given by a compiled
+     * module descriptor.
+     */
+    private void checkAutomaticModuleName() {
+        var entry = zf.getEntry("META-INF/MANIFEST.MF");
+        if (entry == null) {
+            return;
+        }
+        try (InputStream jis = zf.getInputStream(entry)) {
+            Attributes attributes = new Manifest(jis).getMainAttributes();
+            String automaticModuleName = attributes.getValue("Automatic-Module-Name");
+            if (automaticModuleName == null) {
+                return;
+            }
+            try {
+                ModuleDescriptor.newAutomaticModule(automaticModuleName);
+            } catch (IllegalArgumentException e) {
+                errorAndInvalid(formatMsg("error.validator.manifest.invalid.automatic.module.name", automaticModuleName));
+            }
+            if (md == null || automaticModuleName.equals(md.name())) {
+                return;
+            }
+            errorAndInvalid(formatMsg("error.validator.manifest.inconsistent.automatic.module.name", automaticModuleName, md.name()));
+        } catch (IOException e) {
+            errorAndInvalid(e.getMessage());
+        }
+    }
+
     /*
      * Checks whether or not the given versioned module descriptor's attributes
      * are valid when compared against the root/base module descriptor.
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
index c80377e20c1..95c5f80197d 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
@@ -138,6 +138,10 @@ error.validator.metainf.wrong.position=\
         expected entry META-INF/ to be at position 0, but found: {0}
 error.validator.manifest.wrong.position=\
         expected entry META-INF/MANIFEST.MF to be at position 0 or 1, but found it at position: {0}
+error.validator.manifest.invalid.automatic.module.name=\
+        invalid module name of Automatic-Module-Name entry in manifest: {0}
+error.validator.manifest.inconsistent.automatic.module.name=\
+        expected Automatic-Module-Name entry in manifest: {0} to match name of compiled module: {1}
 warn.validator.identical.entry=\
         Warning: entry {0} contains a class that\n\
         is identical to an entry already in the jar
diff --git a/src/jdk.jartool/share/man/jarsigner.md b/src/jdk.jartool/share/man/jarsigner.md
index 0ecc159a037..d128b9c11ff 100644
--- a/src/jdk.jartool/share/man/jarsigner.md
+++ b/src/jdk.jartool/share/man/jarsigner.md
@@ -483,7 +483,7 @@ the following standards:
     `-keystore` option is relevant for signing and verifying a JAR file. In
     addition, aliases are specified when signing and verifying a JAR file.
 
-`-keystore` *url*
+[`-keystore`]{#option-keystore} *url*
 :   Specifies the URL that tells the keystore location. This defaults to the
     file `.keystore` in the user's home directory, as determined by the
     `user.home` system property.
@@ -517,7 +517,7 @@ the following standards:
 
     >   `keytool -keystore NONE -storetype PKCS11 -list`
 
-`-storepass` \[`:env` \| `:file`\] *argument*
+[`-storepass`]{#option-storepass} \[`:env` \| `:file`\] *argument*
 :   Specifies the password that is required to access the keystore. This is
     only needed when signing (not verifying) a JAR file. In that case, if a
     `-storepass` option isn't provided at the command line, then the user is
@@ -536,7 +536,7 @@ the following standards:
     The password shouldn't be specified on the command line or in a script
     unless it is for testing purposes, or you are on a secure system.
 
-`-storetype` *storetype*
+[`-storetype`]{#option-storetype} *storetype*
 :   Specifies the type of keystore to be instantiated. The default keystore
     type is the one that is specified as the value of the `keystore.type`
     property in the security properties file, which is returned by the static
@@ -548,7 +548,7 @@ the following standards:
     (such as a dedicated PIN-pad or a biometric reader), then the `-protected`
     option must be specified and no password options can be specified.
 
-`-keypass` \[`:env` \| `:file`\] *argument* `-certchain` *file*
+[`-keypass`]{#option-keypass} \[`:env` \| `:file`\] *argument* `-certchain` *file*
 :   Specifies the password used to protect the private key of the keystore
     entry addressed by the alias specified on the command line. The password is
     required when using `jarsigner` to sign a JAR file. If no password is
@@ -568,7 +568,7 @@ the following standards:
     The password shouldn't be specified on the command line or in a script
     unless it is for testing purposes, or you are on a secure system.
 
-`-certchain` *file*
+[`-certchain`]{#option-certchain} *file*
 :   Specifies the certificate chain to be used when the certificate chain
     associated with the private key of the keystore entry that is addressed by
     the alias specified on the command line isn't complete. This can happen
@@ -579,7 +579,7 @@ the following standards:
     (also known as Base64 encoding) as defined by [Internet RFC 1421
     Certificate Encoding Standard](http://tools.ietf.org/html/rfc1421).
 
-`-sigfile` *file*
+[`-sigfile`]{#option-sigfile} *file*
 :   Specifies the base file name to be used for the generated `.SF` and signature block
     files. For example, if file is `DUKESIGN`, then the generated `.SF` and
     signature block files are named `DUKESIGN.SF` and `DUKESIGN.RSA`, and placed in the
@@ -598,10 +598,10 @@ the following standards:
     file name, then each such character is converted to an underscore (\_)
     character to form the file name.
 
-`-signedjar` *file*
+[`-signedjar`]{#option-signedjar} *file*
 :   Specifies the name of signed JAR file.
 
-`-digestalg` *algorithm*
+[`-digestalg`]{#option-digestalg} *algorithm*
 :   Specifies the name of the message digest algorithm to use when digesting
     the entries of a JAR file.
 
@@ -613,7 +613,7 @@ the following standards:
     specified algorithm or the user must specify one with the `-addprovider` or
     `-providerClass` options; otherwise, the command will not succeed.
 
-`-sigalg` *algorithm*
+[`-sigalg`]{#option-sigalg} *algorithm*
 :   Specifies the name of the signature algorithm to use to sign the JAR file.
 
     This algorithm must be compatible with the private key used to sign the
@@ -627,10 +627,10 @@ the following standards:
     For a list of standard signature algorithm names, see the Java Security
     Standard Algorithm Names Specification.
 
-`-verify`
+[`-verify`]{#option-verify}
 :   Verifies a signed JAR file.
 
-`-verbose`\[`:`*suboptions*\]
+[`-verbose`]{#option-verbose}\[`:`*suboptions*\]
 :   When the `-verbose` option appears on the command line, it indicates that
     the `jarsigner` use the verbose mode when signing or verifying with the
     suboptions determining how much information is shown. This causes the ,
@@ -654,7 +654,7 @@ the following standards:
     more)*. See [Example of Verifying a Signed JAR File] and [Example of
     Verification with Certificate Information].
 
-`-certs`
+[`-certs`]{#option-certs}
 :   If the `-certs` option appears on the command line with the `-verify` and
     `-verbose` options, then the output includes certificate information for
     each signer of the JAR file. This information includes the name of the type
@@ -669,14 +669,14 @@ the following standards:
     the alias name for the keystore entry for that signer is displayed in
     parentheses.
 
-`-revCheck`
+[`-revCheck`]{#option-revCheck}
 :   This option enables revocation checking of certificates when signing or
     verifying a JAR file. The `jarsigner` command attempts to make network
     connections to fetch OCSP responses and CRLs if the `-revCheck` option
     is specified on the command line. Note that revocation checks are not
     enabled unless this option is specified.
 
-`-tsa` *url*
+[`-tsa`]{#option-tsa} *url*
 :   If `-tsa http://example.tsa.url` appears on the command line when signing a
     JAR file then a time stamp is generated for the signature. The URL,
     `http://example.tsa.url`, identifies the location of the Time Stamping
@@ -689,7 +689,7 @@ the following standards:
     stamp token returned by the TSA is stored with the signature in the
     signature block file.
 
-`-tsacert` *alias*
+[`-tsacert`]{#option-tsacert} *alias*
 :   When `-tsacert` *alias* appears on the command line when signing a JAR
     file, a time stamp is generated for the signature. The alias identifies the
     TSA public key certificate in the keystore that is in effect. The entry's
@@ -699,7 +699,7 @@ the following standards:
     The TSA public key certificate must be present in the keystore when using
     the `-tsacert` option.
 
-`-tsapolicyid` *policyid*
+[`-tsapolicyid`]{#option-tsapolicyid} *policyid*
 :   Specifies the object identifier (OID) that identifies the policy ID to be
     sent to the TSA server. If this option isn't specified, no policy ID is
     sent and the TSA server will choose a default policy ID.
@@ -708,7 +708,7 @@ the following standards:
     Standardization Sector (ITU-T) standard. These identifiers are typically
     period-separated sets of non-negative digits like `1.2.3.4`, for example.
 
-`-tsadigestalg` *algorithm*
+[`-tsadigestalg`]{#option-tsadigestalg} *algorithm*
 :   Specifies the message digest algorithm that is used to generate the message
     imprint to be sent to the TSA server. If this option isn't specified,
     SHA-384 will be used.
@@ -718,7 +718,7 @@ the following standards:
     For a list of standard message digest algorithm names, see the Java Security
     Standard Algorithm Names Specification.
 
-`-internalsf`
+[`-internalsf`]{#option-internalsf}
 :   In the past, the signature block file generated when a JAR file
     was signed included a complete encoded copy of the `.SF` file (signature
     file) also generated. This behavior has been changed. To reduce the overall
@@ -728,7 +728,7 @@ the following standards:
     In practice, don't use the `-internalsf` option because it incurs higher
     overhead.
 
-`-sectionsonly`
+[`-sectionsonly`]{#option-sectionsonly}
 :   If the `-sectionsonly` option appears on the command line, then the `.SF`
     file (signature file) generated when a JAR file is signed doesn't include a
     header that contains a hash of the whole manifest file. It contains only
@@ -747,12 +747,12 @@ the following standards:
     The `-sectionsonly` option is primarily used for testing. It shouldn't be
     used other than for testing because using it incurs higher overhead.
 
-`-protected`
+[`-protected`]{#option-protected}
 :   Values can be either `true` or `false`. Specify `true` when a password must
     be specified through a protected authentication path such as a dedicated
     PIN reader.
 
-`-providerName` *providerName*
+[`-providerName`]{#option-providerName} *providerName*
 :   If more than one provider was configured in the `java.security` security
     properties file, then you can use the `-providerName` option to target a
     specific provider instance. The argument to this option is the name of the
@@ -768,7 +768,7 @@ the following standards:
     >   `jarsigner -keystore NONE -storetype PKCS11 -providerName
         SunPKCS11-SmartCard -list`
 
-`-addprovider` *name* \[`-providerArg` *arg*\]
+[`-addprovider`]{#option-addprovider} *name* \[`-providerArg` *arg*\]
 :   Adds a security provider by name (such as SunPKCS11) and an optional
     configure argument. The value of the security provider is the name of a
     security provider that is defined in a module.
@@ -782,7 +782,7 @@ the following standards:
     >   `jarsigner -keystore NONE -storetype PKCS11 -addprovider SunPKCS11
         -providerArg /mydir1/mydir2/token.config`
 
-`-providerClass` *provider-class-name* \[`-providerArg` *arg*\]
+[`-providerClass`]{#option-providerClass} *provider-class-name* \[`-providerArg` *arg*\]
 :   Used to specify the name of cryptographic service provider's master class
     file when the service provider isn't listed in the `java.security` security
     properties file. Adds a security provider by fully-qualified class name and
@@ -792,7 +792,7 @@ the following standards:
 
     The preferred way to load PKCS11 is by using modules. See `-addprovider`.
 
-`-providerPath` *classpath*
+[`-providerPath`]{#option-providerPath} *classpath*
 :   Used to specify the classpath for providers specified by the `-providerClass`
     option. Multiple paths should be separated by the system-dependent
     path-separator character.
@@ -804,13 +804,13 @@ the following standards:
     execution environment or memory usage. For a list of possible interpreter
     options, type `java -h` or `java -X` at the command line.
 
-`-strict`
+[`-strict`]{#option-strict}
 :   During the signing or verifying process, the command may issue warning
     messages. If you specify this option, the exit code of the tool reflects
     the severe warning messages that this command found. See [Errors and
     Warnings].
 
-`-conf` *url*
+[`-conf`]{#option-conf} *url*
 :   Specifies a pre-configured options file. Read the
     [keytool documentation](keytool.html#pre-configured-options-file) for
     details. The property keys supported are "jarsigner.all" for all actions,
@@ -818,7 +818,7 @@ the following standards:
     `jarsigner` arguments including the JAR file name and alias name(s) cannot
     be set in this file.
 
-`-version`
+[`-version`]{#option-version}
 :   Prints the program version.
 
 ## Errors and Warnings
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
index 0115de5558f..b8767dd9913 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,11 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
 import jdk.javadoc.internal.html.Content;
 import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
 import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Script;
 import jdk.javadoc.internal.html.Text;
 
 import static java.util.stream.Collectors.groupingBy;
@@ -108,6 +112,24 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
                         HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                                 contents.getContent("doclet.External_Specifications"))))
                 .addMainContent(mainContent)
+                .addMainContent(new Script("""
+                        let select = document.getElementById('specs-by-domain');
+                        select.addEventListener("change", selectHost);
+                        addEventListener("pageshow", selectHost);
+                        function selectHost() {
+                            const selectedClass = select.value ? "external-specs-tab" + select.value : "external-specs";
+                            let tabPanel = document.getElementById("external-specs.tabpanel");
+                            let count = 0;
+                            tabPanel.querySelectorAll("div.external-specs").forEach(function(elem) {
+                                elem.style.display = elem.classList.contains(selectedClass) ? "" : "none";
+                                if (elem.style.display === "") {
+                                    let isEvenRow = count++ % 4 < 2;
+                                    toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor);
+                                }
+                            });
+                        }
+                        selectHost();
+                        """).asContent())
                 .setFooter(getFooter()));
         printHtmlDocument(null, "external specifications", body);
 
@@ -180,7 +202,7 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
         boolean noHost = false;
         for (var searchIndexItems : searchIndexMap.values()) {
             try {
-                URI uri = getSpecURI(searchIndexItems.get(0));
+                URI uri = getSpecURI(searchIndexItems.getFirst());
                 String host = uri.getHost();
                 if (host != null) {
                     hostNamesSet.add(host);
@@ -191,14 +213,19 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
                 // ignore
             }
         }
-        var hostNamesList = new ArrayList<>(hostNamesSet);
 
         var table = new Table<URI>(HtmlStyles.summaryTable)
                 .setCaption(contents.externalSpecifications)
                 .setHeader(new TableHeader(contents.specificationLabel, contents.referencedIn))
                 .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast)
-                .setId(HtmlIds.EXTERNAL_SPECS);
+                .setId(HtmlIds.EXTERNAL_SPECS)
+                .setDefaultTab(contents.externalSpecifications)
+                .setRenderTabs(false);
+
+        var hostNamesList = new ArrayList<>(hostNamesSet);
+        Content selector = Text.EMPTY;
         if ((hostNamesList.size() + (noHost ? 1 : 0)) > 1) {
+            selector = createHostSelect(hostNamesList, noHost);
             for (var host : hostNamesList) {
                 table.addTab(Text.of(host), u -> host.equals(u.getHost()));
             }
@@ -207,10 +234,9 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
                         u -> u.getHost() == null);
             }
         }
-        table.setDefaultTab(Text.of(resources.getText("doclet.External_Specifications.All_Specifications")));
 
         for (List<IndexItem> searchIndexItems : searchIndexMap.values()) {
-            IndexItem ii = searchIndexItems.get(0);
+            IndexItem ii = searchIndexItems.getFirst();
             Content specName = createSpecLink(ii);
             Content referencesList = HtmlTree.UL(HtmlStyles.refList, searchIndexItems,
                     item -> HtmlTree.LI(createLink(item)));
@@ -227,6 +253,7 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
                 table.addRow(specName, references);
             }
         }
+        content.add(selector);
         content.add(table);
     }
 
@@ -235,6 +262,29 @@ public class ExternalSpecsWriter extends HtmlDocletWriter {
                 .collect(groupingBy(IndexItem::getLabel, () -> new TreeMap<>(getTitleComparator()), toList()));
     }
 
+    private Content createHostSelect(List<String> hosts, boolean hasLocal) {
+        var index = 1;
+        var id = HtmlId.of("specs-by-domain");
+        var specsByHost = resources.getText("doclet.External_Specifications.by-host");
+        var select = HtmlTree.of(HtmlTag.SELECT)
+                .setId(id)
+                .add(HtmlTree.of(HtmlTag.OPTION)
+                        .put(HtmlAttr.VALUE, "")
+                        .add(Text.of(resources.getText("doclet.External_Specifications.all-hosts"))));
+
+        for (var host : hosts) {
+            select.add(HtmlTree.of(HtmlTag.OPTION)
+                    .put(HtmlAttr.VALUE, Integer.toString(index++))
+                    .add(Text.of(host)));
+        }
+        if (hasLocal) {
+            select.add(HtmlTree.of(HtmlTag.OPTION)
+                    .put(HtmlAttr.VALUE, Integer.toString(index))
+                    .add(Text.of("Local")));
+        }
+        return new ContentBuilder(HtmlTree.LABEL(id.name(), Text.of(specsByHost)), Text.of(" "), select);
+    }
+
     Comparator<String> getTitleComparator() {
         Collator collator = Collator.getInstance();
         return (s1, s2) -> {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index 4366295477b..1aba5c9862b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -180,7 +180,8 @@ doclet.Inheritance_Tree=Inheritance Tree
 doclet.DefinedIn=Defined In
 doclet.ReferencedIn=Referenced In
 doclet.External_Specifications=External Specifications
-doclet.External_Specifications.All_Specifications=All Specifications
+doclet.External_Specifications.by-host=Show specifications by host name:
+doclet.External_Specifications.all-hosts=All host names
 doclet.External_Specifications.no-host=Local
 doclet.Specification=Specification
 doclet.Summary_Page=Summary Page
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index 53b9d8ca6b2..5bd14f7cf33 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -163,6 +163,13 @@
     <path d="m8 8 84 84" style="stroke:%23e0e0e0;stroke-width:15"/>\
     <path d="M8 92 92 8" style="stroke:%23e0e0e0;stroke-width:15"/></svg>');
     --current-theme-svg: url("moon.svg");
+    div.block a[href], div.horizontal-scroll a[href], div.inherited-list h3 a[href], header > div a[href],
+    .hierarchy a[href], .index a[href], div.caption a[href], .sub-title a[href], .deprecation-comment a[href],
+    .serialized-class-details a[href] {
+        text-decoration: underline;
+        text-decoration-thickness: 0.02em;
+        text-underline-offset: 0.12em;
+    }
 }
 /*
  * Styles for individual HTML elements.
@@ -1221,7 +1228,7 @@ input::placeholder {
 input:focus::placeholder {
     color: transparent;
 }
-select#search-modules {
+select {
     margin: 0 10px 10px 2px;
     font-size: var(--nav-font-size);
     padding: 3px 5px;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java
index 84c32a4c732..b3bf1c14cb1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java
@@ -55,7 +55,6 @@ import com.sun.source.doctree.TextTree;
 import com.sun.tools.javac.tree.DCTree.DCDocComment;
 import com.sun.tools.javac.tree.DCTree;
 
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.util.Context.Factory;
 import com.sun.tools.javac.util.DiagnosticSource;
 import com.sun.source.tree.CompilationUnitTree;
@@ -616,7 +615,7 @@ public class JavadocLog extends Log implements Reporter {
             }
 
             @Override
-            public int getEndPosition(EndPosTable endPosTable) {
+            public int getEndPosition() {
                 return end;
             }
         };
diff --git a/src/jdk.jcmd/share/man/jmap.md b/src/jdk.jcmd/share/man/jmap.md
index b0352ad9194..dd0be1b24ef 100644
--- a/src/jdk.jcmd/share/man/jmap.md
+++ b/src/jdk.jcmd/share/man/jmap.md
@@ -62,20 +62,20 @@ was produced.
 
 ## Options for the jmap Command
 
-`-clstats` *pid*
+[`-clstats`]{#option-clstats} *pid*
 :   Connects to a running process and prints class loader statistics of Java
     heap.
 
-`-finalizerinfo` *pid*
+[`-finalizerinfo`]{#option-finalizerinfo} *pid*
 :   Connects to a running process and prints information on objects awaiting
     finalization.
 
-`-histo`\[`:live`\] *pid*
+[`-histo`]{#option-histo}\[`:live`\] *pid*
 :   Connects to a running process and prints a histogram of the Java object
     heap. If the `live` suboption is specified, it then counts only live
     objects.
 
-`-dump:`*dump\_options* *pid*
+[`-dump:`]{#option-dump_}*dump\_options* *pid*
 :   Connects to a running process and dumps the Java heap. The *dump\_options*
     include:
 
diff --git a/src/jdk.jcmd/share/man/jstat.md b/src/jdk.jcmd/share/man/jstat.md
index 324d0a48cb2..624b675de76 100644
--- a/src/jdk.jcmd/share/man/jstat.md
+++ b/src/jdk.jcmd/share/man/jstat.md
@@ -125,7 +125,7 @@ Don't write scripts to parse the `jstat` command's output because the format
 might change in future releases. If you write scripts that parse the `jstat`
 command output, then expect to modify them for future releases of this tool.
 
-`-statOption`
+[`-statOption`]{#option-statOption}
 :   Determines the statistics information that the `jstat` command displays.
     The following lists the available options. Use the `-options` general
     option to display the list of options for a particular platform
@@ -161,7 +161,7 @@ command output, then expect to modify them for future releases of this tool.
 
     `printcompilation`: Displays Java HotSpot VM compilation method statistics.
 
-`-J`*javaOption*
+[`-J`]{#option-J}*javaOption*
 :   Passes *javaOption* to the Java application launcher. For example,
     `-J-Xms48m` sets the startup memory to 48 MB. For a complete list of
     options, see [java](java.html).
@@ -171,7 +171,7 @@ command output, then expect to modify them for future releases of this tool.
 The following information summarizes the columns that the `jstat` command
 outputs for each *statOption*.
 
-`-class` *option*
+[`-class`]{#option-class} *option*
 :   Class loader statistics.
 
     `Loaded`: Number of classes loaded.
@@ -184,7 +184,7 @@ outputs for each *statOption*.
 
     `Time`: Time spent performing class loading and unloading operations.
 
-`-compiler` *option*
+[`-compiler`]{#option-compiler} *option*
 :   Java HotSpot VM Just-in-Time compiler statistics.
 
     `Compiled`: Number of compilation tasks performed.
@@ -199,7 +199,7 @@ outputs for each *statOption*.
 
     `FailedMethod`: Class name and method of the last failed compilation.
 
-`-gc` *option*
+[`-gc`]{#option-gc} *option*
 :   Garbage collected heap statistics.
 
     `S0C`: Current survivor space 0 capacity (KB).
@@ -236,7 +236,7 @@ outputs for each *statOption*.
 
     `GCT`: Total garbage collection time.
 
-`-gccapacity` *option*
+[`-gccapacity`]{#option-gccapacity} *option*
 :   Memory pool generation and space capacities.
 
     `NGCMN`: Minimum new generation capacity (KB).
@@ -275,7 +275,7 @@ outputs for each *statOption*.
 
     `FGC`: Number of full GC events.
 
-`-gccause` *option*
+[`-gccause`]{#option-gccause} *option*
 :   This option displays the same summary of garbage collection statistics as
     the `-gcutil` option, but includes the causes of the last garbage
     collection event and (when applicable), the current garbage collection
@@ -286,7 +286,7 @@ outputs for each *statOption*.
 
     `GCC`: Cause of current garbage collection
 
-`-gcnew` *option*
+[`-gcnew`]{#option-gcnew} *option*
 :   New generation statistics.
 
     `S0C`: Current survivor space 0 capacity (KB).
@@ -311,7 +311,7 @@ outputs for each *statOption*.
 
     `YGCT`: Young generation garbage collection time.
 
-`-gcnewcapacity` *option*
+[`-gcnewcapacity`]{#option-gcnewcapacity} *option*
 :   New generation space size statistics.
 
     `NGCMN`: Minimum new generation capacity (KB).
@@ -336,7 +336,7 @@ outputs for each *statOption*.
 
     `FGC`: Number of full GC events.
 
-`-gcold` *option*
+[`-gcold`]{#option-gcold} *option*
 :   Old generation size statistics.
 
     `MC`: Metaspace Committed Size (KB).
@@ -359,7 +359,7 @@ outputs for each *statOption*.
 
     `GCT`: Total garbage collection time.
 
-`-gcoldcapacity` *option*
+[`-gcoldcapacity`]{#option-gcoldcapacity} *option*
 :   Old generation statistics.
 
     `OGCMN`: Minimum old generation capacity (KB).
@@ -378,7 +378,7 @@ outputs for each *statOption*.
 
     `GCT`: Total garbage collection time.
 
-`-gcmetacapacity` *option*
+[`-gcmetacapacity`]{#option-gcmetacapacity} *option*
 :   Metaspace size statistics.
 
     `MCMN`: Minimum metaspace capacity (KB).
@@ -399,7 +399,7 @@ outputs for each *statOption*.
 
     `GCT`: Total garbage collection time.
 
-`-gcutil` *option*
+[`-gcutil`]{#option-gcutil} *option*
 :   Summary of garbage collection statistics.
 
     `S0`: Survivor space 0 utilization as a percentage of the space's current
@@ -427,7 +427,7 @@ outputs for each *statOption*.
 
     `GCT`: Total garbage collection time.
 
-`-printcompilation` *option*
+[`-printcompilation`]{#option-printcompilation} *option*
 :   Java HotSpot VM compiler method statistics.
 
     `Compiled`: Number of compilation tasks performed by the most recently
diff --git a/src/jdk.jdi/share/man/jdb.md b/src/jdk.jdi/share/man/jdb.md
index 75d2d9a150c..8aabb202c80 100644
--- a/src/jdk.jdi/share/man/jdb.md
+++ b/src/jdk.jdi/share/man/jdb.md
@@ -145,50 +145,50 @@ The following options are accepted by the `jdb` command:
 `-help`
 :   Displays a help message.
 
-`-sourcepath` *dir1*`:`*dir2*`:`...
+[`-sourcepath`]{#option-sourcepath} *dir1*`:`*dir2*`:`...
 :   Uses the specified path to search for source files in the specified path.
     If this option is not specified, then use the default path of dot (`.`).
 
-`-attach` *address*
+[`-attach`]{#option-attach} *address*
 :   Attaches the debugger to a running JVM with the default connection
     mechanism.
 
-`-listen` *address*
+[`-listen`]{#option-listen} *address*
 :   Waits for a running JVM to connect to the specified address with a standard
     connector.
 
-`-listenany`
+[`-listenany`]{#option-listenany}
 :   Waits for a running JVM to connect at any available address using a
     standard connector.
 
-`-launch`
+[`-launch`]{#option-launch}
 :   Starts the debugged application immediately upon startup of the `jdb`
     command. The `-launch` option removes the need for the `run` command. The
     debugged application is launched and then stopped just before the initial
     application class is loaded. At that point, you can set any necessary
     breakpoints and use the `cont` command to continue execution.
 
-`-listconnectors`
+[`-listconnectors`]{#option-listconnectors}
 :   Lists the connectors available in this JVM.
 
-`-connect` *connector-name*`:`*name1*`=`*value1*....
+[`-connect`]{#option-connect} *connector-name*`:`*name1*`=`*value1*....
 :   Connects to the target JVM with the named connector and listed argument
     values.
 
-`-dbgtrace` \[*flags*\]
+[`-dbgtrace`]{#option-dbgtrace} \[*flags*\]
 :   Prints information for debugging the `jdb` command.
 
-`-tclient`
+[`-tclient`]{#option-tclient}
 :   Runs the application in the Java HotSpot VM client.
 
-`-trackallthreads`
+[`-trackallthreads`]{#option-trackallthreads}
 :   Track all threads as they are created, including virtual threads.
     See [Working With Virtual Threads](#working-with-virtual-threads) below.
 
-`-tserver`
+[`-tserver`]{#option-tserver}
 :   Runs the application in the Java HotSpot VM server.
 
-`-J`*option*
+[`-J`]{#option-J}*option*
 :   Passes *option* to the JDB JVM, where option is one of the options described on
     the reference page for the Java application launcher. For example,
     `-J-Xms48m` sets the startup memory to 48 MB. See *Overview of Java
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
index cf330d74d29..d4f4003a43d 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,18 +171,16 @@ initState(JNIEnv *env, jthread thread, StepRequest *step)
      * Initial values that may be changed below
      */
     step->fromLine = -1;
-    step->fromNative = JNI_FALSE;
+    step->notifyFramePopFailed = JNI_FALSE;
     step->frameExited = JNI_FALSE;
     step->fromStackDepth = getFrameCount(thread);
 
     if (step->fromStackDepth <= 0) {
         /*
-         * If there are no stack frames, treat the step as though
-         * from a native frame. This is most likely to occur at the
-         * beginning of a debug session, right after the VM_INIT event,
-         * so we need to do something intelligent.
+         * If there are no stack frames, there is nothing more to do here. If we are
+         * doing a step INTO, initEvents() will enable stepping. Otherwise it is
+         * not enabled because there is nothing to step OVER or OUT of.
          */
-        step->fromNative = JNI_TRUE;
         return JVMTI_ERROR_NONE;
     }
 
@@ -196,7 +194,13 @@ initState(JNIEnv *env, jthread thread, StepRequest *step)
     error = JVMTI_FUNC_PTR(gdata->jvmti,NotifyFramePop)
                 (gdata->jvmti, thread, 0);
     if (error == JVMTI_ERROR_OPAQUE_FRAME) {
-        step->fromNative = JNI_TRUE;
+        // OPAQUE_FRAME doesn't always mean native method. It's rare that it doesn't, and
+        // means that there is something about the frame's state that prevents setting up
+        // a NotifyFramePop. One example is a frame that is in the process of returning,
+        // which can happen if we start single stepping after getting a MethodExit event.
+        // In either any case, we need to be aware that there will be no FramePop event
+        // when this frame exits.
+        step->notifyFramePopFailed = JNI_TRUE;
         error = JVMTI_ERROR_NONE;
         /* continue without error */
     } else if (error == JVMTI_ERROR_DUPLICATE) {
@@ -761,31 +765,28 @@ initEvents(jthread thread, StepRequest *step)
         }
 
     }
+
     /*
-     * Initially enable stepping:
-     * 1) For step into, always
-     * 2) For step over, unless right after the VM_INIT.
-     *    Enable stepping for STEP_MIN or STEP_LINE with or without line numbers.
-     *    If the class is redefined then non EMCP methods may not have line
-     *    number info. So enable line stepping for non line number so that it
-     *    behaves like STEP_MIN/STEP_OVER.
-     * 3) For step out, only if stepping from native, except right after VM_INIT
-     *
-     * (right after VM_INIT, a step->over or out is identical to running
-     * forever)
+     * Enable step events if necessary. Note that right after VM_INIT, a
+     * step OVER or OUT is identical to running forever, so we only enable
+     * step events if fromStackDepth > 0.
      */
     switch (step->depth) {
         case JDWP_STEP_DEPTH(INTO):
             enableStepping(thread);
             break;
         case JDWP_STEP_DEPTH(OVER):
-            if (step->fromStackDepth > 0 && !step->fromNative ) {
+            // We need to always enable for OVER (except right after VM_INIT).
+            // If we are in a native method, that is the only way to find out
+            // that we have returned to a java method.
+            if (step->fromStackDepth > 0) {
               enableStepping(thread);
             }
             break;
         case JDWP_STEP_DEPTH(OUT):
-            if (step->fromNative &&
-                (step->fromStackDepth > 0)) {
+            // We rely on the FramePop event to tell us when we exit the current frame.
+            // If NotifyFramePop failed, then we need to enable stepping.
+            if (step->notifyFramePopFailed && (step->fromStackDepth > 0)) {
                 enableStepping(thread);
             }
             break;
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h
index 63f97fb6231..566b8b00ea0 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ typedef struct {
     /* State */
     jboolean pending;
     jboolean frameExited;    /* for depth == STEP_OVER or STEP_OUT */
-    jboolean fromNative;
+    jboolean notifyFramePopFailed;
     jint fromStackDepth;     /* for all but STEP_INTO STEP_INSTRUCTION */
     jint fromLine;           /* for granularity == STEP_LINE */
     jmethodID method;   /* Where line table came from. */
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/EventSettings.java b/src/jdk.jfr/share/classes/jdk/jfr/EventSettings.java
index 6ed20f124d9..c9f24d9f903 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/EventSettings.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/EventSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -150,6 +150,11 @@ public abstract class EventSettings {
             return FlightRecorder.getFlightRecorder().getInternal();
         }
 
+        @Override
+        public Recording newRecording(RecordingState state) {
+            return new Recording(state, Map.of());
+        }
+
         @Override
         public EventSettings newEventSettings(EventSettingsModifier esm) {
             return new EventSettings.DelegatedEventSettings(esm);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
index 089a5ed37d8..8a3181307d2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import jdk.jfr.RecordingState;
 import jdk.jfr.internal.PlatformRecorder;
 import jdk.jfr.internal.PlatformRecording;
 import jdk.jfr.internal.Type;
@@ -100,11 +101,16 @@ public final class Recording implements Closeable {
      * @since 11
      */
     public Recording(Map<String, String> settings) {
+        this(RecordingState.NEW, settings);
+    }
+
+    // package private
+    Recording(RecordingState state, Map<String, String> settings) {
         Objects.requireNonNull(settings, "settings");
         Map<String, String> sanitized = Utils.sanitizeNullFreeStringMap(settings);
         PlatformRecorder r = FlightRecorder.getFlightRecorder().getInternal();
         synchronized (r) {
-            this.internal = r.newRecording(sanitized);
+            this.internal = r.newRecording(state, sanitized);
             this.internal.setRecording(this);
             if (internal.getRecording() != this) {
                 throw new InternalError("Internal recording not properly setup");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
index 841221c57d9..24c92e81a4c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -71,7 +71,7 @@ public final class JVM {
     /**
      * Begin recording events
      *
-     * Requires that JFR has been started with {@link #createNativeJFR()}
+     * Requires that JFR has been started with {@link JVMSupport#createJFR()}
      */
     public static native void beginRecording();
 
@@ -83,7 +83,7 @@ public final class JVM {
     /**
      * End recording events, which includes flushing data in thread buffers
      *
-     * Requires that JFR has been started with {@link #createNativeJFR()}
+     * Requires that JFR has been started with {@link JVMSupport#createJFR()}
      *
      */
     public static native void endRecording();
@@ -144,7 +144,7 @@ public final class JVM {
     /**
      * Return unique identifier for stack trace.
      *
-     * Requires that JFR has been started with {@link #createNativeJFR()}
+     * Requires that JFR has been started with {@link JVMSupport#createJFR()}
      *
      * @param skipCount number of frames to skip, or 0 if no frames should be
      *                  skipped
@@ -295,7 +295,7 @@ public final class JVM {
     /**
      * Sets the file where data should be written.
      *
-     * Requires that JFR has been started with {@link #createNativeJFR()}
+     * Requires that JFR has been started with {@link JVMSupport#createJFR()}
      *
      * <pre>
      * Recording  Previous  Current  Action
@@ -380,7 +380,7 @@ public final class JVM {
      * chunk, data should be written after GMT offset and size of metadata event
      * should be adjusted
      *
-     * Requires that JFR has been started with {@link #createNativeJFR()}
+     * Requires that JFR has been started with {@link JVMSupport#createJFR()}
      *
      * @param bytes binary representation of metadata descriptor
      */
@@ -409,7 +409,7 @@ public final class JVM {
     /**
      * Destroys native part of JFR. If already destroy, call is ignored.
      *
-     * Requires that JFR has been started with {@link #createNativeJFR()}
+     * Requires that JFR has been started with {@link JVMSupport#createJFR()}
      *
      * @return if an instance was actually destroyed.
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
index cf46c05b804..260f2fed54d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,8 +82,8 @@ public final class PlatformRecorder {
         Runtime.getRuntime().addShutdownHook(shutdownHook);
     }
 
-    public synchronized PlatformRecording newRecording(Map<String, String> settings) {
-        return newRecording(settings, ++recordingCounter);
+    public synchronized PlatformRecording newRecording(RecordingState state, Map<String, String> settings) {
+        return newRecording(state, settings, ++recordingCounter);
     }
 
     // To be used internally when doing dumps.
@@ -92,15 +92,17 @@ public final class PlatformRecorder {
         if(!Thread.holdsLock(this)) {
             throw new InternalError("Caller must have recorder lock");
         }
-        return newRecording(new HashMap<>(), 0);
+        return newRecording(RecordingState.NEW, new HashMap<>(), 0);
     }
 
-    private synchronized PlatformRecording newRecording(Map<String, String> settings, long id) {
+    private synchronized PlatformRecording newRecording(RecordingState state, Map<String, String> settings, long id) {
         PlatformRecording recording = new PlatformRecording(this, id);
         if (!settings.isEmpty()) {
             recording.setSettings(settings);
         }
-        recordings.add(recording);
+        if (state != RecordingState.CLOSED) {
+            recordings.add(recording);
+        }
         return recording;
     }
 
@@ -545,8 +547,10 @@ public final class PlatformRecorder {
     }
 
     synchronized Recording newCopy(PlatformRecording r, boolean stop) {
-        Recording newRec = new Recording();
-        PlatformRecording copy = PrivateAccess.getInstance().getPlatformRecording(newRec);
+        PrivateAccess pr = PrivateAccess.getInstance();
+        boolean closed = r.getState() == RecordingState.CLOSED;
+        Recording newRec = closed ? pr.newRecording(RecordingState.CLOSED) : new Recording();
+        PlatformRecording copy = pr.getPlatformRecording(newRec);
         copy.setSettings(r.getSettings());
         copy.setMaxAge(r.getMaxAge());
         copy.setMaxSize(r.getMaxSize());
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PrivateAccess.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PrivateAccess.java
index fe5d5aea327..2297bf7bdde 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PrivateAccess.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PrivateAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import jdk.jfr.Configuration;
 import jdk.jfr.EventSettings;
 import jdk.jfr.EventType;
 import jdk.jfr.Recording;
+import jdk.jfr.RecordingState;
 import jdk.jfr.SettingDescriptor;
 import jdk.jfr.ValueDescriptor;
 import jdk.jfr.internal.management.EventSettingsModifier;
@@ -96,6 +97,8 @@ public abstract class PrivateAccess {
 
     public abstract PlatformRecorder getPlatformRecorder();
 
+    public abstract Recording newRecording(RecordingState state);
+
     public abstract EventSettings newEventSettings(EventSettingsModifier esm);
 
     public abstract boolean isVisible(EventType t);
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java b/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java
index df2aca02d68..3f324ba1364 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java
@@ -435,7 +435,10 @@ class JImageTask {
                     }
                 }
             } catch (IOException ioe) {
-                throw TASK_HELPER.newBadArgs("err.invalid.jimage", file, ioe.getMessage());
+                boolean isVersionMismatch = ioe instanceof BasicImageReader.ImageVersionMismatchException;
+                // Both messages take the file name and underlying message.
+                String msgKey = isVersionMismatch ? "err.wrong.version" : "err.invalid.jimage";
+                throw TASK_HELPER.newBadArgs(msgKey, file, ioe.getMessage());
             }
         }
     }
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties
index ac13505a0d9..3038dfcc5ec 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties
@@ -89,15 +89,20 @@ main.opt.footer=\
 \  glob:<glob-pattern>\n\
 \  regex:<regex-pattern>
 
-
-
 err.not.a.task=task must be one of <extract | info | list | verify>: {0}
 err.missing.arg=no value given for {0}
 err.ambiguous.arg=value for option {0} starts with \"--\" should use {0}=<value> format
 err.not.a.dir=not a directory: {0}
 err.not.a.jimage=not a jimage file: {0}
-err.invalid.jimage=Unable to open {0}: {1}
 err.no.jimage=no jimage provided
 err.option.unsupported={0} not supported: {1}
 err.unknown.option=unknown option: {0}
 err.cannot.create.dir=cannot create directory {0}
+
+# General failure to open a jimage file.
+# {0} = path of jimage file, {1} = underlying error message
+err.invalid.jimage=Unable to open {0}: {1}
+# More specific alternative for cases of version mismatch
+err.wrong.version=Unable to open {0}: mismatched file and tool version\n\
+Use ''<JAVA_HOME>/bin/jimage'' for the JDK associated with the jimage file:\n\
+{1}
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
index 825672cfe6d..3baae08eed6 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -248,8 +248,8 @@ public class JlinkTask {
      * Read the release.txt from the module.
      */
     private static Optional<String> getReleaseInfo(ModuleReference mref) {
-        try {
-            Optional<InputStream> release = mref.open().open(JDK_RELEASE_RESOURCE);
+        try (var moduleReader = mref.open()) {
+            Optional<InputStream> release = moduleReader.open(JDK_RELEASE_RESOURCE);
 
             if (release.isEmpty()) {
                 return Optional.empty();
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
index 80d1ba6e05f..c313d6a348d 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_de.properties
@@ -170,7 +170,7 @@ plugin.opt.resources-last-sorter=\      --resources-last-sorter <Name>    Das le
 
 plugin.opt.disable-plugin=\      --disable-plugin <Plug-in-Name>     Deaktiviert das angegebene Plug-in
 
-plugin.opt.compress=\      --compress <Komprimierung>             Komprimiert alle Ressourcen im Ausgabeimage:\n                                        Zulässige Werte:\n                                        zip-'{0-9}', wobei "zip-0" für keine Komprimierung\n                                        und "zip-9" für die beste Komprimierung steht.\n                                        Standardwert ist "zip-6."\n                                        Veraltete Werte, die in einem zukünftigen Release entfernt werden:\n                                        0:  Keine Komprimierung. Verwenden Sie stattdessen "zip-0".\n                                        1:  Gemeinsame Verwendung konstanter Zeichenfolgen\n                                        2:  ZIP. Verwenden Sie stattdessen "zip-6".
+plugin.opt.compress=\      --compress <Komprimierung>             Komprimiert alle Ressourcen im Ausgabeimage:\n                                        Zulässige Werte:\n                                        zip-'{0-9}', wobei "zip-0" für keine Komprimierung\n                                        und "zip-9" für die beste Komprimierung steht.\n                                        Standardwert ist "zip-6".\n                                        Veraltete Werte, die in einem zukünftigen Release entfernt werden:\n                                        0:  Keine Komprimierung. Verwenden Sie stattdessen "zip-0".\n                                        1:  Gemeinsame Verwendung konstanter Zeichenfolgen\n                                        2:  ZIP. Verwenden Sie stattdessen "zip-6".
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     Entfernt Debuginformationen
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
index 6ed0a486132..a5dc70061f6 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_ja.properties
@@ -170,7 +170,7 @@ plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    最後
 
 plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     指定したプラグインを無効にします
 
-plugin.opt.compress=\      --compress <compress>             出力イメージ内のすべてのリソースを圧縮します:\n                                        使用可能な値は\n                                        zip-'{0-9}'です。zip-0では圧縮は行われず、\n                                        zip-9では最適な圧縮が行われます。\n                                        デフォルトはzip-6です。\n                                        今後のリリースで削除される非推奨の値:\n                                        0:  圧縮なし。かわりにzip-0を使用。\n                                        1:  定数文字列の共有\n                                        2:  ZIP。かわりにzip-6を使用。
+plugin.opt.compress=\      --compress <圧縮>             出力イメージ内のすべてのリソースを圧縮します:\n                                        使用可能な値は\n                                        zip-'{0-9}'です。zip-0では圧縮は行われず、\n                                        zip-9では最適な圧縮が行われます。\n                                        デフォルトはzip-6です。\n                                        今後のリリースで削除される非推奨の値:\n                                        0:  圧縮なし。かわりにzip-0を使用。\n                                        1:  定数文字列の共有\n                                        2:  ZIP。かわりにzip-6を使用。
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     デバッグ情報を削除します
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
index a0480a31fc3..1de1ef372b6 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins_zh_CN.properties
@@ -170,7 +170,7 @@ plugin.opt.resources-last-sorter=\      --resources-last-sorter <name>    允许
 
 plugin.opt.disable-plugin=\      --disable-plugin <pluginname>     禁用所提及的插件
 
-plugin.opt.compress=\      --compress <compress>             在输出映像中压缩所有资源：\n                                        接受的值包括：\n                                        zip-'{0-9}'，其中 zip-0 表示无压缩，\n                                        zip-9 表示最佳压缩。\n                                        默认值为 zip-6。\n                                        要在未来发行版中删除的已过时值：\n                                        0：无压缩。改为使用 zip-0。\n                                        1：常量字符串共享\n                                        2：ZIP。改为使用 zip-6。
+plugin.opt.compress=\      --compress <压缩>             在输出映像中压缩所有资源：\n                                        接受的值包括：\n                                        zip-'{0-9}'，其中 zip-0 表示无压缩，\n                                        zip-9 表示最佳压缩。\n                                        默认值为 zip-6。\n                                        要在未来发行版中删除的已过时值：\n                                        0：无压缩。改为使用 zip-0。\n                                        1：常量字符串共享\n                                        2：ZIP。改为使用 zip-6。
 
 plugin.opt.strip-debug=\  -G, --strip-debug                     去除调试信息
 
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
index d2169ede461..d6d9def9407 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java
@@ -30,6 +30,7 @@ import static jdk.jpackage.internal.LinuxPackagingPipeline.APPLICATION_LAYOUT;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_APP_IMAGE;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_DEB;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_RPM;
+import static jdk.jpackage.internal.util.MemoizingSupplier.runOnce;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackager.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackager.java
index 0ec6a77e683..7c1f06f54a3 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackager.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebPackager.java
@@ -147,8 +147,6 @@ final class LinuxDebPackager extends LinuxPackager<LinuxDebPackage> {
 
         Path debFile = outputPackageFile();
 
-        Log.verbose(I18N.format("message.outputting-to-location", debFile.toAbsolutePath()));
-
         List<String> cmdline = new ArrayList<>();
         Stream.of(sysEnv.fakeroot(), sysEnv.dpkgdeb()).map(Path::toString).forEach(cmdline::add);
         if (Log.isVerbose()) {
@@ -159,8 +157,6 @@ final class LinuxDebPackager extends LinuxPackager<LinuxDebPackage> {
         // run dpkg
         Executor.of(cmdline).retryOnKnownErrorMessage(
                 "semop(1): encountered an error: Invalid argument").execute();
-
-        Log.verbose(I18N.format("message.output-to-location", debFile.toAbsolutePath()));
     }
 
     @Override
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
index af7f5288cc5..551e1ab1af6 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxPackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ abstract class LinuxPackager<T extends LinuxPackage> implements Consumer<Packagi
 
     @Override
     public void accept(PackagingPipeline.Builder pipelineBuilder) {
-        pipelineBuilder.excludeDirFromCopying(outputDir)
+        pipelineBuilder
                 .task(PackageTaskID.CREATE_CONFIG_FILES)
                         .action(this::buildConfigFiles)
                         .add()
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackager.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackager.java
index 60355d0d1a2..e22b9c24fdd 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackager.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmPackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,8 +133,6 @@ final class LinuxRpmPackager extends LinuxPackager<LinuxRpmPackage> {
 
         Path rpmFile = outputPackageFile();
 
-        Log.verbose(I18N.format("message.outputting-bundle-location", rpmFile.getParent()));
-
         //run rpmbuild
         Executor.of(sysEnv.rpmbuild().toString(),
                 "-bb", specFile().toAbsolutePath().toString(),
@@ -147,8 +145,6 @@ final class LinuxRpmPackager extends LinuxPackager<LinuxRpmPackage> {
                         env.buildRoot().toAbsolutePath()),
                 "--define", String.format("%%_rpmfilename %s", rpmFile.getFileName())
         ).executeExpectSuccess();
-
-        Log.verbose(I18N.format("message.output-bundle-location", rpmFile.getParent()));
     }
 
     private Path installPrefix() {
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
index 3aabe1f4ba5..3aa0e0e92a0 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,11 +49,7 @@ error.rpm-arch-not-detected="Failed to detect RPM arch"
 
 message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
 message.test-for-tool=Test for [{0}]. Result: {1}
-message.outputting-to-location=Generating DEB for installer to: {0}.
-message.output-to-location=Package (.deb) saved to: {0}.
 message.debs-like-licenses=Debian packages should specify a license. The absence of a license will cause some linux distributions to complain about the quality of the application.
-message.outputting-bundle-location=Generating RPM for installer to: {0}.
-message.output-bundle-location=Package (.rpm) saved to: {0}.
 
 message.ldd-not-available=ldd command not found. Package dependencies will not be generated.
 message.deb-ldd-not-available.advice=Install "libc-bin" DEB package to get ldd.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
index 81e04ad7ed1..188430511bb 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigner.java
@@ -24,7 +24,6 @@
  */
 package jdk.jpackage.internal;
 
-import static java.util.stream.Collectors.joining;
 import static jdk.jpackage.internal.MacPackagingPipeline.APPLICATION_LAYOUT;
 import static jdk.jpackage.internal.model.MacPackage.RUNTIME_BUNDLE_LAYOUT;
 import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
@@ -40,13 +39,13 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 import jdk.jpackage.internal.Codesign.CodesignException;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.MacApplication;
 import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.util.MacBundle;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.Result;
 import jdk.jpackage.internal.util.function.ExceptionBox;
@@ -62,9 +61,10 @@ final class AppImageSigner {
                 throw handleCodesignException(app, ex);
             } catch (ExceptionBox ex) {
                 if (ex.getCause() instanceof CodesignException codesignEx) {
-                    handleCodesignException(app, codesignEx);
+                    throw handleCodesignException(app, codesignEx);
+                } else {
+                    throw ex;
                 }
-                throw ex;
             }
         });
     }
@@ -164,28 +164,20 @@ final class AppImageSigner {
         }
     }
 
-    private static CodesignException handleCodesignException(MacApplication app, CodesignException ex) {
-        // Log output of "codesign" in case of error. It should help
-        // user to diagnose issues when using --mac-app-image-sign-identity.
-        // In addition add possible reason for failure. For example
-        // "--app-content" can fail "codesign".
-
-        if (!app.contentDirs().isEmpty()) {
-            Log.info(I18N.getString("message.codesign.failed.reason.app.content"));
+    private static IOException handleCodesignException(MacApplication app, CodesignException ex) {
+        if (!app.contentDirSources().isEmpty()) {
+            // Additional content may cause signing error.
+            Log.fatalError(I18N.getString("message.codesign.failed.reason.app.content"));
         }
 
         // Signing might not work without Xcode with command line
         // developer tools. Show user if Xcode is missing as possible
         // reason.
         if (!isXcodeDevToolsInstalled()) {
-            Log.info(I18N.getString("message.codesign.failed.reason.xcode.tools"));
+            Log.fatalError(I18N.getString("message.codesign.failed.reason.xcode.tools"));
         }
 
-        // Log "codesign" output
-        Log.info(I18N.format("error.tool.failed.with.output", "codesign"));
-        Log.info(Stream.of(ex.getOutput()).collect(joining("\n")).strip());
-
-        return ex;
+        return ex.getCause();
     }
 
     private static boolean isXcodeDevToolsInstalled() {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
index 6fc7fe004c2..962c821c20f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/AppImageSigningConfigBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,24 +61,26 @@ final class AppImageSigningConfigBuilder {
         return this;
     }
 
-    Optional<AppImageSigningConfig> create() {
-        return signingIdentityBuilder.create().map(cfg -> {
-            final var validatedEntitlements = validatedEntitlements();
-            return new AppImageSigningConfig.Stub(
-                    Objects.requireNonNull(cfg.identity()),
-                    Objects.requireNonNull(signingIdentifierPrefix),
-                    validatedEntitlements,
-                    cfg.keychain().map(Keychain::name),
-                    Optional.ofNullable(entitlementsResourceName).orElse("entitlements.plist")
-            );
-        });
+    AppImageSigningConfig create() {
+
+        var cfg = signingIdentityBuilder.create();
+
+        var validatedEntitlements = validatedEntitlements();
+
+        return new AppImageSigningConfig.Stub(
+                Objects.requireNonNull(cfg.identity()),
+                Objects.requireNonNull(signingIdentifierPrefix),
+                validatedEntitlements,
+                cfg.keychain().map(Keychain::name),
+                Optional.ofNullable(entitlementsResourceName).orElse("entitlements.plist")
+        );
     }
 
     private Optional<Path> validatedEntitlements() {
         return Optional.ofNullable(entitlements);
     }
 
-    private SigningIdentityBuilder signingIdentityBuilder;
+    private final SigningIdentityBuilder signingIdentityBuilder;
     private Path entitlements;
     private String entitlementsResourceName;
     private String signingIdentifierPrefix;
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
index a7cd17b06b9..984202bbfaf 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/Codesign.java
@@ -34,22 +34,21 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-
+import jdk.jpackage.internal.util.CommandOutputControl.UnexpectedExitCodeException;
 
 public final class Codesign {
 
     public static final class CodesignException extends Exception {
 
-        CodesignException(String[] output) {
-            this.output = output;
+        CodesignException(UnexpectedExitCodeException cause) {
+            super(Objects.requireNonNull(cause));
         }
 
-        String[] getOutput() {
-            return output;
+        @Override
+        public UnexpectedExitCodeException getCause() {
+            return (UnexpectedExitCodeException)super.getCause();
         }
 
-        private final String[] output;
-
         private static final long serialVersionUID = 1L;
     }
 
@@ -96,9 +95,10 @@ public final class Codesign {
         var exec = Executor.of(cmdline).args(path.toString()).saveOutput(true);
         configureExecutor.ifPresent(configure -> configure.accept(exec));
 
-        var result = exec.execute();
-        if (result.getExitCode() != 0) {
-            throw new CodesignException(result.getOutput().toArray(String[]::new));
+        try {
+            exec.execute().expectExitCode(0);
+        } catch (UnexpectedExitCodeException ex) {
+            throw new CodesignException(ex);
         }
     }
 
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
index 5f126305aed..a73a6152f6d 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacApplicationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,9 @@ import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
+import jdk.jpackage.internal.util.RootedPath;
+import java.util.stream.Stream;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.AppImageSigningConfig;
 import jdk.jpackage.internal.model.Application;
@@ -143,15 +146,17 @@ final class MacApplicationBuilder {
     }
 
     private static void validateAppContentDirs(Application app) {
-        for (var contentDir : app.contentDirs()) {
+        app.contentDirSources().stream().filter(rootedPath -> {
+            return rootedPath.branch().getNameCount() == 1;
+        }).map(RootedPath::fullPath).forEach(contentDir -> {
             if (!Files.isDirectory(contentDir)) {
                 Log.info(I18N.format("warning.app.content.is.not.dir",
                         contentDir));
-            } else if (!CONTENTS_SUB_DIRS.contains(contentDir.getFileName().toString())) {
+            } else if (!CONTENTS_SUB_DIRS.contains(contentDir.getFileName())) {
                 Log.info(I18N.format("warning.non.standard.contents.sub.dir",
                         contentDir));
             }
-        }
+        });
     }
 
     private MacApplicationBuilder createCopyForExternalInfoPlistFile() {
@@ -186,7 +191,7 @@ final class MacApplicationBuilder {
     }
 
     private Optional<AppImageSigningConfig> createSigningConfig() {
-        return Optional.ofNullable(signingBuilder).flatMap(AppImageSigningConfigBuilder::create);
+        return Optional.ofNullable(signingBuilder).map(AppImageSigningConfigBuilder::create);
     }
 
     private String validatedBundleName() {
@@ -258,6 +263,11 @@ final class MacApplicationBuilder {
     private static final int MAX_BUNDLE_NAME_LENGTH = 16;
 
     // List of standard subdirectories of the "Contents" directory
-    private static final Set<String> CONTENTS_SUB_DIRS = Set.of("MacOS",
-            "Resources", "Frameworks", "PlugIns", "SharedSupport");
+    private static final Set<Path> CONTENTS_SUB_DIRS = Stream.of(
+            "MacOS",
+            "Resources",
+            "Frameworks",
+            "PlugIns",
+            "SharedSupport"
+    ).map(Path::of).collect(Collectors.toUnmodifiableSet());
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
index 0531559e052..224ea20f249 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundlingEnvironment.java
@@ -54,7 +54,6 @@ public class MacBundlingEnvironment extends DefaultBundlingEnvironment {
                 buildEnv()::create,
                 MacBundlingEnvironment::buildPipeline,
                 (env, pkg, outputDir) -> {
-                    Log.verbose(I18N.format("message.building-dmg", pkg.app().name()));
                     return new MacDmgPackager(env, pkg, outputDir, sysEnv);
                 });
     }
@@ -64,10 +63,7 @@ public class MacBundlingEnvironment extends DefaultBundlingEnvironment {
                 MacFromOptions.createMacPkgPackage(options),
                 buildEnv()::create,
                 MacBundlingEnvironment::buildPipeline,
-                (env, pkg, outputDir) -> {
-                    Log.verbose(I18N.format("message.building-pkg", pkg.app().name()));
-                    return new MacPkgPackager(env, pkg, outputDir);
-                });
+                MacPkgPackager::new);
     }
 
     private static void signAppImage(Options options) {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgLicense.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgLicense.java
new file mode 100644
index 00000000000..eea09b80929
--- /dev/null
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgLicense.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import jdk.jpackage.internal.resources.ResourceLocator;
+
+final class MacDmgLicense {
+
+    public static void prepareLicensePListFile(Path licenseFile, Path licensePListFile)
+            throws IOException {
+        byte[] licenseContentOriginal =
+                Files.readAllBytes(licenseFile);
+        String licenseInBase64 =
+                Base64.getEncoder().encodeToString(licenseContentOriginal);
+
+        Map<String, String> data = new HashMap<>();
+        data.put("APPLICATION_LICENSE_TEXT", licenseInBase64);
+        data.put("STR_DATA_ENGLISH",
+                getSTRData("English", Locale.ENGLISH, "MacRoman"));
+        data.put("STR_DATA_GERMAN",
+                getSTRData("German", Locale.GERMAN, "MacRoman"));
+        data.put("STR_DATA_JAPANESE",
+                getSTRData("Japanese", Locale.JAPANESE, "Shift_JIS"));
+        data.put("STR_DATA_SIMPLIFIED_CHINESE",
+                getSTRData("Simplified Chinese", Locale.SIMPLIFIED_CHINESE, "GB2312"));
+
+        new OverridableResource(DEFAULT_LICENSE_PLIST, ResourceLocator.class)
+                .setCategory(I18N.getString("resource.license-setup"))
+                .setSubstitutionData(data)
+                .saveToFile(licensePListFile);
+    }
+
+    private static void writeSTRDataString(ByteArrayOutputStream bos,
+                String str, String charset) {
+        byte [] bytes = str.getBytes(Charset.forName(charset));
+        byte [] bytesLength = {(byte)bytes.length};
+        bos.writeBytes(bytesLength);
+        bos.writeBytes(bytes);
+    }
+
+    // Returns base64 decoded STR section data.
+    // Strings should be in following order:
+    // Language, message.dmg.license.button.agree,
+    // message.dmg.license.button.disagree, message.dmg.license.button.print
+    // message.dmg.license.button.save, message.dmg.license.message
+    // STR section data encoded:
+    // Number of strings in the list (unsigned 16-bit integer, big endian): 6
+    // A sequence of strings prefixed with string length (unsigned 8-bit integer)
+    // Note: Language should not be translated.
+    private static String getSTRData(String language, Locale locale, String charset) {
+        ResourceBundle bundle = ResourceBundle.getBundle(
+                "jdk.jpackage.internal.resources.MacResources", locale);
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+        byte [] numberOfStrings = {0x00, 0x06}; // Always 6
+        bos.writeBytes(numberOfStrings);
+
+        writeSTRDataString(bos, language, charset);
+        writeSTRDataString(bos, bundle.getString("message.dmg.license.button.agree"), charset);
+        writeSTRDataString(bos, bundle.getString("message.dmg.license.button.disagree"), charset);
+        writeSTRDataString(bos, bundle.getString("message.dmg.license.button.print"), charset);
+        writeSTRDataString(bos, bundle.getString("message.dmg.license.button.save"), charset);
+        writeSTRDataString(bos, bundle.getString("message.dmg.license.message"), charset);
+
+        return Base64.getEncoder().encodeToString(bos.toByteArray());
+    }
+
+    private static final String DEFAULT_LICENSE_PLIST = "lic_template.plist";
+}
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
index 10754b1f1b6..b9e407b4a47 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackageBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,13 @@
 package jdk.jpackage.internal;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.model.MacDmgPackage;
 import jdk.jpackage.internal.model.MacDmgPackageMixin;
+import jdk.jpackage.internal.util.RootedPath;
 
 final class MacDmgPackageBuilder {
 
@@ -37,8 +39,8 @@ final class MacDmgPackageBuilder {
         this.pkgBuilder = Objects.requireNonNull(pkgBuilder);
     }
 
-    MacDmgPackageBuilder dmgContent(List<Path> v) {
-        dmgContent = v;
+    MacDmgPackageBuilder dmgRootDirSources(Collection<RootedPath> v) {
+        dmgRootDirSources = v;
         return this;
     }
 
@@ -47,8 +49,8 @@ final class MacDmgPackageBuilder {
         return this;
     }
 
-    List<Path> validatedDmgContent() {
-        return Optional.ofNullable(dmgContent).orElseGet(List::of);
+    private Collection<RootedPath> validatedDmgRootDirSources() {
+        return Optional.ofNullable(dmgRootDirSources).orElseGet(List::of);
     }
 
     MacDmgPackage create() {
@@ -56,10 +58,10 @@ final class MacDmgPackageBuilder {
 
         return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(
                 Optional.ofNullable(icon).or((pkg.app())::icon),
-                validatedDmgContent()));
+                validatedDmgRootDirSources()));
     }
 
     private Path icon;
-    private List<Path> dmgContent;
+    private Collection<RootedPath> dmgRootDirSources;
     private final MacPackageBuilder pkgBuilder;
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
index 20a687487ef..24474c88162 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgPackager.java
@@ -34,7 +34,6 @@ import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +46,7 @@ import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.MacDmgPackage;
 import jdk.jpackage.internal.util.FileUtils;
 import jdk.jpackage.internal.util.PathGroup;
+import jdk.jpackage.internal.util.RootedPath;
 
 record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
         MacDmgSystemEnvironment sysEnv) implements Consumer<PackagingPipeline.Builder> {
@@ -61,7 +61,6 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
     @Override
     public void accept(PackagingPipeline.Builder pipelineBuilder) {
         pipelineBuilder
-                .excludeDirFromCopying(outputDir)
                 .task(DmgPackageTaskID.COPY_DMG_CONTENT)
                         .action(this::copyDmgContent)
                         .addDependent(PackageTaskID.CREATE_PACKAGE_FILE)
@@ -105,7 +104,7 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
         return env.configDir().resolve(pkg.app().name() + "-volume.icns");
     }
 
-    Path licenseFile() {
+    Path licensePListFile() {
         return env.configDir().resolve(pkg.app().name() + "-license.plist");
     }
 
@@ -131,9 +130,7 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
 
     private void copyDmgContent() throws IOException {
         final var srcFolder = env.appImageDir();
-        for (Path path : pkg.content()) {
-            FileUtils.copyRecursive(path, srcFolder.resolve(path.getFileName()));
-        }
+        RootedPath.copy(pkg.dmgRootDirSources().stream(), srcFolder);
     }
 
     private Executor hdiutil(String... args) {
@@ -175,26 +172,6 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
                 .saveToFile(dmgSetup);
     }
 
-    private void prepareLicense() throws IOException {
-        final var licFile = pkg.licenseFile();
-        if (licFile.isEmpty()) {
-            return;
-        }
-
-        byte[] licenseContentOriginal =
-                Files.readAllBytes(licFile.orElseThrow());
-        String licenseInBase64 =
-                Base64.getEncoder().encodeToString(licenseContentOriginal);
-
-        Map<String, String> data = new HashMap<>();
-        data.put("APPLICATION_LICENSE_TEXT", licenseInBase64);
-
-        env.createResource(DEFAULT_LICENSE_PLIST)
-                .setCategory(I18N.getString("resource.license-setup"))
-                .setSubstitutionData(data)
-                .saveToFile(licenseFile());
-    }
-
     private void prepareConfigFiles() throws IOException {
 
         env.createResource(DEFAULT_BACKGROUND_IMAGE)
@@ -206,7 +183,9 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
                 .setExternal(pkg.icon().orElse(null))
                 .saveToFile(volumeIcon());
 
-        prepareLicense();
+        if (pkg.licenseFile().isPresent()) {
+            MacDmgLicense.prepareLicensePListFile(pkg.licenseFile().get(), licensePListFile());
+        }
 
         prepareDMGSetupScript();
     }
@@ -235,17 +214,6 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
 
         final Path srcFolder = env.appImageDir();
 
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.creating-dmg-file"), finalDMG.toAbsolutePath()));
-
-        try {
-            Files.deleteIfExists(finalDMG);
-        } catch (IOException ex) {
-            throw new IOException(MessageFormat.format(I18N.getString(
-                    "message.dmg-cannot-be-overwritten"),
-                    finalDMG.toAbsolutePath()));
-        }
-
         Files.createDirectories(protoDMG.getParent());
         Files.createDirectories(finalDMG.getParent());
 
@@ -370,7 +338,7 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
                     "udifrez",
                     normalizedAbsolutePathString(finalDMG),
                     "-xml",
-                    normalizedAbsolutePathString(licenseFile())
+                    normalizedAbsolutePathString(licensePListFile())
             ).retry()
                     .setMaxAttemptsCount(10)
                     .setAttemptTimeout(3, TimeUnit.SECONDS)
@@ -383,11 +351,6 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
         } catch (IOException ex) {
             // Don't care if fails
         }
-
-        Log.verbose(MessageFormat.format(I18N.getString(
-                "message.output-to-location"),
-                pkg.app().name(), normalizedAbsolutePathString(finalDMG)));
-
     }
 
     private void detachVolume() throws IOException {
@@ -457,6 +420,4 @@ record MacDmgPackager(BuildEnv env, MacDmgPackage pkg, Path outputDir,
     private static final String DEFAULT_BACKGROUND_IMAGE = "background_dmg.tiff";
     private static final String DEFAULT_DMG_SETUP_SCRIPT = "DMGsetup.scpt";
     private static final String TEMPLATE_BUNDLE_ICON = "JavaApp.icns";
-
-    private static final String DEFAULT_LICENSE_PLIST="lic_template.plist";
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
index b1094331740..4cd4f386ad8 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFromOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,11 @@ import static jdk.jpackage.internal.FromOptions.createPackageBuilder;
 import static jdk.jpackage.internal.MacPackagingPipeline.APPLICATION_LAYOUT;
 import static jdk.jpackage.internal.MacRuntimeValidator.validateRuntimeHasJliLib;
 import static jdk.jpackage.internal.MacRuntimeValidator.validateRuntimeHasNoBinDir;
+import static jdk.jpackage.internal.OptionUtils.isBundlingOperation;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_MAC_PKG;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.SIGN_MAC_APP_IMAGE;
-import static jdk.jpackage.internal.cli.StandardOption.ICON;
 import static jdk.jpackage.internal.cli.StandardOption.APPCLASS;
+import static jdk.jpackage.internal.cli.StandardOption.ICON;
 import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_CATEGORY;
 import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_IMAGE_SIGN_IDENTITY;
 import static jdk.jpackage.internal.cli.StandardOption.MAC_APP_STORE;
@@ -52,11 +54,14 @@ import static jdk.jpackage.internal.model.StandardPackageType.MAC_PKG;
 import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
 
 import java.nio.file.Path;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.ApplicationBuilder.MainLauncherStartupInfo;
-import jdk.jpackage.internal.SigningIdentityBuilder.ExpiredCertificateException;
+import jdk.jpackage.internal.SigningIdentityBuilder.SigningConfigException;
 import jdk.jpackage.internal.SigningIdentityBuilder.StandardCertificateSelector;
+import jdk.jpackage.internal.cli.OptionValue;
 import jdk.jpackage.internal.cli.Options;
 import jdk.jpackage.internal.cli.StandardFaOption;
 import jdk.jpackage.internal.model.ApplicationLaunchers;
@@ -71,7 +76,9 @@ import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.MacPkgPackage;
 import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.model.RuntimeLayout;
-import jdk.jpackage.internal.util.Result;
+import jdk.jpackage.internal.util.MacBundle;
+import jdk.jpackage.internal.util.RootedPath;
+import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.internal.util.function.ExceptionBox;
 
 
@@ -89,7 +96,14 @@ final class MacFromOptions {
 
         final var pkgBuilder = new MacDmgPackageBuilder(superPkgBuilder);
 
-        MAC_DMG_CONTENT.ifPresentIn(options, pkgBuilder::dmgContent);
+        MAC_DMG_CONTENT.findIn(options).map((List<Collection<RootedPath>> v) -> {
+            // Reverse the order of content sources.
+            // If there are multiple source files for the same
+            // destination file, only the first will be used.
+            // Reversing the order of content sources makes it use the last file
+            // from the original list of source files for the given destination file.
+            return v.reversed().stream().flatMap(Collection::stream).toList();
+        }).ifPresent(pkgBuilder::dmgRootDirSources);
 
         return pkgBuilder.create();
     }
@@ -106,62 +120,75 @@ final class MacFromOptions {
         final boolean sign = MAC_SIGN.findIn(options).orElse(false);
         final boolean appStore = MAC_APP_STORE.findIn(options).orElse(false);
 
-        final var appResult = Result.of(() -> createMacApplicationInternal(options));
+        final Optional<SigningIdentityBuilder> pkgSigningIdentityBuilder;
 
-        final Optional<MacPkgPackageBuilder> pkgBuilder;
-        if (appResult.hasValue()) {
-            final var superPkgBuilder = createMacPackageBuilder(options, appResult.orElseThrow(), MAC_PKG);
-            pkgBuilder = Optional.of(new MacPkgPackageBuilder(superPkgBuilder));
+        if (!sign) {
+            pkgSigningIdentityBuilder = Optional.empty();
+        } else if (hasAppImageSignIdentity(options) && !hasPkgInstallerSignIdentity(options)) {
+            // They explicitly request to sign the app image,
+            // but don't specify signing identity for signing the PKG package.
+            // They want signed app image inside of unsigned PKG.
+            pkgSigningIdentityBuilder = Optional.empty();
         } else {
-            // Failed to create an app. Is it because of the expired certificate?
-            rethrowIfNotExpiredCertificateException(appResult);
-            // Yes, the certificate for signing the app image has expired.
-            // Keep going, try to create a signing config for the package.
-            pkgBuilder = Optional.empty();
-        }
-
-        if (sign) {
             final var signingIdentityBuilder = createSigningIdentityBuilder(options);
-            MAC_INSTALLER_SIGN_IDENTITY.ifPresentIn(options, signingIdentityBuilder::signingIdentity);
-            MAC_SIGNING_KEY_NAME.findIn(options).ifPresent(userName -> {
-                final StandardCertificateSelector domain;
-                if (appStore) {
-                    domain = StandardCertificateSelector.APP_STORE_PKG_INSTALLER;
-                } else {
-                    domain = StandardCertificateSelector.PKG_INSTALLER;
-                }
 
-                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
-            });
+            MAC_INSTALLER_SIGN_IDENTITY.findIn(options).ifPresentOrElse(
+                    signingIdentityBuilder::signingIdentity,
+                    () -> {
+                        MAC_SIGNING_KEY_NAME.findIn(options).or(() -> {
+                            if (MAC_APP_IMAGE_SIGN_IDENTITY.findIn(options).isPresent()) {
+                                return Optional.empty();
+                            } else {
+                                return Optional.of("");
+                            }
+                        }).ifPresent(userName -> {
+                            final StandardCertificateSelector domain;
+                            if (appStore) {
+                                domain = StandardCertificateSelector.APP_STORE_PKG_INSTALLER;
+                            } else {
+                                domain = StandardCertificateSelector.PKG_INSTALLER;
+                            }
 
-            if (pkgBuilder.isPresent()) {
-                pkgBuilder.orElseThrow().signingBuilder(signingIdentityBuilder);
-            } else {
-                //
-                // The certificate for signing the app image has expired. Can not create a
-                // package because there is no app.
-                // Try to create a signing config for the package and see if the certificate for
-                // signing the package is also expired.
-                //
+                            signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
+                        });
+                    }
+            );
 
-                final var expiredAppCertException = appResult.firstError().orElseThrow();
-
-                final var pkgSignConfigResult = Result.of(signingIdentityBuilder::create);
-                try {
-                    rethrowIfNotExpiredCertificateException(pkgSignConfigResult);
-                    // The certificate for the package signing config is also expired!
-                } catch (RuntimeException ex) {
-                    // Some error occurred trying to configure the signing config for the package.
-                    // Ignore it, bail out with the first error.
-                    throw toUnchecked(expiredAppCertException);
-                }
-
-                Log.error(pkgSignConfigResult.firstError().orElseThrow().getMessage());
-                throw toUnchecked(expiredAppCertException);
-            }
+            pkgSigningIdentityBuilder = Optional.of(signingIdentityBuilder);
         }
 
-        return pkgBuilder.orElseThrow().create();
+        ApplicationWithDetails app = null;
+        try {
+            app = createMacApplicationInternal(options);
+        } catch (RuntimeException appEx) {
+            rethrowIfNotSigningConfigException(appEx);
+            try {
+                pkgSigningIdentityBuilder.ifPresent(SigningIdentityBuilder::create);
+            } catch (RuntimeException pkgEx) {
+
+                if (Objects.equals(appEx.getMessage(), pkgEx.getMessage())) {
+                    // Don't report the same error twice.
+                    throw appEx;
+                }
+
+                // Use suppressed exceptions to communicate multiple exceptions to the caller.
+                // The top-level error handling code assumes there is a causal connection
+                // between the exception and its suppressed exceptions.
+                // Based on this assumption and following the principle "Present cause before consequence",
+                // it will report the suppressed exceptions before reporting the caught exception.
+                pkgEx.addSuppressed(appEx);
+                throw pkgEx;
+            }
+
+            throw appEx;
+        }
+
+        final var superPkgBuilder = createMacPackageBuilder(options, app, MAC_PKG);
+        final var pkgBuilder = new MacPkgPackageBuilder(superPkgBuilder);
+
+        pkgSigningIdentityBuilder.ifPresent(pkgBuilder::signingBuilder);
+
+        return pkgBuilder.create();
     }
 
     private record ApplicationWithDetails(MacApplication app, Optional<ExternalApplication> externalApp) {
@@ -221,33 +248,47 @@ final class MacFromOptions {
         MAC_BUNDLE_IDENTIFIER.ifPresentIn(options, appBuilder::bundleIdentifier);
         MAC_APP_CATEGORY.ifPresentIn(options, appBuilder::category);
 
-        final boolean sign;
+        final boolean sign = MAC_SIGN.getFrom(options);
         final boolean appStore;
 
-        if (PREDEFINED_APP_IMAGE.containsIn(options) && OptionUtils.bundlingOperation(options) != SIGN_MAC_APP_IMAGE) {
+        if (PREDEFINED_APP_IMAGE.containsIn(options)) {
             final var appImageFileOptions = superAppBuilder.externalApplication().orElseThrow().extra();
-            sign = MAC_SIGN.getFrom(appImageFileOptions);
             appStore = MAC_APP_STORE.getFrom(appImageFileOptions);
         } else {
-            sign = MAC_SIGN.getFrom(options);
             appStore = MAC_APP_STORE.getFrom(options);
         }
 
         appBuilder.appStore(appStore);
 
-        if (sign) {
-            final var signingIdentityBuilder = createSigningIdentityBuilder(options);
-            MAC_APP_IMAGE_SIGN_IDENTITY.ifPresentIn(options, signingIdentityBuilder::signingIdentity);
-            MAC_SIGNING_KEY_NAME.findIn(options).ifPresent(userName -> {
-                final StandardCertificateSelector domain;
-                if (appStore) {
-                    domain = StandardCertificateSelector.APP_STORE_APP_IMAGE;
-                } else {
-                    domain = StandardCertificateSelector.APP_IMAGE;
-                }
+        final var signOnlyPkgInstaller = sign && (
+                isBundlingOperation(options, CREATE_MAC_PKG)
+                && !hasAppImageSignIdentity(options)
+                && hasPkgInstallerSignIdentity(options));
 
-                signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
-            });
+        if (sign && !signOnlyPkgInstaller) {
+            final var signingIdentityBuilder = createSigningIdentityBuilder(options);
+
+            MAC_APP_IMAGE_SIGN_IDENTITY.findIn(options).ifPresentOrElse(
+                    signingIdentityBuilder::signingIdentity,
+                    () -> {
+                        MAC_SIGNING_KEY_NAME.findIn(options).or(() -> {
+                            if (MAC_INSTALLER_SIGN_IDENTITY.containsIn(options)) {
+                                return Optional.empty();
+                            } else {
+                                return Optional.of("");
+                            }
+                        }).ifPresent(userName -> {
+                            final StandardCertificateSelector domain;
+                            if (appStore) {
+                                domain = StandardCertificateSelector.APP_STORE_APP_IMAGE;
+                            } else {
+                                domain = StandardCertificateSelector.APP_IMAGE;
+                            }
+
+                            signingIdentityBuilder.certificateSelector(StandardCertificateSelector.create(userName, domain));
+                        });
+                    }
+            );
 
             final var signingBuilder = new AppImageSigningConfigBuilder(signingIdentityBuilder);
             if (appStore) {
@@ -276,34 +317,28 @@ final class MacFromOptions {
 
         final var builder = new MacPackageBuilder(createPackageBuilder(options, app.app(), type));
 
-        app.externalApp()
-                .map(ExternalApplication::extra)
-                .flatMap(MAC_SIGN::findIn)
-                .ifPresent(builder::predefinedAppImageSigned);
-
-        PREDEFINED_RUNTIME_IMAGE.findIn(options)
-                .map(MacBundle::new)
-                .filter(MacBundle::isValid)
-                .map(MacBundle::isSigned)
-                .ifPresent(builder::predefinedAppImageSigned);
+        for (OptionValue<Path> ov : List.of(PREDEFINED_APP_IMAGE, PREDEFINED_RUNTIME_IMAGE)) {
+            ov.findIn(options)
+                    .flatMap(MacBundle::fromPath)
+                    .map(MacPackagingPipeline::isSigned)
+                    .ifPresent(builder::predefinedAppImageSigned);
+        }
 
         return builder;
     }
 
-    private static void rethrowIfNotExpiredCertificateException(Result<?> result) {
-        final var ex = result.firstError().orElseThrow();
+    private static void rethrowIfNotSigningConfigException(Exception ex) {
+        var signingConfigExceptionFound = Slot.<Boolean>createEmpty();
 
-        if (ex instanceof ExpiredCertificateException) {
-            return;
-        }
-
-        if (ex instanceof ExceptionBox box) {
-            if (box.getCause() instanceof Exception cause) {
-                rethrowIfNotExpiredCertificateException(Result.ofError(cause));
+        ExceptionBox.visitUnboxedExceptionsRecursively(ex, visited -> {
+            if (visited instanceof SigningConfigException) {
+                signingConfigExceptionFound.set(true);
             }
-        }
+        });
 
-        throw toUnchecked(ex);
+        if (!signingConfigExceptionFound.find().orElse(false)) {
+            throw toUnchecked(ex);
+        }
     }
 
     private static SigningIdentityBuilder createSigningIdentityBuilder(Options options) {
@@ -328,4 +363,12 @@ final class MacFromOptions {
 
         return builder.create(fa);
     }
+
+    private static boolean hasAppImageSignIdentity(Options options) {
+        return options.contains(MAC_SIGNING_KEY_NAME) || options.contains(MAC_APP_IMAGE_SIGN_IDENTITY);
+    }
+
+    private static boolean hasPkgInstallerSignIdentity(Options options) {
+        return options.contains(MAC_SIGNING_KEY_NAME) || options.contains(MAC_INSTALLER_SIGN_IDENTITY);
+    }
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
index 53f297282ba..4e63f6db178 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,8 @@ import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.MacBundle;
+import jdk.jpackage.internal.util.PListReader;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 
@@ -178,13 +180,10 @@ final class MacPackagingPipeline {
                 builder.task(MacCopyAppImageTaskID.COPY_RUNTIME_JLILIB)
                         .appImageAction(MacPackagingPipeline::copyJliLib).add();
 
-                final var predefinedRuntimeBundle = Optional.of(
-                        new MacBundle(p.predefinedAppImage().orElseThrow())).filter(MacBundle::isValid);
-
                 // Don't create ".package" file.
                 disabledTasks.add(MacCopyAppImageTaskID.COPY_PACKAGE_FILE);
 
-                if (predefinedRuntimeBundle.isPresent()) {
+                if (MacBundle.fromPath(p.predefinedAppImage().orElseThrow()).isPresent()) {
                     // The input runtime image is a macOS bundle.
                     // Disable all alterations of the input bundle, but keep the signing enabled.
                     disabledTasks.addAll(List.of(MacCopyAppImageTaskID.values()));
@@ -195,7 +194,7 @@ final class MacPackagingPipeline {
                             .appImageAction(MacPackagingPipeline::writeRuntimeInfoPlist).add();
                 }
 
-                if (predefinedRuntimeBundle.map(MacBundle::isSigned).orElse(false) && !((MacPackage)p).app().sign()) {
+                if (((MacPackage)p).predefinedAppImageSigned().orElse(false) && !((MacPackage)p).app().sign()) {
                     // The input runtime is a signed bundle; explicit signing is not requested for the package.
                     // Disable the signing, i.e. don't re-sign the input bundle.
                     disabledTasks.add(MacCopyAppImageTaskID.COPY_SIGN);
@@ -218,6 +217,11 @@ final class MacPackagingPipeline {
 
     enum SignAppImagePackageType implements PackageType {
         VALUE;
+
+        @Override
+        public String label() {
+            throw new UnsupportedOperationException();
+        }
     }
 
     static Package createSignAppImagePackage(MacApplication app, BuildEnv env) {
@@ -279,6 +283,30 @@ final class MacPackagingPipeline {
         }
     }
 
+    static boolean isSigned(MacBundle bundle) {
+
+        var result = toSupplier(Executor.of(
+                "/usr/sbin/spctl",
+                "-vv",
+                "--raw",
+                "--assess",
+                "--type", "exec",
+                bundle.root().toString()).setQuiet(true).saveOutput(true).binaryOutput()::execute).get();
+
+        switch (result.getExitCode()) {
+            case 0, 3 -> {
+                // These exit codes are accompanied with valid plist xml.
+                return toSupplier(() -> {
+                    return new PListReader(result.byteStdout()).findValue("assessment:originator").isPresent();
+                }).get();
+            }
+            default -> {
+                // Likely to be an "a sealed resource is missing or invalid" error.
+                return false;
+            }
+        }
+    }
+
     private static void copyAppImage(MacPackage pkg, AppImageLayout srcAppImage,
             AppImageLayout dstAppImage) throws IOException {
 
@@ -286,7 +314,7 @@ final class MacPackagingPipeline {
 
         final Optional<MacBundle> srcMacBundle;
         if (pkg.isRuntimeInstaller()) {
-            srcMacBundle = MacBundle.fromAppImageLayout(srcAppImage);
+            srcMacBundle = macBundleFromAppImageLayout(srcAppImage);
         } else {
             srcMacBundle = Optional.empty();
         }
@@ -297,7 +325,7 @@ final class MacPackagingPipeline {
             try {
                 FileUtils.copyRecursive(
                         inputBundle.root(),
-                        MacBundle.fromAppImageLayout(dstAppImage).orElseThrow().root(),
+                        macBundleFromAppImageLayout(dstAppImage).orElseThrow().root(),
                         LinkOption.NOFOLLOW_LINKS);
             } catch (IOException ex) {
                 throw new UncheckedIOException(ex);
@@ -415,7 +443,7 @@ final class MacPackagingPipeline {
 
         final var app = env.app();
 
-        final var infoPlistFile = MacBundle.fromAppImageLayout(env.resolvedLayout()).orElseThrow().infoPlistFile();
+        final var infoPlistFile = macBundleFromAppImageLayout(env.resolvedLayout()).orElseThrow().infoPlistFile();
 
         Log.verbose(I18N.format("message.preparing-info-plist", PathUtils.normalizedAbsolutePathString(infoPlistFile)));
 
@@ -468,7 +496,7 @@ final class MacPackagingPipeline {
         }
 
         final Runnable signAction = () -> {
-            AppImageSigner.createSigner(app, codesignConfigBuilder.create()).accept(MacBundle.fromAppImageLayout(env.resolvedLayout()).orElseThrow());
+            AppImageSigner.createSigner(app, codesignConfigBuilder.create()).accept(macBundleFromAppImageLayout(env.resolvedLayout()).orElseThrow());
         };
 
         app.signingConfig().flatMap(AppImageSigningConfig::keychain).map(Keychain::new).ifPresentOrElse(keychain -> {
@@ -550,7 +578,7 @@ final class MacPackagingPipeline {
 
     private static MacBundle runtimeBundle(AppImageBuildEnv<MacApplication, AppImageLayout> env) {
         if (env.app().isRuntime()) {
-            return MacBundle.fromAppImageLayout(env.resolvedLayout()).orElseThrow();
+            return macBundleFromAppImageLayout(env.resolvedLayout()).orElseThrow();
         } else {
             return new MacBundle(((MacApplicationLayout)env.resolvedLayout()).runtimeRootDirectory());
         }
@@ -595,6 +623,22 @@ final class MacPackagingPipeline {
         };
     }
 
+    private static Optional<MacBundle> macBundleFromAppImageLayout(AppImageLayout layout) {
+        final var root = layout.rootDirectory();
+        final var bundleSubdir = root.relativize(layout.runtimeDirectory());
+        final var contentsDirname = Path.of("Contents");
+        var bundleRoot = root;
+        for (int i = 0; i != bundleSubdir.getNameCount(); i++) {
+            var nameComponent = bundleSubdir.getName(i);
+            if (contentsDirname.equals(nameComponent)) {
+                return Optional.of(new MacBundle(bundleRoot));
+            } else {
+                bundleRoot = bundleRoot.resolve(nameComponent);
+            }
+        }
+        return Optional.empty();
+    }
+
 
     private record TaskContextProxy(TaskContext delegate, boolean forApp, boolean copyAppImage) implements TaskContext {
 
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
index b81340354e1..0a5cc09596f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackageBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ final class MacPkgPackageBuilder {
     }
 
     private Optional<PkgSigningConfig> createSigningConfig() {
-        return Optional.ofNullable(signingBuilder).flatMap(SigningIdentityBuilder::create).map(cfg -> {
+        return Optional.ofNullable(signingBuilder).map(SigningIdentityBuilder::create).map(cfg -> {
             return new PkgSigningConfig.Stub(cfg.identity(), cfg.keychain().map(Keychain::name));
         });
     }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
index 126248e2330..fc5c85c699c 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java
@@ -215,7 +215,6 @@ record MacPkgPackager(BuildEnv env, MacPkgPackage pkg, Optional<Services> servic
     @Override
     public void accept(PackagingPipeline.Builder pipelineBuilder) {
         pipelineBuilder
-                .excludeDirFromCopying(outputDir)
                 .task(PkgPackageTaskID.PREPARE_MAIN_SCRIPTS)
                         .action(this::prepareMainScripts)
                         .addDependent(PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
index 0f753c07569..892601eb363 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/SigningIdentityBuilder.java
@@ -39,23 +39,18 @@ import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 import javax.security.auth.x500.X500Principal;
 import jdk.jpackage.internal.MacCertificateUtils.CertificateHash;
-import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.SigningIdentity;
 
 final class SigningIdentityBuilder {
 
-    static class SigningConfigException extends ConfigException {
-        SigningConfigException(ConfigException ex) {
-            super(ex.getMessage(), ex.getAdvice(), ex.getCause());
+    static class SigningConfigException extends JPackageException {
+        public SigningConfigException(String msg) {
+            super(msg);
         }
 
-        private static final long serialVersionUID = 1L;
-    }
-
-    static class ExpiredCertificateException extends SigningConfigException {
-        ExpiredCertificateException(ConfigException ex) {
-            super(ex);
+        public SigningConfigException(String msg, Throwable cause) {
+            super(msg, cause);
         }
 
         private static final long serialVersionUID = 1L;
@@ -83,11 +78,12 @@ final class SigningIdentityBuilder {
         return this;
     }
 
-    Optional<SigningConfig> create() {
-        if (signingIdentity == null && certificateSelector == null) {
-            return Optional.empty();
+    SigningConfig create() {
+        if (Objects.isNull(certificateSelector) == Objects.isNull(signingIdentity)) {
+            // Either the signing certificate selector or the signing certificate must be configured.
+            throw new IllegalStateException();
         } else {
-            return Optional.of(new SigningConfig(validatedSigningIdentity(), validatedKeychain()));
+            return new SigningConfig(validatedSigningIdentity(), validatedKeychain());
         }
     }
 
@@ -133,8 +129,9 @@ final class SigningIdentityBuilder {
 
         try {
             cert.checkValidity();
-        } catch (CertificateExpiredException|CertificateNotYetValidException ex) {
-            throw new ExpiredCertificateException(I18N.buildConfigException("error.certificate.expired", findSubjectCNs(cert).getFirst()).create());
+        } catch (CertificateExpiredException | CertificateNotYetValidException ex) {
+            throw new SigningConfigException(I18N.format(
+                    "error.certificate.outside-validity-period", findSubjectCNs(cert).getFirst()), ex);
         }
 
         final var signingIdentityHash = CertificateHash.of(cert);
@@ -148,7 +145,7 @@ final class SigningIdentityBuilder {
         Objects.requireNonNull(keychain);
         switch (certs.size()) {
             case 0 -> {
-                throw new JPackageException(I18N.format("error.cert.not.found",
+                throw new SigningConfigException(I18N.format("error.cert.not.found",
                         certificateSelector.signingIdentities().getFirst(),
                         keychain.map(Keychain::name).orElse("")));
             }
@@ -156,10 +153,9 @@ final class SigningIdentityBuilder {
                 return certs.getFirst();
             }
             default -> {
-                throw I18N.buildConfigException("error.multiple.certs.found",
+                throw new SigningConfigException(I18N.format("error.multiple.certs.found",
                         certificateSelector.signingIdentities().getFirst(),
-                        keychain.map(Keychain::name).orElse("")
-                ).create();
+                        keychain.map(Keychain::name).orElse("")));
             }
         }
     }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
index cfe10e8a012..e2b3d30b7ae 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@ import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toUnmodifiableMap;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_APP_STORE;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_MAIN_CLASS;
-import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_SIGNED;
 
 import java.nio.file.Path;
 import java.util.Map;
@@ -96,9 +95,6 @@ public interface MacApplication extends Application, MacApplicationMixin {
     }
 
     public enum ExtraAppImageFileField {
-        SIGNED(MAC_SIGNED, app -> {
-            return Optional.of(Boolean.toString(app.sign()));
-        }),
         APP_STORE(MAC_APP_STORE, app -> {
             return Optional.of(Boolean.toString(app.appStore()));
         }),
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
index 0b502e7ce7e..08797b11509 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacDmgPackageMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,23 @@
 package jdk.jpackage.internal.model;
 
 import java.nio.file.Path;
-import java.util.List;
+import java.util.Collection;
 import java.util.Optional;
+import jdk.jpackage.internal.util.RootedPath;
 
 public interface MacDmgPackageMixin {
 
     Optional<Path> icon();
 
     /**
-     * Returns additional top=level content for DMG package.
+     * Returns the source paths that should be copied into the top-level directory of a DMG package.
      * <p>
      * Each item in the list can be a directory or a file.
      *
-     * @return the additional top=level content for DMG package
+     * @return the source paths of additional top-level content for DMG package
      */
-    List<Path> content();
+    Collection<RootedPath> dmgRootDirSources();
 
-    record Stub(Optional<Path> icon, List<Path> content) implements MacDmgPackageMixin {
+    record Stub(Optional<Path> icon, Collection<RootedPath> dmgRootDirSources) implements MacDmgPackageMixin {
     }
 }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index 240e82dcc9b..e43cadc5782 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -24,11 +24,10 @@
 #
 #
 error.invalid-cfbundle-version.advice=Set a compatible 'app-version' value. Valid versions are one to three integers separated by dots.
-error.certificate.expired=Certificate expired {0}
+error.certificate.outside-validity-period=The certificate "{0}" is outside its validity period
 error.cert.not.found=No certificate found matching [{0}] using keychain [{1}]
 error.multiple.certs.found=Multiple certificates matching name [{0}] found in keychain [{1}]
 error.app-image.mac-sign.required=--mac-sign option is required with predefined application image and with type [app-image]
-error.tool.failed.with.output="{0}" failed with following output:
 error.invalid-runtime-image-missing-file=Runtime image "{0}" is missing "{1}" file
 error.invalid-runtime-image-bin-dir=Runtime image "{0}" should not contain "bin" folder
 error.invalid-runtime-image-bin-dir.advice=Use --strip-native-commands jlink option when generating runtime image used with {0} option
@@ -57,18 +56,18 @@ message.version-string-first-number-not-zero=The first number in an app-version
 message.keychain.error=Unable to get keychain list.
 message.invalid-identifier=Invalid mac bundle identifier [{0}].
 message.invalid-identifier.advice=specify identifier with "--mac-package-identifier".
-message.building-dmg=Building DMG package for {0}.
 message.preparing-dmg-setup=Preparing dmg setup: {0}.
-message.creating-dmg-file=Creating DMG file: {0}.
-message.dmg-cannot-be-overwritten=Dmg file exists [{0}] and can not be removed.
-message.output-to-location=Result DMG installer for {0}: {1}.
-message.building-pkg=Building PKG package for {0}.
 message.preparing-scripts=Preparing package scripts.
 message.preparing-distribution-dist=Preparing distribution.dist: {0}.
 message.signing.pkg=Warning: For signing PKG, you might need to set "Always Trust" for your certificate using "Keychain Access" tool.
 message.setfile.dmg=Setting custom icon on DMG file skipped because 'SetFile' utility was not found. Installing Xcode with Command Line Tools should resolve this issue.
 message.codesign.failed.reason.app.content="codesign" failed and additional application content was supplied via the "--app-content" parameter. Probably the additional content broke the integrity of the application bundle and caused the failure. Ensure content supplied via the "--app-content" parameter does not break the integrity of the application bundle, or add it in the post-processing step.
 message.codesign.failed.reason.xcode.tools=Possible reason for "codesign" failure is missing Xcode with command line developer tools. Install Xcode with command line developer tools to see if it resolves the problem.
+message.dmg.license.button.agree=Agree
+message.dmg.license.button.disagree=Disagree
+message.dmg.license.button.print=Print
+message.dmg.license.button.save=Save...
+message.dmg.license.message=If you agree with the terms of this license, press "Agree" to install the software. If you do not agree, press "Disagree".
 warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {0}.
 warning.per.user.app.image.signed=Warning: Support for per-user configuration of the installed application will not be supported due to missing "{0}" in predefined signed application image.
 warning.non.standard.contents.sub.dir=Warning: The file name of the directory "{0}" specified for the --app-content option is not a standard subdirectory name in the "Contents" directory of the application bundle. The result application bundle may fail code signing and/or notarization.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
index 3cc56bb6cdf..367f3216f85 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_de.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,11 @@ message.signing.pkg=Warnung: Zum Signieren von PKG müssen Sie möglicherweise m
 message.setfile.dmg=Das Festlegen des benutzerdefinierten Symbols für die DMG-Datei wurde übersprungen, weil das Utility "SetFile" nicht gefunden wurde. Durch Installieren von Xcode mit Befehlszeilentools sollte dieses Problem behoben werden.
 message.codesign.failed.reason.app.content="codesign" war nicht erfolgreich, und zusätzlicher Anwendungsinhalt wurde über den Parameter "--app-content" angegeben. Wahrscheinlich hat der zusätzliche Inhalt die Integrität des Anwendungs-Bundles beeinträchtigt und den Fehler verursacht. Stellen Sie sicher, das der über den Parameter "--app-content" angegebene Inhalt nicht die Integrität des Anwendungs-Bundles beeinträchtigt, oder fügen Sie ihn im Nachverarbeitungsschritt hinzu.
 message.codesign.failed.reason.xcode.tools=Möglicher Grund für "codesign"-Fehler ist fehlender Xcode mit Befehlszeilen-Entwicklertools. Installieren Sie Xcode mit Befehlszeilen-Entwicklertools, und prüfen Sie, ob das Problem dadurch beseitigt wird.
+message.dmg.license.button.agree=Akzeptieren
+message.dmg.license.button.disagree=Ablehnen
+message.dmg.license.button.print=Drucken
+message.dmg.license.button.save=Sichern...
+message.dmg.license.message=Klicken Sie in “Akzeptieren”, wenn Sie mit den Bestimmungen des Software-Lizenzvertrags einverstanden sind. Falls nicht, bitte “Ablehnen” anklicken. Sie können die Software nur installieren, wenn Sie “Akzeptieren” angeklickt haben.
 warning.unsigned.app.image=Warnung: Nicht signiertes app-image wird zum Erstellen von signiertem {0} verwendet.
 warning.per.user.app.image.signed=Warnung: Konfiguration der installierten Anwendung pro Benutzer wird nicht unterstützt, da "{0}" im vordefinierten signierten Anwendungsimage fehlt.
 warning.non.standard.contents.sub.dir=Warnung: Der Dateiname des Verzeichnisses "{0}", das für die Option --app-content angegeben wurde, ist kein Standardunterverzeichnisname im Verzeichnis "Contents" des Anwendungs-Bundles. Möglicherweise verläuft die Codesignierung und/oder Notarisierung im Ergebnisanwendungs-Bundle nicht erfolgreich.
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
index d3150a34a86..ba2497d30dd 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_ja.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,11 @@ message.signing.pkg=警告: PKGへの署名の場合、「キーチェーン・
 message.setfile.dmg='SetFile'ユーティリティが見つからないため、DMGファイルでのカスタム・アイコンの設定がスキップされました。Xcodeとコマンド・ライン・ツールをインストールすると、この問題は解決されます。
 message.codesign.failed.reason.app.content="codesign"が失敗したため、追加のアプリケーション・コンテンツが、"--app-content"パラメータを介して提供されました。追加のコンテンツにより、アプリケーション・バンドルの整合性が損われ、失敗の原因になった可能性があります。"--app-content"パラメータを介して提供されたコンテンツによって、アプリケーション・バンドルの整合性が損われていないことを確認するか、処理後のステップで追加してください。
 message.codesign.failed.reason.xcode.tools="codesign"失敗の考えられる理由は、Xcodeとコマンドライン・デベロッパ・ツールの欠落です。Xcodeとコマンドライン・デベロッパ・ツールをインストールして、問題が解決されるかを確認してください。
+message.dmg.license.button.agree=同意します
+message.dmg.license.button.disagree=同意しません
+message.dmg.license.button.print=印刷する
+message.dmg.license.button.save=保存...
+message.dmg.license.message=本ソフトウエア使用許諾契約の条件に同意される場合には、ソフトウエアをインストールするために「同意します」を押してください。　同意されない場合には、「同意しません」を押してください。
 warning.unsigned.app.image=警告: 署名されていないapp-imageを使用して署名された{0}を作成します。
 warning.per.user.app.image.signed=警告: 事前定義済の署名付きアプリケーション・イメージに"{0}"がないため、インストール済アプリケーションのユーザーごとの構成はサポートされません。
 warning.non.standard.contents.sub.dir=警告: --app-contentオプションに指定されたディレクトリ"{0}"のファイル名が、アプリケーション・バンドルの"Contents"ディレクトリ内の標準サブディレクトリ名ではありません。結果アプリケーション・バンドルは、コード署名および/または公証に失敗することがあります。
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
index 8ca2219b72f..f855a31caae 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources_zh_CN.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,11 @@ message.signing.pkg=警告：要对 PKG 进行签名，可能需要使用“密
 message.setfile.dmg=由于未找到 'SetFile' 实用程序，跳过了针对 DMG 文件设置定制图标的操作。安装带命令行工具的 Xcode 应能解决此问题。
 message.codesign.failed.reason.app.content="codesign" 失败，并通过 "--app-content" 参数提供了附加应用程序内容。可能是附加内容破坏了应用程序包的完整性，导致了故障。请确保通过 "--app-content" 参数提供的内容不会破坏应用程序包的完整性，或者在后处理步骤中添加该内容。
 message.codesign.failed.reason.xcode.tools="codesign" 失败可能是因为缺少带命令行开发人员工具的 Xcode。请安装带命令行开发人员工具的 Xcode，看看是否可以解决问题。
+message.dmg.license.button.agree=同意
+message.dmg.license.button.disagree=不同意
+message.dmg.license.button.print=打印
+message.dmg.license.button.save=存储...
+message.dmg.license.message=如果您同意本许可协议的条款，请按“同意”来安装此软件。如果您不同意，请按“不同意”。
 warning.unsigned.app.image=警告：使用未签名的 app-image 生成已签名的 {0}。
 warning.per.user.app.image.signed=警告：由于预定义的已签名应用程序映像中缺少 "{0}"，不支持对已安装应用程序的每用户配置提供支持。
 warning.non.standard.contents.sub.dir=警告：为 --app-content 选项指定的目录 "{0}" 的文件名不是应用程序包的 "Contents" 目录中的标准子目录名称。结果应用程序包可能会使代码签名和/或公证失败。
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist
index 072e7168fb7..ac1b32325e8 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/lic_template.plist
@@ -8,7 +8,9 @@
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>AAAAAgAAAAAAAAAAAAQAAA==</data>
+			<data>
+			AAAABAAAAAAAAAADAAEAAAAOAAIAAQA0AAMAAQ==
+			</data>
 			<key>ID</key>
 			<string>5000</string>
 			<key>Name</key>
@@ -21,17 +23,22 @@
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>AAYPRW5nbGlzaCBkZWZhdWx0BUFncmVlCERpc2FncmVlBVByaW50B1NhdmUuLi56SWYgeW91IGFncmVlIHdpdGggdGhlIHRlcm1zIG9mIHRoaXMgbGljZW5zZSwgY2xpY2sgIkFncmVlIiB0byBhY2Nlc3MgdGhlIHNvZnR3YXJlLiAgSWYgeW91IGRvIG5vdCBhZ3JlZSwgcHJlc3MgIkRpc2FncmVlLiI=</data>
+			<data>
+			STR_DATA_ENGLISH
+			</data>
 			<key>ID</key>
 			<string>5000</string>
+			<!-- Note: Values if "Name" keys should not be localized for all languages. It is internal use only. -->
 			<key>Name</key>
-			<string>English buttons</string>
+			<string>English (United States)</string>
 		</dict>
 		<dict>
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>AAYHRGV1dHNjaAtBa3plcHRpZXJlbghBYmxlaG5lbgdEcnVja2VuClNpY2hlcm4uLi7nS2xpY2tlbiBTaWUgaW4g0kFremVwdGllcmVu0ywgd2VubiBTaWUgbWl0IGRlbiBCZXN0aW1tdW5nZW4gZGVzIFNvZnR3YXJlLUxpemVuenZlcnRyYWdzIGVpbnZlcnN0YW5kZW4gc2luZC4gRmFsbHMgbmljaHQsIGJpdHRlINJBYmxlaG5lbtMgYW5rbGlja2VuLiBTaWUga5pubmVuIGRpZSBTb2Z0d2FyZSBudXIgaW5zdGFsbGllcmVuLCB3ZW5uIFNpZSDSQWt6ZXB0aWVyZW7TIGFuZ2VrbGlja3QgaGFiZW4u</data>
+			<data>
+			STR_DATA_GERMAN
+			</data>
 			<key>ID</key>
 			<string>5001</string>
 			<key>Name</key>
@@ -41,151 +48,25 @@
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>AAYHRW5nbGlzaAVBZ3JlZQhEaXNhZ3JlZQVQcmludAdTYXZlLi4ue0lmIHlvdSBhZ3JlZSB3aXRoIHRoZSB0ZXJtcyBvZiB0aGlzIGxpY2Vuc2UsIHByZXNzICJBZ3JlZSIgdG8gaW5zdGFsbCB0aGUgc29mdHdhcmUuICBJZiB5b3UgZG8gbm90IGFncmVlLCBwcmVzcyAiRGlzYWdyZWUiLg==</data>
+			<data>
+			STR_DATA_JAPANESE
+			</data>
 			<key>ID</key>
 			<string>5002</string>
 			<key>Name</key>
-			<string>English</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYHRXNwYZZvbAdBY2VwdGFyCk5vIGFjZXB0YXIISW1wcmltaXIKR3VhcmRhci4uLsBTaSBlc3SHIGRlIGFjdWVyZG8gY29uIGxvcyB0jnJtaW5vcyBkZSBlc3RhIGxpY2VuY2lhLCBwdWxzZSAiQWNlcHRhciIgcGFyYSBpbnN0YWxhciBlbCBzb2Z0d2FyZS4gRW4gZWwgc3VwdWVzdG8gZGUgcXVlIG5vIGVzdI4gZGUgYWN1ZXJkbyBjb24gbG9zIHSOcm1pbm9zIGRlIGVzdGEgbGljZW5jaWEsIHB1bHNlICJObyBhY2VwdGFyLiI=</data>
-			<key>ID</key>
-			<string>5003</string>
-			<key>Name</key>
-			<string>Spanish</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYIRnJhbo1haXMIQWNjZXB0ZXIHUmVmdXNlcghJbXByaW1lcg5FbnJlZ2lzdHJlci4uLrpTaSB2b3VzIGFjY2VwdGV6IGxlcyB0ZXJtZXMgZGUgbGEgcHKOc2VudGUgbGljZW5jZSwgY2xpcXVleiBzdXIgIkFjY2VwdGVyIiBhZmluIGQnaW5zdGFsbGVyIGxlIGxvZ2ljaWVsLiBTaSB2b3VzIG4nkHRlcyBwYXMgZCdhY2NvcmQgYXZlYyBsZXMgdGVybWVzIGRlIGxhIGxpY2VuY2UsIGNsaXF1ZXogc3VyICJSZWZ1c2VyIi4=</data>
-			<key>ID</key>
-			<string>5004</string>
-			<key>Name</key>
-			<string>French</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYISXRhbGlhbm8HQWNjZXR0bwdSaWZpdXRvBlN0YW1wYQtSZWdpc3RyYS4uLn9TZSBhY2NldHRpIGxlIGNvbmRpemlvbmkgZGkgcXVlc3RhIGxpY2VuemEsIGZhaSBjbGljIHN1ICJBY2NldHRvIiBwZXIgaW5zdGFsbGFyZSBpbCBzb2Z0d2FyZS4gQWx0cmltZW50aSBmYWkgY2xpYyBzdSAiUmlmaXV0byIu</data>
-			<key>ID</key>
-			<string>5005</string>
-			<key>Name</key>
-			<string>Italian</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYISmFwYW5lc2UKk6+I04K1gtyCtwyTr4jTgrWC3IK5gvEIiPON/IK3gukHlduRti4uLrSWe4Ncg3SDZ4NFg0eDQY5nl3CLlpH4jF+W8YLMj/CMj4LJk6+I04KzguqC6Y/qjYeCyYLNgUGDXIN0g2eDRYNHg0GC8INDg5ODWINngVuDi4K3gumCvYLfgsmBdZOviNOCtYLcgreBdoLwiZ+CtYLEgq2CvoKzgqKBQoFAk6+I04KzguqCyIKij+qNh4LJgs2BQYF1k6+I04K1gtyCuYLxgXaC8ImfgrWCxIKtgr6Cs4KigUI=</data>
-			<key>ID</key>
-			<string>5006</string>
-			<key>Name</key>
 			<string>Japanese</string>
 		</dict>
 		<dict>
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>AAYKTmVkZXJsYW5kcwJKYQNOZWUFUHJpbnQJQmV3YWFyLi4upEluZGllbiB1IGFra29vcmQgZ2FhdCBtZXQgZGUgdm9vcndhYXJkZW4gdmFuIGRlemUgbGljZW50aWUsIGt1bnQgdSBvcCAnSmEnIGtsaWtrZW4gb20gZGUgcHJvZ3JhbW1hdHV1ciB0ZSBpbnN0YWxsZXJlbi4gSW5kaWVuIHUgbmlldCBha2tvb3JkIGdhYXQsIGtsaWt0IHUgb3AgJ05lZScu</data>
+			<data>
+			STR_DATA_SIMPLIFIED_CHINESE
+			</data>
 			<key>ID</key>
-			<string>5007</string>
+			<string>5003</string>
 			<key>Name</key>
-			<string>Dutch</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYGU3ZlbnNrCEdvZGuKbm5zBkF2YppqcwhTa3JpdiB1dAhTcGFyYS4uLpNPbSBEdSBnb2Rrim5uZXIgbGljZW5zdmlsbGtvcmVuIGtsaWNrYSBwjCAiR29ka4pubnMiIGaaciBhdHQgaW5zdGFsbGVyYSBwcm9ncmFtcHJvZHVrdGVuLiBPbSBEdSBpbnRlIGdvZGuKbm5lciBsaWNlbnN2aWxsa29yZW4sIGtsaWNrYSBwjCAiQXZimmpzIi4=</data>
-			<key>ID</key>
-			<string>5008</string>
-			<key>Name</key>
-			<string>Swedish</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYRUG9ydHVndZBzLCBCcmFzaWwJQ29uY29yZGFyCURpc2NvcmRhcghJbXByaW1pcglTYWx2YXIuLi6MU2UgZXN0hyBkZSBhY29yZG8gY29tIG9zIHRlcm1vcyBkZXN0YSBsaWNlbo1hLCBwcmVzc2lvbmUgIkNvbmNvcmRhciIgcGFyYSBpbnN0YWxhciBvIHNvZnR3YXJlLiBTZSBui28gZXN0hyBkZSBhY29yZG8sIHByZXNzaW9uZSAiRGlzY29yZGFyIi4=</data>
-			<key>ID</key>
-			<string>5009</string>
-			<key>Name</key>
-			<string>Brazilian Portuguese</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYSU2ltcGxpZmllZCBDaGluZXNlBM2s0uIGsrvNrNLiBLTy06EGtOa0oqGtVMjnufvE+s2s0uKxvtDtv8nQrdLptcTM9b/uo6zH67C0obDNrNLiobHAtLCy17C0y8jtvP6ho8jnufvE+rK7zazS4qOsx+uwtKGwsrvNrNLiobGhow==</data>
-			<key>ID</key>
-			<string>5010</string>
-			<key>Name</key>
-			<string>Simplified Chinese</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYTVHJhZGl0aW9uYWwgQ2hpbmVzZQSmULdOBqSjplC3TgSmQ6ZMBsB4pnOhS1CmcKpHsXqmULdOpbuzXKVpw9K4zKq6sfi02qFBvdCr9qGnplC3TqGopUimd7jLs27F6aFDpnCqR6SjplC3TqFBvdCr9qGnpKOmULdOoaihQw==</data>
-			<key>ID</key>
-			<string>5011</string>
-			<key>Name</key>
-			<string>Traditional Chinese</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYFRGFuc2sERW5pZwVVZW5pZwdVZHNrcml2CkFya2l2ZXIuLi6YSHZpcyBkdSBhY2NlcHRlcmVyIGJldGluZ2Vsc2VybmUgaSBsaWNlbnNhZnRhbGVuLCBza2FsIGR1IGtsaWtrZSBwjCDSRW5pZ9MgZm9yIGF0IGluc3RhbGxlcmUgc29mdHdhcmVuLiBLbGlrIHCMINJVZW5pZ9MgZm9yIGF0IGFubnVsbGVyZSBpbnN0YWxsZXJpbmdlbi4=</data>
-			<key>ID</key>
-			<string>5012</string>
-			<key>Name</key>
-			<string>Danish</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYFU3VvbWkISHl2imtzeW4KRW4gaHl2imtzeQdUdWxvc3RhCVRhbGxlbm5hyW9IeXaKa3N5IGxpc2Vuc3Npc29waW11a3NlbiBlaGRvdCBvc29pdHRhbWFsbGEg1Uh5doprc3nVLiBKb3MgZXQgaHl2imtzeSBzb3BpbXVrc2VuIGVodG9qYSwgb3NvaXRhINVFbiBoeXaKa3N51S4=</data>
-			<key>ID</key>
-			<string>5013</string>
-			<key>Name</key>
-			<string>Finnish</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYRRnJhbo1haXMgY2FuYWRpZW4IQWNjZXB0ZXIHUmVmdXNlcghJbXByaW1lcg5FbnJlZ2lzdHJlci4uLrpTaSB2b3VzIGFjY2VwdGV6IGxlcyB0ZXJtZXMgZGUgbGEgcHKOc2VudGUgbGljZW5jZSwgY2xpcXVleiBzdXIgIkFjY2VwdGVyIiBhZmluIGQnaW5zdGFsbGVyIGxlIGxvZ2ljaWVsLiBTaSB2b3VzIG4nkHRlcyBwYXMgZCdhY2NvcmQgYXZlYyBsZXMgdGVybWVzIGRlIGxhIGxpY2VuY2UsIGNsaXF1ZXogc3VyICJSZWZ1c2VyIi4=</data>
-			<key>ID</key>
-			<string>5014</string>
-			<key>Name</key>
-			<string>French Canadian</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYGS29yZWFuBLW/wMcJtb/AxyC+yMfUBsfBuLDGrgfA+sDlLi4ufrvnv+sgsOi+4LytwMcgs7u/67+hILW/wMfHz7jpLCAitb/AxyIgtNzD37imILStt68gvNLHwcauv/6+7rimILyzxKHHz73KvcO/wC4gtb/Ax8fPwfYgvsq0wrTZuOksICK1v8DHIL7Ix9QiILTcw9+4piC0qbijvcq9w7/ALg==</data>
-			<key>ID</key>
-			<string>5015</string>
-			<key>Name</key>
-			<string>Korean</string>
-		</dict>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0000</string>
-			<key>Data</key>
-			<data>AAYFTm9yc2sERW5pZwlJa2tlIGVuaWcIU2tyaXYgdXQKQXJraXZlci4uLqNIdmlzIERlIGVyIGVuaWcgaSBiZXN0ZW1tZWxzZW5lIGkgZGVubmUgbGlzZW5zYXZ0YWxlbiwga2xpa2tlciBEZSBwjCAiRW5pZyIta25hcHBlbiBmb3IgjCBpbnN0YWxsZXJlIHByb2dyYW12YXJlbi4gSHZpcyBEZSBpa2tlIGVyIGVuaWcsIGtsaWtrZXIgRGUgcIwgIklra2UgZW5pZyIu</data>
-			<key>ID</key>
-			<string>5016</string>
-			<key>Name</key>
-			<string>Norwegian</string>
+			<string>Chinese (Simplified)</string>
 		</dict>
 	</array>
 	<key>TEXT</key>
@@ -194,50 +75,49 @@
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>APPLICATION_LICENSE_TEXT</data>
+			<data>
+			APPLICATION_LICENSE_TEXT
+			</data>
 			<key>ID</key>
 			<string>5000</string>
 			<key>Name</key>
-			<string>English SLA</string>
+			<string>English (United States) SLA</string>
+		</dict>
+				<dict>
+			<key>Attributes</key>
+			<string>0x0000</string>
+			<key>Data</key>
+			<data>
+			APPLICATION_LICENSE_TEXT
+			</data>
+			<key>ID</key>
+			<string>5001</string>
+			<key>Name</key>
+			<string>German SLA</string>
 		</dict>
-	</array>
-	<key>TMPL</key>
-	<array>
 		<dict>
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>E0RlZmF1bHQgTGFuZ3VhZ2UgSUREV1JEBUNvdW50T0NOVAQqKioqTFNUQwtzeXMgbGFuZyBJRERXUkQebG9jYWwgcmVzIElEIChvZmZzZXQgZnJvbSA1MDAwRFdSRBAyLWJ5dGUgbGFuZ3VhZ2U/RFdSRAQqKioqTFNURQ==</data>
+			<data>
+			APPLICATION_LICENSE_TEXT
+			</data>
 			<key>ID</key>
-			<string>128</string>
+			<string>5002</string>
 			<key>Name</key>
-			<string>LPic</string>
+			<string>Japanese SLA</string>
 		</dict>
-	</array>
-	<key>plst</key>
-	<array>
-		<dict>
-			<key>Attributes</key>
-			<string>0x0050</string>
-			<key>Data</key>
-			<data>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</data>
-			<key>ID</key>
-			<string>0</string>
-			<key>Name</key>
-			<string></string>
-		</dict>
-	</array>
-	<key>styl</key>
-	<array>
 		<dict>
 			<key>Attributes</key>
 			<string>0x0000</string>
 			<key>Data</key>
-			<data>AAMAAAAAAAwACQAUAAAAAAAAAAAAAAAAACcADAAJABQBAAAAAAAAAAAAAAAAKgAMAAkAFAAAAAAAAAAAAAA=</data>
+			<data>
+			APPLICATION_LICENSE_TEXT
+			</data>
 			<key>ID</key>
-			<string>5000</string>
+			<string>5003</string>
 			<key>Name</key>
-			<string>English SLA</string>
+			<string>Chinese (Simplified) SLA</string>
 		</dict>
 	</array>
 </dict>
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
index 6896668ffdc..9d5407524a8 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package jdk.jpackage.internal;
 import static jdk.jpackage.internal.I18N.buildConfigException;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +45,7 @@ import jdk.jpackage.internal.model.LauncherIcon;
 import jdk.jpackage.internal.model.LauncherStartupInfo;
 import jdk.jpackage.internal.model.ResourceDirLauncherIcon;
 import jdk.jpackage.internal.model.RuntimeBuilder;
+import jdk.jpackage.internal.util.RootedPath;
 
 final class ApplicationBuilder {
 
@@ -65,8 +67,8 @@ final class ApplicationBuilder {
                 Optional.ofNullable(version).orElseGet(DEFAULTS::version),
                 Optional.ofNullable(vendor).orElseGet(DEFAULTS::vendor),
                 Optional.ofNullable(copyright).orElseGet(DEFAULTS::copyright),
-                Optional.ofNullable(srcDir),
-                Optional.ofNullable(contentDirs).orElseGet(List::of),
+                Optional.ofNullable(appDirSources).orElseGet(List::of),
+                Optional.ofNullable(contentDirSources).orElseGet(List::of),
                 appImageLayout,
                 Optional.ofNullable(runtimeBuilder),
                 launchersAsList,
@@ -126,13 +128,13 @@ final class ApplicationBuilder {
         return this;
     }
 
-    ApplicationBuilder srcDir(Path v) {
-        srcDir = v;
+    ApplicationBuilder appDirSources(Collection<RootedPath> v) {
+        appDirSources = v;
         return this;
     }
 
-    ApplicationBuilder contentDirs(List<Path> v) {
-        contentDirs = v;
+    ApplicationBuilder contentDirSources(Collection<RootedPath> v) {
+        contentDirSources = v;
         return this;
     }
 
@@ -246,8 +248,8 @@ final class ApplicationBuilder {
                 app.version(),
                 app.vendor(),
                 app.copyright(),
-                app.srcDir(),
-                app.contentDirs(),
+                app.appDirSources(),
+                app.contentDirSources(),
                 Objects.requireNonNull(appImageLayout),
                 app.runtimeBuilder(),
                 app.launchers(),
@@ -294,9 +296,9 @@ final class ApplicationBuilder {
     private String version;
     private String vendor;
     private String copyright;
-    private Path srcDir;
+    private Collection<RootedPath> appDirSources;
     private ExternalApplication externalApp;
-    private List<Path> contentDirs;
+    private Collection<RootedPath> contentDirSources;
     private AppImageLayout appImageLayout;
     private RuntimeBuilder runtimeBuilder;
     private ApplicationLaunchers launchers;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
index 3d2ffbfdc7c..5edc4d69c81 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ApplicationImageUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,14 @@
 
 package jdk.jpackage.internal;
 
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
-
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
 import jdk.jpackage.internal.PackagingPipeline.ApplicationImageTaskAction;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
@@ -45,7 +40,7 @@ import jdk.jpackage.internal.model.CustomLauncherIcon;
 import jdk.jpackage.internal.model.DefaultLauncherIcon;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.ResourceDirLauncherIcon;
-import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.RootedPath;
 
 
 final class ApplicationImageUtils {
@@ -86,21 +81,14 @@ final class ApplicationImageUtils {
         };
     }
 
-    static ApplicationImageTaskAction<Application, ApplicationLayout> createCopyContentAction(Supplier<List<Path>> excludeCopyDirs) {
+    static ApplicationImageTaskAction<Application, ApplicationLayout> createCopyContentAction() {
         return env -> {
-            var excludeCandidates = Stream.concat(
-                    excludeCopyDirs.get().stream(),
-                    Stream.of(env.env().buildRoot(), env.env().appImageDir())
-            ).map(Path::toAbsolutePath).toList();
-
-            env.app().srcDir().ifPresent(toConsumer(srcDir -> {
-                copyRecursive(srcDir, env.resolvedLayout().appDirectory(), excludeCandidates);
-            }));
-
-            for (var srcDir : env.app().contentDirs()) {
-                copyRecursive(srcDir,
-                        env.resolvedLayout().contentDirectory().resolve(srcDir.getFileName()),
-                        excludeCandidates);
+            for (var e : List.of(
+                    Map.entry(env.app().appDirSources(), env.resolvedLayout().appDirectory()),
+                    Map.entry(env.app().contentDirSources(), env.resolvedLayout().contentDirectory())
+            )) {
+                RootedPath.copy(e.getKey().stream(), e.getValue(),
+                        StandardCopyOption.REPLACE_EXISTING, LinkOption.NOFOLLOW_LINKS);
             }
         };
     }
@@ -126,21 +114,4 @@ final class ApplicationImageUtils {
             }
         };
     }
-
-    private static void copyRecursive(Path srcDir, Path dstDir, List<Path> excludeDirs) throws IOException {
-        srcDir = srcDir.toAbsolutePath();
-
-        List<Path> excludes = new ArrayList<>();
-
-        for (var path : excludeDirs) {
-            if (Files.isDirectory(path)) {
-                if (path.startsWith(srcDir) && !Files.isSameFile(path, srcDir)) {
-                    excludes.add(path);
-                }
-            }
-        }
-
-        FileUtils.copyRecursive(srcDir, dstDir.toAbsolutePath(), excludes,
-                LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING);
-    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
index 9cb9fb5cba0..7958dcdef2d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/CfgFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,21 +124,19 @@ final class CfgFile {
         Files.write(cfgFile, (Iterable<String>) lines::iterator);
     }
 
-    private record Referencies(Path appModsDirectory) {
+    private record Referencies(Path appModsDirectory, Path appDirectory) {
 
         Referencies {
-            if (!appModsDirectory.startsWith(appDirectory())) {
+            if (!appModsDirectory.startsWith(appDirectory)) {
                 throw new IllegalArgumentException();
             }
         }
 
         Referencies(ApplicationLayout appLayout) {
-            this(Path.of("$APPDIR").resolve(appLayout.appModsDirectory().getFileName()));
+            this(BASEDIR.resolve(appLayout.appModsDirectory().getFileName()), BASEDIR);
         }
 
-        Path appDirectory() {
-            return Path.of("$APPDIR");
-        }
+        private static final Path BASEDIR = Path.of("$APPDIR");
     }
 
     private final LauncherStartupInfo startupInfo;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
index e4473b1e5ce..fc51f60aa66 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DefaultBundlingEnvironment.java
@@ -25,6 +25,7 @@
 package jdk.jpackage.internal;
 
 import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.util.MemoizingSupplier.runOnce;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -36,23 +37,21 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
 import jdk.jpackage.internal.cli.CliBundlingEnvironment;
 import jdk.jpackage.internal.cli.Options;
 import jdk.jpackage.internal.cli.StandardBundlingOperation;
-import jdk.jpackage.internal.model.AppImagePackageType;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.BundlingOperationDescriptor;
 import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.Package;
-import jdk.jpackage.internal.model.PackageType;
-import jdk.jpackage.internal.model.StandardPackageType;
+import jdk.jpackage.internal.util.MemoizingSupplier;
+import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.Result;
 
 class DefaultBundlingEnvironment implements CliBundlingEnvironment {
@@ -68,7 +67,7 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
             return runOnce(e.getValue());
         }));
 
-        this.defaultOperationSupplier = Objects.requireNonNull(defaultOperationSupplier).map(DefaultBundlingEnvironment::runOnce);
+        this.defaultOperationSupplier = Objects.requireNonNull(defaultOperationSupplier).map(MemoizingSupplier::runOnce);
     }
 
 
@@ -112,10 +111,6 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
         return new Builder();
     }
 
-    static <T> Supplier<T> runOnce(Supplier<T> supplier) {
-        return new CachingSupplier<>(supplier);
-    }
-
     static <T extends SystemEnvironment> Supplier<Result<Consumer<Options>>> createBundlerSupplier(
             Supplier<Result<T>> sysEnvResultSupplier, BiConsumer<Options, T> bundler) {
         Objects.requireNonNull(sysEnvResultSupplier);
@@ -134,7 +129,9 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
         Objects.requireNonNull(app);
         Objects.requireNonNull(pipelineBuilder);
 
-        final var outputDir = OptionUtils.outputDir(options).resolve(app.appImageDirName());
+        final var outputDir = PathUtils.normalizedAbsolutePath(OptionUtils.outputDir(options).resolve(app.appImageDirName()));
+
+        Log.verbose(I18N.getString("message.create-app-image"));
 
         IOUtils.writableOutputDir(outputDir.getParent());
 
@@ -142,14 +139,13 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
                 .predefinedAppImageLayout(app.asApplicationLayout().orElseThrow())
                 .create(options, app);
 
-        Log.verbose(I18N.format("message.creating-app-bundle", outputDir.getFileName(), outputDir.toAbsolutePath().getParent()));
-
         if (Files.exists(outputDir)) {
-            throw new JPackageException(I18N.format("error.root-exists", outputDir.toAbsolutePath()));
+            throw new JPackageException(I18N.format("error.root-exists", outputDir));
         }
 
-        pipelineBuilder.excludeDirFromCopying(outputDir.getParent())
-                .create().execute(BuildEnv.withAppImageDir(env, outputDir), app);
+        pipelineBuilder.create().execute(BuildEnv.withAppImageDir(env, outputDir), app);
+
+        Log.verbose(I18N.getString("message.app-image-created"));
     }
 
     static <T extends Package> void createNativePackage(Options options,
@@ -174,11 +170,20 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
         Objects.requireNonNull(createPipelineBuilder);
         Objects.requireNonNull(pipelineBuilderMutatorFactory);
 
+        var pipelineBuilder = Objects.requireNonNull(createPipelineBuilder.apply(pkg));
+
+        // Delete an old output package file (if any) before creating a new one.
+        pipelineBuilder.task(PackageTaskID.DELETE_OLD_PACKAGE_FILE)
+                .addDependencies(pipelineBuilder.taskGraphSnapshot().getTailsOf(PackageTaskID.CREATE_PACKAGE_FILE))
+                .addDependent(PackageTaskID.CREATE_PACKAGE_FILE)
+                .packageAction(PackagingPipeline::deleteOutputBundle)
+                .add();
+
         Packager.<T>build().pkg(pkg)
-            .outputDir(OptionUtils.outputDir(options))
-            .env(Objects.requireNonNull(createBuildEnv.apply(options, pkg)))
-            .pipelineBuilderMutatorFactory(pipelineBuilderMutatorFactory)
-            .execute(Objects.requireNonNull(createPipelineBuilder.apply(pkg)));
+                .outputDir(OptionUtils.outputDir(options))
+                .env(Objects.requireNonNull(createBuildEnv.apply(options, pkg)))
+                .pipelineBuilderMutatorFactory(pipelineBuilderMutatorFactory)
+                .execute(pipelineBuilder);
     }
 
     @Override
@@ -190,15 +195,11 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
     public void createBundle(BundlingOperationDescriptor op, Options cmdline) {
         final var bundler = getBundlerSupplier(op).get().orElseThrow();
         Optional<Path> permanentWorkDirectory = Optional.empty();
-        try (var tempDir = new TempDirectory(cmdline)) {
+        try (var tempDir = new TempDirectory(cmdline, Globals.instance().objectFactory())) {
             if (!tempDir.deleteOnClose()) {
                 permanentWorkDirectory = Optional.of(tempDir.path());
             }
-            bundler.accept(tempDir.options());
-
-            var packageType = OptionUtils.bundlingOperation(cmdline).packageType();
-
-            Log.verbose(I18N.format("message.bundle-created", I18N.getString(bundleTypeDescription(packageType, op.os()))));
+            bundler.accept(tempDir.map(cmdline));
         } catch (IOException ex) {
             throw new UncheckedIOException(ex);
         } finally {
@@ -219,74 +220,6 @@ class DefaultBundlingEnvironment implements CliBundlingEnvironment {
         });
     }
 
-    private String bundleTypeDescription(PackageType type, OperatingSystem os) {
-        switch (type) {
-            case StandardPackageType stdType -> {
-                switch (stdType) {
-                    case WIN_MSI -> {
-                        return "bundle-type.win-msi";
-                    }
-                    case WIN_EXE -> {
-                        return "bundle-type.win-exe";
-                    }
-                    case LINUX_DEB -> {
-                        return "bundle-type.linux-deb";
-                    }
-                    case LINUX_RPM -> {
-                        return "bundle-type.linux-rpm";
-                    }
-                    case MAC_DMG -> {
-                        return "bundle-type.mac-dmg";
-                    }
-                    case MAC_PKG -> {
-                        return "bundle-type.mac-pkg";
-                    }
-                    default -> {
-                        throw new AssertionError();
-                    }
-                }
-            }
-            case AppImagePackageType appImageType -> {
-                switch (os) {
-                    case WINDOWS -> {
-                        return "bundle-type.win-app";
-                    }
-                    case LINUX -> {
-                        return "bundle-type.linux-app";
-                    }
-                    case MACOS -> {
-                        return "bundle-type.mac-app";
-                    }
-                    default -> {
-                        throw new AssertionError();
-                    }
-                }
-            }
-            default -> {
-                throw new AssertionError();
-            }
-        }
-    }
-
-
-    private static final class CachingSupplier<T> implements Supplier<T> {
-
-        CachingSupplier(Supplier<T> getter) {
-            this.getter = Objects.requireNonNull(getter);
-        }
-
-        @Override
-        public T get() {
-            return cachedValue.updateAndGet(v -> {
-                return Optional.ofNullable(v).orElseGet(getter);
-            });
-        }
-
-        private final Supplier<T> getter;
-        private final AtomicReference<T> cachedValue = new AtomicReference<>();
-    }
-
-
     private final Map<BundlingOperationDescriptor, Supplier<Result<Consumer<Options>>>> bundlers;
     private final Optional<Supplier<Optional<BundlingOperationDescriptor>>> defaultOperationSupplier;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java
index ca7a630b6d1..f9ccec7e3bb 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Executor.java
@@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.UnaryOperator;
 import java.util.spi.ToolProvider;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.model.ExecutableAttributesWithCapturedOutput;
 import jdk.jpackage.internal.util.CommandLineFormat;
 import jdk.jpackage.internal.util.CommandOutputControl;
 import jdk.jpackage.internal.util.CommandOutputControl.ProcessAttributes;
@@ -48,7 +49,7 @@ import jdk.jpackage.internal.util.CommandOutputControl.Result;
 import jdk.jpackage.internal.util.RetryExecutor;
 import jdk.jpackage.internal.util.function.ExceptionBox;
 
-final class Executor {
+public final class Executor {
 
     static Executor of(String... cmdline) {
         return of(List.of(cmdline));
@@ -77,118 +78,118 @@ final class Executor {
         mapper = other.mapper;
     }
 
-    Executor saveOutput(boolean v) {
+    public Executor saveOutput(boolean v) {
         commandOutputControl.saveOutput(v);
         return this;
     }
 
-    Executor saveOutput() {
+    public Executor saveOutput() {
         return saveOutput(true);
     }
 
-    Executor saveFirstLineOfOutput() {
+    public Executor saveFirstLineOfOutput() {
         commandOutputControl.saveFirstLineOfOutput();
         return this;
     }
 
-    Executor charset(Charset v) {
+    public Executor charset(Charset v) {
         commandOutputControl.charset(v);
         return this;
     }
 
-    Executor storeOutputInFiles(boolean v) {
+    public Executor storeOutputInFiles(boolean v) {
         commandOutputControl.storeOutputInFiles(v);
         return this;
     }
 
-    Executor storeOutputInFiles() {
+    public Executor storeOutputInFiles() {
         return storeOutputInFiles(true);
     }
 
-    Executor binaryOutput(boolean v) {
+    public Executor binaryOutput(boolean v) {
         commandOutputControl.binaryOutput(v);
         return this;
     }
 
-    Executor binaryOutput() {
+    public Executor binaryOutput() {
         return binaryOutput(true);
     }
 
-    Executor discardStdout(boolean v) {
+    public Executor discardStdout(boolean v) {
         commandOutputControl.discardStdout(v);
         return this;
     }
 
-    Executor discardStdout() {
+    public Executor discardStdout() {
         return discardStdout(true);
     }
 
-    Executor discardStderr(boolean v) {
+    public Executor discardStderr(boolean v) {
         commandOutputControl.discardStderr(v);
         return this;
     }
 
-    Executor discardStderr() {
+    public Executor discardStderr() {
         return discardStderr(true);
     }
 
-    Executor timeout(long v, TimeUnit unit) {
+    public Executor timeout(long v, TimeUnit unit) {
         return timeout(Duration.of(v, unit.toChronoUnit()));
     }
 
-    Executor timeout(Duration v) {
+    public Executor timeout(Duration v) {
         timeout = v;
         return this;
     }
 
-    Executor toolProvider(ToolProvider v) {
+    public Executor toolProvider(ToolProvider v) {
         toolProvider = Objects.requireNonNull(v);
         processBuilder = null;
         return this;
     }
 
-    Optional<ToolProvider> toolProvider() {
+    public Optional<ToolProvider> toolProvider() {
         return Optional.ofNullable(toolProvider);
     }
 
-    Executor processBuilder(ProcessBuilder v) {
+    public Executor processBuilder(ProcessBuilder v) {
         processBuilder = Objects.requireNonNull(v);
         toolProvider = null;
         return this;
     }
 
-    Optional<ProcessBuilder> processBuilder() {
+    public Optional<ProcessBuilder> processBuilder() {
         return Optional.ofNullable(processBuilder);
     }
 
-    Executor args(List<String> v) {
+    public Executor args(List<String> v) {
         args.addAll(v);
         return this;
     }
 
-    Executor args(String... args) {
+    public Executor args(String... args) {
         return args(List.of(args));
     }
 
-    List<String> args() {
+    public List<String> args() {
         return args;
     }
 
-    Executor setQuiet(boolean v) {
+    public Executor setQuiet(boolean v) {
         quietCommand = v;
         return this;
     }
 
-    Executor mapper(UnaryOperator<Executor> v) {
+    public Executor mapper(UnaryOperator<Executor> v) {
         mapper = v;
         return this;
     }
 
-    Optional<UnaryOperator<Executor>> mapper() {
+    public Optional<UnaryOperator<Executor>> mapper() {
         return Optional.ofNullable(mapper);
     }
 
-    Executor copy() {
+    public Executor copy() {
         return new Executor(this);
     }
 
@@ -211,17 +212,11 @@ final class Executor {
             throw new IllegalStateException("No target to execute");
         }
 
-        PrintableOutputBuilder printableOutputBuilder;
-        if (dumpOutput()) {
-            printableOutputBuilder = new PrintableOutputBuilder(coc);
-        } else {
-            printableOutputBuilder = null;
-        }
-
         if (dumpOutput()) {
             Log.verbose(String.format("Running %s", CommandLineFormat.DEFAULT.apply(List.of(commandLine().getFirst()))));
         }
 
+        var printableOutputBuilder = new PrintableOutputBuilder(coc);
         Result result;
         try {
             if (timeout == null) {
@@ -233,11 +228,12 @@ final class Executor {
             throw ExceptionBox.toUnchecked(ex);
         }
 
+        var printableOutput = printableOutputBuilder.create();
         if (dumpOutput()) {
-            log(result, printableOutputBuilder.create());
+            log(result, printableOutput);
         }
 
-        return result;
+        return ExecutableAttributesWithCapturedOutput.augmentResultWithOutput(result, printableOutput);
     }
 
     Result executeExpectSuccess() throws IOException {
@@ -265,7 +261,7 @@ final class Executor {
         });
     }
 
-    List<String> commandLine() {
+    public List<String> commandLine() {
         if (processBuilder != null) {
             return Stream.of(processBuilder.command(), args).flatMap(Collection::stream).toList();
         } else if (toolProvider != null) {
@@ -309,7 +305,7 @@ final class Executor {
         pid.ifPresent(p -> {
             sb.append(" [PID: ").append(p).append("]");
         });
-        sb.append(":\n    ").append(result.execAttrs());
+        sb.append(":\n    ").append(result.execAttrs().printableCommandLine());
         Log.verbose(sb.toString());
 
         if (!printableOutput.isEmpty()) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ExecutorFactory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ExecutorFactory.java
index ce703358b82..82d81d1052e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ExecutorFactory.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ExecutorFactory.java
@@ -25,9 +25,9 @@
 package jdk.jpackage.internal;
 
 @FunctionalInterface
-interface ExecutorFactory {
+public interface ExecutorFactory {
 
     Executor executor();
 
-    static final ExecutorFactory DEFAULT = Executor::new;
+    public static final ExecutorFactory DEFAULT = Executor::new;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
index 6b74cab4e65..cccd05792d6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/FromOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@ import static jdk.jpackage.internal.cli.StandardOption.RESOURCE_DIR;
 import static jdk.jpackage.internal.cli.StandardOption.VENDOR;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -60,6 +61,7 @@ import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.LauncherModularStartupInfo;
 import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.model.RuntimeLayout;
+import jdk.jpackage.internal.util.RootedPath;
 
 final class FromOptions {
 
@@ -168,8 +170,15 @@ final class FromOptions {
         APP_VERSION.ifPresentIn(options, appBuilder::version);
         VENDOR.ifPresentIn(options, appBuilder::vendor);
         COPYRIGHT.ifPresentIn(options, appBuilder::copyright);
-        INPUT.ifPresentIn(options, appBuilder::srcDir);
-        APP_CONTENT.ifPresentIn(options, appBuilder::contentDirs);
+        INPUT.ifPresentIn(options, appBuilder::appDirSources);
+        APP_CONTENT.findIn(options).map((List<Collection<RootedPath>> v) -> {
+            // Reverse the order of content sources.
+            // If there are multiple source files for the same
+            // destination file, only the first will be used.
+            // Reversing the order of content sources makes it use the last file
+            // from the original list of source files for the given destination file.
+            return v.reversed().stream().flatMap(Collection::stream).toList();
+        }).ifPresent(appBuilder::contentDirSources);
 
         if (isRuntimeInstaller) {
             appBuilder.appImageLayout(runtimeLayout);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Globals.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Globals.java
index c1b56b24e0a..d5c714d1a47 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Globals.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Globals.java
@@ -24,6 +24,7 @@
  */
 package jdk.jpackage.internal;
 
+import java.io.PrintWriter;
 import java.util.Optional;
 import java.util.function.Supplier;
 
@@ -32,20 +33,32 @@ public final class Globals {
     private Globals() {
     }
 
-    Globals objectFactory(ObjectFactory v) {
+    public Globals objectFactory(ObjectFactory v) {
         checkMutable();
         objectFactory = Optional.ofNullable(v).orElse(ObjectFactory.DEFAULT);
         return this;
     }
 
-    ObjectFactory objectFactory() {
+    public ObjectFactory objectFactory() {
         return objectFactory;
     }
 
-    Globals executorFactory(ExecutorFactory v) {
+    public Globals executorFactory(ExecutorFactory v) {
         return objectFactory(ObjectFactory.build(objectFactory).executorFactory(v).create());
     }
 
+    Log.Logger logger() {
+        return logger;
+    }
+
+    public void loggerOutputStreams(PrintWriter out, PrintWriter err) {
+        logger.setPrintWriter(out, err);
+    }
+
+    public void loggerVerbose() {
+        logger.setVerbose();
+    }
+
     public static int main(Supplier<Integer> mainBody) {
         if (INSTANCE.isBound()) {
             return mainBody.get();
@@ -65,6 +78,7 @@ public final class Globals {
     }
 
     private ObjectFactory objectFactory = ObjectFactory.DEFAULT;
+    private final Log.Logger logger = new Log.Logger();
 
     private static final ScopedValue<Globals> INSTANCE = ScopedValue.newInstance();
     private static final Globals DEFAULT = new Globals();
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
index ed030a4a726..1ba384dba2d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherFromOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,10 +51,12 @@ import jdk.jpackage.internal.FileAssociationGroup.FileAssociationNoMimesExceptio
 import jdk.jpackage.internal.cli.Options;
 import jdk.jpackage.internal.cli.StandardFaOption;
 import jdk.jpackage.internal.model.CustomLauncherIcon;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.DefaultLauncherIcon;
 import jdk.jpackage.internal.model.FileAssociation;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.LauncherIcon;
+import jdk.jpackage.internal.util.RootedPath;
 
 final class LauncherFromOptions {
 
@@ -91,7 +93,9 @@ final class LauncherFromOptions {
         if (PREDEFINED_APP_IMAGE.findIn(options).isEmpty()) {
             final var startupInfoBuilder = new LauncherStartupInfoBuilder();
 
-            INPUT.ifPresentIn(options, startupInfoBuilder::inputDir);
+            INPUT.findIn(options).flatMap(v -> {
+                return v.stream().findAny().map(RootedPath::root);
+            }).ifPresent(startupInfoBuilder::inputDir);
             ARGUMENTS.ifPresentIn(options, startupInfoBuilder::defaultParameters);
             JAVA_OPTIONS.ifPresentIn(options, startupInfoBuilder::javaOptions);
             MAIN_JAR.ifPresentIn(options, startupInfoBuilder::mainJar);
@@ -130,8 +134,7 @@ final class LauncherFromOptions {
                         .advice("error.no-content-types-for-file-association.advice", faID)
                         .create();
             } catch (FileAssociationNoExtensionsException ex) {
-                // TODO: Must do something about this condition!
-                throw new AssertionError();
+                throw new JPackageException(I18N.format("error.no-extensions-for-file-association", faID));
             } catch (FileAssociationException ex) {
                 // Should never happen
                 throw new UnsupportedOperationException(ex);
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java
index 0f51fa166f9..5c27ef67500 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Log.java
@@ -61,16 +61,6 @@ public class Log {
             this.err = err;
         }
 
-        public void flush() {
-            if (out != null) {
-                out.flush();
-            }
-
-            if (err != null) {
-                err.flush();
-            }
-        }
-
         public void info(String msg) {
             if (out != null) {
                 out.println(msg);
@@ -111,46 +101,27 @@ public class Log {
         }
     }
 
-    private static final InheritableThreadLocal<Logger> instance =
-            new InheritableThreadLocal<Logger>() {
-                @Override protected Logger initialValue() {
-                    return new Logger();
-                }
-            };
-
-    public static void setPrintWriter (PrintWriter out, PrintWriter err) {
-        instance.get().setPrintWriter(out, err);
-    }
-
-    public static void flush() {
-        instance.get().flush();
-    }
-
     public static void info(String msg) {
-        instance.get().info(msg);
+        Globals.instance().logger().info(msg);
     }
 
     public static void fatalError(String msg) {
-        instance.get().fatalError(msg);
+        Globals.instance().logger().fatalError(msg);
     }
 
     public static void error(String msg) {
-        instance.get().error(msg);
-    }
-
-    public static void setVerbose() {
-        instance.get().setVerbose();
+        Globals.instance().logger().error(msg);
     }
 
     public static boolean isVerbose() {
-        return instance.get().isVerbose();
+        return Globals.instance().logger().isVerbose();
     }
 
     public static void verbose(String msg) {
-       instance.get().verbose(msg);
+        Globals.instance().logger().verbose(msg);
     }
 
     public static void verbose(Throwable t) {
-       instance.get().verbose(t);
+        Globals.instance().logger().verbose(t);
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ObjectFactory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ObjectFactory.java
index f1a83eb9eab..b6a95ae539b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ObjectFactory.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/ObjectFactory.java
@@ -28,38 +28,38 @@ import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.util.CompositeProxy;
 
-interface ObjectFactory extends ExecutorFactory, RetryExecutorFactory {
+public interface ObjectFactory extends ExecutorFactory, RetryExecutorFactory {
 
-    static ObjectFactory.Builder build() {
+    public static ObjectFactory.Builder build() {
         return new Builder();
     }
 
-    static ObjectFactory.Builder build(ObjectFactory from) {
+    public static ObjectFactory.Builder build(ObjectFactory from) {
         return build().initFrom(from);
     }
 
-    static final class Builder {
+    public static final class Builder {
         private Builder() {
         }
 
-        ObjectFactory create() {
+        public ObjectFactory create() {
             return CompositeProxy.build().invokeTunnel(CompositeProxyTunnel.INSTANCE).create(
                     ObjectFactory.class,
                     Optional.ofNullable(executorFactory).orElse(ExecutorFactory.DEFAULT),
                     Optional.ofNullable(retryExecutorFactory).orElse(RetryExecutorFactory.DEFAULT));
         }
 
-        Builder initFrom(ObjectFactory of) {
+        public Builder initFrom(ObjectFactory of) {
             Objects.requireNonNull(of);
             return executorFactory(of).retryExecutorFactory(of);
         }
 
-        Builder executorFactory(ExecutorFactory v) {
+        public Builder executorFactory(ExecutorFactory v) {
             executorFactory = v;
             return this;
         }
 
-        Builder retryExecutorFactory(RetryExecutorFactory v) {
+        public Builder retryExecutorFactory(RetryExecutorFactory v) {
             retryExecutorFactory = v;
             return this;
         }
@@ -68,5 +68,5 @@ interface ObjectFactory extends ExecutorFactory, RetryExecutorFactory {
         private RetryExecutorFactory retryExecutorFactory;
     }
 
-    static final ObjectFactory DEFAULT = build().create();
+    public static final ObjectFactory DEFAULT = build().create();
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
index 97e1274f078..b39e67a9eb7 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/OptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_APP_IMAGE;
 import static jdk.jpackage.internal.cli.StandardOption.PREDEFINED_RUNTIME_IMAGE;
 
 import java.nio.file.Path;
+import java.util.Objects;
 import jdk.jpackage.internal.cli.Options;
 import jdk.jpackage.internal.cli.StandardBundlingOperation;
 
@@ -51,4 +52,8 @@ final class OptionUtils {
     static StandardBundlingOperation bundlingOperation(Options options) {
         return StandardBundlingOperation.valueOf(BUNDLING_OPERATION_DESCRIPTOR.getFrom(options)).orElseThrow();
     }
+
+    static boolean isBundlingOperation(Options options, StandardBundlingOperation op) {
+        return bundlingOperation(options).equals(Objects.requireNonNull(op));
+    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
index c94dada9262..315e3bce0f1 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/PackagingPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@ import static java.util.stream.Collectors.toMap;
 import static jdk.jpackage.internal.model.AppImageLayout.toPathGroup;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -39,12 +39,16 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Callable;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.Application;
 import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.pipeline.DirectedEdge;
 import jdk.jpackage.internal.pipeline.FixedDAG;
@@ -97,7 +101,7 @@ final class PackagingPipeline {
     /**
      * The way to access packaging build environment before building a package in a pipeline.
      */
-    interface StartupParameters {
+    sealed interface StartupParameters {
         BuildEnv packagingEnv();
     }
 
@@ -127,6 +131,7 @@ final class PackagingPipeline {
     enum PackageTaskID implements TaskID {
         RUN_POST_IMAGE_USER_SCRIPT,
         CREATE_CONFIG_FILES,
+        DELETE_OLD_PACKAGE_FILE,
         CREATE_PACKAGE_FILE
     }
 
@@ -183,9 +188,11 @@ final class PackagingPipeline {
         void execute() throws IOException;
     }
 
-    record TaskConfig(Optional<TaskAction> action) {
+    record TaskConfig(Optional<TaskAction> action, Optional<TaskAction> beforeAction, Optional<TaskAction> afterAction) {
         TaskConfig {
             Objects.requireNonNull(action);
+            Objects.requireNonNull(beforeAction);
+            Objects.requireNonNull(afterAction);
         }
     }
 
@@ -196,47 +203,64 @@ final class PackagingPipeline {
 
         final class TaskBuilder extends TaskSpecBuilder<TaskID> {
 
-            private TaskBuilder(TaskID id) {
-                super(id);
-            }
-
-            private TaskBuilder(TaskID id, TaskConfig config) {
-                this(id);
-                config.action().ifPresent(this::setAction);
-            }
-
-            private TaskBuilder setAction(TaskAction v) {
-                action = v;
-                return this;
-            }
-
             TaskBuilder noaction() {
-                action = null;
-                return this;
+                return setAction(ActionRole.WORKLOAD, null);
             }
 
             <T extends Application, U extends ApplicationLayout> TaskBuilder applicationAction(ApplicationImageTaskAction<T, U> action) {
-                return setAction(action);
+                return applicationAction(ActionRole.WORKLOAD, action);
             }
 
             <T extends Application, U extends AppImageLayout> TaskBuilder appImageAction(AppImageTaskAction<T, U> action) {
-                return setAction(action);
+                return appImageAction(ActionRole.WORKLOAD, action);
             }
 
             <T extends Package> TaskBuilder copyAction(CopyAppImageTaskAction<T> action) {
-                return setAction(action);
+                return copyAction(ActionRole.WORKLOAD, action);
             }
 
             <T extends Package, U extends AppImageLayout> TaskBuilder packageAction(PackageTaskAction<T, U> action) {
-                return setAction(action);
+                return packageAction(ActionRole.WORKLOAD, action);
             }
 
             TaskBuilder action(NoArgTaskAction action) {
-                return setAction(action);
+                return action(ActionRole.WORKLOAD, action);
+            }
+
+            <T extends Application, U extends AppImageLayout> TaskBuilder logAppImageActionBegin(String keyId, Function<AppImageBuildEnv<T, U>, Object[]> formatArgsSupplier) {
+                return logAppImageAction(ActionRole.BEFORE, keyId, formatArgsSupplier);
+            }
+
+            <T extends Application, U extends AppImageLayout> TaskBuilder logAppImageActionEnd(String keyId, Function<AppImageBuildEnv<T, U>, Object[]> formatArgsSupplier) {
+                return logAppImageAction(ActionRole.AFTER, keyId, formatArgsSupplier);
+            }
+
+            <T extends Package, U extends AppImageLayout> TaskBuilder logPackageActionBegin(String keyId, Function<PackageBuildEnv<T, U>, Object[]> argsSupplier) {
+                return logPackageAction(ActionRole.BEFORE, keyId, argsSupplier);
+            }
+
+            <T extends Package, U extends AppImageLayout> TaskBuilder logPackageActionEnd(String keyId, Function<PackageBuildEnv<T, U>, Object[]> argsSupplier) {
+                return logPackageAction(ActionRole.AFTER, keyId, argsSupplier);
+            }
+
+            TaskBuilder logActionBegin(String keyId, Supplier<Object[]> formatArgsSupplier) {
+                return logAction(ActionRole.BEFORE, keyId, formatArgsSupplier);
+            }
+
+            TaskBuilder logActionBegin(String keyId, Object... formatArgsSupplier) {
+                return logAction(ActionRole.BEFORE, keyId, () -> formatArgsSupplier);
+            }
+
+            TaskBuilder logActionEnd(String keyId, Supplier<Object[]> formatArgsSupplier) {
+                return logAction(ActionRole.AFTER, keyId, formatArgsSupplier);
+            }
+
+            TaskBuilder logActionEnd(String keyId, Object... formatArgsSupplier) {
+                return logAction(ActionRole.AFTER, keyId, () -> formatArgsSupplier);
             }
 
             boolean hasAction() {
-                return action != null;
+                return workloadAction != null;
             }
 
             @Override
@@ -272,13 +296,109 @@ final class PackagingPipeline {
             }
 
             Builder add() {
-                final var config = new TaskConfig(Optional.ofNullable(action));
+                final var config = new TaskConfig(
+                        Optional.ofNullable(workloadAction),
+                        Optional.ofNullable(beforeAction),
+                        Optional.ofNullable(afterAction));
                 taskConfig.put(task(), config);
                 createLinks().forEach(Builder.this::linkTasks);
                 return Builder.this;
             }
 
-            private TaskAction action;
+
+            private enum ActionRole {
+                WORKLOAD(TaskBuilder::setWorkloadAction),
+                BEFORE(TaskBuilder::setBeforeAction),
+                AFTER(TaskBuilder::setAfterAction),
+                ;
+
+                ActionRole(BiConsumer<TaskBuilder, TaskAction> actionSetter) {
+                    this.actionSetter = Objects.requireNonNull(actionSetter);
+                }
+
+                TaskBuilder setAction(TaskBuilder taskBuilder, TaskAction action) {
+                    actionSetter.accept(taskBuilder, action);
+                    return taskBuilder;
+                }
+
+                private final BiConsumer<TaskBuilder, TaskAction> actionSetter;
+            }
+
+
+            private TaskBuilder(TaskID id) {
+                super(id);
+            }
+
+            private TaskBuilder(TaskID id, TaskConfig config) {
+                this(id);
+                config.action().ifPresent(this::setWorkloadAction);
+                config.beforeAction().ifPresent(this::setBeforeAction);
+                config.afterAction().ifPresent(this::setAfterAction);
+            }
+
+            private TaskBuilder setAction(ActionRole role, TaskAction v) {
+                return role.setAction(this, v);
+            }
+
+            private TaskBuilder setWorkloadAction(TaskAction v) {
+                workloadAction = v;
+                return this;
+            }
+
+            private TaskBuilder setBeforeAction(TaskAction v) {
+                beforeAction = v;
+                return this;
+            }
+
+            private TaskBuilder setAfterAction(TaskAction v) {
+                afterAction = v;
+                return this;
+            }
+
+            private <T extends Application, U extends ApplicationLayout> TaskBuilder applicationAction(ActionRole role, ApplicationImageTaskAction<T, U> action) {
+                return setAction(role, action);
+            }
+
+            private <T extends Application, U extends AppImageLayout> TaskBuilder appImageAction(ActionRole role, AppImageTaskAction<T, U> action) {
+                return setAction(role, action);
+            }
+
+            private <T extends Package> TaskBuilder copyAction(ActionRole role, CopyAppImageTaskAction<T> action) {
+                return setAction(role, action);
+            }
+
+            private <T extends Package, U extends AppImageLayout> TaskBuilder packageAction(ActionRole role, PackageTaskAction<T, U> action) {
+                return setAction(role, action);
+            }
+
+            private TaskBuilder action(ActionRole role, NoArgTaskAction action) {
+                return setAction(role, action);
+            }
+
+            private <T extends Application, U extends AppImageLayout> TaskBuilder logAppImageAction(ActionRole role, String keyId, Function<AppImageBuildEnv<T, U>, Object[]> formatArgsSupplier) {
+                Objects.requireNonNull(keyId);
+                return appImageAction(role, (AppImageBuildEnv<T, U> env) -> {
+                    Log.verbose(I18N.format(keyId, formatArgsSupplier.apply(env)));
+                });
+            }
+
+            private <T extends Package, U extends AppImageLayout> TaskBuilder logPackageAction(ActionRole role, String keyId, Function<PackageBuildEnv<T, U>, Object[]> formatArgsSupplier) {
+                Objects.requireNonNull(keyId);
+                return packageAction(role, (PackageBuildEnv<T, U> env) -> {
+                    Log.verbose(I18N.format(keyId, formatArgsSupplier.apply(env)));
+                });
+            }
+
+            private TaskBuilder logAction(ActionRole role, String keyId, Supplier<Object[]> formatArgsSupplier) {
+                Objects.requireNonNull(keyId);
+                return action(role, () -> {
+                    Log.verbose(I18N.format(keyId, formatArgsSupplier.get()));
+                });
+            }
+
+            private TaskAction workloadAction;
+            private TaskAction beforeAction;
+            private TaskAction afterAction;
         }
 
         Builder linkTasks(DirectedEdge<TaskID> edge) {
@@ -294,7 +414,11 @@ final class PackagingPipeline {
         }
 
         TaskBuilder task(TaskID id) {
-            return new TaskBuilder(id);
+            return Optional.ofNullable(taskConfig.get(id)).map(taskConfig -> {
+                return new TaskBuilder(id, taskConfig);
+            }).orElseGet(() -> {
+                return new TaskBuilder(id);
+            });
         }
 
         Stream<TaskBuilder> configuredTasks() {
@@ -303,12 +427,6 @@ final class PackagingPipeline {
             });
         }
 
-        Builder excludeDirFromCopying(Path path) {
-            Objects.requireNonNull(path);
-            excludeCopyDirs.add(path);
-            return this;
-        }
-
         Builder contextMapper(UnaryOperator<TaskContext> v) {
             contextMapper = v;
             return this;
@@ -331,7 +449,6 @@ final class PackagingPipeline {
         }
 
         private final FixedDAG.Builder<TaskID> taskGraphBuilder = FixedDAG.build();
-        private final List<Path> excludeCopyDirs = new ArrayList<>();
         private final Map<TaskID, TaskConfig> taskConfig = new HashMap<>();
         private UnaryOperator<TaskContext> contextMapper;
         private FixedDAG<TaskID> taskGraphSnapshot;
@@ -365,7 +482,7 @@ final class PackagingPipeline {
 
         builder.task(BuildApplicationTaskID.CONTENT)
                 .addDependent(BuildApplicationTaskID.APP_IMAGE_FILE)
-                .applicationAction(ApplicationImageUtils.createCopyContentAction(() -> builder.excludeCopyDirs)).add();
+                .applicationAction(ApplicationImageUtils.createCopyContentAction()).add();
 
         return builder;
     }
@@ -392,6 +509,8 @@ final class PackagingPipeline {
 
         builder.task(PackageTaskID.CREATE_PACKAGE_FILE)
                 .addDependent(PrimaryTaskID.PACKAGE)
+                .logActionBegin("message.create-package")
+                .logActionEnd("message.package-created")
                 .add();
 
         builder.task(PrimaryTaskID.PACKAGE).add();
@@ -425,6 +544,17 @@ final class PackagingPipeline {
                 .run(env.env(), env.pkg().app().name());
     }
 
+    static void deleteOutputBundle(PackageBuildEnv<Package, AppImageLayout> env) throws IOException {
+
+        var outputBundle = env.outputDir().resolve(env.pkg().packageFileNameWithSuffix());
+
+        try {
+            Files.deleteIfExists(outputBundle);
+        } catch (IOException ex) {
+            throw new JPackageException(I18N.format("error.output-bundle-cannot-be-overwritten", outputBundle.toAbsolutePath()), ex);
+        }
+    }
+
     private PackagingPipeline(FixedDAG<TaskID> taskGraph, Map<TaskID, TaskConfig> taskConfig,
             UnaryOperator<TaskContext> contextMapper) {
         this.taskGraph = Objects.requireNonNull(taskGraph);
@@ -645,7 +775,13 @@ final class PackagingPipeline {
             }
 
             if (accepted) {
+                if (config.beforeAction.isPresent()) {
+                    context.execute(config.beforeAction.orElseThrow());
+                }
                 context.execute(config.action.orElseThrow());
+                if (config.afterAction.isPresent()) {
+                    context.execute(config.afterAction.orElseThrow());
+                }
             }
 
             return null;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutorFactory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutorFactory.java
index 3efb522abd4..f18ce61fc04 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutorFactory.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/RetryExecutorFactory.java
@@ -27,9 +27,9 @@ package jdk.jpackage.internal;
 import jdk.jpackage.internal.util.RetryExecutor;
 
 @FunctionalInterface
-interface RetryExecutorFactory {
+public interface RetryExecutorFactory {
 
     <T, E extends Exception> RetryExecutor<T, E> retryExecutor(Class<? extends E> exceptionType);
 
-    static final RetryExecutorFactory DEFAULT = RetryExecutor::new;
+    public static final RetryExecutorFactory DEFAULT = RetryExecutor::new;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
index 50d1701bf0d..345a42c5051 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/TempDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,29 +26,46 @@ package jdk.jpackage.internal;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 import jdk.jpackage.internal.cli.Options;
 import jdk.jpackage.internal.cli.StandardOption;
 import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.Slot;
 
 final class TempDirectory implements Closeable {
 
-    TempDirectory(Options options) throws IOException {
-        final var tempDir = StandardOption.TEMP_ROOT.findIn(options);
-        if (tempDir.isPresent()) {
-            this.path = tempDir.orElseThrow();
-            this.options = options;
-        } else {
-            this.path = Files.createTempDirectory("jdk.jpackage");
-            this.options = options.copyWithDefaultValue(StandardOption.TEMP_ROOT, path);
-        }
-
-        deleteOnClose = tempDir.isEmpty();
+    TempDirectory(Options options, RetryExecutorFactory retryExecutorFactory) throws IOException {
+        this(StandardOption.TEMP_ROOT.findIn(options), retryExecutorFactory);
     }
 
-    Options options() {
-        return options;
+    TempDirectory(Optional<Path> tempDir, RetryExecutorFactory retryExecutorFactory) throws IOException {
+        this(tempDir.isEmpty() ? Files.createTempDirectory("jdk.jpackage") : tempDir.get(),
+                tempDir.isEmpty(),
+                retryExecutorFactory);
+    }
+
+    TempDirectory(Path tempDir, boolean deleteOnClose, RetryExecutorFactory retryExecutorFactory) throws IOException {
+        this.path = Objects.requireNonNull(tempDir);
+        this.deleteOnClose = deleteOnClose;
+        this.retryExecutorFactory = Objects.requireNonNull(retryExecutorFactory);
+    }
+
+    Options map(Options options) {
+        if (deleteOnClose) {
+            return options.copyWithDefaultValue(StandardOption.TEMP_ROOT, path);
+        } else {
+            return options;
+        }
     }
 
     Path path() {
@@ -62,11 +79,107 @@ final class TempDirectory implements Closeable {
     @Override
     public void close() throws IOException {
         if (deleteOnClose) {
-            FileUtils.deleteRecursive(path);
+            retryExecutorFactory.<Void, IOException>retryExecutor(IOException.class)
+                    .setMaxAttemptsCount(5)
+                    .setAttemptTimeout(2, TimeUnit.SECONDS)
+                    .setExecutable(context -> {
+                        try {
+                            FileUtils.deleteRecursive(path);
+                        } catch (IOException ex) {
+                            if (!context.isLastAttempt()) {
+                                throw ex;
+                            } else {
+                                // Collect the list of leftover files. Collect at most the first 100 files.
+                                var remainingFiles = DirectoryListing.listFilesAndEmptyDirectories(
+                                        path, MAX_REPORTED_UNDELETED_FILE_COUNT).paths();
+
+                                if (remainingFiles.equals(List.of(path))) {
+                                    Log.info(I18N.format("warning.tempdir.cleanup-failed", path));
+                                } else {
+                                    remainingFiles.forEach(file -> {
+                                        Log.info(I18N.format("warning.tempdir.cleanup-file-failed", file));
+                                    });
+                                }
+
+                                Log.verbose(ex);
+                            }
+                        }
+                        return null;
+                    }).execute();
+        }
+    }
+
+    record DirectoryListing(List<Path> paths, boolean complete) {
+        DirectoryListing {
+            Objects.requireNonNull(paths);
+        }
+
+        static DirectoryListing listFilesAndEmptyDirectories(Path path, int limit) {
+            Objects.requireNonNull(path);
+            if (limit < 0) {
+                throw new IllegalArgumentException();
+            } else if (limit == 0) {
+                return new DirectoryListing(List.of(), !Files.exists(path));
+            }
+
+            var paths = new ArrayList<Path>();
+            var stopped = Slot.<Boolean>createEmpty();
+
+            stopped.set(false);
+
+            try {
+                Files.walkFileTree(path, new FileVisitor<>() {
+
+                    @Override
+                    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
+                        try (var walk = Files.walk(dir)) {
+                            if (walk.skip(1).findAny().isEmpty()) {
+                                // This is an empty directory, add it to the list.
+                                return addPath(dir, FileVisitResult.SKIP_SUBTREE);
+                            }
+                        } catch (IOException ex) {
+                            Log.verbose(ex);
+                        }
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                        return addPath(file, FileVisitResult.CONTINUE);
+                    }
+
+                    @Override
+                    public FileVisitResult visitFileFailed(Path file, IOException exc) {
+                        return addPath(file, FileVisitResult.CONTINUE);
+                    }
+
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                    private FileVisitResult addPath(Path v, FileVisitResult result) {
+                        if (paths.size() < limit) {
+                            paths.add(v);
+                            return result;
+                        } else {
+                            stopped.set(true);
+                        }
+                        return FileVisitResult.TERMINATE;
+                    }
+
+                });
+            } catch (IOException ex) {
+                Log.verbose(ex);
+            }
+
+            return new DirectoryListing(Collections.unmodifiableList(paths), !stopped.get());
         }
     }
 
     private final Path path;
-    private final Options options;
     private final boolean deleteOnClose;
+    private final RetryExecutorFactory retryExecutorFactory;
+
+    private final static int MAX_REPORTED_UNDELETED_FILE_COUNT = 100;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
index 57b92471e4a..bff35874645 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/JOptSimpleOptionsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package jdk.jpackage.internal.cli;
 
 import static java.util.stream.Collectors.toUnmodifiableMap;
 import static java.util.stream.Collectors.toUnmodifiableSet;
+import static jdk.jpackage.internal.cli.OptionValueConverter.convertString;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -565,7 +566,7 @@ final class JOptSimpleOptionsBuilder {
                 final var converter = optionSpec.converter().orElseThrow();
 
                 final Result<T> conversionResult = optionValue.map(v -> {
-                    return converter.convert(optionName(), StringToken.of(v));
+                    return convertString(converter, optionName(), StringToken.of(v));
                 }).orElseGet(() -> {
                     return Result.ofValue(optionSpec.defaultOptionalValue().orElseThrow());
                 });
@@ -579,7 +580,7 @@ final class JOptSimpleOptionsBuilder {
                         final String str = getOptionValue(List.of(tokens), optionSpec.mergePolicy()).getFirst();
                         final String[] token = arrConverter.tokenize(str);
                         if (token.length == 1 && str.equals(token[0])) {
-                            final var singleTokenConversionResult = converter.convert(optionName(), StringToken.of(str));
+                            final var singleTokenConversionResult = convertString(converter, optionName(), StringToken.of(str));
                             if (singleTokenConversionResult.hasValue()) {
                                 return singleTokenConversionResult;
                             }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
index 31be2bb33c5..d40895a7da6 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
@@ -29,12 +29,15 @@ import static jdk.jpackage.internal.cli.StandardOption.HELP;
 import static jdk.jpackage.internal.cli.StandardOption.VERBOSE;
 import static jdk.jpackage.internal.cli.StandardOption.VERSION;
 
+import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
+import java.io.StringReader;
 import java.io.UncheckedIOException;
 import java.nio.file.NoSuchFileException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -48,7 +51,11 @@ import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.Globals;
 import jdk.jpackage.internal.Log;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExecutableAttributesWithCapturedOutput;
 import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.SelfContainedException;
+import jdk.jpackage.internal.util.CommandOutputControl.UnexpectedExitCodeException;
+import jdk.jpackage.internal.util.CommandOutputControl.UnexpectedResultException;
 import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.internal.util.function.ExceptionBox;
 
@@ -79,8 +86,8 @@ public final class Main {
 
         @Override
         public int run(PrintStream out, PrintStream err, String... args) {
-            PrintWriter outWriter = new PrintWriter(out, true);
-            PrintWriter errWriter = new PrintWriter(err, true);
+            PrintWriter outWriter = toPrintWriter(out);
+            PrintWriter errWriter = toPrintWriter(err);
             try {
                 try {
                     return run(outWriter, errWriter, args);
@@ -98,8 +105,8 @@ public final class Main {
     }
 
     public static void main(String... args) {
-        var out = new PrintWriter(System.out, true);
-        var err = new PrintWriter(System.err, true);
+        var out = toPrintWriter(System.out);
+        var err = toPrintWriter(System.err);
         System.exit(run(out, err, args));
     }
 
@@ -127,7 +134,7 @@ public final class Main {
         Objects.requireNonNull(out);
         Objects.requireNonNull(err);
 
-        Log.setPrintWriter(out, err);
+        Globals.instance().loggerOutputStreams(out, err);
 
         final var runner = new Runner(t -> {
             new ErrorReporter(_ -> {
@@ -179,7 +186,7 @@ public final class Main {
                 }
 
                 if (VERBOSE.containsIn(options)) {
-                    Log.setVerbose();
+                    Globals.instance().loggerVerbose();
                 }
 
                 final var optionsProcessor = new OptionsProcessor(parsedOptionsBuilder, bundlingEnv);
@@ -233,50 +240,68 @@ public final class Main {
         }
 
         void reportError(Throwable t) {
-            if (t instanceof ConfigException cfgEx) {
-                printError(cfgEx, Optional.ofNullable(cfgEx.getAdvice()));
-            } else if (t instanceof ExceptionBox ex) {
-                reportError(ex.getCause());
-            } else if (t instanceof UncheckedIOException ex) {
-                reportError(ex.getCause());
+
+            var unfoldedExceptions = new ArrayList<Exception>();
+            ExceptionBox.visitUnboxedExceptionsRecursively(t, unfoldedExceptions::add);
+
+            unfoldedExceptions.forEach(ex -> {
+                if (ex instanceof ConfigException cfgEx) {
+                    printError(cfgEx, Optional.ofNullable(cfgEx.getAdvice()));
+                } else if (ex instanceof UncheckedIOException) {
+                    printError(ex.getCause(), Optional.empty());
+                } else if (ex instanceof UnexpectedResultException urex) {
+                    printExternalCommandError(urex);
+                } else {
+                    printError(ex, Optional.empty());
+                }
+            });
+        }
+
+        private void printExternalCommandError(UnexpectedResultException ex) {
+            var result = ex.getResult();
+            var commandOutput = ((ExecutableAttributesWithCapturedOutput)result.execAttrs()).printableOutput();
+            var printableCommandLine = result.execAttrs().printableCommandLine();
+
+            if (verbose) {
+                stackTracePrinter.accept(ex);
+            }
+
+            String msg;
+            if (ex instanceof UnexpectedExitCodeException) {
+                msg = I18N.format("error.command-failed-unexpected-exit-code", result.getExitCode(), printableCommandLine);
+            } else if (result.exitCode().isPresent()) {
+                msg = I18N.format("error.command-failed-unexpected-output", printableCommandLine);
             } else {
-                printError(t, Optional.empty());
+                msg = I18N.format("error.command-failed-timed-out", printableCommandLine);
+            }
+
+            messagePrinter.accept(I18N.format("message.error-header", msg));
+            messagePrinter.accept(I18N.format("message.failed-command-output-header"));
+            try (var lines = new BufferedReader(new StringReader(commandOutput)).lines()) {
+                lines.forEach(messagePrinter);
             }
         }
 
         private void printError(Throwable t, Optional<String> advice) {
-            var isAlienException = isAlienExceptionType(t);
+            var isSelfContained = isSelfContained(t);
 
-            if (isAlienException || verbose) {
+            if (!isSelfContained || verbose) {
                 stackTracePrinter.accept(t);
             }
 
             String msg;
-            if (isAlienException) {
-                msg = t.toString();
-            } else {
+            if (isSelfContained) {
                 msg = t.getMessage();
+            } else {
+                msg = t.toString();
             }
 
             messagePrinter.accept(I18N.format("message.error-header", msg));
             advice.ifPresent(v -> messagePrinter.accept(I18N.format("message.advice-header", v)));
         }
 
-        private static boolean isAlienExceptionType(Throwable t) {
-            switch (t) {
-                case JPackageException _ -> {
-                    return false;
-                }
-                case Utils.ParseException _ -> {
-                    return false;
-                }
-                case StandardOption.AddLauncherIllegalArgumentException _ -> {
-                    return false;
-                }
-                default -> {
-                    return true;
-                }
-            }
+        private static boolean isSelfContained(Throwable t) {
+            return t.getClass().getAnnotation(SelfContainedException.class) != null;
         }
     }
 
@@ -310,6 +335,10 @@ public final class Main {
         return System.getProperty("java.version");
     }
 
+    private static PrintWriter toPrintWriter(PrintStream ps) {
+        return new PrintWriter(ps, true, ps.charset());
+    }
+
     private enum DefaultBundlingEnvironmentLoader implements Supplier<CliBundlingEnvironment> {
         INSTANCE;
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
index 401d5e15d28..9b757c29d36 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionArrayValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ package jdk.jpackage.internal.cli;
  *
  * @param <T> option value element type
  */
-interface OptionArrayValueConverter<T> extends OptionValueConverter<T[]> {
+interface OptionArrayValueConverter<T> extends OptionValueConverter<String, T[]> {
 
     /**
      * Splits the given string into tokens and returns the result.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
index c6aa46a6940..60674e6bdfe 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.Result;
 
 
 /**
@@ -56,7 +57,7 @@ import java.util.stream.Stream;
  */
 record OptionSpec<T>(
         List<OptionName> names,
-        Optional<OptionValueConverter<T>> converter,
+        Optional<OptionValueConverter<String, T>> converter,
         Set<OptionScope> scope,
         MergePolicy mergePolicy,
         Optional<T> defaultOptionalValue,
@@ -134,7 +135,7 @@ record OptionSpec<T>(
         });
     }
 
-    <U> OptionSpec<U> copyWithConverter(OptionValueConverter<U> converter) {
+    <U> OptionSpec<U> copyWithConverter(OptionValueConverter<String, U> converter) {
         if (!defaultOptionalValue.isEmpty()) {
             throw new UnsupportedOperationException("Can not convert an option spec with optional value");
         }
@@ -169,12 +170,16 @@ record OptionSpec<T>(
         return valueType(converter).orElseThrow();
     }
 
+    Result<T> convert(OptionName optionName, StringToken optionValue) {
+        return OptionValueConverter.convertString(converter().orElseThrow(), optionName, optionValue);
+    }
+
     @SuppressWarnings("unchecked")
     <U> Optional<OptionArrayValueConverter<U>> arrayValueConverter() {
         return converter.filter(OptionArrayValueConverter.class::isInstance).map(v -> (OptionArrayValueConverter<U>)v);
     }
 
-    private static <T> Optional<Class<? extends T>> valueType(Optional<OptionValueConverter<T>> valueConverter) {
+    private static <T> Optional<Class<? extends T>> valueType(Optional<OptionValueConverter<String, T>> valueConverter) {
         return valueConverter.map(OptionValueConverter::valueType);
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
index e27d6472369..5eecbc9b464 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package jdk.jpackage.internal.cli;
 
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+
 import java.io.File;
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -61,22 +63,49 @@ final class OptionSpecBuilder<T> {
         this.valueType = Objects.requireNonNull(valueType);
     }
 
-    OptionSpecBuilder(OptionSpecBuilder<T> other) {
+    private OptionSpecBuilder(OptionSpecBuilder<T> other) {
         valueType = other.valueType;
+        initFrom(other);
+        defaultValue = other.defaultValue;
+        defaultOptionalValue = other.defaultOptionalValue;
+        converterBuilder = other.converterBuilder.copy();
+        validatorBuilder = other.validatorBuilder.copy();
+        validator = other.validator;
+
+        if (other.arrayDefaultValue != null) {
+            arrayDefaultValue = Arrays.copyOf(other.arrayDefaultValue, other.arrayDefaultValue.length);
+        } else {
+            arrayDefaultValue = null;
+        }
+    }
+
+    private <U> OptionSpecBuilder(OptionSpecBuilder<U> other, ValueConverter<U, T> converter) {
+        Function<U, T> converterFunction = toFunction(converter::convert);
+
+        this.valueType = converter.valueType();
+        initFrom(other);
+        converter(other, converter);
+
+        other.defaultValue().map(converterFunction).ifPresent(this::defaultValue);
+        other.defaultOptionalValue().map(converterFunction).ifPresent(this::defaultOptionalValue);
+
+        if (other.arrayDefaultValue != null) {
+            arrayDefaultValue = Stream.of(other.arrayDefaultValue).map(converterFunction).toArray(length -> {
+                @SuppressWarnings("unchecked")
+                var arr = (T[])Array.newInstance(valueType, length);
+                return arr;
+            });
+        }
+    }
+
+    private void initFrom(OptionSpecBuilder<?> other) {
         name = other.name;
+        nameAliases.clear();
         nameAliases.addAll(other.nameAliases);
         description = other.description;
         mergePolicy = other.mergePolicy;
         scope = Set.copyOf(other.scope);
-        defaultValue = other.defaultValue;
-        defaultOptionalValue = other.defaultOptionalValue;
         valuePattern = other.valuePattern;
-        converterBuilder = other.converterBuilder.copy();
-        validatorBuilder = other.validatorBuilder.copy();
-
-        if (other.arrayDefaultValue != null) {
-            arrayDefaultValue = Arrays.copyOf(other.arrayDefaultValue, other.arrayDefaultValue.length);
-        }
         arrayValuePatternSeparator = other.arrayValuePatternSeparator;
         arrayTokenizer = other.arrayTokenizer;
     }
@@ -85,6 +114,14 @@ final class OptionSpecBuilder<T> {
         return new OptionSpecBuilder<>(this);
     }
 
+    <U> OptionSpecBuilder<U> map(ValueConverter<T, U> converter) {
+        return new OptionSpecBuilder<>(this, converter);
+    }
+
+    <U> OptionSpecBuilder<U> map(Function<OptionSpecBuilder<T>, OptionSpecBuilder<U>> mapper) {
+        return mapper.apply(this);
+    }
+
     Class<? extends T> valueType() {
         return valueType;
     }
@@ -135,10 +172,20 @@ final class OptionSpecBuilder<T> {
                 scope,
                 OptionSpecBuilder.this.mergePolicy().orElse(MergePolicy.CONCATENATE),
                 defaultArrayOptionalValue(),
-                Optional.of(arryValuePattern()),
+                Optional.of(arrayValuePattern()),
                 OptionSpecBuilder.this.description().orElse(""));
     }
 
+    Optional<? extends Validator<T, RuntimeException>> createValidator() {
+        return Optional.ofNullable(validator).or(() -> {
+            if (validatorBuilder.hasValidatingMethod()) {
+                return Optional.of(validatorBuilder.create());
+            } else {
+                return Optional.empty();
+            }
+        });
+    }
+
     OptionSpecBuilder<T> tokenizer(String splitRegexp) {
         Objects.requireNonNull(splitRegexp);
         return tokenizer(str -> {
@@ -162,11 +209,13 @@ final class OptionSpecBuilder<T> {
 
     OptionSpecBuilder<T> validatorExceptionFormatString(String v) {
         validatorBuilder.formatString(v);
+        validator = null;
         return this;
     }
 
-    OptionSpecBuilder<T> validatorExceptionFormatString(UnaryOperator<String> mutator) {
-        validatorBuilder.formatString(mutator.apply(validatorBuilder.formatString().orElse(null)));
+    OptionSpecBuilder<T> validatorExceptionFormatString(UnaryOperator<String> mapper) {
+        validatorBuilder.formatString(mapper.apply(validatorBuilder.formatString().orElse(null)));
+        validator = null;
         return this;
     }
 
@@ -175,18 +224,19 @@ final class OptionSpecBuilder<T> {
         return this;
     }
 
-    OptionSpecBuilder<T> converterExceptionFormatString(UnaryOperator<String> mutator) {
-        converterBuilder.formatString(mutator.apply(converterBuilder.formatString().orElse(null)));
+    OptionSpecBuilder<T> converterExceptionFormatString(UnaryOperator<String> mapper) {
+        converterBuilder.formatString(mapper.apply(converterBuilder.formatString().orElse(null)));
         return this;
     }
 
     OptionSpecBuilder<T> validatorExceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
         validatorBuilder.exceptionFactory(v);
+        validator = null;
         return this;
     }
 
-    OptionSpecBuilder<T> validatorExceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mutator) {
-        return validatorExceptionFactory(mutator.apply(validatorBuilder.exceptionFactory().orElse(null)));
+    OptionSpecBuilder<T> validatorExceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mapper) {
+        return validatorExceptionFactory(mapper.apply(validatorBuilder.exceptionFactory().orElse(null)));
     }
 
     OptionSpecBuilder<T> converterExceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
@@ -194,49 +244,68 @@ final class OptionSpecBuilder<T> {
         return this;
     }
 
-    OptionSpecBuilder<T> converterExceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mutator) {
-        return converterExceptionFactory(mutator.apply(converterBuilder.exceptionFactory().orElse(null)));
+    OptionSpecBuilder<T> converterExceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mapper) {
+        return converterExceptionFactory(mapper.apply(converterBuilder.exceptionFactory().orElse(null)));
     }
 
     OptionSpecBuilder<T> exceptionFormatString(String v) {
         return validatorExceptionFormatString(v).converterExceptionFormatString(v);
     }
 
-    OptionSpecBuilder<T> exceptionFormatString(UnaryOperator<String> mutator) {
-        return validatorExceptionFormatString(mutator).converterExceptionFormatString(mutator);
+    OptionSpecBuilder<T> exceptionFormatString(UnaryOperator<String> mapper) {
+        return validatorExceptionFormatString(mapper).converterExceptionFormatString(mapper);
     }
 
     OptionSpecBuilder<T> exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
         return validatorExceptionFactory(v).converterExceptionFactory(v);
     }
 
-    OptionSpecBuilder<T> exceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mutator) {
-        return validatorExceptionFactory(mutator).converterExceptionFactory(mutator);
+    OptionSpecBuilder<T> exceptionFactory(UnaryOperator<OptionValueExceptionFactory<? extends RuntimeException>> mapper) {
+        return validatorExceptionFactory(mapper).converterExceptionFactory(mapper);
     }
 
-    OptionSpecBuilder<T> converter(ValueConverter<T> v) {
+    OptionSpecBuilder<T> converter(ValueConverter<String, T> v) {
         converterBuilder.converter(v);
         return this;
     }
 
-    OptionSpecBuilder<T> converter(Function<String, T> v) {
+    <U> OptionSpecBuilder<T> converter(OptionSpecBuilder<U> other, ValueConverter<U, T> v) {
+        converterBuilder = other.finalizeConverterBuilder().map(v);
+        return this;
+    }
+
+    <U> OptionSpecBuilder<T> interimConverter(OptionSpecBuilder<U> other) {
+        converterBuilder = converterBuilder.map(other.finalizeConverterBuilder());
+        return this;
+    }
+
+    OptionSpecBuilder<T> converter(ValueConverterFunction<String, T> v) {
         return converter(ValueConverter.create(v, valueType));
     }
 
     OptionSpecBuilder<T> validator(Predicate<T> v) {
         validatorBuilder.predicate(v::test);
+        validator = null;
         return this;
     }
 
     @SuppressWarnings("overloads")
     OptionSpecBuilder<T> validator(Consumer<T> v) {
         validatorBuilder.consumer(v::accept);
+        validator = null;
         return this;
     }
 
     @SuppressWarnings("overloads")
-    OptionSpecBuilder<T> validator(UnaryOperator<Validator.Builder<T, RuntimeException>> mutator) {
-        validatorBuilder = mutator.apply(validatorBuilder);
+    OptionSpecBuilder<T> validator(UnaryOperator<Validator.Builder<T, RuntimeException>> mapper) {
+        validatorBuilder = mapper.apply(validatorBuilder);
+        validator = null;
+        return this;
+    }
+
+    OptionSpecBuilder<T> validator(Validator<T, RuntimeException> v) {
+        validatorBuilder.predicate(null).consumer(null);
+        validator = Objects.requireNonNull(v);
         return this;
     }
 
@@ -247,6 +316,7 @@ final class OptionSpecBuilder<T> {
 
     OptionSpecBuilder<T> withoutValidator() {
         validatorBuilder.predicate(null).consumer(null);
+        validator = null;
         return this;
     }
 
@@ -279,8 +349,8 @@ final class OptionSpecBuilder<T> {
         return this;
     }
 
-    OptionSpecBuilder<T> scope(UnaryOperator<Set<OptionScope>> mutator) {
-        return scope(mutator.apply(scope().orElseGet(Set::of)));
+    OptionSpecBuilder<T> scope(UnaryOperator<Set<OptionScope>> mapper) {
+        return scope(mapper.apply(scope().orElseGet(Set::of)));
     }
 
     OptionSpecBuilder<T> inScope(OptionScope... v) {
@@ -400,10 +470,12 @@ final class OptionSpecBuilder<T> {
     }
 
     private Optional<String> defaultValuePattern() {
-        return converterBuilder.converter().map(_ -> {
+        if (converterBuilder.hasConverter()) {
             final var tokens = name.split("-");
-            return tokens[tokens.length - 1];
-        });
+            return Optional.of(tokens[tokens.length - 1]);
+        } else {
+            return Optional.empty();
+        }
     }
 
     private List<OptionName> names() {
@@ -413,25 +485,21 @@ final class OptionSpecBuilder<T> {
         ).flatMap(Collection::stream).map(OptionName::new).distinct().toList();
     }
 
-    private Optional<OptionValueConverter<T>> createConverter() {
-        if (converterBuilder.converter().isPresent()) {
-            final var newBuilder = converterBuilder.copy();
-            createValidator().ifPresent(newBuilder::validator);
-            return Optional.of(newBuilder.create());
+    private Optional<OptionValueConverter<String, T>> createConverter() {
+        if (converterBuilder.hasConverter()) {
+            return Optional.of(finalizeConverterBuilder().create());
         } else {
             return Optional.empty();
         }
     }
 
-    private Optional<Validator<T, ? extends RuntimeException>> createValidator() {
-        if (validatorBuilder.hasValidatingMethod()) {
-            return Optional.of(validatorBuilder.create());
-        } else {
-            return Optional.empty();
-        }
+    private OptionValueConverter.Builder<T> finalizeConverterBuilder() {
+        final var newBuilder = converterBuilder.copy();
+        createValidator().ifPresent(newBuilder::validator);
+        return newBuilder;
     }
 
-    private OptionValueConverter<T[]> createArrayConverter() {
+    private OptionValueConverter<String, T[]> createArrayConverter() {
         final var newBuilder = converterBuilder.copy();
         newBuilder.tokenizer(Optional.ofNullable(arrayTokenizer).orElse(str -> {
             return new String[] { str };
@@ -440,7 +508,7 @@ final class OptionSpecBuilder<T> {
         return newBuilder.createArray();
     }
 
-    private String arryValuePattern() {
+    private String arrayValuePattern() {
         final var elementValuePattern = OptionSpecBuilder.this.valuePattern().orElseThrow();
         if (arrayValuePatternSeparator == null) {
             return elementValuePattern;
@@ -468,6 +536,7 @@ final class OptionSpecBuilder<T> {
     private String valuePattern;
     private OptionValueConverter.Builder<T> converterBuilder = OptionValueConverter.build();
     private Validator.Builder<T, RuntimeException> validatorBuilder = Validator.build();
+    private Validator<T, RuntimeException> validator;
 
     private T[] arrayDefaultValue;
     private String arrayValuePatternSeparator;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
index 7b517f768bf..42ed704ec6e 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionSpecMapperOptionScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,17 @@
 package jdk.jpackage.internal.cli;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.SequencedMap;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.IdentityWrapper;
 import jdk.jpackage.internal.util.SetBuilder;
 
 /**
@@ -42,9 +48,9 @@ import jdk.jpackage.internal.util.SetBuilder;
  * varies depending on the current OS.
  *
  * @param <T> the type of option value
- * @param <T> the type of context
+ * @param <U> the type of context
  */
-interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
+sealed interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
 
     OptionSpec<T> createOptionSpec(U context, boolean createArray);
 
@@ -52,7 +58,7 @@ interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
 
     @SuppressWarnings("unchecked")
     static <T, U> OptionSpec<T> mapOptionSpec(OptionSpec<T> optionSpec, U context) {
-        return optionSpec.scope().stream()
+        var mappedOptionSpec = optionSpec.scope().stream()
                 .filter(OptionSpecMapperOptionScope.class::isInstance)
                 .map(OptionSpecMapperOptionScope.class::cast)
                 .filter(scope -> {
@@ -62,6 +68,25 @@ interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
                     return ((OptionSpecMapperOptionScope<T, U>)scope).createOptionSpec(
                             context, optionSpec.arrayValueConverter().isPresent());
                 }).orElse(optionSpec);
+
+        Optional<?> valueType = optionSpec.converter().map(OptionValueConverter::valueType);
+        Optional<?> mappedValueType = mappedOptionSpec.converter().map(OptionValueConverter::valueType);
+
+        while (!mappedValueType.equals(valueType)) {
+            // Source and mapped option specs have different option value types.
+            if (Stream.of(valueType, mappedValueType).anyMatch(Optional::isEmpty) &&
+                    Stream.of(valueType, mappedValueType)
+                    .filter(Optional::isPresent).map(Optional::get)
+                    .anyMatch(Predicate.isEqual(Boolean.class))) {
+                // One option spec doesn't have a converter and another has a converter of type `Boolean`.
+                // They are compatible, let it pass.
+                break;
+            }
+
+            throw new IllegalStateException(String.format("Bad option spec mapping from %s to %s", valueType, mappedValueType));
+        }
+
+        return mappedOptionSpec;
     }
 
     static <T, U> Consumer<OptionSpecBuilder<T>> createOptionSpecBuilderMutator(
@@ -94,23 +119,23 @@ interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
 
             var contextOptionScope = scope.stream()
                     .filter(AccumulatingContextOptionScope.class::isInstance)
-                    .map(AccumulatingContextOptionScope.class::cast)
+                    .map(v -> {
+                        @SuppressWarnings("unchecked")
+                        var tv = (AccumulatingContextOptionScope<T, U>)v;
+                        return tv;
+                    })
                     .filter(s -> {
                         return s.contextType().equals(contextType);
                     })
                     .findFirst();
+
             contextOptionScope.ifPresent(v -> {
-                @SuppressWarnings("unchecked")
-                var mutators = (AccumulatingContextOptionScope<T, U>)v;
-                mutators.addMutator(optionSpecBuilderMutator);
-                if (optionSpecBuilder != mutators.optionSpecBuilder) {
-                    throw new IllegalArgumentException();
-                }
+                v.addMutator(optionSpecBuilder, optionSpecBuilderMutator);
             });
 
             if (contextOptionScope.isEmpty()) {
-                var mutators = new AccumulatingContextOptionScope<T, U>(optionSpecBuilder, contextType);
-                mutators.addMutator(optionSpecBuilderMutator);
+                var mutators = new AccumulatingContextOptionScope<T, U>(contextType);
+                mutators.addMutator(optionSpecBuilder, optionSpecBuilderMutator);
                 scope = SetBuilder.<OptionScope>build().add(scope).add(mutators).create();
             }
 
@@ -119,23 +144,24 @@ interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
 
         private static final class AccumulatingContextOptionScope<T, U> implements OptionSpecMapperOptionScope<T, U> {
 
-            AccumulatingContextOptionScope(OptionSpecBuilder<T> optionSpecBuilder, Class<? extends U> contextType) {
-                this.optionSpecBuilder = Objects.requireNonNull(optionSpecBuilder);
+            AccumulatingContextOptionScope(Class<? extends U> contextType) {
                 this.contextType = Objects.requireNonNull(contextType);
             }
 
             @SuppressWarnings("unchecked")
             @Override
             public OptionSpec<T> createOptionSpec(U context, boolean createArray) {
-                var copy = optionSpecBuilder.copy();
-                for (var mutator : optionSpecBuilderMutators) {
-                    mutator.accept(copy, context);
+                var it = builders.values().iterator();
+
+                var builder = it.next().initBuilder(context, Optional.empty());
+                while (it.hasNext()) {
+                    builder = it.next().initBuilder(context, Optional.of(builder));
                 }
 
                 if (createArray) {
-                    return (OptionSpec<T>)copy.createArrayOptionSpec();
+                    return (OptionSpec<T>)builder.createArrayOptionSpec();
                 } else {
-                    return copy.createOptionSpec();
+                    return (OptionSpec<T>)builder.createOptionSpec();
                 }
             }
 
@@ -144,14 +170,43 @@ interface OptionSpecMapperOptionScope<T, U> extends OptionScope {
                 return contextType;
             }
 
-            void addMutator(BiConsumer<OptionSpecBuilder<T>, U> mutator) {
-                optionSpecBuilderMutators.add(mutator);
+            <V> void addMutator(OptionSpecBuilder<V> builder, BiConsumer<OptionSpecBuilder<V>, U> mutator) {
+                @SuppressWarnings("unchecked")
+                var builderWithMutators = ((OptionSpecBuilderWithMutators<V, U>)builders.computeIfAbsent(new IdentityWrapper<>(builder), _ -> {
+                    return new OptionSpecBuilderWithMutators<V, U>(builder);
+                }));
+
+                builderWithMutators.addMutator(mutator);
             }
 
-            private final OptionSpecBuilder<T> optionSpecBuilder;
             private final Class<? extends U> contextType;
-            private final List<BiConsumer<OptionSpecBuilder<T>, U>> optionSpecBuilderMutators = new ArrayList<>();
+            private final SequencedMap<IdentityWrapper<OptionSpecBuilder<?>>, OptionSpecBuilderWithMutators<?, U>> builders = new LinkedHashMap<>();
         }
 
+        private static final class OptionSpecBuilderWithMutators<T, U> {
+
+            OptionSpecBuilderWithMutators(OptionSpecBuilder<T> builder) {
+                this.builder = Objects.requireNonNull(builder);
+            }
+
+            OptionSpecBuilder<T> initBuilder(U context, Optional<OptionSpecBuilder<?>> other) {
+                Objects.requireNonNull(context);
+                Objects.requireNonNull(other);
+
+                var copy = builder.copy();
+                other.ifPresent(copy::interimConverter);
+                for (var mutator : mutators) {
+                    mutator.accept(copy, context);
+                }
+                return copy;
+            }
+
+            void addMutator(BiConsumer<OptionSpecBuilder<T>, U> mutator) {
+                mutators.add(Objects.requireNonNull(mutator));
+            }
+
+            private final OptionSpecBuilder<T> builder;
+            private final List<BiConsumer<OptionSpecBuilder<T>, U>> mutators = new ArrayList<>();
+        }
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
index 8544853d584..7e249ca1508 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,28 +35,35 @@ import jdk.jpackage.internal.cli.Validator.ParsedValue;
 import jdk.jpackage.internal.util.Result;
 
 /**
- * Defines creating an option value of type {@link T} from a string.
+ * Defines creating an option value of type {@link U} from value of type {@link T}.
  *
- * @param <T> option value type
+ * @param <T> input option value type
+ * @param <U> output option value type
  */
-interface OptionValueConverter<T> {
+interface OptionValueConverter<T, U> {
 
     /**
-     * Converts the given string value corresponding to the given option name into a
-     * Java type.
+     * Converts the given value of type {@link T} corresponding to the given option name
+     * and option string value to an object of type {@link U}.
      *
      * @param optionName  the option name
-     * @param optionValue the string value of the option to convert
+     * @param optionValue the string value of the option
+     * @param value       the value of the option to convert
      * @return the conversion result
+     * @throws ConverterException if internal converter error occurs
      */
-    Result<T> convert(OptionName optionName, StringToken optionValue);
+    Result<U> convert(OptionName optionName, StringToken optionValue, T value) throws ConverterException;
 
     /**
      * Gives the class of the type of values this converter converts to.
      *
      * @return the target class for conversion
      */
-    Class<? extends T> valueType();
+    Class<? extends U> valueType();
+
+    static <T> Result<T> convertString(OptionValueConverter<String, T> converter, OptionName optionName, StringToken optionValue) {
+        return converter.convert(optionName, optionValue, optionValue.value());
+    }
 
     /**
      * Thrown to indicate an error in the normal execution of the converter.
@@ -74,54 +81,78 @@ interface OptionValueConverter<T> {
         return new Builder<>();
     }
 
+
     static final class Builder<T> {
 
         private Builder() {
+            this(new OneStepBackend<>(new StepBuilder<>(true)));
+        }
+
+        private Builder(Backend<T> backend) {
+            this.backend = Objects.requireNonNull(backend);
         }
 
         private Builder(Builder<T> other) {
-            converter = other.converter;
-            validator = other.validator;
+            backend = other.backend.copy();
             tokenizer = other.tokenizer;
-            formatString = other.formatString;
-            exceptionFactory = other.exceptionFactory;
         }
 
         Builder<T> copy() {
             return new Builder<>(this);
         }
 
-        OptionValueConverter<T> create() {
-            return new DefaultOptionValueConverter<>(
-                    converter,
-                    formatString().orElseGet(() -> {
-                        if (exceptionFactory == null) {
-                            return "";
-                        } else {
-                            return null;
-                        }
-                    }),
-                    exceptionFactory().orElseGet(() -> {
-                        if (formatString == null) {
-                            return OptionValueExceptionFactory.unreachable();
-                        } else {
-                            return null;
-                        }
-                    }),
-                    validator());
+        <U> Builder<U> map(ValueConverter<T, U> converter) {
+            Objects.requireNonNull(converter);
+            return new Builder<>(new TwoStepBackend<>(
+                    backend,
+                    new StepBuilder<T, U>(false).converter(converter))).tokenizer(tokenizer);
+        }
+
+        <U> Builder<T> map(Builder<U> other) {
+            Objects.requireNonNull(other);
+            switch (backend) {
+                case OneStepBackend<T> _ -> {
+                    throw new UnsupportedOperationException();
+                }
+                case TwoStepBackend<?, T> b -> {
+                    var fromInterimValueType = other.backend.valueType().orElseThrow();
+                    var toInterimValueType = b.interimValueType();
+                    if (fromInterimValueType.equals(toInterimValueType)) {
+                        @SuppressWarnings("unchecked")
+                        var twoStepBackend = (TwoStepBackend<U, T>)b;
+                        return new Builder<>(new TwoStepBackend<>(
+                                other.backend,
+                                twoStepBackend.otherConvBuilder())).tokenizer(tokenizer);
+                    } else {
+                        throw new IllegalArgumentException(String.format(
+                                "Expected (%s); actual (%s)", toInterimValueType, fromInterimValueType));
+                    }
+                }
+            }
+        }
+
+        OptionValueConverter<String, T> create() {
+            return backend.create();
         }
 
         OptionArrayValueConverter<T> createArray() {
             return new DefaultOptionArrayValueConverter<>(create(), tokenizer);
         }
 
-        Builder<T> converter(ValueConverter<T> v) {
-            converter = v;
+        Builder<T> converter(ValueConverter<String, T> v) {
+            switch (backend) {
+                case OneStepBackend<T> b -> {
+                    b.stringConvBuilder().converter(v);
+                }
+                case TwoStepBackend<?, T> _ -> {
+                    throw new UnsupportedOperationException();
+                }
+            }
             return this;
         }
 
         Builder<T> validator(Validator<T, ? extends RuntimeException> v) {
-            validator = v;
+            backend.validator(v);
             return this;
         }
 
@@ -131,12 +162,12 @@ interface OptionValueConverter<T> {
         }
 
         Builder<T> formatString(String v) {
-            formatString = v;
+            backend.formatString(v);
             return this;
         }
 
         Builder<T> exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
-            exceptionFactory = v;
+            backend.exceptionFactory(v);
             return this;
         }
 
@@ -145,12 +176,30 @@ interface OptionValueConverter<T> {
             return this;
         }
 
-        Optional<ValueConverter<T>> converter() {
-            return Optional.ofNullable(converter);
+        boolean hasConverter() {
+            switch (backend) {
+                case OneStepBackend<T> b -> {
+                    return b.stringConvBuilder().converter().isPresent();
+                }
+                case TwoStepBackend<?, T> _ -> {
+                    return true;
+                }
+            }
         }
 
         Optional<Validator<T, ? extends RuntimeException>> validator() {
-            return Optional.ofNullable(validator);
+            return backend.validator();
+        }
+
+        Optional<ValueConverter<String, T>> converter() {
+            switch (backend) {
+                case OneStepBackend<T> b -> {
+                    return b.stringConvBuilder().converter();
+                }
+                case TwoStepBackend<?, T> _ -> {
+                    throw new UnsupportedOperationException();
+                }
+            }
         }
 
         Optional<Function<String, String[]>> tokenizer() {
@@ -158,68 +207,15 @@ interface OptionValueConverter<T> {
         }
 
         Optional<String> formatString() {
-            return Optional.ofNullable(formatString);
+            return backend.formatString();
         }
 
         Optional<OptionValueExceptionFactory<? extends RuntimeException>> exceptionFactory() {
-            return Optional.ofNullable(exceptionFactory);
+            return backend.exceptionFactory();
         }
 
 
-        private record DefaultOptionValueConverter<T>(ValueConverter<T> converter, String formatString,
-                OptionValueExceptionFactory<? extends RuntimeException> exceptionFactory,
-                Optional<Validator<T, ? extends RuntimeException>> validator) implements OptionValueConverter<T> {
-
-            DefaultOptionValueConverter {
-                Objects.requireNonNull(converter);
-                Objects.requireNonNull(formatString);
-                Objects.requireNonNull(exceptionFactory);
-                Objects.requireNonNull(validator);
-            }
-
-            @Override
-            public Result<T> convert(OptionName optionName, StringToken optionValue) {
-                Objects.requireNonNull(optionName);
-
-                final T convertedValue;
-                try {
-                    convertedValue = converter.convert(optionValue.value());
-                } catch (Exception ex) {
-                    return handleException(optionName, optionValue, ex);
-                }
-
-                final List<? extends Exception> validationExceptions = validator.map(val -> {
-                    try {
-                        return val.validate(optionName, ParsedValue.create(convertedValue, optionValue));
-                    } catch (Validator.ValidatorException ex) {
-                        // All unexpected exceptions that the converter yields should be tunneled via ConverterException.
-                        throw new ConverterException(ex.getCause());
-                    }
-                }).orElseGet(List::of);
-
-                if (validationExceptions.isEmpty()) {
-                    return Result.ofValue(convertedValue);
-                } else {
-                    return Result.ofErrors(validationExceptions);
-                }
-            }
-
-            @Override
-            public Class<? extends T> valueType() {
-                return converter.valueType();
-            }
-
-            private Result<T> handleException(OptionName optionName, StringToken optionValue, Exception ex) {
-                if (ex instanceof IllegalArgumentException) {
-                    return Result.ofError(exceptionFactory.create(optionName, optionValue, formatString, Optional.of(ex)));
-                } else {
-                    throw new ConverterException(ex);
-                }
-            }
-        }
-
-
-        private record DefaultOptionArrayValueConverter<T>(OptionValueConverter<T> elementConverter,
+        private record DefaultOptionArrayValueConverter<T>(OptionValueConverter<String, T> elementConverter,
                 Function<String, String[]> tokenizer) implements OptionArrayValueConverter<T> {
 
             DefaultOptionArrayValueConverter {
@@ -229,14 +225,18 @@ interface OptionValueConverter<T> {
 
             @SuppressWarnings("unchecked")
             @Override
-            public Result<T[]> convert(OptionName optionName, StringToken optionValue) {
+            public Result<T[]> convert(OptionName optionName, StringToken optionValue, String value) {
+
+                if (!value.equals(optionValue.value())) {
+                    throw new IllegalArgumentException();
+                }
 
                 final List<Exception> exceptions = new ArrayList<>();
                 final List<T> convertedValues = new ArrayList<>();
 
                 final var tokens = tokenize(optionValue.value());
                 for (var token : tokens) {
-                    final var result = elementConverter.convert(optionName, StringToken.of(optionValue.value(), token));
+                    final var result = elementConverter.convert(optionName, StringToken.of(optionValue.value(), token), token);
                     exceptions.addAll(result.errors());
                     if (exceptions.isEmpty()) {
                         result.value().ifPresent(convertedValues::add);
@@ -264,10 +264,311 @@ interface OptionValueConverter<T> {
             }
         }
 
-        private ValueConverter<T> converter;
-        private Validator<T, ? extends RuntimeException> validator;
+
+        private record TwoStepOptionValueConverter<T, U>(OptionValueConverter<String, T> stringConverter,
+                OptionValueConverter<T, U> converter) implements OptionValueConverter<String, U> {
+
+            TwoStepOptionValueConverter {
+                Objects.requireNonNull(stringConverter);
+                Objects.requireNonNull(converter);
+            }
+
+            @Override
+            public Result<U> convert(OptionName optionName, StringToken optionValue, String value) {
+                final var interimResult = stringConverter.convert(optionName, optionValue, value);
+                return interimResult.flatMap(interimValue -> {
+                    return converter.convert(optionName, optionValue, interimValue);
+                });
+            }
+
+            @Override
+            public Class<? extends U> valueType() {
+                return converter.valueType();
+            }
+        }
+
+
+        private sealed interface Backend<T> {
+
+            OptionValueConverter<String, T> create();
+
+            Backend<T> copy();
+
+            void validator(Validator<T, ? extends RuntimeException> v);
+
+            void formatString(String v);
+
+            void exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v);
+
+            Optional<Class<? extends T>> valueType();
+
+            Optional<Validator<T, ? extends RuntimeException>> validator();
+
+            Optional<String> formatString();
+
+            Optional<OptionValueExceptionFactory<? extends RuntimeException>> exceptionFactory();
+        }
+
+
+        private record OneStepBackend<T>(StepBuilder<String, T> stringConvBuilder) implements Backend<T> {
+
+            OneStepBackend {
+                Objects.requireNonNull(stringConvBuilder);
+            }
+
+            @Override
+            public Backend<T> copy() {
+                return new OneStepBackend<>(stringConvBuilder.copy());
+            }
+
+            @Override
+            public OptionValueConverter<String, T> create() {
+                return stringConvBuilder.create();
+            }
+
+            @Override
+            public void validator(Validator<T, ? extends RuntimeException> v) {
+                stringConvBuilder.validator(v);
+            }
+
+            @Override
+            public void formatString(String v) {
+                stringConvBuilder.formatString(v);
+            }
+
+            @Override
+            public void exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+                stringConvBuilder.exceptionFactory(v);
+            }
+
+            @Override
+            public Optional<Class<? extends T>> valueType() {
+                return stringConvBuilder.converter().map(ValueConverter::valueType);
+            }
+
+            @Override
+            public Optional<Validator<T, ? extends RuntimeException>> validator() {
+                return stringConvBuilder.validator();
+            }
+
+            @Override
+            public Optional<String> formatString() {
+                return stringConvBuilder.formatString();
+            }
+
+            @Override
+            public Optional<OptionValueExceptionFactory<? extends RuntimeException>> exceptionFactory() {
+                return stringConvBuilder.exceptionFactory();
+            }
+        }
+
+
+        private record TwoStepBackend<T, U>(Backend<T> stringConvBuilder, StepBuilder<T, U> otherConvBuilder) implements Backend<U> {
+
+            TwoStepBackend {
+                Objects.requireNonNull(stringConvBuilder);
+                Objects.requireNonNull(otherConvBuilder);
+            }
+
+            Class<? extends T> interimValueType() {
+                return stringConvBuilder.valueType().orElseThrow();
+            }
+
+            @Override
+            public Backend<U> copy() {
+                return new TwoStepBackend<>(stringConvBuilder.copy(), otherConvBuilder.copy());
+            }
+
+            @Override
+            public OptionValueConverter<String, U> create() {
+                return new TwoStepOptionValueConverter<>(stringConvBuilder.create(), otherConvBuilder.create());
+            }
+
+            @Override
+            public void validator(Validator<U, ? extends RuntimeException> v) {
+                otherConvBuilder.validator(v);
+            }
+
+            @Override
+            public void formatString(String v) {
+                otherConvBuilder.formatString(v);
+            }
+
+            @Override
+            public void exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+                otherConvBuilder.exceptionFactory(v);
+            }
+
+            @Override
+            public Optional<Class<? extends U>> valueType() {
+                return otherConvBuilder.converter().map(ValueConverter::valueType);
+            }
+
+            @Override
+            public Optional<Validator<U, ? extends RuntimeException>> validator() {
+                return otherConvBuilder.validator();
+            }
+
+            @Override
+            public Optional<String> formatString() {
+                return otherConvBuilder.formatString();
+            }
+
+            @Override
+            public Optional<OptionValueExceptionFactory<? extends RuntimeException>> exceptionFactory() {
+                return otherConvBuilder.exceptionFactory();
+            }
+        }
+
+
+        private static final class StepBuilder<T, U> {
+
+            private StepBuilder(boolean starter) {
+                this.starter = starter;
+            }
+
+            private StepBuilder(StepBuilder<T, U> other) {
+                starter = other.starter;
+                converter = other.converter;
+                validator = other.validator;
+                formatString = other.formatString;
+                exceptionFactory = other.exceptionFactory;
+            }
+
+            StepBuilder<T, U> copy() {
+                return new StepBuilder<>(this);
+            }
+
+            OptionValueConverter<T, U> create() {
+                return new DefaultOptionValueConverter<>(
+                        converter,
+                        formatString().orElseGet(() -> {
+                            if (exceptionFactory == null) {
+                                return "";
+                            } else {
+                                return null;
+                            }
+                        }),
+                        exceptionFactory().orElseGet(() -> {
+                            if (formatString == null) {
+                                return OptionValueExceptionFactory.unreachable();
+                            } else {
+                                return null;
+                            }
+                        }),
+                        validator(),
+                        starter);
+            }
+
+            StepBuilder<T, U> converter(ValueConverter<T, U> v) {
+                converter = v;
+                return this;
+            }
+
+            StepBuilder<T, U> validator(Validator<U, ? extends RuntimeException> v) {
+                validator = v;
+                return this;
+            }
+
+            StepBuilder<T, U> formatString(String v) {
+                formatString = v;
+                return this;
+            }
+
+            StepBuilder<T, U> exceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> v) {
+                exceptionFactory = v;
+                return this;
+            }
+
+            Optional<ValueConverter<T, U>> converter() {
+                return Optional.ofNullable(converter);
+            }
+
+            Optional<Validator<U, ? extends RuntimeException>> validator() {
+                return Optional.ofNullable(validator);
+            }
+
+            Optional<String> formatString() {
+                return Optional.ofNullable(formatString);
+            }
+
+            Optional<OptionValueExceptionFactory<? extends RuntimeException>> exceptionFactory() {
+                return Optional.ofNullable(exceptionFactory);
+            }
+
+
+            private record DefaultOptionValueConverter<T, U>(
+                    ValueConverter<T, U> converter,
+                    String formatString,
+                    OptionValueExceptionFactory<? extends RuntimeException> exceptionFactory,
+                    Optional<Validator<U, ? extends RuntimeException>> validator,
+                    boolean starter) implements OptionValueConverter<T, U> {
+
+                DefaultOptionValueConverter {
+                    Objects.requireNonNull(converter);
+                    Objects.requireNonNull(formatString);
+                    Objects.requireNonNull(exceptionFactory);
+                    Objects.requireNonNull(validator);
+                }
+
+                @Override
+                public Result<U> convert(OptionName optionName, StringToken optionValue, T value) {
+                    Objects.requireNonNull(optionName);
+                    Objects.requireNonNull(optionValue);
+                    Objects.requireNonNull(value);
+
+                    if (starter && !value.equals(optionValue.value())) {
+                        throw new IllegalArgumentException();
+                    }
+
+                    final U convertedValue;
+                    try {
+                        convertedValue = converter.convert(value);
+                    } catch (Exception ex) {
+                        return handleException(optionName, optionValue, ex);
+                    }
+
+                    final List<? extends Exception> validationExceptions = validator.map(val -> {
+                        try {
+                            return val.validate(optionName, ParsedValue.create(convertedValue, optionValue));
+                        } catch (Validator.ValidatorException ex) {
+                            // All unexpected exceptions that the converter yields should be tunneled via ConverterException.
+                            throw new ConverterException(ex.getCause());
+                        }
+                    }).orElseGet(List::of);
+
+                    if (validationExceptions.isEmpty()) {
+                        return Result.ofValue(convertedValue);
+                    } else {
+                        return Result.ofErrors(validationExceptions);
+                    }
+                }
+
+                @Override
+                public Class<? extends U> valueType() {
+                    return converter.valueType();
+                }
+
+                private Result<U> handleException(OptionName optionName, StringToken optionValue, Exception ex) {
+                    if (ex instanceof IllegalArgumentException) {
+                        return Result.ofError(exceptionFactory.create(optionName, optionValue, formatString, Optional.of(ex)));
+                    } else {
+                        throw new ConverterException(ex);
+                    }
+                }
+            }
+
+
+            private final boolean starter;
+            private ValueConverter<T, U> converter;
+            private Validator<U, ? extends RuntimeException> validator;
+            private String formatString;
+            private OptionValueExceptionFactory<? extends RuntimeException> exceptionFactory;
+        }
+
+
+        private final Backend<T> backend;
         private Function<String, String[]> tokenizer;
-        private String formatString;
-        private OptionValueExceptionFactory<? extends RuntimeException> exceptionFactory;
     }
 }
+
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
index 67e87d55d8b..6c32a3d1569 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import jdk.jpackage.internal.model.BundlingEnvironment;
 import jdk.jpackage.internal.model.BundlingOperationDescriptor;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.JPackageException;
-import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.model.BundleType;
 
 /**
  * Analyzes jpackage command line structure.
@@ -250,7 +250,7 @@ final class OptionsAnalyzer {
             return error("ERR_NoInstallerEntryPoint", mapFormatArguments(optionSpec));
         } else {
             return error("ERR_InvalidTypeOption", mapFormatArguments(
-                    optionSpec, bundlingOperation.packageTypeValue()));
+                    optionSpec, bundlingOperation.bundleTypeValue()));
         }
     }
 
@@ -267,30 +267,30 @@ final class OptionsAnalyzer {
         final var typeOption = TYPE.getOption();
 
         return cmdline.find(typeOption).map(obj -> {
-            if (obj instanceof PackageType packageType) {
-                return packageType;
+            if (obj instanceof BundleType bundleType) {
+                return bundleType;
             } else {
-                return typeOption.spec()
-                        .converter().orElseThrow()
-                        .convert(typeOption.spec().name(), StringToken.of(((String[])obj)[0]))
+                var spec = new StandardOptionContext(os).mapOptionSpec(typeOption.spec());
+                return spec
+                        .convert(spec.name(), StringToken.of(((String[])obj)[0]))
                         .orElseThrow();
             }
-        }).map(packageType -> {
-            // Find standard bundling operations producing the given package type.
+        }).map(bundleType -> {
+            // Find standard bundling operations producing the given bundle type.
             var bundlingOperations = Stream.of(StandardBundlingOperation.values()).filter(op -> {
-                return op.packageType().equals(packageType);
+                return op.bundleType().equals(bundleType);
             }).toList();
 
             if (bundlingOperations.isEmpty()) {
                 // jpackage internal error: none of the standard bundling operations produce
-                // bundles of the `packageType`.
+                // bundles of the `bundleType`.
                 throw new AssertionError(String.format(
                         "None of the standard bundling operations produce bundles of type [%s]",
-                        packageType));
+                        bundleType));
             } else if (bundlingOperations.size() == 1) {
                 return bundlingOperations.getFirst();
             } else {
-                // Multiple standard bundling operations produce the `packageType` package type.
+                // Multiple standard bundling operations produce the `bundleType` bundle type.
                 // Filter those that belong to the current OS
                 bundlingOperations = bundlingOperations.stream().filter(op -> {
                     return op.os().equals(OperatingSystem.current());
@@ -298,10 +298,10 @@ final class OptionsAnalyzer {
 
                 if (bundlingOperations.isEmpty()) {
                     // jpackage internal error: none of the standard bundling operations produce
-                    // bundles of the `packageType` on the current OS.
+                    // bundles of the `bundleType` on the current OS.
                     throw new AssertionError(String.format(
                             "None of the standard bundling operations produce bundles of type [%s] on %s",
-                            packageType, OperatingSystem.current()));
+                            bundleType, OperatingSystem.current()));
                 } else if (bundlingOperations.size() == 1) {
                     return bundlingOperations.getFirst();
                 } else if (StandardBundlingOperation.MACOS_APP_IMAGE.containsAll(bundlingOperations)) {
@@ -316,7 +316,7 @@ final class OptionsAnalyzer {
                 }
             }
         }).orElseGet(() -> {
-            // No package type specified, use the default bundling operation in the given environment.
+            // No bundle type specified, use the default bundling operation in the given environment.
             return env.defaultOperation().map(descriptor -> {
                 return Stream.of(StandardBundlingOperation.values()).filter(op -> {
                     return descriptor.equals(op.descriptor());
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
index 54003b714a2..3c0eab77f8a 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/OptionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import static java.util.stream.Collectors.counting;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toMap;
 import static jdk.jpackage.internal.cli.Option.fromOptionSpecPredicate;
+import static jdk.jpackage.internal.cli.OptionValueConverter.convertString;
 import static jdk.jpackage.internal.cli.StandardOption.ADDITIONAL_LAUNCHERS;
 import static jdk.jpackage.internal.cli.StandardOption.platformOption;
 
@@ -380,8 +381,8 @@ final class OptionsProcessor {
         }
 
         @Override
-        public Result<Options[]> convert(OptionName optionName, StringToken optionValue) {
-            return converter.convert(optionName, optionValue).flatMap(arr -> {
+        public Result<Options[]> convert(OptionName optionName, StringToken optionValue, String value) {
+            return convertString(converter, optionName, optionValue).flatMap(arr -> {
                 return Stream.of(arr).map(mapper).reduce(Result.<List<Options>>ofValue(new ArrayList<>()), (result, o) -> {
                     if (Result.allHaveValues(result, o)) {
                         return result.map(v -> {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
index 330a650e513..2538bbf4fb4 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardAppImageFileOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,15 +169,6 @@ public final class StandardAppImageFileOption {
             .mutate(setPlatformScope(OperatingSystem.MACOS))
             .toOptionValueBuilder().id(StandardOption.MAC_APP_STORE.id()).create();
 
-    /**
-     * Is an application image is signed. macOS-only.
-     */
-    public static final OptionValue<Boolean> MAC_SIGNED = booleanOption("signed")
-            .inScope(AppImageFileOptionScope.APP)
-            .mutate(setPlatformScope(OperatingSystem.MACOS))
-            .toOptionValueBuilder().id(StandardOption.MAC_SIGN.id()).create();
-
-
     public static final class InvalidOptionValueException extends RuntimeException {
 
         InvalidOptionValueException(String str, Throwable t) {
@@ -239,7 +230,7 @@ public final class StandardAppImageFileOption {
             }
 
             return strValue.map(v -> {
-                return spec.converter().orElseThrow().convert(spec.name(), StringToken.of(v)).orElseThrow();
+                return spec.convert(spec.name(), StringToken.of(v)).orElseThrow();
             }).map(v -> {
                 return Map.entry(option, v);
             });
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
index 45f9194db0b..f6fcd68a6d8 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardBundlingOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
  */
 package jdk.jpackage.internal.cli;
 
-import static jdk.jpackage.internal.model.AppImagePackageType.APP_IMAGE;
-
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -34,6 +32,8 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.AppImageBundleType;
+import jdk.jpackage.internal.model.BundleType;
 import jdk.jpackage.internal.model.BundlingOperationDescriptor;
 import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.model.StandardPackageType;
@@ -44,16 +44,16 @@ import jdk.jpackage.internal.util.SetBuilder;
  * Standard jpackage operations.
  */
 public enum StandardBundlingOperation implements BundlingOperationOptionScope {
-    CREATE_WIN_APP_IMAGE(APP_IMAGE, "^(?!(linux-|mac-|win-exe-|win-msi-))", OperatingSystem.WINDOWS),
-    CREATE_LINUX_APP_IMAGE(APP_IMAGE, "^(?!(win-|mac-|linux-rpm-|linux-deb-))", OperatingSystem.LINUX),
-    CREATE_MAC_APP_IMAGE(APP_IMAGE, "^(?!(linux-|win-|mac-dmg-|mac-pkg-))", OperatingSystem.MACOS),
+    CREATE_WIN_APP_IMAGE(AppImageBundleType.WIN_APP_IMAGE, "^(?!(linux-|mac-|win-exe-|win-msi-))", OperatingSystem.WINDOWS),
+    CREATE_LINUX_APP_IMAGE(AppImageBundleType.LINUX_APP_IMAGE, "^(?!(win-|mac-|linux-rpm-|linux-deb-))", OperatingSystem.LINUX),
+    CREATE_MAC_APP_IMAGE(AppImageBundleType.MAC_APP_IMAGE, "^(?!(linux-|win-|mac-dmg-|mac-pkg-))", OperatingSystem.MACOS),
     CREATE_WIN_EXE(StandardPackageType.WIN_EXE, "^(?!(linux-|mac-|win-msi-))", OperatingSystem.WINDOWS),
     CREATE_WIN_MSI(StandardPackageType.WIN_MSI, "^(?!(linux-|mac-|win-exe-))", OperatingSystem.WINDOWS),
     CREATE_LINUX_RPM(StandardPackageType.LINUX_RPM, "^(?!(win-|mac-|linux-deb-))", OperatingSystem.LINUX),
     CREATE_LINUX_DEB(StandardPackageType.LINUX_DEB, "^(?!(win-|mac-|linux-rpm-))", OperatingSystem.LINUX),
     CREATE_MAC_PKG(StandardPackageType.MAC_PKG, "^(?!(linux-|win-|mac-dmg-))", OperatingSystem.MACOS),
     CREATE_MAC_DMG(StandardPackageType.MAC_DMG, "^(?!(linux-|win-|mac-pkg-))", OperatingSystem.MACOS),
-    SIGN_MAC_APP_IMAGE(APP_IMAGE, OperatingSystem.MACOS, Verb.SIGN);
+    SIGN_MAC_APP_IMAGE(AppImageBundleType.MAC_APP_IMAGE, OperatingSystem.MACOS, Verb.SIGN);
 
     /**
      * Supported values of the {@link BundlingOperationDescriptor#verb()} property.
@@ -78,19 +78,19 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
         private final String value;
     }
 
-    StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os, Verb descriptorVerb) {
-        this.packageType = Objects.requireNonNull(packageType);
+    StandardBundlingOperation(BundleType bundleType, String optionNameRegexp, OperatingSystem os, Verb descriptorVerb) {
+        this.bundleType = Objects.requireNonNull(bundleType);
         optionNamePredicate = Pattern.compile(optionNameRegexp).asPredicate();
         this.os = Objects.requireNonNull(os);
         this.descriptorVerb = Objects.requireNonNull(descriptorVerb);
     }
 
-    StandardBundlingOperation(PackageType packageType, String optionNameRegexp, OperatingSystem os) {
-        this(packageType, optionNameRegexp, os, Verb.CREATE);
+    StandardBundlingOperation(BundleType bundleType, String optionNameRegexp, OperatingSystem os) {
+        this(bundleType, optionNameRegexp, os, Verb.CREATE);
     }
 
-    StandardBundlingOperation(PackageType packageType, OperatingSystem os, Verb descriptorVerb) {
-        this.packageType = Objects.requireNonNull(packageType);
+    StandardBundlingOperation(BundleType bundleType, OperatingSystem os, Verb descriptorVerb) {
+        this.bundleType = Objects.requireNonNull(bundleType);
         optionNamePredicate = v -> false;
         this.os = Objects.requireNonNull(os);
         this.descriptorVerb = Objects.requireNonNull(descriptorVerb);
@@ -100,16 +100,20 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
         return os;
     }
 
-    public String packageTypeValue() {
-        if (packageType.equals(APP_IMAGE)) {
+    public String bundleTypeValue() {
+        if (bundleType instanceof AppImageBundleType) {
             return "app-image";
         } else {
-            return ((StandardPackageType)packageType).suffix().substring(1);
+            return ((StandardPackageType)bundleType).suffix().substring(1);
         }
     }
 
+    public BundleType bundleType() {
+        return bundleType;
+    }
+
     public PackageType packageType() {
-        return packageType;
+        return (PackageType)bundleType();
     }
 
     /**
@@ -122,7 +126,7 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
 
     @Override
     public BundlingOperationDescriptor descriptor() {
-        return new BundlingOperationDescriptor(os(), packageTypeValue(), descriptorVerb.value());
+        return new BundlingOperationDescriptor(os(), bundleTypeValue(), descriptorVerb.value());
     }
 
     public static Optional<StandardBundlingOperation> valueOf(BundlingOperationDescriptor descriptor) {
@@ -199,6 +203,6 @@ public enum StandardBundlingOperation implements BundlingOperationOptionScope {
 
     private final Predicate<String> optionNamePredicate;
     private final OperatingSystem os;
-    private final PackageType packageType;
+    private final BundleType bundleType;
     private final Verb descriptorVerb;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
index 0fa0af296dc..eca82da99aa 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardOption.java
@@ -37,6 +37,7 @@ import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.ERRO
 import static jdk.jpackage.internal.cli.StandardOptionValueExceptionFactory.forMessageWithOptionValueAndName;
 import static jdk.jpackage.internal.cli.StandardValueConverter.addLauncherShortcutConv;
 import static jdk.jpackage.internal.cli.StandardValueConverter.booleanConv;
+import static jdk.jpackage.internal.cli.StandardValueConverter.explodedPathConverter;
 import static jdk.jpackage.internal.cli.StandardValueConverter.identityConv;
 import static jdk.jpackage.internal.cli.StandardValueConverter.mainLauncherShortcutConv;
 import static jdk.jpackage.internal.cli.StandardValueConverter.pathConv;
@@ -44,22 +45,27 @@ import static jdk.jpackage.internal.cli.StandardValueConverter.uuidConv;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.model.AppImageBundleType;
+import jdk.jpackage.internal.model.BundleType;
 import jdk.jpackage.internal.model.BundlingOperationDescriptor;
 import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.LauncherShortcut;
 import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
-import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.util.RootedPath;
+import jdk.jpackage.internal.model.SelfContainedException;
 import jdk.jpackage.internal.util.SetBuilder;
 
 /**
@@ -103,23 +109,26 @@ public final class StandardOption {
 
     public static final OptionValue<Boolean> VERBOSE = auxilaryOption("verbose").create();
 
-    public static final OptionValue<PackageType> TYPE = option("type", PackageType.class).addAliases("t")
+    static final OptionValue<BundleType> TYPE = option("type", BundleType.class).addAliases("t")
             .scope(StandardBundlingOperation.values()).inScope(NOT_BUILDING_APP_IMAGE)
             .converterExceptionFactory(ERROR_WITH_VALUE).converterExceptionFormatString("ERR_InvalidInstallerType")
             .converter(str -> {
-                Objects.requireNonNull(str);
-                return Stream.of(StandardBundlingOperation.values()).filter(bundlingOperation -> {
-                    return bundlingOperation.packageTypeValue().equals(str);
-                }).map(StandardBundlingOperation::packageType).findFirst().orElseThrow(IllegalArgumentException::new);
+                return parseBundleType(str, OperatingSystem.current());
             })
             .description("help.option.type" + resourceKeySuffix(OperatingSystem.current()))
             .mutate(createOptionSpecBuilderMutator((b, context) -> {
                 b.description("help.option.type" + resourceKeySuffix(context.os()));
+                b.converter(str -> {
+                    return parseBundleType(str, context.os());
+                });
             })).create();
 
-    public static final OptionValue<Path> INPUT = directoryOption("input").addAliases("i")
+    public static final OptionValue<? extends Collection<RootedPath>> INPUT = directoryOption("input").addAliases("i")
             .outOfScope(NOT_BUILDING_APP_IMAGE)
-            .create();
+            .map(explodedPathOptionMapper(explodedPathConverter().create()))
+            .create(optionValueBuilder -> {
+                return optionValueBuilder.to(List::of).create();
+            });
 
     public static final OptionValue<Path> DEST = directoryOption("dest").addAliases("d")
             .valuePattern("destination path")
@@ -190,16 +199,17 @@ public final class StandardOption {
             .inScope(LauncherProperty.VALUE)
             .createArray(toList());
 
-    public static final OptionValue<List<Path>> APP_CONTENT = pathOption("app-content")
+    public static final OptionValue<List<Collection<RootedPath>>> APP_CONTENT = existingPathOption("app-content")
             .tokenizer(",")
             .valuePattern("additional content")
             .outOfScope(NOT_BUILDING_APP_IMAGE)
+            .map(explodedPathOptionMapper(explodedPathConverter().withPathFileName().create()))
             .mutate(createOptionSpecBuilderMutator((b, context) -> {
                 if (context.os() == OperatingSystem.MACOS) {
                     b.description("help.option.app-content" + resourceKeySuffix(context.os()));
                 }
             }))
-            .createArray(toList());
+            .createArray(toExplodedPathList());
 
     static final OptionValue<Path[]> FILE_ASSOCIATIONS_INTERNAL = fileOption("file-associations")
             .tokenizer(pathSeparator())
@@ -233,6 +243,15 @@ public final class StandardOption {
             .mutate(createOptionSpecBuilderMutator((b, context) -> {
                 if (context.os() == OperatingSystem.MACOS) {
                     b.description("help.option.app-image" + resourceKeySuffix(context.os()));
+                    var directoryValidator = b.createValidator().orElseThrow();
+                    var macBundleValidator = b
+                            .validatorExceptionFormatString("error.parameter-not-mac-bundle")
+                            .validator(StandardValidator.IS_VALID_MAC_BUNDLE)
+                            .createValidator().orElseThrow();
+                    // Use "lazy and" validator composition.
+                    // If the value of the option is not a directory, we want only one error reported, not two:
+                    // one that the value is not a directory and another that it is not a valid macOS bundle.
+                    b.validator(Validator.andLazy(directoryValidator, macBundleValidator));
                 }
             }))
             .create();
@@ -315,10 +334,11 @@ public final class StandardOption {
     // MacOS-specific
     //
 
-    public static final OptionValue<List<Path>> MAC_DMG_CONTENT = pathOption("mac-dmg-content")
+    public static final OptionValue<List<Collection<RootedPath>>> MAC_DMG_CONTENT = existingPathOption("mac-dmg-content")
             .valuePattern("additional content path")
             .tokenizer(",")
-            .createArray(toList());
+            .map(explodedPathOptionMapper(explodedPathConverter().withPathFileName().create()))
+            .createArray(toExplodedPathList());
 
     public static final OptionValue<Boolean> MAC_SIGN = booleanOption("mac-sign").scope(MAC_SIGNING).addAliases("s").create();
 
@@ -504,12 +524,57 @@ public final class StandardOption {
     static Consumer<OptionSpecBuilder<Path>> directoryOptionMutator() {
         return builder -> {
             builder.mutate(pathOptionMutator())
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                context.asFileSource().ifPresent(propertyFile -> {
+                    b.validatorExceptionFactory(forMessageWithOptionValueAndName(propertyFile));
+                    b.validatorExceptionFormatString("error.properties-parameter-not-directory");
+                });
+            }))
             .validator(StandardValidator.IS_DIRECTORY)
             .validatorExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
             .validatorExceptionFormatString("error.parameter-not-directory");
         };
     }
 
+    static Consumer<OptionSpecBuilder<Path>> existingPathOptionMutator() {
+
+        return builder -> {
+            builder.mutate(pathOptionMutator())
+            .validator(createExistingPathValidator(Validator.<Path, RuntimeException>build().exceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME), true))
+            .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                context.asFileSource().ifPresent(propertyFile -> {
+                    var validatorBuilder = Validator.<Path, RuntimeException>build();
+                    validatorBuilder.exceptionFactory(forMessageWithOptionValueAndName(propertyFile));
+                    b.validator(createExistingPathValidator(validatorBuilder, false));
+                });
+            }));
+        };
+    }
+
+    private static Validator<Path, RuntimeException> createExistingPathValidator(Validator.Builder<Path, RuntimeException> builder, boolean cmdline) {
+
+        if (cmdline) {
+            builder.formatString("error.parameter-not-directory");
+        } else {
+            builder.formatString("error.properties-parameter-not-directory");
+        }
+
+        var isDirectoryValidator = builder.predicate(StandardValidator.IS_DIRECTORY).create();
+
+        if (cmdline) {
+            builder.formatString("error.parameter-not-file");
+        } else {
+            builder.formatString("error.properties-parameter-not-file");
+        }
+
+        var isFileValidator = builder.predicate(StandardValidator.IS_FILE_OR_SYMLINK).create();
+
+        @SuppressWarnings("unchecked")
+        var validator = (Validator<Path, RuntimeException>)isDirectoryValidator.or(isFileValidator);
+
+        return validator;
+    }
+
     static Consumer<OptionSpecBuilder<Boolean>> booleanOptionMutator() {
         return builder -> {
             builder.mutate(createOptionSpecBuilderMutator((b, context) -> {
@@ -537,6 +602,30 @@ public final class StandardOption {
         };
     }
 
+    static Function<OptionSpecBuilder<Path>, OptionSpecBuilder<RootedPath[]>> explodedPathOptionMapper(ValueConverter<Path, RootedPath[]> conv) {
+        Objects.requireNonNull(conv);
+        return builder -> {
+            return builder.map(conv)
+                    .converterExceptionFactory(ERROR_WITH_VALUE_AND_OPTION_NAME)
+                    .converterExceptionFormatString("error.path-parameter-ioexception")
+                    // Add empty mutator to OptionSpecMapperOptionScope to make
+                    // mapped option spec have `RootedPath[]` type.
+                    // Otherwise, it will have `Path` type.
+                    .mutate(createOptionSpecBuilderMutator((b, context) -> {
+                    }));
+        };
+    }
+
+    private static <T> Function<OptionValue.Builder<RootedPath[][]>, OptionValue<List<Collection<RootedPath>>>> toExplodedPathList() {
+        return builder -> {
+            return builder.to((RootedPath[][] v) -> {
+                return Stream.of(v).map(arr -> {
+                    return (Collection<RootedPath>)List.of(arr);
+                }).toList();
+            }).create();
+        };
+    }
+
     private static <T> OptionSpecBuilder<T> option(String name, Class<? extends T> valueType) {
         return OptionSpecBuilder.<T>create(valueType)
                 .name(Objects.requireNonNull(name))
@@ -565,6 +654,10 @@ public final class StandardOption {
         return option(name, Path.class).mutate(pathOptionMutator());
     }
 
+    private static OptionSpecBuilder<Path> existingPathOption(String name) {
+        return option(name, Path.class).mutate(existingPathOptionMutator());
+    }
+
     private static OptionSpecBuilder<Path> fileOption(String name) {
         return option(name, Path.class)
                 .valuePattern("file path")
@@ -615,8 +708,7 @@ public final class StandardOption {
     }
 
     private static OptionValue<AdditionalLauncher[]> createAddLauncherOption(String name) {
-        OptionValueConverter<Path> propertyFileConverter = fileOption(name)
-                .create().getSpec().converter().orElseThrow();
+        var propertyFileSpec = fileOption(name).create().getSpec();
 
         return option(name, AdditionalLauncher.class)
                 .valuePattern("<launcher name>=<file path>")
@@ -648,7 +740,7 @@ public final class StandardOption {
 
                     final Path propertyFile;
                     try {
-                        propertyFile = propertyFileConverter.convert(OptionName.of(name),
+                        propertyFile = propertyFileSpec.convert(OptionName.of(name),
                                 StringToken.of(value, components[1])).orElseThrow();
                     } catch (JPackageException ex) {
                         throw new AddLauncherInvalidPropertyFileException(I18N.format(
@@ -659,6 +751,23 @@ public final class StandardOption {
                 }).defaultArrayValue(new AdditionalLauncher[0]).createArray();
     }
 
+    private static BundleType parseBundleType(String str, OperatingSystem appImageOS) {
+        Objects.requireNonNull(str);
+        Objects.requireNonNull(appImageOS);
+
+        return Stream.of(StandardBundlingOperation.values()).filter(bundlingOperation -> {
+            return bundlingOperation.bundleTypeValue().equals(str);
+        })
+        .filter(bundlingOperation -> {
+            // Skip app image bundle type if it is from another platform.
+            return !(bundlingOperation.bundleType() instanceof AppImageBundleType)
+                    || (bundlingOperation.os() == appImageOS);
+        })
+        .map(StandardBundlingOperation::bundleType)
+        .findFirst()
+        .orElseThrow(IllegalArgumentException::new);
+    }
+
     private static String resourceKeySuffix(OperatingSystem os) {
         switch (os) {
             case LINUX -> {
@@ -677,6 +786,7 @@ public final class StandardOption {
     }
 
 
+    @SelfContainedException
     static class AddLauncherIllegalArgumentException extends IllegalArgumentException {
 
         AddLauncherIllegalArgumentException(String message) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
index 0038740f9df..cfa97439592 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import jdk.jpackage.internal.cli.Validator.ValidatingConsumerException;
 import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.MacBundle;
 
 final public class StandardValidator {
 
@@ -138,6 +139,10 @@ final public class StandardValidator {
         return true;
     };
 
+    public static Predicate<Path> IS_VALID_MAC_BUNDLE = path -> {
+        return MacBundle.fromPath(path).isPresent();
+    };
+
 
     public static final class DirectoryListingIOException extends RuntimeException {
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
index 3a310166fa8..b1e1189654d 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/StandardValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,15 @@
 
 package jdk.jpackage.internal.cli;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.UUID;
+import java.util.function.Function;
 import jdk.jpackage.internal.model.LauncherShortcut;
 import jdk.jpackage.internal.model.ParseUtils;
+import jdk.jpackage.internal.util.RootedPath;
 
 
 final class StandardValueConverter {
@@ -37,33 +41,59 @@ final class StandardValueConverter {
     private StandardValueConverter() {
     }
 
-    static ValueConverter<String> identityConv() {
+    static ValueConverter<String, String> identityConv() {
         return IDENTITY_CONV;
     }
 
-    static ValueConverter<Path> pathConv() {
+    static ValueConverter<String, Path> pathConv() {
         return PATH_CONV;
     }
 
-    static ValueConverter<UUID> uuidConv() {
+    static ValueConverter<String, UUID> uuidConv() {
         return UUID_CONV;
     }
 
-    static ValueConverter<Boolean> booleanConv() {
+    static ValueConverter<String, Boolean> booleanConv() {
         return BOOLEAN_CONV;
     }
 
-    static ValueConverter<LauncherShortcut> mainLauncherShortcutConv() {
+    static ValueConverter<String, LauncherShortcut> mainLauncherShortcutConv() {
         return MAIN_LAUNCHER_SHORTCUT_CONV;
     }
 
-    static ValueConverter<LauncherShortcut> addLauncherShortcutConv() {
+    static ValueConverter<String, LauncherShortcut> addLauncherShortcutConv() {
         return ADD_LAUNCHER_SHORTCUT_CONV;
     }
 
-    private static final ValueConverter<String> IDENTITY_CONV = ValueConverter.create(x -> x, String.class);
+    static ExplodedPathConverterBuilder explodedPathConverter() {
+        return new ExplodedPathConverterBuilder();
+    }
 
-    private static final ValueConverter<Path> PATH_CONV = ValueConverter.create(str -> {
+    static final class ExplodedPathConverterBuilder {
+        private ExplodedPathConverterBuilder() {
+        }
+
+        ValueConverter<Path, RootedPath[]> create() {
+            return ValueConverter.create(path -> {
+                return explodePath(path, withPathFileName);
+            }, RootedPath[].class);
+        }
+
+        ExplodedPathConverterBuilder withPathFileName(boolean v) {
+            withPathFileName = v;
+            return this;
+        }
+
+        ExplodedPathConverterBuilder withPathFileName() {
+            return withPathFileName(true);
+        }
+
+        private boolean withPathFileName;
+    }
+
+    private static final ValueConverter<String, String> IDENTITY_CONV = ValueConverter.create(x -> x, String.class);
+
+    private static final ValueConverter<String, Path> PATH_CONV = ValueConverter.create(str -> {
         try {
             return Path.of(str);
         } catch (InvalidPathException ex) {
@@ -71,13 +101,33 @@ final class StandardValueConverter {
         }
     }, Path.class);
 
-    private static final ValueConverter<UUID> UUID_CONV = ValueConverter.create(UUID::fromString, UUID.class);
+    private static final ValueConverter<String, UUID> UUID_CONV = ValueConverter.create(UUID::fromString, UUID.class);
 
-    private static final ValueConverter<Boolean> BOOLEAN_CONV = ValueConverter.create(Boolean::valueOf, Boolean.class);
+    private static final ValueConverter<String, Boolean> BOOLEAN_CONV = ValueConverter.create(Boolean::valueOf, Boolean.class);
 
-    private static final ValueConverter<LauncherShortcut> MAIN_LAUNCHER_SHORTCUT_CONV = ValueConverter.create(
+    private static final ValueConverter<String, LauncherShortcut> MAIN_LAUNCHER_SHORTCUT_CONV = ValueConverter.create(
             ParseUtils::parseLauncherShortcutForMainLauncher, LauncherShortcut.class);
 
-    private static final ValueConverter<LauncherShortcut> ADD_LAUNCHER_SHORTCUT_CONV = ValueConverter.create(
+    private static final ValueConverter<String, LauncherShortcut> ADD_LAUNCHER_SHORTCUT_CONV = ValueConverter.create(
             ParseUtils::parseLauncherShortcutForAddLauncher, LauncherShortcut.class);
+
+    private static RootedPath[] explodePath(Path path, boolean withPathFileName) throws Exception {
+
+        Function<Path, RootedPath> mapper;
+        if (withPathFileName) {
+            mapper = RootedPath.toRootedPath(path.getParent());
+        } else {
+            mapper = RootedPath.toRootedPath(path);
+        }
+
+        RootedPath[] items;
+        try (var walk = Files.walk(path)) {
+            items = walk.map(mapper).toArray(RootedPath[]::new);
+        } catch (IOException ex) {
+            // IOException is not a converter error, it is a converting error, so map it into IAE.
+            throw new IllegalArgumentException(ex);
+        }
+
+        return items;
+    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
index 0565a8f1235..a94de355284 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.function.IntPredicate;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.model.BundlingEnvironment;
+import jdk.jpackage.internal.model.SelfContainedException;
 
 final class Utils {
 
@@ -98,6 +99,7 @@ final class Utils {
                 });
     }
 
+    @SelfContainedException
     static final class ParseException extends RuntimeException {
 
         ParseException(String msg) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
index 0ddf0e1984f..04d8d7cc09b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,20 +24,81 @@
  */
 package jdk.jpackage.internal.cli;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 @FunctionalInterface
 interface Validator<T, U extends Exception> {
 
-    List<U> validate(OptionName optionName, ParsedValue<T> optionValue);
+    /**
+     * Validates the given option value.
+     *
+     * @param optionName  the name of an option to validate
+     * @param optionValue the value of an option to validate
+     * @return the list of validation errors
+     * @throws ValidatorException if internal validator error occurs
+     */
+    List<U> validate(OptionName optionName, ParsedValue<T> optionValue) throws ValidatorException;
 
-    default Validator<T, ? extends Exception> andThen(Validator<T, ? extends Exception> after) {
-        return reduce(this, after);
+    default Validator<T, ? extends Exception> andGreedy(Validator<T, ? extends Exception> after) {
+        Objects.requireNonNull(after);
+        var before = this;
+        return (optionName, optionValue) -> {
+            return Stream.concat(
+                    before.validate(optionName, optionValue).stream(),
+                    after.validate(optionName, optionValue).stream()
+            ).toList();
+        };
+    }
+
+    default Validator<T, ? extends Exception> andLazy(Validator<T, ? extends Exception> after) {
+        Objects.requireNonNull(after);
+        var before = this;
+        return (optionName, optionValue) -> {
+            var bErrors = before.validate(optionName, optionValue);
+            if (!bErrors.isEmpty()) {
+                return bErrors.stream().map(Exception.class::cast).toList();
+            } else {
+                return after.validate(optionName, optionValue).stream().map(Exception.class::cast).toList();
+            }
+        };
+    }
+
+    default Validator<T, ? extends Exception> or(Validator<T, ? extends Exception> after) {
+        Objects.requireNonNull(after);
+        var before = this;
+        return (optionName, optionValue) -> {
+            var bErrors = before.validate(optionName, optionValue);
+            if (bErrors.isEmpty()) {
+                return List.of();
+            }
+
+            var aErrors = after.validate(optionName, optionValue);
+            if (aErrors.isEmpty()) {
+                return List.of();
+            }
+
+            return Stream.concat(bErrors.stream(), aErrors.stream()).toList();
+        };
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T, U extends Exception> Validator<T, U> andGreedy(Validator<T, U> first, Validator<T, U> second) {
+        return (Validator<T, U>)first.andGreedy(second);
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T, U extends Exception> Validator<T, U> andLazy(Validator<T, U> first, Validator<T, U> second) {
+        return (Validator<T, U>)first.andLazy(second);
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T, U extends Exception> Validator<T, U> or(Validator<T, U> first, Validator<T, U> second) {
+        return (Validator<T, U>)first.or(second);
     }
 
     /**
@@ -251,15 +312,4 @@ interface Validator<T, U extends Exception> {
             }
         }
     }
-
-    @SafeVarargs
-    private static <T> Validator<T, ? extends Exception> reduce(Validator<T, ? extends Exception>... validators) {
-        @SuppressWarnings("varargs")
-        var theValidators = List.of(validators);
-        return (optionName, optionValue) -> {
-            return theValidators.stream().map(validator -> {
-                return validator.validate(optionName, optionValue);
-            }).flatMap(Collection::stream).map(Exception.class::cast).toList();
-        };
-    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
index ba52ca35f50..122b212d295 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,41 +25,30 @@
 package jdk.jpackage.internal.cli;
 
 import java.util.Objects;
-import java.util.function.Function;
 
-interface ValueConverter<T> {
-
-    /**
-     * Converts the given string value into a Java type.
-     *
-     * @param value the string to convert
-     * @return the converted value
-     * @throws IllegalArgumentException if the given string value can not be
-     *                                  converted to an object of type {@link T}
-     */
-    T convert(String value) throws IllegalArgumentException;
+interface ValueConverter<T, U> extends ValueConverterFunction<T, U> {
 
     /**
      * Gives the class of the type of values this converter converts to.
      *
      * @return the target class for conversion
      */
-    Class<? extends T> valueType();
+    Class<? extends U> valueType();
 
-    static <T> ValueConverter<T> create(Function<String, T> mapper, Class<? extends T> type) {
-        Objects.requireNonNull(mapper);
+    static <T, U> ValueConverter<T, U> create(ValueConverterFunction<T, U> conv, Class<? extends U> type) {
+        Objects.requireNonNull(conv);
         Objects.requireNonNull(type);
 
         return new ValueConverter<>() {
 
             @Override
-            public T convert(String value) {
+            public U convert(T value) throws Exception {
                 Objects.requireNonNull(value);
-                return Objects.requireNonNull(mapper.apply(value));
+                return Objects.requireNonNull(conv.convert(value));
             }
 
             @Override
-            public Class<? extends T> valueType() {
+            public Class<? extends U> valueType() {
                 return type;
             }
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverterFunction.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverterFunction.java
new file mode 100644
index 00000000000..28702afff75
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/ValueConverterFunction.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.cli;
+
+@FunctionalInterface
+interface ValueConverterFunction<T, U> {
+
+    /**
+     * Converts value of one type into another.
+     *
+     * @param value the value to convert
+     * @return the converted value
+     * @throws IllegalArgumentException if the given value can not be converted to
+     *                                  an object of type {@link U}
+     * @throws Exception                if internal converter error occurs
+     */
+    U convert(T value) throws Exception, IllegalArgumentException;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageBundleType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageBundleType.java
new file mode 100644
index 00000000000..c5d2f0d1569
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImageBundleType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.model;
+
+import java.util.Objects;
+
+/**
+ * App image bundle type.
+ *
+ * @see StandardPackageType
+ */
+public enum AppImageBundleType implements BundleType {
+
+    WIN_APP_IMAGE("bundle-type.win-app"),
+    LINUX_APP_IMAGE("bundle-type.linux-app"),
+    MAC_APP_IMAGE("bundle-type.mac-app"),
+    ;
+
+    private AppImageBundleType(String key) {
+        this.key = Objects.requireNonNull(key);
+    }
+
+    @Override
+    public String label() {
+        return I18N.getString(key);
+    }
+
+    private final String key;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
index 5b20a0690d3..7860a04faac 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/Application.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,13 @@
 package jdk.jpackage.internal.model;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.RootedPath;
 
 /**
  * A generic application for packaging.
@@ -78,27 +80,25 @@ public non-sealed interface Application extends BundleSpec {
     String copyright();
 
     /**
-     * Gets the source directory of this application if available or an empty
-     * {@link Optional} instance.
+     * Gets the source paths that should be copied into
+     * {@link ApplicationLayout#appDirectory()} directory of the image of this
+     * application.
      * <p>
-     * Source directory is a directory with the applications's classes and other
+     * Source paths are supposed to contain the applications's classes and other
      * resources.
      *
-     * @return the source directory of this application
+     * @return the source paths
      */
-    Optional<Path> srcDir();
+    Collection<RootedPath> appDirSources();
 
     /**
-     * Gets the input content directories of this application.
-     * <p>
-     * Contents of the content directories will be copied as-is into the dedicated
-     * location of the application image.
+     * Gets the source paths that should be copied into
+     * {@link ApplicationLayout#contentDirectory()} directory of the image of this
+     * application.
      *
-     * @see ApplicationLayout#contentDirectory
-     *
-     * @return the input content directories of this application
+     * @return the source paths
      */
-    List<Path> contentDirs();
+    Collection<RootedPath> contentDirSources();
 
     /**
      * Gets the unresolved app image layout of this application.
@@ -244,8 +244,17 @@ public non-sealed interface Application extends BundleSpec {
     /**
      * Default implementation of {@link Application} interface.
      */
-    record Stub(String name, String description, String version, String vendor, String copyright, Optional<Path> srcDir,
-            List<Path> contentDirs, AppImageLayout imageLayout, Optional<RuntimeBuilder> runtimeBuilder,
-            List<Launcher> launchers,  Map<String, String> extraAppImageFileData) implements Application {
+    record Stub(
+            String name,
+            String description,
+            String version,
+            String vendor,
+            String copyright,
+            Collection<RootedPath> appDirSources,
+            Collection<RootedPath> contentDirSources,
+            AppImageLayout imageLayout,
+            Optional<RuntimeBuilder> runtimeBuilder,
+            List<Launcher> launchers,
+            Map<String, String> extraAppImageFileData) implements Application {
     }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleType.java
similarity index 77%
rename from src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleType.java
index 4e28bb05aef..009725f3e92 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/AppImagePackageType.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/BundleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,20 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.jpackage.internal.model;
 
-/**
- * App image packaging type.
- *
- * @see StandardPackageType
- */
-public final class AppImagePackageType implements PackageType {
 
-    private AppImagePackageType() {
-    }
+/**
+ * Generic bundle type. E.g.: application image, rpm, msi are all bundle types.
+ */
+public sealed interface BundleType permits PackageType, AppImageBundleType {
 
     /**
-     * Singleton
+     * Returns a user-facing label of this bundle type.
+     * @return a user-facing label of this bundle type.
      */
-    public static final AppImagePackageType APP_IMAGE = new AppImagePackageType();
+    String label();
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExecutableAttributesWithCapturedOutput.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExecutableAttributesWithCapturedOutput.java
new file mode 100644
index 00000000000..faed9d24d01
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/ExecutableAttributesWithCapturedOutput.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.model;
+
+import java.util.List;
+import java.util.Objects;
+import jdk.jpackage.internal.util.CommandOutputControl.ExecutableAttributes;
+import jdk.jpackage.internal.util.CommandOutputControl.Result;
+
+/**
+ * {@link ExecutableAttributes} augmented with printable command output.
+ */
+public record ExecutableAttributesWithCapturedOutput(ExecutableAttributes execAttrs, String printableOutput)
+        implements ExecutableAttributes {
+
+    public ExecutableAttributesWithCapturedOutput {
+        Objects.requireNonNull(execAttrs);
+        Objects.requireNonNull(printableOutput);
+    }
+
+    @Override
+    public List<String> commandLine() {
+        return execAttrs.commandLine();
+    }
+
+    public static Result augmentResultWithOutput(Result result, String output) {
+        var execAttrs = new ExecutableAttributesWithCapturedOutput(result.execAttrs(), output);
+        return result.copyWithExecutableAttributes(execAttrs);
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
index 9727f21d2d7..3d24d293f18 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/JPackageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import java.util.Objects;
 /**
  * Generic jpackage exception with non-null message.
  */
+@SelfContainedException
 public class JPackageException extends RuntimeException {
 
     public JPackageException(String msg) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
index d0a4fd010e6..e7273d27ba5 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/PackageType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@ package jdk.jpackage.internal.model;
 
 
 /**
- * Generic package type. E.g.: application image, rpm, msi are all package types.
+ * Native package type. E.g.: dmg, rpm, msi are all package types.
  *
  * @see jdk.jpackage.internal.model.Package
  */
-public interface PackageType {}
+public non-sealed interface PackageType extends BundleType {}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/SelfContainedException.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/SelfContainedException.java
new file mode 100644
index 00000000000..c7d1b3016ac
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/SelfContainedException.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.model;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for exceptions with self-contained error messages that don't
+ * require an additional context, like exception class name or a stack trace.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
+public @interface SelfContainedException {
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
index ccdeceb4a04..6fadc748ecc 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/model/StandardPackageType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,22 @@
  */
 package jdk.jpackage.internal.model;
 
+import java.util.Objects;
+
 /**
  * Standard native package types.
  */
 public enum StandardPackageType implements PackageType {
-    WIN_MSI(".msi"),
-    WIN_EXE(".exe"),
-    LINUX_DEB(".deb"),
-    LINUX_RPM(".rpm"),
-    MAC_PKG(".pkg"),
-    MAC_DMG(".dmg");
+    WIN_MSI("bundle-type.win-msi", ".msi"),
+    WIN_EXE("bundle-type.win-exe", ".exe"),
+    LINUX_DEB("bundle-type.linux-deb", ".deb"),
+    LINUX_RPM("bundle-type.linux-rpm", ".rpm"),
+    MAC_PKG("bundle-type.mac-pkg", ".pkg"),
+    MAC_DMG("bundle-type.mac-dmg", ".dmg");
 
-    StandardPackageType(String suffix) {
-        this.suffix = suffix;
+    StandardPackageType(String key, String suffix) {
+        this.key = Objects.requireNonNull(key);
+        this.suffix = Objects.requireNonNull(suffix);
     }
 
     /**
@@ -48,5 +51,11 @@ public enum StandardPackageType implements PackageType {
         return suffix;
     }
 
+    @Override
+    public String label() {
+        return I18N.getString(key);
+    }
+
+    private final String key;
     private final String suffix;
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
index e97bee79e6e..233067d6457 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
@@ -28,14 +28,14 @@ param.copyright.default=Copyright (C) {0,date,YYYY}
 param.vendor.default=Unknown
 
 bundle-type.win-app=Windows Application Image
-bundle-type.win-exe=EXE Installer Package
-bundle-type.win-msi=MSI Installer Package
+bundle-type.win-exe=Windows EXE Installer
+bundle-type.win-msi=Windows MSI Installer
 bundle-type.mac-app=Mac Application Image
 bundle-type.mac-dmg=Mac DMG Package
 bundle-type.mac-pkg=Mac PKG Package
 bundle-type.linux-app=Linux Application Image
-bundle-type.linux-deb=DEB Bundle
-bundle-type.linux-rpm=RPM Bundle
+bundle-type.linux-deb=Linux DEB Package
+bundle-type.linux-rpm=Linux RPM Package
 
 resource.post-app-image-script=script to run after application image is populated
 
@@ -43,13 +43,23 @@ message.using-default-resource=Using default package resource {0} {1} (add {2} t
 message.no-default-resource=No default package resource {0} (add {1} to the resource-dir to customize).
 message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
 message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
-message.creating-app-bundle=Creating app package: {0} in {1}
+
+message.create-package=Building output package file...
+message.create-app-image=Building output application image directory...
+message.package-created=Succeeded in building output package file
+message.app-image-created=Succeeded in building output application image directory
+
 message.debug-working-directory=Kept working directory for debug: {0}
-message.bundle-created=Succeeded in building {0} package
+
 message.module-version=Using version "{0}" from module "{1}" as application version
 
 message.error-header=Error: {0}
 message.advice-header=Advice to fix: {0}
+message.failed-command-output-header=Command output:
+
+error.command-failed-unexpected-output=Unexpected output from executing the command {0}
+error.command-failed-unexpected-exit-code=Unexpected exit code {0} from executing the command {1}
+error.command-failed-timed-out=Timed-out command {0}
 
 error.version-string-empty=Version may not be empty string
 error.version-string-zero-length-component=Version [{0}] contains a zero length component
@@ -75,13 +85,16 @@ error.parameter-not-directory=The value "{0}" provided for parameter {1} is not
 error.parameter-not-empty-directory=The value "{0}" provided for parameter {1} is not an empty directory or non existent path
 error.parameter-not-url=The value "{0}" provided for parameter {1} is not a valid URL
 error.parameter-not-launcher-shortcut-dir=The value "{0}" provided for parameter {1} is not a valid shortcut startup directory
+error.parameter-not-mac-bundle=The value "{0}" provided for parameter {1} is not a valid macOS bundle
 error.path-parameter-ioexception=I/O error accessing path value "{0}" of parameter {1}
 error.parameter-add-launcher-malformed=The value "{0}" provided for parameter {1} does not match the pattern <name>=<file path>
 error.parameter-add-launcher-not-file=The value of path to a property file "{0}" provided for additional launcher "{1}" is not a valid file path
 error.properties-parameter-not-path=The value "{0}" provided for property "{1}" in "{2}" file is not a valid path
 error.properties-parameter-not-file=The value "{0}" provided for property "{1}" in "{2}" file is not a file
+error.properties-parameter-not-directory=The value "{0}" provided for property "{1}" in "{2}" file is not a directory
 error.properties-parameter-not-launcher-shortcut-dir=The value "{0}" provided for property "{1}" in "{2}" file is not a valid shortcut startup directory
 
+error.no-extensions-for-file-association=No extensions were specified for File Association number {0}
 error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}
 error.no-content-types-for-file-association.advice=Specify MIME type for File Association number {0}
 error.too-many-content-types-for-file-association=More than one MIME types was specified for File Association number {0}
@@ -96,6 +109,11 @@ error.tool-not-found.advice=Please install "{0}"
 error.tool-old-version=Can not find "{0}" {1} or newer
 error.tool-old-version.advice=Please install "{0}" {1} or newer
 
+warning.tempdir.cleanup-failed=Warning: Failed to clean-up temporary directory {0}
+warning.tempdir.cleanup-file-failed=Warning: Failed to delete "{0}" file in the temporary directory
+
+error.output-bundle-cannot-be-overwritten=Output package file "{0}" exists and can not be removed.
+
 error.blocked.option=jlink option [{0}] is not permitted in --jlink-options
 error.no.name=Name not specified with --name and cannot infer one from app-image
 error.no.name.advice=Specify name with --name
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CommandOutputControl.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CommandOutputControl.java
index e35439815b1..00fbdd71919 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CommandOutputControl.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/CommandOutputControl.java
@@ -796,6 +796,10 @@ public final class CommandOutputControl {
 
     public interface ExecutableAttributes {
         List<String> commandLine();
+
+        default String printableCommandLine() {
+            return CommandLineFormat.DEFAULT.apply(commandLine());
+        }
     }
 
     public sealed interface Executable {
@@ -812,11 +816,6 @@ public final class CommandOutputControl {
             Objects.requireNonNull(pid);
             commandLine.forEach(Objects::requireNonNull);
         }
-
-        @Override
-        public String toString() {
-            return CommandLineFormat.DEFAULT.apply(commandLine());
-        }
     }
 
     public record ToolProviderAttributes(String name, List<String> args) implements ExecutableAttributes {
@@ -825,11 +824,6 @@ public final class CommandOutputControl {
             args.forEach(Objects::requireNonNull);
         }
 
-        @Override
-        public String toString() {
-            return CommandLineFormat.DEFAULT.apply(commandLine());
-        }
-
         @Override
         public List<String> commandLine() {
             return Stream.concat(Stream.of(name), args.stream()).toList();
@@ -837,14 +831,9 @@ public final class CommandOutputControl {
     }
 
     public static ExecutableAttributes EMPTY_EXECUTABLE_ATTRIBUTES = new ExecutableAttributes() {
-        @Override
-        public String toString() {
-            return "<unknown>";
-        }
-
         @Override
         public List<String> commandLine() {
-            return List.of();
+            return List.of("<unknown>");
         }
     };
 
@@ -869,6 +858,51 @@ public final class CommandOutputControl {
             Objects.requireNonNull(execAttrs);
         }
 
+        public static Builder build() {
+            return new Builder();
+        }
+
+        public static final class Builder {
+
+            public Result create() {
+                return new Result(
+                        exitCode,
+                        Optional.ofNullable(content).map(List::copyOf).map(StringListContent::new).map(c -> {
+                            return new CommandOutput<List<String>>(Optional.of(c), c.size(), true);
+                        }),
+                        Optional.empty(),
+                        Optional.ofNullable(execAttrs).orElse(EMPTY_EXECUTABLE_ATTRIBUTES));
+            }
+
+            public Builder exitCode(int v) {
+                exitCode = Optional.of(v);
+                return this;
+            }
+
+            public Builder noExitCode() {
+                exitCode = Optional.empty();
+                return this;
+            }
+
+            public Builder execAttrs(ExecutableAttributes v) {
+                execAttrs = v;
+                return this;
+            }
+
+            public Builder content(List<String> v) {
+                content = v;
+                return this;
+            }
+
+            public Builder content(String... v) {
+                return content(List.of(v));
+            }
+
+            private ExecutableAttributes execAttrs;
+            private List<String> content;
+            private Optional<Integer> exitCode = Optional.empty();
+        }
+
         public Result(int exitCode) {
             this(Optional.of(exitCode), Optional.empty(), Optional.empty(), EMPTY_EXECUTABLE_ATTRIBUTES);
         }
@@ -1019,7 +1053,8 @@ public final class CommandOutputControl {
         }
 
         private UnexpectedResultException(Result value) {
-            this(value, String.format("Unexpected result from executing the command %s", value.execAttrs()));
+            this(value, String.format("Unexpected result from executing the command %s",
+                    value.execAttrs().printableCommandLine()));
         }
 
         public Result getResult() {
@@ -1034,11 +1069,21 @@ public final class CommandOutputControl {
     public static final class UnexpectedExitCodeException extends UnexpectedResultException {
 
         public UnexpectedExitCodeException(Result value, String message) {
-            super(value, message);
+            super(requireExitCode(value), message);
         }
 
         public UnexpectedExitCodeException(Result value) {
-            this(value, String.format("Unexpected exit code %d from executing the command %s", value.getExitCode(), value.execAttrs()));
+            this(value, String.format("Unexpected exit code %d from executing the command %s",
+                    requireExitCode(value).getExitCode(), value.execAttrs().printableCommandLine()));
+        }
+
+        private static Result requireExitCode(Result v) {
+            Objects.requireNonNull(v);
+            if (v.exitCode().isPresent()) {
+                return v;
+            } else {
+                throw new IllegalArgumentException();
+            }
         }
 
         private static final long serialVersionUID = 1L;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
index 2f7f2682a71..b143a54cb5c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/FileUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,12 +57,6 @@ public final class FileUtils {
 
     public static void copyRecursive(Path src, Path dest, CopyOption... options)
             throws IOException {
-        copyRecursive(src, dest, List.of(), options);
-    }
-
-    public static void copyRecursive(Path src, Path dest,
-            final List<Path> excludes, CopyOption... options)
-            throws IOException {
 
         List<CopyAction> copyActions = new ArrayList<>();
 
@@ -71,24 +65,18 @@ public final class FileUtils {
                 @Override
                 public FileVisitResult preVisitDirectory(final Path dir,
                         final BasicFileAttributes attrs) {
-                    if (isPathMatch(dir, excludes)) {
-                        return FileVisitResult.SKIP_SUBTREE;
-                    } else {
-                        copyActions.add(new CopyAction(null, dest.resolve(src.relativize(dir))));
-                        return FileVisitResult.CONTINUE;
-                    }
+                    copyActions.add(new CopyAction(null, dest.resolve(src.relativize(dir))));
+                    return FileVisitResult.CONTINUE;
                 }
 
                 @Override
                 public FileVisitResult visitFile(final Path file,
                         final BasicFileAttributes attrs) {
-                    if (!isPathMatch(file, excludes)) {
-                        copyActions.add(new CopyAction(file, dest.resolve(src.relativize(file))));
-                    }
+                    copyActions.add(new CopyAction(file, dest.resolve(src.relativize(file))));
                     return FileVisitResult.CONTINUE;
                 }
             });
-        } else if (!isPathMatch(src, excludes)) {
+        } else {
             Optional.ofNullable(dest.getParent()).ifPresent(dstDir -> {
                 copyActions.add(new CopyAction(null, dstDir));
             });
@@ -113,10 +101,6 @@ public final class FileUtils {
         }
     }
 
-    private static boolean isPathMatch(Path what, List<Path> paths) {
-        return paths.stream().anyMatch(what::endsWith);
-    }
-
     private static record CopyAction(Path src, Path dest) {
 
         void apply(CopyOption... options) throws IOException {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundle.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MacBundle.java
similarity index 63%
rename from src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundle.java
rename to src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MacBundle.java
index 723614f9bd6..95629e7d4b5 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBundle.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MacBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,54 +23,49 @@
  * questions.
  */
 
-package jdk.jpackage.internal;
+package jdk.jpackage.internal.util;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
-import jdk.jpackage.internal.model.AppImageLayout;
 
 /**
  * An abstraction of macOS Application bundle.
  *
  * @see <a href="https://en.wikipedia.org/wiki/Bundle_(macOS)#Application_bundles">https://en.wikipedia.org/wiki/Bundle_(macOS)#Application_bundles</a>
  */
-record MacBundle(Path root) {
+public record MacBundle(Path root) {
 
-    MacBundle {
+    public MacBundle {
         Objects.requireNonNull(root);
     }
 
-    boolean isValid() {
+    public boolean isValid() {
         return Files.isDirectory(contentsDir()) && Files.isDirectory(macOsDir()) && Files.isRegularFile(infoPlistFile());
     }
 
-    boolean isSigned() {
-        return Files.isDirectory(contentsDir().resolve("_CodeSignature"));
-    }
-
-    Path contentsDir() {
+    public Path contentsDir() {
         return root.resolve("Contents");
     }
 
-    Path homeDir() {
+    public Path homeDir() {
         return contentsDir().resolve("Home");
     }
 
-    Path macOsDir() {
+    public Path macOsDir() {
         return contentsDir().resolve("MacOS");
     }
 
-    Path resourcesDir() {
+    public Path resourcesDir() {
         return contentsDir().resolve("Resources");
     }
 
-    Path infoPlistFile() {
+    public Path infoPlistFile() {
         return contentsDir().resolve("Info.plist");
     }
 
-    static Optional<MacBundle> fromPath(Path path) {
+    public static Optional<MacBundle> fromPath(Path path) {
         var bundle = new MacBundle(path);
         if (bundle.isValid()) {
             return Optional.of(bundle);
@@ -78,20 +73,4 @@ record MacBundle(Path root) {
             return Optional.empty();
         }
     }
-
-    static Optional<MacBundle> fromAppImageLayout(AppImageLayout layout) {
-        final var root = layout.rootDirectory();
-        final var bundleSubdir = root.relativize(layout.runtimeDirectory());
-        final var contentsDirname = Path.of("Contents");
-        var bundleRoot = root;
-        for (int i = 0; i != bundleSubdir.getNameCount(); i++) {
-            var nameComponent = bundleSubdir.getName(i);
-            if (contentsDirname.equals(nameComponent)) {
-                return Optional.of(new MacBundle(bundleRoot));
-            } else {
-                bundleRoot = bundleRoot.resolve(nameComponent);
-            }
-        }
-        return Optional.empty();
-    }
 }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MemoizingSupplier.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MemoizingSupplier.java
new file mode 100644
index 00000000000..2974c498867
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/MemoizingSupplier.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.util;
+
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.function.Supplier;
+
+public final class MemoizingSupplier<T> implements Supplier<T> {
+
+    public MemoizingSupplier(Supplier<T> supplier) {
+        this.future = new FutureTask<>(Objects.requireNonNull(supplier)::get);
+    }
+
+    @Override
+    public T get() {
+        try {
+            future.run();
+            return future.get();
+        } catch (InterruptedException ex) {
+            throw ExceptionBox.toUnchecked(ex);
+        } catch (ExecutionException ex) {
+            throw ExceptionBox.toUnchecked(ExceptionBox.unbox(ex.getCause()));
+        }
+    }
+
+    public static <T> Supplier<T> runOnce(Supplier<T> supplier) {
+        return new MemoizingSupplier<>(supplier);
+    }
+
+    private final FutureTask<T> future;
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/RootedPath.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/RootedPath.java
new file mode 100644
index 00000000000..21d3b6b17b0
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/RootedPath.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.util;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.CopyOption;
+import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * A relative path (branch) rooted at the root.
+ */
+public sealed interface RootedPath {
+
+    Path root();
+    Path branch();
+
+    default Path fullPath() {
+        return root().resolve(branch());
+    }
+
+    public static Function<Path, RootedPath> toRootedPath(Path root) {
+        return path -> {
+            if (!path.startsWith(root)) {
+                throw new IllegalArgumentException(String.format("Expected path [%s] to start with [%s] root", path, root));
+            }
+            return new Details.DefaultRootedPath(root, root.relativize(path), Files.isDirectory(path));
+        };
+    }
+
+    public static void copy(Stream<RootedPath> rootedPaths, Path dest, CopyOption...options) throws IOException {
+        Objects.requireNonNull(rootedPaths);
+        Objects.requireNonNull(dest);
+
+        var marks = new HashMap<Path, Details.PathMark>();
+
+        // Preset marks for the preexisting paths.
+        Files.walkFileTree(dest, new FileVisitor<Path>() {
+
+            @Override
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                marks.put(dir, new Details.PathMark(true, true));
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                marks.put(file, new Details.PathMark(false, true));
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+                return FileVisitResult.TERMINATE;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                return FileVisitResult.CONTINUE;
+            }
+
+        });
+
+        var replacePreexisting = Set.of(options).contains(StandardCopyOption.REPLACE_EXISTING);
+
+        Predicate<Details.PathMark> canReplace = v -> {
+            return v.isPreexisting() && replacePreexisting;
+        };
+
+        try {
+            rootedPaths.sequential().map(Details.DefaultRootedPath.class::cast).forEach(rootedPath -> {
+
+                final var dstPath = dest.resolve(rootedPath.branch());
+
+                var dstPathMark = marks.get(dstPath);
+
+                if (!Optional.ofNullable(dstPathMark).map(canReplace::test).orElse(true)) {
+                    // Destination path can not be replaced, bail out.
+                    return;
+                }
+
+                // Check the ancestors of the destination path.
+                for (var ancestor : Details.ancestorPaths(rootedPath.branch())) {
+                    var mark = Optional.ofNullable(marks.get(dest.resolve(ancestor)));
+
+                    if (!mark.map(Details.PathMark::isDirectory).orElse(true)) {
+                        // `ancestor` is a file, don't overwrite it.
+                        return;
+                    }
+                }
+
+                dstPathMark = rootedPath.createPathMark();
+                marks.put(dstPath, dstPathMark);
+
+                try {
+                    if (replacePreexisting && (rootedPath.isDirectory() != dstPathMark.isDirectory())) {
+                        FileUtils.deleteRecursive(dstPath);
+                    }
+
+                    if (rootedPath.isDirectory()) {
+                        Files.createDirectories(dstPath);
+                    } else {
+                        Files.createDirectories(dstPath.getParent());
+                        Files.copy(rootedPath.fullPath(), dstPath, options);
+                    }
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            });
+        } catch (UncheckedIOException ex) {
+            throw ex.getCause();
+        }
+    }
+
+    static final class Details {
+
+        private Details() {
+        }
+
+        private record DefaultRootedPath(Path root, Path branch, boolean isDirectory) implements RootedPath {
+
+            DefaultRootedPath {
+                Objects.requireNonNull(root);
+                Objects.requireNonNull(branch);
+                if (branch.isAbsolute()) {
+                    throw new IllegalArgumentException();
+                }
+            }
+
+            PathMark createPathMark() {
+                return new PathMark(isDirectory);
+            }
+        }
+
+        private record PathMark(boolean isDirectory, boolean isPreexisting) {
+            PathMark(boolean isDirectory) {
+                this(isDirectory, false);
+            }
+        }
+
+        private static List<Path> ancestorPaths(Path path) {
+            var ancestors = new ArrayList<Path>();
+            while ((path = path.getParent()) != null) {
+                ancestors.add(path);
+            }
+            return ancestors;
+        }
+    }
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java
index 40503469873..0c2963f7397 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/function/ExceptionBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
 package jdk.jpackage.internal.util.function;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
 
 public class ExceptionBox extends RuntimeException {
 
@@ -74,6 +77,40 @@ public class ExceptionBox extends RuntimeException {
         }
     }
 
+    /**
+     * Unboxes the specified throwable and its suppressed throwables recursively.
+     * <p>
+     * Calls {@link #unbox(Throwable)} on the specified throwable and nested
+     * suppressed throwables, passing the result to the {@code visitor}.
+     * <p>
+     * Throwables will be traversed in the "cause before consequence" order. E.g.:
+     * say exception "A" suppresses exceptions "B" and "C", and "B" suppresses "D".
+     * The traverse order will be "D", "B", "C", "A".
+     * <p>
+     * If the method encounters cyclic suppressed throwables, it will fall into an
+     * infinite recursion loop, eventually causing a {@code StackOverflowError}.
+     * <p>
+     * If the specified throwable or any of its nested suppressed throwables are of
+     * type {@link Error}, the method will keep notifying the {@code visitor} until
+     * it hits the first such throwable. When it happens, the method will throw this
+     * throwable.
+     *
+     * @param t       the exception to visit
+     * @param visitor the callback to apply to every subsequently visited exception
+     */
+    public static void visitUnboxedExceptionsRecursively(Throwable t, Consumer<Exception> visitor) {
+        Objects.requireNonNull(t);
+        Objects.requireNonNull(visitor);
+
+        var ex = unbox(t);
+
+        Stream.of(ex.getSuppressed()).forEach(suppressed -> {
+            visitUnboxedExceptionsRecursively(suppressed, visitor);
+        });
+
+        visitor.accept(ex);
+    }
+
     public static Error reachedUnreachable() {
         return new AssertionError("Reached unreachable!");
     }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
index de52a222d7d..e10bfb95abf 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinBundlingEnvironment.java
@@ -29,6 +29,7 @@ import static jdk.jpackage.internal.WinPackagingPipeline.APPLICATION_LAYOUT;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_APP_IMAGE;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_EXE;
 import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_WIN_MSI;
+import static jdk.jpackage.internal.util.MemoizingSupplier.runOnce;
 
 import jdk.jpackage.internal.cli.Options;
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackager.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackager.java
index 9a13a0f954d..21f941eedf5 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackager.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExePackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ final record WinExePackager(BuildEnv env, WinExePackage pkg, Path outputDir, Pat
 
     @Override
     public void accept(PackagingPipeline.Builder pipelineBuilder) {
-        pipelineBuilder.excludeDirFromCopying(outputDir)
+        pipelineBuilder
                 .task(ExePackageTaskID.RUN_POST_MSI_USER_SCRIPT)
                         .action(this::runPostMsiScript)
                         .addDependency(PackageTaskID.CREATE_PACKAGE_FILE)
@@ -79,8 +79,6 @@ final record WinExePackager(BuildEnv env, WinExePackage pkg, Path outputDir, Pat
 
     private void wrapMsiInExe() throws IOException {
 
-        Log.verbose(I18N.format("message.outputting-to-location", outputDir.toAbsolutePath()));
-
         final var msi = msi();
 
         // Copy template msi wrapper next to msi file
@@ -102,7 +100,5 @@ final record WinExePackager(BuildEnv env, WinExePackage pkg, Path outputDir, Pat
         Files.copy(exePath, dstExePath, StandardCopyOption.REPLACE_EXISTING);
 
         dstExePath.toFile().setExecutable(true);
-
-        Log.verbose(I18N.format("message.output-location", outputDir.toAbsolutePath()));
     }
 }
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
index 915d034bd82..c72b14a76d5 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiPackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,7 +162,7 @@ final class WinMsiPackager implements Consumer<PackagingPipeline.Builder> {
 
     @Override
     public void accept(PackagingPipeline.Builder pipelineBuilder) {
-        pipelineBuilder.excludeDirFromCopying(outputDir)
+        pipelineBuilder
                 .task(PackagingPipeline.PackageTaskID.CREATE_CONFIG_FILES)
                         .action(this::prepareConfigFiles)
                         .add()
@@ -315,7 +315,6 @@ final class WinMsiPackager implements Consumer<PackagingPipeline.Builder> {
 
     private void buildPackage() throws IOException {
         final var msiOut = outputDir.resolve(pkg.packageFileNameWithSuffix());
-        Log.verbose(I18N.format("message.generating-msi", msiOut.toAbsolutePath()));
         wixPipeline.buildMsi(msiOut.toAbsolutePath());
     }
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
index 1f485e6c6c8..38d0bd02bbb 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -56,13 +56,9 @@ error.missing-service-installer.advice=Add 'service-installer.exe' service insta
 
 message.icon-not-ico=The specified icon "{0}" is not an ICO file and will not be used. The default icon will be used in it's place.
 message.potential.windows.defender.issue=Warning: Windows Defender may prevent jpackage from functioning. If there is an issue, it can be addressed by either disabling realtime monitoring, or adding an exclusion for the directory "{0}".
-message.outputting-to-location=Generating EXE for installer to: {0}.
-message.output-location=Installer (.exe) saved to: {0}
 message.tool-version=Detected [{0}] version [{1}].
 message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
 message.use-wix36-features=WiX {0} detected. Enabling advanced cleanup action.
 message.product-code=MSI ProductCode: {0}.
 message.upgrade-code=MSI UpgradeCode: {0}.
 message.preparing-msi-config=Preparing MSI config: {0}.
-message.generating-msi=Generating MSI: {0}.
-
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
index bc6f6d30236..70f3b70fd66 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
@@ -337,7 +337,7 @@ class Eval {
             Set<String> anonymousClasses = Collections.emptySet();
             StringBuilder sbBrackets = new StringBuilder();
             Tree baseType = vt.getType();
-            if (baseType != null) {
+            if (vt.getType() != null && vt.getType().getKind() != Tree.Kind.VAR_TYPE) {
                 tds.scan(baseType); // Not dependent on initializer
                 fullTypeName = displayType = typeName = EvalPretty.prettyExpr((JCTree) vt.getType(), false);
                 while (baseType instanceof ArrayTypeTree) {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java b/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
index 0219fa0eaf8..11fe05fbb98 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/ReplParser.java
@@ -75,9 +75,8 @@ class ReplParser extends JavacParser {
             com.sun.tools.javac.parser.Lexer S,
             boolean keepDocComments,
             boolean keepLineMap,
-            boolean keepEndPositions,
             boolean forceExpression) {
-        super(fac, S, keepDocComments, keepLineMap, keepEndPositions);
+        super(fac, S, keepDocComments, keepLineMap);
         this.forceExpression = forceExpression;
         this.source = fac.source;
     }
@@ -103,7 +102,7 @@ class ReplParser extends JavacParser {
 
         boolean firstTypeDecl = true;
         while (token.kind != EOF) {
-            if (token.pos > 0 && token.pos <= endPosTable.errorEndPos) {
+            if (token.pos > 0 && token.pos <= errorEndPos) {
                 // error recovery
                 skip(true, false, false, false);
                 if (token.kind == EOF) {
@@ -141,7 +140,6 @@ class ReplParser extends JavacParser {
             storeEnd(toplevel, S.prevToken().endPos);
         }
         toplevel.lineMap = S.getLineMap();
-        toplevel.endPositions = this.endPosTable;
         return toplevel;
     }
 
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java
index 5c02561807b..3a3b25dade0 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/ReplParserFactory.java
@@ -60,13 +60,8 @@ class ReplParserFactory extends ParserFactory {
     }
 
     @Override
-    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
+    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepLineMap, boolean parseModuleInfo) {
         com.sun.tools.javac.parser.Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
-        return new ReplParser(this, lexer, keepDocComments, keepLineMap, keepEndPos, forceExpression);
-    }
-
-    @Override
-    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap, boolean parseModuleInfo) {
-        return newParser(input, keepDocComments, keepEndPos, keepLineMap);
+        return new ReplParser(this, lexer, keepDocComments, keepLineMap, forceExpression);
     }
 }
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
index d5b44b569a4..35faab231af 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@ import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.Scope;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.Tree.Kind;
-import static com.sun.source.tree.Tree.Kind.METHOD;
 import com.sun.source.tree.TypeParameterTree;
 import com.sun.source.tree.VariableTree;
 import com.sun.source.tree.YieldTree;
@@ -81,6 +80,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
+import java.util.TreeSet;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -114,7 +114,6 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.BiConsumer;
@@ -149,14 +148,10 @@ import javax.tools.JavaFileManager.Location;
 import javax.tools.StandardLocation;
 
 import jdk.jshell.ExpressionToTypeInfo.ExpressionInfo;
-import static jdk.jshell.Util.REPL_DOESNOTMATTER_CLASS_NAME;
 import static jdk.jshell.SourceCodeAnalysis.Completeness.DEFINITELY_INCOMPLETE;
 import static jdk.jshell.TreeDissector.printType;
 
 import static java.util.stream.Collectors.joining;
-import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
-import static javax.lang.model.element.ElementKind.MODULE;
-import static javax.lang.model.element.ElementKind.PACKAGE;
 
 import javax.lang.model.type.IntersectionType;
 import javax.lang.model.util.Elements;
@@ -815,13 +810,13 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
         };
         String wrappedCode = codeWrap.wrapped();
         return this.proc.taskFactory.analyze(codeWrap, task -> {
-            List<Highlight> result = new ArrayList<>();
+            TreeSet<Highlight> result = new TreeSet<>(Comparator.comparing(Highlight::start).thenComparing(Highlight::end));
             CompilationUnitTree cut = task.cuTrees().iterator().next();
             Trees trees = task.trees();
             SourcePositions sp = trees.getSourcePositions();
             List<Token> tokens = new ArrayList<>();
             Context ctx = new Context();
-            ctx.put(DiagnosticListener.class, (DiagnosticListener) d -> {});
+            ctx.put(DiagnosticListener.class, (DiagnosticListener<?>) d -> {});
             Scanner scanner = ScannerFactory.instance(ctx).newScanner(wrappedCode, false);
             Log.instance(ctx).useSource(cut.getSourceFile());
             scanner.nextToken();
@@ -937,7 +932,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 @Override
                 public Void visitVariable(VariableTree node, Void p) {
                     int pos = ((JCTree) node).pos;
-                    if (sp.getEndPosition(cut, node.getType()) == (-1)) {
+                    if (node.getType() != null && node.getType().getKind() == Kind.VAR_TYPE) {
                         Token varCandidate = findTokensBefore(pos, TokenKind.IDENTIFIER);
                         if (varCandidate != null && "var".equals(varCandidate.name().toString())) {
                             addKeyword.accept(varCandidate);
@@ -1050,8 +1045,7 @@ class SourceCodeAnalysisImpl extends SourceCodeAnalysis {
                 }
             }.scan(cut, null);
             result.removeIf(h -> h.start() == h.end());
-            Collections.sort(result, (h1, h2) -> h1.start() - h2.start());
-            return result;
+            return new ArrayList<>(result);
         });
     }
 
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
index 13c07ea32c0..0de0e27ec07 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java
@@ -819,9 +819,9 @@ class TaskFactory {
         }
 
         @Override
-        public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap, boolean parseModuleInfo) {
+        public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepLineMap, boolean parseModuleInfo) {
             com.sun.tools.javac.parser.Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
-            return new JavacParser(this, lexer, keepDocComments, keepLineMap, keepEndPos, parseModuleInfo) {
+            return new JavacParser(this, lexer, keepDocComments, keepLineMap, parseModuleInfo) {
                 @Override
                 public JCExpression parseType(boolean allowVar, com.sun.tools.javac.util.List<JCTree.JCAnnotation> annotations) {
                     int pos = token.pos;
diff --git a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java
index e0b8dce556e..a2b927cdaa0 100644
--- a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java
+++ b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/ResourceRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@ import java.nio.charset.StandardCharsets;
  * The string format is based on the master file representation in
  * RFC 1035.
  *
- * @author Scott Seligman
  */
 
 
@@ -484,11 +483,11 @@ public class ResourceRecord {
         pos += 2;
         int preference = getUShort(pos);
         pos += 2;
-        StringBuffer flags = new StringBuffer();
+        StringBuilder flags = new StringBuilder();
         pos += decodeCharString(pos, flags);
-        StringBuffer services = new StringBuffer();
+        StringBuilder services = new StringBuilder();
         pos += decodeCharString(pos, services);
-        StringBuffer regexp = new StringBuffer(rdlen);
+        StringBuilder regexp = new StringBuilder(rdlen);
         pos += decodeCharString(pos, regexp);
         DnsName replacement = decodeName(pos);
 
@@ -501,7 +500,7 @@ public class ResourceRecord {
      * The rdata consists of one or more <character-string>s.
      */
     private String decodeTxt(int pos) {
-        StringBuffer buf = new StringBuffer(rdlen);
+        StringBuilder buf = new StringBuilder(rdlen);
         int end = pos + rdlen;
         while (pos < end) {
             pos += decodeCharString(pos, buf);
@@ -517,7 +516,7 @@ public class ResourceRecord {
      * The rdata consists of two <character-string>s.
      */
     private String decodeHinfo(int pos) {
-        StringBuffer buf = new StringBuffer(rdlen);
+        StringBuilder buf = new StringBuilder(rdlen);
         pos += decodeCharString(pos, buf);
         buf.append(' ');
         pos += decodeCharString(pos, buf);
@@ -532,7 +531,7 @@ public class ResourceRecord {
      * Returns the size of the encoded string, including the initial
      * length octet.
      */
-    private int decodeCharString(int pos, StringBuffer buf) {
+    private int decodeCharString(int pos, StringBuilder buf) {
         int start = buf.length();       // starting index of this string
         int len = getUByte(pos++);      // encoded string length
         boolean quoted = (len == 0);    // quote string if empty
diff --git a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
index 485ebf13f2c..263aa58e098 100644
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java
@@ -84,9 +84,9 @@ public class SctpChannelImpl extends SctpChannel
 
     private final int fdVal;
 
-    /* IDs of native threads doing send and receive, for signalling */
-    private volatile long receiverThread;
-    private volatile long senderThread;
+    /* Threads doing send and receive, for signalling */
+    private volatile Thread receiverThread;
+    private volatile Thread senderThread;
 
     /* Lock held by current receiving or connecting thread */
     private final Object receiveLock = new Object();
@@ -326,7 +326,7 @@ public class SctpChannelImpl extends SctpChannel
 
     private void receiverCleanup() throws IOException {
         synchronized (stateLock) {
-            receiverThread = 0;
+            receiverThread = null;
             if (state == ChannelState.KILLPENDING)
                 kill();
         }
@@ -334,7 +334,7 @@ public class SctpChannelImpl extends SctpChannel
 
     private void senderCleanup() throws IOException {
         synchronized (stateLock) {
-            senderThread = 0;
+            senderThread = null;
             if (state == ChannelState.KILLPENDING)
                 kill();
         }
@@ -367,7 +367,7 @@ public class SctpChannelImpl extends SctpChannel
                                 if (!isOpen()) {
                                     return false;
                                 }
-                                receiverThread = NativeThread.current();
+                                receiverThread = NativeThread.threadToSignal();
                             }
                             for (;;) {
                                 InetAddress ia = isa.getAddress();
@@ -472,7 +472,7 @@ public class SctpChannelImpl extends SctpChannel
                                 if (!isOpen()) {
                                     return false;
                                 }
-                                receiverThread = NativeThread.current();
+                                receiverThread = NativeThread.threadToSignal();
                             }
                             if (!isBlocking()) {
                                 connected = Net.pollConnect(fd, 0);
@@ -484,7 +484,7 @@ public class SctpChannelImpl extends SctpChannel
                         }
                     } finally {
                         synchronized (stateLock) {
-                            receiverThread = 0;
+                            receiverThread = null;
                             if (state == ChannelState.KILLPENDING) {
                                 kill();
                                 connected = false;
@@ -541,10 +541,10 @@ public class SctpChannelImpl extends SctpChannel
             if (state != ChannelState.KILLED)
                 SctpNet.preClose(fdVal);
 
-            if (receiverThread != 0)
+            if (receiverThread != null)
                 NativeThread.signal(receiverThread);
 
-            if (senderThread != 0)
+            if (senderThread != null)
                 NativeThread.signal(senderThread);
 
             if (!isRegistered())
@@ -644,7 +644,7 @@ public class SctpChannelImpl extends SctpChannel
 
             /* Postpone the kill if there is a waiting reader
              * or writer thread. */
-            if (receiverThread == 0 && senderThread == 0) {
+            if (receiverThread == null && senderThread == null) {
                 state = ChannelState.KILLED;
                 SctpNet.close(fdVal);
             } else {
@@ -743,7 +743,7 @@ public class SctpChannelImpl extends SctpChannel
                         synchronized (stateLock) {
                             if(!isOpen())
                                 return null;
-                            receiverThread = NativeThread.current();
+                            receiverThread = NativeThread.threadToSignal();
                         }
 
                         do {
@@ -936,7 +936,7 @@ public class SctpChannelImpl extends SctpChannel
                 synchronized (stateLock) {
                     if(!isOpen())
                         return 0;
-                    senderThread = NativeThread.current();
+                    senderThread = NativeThread.threadToSignal();
                 }
 
                 do {
@@ -1031,7 +1031,7 @@ public class SctpChannelImpl extends SctpChannel
 
             ensureSendOpen();
             SctpNet.shutdown(fdVal, -1);
-            if (senderThread != 0)
+            if (senderThread != null)
                 NativeThread.signal(senderThread);
             isShutdown = true;
         }
diff --git a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
index 31e83d72f96..c08c6dc88d0 100644
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
@@ -81,9 +81,9 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
 
     private final int fdVal;
 
-    /* IDs of native threads doing send and receives, for signalling */
-    private volatile long receiverThread;
-    private volatile long senderThread;
+    /* Threads doing send and receives, for signalling */
+    private volatile Thread receiverThread;
+    private volatile Thread senderThread;
 
     /* Lock held by current receiving thread */
     private final Object receiveLock = new Object();
@@ -265,7 +265,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
 
     private void receiverCleanup() throws IOException {
         synchronized (stateLock) {
-            receiverThread = 0;
+            receiverThread = null;
             if (state == ChannelState.KILLPENDING)
                 kill();
         }
@@ -273,7 +273,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
 
     private void senderCleanup() throws IOException {
         synchronized (stateLock) {
-            senderThread = 0;
+            senderThread = null;
             if (state == ChannelState.KILLPENDING)
                 kill();
         }
@@ -290,10 +290,10 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
             if (state != ChannelState.KILLED)
                 SctpNet.preClose(fdVal);
 
-            if (receiverThread != 0)
+            if (receiverThread != null)
                 NativeThread.signal(receiverThread);
 
-            if (senderThread != 0)
+            if (senderThread != null)
                 NativeThread.signal(senderThread);
 
             if (!isRegistered())
@@ -378,7 +378,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
             assert !isOpen() && !isRegistered();
 
             /* Postpone the kill if there is a thread sending or receiving. */
-            if (receiverThread == 0 && senderThread == 0) {
+            if (receiverThread == null && senderThread == null) {
                 state = ChannelState.KILLED;
                 SctpNet.close(fdVal);
             } else {
@@ -484,7 +484,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
                         synchronized (stateLock) {
                             if(!isOpen())
                                 return null;
-                            receiverThread = NativeThread.current();
+                            receiverThread = NativeThread.threadToSignal();
                         }
 
                         do {
@@ -765,7 +765,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
                 synchronized (stateLock) {
                     if(!isOpen())
                         return 0;
-                    senderThread = NativeThread.current();
+                    senderThread = NativeThread.threadToSignal();
 
                     /* Determine what address or association to send to */
                     Association assoc = messageInfo.association();
diff --git a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
index 4b2be742c6d..f72e0938eb5 100644
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,8 +58,8 @@ public class SctpServerChannelImpl extends SctpServerChannel
 
     private final int fdVal;
 
-    /* IDs of native thread doing accept, for signalling */
-    private volatile long thread;
+    /* thread doing accept, for signalling */
+    private volatile Thread thread;
 
     /* Lock held by thread currently blocked in this channel */
     private final Object lock = new Object();
@@ -200,7 +200,7 @@ public class SctpServerChannelImpl extends SctpServerChannel
 
     private void acceptCleanup() throws IOException {
         synchronized (stateLock) {
-            thread = 0;
+            thread = null;
             if (state == ChannelState.KILLPENDING)
                 kill();
         }
@@ -222,7 +222,7 @@ public class SctpServerChannelImpl extends SctpServerChannel
                 begin();
                 if (!isOpen())
                     return null;
-                thread = NativeThread.current();
+                thread = NativeThread.threadToSignal();
                 for (;;) {
                     n = Net.accept(fd, newfd, isaa);
                     if ((n == IOStatus.INTERRUPTED) && isOpen())
@@ -253,7 +253,7 @@ public class SctpServerChannelImpl extends SctpServerChannel
         synchronized (stateLock) {
             if (state != ChannelState.KILLED)
                 SctpNet.preClose(fdVal);
-            if (thread != 0)
+            if (thread != null)
                 NativeThread.signal(thread);
             if (!isRegistered())
                 kill();
@@ -273,7 +273,7 @@ public class SctpServerChannelImpl extends SctpServerChannel
             assert !isOpen() && !isRegistered();
 
             // Postpone the kill if there is a thread in accept
-            if (thread == 0) {
+            if (thread == null) {
                 state = ChannelState.KILLED;
                 SctpNet.close(fdVal);
             } else {
diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java
index 785b178e296..4f6d8ca25ef 100644
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package com.sun.security.auth.module;
 
 import java.util.*;
-import java.io.IOException;
 import javax.security.auth.*;
 import javax.security.auth.callback.*;
 import javax.security.auth.login.*;
@@ -34,6 +33,7 @@ import javax.security.auth.spi.*;
 import com.sun.security.auth.UnixPrincipal;
 import com.sun.security.auth.UnixNumericUserPrincipal;
 import com.sun.security.auth.UnixNumericGroupPrincipal;
+import jdk.internal.util.OperatingSystem;
 
 /**
  * This {@code LoginModule} imports a user's Unix
@@ -121,20 +121,34 @@ public class UnixLoginModule implements LoginModule {
      */
     public boolean login() throws LoginException {
 
-        long[] unixGroups = null;
+        // Fail immediately on Windows to avoid cygwin-like functions
+        // being loaded, which are not supported.
+        if (OperatingSystem.isWindows()) {
+            throw new FailedLoginException
+                    ("Failed in attempt to import " +
+                            "the underlying system identity information" +
+                            " on " + System.getProperty("os.name"));
+        }
 
         try {
             ss = new UnixSystem();
-        } catch (UnsatisfiedLinkError ule) {
+        } catch (ExceptionInInitializerError | UnsatisfiedLinkError ule) {
+            // Errors could happen in either static blocks or the constructor,
+            // both have a cause.
             succeeded = false;
-            throw new FailedLoginException
+            var error = new FailedLoginException
                                 ("Failed in attempt to import " +
                                 "the underlying system identity information" +
                                 " on " + System.getProperty("os.name"));
+            if (ule.getCause() != null) {
+                error.initCause(ule.getCause());
+            }
+            throw error;
         }
         userPrincipal = new UnixPrincipal(ss.getUsername());
         UIDPrincipal = new UnixNumericUserPrincipal(ss.getUid());
         GIDPrincipal = new UnixNumericGroupPrincipal(ss.getGid(), true);
+        long[] unixGroups = null;
         if (ss.getGroups() != null && ss.getGroups().length > 0) {
             unixGroups = ss.getGroups();
             for (int i = 0; i < unixGroups.length; i++) {
@@ -150,9 +164,11 @@ public class UnixLoginModule implements LoginModule {
                     "succeeded importing info: ");
             System.out.println("\t\t\tuid = " + ss.getUid());
             System.out.println("\t\t\tgid = " + ss.getGid());
-            unixGroups = ss.getGroups();
-            for (int i = 0; i < unixGroups.length; i++) {
-                System.out.println("\t\t\tsupp gid = " + unixGroups[i]);
+            System.out.println("\t\t\tusername = " + ss.getUsername());
+            if (unixGroups != null) {
+                for (int i = 0; i < unixGroups.length; i++) {
+                    System.out.println("\t\t\tsupp gid = " + unixGroups[i]);
+                }
             }
         }
         succeeded = true;
diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java
index f3741c10404..c0e47fafc2c 100644
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,38 +25,194 @@
 
 package com.sun.security.auth.module;
 
+import jdk.internal.util.Architecture;
+import jdk.internal.util.OperatingSystem;
+
+import java.lang.foreign.AddressLayout;
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.GroupLayout;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.StructLayout;
+import java.lang.foreign.SymbolLookup;
+import java.lang.foreign.ValueLayout;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.VarHandle;
+
+import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
+
 /**
  * This class implementation retrieves and makes available Unix
  * UID/GID/groups information for the current user.
  *
  * @since 1.4
  */
+@SuppressWarnings("restricted")
 public class UnixSystem {
 
-    private native void getUnixInfo();
-
-    // Warning: the following 4 fields are used by Unix.c
-
-    /** The current username. */
+    /**
+     * The current username.
+     */
     protected String username;
 
-    /** The current user ID. */
+    /**
+     * The current user ID.
+     */
     protected long uid;
 
-    /** The current group ID. */
+    /**
+     * The current group ID.
+     */
     protected long gid;
 
-    /** The current list of groups. */
+    /**
+     * The current list of groups.
+     */
     protected long[] groups;
 
+    private static final Linker LINKER = Linker.nativeLinker();
+    private static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.loaderLookup()
+            .or(LINKER.defaultLookup());
+
+    private static final ValueLayout.OfByte C_CHAR
+            = (ValueLayout.OfByte) LINKER.canonicalLayouts().get("char");
+    private static final ValueLayout.OfInt C_INT
+            = (ValueLayout.OfInt) LINKER.canonicalLayouts().get("int");
+    private static final ValueLayout.OfLong C_LONG
+            = (ValueLayout.OfLong) LINKER.canonicalLayouts().get("long");
+    private static final AddressLayout C_POINTER
+            = ((AddressLayout) LINKER.canonicalLayouts().get("void*"))
+            .withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, C_CHAR));
+    private static final ValueLayout C_SIZE_T
+            = (ValueLayout) LINKER.canonicalLayouts().get("size_t");
+
+    private static final StructLayout CAPTURE_STATE_LAYOUT
+            = Linker.Option.captureStateLayout();
+    private static final VarHandle VH_errno = CAPTURE_STATE_LAYOUT.varHandle(
+            MemoryLayout.PathElement.groupElement("errno"));
+
+    private static final MethodHandle MH_strerror
+            = LINKER.downcallHandle(SYMBOL_LOOKUP.findOrThrow("strerror"),
+                    FunctionDescriptor.of(C_POINTER, C_INT));
+
+    private static final MethodHandle MH_getgroups
+            = LINKER.downcallHandle(SYMBOL_LOOKUP.findOrThrow("getgroups"),
+                    FunctionDescriptor.of(C_INT, C_INT, C_POINTER),
+                    Linker.Option.captureCallState("errno"));
+    private static final MethodHandle MH_getuid
+            = LINKER.downcallHandle(SYMBOL_LOOKUP.findOrThrow("getuid"),
+                    FunctionDescriptor.of(C_INT));
+
+    // Some architectures require appropriate zero or sign extension to 64 bit.
+    // Use long directly before https://bugs.openjdk.org/browse/JDK-8336664 is resolved.
+    private static final boolean calling_convention_requires_int_as_long
+            = Architecture.isPPC64() || Architecture.isPPC64LE() || Architecture.isS390();
+
+    // getpwuid_r does not work on AIX, instead we use another similar function
+    // extern int _posix_getpwuid_r(uid_t, struct passwd *, char *, int, struct passwd **)
+    private static final MethodHandle MH_getpwuid_r
+            = LINKER.downcallHandle(SYMBOL_LOOKUP.findOrThrow(
+                            OperatingSystem.isAix() ? "_posix_getpwuid_r" : "getpwuid_r"),
+                    FunctionDescriptor.of(C_INT,
+                            calling_convention_requires_int_as_long ? C_LONG : C_INT,
+                            C_POINTER, C_POINTER,
+                            OperatingSystem.isAix() ? C_INT : C_SIZE_T,
+                            C_POINTER));
+
+    private static final GroupLayout ML_passwd = MemoryLayout.structLayout(
+            C_POINTER.withName("pw_name"),
+            C_POINTER.withName("pw_passwd"),
+            C_INT.withName("pw_uid"),
+            C_INT.withName("pw_gid"),
+            // Different platforms have different fields in `struct passwd`.
+            // While we don't need those fields here, the struct needs to be
+            // big enough to avoid buffer overflow when `getpwuid_r` is called.
+            MemoryLayout.paddingLayout(100));
+
+    private static final VarHandle VH_pw_uid
+            = ML_passwd.varHandle(groupElement("pw_uid"));
+    private static final VarHandle VH_pw_gid
+            = ML_passwd.varHandle(groupElement("pw_gid"));
+    private static final VarHandle VH_pw_name
+            = ML_passwd.varHandle(groupElement("pw_name"));
+
+    // The buffer size for the getpwuid_r function:
+    // 1. sysconf(_SC_GETPW_R_SIZE_MAX) on macOS is 4096 and 1024 on Linux,
+    //    so we choose a bigger one.
+    // 2. We do not call sysconf() here because even _SC_GETPW_R_SIZE_MAX
+    //    could be different on different platforms.
+    // 3. We choose int instead of long because the buffer_size argument
+    //    might be `int` or `long` and converting from `long` to `int`
+    //    requires an explicit cast.
+    private static final int GETPW_R_SIZE_MAX = 4096;
+
     /**
      * Instantiate a {@code UnixSystem} and load
      * the native library to access the underlying system information.
      */
-    @SuppressWarnings("restricted")
     public UnixSystem() {
-        System.loadLibrary("jaas");
-        getUnixInfo();
+        // The FFM code has only been tested on multiple platforms
+        // (including macOS, Linux, AIX, etc) and might fail on other
+        // *nix systems. Especially, the `passwd` struct could be defined
+        // differently. I've checked several and an extra 100 chars at the
+        // end seems enough.
+        try (Arena scope = Arena.ofConfined()) {
+            MemorySegment capturedState = scope.allocate(CAPTURE_STATE_LAYOUT);
+            int groupnum = (int) MH_getgroups.invokeExact(capturedState, 0, MemorySegment.NULL);
+            if (groupnum == -1) {
+                throw new RuntimeException("getgroups returns " + groupnum);
+            }
+
+            var gs = scope.allocate(C_INT, groupnum);
+            groupnum = (int) MH_getgroups.invokeExact(capturedState, groupnum, gs);
+            if (groupnum == -1) {
+                var errno = (int) VH_errno.get(capturedState, 0L);
+                var errMsg = (MemorySegment) MH_strerror.invokeExact(errno);
+                throw new RuntimeException("getgroups returns " + groupnum
+                        + ". Reason: " + errMsg.reinterpret(Long.MAX_VALUE).getString(0));
+            }
+
+            groups = new long[groupnum];
+            for (int i = 0; i < groupnum; i++) {
+                groups[i] = Integer.toUnsignedLong(gs.getAtIndex(C_INT, i));
+            }
+
+            var pwd = scope.allocate(ML_passwd);
+            var result = scope.allocate(C_POINTER);
+            var buffer = scope.allocate(GETPW_R_SIZE_MAX);
+
+            long tmpUid = Integer.toUnsignedLong((int) MH_getuid.invokeExact());
+
+            // Do not call invokeExact because the type of buffer_size is not
+            // always long in the underlying system.
+            int out;
+            if (calling_convention_requires_int_as_long) {
+                out = (int) MH_getpwuid_r.invoke(
+                        tmpUid, pwd, buffer, GETPW_R_SIZE_MAX, result);
+            } else {
+                out = (int) MH_getpwuid_r.invoke(
+                        (int) tmpUid, pwd, buffer, GETPW_R_SIZE_MAX, result);
+            }
+            if (out != 0) {
+                // If ERANGE (Result too large) is detected in a new platform,
+                // consider adjusting GETPW_R_SIZE_MAX.
+                var err = (MemorySegment) MH_strerror.invokeExact(out);
+                throw new RuntimeException(err.reinterpret(Long.MAX_VALUE).getString(0));
+            } else if (result.get(ValueLayout.ADDRESS, 0).equals(MemorySegment.NULL)) {
+                throw new RuntimeException("the requested entry is not found");
+            } else {
+                // uid_t and gid_t were defined unsigned.
+                uid = Integer.toUnsignedLong((int) VH_pw_uid.get(pwd, 0L));
+                gid = Integer.toUnsignedLong((int) VH_pw_gid.get(pwd, 0L));
+                username = ((MemorySegment) VH_pw_name.get(pwd, 0L)).getString(0);
+            }
+        } catch (Throwable t) {
+            var error = new UnsatisfiedLinkError("FFM calls failed");
+            error.initCause(t);
+            throw error;
+        }
     }
 
     /**
diff --git a/src/jdk.security.auth/unix/native/libjaas/Unix.c b/src/jdk.security.auth/unix/native/libjaas/Unix.c
deleted file mode 100644
index 3a93df9ffc9..00000000000
--- a/src/jdk.security.auth/unix/native/libjaas/Unix.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <jni.h>
-#include "jni_util.h"
-#include "com_sun_security_auth_module_UnixSystem.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <pwd.h>
-
-/*
- * Declare library specific JNI_Onload entry if static build
- */
-DEF_STATIC_JNI_OnLoad
-
-JNIEXPORT void JNICALL
-Java_com_sun_security_auth_module_UnixSystem_getUnixInfo
-                                                (JNIEnv *env, jobject obj) {
-
-    int i;
-    char pwd_buf[1024];
-    struct passwd *pwd = NULL;
-    struct passwd resbuf;
-    jfieldID userNameID;
-    jfieldID userID;
-    jfieldID groupID;
-    jfieldID supplementaryGroupID;
-
-    jstring jstr;
-    jlongArray jgroups;
-    jlong *jgroupsAsArray;
-    jsize numSuppGroups;
-    gid_t *groups;
-    jclass cls;
-
-    numSuppGroups = getgroups(0, NULL);
-    if (numSuppGroups == -1) {
-        return;
-    }
-    groups = (gid_t *)calloc(numSuppGroups, sizeof(gid_t));
-    if (groups == NULL) {
-        jclass cls = (*env)->FindClass(env,"java/lang/OutOfMemoryError");
-        if (cls != NULL) {
-            (*env)->ThrowNew(env, cls, NULL);
-        }
-        return;
-    }
-
-    cls = (*env)->GetObjectClass(env, obj);
-
-    supplementaryGroupID = (*env)->GetFieldID(env, cls, "groups", "[J");
-    if (supplementaryGroupID == 0) {
-        goto cleanUpAndReturn;
-    }
-
-    if (getgroups(numSuppGroups, groups) != -1) {
-        jgroups = (*env)->NewLongArray(env, numSuppGroups);
-        if (jgroups == NULL) {
-            goto cleanUpAndReturn;
-        }
-        jgroupsAsArray = (*env)->GetLongArrayElements(env, jgroups, 0);
-        if (jgroupsAsArray == NULL) {
-            goto cleanUpAndReturn;
-        }
-        for (i = 0; i < numSuppGroups; i++) {
-            jgroupsAsArray[i] = groups[i];
-        }
-        (*env)->ReleaseLongArrayElements(env, jgroups, jgroupsAsArray, 0);
-        (*env)->SetObjectField(env, obj, supplementaryGroupID, jgroups);
-    }
-
-    userNameID = (*env)->GetFieldID(env, cls, "username", "Ljava/lang/String;");
-    if (userNameID == 0) {
-        goto cleanUpAndReturn;
-    }
-
-    userID = (*env)->GetFieldID(env, cls, "uid", "J");
-    if (userID == 0) {
-        goto cleanUpAndReturn;
-    }
-
-    groupID = (*env)->GetFieldID(env, cls, "gid", "J");
-    if (groupID == 0) {
-        goto cleanUpAndReturn;
-    }
-
-    memset(pwd_buf, 0, sizeof(pwd_buf));
-    if (getpwuid_r(getuid(), &resbuf, pwd_buf, sizeof(pwd_buf), &pwd) == 0 &&
-            pwd != NULL) {
-        (*env)->SetLongField(env, obj, userID, pwd->pw_uid);
-        (*env)->SetLongField(env, obj, groupID, pwd->pw_gid);
-        jstr = (*env)->NewStringUTF(env, pwd->pw_name);
-        if (jstr == NULL) {
-            goto cleanUpAndReturn;
-        }
-        (*env)->SetObjectField(env, obj, userNameID, jstr);
-    } else {
-        (*env)->SetLongField(env, obj, userID, getuid());
-        (*env)->SetLongField(env, obj, groupID, getgid());
-    }
-cleanUpAndReturn:
-    free(groups);
-    return;
-}
diff --git a/src/jdk.unsupported.desktop/share/classes/jdk/swing/interop/SwingInterOpUtils.java b/src/jdk.unsupported.desktop/share/classes/jdk/swing/interop/SwingInterOpUtils.java
index 589744641e4..aaed4d3e048 100644
--- a/src/jdk.unsupported.desktop/share/classes/jdk/swing/interop/SwingInterOpUtils.java
+++ b/src/jdk.unsupported.desktop/share/classes/jdk/swing/interop/SwingInterOpUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.AWTEvent;
 import sun.awt.SunToolkit;
-import sun.awt.AppContext;
 import sun.awt.UngrabEvent;
 
 /**
@@ -47,10 +46,7 @@ public class SwingInterOpUtils {
     public SwingInterOpUtils() {}
 
     public static void postEvent(Object target, java.awt.AWTEvent e) {
-        AppContext context = SunToolkit.targetToAppContext(target);
-        if (context != null) {
-            SunToolkit.postEvent(context, e);
-        }
+        SunToolkit.postEvent(e);
     }
 
     public static void grab(Toolkit toolkit, Window window) {
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index ab471694890..3223ff9dccd 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,6 +105,9 @@ class ZipFileSystem extends FileSystem {
     private static final String COMPRESSION_METHOD_DEFLATED = "DEFLATED";
     // Value specified for compressionMethod property to not compress Zip entries
     private static final String COMPRESSION_METHOD_STORED = "STORED";
+    // CEN size is limited to the maximum array size in the JDK
+    // See ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
+    private static final int MAX_CEN_SIZE = Integer.MAX_VALUE - 8;
 
     private final ZipFileSystemProvider provider;
     private final Path zfpath;
@@ -1233,7 +1236,7 @@ class ZipFileSystem extends FileSystem {
 
     private volatile boolean isOpen = true;
     private final SeekableByteChannel ch; // channel to the zipfile
-    final byte[]  cen;     // CEN & ENDHDR
+    final byte[]  cen;     // CEN
     private END  end;
     private long locpos;   // position of first LOC header (usually 0)
 
@@ -1353,7 +1356,7 @@ class ZipFileSystem extends FileSystem {
                     // to use the end64 values
                     end.cenlen = cenlen64;
                     end.cenoff = cenoff64;
-                    end.centot = (int)centot64; // assume total < 2g
+                    end.centot = centot64;
                     end.endpos = end64pos;
                     return end;
                 }
@@ -1575,25 +1578,36 @@ class ZipFileSystem extends FileSystem {
             buildNodeTree();
             return null;         // only END header present
         }
-        if (end.cenlen > end.endpos)
-            throw new ZipException("invalid END header (bad central directory size)");
+        // Validate END header
+        if (end.cenlen > end.endpos) {
+            zerror("invalid END header (bad central directory size)");
+        }
         long cenpos = end.endpos - end.cenlen;     // position of CEN table
-
         // Get position of first local file (LOC) header, taking into
-        // account that there may be a stub prefixed to the zip file.
+        // account that there may be a stub prefixed to the ZIP file.
         locpos = cenpos - end.cenoff;
-        if (locpos < 0)
-            throw new ZipException("invalid END header (bad central directory offset)");
+        if (locpos < 0) {
+            zerror("invalid END header (bad central directory offset)");
+        }
+        if (end.cenlen > MAX_CEN_SIZE) {
+            zerror("invalid END header (central directory size too large)");
+        }
+        if (end.centot < 0 || end.centot > end.cenlen / CENHDR) {
+            zerror("invalid END header (total entries count too large)");
+        }
+        // Validation ensures these are <= Integer.MAX_VALUE
+        int cenlen = Math.toIntExact(end.cenlen);
+        int centot = Math.toIntExact(end.centot);
 
-        // read in the CEN and END
-        byte[] cen = new byte[(int)(end.cenlen + ENDHDR)];
-        if (readNBytesAt(cen, 0, cen.length, cenpos) != end.cenlen + ENDHDR) {
-            throw new ZipException("read CEN tables failed");
+        // read in the CEN
+        byte[] cen = new byte[cenlen];
+        if (readNBytesAt(cen, 0, cen.length, cenpos) != cenlen) {
+            zerror("read CEN tables failed");
         }
         // Iterate through the entries in the central directory
-        inodes = LinkedHashMap.newLinkedHashMap(end.centot + 1);
+        inodes = LinkedHashMap.newLinkedHashMap(centot + 1);
         int pos = 0;
-        int limit = cen.length - ENDHDR;
+        int limit = cen.length;
         while (pos < limit) {
             if (!cenSigAt(cen, pos))
                 throw new ZipException("invalid CEN header (bad signature)");
@@ -1641,7 +1655,7 @@ class ZipFileSystem extends FileSystem {
             // skip ext and comment
             pos += (CENHDR + nlen + elen + clen);
         }
-        if (pos + ENDHDR != cen.length) {
+        if (pos != cen.length) {
             throw new ZipException("invalid CEN header (bad header size)");
         }
         buildNodeTree();
@@ -1671,7 +1685,7 @@ class ZipFileSystem extends FileSystem {
         }
         // CEN Offset where this Extra field ends
         int extraEndOffset = startingOffset + extraFieldLen;
-        if (extraEndOffset > cen.length - ENDHDR) {
+        if (extraEndOffset > cen.length) {
             zerror("Invalid CEN header (extra data field size too long)");
         }
         int currentOffset = startingOffset;
@@ -2666,7 +2680,7 @@ class ZipFileSystem extends FileSystem {
         // int  disknum;
         // int  sdisknum;
         // int  endsub;
-        int  centot;        // 4 bytes
+        long centot;        // 4 bytes
         long cenlen;        // 4 bytes
         long cenoff;        // 4 bytes
         // int  comlen;     // comment length
@@ -2689,7 +2703,7 @@ class ZipFileSystem extends FileSystem {
                 xoff = ZIP64_MINVAL;
                 hasZip64 = true;
             }
-            int count = centot;
+            int count = Math.toIntExact(centot);
             if (count >= ZIP64_MINVAL32) {
                 count = ZIP64_MINVAL32;
                 hasZip64 = true;
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
index 66af78e53d2..adfa975c1c3 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@ import static java.nio.file.StandardOpenOption.WRITE;
  */
 final class ZipPath implements Path {
 
+    private static final byte[] EMPTY_PATH = new byte[0];
+
     private final ZipFileSystem zfs;
     private final byte[] path;
     private volatile int[] offsets;
@@ -93,8 +95,15 @@ final class ZipPath implements Path {
     @Override
     public ZipPath getFileName() {
         int off = path.length;
-        if (off == 0 || off == 1 && path[0] == '/')
+        if (off == 0) {
+            // empty path, which is defined as consisting solely of
+            // one name element that is empty
+            return new ZipPath(getFileSystem(), EMPTY_PATH, true);
+        }
+        if (off == 1 && path[0] == '/') {
+            // root path, which is defined as having 0 name elements
             return null;
+        }
         while (--off >= 0 && path[off] != '/') {}
         if (off < 0)
             return this;
diff --git a/test/docs/ProblemList.txt b/test/docs/ProblemList.txt
index c846678665d..d856f9c955e 100644
--- a/test/docs/ProblemList.txt
+++ b/test/docs/ProblemList.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,3 +39,16 @@
 # More than one label is allowed but must be on the same line.
 #
 #############################################################################
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/docs/TEST.ROOT b/test/docs/TEST.ROOT
index 69e66b08b88..9a7e66b631c 100644
--- a/test/docs/TEST.ROOT
+++ b/test/docs/TEST.ROOT
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=8.1+1
+requiredVersion=8.2.1+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/hotspot/gtest/aarch64/aarch64-asmtest.py b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
index 48b19acaa05..1ac2e1a89cd 100644
--- a/test/hotspot/gtest/aarch64/aarch64-asmtest.py
+++ b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
@@ -1871,6 +1871,12 @@ generate(ThreeRegNEONOp,
           ["sminp", "sminp", "8B"], ["sminp", "sminp", "16B"],
           ["sminp", "sminp", "4H"], ["sminp", "sminp", "8H"],
           ["sminp", "sminp", "2S"], ["sminp", "sminp", "4S"],
+          ["uminp", "uminp", "8B"], ["uminp", "uminp", "16B"],
+          ["uminp", "uminp", "4H"], ["uminp", "uminp", "8H"],
+          ["uminp", "uminp", "2S"], ["uminp", "uminp", "4S"],
+          ["umaxp", "umaxp", "8B"], ["umaxp", "umaxp", "16B"],
+          ["umaxp", "umaxp", "4H"], ["umaxp", "umaxp", "8H"],
+          ["umaxp", "umaxp", "2S"], ["umaxp", "umaxp", "4S"],
           ["sqdmulh", "sqdmulh", "4H"], ["sqdmulh", "sqdmulh", "8H"],
           ["sqdmulh", "sqdmulh", "2S"], ["sqdmulh", "sqdmulh", "4S"],
           ["shsubv", "shsub", "8B"], ["shsubv", "shsub", "16B"],
@@ -2252,7 +2258,7 @@ generate(SVEVectorOp, [["add", "ZZZ"],
                        ["uqsub", "ZPZ", "m", "dn"],
                       ])
 
-generate(SVEReductionOp, [["andv", 0], ["orv", 0], ["eorv", 0], ["smaxv", 0], ["sminv", 0],
+generate(SVEReductionOp, [["andv", 0], ["orv", 0], ["eorv", 0], ["smaxv", 0], ["sminv", 0], ["umaxv", 0], ["uminv", 0],
                           ["fminv", 2], ["fmaxv", 2], ["fadda", 2], ["uaddv", 0]])
 
 generate(AddWideNEONOp,
diff --git a/test/hotspot/gtest/aarch64/asmtest.out.h b/test/hotspot/gtest/aarch64/asmtest.out.h
index 34a5f8ca68e..22bb6c57784 100644
--- a/test/hotspot/gtest/aarch64/asmtest.out.h
+++ b/test/hotspot/gtest/aarch64/asmtest.out.h
@@ -826,107 +826,119 @@
     __ sminp(v10, __ T8H, v11, v12);                   //       sminp   v10.8H, v11.8H, v12.8H
     __ sminp(v20, __ T2S, v21, v22);                   //       sminp   v20.2S, v21.2S, v22.2S
     __ sminp(v10, __ T4S, v11, v12);                   //       sminp   v10.4S, v11.4S, v12.4S
-    __ sqdmulh(v4, __ T4H, v5, v6);                    //       sqdmulh v4.4H, v5.4H, v6.4H
-    __ sqdmulh(v24, __ T8H, v25, v26);                 //       sqdmulh v24.8H, v25.8H, v26.8H
-    __ sqdmulh(v17, __ T2S, v18, v19);                 //       sqdmulh v17.2S, v18.2S, v19.2S
-    __ sqdmulh(v17, __ T4S, v18, v19);                 //       sqdmulh v17.4S, v18.4S, v19.4S
-    __ shsubv(v22, __ T8B, v23, v24);                  //       shsub   v22.8B, v23.8B, v24.8B
-    __ shsubv(v3, __ T16B, v4, v5);                    //       shsub   v3.16B, v4.16B, v5.16B
-    __ shsubv(v29, __ T4H, v30, v31);                  //       shsub   v29.4H, v30.4H, v31.4H
-    __ shsubv(v15, __ T8H, v16, v17);                  //       shsub   v15.8H, v16.8H, v17.8H
-    __ shsubv(v22, __ T2S, v23, v24);                  //       shsub   v22.2S, v23.2S, v24.2S
-    __ shsubv(v19, __ T4S, v20, v21);                  //       shsub   v19.4S, v20.4S, v21.4S
+    __ uminp(v4, __ T8B, v5, v6);                      //       uminp   v4.8B, v5.8B, v6.8B
+    __ uminp(v24, __ T16B, v25, v26);                  //       uminp   v24.16B, v25.16B, v26.16B
+    __ uminp(v17, __ T4H, v18, v19);                   //       uminp   v17.4H, v18.4H, v19.4H
+    __ uminp(v17, __ T8H, v18, v19);                   //       uminp   v17.8H, v18.8H, v19.8H
+    __ uminp(v22, __ T2S, v23, v24);                   //       uminp   v22.2S, v23.2S, v24.2S
+    __ uminp(v3, __ T4S, v4, v5);                      //       uminp   v3.4S, v4.4S, v5.4S
+    __ umaxp(v29, __ T8B, v30, v31);                   //       umaxp   v29.8B, v30.8B, v31.8B
+    __ umaxp(v15, __ T16B, v16, v17);                  //       umaxp   v15.16B, v16.16B, v17.16B
+    __ umaxp(v22, __ T4H, v23, v24);                   //       umaxp   v22.4H, v23.4H, v24.4H
+    __ umaxp(v19, __ T8H, v20, v21);                   //       umaxp   v19.8H, v20.8H, v21.8H
+    __ umaxp(v19, __ T2S, v20, v21);                   //       umaxp   v19.2S, v20.2S, v21.2S
+    __ umaxp(v22, __ T4S, v23, v24);                   //       umaxp   v22.4S, v23.4S, v24.4S
+    __ sqdmulh(v2, __ T4H, v3, v4);                    //       sqdmulh v2.4H, v3.4H, v4.4H
+    __ sqdmulh(v15, __ T8H, v16, v17);                 //       sqdmulh v15.8H, v16.8H, v17.8H
+    __ sqdmulh(v6, __ T2S, v7, v8);                    //       sqdmulh v6.2S, v7.2S, v8.2S
+    __ sqdmulh(v12, __ T4S, v13, v14);                 //       sqdmulh v12.4S, v13.4S, v14.4S
+    __ shsubv(v16, __ T8B, v17, v18);                  //       shsub   v16.8B, v17.8B, v18.8B
+    __ shsubv(v11, __ T16B, v12, v13);                 //       shsub   v11.16B, v12.16B, v13.16B
+    __ shsubv(v13, __ T4H, v14, v15);                  //       shsub   v13.4H, v14.4H, v15.4H
+    __ shsubv(v23, __ T8H, v24, v25);                  //       shsub   v23.8H, v24.8H, v25.8H
+    __ shsubv(v1, __ T2S, v2, v3);                     //       shsub   v1.2S, v2.2S, v3.2S
+    __ shsubv(v30, __ T4S, v31, v0);                   //       shsub   v30.4S, v31.4S, v0.4S
     __ fmin(v19, __ T2S, v20, v21);                    //       fmin    v19.2S, v20.2S, v21.2S
-    __ fmin(v22, __ T4S, v23, v24);                    //       fmin    v22.4S, v23.4S, v24.4S
-    __ fmin(v2, __ T2D, v3, v4);                       //       fmin    v2.2D, v3.2D, v4.2D
-    __ fmin(v15, __ T4H, v16, v17);                    //       fmin    v15.4H, v16.4H, v17.4H
-    __ fmin(v6, __ T8H, v7, v8);                       //       fmin    v6.8H, v7.8H, v8.8H
-    __ facgt(v12, __ T2S, v13, v14);                   //       facgt   v12.2S, v13.2S, v14.2S
-    __ facgt(v16, __ T4S, v17, v18);                   //       facgt   v16.4S, v17.4S, v18.4S
-    __ facgt(v11, __ T2D, v12, v13);                   //       facgt   v11.2D, v12.2D, v13.2D
-    __ facgt(v13, __ T4H, v14, v15);                   //       facgt   v13.4H, v14.4H, v15.4H
-    __ facgt(v23, __ T8H, v24, v25);                   //       facgt   v23.8H, v24.8H, v25.8H
+    __ fmin(v5, __ T4S, v6, v7);                       //       fmin    v5.4S, v6.4S, v7.4S
+    __ fmin(v17, __ T2D, v18, v19);                    //       fmin    v17.2D, v18.2D, v19.2D
+    __ fmin(v2, __ T4H, v3, v4);                       //       fmin    v2.4H, v3.4H, v4.4H
+    __ fmin(v16, __ T8H, v17, v18);                    //       fmin    v16.8H, v17.8H, v18.8H
+    __ facgt(v22, __ T2S, v23, v24);                   //       facgt   v22.2S, v23.2S, v24.2S
+    __ facgt(v13, __ T4S, v14, v15);                   //       facgt   v13.4S, v14.4S, v15.4S
+    __ facgt(v10, __ T2D, v11, v12);                   //       facgt   v10.2D, v11.2D, v12.2D
+    __ facgt(v21, __ T4H, v22, v23);                   //       facgt   v21.4H, v22.4H, v23.4H
+    __ facgt(v29, __ T8H, v30, v31);                   //       facgt   v29.8H, v30.8H, v31.8H
 
 // VectorScalarNEONInstruction
-    __ fmlavs(v15, __ T2S, v0, v1, 0);                 //       fmla    v15.2S, v0.2S, v1.S[0]
-    __ mulvs(v2, __ T4S, v3, v4, 2);                   //       mul     v2.4S, v3.4S, v4.S[2]
-    __ fmlavs(v1, __ T2D, v2, v3, 1);                  //       fmla    v1.2D, v2.2D, v3.D[1]
-    __ fmlsvs(v11, __ T2S, v12, v13, 1);               //       fmls    v11.2S, v12.2S, v13.S[1]
-    __ mulvs(v5, __ T4S, v6, v7, 1);                   //       mul     v5.4S, v6.4S, v7.S[1]
-    __ fmlsvs(v14, __ T2D, v15, v16, 1);               //       fmls    v14.2D, v15.2D, v16.D[1]
-    __ fmulxvs(v6, __ T2S, v7, v8, 1);                 //       fmulx   v6.2S, v7.2S, v8.S[1]
+    __ fmlavs(v6, __ T2S, v7, v8, 1);                  //       fmla    v6.2S, v7.2S, v8.S[1]
     __ mulvs(v1, __ T4S, v2, v3, 3);                   //       mul     v1.4S, v2.4S, v3.S[3]
-    __ fmulxvs(v15, __ T2D, v0, v1, 0);                //       fmulx   v15.2D, v0.2D, v1.D[0]
-    __ mulvs(v9, __ T4H, v10, v11, 3);                 //       mul     v9.4H, v10.4H, v11.H[3]
-    __ mulvs(v4, __ T8H, v5, v6, 4);                   //       mul     v4.8H, v5.8H, v6.H[4]
-    __ mulvs(v13, __ T2S, v14, v15, 1);                //       mul     v13.2S, v14.2S, v15.S[1]
-    __ mulvs(v3, __ T4S, v4, v5, 1);                   //       mul     v3.4S, v4.4S, v5.S[1]
+    __ fmlavs(v15, __ T2D, v0, v1, 0);                 //       fmla    v15.2D, v0.2D, v1.D[0]
+    __ fmlsvs(v9, __ T2S, v10, v11, 1);                //       fmls    v9.2S, v10.2S, v11.S[1]
+    __ mulvs(v4, __ T4S, v5, v6, 2);                   //       mul     v4.4S, v5.4S, v6.S[2]
+    __ fmlsvs(v13, __ T2D, v14, v15, 1);               //       fmls    v13.2D, v14.2D, v15.D[1]
+    __ fmulxvs(v3, __ T2S, v4, v5, 0);                 //       fmulx   v3.2S, v4.2S, v5.S[0]
+    __ mulvs(v11, __ T4S, v12, v13, 2);                //       mul     v11.4S, v12.4S, v13.S[2]
+    __ fmulxvs(v12, __ T2D, v13, v14, 1);              //       fmulx   v12.2D, v13.2D, v14.D[1]
+    __ mulvs(v15, __ T4H, v0, v1, 0);                  //       mul     v15.4H, v0.4H, v1.H[0]
+    __ mulvs(v9, __ T8H, v10, v11, 6);                 //       mul     v9.8H, v10.8H, v11.H[6]
+    __ mulvs(v11, __ T2S, v12, v13, 0);                //       mul     v11.2S, v12.2S, v13.S[0]
+    __ mulvs(v1, __ T4S, v2, v3, 2);                   //       mul     v1.4S, v2.4S, v3.S[2]
 
 // NEONVectorCompare
-    __ cm(Assembler::GT, v21, __ T8B, v22, v23);       //       cmgt    v21.8B, v22.8B, v23.8B
-    __ cm(Assembler::GT, v23, __ T16B, v24, v25);      //       cmgt    v23.16B, v24.16B, v25.16B
-    __ cm(Assembler::GT, v31, __ T4H, v0, v1);         //       cmgt    v31.4H, v0.4H, v1.4H
-    __ cm(Assembler::GT, v25, __ T8H, v26, v27);       //       cmgt    v25.8H, v26.8H, v27.8H
-    __ cm(Assembler::GT, v2, __ T2S, v3, v4);          //       cmgt    v2.2S, v3.2S, v4.2S
-    __ cm(Assembler::GT, v31, __ T4S, v0, v1);         //       cmgt    v31.4S, v0.4S, v1.4S
-    __ cm(Assembler::GT, v27, __ T2D, v28, v29);       //       cmgt    v27.2D, v28.2D, v29.2D
-    __ cm(Assembler::GE, v18, __ T8B, v19, v20);       //       cmge    v18.8B, v19.8B, v20.8B
-    __ cm(Assembler::GE, v10, __ T16B, v11, v12);      //       cmge    v10.16B, v11.16B, v12.16B
-    __ cm(Assembler::GE, v23, __ T4H, v24, v25);       //       cmge    v23.4H, v24.4H, v25.4H
-    __ cm(Assembler::GE, v19, __ T8H, v20, v21);       //       cmge    v19.8H, v20.8H, v21.8H
-    __ cm(Assembler::GE, v3, __ T2S, v4, v5);          //       cmge    v3.2S, v4.2S, v5.2S
-    __ cm(Assembler::GE, v18, __ T4S, v19, v20);       //       cmge    v18.4S, v19.4S, v20.4S
-    __ cm(Assembler::GE, v0, __ T2D, v1, v2);          //       cmge    v0.2D, v1.2D, v2.2D
-    __ cm(Assembler::EQ, v25, __ T8B, v26, v27);       //       cmeq    v25.8B, v26.8B, v27.8B
-    __ cm(Assembler::EQ, v26, __ T16B, v27, v28);      //       cmeq    v26.16B, v27.16B, v28.16B
-    __ cm(Assembler::EQ, v23, __ T4H, v24, v25);       //       cmeq    v23.4H, v24.4H, v25.4H
-    __ cm(Assembler::EQ, v2, __ T8H, v3, v4);          //       cmeq    v2.8H, v3.8H, v4.8H
-    __ cm(Assembler::EQ, v18, __ T2S, v19, v20);       //       cmeq    v18.2S, v19.2S, v20.2S
-    __ cm(Assembler::EQ, v12, __ T4S, v13, v14);       //       cmeq    v12.4S, v13.4S, v14.4S
-    __ cm(Assembler::EQ, v4, __ T2D, v5, v6);          //       cmeq    v4.2D, v5.2D, v6.2D
-    __ cm(Assembler::HI, v28, __ T8B, v29, v30);       //       cmhi    v28.8B, v29.8B, v30.8B
-    __ cm(Assembler::HI, v30, __ T16B, v31, v0);       //       cmhi    v30.16B, v31.16B, v0.16B
-    __ cm(Assembler::HI, v29, __ T4H, v30, v31);       //       cmhi    v29.4H, v30.4H, v31.4H
-    __ cm(Assembler::HI, v16, __ T8H, v17, v18);       //       cmhi    v16.8H, v17.8H, v18.8H
-    __ cm(Assembler::HI, v27, __ T2S, v28, v29);       //       cmhi    v27.2S, v28.2S, v29.2S
-    __ cm(Assembler::HI, v6, __ T4S, v7, v8);          //       cmhi    v6.4S, v7.4S, v8.4S
-    __ cm(Assembler::HI, v9, __ T2D, v10, v11);        //       cmhi    v9.2D, v10.2D, v11.2D
-    __ cm(Assembler::HS, v29, __ T8B, v30, v31);       //       cmhs    v29.8B, v30.8B, v31.8B
-    __ cm(Assembler::HS, v18, __ T16B, v19, v20);      //       cmhs    v18.16B, v19.16B, v20.16B
-    __ cm(Assembler::HS, v7, __ T4H, v8, v9);          //       cmhs    v7.4H, v8.4H, v9.4H
-    __ cm(Assembler::HS, v4, __ T8H, v5, v6);          //       cmhs    v4.8H, v5.8H, v6.8H
-    __ cm(Assembler::HS, v7, __ T2S, v8, v9);          //       cmhs    v7.2S, v8.2S, v9.2S
+    __ cm(Assembler::GT, v18, __ T8B, v19, v20);       //       cmgt    v18.8B, v19.8B, v20.8B
+    __ cm(Assembler::GT, v0, __ T16B, v1, v2);         //       cmgt    v0.16B, v1.16B, v2.16B
+    __ cm(Assembler::GT, v25, __ T4H, v26, v27);       //       cmgt    v25.4H, v26.4H, v27.4H
+    __ cm(Assembler::GT, v26, __ T8H, v27, v28);       //       cmgt    v26.8H, v27.8H, v28.8H
+    __ cm(Assembler::GT, v23, __ T2S, v24, v25);       //       cmgt    v23.2S, v24.2S, v25.2S
+    __ cm(Assembler::GT, v2, __ T4S, v3, v4);          //       cmgt    v2.4S, v3.4S, v4.4S
+    __ cm(Assembler::GT, v18, __ T2D, v19, v20);       //       cmgt    v18.2D, v19.2D, v20.2D
+    __ cm(Assembler::GE, v12, __ T8B, v13, v14);       //       cmge    v12.8B, v13.8B, v14.8B
+    __ cm(Assembler::GE, v4, __ T16B, v5, v6);         //       cmge    v4.16B, v5.16B, v6.16B
+    __ cm(Assembler::GE, v28, __ T4H, v29, v30);       //       cmge    v28.4H, v29.4H, v30.4H
+    __ cm(Assembler::GE, v30, __ T8H, v31, v0);        //       cmge    v30.8H, v31.8H, v0.8H
+    __ cm(Assembler::GE, v29, __ T2S, v30, v31);       //       cmge    v29.2S, v30.2S, v31.2S
+    __ cm(Assembler::GE, v16, __ T4S, v17, v18);       //       cmge    v16.4S, v17.4S, v18.4S
+    __ cm(Assembler::GE, v27, __ T2D, v28, v29);       //       cmge    v27.2D, v28.2D, v29.2D
+    __ cm(Assembler::EQ, v6, __ T8B, v7, v8);          //       cmeq    v6.8B, v7.8B, v8.8B
+    __ cm(Assembler::EQ, v9, __ T16B, v10, v11);       //       cmeq    v9.16B, v10.16B, v11.16B
+    __ cm(Assembler::EQ, v29, __ T4H, v30, v31);       //       cmeq    v29.4H, v30.4H, v31.4H
+    __ cm(Assembler::EQ, v18, __ T8H, v19, v20);       //       cmeq    v18.8H, v19.8H, v20.8H
+    __ cm(Assembler::EQ, v7, __ T2S, v8, v9);          //       cmeq    v7.2S, v8.2S, v9.2S
+    __ cm(Assembler::EQ, v4, __ T4S, v5, v6);          //       cmeq    v4.4S, v5.4S, v6.4S
+    __ cm(Assembler::EQ, v7, __ T2D, v8, v9);          //       cmeq    v7.2D, v8.2D, v9.2D
+    __ cm(Assembler::HI, v15, __ T8B, v16, v17);       //       cmhi    v15.8B, v16.8B, v17.8B
+    __ cm(Assembler::HI, v9, __ T16B, v10, v11);       //       cmhi    v9.16B, v10.16B, v11.16B
+    __ cm(Assembler::HI, v23, __ T4H, v24, v25);       //       cmhi    v23.4H, v24.4H, v25.4H
+    __ cm(Assembler::HI, v8, __ T8H, v9, v10);         //       cmhi    v8.8H, v9.8H, v10.8H
+    __ cm(Assembler::HI, v2, __ T2S, v3, v4);          //       cmhi    v2.2S, v3.2S, v4.2S
+    __ cm(Assembler::HI, v28, __ T4S, v29, v30);       //       cmhi    v28.4S, v29.4S, v30.4S
+    __ cm(Assembler::HI, v21, __ T2D, v22, v23);       //       cmhi    v21.2D, v22.2D, v23.2D
+    __ cm(Assembler::HS, v31, __ T8B, v0, v1);         //       cmhs    v31.8B, v0.8B, v1.8B
+    __ cm(Assembler::HS, v5, __ T16B, v6, v7);         //       cmhs    v5.16B, v6.16B, v7.16B
+    __ cm(Assembler::HS, v27, __ T4H, v28, v29);       //       cmhs    v27.4H, v28.4H, v29.4H
+    __ cm(Assembler::HS, v0, __ T8H, v1, v2);          //       cmhs    v0.8H, v1.8H, v2.8H
+    __ cm(Assembler::HS, v17, __ T2S, v18, v19);       //       cmhs    v17.2S, v18.2S, v19.2S
     __ cm(Assembler::HS, v15, __ T4S, v16, v17);       //       cmhs    v15.4S, v16.4S, v17.4S
-    __ cm(Assembler::HS, v9, __ T2D, v10, v11);        //       cmhs    v9.2D, v10.2D, v11.2D
-    __ fcm(Assembler::EQ, v23, __ T2S, v24, v25);      //       fcmeq   v23.2S, v24.2S, v25.2S
+    __ cm(Assembler::HS, v4, __ T2D, v5, v6);          //       cmhs    v4.2D, v5.2D, v6.2D
+    __ fcm(Assembler::EQ, v26, __ T2S, v27, v28);      //       fcmeq   v26.2S, v27.2S, v28.2S
     __ fcm(Assembler::EQ, v8, __ T4S, v9, v10);        //       fcmeq   v8.4S, v9.4S, v10.4S
-    __ fcm(Assembler::EQ, v2, __ T2D, v3, v4);         //       fcmeq   v2.2D, v3.2D, v4.2D
-    __ fcm(Assembler::GT, v28, __ T2S, v29, v30);      //       fcmgt   v28.2S, v29.2S, v30.2S
-    __ fcm(Assembler::GT, v21, __ T4S, v22, v23);      //       fcmgt   v21.4S, v22.4S, v23.4S
-    __ fcm(Assembler::GT, v31, __ T2D, v0, v1);        //       fcmgt   v31.2D, v0.2D, v1.2D
-    __ fcm(Assembler::GE, v5, __ T2S, v6, v7);         //       fcmge   v5.2S, v6.2S, v7.2S
-    __ fcm(Assembler::GE, v27, __ T4S, v28, v29);      //       fcmge   v27.4S, v28.4S, v29.4S
+    __ fcm(Assembler::EQ, v28, __ T2D, v29, v30);      //       fcmeq   v28.2D, v29.2D, v30.2D
+    __ fcm(Assembler::GT, v22, __ T2S, v23, v24);      //       fcmgt   v22.2S, v23.2S, v24.2S
+    __ fcm(Assembler::GT, v27, __ T4S, v28, v29);      //       fcmgt   v27.4S, v28.4S, v29.4S
+    __ fcm(Assembler::GT, v27, __ T2D, v28, v29);      //       fcmgt   v27.2D, v28.2D, v29.2D
+    __ fcm(Assembler::GE, v25, __ T2S, v26, v27);      //       fcmge   v25.2S, v26.2S, v27.2S
+    __ fcm(Assembler::GE, v23, __ T4S, v24, v25);      //       fcmge   v23.4S, v24.4S, v25.4S
     __ fcm(Assembler::GE, v0, __ T2D, v1, v2);         //       fcmge   v0.2D, v1.2D, v2.2D
 
 // SVEComparisonWithZero
-    __ sve_fcm(Assembler::EQ, p8, __ S, p6, z15, 0.0); //       fcmeq   p8.s, p6/z, z15.s, #0.0
-    __ sve_fcm(Assembler::GT, p4, __ D, p6, z28, 0.0); //       fcmgt   p4.d, p6/z, z28.d, #0.0
-    __ sve_fcm(Assembler::GE, p13, __ D, p0, z25, 0.0); //      fcmge   p13.d, p0/z, z25.d, #0.0
-    __ sve_fcm(Assembler::LT, p2, __ D, p0, z6, 0.0);  //       fcmlt   p2.d, p0/z, z6.d, #0.0
-    __ sve_fcm(Assembler::LE, p2, __ S, p2, z15, 0.0); //       fcmle   p2.s, p2/z, z15.s, #0.0
-    __ sve_fcm(Assembler::NE, p3, __ S, p7, z5, 0.0);  //       fcmne   p3.s, p7/z, z5.s, #0.0
+    __ sve_fcm(Assembler::EQ, p2, __ D, p0, z6, 0.0);  //       fcmeq   p2.d, p0/z, z6.d, #0.0
+    __ sve_fcm(Assembler::GT, p2, __ S, p2, z15, 0.0); //       fcmgt   p2.s, p2/z, z15.s, #0.0
+    __ sve_fcm(Assembler::GE, p3, __ S, p7, z5, 0.0);  //       fcmge   p3.s, p7/z, z5.s, #0.0
+    __ sve_fcm(Assembler::LT, p3, __ D, p5, z20, 0.0); //       fcmlt   p3.d, p5/z, z20.d, #0.0
+    __ sve_fcm(Assembler::LE, p3, __ S, p4, z11, 0.0); //       fcmle   p3.s, p4/z, z11.s, #0.0
+    __ sve_fcm(Assembler::NE, p15, __ D, p0, z6, 0.0); //       fcmne   p15.d, p0/z, z6.d, #0.0
 
 // SVEComparisonWithImm
-    __ sve_cmp(Assembler::EQ, p3, __ S, p5, z20, -10); //       cmpeq   p3.s, p5/z, z20.s, #-10
-    __ sve_cmp(Assembler::GT, p5, __ S, p7, z8, -10);  //       cmpgt   p5.s, p7/z, z8.s, #-10
-    __ sve_cmp(Assembler::GE, p8, __ H, p7, z2, 13);   //       cmpge   p8.h, p7/z, z2.h, #13
-    __ sve_cmp(Assembler::LT, p1, __ S, p7, z27, -2);  //       cmplt   p1.s, p7/z, z27.s, #-2
-    __ sve_cmp(Assembler::LE, p6, __ S, p6, z28, -11); //       cmple   p6.s, p6/z, z28.s, #-11
-    __ sve_cmp(Assembler::NE, p1, __ H, p4, z14, -5);  //       cmpne   p1.h, p4/z, z14.h, #-5
-    __ sve_cmp(Assembler::HS, p13, __ H, p1, z23, 90); //       cmphs   p13.h, p1/z, z23.h, #90
-    __ sve_cmp(Assembler::HI, p8, __ B, p4, z4, 66);   //       cmphi   p8.b, p4/z, z4.b, #66
-    __ sve_cmp(Assembler::LS, p9, __ H, p3, z13, 11);  //       cmpls   p9.h, p3/z, z13.h, #11
-    __ sve_cmp(Assembler::LO, p8, __ S, p5, z3, 21);   //       cmplo   p8.s, p5/z, z3.s, #21
+    __ sve_cmp(Assembler::EQ, p6, __ D, p0, z30, 11);  //       cmpeq   p6.d, p0/z, z30.d, #11
+    __ sve_cmp(Assembler::GT, p11, __ H, p3, z29, 12); //       cmpgt   p11.h, p3/z, z29.h, #12
+    __ sve_cmp(Assembler::GE, p8, __ B, p0, z24, -2);  //       cmpge   p8.b, p0/z, z24.b, #-2
+    __ sve_cmp(Assembler::LT, p5, __ H, p6, z16, 7);   //       cmplt   p5.h, p6/z, z16.h, #7
+    __ sve_cmp(Assembler::LE, p6, __ S, p4, z4, -12);  //       cmple   p6.s, p4/z, z4.s, #-12
+    __ sve_cmp(Assembler::NE, p0, __ S, p4, z19, -3);  //       cmpne   p0.s, p4/z, z19.s, #-3
+    __ sve_cmp(Assembler::HS, p7, __ B, p4, z12, 15);  //       cmphs   p7.b, p4/z, z12.b, #15
+    __ sve_cmp(Assembler::HI, p10, __ B, p1, z23, 30); //       cmphi   p10.b, p1/z, z23.b, #30
+    __ sve_cmp(Assembler::LS, p9, __ D, p4, z13, 67);  //       cmpls   p9.d, p4/z, z13.d, #67
+    __ sve_cmp(Assembler::LO, p3, __ D, p0, z2, 16);   //       cmplo   p3.d, p0/z, z2.d, #16
 
 // SpecialCases
     __ ccmn(zr, zr, 3u, Assembler::LE);                //       ccmn    xzr, xzr, #3, LE
@@ -1198,239 +1210,241 @@
     __ fmovd(v0, -1.0625);                             //       fmov d0, #-1.0625
 
 // LSEOp
-    __ swp(Assembler::xword, r6, r7, r19);             //       swp     x6, x7, [x19]
-    __ ldadd(Assembler::xword, r13, r28, r17);         //       ldadd   x13, x28, [x17]
-    __ ldbic(Assembler::xword, r16, r6, r2);           //       ldclr   x16, x6, [x2]
-    __ ldeor(Assembler::xword, r29, r3, r4);           //       ldeor   x29, x3, [x4]
-    __ ldorr(Assembler::xword, r6, r16, r20);          //       ldset   x6, x16, [x20]
-    __ ldsmin(Assembler::xword, r13, r12, r20);        //       ldsmin  x13, x12, [x20]
-    __ ldsmax(Assembler::xword, r8, r25, r20);         //       ldsmax  x8, x25, [x20]
-    __ ldumin(Assembler::xword, r19, r0, r11);         //       ldumin  x19, x0, [x11]
-    __ ldumax(Assembler::xword, r24, r6, r20);         //       ldumax  x24, x6, [x20]
+    __ swp(Assembler::xword, r6, r16, r20);            //       swp     x6, x16, [x20]
+    __ ldadd(Assembler::xword, r13, r12, r20);         //       ldadd   x13, x12, [x20]
+    __ ldbic(Assembler::xword, r8, r25, r20);          //       ldclr   x8, x25, [x20]
+    __ ldeor(Assembler::xword, r19, r0, r11);          //       ldeor   x19, x0, [x11]
+    __ ldorr(Assembler::xword, r24, r6, r20);          //       ldset   x24, x6, [x20]
+    __ ldsmin(Assembler::xword, zr, r14, r16);         //       ldsmin  xzr, x14, [x16]
+    __ ldsmax(Assembler::xword, r6, r0, r7);           //       ldsmax  x6, x0, [x7]
+    __ ldumin(Assembler::xword, r15, r19, r26);        //       ldumin  x15, x19, [x26]
+    __ ldumax(Assembler::xword, r9, r10, r23);         //       ldumax  x9, x10, [x23]
 
 // LSEOp
-    __ swpa(Assembler::xword, zr, r14, r16);           //       swpa    xzr, x14, [x16]
-    __ ldadda(Assembler::xword, r6, r0, r7);           //       ldadda  x6, x0, [x7]
-    __ ldbica(Assembler::xword, r15, r19, r26);        //       ldclra  x15, x19, [x26]
-    __ ldeora(Assembler::xword, r9, r10, r23);         //       ldeora  x9, x10, [x23]
-    __ ldorra(Assembler::xword, r21, r22, r28);        //       ldseta  x21, x22, [x28]
-    __ ldsmina(Assembler::xword, r2, r3, r15);         //       ldsmina x2, x3, [x15]
-    __ ldsmaxa(Assembler::xword, r19, r20, r7);        //       ldsmaxa x19, x20, [x7]
-    __ ldumina(Assembler::xword, r4, r29, r7);         //       ldumina x4, x29, [x7]
-    __ ldumaxa(Assembler::xword, r0, r9, r16);         //       ldumaxa x0, x9, [x16]
+    __ swpa(Assembler::xword, r21, r22, r28);          //       swpa    x21, x22, [x28]
+    __ ldadda(Assembler::xword, r2, r3, r15);          //       ldadda  x2, x3, [x15]
+    __ ldbica(Assembler::xword, r19, r20, r7);         //       ldclra  x19, x20, [x7]
+    __ ldeora(Assembler::xword, r4, r29, r7);          //       ldeora  x4, x29, [x7]
+    __ ldorra(Assembler::xword, r0, r9, r16);          //       ldseta  x0, x9, [x16]
+    __ ldsmina(Assembler::xword, r20, r23, r4);        //       ldsmina x20, x23, [x4]
+    __ ldsmaxa(Assembler::xword, r16, r10, r23);       //       ldsmaxa x16, x10, [x23]
+    __ ldumina(Assembler::xword, r11, r25, r6);        //       ldumina x11, x25, [x6]
+    __ ldumaxa(Assembler::xword, zr, r16, r13);        //       ldumaxa xzr, x16, [x13]
 
 // LSEOp
-    __ swpal(Assembler::xword, r20, r23, r4);          //       swpal   x20, x23, [x4]
-    __ ldaddal(Assembler::xword, r16, r10, r23);       //       ldaddal x16, x10, [x23]
-    __ ldbical(Assembler::xword, r11, r25, r6);        //       ldclral x11, x25, [x6]
-    __ ldeoral(Assembler::xword, zr, r16, r13);        //       ldeoral xzr, x16, [x13]
-    __ ldorral(Assembler::xword, r23, r12, r1);        //       ldsetal x23, x12, [x1]
-    __ ldsminal(Assembler::xword, r14, r9, r21);       //       ldsminal        x14, x9, [x21]
-    __ ldsmaxal(Assembler::xword, r16, r26, r15);      //       ldsmaxal        x16, x26, [x15]
-    __ lduminal(Assembler::xword, r4, r4, r15);        //       lduminal        x4, x4, [x15]
-    __ ldumaxal(Assembler::xword, r8, r6, r30);        //       ldumaxal        x8, x6, [x30]
+    __ swpal(Assembler::xword, r23, r12, r1);          //       swpal   x23, x12, [x1]
+    __ ldaddal(Assembler::xword, r14, r9, r21);        //       ldaddal x14, x9, [x21]
+    __ ldbical(Assembler::xword, r16, r26, r15);       //       ldclral x16, x26, [x15]
+    __ ldeoral(Assembler::xword, r4, r4, r15);         //       ldeoral x4, x4, [x15]
+    __ ldorral(Assembler::xword, r8, r6, r30);         //       ldsetal x8, x6, [x30]
+    __ ldsminal(Assembler::xword, r4, r29, r17);       //       ldsminal        x4, x29, [x17]
+    __ ldsmaxal(Assembler::xword, r29, r26, r9);       //       ldsmaxal        x29, x26, [x9]
+    __ lduminal(Assembler::xword, r15, r2, r11);       //       lduminal        x15, x2, [x11]
+    __ ldumaxal(Assembler::xword, r29, r3, r7);        //       ldumaxal        x29, x3, [x7]
 
 // LSEOp
-    __ swpl(Assembler::xword, r4, r29, r17);           //       swpl    x4, x29, [x17]
-    __ ldaddl(Assembler::xword, r29, r26, r9);         //       ldaddl  x29, x26, [x9]
-    __ ldbicl(Assembler::xword, r15, r2, r11);         //       ldclrl  x15, x2, [x11]
-    __ ldeorl(Assembler::xword, r29, r3, r7);          //       ldeorl  x29, x3, [x7]
-    __ ldorrl(Assembler::xword, r1, r27, r21);         //       ldsetl  x1, x27, [x21]
-    __ ldsminl(Assembler::xword, r16, r14, r8);        //       ldsminl x16, x14, [x8]
-    __ ldsmaxl(Assembler::xword, r16, r22, r25);       //       ldsmaxl x16, x22, [x25]
-    __ lduminl(Assembler::xword, r5, r20, r21);        //       lduminl x5, x20, [x21]
-    __ ldumaxl(Assembler::xword, r16, r23, r16);       //       ldumaxl x16, x23, [x16]
+    __ swpl(Assembler::xword, r1, r27, r21);           //       swpl    x1, x27, [x21]
+    __ ldaddl(Assembler::xword, r16, r14, r8);         //       ldaddl  x16, x14, [x8]
+    __ ldbicl(Assembler::xword, r16, r22, r25);        //       ldclrl  x16, x22, [x25]
+    __ ldeorl(Assembler::xword, r5, r20, r21);         //       ldeorl  x5, x20, [x21]
+    __ ldorrl(Assembler::xword, r16, r23, r16);        //       ldsetl  x16, x23, [x16]
+    __ ldsminl(Assembler::xword, r30, r20, r20);       //       ldsminl x30, x20, [x20]
+    __ ldsmaxl(Assembler::xword, r0, r4, r19);         //       ldsmaxl x0, x4, [x19]
+    __ lduminl(Assembler::xword, r24, r4, r20);        //       lduminl x24, x4, [x20]
+    __ ldumaxl(Assembler::xword, r4, r24, r26);        //       ldumaxl x4, x24, [x26]
 
 // LSEOp
-    __ swp(Assembler::word, r30, r20, r20);            //       swp     w30, w20, [x20]
-    __ ldadd(Assembler::word, r0, r4, r19);            //       ldadd   w0, w4, [x19]
-    __ ldbic(Assembler::word, r24, r4, r20);           //       ldclr   w24, w4, [x20]
-    __ ldeor(Assembler::word, r4, r24, r26);           //       ldeor   w4, w24, [x26]
-    __ ldorr(Assembler::word, r19, r2, r8);            //       ldset   w19, w2, [x8]
-    __ ldsmin(Assembler::word, r8, r14, r24);          //       ldsmin  w8, w14, [x24]
-    __ ldsmax(Assembler::word, r16, zr, r22);          //       ldsmax  w16, wzr, [x22]
-    __ ldumin(Assembler::word, r4, zr, r1);            //       ldumin  w4, wzr, [x1]
-    __ ldumax(Assembler::word, r10, r20, r12);         //       ldumax  w10, w20, [x12]
+    __ swp(Assembler::word, r19, r2, r8);              //       swp     w19, w2, [x8]
+    __ ldadd(Assembler::word, r8, r14, r24);           //       ldadd   w8, w14, [x24]
+    __ ldbic(Assembler::word, r16, zr, r22);           //       ldclr   w16, wzr, [x22]
+    __ ldeor(Assembler::word, r4, zr, r1);             //       ldeor   w4, wzr, [x1]
+    __ ldorr(Assembler::word, r10, r20, r12);          //       ldset   w10, w20, [x12]
+    __ ldsmin(Assembler::word, r0, r9, r7);            //       ldsmin  w0, w9, [x7]
+    __ ldsmax(Assembler::word, r24, r16, r4);          //       ldsmax  w24, w16, [x4]
+    __ ldumin(Assembler::word, r27, r6, r10);          //       ldumin  w27, w6, [x10]
+    __ ldumax(Assembler::word, r27, r24, r13);         //       ldumax  w27, w24, [x13]
 
 // LSEOp
-    __ swpa(Assembler::word, r0, r9, r7);              //       swpa    w0, w9, [x7]
-    __ ldadda(Assembler::word, r24, r16, r4);          //       ldadda  w24, w16, [x4]
-    __ ldbica(Assembler::word, r27, r6, r10);          //       ldclra  w27, w6, [x10]
-    __ ldeora(Assembler::word, r27, r24, r13);         //       ldeora  w27, w24, [x13]
-    __ ldorra(Assembler::word, r16, zr, r22);          //       ldseta  w16, wzr, [x22]
-    __ ldsmina(Assembler::word, r22, r20, sp);         //       ldsmina w22, w20, [sp]
-    __ ldsmaxa(Assembler::word, r29, r9, r14);         //       ldsmaxa w29, w9, [x14]
-    __ ldumina(Assembler::word, r20, r7, r20);         //       ldumina w20, w7, [x20]
-    __ ldumaxa(Assembler::word, r28, r9, r11);         //       ldumaxa w28, w9, [x11]
+    __ swpa(Assembler::word, r16, zr, r22);            //       swpa    w16, wzr, [x22]
+    __ ldadda(Assembler::word, r22, r20, sp);          //       ldadda  w22, w20, [sp]
+    __ ldbica(Assembler::word, r29, r9, r14);          //       ldclra  w29, w9, [x14]
+    __ ldeora(Assembler::word, r20, r7, r20);          //       ldeora  w20, w7, [x20]
+    __ ldorra(Assembler::word, r28, r9, r11);          //       ldseta  w28, w9, [x11]
+    __ ldsmina(Assembler::word, r14, r12, r20);        //       ldsmina w14, w12, [x20]
+    __ ldsmaxa(Assembler::word, r1, r24, r9);          //       ldsmaxa w1, w24, [x9]
+    __ ldumina(Assembler::word, r19, r13, r19);        //       ldumina w19, w13, [x19]
+    __ ldumaxa(Assembler::word, r16, r16, r5);         //       ldumaxa w16, w16, [x5]
 
 // LSEOp
-    __ swpal(Assembler::word, r14, r12, r20);          //       swpal   w14, w12, [x20]
-    __ ldaddal(Assembler::word, r1, r24, r9);          //       ldaddal w1, w24, [x9]
-    __ ldbical(Assembler::word, r19, r13, r19);        //       ldclral w19, w13, [x19]
-    __ ldeoral(Assembler::word, r16, r16, r5);         //       ldeoral w16, w16, [x5]
-    __ ldorral(Assembler::word, r0, r3, r12);          //       ldsetal w0, w3, [x12]
-    __ ldsminal(Assembler::word, r8, r15, r15);        //       ldsminal        w8, w15, [x15]
-    __ ldsmaxal(Assembler::word, r16, r4, r15);        //       ldsmaxal        w16, w4, [x15]
-    __ lduminal(Assembler::word, r30, r5, r0);         //       lduminal        w30, w5, [x0]
-    __ ldumaxal(Assembler::word, r10, r22, r27);       //       ldumaxal        w10, w22, [x27]
+    __ swpal(Assembler::word, r0, r3, r12);            //       swpal   w0, w3, [x12]
+    __ ldaddal(Assembler::word, r8, r15, r15);         //       ldaddal w8, w15, [x15]
+    __ ldbical(Assembler::word, r16, r4, r15);         //       ldclral w16, w4, [x15]
+    __ ldeoral(Assembler::word, r30, r5, r0);          //       ldeoral w30, w5, [x0]
+    __ ldorral(Assembler::word, r10, r22, r27);        //       ldsetal w10, w22, [x27]
+    __ ldsminal(Assembler::word, r3, r0, r9);          //       ldsminal        w3, w0, [x9]
+    __ ldsmaxal(Assembler::word, r19, r29, r10);       //       ldsmaxal        w19, w29, [x10]
+    __ lduminal(Assembler::word, r24, r4, r20);        //       lduminal        w24, w4, [x20]
+    __ ldumaxal(Assembler::word, r7, r24, r29);        //       ldumaxal        w7, w24, [x29]
 
 // LSEOp
-    __ swpl(Assembler::word, r3, r0, r9);              //       swpl    w3, w0, [x9]
-    __ ldaddl(Assembler::word, r19, r29, r10);         //       ldaddl  w19, w29, [x10]
-    __ ldbicl(Assembler::word, r24, r4, r20);          //       ldclrl  w24, w4, [x20]
-    __ ldeorl(Assembler::word, r7, r24, r29);          //       ldeorl  w7, w24, [x29]
-    __ ldorrl(Assembler::word, r14, r21, r11);         //       ldsetl  w14, w21, [x11]
-    __ ldsminl(Assembler::word, r27, r13, r15);        //       ldsminl w27, w13, [x15]
-    __ ldsmaxl(Assembler::word, zr, r17, r14);         //       ldsmaxl wzr, w17, [x14]
-    __ lduminl(Assembler::word, r3, r30, r16);         //       lduminl w3, w30, [x16]
-    __ ldumaxl(Assembler::word, r22, r20, r7);         //       ldumaxl w22, w20, [x7]
+    __ swpl(Assembler::word, r14, r21, r11);           //       swpl    w14, w21, [x11]
+    __ ldaddl(Assembler::word, r27, r13, r15);         //       ldaddl  w27, w13, [x15]
+    __ ldbicl(Assembler::word, zr, r17, r14);          //       ldclrl  wzr, w17, [x14]
+    __ ldeorl(Assembler::word, r3, r30, r16);          //       ldeorl  w3, w30, [x16]
+    __ ldorrl(Assembler::word, r22, r20, r7);          //       ldsetl  w22, w20, [x7]
+    __ ldsminl(Assembler::word, r20, r3, r1);          //       ldsminl w20, w3, [x1]
+    __ ldsmaxl(Assembler::word, r26, r19, r9);         //       ldsmaxl w26, w19, [x9]
+    __ lduminl(Assembler::word, r16, r17, r21);        //       lduminl w16, w17, [x21]
+    __ ldumaxl(Assembler::word, r0, r4, r2);           //       ldumaxl w0, w4, [x2]
 
 // SHA3SIMDOp
-    __ bcax(v20, __ T16B, v3, v1, v26);                //       bcax            v20.16B, v3.16B, v1.16B, v26.16B
-    __ eor3(v19, __ T16B, v9, v16, v17);               //       eor3            v19.16B, v9.16B, v16.16B, v17.16B
-    __ rax1(v21, __ T2D, v0, v4);                      //       rax1            v21.2D, v0.2D, v4.2D
-    __ xar(v2, __ T2D, v24, v14, 12);                  //       xar             v2.2D, v24.2D, v14.2D, #12
+    __ bcax(v24, __ T16B, v14, v6, v11);               //       bcax            v24.16B, v14.16B, v6.16B, v11.16B
+    __ eor3(v21, __ T16B, v14, v17, v30);              //       eor3            v21.16B, v14.16B, v17.16B, v30.16B
+    __ rax1(v12, __ T2D, v3, v3);                      //       rax1            v12.2D, v3.2D, v3.2D
+    __ xar(v23, __ T2D, v9, v3, 49);                   //       xar             v23.2D, v9.2D, v3.2D, #49
 
 // SHA512SIMDOp
-    __ sha512h(v11, __ T2D, v21, v14);                 //       sha512h         q11, q21, v14.2D
-    __ sha512h2(v17, __ T2D, v30, v12);                //       sha512h2                q17, q30, v12.2D
-    __ sha512su0(v3, __ T2D, v3);                      //       sha512su0               v3.2D, v3.2D
-    __ sha512su1(v23, __ T2D, v9, v3);                 //       sha512su1               v23.2D, v9.2D, v3.2D
+    __ sha512h(v28, __ T2D, v3, v19);                  //       sha512h         q28, q3, v19.2D
+    __ sha512h2(v23, __ T2D, v7, v26);                 //       sha512h2                q23, q7, v26.2D
+    __ sha512su0(v21, __ T2D, v14);                    //       sha512su0               v21.2D, v14.2D
+    __ sha512su1(v5, __ T2D, v8, v26);                 //       sha512su1               v5.2D, v8.2D, v26.2D
 
 // SVEBinaryImmOp
-    __ sve_add(z24, __ D, 26u);                        //       add     z24.d, z24.d, #0x1a
-    __ sve_sub(z19, __ S, 62u);                        //       sub     z19.s, z19.s, #0x3e
-    __ sve_and(z26, __ S, 917504u);                    //       and     z26.s, z26.s, #0xe0000
-    __ sve_eor(z8, __ D, 18442240474082197503u);       //       eor     z8.d, z8.d, #0xfff0000000003fff
-    __ sve_orr(z18, __ S, 253952u);                    //       orr     z18.s, z18.s, #0x3e000
+    __ sve_add(z5, __ S, 146u);                        //       add     z5.s, z5.s, #0x92
+    __ sve_sub(z17, __ B, 31u);                        //       sub     z17.b, z17.b, #0x1f
+    __ sve_and(z9, __ S, 16744448u);                   //       and     z9.s, z9.s, #0xff8000
+    __ sve_eor(z12, __ H, 33279u);                     //       eor     z12.h, z12.h, #0x81ff
+    __ sve_orr(z11, __ H, 49663u);                     //       orr     z11.h, z11.h, #0xc1ff
 
 // SVEBinaryImmOp
-    __ sve_add(z9, __ S, 97u);                         //       add     z9.s, z9.s, #0x61
-    __ sve_sub(z8, __ H, 118u);                        //       sub     z8.h, z8.h, #0x76
-    __ sve_and(z19, __ S, 1056980736u);                //       and     z19.s, z19.s, #0x3f003f00
-    __ sve_eor(z25, __ S, 3758350339u);                //       eor     z25.s, z25.s, #0xe003e003
-    __ sve_orr(z9, __ S, 4294459391u);                 //       orr     z9.s, z9.s, #0xfff83fff
+    __ sve_add(z31, __ S, 72u);                        //       add     z31.s, z31.s, #0x48
+    __ sve_sub(z16, __ H, 218u);                       //       sub     z16.h, z16.h, #0xda
+    __ sve_and(z23, __ D, 562675075514368u);           //       and     z23.d, z23.d, #0x1ffc000000000
+    __ sve_eor(z8, __ B, 243u);                        //       eor     z8.b, z8.b, #0xf3
+    __ sve_orr(z10, __ B, 239u);                       //       orr     z10.b, z10.b, #0xef
 
 // SVEBinaryImmOp
-    __ sve_add(z23, __ D, 183u);                       //       add     z23.d, z23.d, #0xb7
-    __ sve_sub(z8, __ H, 41u);                         //       sub     z8.h, z8.h, #0x29
-    __ sve_and(z28, __ D, 8064u);                      //       and     z28.d, z28.d, #0x1f80
-    __ sve_eor(z15, __ D, 18428729675200069887u);      //       eor     z15.d, z15.d, #0xffc00000000000ff
-    __ sve_orr(z0, __ B, 239u);                        //       orr     z0.b, z0.b, #0xef
+    __ sve_add(z22, __ S, 5u);                         //       add     z22.s, z22.s, #0x5
+    __ sve_sub(z3, __ S, 209u);                        //       sub     z3.s, z3.s, #0xd1
+    __ sve_and(z5, __ D, 17870287719452639231u);       //       and     z5.d, z5.d, #0xf80003ffffffffff
+    __ sve_eor(z17, __ B, 128u);                       //       eor     z17.b, z17.b, #0x80
+    __ sve_orr(z30, __ H, 49663u);                     //       orr     z30.h, z30.h, #0xc1ff
 
 // SVEBinaryImmOp
-    __ sve_add(z5, __ D, 243u);                        //       add     z5.d, z5.d, #0xf3
-    __ sve_sub(z19, __ S, 8u);                         //       sub     z19.s, z19.s, #0x8
-    __ sve_and(z13, __ H, 32256u);                     //       and     z13.h, z13.h, #0x7e00
-    __ sve_eor(z0, __ S, 4294967293u);                 //       eor     z0.s, z0.s, #0xfffffffd
-    __ sve_orr(z21, __ S, 4294965263u);                //       orr     z21.s, z21.s, #0xfffff80f
+    __ sve_add(z2, __ D, 168u);                        //       add     z2.d, z2.d, #0xa8
+    __ sve_sub(z23, __ S, 240u);                       //       sub     z23.s, z23.s, #0xf0
+    __ sve_and(z12, __ H, 1u);                         //       and     z12.h, z12.h, #0x1
+    __ sve_eor(z15, __ S, 1u);                         //       eor     z15.s, z15.s, #0x1
+    __ sve_orr(z19, __ D, 18446532967477018623u);      //       orr     z19.d, z19.d, #0xffff3fffffffffff
 
 // SVEBinaryImmOp
-    __ sve_add(z12, __ H, 20u);                        //       add     z12.h, z12.h, #0x14
-    __ sve_sub(z0, __ H, 190u);                        //       sub     z0.h, z0.h, #0xbe
-    __ sve_and(z23, __ B, 239u);                       //       and     z23.b, z23.b, #0xef
-    __ sve_eor(z27, __ D, 18442240474082197503u);      //       eor     z27.d, z27.d, #0xfff0000000003fff
-    __ sve_orr(z22, __ B, 124u);                       //       orr     z22.b, z22.b, #0x7c
+    __ sve_add(z13, __ S, 179u);                       //       add     z13.s, z13.s, #0xb3
+    __ sve_sub(z2, __ B, 88u);                         //       sub     z2.b, z2.b, #0x58
+    __ sve_and(z20, __ H, 57855u);                     //       and     z20.h, z20.h, #0xe1ff
+    __ sve_eor(z24, __ H, 33279u);                     //       eor     z24.h, z24.h, #0x81ff
+    __ sve_orr(z20, __ S, 917504u);                    //       orr     z20.s, z20.s, #0xe0000
 
 // SVEBinaryImmOp
-    __ sve_add(z20, __ H, 165u);                       //       add     z20.h, z20.h, #0xa5
-    __ sve_sub(z24, __ D, 72u);                        //       sub     z24.d, z24.d, #0x48
-    __ sve_and(z31, __ S, 4026535935u);                //       and     z31.s, z31.s, #0xf0000fff
-    __ sve_eor(z21, __ B, 128u);                       //       eor     z21.b, z21.b, #0x80
-    __ sve_orr(z30, __ S, 4294967293u);                //       orr     z30.s, z30.s, #0xfffffffd
+    __ sve_add(z21, __ H, 247u);                       //       add     z21.h, z21.h, #0xf7
+    __ sve_sub(z22, __ D, 253u);                       //       sub     z22.d, z22.d, #0xfd
+    __ sve_and(z26, __ S, 1610637312u);                //       and     z26.s, z26.s, #0x60006000
+    __ sve_eor(z11, __ H, 51199u);                     //       eor     z11.h, z11.h, #0xc7ff
+    __ sve_orr(z5, __ B, 128u);                        //       orr     z5.b, z5.b, #0x80
 
 // SVEVectorOp
-    __ sve_add(z26, __ H, z18, z19);                   //       add     z26.h, z18.h, z19.h
-    __ sve_sub(z11, __ S, z13, z29);                   //       sub     z11.s, z13.s, z29.s
-    __ sve_fadd(z5, __ S, z1, z14);                    //       fadd    z5.s, z1.s, z14.s
-    __ sve_fmul(z2, __ S, z7, z10);                    //       fmul    z2.s, z7.s, z10.s
-    __ sve_fsub(z19, __ S, z4, z26);                   //       fsub    z19.s, z4.s, z26.s
-    __ sve_sqadd(z2, __ B, z3, z30);                   //       sqadd   z2.b, z3.b, z30.b
-    __ sve_sqsub(z20, __ D, z5, z20);                  //       sqsub   z20.d, z5.d, z20.d
-    __ sve_uqadd(z29, __ H, z13, z13);                 //       uqadd   z29.h, z13.h, z13.h
-    __ sve_uqsub(z14, __ H, z30, z1);                  //       uqsub   z14.h, z30.h, z1.h
-    __ sve_abs(z28, __ D, p0, z3);                     //       abs     z28.d, p0/m, z3.d
-    __ sve_add(z9, __ B, p6, z9);                      //       add     z9.b, p6/m, z9.b, z9.b
-    __ sve_and(z26, __ B, p2, z14);                    //       and     z26.b, p2/m, z26.b, z14.b
-    __ sve_asr(z20, __ D, p6, z7);                     //       asr     z20.d, p6/m, z20.d, z7.d
-    __ sve_bic(z20, __ D, p4, z6);                     //       bic     z20.d, p4/m, z20.d, z6.d
-    __ sve_clz(z13, __ H, p0, z29);                    //       clz     z13.h, p0/m, z29.h
-    __ sve_cnt(z9, __ B, p0, z1);                      //       cnt     z9.b, p0/m, z1.b
-    __ sve_eor(z27, __ B, p6, z15);                    //       eor     z27.b, p6/m, z27.b, z15.b
-    __ sve_lsl(z4, __ D, p7, z17);                     //       lsl     z4.d, p7/m, z4.d, z17.d
-    __ sve_lsr(z2, __ B, p0, z24);                     //       lsr     z2.b, p0/m, z2.b, z24.b
-    __ sve_mul(z26, __ B, p7, z13);                    //       mul     z26.b, p7/m, z26.b, z13.b
-    __ sve_neg(z22, __ D, p3, z16);                    //       neg     z22.d, p3/m, z16.d
-    __ sve_not(z17, __ D, p1, z11);                    //       not     z17.d, p1/m, z11.d
-    __ sve_orr(z16, __ B, p0, z16);                    //       orr     z16.b, p0/m, z16.b, z16.b
-    __ sve_rbit(z28, __ D, p1, z23);                   //       rbit    z28.d, p1/m, z23.d
-    __ sve_revb(z28, __ D, p4, z10);                   //       revb    z28.d, p4/m, z10.d
-    __ sve_smax(z17, __ S, p7, z7);                    //       smax    z17.s, p7/m, z17.s, z7.s
-    __ sve_smin(z4, __ H, p3, z24);                    //       smin    z4.h, p3/m, z4.h, z24.h
-    __ sve_umax(z9, __ B, p2, z11);                    //       umax    z9.b, p2/m, z9.b, z11.b
-    __ sve_umin(z4, __ S, p5, z22);                    //       umin    z4.s, p5/m, z4.s, z22.s
-    __ sve_sub(z4, __ H, p0, z15);                     //       sub     z4.h, p0/m, z4.h, z15.h
-    __ sve_fabs(z4, __ D, p7, z26);                    //       fabs    z4.d, p7/m, z26.d
-    __ sve_fadd(z5, __ S, p5, z26);                    //       fadd    z5.s, p5/m, z5.s, z26.s
-    __ sve_fdiv(z31, __ S, p0, z25);                   //       fdiv    z31.s, p0/m, z31.s, z25.s
-    __ sve_fmax(z8, __ D, p1, z3);                     //       fmax    z8.d, p1/m, z8.d, z3.d
-    __ sve_fmin(z7, __ D, p6, z24);                    //       fmin    z7.d, p6/m, z7.d, z24.d
-    __ sve_fmul(z24, __ S, p7, z17);                   //       fmul    z24.s, p7/m, z24.s, z17.s
-    __ sve_fneg(z10, __ S, p3, z30);                   //       fneg    z10.s, p3/m, z30.s
-    __ sve_frintm(z8, __ S, p6, z29);                  //       frintm  z8.s, p6/m, z29.s
-    __ sve_frintn(z31, __ D, p5, z31);                 //       frintn  z31.d, p5/m, z31.d
-    __ sve_frintp(z0, __ D, p5, z7);                   //       frintp  z0.d, p5/m, z7.d
-    __ sve_fsqrt(z29, __ S, p6, z22);                  //       fsqrt   z29.s, p6/m, z22.s
-    __ sve_fsub(z29, __ S, p6, z20);                   //       fsub    z29.s, p6/m, z29.s, z20.s
-    __ sve_fmad(z6, __ D, p4, z18, z13);               //       fmad    z6.d, p4/m, z18.d, z13.d
-    __ sve_fmla(z21, __ S, p2, z0, z19);               //       fmla    z21.s, p2/m, z0.s, z19.s
-    __ sve_fmls(z28, __ D, p1, z17, z6);               //       fmls    z28.d, p1/m, z17.d, z6.d
-    __ sve_fmsb(z20, __ D, p6, z28, z14);              //       fmsb    z20.d, p6/m, z28.d, z14.d
-    __ sve_fnmad(z14, __ S, p4, z10, z26);             //       fnmad   z14.s, p4/m, z10.s, z26.s
-    __ sve_fnmsb(z24, __ D, p0, z11, z15);             //       fnmsb   z24.d, p0/m, z11.d, z15.d
-    __ sve_fnmla(z23, __ D, p5, z20, z28);             //       fnmla   z23.d, p5/m, z20.d, z28.d
-    __ sve_fnmls(z20, __ D, p7, z24, z0);              //       fnmls   z20.d, p7/m, z24.d, z0.d
-    __ sve_mla(z6, __ B, p5, z13, z12);                //       mla     z6.b, p5/m, z13.b, z12.b
-    __ sve_mls(z13, __ S, p7, z26, z23);               //       mls     z13.s, p7/m, z26.s, z23.s
-    __ sve_and(z6, z2, z29);                           //       and     z6.d, z2.d, z29.d
-    __ sve_eor(z0, z29, z23);                          //       eor     z0.d, z29.d, z23.d
-    __ sve_orr(z4, z5, z8);                            //       orr     z4.d, z5.d, z8.d
-    __ sve_bic(z13, z17, z13);                         //       bic     z13.d, z17.d, z13.d
-    __ sve_uzp1(z8, __ H, z10, z8);                    //       uzp1    z8.h, z10.h, z8.h
-    __ sve_uzp2(z19, __ S, z0, z29);                   //       uzp2    z19.s, z0.s, z29.s
-    __ sve_fabd(z16, __ D, p3, z23);                   //       fabd    z16.d, p3/m, z16.d, z23.d
-    __ sve_bext(z23, __ B, z30, z13);                  //       bext    z23.b, z30.b, z13.b
-    __ sve_bdep(z25, __ H, z22, z0);                   //       bdep    z25.h, z22.h, z0.h
-    __ sve_eor3(z25, z30, z11);                        //       eor3    z25.d, z25.d, z30.d, z11.d
-    __ sve_sqadd(z14, __ H, p5, z22);                  //       sqadd   z14.h, p5/m, z14.h, z22.h
-    __ sve_sqsub(z5, __ H, p4, z0);                    //       sqsub   z5.h, p4/m, z5.h, z0.h
-    __ sve_uqadd(z9, __ D, p0, z3);                    //       uqadd   z9.d, p0/m, z9.d, z3.d
-    __ sve_uqsub(z14, __ H, p1, z29);                  //       uqsub   z14.h, p1/m, z14.h, z29.h
+    __ sve_add(z2, __ H, z7, z10);                     //       add     z2.h, z7.h, z10.h
+    __ sve_sub(z19, __ H, z4, z26);                    //       sub     z19.h, z4.h, z26.h
+    __ sve_fadd(z2, __ S, z3, z30);                    //       fadd    z2.s, z3.s, z30.s
+    __ sve_fmul(z20, __ D, z5, z20);                   //       fmul    z20.d, z5.d, z20.d
+    __ sve_fsub(z29, __ S, z13, z13);                  //       fsub    z29.s, z13.s, z13.s
+    __ sve_sqadd(z14, __ H, z30, z1);                  //       sqadd   z14.h, z30.h, z1.h
+    __ sve_sqsub(z28, __ D, z3, z3);                   //       sqsub   z28.d, z3.d, z3.d
+    __ sve_uqadd(z9, __ B, z25, z9);                   //       uqadd   z9.b, z25.b, z9.b
+    __ sve_uqsub(z26, __ B, z10, z14);                 //       uqsub   z26.b, z10.b, z14.b
+    __ sve_abs(z20, __ D, p6, z7);                     //       abs     z20.d, p6/m, z7.d
+    __ sve_add(z20, __ D, p4, z6);                     //       add     z20.d, p4/m, z20.d, z6.d
+    __ sve_and(z13, __ H, p0, z29);                    //       and     z13.h, p0/m, z13.h, z29.h
+    __ sve_asr(z9, __ B, p0, z1);                      //       asr     z9.b, p0/m, z9.b, z1.b
+    __ sve_bic(z27, __ B, p6, z15);                    //       bic     z27.b, p6/m, z27.b, z15.b
+    __ sve_clz(z4, __ D, p7, z17);                     //       clz     z4.d, p7/m, z17.d
+    __ sve_cnt(z2, __ B, p0, z24);                     //       cnt     z2.b, p0/m, z24.b
+    __ sve_eor(z26, __ B, p7, z13);                    //       eor     z26.b, p7/m, z26.b, z13.b
+    __ sve_lsl(z22, __ D, p3, z16);                    //       lsl     z22.d, p3/m, z22.d, z16.d
+    __ sve_lsr(z17, __ D, p1, z11);                    //       lsr     z17.d, p1/m, z17.d, z11.d
+    __ sve_mul(z16, __ B, p0, z16);                    //       mul     z16.b, p0/m, z16.b, z16.b
+    __ sve_neg(z28, __ D, p1, z23);                    //       neg     z28.d, p1/m, z23.d
+    __ sve_not(z28, __ S, p4, z10);                    //       not     z28.s, p4/m, z10.s
+    __ sve_orr(z17, __ S, p7, z7);                     //       orr     z17.s, p7/m, z17.s, z7.s
+    __ sve_rbit(z4, __ H, p3, z24);                    //       rbit    z4.h, p3/m, z24.h
+    __ sve_revb(z9, __ H, p2, z11);                    //       revb    z9.h, p2/m, z11.h
+    __ sve_smax(z4, __ S, p5, z22);                    //       smax    z4.s, p5/m, z4.s, z22.s
+    __ sve_smin(z4, __ H, p0, z15);                    //       smin    z4.h, p0/m, z4.h, z15.h
+    __ sve_umax(z4, __ D, p7, z26);                    //       umax    z4.d, p7/m, z4.d, z26.d
+    __ sve_umin(z5, __ H, p5, z26);                    //       umin    z5.h, p5/m, z5.h, z26.h
+    __ sve_sub(z31, __ B, p0, z25);                    //       sub     z31.b, p0/m, z31.b, z25.b
+    __ sve_fabs(z8, __ D, p1, z3);                     //       fabs    z8.d, p1/m, z3.d
+    __ sve_fadd(z7, __ D, p6, z24);                    //       fadd    z7.d, p6/m, z7.d, z24.d
+    __ sve_fdiv(z24, __ S, p7, z17);                   //       fdiv    z24.s, p7/m, z24.s, z17.s
+    __ sve_fmax(z10, __ S, p3, z30);                   //       fmax    z10.s, p3/m, z10.s, z30.s
+    __ sve_fmin(z8, __ S, p6, z29);                    //       fmin    z8.s, p6/m, z8.s, z29.s
+    __ sve_fmul(z31, __ D, p5, z31);                   //       fmul    z31.d, p5/m, z31.d, z31.d
+    __ sve_fneg(z0, __ D, p5, z7);                     //       fneg    z0.d, p5/m, z7.d
+    __ sve_frintm(z29, __ S, p6, z22);                 //       frintm  z29.s, p6/m, z22.s
+    __ sve_frintn(z29, __ S, p6, z20);                 //       frintn  z29.s, p6/m, z20.s
+    __ sve_frintp(z6, __ S, p4, z18);                  //       frintp  z6.s, p4/m, z18.s
+    __ sve_fsqrt(z26, __ S, p5, z8);                   //       fsqrt   z26.s, p5/m, z8.s
+    __ sve_fsub(z19, __ S, p2, z28);                   //       fsub    z19.s, p2/m, z19.s, z28.s
+    __ sve_fmad(z17, __ D, p1, z30, z20);              //       fmad    z17.d, p1/m, z30.d, z20.d
+    __ sve_fmla(z28, __ D, p3, z17, z14);              //       fmla    z28.d, p3/m, z17.d, z14.d
+    __ sve_fmls(z10, __ S, p6, z11, z24);              //       fmls    z10.s, p6/m, z11.s, z24.s
+    __ sve_fmsb(z11, __ D, p3, z28, z23);              //       fmsb    z11.d, p3/m, z28.d, z23.d
+    __ sve_fnmad(z20, __ D, p7, z23, z20);             //       fnmad   z20.d, p7/m, z23.d, z20.d
+    __ sve_fnmsb(z24, __ D, p0, z27, z6);              //       fnmsb   z24.d, p0/m, z27.d, z6.d
+    __ sve_fnmla(z13, __ D, p3, z4, z13);              //       fnmla   z13.d, p3/m, z4.d, z13.d
+    __ sve_fnmls(z26, __ S, p5, z20, z6);              //       fnmls   z26.s, p5/m, z20.s, z6.s
+    __ sve_mla(z29, __ S, p7, z0, z29);                //       mla     z29.s, p7/m, z0.s, z29.s
+    __ sve_mls(z3, __ D, p1, z5, z8);                  //       mls     z3.d, p1/m, z5.d, z8.d
+    __ sve_and(z13, z17, z13);                         //       and     z13.d, z17.d, z13.d
+    __ sve_eor(z8, z10, z8);                           //       eor     z8.d, z10.d, z8.d
+    __ sve_orr(z19, z0, z29);                          //       orr     z19.d, z0.d, z29.d
+    __ sve_bic(z16, z13, z23);                         //       bic     z16.d, z13.d, z23.d
+    __ sve_uzp1(z23, __ B, z30, z13);                  //       uzp1    z23.b, z30.b, z13.b
+    __ sve_uzp2(z25, __ H, z22, z0);                   //       uzp2    z25.h, z22.h, z0.h
+    __ sve_fabd(z25, __ S, p7, z11);                   //       fabd    z25.s, p7/m, z25.s, z11.s
+    __ sve_bext(z14, __ H, z23, z22);                  //       bext    z14.h, z23.h, z22.h
+    __ sve_bdep(z5, __ H, z18, z0);                    //       bdep    z5.h, z18.h, z0.h
+    __ sve_eor3(z9, z2, z3);                           //       eor3    z9.d, z9.d, z2.d, z3.d
+    __ sve_sqadd(z14, __ H, p1, z29);                  //       sqadd   z14.h, p1/m, z14.h, z29.h
+    __ sve_sqsub(z14, __ D, p5, z4);                   //       sqsub   z14.d, p5/m, z14.d, z4.d
+    __ sve_uqadd(z27, __ S, p3, z22);                  //       uqadd   z27.s, p3/m, z27.s, z22.s
+    __ sve_uqsub(z31, __ S, p6, z11);                  //       uqsub   z31.s, p6/m, z31.s, z11.s
 
 // SVEReductionOp
-    __ sve_andv(v14, __ D, p5, z4);                    //       andv d14, p5, z4.d
-    __ sve_orv(v27, __ S, p3, z22);                    //       orv s27, p3, z22.s
-    __ sve_eorv(v31, __ S, p6, z11);                   //       eorv s31, p6, z11.s
-    __ sve_smaxv(v12, __ B, p4, z28);                  //       smaxv b12, p4, z28.b
-    __ sve_sminv(v28, __ D, p4, z4);                   //       sminv d28, p4, z4.d
-    __ sve_fminv(v6, __ D, p0, z15);                   //       fminv d6, p0, z15.d
-    __ sve_fmaxv(v1, __ D, p5, z18);                   //       fmaxv d1, p5, z18.d
-    __ sve_fadda(v2, __ S, p2, z4);                    //       fadda s2, p2, s2, z4.s
-    __ sve_uaddv(v11, __ S, p2, z28);                  //       uaddv d11, p2, z28.s
+    __ sve_andv(v12, __ B, p4, z28);                   //       andv b12, p4, z28.b
+    __ sve_orv(v28, __ D, p4, z4);                     //       orv d28, p4, z4.d
+    __ sve_eorv(v6, __ S, p0, z15);                    //       eorv s6, p0, z15.s
+    __ sve_smaxv(v1, __ S, p5, z18);                   //       smaxv s1, p5, z18.s
+    __ sve_sminv(v2, __ H, p2, z4);                    //       sminv h2, p2, z4.h
+    __ sve_umaxv(v11, __ S, p2, z28);                  //       umaxv s11, p2, z28.s
+    __ sve_uminv(v3, __ H, p5, z31);                   //       uminv h3, p5, z31.h
+    __ sve_fminv(v24, __ S, p5, z15);                  //       fminv s24, p5, z15.s
+    __ sve_fmaxv(v6, __ S, p3, z8);                    //       fmaxv s6, p3, z8.s
+    __ sve_fadda(v21, __ D, p7, z4);                   //       fadda d21, p7, d21, z4.d
+    __ sve_uaddv(v24, __ B, p5, z6);                   //       uaddv d24, p5, z6.b
 
 // AddWideNEONOp
-    __ saddwv(v3, v4, __ T8H, v5, __ T8B);             //       saddw   v3.8H, v4.8H, v5.8B
-    __ saddwv2(v21, v22, __ T8H, v23, __ T16B);        //       saddw2  v21.8H, v22.8H, v23.16B
-    __ saddwv(v31, v0, __ T4S, v1, __ T4H);            //       saddw   v31.4S, v0.4S, v1.4H
-    __ saddwv2(v11, v12, __ T4S, v13, __ T8H);         //       saddw2  v11.4S, v12.4S, v13.8H
-    __ saddwv(v24, v25, __ T2D, v26, __ T2S);          //       saddw   v24.2D, v25.2D, v26.2S
-    __ saddwv2(v21, v22, __ T2D, v23, __ T4S);         //       saddw2  v21.2D, v22.2D, v23.4S
-    __ uaddwv(v15, v16, __ T8H, v17, __ T8B);          //       uaddw   v15.8H, v16.8H, v17.8B
-    __ uaddwv2(v12, v13, __ T8H, v14, __ T16B);        //       uaddw2  v12.8H, v13.8H, v14.16B
-    __ uaddwv(v6, v7, __ T4S, v8, __ T4H);             //       uaddw   v6.4S, v7.4S, v8.4H
-    __ uaddwv2(v13, v14, __ T4S, v15, __ T8H);         //       uaddw2  v13.4S, v14.4S, v15.8H
-    __ uaddwv(v8, v9, __ T2D, v10, __ T2S);            //       uaddw   v8.2D, v9.2D, v10.2S
-    __ uaddwv2(v15, v16, __ T2D, v17, __ T4S);         //       uaddw2  v15.2D, v16.2D, v17.4S
+    __ saddwv(v4, v5, __ T8H, v6, __ T8B);             //       saddw   v4.8H, v5.8H, v6.8B
+    __ saddwv2(v10, v11, __ T8H, v12, __ T16B);        //       saddw2  v10.8H, v11.8H, v12.16B
+    __ saddwv(v9, v10, __ T4S, v11, __ T4H);           //       saddw   v9.4S, v10.4S, v11.4H
+    __ saddwv2(v25, v26, __ T4S, v27, __ T8H);         //       saddw2  v25.4S, v26.4S, v27.8H
+    __ saddwv(v10, v11, __ T2D, v12, __ T2S);          //       saddw   v10.2D, v11.2D, v12.2S
+    __ saddwv2(v5, v6, __ T2D, v7, __ T4S);            //       saddw2  v5.2D, v6.2D, v7.4S
+    __ uaddwv(v31, v0, __ T8H, v1, __ T8B);            //       uaddw   v31.8H, v0.8H, v1.8B
+    __ uaddwv2(v22, v23, __ T8H, v24, __ T16B);        //       uaddw2  v22.8H, v23.8H, v24.16B
+    __ uaddwv(v25, v26, __ T4S, v27, __ T4H);          //       uaddw   v25.4S, v26.4S, v27.4H
+    __ uaddwv2(v15, v16, __ T4S, v17, __ T8H);         //       uaddw2  v15.4S, v16.4S, v17.8H
+    __ uaddwv(v3, v4, __ T2D, v5, __ T2S);             //       uaddw   v3.2D, v4.2D, v5.2S
+    __ uaddwv2(v18, v19, __ T2D, v20, __ T4S);         //       uaddw2  v18.2D, v19.2D, v20.4S
 
     __ bind(forth);
 
@@ -1449,30 +1463,30 @@
     0x9101a1a0,     0xb10a5cc8,     0xd10810aa,     0xf10fd061,
     0x120cb166,     0x321764bc,     0x52174681,     0x720c0227,
     0x9241018e,     0xb25a2969,     0xd278b411,     0xf26aad01,
-    0x14000000,     0x17ffffd7,     0x140004bb,     0x94000000,
-    0x97ffffd4,     0x940004b8,     0x3400000a,     0x34fffa2a,
-    0x340096aa,     0x35000008,     0x35fff9c8,     0x35009648,
-    0xb400000b,     0xb4fff96b,     0xb40095eb,     0xb500001d,
-    0xb5fff91d,     0xb500959d,     0x10000013,     0x10fff8b3,
-    0x10009533,     0x90000013,     0x36300016,     0x3637f836,
-    0x363094b6,     0x3758000c,     0x375ff7cc,     0x3758944c,
+    0x14000000,     0x17ffffd7,     0x140004c9,     0x94000000,
+    0x97ffffd4,     0x940004c6,     0x3400000a,     0x34fffa2a,
+    0x3400986a,     0x35000008,     0x35fff9c8,     0x35009808,
+    0xb400000b,     0xb4fff96b,     0xb40097ab,     0xb500001d,
+    0xb5fff91d,     0xb500975d,     0x10000013,     0x10fff8b3,
+    0x100096f3,     0x90000013,     0x36300016,     0x3637f836,
+    0x36309676,     0x3758000c,     0x375ff7cc,     0x3758960c,
     0x128313a0,     0x528a32c7,     0x7289173b,     0x92ab3acc,
     0xd2a0bf94,     0xf2c285e8,     0x9358722f,     0x330e652f,
     0x53067f3b,     0x93577c53,     0xb34a1aac,     0xd35a4016,
     0x13946c63,     0x93c3dbc8,     0x54000000,     0x54fff5a0,
-    0x54009220,     0x54000001,     0x54fff541,     0x540091c1,
-    0x54000002,     0x54fff4e2,     0x54009162,     0x54000002,
-    0x54fff482,     0x54009102,     0x54000003,     0x54fff423,
-    0x540090a3,     0x54000003,     0x54fff3c3,     0x54009043,
-    0x54000004,     0x54fff364,     0x54008fe4,     0x54000005,
-    0x54fff305,     0x54008f85,     0x54000006,     0x54fff2a6,
-    0x54008f26,     0x54000007,     0x54fff247,     0x54008ec7,
-    0x54000008,     0x54fff1e8,     0x54008e68,     0x54000009,
-    0x54fff189,     0x54008e09,     0x5400000a,     0x54fff12a,
-    0x54008daa,     0x5400000b,     0x54fff0cb,     0x54008d4b,
-    0x5400000c,     0x54fff06c,     0x54008cec,     0x5400000d,
-    0x54fff00d,     0x54008c8d,     0x5400000e,     0x54ffefae,
-    0x54008c2e,     0x5400000f,     0x54ffef4f,     0x54008bcf,
+    0x540093e0,     0x54000001,     0x54fff541,     0x54009381,
+    0x54000002,     0x54fff4e2,     0x54009322,     0x54000002,
+    0x54fff482,     0x540092c2,     0x54000003,     0x54fff423,
+    0x54009263,     0x54000003,     0x54fff3c3,     0x54009203,
+    0x54000004,     0x54fff364,     0x540091a4,     0x54000005,
+    0x54fff305,     0x54009145,     0x54000006,     0x54fff2a6,
+    0x540090e6,     0x54000007,     0x54fff247,     0x54009087,
+    0x54000008,     0x54fff1e8,     0x54009028,     0x54000009,
+    0x54fff189,     0x54008fc9,     0x5400000a,     0x54fff12a,
+    0x54008f6a,     0x5400000b,     0x54fff0cb,     0x54008f0b,
+    0x5400000c,     0x54fff06c,     0x54008eac,     0x5400000d,
+    0x54fff00d,     0x54008e4d,     0x5400000e,     0x54ffefae,
+    0x54008dee,     0x5400000f,     0x54ffef4f,     0x54008d8f,
     0xd40658e1,     0xd4014d22,     0xd4046543,     0xd4273f60,
     0xd44cad80,     0xd503201f,     0xd503203f,     0xd503205f,
     0xd503209f,     0xd50320bf,     0xd503219f,     0xd50323bf,
@@ -1613,30 +1627,33 @@
     0x0eb26e30,     0x4eae6dac,     0x2e2d6d8b,     0x6e2b6d49,
     0x2e686ce6,     0x6e606ffe,     0x2eb36e51,     0x6ebd6f9b,
     0x0e3eafbc,     0x4e20affe,     0x0e69ad07,     0x4e6cad6a,
-    0x0eb6aeb4,     0x4eacad6a,     0x0e66b4a4,     0x4e7ab738,
-    0x0eb3b651,     0x4eb3b651,     0x0e3826f6,     0x4e252483,
-    0x0e7f27dd,     0x4e71260f,     0x0eb826f6,     0x4eb52693,
-    0x0eb5f693,     0x4eb8f6f6,     0x4ee4f462,     0x0ed1360f,
-    0x4ec834e6,     0x2eaeedac,     0x6eb2ee30,     0x6eeded8b,
-    0x2ecf2dcd,     0x6ed92f17,     0x0f81100f,     0x4f848862,
-    0x4fc31841,     0x0fad518b,     0x4fa780c5,     0x4fd059ee,
-    0x2fa890e6,     0x4fa38841,     0x6fc1900f,     0x0f7b8149,
-    0x4f4688a4,     0x0faf81cd,     0x4fa58083,     0x0e3736d5,
-    0x4e393717,     0x0e61341f,     0x4e7b3759,     0x0ea43462,
-    0x4ea1341f,     0x4efd379b,     0x0e343e72,     0x4e2c3d6a,
-    0x0e793f17,     0x4e753e93,     0x0ea53c83,     0x4eb43e72,
-    0x4ee23c20,     0x2e3b8f59,     0x6e3c8f7a,     0x2e798f17,
-    0x6e648c62,     0x2eb48e72,     0x6eae8dac,     0x6ee68ca4,
-    0x2e3e37bc,     0x6e2037fe,     0x2e7f37dd,     0x6e723630,
-    0x2ebd379b,     0x6ea834e6,     0x6eeb3549,     0x2e3f3fdd,
-    0x6e343e72,     0x2e693d07,     0x6e663ca4,     0x2ea93d07,
-    0x6eb13e0f,     0x6eeb3d49,     0x0e39e717,     0x4e2ae528,
-    0x4e64e462,     0x2ebee7bc,     0x6eb7e6d5,     0x6ee1e41f,
-    0x2e27e4c5,     0x6e3de79b,     0x6e62e420,     0x659239e8,
-    0x65d03b94,     0x65d0232d,     0x65d120c2,     0x659129f2,
-    0x65933ca3,     0x25969683,     0x25961d15,     0x254d1c48,
-    0x259e3f61,     0x25953b96,     0x255b91d1,     0x247686ed,
-    0x24309098,     0x2462edb9,     0x24a57468,     0xba5fd3e3,
+    0x0eb6aeb4,     0x4eacad6a,     0x2e26aca4,     0x6e3aaf38,
+    0x2e73ae51,     0x6e73ae51,     0x2eb8aef6,     0x6ea5ac83,
+    0x2e3fa7dd,     0x6e31a60f,     0x2e78a6f6,     0x6e75a693,
+    0x2eb5a693,     0x6eb8a6f6,     0x0e64b462,     0x4e71b60f,
+    0x0ea8b4e6,     0x4eaeb5ac,     0x0e322630,     0x4e2d258b,
+    0x0e6f25cd,     0x4e792717,     0x0ea32441,     0x4ea027fe,
+    0x0eb5f693,     0x4ea7f4c5,     0x4ef3f651,     0x0ec43462,
+    0x4ed23630,     0x2eb8eef6,     0x6eafedcd,     0x6eeced6a,
+    0x2ed72ed5,     0x6edf2fdd,     0x0fa810e6,     0x4fa38841,
+    0x4fc1100f,     0x0fab5149,     0x4f8688a4,     0x4fcf59cd,
+    0x2f859083,     0x4f8d898b,     0x6fce99ac,     0x0f41800f,
+    0x4f6b8949,     0x0f8d818b,     0x4f838841,     0x0e343672,
+    0x4e223420,     0x0e7b3759,     0x4e7c377a,     0x0eb93717,
+    0x4ea43462,     0x4ef43672,     0x0e2e3dac,     0x4e263ca4,
+    0x0e7e3fbc,     0x4e603ffe,     0x0ebf3fdd,     0x4eb23e30,
+    0x4efd3f9b,     0x2e288ce6,     0x6e2b8d49,     0x2e7f8fdd,
+    0x6e748e72,     0x2ea98d07,     0x6ea68ca4,     0x6ee98d07,
+    0x2e31360f,     0x6e2b3549,     0x2e793717,     0x6e6a3528,
+    0x2ea43462,     0x6ebe37bc,     0x6ef736d5,     0x2e213c1f,
+    0x6e273cc5,     0x2e7d3f9b,     0x6e623c20,     0x2eb33e51,
+    0x6eb13e0f,     0x6ee63ca4,     0x0e3ce77a,     0x4e2ae528,
+    0x4e7ee7bc,     0x2eb8e6f6,     0x6ebde79b,     0x6efde79b,
+    0x2e3be759,     0x6e39e717,     0x6e62e420,     0x65d220c2,
+    0x659029f2,     0x65903ca3,     0x65d13683,     0x65913173,
+    0x65d320cf,     0x25cb83c6,     0x254c0fbb,     0x251e0308,
+    0x25473a05,     0x25943096,     0x259d9270,     0x2423d187,
+    0x242786fa,     0x24f0f1b9,     0x24e42043,     0xba5fd3e3,
     0x3a5f03e5,     0xfa411be4,     0x7a42cbe2,     0x93df03ff,
     0xc820ffff,     0x8822fc7f,     0xc8247cbf,     0x88267fff,
     0x4e010fe0,     0x5e040420,     0x4e081fe1,     0x4e0c1fe1,
@@ -1703,55 +1720,55 @@
     0x1e741000,     0x1e743000,     0x1e761000,     0x1e763000,
     0x1e781000,     0x1e783000,     0x1e7a1000,     0x1e7a3000,
     0x1e7c1000,     0x1e7c3000,     0x1e7e1000,     0x1e7e3000,
-    0xf8268267,     0xf82d023c,     0xf8301046,     0xf83d2083,
-    0xf8263290,     0xf82d528c,     0xf8284299,     0xf8337160,
-    0xf8386286,     0xf8bf820e,     0xf8a600e0,     0xf8af1353,
-    0xf8a922ea,     0xf8b53396,     0xf8a251e3,     0xf8b340f4,
-    0xf8a470fd,     0xf8a06209,     0xf8f48097,     0xf8f002ea,
-    0xf8eb10d9,     0xf8ff21b0,     0xf8f7302c,     0xf8ee52a9,
-    0xf8f041fa,     0xf8e471e4,     0xf8e863c6,     0xf864823d,
-    0xf87d013a,     0xf86f1162,     0xf87d20e3,     0xf86132bb,
-    0xf870510e,     0xf8704336,     0xf86572b4,     0xf8706217,
-    0xb83e8294,     0xb8200264,     0xb8381284,     0xb8242358,
-    0xb8333102,     0xb828530e,     0xb83042df,     0xb824703f,
-    0xb82a6194,     0xb8a080e9,     0xb8b80090,     0xb8bb1146,
-    0xb8bb21b8,     0xb8b032df,     0xb8b653f4,     0xb8bd41c9,
-    0xb8b47287,     0xb8bc6169,     0xb8ee828c,     0xb8e10138,
-    0xb8f3126d,     0xb8f020b0,     0xb8e03183,     0xb8e851ef,
-    0xb8f041e4,     0xb8fe7005,     0xb8ea6376,     0xb8638120,
-    0xb873015d,     0xb8781284,     0xb86723b8,     0xb86e3175,
-    0xb87b51ed,     0xb87f41d1,     0xb863721e,     0xb87660f4,
-    0xce216874,     0xce104533,     0xce648c15,     0xce8e3302,
-    0xce6e82ab,     0xce6c87d1,     0xcec08063,     0xce638937,
-    0x25e0c358,     0x25a1c7d3,     0x0580785a,     0x05426328,
-    0x05009892,     0x25a0cc29,     0x2561cec8,     0x058044b3,
-    0x05401c99,     0x05006b49,     0x25e0d6f7,     0x2561c528,
-    0x0583c8bc,     0x0542522f,     0x05001ec0,     0x25e0de65,
-    0x25a1c113,     0x05803cad,     0x0540f3c0,     0x0500ab15,
-    0x2560c28c,     0x2561d7c0,     0x05801ed7,     0x0542633b,
-    0x05003696,     0x2560d4b4,     0x25e1c918,     0x058021ff,
-    0x05400e15,     0x0500f3de,     0x0473025a,     0x04bd05ab,
-    0x658e0025,     0x658a08e2,     0x659a0493,     0x043e1062,
-    0x04f418b4,     0x046d15bd,     0x04611fce,     0x04d6a07c,
-    0x04001929,     0x041a09da,     0x04d098f4,     0x04db10d4,
-    0x0459a3ad,     0x041aa029,     0x041919fb,     0x04d39e24,
-    0x04118302,     0x04101dba,     0x04d7ae16,     0x04dea571,
-    0x04180210,     0x05e786fc,     0x05e4915c,     0x04881cf1,
-    0x044a0f04,     0x04090969,     0x048b16c4,     0x044101e4,
-    0x04dcbf44,     0x65809745,     0x658d833f,     0x65c68468,
-    0x65c79b07,     0x65829e38,     0x049dafca,     0x6582bba8,
-    0x65c0b7ff,     0x65c1b4e0,     0x658dbadd,     0x65819a9d,
-    0x65ed9246,     0x65b30815,     0x65e6263c,     0x65eebb94,
-    0x65bad14e,     0x65efe178,     0x65fc5697,     0x65e07f14,
-    0x040c55a6,     0x04977f4d,     0x043d3046,     0x04b733a0,
-    0x046830a4,     0x04ed322d,     0x05686948,     0x05bd6c13,
-    0x65c88ef0,     0x450db3d7,     0x4540b6d9,     0x043e3979,
-    0x445896ce,     0x445a9005,     0x44d98069,     0x445b87ae,
-    0x04da348e,     0x04982edb,     0x0499397f,     0x0408338c,
-    0x04ca309c,     0x65c721e6,     0x65c63641,     0x65982882,
-    0x04812b8b,     0x0e251083,     0x4e3712d5,     0x0e61101f,
-    0x4e6d118b,     0x0eba1338,     0x4eb712d5,     0x2e31120f,
-    0x6e2e11ac,     0x2e6810e6,     0x6e6f11cd,     0x2eaa1128,
-    0x6eb1120f,
+    0xf8268290,     0xf82d028c,     0xf8281299,     0xf8332160,
+    0xf8383286,     0xf83f520e,     0xf82640e0,     0xf82f7353,
+    0xf82962ea,     0xf8b58396,     0xf8a201e3,     0xf8b310f4,
+    0xf8a420fd,     0xf8a03209,     0xf8b45097,     0xf8b042ea,
+    0xf8ab70d9,     0xf8bf61b0,     0xf8f7802c,     0xf8ee02a9,
+    0xf8f011fa,     0xf8e421e4,     0xf8e833c6,     0xf8e4523d,
+    0xf8fd413a,     0xf8ef7162,     0xf8fd60e3,     0xf86182bb,
+    0xf870010e,     0xf8701336,     0xf86522b4,     0xf8703217,
+    0xf87e5294,     0xf8604264,     0xf8787284,     0xf8646358,
+    0xb8338102,     0xb828030e,     0xb83012df,     0xb824203f,
+    0xb82a3194,     0xb82050e9,     0xb8384090,     0xb83b7146,
+    0xb83b61b8,     0xb8b082df,     0xb8b603f4,     0xb8bd11c9,
+    0xb8b42287,     0xb8bc3169,     0xb8ae528c,     0xb8a14138,
+    0xb8b3726d,     0xb8b060b0,     0xb8e08183,     0xb8e801ef,
+    0xb8f011e4,     0xb8fe2005,     0xb8ea3376,     0xb8e35120,
+    0xb8f3415d,     0xb8f87284,     0xb8e763b8,     0xb86e8175,
+    0xb87b01ed,     0xb87f11d1,     0xb863221e,     0xb87630f4,
+    0xb8745023,     0xb87a4133,     0xb87072b1,     0xb8606044,
+    0xce262dd8,     0xce1179d5,     0xce638c6c,     0xce83c537,
+    0xce73807c,     0xce7a84f7,     0xcec081d5,     0xce7a8905,
+    0x25a0d245,     0x2521c3f1,     0x05808909,     0x05400d2c,
+    0x0500154b,     0x25a0c91f,     0x2561db50,     0x0582d157,
+    0x054026a8,     0x05001eca,     0x25a0c0b6,     0x25a1da23,
+    0x05822dc5,     0x05400e11,     0x0500155e,     0x25e0d502,
+    0x25a1de17,     0x0580040c,     0x0540000f,     0x050287b3,
+    0x25a0d66d,     0x2521cb02,     0x05801d74,     0x05400d38,
+    0x05007854,     0x2560def5,     0x25e1dfb6,     0x05801c3a,
+    0x0540158b,     0x05000e05,     0x046a00e2,     0x047a0493,
+    0x659e0062,     0x65d408b4,     0x658d05bd,     0x046113ce,
+    0x04e3187c,     0x04291729,     0x042e1d5a,     0x04d6b8f4,
+    0x04c010d4,     0x045a03ad,     0x04108029,     0x041b19fb,
+    0x04d9be24,     0x041aa302,     0x04191dba,     0x04d38e16,
+    0x04d18571,     0x04100210,     0x04d7a6fc,     0x049eb15c,
+    0x04981cf1,     0x05678f04,     0x05648969,     0x048816c4,
+    0x044a01e4,     0x04c91f44,     0x044b1745,     0x0401033f,
+    0x04dca468,     0x65c09b07,     0x658d9e38,     0x65868fca,
+    0x65879ba8,     0x65c297ff,     0x04ddb4e0,     0x6582badd,
+    0x6580ba9d,     0x6581b246,     0x658db51a,     0x65818b93,
+    0x65f487d1,     0x65ee0e3c,     0x65b8396a,     0x65f7af8b,
+    0x65f4def4,     0x65e6e378,     0x65ed4c8d,     0x65a6769a,
+    0x049d5c1d,     0x04c864a3,     0x042d322d,     0x04a83148,
+    0x047d3013,     0x04f731b0,     0x052d6bd7,     0x05606ed9,
+    0x65889d79,     0x4556b2ee,     0x4540b645,     0x04223869,
+    0x445887ae,     0x44da948e,     0x44998edb,     0x449b997f,
+    0x041a338c,     0x04d8309c,     0x049921e6,     0x04883641,
+    0x044a2882,     0x04892b8b,     0x044b37e3,     0x658735f8,
+    0x65862d06,     0x65d83c95,     0x040134d8,     0x0e2610a4,
+    0x4e2c116a,     0x0e6b1149,     0x4e7b1359,     0x0eac116a,
+    0x4ea710c5,     0x2e21101f,     0x6e3812f6,     0x2e7b1359,
+    0x6e71120f,     0x2ea51083,     0x6eb41272,
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/gtest/aarch64/test_spin_pause.cpp b/test/hotspot/gtest/aarch64/test_spin_pause.cpp
index e220362eae9..98d05e030c2 100644
--- a/test/hotspot/gtest/aarch64/test_spin_pause.cpp
+++ b/test/hotspot/gtest/aarch64/test_spin_pause.cpp
@@ -21,7 +21,9 @@
  * questions.
  */
 
-#if defined(AARCH64) && !defined(ZERO)
+// Skip Windows to prevent GTestWrapper.java from failing because
+// SpinPause is not implemented on Windows (and therefore returns 0)
+#if defined(AARCH64) && !defined(ZERO) && !defined(_WINDOWS)
 
 #include "utilities/spinYield.hpp"
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/cds/test_scaledOffsets.cpp b/test/hotspot/gtest/cds/test_scaledOffsets.cpp
new file mode 100644
index 00000000000..93b1b211276
--- /dev/null
+++ b/test/hotspot/gtest/cds/test_scaledOffsets.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2026 salesforce.com, inc. All Rights Reserved
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "cds/aotCompressedPointers.hpp"
+#include "unittest.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+#include <cstdint>
+
+TEST_VM(ScaledOffsetsTest, constants) {
+#ifdef _LP64
+  ASSERT_EQ((size_t)3, AOTCompressedPointers::MetadataOffsetShift);
+  ASSERT_TRUE(is_aligned(AOTCompressedPointers::MaxMetadataOffsetBytes, (size_t)1 << AOTCompressedPointers::MetadataOffsetShift));
+  ASSERT_EQ((size_t)(3584ULL * M), AOTCompressedPointers::MaxMetadataOffsetBytes);
+#else
+  ASSERT_EQ((size_t)0, AOTCompressedPointers::MetadataOffsetShift);
+  ASSERT_EQ((size_t)0x7FFFFFFF, AOTCompressedPointers::MaxMetadataOffsetBytes);
+#endif
+}
+
+TEST_VM(ScaledOffsetsTest, encode_decode_roundtrip) {
+  // Test that encoding and decoding via get_byte_offset produces correct results
+  const size_t unit = (size_t)1 << AOTCompressedPointers::MetadataOffsetShift;
+
+  // Test that get_byte_offset correctly applies the shift
+  // Note: We can't directly test encode_byte_offset as it's private, but we can verify
+  // the shift value is applied correctly in get_byte_offset
+  AOTCompressedPointers::narrowPtr np1 = static_cast<AOTCompressedPointers::narrowPtr>(1);
+  ASSERT_EQ(unit, AOTCompressedPointers::get_byte_offset(np1));
+
+  AOTCompressedPointers::narrowPtr np2 = static_cast<AOTCompressedPointers::narrowPtr>(2);
+  ASSERT_EQ(2 * unit, AOTCompressedPointers::get_byte_offset(np2));
+
+  AOTCompressedPointers::narrowPtr np1024 = static_cast<AOTCompressedPointers::narrowPtr>(1024);
+  ASSERT_EQ(1024 * unit, AOTCompressedPointers::get_byte_offset(np1024));
+
+#ifdef _LP64
+  const uint64_t max_units = (uint64_t)UINT32_MAX;
+  AOTCompressedPointers::narrowPtr np_max = static_cast<AOTCompressedPointers::narrowPtr>(UINT32_MAX);
+  const uint64_t max_bytes = max_units << AOTCompressedPointers::MetadataOffsetShift;
+  ASSERT_EQ(max_bytes, AOTCompressedPointers::get_byte_offset(np_max));
+  ASSERT_GE(max_bytes, AOTCompressedPointers::MaxMetadataOffsetBytes - unit);
+#endif
+}
+
+TEST_VM(ScaledOffsetsTest, null_handling) {
+  // Test that null() returns 0
+  ASSERT_EQ(static_cast<AOTCompressedPointers::narrowPtr>(0), AOTCompressedPointers::null());
+  ASSERT_EQ((size_t)0, AOTCompressedPointers::get_byte_offset(AOTCompressedPointers::null()));
+}
diff --git a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
index d83d8ffeef6..91951b35405 100644
--- a/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
+++ b/test/hotspot/gtest/gc/g1/test_g1CardSetContainers.cpp
@@ -25,6 +25,7 @@
 #include "gc/g1/g1HeapRegionBounds.inline.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "memory/allocation.inline.hpp"
+#include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "unittest.hpp"
@@ -82,48 +83,48 @@ void G1CardSetContainersTest::cardset_inlineptr_test(uint bits_per_card) {
 
   G1AddCardResult res;
 
-  G1CardSet::ContainerPtr value = G1CardSetInlinePtr();
+  Atomic<G1CardSet::ContainerPtr> value{};
 
   for (uint i = 0; i < CardsPerSet; i++) {
     {
-      G1CardSetInlinePtr cards(&value, value);
+      G1CardSetInlinePtr cards(&value, value.load_relaxed());
       res = cards.add(i + 1, bits_per_card, CardsPerSet);
       ASSERT_TRUE(res == Added);
     }
     {
-      G1CardSetInlinePtr cards(&value, value);
+      G1CardSetInlinePtr cards(&value, value.load_relaxed());
       ASSERT_TRUE(cards.contains(i + 1, bits_per_card));
     }
   }
 
   for (uint i = 0; i < CardsPerSet; i++) {
-    G1CardSetInlinePtr cards(value);
+    G1CardSetInlinePtr cards(value.load_relaxed());
     ASSERT_TRUE(cards.contains(i + 1, bits_per_card));
   }
 
   // Try to add again, should all return that the card had been added.
   for (uint i = 0; i < CardsPerSet; i++) {
-    G1CardSetInlinePtr cards(&value, value);
+    G1CardSetInlinePtr cards(&value, value.load_relaxed());
     res = cards.add(i + 1, bits_per_card, CardsPerSet);
     ASSERT_TRUE(res == Found);
   }
 
   // Should be no more space in set.
   {
-    G1CardSetInlinePtr cards(&value, value);
+    G1CardSetInlinePtr cards(&value, value.load_relaxed());
     res = cards.add(CardsPerSet + 1, bits_per_card, CardsPerSet);
     ASSERT_TRUE(res == Overflow);
   }
 
   // Cards should still be in the set.
   for (uint i = 0; i < CardsPerSet; i++) {
-    G1CardSetInlinePtr cards(value);
+    G1CardSetInlinePtr cards(value.load_relaxed());
     ASSERT_TRUE(cards.contains(i + 1, bits_per_card));
   }
 
   // Boundary cards should not be in the set.
   {
-    G1CardSetInlinePtr cards(value);
+    G1CardSetInlinePtr cards(value.load_relaxed());
     ASSERT_TRUE(!cards.contains(0, bits_per_card));
     ASSERT_TRUE(!cards.contains(CardsPerSet + 1, bits_per_card));
   }
@@ -131,7 +132,7 @@ void G1CardSetContainersTest::cardset_inlineptr_test(uint bits_per_card) {
   // Verify iteration finds all cards too and only those.
   {
     G1FindCardsInRange found(1, CardsPerSet);
-    G1CardSetInlinePtr cards(value);
+    G1CardSetInlinePtr cards(value.load_relaxed());
     cards.iterate(found, bits_per_card);
     found.verify_all_found();
   }
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahCollectorPolicy.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahCollectorPolicy.cpp
index b5c974f65ad..70d458ec5e5 100644
--- a/test/hotspot/gtest/gc/shenandoah/test_shenandoahCollectorPolicy.cpp
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahCollectorPolicy.cpp
@@ -28,7 +28,7 @@
 TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_sanity) {
   ShenandoahCollectorPolicy policy;
   EXPECT_EQ(policy.consecutive_degenerated_gc_count(), 0UL);
-  EXPECT_EQ(policy.generational_should_upgrade_degenerated_gc(), false);
+  EXPECT_EQ(policy.should_upgrade_degenerated_gc(), false);
 }
 
 TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_no_upgrade) {
@@ -36,7 +36,7 @@ TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_no_upgrade) {
   policy.record_degenerated(true, true, true);
   policy.record_degenerated(true, true, true);
   EXPECT_EQ(policy.consecutive_degenerated_gc_count(), 2UL);
-  EXPECT_EQ(policy.generational_should_upgrade_degenerated_gc(), false);
+  EXPECT_EQ(policy.should_upgrade_degenerated_gc(), false);
 }
 
 TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_upgrade) {
@@ -44,7 +44,7 @@ TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_upgrade) {
   policy.record_degenerated(true, true, false);
   policy.record_degenerated(true, true, false);
   EXPECT_EQ(policy.consecutive_degenerated_gc_count(), 2UL);
-  EXPECT_EQ(policy.generational_should_upgrade_degenerated_gc(), true);
+  EXPECT_EQ(policy.should_upgrade_degenerated_gc(), true);
 }
 
 TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_reset_progress) {
@@ -52,7 +52,7 @@ TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_reset_progress) {
   policy.record_degenerated(true, true, false);
   policy.record_degenerated(true, true, true);
   EXPECT_EQ(policy.consecutive_degenerated_gc_count(), 2UL);
-  EXPECT_EQ(policy.generational_should_upgrade_degenerated_gc(), false);
+  EXPECT_EQ(policy.should_upgrade_degenerated_gc(), false);
 }
 
 TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_full_reset) {
@@ -60,7 +60,7 @@ TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_full_reset) {
   policy.record_degenerated(true, true, false);
   policy.record_success_full();
   EXPECT_EQ(policy.consecutive_degenerated_gc_count(), 0UL);
-  EXPECT_EQ(policy.generational_should_upgrade_degenerated_gc(), false);
+  EXPECT_EQ(policy.should_upgrade_degenerated_gc(), false);
 }
 
 TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_reset) {
@@ -68,5 +68,5 @@ TEST(ShenandoahCollectorPolicyTest, track_degen_cycles_reset) {
   policy.record_degenerated(true, true, false);
   policy.record_success_concurrent(true, true);
   EXPECT_EQ(policy.consecutive_degenerated_gc_count(), 0UL);
-  EXPECT_EQ(policy.generational_should_upgrade_degenerated_gc(), false);
+  EXPECT_EQ(policy.should_upgrade_degenerated_gc(), false);
 }
diff --git a/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp b/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp
index b184b19ce6c..c0ec1bcf3c9 100644
--- a/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp
+++ b/test/hotspot/gtest/gc/shenandoah/test_shenandoahOldHeuristic.cpp
@@ -201,7 +201,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, prime_one_old_region) {
 
   size_t garbage = make_garbage_above_collection_threshold(10);
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(10UL));
   EXPECT_EQ(garbage, _collection_set->get_old_garbage());
@@ -214,7 +216,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, prime_many_old_regions) {
   size_t g1 = make_garbage_above_collection_threshold(100);
   size_t g2 = make_garbage_above_collection_threshold(101);
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(100UL, 101UL));
   EXPECT_EQ(g1 + g2, _collection_set->get_old_garbage());
@@ -226,7 +230,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, require_multiple_mixed_evacuations) {
 
   size_t garbage = create_too_much_garbage_for_one_mixed_evacuation();
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_LT(_collection_set->get_old_garbage(), garbage);
   EXPECT_GT(_heuristics->unprocessed_old_collection_candidates(), 0UL);
@@ -248,7 +254,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, skip_pinned_regions) {
   ASSERT_EQ(3UL, _heuristics->unprocessed_old_collection_candidates());
 
   // Here the region is still pinned, so it cannot be added to the collection set.
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   // The two unpinned regions should be added to the collection set and the pinned
   // region should be retained at the front of the list of candidates as it would be
@@ -261,7 +269,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, skip_pinned_regions) {
   // the now unpinned region should be added to the collection set.
   make_unpinned(1);
   _collection_set->clear();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_EQ(_collection_set->get_old_garbage(), g2);
   EXPECT_TRUE(collection_set_is(1UL));
@@ -278,14 +288,18 @@ TEST_VM_F(ShenandoahOldHeuristicTest, pinned_region_is_first) {
 
   make_pinned(0);
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(1UL, 2UL));
   EXPECT_EQ(_heuristics->unprocessed_old_collection_candidates(), 1UL);
 
   make_unpinned(0);
   _collection_set->clear();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(0UL));
   EXPECT_EQ(_heuristics->unprocessed_old_collection_candidates(), 0UL);
@@ -301,7 +315,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, pinned_region_is_last) {
 
   make_pinned(2);
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(0UL, 1UL));
   EXPECT_EQ(_collection_set->get_old_garbage(), g1 + g2);
@@ -309,7 +325,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, pinned_region_is_last) {
 
   make_unpinned(2);
   _collection_set->clear();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(2UL));
   EXPECT_EQ(_collection_set->get_old_garbage(), g3);
@@ -327,7 +345,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, unpinned_region_is_middle) {
   make_pinned(0);
   make_pinned(2);
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(1UL));
   EXPECT_EQ(_collection_set->get_old_garbage(), g2);
@@ -336,7 +356,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, unpinned_region_is_middle) {
   make_unpinned(0);
   make_unpinned(2);
   _collection_set->clear();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   EXPECT_TRUE(collection_set_is(0UL, 2UL));
   EXPECT_EQ(_collection_set->get_old_garbage(), g1 + g3);
@@ -354,7 +376,9 @@ TEST_VM_F(ShenandoahOldHeuristicTest, all_candidates_are_pinned) {
   make_pinned(1);
   make_pinned(2);
   _heuristics->prepare_for_old_collections();
-  _heuristics->prime_collection_set(_collection_set);
+  if (_heuristics->prime_collection_set(_collection_set)) {
+    _heuristics->finalize_mixed_evacs();
+  }
 
   // In the case when all candidates are pinned, we want to abandon
   // this set of mixed collection candidates so that another old collection
diff --git a/test/hotspot/gtest/gc/z/test_zForwarding.cpp b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
index 5275b78fb82..6b66d43ae7f 100644
--- a/test/hotspot/gtest/gc/z/test_zForwarding.cpp
+++ b/test/hotspot/gtest/gc/z/test_zForwarding.cpp
@@ -44,11 +44,12 @@ using namespace testing;
 class ZForwardingTest : public ZTest {
 public:
   // Setup and tear down
-  ZHeap*            _old_heap;
-  ZGenerationOld*   _old_old;
-  ZGenerationYoung* _old_young;
-  ZAddressReserver  _zaddress_reserver;
-  zoffset           _page_offset;
+  ZHeap*                       _old_heap;
+  ZGenerationOld*              _old_old;
+  ZGenerationYoung*            _old_young;
+  ZAddressReserver             _zaddress_reserver;
+  ZPhysicalMemoryBackingMocker _physical_backing;
+  zoffset                      _page_offset;
 
   virtual void SetUp() {
     _old_heap = ZHeap::_heap;
@@ -73,8 +74,16 @@ public:
       GTEST_SKIP() << "Unable to reserve memory";
     }
 
-    char* const addr = (char*)untype(ZOffset::address_unsafe(_page_offset));
-    os::commit_memory(addr, ZGranuleSize, /* executable */ false);
+    // Setup backing storage
+    _physical_backing.SetUp(ZGranuleSize);
+
+    size_t committed = _physical_backing()->commit(zbacking_offset(0), ZGranuleSize, 0);
+
+    if (committed != ZGranuleSize) {
+      GTEST_SKIP() << "Unable to commit memory";
+    }
+
+    _physical_backing()->map(ZOffset::address_unsafe(_page_offset), ZGranuleSize, zbacking_offset(0));
   }
 
   virtual void TearDown() {
@@ -84,10 +93,12 @@ public:
     ZGeneration::_young = _old_young;
 
     if (_page_offset != zoffset::invalid) {
-      char* const addr = (char*)untype(ZOffset::address_unsafe(_page_offset));
-      os::uncommit_memory(addr, ZGranuleSize, false /* executable */);
+      _physical_backing()->unmap(ZOffset::address_unsafe(_page_offset), ZGranuleSize);
+      _physical_backing()->uncommit(zbacking_offset(0), ZGranuleSize);
     }
 
+    _physical_backing.TearDown();
+
     _zaddress_reserver.TearDown();
   }
 
diff --git a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
index 7c41dde04cb..f2a62fea57d 100644
--- a/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
+++ b/test/hotspot/gtest/gc/z/test_zVirtualMemoryManager.cpp
@@ -168,8 +168,7 @@ public:
     ASSERT_EQ(vmem, ZVirtualMemory(base_offset + 2 * ZGranuleSize, ZGranuleSize));
     _reserver->unreserve(vmem);
 
-    const bool released = os::release_memory((char*)untype(blocked), ZGranuleSize);
-    ASSERT_TRUE(released);
+    os::release_memory((char*)untype(blocked), ZGranuleSize);
   }
 
   void test_remove_from_low() {
diff --git a/test/hotspot/gtest/gc/z/zunittest.hpp b/test/hotspot/gtest/gc/z/zunittest.hpp
index 2464f821380..13a8eb10f8a 100644
--- a/test/hotspot/gtest/gc/z/zunittest.hpp
+++ b/test/hotspot/gtest/gc/z/zunittest.hpp
@@ -28,6 +28,7 @@
 #include "gc/z/zArguments.hpp"
 #include "gc/z/zInitialize.hpp"
 #include "gc/z/zNUMA.hpp"
+#include "gc/z/zPhysicalMemoryManager.hpp"
 #include "gc/z/zRangeRegistry.hpp"
 #include "gc/z/zVirtualMemory.inline.hpp"
 #include "gc/z/zVirtualMemoryManager.hpp"
@@ -104,6 +105,54 @@ public:
       }
   };
 
+  class ZPhysicalMemoryBackingMocker {
+    size_t                  _old_max;
+    ZPhysicalMemoryBacking* _backing;
+    bool                    _active;
+
+    static size_t set_max(size_t max_capacity) {
+      size_t old_max = ZBackingOffsetMax;
+
+      ZBackingOffsetMax = max_capacity;
+      ZBackingIndexMax = checked_cast<uint32_t>(ZBackingOffsetMax >> ZGranuleSizeShift);
+
+      return old_max;
+    }
+
+  public:
+    ZPhysicalMemoryBackingMocker()
+      : _old_max(0),
+        _backing(nullptr),
+        _active(false) {}
+
+    void SetUp(size_t max_capacity) {
+      GTEST_EXPECT_FALSE(_active) << "SetUp called twice without a TearDown";
+
+      _old_max = set_max(max_capacity);
+
+      char* const mem = (char*)os::malloc(sizeof(ZPhysicalMemoryBacking), mtTest);
+      _backing = new (mem) ZPhysicalMemoryBacking(ZGranuleSize);
+
+      _active = true;
+    }
+
+    void TearDown() {
+      GTEST_EXPECT_TRUE(_active) << "TearDown called without a preceding SetUp";
+
+      _active = false;
+
+      _backing->~ZPhysicalMemoryBacking();
+      os::free(_backing);
+      _backing = nullptr;
+
+      set_max(_old_max);
+    }
+
+    ZPhysicalMemoryBacking* operator()() {
+      return _backing;
+    }
+  };
+
 private:
   ZAddressOffsetMaxSetter _zaddress_offset_max_setter;
   unsigned int _rand_seed;
diff --git a/test/hotspot/gtest/logging/test_logOutputList.cpp b/test/hotspot/gtest/logging/test_logOutputList.cpp
index 64becbd7ef7..df3bb2c3227 100644
--- a/test/hotspot/gtest/logging/test_logOutputList.cpp
+++ b/test/hotspot/gtest/logging/test_logOutputList.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,16 @@ static LogOutput* dummy_output(size_t id) {
   return reinterpret_cast<LogOutput*>(id + 1);
 }
 
+static LogStdoutOutput* dummy_stdout() {
+  static LogStdoutOutput dummy_stdout;
+  return &dummy_stdout;
+}
+
+static LogStderrOutput* dummy_stderr() {
+  static LogStderrOutput dummy_stderr;
+  return &dummy_stderr;
+}
+
 // Randomly update and verify some outputs some number of times
 TEST(LogOutputList, set_output_level_update) {
   const size_t TestOutputCount = 10;
@@ -174,7 +184,7 @@ TEST(LogOutputList, is_level_single_output) {
   for (size_t i = LogLevel::First; i < LogLevel::Count; i++) {
     LogLevelType level = static_cast<LogLevelType>(i);
     LogOutputList list;
-    list.set_output_level(LogConfiguration::StdoutLog, level);
+    list.set_output_level(dummy_stdout(), level);
     for (size_t j = LogLevel::First; j < LogLevel::Count; j++) {
       LogLevelType other = static_cast<LogLevelType>(j);
       // Verify that levels finer than the current level for stdout are reported as disabled,
@@ -202,8 +212,8 @@ TEST(LogOutputList, is_level_empty) {
 // Test is_level() on lists with two outputs on different levels
 TEST(LogOutputList, is_level_multiple_outputs) {
   for (size_t i = LogLevel::First; i < LogLevel::Count - 1; i++) {
-      LogOutput* dummy1 = LogConfiguration::StdoutLog;
-      LogOutput* dummy2 = LogConfiguration::StderrLog;
+      LogOutput* dummy1 = dummy_stdout();
+      LogOutput* dummy2 = dummy_stderr();
       LogLevelType first = static_cast<LogLevelType>(i);
       LogLevelType second = static_cast<LogLevelType>(i + 1);
       LogOutputList list;
@@ -227,19 +237,19 @@ TEST(LogOutputList, level_for) {
   LogOutputList list;
 
   // Ask the empty list about stdout, stderr
-  EXPECT_EQ(LogLevel::Off, list.level_for(LogConfiguration::StdoutLog));
-  EXPECT_EQ(LogLevel::Off, list.level_for(LogConfiguration::StderrLog));
+  EXPECT_EQ(LogLevel::Off, list.level_for(dummy_stdout()));
+  EXPECT_EQ(LogLevel::Off, list.level_for(dummy_stderr()));
 
   // Ask for level in a list with two outputs on different levels
-  list.set_output_level(LogConfiguration::StdoutLog, LogLevel::Info);
-  list.set_output_level(LogConfiguration::StderrLog, LogLevel::Trace);
-  EXPECT_EQ(LogLevel::Info, list.level_for(LogConfiguration::StdoutLog));
-  EXPECT_EQ(LogLevel::Trace, list.level_for(LogConfiguration::StderrLog));
+  list.set_output_level(dummy_stdout(), LogLevel::Info);
+  list.set_output_level(dummy_stderr(), LogLevel::Trace);
+  EXPECT_EQ(LogLevel::Info, list.level_for(dummy_stdout()));
+  EXPECT_EQ(LogLevel::Trace, list.level_for(dummy_stderr()));
 
   // Remove and ask again
-  list.set_output_level(LogConfiguration::StdoutLog, LogLevel::Off);
-  EXPECT_EQ(LogLevel::Off, list.level_for(LogConfiguration::StdoutLog));
-  EXPECT_EQ(LogLevel::Trace, list.level_for(LogConfiguration::StderrLog));
+  list.set_output_level(dummy_stdout(), LogLevel::Off);
+  EXPECT_EQ(LogLevel::Off, list.level_for(dummy_stdout()));
+  EXPECT_EQ(LogLevel::Trace, list.level_for(dummy_stderr()));
 
   // Ask about an unknown output
   LogOutput* dummy = dummy_output(4711);
@@ -252,5 +262,5 @@ TEST(LogOutputList, level_for) {
   }
 
   // Make sure the stderr level is still the same
-  EXPECT_EQ(LogLevel::Trace, list.level_for(LogConfiguration::StderrLog));
+  EXPECT_EQ(LogLevel::Trace, list.level_for(dummy_stderr()));
 }
diff --git a/test/hotspot/gtest/logging/test_logTagSet.cpp b/test/hotspot/gtest/logging/test_logTagSet.cpp
index 4c00644d25b..b53272eafdb 100644
--- a/test/hotspot/gtest/logging/test_logTagSet.cpp
+++ b/test/hotspot/gtest/logging/test_logTagSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,9 @@
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
 
-// Test the default level for each tagset
-TEST_VM(LogTagSet, defaults) {
+// Test the default level for each tagset, runs in other VM to ensure no other
+// test have changed a LogTagSet.
+TEST_OTHER_VM(LogTagSet, defaults) {
   for (LogTagSet* ts = LogTagSet::first(); ts != nullptr; ts = ts->next()) {
     char buf[256];
     ts->label(buf, sizeof(buf));
diff --git a/test/hotspot/gtest/memory/test_virtualspace.cpp b/test/hotspot/gtest/memory/test_virtualspace.cpp
index d2f8927ba28..eaabc46edaf 100644
--- a/test/hotspot/gtest/memory/test_virtualspace.cpp
+++ b/test/hotspot/gtest/memory/test_virtualspace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ namespace {
    public:
     MemoryReleaser(ReservedSpace* rs) : _rs(rs) { }
     ~MemoryReleaser() {
-      EXPECT_TRUE(MemoryReserver::release(*_rs));
+      MemoryReserver::release(*_rs);
     }
   };
 
@@ -354,11 +354,7 @@ class TestReservedSpace : AllStatic {
   }
 
   static void release_memory_for_test(ReservedSpace rs) {
-    if (rs.special()) {
-      EXPECT_TRUE(os::release_memory_special(rs.base(), rs.size()));
-    } else {
-      EXPECT_TRUE(os::release_memory(rs.base(), rs.size()));
-    }
+    os::release_memory(rs.base(), rs.size());
   }
 
   static void test_reserved_space1(size_t size, size_t alignment) {
diff --git a/test/hotspot/gtest/metaspace/test_blocktree.cpp b/test/hotspot/gtest/metaspace/test_blocktree.cpp
index 6d1e8d2884d..3bcd79c98ad 100644
--- a/test/hotspot/gtest/metaspace/test_blocktree.cpp
+++ b/test/hotspot/gtest/metaspace/test_blocktree.cpp
@@ -74,7 +74,7 @@ TEST_VM(metaspace, BlockTree_basic) {
   MetaWord* p = nullptr;
   MetaWord arr[10000];
 
-  ASSERT_LE(BlockTree::MinWordSize, (size_t)6); // Sanity check. Adjust if Node is changed.
+  ASSERT_LE(BlockTree::MinWordSize, (size_t)7); // Sanity check. Adjust if Node is changed.
 
   const size_t minws = BlockTree::MinWordSize;
 
diff --git a/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp b/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
index 5752d6df75d..e3b03440141 100644
--- a/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022 SAP SE. All rights reserved.
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,6 @@
 #include "unittest.hpp"
 #include "testutils.hpp"
 
-#if !INCLUDE_ASAN
-
 // This prefix shows up on any c heap corruption NMT detects. If unsure which assert will
 // come, just use this one.
 #define COMMON_NMT_HEAP_CORRUPTION_MESSAGE_PREFIX "NMT has detected a memory corruption bug."
@@ -49,9 +47,10 @@
                 "fake message ignore this - " expected_assertion_message);                \
     }                                                                                     \
   }
-
 ///////
 
+#if !INCLUDE_ASAN
+
 static void test_overwrite_front() {
   address p = (address) os::malloc(1, mtTest);
   *(p - 1) = 'a';
@@ -86,31 +85,6 @@ DEFINE_TEST(test_overwrite_back_long_unaligned_distance, "footer canary broken")
 
 ///////
 
-static void test_double_free() {
-  address p = (address) os::malloc(1, mtTest);
-  os::free(p);
-  // Now a double free. Note that this is susceptible to concurrency issues should
-  // a concurrent thread have done a malloc and gotten the same address after the
-  // first free. To decrease chance of this happening, we repeat the double free
-  // several times.
-  for (int i = 0; i < 100; i ++) {
-    os::free(p);
-  }
-}
-
-// What assertion message we will see depends on whether the VM wipes the memory-to-be-freed
-// on the first free(), and whether the libc uses the freed memory to store bookkeeping information.
-// If the death marker in the header is still intact after the first free, we will recognize this as
-// double free; if it got wiped, we should at least see a broken header canary.
-// The message would be either
-// - "header canary broken" or
-// - "header canary dead (double free?)".
-// However, since gtest regex expressions do not support unions (a|b), I search for a reasonable
-// subset here.
-DEFINE_TEST(test_double_free, "header canary")
-
-///////
-
 static void test_invalid_block_address() {
   // very low, like the result of an overflow or of accessing a null this pointer
   os::free((void*)0x100);
@@ -190,4 +164,78 @@ TEST_VM_FATAL_ERROR_MSG(NMT, memory_corruption_call_stack, ".*header canary.*")
   os::free(p);
 }
 
+#else // ASAN is enabled
+
+#define DEFINE_ASAN_TEST(test_function)  \
+  DEFINE_TEST(test_function, ".*AddressSanitizer.*")
+
+static void test_write_header() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  // sizeof(MallocHeader) == 16, pick anywheree in [p - 16, p)
+  *(uint16_t*)((char*)p - 5) = 1;
+}
+
+static void test_read_header() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  // sizeof(MallocHeader) == 16, pick anywheree in [p - 16, p)
+  uint16_t read_canary = *(uint16_t*)((char*)p - 5);
+}
+
+static void test_write_footer() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  uint16_t* footer_ptr = (uint16_t*)(p + SIZE);
+  *footer_ptr = 1;
+}
+
+static void test_read_footer() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  uint16_t* footer_ptr = (uint16_t*)(p + SIZE);
+  uint16_t read_footer = *footer_ptr;
+}
+
+static void test_write_header_after_realloc() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  p = (char*)os::realloc(p, 2 * SIZE, mtTest);
+  // sizeof(MallocHeader) == 16, pick anywheree in [p - 16, p)
+  *(uint16_t*)((char*)p - 5) = 1;
+}
+
+static void test_read_header_after_realloc() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  p = (char*)os::realloc(p, 2 * SIZE, mtTest);
+  // sizeof(MallocHeader) == 16, pick anywheree in [p - 16, p)
+  uint16_t read_canary = *(uint16_t*)((char*)p - 5);
+}
+
+static void test_write_footer_after_realloc() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  p = (char*)os::realloc(p, 2 * SIZE, mtTest);
+  uint16_t* footer_ptr = (uint16_t*)(p + 2 * SIZE);
+  *footer_ptr = 1;
+}
+
+static void test_read_footer_after_realloc() {
+  const size_t SIZE = 10;
+  char* p = (char*)os::malloc(SIZE, mtTest);
+  p = (char*)os::realloc(p, 2 * SIZE, mtTest);
+  uint16_t* footer_ptr = (uint16_t*)(p + 2 * SIZE);
+  uint16_t read_footer = *footer_ptr;
+}
+
+DEFINE_ASAN_TEST(test_write_header);
+DEFINE_ASAN_TEST(test_read_header);
+DEFINE_ASAN_TEST(test_write_footer);
+DEFINE_ASAN_TEST(test_read_footer);
+DEFINE_ASAN_TEST(test_write_header_after_realloc);
+DEFINE_ASAN_TEST(test_read_header_after_realloc);
+DEFINE_ASAN_TEST(test_write_footer_after_realloc);
+DEFINE_ASAN_TEST(test_read_footer_after_realloc);
+
 #endif // !INCLUDE_ASAN
diff --git a/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp b/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp
index d1da65cb396..e0a452b1831 100644
--- a/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023 SAP SE. All rights reserved.
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,9 @@
 #include "testutils.hpp"
 #include "unittest.hpp"
 
+// ASAN complains about allocating very large sizes
+#if !INCLUDE_ASAN
+
 // Check NMT header for integrity, as well as expected type and size.
 static void check_expected_malloc_header(const void* payload, MemTag mem_tag, size_t size) {
   const MallocHeader* hdr = MallocHeader::resolve_checked(payload);
@@ -38,9 +41,6 @@ static void check_expected_malloc_header(const void* payload, MemTag mem_tag, si
   EXPECT_EQ(hdr->mem_tag(), mem_tag);
 }
 
-// ASAN complains about allocating very large sizes
-#if !INCLUDE_ASAN
-
 // Check that a malloc with an overflowing size is rejected.
 TEST_VM(NMT, malloc_failure1) {
   void* p = os::malloc(SIZE_MAX, mtTest);
@@ -88,7 +88,6 @@ TEST_VM(NMT, realloc_failure_overflowing_size) {
 TEST_VM(NMT, realloc_failure_gigantic_size) {
   check_failing_realloc(SIZE_MAX - M);
 }
-#endif // !INCLUDE_ASAN
 
 static void* do_realloc(void* p, size_t old_size, size_t new_size, uint8_t old_content, bool check_nmt_header) {
 
@@ -154,8 +153,8 @@ TEST_VM(NMT, HeaderKeepsIntegrityAfterRevival) {
   size_t some_size = 16;
   void* p = os::malloc(some_size, mtTest);
   ASSERT_NOT_NULL(p) << "Failed to malloc()";
-  MallocHeader* hdr = MallocTracker::malloc_header(p);
-  hdr->mark_block_as_dead();
-  hdr->revive();
+  MallocHeader* hdr = MallocHeader::kill_block(p);
+  MallocHeader::revive_block(p);
   check_expected_malloc_header(p, mtTest, some_size);
 }
+#endif // !INCLUDE_ASAN
\ No newline at end of file
diff --git a/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp b/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp
index da357285148..48da390e06f 100644
--- a/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 SAP SE. All rights reserved.
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
  */
 
 #include "memory/allocation.hpp"
+#include "memory/arena.hpp"
 #include "nmt/mallocLimit.hpp"
 #include "nmt/memTracker.hpp"
 #include "nmt/nmtCommon.hpp"
@@ -155,3 +156,14 @@ TEST_VM_FATAL_ERROR_MSG(NMT, MallocLimitDeathTestOnStrDup, ".*MallocLimit: reach
     char* p = os::strdup("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", mtTest);
   }
 }
+
+TEST_VM_FATAL_ERROR_MSG(NMT, MallocLimitDeathTestOnArenaGrow, ".*MallocLimit in Arena::grow.*") {
+  // We fake the correct assert if NMT is off to make the test pass (there is no way to execute a death test conditionally)
+  if (!MemTracker::enabled()) {
+    fatal("Fake message please ignore: MallocLimit in Arena::grow");
+  }
+  // the real test
+  MallocLimitHandler::initialize("test:10m:oom");
+  Arena ar(mtTest);
+  ar.Amalloc(10 * M, AllocFailStrategy::EXIT_OOM);
+}
diff --git a/test/hotspot/gtest/nmt/test_nmt_summarydiff.cpp b/test/hotspot/gtest/nmt/test_nmt_summarydiff.cpp
new file mode 100644
index 00000000000..fcdbe57bfe1
--- /dev/null
+++ b/test/hotspot/gtest/nmt/test_nmt_summarydiff.cpp
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "nmt/memTag.hpp"
+#include "nmt/vmatree.hpp"
+#include "unittest.hpp"
+
+
+// The SummaryDiff is seldom used with a large number of tags
+// so test that separately.
+TEST(NMTSummaryDiffTest, WorksForLargeTagCount) {
+  VMATree::SummaryDiff d;
+  for (int i = 0; i < std::numeric_limits<std::underlying_type_t<MemTag>>::max(); i++) {
+    VMATree::SingleDiff& sd = d.tag(i);
+    sd.reserve = i;
+  }
+  for (int i = 0; i < std::numeric_limits<std::underlying_type_t<MemTag>>::max(); i++) {
+    VMATree::SingleDiff& sd = d.tag(i);
+    EXPECT_EQ(i, sd.reserve);
+  }
+}
diff --git a/test/hotspot/gtest/nmt/test_regions_tree.cpp b/test/hotspot/gtest/nmt/test_regions_tree.cpp
index 7465c84aa72..5d50a797a80 100644
--- a/test/hotspot/gtest/nmt/test_regions_tree.cpp
+++ b/test/hotspot/gtest/nmt/test_regions_tree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,30 +44,30 @@ TEST_VM_F(NMTRegionsTreeTest, ReserveCommitTwice) {
   {
     VMATree::SummaryDiff diff;
     rt.reserve_mapping(0, 100, rd, diff);
-    EXPECT_EQ(100, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
+    EXPECT_EQ(100, diff.tag(mtTest).reserve);
   }
   {
     VMATree::SummaryDiff diff, not_used;
     rt.commit_region(nullptr, 50, ncs, not_used);
     rt.reserve_mapping(0, 100, rd, diff);
-    EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-    EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+    EXPECT_EQ(0, diff.tag(mtTest).reserve);
+    EXPECT_EQ(-50, diff.tag(mtTest).commit);
   }
   {
     VMATree::SummaryDiff diff;
     rt.reserve_mapping(0, 100, rd2, diff);
-    EXPECT_EQ(-100, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-    EXPECT_EQ(100, diff.tag[NMTUtil::tag_to_index(mtGC)].reserve);
+    EXPECT_EQ(-100, diff.tag(mtTest).reserve);
+    EXPECT_EQ(100, diff.tag(mtGC).reserve);
   }
 
   {
     VMATree::SummaryDiff diff1, diff2;
     rt.commit_region(nullptr, 50, ncs, diff1);
-    EXPECT_EQ(0, diff1.tag[NMTUtil::tag_to_index(mtGC)].reserve);
-    EXPECT_EQ(50, diff1.tag[NMTUtil::tag_to_index(mtGC)].commit);
+    EXPECT_EQ(0, diff1.tag(mtGC).reserve);
+    EXPECT_EQ(50, diff1.tag(mtGC).commit);
     rt.commit_region(nullptr, 50, ncs, diff2);
-    EXPECT_EQ(0, diff2.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-    EXPECT_EQ(0, diff2.tag[NMTUtil::tag_to_index(mtTest)].commit);
+    EXPECT_EQ(0, diff2.tag(mtTest).reserve);
+    EXPECT_EQ(0, diff2.tag(mtTest).commit);
   }
 }
 
@@ -79,20 +79,20 @@ TEST_VM_F(NMTRegionsTreeTest, CommitUncommitRegion) {
   {
     VMATree::SummaryDiff diff;
     rt.commit_region(nullptr, 50, ncs, diff);
-    EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-    EXPECT_EQ(50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+    EXPECT_EQ(0, diff.tag(mtTest).reserve);
+    EXPECT_EQ(50, diff.tag(mtTest).commit);
   }
   {
     VMATree::SummaryDiff diff;
     rt.commit_region((address)60, 10, ncs, diff);
-    EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-    EXPECT_EQ(10, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+    EXPECT_EQ(0, diff.tag(mtTest).reserve);
+    EXPECT_EQ(10, diff.tag(mtTest).commit);
   }
   {
     VMATree::SummaryDiff diff;
     rt.uncommit_region(nullptr, 50, diff);
-    EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-    EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+    EXPECT_EQ(0, diff.tag(mtTest).reserve);
+    EXPECT_EQ(-50, diff.tag(mtTest).commit);
   }
 }
 
@@ -104,15 +104,15 @@ TEST_VM_F(NMTRegionsTreeTest, FindReservedRegion) {
   rt.reserve_mapping(1200, 50, rd, not_used);
   rt.reserve_mapping(1300, 50, rd, not_used);
   rt.reserve_mapping(1400, 50, rd, not_used);
-  ReservedMemoryRegion rmr;
-  rmr = rt.find_reserved_region((address)1205);
-  EXPECT_EQ(rmr.base(), (address)1200);
-  rmr = rt.find_reserved_region((address)1305);
-  EXPECT_EQ(rmr.base(), (address)1300);
-  rmr = rt.find_reserved_region((address)1405);
-  EXPECT_EQ(rmr.base(), (address)1400);
-  rmr = rt.find_reserved_region((address)1005);
-  EXPECT_EQ(rmr.base(), (address)1000);
+  VirtualMemoryRegion rgn;
+  rgn = rt.find_reserved_region((address)1205);
+  EXPECT_EQ(rgn.base(), (address)1200);
+  rgn = rt.find_reserved_region((address)1305);
+  EXPECT_EQ(rgn.base(), (address)1300);
+  rgn = rt.find_reserved_region((address)1405);
+  EXPECT_EQ(rgn.base(), (address)1400);
+  rgn = rt.find_reserved_region((address)1005);
+  EXPECT_EQ(rgn.base(), (address)1000);
 }
 
 TEST_VM_F(NMTRegionsTreeTest, VisitReservedRegions) {
@@ -124,7 +124,7 @@ TEST_VM_F(NMTRegionsTreeTest, VisitReservedRegions) {
   rt.reserve_mapping(1300, 50, rd, not_used);
   rt.reserve_mapping(1400, 50, rd, not_used);
 
-  rt.visit_reserved_regions([&](const ReservedMemoryRegion& rgn) {
+  rt.visit_reserved_regions([&](const VirtualMemoryRegion& rgn) {
     EXPECT_EQ(((size_t)rgn.base()) % 100, 0UL);
     EXPECT_EQ(rgn.size(), 50UL);
     return true;
@@ -144,9 +144,9 @@ TEST_VM_F(NMTRegionsTreeTest, VisitCommittedRegions) {
   rt.commit_region((address)1020, 5UL, ncs, not_used);
   rt.commit_region((address)1030, 5UL, ncs, not_used);
   rt.commit_region((address)1040, 5UL, ncs, not_used);
-  ReservedMemoryRegion rmr((address)1000, 50);
+  VirtualMemoryRegion rgn((address)1000, 50);
   size_t count = 0;
-  rt.visit_committed_regions(rmr, [&](CommittedMemoryRegion& crgn) {
+  rt.visit_committed_regions(rgn, [&](VirtualMemoryRegion& crgn) {
     count++;
     EXPECT_EQ((((size_t)crgn.base()) % 100) / 10, count);
     EXPECT_EQ(crgn.size(), 5UL);
diff --git a/test/hotspot/gtest/nmt/test_vmatree.cpp b/test/hotspot/gtest/nmt/test_vmatree.cpp
index eed2e5af0be..67cdc080cd6 100644
--- a/test/hotspot/gtest/nmt/test_vmatree.cpp
+++ b/test/hotspot/gtest/nmt/test_vmatree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -221,13 +221,13 @@ public:
     EXPECT_EQ(n1.val().out.committed_stack(), upd.new_st.committed_stack()) << failed_case;
 
     if (from == to) {
-      EXPECT_EQ(diff.tag[from].reserve, upd.reserve[0] + upd.reserve[1]) << failed_case;
-      EXPECT_EQ(diff.tag[from].commit, upd.commit[0] + upd.commit[1]) << failed_case;
+      EXPECT_EQ(diff.tag(from).reserve, upd.reserve[0] + upd.reserve[1]) << failed_case;
+      EXPECT_EQ(diff.tag(from).commit, upd.commit[0] + upd.commit[1]) << failed_case;
     } else {
-      EXPECT_EQ(diff.tag[from].reserve, upd.reserve[0]) << failed_case;
-      EXPECT_EQ(diff.tag[from].commit, upd.commit[0]) << failed_case;
-      EXPECT_EQ(diff.tag[to].reserve, upd.reserve[1]) << failed_case;
-      EXPECT_EQ(diff.tag[to].commit, upd.commit[1]) << failed_case;
+      EXPECT_EQ(diff.tag(from).reserve, upd.reserve[0]) << failed_case;
+      EXPECT_EQ(diff.tag(from).commit, upd.commit[0]) << failed_case;
+      EXPECT_EQ(diff.tag(to).reserve, upd.reserve[1]) << failed_case;
+      EXPECT_EQ(diff.tag(to).commit, upd.commit[1]) << failed_case;
     }
   }
 
@@ -235,6 +235,7 @@ public:
   void create_tree(Tree& tree, ExpectedTree<N>& et, int line_no) {
     using SIndex = NativeCallStackStorage::StackIndex;
     const SIndex ES = NativeCallStackStorage::invalid; // Empty Stack
+    VMATree::SummaryDiff not_used;
     VMATree::IntervalChange st;
     for (int i = 0; i < N; i++) {
       st.in.set_type(et.states[i]);
@@ -537,8 +538,8 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
 
     tree.reserve_mapping(0, 600, rd, not_used);
 
-    tree.set_tag(0, 500, mtGC);
-    tree.set_tag(500, 100, mtClassShared);
+    tree.set_tag(0, 500, mtGC, not_used);
+    tree.set_tag(500, 100, mtClassShared, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -569,8 +570,8 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     tree.commit_mapping(550, 10, rd, not_used);
     tree.commit_mapping(565, 10, rd, not_used);
     // OK, set tag
-    tree.set_tag(0, 500, mtGC);
-    tree.set_tag(500, 100, mtClassShared);
+    tree.set_tag(0, 500, mtGC, not_used);
+    tree.set_tag(500, 100, mtClassShared, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -584,7 +585,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     Tree::RegionData compiler(si, mtCompiler);
     tree.reserve_mapping(0, 100, gc, not_used);
     tree.reserve_mapping(100, 100, compiler, not_used);
-    tree.set_tag(0, 200, mtGC);
+    tree.set_tag(0, 200, mtGC, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -601,7 +602,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     Tree::RegionData compiler(si2, mtCompiler);
     tree.reserve_mapping(0, 100, gc, not_used);
     tree.reserve_mapping(100, 100, compiler, not_used);
-    tree.set_tag(0, 200, mtGC);
+    tree.set_tag(0, 200, mtGC, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -615,7 +616,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     VMATree::SummaryDiff not_used;
     Tree::RegionData compiler(si, mtCompiler);
     tree.reserve_mapping(0, 200, compiler, not_used);
-    tree.set_tag(100, 50, mtGC);
+    tree.set_tag(100, 50, mtGC, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -631,7 +632,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     Tree::RegionData compiler(si, mtCompiler);
     tree.reserve_mapping(0, 100, gc, not_used);
     tree.reserve_mapping(100, 100, compiler, not_used);
-    tree.set_tag(75, 50, mtClass);
+    tree.set_tag(75, 50, mtClass, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -647,7 +648,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     Tree::RegionData class_shared(si, mtClassShared);
     tree.reserve_mapping(0, 50, class_shared, not_used);
     tree.reserve_mapping(75, 25, class_shared, not_used);
-    tree.set_tag(0, 80, mtGC);
+    tree.set_tag(0, 80, mtGC, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -659,7 +660,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     VMATree::SummaryDiff not_used;
     Tree::RegionData class_shared(si, mtClassShared);
     tree.reserve_mapping(10, 10, class_shared, not_used);
-    tree.set_tag(0, 100, mtCompiler);
+    tree.set_tag(0, 100, mtCompiler, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 
@@ -677,7 +678,7 @@ TEST_VM_F(NMTVMATreeTest, SetTag) {
     tree.reserve_mapping(0, 100, class_shared, not_used);
     tree.release_mapping(1, 49, not_used);
     tree.release_mapping(75, 24, not_used);
-    tree.set_tag(0, 100, mtGC);
+    tree.set_tag(0, 100, mtGC, not_used);
     expect_equivalent_form(expected, tree, __LINE__);
   }
 }
@@ -696,7 +697,7 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  A - Test (reserved)
 //  . - free
-    VMATree::SingleDiff diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    VMATree::SingleDiff diff = all_diff.tag(mtTest);
     EXPECT_EQ(100, diff.reserve);
     tree.reserve_mapping(50, 25, rd_NMT_cs0, all_diff);
 //              1         2         3         4         5         6         7         8         9         10         11
@@ -707,8 +708,8 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //     B - Native Memory Tracking (reserved)
 //     C - Test (reserved)
 //     . - free
-    diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
-    VMATree::SingleDiff diff2 = all_diff.tag[NMTUtil::tag_to_index(mtNMT)];
+    diff = all_diff.tag(mtTest);
+    VMATree::SingleDiff diff2 = all_diff.tag(mtNMT);
     EXPECT_EQ(-25, diff.reserve);
     EXPECT_EQ(25, diff2.reserve);
   }
@@ -723,14 +724,14 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  A - Test (reserved)
 //  . - free
-    VMATree::SingleDiff diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    VMATree::SingleDiff diff = all_diff.tag(mtTest);
     EXPECT_EQ(100, diff.reserve);
     tree.release_mapping(0, 100, all_diff);
 //            1         2         3         4         5         6         7         8         9         10        11
 //  01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 //  ..............................................................................................................
 //  Legend:
-    diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    diff = all_diff.tag(mtTest);
     EXPECT_EQ(-100, diff.reserve);
   }
   { // Convert some of a released mapping to a committed one
@@ -744,7 +745,7 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  A - Test (reserved)
 //  . - free
-    VMATree::SingleDiff diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    VMATree::SingleDiff diff = all_diff.tag(mtTest);
     EXPECT_EQ(diff.reserve, 100);
     tree.commit_mapping(0, 100, rd_Test_cs0, all_diff);
 //            1         2         3         4         5         6         7         8         9         10         11
@@ -753,7 +754,7 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  a - Test (committed)
 //  . - free
-    diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    diff = all_diff.tag(mtTest);
     EXPECT_EQ(0, diff.reserve);
     EXPECT_EQ(100, diff.commit);
   }
@@ -768,7 +769,7 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  A - Test (reserved)
 //  . - free
-    VMATree::SingleDiff diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    VMATree::SingleDiff diff = all_diff.tag(mtTest);
     EXPECT_EQ(diff.reserve, 10);
     tree.reserve_mapping(10, 10, rd_Test_cs0, all_diff);
 //            1         2         3
@@ -777,7 +778,7 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  A - Test (reserved)
 //  . - free
-    diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    diff = all_diff.tag(mtTest);
     EXPECT_EQ(10, diff.reserve);
   }
   { // Adjacent reserved mappings with different tags
@@ -792,7 +793,7 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  A - Test (reserved)
 //  . - free
-    VMATree::SingleDiff diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    VMATree::SingleDiff diff = all_diff.tag(mtTest);
     EXPECT_EQ(diff.reserve, 10);
     tree.reserve_mapping(10, 10, rd_NMT_cs0, all_diff);
 //            1         2         3
@@ -802,9 +803,9 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  A - Test (reserved)
 //  B - Native Memory Tracking (reserved)
 //  . - free
-    diff = all_diff.tag[NMTUtil::tag_to_index(mtTest)];
+    diff = all_diff.tag(mtTest);
     EXPECT_EQ(0, diff.reserve);
-    diff = all_diff.tag[NMTUtil::tag_to_index(mtNMT)];
+    diff = all_diff.tag(mtNMT);
     EXPECT_EQ(10, diff.reserve);
   }
 
@@ -834,8 +835,8 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccounting) {
 //  Legend:
 //  a - Test (committed)
 //  . - free
-    EXPECT_EQ(16, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
-    EXPECT_EQ(16, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
+    EXPECT_EQ(16, diff.tag(mtTest).commit);
+    EXPECT_EQ(16, diff.tag(mtTest).reserve);
   }
 }
 
@@ -845,16 +846,16 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccountingReserveAsUncommit) {
   VMATree::SummaryDiff diff1, diff2, diff3;
   tree.reserve_mapping(1200, 100, rd, diff1);
   tree.commit_mapping(1210, 50, rd, diff2);
-  EXPECT_EQ(100, diff1.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-  EXPECT_EQ(50, diff2.tag[NMTUtil::tag_to_index(mtTest)].commit);
+  EXPECT_EQ(100, diff1.tag(mtTest).reserve);
+  EXPECT_EQ(50, diff2.tag(mtTest).commit);
   tree.reserve_mapping(1220, 20, rd, diff3);
-  EXPECT_EQ(-20, diff3.tag[NMTUtil::tag_to_index(mtTest)].commit);
-  EXPECT_EQ(0, diff3.tag[NMTUtil::tag_to_index(mtTest)].reserve);
+  EXPECT_EQ(-20, diff3.tag(mtTest).commit);
+  EXPECT_EQ(0, diff3.tag(mtTest).reserve);
 }
 
 // Exceedingly simple tracker for page-granular allocations
 // Use it for testing consistency with VMATree.
-  struct SimpleVMATracker : public CHeapObj<mtTest> {
+struct SimpleVMATracker : public CHeapObj<mtTest> {
   const size_t page_size = 4096;
   enum Kind { Reserved, Committed, Free };
   struct Info {
@@ -881,10 +882,9 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccountingReserveAsUncommit) {
     }
   }
 
-  VMATree::SummaryDiff do_it(Kind kind, size_t start, size_t size, NativeCallStack stack, MemTag mem_tag) {
+  void do_it(Kind kind, size_t start, size_t size, NativeCallStack stack, MemTag mem_tag, VMATree::SummaryDiff& diff) {
     assert(is_aligned(size, page_size) && is_aligned(start, page_size), "page alignment");
 
-    VMATree::SummaryDiff diff;
     const size_t page_count = size / page_size;
     const size_t start_idx = start / page_size;
     const size_t end_idx = start_idx + page_count;
@@ -896,34 +896,33 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccountingReserveAsUncommit) {
 
       // Register diff
       if (old_info.kind == Reserved) {
-        diff.tag[(int)old_info.mem_tag].reserve -= page_size;
+        diff.tag(old_info.mem_tag).reserve -= page_size;
       } else if (old_info.kind == Committed) {
-        diff.tag[(int)old_info.mem_tag].reserve -= page_size;
-        diff.tag[(int)old_info.mem_tag].commit -= page_size;
+        diff.tag(old_info.mem_tag).reserve -= page_size;
+        diff.tag(old_info.mem_tag).commit -= page_size;
       }
 
       if (kind == Reserved) {
-        diff.tag[(int)new_info.mem_tag].reserve += page_size;
+        diff.tag(new_info.mem_tag).reserve += page_size;
       } else if (kind == Committed) {
-        diff.tag[(int)new_info.mem_tag].reserve += page_size;
-        diff.tag[(int)new_info.mem_tag].commit += page_size;
+        diff.tag(new_info.mem_tag).reserve += page_size;
+        diff.tag(new_info.mem_tag).commit += page_size;
       }
       // Overwrite old one with new
       pages[i] = new_info;
     }
-    return diff;
   }
 
-  VMATree::SummaryDiff reserve(size_t start, size_t size, NativeCallStack stack, MemTag mem_tag) {
-    return do_it(Reserved, start, size, stack, mem_tag);
+  void reserve(size_t start, size_t size, NativeCallStack stack, MemTag mem_tag, VMATree::SummaryDiff& diff) {
+    return do_it(Reserved, start, size, stack, mem_tag, diff);
   }
 
-  VMATree::SummaryDiff commit(size_t start, size_t size, NativeCallStack stack, MemTag mem_tag) {
-    return do_it(Committed, start, size, stack, mem_tag);
+  void commit(size_t start, size_t size, NativeCallStack stack, MemTag mem_tag, VMATree::SummaryDiff& diff) {
+    return do_it(Committed, start, size, stack, mem_tag, diff);
   }
 
-  VMATree::SummaryDiff release(size_t start, size_t size) {
-    return do_it(Free, start, size, NativeCallStack(), mtNone);
+  void release(size_t start, size_t size, VMATree::SummaryDiff& diff) {
+    return do_it(Free, start, size, NativeCallStack(), mtNone, diff);
   }
 };
 
@@ -979,19 +978,19 @@ TEST_VM_F(NMTVMATreeTest, TestConsistencyWithSimpleTracker) {
     VMATree::SummaryDiff tree_diff;
     VMATree::SummaryDiff simple_diff;
     if (kind == SimpleVMATracker::Reserved) {
-      simple_diff = tr->reserve(start, size, stack, mem_tag);
+      tr->reserve(start, size, stack, mem_tag, simple_diff);
       tree.reserve_mapping(start, size, data, tree_diff);
     } else if (kind == SimpleVMATracker::Committed) {
-      simple_diff = tr->commit(start, size, stack, mem_tag);
+      tr->commit(start, size, stack, mem_tag, simple_diff);
       tree.commit_mapping(start, size, data, tree_diff);
     } else {
-      simple_diff = tr->release(start, size);
+      tr->release(start, size, simple_diff);
       tree.release_mapping(start, size, tree_diff);
     }
 
     for (int j = 0; j < mt_number_of_tags; j++) {
-      VMATree::SingleDiff td = tree_diff.tag[j];
-      VMATree::SingleDiff sd = simple_diff.tag[j];
+      VMATree::SingleDiff td = tree_diff.tag(j);
+      VMATree::SingleDiff sd = simple_diff.tag(j);
       ASSERT_EQ(td.reserve, sd.reserve);
       ASSERT_EQ(td.commit, sd.commit);
     }
@@ -1067,22 +1066,22 @@ TEST_VM_F(NMTVMATreeTest, SummaryAccountingWhenUseTagInplace) {
   //            1         2         3         4         5
   //  012345678901234567890123456789012345678901234567890
   //  CCCCCCCCCCCCCCCCCCCCCCCCCrrrrrrrrrrrrrrrrrrrrrrrrr
-  EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-  EXPECT_EQ(25, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+  EXPECT_EQ(0, diff.tag(mtTest).reserve);
+  EXPECT_EQ(25, diff.tag(mtTest).commit);
 
   tree.commit_mapping(30, 5, rd_None_cs1, diff, true);
   //            1         2         3         4         5
   //  012345678901234567890123456789012345678901234567890
   //  CCCCCCCCCCCCCCCCCCCCCCCCCrrrrrCCCCCrrrrrrrrrrrrrrr
-  EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-  EXPECT_EQ(5, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+  EXPECT_EQ(0, diff.tag(mtTest).reserve);
+  EXPECT_EQ(5, diff.tag(mtTest).commit);
 
   tree.uncommit_mapping(0, 25, rd_None_cs1, diff);
   //            1         2         3         4         5
   //  012345678901234567890123456789012345678901234567890
   //  rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrCCCCCrrrrrrrrrrrrrrr
-  EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
-  EXPECT_EQ(-25, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+  EXPECT_EQ(0, diff.tag(mtTest).reserve);
+  EXPECT_EQ(-25, diff.tag(mtTest).commit);
 }
 
 // How the memory regions are visualized:
@@ -1328,8 +1327,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows0To3) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCCCCCCC..........................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10);
     ExpectedTree<6> et = {{     5,     10,     12,     14,     16,     25        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , C     , C     , C     , C     , C     , Rl    },
@@ -1356,8 +1355,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows0To3) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCC...............................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 15);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 5);
+    EXPECT_EQ(diff.tag(mtTest).commit, 15);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 5);
     ExpectedTree<6> et = {{   5,      10,     12,     14,     16,      20        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , C     , C     , C     , C     , C     , Rl    },
@@ -1402,8 +1401,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows4to7) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrrrrrr..........CCCCCCCCCCCCCCCCCCCC...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 20);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 20);
     ExpectedTree<4> et = {{     0,     10,     20,     40        },
                           {mtNone, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , Rs    , Rl    , C     , Rl    },
@@ -1430,8 +1429,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows4to7) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....rrrrrCCCCCCCCCC...............................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 10);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 20 - 15);
+    EXPECT_EQ(diff.tag(mtTest).commit, 10);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 20 - 15);
     ExpectedTree<4> et = {{     5,     10,     15,     20        },
                           {mtNone, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , Rs    , C     , C     , Rl    },
@@ -1458,8 +1457,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows4to7) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrr..CCCCCCCCCCCCCCCCCCCC........................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10);
     ExpectedTree<8> et = {{     0,      5,      7,    10,      12,     14,     16,     27        },
                           {mtNone, mtTest, mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , Rs    , Rl    , C     , C     , C     , C     , C     , Rl    },
@@ -1486,8 +1485,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows4to7) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrr..CCCCCCCCCCCCC...............................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 13);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 3);
+    EXPECT_EQ(diff.tag(mtTest).commit, 13);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 3);
     ExpectedTree<8> et = {{     0,      5,      7,     10,     12,     14,     16,     20        },
                           {mtNone, mtTest, mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , Rs    , Rl    , C     , C     , C     , C     , C     , Rl    },
@@ -1539,8 +1538,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows8to11) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrrrrrrCCCCCCCCCCCCCCCCCCCC.....................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 20);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 20);
     ExpectedTree<3> et = {{     0,     10,     30        },
                           {mtNone, mtTest, mtTest, mtNone},
                           {Rl    , Rs    , C     , Rl    },
@@ -1567,8 +1566,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows8to11) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  CCCCCCCCCCCCCCCCCCCC...............................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10);
     ExpectedTree<3> et = {{     0,     10,     20        },
                           {mtNone, mtTest, mtTest, mtNone},
                           {Rl    , C     , C     , Rl    },
@@ -1595,8 +1594,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows8to11) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCCCCCCC..........................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 25 - 20);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 25 - 20);
     ExpectedTree<6> et = {{     5,     10,     12,     14,     16,     25        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , C     , C     , C     , C     , C     , Rl    },
@@ -1623,8 +1622,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows8to11) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCC...............................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 15);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 0);
+    EXPECT_EQ(diff.tag(mtTest).commit, 15);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 0);
     ExpectedTree<6> et = {{     5,     10,     12,     14,     16,     20        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , C     , C     , C     , C     , C     , Rl    },
@@ -1670,8 +1669,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows12to15) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCCCCCCC.....rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 20);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 20);
     ExpectedTree<4> et = {{     5,     25,     30,     40        },
                           {mtNone, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , C     , Rl    , Rs    , Rl    },
@@ -1698,8 +1697,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows12to15) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCCCCCCCrrrrr.....................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 30 - 25);
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 30 - 25);
     ExpectedTree<4> et = {{     5,     10,     25,     30        },
                           {mtNone, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , C     , C     , Rs    , Rl    },
@@ -1726,8 +1725,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows12to15) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCCCCCCC.....rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, (10 - 5) + ( 25 - 20));
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, (10 - 5) + ( 25 - 20));
     ExpectedTree<8> et = {{     5,     10,     12,     14,     16,     25,     30,     40        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , C     , C     , C     , C     , C     , Rl    , Rs    , Rl    },
@@ -1754,8 +1753,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows12to15) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  .....CCCCCCCCCCCCCCC..........rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 15);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10 - 5);
+    EXPECT_EQ(diff.tag(mtTest).commit, 15);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10 - 5);
     ExpectedTree<8> et = {{     5,     10,     12,     14,     16,     20,     30,     40        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , C     , C     , C     , C     , C     , Rl    , Rs    , Rl    },
@@ -1800,8 +1799,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows16to19) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrrrrrr.....CCCCCCCCCC.....rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 10);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10);
+    EXPECT_EQ(diff.tag(mtTest).commit, 10);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10);
     ExpectedTree<6> et = {{     0,     10,     15,     25,     30,     40        },
                           {mtNone, mtTest, mtNone, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , Rs    , Rl    , C     , Rl    , Rs    , Rl    },
@@ -1828,8 +1827,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows16to19) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrrrrrr.....CCCCCCCCCCrrrrr.....................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 10);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 20 - 15);
+    EXPECT_EQ(diff.tag(mtTest).commit, 10);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 20 - 15);
     ExpectedTree<6> et = {{     0,     10,     15,     20,     25,     30        },
                           {mtNone, mtTest, mtNone, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , Rs    , Rl    , C     , C     , Rs    , Rl    },
@@ -1856,8 +1855,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows16to19) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrr..CCCCCCCCCCCCCCCCCCCC...rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, (10 - 7) + (27 - 20));
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, (10 - 7) + (27 - 20));
     ExpectedTree<10> et = {{     0,      5,      7,     12,     14,     16,     20,     27,     30,     40        },
                            {mtNone, mtTest, mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone, mtTest, mtNone},
                            {Rl    , Rs    , Rl    , C     , C     , C     , C     , C     , Rl    , Rs    , Rl    },
@@ -1884,8 +1883,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows16to19) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrr..CCCCCCCCCCCCC..........rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 13);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10 - 7);
+    EXPECT_EQ(diff.tag(mtTest).commit, 13);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10 - 7);
     ExpectedTree<10> et = {{     0,      5,      7,     10,     12,     14,     16,     20,     30,     40        },
                            {mtNone, mtTest, mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone, mtTest, mtNone},
                            {Rl    , Rs    , Rl    , C     , C     , C     , C     , C     , Rl    , Rs    , Rl    },
@@ -1931,8 +1930,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows20to23) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrrrrrrCCCCCCCCCCCCCCC.....rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 15);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 15);
+    EXPECT_EQ(diff.tag(mtTest).commit, 15);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 15);
     ExpectedTree<5> et = {{     0,     10,     25,     30,     40        },
                           {mtNone, mtTest, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , Rs    , C     , Rl    , Rs    , Rl    },
@@ -1959,8 +1958,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows20to23) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrrrrrrCCCCCCCCCCCCCCCrrrrr.....................
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 15);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 20 - 10);
+    EXPECT_EQ(diff.tag(mtTest).commit, 15);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 20 - 10);
     ExpectedTree<5> et = {{     0,     10,     20,     25,     30        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtNone},
                           {Rl    , Rs    , C     , C     , Rs    , Rl    },
@@ -1987,8 +1986,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows20to23) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrCCCCCCCCCCCCCCCCCCCC.....rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 20);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, (10 - 5) + (25 - 20));
+    EXPECT_EQ(diff.tag(mtTest).commit, 20);
+    EXPECT_EQ(diff.tag(mtTest).reserve, (10 - 5) + (25 - 20));
     ExpectedTree<9> et = {{     0,      5,     12,     14,     16,     20,    25,      30,     40        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , Rs    , C     , C     , C     , C     , C     , Rl    , Rs    , Rl    },
@@ -2015,8 +2014,8 @@ TEST_VM_F(NMTVMATreeTest, OverlapTableRows20to23) {
     //            1         2         3         4         5
     //  012345678901234567890123456789012345678901234567890
     //  rrrrrCCCCCCCCCCCCCCC..........rrrrrrrrrr...........
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].commit, 15);
-    EXPECT_EQ(diff.tag[NMTUtil::tag_to_index(mtTest)].reserve, 10 - 5);
+    EXPECT_EQ(diff.tag(mtTest).commit, 15);
+    EXPECT_EQ(diff.tag(mtTest).reserve, 10 - 5);
     ExpectedTree<9> et = {{     0,      5,     10,     12,     14,     16,     20,     30,     40        },
                           {mtNone, mtTest, mtTest, mtTest, mtTest, mtTest, mtTest, mtNone, mtTest, mtNone},
                           {Rl    , Rs    , C     , C     , C     , C     , C     , Rl    , Rs    , Rl    },
@@ -2070,4 +2069,4 @@ TEST_VM_F(NMTVMATreeTest, UpdateRegionTest) {
   for (auto ci : call_info) {
     call_update_region(ci);
   }
-}
\ No newline at end of file
+}
diff --git a/test/hotspot/gtest/opto/test_rangeinference.cpp b/test/hotspot/gtest/opto/test_rangeinference.cpp
index 42767e9fcab..fd49050d022 100644
--- a/test/hotspot/gtest/opto/test_rangeinference.cpp
+++ b/test/hotspot/gtest/opto/test_rangeinference.cpp
@@ -216,13 +216,13 @@ TEST_VM(opto, canonicalize_constraints) {
 
 // Implementations of TypeIntMirror methods for testing purposes
 template <class S, class U>
-const TypeIntMirror<S, U>* TypeIntMirror<S, U>::operator->() const {
-  return this;
+TypeIntMirror<S, U> TypeIntMirror<S, U>::make(const TypeIntMirror<S, U>& t, int widen) {
+  return t;
 }
 
 template <class S, class U>
-TypeIntMirror<S, U> TypeIntMirror<S, U>::meet(const TypeIntMirror& o) const {
-  return TypeIntHelper::int_type_union(*this, o);
+const TypeIntMirror<S, U>* TypeIntMirror<S, U>::operator->() const {
+  return this;
 }
 
 template <class S, class U>
diff --git a/test/hotspot/gtest/runtime/test_atomic.cpp b/test/hotspot/gtest/runtime/test_atomic.cpp
index 753dde0ca57..80e67ef0bf9 100644
--- a/test/hotspot/gtest/runtime/test_atomic.cpp
+++ b/test/hotspot/gtest/runtime/test_atomic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,15 +22,100 @@
  *
  */
 
+#include "cppstdlib/new.hpp"
 #include "cppstdlib/type_traits.hpp"
 #include "metaprogramming/primitiveConversions.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/os.hpp"
 
 #include "unittest.hpp"
 
 // These tests of Atomic<T> only verify functionality.  They don't verify
 // atomicity.
 
+template<typename T>
+struct AtomicInitializationTestSupport {
+  struct Holder {
+    Atomic<T> _explicitly_initialized;
+    Atomic<T> _default_initialized;
+    Atomic<T> _value_initialized;
+
+    Holder()
+      : _explicitly_initialized(T()),
+        /* _default_initialized */
+        _value_initialized{}
+    {}
+  };
+
+  struct HolderNoConstructor {
+    Atomic<T> _default_initialized;
+  };
+
+  void test() {
+    T t = T();
+
+    {
+      Holder h;
+
+      EXPECT_EQ(t, h._explicitly_initialized.load_relaxed());
+      EXPECT_EQ(t, h._default_initialized.load_relaxed());
+      EXPECT_EQ(t, h._value_initialized.load_relaxed());
+    }
+
+    {
+      Holder h{};
+
+      EXPECT_EQ(t, h._explicitly_initialized.load_relaxed());
+      EXPECT_EQ(t, h._default_initialized.load_relaxed());
+      EXPECT_EQ(t, h._value_initialized.load_relaxed());
+    }
+
+    {
+      alignas(Holder) char mem[sizeof(Holder)];
+      memset(mem, 0xFF, sizeof(Holder));
+      Holder* h = new (mem) Holder();
+
+      EXPECT_EQ(t, h->_explicitly_initialized.load_relaxed());
+      EXPECT_EQ(t, h->_default_initialized.load_relaxed());
+      EXPECT_EQ(t, h->_value_initialized.load_relaxed());
+    }
+
+    // No-constructor variant
+
+    {
+      HolderNoConstructor h;
+
+      EXPECT_EQ(t, h._default_initialized.load_relaxed());
+    }
+
+    {
+      HolderNoConstructor h{};
+
+      EXPECT_EQ(t, h._default_initialized.load_relaxed());
+    }
+
+    {
+      alignas(HolderNoConstructor) char mem[sizeof(HolderNoConstructor)];
+      memset(mem, 0xFF, sizeof(HolderNoConstructor));
+      HolderNoConstructor* h = new (mem) HolderNoConstructor();
+
+      EXPECT_EQ(t, h->_default_initialized.load_relaxed());
+    }
+  }
+};
+
+TEST_VM(AtomicInitializationTest, byte) {
+  AtomicInitializationTestSupport<char>().test();
+}
+
+TEST_VM(AtomicInitializationTest, integer) {
+  AtomicInitializationTestSupport<int32_t>().test();
+}
+
+TEST_VM(AtomicInitializationTest, pointer) {
+  AtomicInitializationTestSupport<void*>().test();
+}
+
 template<typename T>
 struct AtomicIntegerArithmeticTestSupport {
   Atomic<T> _test_value;
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index 5b78a66a3ae..8cf62fb9ea5 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,15 +45,14 @@ public:
       VirtualMemoryTracker::Instance::snapshot_thread_stacks();
     }
 
-    ReservedMemoryRegion rmr_found;
+    VirtualMemoryRegion rgn_found;
     {
       MemTracker::NmtVirtualMemoryLocker vml;
-      rmr_found = VirtualMemoryTracker::Instance::tree()->find_reserved_region(stack_end);
+      rgn_found = VirtualMemoryTracker::Instance::tree()->find_reserved_region(stack_end);
     }
 
-    ASSERT_TRUE(rmr_found.is_valid());
-    ASSERT_EQ(rmr_found.base(), stack_end);
-
+    ASSERT_TRUE(rgn_found.is_valid());
+    ASSERT_EQ(rgn_found.base(), stack_end);
 
     int i = 0;
     address i_addr = (address)&i;
@@ -64,12 +63,12 @@ public:
     bool found_stack_top = false;
     {
       MemTracker::NmtVirtualMemoryLocker vml;
-      VirtualMemoryTracker::Instance::tree()->visit_committed_regions(rmr_found, [&](const CommittedMemoryRegion& cmr) {
-        if (cmr.base() + cmr.size() == stack_top) {
-          EXPECT_TRUE(cmr.size() <= stack_size);
+      VirtualMemoryTracker::Instance::tree()->visit_committed_regions(rgn_found, [&](const VirtualMemoryRegion& rgn) {
+        if (rgn.base() + rgn.size() == stack_top) {
+          EXPECT_TRUE(rgn.size() <= stack_size);
           found_stack_top = true;
         }
-        if (i_addr < stack_top && i_addr >= cmr.base()) {
+        if (i_addr < stack_top && i_addr >= rgn.base()) {
           found_i_addr = true;
         }
         i++;
@@ -115,25 +114,25 @@ public:
     }
 
     // trigger the test
-    ReservedMemoryRegion rmr_found;
+    VirtualMemoryRegion rgn_found;
     {
       MemTracker::NmtVirtualMemoryLocker nvml;
       VirtualMemoryTracker::Instance::snapshot_thread_stacks();
-      rmr_found = VirtualMemoryTracker::Instance::tree()->find_reserved_region((address)base);
+      rgn_found = VirtualMemoryTracker::Instance::tree()->find_reserved_region((address)base);
     }
-    ASSERT_TRUE(rmr_found.is_valid());
-    ASSERT_EQ(rmr_found.base(), (address)base);
+    ASSERT_TRUE(rgn_found.is_valid());
+    ASSERT_EQ(rgn_found.base(), (address)base);
 
 
     bool precise_tracking_supported = false;
     {
       MemTracker::NmtVirtualMemoryLocker nvml;
-      VirtualMemoryTracker::Instance::tree()->visit_committed_regions(rmr_found, [&](const CommittedMemoryRegion& cmr){
-        if (cmr.size() == size) {
+      VirtualMemoryTracker::Instance::tree()->visit_committed_regions(rgn_found, [&](const VirtualMemoryRegion& rgn){
+        if (rgn.size() == size) {
           return false;
         } else {
           precise_tracking_supported = true;
-          check_covered_pages(cmr.base(), cmr.size(), (address)base, touch_pages, page_num);
+          check_covered_pages(rgn.base(), rgn.size(), (address)base, touch_pages, page_num);
         }
         return true;
       });
@@ -151,9 +150,9 @@ public:
     {
       MemTracker::NmtVirtualMemoryLocker nvml;
       VirtualMemoryTracker::Instance::remove_released_region((address)base, size);
-      rmr_found = VirtualMemoryTracker::Instance::tree()->find_reserved_region((address)base);
+      rgn_found = VirtualMemoryTracker::Instance::tree()->find_reserved_region((address)base);
     }
-    ASSERT_TRUE(!rmr_found.is_valid());
+    ASSERT_TRUE(!rgn_found.is_valid());
   }
 
   static void test_committed_region() {
diff --git a/test/hotspot/gtest/runtime/test_globals.cpp b/test/hotspot/gtest/runtime/test_globals.cpp
index 84a62732056..9ef5bd6a5af 100644
--- a/test/hotspot/gtest/runtime/test_globals.cpp
+++ b/test/hotspot/gtest/runtime/test_globals.cpp
@@ -58,7 +58,7 @@ TEST_VM(FlagGuard, size_t_flag) {
 }
 
 TEST_VM(FlagGuard, uint64_t_flag) {
-  TEST_FLAG(MaxRAM, uint64_t, 1337);
+  TEST_FLAG(ErrorLogTimeout, uint64_t, 1337);
 }
 
 TEST_VM(FlagGuard, double_flag) {
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index aee7b51e2b3..094f16a4262 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -506,16 +506,16 @@ static inline bool can_reserve_executable_memory(void) {
 #define PRINT_MAPPINGS(s) { tty->print_cr("%s", s); os::print_memory_mappings((char*)p, total_range_len, tty); tty->cr(); }
 //#define PRINT_MAPPINGS
 
+#ifndef _AIX
 // Release a range allocated with reserve_multiple carefully, to not trip mapping
 // asserts on Windows in os::release_memory()
 static void carefully_release_multiple(address start, int num_stripes, size_t stripe_len) {
   for (int stripe = 0; stripe < num_stripes; stripe++) {
     address q = start + (stripe * stripe_len);
-    EXPECT_TRUE(os::release_memory((char*)q, stripe_len));
+    os::release_memory((char*)q, stripe_len);
   }
 }
 
-#ifndef _AIX // JDK-8257041
 // Reserve an area consisting of multiple mappings
 //  (from multiple calls to os::reserve_memory)
 static address reserve_multiple(int num_stripes, size_t stripe_len) {
@@ -534,7 +534,7 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
     p = (address)os::reserve_memory(total_range_len, mtTest);
     EXPECT_NE(p, (address)nullptr);
     // .. release it...
-    EXPECT_TRUE(os::release_memory((char*)p, total_range_len));
+    os::release_memory((char*)p, total_range_len);
     // ... re-reserve in the same spot multiple areas...
     for (int stripe = 0; stripe < num_stripes; stripe++) {
       address q = p + (stripe * stripe_len);
@@ -627,7 +627,7 @@ TEST_VM(os, release_multi_mappings) {
     // On Windows, temporarily switch on UseNUMAInterleaving to allow release_memory to release
     //  multiple mappings in one go (otherwise we assert, which we test too, see death test below).
     WINDOWS_ONLY(NUMASwitcher b(true);)
-    ASSERT_TRUE(os::release_memory((char*)p_middle_stripes, middle_stripe_len));
+    os::release_memory((char*)p_middle_stripes, middle_stripe_len);
   }
   PRINT_MAPPINGS("B");
 
@@ -641,7 +641,7 @@ TEST_VM(os, release_multi_mappings) {
   // Clean up. Release all mappings.
   {
     WINDOWS_ONLY(NUMASwitcher b(true);) // allow release_memory to release multiple regions
-    ASSERT_TRUE(os::release_memory((char*)p, total_range_len));
+    os::release_memory((char*)p, total_range_len);
   }
 }
 #endif // !AIX
@@ -650,29 +650,54 @@ TEST_VM(os, release_multi_mappings) {
 // On Windows, test that we recognize bad ranges.
 //  On debug this would assert. Test that too.
 //  On other platforms, we are unable to recognize bad ranges.
-#ifdef ASSERT
-TEST_VM_ASSERT_MSG(os, release_bad_ranges, ".*bad release") {
-#else
-TEST_VM(os, release_bad_ranges) {
-#endif
-  char* p = os::reserve_memory(4 * M, mtTest);
-  ASSERT_NE(p, (char*)nullptr);
-  // Release part of range
-  ASSERT_FALSE(os::release_memory(p, M));
-  // Release part of range
-  ASSERT_FALSE(os::release_memory(p + M, M));
-  // Release more than the range (explicitly switch off NUMA here
-  //  to make os::release_memory() test more strictly and to not
-  //  accidentally release neighbors)
-  {
-    NUMASwitcher b(false);
-    ASSERT_FALSE(os::release_memory(p, M * 5));
-    ASSERT_FALSE(os::release_memory(p - M, M * 5));
-    ASSERT_FALSE(os::release_memory(p - M, M * 6));
-  }
 
-  ASSERT_TRUE(os::release_memory(p, 4 * M)); // Release for real
-  ASSERT_FALSE(os::release_memory(p, 4 * M)); // Again, should fail
+#ifdef ASSERT
+#define TEST_RELEASE_RANGE_ERROR(name) TEST_VM_ASSERT_MSG(os, name, ".*bad release")
+#else
+#define TEST_RELEASE_RANGE_ERROR(name) TEST_VM_FATAL_ERROR_MSG(os, name, ".*Failed to release.*")
+#endif
+
+static char* setup_release_test_memory() {
+  char* p = os::reserve_memory(4 * M, mtTest);
+  EXPECT_NE(p, (char*)nullptr);
+  return p;
+}
+
+TEST_RELEASE_RANGE_ERROR(release_bad_range_start) {
+  char* p = setup_release_test_memory();
+  os::release_memory(p, M);  // Release part of the range
+}
+
+TEST_RELEASE_RANGE_ERROR(release_bad_range_middle) {
+  char* p = setup_release_test_memory();
+  os::release_memory(p + M, M);  // Release middle part
+}
+
+// Release more than the range (explicitly switch off NUMA here
+//  to make os::release_memory() test more strict and to not
+//  accidentally release neighbors)
+TEST_RELEASE_RANGE_ERROR(release_beyond_range1) {
+  char* p = setup_release_test_memory();
+  NUMASwitcher b(false);
+  os::release_memory(p, M * 5);
+}
+
+TEST_RELEASE_RANGE_ERROR(release_beyond_range2) {
+  char* p = setup_release_test_memory();
+  NUMASwitcher b(false);
+  os::release_memory(p - M, M * 5);
+}
+
+TEST_RELEASE_RANGE_ERROR(release_beyond_range3) {
+  char* p = setup_release_test_memory();
+  NUMASwitcher b(false);
+  os::release_memory(p - M, M * 6);
+}
+
+TEST_RELEASE_RANGE_ERROR(release_already_released) {
+  char* p = setup_release_test_memory();
+  os::release_memory(p, 4 * M); // Release for real
+  os::release_memory(p, 4 * M); // Again, should fail
 }
 #endif // _WIN32
 
@@ -695,11 +720,11 @@ TEST_VM(os, release_one_mapping_multi_commits) {
 
   ASSERT_TRUE(p2 == nullptr || p2 == border);
 
-  ASSERT_TRUE(os::release_memory((char*)p, total_range_len));
+  os::release_memory((char*)p, total_range_len);
   PRINT_MAPPINGS("C");
 
   if (p2 != nullptr) {
-    ASSERT_TRUE(os::release_memory((char*)p2, stripe_len));
+    os::release_memory((char*)p2, stripe_len);
     PRINT_MAPPINGS("D");
   }
 }
@@ -772,7 +797,7 @@ TEST_VM(os, find_mapping_simple) {
     if (os::win32::find_mapping(p + total_range_len, &mapping_info)) {
       ASSERT_NE(mapping_info.base, p);
     }
-    ASSERT_TRUE(os::release_memory((char*)p, total_range_len));
+    os::release_memory((char*)p, total_range_len);
     PRINT_MAPPINGS("B");
     ASSERT_FALSE(os::win32::find_mapping(p, &mapping_info));
   }
@@ -801,7 +826,7 @@ TEST_VM(os, find_mapping_2) {
   if (os::win32::find_mapping(p + total_range_len, &mapping_info)) {
     ASSERT_NE(mapping_info.base, p);
   }
-  ASSERT_TRUE(os::release_memory((char*)p, total_range_len));
+  os::release_memory((char*)p, total_range_len);
   PRINT_MAPPINGS("B");
   ASSERT_FALSE(os::win32::find_mapping(p, &mapping_info));
 }
@@ -1132,11 +1157,11 @@ TEST_VM(os, commit_memory_or_exit) {
   ASSERT_NOT_NULL(base);
   os::commit_memory_or_exit(base, size, false, "Commit failed.");
   strcpy(base, letters);
-  ASSERT_TRUE(os::uncommit_memory(base, size, false));
+  os::uncommit_memory(base, size, false);
   os::commit_memory_or_exit(base, size, page_sz, false, "Commit with alignment hint failed.");
   strcpy(base, letters);
-  ASSERT_TRUE(os::uncommit_memory(base, size, false));
-  EXPECT_TRUE(os::release_memory(base, size));
+  os::uncommit_memory(base, size, false);
+  os::release_memory(base, size);
 }
 
 #if !defined(_AIX)
@@ -1152,7 +1177,7 @@ TEST_VM(os, map_memory_to_file) {
   char* result = os::map_memory_to_file(size, fd, mtTest);
   ASSERT_NOT_NULL(result);
   EXPECT_EQ(strcmp(letters, result), 0);
-  EXPECT_TRUE(os::unmap_memory(result, size));
+  os::unmap_memory(result, size);
   ::close(fd);
 }
 
@@ -1169,7 +1194,7 @@ TEST_VM(os, map_unmap_memory) {
   char* result = os::map_memory(fd, path, 0, nullptr, size, mtTest, true, false);
   ASSERT_NOT_NULL(result);
   EXPECT_EQ(strcmp(letters, result), 0);
-  EXPECT_TRUE(os::unmap_memory(result, size));
+  os::unmap_memory(result, size);
   ::close(fd);
 }
 
@@ -1184,7 +1209,7 @@ TEST_VM(os, map_memory_to_file_aligned) {
   char* result = os::map_memory_to_file_aligned(os::vm_allocation_granularity(), os::vm_allocation_granularity(), fd, mtTest);
   ASSERT_NOT_NULL(result);
   EXPECT_EQ(strcmp(letters, result), 0);
-  EXPECT_TRUE(os::unmap_memory(result, os::vm_allocation_granularity()));
+  os::unmap_memory(result, os::vm_allocation_granularity());
   ::close(fd);
 }
 
diff --git a/test/hotspot/gtest/runtime/test_os_linux.cpp b/test/hotspot/gtest/runtime/test_os_linux.cpp
index c8467784b0a..9c624267c18 100644
--- a/test/hotspot/gtest/runtime/test_os_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_os_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ namespace {
     HugeTlbfsMemory(char* const ptr, size_t size) : _ptr(ptr), _size(size) { }
     ~HugeTlbfsMemory() {
       if (_ptr != nullptr) {
-        os::release_memory_special(_ptr, _size);
+        os::release_memory(_ptr, _size);
       }
     }
   };
@@ -227,7 +227,7 @@ class TestReserveMemorySpecial : AllStatic {
     char* addr = os::reserve_memory_special(size, alignment, page_size, nullptr, false);
     if (addr != nullptr) {
       small_page_write(addr, size);
-      os::release_memory_special(addr, size);
+      os::release_memory(addr, size);
     }
   }
 
@@ -285,7 +285,7 @@ class TestReserveMemorySpecial : AllStatic {
         if (p != nullptr) {
           EXPECT_TRUE(is_aligned(p, alignment));
           small_page_write(p, size);
-          os::release_memory_special(p, size);
+          os::release_memory(p, size);
         }
       }
     }
@@ -300,7 +300,7 @@ class TestReserveMemorySpecial : AllStatic {
         if (p != nullptr) {
           EXPECT_EQ(p, req_addr);
           small_page_write(p, size);
-          os::release_memory_special(p, size);
+          os::release_memory(p, size);
         }
       }
     }
@@ -379,8 +379,8 @@ TEST_VM(os_linux, pretouch_thp_and_use_concurrent) {
   for (int i = 0; i < 1000; i++)
     EXPECT_EQ(*iptr++, i);
 
-  EXPECT_TRUE(os::uncommit_memory(heap, size, false));
-  EXPECT_TRUE(os::release_memory(heap, size));
+  os::uncommit_memory(heap, size, false);
+  os::release_memory(heap, size);
   UseTransparentHugePages = useThp;
 }
 
diff --git a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
index 8e68be22749..7c256c7c3db 100644
--- a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
+++ b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
@@ -335,6 +335,8 @@ TEST_VM(os, attempt_reserve_memory_randomization_cornercases) {
 
 // Test that, regardless where the hole is in the [min, max) range, if we probe nonrandomly, we will fill that hole
 // as long as the range size is smaller than the number of probe attempts
+// On AIX, the allocation granularity is too large and not well suited for 'small' holes, so we avoid the test
+#if !defined(_AIX)
 TEST_VM(os, attempt_reserve_memory_between_small_range_fill_hole) {
   const size_t ps = os::vm_page_size();
   const size_t ag = allocation_granularity();
@@ -348,3 +350,4 @@ TEST_VM(os, attempt_reserve_memory_between_small_range_fill_hole) {
     }
   }
 }
+#endif
diff --git a/test/hotspot/gtest/runtime/test_os_windows.cpp b/test/hotspot/gtest/runtime/test_os_windows.cpp
index 2d9a7e00b39..13574dcbdb3 100644
--- a/test/hotspot/gtest/runtime/test_os_windows.cpp
+++ b/test/hotspot/gtest/runtime/test_os_windows.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ namespace {
     MemoryReleaser(char* ptr, size_t size) : _ptr(ptr), _size(size) { }
     ~MemoryReleaser() {
       if (_ptr != nullptr) {
-        os::release_memory_special(_ptr, _size);
+        os::release_memory(_ptr, _size);
       }
     }
   };
diff --git a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
index 4242302997a..a7e4b273788 100644
--- a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
+++ b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,41 +50,41 @@ namespace {
   };
 }
 
-#define check(vmt, rmr, regions) check_inner((vmt), (rmr), (regions), ARRAY_SIZE(regions), __FILE__, __LINE__)
+#define check(vmt, rgn, regions) check_inner((vmt), (rgn), (regions), ARRAY_SIZE(regions), __FILE__, __LINE__)
 
-#define check_empty(vmt, rmr)                              \
+#define check_empty(vmt, rgn)                              \
   do {                                                \
-    check_inner((vmt), (rmr), nullptr, 0, __FILE__, __LINE__);  \
+    check_inner((vmt), (rgn), nullptr, 0, __FILE__, __LINE__);  \
   } while (false)
 
-static void diagnostic_print(VirtualMemoryTracker& vmt, const ReservedMemoryRegion& rmr) {
-  LOG("In reserved region " PTR_FORMAT ", size %X:", p2i(rmr.base()), rmr.size());
-  vmt.tree()->visit_committed_regions(rmr, [&](CommittedMemoryRegion& region) {
-    LOG("   committed region: " PTR_FORMAT ", size %X", p2i(region.base()), region.size());
+static void diagnostic_print(VirtualMemoryTracker& vmt, const VirtualMemoryRegion& rgn) {
+  LOG("In reserved region " PTR_FORMAT ", size %X:", p2i(rgn.base()), rgn.size());
+  vmt.tree()->visit_committed_regions(rgn, [&](VirtualMemoryRegion& crgn) {
+    LOG("   committed region: " PTR_FORMAT ", size %X", p2i(crgn.base()), crgn.size());
     return true;
   });
 }
 
-static void check_inner(VirtualMemoryTracker& vmt, const ReservedMemoryRegion& rmr, R* regions, size_t regions_size, const char* file, int line) {
+static void check_inner(VirtualMemoryTracker& vmt, const VirtualMemoryRegion& rgn, R* regions, size_t regions_size, const char* file, int line) {
   size_t i = 0;
   size_t size = 0;
 
   // Helpful log
-  diagnostic_print(vmt, rmr);
+  diagnostic_print(vmt, rgn);
 
 #define WHERE " from " << file << ":" << line
 
-  vmt.tree()->visit_committed_regions(rmr, [&](CommittedMemoryRegion& region) {
+  vmt.tree()->visit_committed_regions(rgn, [&](VirtualMemoryRegion& crgn) {
     EXPECT_LT(i, regions_size) << WHERE;
-    EXPECT_EQ(region.base(), regions[i]._addr) << WHERE;
-    EXPECT_EQ(region.size(), regions[i]._size) << WHERE;
-    size += region.size();
+    EXPECT_EQ(crgn.base(), regions[i]._addr) << WHERE;
+    EXPECT_EQ(crgn.size(), regions[i]._size) << WHERE;
+    size += crgn.size();
     i++;
     return true;
   });
 
   EXPECT_EQ(i, regions_size) << WHERE;
-  EXPECT_EQ(size, vmt.committed_size(&rmr)) << WHERE;
+  EXPECT_EQ(size, vmt.committed_size(&rgn)) << WHERE;
 }
 
 class VirtualMemoryTrackerTest {
@@ -104,11 +104,11 @@ public:
     NativeCallStack stack(&frame1, 1);
     NativeCallStack stack2(&frame2, 1);
 
-    // Fetch the added RMR for the space
-    ReservedMemoryRegion rmr = rtree->find_reserved_region(addr);
+    // Fetch the added region for the space
+    VirtualMemoryRegion rgn = rtree->find_reserved_region(addr);
 
-    ASSERT_EQ(rmr.size(), size);
-    ASSERT_EQ(rmr.base(), addr);
+    ASSERT_EQ(rgn.size(), size);
+    ASSERT_EQ(rgn.base(), addr);
 
     // Commit Size Granularity
     const size_t cs = 0x1000;
@@ -118,24 +118,24 @@ public:
     { // Commit one region
       rtree->commit_region(addr + cs, cs, stack, diff);
       R r[] = { {addr + cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit adjacent - lower address
       rtree->commit_region(addr, cs, stack, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit adjacent - higher address
       rtree->commit_region(addr + 2 * cs, cs, stack, diff);
       R r[] = { {addr, 3 * cs} };
-      check(vmt,rmr, r);
+      check(vmt, rgn, r);
     }
 
     // Cleanup
     rtree->uncommit_region(addr, 3 * cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 0u);
+    ASSERT_EQ(vmt.committed_size(&rgn), 0u);
 
 
     // Commit adjacent regions with different stacks
@@ -143,14 +143,14 @@ public:
     { // Commit one region
       rtree->commit_region(addr + cs, cs, stack, diff);
       R r[] = { {addr + cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit adjacent - lower address
       rtree->commit_region(addr, cs, stack2, diff);
       R r[] = { {addr,      cs},
                 {addr + cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit adjacent - higher address
@@ -158,12 +158,12 @@ public:
       R r[] = { {addr,          cs},
                 {addr +     cs, cs},
                 {addr + 2 * cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     // Cleanup
     rtree->uncommit_region(addr, 3 * cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 0u);
+    ASSERT_EQ(vmt.committed_size(&rgn), 0u);
   }
 
   static void test_add_committed_region_adjacent_overlapping() {
@@ -180,11 +180,11 @@ public:
     NativeCallStack stack(&frame1, 1);
     NativeCallStack stack2(&frame2, 1);
 
-    // Fetch the added RMR for the space
-    ReservedMemoryRegion rmr = rtree->find_reserved_region(addr);
+    // Fetch the added region for the space
+    VirtualMemoryRegion rgn = rtree->find_reserved_region(addr);
 
-    ASSERT_EQ(rmr.size(), size);
-    ASSERT_EQ(rmr.base(), addr);
+    ASSERT_EQ(rgn.size(), size);
+    ASSERT_EQ(rgn.base(), addr);
 
     // Commit Size Granularity
     const size_t cs = 0x1000;
@@ -196,28 +196,28 @@ public:
       rtree->commit_region(addr + 3 * cs, 2 * cs, stack, diff);
       R r[] = { {addr,          2 * cs},
                 {addr + 3 * cs, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit adjacent and overlapping
       rtree->commit_region(addr + 2 * cs, 2 * cs, stack, diff);
       R r[] = { {addr, 5 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     // revert to two non-adjacent regions
     rtree->uncommit_region(addr + 2 * cs, cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 4 * cs);
+    ASSERT_EQ(vmt.committed_size(&rgn), 4 * cs);
 
     { // Commit overlapping and adjacent
       rtree->commit_region(addr + cs, 2 * cs, stack, diff);
       R r[] = { {addr, 5 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     // Cleanup
     rtree->uncommit_region(addr, 5 * cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 0u);
+    ASSERT_EQ(vmt.committed_size(&rgn), 0u);
 
 
     // Commit adjacent and overlapping regions with different stacks
@@ -227,7 +227,7 @@ public:
       rtree->commit_region(addr + 3 * cs, 2 * cs, stack, diff);
       R r[] = { {addr,          2 * cs},
                 {addr + 3 * cs, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit adjacent and overlapping
@@ -235,20 +235,20 @@ public:
       R r[] = { {addr,          2 * cs},
                 {addr + 2 * cs, 2 * cs},
                 {addr + 4 * cs,     cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     // revert to two non-adjacent regions
     rtree->commit_region(addr, 5 * cs, stack, diff);
     rtree->uncommit_region(addr + 2 * cs, cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 4 * cs);
+    ASSERT_EQ(vmt.committed_size(&rgn), 4 * cs);
 
     { // Commit overlapping and adjacent
       rtree->commit_region(addr + cs, 2 * cs, stack2, diff);
       R r[] = { {addr,              cs},
                 {addr +     cs, 2 * cs},
                 {addr + 3 * cs, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     rtree->tree().remove_all();
@@ -269,12 +269,12 @@ public:
     NativeCallStack stack(&frame1, 1);
     NativeCallStack stack2(&frame2, 1);
 
-    // Fetch the added RMR for the space
-    ReservedMemoryRegion rmr = rtree->find_reserved_region(addr);
+    // Fetch the added region for the space
+    VirtualMemoryRegion rgn = rtree->find_reserved_region(addr);
 
 
-    ASSERT_EQ(rmr.size(), size);
-    ASSERT_EQ(rmr.base(), addr);
+    ASSERT_EQ(rgn.size(), size);
+    ASSERT_EQ(rgn.base(), addr);
 
     // Commit Size Granularity
     const size_t cs = 0x1000;
@@ -284,54 +284,54 @@ public:
     { // Commit one region
       rtree->commit_region(addr, cs, stack, diff);
       R r[] = { {addr, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit the same region
       rtree->commit_region(addr, cs, stack, diff);
       R r[] = { {addr, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit a succeeding region
       rtree->commit_region(addr + cs, cs, stack, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit  over two regions
       rtree->commit_region(addr, 2 * cs, stack, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     {// Commit first part of a region
       rtree->commit_region(addr, cs, stack, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit second part of a region
       rtree->commit_region(addr + cs, cs, stack, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit a third part
       rtree->commit_region(addr + 2 * cs, cs, stack, diff);
       R r[] = { {addr, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit in the middle of a region
       rtree->commit_region(addr + 1 * cs, cs, stack, diff);
       R r[] = { {addr, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     // Cleanup
     rtree->uncommit_region(addr, 3 * cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 0u);
+    ASSERT_EQ(vmt.committed_size(&rgn), 0u);
 
     // With preceding region
 
@@ -342,71 +342,71 @@ public:
     {
       R r[] = { {addr,              cs},
                 {addr + 2 * cs, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     rtree->commit_region(addr + 3 * cs,     cs, stack, diff);
     {
       R r[] = { {addr,              cs},
                 {addr + 2 * cs, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     rtree->commit_region(addr + 4 * cs,     cs, stack, diff);
     {
       R r[] = { {addr,              cs},
                 {addr + 2 * cs, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     // Cleanup
     rtree->uncommit_region(addr, 5 * cs, diff);
-    ASSERT_EQ(vmt.committed_size(&rmr), 0u);
+    ASSERT_EQ(vmt.committed_size(&rgn), 0u);
 
     // With different stacks
 
     { // Commit one region
       rtree->commit_region(addr, cs, stack, diff);
       R r[] = { {addr, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit the same region
       rtree->commit_region(addr, cs, stack2, diff);
       R r[] = { {addr, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit a succeeding region
       rtree->commit_region(addr + cs, cs, stack, diff);
       R r[] = { {addr,      cs},
                 {addr + cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit  over two regions
       rtree->commit_region(addr, 2 * cs, stack, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     {// Commit first part of a region
       rtree->commit_region(addr, cs, stack2, diff);
       R r[] = { {addr,      cs},
                 {addr + cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit second part of a region
       rtree->commit_region(addr + cs, cs, stack2, diff);
       R r[] = { {addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit a third part
       rtree->commit_region(addr + 2 * cs, cs, stack2, diff);
       R r[] = { {addr, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     { // Commit in the middle of a region
@@ -414,7 +414,7 @@ public:
       R r[] = { {addr,          cs},
                 {addr +     cs, cs},
                 {addr + 2 * cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
     }
 
     rtree->tree().remove_all();
@@ -445,11 +445,11 @@ public:
     NativeCallStack stack(&frame1, 1);
     NativeCallStack stack2(&frame2, 1);
 
-    // Fetch the added RMR for the space
-    ReservedMemoryRegion rmr = rtree->find_reserved_region(addr);
+    // Fetch the added region for the space
+    VirtualMemoryRegion rgn = rtree->find_reserved_region(addr);
 
-    ASSERT_EQ(rmr.size(), size);
-    ASSERT_EQ(rmr.base(), addr);
+    ASSERT_EQ(rgn.size(), size);
+    ASSERT_EQ(rgn.base(), addr);
 
     // Commit Size Granularity
     const size_t cs = 0x1000;
@@ -457,11 +457,11 @@ public:
     { // Commit regions
       rtree->commit_region(addr, 3 * cs, stack, diff);
       R r[] = { {addr, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
 
       // Remove only existing
       rtree->uncommit_region(addr, 3 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     {
@@ -473,7 +473,7 @@ public:
         rtree->uncommit_region(addr, cs, diff);
         R r[] = { {addr + 2 * cs, cs},
                   {addr + 4 * cs, cs} };
-        check(vmt, rmr, r);
+        check(vmt, rgn, r);
       }
 
       // add back
@@ -483,7 +483,7 @@ public:
         rtree->uncommit_region(addr + 2 * cs, cs, diff);
         R r[] = { {addr + 0 * cs, cs},
                   {addr + 4 * cs, cs} };
-        check(vmt, rmr, r);
+        check(vmt, rgn, r);
       }
 
       // add back
@@ -493,17 +493,17 @@ public:
         rtree->uncommit_region(addr + 4 * cs, cs, diff);
         R r[] = { {addr + 0 * cs, cs},
                   {addr + 2 * cs, cs} };
-        check(vmt, rmr, r);
+        check(vmt, rgn, r);
       }
 
       rtree->uncommit_region(addr, 5 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     { // Remove larger region
       rtree->commit_region(addr + 1 * cs, cs, stack, diff);
       rtree->uncommit_region(addr, 3 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     { // Remove smaller region - in the middle
@@ -511,50 +511,50 @@ public:
       rtree->uncommit_region(addr + 1 * cs, cs, diff);
       R r[] = { { addr + 0 * cs, cs},
                 { addr + 2 * cs, cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
 
       rtree->uncommit_region(addr, 3 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     { // Remove smaller region - at the beginning
       rtree->commit_region(addr, 3 * cs, stack, diff);
       rtree->uncommit_region(addr + 0 * cs, cs, diff);
       R r[] = { { addr + 1 * cs, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
 
       rtree->uncommit_region(addr, 3 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     { // Remove smaller region - at the end
       rtree->commit_region(addr, 3 * cs, stack, diff);
       rtree->uncommit_region(addr + 2 * cs, cs, diff);
       R r[] = { { addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
 
       rtree->uncommit_region(addr, 3 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     { // Remove smaller, overlapping region - at the beginning
       rtree->commit_region(addr + 1 * cs, 4 * cs, stack, diff);
       rtree->uncommit_region(addr, 2 * cs, diff);
       R r[] = { { addr + 2 * cs, 3 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
 
       rtree->uncommit_region(addr + 1 * cs, 4 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     { // Remove smaller, overlapping region - at the end
       rtree->commit_region(addr, 3 * cs, stack, diff);
       rtree->uncommit_region(addr + 2 * cs, 2 * cs, diff);
       R r[] = { { addr, 2 * cs} };
-      check(vmt, rmr, r);
+      check(vmt, rgn, r);
 
       rtree->uncommit_region(addr, 3 * cs, diff);
-      check_empty(vmt, rmr);
+      check_empty(vmt, rgn);
     }
 
     rtree->tree().remove_all();
diff --git a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
index f24d74ea529..6636efbba8e 100644
--- a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
+++ b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp
@@ -321,3 +321,38 @@ TEST(globalDefinitions, jlong_from) {
   val = jlong_from(0xABCD, 0xEFEF);
   EXPECT_EQ(val, CONST64(0x0000ABCD0000EFEF));
 }
+
+struct NoCopy {
+  int x;
+  NONCOPYABLE(NoCopy);
+};
+
+TEST(globalDefinitions, sizeof_auto) {
+  char x = 5;
+  char& y = x;
+  char* z = &x;
+  EXPECT_EQ(sizeof_auto(x), sizeof(x));
+  EXPECT_EQ(sizeof_auto(y), sizeof(y));
+  EXPECT_EQ(sizeof_auto(z), sizeof(z));
+
+  NoCopy nc{0};
+  sizeof_auto(nc);
+
+  static_assert(sizeof_auto(char[1LL])  == 1);
+  static_assert(sizeof_auto(char[std::numeric_limits<uint8_t>::max()  + 1LL]) == std::numeric_limits<uint8_t>::max()  + 1LL);
+  static_assert(sizeof_auto(char[std::numeric_limits<uint16_t>::max() + 1LL]) == std::numeric_limits<uint16_t>::max() + 1LL);
+#if defined(_LP64) && !defined(_WINDOWS)
+  // char array sometimes limited to 2 gig length on 32 bit platforms (signed), disabled for Windows because of compiler error C2148.
+  static_assert(sizeof_auto(char[std::numeric_limits<uint32_t>::max() + 1LL]) == std::numeric_limits<uint32_t>::max() + 1LL);
+#endif
+
+  static_assert(sizeof(sizeof_auto(char[std::numeric_limits<uint8_t>::max()]))        == sizeof(uint8_t));
+  static_assert(sizeof(sizeof_auto(char[std::numeric_limits<uint8_t>::max() + 1LL]))  == sizeof(uint16_t));
+  static_assert(sizeof(sizeof_auto(char[std::numeric_limits<uint16_t>::max()]))       == sizeof(uint16_t));
+  static_assert(sizeof(sizeof_auto(char[std::numeric_limits<uint16_t>::max() + 1LL])) == sizeof(uint32_t));
+#if defined(_LP64) && !defined(_WINDOWS)
+  // char array sometimes limited to 2 gig length on 32 bit platforms (signed), disabled for Windows because of compiler error C2148.
+  static_assert(sizeof(sizeof_auto(char[std::numeric_limits<uint32_t>::max()]))       == sizeof(uint32_t));
+  static_assert(sizeof(sizeof_auto(char[std::numeric_limits<uint32_t>::max() + 1LL])) == sizeof(uint64_t));
+#endif
+}
diff --git a/test/hotspot/gtest/utilities/test_growableArray.cpp b/test/hotspot/gtest/utilities/test_growableArray.cpp
index 45fc9498d27..6958da18ac3 100644
--- a/test/hotspot/gtest/utilities/test_growableArray.cpp
+++ b/test/hotspot/gtest/utilities/test_growableArray.cpp
@@ -232,12 +232,111 @@ protected:
     }
   }
 
+  template <typename ArrayClass>
+  static void test_remove_range(ArrayClass* a) {
+    // Seed initial
+    for (int i = 0; i < 10; i++) {
+      a->append(i);
+    }
+    ASSERT_EQ(a->length(), 10);
+
+    // Remove empty range from the non-empty list, should not modify the list.
+    a->remove_range(0, 0);
+    ASSERT_EQ(a->length(), 10);
+
+    // Remove one element from head, should result in [1 ... 9]
+    a->remove_range(0, 1);
+    ASSERT_EQ(a->length(), 9);
+    for (int i = 0; i < a->length(); i++) {
+      ASSERT_EQ(a->at(i), i + 1);
+    }
+
+    // Remove one element from tail, should result in [1 ... 8]
+    a->remove_range(8, 9);
+    ASSERT_EQ(a->length(), 8);
+    for (int i = 0; i < a->length(); i++) {
+      ASSERT_EQ(a->at(i), i + 1);
+    }
+
+    // Remove another empty range from the non-empty list, should not modify
+    a->remove_range(1, 1);
+    ASSERT_EQ(a->length(), 8);
+
+    // Remove some elements from the middle, should result in [1 2 7 8]
+    a->remove_range(2, 6);
+    ASSERT_EQ(a->length(), 4);
+    ASSERT_EQ(a->at(0), 1);
+    ASSERT_EQ(a->at(1), 2);
+    ASSERT_EQ(a->at(2), 7);
+    ASSERT_EQ(a->at(3), 8);
+
+    // Remove the rest of the elements one by one
+    a->remove_range(0, 1);
+    ASSERT_EQ(a->length(), 3);
+    ASSERT_EQ(a->at(0), 2);
+    ASSERT_EQ(a->at(1), 7);
+    ASSERT_EQ(a->at(2), 8);
+
+    a->remove_range(0, 1);
+    ASSERT_EQ(a->length(), 2);
+    ASSERT_EQ(a->at(0), 7);
+    ASSERT_EQ(a->at(1), 8);
+
+    a->remove_range(0, 1);
+    ASSERT_EQ(a->length(), 1);
+    ASSERT_EQ(a->at(0), 8);
+
+    a->remove_range(0, 1);
+    ASSERT_EQ(a->length(), 0);
+
+    // Remove elements from empty list with empty range, should be accepted
+    a->remove_range(0, 0);
+    ASSERT_EQ(a->length(), 0);
+  }
+
+  template <typename ArrayClass>
+  static void test_remove_till(ArrayClass* a) {
+    // Seed initial
+    for (int i = 0; i < 10; i++) {
+      a->append(i);
+    }
+    ASSERT_EQ(a->length(), 10);
+
+    // Remove empty range from non-empty list, should work
+    a->remove_till(0);
+    ASSERT_EQ(a->length(), 10);
+
+    // Remove one element from head, should result in [1 ... 9]
+    a->remove_till(1);
+    ASSERT_EQ(a->length(), 9);
+    for (int i = 0; i < a->length(); i++) {
+      ASSERT_EQ(a->at(i), i + 1);
+    }
+
+    // Remove two elements from head, should result in [3 ... 9]
+    a->remove_till(2);
+    ASSERT_EQ(a->length(), 7);
+    for (int i = 0; i < a->length(); i++) {
+      ASSERT_EQ(a->at(i), i + 3);
+    }
+
+    // Remove remaining elements, should result in []
+    a->remove_till(a->length());
+    ASSERT_EQ(a->length(), 0);
+
+    // Remove empty range from empty list, should work
+    a->remove_till(0);
+    ASSERT_EQ(a->length(), 0);
+  }
+
   // Supported by all GrowableArrays
   enum TestEnum {
     Append,
     Clear,
     Capacity,
-    Iterator
+    Iterator,
+    RemoveRange,
+    RemoveTill
   };
 
   template <typename ArrayClass>
@@ -259,6 +358,14 @@ protected:
         test_iterator(a);
         break;
 
+      case RemoveRange:
+        test_remove_range(a);
+        break;
+
+      case RemoveTill:
+        test_remove_till(a);
+        break;
+
       default:
         fatal("Missing dispatch");
         break;
@@ -451,6 +558,14 @@ TEST_VM_F(GrowableArrayTest, iterator) {
   with_all_types_all_0(Iterator);
 }
 
+TEST_VM_F(GrowableArrayTest, remove_range) {
+  with_all_types_all_0(RemoveRange);
+}
+
+TEST_VM_F(GrowableArrayTest, remove_till) {
+  with_all_types_all_0(RemoveTill);
+}
+
 TEST_VM_F(GrowableArrayTest, copy) {
   with_no_cheap_array_append1(Copy1);
 }
diff --git a/test/hotspot/gtest/utilities/test_metaspaceClosure.cpp b/test/hotspot/gtest/utilities/test_metaspaceClosure.cpp
index b2acf45c470..c98b38b8c3c 100644
--- a/test/hotspot/gtest/utilities/test_metaspaceClosure.cpp
+++ b/test/hotspot/gtest/utilities/test_metaspaceClosure.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "cds/aotGrowableArray.inline.hpp"
 #include "memory/allocation.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
@@ -58,7 +59,7 @@ public:
 
 class MyUniqueMetaspaceClosure : public MetaspaceClosure {
   static constexpr int SIZE = 10;
-  MyMetaData* _visited[SIZE];
+  void* _visited[SIZE];
   int _count;
 public:
   MyUniqueMetaspaceClosure() {
@@ -71,11 +72,22 @@ public:
   virtual bool do_ref(Ref* ref, bool read_only) {
     MyMetaData* ptr = (MyMetaData*)ref->obj();
     assert(_count < SIZE, "out of bounds");
-    _visited[_count++] = ptr;
+    for (int i = 0; i < _count; i++) {
+      if (_visited[i] == (void*)ptr) {
+        // We have walked this before.
+        return false;
+      }
+    }
+
+    // Found a new pointer. Let's walk it
+    _visited[_count++] = (void*)ptr;
     return true; // recurse
   }
 
   bool has_visited(MyMetaData* p) {
+    return has_visited((void*)p);
+  }
+  bool has_visited(void* p) {
     for (int i = 0; i < SIZE; i++) {
       if (_visited[i] == p) {
         return true;
@@ -83,6 +95,9 @@ public:
     }
     return false;
   }
+  int visited_count() {
+    return _count;
+  }
 };
 
 // iterate an Array<MyMetaData*>
@@ -104,7 +119,9 @@ TEST_VM(MetaspaceClosure, MSOPointerArrayRef) {
 
   MyUniqueMetaspaceClosure closure;
   closure.push(&array);
+  closure.finish();
 
+  EXPECT_TRUE(closure.has_visited(array)) << "must be";
   EXPECT_TRUE(closure.has_visited(&x)) << "must be";
   EXPECT_TRUE(closure.has_visited(&y)) << "must be";
   EXPECT_TRUE(closure.has_visited(&z)) << "must be";
@@ -130,8 +147,85 @@ TEST_VM(MetaspaceClosure, MSOArrayRef) {
 
   MyUniqueMetaspaceClosure closure;
   closure.push(&array);
+  closure.finish();
 
+  EXPECT_TRUE(closure.has_visited(array)) << "must be";
   EXPECT_TRUE(closure.has_visited(&x)) << "must be";
   EXPECT_TRUE(closure.has_visited(&y)) << "must be";
   EXPECT_TRUE(closure.has_visited(&z)) << "must be";
 }
+
+// iterate an Array<int>
+TEST_VM(MetaspaceClosure, OtherArrayRef) {
+  JavaThread* THREAD = JavaThread::current();
+  ClassLoaderData* cld = ClassLoaderData::the_null_class_loader_data();
+  Array<int>* array = MetadataFactory::new_array<int>(cld, 4, THREAD);
+
+  MyUniqueMetaspaceClosure closure;
+  closure.push(&array);
+  closure.finish();
+
+  EXPECT_TRUE(closure.has_visited(array)) << "must be";
+}
+
+// iterate an AOTGrowableArray<MyMetaData*>
+TEST_VM(MetaspaceClosure, GrowableArray_MSOPointer) {
+  AOTGrowableArray<MyMetaData*>* array = new(mtClass) AOTGrowableArray<MyMetaData*>(2, mtClass);
+
+  MyMetaData x;
+  MyMetaData y;
+  MyMetaData z;
+
+  array->push(&x);
+  array->push(&y);
+  y._a = &z;
+
+  MyUniqueMetaspaceClosure closure;
+  closure.push(&array);
+  closure.finish();
+
+  EXPECT_TRUE(closure.has_visited(array)) << "must be";
+  EXPECT_TRUE(closure.has_visited(&x)) << "must be";
+  EXPECT_TRUE(closure.has_visited(&y)) << "must be";
+  EXPECT_TRUE(closure.has_visited(&z)) << "must be";
+}
+
+// iterate an AOTGrowableArray<MyMetaData>
+TEST_VM(MetaspaceClosure, GrowableArray_MSO) {
+  AOTGrowableArray<MyMetaData>* array = new(mtClass) AOTGrowableArray<MyMetaData>(4, mtClass);
+
+  for (int i = 0; i < array->length(); i++) {
+    EXPECT_TRUE(array->at(i)._a == nullptr) << "should be initialized to null";
+    EXPECT_TRUE(array->at(i)._b == nullptr) << "should be initialized to null";
+  }
+
+  MyMetaData x;
+  MyMetaData y;
+  MyMetaData z;
+
+  z._a = &x;
+  z._b = &y;
+  y._a = &z;
+  array->push(z);
+
+  MyUniqueMetaspaceClosure closure;
+  closure.push(&array);
+  closure.finish();
+
+  EXPECT_TRUE(closure.has_visited(array)) << "must be";
+  EXPECT_TRUE(closure.has_visited(&x)) << "must be";
+  EXPECT_TRUE(closure.has_visited(&y)) << "must be";
+  EXPECT_TRUE(closure.has_visited(&z)) << "must be";
+}
+
+// iterate an AOTGrowableArray<jlong>
+TEST_VM(MetaspaceClosure, GrowableArray_jlong) {
+  AOTGrowableArray<jlong>* array = new(mtClass) AOTGrowableArray<jlong>(4, mtClass);
+
+  MyUniqueMetaspaceClosure closure;
+  closure.push(&array);
+  closure.finish();
+
+  EXPECT_TRUE(closure.has_visited(array)) << "must be";
+  EXPECT_TRUE(closure.visited_count() == 2) << "must visit buffer inside GrowableArray";
+}
diff --git a/test/hotspot/gtest/utilities/test_rbtree.cpp b/test/hotspot/gtest/utilities/test_rbtree.cpp
index a351e2141e8..7eca5f54831 100644
--- a/test/hotspot/gtest/utilities/test_rbtree.cpp
+++ b/test/hotspot/gtest/utilities/test_rbtree.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,6 +115,16 @@ struct ArrayAllocator {
   using IntrusiveTreeInt = IntrusiveRBTree<int, IntrusiveCmp>;
   using IntrusiveCursor = IntrusiveTreeInt::Cursor;
 
+  struct DestructionTracker {
+    static int destructed_count;
+    int value;
+
+    DestructionTracker(int value) : value(value) {}
+    ~DestructionTracker() { destructed_count++; }
+
+    static void reset() { destructed_count = 0; }
+  };
+
 public:
   void inserting_duplicates_results_in_one_value() {
     constexpr int up_to = 10;
@@ -607,6 +617,55 @@ public:
     }
   }
 
+  void test_remove_destructs() {
+    using Tree = RBTreeCHeap<int, DestructionTracker, Cmp, mtTest>;
+    using Node = RBNode<int, DestructionTracker>;
+    using Cursor = Tree::Cursor;
+
+    Tree tree;
+
+    // Test the 3 ways of removing a single node
+    tree.upsert(0, DestructionTracker(0));
+    tree.upsert(1, DestructionTracker(1));
+    tree.upsert(2, DestructionTracker(2));
+
+    DestructionTracker::reset();
+
+    tree.remove(0);
+
+    Node* n = tree.find_node(1);
+    tree.remove(n);
+
+    Cursor remove_cursor = tree.cursor(2);
+    tree.remove_at_cursor(remove_cursor);
+
+    EXPECT_EQ(3, DestructionTracker::destructed_count);
+
+    // Test clearing the tree
+    constexpr int num_nodes = 10;
+    for (int n = 0; n < num_nodes; n++) {
+      tree.upsert(n, DestructionTracker(n));
+    }
+
+    DestructionTracker::reset();
+
+    tree.remove_all();
+    EXPECT_EQ(num_nodes, DestructionTracker::destructed_count);
+
+    // Test replacing a node
+    tree.upsert(0, DestructionTracker(0));
+    Cursor replace_cursor = tree.cursor(0);
+    Node* new_node = tree.allocate_node(1, DestructionTracker(1));
+
+    DestructionTracker::reset();
+
+    tree.replace_at_cursor(new_node, replace_cursor);
+    EXPECT_EQ(1, DestructionTracker::destructed_count);
+
+    tree.remove_at_cursor(replace_cursor);
+    EXPECT_EQ(2, DestructionTracker::destructed_count);
+  }
+
   void test_cursor() {
     constexpr int num_nodes = 10;
     RBTreeInt tree;
@@ -971,6 +1030,11 @@ TEST_VM_F(RBTreeTest, NodeHints) {
   this->test_node_hints();
 }
 
+int RBTreeTest::DestructionTracker::destructed_count = 0;
+TEST_VM_F(RBTreeTest, RemoveDestructs) {
+  this->test_remove_destructs();
+}
+
 TEST_VM_F(RBTreeTest, CursorFind) {
   this->test_cursor();
 }
@@ -1252,3 +1316,17 @@ TEST_VM_F(RBTreeTest, AllocatorMayReturnNull) {
   EXPECT_EQ(false, success);
   // The test didn't exit the VM, so it was succesful.
 }
+
+TEST_VM_F(RBTreeTest, ArenaAllocator) {
+  Arena arena(mtTest);
+  RBTreeArena<int, int, Cmp> rbtree(&arena);
+  bool success = rbtree.upsert(5, 5);
+  ASSERT_EQ(true, success);
+}
+
+TEST_VM_F(RBTreeTest, ResourceAreaAllocator) {
+  ResourceArea area(mtTest);
+  RBTreeResourceArea<int, int, Cmp> rbtree(&area);
+  bool success = rbtree.upsert(5, 5);
+  ASSERT_EQ(true, success);
+}
diff --git a/test/hotspot/jtreg/ProblemList-AotJdk.txt b/test/hotspot/jtreg/ProblemList-AotJdk.txt
index af3994289df..0a2177b8edb 100644
--- a/test/hotspot/jtreg/ProblemList-AotJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-AotJdk.txt
@@ -1,3 +1,32 @@
+#
+# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing in AOT_JDK mode.
+#
+#############################################################################
+
 runtime/modules/PatchModule/PatchModuleClassList.java 0000000 generic-all
 runtime/NMT/NMTWithCDS.java                           0000000 generic-all
 runtime/symbols/TestSharedArchiveConfigFile.java      0000000 generic-all
@@ -27,3 +56,16 @@ compiler/ciReplay/TestInliningProtectionDomain.java   0000000 generic-all
 # These tests fail often with AotJdk due to JDK-8323727
 compiler/arguments/TestStressReflectiveCode.java 8323727 generic-all
 compiler/arraycopy/TestCloneWithStressReflectiveCode.java 8323727 generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/ProblemList-StaticJdk.txt b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
index a34ae3c0658..8cd10f26a85 100644
--- a/test/hotspot/jtreg/ProblemList-StaticJdk.txt
+++ b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
@@ -1,3 +1,32 @@
+#
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing in StaticJdk mode.
+#
+#############################################################################
+
 # Dynamically link with JDK/VM native libraries
 gtest/CheckShuffledGtest.java                           8356201 generic-all
 gtest/GTestWrapper.java                                 8356201 generic-all
@@ -7,3 +36,16 @@ gtest/MetaspaceGtests.java#no-ccs                       8356201 generic-all
 gtest/NMTGtests.java#nmt-detail                         8356201 generic-all
 gtest/NMTGtests.java#nmt-off                            8356201 generic-all
 gtest/NMTGtests.java#nmt-summary                        8356201 generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index 31684662194..7c4846a9fb2 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -77,3 +77,15 @@ vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemor
 # to make progress when all other threads are currently suspended.
 vmTestbase/nsk/jdi/ThreadReference/isSuspended/issuspended002/TestDescription.java 8338713 generic-all
 
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index 758bb32e968..e4f1774e6e0 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,3 +46,16 @@ vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 829
 vmTestbase/nsk/stress/thread/thread006.java 8321476 linux-all
 
 gc/arguments/TestNewSizeFlags.java 8299116 macosx-aarch64
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/ProblemList-enable-preview.txt b/test/hotspot/jtreg/ProblemList-enable-preview.txt
index 31e09d372a8..1a831a0dde3 100644
--- a/test/hotspot/jtreg/ProblemList-enable-preview.txt
+++ b/test/hotspot/jtreg/ProblemList-enable-preview.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 #
 # List of quarantined tests for testing with --enable-preview
 #
+# These are failures that ONLY occur with the '--enable-preview' option
+# specified. There are separate sub-sections for each preview project.
+#
 #############################################################################
 
-
diff --git a/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt b/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
index eb4131691c9..1e84a39c30b 100644
--- a/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
+++ b/test/hotspot/jtreg/ProblemList-jvmti-stress-agent.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -96,3 +96,16 @@ serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadTest.java
 serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorTwoAgentsTest.java                        0000000 generic-all
 serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java#id0                     0000000 generic-all
 serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java#id1                     0000000 generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 911e3adc9ca..3e52b7169df 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -113,3 +113,16 @@ compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java      8343233 generic-aarch64
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java             8343233 generic-aarch64
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java      8343233 generic-aarch64
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 13e1ea30a34..ba63f775223 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,10 @@ compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
 compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897,8348519 aix-ppc64,linux-ppc64le,linux-s390x
 compiler/vectorapi/VectorRebracket128Test.java 8330538 generic-all
 
+compiler/vectorization/TestVectorAlgorithms.java#noSuperWord 8376803 aix-ppc64,linux-s390x
+compiler/vectorization/TestVectorAlgorithms.java#vanilla 8376803 aix-ppc64,linux-s390x
+compiler/vectorization/TestVectorAlgorithms.java#noOptimizeFill 8376803 aix-ppc64,linux-s390x
+
 compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java 8331704 linux-riscv64
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java 8331704 linux-riscv64
@@ -77,6 +81,8 @@ compiler/interpreter/Test6833129.java 8335266 generic-i586
 
 compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64
 
+compiler/longcountedloops/TestLoopNestTooManyTraps.java 8376591 generic-all
+
 #############################################################################
 
 # :hotspot_gc
@@ -90,9 +96,6 @@ gc/TestAllocHumongousFragment.java#g1 8298781 generic-all
 gc/TestAllocHumongousFragment.java#static 8298781 generic-all
 gc/shenandoah/oom/TestAllocOutOfMemory.java#large 8344312 linux-ppc64le
 gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
-gc/shenandoah/TestRetainObjects.java#no-tlab 8361099 generic-all
-gc/shenandoah/TestSieveObjects.java#no-tlab 8361099 generic-all
-gc/shenandoah/TestSieveObjects.java#no-tlab-genshen 8361099 generic-all
 
 #############################################################################
 
@@ -113,7 +116,6 @@ runtime/NMT/VirtualAllocCommitMerge.java 8309698 linux-s390x
 applications/jcstress/copy.java 8229852 linux-all
 
 containers/docker/TestJcmd.java 8278102 linux-all
-containers/docker/TestMemoryAwareness.java 8303470 linux-all
 containers/docker/TestJFREvents.java 8327723 linux-x64
 containers/docker/TestJcmdWithSideCar.java 8341518 linux-x64
 
@@ -182,3 +184,16 @@ vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEa
 vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi005/TestDescription.java 8076494 windows-x64
 
 vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find006/TestDescription.java 8310144 macosx-aarch64
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index 0fdbdae9bc5..d1c72b9768c 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -107,7 +107,7 @@ requires.properties= \
     jdk.static
 
 # Minimum jtreg version
-requiredVersion=8.1+1
+requiredVersion=8.2.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../../ notation to reach them
diff --git a/test/hotspot/jtreg/compiler/arguments/TestUseSHA3IntrinsicsWithUseSHADisabledOnSupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseSHA3IntrinsicsWithUseSHADisabledOnSupportedCPU.java
new file mode 100644
index 00000000000..cf8000b7a21
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/arguments/TestUseSHA3IntrinsicsWithUseSHADisabledOnSupportedCPU.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8375443
+ * @summary Verify that UseSHA3Intrinsics is properly disabled when UseSHA is disabled
+ *          on supported CPU
+ * @library /test/lib /
+ * @requires vm.flagless
+
+ *
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI
+ *                   compiler.arguments.TestUseSHA3IntrinsicsWithUseSHADisabledOnSupportedCPU
+ */
+
+package compiler.arguments;
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+import jdk.test.lib.cli.CommandLineOptionTest;
+import jdk.test.lib.process.ExitCode;
+import jtreg.SkippedException;
+
+public class TestUseSHA3IntrinsicsWithUseSHADisabledOnSupportedCPU {
+    private static final String OPTION_NAME = "UseSHA3Intrinsics";
+    private static final String MASTER_OPTION = "UseSHA";
+    private static final String WARNING_MESSAGE =
+        "Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU\\.";
+    private static final String UNLOCK_DIAGNOSTIC = "-XX:+UnlockDiagnosticVMOptions";
+
+    public static void main(String[] args) throws Throwable {
+        if (!IntrinsicPredicates.SHA3_INSTRUCTION_AVAILABLE.getAsBoolean()) {
+            throw new SkippedException("Skipping... SHA3 intrinsics are not available on this platform.");
+        }
+
+        // Verify that UseSHA3Intrinsics can be explicitly enabled when UseSHA is enabled (default)
+        testExplicitEnableWithUseSHAEnabled();
+
+        // Verify that UseSHA3Intrinsics is forced to false when UseSHA is disabled,
+        // even if explicitly set to true
+        testForcedDisableWhenUseSHADisabled();
+
+        // Verify that a warning is printed when trying to enable UseSHA3Intrinsics
+        // while UseSHA is disabled
+        testWarningWhenEnablingWithUseSHADisabled();
+
+        // Verify that UseSHA3Intrinsics can be explicitly disabled even when UseSHA is enabled
+        testExplicitDisableWithUseSHAEnabled();
+    }
+
+    private static void testExplicitEnableWithUseSHAEnabled() throws Throwable {
+        // Verify the option value is true when explicitly enabled (with UseSHA enabled by default)
+        CommandLineOptionTest.verifyOptionValueForSameVM(
+            OPTION_NAME,
+            "true",
+            "UseSHA3Intrinsics should be enabled when explicitly set to true with UseSHA enabled",
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true)
+        );
+
+        // Verify no warning is printed when enabling UseSHA3Intrinsics with UseSHA enabled
+        CommandLineOptionTest.verifySameJVMStartup(
+            null,  // No specific output expected
+            new String[] { WARNING_MESSAGE },  // Warning should not appear
+            "No warning should be printed when enabling UseSHA3Intrinsics with UseSHA enabled",
+            "UseSHA3Intrinsics should be enabled without warnings when UseSHA is enabled",
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true)
+        );
+    }
+
+    private static void testForcedDisableWhenUseSHADisabled() throws Throwable {
+        // When -XX:-UseSHA is set, UseSHA3Intrinsics should be forced to false
+        // even if +UseSHA3Intrinsics is explicitly passed
+        CommandLineOptionTest.verifyOptionValueForSameVM(
+            OPTION_NAME,
+            "false",
+            String.format("UseSHA3Intrinsics should be forced to false when %s is set, " +
+                         "even if explicitly enabled",
+                         CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, false)),
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true),
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, false)
+        );
+    }
+
+    private static void testWarningWhenEnablingWithUseSHADisabled() throws Throwable {
+        // A warning should be printed when trying to enable UseSHA3Intrinsics with -UseSHA
+        CommandLineOptionTest.verifySameJVMStartup(
+            new String[] { WARNING_MESSAGE },  // Warning should appear
+            null,  // No unexpected output
+            "JVM should start successfully",
+            String.format("A warning should be printed when trying to enable %s while %s is disabled",
+                         OPTION_NAME,
+                         MASTER_OPTION),
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, false),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true)
+        );
+    }
+
+    private static void testExplicitDisableWithUseSHAEnabled() throws Throwable {
+        // Verify that UseSHA3Intrinsics can be explicitly disabled even when UseSHA is enabled
+        CommandLineOptionTest.verifyOptionValueForSameVM(
+            OPTION_NAME,
+            "false",
+            "UseSHA3Intrinsics should be disabled when explicitly set to false",
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, true),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, false)
+        );
+
+        // Verify no warning is printed when explicitly disabling UseSHA3Intrinsics
+        CommandLineOptionTest.verifySameJVMStartup(
+            null,  // No specific output expected
+            new String[] { WARNING_MESSAGE },  // Warning should not appear
+            "No warning should be printed when explicitly disabling UseSHA3Intrinsics",
+            "UseSHA3Intrinsics should be disabled without warnings",
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, true),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, false)
+        );
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/arguments/TestUseSHA3IntrinsicsWithUseSHADisabledOnUnsupportedCPU.java b/test/hotspot/jtreg/compiler/arguments/TestUseSHA3IntrinsicsWithUseSHADisabledOnUnsupportedCPU.java
new file mode 100644
index 00000000000..1e0df1874b6
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/arguments/TestUseSHA3IntrinsicsWithUseSHADisabledOnUnsupportedCPU.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8375443
+ * @summary Verify that UseSHA3Intrinsics is properly disabled with warnings
+ *          on unsupported CPU.
+ * @library /test/lib /
+ * @requires vm.flagless
+ *
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI
+ *                   compiler.arguments.TestUseSHA3IntrinsicsWithUseSHADisabledOnUnsupportedCPU
+ */
+
+package compiler.arguments;
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+import jdk.test.lib.cli.CommandLineOptionTest;
+import jdk.test.lib.process.ExitCode;
+import jtreg.SkippedException;
+
+public class TestUseSHA3IntrinsicsWithUseSHADisabledOnUnsupportedCPU {
+    private static final String OPTION_NAME = "UseSHA3Intrinsics";
+    private static final String MASTER_OPTION = "UseSHA";
+    private static final String WARNING_MESSAGE =
+        "Intrinsics for SHA3-224, SHA3-256, SHA3-384 and SHA3-512 crypto hash functions not available on this CPU\\.";
+    private static final String UNLOCK_DIAGNOSTIC = "-XX:+UnlockDiagnosticVMOptions";
+
+    public static void main(String[] args) throws Throwable {
+        if (IntrinsicPredicates.SHA3_INSTRUCTION_AVAILABLE.getAsBoolean()) {
+            throw new SkippedException("Skipping... SHA3 intrinsics are available on this platform.");
+        }
+
+        // Verify that UseSHA3Intrinsics remains false when UseSHA is enabled
+        // but CPU doesn't support the instructions
+        testRemainsDisabledWithUseSHAEnabled();
+
+        // Verify that explicitly disabling UseSHA3Intrinsics works without warnings
+        testExplicitDisableWithoutWarning();
+
+        // Verify behavior with both -XX:-UseSHA and +XX:+UseSHA3Intrinsics
+        testWithUseSHADisabled();
+    }
+
+    private static void testRemainsDisabledWithUseSHAEnabled() throws Throwable {
+        // Even with +UseSHA, UseSHA3Intrinsics should remain false on unsupported CPU
+        CommandLineOptionTest.verifyOptionValueForSameVM(
+            OPTION_NAME,
+            "false",
+            "UseSHA3Intrinsics should remain false even when UseSHA is enabled on unsupported CPU",
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, true)
+        );
+
+        // Trying to enable both should still produce a warning
+        CommandLineOptionTest.verifySameJVMStartup(
+            new String[] { WARNING_MESSAGE },
+            null,
+            "JVM should start with a warning",
+            "Warning should be printed even when UseSHA is explicitly enabled",
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, true),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true)
+        );
+    }
+
+    private static void testExplicitDisableWithoutWarning() throws Throwable {
+        // Explicitly disabling should not produce any warnings
+        CommandLineOptionTest.verifySameJVMStartup(
+            null,  // No specific output expected
+            new String[] { WARNING_MESSAGE },  // Warning should NOT appear
+            "JVM should start without warnings",
+            "No warning should be printed when explicitly disabling UseSHA3Intrinsics",
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, false)
+        );
+
+        // Verify the flag value is false
+        CommandLineOptionTest.verifyOptionValueForSameVM(
+            OPTION_NAME,
+            "false",
+            "UseSHA3Intrinsics should be false when explicitly disabled",
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, false)
+        );
+    }
+
+    private static void testWithUseSHADisabled() throws Throwable {
+        // When UseSHA is disabled, UseSHA3Intrinsics should also be disabled
+        // and a warning should be printed
+        CommandLineOptionTest.verifySameJVMStartup(
+            new String[] { WARNING_MESSAGE },
+            null,
+            "JVM should start with a warning",
+            String.format("Warning should be printed when trying to enable %s while %s is disabled on unsupported CPU",
+                         OPTION_NAME,
+                         MASTER_OPTION),
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, false),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true)
+        );
+
+        // Verify the flag is forced to false
+        CommandLineOptionTest.verifyOptionValueForSameVM(
+            OPTION_NAME,
+            "false",
+            String.format("UseSHA3Intrinsics should be false when %s is disabled on unsupported CPU",
+                         MASTER_OPTION),
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, false),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, true)
+        );
+
+        // Test that with both flags disabled, no warning appears
+        CommandLineOptionTest.verifySameJVMStartup(
+            null,
+            new String[] { WARNING_MESSAGE },
+            "JVM should start without warnings",
+            "No warning when both UseSHA and UseSHA3Intrinsics are disabled",
+            ExitCode.OK,
+            UNLOCK_DIAGNOSTIC,
+            CommandLineOptionTest.prepareBooleanFlag(MASTER_OPTION, false),
+            CommandLineOptionTest.prepareBooleanFlag(OPTION_NAME, false)
+        );
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/ClearArray.java b/test/hotspot/jtreg/compiler/c2/ClearArray.java
index ee376641650..d218eef5780 100644
--- a/test/hotspot/jtreg/compiler/c2/ClearArray.java
+++ b/test/hotspot/jtreg/compiler/c2/ClearArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 
 /*
  * @test ClearArray.java
- * @bug 8284883
+ * @bug 8284883 8374570
  * @compile ClearArray.java
  * @summary ClearArray instruction overflows scratch buffer
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-TieredCompilation -Xbatch
@@ -33,6 +33,8 @@
  *   -XX:InitArrayShortSize=32768 -XX:-IdealizeClearArrayNode -XX:UseAVX=3 compiler.c2.ClearArray
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xbatch
  *   -XX:InitArrayShortSize=32768 -XX:MaxVectorSize=8 -XX:-IdealizeClearArrayNode -XX:UseAVX=3 compiler.c2.ClearArray
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -Xbatch
+ *   -XX:+EnableX86ECoreOpts -XX:MaxVectorSize=8 -XX:UseAVX=3 compiler.c2.ClearArray
  */
 
 package compiler.c2;
diff --git a/test/hotspot/jtreg/compiler/c2/TestDependsOnTestSqrtHFAssertion.java b/test/hotspot/jtreg/compiler/c2/TestDependsOnTestSqrtHFAssertion.java
new file mode 100644
index 00000000000..5ad9a927097
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestDependsOnTestSqrtHFAssertion.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8378897
+ * @summary assertion failure due to missing depends_only_on_test_impl definition in SqrtHFNode
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @requires vm.debug & vm.compiler2.enabled
+ * @run main/othervm --add-modules=jdk.incubator.vector compiler.c2.TestDependsOnTestSqrtHFAssertion
+ */
+
+package compiler.c2;
+
+import jdk.incubator.vector.*;
+
+public class TestDependsOnTestSqrtHFAssertion {
+    public static int x1 = 10;
+
+    public static int x2 = 20;
+
+    public static int y = 30;
+
+    public static int micro(int x1, int x2, int y, int ctr) {
+        int res = 0;
+        for (int i = 0; i < ctr; i++) {
+            if (y != 0) {
+                if (x1 > 0) {
+                    if (x2 > 0) {
+                        if (y != 0) {
+                            res += (int)Float16.float16ToRawShortBits(Float16.sqrt(Float16.shortBitsToFloat16((short)(x1/y))));
+                            res += (int)Float16.float16ToRawShortBits(Float16.sqrt(Float16.shortBitsToFloat16((short)(x2/y))));
+                        }
+                    }
+                }
+           }
+        }
+        return res;
+    }
+
+    public static void main(String [] args) {
+        int res = 0;
+        for (int i = 0 ; i < 100000; i++) {
+            res += micro(x1, x2, y, i);
+        }
+        IO.println("PASS" + res);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java b/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java
index a7e90353f90..6b93f00cdb1 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMinMaxSubword.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +31,7 @@ import java.util.Random;
 
 /*
  * @test
- * @bug 8294816
+ * @bug 8294816 8342095
  * @key randomness
  * @summary Test Math.min/max vectorization miscompilation for integer subwords
  * @library /test/lib /
@@ -58,11 +59,11 @@ public class TestMinMaxSubword {
         }
     }
 
-    // Ensure vector max/min instructions are not generated for integer subword types
-    // as Java APIs for Math.min/max do not support integer subword types and superword
-    // should not generate vectorized Min/Max nodes for them.
+    // Ensure that casts to/from subword types are emitted, as java APIs for Math.min/max do not support integer subword
+    // types and superword should generate int versions and then cast between them.
+
     @Test
-    @IR(failOn = {IRNode.MIN_VI, IRNode.MIN_VF, IRNode.MIN_VD})
+    @IR(applyIfCPUFeature = { "avx", "true" }, counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
     public static void testMinShort() {
         for (int i = 0; i < LENGTH; i++) {
            sb[i] = (short) Math.min(sa[i], val);
@@ -78,7 +79,7 @@ public class TestMinMaxSubword {
     }
 
     @Test
-    @IR(failOn = {IRNode.MAX_VI, IRNode.MAX_VF, IRNode.MAX_VD})
+    @IR(applyIfCPUFeature = { "avx", "true" }, counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
     public static void testMaxShort() {
         for (int i = 0; i < LENGTH; i++) {
             sb[i] = (short) Math.max(sa[i], val);
@@ -93,7 +94,7 @@ public class TestMinMaxSubword {
     }
 
     @Test
-    @IR(failOn = {IRNode.MIN_VI, IRNode.MIN_VF, IRNode.MIN_VD})
+    @IR(applyIfCPUFeature = { "avx", "true" }, counts = { IRNode.VECTOR_CAST_I2B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", ">0" })
     public static void testMinByte() {
         for (int i = 0; i < LENGTH; i++) {
            bb[i] = (byte) Math.min(ba[i], val);
@@ -109,7 +110,7 @@ public class TestMinMaxSubword {
     }
 
     @Test
-    @IR(failOn = {IRNode.MAX_VI, IRNode.MAX_VF, IRNode.MAX_VD})
+    @IR(applyIfCPUFeature = { "avx", "true" }, counts = { IRNode.VECTOR_CAST_I2B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", ">0" })
     public static void testMaxByte() {
         for (int i = 0; i < LENGTH; i++) {
             bb[i] = (byte) Math.max(ba[i], val);
diff --git a/test/jdk/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java b/test/hotspot/jtreg/compiler/c2/TestUnlockNodeNullMemprof.java
similarity index 55%
rename from test/jdk/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java
rename to test/hotspot/jtreg/compiler/c2/TestUnlockNodeNullMemprof.java
index be861e43723..f86dc495fd2 100644
--- a/test/jdk/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java
+++ b/test/hotspot/jtreg/compiler/c2/TestUnlockNodeNullMemprof.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,23 +20,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import javax.sql.rowset.serial.SerialClob;
-import javax.sql.rowset.serial.SerialException;
 
 /**
  * @test
- * @bug 7077451
- * @summary tests if the correct exception is thrown when calling method setCharacterStream() on SerialClob
+ * @bug 8370502
+ * @summary Do not segfault while adding node to IGVN worklist
+ *
+ * @run main/othervm -Xbatch ${test.main.class}
  */
-public class SetCharacterStream {
 
-    public static void main(String[] args) throws Exception {
-        SerialClob clob = new SerialClob(new char[0]);
-        try {
-            clob.setCharacterStream(0);
-        } catch (SerialException e) {
-             System.out.println("Test PASSED");
-        }
+package compiler.c2;
+
+public class TestUnlockNodeNullMemprof {
+    public static void main(String[] args) {
+        int[] a = new int[0]; // test only valid when size is 0.
+        for (int i = 0; i < Integer.valueOf(10000); i++) // test only valid with boxed loop limit
+            try {
+                test(a);
+            } catch (ArrayIndexOutOfBoundsException e) {
+            }
     }
 
+    static void test(int[] a) {
+        for (int i = 0; i < 1;) {
+            a[i] = 0;
+            synchronized (TestUnlockNodeNullMemprof.class) {
+            }
+            for (int j = 0; Integer.valueOf(j) < 1;)
+                j = 0;
+        }
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java b/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java
index 4b6215b25bd..39bb8b0a0ad 100644
--- a/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java
+++ b/test/hotspot/jtreg/compiler/c2/TestVerifyIterativeGVN.java
@@ -25,9 +25,9 @@
  * @test
  * @bug 8238756 8351889
  * @requires vm.debug == true & vm.flavor == "server"
- * @summary Run with -Xcomp to test -XX:VerifyIterativeGVN=11111 in debug builds.
+ * @summary Run with -Xcomp to test -XX:VerifyIterativeGVN=111111 in debug builds.
  *
- * @run main/othervm/timeout=300 -Xcomp -XX:VerifyIterativeGVN=11111 compiler.c2.TestVerifyIterativeGVN
+ * @run main/othervm/timeout=300 -Xcomp -XX:VerifyIterativeGVN=111111 compiler.c2.TestVerifyIterativeGVN
  */
 package compiler.c2;
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestVerifyLoopOptimizationsHighMemUsage.java b/test/hotspot/jtreg/compiler/c2/TestVerifyLoopOptimizationsHighMemUsage.java
new file mode 100644
index 00000000000..ea7f3049ec3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestVerifyLoopOptimizationsHighMemUsage.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @key stress randomness
+ * @bug 8370519
+ * @summary C2: Hit MemLimit when running with +VerifyLoopOptimizations
+ * @run main/othervm -XX:CompileCommand=compileonly,${test.main.class}::* -XX:-TieredCompilation -Xbatch
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:+StressLoopPeeling -XX:+VerifyLoopOptimizations
+ *                   -XX:CompileCommand=memlimit,${test.main.class}::*,600M~crash
+ *                   -XX:StressSeed=3106998670 ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.c2;
+
+public class TestVerifyLoopOptimizationsHighMemUsage {
+    public static final int N = 400;
+    public static long instanceCount = -13L;
+    public static volatile short sFld = -16143;
+    public static int iFld = -159;
+    public static float fArrFld[] = new float[N];
+
+    public static long lMeth(int i1) {
+        int i2 = 11, i3 = 37085, i4 = 177, i5 = 190, i6 = -234, i7 = 13060,
+                iArr[] = new int[N];
+        float f = 1.179F;
+        double d = 2.9685;
+        long lArr[] = new long[N];
+        for (i2 = 15; i2 < 330; ++i2)
+            for (i4 = 1; i4 < 5; ++i4) {
+                fArrFld[i4 + 1] = (++i1);
+                for (i6 = 2; i6 > 1; i6 -= 3)
+                    switch ((i2 * 5) + 54) {
+                        case 156:
+                            if (i4 != 0)
+                                ;
+                        case 168:
+                        case 342:
+                        case 283:
+                        case 281:
+                        case 328:
+                        case 322:
+                        case 228:
+                        case 114:
+                        case 207:
+                        case 209:
+                        case 354:
+                        case 108:
+                            i1 <<= i1;
+                        case 398:
+                        case 144:
+                        case 218:
+                        case 116:
+                        case 296:
+                        case 198:
+                        case 173:
+                        case 105:
+                        case 120:
+                        case 248:
+                        case 140:
+                        case 352:
+                            try {
+                            } catch (ArithmeticException a_e) {
+                            }
+                        case 404:
+                            i5 += (i6 ^ instanceCount);
+                        case 370:
+                        case 211:
+                        case 231:
+                            try {
+                            } catch (ArithmeticException a_e) {
+                            }
+                        case 251:
+                        case 179:
+                            f += (((i6 * sFld) + i4) -
+                                    iFld);
+                    }
+            }
+        long meth_res = i1 + i2 + i3 + i4 + i5 + i6 + i7 + Float.floatToIntBits(f) +
+                Double.doubleToLongBits(d) + +checkSum(iArr) +
+                checkSum(lArr);
+        return meth_res;
+    }
+
+    public static long checkSum(int[] a) {
+        long sum = 0;
+        for (int j = 0; j < a.length; j++)
+            sum += (a[j] / (j + 1) + a[j] % (j + 1));
+        return sum;
+    }
+
+    public static long checkSum(long[] a) {
+        long sum = 0;
+        for (int j = 0; j < a.length; j++)
+            sum += (a[j] / (j + 1) + a[j] % (j + 1));
+        return sum;
+    }
+
+  public static void main(String[] strArr) {
+    for (int i = 0; i < 10; i++)
+      lMeth(-159);
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/CmpUNodeValueTests.java b/test/hotspot/jtreg/compiler/c2/gvn/CmpUNodeValueTests.java
new file mode 100644
index 00000000000..cbcbda3422f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/CmpUNodeValueTests.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.gvn;
+
+import compiler.lib.generators.Generators;
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8375653
+ * @summary Test that Value computations of CmpUNode are being performed as expected.
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class CmpUNodeValueTests {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @DontInline
+    public static int one() {
+        return 1;
+    }
+
+    // Move to a separate method to prevent javac folding the constant comparison
+    @ForceInline
+    public static int oneInline() {
+        return 1;
+    }
+
+    @Run(test = {"testIntControl", "testIntLT", "testIntLE", "testIntGT", "testIntGE", "testIntEQ", "testIntNE",
+                 "testLongControl", "testLongLT", "testLongLE", "testLongGT", "testLongGE", "testLongEQ", "testLongNE"})
+    public void run() {
+        var stream = Generators.G.longs();
+        long x = stream.next();
+        long y = stream.next();
+
+        Asserts.assertEQ(0, testIntControl(false, false));
+        Asserts.assertEQ(0, testIntControl(false, true));
+        Asserts.assertEQ(0, testIntControl(true, false));
+        Asserts.assertEQ(1, testIntControl(true, true));
+        Asserts.assertEQ(0, testIntLT((int) x));
+        Asserts.assertEQ(0, testIntLE(false, false));
+        Asserts.assertEQ(0, testIntLE(false, true));
+        Asserts.assertEQ(0, testIntLE(true, false));
+        Asserts.assertEQ(0, testIntLE(true, true));
+        Asserts.assertEQ(0, testIntGT(false, false));
+        Asserts.assertEQ(0, testIntGT(false, true));
+        Asserts.assertEQ(0, testIntGT(true, false));
+        Asserts.assertEQ(0, testIntGT(true, true));
+        Asserts.assertEQ(0, testIntGE((int) x, (int) y));
+        Asserts.assertEQ(0, testIntEQ());
+        Asserts.assertEQ(0, testIntNE(false, false));
+        Asserts.assertEQ(0, testIntNE(false, true));
+        Asserts.assertEQ(0, testIntNE(true, false));
+        Asserts.assertEQ(0, testIntNE(true, true));
+
+        Asserts.assertEQ(0, testLongControl(false, false));
+        Asserts.assertEQ(0, testLongControl(false, true));
+        Asserts.assertEQ(0, testLongControl(true, false));
+        Asserts.assertEQ(1, testLongControl(true, true));
+        Asserts.assertEQ(0, testLongLT((int) x, false));
+        Asserts.assertEQ(0, testLongLT((int) x, true));
+        Asserts.assertEQ(0, testLongLE(false, false));
+        Asserts.assertEQ(0, testLongLE(false, true));
+        Asserts.assertEQ(0, testLongLE(true, false));
+        Asserts.assertEQ(0, testLongLE(true, true));
+        Asserts.assertEQ(0, testLongGT(false, false));
+        Asserts.assertEQ(0, testLongGT(false, true));
+        Asserts.assertEQ(0, testLongGT(true, false));
+        Asserts.assertEQ(0, testLongGT(true, true));
+        Asserts.assertEQ(0, testLongGE((int) x, (int) y));
+        Asserts.assertEQ(0, testLongEQ());
+        Asserts.assertEQ(0, testLongNE(false, false));
+        Asserts.assertEQ(0, testLongNE(false, true));
+        Asserts.assertEQ(0, testLongNE(true, false));
+        Asserts.assertEQ(0, testLongNE(true, true));
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, counts = {IRNode.CMP_U, "1"})
+    int testIntControl(boolean b1, boolean b2) {
+        int v1 = b1 ? 1 : -1;
+        int v2 = b2 ? 1 : 0;
+        return Integer.compareUnsigned(v1, v2) > 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_U, IRNode.CALL})
+    int testIntLT(int x) {
+        int v1 = x & Integer.MAX_VALUE; // Unset the highest bit, make v1 non-negative
+        int v2 = Integer.MIN_VALUE;
+        return Integer.compareUnsigned(v1, v2) < 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_U, IRNode.CALL})
+    int testIntLE(boolean b1, boolean b2) {
+        int v1 = b1 ? 2 : 0;
+        int v2 = b2 ? -1 : 2;
+        return Integer.compareUnsigned(v1, v2) <= 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_U, IRNode.CALL})
+    int testIntGT(boolean b1, boolean b2) {
+        int v1 = b1 ? Integer.MIN_VALUE : Integer.MAX_VALUE;
+        int v2 = b2 ? 0 : 2;
+        return Integer.compareUnsigned(v1, v2) > 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_U, IRNode.CALL})
+    int testIntGE(int x, int y) {
+        int v1 = x | Integer.MIN_VALUE; // Set the highest bit, make v1 negative
+        int v2 = y & Integer.MAX_VALUE; // Unset the highest bit, make v2 non-negative
+        return Integer.compareUnsigned(v1, v2) >= 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_U, IRNode.CALL})
+    int testIntEQ() {
+        return Integer.compareUnsigned(oneInline(), 1) == 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_U, IRNode.CALL})
+    int testIntNE(boolean b1, boolean b2) {
+        int v1 = b1 ? 1 : -1;
+        int v2 = b2 ? 0 : 2;
+        return Integer.compareUnsigned(v1, v2) != 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, counts = {IRNode.CMP_UL, "1"})
+    int testLongControl(boolean b1, boolean b2) {
+        long v1 = b1 ? 1 : -1;
+        long v2 = b2 ? 1 : 0;
+        return Long.compareUnsigned(v1, v2) > 0 ? 0 : one();
+    }
+
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_UL, IRNode.CALL})
+    int testLongLT(int x, boolean b2) {
+        long v1 = Integer.toUnsignedLong(x);
+        long v2 = Integer.MIN_VALUE;
+        return Long.compareUnsigned(v1, v2) < 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_UL, IRNode.CALL})
+    int testLongLE(boolean b1, boolean b2) {
+        long v1 = b1 ? 2 : 0;
+        long v2 = b2 ? -1 : 2;
+        return Long.compareUnsigned(v1, v2) <= 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_UL, IRNode.CALL})
+    int testLongGT(boolean b1, boolean b2) {
+        long v1 = b1 ? Long.MIN_VALUE : Long.MAX_VALUE;
+        long v2 = b2 ? 0 : 2;
+        return Long.compareUnsigned(v1, v2) > 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_UL, IRNode.CALL})
+    int testLongGE(int x, int y) {
+        long v1 = x | Long.MIN_VALUE; // Set the highest bit, make v1 negative
+        long v2 = y & Long.MAX_VALUE; // Unset the highest bit, make v2 non-negative
+        return Long.compareUnsigned(v1, v2) >= 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_UL, IRNode.CALL})
+    int testLongEQ() {
+        return Long.compareUnsigned(oneInline(), 1L) == 0 ? 0 : one();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true"}, failOn = {IRNode.CMP_UL, IRNode.CALL})
+    int testLongNE(boolean b1, boolean b2) {
+        long v1 = b1 ? 1 : -1;
+        long v2 = b2 ? 0 : 2;
+        return Long.compareUnsigned(v1, v2) != 0 ? 0 : one();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/MissedRShiftLShiftIdentity.java b/test/hotspot/jtreg/compiler/c2/gvn/MissedRShiftLShiftIdentity.java
new file mode 100644
index 00000000000..9f8eaab514f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/MissedRShiftLShiftIdentity.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.gvn;
+
+/*
+ * @test
+ * @bug 8374798
+ * @summary RShift(LShift(x, C), C) Identity missed when shift counts are different
+ *          constant nodes for the same effective count (e.g. -1 vs 31) due to
+ *          mask_and_replace_shift_amount normalizing them at different times.
+ *
+ * @run main ${test.main.class}
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+StressIGVN -XX:+StressCCP -XX:VerifyIterativeGVN=1000 -Xbatch -XX:-TieredCompilation
+ *                   -XX:CompileCommand=compileonly,${test.main.class}::test* ${test.main.class}
+ */
+
+public class MissedRShiftLShiftIdentity {
+    public static int iFld = 0;
+
+    public static void test() {
+        int[] iArr = new int[10];
+        int i2 = -1, i3 = 0;
+
+        for (int i11 : iArr) {
+            iFld = i11;
+            for (int i1 = 0; i1 < 10; i1++) {
+                iFld <<= i3;
+                iFld >>= i2; // RShift
+                i3 = i2;
+            }
+            int i16 = 0;
+            do {
+                for (int f3 = 1; f3 < 1; f3 += 3) {
+                    i2 = -1;
+                }
+            } while (++i16 < 5);
+        }
+    }
+
+    public static void main(String[] args) {
+        test();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/MissedURShiftLShiftIdeal.java b/test/hotspot/jtreg/compiler/c2/gvn/MissedURShiftLShiftIdeal.java
new file mode 100644
index 00000000000..774b218b1ca
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/MissedURShiftLShiftIdeal.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.gvn;
+
+/*
+ * @test
+ * @bug 8374798 8377389
+ * @summary URShift(LShift(x, C), C) Ideal optimization missed due to missing IGVN notification:
+ *          when LShift inputs change, its URShift users were not re-queued for the
+ *          (X << C) >>> C -> X & mask optimization.
+ *
+ * @run main ${test.main.class}
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+StressIGVN -XX:+StressCCP -XX:VerifyIterativeGVN=0100 -Xbatch -XX:-TieredCompilation
+ *                   -XX:CompileCommand=compileonly,${test.main.class}::test* ${test.main.class}
+ */
+
+public class MissedURShiftLShiftIdeal {
+    public static int iFld = 0;
+
+    public static void test() {
+        int[] iArr = new int[10];
+        int i2 = -1, i3 = 0;
+
+        for (int i11 : iArr) {
+            iFld = i11;
+            for (int i1 = 0; i1 < 10; i1++) {
+                iFld <<= i3;
+                iFld >>>= i2; // URShift
+                i3 = i2;
+            }
+            int i16 = 0;
+            do {
+                for (int f3 = 1; f3 < 1; f3 += 3) {
+                    i2 = -1;
+                }
+            } while (++i16 < 5);
+        }
+    }
+
+    public static void main(String[] args) {
+        test();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/gvn/TestFindStore.java b/test/hotspot/jtreg/compiler/c2/gvn/TestFindStore.java
new file mode 100644
index 00000000000..aac3e0cf980
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/gvn/TestFindStore.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.gvn;
+
+import compiler.lib.ir_framework.*;
+import jdk.internal.misc.Unsafe;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8376220
+ * @summary Tests that memory accesses can be elided when the compiler can see the value at the
+ *          accessed memory location by walking the memory graph.
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class TestFindStore {
+    private static final Unsafe U = Unsafe.getUnsafe();
+
+    static class P {
+        int v;
+        int u;
+    }
+
+    static final long V_OFFSET = U.objectFieldOffset(P.class, "v");
+    static final long U_OFFSET = U.objectFieldOffset(P.class, "u");
+
+    static class C1 extends P {}
+    static class C2 extends P {}
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED");
+    }
+
+    @Run(test = {"testLoad", "testStore", "testLoadDependent1", "testLoadDependent2", "testLoadArray",
+                 "testLoadArrayOverlap", "testLoadIndependentAliasClasses", "testLoadMismatched",
+                 "testLoadArrayCopy", "testLoadArrayCopyUnknownLength"})
+    public void run() {
+        C1 c1 = new C1();
+        C2 c2 = new C2();
+        int[] a1 = new int[1000];
+        int[] a2 = new int[1000];
+
+        Asserts.assertEQ(0, testLoad(c1, c2, 0, 1));
+        Asserts.assertEQ(0, testStore(c2, 0).v);
+        Asserts.assertEQ(0, testLoadDependent1(c1, c1, 0, 1));
+        Asserts.assertEQ(1, testLoadDependent1(c2, c1, 0, 1));
+        Asserts.assertEQ(1, testLoadDependent2(c1, c1, 0, 1));
+        Asserts.assertEQ(0, testLoadDependent2(c2, c1, 0, 1));
+
+        Asserts.assertEQ(0, testLoadArray(a1, a2, 0, 1));
+        Asserts.assertEQ(0, testLoadArrayOverlap(a1, a2, 2, 0, 1));
+        Asserts.assertEQ(0, testLoadArrayOverlap(a1, a1, 0, 0, 1));
+        Asserts.assertEQ(1, testLoadArrayOverlap(a1, a1, 2, 0, 1));
+        Asserts.assertEQ(0, testLoadIndependentAliasClasses(c1, 0, 1));
+        Asserts.assertNE(0, testLoadMismatched(c1, 0, -1));
+        Asserts.assertEQ(1, testLoadArrayCopy(a1, a2, 1));
+
+        a1[2] = 0;
+        Asserts.assertEQ(1, testLoadArrayCopyUnknownLength(a1, a2, 100, 1));
+        a1[2] = 0;
+        Asserts.assertEQ(0, testLoadArrayCopyUnknownLength(a1, a2, 2, 1));
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD)
+    static int testLoad(C1 c1, C2 c2, int v1, int v2) {
+        // c1 and c2 are provably independent
+        c1.v = v1;
+        c2.v = v2;
+        return c1.v;
+    }
+
+    @Test
+    @IR(counts = {IRNode.STORE, "1"}, phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    static C1 testStore(C2 c2, int v2) {
+        C1 c1 = new C1();
+        c2.v = v2;
+        c1.v = 0;
+        return c1;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD, "1"})
+    static int testLoadDependent1(P p, C1 c1, int v, int v1) {
+        // It cannot be proved that p and c1 are independent
+        c1.v = v1;
+        p.v = v;
+        return c1.v;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD, "1"})
+    static int testLoadDependent2(P p, C1 c1, int v, int v1) {
+        // It cannot be proved that p and c1 are independent
+        p.v = v;
+        c1.v = v1;
+        return p.v;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD)
+    static int testLoadArray(int[] a1, int[] a2, int v1, int v2) {
+        // a1[2] and a2[1] are provably independent
+        a1[2] = v1;
+        a2[1] = v2;
+        return a1[2];
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD, "1"})
+    static int testLoadArrayOverlap(int[] a1, int[] a2, int idx, int v1, int v2) {
+        // Cannot prove that a1[2] and a2[idx] are independent
+        a1[2] = v1;
+        a2[idx] = v2;
+        return a1[2];
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD)
+    static int testLoadIndependentAliasClasses(P p, int v, int u) {
+        p.v = v;
+        p.u = u;
+        return p.v;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD, "1"})
+    static int testLoadMismatched(P p, int v1, int v2) {
+        p.v = v1;
+        U.putIntUnaligned(p, (V_OFFSET + U_OFFSET) / 2, v2);
+        return p.v;
+    }
+
+    @Test
+    @IR(failOn = IRNode.LOAD, applyIf = {"ArrayCopyLoadStoreMaxElem", "<100"})
+    static int testLoadArrayCopy(int[] a1, int[] a2, int v) {
+        a2[2] = v;
+        // Should be large so the compiler does not just transform it into a couple of loads and stores
+        System.arraycopy(a2, 0, a1, 0, 100);
+        return a1[2];
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD, "1"})
+    static int testLoadArrayCopyUnknownLength(int[] a1, int[] a2, int len, int v) {
+        a2[2] = v;
+        // Cannot determine if this overwrites a1[2]
+        System.arraycopy(a2, 0, a1, 0, len);
+        return a1[2];
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/igvn/TestIdealReturnReplaceShiftAmount.java b/test/hotspot/jtreg/compiler/c2/igvn/TestIdealReturnReplaceShiftAmount.java
new file mode 100644
index 00000000000..589da988606
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/igvn/TestIdealReturnReplaceShiftAmount.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.c2.igvn;
+
+/*
+ * @test
+ * @bug 8373251
+ * @summary In Ideal of shift nodes, we call mask_and_replace_shift_amount to reduce the
+ *          shift amount. We need to make sure that Ideal returns something if this is
+ *          the only modification taking place. Use -XX:VerifyIterativeGVN=100000 to
+ *          verify the return value of Ideal if the hash has changed.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:-TieredCompilation
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *      -XX:VerifyIterativeGVN=100000
+ *      ${test.main.class}
+ * @run main ${test.main.class}
+ *
+ */
+
+public class TestIdealReturnReplaceShiftAmount {
+    static long lFld;
+    static int iFld;
+
+    static void testLShiftI() {
+        // we need the loop so that the shift amount replacement happens
+        // during IGVN and not directly at parsing
+        for (int i = 0; i < 5; i++) {
+            iFld <<= (i + 32);
+        }
+    }
+
+    static void testLShiftL() {
+        for (int i = 0; i < 5; i++) {
+            lFld <<= (i + 64);
+        }
+    }
+
+    static void testRShiftI() {
+        for (int i = 0; i < 5; i++) {
+            iFld >>= (i + 32);
+        }
+    }
+
+    static void testRShiftL() {
+        for (int i = 0; i < 5; i++) {
+            lFld >>= (i + 64);
+        }
+    }
+
+    static void testURShiftI() {
+        for (int i = 0; i < 5; i++) {
+            iFld >>>= (i + 32);
+        }
+    }
+
+    static void testURShiftL() {
+        for (int i = 0; i < 5; i++) {
+            lFld >>>= (i + 64);
+        }
+    }
+
+    public static void main(String[] args) {
+        testLShiftI();
+        testLShiftL();
+        testRShiftI();
+        testRShiftL();
+        testURShiftI();
+        testURShiftL();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/igvn/TestMissingAddSubElimination.java b/test/hotspot/jtreg/compiler/c2/igvn/TestMissingAddSubElimination.java
new file mode 100644
index 00000000000..1679e131505
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/igvn/TestMissingAddSubElimination.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.c2.igvn;
+
+import compiler.lib.ir_framework.*;
+import java.util.Random;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+
+/*
+ * @test
+ * @bug 8373731
+ * @summary C2 IGVN should eliminate a + (b - c) after c = a * i folds to a,
+ *          i.e. a + (b - a) -> b
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+public class TestMissingAddSubElimination {
+    private static final Random R = Utils.getRandomInstance();
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("-XX:+IgnoreUnrecognizedVMOptions",
+                                   "-XX:VerifyIterativeGVN=1000",
+                                   "-XX:CompileCommand=compileonly,compiler.c2.igvn.TestMissingAddSubElimination::*");
+    }
+
+    @Run(test = {"testAddI1", "testAddI2", "testAddL1", "testAddL2"})
+    public void runTestAdd(){
+        int x = R.nextInt();
+        int y = R.nextInt();
+        Asserts.assertEQ(testAddI1(x, y), y);
+        Asserts.assertEQ(testAddI2(x, y), x);
+
+        long xl = R.nextLong();
+        long yl = R.nextLong();
+        Asserts.assertEQ(testAddL1(xl, yl), yl);
+        Asserts.assertEQ(testAddL2(xl, yl), xl);
+    }
+
+    // int: x + (y - x) -> y
+    @Test
+    @IR(counts = {
+            IRNode.ADD_I, "0",
+            IRNode.SUB_I, "0",
+            IRNode.MUL_I, "0"
+    })
+    int testAddI1(int x, int y) {
+        int i;
+        for (i = -10; i < 1; i++) { }
+        int c = x * i;
+        return x + (y - c);
+    }
+
+    // int: (x - y) + y -> x
+    @Test
+    @IR(counts = {
+            IRNode.ADD_I, "0",
+            IRNode.SUB_I, "0",
+            IRNode.MUL_I, "0"
+    })
+    int testAddI2(int x, int y) {
+        int i;
+        for (i = -10; i < 1; i++) { }
+        int c =  y * i;
+        return (x - c) + y;
+    }
+
+    // long: x + (y - x) -> y
+    @Test
+    @IR(counts = {
+            IRNode.ADD_L, "0",
+            IRNode.SUB_L, "0",
+            IRNode.MUL_L, "0"
+    })
+    long testAddL1(long x, long y) {
+        int i;
+        for (i = -10; i < 1; i++) { }
+        long c = x * i;
+        return x + (y - c);
+    }
+
+    // long: (x - y) + y -> x
+    @Test
+    @IR(counts = {
+            IRNode.ADD_L, "0",
+            IRNode.SUB_L, "0",
+            IRNode.MUL_L, "0"
+    })
+    long testAddL2(long x, long y) {
+        int i;
+        for (i = -10; i < 1; i++) { }
+        long c =  y * i;
+        return (x - c) + y;
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/c2/igvn/TestMissingOptReplaceShiftAmount.java b/test/hotspot/jtreg/compiler/c2/igvn/TestMissingOptReplaceShiftAmount.java
new file mode 100644
index 00000000000..a2d6505c311
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/igvn/TestMissingOptReplaceShiftAmount.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.c2.igvn;
+
+/*
+ * @test
+ * @bug 8373251
+ * @summary In Ideal of shift nodes, we call mask_and_replace_shift_amount to reduce the
+ *          shift amount. We need to make sure that the updates are propagated if this is
+ *          the only modification taking place. Use -XX:VerifyIterativeGVN=1110 to
+ *          catch missing optimizations.
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:-TieredCompilation
+ *      -XX:+StressIGVN -XX:StressSeed=342568167
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *      -XX:VerifyIterativeGVN=1110
+ *      ${test.main.class}
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
+ *      -Xcomp -XX:-TieredCompilation
+ *      -XX:+StressIGVN
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test*
+ *      -XX:VerifyIterativeGVN=1110
+ *      ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+public class TestMissingOptReplaceShiftAmount {
+    static long lFld;
+    static boolean flag;
+
+    static void test() {
+        int x = 67;
+        for (int i = 0; i < 20; i++) {
+            if (flag) {
+                x = 0;
+            }
+            lFld <<= x;
+            lFld >>>= x;
+        }
+    }
+
+    public static void main(String[] args) {
+        test();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/CMoveLConstants.java b/test/hotspot/jtreg/compiler/c2/irTests/CMoveLConstants.java
index e62e1adc8d0..cf86764aecc 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/CMoveLConstants.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/CMoveLConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,31 +39,56 @@ public class CMoveLConstants {
     }
 
     @Test
-    @IR(applyIfPlatform = {"x64", "true"}, counts = {IRNode.X86_CMOVEL_IMM01, "1"}, phase = CompilePhase.FINAL_CODE)
+    @IR(counts = {IRNode.X86_CMOVEL_IMM01, "1"},
+        applyIfPlatform = {"x64", "true"},
+        phase = CompilePhase.FINAL_CODE)
     public static long testSigned(int a, int b) {
         return a > b ? 1L : 0L;
     }
 
     @Test
-    @IR(applyIfPlatform = {"x64", "true"}, counts = {IRNode.X86_CMOVEL_IMM01U, "1"}, phase = CompilePhase.FINAL_CODE)
+    @IR(counts = {IRNode.X86_CMOVEL_IMM01U, "1"},
+        applyIfPlatform = {"x64", "true"},
+        phase = CompilePhase.FINAL_CODE)
     public static long testUnsigned(int a, int b) {
         return Integer.compareUnsigned(a, b) > 0 ? 1L : 0L;
     }
 
     @Test
-    @IR(applyIfPlatform = {"x64", "true"}, counts = {IRNode.X86_CMOVEL_IMM01UCF, "1"}, phase = CompilePhase.FINAL_CODE)
+    @IR(counts = {IRNode.X86_CMOVEL_IMM01UCF, "1"},
+        applyIfPlatform = {"x64", "true"},
+        applyIfCPUFeatureOr = {"apx_f", "false", "avx10_2", "false"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(counts = {IRNode.X86_CMOVEL_IMM01UCFE, "1"},
+        applyIfPlatform = {"x64", "true"},
+        applyIfCPUFeatureAnd = {"apx_f", "true", "avx10_2", "true"},
+        phase = CompilePhase.FINAL_CODE)
     public static long testFloat(float a, float b) {
         return a > b ? 1L : 0L;
     }
 
+    @Test
+    @IR(counts = {IRNode.X86_CMOVEL_IMM01UCF, "1"},
+        applyIfPlatform = {"x64", "true"},
+        applyIfCPUFeatureOr = {"apx_f", "false", "avx10_2", "false"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(counts = {IRNode.X86_CMOVEL_IMM01UCFE, "1"},
+        applyIfPlatform = {"x64", "true"},
+        applyIfCPUFeatureAnd = {"apx_f", "true", "avx10_2", "true"},
+        phase = CompilePhase.FINAL_CODE)
+    public static long testDouble(double a, double b) {
+        return a > b ? 1L : 0L;
+    }
+
     @DontCompile
     public void assertResults(int a, int b) {
         Asserts.assertEQ(a > b ? 1L : 0L, testSigned(a, b));
         Asserts.assertEQ(Integer.compareUnsigned(a, b) > 0 ? 1L : 0L, testUnsigned(a, b));
         Asserts.assertEQ((float) a > (float) b ? 1L : 0L, testFloat(a, b));
+        Asserts.assertEQ((double) a > (double) b ? 1L : 0L, testDouble(a, b));
     }
 
-    @Run(test = {"testSigned", "testUnsigned", "testFloat"})
+    @Run(test = {"testSigned", "testUnsigned", "testFloat", "testDouble"})
     public void runMethod() {
         assertResults(10, 20);
         assertResults(20, 10);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ConvD2FIdealizationStress.java b/test/hotspot/jtreg/compiler/c2/irTests/ConvD2FIdealizationStress.java
new file mode 100644
index 00000000000..ac0df25ff86
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ConvD2FIdealizationStress.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+import java.util.Random;
+import jdk.test.lib.Utils;
+
+/*
+ * @test
+ * @bug 8375633
+ * @key randomness
+ * @summary Test that ConvD2F::Ideal optimization is not missed with incremental inlining.
+ *          AlwaysIncrementalInline is not required but deterministically defers even
+ *          small methods, making this test reliable.
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class ConvD2FIdealizationStress {
+
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("-XX:-TieredCompilation",
+                                   "-XX:+IgnoreUnrecognizedVMOptions",
+                                   "-XX:+AlwaysIncrementalInline",
+                                   "-XX:VerifyIterativeGVN=1110");
+    }
+
+    // Deferred by AlwaysIncrementalInline; ConvF2D appears only after inlining.
+    static double toDouble(float x) {
+        return (double) x;
+    }
+
+    // ConvD2F(SqrtD(ConvF2D(x))) => SqrtF(x)
+    // Math.sqrt (intrinsic) is expanded at parse time; toDouble is deferred.
+    @Test
+    @IR(counts = {IRNode.SQRT_F, ">=1"},
+        failOn = {IRNode.CONV_D2F, IRNode.SQRT_D, IRNode.CONV_F2D})
+    public static float testSqrtConversion(float x) {
+        return (float) Math.sqrt(toDouble(x));
+    }
+
+    @Run(test = "testSqrtConversion")
+    public void runSqrtConversion() {
+        float input = RANDOM.nextFloat();
+        checkSqrtConversion(input, testSqrtConversion(input));
+    }
+
+    @DontCompile
+    public void checkSqrtConversion(float input, float result) {
+        Asserts.assertEQ((float) Math.sqrt(input), result);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationStress.java b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationStress.java
new file mode 100644
index 00000000000..941077362d5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationStress.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+import java.util.Random;
+import jdk.test.lib.Utils;
+
+/*
+ * @test
+ * @bug 8375633
+ * @key randomness
+ * @summary Test that ConvF2HF::Ideal optimization is not missed with incremental inlining.
+ *          AlwaysIncrementalInline is not required but deterministically defers even
+ *          small methods, making this test reliable.
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class ConvF2HFIdealizationStress {
+
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    private short srcBits;
+    private short twoBits;
+    private short actualBits;
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("-XX:-TieredCompilation",
+                                   "-XX:+IgnoreUnrecognizedVMOptions",
+                                   "-XX:+AlwaysIncrementalInline",
+                                   "-XX:VerifyIterativeGVN=1110");
+    }
+
+    public ConvF2HFIdealizationStress() {
+        srcBits = Float.floatToFloat16(RANDOM.nextFloat());
+        twoBits = Float.floatToFloat16(2.0f);
+    }
+
+    // Deferred by AlwaysIncrementalInline; ConvHF2F appears only after inlining.
+    static float toFloat(short hf) {
+        return Float.float16ToFloat(hf);
+    }
+
+    // ConvF2HF(MulF(ConvHF2F(a), ConvHF2F(b))) => MulHF(a, b)
+    // Float.floatToFloat16 (intrinsic) is expanded at parse time; toFloat is deferred.
+    @Test
+    @IR(counts = {IRNode.MUL_HF, "1"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"},
+        failOn = {IRNode.CONV_F2HF})
+    @IR(counts = {IRNode.MUL_HF, "1"},
+        applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"},
+        failOn = {IRNode.CONV_F2HF})
+    public void testMultiply() {
+        actualBits = Float.floatToFloat16(toFloat(srcBits) * toFloat(twoBits));
+    }
+
+    @Check(test = "testMultiply")
+    public void checkMultiply() {
+        float twice = Float.float16ToFloat(srcBits) * Float.float16ToFloat(twoBits);
+        short expected = Float.floatToFloat16(twice);
+        Asserts.assertEQ(expected, actualBits);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java b/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java
index 3aee78e9d6a..81a88791b07 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestPushAddThruCast.java
@@ -86,7 +86,7 @@ public class TestPushAddThruCast {
     // Test commoning of Casts after loop opts when they are at the same control
     @Test
     @IR(phase = CompilePhase.ITER_GVN1, counts = { IRNode.CAST_II, "4" })
-    @IR(phase = CompilePhase.OPTIMIZE_FINISHED, counts = { IRNode.CAST_II, "2" })
+    @IR(phase = CompilePhase.OPTIMIZE_FINISHED, counts = { IRNode.CAST_II, "3" })
     public static int test3() {
         int j = Objects.checkIndex(i - 3, length);
         j += Objects.checkIndex(i, length);
diff --git a/test/hotspot/jtreg/compiler/ccp/TestCmpUMonotonicity.java b/test/hotspot/jtreg/compiler/ccp/TestCmpUMonotonicity.java
new file mode 100644
index 00000000000..5ebdd9469fc
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/ccp/TestCmpUMonotonicity.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.ccp;
+
+/*
+ * @test
+ * @bug 8375653
+ * @summary Test that CmpUNode::sub conforms monotonicity
+ *
+ * @run main ${test.main.class}
+ * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,${test.main.class}::test* ${test.main.class}
+ */
+public class TestCmpUMonotonicity {
+    public static void main(String[] args) {
+        for (int i = 0; i < 20000; i++) {
+            testInt(true, 1, 100, 2);
+            testInt(false, 1, 100, 2);
+            testLong(true, 1, 100, 2);
+            testLong(false, 1, 100, 2);
+        }
+    }
+
+    private static int testInt(boolean b, int start, int limit, int step) {
+        int v2 = b ? 1 : -1;
+        int v1 = 0;
+        for (int i = start; i < limit; i *= step) {
+            if (Integer.compareUnsigned(v1, v2) < 0) {
+                v1 = 2;
+            } else {
+                v1 = 0;
+            }
+        }
+        return v1;
+    }
+
+    private static long testLong(boolean b, int start, int limit, int step) {
+        long v2 = b ? 1 : -1;
+        long v1 = 0;
+        for (int i = start; i < limit; i *= step) {
+            if (Long.compareUnsigned(v1, v2) < 0) {
+                v1 = 2;
+            } else {
+                v1 = 0;
+            }
+        }
+        return v1;
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java b/test/hotspot/jtreg/compiler/ccp/TestWrongXorIWiden.java
similarity index 55%
rename from test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java
rename to test/hotspot/jtreg/compiler/ccp/TestWrongXorIWiden.java
index 755d64bf51b..3b058758beb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWb.java
+++ b/test/hotspot/jtreg/compiler/ccp/TestWrongXorIWiden.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,24 +19,36 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
-import jdk.test.whitebox.WhiteBox;
+package compiler.ccp;
 
-public class SharedStringsWb {
-    public static void main(String[] args) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        String s = "shared_test_string_unique_14325";
-        s = s.intern();
-        if (wb.areSharedStringsMapped()) {
-            if (wb.isSharedInternedString(s)) {
-                System.out.println("Found shared string.");
-            } else {
-                throw new RuntimeException("String is not shared.");
+/*
+ * @test
+ * @bug 8374180
+ * @summary Test that _widen is set correctly in XorI::add_ring() to ensure monotonicity.
+ * @run main/othervm -XX:CompileCommand=compileonly,${test.main.class}::* -Xcomp ${test.main.class}
+ */
+public class TestWrongXorIWiden {
+    static byte byFld;
+
+    public static void main(String[] strArr) {
+        test();
+    }
+
+    static void test() {
+        int k, i17 = 0;
+        long lArr[] = new long[400];
+        for (int i = 9; i < 54; ++i) {
+            for (int j = 7; j > 1; j--) {
+                for (k = 1; k < 2; k++) {
+                    i17 >>= i;
+                }
+                byFld += j ^ i17;
+                for (int a = 1; a < 2; a++) {
+                    i17 = k;
+                }
             }
         }
     }
 }
-
-
diff --git a/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java b/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
index 06b51b1641d..a99f6b83cc6 100644
--- a/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
+++ b/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test CheckSegmentedCodeCache
- * @bug 8015774
+ * @bug 8015774 8375598
  * @summary Checks VM options related to the segmented code cache
  * @library /test/lib
  * @requires vm.flagless
@@ -247,5 +247,12 @@ public class CheckSegmentedCodeCache {
                                                               "-XX:+PrintFlagsFinal",
                                                               "-version");
         verifyCodeHeapSize(pb, "NonNMethodCodeHeapSize", 83886080);
+
+        // A large NonNMethodCodeHeapSize can make the total code cache exceed the platform limit.
+        // The VM should fail fast during initialization.
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:+SegmentedCodeCache",
+                                                              "-XX:NonNMethodCodeHeapSize=3G",
+                                                              "-version");
+        failsWith(pb, "Code cache size exceeds platform limit");
     }
 }
diff --git a/test/hotspot/jtreg/compiler/codecache/CodeCacheSegmentSizeTest.java b/test/hotspot/jtreg/compiler/codecache/CodeCacheSegmentSizeTest.java
index 5531bdd1517..b6d051fcd06 100644
--- a/test/hotspot/jtreg/compiler/codecache/CodeCacheSegmentSizeTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/CodeCacheSegmentSizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * Copyright (c) 2025, 2026, IBM Corporation. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *          - fails gracefully for invalid value
  *          - succeeds for valid value
  * @library /test/lib
+ * @requires vm.flagless
  * @run driver CodeCacheSegmentSizeTest
  */
 
diff --git a/test/hotspot/jtreg/compiler/corelibs/OptionalFold.java b/test/hotspot/jtreg/compiler/corelibs/OptionalFold.java
new file mode 100644
index 00000000000..1f850aaf7cd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/corelibs/OptionalFold.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.corelibs;
+
+import java.util.Optional;
+
+import compiler.lib.ir_framework.Check;
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.IRNode;
+import compiler.lib.ir_framework.Test;
+import compiler.lib.ir_framework.TestFramework;
+
+/*
+ * @test
+ * @bug 8372696
+ * @summary Verify constant folding for Optional, both present and absent
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class OptionalFold {
+
+    public static void main(String[] args) {
+        // Somehow fails with -XX:-TieredCompilation
+        TestFramework.runWithFlags("-XX:+TieredCompilation");
+    }
+
+    // Ensure both present and empty values can fold
+    static final Optional<Integer> ONE = Optional.of(5), TWO = Optional.empty();
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I})
+    public int testSum() {
+        return ONE.orElse(7) + TWO.orElse(12);
+    }
+
+    @Check(test = "testSum")
+    public void checkTestSum(int res) {
+        if (res != 5 + 12) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
+}
diff --git a/test/jdk/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java b/test/hotspot/jtreg/compiler/cpuflags/TestUseAESCTRIntrinsicsWithUseAESDisabled.java
similarity index 63%
rename from test/jdk/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java
rename to test/hotspot/jtreg/compiler/cpuflags/TestUseAESCTRIntrinsicsWithUseAESDisabled.java
index 10deaf523e9..b6c28bb6a3b 100644
--- a/test/jdk/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java
+++ b/test/hotspot/jtreg/compiler/cpuflags/TestUseAESCTRIntrinsicsWithUseAESDisabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,23 +20,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import javax.sql.rowset.serial.SerialClob;
-import javax.sql.rowset.serial.SerialException;
 
 /**
  * @test
- * @bug 7077451
- * @summary tests if the correct exception is thrown when calling method setAsciiStream() on SerialClob
+ * @bug 8374516
+ * @summary Regression test for -XX:+UseAESCTRIntrinsics -XX:-UseAES crash
+ * @requires os.arch=="amd64" | os.arch=="x86_64"
+ * @requires vm.debug
+ * @run main/othervm -XX:+UseAESCTRIntrinsics -XX:-UseAES compiler.cpuflags.TestUseAESCTRIntrinsicsWithUseAESDisabled
  */
-public class SetAsciiStream {
+package compiler.cpuflags;
 
-    public static void main(String[] args) throws Exception {
-        SerialClob clob = new SerialClob(new char[0]);
-        try {
-            clob.setAsciiStream(0);
-        } catch (SerialException e) {
-             System.out.println("Test PASSED");
-        }
+public class TestUseAESCTRIntrinsicsWithUseAESDisabled {
+
+    public static void main(String[] args) {
+        System.out.println("passed");
     }
-
-}
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestCanReduceCheckUsersDifferentIfs.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestCanReduceCheckUsersDifferentIfs.java
index b71f9b2cef2..9e2d3eeb752 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestCanReduceCheckUsersDifferentIfs.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestCanReduceCheckUsersDifferentIfs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@ public class TestCanReduceCheckUsersDifferentIfs {
         // (6) CastPP(phi1) ends up at IfFalse of OuterStripMinedLoopEnd of loop (L).
         // (7) EA tries to reduce phi1(CheckCastPP(B), CheckCastPP(c)) and looks at
         //     OuterStripMinedLoopEnd and asserts that if it's not an IfNode that it has
-        //     an OpaqueNotNull which obviously is not the case and the assert fails.
+        //     an OpaqueConstantBool which obviously is not the case and the assert fails.
 
         // (5) Found to be false after PhaseIdealLoop before EA and is folded away.
         if (y == 76) {
@@ -77,7 +77,7 @@ public class TestCanReduceCheckUsersDifferentIfs {
     }
 
     // Same as testOuterStripMinedLoopEnd() but we find in (7) a ParsePredicate from the
-    // removed loop (L) which also does not have an OpaqueNotNull and the assert fails.
+    // removed loop (L) which also does not have an OpaqueConstantBool and the assert fails.
     static void testParsePredicate() {
         A a = flag ? new B() : new C();
 
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestSplitLoadThroughPhiDuringEA.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestSplitLoadThroughPhiDuringEA.java
new file mode 100644
index 00000000000..1221c1b8064
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestSplitLoadThroughPhiDuringEA.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.escapeAnalysis;
+
+import java.util.Objects;
+
+/*
+ * @test
+ * @bug 8374435
+ * @summary assert during escape analysis when splitting a Load through a Phi because the input of
+ *          the result Phi is a Load not from an AddP
+ * @run main/othervm -XX:-UseOnStackReplacement -XX:-UseCompressedOops ${test.main.class}
+ */
+public class TestSplitLoadThroughPhiDuringEA {
+    static class Holder {
+        Object o;
+    }
+
+    public static void main(String[] args) {
+        Object o = new Object();
+        Holder h = new Holder();
+        for (int i = 0; i < 20000; i++) {
+            test(true, h, o);
+            test(false, h, o);
+        }
+    }
+
+    private static Object test(boolean b, Holder h, Object o) {
+        h = Objects.requireNonNull(h);
+        if (b) {
+            h = new Holder();
+            // This access has the pattern LoadP -> LoadP, which upsets the compiler because the
+            // pointer input of a LoadP is not an AddP
+            h.o = o.getClass();
+        }
+        return h.o;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/gallery/ParticleLife.java b/test/hotspot/jtreg/compiler/gallery/ParticleLife.java
new file mode 100644
index 00000000000..b6c393d328b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/gallery/ParticleLife.java
@@ -0,0 +1,812 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.gallery;
+
+import java.util.Random;
+
+import jdk.incubator.vector.*;
+
+import javax.swing.*;
+
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Dimension;
+import java.awt.BorderLayout;
+import java.awt.RenderingHints;
+import java.awt.geom.Ellipse2D;
+
+/**
+ * This is a visual demo of the Vector API, presenting an N-Body simulation,
+ * where every body (particle) interacts with every other body.
+ *
+ * This is a stand-alone test that you can run directly with:
+ *   java --add-modules=jdk.incubator.vector ParticleLife.java
+ *
+ * On x86, you can also play with the UseAVX flag:
+ *   java --add-modules=jdk.incubator.vector -XX:UseAVX=2 ParticleLife.java
+ *
+ * There is a JTREG test that automatically runs this demo,
+ * see {@link TestParticleLife}.
+ *
+ * The motivation for this demo is to present a realistic computation,
+ * such as a physics simulation, but which is currently not auto
+ * vectorized. It is thus a good candidate for the use of the Vector API.
+ * This demo is based on the work of Tom Mohr and others before him:
+ *   https://particle-life.com/
+ *   https://www.youtube.com/@tom-mohr
+ *
+ * If you are interested in understanding the components, then look at these:
+ * - State.update: one step in the simulation. This consists of two parts:
+ *   - updateForce*: This computes the forces between all the particles, which affects the velocities.
+ *                   We have multiple implementations (scalar and Vector API).
+ *                   This is the most expensive part of the simulation.
+ *   - updatePositions: The velocities are added to the position.
+ */
+public class ParticleLife {
+    public static final Random RANDOM = new Random(123);
+
+    // Increasing this number will make the demo slower.
+    public static int NUMBER_OF_PARTICLES = 2560;
+    public static int NUMBER_OF_GROUPS = 50;
+
+    public static float ZOOM = 1500f;
+
+    public static float SCALE1 = 0.02f;
+    public static float SCALE2 = 0.04f;
+    public static float SCALE3 = 1f;
+    public static float FORCE_PARTICLE = 0.0001f;
+    public static float FORCE_ORIGIN = 0.05f;
+
+    // Dampening factor, applied to the velocity.
+    // 0: no velocity carried to next update, particles have no momentum
+    // 1: no dampening, can lead to increase in energy in the system over time.
+    public static float DAMPENING = 0.3f;
+
+    // Time step size of each update. Larger makes the simulation faster.
+    // But if it is too large, this can lead to numerical instability.
+    public static float DT = 1f;
+
+    enum Implementation {
+        Scalar, VectorAPI_Inner_Gather, VectorAPI_Inner_Rearranged, VectorAPI_Outer
+    }
+
+    public static Implementation IMPLEMENTATION = Implementation.Scalar;
+
+    enum PoleGen {
+        Default, Random, Rainbow, Sparse
+    }
+
+    public static PoleGen POLE_GEN = PoleGen.Default;
+
+    private static final VectorSpecies<Float> SPECIES_F = FloatVector.SPECIES_PREFERRED;
+
+    public static State STATE = new State();
+
+    static void main() {
+        System.out.println("Welcome to the Particle Life Demo!");
+
+        // Set up a panel we can draw on, and put it in a window.
+        JFrame frame = new JFrame("Particle Life Demo (VectorAPI)");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setSize(1400, 1000);
+        frame.setResizable(false);
+        frame.setLayout(new BorderLayout());
+
+        ParticlePanel panel = new ParticlePanel();
+        panel.setPreferredSize(new Dimension(1000, 0));
+
+        JPanel controlPanel = new JPanel();
+        controlPanel.setLayout(null);
+        controlPanel.setPreferredSize(new Dimension(400, 0));
+
+        int y = 10;
+        // ---------------------------- Reset Button -------------------------
+        JButton button = new JButton("Reset");
+        button.setBounds(10, y, 120, 30);
+        button.setToolTipText("Reset state, with new numbers of particles and groups, and new poles.");
+        controlPanel.add(button);
+
+        button.addActionListener(_ -> { STATE = new State(); });
+        y += 40;
+
+        // ---------------------------- Computation Selector -------------------------
+        {
+            JLabel label = new JLabel("Implementation");
+            label.setBounds(10, y, 150, 30);
+            controlPanel.add(label);
+
+            String[] options = {"Scalar", "VectorAPI Inner Gather", "VectorAPI Inner Rearranged", "VectorAPI Outer"};
+            JComboBox<String> comboBox = new JComboBox<>(options);
+            comboBox.setBounds(160, y, 210, 30);
+            comboBox.setToolTipText("Choose the implementation of the force computation. Using the VectorAPI should be faster.");
+            controlPanel.add(comboBox);
+
+            comboBox.addActionListener(_ -> {
+                String selected = (String) comboBox.getSelectedItem();
+                switch (selected) {
+                    case "Scalar"                     -> IMPLEMENTATION = Implementation.Scalar;
+                    case "VectorAPI Inner Gather"     -> IMPLEMENTATION = Implementation.VectorAPI_Inner_Gather;
+                    case "VectorAPI Inner Rearranged" -> IMPLEMENTATION = Implementation.VectorAPI_Inner_Rearranged;
+                    case "VectorAPI Outer"            -> IMPLEMENTATION = Implementation.VectorAPI_Outer;
+                }
+            });
+        }
+        y += 40;
+
+        // ---------------------------- Zoom Slider -------------------------
+        JLabel zoomLabel = new JLabel("Zoom");
+        zoomLabel.setBounds(10, y, 80, 30);
+        controlPanel.add(zoomLabel);
+
+        JSlider zoomSlider = new JSlider(JSlider.HORIZONTAL, 10, 2500, (int)ZOOM);
+        zoomSlider.setBounds(160, y, 200, 30);
+        zoomSlider.setMajorTickSpacing(100);
+        zoomSlider.setPaintTicks(false);
+        zoomSlider.setPaintLabels(false);
+        controlPanel.add(zoomSlider);
+
+        zoomSlider.addChangeListener(_ -> {
+            ZOOM = zoomSlider.getValue();
+        });
+        zoomSlider.setValue((int)ZOOM);
+        y += 40;
+
+        // ---------------------------- :Particles Slider -------------------------
+        JLabel particlesLabel = new JLabel("Particles");
+        particlesLabel.setBounds(10, y, 150, 30);
+        controlPanel.add(particlesLabel);
+
+        JSlider particlesSlider = new JSlider(JSlider.HORIZONTAL, 64, 10000, 64);
+        particlesSlider.setBounds(160, y, 200, 30);
+        particlesSlider.setMajorTickSpacing(100);
+        particlesSlider.setPaintTicks(false);
+        particlesSlider.setPaintLabels(false);
+        particlesSlider.setToolTipText("More particles make the simulation slower. Only applied on Reset.");
+        controlPanel.add(particlesSlider);
+
+        particlesSlider.addChangeListener(_ -> {
+            NUMBER_OF_PARTICLES = particlesSlider.getValue() / 64 * 64;
+            particlesLabel.setText("Particles = " + NUMBER_OF_PARTICLES);
+        });
+        particlesSlider.setValue(NUMBER_OF_PARTICLES);
+        y += 40;
+
+        // ---------------------------- Groups Slider -------------------------
+        JLabel groupsLabel = new JLabel("Groups");
+        groupsLabel.setBounds(10, y, 150, 30);
+        controlPanel.add(groupsLabel);
+
+        JSlider groupsSlider = new JSlider(JSlider.HORIZONTAL, 1, 100, 1);
+        groupsSlider.setBounds(160, y, 200, 30);
+        groupsSlider.setMajorTickSpacing(100);
+        groupsSlider.setPaintTicks(false);
+        groupsSlider.setPaintLabels(false);
+        groupsSlider.setToolTipText("More groups lead to more complex behavior. Only applied on Reset.");
+        controlPanel.add(groupsSlider);
+
+        groupsSlider.addChangeListener(_ -> {
+            NUMBER_OF_GROUPS = groupsSlider.getValue();
+            groupsLabel.setText("Groups = " + NUMBER_OF_GROUPS);
+        });
+        groupsSlider.setValue(NUMBER_OF_GROUPS);
+        y += 40;
+
+        // ---------------------------- Pole Gen Selector -------------------------
+        {
+            JLabel label = new JLabel("Poles");
+            label.setBounds(10, y, 150, 30);
+            controlPanel.add(label);
+
+            String[] options = {"Default", "Random", "Rainbow", "Sparse"};
+            JComboBox<String> comboBox = new JComboBox<>(options);
+            comboBox.setBounds(160, y, 210, 30);
+            comboBox.setToolTipText("Poles define attraction/repulsion between groups. Only applied on Reset.");
+            controlPanel.add(comboBox);
+
+            comboBox.addActionListener(_ -> {
+                String selected = (String) comboBox.getSelectedItem();
+                switch (selected) {
+                    case "Default" -> POLE_GEN = PoleGen.Default;
+                    case "Random"  -> POLE_GEN = PoleGen.Random;
+                    case "Rainbow" -> POLE_GEN = PoleGen.Rainbow;
+                    case "Sparse"  -> POLE_GEN = PoleGen.Sparse;
+                }
+            });
+        }
+        y += 40;
+
+        // ---------------------------- Scale1 Slider -------------------------
+        JLabel scale1Label = new JLabel("scale1");
+        scale1Label.setBounds(10, y, 150, 30);
+        controlPanel.add(scale1Label);
+
+        JSlider scale1Slider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        scale1Slider.setBounds(160, y, 200, 30);
+        scale1Slider.setMajorTickSpacing(100);
+        scale1Slider.setPaintTicks(false);
+        scale1Slider.setPaintLabels(false);
+        scale1Slider.setToolTipText("Defines (inner) radius: repulsion between all particles.");
+        controlPanel.add(scale1Slider);
+
+        scale1Slider.addChangeListener(_ -> {
+            SCALE1 = scale1Slider.getValue() * 0.002f + 0.001f;
+            scale1Label.setText("scale1 = " + String.format("%.4f", SCALE1));
+        });
+        scale1Slider.setValue(10);
+        y += 40;
+
+        // ---------------------------- Scale2 Slider -------------------------
+        JLabel scale2Label = new JLabel("scale2");
+        scale2Label.setBounds(10, y, 150, 30);
+        controlPanel.add(scale2Label);
+
+        JSlider scale2Slider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        scale2Slider.setBounds(160, y, 200, 30);
+        scale2Slider.setMajorTickSpacing(100);
+        scale2Slider.setPaintTicks(false);
+        scale2Slider.setPaintLabels(false);
+        scale2Slider.setToolTipText("Defines (outer) radius: attraction/repulsion depending on poles/groups.");
+        controlPanel.add(scale2Slider);
+
+        scale2Slider.addChangeListener(_ -> {
+            SCALE2 = scale2Slider.getValue() * 0.002f + 0.001f;
+            scale2Label.setText("scale2 = " + String.format("%.4f", SCALE2));
+        });
+        scale2Slider.setValue(20);
+        y += 40;
+
+        // ---------------------------- Scale3 Slider -------------------------
+        JLabel scale3Label = new JLabel("scale3");
+        scale3Label.setBounds(10, y, 150, 30);
+        controlPanel.add(scale3Label);
+
+        JSlider scale3Slider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        scale3Slider.setBounds(160, y, 200, 30);
+        scale3Slider.setMajorTickSpacing(101);
+        scale3Slider.setPaintTicks(false);
+        scale3Slider.setPaintLabels(false);
+        scale3Slider.setToolTipText("Poles factor: adjust attraction/repulsion strenght.");
+        controlPanel.add(scale3Slider);
+
+        scale3Slider.addChangeListener(_ -> {
+            SCALE3 = scale3Slider.getValue() * 0.02f;
+            scale3Label.setText("scale3 = " + String.format("%.4f", SCALE3));
+        });
+        scale3Slider.setValue(50);
+        y += 40;
+
+        // ---------------------------- FORCE_PARTICLE Slider -------------------------
+        JLabel forceParticlesLabel = new JLabel("fParticles");
+        forceParticlesLabel.setBounds(10, y, 150, 30);
+        controlPanel.add(forceParticlesLabel);
+
+        JSlider forceParticlesSlider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        forceParticlesSlider.setBounds(160, y, 200, 30);
+        forceParticlesSlider.setMajorTickSpacing(100);
+        forceParticlesSlider.setPaintTicks(false);
+        forceParticlesSlider.setPaintLabels(false);
+        forceParticlesSlider.setToolTipText("Particles force factor: adjust force strength between particles.");
+        controlPanel.add(forceParticlesSlider);
+
+        forceParticlesSlider.addChangeListener(_ -> {
+            FORCE_PARTICLE = forceParticlesSlider.getValue() * 0.00001f;
+            forceParticlesLabel.setText("fParticles = " + String.format("%.5f", FORCE_PARTICLE));
+        });
+        forceParticlesSlider.setValue(10);
+        y += 40;
+
+        // ---------------------------- FORCE_ORIGIN Slider -------------------------
+        JLabel forceOriginLabel = new JLabel("fOrigin");
+        forceOriginLabel.setBounds(10, y, 150, 30);
+        controlPanel.add(forceOriginLabel);
+
+        JSlider forceOriginSlider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        forceOriginSlider.setBounds(160, y, 200, 30);
+        forceOriginSlider.setMajorTickSpacing(100);
+        forceOriginSlider.setPaintTicks(false);
+        forceOriginSlider.setPaintLabels(false);
+        forceOriginSlider.setToolTipText("Origin force factor: adjust force attracting all particles to the center/origin.");
+        controlPanel.add(forceOriginSlider);
+
+        forceOriginSlider.addChangeListener(_ -> {
+            FORCE_ORIGIN = forceOriginSlider.getValue() * 0.0005f;
+            forceOriginLabel.setText("fOrigin = " + String.format("%.5f", FORCE_ORIGIN));
+        });
+        forceOriginSlider.setValue(50);
+        y += 40;
+
+        // ---------------------------- DAMPENING Slider -------------------------
+        JLabel dampeningLabel = new JLabel("dampening");
+        dampeningLabel.setBounds(10, y, 150, 30);
+        controlPanel.add(dampeningLabel);
+
+        JSlider dampeningSlider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        dampeningSlider.setBounds(160, y, 200, 30);
+        dampeningSlider.setMajorTickSpacing(100);
+        dampeningSlider.setPaintTicks(false);
+        dampeningSlider.setPaintLabels(false);
+        dampeningSlider.setToolTipText("Dampening removes energy from the system over time. 1 = no dampening.");
+        controlPanel.add(dampeningSlider);
+
+        dampeningSlider.addChangeListener(_ -> {
+            DAMPENING = dampeningSlider.getValue() * 0.01f;
+            dampeningLabel.setText("dampening = " + String.format("%.5f", DAMPENING));
+        });
+        dampeningSlider.setValue(30);
+        y += 40;
+
+        // ---------------------------- DT Slider -------------------------
+        JLabel dtLabel = new JLabel("dt");
+        dtLabel.setBounds(10, y, 150, 30);
+        controlPanel.add(dtLabel);
+
+        JSlider dtSlider = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+        dtSlider.setBounds(160, y, 200, 30);
+        dtSlider.setMajorTickSpacing(100);
+        dtSlider.setPaintTicks(false);
+        dtSlider.setPaintLabels(false);
+        dtSlider.setToolTipText("Time delta between simulation steps. Small values lead to slow simulation, large values can lead to simulation instability.");
+        controlPanel.add(dtSlider);
+
+        dtSlider.addChangeListener(_ -> {
+            DT = dtSlider.getValue() * 0.04f + 0.001f;
+            dtLabel.setText("dt = " + String.format("%.3f", DT));
+        });
+        dtSlider.setValue(25);
+        y += 40;
+
+        // ---------------------------- Force Panel -------------------------
+        ForcePanel forcePanel = new ForcePanel();
+        forcePanel.setBounds(10, y, 350, 350);
+        forcePanel.setToolTipText("Displays the attraction/repulsion between the groups. Only updated on Reset.");
+        controlPanel.add(forcePanel);
+        y += 360;
+
+        frame.add(panel, BorderLayout.WEST);
+        frame.add(controlPanel, BorderLayout.CENTER);
+        frame.setVisible(true);
+
+        System.out.println("Running Demo...");
+        try {
+            // Tight loop where we redraw the panel as fast as possible.
+            while (true) {
+                Thread.sleep(1);
+                STATE.update();
+                panel.repaint();
+                forcePanel.repaint();
+            }
+        } catch (InterruptedException e) {
+            System.out.println("Interrputed, terminating demo.");
+        } finally {
+            System.out.println("Shut down demo.");
+            frame.setVisible(false);
+            frame.dispose();
+        }
+    }
+
+    /**
+     * State of the simulation.
+     */
+    public static class State {
+        public long lastTime;
+        public float fps;
+
+        // "struct of arrays" approach allows adjacent vector loads.
+        public float[] x;
+        public float[] y;
+        public float[] vx;
+        public float[] vy;
+        public int[] group; // group index of the particle
+
+        public Color[] colors; // color of the group
+
+        // Matrix of the poles: defines attraction/repulsion between groups i and j
+        public float[][] poles;
+        public float[][] polesT; // transpose of poles
+        public float[] polesScratch;
+
+        public State() {
+            int n = NUMBER_OF_PARTICLES;
+            int g = NUMBER_OF_GROUPS;
+            x = new float[n];
+            y = new float[n];
+            vx = new float[n];
+            vy = new float[n];
+            group = new int[n];
+
+            for (int i = 0; i < n; i++) {
+                x[i] = 0.2f * (RANDOM.nextFloat() - 0.5f);
+                y[i] = 0.2f * (RANDOM.nextFloat() - 0.5f);
+                group[i] = RANDOM.nextInt(g);
+            }
+
+            colors = new Color[g];
+            for (int i = 0; i < g; i++) {
+                float h = i / (float)g;
+                colors[i] = Color.getHSBColor(h, 1f, 1f);
+            }
+
+            poles = new float[g][g];
+            polesT = new float[g][g];
+            polesScratch = new float[n];
+            for (int i = 0; i < g; i++) {
+                for (int j = 0; j < g; j++) {
+                    poles[i][j] = poleGen(i, j, g);
+                    polesT[j][i] = poles[i][j];
+                }
+            }
+
+            // Set up the FPS tracker
+            lastTime = System.nanoTime();
+        }
+
+        public static float poleGen(int i, int j, int g) {
+            int offset = (i - j + g) % g;
+            return switch (POLE_GEN) {
+                case PoleGen.Default -> (i == j) ? -1f : RANDOM.nextFloat() * 2f - 1f;
+                case PoleGen.Random  -> RANDOM.nextFloat() * 2f - 1f;
+                case PoleGen.Rainbow -> (i == j) ? -1f : ((offset == 1) ? -0.5f : 0f);
+                case PoleGen.Sparse  -> (i == j) ? -1f : (RANDOM.nextInt(g) <= 2 ? -0.5f : 0.3f);
+            };
+        }
+
+        public void update() {
+            long nowTime = System.nanoTime();
+            float newFPS = 1e9f / (nowTime - lastTime);
+            fps = 0.9f * fps + 0.1f * newFPS;
+            lastTime = nowTime;
+
+            switch (IMPLEMENTATION) {
+                case Implementation.Scalar                     -> updateForcesScalar();
+                case Implementation.VectorAPI_Inner_Gather     -> updateForcesVectorAPI_Inner_Gather();
+                case Implementation.VectorAPI_Inner_Rearranged -> updateForcesVectorAPI_Inner_Rearranged();
+                case Implementation.VectorAPI_Outer            -> updateForcesVectorAPI_Outer();
+                default -> throw new RuntimeException("not implemented");
+            }
+
+            updatePositions();
+        }
+
+        public void updateForcesScalar() {
+            for (int i = 0; i < x.length; i++) {
+                float pix = x[i];
+                float piy = y[i];
+                float pivx = vx[i];
+                float pivy = vy[i];
+                for (int j = 0; j < x.length; j++) {
+                    float pjx = x[j];
+                    float pjy = y[j];
+
+                    float dx = pix - pjx;
+                    float dy = piy - pjy;
+                    float d = (float)Math.sqrt(dx * dx + dy * dy);
+
+                    // Ignoring d=0 avoids division by zero.
+                    // This would happen for i==j which we want to exclude anyway,
+                    // of if two particles have identical position.
+                    if (d > 0f) {
+                        float pole = poles[group[i]][group[j]];
+                        // If the distance is very large, the force is zero.
+                        float f = 0;
+                        if (d < SCALE1) {
+                            // Small distance: repell all particles
+                            f = (SCALE1 - d) / SCALE1;
+                        } else if (d < SCALE1 + SCALE2) {
+                            // Medium distance: attract/repell according to pole
+                            f = (d - SCALE1) / SCALE2 * pole * SCALE3;
+                        } else if (d < SCALE1 + 2f * SCALE2) {
+                            // Medium distance: attract/repell according to pole
+                            f = ((SCALE1 + 2f * SCALE2) - d) / SCALE2 * pole * SCALE3;
+                        }
+                        // The force is adjustable by the user via FORCE_PARTICLE.
+                        // Additionally we need to respect the DT factor of the simulation
+                        // time step. Finally, we need to normalize dx and dy by dividing
+                        // by d.
+                        f *= FORCE_PARTICLE * DT / d;
+                        pivx += dx * f;
+                        pivy += dy * f;
+                    }
+                }
+                vx[i] = pivx;
+                vy[i] = pivy;
+            }
+        }
+
+        // Inner loop vectorization, the inner loop is vectorized.
+        public void updateForcesVectorAPI_Inner_Gather() {
+            // We don't want to deal with tail loops, so we just assert that the number of
+            // particles is a multiple of the vector length.
+            if (x.length % SPECIES_F.length() != 0) {
+                throw new RuntimeException("Number of particles is not a multiple of the vector length.");
+            }
+
+            for (int i = 0; i < x.length; i++) {
+                float pix = x[i];
+                float piy = y[i];
+
+                // We consider the force of multiple (j) particles on particle i.
+                var fx = FloatVector.zero(SPECIES_F);
+                var fy = FloatVector.zero(SPECIES_F);
+
+                for (int j = 0; j < x.length; j += SPECIES_F.length()) {
+                    var pjx = FloatVector.fromArray(SPECIES_F, x, j);
+                    var pjy = FloatVector.fromArray(SPECIES_F, y, j);
+
+                    var dx = pjx.sub(pix).neg();
+                    var dy = pjy.sub(piy).neg();
+                    var d2 = ( dx.mul(dx) ).add( dy.mul(dy) );
+                    var d = d2.lanewise(VectorOperators.SQRT);
+
+                    // We directly gather the poles from the matrix.
+                    var pole = FloatVector.fromArray(SPECIES_F, poles[group[i]], 0, group, j);
+
+                    // We need to compute all 3 piece-wise liner parts.
+                    var poleDivScale2 = pole.mul(SCALE3 / SCALE2);
+                    var f1 = d.sub(SCALE1).neg().mul(1f / SCALE1);
+                    var f2 = d.sub(SCALE1).mul(poleDivScale2);
+                    var f3 = d.sub(SCALE1 + SCALE2 * 2f).neg().mul(poleDivScale2);
+
+                    // And we need to perform all checks, for the boundaries of the piece-wise parts.
+                    var f0Mask = d.compare(VectorOperators.GT, 0);
+                    var f1Mask = d.compare(VectorOperators.LT, SCALE1);
+                    var f2Mask = d.compare(VectorOperators.LT, SCALE1 + SCALE2);
+                    var f3Mask = d.compare(VectorOperators.LT, SCALE1 + SCALE2 * 2f);
+                    var f03Mask = f0Mask.and(f3Mask);
+
+                    // Then, we put together the 3 middle parts.
+                    var f12  = f2.blend(f1, f1Mask);
+                    var f123 = f3.blend(f12, f2Mask);
+
+                    f123 = f123.mul(FORCE_PARTICLE * DT).div(d);
+
+                    // And we only apply the middle (non-zero) parts if the mask is enabled.
+                    fx = fx.add(dx.mul(f123), f03Mask);
+                    fy = fy.add(dy.mul(f123), f03Mask);
+                }
+                // We need to add the force of all the (j) particles onto i's velocity.
+                vx[i] += fx.reduceLanes(VectorOperators.ADD);
+                vy[i] += fy.reduceLanes(VectorOperators.ADD);
+            }
+        }
+
+        // Inner loop vectorization, the inner loop is vectorized. But instead of gathering the poles
+        // in the inner loop, we rearrange it in the outer loop, so the inner loop has a linear access.
+        public void updateForcesVectorAPI_Inner_Rearranged() {
+            // We don't want to deal with tail loops, so we just assert that the number of
+            // particles is a multiple of the vector length.
+            if (x.length % SPECIES_F.length() != 0) {
+                throw new RuntimeException("Number of particles is not a multiple of the vector length.");
+            }
+
+            for (int i = 0; i < x.length; i++) {
+                // Rearrange data to avoid rearrange in the loop.
+                // We could also use the VectorAPI for this loop, but it is not even necessary for speedups.
+                float[] polesgi = poles[group[i]];
+                for (int j = 0; j < x.length; j++) {
+                    polesScratch[j] = polesgi[group[j]];
+                }
+
+                float pix = x[i];
+                float piy = y[i];
+
+                // We consider the force of multiple (j) particles on particle i.
+                var fx = FloatVector.zero(SPECIES_F);
+                var fy = FloatVector.zero(SPECIES_F);
+
+                for (int j = 0; j < x.length; j += SPECIES_F.length()) {
+                    var pjx = FloatVector.fromArray(SPECIES_F, x, j);
+                    var pjy = FloatVector.fromArray(SPECIES_F, y, j);
+
+                    var dx = pjx.sub(pix).neg();
+                    var dy = pjy.sub(piy).neg();
+                    var d2 = ( dx.mul(dx) ).add( dy.mul(dy) );
+                    var d = d2.lanewise(VectorOperators.SQRT);
+
+                    // We can now access the poles from scratch in a linear access, avoiding the
+                    // repeated gather in each inner loop. This helps especially if gather is
+                    // not supported on a platform. But it also improves the access pattern on
+                    // platforms where gather would be supported, but linear access is faster.
+                    var pole = FloatVector.fromArray(SPECIES_F, polesScratch, j);
+
+                    // We need to compute all 3 piece-wise liner parts.
+                    var poleDivScale2 = pole.mul(SCALE3 / SCALE2);
+                    var f1 = d.sub(SCALE1).neg().mul(1f / SCALE1);
+                    var f2 = d.sub(SCALE1).mul(poleDivScale2);
+                    var f3 = d.sub(SCALE1 + SCALE2 * 2f).neg().mul(poleDivScale2);
+
+                    // And we need to perform all checks, for the boundaries of the piece-wise parts.
+                    var f0Mask = d.compare(VectorOperators.GT, 0);
+                    var f1Mask = d.compare(VectorOperators.LT, SCALE1);
+                    var f2Mask = d.compare(VectorOperators.LT, SCALE1 + SCALE2);
+                    var f3Mask = d.compare(VectorOperators.LT, SCALE1 + SCALE2 * 2f);
+                    var f03Mask = f0Mask.and(f3Mask);
+
+                    // Then, we put together the 3 middle parts.
+                    var f12  = f2.blend(f1, f1Mask);
+                    var f123 = f3.blend(f12, f2Mask);
+
+                    f123 = f123.mul(FORCE_PARTICLE * DT).div(d);
+
+                    // And we only apply the middle (non-zero) parts if the mask is enabled.
+                    fx = fx.add(dx.mul(f123), f03Mask);
+                    fy = fy.add(dy.mul(f123), f03Mask);
+                }
+                // We need to add the force of all the (j) particles onto i's velocity.
+                vx[i] += fx.reduceLanes(VectorOperators.ADD);
+                vy[i] += fy.reduceLanes(VectorOperators.ADD);
+            }
+        }
+
+        // Instead of vectorizing the inner loop, we can also vectorize the outer loop.
+        public void updateForcesVectorAPI_Outer() {
+            // We don't want to deal with tail loops, so we just assert that the number of
+            // particles is a multiple of the vector length.
+            if (x.length % SPECIES_F.length() != 0) {
+                throw new RuntimeException("Number of particles is not a multiple of the vector length.");
+            }
+
+            for (int i = 0; i < x.length; i += SPECIES_F.length()) {
+                var pix = FloatVector.fromArray(SPECIES_F, x, i);
+                var piy = FloatVector.fromArray(SPECIES_F, y, i);
+                var pivx = FloatVector.fromArray(SPECIES_F, vx, i);
+                var pivy = FloatVector.fromArray(SPECIES_F, vy, i);
+
+                // Let's consider the force of the j particle on all of the i particles in the vector.
+                for (int j = 0; j < x.length; j++) {
+                    float pjx = x[j];
+                    float pjy = y[j];
+
+                    var dx = pix.sub(pjx);
+                    var dy = piy.sub(pjy);
+                    var d2 = ( dx.mul(dx) ).add( dy.mul(dy) );
+                    var d = d2.lanewise(VectorOperators.SQRT);
+
+                    // We need to access transpose of poles, because we need to access adjacent i's
+                    var pole = FloatVector.fromArray(SPECIES_F, polesT[group[j]], 0, group, i);
+
+                    var poleDivScale2 = pole.mul(SCALE3 / SCALE2);
+                    var f1 = d.sub(SCALE1).neg().mul(1f / SCALE1);
+                    var f2 = d.sub(SCALE1).mul(poleDivScale2);
+                    var f3 = d.sub(SCALE1 + SCALE2 * 2f).neg().mul(poleDivScale2);
+
+                    var f0Mask = d.compare(VectorOperators.GT, 0);
+                    var f1Mask = d.compare(VectorOperators.LT, SCALE1);
+                    var f2Mask = d.compare(VectorOperators.LT, SCALE1 + SCALE2);
+                    var f3Mask = d.compare(VectorOperators.LT, SCALE1 + SCALE2 * 2f);
+                    var f03Mask = f0Mask.and(f3Mask);
+
+                    var f12  = f2.blend(f1, f1Mask);
+                    var f123 = f3.blend(f12, f2Mask);
+
+                    f123 = f123.mul(FORCE_PARTICLE * DT).div(d);
+                    pivx = pivx.add(dx.mul(f123), f03Mask);
+                    pivy = pivy.add(dy.mul(f123), f03Mask);
+                }
+                pivx.intoArray(vx, i);
+                pivy.intoArray(vy, i);
+            }
+        }
+
+        // The loop is so simple that it can be auto vectorized
+        public void updatePositions() {
+            float effectiveDampening = (float)Math.pow(DAMPENING, DT);
+            for (int i = 0; i < x.length; i++) {
+                float px = x[i];
+                float py = y[i];
+                float pvx = vx[i];
+                float pvy = vy[i];
+
+                // Force that pulls to origin, based on distance.
+                float d = (float)Math.sqrt(px * px + py * py);
+                pvx -= px * d * FORCE_ORIGIN * DT;
+                pvy -= py * d * FORCE_ORIGIN * DT;
+
+                // Update position and put drag on speed
+                px += pvx * DT;
+                py += pvy * DT;
+                pvx *= effectiveDampening;
+                pvy *= effectiveDampening;
+
+                x[i] = px;
+                y[i] = py;
+                vx[i] = pvx;
+                vy[i] = pvy;
+            }
+        }
+    }
+
+    /**
+     * This panel displays the simulation.
+     **/
+    public static class ParticlePanel extends JPanel {
+
+        @Override
+        protected void paintComponent(Graphics g) {
+            super.paintComponent(g);
+            Graphics2D g2d = (Graphics2D) g;
+
+            // Rendering settings for smoother circles
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+            g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+
+            g2d.setColor(new Color(0, 0, 0));
+            g2d.fillRect(0, 0, 1000, 1000);
+
+            // Draw position of points
+            for (int i = 0; i < STATE.x.length; i++) {
+                g2d.setColor(STATE.colors[STATE.group[i]]);
+                int xx = (int)(STATE.x[i] * ZOOM + 500f);
+                int yy = (int)(STATE.y[i] * ZOOM + 500f);
+                //g2d.fillRect(xx - 3, yy - 3, 6, 6);
+                g2d.fill(new Ellipse2D.Double(xx - 3, yy - 3, 6, 6));
+            }
+
+            g2d.setColor(new Color(0, 0, 0));
+            g2d.fillRect(0, 0, 150, 35);
+            g2d.setColor(new Color(255, 255, 255));
+            g2d.setFont(new Font("Consolas", Font.PLAIN, 30));
+            g2d.drawString("FPS: " + (int)Math.floor(STATE.fps), 0, 30);
+
+            g2d.setColor(new Color(255, 255, 255));
+            int r1 = (int)(ZOOM * SCALE1);
+            int r2 = (int)(ZOOM * (SCALE1 + SCALE2 * 2f));
+            g2d.drawOval(900 - r1, 100 - r1, 2 * r1, 2 * r1);
+            g2d.drawOval(900 - r2, 100 - r2, 2 * r2, 2 * r2);
+        }
+    }
+
+    /**
+     * This panel displays the pole matrix.
+     **/
+    public static class ForcePanel extends JPanel {
+
+        @Override
+        protected void paintComponent(Graphics g) {
+            super.paintComponent(g);
+            Graphics2D g2d = (Graphics2D) g;
+
+            g2d.setColor(new Color(0, 0, 0));
+            g2d.fillRect(0, 0, 350, 350);
+
+            int nGroups = STATE.poles.length;
+            int scale = (int)(300f / nGroups);
+            for (int i = 0; i < nGroups; i++) {
+                g2d.setColor(STATE.colors[i]);
+                g2d.fillRect(scale * (i + 1), 0, scale, scale);
+                g2d.fillRect(0, scale * (i + 1), scale, scale);
+
+                for (int j = 0; j < nGroups; j++) {
+                    float p = STATE.poles[i][j];
+                    float cr = Math.max(0, p);
+                    float cg = Math.max(0, -p);
+                    g2d.setColor(new Color(cr, cg, 0));
+                    g2d.fillRect(scale * (i + 1), scale * (j + 1), scale, scale);
+                }
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/gallery/TestParticleLife.java b/test/hotspot/jtreg/compiler/gallery/TestParticleLife.java
new file mode 100644
index 00000000000..e0fb6164acf
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/gallery/TestParticleLife.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=ir
+ * @bug 8378166
+ * @summary Visual example of the Vector API: NBody / Particle Life simulation.
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run driver ${test.main.class} ir
+ */
+
+/*
+ * @test id=visual
+ * @key headful
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run main ${test.main.class} visual
+ */
+
+package compiler.gallery;
+
+import jdk.test.lib.Utils;
+
+import compiler.lib.ir_framework.*;
+
+/**
+ * This test is the JTREG version for automatic verification of the stand-alone
+ * {@link ParticleLife}. If you just want to run the demo and play with it,
+ * go look at the documentation in {@link ParticleLife}.
+ * Here, we launch both a visual version that just runs for a few seconds, to see
+ * that there are no crashes, but we don't do any specific verification.
+ * We also have an IR test, that ensures that we get vectorization.
+ */
+public class TestParticleLife {
+    public static void main(String[] args) throws InterruptedException {
+        String mode = args[0];
+        System.out.println("Running JTREG test in mode: " + mode);
+
+        switch (mode) {
+            case "ir" -> runIR();
+            case "visual" -> runVisual();
+            default -> throw new RuntimeException("Unknown mode: " + mode);
+        }
+    }
+
+    private static void runIR() {
+        System.out.println("Testing with IR rules...");
+        TestFramework.runWithFlags("-XX:CompileCommand=inline,compiler.gallery.ParticleLife$State::update*",
+                                   "--add-modules=jdk.incubator.vector");
+    }
+
+    private static void runVisual() throws InterruptedException {
+        System.out.println("Testing with 2d Graphics (visual)...");
+
+        // We will not do anything special here, just launch the application,
+        // tell it to run for 10 second, interrupt it and let it shut down.
+        Thread thread = new Thread() {
+            public void run() {
+                ParticleLife.main();
+            }
+        };
+        thread.setDaemon(true);
+        thread.start();
+        Thread.sleep(Utils.adjustTimeout(10000)); // let demo run for 10 seconds
+        thread.interrupt();
+        Thread.sleep(Utils.adjustTimeout(1000)); // allow demo 1 second for shutdown
+    }
+
+    // ---------------------- For the IR testing part only --------------------------------
+    ParticleLife.State state = new ParticleLife.State();
+
+    @Test
+    @Warmup(100)
+    @IR(counts = {IRNode.REPLICATE_F,     "> 0",
+                  IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.SUB_VF,          "> 0",
+                  IRNode.MUL_VF,          "> 0",
+                  IRNode.ADD_VF,          "> 0",
+                  IRNode.SQRT_VF,         "> 0",
+                  IRNode.STORE_VECTOR,    "> 0"},
+        applyIf = {"AlignVector", "false"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    private void testIR_updatePositions() {
+        // This call should inline given the CompileCommand above.
+        // We expect auto vectorization of the relatively simple loop.
+        state.updatePositions();
+    }
+
+    @Test
+    @Warmup(10)
+    @IR(counts = {IRNode.REPLICATE_F,        "= 0",
+                  IRNode.LOAD_VECTOR_F,      "= 0",
+                  IRNode.REPLICATE_I,        "= 0",
+                  IRNode.LOAD_VECTOR_I,      "= 0",
+                  IRNode.ADD_VI,             "= 0",
+                  IRNode.LOAD_VECTOR_GATHER, "= 0",
+                  IRNode.SUB_VF,             "= 0",
+                  IRNode.MUL_VF,             "= 0",
+                  IRNode.ADD_VF,             "= 0",
+                  IRNode.NEG_VF,             "= 0",
+                  IRNode.SQRT_VF,            "= 0",
+                  IRNode.DIV_VF,             "= 0",
+                  IRNode.VECTOR_MASK_CMP,    "= 0",
+                  IRNode.VECTOR_MASK_CAST,   "= 0",
+                  IRNode.AND_V_MASK,         "= 0",
+                  IRNode.VECTOR_BLEND_F,     "= 0",
+                  IRNode.STORE_VECTOR,       "= 0",
+                  IRNode.ADD_REDUCTION_VF,   "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+    private void testIR_updateForcesScalar() {
+        // This call should inline given the CompileCommand above.
+        // We expect no vectorization, though it may in principle be possible
+        // to auto vectorize one day.
+        state.updateForcesScalar();
+    }
+
+    @Test
+    @Warmup(10)
+    @IR(counts = {IRNode.REPLICATE_F,        "> 0",
+                  IRNode.LOAD_VECTOR_F,      "> 0",
+                  IRNode.REPLICATE_I,        "> 0",
+                  IRNode.LOAD_VECTOR_I,      "> 0",
+                  IRNode.ADD_VI,             "> 0",
+                  IRNode.LOAD_VECTOR_GATHER, "> 0",
+                  IRNode.SUB_VF,             "> 0",
+                  IRNode.MUL_VF,             "> 0",
+                  IRNode.ADD_VF,             "> 0",
+                  IRNode.NEG_VF,             "> 0",
+                  IRNode.SQRT_VF,            "> 0",
+                  IRNode.DIV_VF,             "> 0",
+                  IRNode.VECTOR_MASK_CMP,    "> 0",
+                  IRNode.VECTOR_MASK_CAST,   "> 0",
+                  IRNode.VECTOR_BLEND_F,     "> 0",
+                  IRNode.ADD_REDUCTION_VF,   "> 0"}, // instead we reduce the vector to a scalar
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeature = {"avx2", "true"})
+    private void testIR_updateForcesVectorAPI_Inner_Gather() {
+        // This call should inline given the CompileCommand above.
+        // We expect the VectorAPI calls to intrinsify.
+        state.updateForcesVectorAPI_Inner_Gather();
+    }
+
+    @Test
+    @Warmup(10)
+    @IR(counts = {IRNode.REPLICATE_F,        "> 0",
+                  IRNode.LOAD_VECTOR_F,      "> 0",
+                  IRNode.REPLICATE_I,        "= 0", // No gather operation
+                  IRNode.LOAD_VECTOR_I,      "= 0", // No gather operation
+                  IRNode.ADD_VI,             "= 0", // No gather operation
+                  IRNode.LOAD_VECTOR_GATHER, "= 0", // No gather operation
+                  IRNode.SUB_VF,             "> 0",
+                  IRNode.MUL_VF,             "> 0",
+                  IRNode.ADD_VF,             "> 0",
+                  IRNode.NEG_VF,             "> 0",
+                  IRNode.SQRT_VF,            "> 0",
+                  IRNode.DIV_VF,             "> 0",
+                  IRNode.VECTOR_MASK_CMP,    "> 0",
+                  IRNode.VECTOR_MASK_CAST,   "> 0",
+                  IRNode.VECTOR_BLEND_F,     "> 0",
+                  IRNode.ADD_REDUCTION_VF,   "> 0"}, // instead we reduce the vector to a scalar
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+    private void testIR_updateForcesVectorAPI_Inner_Rearranged() {
+        // This call should inline given the CompileCommand above.
+        // We expect the VectorAPI calls to intrinsify.
+        state.updateForcesVectorAPI_Inner_Rearranged();
+    }
+
+
+    @Test
+    @Warmup(10)
+    @IR(counts = {IRNode.REPLICATE_F,        "> 0",
+                  IRNode.LOAD_VECTOR_F,      "> 0",
+                  IRNode.REPLICATE_I,        "> 0",
+                  IRNode.LOAD_VECTOR_I,      "> 0",
+                  IRNode.ADD_VI,             "> 0",
+                  IRNode.LOAD_VECTOR_GATHER, "> 0",
+                  IRNode.SUB_VF,             "> 0",
+                  IRNode.MUL_VF,             "> 0",
+                  IRNode.ADD_VF,             "> 0",
+                  IRNode.NEG_VF,             "> 0",
+                  IRNode.SQRT_VF,            "> 0",
+                  IRNode.DIV_VF,             "> 0",
+                  IRNode.VECTOR_MASK_CMP,    "> 0",
+                  IRNode.VECTOR_MASK_CAST,   "> 0",
+                  IRNode.VECTOR_BLEND_F,     "> 0",
+                  IRNode.STORE_VECTOR,       "> 0",  // store back a vector
+                  IRNode.ADD_REDUCTION_VF,   "= 0"}, // and no reduction operation
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeature = {"avx2", "true"})
+    private void testIR_updateForcesVectorAPI_Outer() {
+        // This call should inline given the CompileCommand above.
+        // We expect the VectorAPI calls to intrinsify.
+        state.updateForcesVectorAPI_Outer();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/igvn/CastLLBits.java b/test/hotspot/jtreg/compiler/igvn/CastLLBits.java
new file mode 100644
index 00000000000..a212fd1d3b6
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/igvn/CastLLBits.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.igvn;
+
+/**
+ * @test
+ * @bug 8375618
+ * @summary A CastLLNode may change only a bit of its input, which triggers the incorrect assertion
+ *          that the signed range must changes
+ * @run main/othervm -XX:-TieredCompilation -Xbatch ${test.main.class}
+ * @run main ${test.main.class}
+ */
+public class CastLLBits {
+    static long instanceCount;
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 2000; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        int i, i1 = 6, i9, i10, i11, i12;
+        boolean b = false;
+        for (i = 25; i > 5; i--) {
+            i9 = 1;
+            do {
+                i1 += 0;
+                for (i10 = 1; i10 < 3; ++i10) {
+                    instanceCount = i9;
+                }
+                i12 = 3;
+                while (--i12 > 0) {
+                    i11 = (int) instanceCount;
+                    i1 = i11;
+                    if (b) {};
+                    instanceCount &= 21;
+                }
+                i9++;
+            } while (i9 < 9);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java b/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java
new file mode 100644
index 00000000000..f91b153817b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/igvn/TestMinMaxIdentity.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2025, 2026 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8373134
+ * @summary Verify that min/max add identity optimizations get applied correctly
+ * @modules java.base/jdk.internal.misc
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+package compiler.igvn;
+
+import compiler.lib.compile_framework.CompileFramework;
+import compiler.lib.template_framework.Template;
+import compiler.lib.template_framework.TemplateToken;
+import compiler.lib.template_framework.library.CodeGenerationDataNameType;
+import compiler.lib.template_framework.library.PrimitiveType;
+import compiler.lib.template_framework.library.TestFrameworkClass;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import static compiler.lib.template_framework.Template.let;
+import static compiler.lib.template_framework.Template.scope;
+
+public class TestMinMaxIdentity {
+    public static void main(String[] args) {
+        // Create a new CompileFramework instance.
+        CompileFramework comp = new CompileFramework();
+
+        // Add a java source file.
+        comp.addJavaSourceCode("compiler.igvn.templated.MinMaxIdentity", generate(comp));
+
+        // Compile the source file.
+        comp.compile("--add-modules=jdk.incubator.vector");
+
+        comp.invoke("compiler.igvn.templated.MinMaxIdentity", "main", new Object[] {new String[] {
+            "--add-modules=jdk.incubator.vector",
+            "--add-opens", "jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED"
+        }});
+    }
+
+    private static String generate(CompileFramework comp) {
+        // Create a list to collect all tests.
+        List<TemplateToken> testTemplateTokens = new ArrayList<>();
+
+        Stream.of(MinMaxOp.values())
+            .flatMap(MinMaxOp::generate)
+            .forEach(testTemplateTokens::add);
+
+        // Note that for floating point Min/Max these cases below don't hold
+        generate(MinMaxOp.MIN_I, MinMaxOp.MAX_I).forEach(testTemplateTokens::add);
+        generate(MinMaxOp.MIN_L, MinMaxOp.MAX_L).forEach(testTemplateTokens::add);
+
+        Stream.of(Fp16MinMaxOp.values())
+            .flatMap(Fp16MinMaxOp::generate)
+            .forEach(testTemplateTokens::add);
+
+        // Create the test class, which runs all testTemplateTokens.
+        return TestFrameworkClass.render(
+            // package and class name.
+            "compiler.igvn.templated", "MinMaxIdentity",
+            // List of imports.
+            Set.of("jdk.incubator.vector.Float16"),
+            // classpath, so the Test VM has access to the compiled class files.
+            comp.getEscapedClassPathOfCompiledClasses(),
+            // The list of tests.
+            testTemplateTokens);
+    }
+
+    static Stream<TemplateToken> generate(MinMaxOp op1, MinMaxOp op2) {
+        return Stream.of(template("a", "b", op1, op2), template("b", "a", op1, op2),
+                template("a", "b", op2, op1), template("b", "a", op2, op1)).
+            map(Template.ZeroArgs::asToken);
+    }
+
+    static Template.ZeroArgs template(String arg1, String arg2, MinMaxOp op1, MinMaxOp op2) {
+        return Template.make(() -> scope(
+            let("boxedTypeName", op1.type.boxedTypeName()),
+            let("op1", op1.name()),
+            let("op2", op2.name()),
+            let("type", op1.type.name()),
+            let("fn1", op1.functionName),
+            let("fn2", op2.functionName),
+            let("arg1", arg1),
+            let("arg2", arg2),
+            """
+            @Test
+            @IR(counts = {IRNode.#op1, "= 0", IRNode.#op2, "= 0"},
+                phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+            @Arguments(values = {Argument.NUMBER_42, Argument.NUMBER_42})
+            public #type $test(#type #arg1, #type #arg2) {
+                int i;
+                for (i = -10; i < 1; i++) {
+                }
+                #type c = a * i;
+                return #boxedTypeName.#fn1(a, #boxedTypeName.#fn2(b, c));
+            }
+            """
+        ));
+    }
+
+    enum MinMaxOp {
+        MIN_D("min", CodeGenerationDataNameType.doubles()),
+        MAX_D("max", CodeGenerationDataNameType.doubles()),
+        MIN_F("min", CodeGenerationDataNameType.floats()),
+        MAX_F("max", CodeGenerationDataNameType.floats()),
+        MIN_I("min", CodeGenerationDataNameType.ints()),
+        MAX_I("max", CodeGenerationDataNameType.ints()),
+        MIN_L("min", CodeGenerationDataNameType.longs()),
+        MAX_L("max", CodeGenerationDataNameType.longs());
+
+        final String functionName;
+        final PrimitiveType type;
+
+        MinMaxOp(String functionName, PrimitiveType type) {
+            this.functionName = functionName;
+            this.type = type;
+        }
+
+        Stream<TemplateToken> generate() {
+            return Stream.of(template("a", "b"), template("b", "a")).
+                map(Template.ZeroArgs::asToken);
+        }
+
+        private Template.ZeroArgs template(String arg1, String arg2) {
+            return Template.make(() -> scope(
+                let("boxedTypeName", type.boxedTypeName()),
+                let("op", name()),
+                let("type", type.name()),
+                let("functionName", functionName),
+                let("arg1", arg1),
+                let("arg2", arg2),
+                """
+                @Test
+                """,
+                type.isFloating() ?
+                    """
+                    @IR(counts = {IRNode.#op, "= 1"},
+                        phase = CompilePhase.BEFORE_MACRO_EXPANSION,
+                        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "darn", "true"})
+                    @IR(counts = {IRNode.#op, "= 1"},
+                        phase = CompilePhase.BEFORE_MACRO_EXPANSION,
+                        applyIfPlatform = {"riscv64", "true"})
+                    """ :
+                    """
+                    @IR(counts = {IRNode.#op, "= 1"},
+                        phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+                    """,
+                """
+                @Arguments(values = {Argument.NUMBER_42, Argument.NUMBER_42})
+                public #type $test(#type #arg1, #type #arg2) {
+                    int i;
+                    for (i = -10; i < 1; i++) {
+                    }
+                    #type c = a * i;
+                    return #boxedTypeName.#functionName(a, #boxedTypeName.#functionName(b, c));
+                }
+                """
+            ));
+        }
+    }
+
+    enum Fp16MinMaxOp {
+        MAX_HF("max"),
+        MIN_HF("min");
+
+        final String functionName;
+
+        Fp16MinMaxOp(String functionName) {
+            this.functionName = functionName;
+        }
+
+        Stream<TemplateToken> generate() {
+            return Stream.of(template("a", "b"), template("b", "a")).
+                map(Template.ZeroArgs::asToken);
+        }
+
+        private Template.ZeroArgs template(String arg1, String arg2) {
+            return Template.make(() -> scope(
+                let("op", name()),
+                let("functionName", functionName),
+                let("arg1", arg1),
+                let("arg2", arg2),
+                """
+                @Setup
+                private static Object[] $setup() {
+                    return new Object[] {Float16.valueOf(42), Float16.valueOf(42)};
+                }
+
+                @Test
+                @IR(counts = {IRNode.#op, "= 1"},
+                    phase = CompilePhase.BEFORE_MACRO_EXPANSION,
+                    applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
+                @IR(counts = {IRNode.#op, "= 1"},
+                    phase = CompilePhase.BEFORE_MACRO_EXPANSION,
+                    applyIfCPUFeatureAnd = {"fphp", "true", "asimdhp", "true"})
+                @Arguments(setup = "$setup")
+                public Float16 $test(Float16 #arg1, Float16 #arg2) {
+                    int i;
+                    for (i = -10; i < 1; i++) {
+                    }
+                    Float16 c = Float16.multiply(a, Float16.valueOf(i));
+                    return Float16.#functionName(a, Float16.#functionName(b, c));
+                }
+                """
+            ));
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/integerArithmetic/TestHoistDivision.java b/test/hotspot/jtreg/compiler/integerArithmetic/TestHoistDivision.java
new file mode 100644
index 00000000000..26fce864c12
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/integerArithmetic/TestHoistDivision.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.integerArithmetic;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8347365
+ * @summary Tests that divisions are hoisted when their zero checks are elided.
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+public class TestHoistDivision {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @DontInline
+    private static void dontInline() {}
+
+    @Run(test = {"testCommon", "testHoistOutOfLoop"})
+    public void run() {
+        Asserts.assertEQ(2, testCommon(1, 1));
+        Asserts.assertEQ(0, testHoistOutOfLoop(1, 1, true, 1, 4, 2));
+        Asserts.assertEQ(0, testHoistOutOfLoop(1, 1, false, 1, 4, 2));
+    }
+
+    @Test
+    @IR(counts = {IRNode.DIV_I, "1", IRNode.DIV_BY_ZERO_TRAP, "1"})
+    public int testCommon(int x, int y) {
+        // The 2 divisions should be commoned
+        int result = x / y;
+        dontInline();
+        return result + x / y;
+    }
+
+    @Test
+    @IR(failOn = IRNode.DIV_BY_ZERO_TRAP, counts = {IRNode.DIV_I, "1", IRNode.TRAP, "1"})
+    public int testHoistOutOfLoop(int x, int y, boolean b, int start, int limit, int step) {
+        // The divisions should be hoisted out of the loop, allowing them to be commoned
+        int result = 0;
+        for (int i = start; i < limit; i *= step) {
+            if (b) {
+                dontInline();
+                result += x / y;
+            } else {
+                result -= x / y;
+            }
+            b = !b;
+        }
+        return result;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
index 76ef4766159..94136c71c53 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestCountPositives.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java
index 38a516e7521..0165a77d803 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestEncodeIntrinsics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java
index 6edf2dc2e56..f80b7f63402 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestHasNegatives.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestOpaqueConstantBoolNodes.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestOpaqueConstantBoolNodes.java
new file mode 100644
index 00000000000..b8db97f7ecb
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestOpaqueConstantBoolNodes.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8374582
+ * @summary Tests the creation and removal of opaque nodes at range checks points in string intrinsics.
+ * @requires vm.flagless
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+package compiler.intrinsics.string;
+
+import compiler.lib.ir_framework.*;
+
+public class TestOpaqueConstantBoolNodes {
+
+    static byte[] bytes = new byte[42];
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags(
+            "-XX:CompileCommand=inline,java.lang.String::*",
+            "-XX:CompileCommand=inline,java.lang.StringCoding::*",
+            "-XX:CompileCommand=exclude,jdk.internal.util.Preconditions::checkFromIndexSize");
+    }
+
+    @Setup
+    private static Object[] setup() {
+        return new Object[] {bytes, 2, 23};
+    }
+
+    @Test
+    @IR(counts = {IRNode.OPAQUE_CONSTANT_BOOL, "3"}, phase = CompilePhase.AFTER_PARSING)
+    @IR(failOn = {IRNode.OPAQUE_CONSTANT_BOOL}, phase = CompilePhase.AFTER_MACRO_EXPANSION)
+    @Arguments(setup = "setup")
+    private static String test(byte[] bytes, int i, int l) {
+        return new String(bytes, i , l);
+    }
+}
+
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestRangeCheck.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestRangeCheck.java
new file mode 100644
index 00000000000..3b01e0f85a4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestRangeCheck.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8374582
+ * @summary Tests handling of invalid array indices in C2 intrinsic if explicit range check in Java code is not inlined.
+ * @modules java.base/jdk.internal.access
+ * @run main/othervm
+ *      -XX:CompileCommand=inline,java.lang.StringCoding::*
+ *      -XX:CompileCommand=exclude,jdk.internal.util.Preconditions::checkFromIndexSize
+ *      ${test.main.class}
+ */
+
+package compiler.intrinsics.string;
+
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
+
+public class TestRangeCheck {
+
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
+    public static void main(String[] args) {
+        byte[] bytes = new byte[42];
+        for (int i = 0; i < 10_000; ++i) {
+            test(bytes);
+        }
+    }
+
+    private static int test(byte[] bytes) {
+        try {
+            // Calling `StringCoding::countPositives`, which is a "front door"
+            // to the `StringCoding::countPositives0` intrinsic.
+            // `countPositives` validates its input using
+            // `Preconditions::checkFromIndexSize`, which also maps to an
+            // intrinsic. When `checkFromIndexSize` is not inlined, C2 does not
+            // know about the explicit range checks, and does not cut off the
+            // dead code. As a result, an invalid value (e.g., `-1`) can be fed
+            // as input into the `countPositives0` intrinsic, get replaced
+            // by TOP, and cause a failure in the matcher.
+            return JLA.countPositives(bytes, -1, 42);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+}
+
diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java b/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
index d9a98582aec..3612f5ab3d3 100644
--- a/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@ import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import jtreg.SkippedException;
 
 /**
  * This is the entry-point for the Compile Framework. Its purpose it to allow
@@ -132,10 +134,31 @@ public class CompileFramework {
         } catch (IllegalAccessException e) {
             throw new CompileFrameworkException("Illegal access:", e);
         } catch (InvocationTargetException e) {
+            // Rethrow jtreg.SkippedException so the tests are properly skipped.
+            // If we wrapped the SkippedException instead, it would get buried
+            // in the exception causes and cause a failed test instead.
+            findJtregSkippedExceptionInCauses(e).ifPresent(ex -> { throw ex; });
             throw new CompileFrameworkException("Invocation target:", e);
         }
     }
 
+    private static Optional<RuntimeException> findJtregSkippedExceptionInCauses(Throwable ex) {
+        while (ex != null) {
+            // jtreg.SkippedException can be from a different classloader, comparing by name
+            if (ex.getClass().getName().equals(SkippedException.class.getName())) {
+                return Optional.of((RuntimeException) ex);
+            }
+
+            if (ex.getCause() == ex) {
+                break;
+            }
+
+            ex = ex.getCause();
+        }
+
+        return Optional.empty();
+    }
+
     private Method findMethod(String className, String methodName) {
         Class<?> c = getClass(className);
         Method[] methods = c.getDeclaredMethods();
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/AbstractInfo.java b/test/hotspot/jtreg/compiler/lib/ir_framework/AbstractInfo.java
index 20a865b1337..b57b209112c 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/AbstractInfo.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/AbstractInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,7 +103,7 @@ abstract public class AbstractInfo {
     }
 
     /**
-     * Returns a boolean indicating if the test VM runs with flags that allow C2 compilations.
+     * Returns a boolean indicating if the Test VM runs with flags that allow C2 compilations.
      *
      * @return {@code true} if C2 compilations are allowed;
      *         {@code false} otherwise (run with {@code -XX:TieredStopAtLevel={1,2,3}, -XX:-UseCompiler}).
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/CompLevel.java b/test/hotspot/jtreg/compiler/lib/ir_framework/CompLevel.java
index b6e55c0f617..f8760b4dfad 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/CompLevel.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/CompLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ public enum CompLevel {
      * Can only be used at {@link Test#compLevel()}. After the warm-up, the framework keeps invoking the test over a span
      * of 10s (configurable by setting the property flag {@code -DWaitForCompilationTimeout}) until HotSpot compiles the
      * {@link Test} method. If the method was not compiled after 10s, an exception is thrown. The framework does not wait
-     * for the compilation if the test VM is run with {@code -Xcomp}, {@code -XX:-UseCompiler}, or
+     * for the compilation if the Test VM is run with {@code -Xcomp}, {@code -XX:-UseCompiler}, or
      * {@code -DExcludeRandom=true}.
      */
     WAIT_FOR_COMPILATION(-4),
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
index a536808d269..1e3ba7c314e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,7 +161,7 @@ public enum CompilePhase {
     static {
         for (CompilePhase phase : CompilePhase.values()) {
             if (phase == PRINT_IDEAL) {
-                PHASES_BY_PARSED_NAME.put("print_ideal", phase);
+                PHASES_BY_PARSED_NAME.put("PrintIdeal", phase);
             } else {
                 PHASES_BY_PARSED_NAME.put(phase.name(), phase);
             }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IR.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IR.java
index fd2cd69056a..96df71dacd7 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IR.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ import java.lang.annotation.RetentionPolicy;
  * For any other flag specified either by user code (e.g. {@link Scenario#Scenario(int, String...)},
  * {@link TestFramework#runWithFlags(String...) etc.} or as part of the JTreg whitelist, IR verification is applied.
  * To restrict the application of IR rules when certain flags are present that could change the IR, each {@code @IR}
- * annotation can specify additional preconditions on the allowed test VM flags that must hold when an IR rule is applied.
+ * annotation can specify additional preconditions on the allowed Test VM flags that must hold when an IR rule is applied.
  * If the specified preconditions fail, then the framework does not apply the IR rule. These preconditions can be
  * set with {@link #applyIf()}, {@link #applyIfNot()}, {@link #applyIfAnd()}, or {@link #applyIfOr()}.
  * <p>
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 3fd8e2eceb4..3508c06ad0a 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -640,6 +640,11 @@ public class IRNode {
         beforeMatchingNameRegex(CONV, "Conv");
     }
 
+    public static final String CONV_D2F = PREFIX + "CONV_D2F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(CONV_D2F, "ConvD2F");
+    }
+
     public static final String CONV_D2I = PREFIX + "CONV_D2I" + POSTFIX;
     static {
         beforeMatchingNameRegex(CONV_D2I, "ConvD2I");
@@ -650,6 +655,11 @@ public class IRNode {
         beforeMatchingNameRegex(CONV_D2L, "ConvD2L");
     }
 
+    public static final String CONV_F2D = PREFIX + "CONV_F2D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(CONV_F2D, "ConvF2D");
+    }
+
     public static final String CONV_F2HF = PREFIX + "CONV_F2HF" + POSTFIX;
     static {
         beforeMatchingNameRegex(CONV_F2HF, "ConvF2HF");
@@ -1478,6 +1488,12 @@ public class IRNode {
         beforeMatchingNameRegex(VECTOR_MASK_FIRST_TRUE, "VectorMaskFirstTrue");
     }
 
+    // Can only be used if libjsvml or libsleef is available
+    public static final String CALL_LEAF_VECTOR = PREFIX + "CALL_LEAF_VECTOR" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(CALL_LEAF_VECTOR, "CallLeafVector");
+    }
+
     // Can only be used if avx512_vnni is available.
     public static final String MUL_ADD_VS2VI_VNNI = PREFIX + "MUL_ADD_VS2VI_VNNI" + POSTFIX;
     static {
@@ -1574,6 +1590,16 @@ public class IRNode {
         superWordNodes(MAX_REDUCTION_V, "MaxReductionV");
     }
 
+    public static final String UMIN_REDUCTION_V = PREFIX + "UMIN_REDUCTION_V" + POSTFIX;
+    static {
+        superWordNodes(UMIN_REDUCTION_V, "UMinReductionV");
+    }
+
+    public static final String UMAX_REDUCTION_V = PREFIX + "UMAX_REDUCTION_V" + POSTFIX;
+    static {
+        superWordNodes(UMAX_REDUCTION_V, "UMaxReductionV");
+    }
+
     public static final String NEG_VF = VECTOR_PREFIX + "NEG_VF" + POSTFIX;
     static {
         vectorNode(NEG_VF, "NegVF", TYPE_FLOAT);
@@ -1985,6 +2011,11 @@ public class IRNode {
        beforeMatchingNameRegex(SQRT_HF, "SqrtHF");
     }
 
+    public static final String SQRT_D = PREFIX + "SQRT_D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(SQRT_D, "SqrtD");
+    }
+
     public static final String SQRT_F = PREFIX + "SQRT_F" + POSTFIX;
     static {
        beforeMatchingNameRegex(SQRT_F, "SqrtF");
@@ -3080,6 +3111,11 @@ public class IRNode {
         machOnlyNameRegex(X86_CMOVEL_IMM01UCF, "cmovL_imm_01UCF");
     }
 
+    public static final String X86_CMOVEL_IMM01UCFE = PREFIX + "X86_CMOVEL_IMM01UCFE" + POSTFIX;
+    static {
+        machOnlyNameRegex(X86_CMOVEL_IMM01UCFE, "cmovL_imm_01UCFE");
+    }
+
     public static final String MOD_F = PREFIX + "MOD_F" + POSTFIX;
     static {
         String regex = START + "ModF" + MID + END;
@@ -3137,6 +3173,11 @@ public class IRNode {
         machOnlyNameRegex(REPLICATE_HF_IMM8, "replicateHF_imm8_gt128b");
     }
 
+    public static final String OPAQUE_CONSTANT_BOOL = PREFIX + "OPAQUE_CONSTANT_BOOL" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(OPAQUE_CONSTANT_BOOL, "OpaqueConstantBool");
+    }
+
     /*
      * Utility methods to set up IR_NODE_MAPPINGS.
      */
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/README.md b/test/hotspot/jtreg/compiler/lib/ir_framework/README.md
index c0df8b54658..da59bd61b13 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/README.md
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/README.md
@@ -115,7 +115,7 @@ The [@IR](./IR.java) annotation provides two kinds of checks:
  - `counts`: A list of one or more "IR node/user-defined regex - counter" pairs which specify how often each IR node/user-defined regex should be matched on the compilation output of each compile phase.
 
 #### Disable/Enable IR Rules based on VM Flags
-One might also want to restrict the application of certain `@IR` rules depending on the used flags in the test VM. These could be flags defined by the user or by JTreg. In the latter case, the flags must be whitelisted in `JTREG_WHITELIST_FLAGS` in [TestFramework](./TestFramework.java) (i.e. have no unexpected impact on the IR except if the flag simulates a specific machine setup like `UseAVX={1,2,3}` etc.) to enable an IR verification by the framework. The `@IR` rules thus have an option to restrict their application:
+One might also want to restrict the application of certain `@IR` rules depending on the used flags in the Test VM. These could be flags defined by the user or by JTreg. In the latter case, the flags must be whitelisted in `JTREG_WHITELIST_FLAGS` in [TestFramework](./TestFramework.java) (i.e. have no unexpected impact on the IR except if the flag simulates a specific machine setup like `UseAVX={1,2,3}` etc.) to enable an IR verification by the framework. The `@IR` rules thus have an option to restrict their application:
 
 - `applyIf`: Only apply a rule if a flag has the specified value/range of values.
 - `applyIfNot`: Only apply a rule if a flag has **not** a specified value/range of values
@@ -144,7 +144,7 @@ An IR verification cannot always be performed. Certain VM flags explicitly disab
 More information about IR matching can be found in the Javadocs of [IR](./IR.java). Concrete examples on how to specify IR constraint/rules can be found in [IRExample](../../../testlibrary_tests/ir_framework/examples/IRExample.java), [TestIRMatching](../../../testlibrary_tests/ir_framework/tests/TestIRMatching.java) (internal framework test), and [TestPhaseIRMatching](../../../testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java) (internal framework test).
 
 ### 2.3 Test VM Flags and Scenarios
-The recommended way to use the framework is by defining a single `@run driver` statement in the JTreg header which, however, does not allow the specification of additional test VM flags. Instead, the user has the possibility to provide VM flags by calling `TestFramework.runWithFlags()` or by creating a `TestFramework` builder object on which `addFlags()` can be called.
+The recommended way to use the framework is by defining a single `@run driver` statement in the JTreg header which, however, does not allow the specification of additional Test VM flags. Instead, the user has the possibility to provide VM flags by calling `TestFramework.runWithFlags()` or by creating a `TestFramework` builder object on which `addFlags()` can be called.
 
 If a user wants to provide multiple flag combinations for a single test, he or she has the option to provide different scenarios. A scenario based flag will always have precedence over other user defined flags. More information about scenarios can be found in the Javadocs of [Scenario](./Scenario.java). If a user wants to test all combinations of multiple sets of flags, they can use `TestFramework.addCrossProductScenarios()`.
 
@@ -174,16 +174,16 @@ The framework provides various stress and debug flags. They should mainly be use
 - `-DExclude=test3`: Provide a list of `@Test` method names which should be excluded from execution.
 - `-DScenarios=1,2`: Provide a list of scenario indexes to specify which scenarios should be executed.
 - `-DWarmup=200`: Provide a new default value of the number of warm-up iterations (framework default is 2000). This might have an influence on the resulting IR and could lead to matching failures (the user can also set a fixed default warm-up value in a test with `testFrameworkObject.setDefaultWarmup(200)`).
-- `-DReportStdout=true`: Print the standard output of the test VM.
+- `-DReportStdout=true`: Print the standard output of the Test VM.
 - `-DVerbose=true`: Enable more fine-grained logging (slows the execution down).
-- `-DReproduce=true`: Flag to use when directly running a test VM to bypass dependencies to the driver VM state (for example, when reproducing an issue).
+- `-DReproduce=true`: Flag to use when directly running a Test VM to bypass dependencies to the Driver VM state (for example, when reproducing an issue).
 - `-DPrintTimes=true`: Print the execution time measurements of each executed test.
 - `-DPrintRuleMatchingTime=true`: Print the time of matching IR rules per method. Slows down the execution as the rules are warmed up before measurement.
-- `-DVerifyVM=true`: The framework runs the test VM with additional verification flags (slows the execution down).
+- `-DVerifyVM=true`: The framework runs the Test VM with additional verification flags (slows the execution down).
 - `-DExcludeRandom=true`: The framework randomly excludes some methods from compilation. IR verification is disabled completely with this flag.
 - `-DFlipC1C2=true`: The framework compiles all `@Test` annotated method with C1 if a C2 compilation would have been applied and vice versa. IR verification is disabled completely with this flag.
 - `-DShuffleTests=false`: Disables the random execution order of all tests (such a shuffling is always done by default).
-- `-DDumpReplay=true`: Add the `DumpReplay` directive to the test VM.
+- `-DDumpReplay=true`: Add the `DumpReplay` directive to the Test VM.
 - `-DGCAfter=true`: Perform `System.gc()` after each test (slows the execution down).
 - `-DTestCompilationTimeout=20`: Change the default waiting time (default: 10s) for a compilation of a normal `@Test` annotated method.
 - `-DWaitForCompilationTimeout=20`: Change the default waiting time (default: 10s) for a compilation of a `@Test` annotated method with compilation level [WAIT\_FOR\_COMPILATION](./CompLevel.java).
@@ -193,12 +193,12 @@ The framework provides various stress and debug flags. They should mainly be use
 ## 3. Test Framework Execution
 This section gives an overview of how the framework is executing a JTreg test that calls the framework from within its `main()` method.
 
-The framework will spawn a new "test VM" to execute the user defined tests. The test VM collects all tests of the test class specified by the user code in `main()` and ensures that there is no violation of the required format by the framework. In a next step, the framework does the following for each test in general:
+The framework will spawn a new "Test VM" to execute the user defined tests. The Test VM collects all tests of the test class specified by the user code in `main()` and ensures that there is no violation of the required format by the framework. In a next step, the framework does the following for each test in general:
 1. Warm the test up for a predefined number of times (default 2000). This can also be adapted for all tests by using `testFrameworkobject.setDefaultWarmup(100)` or for individual tests with an additional [@Warmup](./Warmup.java) annotation.
 2. After the warm-up is finished, the framework compiles the associated `@Test` annotated method at the specified compilation level (default: C2).
 3. After the compilation, the test is invoked one more time.
 
-Once the test VM terminates, IR verification (if possible) is performed on the output of the test VM. If any test throws an exception during its execution or if IR matching fails, the failures are collected and reported in a pretty format. Check the standard error and output for more information and how to reproduce these failures.
+Once the Test VM terminates, IR verification (if possible) is performed on the output of the Test VM. If any test throws an exception during its execution or if IR matching fails, the failures are collected and reported in a pretty format. Check the standard error and output for more information and how to reproduce these failures.
 
 Some of the steps above can be different due to the kind of the test or due to using non-default annotation properties. These details and differences are described in the Javadocs for the three tests (see section 2.1 Different Tests).
 
@@ -212,10 +212,10 @@ Additional testing was performed by converting all compiler Inline Types tests t
 ## 5. Framework Package Structure
 A user only needs to import classes from the package `compiler.lib.ir_framework` (e.g. `import compiler.lib.ir_framework.*;`) which represents the interface classes to the framework. The remaining framework internal classes are kept in separate subpackages and should not directly be imported:
 
-- `compiler.lib.ir_framework.driver`: These classes are used while running the driver VM (same VM as the one running the user code's `main()` method of a JTreg test).
-- `compiler.lib.ir_framework.flag`: These classes are used while running the flag VM to determine additional flags for the test VM which are required for IR verification.
-- `compiler.lib.ir_framework.test`: These classes are used while running the test VM (i.e. the actual execution of the user tests as described in section 3).
-- `compiler.lib.ir_framework.shared`: These classes can be called from either the driver, flag, or test VM.
+- `compiler.lib.ir_framework.driver`: These classes are used while running the Driver VM (same VM as the one running the user code's `main()` method of a JTreg test).
+- `compiler.lib.ir_framework.flag`: These classes are used while running the Flag VM to determine additional flags for the Test VM which are required for IR verification.
+- `compiler.lib.ir_framework.test`: These classes are used while running the Test VM (i.e. the actual execution of the user tests as described in section 3).
+- `compiler.lib.ir_framework.shared`: These classes can be called from either the driver, flag, or Test VM.
 
 ## 6. Summary
 The initial design and feature set was kept simple and straight forward and serves well for small to medium sized tests. There are a lot of possibilities to further enhance the framework and make it more powerful. This can be tackled in additional RFEs. A few ideas can be found as subtasks of the [initial RFE](https://bugs.openjdk.org/browse/JDK-8254129) for this framework.
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/Scenario.java b/test/hotspot/jtreg/compiler/lib/ir_framework/Scenario.java
index 17776f7285c..65f61173e2a 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/Scenario.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/Scenario.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,16 +121,16 @@ public class Scenario {
     }
 
     /**
-     * Get the test VM output (stdout + stderr) of this scenario from the last execution of the framework.
+     * Get the Test VM output (stdout + stderr) of this scenario from the last execution of the framework.
      *
-     * @return the test VM output.
+     * @return the Test VM output.
      */
     public String getTestVMOutput() {
         return testVMOutput;
     }
 
     /**
-     * Set the test VM output, called by the framework.
+     * Set the Test VM output, called by the framework.
      */
     void setTestVMOutput(String testVMOutput) {
         this.testVMOutput = testVMOutput;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index 09e291ce5a4..debb025f449 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,19 +85,19 @@ import java.util.stream.Stream;
  * {@code runXX()} methods of {@link TestFramework}. The second way, which gives more control, is to create a new
  * {@code TestFramework} builder object on which {@link #start()} needs to be eventually called to start the testing.
  * <p>
- * The framework is called from the <i>driver VM</i> in which the JTreg test is initially run by specifying {@code
+ * The framework is called from the <i>Driver VM</i> in which the JTreg test is initially run by specifying {@code
  * @run driver} in the JTreg header. This strips all additionally specified JTreg VM and Javaoptions.
- * The framework creates a new <i>flag VM</i> with all these flags added again in order to figure out which flags are
+ * The framework creates a new <i>Flag VM</i> with all these flags added again in order to figure out which flags are
  * required to run the tests specified in the test class (e.g. {@code -XX:+PrintIdeal} and {@code -XX:+PrintOptoAssembly}
  * for IR matching).
  * <p>
- * After the flag VM terminates, it starts a new <i>test VM</i> which performs the execution of the specified
+ * After the Flag VM terminates, it starts a new <i>Test VM</i> which performs the execution of the specified
  * tests in the test class as described in {@link Test}, {@link Check}, and {@link Run}.
  * <p>
- * In a last step, once the test VM has terminated without exceptions, IR matching is performed if there are any IR
+ * In a last step, once the Test VM has terminated without exceptions, IR matching is performed if there are any IR
  * rules and if no VM flags disable it (e.g. not running with {@code -Xint}, see {@link IR} for more details).
  * The IR regex matching is done on the output of {@code -XX:+PrintIdeal} and {@code -XX:+PrintOptoAssembly} by parsing
- * the hotspot_pid file of the test VM. Failing IR rules are reported by throwing a {@link IRViolationException}.
+ * the hotspot_pid file of the Test VM. Failing IR rules are reported by throwing a {@link IRViolationException}.
  *
  * @see Test
  * @see Check
@@ -166,7 +166,7 @@ public class TestFramework {
                                                #############################################################
                                                 - To only run the failed tests use -DTest, -DExclude,
                                                   and/or -DScenarios.
-                                                - To also get the standard output of the test VM run with
+                                                - To also get the standard output of the Test VM run with
                                                   -DReportStdout=true or for even more fine-grained logging
                                                   use -DVerbose=true.
                                                #############################################################
@@ -183,7 +183,7 @@ public class TestFramework {
     private List<String> flags;
     private int defaultWarmup = -1;
     private boolean testClassesOnBootClassPath;
-    private boolean isAllowNotCompilable = false;
+    private boolean allowNotCompilable = false;
 
     /*
      * Public interface methods
@@ -236,10 +236,10 @@ public class TestFramework {
     }
 
     /**
-     * Tests the class from which this method was invoked from. The test VM is called with the specified {@code flags}.
+     * Tests the class from which this method was invoked from. The Test VM is called with the specified {@code flags}.
      * <ul>
      *     <li><p>The {@code flags} override any set VM or Javaoptions flags by JTreg by default.<p>
-     *            Use {@code -DPreferCommandLineFlags=true} if you want to prefer the JTreg VM and  Javaoptions flags over
+     *            Use {@code -DPreferCommandLineFlags=true} if you want to prefer the JTreg VM and Javaoptions flags over
      *            the specified {@code flags} of this method.</li>
      *     <li><p>If you want to run your entire JTreg test with additional flags, use this method.</li>
      *     <li><p>If you want to run your entire JTreg test with additional flags but for another test class then the one
@@ -248,7 +248,7 @@ public class TestFramework {
      *            {@link #addScenarios(Scenario...)}</li>
      * </ul>
      *
-     * @param flags VM flags to be used for the test VM.
+     * @param flags VM flags to be used for the Test VM.
      */
     public static void runWithFlags(String... flags) {
         StackWalker walker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
@@ -258,13 +258,13 @@ public class TestFramework {
     }
 
     /**
-     * Add VM flags to be used for the test VM. These flags override any VM or Javaoptions set by JTreg by default.<p>
+     * Add VM flags to be used for the Test VM. These flags override any VM or Javaoptions set by JTreg by default.<p>
      * Use {@code -DPreferCommandLineFlags=true} if you want to prefer the VM or Javaoptions over the scenario flags.
      *
      * <p>
      * The testing can be started by invoking {@link #start()}
      *
-     * @param flags VM options to be applied to the test VM.
+     * @param flags VM options to be applied to the Test VM.
      * @return the same framework instance.
      */
     public TestFramework addFlags(String... flags) {
@@ -306,7 +306,7 @@ public class TestFramework {
     }
 
     /**
-     * Add scenarios to be used for the test VM. A test VM is called for each scenario in {@code scenarios} by using the
+     * Add scenarios to be used for the Test VM. A Test VM is called for each scenario in {@code scenarios} by using the
      * specified VM flags in the scenario. The scenario flags override any flags set by {@link #addFlags(String...)}
      * and thus also override any VM or Javaoptions set by JTreg by default.<p>
      * Use {@code -DPreferCommandLineFlags=true} if you want to prefer the VM and Javaoptions over the scenario flags.
@@ -314,7 +314,7 @@ public class TestFramework {
      * <p>
      * The testing can be started by invoking {@link #start()}
      *
-     * @param scenarios scenarios which specify specific flags for the test VM.
+     * @param scenarios scenarios which specify specific flags for the Test VM.
      * @return the same framework instance.
      */
     public TestFramework addScenarios(Scenario... scenarios) {
@@ -498,15 +498,15 @@ public class TestFramework {
      * and else it is ignored silently.
      */
     public TestFramework allowNotCompilable() {
-        this.isAllowNotCompilable = true;
+        this.allowNotCompilable = true;
         return this;
     }
 
     /**
-     * Get the VM output of the test VM. Use {@code -DVerbose=true} to enable more debug information. If scenarios
+     * Get the VM output of the Test VM. Use {@code -DVerbose=true} to enable more debug information. If scenarios
      * were run, use {@link Scenario#getTestVMOutput()}.
      *
-     * @return the last test VM output.
+     * @return the last Test VM output.
      */
     public static String getLastTestVMOutput() {
         return TestVMProcess.getLastTestVMOutput();
@@ -721,7 +721,7 @@ public class TestFramework {
             nonWhiteListedFlags.forEach((f) -> System.out.println("  - " + f));
         }
 
-        System.out.println("");
+        System.out.println();
     }
 
     /**
@@ -796,9 +796,9 @@ public class TestFramework {
     }
 
     /**
-     * Execute a separate "flag" VM with White Box access to determine all test VM flags. The flag VM sends an encoding of
-     * all required flags for the test VM to the driver VM over a socket. Once the flag VM exits, this driver VM parses the
-     * test VM flags, which also determine if IR matching should be done, and then starts the test VM to execute all tests.
+     * Execute a separate Flag VM with White Box access to determine all Test VM flags. The Flag VM sends an encoding of
+     * all required flags for the Test VM to the Driver VM over a socket. Once the Flag VM exits, this Driver VM parses the
+     * Test VM flags, which also determine if IR matching should be done, and then starts the Test VM to execute all tests.
      */
     private void start(Scenario scenario) {
         if (scenario != null && !scenario.isEnabled()) {
@@ -823,12 +823,12 @@ public class TestFramework {
                     "" : " - [" + String.join(", ", additionalFlags) + "]";
 
             if (shouldVerifyIR) {
-                // Only need to use flag VM if an IR verification is possibly done.
+                // Only need to use Flag VM if an IR verification is possibly done.
                 System.out.println("Run Flag VM:");
                 FlagVMProcess flagVMProcess = new FlagVMProcess(testClass, additionalFlags);
                 shouldVerifyIR = flagVMProcess.shouldVerifyIR();
                 if (shouldVerifyIR) {
-                    // Add more flags for the test VM which are required to do IR verification.
+                    // Add more flags for the Test VM which are required to do IR verification.
                     additionalFlags.addAll(flagVMProcess.getTestVMFlags());
                 } // else: Flag VM found a reason to not do IR verification.
             } else {
@@ -860,8 +860,8 @@ public class TestFramework {
     private List<String> anyNonWhitelistedJTregVMAndJavaOptsFlags() {
         List<String> flags = Arrays.stream(Utils.getTestJavaOpts())
                                    .map(s -> s.replaceFirst("-XX:[+|-]?|-(?=[^D|^e])", ""))
-                                   .collect(Collectors.toList());
-        List<String> nonWhiteListedFlags = new ArrayList();
+                                   .toList();
+        List<String> nonWhiteListedFlags = new ArrayList<>();
         for (String flag : flags) {
             if (flag.contains("agentpath")) {
                 throw new SkippedException("Can't run test with -javaagent");
@@ -877,12 +877,11 @@ public class TestFramework {
 
     private void runTestVM(List<String> additionalFlags) {
         TestVMProcess testVMProcess = new TestVMProcess(additionalFlags, testClass, helperClasses, defaultWarmup,
-                                                        isAllowNotCompilable, testClassesOnBootClassPath);
+                                                        allowNotCompilable, testClassesOnBootClassPath);
         if (shouldVerifyIR) {
             try {
-                TestClassParser testClassParser = new TestClassParser(testClass, isAllowNotCompilable);
-                Matchable testClassMatchable = testClassParser.parse(testVMProcess.getHotspotPidFileName(),
-                                                                     testVMProcess.getIrEncoding());
+                TestClassParser testClassParser = new TestClassParser(testClass, allowNotCompilable);
+                Matchable testClassMatchable = testClassParser.parse(testVMProcess.testVmData());
                 IRMatcher matcher = new IRMatcher(testClassMatchable);
                 matcher.match();
             } catch (IRViolationException e) {
@@ -892,7 +891,7 @@ public class TestFramework {
         } else {
             System.out.println("IR verification disabled either due to no @IR annotations, through explicitly setting " +
                                "-DVerify=false, due to not running a debug build, using a non-whitelisted JTreg VM or " +
-                               "Javaopts flag like -Xint, or running the test VM with other VM flags added by user code " +
+                               "Javaopts flag like -Xint, or running the Test VM with other VM flags added by user code " +
                                "that make the IR verification impossible (e.g. -XX:-UseCompile, " +
                                "-XX:TieredStopAtLevel=[1,2,3], etc.).");
         }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
index 0b7d1db125c..86eb1935207 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/FlagVMProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * This class prepares, creates, and runs the "flag" VM with verification of proper termination. The flag VM determines
- * the flags required for the "test" VM. The flag VM writes these flags to a dedicated file which is then parsed by this
- * class after the termination of the flag VM.
+ * This class prepares, creates, and runs the Flag VM with verification of proper termination. The Flag VM determines
+ * the flags required for the Test VM. The Flag VM writes these flags to a dedicated file which is then parsed by this
+ * class after the termination of the Flag VM.
  *
  * @see FlagVM
  */
@@ -73,7 +73,7 @@ public class FlagVMProcess {
         String patternString = "(.*DShouldDoIRVerification=(true|false).*)";
         Pattern pattern = Pattern.compile(patternString);
         Matcher matcher = pattern.matcher(flags);
-        TestFramework.check(matcher.find(), "Invalid flag encoding emitted by flag VM");
+        TestFramework.check(matcher.find(), "Invalid flag encoding emitted by Flag VM");
         // Maybe we run with flags that make IR verification impossible
         shouldVerifyIR = Boolean.parseBoolean(matcher.group(2));
         testVMFlags.addAll(Arrays.asList(matcher.group(1).split(FlagVM.TEST_VM_FLAGS_DELIMITER)));
@@ -91,8 +91,8 @@ public class FlagVMProcess {
     }
 
     /**
-     * The flag VM needs White Box access to prepare all test VM flags. The flag VM will write the test VM flags to
-     * a dedicated file which is afterwards parsed by the driver VM and added as flags to the test VM.
+     * The Flag VM needs White Box access to prepare all Test VM flags. The Flag VM will write the Test VM flags to
+     * a dedicated file which is afterwards parsed by the Driver VM and added as flags to the Test VM.
      */
     private void prepareVMFlags(Class<?> testClass, List<String> additionalFlags) {
         cmds.add("-Dtest.jdk=" + Utils.TEST_JDK);
@@ -103,7 +103,7 @@ public class FlagVMProcess {
         cmds.add("-Xbootclasspath/a:.");
         cmds.add("-XX:+UnlockDiagnosticVMOptions");
         cmds.add("-XX:+WhiteBoxAPI");
-        // TestFramework and scenario flags might have an influence on the later used test VM flags. Add them as well.
+        // TestFramework and scenario flags might have an influence on the later used Test VM flags. Add them as well.
         cmds.addAll(additionalFlags);
         cmds.add(FlagVM.class.getCanonicalName());
         cmds.add(testClass.getCanonicalName());
@@ -111,10 +111,10 @@ public class FlagVMProcess {
 
     private void start() {
         try {
-            // Run "flag" VM with White Box access to determine the test VM flags and if IR verification should be done.
+            // Run Flag VM with White Box access to determine the Test VM flags and if IR verification should be done.
             oa = ProcessTools.executeTestJava(cmds);
         } catch (Exception e) {
-            throw new TestRunException("Failed to execute TestFramework flag VM", e);
+            throw new TestRunException("Failed to execute TestFramework Flag VM", e);
         }
         testVMFlagsFile = FlagVM.TEST_VM_FLAGS_FILE_PREFIX + oa.pid()
                           + FlagVM.FILE_POSTFIX;
@@ -125,14 +125,14 @@ public class FlagVMProcess {
         String flagVMOutput = oa.getOutput();
         int exitCode = oa.getExitValue();
         if (VERBOSE && exitCode == 0) {
-            System.out.println("--- OUTPUT TestFramework flag VM ---");
+            System.out.println("--- OUTPUT TestFramework Flag VM ---");
             System.out.println(flagVMOutput);
         }
 
         if (exitCode != 0) {
-            System.err.println("--- OUTPUT TestFramework flag VM ---");
+            System.err.println("--- OUTPUT TestFramework Flag VM ---");
             System.err.println(flagVMOutput);
-            throw new RuntimeException("TestFramework flag VM exited with " + exitCode);
+            throw new RuntimeException("TestFramework Flag VM exited with " + exitCode);
         }
     }
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMException.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMException.java
index 63b3d522b86..8de9ac8e348 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMException.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@ package compiler.lib.ir_framework.driver;
 import compiler.lib.ir_framework.shared.TestFormatException;
 
 /**
- * Exception that is thrown if the test VM has thrown any kind of exception (except for {@link TestFormatException}).
+ * Exception that is thrown if the Test VM has thrown any kind of exception (except for {@link TestFormatException}).
  */
 public class TestVMException extends RuntimeException {
     private final String exceptionInfo;
@@ -37,9 +37,9 @@ public class TestVMException extends RuntimeException {
     }
 
     /**
-     * Get some more detailed information about the exception thrown in the test VM and how to reproduce it.
+     * Get some more detailed information about the exception thrown in the Test VM and how to reproduce it.
      *
-     * @return a formatted string containing information about the exception of the test VM and how to reproduce it.
+     * @return a formatted string containing information about the exception of the Test VM and how to reproduce it.
      */
     public String getExceptionInfo() {
         return exceptionInfo;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
index 2b7fd2a1eea..00a9b93d124 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 package compiler.lib.ir_framework.driver;
 
 import compiler.lib.ir_framework.TestFramework;
+import compiler.lib.ir_framework.driver.network.TestVMData;
 import compiler.lib.ir_framework.shared.TestFrameworkException;
 import compiler.lib.ir_framework.shared.TestFrameworkSocket;
 import compiler.lib.ir_framework.shared.NoTestsRunException;
@@ -38,12 +39,11 @@ import java.io.File;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 /**
- * This class prepares, creates, and runs the "test" VM with verification of proper termination. The class also stores
- * information about the test VM which is later queried for IR matching. The communication between this driver VM
- * and the test VM is done over a dedicated socket.
+ * This class prepares, creates, and runs the Test VM with verification of proper termination. The class also stores
+ * information about the Test VM which is later queried for IR matching. The communication between this Driver VM
+ * and the Test VM is done over a dedicated socket.
  *
  * @see TestVM
  * @see TestFrameworkSocket
@@ -59,10 +59,9 @@ public class TestVMProcess {
     private static String lastTestVMOutput = "";
 
     private final ArrayList<String> cmds;
-    private String hotspotPidFileName;
     private String commandLine;
     private OutputAnalyzer oa;
-    private String irEncoding;
+    private final TestVMData testVmData;
 
     public TestVMProcess(List<String> additionalFlags, Class<?> testClass, Set<Class<?>> helperClasses, int defaultWarmup,
                          boolean allowNotCompilable, boolean testClassesOnBootClassPath) {
@@ -73,20 +72,18 @@ public class TestVMProcess {
                                allowNotCompilable, testClassesOnBootClassPath);
             start();
         }
-        processSocketOutput(socket);
         checkTestVMExitCode();
+        String hotspotPidFileName = String.format("hotspot_pid%d.log", oa.pid());
+        testVmData = socket.testVmData(hotspotPidFileName, allowNotCompilable);
+        testVmData.printJavaMessages();
     }
 
     public String getCommandLine() {
         return commandLine;
     }
 
-    public String getIrEncoding() {
-        return irEncoding;
-    }
-
-    public String getHotspotPidFileName() {
-        return hotspotPidFileName;
+    public TestVMData testVmData() {
+        return testVmData;
     }
 
     public static String getLastTestVMOutput() {
@@ -98,7 +95,7 @@ public class TestVMProcess {
                                     boolean testClassesOnBootClassPath) {
         // Set java.library.path so JNI tests which rely on jtreg nativepath setting work
         cmds.add("-Djava.library.path=" + Utils.TEST_NATIVE_PATH);
-        // Need White Box access in test VM.
+        // Need White Box access in Test VM.
         String bootClassPath = "-Xbootclasspath/a:.";
         if (testClassesOnBootClassPath) {
             // Add test classes themselves to boot classpath to make them privileged.
@@ -108,11 +105,12 @@ public class TestVMProcess {
         cmds.add("-XX:+UnlockDiagnosticVMOptions");
         cmds.add("-XX:+WhiteBoxAPI");
         // Ignore CompileCommand flags which have an impact on the profiling information.
-        List<String> jtregVMFlags = Arrays.stream(Utils.getTestJavaOpts()).filter(s -> !s.contains("CompileThreshold")).collect(Collectors.toList());
+        List<String> jtregVMFlags = Arrays.stream(Utils.getTestJavaOpts()).filter(s -> !s.contains("CompileThreshold")).toList();
         if (!PREFER_COMMAND_LINE_FLAGS) {
             cmds.addAll(jtregVMFlags);
         }
-        // Add server property flag that enables test VM to print encoding for IR verification last and debug messages.
+        // Add server property flag that enables the Test VM to print the Applicable IR Rules for IR verification and
+        // debug messages.
         cmds.add(socket.getPortPropertyFlag());
         cmds.addAll(additionalFlags);
         cmds.addAll(Arrays.asList(getDefaultFlags()));
@@ -142,7 +140,7 @@ public class TestVMProcess {
     }
 
     /**
-     * Default flags that are added used for the test VM.
+     * Default flags that are added used for the Test VM.
      */
     private static String[] getDefaultFlags() {
         return new String[] {"-XX:-BackgroundCompilation", "-XX:CompileCommand=quiet"};
@@ -169,62 +167,16 @@ public class TestVMProcess {
             throw new TestFrameworkException("Error while executing Test VM", e);
         }
 
-        process.command().add(1, "-DReproduce=true"); // Add after "/path/to/bin/java" in order to rerun the test VM directly
+        process.command().add(1, "-DReproduce=true"); // Add after "/path/to/bin/java" in order to rerun the Test VM directly
         commandLine = "Command Line:" + System.lineSeparator() + String.join(" ", process.command())
                       + System.lineSeparator();
-        hotspotPidFileName = String.format("hotspot_pid%d.log", oa.pid());
         lastTestVMOutput = oa.getOutput();
     }
 
-    /**
-     * Process the socket output: All prefixed lines are dumped to the standard output while the remaining lines
-     * represent the IR encoding used for IR matching later.
-     */
-    private void processSocketOutput(TestFrameworkSocket socket) {
-        String output = socket.getOutput();
-        if (socket.hasStdOut()) {
-            StringBuilder testListBuilder = new StringBuilder();
-            StringBuilder messagesBuilder = new StringBuilder();
-            StringBuilder nonStdOutBuilder = new StringBuilder();
-            Scanner scanner = new Scanner(output);
-            while (scanner.hasNextLine()) {
-                String line = scanner.nextLine();
-                if (line.startsWith(TestFrameworkSocket.STDOUT_PREFIX)) {
-                    // Exclude [STDOUT] from message.
-                    line = line.substring(TestFrameworkSocket.STDOUT_PREFIX.length());
-                    if (line.startsWith(TestFrameworkSocket.TESTLIST_TAG)) {
-                        // Exclude [TESTLIST] from message for better formatting.
-                        line = "> " + line.substring(TestFrameworkSocket.TESTLIST_TAG.length() + 1);
-                        testListBuilder.append(line).append(System.lineSeparator());
-                    } else {
-                        messagesBuilder.append(line).append(System.lineSeparator());
-                    }
-                } else {
-                    nonStdOutBuilder.append(line).append(System.lineSeparator());
-                }
-            }
-            System.out.println();
-            if (!testListBuilder.isEmpty()) {
-                System.out.println("Run flag defined test list");
-                System.out.println("--------------------------");
-                System.out.println(testListBuilder);
-                System.out.println();
-            }
-            if (!messagesBuilder.isEmpty()) {
-                System.out.println("Messages from Test VM");
-                System.out.println("---------------------");
-                System.out.println(messagesBuilder);
-            }
-            irEncoding = nonStdOutBuilder.toString();
-        } else {
-            irEncoding = output;
-        }
-    }
-
     private void checkTestVMExitCode() {
         final int exitCode = oa.getExitValue();
         if (EXCLUDE_RANDOM || REPORT_STDOUT || (VERBOSE && exitCode == 0)) {
-            System.out.println("--- OUTPUT TestFramework test VM ---");
+            System.out.println("--- OUTPUT TestFramework Test VM ---");
             System.out.println(oa.getOutput());
         }
 
@@ -234,7 +186,7 @@ public class TestVMProcess {
     }
 
     /**
-     * Exit code was non-zero of test VM. Check the stderr to determine what kind of exception that should be thrown to
+     * Exit code was non-zero of Test VM. Check the stderr to determine what kind of exception that should be thrown to
      * react accordingly later.
      */
     private void throwTestVMException() {
@@ -266,7 +218,7 @@ public class TestVMProcess {
             stdOut = System.lineSeparator() + System.lineSeparator() + "Standard Output" + System.lineSeparator()
                      + "---------------" + System.lineSeparator() + oa.getOutput();
         }
-        return "TestFramework test VM exited with code " + exitCode + System.lineSeparator() + stdOut
+        return "TestFramework Test VM exited with code " + exitCode + System.lineSeparator() + stdOut
                + System.lineSeparator() + commandLine + System.lineSeparator() + System.lineSeparator()
                + "Error Output" + System.lineSeparator() + "------------" + System.lineSeparator() + stdErr
                + System.lineSeparator() + System.lineSeparator();
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethod.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethod.java
index 714af5c6519..5fbe90f0e72 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethod.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/IRMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import compiler.lib.ir_framework.driver.irmatching.Matchable;
 import compiler.lib.ir_framework.driver.irmatching.MatchableMatcher;
 import compiler.lib.ir_framework.driver.irmatching.irrule.IRRule;
 import compiler.lib.ir_framework.driver.irmatching.parser.VMInfo;
+import compiler.lib.ir_framework.driver.network.testvm.java.IRRuleIds;
 import compiler.lib.ir_framework.shared.TestFormat;
 import compiler.lib.ir_framework.shared.TestFormatException;
 
@@ -53,14 +54,14 @@ public class IRMethod implements IRMethodMatchable {
     private final Method method;
     private final MatchableMatcher matcher;
 
-    public IRMethod(Method method, int[] ruleIds, IR[] irAnnos, Compilation compilation, VMInfo vmInfo) {
+    public IRMethod(Method method, IRRuleIds irRuleIds, IR[] irAnnos, Compilation compilation, VMInfo vmInfo) {
         this.method = method;
-        this.matcher = new MatchableMatcher(createIRRules(method, ruleIds, irAnnos, compilation, vmInfo));
+        this.matcher = new MatchableMatcher(createIRRules(method, irRuleIds, irAnnos, compilation, vmInfo));
     }
 
-    private List<Matchable> createIRRules(Method method, int[] ruleIds, IR[] irAnnos, Compilation compilation, VMInfo vmInfo) {
+    private List<Matchable> createIRRules(Method method, IRRuleIds irRuleIds, IR[] irAnnos, Compilation compilation, VMInfo vmInfo) {
         List<Matchable> irRules = new ArrayList<>();
-        for (int ruleId : ruleIds) {
+        for (int ruleId : irRuleIds) {
             try {
                 irRules.add(new IRRule(ruleId, irAnnos[ruleId - 1], compilation, vmInfo));
             } catch (TestFormatException e) {
@@ -89,16 +90,15 @@ public class IRMethod implements IRMethodMatchable {
             return new IRMethodMatchResult(method, matcher.match());
         }
 
-        List<MatchResult> match;
         for (int i = 0; i < 10; i++) {  // warm up
-            match = matcher.match();
+            matcher.match();
         }
 
         long startTime = System.nanoTime();
-        match = matcher.match();
+        List<MatchResult> match = matcher.match();
         long endTime = System.nanoTime();
         long duration = (endTime - startTime);
-        System.out.println("Verifying IR rules for " + name() + ": " + duration + " ns = " + (duration / 1000000) + " ms");
+        System.out.println("Verifying IR rules for " + name() + ": " + duration + " ns = " + (duration / 1_000_000) + " ms");
         return new IRMethodMatchResult(method, match);
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java
index d74825c8d4f..cb99ea219fe 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,7 @@
 package compiler.lib.ir_framework.driver.irmatching.irmethod;
 
 import compiler.lib.ir_framework.IR;
-import compiler.lib.ir_framework.Run;
-import compiler.lib.ir_framework.RunMode;
+import compiler.lib.ir_framework.Test;
 
 import java.lang.reflect.Method;
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java
index 011b596cc9e..bea8dc3ab27 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,7 @@
 
 package compiler.lib.ir_framework.driver.irmatching.irmethod;
 
-import compiler.lib.ir_framework.Run;
-import compiler.lib.ir_framework.RunMode;
+import compiler.lib.ir_framework.Test;
 import compiler.lib.ir_framework.driver.irmatching.MatchResult;
 import compiler.lib.ir_framework.driver.irmatching.visitor.MatchResultVisitor;
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/ApplicableIRRulesParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/ApplicableIRRulesParser.java
new file mode 100644
index 00000000000..d251c574e47
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/ApplicableIRRulesParser.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.irmatching.parser;
+
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.TestFramework;
+import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.HotSpotPidFileParser;
+import compiler.lib.ir_framework.driver.network.testvm.java.IRRuleIds;
+import compiler.lib.ir_framework.shared.TestFormat;
+import compiler.lib.ir_framework.shared.TestFrameworkException;
+import compiler.lib.ir_framework.test.ApplicableIRRulesPrinter;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Class to parse the Applicable IR Rules emitted by the Test VM and creating {@link TestMethod} objects for each entry.
+ *
+ * @see TestMethod
+ */
+public class ApplicableIRRulesParser {
+    private final Map<String, TestMethod> testMethods;
+    private final Class<?> testClass;
+
+    public ApplicableIRRulesParser(Class<?> testClass) {
+        this.testClass = testClass;
+        this.testMethods = new HashMap<>();
+    }
+
+    /**
+     * Parse the Applicable IR rules passed as parameter and return a "test name" -> TestMethod map that contains an
+     * entry for each method that needs to be IR matched on.
+     */
+    public TestMethods parse(String applicableIRRules) {
+        createTestMethodMap(applicableIRRules, testClass);
+        // We could have found format errors in @IR annotations. Report them now with an exception.
+        TestFormat.throwIfAnyFailures();
+        return new TestMethods(testMethods);
+    }
+
+    /**
+     * Sets up a map testname -> TestMethod map. The TestMethod object will later be filled with the ideal and opto
+     * assembly output in {@link HotSpotPidFileParser}.
+     */
+    private void createTestMethodMap(String applicableIRRules, Class<?> testClass) {
+        Map<String, IRRuleIds> irRulesMap = parseApplicableIRRules(applicableIRRules);
+        createTestMethodsWithApplicableIRRules(testClass, irRulesMap);
+    }
+
+    /**
+     * Read the Applicable IR Rules emitted by the Test VM to decide if an @IR rule must be checked for a method.
+     */
+    private Map<String, IRRuleIds> parseApplicableIRRules(String applicableIRRules) {
+        Map<String, IRRuleIds> irRulesMap = new HashMap<>();
+        String[] applicableIRRulesLines = getApplicableIRRulesLines(applicableIRRules);
+        for (String s : applicableIRRulesLines) {
+            String line = s.trim();
+            String[] splitLine = line.split(",");
+            if (splitLine.length < 2) {
+                throw new TestFrameworkException("Invalid Applicable IR Rules format. No comma found: " + splitLine[0]);
+            }
+            String testName = splitLine[0];
+            IRRuleIds irRuleIds = parseIrRulesIds(splitLine);
+            irRulesMap.put(testName, irRuleIds);
+        }
+        return irRulesMap;
+    }
+
+    /**
+     * Parse the Applicable IR Rules lines without header, explanation line and footer and return them in an array.
+     */
+    private String[] getApplicableIRRulesLines(String applicableIRRules) {
+        if (applicableIRRules.isEmpty()) {
+            // Nothing to IR match.
+            return new String[0];
+        }
+        return applicableIRRules.split("\\R");
+    }
+
+    /**
+     * Parse rule indexes from a single line of the Applicable IR Rules in the format: <method,idx1,idx2,...>
+     */
+    private IRRuleIds parseIrRulesIds(String[] splitLine) {
+        List<Integer> irRuleIds = new ArrayList<>();
+        for (int i = 1; i < splitLine.length; i++) {
+            try {
+                irRuleIds.add(Integer.parseInt(splitLine[i]));
+            } catch (NumberFormatException e) {
+                throw new TestFrameworkException("Invalid Applicable IR Rules format. No number found: " + splitLine[i]);
+            }
+        }
+        return new IRRuleIds(irRuleIds);
+    }
+
+    private void createTestMethodsWithApplicableIRRules(Class<?> testClass, Map<String, IRRuleIds> irRulesMap) {
+        for (Method m : testClass.getDeclaredMethods()) {
+            IR[] irAnnos = m.getAnnotationsByType(IR.class);
+            if (irAnnos.length > 0) {
+                // Validation of legal @IR attributes and placement of the annotation was already done in Test VM.
+                IRRuleIds irRuleIds = irRulesMap.get(m.getName());
+                validateIRRuleIds(m, irAnnos, irRuleIds);
+                if (hasAnyApplicableIRRules(irRuleIds)) {
+                    testMethods.put(m.getName(), new TestMethod(m, irAnnos, irRuleIds));
+                }
+            }
+        }
+    }
+
+    private void validateIRRuleIds(Method m, IR[] irAnnos, IRRuleIds irRuleIds) {
+        TestFramework.check(irRuleIds != null, "Should find method name in validIrRulesMap for " + m);
+        TestFramework.check(!irRuleIds.isEmpty(), "Did not find any rule indices for " + m);
+        TestFramework.check((irRuleIds.first() >= 1 || irRuleIds.first() == ApplicableIRRulesPrinter.NO_RULES)
+                            && irRuleIds.last() <= irAnnos.length,
+                            "Invalid IR rule index found in validIrRulesMap for " + m);
+    }
+
+    /**
+     * Does the list of IR rules contain any applicable IR rules for the given conditions?
+     */
+    private boolean hasAnyApplicableIRRules(IRRuleIds irRuleIds) {
+        return irRuleIds.first() != ApplicableIRRulesPrinter.NO_RULES;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IREncodingParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IREncodingParser.java
deleted file mode 100644
index 28c4213f82d..00000000000
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IREncodingParser.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package compiler.lib.ir_framework.driver.irmatching.parser;
-
-import compiler.lib.ir_framework.IR;
-import compiler.lib.ir_framework.TestFramework;
-import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.HotSpotPidFileParser;
-import compiler.lib.ir_framework.shared.TestFormat;
-import compiler.lib.ir_framework.shared.TestFrameworkException;
-import compiler.lib.ir_framework.test.IREncodingPrinter;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Class to parse the IR encoding emitted by the test VM and creating {@link TestMethod} objects for each entry.
- *
- * @see TestMethod
- */
-public class IREncodingParser {
-
-    private static final boolean PRINT_IR_ENCODING = Boolean.parseBoolean(System.getProperty("PrintIREncoding", "false"));
-    private static final Pattern IR_ENCODING_PATTERN =
-            Pattern.compile("(?<=" + IREncodingPrinter.START + "\r?\n).*\\R([\\s\\S]*)(?=" + IREncodingPrinter.END + ")");
-
-    private final Map<String, TestMethod> testMethods;
-    private final Class<?> testClass;
-
-    public IREncodingParser(Class<?> testClass) {
-        this.testClass = testClass;
-        this.testMethods = new HashMap<>();
-    }
-
-    /**
-     * Parse the IR encoding passed as parameter and return a "test name" -> TestMethod map that contains an entry
-     * for each method that needs to be IR matched on.
-     */
-    public TestMethods parse(String irEncoding) {
-        if (TestFramework.VERBOSE || PRINT_IR_ENCODING) {
-            System.out.println("Read IR encoding from test VM:");
-            System.out.println(irEncoding);
-        }
-        createTestMethodMap(irEncoding, testClass);
-        // We could have found format errors in @IR annotations. Report them now with an exception.
-        TestFormat.throwIfAnyFailures();
-        return new TestMethods(testMethods);
-    }
-
-    /**
-     * Sets up a map testname -> TestMethod map. The TestMethod object will later be filled with the ideal and opto
-     * assembly output in {@link HotSpotPidFileParser}.
-     */
-    private void createTestMethodMap(String irEncoding, Class<?> testClass) {
-        Map<String, int[]> irRulesMap = parseIREncoding(irEncoding);
-        createTestMethodsWithEncoding(testClass, irRulesMap);
-    }
-
-    /**
-     * Read the IR encoding emitted by the test VM to decide if an @IR rule must be checked for a method.
-     */
-    private Map<String, int[]> parseIREncoding(String irEncoding) {
-        Map<String, int[]> irRulesMap = new HashMap<>();
-        String[] irEncodingLines = getIREncodingLines(irEncoding);
-        for (String s : irEncodingLines) {
-            String line = s.trim();
-            String[] splitLine = line.split(",");
-            if (splitLine.length < 2) {
-                throw new TestFrameworkException("Invalid IR match rule encoding. No comma found: " + splitLine[0]);
-            }
-            String testName = splitLine[0];
-            int[] irRulesIdx = getRuleIndexes(splitLine);
-            irRulesMap.put(testName, irRulesIdx);
-        }
-        return irRulesMap;
-    }
-
-    /**
-     * Parse the IR encoding lines without header, explanation line and footer and return them in an array.
-     */
-    private String[] getIREncodingLines(String irEncoding) {
-        Matcher matcher = IR_ENCODING_PATTERN.matcher(irEncoding);
-        TestFramework.check(matcher.find(), "Did not find IR encoding in:" + System.lineSeparator() + irEncoding);
-        String lines = matcher.group(1).trim();
-        if (lines.isEmpty()) {
-            // Nothing to IR match.
-            return new String[0];
-        }
-        return lines.split("\\R");
-    }
-
-    /**
-     * Parse rule indexes from IR encoding line of the format: <method,idx1,idx2,...>
-     */
-    private int[] getRuleIndexes(String[] splitLine) {
-        int[] irRulesIdx = new int[splitLine.length - 1];
-        for (int i = 1; i < splitLine.length; i++) {
-            try {
-                irRulesIdx[i - 1] = Integer.parseInt(splitLine[i]);
-            } catch (NumberFormatException e) {
-                throw new TestFrameworkException("Invalid IR match rule encoding. No number found: " + splitLine[i]);
-            }
-        }
-        return irRulesIdx;
-    }
-
-    private void createTestMethodsWithEncoding(Class<?> testClass, Map<String, int[]> irRulesMap) {
-        for (Method m : testClass.getDeclaredMethods()) {
-            IR[] irAnnos = m.getAnnotationsByType(IR.class);
-            if (irAnnos.length > 0) {
-                // Validation of legal @IR attributes and placement of the annotation was already done in Test VM.
-                int[] irRuleIds = irRulesMap.get(m.getName());
-                validateIRRuleIds(m, irAnnos, irRuleIds);
-                if (hasAnyApplicableIRRules(irRuleIds)) {
-                    testMethods.put(m.getName(), new TestMethod(m, irAnnos, irRuleIds));
-                }
-            }
-        }
-    }
-
-    private void validateIRRuleIds(Method m, IR[] irAnnos, int[] ids) {
-        TestFramework.check(ids != null, "Should find method name in validIrRulesMap for " + m);
-        TestFramework.check(ids.length > 0, "Did not find any rule indices for " + m);
-        TestFramework.check((ids[0] >= 1 || ids[0] == IREncodingPrinter.NO_RULE_APPLIED)
-                            && ids[ids.length - 1] <= irAnnos.length,
-                            "Invalid IR rule index found in validIrRulesMap for " + m);
-    }
-
-    /**
-     * Does the list of IR rules contain any applicable IR rules for the given conditions?
-     */
-    private boolean hasAnyApplicableIRRules(int[] irRuleIds) {
-        return irRuleIds[0] != IREncodingPrinter.NO_RULE_APPLIED;
-    }
-}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java
index 538680496e7..46a237576e6 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 package compiler.lib.ir_framework.driver.irmatching.parser;
 
 import compiler.lib.ir_framework.Test;
-import compiler.lib.ir_framework.TestFramework;
 import compiler.lib.ir_framework.driver.irmatching.Compilation;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethod;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethodMatchable;
@@ -53,7 +52,7 @@ class IRMethodBuilder {
     }
 
     /**
-     * Create IR methods for all test methods identified by {@link IREncodingParser} by combining them with the parsed
+     * Create IR methods for all test methods identified by {@link ApplicableIRRulesParser} by combining them with the parsed
      * compilation output from {@link HotSpotPidFileParser}.
      */
     public SortedSet<IRMethodMatchable> build(VMInfo vmInfo) {
@@ -72,9 +71,9 @@ class IRMethodBuilder {
             Test[] testAnnos = testMethod.method().getAnnotationsByType(Test.class);
             boolean allowMethodNotCompilable = allowNotCompilable || testAnnos[0].allowNotCompilable();
             if (allowMethodNotCompilable) {
-                return new NotCompilableIRMethod(testMethod.method(), testMethod.irRuleIds().length);
+                return new NotCompilableIRMethod(testMethod.method(), testMethod.irRuleIds().count());
             } else {
-                return new NotCompiledIRMethod(testMethod.method(), testMethod.irRuleIds().length);
+                return new NotCompiledIRMethod(testMethod.method(), testMethod.irRuleIds().count());
             }
         }
     }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java
index b6c9920c2d1..ca36a3e9f72 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethod;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethodMatchable;
 import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.HotSpotPidFileParser;
 import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.LoggedMethods;
+import compiler.lib.ir_framework.driver.network.TestVMData;
 import compiler.lib.ir_framework.shared.TestFormat;
 
 import java.util.SortedSet;
@@ -50,23 +51,23 @@ public class TestClassParser {
     }
 
     /**
-     * Parse the IR encoding and hotspot_pid* file to create a collection of {@link IRMethod} objects.
+     * Parse the Applicable IR Rules and hotspot_pid* file to create a collection of {@link IRMethod} objects.
      * Return a default/empty TestClass object if there are no applicable @IR rules in any method of the test class.
      */
-    public Matchable parse(String hotspotPidFileName, String irEncoding) {
-        IREncodingParser irEncodingParser = new IREncodingParser(testClass);
-        TestMethods testMethods = irEncodingParser.parse(irEncoding);
-        VMInfo vmInfo = VMInfoParser.parseVMInfo(irEncoding);
+    public Matchable parse(TestVMData testVmData) {
+        ApplicableIRRulesParser applicableIRRulesParser = new ApplicableIRRulesParser(testClass);
+        TestMethods testMethods = applicableIRRulesParser.parse(testVmData.applicableIRRules());
+        VMInfo vmInfo = VMInfoParser.parseVMInfo(testVmData.vmInfo());
         if (testMethods.hasTestMethods()) {
             HotSpotPidFileParser hotSpotPidFileParser = new HotSpotPidFileParser(testClass.getName(), testMethods);
-            LoggedMethods loggedMethods = hotSpotPidFileParser.parse(hotspotPidFileName);
+            LoggedMethods loggedMethods = hotSpotPidFileParser.parse(testVmData.hotspotPidFileName());
             return createTestClass(testMethods, loggedMethods, vmInfo);
         }
         return new NonIRTestClass();
     }
 
     /**
-     * Create test class with IR methods for all test methods identified by {@link IREncodingParser} by combining them
+     * Create test class with IR methods for all test methods identified by {@link ApplicableIRRulesParser} by combining them
      * with the parsed compilation output from {@link HotSpotPidFileParser}.
      */
     private Matchable createTestClass(TestMethods testMethods, LoggedMethods loggedMethods, VMInfo vmInfo) {
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethod.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethod.java
index 8491b8d61eb..37989d8810b 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethod.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,23 +26,24 @@ package compiler.lib.ir_framework.driver.irmatching.parser;
 import compiler.lib.ir_framework.IR;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethod;
 import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.LoggedMethod;
+import compiler.lib.ir_framework.driver.network.testvm.java.IRRuleIds;
 
 import java.lang.reflect.Method;
 
 /**
- * This class represents a test method parsed by {@link IREncodingParser}. In combination with the associated
+ * This class represents a test method parsed by {@link ApplicableIRRulesParser}. In combination with the associated
  * {@link LoggedMethod}, a new {@link IRMethod} is created to IR match on later.
  *
- * @see IREncodingParser
+ * @see ApplicableIRRulesParser
  * @see LoggedMethod
  * @see IRMethod
  */
 public class TestMethod {
     private final Method method;
     private final IR[] irAnnos;
-    private final int[] irRuleIds;
+    private final IRRuleIds irRuleIds;
 
-    public TestMethod(Method m, IR[] irAnnos, int[] irRuleIds) {
+    public TestMethod(Method m, IR[] irAnnos, IRRuleIds irRuleIds) {
         this.method = m;
         this.irAnnos = irAnnos;
         this.irRuleIds = irRuleIds;
@@ -56,7 +57,7 @@ public class TestMethod {
         return irAnnos;
     }
 
-    public int[] irRuleIds() {
+    public IRRuleIds irRuleIds() {
         return irRuleIds;
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethods.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethods.java
index ecc8fb4e0b9..d1edfb08fdf 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethods.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,15 @@ import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.HotSpotPidFile
 import java.util.Map;
 
 /**
- * This class stores all test methods that need to be IR matched as identified by {@link IREncodingParser}.
+ * This class stores all test methods that need to be IR matched as identified by {@link ApplicableIRRulesParser}.
  *
- * @see IREncodingParser
+ * @see ApplicableIRRulesParser
  * @see HotSpotPidFileParser
  * @see IRMethod
  */
 public class TestMethods {
     /**
-     * "Method name" -> TestMethod map created by {@link IREncodingParser} which contains an entry for each method that
+     * "Method name" -> TestMethod map created by {@link ApplicableIRRulesParser} which contains an entry for each method that
      * needs to be IR matched on.
      */
     private final Map<String, TestMethod> testMethods;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
index db70e7892a2..89b6d610496 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
 /**
  * This class stores the key value mapping from the VMInfo.
  *
- * @see IREncodingParser
+ * @see ApplicableIRRulesParser
  */
 public class VMInfo {
     /**
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfoParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfoParser.java
index a8e6782ab12..44013839754 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfoParser.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfoParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,31 +23,24 @@
 
 package compiler.lib.ir_framework.driver.irmatching.parser;
 
-import compiler.lib.ir_framework.TestFramework;
 import compiler.lib.ir_framework.shared.TestFrameworkException;
-import compiler.lib.ir_framework.test.VMInfoPrinter;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
- * Class to parse the VMInfo emitted by the test VM and creating {@link VMInfo} objects for each entry.
+ * Class to parse the VMInfo emitted by the Test VM and creating {@link VMInfo} objects for each entry.
  *
  * @see VMInfo
  */
 public class VMInfoParser {
 
-    private static final Pattern VM_INFO_PATTERN =
-            Pattern.compile("(?<=" + VMInfoPrinter.START_VM_INFO + "\r?\n).*\\R([\\s\\S]*)(?=" + VMInfoPrinter.END_VM_INFO + ")");
-
     /**
-     * Extract VMInfo from the irEncoding.
+     * Create a new VMInfo object from the vmInfo string.
      */
-    public static VMInfo parseVMInfo(String irEncoding) {
+    public static VMInfo parseVMInfo(String vmInfo) {
         Map<String, String> map = new HashMap<>();
-        String[] lines = getVMInfoLines(irEncoding);
+        String[] lines = getVMInfoLines(vmInfo);
         for (String s : lines) {
             String line = s.trim();
             String[] splitLine = line.split(":", 2);
@@ -62,16 +55,13 @@ public class VMInfoParser {
     }
 
     /**
-     * Extract the VMInfo from the irEncoding string, strip away the header and return the individual key-value lines.
+     * Extract the VMInfo from the applicableIRRules string, strip away the header and return the individual key-value lines.
      */
-    private static String[] getVMInfoLines(String irEncoding) {
-        Matcher matcher = VM_INFO_PATTERN.matcher(irEncoding);
-        TestFramework.check(matcher.find(), "Did not find VMInfo in:" + System.lineSeparator() + irEncoding);
-        String lines = matcher.group(1).trim();
-        if (lines.isEmpty()) {
+    private static String[] getVMInfoLines(String vmInfo) {
+        if (vmInfo.isEmpty()) {
             // Nothing to IR match.
             return new String[0];
         }
-        return lines.split("\\R");
+        return vmInfo.split("\\R");
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/CompileQueueMessages.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/CompileQueueMessages.java
index 9ccb78ea892..f9fa0d1433e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/CompileQueueMessages.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/CompileQueueMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 package compiler.lib.ir_framework.driver.irmatching.parser.hotspot;
 
 import compiler.lib.ir_framework.TestFramework;
-import compiler.lib.ir_framework.driver.irmatching.parser.IREncodingParser;
+import compiler.lib.ir_framework.driver.irmatching.parser.ApplicableIRRulesParser;
 import compiler.lib.ir_framework.driver.irmatching.parser.TestMethods;
 
 import java.util.HashMap;
@@ -34,9 +34,9 @@ import java.util.regex.Pattern;
 
 /**
  * This class parses compile queue messages found in the hotspot_pid* files and keeps track of those that need to be
- * IR matched (i.e. identified by {@link IREncodingParser}.
+ * IR matched (i.e. identified by {@link ApplicableIRRulesParser}.
  *
- * @see IREncodingParser
+ * @see ApplicableIRRulesParser
  */
 class CompileQueueMessages {
     private static final Pattern COMPILE_ID_PATTERN = Pattern.compile("compile_id='(\\d+)'");
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/HotSpotPidFileParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/HotSpotPidFileParser.java
index a5a5a0b20a9..f39f7cc9a83 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/HotSpotPidFileParser.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/HotSpotPidFileParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 package compiler.lib.ir_framework.driver.irmatching.parser.hotspot;
 
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethod;
-import compiler.lib.ir_framework.driver.irmatching.parser.IREncodingParser;
+import compiler.lib.ir_framework.driver.irmatching.parser.ApplicableIRRulesParser;
 import compiler.lib.ir_framework.driver.irmatching.parser.TestMethods;
 import compiler.lib.ir_framework.shared.TestFrameworkException;
 
@@ -34,10 +34,10 @@ import java.nio.file.Paths;
 
 /**
  * Class to parse the ideal compile phases and PrintOptoAssembly outputs of the test class from the hotspot_pid* file
- * of all methods identified by {@link IREncodingParser}.
+ * of all methods identified by {@link ApplicableIRRulesParser}.
  *
  * @see IRMethod
- * @see IREncodingParser
+ * @see ApplicableIRRulesParser
  */
 public class HotSpotPidFileParser {
     private final State state;
@@ -47,8 +47,8 @@ public class HotSpotPidFileParser {
     }
 
     /**
-     * Parse the hotspot_pid*.log file from the test VM. Read the ideal compile phase and PrintOptoAssembly outputs for
-     * all methods defined by the IR encoding.
+     * Parse the hotspot_pid*.log file from the Test VM. Read the ideal compile phase and PrintOptoAssembly outputs for
+     * all methods defined by the Applicable IR Rules.
      */
     public LoggedMethods parse(String hotspotPidFileName) {
         try (var reader = Files.newBufferedReader(Paths.get(hotspotPidFileName))) {
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
index 9cbba83e90b..f52c5f8fb5f 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,8 @@ public class FailureMessageBuilder implements MatchResultVisitor {
             msg.append(System.lineSeparator());
         }
         msg.append(methodIndex).append(") ");
-        msg.append("Method \"").append(method)
+        msg.append("Method \"")
+           .append(method.getDeclaringClass().getTypeName()).append("::").append(method.getName())
            .append("\" - [Failed IR rules: ").append(failedIRRules).append("]:")
            .append(System.lineSeparator());
     }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/TestVMData.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/TestVMData.java
new file mode 100644
index 00000000000..413cf3347d8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/TestVMData.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network;
+
+import compiler.lib.ir_framework.driver.irmatching.IRMatcher;
+import compiler.lib.ir_framework.driver.network.testvm.java.JavaMessages;
+import compiler.lib.ir_framework.shared.TestFrameworkSocket;
+
+/**
+ * This class collects all the parsed data received over the {@link TestFrameworkSocket}. This data is required later
+ * in the {@link IRMatcher}.
+ */
+public class TestVMData {
+    private final JavaMessages javaMessages;
+    private final boolean allowNotCompilable;
+    private final String hotspotPidFileName;
+
+    public TestVMData(JavaMessages javaMessages, String hotspotPidFileName, boolean allowNotCompilable) {
+        this.javaMessages = javaMessages;
+        this.hotspotPidFileName = hotspotPidFileName;
+        this.allowNotCompilable = allowNotCompilable;
+    }
+
+    public String applicableIRRules() {
+        return javaMessages.applicableIRRules();
+    }
+
+    public String vmInfo() {
+        return javaMessages.vmInfo();
+    }
+
+    public String hotspotPidFileName() {
+        return hotspotPidFileName;
+    }
+
+    public boolean allowNotCompilable() {
+        return allowNotCompilable;
+    }
+
+    public void printJavaMessages() {
+        javaMessages.print();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/TestVmMessageReader.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/TestVmMessageReader.java
new file mode 100644
index 00000000000..a203fd367f7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/TestVmMessageReader.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network.testvm;
+
+import compiler.lib.ir_framework.driver.network.testvm.java.JavaMessageParser;
+import compiler.lib.ir_framework.driver.network.testvm.java.JavaMessages;
+import compiler.lib.ir_framework.shared.TestFrameworkException;
+import compiler.lib.ir_framework.shared.TestFrameworkSocket;
+
+import java.io.BufferedReader;
+import java.net.Socket;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
+/**
+ * Dedicated reader for Test VM messages received by the {@link TestFrameworkSocket}. The reader is used as a task
+ * wrapped in a {@link Future}. The received messages are parsed with the {@link JavaMessageParser}. Once the Test VM
+ * is terminated, client connection is closed and the parsed messages can be fetched with {@link Future#get()} which
+ * calls {@link #call()}.
+ */
+public class TestVmMessageReader implements Callable<JavaMessages> {
+    private final Socket socket;
+    private final BufferedReader reader;
+    private final JavaMessageParser messageParser;
+
+    public TestVmMessageReader(Socket socket, BufferedReader reader) {
+        this.socket = socket;
+        this.reader = reader;
+        this.messageParser = new JavaMessageParser();
+    }
+
+    @Override
+    public JavaMessages call() {
+        try (socket; reader) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                messageParser.parseLine(line);
+            }
+            return messageParser.output();
+        } catch (Exception e) {
+            throw new TestFrameworkException("Error while reading Test VM socket messages", e);
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutNoProxyAsync.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/ExecutedTests.java
similarity index 52%
rename from test/jdk/java/net/httpclient/ConnectTimeoutNoProxyAsync.java
rename to test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/ExecutedTests.java
index ace12cd0295..f17d7eb5d74 100644
--- a/test/jdk/java/net/httpclient/ConnectTimeoutNoProxyAsync.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/ExecutedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,27 +21,35 @@
  * questions.
  */
 
-import java.net.http.HttpClient.Version;
-import java.time.Duration;
-import org.testng.annotations.Test;
+package compiler.lib.ir_framework.driver.network.testvm.java;
 
-/*
- * @test
- * @summary Tests for connection related timeouts
- * @bug 8208391
- * @run testng/othervm ConnectTimeoutNoProxyAsync
+import compiler.lib.ir_framework.test.network.MessageTag;
+
+import java.util.List;
+
+/**
+ * Class to collect all Java Messages sent with tag {@link MessageTag#TEST_LIST}. These are only generated when the
+ * user runs with {@code -DTest=myTest} and represent the executed tests.
  */
+class ExecutedTests implements JavaMessage {
+    private final List<String> tests;
 
-public class ConnectTimeoutNoProxyAsync extends AbstractConnectTimeout {
+    public ExecutedTests(List<String> tests) {
+        this.tests = tests;
+    }
 
-    @Test(dataProvider = "variants")
     @Override
-    public void timeoutNoProxyAsync(Version requestVersion,
-                                    String scheme,
-                                    String method,
-                                    Duration connectTimeout,
-                                    Duration requestduration)
-    {
-        super.timeoutNoProxyAsync(requestVersion, scheme, method, connectTimeout, requestduration);
+    public void print() {
+        if (tests.isEmpty()) {
+            return;
+        }
+
+        System.out.println();
+        System.out.println("Executed Subset of Tests");
+        System.out.println("------------------------");
+        for (String test : tests) {
+            System.out.println("- " + test);
+        }
+        System.out.println();
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/IRRuleIds.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/IRRuleIds.java
new file mode 100644
index 00000000000..b8ea1765b4f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/IRRuleIds.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network.testvm.java;
+
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethod;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Stream;
+
+/**
+ * Class to hold the indices of the applicable {@link IR @IR} rules of an {@link IRMethod}.
+ */
+public class IRRuleIds implements Iterable<Integer> {
+    private final List<Integer> ruleIds;
+
+    public IRRuleIds(List<Integer> ruleIds) {
+        this.ruleIds = ruleIds;
+    }
+
+    public int first() {
+        return ruleIds.getFirst();
+    }
+
+    public int last() {
+        return ruleIds.getLast();
+    }
+
+    public boolean isEmpty() {
+        return ruleIds.isEmpty();
+    }
+
+    public int count() {
+        return ruleIds.size();
+    }
+
+    @Override
+    public Iterator<Integer> iterator() {
+        return ruleIds.iterator();
+    }
+
+    public Stream<Integer> stream() {
+        return ruleIds.stream();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessage.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessage.java
new file mode 100644
index 00000000000..7eef84dbbbc
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessage.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network.testvm.java;
+
+import compiler.lib.ir_framework.shared.TestFrameworkSocket;
+import compiler.lib.ir_framework.test.network.MessageTag;
+
+/**
+ * Interface for a message sent from Java code to the Driver VM via the {@link TestFrameworkSocket}. We differentiate
+ * between different messages depending on the leading {@link MessageTag} of a received message.
+ */
+public interface JavaMessage {
+    void print();
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessageParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessageParser.java
new file mode 100644
index 00000000000..896aef38f1f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessageParser.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network.testvm.java;
+
+import compiler.lib.ir_framework.TestFramework;
+import compiler.lib.ir_framework.shared.TestFrameworkException;
+import compiler.lib.ir_framework.test.network.MessageTag;
+
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static compiler.lib.ir_framework.test.network.MessageTag.*;
+
+/**
+ * Dedicated parser for {@link JavaMessages} received from the Test VM. Depending on the parsed {@link MessageTag}, the
+ * message is parsed differently.
+ */
+public class JavaMessageParser {
+    private static final Pattern TAG_PATTERN = Pattern.compile("^(\\[[^]]+])\\s*(.*)$");
+
+    private final List<String> stdoutMessages;
+    private final List<String> executedTests;
+    private final Map<String, Long> methodTimes;
+    private final StringBuilder vmInfoBuilder;
+    private final StringBuilder applicableIrRules;
+
+    private StringBuilder currentBuilder;
+
+    public JavaMessageParser() {
+        this.stdoutMessages = new ArrayList<>();
+        this.methodTimes = new HashMap<>();
+        this.executedTests = new ArrayList<>();
+        this.vmInfoBuilder = new StringBuilder();
+        this.applicableIrRules = new StringBuilder();
+        this.currentBuilder = null;
+    }
+
+    public void parseLine(String line) {
+        line = line.trim();
+        Matcher tagLineMatcher = TAG_PATTERN.matcher(line);
+        if (tagLineMatcher.matches()) {
+            // New tag
+            assertNoActiveParser();
+            parseTagLine(tagLineMatcher);
+            return;
+        }
+
+        assertActiveParser();
+        if (line.equals(END_MARKER)) {
+            // End tag
+            parseEndTag();
+            return;
+        }
+
+        // Multi-line message for single tag.
+        currentBuilder.append(line).append(System.lineSeparator());
+    }
+
+    private void assertNoActiveParser() {
+        TestFramework.check(currentBuilder == null, "Unexpected new tag while parsing block");
+    }
+
+    private void parseTagLine(Matcher tagLineMatcher) {
+        String tag = tagLineMatcher.group(1);
+        String message = tagLineMatcher.group(2);
+        switch (tag) {
+            case STDOUT -> stdoutMessages.add(message);
+            case TEST_LIST -> executedTests.add(message);
+            case PRINT_TIMES -> parsePrintTimes(message);
+            case VM_INFO -> currentBuilder = vmInfoBuilder;
+            case APPLICABLE_IR_RULES -> currentBuilder = applicableIrRules;
+            default -> throw new TestFrameworkException("unknown tag");
+        }
+    }
+
+    private void parsePrintTimes(String message) {
+        String[] split = message.split(",");
+        TestFramework.check(split.length == 2, "unexpected format");
+        String methodName = split[0];
+        try {
+            long duration = Long.parseLong(split[1]);
+            methodTimes.put(methodName, duration);
+        } catch (NumberFormatException e) {
+            throw new TestFrameworkException("invalid duration", e);
+        }
+    }
+
+    private void assertActiveParser() {
+        TestFramework.check(currentBuilder != null, "Received non-tag line outside of any tag block");
+    }
+
+    private void parseEndTag() {
+        currentBuilder = null;
+    }
+
+    public JavaMessages output() {
+        return new JavaMessages(new StdoutMessages(stdoutMessages),
+                                new ExecutedTests(executedTests),
+                                new MethodTimes(methodTimes),
+                                applicableIrRules.toString(),
+                                vmInfoBuilder.toString());
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessages.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessages.java
new file mode 100644
index 00000000000..e47ecff4b2a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/JavaMessages.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network.testvm.java;
+
+import compiler.lib.ir_framework.TestFramework;
+
+/**
+ * Class to collect all Java messages sent from the Test VM to the Driver VM.
+ */
+public class JavaMessages {
+    private static final boolean PRINT_APPLICABLE_IR_RULES = Boolean.parseBoolean(System.getProperty("PrintApplicableIRRules", "false"));
+
+    private final StdoutMessages stdoutMessages;
+    private final ExecutedTests executedTests;
+    private final MethodTimes methodTimes;
+    private final String applicableIrRules;
+    private final String vmInfo;
+
+    JavaMessages(StdoutMessages stdoutMessages, ExecutedTests executedTests, MethodTimes methodTimes,
+                 String applicableIrRules, String vmInfo) {
+        this.stdoutMessages = stdoutMessages;
+        this.executedTests = executedTests;
+        this.methodTimes = methodTimes;
+        this.applicableIrRules = applicableIrRules;
+        this.vmInfo = vmInfo;
+    }
+
+    public String applicableIRRules() {
+        return applicableIrRules;
+    }
+
+    public String vmInfo() {
+        return vmInfo;
+    }
+
+    public void print() {
+        stdoutMessages.print();
+        methodTimes.print();
+        executedTests.print();
+        if (TestFramework.VERBOSE || PRINT_APPLICABLE_IR_RULES) {
+            System.out.println("Read Applicable IR Rules from Test VM:");
+            System.out.println(applicableIrRules);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/MethodTimes.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/MethodTimes.java
new file mode 100644
index 00000000000..1b4cad52270
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/MethodTimes.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.network.testvm.java;
+
+import compiler.lib.ir_framework.test.network.MessageTag;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Class to collect all Java Messages sent with tag {@link MessageTag#PRINT_TIMES}. These are only generated when the
+ * user runs with {@code -DPrintTimes=true} and represent the execution times for methods.
+ */
+class MethodTimes implements JavaMessage {
+    private final Map<String, Long> methodTimes;
+
+    public MethodTimes(Map<String, Long> methodTimes) {
+        this.methodTimes = methodTimes;
+    }
+
+    @Override
+    public void print() {
+        if (methodTimes.isEmpty()) {
+            return;
+        }
+
+        System.out.println();
+        System.out.println("Test Execution Times");
+        System.out.println("--------------------");
+
+        int maxWidthNames = maxMethodNameWidth();
+        int maxDurationsWidth = maxDurationsWidth();
+        List<Map.Entry<String, Long>>  sortedMethodTimes = sortByDurationAsc();
+
+        for (Map.Entry<String, Long> entry : sortedMethodTimes) {
+            System.out.printf("- %-" + (maxWidthNames + 3) + "s %" + maxDurationsWidth + "d ns%n",
+                              entry.getKey() + ":", entry.getValue());
+        }
+
+        System.out.println();
+    }
+
+    private int maxMethodNameWidth() {
+        return methodTimes.keySet().stream()
+                .mapToInt(String::length)
+                .max()
+                .orElseThrow();
+    }
+
+    private int maxDurationsWidth() {
+        return methodTimes.values().stream()
+                .mapToInt(v -> Long.toString(v).length())
+                .max()
+                .orElseThrow();
+    }
+
+    private List<Map.Entry<String, Long>> sortByDurationAsc() {
+        return methodTimes.entrySet().stream()
+                .sorted(Map.Entry.comparingByValue())
+                .toList();
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutWithProxyAsync.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/StdoutMessages.java
similarity index 52%
rename from test/jdk/java/net/httpclient/ConnectTimeoutWithProxyAsync.java
rename to test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/StdoutMessages.java
index a6e0c22c15a..11b23ad4237 100644
--- a/test/jdk/java/net/httpclient/ConnectTimeoutWithProxyAsync.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/network/testvm/java/StdoutMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,27 +21,34 @@
  * questions.
  */
 
-import java.net.http.HttpClient.Version;
-import java.time.Duration;
-import org.testng.annotations.Test;
+package compiler.lib.ir_framework.driver.network.testvm.java;
 
-/*
- * @test
- * @summary Tests for connection related timeouts
- * @bug 8208391
- * @run testng/othervm ConnectTimeoutWithProxyAsync
+import compiler.lib.ir_framework.test.network.MessageTag;
+
+import java.util.List;
+
+
+/**
+ * Class to collect all Java Messages sent with tag {@link MessageTag#STDOUT}. These messages are generated at various
+ * places in the Test VM and are unconditionally shown in the Driver VM output.
  */
+class StdoutMessages implements JavaMessage {
+    private final List<String> messages;
 
-public class ConnectTimeoutWithProxyAsync extends AbstractConnectTimeout {
+    public StdoutMessages(List<String> messages) {
+        this.messages = messages;
+    }
 
-    @Test(dataProvider = "variants")
     @Override
-    public void timeoutWithProxyAsync(Version requestVersion,
-                                      String scheme,
-                                      String method,
-                                      Duration connectTimeout,
-                                      Duration requestTimeout)
-    {
-        super.timeoutWithProxyAsync(requestVersion, scheme, method, connectTimeout, requestTimeout);
+    public void print() {
+        if (messages.isEmpty()) {
+            return;
+        }
+        System.out.println();
+        System.out.println("Test VM Messages");
+        System.out.println("----------------");
+        for (String message : messages) {
+            System.out.println("- " + message);
+        }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/flag/CompilePhaseCollector.java b/test/hotspot/jtreg/compiler/lib/ir_framework/flag/CompilePhaseCollector.java
index 86ef31c6277..0488b3f58e6 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/flag/CompilePhaseCollector.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/flag/CompilePhaseCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ class CompilePhaseCollector {
                                                  collectCompilePhases(method));
             }
         } catch (TestFormatException e) {
-            // Create default map and let the IR matcher report the format failures later in the driver VM.
+            // Create default map and let the IR matcher report the format failures later in the Driver VM.
             return createDefaultMap(testClass);
         }
         return methodNameToCompilePhasesMap;
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/flag/FlagVM.java b/test/hotspot/jtreg/compiler/lib/ir_framework/flag/FlagVM.java
index 42e4c85a499..4b033eb2c0e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/flag/FlagVM.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/flag/FlagVM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
- * This class' main method is called from {@link TestFramework} and represents the so-called "flag VM". It uses the
- * Whitebox API to determine the necessary additional flags to run the test VM (e.g. to do IR matching). It returns
+ * This class' main method is called from {@link TestFramework} and represents the so-called "Flag VM". It uses the
+ * Whitebox API to determine the necessary additional flags to run the Test VM (e.g. to do IR matching). It returns
  * the flags over the dedicated TestFramework socket.
  */
 public class FlagVM {
@@ -79,12 +79,12 @@ public class FlagVM {
     private static final boolean VERIFY_IR = REQUESTED_VERIFY_IR && USE_COMPILER && !EXCLUDE_RANDOM && !FLIP_C1_C2 && !TEST_C1 && Platform.isServer();
 
     /**
-     * Main entry point of the flag VM.
+     * Main entry point of the Flag VM.
      */
     public static void main(String[] args) {
         String testClassName = args[0];
         if (VERBOSE) {
-            System.out.println("FlagVM main() called. Prepare test VM flags to run class " + testClassName);
+            System.out.println("FlagVM main() called. Prepare Test VM flags to run class " + testClassName);
         }
         Class<?> testClass;
         try {
@@ -96,8 +96,8 @@ public class FlagVM {
     }
 
     /**
-     * Emit test VM flags to the dedicated test VM flags file to parse them from the TestFramework "driver" VM again
-     * which adds them to the test VM.
+     * Emit Test VM flags to the dedicated Test VM flags file to parse them from the TestFramework Driver VM again
+     * which adds them to the Test VM.
      */
     private static void emitTestVMFlags(ArrayList<String> flags) {
         try (var bw = Files.newBufferedWriter(Paths.get(TEST_VM_FLAGS_FILE))) {
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/NoTestsRunException.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/NoTestsRunException.java
index 02afdd4ee4f..4b616f53e4d 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/NoTestsRunException.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/NoTestsRunException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,17 +24,17 @@
 package compiler.lib.ir_framework.shared;
 
 /**
- * Exception that is thrown by the test VM if no tests are run as a result of specifying {@code -DTest} and/or
- * {@code -DExclude} defining an empty set with the used test VM flags.
+ * Exception that is thrown by the Test VM if no tests are run as a result of specifying {@code -DTest} and/or
+ * {@code -DExclude} defining an empty set with the used Test VM flags.
  */
 public class NoTestsRunException extends RuntimeException {
     /**
-     * Default constructor used by test VM
+     * Default constructor used by Test VM
      */
     public NoTestsRunException() {}
 
     /**
-     * Constructor used to eventually throw the exception in the driver VM.
+     * Constructor used to eventually throw the exception in the Driver VM.
      */
     public NoTestsRunException(String message) {
         super(message);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
index 1fdcb34a6b8..77d560952f1 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,40 +24,27 @@
 package compiler.lib.ir_framework.shared;
 
 import compiler.lib.ir_framework.TestFramework;
+import compiler.lib.ir_framework.driver.network.*;
+import compiler.lib.ir_framework.driver.network.testvm.TestVmMessageReader;
+import compiler.lib.ir_framework.driver.network.testvm.java.JavaMessages;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
+import java.net.*;
+import java.util.concurrent.*;
 
 /**
- * Dedicated socket to send data from the flag and test VM back to the driver VM.
+ * Dedicated Driver VM socket to receive data from the Test VM. Could either be received from Java and C2 code.
  */
 public class TestFrameworkSocket implements AutoCloseable {
-    public static final String STDOUT_PREFIX = "[STDOUT]";
-    public static final String TESTLIST_TAG = "[TESTLIST]";
-    public static final String DEFAULT_REGEX_TAG = "[DEFAULT_REGEX]";
-    public static final String PRINT_TIMES_TAG = "[PRINT_TIMES]";
-    public static final String NOT_COMPILABLE_TAG = "[NOT_COMPILABLE]";
-
-    // Static fields used for test VM only.
     private static final String SERVER_PORT_PROPERTY = "ir.framework.server.port";
-    private static final int SERVER_PORT = Integer.getInteger(SERVER_PORT_PROPERTY, -1);
 
-    private static final boolean REPRODUCE = Boolean.getBoolean("Reproduce");
-    private static Socket clientSocket = null;
-    private static PrintWriter clientWriter = null;
-
-    private final String serverPortPropertyFlag;
-    private FutureTask<String> socketTask;
+    private final int serverSocketPort;
     private final ServerSocket serverSocket;
-    private boolean receivedStdOut = false;
+    private boolean running;
+    private final ExecutorService executor;
+    private Future<JavaMessages> javaFuture;
 
     public TestFrameworkSocket() {
         try {
@@ -66,140 +53,80 @@ public class TestFrameworkSocket implements AutoCloseable {
         } catch (IOException e) {
             throw new TestFrameworkException("Failed to create TestFramework server socket", e);
         }
-        int port = serverSocket.getLocalPort();
+        serverSocketPort = serverSocket.getLocalPort();
+        executor = Executors.newCachedThreadPool();
         if (TestFramework.VERBOSE) {
-            System.out.println("TestFramework server socket uses port " + port);
+            System.out.println("TestFramework server socket uses port " + serverSocketPort);
         }
-        serverPortPropertyFlag = "-D" + SERVER_PORT_PROPERTY + "=" + port;
         start();
     }
 
     public String getPortPropertyFlag() {
-        return serverPortPropertyFlag;
+        return "-D" + SERVER_PORT_PROPERTY + "=" + serverSocketPort;
     }
 
     private void start() {
-        socketTask = initSocketTask();
-        Thread socketThread = new Thread(socketTask);
-        socketThread.start();
+        running = true;
+        executor.submit(this::acceptLoop);
     }
 
     /**
-     * Waits for a client (created by flag or test VM) to connect. Return the messages received from the client.
+     * Main loop to wait for new client connections and handling them upon connection request.
      */
-    private FutureTask<String> initSocketTask() {
-        return new FutureTask<>(() -> {
-            try (Socket clientSocket = serverSocket.accept();
-                 BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()))
-            ) {
-                StringBuilder builder = new StringBuilder();
-                String next;
-                while ((next = in.readLine()) != null) {
-                    builder.append(next).append(System.lineSeparator());
-                    if (next.startsWith(STDOUT_PREFIX)) {
-                        receivedStdOut = true;
-                    }
-                }
-                return builder.toString();
-            } catch (IOException e) {
+    private void acceptLoop() {
+        while (running) {
+            try {
+                acceptNewClientConnection();
+            } catch (TestFrameworkException e) {
+                running = false;
+                throw e;
+            } catch (Exception e) {
+                running = false;
                 throw new TestFrameworkException("Server socket error", e);
             }
-        });
+        }
+    }
+
+    /**
+     * Accept new client connection and then submit a task accordingly to manage incoming message on that connection/socket.
+     */
+    private void acceptNewClientConnection() throws IOException {
+        Socket client = serverSocket.accept();
+        BufferedReader reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
+        submitTask(client, reader);
+    }
+
+    /**
+     * Submit dedicated tasks which are wrapped into {@link Future} objects. The tasks will read all messages sent
+     * over that connection.
+     */
+    private void submitTask(Socket client, BufferedReader reader) {
+        javaFuture = executor.submit(new TestVmMessageReader(client, reader));
     }
 
     @Override
     public void close() {
         try {
+            running = false;
             serverSocket.close();
         } catch (IOException e) {
             throw new TestFrameworkException("Could not close socket", e);
         }
+        executor.shutdown();
     }
 
-    /**
-     * Only called by test VM to write to server socket.
-     */
-    public static void write(String msg, String tag) {
-        write(msg, tag, false);
+    public TestVMData testVmData(String hotspotPidFileName, boolean allowNotCompilable) {
+        JavaMessages javaMessages = testVmMessages();
+        return new TestVMData(javaMessages, hotspotPidFileName, allowNotCompilable);
     }
 
-    /**
-     * Only called by test VM to write to server socket.
-     * <p>
-     * The test VM is spawned by the main jtreg VM. The stdout of the test VM is hidden
-     * unless the Verbose or ReportStdout flag is used. TestFrameworkSocket is used by the parent jtreg
-     * VM and the test VM to communicate. By sending the prints through the TestFrameworkSocket with the
-     * parameter stdout set to true, the parent VM will print the received messages to its stdout, making it
-     * visible to the user.
-     */
-    public static void write(String msg, String tag, boolean stdout) {
-        if (REPRODUCE) {
-            System.out.println("Debugging Test VM: Skip writing due to -DReproduce");
-            return;
-        }
-        TestFramework.check(SERVER_PORT != -1, "Server port was not set correctly for flag and/or test VM "
-                                               + "or method not called from flag or test VM");
+    private JavaMessages testVmMessages() {
         try {
-            // Keep the client socket open until the test VM terminates (calls closeClientSocket before exiting main()).
-            if (clientSocket == null) {
-                clientSocket = new Socket(InetAddress.getLoopbackAddress(), SERVER_PORT);
-                clientWriter = new PrintWriter(clientSocket.getOutputStream(), true);
-            }
-            if (stdout) {
-                msg = STDOUT_PREFIX + tag + " " + msg;
-            }
-            clientWriter.println(msg);
-        } catch (Exception e) {
-            // When the test VM is directly run, we should ignore all messages that would normally be sent to the
-            // driver VM.
-            String failMsg = System.lineSeparator() + System.lineSeparator() + """
-                             ###########################################################
-                              Did you directly run the test VM (TestVM class)
-                              to reproduce a bug?
-                              => Append the flag -DReproduce=true and try again!
-                             ###########################################################
-                             """;
-            throw new TestRunException(failMsg, e);
-        }
-        if (TestFramework.VERBOSE) {
-            System.out.println("Written " + tag + " to socket:");
-            System.out.println(msg);
-        }
-    }
-
-    /**
-     * Closes (and flushes) the printer to the socket and the socket itself. Is called as last thing before exiting
-     * the main() method of the flag and the test VM.
-     */
-    public static void closeClientSocket() {
-        if (clientSocket != null) {
-            try {
-                clientWriter.close();
-                clientSocket.close();
-            } catch (IOException e) {
-                throw new RuntimeException("Could not close TestVM socket", e);
-            }
-        }
-    }
-
-    /**
-     * Get the socket output of the flag VM.
-     */
-    public String getOutput() {
-        try {
-            return socketTask.get();
+            return javaFuture.get();
         } catch (ExecutionException e) {
-            // Thrown when socket task was not finished, yet (i.e. no client sent data) but socket was already closed.
-            return "";
+            throw new TestFrameworkException("No test VM messages were received", e);
         } catch (Exception e) {
-            throw new TestFrameworkException("Could not read from socket task", e);
+            throw new TestFrameworkException("Error while fetching Test VM Future", e);
         }
     }
-
-    /**
-     * Return whether test VM sent messages to be put on stdout (starting with {@link ::STDOUT_PREFIX}).
-     */
-    public boolean hasStdOut() {
-        return receivedStdOut;
-    }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
index 4d227900e2e..152dcab273a 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,13 @@ package compiler.lib.ir_framework.test;
 import compiler.lib.ir_framework.*;
 import compiler.lib.ir_framework.shared.TestRun;
 import compiler.lib.ir_framework.shared.TestRunException;
+import compiler.lib.ir_framework.test.network.TestVmSocket;
 import jdk.test.whitebox.WhiteBox;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import compiler.lib.ir_framework.shared.TestFrameworkSocket;
-
 /**
  * Abstract super class for base, checked and custom run tests.
  */
@@ -118,7 +117,7 @@ abstract class AbstractTest {
             tryCompileMethod(test);
         } catch (MethodNotCompilableException e) {
             final Method testMethod = test.getTestMethod();
-            TestFrameworkSocket.write("Method not compilable: " + testMethod, TestFrameworkSocket.NOT_COMPILABLE_TAG, true);
+            TestVmSocket.send("Method not compilable: " + testMethod);
             TestRun.check(test.isAllowNotCompilable(),
                           "Method " + testMethod + " not compilable (anymore) at level " + test.getCompLevel() +
                           ". Most likely, this is not expected, but if it is, you can use 'allowNotCompilable'.");
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java
similarity index 93%
rename from test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
rename to test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java
index a24cfbd3e37..79f5c7fe18e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/ApplicableIRRulesPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ import compiler.lib.ir_framework.IR;
 import compiler.lib.ir_framework.IRNode;
 import compiler.lib.ir_framework.TestFramework;
 import compiler.lib.ir_framework.shared.*;
+import compiler.lib.ir_framework.test.network.MessageTag;
+import compiler.lib.ir_framework.test.network.TestVmSocket;
 import jdk.test.lib.Platform;
 import jdk.test.whitebox.WhiteBox;
 
@@ -39,14 +41,13 @@ import java.util.Objects;
 import java.util.function.Function;
 
 /**
- * Prints an encoding to the dedicated test framework socket whether @IR rules of @Test methods should be applied or not.
- * This is done during the execution of the test VM by checking the active VM flags. This encoding is eventually parsed
- * and checked by the IRMatcher class in the driver VM after the termination of the test VM. IR rule indices start at 1.
+ * Prints all applicable IR rules to the dedicated test framework socket whether @IR rules of @Test methods should be
+ * applied or not. This is done during the execution of the Test VM by checking the active VM flags. This
+ * Applicable IR Rules message is eventually parsed and checked by the IRMatcher class in the Driver VM after the
+ * termination of the Test VM. IR rule indices start at 1.
  */
-public class IREncodingPrinter {
-    public static final String START = "##### IRMatchRulesEncoding - used by TestFramework #####";
-    public static final String END = "----- END -----";
-    public static final int NO_RULE_APPLIED = -1;
+public class ApplicableIRRulesPrinter {
+    public static final int NO_RULES = -1;
 
     private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
     private static final List<Function<String, Object>> LONG_GETTERS = Arrays.asList(
@@ -60,7 +61,7 @@ public class IREncodingPrinter {
     // Platforms for use in IR preconditions. Please verify that e.g. there is
     // a corresponding use in a jtreg @requires annotation before adding new platforms,
     // as adding non-existent platforms can lead to skipped tests.
-    private static final List<String> irTestingPlatforms = new ArrayList<String>(Arrays.asList(
+    private static final List<String> irTestingPlatforms = new ArrayList<>(Arrays.asList(
         // os.family
         "aix",
         "linux",
@@ -85,7 +86,7 @@ public class IREncodingPrinter {
     // Please verify new CPU features before adding them. If we allow non-existent features
     // on this list, we will ignore tests and never execute them. Consult CPU_FEATURE_FLAGS
     // in corresponding vm_version_.hpp file to find correct cpu feature's name.
-    private static final List<String> verifiedCPUFeatures = new ArrayList<String>( Arrays.asList(
+    private static final List<String> verifiedCPUFeatures = new ArrayList<>( Arrays.asList(
         // x86
         "fma",
         "f16c",
@@ -109,6 +110,8 @@ public class IREncodingPrinter {
         "avx512_vbmi2",
         "avx10_2",
         "bmi2",
+        // Intel APX
+        "apx_f",
         // AArch64
         "sha3",
         "asimd",
@@ -123,20 +126,18 @@ public class IREncodingPrinter {
         "zfh",
         "zvbb",
         "zvfh",
-        "zvkn"
+        "zvkn",
+        // PPC64
+        "darn",
+        "brw"
     ));
 
-    public IREncodingPrinter() {
-        output.append(START).append(System.lineSeparator());
-        output.append("<method>,{comma separated applied @IR rule ids}").append(System.lineSeparator());
-    }
-
     /**
      * Emits "<method>,{ids}" where {ids} is either:
      * - indices of all @IR rules that should be applied, separated by a comma
      * - "-1" if no @IR rule should not be applied
      */
-    public void emitRuleEncoding(Method m, boolean skipped) {
+    public void emitApplicableIRRules(Method m, boolean skipped) {
         method = m;
         int i = 0;
         ArrayList<Integer> validRules = new ArrayList<>();
@@ -157,7 +158,7 @@ public class IREncodingPrinter {
         if (irAnnos.length != 0) {
             output.append(m.getName());
             if (validRules.isEmpty()) {
-                output.append("," + NO_RULE_APPLIED);
+                output.append("," + NO_RULES);
             } else {
                 for (i = 0; i < validRules.size(); i++) {
                     output.append(",").append(validRules.get(i));
@@ -168,9 +169,8 @@ public class IREncodingPrinter {
     }
 
     private void printDisableReason(String method, String reason, String[] apply, int ruleIndex, int ruleMax) {
-        TestFrameworkSocket.write("Disabling IR matching for rule " + ruleIndex + " of " + ruleMax + " in " +
-                                  method + ": " + reason + ": " + String.join(", ", apply),
-                                  "[IREncodingPrinter]", true);
+        TestVmSocket.send("Disabling IR matching for rule " + ruleIndex + " of " + ruleMax + " in " + method + ": " +
+                                  reason + ": " + String.join(", ", apply));
     }
 
     private boolean shouldApplyIrRule(IR irAnno, String m, int ruleIndex, int ruleMax) {
@@ -283,7 +283,7 @@ public class IREncodingPrinter {
                 IRNode.checkIRNodeSupported(s);
             }
         } catch (CheckedTestFrameworkException e) {
-            TestFrameworkSocket.write("Skip Rule " + ruleIndex + ": " + e.getMessage(), TestFrameworkSocket.DEFAULT_REGEX_TAG, true);
+            TestVmSocket.send("Skip Rule " + ruleIndex + ": " + e.getMessage());
             return true;
         }
         return false;
@@ -520,8 +520,8 @@ public class IREncodingPrinter {
     }
 
     public void emit() {
-        output.append(END);
-        TestFrameworkSocket.write(output.toString(), "IR rule application encoding");
+        output.append(MessageTag.END_MARKER);
+        TestVmSocket.sendMultiLine(MessageTag.APPLICABLE_IR_RULES, output.toString());
     }
 }
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
index 8ccd0faa013..ac52bcaaa98 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@ package compiler.lib.ir_framework.test;
 import compiler.lib.ir_framework.*;
 import compiler.lib.ir_framework.Compiler;
 import compiler.lib.ir_framework.shared.*;
+import compiler.lib.ir_framework.test.network.MessageTag;
+import compiler.lib.ir_framework.test.network.TestVmSocket;
 import jdk.test.lib.Platform;
 import jdk.test.lib.Utils;
 import jdk.test.whitebox.WhiteBox;
@@ -38,10 +40,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static compiler.lib.ir_framework.shared.TestFrameworkSocket.PRINT_TIMES_TAG;
-
 /**
- * This class' main method is called from {@link TestFramework} and represents the so-called "test VM". The class is
+ * This class' main method is called from {@link TestFramework} and represents the so-called "Test VM". The class is
  * the heart of the framework and is responsible for executing all the specified tests in the test class. It uses the
  * Whitebox API and reflection to achieve this task.
  */
@@ -58,7 +58,7 @@ public class TestVM {
                                   TestFramework in main() of your test? Make sure to
                                   only call setup/run methods and no checks or
                                   assertions from main() of your test!
-                                - Are you rerunning the test VM (TestVM class)
+                                - Are you rerunning the Test VM (TestVM class)
                                   directly after a JTreg run? Make sure to start it
                                   from within JTwork/scratch and with the flag
                                   -DReproduce=true!
@@ -92,7 +92,7 @@ public class TestVM {
 
     static final boolean XCOMP = Platform.isComp();
     static final boolean VERBOSE = Boolean.getBoolean("Verbose");
-    private static final boolean PRINT_TIMES = Boolean.getBoolean("PrintTimes");
+    private static final boolean PRINT_TIMES = Boolean.getBoolean("PrintTimes") || VERBOSE;
     public static final boolean USE_COMPILER = WHITE_BOX.getBooleanVMFlag("UseCompiler");
     static final boolean EXCLUDE_RANDOM = Boolean.getBoolean("ExcludeRandom");
     private static final String TESTLIST = System.getProperty("Test", "");
@@ -100,7 +100,7 @@ public class TestVM {
     private static final boolean DUMP_REPLAY = Boolean.getBoolean("DumpReplay");
     private static final boolean GC_AFTER = Boolean.getBoolean("GCAfter");
     private static final boolean SHUFFLE_TESTS = Boolean.parseBoolean(System.getProperty("ShuffleTests", "true"));
-    // Use separate flag as VERIFY_IR could have been set by user but due to other flags it was disabled by flag VM.
+    // Use separate flag as VERIFY_IR could have been set by user but due to other flags it was disabled by Flag VM.
     private static final boolean PRINT_VALID_IR_RULES = Boolean.getBoolean("ShouldDoIRVerification");
     protected static final long PER_METHOD_TRAP_LIMIT = (Long)WHITE_BOX.getVMFlag("PerMethodTrapLimit");
     protected static final boolean PROFILE_INTERPRETER = (Boolean)WHITE_BOX.getVMFlag("ProfileInterpreter");
@@ -114,7 +114,7 @@ public class TestVM {
     private final List<String> excludeList;
     private final List<String> testList;
     private Set<Class<?>> helperClasses = null; // Helper classes that contain framework annotations to be processed.
-    private final IREncodingPrinter irMatchRulePrinter;
+    private final ApplicableIRRulesPrinter irMatchRulePrinter;
     private final Class<?> testClass;
     private final Map<Executable, CompLevel> forceCompileMap = new HashMap<>();
 
@@ -125,7 +125,7 @@ public class TestVM {
         this.excludeList = createTestFilterList(EXCLUDELIST, testClass);
 
         if (PRINT_VALID_IR_RULES) {
-            irMatchRulePrinter = new IREncodingPrinter();
+            irMatchRulePrinter = new ApplicableIRRulesPrinter();
         } else {
             irMatchRulePrinter = null;
         }
@@ -155,10 +155,11 @@ public class TestVM {
     }
 
     /**
-     * Main entry point of the test VM.
+     * Main entry point of the Test VM.
      */
     public static void main(String[] args) {
         try {
+            TestVmSocket.connect();
             String testClassName = args[0];
             System.out.println("TestVM main() called - about to run tests in class " + testClassName);
             Class<?> testClass = getClassObject(testClassName, "test");
@@ -167,7 +168,7 @@ public class TestVM {
             framework.addHelperClasses(args);
             framework.start();
         } finally {
-            TestFrameworkSocket.closeClientSocket();
+            TestVmSocket.close();
         }
     }
 
@@ -293,7 +294,7 @@ public class TestVM {
                     BaseTest baseTest = new BaseTest(test, shouldExcludeTest(m.getName()));
                     allTests.add(baseTest);
                     if (PRINT_VALID_IR_RULES) {
-                        irMatchRulePrinter.emitRuleEncoding(m, baseTest.isSkipped());
+                        irMatchRulePrinter.emitApplicableIRRules(m, baseTest.isSkipped());
                     }
                 } catch (TestFormatException e) {
                     // Failure logged. Continue and report later.
@@ -588,8 +589,13 @@ public class TestVM {
     }
 
     private void checkTestAnnotations(Method m, Test testAnno) {
-        TestFormat.check(!testMethodMap.containsKey(m.getName()),
-                         "Cannot overload two @Test methods: " + m + ", " + testMethodMap.get(m.getName()));
+        List<Method> overloads = Arrays.stream(testClass.getDeclaredMethods()).filter(other -> !m.equals(other) && m.getName().equals(other.getName())).toList();
+        TestFormat.check(overloads.isEmpty(),
+                "Cannot overload @Test methods, but method " + m + " has " + overloads.size() + " overload" + (overloads.size() == 1 ? "" : "s") + ":" +
+                overloads.stream().map(String::valueOf).collect(Collectors.joining("\n    - ", "\n    - ", ""))
+        );
+        TestFramework.check(!testMethodMap.containsKey(m.getName()),
+                            "Cannot overload two @Test methods: " + m + ", " + testMethodMap.get(m.getName()));
         TestFormat.check(testAnno != null, m + " must be a method with a @Test annotation");
 
         Check checkAnno = getAnnotation(m, Check.class);
@@ -687,7 +693,7 @@ public class TestVM {
         allTests.add(checkedTest);
         if (PRINT_VALID_IR_RULES) {
             // Only need to emit IR verification information if IR verification is actually performed.
-            irMatchRulePrinter.emitRuleEncoding(testMethod, checkedTest.isSkipped());
+            irMatchRulePrinter.emitApplicableIRRules(testMethod, checkedTest.isSkipped());
         }
     }
 
@@ -755,7 +761,7 @@ public class TestVM {
         CustomRunTest customRunTest = new CustomRunTest(m, getAnnotation(m, Warmup.class), runAnno, tests, shouldExcludeTest);
         allTests.add(customRunTest);
         if (PRINT_VALID_IR_RULES) {
-            tests.forEach(test -> irMatchRulePrinter.emitRuleEncoding(test.getTestMethod(), customRunTest.isSkipped()));
+            tests.forEach(test -> irMatchRulePrinter.emitApplicableIRRules(test.getTestMethod(), customRunTest.isSkipped()));
         }
     }
 
@@ -823,14 +829,13 @@ public class TestVM {
         forceCompileMap.forEach((key, value) -> builder.append("- ").append(key).append(" at CompLevel.").append(value)
                                                        .append(System.lineSeparator()));
         throw new TestRunException("Could not force compile the following @ForceCompile methods:"
-                                   + System.lineSeparator() + builder.toString());
+                                   + System.lineSeparator() + builder);
     }
 
     /**
      * Once all framework tests are collected, they are run in this method.
      */
     private void runTests() {
-        TreeMap<Long, String> durations = (PRINT_TIMES || VERBOSE) ? new TreeMap<>() : null;
         long startTime = System.nanoTime();
         List<AbstractTest> testList;
         boolean testFilterPresent = testFilterPresent();
@@ -859,7 +864,7 @@ public class TestVM {
                 System.out.println("Run " + test.toString());
             }
             if (testFilterPresent) {
-                TestFrameworkSocket.write("Run " + test.toString(), TestFrameworkSocket.TESTLIST_TAG, true);
+                TestVmSocket.sendWithTag(MessageTag.TEST_LIST, "Run " + test.toString());
             }
             try {
                 test.run();
@@ -867,17 +872,18 @@ public class TestVM {
                 StringWriter sw = new StringWriter();
                 PrintWriter pw = new PrintWriter(sw);
                 e.printStackTrace(pw);
-                builder.append(test.toString()).append(":").append(System.lineSeparator()).append(sw.toString())
+                builder.append(test).append(":").append(System.lineSeparator()).append(sw)
                        .append(System.lineSeparator()).append(System.lineSeparator());
                 failures++;
             }
-            if (PRINT_TIMES || VERBOSE) {
+            if (PRINT_TIMES) {
                 long endTime = System.nanoTime();
                 long duration = (endTime - startTime);
-                durations.put(duration, test.getName());
                 if (VERBOSE) {
-                    System.out.println("Done " + test.getName() + ": " + duration + " ns = " + (duration / 1000000) + " ms");
+                    System.out.println("Done " + test.getName() + ": " + duration + " ns = " + (duration / 1_000_000) + " ms");
                 }
+                // Will be correctly formatted later.
+                TestVmSocket.sendWithTag(MessageTag.PRINT_TIMES, test.getName() + "," + duration);
             }
             if (GC_AFTER) {
                 System.out.println("doing GC");
@@ -885,20 +891,11 @@ public class TestVM {
             }
         }
 
-        // Print execution times
-        if (VERBOSE || PRINT_TIMES) {
-            TestFrameworkSocket.write("Test execution times:", PRINT_TIMES_TAG, true);
-            for (Map.Entry<Long, String> entry : durations.entrySet()) {
-                TestFrameworkSocket.write(String.format("%-25s%15d ns%n", entry.getValue() + ":", entry.getKey()),
-                        PRINT_TIMES_TAG, true);
-            }
-        }
-
         if (failures > 0) {
             // Finally, report all occurred exceptions in a nice format.
             String msg = System.lineSeparator() + System.lineSeparator() + "Test Failures (" + failures + ")"
                          + System.lineSeparator() + "----------------" + "-".repeat(String.valueOf(failures).length());
-            throw new TestRunException(msg + System.lineSeparator() + builder.toString());
+            throw new TestRunException(msg + System.lineSeparator() + builder);
         }
     }
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/VMInfoPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/VMInfoPrinter.java
index 14636da4cbe..8fc61ee9bad 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/VMInfoPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/VMInfoPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,22 +23,18 @@
 
 package compiler.lib.ir_framework.test;
 
-import compiler.lib.ir_framework.shared.TestFrameworkSocket;
+import compiler.lib.ir_framework.test.network.MessageTag;
+import compiler.lib.ir_framework.test.network.TestVmSocket;
 import jdk.test.whitebox.WhiteBox;
 
 /**
- * Prints some test VM info to the socket.
+ * Prints some Test VM info to the socket.
  */
 public class VMInfoPrinter {
-    public static final String START_VM_INFO = "##### IRMatchingVMInfo - used by TestFramework #####";
-    public static final String END_VM_INFO = "----- END VMInfo -----";
-
     private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
 
     public static void emit() {
         StringBuilder vmInfo = new StringBuilder();
-        vmInfo.append(START_VM_INFO).append(System.lineSeparator());
-        vmInfo.append("<key>:<value>").append(System.lineSeparator());
 
         // CPU feature independent info
         String cpuFeatures = WHITE_BOX.getCPUFeatures();
@@ -64,7 +60,7 @@ public class VMInfoPrinter {
               .append(useAVXIsDefault ? 1 : 0)
               .append(System.lineSeparator());
 
-        vmInfo.append(END_VM_INFO);
-        TestFrameworkSocket.write(vmInfo.toString(), "VMInfo");
+        vmInfo.append(MessageTag.END_MARKER);
+        TestVmSocket.sendMultiLine(MessageTag.VM_INFO, vmInfo.toString());
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/network/MessageTag.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/network/MessageTag.java
new file mode 100644
index 00000000000..66b89dc122d
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/network/MessageTag.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.test.network;
+
+public class MessageTag {
+    public static final String STDOUT = "[STDOUT]";
+    public static final String TEST_LIST = "[TEST_LIST]";
+    public static final String PRINT_TIMES = "[PRINT_TIMES]";
+    public static final String VM_INFO = "[VM_INFO]";
+    public static final String APPLICABLE_IR_RULES = "[APPLICABLE_IR_RULES]";
+    public static final String END_MARKER = "#END#";
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/network/TestVmSocket.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/network/TestVmSocket.java
new file mode 100644
index 00000000000..37e59b9dcae
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/network/TestVmSocket.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.test.network;
+
+import compiler.lib.ir_framework.TestFramework;
+import compiler.lib.ir_framework.shared.TestRunException;
+import compiler.lib.ir_framework.test.TestVM;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.Socket;
+
+public class TestVmSocket {
+    private static final boolean REPRODUCE = Boolean.getBoolean("Reproduce");
+    private static final String SERVER_PORT_PROPERTY = "ir.framework.server.port";
+    private static final int SERVER_PORT = Integer.getInteger(SERVER_PORT_PROPERTY, -1);
+
+    private static Socket socket = null;
+    private static PrintWriter writer = null;
+
+    /**
+     * Send a message to the Driver VM which is unconditionally shown in the Driver VM output.
+     */
+    public static void send(String message) {
+        sendWithTag(MessageTag.STDOUT, message);
+    }
+
+    /**
+     * Send a message with multiple lines to the Driver VM with a {@link MessageTag}. Not all messages are shown by
+     * default in the Driver VM output and require setting some property flags first like {@code -DPrintTimes=true}.
+     */
+    public static void sendMultiLine(String tag, String message) {
+        if (REPRODUCE) {
+            // Debugging Test VM: Skip writing due to -DReproduce;
+            return;
+        }
+
+        TestFramework.check(socket != null, "must be connected");
+        writer.println(tag + System.lineSeparator() + message);
+    }
+
+    /**
+     * Send a message to the Driver VM with a {@link MessageTag}. Not all messages are shown by default in the
+     * Driver VM output and require setting some property flags first like {@code -DPrintTimes=true}.
+     */
+    public static void sendWithTag(String tag, String message) {
+        if (REPRODUCE) {
+            // Debugging Test VM: Skip writing due to -DReproduce;
+            return;
+        }
+
+        TestFramework.check(socket != null, "must be connected");
+        writer.println(tag + " " + message);
+    }
+
+    public static void connect() {
+        if (REPRODUCE) {
+            // Debugging Test VM: Skip writing due to -DReproduce;
+            return;
+        }
+
+        TestFramework.check(SERVER_PORT != -1, "Server port was not set correctly for flag and/or test VM "
+                + "or method not called from flag or test VM");
+
+        try {
+            // Keep the client socket open until the test VM terminates (calls closeClientSocket before exiting main()).
+            socket = new Socket(InetAddress.getLoopbackAddress(), SERVER_PORT);
+            writer = new PrintWriter(socket.getOutputStream(), true);
+        } catch (Exception e) {
+            // When the test VM is directly run, we should ignore all messages that would normally be sent to the
+            // driver VM.
+            String failMsg = System.lineSeparator() + System.lineSeparator() + """
+                             ###########################################################
+                              Did you directly run the test VM (TestVM class)
+                              to reproduce a bug?
+                              => Append the flag -DReproduce=true and try again!
+                             ###########################################################
+                             """;
+            throw new TestRunException(failMsg, e);
+        }
+
+    }
+
+    /**
+     * Closes (and flushes) the printer to the socket and the socket itself. Is called as last thing before exiting
+     * the main() method of the flag and the test VM.
+     */
+    public static void close() {
+        if (socket != null) {
+            writer.close();
+            try {
+                socket.close();
+            } catch (IOException e) {
+                throw new RuntimeException("Could not close TestVM socket", e);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java b/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
index 61ab9ab343c..cb83a5ea40c 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Renderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -413,8 +413,39 @@ final class Renderer {
         }
     }
 
+    /**
+     * Finds the index where the next replacement pattern after {@code start} begins while skipping
+     * over "$$" and "##".
+     *
+     * @param s     string to search for replacements
+     * @param start index from which to start searching
+     * @return the index of the beginning of the next replacement pattern or the length of {@code s}
+     */
+    private int findNextReplacement(final String s, final int start) {
+        int next = start;
+        for (int potentialStart = start; potentialStart < s.length() && s.charAt(next) == s.charAt(potentialStart); potentialStart = next + 1) {
+            // If this is not the first iteration, we have found a doubled up "$" or "#" and need to skip
+            // over the second instance.
+            if (potentialStart != start) {
+                potentialStart += 1;
+            }
+            // Find the next "$" or "#", after the potential start.
+            int dollar  = s.indexOf("$", potentialStart);
+            int hashtag = s.indexOf("#", potentialStart);
+            // If the character was not found, we want to have the rest of the
+            // String s, so instead of "-1" take the end/length of the String.
+            dollar  = (dollar == -1)  ? s.length() : dollar;
+            hashtag = (hashtag == -1) ? s.length() : hashtag;
+            // Take the first one.
+            next = Math.min(dollar, hashtag);
+        }
+
+        return next;
+    }
+
     /**
      * We split a {@link String} by "#" and "$", and then look at each part.
+     * However, we escape "##" to "#" and "$$" to "$".
      * Example:
      *
      *  s:    "abcdefghijklmnop #name abcdefgh${var_name} 12345#{name2}_con $field_name something"
@@ -428,16 +459,19 @@ final class Renderer {
         int start = 0;
         boolean startIsAfterDollar = false;
         do {
-            // Find the next "$" or "#", after start.
-            int dollar  = s.indexOf("$", start);
-            int hashtag = s.indexOf("#", start);
-            // If the character was not found, we want to have the rest of the
-            // String s, so instead of "-1" take the end/length of the String.
-            dollar  = (dollar == -1)  ? s.length() : dollar;
-            hashtag = (hashtag == -1) ? s.length() : hashtag;
-            // Take the first one.
-            int next = Math.min(dollar, hashtag);
+            int next = findNextReplacement(s, start);
+
+            // Detect most zero sized replacement patterns, i.e. "$#" or "#$", for better error reporting.
+            if (next < s.length() - 2 && ((s.charAt(next) == '$' && s.charAt(next + 1) == '#') ||
+                (s.charAt(next) == '#' && s.charAt(next + 1) == '$'))) {
+                String pattern = s.substring(next, next + 2);
+                throw new RendererException("Found zero sized replacement pattern '" + pattern + "'.");
+            }
+
             String part = s.substring(start, next);
+            // Escape doubled up replacement characters.
+            part = part.replace("##", "#");
+            part = part.replace("$$", "$");
 
             if (count == 0) {
                 // First part has no "#" or "$" before it.
@@ -452,8 +486,8 @@ final class Renderer {
                 // terminate now.
                 return;
             }
-            start = next + 1; // skip over the "#" or "$"
-            startIsAfterDollar = next == dollar; // remember which character we just split with
+            start = next + 1;
+            startIsAfterDollar = s.charAt(next) == '$'; // remember which character we just split with
             count++;
         } while (true);
     }
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/Template.java b/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
index f245cda0501..3cd3a9097ff 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/Template.java
@@ -160,7 +160,8 @@ import compiler.lib.ir_framework.TestFramework;
  * arguments into the strings. But since string templates are not (yet) available, the Templates provide
  * <strong>hashtag replacements</strong> in the {@link String}s: the Template argument names are captured, and
  * the argument values automatically replace any {@code "#name"} in the {@link String}s. See the different overloads
- * of {@link #make} for examples. Additional hashtag replacements can be defined with {@link #let}.
+ * of {@link #make} for examples. Additional hashtag replacements can be defined with {@link #let}. If a "#" is needed
+ * in the code, hashtag replacmement can be escaped by writing two hashtags, i.e. "##" will render as "#".
  * We have decided to keep hashtag replacements constrained to the scope of one Template. They
  * do not escape to outer or inner Template uses. If one needs to pass values to inner Templates,
  * this can be done with Template arguments. Keeping hashtag replacements local to Templates
@@ -172,7 +173,8 @@ import compiler.lib.ir_framework.TestFramework;
  * For this, Templates provide <strong>dollar replacements</strong>, which automatically rename any
  * {@code "$name"} in the {@link String} with a {@code "name_ID"}, where the {@code "ID"} is unique for every use of
  * a Template. The dollar replacement can also be captured with {@link #$}, and passed to nested
- * Templates, which allows sharing of these identifier names between Templates.
+ * Templates, which allows sharing of these identifier names between Templates. Similar to hashtag replacements,
+ * dollars can be escaped by doubling up, i.e. "$$" renders as "$".
  *
  * <p>
  * The dollar and hashtag names must have at least one character. The first character must be a letter
diff --git a/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java b/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
index b789da45d44..c8541ac1fa6 100644
--- a/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
+++ b/test/hotspot/jtreg/compiler/lib/template_framework/library/PrimitiveType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -141,6 +141,35 @@ public final class PrimitiveType implements CodeGenerationDataNameType {
         };
     }
 
+    /**
+     * Provides the field descriptor for primitive types as per JVMS§4.3.2.
+     *
+     * @return the field descriptor of the type.
+     */
+    public String fieldDesc() {
+        return switch (kind) {
+            case LONG    -> "J";
+            case BOOLEAN -> "Z";
+            default      -> boxedTypeName().substring(0, 1);
+        };
+    }
+
+    /**
+     * Provides the abbreviation of the type as it would be used for node classes in the
+     * IR-Framework. Note the the abbreviations for boolean and char are used inconsistently.
+     * This method maps boolean to "UB", even though it might sometimes be mapped under "B" since
+     * it is loaded as a byte, and char to "C", even though it might sometimes be mapped to "US"
+     * for "unsigned short".
+     *
+     * @return the abbreviation of the type.
+     */
+    public String abbrev() {
+        return switch (kind) {
+            case BOOLEAN -> "UB";
+            default      -> boxedTypeName().substring(0, 1);
+        };
+    }
+
     /**
      * Indicates if the type is a floating point type.
      *
diff --git a/test/hotspot/jtreg/compiler/longcountedloops/TestLoopNestTooManyTraps.java b/test/hotspot/jtreg/compiler/longcountedloops/TestLoopNestTooManyTraps.java
new file mode 100644
index 00000000000..502afc56548
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/longcountedloops/TestLoopNestTooManyTraps.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2026 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8350330
+ * @summary C2: PhaseIdealLoop::add_parse_predicate() should mirror GraphKit::add_parse_predicate()
+ * @library /test/lib /
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ *      -XX:-BackgroundCompilation -XX:-ShortRunningLongLoop -XX:-UseOnStackReplacement
+ *      -XX:CompileOnly=*TestLoopNestTooManyTraps::test1 -XX:LoopMaxUnroll=0
+ *      compiler.longcountedloops.TestLoopNestTooManyTraps
+ */
+
+package compiler.longcountedloops;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+import jdk.test.whitebox.WhiteBox;
+
+public class TestLoopNestTooManyTraps {
+    private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
+
+    public static void main(String[] args) throws NoSuchMethodException {
+        Method methodTest1 = TestLoopNestTooManyTraps.class.getDeclaredMethod("test1", int.class, long.class);
+
+        for (int j = 0; j < 10; j++) {
+            System.out.println("iteration " + j);
+            for (int i = 0; i < 20_000; i++) {
+                test1(1000, 1000);
+            }
+            if (!WHITE_BOX.isMethodCompiled(methodTest1)) {
+                throw new RuntimeException("test1 should be compiled");
+            }
+            System.out.println("iteration 2 " + j);
+            try {
+                test1(10000, 1000);
+            } catch (IndexOutOfBoundsException ioobe) {
+            }
+            if (j <= 1) {
+                if (WHITE_BOX.isMethodCompiled(methodTest1)) {
+                    throw new RuntimeException("test1 should have deoptimized at iteration " + j);
+                }
+            } else {
+                if (!WHITE_BOX.isMethodCompiled(methodTest1)) {
+                    throw new RuntimeException("test1 shouldn't have deoptimized");
+                }
+            }
+        }
+    }
+
+    private static void test1(int stop, long length) {
+        for (int i = 0; i < stop; i++) {
+            Objects.checkIndex(i, length);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestSinkingLoadInputOfPhi.java b/test/hotspot/jtreg/compiler/loopopts/TestSinkingLoadInputOfPhi.java
new file mode 100644
index 00000000000..cd563e6caf2
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestSinkingLoadInputOfPhi.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2026 IBM Corporation. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8374725
+ * @summary C2: assert(x_ctrl == get_late_ctrl_with_anti_dep(x->as_Load(), early_ctrl, x_ctrl)) failed: anti-dependences were already checked
+ * @run main/othervm  -XX:CompileCommand=compileonly,*TestSinkingLoadInputOfPhi*::* -XX:-TieredCompilation -Xcomp ${test.main.class}
+ * @run main ${test.main.class}
+ */
+
+package compiler.loopopts;
+
+public class TestSinkingLoadInputOfPhi {
+
+  static long lFld;
+  static int iFld = 55;
+  static int iFld2 = 10;
+  static void test() {
+    int iArr[] = new int[iFld2];
+
+    for (int i13 : iArr)
+      switch (iFld) {
+      case 69:
+      case 46:
+      case 65:
+        lFld = i13;
+      case 55: // taken
+        for (int i16 = 1; i16 < 30000; i16++)
+          ;
+      case 71:
+        iArr[iFld2] = 2; // OOB-access
+      }
+  }
+
+  public static void main(String[] strArr) {
+    try {
+      test();
+      } catch (ArrayIndexOutOfBoundsException e) {
+        // expected
+      }
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
index 0e17489e1c8..873533aaba8 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ import java.nio.ByteOrder;
 
 /*
  * @test
- * @bug 8325155
+ * @bug 8325155 8342095
  * @key randomness
  * @summary Test some cases that vectorize after the removal of the alignment boundaries code.
  *          Now, we instead check if use-def connections have compatible type size.
@@ -106,6 +106,22 @@ public class TestCompatibleUseDefTypeSize {
         tests.put("test9",       () -> { return test9(aL.clone(), bD.clone()); });
         tests.put("test10",      () -> { return test10(aL.clone(), bD.clone()); });
         tests.put("test11",      () -> { return test11(aC.clone()); });
+        tests.put("testByteToInt",   () -> { return testByteToInt(aB.clone(), bI.clone()); });
+        tests.put("testByteToShort", () -> { return testByteToShort(aB.clone(), bS.clone()); });
+        tests.put("testByteToChar",  () -> { return testByteToChar(aB.clone(), bC.clone()); });
+        tests.put("testByteToLong",  () -> { return testByteToLong(aB.clone(), bL.clone()); });
+        tests.put("testShortToByte", () -> { return testShortToByte(aS.clone(), bB.clone()); });
+        tests.put("testShortToChar", () -> { return testShortToChar(aS.clone(), bC.clone()); });
+        tests.put("testShortToInt",  () -> { return testShortToInt(aS.clone(), bI.clone()); });
+        tests.put("testShortToLong", () -> { return testShortToLong(aS.clone(), bL.clone()); });
+        tests.put("testIntToShort",  () -> { return testIntToShort(aI.clone(), bS.clone()); });
+        tests.put("testIntToChar",   () -> { return testIntToChar(aI.clone(), bC.clone()); });
+        tests.put("testIntToByte",   () -> { return testIntToByte(aI.clone(), bB.clone()); });
+        tests.put("testIntToLong",   () -> { return testIntToLong(aI.clone(), bL.clone()); });
+        tests.put("testLongToByte",  () -> { return testLongToByte(aL.clone(), bB.clone()); });
+        tests.put("testLongToShort", () -> { return testLongToShort(aL.clone(), bS.clone()); });
+        tests.put("testLongToChar",  () -> { return testLongToChar(aL.clone(), bC.clone()); });
+        tests.put("testLongToInt",   () -> { return testLongToInt(aL.clone(), bI.clone()); });
 
         // Compute gold value for all test methods before compilation
         for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
@@ -128,7 +144,23 @@ public class TestCompatibleUseDefTypeSize {
                  "test8",
                  "test9",
                  "test10",
-                 "test11"})
+                 "test11",
+                 "testByteToInt",
+                 "testByteToShort",
+                 "testByteToChar",
+                 "testByteToLong",
+                 "testShortToByte",
+                 "testShortToChar",
+                 "testShortToInt",
+                 "testShortToLong",
+                 "testIntToShort",
+                 "testIntToChar",
+                 "testIntToByte",
+                 "testIntToLong",
+                 "testLongToByte",
+                 "testLongToShort",
+                 "testLongToChar",
+                 "testLongToInt"})
     public void runTests() {
         for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
             String name = entry.getKey();
@@ -328,12 +360,12 @@ public class TestCompatibleUseDefTypeSize {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
+    @IR(counts = {IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"})
     // "inflate"  method: 1 byte -> 2 byte.
     // Java scalar code has no explicit conversion.
-    // Vector code would need a conversion. We may add this in the future.
     static Object[] test1(byte[] src, char[] dst) {
         for (int i = 0; i < src.length; i++) {
             dst[i] = (char)(src[i]);
@@ -478,4 +510,201 @@ public class TestCompatibleUseDefTypeSize {
         }
         return new Object[]{ a, new char[] { m } };
     }
+
+    // Narrowing
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
+    public Object[] testIntToShort(int[] ints, short[] res) {
+        for (int i = 0; i < ints.length; i++) {
+            res[i] = (short) ints[i];
+        }
+
+        return new Object[] { ints, res };
+    }
+
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_char)", ">0" })
+    public Object[] testIntToChar(int[] ints, char[] res) {
+        for (int i = 0; i < ints.length; i++) {
+            res[i] = (char) ints[i];
+        }
+
+        return new Object[] { ints, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", ">0" })
+    public Object[] testIntToByte(int[] ints, byte[] res) {
+        for (int i = 0; i < ints.length; i++) {
+            res[i] = (byte) ints[i];
+        }
+
+        return new Object[] { ints, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_S2B, IRNode.VECTOR_SIZE + "min(max_short, max_byte)", ">0" })
+    public Object[] testShortToByte(short[] shorts, byte[] res) {
+        for (int i = 0; i < shorts.length; i++) {
+            res[i] = (byte) shorts[i];
+        }
+
+        return new Object[] { shorts, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx2", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_L2B, IRNode.VECTOR_SIZE + "min(max_long, max_byte)", ">0" })
+    public Object[] testLongToByte(long[] longs, byte[] res) {
+        for (int i = 0; i < longs.length; i++) {
+            res[i] = (byte) longs[i];
+        }
+
+        return new Object[] { longs, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_L2S, IRNode.VECTOR_SIZE + "min(max_long, max_short)", ">0" })
+    public Object[] testLongToShort(long[] longs, short[] res) {
+        for (int i = 0; i < longs.length; i++) {
+            res[i] = (short) longs[i];
+        }
+
+        return new Object[] { longs, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_L2S, IRNode.VECTOR_SIZE + "min(max_long, max_char)", ">0" })
+    public Object[] testLongToChar(long[] longs, char[] res) {
+        for (int i = 0; i < longs.length; i++) {
+            res[i] = (char) longs[i];
+        }
+
+        return new Object[] { longs, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_L2I, IRNode.VECTOR_SIZE + "min(max_long, max_int)", ">0" })
+    public Object[] testLongToInt(long[] longs, int[] res) {
+        for (int i = 0; i < longs.length; i++) {
+            res[i] = (int) longs[i];
+        }
+
+        return new Object[] { longs, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.STORE_VECTOR, ">0" })
+    public Object[] testShortToChar(short[] shorts, char[] res) {
+        for (int i = 0; i < shorts.length; i++) {
+            res[i] = (char) shorts[i];
+        }
+
+        return new Object[] { shorts, res };
+    }
+
+    // Widening
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_S2I, IRNode.VECTOR_SIZE + "min(max_short, max_int)", ">0" })
+    public Object[] testShortToInt(short[] shorts, int[] res) {
+        for (int i = 0; i < shorts.length; i++) {
+            res[i] = shorts[i];
+        }
+
+        return new Object[] { shorts, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_B2I, IRNode.VECTOR_SIZE + "min(max_byte, max_int)", ">0" })
+    public Object[] testByteToInt(byte[] bytes, int[] res) {
+        for (int i = 0; i < bytes.length; i++) {
+            res[i] = bytes[i];
+        }
+
+        return new Object[] { bytes, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_B2S, IRNode.VECTOR_SIZE + "min(max_byte, max_short)", ">0" })
+    public Object[] testByteToShort(byte[] bytes, short[] res) {
+        for (int i = 0; i < bytes.length; i++) {
+            res[i] = bytes[i];
+        }
+
+        return new Object[] { bytes, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_B2S, IRNode.VECTOR_SIZE + "min(max_byte, max_char)", ">0" })
+    public Object[] testByteToChar(byte[] bytes, char[] res) {
+        for (int i = 0; i < bytes.length; i++) {
+            res[i] = (char) bytes[i];
+        }
+
+        return new Object[] { bytes, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx2", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_B2L, IRNode.VECTOR_SIZE + "min(max_byte, max_long)", ">0" })
+    public Object[] testByteToLong(byte[] bytes, long[] res) {
+        for (int i = 0; i < bytes.length; i++) {
+            res[i] = bytes[i];
+        }
+
+        return new Object[] { bytes, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_S2L, IRNode.VECTOR_SIZE + "min(max_short, max_long)", ">0" })
+    public Object[] testShortToLong(short[] shorts, long[] res) {
+        for (int i = 0; i < shorts.length; i++) {
+            res[i] = shorts[i];
+        }
+
+        return new Object[] { shorts, res };
+    }
+
+    @Test
+    @IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2L, IRNode.VECTOR_SIZE + "min(max_int, max_long)", ">0" })
+    public Object[] testIntToLong(int[] ints, long[] res) {
+        for (int i = 0; i < ints.length; i++) {
+            res[i] = ints[i];
+        }
+
+        return new Object[] { ints, res };
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java
index 1cd5cfa1e75..9d674950499 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestReductions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test id=no-vectorization
- * @bug 8340093
+ * @bug 8340093 8342095
  * @summary Test vectorization of reduction loops.
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestReductions P0
@@ -31,7 +31,7 @@
 
 /*
  * @test id=vanilla
- * @bug 8340093
+ * @bug 8340093 8342095
  * @summary Test vectorization of reduction loops.
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestReductions P1
@@ -39,7 +39,7 @@
 
 /*
  * @test id=force-vectorization
- * @bug 8340093
+ * @bug 8340093 8342095
  * @summary Test vectorization of reduction loops.
  * @library /test/lib /
  * @run driver compiler.loopopts.superword.TestReductions P2
@@ -455,7 +455,13 @@ public class TestReductions {
 
     // ---------byte***Simple ------------------------------------------------------------
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteAndSimple() {
         byte acc = (byte)0xFF; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -466,7 +472,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteOrSimple() {
         byte acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -477,7 +489,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteXorSimple() {
         byte acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -510,7 +528,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteMinSimple() {
         byte acc = Byte.MAX_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -521,7 +545,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteMaxSimple() {
         byte acc = Byte.MIN_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -533,7 +563,13 @@ public class TestReductions {
 
     // ---------byte***DotProduct ------------------------------------------------------------
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteAndDotProduct() {
         byte acc = (byte)0xFF; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -544,7 +580,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteOrDotProduct() {
         byte acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -555,7 +597,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteXorDotProduct() {
         byte acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -588,7 +636,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteMinDotProduct() {
         byte acc = Byte.MAX_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -599,7 +653,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteMaxDotProduct() {
         byte acc = Byte.MIN_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -611,7 +671,13 @@ public class TestReductions {
 
     // ---------byte***Big ------------------------------------------------------------
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteAndBig() {
         byte acc = (byte)0xFF; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -622,7 +688,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteOrBig() {
         byte acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -633,7 +705,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteXorBig() {
         byte acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -666,7 +744,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteMinBig() {
         byte acc = Byte.MAX_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -677,7 +761,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_B) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_B,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static byte byteMaxBig() {
         byte acc = Byte.MIN_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -923,7 +1013,13 @@ public class TestReductions {
 
     // ---------short***Simple ------------------------------------------------------------
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortAndSimple() {
         short acc = (short)0xFFFF; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -934,7 +1030,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortOrSimple() {
         short acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -945,7 +1047,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortXorSimple() {
         short acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -978,7 +1086,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortMinSimple() {
         short acc = Short.MAX_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -989,7 +1103,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortMaxSimple() {
         short acc = Short.MIN_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1001,7 +1121,13 @@ public class TestReductions {
 
     // ---------short***DotProduct ------------------------------------------------------------
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortAndDotProduct() {
         short acc = (short)0xFFFF; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1012,7 +1138,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortOrDotProduct() {
         short acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1023,7 +1155,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortXorDotProduct() {
         short acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1056,7 +1194,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortMinDotProduct() {
         short acc = Short.MAX_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1067,7 +1211,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortMaxDotProduct() {
         short acc = Short.MIN_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1079,7 +1229,13 @@ public class TestReductions {
 
     // ---------short***Big ------------------------------------------------------------
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.AND_REDUCTION_V, "> 0",
+                  IRNode.AND_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortAndBig() {
         short acc = (short)0xFFFF; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1090,7 +1246,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.OR_REDUCTION_V, "> 0",
+                  IRNode.OR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortOrBig() {
         short acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1101,7 +1263,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.XOR_REDUCTION_V, "> 0",
+                  IRNode.XOR_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortXorBig() {
         short acc = 0; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1134,7 +1302,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.MIN_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortMinBig() {
         short acc = Short.MAX_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
@@ -1145,7 +1319,13 @@ public class TestReductions {
     }
 
     @Test
-    @IR(failOn = IRNode.LOAD_VECTOR_S) // does not vectorize for now, might in the future.
+    @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                  IRNode.MAX_REDUCTION_V, "> 0",
+                  IRNode.MAX_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"},
+        applyIf = {"AutoVectorizationOverrideProfitability", "> 0"})
+    @IR(failOn = IRNode.LOAD_VECTOR_S,
+        applyIf = {"AutoVectorizationOverrideProfitability", "= 0"})
     private static short shortMaxBig() {
         short acc = Short.MIN_VALUE; // neutral element
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
index e6c8b68fc6f..0693d6b3df0 100644
--- a/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
+++ b/test/hotspot/jtreg/compiler/patches/java.base/java/lang/Helper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ public class Helper {
     }
 
     public static void inflate(byte[] src, int srcOff, byte[] dst, int dstOff, int len) {
-        StringUTF16.inflate(src, srcOff, dst, dstOff, len);
+        StringLatin1.inflate(src, srcOff, dst, dstOff, len);
     }
 
     public static int indexOf(byte[] src, int srcCount,
diff --git a/test/jdk/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptDetailsLockRank.java
similarity index 63%
rename from test/jdk/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java
rename to test/hotspot/jtreg/compiler/uncommontrap/TestDeoptDetailsLockRank.java
index a2d7ea2f8cb..2866a84ba46 100644
--- a/test/jdk/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java
+++ b/test/hotspot/jtreg/compiler/uncommontrap/TestDeoptDetailsLockRank.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,23 +20,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import javax.sql.rowset.serial.SerialBlob;
-import javax.sql.rowset.serial.SerialException;
 
-/**
+ /**
  * @test
- * @bug 7077451
- * @summary tests if the correct exception is thrown when calling method setBinaryStream() on SerialBlob
+ * @bug 8374862
+ * @summary Regression test for -XX:+Verbose -XX:+WizardMode -XX:+PrintDeoptimizationDetails crash
+ * @requires vm.debug
+ * @run main/othervm -XX:+Verbose -XX:+WizardMode -XX:+PrintDeoptimizationDetails compiler.uncommontrap.TestDeoptDetailsLockRank
  */
-public class SetBinaryStream {
 
-    public static void main(String[] args) throws Exception {
-        SerialBlob blob = new SerialBlob(new byte[0]);
-        try {
-            blob.setBinaryStream(0);
-        } catch (SerialException e) {
-            System.out.println("Test PASSED");
-        }
+package compiler.uncommontrap;
+
+public class TestDeoptDetailsLockRank {
+
+    public static void main(String[] args) {
+        System.out.println("passed");
     }
-
-}
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/uncommontrap/TestPrintDiagnosticsWithoutProfileTraps.java b/test/hotspot/jtreg/compiler/uncommontrap/TestPrintDiagnosticsWithoutProfileTraps.java
new file mode 100644
index 00000000000..51b30219aca
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/uncommontrap/TestPrintDiagnosticsWithoutProfileTraps.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /**
+ * @test
+ * @bug 8374807
+ * @summary Regression test for -XX:+TraceDeoptimization -XX:-ProfileTraps
+ *          -XX:-TieredCompilation -Xcomp crash
+ * @modules java.base/jdk.internal.misc
+ * @requires vm.debug
+ * @run main/othervm -XX:+TraceDeoptimization -XX:-ProfileTraps
+ *                   -XX:-TieredCompilation -Xcomp -Xbatch
+ *                   -XX:CompileCommand=compileonly,compiler.uncommontrap.TestPrintDiagnosticsWithoutProfileTraps::test
+ *                   compiler.uncommontrap.TestPrintDiagnosticsWithoutProfileTraps
+ */
+
+package compiler.uncommontrap;
+
+import jdk.internal.misc.Unsafe;
+
+public class TestPrintDiagnosticsWithoutProfileTraps {
+    static final Unsafe UNSAFE=Unsafe.getUnsafe();
+    static volatile long sink;
+
+    static class TestSubClass {
+        int f;
+    }
+
+    static void test(){
+        // Trigger a deopt/uncommon-trap path while resolving the field offset.
+        sink = UNSAFE.objectFieldOffset(TestSubClass.class,"f");
+    }
+
+    public static void main(String[] args) {
+        test();
+        System.out.println("passed");
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java b/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java
index 7977125b9cf..9a31cbbb057 100644
--- a/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java
+++ b/test/hotspot/jtreg/compiler/unsafe/OpaqueAccesses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,15 +65,15 @@ public class OpaqueAccesses {
     // Finish the line after the node type, skips full line, and eats until before the node types
     private static final String SKIP = IRNode.MID + IRNode.END + "\\R" + FULL_LINES + "\\s*" + IRNode.START;
 
-    private static final String CALL_STATIC_JAVA_AND_THEN_OPAQUE_NOT_NULL = IRNode.START + "CallStaticJava" + SKIP + "OpaqueNotNull" + IRNode.MID + IRNode.END;
-    private static final String OPAQUE_NOT_NULL_AND_THEN_CALL_STATIC_JAVA = IRNode.START + "OpaqueNotNull" + SKIP + "CallStaticJava" + IRNode.MID + IRNode.END;
-    /* Having both CallStaticJava and OpaqueNotNull, in any order. We use that in a failOn to make sure we have one
+    private static final String CALL_STATIC_JAVA_AND_THEN_OPAQUE_CONSTANT_BOOL = IRNode.START + "CallStaticJava" + SKIP + "OpaqueConstantBool" + IRNode.MID + IRNode.END;
+    private static final String OPAQUE_CONSTANT_BOOL_AND_THEN_CALL_STATIC_JAVA = IRNode.START + "OpaqueConstantBool" + SKIP + "CallStaticJava" + IRNode.MID + IRNode.END;
+    /* Having both CallStaticJava and OpaqueConstantBool, in any order. We use that in a failOn to make sure we have one
      * or the other (or none), but not both.
-     * The CallStaticJava happens when the call is not intrinsified, and the OpaqueNotNull comes from the intrinsic.
+     * The CallStaticJava happens when the call is not intrinsified, and the OpaqueConstantBool comes from the intrinsic.
      * We don't want a unfinished intrinsic, with the call nevertheless.
      */
     private static final String BOTH_CALL_STATIC_JAVA_AND_OPAQUE_NOT_NULL =
-            "(" + CALL_STATIC_JAVA_AND_THEN_OPAQUE_NOT_NULL + ") | (" + OPAQUE_NOT_NULL_AND_THEN_CALL_STATIC_JAVA + ")";
+            "(" + CALL_STATIC_JAVA_AND_THEN_OPAQUE_CONSTANT_BOOL + ") | (" + OPAQUE_CONSTANT_BOOL_AND_THEN_CALL_STATIC_JAVA + ")";
 
 
     @Test
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestCastShapeBadOpc.java b/test/hotspot/jtreg/compiler/vectorapi/TestCastShapeBadOpc.java
new file mode 100644
index 00000000000..743c243cb58
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestCastShapeBadOpc.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=all-flags
+ * @bug 8374889
+ * @summary Test case that can compile unexpected code paths in VectorAPI cast intrinsification.
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:-TieredCompilation -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:StressSeed=1462975402
+ *      -XX:+StressIncrementalInlining
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test2
+ *      ${test.main.class}
+ */
+
+/*
+ * @test id=no-stress-seed
+ * @bug 8374889
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run main/othervm
+ *      -XX:+IgnoreUnrecognizedVMOptions
+ *      -XX:-TieredCompilation -Xbatch
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+StressIncrementalInlining
+ *      -XX:CompileCommand=compileonly,${test.main.class}::test2
+ *      ${test.main.class}
+ */
+
+/*
+ * @test id=vanilla
+ * @bug 8374889
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run driver ${test.main.class}
+ */
+
+package compiler.vectorapi;
+
+import jdk.incubator.vector.*;
+
+public class TestCastShapeBadOpc {
+    public static void main(String[] args) {
+        for (int i = 0; i < 100_000; ++i) {
+            test1();
+            test2();
+        }
+    }
+
+    // This code does not trigger the bug itself, but seems to be important for profiling,
+    // so that test2 fails.
+    public static Object test1() {
+        LongVector v0 = LongVector.broadcast(LongVector.SPECIES_512, -15L);
+        var v1 = (ByteVector)v0.convertShape(VectorOperators.Conversion.ofReinterpret(long.class, byte.class), ByteVector.SPECIES_128, 0);
+        var v2 = (ByteVector)v1.castShape(ByteVector.SPECIES_256, 0);
+        return v2;
+    }
+
+    public static Object test2() {
+        var v0 = ShortVector.broadcast(ShortVector.SPECIES_64, (short)7729);
+        var v1 = (FloatVector)v0.reinterpretShape(FloatVector.SPECIES_64, 0);
+        // The castShape below should take the "C" path in AbstractVector::convert0, but sometimes
+        // we also compile the "Z" case because of profiling. This means we attempt to create
+        // a vector cast from float -> long, but unfortunately with a UCAST (float -> long is signed).
+        // This triggered an assert in VectorCastNode::opcode.
+        var v2 = (LongVector)v1.castShape(LongVector.SPECIES_256, 0);
+        return v2;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorLibraryUnaryOpAndBinaryOp.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorLibraryUnaryOpAndBinaryOp.java
new file mode 100644
index 00000000000..f7837e1abfa
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorLibraryUnaryOpAndBinaryOp.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, NTT DATA
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.ir_framework.*;
+import jdk.incubator.vector.*;
+
+/**
+ * @test
+ * @bug 8378312
+ * @library /test/lib /
+ * @summary VectorAPI: libraryUnaryOp and libraryBinaryOp should be intrinsified.
+ * @modules jdk.incubator.vector
+ *
+ * @run driver compiler.vectorapi.TestVectorLibraryUnaryOpAndBinaryOp
+ */
+
+public class TestVectorLibraryUnaryOpAndBinaryOp {
+
+    @Test
+    @IR(counts = { IRNode.CALL_LEAF_VECTOR, "= 1" }, applyIfCPUFeatureOr = { "asimd", "true", "avx", "true" })
+    public static void testUnary() {
+        var vec = FloatVector.broadcast(FloatVector.SPECIES_128, 3.14f);
+        vec.lanewise(VectorOperators.COS);
+    }
+
+    @Test
+    @IR(counts = { IRNode.CALL_LEAF_VECTOR, "= 1" }, applyIfCPUFeatureOr = { "asimd", "true", "avx", "true" })
+    public static void testBinary() {
+        var vec = FloatVector.broadcast(FloatVector.SPECIES_128, 2.0f);
+        vec.lanewise(VectorOperators.HYPOT, 1.0f);
+    }
+
+    public static void main(String[] args) {
+        TestFramework testFramework = new TestFramework();
+        testFramework.addFlags("--add-modules=jdk.incubator.vector")
+                     .start();
+    }
+
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java b/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java
index c603f450d0c..71507bde7c0 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestVectorLoadStoreOptimization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * Copyright (c) 2025, 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ import jdk.incubator.vector.*;
 import jdk.test.lib.Asserts;
 
 /**
- * @test 8371603
+ * @test 8371603 8378239
  * @key randomness
  * @library /test/lib /
  * @summary Test the missing optimization issues for vector load/store caused by JDK-8286941
@@ -96,6 +96,14 @@ public class TestVectorLoadStoreOptimization {
         }
     }
 
+    // Test that store a value that is just loaded from the same memory location is elided
+    @Test
+    @IR(failOn = IRNode.STORE_VECTOR,
+        applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"})
+    public static void testStoreVector2() {
+        IntVector.fromArray(SPECIES, a, 0).intoArray(a, 0);
+    }
+
     public static void main(String[] args) {
         TestFramework testFramework = new TestFramework();
         testFramework.setDefaultWarmup(10000)
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandPhi.java b/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandPhi.java
new file mode 100644
index 00000000000..936d24e4767
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandPhi.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import jdk.incubator.vector.*;
+
+/*
+ * @test
+ * @bug 8374903
+ * @summary C2 crashes when VectorBox Phi and vector Phi have different regions
+ * @modules jdk.incubator.vector
+ * @library /test/lib
+ *
+ * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,compiler.vectorapi.VectorBoxExpandPhi::test compiler.vectorapi.VectorBoxExpandPhi
+ */
+public class VectorBoxExpandPhi {
+    public static void main(String[] args) {
+        for (int i = 0; i < 10_000; i++) {
+            test();
+        }
+    }
+
+    public static Object test() {
+        var v0 = DoubleVector.broadcast(DoubleVector.SPECIES_128, 1.0);
+        var v1 = (FloatVector)v0.convertShape(VectorOperators.Conversion.ofCast(double.class, float.class), FloatVector.SPECIES_64, 0);
+        var v2 = (FloatVector)v1.convertShape(VectorOperators.Conversion.ofReinterpret(float.class, float.class), FloatVector.SPECIES_64, 0);
+        return v2;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandProj.java b/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandProj.java
new file mode 100644
index 00000000000..5d152834b17
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorBoxExpandProj.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import jdk.incubator.vector.*;
+
+/*
+ * @test
+ * @bug 8375010
+ * @summary C2 crashes when expanding VectorBox with Proj input from vector math call
+ * @modules jdk.incubator.vector
+ * @library /test/lib
+ *
+ * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,compiler.vectorapi.VectorBoxExpandProj::test compiler.vectorapi.VectorBoxExpandProj
+ */
+public class VectorBoxExpandProj {
+    static boolean b;
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 20_000; i++) {
+            b = !b;
+            test();
+        }
+        System.out.println("PASS");
+    }
+
+    // TAN returns Proj (not VectorNode). Phi merging creates VectorBox(Phi, Proj).
+    // expand_vbox_node_helper must handle Proj inputs with vector type.
+    static Object test() {
+        var t = DoubleVector.broadcast(DoubleVector.SPECIES_128, 1.0).lanewise(VectorOperators.TAN);
+        return b ? t.convertShape(VectorOperators.Conversion.ofCast(double.class, double.class), DoubleVector.SPECIES_128, 0) : t;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorUMinMaxReductionTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorUMinMaxReductionTest.java
new file mode 100644
index 00000000000..1c8cc34170e
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorUMinMaxReductionTest.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.generators.*;
+import compiler.lib.ir_framework.*;
+
+import jdk.incubator.vector.*;
+import jdk.test.lib.Asserts;
+
+import java.util.function.BinaryOperator;
+
+/**
+ * @test
+ * @bug 8372980
+ * @key randomness
+ * @summary Add intrinsic support for unsigned min/max reduction operations
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run driver compiler.vectorapi.VectorUMinMaxReductionTest
+ */
+
+public class VectorUMinMaxReductionTest {
+    private static final VectorSpecies<Byte> B_SPECIES = ByteVector.SPECIES_MAX;
+    private static final VectorSpecies<Short> S_SPECIES = ShortVector.SPECIES_MAX;
+    private static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_MAX;
+    private static final VectorSpecies<Float> F_SPECIES = FloatVector.SPECIES_MAX;
+    private static final VectorSpecies<Long> L_SPECIES = LongVector.SPECIES_MAX;
+    private static final VectorSpecies<Double> D_SPECIES = DoubleVector.SPECIES_MAX;
+    private static final int LENGTH = 256;
+    private static final Generators RD = Generators.G;
+
+    // Identity values for unsigned min/max operations
+    private static final byte BYTE_UMIN_IDENTITY = (byte) -1;
+    private static final byte BYTE_UMAX_IDENTITY = (byte) 0;
+    private static final short SHORT_UMIN_IDENTITY = (short) -1;
+    private static final short SHORT_UMAX_IDENTITY = (short) 0;
+    private static final int INT_UMIN_IDENTITY = -1;
+    private static final int INT_UMAX_IDENTITY = 0;
+    private static final long LONG_UMIN_IDENTITY = -1L;
+    private static final long LONG_UMAX_IDENTITY = 0L;
+
+    private static byte[] ba;
+    private static short[] sa;
+    private static int[] ia;
+    private static long[] la;
+    private static boolean[] ma;
+
+    static {
+        ba = new byte[LENGTH];
+        sa = new short[LENGTH];
+        ia = new int[LENGTH];
+        la = new long[LENGTH];
+        ma = new boolean[LENGTH];
+
+        Generator<Integer> iGen = RD.ints();
+        Generator<Long> lGen = RD.longs();
+
+        for (int i = 0; i < LENGTH; i++) {
+            ba[i] = iGen.next().byteValue();
+            sa[i] = iGen.next().shortValue();
+            ma[i] = iGen.next() % 2 == 0;
+        }
+        RD.fill(iGen, ia);
+        RD.fill(lGen, la);
+    }
+
+    // ==================== Helper Functions ====================
+
+    @DontInline
+    private static void verifyByte(VectorSpecies<Byte> species, byte got, byte init,
+                                   BinaryOperator<Byte> op, boolean isMasked) {
+        byte expected = init;
+        for (int i = 0; i < species.length(); i++) {
+            if (!isMasked || ma[i]) {
+                expected = op.apply(expected, ba[i]);
+            }
+        }
+        Asserts.assertEquals(expected, got);
+    }
+
+    @DontInline
+    private static void verifyShort(VectorSpecies<Short> species, short got, short init,
+                                    BinaryOperator<Short> op, boolean isMasked) {
+        short expected = init;
+        for (int i = 0; i < species.length(); i++) {
+            if (!isMasked || ma[i]) {
+                expected = op.apply(expected, sa[i]);
+            }
+        }
+        Asserts.assertEquals(expected, got);
+    }
+
+    @DontInline
+    private static void verifyInt(VectorSpecies<Integer> species, int got, int init,
+                                  BinaryOperator<Integer> op, boolean isMasked) {
+        int expected = init;
+        for (int i = 0; i < species.length(); i++) {
+            if (!isMasked || ma[i]) {
+                expected = op.apply(expected, ia[i]);
+            }
+        }
+        Asserts.assertEquals(expected, got);
+    }
+
+    @DontInline
+    private static void verifyLong(VectorSpecies<Long> species, long got, long init,
+                                   BinaryOperator<Long> op, boolean isMasked) {
+        long expected = init;
+        for (int i = 0; i < species.length(); i++) {
+            if (!isMasked || ma[i]) {
+                expected = op.apply(expected, la[i]);
+            }
+        }
+        Asserts.assertEquals(expected, got);
+    }
+
+    // ==================== Byte Tests ====================
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testByteUMin() {
+        byte got = ByteVector.fromArray(B_SPECIES, ba, 0).reduceLanes(VectorOperators.UMIN);
+        verifyByte(B_SPECIES, got, BYTE_UMIN_IDENTITY, VectorMath::minUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testByteUMax() {
+        byte got = ByteVector.fromArray(B_SPECIES, ba, 0).reduceLanes(VectorOperators.UMAX);
+        verifyByte(B_SPECIES, got, BYTE_UMAX_IDENTITY, VectorMath::maxUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testByteUMinMasked() {
+        byte got = ByteVector.fromArray(B_SPECIES, ba, 0)
+                             .reduceLanes(VectorOperators.UMIN,
+                                          VectorMask.fromArray(B_SPECIES, ma, 0));
+        verifyByte(B_SPECIES, got, BYTE_UMIN_IDENTITY, VectorMath::minUnsigned, true);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testByteUMaxMasked() {
+        byte got = ByteVector.fromArray(B_SPECIES, ba, 0)
+                             .reduceLanes(VectorOperators.UMAX,
+                                          VectorMask.fromArray(B_SPECIES, ma, 0));
+        verifyByte(B_SPECIES, got, BYTE_UMAX_IDENTITY, VectorMath::maxUnsigned, true);
+    }
+
+    // ==================== Short Tests ====================
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testShortUMin() {
+        short got = ShortVector.fromArray(S_SPECIES, sa, 0).reduceLanes(VectorOperators.UMIN);
+        verifyShort(S_SPECIES, got, SHORT_UMIN_IDENTITY, VectorMath::minUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testShortUMax() {
+        short got = ShortVector.fromArray(S_SPECIES, sa, 0).reduceLanes(VectorOperators.UMAX);
+        verifyShort(S_SPECIES, got, SHORT_UMAX_IDENTITY, VectorMath::maxUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testShortUMinMasked() {
+        short got = ShortVector.fromArray(S_SPECIES, sa, 0)
+                               .reduceLanes(VectorOperators.UMIN,
+                                            VectorMask.fromArray(S_SPECIES, ma, 0));
+        verifyShort(S_SPECIES, got, SHORT_UMIN_IDENTITY, VectorMath::minUnsigned, true);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testShortUMaxMasked() {
+        short got = ShortVector.fromArray(S_SPECIES, sa, 0)
+                               .reduceLanes(VectorOperators.UMAX,
+                                            VectorMask.fromArray(S_SPECIES, ma, 0));
+        verifyShort(S_SPECIES, got, SHORT_UMAX_IDENTITY, VectorMath::maxUnsigned, true);
+    }
+
+    // ==================== Int Tests ====================
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testIntUMin() {
+        int got = IntVector.fromArray(I_SPECIES, ia, 0).reduceLanes(VectorOperators.UMIN);
+        verifyInt(I_SPECIES, got, INT_UMIN_IDENTITY, VectorMath::minUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testIntUMax() {
+        int got = IntVector.fromArray(I_SPECIES, ia, 0).reduceLanes(VectorOperators.UMAX);
+        verifyInt(I_SPECIES, got, INT_UMAX_IDENTITY, VectorMath::maxUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testIntUMinMasked() {
+        int got = IntVector.fromArray(I_SPECIES, ia, 0)
+                           .reduceLanes(VectorOperators.UMIN,
+                                        VectorMask.fromArray(I_SPECIES, ma, 0));
+        verifyInt(I_SPECIES, got, INT_UMIN_IDENTITY, VectorMath::minUnsigned, true);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testIntUMaxMasked() {
+        int got = IntVector.fromArray(I_SPECIES, ia, 0)
+                           .reduceLanes(VectorOperators.UMAX,
+                                        VectorMask.fromArray(I_SPECIES, ma, 0));
+        verifyInt(I_SPECIES, got, INT_UMAX_IDENTITY, VectorMath::maxUnsigned, true);
+    }
+
+    // ==================== Long Tests ====================
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testLongUMin() {
+        long got = LongVector.fromArray(L_SPECIES, la, 0).reduceLanes(VectorOperators.UMIN);
+        verifyLong(L_SPECIES, got, LONG_UMIN_IDENTITY, VectorMath::minUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testLongUMax() {
+        long got = LongVector.fromArray(L_SPECIES, la, 0).reduceLanes(VectorOperators.UMAX);
+        verifyLong(L_SPECIES, got, LONG_UMAX_IDENTITY, VectorMath::maxUnsigned, false);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMIN_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testLongUMinMasked() {
+        long got = LongVector.fromArray(L_SPECIES, la, 0)
+                             .reduceLanes(VectorOperators.UMIN,
+                                          VectorMask.fromArray(L_SPECIES, ma, 0));
+        verifyLong(L_SPECIES, got, LONG_UMIN_IDENTITY, VectorMath::minUnsigned, true);
+    }
+
+    @Test
+    @IR(counts = {IRNode.UMAX_REDUCTION_V, "= 1"},
+        applyIfCPUFeature = {"asimd", "true"})
+    public static void testLongUMaxMasked() {
+        long got = LongVector.fromArray(L_SPECIES, la, 0)
+                             .reduceLanes(VectorOperators.UMAX,
+                                          VectorMask.fromArray(L_SPECIES, ma, 0));
+        verifyLong(L_SPECIES, got, LONG_UMAX_IDENTITY, VectorMath::maxUnsigned, true);
+    }
+
+    public static void main(String[] args) {
+        TestFramework testFramework = new TestFramework();
+        testFramework.setDefaultWarmup(10000)
+                     .addFlags("--add-modules=jdk.incubator.vector")
+                     .start();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRotateByteAndShortVector.java b/test/hotspot/jtreg/compiler/vectorization/TestRotateByteAndShortVector.java
index e130fc0ba6c..79cde2f0d26 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestRotateByteAndShortVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRotateByteAndShortVector.java
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2022, 2025 Loongson Technology Co. Ltd. All rights reserved.
  * Copyright (c) 2025, Rivos Inc. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +25,7 @@
 
 /**
  * @test
- * @bug 8286847 8353600
+ * @bug 8286847 8353600 8342095
  * @key randomness
  * @summary Test vectorization of rotate byte and short
  * @library /test/lib /
@@ -116,11 +117,10 @@ public class TestRotateByteAndShortVector {
         }
     }
 
-    // NOTE: currently, there is no platform supporting RotateLeftV/RotateRightV intrinsic.
-    // If there is some implementation, it could probably in a wrong way which is different
-    // from what java language spec expects.
     @Test
-    @IR(failOn = { IRNode.ROTATE_LEFT_V })
+    @IR(counts = { IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                   IRNode.ROTATE_LEFT_V, "> 0" },
+        applyIfCPUFeature = {"avx512f", "true"})
     @IR(failOn = { IRNode.ROTATE_RIGHT_V })
     static void testRotateLeftByte(byte[] test, byte[] arr, int shift) {
         for (int i = 0; i < ARRLEN; i++) {
@@ -130,7 +130,9 @@ public class TestRotateByteAndShortVector {
 
     @Test
     @IR(failOn = { IRNode.ROTATE_LEFT_V })
-    @IR(failOn = { IRNode.ROTATE_RIGHT_V })
+    @IR(counts = { IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0",
+                   IRNode.ROTATE_RIGHT_V, "> 0" },
+        applyIfCPUFeature = {"avx512f", "true"})
     static void testRotateRightByte(byte[] test, byte[] arr, int shift) {
         for (int i = 0; i < ARRLEN; i++) {
             test[i] = (byte) ((arr[i] >>> shift) | (arr[i] << -shift));
@@ -138,7 +140,9 @@ public class TestRotateByteAndShortVector {
     }
 
     @Test
-    @IR(failOn = { IRNode.ROTATE_LEFT_V })
+    @IR(counts = { IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                   IRNode.ROTATE_LEFT_V, "> 0" },
+        applyIfCPUFeature = {"avx512f", "true"})
     @IR(failOn = { IRNode.ROTATE_RIGHT_V })
     static void testRotateLeftShort(short[] test, short[] arr, int shift) {
         for (int i = 0; i < ARRLEN; i++) {
@@ -148,7 +152,9 @@ public class TestRotateByteAndShortVector {
 
     @Test
     @IR(failOn = { IRNode.ROTATE_LEFT_V })
-    @IR(failOn = { IRNode.ROTATE_RIGHT_V })
+    @IR(counts = { IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0",
+                   IRNode.ROTATE_RIGHT_V, "> 0" },
+        applyIfCPUFeature = {"avx512f", "true"})
     static void testRotateRightShort(short[] test, short[] arr, int shift) {
         for (int i = 0; i < ARRLEN; i++) {
             test[i] = (short) ((arr[i] >>> shift) | (arr[i] << -shift));
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestSubwordTruncation.java b/test/hotspot/jtreg/compiler/vectorization/TestSubwordTruncation.java
index 53c1b89a203..2f6296e41d2 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestSubwordTruncation.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestSubwordTruncation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.g
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ import compiler.lib.generators.*;
 
 /*
  * @test
- * @bug 8350177 8362171 8369881
+ * @bug 8350177 8362171 8369881 8342095
  * @summary Ensure that truncation of subword vectors produces correct results
  * @library /test/lib /
  * @run driver compiler.vectorization.TestSubwordTruncation
@@ -73,7 +73,8 @@ public class TestSubwordTruncation {
     // Shorts
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupShortArray")
     public Object[] testShortLeadingZeros(short[] in) {
         short[] res = new short[SIZE];
@@ -98,7 +99,8 @@ public class TestSubwordTruncation {
     }
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupShortArray")
     public Object[] testShortTrailingZeros(short[] in) {
         short[] res = new short[SIZE];
@@ -123,7 +125,8 @@ public class TestSubwordTruncation {
     }
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupShortArray")
     public Object[] testShortReverse(short[] in) {
         short[] res = new short[SIZE];
@@ -148,7 +151,8 @@ public class TestSubwordTruncation {
     }
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupShortArray")
     public Object[] testShortBitCount(short[] in) {
         short[] res = new short[SIZE];
@@ -277,7 +281,8 @@ public class TestSubwordTruncation {
     // Bytes
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupByteArray")
     public Object[] testByteLeadingZeros(byte[] in) {
         byte[] res = new byte[SIZE];
@@ -302,7 +307,8 @@ public class TestSubwordTruncation {
     }
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupByteArray")
     public Object[] testByteTrailingZeros(byte[] in) {
         byte[] res = new byte[SIZE];
@@ -327,7 +333,8 @@ public class TestSubwordTruncation {
     }
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupByteArray")
     public Object[] testByteReverse(byte[] in) {
         byte[] res = new byte[SIZE];
@@ -403,7 +410,8 @@ public class TestSubwordTruncation {
 
 
     @Test
-    @IR(counts = { IRNode.STORE_VECTOR, "=0" })
+    @IR(counts = { IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", "> 0" },
+        applyIfCPUFeatureOr = { "avx2", "true", "asimd", "true", "zvbb", "true" })
     @Arguments(setup = "setupByteArray")
     public Object[] testByteBitCount(byte[] in) {
         byte[] res = new byte[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorAlgorithms.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorAlgorithms.java
new file mode 100644
index 00000000000..e02563c2fc2
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorAlgorithms.java
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=vanilla
+ * @bug 8373026
+ * @summary Test auto vectorization and Vector API with some vector
+ *          algorithms. Related benchmark: VectorAlgorithms.java
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run driver ${test.main.class}
+ */
+
+/*
+ * @test id=noSuperWord
+ * @bug 8373026
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run driver ${test.main.class} -XX:-UseSuperWord
+ */
+
+/*
+ * @test id=noOptimizeFill
+ * @bug 8373026
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run driver ${test.main.class} -XX:-OptimizeFill
+ */
+
+package compiler.vectorization;
+
+import java.util.Map;
+import java.util.HashMap;
+import jdk.test.lib.Utils;
+import java.util.Random;
+import java.lang.foreign.*;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.generators.*;
+import static compiler.lib.generators.Generators.G;
+import compiler.lib.verify.*;
+
+/**
+ * The goal of this benchmark is to show the power of auto vectorization
+ * and the Vector API.
+ *
+ * Please only modify this benchark in synchronization with the JMH benchmark:
+ *   micro/org/openjdk/bench/vm/compiler/VectorAlgorithms.java
+ */
+public class TestVectorAlgorithms {
+    private static final Random RANDOM = Utils.getRandomInstance();
+    private static final RestrictableGenerator<Integer> INT_GEN = Generators.G.ints();
+
+    interface TestFunction {
+        Object run(int i);
+    }
+
+    Map<String, Map<String, TestFunction>> testGroups = new HashMap<String, Map<String, TestFunction>>();
+
+    VectorAlgorithmsImpl.Data d;
+
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework();
+        framework.addFlags("--add-modules=jdk.incubator.vector",
+                           "-XX:CompileCommand=inline,*VectorAlgorithmsImpl*::*");
+        framework.addFlags(args);
+        framework.start();
+    }
+
+    public TestVectorAlgorithms () {
+        testGroups.put("fillI", new HashMap<String,TestFunction>());
+        testGroups.get("fillI").put("fillI_loop",      i -> { return fillI_loop(d.rI1); });
+        testGroups.get("fillI").put("fillI_VectorAPI", i -> { return fillI_VectorAPI(d.rI2); });
+        testGroups.get("fillI").put("fillI_Arrays",    i -> { return fillI_Arrays(d.rI3); });
+
+        testGroups.put("iotaI", new HashMap<String,TestFunction>());
+        testGroups.get("iotaI").put("iotaI_loop",      i -> { return iotaI_loop(d.rI1); });
+        testGroups.get("iotaI").put("iotaI_VectorAPI", i -> { return iotaI_VectorAPI(d.rI2); });
+
+        testGroups.put("copyI", new HashMap<String,TestFunction>());
+        testGroups.get("copyI").put("copyI_loop",             i -> { return copyI_loop(d.aI, d.rI1); });
+        testGroups.get("copyI").put("copyI_VectorAPI",        i -> { return copyI_VectorAPI(d.aI, d.rI2); });
+        testGroups.get("copyI").put("copyI_System_arraycopy", i -> { return copyI_System_arraycopy(d.aI, d.rI3); });
+
+        testGroups.put("mapI", new HashMap<String,TestFunction>());
+        testGroups.get("mapI").put("mapI_loop",      i -> { return mapI_loop(d.aI, d.rI1); });
+        testGroups.get("mapI").put("mapI_VectorAPI", i -> { return mapI_VectorAPI(d.aI, d.rI2); });
+
+        testGroups.put("reduceAddI", new HashMap<String,TestFunction>());
+        testGroups.get("reduceAddI").put("reduceAddI_loop",                           i -> { return reduceAddI_loop(d.aI); });
+        testGroups.get("reduceAddI").put("reduceAddI_reassociate",                    i -> { return reduceAddI_reassociate(d.aI); });
+        testGroups.get("reduceAddI").put("reduceAddI_VectorAPI_naive",                i -> { return reduceAddI_VectorAPI_naive(d.aI); });
+        testGroups.get("reduceAddI").put("reduceAddI_VectorAPI_reduction_after_loop", i -> { return reduceAddI_VectorAPI_reduction_after_loop(d.aI); });
+
+        testGroups.put("dotProductF", new HashMap<String,TestFunction>());
+        testGroups.get("dotProductF").put("dotProductF_loop",                           i -> { return dotProductF_loop(d.aF, d.bF); });
+        testGroups.get("dotProductF").put("dotProductF_VectorAPI_naive",                i -> { return dotProductF_VectorAPI_naive(d.aF, d.bF); });
+        testGroups.get("dotProductF").put("dotProductF_VectorAPI_reduction_after_loop", i -> { return dotProductF_VectorAPI_reduction_after_loop(d.aF, d.bF); });
+
+        testGroups.put("hashCodeB", new HashMap<String,TestFunction>());
+        testGroups.get("hashCodeB").put("hashCodeB_loop",         i -> { return hashCodeB_loop(d.aB); });
+        testGroups.get("hashCodeB").put("hashCodeB_Arrays",       i -> { return hashCodeB_Arrays(d.aB); });
+        testGroups.get("hashCodeB").put("hashCodeB_VectorAPI_v1", i -> { return hashCodeB_VectorAPI_v1(d.aB); });
+        testGroups.get("hashCodeB").put("hashCodeB_VectorAPI_v2", i -> { return hashCodeB_VectorAPI_v2(d.aB); });
+
+        testGroups.put("scanAddI", new HashMap<String,TestFunction>());
+        testGroups.get("scanAddI").put("scanAddI_loop",                      i -> { return scanAddI_loop(d.aI, d.rI1); });
+        testGroups.get("scanAddI").put("scanAddI_loop_reassociate",          i -> { return scanAddI_loop_reassociate(d.aI, d.rI2); });
+        testGroups.get("scanAddI").put("scanAddI_VectorAPI_permute_add",     i -> { return scanAddI_VectorAPI_permute_add(d.aI, d.rI4); });
+
+        testGroups.put("findMinIndexI", new HashMap<String,TestFunction>());
+        testGroups.get("findMinIndexI").put("findMinIndexI_loop",      i -> { return findMinIndexI_loop(d.aI); });
+        testGroups.get("findMinIndexI").put("findMinIndexI_VectorAPI", i -> { return findMinIndexI_VectorAPI(d.aI); });
+
+        testGroups.put("findI", new HashMap<String,TestFunction>());
+        testGroups.get("findI").put("findI_loop",      i -> { return findI_loop(d.aI, d.eI[i]); });
+        testGroups.get("findI").put("findI_VectorAPI", i -> { return findI_VectorAPI(d.aI, d.eI[i]); });
+
+        testGroups.put("reverseI", new HashMap<String,TestFunction>());
+        testGroups.get("reverseI").put("reverseI_loop",      i -> { return reverseI_loop(d.aI, d.rI1); });
+        testGroups.get("reverseI").put("reverseI_VectorAPI", i -> { return reverseI_VectorAPI(d.aI, d.rI2); });
+
+        testGroups.put("filterI", new HashMap<String,TestFunction>());
+        testGroups.get("filterI").put("filterI_loop",      i -> { return filterI_loop(d.aI, d.rI1, d.eI[i]); });
+        testGroups.get("filterI").put("filterI_VectorAPI", i -> { return filterI_VectorAPI(d.aI, d.rI2, d.eI[i]); });
+
+        testGroups.put("reduceAddIFieldsX4", new HashMap<String,TestFunction>());
+        testGroups.get("reduceAddIFieldsX4").put("reduceAddIFieldsX4_loop",      i -> { return reduceAddIFieldsX4_loop(d.oopsX4, d.memX4); });
+        testGroups.get("reduceAddIFieldsX4").put("reduceAddIFieldsX4_VectorAPI", i -> { return reduceAddIFieldsX4_VectorAPI(d.oopsX4, d.memX4); });
+
+        testGroups.put("lowerCaseB", new HashMap<String,TestFunction>());
+        testGroups.get("lowerCaseB").put("lowerCaseB_loop",         i -> { return lowerCaseB_loop(d.strB, d.rB1); });
+        testGroups.get("lowerCaseB").put("lowerCaseB_VectorAPI_v1", i -> { return lowerCaseB_VectorAPI_v1(d.strB, d.rB2); });
+        testGroups.get("lowerCaseB").put("lowerCaseB_VectorAPI_v2", i -> { return lowerCaseB_VectorAPI_v2(d.strB, d.rB3); });
+    }
+
+    @Warmup(100)
+    @Run(test = {"fillI_loop",
+                 "fillI_VectorAPI",
+                 "fillI_Arrays",
+                 "iotaI_loop",
+                 "iotaI_VectorAPI",
+                 "copyI_loop",
+                 "copyI_VectorAPI",
+                 "copyI_System_arraycopy",
+                 "mapI_loop",
+                 "mapI_VectorAPI",
+                 "reduceAddI_loop",
+                 "reduceAddI_reassociate",
+                 "reduceAddI_VectorAPI_naive",
+                 "reduceAddI_VectorAPI_reduction_after_loop",
+                 "dotProductF_loop",
+                 "dotProductF_VectorAPI_naive",
+                 "dotProductF_VectorAPI_reduction_after_loop",
+                 "hashCodeB_loop",
+                 "hashCodeB_Arrays",
+                 "hashCodeB_VectorAPI_v1",
+                 "hashCodeB_VectorAPI_v2",
+                 "scanAddI_loop",
+                 "scanAddI_loop_reassociate",
+                 "scanAddI_VectorAPI_permute_add",
+                 "findMinIndexI_loop",
+                 "findMinIndexI_VectorAPI",
+                 "findI_loop",
+                 "findI_VectorAPI",
+                 "reverseI_loop",
+                 "reverseI_VectorAPI",
+                 "filterI_loop",
+                 "filterI_VectorAPI",
+                 "reduceAddIFieldsX4_loop",
+                 "reduceAddIFieldsX4_VectorAPI",
+                 "lowerCaseB_loop",
+                 "lowerCaseB_VectorAPI_v1",
+                 "lowerCaseB_VectorAPI_v2"})
+    public void runTests(RunInfo info) {
+        // Repeat many times, so that we also have multiple iterations for post-warmup to potentially recompile
+        int iters = info.isWarmUp() ? 1 : 20;
+        for (int iter = 0; iter < iters; iter++) {
+            // Set up random inputs, random size is important to stress tails.
+            int size = 100_000 + RANDOM.nextInt(10_000);
+            int seed = RANDOM.nextInt();
+            int numXObjects = 10_000;
+            d = new VectorAlgorithmsImpl.Data(size, seed, numXObjects);
+
+            // Run all tests
+            for (Map.Entry<String, Map<String,TestFunction>> group_entry : testGroups.entrySet()) {
+                String group_name = group_entry.getKey();
+                Map<String, TestFunction> group = group_entry.getValue();
+                Object gold = null;
+                String gold_name = "NONE";
+                for (Map.Entry<String,TestFunction> entry : group.entrySet()) {
+                    String name = entry.getKey();
+                    TestFunction test = entry.getValue();
+                    Object result = test.run(iter);
+                    if (gold == null) {
+                        gold = result;
+                        gold_name = name;
+                    } else {
+                        try {
+                            Verify.checkEQ(gold, result);
+                        } catch (VerifyException e) {
+                            throw new RuntimeException("Verify.checkEQ failed for group " + group_name +
+                                                       ", gold " + gold_name + ", test " + name, e);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REPLICATE_I,  "= 1",
+                  IRNode.STORE_VECTOR, "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfAnd = {"UseSuperWord", "true", "OptimizeFill", "false"})
+    @IR(counts = {".*CallLeafNoFP.*jint_fill.*", "= 1"},
+        phase = CompilePhase.BEFORE_MATCHING,
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"OptimizeFill", "true"})
+    // By default, the fill intrinsic "jint_fill" is used, but we can disable
+    // the detection of the fill loop, and then we auto vectorize.
+    public Object fillI_loop(int[] r) {
+        return VectorAlgorithmsImpl.fillI_loop(r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.REPLICATE_I,  "= 1",
+                  IRNode.STORE_VECTOR, "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object fillI_VectorAPI(int[] r) {
+        return VectorAlgorithmsImpl.fillI_VectorAPI(r);
+    }
+
+    @Test
+    // Arrays.fill is not necessarily inlined, so we can't check
+    // for vectors in the IR.
+    public Object fillI_Arrays(int[] r) {
+        return VectorAlgorithmsImpl.fillI_Arrays(r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.POPULATE_INDEX, "> 0",
+                  IRNode.STORE_VECTOR,   "> 0"},
+        applyIfCPUFeatureOr = {"avx2", "true", "sve", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    // Note: the Vector API example below can also vectorize for AVX,
+    //       because it does not use a PopulateIndex.
+    public Object iotaI_loop(int[] r) {
+        return VectorAlgorithmsImpl.iotaI_loop(r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI,       "> 0",
+                  IRNode.STORE_VECTOR, "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"})
+    // Note: also works with NEON/asimd, but only with TieredCompilation.
+    public Object iotaI_VectorAPI(int[] r) {
+        return VectorAlgorithmsImpl.iotaI_VectorAPI(r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    public Object copyI_loop(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.copyI_loop(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object copyI_VectorAPI(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.copyI_VectorAPI(a, r);
+    }
+
+    @Test
+    @IR(counts = {".*CallLeafNoFP.*jint_disjoint_arraycopy.*", "= 1"},
+        phase = CompilePhase.BEFORE_MATCHING,
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object copyI_System_arraycopy(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.copyI_System_arraycopy(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.MUL_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    public Object mapI_loop(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.mapI_loop(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.MUL_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object mapI_VectorAPI(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.mapI_VectorAPI(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0",
+                  IRNode.ADD_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    public int reduceAddI_loop(int[] a) {
+        return VectorAlgorithmsImpl.reduceAddI_loop(a);
+    }
+
+    @Test
+    public int reduceAddI_reassociate(int[] a) {
+        return VectorAlgorithmsImpl.reduceAddI_reassociate(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0"}, // reduceLanes inside loop
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public int reduceAddI_VectorAPI_naive(int[] a) {
+        return VectorAlgorithmsImpl.reduceAddI_VectorAPI_naive(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.MUL_VF,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    // See also TestReduction.floatAddDotProduct
+    public float dotProductF_loop(float[] a, float[] b) {
+        return VectorAlgorithmsImpl.dotProductF_loop(a, b);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.MUL_VF,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    public float dotProductF_VectorAPI_naive(float[] a, float[] b) {
+        return VectorAlgorithmsImpl.dotProductF_VectorAPI_naive(a, b);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_F,   "> 0",
+                  IRNode.ADD_REDUCTION_V, "> 0",
+                  IRNode.MUL_VF,          "> 0"},
+        applyIfCPUFeature = {"sse4.1", "true"},
+        applyIf = {"UseSuperWord", "true"})
+    public float dotProductF_VectorAPI_reduction_after_loop(float[] a, float[] b) {
+        return VectorAlgorithmsImpl.dotProductF_VectorAPI_reduction_after_loop(a, b);
+    }
+
+    @Test
+    public int hashCodeB_loop(byte[] a) {
+        return VectorAlgorithmsImpl.hashCodeB_loop(a);
+    }
+
+    @Test
+    public int hashCodeB_Arrays(byte[] a) {
+        return VectorAlgorithmsImpl.hashCodeB_Arrays(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B,    IRNode.VECTOR_SIZE_8, "> 0",
+                  IRNode.VECTOR_CAST_B2I,  IRNode.VECTOR_SIZE_8, "> 0",
+                  IRNode.MUL_VI,           IRNode.VECTOR_SIZE_8, "> 0",
+                  IRNode.ADD_VI,           IRNode.VECTOR_SIZE_8, "> 0",
+                  IRNode.ADD_REDUCTION_VI,                       "> 0"},
+        applyIfCPUFeature = {"avx2", "true"})
+    public int hashCodeB_VectorAPI_v1(byte[] a) {
+        return VectorAlgorithmsImpl.hashCodeB_VectorAPI_v1(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B,    "> 0",
+                  IRNode.MUL_VI,           "> 0",
+                  IRNode.ADD_VI,           "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0"},
+        applyIfCPUFeature = {"avx2", "true"})
+    public int hashCodeB_VectorAPI_v2(byte[] a) {
+        return VectorAlgorithmsImpl.hashCodeB_VectorAPI_v2(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.ADD_REDUCTION_VI, "> 0",
+                  IRNode.ADD_VI,           "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public int reduceAddI_VectorAPI_reduction_after_loop(int[] a) {
+        return VectorAlgorithmsImpl.reduceAddI_VectorAPI_reduction_after_loop(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"})
+    // Currently does not vectorize, but might in the future.
+    public Object scanAddI_loop(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.scanAddI_loop(a, r);
+    }
+
+    @Test
+    public Object scanAddI_loop_reassociate(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.scanAddI_loop_reassociate(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.REARRANGE_VI,     "> 0",
+                  IRNode.AND_VI,           "> 0",
+                  IRNode.ADD_VI,           "> 0",
+                  IRNode.STORE_VECTOR,     "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIf = {"MaxVectorSize", ">=64"})
+    public Object scanAddI_VectorAPI_permute_add(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.scanAddI_VectorAPI_permute_add(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0"})
+    // Currently does not vectorize, but might in the future.
+    public int findMinIndexI_loop(int[] a) {
+        return VectorAlgorithmsImpl.findMinIndexI_loop(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.VECTOR_MASK_CMP, "> 0",
+                  IRNode.VECTOR_BLEND_I,  "> 0",
+                  IRNode.MIN_REDUCTION_V, "> 0",
+                  IRNode.ADD_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public int findMinIndexI_VectorAPI(int[] a) {
+        return VectorAlgorithmsImpl.findMinIndexI_VectorAPI(a);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0"})
+    // Currently does not vectorize, but might in the future.
+    public int findI_loop(int[] a, int e) {
+        return VectorAlgorithmsImpl.findI_loop(a, e);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,   "> 0",
+                  IRNode.VECTOR_MASK_CMP, "> 0",
+                  IRNode.VECTOR_TEST,     "> 0"},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public int findI_VectorAPI(int[] a, int e) {
+        return VectorAlgorithmsImpl.findI_VectorAPI(a, e);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"})
+    // Currently does not vectorize, but might in the future.
+    public Object reverseI_loop(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.reverseI_loop(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,    "> 0",
+                  IRNode.REARRANGE_VI,     "> 0",
+                  IRNode.AND_VI,           "> 0",
+                  IRNode.STORE_VECTOR,     "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object reverseI_VectorAPI(int[] a, int[] r) {
+        return VectorAlgorithmsImpl.reverseI_VectorAPI(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"})
+    public Object filterI_loop(int[] a, int[] r, int threshold) {
+        return VectorAlgorithmsImpl.filterI_loop(a, r, threshold);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,       "> 0",
+                  IRNode.VECTOR_MASK_CMP,     "> 0",
+                  IRNode.VECTOR_TEST,         "> 0",
+                  IRNode.COMPRESS_VI,         "> 0",
+                  IRNode.STORE_VECTOR_MASKED, "> 0"},
+        applyIfCPUFeature = {"avx2", "true"})
+    public Object filterI_VectorAPI(int[] a, int[] r, int threshold) {
+        return VectorAlgorithmsImpl.filterI_VectorAPI(a, r, threshold);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0"})
+    // Currently does not vectorize, but might in the future.
+    public int reduceAddIFieldsX4_loop(int[] oops, int[] mem) {
+        return VectorAlgorithmsImpl.reduceAddIFieldsX4_loop(oops, mem);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I,             "> 0",
+                  IRNode.VECTOR_MASK_CMP,           "> 0",
+                  IRNode.VECTOR_TEST,               "> 0",
+                  IRNode.LOAD_VECTOR_GATHER_MASKED, "> 0",
+                  IRNode.OR_V_MASK,                 "> 0",
+                  IRNode.ADD_VI,                    "> 0",
+                  IRNode.ADD_REDUCTION_VI,          "> 0"},
+        applyIfCPUFeatureOr = {"avx512", "true", "sve", "true"})
+    public int reduceAddIFieldsX4_VectorAPI(int[] oops, int[] mem) {
+        return VectorAlgorithmsImpl.reduceAddIFieldsX4_VectorAPI(oops, mem);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0"})
+    // Currently does not vectorize, but might in the future.
+    public Object lowerCaseB_loop(byte[] a, byte[] r) {
+        return VectorAlgorithmsImpl.lowerCaseB_loop(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object lowerCaseB_VectorAPI_v1(byte[] a, byte[] r) {
+        return VectorAlgorithmsImpl.lowerCaseB_VectorAPI_v1(a, r);
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
+                  IRNode.ADD_VB,        "> 0"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    public Object lowerCaseB_VectorAPI_v2(byte[] a, byte[] r) {
+        return VectorAlgorithmsImpl.lowerCaseB_VectorAPI_v2(a, r);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java b/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java
new file mode 100644
index 00000000000..2dfac704069
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java
@@ -0,0 +1,774 @@
+/*
+ *  Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ *  This code is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 only, as
+ *  published by the Free Software Foundation.
+ *
+ *  This code is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  version 2 for more details (a copy is included in the LICENSE file that
+ *  accompanied this code).
+ *
+ *  You should have received a copy of the GNU General Public License version
+ *  2 along with this work; if not, write to the Free Software Foundation,
+ *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ *  or visit www.oracle.com if you need additional information or have any
+ *  questions.
+ *
+ */
+
+package compiler.vectorization;
+
+import java.util.Arrays;
+import java.util.Random;
+import jdk.incubator.vector.*;
+
+/**
+ * The code below is supposed to be an exact copy of:
+ *   micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java
+ */
+public class VectorAlgorithmsImpl {
+    private static final VectorSpecies<Integer> SPECIES_I    = IntVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Integer> SPECIES_I512 = IntVector.SPECIES_512;
+    private static final VectorSpecies<Integer> SPECIES_I256 = IntVector.SPECIES_256;
+    private static final VectorSpecies<Byte> SPECIES_B       = ByteVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Byte> SPECIES_B64     = ByteVector.SPECIES_64;
+    private static final VectorSpecies<Float> SPECIES_F      = FloatVector.SPECIES_PREFERRED;
+
+    // This class stores the input and output arrays.
+    // The constructor sets up all the data.
+    //
+    // IMPORTANT:
+    //   If you want to use some array but do NOT modify it: just use it.
+    //   If you want to use it and DO want to modify it: clone it. This
+    //   ensures that each test gets a separate copy, and that when we
+    //   capture the modified arrays they are different for every method
+    //   and run.
+    //   An alternative to cloning is to use different return arrays for
+    //   different implementations of the same group, e.g. rI1, rI2, ...
+    //
+    public static class Data {
+        public int[] aI;
+        public int[] rI1;
+        public int[] rI2;
+        public int[] rI3;
+        public int[] rI4;
+        public int[] eI;
+        // The test has to use the same index into eI for all implementations. But in the
+        // benchmark, we'd like to use random indices, so we use the index to advance through
+        // the array.
+        public int eI_idx = 0;
+
+        public float[] aF;
+        public float[] bF;
+
+        public byte[] aB;
+        public byte[] strB;
+        public byte[] rB1;
+        public byte[] rB2;
+        public byte[] rB3;
+
+        public int[] oopsX4;
+        public int[] memX4;
+
+        public Data(int size, int seed, int numX4Objects) {
+            Random random = new Random(seed);
+
+            // int: one input array and multiple output arrays so different implementations can
+            // store their results to different arrays.
+            aI = new int[size];
+            rI1 = new int[size];
+            rI2 = new int[size];
+            rI3 = new int[size];
+            rI4 = new int[size];
+            Arrays.setAll(aI, i -> random.nextInt());
+
+            // Populate with some random values from aI, and some totally random values.
+            eI = new int[0x10000];
+            for (int i = 0; i < eI.length; i++) {
+                eI[i] = (random.nextInt(10) == 0) ? random.nextInt() : aI[random.nextInt(size)];
+            }
+
+            // X4 oop setup.
+            // oopsX4 holds "addresses" (i.e. indices), that point to the 16-byte objects in memX4.
+            oopsX4 = new int[size];
+            memX4 = new int[numX4Objects * 4];
+            for (int i = 0; i < size; i++) {
+                // assign either a zero=null, or assign a random oop.
+                oopsX4[i] = (random.nextInt(10) == 0) ? 0 : random.nextInt(numX4Objects) * 4;
+            }
+            // Just fill the whole array with random values.
+            // The relevant field is only at every "4 * i + 3" though.
+            memX4 = new int[4 * numX4Objects];
+            for (int i = 0; i < memX4.length; i++) {
+                memX4[i] = random.nextInt();
+            }
+
+            // float inputs. To avoid rounding issues, only use small integers.
+            aF = new float[size];
+            bF = new float[size];
+            for (int i = 0; i < size; i++) {
+                aF[i] = random.nextInt(32) - 16;
+                bF[i] = random.nextInt(32) - 16;
+            }
+
+            // byte: just random data.
+            aB = new byte[size];
+            strB = new byte[size];
+            rB1 = new byte[size];
+            rB2 = new byte[size];
+            rB3 = new byte[size];
+            random.nextBytes(aB);
+            random.nextBytes(strB); // TODO: special data!
+        }
+    }
+
+    public static Object fillI_loop(int[] r) {
+        for (int i = 0; i < r.length; i++) {
+            r[i] = 42;
+        }
+        return r;
+    }
+
+    public static Object fillI_Arrays(int[] r) {
+        Arrays.fill(r, 42);
+        return r;
+    }
+
+    public static Object fillI_VectorAPI(int[] r) {
+        var v = IntVector.broadcast(SPECIES_I, 42);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            v.intoArray(r, i);
+        }
+        for (; i < r.length; i++) {
+            r[i] = 42;
+        }
+        return r;
+    }
+
+    public static Object iotaI_loop(int[] r) {
+        for (int i = 0; i < r.length; i++) {
+            r[i] = i;
+        }
+        return r;
+    }
+
+    public static Object iotaI_VectorAPI(int[] r) {
+        var iota = IntVector.broadcast(SPECIES_I, 0).addIndex(1);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            iota.intoArray(r, i);
+            iota = iota.add(SPECIES_I.length());
+        }
+        for (; i < r.length; i++) {
+            r[i] = i;
+        }
+        return r;
+    }
+
+    public static Object copyI_loop(int[] a, int[] r) {
+        for (int i = 0; i < a.length; i++) {
+            r[i] = a[i];
+        }
+        return r;
+    }
+
+    public static Object copyI_System_arraycopy(int[] a, int[] r) {
+        System.arraycopy(a, 0, r, 0, a.length);
+        return r;
+    }
+
+    public static Object copyI_VectorAPI(int[] a, int[] r) {
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            v.intoArray(r, i);
+        }
+        for (; i < r.length; i++) {
+            r[i] = a[i];
+        }
+        return r;
+    }
+
+    public static Object mapI_loop(int[] a, int[] r) {
+        for (int i = 0; i < a.length; i++) {
+            r[i] = a[i] * 42;
+        }
+        return r;
+    }
+
+    public static Object mapI_VectorAPI(int[] a, int[] r) {
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            v = v.mul(42);
+            v.intoArray(r, i);
+        }
+        for (; i < r.length; i++) {
+            r[i] = a[i] * 42;
+        }
+        return r;
+    }
+
+    public static int reduceAddI_loop(int[] a) {
+        int sum = 0;
+        for (int i = 0; i < a.length; i++) {
+            // Relying on simple reduction loop should vectorize since JDK26.
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static int reduceAddI_reassociate(int[] a) {
+        int sum = 0;
+        int i;
+        for (i = 0; i < a.length - 3; i += 4) {
+            // Unroll 4x, reassociate inside.
+            sum += a[i] + a[i + 1] + a[i + 2] + a[i + 3];
+        }
+        for (; i < a.length; i++) {
+            // Tail
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static int reduceAddI_VectorAPI_naive(int[] a) {
+        var sum = 0;
+        int i;
+        for (i = 0; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            // reduceLanes in loop is better than scalar performance, but still
+            // relatively slow.
+            sum += v.reduceLanes(VectorOperators.ADD);
+        }
+        for (; i < a.length; i++) {
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static int reduceAddI_VectorAPI_reduction_after_loop(int[] a) {
+        var acc = IntVector.broadcast(SPECIES_I, 0);
+        int i;
+        for (i = 0; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            // Element-wide addition into a vector of partial sums is much faster.
+            // Now, we only need to do a reduceLanes after the loop.
+            // This works because int-addition is associative and commutative.
+            acc = acc.add(v);
+        }
+        int sum = acc.reduceLanes(VectorOperators.ADD);
+        for (; i < a.length; i++) {
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static float dotProductF_loop(float[] a, float[] b) {
+        float sum = 0;
+        for (int i = 0; i < a.length; i++) {
+            sum += a[i] * b[i];
+        }
+        return sum;
+    }
+
+    public static float dotProductF_VectorAPI_naive(float[] a, float[] b) {
+        float sum = 0;
+        int i;
+        for (i = 0; i < SPECIES_F.loopBound(a.length); i += SPECIES_F.length()) {
+            var va = FloatVector.fromArray(SPECIES_F, a, i);
+            var vb = FloatVector.fromArray(SPECIES_F, b, i);
+            sum += va.mul(vb).reduceLanes(VectorOperators.ADD);
+        }
+        for (; i < a.length; i++) {
+            sum += a[i] * b[i];
+        }
+        return sum;
+    }
+
+    public static float dotProductF_VectorAPI_reduction_after_loop(float[] a, float[] b) {
+        var sums = FloatVector.broadcast(SPECIES_F, 0.0f);
+        int i;
+        for (i = 0; i < SPECIES_F.loopBound(a.length); i += SPECIES_F.length()) {
+            var va = FloatVector.fromArray(SPECIES_F, a, i);
+            var vb = FloatVector.fromArray(SPECIES_F, b, i);
+            sums = sums.add(va.mul(vb));
+        }
+        float sum = sums.reduceLanes(VectorOperators.ADD);
+        for (; i < a.length; i++) {
+            sum += a[i] * b[i];
+        }
+        return sum;
+    }
+
+    public static int hashCodeB_loop(byte[] a) {
+        int h = 1;
+        for (int i = 0; i < a.length; i++) {
+            h = 31 * h + a[i];
+        }
+        return h;
+    }
+
+    public static int hashCodeB_Arrays(byte[] a) {
+        return Arrays.hashCode(a);
+    }
+
+    // Simplified intrinsic code from C2_MacroAssembler::arrays_hashcode in c2_MacroAssembler_x86.cpp
+    //
+    // Ideas that may help understand the code:
+    //   h(i) = 31 * h(i-1) + a[i]
+    // "unroll" by factor of L=8:
+    //   h(i+8) = h(i) * 31^8 + a[i+1] * 31^7 + a[i+2] * 31^6 + ... + a[i+8] * 1
+    //            -----------   ------------------------------------------------
+    //            scalar        vector: notice the powers of 31 in reverse
+    //
+    // We notice that we can load a[i+1 .. i+8], then element-wise multiply with
+    // the vector of reversed powers-of-31, and then do reduceLanes(ADD).
+    // But we can do even better: By looking at multiple such 8-unrolled iterations.
+    // Instead of applying the "next" factor of "31^8" to the reduced scalar, we can
+    // already apply it element-wise. That allows us to move the reduction out
+    // of the loop.
+    //
+    // Note: the intrinsic additionally unrolls the loop by a factor of 4,
+    //       but we want to keep thins simple for demonstration purposes.
+    //
+    private static int[] REVERSE_POWERS_OF_31 = new int[9];
+    static {
+        int p = 1;
+        for (int i = REVERSE_POWERS_OF_31.length - 1; i >= 0; i--) {
+            REVERSE_POWERS_OF_31[i] = p;
+            p *= 31;
+        }
+    }
+    public static int hashCodeB_VectorAPI_v1(byte[] a) {
+        int result = 1; // initialValue
+        var vresult = IntVector.zero(SPECIES_I256);
+        int next = REVERSE_POWERS_OF_31[0]; // 31^L
+        var vcoef = IntVector.fromArray(SPECIES_I256, REVERSE_POWERS_OF_31, 1); // powers of 2 in reverse
+        int i;
+        for (i = 0; i < SPECIES_B64.loopBound(a.length); i += SPECIES_B64.length()) {
+            // scalar part: result *= 31^L
+            result *= next;
+            // vector part: element-wise apply the next factor and add in the new values.
+            var vb = ByteVector.fromArray(SPECIES_B64, a, i);
+            var vi = vb.castShape(SPECIES_I256, 0);
+            vresult = vresult.mul(next).add(vi);
+        }
+        // reduce the partial hashes in the elements, using the reverse list of powers of 2.
+        result += vresult.mul(vcoef).reduceLanes(VectorOperators.ADD);
+        for (; i < a.length; i++) {
+            result = 31 * result + a[i];
+        }
+        return result;
+    }
+
+    // This second approach follows the idea from this blog post by Otmar Ertl:
+    // https://www.dynatrace.com/news/blog/java-arrays-hashcode-byte-efficiency-techniques/
+    //
+    // I simplified the algorithm a little, so that it is a bit closer
+    // to the solution "v1" above.
+    //
+    // The major issue with "v1" is that we cannot load a full vector of bytes,
+    // because of the cast to ints. So we can only fill 1/4 of the maximal
+    // vector size. The trick here is to do an unrolling of factor 4, from:
+    //   h(i) = 31 * h(i-1) + a[i]
+    // to:
+    //   h(i+4) = h(i) * 31^4 + a[i + 1] * 31^3
+    //                        + a[i + 2] * 31^2
+    //                        + a[i + 3] * 31^1
+    //                        + a[i + 4] * 31^0
+    // The goal is now to compute this value for 4 bytes within a 4 byte
+    // lane of the vector. One concern is that we start with byte values,
+    // but need to do int-multiplication with powers of 31. If we instead
+    // did a byte-multiplication, we could get overflows that we would not
+    // have had in the int-multiplication.
+    // One trick that helps with chaning the size of the lanes from byte
+    // to short to int is doing all operations with unsigned integers. That
+    // way, we can zero-extend instead of sign-bit extend. The first step
+    // is thus to convert the bytes into unsigned values. Since byte is in
+    // range [-128..128), doing "a[i+j] + 128" makes it a positive value,
+    // allowing for unsigned multiplication.
+    // h(i+4) = h(i) * 31^4 +   a[i + 1]              * 31^3
+    //                      +   a[i + 2]              * 31^2
+    //                      +   a[i + 3]              * 31^1
+    //                      +   a[i + 4]              * 31^0
+    //        = h(i) * 31^4 +  (a[i + 1] + 128 - 128) * 31^3
+    //                      +  (a[i + 2] + 128 - 128) * 31^2
+    //                      +  (a[i + 3] + 128 - 128) * 31^1
+    //                      +  (a[i + 4] + 128 - 128) * 31^0
+    //        = h(i) * 31^4 +  (a[i + 1] + 128      ) * 31^3
+    //                      +  (a[i + 2] + 128      ) * 31^2
+    //                      +  (a[i + 3] + 128      ) * 31^1
+    //                      +  (a[i + 4] + 128      ) * 31^0
+    //                      +  -128 * (31^3 + 31^2 + 31^1 + 1)
+    //        = h(i) * 31^4 + ((a[i + 1] + 128) * 31
+    //                      +  (a[i + 2] + 128      ) * 31^2
+    //                      + ((a[i + 3] + 128) * 31
+    //                      +  (a[i + 4] + 128      )
+    //                      +  -128 * (31^3 + 31^2 + 31^1 + 1)
+    //
+    // Getting from the signed a[i] value to unsigned with +128, we can
+    // just xor with 0x80=128. Any numbers there in range [-128..0) are
+    // now in range [0..128). And any numbers that were in range [0..128)
+    // are now in unsigned range [128..255). What a neat trick!
+    //
+    // We then apply a byte->short transition where we crunch 2 bytes
+    // into one short, applying a multiplication with 31 to one of the
+    // two bytes. This multiplication cannot overflow in a short.
+    // then we apply a short->int transition where we crunch 2 shorts
+    // into one int, applying a multiplication with 31^2 to one of the
+    // two shorts. This multiplication cannot overflow in an int.
+    //
+    public static int hashCodeB_VectorAPI_v2(byte[] a) {
+        return HashCodeB_VectorAPI_V2.compute(a);
+    }
+
+    private static class HashCodeB_VectorAPI_V2 {
+        private static final int L = Math.min(ByteVector.SPECIES_PREFERRED.length(),
+                                              IntVector.SPECIES_PREFERRED.length() * 4);
+        private static final VectorShape SHAPE = VectorShape.forBitSize(8 * L);
+        private static final VectorSpecies<Byte>    SPECIES_B = SHAPE.withLanes(byte.class);
+        private static final VectorSpecies<Integer> SPECIES_I = SHAPE.withLanes(int.class);
+
+        private static int[] REVERSE_POWERS_OF_31_STEP_4 = new int[L / 4 + 1];
+        static {
+            int p = 1;
+            int step = 31 * 31 * 31 * 31; // step by 4
+            for (int i = REVERSE_POWERS_OF_31_STEP_4.length - 1; i >= 0; i--) {
+                REVERSE_POWERS_OF_31_STEP_4[i] = p;
+                p *= step;
+            }
+        }
+
+        public static int compute(byte[] a) {
+            int result = 1; // initialValue
+            int next = REVERSE_POWERS_OF_31_STEP_4[0]; // 31^L
+            var vcoef = IntVector.fromArray(SPECIES_I, REVERSE_POWERS_OF_31_STEP_4, 1); // W
+            var vresult = IntVector.zero(SPECIES_I);
+            int i;
+            for (i = 0; i < SPECIES_B.loopBound(a.length); i += SPECIES_B.length()) {
+                var vb = ByteVector.fromArray(SPECIES_B, a, i);
+                // Add 128 to each byte.
+                var vs = vb.lanewise(VectorOperators.XOR, (byte)0x80)
+                           .reinterpretAsShorts();
+                // Each short lane contains 2 bytes, crunch them.
+                var vi = vs.and((short)0xff) // lower byte
+                           .mul((short)31)
+                           .add(vs.lanewise(VectorOperators.LSHR, 8)) // upper byte
+                           .reinterpretAsInts();
+                // Each int contains 2 shorts, crunch them.
+                var v  = vi.and(0xffff) // lower short
+                           .mul(31 * 31)
+                           .add(vi.lanewise(VectorOperators.LSHR, 16)); // upper short
+                // Add the correction for the 128 additions above.
+                v = v.add(-128 * (31*31*31 + 31*31 + 31 + 1));
+                // Every element of v now contains a crunched int-package of 4 bytes.
+                result *= next;
+                vresult = vresult.mul(next).add(v);
+            }
+            result += vresult.mul(vcoef).reduceLanes(VectorOperators.ADD);
+            for (; i < a.length; i++) {
+                result = 31 * result + a[i];
+            }
+            return result;
+        }
+    }
+
+    public static Object scanAddI_loop(int[] a, int[] r) {
+        int sum = 0;
+        for (int i = 0; i < a.length; i++) {
+            sum += a[i];
+            r[i] = sum;
+        }
+        return r;
+    }
+
+    public static Object scanAddI_loop_reassociate(int[] a, int[] r) {
+        int sum = 0;
+        int i = 0;
+        for (; i < a.length - 3; i += 4) {
+            // We cut the latency by a factor of 4, but increase the number of additions.
+            int old_sum = sum;
+            int v0 = a[i + 0];
+            int v1 = a[i + 1];
+            int v2 = a[i + 2];
+            int v3 = a[i + 3];
+            int v01 = v0 + v1;
+            int v23 = v2 + v3;
+            int v0123 = v01 + v23;
+            sum += v0123;
+            r[i + 0] = old_sum + v0;
+            r[i + 1] = old_sum + v01;
+            r[i + 2] = old_sum + v01 + v2;
+            r[i + 3] = old_sum + v0123;
+        }
+        for (; i < a.length; i++) {
+            sum += a[i];
+            r[i] = sum;
+        }
+        return r;
+    }
+
+    public static Object scanAddI_VectorAPI_permute_add(int[] a, int[] r) {
+        // Using Naive Parallel Algorithm: Hills and Steele
+        int sum = 0;
+        int xx = 0; // masked later anyway
+        var shf1 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14}, 0);
+        var shf2 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx, xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13}, 0);
+        var shf3 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx, xx, xx, xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11}, 0);
+        var shf4 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx, xx, xx, xx, xx, xx, xx, xx,  0,  1,  2,  3,  4,  5,  6,  7}, 0);
+        var mask1 = VectorMask.fromLong(SPECIES_I512, 0b1111111111111110);
+        var mask2 = VectorMask.fromLong(SPECIES_I512, 0b1111111111111100);
+        var mask3 = VectorMask.fromLong(SPECIES_I512, 0b1111111111110000);
+        var mask4 = VectorMask.fromLong(SPECIES_I512, 0b1111111100000000);
+        int i = 0;
+        for (; i < SPECIES_I512.loopBound(a.length); i += SPECIES_I512.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I512, a, i);
+            v = v.add(v.rearrange(shf1), mask1);
+            v = v.add(v.rearrange(shf2), mask2);
+            v = v.add(v.rearrange(shf3), mask3);
+            v = v.add(v.rearrange(shf4), mask4);
+            v = v.add(sum);
+            v.intoArray(r, i);
+            sum = v.lane(SPECIES_I512.length() - 1);
+        }
+        for (; i < a.length; i++) {
+            sum += a[i];
+            r[i] = sum;
+        }
+        return r;
+    }
+
+    public static int findMinIndexI_loop(int[] a) {
+        int min = a[0];
+        int index = 0;
+        for (int i = 1; i < a.length; i++) {
+            int ai = a[i];
+            if (ai < min) {
+                min = ai;
+                index = i;
+            }
+        }
+        return index;
+    }
+
+    public static int findMinIndexI_VectorAPI(int[] a) {
+        // Main approach: have partial results in mins and idxs.
+        var mins = IntVector.broadcast(SPECIES_I, a[0]);
+        var idxs = IntVector.broadcast(SPECIES_I, 0);
+        var iota = IntVector.broadcast(SPECIES_I, 0).addIndex(1);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            var mask = v.compare(VectorOperators.LT, mins);
+            mins = mins.blend(v, mask);
+            idxs = idxs.blend(iota, mask);
+            iota = iota.add(SPECIES_I.length());
+        }
+        // Reduce the vectors down
+        int min = mins.reduceLanes(VectorOperators.MIN);
+        var not_min_mask = mins.compare(VectorOperators.NE, min);
+        int index = idxs.blend(a.length, not_min_mask).reduceLanes(VectorOperators.MIN);
+        // Tail loop
+        for (; i < a.length; i++) {
+            int ai = a[i];
+            if (ai < min) {
+                min = ai;
+                index = i;
+            }
+        }
+        return index;
+    }
+
+    public static int findI_loop(int[] a, int e) {
+        for (int i = 0; i < a.length; i++) {
+            int ai = a[i];
+            if (ai == e) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static int findI_VectorAPI(int[] a, int e) {
+        var es = IntVector.broadcast(SPECIES_I, e);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            var mask = v.compare(VectorOperators.EQ, es);
+            if (mask.anyTrue()) {
+                return i + mask.firstTrue();
+            }
+        }
+        for (; i < a.length; i++) {
+            int ai = a[i];
+            if (ai == e) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static Object reverseI_loop(int[] a, int[] r) {
+        for (int i = 0; i < a.length; i++) {
+            r[a.length - i - 1] = a[i];
+        }
+        return r;
+    }
+
+    private static final VectorShuffle<Integer> REVERSE_SHUFFLE_I = SPECIES_I.iotaShuffle(SPECIES_I.length()-1, -1, true);
+
+    public static Object reverseI_VectorAPI(int[] a, int[] r) {
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            v = v.rearrange(REVERSE_SHUFFLE_I);
+            v.intoArray(r, r.length - SPECIES_I.length() - i);
+        }
+        for (; i < a.length; i++) {
+            r[a.length - i - 1] = a[i];
+        }
+        return r;
+    }
+
+    public static Object filterI_loop(int[] a, int[] r, int threshold) {
+        int j = 0;
+        for (int i = 0; i < a.length; i++) {
+            int ai = a[i];
+            if (ai >= threshold) {
+                r[j++] = ai;
+            }
+        }
+        // Just force the resulting length onto the same array.
+        r[r.length - 1] = j;
+        return r;
+    }
+
+    public static Object filterI_VectorAPI(int[] a, int[] r, int threshold) {
+        var thresholds = IntVector.broadcast(SPECIES_I, threshold);
+        int j = 0;
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            var mask = v.compare(VectorOperators.GE, thresholds);
+            v = v.compress(mask);
+            int trueCount = mask.trueCount();
+            var prefixMask = mask.compress();
+            v.intoArray(r, j, prefixMask);
+            j += trueCount;
+        }
+
+        for (; i < a.length; i++) {
+            int ai = a[i];
+            if (ai >= threshold) {
+                r[j++] = ai;
+            }
+        }
+        // Just force the resulting length onto the same array.
+        r[r.length - 1] = j;
+        return r;
+    }
+
+    // X4: ints simulate 4-byte oops.
+    // oops: if non-zero (= non-null), every entry simulates a 4-byte oop, pointing into mem.
+    // mem: an int array that simulates the memory.
+    //
+    // Task: Find all non-null oops, and dereference them, get the relevant field.
+    //       Objects have 16 bytes, and the relevant field is at bytes 12-16.
+    //       That maps to 4 ints, and the relevant field is the 4th element of 4.
+    //       Sum up all the field values.
+    public static int reduceAddIFieldsX4_loop(int[] oops, int[] mem) {
+        int sum = 0;
+        for (int i = 0; i < oops.length; i++) {
+            int oop = oops[i];
+            if (oop != 0) {
+                int fieldValue = mem[oop + 3]; // oop+12
+                sum += fieldValue;
+            }
+        }
+        return sum;
+    }
+
+    public static int reduceAddIFieldsX4_VectorAPI(int[] oops, int[] mem) {
+        var acc = IntVector.broadcast(SPECIES_I, 0);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(oops.length); i += SPECIES_I.length()) {
+            var oopv = IntVector.fromArray(SPECIES_I, oops, i);
+            var mask = oopv.compare(VectorOperators.NE, /* null */0);
+            // We are lucky today: we need to access mem[oop + 3]
+            var fieldValues = IntVector.fromArray(SPECIES_I, mem, 3, oops, i, mask);
+            acc = acc.add(fieldValues);
+        }
+        int sum = acc.reduceLanes(VectorOperators.ADD);
+        for (; i < oops.length; i++) {
+            int oop = oops[i];
+            if (oop != 0) {
+                int fieldValue = mem[oop + 3]; // oop+12
+                sum += fieldValue;
+            }
+        }
+        return sum;
+    }
+
+    // The lowerCase example demonstrates a lane-wise control-flow diamond.
+    public static Object lowerCaseB_loop(byte[] a, byte[] r) {
+        for (int i = 0; i < a.length; i++) {
+            byte c = a[i];
+            if (c >= 'A' && c <= 'Z') {
+                c += ('a' - 'A'); // c += 32
+            }
+            r[i] = c;
+        }
+        return r;
+    }
+
+    // Control-flow diamonds can easily be simulated by "if-conversion", i.e.
+    // by using masked operations. An alternative would be to use blend.
+    public static Object lowerCaseB_VectorAPI_v1(byte[] a, byte[] r) {
+        int i;
+        for (i = 0; i < SPECIES_B.loopBound(a.length); i += SPECIES_B.length()) {
+            var vc = ByteVector.fromArray(SPECIES_B, a, i);
+            var maskA = vc.compare(VectorOperators.GE, (byte)'A');
+            var maskZ = vc.compare(VectorOperators.LE, (byte)'Z');
+            var mask = maskA.and(maskZ);
+            vc = vc.add((byte)32, mask);
+            vc.intoArray(r, i);
+        }
+        for (; i < a.length; i++) {
+            byte c = a[i];
+            if (c >= 'A' && c <= 'Z') {
+                c += ('a' - 'A');
+            }
+            r[i] = c;
+        }
+        return r;
+    }
+
+    public static Object lowerCaseB_VectorAPI_v2(byte[] a, byte[] r) {
+        int i;
+        for (i = 0; i < SPECIES_B.loopBound(a.length); i += SPECIES_B.length()) {
+            var vc = ByteVector.fromArray(SPECIES_B, a, i);
+            // We can convert the range 65..90 (represents ascii A..Z) into a range 0..25.
+            // This allows us to only use a single unsigned comparison.
+            var vt = vc.add((byte)-'A');
+            var mask = vt.compare(VectorOperators.ULE, (byte)25);
+            vc = vc.add((byte)32, mask);
+            vc.intoArray(r, i);
+        }
+        for (; i < a.length; i++) {
+            byte c = a[i];
+            if (c >= 'A' && c <= 'Z') {
+                c += ('a' - 'A');
+            }
+            r[i] = c;
+        }
+        return r;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
index 1f0c8e668b7..a0434411da7 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayShiftOpTest.java
@@ -247,9 +247,8 @@ public class ArrayShiftOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    // Note that right shift operations on subword expressions cannot be
-    // vectorized since precise type info about signedness is missing.
-    @IR(failOn = {IRNode.STORE_VECTOR})
+    @IR(applyIfCPUFeature = {"avx", "true"},
+            counts = {IRNode.RSHIFT_VI, ">0"})
     public short[] subwordExpressionRightShift() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
index d3119a00c37..f9c5f6199f1 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @bug 8183390 8340010 8342095
  * @summary Vectorization test on array type conversions
  * @library /test/lib /
  *
@@ -108,10 +109,9 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     // ---------------- Integer Extension ----------------
     @Test
-    @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
-    // Assert the vectorization failure so that we are reminded to update
-    // the test when this limitation is addressed in the future.
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_S2I, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
     public int[] signExtension() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -122,7 +122,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     @Test
     @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
+    // Subword vector casts with char do not work currently, see JDK-8349562.
     // Assert the vectorization failure so that we are reminded to update
     // the test when this limitation is addressed in the future.
     public int[] zeroExtension() {
@@ -134,10 +134,9 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
-    // Assert the vectorization failure so that we are reminded to update
-    // the test when this limitation is addressed in the future.
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_B2I, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", ">0" })
     public int[] signExtensionFromByte() {
         int[] res = new int[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -146,12 +145,23 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
         return res;
     }
 
+    @Test
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_B2S, IRNode.VECTOR_SIZE + "min(max_short, max_byte)", ">0" })
+    public short[] signExtensionFromByteToShort() {
+        short[] res = new short[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            res[i] = bytes[i];
+        }
+        return res;
+    }
+
     // ---------------- Integer Narrow ----------------
     @Test
-    @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
-    // Assert the vectorization failure so that we are reminded to update
-    // the test when this limitation is addressed in the future.
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
     public short[] narrowToSigned() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -161,10 +171,9 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
-    // Assert the vectorization failure so that we are reminded to update
-    // the test when this limitation is addressed in the future.
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_char)", ">0" })
     public char[] narrowToUnsigned() {
         char[] res = new char[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -174,11 +183,10 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
-    // Assert the vectorization failure so that we are reminded to update
-    // the test when this limitation is addressed in the future.
-    public byte[] NarrowToByte() {
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_I2B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", ">0" })
+    public byte[] narrowToByte() {
         byte[] res = new byte[SIZE];
         for (int i = 0; i < SIZE; i++) {
             res[i] = (byte) ints[i];
@@ -186,6 +194,18 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
         return res;
     }
 
+    @Test
+    @IR(applyIfCPUFeature = { "avx", "true" },
+        applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
+        counts = { IRNode.VECTOR_CAST_S2B, IRNode.VECTOR_SIZE + "min(max_short, max_byte)", ">0" })
+    public byte[] narrowShortToByte() {
+        byte[] res = new byte[SIZE];
+        for (int i = 0; i < SIZE; i++) {
+            res[i] = (byte) shorts[i];
+        }
+        return res;
+    }
+
     // ---------------- Convert I/L to F/D ----------------
     @Test
     @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
@@ -268,7 +288,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     @Test
     @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
+    // Subword vector casts with char do not work currently, see JDK-8349562.
     // Assert the vectorization failure so that we are reminded to update
     // the test when this limitation is addressed in the future.
     public float[] convertCharToFloat() {
@@ -281,7 +301,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     @Test
     @IR(failOn = {IRNode.STORE_VECTOR})
-    // Subword vector casts do not work currently, see JDK-8342095.
+    // Subword vector casts with char do not work currently, see JDK-8349562.
     // Assert the vectorization failure so that we are reminded to update
     // the test when this limitation is addressed in the future.
     public double[] convertCharToDouble() {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
index 63739584558..b957a00278a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +24,7 @@
 
 /*
  * @test
+ * @bug 8183390 8342095
  * @summary Vectorization test on basic short operations
  * @library /test/lib /
  *
@@ -210,10 +212,10 @@ public class BasicShortOpTest extends VectorizationTestRunner {
         return res;
     }
 
+    // Min/Max vectorization requires a cast from subword to int and back to subword, to avoid losing the higher order bits.
+
     @Test
-    // Note that min operations on subword types cannot be vectorized
-    // because higher bits will be lost.
-    @IR(failOn = {IRNode.STORE_VECTOR})
+    @IR(applyIfCPUFeature = { "avx", "true" }, counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
     public short[] vectorMin() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -223,9 +225,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    // Note that max operations on subword types cannot be vectorized
-    // because higher bits will be lost.
-    @IR(failOn = {IRNode.STORE_VECTOR})
+    @IR(applyIfCPUFeature = { "avx", "true" }, counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
     public short[] vectorMax() {
         short[] res = new short[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
index 6b0a536e4d4..3064b320c0d 100644
--- a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
+++ b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -143,9 +143,9 @@ public class TestCPUAwareness {
 
 
     // Expected active processor count can not exceed available CPU count
-    private static int adjustExpectedAPCForAvailableCPUs(int expectedAPC) {
-        if (expectedAPC > availableCPUs) {
-            expectedAPC = availableCPUs;
+    private static double adjustExpectedAPCForAvailableCPUs(double expectedAPC) {
+        if (expectedAPC > (double)availableCPUs) {
+            expectedAPC = (double)availableCPUs;
             System.out.println("Adjusted expectedAPC = " + expectedAPC);
         }
         return expectedAPC;
@@ -158,7 +158,7 @@ public class TestCPUAwareness {
         System.out.println("quota = " + quota);
         System.out.println("period = " + period);
 
-        int expectedAPC = (int) Math.ceil((float) quota / (float) period);
+        double expectedAPC = (double) quota / (double) period;
         System.out.println("expectedAPC = " + expectedAPC);
         expectedAPC = adjustExpectedAPCForAvailableCPUs(expectedAPC);
 
@@ -178,7 +178,7 @@ public class TestCPUAwareness {
 
 
     private static void testAPCCombo(String cpuset, int quota, int period, int shares,
-                                     int expectedAPC) throws Exception {
+                                     double expectedAPC) throws Exception {
         Common.logNewTestCase("test APC Combo");
         System.out.println("cpuset = " + cpuset);
         System.out.println("quota = " + quota);
diff --git a/test/hotspot/jtreg/containers/docker/TestJcmd.java b/test/hotspot/jtreg/containers/docker/TestJcmd.java
index 3cfe2945e92..fcd5c665f2b 100644
--- a/test/hotspot/jtreg/containers/docker/TestJcmd.java
+++ b/test/hotspot/jtreg/containers/docker/TestJcmd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -143,6 +143,7 @@ public class TestJcmd {
         sb.append(String.format("FROM %s:%s\n", DockerfileConfig.getBaseImageName(),
                                 DockerfileConfig.getBaseImageVersion()));
         sb.append("COPY /jdk /jdk\n");
+        sb.append("ENV LANG=C.UTF-8\n");
         sb.append("ENV JAVA_HOME=/jdk\n");
 
         if (!IS_PODMAN) { // only needed for docker
diff --git a/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java b/test/hotspot/jtreg/gc/arguments/TestMaxRAMPercentage.java
similarity index 73%
rename from test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java
rename to test/hotspot/jtreg/gc/arguments/TestMaxRAMPercentage.java
index e7b2f371ed6..0cf34a0d239 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMaxRAMFlags.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMaxRAMPercentage.java
@@ -24,10 +24,9 @@
 package gc.arguments;
 
 /*
- * @test TestMaxRAMFlags
+ * @test TestMaxRAMPercentage
  * @bug 8222252
- * @summary Verify correct MaxHeapSize and UseCompressedOops when MaxRAM and MaxRAMPercentage
- * are specified.
+ * @summary Verify correct MaxHeapSize and UseCompressedOops when MaxRAMPercentage is specified
  * @library /test/lib
  * @library /
  * @requires vm.bits == "64"
@@ -35,8 +34,11 @@ package gc.arguments;
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run driver gc.arguments.TestMaxRAMFlags
- * @author bob.vandette@oracle.com
+ * @run main/othervm
+ *      -Xbootclasspath/a:.
+ *      -XX:+UnlockDiagnosticVMOptions
+ *      -XX:+WhiteBoxAPI
+ *      gc.arguments.TestMaxRAMPercentage
  */
 
 import java.util.regex.Matcher;
@@ -45,14 +47,17 @@ import java.util.regex.Pattern;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import jdk.test.whitebox.WhiteBox;
 import jdk.test.lib.process.OutputAnalyzer;
+import jtreg.SkippedException;
 
-public class TestMaxRAMFlags {
+public class TestMaxRAMPercentage {
 
-  private static void checkMaxRAMSize(long maxram, int maxrampercent, boolean forcecoop, long expectheap, boolean expectcoop) throws Exception {
+  private static final WhiteBox wb = WhiteBox.getWhiteBox();
+
+  private static void checkMaxRAMSize(double maxrampercent, boolean forcecoop, long expectheap, boolean expectcoop) throws Exception {
 
     ArrayList<String> args = new ArrayList<String>();
-    args.add("-XX:MaxRAM=" + maxram);
     args.add("-XX:MaxRAMPercentage=" + maxrampercent);
     if (forcecoop) {
       args.add("-XX:+UseCompressedOops");
@@ -107,21 +112,32 @@ public class TestMaxRAMFlags {
   }
 
   public static void main(String args[]) throws Exception {
-    // Tests
-    // 1. Verify that MaxRAMPercentage overrides UseCompressedOops Ergo
-    // 2. Verify that UseCompressedOops forces compressed oops limit even
-    //    when other flags are specified.
-
-    long oneG = 1L * 1024L * 1024L * 1024L;
-
     // Hotspot startup logic reduces MaxHeapForCompressedOops by HeapBaseMinAddress
     // in order to get zero based compressed oops offsets.
     long heapbaseminaddr = getHeapBaseMinAddress();
     long maxcoopheap = TestUseCompressedOopsErgoTools.getMaxHeapForCompressedOops(new String [0]) - heapbaseminaddr;
 
-    // Args: MaxRAM , MaxRAMPercentage, forcecoop, expect heap, expect coop
-    checkMaxRAMSize(maxcoopheap - oneG, 100, false, maxcoopheap - oneG, true);
-    checkMaxRAMSize(maxcoopheap + oneG, 100, false, maxcoopheap + oneG, false);
-    checkMaxRAMSize(maxcoopheap + oneG, 100, true, maxcoopheap, true);
+    // The headroom is used to get/not get compressed oops from the maxcoopheap size
+    long M = 1L * 1024L * 1024L;
+    long headroom = 64 * M;
+
+    long requiredHostMemory = maxcoopheap + headroom;
+
+    // Get host memory
+    long hostMemory = wb.hostPhysicalMemory();
+
+    System.out.println("hostMemory: " + hostMemory + ", requiredHostMemory: " + requiredHostMemory);
+
+    if (hostMemory < requiredHostMemory) {
+      throw new SkippedException("Not enough RAM on machine to run. Test skipped!");
+    }
+
+    double MaxRAMPercentage = ((double)maxcoopheap / hostMemory) * 100.0;
+    double headroomPercentage = ((double)headroom / hostMemory) * 100.0;
+
+    // Args: MaxRAMPercentage, forcecoop, expectheap, expectcoop
+    checkMaxRAMSize(MaxRAMPercentage - headroomPercentage, false, maxcoopheap - (long)headroom, true);
+    checkMaxRAMSize(MaxRAMPercentage + headroomPercentage, false, maxcoopheap + (long)headroom, false);
+    checkMaxRAMSize(MaxRAMPercentage, true, maxcoopheap, true);
   }
 }
diff --git a/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java b/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java
deleted file mode 100644
index 2cd9e9cd60b..00000000000
--- a/test/hotspot/jtreg/gc/arguments/TestParallelRefProc.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package gc.arguments;
-
-/*
- * @test id=Serial
- * @summary Test defaults processing for -XX:+ParallelRefProcEnabled with Serial GC.
- * @library /test/lib
- * @library /
- * @requires vm.gc.Serial
- * @run driver gc.arguments.TestParallelRefProc Serial
- */
-
-/*
- * @test id=Parallel
- * @summary Test defaults processing for -XX:+ParallelRefProcEnabled with Parallel GC.
- * @library /test/lib
- * @library /
- * @requires vm.gc.Parallel
- * @run driver gc.arguments.TestParallelRefProc Parallel
- */
-
-/*
- * @test id=G1
- * @summary Test defaults processing for -XX:+ParallelRefProcEnabled with G1 GC.
- * @library /test/lib
- * @library /
- * @requires vm.gc.G1
- * @run driver gc.arguments.TestParallelRefProc G1
- */
-
-import java.util.Arrays;
-import java.util.ArrayList;
-
-import jdk.test.lib.process.OutputAnalyzer;
-
-public class TestParallelRefProc {
-
-    public static void main(String args[]) throws Exception {
-        if (args.length == 0) {
-            throw new IllegalArgumentException("Test type must be specified as argument");
-        }
-
-        String testType = args[0];
-
-        switch (testType) {
-            case "Serial":
-                testSerial();
-                break;
-            case "Parallel":
-                testParallel();
-                break;
-            case "G1":
-                testG1();
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown test type \"" + testType + "\"");
-        }
-    }
-
-    private static void testSerial() throws Exception {
-        testFlag(new String[] { "-XX:+UseSerialGC" }, false);
-    }
-
-    private static void testParallel() throws Exception {
-        testFlag(new String[] { "-XX:+UseParallelGC", "-XX:ParallelGCThreads=1" }, false);
-        testFlag(new String[] { "-XX:+UseParallelGC", "-XX:ParallelGCThreads=2" }, true);
-        testFlag(new String[] { "-XX:+UseParallelGC", "-XX:-ParallelRefProcEnabled", "-XX:ParallelGCThreads=2" }, false);
-    }
-
-    private static void testG1() throws Exception {
-        testFlag(new String[] { "-XX:+UseG1GC", "-XX:ParallelGCThreads=1" }, false);
-        testFlag(new String[] { "-XX:+UseG1GC", "-XX:ParallelGCThreads=2" }, true);
-        testFlag(new String[] { "-XX:+UseG1GC", "-XX:-ParallelRefProcEnabled", "-XX:ParallelGCThreads=2" }, false);
-    }
-
-    private static final String parallelRefProcEnabledPattern =
-        " *bool +ParallelRefProcEnabled *= *true +\\{product\\}";
-
-    private static final String parallelRefProcDisabledPattern =
-        " *bool +ParallelRefProcEnabled *= *false +\\{product\\}";
-
-    private static void testFlag(String[] args, boolean expectedTrue) throws Exception {
-        ArrayList<String> result = new ArrayList<String>();
-        result.addAll(Arrays.asList(args));
-        result.add("-XX:+PrintFlagsFinal");
-        result.add("-version");
-        OutputAnalyzer output = GCArguments.executeTestJava(result);
-
-        output.shouldHaveExitValue(0);
-
-        final String expectedPattern = expectedTrue ? parallelRefProcEnabledPattern : parallelRefProcDisabledPattern;
-
-        String value = output.firstMatch(expectedPattern);
-        if (value == null) {
-            throw new RuntimeException(
-                Arrays.toString(args) + " didn't set ParallelRefProcEnabled to " + expectedTrue + " as expected");
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
index c9cf7291aaa..10c85c30c33 100644
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
+++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsFlagsWithUlimit.java
@@ -26,8 +26,7 @@ package gc.arguments;
 /*
  * @test TestUseCompressedOopsFlagsWithUlimit
  * @bug 8280761
- * @summary Verify correct UseCompressedOops when MaxRAM and MaxRAMPercentage
- * are specified with ulimit -v.
+ * @summary Verify that ergonomic setting of UseCompressedOops adheres to ulimit -v
  * @library /test/lib
  * @library /
  * @requires vm.bits == "64"
@@ -50,10 +49,9 @@ import jdk.test.lib.process.ProcessTools;
 
 public class TestUseCompressedOopsFlagsWithUlimit {
 
-  private static void checkFlag(long ulimit, long maxram, int maxrampercent, boolean expectcoop) throws Exception {
+  private static void checkFlag(long ulimit, int maxrampercent, boolean expectcoop) throws Exception {
 
     ArrayList<String> args = new ArrayList<String>();
-    args.add("-XX:MaxRAM=" + maxram);
     args.add("-XX:MaxRAMPercentage=" + maxrampercent);
     args.add("-XX:+PrintFlagsFinal");
 
@@ -74,7 +72,7 @@ public class TestUseCompressedOopsFlagsWithUlimit {
     boolean actualcoop = getFlagBoolValue("UseCompressedOops", stdout);
     if (actualcoop != expectcoop) {
       throw new RuntimeException("UseCompressedOops set to " + actualcoop +
-        ", expected " + expectcoop + " when running with the following flags: " + Arrays.asList(args).toString());
+        ", expected " + expectcoop + " when running with the following flags: " + Arrays.asList(args).toString() + ", and ulimit: " + ulimit);
     }
   }
 
@@ -91,10 +89,13 @@ public class TestUseCompressedOopsFlagsWithUlimit {
     // Verify that UseCompressedOops Ergo follows ulimit -v setting.
 
     long oneG = 1L * 1024L * 1024L * 1024L;
+    long ulimit = 10 * oneG;
 
-    // Args: ulimit, max_ram, max_ram_percent, expected_coop
-    // Setting MaxRAMPercentage explicitly to make the test more resilient.
-    checkFlag(10 * oneG, 32 * oneG, 100, true);
-    checkFlag(10 * oneG, 128 * oneG, 100, true);
+    // Regardless of how much memory that is available on the machine, we should
+    // always get compressed oops if we have set a ulimit below the COOPS limit.
+    // We set MaxRAMPercentage explicitly to make the test more resilient.
+
+    // Args: ulimit, maxrampercent, expectedcoop
+    checkFlag(ulimit, 100, true);
   }
 }
diff --git a/test/hotspot/jtreg/gc/epsilon/TestInitAllocs.java b/test/hotspot/jtreg/gc/epsilon/TestInitAllocs.java
index 353daaef8b6..cdfd29bad61 100644
--- a/test/hotspot/jtreg/gc/epsilon/TestInitAllocs.java
+++ b/test/hotspot/jtreg/gc/epsilon/TestInitAllocs.java
@@ -23,54 +23,84 @@
 
 package gc.epsilon;
 
-/**
- * @test TestInitAllocs
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/* @test id=default
  * @requires vm.gc.Epsilon
- * @summary Test that allocation path taken in early JVM phases works
- *
- * @run main/othervm -Xmx256m
- *                   -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC
- *                   gc.epsilon.TestInitAllocs
- *
- * @run main/othervm -Xmx256m
- *                   -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC
- *                   -XX:+UseTLAB
- *                   -XX:+UseCompressedOops
- *                   -XX:EpsilonMinHeapExpand=1024
- *                   -XX:EpsilonUpdateCountersStep=1
- *                   -XX:EpsilonPrintHeapSteps=1000000
- *                   gc.epsilon.TestInitAllocs
- *
- * @run main/othervm -Xmx256m
- *                   -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC
- *                   -XX:+UseTLAB
- *                   -XX:-UseCompressedOops
- *                   -XX:EpsilonMinHeapExpand=1024
- *                   -XX:EpsilonUpdateCountersStep=1
- *                   -XX:EpsilonPrintHeapSteps=1000000
- *                   gc.epsilon.TestInitAllocs
- *
- * @run main/othervm -Xmx256m
- *                   -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC
- *                   -XX:-UseTLAB
- *                   -XX:+UseCompressedOops
- *                   -XX:EpsilonMinHeapExpand=1024
- *                   -XX:EpsilonUpdateCountersStep=1
- *                   -XX:EpsilonPrintHeapSteps=1000000
- *                   gc.epsilon.TestInitAllocs
- *
- * @run main/othervm -Xmx256m
- *                   -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC
- *                   -XX:-UseTLAB
- *                   -XX:-UseCompressedOops
- *                   -XX:EpsilonMinHeapExpand=1024
- *                   -XX:EpsilonUpdateCountersStep=1
- *                   -XX:EpsilonPrintHeapSteps=1000000
- *                   gc.epsilon.TestInitAllocs
+ * @summary Stress test that allocation path taken in early JVM phases works
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs
+ */
+
+/* @test id=nocoops
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:-UseCompressedOops
+ */
+
+/* @test id=notlabs
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:-UseTLAB
+ */
+
+/* @test id=notlabs-nocoops
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:-UseCompressedOops -XX:-UseTLAB
+ */
+
+/* @test id=coh
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:+UseCompactObjectHeaders
+ */
+
+/* @test id=coh-nocoops
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:+UseCompactObjectHeaders -XX:-UseCompressedOops
+ */
+
+/* @test id=coh-notlabs
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:+UseCompactObjectHeaders -XX:-UseTLAB
+ */
+
+/* @test id=coh-notlabs-nocoops
+ * @requires vm.gc.Epsilon
+ * @library /test/lib
+ * @run driver gc.epsilon.TestInitAllocs -XX:+UseCompactObjectHeaders -XX:-UseCompressedOops -XX:-UseTLAB
  */
 
 public class TestInitAllocs {
-  public static void main(String[] args) throws Exception {
-    System.out.println("Hello World");
+  static final Integer TRIES = Integer.getInteger("tries", 500);
+
+  public static void main(String... args) throws Exception {
+    List<String> testArgs = new ArrayList<>();
+    testArgs.add("-Xmx256m");
+    testArgs.add("-XX:+UnlockExperimentalVMOptions");
+    testArgs.add("-XX:+UseEpsilonGC");
+    testArgs.add("-XX:EpsilonMinHeapExpand=1024");
+    testArgs.add("-XX:EpsilonUpdateCountersStep=1");
+    testArgs.add("-XX:EpsilonPrintHeapSteps=1000000");
+    testArgs.addAll(Arrays.asList(args));
+    testArgs.add(TestInitAllocs.Main.class.getName());
+    for (int t = 0; t < TRIES; t++) {
+      OutputAnalyzer oa = ProcessTools.executeLimitedTestJava(testArgs);
+      oa.shouldHaveExitValue(0);
+    }
+  }
+
+  static class Main {
+    public static void main(String... args) {
+      // Do nothing
+    }
   }
 }
diff --git a/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java b/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java
index cf3445bd656..b0cf8f582b2 100644
--- a/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java
+++ b/test/hotspot/jtreg/gc/ergonomics/TestDynamicNumberOfGCThreads.java
@@ -70,14 +70,6 @@ public class TestDynamicNumberOfGCThreads {
     // Base test with gc and +UseDynamicNumberOfGCThreads:
     OutputAnalyzer output = ProcessTools.executeLimitedTestJava(baseArgs);
     verifyDynamicNumberOfGCThreads(output);
-
-    // Turn on parallel reference processing
-    String[] parRefProcArg = {"-XX:+ParallelRefProcEnabled", "-XX:-ShowMessageBoxOnError"};
-    String[] parRefArgs = new String[baseArgs.length + parRefProcArg.length];
-    System.arraycopy(parRefProcArg, 0, parRefArgs, 0,                parRefProcArg.length);
-    System.arraycopy(baseArgs,  0, parRefArgs, parRefProcArg.length, baseArgs.length);
-    output = ProcessTools.executeLimitedTestJava(parRefArgs);
-    verifyDynamicNumberOfGCThreads(output);
   }
 
   static class GCTest {
diff --git a/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java b/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java
index e36ccace9dc..94441840723 100644
--- a/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java
+++ b/test/hotspot/jtreg/gc/g1/TestCodeCacheUnloadDuringConcCycle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ package gc.g1;
  * during concurrent mark, and verify that after the concurrent cycle additional code
  * cache gc requests start more concurrent cycles.
  * @requires vm.gc.G1
+ * @requires vm.flagless
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/gc/g1/TestRegionAlignment.java b/test/hotspot/jtreg/gc/g1/TestRegionAlignment.java
index 2bc25079068..3555fad56a8 100644
--- a/test/hotspot/jtreg/gc/g1/TestRegionAlignment.java
+++ b/test/hotspot/jtreg/gc/g1/TestRegionAlignment.java
@@ -28,12 +28,12 @@ package gc.g1;
  * @bug 8013791
  * @requires vm.gc.G1
  * @summary Make sure that G1 ergonomics pick a heap size that is aligned with the region size
- * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:MaxRAM=555m gc.g1.TestRegionAlignment
- *
- * When G1 ergonomically picks a maximum heap size it must be aligned to the region size.
- * This test tries to get the VM to pick a small and unaligned heap size (by using MaxRAM=555) and a
- * large region size (by using -XX:G1HeapRegionSize=32m). This will fail without the fix for 8013791.
+ * @comment When G1 ergonomically picks a maximum heap size it must be aligned to the region size.
+ *          This test tries to get the VM to pick a small and unaligned heap size (by using MaxRAM=555) and a
+ *          large region size (by using -XX:G1HeapRegionSize=32m). This will fail without the fix for 8013791.
+ * @run main/othervm -XX:+UseG1GC -XX:G1HeapRegionSize=32m -Xmx140m gc.g1.TestRegionAlignment
  */
+
 public class TestRegionAlignment {
     public static void main(String[] args) { }
 }
diff --git a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
index 6f2c7c005df..2028e8751d7 100644
--- a/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
+++ b/test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,7 +119,6 @@ public class TestIHOPStatic {
         System.out.println("  MaxHeapSize : " + heapSize);
         System.out.println("  Expect for concurrent cycle initiation message : " + expectInitiationMessage);
         List<String> options = new ArrayList<>();
-        Collections.addAll(options, Utils.getTestJavaOpts());
         Collections.addAll(options,
                 "-XX:InitiatingHeapOccupancyPercent=" + ihop,
                 "-Dmemory.fill=" + (heapSize * 1024 * 1024 * pctToFill / 100),
diff --git a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
index 6f64e6e9b5e..390159e7cd2 100644
--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
@@ -57,8 +57,7 @@ public class TestPrintReferences {
     static final String gcLogTimeRegex = ".* GC\\([0-9]+\\) ";
 
     public static void main(String[] args) throws Exception {
-        testPhases(true);
-        testPhases(false);
+        testPhases();
         testRefs();
     }
 
@@ -93,16 +92,15 @@ public class TestPrintReferences {
                            refRegex("PhantomReference"));
     }
 
-    public static void testPhases(boolean parallelRefProcEnabled) throws Exception {
+    public static void testPhases() throws Exception {
         OutputAnalyzer output = ProcessTools.executeLimitedTestJava("-Xlog:gc+phases+ref=debug",
                                                                     "-XX:+UseG1GC",
                                                                     "-Xmx32M",
-                                                                    "-XX:" + (parallelRefProcEnabled ? "+" : "-") + "ParallelRefProcEnabled",
                                                                     "-XX:-UseDynamicNumberOfGCThreads",
                                                                     "-XX:ParallelGCThreads=2",
                                                                     GCTest.class.getName());
 
-        checkLogFormat(output, parallelRefProcEnabled);
+        checkLogFormat(output);
         checkLogValue(output);
 
         output.shouldHaveExitValue(0);
@@ -113,37 +111,31 @@ public class TestPrintReferences {
         return indent(6) + phaseName + ": " + timeRegex + "\n";
     }
 
-    private static String subphaseRegex(String subphaseName, boolean parallelRefProcEnabled) {
+    private static String subphaseRegex(String subphaseName) {
         final String timeRegex = "\\s+" + doubleRegex;
-        if (parallelRefProcEnabled) {
-            final String timeInParRegex = timeRegex +",\\s";
-            return gcLogTimeRegex + indent(8) + subphaseName +
-                   " \\(ms\\):\\s+(Min:" + timeInParRegex + "Avg:" + timeInParRegex + "Max:" + timeInParRegex + "Diff:" + timeInParRegex + "Sum:" + timeInParRegex +
-                   "Workers: [0-9]+|skipped)" + "\n";
-        } else {
-            return gcLogTimeRegex + indent(8) + subphaseName + ":(" + timeRegex + "ms|\\s+skipped)\n";
-        }
+        final String timeInParRegex = timeRegex +",\\s";
+        return gcLogTimeRegex + indent(8) + subphaseName +
+               " \\(ms\\):\\s+(Min:" + timeInParRegex + "Avg:" + timeInParRegex + "Max:" + timeInParRegex + "Diff:" + timeInParRegex + "Sum:" + timeInParRegex +
+               "Workers: [0-9]+|skipped)" + "\n";
     }
 
     // Find the first Reference Processing log and check its format.
-    private static void checkLogFormat(OutputAnalyzer output, boolean parallelRefProcEnabled) {
+    private static void checkLogFormat(OutputAnalyzer output) {
         String timeRegex = doubleRegex + "ms";
 
         /* Total Reference processing time */
         String totalRegex = gcLogTimeRegex + indent(4) + referenceProcessing + ": " + timeRegex + "\n";
 
-        String balanceRegex = parallelRefProcEnabled ? "(" + gcLogTimeRegex + indent(8) + "Balance queues: " + timeRegex + "\n)??" : "";
-
-        final boolean p = parallelRefProcEnabled;
+        String balanceRegex = "(" + gcLogTimeRegex + indent(8) + "Balance queues: " + timeRegex + "\n)??";
 
         String phase2Regex = gcLogTimeRegex + phaseRegex(phaseNotifySoftWeakReferences) +
                              balanceRegex +
-                             subphaseRegex("SoftRef", p) +
-                             subphaseRegex("WeakRef", p) +
-                             subphaseRegex("FinalRef", p) +
-                             subphaseRegex("Total", p);
-        String phase3Regex = gcLogTimeRegex + phaseRegex(phaseNotifyKeepAliveFinalizer) + balanceRegex + subphaseRegex("FinalRef", p);
-        String phase4Regex = gcLogTimeRegex + phaseRegex(phaseNotifyPhantomReferences) + balanceRegex + subphaseRegex("PhantomRef", p);
+                             subphaseRegex("SoftRef") +
+                             subphaseRegex("WeakRef") +
+                             subphaseRegex("FinalRef") +
+                             subphaseRegex("Total");
+        String phase3Regex = gcLogTimeRegex + phaseRegex(phaseNotifyKeepAliveFinalizer) + balanceRegex + subphaseRegex("FinalRef");
+        String phase4Regex = gcLogTimeRegex + phaseRegex(phaseNotifyPhantomReferences) + balanceRegex + subphaseRegex("PhantomRef");
 
         output.shouldMatch(totalRegex +
                            phase2Regex +
diff --git a/test/hotspot/jtreg/gc/parallel/TestObjectCountAfterGC.java b/test/hotspot/jtreg/gc/parallel/TestObjectCountAfterGC.java
new file mode 100644
index 00000000000..e61e7518938
--- /dev/null
+++ b/test/hotspot/jtreg/gc/parallel/TestObjectCountAfterGC.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package gc.parallel;
+
+/*
+ * @test TestObjectCountAfterGC
+ * @bug 8375314
+ * @summary Verifies that the HeapInspection VM operation for the ObjectCountAfterGC JFR event does not crash the VM.
+ *          Creates a set of custom classes that are about to be unloaded to cause metaspace to uncommit pages. When
+ *          the execution of the heap inspection iterates over the heap, it will come across these unloaded classes
+ *          referencing uncommitted memory, crashing.
+ * @requires vm.gc.Parallel
+ * @requires vm.opt.final.ClassUnloading
+ * @library /test/lib
+ * @library /testlibrary/asm
+ * @modules java.base/jdk.internal.misc
+ * @run main/othervm -XX:+UseParallelGC -Xlog:gc=debug,metaspace=info -XX:StartFlightRecording:gc=all,duration=1s,filename=myrecording.jfr
+ *                   gc.parallel.TestObjectCountAfterGC
+ */
+
+import java.lang.ref.Reference;
+
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+public class TestObjectCountAfterGC {
+
+    static final String className = "ClassToLoadUnload";
+
+    public static void main(String args[]) throws Exception {
+        final int KEEPALIVE_LENGTH = 100;
+
+        Object[] keepalive = new Object[KEEPALIVE_LENGTH];
+
+        for (int i = 1; i < 1000; i++) {
+            ClassLoader cl = new MyClassLoader();
+            Object o = null;
+            // Create some random kept alive objects so that the
+            // compaction regions are not totally empty and the
+            // heap inspection VM operation needs to iterate them.
+            keepalive[(i / KEEPALIVE_LENGTH) % KEEPALIVE_LENGTH] = new int[100];
+            o = cl.loadClass(className + i).newInstance();
+
+            cl = null;
+            o = null;
+        }
+
+        // There is heap inspection VM operation for the ObjectCountAfterGC event
+        // when JFR stops recording.
+
+        Reference.reachabilityFence(keepalive);
+    }
+}
+
+class MyClassLoader extends ClassLoader {
+
+    // Create a class of the given name with a default constructor.
+    public byte[] createClass(String name) {
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
+        cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER, name, null, "java/lang/Object", null);
+        // Add default constructor that just calls the super class constructor.
+        MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(Opcodes.ALOAD, 0);
+        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+        mv.visitInsn(Opcodes.RETURN);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+        return cw.toByteArray();
+    }
+
+    // If the given name starts with "TestObjectCountAfterGC" create a new class on the fly,
+    // delegate otherwise.
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        if (!name.startsWith(TestObjectCountAfterGC.className)) {
+            return super.loadClass(name);
+        }
+        byte[] cls = createClass(name);
+        return defineClass(name, cls, 0, cls.length, null);
+    }
+  }
+
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java
index 96440ba15ae..ff853d174b1 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestLinkToNativeRBP.java
@@ -27,10 +27,11 @@
  * @summary guarantee(loc != NULL) failed: missing saved register with native invoke
  *
  * @requires vm.flavor == "server"
- * @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64" | os.arch == "ppc64" | os.arch == "ppc64le"
+ * @requires ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") |
+              os.arch == "aarch64" | os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "riscv64"
  * @requires vm.gc.Shenandoah
  *
- * @run main/othervm --enable-native-access=ALL-UNNAMED -XX:+UnlockDiagnosticVMOptions
+ * @run main/native/othervm --enable-native-access=ALL-UNNAMED -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestLinkToNativeRBP
  *
  */
diff --git a/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java b/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java
index a323ebd945a..ffd5203dfb8 100644
--- a/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java
+++ b/test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java
@@ -44,15 +44,15 @@ import jdk.test.lib.Utils;
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=1 -Xlog:gc
+ *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=1 -Xlog:gc -XX:-UseGCOverheadLimit
  *   -Xmx500m -XX:G1HeapRegionSize=1m -XX:MaxGCPauseMillis=1000 gc.stress.TestMultiThreadStressRSet 10 4
  *
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=100 -Xlog:gc
+ *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=100 -Xlog:gc -XX:-UseGCOverheadLimit
  *   -Xmx1G -XX:G1HeapRegionSize=8m -XX:MaxGCPauseMillis=1000 gc.stress.TestMultiThreadStressRSet 60 16
  *
  * @run main/othervm/timeout=1200 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=100 -Xlog:gc
+ *   -XX:+UseG1GC -XX:G1SummarizeRSetStatsPeriod=100 -Xlog:gc -XX:-UseGCOverheadLimit
  *   -Xmx500m -XX:G1HeapRegionSize=1m -XX:MaxGCPauseMillis=1000 gc.stress.TestMultiThreadStressRSet 600 32
  */
 public class TestMultiThreadStressRSet {
diff --git a/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java b/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
index 9d1f95aa411..4e2b9dd5be7 100644
--- a/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
+++ b/test/hotspot/jtreg/gc/stress/TestStressG1Uncommit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@ public class TestStressG1Uncommit {
     public static void main(String[] args) throws Exception {
         ArrayList<String> options = new ArrayList<>();
         Collections.addAll(options,
+            "-XX:MinHeapFreeRatio=40",
+            "-XX:MaxHeapFreeRatio=70",
             "-Xlog:gc,gc+heap+region=debug",
             "-XX:+UseG1GC",
             "-Xmx1g",
diff --git a/test/hotspot/jtreg/gtest/TestSpinPauseAArch64.java b/test/hotspot/jtreg/gtest/TestSpinPauseAArch64.java
index 475c86d889f..6adf00af250 100644
--- a/test/hotspot/jtreg/gtest/TestSpinPauseAArch64.java
+++ b/test/hotspot/jtreg/gtest/TestSpinPauseAArch64.java
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @requires vm.flagless
  * @requires os.arch=="aarch64"
+ * @requires os.family != "windows"
  * @run main/native GTestWrapper --gtest_filter=SpinPause*
  * @run main/native GTestWrapper --gtest_filter=SpinPause* -XX:+UnlockDiagnosticVMOptions -XX:OnSpinWaitInst=none
  * @run main/native GTestWrapper --gtest_filter=SpinPause* -XX:+UnlockDiagnosticVMOptions -XX:OnSpinWaitInst=nop
@@ -41,6 +42,6 @@
  * @summary Run SpinPause gtest using SB instruction for SpinPause
  * @library /test/lib
  * @requires vm.flagless
- * @requires (os.arch=="aarch64" & vm.cpu.features ~= ".*sb.*")
+ * @requires (os.arch=="aarch64" & vm.cpu.features ~= ".*sb.*" & os.family != "windows")
  * @run main/native GTestWrapper --gtest_filter=SpinPause* -XX:+UnlockDiagnosticVMOptions -XX:OnSpinWaitInst=sb
  */
diff --git a/test/hotspot/jtreg/runtime/7167069/PrintAsFlag.java b/test/hotspot/jtreg/runtime/7167069/PrintAsFlag.java
index 9948ef1738f..cd03af20b34 100644
--- a/test/hotspot/jtreg/runtime/7167069/PrintAsFlag.java
+++ b/test/hotspot/jtreg/runtime/7167069/PrintAsFlag.java
@@ -27,7 +27,7 @@
  *
  * @test PrintAsFlag
  * @summary verify that Flag::print_as_flag() works correctly. This is used by "jinfo -flag" and -XX:+PrintCommandLineFlags.
- * @run main/othervm -XX:+PrintCommandLineFlags -XX:-ShowMessageBoxOnError -XX:ParallelGCThreads=4 -XX:MaxRAM=1G -XX:ErrorFile="file" PrintAsFlag
+ * @run main/othervm -XX:+PrintCommandLineFlags -XX:-ShowMessageBoxOnError -XX:ParallelGCThreads=4 -XX:ErrorLogTimeout=12345 -XX:ErrorFile="file" PrintAsFlag
  */
 
 public class PrintAsFlag {
diff --git a/test/hotspot/jtreg/runtime/ClassFile/NestedAnnotations.java b/test/hotspot/jtreg/runtime/ClassFile/NestedAnnotations.java
new file mode 100644
index 00000000000..e523c2ed736
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ClassFile/NestedAnnotations.java
@@ -0,0 +1,77 @@
+ /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test NestedAnnotations
+ * @summary The JVM handles nested annotations
+ * @bug 8364655
+ * @requires vm.flagless
+ * @library /test/lib
+ * @library /testlibrary/asm
+ * @modules java.base/jdk.internal.misc
+ *          java.desktop
+ *          java.management
+ * @run driver NestedAnnotations
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassWriter;
+
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+
+import static org.objectweb.asm.Opcodes.*;
+
+public class NestedAnnotations {
+    static void test() throws Exception {
+        var cw = new ClassWriter(0);
+        cw.visit(V17, 0, "Annotations", null, "java/lang/Object", null);
+        final int number_of_annotations = 65535;
+        var av = cw.visitAnnotation("LTest;", true);
+        var stack = new ArrayList<AnnotationVisitor>(number_of_annotations + 1);
+        stack.add(av);
+        for (int i = 0; i < number_of_annotations; i++) {
+            stack.add(av = av.visitAnnotation("value", "LTest;"));
+        }
+        for (int i = number_of_annotations; i != 0;) {
+            stack.get(--i).visitEnd();
+        }
+
+        cw.visitEnd();
+        // Does not matter whether the class is hidden, used for simplicity's sake.
+        MethodHandles.lookup().defineHiddenClass(cw.toByteArray(), true);
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 1 && args[0].equals("testIt")) {
+            test();
+        } else {
+            OutputAnalyzer oa = ProcessTools.executeTestJava("NestedAnnotations", "testIt");
+            oa.shouldHaveExitValue(0);
+        }
+    }
+}
+
diff --git a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
index 0ac19c4a487..eb0fd5f8be5 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java
@@ -237,7 +237,6 @@ public class TestOptionsWithRanges {
         excludeTestMaxRange("G1ConcRefinementThreads");
         excludeTestMaxRange("InitialHeapSize");
         excludeTestMaxRange("MaxHeapSize");
-        excludeTestMaxRange("MaxRAM");
         excludeTestMaxRange("NewSize");
         excludeTestMaxRange("ParallelGCThreads");
         excludeTestMaxRange("TLABSize");
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
index a9d957bac18..61d017d2264 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2025, Red Hat, Inc.
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @library /test/lib
  * @requires vm.bits == 64 & vm.debug == true & vm.flagless
  * @requires os.family != "aix"
+ * @comment This test relies on crashing which conflicts with ASAN checks
+ * @requires !vm.asan
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
@@ -40,6 +42,8 @@
  * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
  * @requires vm.cds & vm.bits == 64 & vm.debug == true & vm.flagless
  * @requires os.family != "aix"
+ * @comment This test relies on crashing which conflicts with ASAN checks
+ * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -53,6 +57,8 @@
  * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
  * @requires vm.bits == 64 & vm.debug == true & vm.flagless
  * @requires os.family != "aix"
+ * @comment This test relies on crashing which conflicts with ASAN checks
+ * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -66,6 +72,8 @@
  * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
  * @requires vm.cds & vm.bits == 64 & vm.debug == true & vm.flagless
  * @requires os.family != "aix"
+ * @comment This test relies on crashing which conflicts with ASAN checks
+ * @requires !vm.asan
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java b/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java
index 74cedae5f1a..7608c5f5619 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/MachCodeFramesInErrorFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @requires vm.flagless
  * @requires vm.compiler2.enabled
  * @requires test.thread.factory == null
+ * @comment This test relies on crashing which conflicts with ASAN checks
+ * @requires !vm.asan
  * @summary Test that abstract machine code is dumped for the top frames in a hs-err log
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -167,6 +169,10 @@ public class MachCodeFramesInErrorFile {
         Matcher matcher = Pattern.compile("\\[MachCode\\]\\s*\\[Verified Entry Point\\]\\s*  # \\{method\\} \\{[^}]*\\} '([^']+)' '([^']+)' in '([^']+)'", Pattern.DOTALL).matcher(hsErr);
         List<String> machCodeHeaders = matcher.results().map(mr -> String.format("'%s' '%s' in '%s'", mr.group(1), mr.group(2), mr.group(3))).collect(Collectors.toList());
         int minExpectedMachCodeSections = Math.max(1, compiledJavaFrames);
+        if ((hsErr.contains("stop reattempt (retry printing native stack (no source info))") || hsErr.contains("reason: Step time limit reached"))) {
+            // In this case, the vm only prints the crashing frame.
+            minExpectedMachCodeSections = 1;
+        }
         if (machCodeHeaders.size() < minExpectedMachCodeSections) {
             Asserts.fail(machCodeHeaders.size() + " < " + minExpectedMachCodeSections);
         }
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java
index 5bbc4cfac00..583ed894035 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/ResourceMarkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
  * @library /test/lib
  * @requires vm.flagless
  * @requires vm.debug
+ * @comment ASAN grabs SIGFPE earlier than vm signal handler
+ * @requires !vm.asan
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java
index 5b28e2a1d8b..f7facaab186 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2024 SAP SE. All rights reserved.
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
  * @library /test/lib
  * @requires vm.flagless
  * @requires vm.debug
+ * @comment ASAN grabs SIGFPE earlier than vm signal handler
+ * @requires !vm.asan
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -41,6 +43,8 @@
  * @library /test/lib
  * @requires vm.flagless
  * @requires vm.debug
+ * @comment ASAN grabs SIGFPE earlier than vm signal handler
+ * @requires !vm.asan
  * @requires os.family != "windows"
  * @modules java.base/jdk.internal.misc
  *          java.management
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java b/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java
index 00b5becdbfa..6fe00498797 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TestDwarf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,13 +108,19 @@ public class TestDwarf {
         if (Platform.isX64() || Platform.isX86()) {
             // Not all platforms raise SIGFPE but x86_32 and x86_64 do.
             runAndCheck(new Flags(TestDwarf.class.getCanonicalName(), "nativeDivByZero"),
-                        new DwarfConstraint(0, "Java_TestDwarf_crashNativeDivByZero", "libTestDwarf.c", 59));
+                        new DwarfConstraint(0, "Java_TestDwarf_crashNativeDivByZero", "libTestDwarf.c", 62));
             runAndCheck(new Flags(TestDwarf.class.getCanonicalName(), "nativeMultipleMethods"),
-                        new DwarfConstraint(0, "foo", "libTestDwarf.c", 42),
-                        new DwarfConstraint(1, "Java_TestDwarf_crashNativeMultipleMethods", "libTestDwarf.c", 70));
+                        new DwarfConstraint(0, "foo", "libTestDwarf.c", 45),
+                        new DwarfConstraint(1, "Java_TestDwarf_crashNativeMultipleMethods", "libTestDwarf.c", 73));
+        }
+        // Null pointer dereferences exhibit different behaviour depending on if GCC or Clang is used.
+        // When using GCC, the VM will crash gracefully and generate a hs_err which can be parsed.
+        // On the contrary, with Clang the process exits immediately without hs_err.
+        // Since runAndCheck needs an hs_err file, we have to skip this subtest.
+        if (!isUsingClang()) {
+            runAndCheck(new Flags(TestDwarf.class.getCanonicalName(), "nativeDereferenceNull"),
+                        new DwarfConstraint(0, "dereference_null", "libTestDwarfHelper.h", 49));
         }
-        runAndCheck(new Flags(TestDwarf.class.getCanonicalName(), "nativeDereferenceNull"),
-                    new DwarfConstraint(0, "dereference_null", "libTestDwarfHelper.h", 46));
     }
 
     // A full pattern could check for lines like:
@@ -240,6 +246,7 @@ public class TestDwarf {
     private static native void crashNativeDivByZero();
     private static native void crashNativeDereferenceNull();
     private static native void crashNativeMultipleMethods(int x);
+    private static native boolean isUsingClang();
 }
 
 class UnsupportedDwarfVersionException extends RuntimeException { }
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarf.c b/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarf.c
index 616a6f07d12..19993d17de3 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarf.c
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,10 @@ int zero = 0;
 int result = 0;
 int limit = 20;
 
-// Just big enough by doing some random things such that it is not inlined.
+// Explicitly don't inline. foo needs complexity so GCC/Clang don't optimize it away.
+#if !defined(_MSC_VER)
+__attribute__((noinline))
+#endif
 void foo(int x) {
     printf("foo3:");
     printf(" %d\n", x);
@@ -76,3 +79,12 @@ JNIEXPORT void JNICALL Java_TestDwarf_crashNativeMultipleMethods(JNIEnv* env, jc
   }
 }
 
+// Need to tell if Clang was used to build libTestDwarf.
+JNIEXPORT jboolean JNICALL Java_TestDwarf_isUsingClang(JNIEnv* env, jobject obj) {
+#if defined(__clang__)
+    return JNI_TRUE;
+#else
+    return JNI_FALSE;
+#endif
+}
+
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarfHelper.h b/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarfHelper.h
index 1da05c1c3d3..9f9ef33add2 100644
--- a/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarfHelper.h
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/libTestDwarfHelper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,9 @@ void unused4() {
 void unused5() {
 }
 
+#if !defined(_MSC_VER)
+__attribute__((noinline))
+#endif
 EXPORT void dereference_null() {
   int* x = (int*)0;
   *x = 34; // Crash
diff --git a/test/hotspot/jtreg/runtime/NMT/NMTPrintMallocSiteOfCorruptedMemory.java b/test/hotspot/jtreg/runtime/NMT/NMTPrintMallocSiteOfCorruptedMemory.java
index 7f0f1be929b..f1d4964d6cf 100644
--- a/test/hotspot/jtreg/runtime/NMT/NMTPrintMallocSiteOfCorruptedMemory.java
+++ b/test/hotspot/jtreg/runtime/NMT/NMTPrintMallocSiteOfCorruptedMemory.java
@@ -24,6 +24,8 @@
 /*
  * @test
  * @summary Check the allocation-site stack trace of a corrupted memory at free() time
+ * @comment Under ASAN build, memory corruption is reported by ASAN runtime and not JVM.
+ * @requires !vm.asan
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java
index 735d5a3070b..f606f242cf6 100644
--- a/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java
+++ b/test/hotspot/jtreg/runtime/cds/DumpSymbolAndStringTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,70 +24,26 @@
 /*
  * @test
  * @bug 8059510 8213445
- * @summary Test jcmd VM.symboltable, VM.stringtable and VM.systemdictionary options
+ * @summary Test jcmd VM.symboltable and VM.stringtable
  * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- *                   -XX:+WhiteBoxAPI DumpSymbolAndStringTable
+ * @run main/othervm DumpSymbolAndStringTable
  */
 import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.dcmd.PidJcmdExecutor;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.whitebox.WhiteBox;
 
 public class DumpSymbolAndStringTable {
-    public static void main(String[] args) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        boolean sharingEnabled = wb.isSharingEnabled();
+    public static final String s = "MY_INTERNED_STRING";
 
+    public static void main(String[] args) throws Exception {
         ProcessBuilder pb = new ProcessBuilder();
+
         pb.command(new PidJcmdExecutor().getCommandLine("VM.symboltable", "-verbose"));
         OutputAnalyzer output = CDSTestUtils.executeAndLog(pb, "jcmd-symboltable");
-        final String sharedSymbolsHeader = "Shared symbols:\n";
-        try {
-            output.shouldContain("24 2: DumpSymbolAndStringTable\n");
-            if (sharingEnabled) {
-                output.shouldContain(sharedSymbolsHeader);
-                output.shouldContain("17 65535: java.lang.runtime\n");
-            }
-        } catch (RuntimeException e) {
-            output.shouldContain("Unknown diagnostic command");
-        }
+        output.shouldContain("18 1: MY_INTERNED_STRING\n"); // This symbol should have been interned
 
         pb.command(new PidJcmdExecutor().getCommandLine("VM.stringtable", "-verbose"));
         output = CDSTestUtils.executeAndLog(pb, "jcmd-stringtable");
-        final String sharedStringsHeader = "Shared strings:\n";
-        try {
-            output.shouldContain("24: DumpSymbolAndStringTable\n");
-            if (sharingEnabled && wb.canWriteJavaHeapArchive()) {
-                output.shouldContain(sharedStringsHeader);
-                if (!wb.isSharedInternedString("MILLI_OF_SECOND")) {
-                    throw new RuntimeException("'MILLI_OF_SECOND' should be a shared string");
-                }
-            }
-        } catch (RuntimeException e) {
-            output.shouldContain("Unknown diagnostic command");
-        }
-
-        pb.command(new PidJcmdExecutor().getCommandLine("VM.systemdictionary"));
-        output = CDSTestUtils.executeAndLog(pb, "jcmd-systemdictionary");
-        try {
-            output.shouldContain("System Dictionary for 'app' class loader statistics:");
-            output.shouldContain("Number of buckets");
-            output.shouldContain("Number of entries");
-            output.shouldContain("Maximum bucket size");
-        } catch (RuntimeException e) {
-            output.shouldContain("Unknown diagnostic command");
-        }
-
-        pb.command(new PidJcmdExecutor().getCommandLine("VM.systemdictionary", "-verbose"));
-        output = CDSTestUtils.executeAndLog(pb, "jcmd-systemdictionary");
-        try {
-            output.shouldContain("Dictionary for loader data: 0x");
-            output.shouldContain("^java.lang.String");
-        } catch (RuntimeException e) {
-            output.shouldContain("Unknown diagnostic command");
-        }
+        output.shouldContain("18: MY_INTERNED_STRING\n"); // This string should have been interned
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStrings.java b/test/hotspot/jtreg/runtime/cds/SharedStrings.java
deleted file mode 100644
index db0bc3264b2..00000000000
--- a/test/hotspot/jtreg/runtime/cds/SharedStrings.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @summary Check to make sure that shared strings in the bootstrap CDS archive
- *          are actually shared
- * @requires vm.cds.write.mapped.java.heap
- * @requires vm.flagless
- * @library /test/lib
- * @build SharedStringsWb jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox
- * @run driver SharedStrings
- */
-
-import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.helpers.ClassFileInstaller;
-
-public class SharedStrings {
-    public static void main(String[] args) throws Exception {
-        // Note: This is a basic sanity test for Shared Strings feature.
-        // This also serves as a reference on how to use this feature,
-        // hence the command lines are spelled out instead of using the
-        // test utils methods.
-        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-XX:+UnlockDiagnosticVMOptions",
-            "-XX:SharedArchiveFile=./SharedStrings.jsa",
-            "-Xlog:cds,aot+hashtables",
-            // Needed for bootclasspath match, for CDS to work with WhiteBox API
-            "-Xbootclasspath/a:" + ClassFileInstaller.getJarPath("whitebox.jar"),
-            "-Xshare:dump");
-
-        OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "dump");
-        CDSTestUtils.checkDump(out, "Shared string table stats");
-
-
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-                "-XX:+UnlockDiagnosticVMOptions",
-                "-XX:SharedArchiveFile=./SharedStrings.jsa",
-                // needed for access to white box test API
-                "-Xbootclasspath/a:" + ClassFileInstaller.getJarPath("whitebox.jar"),
-                "-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
-                "-Xshare:on", "-showversion", "SharedStringsWb");
-
-        out = CDSTestUtils.executeAndLog(pb, "exec");
-        CDSTestUtils.checkExec(out);
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/SharedStringsWb.java b/test/hotspot/jtreg/runtime/cds/SharedStringsWb.java
deleted file mode 100644
index 5a4d24e4fdf..00000000000
--- a/test/hotspot/jtreg/runtime/cds/SharedStringsWb.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import jdk.test.whitebox.WhiteBox;
-
-// This class is used by the test SharedStrings.java
-// It should be launched in CDS mode
-public class SharedStringsWb {
-    public static void main(String[] args) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-
-        if (!wb.areSharedStringsMapped()) {
-            System.out.println("Shared strings are not mapped, assuming PASS");
-            return;
-        }
-
-        // The string below is known to be added to CDS archive
-        String s = "<init>";
-        String internedS = s.intern();
-
-        // Check that it's a valid string
-        if (s.getClass() != String.class || !(s instanceof String)) {
-            throw new RuntimeException("Shared string is not a valid String: FAIL");
-        }
-
-        if (wb.isSharedInternedString(internedS)) {
-            System.out.println("Found shared string, result: PASS");
-        } else {
-            throw new RuntimeException("String is not shared, result: FAIL");
-        }
-    }
-}
-
-
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
index 7c0b5896a98..eb42bb9f93d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /*
- * @test
+ * @test id=COH
  * @bug 8232069
  * @requires vm.cds
  * @requires vm.bits == 64
@@ -31,7 +31,32 @@
  * @requires vm.gc == null
  * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
  * @compile test-classes/Hello.java
- * @run driver TestZGCWithCDS
+ * @comment Only run if COH is unset or enabled.
+ * @requires vm.opt.UseCompactObjectHeaders != "false"
+ * @comment Driver sets compressed oops/class pointers, jtreg overrides will cause problems.
+            Only run the test if the flags are not set via the command line.
+ * @requires vm.opt.UseCompressedOops == null
+ * @requires vm.opt.UseCompressedClassPointers == null
+ * @run driver TestZGCWithCDS true
+ */
+
+/*
+ * @test id=NO-COH
+ * @bug 8232069
+ * @requires vm.cds
+ * @requires vm.bits == 64
+ * @requires vm.gc.Z
+ * @requires vm.gc.Serial
+ * @requires vm.gc == null
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile test-classes/Hello.java
+ * @comment Only run if COH is unset or disabled.
+ * @requires vm.opt.UseCompactObjectHeaders != "true"
+ * @comment Driver sets compressed oops/class pointers, jtreg overrides will cause problems.
+            Only run the test if the flags are not set via the command line.
+ * @requires vm.opt.UseCompressedOops == null
+ * @requires vm.opt.UseCompressedClassPointers == null
+ * @run driver TestZGCWithCDS false
  */
 
 import jdk.test.lib.Platform;
@@ -42,7 +67,8 @@ public class TestZGCWithCDS {
     public final static String UNABLE_TO_USE_ARCHIVE = "Unable to use shared archive.";
     public final static String ERR_MSG = "The saved state of UseCompressedOops and UseCompressedClassPointers is different from runtime, CDS will be disabled.";
     public static void main(String... args) throws Exception {
-         String compactHeaders = "-XX:+UseCompactObjectHeaders";
+         boolean compactHeadersOn = Boolean.valueOf(args[0]);
+         String compactHeaders = "-XX:" + (compactHeadersOn ? "+" : "-") + "UseCompactObjectHeaders";
          String helloJar = JarBuilder.build("hello", "Hello");
          System.out.println("0. Dump with ZGC");
          OutputAnalyzer out = TestCommon
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTMapTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTMapTest.java
index 6cbfcbbd3c3..209eb064945 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTMapTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/AOTMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,6 +136,7 @@ public class AOTMapTest {
 }
 
 class AOTMapTestApp {
+    static URLClassLoader loader; // keep Hello class alive
     public static void main(String[] args) throws Exception {
         System.out.println("Hello AOTMapTestApp");
         testCustomLoader();
@@ -144,7 +145,7 @@ class AOTMapTestApp {
     static void testCustomLoader() throws Exception {
         File custJar = new File("cust.jar");
         URL[] urls = new URL[] {custJar.toURI().toURL()};
-        URLClassLoader loader = new URLClassLoader(urls, AOTMapTestApp.class.getClassLoader());
+        loader = new URLClassLoader(urls, AOTMapTestApp.class.getClassLoader());
         Class<?> c = loader.loadClass("Hello");
         System.out.println(c);
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ChangedJarFile.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ChangedJarFile.java
new file mode 100644
index 00000000000..a717b267347
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCache/ChangedJarFile.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @summary AOT cache should be rejected if JAR file(s) in the classpath have changed
+ * @bug 8377932
+ * @requires vm.cds.supports.aot.class.linking
+ * @library /test/lib
+ * @build ChangedJarFile
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp OtherClass
+ * @run driver ChangedJarFile AOT
+ */
+
+import jdk.jfr.Event;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class ChangedJarFile {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = MyTestApp.class.getName();
+
+    public static void main(String[] args) throws Exception {
+        // Train and run with unchanged JAR file (which has OtherClass.class)
+        Tester tester = new Tester();
+        tester.run(args);
+
+        // Run again with changed JAR file (which doesn't have OtherClass.class anymore)
+        ClassFileInstaller.writeJar(appJar, "MyTestApp");
+
+        // First disable AOT cache to verify test login
+        tester.productionRun(new String[] {"-XX:AOTMode=off"},
+                             new String[] {"jarHasChanged"});
+
+        // Now see if the AOT cache will be automatically disabled
+        OutputAnalyzer out =
+            tester.productionRun(new String[] {"-XX:AOTMode=auto", "-Xlog:aot"},
+                                 new String[] {"jarHasChanged"});
+        out.shouldMatch("This file is not the one used while building the " +
+                        "AOT cache: '.*app.jar', timestamp has changed, size has changed");
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] { mainClass };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+
+        }
+    }
+
+
+}
+
+class MyTestApp {
+    public static void main(String args[]) {
+        boolean jarHasChanged = (args.length != 0);
+
+        System.out.println("JAR has changed = " + (jarHasChanged));
+        Class c = null;
+        try {
+            c = Class.forName("OtherClass");
+            System.out.println("Other class = " + c);
+        } catch (Throwable t) {
+            if (!jarHasChanged) {
+                throw new RuntimeException("OtherClass should have been loaded because JAR has not been changed yet", t);
+            }
+        }
+
+        if (jarHasChanged && c != null) {
+            throw new RuntimeException("OtherClass should not be in JAR file");
+        }
+    }
+}
+
+class OtherClass {}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCPUFeatureIncompatibilityTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCPUFeatureIncompatibilityTest.java
new file mode 100644
index 00000000000..8d1e190d1e3
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCPUFeatureIncompatibilityTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @summary CPU feature compatibility test for AOT Code Cache
+ * @requires vm.cds.supports.aot.code.caching
+ * @requires vm.compMode != "Xcomp" & vm.compMode != "Xint"
+ * @requires os.simpleArch == "x64" | os.simpleArch == "aarch64"
+ * @comment The test verifies AOT checks during VM startup and not code generation.
+ *          No need to run it with -Xcomp.
+ * @library /test/lib /test/setup_aot
+ * @build AOTCodeCPUFeatureIncompatibilityTest JavacBenchApp
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar
+ *             JavacBenchApp
+ *             JavacBenchApp$ClassFile
+ *             JavacBenchApp$FileManager
+ *             JavacBenchApp$SourceFile
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AOTCodeCPUFeatureIncompatibilityTest
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jdk.test.lib.Platform;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+import jdk.test.whitebox.WhiteBox;
+import jdk.test.whitebox.cpuinfo.CPUInfo;
+
+public class AOTCodeCPUFeatureIncompatibilityTest {
+    public static void main(String... args) throws Exception {
+        List<String> cpuFeatures = CPUInfo.getFeatures();
+        if (Platform.isX64()) {
+            // Minimum value of UseSSE required by JVM is 2. So the production run has to be executed with UseSSE=2.
+            // To simulate the case of incmpatible SSE feature, we can run this test only on system with higher SSE level (sse3 or above).
+            if (isSSE3Supported(cpuFeatures)) {
+                testIncompatibleFeature("-XX:UseSSE=2", "sse3");
+            }
+            if (isAVXSupported(cpuFeatures)) {
+                testIncompatibleFeature("-XX:UseAVX=0", "avx");
+            }
+        }
+    }
+
+    // vmOption = command line option to disable CPU feature
+    // featureName = name of the CPU feature used by the JVM in the log messages
+    public static void testIncompatibleFeature(String vmOption, String featureName) throws Exception {
+        new CDSAppTester("AOTCodeCPUFeatureIncompatibilityTest") {
+            @Override
+            public String[] vmArgs(RunMode runMode) {
+                if (runMode == RunMode.PRODUCTION) {
+                    return new String[] {vmOption, "-Xlog:aot+codecache+init=debug"};
+                }
+                return new String[] {};
+            }
+            @Override
+            public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+                if (runMode == RunMode.ASSEMBLY) {
+                    out.shouldMatch("CPU features recorded in AOTCodeCache:.*" + featureName + ".*");
+                } else if (runMode == RunMode.PRODUCTION) {
+                    out.shouldMatch("AOT Code Cache disabled: required cpu features are missing:.*" + featureName + ".*");
+                    out.shouldContain("Unable to use AOT Code Cache");
+                }
+            }
+            @Override
+            public String classpath(RunMode runMode) {
+                return "app.jar";
+            }
+            @Override
+            public String[] appCommandLine(RunMode runMode) {
+                return new String[] {
+                    "JavacBenchApp", "10"
+                };
+            }
+        }.runAOTWorkflow("--two-step-training");
+    }
+
+    // Only used on x86-64 platform
+    static boolean isSSE3Supported(List<String> cpuFeatures) {
+        return cpuFeatures.contains("sse3");
+    }
+
+    // Only used on x86-64 platform
+    static boolean isAVXSupported(List<String> cpuFeatures) {
+        return cpuFeatures.contains("avx");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java
deleted file mode 100644
index 9e4558002cc..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsApp.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-import java.io.File;
-import java.net.URL;
-import jdk.test.whitebox.WhiteBox;
-
-//
-// - Test static final String field with initial value in cached mirror should be also archived.
-// - GC should not crash when reference fields in cached mirror are updated at runtime
-//     - Reference fields are updated to point to runtime created objects
-//     - Reference fields are nullified
-//
-public class MirrorWithReferenceFieldsApp {
-
-    // Static String field with initial value
-    static final String archived_field = "abc";
-
-    // Static object field
-    static Object non_archived_field_1;
-
-    // Instance field
-    Integer non_archived_field_2;
-
-    public MirrorWithReferenceFieldsApp() {
-        non_archived_field_1 = new Object();
-        non_archived_field_2 = Integer.valueOf(1);
-    }
-
-    public static void main(String args[]) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-
-        if (!wb.areOpenArchiveHeapObjectsMapped()) {
-            System.out.println("Archived open_archive_heap objects are not mapped.");
-            System.out.println("This may happen during normal operation. Test Skipped.");
-            return;
-        }
-
-        MirrorWithReferenceFieldsApp m = new MirrorWithReferenceFieldsApp();
-        m.test(wb);
-    }
-
-    public void test(WhiteBox wb) {
-        Class c = MirrorWithReferenceFieldsApp.class;
-        if (wb.isSharedClass(c)) {
-            if (wb.isSharedInternedString(archived_field)) {
-                System.out.println("archived_field is archived as excepted");
-            } else {
-                throw new RuntimeException(
-                    "FAILED. archived_field is not archived.");
-            }
-
-            // GC should not crash
-            System.gc();
-            System.gc();
-            System.gc();
-
-            non_archived_field_1 = null;
-            non_archived_field_2 = null;
-
-            System.gc();
-            System.gc();
-            System.gc();
-
-            System.out.println("Done.");
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java
deleted file mode 100644
index 4c670ccba9b..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/MirrorWithReferenceFieldsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test
- * @summary Test archived mirror with reference fields
- * @requires vm.cds.write.archived.java.heap
- * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @build jdk.test.whitebox.WhiteBox
- * @compile MirrorWithReferenceFieldsApp.java
- * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MirrorWithReferenceFieldsApp
- * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar WhiteBox.jar jdk.test.whitebox.WhiteBox
- * @run driver MirrorWithReferenceFieldsTest
- */
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.helpers.ClassFileInstaller;
-import jdk.test.whitebox.WhiteBox;
-
-public class MirrorWithReferenceFieldsTest {
-    public static void main(String[] args) throws Exception {
-        String wbJar = ClassFileInstaller.getJarPath("WhiteBox.jar");
-        String use_whitebox_jar = "-Xbootclasspath/a:" + wbJar;
-        String appJar = ClassFileInstaller.getJarPath("app.jar");
-
-        String classlist[] = new String[] {
-            "MirrorWithReferenceFieldsApp",
-        };
-
-        TestCommon.testDump(appJar, classlist, use_whitebox_jar);
-        OutputAnalyzer output = TestCommon.exec(appJar, use_whitebox_jar,
-                                                "-XX:+UnlockDiagnosticVMOptions",
-                                                "-XX:+WhiteBoxAPI",
-                                                "-XX:+VerifyAfterGC",
-                                                "MirrorWithReferenceFieldsApp");
-        try {
-            TestCommon.checkExec(output, "Done");
-        } catch (Exception e) {
-            output.shouldContain("Archived open_archive_heap objects are not mapped");
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java
index e247a8158f7..0bac9f4e77d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/RedefineClassApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,11 +55,6 @@ public class RedefineClassApp {
     static Instrumentation instrumentation;
 
     public static void main(String args[]) throws Throwable {
-        if (!wb.areSharedStringsMapped()) {
-          System.out.println("Shared strings are ignored.");
-          return;
-        }
-
         File bootJar = new File(args[0]);
         File appJar  = new File(args[1]);
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArraySuperTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArraySuperTest.java
new file mode 100644
index 00000000000..5274c140f32
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArraySuperTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8304147
+ * @summary make sure dynamic archive does not archive array classes with incorrect values in
+ *          Array::_secondary_supers
+ * @requires vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @build ArraySuperTest jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar ArraySuperApp.jar ArraySuperApp
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. ArraySuperTest
+ */
+
+import java.util.function.Predicate;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class ArraySuperTest extends DynamicArchiveTestBase {
+
+    public static void main(String[] args) throws Exception {
+        runTest(ArraySuperTest::test);
+    }
+
+    static void test() throws Exception {
+        String topArchiveName = getNewArchiveName();
+        String appJar = ClassFileInstaller.getJarPath("ArraySuperApp.jar");
+        String mainClass = ArraySuperApp.class.getName();
+
+        dump(topArchiveName, "-cp", appJar, mainClass).assertNormalExit();
+        run(topArchiveName, "-cp", appJar, "-Xshare:off", mainClass, "withDynamicArchive").assertNormalExit();
+        run(topArchiveName, "-cp", appJar, mainClass, "withDynamicArchive").assertNormalExit();
+    }
+}
+
+class ArraySuperApp implements Predicate {
+    static volatile Object array;
+    public boolean test(Object o) {
+        return true;
+    }
+    static void main(String args[]) {
+        array = new ArraySuperApp[1];
+        if (args.length > 0) {
+            Predicate[] p = new Predicate[0];
+            System.out.println(p.getClass().isInstance(array));
+            p = (Predicate[])array;
+            p[0] = new ArraySuperApp();
+            System.out.println("All tests passed");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java
index 4586b94b519..1089e849a90 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/resolvedConstants/AOTLinkedVarHandles.java
@@ -64,6 +64,7 @@ public class AOTLinkedVarHandles {
         OutputAnalyzer dumpOut = CDSTestUtils.createArchiveAndCheck(opts);
         dumpOut.shouldMatch(s + "java/lang/invoke/VarHandle.compareAndExchangeAcquire:\\(\\[DIDI\\)D =>");
         dumpOut.shouldMatch(s + "java/lang/invoke/VarHandle.get:\\(\\[DI\\)D => ");
+        dumpOut.shouldNotContain("rejected .* CP entry.*");
 
         CDSOptions runOpts = (new CDSOptions())
             .setUseVersion(false)
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java
deleted file mode 100644
index 0f8dbf7e753..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringGC.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-import jdk.test.whitebox.WhiteBox;
-
-public class HelloStringGC {
-    public static String[] array01 = new String[1000];
-    public static String[] array02 = new String[1000];
-
-    public static void main(String args[]) throws RuntimeException {
-        String testString1 = "shared_test_string_unique_14325";
-        String testString2 = "test123";
-
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        if (wb.areSharedStringsMapped() && !wb.isSharedInternedString(testString1)) {
-            throw new RuntimeException("testString1 is not shared");
-        }
-
-        for (int i=0; i<5; i++) {
-            allocSomeStrings(testString1, testString2);
-            array01 = null;
-            array02 = null;
-            System.gc();
-            sleep(300);
-            array01 = new String[1000];
-            array02 = new String[1000];
-        }
-
-        wb.fullGC();
-
-        System.out.println("HelloStringGC: PASS");
-    }
-
-    private static void allocSomeStrings(String s1, String s2) {
-        for (int i = 0; i < 1000; i ++) {
-            array01[i] = new String(s1);
-            array02[i] = new String(s2);
-        }
-    }
-
-    private static void sleep(int ms) {
-        try {
-            Thread.sleep(ms);
-        } catch (InterruptedException e) {
-        }
-    }
-
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringPlus.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringPlus.java
deleted file mode 100644
index da111ced43a..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/HelloStringPlus.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-// A test class to be launched in AppCDS mode, has basic+
-// coverage of string operations
-
-import jdk.test.whitebox.WhiteBox;
-
-public class HelloStringPlus {
-    public static void main(String args[]) {
-        // Let's reference the string that is in archive
-        String testString1 = "shared_test_string_unique_14325";
-        System.out.println("Hello String: " + testString1);
-
-        WhiteBox wb = WhiteBox.getWhiteBox();
-        if (wb.areSharedStringsMapped() && !wb.isSharedInternedString(testString1)) {
-            throw new RuntimeException("testString1 is not shared");
-        }
-
-        // Check other basic string operations
-        // Interning and equality
-        String[] testArray = new String[] {"shared_", "test_", "string_", "intern_", "12345"};
-        String toBeInterned = "";
-
-        StringBuilder sb = new StringBuilder();
-        for (String s : testArray) {
-            sb.append(s);
-        }
-        toBeInterned = sb.toString();
-
-        System.out.println("About to intern a string: " + toBeInterned);
-        toBeInterned.intern();
-
-        // check equality
-        if (testString1.equals(toBeInterned))
-            throw new RuntimeException("Equality test 1 failed");
-
-        if (!testString1.equals("shared_test_string" + '_' + "unique_14325"))
-            throw new RuntimeException("Equality test 2 failed");
-
-        // Chech the hash code functionality; no special assertions, just make sure
-        // no crashe or exception occurs
-        System.out.println("testString1.hashCode() = " + testString1.hashCode());
-
-        // Check intern() method for "" string
-        String empty = "";
-        String empty_interned = empty.intern();
-        if (wb.areSharedStringsMapped() && !wb.isSharedInternedString(empty)) {
-           throw new RuntimeException("Empty string should be shared");
-        }
-        if (empty_interned != empty) {
-            throw new RuntimeException("Different string is returned from intern() for empty string");
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
deleted file mode 100644
index 89136ebdc4d..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test
- * @summary Test shared strings together with string intern operation
- * @requires vm.gc == null
- * @requires vm.cds.write.mapped.java.heap
- * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
- * @compile InternStringTest.java
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run driver InternSharedString
- */
-
-// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
-// about using the mechanism for dumping the entire string table, which the streaming solution
-// does not do.
-
-public class InternSharedString {
-    public static void main(String[] args) throws Exception {
-        SharedStringsUtils.run(args, InternSharedString::test);
-    }
-
-    public static void test(String[] args) throws Exception {
-        SharedStringsUtils.buildJarAndWhiteBox("InternStringTest");
-
-        SharedStringsUtils.dumpWithWhiteBox(TestCommon.list("InternStringTest"),
-            "ExtraSharedInput.txt", "-Xlog:cds,aot+hashtables");
-
-        String[] extraMatches = new String[]   {
-            InternStringTest.passed_output1,
-            InternStringTest.passed_output2,
-            InternStringTest.passed_output3  };
-
-        SharedStringsUtils.runWithArchiveAndWhiteBox(extraMatches, "InternStringTest");
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java
deleted file mode 100644
index bea24c87888..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternStringTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-import jdk.test.whitebox.WhiteBox;
-
-public class InternStringTest {
-    public static String passed_output1 = "Found shared string.";
-    public static String passed_output2 = "Shared strings are equal.";
-    public static String passed_output3 = "Found shared string containing latin1 supplement chars.";
-    public static String passed_output4 = "Found shared string containing non-western chars.";
-    public static final String latin1Sup  = "XXXX \u00a3 YYYY"; // \u00a3 = The pound sign
-    public static final String nonWestern = "XXXX \u5678 YYYY"; // \u5678 = Unicode Han Character 'ton (metric or English)'
-
-    public static void main(String[] args) throws Exception {
-        WhiteBox wb = WhiteBox.getWhiteBox();
-
-        // All string literals are shared.
-        String shared1 = "LiveOak";
-        String interned1 = shared1.intern();
-        if (wb.areSharedStringsMapped()) {
-            if (wb.isSharedInternedString(interned1)) {
-                System.out.println(passed_output1);
-            } else {
-                throw new RuntimeException("Failed: String is not shared.");
-            }
-        }
-
-        // Test 2: shared_string1.intern() == shared_string2.intern()
-        String shared2 = "LiveOak";
-        String interned2 = shared2.intern();
-        if (interned1 == interned2) {
-            System.out.println(passed_output2);
-        } else {
-            throw new RuntimeException("Not equal!");
-        }
-
-        // Test 3: interned strings with a char in latin1 supplement block [\u0080-\u00ff]
-        {
-            String a = "X" + latin1Sup.substring(1);
-            String b = a.intern();
-
-            if (wb.areSharedStringsMapped()) {
-                if (wb.isSharedInternedString(b)) {
-                    System.out.println(passed_output3);
-                } else {
-                    throw new RuntimeException("Failed: expected shared string with latin1-supplement chars.");
-                }
-            }
-        }
-
-        // Test 5: interned strings with non-western characters
-        {
-            String a = "X" + nonWestern.substring(1);
-            String b = a.intern();
-            if (wb.areSharedStringsMapped()) {
-                if (wb.isSharedInternedString(b)) {
-                    System.out.println(passed_output4);
-                } else {
-                    throw new RuntimeException("Failed: expected shared string with non-western chars.");
-                }
-            }
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
deleted file mode 100644
index 6145ea7719b..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test
- * @summary Basic plus test for shared strings
- * @requires vm.cds.write.mapped.java.heap
- * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
- * @build HelloStringPlus jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run driver SharedStringsBasicPlus
- */
-
-// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
-// about using the mechanism for dumping the entire string table, which the streaming solution
-// does not do.
-
-public class SharedStringsBasicPlus {
-    public static void main(String[] args) throws Exception {
-        SharedStringsUtils.run(args, SharedStringsBasicPlus::test);
-    }
-
-    public static void test(String[] args) throws Exception {
-        SharedStringsUtils.buildJarAndWhiteBox("HelloStringPlus");
-
-        SharedStringsUtils.dumpWithWhiteBox( TestCommon.list("HelloStringPlus"),
-            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
-
-        SharedStringsUtils.runWithArchiveAndWhiteBox("HelloStringPlus");
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
index 4d176c949c6..dc677756ffa 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsStress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,8 +80,6 @@ public class SharedStringsStress {
                 "-Xlog:gc+region+cds",
                 "-Xlog:gc+region=trace"));
         TestCommon.checkDump(dumpOutput);
-        dumpOutput.shouldContain("string table array (primary)");
-        dumpOutput.shouldContain("string table array (secondary)");
 
         // We could create up to 26MB of archived heap objects. Run with enough Xms to ensure
         // SerialGC can accommodate the archived objects during VM start up.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
index e15cfafa3cb..15686d76ab3 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ public class SharedStringsUtils {
     // SharedStringsUtils.run() is for running the main test body multiple times, each with a different
     // set of extra VM options that are passed to the child processes.
     //
-    // See ./ExerciseGC.java for an example.
+    // See ./LargePages.java for an example.
     public static void run(String args[], Test t) throws Exception {
         int numSetOfChildVMOptions = vmOptionCombos.length;
         for (int i=0; i< numSetOfChildVMOptions; i++) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java b/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
deleted file mode 100644
index 20dbad30441..00000000000
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/*
- * @test
- * @summary White box test for shared strings
- * @requires vm.cds.write.mapped.java.heap
- * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
- * @build jdk.test.whitebox.WhiteBox SharedStringsWb
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run driver SharedStringsWbTest
- */
-
-// This test requires the vm.cds.write.mapped.java.heap specifically as it has expectations
-// about using the mechanism for dumping the entire string table, which the streaming solution
-// does not do.
-
-import java.io.*;
-import jdk.test.whitebox.WhiteBox;
-
-public class SharedStringsWbTest {
-    public static void main(String[] args) throws Exception {
-        SharedStringsUtils.run(args, SharedStringsWbTest::test);
-    }
-
-    public static void test(String[] args) throws Exception {
-        SharedStringsUtils.buildJarAndWhiteBox("SharedStringsWb");
-
-        SharedStringsUtils.dumpWithWhiteBox(TestCommon.list("SharedStringsWb"),
-            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
-
-        SharedStringsUtils.runWithArchiveAndWhiteBox("SharedStringsWb");
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE78_A.java b/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE78_A.java
index e0491b4b89f..0684ad1aacc 100644
--- a/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE78_A.java
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE78_A.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 by SAP AG, Walldorf, Germany.
+ * Copyright (c) 2018, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE_Loader2.java b/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE_Loader2.java
index 373ee584679..d13e5e5d3c1 100644
--- a/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE_Loader2.java
+++ b/test/hotspot/jtreg/runtime/exceptionMsgs/IllegalAccessError/IAE_Loader2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 by SAP AG, Walldorf, Germany.
+ * Copyright (c) 2018, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/execstack/Test.java b/test/hotspot/jtreg/runtime/execstack/Test.java
index 67891a523aa..22063a56dd5 100644
--- a/test/hotspot/jtreg/runtime/execstack/Test.java
+++ b/test/hotspot/jtreg/runtime/execstack/Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/execstack/TestMT.java b/test/hotspot/jtreg/runtime/execstack/TestMT.java
index 0be1a461c0a..282b09f9a35 100644
--- a/test/hotspot/jtreg/runtime/execstack/TestMT.java
+++ b/test/hotspot/jtreg/runtime/execstack/TestMT.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/execstack/libtest-rw.c b/test/hotspot/jtreg/runtime/execstack/libtest-rw.c
index 7ad4b95d25e..52e1e8328a1 100644
--- a/test/hotspot/jtreg/runtime/execstack/libtest-rw.c
+++ b/test/hotspot/jtreg/runtime/execstack/libtest-rw.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/execstack/libtest-rwx.c b/test/hotspot/jtreg/runtime/execstack/libtest-rwx.c
index bce4f853106..e0d8e424809 100644
--- a/test/hotspot/jtreg/runtime/execstack/libtest-rwx.c
+++ b/test/hotspot/jtreg/runtime/execstack/libtest-rwx.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * Copyright (c) 2011, 2026 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/hotspot/jtreg/runtime/interpreter/CoherentBytecodeTraceTest.java b/test/hotspot/jtreg/runtime/interpreter/CoherentBytecodeTraceTest.java
new file mode 100644
index 00000000000..e0fb8cf98ec
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/interpreter/CoherentBytecodeTraceTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8370044
+ * @library / /test/lib
+ * @summary Ensures that individual bytecodes are not broken apart.
+ * @requires vm.debug == true & vm.flagless
+ * @run driver CoherentBytecodeTraceTest
+ */
+
+import module java.base;
+
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.*;
+
+public class CoherentBytecodeTraceTest {
+    private static final int NUM_THREADS = 3;
+    private static final String THE_METHOD = "<CoherentBytecodeTraceTest$Strategy.foo(I)V>";
+
+    public static void main(String[] args)
+            throws InterruptedException, IOException {
+        if (args.length == 1 && "worker".equals(args[0])) {
+            schedule();
+            return;
+        }
+        // Create a VM process and trace its bytecodes.
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
+            "-XX:+TraceBytecodes",
+            // Make sure that work() is not compiled. If there is no compiler,
+            // the flag is still accepted.
+            "-XX:CompileCommand=exclude,CoherentBytecodeTraceTest.work",
+            CoherentBytecodeTraceTest.class.getName(), "worker"
+        );
+        OutputAnalyzer oa = new OutputAnalyzer(pb.start()).shouldHaveExitValue(0);
+        analyze(oa.stdoutAsLines());
+    }
+
+    private static void schedule() throws InterruptedException {
+        Thread[] threads =
+            IntStream.range(0, NUM_THREADS)
+                     .mapToObj(i -> {
+                         Thread thread = new Thread(
+                             CoherentBytecodeTraceTest::work
+                         );
+                         thread.start();
+                         return thread;
+                     })
+                     .toArray(Thread[]::new);
+        for (Thread thread : threads) {
+            thread.join();
+        }
+    }
+
+    // The analysis works by finding the invokeinterface bytecode when calling
+    // Strategy.foo. The trace should look something like the following:
+    // invokeinterface 116 <CoherentBytecodeTraceTest$Strategy.foo(I)V>
+    // The strategy is to find CoherentBytecodeTraceTest$Strategy.foo's index
+    // and then ensure the constant pool ref and opcode before are correct.
+    // This requires going through the file line-by-line.
+    private static void analyze(List<String> lines) {
+        IO.println("Analyzing " + lines.size() + " lines");
+        boolean foundAtLeastOne = false;
+        // Reverse regex for: 'invokeinterface \d+ '. This is needed to look
+        // back from the interface name to ensure that the thing that
+        // preceeds it is an invokeinterface with a constant pool reference.
+        // Use 'XXXX' to denote where we want to put \d+ or else it will get
+        // reversed and lose its semantics.
+        String searchRegex = reverseString("invokeinterface XXXX ")
+                                 .replace("XXXX", "\\d+");
+        Pattern reverseFirstPart = Pattern.compile(searchRegex);
+        for (String line : lines) {
+            int fooCallIndex = line.indexOf(THE_METHOD);
+            if (fooCallIndex == -1) {
+                continue;
+            }
+            String untilFooCall = line.substring(0, fooCallIndex);
+            String beginningReverse = reverseString(untilFooCall);
+            // Use a Scanner to do a match for "invokeinterface XXXX "
+            // immediately before the constant pool reference.
+            Scanner scanner = new Scanner(beginningReverse);
+            // Scanner#hasNext would use the next token given by whitespace,
+            // but whitespace is part of the pattern. Use horizon instead, if
+            // this is null, then there is no match.
+            if (scanner.findWithinHorizon(reverseFirstPart, 0) == null) {
+                IO.println("Using regex: " + reverseFirstPart);
+                IO.println("Regex rejected: " + beginningReverse);
+                throw new RuntimeException(
+                    "torn bytecode trace: " + line
+                );
+            }
+            foundAtLeastOne = true;
+        }
+        // If there are no invokeinterface calls then something went wrong
+        // and the test probably needs to be updated.
+        if (!foundAtLeastOne) {
+            throw new RuntimeException(
+                "sanity failure: no invokeinterface found for " + THE_METHOD
+            );
+        }
+    }
+
+    // Performs some random work.
+    // The goal is to have this emit some bytecodes that contain other bytes.
+    public static void work() {
+        int x = 10;
+        int y = 30;
+        int sum = 123;
+        for (int i = 0; i < 10_000; i++) {
+            if (i == x) {
+                int modulo = y % i;
+                sum ^= modulo;
+            } else {
+                Strategy[] arr = new Strategy[] { new Outer(new Object()) };
+                arr[0].foo(i);
+                x = y - sum;
+            }
+        }
+    }
+
+    private static String reverseString(String input) {
+        return new StringBuilder(input).reverse().toString();
+    }
+
+    private record Outer(Object inner) implements Strategy {
+        @Override
+        public void foo(int i) {
+            if (i % 1000 == 0) {
+                IO.println("foo" + i);
+            }
+        }
+    }
+
+    public interface Strategy {
+        void foo(int i);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/os/TestHugePageDecisionsAtVMStartup.java b/test/hotspot/jtreg/runtime/os/TestHugePageDecisionsAtVMStartup.java
index 7c0dfb2f3bb..6c5896df058 100644
--- a/test/hotspot/jtreg/runtime/os/TestHugePageDecisionsAtVMStartup.java
+++ b/test/hotspot/jtreg/runtime/os/TestHugePageDecisionsAtVMStartup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, 2024, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
  * @test id=Default
  * @summary Test JVM large page setup (default options)
  * @library /test/lib
+ * @requires vm.flagless
  * @requires os.family == "linux"
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -36,6 +37,7 @@
  * @test id=LP_enabled
  * @summary Test JVM large page setup (+LP)
  * @library /test/lib
+ * @requires vm.flagless
  * @requires os.family == "linux"
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -46,6 +48,7 @@
  * @test id=THP_enabled
  * @summary Test JVM large page setup (+THP)
  * @library /test/lib
+ * @requires vm.flagless
  * @requires os.family == "linux"
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
diff --git a/test/hotspot/jtreg/runtime/os/TestMemoryAllocationLogging.java b/test/hotspot/jtreg/runtime/os/TestMemoryAllocationLogging.java
index 9f4f4baeead..60f6d29f16d 100644
--- a/test/hotspot/jtreg/runtime/os/TestMemoryAllocationLogging.java
+++ b/test/hotspot/jtreg/runtime/os/TestMemoryAllocationLogging.java
@@ -157,7 +157,7 @@ public class TestMemoryAllocationLogging {
                 expectedLogs = new String[] {
                         /* Debug level log */
                         String.format("Reserved \\[0x.* - 0x.*\\), \\(%d bytes\\)", PAGE_SIZE),
-                        "Failed to uncommit \\[0x.* - 0x.*\\), \\(.* bytes\\)",
+                        "fatal error: Failed to uncommit \\[0x.* - 0x.*\\), \\(.* bytes\\).*",
                         /* Trace level log */
                         "mmap failed: \\[0x.* - 0x.*\\), \\(.* bytes\\) errno=\\(Invalid argument\\)"
                 };
diff --git a/test/hotspot/jtreg/runtime/os/TestTrimNativeHeapIntervalTablesCleanup.java b/test/hotspot/jtreg/runtime/os/TestTrimNativeHeapIntervalTablesCleanup.java
new file mode 100644
index 00000000000..3ced98b616d
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/os/TestTrimNativeHeapIntervalTablesCleanup.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /**
+ * @test
+ * @bug 8375125
+ * @summary Trigger StringTable::clean_dead_entries or SymbolTable::clean_dead_entries
+ *          with -XX:TrimNativeHeapInterval enabled,should not violate lock ordering.
+ * @requires vm.debug
+ * @requires vm.gc != "Epsilon"
+ * @library /test/lib
+ * @modules java.compiler
+ * @run main/othervm -Xms128m -Xmx128m
+ *                   -XX:TrimNativeHeapInterval=300000
+ *                   TestTrimNativeHeapIntervalTablesCleanup string
+ * @run main/othervm -Xms128m -Xmx128m
+ *                   -XX:TrimNativeHeapInterval=300000
+ *                   TestTrimNativeHeapIntervalTablesCleanup symbol
+ */
+
+import java.util.LinkedList;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+
+public class TestTrimNativeHeapIntervalTablesCleanup {
+
+    public static void main(String[] args) throws Exception{
+        if (args.length != 1) {
+            throw new IllegalArgumentException("Expected 1 argument: string|symbol");
+        }
+        switch (args[0]) {
+            case "string":
+                testStringTableCleanup();
+                break;
+            case "symbol":
+                testSymbolTableCleanup();
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown mode: " + args[0]);
+        }
+        System.out.println("passed: " + args[0]);
+    }
+
+    static void testStringTableCleanup() throws Exception{
+        final int rounds = 30;
+        final int maxSize = 200_000;
+        final int pruneEvery = 50_000;
+        final int pruneCount = 25_000;
+        long stringNum = 0;
+
+        for (int round = 0; round < rounds; round++) {
+            LinkedList<String> list = new LinkedList<>();
+            for (int i = 0; i < maxSize; i++, stringNum++) {
+                if (i != 0 && (i % pruneEvery) == 0) {
+                    int toRemove = Math.min(pruneCount, list.size());
+                    list.subList(0, toRemove).clear();
+                }
+                list.push(Long.toString(stringNum).intern());
+            }
+            System.gc();
+            Thread.sleep(1000);
+        }
+    }
+
+    static void testSymbolTableCleanup() throws Exception {
+        final int rounds = 10;
+        final int classesPerRound = 100;
+
+        for (int r = 0; r < rounds; r++) {
+            for (int i = 0; i < classesPerRound; i++) {
+                String cn = "C" + r + "_" + i;
+                byte[] bytes = InMemoryJavaCompiler.compile(
+                               cn,
+                               "public class " + cn + " { int m" + i + "() { return " + i + "; } }"
+                               );
+                new ClassLoader(null) {
+                    @Override
+                    protected Class<?> findClass(String name) throws ClassNotFoundException {
+                        if (!name.equals(cn)) throw new ClassNotFoundException(name);
+                        return defineClass(name, bytes, 0, bytes.length);
+                    }
+                }.loadClass(cn).getDeclaredConstructor().newInstance();
+            }
+            System.gc();
+            Thread.sleep(1000);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/hotspot/jtreg/runtime/os/TestWXHealing.java b/test/hotspot/jtreg/runtime/os/TestWXHealing.java
new file mode 100644
index 00000000000..1ed2caf2433
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/os/TestWXHealing.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test id=TraceWXHealing
+ * @summary Run shell with -XX:+StressWXHealing and -XX:+TraceWXHealing. This tests most of
+ * the triggers for WX mode.
+ * @requires os.family == "mac"
+ * @requires os.arch == "aarch64"
+ * @requires vm.debug == true
+ * @library /test/lib
+ * @compile WXHealing.java
+ * @build jtreg.SkippedException
+ * @run main TestWXHealing traceWXHealing
+ */
+
+/*
+ * @test id=No-TraceWXHealing
+ * @summary Run shell with -XX:+StressWXHealing. This tests most of
+ * the triggers for WX mode.
+ * @requires os.family == "mac"
+ * @requires os.arch == "aarch64"
+ * @library /test/lib
+ * @compile WXHealing.java
+ * @build jtreg.SkippedException
+ * @run main TestWXHealing
+ */
+import java.util.regex.*;
+import jdk.test.lib.process.*;
+import jtreg.SkippedException;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+public class TestWXHealing {
+
+    public static void main(String[] args) throws Throwable {
+        String[] opts;
+        boolean traceWXHealing = args.length > 0 && args[0].equals("traceWXHealing");
+        // pass -XX:+TraceWXHealing only when instructed to do so
+        if (traceWXHealing) {
+            opts = new String[]{
+                    "-XX:+UnlockDiagnosticVMOptions",
+                    "-XX:+TraceWXHealing",
+                    "-XX:+StressWXHealing",
+                    "WXHealing"
+            };
+        } else {
+            opts = new String[]{
+                    "-XX:+UnlockDiagnosticVMOptions",
+                    "-XX:+StressWXHealing",
+                    "WXHealing"
+            };
+        }
+        var process = ProcessTools.createTestJavaProcessBuilder(opts).start();
+        OutputAnalyzer oa = new OutputAnalyzer(process, UTF_8);
+        oa.shouldHaveExitValue(0);
+        String output = oa.getStdout();
+        System.out.println("output from WXHealing application: " + output);
+        if (output.isEmpty()) {
+            throw new RuntimeException("no output generated by WXHealing application");
+        }
+        if (!traceWXHealing) {
+            // if -XX:+TraceWXHealing wasn't enabled, then this test merely
+            // verifies that the java application launched with -XX:+StressWXHealing
+            // exited normally.
+            return;
+        }
+        // verify the output generated by -XX:+TraceWXHealing
+        if (output.contains("MAP_JIT write protection does not work on this system")) {
+            throw new SkippedException("Test was not run because MAP_JIT write protection does not work on this system");
+        } else {
+            var pattern = Pattern.compile("Healing WXMode WXArmedForWrite at 0x[0-9a-f]* to WXWrite  ");
+            var matches = pattern.matcher(output).results().count();
+            if (matches < 10) {
+                throw new RuntimeException("Only " + matches + " healings in\n" + output);
+            }
+        }
+    }
+}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java b/test/hotspot/jtreg/runtime/os/WXHealing.java
similarity index 53%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java
rename to test/hotspot/jtreg/runtime/os/WXHealing.java
index 992d86a02ec..eb5c5ad7b4b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArgInfoData.java
+++ b/test/hotspot/jtreg/runtime/os/WXHealing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025 IBM Corporation. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,38 +19,34 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
-package sun.jvm.hotspot.oops;
-
 import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
+import java.util.HashMap;
 
-public class ArgInfoData extends ArrayData {
+import jdk.jshell.tool.*;
 
-  public ArgInfoData(DataLayout layout) {
-    super(layout);
-  }
+public class WXHealing {
 
-  int numberOfArgs() {
-    return arrayLen();
-  }
-
-  int argModified(int arg) {
-    return arrayUintAt(arg);
-  }
-
-  public void printDataOn(PrintStream st) {
-    printShared(st, "ArgInfoData");
-    int nargs = numberOfArgs();
-    for (int i = 0; i < nargs; i++) {
-      st.print("  0x" + Integer.toHexString(argModified(i)));
+    // There's nothing special about jshell here: we just need an
+    // application that does a lot of compilation and class loading.
+    public static void main(String[] args) throws Throwable {
+        JavaShellToolBuilder
+            .builder()
+            // we don't need system level history/storage for this test
+            .persistence(new HashMap<>())
+            .in(new ByteArrayInputStream
+                ("""
+                 void main() {
+                     System.out.println("Hello, World!");
+                 }
+                 main()
+                 2+2
+                 Math.sqrt(2)
+                 4 * Math.atan(1)
+                 Math.exp(1)
+                 """
+                 .getBytes()), null)
+            .start();
     }
-    st.println();
-  }
 }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java b/test/hotspot/jtreg/serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java
index 10888dce1b4..5b4a1c7e663 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java
@@ -29,7 +29,8 @@
  *           vm.gc != "Epsilon" &
  *           vm.flavor == "server" &
  *           !vm.emulatedClient &
- *           (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
+ *           (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4) &
+ *           vm.compMode == "Xmixed"
  * @library /test/lib /test/hotspot/jtreg
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java
index fa6bf0b98d4..340207071e0 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineVerifyError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6402717 8330606
+ * @bug 6402717 8330606 8376295
  * @summary Redefine VerifyError to get a VerifyError should not throw SOE
  * @requires vm.jvmti
  * @library /test/lib
@@ -33,10 +33,18 @@
  *          java.instrument
  *          jdk.jartool/sun.tools.jar
  * @run main RedefineClassHelper
+ *
  * @run main/othervm/timeout=180
  *         -javaagent:redefineagent.jar
  *         -Xlog:class+init,exceptions
  *         RedefineVerifyError
+ *
+ * @run main/othervm/timeout=180
+ *         -javaagent:redefineagent.jar
+ *         -Xlog:class+init,exceptions
+ *         -XX:+UnlockDiagnosticVMOptions
+ *         -XX:-BytecodeVerificationRemote
+ *         RedefineVerifyError
  */
 
 import org.objectweb.asm.AnnotationVisitor;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWait.java b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWait.java
deleted file mode 100644
index 3a747a3e86b..00000000000
--- a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWait.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4413752 8262881
- * @summary Test SuspendThread with ObjectMonitor wait.
- * @requires vm.jvmti
- * @library /test/lib
- * @compile SuspendWithObjectMonitorWait.java
- * @run main/othervm/native -agentlib:SuspendWithObjectMonitorWait SuspendWithObjectMonitorWait
- */
-
-import java.io.PrintStream;
-
-//
-// main               waiter              resumer
-// =================  ==================  ===================
-// launch waiter
-// <launch returns>   waiter running
-// launch resumer     enter threadLock
-// <launch returns>   threadLock.wait()   resumer running
-// enter threadLock   :                   wait for notify
-// threadLock.notify  wait finishes       :
-// :                  reenter blocks      :
-// suspend waiter     <suspended>         :
-// exit threadLock    :                   :
-// <ready to test>    :                   :
-// :                  :                   :
-// notify resumer     :                   wait finishes
-// join resumer       :                   enter threadLock
-// :                  <resumed>           resume waiter
-// :                  :                   exit threadLock
-// :                  reenter threadLock  :
-// <join returns>     :                   resumer exits
-// join waiter        :
-// <join returns>     waiter exits
-//
-
-public class SuspendWithObjectMonitorWait {
-    private static final String AGENT_LIB = "SuspendWithObjectMonitorWait";
-    private static final int exit_delta   = 95;
-
-    private static final int DEF_TIME_MAX = 60;    // default max # secs to test
-    private static final int JOIN_MAX     = 30;    // max # secs to wait for join
-
-    public static final int TS_INIT            = 1;  // initial testState
-    public static final int TS_WAITER_RUNNING  = 2;  // waiter is running
-    public static final int TS_RESUMER_RUNNING = 3;  // resumer is running
-    public static final int TS_READY_TO_NOTIFY = 4;  // ready to notify threadLock
-    public static final int TS_CALL_SUSPEND    = 5;  // call suspend on contender
-    public static final int TS_READY_TO_RESUME = 6;  // ready to resume waiter
-    public static final int TS_CALL_RESUME     = 7;  // call resume on waiter
-    public static final int TS_WAITER_DONE     = 8;  // waiter has run; done
-
-    public static Object barrierLaunch = new Object();   // controls thread launch
-    public static Object barrierResumer = new Object();  // controls resumer
-    public static Object threadLock = new Object();      // testing object
-
-    public static long count = 0;
-    public static boolean printDebug = false;
-    public volatile static int testState;
-
-    private static void log(String msg) { System.out.println(msg); }
-
-    native static int suspendThread(SuspendWithObjectMonitorWaitWorker thr);
-    native static int wait4ContendedEnter(SuspendWithObjectMonitorWaitWorker thr);
-
-    public static void main(String[] args) throws Exception {
-        try {
-            System.loadLibrary(AGENT_LIB);
-            log("Loaded library: " + AGENT_LIB);
-        } catch (UnsatisfiedLinkError ule) {
-            log("Failed to load library: " + AGENT_LIB);
-            log("java.library.path: " + System.getProperty("java.library.path"));
-            throw ule;
-        }
-
-        int timeMax = 0;
-        if (args.length == 0) {
-            timeMax = DEF_TIME_MAX;
-        } else {
-            int argIndex = 0;
-            int argsLeft = args.length;
-            if (args[0].equals("-p")) {
-                printDebug = true;
-                argIndex = 1;
-                argsLeft--;
-            }
-            if (argsLeft == 0) {
-                timeMax = DEF_TIME_MAX;
-            } else if (argsLeft == 1) {
-                try {
-                    timeMax = Integer.parseUnsignedInt(args[argIndex]);
-                } catch (NumberFormatException nfe) {
-                    System.err.println("'" + args[argIndex] +
-                                       "': invalid timeMax value.");
-                    usage();
-                }
-            } else {
-                usage();
-            }
-        }
-
-        System.exit(run(timeMax, System.out) + exit_delta);
-    }
-
-    public static void logDebug(String mesg) {
-        if (printDebug) {
-            System.err.println(Thread.currentThread().getName() + ": " + mesg);
-        }
-    }
-
-    public static void usage() {
-        System.err.println("Usage: " + AGENT_LIB + " [-p][time_max]");
-        System.err.println("where:");
-        System.err.println("    -p       ::= print debug info");
-        System.err.println("    time_max ::= max looping time in seconds");
-        System.err.println("                 (default is " + DEF_TIME_MAX +
-                           " seconds)");
-        System.exit(1);
-    }
-
-    public static int run(int timeMax, PrintStream out) {
-        return (new SuspendWithObjectMonitorWait()).doWork(timeMax, out);
-    }
-
-    public static void checkTestState(int exp) {
-        if (testState != exp) {
-            System.err.println("Failure at " + count + " loops.");
-            throw new InternalError("Unexpected test state value: "
-                + "expected=" + exp + " actual=" + testState);
-        }
-    }
-
-    public int doWork(int timeMax, PrintStream out) {
-        SuspendWithObjectMonitorWaitWorker waiter;    // waiter thread
-        SuspendWithObjectMonitorWaitWorker resumer;    // resumer thread
-
-        System.out.println("About to execute for " + timeMax + " seconds.");
-
-        long start_time = System.currentTimeMillis();
-        while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
-            count++;
-            testState = TS_INIT;  // starting the test loop
-
-            // launch the waiter thread
-            synchronized (barrierLaunch) {
-                waiter = new SuspendWithObjectMonitorWaitWorker("waiter");
-                waiter.start();
-
-                while (testState != TS_WAITER_RUNNING) {
-                    try {
-                        barrierLaunch.wait(0);  // wait until it is running
-                    } catch (InterruptedException ex) {
-                    }
-                }
-            }
-
-            // launch the resumer thread
-            synchronized (barrierLaunch) {
-                resumer = new SuspendWithObjectMonitorWaitWorker("resumer", waiter);
-                resumer.start();
-
-                while (testState != TS_RESUMER_RUNNING) {
-                    try {
-                        barrierLaunch.wait(0);  // wait until it is running
-                    } catch (InterruptedException ex) {
-                    }
-                }
-            }
-
-            checkTestState(TS_RESUMER_RUNNING);
-
-            // The waiter thread was synchronized on threadLock before it
-            // set TS_WAITER_RUNNING and notified barrierLaunch above so
-            // we cannot enter threadLock until the waiter thread calls
-            // threadLock.wait().
-            synchronized (threadLock) {
-                // notify waiter thread so it can try to reenter threadLock
-                testState = TS_READY_TO_NOTIFY;
-                threadLock.notify();
-
-                // wait for the waiter thread to block
-                logDebug("before contended enter wait");
-                int retCode = wait4ContendedEnter(waiter);
-                if (retCode != 0) {
-                    throw new RuntimeException("error in JVMTI GetThreadState: "
-                                               + "retCode=" + retCode);
-                }
-                logDebug("done contended enter wait");
-
-                checkTestState(TS_READY_TO_NOTIFY);
-                testState = TS_CALL_SUSPEND;
-                logDebug("before suspend thread");
-                retCode = suspendThread(waiter);
-                if (retCode != 0) {
-                    throw new RuntimeException("error in JVMTI SuspendThread: "
-                                               + "retCode=" + retCode);
-                }
-                logDebug("suspended thread");
-            }
-
-            //
-            // At this point, all of the child threads are running
-            // and we can get to meat of the test:
-            //
-            // - suspended threadLock waiter (trying to reenter)
-            // - a threadLock enter in the resumer thread
-            // - resumption of the waiter thread
-            // - a threadLock enter in the freshly resumed waiter thread
-            //
-
-            synchronized (barrierResumer) {
-                checkTestState(TS_CALL_SUSPEND);
-
-                // tell resumer thread to resume waiter thread
-                testState = TS_READY_TO_RESUME;
-                barrierResumer.notify();
-
-                // Can't call checkTestState() here because the
-                // resumer thread may have already resumed the
-                // waiter thread.
-            }
-
-            try {
-                resumer.join(JOIN_MAX * 1000);
-                if (resumer.isAlive()) {
-                    System.err.println("Failure at " + count + " loops.");
-                    throw new InternalError("resumer thread is stuck");
-                }
-                waiter.join(JOIN_MAX * 1000);
-                if (waiter.isAlive()) {
-                    System.err.println("Failure at " + count + " loops.");
-                    throw new InternalError("waiter thread is stuck");
-                }
-            } catch (InterruptedException ex) {
-            }
-
-            checkTestState(TS_WAITER_DONE);
-        }
-
-        System.out.println("Executed " + count + " loops in " + timeMax +
-                           " seconds.");
-
-        return 0;
-    }
-}
-
-class SuspendWithObjectMonitorWaitWorker extends Thread {
-    private SuspendWithObjectMonitorWaitWorker target;  // target for resume operation
-
-    public SuspendWithObjectMonitorWaitWorker(String name) {
-        super(name);
-    }
-
-    public SuspendWithObjectMonitorWaitWorker(String name, SuspendWithObjectMonitorWaitWorker target) {
-        super(name);
-        this.target = target;
-    }
-
-    native static int resumeThread(SuspendWithObjectMonitorWaitWorker thr);
-
-    public void run() {
-        SuspendWithObjectMonitorWait.logDebug("thread running");
-
-        //
-        // Launch the waiter thread:
-        // - grab the threadLock
-        // - threadLock.wait()
-        // - releases threadLock
-        //
-        if (getName().equals("waiter")) {
-            // grab threadLock before we tell main we are running
-            SuspendWithObjectMonitorWait.logDebug("before enter threadLock");
-            synchronized(SuspendWithObjectMonitorWait.threadLock) {
-                SuspendWithObjectMonitorWait.logDebug("enter threadLock");
-
-                SuspendWithObjectMonitorWait.checkTestState(SuspendWithObjectMonitorWait.TS_INIT);
-
-                synchronized(SuspendWithObjectMonitorWait.barrierLaunch) {
-                    // tell main we are running
-                    SuspendWithObjectMonitorWait.testState = SuspendWithObjectMonitorWait.TS_WAITER_RUNNING;
-                    SuspendWithObjectMonitorWait.barrierLaunch.notify();
-                }
-
-                SuspendWithObjectMonitorWait.logDebug("before wait");
-
-                // TS_READY_TO_NOTIFY is set after the main thread has
-                // entered threadLock so a spurious wakeup can't get the
-                // waiter thread out of this threadLock.wait(0) call:
-                while (SuspendWithObjectMonitorWait.testState <= SuspendWithObjectMonitorWait.TS_READY_TO_NOTIFY) {
-                    try {
-                        SuspendWithObjectMonitorWait.threadLock.wait(0);
-                    } catch (InterruptedException ex) {
-                    }
-                }
-
-                SuspendWithObjectMonitorWait.logDebug("after wait");
-
-                SuspendWithObjectMonitorWait.checkTestState(SuspendWithObjectMonitorWait.TS_CALL_RESUME);
-                SuspendWithObjectMonitorWait.testState = SuspendWithObjectMonitorWait.TS_WAITER_DONE;
-
-                SuspendWithObjectMonitorWait.logDebug("exit threadLock");
-            }
-        }
-        //
-        // Launch the resumer thread:
-        // - tries to grab the threadLock (should not block!)
-        // - grabs threadLock
-        // - resumes the waiter thread
-        // - releases threadLock
-        //
-        else if (getName().equals("resumer")) {
-            synchronized(SuspendWithObjectMonitorWait.barrierResumer) {
-                synchronized(SuspendWithObjectMonitorWait.barrierLaunch) {
-                    // tell main we are running
-                    SuspendWithObjectMonitorWait.testState = SuspendWithObjectMonitorWait.TS_RESUMER_RUNNING;
-                    SuspendWithObjectMonitorWait.barrierLaunch.notify();
-                }
-                SuspendWithObjectMonitorWait.logDebug("thread waiting");
-                while (SuspendWithObjectMonitorWait.testState != SuspendWithObjectMonitorWait.TS_READY_TO_RESUME) {
-                    try {
-                        // wait for main to tell us when to continue
-                        SuspendWithObjectMonitorWait.barrierResumer.wait(0);
-                    } catch (InterruptedException ex) {
-                    }
-                }
-            }
-
-            SuspendWithObjectMonitorWait.logDebug("before enter threadLock");
-            synchronized(SuspendWithObjectMonitorWait.threadLock) {
-                SuspendWithObjectMonitorWait.logDebug("enter threadLock");
-
-                SuspendWithObjectMonitorWait.checkTestState(SuspendWithObjectMonitorWait.TS_READY_TO_RESUME);
-                SuspendWithObjectMonitorWait.testState = SuspendWithObjectMonitorWait.TS_CALL_RESUME;
-
-                // resume the waiter thread so waiter.join() can work
-                SuspendWithObjectMonitorWait.logDebug("before resume thread");
-                int retCode = resumeThread(target);
-                if (retCode != 0) {
-                    throw new RuntimeException("error in JVMTI ResumeThread: " +
-                                               "retCode=" + retCode);
-                }
-                SuspendWithObjectMonitorWait.logDebug("resumed thread");
-
-                SuspendWithObjectMonitorWait.logDebug("exit threadLock");
-            }
-        }
-    }
-}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitBase.java b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitBase.java
new file mode 100644
index 00000000000..5443e4005fe
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitBase.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.PrintStream;
+
+public class SuspendWithObjectMonitorWaitBase {
+    protected static final String AGENT_LIB = "SuspendWithObjectMonitorWait";
+    protected static final int exit_delta   = 95;
+
+    protected static final int DEF_TIME_MAX = 60;    // default max # secs to test
+    protected static final int JOIN_MAX     = 30;    // max # secs to wait for join
+
+    public static final int TS_INIT            = 1;  // initial testState
+    public static final int TS_WAITER_RUNNING  = 2;  // waiter is running
+    public static final int TS_RESUMER_RUNNING = 3;  // resumer is running
+    public static final int TS_READY_TO_NOTIFY = 4;  // ready to notify threadLock
+    public static final int TS_CALL_SUSPEND    = 5;  // call suspend on contender
+    public static final int TS_READY_TO_RESUME = 6;  // ready to resume waiter
+    public static final int TS_CALL_RESUME     = 7;  // call resume on waiter
+    public static final int TS_WAITER_DONE     = 8;  // waiter has run; done
+
+    public static Object barrierLaunch = new Object();   // controls thread launch
+    public static Object barrierResumer = new Object();  // controls resumer
+    public static Object threadLock = new Object();      // testing object
+
+    public static long count = 0;
+    public static boolean printDebug = false;
+    public volatile static int testState;
+
+    protected static void log(String msg) { System.out.println(msg); }
+
+    native static int suspendThread(SuspendWithObjectMonitorWaitWorker thr);
+    native static int wait4ContendedEnter(SuspendWithObjectMonitorWaitWorker thr);
+
+    public static void logDebug(String mesg) {
+        if (printDebug) {
+            System.err.println(Thread.currentThread().getName() + ": " + mesg);
+        }
+    }
+
+    public static void usage() {
+        System.err.println("Usage: " + AGENT_LIB + " test_case [-p] [time_max]");
+        System.err.println("where:");
+        System.err.println("    test_case ::= 1 | 2 | 3");
+        System.err.println("    -p        ::= print debug info");
+        System.err.println("    time_max  ::= max looping time in seconds");
+        System.err.println("                  (default is " + DEF_TIME_MAX +
+                " seconds)");
+        System.exit(1);
+    }
+
+    public static void checkTestState(int exp) {
+        if (testState != exp) {
+            System.err.println("Failure at " + count + " loops.");
+            throw new InternalError("Unexpected test state value: "
+                    + "expected=" + exp + " actual=" + testState);
+        }
+    }
+
+    public SuspendWithObjectMonitorWaitWorker launchWaiter(long waitTimeout) {
+        SuspendWithObjectMonitorWaitWorker waiter;
+        // launch the waiter thread
+        synchronized (barrierLaunch) {
+            waiter = new SuspendWithObjectMonitorWaitWorker("waiter", waitTimeout);
+            waiter.start();
+
+            while (testState != TS_WAITER_RUNNING) {
+                try {
+                    barrierLaunch.wait(0);  // wait until it is running
+                } catch (InterruptedException ex) {
+                }
+            }
+        }
+        return waiter;
+    }
+
+    public SuspendWithObjectMonitorWaitWorker launchResumer(SuspendWithObjectMonitorWaitWorker waiter) {
+        SuspendWithObjectMonitorWaitWorker resumer;
+        synchronized (barrierLaunch) {
+            resumer = new SuspendWithObjectMonitorWaitWorker("resumer", waiter);
+            resumer.start();
+
+            while (testState != TS_RESUMER_RUNNING) {
+                try {
+                    barrierLaunch.wait(0);  // wait until it is running
+                } catch (InterruptedException ex) {
+                }
+            }
+        }
+        return resumer;
+    }
+
+    public void barrierResumerNotify() {
+        synchronized (barrierResumer) {
+            checkTestState(TS_CALL_SUSPEND);
+
+            // tell resumer thread to resume waiter thread
+            testState = TS_READY_TO_RESUME;
+            barrierResumer.notify();
+
+            // Can't call checkTestState() here because the
+            // resumer thread may have already resumed the
+            // waiter thread.
+        }
+    }
+
+    public void shutDown(SuspendWithObjectMonitorWaitWorker resumer, SuspendWithObjectMonitorWaitWorker waiter) {
+        try {
+            resumer.join(JOIN_MAX * 1000);
+            if (resumer.isAlive()) {
+                System.err.println("Failure at " + count + " loops.");
+                throw new InternalError("resumer thread is stuck");
+            }
+            waiter.join(JOIN_MAX * 1000);
+            if (waiter.isAlive()) {
+                System.err.println("Failure at " + count + " loops.");
+                throw new InternalError("waiter thread is stuck");
+            }
+        } catch (InterruptedException ex) {
+        }
+    }
+
+    public int run(int timeMax, PrintStream out) {
+        return 0;
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            System.err.println("Invalid number of arguments, there should be at least a test_case given.");
+            usage();
+        }
+
+        if (args.length > 3) {
+            System.err.println("Invalid number of arguments, there are too many arguments.");
+            usage();
+        }
+
+        try {
+            System.loadLibrary(AGENT_LIB);
+            log("Loaded library: " + AGENT_LIB);
+        } catch (UnsatisfiedLinkError ule) {
+            log("Failed to load library: " + AGENT_LIB);
+            log("java.library.path: " + System.getProperty("java.library.path"));
+            throw ule;
+        }
+
+        int testCase = 0;
+        int timeMax = 0;
+        for (int argIndex = 0; argIndex < args.length; argIndex++) {
+            if (args[argIndex].equals("-p")) {
+                // Handle optional -p arg regardless of position.
+                printDebug = true;
+                continue;
+            }
+
+            if (testCase == 0) {
+                try {
+                    // testCase must be the first non-optional arg.
+                    testCase = Integer.parseUnsignedInt(args[argIndex]);
+                    log("testCase = " + testCase);
+                } catch (NumberFormatException nfe) {
+                    System.err.println("'" + args[argIndex] +
+                            "': invalid test_case value.");
+                    usage();
+                }
+                if (testCase < 1 || testCase > 3) {
+                    System.err.println("Invalid test_case value: '" + testCase + "'");
+                    usage();
+                }
+                continue;
+            }
+
+            if (argIndex < args.length) {
+                // timeMax is an optional arg.
+                try {
+                    timeMax = Integer.parseUnsignedInt(args[argIndex]);
+                } catch (NumberFormatException nfe) {
+                    System.err.println("'" + args[argIndex] +
+                            "': invalid time_max value.");
+                    usage();
+                }
+            } else {
+                timeMax = DEF_TIME_MAX;
+            }
+        }
+
+        if (timeMax == 0) {
+            timeMax = DEF_TIME_MAX;
+        }
+        log("timeMax = " + timeMax);
+
+        if (testCase == 0) {
+            // Just -p was given.
+            System.err.println("Invalid number of arguments, no test_case given.");
+            usage();
+        }
+
+        SuspendWithObjectMonitorWaitBase test = null;
+        switch (testCase) {
+            case 1:
+                test = new SuspendWithObjectMonitorWaitDefault();
+                break;
+            case 2:
+                test = new SuspendWithObjectMonitorWaitReentryPartFirst();
+                break;
+            case 3:
+                test = new SuspendWithObjectMonitorWaitReentryPartSecond();
+                break;
+            default:
+                // Impossible
+                break;
+        }
+        int result = test.run(timeMax, System.out);
+        System.exit(result + exit_delta);
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitDefault.java b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitDefault.java
new file mode 100644
index 00000000000..b2c1f108de5
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitDefault.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4413752 8262881
+ * @summary Test SuspendThread with ObjectMonitor wait.
+ * @requires vm.jvmti
+ * @library /test/lib
+ * @compile SuspendWithObjectMonitorWaitDefault.java
+ * @run main/othervm/native -agentlib:SuspendWithObjectMonitorWait SuspendWithObjectMonitorWaitDefault 1
+ */
+
+import java.io.PrintStream;
+
+//
+// SuspendWithObjectMonitorWaitDefault algorithm:
+//
+// main               waiter              resumer
+// =================  ==================  ===================
+// launch waiter
+// <launch returns>   waiter running
+// launch resumer     enter threadLock
+// <launch returns>   threadLock.wait()   resumer running
+// enter threadLock   :                   wait for notify
+// threadLock.notify  wait finishes       :
+// :                  reenter blocks      :
+// suspend waiter     <suspended>         :
+// exit threadLock    :                   :
+// <ready to test>    :                   :
+// :                  :                   :
+// notify resumer     :                   wait finishes
+// join resumer       :                   enter threadLock
+// :                  <resumed>           resume waiter
+// :                  :                   exit threadLock
+// :                  reenter threadLock  :
+// <join returns>     :                   resumer exits
+// join waiter        :
+// <join returns>     waiter exits
+//
+
+public class SuspendWithObjectMonitorWaitDefault extends SuspendWithObjectMonitorWaitBase {
+
+    @Override
+    public int run(int timeMax, PrintStream out) {
+        return doWork1(timeMax, out);
+    }
+
+    // Default scenario, the resumer thread is always able to grab the threadLock once notified by the main thread.
+    public int doWork1(int timeMax, PrintStream out) {
+        SuspendWithObjectMonitorWaitWorker waiter;    // waiter thread
+        SuspendWithObjectMonitorWaitWorker resumer;   // resumer thread
+
+        System.out.println("Test 1: About to execute for " + timeMax + " seconds.");
+
+        long start_time = System.currentTimeMillis();
+        while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
+            count++;
+            testState = TS_INIT;  // starting the test loop
+
+            // launch the waiter thread
+            waiter = launchWaiter(0);
+
+            // launch the resumer thread
+            resumer = launchResumer(waiter);
+
+            checkTestState(TS_RESUMER_RUNNING);
+
+            // The waiter thread was synchronized on threadLock before it
+            // set TS_WAITER_RUNNING and notified barrierLaunch above so
+            // we cannot enter threadLock until the waiter thread calls
+            // threadLock.wait().
+            synchronized (threadLock) {
+                // notify waiter thread so it can try to reenter threadLock
+                testState = TS_READY_TO_NOTIFY;
+                threadLock.notify();
+
+                // wait for the waiter thread to block
+                logDebug("before contended enter wait");
+                int retCode = wait4ContendedEnter(waiter);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI GetThreadState: "
+                                               + "retCode=" + retCode);
+                }
+                logDebug("done contended enter wait");
+
+                checkTestState(TS_READY_TO_NOTIFY);
+                testState = TS_CALL_SUSPEND;
+                logDebug("before suspend thread");
+                retCode = suspendThread(waiter);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI SuspendThread: "
+                                               + "retCode=" + retCode);
+                }
+                logDebug("suspended thread");
+            }
+
+            //
+            // At this point, all of the child threads are running
+            // and we can get to meat of the test:
+            //
+            // - suspended threadLock waiter (trying to reenter)
+            // - a threadLock enter in the resumer thread
+            // - resumption of the waiter thread
+            // - a threadLock enter in the freshly resumed waiter thread
+            //
+            barrierResumerNotify();
+
+            shutDown(waiter ,resumer);
+            checkTestState(TS_WAITER_DONE);
+        }
+
+        System.out.println("Executed " + count + " loops in " + timeMax +
+                           " seconds.");
+
+        return 0;
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitReentryPartFirst.java b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitReentryPartFirst.java
new file mode 100644
index 00000000000..b331b338f47
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitReentryPartFirst.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4413752 8262881
+ * @summary Test SuspendThread with ObjectMonitor wait.
+ * @requires vm.jvmti
+ * @library /test/lib
+ * @compile SuspendWithObjectMonitorWaitReentryPartFirst.java
+ * @run main/othervm/native -agentlib:SuspendWithObjectMonitorWait SuspendWithObjectMonitorWaitReentryPartFirst 2
+ */
+
+import java.io.PrintStream;
+
+//
+// SuspendWithObjectMonitorWaitReentryPartFirst algorithm:
+//
+// main               waiter              resumer
+// =================  ==================  ===================
+// launch waiter
+// <launch returns>   waiter running
+// launch resumer     enter threadLock
+// <launch returns>   threadLock.wait()   resumer running
+// enter threadLock   :                   wait for notify
+// threadLock.notify  wait finishes       :
+// :                  reenter blocks      :
+// suspend waiter     <suspended>         :
+// <ready to test>    :                   :
+// :                  :                   :
+// notify resumer     :                   wait finishes
+// delay 1-second     :                   :
+// exit threadLock    :                   :
+// join resumer       :                   enter threadLock
+// :                  <resumed>           resume waiter
+// :                  :                   exit threadLock
+// :                  reenter threadLock  :
+// <join returns>     :                   resumer exits
+// join waiter        :
+// <join returns>     waiter exits
+//
+// Note: The sleep(1-second) in main along with the delayed exit
+//       of threadLock in main forces the resumer thread to reach
+//       "enter threadLock" and block. This difference from the default scenario
+//       forces the resumer thread to be contending for threadLock
+//       while the waiter thread is in threadLock.wait() increasing
+//       stress on the monitor sub-system.
+//
+
+public class SuspendWithObjectMonitorWaitReentryPartFirst extends SuspendWithObjectMonitorWaitBase {
+
+    @Override
+    public int run(int timeMax, PrintStream out) {
+        return doWork2(timeMax, out);
+    }
+
+    // Notify the resumer while holding the threadLock.
+    public int doWork2(int timeMax, PrintStream out) {
+        SuspendWithObjectMonitorWaitWorker waiter;    // waiter thread
+        SuspendWithObjectMonitorWaitWorker resumer;   // resumer thread
+
+        System.out.println("Test 2: About to execute for " + timeMax + " seconds.");
+
+        long start_time = System.currentTimeMillis();
+        while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
+            count++;
+            testState = TS_INIT;  // starting the test loop
+
+            // launch the waiter thread
+            waiter = launchWaiter(0);
+
+            // launch the resumer thread
+            resumer = launchResumer(waiter);
+
+            checkTestState(TS_RESUMER_RUNNING);
+
+            // The waiter thread was synchronized on threadLock before it
+            // set TS_WAITER_RUNNING and notified barrierLaunch above so
+            // we cannot enter threadLock until the waiter thread calls
+            // threadLock.wait().
+            synchronized (threadLock) {
+                // notify waiter thread so it can try to reenter threadLock
+                testState = TS_READY_TO_NOTIFY;
+                threadLock.notify();
+
+                // wait for the waiter thread to block
+                logDebug("before contended enter wait");
+                int retCode = wait4ContendedEnter(waiter);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI GetThreadState: "
+                            + "retCode=" + retCode);
+                }
+                logDebug("done contended enter wait");
+
+                checkTestState(TS_READY_TO_NOTIFY);
+                testState = TS_CALL_SUSPEND;
+                logDebug("before suspend thread");
+                retCode = suspendThread(waiter);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI SuspendThread: "
+                            + "retCode=" + retCode);
+                }
+                logDebug("suspended thread");
+
+                //
+                // At this point, all of the child threads are running
+                // and we can get to meat of the test:
+                //
+                // - suspended threadLock waiter (trying to reenter)
+                // - a blocked threadLock enter in the resumer thread while the
+                //   threadLock is held by the main thread.
+                // - resumption of the waiter thread
+                // - a threadLock enter in the freshly resumed waiter thread
+                //
+                barrierResumerNotify();
+                try {
+                    // Delay for 1-second while holding the threadLock to force the
+                    // resumer thread to block on entering the threadLock.
+                    Thread.sleep(1000);
+                } catch (Exception e) {}
+            }
+
+            shutDown(waiter ,resumer);
+            checkTestState(TS_WAITER_DONE);
+        }
+
+        System.out.println("Executed " + count + " loops in " + timeMax +
+                " seconds.");
+
+        return 0;
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitReentryPartSecond.java b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitReentryPartSecond.java
new file mode 100644
index 00000000000..92ab5a88eb6
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitReentryPartSecond.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4413752 8262881
+ * @summary Test SuspendThread with ObjectMonitor wait.
+ * @requires vm.jvmti
+ * @library /test/lib
+ * @compile SuspendWithObjectMonitorWaitReentryPartSecond.java
+ * @run main/othervm/native -agentlib:SuspendWithObjectMonitorWait SuspendWithObjectMonitorWaitReentryPartSecond 3
+ */
+
+import java.io.PrintStream;
+
+//
+// SuspendWithObjectMonitorWaitReentryPartSecond algorithm:
+//
+// main                 waiter                  resumer
+// ===================  ======================  ===================
+// launch waiter
+// <launch returns>     waiter running
+// launch resumer       enter threadLock
+// <launch returns>     while !READY_TO_NOTIFY  resumer running
+// :                      threadLock.wait(1)    wait for notify
+// enter threadLock     :                       :
+// set READY_TO_NOTIFY  :
+// threadLock.notify    wait finishes           :
+// : delay 200ms        reenter blocks          :
+// suspend waiter       <suspended>             :
+// <ready to test>      :                       :
+// :                    :                       :
+// notify resumer       :                       wait finishes
+// delay 1-second       :                       :
+// exit threadLock      :                       :
+// join resumer         :                       enter threadLock
+// :                    <resumed>               resume waiter
+// :                    :                       exit threadLock
+// :                    reenter threadLock      :
+// <join returns>       :                       resumer exits
+// join waiter          :
+// <join returns>       waiter exits
+//
+// Note: The sleep(1-second) in main along with the delayed exit
+//       of threadLock in main forces the resumer thread to reach
+//       "enter threadLock" and block. This difference from the default scenario
+//       forces the resumer thread to be contending for threadLock
+//       while the waiter thread is in the threadLock.wait(1) tight
+//       loop increasing stress on the monitor sub-system.
+//
+// Note: sleep(200ms) here while holding the threadLock to allow the
+//       waiter thread's timed wait to finish before we attempt to
+//       suspend the waiter thread.
+//
+
+public class SuspendWithObjectMonitorWaitReentryPartSecond extends SuspendWithObjectMonitorWaitBase {
+
+    @Override
+    public int run(int timeMax, PrintStream out) {
+        return doWork3(timeMax, out);
+    }
+
+    // Suspend on the re-entry path of wait.
+    public int doWork3(int timeMax, PrintStream out) {
+        SuspendWithObjectMonitorWaitWorker waiter;    // waiter thread
+        SuspendWithObjectMonitorWaitWorker resumer;   // resumer thread
+
+        System.out.println("Test 3: About to execute for " + timeMax + " seconds.");
+
+        long start_time = System.currentTimeMillis();
+        while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
+            count++;
+            testState = TS_INIT;  // starting the test loop
+
+            // launch the waiter thread
+            waiter = launchWaiter(100);
+
+            // launch the resumer thread
+            resumer = launchResumer(waiter);
+
+            checkTestState(TS_RESUMER_RUNNING);
+
+            // The waiter thread was synchronized on threadLock before it
+            // set TS_WAITER_RUNNING and notified barrierLaunch above so
+            // we cannot enter threadLock until the waiter thread calls
+            // threadLock.wait().
+            synchronized (threadLock) {
+                // notify waiter thread so it can try to reenter threadLock
+                testState = TS_READY_TO_NOTIFY;
+                threadLock.notify();
+
+                try {
+                    Thread.sleep(200);
+                } catch (Exception e) {}
+
+                // wait for the waiter thread to block
+                logDebug("before contended enter wait");
+                int retCode = wait4ContendedEnter(waiter);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI GetThreadState: "
+                            + "retCode=" + retCode);
+                }
+                logDebug("done contended enter wait");
+
+                checkTestState(TS_READY_TO_NOTIFY);
+                testState = TS_CALL_SUSPEND;
+                logDebug("before suspend thread");
+                retCode = suspendThread(waiter);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI SuspendThread: "
+                            + "retCode=" + retCode);
+                }
+                logDebug("suspended thread");
+
+                //
+                // At this point, all of the child threads are running
+                // and we can get to meat of the test:
+                //
+                // - suspended threadLock waiter (trying to reenter)
+                // - a blocked threadLock enter in the resumer thread while the
+                //   threadLock is held by the main thread.
+                // - resumption of the waiter thread
+                // - a threadLock enter in the freshly resumed waiter thread
+                //
+                barrierResumerNotify();
+                try {
+                    // Delay for 1-second while holding the threadLock to force the
+                    // resumer thread to block on entering the threadLock.
+                    Thread.sleep(1000);
+                } catch (Exception e) {}
+            }
+
+            shutDown(waiter ,resumer);
+            checkTestState(TS_WAITER_DONE);
+        }
+
+        System.out.println("Executed " + count + " loops in " + timeMax +
+                " seconds.");
+
+        return 0;
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitWorker.java b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitWorker.java
new file mode 100644
index 00000000000..2bf41168d5a
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/SuspendWithObjectMonitorWaitWorker.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public class SuspendWithObjectMonitorWaitWorker extends Thread {
+    private SuspendWithObjectMonitorWaitWorker target;  // target for resume operation
+    private final long waitTimeout;
+
+    public SuspendWithObjectMonitorWaitWorker(String name, long waitTimeout) {
+        super(name);
+        this.waitTimeout = waitTimeout;
+    }
+
+    public SuspendWithObjectMonitorWaitWorker(String name, SuspendWithObjectMonitorWaitWorker target) {
+        super(name);
+        this.target = target;
+        this.waitTimeout = 0;
+    }
+
+    native static int resumeThread(SuspendWithObjectMonitorWaitWorker thr);
+
+    public void run() {
+        SuspendWithObjectMonitorWaitBase.logDebug("thread running");
+
+        //
+        // Launch the waiter thread:
+        // - grab the threadLock
+        // - threadLock.wait()
+        // - releases threadLock
+        //
+        if (getName().equals("waiter")) {
+            // grab threadLock before we tell main we are running
+            SuspendWithObjectMonitorWaitBase.logDebug("before enter threadLock");
+            synchronized(SuspendWithObjectMonitorWaitBase.threadLock) {
+                SuspendWithObjectMonitorWaitBase.logDebug("enter threadLock");
+
+                SuspendWithObjectMonitorWaitBase.checkTestState(SuspendWithObjectMonitorWaitBase.TS_INIT);
+
+                synchronized(SuspendWithObjectMonitorWaitBase.barrierLaunch) {
+                    // tell main we are running
+                    SuspendWithObjectMonitorWaitBase.testState = SuspendWithObjectMonitorWaitBase.TS_WAITER_RUNNING;
+                    SuspendWithObjectMonitorWaitBase.barrierLaunch.notify();
+                }
+
+                SuspendWithObjectMonitorWaitBase.logDebug("before wait");
+
+                // TS_READY_TO_NOTIFY is set after the main thread has
+                // entered threadLock so a spurious wakeup can't get the
+                // waiter thread out of this threadLock.wait(0) call:
+                while (SuspendWithObjectMonitorWaitBase.testState <= SuspendWithObjectMonitorWaitBase.TS_READY_TO_NOTIFY) {
+                    try {
+                        SuspendWithObjectMonitorWaitBase.threadLock.wait(waitTimeout);
+                    } catch (InterruptedException ex) {
+                    }
+                }
+
+                SuspendWithObjectMonitorWaitBase.logDebug("after wait");
+
+                SuspendWithObjectMonitorWaitBase.checkTestState(SuspendWithObjectMonitorWaitBase.TS_CALL_RESUME);
+                SuspendWithObjectMonitorWaitBase.testState = SuspendWithObjectMonitorWaitBase.TS_WAITER_DONE;
+
+                SuspendWithObjectMonitorWaitBase.logDebug("exit threadLock");
+            }
+        }
+        //
+        // Launch the resumer thread:
+        // - tries to grab the threadLock (should not block with doWork1!)
+        // - grabs threadLock
+        // - resumes the waiter thread
+        // - releases threadLock
+        //
+        else if (getName().equals("resumer")) {
+            synchronized(SuspendWithObjectMonitorWaitBase.barrierResumer) {
+                synchronized(SuspendWithObjectMonitorWaitBase.barrierLaunch) {
+                    // tell main we are running
+                    SuspendWithObjectMonitorWaitBase.testState = SuspendWithObjectMonitorWaitBase.TS_RESUMER_RUNNING;
+                    SuspendWithObjectMonitorWaitBase.barrierLaunch.notify();
+                }
+                SuspendWithObjectMonitorWaitBase.logDebug("thread waiting");
+                while (SuspendWithObjectMonitorWaitBase.testState != SuspendWithObjectMonitorWaitBase.TS_READY_TO_RESUME) {
+                    try {
+                        // wait for main to tell us when to continue
+                        SuspendWithObjectMonitorWaitBase.barrierResumer.wait(0);
+                    } catch (InterruptedException ex) {
+                    }
+                }
+            }
+
+            SuspendWithObjectMonitorWaitBase.logDebug("before enter threadLock");
+            synchronized(SuspendWithObjectMonitorWaitBase.threadLock) {
+                SuspendWithObjectMonitorWaitBase.logDebug("enter threadLock");
+
+                SuspendWithObjectMonitorWaitBase.checkTestState(SuspendWithObjectMonitorWaitBase.TS_READY_TO_RESUME);
+                SuspendWithObjectMonitorWaitBase.testState = SuspendWithObjectMonitorWaitBase.TS_CALL_RESUME;
+
+                // resume the waiter thread so waiter.join() can work
+                SuspendWithObjectMonitorWaitBase.logDebug("before resume thread");
+                int retCode = resumeThread(target);
+                if (retCode != 0) {
+                    throw new RuntimeException("error in JVMTI ResumeThread: " +
+                            "retCode=" + retCode);
+                }
+                SuspendWithObjectMonitorWaitBase.logDebug("resumed thread");
+
+                SuspendWithObjectMonitorWaitBase.logDebug("exit threadLock");
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/libSuspendWithObjectMonitorWait.cpp b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/libSuspendWithObjectMonitorWait.cpp
index 3706cba76dc..bea70c4925f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/libSuspendWithObjectMonitorWait.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithObjectMonitorWait/libSuspendWithObjectMonitorWait.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ static jvmtiEnv* jvmti = nullptr;
   } while (0)
 
 JNIEXPORT int JNICALL
-Java_SuspendWithObjectMonitorWait_suspendThread(JNIEnv *jni, jclass cls, jthread thr) {
+Java_SuspendWithObjectMonitorWaitBase_suspendThread(JNIEnv *jni, jclass cls, jthread thr) {
   return jvmti->SuspendThread(thr);
 }
 
@@ -46,7 +46,7 @@ Java_SuspendWithObjectMonitorWaitWorker_resumeThread(JNIEnv *jni, jclass cls, jt
 }
 
 JNIEXPORT jint JNICALL
-Java_SuspendWithObjectMonitorWait_wait4ContendedEnter(JNIEnv *jni, jclass cls, jthread thr) {
+Java_SuspendWithObjectMonitorWaitBase_wait4ContendedEnter(JNIEnv *jni, jclass cls, jthread thr) {
   jvmtiError err;
   jint thread_state;
   do {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
index b596a5c7ee2..359d4a0b5be 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/SelfSuspendDisablerTest.java
@@ -111,7 +111,7 @@ public class SelfSuspendDisablerTest {
         t3.start();
 
         while(!isSuspended(t3)) {
-            sleep(100);
+            sleep(1);
         }
 
         testJvmtiThreadState(t3, SUSPENDED);
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume3/SuspendResume3.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume3/SuspendResume3.java
new file mode 100644
index 00000000000..fbc9ff2d5b3
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume3/SuspendResume3.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373944
+ * @summary Suspend thread while it's trying to acquire a monitor when unmounted vthreads are in the queue
+ * @requires vm.continuations
+ * @requires vm.jvmti
+ * @library /test/lib /test/hotspot/jtreg/testlibrary
+ * @run main/othervm/native SuspendResume3
+ */
+
+import java.time.Instant;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Phaser;
+
+import jvmti.JVMTIUtils;
+
+public class SuspendResume3 {
+    int iterations;
+    int dummyCounter;
+    Object lock = new Object();
+    Phaser allSync = new Phaser(3);
+
+    SuspendResume3 (int iterations) {
+        this.iterations = iterations;
+    }
+
+    void worker1(Phaser sync1, Phaser sync2) {
+        for (int i = 0; i < iterations; i++) {
+            synchronized (lock) {
+                sync1.arriveAndAwaitAdvance();
+                sync2.arriveAndAwaitAdvance();
+            }
+            allSync.arriveAndAwaitAdvance();
+        }
+    };
+
+    void worker2(Phaser sync1, Phaser sync2) {
+        for (int i = 0; i < iterations; i++) {
+            sync1.arriveAndAwaitAdvance();
+            synchronized (lock) {
+                sync2.arriveAndAwaitAdvance();
+            }
+            allSync.arriveAndAwaitAdvance();
+        }
+    };
+
+    void vthreadWorker(CountDownLatch started) {
+        started.countDown();
+        synchronized (lock) {
+            dummyCounter++;
+        }
+    }
+
+    private void runTest() throws Exception {
+        final Phaser w1Sync1 = new Phaser(2);
+        final Phaser w1Sync2 = new Phaser(2);
+        Thread worker1 = Thread.ofPlatform().start(() -> worker1(w1Sync1, w1Sync2));
+
+        final Phaser w2Sync1 = new Phaser(2);
+        final Phaser w2Sync2 = new Phaser(2);
+        Thread worker2 = Thread.ofPlatform().start(() -> worker2(w2Sync1, w2Sync2));
+
+        for (int i = 0; i < iterations; i++) {
+            // Wait until worker1 acquires monitor
+            w1Sync1.arriveAndAwaitAdvance();
+            // Let worker2 block on monitor
+            w2Sync1.arriveAndAwaitAdvance();
+            await(worker2, Thread.State.BLOCKED);
+
+            // Suspend worker2
+            JVMTIUtils.suspendThread(worker2);
+
+            // Add umounted vthread to _entry_list
+            var started = new CountDownLatch(1);
+            Thread vthread = Thread.ofVirtual().start(() -> vthreadWorker(started));
+            started.await();
+            await(vthread, Thread.State.BLOCKED);
+
+            // Now let worker1 release the monitor picking worker2
+            // as successor. Since worker2 is suspended, it will wake
+            // up, acquire the monitor and release it, unparking the
+            // unmounted thread as next successor.
+            w1Sync2.arriveAndAwaitAdvance();
+
+            // Force safepoint
+            System.gc();
+
+            // Let vthread terminate
+            vthread.join();
+
+            // Resume worker2
+            JVMTIUtils.resumeThread(worker2);
+            w2Sync2.arriveAndAwaitAdvance();
+
+            if ((i % 10) == 0) {
+                System.out.println(Instant.now() + " => " + i + " of " + iterations);
+            }
+            allSync.arriveAndAwaitAdvance();
+        }
+
+        worker1.join();
+        worker2.join();
+    }
+
+    public static void main(String[] args) throws Exception {
+        int iterations = (args.length > 0) ? Integer.parseInt(args[0]) : 100;
+
+        SuspendResume3 obj = new SuspendResume3(iterations);
+        obj.runTest();
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+
+    private static void assertTrue(boolean condition, String msg) {
+        if (!condition) {
+            throw new RuntimeException(msg);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest2/ThreadStateTest2.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest2/ThreadStateTest2.java
new file mode 100644
index 00000000000..ce3f2a5fe40
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest2/ThreadStateTest2.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373366
+ * @summary HandshakeState should disallow suspend ops for disabler threads
+ * @requires vm.continuations
+ * @requires vm.jvmti
+ * @requires vm.compMode != "Xcomp"
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run main/othervm/native -agentlib:ThreadStateTest2 ThreadStateTest2
+ */
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
+import jdk.test.lib.thread.VThreadScheduler;
+
+/* Testing scenario:
+ * Several threads are involved:
+ *  - VT-0: a virtual thread which is interrupt-friendly and constantly interrupted with JVMTI InterruptThread
+ *  - VT-1: a virtual thread which state is constantly checked with JVMTI GetThreadState
+ *  - VT-2: a virtual thread: in a loop calls JVMTI InterruptThread(VT-0) and GetThreadState(VT-1)
+ *  - main: a platform thread: in a loop invokes native method testSuspendResume which suspends and resumes VT-2
+ * The JVMTI functions above install a MountUnmountDisabler for target virtual thread (VT-0 or VT-1).
+ * The goal is to catch VT-2 in an attempt to self-suspend while in a context of MountUnmountDisabler.
+ * This would mean there is a suspend point while VT-2 is in a context of MountUnmountDisabler.
+ * The InterruptThread implementation does a Java upcall to j.l.Thread::interrupt().
+ * The JavaCallWrapper constructor has such a suspend point.
+ */
+public class ThreadStateTest2 {
+    private static native void setMonitorContendedMode(boolean enable);
+    private static native void testSuspendResume(Thread vthread);
+    private static native void testInterruptThread(Thread vthread);
+    private static native int testGetThreadState(Thread vthread);
+
+    static Thread vthread0;
+    static Thread vthread1;
+    static Thread vthread2;
+    static AtomicBoolean vt2Started = new AtomicBoolean();
+    static AtomicBoolean vt2Finished = new AtomicBoolean();
+
+    static void log(String msg) { System.out.println(msg); }
+
+    // Should handle interruptions from vthread2.
+    final Runnable FOO_0 = () -> {
+        log("VT-0 started");
+        while (!vt2Finished.get()) {
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException ie) {
+                // ignore
+            }
+        }
+        log("VT-0 finished");
+    };
+
+    // A target for vthread2 to check state with JVMTI GetThreadState.
+    final Runnable FOO_1 = () -> {
+        log("VT-1 started");
+        while (!vt2Finished.get()) {
+            Thread.yield();
+        }
+        log("VT-1 finished");
+    };
+
+    // In a loop execute JVMTI functions on threads vthread0 and vthread1:
+    // InterruptThread(vthread0) and GetThreadState(vthread1).
+    final Runnable FOO_2 = () -> {
+        log("VT-2 started");
+        vt2Started.set(true);
+        for (int i = 0; i < 40; i++) {
+            testInterruptThread(vthread0);
+            int state = testGetThreadState(vthread1);
+            if (state == 2) {
+                break;
+            }
+            Thread.yield();
+        }
+        vt2Finished.set(true);
+        log("VT-2 finished");
+    };
+
+    private void runTest() throws Exception {
+        // Force creation of JvmtiThreadState on vthread start.
+        setMonitorContendedMode(true);
+
+        ExecutorService scheduler = Executors.newFixedThreadPool(2);
+        ThreadFactory factory = VThreadScheduler.virtualThreadBuilder(scheduler).factory();
+
+        vthread0 = factory.newThread(FOO_0);
+        vthread1 = factory.newThread(FOO_1);
+        vthread2 = factory.newThread(FOO_2);
+        vthread0.setName("VT-0");
+        vthread1.setName("VT-1");
+        vthread2.setName("VT-2");
+        vthread0.start();
+        vthread1.start();
+        vthread2.start();
+
+        // Give some time for vthreads to start.
+        while (!vt2Started.get()) {
+            Thread.sleep(1);
+        }
+        while (!vt2Finished.get() /* && tryCount-- > 0 */) {
+            testSuspendResume(vthread2);
+        }
+        vthread0.join();
+        vthread1.join();
+        vthread2.join();
+
+        // Let all carriers go away.
+        scheduler.shutdown();
+        Thread.sleep(20);
+    }
+
+    public static void main(String[] args) throws Exception {
+        ThreadStateTest2 obj = new ThreadStateTest2();
+        obj.runTest();
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest2/libThreadStateTest2.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest2/libThreadStateTest2.cpp
new file mode 100644
index 00000000000..8464e8ebc57
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest2/libThreadStateTest2.cpp
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+#include <jvmti.h>
+#include <stdio.h>
+#include <string.h>
+#include "jvmti_common.hpp"
+
+// set by Agent_OnLoad
+static jvmtiEnv* jvmti = nullptr;
+static jrawMonitorID agent_event_lock = nullptr;
+
+extern "C" {
+
+static void JNICALL
+MonitorContended(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread,
+                 jobject object) {
+}
+
+JNIEXPORT void JNICALL
+Java_ThreadStateTest2_testSuspendResume(JNIEnv* jni, jclass klass, jthread thread) {
+  jvmtiError err;
+  RawMonitorLocker event_locker(jvmti, jni, agent_event_lock);
+
+  LOG("\nMAIN: testSuspendResume: before suspend\n");
+  err = jvmti->SuspendThread(thread);
+  if (err == JVMTI_ERROR_THREAD_NOT_ALIVE) {
+    return;
+  }
+  check_jvmti_status(jni, err, "testSuspendResume error in JVMTI SuspendThread");
+  LOG("\nMAIN: testSuspendResume:  after suspend\n");
+
+  event_locker.wait(1);
+
+  LOG("MAIN: testSuspendResume: before resume\n");
+  err = jvmti->ResumeThread(thread);
+  check_jvmti_status(jni, err, "testSuspendResume error in JVMTI ResumeThread");
+}
+
+JNIEXPORT void JNICALL
+Java_ThreadStateTest2_setMonitorContendedMode(JNIEnv* jni, jclass klass, jboolean enable) {
+  set_event_notification_mode(jvmti, jni, enable ? JVMTI_ENABLE : JVMTI_DISABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, nullptr);
+}
+
+JNIEXPORT void JNICALL
+Java_ThreadStateTest2_testInterruptThread(JNIEnv* jni, jclass klass, jthread vthread) {
+  char* tname = get_thread_name(jvmti, jni, vthread);
+  LOG("VT-2: testInterruptThread: %s\n", tname);
+
+  jvmtiError err = jvmti->InterruptThread(vthread);
+  check_jvmti_status(jni, err, "testInterruptThread error in JVMTI InterruptThread");
+}
+
+JNIEXPORT jint JNICALL
+Java_ThreadStateTest2_testGetThreadState(JNIEnv* jni, jclass klass, jthread vthread) {
+  jint  state = get_thread_state(jvmti, jni, vthread);
+  char* tname = get_thread_name(jvmti, jni, vthread);
+
+  LOG("VT-2: testGetThreadState: %s state: %x\n", tname, state);
+  return state;
+}
+
+JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM* jvm, char* options, void* reserved) {
+  jvmtiEventCallbacks callbacks;
+  jvmtiCapabilities caps;
+  jvmtiError err;
+
+  printf("Agent_OnLoad: started\n");
+  if (jvm->GetEnv((void **) (&jvmti), JVMTI_VERSION) != JNI_OK) {
+    LOG("Agent_OnLoad: error in GetEnv");
+    return JNI_ERR;
+  }
+
+  memset(&caps, 0, sizeof(caps));
+  caps.can_suspend = 1;
+  caps.can_signal_thread = 1;
+  caps.can_support_virtual_threads = 1;
+  caps.can_generate_monitor_events = 1;
+
+  err = jvmti->AddCapabilities(&caps);
+  if (err != JVMTI_ERROR_NONE) {
+    LOG("Agent_OnLoad: error in JVMTI AddCapabilities: %d\n", err);
+  }
+  memset(&callbacks, 0, sizeof(callbacks));
+  callbacks.MonitorContendedEnter = &MonitorContended;
+  err = jvmti->SetEventCallbacks(&callbacks, sizeof(jvmtiEventCallbacks));
+  if (err != JVMTI_ERROR_NONE) {
+    LOG("Agent_OnLoad: Error in JVMTI SetEventCallbacks: %d\n", err);
+  }
+  agent_event_lock = create_raw_monitor(jvmti, "agent_event_lock");
+  printf("Agent_OnLoad: finished\n");
+
+  return 0;
+}
+
+} // extern "C"
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
index 53370fc09d6..aa3b19c4fcf 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 8174994 8200613
- * @summary Test the clhsdb commands 'printmdo', 'printall', 'jstack' on a CDS enabled corefile.
+ * @summary Test the clhsdb commands 'printall', 'jstack' on a CDS enabled corefile.
  * @requires vm.cds
  * @requires vm.hasSA
  * @requires vm.flavor == "server"
@@ -124,24 +124,10 @@ public class ClhsdbCDSCore {
                 throw new SkippedException("The CDS archive is not mapped");
             }
 
-            List testJavaOpts = Arrays.asList(Utils.getTestJavaOpts());
-
-            if (testJavaOpts.contains("-XX:TieredStopAtLevel=1")) {
-                // No MDOs are allocated in -XX:TieredStopAtLevel=1
-                // The reason is methods being compiled aren't hot enough
-                // Let's not call printmdo in such scenario
-                cmds = List.of("printall", "jstack -v");
-            } else {
-                cmds = List.of("printmdo -a", "printall", "jstack -v");
-            }
+            cmds = List.of("printall", "jstack -v");
 
             Map<String, List<String>> expStrMap = new HashMap<>();
             Map<String, List<String>> unExpStrMap = new HashMap<>();
-            expStrMap.put("printmdo -a", List.of(
-                "CounterData",
-                "BranchData"));
-            unExpStrMap.put("printmdo -a", List.of(
-                "No suitable match for type of address"));
             expStrMap.put("printall", List.of(
                 "aload_0",
                 "_nofast_aload_0",
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
index ee9872867ac..d9f856ab0a3 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,14 @@ import java.util.Map;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 import static jdk.test.lib.Asserts.assertTrue;
 import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.fail;
 import jdk.test.lib.hprof.HprofParser;
 import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.hprof.model.Root;
 import jdk.test.lib.hprof.parser.HprofReader;
 import jtreg.SkippedException;
 
@@ -66,9 +69,35 @@ public class ClhsdbDumpheap {
         }
     }
 
+    private static void verifyLocalRefs(String file) throws IOException {
+        try (var snapshot = HprofReader.readFile(file, false, 0)) {
+            for (var root = snapshot.getRoots(); root.hasMoreElements();) {
+                if (root.nextElement().getType() == Root.JAVA_LOCAL) {
+                    // expected
+                    return;
+                }
+            }
+        }
+        fail("HPROF_GC_ROOT_JAVA_FRAME not found");
+    }
+
+    private static void verifyStickyClasses(String file) throws IOException {
+        try (var snapshot = HprofReader.readFile(file, false, 0)) {
+            for (var root = snapshot.getRoots(); root.hasMoreElements();) {
+                if (root.nextElement().getType() == Root.SYSTEM_CLASS) {
+                    // expected
+                    return;
+                }
+            }
+        }
+        fail("HPROF_GC_ROOT_STICKY_CLASS not found");
+    }
+
     private static void verifyDumpFile(File dump) throws Exception {
         assertTrue(dump.exists() && dump.isFile(), "Could not create dump file " + dump.getAbsolutePath());
         printStackTraces(dump.getAbsolutePath());
+        verifyLocalRefs(dump.getAbsolutePath());
+        verifyStickyClasses(dump.getAbsolutePath());
     }
 
     private static class SubTest {
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
index e7531226d2d..553706e502d 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ public class ClhsdbInspect {
             System.out.println("Started LingeredApp with pid " + theApp.getPid());
 
             // Run the 'jstack -v' command to get the address of a Method*,
-            // the oop address of a java.lang.ref.ReferenceQueue$Lock
+            // the oop address of a LingeredAppWithLock$NestedLock
             // and the oop address of a java.lang.Class object
             List<String> cmds = List.of("jstack -v");
 
@@ -63,8 +63,8 @@ public class ClhsdbInspect {
             tokensMap.put("(a java.lang.Class for LingeredAppWithLock)",
                           "instance of Oop for java/lang/Class");
             tokensMap.put("Method*=", "Type is Method");
-            tokensMap.put("(a java.lang.ref.ReferenceQueue$Lock)",
-                          "instance of Oop for java/lang/ref/ReferenceQueue\\$Lock");
+            tokensMap.put("(a LingeredAppWithLock$NestedLock)",
+                          "instance of Oop for LingeredAppWithLock\\$NestedLock");
 
             String[] lines = jstackOutput.split("\\R");
 
diff --git a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java
index 4319d576590..9a51aef75ce 100644
--- a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ import jdk.test.lib.apps.LingeredApp;
 public class LingeredAppWithLock extends LingeredApp {
     private static Object lockObj = new Object();
 
+    private static class NestedLock {}
+
     public static void lockMethod(Object lock) {
         synchronized (lock) {
             try {
@@ -50,12 +52,14 @@ public class LingeredAppWithLock extends LingeredApp {
     public static void main(String args[]) {
         Thread classLock1 = new Thread(() -> lockMethod(LingeredAppWithLock.class));
         Thread classLock2 = new Thread(() -> lockMethod(LingeredAppWithLock.class));
+        Thread nestedClassLock = new Thread(() -> lockMethod(new NestedLock()));
         Thread objectLock = new Thread(() -> lockMethod(classLock1));
         Thread primitiveLock = new Thread(() -> lockMethod(int.class));
         Thread objectWait = new Thread(() -> waitMethod());
 
         classLock1.start();
         classLock2.start();
+        nestedClassLock.start();
         objectLock.start();
         primitiveLock.start();
         objectWait.start();
@@ -65,6 +69,8 @@ public class LingeredAppWithLock extends LingeredApp {
                 classLock1.getState() != Thread.State.TIMED_WAITING) ||
                (classLock2.getState() != Thread.State.BLOCKED &&
                 classLock2.getState() != Thread.State.TIMED_WAITING) ||
+               (nestedClassLock.getState() != Thread.State.BLOCKED &&
+                nestedClassLock.getState() != Thread.State.TIMED_WAITING) ||
                (objectLock.getState() != Thread.State.TIMED_WAITING) ||
                (primitiveLock.getState() != Thread.State.TIMED_WAITING) ||
                (objectWait.getState() != Thread.State.TIMED_WAITING)) {
diff --git a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithVDSOCall.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithVDSOCall.java
new file mode 100644
index 00000000000..d893ddf6f89
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithVDSOCall.java
@@ -0,0 +1,61 @@
+
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, NTT DATA
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.invoke.MethodHandle;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.ValueLayout;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.apps.LingeredApp;
+
+
+public class LingeredAppWithVDSOCall extends LingeredApp {
+
+    private static final MethodHandle gettimeofday;
+
+    static {
+        var desc = FunctionDescriptor.of(ValueLayout.JAVA_INT,   // return
+                                         ValueLayout.JAVA_LONG,  // tv
+                                         ValueLayout.JAVA_LONG); // tz
+        var linker = Linker.nativeLinker();
+        var gettimeofdayPtr = linker.defaultLookup().findOrThrow("gettimeofday");
+        gettimeofday = linker.downcallHandle(gettimeofdayPtr, desc);
+    }
+
+    private static void crashAtGettimeofday(long tvAddr, long tzAddr) {
+        try {
+            gettimeofday.invoke(tvAddr, tzAddr);
+        } catch (Throwable t) {
+            throw new RuntimeException(t);
+        }
+        Asserts.fail("gettimeofday() didn't crash");
+    }
+
+    public static void main(String[] args) {
+        setCrasher(() -> crashAtGettimeofday(100L, 200L));
+        LingeredApp.main(args);
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
index b02d3f3aef3..e90418b1030 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
 import jdk.test.lib.SA.SATestUtils;
 import jdk.test.lib.Utils;
 import jdk.test.lib.apps.LingeredApp;
@@ -35,8 +36,8 @@ import jdk.test.lib.process.OutputAnalyzer;
 /**
  * @test
  * @key randomness
- * @bug 8208091
- * @requires (os.family == "linux") & (vm.hasSA)
+ * @bug 8208091 8374469 8377710
+ * @requires (os.family == "linux" | os.family == "windows") & (vm.hasSA)
  * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
  * @library /test/lib
  * @run driver TestJhsdbJstackMixed
@@ -50,8 +51,11 @@ public class TestJhsdbJstackMixed {
     private static final Pattern LINE_PATTERN = Pattern
             .compile(LINE_MATCHER_STR);
     private static final String HEX_STR_PATTERN = "0x([a-fA-F0-9]+)";
-    private static final String FIB_SPLIT_PATTERN = NATIVE_FUNCTION_NAME
+
+    // On windows the native symbol will be prefixed with "NoFramePointer!"
+    private static final String FIB_SPLIT_PATTERN = "(NoFramePointer!)?" + NATIVE_FUNCTION_NAME
             + "\\s+\\+";
+
     private static final Pattern HEX_PATTERN = Pattern.compile(HEX_STR_PATTERN);
     private static final int ADDRESS_ALIGNMENT_X86 = 4;
 
@@ -149,6 +153,11 @@ public class TestJhsdbJstackMixed {
             System.err.println(out.getStderr());
 
             out.shouldContain(LingeredAppWithNativeMethod.THREAD_NAME);
+            out.shouldNotContain("sun.jvm.hotspot.debugger.UnmappedAddressException:");
+            if (Platform.isWindows()) {
+                // We need to check stdout/stderr only once on Windows.
+                break;
+            }
             if (isFibAndAlignedAddress(out.asLines())) {
                 System.out.println("DEBUG: Test triggered interesting condition.");
                 out.shouldNotContain("sun.jvm.hotspot.debugger.UnmappedAddressException:");
@@ -157,7 +166,6 @@ public class TestJhsdbJstackMixed {
             }
             System.out.println("DEBUG: Iteration: " + (i + 1)
                                  + " - Test didn't trigger interesting condition.");
-            out.shouldNotContain("sun.jvm.hotspot.debugger.UnmappedAddressException:");
         }
         System.out.println("DEBUG: Test didn't trigger interesting condition " +
                              "but no UnmappedAddressException was thrown. PASS!");
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedCore.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedCore.java
new file mode 100644
index 00000000000..84a62eb65e5
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedCore.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, NTT DATA
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jtreg.SkippedException;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
+import jdk.test.lib.SA.SATestUtils;
+import jdk.test.lib.Utils;
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.CoreUtils;
+
+import jtreg.SkippedException;
+
+/**
+ * @test
+ * @bug 8374482 8376264 8376284 8377395
+ * @requires (os.family == "linux") & (vm.hasSA)
+ * @requires os.arch == "amd64"
+ * @library /test/lib
+ * @run driver TestJhsdbJstackMixedCore
+ */
+public class TestJhsdbJstackMixedCore {
+
+    private static void runJstackMixed(String coreFileName) throws Exception {
+        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
+        launcher.addVMArgs(Utils.getTestJavaOpts());
+        launcher.addToolArg("jstack");
+        launcher.addToolArg("--mixed");
+        launcher.addToolArg("--exe");
+        launcher.addToolArg(JDKToolFinder.getTestJDKTool("java"));
+        launcher.addToolArg("--core");
+        launcher.addToolArg(coreFileName);
+
+        ProcessBuilder pb = SATestUtils.createProcessBuilder(launcher);
+        Process jhsdb = pb.start();
+        OutputAnalyzer out = new OutputAnalyzer(jhsdb);
+
+        jhsdb.waitFor();
+
+        System.out.println(out.getStdout());
+        System.err.println(out.getStderr());
+
+        out.shouldContain("__restore_rt <signal trampoline>");
+        out.shouldContain("Java_jdk_test_lib_apps_LingeredApp_crash");
+        out.shouldContain("jdk.test.lib.apps.LingeredApp.crash()");
+    }
+
+    public static void main(String... args) throws Throwable {
+        if (Platform.isMusl()) {
+            throw new SkippedException("This test does not work on musl libc.");
+        }
+
+        // Check whether the symbol of signal trampoline is available.
+        var libc = SATestUtils.getLibCPath();
+
+        // SA distinguishes the frame is signal trampoline if the function
+        // is named "__restore_rt".
+        // SA cannot unwind problematic frame from it if the symbol not found.
+        if (!SATestUtils.isSymbolAvailable(libc, "__restore_rt")) {
+            throw new SkippedException("Signal trampoline (__restore_rt) not found in libc.");
+        }
+
+        LingeredApp app = new LingeredApp();
+        app.setForceCrash(true);
+        LingeredApp.startApp(app, CoreUtils.getAlwaysPretouchArg(true));
+        app.waitAppTerminate();
+
+        String crashOutput = app.getOutput().getStdout();
+        String coreFileName = CoreUtils.getCoreFileLocation(crashOutput, app.getPid());
+        runJstackMixed(coreFileName);
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithVDSOCallCore.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithVDSOCallCore.java
new file mode 100644
index 00000000000..84da46e272f
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedWithVDSOCallCore.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, NTT DATA
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.file.Path;
+
+import jtreg.SkippedException;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
+import jdk.test.lib.SA.SATestUtils;
+import jdk.test.lib.Utils;
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.CoreUtils;
+
+/**
+ * @test
+ * @bug 8376269
+ * @requires (os.family == "linux") & (vm.hasSA)
+ * @requires os.arch == "amd64"
+ * @library /test/lib
+ * @run driver TestJhsdbJstackMixedWithVDSOCallCore
+ */
+public class TestJhsdbJstackMixedWithVDSOCallCore {
+
+    private static void runJstackMixed(String coreFileName) throws Exception {
+        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
+        launcher.addVMArgs(Utils.getTestJavaOpts());
+        launcher.addToolArg("jstack");
+        launcher.addToolArg("--mixed");
+        launcher.addToolArg("--exe");
+        launcher.addToolArg(JDKToolFinder.getTestJDKTool("java"));
+        launcher.addToolArg("--core");
+        launcher.addToolArg(coreFileName);
+
+        ProcessBuilder pb = SATestUtils.createProcessBuilder(launcher);
+        Process jhsdb = pb.start();
+        OutputAnalyzer out = new OutputAnalyzer(jhsdb);
+
+        jhsdb.waitFor();
+
+        System.out.println(out.getStdout());
+        System.err.println(out.getStderr());
+
+        out.shouldContain("vdso_gettimeofday");
+    }
+
+    private static void checkVDSODebugInfo() {
+        var kernelVersion = System.getProperty("os.version");
+        var vdso = Path.of("/lib", "modules", kernelVersion, "vdso", "vdso64.so");
+        if (SATestUtils.getDebugInfo(vdso.toString()) == null) {
+            // Skip this test if debuginfo of vDSO not found because internal
+            // function of gettimeofday() would not be exported, and vDSO
+            // binary might be stripped.
+            throw new SkippedException("vDSO debuginfo not found (" + vdso.toString() + ")");
+        }
+    }
+
+    public static void main(String... args) throws Throwable {
+        if (Platform.isMusl()) {
+            throw new SkippedException("This test does not work on musl libc.");
+        }
+        checkVDSODebugInfo();
+
+        var app = new LingeredAppWithVDSOCall();
+        app.setForceCrash(true);
+        LingeredApp.startApp(app, CoreUtils.getAlwaysPretouchArg(true));
+        app.waitAppTerminate();
+
+        String crashOutput = app.getOutput().getStdout();
+        String coreFileName = CoreUtils.getCoreFileLocation(crashOutput, app.getPid());
+        runJstackMixed(coreFileName);
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java b/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
deleted file mode 100644
index 7292d797740..00000000000
--- a/test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.Utils;
-import jtreg.SkippedException;
-
-/**
- * @test
- * @library /test/lib
- * @requires vm.hasSA
- * @requires (os.arch != "riscv64" | !(vm.cpu.features ~= ".*qemu.*"))
- * @requires vm.flavor == "server" & !vm.emulatedClient & !(vm.opt.TieredStopAtLevel == 1)
- * @run main/othervm TestPrintMdo
- */
-
-public class TestPrintMdo {
-
-    public static void main (String... args) throws Exception {
-        System.out.println("Starting TestPrintMdo test");
-        LingeredApp app = null;
-        try {
-            ClhsdbLauncher test = new ClhsdbLauncher();
-            app = LingeredApp.startApp("-XX:+ProfileInterpreter", "-XX:CompileThreshold=100");
-            System.out.println ("Started LingeredApp with pid " + app.getPid());
-            List<String> cmds = List.of("printmdo -a");
-
-            Map<String, List<String>> expStrMap = new HashMap<>();
-            Map<String, List<String>> unExpStrMap = new HashMap<>();
-            expStrMap.put("printmdo -a", List.of(
-                "VirtualCallData",
-                "CounterData",
-                "bci",
-                "MethodData",
-                "java/lang/Object"));
-            unExpStrMap.put("printmdo -a", List.of(
-                            "missing reason for "));
-            test.run(app.getPid(), cmds, expStrMap, unExpStrMap);
-        } catch (SkippedException se) {
-            throw se;
-        } catch (Exception ex) {
-            throw new RuntimeException("Test ERROR " + ex, ex);
-        } finally {
-            LingeredApp.stopApp(app);
-        }
-
-        System.out.println("Test PASSED");
-    }
-}
diff --git a/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java
index cee7bebbd50..9f5355bcdbc 100644
--- a/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java
+++ b/test/hotspot/jtreg/serviceability/tmtools/jstat/utils/JstatGcCapacityResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,18 +88,11 @@ public class JstatGcCapacityResults extends JstatResults {
         assertThat(EC <= NGC, "EC > NGC (eden space capacity > new generation capacity)");
 
         // Verify relative size of NGC and S0C + S1C + EC.
-        // The rule depends on if the tenured GC is parallel or not.
-        // For parallell GC:     NGC >= S0C + S1C + EC
-        // For non-parallell GC: NGC == S0C + S1C + EC
-        boolean isTenuredParallelGC = isTenuredParallelGC();
+        // NGC == S0C + S1C + EC
         String errMsg = String.format(
-                "NGC %s (S0C + S1C + EC) (NGC = %.1f, S0C = %.1f, S1C = %.1f, EC = %.1f, (S0C + S1C + EC) = %.1f)",
-                isTenuredParallelGC ? "<" : "!=", NGC, S0C, S1C, EC, S0C + S1C + EC);
-        if (isTenuredParallelGC) {
-            assertThat(NGC >= S0C + S1C + EC, errMsg);
-        } else {
-            assertThat(checkFloatIsSum(NGC, S0C, S1C, EC), errMsg);
-        }
+                "NGC != (S0C + S1C + EC) (NGC = %.1f, S0C = %.1f, S1C = %.1f, EC = %.1f, (S0C + S1C + EC) = %.1f)",
+                NGC, S0C, S1C, EC, S0C + S1C + EC);
+        assertThat(checkFloatIsSum(NGC, S0C, S1C, EC), errMsg);
 
         // Check Old Gen consistency
         float OGCMN = getFloatValue("OGCMN");
@@ -121,23 +114,4 @@ public class JstatGcCapacityResults extends JstatResults {
         assertThat(MC >= MCMN, "MC < MCMN (generation capacity < min generation capacity)");
         assertThat(MC <= MCMX, "MGC > MCMX (generation capacity > max generation capacity)");
     }
-
-    /**
-     * Check if the tenured generation are currently using a parallel GC.
-     */
-    protected static boolean isTenuredParallelGC() {
-        // Currently the only parallel GC for the tenured generation is PS MarkSweep.
-        List<String> parallelGCs = Arrays.asList(new String[] { "PS MarkSweep"});
-        try {
-            List<GarbageCollectorMXBean> beans = ManagementFactory.getGarbageCollectorMXBeans();
-            for (GarbageCollectorMXBean bean : beans) {
-                if (parallelGCs.contains(bean.getName())) {
-                    return true;
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
 }
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
index 200866375af..da8fd6489b8 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -276,9 +276,10 @@ class BadArgumentsAnnotation {
     }
 }
 
+// Since all the methods are failing, the class doesn't specify any @Test methods, which is another failure.
+@ClassFail
 class BadOverloadedMethod {
 
-    @FailCount(0) // Combined with both sameName() below
     @Test
     public void sameName() {}
 
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java
index b5006290047..8efdcb4f021 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBasics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@ import compiler.lib.ir_framework.test.TestVM;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.stream.Stream;
 
 /*
@@ -44,7 +46,7 @@ import java.util.stream.Stream;
 public class TestBasics {
     private static boolean wasExecuted = false;
     private boolean lastToggleBoolean = true;
-    private final static int[] executed = new int[100];
+    private final static HashMap<String, Integer> executed = HashMap.newHashMap(100);
     private final static int[] executedOnce = new int[5];
     private long[] nonFloatingRandomNumbers = new long[10];
     private double[] floatingRandomNumbers = new double[10];
@@ -60,12 +62,12 @@ public class TestBasics {
         if (wasExecuted) {
             throw new RuntimeException("Executed non @Test method or a method that was not intended to be run");
         }
-        for (int i = 0; i < executed.length; i++) {
-            int value = executed[i];
+        for (Map.Entry<String, Integer> entry : executed.entrySet()) {
+            int value = entry.getValue();
             if (value != TestVM.WARMUP_ITERATIONS + 1) {
                 // Warmups + 1 C2 compiled invocation
-                throw new RuntimeException("Test " + i + "  was executed " + value + " times instead stead of "
-                                           + (TestVM.WARMUP_ITERATIONS + 1) + " times." );
+                throw new RuntimeException("Test " + entry.getKey() + "  was executed " + value + " times instead stead of "
+                        + (TestVM.WARMUP_ITERATIONS + 1) + " times." );
             }
         }
 
@@ -88,12 +90,6 @@ public class TestBasics {
         randomBooleans = new Boolean[64];
     }
 
-    // Base test, no arguments, directly invoked.
-    @Test
-    public void test() {
-        executed[0]++;
-    }
-
     // Not a test
     public void noTest() {
         wasExecuted = true;
@@ -109,24 +105,19 @@ public class TestBasics {
         wasExecuted = true;
     }
 
-    // Can overload a @Test if it is not a @Test itself.
-    public static void test(double i) {
-        wasExecuted = true;
-    }
-
     @Test
     public static void staticTest() {
-        executed[1]++;
+        executed.merge("staticTest", 1, Integer::sum);
     }
 
     @Test
     public final void finalTest() {
-        executed[2]++;
+        executed.merge("finalTest", 1, Integer::sum);
     }
 
     @Test
     public int returnValueTest() {
-        executed[3]++;
+        executed.merge("returnValueTest", 1, Integer::sum);
         return 4;
     }
 
@@ -135,7 +126,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void byteDefaultArgument(byte x) {
-        executed[4]++;
+        executed.merge("byteDefaultArgument", 1, Integer::sum);
         if (x != 0) {
             throw new RuntimeException("Must be 0");
         }
@@ -144,7 +135,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void shortDefaultArgument(short x) {
-        executed[5]++;
+        executed.merge("shortDefaultArgument", 1, Integer::sum);
         if (x != 0) {
             throw new RuntimeException("Must be 0");
         }
@@ -153,7 +144,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void intDefaultArgument(int x) {
-        executed[6]++;
+        executed.merge("intDefaultArgument", 1, Integer::sum);
         if (x != 0) {
             throw new RuntimeException("Must be 0");
         }
@@ -162,7 +153,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void longDefaultArgument(long x) {
-        executed[7]++;
+        executed.merge("longDefaultArgument", 1, Integer::sum);
         if (x != 0L) {
             throw new RuntimeException("Must be 0");
         }
@@ -171,7 +162,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void floatDefaultArgument(float x) {
-        executed[8]++;
+        executed.merge("floatDefaultArgument", 1, Integer::sum);
         if (x != 0.0f) {
             throw new RuntimeException("Must be 0.0");
         }
@@ -180,7 +171,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void doubleDefaultArgument(double x) {
-        executed[9]++;
+        executed.merge("doubleDefaultArgument", 1, Integer::sum);
         if (x != 0.0f) {
             throw new RuntimeException("Must be 0.0");
         }
@@ -189,7 +180,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void charDefaultArgument(char x) {
-        executed[10]++;
+        executed.merge("charDefaultArgument", 1, Integer::sum);
         if (x != '\u0000') {
             throw new RuntimeException("Must be \u0000");
         }
@@ -198,7 +189,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void booleanDefaultArgument(boolean x) {
-        executed[11]++;
+        executed.merge("booleanDefaultArgument", 1, Integer::sum);
         if (x) {
             throw new RuntimeException("Must be false");
         }
@@ -207,7 +198,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void stringObjectDefaultArgument(String x) {
-        executed[12]++;
+        executed.merge("stringObjectDefaultArgument", 1, Integer::sum);
         if (x == null || x.length() != 0) {
             throw new RuntimeException("Default string object must be non-null and having a length of zero");
         }
@@ -216,7 +207,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.DEFAULT)
     public void defaultObjectDefaultArgument(DefaultObject x) {
-        executed[13]++;
+        executed.merge("defaultObjectDefaultArgument", 1, Integer::sum);
         if (x == null || x.i != 4) {
             throw new RuntimeException("Default object must not be null and its i field must be 4");
         }
@@ -225,7 +216,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public void byte42(byte x) {
-        executed[14]++;
+        executed.merge("byte42", 1, Integer::sum);
         if (x != 42) {
             throw new RuntimeException("Must be 42");
         }
@@ -234,7 +225,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public void short42(short x) {
-        executed[15]++;
+        executed.merge("short42", 1, Integer::sum);
         if (x != 42) {
             throw new RuntimeException("Must be 42");
         }
@@ -243,7 +234,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public void int42(int x) {
-        executed[16]++;
+        executed.merge("int42", 1, Integer::sum);
         if (x != 42) {
             throw new RuntimeException("Must be 42");
         }
@@ -252,7 +243,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public void long42(long x) {
-        executed[17]++;
+        executed.merge("long42", 1, Integer::sum);
         if (x != 42) {
             throw new RuntimeException("Must be 42");
         }
@@ -261,7 +252,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public void float42(float x) {
-        executed[18]++;
+        executed.merge("float42", 1, Integer::sum);
         if (x != 42.0) {
             throw new RuntimeException("Must be 42");
         }
@@ -270,7 +261,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public void double42(double x) {
-        executed[19]++;
+        executed.merge("double42", 1, Integer::sum);
         if (x != 42.0) {
             throw new RuntimeException("Must be 42");
         }
@@ -279,7 +270,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.FALSE)
     public void booleanFalse(boolean x) {
-        executed[20]++;
+        executed.merge("booleanFalse", 1, Integer::sum);
         if (x) {
             throw new RuntimeException("Must be false");
         }
@@ -288,7 +279,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.TRUE)
     public void booleanTrue(boolean x) {
-        executed[21]++;
+        executed.merge("booleanTrue", 1, Integer::sum);
         if (!x) {
             throw new RuntimeException("Must be true");
         }
@@ -297,37 +288,37 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomByte(byte x) {
-        executed[22]++;
+        executed.merge("randomByte", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomShort(short x) {
-        executed[23]++;
+        executed.merge("randomShort", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomInt(int x) {
-        executed[24]++;
+        executed.merge("randomInt", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomLong(long x) {
-        executed[25]++;
+        executed.merge("randomLong", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomFloat(float x) {
-        executed[26]++;
+        executed.merge("randomFloat", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomDouble(double x) {
-        executed[27]++;
+        executed.merge("randomDouble", 1, Integer::sum);
     }
 
     // Not executed
@@ -338,13 +329,13 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.RANDOM_ONCE)
     public void randomBoolean(boolean x) {
-        executed[28]++;
+        executed.merge("randomBoolean", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.BOOLEAN_TOGGLE_FIRST_FALSE)
     public void booleanToggleFirstFalse(boolean x) {
-        if (executed[29] == 0) {
+        if (!executed.containsKey("booleanToggleFirstFalse")) {
             // First invocation
             if (x) {
                 throw new RuntimeException("BOOLEAN_TOGGLE_FIRST_FALSE must be false on first invocation");
@@ -353,63 +344,63 @@ public class TestBasics {
             throw new RuntimeException("BOOLEAN_TOGGLE_FIRST_FALSE did not toggle");
         }
         lastToggleBoolean = x;
-        executed[29]++;
+        executed.merge("booleanToggleFirstFalse", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachByte(byte x) {
-        checkNonFloatingRandomNumber(x, executed[30]);
-        executed[30]++;
+        checkNonFloatingRandomNumber(x, executed.getOrDefault("randomEachByte", 0));
+        executed.merge("randomEachByte", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachShort(short x) {
-        checkNonFloatingRandomNumber(x, executed[31]);
-        executed[31]++;
+        checkNonFloatingRandomNumber(x, executed.getOrDefault("randomEachShort", 0));
+        executed.merge("randomEachShort", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachInt(int x) {
-        checkNonFloatingRandomNumber(x, executed[32]);
-        executed[32]++;
+        checkNonFloatingRandomNumber(x, executed.getOrDefault("randomEachInt", 0));
+        executed.merge("randomEachInt", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachLong(long x) {
-        checkNonFloatingRandomNumber(x, executed[33]);
-        executed[33]++;
+        checkNonFloatingRandomNumber(x, executed.getOrDefault("randomEachLong", 0));
+        executed.merge("randomEachLong", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachChar(char x) {
-        checkNonFloatingRandomNumber(x, executed[34]);
-        executed[34]++;
+        checkNonFloatingRandomNumber(x, executed.getOrDefault("randomEachChar", 0));
+        executed.merge("randomEachChar", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachFloat(float x) {
-        checkFloatingRandomNumber(x, executed[35]);
-        executed[35]++;
+        checkFloatingRandomNumber(x, executed.getOrDefault("randomEachFloat", 0));
+        executed.merge("randomEachFloat", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachDouble(double x) {
-        checkFloatingRandomNumber(x, executed[36]);
-        executed[36]++;
+        checkFloatingRandomNumber(x, executed.getOrDefault("randomEachDouble", 0));
+        executed.merge("randomEachDouble", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     public void randomEachBoolean(boolean x) {
-        checkRandomBoolean(x, executed[37]);
-        executed[37]++;
+        checkRandomBoolean(x, executed.getOrDefault("randomEachBoolean", 0));
+        executed.merge("randomEachBoolean", 1, Integer::sum);
     }
 
     private void checkNonFloatingRandomNumber(long x, int invocationCount) {
@@ -461,7 +452,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_MINUS_42)
     public void byteMinus42(byte x) {
-        executed[38]++;
+        executed.merge("byteMinus42", 1, Integer::sum);
         if (x != -42) {
             throw new RuntimeException("Must be -42");
         }
@@ -470,7 +461,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_MINUS_42)
     public void shortMinus42(short x) {
-        executed[39]++;
+        executed.merge("shortMinus42", 1, Integer::sum);
         if (x != -42) {
             throw new RuntimeException("Must be -42");
         }
@@ -479,7 +470,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_MINUS_42)
     public void intMinus42(int x) {
-        executed[40]++;
+        executed.merge("intMinus42", 1, Integer::sum);
         if (x != -42) {
             throw new RuntimeException("Must be -42");
         }
@@ -488,7 +479,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_MINUS_42)
     public void longMinus42(long x) {
-        executed[41]++;
+        executed.merge("longMinus42", 1, Integer::sum);
         if (x != -42) {
             throw new RuntimeException("Must be -42");
         }
@@ -497,7 +488,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_MINUS_42)
     public void floatMinus42(float x) {
-        executed[42]++;
+        executed.merge("floatMinus42", 1, Integer::sum);
         if (x != -42.0) {
             throw new RuntimeException("Must be -42");
         }
@@ -506,7 +497,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.NUMBER_MINUS_42)
     public void doubleMinus42(double x) {
-        executed[43]++;
+        executed.merge("doubleMinus42", 1, Integer::sum);
         if (x != -42.0) {
             throw new RuntimeException("Must be -42");
         }
@@ -515,7 +506,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void byteMin(byte x) {
-        executed[79]++;
+        executed.merge("byteMin", 1, Integer::sum);
         if (x != Byte.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -524,7 +515,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void charMin(char x) {
-        executed[80]++;
+        executed.merge("charMin", 1, Integer::sum);
         if (x != Character.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -533,7 +524,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void shortMin(short x) {
-        executed[81]++;
+        executed.merge("shortMin", 1, Integer::sum);
         if (x != Short.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -542,7 +533,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void intMin(int x) {
-        executed[82]++;
+        executed.merge("intMin", 1, Integer::sum);
         if (x != Integer.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -551,7 +542,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void longMin(long x) {
-        executed[83]++;
+        executed.merge("longMin", 1, Integer::sum);
         if (x != Long.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -560,7 +551,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void floatMin(float x) {
-        executed[84]++;
+        executed.merge("floatMin", 1, Integer::sum);
         if (x != Float.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -569,7 +560,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MIN)
     public void doubleMin(double x) {
-        executed[85]++;
+        executed.merge("doubleMin", 1, Integer::sum);
         if (x != Double.MIN_VALUE) {
             throw new RuntimeException("Must be MIN_VALUE");
         }
@@ -578,7 +569,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void byteMax(byte x) {
-        executed[86]++;
+        executed.merge("byteMax", 1, Integer::sum);
         if (x != Byte.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -587,7 +578,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void charMax(char x) {
-        executed[87]++;
+        executed.merge("charMax", 1, Integer::sum);
         if (x != Character.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -596,7 +587,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void shortMax(short x) {
-        executed[88]++;
+        executed.merge("shortMax", 1, Integer::sum);
         if (x != Short.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -605,7 +596,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void intMax(int x) {
-        executed[89]++;
+        executed.merge("intMax", 1, Integer::sum);
         if (x != Integer.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -614,7 +605,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void longMax(long x) {
-        executed[90]++;
+        executed.merge("longMax", 1, Integer::sum);
         if (x != Long.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -623,7 +614,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void floatMax(float x) {
-        executed[91]++;
+        executed.merge("floatMax", 1, Integer::sum);
         if (x != Float.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -632,7 +623,7 @@ public class TestBasics {
     @Test
     @Arguments(values = Argument.MAX)
     public void doubleMax(double x) {
-        executed[78]++;
+        executed.merge("doubleMax", 1, Integer::sum);
         if (x != Double.MAX_VALUE) {
             throw new RuntimeException("Must be MAX_VALUE");
         }
@@ -641,7 +632,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.DEFAULT, Argument.DEFAULT})
     public void twoArgsDefault1(byte x, short y) {
-        executed[44]++;
+        executed.merge("twoArgsDefault1", 1, Integer::sum);
         if (x != 0 || y != 0) {
             throw new RuntimeException("Both must be 0");
         }
@@ -650,7 +641,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.DEFAULT, Argument.DEFAULT})
     public void twoArgsDefault2(int x, short y) {
-        executed[45]++;
+        executed.merge("twoArgsDefault2", 1, Integer::sum);
         if (x != 0 || y != 0) {
             throw new RuntimeException("Both must be 0");
         }
@@ -659,7 +650,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.DEFAULT, Argument.DEFAULT})
     public void twoArgsDefault3(short x, long y) {
-        executed[46]++;
+        executed.merge("twoArgsDefault3", 1, Integer::sum);
         if (x != 0 || y != 0) {
             throw new RuntimeException("Both must be 0");
         }
@@ -668,7 +659,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.DEFAULT, Argument.DEFAULT})
     public void twoArgsDefault4(float x, boolean y) {
-        executed[47]++;
+        executed.merge("twoArgsDefault4", 1, Integer::sum);
         if (x != 0.0 || y) {
             throw new RuntimeException("Must be 0 and false");
         }
@@ -677,7 +668,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.DEFAULT, Argument.DEFAULT})
     public void twoArgsDefault5(boolean x, char y) {
-        executed[48]++;
+        executed.merge("twoArgsDefault5", 1, Integer::sum);
         if (x || y != '\u0000') {
             throw new RuntimeException("Must be false and \u0000");
         }
@@ -686,7 +677,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.DEFAULT, Argument.DEFAULT})
     public void twoArgsDefault6(char x, byte y) {
-        executed[49]++;
+        executed.merge("twoArgsDefault6", 1, Integer::sum);
         if (x != '\u0000' || y != 0) {
             throw new RuntimeException("Must be\u0000 and 0");
         }
@@ -695,7 +686,7 @@ public class TestBasics {
     @Test
     @Arguments(values = {Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
     public void twoArgsRandomOnce(char x, byte y) {
-        executed[50]++;
+        executed.merge("twoArgsRandomOnce", 1, Integer::sum);
     }
 
     @Test
@@ -707,7 +698,7 @@ public class TestBasics {
         if (Stream.of(a, b, c, d, e, f, g, h).allMatch(i -> i == a)) {
             throw new RuntimeException("RANDOM_ONCE does not produce random values for different arguments");
         }
-        executed[51]++;
+        executed.merge("checkRandomOnceDifferentArgs", 1, Integer::sum);
     }
 
     @Test
@@ -716,7 +707,7 @@ public class TestBasics {
                 Argument.RANDOM_ONCE, Argument.RANDOM_ONCE,
                 Argument.RANDOM_ONCE, Argument.RANDOM_ONCE})
     public void checkMixedRandoms1(byte a, short b, int c, long d, char e, boolean f, float g, double h) {
-        executed[52]++;
+        executed.merge("checkMixedRandoms1", 1, Integer::sum);
     }
 
     @Test
@@ -725,7 +716,7 @@ public class TestBasics {
                 Argument.RANDOM_EACH, Argument.RANDOM_EACH,
                 Argument.RANDOM_EACH, Argument.RANDOM_EACH})
     public void checkMixedRandoms2(byte a, short b, int c, long d, char e, boolean f, float g, double h) {
-        executed[53]++;
+        executed.merge("checkMixedRandoms2", 1, Integer::sum);
     }
 
     @Test
@@ -734,7 +725,7 @@ public class TestBasics {
                 Argument.RANDOM_ONCE, Argument.RANDOM_EACH,
                 Argument.RANDOM_EACH, Argument.RANDOM_ONCE})
     public void checkMixedRandoms3(byte a, short b, int c, long d, char e, boolean f, float g, double h) {
-        executed[54]++;
+        executed.merge("checkMixedRandoms3", 1, Integer::sum);
     }
 
     @Test
@@ -745,7 +736,7 @@ public class TestBasics {
         if (a != 42 || b != 42 || c != 42 || d != 42 || e != 42.0 || f != 42.0) {
             throw new RuntimeException("Must all be 42");
         }
-        executed[55]++;
+        executed.merge("check42Mix1", 1, Integer::sum);
     }
 
     @Test
@@ -756,7 +747,7 @@ public class TestBasics {
         if (a != -42 || b != -42 || c != -42 || d != -42 || e != -42.0 || f != -42.0) {
             throw new RuntimeException("Must all be -42");
         }
-        executed[56]++;
+        executed.merge("check42Mix2", 1, Integer::sum);
     }
 
     @Test
@@ -767,14 +758,14 @@ public class TestBasics {
         if (a != -42 || b != 42 || c != -42 || d != -42 || e != 42.0 || f != -42.0) {
             throw new RuntimeException("Do not match the right 42 version");
         }
-        executed[57]++;
+        executed.merge("check42Mix3", 1, Integer::sum);
     }
 
 
     @Test
     @Arguments(values = Argument.BOOLEAN_TOGGLE_FIRST_TRUE)
     public void booleanToggleFirstTrue(boolean x) {
-        if (executed[58] == 0) {
+        if (executed.getOrDefault("booleanToggleFirstTrue", 0) == 0) {
             // First invocation
             if (!x) {
                 throw new RuntimeException("BOOLEAN_TOGGLE_FIRST_FALSE must be false on first invocation");
@@ -783,13 +774,13 @@ public class TestBasics {
             throw new RuntimeException("BOOLEAN_TOGGLE_FIRST_FALSE did not toggle");
         }
         lastToggleBoolean = x;
-        executed[58]++;
+        executed.merge("booleanToggleFirstTrue", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = {Argument.BOOLEAN_TOGGLE_FIRST_FALSE, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
     public void checkTwoToggles(boolean b1, boolean b2) {
-        if (executed[59] == 0) {
+        if (executed.getOrDefault("checkTwoToggles", 0) == 0) {
             // First invocation
             if (b1 || !b2) {
                 throw new RuntimeException("BOOLEAN_TOGGLES have wrong initial value");
@@ -800,14 +791,14 @@ public class TestBasics {
             throw new RuntimeException("Booleans did not toggle");
         }
         lastToggleBoolean = b1;
-        executed[59]++;
+        executed.merge("checkTwoToggles", 1, Integer::sum);
     }
 
     @Test
     @Arguments(values = {Argument.BOOLEAN_TOGGLE_FIRST_FALSE, Argument.FALSE,
                 Argument.TRUE, Argument.BOOLEAN_TOGGLE_FIRST_TRUE})
     public void booleanMix(boolean b1, boolean b2, boolean b3, boolean b4) {
-        if (executed[60] == 0) {
+        if (executed.getOrDefault("booleanMix", 0) == 0) {
             // First invocation
             if (b1 || b2 || !b3 || !b4) {
                 throw new RuntimeException("BOOLEAN_TOGGLES have wrong initial value");
@@ -818,7 +809,7 @@ public class TestBasics {
             throw new RuntimeException("Booleans did not toggle");
         }
         lastToggleBoolean = b1;
-        executed[60]++;
+        executed.merge("booleanMix", 1, Integer::sum);
     }
 
     /*
@@ -827,19 +818,19 @@ public class TestBasics {
 
     @Test
     public int testCheck() {
-        executed[63]++;
+        executed.merge("testCheck", 1, Integer::sum);
         return 1;
     }
 
     // Checked test. Check invoked after invoking "testCheck". Perform some more things after invocation.
     @Check(test = "testCheck")
     public void checkTestCheck() {
-        executed[64]++; // Executed on each invocation
+        executed.merge("checkTestCheck", 1, Integer::sum); // Executed on each invocation
     }
 
     @Test
     public int testCheckReturn() {
-        executed[65]++;
+        executed.merge("testCheckReturn", 1, Integer::sum);
         return 2;
     }
 
@@ -849,13 +840,13 @@ public class TestBasics {
         if (returnValue != 2) {
             throw new RuntimeException("Must be 2");
         }
-        executed[66]++; // Executed on each invocation
+        executed.merge("checkTestCheckReturn", 1, Integer::sum); // Executed on each invocation
     }
 
     @Test
     @Arguments(values = Argument.NUMBER_42)
     public short testCheckWithArgs(short x) {
-        executed[94]++;
+        executed.merge("testCheckWithArgs", 1, Integer::sum);
         return x;
     }
 
@@ -864,25 +855,25 @@ public class TestBasics {
         if (returnValue != 42) {
             throw new RuntimeException("Must be 42");
         }
-        executed[95]++; // Executed on each invocation
+        executed.merge("checkTestCheckWithArgs", 1, Integer::sum); // Executed on each invocation
     }
 
     @Test
     public int testCheckTestInfo() {
-        executed[67]++;
+        executed.merge("testCheckTestInfo", 1, Integer::sum);
         return 3;
     }
 
     // Checked test with info object about test.
     @Check(test = "testCheckTestInfo")
     public void checkTestCheckTestInfo(TestInfo testInfo) {
-        executed[68]++; // Executed on each invocation
+        executed.merge("checkTestCheckTestInfo(TestInfo)", 1, Integer::sum); // Executed on each invocation
     }
 
 
     @Test
     public int testCheckBoth() {
-        executed[69]++;
+        executed.merge("testCheckBoth", 1, Integer::sum);
         return 4;
     }
 
@@ -892,12 +883,12 @@ public class TestBasics {
         if (returnValue != 4) {
             throw new RuntimeException("Must be 4");
         }
-        executed[70]++; // Executed on each invocation
+        executed.merge("checkTestCheckTestInfo(int, TestInfo)", 1, Integer::sum); // Executed on each invocation
     }
 
     @Test
     public int testCheckOnce() {
-        executed[71]++;
+        executed.merge("testCheckOnce", 1, Integer::sum);
         return 1;
     }
 
@@ -909,7 +900,7 @@ public class TestBasics {
 
     @Test
     public int testCheckReturnOnce() {
-        executed[72]++;
+        executed.merge("testCheckReturnOnce", 1, Integer::sum);
         return 2;
     }
 
@@ -923,7 +914,7 @@ public class TestBasics {
 
     @Test
     public int testCheckTestInfoOnce() {
-        executed[73]++;
+        executed.merge("testCheckTestInfoOnce", 1, Integer::sum);
         return 3;
     }
 
@@ -934,7 +925,7 @@ public class TestBasics {
 
     @Test
     public int testCheckBothOnce() {
-        executed[74]++;
+        executed.merge("testCheckBothOnce", 1, Integer::sum);
         return 4;
     }
 
@@ -946,42 +937,9 @@ public class TestBasics {
         executedOnce[3]++; // Executed once
     }
 
-    @Test
-    public void sameName() {
-        executed[76]++;
-    }
-
-    // Allowed to overload test method if not test method itself
-    public void sameName(boolean a) {
-        wasExecuted = true;
-    }
-
-    // Allowed to overload test method if not test method itself
-    @Check(test = "sameName")
-    public void sameName(TestInfo info) {
-        executed[77]++;
-    }
-
-
-    /*
-     * Custom run tests.
-     */
-
-    @Test
-    public void sameName2() {
-        executed[92]++;
-    }
-
-    // Allowed to overload test method if not test method itself
-    @Run(test = "sameName2")
-    public void sameName2(RunInfo info) {
-        executed[93]++;
-        sameName2();
-    }
-
     @Test
     public void testRun() {
-        executed[61]++;
+        executed.merge("testRun", 1, Integer::sum);
     }
 
     // Custom run test. This method is invoked each time instead of @Test method. This method responsible for calling
@@ -993,7 +951,7 @@ public class TestBasics {
 
     @Test
     public void testRunNoTestInfo(int i) { // Argument allowed when run by @Run
-        executed[62]++;
+        executed.merge("testRunNoTestInfo", 1, Integer::sum);
     }
 
     @Run(test = "testRunNoTestInfo")
@@ -1025,7 +983,7 @@ public class TestBasics {
 
     @Test
     public void testRunOnce2() {
-        executed[75]++;
+        executed.merge("testRunOnce2", 1, Integer::sum);
     }
 
     @Run(test = "testRunOnce2", mode = RunMode.STANDALONE)
@@ -1037,12 +995,12 @@ public class TestBasics {
 
     @Test
     public void testRunMultiple() {
-        executed[96]++;
+        executed.merge("testRunMultiple", 1, Integer::sum);
     }
 
     @Test
     public void testRunMultiple2() {
-        executed[97]++;
+        executed.merge("testRunMultiple2", 1, Integer::sum);
     }
 
     @Test
@@ -1059,12 +1017,12 @@ public class TestBasics {
 
     @Test
     public void testRunMultiple3() {
-        executed[98]++;
+        executed.merge("testRunMultiple3", 1, Integer::sum);
     }
 
     @Test
     public void testRunMultiple4() {
-        executed[99]++;
+        executed.merge("testRunMultiple4", 1, Integer::sum);
     }
 
     @Test
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java
index 5b7cd3c38a8..d4c12de3e4b 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCheckedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,6 +180,12 @@ class BadIRAndRuntimeCheckedTests {
             throw new BadCheckedTestException("expected");
         }
     }
+
+    static class BadCheckedTestException extends RuntimeException {
+        BadCheckedTestException(String s) {
+            super(s);
+        }
+    }
 }
 
 class BadIRCheckedTests {
@@ -224,9 +230,3 @@ class BadIRCheckedTests {
         }
     }
 }
-
-class BadCheckedTestException extends RuntimeException {
-    BadCheckedTestException(String s) {
-        super(s);
-    }
-}
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompileThreshold.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompileThreshold.java
index 7225c7fff07..793ef1ebe34 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompileThreshold.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestCompileThreshold.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ public class TestCompileThreshold {
                                        "-DPreferCommandLineFlags=true");
         } catch (IRViolationException e) {
             Asserts.assertTrue(e.getExceptionInfo().contains("Failed IR Rules (1)"), "exactly one rule failed");
-            Asserts.assertTrue(e.getExceptionInfo().contains("testWithCompileThreshold()"),
+            Asserts.assertTrue(e.getExceptionInfo().contains("testWithCompileThreshold"),
                                "testWithCompileThreshold() failed");
         }
 
@@ -59,7 +59,7 @@ public class TestCompileThreshold {
                                        "-DTest=testWithoutCompileThreshold");
         } catch (IRViolationException e) {
             Asserts.assertTrue(e.getExceptionInfo().contains("Failed IR Rules (1)"), "exactly one rule failed");
-            Asserts.assertTrue(e.getExceptionInfo().contains("testWithoutCompileThreshold()"),
+            Asserts.assertTrue(e.getExceptionInfo().contains("testWithoutCompileThreshold"),
                                "testWithoutCompileThreshold() failed");
         }
     }
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
index 7fa834b3e55..05b7007c9bd 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestControls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ import jdk.test.lib.Asserts;
 import jdk.test.whitebox.WhiteBox;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -46,7 +47,7 @@ import java.util.regex.Pattern;
  */
 
 public class TestControls {
-    static int[] executed = new int[15];
+    static HashMap<String, Integer> executed = HashMap.newHashMap(15);
     static boolean wasExecuted = false;
     static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
 
@@ -56,31 +57,21 @@ public class TestControls {
         Method runTestsOnSameVM = TestVM.class.getDeclaredMethod("runTestsOnSameVM", Class.class);
         runTestsOnSameVM.setAccessible(true);
         runTestsOnSameVM.invoke(null, new Object[]{ null });
-        final int defaultIterations = TestVM.WARMUP_ITERATIONS + 1;
-        Asserts.assertEQ(executed[0], 1001);
-        Asserts.assertEQ(executed[1], 101);
-        Asserts.assertEQ(executed[2], 10000);
-        Asserts.assertEQ(executed[3], 10000);
-        Asserts.assertEQ(executed[4], defaultIterations);
-        Asserts.assertEQ(executed[5], defaultIterations);
-        Asserts.assertEQ(executed[6], 5001);
-        Asserts.assertEQ(executed[7], 5001);
-        Asserts.assertEQ(executed[8], 1);
-        Asserts.assertEQ(executed[9], 5000);
-        Asserts.assertEQ(executed[10], 1);
-        Asserts.assertEQ(executed[11], 2);
-        Asserts.assertEQ(executed[12], 1);
-        Asserts.assertEQ(executed[13], 1);
+        Asserts.assertEQ(executed.get("test1"), 1001);
+        Asserts.assertEQ(executed.get("test2"), 101);
+        Asserts.assertEQ(executed.get("testDontCompile"), 10000);
+        Asserts.assertEQ(executed.get("dontCompile"), 10000);
+        Asserts.assertEQ(executed.get("testCompileAtLevel1"), 5001);
+        Asserts.assertEQ(executed.get("dontCompile2"), 5001);
+        Asserts.assertEQ(executed.get("runTestDontCompile2A"), 1);
+        Asserts.assertEQ(executed.get("runTestDontCompile2B"), 5000);
+        Asserts.assertEQ(executed.get("noWarmup"), 1);
+        Asserts.assertEQ(executed.get("noWarmup2"), 2);
+        Asserts.assertEQ(executed.get("runNoWarmup2"), 1);
+        Asserts.assertEQ(executed.get("runTestCompilation"), 1);
         Asserts.assertFalse(wasExecuted);
         final long started = System.currentTimeMillis();
         long elapsed = 0;
-        Method overloadDouble = TestControls.class.getDeclaredMethod("overload", double.class);
-        Method overloadInt = TestControls.class.getDeclaredMethod("overload", int.class);
-        while (!(TestFramework.isC2Compiled(overloadInt) && TestFramework.isCompiledAtLevel(overloadDouble, CompLevel.C1_LIMITED_PROFILE)) && elapsed < 5000) {
-            elapsed = System.currentTimeMillis() - started;
-        }
-        TestFramework.assertCompiledAtLevel(TestControls.class.getDeclaredMethod("overload", double.class), CompLevel.C1_LIMITED_PROFILE);
-        TestFramework.assertCompiledByC2(TestControls.class.getDeclaredMethod("overload", int.class));
 
         TestFramework framework = new TestFramework(ClassInitializerTest.class);
         framework.addFlags("-XX:+PrintCompilation").addHelperClasses(ClassInitializerHelper.class).start();
@@ -99,15 +90,15 @@ public class TestControls {
     @Test
     @Warmup(1000)
     public void test1() {
-        executed[0]++;
+        executed.merge("test1", 1, Integer::sum);
     }
 
     @Check(test = "test1")
     public void check1(TestInfo info) {
-        if (executed[0] <= 1000) {
+        if (executed.getOrDefault("test1", 0) <= 1000) {
             Asserts.assertTrue(info.isWarmUp());
         } else {
-            Asserts.assertTrue(!info.isWarmUp() && executed[0] == 1001);
+            Asserts.assertTrue(!info.isWarmUp() && executed.getOrDefault("test1", 0) == 1001);
             TestFramework.assertCompiledByC2(info.getTest());
         }
     }
@@ -115,45 +106,23 @@ public class TestControls {
     @Test
     @Warmup(100)
     public void test2() {
-        executed[1]++;
+        executed.merge("test2", 1, Integer::sum);
     }
 
     @Check(test = "test2", when = CheckAt.COMPILED)
     public void check2(TestInfo info) {
-        Asserts.assertTrue(!info.isWarmUp() && executed[1] == 101);
+        Asserts.assertTrue(!info.isWarmUp() && executed.getOrDefault("test2", 0) == 101);
         TestFramework.assertCompiledByC2(info.getTest());
     }
 
-    @Test
-    public void overload() {
-        executed[4]++;
-    }
-
-    @ForceCompile
-    @DontInline
-    public static void overload(int i) {
-        wasExecuted = true;
-    }
-
-    @ForceCompile(CompLevel.C1_LIMITED_PROFILE)
-    @ForceInline
-    public static void overload(double i) {
-        wasExecuted = true;
-    }
-
-    @Check(test = "overload")
-    public void checkOverload()  {
-        executed[5]++;
-    }
-
     @Test
     public void testDontCompile() {
-        executed[2]++;
+        executed.merge("testDontCompile", 1, Integer::sum);
     }
 
     @DontCompile
     public static void dontCompile() {
-        executed[3]++;
+        executed.merge("dontCompile", 1, Integer::sum);
     }
 
     @Run(test = "testDontCompile", mode = RunMode.STANDALONE)
@@ -167,12 +136,12 @@ public class TestControls {
 
     @Test
     public void testCompileAtLevel1() {
-        executed[6]++;
+        executed.merge("testCompileAtLevel1", 1, Integer::sum);
     }
 
     @DontCompile(Compiler.ANY)
     public static void dontCompile2() {
-        executed[7]++;
+        executed.merge("dontCompile2", 1, Integer::sum);
     }
 
     @Run(test = "testCompileAtLevel1")
@@ -181,23 +150,23 @@ public class TestControls {
         dontCompile2();
         testCompileAtLevel1();
         if (!info.isWarmUp()) {
-            executed[8]++;
+            executed.merge("runTestDontCompile2A", 1, Integer::sum);
             int compLevel = WHITE_BOX.getMethodCompilationLevel(TestControls.class.getDeclaredMethod("dontCompile2"), false);
             Asserts.assertLessThan(compLevel, CompLevel.C1_LIMITED_PROFILE.getValue());
         } else {
-            executed[9]++;
+            executed.merge("runTestDontCompile2B", 1, Integer::sum);
         }
     }
 
     @Test
     @Warmup(0)
     public void noWarmup() {
-        executed[10]++;
+        executed.merge("noWarmup", 1, Integer::sum);
     }
 
     @Test
     public void noWarmup2() {
-        executed[11]++;
+        executed.merge("noWarmup2", 1, Integer::sum);
     }
 
     @Run(test = "noWarmup2")
@@ -206,7 +175,7 @@ public class TestControls {
         noWarmup2();
         noWarmup2();
         Asserts.assertTrue(!info.isWarmUp());
-        executed[12]++;
+        executed.merge("runNoWarmup2", 1, Integer::sum);
     }
 
     @Test
@@ -301,7 +270,7 @@ public class TestControls {
 
         TestFramework.assertCompiledAtLevel(info.getTestClassMethod("forceC1DontC2"), CompLevel.C1_SIMPLE);
         TestFramework.assertCompiledAtLevel(info.getTestClassMethod("forceC2DontC1"), CompLevel.C2);
-        executed[13]++;
+        executed.merge("runTestCompilation", 1, Integer::sum);
     }
 }
 
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
index 142a30f34a9..b6881fede75 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,17 +34,18 @@ import java.io.PrintStream;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /*
  * @test
  * @requires vm.debug == true & vm.compMode != "Xint" & vm.compiler1.enabled & vm.compiler2.enabled & vm.flagless
- * @summary Test IR matcher with different default IR node regexes. Use -DPrintIREncoding.
+ * @summary Test IR matcher with different default IR node regexes. Use -DPrintApplicableIRRules.
  *          Normally, the framework should be called with driver.
  * @library /test/lib /testlibrary_tests /
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=240 -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
- *                               -XX:+WhiteBoxAPI -DPrintIREncoding=true  ir_framework.tests.TestIRMatching
+ *                               -XX:+WhiteBoxAPI -DPrintApplicableIRRules=true  ir_framework.tests.TestIRMatching
  */
 
 public class TestIRMatching {
@@ -72,180 +73,180 @@ public class TestIRMatching {
         runWithArguments(GoodCount.class, "-XX:TLABRefillWasteFraction=50");
         runWithArguments(MultipleFailOnGood.class, "-XX:TLABRefillWasteFraction=50");
 
-        runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:+UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test1(int)", 1, "CallStaticJava"));
-        runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:-UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test2()", 1, "CallStaticJava"));
+        runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:+UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test1", 1, "CallStaticJava"));
+        runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:-UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test2", 1, "CallStaticJava"));
 
-        runCheck(BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1, 1, "Store"),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1,  3, "Store"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail1()", 1,  2, 4),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail2()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail2()", 1,  2, "CallStaticJava"),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail3()", 1,  2, "Store"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail3()", 1,  1, 3),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail4()", 1,  1, "Store"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail4()", 1,  2, 3),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail5()", 1,  1, "Store"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail5()", 1,  2, 3),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  2, "MyClass"),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  3, "CallStaticJava"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail7()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail7()", 1,  2, "MyClass"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail8()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail8()", 1,  2, "MyClass"),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail9()", 1,  1, "Store"),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail9()", 1,  2, "CallStaticJava"),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail10()", 1,  1, "Store", "iFld"),
-                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail10()", 1,  2, 3)
+        runCheck(BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1", 1, 1, "Store"),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1", 1, 3, "Store"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail1", 1, 2, 4),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail2", 1, 1),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail2", 1, 2, "CallStaticJava"),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail3", 1, 2, "Store"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail3", 1, 1, 3),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail4", 1, 1, "Store"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail4", 1, 2, 3),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail5", 1, 1, "Store"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail5", 1, 2, 3),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail6", 1, 1),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6", 1, 2, "MyClass"),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6", 1, 3, "CallStaticJava"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail7", 1, 1),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail7", 1, 2, "MyClass"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail8", 1, 1),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail8", 1, 2, "MyClass"),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail9", 1, 1, "Store"),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail9", 1, 2, "CallStaticJava"),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail10", 1, 1, "Store", "iFld"),
+                 GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail10", 1, 2, 3)
         );
 
-        runCheck(BadCountsConstraint.create(BadCount.class, "bad1()", 1, 2, "Load"),
-                 GoodCountsConstraint.create(BadCount.class, "bad1()", 2),
-                 GoodCountsConstraint.create(BadCount.class, "bad2()", 1),
-                 BadCountsConstraint.create(BadCount.class, "bad2()", 2,  2, "Store"),
-                 BadCountsConstraint.create(BadCount.class, "bad3()", 1,  2, "Load"),
-                 BadCountsConstraint.create(BadCount.class, "bad3()", 2,  2, "Store")
+        runCheck(BadCountsConstraint.create(BadCount.class, "bad1", 1, 2, "Load"),
+                 GoodCountsConstraint.create(BadCount.class, "bad1", 2),
+                 GoodCountsConstraint.create(BadCount.class, "bad2", 1),
+                 BadCountsConstraint.create(BadCount.class, "bad2", 2, 2,"Store"),
+                 BadCountsConstraint.create(BadCount.class, "bad3", 1, 2,"Load"),
+                 BadCountsConstraint.create(BadCount.class, "bad3", 2, 2,"Store")
         );
 
-        runCheck(GoodRuleConstraint.create(Calls.class, "calls()", 1),
-                 BadFailOnConstraint.create(Calls.class, "calls()", 2, 1, "CallStaticJava", "dontInline"),
-                 BadFailOnConstraint.create(Calls.class, "calls()", 2, 2, "CallStaticJava", "dontInline"),
-                 GoodRuleConstraint.create(Calls.class, "calls()", 3)
+        runCheck(GoodRuleConstraint.create(Calls.class, "calls", 1),
+                 BadFailOnConstraint.create(Calls.class, "calls", 2, 1, "CallStaticJava", "dontInline"),
+                 BadFailOnConstraint.create(Calls.class, "calls", 2, 2, "CallStaticJava", "dontInline"),
+                 GoodRuleConstraint.create(Calls.class, "calls", 3)
         );
 
-        runCheck(BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 1),
-                BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 2),
-                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 3),
-                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 4),
-                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 5),
-                BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 6),
-                BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 7),
-                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 8),
-                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 9),
-                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 10)
+        runCheck(BadFailOnConstraint.create(AllocInstance.class, "allocInstance", 1),
+                BadFailOnConstraint.create(AllocInstance.class, "allocInstance", 2),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance", 3),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance", 4),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance", 5),
+                BadFailOnConstraint.create(AllocInstance.class, "allocInstance", 6),
+                BadFailOnConstraint.create(AllocInstance.class, "allocInstance", 7),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance", 8),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance", 9),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance", 10)
         );
 
         runCheck(
-                BadFailOnConstraint.create(AllocInstance.class, "allocNested()", 1),
-                BadFailOnConstraint.create(AllocInstance.class, "allocNested()", 2),
-                BadFailOnConstraint.create(AllocInstance.class, "allocNested()", 3)
+                BadFailOnConstraint.create(AllocInstance.class, "allocNested", 1),
+                BadFailOnConstraint.create(AllocInstance.class, "allocNested", 2),
+                BadFailOnConstraint.create(AllocInstance.class, "allocNested", 3)
         );
 
-        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocArray()", 1),
-                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 2),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 3),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 4),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 5),
-                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 6),
-                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 7),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 8),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 9),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 10)
+        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocArray", 1),
+                 BadFailOnConstraint.create(AllocArray.class, "allocArray", 2),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray", 3),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray", 4),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray", 5),
+                 BadFailOnConstraint.create(AllocArray.class, "allocArray", 6),
+                 BadFailOnConstraint.create(AllocArray.class, "allocArray", 7),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray", 8),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray", 9),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray", 10)
         );
 
-        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 1),
-                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 2),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 3),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 4),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 5),
-                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 6),
-                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 7),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 8),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 9),
-                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 10)
+        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocMultiArray", 1),
+                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray", 2),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray", 3),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray", 4),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray", 5),
+                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray", 6),
+                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray", 7),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray", 8),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray", 9),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray", 10)
         );
 
-        runCheck(GoodRuleConstraint.create(RunTests.class, "good1()", 1),
-                 GoodRuleConstraint.create(RunTests.class, "good1()", 2),
-                 GoodRuleConstraint.create(RunTests.class, "good2()", 1),
-                 GoodRuleConstraint.create(RunTests.class, "good2()", 2),
-                 GoodRuleConstraint.create(RunTests.class, "good3(int)", 1),
-                 BadCountsConstraint.create(RunTests.class, "bad1(int)", 1, 0),
-                 BadFailOnConstraint.create(RunTests.class, "bad1(int)", 2, "Load")
+        runCheck(GoodRuleConstraint.create(RunTests.class, "good1", 1),
+                 GoodRuleConstraint.create(RunTests.class, "good1", 2),
+                 GoodRuleConstraint.create(RunTests.class, "good2", 1),
+                 GoodRuleConstraint.create(RunTests.class, "good2", 2),
+                 GoodRuleConstraint.create(RunTests.class, "good3", 1),
+                 BadCountsConstraint.create(RunTests.class, "bad1", 1, 0),
+                 BadFailOnConstraint.create(RunTests.class, "bad1", 2, "Load")
         );
 
         runCheck(new String[] {"-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UseCompressedClassPointers"},
-                 BadFailOnConstraint.create(Loads.class, "load()", 1, 1, "Load"),
-                 BadFailOnConstraint.create(Loads.class, "load()", 1, 3, "LoadI"),
-                 BadCountsConstraint.create(Loads.class, "load()", 1, 1, 0),
-                 BadCountsConstraint.create(Loads.class, "load()", 1, 2, 1,"Load"),
-                 GoodRuleConstraint.create(Loads.class, "load()", 2),
-                 GoodFailOnConstraint.create(Loads.class, "load()", 3),
-                 BadCountsConstraint.create(Loads.class, "load()", 3, 2, 2,"Store"),
-                 BadFailOnConstraint.create(Loads.class, "load()", 4, 2, "Store"),
-                 BadFailOnConstraint.create(Loads.class, "load()", 5, "Load"),
-                 BadFailOnConstraint.create(Loads.class, "load()", 6, "Load"),
-                 BadFailOnConstraint.create(Loads.class, "load()", 7, "Load"),
-                 GoodRuleConstraint.create(Loads.class, "load()", 8),
-                 GoodRuleConstraint.create(Loads.class, "load()", 9),
-                 GoodRuleConstraint.create(Loads.class, "load()", 10),
-                 BadFailOnConstraint.create(Loads.class, "loadKlass()", 1),
-                 BadCountsConstraint.create(Loads.class, "loadKlass()", 2, 2,"Field")
+                 BadFailOnConstraint.create(Loads.class, "load", 1, 1, "Load"),
+                 BadFailOnConstraint.create(Loads.class, "load", 1, 3, "LoadI"),
+                 BadCountsConstraint.create(Loads.class, "load", 1, 1, 0),
+                 BadCountsConstraint.create(Loads.class, "load", 1, 2, 1,"Load"),
+                 GoodRuleConstraint.create(Loads.class, "load", 2),
+                 GoodFailOnConstraint.create(Loads.class, "load", 3),
+                 BadCountsConstraint.create(Loads.class, "load", 3, 2, 2,"Store"),
+                 BadFailOnConstraint.create(Loads.class, "load", 4, 2, "Store"),
+                 BadFailOnConstraint.create(Loads.class, "load", 5, "Load"),
+                 BadFailOnConstraint.create(Loads.class, "load", 6, "Load"),
+                 BadFailOnConstraint.create(Loads.class, "load", 7, "Load"),
+                 GoodRuleConstraint.create(Loads.class, "load", 8),
+                 GoodRuleConstraint.create(Loads.class, "load", 9),
+                 GoodRuleConstraint.create(Loads.class, "load", 10),
+                 BadFailOnConstraint.create(Loads.class, "loadKlass", 1),
+                 BadCountsConstraint.create(Loads.class, "loadKlass", 2, 2,"Field")
                  );
 
         // Loops
-        runCheck(BadFailOnConstraint.create(Loops.class, "loop()", 1, "Loop"),
-                 GoodRuleConstraint.create(Loops.class, "loop()", 2),
-                 GoodRuleConstraint.create(Loops.class, "loop()", 3),
-                 GoodRuleConstraint.create(Loops.class, "countedLoop()", 1),
-                 BadFailOnConstraint.create(Loops.class, "countedLoop()", 2, "CountedLoop"),
-                 GoodRuleConstraint.create(Loops.class, "countedLoop()", 3),
-                 BadFailOnConstraint.create(Loops.class, "loopAndCountedLoop()", 1, "Loop"),
-                 BadFailOnConstraint.create(Loops.class, "loopAndCountedLoop()", 2, "CountedLoop"),
-                 GoodRuleConstraint.create(Loops.class, "loopAndCountedLoop()", 3),
-                 GoodRuleConstraint.create(Loops.class, "countedLoopMain()", 1),
-                 BadFailOnConstraint.create(Loops.class, "countedLoopMain()", 2, "CountedLoop"),
-                 BadFailOnConstraint.create(Loops.class, "countedLoopMain()", 3, "CountedLoop", "main"),
-                 GoodRuleConstraint.create(Loops.class, "countedLoopUnrolled()", 1),
-                 GoodRuleConstraint.create(Loops.class, "countedLoopUnrolled()", 2),
-                 GoodRuleConstraint.create(Loops.class, "countedLoopUnrolled()", 3)
+        runCheck(BadFailOnConstraint.create(Loops.class, "loop", 1, "Loop"),
+                 GoodRuleConstraint.create(Loops.class, "loop", 2),
+                 GoodRuleConstraint.create(Loops.class, "loop", 3),
+                 GoodRuleConstraint.create(Loops.class, "countedLoop", 1),
+                 BadFailOnConstraint.create(Loops.class, "countedLoop", 2, "CountedLoop"),
+                 GoodRuleConstraint.create(Loops.class, "countedLoop", 3),
+                 BadFailOnConstraint.create(Loops.class, "loopAndCountedLoop", 1, "Loop"),
+                 BadFailOnConstraint.create(Loops.class, "loopAndCountedLoop", 2, "CountedLoop"),
+                 GoodRuleConstraint.create(Loops.class, "loopAndCountedLoop", 3),
+                 GoodRuleConstraint.create(Loops.class, "countedLoopMain", 1),
+                 BadFailOnConstraint.create(Loops.class, "countedLoopMain", 2, "CountedLoop"),
+                 BadFailOnConstraint.create(Loops.class, "countedLoopMain", 3, "CountedLoop", "main"),
+                 GoodRuleConstraint.create(Loops.class, "countedLoopUnrolled", 1),
+                 GoodRuleConstraint.create(Loops.class, "countedLoopUnrolled", 2),
+                 GoodRuleConstraint.create(Loops.class, "countedLoopUnrolled", 3)
         );
 
         // Traps
-        runCheck(GoodRuleConstraint.create(Traps.class, "noTraps()", 1),
-                 BadFailOnConstraint.create(Traps.class, "noTraps()", 2, "Store", "iFld"),
-                 GoodRuleConstraint.create(Traps.class, "noTraps()", 3),
-                 BadFailOnConstraint.create(Traps.class, "predicateTrap()", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(Traps.class, "predicateTrap()", 2, "CallStaticJava", "uncommon_trap", "predicate"),
-                 GoodRuleConstraint.create(Traps.class, "predicateTrap()", 3),
-                 GoodRuleConstraint.create(Traps.class, "predicateTrap()", 4),
-                 BadFailOnConstraint.create(Traps.class, "nullCheck()", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(Traps.class, "nullCheck()", 2, "CallStaticJava", "uncommon_trap", "null_check"),
-                 BadFailOnConstraint.create(Traps.class, "nullCheck()", 3, "uncommon_trap", "class_check"),
-                 GoodRuleConstraint.create(Traps.class, "nullCheck()", 4),
-                 BadFailOnConstraint.create(Traps.class, "nullAssert()", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(Traps.class, "nullAssert()", 2, "CallStaticJava", "uncommon_trap", "null_assert"),
-                 BadFailOnConstraint.create(Traps.class, "nullAssert()", 3, "CallStaticJava", "uncommon_trap", "null_check"),
-                 GoodRuleConstraint.create(Traps.class, "nullAssert()", 4),
-                 BadFailOnConstraint.create(Traps.class, "unstableIf(boolean)", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(Traps.class, "unstableIf(boolean)",  2, "CallStaticJava", "uncommon_trap", "unstable_if"),
-                 GoodRuleConstraint.create(Traps.class, "unstableIf(boolean)", 3),
-                 BadFailOnConstraint.create(Traps.class, "classCheck()", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(Traps.class, "classCheck()", 2, "CallStaticJava", "uncommon_trap", "class_check"),
-                 BadFailOnConstraint.create(Traps.class, "classCheck()", 3, "CallStaticJava", "uncommon_trap", "null_check"),
-                 GoodRuleConstraint.create(Traps.class, "classCheck()", 4),
-                 BadFailOnConstraint.create(Traps.class, "rangeCheck()", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(Traps.class, "rangeCheck()", 2, "CallStaticJava", "uncommon_trap", "range_check"),
-                 BadFailOnConstraint.create(Traps.class, "rangeCheck()", 3, "CallStaticJava", "uncommon_trap", "null_check"),
-                 GoodRuleConstraint.create(Traps.class, "rangeCheck()", 4),
-                 BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining()", 1, "CallStaticJava", "uncommon_trap"),
+        runCheck(GoodRuleConstraint.create(Traps.class, "noTraps", 1),
+                 BadFailOnConstraint.create(Traps.class, "noTraps", 2, "Store", "iFld"),
+                 GoodRuleConstraint.create(Traps.class, "noTraps", 3),
+                 BadFailOnConstraint.create(Traps.class, "predicateTrap", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(Traps.class, "predicateTrap", 2, "CallStaticJava", "uncommon_trap", "predicate"),
+                 GoodRuleConstraint.create(Traps.class, "predicateTrap", 3),
+                 GoodRuleConstraint.create(Traps.class, "predicateTrap", 4),
+                 BadFailOnConstraint.create(Traps.class, "nullCheck", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(Traps.class, "nullCheck", 2, "CallStaticJava", "uncommon_trap", "null_check"),
+                 BadFailOnConstraint.create(Traps.class, "nullCheck", 3, "uncommon_trap", "class_check"),
+                 GoodRuleConstraint.create(Traps.class, "nullCheck", 4),
+                 BadFailOnConstraint.create(Traps.class, "nullAssert", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(Traps.class, "nullAssert", 2, "CallStaticJava", "uncommon_trap", "null_assert"),
+                 BadFailOnConstraint.create(Traps.class, "nullAssert", 3, "CallStaticJava", "uncommon_trap", "null_check"),
+                 GoodRuleConstraint.create(Traps.class, "nullAssert", 4),
+                 BadFailOnConstraint.create(Traps.class, "unstableIf", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(Traps.class, "unstableIf", 2, "CallStaticJava", "uncommon_trap", "unstable_if"),
+                 GoodRuleConstraint.create(Traps.class, "unstableIf", 3),
+                 BadFailOnConstraint.create(Traps.class, "classCheck", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(Traps.class, "classCheck", 2, "CallStaticJava", "uncommon_trap", "class_check"),
+                 BadFailOnConstraint.create(Traps.class, "classCheck", 3, "CallStaticJava", "uncommon_trap", "null_check"),
+                 GoodRuleConstraint.create(Traps.class, "classCheck", 4),
+                 BadFailOnConstraint.create(Traps.class, "rangeCheck", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(Traps.class, "rangeCheck", 2, "CallStaticJava", "uncommon_trap", "range_check"),
+                 BadFailOnConstraint.create(Traps.class, "rangeCheck", 3, "CallStaticJava", "uncommon_trap", "null_check"),
+                 GoodRuleConstraint.create(Traps.class, "rangeCheck", 4),
+                 BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining", 1, "CallStaticJava", "uncommon_trap"),
                  WhiteBox.getWhiteBox().isJVMCISupportedByGC() ?
-                    BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining()", 2, "CallStaticJava", "uncommon_trap", "intrinsic_or_type_checked_inlining")
-                    : GoodRuleConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining()", 2),
-                 BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining()", 3, "CallStaticJava", "uncommon_trap", "intrinsic"),
-                 BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining()", 4, "CallStaticJava", "uncommon_trap", "null_check"),
-                 GoodRuleConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining()", 5)
+                    BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining", 2, "CallStaticJava", "uncommon_trap", "intrinsic_or_type_checked_inlining")
+                    : GoodRuleConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining", 2),
+                 BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining", 3, "CallStaticJava", "uncommon_trap", "intrinsic"),
+                 BadFailOnConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining", 4, "CallStaticJava", "uncommon_trap", "null_check"),
+                 GoodRuleConstraint.create(Traps.class, "instrinsicOrTypeCheckedInlining", 5)
         );
 
 
         runCheck(new String[] {"-XX:+BailoutToInterpreterForThrows"},
-                 BadFailOnConstraint.create(UnhandledTrap.class, "unhandled()", 1, "CallStaticJava", "uncommon_trap"),
-                 BadFailOnConstraint.create(UnhandledTrap.class, "unhandled()", 2, "CallStaticJava", "uncommon_trap", "unhandled"),
-                 GoodRuleConstraint.create(UnhandledTrap.class, "unhandled()", 3)
+                 BadFailOnConstraint.create(UnhandledTrap.class, "unhandled", 1, "CallStaticJava", "uncommon_trap"),
+                 BadFailOnConstraint.create(UnhandledTrap.class, "unhandled", 2, "CallStaticJava", "uncommon_trap", "unhandled"),
+                 GoodRuleConstraint.create(UnhandledTrap.class, "unhandled", 3)
         );
 
-        runCheck(BadFailOnConstraint.create(ScopeObj.class, "scopeObject()", 1, "ScObj"));
-        runCheck(BadFailOnConstraint.create(Membar.class, "membar()", 1, "MemBar"));
+        runCheck(BadFailOnConstraint.create(ScopeObj.class, "scopeObject", 1, "ScObj"));
+        runCheck(BadFailOnConstraint.create(Membar.class, "membar", 1, "MemBar"));
 
         String cmp;
         if (Platform.isPPC() || Platform.isX86()) {
@@ -255,13 +256,13 @@ public class TestIRMatching {
         } else {
             cmp = "cmp";
         }
-        runCheck(BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 1, cmp, "Constant"),
-                 BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 2, 1,cmp, "Constant", "MyClass"),
-                 BadFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 2, 2,cmp, "Constant", "ir_framework/tests/MyClass"),
-                 GoodFailOnConstraint.create(CheckCastArray.class, "array(java.lang.Object[])", 3),
+        runCheck(BadFailOnConstraint.create(CheckCastArray.class, "array", 1, cmp, "Constant"),
+                 BadFailOnConstraint.create(CheckCastArray.class, "array", 2, 1,cmp, "Constant", "MyClass"),
+                 BadFailOnConstraint.create(CheckCastArray.class, "array", 2, 2,cmp, "Constant", "ir_framework/tests/MyClass"),
+                 GoodFailOnConstraint.create(CheckCastArray.class, "array", 3),
                  Platform.isS390x() ? // There is no checkcast_arraycopy stub for C2 on s390
-                     GoodFailOnConstraint.create(CheckCastArray.class, "arrayCopy(java.lang.Object[],java.lang.Class)", 1)
-                     : BadFailOnConstraint.create(CheckCastArray.class, "arrayCopy(java.lang.Object[],java.lang.Class)", 1, "checkcast_arraycopy")
+                     GoodFailOnConstraint.create(CheckCastArray.class, "arrayCopy", 1)
+                     : BadFailOnConstraint.create(CheckCastArray.class, "arrayCopy", 1, "checkcast_arraycopy")
         );
 
         try {
@@ -440,7 +441,8 @@ public class TestIRMatching {
             }
         }
         if (!output.contains(builder.toString())) {
-            addException(new RuntimeException("Could not find encoding: \"" + builder + System.lineSeparator()));
+            addException(new RuntimeException("Could not find line in Applicable IR Rules: \"" + builder +
+                                                      System.lineSeparator()));
         }
     }
 }
@@ -1554,28 +1556,15 @@ abstract class Constraint {
     private final Class<?> klass;
     protected final int ruleIdx;
     private final Pattern methodPattern;
-    private final String classAndMethod;
-    protected final Pattern irPattern;
     private final String methodName;
     protected boolean matched;
 
-    Constraint(Class<?> klass, String methodName, int ruleIdx, Pattern irPattern) {
-        this.klass = klass;
-        classAndMethod = klass.getSimpleName() + "." + methodName;
-        this.ruleIdx = ruleIdx;
-        this.methodPattern = Pattern.compile(Pattern.quote(classAndMethod));
-        this.irPattern = irPattern;
-        this.methodName = methodName;
-        this.matched = false;
-    }
-
     // For good constraints only
     Constraint(Class<?> klass, String methodName, int ruleIdx) {
         this.klass = klass;
-        classAndMethod = klass.getSimpleName() + "." + methodName;
+        String classAndMethod = klass.getSimpleName() + "::" + methodName;
         this.ruleIdx = ruleIdx;
-        this.methodPattern = Pattern.compile(Pattern.quote(classAndMethod));
-        this.irPattern = null;
+        this.methodPattern = Pattern.compile("\\b" + Pattern.quote(classAndMethod) + "\\b");
         this.methodName = methodName;
         this.matched = false;
     }
@@ -1676,7 +1665,7 @@ abstract class RegexConstraint extends Constraint {
     final List<String> matches;
 
     RegexConstraint(Class<?> klass, String methodName, String category, boolean isGood, List<String> matches, int ruleIdx, int... regexIndexes) {
-        super(klass, methodName, ruleIdx, initIRPattern(category, ruleIdx));
+        super(klass, methodName, ruleIdx);
         this.category = category;
         this.regexIndexes = regexIndexes;
         if (category.equals("failOn")) {
@@ -1705,16 +1694,6 @@ abstract class RegexConstraint extends Constraint {
         return super.errorPrefix() + " with \"" + category + "\"";
     }
 
-    private static Pattern initIRPattern(String category, int ruleIdx) {
-        if (category.equals("failOn")) {
-            return Pattern.compile("rule " + ruleIdx + ":.*\\R.*- failOn: Graph contains forbidden nodes.*\\R" +
-                                   ".*Constraint \\d+:.*\\R.*Matched forbidden node.*");
-        } else {
-            return Pattern.compile("rule " + ruleIdx + ":.*\\R.*- counts: Graph contains wrong number of nodes:\\R" +
-                                   ".*Constraint \\d+:.*\\R.*Expected.*");
-        }
-    }
-
     @Override
     protected void checkIRRule(String irRule) {
         int categoryIndex = irRule.indexOf("- " + category);
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
index fe21dce73b5..8bec7c03bfe 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,8 +69,7 @@ public class TestPhaseIRMatching {
         List<String> testVMFlags = flagVMProcess.getTestVMFlags();
         TestVMProcess testVMProcess = new TestVMProcess(testVMFlags, testClass, null, -1, false, false);
         TestClassParser testClassParser = new TestClassParser(testClass, false);
-        Matchable testClassMatchable = testClassParser.parse(testVMProcess.getHotspotPidFileName(),
-                                                             testVMProcess.getIrEncoding());
+        Matchable testClassMatchable = testClassParser.parse(testVMProcess.testVmData());
         MatchResult result = testClassMatchable.match();
         List<Failure> expectedFails = new ExpectedFailsBuilder().build(testClass);
         List<Failure> foundFailures = new FailureBuilder().build(result);
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
index f8d64944ff4..39dae4ae3ad 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestRunTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class TestRunTests {
             Asserts.fail("Should have thrown exception");
         } catch (IRViolationException e) {
             System.setOut(oldOut);
-            String[] matches = { "test(int)", "test2(int)", "Failed IR Rules (2)"};
+            String[] matches = { "test", "test2", "Failed IR Rules (2)"};
             Arrays.stream(matches).forEach(m -> Asserts.assertTrue(e.getExceptionInfo().contains(m)));
             Asserts.assertEQ(e.getExceptionInfo().split("STANDALONE mode", -1).length - 1, 2);
         }
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSetupTests.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSetupTests.java
index 782a773515a..1cdb6c2797a 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSetupTests.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestSetupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package ir_framework.tests;
 
 import compiler.lib.ir_framework.*;
 import compiler.lib.ir_framework.driver.TestVMException;
-import compiler.lib.ir_framework.shared.TestRunException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -360,10 +359,11 @@ class TestSetupTestsWithExpectedExceptions {
     public void checkThrowInCheck(int x) {
         throw new BadCheckedTestException("expected check");
     }
-}
 
-class BadCheckedTestException extends RuntimeException {
-    BadCheckedTestException(String s) {
-        super(s);
+
+    static class BadCheckedTestException extends RuntimeException {
+        BadCheckedTestException(String s) {
+            super(s);
+        }
     }
 }
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java
index b1f5f74e682..6193b6aad0c 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestPrimitiveTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -174,6 +174,46 @@ public class TestPrimitiveTypes {
 
         tests.put("test_names", namesTemplate.asToken());
 
+        var abbrevDefTemplate = Template.make("type", (PrimitiveType type) -> scope(
+            let("CON1", type.con()),
+            let("CON2", type.con()),
+            let("abbrev", type.abbrev()),
+            let("fieldDesc", type.fieldDesc()),
+            """
+            static #type varAbbrev#abbrev = #CON1;
+            static #type varFieldDesc#fieldDesc = #CON2;
+            """
+        ));
+        var swapTemplate = Template.make("type", (PrimitiveType type) -> scope(
+            let("abbrev", type.abbrev()),
+            let("fieldDesc", type.fieldDesc()),
+            """
+            #type tmp#abbrev = varAbbrev#abbrev;
+            varAbbrev#abbrev = varFieldDesc#fieldDesc;
+            varFieldDesc#fieldDesc = tmp#abbrev;
+            """
+        ));
+        var abbrevTemplate = Template.make(() -> scope(
+            """
+            public static void test_abbrev() {
+            """,
+            Hooks.CLASS_HOOK.insert(scope(
+                // Create fields that would collide if the abbrev() or fieldDesc() methods produced colliding
+                // strings for different types
+                CodeGenerationDataNameType.PRIMITIVE_TYPES.stream().map(type ->
+                    abbrevDefTemplate.asToken(type)
+                ).toList()
+            )),
+                CodeGenerationDataNameType.PRIMITIVE_TYPES.stream().map(type ->
+                    swapTemplate.asToken(type)
+                ).toList(),
+            """
+            }
+            """
+        ));
+
+        tests.put("test_abbrev", abbrevTemplate.asToken());
+
         // Test runtime random value generation with LibraryRNG
         // Runtime random number generation of a given primitive type can be very helpful
         // when writing tests that require random inputs.
@@ -231,6 +271,9 @@ public class TestPrimitiveTypes {
             import compiler.lib.generators.*;
 
             public class InnerTest {
+            """,
+            Hooks.CLASS_HOOK.anchor(scope(
+            """
                 public static void main() {
             """,
             // Call all test methods from main.
@@ -241,7 +284,8 @@ public class TestPrimitiveTypes {
                 }
             """,
             // Now add all the test methods.
-            tests.values().stream().toList(),
+            tests.values().stream().toList()
+            )),
             """
             }
             """
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
index ed542180bad..7de32d1bc10 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/examples/TestTutorial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -226,6 +226,8 @@ public class TestTutorial {
             // we automatically rename the names that have a $ prepended with
             // var_1, var_2, etc.
             """
+            // You can escape a hashtag by doubling it up. e.g. ## will render as a
+            // single hashtag. The same goes for $$.
             int $var = #con;
             System.out.println("T1: #x, #con, " + $var);
             """
diff --git a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
index 9be74d232a7..f56a9d5b231 100644
--- a/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
+++ b/test/hotspot/jtreg/testlibrary_tests/template_framework/tests/TestTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8344942
+ * @bug 8344942 8364393
  * @summary Test some basic Template instantiations. We do not necessarily generate correct
  *          java code, we just test that the code generation deterministically creates the
  *          expected String.
@@ -138,6 +138,7 @@ public class TestTemplate {
         testHookWithNestedTemplates();
         testHookRecursion();
         testDollar();
+        testEscaping();
         testLet1();
         testLet2();
         testDollarAndHashtagBrackets();
@@ -182,7 +183,6 @@ public class TestTemplate {
         expectRendererException(() -> testFailingDollarName5(), "Is not a valid '$' replacement pattern: '$' in '$'.");
         expectRendererException(() -> testFailingDollarName6(), "Is not a valid '$' replacement pattern: '$' in 'asdf$'.");
         expectRendererException(() -> testFailingDollarName7(), "Is not a valid '$' replacement pattern: '$1' in 'asdf$1'.");
-        expectRendererException(() -> testFailingDollarName8(), "Is not a valid '$' replacement pattern: '$' in 'abc$$abc'.");
         expectRendererException(() -> testFailingLetName1(), "A hashtag replacement should not be null.");
         expectRendererException(() -> testFailingHashtagName1(), "Is not a valid hashtag replacement name: ''.");
         expectRendererException(() -> testFailingHashtagName2(), "Is not a valid hashtag replacement name: 'abc#abc'.");
@@ -191,11 +191,12 @@ public class TestTemplate {
         expectRendererException(() -> testFailingHashtagName5(), "Is not a valid '#' replacement pattern: '#' in '#'.");
         expectRendererException(() -> testFailingHashtagName6(), "Is not a valid '#' replacement pattern: '#' in 'asdf#'.");
         expectRendererException(() -> testFailingHashtagName7(), "Is not a valid '#' replacement pattern: '#1' in 'asdf#1'.");
-        expectRendererException(() -> testFailingHashtagName8(), "Is not a valid '#' replacement pattern: '#' in 'abc##abc'.");
         expectRendererException(() -> testFailingDollarHashtagName1(), "Is not a valid '#' replacement pattern: '#' in '#$'.");
         expectRendererException(() -> testFailingDollarHashtagName2(), "Is not a valid '$' replacement pattern: '$' in '$#'.");
-        expectRendererException(() -> testFailingDollarHashtagName3(), "Is not a valid '#' replacement pattern: '#' in '#$name'.");
-        expectRendererException(() -> testFailingDollarHashtagName4(), "Is not a valid '$' replacement pattern: '$' in '$#name'.");
+        expectRendererException(() -> testFailingDollarHashtagName3(), "Found zero sized replacement pattern '#$'.");
+        expectRendererException(() -> testFailingDollarHashtagName4(), "Found zero sized replacement pattern '$#'.");
+        expectRendererException(() -> testFailingDollarHashtagName5(), "Found zero sized replacement pattern '#$'.");
+        expectRendererException(() -> testFailingDollarHashtagName6(), "Found zero sized replacement pattern '$#'.");
         expectRendererException(() -> testFailingHook(), "Hook 'Hook1' was referenced but not found!");
         expectRendererException(() -> testFailingSample1a(),  "No Name found for DataName.FilterdSet(MUTABLE, subtypeOf(int), supertypeOf(int))");
         expectRendererException(() -> testFailingSample1b(),  "No Name found for StructuralName.FilteredSet( subtypeOf(StructuralA) supertypeOf(StructuralA))");
@@ -822,6 +823,60 @@ public class TestTemplate {
         checkEQ(code, expected);
     }
 
+    public static void testEscaping() {
+        var template1 = Template.make(() -> scope(
+            let("one", 1),
+            let("two", 2),
+            let("three", 3),
+            """
+            abc##def
+            abc$$def
+            abc####def
+            abc$$$$def
+            ##abc
+            $$abc
+            abc##
+            abc$$
+            ##
+            $$
+            ######
+            $$$$$$
+            abc###one
+            abc$$$dollar
+            #one ###two #####three
+            ###{one}##
+            $dollar $$$dollar $$$$$dollar
+            $$${dollar}$$
+            ##$dollar $$#one $$##$$##
+            """
+        ));
+
+        String code = template1.render();
+        String expected =
+            """
+            abc#def
+            abc$def
+            abc##def
+            abc$$def
+            #abc
+            $abc
+            abc#
+            abc$
+            #
+            $
+            ###
+            $$$
+            abc#1
+            abc$dollar_1
+            1 #2 ##3
+            #1#
+            dollar_1 $dollar_1 $$dollar_1
+            $dollar_1$
+            #dollar_1 $1 $#$#
+            """;
+        checkEQ(code, expected);
+    }
+
     public static void testLet1() {
         var hook1 = new Hook("Hook1");
 
@@ -3382,13 +3437,6 @@ public class TestTemplate {
         String code = template1.render();
     }
 
-    public static void testFailingDollarName8() {
-        var template1 = Template.make(() -> scope(
-            "abc$$abc" // empty dollar name
-        ));
-        String code = template1.render();
-    }
-
     public static void testFailingLetName1() {
         var template1 = Template.make(() -> scope(
             let(null, $("abc")) // Null input for hashtag name
@@ -3447,13 +3495,6 @@ public class TestTemplate {
         String code = template1.render();
     }
 
-    public static void testFailingHashtagName8() {
-        var template1 = Template.make(() -> scope(
-            "abc##abc" // empty hashtag name
-        ));
-        String code = template1.render();
-    }
-
     public static void testFailingDollarHashtagName1() {
         var template1 = Template.make(() -> scope(
             "#$" // empty hashtag name
@@ -3470,14 +3511,28 @@ public class TestTemplate {
 
     public static void testFailingDollarHashtagName3() {
         var template1 = Template.make(() -> scope(
-            "#$name" // empty hashtag name
+            "#$name" // Zero sized replacement
         ));
         String code = template1.render();
     }
 
     public static void testFailingDollarHashtagName4() {
         var template1 = Template.make(() -> scope(
-            "$#name" // empty dollar name
+            "$#name" // Zero sized replacement
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarHashtagName5() {
+        var template1 = Template.make(() -> scope(
+            "asdf#$abc" // Zero sized replacement
+        ));
+        String code = template1.render();
+    }
+
+    public static void testFailingDollarHashtagName6() {
+        var template1 = Template.make(() -> scope(
+            "asdf$#abc" // Zero sized replacement
         ));
         String code = template1.render();
     }
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java
index 8f8cfdcd541..1fd550d3571 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large001/large001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,8 @@
  *     generated by nsk.share.gc.Generator (see its javadoc for more details).
  *     Each class has a huge number of fields, but this number is less than the JVM
  *     limitation.
- *     The test loads the classes with nsk.share.gc.GCClassUnloader class that
- *     extends nsk.share.ClassUnloader and has a bit different algorith of eating
- *     heap. As soon as a class is loaded, the test creates an instance of
+ *     The test loads the classes with nsk.share.gc.GCClassUnloader class.
+ *     As soon as a class is loaded, the test creates an instance of
  *     it - allocates an object of that type. Then it drops references to the
  *     class and to the instance and tries to unload the class. The test does not
  *     expect any exceptions to be thrown.
@@ -57,10 +56,13 @@
  *          /test/lib
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.gc.GenClassesBuilder
  *
  * @run main/othervm/timeout=1200
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      -Xlog:gc*
  *      gc.gctests.LargeObjects.large001.large001
  *      -largeClassesPath classes
@@ -79,6 +81,7 @@ import nsk.share.TestFailure;
 
 import nsk.share.gc.*;
 import nsk.share.*;
+import jdk.test.whitebox.WhiteBox;
 
 public class large001 extends ThreadedGCTest {
 
@@ -146,8 +149,8 @@ public class large001 extends ThreadedGCTest {
                     List<WeakReference> refs = new ArrayList<WeakReference>(depth);
                     addObjRef(loadedClassInstance, loadedClass, depth, refs);
 
-                    // Drop all references to the class and try to unload it
-                    Algorithms.eatMemory(getExecutionController());
+                    // Keep all references to the class and try to unload it
+                    WhiteBox.getWhiteBox().fullGC();
                     log.debug(id + ": Testing non-null after GC force for: " + name);
                     if (loadedClass == null || loadedClassInstance == null) {
                         throw new Exception("Null class");
@@ -158,21 +161,14 @@ public class large001 extends ThreadedGCTest {
                             throw new Exception("Unexpected null reference");
                         }
                     }
+                    // Drop all references to the class and try to unload it
                     refs = null;
                     loadedClass = null;
                     loadedClassInstance = null;
 
                     log.debug(id + ": Unloading class: "
                             + name);
-                    boolean result = unloader.unloadClass(getExecutionController());
-                    log.debug(id + ": Result of uloading "
-                            + "class " + name + ": " + result);
-                }
-            } catch (OutOfMemoryError oome) {
-                // just skip if we eat memory in several threads...
-                // rethrow in the case of one thread
-                if (runParams.getNumberOfThreads() == 1) {
-                    throw oome;
+                    WhiteBox.getWhiteBox().fullGC();
                 }
             } catch (Throwable t) {
                 throw new TestFailure("Unexpected exception: ", t);
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java
index c207b80c059..834a5d71822 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,9 +47,8 @@
  *     generated by nsk.share.gc.Generator (see its javadoc for more details).
  *     Each class has a huge number of fields, and the number of fields is more than
  *     the JVM limitation.
- *     The test loads the classes with nsk.share.gc.GCClassUnloader class that
- *     extends nsk.share.ClassUnloader and has a bit different algorith of eating
- *     heap. As soon as a class is loaded, the test creates an instance of
+ *     The test loads the classes with nsk.share.gc.GCClassUnloader class.
+ *     As soon as a class is loaded, the test creates an instance of
  *     it - allocates an object of that type. Then it drops references to the
  *     class and to the instance and tries to unload the class. The test does not
  *     expect any exceptions to be thrown.
@@ -58,10 +57,13 @@
  *          /test/lib
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.gc.GenClassesBuilder
  *
  * @run main/othervm/timeout=1200
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      gc.gctests.LargeObjects.large001.large001
  *      -largeClassesPath classes
  *      -isOverLimitFields true
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java
index fd7e1e5e8dd..d094776cb5d 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,9 +47,8 @@
  *     generated by nsk.share.gc.Generator (see its javadoc for more details).
  *     Each class has a huge number of fields, but this number is less than the JVM
  *     limitation.
- *     The test loads the classes with nsk.share.gc.GCClassUnloader class that
- *     extends nsk.share.ClassUnloader and has a bit different algorith of eating
- *     heap. As soon as a class is loaded, the test creates an instance of
+ *     The test loads the classes with nsk.share.gc.GCClassUnloader class.
+ *     As soon as a class is loaded, the test creates an instance of
  *     it - allocates an object of that type. Then it drops references to the
  *     class and to the instance and tries to unload the class. The test does not
  *     expect any exceptions to be thrown.
@@ -62,10 +61,13 @@
  *          /test/lib
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.gc.GenClassesBuilder
  *
  * @run main/othervm/timeout=1200
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      gc.gctests.LargeObjects.large001.large001
  *      -largeClassesPath classes
  *      -isOverLimitFields false
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java
index 2301daba8d3..021170d7d7a 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,9 +47,8 @@
  *     generated by nsk.share.gc.Generator (see its javadoc for more details).
  *     Each class has a huge number of fields, but this number is less than the JVM
  *     limitation.
- *     The test loads the classes with nsk.share.gc.GCClassUnloader class that
- *     extends nsk.share.ClassUnloader and has a bit different algorith of eating
- *     heap. As soon as a class is loaded, the test creates an instance of
+ *     The test loads the classes with nsk.share.gc.GCClassUnloader class.
+ *     As soon as a class is loaded, the test creates an instance of
  *     it - allocates an object of that type. Then it drops references to the
  *     class and to the instance and tries to unload the class. The test does not
  *     expect any exceptions to be thrown.
@@ -62,10 +61,13 @@
  *          /test/lib
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.gc.GenClassesBuilder
  *
  * @run main/othervm/timeout=1200
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      gc.gctests.LargeObjects.large001.large001
  *      -largeClassesPath classes
  *      -isOverLimitFields true
diff --git a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java
index abf91f48dea..6ad629aa84e 100644
--- a/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,9 +47,8 @@
  *     generated by nsk.share.gc.Generator (see its javadoc for more details).
  *     Each class has a huge number of fields, but this number is less than the JVM
  *     limitation.
- *     The test loads the classes with nsk.share.gc.GCClassUnloader class that
- *     extends nsk.share.ClassUnloader and has a bit different algorith of eating
- *     heap. As soon as a class is loaded, the test creates an instance of
+ *     The test loads the classes with nsk.share.gc.GCClassUnloader class.
+ *     As soon as a class is loaded, the test creates an instance of
  *     it - allocates an object of that type. Then it drops references to the
  *     class and to the instance and tries to unload the class. The test does not
  *     expect any exceptions to be thrown.
@@ -62,10 +61,13 @@
  *          /test/lib
  *
  * @comment generate and compile nsk.share.gc.newclass.* classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.gc.GenClassesBuilder
  *
  * @run main/othervm/timeout=1200
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      gc.gctests.LargeObjects.large001.large001
  *      -largeClassesPath classes
  *      -isOverLimitFields true
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
index 20584002f6e..efec917716a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ClassObjectReference.reflectedType.reflectype002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
index c967382ccfd..8f906d4d6b2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/className/classname001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
  *    debugger and debugee communicates with special commands.
  *    The debugger forces debuggee to load checked class, creates and
  *    enables ClassUnloadRequest. Next, debugger forces debuggee to
- *    unload class, using memory stressing techique, and waits for
+ *    unload class, using whitebox full GC techique, and waits for
  *    ClassUnloadEvent.
  *    If expected ClassUnloadEvent occurs, debugger tests method
  *    ClassUnloadEvent.className() and verifies that this event
@@ -81,6 +81,8 @@
  *        nsk.jdi.ClassUnloadEvent.className.classname001a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -92,6 +94,6 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
index c83d6cdf0f3..6974e7077df 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadEvent/classSignature/signature001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
  *    debugger and debugee communicates with special commands.
  *    The debugger forces debugge to load checked classes, creates and
  *    enables ClassUnloadRequest. Next, debugger forces debuggee to
- *    unload classes, using memory stressing techique, and waits for
+ *    unload classes, using whitebox full GC techique, and waits for
  *    ClassUnloadEvent.
  *    If each expected ClassUnloadEvent occurs, debugger tests method
  *    ClassUnloadEvent.classSignature() and verifies that this event
@@ -87,6 +87,8 @@
  *        nsk.jdi.ClassUnloadEvent.classSignature.signature001a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -98,6 +100,6 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java
index ad14def18dc..d449ed04f91 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassExclusionFilter/exclfilter001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,6 +67,8 @@
  *        nsk.jdi.ClassUnloadRequest.addClassExclusionFilter.exclfilter001a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -77,6 +79,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java
index 6a388fbaea9..1783e44fa43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassUnloadRequest/addClassFilter/filter001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,8 @@
  *        nsk.jdi.ClassUnloadRequest.addClassFilter.filter001a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -75,6 +77,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
index 25196c3ae9b..053a6ff34c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allFields/allfields003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.allFields.allfields003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
index 149de042248..a0e8bd2b7f1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/allMethods/allmethods003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.allMethods.allmethods003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
index a639fe76ad8..ab751a1f29c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/classObject/classobj002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.classObject.classobj002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
index 1ccd1358c1c..e1c25e9dbdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/equals/equals002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.equals.equals002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
index af68db9d869..703bb6c54aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/failedToInitialize/failedtoinit002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.failedToInitialize.failedtoinit002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
index bbd8998d3a1..fa5104cad55 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fieldByName/fieldbyname003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.fieldByName.fieldbyname003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
index d6379dfbdbf..ab6af3a98e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/fields/fields003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.fields.fields003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
index f7a960746d9..693171c9dfe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/hashCode/hashcode002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.hashCode.hashcode002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
index 6f9c0d5b18e..b61c14d3d4b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isAbstract/isabstract002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.isAbstract.isabstract002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
index c484851c178..c2b1eac7c1e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isInitialized/isinit002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.isInitialized.isinit002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
index 867b7c45e81..9030c57a727 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isPrepared/isprepared002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.isPrepared.isprepared002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
index 5f638386da8..a766e7476f6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/isVerified/isverified002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,8 @@
  *        nsk.jdi.ReferenceType.isVerified.isverified002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -67,6 +69,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
index df70528ffd9..5a37d7e66a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methods/methods003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,8 @@
  * @comment compile loadclassXX to bin/loadclassXX
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
- *
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver
  *      nsk.jdi.ReferenceType.methods.methods003
  *      -verbose
@@ -65,6 +66,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
index fae4c67e986..6f70f225a14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_s/methbyname_s003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.methodsByName_s.methbyname_s003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
index 5d21a5c868f..baf8931a636 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/methodsByName_ss/methbyname_ss003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,6 +57,8 @@
  * @comment compile loadclassXX to bin/loadclassXX
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  *
  * @run driver
  *      nsk.jdi.ReferenceType.methodsByName_ss.methbyname_ss003
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
index 91c37d75710..927e07929b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/name/name002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.name.name002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
index 74427e9a8bc..543272a52f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/sourceName/sourcename002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.sourceName.sourcename002a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
index db4ba02e457..f349deaad85 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleFields/visibfield003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.visibleFields.visibfield003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
index 11c4c3566bb..c6de37e2939 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ReferenceType/visibleMethods/visibmethod003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
  *        nsk.jdi.ReferenceType.visibleMethods.visibmethod003a
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
@@ -65,6 +67,7 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}" ./bin
+ *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts} -Xbootclasspath/a:.
+ *                      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI"
+ *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
index f2150775916..4f4e83188b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,8 @@
  * @build nsk.jdi.VirtualMachine.instanceCounts.instancecounts003.instancecounts003
  *        nsk.share.jdi.TestClass1
  *        nsk.share.jdi.TestInterfaceImplementer1
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver
  *      nsk.jdi.VirtualMachine.instanceCounts.instancecounts003.instancecounts003
  *      -verbose
@@ -55,7 +57,9 @@
  *      -waittime=5
  *      -debugee.vmkind=java
  *      -transport.address=dynamic
- *      -debugee.vmkeys="-Xmx256M ${test.vm.opts} ${test.java.opts}"
+ *      -debugee.vmkeys="-Xmx256M ${test.vm.opts} ${test.java.opts}
+ *                      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                      -XX:+WhiteBoxAPI"
  *      -testClassPath ${test.class.path}
  */
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001.java
index e03c4ff4be2..cf840e56c07 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,6 @@
 package nsk.jvmti.CompiledMethodUnload;
 
 import java.io.*;
-import java.math.*;
-import java.util.*;
 
 import nsk.share.*;
 import nsk.share.jvmti.*;
@@ -47,7 +45,7 @@ public class compmethunload001 {
     private final static String CLS_TO_BE_UNLOADED =
         "nsk.jvmti.CompiledMethodUnload.compmethunload001u";
 
-    private final static int MAX_ITERATIONS = 5;
+    private final static int MAX_ITERATIONS = 10;
 
     static {
         try {
@@ -93,9 +91,11 @@ public class compmethunload001 {
         hotCls = null;
         c = null;
 
-        boolean clsUnloaded = clsUnLoader.unloadClass();
-        clsUnLoader = null;
-        System.gc();
+        // BackgroundCompilation is on by default so wait for compiler threads
+        // to drop references to the to-be-unloaded class.
+        if (!clsUnLoader.unloadClassAndWait(10_000)) {
+            throw new Failure("Class should have been unloaded");
+        }
     }
 
     private int runThis(String argv[], PrintStream out) throws Exception {
@@ -110,12 +110,13 @@ public class compmethunload001 {
         int num = unloaded();
         int iter = 0;
         while (num == 0) {
-           System.gc();
-           num = unloaded();
-           iter++;
-           if (iter > MAX_ITERATIONS) {
-               throw new Failure("PRODUCT BUG: class was not unloaded in " + MAX_ITERATIONS);
-           }
+            // The unload is delayed because it happens async
+            Thread.sleep(1000);
+            num = unloaded();
+            iter++;
+            if (iter > MAX_ITERATIONS) {
+                throw new Failure("PRODUCT BUG: no classunloading callback in " + MAX_ITERATIONS);
+            }
         }
         System.out.println("Number of unloaded events " + num + " number of iterations " + iter);
         return check();
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/TestDescription.java
index 975f0fdee28..b3e43bf7d03 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,12 +46,14 @@
  * @build nsk.jvmti.CompiledMethodUnload.compmethunload001
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
  * @run main/othervm/native
  *      -agentlib:compmethunload001=-waittime=5
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.jvmti.CompiledMethodUnload.compmethunload001
  *      ./bin
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/TestDescription.java
index 8da18b646c7..c7f5376e53c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,12 +51,15 @@
  * @build nsk.jvmti.ObjectFree.objfree001
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
  * @run main/othervm/native
  *      -agentlib:objfree001=-waittime=5
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.jvmti.ObjectFree.objfree001
  *      ./bin 5 ./bin
  */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003.java
index d4cb4a8569a..a23732dc554 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -105,6 +105,21 @@ public class em02t003 extends DebugeeClass {
                 return Consts.TEST_FAILED;
             }
 
+            while (thrd.isAlive()) {
+                logger.display("Thread state: " + thrd.getState()
+                    + " - waiting for completion.");
+                try {
+                    // small delay to avoid produce huge amount of output
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                }
+            }
+            try {
+                // give some time wait thread to exit completely
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+            }
+
             logger.display("MethodCompiling:: Provoke unloading compiled method - "
                                 + "\n\ttrying to unload class...");
             thrd = null;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/TestDescription.java
index d3179b3c2c0..c32abdb635b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,13 +71,15 @@
  * @build nsk.jvmti.scenarios.events.EM02.em02t003
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
  * @run main/othervm/native
  *      -agentlib:em02t003=-waittime=5
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.jvmti.scenarios.events.EM02.em02t003
  *      ./bin/loadclass
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/TestDescription.java
index 5e8b186fe9d..35fc4ceacdb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,13 +64,15 @@
  * @build nsk.jvmti.scenarios.events.EM02.em02t005
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
  * @run main/othervm/native
  *      -agentlib:em02t005=-waittime=5
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.jvmti.scenarios.events.EM02.em02t005
  *      ./bin/loadclass
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/TestDescription.java
index aacc48a1e94..dea19222973 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,13 +57,15 @@
  * @build nsk.jvmti.scenarios.events.EM07.em07t002
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
  * @run main/othervm/native
  *      -agentlib:em07t002=attempts=2,-waittime=5
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.jvmti.scenarios.events.EM07.em07t002
  *      ./bin/loadclass
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java
index 0e63411b94b..76798c229f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,13 +55,15 @@
  * @build nsk.jvmti.scenarios.extension.EX03.ex03t001
  *
  * @comment compile loadclassXX to bin/loadclassXX
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.share.ExtraClassesBuilder
  *      loadclass
  *
  * @run main/othervm/native
  *      -agentlib:ex03t001=-waittime=5
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.jvmti.scenarios.extension.EX03.ex03t001
  *      ./bin/loadclass
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
index 52459a7994f..8205729e4ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ static int prepare(JNIEnv* jni) {
 /** Agent algorithm. */
 static void JNICALL
 agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
-    jint dummy;
+    jint dummy = 0;
 
     if (!nsk_jvmti_waitForSync(timeout))
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp
index 7f716d009ce..f2cff01948b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,7 +113,7 @@ static int prepare(JNIEnv* jni) {
 /** Agent algorithm. */
 static void JNICALL
 agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
-    jint dummy;
+    jint dummy = 0;
 
     if (!nsk_jvmti_waitForSync(timeout))
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load001/TestDescription.java
index e93d0052423..979f51007a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,12 +43,14 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load002/TestDescription.java
index 563eb7500a0..e1dcaaf6946 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,13 +46,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load003/TestDescription.java
index d972a74492c..41ffed813d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
@@ -56,4 +59,3 @@
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load004/TestDescription.java
index 7789d6b70ce..b0470cca572 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load004/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,13 +47,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -singleClassloaderClass
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load005/TestDescription.java
index b6eba9ca652..d5be1a61e8a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load005/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
@@ -54,4 +57,3 @@
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load006/TestDescription.java
index af8f67362bf..eff574f05a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load006/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
@@ -55,4 +58,3 @@
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java
index f8674cdbd21..ecd7e495fb9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,12 +46,14 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=360
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -loadableClassCount=100
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load008/TestDescription.java
index f306fda9e02..9ebc7be7a72 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load008/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,13 +44,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=420
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
  *      -loadableClassCount=100
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load009/TestDescription.java
index 50f8116f7c9..5355064e57a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load009/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=420
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
@@ -54,4 +57,3 @@
  *      -loadableClassCount=100
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load010/TestDescription.java
index 4f477035cd2..fe0ec8c9b62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load010/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,13 +46,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=300
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -singleClassloaderClass
  *      -loadableClassCount=100
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java
index 110f270daff..a5a1a5ae2a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=360
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
@@ -54,4 +57,3 @@
  *      -loadableClassCount=100
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java
index 52c9d3e8ae7..ac3f8217a0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=300
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.load001
  *      classes
  *      -testMode=server
@@ -55,4 +58,3 @@
  *      -loadableClassCount=100
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload001/TestDescription.java
index cab8b333848..9690240caa5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,11 +46,13 @@
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload002/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload002/TestDescription.java
index cf611e5eb05..52395f92b0c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload002/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload002/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,13 +46,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload003/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload003/TestDescription.java
index 6c8d9f61e36..7e24f92dafd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload003/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload003/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
@@ -56,4 +59,3 @@
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload004/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload004/TestDescription.java
index 8f8e46e40be..8dedf5c1f61 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload004/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload004/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,13 +47,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -singleClassloaderClass
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload005/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload005/TestDescription.java
index 73aa31b3ff3..e4236d40e58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload005/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload005/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
@@ -54,4 +57,3 @@
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload006/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload006/TestDescription.java
index 1b3d309a7fd..ef6e3d996d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload006/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload006/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,9 +44,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
@@ -55,4 +58,3 @@
  *      -loadableClassCount=1
  *      -loadersCount=100
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload007/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload007/TestDescription.java
index 62eaaa6c40a..cbe155bc77e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload007/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload007/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,12 +48,14 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -loadableClassCount=100
  *      -loadersCount=12
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload008/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload008/TestDescription.java
index f87f913b769..41894adaed7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload008/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload008/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,13 +46,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
  *      -loadableClassCount=100
  *      -loadersCount=12
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload009/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload009/TestDescription.java
index 27c19980411..5999a8c7f7c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload009/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload009/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm/timeout=180
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
@@ -56,4 +59,3 @@
  *      -loadableClassCount=100
  *      -loadersCount=12
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload010/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload010/TestDescription.java
index afc3cbb026c..683bca7ab93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload010/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload010/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,13 +48,15 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -singleClassloaderClass
  *      -loadableClassCount=100
  *      -loadersCount=12
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload011/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload011/TestDescription.java
index 037d4c2affe..26227644431 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload011/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload011/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
@@ -56,4 +59,3 @@
  *      -loadableClassCount=100
  *      -loadersCount=12
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload012/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload012/TestDescription.java
index 256b0f91d1f..446db1d6e28 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload012/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload012/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,9 +46,12 @@
  * @library /vmTestbase
  *          /test/lib
  * @comment generate and compile LoadableClassXXX classes
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run driver nsk.monitoring.stress.classload.GenClassesBuilder
  * @run main/othervm
  *      -XX:-UseGCOverheadLimit
+ *      -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *      nsk.monitoring.stress.classload.unload001
  *      classes
  *      -testMode=server
@@ -57,4 +60,3 @@
  *      -loadableClassCount=100
  *      -loadersCount=12
  */
-
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/ClassUnloader.java b/test/hotspot/jtreg/vmTestbase/nsk/share/ClassUnloader.java
index e3b6693657c..8f473bf60c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/ClassUnloader.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/ClassUnloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,15 @@ import java.util.*;
 import nsk.share.gc.gp.*;
 import nsk.share.test.ExecutionController;
 import nsk.share.test.Stresser;
+import jdk.test.lib.Utils;
+import jdk.test.whitebox.WhiteBox;
 
 /**
  * The <code>ClassUnloader</code> class allows to force VM to unload class(es)
- * using memory stressing technique.
+ * using WhiteBox.fullGC technique.
  *
- * <p>The method <code>unloadClass()</code> is provided which eats memory
- * to enforce GC to cleanup the heap. So, if all references to a class
+ * <p>The method <code>unloadClass()</code> is provided which calls
+ * WhiteBox.fullGC to cleanup the heap. So, if all references to a class
  * and its loader are canceled, this may result in unloading the class.
  *
  * <p>ClassUnloader mainly intends to unload a class which was loaded
@@ -228,62 +230,51 @@ public class ClassUnloader {
 
     /**
      * Forces GC to unload previously loaded classes by cleaning all references
-     * to class loader with its loaded classes and eating memory.
+     * to class loader with its loaded classes.
      *
-     * @return  <i>true</i> if classes unloading has been detected
+     * @return  <i>true</i> if the class has been unloaded
              or <i>false</i> otherwise
      *
-     * @throws  Failure if exception other than OutOfMemoryError
-     *           is thrown while eating memory
-     *
-     * @see #eatMemory()
+     * @see WhiteBox.getWhiteBox().fullGC()
      */
-    public boolean unloadClass(ExecutionController stresser) {
-
+    public boolean unloadClass() {
         // free references to class and class loader to be able for collecting by GC
         classObjects.removeAllElements();
         customClassLoader = null;
 
-        // force class unloading by eating memory pool
-        eatMemory(stresser);
+        // force class unloading by triggering full GC
+        WhiteBox.getWhiteBox().fullGC();
 
-        // force GC to unload marked class loader and its classes
         if (isClassLoaderReclaimed()) {
-            Runtime.getRuntime().gc();
+            System.out.println("ClassUnloader: class loader has been reclaimed.");
             return true;
+        } else {
+            System.out.println("ClassUnloader: class loader is still reachable.");
+            return false;
         }
-
-        // class loader has not been reclaimed
-        return false;
     }
 
-    public boolean unloadClass() {
-        Stresser stresser = new Stresser() {
-
-            @Override
-            public boolean continueExecution() {
-                return true;
+    /**
+     * Forces GC to unload previously loaded classes by cleaning all references
+     * to class loader with its loaded classes and wait for class loader to be reclaimed.
+     *
+     * @param timeout max time to wait for class loader to be reclaimed in milliseconds
+     * @return  <i>true</i> if the class has been unloaded
+             or <i>false</i> otherwise
+     */
+    public boolean unloadClassAndWait(long timeout) {
+        timeout = Utils.adjustTimeout(timeout);
+        boolean wasUnloaded;
+        final long waitTime = 100;
+        do {
+            try {
+                Thread.sleep(waitTime);
+            } catch (InterruptedException e) {
+                // ignore
             }
-
-        };
-        return unloadClass(stresser);
-    }
-
-     // Stresses memory by allocating arrays of bytes.
-   public static void eatMemory(ExecutionController stresser) {
-       GarbageUtils.eatMemory(stresser, 50, 1024, 2);
-    }
-
-     // Stresses memory by allocating arrays of bytes.
-    public static void eatMemory() {
-        Stresser stresser = new Stresser() {
-
-            @Override
-            public boolean continueExecution() {
-                return true;
-            }
-
-        };
-        eatMemory(stresser);
+            timeout -= waitTime;
+            wasUnloaded = unloadClass();
+        } while (!wasUnloaded && timeout > 0);
+        return wasUnloaded;
     }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/AbstractDebuggeeTest.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/AbstractDebuggeeTest.java
index 74516fd5a69..ec4dcd87d67 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/AbstractDebuggeeTest.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jpda/AbstractDebuggeeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,7 +153,18 @@ public class AbstractDebuggeeTest {
         ClassUnloader classUnloader = loadedClasses.get(className);
 
         if (classUnloader != null) {
-            boolean wasUnloaded = classUnloader.unloadClass();
+            boolean wasUnloaded;
+            if (expectedUnloadingResult) {
+                // We expect unloading to succeed. Retry multiple times because
+                // the debug agent creates global references (NewGlobalRef)
+                // when handling ClassPrepare events. These global references
+                // are released only by the agent thread, whose scheduling can
+                // be delayed, causing class unloading to occur later than
+                // expected.
+                wasUnloaded = classUnloader.unloadClassAndWait(10_000);
+            } else {
+                wasUnloaded = classUnloader.unloadClass();
+            }
 
             if (wasUnloaded)
                 loadedClasses.remove(className);
diff --git a/test/jaxp/ProblemList.txt b/test/jaxp/ProblemList.txt
index 23ebb07f5ff..8f7380a43f8 100644
--- a/test/jaxp/ProblemList.txt
+++ b/test/jaxp/ProblemList.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,3 +23,15 @@
 #
 ###########################################################################
 
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jaxp/TEST.ROOT b/test/jaxp/TEST.ROOT
index 82504c251c0..aff3b769830 100644
--- a/test/jaxp/TEST.ROOT
+++ b/test/jaxp/TEST.ROOT
@@ -23,7 +23,7 @@ modules=java.xml
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=8.1+1
+requiredVersion=8.2.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
diff --git a/test/jdk/ProblemList-AotJdk.txt b/test/jdk/ProblemList-AotJdk.txt
index 20960652dcf..c98bf63b25f 100644
--- a/test/jdk/ProblemList-AotJdk.txt
+++ b/test/jdk/ProblemList-AotJdk.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -44,3 +44,15 @@ java/lang/invoke/DumpMethodHandleInternals.java                 0000000 generic-
 # this message will not be printed in the production run.
 java/util/Locale/UseOldISOCodesTest.java                       0000000 generic-all
 
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-StaticJdk.txt b/test/jdk/ProblemList-StaticJdk.txt
index 70f0438c0c6..700099656e8 100644
--- a/test/jdk/ProblemList-StaticJdk.txt
+++ b/test/jdk/ProblemList-StaticJdk.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,3 +24,16 @@
 ###########################################################################
 
 # Currently empty
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index fc5f31e3ce8..52f187086de 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,3 +34,15 @@ java/lang/ScopedValue/StressStackOverflow.java#default 8309646 generic-all
 java/lang/ScopedValue/StressStackOverflow.java#no-TieredCompilation 8309646 generic-all
 java/lang/ScopedValue/StressStackOverflow.java#TieredStopAtLevel1 8309646 generic-all
 
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-Xcomp.txt b/test/jdk/ProblemList-Xcomp.txt
index 5ed171a1fea..44bad411f26 100644
--- a/test/jdk/ProblemList-Xcomp.txt
+++ b/test/jdk/ProblemList-Xcomp.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,3 +29,16 @@
 
 java/lang/invoke/MethodHandles/CatchExceptionTest.java          8146623 generic-all
 java/lang/reflect/callerCache/ReflectionCallerCacheTest.java    8332028 generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-coh.txt b/test/jdk/ProblemList-coh.txt
new file mode 100644
index 00000000000..b3bddb0c9f4
--- /dev/null
+++ b/test/jdk/ProblemList-coh.txt
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing with -XX:+UseCompactObjectHeaders
+#
+#############################################################################
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-enable-preview.txt b/test/jdk/ProblemList-enable-preview.txt
index 31e09d372a8..1a831a0dde3 100644
--- a/test/jdk/ProblemList-enable-preview.txt
+++ b/test/jdk/ProblemList-enable-preview.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 #
 # List of quarantined tests for testing with --enable-preview
 #
+# These are failures that ONLY occur with the '--enable-preview' option
+# specified. There are separate sub-sections for each preview project.
+#
 #############################################################################
 
-
diff --git a/test/jdk/ProblemList-jvmti-stress-agent.txt b/test/jdk/ProblemList-jvmti-stress-agent.txt
index 09be19c3d94..e9019b6014e 100644
--- a/test/jdk/ProblemList-jvmti-stress-agent.txt
+++ b/test/jdk/ProblemList-jvmti-stress-agent.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,3 +29,16 @@ com/sun/jdi/ThreadMemoryLeakTest.java                                       0000
 # weak referenced are not cleared
 java/lang/WeakPairMap/Driver.java                                           0000000 generic-all
 java/lang/ref/ReachabilityFenceTest.java                                    0000000 generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-shenandoah.txt b/test/jdk/ProblemList-shenandoah.txt
index 063795d69e8..522b77cb502 100644
--- a/test/jdk/ProblemList-shenandoah.txt
+++ b/test/jdk/ProblemList-shenandoah.txt
@@ -58,3 +58,15 @@ jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java            8342951     generic-all
 jdk/jfr/jvm/TestWaste.java                              8342951     generic-all
 jdk/jfr/startupargs/TestOldObjectQueueSize.java         8342951     generic-all
 
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt
index ab44c5e47a9..065a52f9a83 100644
--- a/test/jdk/ProblemList-zgc.txt
+++ b/test/jdk/ProblemList-zgc.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,3 +38,16 @@ sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8307393   generic-all
 sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8307393   generic-all
 
 com/sun/jdi/ThreadMemoryLeakTest.java              8307402   generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 9cfc23ea8da..070f9b0ce03 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -223,6 +223,7 @@ sun/awt/shell/ShellFolderMemoryLeak.java 8197794 windows-all
 sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java 8196102 generic-all
 sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java 8196180 windows-all,macosx-all
 sun/java2d/OpenGL/OpaqueDest.java#id1 8367574 macosx-all
+sun/java2d/OpenGL/ScaleParamsOOB.java#id0 8377908 linux-all
 sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java 8144029 macosx-all,linux-all
 sun/java2d/SunGraphics2D/DrawImageBilinear.java 8297175 linux-all
 sun/java2d/SunGraphics2D/PolyVertTest.java 6986565 generic-all
@@ -710,7 +711,6 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 # jdk_jfr
 
 jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-all
-jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java             8371014 aix-ppc64,linux-ppc64le
 jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
 jdk/jfr/jvm/TestWaste.java                                      8371630 generic-all
@@ -778,3 +778,16 @@ java/awt/Cursor/CursorDragTest/ListDragCursor.java 7177297 macosx-all
 # jdk_since_checks
 
 tools/sincechecker/modules/jdk.management.jfr/JdkManagementJfrCheckSince.java 8354921 generic-all
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index f22b316e19a..cc571deab20 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This file identifies the root of the test-suite hierarchy.
@@ -123,7 +123,7 @@ requires.properties= \
     jdk.static
 
 # Minimum jtreg version
-requiredVersion=8.1+1
+requiredVersion=8.2.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 27f6bb48a63..ccf745700d1 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -1,4 +1,4 @@
-#  Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
 #  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 #  This code is free software; you can redistribute it and/or modify it
@@ -664,7 +664,8 @@ jdk_core_manual_interactive = \
 jdk_security_manual_interactive = \
     sun/security/tools/keytool/i18n.java \
     com/sun/security/auth/callback/TextCallbackHandler/Password.java \
-    sun/security/krb5/config/native/TestDynamicStore.java
+    sun/security/krb5/config/native/TestDynamicStore.java \
+    sun/security/tools/keytool/EchoPassword.java
 
 # Test sets for running inside container environment
 jdk_containers_extended = \
diff --git a/test/jdk/build/CheckFiles.java b/test/jdk/build/CheckFiles.java
index 412e66ebf01..7ef5b803d2d 100644
--- a/test/jdk/build/CheckFiles.java
+++ b/test/jdk/build/CheckFiles.java
@@ -23,6 +23,7 @@
  */
 
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -36,7 +37,7 @@ import jdk.test.lib.Platform;
 
 /*
  * @test
- * @summary Check for unwanted file (types/extensions) in the jdk image
+ * @summary Check for unwanted files (types/extensions) in the jdk image
  * @library /test/lib
  * @requires !vm.debug
  * @run main CheckFiles
@@ -47,6 +48,20 @@ public class CheckFiles {
     // JTREG=JAVA_OPTIONS=-Djdk.test.build.CheckFiles.dir=/path/to/dir
     public static final String DIR_PROPERTY = "jdk.test.build.CheckFiles.dir";
 
+    private static boolean isGpl(Path myFile) {
+        if (myFile == null || !Files.exists(myFile)) {
+            return false;
+        }
+
+        try {
+            String firstLine = Files.readAllLines(myFile).stream()
+                                    .findFirst().orElse("");
+            return firstLine.contains("The GNU General Public License (GPL)");
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
     public static void main(String[] args) throws Exception {
         String jdkPathString = System.getProperty("test.jdk");
         Path jdkHome = Paths.get(jdkPathString);
@@ -60,6 +75,8 @@ public class CheckFiles {
         System.out.println("Main directory to scan:" + mainDirToScan);
         Path binDir = mainDirToScan.resolve("bin");
         Path libDir = mainDirToScan.resolve("lib");
+        Path includeDir = mainDirToScan.resolve("include");
+        Path jmodsDir = mainDirToScan.resolve("jmods");
 
         System.out.println("Bin directory to scan:" + binDir);
         ArrayList<String> allowedEndingsBinDir = new ArrayList<>();
@@ -89,6 +106,8 @@ public class CheckFiles {
         allowedEndingsLibDir.add("psfont.properties.ja");
         allowedEndingsLibDir.add("src.zip");
         allowedEndingsLibDir.add("tzdb.dat");
+        allowedEndingsLibDir.add("javafx-swt.jar");
+        allowedEndingsLibDir.add("javafx.properties");
         if (Platform.isWindows()) {
             allowedEndingsLibDir.add(".lib");
             allowedEndingsLibDir.add("tzmappings");
@@ -108,13 +127,86 @@ public class CheckFiles {
         }
         boolean libDirRes = scanFiles(libDir, allowedEndingsLibDir);
 
-        if (!binDirRes) {
+        if (binDirRes) {
+            System.out.println("Bin directory scan successful.");
+        } else {
             throw new Error("bin dir scan failed");
         }
 
-        if (!libDirRes) {
+        if (libDirRes) {
+            System.out.println("Lib directory scan successful.");
+        } else {
             throw new Error("lib dir scan failed");
         }
+
+        if (Files.isDirectory(includeDir)) {
+            System.out.println("Include directory to scan:" + includeDir);
+            ArrayList<String> allowedEndingsIncludeDir = new ArrayList<>();
+            allowedEndingsIncludeDir.add(".h");
+            allowedEndingsIncludeDir.add(".hpp");
+            boolean includeDirRes = scanFiles(includeDir, allowedEndingsIncludeDir);
+            if (includeDirRes) {
+                System.out.println("Include directory scan successful.");
+            } else {
+                throw new Error("include dir scan failed");
+            }
+        }
+
+        // when enabling "JEP 493: Linking Run-Time Images without JMODs" we do not
+        // have the jmods folder at all, so first test the presence of the folder
+        if (Files.isDirectory(jmodsDir)) {
+            System.out.println("Jmods directory to scan:" + jmodsDir);
+            ArrayList<String> allowedEndingsJmodsDir = new ArrayList<>();
+            allowedEndingsJmodsDir.add(".jmod");
+            boolean jmodsDirRes = scanFiles(jmodsDir, allowedEndingsJmodsDir);
+            if (jmodsDirRes) {
+                System.out.println("Jmods directory scan successful.");
+            } else {
+                throw new Error("jmods dir scan failed");
+            }
+        }
+
+        Path legalDir = mainDirToScan.resolve("legal");
+        Path javabaseLicenseFile = mainDirToScan.resolve("legal/java.base/LICENSE");
+        if (isGpl(javabaseLicenseFile)) { // for now check only legal dir of GPL based images; other ones might have other content
+            System.out.println("GPL info found in java.base LICENSE file");
+            ArrayList<String> allowedEndingsLegalDir = new ArrayList<>();
+            allowedEndingsLegalDir.add(".md");
+            allowedEndingsLegalDir.add("ADDITIONAL_LICENSE_INFO");
+            allowedEndingsLegalDir.add("ASSEMBLY_EXCEPTION");
+            allowedEndingsLegalDir.add("LICENSE");
+
+            ArrayList<String> requiredFilesInLegalSubdirs = new ArrayList<>();
+            requiredFilesInLegalSubdirs.add("LICENSE");
+            requiredFilesInLegalSubdirs.add("ADDITIONAL_LICENSE_INFO");
+            requiredFilesInLegalSubdirs.add("ASSEMBLY_EXCEPTION");
+
+            System.out.println("Legal directory to scan:" + legalDir);
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(legalDir)) {
+                for (Path subfolder : stream) {
+                    if (Files.isDirectory(subfolder)) {
+                        System.out.println("Checking legal dir subfolder for required files: " + subfolder.getFileName());
+
+                        for (String fileName : requiredFilesInLegalSubdirs) {
+                            Path filePath = subfolder.resolve(fileName);
+                            if (Files.exists(filePath)) {
+                                System.out.println("  Found " + fileName);
+                            } else {
+                                System.out.println("  Missing " + fileName);
+                                throw new Error("legal dir scan for required files failed");
+                            }
+                        }
+                    }
+                }
+            }
+
+            boolean legalDirRes = scanFiles(legalDir, allowedEndingsLegalDir);
+            if (legalDirRes) {
+                System.out.println("Legal directory scan successful.");
+            } else {
+                throw new Error("Legal dir scan failed");
+            }
+        }
     }
 
     private static boolean scanFiles(Path root, ArrayList<String> allowedEndings) throws IOException {
diff --git a/test/jdk/com/sun/jdi/EATests.java b/test/jdk/com/sun/jdi/EATests.java
index cb51e91021b..3a936f288cc 100644
--- a/test/jdk/com/sun/jdi/EATests.java
+++ b/test/jdk/com/sun/jdi/EATests.java
@@ -84,6 +84,15 @@
  * @comment Regression test for using the wrong thread when logging during re-locking from deoptimization.
  *
  * @comment DiagnoseSyncOnValueBasedClasses=2 will cause logging when locking on \@ValueBased objects.
+ * @run driver EATests
+ *                 -XX:+UnlockDiagnosticVMOptions
+ *                 -Xms256m -Xmx256m
+ *                 -Xbootclasspath/a:.
+ *                 -XX:CompileCommand=dontinline,*::dontinline_*
+ *                 -XX:+WhiteBoxAPI
+ *                 -Xbatch
+ *                 -XX:+DoEscapeAnalysis -XX:+EliminateAllocations -XX:+EliminateLocks -XX:+EliminateNestedLocks
+ *                 -XX:DiagnoseSyncOnValueBasedClasses=2
  *
  * @comment Re-lock may inflate monitors when re-locking, which cause monitorinflation trace logging.
  * @run driver EATests
diff --git a/test/jdk/com/sun/jdi/JdbMethodExitTest.java b/test/jdk/com/sun/jdi/JdbMethodExitTest.java
index 77e12b5f4a6..da76ddb4ab6 100644
--- a/test/jdk/com/sun/jdi/JdbMethodExitTest.java
+++ b/test/jdk/com/sun/jdi/JdbMethodExitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -239,6 +239,7 @@ public class JdbMethodExitTest extends JdbTest {
         // trace exit of methods with all the return values
         // (but just check a couple of them)
         jdb.command(JdbCommand.traceMethodExits(true, threadId));
+        execCommand(JdbCommand.trace());
         execCommand(JdbCommand.cont())
                 .shouldContain("instance of JdbMethodExitTestTarg")
                 .shouldContain("return value = 8");
@@ -252,7 +253,7 @@ public class JdbMethodExitTest extends JdbTest {
                 .shouldContain("Method entered:");
         execCommand(JdbCommand.cont())
                 .shouldContain("Method exited: return value = \"traceMethods\"");
-        jdb.command(JdbCommand.stepUp());
+        jdb.command(JdbCommand.next());
 
 
         List<String> reply = new LinkedList<>();
diff --git a/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java
index 80931ca7440..76acac11506 100644
--- a/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java
+++ b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/Client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,11 @@ import javax.management.remote.JMXConnectionNotification;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
+import jdk.test.lib.Utils;
 
 public class Client {
 
-    public static final int COUNTER_TIMEOUT_SECONDS = 60;
+    public static final int COUNTER_TIMEOUT_SECONDS = 30;
 
     public static void run(String url) throws Exception {
         final int notifEmittedCnt = 10;
@@ -87,7 +88,7 @@ public class Client {
         System.out.println();
         try {
             System.out.println("waiting for " + notifEmittedCnt + " notifications to arrive");
-            if (!counter.await(COUNTER_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
+            if (!counter.await(Utils.adjustTimeout(COUNTER_TIMEOUT_SECONDS), TimeUnit.SECONDS)) {
                 throw new Error("Client: Counter await expired");
             }
             if (duplNotification.get()) {
diff --git a/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java
index 0e5e5e30d4e..5fac14d76e3 100644
--- a/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java
+++ b/test/jdk/com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,9 @@ import java.util.Arrays;
  * @author Jaroslav Bachorik
  * @bug 6937053 8005472
  *
+ * @library /test/lib
+ * @build jdk.test.lib.Utils
+ *
  * @modules java.management
  *          jdk.compiler
  * @run clean TestSerializationMismatch
diff --git a/test/jdk/com/sun/jndi/dns/ConfigTests/PortUnreachable.java b/test/jdk/com/sun/jndi/dns/ConfigTests/PortUnreachable.java
index 0a92e52c270..eb917c2f25a 100644
--- a/test/jdk/com/sun/jndi/dns/ConfigTests/PortUnreachable.java
+++ b/test/jdk/com/sun/jndi/dns/ConfigTests/PortUnreachable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ import javax.naming.directory.InitialDirContext;
  * @requires os.family != "aix"
  * @library ../lib/
  * @modules java.base/sun.security.util
- * @run main/othervm -Djdk.net.usePlainDatagramSocketImpl=false PortUnreachable
+ * @run main PortUnreachable
  */
 
 public class PortUnreachable extends DNSTestBase {
diff --git a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
index b47433ca16f..b139f12da25 100644
--- a/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
+++ b/test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -131,6 +131,7 @@ public class LdapPoolTimeoutTest {
                                 || msg.contains("No route to host")
                                 || msg.contains("Timed out waiting for lock")
                                 || msg.contains("Connect timed out")
+                                || msg.contains("Connection timed out")
                                 || msg.contains("Timeout exceeded while waiting for a connection"))) {
                     // got the expected exception
                     System.out.println("Received expected NamingException with message: " + msg);
diff --git a/test/jdk/com/sun/jndi/ldap/SaslOutputStreamCloseTest.java b/test/jdk/com/sun/jndi/ldap/SaslOutputStreamCloseTest.java
new file mode 100644
index 00000000000..5558a4ab196
--- /dev/null
+++ b/test/jdk/com/sun/jndi/ldap/SaslOutputStreamCloseTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Constructor;
+
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslException;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/*
+ * @test
+ * @bug 8377486
+ * @summary Verify that SaslOutputStream.write() methods throw an IOException, if invoked
+ *          when the stream is closed
+ * @modules java.security.sasl/com.sun.security.sasl
+ *          java.naming/com.sun.jndi.ldap.sasl:+open
+ * @run junit ${test.main.class}
+ */
+class SaslOutputStreamCloseTest {
+
+    /*
+     * Verifies that SaslOutputStream.write(...) throws IOException if the SaslOutputStream
+     * is closed.
+     */
+    @Test
+    void testWriteThrowsIOExceptionOnClose() throws Exception {
+        try (final OutputStream os = createSaslOutputStream(new ByteArrayOutputStream())) {
+            os.write(new byte[]{0x42, 0x42});
+            os.close();
+            try {
+                os.write(new byte[]{0x42}, 0, 1);
+                fail("OutputStream.write(...) on closed " + os + " did not throw IOException");
+            } catch (IOException ioe) {
+                // verify it was thrown for right reason
+                if (!"stream closed".equals(ioe.getMessage())) {
+                    throw ioe; // propagate original exception
+                }
+                // expected
+                System.err.println("received expected IOException: " + ioe);
+            }
+        }
+    }
+
+    // reflectively construct an instance of
+    // (package private) com.sun.jndi.ldap.sasl.SaslOutputStream class
+    private static OutputStream createSaslOutputStream(final OutputStream underlying) throws Exception {
+        final Constructor<?> constructor = Class.forName("com.sun.jndi.ldap.sasl.SaslOutputStream")
+                .getDeclaredConstructor(new Class[]{SaslClient.class, OutputStream.class});
+        constructor.setAccessible(true);
+        return (OutputStream) constructor.newInstance(new DummySaslClient(), underlying);
+    }
+
+
+    private static final class DummySaslClient implements SaslClient {
+        private boolean closed;
+
+        @Override
+        public String getMechanismName() {
+            return "DUMMY";
+        }
+
+        @Override
+        public boolean hasInitialResponse() {
+            return false;
+        }
+
+        @Override
+        public byte[] evaluateChallenge(byte[] challenge) throws SaslException {
+            return new byte[0];
+        }
+
+        @Override
+        public boolean isComplete() {
+            return true;
+        }
+
+        @Override
+        public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException {
+            if (closed) {
+                // intentionally throw something other than a IOException
+                throw new IllegalStateException(this + " is closed");
+            }
+            return incoming;
+        }
+
+        @Override
+        public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException {
+            if (closed) {
+                // intentionally throw something other than a IOException
+                throw new IllegalStateException(this + " is closed");
+            }
+            return outgoing;
+        }
+
+        @Override
+        public Object getNegotiatedProperty(String propName) {
+            return null;
+        }
+
+        @Override
+        public void dispose() {
+            this.closed = true;
+        }
+    }
+}
diff --git a/test/jdk/com/sun/jndi/ldap/SkipAbandonRequestOnClosedConn.java b/test/jdk/com/sun/jndi/ldap/SkipAbandonRequestOnClosedConn.java
new file mode 100644
index 00000000000..cb2eef49bd2
--- /dev/null
+++ b/test/jdk/com/sun/jndi/ldap/SkipAbandonRequestOnClosedConn.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import com.sun.jndi.ldap.Connection;
+import com.sun.jndi.ldap.LdapClient;
+import com.sun.jndi.ldap.LdapCtx;
+import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/*
+ * @test
+ * @bug 8362268
+ * @summary Verify that unexpected exceptions aren't propagated to LdapCtx callers
+ *          when the LdapCtx's (internal) connection is closed due to an exception
+ *          when reading/writing over the connection's stream
+ * @modules java.naming/com.sun.jndi.ldap:+open
+ * @library /test/lib lib/
+ * @build jdk.test.lib.net.URIBuilder
+ *        BaseLdapServer LdapMessage
+ * @run junit/othervm ${test.main.class}
+ */
+class SkipAbandonRequestOnClosedConn {
+
+    private static final String LOOKUP_NAME = "ou=People,o=FooBar";
+
+    private static final class Server extends BaseLdapServer {
+
+        private Server() throws IOException {
+            super();
+        }
+
+        // handles and responds to the incoming LDAP request
+        @Override
+        protected void handleRequest(final Socket socket,
+                                     final LdapMessage request,
+                                     final OutputStream out) throws IOException {
+            switch (request.getOperation()) {
+                case SEARCH_REQUEST: {
+                    System.err.println("responding to SEARCH_REQUEST with id: "
+                            + request.getMessageID() + " on socket " + socket);
+                    // write out some bytes as a response. it doesn't matter what those
+                    // bytes are - in this test they aren't expected to reach
+                    // the application code.
+                    final byte[] irrelevantResponse = new byte[]{0x42, 0x42, 0x42};
+                    System.err.println("Response: " + Arrays.toString(irrelevantResponse));
+                    out.write(irrelevantResponse);
+                    out.flush();
+                    break;
+                }
+                default: {
+                    throw new IOException("unexpected operation type: " + request.getOperation()
+                            + ", request: " + request);
+                }
+            }
+        }
+    }
+
+    private static Server server;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        server = new Server();
+        server.start();
+        System.err.println("server started at " + server.getInetAddress()
+                + ":" + server.getPort());
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        if (server != null) {
+            System.err.println("stopping server " + server.getInetAddress()
+                    + ":" + server.getPort());
+            server.close();
+        }
+    }
+
+
+    /*
+     * Creates a com.sun.jndi.ldap.LdapCtx and configures its internal com.sun.jndi.ldap.Connection
+     * instance with an InputStream that throws an IOException in its read() methods. The test
+     * then initiates a Context.lookup() so that a LDAP request is internally issued and a LDAP
+     * response is waited for. Due to the configured InputStream throwing an exception from its
+     * read(), the com.sun.jndi.ldap.Connection will get closed (internally) when reading the
+     * response and the main thread which was waiting for the LDAP response is woken up and notices
+     * the connection closure. This test verifies that a NamingException gets thrown from the
+     * lookup() in this scenario.
+     */
+    @Test
+    void testNamingException() throws Exception {
+        final Hashtable<String, String> envProps = new Hashtable<>();
+        envProps.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+        final String providerUrl = URIBuilder.newBuilder()
+                .scheme("ldap")
+                .host(server.getInetAddress().getHostAddress())
+                .port(server.getPort())
+                .build().toString();
+        envProps.put(Context.PROVIDER_URL, providerUrl);
+        // explicitly set LDAP version to 3 to prevent LDAP BIND requests
+        // during LdapCtx instantiation
+        envProps.put("java.naming.ldap.version", "3");
+        // create a (custom) InitialContext which allows us to access the
+        // LdapCtx's internal connection instance
+        try (final CustomContext ctx = new CustomContext(envProps)) {
+            // replace the InputStream and OutputStream of the LdapCtx's
+            // internal connection, to allow us to raise exception from
+            // the InputStream and OutputStream as necessary
+            ctx.replaceStreams();
+
+            System.err.println("issuing ldap request against " + providerUrl
+                    + " using context " + ctx);
+            // trigger the LDAP SEARCH request through the lookup call. we are not
+            // interested in the returned value and are merely interested in the
+            // Context.lookup(...) failing with a NamingException
+            assertLookupThrowsNamingException(ctx);
+        }
+    }
+
+    // assert that Context.lookup(...) raises a NamingException
+    private static void assertLookupThrowsNamingException(final Context ctx) {
+        try {
+            final Object result = ctx.lookup(LOOKUP_NAME);
+            fail("Context.lookup() was expected to throw NamingException" +
+                    " but returned result " + result);
+        } catch (NamingException ne) {
+            // verify the NamingException is for the right reason
+            if (!ne.toString().contains("LDAP connection has been closed")) {
+                // unexpected exception, propagate it
+                fail("NamingException is missing \"LDAP connection has been closed\" message", ne);
+            }
+            // expected
+            System.err.println("got expected exception: " + ne);
+        }
+    }
+
+    private static final class CustomContext extends InitialContext implements AutoCloseable {
+
+        private CustomContext(final Hashtable<?, ?> environment) throws NamingException {
+            super(environment);
+        }
+
+        private LdapCtx getLdapCtx() throws NamingException {
+            final Context ctx = getDefaultInitCtx();
+            if (ctx instanceof LdapCtx ldapCtx) {
+                return ldapCtx;
+            }
+            throw new IllegalStateException("Not a LdapCtx: " + ctx.getClass().getName());
+        }
+
+        // using reflection, return the com.sun.jndi.ldap.Connection instance
+        // from within the com.sun.jndi.ldap.LdapCtx
+        private Connection getConnection() throws Exception {
+            final LdapCtx ldapCtx = getLdapCtx();
+            final Field clientField = ldapCtx.getClass().getDeclaredField("clnt");
+            clientField.setAccessible(true);
+            final LdapClient ldapClient = (LdapClient) clientField.get(ldapCtx);
+            final Field connField = ldapClient.getClass().getDeclaredField("conn");
+            connField.setAccessible(true);
+            return (Connection) connField.get(ldapClient);
+        }
+
+        private void replaceStreams() throws Exception {
+            final Connection conn = getConnection();
+            assertNotNull(conn, "com.sun.jndi.ldap.Connection instance is null");
+            final InputStream originalInputStream = conn.inStream;
+            final OutputStream originalOutputStream = conn.outStream;
+            // replace the connection's streams with our test specific streams
+            conn.replaceStreams(new In(originalInputStream), new Out(originalOutputStream));
+            System.err.println("replaced streams on connection: " + conn);
+        }
+    }
+
+    // an OutputStream which intentionally throws a NullPointerException
+    // from its write(...) methods if the OutputStream has been closed
+    private static final class Out extends FilterOutputStream {
+        private volatile boolean closed;
+
+        private Out(final OutputStream underlying) {
+            super(underlying);
+        }
+
+        @Override
+        public void write(final int b) throws IOException {
+            if (closed) {
+                throw new NullPointerException("OutputStream is closed - intentional" +
+                        " NullPointerException instead of IOException");
+            }
+            super.write(b);
+        }
+
+        @Override
+        public void write(final byte[] b, final int off, final int len) throws IOException {
+            if (closed) {
+                throw new NullPointerException("OutputStream is closed - intentional" +
+                        " NullPointerException instead of IOException");
+            }
+            super.write(b, off, len);
+        }
+
+        @Override
+        public void close() throws IOException {
+            System.err.println("closing output stream " + this);
+            closed = true;
+            super.close();
+        }
+    }
+
+    // an InputStream which intentionally throws an exception
+    // from its read(...) methods.
+    private static final class In extends FilterInputStream {
+
+        private In(InputStream underlying) {
+            super(underlying);
+        }
+
+        @Override
+        public int read() throws IOException {
+            final int v = super.read();
+            System.err.println("read " + v + " from " + in
+                    + ", will now intentionally throw an exception");
+            throw new IOException("intentional IOException from " + In.class.getName() + ".read()");
+        }
+
+        @Override
+        public int read(final byte[] b, final int off, final int len) throws IOException {
+            final int v = super.read(b, off, len);
+            System.err.println("read " + v + " byte(s) from " + in
+                    + ", will now intentionally throw an exception");
+            throw new IOException("intentional IOException from " + In.class.getName()
+                    + ".read(byte[], int, int)");
+        }
+    }
+}
diff --git a/test/jdk/com/sun/net/httpserver/ContextPathMatcherPathPrefixTest.java b/test/jdk/com/sun/net/httpserver/ContextPathMatcherPathPrefixTest.java
new file mode 100644
index 00000000000..e1cff62a45f
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/ContextPathMatcherPathPrefixTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Map;
+
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+
+import org.junit.jupiter.api.AfterAll;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+/*
+ * @test id=default
+ * @bug 8272758
+ * @summary Verifies path prefix matching using defaults
+ * @build EchoHandler
+ * @run junit ${test.main.class}
+ */
+
+/*
+ * @test id=withProperty
+ * @bug 8272758
+ * @summary Verifies path prefix matching by providing a system property
+ * @build EchoHandler
+ * @run junit/othervm
+ *      -Dsun.net.httpserver.pathMatcher=pathPrefix
+ *      ${test.main.class}
+ */
+
+/*
+ * @test id=withInvalidProperty
+ * @bug 8272758
+ * @summary Verifies path prefix matching by providing a system property
+ *          containing an invalid value, and observing it fall back to the
+ *          default
+ * @build EchoHandler
+ * @run junit/othervm
+ *      -Dsun.net.httpserver.pathMatcher=noSuchMatcher
+ *      ${test.main.class}
+ */
+
+public class ContextPathMatcherPathPrefixTest {
+
+    protected static final HttpClient CLIENT =
+            HttpClient.newBuilder().proxy(NO_PROXY).build();
+
+    @AfterAll
+    static void stopClient() {
+        CLIENT.shutdownNow();
+    }
+
+    @Test
+    void testContextPathOfEmptyString() {
+        var iae = assertThrows(IllegalArgumentException.class, () -> new Infra(""));
+        assertEquals("Illegal value for path or protocol", iae.getMessage());
+    }
+
+    @Test
+    void testContextPathAtRoot() throws Exception {
+        try (var infra = new Infra("/")) {
+            infra.expect(200, "/foo", "/foo/", "/foo/bar", "/foobar");
+        }
+    }
+
+    @Test
+    void testContextPathAtSubDir() throws Exception {
+        try (var infra = new Infra("/foo")) {
+            infra.expect(200, "/foo", "/foo/", "/foo/bar");
+            infra.expect(404, "/foobar");
+        }
+    }
+
+    @Test
+    void testContextPathAtSubDirWithTrailingSlash() throws Exception {
+        try (var infra = new Infra("/foo/")) {
+            infra.expect(200, "/foo/", "/foo/bar");
+            infra.expect(404, "/foo", "/foobar");
+        }
+    }
+
+    protected static final class Infra implements AutoCloseable {
+
+        private static final InetSocketAddress LO_SA_0 =
+                new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+        private static final HttpHandler HANDLER = new EchoHandler();
+
+        private final HttpServer server;
+
+        private final String contextPath;
+
+        protected Infra(String contextPath) throws IOException {
+            this.server = HttpServer.create(LO_SA_0, 10);
+            server.createContext(contextPath, HANDLER);
+            server.start();
+            this.contextPath = contextPath;
+        }
+
+        protected void expect(int statusCode, String... requestPaths) throws Exception {
+            for (String requestPath : requestPaths) {
+                var requestURI = URI.create("http://%s:%s%s".formatted(
+                        server.getAddress().getHostString(),
+                        server.getAddress().getPort(),
+                        requestPath));
+                var request = HttpRequest.newBuilder(requestURI).build();
+                var response = CLIENT.send(request, HttpResponse.BodyHandlers.discarding());
+                assertEquals(
+                        statusCode, response.statusCode(),
+                        "unexpected status code " + Map.of(
+                                "contextPath", contextPath,
+                                "requestPath", requestPath));
+            }
+        }
+
+        @Override
+        public void close() {
+            server.stop(0);
+        }
+
+    }
+
+}
diff --git a/test/jdk/com/sun/net/httpserver/ContextPathMatcherStringPrefixTest.java b/test/jdk/com/sun/net/httpserver/ContextPathMatcherStringPrefixTest.java
new file mode 100644
index 00000000000..3f3008a8531
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/ContextPathMatcherStringPrefixTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import org.junit.jupiter.api.Test;
+
+/*
+ * @test
+ * @bug 8272758
+ * @summary Verifies string prefix matching configured using a system property
+ * @build ContextPathMatcherPathPrefixTest
+ *        EchoHandler
+ * @run junit/othervm
+ *      -Dsun.net.httpserver.pathMatcher=stringPrefix
+ *      ${test.main.class}
+ */
+
+class ContextPathMatcherStringPrefixTest extends ContextPathMatcherPathPrefixTest {
+
+    @Test
+    @Override
+    void testContextPathAtRoot() throws Exception {
+        try (var infra = new Infra("/")) {
+            infra.expect(200, "/foo", "/foo/", "/foo/bar", "/foobar");
+        }
+    }
+
+    @Test
+    @Override
+    void testContextPathAtSubDir() throws Exception {
+        try (var infra = new Infra("/foo")) {
+            infra.expect(200, "/foo", "/foo/", "/foo/bar", "/foobar");
+        }
+    }
+
+    @Test
+    @Override
+    void testContextPathAtSubDirWithTrailingSlash() throws Exception {
+        try (var infra = new Infra("/foo/")) {
+            infra.expect(200, "/foo/", "/foo/bar");
+            infra.expect(404, "/foo", "/foobar");
+        }
+    }
+
+}
diff --git a/test/jdk/com/sun/net/httpserver/FailAndStopTest.java b/test/jdk/com/sun/net/httpserver/FailAndStopTest.java
new file mode 100644
index 00000000000..005d78add18
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/FailAndStopTest.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8377302
+ * @summary HttpServer.stop() blocks indefinitely if handler throws
+ * @modules jdk.httpserver java.logging
+ * @library /test/lib
+ * @run main/othervm ${test.main.class}
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+import java.util.function.BiPredicate;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+import jdk.test.lib.Utils;
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_CHUNKED;
+
+public class FailAndStopTest implements HttpHandler {
+    // Keep that logger in a static field to make sure it doesn't
+    // get GC'ed and recreated before the HttpServer is initialized.
+    private static final Logger LOGGER = Logger.getLogger("com.sun.net.httpserver");
+    private static final String BODY = "OK";
+
+    static enum TestCases {
+        FAILNOW("failNow", TestCases::shouldAlwaysFail),
+        ASSERTNOW("assertNow", TestCases::shouldAlwaysFail),
+        RESPANDFAIL("failAfterResponseStatus", TestCases::shouldFailExceptForHead),
+        RESPANDASSERT("assertAfterResponseStatus", TestCases::shouldFailExceptForHead),
+        CLOSEAFTERRESP("closeExchangeAfterResponseStatus", TestCases::shouldFailExceptForHead),
+        BODYANDFAIL("failAfterBody", TestCases::shouldFailExceptForHeadOrHttps),
+        BODYANDASSERT("assertAfterBody", TestCases::shouldFailExceptForHeadOrHttps),
+        CLOSEBEFOREOS("closeExchangeBeforeOS", TestCases::shouldNeverFail),
+        CLOSEANDRETURN("closeAndReturn", TestCases::shouldNeverFail),
+        CLOSEANDFAIL("closeAndFail", TestCases::shouldNeverFail),
+        CLOSEANDASSERT("closeAndAssert", TestCases::shouldNeverFail);
+
+        private final String query;
+        private BiPredicate<String,String> shouldFail;
+        TestCases(String query, BiPredicate<String,String> shouldFail) {
+            this.query = query;
+            this.shouldFail = shouldFail;
+        }
+        boolean shouldFail(String scheme, String method) {
+            // in case of HEAD method the client should not
+            // fail if we throw after sending response headers
+            return shouldFail.test(scheme, method);
+        }
+        private static boolean shouldAlwaysFail(String scheme, String method) {
+            return true;
+        }
+        private static boolean shouldNeverFail(String scheme, String method) {
+            return false;
+        }
+        private static boolean shouldFailExceptForHead(String scheme, String method) {
+            return !"HEAD".equals(method);
+        }
+        private static boolean shouldFailExceptForHeadOrHttps(String scheme, String method) {
+            // When using https, the buffered response bytes may be sent
+            // when the connection is closed, in which case the full body
+            // will be correctly received, and the client connection
+            // will not fail. With plain http, the bytes are not sent and
+            // the client fails with premature end of file.
+            return !"HEAD".equals(method) && !"https".equalsIgnoreCase(scheme);
+        }
+
+    }
+
+    @Override
+    public void handle(HttpExchange ex) throws IOException {
+        String query = ex.getRequestURI().getRawQuery();
+        TestCases step = TestCases.FAILNOW;
+        if (query == null || query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new NullPointerException("Got you!");
+        }
+        step = TestCases.ASSERTNOW;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new AssertionError("Got you!");
+        }
+        byte[] body = BODY.getBytes(StandardCharsets.UTF_8);
+        ex.sendResponseHeaders(200, body.length);
+        step = TestCases.RESPANDFAIL;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new NullPointerException("Got you!");
+        }
+        step = TestCases.RESPANDASSERT;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new AssertionError("Got you!");
+        }
+        step = TestCases.CLOSEAFTERRESP;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            ex.close();
+            return;
+        }
+        if (!"HEAD".equals(ex.getRequestMethod())) {
+            ex.getResponseBody().write(body);
+        }
+        step = TestCases.BODYANDFAIL;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new NullPointerException("Got you!");
+        }
+        step = TestCases.BODYANDASSERT;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new AssertionError("Got you!");
+        }
+        step = TestCases.CLOSEBEFOREOS;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            ex.close();
+            return;
+        }
+        System.out.println("Server: closing response body");
+        ex.getResponseBody().close();
+        step = TestCases.CLOSEANDRETURN;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            ex.close();
+            return;
+        }
+        step = TestCases.CLOSEANDFAIL;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new NullPointerException("Got you!");
+        }
+        step = TestCases.CLOSEANDASSERT;
+        if (query.equals(step.query)) {
+            System.out.println("Server: " + step);
+            throw new AssertionError("Got you!");
+        }
+    }
+
+    private static void enableHttpServerLogging() {
+        // set HttpServer's logger to ALL
+        LOGGER.setLevel(Level.ALL);
+        // get the root logger, get its first handler (by default
+        // it's a ConsoleHandler), and set its level to ALL (by
+        // default its level is INFO).
+        Logger.getLogger("").getHandlers()[0].setLevel(Level.ALL);
+    }
+
+
+    public static void main(String[] args) throws Exception {
+
+        enableHttpServerLogging();
+
+        // test with GET
+        for (var test : TestCases.values()) {
+            test(test, Optional.empty(), "http");
+            test(test, Optional.empty(), "https");
+        }
+        // test with HEAD
+        for (var test : TestCases.values()) {
+            test(test, Optional.of("HEAD"), "http");
+            test(test, Optional.of("HEAD"), "https");
+        }
+    }
+
+    private static SSLContext initSSLContext(boolean secure) {
+        SSLContext context = secure ? SimpleSSLContext.findSSLContext() : null;
+        if (secure) {
+            SSLContext.setDefault(context);
+        }
+        return context;
+    }
+
+    private static HttpServer createHttpServer(SSLContext context) throws IOException {
+        var address = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+        if (context != null) {
+            var server = HttpsServer.create(address, 0);
+            server.setHttpsConfigurator(new HttpsConfigurator(context));
+            return server;
+        } else {
+            return HttpServer.create(address, 0);
+        }
+    }
+
+    private static HttpURLConnection createConnection(URL url, boolean secure)
+            throws IOException {
+        HttpURLConnection urlc = (HttpURLConnection) url.openConnection(Proxy.NO_PROXY);
+        if (secure) {
+            ((HttpsURLConnection)urlc).setHostnameVerifier(new HostnameVerifier() {
+                @Override
+                public boolean verify(String hostname, SSLSession session) {
+                    return true;
+                }
+            });
+        }
+        return urlc;
+    }
+
+    private static void test(TestCases test, Optional<String> method, String scheme)
+            throws Exception {
+        boolean secure = "https".equalsIgnoreCase(scheme);
+        SSLContext context = initSSLContext(secure);
+        HttpServer server = createHttpServer(context);
+
+        System.out.println("Test: " + method.orElse("GET") + " " + test.query);
+        System.out.println("Server listening at: " + server.getAddress());
+        try {
+            server.createContext("/FailAndStopTest/", new FailAndStopTest());
+            server.start();
+
+            URL url = URIBuilder.newBuilder()
+                    .scheme(scheme)
+                    .loopback()
+                    .port(server.getAddress().getPort())
+                    .path("/FailAndStopTest/")
+                    .query(test.query)
+                    .toURLUnchecked();
+            System.out.println("Connecting to: " + url);
+            HttpURLConnection urlc = createConnection(url, secure);
+            if (method.isPresent()) urlc.setRequestMethod(method.get());
+            try {
+                System.out.println("Client: Response code received: " + urlc.getResponseCode());
+                InputStream is = urlc.getInputStream();
+                String body = new String(is.readAllBytes(), StandardCharsets.UTF_8);
+                is.close();
+                System.out.printf("Client: read body: \"%s\"%n", body);
+                if (test.shouldFail(scheme, urlc.getRequestMethod())) {
+                    throw new AssertionError(test.query + ": test did not fail");
+                }
+                if (!method.orElse("GET").equals("HEAD")) {
+                    if (!BODY.equals(body)) {
+                        throw new AssertionError(
+                                String.format("\"%s\" != \"%s\"", body, BODY));
+                    }
+                } else if (!body.isEmpty()) {
+                    throw new AssertionError("Body is not empty: " + body);
+                }
+            } catch (IOException so) {
+                if (test.shouldFail(scheme, urlc.getRequestMethod())) {
+                    // expected
+                    System.out.println(test.query + ": Got expected exception: " + so);
+                } else if (!test.shouldFail("http", urlc.getRequestMethod())) {
+                    // When using https, the buffered response bytes may be sent
+                    // when the connection is closed, in which case the full body
+                    // will be correctly received, and the client connection
+                    // will not fail. With plain http, the bytes are not sent and
+                    // the client fails with premature end of file.
+                    // So only fail here if the test should not fail with plain
+                    // http - we want to accept possible exception for https...
+                    throw new AssertionError(
+                                String.format("%s: test failed with %s", test.query, so), so);
+                } else {
+                    System.out.printf("%s: WARNING: unexpected exception: %s%n", test.query, so);
+                    // should only happen in those two cases:
+                    assert secure && !"HEAD".equals(method) &&
+                            (test == TestCases.BODYANDFAIL || test == TestCases.BODYANDASSERT);
+                }
+            }
+        } finally {
+            // if not fixed will cause the test to fail in jtreg timeout
+            server.stop((int)Utils.adjustTimeout(5000));
+            System.out.println("Server stopped as expected");
+        }
+    }
+}
diff --git a/test/jdk/com/sun/security/auth/module/AllPlatforms.java b/test/jdk/com/sun/security/auth/module/AllPlatforms.java
index 79eea7b4d23..6f7cbfb9c52 100644
--- a/test/jdk/com/sun/security/auth/module/AllPlatforms.java
+++ b/test/jdk/com/sun/security/auth/module/AllPlatforms.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,11 @@
  * @test
  * @bug 8039951
  * @summary com.sun.security.auth.module missing classes on some platforms
+ * @modules java.base/jdk.internal.util
  * @run main/othervm AllPlatforms
  */
+import jdk.internal.util.OperatingSystem;
+
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import java.nio.file.Files;
@@ -39,14 +42,14 @@ public class AllPlatforms {
     private static final String NT_MODULE = "NTLoginModule";
 
     public static void main(String[] args) throws Exception {
-        login("cross-platform",
+        login(true, "cross-platform",
                 UNIX_MODULE, "optional",
                 NT_MODULE, "optional");
-        login("windows", NT_MODULE, "required");
-        login("unix", UNIX_MODULE, "required");
+        login(OperatingSystem.isWindows(), "windows", NT_MODULE, "required");
+        login(!OperatingSystem.isWindows(), "unix", UNIX_MODULE, "required");
     }
 
-    static void login(String test, String... conf) throws Exception {
+    static void login(boolean shouldSucceed, String test, String... conf) throws Exception {
         System.out.println("Testing " + test + "...");
 
         StringBuilder sb = new StringBuilder();
@@ -68,11 +71,19 @@ public class AllPlatforms {
             lc.login();
             System.out.println(lc.getSubject());
             lc.logout();
+            if (!shouldSucceed) {
+                throw new RuntimeException("Should not succeed");
+            }
         } catch (FailedLoginException e) {
+            if (shouldSucceed) {
+                throw new RuntimeException("Should succeed");
+            }
             // This exception can occur in other platform module than the running one.
-            if(e.getMessage().startsWith("Failed in attempt to import")) {
+            if (e.getMessage().startsWith("Failed in attempt to import")) {
                 System.out.println("Expected Exception found.");
                 e.printStackTrace(System.out);
+            } else {
+                throw new RuntimeException("Unexpected error", e);
             }
         }
     }
diff --git a/test/jdk/com/sun/tools/attach/TestWithoutDumpableProcess.java b/test/jdk/com/sun/tools/attach/TestWithoutDumpableProcess.java
new file mode 100644
index 00000000000..be9d0c8790c
--- /dev/null
+++ b/test/jdk/com/sun/tools/attach/TestWithoutDumpableProcess.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, NTT DATA
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.ValueLayout;
+
+import com.sun.tools.attach.VirtualMachine;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.thread.ProcessThread;
+import jdk.test.lib.process.ProcessTools;
+
+/*
+ * @test
+ * @bug 8226919 8373867
+ * @summary Test to make sure attach target process which is not dumpable.
+ * @library /test/lib
+ * @modules jdk.attach
+ * @requires os.family == "linux"
+ *
+ * @run main/timeout=200 TestWithoutDumpableProcess
+ */
+public class TestWithoutDumpableProcess {
+
+    private static final String EXPECTED_PROP_KEY = "attach.test";
+    private static final String EXPECTED_PROP_VALUE = "true";
+
+    public static class Debuggee {
+
+        // Disable dumpable attribute via prctl(2)
+        private static void disableDumpable() throws Throwable {
+            var linker = Linker.nativeLinker();
+            var prctl = linker.downcallHandle(linker.defaultLookup().findOrThrow("prctl"),
+                                              FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_LONG),
+                                              Linker.Option.firstVariadicArg(1), Linker.Option.captureCallState("errno"));
+            var errnoSeg = Arena.global().allocate(Linker.Option.captureStateLayout());
+            final int PR_SET_DUMPABLE = 4; // from linux/prctl.h
+
+            int ret = (int)prctl.invoke(errnoSeg, PR_SET_DUMPABLE, 0L);
+            if (ret == -1){
+                var hndErrno = Linker.Option
+                                     .captureStateLayout()
+                                     .varHandle(MemoryLayout.PathElement.groupElement("errno"));
+                int errno = (int)hndErrno.get(errnoSeg, 0L);
+                throw new RuntimeException("prctl: errno=" + errno);
+            }
+        }
+
+        public static void main(String[] args) throws Throwable {
+            disableDumpable();
+            IO.println(Application.READY_MSG);
+
+            while (IO.readln().equals(Application.SHUTDOWN_MSG));
+        }
+
+        public static ProcessThread start() {
+            var args = new String[]{
+                "--enable-native-access=ALL-UNNAMED",
+                String.format("-D%s=%s", EXPECTED_PROP_KEY, EXPECTED_PROP_VALUE), Debuggee.class.getName()
+            };
+            var pb = ProcessTools.createLimitedTestJavaProcessBuilder(args);
+            var pt = new ProcessThread("runApplication", Application.READY_MSG::equals, pb);
+            pt.start();
+            return pt;
+        }
+
+    }
+
+    public static void main(String[] args) throws Exception {
+        var pt = Debuggee.start();
+        var vm = VirtualMachine.attach(Long.toString(pt.getPid()));
+        var val = vm.getSystemProperties().getProperty(EXPECTED_PROP_KEY);
+
+        Asserts.assertNotNull(val, "Expected sysprop not found");
+        Asserts.assertEquals(val, "true", "Unexpected sysprop value");
+    }
+
+}
diff --git a/test/jdk/java/awt/ColorClass/ColorARGBConstructorTest.java b/test/jdk/java/awt/ColorClass/ColorARGBConstructorTest.java
new file mode 100644
index 00000000000..3464e2057b9
--- /dev/null
+++ b/test/jdk/java/awt/ColorClass/ColorARGBConstructorTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Color;
+
+/**
+ * @test
+ * @bug 6434110
+ * @summary Verify Color(int, boolean) constructor uses ARGB bit layout
+ */
+public final class ColorARGBConstructorTest {
+
+    public static void main(String[] args) {
+        for (int argb : new int[]{0x00000000, 0x01020304, 0xC0903020,
+                                  0x40302010, 0xD08040C0, 0x80000000,
+                                  0x7FFFFFFF, 0xFFFFFFFF, 0xFF000000,
+                                  0x00FF0000, 0x0000FF00, 0x000000FF})
+        {
+            verify(argb, true);
+            verify(argb, false);
+        }
+    }
+
+    private static void verify(int argb, boolean hasAlpha) {
+        var c = new Color(argb, hasAlpha);
+        int expRGB = hasAlpha ? argb : (0xFF000000 | argb);
+        int expA = hasAlpha ? (argb >>> 24) : 0xFF;
+        int expR = (argb >> 16) & 0xFF;
+        int expG = (argb >> 8) & 0xFF;
+        int expB = argb & 0xFF;
+        check("RGB", expRGB, c.getRGB(), argb, hasAlpha);
+        check("Alpha", expA, c.getAlpha(), argb, hasAlpha);
+        check("Red", expR, c.getRed(), argb, hasAlpha);
+        check("Green", expG, c.getGreen(), argb, hasAlpha);
+        check("Blue", expB, c.getBlue(), argb, hasAlpha);
+    }
+
+    private static void check(String comp, int exp, int got, int argb,
+                              boolean hasAlpha)
+    {
+        if (exp != got) {
+            throw new RuntimeException("0x%08X(%b) %s: 0x%08X != 0x%08X"
+                    .formatted(argb, hasAlpha, comp, exp, got));
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Desktop/BrowseTest.java b/test/jdk/java/awt/Desktop/BrowseTest.java
index 33de1ecdca7..28e08fe16c7 100644
--- a/test/jdk/java/awt/Desktop/BrowseTest.java
+++ b/test/jdk/java/awt/Desktop/BrowseTest.java
@@ -40,10 +40,27 @@ import jtreg.SkippedException;
 
 public class BrowseTest extends JPanel {
     static final String INSTRUCTIONS = """
-            This test could launch default file manager to open user's home
-            directory, and default web browser to show the URL of java vendor.
-            After test execution close the native file manager and web browser
+            Set your default browser as per the test platform.
+            macOS - Safari
+            windows - MS Edge
+            linux - Firefox
+
+            This test checks 2 cases:
+
+            1) Directory URI:
+               On macOS and windows, verify that a browser window opens and
+               EITHER the browser OR native file manager shows the user's
+               home directory.
+
+               On Linux verify that the user's home directory is shown by the
+               default file manager.
+
+            2) Web URI:
+               Verify that the Web URI (URL of java vendor) opens in the browser.
+
+            After test execution close the native file manager and any web browser
             windows if they were launched by test.
+
             Also check output for any unexpected EXCEPTIONS,
             if you see any failure messages press Fail otherwise press Pass.
             """;
@@ -53,7 +70,7 @@ public class BrowseTest extends JPanel {
 
         URI dirURI = new File(System.getProperty("user.home")).toURI();
         URI webURI = URI.create(System.getProperty("java.vendor.url", "http://www.java.com"));
-        boolean failed = false;
+        PassFailJFrame.log("Testing 1st case: Directory URI ...");
         try {
             PassFailJFrame.log("Try to browse " + dirURI + " ...");
             desktop.browse(dirURI);
@@ -62,6 +79,7 @@ public class BrowseTest extends JPanel {
             PassFailJFrame.log("EXCEPTION: " + e.getMessage());
         }
 
+        PassFailJFrame.log("Testing 2nd case: Web URI ...");
         try {
             PassFailJFrame.log("Try to browse " + webURI + " ...");
             desktop.browse(webURI);
diff --git a/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java b/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java
index b2d7ef28df1..77d86ceb42a 100644
--- a/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java
+++ b/test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java
@@ -48,7 +48,7 @@ public class EditAndPrintTest extends JPanel {
             This test tries to edit and print a directory, which will expectedly raise IOException.
             Then this test would edit and print a .txt file, which should be successful.
             After test execution close the editor if it was launched by test.
-            If you see any EXCEPTION messages in the output press FAIL.
+            If you see any EXCEPTION messages in case of .txt file in the output press FAIL.
             """;
 
     static Desktop desktop;
diff --git a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java b/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
deleted file mode 100644
index 1201e5c835c..00000000000
--- a/test/jdk/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.io.*;
-import javax.swing.*;
-import sun.awt.SunToolkit;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * @test
- * @key headful
- * @bug 8043705
- * @summary Can't exit color chooser dialog when running in non-default AppContext
- * @modules java.desktop/sun.awt
- * @run main CloseDialogTest
- */
-
-public class CloseDialogTest {
-
-    private static volatile Frame frame;
-    private static volatile Dialog dialog;
-    private static volatile InputStream testErrorStream;
-    private static final PrintStream systemErrStream = System.err;
-    private static final AtomicReference<Exception> caughtException
-            = new AtomicReference<>();
-
-    public static void main(String[] args) throws Exception {
-
-        // redirect System err
-        PipedOutputStream errorOutputStream = new PipedOutputStream();
-        testErrorStream = new PipedInputStream(errorOutputStream);
-        System.setErr(new PrintStream(errorOutputStream));
-
-        ThreadGroup swingTG = new ThreadGroup(getRootThreadGroup(), "SwingTG");
-        try {
-            new Thread(swingTG, () -> {
-                SunToolkit.createNewAppContext();
-                SwingUtilities.invokeLater(() -> {
-                    frame = new Frame();
-                    frame.setSize(300, 300);
-                    frame.setVisible(true);
-
-                    dialog = new Dialog(frame);
-                    dialog.setSize(200, 200);
-                    dialog.setModal(true);
-                    dialog.setVisible(true);
-                });
-            }).start();
-
-            Thread.sleep(400);
-
-            Thread disposeThread = new Thread(swingTG, () ->
-                    SwingUtilities.invokeLater(() -> {
-                try {
-                    while (dialog == null || !dialog.isVisible()) {
-                        Thread.sleep(100);
-                    }
-                    dialog.setVisible(false);
-                    dialog.dispose();
-                    frame.dispose();
-                } catch (Exception e) {
-                    caughtException.set(e);
-                }
-            }));
-            disposeThread.start();
-            disposeThread.join();
-            Thread.sleep(500);
-
-            // read System err
-            final char[] buffer = new char[2048];
-            System.err.print("END");
-            System.setErr(systemErrStream);
-            try (Reader in = new InputStreamReader(testErrorStream, "UTF-8")) {
-                int size = in.read(buffer, 0, buffer.length);
-                String errorString = new String(buffer, 0, size);
-                if (!errorString.startsWith("END")) {
-                    System.err.println(errorString.
-                            substring(0, errorString.length() - 4));
-                    throw new RuntimeException("Error output is not empty!");
-                }
-            }
-        } finally {
-            if (caughtException.get() != null) {
-                throw new RuntimeException("Failed. Caught exception!",
-                        caughtException.get());
-            }
-        }
-    }
-
-    private static ThreadGroup getRootThreadGroup() {
-        ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
-        while (threadGroup.getParent() != null) {
-            threadGroup = threadGroup.getParent();
-        }
-        return threadGroup;
-    }
-}
diff --git a/test/jdk/java/awt/Toolkit/DisplayChangesException/DisplayChangesException.java b/test/jdk/java/awt/Toolkit/DisplayChangesException/DisplayChangesException.java
deleted file mode 100644
index 0f13265ac58..00000000000
--- a/test/jdk/java/awt/Toolkit/DisplayChangesException/DisplayChangesException.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.EventQueue;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
-import java.lang.reflect.Method;
-import java.util.concurrent.CountDownLatch;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-
-import sun.awt.DisplayChangedListener;
-import sun.awt.SunToolkit;
-
-/**
- * @test
- * @key headful
- * @bug 8207070
- * @modules java.desktop/sun.java2d
- *          java.desktop/sun.awt
- *          java.desktop/sun.awt.windows:open
- */
-public final class DisplayChangesException {
-
-    private static boolean fail;
-    private static CountDownLatch go = new CountDownLatch(1);
-
-    static final class TestThread extends Thread {
-
-        private JFrame frame;
-
-        private TestThread(ThreadGroup tg, String threadName) {
-            super(tg, threadName);
-        }
-
-        public void run() {
-            try {
-                test();
-            } catch (final Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        private void test() throws Exception {
-            SunToolkit.createNewAppContext();
-            EventQueue.invokeAndWait(() -> {
-                frame = new JFrame();
-                final JButton b = new JButton();
-                b.addPropertyChangeListener(evt -> {
-                    if (!SunToolkit.isDispatchThreadForAppContext(b)) {
-                        System.err.println("Wrong thread:" + currentThread());
-                        fail = true;
-                    }
-                });
-                frame.add(b);
-                frame.setSize(100, 100);
-                frame.setLocationRelativeTo(null);
-                frame.pack();
-            });
-            go.await();
-            EventQueue.invokeAndWait(() -> {
-                frame.dispose();
-            });
-        }
-    }
-
-    public static void main(final String[] args) throws Exception {
-        ThreadGroup tg0 = new ThreadGroup("ThreadGroup0");
-        ThreadGroup tg1 = new ThreadGroup("ThreadGroup1");
-
-        TestThread t0 = new TestThread(tg0, "TestThread 0");
-        TestThread t1 = new TestThread(tg1, "TestThread 1");
-
-        t0.start();
-        t1.start();
-        Thread.sleep(1500); // Cannot use Robot.waitForIdle
-        testToolkit();
-        Thread.sleep(1500);
-        testGE();
-        Thread.sleep(1500);
-        go.countDown();
-
-        if (fail) {
-            throw new RuntimeException();
-        }
-    }
-
-    private static void testGE() {
-        Object ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        if (!(ge instanceof DisplayChangedListener)) {
-            return;
-        }
-        ((DisplayChangedListener) ge).displayChanged();
-    }
-
-    private static void testToolkit() {
-        final Class toolkit;
-        try {
-            toolkit = Class.forName("sun.awt.windows.WToolkit");
-        } catch (final ClassNotFoundException ignored) {
-            return;
-        }
-        try {
-            final Method displayChanged = toolkit.getMethod("displayChanged");
-            displayChanged.invoke(Toolkit.getDefaultToolkit());
-        } catch (final Exception e) {
-            e.printStackTrace();
-            fail = true;
-        }
-    }
-}
-
diff --git a/test/jdk/java/awt/font/GlyphVector/GlyphMetricsRotatedFontTest.java b/test/jdk/java/awt/font/GlyphVector/GlyphMetricsRotatedFontTest.java
new file mode 100644
index 00000000000..eb00fd4f34d
--- /dev/null
+++ b/test/jdk/java/awt/font/GlyphVector/GlyphMetricsRotatedFontTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8148334 8377937
+ * @summary Checks behavior of GlyphVector.getGlyphMetrics(int) with rotated fonts.
+ */
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphMetrics;
+import java.awt.font.GlyphVector;
+import java.awt.geom.AffineTransform;
+
+public class GlyphMetricsRotatedFontTest {
+
+    public static void main(String[] args) {
+
+        String text = "The quick brown \r\n fox JUMPS over \t the lazy dog.";
+        FontRenderContext frc = new FontRenderContext(null, true, true);
+
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        String[] names = ge.getAvailableFontFamilyNames();
+
+        for (String name : names) {
+
+            Font normal = new Font(name, Font.PLAIN, 60);
+            if (normal.canDisplayUpTo("AZaz09") != -1) {
+                continue;
+            }
+
+            double theta = 0.5; // about 30 degrees
+            AffineTransform tx = AffineTransform.getRotateInstance(theta);
+            Font rotated = normal.deriveFont(tx);
+
+            GlyphVector gv1 = normal.createGlyphVector(frc, text);
+            GlyphVector gv2 = rotated.createGlyphVector(frc, text);
+
+            for (int i = 0; i < gv1.getNumGlyphs(); i++) {
+                GlyphMetrics gm1 = gv1.getGlyphMetrics(i);
+                GlyphMetrics gm2 = gv2.getGlyphMetrics(i);
+                assertEqual(0, gm1.getAdvanceY(), 0, name + " normal y", i);
+                double expectedX = Math.cos(theta) * gm1.getAdvanceX();
+                double expectedY = Math.sin(theta) * gm1.getAdvanceX();
+                assertEqual(expectedX, gm2.getAdvanceX(), 1, name + " rotated x", i);
+                assertEqual(expectedY, gm2.getAdvanceY(), 1, name + " rotated y", i);
+            }
+        }
+    }
+
+    private static void assertEqual(double d1, double d2, double variance,
+                                    String scenario, int index) {
+        if (Math.abs(d1 - d2) > variance) {
+            String msg = String.format("%s for index %d: %f != %f", scenario, index, d1, d2);
+            throw new RuntimeException(msg);
+        }
+    }
+}
diff --git a/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java b/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
index 63cd890f1db..4a3f759c559 100644
--- a/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
+++ b/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,9 +67,13 @@ public class FormatCharAdvanceTest {
      * font.em = 2048
      * font.ascent = 1638
      * font.descent = 410
-     * font.familyname = 'Test'
-     * font.fontname = 'Test'
-     * font.fullname = 'Test'
+     * font.familyname = 'TTFTest'
+     * font.fontname = 'TTFTest'
+     * font.fullname = 'TTFTest'
+     * #Use below values for Type 1 font
+     * #font.familyname = 'Type1Test'
+     * #font.fontname = 'Type1Test'
+     * #font.fullname = 'Type1Test'
      * font.copyright = ''
      * font.autoWidth(0, 0, 2048)
      *
@@ -107,29 +111,30 @@ public class FormatCharAdvanceTest {
      *
      * ttf = 'test.ttf'     # TrueType
      * t64 = 'test.ttf.txt' # TrueType Base64
-     * pfb = 'test.pfb'     # PostScript Type1
-     * p64 = 'test.pfb.txt' # PostScript Type1 Base64
+     * #Use commented lines to generate Type1 font
+     * #pfb = 'test.pfb'     # PostScript Type1
+     * #p64 = 'test.pfb.txt' # PostScript Type1 Base64
      *
      * font.generate(ttf)
-     * font.generate(pfb)
+     * #font.generate(pfb)
      *
      * with open(ttf, 'rb') as f1:
      *   encoded = base64.b64encode(f1.read())
      *   with open(t64, 'wb') as f2:
      *     f2.write(encoded)
      *
-     * with open(pfb, 'rb') as f3:
-     *   encoded = base64.b64encode(f3.read())
-     *   with open(p64, 'wb') as f4:
-     *     f4.write(encoded)
+     * #with open(pfb, 'rb') as f3:
+     *   #encoded = base64.b64encode(f3.read())
+     *   #with open(p64, 'wb') as f4:
+     *     #f4.write(encoded)
      * </pre>
      */
-    private static final String TTF_BYTES = "AAEAAAANAIAAAwBQRkZUTarBS1AAABbcAAAAHE9TLzKD7vqWAAABWAAAAGBjbWFw11zF/AAAAvwAAANSY3Z0IABEBREAAAZQAAAABGdhc3D//wADAAAW1AAAAAhnbHlmgVJ3qAAAB4gAAAnMaGVhZCqFqboAAADcAAAANmhoZWEIcgJiAAABFAAAACRobXR4L1UevAAAAbgAAAFEbG9jYb8EwZoAAAZUAAABNG1heHAA4ABCAAABOAAAACBuYW1lJWcF2wAAEVQAAAGJcG9zdBSfZd0AABLgAAAD8QABAAAAAQAAzMHptF8PPPUACwgAAAAAAORfr7QAAAAA5F+vtABEAAACZAVVAAAACAACAAAAAAAAAAEAAAVVAAAAuAJYAAAAAAJkAAEAAAAAAAAAAAAAAAAAAAAJAAEAAACZAAgAAgAIAAIAAgAAAAEAAQAAAEAALgABAAEABAJXAZAABQAABTMFmQAAAR4FMwWZAAAD1wBmAhIAAAIABQMAAAAAAACAACADAgAAABECAKgAAAAAUGZFZACAAAn//wZm/mYAuAVVAAAAAAABAAAAAADIAMgAAAAgAAEC7ABEAAAAAAJYAGQCWABkAlgAZAJYAGQCWABkAjkAAAJYAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAAAAFAAAAAwAAACwAAAAEAAAA7AABAAAAAAJMAAMAAQAAACwAAwAKAAAA7AAEAMAAAAAoACAABAAIAA0AIAA5AFoAegCFAK0GBQYcBt0HDwiRCOIYDiAPIC8gb/7///v//wAAAAkAIAAwAEEAYQCFAK0GAAYcBt0HDwiQCOIYDiALICggYP7///n//wAA/+f/2P/R/8v/wf+a+kj6Mvly+UH3wfdx6EbgSuAy4AIBcwAAAAEAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAMABAAFAAYAAgBzAHQAdQAMAAAAAAFgAAAAAAAAABwAAAAJAAAADAAAAAMAAAANAAAADQAAAAIAAAAgAAAAIAAAAAcAAAAwAAAAOQAAAAgAAABBAAAAWgAAABIAAABhAAAAegAAACwAAACFAAAAhQAAAEYAAACtAAAArQAAAEcAAAYAAAAGBQAAAEgAAAYcAAAGHAAAAE4AAAbdAAAG3QAAAE8AAAcPAAAHDwAAAFAAAAiQAAAIkQAAAFEAAAjiAAAI4gAAAFMAABgOAAAYDgAAAFQAACALAAAgDwAAAFUAACAoAAAgLwAAAFoAACBgAAAgbwAAAGIAAP7/AAD+/wAAAHIAAP/5AAD/+wAAAHMAARC9AAEQvQAAAHYAARDNAAEQzQAAAHcAATQwAAE0PwAAAHgAAbygAAG8owAAAIgAAdFzAAHRegAAAIwADgABAA4AAQAAAJQADgAgAA4AIQAAAJUADgB+AA4AfwAAAJcAAAEGAAABAAAAAAAAAAEDBAUGAgAAAAAAAAAAAAAAAAAAAAEAAAcAAAAAAAAAAAAAAAAAAAAICQoLDA0ODxARAAAAAAAAABITFBUWFxgZGhscHR4fICEiIyQlJicoKSorAAAAAAAALC0uLzAxMjM0NTY3ODk6Ozw9Pj9AQUJDREUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAURAAAALAAsADQAPABEAEwAVABUAFwAZABsAHQAfACEAIwAlACcAKQArAC0ALwAxADMANQA3ADkAOwA9AD8AQQBDAEUARwBJAEsATQBPAFEAUwBVAFcAWQBbAF0AYYBjgGWAZ4BpgGuAbYBvgHGAc4B1gHeAeYB7gH2Af4CBgIOAhYCHgImAi4CNgI+AkYCTgJWAl4CZgJuAnYCfgKGAo4ClgKeAqYCrgK2Ar4CxgLOAtYC3gLmAu4C9gL+AwYDDgMWAx4DJgMuAzYDPgNGA04DVgNeA2YDbgN2A34DhgOOA5YDngOmA64DtgO+A8YDzgPWA94D5gPuA/YD/gQGBA4EFgQeBCYELgQ2BD4ERgROBFYEXgRmBG4EdgR+BIYEjgSWBJ4EpgSuBLYEvgTGBM4E1gTeBOYAAgBEAAACZAVVAAMABwAusQEALzyyBwQA7TKxBgXcPLIDAgDtMgCxAwAvPLIFBADtMrIHBgH8PLIBAgDtMjMRIRElIREhRAIg/iQBmP5oBVX6q0QEzQAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAAAAgBkAGQB9ADIAAMABwAANzUhFSE1IRVkAZD+cAGQZGRkZGT//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAAAAAAOAK4AAQAAAAAAAAAAAAIAAQAAAAAAAQAEAA0AAQAAAAAAAgAHACIAAQAAAAAAAwAgAGwAAQAAAAAABAAEAJcAAQAAAAAABQAPALwAAQAAAAAABgAEANYAAwABBAkAAAAAAAAAAwABBAkAAQAIAAMAAwABBAkAAgAOABIAAwABBAkAAwBAACoAAwABBAkABAAIAI0AAwABBAkABQAeAJwAAwABBAkABgAIAMwAAAAAVABlAHMAdAAAVGVzdAAAUgBlAGcAdQBsAGEAcgAAUmVndWxhcgAARgBvAG4AdABGAG8AcgBnAGUAIAAyAC4AMAAgADoAIABUAGUAcwB0ACAAOgAgADMAMAAtADUALQAyADAAMgA1AABGb250Rm9yZ2UgMi4wIDogVGVzdCA6IDMwLTUtMjAyNQAAVABlAHMAdAAAVGVzdAAAVgBlAHIAcwBpAG8AbgAgADAAMAAxAC4AMAAwADAAAFZlcnNpb24gMDAxLjAwMAAAVABlAHMAdAAAVGVzdAAAAAAAAgAAAAAAAP9nAGYAAAAAAAAAAAAAAAAAAAAAAAAAAACZAAAAAQECAQMBBAEFAQYAAwATABQAFQAWABcAGAAZABoAGwAcACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0BBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZB3VuaTAwMEQHdW5pMDAwOQd1bmkwMDBBB3VuaTAwMEIHdW5pMDAwQwd1bmkwMDg1B3VuaTAwQUQHdW5pMDYwMAd1bmkwNjAxB3VuaTA2MDIHdW5pMDYwMwd1bmkwNjA0B3VuaTA2MDUHdW5pMDYxQwd1bmkwNkREB3VuaTA3MEYHdW5pMDg5MAd1bmkwODkxB3VuaTA4RTIHdW5pMTgwRQd1bmkyMDBCB3VuaTIwMEMHdW5pMjAwRAd1bmkyMDBFB3VuaTIwMEYHdW5pMjAyOAd1bmkyMDI5B3VuaTIwMkEHdW5pMjAyQgd1bmkyMDJDB3VuaTIwMkQHdW5pMjAyRQd1bmkyMDJGB3VuaTIwNjAHdW5pMjA2MQd1bmkyMDYyB3VuaTIwNjMHdW5pMjA2NAd1bmkyMDY1B3VuaTIwNjYHdW5pMjA2Nwd1bmkyMDY4B3VuaTIwNjkHdW5pMjA2QQd1bmkyMDZCB3VuaTIwNkMHdW5pMjA2RAd1bmkyMDZFB3VuaTIwNkYHdW5pRkVGRgd1bmlGRkY5B3VuaUZGRkEHdW5pRkZGQgZ1MTEwQkQGdTExMENEBnUxMzQzMAZ1MTM0MzEGdTEzNDMyBnUxMzQzMwZ1MTM0MzQGdTEzNDM1BnUxMzQzNgZ1MTM0MzcGdTEzNDM4BnUxMzQzOQZ1MTM0M0EGdTEzNDNCBnUxMzQzQwZ1MTM0M0QGdTEzNDNFBnUxMzQzRgZ1MUJDQTAGdTFCQ0ExBnUxQkNBMgZ1MUJDQTMGdTFEMTczBnUxRDE3NAZ1MUQxNzUGdTFEMTc2BnUxRDE3NwZ1MUQxNzgGdTFEMTc5BnUxRDE3QQZ1RTAwMDEGdUUwMDIwBnVFMDAyMQZ1RTAwN0UGdUUwMDdGAAAAAAAAAf//AAIAAAABAAAAAOIB6+cAAAAA5F+vtAAAAADkX6+0";
+    private static final String TTF_BYTES = "AAEAAAANAIAAAwBQRkZUTbCUBjwAABcAAAAAHE9TLzKD7vqWAAABWAAAAGBjbWFw11zF/AAAAvwAAANSY3Z0IABEBREAAAZQAAAABGdhc3D//wADAAAW+AAAAAhnbHlmgVJ3qAAAB4gAAAnMaGVhZC1MmToAAADcAAAANmhoZWEIcgJiAAABFAAAACRobXR4L1UevAAAAbgAAAFEbG9jYb8EwZoAAAZUAAABNG1heHAA4ABCAAABOAAAACBuYW1lLzI4NgAAEVQAAAGtcG9zdBSfZd0AABMEAAAD8QABAAAAAQAAp/gvll8PPPUACwgAAAAAAOXDJ3QAAAAA5cMndABEAAACZAVVAAAACAACAAAAAAAAAAEAAAVVAAAAuAJYAAAAAAJkAAEAAAAAAAAAAAAAAAAAAAAJAAEAAACZAAgAAgAIAAIAAgAAAAEAAQAAAEAALgABAAEABAJXAZAABQAABTMFmQAAAR4FMwWZAAAD1wBmAhIAAAIABQMAAAAAAACAACADAgAAABECAKgAAAAAUGZFZACAAAn//wZm/mYAuAVVAAAAAAABAAAAAADIAMgAAAAgAAEC7ABEAAAAAAJYAGQCWABkAlgAZAJYAGQCWABkAjkAAAJYAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAZABkAGQAAAAFAAAAAwAAACwAAAAEAAAA7AABAAAAAAJMAAMAAQAAACwAAwAKAAAA7AAEAMAAAAAoACAABAAIAA0AIAA5AFoAegCFAK0GBQYcBt0HDwiRCOIYDiAPIC8gb/7///v//wAAAAkAIAAwAEEAYQCFAK0GAAYcBt0HDwiQCOIYDiALICggYP7///n//wAA/+f/2P/R/8v/wf+a+kj6Mvly+UH3wfdx6EbgSuAy4AIBcwAAAAEAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAMABAAFAAYAAgBzAHQAdQAMAAAAAAFgAAAAAAAAABwAAAAJAAAADAAAAAMAAAANAAAADQAAAAIAAAAgAAAAIAAAAAcAAAAwAAAAOQAAAAgAAABBAAAAWgAAABIAAABhAAAAegAAACwAAACFAAAAhQAAAEYAAACtAAAArQAAAEcAAAYAAAAGBQAAAEgAAAYcAAAGHAAAAE4AAAbdAAAG3QAAAE8AAAcPAAAHDwAAAFAAAAiQAAAIkQAAAFEAAAjiAAAI4gAAAFMAABgOAAAYDgAAAFQAACALAAAgDwAAAFUAACAoAAAgLwAAAFoAACBgAAAgbwAAAGIAAP7/AAD+/wAAAHIAAP/5AAD/+wAAAHMAARC9AAEQvQAAAHYAARDNAAEQzQAAAHcAATQwAAE0PwAAAHgAAbygAAG8owAAAIgAAdFzAAHRegAAAIwADgABAA4AAQAAAJQADgAgAA4AIQAAAJUADgB+AA4AfwAAAJcAAAEGAAABAAAAAAAAAAEDBAUGAgAAAAAAAAAAAAAAAAAAAAEAAAcAAAAAAAAAAAAAAAAAAAAICQoLDA0ODxARAAAAAAAAABITFBUWFxgZGhscHR4fICEiIyQlJicoKSorAAAAAAAALC0uLzAxMjM0NTY3ODk6Ozw9Pj9AQUJDREUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAURAAAALAAsADQAPABEAEwAVABUAFwAZABsAHQAfACEAIwAlACcAKQArAC0ALwAxADMANQA3ADkAOwA9AD8AQQBDAEUARwBJAEsATQBPAFEAUwBVAFcAWQBbAF0AYYBjgGWAZ4BpgGuAbYBvgHGAc4B1gHeAeYB7gH2Af4CBgIOAhYCHgImAi4CNgI+AkYCTgJWAl4CZgJuAnYCfgKGAo4ClgKeAqYCrgK2Ar4CxgLOAtYC3gLmAu4C9gL+AwYDDgMWAx4DJgMuAzYDPgNGA04DVgNeA2YDbgN2A34DhgOOA5YDngOmA64DtgO+A8YDzgPWA94D5gPuA/YD/gQGBA4EFgQeBCYELgQ2BD4ERgROBFYEXgRmBG4EdgR+BIYEjgSWBJ4EpgSuBLYEvgTGBM4E1gTeBOYAAgBEAAACZAVVAAMABwAusQEALzyyBwQA7TKxBgXcPLIDAgDtMgCxAwAvPLIFBADtMrIHBgH8PLIBAgDtMjMRIRElIREhRAIg/iQBmP5oBVX6q0QEzQAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAAAAgBkAGQB9ADIAAMABwAANzUhFSE1IRVkAZD+cAGQZGRkZGT//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAD//wBkAGQB9ADIEgYALAAA//8AZABkAfQAyBIGACwAAP//AGQAZAH0AMgSBgAsAAAAAAAOAK4AAQAAAAAAAAAAAAIAAQAAAAAAAQAHABMAAQAAAAAAAgAHACsAAQAAAAAAAwAjAHsAAQAAAAAABAAHAK8AAQAAAAAABQAPANcAAQAAAAAABgAHAPcAAwABBAkAAAAAAAAAAwABBAkAAQAOAAMAAwABBAkAAgAOABsAAwABBAkAAwBGADMAAwABBAkABAAOAJ8AAwABBAkABQAeALcAAwABBAkABgAOAOcAAAAAVABUAEYAVABlAHMAdAAAVFRGVGVzdAAAUgBlAGcAdQBsAGEAcgAAUmVndWxhcgAARgBvAG4AdABGAG8AcgBnAGUAIAAyAC4AMAAgADoAIABUAFQARgBUAGUAcwB0ACAAOgAgADIANAAtADIALQAyADAAMgA2AABGb250Rm9yZ2UgMi4wIDogVFRGVGVzdCA6IDI0LTItMjAyNgAAVABUAEYAVABlAHMAdAAAVFRGVGVzdAAAVgBlAHIAcwBpAG8AbgAgADAAMAAxAC4AMAAwADAAAFZlcnNpb24gMDAxLjAwMAAAVABUAEYAVABlAHMAdAAAVFRGVGVzdAAAAAAAAgAAAAAAAP9nAGYAAAAAAAAAAAAAAAAAAAAAAAAAAACZAAAAAQECAQMBBAEFAQYAAwATABQAFQAWABcAGAAZABoAGwAcACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0BBwEIAQkBCgELAQwBDQEOAQ8BEAERARIBEwEUARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEBIgEjASQBJQEmAScBKAEpASoBKwEsAS0BLgEvATABMQEyATMBNAE1ATYBNwE4ATkBOgE7ATwBPQE+AT8BQAFBAUIBQwFEAUUBRgFHAUgBSQFKAUsBTAFNAU4BTwFQAVEBUgFTAVQBVQFWAVcBWAFZB3VuaTAwMEQHdW5pMDAwOQd1bmkwMDBBB3VuaTAwMEIHdW5pMDAwQwd1bmkwMDg1B3VuaTAwQUQHdW5pMDYwMAd1bmkwNjAxB3VuaTA2MDIHdW5pMDYwMwd1bmkwNjA0B3VuaTA2MDUHdW5pMDYxQwd1bmkwNkREB3VuaTA3MEYHdW5pMDg5MAd1bmkwODkxB3VuaTA4RTIHdW5pMTgwRQd1bmkyMDBCB3VuaTIwMEMHdW5pMjAwRAd1bmkyMDBFB3VuaTIwMEYHdW5pMjAyOAd1bmkyMDI5B3VuaTIwMkEHdW5pMjAyQgd1bmkyMDJDB3VuaTIwMkQHdW5pMjAyRQd1bmkyMDJGB3VuaTIwNjAHdW5pMjA2MQd1bmkyMDYyB3VuaTIwNjMHdW5pMjA2NAd1bmkyMDY1B3VuaTIwNjYHdW5pMjA2Nwd1bmkyMDY4B3VuaTIwNjkHdW5pMjA2QQd1bmkyMDZCB3VuaTIwNkMHdW5pMjA2RAd1bmkyMDZFB3VuaTIwNkYHdW5pRkVGRgd1bmlGRkY5B3VuaUZGRkEHdW5pRkZGQgZ1MTEwQkQGdTExMENEBnUxMzQzMAZ1MTM0MzEGdTEzNDMyBnUxMzQzMwZ1MTM0MzQGdTEzNDM1BnUxMzQzNgZ1MTM0MzcGdTEzNDM4BnUxMzQzOQZ1MTM0M0EGdTEzNDNCBnUxMzQzQwZ1MTM0M0QGdTEzNDNFBnUxMzQzRgZ1MUJDQTAGdTFCQ0ExBnUxQkNBMgZ1MUJDQTMGdTFEMTczBnUxRDE3NAZ1MUQxNzUGdTFEMTc2BnUxRDE3NwZ1MUQxNzgGdTFEMTc5BnUxRDE3QQZ1RTAwMDEGdUUwMDIwBnVFMDAyMQZ1RTAwN0UGdUUwMDdGAAAAAAAAAf//AAIAAAABAAAAAOUNt1MAAAAA5cMndAAAAADlwyd0";
 
     /**
-     * Same font as above, but in PostScript Type1 (PFB) format.
+     * Same font as above, but in PostScript Type1 (PFB) format with different font name.
      */
-    private static final String TYPE1_BYTES = "gAFSBwAAJSFQUy1BZG9iZUZvbnQtMS4wOiBUZXN0IDAwMS4wMDAKJSVUaXRsZTogVGVzdAolVmVyc2lvbjogMDAxLjAwMAolJUNyZWF0aW9uRGF0ZTogRnJpIE1heSAzMCAyMDo1NTo0OCAyMDI1CiUlQ3JlYXRvcjogRGFuaWVsIEdyZWRsZXIKJSAyMDI1LTUtMzA6IENyZWF0ZWQgd2l0aCBGb250Rm9yZ2UgKGh0dHA6Ly9mb250Zm9yZ2Uub3JnKQolIEdlbmVyYXRlZCBieSBGb250Rm9yZ2UgMjAyMzAxMDEgKGh0dHA6Ly9mb250Zm9yZ2Uuc2YubmV0LykKJSVFbmRDb21tZW50cwoKMTAgZGljdCBiZWdpbgovRm9udFR5cGUgMSBkZWYKL0ZvbnRNYXRyaXggWzAuMDAwNDg4MjgxIDAgMCAwLjAwMDQ4ODI4MSAwIDAgXXJlYWRvbmx5IGRlZgovRm9udE5hbWUgL1Rlc3QgZGVmCi9Gb250QkJveCB7MTAwIDEwMCA1MDAgMjAwIH1yZWFkb25seSBkZWYKL1BhaW50VHlwZSAwIGRlZgovRm9udEluZm8gMTAgZGljdCBkdXAgYmVnaW4KIC92ZXJzaW9uICgwMDEuMDAwKSByZWFkb25seSBkZWYKIC9Ob3RpY2UgKCkgcmVhZG9ubHkgZGVmCiAvRnVsbE5hbWUgKFRlc3QpIHJlYWRvbmx5IGRlZgogL0ZhbWlseU5hbWUgKFRlc3QpIHJlYWRvbmx5IGRlZgogL1dlaWdodCAoUmVndWxhcikgcmVhZG9ubHkgZGVmCiAvRlNUeXBlIDAgZGVmCiAvSXRhbGljQW5nbGUgMCBkZWYKIC9pc0ZpeGVkUGl0Y2ggZmFsc2UgZGVmCiAvVW5kZXJsaW5lUG9zaXRpb24gLTIwNC44IGRlZgogL1VuZGVybGluZVRoaWNrbmVzcyAxMDIuNCBkZWYKZW5kIHJlYWRvbmx5IGRlZgovRW5jb2RpbmcgMjU2IGFycmF5CiAwIDEgMjU1IHsgMSBpbmRleCBleGNoIC8ubm90ZGVmIHB1dH0gZm9yCmR1cCA5L3VuaTAwMDkgcHV0CmR1cCAxMC91bmkwMDBBIHB1dApkdXAgMTEvdW5pMDAwQiBwdXQKZHVwIDEyL3VuaTAwMEMgcHV0CmR1cCAxMy91bmkwMDBEIHB1dApkdXAgMzIvc3BhY2UgcHV0CmR1cCA0OC96ZXJvIHB1dApkdXAgNDkvb25lIHB1dApkdXAgNTAvdHdvIHB1dApkdXAgNTEvdGhyZWUgcHV0CmR1cCA1Mi9mb3VyIHB1dApkdXAgNTMvZml2ZSBwdXQKZHVwIDU0L3NpeCBwdXQKZHVwIDU1L3NldmVuIHB1dApkdXAgNTYvZWlnaHQgcHV0CmR1cCA1Ny9uaW5lIHB1dApkdXAgNjUvQSBwdXQKZHVwIDY2L0IgcHV0CmR1cCA2Ny9DIHB1dApkdXAgNjgvRCBwdXQKZHVwIDY5L0UgcHV0CmR1cCA3MC9GIHB1dApkdXAgNzEvRyBwdXQKZHVwIDcyL0ggcHV0CmR1cCA3My9JIHB1dApkdXAgNzQvSiBwdXQKZHVwIDc1L0sgcHV0CmR1cCA3Ni9MIHB1dApkdXAgNzcvTSBwdXQKZHVwIDc4L04gcHV0CmR1cCA3OS9PIHB1dApkdXAgODAvUCBwdXQKZHVwIDgxL1EgcHV0CmR1cCA4Mi9SIHB1dApkdXAgODMvUyBwdXQKZHVwIDg0L1QgcHV0CmR1cCA4NS9VIHB1dApkdXAgODYvViBwdXQKZHVwIDg3L1cgcHV0CmR1cCA4OC9YIHB1dApkdXAgODkvWSBwdXQKZHVwIDkwL1ogcHV0CmR1cCA5Ny9hIHB1dApkdXAgOTgvYiBwdXQKZHVwIDk5L2MgcHV0CmR1cCAxMDAvZCBwdXQKZHVwIDEwMS9lIHB1dApkdXAgMTAyL2YgcHV0CmR1cCAxMDMvZyBwdXQKZHVwIDEwNC9oIHB1dApkdXAgMTA1L2kgcHV0CmR1cCAxMDYvaiBwdXQKZHVwIDEwNy9rIHB1dApkdXAgMTA4L2wgcHV0CmR1cCAxMDkvbSBwdXQKZHVwIDExMC9uIHB1dApkdXAgMTExL28gcHV0CmR1cCAxMTIvcCBwdXQKZHVwIDExMy9xIHB1dApkdXAgMTE0L3IgcHV0CmR1cCAxMTUvcyBwdXQKZHVwIDExNi90IHB1dApkdXAgMTE3L3UgcHV0CmR1cCAxMTgvdiBwdXQKZHVwIDExOS93IHB1dApkdXAgMTIwL3ggcHV0CmR1cCAxMjEveSBwdXQKZHVwIDEyMi96IHB1dApkdXAgMTMzL3VuaTAwODUgcHV0CmR1cCAxNzMvdW5pMDBBRCBwdXQKcmVhZG9ubHkgZGVmCmN1cnJlbnRkaWN0IGVuZApjdXJyZW50ZmlsZSBlZXhlYwqAAo0WAAB0P4QT82NsqFqf/vtQtLsnMCpcwKtuL5Wb8g0yDDc8ISjQoM5wcrH2cqCqOMPA7OsEtEyxdKHDFhLXH/ogyQlUJWN4Ny95WwvylB9DfwWfQa4FmMAFFf7xhzM1V/Ms4yqe59S6tl2lND+ScH4s/PPozkRuWtrDn8N+zmS2izVs4NcQ9FsefyzXaKvKFDYINmh2GhAJRkFi0FTB9r8sRqMZs8ZkUodjFsE6kmRW02YpWP1WdA1YVnNuYQT4E+0xkVZ3eTTuscVEWua/buWeWxlwi0KH20ubr5iCkavAb953/MMe4XMKlPvGzsx0Slmp9qOOLD0ko2287peB1DvLavHCG/r2rr8MhqsKVoSyFr36sVd9hMSQrwFxpRjVEjtt5HDGcbHwy3ylp8b1oopSl5AQmeoW/oGT0rPr+358A+Qd2/wpQgStXDcDExQWDrdOL7J5Fr7VBDu8NNORXc7c5uKb2iVQq5AOF+Yfa5bH4reIFcWrAItBML9L9b8sOf1QKzGymFzgcDW3EEx07Y07ys95zSLkYtY5lkjm07GFSyM9cuWhRctY6RTcjTAFNdbxOUBXbIGf4Q8nhdXXi3IKhYdqdgKEsWphwKEdQeP7QYqW4bPSB881DjF/e7r6PIkua8MXGI3G1I0C53TIFnHXai5dtVJ4cZhdaTzgoD9K6zYMNsb8Tof6THYx+cRUzPbJmb+VbprjDk96+92jF+P0EwubV0GQMLEdCyPDV1u/vIHPePqSJt2/YjgkXEugRbyqzFwfZJdeAmkzcqs1CU9EiqrwgqbEfdmWWwv9BDxgkWD4omPKAKX1A6asv/UVfH8lebHSbrKddpR8XU/C2I/t7UhI19oTFqIvUL061MrZPiHZaFE9bnvJw+P91hF+MoPs69ddhD4Kj6z6MJYNGlvAZMuUM/RdAUwE3HHhwGiCN3Hqi4V+byVeB95B/8YLQK1CiW/pgfU7TqZ1d5nWGoAXAcAu6UYGvZZ0ChX3AEPlIFJ4x4hXfBo0I/k/TEHus/u5dNm/+ixyBcr/rX/e2yPIBfJkBJDG8x/y7JaxOFAD1NMQ4zWjbzP1uPpiGzRKfCXYLF6YXLfGDKJ1w3IENGwIMXBgqOx6O2v2xkYhcAUkrZ2Nw3xpRrnj2RqGCGwz00AHrl9AU7CNaM8BkSe6d86xT8teVYuOk926Xj4/+Kx6rfu526Ylz91kxebopcMvql6ysRVzzSGsW2ec9ZPJo1Q/WKb+tCvBm8OdUnRi+DldIajpytyl08TmlS+IRUcHZbxoIjxb7ZCvF8hd03yDhs9bsUSO6h7jbhegenLIiQPX7RtsGAg3logZLD0NUjcAm2tKBieMHhMxAD89lVmuMkNj5r6EaixXvkvhgqzhjPExdu30Knife5IEnlCvIlMCh1EXQsY9KRkzeTRTKfnZTJ/idze+cX0nCEGcFrvCCjZRfNuaLRHx73o2KlDHmoYBm1mFEEvfUReQxS987AiVfSF7cs8IrLEqV9qe2mCAv7ATbVUFbnvYxTBYvHL9sc4892rLrjSu/yP5RZmmIMOpTH8CStLw1zGAcXH3W3ZfPjQkEA4jzvo1U5Oi9EkBKqlgqjj2pFLWepwuNG/L3Iyr36frW6NFtqCxyVQYcNwOTnmQjY0LXPAKxyz2l+xyo/gcDY8nqtWms5aqINgemqM0pG2wBt3GawARbEVkkKllyB/WJbRw0GGHktmj73ixkTulD6nHZ+vMd+aS8iKXPa2ASEOPpxp515DZxg+VYZIrM0h4mDdRff4To/8NKs7Kx4IZx2qzlhIKS2zHpLwuY/U2Wt80e9nqMCFEtnS8sKpcy1rrE9FzXsFUNtYE6LdIat4ygQxoq24Y6D3bfDpl3E8wMvECaVCJX8lfBhQcGGU6+Jba1qfQ7jonjQM0zfoOwHrApk/dkPkSdjQy7UM+dZNMtgZf2N46UuWC2YCtcqCN1X+o5SpojTgXNmTjUy3KOy6L4GNYOxutsDhWiah6rJ+FGVL9D51MJvT3l02T1+LpNt8ZeZQSkZpx7NdFFTFA4/SE8zycfBLNm71Q9pjQKa30TnCY9ZkMEH9rnArLV0w2Gi6LoJoWpT7GoAB2Cdvi3x9wGDdt60K6oABWiD5mpAv4KfrJMBn5dRDJVyRPARXxwBUROAc3BxY8St3WuWKqDqqef0t0rlqAXGynPrcAjqFMXc/GBWORQ7W/dTvbu/eZb+apjKEX7szjaY4cSRsNge4gTyCEsfhLrdBkncM7up9jj206tIaqZQILxHAnrVwYplJ5D2EvSSLYvxFEVHSrI19aNJEvDK64tzXCV+P4yOCOuXpBmc15PDlrMQEauqrD+xneCO+CrCbudHXOJsbmvQq56+ovLp5SNBfdEPQpqo5tBgQaNHcEjg/iVt++uLxT3vAEFW5d7WXPMYdy+XqoMmdRDOzey0Mdx5BZ92rNM/LthQa6F54nvzkypM64HdxCYlri8cO3k0G6bp2eWdseP0P4zMc5QikuXc/Dr4NztBYe2yJLbLLesWSB8nOWcl+gd0GMX5PY4P5mn5WJDNStLWPdD9NapzMsyx6lZwR9Tfv/XSmay9LEo9YaaxysWfllDIasUCdvhZVi7LJvPu/0GbuHLOz9mP6prkF8h8KmjBYMlMktouA23G74M+Pkdfbj9KAM8zOYCgQFZUaXx3iZ4m3uBtDPeKjUcdFZSnHdW11eSv5aCz2fMbExV/qnPOSMbkR5rvpR71WwVZP6j3tNWr8jlPQ8d60k8jXPy7d8wjw9obnDEpvKzKreEzjfA0wCovNt7FLH9oxWmO5TF8JMg/U7+ToEv0fPAW475dXTXdue98/k/c+3+LCJNbHzBBx14CzpteKXKqGNA3jwgJUhfDsTISiN4gF222zIi1deY9BspjPl7jergbwh+ZPdfk2BLaPTDeNUycKdeiFoJEd8gKLvjMrnPa9IX4HwR9gJSjsQ0UWhnYuaXdk12zk8sVkGJAJLrphh5tHcd4LwG2rWcVXwM/2zw1YXQR+jffC1uxUEPVaq1fSf9RB6iEb8LgIollE+gDEybc+Dw3Q/gxVe5/Nu0vHHur6B+4YEcxvz3O5cYKUQTxDgG4mXJhqZ6z7etSWINChQyP6PUFFbsUIDXjfuHZ9oF4ce1NNOnn/RIwm/u/+AduDTtqloUooZjqak4VbvmBEZcW75liKm0MggeilL0nl5arItzTwE8OudJDBkJ/xnf1yZIgeFKSODIz5aQrIiSMJX3BGRxHEEQrm1xtwCfjtMPpFhFtG+o5fjMlCnowJ6+/HrG3FdZKn4/gv7qCxF2/3NW2J4OWuXbjEsUlSHu57DFvhrVl/q8jv81OfXhZKutYQWjaDWwOQHR+ym6wvMyQ9YfiiJpBXa+Ig9uGAbERyApc8wsCLcy0d8Msxx9PAfhrDa+Gf2yhYGA57t8iGxEcoI0A4B8zKVqYXKf4AdsrVzE9cUpfRN/HH8OGWyv9mKMTJyGJQql/OH5hYHnvJVKZXIz6l3nL/7gnpYaGtASiV1q+JwO7WSk1pfwT9SE4sFl7uS7f3pu4BwPhcz/wyN82f144yav11mrGqypOMaMDR27/L0sW1c3hWBBa8BMU/EuwF7ldclS9nxmFHOc35RLruyQ26cp1niukcpK42wg3ozqGQLoQRIoin0AWnUwnOmkdBEkILqFCiWgERDZuCB7G3pZJW/32HPgD3byO0lH8JF6OiINsUmM+75Y3qdvuepTHxXwpDa9Isero3x/f+UWGGUO12s+Ou2yQKtLsQaBNSTaGEBVCAtpJ58TgZ+KfVyhgRQdINr7GuGq9iRPQBY00anspxvsrhfffggqOariHO8h0jdEZPJarJJAufQbYgKiACtJ8iG6jlIs3GfWRI0jRYDw+kHPc2/A6fS5XGF360aX1I6iy5J1pZpN+6stJq5MQ8QRHopTJWQ0DW1Pq46BglmHH9av/X4tvLFFyyC4X6OB2jDb9+XwwcuJ2t/352IcJC06IsWKDsr6E6vF3hC3GUBUy9I7JbqlAh7zlYK52MITQzGINZD2p8+TJjmDycEr/UM/JHqBzbJniUzxg8vo2/FjpZggU8NuBsTZ5P/YZSgRsZcVKkhkGYAn+euvrQIiZ2LMwOygD0gW/zy7v+Z1aHfxKig7kkOR1ZuVCFE8FWx1unCnFHtkjFIx9JY4cYHboveIlF2IzNhfnKJncBt7DuZORqfAT3gQDZlIFNx06tSnTe1v5l7u7VSKMXRhc3bbeCqfvO/NSOqfLz1QYlj2b0C5sm0AcUe1RpC7rOu6muPLeJ38DOIhJHzs+wpqBZTHJr9zdnjZl+OyXaAAbgCsxamEQW91iGdRmVHqyT+0+XQxssYOF795eGYpsXy9Bik6Z4apt/AcuZQFu3XthVXvjyVCi0Rj3gXjOkFdT1YaiRe6yPRdBB2GorcxCzQQvjZXTuh5P4a7MD/6W0mJYoh0BzQHYC0O/T9v3d8GepAbQTytL7MWIWk9C2qZ0pPciuIfXNmGRWBUkCCts1BAsW39l4giNBCwDQ6CauWkz8iWaxx2krBQpKl0WyBBSd/SIJUFM4psvYNaGNk+xR18s0OrPqvxQvc3NNgVwpAljSM/wt3IzIcIsJHF/u0T60hXgEv4H0f44/SzROL0iGUZIfRZK6sJRGBQH2ZVrFCJ6ageJX7WTBLVwKAtxgIUK2dXAemsYgGm/CIe3JCmwL/YmEh8I8W4LrWzXq4vNF6/Sq1hQ2r4dndAO+HEZ8nYpPr+9pUCUgSvnN7aVWZpc/xJaj5L4U6W28hVZ2mb+UUKDpq0bSxKdkVr2SC/7Q/8WimMNDYCaExzXQ+RzZyv/4227pn/k3y1avulXGz3ujy+lqdciVVWHmPYyJPhqeoyDEkM6g46KL9kg912jsB1SGP7Yc2l7XENW59mh5RE+fNiW8wWjxW0Oa+xSe2+RTOgRA+Ojq2L8+g9sL7jKw7BPAPjnYTo8gMat4DurAKbJrtaRLZMzXkFyE7heHr9NsLJl/d1JLRwNoGDpnvLjyPNBUjW/2CTEEIyI6yq3oOJivAwe1yiJib7IUTkh5MCBSnEssvxOYJRUaR/ILAHMJpAoEV/VOCfBlh/I55gVYZWa+Y/5/AMs5Po1w9/18Q6V4ichv80Qr+Up7+2s8sV6zM7m78WMmQp3IR6uTJasqI2Vnr99KAY31BJVpBelRq2xjIruSHx/BAr2kSHA+Kuk1I9+Y1dEaSbfUpjcly0WDUh9x1VTkrUu1u6XN/i/SkFeO1k8o2o7s0rVXNI+VipXQt69H+yVDea7AYuvy9Rp2kKuq7o7mgcFCVq1Vbeyv++vDSKdYmKbyQ2N7ubU6u41Td59YNfRldl56ec0bl7hgyMUb/7/ifjdRXOVl1sTTMUiETnT+44vuAiiUeOHRgKmRlLgHp9iMnPPZVF3DqExLV1IPraZO/olA9QIc4bM2g6SPebITaH94rZn80oQzWzBAFUzK/B2vY39XGdPSTAZTFn1yAYcRHIhqWZs9+FtJvBN9f9lUxPFHUs3vyKBC8sFph/yee7KNIKyTinMNAs1+jcnVS4LPqR4L4cn3ancasZ6wBgexKIjjwf8KPkgUcMwZqk+KwDeJbmyGblqsRzSuhrwPq0U+n4n1ktcqI11Y4D/u93UrU04LgZwWPEZPrgjGUgciPrRa3BIJb6oT1s5VSfgiupwHaFYgF5sJ3VD0ZcT1zwdet8tPprxRq00SIZMZKZeVSIWD0ai82pPxH4PYLUGwUbW3ocaYouILRf9sF9DP1gaVfd4SDRUuKUtZRiG6lpSopmFO24N1vWq90caknzY91uUWX2v4+C/JHDd47e4h/g1Lf13euI6csefzsnQDTDsyrh5zSJDo26B81kY5RyKv+AnsvTnTl8uroRsh1KqeIUywpWImmlnnWT8rpNg822BjraGaWc9NHFzkUSmOmD/iJRdfRjno1JaeDVk8KBniY0vnMqdBG1BWRMsnUAhWxHJ4Jn5fXCltO2C5OV+x+jYocNhWw4Mgu3CVZp9erAEPsDEUsY4qaMitjRq6yJPn3nwkQRpFHGbXv187fPU/z8+BQ5/W4Qfg/qEmJKcp1T5VcrwLAlZQTomKAt/7xNlJIxlx9bCMVXnvk3Y8hB7kCTaSQmvjC8IXCHbJyMCFQV7qAKdmaihyV7zmpqWcDqfELQChm2KxmQJ1dPYJ1+jR+aYm3an5bPEoCdbsZauFF8qXHIhx8JKvRGgxPrTGHi8N5FcfuNsCA3xOkoSGX9Sxg6h5KEtoeFdkwf5BKqhJj5pcsBewAHkWng86BzAqt7R+a9TnyvLMWvmpI/0fkpRkbg731aWOnWOvbpz6f+nXSxGgrvs/B6xSgFPDo6Ty3ivL+CGitfK6XwdHA07TV/eK5vd5oyNe/Ay5wMdXiypEUWukN+jiuGmrVMkke/0DmXmtqqY3T45iLrqfgwRhXsT9kEdzcWVqM4OkAEqEzpjI0NHG74cslhQvDPbX/ZRp57/bcOuarHpCDakvzajblF2NXf0Wp0dO0NltExHFoY8myAlBu/SMn3VN6GF5faMq370MevoNi4eNRD8XiGUYh+QzVphqtLIeqyyt6W4MzTjwSLgAB0kITRYcG0KVi89iUgZMQdwIOfMUBmS/q1GpBtTFKqI2TwC3dz9oBnNzwi3Ru9yyNuX1mw1p0Sd8UNY0yVbdb7UrLrd0ldVrx2FWNVCEedkn0npe9xstIJvgMuRLA0DNN7vex3hfvGvV7qCuQi5ssNVYUkoyEjlFR3xCThuVCgwzK77JmvWMpeB0eR0O3SH9KK/1qaAkXK/bhyazFdT+WHrexsFYZuO5I1MiQWJzNDQ9r3act5mt0senky0dQ+Sb233mB+RX2AWxOf9SUcRtkKjiTvfSdcKHmLx7ns2F8MQdwFoKz7j4a7sPsuruL+BMHWuDj/VTfnVmG6nlzIjs92LVWKnZ010UOv156HJYQvhlSV+WzPv8EC/2A2LhBx0g1ZJ3vYQIu2G1AuhcZurtEOfbhcIsS6cq9P2YoRYTYTHeiXHNzKot/25uSAFs85GQhWyMz+2L3HBiszTmSdwtf0ZzHgGEBc90JD6yNfjwqF4FJ7AcuLYw5euNz/VEON3z2C021shibn6LGd4RjflA8XmBGSakJ0nkpplflYaQ9Awcv2eKYR4ebAVjhyErm4zHikUC5Vgtz/0UbghbNcX0RIEESW2GaGtFNYIYNPHJNtj4QMYLK7BrUOnzITF+Kx/FZG6oIeySnU+TJoZIkJBIqGLOYSkw+QuEbCbf1BM5nERddA8z+IFxYz7Goxg4XMpc3+L/Hx29UZzkNSY55Y2Swii1qxBWgBaRGpzI66cKfr6mHES+cbb9vNAdFPuBgJttyT/t3Jf+W5yRYt8M4VyIlEiUjAGqL3bqakDP5IwywMSpYeS1PmqWBsbUcV9bAavsLMnnEHvUue8GboIr+EeBMCk6XPBKFahrRZBTQq802IGDYOi++VjG7805Tleu2pX6H/IY/LDQVLnqVhxDaVonTvQqMffVvSwXp7EFNvR/XKxh+IJxO/W3tQeAi8Jn77E3itRU+tQEl8QQ65psW7FBQXujG6YYWK9XbPUPI/AkdVmaAuQQt7RPni0MhxB0Q8k6BqzhwbpyLMPa/XCkHdJLrO2xGupnrwYvt0OcF7Ia/hN9+HAekLtq8l+HcNGIY/JA2RPYOYGSEgAEVAgAACjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMApjbGVhcnRvbWFyawqAAw==";
+    private static final String TYPE1_BYTES = "gAFfBwAAJSFQUy1BZG9iZUZvbnQtMS4wOiBUeXBlMVRlc3QgMDAxLjAwMAolJVRpdGxlOiBUeXBlMVRlc3QKJVZlcnNpb246IDAwMS4wMDAKJSVDcmVhdGlvbkRhdGU6IFR1ZSBGZWIgMjQgMTU6MzQ6MDUgMjAyNgolJUNyZWF0b3I6IEpheWF0aGlydGggUmFvIEQgVgolIDIwMjYtMi0yNDogQ3JlYXRlZCB3aXRoIEZvbnRGb3JnZSAoaHR0cDovL2ZvbnRmb3JnZS5vcmcpCiUgR2VuZXJhdGVkIGJ5IEZvbnRGb3JnZSAyMDI1MTAwOSAoaHR0cDovL2ZvbnRmb3JnZS5zZi5uZXQvKQolJUVuZENvbW1lbnRzCgoxMCBkaWN0IGJlZ2luCi9Gb250VHlwZSAxIGRlZgovRm9udE1hdHJpeCBbMC4wMDA0ODgyODEgMCAwIDAuMDAwNDg4MjgxIDAgMCBdcmVhZG9ubHkgZGVmCi9Gb250TmFtZSAvVHlwZTFUZXN0IGRlZgovRm9udEJCb3ggezEwMCAxMDAgNTAwIDIwMCB9cmVhZG9ubHkgZGVmCi9QYWludFR5cGUgMCBkZWYKL0ZvbnRJbmZvIDkgZGljdCBkdXAgYmVnaW4KIC92ZXJzaW9uICgwMDEuMDAwKSByZWFkb25seSBkZWYKIC9Ob3RpY2UgKCkgcmVhZG9ubHkgZGVmCiAvRnVsbE5hbWUgKFR5cGUxVGVzdCkgcmVhZG9ubHkgZGVmCiAvRmFtaWx5TmFtZSAoVHlwZTFUZXN0KSByZWFkb25seSBkZWYKIC9XZWlnaHQgKFJlZ3VsYXIpIHJlYWRvbmx5IGRlZgogL0l0YWxpY0FuZ2xlIDAgZGVmCiAvaXNGaXhlZFBpdGNoIGZhbHNlIGRlZgogL1VuZGVybGluZVBvc2l0aW9uIC0yMDQuOCBkZWYKIC9VbmRlcmxpbmVUaGlja25lc3MgMTAyLjQgZGVmCmVuZCByZWFkb25seSBkZWYKL0VuY29kaW5nIDI1NiBhcnJheQogMCAxIDI1NSB7IDEgaW5kZXggZXhjaCAvLm5vdGRlZiBwdXR9IGZvcgpkdXAgOS91bmkwMDA5IHB1dApkdXAgMTAvdW5pMDAwQSBwdXQKZHVwIDExL3VuaTAwMEIgcHV0CmR1cCAxMi91bmkwMDBDIHB1dApkdXAgMTMvdW5pMDAwRCBwdXQKZHVwIDMyL3NwYWNlIHB1dApkdXAgNDgvemVybyBwdXQKZHVwIDQ5L29uZSBwdXQKZHVwIDUwL3R3byBwdXQKZHVwIDUxL3RocmVlIHB1dApkdXAgNTIvZm91ciBwdXQKZHVwIDUzL2ZpdmUgcHV0CmR1cCA1NC9zaXggcHV0CmR1cCA1NS9zZXZlbiBwdXQKZHVwIDU2L2VpZ2h0IHB1dApkdXAgNTcvbmluZSBwdXQKZHVwIDY1L0EgcHV0CmR1cCA2Ni9CIHB1dApkdXAgNjcvQyBwdXQKZHVwIDY4L0QgcHV0CmR1cCA2OS9FIHB1dApkdXAgNzAvRiBwdXQKZHVwIDcxL0cgcHV0CmR1cCA3Mi9IIHB1dApkdXAgNzMvSSBwdXQKZHVwIDc0L0ogcHV0CmR1cCA3NS9LIHB1dApkdXAgNzYvTCBwdXQKZHVwIDc3L00gcHV0CmR1cCA3OC9OIHB1dApkdXAgNzkvTyBwdXQKZHVwIDgwL1AgcHV0CmR1cCA4MS9RIHB1dApkdXAgODIvUiBwdXQKZHVwIDgzL1MgcHV0CmR1cCA4NC9UIHB1dApkdXAgODUvVSBwdXQKZHVwIDg2L1YgcHV0CmR1cCA4Ny9XIHB1dApkdXAgODgvWCBwdXQKZHVwIDg5L1kgcHV0CmR1cCA5MC9aIHB1dApkdXAgOTcvYSBwdXQKZHVwIDk4L2IgcHV0CmR1cCA5OS9jIHB1dApkdXAgMTAwL2QgcHV0CmR1cCAxMDEvZSBwdXQKZHVwIDEwMi9mIHB1dApkdXAgMTAzL2cgcHV0CmR1cCAxMDQvaCBwdXQKZHVwIDEwNS9pIHB1dApkdXAgMTA2L2ogcHV0CmR1cCAxMDcvayBwdXQKZHVwIDEwOC9sIHB1dApkdXAgMTA5L20gcHV0CmR1cCAxMTAvbiBwdXQKZHVwIDExMS9vIHB1dApkdXAgMTEyL3AgcHV0CmR1cCAxMTMvcSBwdXQKZHVwIDExNC9yIHB1dApkdXAgMTE1L3MgcHV0CmR1cCAxMTYvdCBwdXQKZHVwIDExNy91IHB1dApkdXAgMTE4L3YgcHV0CmR1cCAxMTkvdyBwdXQKZHVwIDEyMC94IHB1dApkdXAgMTIxL3kgcHV0CmR1cCAxMjIveiBwdXQKZHVwIDEzMy91bmkwMDg1IHB1dApkdXAgMTczL3VuaTAwQUQgcHV0CnJlYWRvbmx5IGRlZgpjdXJyZW50ZGljdCBlbmQKY3VycmVudGZpbGUgZWV4ZWMKgAKNFgAAdD+EE/NjbKhan/77ULS7JzAqXMCrbi+Vm/INMgw3PCEo0KDOcHKx9nKgqjjDwOzrBLRMsXShwxYS1x/6IMkJVCVjeDcveVsL8pQfQ38Fn0GuBZjABRX+8YczNVfzLOMqnufUurZdpTQ/knB+LPzz6M5Eblraw5/Dfs5ktos1bODXEPRbHn8s12iryhQ2CDZodhoQCUZBYtBUwfa/LEajGbPGZFKHYxbBOpJkVtNmKVj9VnQNWFZzbmEE+BPtMZFWd3k07rHFRFrmv27lnlsZcItCh9tLm6+YgpGrwG/ed/zDHuFzCpT7xs7MdEpZqfajjiw9JKNtvO6XgdQ7y2rxwhv69q6/DIarClaEsha9+rFXfYTEkK8BcaUY1RI7beRwxnGx8Mt8pafG9aKKUpeQEJnqFv6Bk9Kz6/t+fAPkHdv8KUIErVw3AxMUFg63Ti+yeRa+1QQ7vDTTkV3O3Obim9olUKuQDhfmH2uWx+K3iBXFqwCLQTC/S/W/LDn9UCsxsphc4HA1txBMdO2NO8rPec0i5GLWOZZI5tOxhUsjPXLloUXLWOkU3I0wBTXW8TlAV2yBn+EPJ4XV14tyCoWHanYChLFqYcChHUHj+0GKluGz0gfPNQ4xf3u6+jyJLmvDFxiNxtSNAud0yBZx12ouXbVSeHGYXWk84KA/Sus2DDbG/E6H+kx2MfnEVMz2yZm/lW6a4w5Pevvdoxfj9BMLm1dBkDCxHQsjw1dbv7yBz3j6kibdv2I4JFxLoEW8qsxcH2SXXgJpM3KrNQlPRIqq8IKmxH3ZllsL/QQ8YJFg+KJjygCl9QOmrL/1FXx/JXmx0m6ynXaUfF1PwtiP7e1ISNfaExaiL1C9OtTK2T4h2WhRPW57ycPj/dYRfjKD7OvXXYQ+Co+s+jCWDRpbwGTLlDP0XQFMBNxx4cBogjdx6ouFfm8lXgfeQf/GC0CtQolv6YH1O06mdXeZ1hqAFwHALulGBr2WdAoV9wBD5SBSeMeIV3waNCP5P0xB7rP7uXTZv/oscgXK/61/3tsjyAXyZASQxvMf8uyWsThQA9TTEOM1o28z9bj6Yhs0Snwl2CxemFy3xgyidcNyBDRsCDFwYKjsejtr9sZGIXAFJK2djcN8aUa549kahghsM9NAB65fQFOwjWjPAZEnunfOsU/LXlWLjpPdul4+P/iseq37udumJc/dZMXm6KXDL6pesrEVc80hrFtnnPWTyaNUP1im/rQrwZvDnVJ0Yvg5XSGo6crcpdPE5pUviEVHB2W8aCI8W+2QrxfIXdN8g4bPW7FEjuoe424XoHpyyIkD1+0MyVNgCVywIoFjugUfAu5NKoFo+7+WyIvtrHlgEuMjEK70a2RhFp7wVuod4VD0EHJ+MWXUglKomSB7mA07KQiQDck++iAwwPmxKLmUdUItfeOcEji8RBoUkcTu9YuNij22HrsBxawVzE8Yz/ZRKqlbHpuuRHao7z2gIobOg8wHb/+lMC1o4vjwayYLSNfFyvf6XivjCkz2KUQlrLX+8WyTVA6JDHsI1xfhI+kr3NTJ2fZBKweobTge72fpGuiVEjV82l52w9UZBH9P70XJUqd1lYIstqLN+mDdVSJ1axsp9sDufLMEFWX9xUlCOyAdOefz02cniXnJcxIVdH8q01OLa5jxMlJ+CBeXO0D4j+r7qY8ZCTyeRT9eEpAykqEajhOoZPjhjtMlw5jgyZJ9COaM30bC3coKF93YSmRQaIkE9b1kw5dGlFvpGGYL4bAzo0SNSkIO00So24z3TISF9aJ1ssBn2072KoV99O/5QN5cWKdDvaSFkMJp0YFRHXNNHe1Zo0kV5Shq0uEygfikR1XDyuLuiycQSHWnFxVr2xSaMnA5CfKwfQu8hQ5ljap6spe1+Qh6Am4TkDa/CaO1QlQ03mRUcyyxFwGZJljNAkI7mVgG6DUlxxVSK8wJMH7otzpS0L2LYTHTG6LV0iXQBjNB4wuH5LqyqTgsiA8x7UASJFYY0RJGrD9moFp/ON0t+NPT6Rfw3Semq239oYpxMQr/mHkHfExaIA0AX31DjfMqWzj4bypd8B9zZFvOogC2EHPobmhYhjzFcbMdVXwnAENC0EVbEMdLzDQFeSFRpDwF6MJ5CyqFS4wD7PsyF/aVlPwi0rLnr6+xygmhFhtpsOi/zVT8qT0BCWBG4+9UZIh6MfLm+JWkLNQcEGmhTglxzIhntDTZkBO9MkYhs2vOM9pAWS9Pjcba8OR6+aiVMOZVReGm7FH3BixWPTHOeqMGpZYH09MRTScHecT7G/TgiZIcUReqM7OdmyExBR2IJ0tLuaEuHxyn7SC5Gdlcf9mL9Kz15sZFzTkZMjJAtCOTPMaHq/0eQIr/Ln1YMDd6O+ApErFrIGDQd4hBA2H8tIZMIuSct/KMzwj83QiB+wvvF/ec6vJCSEjU7FPayLiPt9ELxOKC0p3+k4wfc4PCX0VLozKllmEQ2+m7gkcI+mvWXGkjziNZtg7HsgEZbRTjH2H8LuaonHwNzpASWjt8e6deQzOglya7sRNKamea3s1oGPx1ZAZmGs5EZGtW0wT7h7WbQkM0Pv0Xcmb2d+0MWyOpvThTQOqog9wOrBZp8WQwFMbimf5h3nqrmgeRcmQL5YGrA0lLaShxIB9fiC8RBJ2ndEs8vW4MJU3u95ZJmQUwTDewI2WhsgV4CG9t74y790nLu/OWuRtm83j6FLEvtmgs0fMoE0WAtqrbzB2BLblT4GN7VXbZSE7K8B+zPTlx2Lw1mH4AwW0RK/6Hl6P8Y2KMsVSnLDDhKXxXSpaQQiiMV6lGAT4JLO9dh4cSAl0KVseZ62jLfcpN3T5UpiNAXr/OMqe0Vki/TLdwUCbfNL606j7Ki8v84s/ob3kaoYzKE5HDhgxKRYkd5NXmT321GSDdGW5OG4J5kwcF7KgJ7lY4HwLAkumbF4oMWMDz3FYRK5BxlYA65pSMxhCYKV5XMg2cPDPpLj8S55CI0Nq8WX8vnIY8JhSA2nbnTwzrSU30sN6BpXPILan6UBbNn91PgLOawA9Qnqebuq3BwqHOYAFecMIf3W/70HZ+iFc87AiEPK7kmn2Fm4az69PV3jVBZlIKAYGUHQvTm3+KYnNEGKSoOLB0bUGhklOy3vnbCuZt7Z2i0OpM2d7J9SqaCF1qrmIItsPKwGI6E1XyOhs1pVMwbWUzwHh4EU/wvU0bmcMinR9PWfvyusq4wUeP/rSQoRd7TfFNHZaCg9HJkgDdtjcTjpPBv/SPMNahf6KdknrkRunKE1+XxvdjKxo+7DXcijK8kPwDB5ZAv//BxZ6NEkippShPuCXnlP6huGWMNaM4Ascw+BU3R5P6SHODlrafn48qAqemBBnoUfmCw2mu+su+agNtVYx5MEacrmpyZGaQizFF/IAygncdllch8YCF6upwv0J8ehKxqIrdB5EpS8NwVmSl9HnL4Xkob5/T/PzCK5wCZYkECwKZEF1atSrcoKBeIHzn7FsCGLNDU7WPEseSYZvRNOUmunflZDysYSLBf7XMKkeaLijeB1qrD4P4fone9c9g1KrdZO597AT3DFfL/fTuKfvzLFS2dFJW3JxBhtIAEbVyd7hhE1ik1QulOOh7ZyPiuu60urRcrGU+fQVbXtdCVCZ+NMn/gvFbipQ+4w4Ry8xfBpyWQrIFTyzQ/hyBgecQnA7iJhrSiV56aCErXrHDhNCXvApKd9+rUB6w8Ltrp2ag/AIn3jA414KjLwvcvh2ztTYW9kGsA9c/TQYKYXrgbaWoSd7Z357cmY9I4UOEVad3Fxk8QZ2zWFdvydAyOrGU+7lo6fvirobuADWo1P6/4BSh7ZdzHxs5s3RvDAYrWwoO/WpmMdWzF5RvAXKXXcYhme5QBalZw270QjmB3VOvaZLQgkBFYV/USdi2Pl5yJRxmeRLHxW+9U3gi/vUxowUiFPaJ4hjgzuogct3zF0oJ3ZrSamVut85DZC88fY5RdC/GR53FR+nt51wzu+PPjh2UtQgZTdTD4tfmZ8MGc2BaHiQ+yhEPpXWi2sfkFwkVlOMnHrJOFwKil0Uy8OoHHiDlSQNX22YinDSmcY8silpqltMmVnibm4mQodIocSfNY+DMA6v5oiFFsXUCEiS5P8975OihDJIokTGt4E/z7VQag2vChKPSEMaK6NIhQjGn1qAVq26MDnXkLe1ScmDDVhdBH7F9OiPdGEoGz0R/EHqAiPC6LaGByJwvKm87QgQ0bP/CIWKAGOmV9b9GV18G8nN4+T1xu4bcatp+0RzLNXxPXBMvFYBDvhBv0JqM1Bzkff5VHc8Cly7qfWJ9GPfghDC1cdFtXf/qNzdrCNvEeT5BloKFZ6s7vkDEfGPLqgMxt5T3ywQPJhdh0J5m7HurwNA+BwBycoPts7h33elU2NlSNe7iRbTViFFLirJdYGSlZaelccnNqAJEWC55V5gxbZiA+nym/7KRlEeUpFmLtFBBPKHOsbhK5uNWw2w2cCCJuwlC8FcLoqsGaykaQimUJNrg4r5lDLwcdIPslHivyRywMP4f/rr509DL/ZsvrEZHXpC1UHiuUnpoYp5uD8Sd5t7TCG1pKC5Wqw6QnE3j5Ra0Zd3WaY9MJkTtmj5zAmPvBWtda/uhdM++vqUD5pm2FkmZjpcxdQ+Dw2ebN3eOKQsDcRrNc07d8qWC2XkqAxyolN21qFg4FBcM68Szc1/50XwOK8QyEBhG24XJbMDfwTGOtzKCExUaTje30HoD3Nzzee39rTe8t3aQJ56VVEdDPBsxqjrYHdbEPJFqwRSExlngpbIWjOiEyWu5YbcX0cQgk/TSlnRGV16o9pg2qBbcvWm5gpPZ0Kj3QrxPpmJIUqq6tYoc2zt2LZUbrTnopjvISz8+fm1jIQJt2vpRgnwLwC9uAsf3vBEoZvnxGQKVsG+1B6uVnlK4hKB0retrDEbdcGGpiACMc8IuXH+vQztfpFYR8aCY79MpHm+oHiIUWsBiosbWoYNOZv1D3T28W+A3xBrKABzqhwvymGnMrec/JzNPObaj4szJYJegxC7SyWuNbA8Je5xNon8SKM9KvtSh6MWDOhOMk4eTOyiuwUpUYRiMpazBdMe0msnhuE2qlRvQC08QaDEUZMN+EWEX63wnjN6CfXw5qIdlAHoG9ZypCQy7G3mYVqYLfywMdFBKE7JY+u31XsYp7UNuRkKAN6VGQux6Qym64jGLBO5M5gvzIHmUluXR+y9D6SzcOtocea4Y9/YXggV1MWSmW2dq7hvV58ZYbix1wWwuv10uG8OIUwiaMet6vVag6bIK1RG+7yPB3caz9gCcqoXnU4zlHNYqu6Zcg3226k91SSDWcvy5fHoKSZOtSwkIEb0m+dJURp7QFJ1AeuWoy6oxD6xAM995YBRyLCX3N9gHGiJZ33BbKq85oGrzQN8SeXs6j8+FrglsRqcjvdk7vgZCLRl7qcWsmkFXCzikZsHPn2stZMJm7bVfILwdMTF4A42iV9wy1idF4qXYzAZHLdEP9BDpdGMKRiICY8avlTv0nYMW1qgBz4cXrdmSrBTPV4Ts5/3yDP44/foH/rju3wLoWprGkQMU1cNj66iCCuKnhExh/bRb40wLE1N6H86Le9WYBUbJEJA5Knx3ELAboZ2xK+e8zK2jPZdcv1AGGfPE7V6G7/7YCOepiP4cv+RTru77QaND/sf+eX1N+pb8WDxgTMPQ5/AJeibBWmEO7zw+L8CBY+rAphiofoUzY9U32dBwf82tdPDwvqrtik+HqZfG74h6We9fRJrfUjR3J/5g7P8IpcJAI7XQ6N7IvujSTMCtDtOd5Pf4mzuvFj/y3A5cLXuFT8wvqtm+BaIMLCe0lgWg4h6vtXEeKGmMsCVnZP16QiuaftHgo71UaXH18Z/rafUcV1TirxHs9ddST6hNPZ31IMPVt6L2Z8p3ucsMRPjlqY4SpYjQClVEiUc6R2FPbGstgmH/OU+uDx7oNhRgFV91/h3p/9klZ1PXOHWzTtPN91bKkITWttjft16yhKkY9Qi2vXG/f8BdyNenjFoUHATcsr4n9UtjNFBIptLX7UQFf4KkNnbyeKV1Cqdl3L+NEz8/gXBeAXJgEEHNRBjz9sQLiyj82rL4wgonrKDtxvVRCBVOc3g2BYdnqsKpe7be5GFrhxyYIufRfj64AVfn9tExQC4y7NoQcMUCXHcDXSQaO4DI5kh4hWftJhYRQciNx7okOXWgQakxRz0BLMquW2zr16Eh+a1wMV+RRRbnOQUrdSuOptLp0HeXxDPBmd23mb+o9EaBZopKJcsZ5uVRnRPG5MpSDZBX/dD+ZcFhNxAkwftTJGxbHU2FvDZxZMau4ORlvRpe0jQqK0KAPjVhxygj+efvJhwqE7SjMk92H8tSlUcJNKTPRWlbzC+nXIfQmrUKWHB9WkJYPkygDNksMh29qtDKBoTrPFKd8TjtqAmPPYOARdnuOZ5GBLvk29+HuyIxm1reGzc0gAVPFM4+a5KuvdXP5RDQsfOYhrjfhryXiSjnafEa4Vr8bQV4tCrvM1wB6GwJNUMUIOLnZMKC1Wpa42CVKIjTsED1U11qk0c/z2pdQSW8bkze+S96EspK6YwFRpG+l2w57H45pXKCM/OtEoUFAsNYp0aUI03VLX0vayOPXwZjxfm0Sbxw8GlVveOcDjxP9PubGwJWB3zThbP3mWiciTTtQYHzJ12nStPUWrHe09we4wUPO5jzfTMVhXA/IGP6+xomVdm6BR6Iffn12RP9G+HUeWBB/vSHCL6FMcBSGEKo8kX9sVT43WPthgSJGxH+5cxSVsRZSpa3WEwJI7W6R30TpkUmhLMOROdMF9Oh6+G+73HC6kdt27xFupu9ZkFRCBxpa/QAQxLUKMekm90PTVMdiWBALcRG/5a+GbCJsEwasen3e8NWD8CDFqPPeDNQEhkDNzaWbvtiNttHV9ESmFC5Ty642U6taS7g3yI/aeMBjh6zebr+UmXv17XeNyO6N6KJBOstv8Ry1f/TmkuuQm3fXu3n99fkb5gLZUHIvUuQ+Q3vTnWrPkCt2Ezbp125iAKvlRyhk1pXLvrr/EA1OhtaGnLqEeq5XqBpwh6StXPQXk9qfZT9wNzhylhcM929FxVeGolbk+68k//XdoJhQg4nxUqYBavhqCEpNTvL+tCJP/DOX4MSAH+3VYuzPQGp03X4exr4V3CKf9vCE6BUiBvHjDic5quOPsKCg8oYqU98UUr7f8aF1IwzW5woFt5CcScIS7mxk93T9ZB3WasKAPuMgV97OniMMOLqV1q6x5g1kHT67a7lQG3t1rPIFzDu/YvRh0ro/ldnLOAG7kgcZgBxG+GUlSMJMFzA51cKCE6zulbDK0U4lGyF+0fQzK5J7JGySCNyspkbL2KoioJJPWZ9kEggqZlKQk9ps0HQbBLNKkad1ZVIyuJHrQTddcr6SB8TnUI+FEH9/dyBpfXAx3XCL9xWWSqzEsQ9h24a+oRnfkm9lEQDrR9YpPyFavVP2QhljRuQJ6TXwqrrBe0LbEL7kn3st3w98B99u4MtdP/mbeSDjk5/8iYKLsilg30/mllHfbIv8kue12+JmZJo01gCc+Dehm0rlMPMxeqqrCKlXj5n5FerqqPfkNs/rKfXFFlgu5cl/cBKqP17G4xLPLOLA7wHfabHXZB0vQDeE9SpIAZPmzR9VjXx/quSDUV8p4ABFQIAAAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAowMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKY2xlYXJ0b21hcmsKgAM=";
 
     public static void main(String[] args) throws Exception {
 
diff --git a/test/jdk/java/awt/geom/Arc2D/Arc2DGetBoundsTest.java b/test/jdk/java/awt/geom/Arc2D/Arc2DGetBoundsTest.java
new file mode 100644
index 00000000000..983c4583708
--- /dev/null
+++ b/test/jdk/java/awt/geom/Arc2D/Arc2DGetBoundsTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 4197755
+ * @summary Verifies that Arc2D.getBounds() is similar to Arc2D.getBounds2D()
+ */
+
+import java.awt.geom.Arc2D;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Arc2DGetBoundsTest {
+    public static void main(String[] args) {
+        // Imagine a circle that represents a compass.
+        // This arc represents the northern / top quarter.
+        Arc2D arc = new Arc2D.Double(0, 0, 1000, 1000, 45, 90, Arc2D.PIE);
+
+        // Create 8 pie slices, and place a dot in the center of each
+        List<Point2D> samples = new ArrayList<>();
+        for (int segment = 0; segment < 8; segment++) {
+            double theta = -(segment + .5) / 8.0 * 2 * Math.PI;
+            Point2D p = new Point2D.Double(
+                    500 + 100 * Math.cos(theta),
+                    500 + 100 * Math.sin(theta)
+            );
+            samples.add(p);
+        }
+
+        // these assertions have never been known to fail:
+        assertTrue(!arc.contains(samples.get(0)));
+        assertTrue(arc.contains(samples.get(1)));
+        assertTrue(arc.contains(samples.get(2)));
+        assertTrue(!arc.contains(samples.get(3)));
+        assertTrue(!arc.contains(samples.get(4)));
+        assertTrue(!arc.contains(samples.get(5)));
+        assertTrue(!arc.contains(samples.get(6)));
+        assertTrue(!arc.contains(samples.get(7)));
+
+        assertTrue(arc.getBounds2D().contains(samples.get(0)));
+        assertTrue(arc.getBounds2D().contains(samples.get(1)));
+        assertTrue(arc.getBounds2D().contains(samples.get(2)));
+        assertTrue(arc.getBounds2D().contains(samples.get(3)));
+        assertTrue(!arc.getBounds2D().contains(samples.get(4)));
+        assertTrue(!arc.getBounds2D().contains(samples.get(5)));
+        assertTrue(!arc.getBounds2D().contains(samples.get(6)));
+        assertTrue(!arc.getBounds2D().contains(samples.get(7)));
+
+
+        assertTrue(arc.getBounds().contains(samples.get(0)));
+        assertTrue(arc.getBounds().contains(samples.get(1)));
+        assertTrue(arc.getBounds().contains(samples.get(2)));
+        assertTrue(arc.getBounds().contains(samples.get(3)));
+
+        // these are the assertions that failed before resolving 4197755
+        assertTrue(!arc.getBounds().contains(samples.get(4)));
+        assertTrue(!arc.getBounds().contains(samples.get(5)));
+        assertTrue(!arc.getBounds().contains(samples.get(6)));
+        assertTrue(!arc.getBounds().contains(samples.get(7)));
+    }
+
+    private static void assertTrue(boolean b) {
+        if (!b)
+            throw new Error();
+    }
+}
diff --git a/test/jdk/java/awt/image/GetSampleSizeTest.java b/test/jdk/java/awt/image/GetSampleSizeTest.java
new file mode 100644
index 00000000000..dcf6d1e6ed5
--- /dev/null
+++ b/test/jdk/java/awt/image/GetSampleSizeTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.image.ComponentSampleModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.MultiPixelPackedSampleModel;
+import java.awt.image.SinglePixelPackedSampleModel;
+
+/*
+ * @test
+ * @bug  8376297
+ * @summary  Test SampleModel.getSampleSize(int)
+ */
+
+public class GetSampleSizeTest {
+
+    public static void main(String[] args) {
+
+        final int width = 10;
+        final int height = 10;
+        int[] bandOffsets = {0, 0};
+        int[] bitMask = {0x00ff0000, 0x0000ff00, 0xff, 0x0};
+
+        {
+            ComponentSampleModel csm =
+                new ComponentSampleModel(DataBuffer.TYPE_BYTE,
+                                         width, height, 1, width, bandOffsets);
+            int numBands = csm.getNumBands();
+            System.out.println("CSM numBands = " + numBands);
+            if (numBands != 2) {
+                throw new RuntimeException("Unexpected numBands");
+            }
+            System.out.println("CSM sample size = " + csm.getSampleSize(numBands));
+        }
+
+        {
+            MultiPixelPackedSampleModel mppsm =
+                new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, width, height, 4);
+            int numBands = mppsm.getNumBands();
+            System.out.println("MPPSM numBands = " + numBands);
+            if (numBands != 1) {
+                 throw new RuntimeException("Unexpected numBands");
+            }
+            System.out.println("MPPSM sample size = " + mppsm.getSampleSize(numBands));
+        }
+
+        {
+            SinglePixelPackedSampleModel sppsm  =
+                new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE, width, height, bitMask);
+            int numBands = sppsm.getNumBands();
+            System.out.println("SPPSM numBands = " + numBands);
+            if (numBands != 4) {
+                throw new RuntimeException("Unexpected numBands");
+            }
+            try {
+                System.out.println("SPPSM sample size = " + sppsm.getSampleSize(numBands));
+                throw new RuntimeException("No expected AIOBE");
+            } catch (ArrayIndexOutOfBoundsException e) {
+                System.out.println("Got expected AIOBE for SPPSM");
+            }
+        }
+
+   }
+}
+
diff --git a/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java b/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
index d89de44401b..13a88e8c590 100644
--- a/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
+++ b/test/jdk/java/awt/image/Raster/CreateRasterExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8255800 8369129
+ * @bug 8255800 8369129 8376297
  * @summary verify Raster + SampleModel creation vs spec.
  */
 
@@ -739,7 +739,7 @@ public class CreateRasterExceptionTest {
              /* @throws IllegalArgumentException if
               * {@code scanlineStride} is less than 0
               */
-            Raster.createBandedRaster(DataBuffer.TYPE_INT, 1, 1, -3,
+            Raster.createBandedRaster(DataBuffer.TYPE_INT, 10, 10, -1000,
                                       bankIndices, bandOffsets, null);
             noException();
         } catch (IllegalArgumentException t) {
diff --git a/test/jdk/java/awt/image/XBMDecoder/XBMDecoderTest.java b/test/jdk/java/awt/image/XBMDecoder/XBMDecoderTest.java
index 19bc6d95c39..9d2a23bd29b 100644
--- a/test/jdk/java/awt/image/XBMDecoder/XBMDecoderTest.java
+++ b/test/jdk/java/awt/image/XBMDecoder/XBMDecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,20 @@
 
 /*
  * @test
- * @bug 8361748
+ * @bug 8361748 8377924
  * @summary Tests XBM image size limits and if XBMImageDecoder.produceImage()
  *          throws appropriate error when parsing invalid XBM image data.
  * @run main XBMDecoderTest
  */
 
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.PrintStream;
+import java.util.Arrays;
 import javax.swing.ImageIcon;
 
 public class XBMDecoderTest {
@@ -57,21 +61,39 @@ public class XBMDecoderTest {
 
                 ImageIcon icon = new ImageIcon(fis.readAllBytes());
                 boolean isErrEmpty = errContent.toString().isEmpty();
+
                 if (!isErrEmpty) {
-                    System.out.println("Expected ImageFormatException occurred.");
+                    if (!validCase) {
+                        System.out.println("Expected ImageFormatException occurred.");
+                    }
                     System.out.print(errContent);
                 }
-
                 if (validCase && !isErrEmpty) {
                     throw new RuntimeException("Test failed: Error stream not empty");
-                } else if (!validCase && isErrEmpty) {
+                } else if (!validCase && isErrEmpty && hasPixelData(icon.getImage())) {
                     throw new RuntimeException("Test failed: ImageFormatException"
                             + " expected but not thrown");
                 }
+                if (validCase && !hasPixelData(icon.getImage())) {
+                    throw new RuntimeException("Test failed: the parsed image " +
+                            "does not contain any pixel data");
+                }
                 System.out.println("PASSED\n");
             } finally {
                 System.setErr(originalErr);
             }
         }
     }
+
+    private static boolean hasPixelData(Image img) {
+        int w = img.getWidth(null);
+        int h = img.getHeight(null);
+        BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = bi.createGraphics();
+        g.drawImage(img, 0, 0, null);
+        g.dispose();
+        int[] pixels = bi.getRGB(0, 0, w, h, null, 0, w);
+        return !Arrays.stream(pixels)
+                      .allMatch(i -> i == 0);
+    }
 }
diff --git a/test/jdk/java/awt/image/XBMDecoder/XBMDecoderWidthHeight.java b/test/jdk/java/awt/image/XBMDecoder/XBMDecoderWidthHeight.java
new file mode 100644
index 00000000000..7a9328b1554
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/XBMDecoderWidthHeight.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import javax.swing.ImageIcon;
+
+/*
+ * @test
+ * @bug 8377924
+ * @summary Verifies XBM decoder parses width and height in backward-compatible
+ *          way: `-h` corresponds to width; `-ht` corresponds to height
+ * @run main XBMDecoderWidthHeight
+ */
+public final class XBMDecoderWidthHeight {
+    private static final PrintStream originalErr = System.err;
+
+    private static final String dir = System.getProperty("test.src", ".");
+
+    private static final int WIDTH = 8;
+    private static final int HEIGHT = 1;
+
+    private static final Pattern glob =
+            Pattern.compile("valid_WH.?-.*\\.xbm");
+
+    private static boolean matchesGlob(final Path file) {
+        return glob.matcher(file.getFileName()
+                                .toString())
+                   .matches();
+    }
+
+    public static void main(String[] args) throws Exception {
+        final List<Throwable> errors;
+
+        try (Stream<Path> files = Files.list(Paths.get(dir))) {
+            errors = files.filter(XBMDecoderWidthHeight::matchesGlob)
+                          .map(XBMDecoderWidthHeight::testFileWrapper)
+                          .filter(Objects::nonNull)
+                          .toList();
+        }
+
+        if (!errors.isEmpty()) {
+            errors.stream()
+                  .map(Throwable::getMessage)
+                  .forEach(System.err::println);
+            throw new RuntimeException("Errors found: " + errors.size() + ". "
+                                       + errors.get(0).getMessage());
+        }
+    }
+
+    private static Throwable testFileWrapper(final Path file) {
+        try {
+            testFile(file);
+        } catch (Throwable t) {
+            return t;
+        }
+        return null;
+    }
+
+    private static void testFile(final Path file) throws IOException, Error {
+        try (ByteArrayOutputStream errContent = new ByteArrayOutputStream()) {
+            System.setErr(new PrintStream(errContent));
+
+            ImageIcon icon = new ImageIcon(Files.readAllBytes(file));
+
+            if (errContent.size() != 0) {
+                throw new Error(file.getFileName() + " "
+                                + errContent.toString().split("\\n")[0]);
+            }
+
+            if (icon.getIconWidth() != WIDTH || icon.getIconHeight() != HEIGHT) {
+                throw new Error(file.getFileName()
+                                + " Unexpected size: "
+                                + formatSize(icon.getIconWidth(),
+                                             icon.getIconHeight())
+                                + " vs " + formatSize(WIDTH, HEIGHT));
+            }
+        } finally {
+            System.setErr(originalErr);
+        }
+    }
+
+    private static String formatSize(int width, int height) {
+        return width + " x " + height;
+    }
+}
diff --git a/test/jdk/java/awt/image/XBMDecoder/invalid_WH1-no-height.xbm b/test/jdk/java/awt/image/XBMDecoder/invalid_WH1-no-height.xbm
new file mode 100644
index 00000000000..09fcfe0d576
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/invalid_WH1-no-height.xbm
@@ -0,0 +1,3 @@
+#define width  8
+#define width  1
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/invalid_WH2-no-width.xbm b/test/jdk/java/awt/image/XBMDecoder/invalid_WH2-no-width.xbm
new file mode 100644
index 00000000000..fa2e6d9546b
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/invalid_WH2-no-width.xbm
@@ -0,0 +1,3 @@
+#define height 8
+#define height 1
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/invalid_WH3-no-width-height.xbm b/test/jdk/java/awt/image/XBMDecoder/invalid_WH3-no-width-height.xbm
new file mode 100644
index 00000000000..cf22314b055
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/invalid_WH3-no-width-height.xbm
@@ -0,0 +1,3 @@
+#define test1 8
+#define test2 1
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/invalid_empty.xbm b/test/jdk/java/awt/image/XBMDecoder/invalid_empty.xbm
new file mode 100644
index 00000000000..5cfb8e21cf8
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/invalid_empty.xbm
@@ -0,0 +1,6 @@
+#define test_width 16
+#define test_height 3
+#define ht_x 1
+#define ht_y 2
+static unsigned char test_bits[] = {
+};
diff --git a/test/jdk/java/awt/image/XBMDecoder/invalid_hex.xbm b/test/jdk/java/awt/image/XBMDecoder/invalid_hex.xbm
index c6f819582d0..1286eee1d9b 100644
--- a/test/jdk/java/awt/image/XBMDecoder/invalid_hex.xbm
+++ b/test/jdk/java/awt/image/XBMDecoder/invalid_hex.xbm
@@ -1,3 +1,3 @@
-#define k_wt 16
-#define k_ht  1
+#define k_width 16
+#define k_height  1
 k[] = { 0x10, 1234567890};
diff --git a/test/jdk/java/awt/image/XBMDecoder/invalid_plus.xbm b/test/jdk/java/awt/image/XBMDecoder/invalid_plus.xbm
new file mode 100644
index 00000000000..714907084f2
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/invalid_plus.xbm
@@ -0,0 +1,3 @@
+#define test_width 16
+#define test_height 2
+static unsigned char test_bits[] = { 0x13, 0x11, 0xAB+, 0xff };
\ No newline at end of file
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_WH1-th-ht.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_WH1-th-ht.xbm
new file mode 100644
index 00000000000..c287afe79b3
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_WH1-th-ht.xbm
@@ -0,0 +1,3 @@
+#define th  8
+#define ht  1
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_WH2-h-ht.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_WH2-h-ht.xbm
new file mode 100644
index 00000000000..58605910d70
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_WH2-h-ht.xbm
@@ -0,0 +1,3 @@
+#define h   8
+#define ht  1
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_WH3-ht-th.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_WH3-ht-th.xbm
new file mode 100644
index 00000000000..7d8bc74d1ec
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_WH3-ht-th.xbm
@@ -0,0 +1,3 @@
+#define ht  1
+#define th  8
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_WH4-ht-h.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_WH4-ht-h.xbm
new file mode 100644
index 00000000000..94afe2c39b9
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_WH4-ht-h.xbm
@@ -0,0 +1,3 @@
+#define ht  1
+#define h   8
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_WH5-w-h.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_WH5-w-h.xbm
new file mode 100644
index 00000000000..cf423b737a1
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_WH5-w-h.xbm
@@ -0,0 +1,3 @@
+#define width   8
+#define height  1
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_WH6-h-w.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_WH6-h-w.xbm
new file mode 100644
index 00000000000..d9641b9009f
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_WH6-h-w.xbm
@@ -0,0 +1,3 @@
+#define height  1
+#define width   8
+k[] = {0xAB};
diff --git a/test/jdk/java/awt/image/XBMDecoder/valid_multiline.xbm b/test/jdk/java/awt/image/XBMDecoder/valid_multiline.xbm
new file mode 100644
index 00000000000..e24bc10e9b0
--- /dev/null
+++ b/test/jdk/java/awt/image/XBMDecoder/valid_multiline.xbm
@@ -0,0 +1,8 @@
+#define test_width 16
+#define test_height 3
+#define ht_x 1
+#define ht_y 2
+static unsigned char test_bits[] = {
+0x20, 0x10, 
+0x25, 0x01, 
+0xAC, 0xab };
diff --git a/test/jdk/java/awt/print/PrinterJob/ExceptionFromPrintableIsIgnoredTest.java b/test/jdk/java/awt/print/PrinterJob/ExceptionFromPrintableIsIgnoredTest.java
index a62ae536e1b..4c2ff370cb8 100644
--- a/test/jdk/java/awt/print/PrinterJob/ExceptionFromPrintableIsIgnoredTest.java
+++ b/test/jdk/java/awt/print/PrinterJob/ExceptionFromPrintableIsIgnoredTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,16 @@
  * questions.
  */
 
-/* @test
-   @bug 8262731
-   @key headful printer
-   @summary Verify that "PrinterJob.print" throws the expected exception,
-            if "Printable.print" throws an exception.
-   @run main ExceptionFromPrintableIsIgnoredTest MAIN PE
-   @run main ExceptionFromPrintableIsIgnoredTest MAIN RE
-   @run main ExceptionFromPrintableIsIgnoredTest EDT PE
-   @run main ExceptionFromPrintableIsIgnoredTest EDT RE
+/*
+ * @test
+ * @bug 8262731 8268675
+ * @key printer
+ * @summary Verify that "PrinterJob.print" throws the expected exception,
+ *          if "Printable.print" throws an exception.
+ * @run main ExceptionFromPrintableIsIgnoredTest MAIN PE
+ * @run main ExceptionFromPrintableIsIgnoredTest MAIN RE
+ * @run main ExceptionFromPrintableIsIgnoredTest EDT PE
+ * @run main ExceptionFromPrintableIsIgnoredTest EDT RE
  */
 
 import java.awt.Graphics;
@@ -64,14 +65,6 @@ public class ExceptionFromPrintableIsIgnoredTest {
                 "Test started. threadType='%s', exceptionType='%s'",
                 threadType, exceptionType));
 
-        String osName = System.getProperty("os.name");
-        boolean isOSX = osName.toLowerCase().startsWith("mac");
-        if ((exceptionType == TestExceptionType.RE) && !isOSX) {
-            System.out.println(
-                "Currently this test scenario can be verified only on macOS.");
-            return;
-        }
-
         printError = null;
 
         if (threadType == TestThreadType.MAIN) {
diff --git a/test/jdk/java/awt/print/PrinterJob/PageRanges.java b/test/jdk/java/awt/print/PrinterJob/PageRanges.java
index e80330bae6c..691357d5a3c 100644
--- a/test/jdk/java/awt/print/PrinterJob/PageRanges.java
+++ b/test/jdk/java/awt/print/PrinterJob/PageRanges.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6575331
+ * @bug 6575331 8297191 8373239
  * @key printer
  * @summary The specified pages should be printed.
  * @library /java/awt/regtesthelpers
diff --git a/test/jdk/java/io/Console/ReadWriteBlockingTest.java b/test/jdk/java/io/Console/ReadWriteBlockingTest.java
new file mode 100644
index 00000000000..7c05d5d257b
--- /dev/null
+++ b/test/jdk/java/io/Console/ReadWriteBlockingTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8340830
+ * @summary Check if writing to Console is not blocked by other thread's read.
+ *          This test relies on sleep(1000) to ensure that readLine() is
+ *          invoked before printf(), which may not always occur.
+ * @library /test/lib
+ * @requires (os.family == "linux" | os.family == "mac")
+ * @run junit ReadWriteBlockingTest
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class ReadWriteBlockingTest {
+
+    @ParameterizedTest
+    @ValueSource(strings = {"java.base", "jdk.internal.le"})
+    @EnabledOnOs({OS.LINUX, OS.MAC})
+    public void testReadWriteBlocking(String consoleModule) throws Exception {
+        // check "expect" command availability
+        var expect = Path.of("/usr/bin/expect");
+        if (!Files.exists(expect) || !Files.isExecutable(expect)) {
+            Assumptions.abort("'" + expect + "' not found");
+        }
+
+        // invoking "expect" command
+        var testSrc = System.getProperty("test.src", ".");
+        var testClasses = System.getProperty("test.classes", ".");
+        var jdkDir = System.getProperty("test.jdk");
+        OutputAnalyzer output = ProcessTools.executeProcess(
+            "/usr/bin/expect",
+            "-n",
+            testSrc + "/readWriteBlocking.exp",
+            jdkDir + "/bin/java",
+            "-classpath", testClasses,
+            "-Djdk.console=" + consoleModule,
+            "ReadWriteBlockingTest");
+        output.reportDiagnosticSummary();
+        output.shouldHaveExitValue(0);
+    }
+
+    public static void main(String... args) {
+        var con = System.console();
+        Thread.ofVirtual().start(() -> {
+            try {
+                // give some time for main thread to invoke readLine()
+                Thread.sleep(1000);
+            } catch (InterruptedException _) {}
+            con.printf("printf() invoked");
+        });
+        con.readLine("");
+    }
+}
diff --git a/test/jdk/java/io/Console/readWriteBlocking.exp b/test/jdk/java/io/Console/readWriteBlocking.exp
new file mode 100644
index 00000000000..202dd42db3f
--- /dev/null
+++ b/test/jdk/java/io/Console/readWriteBlocking.exp
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+set timeout 10
+eval spawn $argv
+
+expect {
+    "printf() invoked" {
+        send -- "\n"
+    }
+    timeout {
+        puts stderr "ERROR: Timed out waiting for the expected text"
+        exit 1
+    }
+    eof {
+        puts stderr "ERROR: Process exited before printing the expected text"
+        exit 1
+    }
+}
+
+expect eof
diff --git a/test/jdk/java/io/FileDescriptor/Sharing.java b/test/jdk/java/io/FileDescriptor/Sharing.java
index 24f4fb70b02..e4ceb2d6906 100644
--- a/test/jdk/java/io/FileDescriptor/Sharing.java
+++ b/test/jdk/java/io/FileDescriptor/Sharing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,14 @@
  * @run main/othervm Sharing
  */
 
-import java.io.*;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.io.Writer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.util.concurrent.CountDownLatch;
@@ -71,7 +78,7 @@ public class Sharing {
                 // encourage gc
                 System.gc();
                 // read from fis2 - when fis1 is gc'ed and finalizer is run, read will fail
-                System.out.print(".");
+                System.err.print(".");
                 ret = fis2.read();
             }
         }
@@ -93,7 +100,7 @@ public class Sharing {
                  * read from fis3 - when raf is gc'ed and finalizer is run,
                  * fd should still be valid.
                  */
-                System.out.print(".");
+                System.err.print(".");
                 ret = fis3.read();
             }
         } finally {
@@ -290,7 +297,7 @@ public class Sharing {
         FileInputStream fis = new FileInputStream(raf.getFD());
         fis.close();
         if (raf.getFD().valid()) {
-             throw new RuntimeException("FD should not be valid.");
+            throw new RuntimeException("FD should not be valid.");
         }
 
         // Test the suppressed exception handling - FileInputStream
@@ -308,7 +315,7 @@ public class Sharing {
             ioe.printStackTrace();
             if (ioe.getSuppressed().length != 2) {
                 throw new RuntimeException("[FIS]Incorrect number of suppressed " +
-                          "exceptions received : " + ioe.getSuppressed().length);
+                                           "exceptions received : " + ioe.getSuppressed().length);
             }
         }
         if (raf.getFD().valid()) {
@@ -332,7 +339,7 @@ public class Sharing {
             ioe.printStackTrace();
             if (ioe.getSuppressed().length != 2) {
                 throw new RuntimeException("[FOS]Incorrect number of suppressed " +
-                          "exceptions received : " + ioe.getSuppressed().length);
+                                           "exceptions received : " + ioe.getSuppressed().length);
             }
         }
         if (raf.getFD().valid()) {
@@ -347,10 +354,8 @@ public class Sharing {
      * FileOutputStreams referencing the same native file descriptor.
      */
     private static class OpenClose extends Thread {
-        private FileDescriptor fd = null;
-        private CountDownLatch done;
-        FileInputStream[] fisArray = new FileInputStream[numFiles];
-        FileOutputStream[] fosArray = new FileOutputStream[numFiles];
+        private final FileDescriptor fd;
+        private final CountDownLatch done;
 
         OpenClose(FileDescriptor filedescriptor, CountDownLatch done) {
             this.fd = filedescriptor;
@@ -358,29 +363,32 @@ public class Sharing {
         }
 
         public void run() {
-             try {
-                 for(int i=0;i<numFiles;i++) {
-                     fisArray[i] = new FileInputStream(fd);
-                     fosArray[i] = new FileOutputStream(fd);
-                 }
+            FileInputStream[] fisArray = new FileInputStream[numFiles];
+            FileOutputStream[] fosArray = new FileOutputStream[numFiles];
 
-                 // Now close out
-                 for(int i=0;i<numFiles;i++) {
-                     if(fisArray[i] != null) fisArray[i].close();
-                     if(fosArray[i] != null) fosArray[i].close();
-                 }
+            try {
+                for(int i=0;i<numFiles;i++) {
+                    fisArray[i] = new FileInputStream(fd);
+                    fosArray[i] = new FileOutputStream(fd);
+                }
 
-             } catch(IOException ioe) {
-                 System.out.println("OpenClose encountered IO issue :" + ioe);
-                 fail = true;
-             } finally {
-                 if (fd.valid()) { // fd should not be valid after first close() call
-                     System.out.println("OpenClose: FileDescriptor shouldn't be valid");
-                     fail = true;
-                 }
-                 done.countDown();
-             }
-         }
+                // Now close out
+                for(int i=0;i<numFiles;i++) {
+                    fisArray[i].close();
+                    fosArray[i].close();
+                }
+
+            } catch(IOException ioe) {
+                System.err.println("OpenClose encountered IO issue :" + ioe);
+                fail = true;
+            } finally {
+                if (fd.valid()) { // fd should not be valid after first close() call
+                    System.err.println("OpenClose: FileDescriptor shouldn't be valid");
+                    fail = true;
+                }
+                done.countDown();
+            }
+        }
     }
 
     private static class BadFileInputStream extends FileInputStream {
diff --git a/test/jdk/java/io/Serializable/GetField/ReadFieldsCNF.java b/test/jdk/java/io/Serializable/GetField/ReadFieldsCNF.java
index 7b91222d737..2b3f1c6aa45 100644
--- a/test/jdk/java/io/Serializable/GetField/ReadFieldsCNF.java
+++ b/test/jdk/java/io/Serializable/GetField/ReadFieldsCNF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
  * @summary Verify that ObjectInputStream ReadFields correctly reports ClassNotFoundException
  *    while getting the field value. The test uses Vector that calls ReadFields from its readObject.
  * @library /test/lib
- * @run testng ReadFieldsCNF
- * @run testng/othervm -Djdk.serialGetFieldCnfeReturnsNull=true ReadFieldsCNF
+ * @run junit ReadFieldsCNF
+ * @run junit/othervm -Djdk.serialGetFieldCnfeReturnsNull=true ReadFieldsCNF
  */
 
 import java.io.ByteArrayInputStream;
@@ -41,12 +41,12 @@ import java.io.StreamCorruptedException;
 import java.nio.charset.StandardCharsets;
 import java.util.Vector;
 
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
 import jdk.test.lib.hexdump.HexPrinter;
 import jdk.test.lib.hexdump.ObjectStreamPrinter;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 public class ReadFieldsCNF {
 
     private static final boolean GETFIELD_CNFE_RETURNS_NULL =
@@ -58,7 +58,7 @@ public class ReadFieldsCNF {
      * @throws IOException If any other exception occurs
      */
     @Test
-    private static void testVectorWithRole() throws IOException {
+    void testVectorWithRole() throws IOException {
         System.out.println("Property GETFIELD_CNFE_RETURNS_NULL: " + GETFIELD_CNFE_RETURNS_NULL);
 
         Role role = new Role();
@@ -75,7 +75,7 @@ public class ReadFieldsCNF {
         System.out.printf("Role offset: %d (0x%x) : %s%n", off, off, Role.class.getName());
         if (off < 0) {
             HexPrinter.simple().formatter(ObjectStreamPrinter.formatter()).format(bytes);
-            Assert.fail("classname not found");
+            Assertions.fail("classname not found");
         }
 
         bytes[off] = (byte) 'X';  // replace R with X -> Class not found
@@ -85,18 +85,18 @@ public class ReadFieldsCNF {
         try {
             Object obj = in.readObject();
             System.out.println("Read: " + obj);
-            Assert.fail("Should not reach here, an exception should always occur");
+            Assertions.fail("Should not reach here, an exception should always occur");
         } catch (ClassNotFoundException cnfe) {
             // Expected ClassNotFoundException
             String expected = "XeadFieldsCNF$Role";
-            Assert.assertEquals(expected, cnfe.getMessage(), "Wrong classname");
+            Assertions.assertEquals(expected, cnfe.getMessage(), "Wrong classname");
             if (GETFIELD_CNFE_RETURNS_NULL) {
-                Assert.fail("Expected IOException got ClassNotFoundException", cnfe);
+                Assertions.fail("Expected IOException got ClassNotFoundException", cnfe);
             }
             System.out.println("Normal:  OIS.readObject: " + cnfe);
         } catch (StreamCorruptedException ioe) {
             if (!GETFIELD_CNFE_RETURNS_NULL) {
-                Assert.fail("Expected ClassNotFoundException got StreamCorruptedException ", ioe);
+                Assertions.fail("Expected ClassNotFoundException got StreamCorruptedException ", ioe);
             }
             System.out.println("Normal: " + ioe);
         }
@@ -108,7 +108,7 @@ public class ReadFieldsCNF {
      * @throws IOException If any other exception occurs
      */
     @Test
-    private static void testHolderWithRole() throws IOException {
+    void testHolderWithRole() throws IOException {
         System.out.println("Property GETFIELD_CNFE_RETURNS_NULL: " + GETFIELD_CNFE_RETURNS_NULL);
         Role role = new Role();
         Holder holder = new Holder(role);
@@ -123,7 +123,7 @@ public class ReadFieldsCNF {
         System.out.printf("Role offset: %d (0x%x)%n", off, off);
         if (off < 0) {
             HexPrinter.simple().formatter(ObjectStreamPrinter.formatter()).format(bytes);
-            Assert.fail("classname found at index: " + off + " (0x" + Integer.toHexString(off) + ")");
+            Assertions.fail("classname found at index: " + off + " (0x" + Integer.toHexString(off) + ")");
         }
 
         bytes[off] = (byte) 'X';  // replace R with X -> Class not found
@@ -133,15 +133,15 @@ public class ReadFieldsCNF {
         try {
             Holder obj = (Holder)in.readObject();
             System.out.println("Read: " + obj);
-            Assert.fail("Should not reach here, an exception should always occur");
+            Assertions.fail("Should not reach here, an exception should always occur");
         } catch (ClassNotFoundException cnfe) {
             // Expected ClassNotFoundException
             String expected = "XeadFieldsCNF$Role";
-            Assert.assertEquals(expected, cnfe.getMessage(), "Wrong classname");
+            Assertions.assertEquals(expected, cnfe.getMessage(), "Wrong classname");
             System.out.println("Normal: OIS.readObject: " + cnfe);
         } catch (StreamCorruptedException ioe) {
             if (!GETFIELD_CNFE_RETURNS_NULL) {
-                Assert.fail("Expected ClassNotFoundException got StreamCorruptedException ", ioe);
+                Assertions.fail("Expected ClassNotFoundException got StreamCorruptedException ", ioe);
             }
             System.out.println("Normal: " + ioe);
         }
diff --git a/test/jdk/java/io/Serializable/class/NonSerializableTest.java b/test/jdk/java/io/Serializable/class/NonSerializableTest.java
index fa81b3e3ce7..2a36380aae7 100644
--- a/test/jdk/java/io/Serializable/class/NonSerializableTest.java
+++ b/test/jdk/java/io/Serializable/class/NonSerializableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,79 +32,84 @@
  *        jdk.test.lib.JDKToolLauncher
  *        jdk.test.lib.Platform
  *        jdk.test.lib.process.*
- * @run testng/timeout=300 NonSerializableTest
+ * @run junit/timeout=300 NonSerializableTest
  * @summary Enable serialize of nonSerializable Class descriptor.
  */
 
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.ProcessTools;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 
 public class NonSerializableTest {
 
-    @BeforeClass
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         boolean b = CompilerUtils.compile(
                 Paths.get(System.getProperty("test.src"), "TestEntry.java"),
                 Paths.get(System.getProperty("user.dir")));
         assertTrue(b, "Compilation failed");
     }
 
-    @DataProvider
-    public Object[][] provider() {
-        return new String[][][] {
+    // Test cases to compile and run
+    public static Stream<List<String>> provider() {
+        return Stream.of(
             // Write NonSerial1, Read NonSerial1
-            {{"NonSerialA_1", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"NonSerialA_1", "-cp", ".", "TestEntry", "-d"}},
+            List.of("NonSerialA_1", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("NonSerialA_1", "-cp", ".", "TestEntry", "-d"),
 
             // Write NonSerial1, Read NonSerial2
-            {{"NonSerialA_1", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"NonSerialA_2", "-cp", ".", "TestEntry", "-d"}},
+            List.of("NonSerialA_1", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("NonSerialA_2", "-cp", ".", "TestEntry", "-d"),
 
             // Write NonSerial1, Read Serial1
-            {{"NonSerialA_1", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"SerialA_1", "-cp", ".", "TestEntry", "-d"}},
+            List.of("NonSerialA_1", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("SerialA_1", "-cp", ".", "TestEntry", "-d"),
 
             // Write Serial1, Read NonSerial1
-            {{"SerialA_1", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"NonSerialA_1", "-cp", ".", "TestEntry", "-doe"}},
+            List.of("SerialA_1", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("NonSerialA_1", "-cp", ".", "TestEntry", "-doe"),
 
             // Write Serial1, Read Serial2
-            {{"SerialA_1", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"SerialA_2", "-cp", ".", "TestEntry", "-d"}},
+            List.of("SerialA_1", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("SerialA_2", "-cp", ".", "TestEntry", "-d"),
 
             // Write Serial2, Read Serial1
-            {{"SerialA_2", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"SerialA_1", "-cp", ".", "TestEntry", "-d"}},
+            List.of("SerialA_2", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("SerialA_1", "-cp", ".", "TestEntry", "-d"),
 
             // Write Serial1, Read Serial3
-            {{"SerialA_1", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"SerialA_3", "-cp", ".", "TestEntry", "-de"}},
+            List.of("SerialA_1", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("SerialA_3", "-cp", ".", "TestEntry", "-de"),
 
             // Write Serial3, Read Serial1
-            {{"SerialA_3", "-cp", ".", "TestEntry", "-s", "A"}},
-            {{"SerialA_1", "-cp", ".", "TestEntry", "-de"}},
-        };
+            List.of("SerialA_3", "-cp", ".", "TestEntry", "-s", "A"),
+            List.of("SerialA_1", "-cp", ".", "TestEntry", "-de"));
     }
 
-    @Test(dataProvider="provider")
-    public void test(String[] args) throws Exception {
+    @ParameterizedTest
+    @MethodSource("provider")
+    public void test(List<String> argList) throws Exception {
+        String[] args = argList.toArray(new String[0]);
         boolean b = CompilerUtils.compile(Paths.get(System.getProperty("test.src"), args[0]),
                                           Paths.get(System.getProperty("user.dir")));
         assertTrue(b, "Compilation failed");
-        String params[] = Arrays.copyOfRange(args, 1, args.length);
+        String[] params = Arrays.copyOfRange(args, 1, args.length);
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(params);
-        Process p = ProcessTools.startProcess("Serializable Test", pb);
-        int exitValue = p.waitFor();
-        assertEquals(exitValue, 0, "Test failed");
+        try (Process p = ProcessTools.startProcess("Serializable Test", pb)) {
+            int exitValue = p.waitFor();
+            assertEquals(0, exitValue, "Test failed");
+        }
     }
 }
diff --git a/test/jdk/java/io/Serializable/records/RecordClassTest.java b/test/jdk/java/io/Serializable/records/RecordClassTest.java
index ba920ce92e5..951dd2f44dc 100644
--- a/test/jdk/java/io/Serializable/records/RecordClassTest.java
+++ b/test/jdk/java/io/Serializable/records/RecordClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
+import java.io.Serial;
 import java.io.Serializable;
 import static java.lang.System.out;
 
@@ -49,12 +50,12 @@ import org.junit.jupiter.params.provider.MethodSource;
 /**
  * Serializes and deserializes record classes. Ensures that the SUID is 0.
  */
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class RecordClassTest {
 
     record Foo () implements Serializable { }
 
     record Bar (int x) implements Serializable {
+        @Serial
         private static final long serialVersionUID = 987654321L;
     }
 
@@ -70,6 +71,7 @@ public class RecordClassTest {
     }
 
     record Wibble () implements ThrowingExternalizable {
+        @Serial
         private static final long serialVersionUID = 12345678L;
     }
 
@@ -77,7 +79,7 @@ public class RecordClassTest {
 
     record Wubble (Wobble wobble, Wibble wibble, String s) implements ThrowingExternalizable { }
 
-    public Object[][] recordClasses() {
+    public static Object[][] recordClasses() {
         return new Object[][] {
             new Object[] { Foo.class    , 0L         },
             new Object[] { Bar.class    , 987654321L },
@@ -124,7 +126,7 @@ public class RecordClassTest {
 
     record NotSerializable3<T>(T t) { }
 
-    public Object[][] notSerRecordClasses() {
+    public static Object[][] notSerRecordClasses() {
         return new Object[][] {
             new Object[] { NotSerializable1.class },
             new Object[] { NotSerializable2.class },
diff --git a/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java b/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
index 2c133392dcb..f313e8a44a3 100644
--- a/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
+++ b/test/jdk/java/io/Serializable/records/SerialVersionUIDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,18 +45,18 @@ import static java.lang.System.out;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class SerialVersionUIDTest {
 
     record R1 () implements Serializable {
+        @Serial
         private static final long serialVersionUID = 1L;
     }
 
     record R2 (int x, int y) implements Serializable {
+        @Serial
         private static final long serialVersionUID = 0L;
     }
 
@@ -64,10 +65,11 @@ public class SerialVersionUIDTest {
     record R4 (String s) implements Serializable { }
 
     record R5 (long l) implements Serializable {
+        @Serial
         private static final long serialVersionUID = 5678L;
     }
 
-    public Object[][] recordObjects() {
+    public static Object[][] recordObjects() {
         return new Object[][] {
             new Object[] { new R1(),        1L    },
             new Object[] { new R2(1, 2),    0L    },
@@ -103,7 +105,7 @@ public class SerialVersionUIDTest {
         assertEquals(expectedUID, dis.readLong());
     }
 
-    public Object[][] recordClasses() {
+    public static Object[][] recordClasses() {
         List<Object[]> list = new ArrayList<>();
         List<Class<?>> recordClasses = List.of(R1.class, R2.class, R3.class, R4.class, R5.class);
         LongStream.of(0L, 1L, 100L, 10_000L, 1_000_000L).forEach(suid ->
diff --git a/test/jdk/java/io/Serializable/serialFilter/CheckArrayTest.java b/test/jdk/java/io/Serializable/serialFilter/CheckArrayTest.java
index d00c670bd15..2081375ca59 100644
--- a/test/jdk/java/io/Serializable/serialFilter/CheckArrayTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/CheckArrayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,15 @@ import java.io.InvalidClassException;
 
 import jdk.internal.access.SharedSecrets;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.Assert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /* @test
  * @build CheckArrayTest SerialFilterTest
  * @bug 8203368
  * @modules java.base/jdk.internal.access
- * @run testng CheckArrayTest
+ * @run junit CheckArrayTest
  *
  * @summary Test the SharedSecret access to ObjectInputStream.checkArray works
  *      with overridden subclasses.
@@ -53,8 +53,8 @@ import org.testng.Assert;
  */
 public class CheckArrayTest {
 
-    @DataProvider(name = "Patterns")
-    Object[][] patterns() {
+    // Test patterns for arrays
+    private static Object[][] patterns() {
         return new Object[][]{
                 new Object[]{"maxarray=10", 10, new String[10]},    // successful
                 new Object[]{"maxarray=10", 11, new String[11]},    // exception expected
@@ -64,7 +64,8 @@ public class CheckArrayTest {
     /**
      * Test SharedSecrets checkArray with unmodified ObjectInputStream.
      */
-    @Test(dataProvider = "Patterns")
+    @ParameterizedTest
+    @MethodSource("patterns")
     public void normalOIS(String pattern, int arraySize, Object[] array) throws IOException {
         ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(pattern);
         byte[] bytes = SerialFilterTest.writeObjects(array);
@@ -75,10 +76,10 @@ public class CheckArrayTest {
                 ois.setObjectInputFilter(filter);
                 SharedSecrets.getJavaObjectInputStreamAccess()
                         .checkArray(ois, array.getClass(), arraySize);
-                Assert.assertTrue(array.length >= arraySize,
+                Assertions.assertTrue(array.length >= arraySize,
                         "Should have thrown InvalidClassException due to array size");
             } catch (InvalidClassException ice) {
-                Assert.assertFalse(array.length > arraySize,
+                Assertions.assertFalse(array.length > arraySize,
                         "Should NOT have thrown InvalidClassException due to array size");
             }
         }
@@ -88,7 +89,8 @@ public class CheckArrayTest {
      * Test SharedSecrets checkArray with an ObjectInputStream subclassed to
      * handle all input stream functions.
      */
-    @Test(dataProvider = "Patterns")
+    @ParameterizedTest
+    @MethodSource("patterns")
     public void subclassedOIS(String pattern, int arraySize, Object[] array) throws IOException {
         byte[] bytes = SerialFilterTest.writeObjects(array);
         try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
@@ -98,10 +100,10 @@ public class CheckArrayTest {
             ois.setObjectInputFilter(filter);
             SharedSecrets.getJavaObjectInputStreamAccess()
                     .checkArray(ois, array.getClass(), arraySize);
-            Assert.assertTrue(array.length >= arraySize,
+            Assertions.assertTrue(array.length >= arraySize,
                     "Should have thrown InvalidClassException due to array size");
         } catch (InvalidClassException ice) {
-            Assert.assertFalse(array.length > arraySize,
+            Assertions.assertFalse(array.length > arraySize,
                     "Should NOT have thrown InvalidClassException due to array size");
         }
     }
diff --git a/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java b/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java
index 0230eb653ce..d824c947ece 100644
--- a/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/CheckInputOrderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,28 +25,28 @@ import java.io.ByteArrayInputStream;
 import java.io.InvalidClassException;
 import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
+import java.io.Serial;
 import java.io.Serializable;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /* @test
  * @build CheckInputOrderTest SerialFilterTest
- * @run testng/othervm CheckInputOrderTest
+ * @run junit/othervm CheckInputOrderTest
  *
  * @summary Test that when both global filter and specific filter are set,
  *          global filter will not affect specific filter.
  */
 
 public class CheckInputOrderTest implements Serializable {
+    @Serial
     private static final long serialVersionUID = 12345678901L;
 
-    @DataProvider(name="Patterns")
-    Object[][] patterns() {
+    // Test cases for serial filter strings
+    static Object[][] patterns() {
         return new Object[][] {
                 new Object[] { SerialFilterTest.genTestObject("maxarray=1", true), "java.**;java.lang.*;java.lang.Long;maxarray=0", false },
                 new Object[] { SerialFilterTest.genTestObject("maxarray=1", true), "java.**;java.lang.*;java.lang.Long", true },
@@ -75,7 +75,8 @@ public class CheckInputOrderTest implements Serializable {
      *   "global filter reject" + "specific ObjectInputStream filter is empty" => should reject
      *   "global filter reject" + "specific ObjectInputStream filter allow"    => should allow
      */
-    @Test(dataProvider="Patterns")
+    @ParameterizedTest
+    @MethodSource("patterns")
     public void testRejectedInGlobal(Object toDeserialized, String pattern, boolean allowed) throws Exception {
         byte[] bytes = SerialFilterTest.writeObjects(toDeserialized);
         ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(pattern);
diff --git a/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java b/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java
index 9e38d6c499d..18bbf265e43 100644
--- a/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/GlobalFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,8 @@
  * questions.
  */
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
@@ -35,39 +34,40 @@ import java.io.ObjectInputStream;
 import java.security.Security;
 import java.util.Objects;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /* @test
  * @bug 8231422
  * @build GlobalFilterTest SerialFilterTest
- * @run testng/othervm GlobalFilterTest
- * @run testng/othervm -Djdk.serialFilter=java.**
+ * @run junit/othervm GlobalFilterTest
+ * @run junit/othervm -Djdk.serialFilter=java.**
  *          -Dexpected-jdk.serialFilter=java.** GlobalFilterTest
  * @summary Test Global Filters
  */
-@Test
 public class GlobalFilterTest {
     private static final String serialPropName = "jdk.serialFilter";
     private static final String badSerialFilter = "java.lang.StringBuffer;!*";
     private static final String origSerialFilterProperty =
             System.setProperty(serialPropName, badSerialFilter);
 
+    private static final String EXPECTED_GLOBAL_FILTER = System.getProperty("expected-" + serialPropName,
+            Security.getProperty(serialPropName));
+
+    static boolean hasGlobalFilter() {
+        return EXPECTED_GLOBAL_FILTER != null && !EXPECTED_GLOBAL_FILTER.isEmpty();
+    }
+
     /**
      * DataProvider of patterns and objects derived from the configured process-wide filter.
      * @return Array of arrays of pattern, object, allowed boolean, and API factory
      */
-    @DataProvider(name="globalPatternElements")
-    Object[][] globalPatternElements() {
-        String globalFilter =
-                System.getProperty("expected-" + serialPropName,
-                        Security.getProperty(serialPropName));
-        if (globalFilter == null) {
-            return new Object[0][];
-        }
+    static Object[][] globalPatternElements() {
 
-        String[] patterns = globalFilter.split(";");
+        String[] patterns = EXPECTED_GLOBAL_FILTER.split(";");
         Object[][] objects = new Object[patterns.length][];
 
         for (int i = 0; i < patterns.length; i++) {
@@ -83,7 +83,7 @@ public class GlobalFilterTest {
                     ? SerialFilterTest.genTestObject(pattern, true)
                     : SerialFilterTest.genTestObject(pattern.substring(1), false);
 
-                Assert.assertNotNull(o, "fail generation failed");
+                Assertions.assertNotNull(o, "fail generation failed");
             }
             objects[i] = new Object[3];
             objects[i][0] = pattern;
@@ -98,13 +98,13 @@ public class GlobalFilterTest {
      * and has the toString matching the configured pattern.
      */
     @Test()
-    static void globalFilter() {
+    void globalFilter() {
         ObjectInputFilter filter = ObjectInputFilter.Config.getSerialFilter();
 
         // Check that the System.setProperty(jdk.serialFilter) DOES NOT affect the filter.
         String asSetSystemProp = System.getProperty(serialPropName,
                 Security.getProperty(serialPropName));
-        Assert.assertNotEquals(Objects.toString(filter, null), asSetSystemProp,
+        Assertions.assertNotEquals(asSetSystemProp, Objects.toString(filter, null),
                 "System.setProperty(\"jdk.serialfilter\", ...) should not change filter: " +
                 asSetSystemProp);
 
@@ -112,7 +112,7 @@ public class GlobalFilterTest {
                 System.getProperty("expected-" + serialPropName,
                         Security.getProperty(serialPropName));
         System.out.printf("global pattern: %s, filter: %s%n", pattern, filter);
-        Assert.assertEquals(Objects.toString(filter, null), pattern,
+        assertEquals(pattern, Objects.toString(filter, null),
                 "process-wide filter pattern does not match");
     }
 
@@ -120,16 +120,15 @@ public class GlobalFilterTest {
      * If the Global filter is already set, it should always refuse to be
      * set again.
      */
-    @Test()
-    @SuppressWarnings("removal")
-    static void setGlobalFilter() {
+    @Test
+    void setGlobalFilter() {
         ObjectInputFilter filter = new SerialFilterTest.Validator();
         ObjectInputFilter global = ObjectInputFilter.Config.getSerialFilter();
         if (global != null) {
             // once set, can never be re-set
             try {
                 ObjectInputFilter.Config.setSerialFilter(filter);
-                Assert.fail("set only once process-wide filter");
+                Assertions.fail("set only once process-wide filter");
             } catch (IllegalStateException ise) {
                 // Normal, once set can never be re-set
             }
@@ -141,7 +140,7 @@ public class GlobalFilterTest {
             try {
                 // Try to set it again, expecting it to throw
                 ObjectInputFilter.Config.setSerialFilter(filter);
-                Assert.fail("set only once process-wide filter");
+                Assertions.fail("set only once process-wide filter");
             } catch (IllegalStateException ise) {
                 // Normal case
             }
@@ -154,8 +153,10 @@ public class GlobalFilterTest {
      *
      * @param pattern a pattern extracted from the configured global pattern
      */
-    @Test(dataProvider = "globalPatternElements")
-    static void globalFilterElements(String pattern, boolean allowed,Object obj) {
+    @ParameterizedTest
+    @EnabledIf("hasGlobalFilter")
+    @MethodSource("globalPatternElements")
+    void globalFilterElements(String pattern, boolean allowed,Object obj) {
         testGlobalPattern(pattern, obj, allowed);
     }
 
@@ -177,15 +178,15 @@ public class GlobalFilterTest {
             } catch (EOFException eof) {
                 // normal completion
             } catch (ClassNotFoundException cnf) {
-                Assert.fail("Deserializing", cnf);
+                Assertions.fail("Deserializing", cnf);
             }
-            Assert.assertTrue(allowed, "filter should have thrown an exception");
+            assertTrue(allowed, "filter should have thrown an exception");
         } catch (IllegalArgumentException iae) {
-            Assert.fail("bad format pattern", iae);
+            Assertions.fail("bad format pattern", iae);
         } catch (InvalidClassException ice) {
-            Assert.assertFalse(allowed, "filter should not have thrown an exception: " + ice);
+            Assertions.assertFalse(allowed, "filter should not have thrown an exception: " + ice);
         } catch (IOException ioe) {
-            Assert.fail("Unexpected IOException", ioe);
+            Assertions.fail("Unexpected IOException", ioe);
         }
     }
 }
diff --git a/test/jdk/java/io/Serializable/serialFilter/InvalidGlobalFilterTest.java b/test/jdk/java/io/Serializable/serialFilter/InvalidGlobalFilterTest.java
index a017354b103..b924a96c86c 100644
--- a/test/jdk/java/io/Serializable/serialFilter/InvalidGlobalFilterTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/InvalidGlobalFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,6 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -31,18 +28,22 @@ import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
 import java.util.Map;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.function.Executable;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /*
  * @test
  * @bug 8278087
  * @summary Test that an invalid pattern value for the jdk.serialFilter system property causes an
  * exception to be thrown when an attempt is made to use the filter or deserialize.
  * A subset of invalid filter patterns is tested.
- * @run testng/othervm -Djdk.serialFilter=.* InvalidGlobalFilterTest
- * @run testng/othervm -Djdk.serialFilter=! InvalidGlobalFilterTest
- * @run testng/othervm -Djdk.serialFilter=/ InvalidGlobalFilterTest
+ * @run junit/othervm -Djdk.serialFilter=.* InvalidGlobalFilterTest
+ * @run junit/othervm -Djdk.serialFilter=! InvalidGlobalFilterTest
+ * @run junit/othervm -Djdk.serialFilter=/ InvalidGlobalFilterTest
  *
  */
-@Test
 public class InvalidGlobalFilterTest {
     private static final String serialPropName = "jdk.serialFilter";
     private static final String serialFilter = System.getProperty(serialPropName);
@@ -64,13 +65,13 @@ public class InvalidGlobalFilterTest {
                     "java.base/", "Invalid jdk.serialFilter: class or package missing in: \"java.base/\"",
                     "/", "Invalid jdk.serialFilter: module name is missing in: \"/\"");
 
-    @DataProvider(name = "MethodsToCall")
-    private Object[][] cases() {
+    // Test cases for exceptions
+    private static Object[][] cases() {
         return new Object[][] {
-                {serialFilter, "getSerialFilter", (Assert.ThrowingRunnable) () -> ObjectInputFilter.Config.getSerialFilter()},
-                {serialFilter, "setSerialFilter", (Assert.ThrowingRunnable) () -> ObjectInputFilter.Config.setSerialFilter(new NoopFilter())},
-                {serialFilter, "new ObjectInputStream(is)", (Assert.ThrowingRunnable) () -> new ObjectInputStream(new ByteArrayInputStream(new byte[0]))},
-                {serialFilter, "new OISSubclass()", (Assert.ThrowingRunnable) () -> new OISSubclass()},
+                {serialFilter, "getSerialFilter", (Executable) () -> ObjectInputFilter.Config.getSerialFilter()},
+                {serialFilter, "setSerialFilter", (Executable) () -> ObjectInputFilter.Config.setSerialFilter(new NoopFilter())},
+                {serialFilter, "new ObjectInputStream(is)", (Executable) () -> new ObjectInputStream(new ByteArrayInputStream(new byte[0]))},
+                {serialFilter, "new OISSubclass()", (Executable) () -> new OISSubclass()},
         };
     }
 
@@ -78,18 +79,19 @@ public class InvalidGlobalFilterTest {
      * Test each method that should throw IllegalStateException based on
      * the invalid arguments it was launched with.
      */
-    @Test(dataProvider = "MethodsToCall")
-    public void initFaultTest(String pattern, String method, Assert.ThrowingRunnable runnable) {
+    @ParameterizedTest
+    @MethodSource("cases")
+    public void initFaultTest(String pattern, String method, Executable runnable) {
 
-        IllegalStateException ex = Assert.expectThrows(IllegalStateException.class,
+        IllegalStateException ex = Assertions.assertThrows(IllegalStateException.class,
                 runnable);
 
         String expected = invalidMessages.get(serialFilter);
         if (expected == null) {
-            Assert.fail("No expected message for filter: " + serialFilter);
+            Assertions.fail("No expected message for filter: " + serialFilter);
         }
         System.out.println(ex.getMessage());
-        Assert.assertEquals(ex.getMessage(), expected, "wrong message");
+        Assertions.assertEquals(expected, ex.getMessage(), "wrong message");
     }
 
     private static class NoopFilter implements ObjectInputFilter {
diff --git a/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java b/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java
index 8e24f27f598..5af5f4d15ed 100644
--- a/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/MixedFiltersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,20 +25,21 @@ import java.io.ByteArrayInputStream;
 import java.io.InvalidClassException;
 import java.io.ObjectInputFilter;
 import java.io.ObjectInputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.security.Security;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /* @test
  * @build MixedFiltersTest SerialFilterTest
- * @run testng/othervm -Djdk.serialFilter=!java.**;!java.lang.Long;maxdepth=5;maxarray=5;maxbytes=90;maxrefs=5          MixedFiltersTest
- * @run testng/othervm -Djdk.serialFilter=java.**;java.lang.Long;maxdepth=1000;maxarray=1000;maxbytes=1000;maxrefs=1000 MixedFiltersTest
+ * @run junit/othervm -Djdk.serialFilter=!java.**;!java.lang.Long;maxdepth=5;maxarray=5;maxbytes=90;maxrefs=5          MixedFiltersTest
+ * @run junit/othervm -Djdk.serialFilter=java.**;java.lang.Long;maxdepth=1000;maxarray=1000;maxbytes=1000;maxrefs=1000 MixedFiltersTest
  *
  * @summary Test that when both global filter and specific filter are set,
  *          global filter will not affect specific filter.
@@ -46,23 +47,17 @@ import static org.testng.Assert.fail;
 
 public class MixedFiltersTest implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1234567890L;
 
+    private static final String JDK_SERIAL_FILTER = System.getProperty("jdk.serialFilter",
+            Security.getProperty("jdk.serialFilter"));
 
-    boolean globalRejected;
-
-    @BeforeClass
-    public void setup() {
-        String pattern = System.getProperty("jdk.serialFilter",
-                Security.getProperty("jdk.serialFilter"));
-        globalRejected = pattern.startsWith("!");
+    private static boolean globalRejected() {
+        return JDK_SERIAL_FILTER.startsWith("!");
     }
 
-    @DataProvider(name="RejectedInGlobal")
-    Object[][] rejectedInGlobal() {
-        if (!globalRejected) {
-            return new Object[0][];
-        }
+    static Object[][] rejectedInGlobal() {
         return new Object[][] {
                 new Object[] { Long.MAX_VALUE, "java.**" },
                 new Object[] { Long.MAX_VALUE, "java.lang.Long" },
@@ -79,7 +74,9 @@ public class MixedFiltersTest implements Serializable {
      *   "global filter reject" + "specific ObjectInputStream filter is empty" => should reject
      *   "global filter reject" + "specific ObjectInputStream filter allow"    => should allow
      */
-    @Test(dataProvider="RejectedInGlobal")
+    @ParameterizedTest
+    @EnabledIf("globalRejected")
+    @MethodSource("rejectedInGlobal")
     public void testRejectedInGlobal(Object toDeserialized, String pattern) throws Exception {
         byte[] bytes = SerialFilterTest.writeObjects(toDeserialized);
         try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
@@ -96,12 +93,7 @@ public class MixedFiltersTest implements Serializable {
         }
     }
 
-    @DataProvider(name="AllowedInGlobal")
-    Object[][] allowedInGlobal() {
-        if (globalRejected) {
-            return new Object[0][];
-        }
-
+    static Object[][] allowedInGlobal() {
         return new Object[][] {
                 new Object[] { Long.MAX_VALUE, "!java.**" },
                 new Object[] { Long.MAX_VALUE, "!java.lang.Long" },
@@ -118,7 +110,9 @@ public class MixedFiltersTest implements Serializable {
      *   "global filter allow" + "specific ObjectInputStream filter is empty" => should allow
      *   "global filter allow" + "specific ObjectInputStream filter reject"   => should reject
      */
-    @Test(dataProvider="AllowedInGlobal")
+    @ParameterizedTest
+    @DisabledIf("globalRejected")
+    @MethodSource("allowedInGlobal")
     public void testAllowedInGlobal(Object toDeserialized, String pattern) throws Exception {
         byte[] bytes = SerialFilterTest.writeObjects(toDeserialized);
         try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
diff --git a/test/jdk/java/io/Serializable/serialFilter/SerialFactoryExample.java b/test/jdk/java/io/Serializable/serialFilter/SerialFactoryExample.java
index 45b1872bae0..271c22b917c 100644
--- a/test/jdk/java/io/Serializable/serialFilter/SerialFactoryExample.java
+++ b/test/jdk/java/io/Serializable/serialFilter/SerialFactoryExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,6 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -46,9 +42,13 @@ import static java.io.ObjectInputFilter.Status.ALLOWED;
 import static java.io.ObjectInputFilter.Status.REJECTED;
 import static java.io.ObjectInputFilter.Status.UNDECIDED;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /* @test
- * @run testng/othervm SerialFactoryExample
- * @run testng/othervm -Djdk.serialFilterFactory=SerialFactoryExample$FilterInThread SerialFactoryExample
+ * @run junit/othervm SerialFactoryExample
+ * @run junit/othervm -Djdk.serialFilterFactory=SerialFactoryExample$FilterInThread SerialFactoryExample
  * @summary Test SerialFactoryExample
  */
 
@@ -76,10 +76,9 @@ import static java.io.ObjectInputFilter.Status.UNDECIDED;
  *
  * The `doWithSerialFilter` calls can be nested. When nested, the filters are concatenated.
  */
-@Test
 public class SerialFactoryExample {
 
-    @DataProvider(name = "Examples")
+    // Test cases for filters
     static Object[][] examples() {
         return new Object[][]{
                 {new Point(1, 2), null,
@@ -108,7 +107,8 @@ public class SerialFactoryExample {
     }
 
 
-    @Test(dataProvider = "Examples")
+    @ParameterizedTest
+    @MethodSource("examples")
     void examples(Serializable obj, ObjectInputFilter filter, Status expected) {
         // Establish FilterInThread as the application-wide filter factory
         FilterInThread filterInThread;
@@ -128,11 +128,11 @@ public class SerialFactoryExample {
                 Object o = deserializeObject(bytes);
             });
             if (expected.equals(REJECTED))
-                Assert.fail("IllegalClassException should have occurred");
+                Assertions.fail("IllegalClassException should have occurred");
         } catch (UncheckedIOException uioe) {
             IOException ioe = uioe.getCause();
-            Assert.assertEquals(ioe.getClass(), InvalidClassException.class, "Wrong exception");
-            Assert.assertEquals(REJECTED, expected, "Exception should not have occurred");
+            Assertions.assertEquals(InvalidClassException.class, ioe.getClass(), "Wrong exception");
+            Assertions.assertEquals(expected, REJECTED, "Exception should not have occurred");
         }
     }
 
@@ -142,7 +142,8 @@ public class SerialFactoryExample {
      * @param filter a filter
      * @param expected status
      */
-    @Test(dataProvider = "Examples")
+    @ParameterizedTest
+    @MethodSource("examples")
     void checkStatus(Serializable obj, ObjectInputFilter filter, Status expected) {
         // Establish FilterInThread as the application-wide filter factory
         FilterInThread filterInThread;
@@ -166,12 +167,12 @@ public class SerialFactoryExample {
                 System.out.println("    filter in effect: " + filterInThread.currFilter);
                 if (compositeFilter != null) {
                     Status actualStatus = compositeFilter.checkInput(info);
-                    Assert.assertEquals(actualStatus, expected, "Wrong Status");
+                    Assertions.assertEquals(expected, actualStatus, "Wrong Status");
                 }
             });
 
         } catch (Exception ex) {
-            Assert.fail("unexpected exception", ex);
+            Assertions.fail("unexpected exception", ex);
         }
     }
 
diff --git a/test/jdk/java/io/Serializable/serialFilter/SerialFactoryFaults.java b/test/jdk/java/io/Serializable/serialFilter/SerialFactoryFaults.java
index 1d35306a426..add9f3557da 100644
--- a/test/jdk/java/io/Serializable/serialFilter/SerialFactoryFaults.java
+++ b/test/jdk/java/io/Serializable/serialFilter/SerialFactoryFaults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,6 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -32,15 +29,19 @@ import java.io.ObjectInputFilter.Config;
 import java.io.ObjectInputStream;
 import java.util.function.BinaryOperator;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.function.Executable;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /* @test
- * @run testng/othervm  -Djdk.serialFilterFactory=ForcedError_NoSuchClass SerialFactoryFaults
- * @run testng/othervm  -Djdk.serialFilterFactory=SerialFactoryFaults$NoPublicConstructor SerialFactoryFaults
- * @run testng/othervm  -Djdk.serialFilterFactory=SerialFactoryFaults$ConstructorThrows SerialFactoryFaults
- * @run testng/othervm  -Djdk.serialFilterFactory=SerialFactoryFaults$FactorySetsFactory SerialFactoryFaults
+ * @run junit/othervm  -Djdk.serialFilterFactory=ForcedError_NoSuchClass SerialFactoryFaults
+ * @run junit/othervm  -Djdk.serialFilterFactory=SerialFactoryFaults$NoPublicConstructor SerialFactoryFaults
+ * @run junit/othervm  -Djdk.serialFilterFactory=SerialFactoryFaults$ConstructorThrows SerialFactoryFaults
+ * @run junit/othervm  -Djdk.serialFilterFactory=SerialFactoryFaults$FactorySetsFactory SerialFactoryFaults
  * @summary Check cases where the Filter Factory initialization from properties fails
  */
 
-@Test
 public class SerialFactoryFaults {
 
     // Sample the serial factory class name
@@ -52,13 +53,13 @@ public class SerialFactoryFaults {
                 System.getProperty("test.src", ".") + "/logging.properties");
     }
 
-    @DataProvider(name = "MethodsToCall")
-    private Object[][] cases() {
+    // Test cases of faults
+    private static Object[][] cases() {
         return new Object[][] {
-                {"getSerialFilterFactory", (Assert.ThrowingRunnable) () -> Config.getSerialFilterFactory()},
-                {"setSerialFilterFactory", (Assert.ThrowingRunnable) () -> Config.setSerialFilterFactory(new NoopFactory())},
-                {"new ObjectInputStream(is)", (Assert.ThrowingRunnable) () -> new ObjectInputStream(new ByteArrayInputStream(new byte[0]))},
-                {"new OISSubclass()", (Assert.ThrowingRunnable) () -> new OISSubclass()},
+                {"getSerialFilterFactory", (Executable) () -> Config.getSerialFilterFactory()},
+                {"setSerialFilterFactory", (Executable) () -> Config.setSerialFilterFactory(new NoopFactory())},
+                {"new ObjectInputStream(is)", (Executable) () -> new ObjectInputStream(new ByteArrayInputStream(new byte[0]))},
+                {"new OISSubclass()", (Executable) () -> new OISSubclass()},
         };
     }
 
@@ -66,26 +67,23 @@ public class SerialFactoryFaults {
      * Test each method that should throw IllegalStateException based on
      * the invalid arguments it was launched with.
      */
-    @Test(dataProvider = "MethodsToCall")
-    public void initFaultTest(String name, Assert.ThrowingRunnable runnable) {
-        IllegalStateException ex = Assert.expectThrows(IllegalStateException.class,
+    @ParameterizedTest
+    @MethodSource("cases")
+    public void initFaultTest(String name, Executable runnable) {
+        IllegalStateException ex = Assertions.assertThrows(IllegalStateException.class,
                 runnable);
         final String msg = ex.getMessage();
 
         if (factoryName.equals("ForcedError_NoSuchClass")) {
-            Assert.assertEquals(msg,
-                    "invalid jdk.serialFilterFactory: ForcedError_NoSuchClass: java.lang.ClassNotFoundException: ForcedError_NoSuchClass", "wrong exception");
+            Assertions.assertEquals("invalid jdk.serialFilterFactory: ForcedError_NoSuchClass: java.lang.ClassNotFoundException: ForcedError_NoSuchClass", msg, "wrong exception");
         } else if (factoryName.equals("SerialFactoryFaults$NoPublicConstructor")) {
-            Assert.assertEquals(msg,
-                    "invalid jdk.serialFilterFactory: SerialFactoryFaults$NoPublicConstructor: java.lang.NoSuchMethodException: SerialFactoryFaults$NoPublicConstructor.<init>()", "wrong exception");
+            Assertions.assertEquals("invalid jdk.serialFilterFactory: SerialFactoryFaults$NoPublicConstructor: java.lang.NoSuchMethodException: SerialFactoryFaults$NoPublicConstructor.<init>()", msg, "wrong exception");
         } else if (factoryName.equals("SerialFactoryFaults$ConstructorThrows")) {
-            Assert.assertEquals(msg,
-                    "invalid jdk.serialFilterFactory: SerialFactoryFaults$ConstructorThrows: java.lang.RuntimeException: constructor throwing a runtime exception", "wrong exception");
+            Assertions.assertEquals("invalid jdk.serialFilterFactory: SerialFactoryFaults$ConstructorThrows: java.lang.RuntimeException: constructor throwing a runtime exception", msg, "wrong exception");
         } else if (factoryName.equals("SerialFactoryFaults$FactorySetsFactory")) {
-            Assert.assertEquals(msg,
-                    "invalid jdk.serialFilterFactory: SerialFactoryFaults$FactorySetsFactory: java.lang.IllegalStateException: Serial filter factory initialization incomplete", "wrong exception");
+            Assertions.assertEquals("invalid jdk.serialFilterFactory: SerialFactoryFaults$FactorySetsFactory: java.lang.IllegalStateException: Serial filter factory initialization incomplete", msg, "wrong exception");
         } else {
-            Assert.fail("No test for filter factory: " + factoryName);
+            Assertions.fail("No test for filter factory: " + factoryName);
         }
     }
 
diff --git a/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java b/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java
index 6842eabe9b0..f34f95a72b3 100644
--- a/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/SerialFilterFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,6 @@
  */
 
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,17 +35,26 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.function.BinaryOperator;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /* @test
  * @build SerialFilterFactoryTest
- * @run testng/othervm SerialFilterFactoryTest
- * @run testng/othervm -Djdk.serialFilterFactory=SerialFilterFactoryTest$PropertyFilterFactory
+ * @run junit/othervm SerialFilterFactoryTest
+ * @run junit/othervm -Djdk.serialFilterFactory=SerialFilterFactoryTest$PropertyFilterFactory
  *                     -Djava.util.logging.config.file=${test.src}/logging.properties SerialFilterFactoryTest
- * @run testng/othervm -Djdk.serialFilterFactory=SerialFilterFactoryTest$NotMyFilterFactory
+ * @run junit/othervm -Djdk.serialFilterFactory=SerialFilterFactoryTest$NotMyFilterFactory
  *                     -Djava.util.logging.config.file=${test.src}/logging.properties SerialFilterFactoryTest
  *
  * @summary Test Context-specific Deserialization Filters
  */
-@Test
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SerialFilterFactoryTest {
 
     // A stream with just the header, enough to create a OIS
@@ -70,7 +76,7 @@ public class SerialFilterFactoryTest {
             ois.writeObject(new Dummy("Here"));
             return boas.toByteArray();
         } catch (IOException ioe) {
-            Assert.fail("unexpected IOE", ioe);
+            Assertions.fail("unexpected IOE", ioe);
         }
         throw new RuntimeException("should not reach here");
     }
@@ -109,7 +115,7 @@ public class SerialFilterFactoryTest {
         return !(ObjectInputFilter.Config.getSerialFilterFactory() instanceof NotMyFilterFactory);
     }
 
-    @DataProvider(name="FilterCases")
+    // Test cases for filter factory
     static Object[][] filterCases() {
         if (isValidFilterFactory()) {
             return new Object[][]{
@@ -124,9 +130,11 @@ public class SerialFilterFactoryTest {
     }
 
     // Setting the filter factory to null is not allowed.
-    @Test(expectedExceptions=NullPointerException.class)
+    @Test
     void testNull() {
-        Config.setSerialFilterFactory(null);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            Config.setSerialFilterFactory(null);
+        });
     }
 
     /**
@@ -136,7 +144,6 @@ public class SerialFilterFactoryTest {
      * Try to set it again, the second should throw.
      */
     @Test
-    @SuppressWarnings("removal")
     void testSecondSetShouldThrow() {
         var currFF = Config.getSerialFilterFactory();
         if (currFF.getClass().getClassLoader() == null) {
@@ -145,14 +152,14 @@ public class SerialFilterFactoryTest {
                 Config.setSerialFilterFactory(contextFilterFactory);
                 currFF = contextFilterFactory;
             } catch (IllegalStateException ise) {
-                Assert.fail("First setSerialFilterFactory should not throw");
+                Assertions.fail("First setSerialFilterFactory should not throw");
             }
         }
         // Setting it again will throw
-        Assert.expectThrows(IllegalStateException.class,
+        Assertions.assertThrows(IllegalStateException.class,
                 () -> Config.setSerialFilterFactory(new MyFilterFactory("f11")));
         var resetFF = Config.getSerialFilterFactory();
-        Assert.assertEquals(resetFF, currFF, "Setting again should not change filter factory");
+        Assertions.assertEquals(currFF, resetFF, "Setting again should not change filter factory");
     }
 
     /**
@@ -167,8 +174,10 @@ public class SerialFilterFactoryTest {
      * @throws IOException if an I/O error occurs (should not occur)
      * @throws ClassNotFoundException for class not found (should not occur)
      */
-    @Test(dataProvider="FilterCases")
-    @SuppressWarnings("removal")
+    @ParameterizedTest
+    @EnabledIf("isValidFilterFactory")
+    @MethodSource("filterCases")
+    @Order(1)
     void testCase(MyFilterFactory dynFilterFactory, Validator dynFilter, Validator streamFilter)
                 throws IOException, ClassNotFoundException {
 
@@ -182,32 +191,32 @@ public class SerialFilterFactoryTest {
         InputStream is = new ByteArrayInputStream(simpleStream);
         ObjectInputStream ois = new ObjectInputStream(is);
 
-        Assert.assertNull(factory.current(), "initially current should be null");
-        Assert.assertEquals(factory.next(), configFilter, "initially next should be the configured filter");
+        Assertions.assertNull(factory.current(), "initially current should be null");
+        Assertions.assertEquals(configFilter, factory.next(), "initially next should be the configured filter");
         var currFilter = ois.getObjectInputFilter();
         if (currFilter != null && currFilter.getClass().getClassLoader() == null) {
             // Builtin loader;  defaults to configured filter
-            Assert.assertEquals(currFilter, configFilter, "getObjectInputFilter should be configured filter");
+            Assertions.assertEquals(configFilter, currFilter, "getObjectInputFilter should be configured filter");
         } else {
-            Assert.assertEquals(currFilter, configFilter, "getObjectInputFilter should be null");
+            Assertions.assertEquals(configFilter, currFilter, "getObjectInputFilter should be null");
         }
         if (streamFilter != null) {
             ois.setObjectInputFilter(streamFilter);
             // MyFilterFactory is called when the stream filter is changed; verify values passed it
-            Assert.assertEquals(factory.current(), currFilter, "when setObjectInputFilter, current should be current filter");
-            Assert.assertEquals(factory.next(), streamFilter, "next should be stream specific filter");
+            Assertions.assertEquals(currFilter, factory.current(), "when setObjectInputFilter, current should be current filter");
+            Assertions.assertEquals(streamFilter, factory.next(), "next should be stream specific filter");
 
             // Check the OIS filter after the factory has updated it.
             currFilter = ois.getObjectInputFilter();
-            Assert.assertEquals(currFilter, streamFilter, "getObjectInputFilter should be set");
+            Assertions.assertEquals(streamFilter, currFilter, "getObjectInputFilter should be set");
 
             // Verify that it can not be set again
-            Assert.assertThrows(IllegalStateException.class, () -> ois.setObjectInputFilter(streamFilter));
+            Assertions.assertThrows(IllegalStateException.class, () -> ois.setObjectInputFilter(streamFilter));
         }
         if (currFilter instanceof Validator validator) {
             validator.reset();
             Object o = ois.readObject();       // Invoke only for the side effect of calling the Filter
-            Assert.assertEquals(validator.count, 1, "Wrong number of calls to the stream filter");
+            Assertions.assertEquals(1, validator.count, "Wrong number of calls to the stream filter");
         } else {
             Object o = ois.readObject();       // Invoke only for the side effect of calling the filter
         }
@@ -217,18 +226,19 @@ public class SerialFilterFactoryTest {
     @Test
     void testPropertyFilterFactory() {
         if (jdkSerialFilterFactoryProp != null) {
-            Assert.assertEquals(jdkSerialFilterFactory.getClass().getName(), jdkSerialFilterFactoryProp,
+            Assertions.assertEquals(jdkSerialFilterFactoryProp, jdkSerialFilterFactory.getClass().getName(),
                     "jdk.serialFilterFactory property classname mismatch");
         }
     }
 
     // Test that setting the filter factory after any deserialization (any testCase)
     // throws IllegalStateException with the specific message
-    @Test(dependsOnMethods="testCase")
+    @Test
+    @Order(99)
     void testSetFactoryAfterDeserialization() {
         BinaryOperator<ObjectInputFilter> factory = Config.getSerialFilterFactory();
-        IllegalStateException ise = Assert.expectThrows(IllegalStateException.class, () -> Config.setSerialFilterFactory(factory));
-        Assert.assertTrue(ise.getMessage().startsWith("Cannot replace filter factory: "));
+        IllegalStateException ise = Assertions.assertThrows(IllegalStateException.class, () -> Config.setSerialFilterFactory(factory));
+        Assertions.assertTrue(ise.getMessage().startsWith("Cannot replace filter factory: "));
     }
 
 
@@ -243,11 +253,11 @@ public class SerialFilterFactoryTest {
             // Try to set the filter to null
             ois.setObjectInputFilter(null);
             if (curr != null) {
-                Assert.fail("setting filter to null after a non-null filter should throw");
+                Assertions.fail("setting filter to null after a non-null filter should throw");
             }
         } catch (IllegalStateException ise) {
             if (curr == null) {
-                Assert.fail("setting filter to null after a null filter should not throw");
+                Assertions.fail("setting filter to null after a null filter should not throw");
             }
         }
     }
diff --git a/test/jdk/java/io/Serializable/serialFilter/SerialFilterFunctionTest.java b/test/jdk/java/io/Serializable/serialFilter/SerialFilterFunctionTest.java
index 41832d583c2..8930c2dfa9d 100644
--- a/test/jdk/java/io/Serializable/serialFilter/SerialFilterFunctionTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/SerialFilterFunctionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,6 @@
  * questions.
  */
 
-
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.io.ObjectInputFilter;
 import java.io.ObjectInputFilter.FilterInfo;
 import java.util.function.Predicate;
@@ -35,12 +30,16 @@ import static java.io.ObjectInputFilter.Status.ALLOWED;
 import static java.io.ObjectInputFilter.Status.REJECTED;
 import static java.io.ObjectInputFilter.Status.UNDECIDED;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /* @test
- * @run testng/othervm -Djava.util.logging.config.file=${test.src}/logging.properties
+ * @run junit/othervm -Djava.util.logging.config.file=${test.src}/logging.properties
  *                      SerialFilterFunctionTest
  * @summary ObjectInputFilter.Config Function Tests
  */
-@Test
 public class SerialFilterFunctionTest {
 
     @Test
@@ -53,10 +52,10 @@ public class SerialFilterFunctionTest {
                 ObjectInputFilter filter2 = getFilter(st2);
                 ObjectInputFilter f = ObjectInputFilter.merge(filter1, filter2);
                 Status r = f.checkInput(info);
-                Assert.assertEquals(merge(st1, st2), r, "merge");
+                Assertions.assertEquals(r, merge(st1, st2), "merge");
             }
-            Assert.assertSame(ObjectInputFilter.merge(filter1, null), filter1, "merge with null fail");
-            Assert.assertThrows(NullPointerException.class, () -> ObjectInputFilter.merge(null, filter1));
+            Assertions.assertSame(ObjectInputFilter.merge(filter1, null), filter1, "merge with null fail");
+            Assertions.assertThrows(NullPointerException.class, () -> ObjectInputFilter.merge(null, filter1));
         }
     }
 
@@ -84,7 +83,7 @@ public class SerialFilterFunctionTest {
         return (cl) -> cl.equals(Integer.class);
     }
 
-    @DataProvider(name = "AllowPredicateCases")
+    // Test cases of filter strings
     static Object[][] allowPredicateCases() {
         return new Object[][]{
                 { Integer.class, isInteger(), REJECTED, ALLOWED},
@@ -95,18 +94,17 @@ public class SerialFilterFunctionTest {
         };
     }
 
-    @Test(dataProvider = "AllowPredicateCases")
+    @ParameterizedTest
+    @MethodSource("allowPredicateCases")
     void testAllowPredicates(Class<?> clazz, Predicate<Class<?>> predicate, Status otherStatus, Status expected) {
         ObjectInputFilter.FilterInfo info = new SerialInfo(clazz);
         if (predicate == null || expected == null) {
-            Assert.assertThrows(NullPointerException.class, () -> ObjectInputFilter.allowFilter(predicate, expected));
+            Assertions.assertThrows(NullPointerException.class, () -> ObjectInputFilter.allowFilter(predicate, expected));
         } else {
-            Assert.assertEquals(ObjectInputFilter.allowFilter(predicate, otherStatus).checkInput(info),
-                    expected, "Predicate result");
+            Assertions.assertEquals(                    expected, ObjectInputFilter.allowFilter(predicate, otherStatus).checkInput(info), "Predicate result");
         }
     }
 
-    @DataProvider(name = "RejectPredicateCases")
     static Object[][] rejectPredicateCases() {
         return new Object[][]{
                 { Integer.class, isInteger(), REJECTED, REJECTED},
@@ -117,14 +115,15 @@ public class SerialFilterFunctionTest {
         };
     }
 
-    @Test(dataProvider = "RejectPredicateCases")
+    @ParameterizedTest
+    @MethodSource("rejectPredicateCases")
     void testRejectPredicates(Class<?> clazz, Predicate<Class<?>> predicate, Status otherStatus, Status expected) {
         ObjectInputFilter.FilterInfo info = new SerialInfo(clazz);
         if (predicate == null || expected == null) {
-            Assert.assertThrows(NullPointerException.class, () -> ObjectInputFilter.allowFilter(predicate, expected));
+            Assertions.assertThrows(NullPointerException.class, () -> ObjectInputFilter.allowFilter(predicate, expected));
         } else {
-            Assert.assertEquals(ObjectInputFilter.rejectFilter(predicate, otherStatus)
-                    .checkInput(info), expected, "Predicate result");
+            Assertions.assertEquals(expected, ObjectInputFilter.rejectFilter(predicate, otherStatus)
+                    .checkInput(info), "Predicate result");
         }
     }
 
@@ -133,11 +132,11 @@ public class SerialFilterFunctionTest {
         FilterInfo info = new SerialInfo(Object.class); // an info structure, unused
 
         ObjectInputFilter undecided = getFilter(UNDECIDED);
-        Assert.assertEquals(ObjectInputFilter.rejectUndecidedClass(undecided).checkInput(info), REJECTED, "undecided -> rejected");
+        Assertions.assertEquals(REJECTED, ObjectInputFilter.rejectUndecidedClass(undecided).checkInput(info), "undecided -> rejected");
         ObjectInputFilter allowed = getFilter(ALLOWED);
-        Assert.assertEquals(ObjectInputFilter.rejectUndecidedClass(allowed).checkInput(info), ALLOWED, "allowed -> rejected");
+        Assertions.assertEquals(ALLOWED, ObjectInputFilter.rejectUndecidedClass(allowed).checkInput(info), "allowed -> rejected");
         ObjectInputFilter rejected = getFilter(REJECTED);
-        Assert.assertEquals(ObjectInputFilter.rejectUndecidedClass(rejected).checkInput(info), REJECTED, "rejected -> rejected");
+        Assertions.assertEquals(REJECTED, ObjectInputFilter.rejectUndecidedClass(rejected).checkInput(info), "rejected -> rejected");
 
         // Specific cases of Classes the result in allowed, rejected, and undecided status
         ObjectInputFilter numberFilter = ObjectInputFilter.Config.createFilter("java.lang.Integer;!java.lang.Double");
@@ -164,9 +163,9 @@ public class SerialFilterFunctionTest {
                 while (clazz.isArray())
                     clazz = clazz.getComponentType();
                 Status expected = (clazz.isPrimitive()) ? UNDECIDED : REJECTED;
-                Assert.assertEquals(st, expected, "Wrong status for class: " + obj.getClass());
+                Assertions.assertEquals(expected, st, "Wrong status for class: " + obj.getClass());
             } else {
-                Assert.assertEquals(rawSt, st, "raw filter and rejectUndecided filter disagree");
+                Assertions.assertEquals(st, rawSt, "raw filter and rejectUndecided filter disagree");
             }
         }
     }
diff --git a/test/jdk/java/io/Serializable/serialFilter/SerialFilterTest.java b/test/jdk/java/io/Serializable/serialFilter/SerialFilterTest.java
index fb02cd02268..3b2ecc3d1b1 100644
--- a/test/jdk/java/io/Serializable/serialFilter/SerialFilterTest.java
+++ b/test/jdk/java/io/Serializable/serialFilter/SerialFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,20 +46,20 @@ import java.util.concurrent.atomic.LongAdder;
 
 import javax.net.ssl.SSLEngineResult;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /* @test
  * @bug 8234836
  * @build SerialFilterTest
- * @run testng/othervm -Djava.util.logging.config.file=${test.src}/logging.properties
+ * @run junit/othervm -Djava.util.logging.config.file=${test.src}/logging.properties
  *                      SerialFilterTest
- * @run testng/othervm -Djdk.serialSetFilterAfterRead=true SerialFilterTest
+ * @run junit/othervm -Djdk.serialSetFilterAfterRead=true SerialFilterTest
  *
  * @summary Test ObjectInputFilters using Builtin Filter Factory
  */
-@Test
 public class SerialFilterTest implements Serializable {
 
     @Serial
@@ -89,9 +89,8 @@ public class SerialFilterTest implements Serializable {
      * Expand the patterns into cases for each of the Std and Compatibility APIs.
      * @return an array of arrays of the parameters including factories
      */
-    @DataProvider(name="Patterns")
     static Object[][] patterns() {
-        Object[][] patterns = new Object[][]{
+        return new Object[][]{
                 {"java.util.Hashtable"},
                 {"java.util.Hash*"},
                 {"javax.net.ssl.*"},
@@ -105,10 +104,8 @@ public class SerialFilterTest implements Serializable {
                 {"maxbytes=+1024"},
                 {"java.base/java.util.Hashtable"},
         };
-        return patterns;
     }
 
-    @DataProvider(name="InvalidPatterns")
     static Object[][] invalidPatterns() {
         return new Object [][] {
                 {".*"},
@@ -120,7 +117,6 @@ public class SerialFilterTest implements Serializable {
         };
     }
 
-    @DataProvider(name="Limits")
     static Object[][] limits() {
         // The numbers are arbitrary > 1
         return new Object[][] {
@@ -133,7 +129,6 @@ public class SerialFilterTest implements Serializable {
         };
     }
 
-    @DataProvider(name="InvalidLimits")
     static Object[][] invalidLimits() {
         return new Object[][] {
                 {"maxrefs=-1"},
@@ -157,7 +152,6 @@ public class SerialFilterTest implements Serializable {
      * available to the filter.
      * @return  Arrays of parameters with objects
      */
-    @DataProvider(name="Objects")
     static Object[][] objects() {
         byte[] byteArray = new byte[0];
         Object[] objArray = new Object[7];
@@ -168,7 +162,7 @@ public class SerialFilterTest implements Serializable {
         try {
             serClass = Class.forName(className);
         } catch (Exception e) {
-            Assert.fail("missing class: " + className, e);
+            Assertions.fail("missing class: " + className, e);
         }
 
         Class<?>[] interfaces = {Runnable.class};
@@ -213,7 +207,6 @@ public class SerialFilterTest implements Serializable {
         return objects;
     }
 
-    @DataProvider(name="Arrays")
     static Object[][] arrays() {
         return new Object[][]{
                 {new Object[16], 16},
@@ -244,21 +237,22 @@ public class SerialFilterTest implements Serializable {
      * @param classes  the expected (unique) classes
      * @throws IOException
      */
-    @Test(dataProvider="Objects")
+    @ParameterizedTest
+    @MethodSource("objects")
     void t1(Object object,
                           long count, long maxArray, long maxRefs, long maxDepth, long maxBytes,
                           List<Class<?>> classes) throws IOException {
         byte[] bytes = writeObjects(object);
         Validator validator = new Validator();
         validate(bytes, validator);
-        System.out.printf("v: %s%n", validator);
+        System.err.printf("v: %s%n", validator);
 
-        Assert.assertEquals(validator.count, count, "callback count wrong");
-        Assert.assertEquals(validator.classes, classes, "classes mismatch");
-        Assert.assertEquals(validator.maxArray, maxArray, "maxArray mismatch");
-        Assert.assertEquals(validator.maxRefs, maxRefs, "maxRefs wrong");
-        Assert.assertEquals(validator.maxDepth, maxDepth, "depth wrong");
-        Assert.assertEquals(validator.maxBytes, maxBytes, "maxBytes wrong");
+        Assertions.assertEquals(count, validator.count, "callback count wrong");
+        Assertions.assertEquals(classes, validator.classes, "classes mismatch");
+        Assertions.assertEquals(maxArray, validator.maxArray, "maxArray mismatch");
+        Assertions.assertEquals(maxRefs, validator.maxRefs, "maxRefs wrong");
+        Assertions.assertEquals(maxDepth, validator.maxDepth, "depth wrong");
+        Assertions.assertEquals(maxBytes, validator.maxBytes, "maxBytes wrong");
     }
 
     /**
@@ -269,7 +263,8 @@ public class SerialFilterTest implements Serializable {
      *
      * @param pattern a pattern
      */
-    @Test(dataProvider="Patterns")
+    @ParameterizedTest
+    @MethodSource("patterns")
     void testPatterns(String pattern) {
         evalPattern(pattern, (p, o, neg) -> testPatterns(p, o, neg));
     }
@@ -297,23 +292,23 @@ public class SerialFilterTest implements Serializable {
                     // Check the initial filter is the global filter; may be null
                     ObjectInputFilter global = ObjectInputFilter.Config.getSerialFilter();
                     ObjectInputFilter initial = ois.getObjectInputFilter();
-                    Assert.assertEquals(global, initial, "initial filter should be the global filter");
+                    Assertions.assertEquals(initial, global, "initial filter should be the global filter");
 
                     ois.setObjectInputFilter(validator);
                     Object o = ois.readObject();
                     try {
                         ois.setObjectInputFilter(validator2);
-                        Assert.fail("Should not be able to set filter twice");
+                        Assertions.fail("Should not be able to set filter twice");
                     } catch (IllegalStateException ise) {
                         // success, the exception was expected
                     }
                 } catch (EOFException eof) {
-                    Assert.fail("Should not reach end-of-file", eof);
+                    Assertions.fail("Should not reach end-of-file", eof);
                 } catch (ClassNotFoundException cnf) {
-                    Assert.fail("Deserializing", cnf);
+                    Assertions.fail("Deserializing", cnf);
                 }
             } catch (IOException ex) {
-                Assert.fail("Unexpected IOException", ex);
+                Assertions.fail("Unexpected IOException", ex);
             }
         }
     }
@@ -336,7 +331,7 @@ public class SerialFilterTest implements Serializable {
             try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
                  ObjectInputStream ois = new ObjectInputStream(bais)) {
                 Object actual1 = toggle ? ois.readObject() : ois.readUnshared();
-                Assert.assertEquals(actual1, expected1, "unexpected string");
+                Assertions.assertEquals(expected1, actual1, "unexpected string");
                 // Attempt to set filter
                 ois.setObjectInputFilter(new ObjectInputFilter() {
                     @Override
@@ -345,14 +340,14 @@ public class SerialFilterTest implements Serializable {
                     }
                 });
                 if (!SET_FILTER_AFTER_READ)
-                    Assert.fail("Should not be able to set filter after readObject has been called");
+                    Assertions.fail("Should not be able to set filter after readObject has been called");
             } catch (IllegalStateException ise) {
                 // success, the exception was expected
                 if (SET_FILTER_AFTER_READ)
-                    Assert.fail("With jdk.serialSetFilterAfterRead property set = true; " +
+                    Assertions.fail("With jdk.serialSetFilterAfterRead property set = true; " +
                             "should be able to set the filter after a read");
             } catch (EOFException eof) {
-                Assert.fail("Should not reach end-of-file", eof);
+                Assertions.fail("Should not reach end-of-file", eof);
             }
         }
     }
@@ -362,12 +357,13 @@ public class SerialFilterTest implements Serializable {
      * that the callback to the filter includes the proper array length.
      * @throws IOException if an error occurs
      */
-    @Test(dataProvider="Arrays")
+    @ParameterizedTest
+    @MethodSource("arrays")
     void testReadResolveToArray(Object array, int length) throws IOException {
         ReadResolveToArray object = new ReadResolveToArray(array, length);
         byte[] bytes = writeObjects(object);
         Object o = validate(bytes, object);    // the object is its own filter
-        Assert.assertEquals(o.getClass(), array.getClass(), "Filter not called with the array");
+        Assertions.assertEquals(array.getClass(), o.getClass(), "Filter not called with the array");
     }
 
 
@@ -379,18 +375,17 @@ public class SerialFilterTest implements Serializable {
      * @param name the name of the limit to test
      * @param value a test value
      */
-    @Test(dataProvider="Limits")
+    @ParameterizedTest
+    @MethodSource("limits")
     void testLimits(String name, long value) {
         Class<?> arrayClass = new int[0].getClass();
         String pattern = String.format("%s=%d;%s=%d", name, value, name, value - 1);
         ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(pattern);
-        Assert.assertEquals(
+        Assertions.assertEquals(ObjectInputFilter.Status.REJECTED,
                 filter.checkInput(new FilterValues(arrayClass, value, value, value, value)),
-                ObjectInputFilter.Status.REJECTED,
                 "last limit value not used: " + filter);
-        Assert.assertEquals(
+        Assertions.assertEquals(ObjectInputFilter.Status.UNDECIDED,
                 filter.checkInput(new FilterValues(arrayClass, value-1, value-1, value-1, value-1)),
-                ObjectInputFilter.Status.UNDECIDED,
                 "last limit value not used: " + filter);
     }
 
@@ -399,46 +394,36 @@ public class SerialFilterTest implements Serializable {
      * Construct a filter with the limit, it should throw IllegalArgumentException.
      * @param pattern a pattern to test
      */
-    @Test(dataProvider="InvalidLimits", expectedExceptions=java.lang.IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("invalidLimits")
     void testInvalidLimits(String pattern) {
-        try {
-            ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(pattern);
-        } catch (IllegalArgumentException iae) {
-            System.out.printf("    success exception: %s%n", iae);
-            throw iae;
-        }
+        var iae = Assertions.assertThrows(IllegalArgumentException.class,
+                () -> ObjectInputFilter.Config.createFilter(pattern));
+        System.err.printf("    success exception: %s%n", iae);
     }
 
     /**
      * Test that returning null from a filter causes deserialization to fail.
      */
-    @Test(expectedExceptions=InvalidClassException.class)
+    @Test
     void testNullStatus() throws IOException {
-        byte[] bytes = writeObjects(0); // an Integer
-        try {
-            Object o = validate(bytes, new ObjectInputFilter() {
-                public ObjectInputFilter.Status checkInput(ObjectInputFilter.FilterInfo f) {
-                    return null;
-                }
-            });
-        } catch (InvalidClassException ice) {
-            System.out.printf("    success exception: %s%n", ice);
-            throw ice;
-        }
+        var ice = Assertions.assertThrows(InvalidClassException.class, () -> {
+            byte[] bytes = writeObjects(0); // an Integer
+            validate(bytes, f -> null);
+        });
+        System.err.printf("    success exception: %s%n", ice);
     }
 
     /**
      * Verify that malformed patterns throw IAE.
      * @param pattern pattern from the data source
      */
-    @Test(dataProvider="InvalidPatterns", expectedExceptions=IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("invalidPatterns")
     void testInvalidPatterns(String pattern) {
-        try {
-            ObjectInputFilter.Config.createFilter(pattern);
-        } catch (IllegalArgumentException iae) {
-            System.out.printf("    success exception: %s%n", iae);
-            throw iae;
-        }
+        var iae = Assertions.assertThrows(IllegalArgumentException.class,
+                () -> ObjectInputFilter.Config.createFilter(pattern));
+        System.err.printf("    success exception: %s%n", iae);
     }
 
     /**
@@ -447,10 +432,10 @@ public class SerialFilterTest implements Serializable {
     @Test()
     void testEmptyPattern() {
         ObjectInputFilter filter = ObjectInputFilter.Config.createFilter("");
-        Assert.assertNull(filter, "empty pattern did not return null");
+        Assertions.assertNull(filter, "empty pattern did not return null");
 
         filter = ObjectInputFilter.Config.createFilter(";;;;");
-        Assert.assertNull(filter, "pattern with only delimiters did not return null");
+        Assertions.assertNull(filter, "pattern with only delimiters did not return null");
     }
 
     /**
@@ -472,7 +457,7 @@ public class SerialFilterTest implements Serializable {
         } catch (EOFException eof) {
             // normal completion
         } catch (ClassNotFoundException cnf) {
-            Assert.fail("Deserializing", cnf);
+            Assertions.fail("Deserializing", cnf);
         }
         return null;
     }
@@ -514,7 +499,7 @@ public class SerialFilterTest implements Serializable {
         @Override
         public ObjectInputFilter.Status checkInput(FilterInfo filter) {
             Class<?> serialClass = filter.serialClass();
-            System.out.printf("     checkInput: class: %s, arrayLen: %d, refs: %d, depth: %d, bytes; %d%n",
+            System.err.printf("     checkInput: class: %s, arrayLen: %d, refs: %d, depth: %d, bytes; %d%n",
                     serialClass, filter.arrayLength(), filter.references(),
                     filter.depth(), filter.streamBytes());
             count++;
@@ -561,13 +546,13 @@ public class SerialFilterTest implements Serializable {
             byte[] bytes = SerialFilterTest.writeObjects(object);
             ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(pattern);
             validate(bytes, filter);
-            Assert.assertTrue(allowed, "filter should have thrown an exception");
+            Assertions.assertTrue(allowed, "filter should have thrown an exception");
         } catch (IllegalArgumentException iae) {
-            Assert.fail("bad format pattern", iae);
+            Assertions.fail("bad format pattern", iae);
         } catch (InvalidClassException ice) {
-            Assert.assertFalse(allowed, "filter should not have thrown an exception: " + ice);
+            Assertions.assertFalse(allowed, "filter should not have thrown an exception: " + ice);
         } catch (IOException ioe) {
-            Assert.fail("Unexpected IOException", ioe);
+            Assertions.fail("Unexpected IOException", ioe);
         }
     }
 
@@ -578,12 +563,12 @@ public class SerialFilterTest implements Serializable {
      */
     static void evalPattern(String pattern, TriConsumer<String, Object, Boolean> action) {
         Object o = genTestObject(pattern, true);
-        Assert.assertNotNull(o, "success generation failed");
+        Assertions.assertNotNull(o, "success generation failed");
         action.accept(pattern, o, true);
 
         // Test the negative pattern
         o = genTestObject(pattern, false);
-        Assert.assertNotNull(o, "fail generation failed");
+        Assertions.assertNotNull(o, "fail generation failed");
         String negPattern = pattern.contains("=") ? pattern : "!" + pattern;
         action.accept(negPattern, o, false);
     }
@@ -616,12 +601,12 @@ public class SerialFilterTest implements Serializable {
                 Constructor<?> cons = clazz.getConstructor();
                 return cons.newInstance();
             } catch (ClassNotFoundException ex) {
-                Assert.fail("no such class available: " + pattern);
+                Assertions.fail("no such class available: " + pattern);
             } catch (InvocationTargetException
                     | NoSuchMethodException
                     | InstantiationException
                     | IllegalAccessException ex1) {
-                Assert.fail("newInstance: " + ex1);
+                Assertions.fail("newInstance: " + ex1);
             }
         }
         return null;
@@ -661,7 +646,7 @@ public class SerialFilterTest implements Serializable {
                 return new Hashtable<String, String>();
             }
         }
-        Assert.fail("Object could not be generated for pattern: "
+        Assertions.fail("Object could not be generated for pattern: "
                 + pattern
                 + ", allowed: " + allowed);
         return null;
@@ -677,7 +662,7 @@ public class SerialFilterTest implements Serializable {
      */
     static Object genTestLimit(String pattern, boolean allowed) {
         int ndx = pattern.indexOf('=');
-        Assert.assertNotEquals(ndx, -1, "missing value in limit");
+        Assertions.assertNotEquals(-1, ndx, "missing value in limit");
         long value = Long.parseUnsignedLong(pattern.substring(ndx+1));
         if (pattern.startsWith("maxdepth=")) {
             // Return an object with the requested depth (or 1 greater)
@@ -703,7 +688,7 @@ public class SerialFilterTest implements Serializable {
         } else if (pattern.startsWith("maxarray=")) {
                 return allowed ? new int[(int)value] : new int[(int)value+1];
         }
-        Assert.fail("Object could not be generated for pattern: "
+        Assertions.fail("Object could not be generated for pattern: "
                 + pattern
                 + ", allowed: " + allowed);
         return null;
@@ -736,7 +721,7 @@ public class SerialFilterTest implements Serializable {
                 os.flush();
                 actualSize = baos.size();
             } catch (IOException ie) {
-                Assert.fail("exception generating stream", ie);
+                Assertions.fail("exception generating stream", ie);
             }
         } while (actualSize != desiredSize);
         return holder;
diff --git a/test/jdk/java/lang/Math/HyperbolicTests.java b/test/jdk/java/lang/Math/HyperbolicTests.java
index 4534396ee06..ac5526c1953 100644
--- a/test/jdk/java/lang/Math/HyperbolicTests.java
+++ b/test/jdk/java/lang/Math/HyperbolicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @build Tests
  * @build HyperbolicTests
  * @run main HyperbolicTests
- * @summary Tests for {Math, StrictMath}.{sinh, cosh, tanh}
+ * @summary Tests for {Math, StrictMath}.{sinh, cosh, tanh, asinh, acosh, atanh}
  */
 
 import static java.lang.Double.longBitsToDouble;
@@ -43,6 +43,9 @@ public class HyperbolicTests {
         failures += testSinh();
         failures += testCosh();
         failures += testTanh();
+        failures += testAsinh();
+        failures += testAcosh();
+        failures += testAtanh();
 
         if (failures > 0) {
             System.err.println("Testing the hyperbolic functions incurred "
@@ -1390,4 +1393,1096 @@ public class HyperbolicTests {
         failures += Tests.testUlpDiffWithAbsBound("StrictMath.tanh", -input, StrictMath::tanh, -expected, ulps, 1.0);
         return failures;
     }
+
+    /**
+     * Test accuracy of {Math, StrictMath}.asinh.  The specified
+     * accuracy is 2.5 ulps.
+     *
+     * The defintion of asinh(x) is
+     *
+     * asinh(sinh(x)) = x
+     *
+     * Can be also written as
+     *
+     * asinh(x) = ln(x + sqrt(x*x + 1))
+     *
+     * The series expansion of asinh(x) =
+     *
+     * x - x^3/6 + 3x^5/40 - 15x^7/336 + ...
+     *
+     * Therefore,
+     *
+     * 1. For small values of x, asinh(x) ~= x.
+     *
+     * Additionally, asinh is an odd function; asinh(-x) = -asinh(x).
+     *
+     */
+    static int testAsinh() {
+        int failures = 0;
+        /*
+         * Array elements below generated using a quad asinh
+         * implementation.  Rounded to a double, the quad result
+         * *should* be correctly rounded, unless we are quite unlucky.
+         * Assuming the quad value is a correctly rounded double, the
+         * allowed error is 3.0 ulps instead of 2.5 since the quad
+         * value rounded to double can have its own 1/2 ulp error.
+         */
+        double [][] testCases = {
+                // x                                              asinh(x)
+                {+8.08576586004706676646947016706690192e+00    , +2.78705446940175084037519072068240843e+00    },
+                {+5.71198448718283557923314219806343317e+00    , +2.44328951112537869179362382769224610e+00    },
+                {+5.13969133196956207143557548988610506e+00    , +2.33947242588811531576718987896918712e+00    },
+                {+2.95996078504353032911922127823345363e+00    , +1.80570832446450945675615676944433187e+00    },
+                {+4.16200980791957864113328469102270901e+00    , +2.13327472868053919998765640756092875e+00    },
+                {+3.69545071772785460595400763850193471e+00    , +2.01807302682646291458685219028816252e+00    },
+                {+1.37724078256330018099617973348358646e+00    , +1.12468193910119796648577714130477538e+00    },
+                {+8.42544369040329677034151245607063174e+00    , +2.82790657643842246518401899587920414e+00    },
+                {+3.91229039061375782893037467147223651e+00    , +2.07321736531667549827684130235156669e+00    },
+                {+5.73782778462038400846267904853448272e+00    , +2.44773637486997939825874893068408245e+00    },
+                {+4.99855755102017340618658636230975389e+00    , +2.31215541451092776291779112133540281e+00    },
+                {+8.10100320171622989562365546589717269e+00    , +2.78892295229049846951081695322303143e+00    },
+                {+6.40711498894297992734436775208450854e+00    , +2.55659134739804960225496541857063844e+00    },
+                {+4.25639664782793492037171745323576033e+00    , +2.15509221067754853744881157535735520e+00    },
+                {+2.65061122655180847473843641637358814e+00    , +1.70175906719364776650786532519668576e+00    },
+                {+3.14233404262031967846269253641366959e+00    , +1.86252059324271515969573278167449533e+00    },
+                {+9.13083295141416328988270834088325500e+00    , +2.90778930976529177537743330080053959e+00    },
+                {+9.34996922888940673601609887555241585e+00    , +2.93136773795688457445658002134152253e+00    },
+                {+9.35132773574746245515143527882173657e+00    , +2.93151219897178112284587212807769745e+00    },
+                {+1.47453686867873412502660812606336549e+00    , +1.18055530917929730380021873702412893e+00    },
+                {+2.93708318858647077220780374773312360e+00    , +1.79836038745797816082436481350298220e+00    },
+                {+4.09105467685985679793247982161119580e+00    , +2.11656320434131763040467250984368994e+00    },
+                {+4.65121160775030162426446622703224421e+00    , +2.24163561547669988062740649953739512e+00    },
+                {+8.83128600332669755346159945474937558e+00    , +2.87463799399744068863572725409458990e+00    },
+                {+1.66240543263013162977870251779677346e+00    , +1.28160121300334421559587040333022048e+00    },
+                {+4.58372145493984728403802364482544363e+00    , +2.22735027800562207352532152241704895e+00    },
+                {+8.50271775332108248335316602606326342e+00    , +2.83697322459569158510957272430255446e+00    },
+                {+8.82962635800362249938189052045345306e+00    , +2.87445124207064977822740131999732509e+00    },
+                {+8.84552264926561093716372852213680744e+00    , +2.87623855339831018046947582541398439e+00    },
+                {+3.12516324361785047258877057174686342e+00    , +1.85730059825198435603813107760370448e+00    },
+                {+8.26480987017928114823916985187679529e+00    , +2.80879391905067271939218423695889677e+00    },
+                {+9.68117403887023186825899756513535976e+00    , +2.96598712423961990106836581021055404e+00    },
+                {+3.05372997660021550103692788979969919e+00    , +1.83530180662998049991392377010746750e+00    },
+                {+4.40157829954937795946534606628119946e+00    , +2.18777148553475610871290743261274356e+00    },
+                {+6.88055177977352627749496605247259140e+00    , +2.62708540897893209827881652490154282e+00    },
+                {+5.98475681846005524988640900119207799e+00    , +2.48927078678959642161006322827411013e+00    },
+                {+8.92994029487849694248779996996745467e+00    , +2.88567728733406656162446662917506943e+00    },
+                {+3.12419716639021327608816136489622295e+00    , +1.85700613402604977963039277274730202e+00    },
+                {+7.51161063055123179310612613335251808e+00    , +2.71399864345854847918135863803957037e+00    },
+                {+1.17944590788822001314883891609497368e+00    , +1.00274792631001937429660854217557106e+00    },
+                {+1.36421200272156672994583459512796253e+00    , +1.11700316010328101318941761315262905e+00    },
+                {+6.88888479910741580169997178018093109e+00    , +2.62828320452398770553274423944254222e+00    },
+                {+3.64699814082431839068476620013825595e+00    , +2.00533888971591775569462526134655508e+00    },
+                {+1.41057156993997545590957543026888743e+00    , +1.14411132290221221244416446367286189e+00    },
+                {+6.14945472638136703125155690941028297e+00    , +2.51605697935151660544323868421618014e+00    },
+                {+6.02996213994895136067952989833429456e+00    , +2.49669366977555745163814756818745494e+00    },
+                {+9.65271660518461160904735152143985033e+00    , +2.96305895992701909105343212587439308e+00    },
+                {+3.48339981002946785793028539046645164e+00    , +1.96115002199047863383320140967526859e+00    },
+                {+6.07995920803143352628694628947414458e+00    , +2.50484056235894688250578712446408489e+00    },
+                {+6.00204567486939666309808671940118074e+00    , +2.49211610375224051369293822349155577e+00    },
+                {+1.38833519546032624347731143643613905e+00    , +1.13118326188543957732445742827584178e+00    },
+                {+4.52480967383013776839106867555528879e+00    , +2.21471559269073802833304398595496088e+00    },
+                {+6.11810275538071746126433936296962202e+00    , +2.51101220932060589427300910397289711e+00    },
+                {+7.50648056792778461954185331705957651e+00    , +2.71332143777867740825109248925661428e+00    },
+                {+4.89658239129396388733539424720220268e+00    , +2.29195213807282224382341089459270833e+00    },
+                {+2.79265817118974496446881516931171063e-02    , +2.79229530231546570990366385479747555e-02    },
+                {+9.69315108025863381158160336781293154e+00    , +2.96721697176250274577477693915618144e+00    },
+                {+7.83910637998812109827895255875773728e+00    , +2.75631566551255789285879320458504177e+00    },
+                {+2.76576984498692324265789466153364629e+00    , +1.74165321687466923031477628544545184e+00    },
+                {+4.99754435738235347486124737770296633e+00    , +2.31195663638515281361584735869808938e+00    },
+                {+4.88922334987356776991873630322515965e+00    , +2.29047857490944287858591282873426921e+00    },
+                {+2.78689754339832429508305722265504301e+00    , +1.74881289991707628903792141369254180e+00    },
+                {+7.20931795462930935514123120810836554e+00    , +2.67329726418547732793921189411944602e+00    },
+                {+8.33063517511005890980868571205064654e+00    , +2.81666990685356361031034871477442414e+00    },
+                {+3.61188437237348836106320959515869617e+00    , +1.99601167970722876532263572785839092e+00    },
+                {+5.32263649620131218398455530405044556e+00    , +2.37382580077770566473979021057511520e+00    },
+                {+8.00366962656528002639788610395044088e+00    , +2.77692733912554343763823757722995583e+00    },
+                {+4.59751681469834139193153532687574625e+00    , +2.23028654083102682106197643909523811e+00    },
+                {+8.20253764279967612083055428229272366e+00    , +2.80128593985583624900402694440723735e+00    },
+                {+8.81590969774593169461240904638543725e+00    , +2.87290644386803298326256037256286587e+00    },
+                {+9.00323408655057377814046049024909735e+00    , +2.89380106762776953348709842638973283e+00    },
+                {+7.21533058010746941590696224011480808e+00    , +2.67412302459536699184126235350224069e+00    },
+                {+8.23695914498319758934030687669292092e+00    , +2.80544295419888555964661400747277886e+00    },
+                {+9.66912482942344198022510681767016649e+00    , +2.96474834621717039972248353595994898e+00    },
+                {+3.17602315814959101913927952409721911e+00    , +1.87268737666193382172385150977422494e+00    },
+                {+6.90930101488594594627556944033131003e+00    , +2.63121186253032074408677485367709385e+00    },
+                {+6.52386312488162189993090578354895115e+00    , +2.57443674633460769002260368508028529e+00    },
+                {+8.33701897902340283152966549096163362e-01    , +7.58769250678348128717944053061372995e-01    },
+                {+1.84073794668312284983358040335588157e+00    , +1.37005541332928719568137972151743439e+00    },
+                {+3.74278586498477183752697783347684890e+00    , +2.03036413719335448282150464654423886e+00    },
+                {+1.24005876679504356552286026271758601e+00    , +1.04136768247874493368196676622778561e+00    },
+                {+5.46039591734140294931876269401982427e+00    , +2.39894972726732001224686289699275119e+00    },
+                {+2.05576175637293001585703677847050130e+00    , +1.46829835554351749799178251325101620e+00    },
+                {+8.14075272140118322283797169802710414e+00    , +2.79378100004325258561034629239868920e+00    },
+                {+1.83236824312878154863426516385516152e+00    , +1.36605297794115641494849841805273118e+00    },
+                {+3.75374287549383511830569659650791436e+00    , +2.03318857169224539730556063537088565e+00    },
+                {+6.43073501869452779367009043198777363e-01    , +6.05407648939611618428355730173212664e-01    },
+                {+3.48621711345758855671306264412123710e+00    , +1.96192711264291527976588288592889484e+00    },
+                {+3.91549582965699016767757711932063103e+00    , +2.07401086477835132988304884524188567e+00    },
+                {+8.71307615958979297943187702912837267e+00    , +2.86124897639861530832907097356321837e+00    },
+                {+9.25125528837059185605085076531395316e+00    , +2.92081476128803069384228991876733421e+00    },
+                {+1.39894257949993688905365729624463711e-01    , +1.39441932379308919610017101598940231e-01    },
+                {+2.13018467023163493578863381117116660e+00    , +1.50038473636497909802939352641033551e+00    },
+                {+9.11338663647286573166184098226949573e+00    , +2.90588816775704749530976417485641794e+00    },
+                {+2.13672753800762960096903952944558114e+00    , +1.50316162138023144213989303271149548e+00    },
+                {+1.84662954052762628975870029535144567e+00    , +1.37286438673796624203424974151164008e+00    },
+                {+2.27538767726088808629469895095098764e+00    , +1.56042056675324794384613128836997008e+00    },
+                {+2.25459809157452584216230206948239356e+00    , +1.55202382694053013875493092338973536e+00    },
+                {+6.43951067826539436111943359719589353e+00    , +2.56157478187883218395455558699771338e+00    },
+                {+2.38928979360439708301555583602748811e+00    , +1.60531075239512338397498990117642106e+00    }
+        };
+
+
+        for (double [] testCase : testCases) {
+            failures += testAsinhCaseWithUlpDiff(testCase[0],
+                    testCase[1],
+                    3.0);
+        }
+
+
+
+        for (double nan : Tests.NaNs) {
+            failures += testAsinhCaseWithUlpDiff(nan, NaNd, 0);
+        }
+
+
+
+        double [][] specialTestCases = {
+                {0.0,                       0.0},
+                {-0.0,                     -0.0},
+                {Double.POSITIVE_INFINITY,  Double.POSITIVE_INFINITY},
+                {Double.NEGATIVE_INFINITY,  Double.NEGATIVE_INFINITY}
+        };
+
+
+
+        for (double [] specialTestCase : specialTestCases) {
+            failures += testAsinhCaseWithUlpDiff(specialTestCase[0],
+                    specialTestCase[1],
+                    0.0);
+        }
+
+
+
+        // For powers of 2 less than 2^(-27), the second and
+        // subsequent terms of the Taylor series expansion will get
+        // rounded away since |n-n^3| > 53, the binary precision of a
+        // double significand.
+
+        for (int i = DoubleConsts.MIN_SUB_EXPONENT; i < -27; i++) {
+            double d = Math.scalb(2.0, i);
+
+            // Result and expected are the same.
+            failures += testAsinhCaseWithUlpDiff(d, d, 3.0);
+        }
+
+        failures += testAsinhAdditionalTests();
+
+        return failures;
+    }
+
+    /**
+     * Test accuracy of {Math, StrictMath}.asinh using quad precision
+     * asinh implementation as the reference. There are additional tests.
+     * The specified accuracy is 2.5 ulps.
+     *
+     */
+    static int testAsinhAdditionalTests() {
+        int failures = 0;
+        /*
+         * Array elements below are generated using a quad precision asinh
+         * implementation (libquadmath). Rounded to a double, the quad result
+         * *should* be correctly rounded, unless we are quite unlucky.
+         * Assuming the quad value is a correctly rounded double, the
+         * allowed error is 3.0 ulps instead of 2.5 since the quad
+         * value rounded to double can have its own 1/2 ulp error.
+         */
+        double[][] testCases = {
+                // x                                              asinh(x)
+                {+9.29888520047217510822168407003118773e-03    , +9.29875119439016991620829879950089510e-03    },
+                {+8.99606577522583765460506555200481671e-03    , +8.99594443891109052619951669093253709e-03    },
+                {+1.14699795207729403345719987328266143e-03    , +1.14699770057820289010729363443748979e-03    },
+                {-7.40424146583510897623447988280531717e-03    , -7.40417381397284073003520743847398090e-03    },
+                {+5.49488608694304568602628791040842771e-03    , +5.49485843542812296005405619611903743e-03    },
+                {-2.52116366329231764847884633695684897e-03    , -2.52116099243538701654807174519941378e-03    },
+                {+8.06768422999586641564118139058336965e-03    , +8.06759671495411237747532966838824601e-03    },
+                {+9.88178277836134454081840061689945287e-03    , +9.88162196002118907735979091611455166e-03    },
+                {-9.74812907680771244256501262270830921e-03    , -9.74797469575697378811862965186905034e-03    },
+                {+1.28957646989550853144912423431378556e-03    , +1.28957611246655855199674391222106077e-03    },
+                {-3.58837408582282288427300898092653370e-03    , -3.58836638496033900344918006245058062e-03    },
+                {+4.13062959563161372078532451723731356e-03    , +4.13061784951867272487598247250853139e-03    },
+                {-2.51244549635140212301420703511212196e-03    , -2.51244285310613342444371438470610248e-03    },
+                {+9.68636675928437156091188597883956390e-03    , +9.68621529398750501339156647788267837e-03    },
+                {-5.46432162869262862125996349504930549e-03    , -5.46429443603366704988023092426655825e-03    },
+                {-1.83386276898741575058782160567716346e-03    , -1.83386174109279550088776833959567103e-03    },
+                {+4.29194713096967862819841599275605404e-03    , +4.29193395422167505495925421977757693e-03    },
+                {-9.98345193989031744197237827620483586e-03    , -9.98328610669592860197569944928865818e-03    },
+                {-2.77682511858849418590056146172173612e-03    , -2.77682155002991423153566829770018797e-03    },
+                {-9.27080565792574341765774903478813940e-03    , -9.27067286211199059124030266083673465e-03    },
+                {+2.13343832085455265001883162767626345e-03    , +2.13343670244611127381061946915639278e-03    },
+                {+1.86531796573603282640707590189776965e-03    , +1.86531688403638317794548160776476123e-03    },
+                {+7.59089952706850680519412577496041195e-03    , +7.59082662879913430594165031269929038e-03    },
+                {-7.23221864571126256404642873576449347e-03    , -7.23215560034534649276205014022842148e-03    },
+                {-4.85379569260787659124023463164121495e-03    , -4.85377663411205855718020189862812411e-03    },
+                {+2.06427745583616026325834980070794700e-03    , +2.06427598977487382238201754110142048e-03    },
+                {-9.05864273164906988466960058303811820e-03    , -9.05851884568408865775918913306811448e-03    },
+                {+8.14126659074132334736884075709895114e-03    , +8.14117665926450847350600785486541236e-03    },
+                {-1.18703607276676031956341716977476608e-03    , -1.18703579400048976745061906381442506e-03    },
+                {-3.72556727069004237073990282169688726e-03    , -3.72555865235713390047416035972567655e-03    },
+                {+3.20078632768614965153908258344017668e-03    , +3.20078086235102579132641956617880741e-03    },
+                {-3.64652695868728470018904630478573381e-03    , -3.64651887732759812624780495337361570e-03    },
+                {-4.37271109890237635181575726051050879e-03    , -4.37269716421058504020032749615645348e-03    },
+                {-4.53954699201700607319454050525564526e-03    , -4.53953140071906668014572342681250395e-03    },
+                {-7.71410922638161335174178390161614516e-03    , -7.71403272056205844933819193169521112e-03    },
+                {-4.14748385016995048391041933655287721e-03    , -4.14747195968688563991362285984749351e-03    },
+                {+2.16239643776180469336711809091866598e-03    , +2.16239475255273602474341490749538226e-03    },
+                {+1.70867505939914857138184345330955693e-04    , +1.70867505108481996929933792720554316e-04    },
+                {+4.45468038573873341412490134416657384e-03    , +4.45466565262570403928813346774794963e-03    },
+                {+5.02848450175214997659445259614585666e-04    , +5.02848428983795534702560585886961806e-04    },
+                {+3.27121347478520618778929929248988628e-03    , +3.27120764069260936386068328808026876e-03    },
+                {-3.02035237923277844612757192521712568e-03    , -3.02034778704318937598236175985252813e-03    },
+                {+1.83493544153568409471599665039320826e-03    , +1.83493441183628601773262459027151432e-03    },
+                {-3.57742891707456961425393160425301176e-03    , -3.57742128646403200576149317708586166e-03    },
+                {+4.07461518018882584701856330866576172e-04    , +4.07461506744091232910512108590665082e-04    },
+                {+8.93213245095503781401102827430804609e-03    , +8.93201368317984717551252673740071605e-03    },
+                {+4.83633433470810093768310622408534982e-03    , +4.83631548115857258701091393657125083e-03    },
+                {+4.41941080408745669283465673515820527e-03    , +4.41939641815384450220145838057678415e-03    },
+                {-7.40905574125878471636319488879962591e-03    , -7.40898795735011644277922058251845971e-03    },
+                {+5.86417821400006013254913028731607483e-03    , +5.86414460438723375893640532030031887e-03    },
+                {+6.40143962390532852979596611930901418e-04    , +6.40143918670384118303282950462728667e-04    },
+                {-6.62414482978957927516994175221043406e-03    , -6.62409638694556116425732364897473820e-03    },
+                {+2.32034013904017406837443360245742952e-03    , +2.32033805693503550464566970496041304e-03    },
+                {-1.70037238711657177903102677873903303e-03    , -1.70037156774608724006177273975196346e-03    },
+                {-2.41007559448008345376335270771051000e-03    , -2.41007326134647811152942503146226815e-03    },
+                {-4.88371906557288470301925187300184916e-03    , -4.88369965241849364892773140816442366e-03    },
+                {+5.45353417327115556900718473798406194e-03    , +5.45350714134116714399404074418610335e-03    },
+                {+1.82127472834406854695910027430727496e-03    , +1.82127372147155402291508536733347481e-03    },
+                {+3.08464771244317328968698177504847990e-03    , +3.08464282070047297125571891308421168e-03    },
+                {+8.64099586698139320029010690404902562e-03    , +8.64088833799551442516038310825829002e-03    },
+                {+5.55586600363066999974659410099775414e-03    , +5.55583742127587993316327594170344732e-03    },
+                {+8.72688321697448303460031837630594964e-03    , +8.72677244972821936872995155020997092e-03    },
+                {+8.67310115846320860144569309113649069e-03    , +8.67299242648623772707657889109267822e-03    },
+                {-6.14210531791088872044515056813906995e-03    , -6.14206669961072319996743834488437463e-03    },
+                {+8.88625749891074935560286718327915878e-03    , +8.88614055166480866111859091126682642e-03    },
+                {-1.43504119833010382323301712403917918e-03    , -1.43504070579016156191011766070535043e-03    },
+                {+8.88630021979499445938799340183322784e-04    , +8.88629905026452701546356648558325925e-04    },
+                {+3.93780142608554303840229238176107174e-03    , +3.93779124938125782164719425287579139e-03    },
+                {+5.97434710953371854447180311353804427e-03    , +5.97431156988517485964304752157241804e-03    },
+                {-7.98875566707221360096546902695990866e-03    , -7.98867069549231529699110336543851522e-03    },
+                {-7.35260998042218307663153709086145682e-03    , -7.35254373394740372183361138755444401e-03    },
+                {-1.21452151194481779150624589647122775e-03    , -1.21452121336249242914680975845323467e-03    },
+                {+4.98481949753720385287714123023761204e-04    , +4.98481929109570105039386663388380124e-04    },
+                {+4.91985816350236880578616904813316069e-03    , +4.91983831618717601288972307767102048e-03    },
+                {+7.68796449908712258014542584305672790e-03    , +7.68788876850302034489862036714171394e-03    },
+                {-1.49188964399755812084702455422302592e-03    , -1.49188909057301843050666760106824645e-03    },
+                {-6.73163270527497858974896871586679481e-03    , -6.73158186579155909561057079482268382e-03    },
+                {+8.73326787816911150053034162965559517e-03    , +8.73315686763575988088834491175495305e-03    },
+                {+7.81885100909627574206073319373899722e-03    , +7.81877134445315065535398733750043537e-03    },
+                {+5.17883696377165365920536288513176260e-03    , +5.17881381434573686588090532152532759e-03    },
+                {+5.94443020139156542980263253639350296e-03    , +5.94439519296920978949883610708856872e-03    },
+                {+6.20408692607689153664107806207539397e-03    , +6.20404712683039987243003869674263039e-03    },
+                {-4.13924636982772493898341537033047643e-03    , -4.13923455005213957426577773895357676e-03    },
+                {-3.71140287747976152510354097557865316e-03    , -3.71139435707241790669973810798603847e-03    },
+                {-8.37941685260259506995428324671593145e-03    , -8.37931879609631048090526043629803007e-03    },
+                {+8.48517293301665094518160259440264781e-03    , +8.48507111684271940482025173385456325e-03    },
+                {+8.52827781082153742187035305732933921e-03    , +8.52817443510010657036791986083451790e-03    },
+                {-4.07416024108964158756407414330169559e-03    , -4.07414897015777394146227881635448891e-03    },
+                {+4.33240979016216026797891913702187594e-03    , +4.33239623721743479728849041379241354e-03    },
+                {-4.89052581083683143847729013486969052e-04    , -4.89052561589036445343259711601066150e-04    },
+                {-9.62974650385375885441874288517283276e-05    , -9.62974648897066185792218187524452666e-05    },
+                {-9.26529020589744040092838872624270152e-04    , -9.26528888025725086174151901318195528e-04    },
+                {+1.39965317129459553002757132844635635e-03    , +1.39965271430147299997462291249440004e-03    },
+                {-7.12079193844885119379917171045235591e-03    , -7.12073176239158986696262840488189056e-03    },
+                {-3.62621830991397085114380516301935131e-03    , -3.62621036282602413990843595245483708e-03    },
+                {-7.11170226471406416446363607519742800e-03    , -7.11164231880305326913177834599584014e-03    },
+                {-1.07788116725225993630665755063091638e-04    , -1.07788116516507275261580974984359313e-04    },
+                {-2.51343271020868386927960003163207148e-03    , -2.51343006384636979438035563375611134e-03    },
+                {-9.70989675056706420808172453007500735e-03    , -9.70974417880563379443605277365308469e-03    },
+                {+7.17488567146307328059595675995296915e-03    , +7.17482411358449384368065167506580475e-03    }
+        };
+
+        for (int i = 0; i < testCases.length; i++) {
+            double[] testCase = testCases[i];
+            failures += testAsinhCaseWithUlpDiff(testCase[0],
+                    testCase[1],
+                    3.0);
+        }
+
+        return failures;
+    }
+
+    public static int testAsinhCaseWithTolerance(double input,
+                                                double expected,
+                                                double tolerance) {
+        int failures = 0;
+        failures += Tests.testTolerance("Math.asinh",       input, Math::asinh,         expected, tolerance);
+        failures += Tests.testTolerance("Math.asinh",      -input, Math::asinh,        -expected, tolerance);
+
+        failures += Tests.testTolerance("StrictMath.asinh",  input, StrictMath::asinh,  expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.asinh", -input, StrictMath::asinh, -expected, tolerance);
+        return failures;
+    }
+
+    public static int testAsinhCaseWithUlpDiff(double input,
+                                              double expected,
+                                              double ulps) {
+        int failures = 0;
+
+        failures += Tests.testUlpDiffWithAbsBound("Math.asinh",       input,  Math::asinh,       expected, ulps, Double.POSITIVE_INFINITY);
+        failures += Tests.testUlpDiffWithAbsBound("Math.asinh",      -input,  Math::asinh,      -expected, ulps, Double.NEGATIVE_INFINITY);
+
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.asinh",  input, StrictMath::asinh,  expected, ulps, Double.POSITIVE_INFINITY);
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.asinh", -input, StrictMath::asinh, -expected, ulps, Double.NEGATIVE_INFINITY);
+        return failures;
+    }
+
+    /**
+     * Test accuracy of {Math, StrictMath}.acosh.  The specified
+     * accuracy is 2.5 ulps.
+     *
+     * The defintion of acosh(x) is
+     *
+     * acosh(cosh(x)) = x
+     *
+     * Can be also written as
+     *
+     * acosh(x) = ln(x + sqrt(x * x - 1))
+     *
+     * The series expansion of acosh(x) =
+     *
+     * ln(2 * x) - (x^-2 / 4 + 3 * x^-4 / 32 + 15 * x^-6 / 288 ...)
+     *
+     * Therefore,
+     *
+     * 1. acosh(1) = 0.
+     *
+     * 2. The domain is x >= 1.
+     *
+     * 3. The function is neither odd nor even.
+     *
+     */
+    static int testAcosh() {
+        int failures = 0;
+        /*
+         * Array elements below generated using a quad acosh
+         * implementation.  Rounded to a double, the quad result
+         * *should* be correctly rounded, unless we are quite unlucky.
+         * Assuming the quad value is a correctly rounded double, the
+         * allowed error is 3.0 ulps instead of 2.5 since the quad
+         * value rounded to double can have its own 1/2 ulp error.
+         */
+        double [][] testCases = {
+                // x     acosh(x)
+                {1.0000, +0.00000000000000000000000000000000000e+00    },
+                {1.0625, +3.51737390043260579770744786121122844e-01    },
+                {1.1250, +4.94932923094526905889563099576718556e-01    },
+                {1.1875, +6.03186598686334413155297365190676416e-01    },
+                {1.2500, +6.93147180559945309417232121458176575e-01    },
+                {1.3125, +7.71307459173256653700937951825817144e-01    },
+                {1.3750, +8.41019322011445738489485196126304665e-01    },
+                {1.4375, +9.04286762705515769042139988689583282e-01    },
+                {1.5000, +9.62423650119206894995517826848736845e-01    },
+                {1.5625, +1.01634809667840380541358127166594224e+00    },
+                {1.6250, +1.06673243190143557362309154628644597e+00    },
+                {1.6875, +1.11408700135293645158376433073169476e+00    },
+                {1.7500, +1.15881036042994681173087299087873020e+00    },
+                {1.8125, +1.20122101997969472087682270695675759e+00    },
+                {1.8750, +1.24157842330772117651284669611837885e+00    },
+                {1.9375, +1.28009731675807455651225000558265526e+00    },
+                {2.0000, +1.31695789692481670862504634730796848e+00    },
+                {2.0625, +1.35231316261931093541047819670045078e+00    },
+                {2.1250, +1.38629436111989061883446424291635315e+00    },
+                {2.1875, +1.41901510140371506613255066437684651e+00    },
+                {2.2500, +1.45057451382258020872826178236677635e+00    },
+                {2.3125, +1.48105971405608381331792780208719133e+00    },
+                {2.3750, +1.51054775047320739150161777699985299e+00    },
+                {2.4375, +1.53910716184424377297903295285722198e+00    },
+                {2.5000, +1.56679923697241107866405686258048358e+00    },
+                {2.5625, +1.59367904336440765353731339657532894e+00    },
+                {2.6250, +1.61979627485649999465013597110633349e+00    },
+                {2.6875, +1.64519595581279452177517379518794699e+00    },
+                {2.7500, +1.66991903058776998677838891147712239e+00    },
+                {2.8125, +1.69400286038199600062127876942753998e+00    },
+                {2.8750, +1.71748164473336519458386901818676709e+00    },
+                {2.9375, +1.74038678120611400701568860843885133e+00    },
+                {3.0000, +1.76274717403908605046521864995958460e+00    },
+                {3.0625, +1.78458950036205246630242932084698860e+00    },
+                {3.1250, +1.80593844091928647006641838950547765e+00    },
+                {3.1875, +1.82681688093354809536648865402886324e+00    },
+                {3.2500, +1.84724608571383784130004129627716938e+00    },
+                {3.3125, +1.86724585479221893347421970944127165e+00    },
+                {3.3750, +1.88683465772058517690549455261749833e+00    },
+                {3.4375, +1.90602975413127236084850555002346490e+00    },
+                {3.5000, +1.92484730023841378999103565369747369e+00    },
+                {3.5625, +1.94330244360892107348697778473632964e+00    },
+                {3.6250, +1.96140940774674480423275041043129955e+00    },
+                {3.6875, +1.97918156779907568924375778194574535e+00    },
+                {3.7500, +1.99663151849857170393899871209510294e+00    },
+                {3.8125, +2.01377113529382496280930762219993708e+00    },
+                {3.8750, +2.03061162948500957172739654092925159e+00    },
+                {3.9375, +2.04716359806812267677620352283230977e+00    },
+                {4.0000, +2.06343706889556054672728117262013178e+00    },
+                {4.0625, +2.07944154167983592825169636437452953e+00    },
+                {4.1250, +2.09518602529851747179664246793750599e+00    },
+                {4.1875, +2.11067907179990670152964344211957784e+00    },
+                {4.2500, +2.12592880745889053593506179143141713e+00    },
+                {4.3125, +2.14094296118944770996055814756135545e+00    },
+                {4.3750, +2.15572889058331846311473049052403906e+00    },
+                {4.4375, +2.17029360581243752070499251797833202e+00    },
+                {4.5000, +2.18464379160510872667627813307212784e+00    },
+                {4.5625, +2.19878582748192321247116242073983256e+00    },
+                {4.6250, +2.21272580641655511554559532685274022e+00    },
+                {4.6875, +2.22646955206835990390469193746457694e+00    },
+                {4.7500, +2.24002263471777221819301091423172581e+00    },
+                {4.8125, +2.25339038602153389445857144762743321e+00    },
+                {4.8750, +2.26657791269250866199452039018610592e+00    },
+                {4.9375, +2.27959010919802897270925407255393153e+00    },
+                {5.0000, +2.29243166956117768780078731134801529e+00    },
+                {5.0625, +2.30510709834096668441430402487399027e+00    },
+                {5.1250, +2.31762072085989362346174598175746039e+00    },
+                {5.1875, +2.32997669274071514661824152082627607e+00    },
+                {5.2500, +2.34217900880836474718960439585388779e+00    },
+                {5.3125, +2.35423151140767607019354831300009086e+00    },
+                {5.3750, +2.36613789818286932753788120137389157e+00    },
+                {5.4375, +2.37790172936055222645518871553565388e+00    },
+                {5.5000, +2.38952643457421860822386165703818122e+00    },
+                {5.5625, +2.40101531926484683717268315699636478e+00    },
+                {5.6250, +2.41237157068916138816151585667001780e+00    },
+                {5.6875, +2.42359826356438621752612199535640197e+00    },
+                {5.7500, +2.43469836537585339202679859270163341e+00    },
+                {5.8125, +2.44567474137160531324234100032920604e+00    },
+                {5.8750, +2.45653015926611756205299063862500772e+00    },
+                {5.9375, +2.46726729367344889723552955806057589e+00    },
+                {6.0000, +2.47788873028847500481395074507450545e+00    },
+                {6.0625, +2.48839696983336532007430913631752335e+00    },
+                {6.1250, +2.49879443178510181484789673802222733e+00    },
+                {6.1875, +2.50908345789860105234876846349648239e+00    },
+                {6.2500, +2.51926631553887363826303725428234388e+00    },
+                {6.3125, +2.52934520083462740598919885177286592e+00    },
+                {6.3750, +2.53932224166478245066792464622248188e+00    },
+                {6.4375, +2.54919950048850872717547586051387259e+00    },
+                {6.5000, +2.55897897702861255144554182625683448e+00    },
+                {6.5625, +2.56866261081738002442374329274624674e+00    },
+                {6.6250, +2.57825228361332690085894009323471199e+00    },
+                {6.6875, +2.58774982169670016849316580209717247e+00    },
+                {6.7500, +2.59715699805102158059159611581476354e+00    },
+                {6.8125, +2.60647553443745310075195298905494613e+00    },
+                {6.8750, +2.61570710336829463210497297146055746e+00    },
+                {6.9375, +2.62485332998549187571842397668306463e+00    },
+                {7.0000, +2.63391579384963341725009269461593696e+00    },
+                {7.0625, +2.64289603064454821939888620389440586e+00    },
+                {7.1250, +2.65179553380227492960508448932353394e+00    },
+                {7.1875, +2.66061575605286038291043830648413625e+00    },
+                {7.2500, +2.66935811090315420323249076787858338e+00    },
+                {7.3125, +2.67802397404849750222123152071366765e+00    },
+                {7.3750, +2.68661468472095454727243455865687717e+00    },
+                {7.4375, +2.69513154697750528856415868272675449e+00    },
+                {7.5000, +2.70357583093140231733394963705451385e+00    },
+                {7.5625, +2.71194877392969682611305770501597479e+00    },
+                {7.6250, +2.72025158167975322903284501674667068e+00    },
+                {7.6875, +2.72848542932740015820479864569947040e+00    },
+                {7.7500, +2.73665146248920556040148045776356816e+00    },
+                {7.8125, +2.74475079824121464549309272530654441e+00    },
+                {7.8750, +2.75278452606635063332660947345292156e+00    },
+                {7.9375, +2.76075370876254883072567909046267813e+00    },
+                {8.0000, +2.76865938331357383273200140938374547e+00    },
+                {8.0625, +2.77650256172435692961336760207948251e+00    },
+                {8.1250, +2.78428423182258551535630273235901386e+00    },
+                {8.1875, +2.79200535802817788553087801705861609e+00    },
+                {8.2500, +2.79966688209218477865004528925200022e+00    },
+                {8.3125, +2.80726972380657289240925980113428074e+00    },
+                {8.3750, +2.81481478168626496869015857854363587e+00    },
+                {8.4375, +2.82230293362473549711106510083524230e+00    },
+                {8.5000, +2.82973503752439027536610108611637391e+00    },
+                {8.5625, +2.83711193190289165307916749543060640e+00    },
+                {8.6250, +2.84443443647652896774770544175385075e+00    },
+                {8.6875, +2.85170335272167517356988163822694873e+00    },
+                {8.7500, +2.85891946441531570520913194770155741e+00    },
+                {8.8125, +2.86608353815558396737111566993889866e+00    },
+                {8.8750, +2.87319632386318927416511462539646535e+00    },
+                {8.9375, +2.88025855526457737300290165271813925e+00    },
+                {9.0000, +2.88727095035762068498655348054621044e+00    },
+                {9.0625, +2.89423421186059490016531823326821096e+00    },
+                {9.1250, +2.90114902764516041745652356473355270e+00    },
+                {9.1875, +2.90801607115403116308966232802812480e+00    },
+                {9.2500, +2.91483600180397941677005500735563642e+00    },
+                {9.3125, +2.92160946537479329008903038647778851e+00    },
+                {9.3750, +2.92833709438477331505751565470704144e+00    },
+                {9.4375, +2.93501950845332609861824133070706912e+00    },
+                {9.5000, +2.94165731465118607612817277397561825e+00    },
+                {9.5625, +2.94825110783877095494122437627939968e+00    },
+                {9.6250, +2.95480147099315238696389016790268450e+00    },
+                {9.6875, +2.96130897552410066125326263536732120e+00    },
+                {9.7500, +2.96777418157964068500790378422486329e+00    },
+                {9.8125, +2.97419763834153614964672155497739057e+00    },
+                {9.8750, +2.98057988431109948901325801645778406e+00    },
+                {9.9375, +2.98692144758570696460723739938555692e+00    },
+                {10.0000, +2.99322284612638089791266771377418276e+00    },
+        };
+
+
+        for (double [] testCase : testCases) {
+            failures += testAcoshCaseWithUlpDiff(testCase[0],
+                    testCase[1],
+                    3.0);
+        }
+
+
+
+        for (double nan : Tests.NaNs) {
+            failures += testAcoshCaseWithUlpDiff(nan, NaNd, 0);
+        }
+
+
+
+        double [][] specialTestCases = {
+                {0.0,                       NaNd},
+                {-0.0,                      NaNd},
+                {1.0,                       0.0},
+                {Double.POSITIVE_INFINITY,  Double.POSITIVE_INFINITY},
+                {Double.NEGATIVE_INFINITY,  NaNd}
+        };
+
+
+
+        for (double [] specialTestCase : specialTestCases) {
+            failures += testAcoshCaseWithUlpDiff(specialTestCase[0],
+                    specialTestCase[1],
+                    0.0);
+        }
+
+
+        failures += testAcoshAdditionalTests();
+
+        return failures;
+    }
+
+    /**
+     * Test accuracy of {Math, StrictMath}.acosh using quad precision
+     * acosh implementation as the reference. There are additional tests.
+     * The specified accuracy is 2.5 ulps.
+     *
+     */
+    static int testAcoshAdditionalTests() {
+        int failures = 0;
+        /*
+         * Array elements below are generated using a quad precision acosh
+         * implementation (libquadmath). Rounded to a double, the quad result
+         * *should* be correctly rounded, unless we are quite unlucky.
+         * Assuming the quad value is a correctly rounded double, the
+         * allowed error is 3.0 ulps instead of 2.5 since the quad
+         * value rounded to double can have its own 1/2 ulp error.
+         */
+        double[][] testCases = {
+                // x                                              acosh(x)
+                {+1.40222409861373051853661308996379375e+01    , +3.33251799248457675610296187717275023e+00    },
+                {+4.64063630702987595100239559542387724e+01    , +4.53046765794427717250009108708063951e+00    },
+                {+2.26769594350354175560369185404852033e+01    , +3.81401008174403012773998497198756862e+00    },
+                {+6.82076069573278687130368780344724655e+01    , +4.91564953670154039555101045371992145e+00    },
+                {+9.35345967264471340740783489309251308e+01    , +5.23144999004817476451595194893686997e+00    },
+                {+5.24222208302520016331982333213090897e+01    , +4.65238675892723943927493345614044802e+00    },
+                {+4.42263893601989721560130419675260782e+00    , +2.16685013650055071552269762531726701e+00    },
+                {+5.34403191209646664106003299821168184e+01    , +4.67162513077968730816736013866320559e+00    },
+                {+1.76212042009831870714720025716815144e+00    , +1.16720688415256589829633745537084420e+00    },
+                {+7.61738148899418732185040425974875689e+00    , +2.71924321506064362327407359954437453e+00    },
+                {+6.89904985284954790358824538998305798e+01    , +4.92706344460967378866907640972706781e+00    },
+                {+9.31132130019995969405499636195600033e+01    , +5.22693444138174309022758439394131022e+00    },
+                {+5.31659489982307036370912101119756699e+01    , +4.66647685890886539018247877652269347e+00    },
+                {+6.57379772558717405672723543830215931e+01    , +4.87876612392399046931262815776348806e+00    },
+                {+7.04178688554184901704502408392727375e+01    , +4.94754380999195554008986754487841587e+00    },
+                {+7.64576059598647788106973166577517986e+01    , +5.02984082858162069509313975886000718e+00    },
+                {+5.69898682524488275902285749907605350e+00    , +2.42564775130097776080234839595030019e+00    },
+                {+3.34951883898407629658322548493742943e+01    , +4.20432607363489310218001177932001376e+00    },
+                {+7.58846381271260241874188068322837353e+01    , +5.02231803118503396528914607189891829e+00    },
+                {+3.71685284182660993224089907016605139e+01    , +4.30842856158112686719805147741579474e+00    },
+                {+9.82724783457824031529526109807193279e+01    , +5.28086530470046881951663865035216936e+00    },
+                {+7.55822276853527057483006501570343971e+01    , +5.01832458735915146090685859231899627e+00    },
+                {+8.19590239920287544350685493554919958e+00    , +2.79303880830104526461764198808709567e+00    },
+                {+8.85860057527683011358021758496761322e+01    , +5.17708921820009272972577332594088089e+00    },
+                {+4.42047291460483080527410493232309818e+01    , +4.48185099473614683233384262644114551e+00    },
+                {+4.82954447467224099455052055418491364e+01    , +4.57037722443775069839008053496876858e+00    },
+                {+2.82157771675713533454654680099338293e+01    , +4.03271430903366741210592839999395032e+00    },
+                {+1.74842128192706276479384541744366288e+01    , +3.55362672330870909254873232512209322e+00    },
+                {+8.98679723864892281426364206708967686e+01    , +5.19145784395917044408731940940225234e+00    },
+                {+6.99586842581785273154082460678182542e+00    , +2.63331927275597158625520354348567456e+00    },
+                {+5.09477665985264778214514080900698900e+01    , +4.62385177612510228171242777653641979e+00    },
+                {+3.25842611674598501281252538319677114e+01    , +4.17674101901473628570827854743466486e+00    },
+                {+4.99036918354616290116609889082610607e+01    , +4.60314176379122016396592518510391469e+00    },
+                {+9.98255656348235120844947232399135828e+00    , +2.99146816849131388203109739268493125e+00    },
+                {+8.30115844701927940718633180949836969e+00    , +2.80589439276611715849813780991570715e+00    },
+                {+3.90300726488373044276158907450735569e+01    , +4.35731547033614744103231173076054669e+00    },
+                {+9.14679267650316347726402455009520054e+01    , +5.20910568139874158502888666687786843e+00    },
+                {+4.69801366698952662659394263755530119e+01    , +4.54275878054294975578025810303600533e+00    },
+                {+5.95831438716205052941177200409583747e+00    , +2.47081727711668636777886134527797777e+00    },
+                {+7.72502501531925105382470064796507359e+01    , +5.04015543904862200893429166398240913e+00    },
+                {+1.34111721821950098387787875253707170e+01    , +3.28784240452352224920507313116967307e+00    },
+                {+6.91570748043642566926791914738714695e+01    , +4.92947526860125472538045310739830979e+00    },
+                {+6.33247983942767831422315794043242931e+01    , +4.84136184327272941501425426966065239e+00    },
+                {+7.28157878674183933753738529048860073e+01    , +4.98103282444372675567185179132668151e+00    },
+                {+8.89686491926590150569609249942004681e+01    , +5.18139964655774166552638928730792362e+00    },
+                {+3.13258612573789463340290240012109280e+01    , +4.13733631620326521460511053592093813e+00    },
+                {+5.18140965157089325998640561010688543e+01    , +4.64071629304849263117175976059711265e+00    },
+                {+8.47521744710507647369013284333050251e+01    , +5.13284377741645310577993893073249440e+00    },
+                {+8.43095533174532931752764852717518806e+01    , +5.12760719138905245783659501854598879e+00    },
+                {+4.21240669274286076984026294667273760e+01    , +4.43362549935510675489581351410263443e+00    },
+                {+4.73238194816935475728314486332237720e+01    , +4.55004928385543400029944037596031391e+00    },
+                {+1.86544426645817758014800347154960036e+01    , +3.61851232034069491499592508470176552e+00    },
+                {+5.75938262601410571051019360311329365e+01    , +4.74648718281138202967444216845950983e+00    },
+                {+4.27232167589609090896374254953116179e+00    , +2.13131771884641485793724599940809626e+00    },
+                {+5.03495317868001706074210233055055141e+01    , +4.61203786952239923442865869830624998e+00    },
+                {+7.50809724725515792442820384167134762e+01    , +5.01166999309632169153897035236491293e+00    },
+                {+8.91830106756043647919796057976782322e+01    , +5.18380630497515107426424373476548239e+00    },
+                {+8.43619216604083419497328577563166618e+01    , +5.12822818585720472109565051928260461e+00    },
+                {+2.20623999405381177041363116586580873e+01    , +3.78650797260310183157107999251647380e+00    },
+                {+1.39122989185065399908580729970708489e+01    , +3.32462629189603078991830801184905350e+00    },
+                {+2.81842266001629120353300095302984118e+01    , +4.03159479043564760795745665884328416e+00    },
+                {+4.20150330398823186328627343755215406e+01    , +4.43103301227168439924256715079001048e+00    },
+                {+7.12721396815986594219793914817273617e+01    , +4.95960346484961706088932387548050013e+00    },
+                {+2.47511696812483386054282163968309760e+01    , +3.90161159523447275422094662483857801e+00    },
+                {+3.24364140945400691862232633866369724e+01    , +4.17219116407069688318499622366971673e+00    },
+                {+6.55538099356552947938325814902782440e+01    , +4.87596033055444598453664902130389245e+00    },
+                {+6.84532751547124860280746361240744591e+01    , +4.91924522217897758728929410442650248e+00    },
+                {+3.93848083647737539081390423234552145e+01    , +4.36636613965538581613443666385597861e+00    },
+                {+1.56057673113820580823585260077379644e+01    , +3.43975961616459237301460093608428409e+00    },
+                {+8.47119903068781923138885758817195892e+01    , +5.13236949468185791854133268753960238e+00    },
+                {+9.55854738436600683826327440328896046e+01    , +5.25314067817929358802774910100252994e+00    },
+                {+1.56670046394655830823694486753083766e+01    , +3.44368399001615451248068997740627574e+00    },
+                {+4.14679026870443507846175634767860174e+01    , +4.41792146385299219920359657474436019e+00    },
+                {+5.69249693750823269056127173826098442e+01    , +4.73480409586514749627990327668077645e+00    },
+                {+4.93629403713561600852699484676122665e+01    , +4.59224451473128480136302652897840027e+00    },
+                {+9.61484189551490686653778539039194584e+01    , +5.25901316478560252169572160735164898e+00    },
+                {+2.07759627057374345326934417244046926e+01    , +3.72636417050318935004571518016144611e+00    },
+                {+6.32976464844313539970244164578616619e+01    , +4.84093292566853424246928339764776273e+00    },
+                {+6.54741204020067897317858296446502209e+01    , +4.87474381391982909784974793043917201e+00    },
+                {+8.05042266117176978923453134484589100e+01    , +5.08141829115959617683933639313475601e+00    },
+                {+4.81667484910552587962229154072701931e+01    , +4.56770832383321482034955903243661906e+00    },
+                {+2.11217831158012465664342016680166125e+01    , +3.74289121691996804899454065396184575e+00    },
+                {+9.02656763961261532358548720367252827e+01    , +5.19587377817524068279272963615894387e+00    },
+                {+1.50600821596306779781571094645187259e+01    , +3.40409076820438745807924396441229869e+00    },
+                {+4.16209905361957765990155166946351528e+01    , +4.42160745328229554045710868854157175e+00    },
+                {+8.86791887429291563194055925123393536e+01    , +5.17814062516654447520446624771754712e+00    },
+                {+1.70576566142218695176779874600470066e+01    , +3.52888602841986989717710320391598297e+00    },
+                {+3.71685638271143758970538328867405653e+01    , +4.30842951458236820308439636796433560e+00    },
+                {+1.43758274343816250251393284997902811e+01    , +3.35748343469042965382754422758946510e+00    },
+                {+4.60754211385189549332608294207602739e+01    , +4.52330904257767828148397295029679237e+00    },
+                {+4.57777167466274974572115752380341291e+01    , +4.51682530040123678433942314310447564e+00    },
+                {+9.32357656650976593937230063602328300e+01    , +5.22824982009254837221678766114741857e+00    },
+                {+2.23095900244694895775410259375348687e+01    , +3.79766114099573434402313460678612040e+00    },
+                {+9.09832666680431856320865335874259472e+01    , +5.20379258533493176911574496349341434e+00    },
+                {+8.62251237613208019183730357326567173e+01    , +5.15007514723643448859452771190406728e+00    },
+                {+5.10896316393437928127241320908069611e+01    , +4.62663296015956482467254446322296917e+00    },
+                {+8.19385868289117524909670464694499969e+01    , +5.09907996803279765921917143342322948e+00    },
+                {+4.67622529628467802353952720295637846e+01    , +4.53810915071314717336273606975590283e+00    },
+                {+6.36411313235143367705859418492764235e+01    , +4.84634542963631730817381276671897779e+00    },
+                {+8.26450413110590460519233602099120617e+01    , +5.10766540264697663339669119714720544e+00    },
+        };
+
+        for (double[] testCase : testCases) {
+            failures += testAcoshCaseWithUlpDiff(testCase[0],
+                    testCase[1],
+                    3.0);
+        }
+
+        return failures;
+    }
+
+    public static int testAcoshCaseWithTolerance(double input,
+                                                 double expected,
+                                                 double tolerance) {
+        int failures = 0;
+        failures += Tests.testTolerance("Math.acosh",        input, Math::acosh,         expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.acosh",  input, StrictMath::acosh,   expected, tolerance);
+        return failures;
+    }
+
+    public static int testAcoshCaseWithUlpDiff(double input,
+                                               double expected,
+                                               double ulps) {
+        int failures = 0;
+        failures += Tests.testUlpDiffWithAbsBound("Math.acosh",        input,  Math::acosh,       expected, ulps, Double.POSITIVE_INFINITY);
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.acosh",  input,  StrictMath::acosh, expected, ulps, Double.POSITIVE_INFINITY);
+        return failures;
+    }
+
+    /**
+     * Test accuracy of {Math, StrictMath}.atanh.  The specified
+     * accuracy is 2.5 ulps.
+     *
+     * The defintion of atanh(x) is
+     *
+     * atanh(tanh(x)) = x
+     *
+     * Can be also written as
+     *
+     * 0.5 * log1p(2 * x / (1-x0))
+     *
+     * Taylor expansion:
+     *
+     * x + x^3 / 3 + x^5 / 5 + ...
+     *
+     * Therefore,
+     *
+     * 1. For small values of x, tanh(x) ~= x.
+     *
+     * Additionally, atanh is an odd function; atanh(-x) = -atanh(x).
+     *
+     */
+    static int testAtanh() {
+        int failures = 0;
+        /*
+         * Array elements below generated using a quad atanh
+         * implementation.  Rounded to a double, the quad result
+         * *should* be correctly rounded, unless we are quite unlucky.
+         * Assuming the quad value is a correctly rounded double, the
+         * allowed error is 3.0 ulps instead of 2.5 since the quad
+         * value rounded to double can have its own 1/2 ulp error.
+         */
+        double [][] testCases = {
+                // x                                            atanh(x)
+                {+0.00000000000000000000000000000000000e+00    , +0.00000000000000000000000000000000000e+00    },
+                {+2.00000000000000004163336342344337027e-02    , +2.00026673068495811335374182828113576e-02    },
+                {+4.00000000000000008326672684688674053e-02    , +4.00213538367682137458906520059156020e-02    },
+                {+5.99999999999999977795539507496869192e-02    , +6.00721559210316214332906986486015264e-02    },
+                {+8.00000000000000016653345369377348106e-02    , +8.01713250375896933655527689248809233e-02    },
+                {+1.00000000000000005551115123125782702e-01    , +1.00335347731075586242913545116385118e-01    },
+                {+1.20000000000000009436895709313830594e-01    , +1.20581028408444044805093075807633198e-01    },
+                {+1.40000000000000013322676295501878485e-01    , +1.40925576070493877554736186975308236e-01    },
+                {+1.60000000000000003330669073875469621e-01    , +1.61386696131525518759511362898215609e-01    },
+                {+1.79999999999999993338661852249060757e-01    , +1.81982688600705816490251036770517457e-01    },
+                {+1.99999999999999983346654630622651894e-01    , +2.02732554054082173641771797964103718e-01    },
+                {+2.19999999999999973354647408996243030e-01    , +2.23656109021832382650747515743625830e-01    },
+                {+2.39999999999999963362640187369834166e-01    , +2.44774112659352854083413297101694196e-01    },
+                {+2.59999999999999953370632965743425302e-01    , +2.66108406873654071753827618842061943e-01    },
+                {+2.79999999999999971134201359745929949e-01    , +2.87682072451780896117822911968144088e-01    },
+                {+2.99999999999999988897769753748434596e-01    , +3.09519604203111703273814331202206426e-01    },
+                {+3.20000000000000006661338147750939243e-01    , +3.31647108705132085025104001081840030e-01    },
+                {+3.40000000000000024424906541753443889e-01    , +3.54092528962242939723929765493171945e-01    },
+                {+3.60000000000000042188474935755948536e-01    , +3.76885901188190124469133896689497444e-01    },
+                {+3.80000000000000059952043329758453183e-01    , +4.00059650056056638206593741845596981e-01    },
+                {+4.00000000000000077715611723760957830e-01    , +4.23648930193601899373639138690042112e-01    },
+                {+4.20000000000000095479180117763462476e-01    , +4.47692023527420813002158901561072580e-01    },
+                {+4.40000000000000113242748511765967123e-01    , +4.72230804420425833981180600242988051e-01    },
+                {+4.60000000000000131006316905768471770e-01    , +4.97311287572031193620508878977899997e-01    },
+                {+4.80000000000000148769885299770976417e-01    , +5.22984277591344047465367134186014130e-01    },
+                {+5.00000000000000111022302462515654042e-01    , +5.49306144334054993727359235148812474e-01    },
+                {+5.20000000000000128785870856518158689e-01    , +5.76339754969192906113997153691857594e-01    },
+                {+5.40000000000000146549439250520663336e-01    , +6.04155602962267286054127265014583953e-01    },
+                {+5.60000000000000164313007644523167983e-01    , +6.32833186665638181077146946128475799e-01    },
+                {+5.80000000000000182076576038525672629e-01    , +6.62462707371799523213172030295196960e-01    },
+                {+6.00000000000000199840144432528177276e-01    , +6.93147180559945621667457797283512021e-01    },
+                {+6.20000000000000217603712826530681923e-01    , +7.25005087752999506268291290927001216e-01    },
+                {+6.40000000000000235367281220533186570e-01    , +7.58173744684044609195455590065769225e-01    },
+                {+6.60000000000000253130849614535691217e-01    , +7.92813631870191370108450047457113058e-01    },
+                {+6.80000000000000270894418008538195863e-01    , +8.29114038301766692728933700083100051e-01    },
+                {+7.00000000000000288657986402540700510e-01    , +8.67300527694053760423196460163172710e-01    },
+                {+7.20000000000000306421554796543205157e-01    , +9.07644983319125195441126107009775370e-01    },
+                {+7.40000000000000324185123190545709804e-01    , +9.50479380596524207852088721432242171e-01    },
+                {+7.60000000000000341948691584548214450e-01    , +9.96215082345103890579587353760865510e-01    },
+                {+7.80000000000000359712259978550719097e-01    , +1.04537054846688556569856922586455819e+00    },
+                {+8.00000000000000377475828372553223744e-01    , +1.09861228866811073993921293846013796e+00    },
+                {+8.20000000000000395239396766555728391e-01    , +1.15681746459031653565363995495937725e+00    },
+                {+8.40000000000000413002965160558233038e-01    , +1.22117351768460359355809310163905228e+00    },
+                {+8.60000000000000430766533554560737684e-01    , +1.29334467204897297035888921761818841e+00    },
+                {+8.80000000000000448530101948563242331e-01    , +1.37576765652097643587819823310934128e+00    },
+                {+9.00000000000000466293670342565746978e-01    , +1.47221948958322268418172604524275263e+00    },
+                {+9.20000000000000484057238736568251625e-01    , +1.58902691517397596123778549185721945e+00    },
+                {+9.40000000000000501820807130570756271e-01    , +1.73804934491764087653605718356588900e+00    },
+                {+9.60000000000000519584375524573260918e-01    , +1.94591014905531993245708137324632564e+00    },
+                {+9.80000000000000537347943918575765565e-01    , +2.29755992506730853281874022244325249e+00    },
+        };
+
+        for(double [] testCase : testCases) {
+            failures += testAtanhCaseWithUlpDiff(testCase[0],
+                    testCase[1],
+                    3.0);
+        }
+
+        for(double nan : Tests.NaNs) {
+            failures += testAtanhCaseWithUlpDiff(nan, NaNd, 0);
+        }
+
+        double [][] specialTestCases = {
+                {0.0,                       0.0},
+                {-0.0,                      -0.0},
+                {1.0,                       Double.POSITIVE_INFINITY},
+                {-1.0,                      Double.NEGATIVE_INFINITY},
+                {2.0,                       NaNd},
+                {-2.0,                      NaNd},
+        };
+
+        for(double [] specialTestCase : specialTestCases) {
+            failures += testAtanhCaseWithUlpDiff(specialTestCase[0],
+                    specialTestCase[1],
+                    0.0);
+        }
+
+        // For powers of 2 less than 2^(-27), the second and
+        // subsequent terms of the Taylor series expansion will get
+        // rounded away since |n-n^3| > 53, the binary precision of a
+        // double significand.
+
+        for(int i = DoubleConsts.MIN_SUB_EXPONENT; i < -27; i++) {
+            double d = Math.scalb(2.0, i);
+
+            // Result and expected are the same.
+            failures += testAtanhCaseWithUlpDiff(d, d, 2.5);
+        }
+
+        failures += testAtanhAdditionalTests();
+
+        return failures;
+    }
+
+    /**
+     * Test accuracy of {Math, StrictMath}.tanh using quad precision
+     * tanh implementation as the reference. There are additional tests.
+     * The specified accuracy is 2.5 ulps.
+     *
+     */
+    static int testAtanhAdditionalTests() {
+        int failures = 0;
+        /*
+         * Array elements below are generated using a quad precision tanh
+         * implementation (libquadmath). Rounded to a double, the quad result
+         * *should* be correctly rounded, unless we are quite unlucky.
+         * Assuming the quad value is a correctly rounded double, the
+         * allowed error is 3.0 ulps instead of 2.5 since the quad
+         * value rounded to double can have its own 1/2 ulp error.
+         */
+        double[][] testCases = {
+                // x                                             atanh(x)
+                {+9.39017107929201566562937841808889061e-01    , +1.72967155564501022599234830162276798e+00    },
+                {+4.56590977869321346105380143853835762e-01    , +4.92995868916526654745557405930485720e-01    },
+                {-6.57855028101722583144805867050308734e-01    , -7.89022676186288902931611202476188124e-01    },
+                {+4.62405425240985490376033339998684824e-01    , +5.00366606474614321339885208418466006e-01    },
+                {-9.83365261789753697385663144814316183e-01    , -2.39052856803141716223262787771779768e+00    },
+                {-6.27582201138608741786129030515439808e-01    , -7.37417270574716377975381198846020522e-01    },
+                {-9.83196938676588638728048863413278013e-01    , -2.38545217282555498582477166161511345e+00    },
+                {+7.36681396907350904967870519612915814e-01    , +9.43183305171108845024940622694003154e-01    },
+                {-7.68733978209885648880117514636367559e-01    , -1.01722532284268312448347897782273734e+00    },
+                {-8.99650279001481090190850409271661192e-01    , -1.47038189478731874369381319202006168e+00    },
+                {+6.23383381659472490810003364458680153e-02    , +6.24192773197774301522605242534216118e-02    },
+                {-8.14139384718910008587045012973248959e-01    , -1.13918472673420532816505691112579313e+00    },
+                {-4.89518635342238050967011986358556896e-01    , -5.35427075187260852558782518094419668e-01    },
+                {-6.08295892536873550326959048106800765e-01    , -7.06211859359034873213744847874549993e-01    },
+                {+9.36079053287340978606323460553539917e-01    , +1.70538649403259128938060088254525967e+00    },
+                {+8.31593360663532843446432707423809916e-01    , +1.19328001443669418326658153597705593e+00    },
+                {+6.56422583223821076714443734090309590e-01    , +7.86501511439435312578862353672697253e-01    },
+                {-3.45789522181036979020518629113212228e-01    , -3.60653496973375779632391162421477716e-01    },
+                {+5.32079052777165939502879155043046921e-01    , +5.93040792269778100045583612458499490e-01    },
+                {-3.36182931512335247958844774984754622e-01    , -3.49782828626977949006925091676664461e-01    },
+                {+6.13630231412017335124176042882027104e-01    , +7.14723430606319696079463920489037224e-01    },
+                {+7.39217182016670415478643008100334555e-01    , +9.48751224833067617682882507817093541e-01    },
+                {-7.64409441646018983362864673836156726e-03    , -7.64424330871250337925427639013540391e-03    },
+                {-9.74816033382744917545892349153291434e-01    , -2.18101148933100542106171185218910695e+00    },
+                {+5.52687515297161868765840608830330893e-01    , +6.22242584006598996817110126253907160e-01    },
+                {+9.93416759200363430615254856093088165e-01    , +2.85653913150680081054657418761203993e+00    },
+                {+9.07659865436335255850508474395610392e-01    , +1.51407684709244159021847264731507603e+00    },
+                {+6.60272764758356833780794659105595201e-01    , +7.93297068812459385386864151954890303e-01    },
+                {+9.63130814953695568725322573300218210e-01    , +1.98745986190671136058731587311090272e+00    },
+                {-5.70877067883640121337407435930799693e-01    , -6.48822975697686437517619163352737241e-01    },
+                {-8.11543971448019485492864077968988568e-01    , -1.13153503707350652581786706338031953e+00    },
+                {+6.25363929368137561048968109389534220e-01    , +7.33765974893577300297563917687072047e-01    },
+                {-2.98846490310910706256208868580870330e-01    , -3.08252492314447063039336121789383998e-01    },
+                {-5.97049745291272859759601487894542515e-01    , -6.88550090030688204308547683807415861e-01    },
+                {+8.32383827085564576009346637874841690e-01    , +1.19584817769769645815260824209818595e+00    },
+                {-6.63715390745103883674005373904947191e-01    , -7.99425357382537999237287552090479860e-01    },
+                {-3.94238412786191538828006741823628545e-01    , -4.16808558150307726736043589182851417e-01    },
+                {-9.76759747274416945117536670295521617e-01    , -2.22166424268955747060822814557733573e+00    },
+                {+8.57442746954987455865193624049425125e-01    , +1.28360612935435243492898897724236702e+00    },
+                {-4.24565955117479187919116156990639865e-01    , -4.53248918353154620159372526887584647e-01    },
+                {+3.42862260746481295470289296645205468e-01    , +3.57332492545316699435359810051341636e-01    },
+                {+9.34459049867542246303742103918921202e-01    , +1.69245393271799745831802454769856267e+00    },
+                {+7.64520478549035598092586951679550111e-01    , +1.00700514849153029184678063244721996e+00    },
+                {-9.63864704576277597780631367641035467e-01    , -1.99769974929677935746994673118167405e+00    },
+                {-1.63366842704400605512660149543080479e-01    , -1.64843919557971079920329622870569601e-01    },
+                {+9.94878693411232140064726081618573517e-01    , +2.98246446127683966842287869896800818e+00    },
+                {+7.97196021651951247655176757689332590e-01    , +1.09087153746565597453258159715989760e+00    },
+                {+8.42371664350162419054868223611265421e-01    , +1.22928450632196951329839160548759750e+00    },
+                {+6.96520087724423975217291626904625446e-01    , +8.60509501716176099565750762116593117e-01    },
+                {+2.01836732473232416396058397367596626e-01    , +2.04646551779576522368238234135183581e-01    },
+                {+5.05939365449320055390103334502782673e-01    , +5.57256946951148119219566387597645954e-01    },
+                {-6.01430574320412913991162895399611443e-01    , -6.95385458565007214254554832195678104e-01    },
+                {-4.47649318961238940062230540206655860e-01    , -4.81756612137591759595253632500957881e-01    },
+                {+3.37215361458020113083478008775273338e-01    , +3.50947266793232870614512911957588554e-01    },
+                {+5.14125575037364890285118690371746197e-01    , +5.68321583728012649428480801619053327e-01    },
+                {-2.15214858343344861424384362180717289e-01    , -2.18633101430445893274568498462426012e-01    },
+                {-9.20630621904034773805847180483397096e-01    , -1.59314811621779716899638118653946385e+00    },
+                {+9.19047868224296293782060729427030310e-01    , +1.58286321290197920098639225270320808e+00    },
+                {-2.90913484009795997309311132994480431e-01    , -2.99563914714840125917110413508169726e-01    },
+                {+3.17993101000002553746526245959103107e-03    , +3.17994172851141737533171613593260162e-03    },
+                {-7.16021961571153608971940229821484536e-01    , -8.99433586194582637259073931486986768e-01    },
+                {+9.92926371376932737078391255636233836e-01    , +2.82049289268529672262432232518141968e+00    },
+                {-7.42199723778889541847547661745920777e-01    , -9.55359320438959545982214260560204172e-01    },
+                {+4.01228574786033020949105321051320061e-01    , +4.25112376436892578257996500834612471e-01    },
+                {-4.41626489426403034954660142830107361e-01    , -4.74249574732580717257665801841627296e-01    },
+                {-7.21334187852223251979921769816428423e-01    , -9.10420850885118135075313207007968241e-01    },
+                {+2.82138790772897052328005429444601759e-01    , +2.90004322151609047453793285881602424e-01    },
+                {+9.42986643599090679224161704041762277e-01    , +1.76434800601646585550841462860153977e+00    },
+                {-5.29497382099672897481923428131267428e-01    , -5.89446464446382266025999977702386855e-01    },
+                {+8.90579204675862490248050562513526529e-01    , +1.42471878072594370872155352848645131e+00    },
+                {+7.91047774827229877026013582508312538e-01    , +1.07422521925289214702426279427778303e+00    },
+                {+4.75836513423619322793456376530230045e-01    , +5.17588301409701923326927500834908347e-01    },
+                {+9.32576831661000027473562568047782406e-01    , +1.67781041728427657120484424620161805e+00    },
+                {+4.49528137196881449888508086587535217e-01    , +4.84108758524071045231641283604748208e-01    },
+                {-6.26946229789648867836149292998015881e-01    , -7.36368746336877301544734566556181860e-01    },
+                {+9.58777722962137812778848910966189578e-01    , +1.93054856596755898497650787204101231e+00    },
+                {-9.52075725696122754371231167169753462e-01    , -1.85351320681716370080636444991087747e+00    },
+                {+9.66628065084665144546249848644947633e-01    , +2.03818021917486263862909093415522483e+00    },
+                {-9.90577960901121823411585864960215986e-01    , -2.67656438907628996596144534201915287e+00    },
+                {-4.29129153811968588883019037893973291e-01    , -4.58828779570547333956754968138122237e-01    },
+                {+9.21075240738198020018501210870454088e-01    , +1.59607267263080478465215862819487820e+00    },
+                {-3.36155477527195101217216688382904977e-01    , -3.49751876782073295503516199927519371e-01    },
+                {-4.48919523178084922676589485490694642e-01    , -4.83346273396370947315596684554195125e-01    },
+                {-7.74714213440744980943009068141691387e-01    , -1.03201246185914269057125935805127686e+00    },
+                {-9.33695607057150489538344118045642972e-01    , -1.68646605985566878841417421790327581e+00    },
+                {-9.70495709947644780157816057908348739e-01    , -2.10075237060881671900628221642575807e+00    },
+                {-9.36541591900329706277261720970273018e-01    , -1.70913713792726775520494333833202263e+00    },
+                {+7.37812568478896091406227242259774357e-02    , +7.39155762025176670781318988781666040e-02    },
+                {-5.04698425671640915624038825626485050e-01    , -5.55590478683141718256493322563558866e-01    },
+                {+8.86920594265426132096763467416167259e-01    , +1.40730559326330763357753153399607213e+00    },
+                {-5.34965721339583311078058613929897547e-01    , -5.97076103988724933820435448973192479e-01    },
+                {-5.04547440425485049786402669269591570e-01    , -5.55387910636784813509136387661093775e-01    },
+                {+6.29048733546408000982808061962714419e-01    , +7.39840413838973059800583747029269377e-01    },
+                {-9.78682200705922600292296920088119805e-01    , -2.26532198777189725437096465346095003e+00    },
+                {+2.38919916302204882185833412222564220e-03    , +2.38920370910435739436106539813089152e-03    },
+                {+9.39119411473845255855508185049984604e-01    , +1.73053742845170764254605902984133442e+00    },
+                {-6.12092729070447649775132958893664181e-01    , -7.12261063519474464072359286081706738e-01    },
+                {-4.28286500855559193468025114270858467e-01    , -4.57796381674494452786278030205231882e-01    },
+                {-3.27343597141078301859806742868386209e-01    , -3.39850137417994572135528032299471827e-01    },
+                {+8.67784128381645536443045330088352785e-01    , +1.32403603565363914121499259355873480e+00    },
+                {+7.52660015475228982850808279181364924e-01    , +9.79063037984556159433073554464697266e-01    },
+                {+7.94013223397652012636172003112733364e-01    , +1.08219921900739052536746217766952318e+00    },
+                {+7.09905313419819106179886603058548644e-01    , +8.86992950278189161084285873777251874e-01    },
+                {-1.98448575704946783559989853529259562e-01    , -2.01117007840272246446085014680650093e-01    },
+                {-5.42433878231522781376838793221395463e-01    , -6.07597742754044712584754611484481699e-01    },
+                {-7.54416871023775081894768845813814551e-01    , -9.83128156322049799142775913826928208e-01    },
+                {+3.79392548957375952412007791281212121e-01    , +3.99349870596906125894068556877626311e-01    },
+                {-7.19279634651493138264299886941444129e-01    , -9.06150816136239309657351447814954486e-01    },
+                {-7.23976590297829680764607473975047469e-01    , -9.15951596268038628402616624621418121e-01    },
+                {+9.31431733675747830503155455517116934e-01    , +1.66909350005993386837360519102696526e+00    },
+                {+5.37270796945802042721140878711594269e-01    , +6.00310952521635654514167563653463826e-01    },
+                {+5.05516649275373541883027428411878645e-01    , +5.56688962620397076749424137775916558e-01    },
+                {+6.47849417517198489235852321144193411e-01    , +7.71583729081504579676124881689567952e-01    },
+                {-5.41124640015404612114480187301523983e-01    , -6.05744544146300297202878069447139070e-01    },
+                {+8.08308086737189235293499223189428449e-01    , +1.12212873178291911884370700806026369e+00    },
+                {-3.98280706273062445887944704736582935e-01    , -4.21603823445725768059979840445297322e-01    },
+                {+8.21296094676341903451088910514954478e-01    , +1.16078669527372101102128788451037300e+00    },
+                {+8.31294185704192667429879293194971979e-01    , +1.19231087346512905437819601187290515e+00    },
+                {+7.75279686135698531401772015669848770e-01    , +1.03342833983253459558199442655538342e+00    },
+                {+8.63016425798844855066249692754354328e-01    , +1.30504558255929258800082186193362940e+00    },
+                {-4.01121200686206158536606380948796868e-01    , -4.24984406726507784951210586374028211e-01    },
+                {-7.26296876814658931564849808637518436e-01    , -9.20844916340064967501644052845522852e-01    },
+                {-6.51251452570346556214531119621824473e-01    , -7.77468783732375082858572957021836038e-01    },
+                {-3.38884333978433982537126212264411151e-01    , -3.52831574304372263524860719607206882e-01    },
+                {+1.72392299987310537723317338532069698e-01    , +1.74131195612490806064041759672764899e-01    },
+                {-5.51462898378643817665079041034914553e-01    , -6.20481084171861782978180187043219425e-01    },
+                {-9.64904165725041895740332620334811509e-01    , -2.01255815534358709601688745544440155e+00    },
+                {+4.86038064330916674826710277557140216e-01    , +5.30859816325958819695652448239234798e-01    },
+                {-1.71510111227157313606994648580439389e-01    , -1.73222128192418256096782313598032358e-01    },
+                {-6.40878189659797481425584919634275138e-01    , -7.59662611746376207791374637040653373e-01    },
+                {-9.21153045478257270772814990777987987e-01    , -1.59658607015886876829589111732687615e+00    },
+                {+9.25949497320595948934851548983715475e-01    , +1.62921352070439068555146795332724838e+00    },
+                {+6.67107753751613463677472282142844051e-02    , +6.68100020655284551850585715148980622e-02    },
+                {-7.11704678755497255338013928849250078e-01    , -8.90629832677982628857274943637335499e-01    },
+                {+2.35257760530820814182106914813630283e-01    , +2.39748052543229836539708777609029562e-01    },
+                {-5.99809116170998191108765240642242134e-01    , -6.92848977932719794607448570102282265e-01    },
+                {+2.36856137326988402946881251409649849e-02    , +2.36900444994942435090279187572837691e-02    },
+                {+4.79753735068501274696473046788014472e-01    , +5.22664335906700767137176554743504717e-01    },
+                {-6.67813223642592657114391840877942741e-02    , -6.68808647504004031806529934863158282e-02    },
+                {+4.94668485437996574560770568496081978e-01    , +5.42222516993971658066335656775147071e-01    },
+                {+9.22379519394591618208778527332469821e-01    , +1.60474385650308389567794994129179836e+00    },
+                {+8.66971245297548764874306925776181743e-01    , +1.32075371812223257408713093011711133e+00    },
+                {-4.12983669850965462444492004578933120e-01    , -4.39203093212737172928023065922190938e-01    },
+                {-5.47462091173417153555647018947638571e-01    , -6.14749985698478964136871989998405650e-01    },
+                {+1.94666780724803700763914093840867281e-02    , +1.94691376077079831895420594672983760e-02    },
+                {+7.50017550413333511372115935955662280e-01    , +9.72995190965114870405588062706564568e-01    },
+                {+4.63499306097077345967250039393547922e-01    , +5.01758888267043269595832923648429311e-01    },
+                {-8.37886773978241183868931329925544560e-01    , -1.21403834050977292529923613488719174e+00    },
+                {-8.44836969187467534680990866036154330e-01    , -1.23783490656982630833439816713451784e+00    },
+                {-6.25239150214307315422956889960914850e-02    , -6.26055803188625957299760516982282628e-02    },
+                {+9.22830248275150921699605532921850681e-01    , +1.60777295202485947753242989620181993e+00    },
+                {-4.00102773592881266750964641687460244e-01    , -4.23771285697601852943736383483221011e-01    },
+                {-2.14797176230649089490043479599989951e-01    , -2.18195175029126913051736730604906575e-01    },
+                {+8.02345358196084879054410521348472685e-01    , +1.10516139904369984294917445650114715e+00    },
+                {-4.71866662797370439719202295236755162e-01    , -5.12468964220618253719339326228366982e-01    },
+                {-5.92911187960187158196845302882138640e-01    , -6.82143591940237868513886526048905163e-01    },
+                {-8.76501962797874289989863427763339132e-01    , -1.36046970086086594286889855837180352e+00    },
+                {-7.98090332703508265055347692396026105e-01    , -1.09333002432404366596746493295830794e+00    },
+                {-9.95891457501823618159164652752224356e-01    , -3.09288886654198972890077598351970075e+00    },
+                {+8.90238675794242206862350030860397965e-01    , +1.42307507755399321220435398978827125e+00    },
+                {+2.65017376806080395823528306209482253e-01    , +2.71497140326271882216423312414093371e-01    },
+                {-8.86140475954999118357591214589774609e-01    , -1.40366125031104099709908824399414822e+00    },
+                {-2.77209688130732434530045793508179486e-01    , -2.84656945620440202957754725962273832e-01    },
+                {-5.61942305274404585446745841181837022e-01    , -6.35667384226952551579962809234573845e-01    },
+                {+5.85899688875965107826004896196536720e-01    , +6.71399455223037749672225055315941521e-01    },
+                {+2.89700970360319720597885861934628338e-01    , +2.98239807343473574150289333944139019e-01    },
+                {+6.75650398573335864149669305334100500e-01    , +8.21067357862862215855289466859201333e-01    },
+                {+8.44595640831392491243434506031917408e-01    , +1.23699243938765398083225288313951255e+00    },
+                {+7.51976945151026199276600436860462651e-01    , +9.77489203652249672733902415356008597e-01    },
+                {+5.84881385823573185511747851705877110e-01    , +6.69850275691608515819691751205471169e-01    },
+                {+1.23322570031297651382828917121514678e-01    , +1.23953519549355101274007946363965461e-01    },
+                {-2.47363663564394764549092542438302189e-01    , -2.52602687864803306420298300961589174e-01    },
+                {-8.72948142869468535209875881264451891e-01    , -1.34533684420626699711543794108336721e+00    },
+                {+8.66853617575293000641067919787019491e-01    , +1.32028029629708106765994282266545478e+00    },
+                {+9.65229404828656933901243064610753208e-02    , +9.68243850830075059690451893341587506e-02    },
+                {-5.83777226707343555034412929671816528e-01    , -6.68173646565246900863367519530400319e-01    },
+                {+9.94603681374665704595372517360374331e-01    , +2.95624183430168683072844226874046298e+00    },
+                {+7.54573357889273710341626610897947103e-01    , +9.83491456493016558037612443042858735e-01    },
+                {-8.72065566686865079049084670259617269e-01    , -1.34163989421242748094845640631675400e+00    },
+                {-1.57050652646726351946426802896894515e-01    , -1.58361317756145752747805962366582739e-01    },
+                {+9.07524513496185902816648649604758248e-01    , +1.51330900778040915728163457702896072e+00    },
+                {+8.88013640284071148478517443436430767e-01    , +1.41245174788920614220523066982061669e+00    },
+                {+5.25920210223992712350593592418590561e-01    , +5.84488641604906625861481645606402185e-01    },
+                {-8.55361269493308373768059027497656643e-01    , -1.27579779541753266418749325433063584e+00    },
+                {+7.52458416629113502338555008464027196e-01    , +9.78598154541206783526807546834975210e-01    },
+                {+2.11594554867804984787937883083941415e-01    , +2.14840051580673426585151516223475322e-01    },
+                {-8.77614995063785929829691667691804469e-01    , -1.36529288845779405074788706705067271e+00    },
+                {-8.13140811836136734314095519948750734e-01    , -1.13623027343457311746522665305747518e+00    },
+                {-9.09625945665704094267312029842287302e-03    , -9.09651034981903612229998860206266111e-03    },
+                {+7.11723260837115345722736492461990565e-01    , +8.90667489144918362129731310184000150e-01    },
+                {-8.83729688568336113618784111167769879e-01    , -1.39254560811946769303745792066561506e+00    },
+                {+2.81119771587539202251093684026272967e-01    , +2.88897516488748428420498810336047168e-01    },
+                {+8.67969571335847511761585337808355689e-01    , +1.32478745650884654793737485679177607e+00    },
+                {+3.71711284421433640901000217127148062e-01    , +3.90407276521447439801268385319531263e-01    },
+                {-5.53264526894389874200896883849054575e-01    , -6.23073752400105167233817313285610373e-01    },
+                {-7.50972436681106358946635737083852291e-01    , -9.75181502145488477599896301261990367e-01    },
+                {+6.22632428081477007353328190220054239e-01    , +7.29292680370939598849165484001382202e-01    },
+                {-5.93039523143406244187758602492976934e-01    , -6.82341523923040079633725976448706286e-01    },
+                {-6.21804927349977942796499519317876548e-01    , -7.27942416494347815893737620840227454e-01    },
+                {-5.91667199221579398482617762056179345e-01    , -6.80227384371192279205589233595913495e-01    },
+        };
+
+        for (double[] testCase : testCases) {
+            failures += testAtanhCaseWithUlpDiff(testCase[0],
+                    testCase[1],
+                    3.0);
+        }
+
+        return failures;
+    }
+
+    public static int testAtanhCaseWithTolerance(double input,
+                                                double expected,
+                                                double tolerance) {
+        int failures = 0;
+        failures += Tests.testTolerance("Math.atanh",       input, Math::atanh,         expected, tolerance);
+        failures += Tests.testTolerance("Math.atanh",      -input, Math::atanh,        -expected, tolerance);
+
+        failures += Tests.testTolerance("StrictMath.atanh",  input, StrictMath::atanh,  expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.atanh", -input, StrictMath::atanh, -expected, tolerance);
+        return failures;
+    }
+
+    public static int testAtanhCaseWithUlpDiff(double input,
+                                              double expected,
+                                              double ulps) {
+        int failures = 0;
+
+        failures += Tests.testUlpDiffWithAbsBound("Math.atanh",       input,  Math::atanh,       expected, ulps, Double.POSITIVE_INFINITY);
+        failures += Tests.testUlpDiffWithAbsBound("Math.atanh",      -input,  Math::atanh,      -expected, ulps, Double.POSITIVE_INFINITY);
+
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.atanh",  input, StrictMath::atanh,  expected, ulps, Double.POSITIVE_INFINITY);
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.atanh", -input, StrictMath::atanh, -expected, ulps, Double.POSITIVE_INFINITY);
+        return failures;
+    }
 }
diff --git a/test/jdk/java/lang/ProcessBuilder/InheritIOClosed.java b/test/jdk/java/lang/ProcessBuilder/InheritIOClosed.java
new file mode 100644
index 00000000000..3e96a49bd3b
--- /dev/null
+++ b/test/jdk/java/lang/ProcessBuilder/InheritIOClosed.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary child process should not hang even if parent process has closed System.out/err
+ * @bug 8366736
+ * @run main/othervm InheritIOClosed close dontclose
+ * @run main/othervm InheritIOClosed dontclose close
+ * @run main/othervm InheritIOClosed close close
+ */
+
+import java.nio.file.Path;
+
+public class InheritIOClosed {
+    private final static Path JAVA_EXE =
+            Path.of(System.getProperty("java.home"), "bin", "java");
+
+    private static final String s = "1234567890".repeat(10);
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 2) {
+            // Main test process
+            if (args[0].equals("close")) {
+                System.out.close();
+            }
+            if (args[1].equals("close")) {
+                System.err.close();
+            }
+
+            ProcessBuilder pb = new ProcessBuilder().inheritIO()
+                .command(JAVA_EXE.toString(),
+                         "-cp",
+                         System.getProperty("java.class.path"),
+                         InheritIOClosed.class.getName());
+            Process process = pb.start();
+            process.waitFor();
+
+            System.out.println("Done");
+        } else {
+            // Child process -- print to System.out/err. Without the fix in
+            // JDK-8366736, this process will hang on Windows.
+            for (int i = 0; i < 100; i++) {
+                System.out.println(s);
+            }
+            for (int i = 0; i < 100; i++) {
+                System.err.println(s);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/lang/ProcessBuilder/PipelineLeaksFD.java b/test/jdk/java/lang/ProcessBuilder/PipelineLeaksFD.java
index d3c44bc9279..92cca736503 100644
--- a/test/jdk/java/lang/ProcessBuilder/PipelineLeaksFD.java
+++ b/test/jdk/java/lang/ProcessBuilder/PipelineLeaksFD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,32 +21,49 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
+import jdk.test.lib.Utils;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.lang.ProcessHandle;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.concurrent.TimeUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
 
 /*
  * @test
- * @bug 8289643 8291760
- * @requires (os.family == "linux" & !vm.musl)
+ * @bug 8289643 8291760 8291986
+ * @requires os.family == "mac" | (os.family == "linux" & !vm.musl)
  * @summary File descriptor leak detection with ProcessBuilder.startPipeline
- * @run testng/othervm PipelineLeaksFD
+ * @library /test/lib
+ * @run junit/othervm/timeout=240 PipelineLeaksFD
  */
 
-@Test
 public class PipelineLeaksFD {
-    @DataProvider
-    public Object[][] builders() {
+
+    private static final String OS_NAME = System.getProperty("os.name", "Unknown");
+
+    private static final long MY_PID =  ProcessHandle.current().pid();
+
+    private static final boolean LSOF_AVAILABLE = checkForLSOF();
+
+    // Test cases for pipelines with a number of pipeline sequences
+    public static Object[][] builders() {
         return new Object[][]{
                 {List.of(new ProcessBuilder("cat"))},
                 {List.of(new ProcessBuilder("cat"),
@@ -59,20 +76,43 @@ public class PipelineLeaksFD {
         };
     }
 
-    @Test(dataProvider = "builders")
+    // True if lsof is runnable and collect pipe usage.
+    private static boolean lsofAvailable() {
+        return LSOF_AVAILABLE;
+    }
+
+    // Check if lsof is available
+    private static boolean checkForLSOF() {
+        try {
+            lsofForPids(MY_PID);
+            return true;
+        } catch (IOException ioe) {
+            System.err.println("Skipping: " + ioe);
+            return false;
+        }
+    }
+
+    @EnabledIf("lsofAvailable")
+    @ParameterizedTest
+    @MethodSource("builders")
     void checkForLeaks(List<ProcessBuilder> builders) throws IOException {
 
-        Set<PipeRecord> pipesBefore = myPipes();
+        List<String> lsofLines = lsofForPids(MY_PID);
+        Set<PipeRecord> pipesBefore = pipesFromLSOF(lsofLines, MY_PID);
         if (pipesBefore.size() < 3) {
-            System.out.println(pipesBefore);
-            Assert.fail("There should be at least 3 pipes before, (0, 1, 2)");
+            // Dump all lsof output to aid debugging
+            System.out.println("Output from lsof");
+            lsofLines.forEach(System.err::println);
+            System.err.println(pipesBefore);
+            fail("There should be at least 3 pipes before, (0, 1, 2)");
         }
+        printPipes(pipesBefore, "Before start");
 
         List<Process> processes = ProcessBuilder.startPipeline(builders);
 
         // Write something through the pipeline
         final String text = "xyz";
-        try (Writer out = processes.get(0).outputWriter()) {
+        try (Writer out = processes.getFirst().outputWriter()) {
             out.write(text);
         }
 
@@ -84,16 +124,17 @@ public class PipelineLeaksFD {
             try (BufferedReader inputStream = p.inputReader();
                  BufferedReader errorStream = p.errorReader()) {
                 String outActual = inputStream.readLine();
-                Assert.assertEquals(outActual, expectedOut, "stdout, process[ " + i + "]: " + p);
+                assertEquals(expectedOut, outActual, "stdout, process[ " + i + "]: " + p);
 
                 String errActual = errorStream.readLine();
-                Assert.assertEquals(errActual, expectedErr, "stderr, process[ " + i + "]: " + p);
+                assertEquals(expectedErr, errActual, "stderr, process[ " + i + "]: " + p);
             }
         }
 
-        processes.forEach(p -> waitForQuiet(p));
+        processes.forEach(PipelineLeaksFD::waitForQuiet);
 
-        Set<PipeRecord> pipesAfter = myPipes();
+        lsofLines = lsofForPids(MY_PID);
+        Set<PipeRecord> pipesAfter = pipesFromLSOF(lsofLines, MY_PID);
         if (!pipesBefore.equals(pipesAfter)) {
             Set<PipeRecord> missing = new HashSet<>(pipesBefore);
             missing.removeAll(pipesAfter);
@@ -101,46 +142,217 @@ public class PipelineLeaksFD {
             Set<PipeRecord> extra = new HashSet<>(pipesAfter);
             extra.removeAll(pipesBefore);
             printPipes(extra, "Extra pipes in pipesAfter");
-            Assert.fail("More or fewer pipes than expected");
+            // Dump all lsof output to aid debugging
+            System.out.println("\nOutput from lsof");
+            lsofLines.forEach(System.err::println);
+            fail("More or fewer pipes than expected");
+        }
+    }
+
+    // Test redirectErrorStream, both true and false
+    public static Object[][] redirectCases() {
+        return new Object[][] {
+                {true},
+                {false},
+        };
+    }
+
+    // Test redirectErrorStream  (true/false) has the right number of pipes in use
+    @EnabledIf("lsofAvailable")
+    @ParameterizedTest()
+    @MethodSource("redirectCases")
+    void checkRedirectErrorStream(boolean redirectError) {
+        try (Process p = new ProcessBuilder("cat")
+                .redirectErrorStream(redirectError)
+                .start()) {
+            System.err.printf("Parent PID; %d, Child Pid: %d\n", MY_PID, p.pid());
+            List<String> lsofLines = lsofForPids(MY_PID, p.pid());
+            final Set<PipeRecord> pipes = pipesFromLSOF(lsofLines, MY_PID, p.pid());
+            printPipes(pipes, "Parent and child pipes");
+
+            // For each of the child standard pipes, check the parent and child uses of the pipe
+            var pIn = PipeRecord.pipeFor(pipes, p.pid(), 0).orElseThrow();
+            Set<PipeRecord> pIns = PipeRecord.allSamePipes(pipes, pIn);
+            assertEquals(2, pIns.size(), "StdIn pipe count");
+
+            // Number of pipe references depending on whether stderr is redirected to stdout
+            long expected = redirectError ? 3 : 2;
+
+            var pOut = PipeRecord.pipeFor(pipes, p.pid(), 1).orElseThrow();
+            Set<PipeRecord> pOuts = PipeRecord.allSamePipes(pipes, pOut);
+            assertEquals(expected, pOuts.size(), "StdOut pipe count");
+
+            var pErr = PipeRecord.pipeFor(pipes, p.pid(), 2).orElseThrow();
+            Set<PipeRecord> pErrs = PipeRecord.allSamePipes(pipes, pErr);
+            assertEquals(expected, pErrs.size(), "StdErr pipe count");
+
+            String expectedTypeName = redirectError
+                    ? "java.lang.ProcessBuilder$NullInputStream"
+                    : "java.lang.ProcessImpl$ProcessPipeInputStream";
+            assertEquals(expectedTypeName, p.getErrorStream().getClass().getName(),
+                    "errorStream type is incorrect");
+        } catch (IOException ioe) {
+            fail("Process start", ioe);
         }
     }
 
     static void printPipes(Set<PipeRecord> pipes, String label) {
-        System.out.printf("%s: [%d]%n", label, pipes.size());
-        pipes.forEach(r -> System.out.printf("%-20s: %s%n", r.fd(), r.link()));
+        System.err.printf("%s: [%d]%n", label, pipes.size());
+        pipes.forEach(System.err::println);
     }
 
     static void waitForQuiet(Process p) {
         try {
             int st = p.waitFor();
             if (st != 0) {
-                System.out.println("non-zero exit status: " + p);
+                System.err.println("non-zero exit status: " + p);
             }
         } catch (InterruptedException ie) {
         }
     }
 
     /**
-     * Collect a Set of pairs of /proc fd paths and the symbol links that are pipes.
-     * @return A set of PipeRecords, possibly empty
+     * Extract the PipeRecords from the `lsof` output for a list of processes
+     *
+     * @param lines lines of lsof output
+     * @param pids varargs list of pids of interest
+     * @return a Set of PipeRecords for those pids
      */
-    static Set<PipeRecord> myPipes() {
-        Path path = Path.of("/proc/" + ProcessHandle.current().pid() + "/fd");
-        Set<PipeRecord> pipes = new HashSet<>();
-        File[] files = path.toFile().listFiles(f -> Files.isSymbolicLink(f.toPath()));
-        if (files != null) {
-            for (File file : files) {
-                try {
-                    Path link = Files.readSymbolicLink(file.toPath());
-                    if (link.toString().startsWith("pipe:")) {
-                        pipes.add(new PipeRecord(file.toPath(), link));
-                    }
-                } catch (IOException ioe) {
-                }
-            }
-        }
-        return pipes;
+    private static LinkedHashSet<PipeRecord> pipesFromLSOF(List<String> lines, long... pids) {
+        Arrays.sort(pids);
+        return lines.stream()
+                .map(PipelineLeaksFD::pipeFromLSOF)
+                .filter(pr -> pr != null &&
+                        Arrays.binarySearch(pids, pr.pid()) >= 0)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    record PipeRecord(Path fd, Path link) { };
+    /**
+     * Collect the output of `lsof` for all files.
+     * Files are used for `lsof` input and output to avoid creating pipes.
+     * @param pids zero or more pids to request data for; none -> all
+     * @return a List of lines output from `lsof`.
+     */
+    private static List<String> lsofForPids(long... pids) throws IOException {
+        Path tmpDir = Path.of(".");
+        String tmpPrefix = "lsof-";
+        Path lsofEmptyInput = Files.createTempFile(tmpDir, tmpPrefix, ".empty");
+        Path lsofOutput = Files.createTempFile(tmpDir, tmpPrefix, ".tmp");
+
+        List<String> lsofArgs = new ArrayList<>();
+        lsofArgs.add("lsof");
+        if (pids.length > 0) {
+            StringJoiner pidsArg = new StringJoiner(",");
+            for (long p : pids) {
+                pidsArg.add(Long.toString(p));
+            }
+            lsofArgs.add("-p");
+            lsofArgs.add(pidsArg.toString());
+        }
+
+        try (Process p = new ProcessBuilder(lsofArgs)
+                .redirectOutput(lsofOutput.toFile())
+                .redirectInput(lsofEmptyInput.toFile()) // empty input
+                .redirectError(ProcessBuilder.Redirect.DISCARD) // ignored output
+                .start()) {
+            boolean status = p.waitFor(Utils.adjustTimeout(120), TimeUnit.SECONDS);
+            if (!status) {
+                p.destroyForcibly();
+            }
+            assertTrue(status, "Process 'lsof' failed");
+
+            return Files.readAllLines(lsofOutput);
+        } catch (InterruptedException ie) {
+            throw new IOException("Waiting for lsof exit interrupted", ie);
+        }
+    }
+
+    // Return pipe records by parsing the appropriate platform specific `lsof` output.
+    static PipeRecord pipeFromLSOF(String s) {
+        return switch (OS_NAME) {
+            case "Linux" -> pipeFromLinuxLSOF(s);
+            case "Mac OS X" -> pipeFromMacLSOF(s);
+            default -> throw new RuntimeException("lsof not supported on platform: " + OS_NAME);
+        };
+    }
+
+    // Return Pipe from lsof output put, or null (on Mac OS X)
+    // lsof      55221 xxxx    0      PIPE 0xc76402237956a5cb      16384  ->0xfcb0c07ae447908c
+    // lsof      55221 xxxx    1      PIPE 0xb486e02f86da463e      16384  ->0xf94eacc85896b4e6
+    static PipeRecord pipeFromMacLSOF(String s) {
+        String[] fields = s.split("\\s+");
+        if ("PIPE".equals(fields[4])) {
+            final int pid = Integer.parseInt(fields[1]);
+            final String myKey = (fields.length > 5) ? fields[5] : "";
+            final String otherKey = (fields.length > 7) ? fields[7].substring(2) : "";
+            return PipeRecord.lookup(Integer.parseInt(fields[3]), myKey, otherKey, pid);
+        }
+        return null;
+    }
+
+    // Return Pipe from lsof output put, or null (on Linux)
+    // java    7612 xxxx   14w  FIFO   0,12       0t0   117662267 pipe
+    // java    7612 xxxx   15r  FIFO   0,12       0t0   117662268 pipe
+    static PipeRecord pipeFromLinuxLSOF(String s) {
+        String[] fields = s.split("\\s+");
+        if ("FIFO".equals(fields[4])) {
+            final int pid = Integer.parseInt(fields[1]);
+            final String key = (fields.length > 7) ? fields[7] : "";
+            final int fdNum = Integer.parseInt(fields[3].substring(0, fields[3].length() - 1));
+            return PipeRecord.lookup(fdNum, key, null, pid);
+        }
+        return null;
+    }
+
+    // Identify a pipe by pid, fd, and a key (unique across processes)
+    // Mac OS X has separate keys for read and write sides, both are matched to the same "name"
+    record PipeRecord(long pid, int fd, KeyedString myKey) {
+        static PipeRecord lookup(int fd, String myKey, String otherKey, int pid) {
+            return new PipeRecord(pid, fd, KeyedString.getKey(myKey, otherKey));
+        }
+
+        // Return the PipeRecord matching the fd and pid
+        static Optional<PipeRecord> pipeFor(Set<PipeRecord> pipes, long pid, int fd) {
+            return pipes.stream()
+                    .filter(p -> p.fd() == fd && p.pid() == pid)
+                    .findFirst();
+        }
+
+        // Return all the PipeRecords with the same key (the same OS pipe identification)
+        static Set<PipeRecord> allSamePipes(Set<PipeRecord> pipes, PipeRecord p) {
+            return pipes.stream()
+                    .filter(p1 -> p1.myKey().key.equals(p.myKey().key))
+                    .collect(Collectors.toSet());
+        }
+    }
+
+    // A unique name for a string with a count of uses
+    // Used to associate pipe between parent and child.
+    static class KeyedString {
+        private static final HashMap<String, KeyedString> map = new HashMap<>();
+        private static int nextInt = 1;
+        private final String key;
+        private final String name;
+        KeyedString(String key, String name) {
+            this.key = key;
+            this.name = name;
+        }
+
+        KeyedString(String s) {
+            String k = "p" + nextInt++;
+            this(s, k);
+        }
+
+        static KeyedString getKey(String key, String otherKey) {
+            var k = map.computeIfAbsent(key, KeyedString::new);
+            if (otherKey != null) {
+                map.putIfAbsent(otherKey, k);
+            }
+            return k;
+        }
+
+        public String toString() {
+            return name + ": osInfo: " + key;
+        }
+    }
 }
diff --git a/test/jdk/java/lang/ProcessBuilder/TEST.properties b/test/jdk/java/lang/ProcessBuilder/TEST.properties
new file mode 100644
index 00000000000..f96e7602fd4
--- /dev/null
+++ b/test/jdk/java/lang/ProcessBuilder/TEST.properties
@@ -0,0 +1 @@
+maxOutputSize=12000000
diff --git a/test/jdk/java/lang/StrictMath/ExhaustingTests.java b/test/jdk/java/lang/StrictMath/ExhaustingTests.java
index 0351caff70c..23b55a50bee 100644
--- a/test/jdk/java/lang/StrictMath/ExhaustingTests.java
+++ b/test/jdk/java/lang/StrictMath/ExhaustingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,10 @@ public class ExhaustingTests {
             new UnaryTestCase("asin",  FdlibmTranslit::asin,  StrictMath::asin,  DEFAULT_SHIFT),
             new UnaryTestCase("acos",  FdlibmTranslit::acos,  StrictMath::acos,  DEFAULT_SHIFT),
             new UnaryTestCase("atan",  FdlibmTranslit::atan,  StrictMath::atan,  DEFAULT_SHIFT),
+
+            new UnaryTestCase("asinh", FdlibmTranslit::asinh, StrictMath::asinh, DEFAULT_SHIFT),
+            new UnaryTestCase("acosh", FdlibmTranslit::acosh, StrictMath::acosh, DEFAULT_SHIFT),
+            new UnaryTestCase("atanh", FdlibmTranslit::atanh, StrictMath::atanh, DEFAULT_SHIFT),
         };
 
         for (var testCase : testCases) {
diff --git a/test/jdk/java/lang/StrictMath/FdlibmTranslit.java b/test/jdk/java/lang/StrictMath/FdlibmTranslit.java
index f38ca68569b..ffa18676c90 100644
--- a/test/jdk/java/lang/StrictMath/FdlibmTranslit.java
+++ b/test/jdk/java/lang/StrictMath/FdlibmTranslit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -140,6 +140,18 @@ public class FdlibmTranslit {
         return Tanh.compute(x);
     }
 
+    public static double asinh(double x) {
+        return Asinh.compute(x);
+    }
+
+    public static double acosh(double x) {
+        return Acosh.compute(x);
+    }
+
+    public static double atanh(double x) {
+        return Atanh.compute(x);
+    }
+
     public static double IEEEremainder(double f1, double f2) {
         return IEEEremainder.compute(f1, f2);
     }
@@ -2752,4 +2764,131 @@ public class FdlibmTranslit {
             return x;               /* exact output */
         }
     }
+
+    /*
+    *  Return the Inverse Hyperbolic Sine of x
+    *
+    *  Method :
+    *
+    *   Based on
+    *     asinh(x) = sign(x) * log [ |x| + sqrt(x*x+1) ]
+    *    we have
+    *    asinh(x) := x  if  1+x*x=1,
+    *             := sign(x)*(log(x)+ln2)) for large |x|, else
+    *             := sign(x)*log(2|x|+1/(|x|+sqrt(x*x+1))) if|x|>2, else
+    *             := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2)))
+    */
+    private static final class Asinh {
+        private static final double one = 1.0;
+        private static final double ln2 = 6.93147180559945286227e-01;
+        private static final double huge = 1.0e300;
+
+        static double compute(double x) {
+            double t,w;
+            int hx,ix;
+            hx = __HI(x);
+            ix = hx&0x7fffffff;
+            if(ix>=0x7ff00000) return x+x;  /* x is inf or NaN */
+            if(ix< 0x3e300000) {    /* |x|<2**-28 */
+                if(huge+x>one) return x;    /* return x inexact except 0 */
+            }
+            if(ix>0x41b00000) { /* |x| > 2**28 */
+                w = log(Math.abs(x))+ln2;
+            } else if (ix>0x40000000) { /* 2**28 > |x| > 2.0 */
+                t = Math.abs(x);
+                w = log(2.0*t+one/(sqrt(x*x+one)+t));
+            } else {        /* 2.0 > |x| > 2**-28 */
+                t = x*x;
+                w =log1p(Math.abs(x)+t/(one+sqrt(one+t)));
+            }
+            if(hx>0) return w; else return -w;
+        }
+    }
+
+    /*
+     *  Return the Inverse Hyperbolic Cosine of x
+     *
+     *  Method :
+     *  Based on
+     *   acosh(x) = log [ x + sqrt(x*x-1) ]
+     *   we have
+     *    acosh(x) := log(x)+ln2,    if x is large; else
+     *             := log(2x-1/(sqrt(x*x-1)+x)) if x>2; else
+     *             := log1p(t+sqrt(2.0*t+t*t)); where t=x-1.
+     *
+     *  Special cases:
+     *   acosh(x) is NaN with signal if x<1.
+     *   acosh(NaN) is NaN without signal.
+     */
+    private static final class Acosh {
+        private static final double one = 1.0;
+        private static final double ln2 = 6.93147180559945286227e-01;
+        static double compute(double x) {
+            double t;
+            int hx;
+            hx = __HI(x);
+            if(hx<0x3ff00000) {      /* x < 1 */
+                return (x-x)/(x-x);
+            } else if(hx >=0x41b00000) {    /* x > 2**28 */
+                if(hx >=0x7ff00000) {    /* x is inf of NaN */
+                    return x+x;
+                } else
+                    return log(x)+ln2;   /* acosh(huge)=log(2x) */
+            } else if(((hx-0x3ff00000)|__LO(x))==0) {
+                return 0.0;         /* acosh(1) = 0 */
+            } else if (hx > 0x40000000) {   /* 2**28 > x > 2 */
+                t=x*x;
+                return log(2.0*x-one/(x+sqrt(t-one)));
+            } else {            /* 1<x<2 */
+                t = x-one;
+                return log1p(t+sqrt(2.0*t+t*t));
+            }
+        }
+    }
+
+    /*
+     *  Return the Inverse Hyperbolic Tangent of x
+     *
+     *  Method :
+     *    1.Reduced x to positive by atanh(-x) = -atanh(x)
+     *    2.For x>=0.5
+     *                1              2x                          x
+     *    atanh(x) = --- * log(1 + -------) = 0.5 * log1p(2 * --------)
+     *                2             1 - x                      1 - x
+     *
+     *  For x<0.5
+     *   atanh(x) = 0.5*log1p(2x+2x*x/(1-x))
+     *
+     *  Special cases:
+     *    atanh(x) is NaN if |x| > 1 with signal;
+     *    atanh(NaN) is that NaN with no signal;
+     *    atanh(+-1) is +-INF with signal.
+     *
+     */
+    private static final class Atanh {
+        private static final double zero = 0.0;
+        private static final double one = 1.0;
+        private static final double huge = 1.0e300;
+
+        static double compute(double x) {
+            double t;
+            int hx,ix;
+            /*unsigned*/ int lx;
+            hx = __HI(x);       /* high word */
+            lx = __LO(x);       /* low word */
+            ix = hx&0x7fffffff;
+            if ((ix|((lx|(-lx))>>>31))>0x3ff00000) /* |x|>1 */
+                return (x-x)/(x-x);
+            if(ix==0x3ff00000)
+                return x/zero;
+            if(ix<0x3e300000&&(huge+x)>zero) return x;  /* x<2**-28 */
+            x = __HI(x, ix);     /* x <- |x| */
+            if(ix<0x3fe00000) {     /* x < 0.5 */
+                t = x+x;
+                t = 0.5*log1p(t+t*x/(one-x));
+            } else
+                t = 0.5*log1p((x+x)/(one-x));
+            if(hx>=0) return t; else return -t;
+        }
+    }
 }
diff --git a/test/jdk/java/lang/StrictMath/HyperbolicTests.java b/test/jdk/java/lang/StrictMath/HyperbolicTests.java
index 1f570ce9efd..4be1b350c1d 100644
--- a/test/jdk/java/lang/StrictMath/HyperbolicTests.java
+++ b/test/jdk/java/lang/StrictMath/HyperbolicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@ import java.util.function.DoubleUnaryOperator;
 
 /*
  * @test
- * @bug 4851625 8301444
+ * @bug 4851625 8301444 8331354
  * @key randomness
  * @library /test/lib
  * @build jdk.test.lib.RandomFactory
@@ -34,7 +34,7 @@ import java.util.function.DoubleUnaryOperator;
  * @build FdlibmTranslit
  * @build HyperbolicTests
  * @run main HyperbolicTests
- * @summary Tests for StrictMath.{sinh, cosh, tanh}
+ * @summary Tests for StrictMath.{sinh, cosh, tanh, asinh, acosh, atanh}
  */
 
 /**
@@ -60,10 +60,14 @@ public class HyperbolicTests {
         failures += testAgainstTranslitSinh();
         failures += testAgainstTranslitCosh();
         failures += testAgainstTranslitTanh();
+        failures += testAgainstTranslitAtanh();
 
         failures += testSinh();
         failures += testCosh();
         failures += testTanh();
+        failures += testAsinh();
+        failures += testAcosh();
+        failures += testAtanh();
 
         if (failures > 0) {
             System.err.println("Testing the hyperbolics incurred "
@@ -78,7 +82,10 @@ public class HyperbolicTests {
     private static enum HyperbolicTest {
         SINH(HyperbolicTests::testSinhCase, FdlibmTranslit::sinh),
         COSH(HyperbolicTests::testCoshCase, FdlibmTranslit::cosh),
-        TANH(HyperbolicTests::testTanhCase, FdlibmTranslit::tanh);
+        TANH(HyperbolicTests::testTanhCase, FdlibmTranslit::tanh),
+        ASINH(HyperbolicTests::testAsinhCase, FdlibmTranslit::asinh),
+        ACOSH(HyperbolicTests::testAcoshCase, FdlibmTranslit::acosh),
+        ATANH(HyperbolicTests::testAtanhCase, FdlibmTranslit::atanh);
 
         private DoubleDoubleToInt testCase;
         private DoubleUnaryOperator transliteration;
@@ -212,6 +219,31 @@ public class HyperbolicTests {
         return failures;
     }
 
+    /**
+     * Test StrictMath.tanh against transliteration port of tanh
+     */
+    private static int testAgainstTranslitAtanh() {
+        int failures = 0;
+        double x;
+
+        // Probe near decision points in the FDLIBM algorithm.
+        double[] decisionPoints = {
+                0.0,
+
+                0x1.0p-28,
+                -0x1.0p-28,
+
+                1.0,
+                -1.0,
+        };
+
+        for (double testPoint : decisionPoints) {
+            failures += testRangeMidpoint(testPoint, Math.ulp(testPoint), 1000, HyperbolicTest.ATANH);
+        }
+
+        return failures;
+    }
+
     private interface DoubleDoubleToInt {
         int apply(double x, double y);
     }
@@ -253,6 +285,21 @@ public class HyperbolicTests {
                           StrictMath::tanh, expected);
     }
 
+    private static int testAsinhCase(double input, double expected) {
+        return Tests.test("StrictMath.asinh(double)", input,
+                StrictMath::asinh, expected);
+    }
+
+    private static int testAcoshCase(double input, double expected) {
+        return Tests.test("StrictMath.asinh(double)", input,
+                StrictMath::acosh, expected);
+    }
+
+    private static int testAtanhCase(double input, double expected) {
+        return Tests.test("StrictMath.atanh(double)", input,
+                StrictMath::atanh, expected);
+    }
+
     private static int testSinh() {
         int failures = 0;
         double [][] testCases = {
@@ -484,4 +531,189 @@ public class HyperbolicTests {
 
         return failures;
     }
+
+    private static int testAsinh() {
+        int failures = 0;
+        double [][] testCases = {
+                {0x1.5798ee2308c36p-27, 0x1.5798ee2308c35p-27},
+                {0x1.ffffffffffffep-26, 0x1.ffffffffffffdp-26},
+                {0x1.ffffffffffffep-25, 0x1.ffffffffffff9p-25},
+                {0x1.ad7f29abcaf47p-24, 0x1.ad7f29abcaf3bp-24},
+                {0x1.ad7f29abcaf48p-24, 0x1.ad7f29abcaf3cp-24},
+                {0x1.ffffffffffffep-24, 0x1.fffffffffffe9p-24},
+                {0x1.ffffffffffffep-23, 0x1.fffffffffffa9p-23},
+                {0x1.ffffffffffffep-22, 0x1.ffffffffffea9p-22},
+                {0x1.ffffffffffffep-21, 0x1.ffffffffffaa9p-21},
+                {0x1.0c6f7a0b5ed8dp-20, 0x1.0c6f7a0b5ea7ap-20},
+                {0x1.ffffffffffffep-20, 0x1.fffffffffeaa9p-20},
+                {0x1.ffffffffffffep-19, 0x1.fffffffffaaa9p-19},
+                {0x1.fffffffffffffp-18, 0x1.ffffffffeaaa9p-18},
+                {0x1p-17,               0x1.ffffffffeaaabp-18},
+                {0x1.4f8b588e368edp-17, 0x1.4f8b588e1e89ep-17},
+                {0x1.fffffffffffffp-17, 0x1.ffffffffaaaa9p-17},
+                {0x1.fffffffffffffp-16, 0x1.fffffffeaaaa9p-16},
+                {0x1p-15,               0x1.fffffffeaaaabp-16},
+                {0x1.fffffffffe5ddp-15, 0x1.fffffffaa9087p-15},
+                {0x1.fffffffffffffp-15, 0x1.fffffffaaaaa9p-15},
+                {0x1.a36e2eb1c432dp-14, 0x1.a36e2ea609cc8p-14},
+                {0x1.ffffffffffffep-14, 0x1.ffffffeaaaaa9p-14},
+                {0x1p-13,               0x1.ffffffeaaaaabp-14},
+                {0x1.ffffffffffd51p-13, 0x1.ffffffaaaa7fdp-13},
+                {0x1.fffffffffffffp-13, 0x1.ffffffaaaaaadp-13},
+                {0x1.ffffffffffffep-12, 0x1.fffffeaaaaacfp-12},
+                {0x1p-11,               0x1.fffffeaaaaad1p-12},
+                {0x1.fffffffffff1p-11,  0x1.fffffaaaaac21p-11},
+                {0x1p-10,               0x1.fffffaaaaad11p-11},
+                {0x1.0624dd2f1a9c6p-10, 0x1.0624da5218b5fp-10},
+                {0x1.0624dd2f1a9f8p-10, 0x1.0624da5218b91p-10},
+                {0x1.fffffffffffddp-10, 0x1.ffffeaaaad0edp-10},
+                {0x1.fffffffffffffp-10, 0x1.ffffeaaaad10fp-10},
+                {0x1.ffffffffffffcp-9,  0x1.ffffaaaad110cp-9},
+                {0x1.ffffffffffffep-9,  0x1.ffffaaaad110ep-9},
+                {0x1.ffffffffffff8p-8,  0x1.fffeaaad110aep-8},
+                {0x1.ffffffffffffep-8,  0x1.fffeaaad110b4p-8},
+                {0x1.47ae147ae1458p-7,  0x1.47acae9508ae4p-7},
+                {0x1.47ae147ae1464p-7,  0x1.47acae9508afp-7},
+                {0x1.ffffffffffffep-7,  0x1.fffaaad10fa35p-7},
+                {0x1.fffffffffffffp-7,  0x1.fffaaad10fa35p-7},
+                {0x1.ffffffffffff9p-6,  0x1.ffeaad10b5b28p-6},
+                {0x1.ffffffffffffep-6,  0x1.ffeaad10b5b2bp-6},
+                {0x1.ffffffffffff9p-5,  0x1.ffaad0fa4525bp-5},
+                {0x1.fffffffffffffp-5,  0x1.ffaad0fa45261p-5},
+                {0x1.9999999999996p-4,  0x1.98eb9e7e5fc3ap-4},
+                {0x1.9999999999997p-4,  0x1.98eb9e7e5fc3bp-4},
+                {0x1.fffffffffffffp-4,  0x1.fead0b6996972p-4},
+                {0x1p-3,                0x1.fead0b6996972p-4},
+                {0x1.fffffffffffffp-3,  0x1.facfb2399e636p-3},
+                {0x1.ffffffffffffcp-2,  0x1.ecc2caec51605p-2},
+                {0x1.ffffffffffffep-2,  0x1.ecc2caec51608p-2},
+                {0x1.ffffffffffffbp-1,  0x1.c34366179d423p-1},
+                {0x1.ffffffffffffep-1,  0x1.c34366179d426p-1},
+                {0x1.fffffffffffd3p+0,  0x1.719218313d073p+0},
+                {0x1.fffffffffffe1p+0,  0x1.719218313d079p+0},
+                {0x1.ffffffffffed8p+1,  0x1.0c1f8a6e80ea4p+1},
+                {0x1.fffffffffff92p+1,  0x1.0c1f8a6e80edp+1},
+                {0x1.0108b83c4bbc8p-1,  0x1.ee9c256f3947ep-2},
+                {-0x1.c41e527b70f43p-3, -0x1.c0863c7dece22p-3},
+        };
+
+        for (double[] testCase: testCases) {
+            failures += testAsinhCase(testCase[0], testCase[1]);
+        }
+
+        return failures;
+    }
+
+    private static int testAcosh() {
+        int failures = 0;
+        double [][] testCases = {
+                {0x1.00020000aaaabp+0,      0x1.fffffffff749fp-8},
+                {0x1.000346de27853p+0,      0x1.47ae147ae274p-7},
+                {0x1.0008000aaab05p+0,      0x1.fffffffffe9f1p-7},
+                {0x1.0008000aaab05p+0,      0x1.fffffffffe9f1p-7},
+                {0x1.002000aaac169p+0,      0x1.fffffffffe67bp-6},
+                {0x1.002000aaac16bp+0,      0x1.ffffffffff679p-6},
+                {0x1.00800aab05b1ep+0,      0x1.ffffffffffc9cp-5},
+                {0x1.00800aab05b1fp+0,      0x1.ffffffffffe9bp-5},
+                {0x1.0147f40224b2ep+0,      0x1.9999999999318p-4},
+                {0x1.0147f40224b35p+0,      0x1.9999999999776p-4},
+                {0x1.0200aac16db6cp+0,      0x1.ffffffffffe91p-4},
+                {0x1.0200aac16db6ep+0,      0x1.fffffffffff91p-4},
+                {0x1.080ab05ca613bp+0,      0x1.ffffffffffea5p-3},
+                {0x1.080ab05ca6146p+0,      0x1.0000000000001p-2},
+                {0x1.20ac1862ae8cep+0,      0x1.fffffffffffedp-2},
+                {0x1.20ac1862ae8dp+0,       0x1.ffffffffffffdp-2},
+                {0x1.8b07551d9f551p+0,      0x1p+0},
+                {0x1.e18fa0df2d9b3p+1,      0x1.ffffffffffffbp+0},
+                {0x1.e18fa0df2d9b8p+1,      0x1.ffffffffffffep+0},
+                {0x1.e18fa0df2d9bap+1,      0x1.fffffffffffffp+0},
+                {0x1.b4ee858de3e68p+4,      0x1.ffffffffffff9p+1},
+                {0x1.b4ee858de3e7ap+4,      0x1.ffffffffffffep+1},
+                {0x1.b4ee858de3e7dp+4,      0x1.fffffffffffffp+1},
+                {0x1.749eaa93f4e5ep+10,     0x1.ffffffffffffcp+2},
+                {0x1.749eaa93f4e64p+10,     0x1.ffffffffffffdp+2},
+                {0x1.749eaa93f4e76p+10,     0x1p+3},
+                {0x1.0f2ebd0a7fb9p+22,      0x1.fffffffffff6fp+3},
+                {0x1.0f2ebd0a8005cp+22,     0x1p+4},
+                {0x1.1f43fcc4b6316p+45,     0x1.fffffffffffd3p+4},
+                {0x1.1f43fcc4b662cp+45,     0x1.fffffffffffffp+4},
+                {0x1.fdf25fc26e7cp+1023,    0x1.633c654fee2bap+9},
+                {0x1.fdf25fc26e7cp+1023,    0x1.633c654fee2bap+9},
+                {0x1.e0976c8f0ebdfp+1,      0x1.ff76fb3f476d5p+0},
+                {0x1.ff66e0de4dc6fp+1023,   0x1.633cc2ae1c934p+9},
+                {0x1.f97ccb0aef314p+11,     0x1.1ff088806d82ep+3},
+                {0x1.fdf28623ef923p+1021,   0x1.628af341989dap+9},
+        };
+
+        for (double[] testCase: testCases) {
+            failures += testAcoshCase(testCase[0], testCase[1]);
+        }
+
+        return failures;
+    }
+
+    private static int testAtanh() {
+        int failures = 0;
+        double [][] testCases = {
+            {0x1.5798ee2308c36p-27, 0x1.5798ee2308c37p-27},
+            {0x1.ffffffffffffep-26, 0x1p-25},
+            {0x1.ffffffffffffep-25, 0x1.0000000000004p-24},
+            {0x1.ad7f29abcaf47p-24, 0x1.ad7f29abcaf6p-24},
+            {0x1.ad7f29abcaf48p-24, 0x1.ad7f29abcaf61p-24},
+            {0x1.ffffffffffffep-24, 0x1.0000000000014p-23},
+            {0x1.ffffffffffffep-23, 0x1.0000000000054p-22},
+            {0x1.ffffffffffffep-22, 0x1.0000000000154p-21},
+            {0x1.ffffffffffffep-21, 0x1.0000000000554p-20},
+            {0x1.0c6f7a0b5ed8dp-20, 0x1.0c6f7a0b5f3b3p-20},
+            {0x1.ffffffffffffep-20, 0x1.0000000001554p-19},
+            {0x1.ffffffffffffep-19, 0x1.0000000005554p-18},
+            {0x1.fffffffffffffp-18, 0x1.0000000015555p-17},
+            {0x1p-17, 0x1.0000000015555p-17},
+            {0x1.4f8b588e368edp-17, 0x1.4f8b588e6698bp-17},
+            {0x1.fffffffffffffp-17, 0x1.0000000055555p-16},
+            {0x1.fffffffffffffp-16, 0x1.0000000155555p-15},
+            {0x1p-15, 0x1.0000000155555p-15},
+            {0x1.fffffffffe5ddp-15, 0x1.0000000554844p-14},
+            {0x1.fffffffffffffp-15, 0x1.0000000555555p-14},
+            {0x1.a36e2eb1c432dp-14, 0x1.a36e2ec938ff8p-14},
+            {0x1.ffffffffffffep-14, 0x1.0000001555555p-13},
+            {0x1p-13, 0x1.0000001555556p-13},
+            {0x1.ffffffffffd51p-13, 0x1.0000005555401p-12},
+            {0x1.fffffffffffffp-13, 0x1.0000005555559p-12},
+            {0x1.ffffffffffffep-12, 0x1.0000015555587p-11},
+            {0x1p-11, 0x1.0000015555588p-11},
+            {0x1.fffffffffff1p-11, 0x1.0000055555811p-10},
+            {0x1p-10, 0x1.0000055555889p-10},
+            {0x1.0624dd2f1a9c6p-10, 0x1.0624e2e91ece1p-10},
+            {0x1.0624dd2f1a9f8p-10, 0x1.0624e2e91ed13p-10},
+            {0x1.fffffffffffddp-10, 0x1.0000155558877p-9},
+            {0x1.fffffffffffffp-10, 0x1.0000155558888p-9},
+            {0x1.ffffffffffffcp-9, 0x1.0000555588889p-8},
+            {0x1.ffffffffffffep-9, 0x1.000055558888ap-8},
+            {0x1.ffffffffffff8p-8, 0x1.0001555888917p-7},
+            {0x1.ffffffffffffep-8, 0x1.000155588891ap-7},
+            {0x1.47ae147ae1458p-7, 0x1.47b0e059d0574p-7},
+            {0x1.47ae147ae1464p-7, 0x1.47b0e059d058p-7},
+            {0x1.ffffffffffffep-7, 0x1.000555888ad1bp-6},
+            {0x1.fffffffffffffp-7, 0x1.000555888ad1cp-6},
+            {0x1.ffffffffffff9p-6, 0x1.001558891aedep-5},
+            {0x1.ffffffffffffep-6, 0x1.001558891aee1p-5},
+            {0x1.ffffffffffff9p-5, 0x1.005588ad375a9p-4},
+            {0x1.fffffffffffffp-5, 0x1.005588ad375acp-4},
+            {0x1.9999999999996p-4, 0x1.9af93cd23440ep-4},
+            {0x1.9999999999997p-4, 0x1.9af93cd23440fp-4},
+            {0x1.fffffffffffffp-4, 0x1.015891c9eaef7p-3},
+            {0x1p-3, 0x1.015891c9eaef7p-3},
+            {0x1.fffffffffffffp-3, 0x1.058aefa811451p-2},
+            {0x1.ffffffffffffcp-2, 0x1.193ea7aad0308p-1},
+            {0x1.ffffffffffffep-2, 0x1.193ea7aad0309p-1},
+            {0x1.ffffffffffffbp-1, 0x1.1e9067763b478p+4},
+            {0x1.ffffffffffffep-1, 0x1.25e4f7b2737fap+4},
+        };
+
+        for (double[] testCase: testCases)
+            failures += testAtanhCase(testCase[0], testCase[1]);
+
+        return failures;
+    }
 }
diff --git a/test/jdk/java/lang/String/IndexOf.java b/test/jdk/java/lang/String/IndexOf.java
index b4fd17105a8..48f23de79b0 100644
--- a/test/jdk/java/lang/String/IndexOf.java
+++ b/test/jdk/java/lang/String/IndexOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ * Copyright (c) 2024, 2026, Intel Corporation. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,15 @@
  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:-TieredCompilation -XX:UseAVX=2 -XX:+UnlockDiagnosticVMOptions -XX:+EnableX86ECoreOpts IndexOf
  */
 
+/*
+ * @test
+ * @bug 8360271
+ * @summary test String indexOf() intrinsic
+ * @requires vm.cpu.features ~= ".*avx2.*"
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xcomp -XX:-TieredCompilation -XX:UseAVX=2 -XX:+UnlockDiagnosticVMOptions -XX:+EnableX86ECoreOpts -XX:-CompactStrings IndexOf
+ */
+
  public class IndexOf {
   final int scope = 32*2+16+8;
   final char a, aa, b, c, d;
@@ -56,11 +65,11 @@
               d = 'd';
               break;
           case UU:
-              a = '\u0061';
+              a = '\u1061';
               aa = a;
-              b = '\u0062';
+              b = '\u1062';
               c = '\u1063';
-              d = '\u0064';
+              d = '\u1064';
               break;
           default: //case UL:
               a = 'a';
@@ -73,7 +82,7 @@
   }
 
   // needle    =~ /ab*d/
-  // badNeedle =~ /ab*db*d/
+  // badNeedle =~ /ab*cb*d/
   interface Append {void append(int pos, char cc);}
   String newNeedle(int size, int badPosition) {
       if (size<2) {throw new RuntimeException("Fix testcase "+size);}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java
index 733ee261b09..15a134f0bb2 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @requires vm.debug != true
  * @modules jdk.management
  * @library /test/lib
- * @run main/othervm/timeout=1200 GetStackTraceALotWhenBlocking 100000
+ * @run main/othervm/timeout=1200 GetStackTraceALotWhenBlocking 10000
  */
 
 /*
@@ -36,7 +36,7 @@
  * @requires vm.debug == true & vm.continuations
  * @modules jdk.management
  * @library /test/lib
- * @run main/othervm/timeout=1200 GetStackTraceALotWhenBlocking 50000
+ * @run main/othervm/timeout=1200 GetStackTraceALotWhenBlocking 5000
  */
 
 import java.time.Instant;
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java
index ef385e47e21..a23a0de36d2 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @requires vm.debug != true
  * @modules jdk.management
  * @library /test/lib
- * @run main/othervm/native/timeout=300 --enable-native-access=ALL-UNNAMED GetStackTraceALotWhenPinned 100000
+ * @run main/othervm/native/timeout=300 --enable-native-access=ALL-UNNAMED GetStackTraceALotWhenPinned 10000
  */
 
 /*
@@ -36,7 +36,7 @@
  * @requires vm.debug == true
  * @modules jdk.management
  * @library /test/lib
- * @run main/othervm/native/timeout=300 --enable-native-access=ALL-UNNAMED GetStackTraceALotWhenPinned 50000
+ * @run main/othervm/native/timeout=300 --enable-native-access=ALL-UNNAMED GetStackTraceALotWhenPinned 5000
  */
 
 import java.time.Instant;
diff --git a/test/jdk/java/lang/Thread/virtual/stress/NotifiedThenTimedOutWait.java b/test/jdk/java/lang/Thread/virtual/stress/NotifiedThenTimedOutWait.java
new file mode 100644
index 00000000000..0734a794b90
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/NotifiedThenTimedOutWait.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8373120
+ * @summary Stress test two consecutive timed Object.wait calls where only the first one is notified.
+ * @run main/othervm -XX:CompileCommand=exclude,java.lang.VirtualThread::afterYield NotifiedThenTimedOutWait 1 100 100
+ */
+
+/*
+ * @test
+ * @run main/othervm -XX:CompileCommand=exclude,java.lang.VirtualThread::afterYield NotifiedThenTimedOutWait 2 100 100
+ */
+
+import java.time.Instant;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class NotifiedThenTimedOutWait {
+    public static void main(String[] args) throws Exception {
+        int race = (args.length > 0) ? Integer.parseInt(args[0]) : 1;
+        int nruns = (args.length > 1) ? Integer.parseInt(args[1]) : 100;
+        int iterations = (args.length > 2) ? Integer.parseInt(args[2]) : 100;
+
+        for (int i = 1; i <= nruns; i++) {
+            System.out.println(Instant.now() + " => " + i + " of " + nruns);
+            switch (race) {
+                case 1 -> race1(iterations);
+                case 2 -> race2(iterations);
+            }
+        }
+    }
+
+    /**
+     * Barrier in synchronized block.
+     */
+    private static void race1(int iterations) throws InterruptedException {
+        final int timeout = 1;
+        var lock = new Object();
+        var start = new Phaser(2);
+        var end = new Phaser(2);
+
+        var vthread = Thread.ofVirtual().start(() -> {
+            try {
+                for (int j = 0; j < iterations; j++) {
+                    synchronized (lock) {
+                        start.arriveAndAwaitAdvance();
+                        lock.wait(timeout);
+                        lock.wait(timeout);
+                    }
+                    end.arriveAndAwaitAdvance();
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        });
+
+        ThreadFactory factory = ThreadLocalRandom.current().nextBoolean()
+                    ? Thread.ofPlatform().factory() : Thread.ofVirtual().factory();
+        var notifier = factory.newThread(() -> {
+            for (int j = 0; j < iterations; j++) {
+                start.arriveAndAwaitAdvance();
+                synchronized (lock) {
+                    lock.notify();
+                }
+                end.arriveAndAwaitAdvance();
+            }
+        });
+        notifier.start();
+
+        vthread.join();
+        notifier.join();
+    }
+
+    /**
+     * Barrier before synchronized block.
+     */
+    private static void race2(int iterations) throws InterruptedException {
+        final int timeout = 1;
+        var lock = new Object();
+        var start = new Phaser(2);
+
+        var vthread = Thread.startVirtualThread(() -> {
+            try {
+                for (int i = 0; i < iterations; i++) {
+                    start.arriveAndAwaitAdvance();
+                    synchronized (lock) {
+                        lock.wait(timeout);
+                        lock.wait(timeout);
+                    }
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        });
+
+        ThreadFactory factory = ThreadLocalRandom.current().nextBoolean()
+                    ? Thread.ofPlatform().factory() : Thread.ofVirtual().factory();
+        var notifier = factory.newThread(() -> {
+            for (int i = 0; i < iterations; i++) {
+                start.arriveAndAwaitAdvance();
+                synchronized (lock) {
+                    lock.notify();
+                }
+            }
+        });
+        notifier.start();
+
+        vthread.join();
+        notifier.join();
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/ParkAfterTimedPark.java b/test/jdk/java/lang/Thread/virtual/stress/ParkAfterTimedPark.java
index 1b173271a79..7dd0ac6e5a2 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/ParkAfterTimedPark.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/ParkAfterTimedPark.java
@@ -53,7 +53,7 @@ public class ParkAfterTimedPark {
         for (int i = 1; i <= iterations; i++) {
             System.out.println(Instant.now() + " => " + i + " of " + iterations);
             for (int timeout = 1; timeout <= 10; timeout++) {
-                test(timeout, true);
+                test(timeout, pinned);
             }
         }
     }
diff --git a/test/jdk/java/lang/constant/ClassDescTest.java b/test/jdk/java/lang/constant/ClassDescTest.java
index ee76d27e8d0..7551edff11a 100644
--- a/test/jdk/java/lang/constant/ClassDescTest.java
+++ b/test/jdk/java/lang/constant/ClassDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,23 +31,17 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /*
  * @test
  * @bug 8215510 8283075 8338544
  * @compile ClassDescTest.java
- * @run testng ClassDescTest
+ * @run junit ClassDescTest
  * @summary unit tests for java.lang.constant.ClassDesc
  */
-@Test
 public class ClassDescTest extends SymbolicDescTest {
 
     private void testClassDesc(ClassDesc r) throws ReflectiveOperationException {
@@ -73,7 +67,7 @@ public class ClassDescTest extends SymbolicDescTest {
         }
 
         if (!r.isClassOrInterface()) {
-            assertEquals(r.packageName(), "");
+            assertEquals("", r.packageName());
         }
     }
 
@@ -97,18 +91,19 @@ public class ClassDescTest extends SymbolicDescTest {
     private void testClassDesc(ClassDesc r, Class<?> c) throws ReflectiveOperationException {
         testClassDesc(r);
 
-        assertEquals(r.resolveConstantDesc(LOOKUP), c);
-        assertEquals(c.describeConstable().orElseThrow(), r);
-        assertEquals(ClassDesc.ofDescriptor(c.descriptorString()), r);
+        assertEquals(c, r.resolveConstantDesc(LOOKUP));
+        assertEquals(r, c.describeConstable().orElseThrow());
+        assertEquals(r, ClassDesc.ofDescriptor(c.descriptorString()));
         if (r.isArray()) {
             testClassDesc(r.componentType(), c.componentType());
         }
         if (r.isClassOrInterface()) {
-            assertEquals(r.packageName(), c.getPackageName());
+            assertEquals(c.getPackageName(), r.packageName());
         }
-        assertEquals(r.displayName(), classDisplayName(c));
+        assertEquals(classDisplayName(c), r.displayName());
     }
 
+    @Test
     public void testSymbolicDescsConstants() throws ReflectiveOperationException {
         int tested = 0;
         Field[] fields = ConstantDescs.class.getDeclaredFields();
@@ -132,6 +127,7 @@ public class ClassDescTest extends SymbolicDescTest {
         assertTrue(tested > 0);
     }
 
+    @Test
     public void testPrimitiveClassDesc() throws ReflectiveOperationException {
         for (Primitives p : Primitives.values()) {
             List<ClassDesc> descs = List.of(ClassDesc.ofDescriptor(p.descriptor),
@@ -140,26 +136,27 @@ public class ClassDescTest extends SymbolicDescTest {
             for (ClassDesc c : descs) {
                 testClassDesc(c, p.clazz);
                 assertTrue(c.isPrimitive());
-                assertEquals(p.descriptor, c.descriptorString());
-                assertEquals(p.name, c.displayName());
-                descs.forEach(cc -> assertEquals(c, cc));
+                assertEquals(c.descriptorString(), p.descriptor);
+                assertEquals(c.displayName(), p.name);
+                descs.forEach(cc -> assertEquals(cc, c));
                 if (p != Primitives.VOID) {
                     testClassDesc(c.arrayType(), p.arrayClass);
-                    assertEquals(c, p.arrayClass.describeConstable().orElseThrow().componentType());
-                    assertEquals(c, p.classDesc.arrayType().componentType());
+                    assertEquals(p.arrayClass.describeConstable().orElseThrow().componentType(), c);
+                    assertEquals(p.classDesc.arrayType().componentType(), c);
                 }
             }
 
             for (Primitives other : Primitives.values()) {
                 ClassDesc otherDescr = ClassDesc.ofDescriptor(other.descriptor);
                 if (p != other)
-                    descs.forEach(c -> assertNotEquals(c, otherDescr));
+                    descs.forEach(c -> assertNotEquals(otherDescr, c));
                 else
-                    descs.forEach(c -> assertEquals(c, otherDescr));
+                    descs.forEach(c -> assertEquals(otherDescr, c));
             }
         }
     }
 
+    @Test
     public void testSimpleClassDesc() throws ReflectiveOperationException {
 
         List<ClassDesc> stringClassDescs = Arrays.asList(ClassDesc.ofDescriptor("Ljava/lang/String;"),
@@ -175,22 +172,23 @@ public class ClassDescTest extends SymbolicDescTest {
             assertEquals("String", r.displayName());
             testClassDesc(r.arrayType(), String[].class);
             testClassDesc(r.arrayType(3), String[][][].class);
-            stringClassDescs.forEach(rr -> assertEquals(r, rr));
+            stringClassDescs.forEach(rr -> assertEquals(rr, r));
         }
 
         testClassDesc(ClassDesc.of("java.lang.String").arrayType(), String[].class);
         testClassDesc(ClassDesc.of("java.util.Map").nested("Entry"), Map.Entry.class);
 
-        assertEquals(ClassDesc.of("java.lang.String"), ClassDesc.ofDescriptor("Ljava/lang/String;"));
-        assertEquals(ClassDesc.of("java.lang.String"), ClassDesc.ofInternalName("java/lang/String"));
+        assertEquals(ClassDesc.ofDescriptor("Ljava/lang/String;"), ClassDesc.of("java.lang.String"));
+        assertEquals(ClassDesc.ofInternalName("java/lang/String"), ClassDesc.of("java.lang.String"));
 
         ClassDesc thisClassDesc = ClassDesc.ofDescriptor("LClassDescTest;");
-        assertEquals(thisClassDesc, ClassDesc.of("", "ClassDescTest"));
-        assertEquals(thisClassDesc, ClassDesc.of("ClassDescTest"));
-        assertEquals(thisClassDesc.displayName(), "ClassDescTest");
+        assertEquals(ClassDesc.of("", "ClassDescTest"), thisClassDesc);
+        assertEquals(ClassDesc.of("ClassDescTest"), thisClassDesc);
+        assertEquals("ClassDescTest", thisClassDesc.displayName());
         testClassDesc(thisClassDesc, ClassDescTest.class);
     }
 
+    @Test
     public void testPackageName() {
         assertEquals("com.foo", ClassDesc.of("com.foo.Bar").packageName());
         assertEquals("com.foo", ClassDesc.of("com.foo.Bar").nested("Baz").packageName());
@@ -205,33 +203,19 @@ public class ClassDescTest extends SymbolicDescTest {
     }
 
     private void testBadArrayRank(ClassDesc cr) {
-        try {
-            cr.arrayType(-1);
-            fail("");
-        } catch (IllegalArgumentException e) {
-            // good
-        }
-        try {
-            cr.arrayType(0);
-            fail("");
-        } catch (IllegalArgumentException e) {
-            // good
-        }
+        assertThrows(IllegalArgumentException.class, () -> cr.arrayType(-1));
+        assertThrows(IllegalArgumentException.class, () -> cr.arrayType(0));
     }
 
     private void testArrayRankOverflow() {
         ClassDesc TwoDArrayDesc =
             String.class.describeConstable().get().arrayType().arrayType();
 
-        try {
-            TwoDArrayDesc.arrayType(Integer.MAX_VALUE);
-            fail("");
-        } catch (IllegalArgumentException iae) {
-            // Expected
-        }
+        assertThrows(IllegalArgumentException.class, () -> TwoDArrayDesc.arrayType(Integer.MAX_VALUE));
     }
 
 
+    @Test
     public void testArrayClassDesc() throws ReflectiveOperationException {
         for (String d : basicDescs) {
             ClassDesc a0 = ClassDesc.ofDescriptor(d);
@@ -246,36 +230,32 @@ public class ClassDescTest extends SymbolicDescTest {
             assertTrue(a2.isArray());
             assertFalse(a1.isPrimitive());
             assertFalse(a2.isPrimitive());
-            assertEquals(a0.descriptorString(), d);
-            assertEquals(a1.descriptorString(), "[" + a0.descriptorString());
-            assertEquals(a2.descriptorString(), "[[" + a0.descriptorString());
+            assertEquals(d, a0.descriptorString());
+            assertEquals("[" + a0.descriptorString(), a1.descriptorString());
+            assertEquals("[[" + a0.descriptorString(), a2.descriptorString());
 
             assertNull(a0.componentType());
-            assertEquals(a0, a1.componentType());
-            assertEquals(a1, a2.componentType());
+            assertEquals(a1.componentType(), a0);
+            assertEquals(a2.componentType(), a1);
 
-            assertNotEquals(a0, a1);
-            assertNotEquals(a1, a2);
+            assertNotEquals(a1, a0);
+            assertNotEquals(a2, a1);
 
-            assertEquals(a1, ClassDesc.ofDescriptor("[" + d));
-            assertEquals(a2, ClassDesc.ofDescriptor("[[" + d));
-            assertEquals(classToDescriptor(a0.resolveConstantDesc(LOOKUP)), a0.descriptorString());
-            assertEquals(classToDescriptor(a1.resolveConstantDesc(LOOKUP)), a1.descriptorString());
-            assertEquals(classToDescriptor(a2.resolveConstantDesc(LOOKUP)), a2.descriptorString());
+            assertEquals(ClassDesc.ofDescriptor("[" + d), a1);
+            assertEquals(ClassDesc.ofDescriptor("[[" + d), a2);
+            assertEquals(a0.descriptorString(), classToDescriptor(a0.resolveConstantDesc(LOOKUP)));
+            assertEquals(a1.descriptorString(), classToDescriptor(a1.resolveConstantDesc(LOOKUP)));
+            assertEquals(a2.descriptorString(), classToDescriptor(a2.resolveConstantDesc(LOOKUP)));
 
             testBadArrayRank(ConstantDescs.CD_int);
             testBadArrayRank(ConstantDescs.CD_String);
             testBadArrayRank(ClassDesc.of("Bar"));
             testArrayRankOverflow();
         }
-        try {
-            ConstantDescs.CD_void.arrayType();
-            fail("Should throw IAE");
-        } catch (IllegalArgumentException iae) {
-            // Expected
-        }
+        assertThrows(IllegalArgumentException.class, () -> ConstantDescs.CD_void.arrayType());
     }
 
+    @Test
     public void testBadClassDescs() {
         List<String> badDescriptors = List.of("II", "I;", "Q", "L", "",
                                               "java.lang.String", "[]", "Ljava/lang/String",
@@ -283,35 +263,19 @@ public class ClassDescTest extends SymbolicDescTest {
                                               "La//b;", "L/a;", "La/;");
 
         for (String d : badDescriptors) {
-            try {
-                ClassDesc constant = ClassDesc.ofDescriptor(d);
-                fail(d);
-            }
-            catch (IllegalArgumentException e) {
-                // good
-            }
+            assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(d), d);
         }
 
         List<String> badBinaryNames = List.of("I;", "[]", "Ljava/lang/String",
                 "Ljava.lang.String;", "java/lang/String", "");
         for (String d : badBinaryNames) {
-            try {
-                ClassDesc constant = ClassDesc.of(d);
-                fail(d);
-            } catch (IllegalArgumentException e) {
-                // good
-            }
+            assertThrows(IllegalArgumentException.class, () -> ClassDesc.of(d), d);
         }
 
         List<String> badInternalNames = List.of("I;", "[]", "[Ljava/lang/String;",
                 "Ljava.lang.String;", "java.lang.String", "");
         for (String d : badInternalNames) {
-            try {
-                ClassDesc constant = ClassDesc.ofInternalName(d);
-                fail(d);
-            } catch (IllegalArgumentException e) {
-                // good
-            }
+            assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofInternalName(d), d);
         }
 
         for (Primitives p : Primitives.values()) {
@@ -321,80 +285,48 @@ public class ClassDescTest extends SymbolicDescTest {
 
         ClassDesc stringDesc = ClassDesc.ofDescriptor("Ljava/lang/String;");
         ClassDesc stringArrDesc = stringDesc.arrayType(255);
-        try {
-            ClassDesc arrGreaterThan255 = stringArrDesc.arrayType();
-            fail("can't create an array type descriptor with more than 255 dimensions");
-        } catch (IllegalStateException e) {
-            // good
-        }
-        String descWith255ArrayDims = new String(new char[255]).replace('\0', '[');
-        try {
-            ClassDesc arrGreaterThan255 = ClassDesc.ofDescriptor(descWith255ArrayDims + "[Ljava/lang/String;");
-            fail("can't create an array type descriptor with more than 255 dimensions");
-        } catch (IllegalArgumentException e) {
-            // good
-        }
-        try {
-            ClassDesc arrWith255Dims = ClassDesc.ofDescriptor(descWith255ArrayDims + "Ljava/lang/String;");
-            arrWith255Dims.arrayType(1);
-            fail("can't create an array type descriptor with more than 255 dimensions");
-        } catch (IllegalArgumentException e) {
-            // good
-        }
+        assertThrows(IllegalStateException.class, () -> stringArrDesc.arrayType(),
+                "can't create an array type descriptor with more than 255 dimensions");
+        String descWith255ArrayDims = "[".repeat(255);
+        assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(descWith255ArrayDims + "[Ljava/lang/String;"),
+                "can't create an array type descriptor with more than 255 dimensions");
+        ClassDesc arrWith255Dims = ClassDesc.ofDescriptor(descWith255ArrayDims + "Ljava/lang/String;");
+        assertThrows(IllegalArgumentException.class, () -> arrWith255Dims.arrayType(1),
+                "can't create an array type descriptor with more than 255 dimensions");
     }
 
     private void testBadNestedClasses(ClassDesc cr, String firstNestedName, String... moreNestedNames) {
-        try {
-            cr.nested(firstNestedName, moreNestedNames);
-            fail("");
-        } catch (IllegalStateException e) {
-            // good
-        }
+        assertThrows(IllegalStateException.class, () -> cr.nested(firstNestedName, moreNestedNames));
     }
 
+    @Test
     public void testLangClasses() {
         Double d = 1.0;
-        assertEquals(d.resolveConstantDesc(LOOKUP), d);
-        assertEquals(d.describeConstable().get(), d);
+        assertEquals(d, d.resolveConstantDesc(LOOKUP));
+        assertEquals(d, d.describeConstable().get());
 
         Integer i = 1;
-        assertEquals(i.resolveConstantDesc(LOOKUP), i);
-        assertEquals(i.describeConstable().get(), i);
+        assertEquals(i, i.resolveConstantDesc(LOOKUP));
+        assertEquals(i, i.describeConstable().get());
 
         Float f = 1.0f;
-        assertEquals(f.resolveConstantDesc(LOOKUP), f);
-        assertEquals(f.describeConstable().get(), f);
+        assertEquals(f, f.resolveConstantDesc(LOOKUP));
+        assertEquals(f, f.describeConstable().get());
 
         Long l = 1L;
-        assertEquals(l.resolveConstantDesc(LOOKUP), l);
-        assertEquals(l.describeConstable().get(), l);
+        assertEquals(l, l.resolveConstantDesc(LOOKUP));
+        assertEquals(l, l.describeConstable().get());
 
         String s = "";
-        assertEquals(s.resolveConstantDesc(LOOKUP), s);
-        assertEquals(s.describeConstable().get(), s);
+        assertEquals(s, s.resolveConstantDesc(LOOKUP));
+        assertEquals(s, s.describeConstable().get());
     }
 
+    @Test
     public void testNullNestedClasses() {
         ClassDesc cd = ClassDesc.of("Bar");
-        try {
-            cd.nested(null);
-            fail("");
-        } catch (NullPointerException e) {
-            // good
-        }
-
-        try {
-            cd.nested("good", null);
-            fail("");
-        } catch (NullPointerException e) {
-            // good
-        }
-
-        try {
-            cd.nested("good", "goodToo", null);
-            fail("");
-        } catch (NullPointerException e) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> cd.nested(null));
+        assertThrows(NullPointerException.class, () -> cd.nested("good", null));
+        assertThrows(NullPointerException.class, () -> cd.nested("good", "goodToo", null));
     }
 }
diff --git a/test/jdk/java/lang/constant/CondyDescTest.java b/test/jdk/java/lang/constant/CondyDescTest.java
index 08350f7748c..194c12527a2 100644
--- a/test/jdk/java/lang/constant/CondyDescTest.java
+++ b/test/jdk/java/lang/constant/CondyDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,52 +33,50 @@ import java.lang.constant.DirectMethodHandleDesc;
 import java.lang.constant.DynamicConstantDesc;
 import java.lang.constant.MethodHandleDesc;
 
-import org.testng.annotations.Test;
-
 import static java.lang.constant.ConstantDescs.CD_MethodHandle;
 import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.constant.ConstantDescs.CD_String;
 import static java.lang.constant.ConstantDescs.CD_VarHandle;
 import static java.lang.constant.ConstantDescs.CD_int;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
  * @compile CondyDescTest.java
- * @run testng CondyDescTest
+ * @run junit CondyDescTest
  * @summary unit tests for java.lang.constant.CondyDescTest
  */
-@Test
 public class CondyDescTest extends SymbolicDescTest {
     private final static ConstantDesc[] EMPTY_ARGS = new ConstantDesc[0];
     private final static ClassDesc CD_ConstantBootstraps = ClassDesc.of("java.lang.invoke.ConstantBootstraps");
 
     private static<T> void testDCR(DynamicConstantDesc<T> r, T c) throws ReflectiveOperationException {
-        assertEquals(r, DynamicConstantDesc.ofNamed(r.bootstrapMethod(), r.constantName(), r.constantType(), r.bootstrapArgs()));
-        assertEquals(r.resolveConstantDesc(LOOKUP), c);
+        assertEquals(DynamicConstantDesc.ofNamed(r.bootstrapMethod(), r.constantName(), r.constantType(), r.bootstrapArgs()), r);
+        assertEquals(c, r.resolveConstantDesc(LOOKUP));
     }
 
     private void testVarHandleDesc(DynamicConstantDesc<VarHandle> r, VarHandle vh) throws ReflectiveOperationException  {
         testSymbolicDesc(r);
-        assertEquals(vh.describeConstable().orElseThrow(), r);
+        assertEquals(r, vh.describeConstable().orElseThrow());
     }
 
     private static<E extends Enum<E>> void testEnumDesc(EnumDesc<E> r, E e) throws ReflectiveOperationException {
         testSymbolicDesc(r);
 
-        assertEquals(r, EnumDesc.of(r.constantType(), r.constantName()));
-        assertEquals(r.resolveConstantDesc(LOOKUP), e);
+        assertEquals(EnumDesc.of(r.constantType(), r.constantName()), r);
+        assertEquals(e, r.resolveConstantDesc(LOOKUP));
     }
 
+    @Test
     public void testNullConstant() throws ReflectiveOperationException {
         DynamicConstantDesc<?> r = (DynamicConstantDesc<?>) ConstantDescs.NULL;
-        assertEquals(r, DynamicConstantDesc.ofNamed(r.bootstrapMethod(), r.constantName(), r.constantType(), r.bootstrapArgs()));
+        assertEquals(DynamicConstantDesc.ofNamed(r.bootstrapMethod(), r.constantName(), r.constantType(), r.bootstrapArgs()), r);
         assertNull(r.resolveConstantDesc(LOOKUP));
     }
 
@@ -86,6 +84,7 @@ public class CondyDescTest extends SymbolicDescTest {
         return a + b;
     }
 
+    @Test
     public void testDynamicConstant() throws ReflectiveOperationException {
         DirectMethodHandleDesc bsmDesc = ConstantDescs.ofConstantBootstrap(ClassDesc.of("CondyDescTest"), "concatBSM",
                                                                             CD_String, CD_String, CD_String);
@@ -93,6 +92,7 @@ public class CondyDescTest extends SymbolicDescTest {
         testDCR(r, "foobar");
     }
 
+    @Test
     public void testNested() throws Throwable {
         DirectMethodHandleDesc invoker = ConstantDescs.ofConstantBootstrap(CD_ConstantBootstraps, "invoke", CD_Object, CD_MethodHandle, CD_Object.arrayType());
         DirectMethodHandleDesc format = MethodHandleDesc.ofMethod(DirectMethodHandleDesc.Kind.STATIC, CD_String, "format",
@@ -101,7 +101,7 @@ public class CondyDescTest extends SymbolicDescTest {
         String s = (String) invoker.resolveConstantDesc(LOOKUP)
                                    .invoke(LOOKUP, "", String.class,
                                            format.resolveConstantDesc(LOOKUP), "%s%s", "moo", "cow");
-        assertEquals(s, "moocow");
+        assertEquals("moocow", s);
 
         DynamicConstantDesc<String> desc = DynamicConstantDesc.of(invoker, format, "%s%s", "moo", "cow");
         testDCR(desc, "moocow");
@@ -112,6 +112,7 @@ public class CondyDescTest extends SymbolicDescTest {
 
     enum MyEnum { A, B, C }
 
+    @Test
     public void testEnumDesc() throws ReflectiveOperationException {
         ClassDesc enumClass = ClassDesc.of("CondyDescTest").nested("MyEnum");
 
@@ -131,6 +132,7 @@ public class CondyDescTest extends SymbolicDescTest {
         int f;
     }
 
+    @Test
     public void testVarHandles() throws ReflectiveOperationException {
         ClassDesc testClass = ClassDesc.of("CondyDescTest").nested("MyClass");
         MyClass instance = new MyClass();
@@ -140,20 +142,20 @@ public class CondyDescTest extends SymbolicDescTest {
         VarHandle varHandle = LOOKUP.findStaticVarHandle(MyClass.class, "sf", int.class);
         testVarHandleDesc(vhc, varHandle);
 
-        assertEquals(varHandle.varType(), int.class);
+        assertEquals(int.class, varHandle.varType());
         varHandle.set(8);
         assertEquals(8, (int) varHandle.get());
-        assertEquals(MyClass.sf, 8);
+        assertEquals(8, MyClass.sf);
 
         // static varHandle
         vhc = VarHandleDesc.ofField(testClass, "f", CD_int);
         varHandle = LOOKUP.findVarHandle(MyClass.class, "f", int.class);
         testVarHandleDesc(vhc, varHandle);
 
-        assertEquals(varHandle.varType(), int.class);
+        assertEquals(int.class, varHandle.varType());
         varHandle.set(instance, 9);
         assertEquals(9, (int) varHandle.get(instance));
-        assertEquals(instance.f, 9);
+        assertEquals(9, instance.f);
 
         vhc = VarHandleDesc.ofArray(CD_int.arrayType());
         varHandle = MethodHandles.arrayElementVarHandle(int[].class);
@@ -215,6 +217,7 @@ public class CondyDescTest extends SymbolicDescTest {
         }
     }
 
+    @Test
     public void testLifting() {
         DynamicConstantDesc<Object> unliftedNull = DynamicConstantDesc.ofNamed(ConstantDescs.BSM_NULL_CONSTANT, "_", CD_Object, EMPTY_ARGS);
         assertEquals(ConstantDescs.NULL, unliftedNull);
diff --git a/test/jdk/java/lang/constant/ConstantDescsTest.java b/test/jdk/java/lang/constant/ConstantDescsTest.java
index 9b0e73868b9..0d7a85f5425 100644
--- a/test/jdk/java/lang/constant/ConstantDescsTest.java
+++ b/test/jdk/java/lang/constant/ConstantDescsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,6 @@
  * questions.
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDesc;
 import java.lang.constant.ConstantDescs;
@@ -47,18 +44,20 @@ import java.util.Set;
 import java.util.stream.Stream;
 
 import static java.lang.constant.ConstantDescs.*;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @compile ConstantDescsTest.java
- * @run testng ConstantDescsTest
+ * @run junit ConstantDescsTest
  * @summary unit tests for java.lang.constant.ConstantDescs
  */
 public class ConstantDescsTest {
 
-    @DataProvider(name = "validateFields")
-    public Object[][] knownFieldsData() {
+    public static Object[][] knownFieldsData() {
         return new Object[][]{
                 {CD_Object, Object.class},
                 {CD_String, String.class},
@@ -117,10 +116,11 @@ public class ConstantDescsTest {
      * constants.
      * @throws ReflectiveOperationException if the test fails
      */
-    @Test(dataProvider = "validateFields")
+    @ParameterizedTest
+    @MethodSource("knownFieldsData")
     public void validateFields(ConstantDesc desc, Object value) throws ReflectiveOperationException {
         // Use a minimally-trusted lookup
-        assertEquals(desc.resolveConstantDesc(MethodHandles.publicLookup()), value);
+        assertEquals(value, desc.resolveConstantDesc(MethodHandles.publicLookup()));
     }
 
     /**
diff --git a/test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java b/test/jdk/java/lang/constant/ConstantUtilsTest.java
similarity index 65%
rename from test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
rename to test/jdk/java/lang/constant/ConstantUtilsTest.java
index 3afcc64bc4a..c614132c7e5 100644
--- a/test/jdk/java/lang/constant/boottest/java.base/jdk/internal/constant/ConstantUtilsTest.java
+++ b/test/jdk/java/lang/constant/ConstantUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,55 +21,41 @@
  * questions.
  */
 
-package jdk.internal.constant;
-
 import java.lang.constant.*;
 import java.util.*;
 
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
-import static org.testng.Assert.*;
+import jdk.internal.constant.ConstantAccess;
+import jdk.internal.constant.ConstantUtils;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @bug 8303930
+ * @build java.base/jdk.internal.constant.*
  * @compile ConstantUtilsTest.java
  * @modules java.base/jdk.internal.constant
- * @run testng ConstantUtilsTest
+ * @run junit ConstantUtilsTest
  * @summary unit tests for methods of java.lang.constant.ConstantUtils that are not covered by other unit tests
  */
-@Test
 public class ConstantUtilsTest {
     private static ClassDesc thisClass = ClassDesc.of("MethodHandleDescTest");
 
+    @Test
     public void testValidateMemberName() {
-        try {
-            ConstantUtils.validateMemberName(null, false);
-            fail("");
-        } catch (NullPointerException e) {
-            // good
-        }
-
-        try {
-            ConstantUtils.validateMemberName("", false);
-            fail("");
-        } catch (IllegalArgumentException e) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> ConstantUtils.validateMemberName(null, false));
+        assertThrows(IllegalArgumentException.class, () -> ConstantUtils.validateMemberName("", false));
 
         List<String> badNames = List.of(".", ";", "[", "/", "<", ">");
         for (String n : badNames) {
-            try {
-                ConstantUtils.validateMemberName(n, true);
-                fail(n);
-            } catch (IllegalArgumentException e) {
-                // good
-            }
+            assertThrows(IllegalArgumentException.class, () -> ConstantUtils.validateMemberName(n, true), n);
         }
     }
 
+    @Test
     public void testSkipOverFieldSignatureVoid() {
-       int ret = ConstantUtils.skipOverFieldSignature("(V)V", 1, 4);
-       assertEquals(ret, 0, "Descriptor of (V)V starting at index 1, void disallowed");
+       int ret = ConstantAccess.skipOverFieldSignature("(V)V", 1, 4);
+       assertEquals(0, ret, "Descriptor of (V)V starting at index 1, void disallowed");
     }
 }
diff --git a/test/jdk/java/lang/constant/DescribeResolveTest.java b/test/jdk/java/lang/constant/DescribeResolveTest.java
index cc2a36dd3e2..7a9a11e64d0 100644
--- a/test/jdk/java/lang/constant/DescribeResolveTest.java
+++ b/test/jdk/java/lang/constant/DescribeResolveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,21 +23,19 @@
 
 /*
  * @test
- * @run testng DescribeResolveTest
+ * @run junit DescribeResolveTest
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.constant.Constable;
 import java.lang.constant.ConstantDesc;
 import java.lang.invoke.MethodHandles;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class DescribeResolveTest {
 
-    @DataProvider
     public static Object[][] constables() {
         return new Object[][]{
             { true },
@@ -48,7 +46,8 @@ public class DescribeResolveTest {
         };
     }
 
-    @Test(dataProvider = "constables")
+    @ParameterizedTest
+    @MethodSource("constables")
     public void testDescribeResolve(Constable constable) throws ReflectiveOperationException {
         ConstantDesc desc = constable.describeConstable().orElseThrow();
         Object resolved = desc.resolveConstantDesc(MethodHandles.lookup());
diff --git a/test/jdk/java/lang/constant/DynamicCallSiteDescTest.java b/test/jdk/java/lang/constant/DynamicCallSiteDescTest.java
index 6f5e04efeb0..14d5fadbf01 100644
--- a/test/jdk/java/lang/constant/DynamicCallSiteDescTest.java
+++ b/test/jdk/java/lang/constant/DynamicCallSiteDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,109 +21,71 @@
  * questions.
  */
 
-import java.lang.invoke.MethodType;
 import java.lang.constant.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static java.lang.constant.ConstantDescs.CD_int;
-import static java.lang.constant.ConstantDescs.CD_void;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
-/**
+/*
  * @test
  * @compile DynamicCallSiteDescTest.java
- * @run testng DynamicCallSiteDescTest
+ * @run junit DynamicCallSiteDescTest
  * @summary unit tests for java.lang.constant.DynamicCallSiteDesc
  */
 
-@Test
 public class DynamicCallSiteDescTest extends SymbolicDescTest {
     /* note there is no unit test for method resolveCallSiteDesc as it is being tested in another test in this
      * suite, IndyDescTest
      */
 
+    @Test
     public void testOf() throws ReflectiveOperationException {
         DirectMethodHandleDesc dmh = ConstantDescs.ofCallsiteBootstrap(
                 ClassDesc.of("BootstrapAndTarget"),
                 "bootstrap",
                 ClassDesc.of("java.lang.invoke.CallSite")
         );
-        try {
-            DynamicCallSiteDesc.of(
-                    dmh,
-                    "",
-                    MethodTypeDesc.ofDescriptor("()I")
-            );
-            fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException iae) {
-            // good
-        }
+        assertThrows(IllegalArgumentException.class, () -> DynamicCallSiteDesc.of(
+                dmh,
+                "",
+                MethodTypeDesc.ofDescriptor("()I")
+        ));
 
-        try {
-            DynamicCallSiteDesc.of(
-                    null,
-                    "getTarget",
-                    MethodTypeDesc.ofDescriptor("()I")
-            );
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> DynamicCallSiteDesc.of(
+                null,
+                "getTarget",
+                MethodTypeDesc.ofDescriptor("()I")
+        ));
 
-        try {
-            DynamicCallSiteDesc.of(
-                    dmh,
-                    null,
-                    MethodTypeDesc.ofDescriptor("()I")
-            );
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> DynamicCallSiteDesc.of(
+                dmh,
+                null,
+                MethodTypeDesc.ofDescriptor("()I")
+        ));
 
-        try {
-            DynamicCallSiteDesc.of(
-                    dmh,
-                    "getTarget",
-                    null
-            );
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> DynamicCallSiteDesc.of(
+                dmh,
+                "getTarget",
+                null
+        ));
 
-        try {
-            DynamicCallSiteDesc.of(
-                    dmh,
-                    "getTarget",
-                    MethodTypeDesc.ofDescriptor("()I"),
-                    null
-            );
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
-        try {
-            DynamicCallSiteDesc.of(
-                    dmh,
-                    "getTarget",
-                    MethodTypeDesc.ofDescriptor("()I"),
-                    new ConstantDesc[]{ null }
-            );
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> DynamicCallSiteDesc.of(
+                dmh,
+                "getTarget",
+                MethodTypeDesc.ofDescriptor("()I"),
+                null
+        ));
+
+        assertThrows(NullPointerException.class, () -> DynamicCallSiteDesc.of(
+                dmh,
+                "getTarget",
+                MethodTypeDesc.ofDescriptor("()I"),
+                new ConstantDesc[]{ null }
+        ));
     }
 
+    @Test
     public void testWithArgs() throws ReflectiveOperationException {
         DynamicCallSiteDesc desc = DynamicCallSiteDesc.of(ConstantDescs.ofCallsiteBootstrap(
                 ClassDesc.of("BootstrapAndTarget"),
@@ -134,21 +96,11 @@ public class DynamicCallSiteDescTest extends SymbolicDescTest {
             MethodTypeDesc.ofDescriptor("()I")
         );
 
-        try {
-            desc.withArgs(null);
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
-
-        try {
-            desc.withArgs(new ConstantDesc[]{ null });
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> desc.withArgs(null));
+        assertThrows(NullPointerException.class, () -> desc.withArgs(new ConstantDesc[]{ null }));
     }
 
+    @Test
     public void testWithNameAndType() throws ReflectiveOperationException {
         DynamicCallSiteDesc desc = DynamicCallSiteDesc.of(ConstantDescs.ofCallsiteBootstrap(
                 ClassDesc.of("BootstrapAndTarget"),
@@ -159,21 +111,11 @@ public class DynamicCallSiteDescTest extends SymbolicDescTest {
                 MethodTypeDesc.ofDescriptor("()I")
         );
 
-        try {
-            desc.withNameAndType(null, MethodTypeDesc.ofDescriptor("()I"));
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
-
-        try {
-            desc.withNameAndType("bootstrap", null);
-            fail("NullPointerException expected");
-        } catch (NullPointerException npe) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> desc.withNameAndType(null, MethodTypeDesc.ofDescriptor("()I")));
+        assertThrows(NullPointerException.class, () -> desc.withNameAndType("bootstrap", null));
     }
 
+    @Test
     public void testAccessorsAndFactories() throws ReflectiveOperationException {
         DynamicCallSiteDesc desc = DynamicCallSiteDesc.of(ConstantDescs.ofCallsiteBootstrap(
                 ClassDesc.of("BootstrapAndTarget"),
diff --git a/test/jdk/java/lang/constant/IndyDescTest.java b/test/jdk/java/lang/constant/IndyDescTest.java
index 13862fecd0b..9d635c0eb08 100644
--- a/test/jdk/java/lang/constant/IndyDescTest.java
+++ b/test/jdk/java/lang/constant/IndyDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,19 +32,19 @@ import java.lang.constant.DynamicCallSiteDesc;
 import java.lang.constant.MethodHandleDesc;
 import java.lang.constant.MethodTypeDesc;
 
-import org.testng.annotations.Test;
 
 import static java.lang.constant.ConstantDescs.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @compile IndyDescTest.java
- * @run testng IndyDescTest
+ * @run junit IndyDescTest
  * @summary unit tests for java.lang.constant.IndyDescTest
  */
-@Test
 public class IndyDescTest {
     public static CallSite bootstrap(MethodHandles.Lookup lookup, String name, MethodType type,
                                      Object... args) {
@@ -54,6 +54,7 @@ public class IndyDescTest {
             return new ConstantCallSite(MethodHandles.constant(String.class, (String) args[0]));
     }
 
+    @Test
     public void testIndyDesc() throws Throwable {
         ClassDesc c = ClassDesc.of("IndyDescTest");
         MethodTypeDesc mt = MethodTypeDesc.of(CD_CallSite, CD_MethodHandles_Lookup, CD_String, CD_MethodType, CD_Object.arrayType());
@@ -96,6 +97,7 @@ public class IndyDescTest {
         assertEquals("foo", csd5.invocationName());
     }
 
+    @Test
     public void testEqualsHashToString() throws Throwable {
         ClassDesc c = ClassDesc.of("IndyDescTest");
         MethodTypeDesc mt = MethodTypeDesc.of(CD_CallSite, CD_MethodHandles_Lookup, CD_String, CD_MethodType, CD_Object.arrayType());
@@ -109,14 +111,14 @@ public class IndyDescTest {
         assertNotEquals(csd1, csd3);
         assertNotEquals(csd1.hashCode(), csd3.hashCode());
 
-        assertEquals(csd1.toString(), "DynamicCallSiteDesc[IndyDescTest::bootstrap(wooga/):()String]");
+        assertEquals("DynamicCallSiteDesc[IndyDescTest::bootstrap(wooga/):()String]", csd1.toString());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testEmptyInvocationName() throws Throwable {
         ClassDesc c = ClassDesc.of("IndyDescTest");
         MethodTypeDesc mt = MethodTypeDesc.of(CD_CallSite, CD_MethodHandles_Lookup, CD_String, CD_MethodType, CD_Object.arrayType());
         DirectMethodHandleDesc mh = MethodHandleDesc.ofMethod(DirectMethodHandleDesc.Kind.STATIC, c, "bootstrap", mt);
-        DynamicCallSiteDesc csd1 = DynamicCallSiteDesc.of(mh, "", MethodTypeDesc.of(CD_String));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> DynamicCallSiteDesc.of(mh, "", MethodTypeDesc.of(CD_String)));
     }
 }
diff --git a/test/jdk/java/lang/constant/MethodHandleDescTest.java b/test/jdk/java/lang/constant/MethodHandleDescTest.java
index e8b66daa6b7..68d9dad045b 100644
--- a/test/jdk/java/lang/constant/MethodHandleDescTest.java
+++ b/test/jdk/java/lang/constant/MethodHandleDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
-import org.testng.annotations.Test;
 
 import static java.lang.constant.ConstantDescs.CD_Void;
 import static java.lang.constant.ConstantDescs.CD_boolean;
@@ -54,20 +53,16 @@ import static java.lang.constant.ConstantDescs.CD_String;
 import static java.lang.constant.ConstantDescs.CD_int;
 import static java.lang.constant.ConstantDescs.CD_void;
 import static java.lang.invoke.MethodHandleInfo.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertSame;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import org.junit.jupiter.api.Test;
 
-/**
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
  * @test
  * @compile MethodHandleDescTest.java
- * @run testng MethodHandleDescTest
+ * @run junit MethodHandleDescTest
  * @summary unit tests for java.lang.constant.MethodHandleDesc
  */
-@Test
 public class MethodHandleDescTest extends SymbolicDescTest {
     private static ClassDesc helperHolderClass = ClassDesc.of("TestHelpers");
     private static ClassDesc testClass = helperHolderClass.nested("TestClass");
@@ -75,13 +70,13 @@ public class MethodHandleDescTest extends SymbolicDescTest {
     private static ClassDesc testSuperclass = helperHolderClass.nested("TestSuperclass");
 
 
-    private static void assertMHEquals(MethodHandle a, MethodHandle b) {
-        MethodHandleInfo ia = LOOKUP.revealDirect(a);
-        MethodHandleInfo ib = LOOKUP.revealDirect(b);
-        assertEquals(ia.getDeclaringClass(), ib.getDeclaringClass());
-        assertEquals(ia.getName(), ib.getName());
-        assertEquals(ia.getMethodType(), ib.getMethodType());
-        assertEquals(ia.getReferenceKind(), ib.getReferenceKind());
+    private static void assertMHEquals(MethodHandle expected, MethodHandle actual) {
+        MethodHandleInfo expectedInfo = LOOKUP.revealDirect(expected);
+        MethodHandleInfo actualInfo = LOOKUP.revealDirect(actual);
+        assertEquals(expectedInfo.getDeclaringClass(), actualInfo.getDeclaringClass());
+        assertEquals(expectedInfo.getName(), actualInfo.getName());
+        assertEquals(expectedInfo.getMethodType(), actualInfo.getMethodType());
+        assertEquals(expectedInfo.getReferenceKind(), actualInfo.getReferenceKind());
     }
 
     private void testMethodHandleDesc(MethodHandleDesc r) throws ReflectiveOperationException {
@@ -89,8 +84,8 @@ public class MethodHandleDescTest extends SymbolicDescTest {
             testSymbolicDesc(r);
 
             DirectMethodHandleDesc rr = (DirectMethodHandleDesc) r;
-            assertEquals(r, MethodHandleDesc.of(rr.kind(), rr.owner(), rr.methodName(), rr.lookupDescriptor()));
-            assertEquals(r.invocationType().resolveConstantDesc(LOOKUP), r.resolveConstantDesc(LOOKUP).type());
+            assertEquals(MethodHandleDesc.of(rr.kind(), rr.owner(), rr.methodName(), rr.lookupDescriptor()), r);
+            assertEquals(r.resolveConstantDesc(LOOKUP).type(), r.invocationType().resolveConstantDesc(LOOKUP));
         }
         else {
             testSymbolicDescForwardOnly(r);
@@ -114,19 +109,20 @@ public class MethodHandleDescTest extends SymbolicDescTest {
     private void testMethodHandleDesc(MethodHandleDesc r, MethodHandle mh) throws ReflectiveOperationException {
         testMethodHandleDesc(r);
 
-        assertMHEquals(r.resolveConstantDesc(LOOKUP), mh);
-        assertEquals(mh.describeConstable().orElseThrow(), r);
+        assertMHEquals(mh, r.resolveConstantDesc(LOOKUP));
+        assertEquals(r, mh.describeConstable().orElseThrow());
 
         // compare extractable properties: refKind, owner, name, type
         MethodHandleInfo mhi = LOOKUP.revealDirect(mh);
         DirectMethodHandleDesc rr = (DirectMethodHandleDesc) r;
-        assertEquals(mhi.getDeclaringClass().descriptorString(), rr.owner().descriptorString());
-        assertEquals(mhi.getName(), rr.methodName());
-        assertEquals(mhi.getReferenceKind(), rr.kind().refKind);
+        assertEquals(rr.owner().descriptorString(), mhi.getDeclaringClass().descriptorString());
+        assertEquals(rr.methodName(), mhi.getName());
+        assertEquals(rr.kind().refKind, mhi.getReferenceKind());
         MethodType type = mhi.getMethodType();
-        assertEquals(type.toMethodDescriptorString(), lookupDescriptor(rr));
+        assertEquals(lookupDescriptor(rr), type.toMethodDescriptorString());
     }
 
+    @Test
     public void testSimpleMHs() throws ReflectiveOperationException {
         MethodHandle MH_String_isEmpty = LOOKUP.findVirtual(String.class, "isEmpty", MethodType.fromMethodDescriptorString("()Z", null));
         testMethodHandleDesc(MethodHandleDesc.of(Kind.VIRTUAL, CD_String, "isEmpty", "()Z"), MH_String_isEmpty);
@@ -147,33 +143,16 @@ public class MethodHandleDescTest extends SymbolicDescTest {
                              MH_ArrayList_new);
         testMethodHandleDesc(MethodHandleDesc.ofConstructor(ClassDesc.of("java.util.ArrayList")), MH_ArrayList_new);
 
-        // bad constructor non void return type
-        try {
-            MethodHandleDesc.of(Kind.CONSTRUCTOR, ClassDesc.of("java.util.ArrayList"), "<init>", "()I");
-            fail("should have failed: non void return type for constructor");
-        } catch (IllegalArgumentException ex) {
-            // good
-        }
+        assertThrows(IllegalArgumentException.class, () -> MethodHandleDesc.of(Kind.CONSTRUCTOR, ClassDesc.of("java.util.ArrayList"), "<init>", "()I"),
+                "bad constructor non void return type");
+        assertThrows(NullPointerException.class, () -> MethodHandleDesc.ofConstructor(ClassDesc.of("java.util.ArrayList", null)),
+                "null list of parameters");
 
-        // null list of parameters
-        try {
-            MethodHandleDesc.ofConstructor(ClassDesc.of("java.util.ArrayList", null));
-            fail("should have failed: null list of parameters");
-        } catch (NullPointerException ex) {
-            // good
-        }
-
-        // null elements in list of parameters
-        try {
-            ClassDesc[] paramList = new ClassDesc[1];
-            paramList[0] = null;
-            MethodHandleDesc.ofConstructor(ClassDesc.of("java.util.ArrayList"), paramList);
-            fail("should have failed: null content in list of parameters");
-        } catch (NullPointerException ex) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> MethodHandleDesc.ofConstructor(ClassDesc.of("java.util.ArrayList"), new ClassDesc[] { null }),
+                "null elements in list of parameters");
     }
 
+    @Test
     public void testAsType() throws Throwable {
         MethodHandleDesc mhr = MethodHandleDesc.ofMethod(Kind.STATIC, ClassDesc.of("java.lang.Integer"), "valueOf",
                                                          MethodTypeDesc.of(CD_Integer, CD_int));
@@ -181,41 +160,33 @@ public class MethodHandleDescTest extends SymbolicDescTest {
         testMethodHandleDesc(takesInteger);
         MethodHandle mh1 = takesInteger.resolveConstantDesc(LOOKUP);
         assertEquals((Integer) 3, (Integer) mh1.invokeExact((Integer) 3));
-        assertEquals(takesInteger.toString(), "MethodHandleDesc[STATIC/Integer::valueOf(int)Integer].asType(Integer)Integer");
+        assertEquals("MethodHandleDesc[STATIC/Integer::valueOf(int)Integer].asType(Integer)Integer", takesInteger.toString());
 
-        try {
-            Integer i = (Integer) mh1.invokeExact(3);
-            fail("Expected WMTE");
-        }
-        catch (WrongMethodTypeException ignored) { }
+        assertThrows(WrongMethodTypeException.class, () -> {
+            Integer _ = (Integer) mh1.invokeExact(3);
+        });
 
         MethodHandleDesc takesInt = takesInteger.asType(MethodTypeDesc.of(CD_Integer, CD_int));
         testMethodHandleDesc(takesInt);
         MethodHandle mh2 = takesInt.resolveConstantDesc(LOOKUP);
         assertEquals((Integer) 3, (Integer) mh2.invokeExact(3));
 
-        try {
-            Integer i = (Integer) mh2.invokeExact((Integer) 3);
-            fail("Expected WMTE");
-        }
-        catch (WrongMethodTypeException ignored) { }
+        assertThrows(WrongMethodTypeException.class, () -> {
+            Integer _ = (Integer) mh2.invokeExact((Integer) 3);
+        });
 
         // Short circuit optimization
         MethodHandleDesc same = mhr.asType(mhr.invocationType());
         assertSame(mhr, same);
 
-        try {
-            mhr.asType(null);
-            fail("Expected NPE");
-        } catch (NullPointerException ex) {
-            // good
-        }
+        assertThrows(NullPointerException.class, () -> mhr.asType(null));
 
         // @@@ Test varargs adaptation
         // @@@ Test bad adaptations and assert runtime error on resolution
         // @@@ Test intrinsification of adapted MH
     }
 
+    @Test
     public void testMethodHandleDesc() throws Throwable {
         MethodHandleDesc ctorDesc = MethodHandleDesc.of(Kind.CONSTRUCTOR, testClass, "<ignored!>", "()V");
         MethodHandleDesc staticMethodDesc = MethodHandleDesc.of(Kind.STATIC, testClass, "sm", "(I)I");
@@ -229,14 +200,14 @@ public class MethodHandleDescTest extends SymbolicDescTest {
         MethodHandleDesc privateStaticMethodDesc = MethodHandleDesc.of(Kind.STATIC, testClass, "psm", "(I)I");
         MethodHandleDesc privateStaticIMethodDesc = MethodHandleDesc.of(Kind.INTERFACE_STATIC, testInterface, "psm", "(I)I");
 
-        assertEquals(ctorDesc.invocationType(), MethodTypeDesc.of(testClass));
-        assertEquals(((DirectMethodHandleDesc) ctorDesc).lookupDescriptor(), "()V");
+        assertEquals(MethodTypeDesc.of(testClass), ctorDesc.invocationType());
+        assertEquals("()V", ((DirectMethodHandleDesc) ctorDesc).lookupDescriptor());
 
-        assertEquals(staticMethodDesc.invocationType().descriptorString(), "(I)I");
-        assertEquals(((DirectMethodHandleDesc) staticMethodDesc).lookupDescriptor(), "(I)I");
+        assertEquals("(I)I", staticMethodDesc.invocationType().descriptorString());
+        assertEquals("(I)I", ((DirectMethodHandleDesc) staticMethodDesc).lookupDescriptor());
 
-        assertEquals(instanceMethodDesc.invocationType().descriptorString(), "(" + testClass.descriptorString() + "I)I");
-        assertEquals(((DirectMethodHandleDesc) instanceMethodDesc).lookupDescriptor(), "(I)I");
+        assertEquals("(" + testClass.descriptorString() + "I)I", instanceMethodDesc.invocationType().descriptorString());
+        assertEquals("(I)I", ((DirectMethodHandleDesc) instanceMethodDesc).lookupDescriptor());
 
         for (MethodHandleDesc r : List.of(ctorDesc, staticMethodDesc, staticIMethodDesc, instanceMethodDesc, instanceIMethodDesc))
             testMethodHandleDesc(r);
@@ -257,29 +228,23 @@ public class MethodHandleDescTest extends SymbolicDescTest {
         assertEquals(5, (int) instanceIMethodDesc.resolveConstantDesc(LOOKUP).invokeExact(instanceI, 5));
         assertEquals(5, (int) instanceIMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instanceI, 5));
 
-        try { superMethodDesc.resolveConstantDesc(LOOKUP); fail(); }
-        catch (IllegalAccessException e) { /* expected */ }
+        assertThrows(IllegalAccessException.class, () -> superMethodDesc.resolveConstantDesc(LOOKUP));
         assertEquals(-1, (int) superMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance, 5));
 
-        try { superIMethodDesc.resolveConstantDesc(LOOKUP); fail(); }
-        catch (IllegalAccessException e) { /* expected */ }
+        assertThrows(IllegalAccessException.class, () -> superIMethodDesc.resolveConstantDesc(LOOKUP));
         assertEquals(0, (int) superIMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance, 5));
 
-        try { privateMethodDesc.resolveConstantDesc(LOOKUP); fail(); }
-        catch (IllegalAccessException e) { /* expected */ }
+        assertThrows(IllegalAccessException.class, () -> privateMethodDesc.resolveConstantDesc(LOOKUP));
         assertEquals(5, (int) privateMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance, 5));
 
-        try { privateIMethodDesc.resolveConstantDesc(LOOKUP); fail(); }
-        catch (IllegalAccessException e) { /* expected */ }
+        assertThrows(IllegalAccessException.class, () -> privateIMethodDesc.resolveConstantDesc(LOOKUP));
         assertEquals(0, (int) privateIMethodDesc.resolveConstantDesc(TestHelpers.TestInterface.LOOKUP).invokeExact(instanceI, 5));
         assertEquals(0, (int) privateIMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invoke(instanceI, 5));
 
-        try { privateStaticMethodDesc.resolveConstantDesc(LOOKUP); fail(); }
-        catch (IllegalAccessException e) { /* expected */ }
+        assertThrows(IllegalAccessException.class, () -> privateStaticMethodDesc.resolveConstantDesc(LOOKUP));
         assertEquals(5, (int) privateStaticMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(5));
 
-        try { privateStaticIMethodDesc.resolveConstantDesc(LOOKUP); fail(); }
-        catch (IllegalAccessException e) { /* expected */ }
+        assertThrows(IllegalAccessException.class, () -> privateStaticIMethodDesc.resolveConstantDesc(LOOKUP));
         assertEquals(0, (int) privateStaticIMethodDesc.resolveConstantDesc(TestHelpers.TestInterface.LOOKUP).invokeExact(5));
         assertEquals(0, (int) privateStaticIMethodDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(5));
 
@@ -292,34 +257,29 @@ public class MethodHandleDescTest extends SymbolicDescTest {
         for (MethodHandleDesc r : List.of(staticSetterDesc, staticGetterDesc, staticGetterIDesc, setterDesc, getterDesc))
             testMethodHandleDesc(r);
 
-        staticSetterDesc.resolveConstantDesc(LOOKUP).invokeExact(6); assertEquals(TestHelpers.TestClass.sf, 6);
+        staticSetterDesc.resolveConstantDesc(LOOKUP).invokeExact(6); assertEquals(6, TestHelpers.TestClass.sf);
         assertEquals(6, (int) staticGetterDesc.resolveConstantDesc(LOOKUP).invokeExact());
         assertEquals(6, (int) staticGetterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact());
-        staticSetterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(7); assertEquals(TestHelpers.TestClass.sf, 7);
+        staticSetterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(7); assertEquals(7, TestHelpers.TestClass.sf);
         assertEquals(7, (int) staticGetterDesc.resolveConstantDesc(LOOKUP).invokeExact());
         assertEquals(7, (int) staticGetterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact());
 
         assertEquals(3, (int) staticGetterIDesc.resolveConstantDesc(LOOKUP).invokeExact());
         assertEquals(3, (int) staticGetterIDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact());
 
-        setterDesc.resolveConstantDesc(LOOKUP).invokeExact(instance, 6); assertEquals(instance.f, 6);
+        setterDesc.resolveConstantDesc(LOOKUP).invokeExact(instance, 6); assertEquals(6, instance.f);
         assertEquals(6, (int) getterDesc.resolveConstantDesc(LOOKUP).invokeExact(instance));
         assertEquals(6, (int) getterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance));
-        setterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance, 7); assertEquals(instance.f, 7);
+        setterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance, 7); assertEquals(7, instance.f);
         assertEquals(7, (int) getterDesc.resolveConstantDesc(LOOKUP).invokeExact(instance));
         assertEquals(7, (int) getterDesc.resolveConstantDesc(TestHelpers.TestClass.LOOKUP).invokeExact(instance));
     }
 
     private void assertBadArgs(Supplier<MethodHandleDesc> supplier, String s) {
-        try {
-            MethodHandleDesc r = supplier.get();
-            fail("Expected failure for " + s);
-        }
-        catch (IllegalArgumentException e) {
-            // succeed
-        }
+        assertThrows(IllegalArgumentException.class, supplier::get, s);
     }
 
+    @Test
     public void testBadFieldMHs() {
         List<String> badGetterDescs = List.of("()V", "(Ljava/lang/Object;)V", "(I)I", "(Ljava/lang/Object;I)I");
         List<String> badStaticGetterDescs = List.of("()V", "(Ljava/lang/Object;)I", "(I)I", "(Ljava/lang/Object;I)I");
@@ -332,11 +292,12 @@ public class MethodHandleDescTest extends SymbolicDescTest {
         badStaticSetterDescs.forEach(s -> assertBadArgs(() -> MethodHandleDesc.of(STATIC_SETTER, helperHolderClass, "x", s), s));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testBadOwners() {
-        MethodHandleDesc.ofMethod(VIRTUAL, ClassDesc.ofDescriptor("I"), "x", MethodTypeDesc.ofDescriptor("()I"));
+        assertThrows(IllegalArgumentException.class, () -> MethodHandleDesc.ofMethod(VIRTUAL, ClassDesc.ofDescriptor("I"), "x", MethodTypeDesc.ofDescriptor("()I")));
     }
 
+    @Test
     public void testSymbolicDescsConstants() throws ReflectiveOperationException {
         int tested = 0;
         Field[] fields = ConstantDescs.class.getDeclaredFields();
@@ -359,10 +320,11 @@ public class MethodHandleDescTest extends SymbolicDescTest {
         assertTrue(tested > 0);
     }
 
+    @Test
     public void testKind() {
         for (Kind k : Kind.values()) {
-            assertEquals(Kind.valueOf(k.refKind), Kind.valueOf(k.refKind, k.refKind == MethodHandleInfo.REF_invokeInterface));
-            assertEquals(Kind.valueOf(k.refKind, k.isInterface), k);
+            assertEquals(Kind.valueOf(k.refKind, k.refKind == MethodHandleInfo.REF_invokeInterface), Kind.valueOf(k.refKind));
+            assertEquals(k, Kind.valueOf(k.refKind, k.isInterface));
         }
         // let's now verify those cases for which the value of the isInterface parameter is ignored
         int[] isInterfaceIgnored = new int[] {
@@ -374,15 +336,15 @@ public class MethodHandleDescTest extends SymbolicDescTest {
                 REF_invokeInterface
         };
         for (int refKind : isInterfaceIgnored) {
-            assertEquals(Kind.valueOf(refKind, false), Kind.valueOf(refKind, true));
+            assertEquals(Kind.valueOf(refKind, true), Kind.valueOf(refKind, false));
         }
 
         // some explicit tests for REF_invokeStatic and REF_invokeSpecial
-        assertNotEquals(Kind.valueOf(REF_invokeStatic, false), Kind.valueOf(REF_invokeStatic, true));
-        assertNotEquals(Kind.valueOf(REF_invokeSpecial, false), Kind.valueOf(REF_invokeSpecial, true));
-        assertEquals(Kind.valueOf(REF_invokeStatic, false), Kind.STATIC);
-        assertEquals(Kind.valueOf(REF_invokeStatic, true), Kind.INTERFACE_STATIC);
-        assertEquals(Kind.valueOf(REF_invokeSpecial, false), Kind.SPECIAL);
-        assertEquals(Kind.valueOf(REF_invokeSpecial, true), Kind.INTERFACE_SPECIAL);
+        assertNotEquals(Kind.valueOf(REF_invokeStatic, true), Kind.valueOf(REF_invokeStatic, false));
+        assertNotEquals(Kind.valueOf(REF_invokeSpecial, true), Kind.valueOf(REF_invokeSpecial, false));
+        assertEquals(Kind.STATIC, Kind.valueOf(REF_invokeStatic, false));
+        assertEquals(Kind.INTERFACE_STATIC, Kind.valueOf(REF_invokeStatic, true));
+        assertEquals(Kind.SPECIAL, Kind.valueOf(REF_invokeSpecial, false));
+        assertEquals(Kind.INTERFACE_SPECIAL, Kind.valueOf(REF_invokeSpecial, true));
     }
 }
diff --git a/test/jdk/java/lang/constant/MethodTypeDescTest.java b/test/jdk/java/lang/constant/MethodTypeDescTest.java
index 5f7a2fc691f..06a6d5055b8 100644
--- a/test/jdk/java/lang/constant/MethodTypeDescTest.java
+++ b/test/jdk/java/lang/constant/MethodTypeDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,21 +32,20 @@ import java.util.List;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.testng.annotations.Test;
 
 import static java.lang.constant.ConstantDescs.*;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @bug 8304932
  * @compile MethodTypeDescTest.java
- * @run testng MethodTypeDescTest
+ * @run junit MethodTypeDescTest
  * @summary unit tests for java.lang.constant.MethodTypeDesc
  */
-@Test
 public class MethodTypeDescTest extends SymbolicDescTest {
 
     private void testMethodTypeDesc(MethodTypeDesc r) throws ReflectiveOperationException {
@@ -75,16 +74,16 @@ public class MethodTypeDescTest extends SymbolicDescTest {
     private void testMethodTypeDesc(MethodTypeDesc r, MethodType mt) throws ReflectiveOperationException {
         testMethodTypeDesc(r);
 
-        assertEquals(r.resolveConstantDesc(LOOKUP), mt);
-        assertEquals(mt.describeConstable().get(), r);
+        assertEquals(mt, r.resolveConstantDesc(LOOKUP));
+        assertEquals(r, mt.describeConstable().get());
 
-        assertEquals(r.descriptorString(), mt.toMethodDescriptorString());
-        assertEquals(r.parameterCount(), mt.parameterCount());
-        assertEquals(r.parameterList(), mt.parameterList().stream().map(SymbolicDescTest::classToDesc).collect(toList()));
-        assertEquals(r.parameterArray(), Stream.of(mt.parameterArray()).map(SymbolicDescTest::classToDesc).toArray(ClassDesc[]::new));
+        assertEquals(mt.toMethodDescriptorString(), r.descriptorString());
+        assertEquals(mt.parameterCount(), r.parameterCount());
+        assertEquals(mt.parameterList().stream().map(SymbolicDescTest::classToDesc).collect(toList()), r.parameterList());
+        assertArrayEquals(Stream.of(mt.parameterArray()).map(SymbolicDescTest::classToDesc).toArray(ClassDesc[]::new), r.parameterArray());
         for (int i=0; i<r.parameterCount(); i++)
-            assertEquals(r.parameterType(i), classToDesc(mt.parameterType(i)));
-        assertEquals(r.returnType(), classToDesc(mt.returnType()));
+            assertEquals(classToDesc(mt.parameterType(i)), r.parameterType(i));
+        assertEquals(classToDesc(mt.returnType()), r.returnType());
     }
 
     private void assertMethodType(ClassDesc returnType,
@@ -94,13 +93,13 @@ public class MethodTypeDescTest extends SymbolicDescTest {
         MethodTypeDesc mtDesc = MethodTypeDesc.of(returnType, paramTypes);
 
         // MTDesc accessors
-        assertEquals(descriptor, mtDesc.descriptorString());
-        assertEquals(returnType, mtDesc.returnType());
-        assertEquals(paramTypes, mtDesc.parameterArray());
-        assertEquals(Arrays.asList(paramTypes), mtDesc.parameterList());
-        assertEquals(paramTypes.length, mtDesc.parameterCount());
+        assertEquals(mtDesc.descriptorString(), descriptor);
+        assertEquals(mtDesc.returnType(), returnType);
+        assertArrayEquals(mtDesc.parameterArray(), paramTypes);
+        assertEquals(mtDesc.parameterList(), Arrays.asList(paramTypes));
+        assertEquals(mtDesc.parameterCount(), paramTypes.length);
         for (int i=0; i<paramTypes.length; i++)
-            assertEquals(paramTypes[i], mtDesc.parameterType(i));
+            assertEquals(mtDesc.parameterType(i), paramTypes[i]);
 
         // Consistency between MT and MTDesc
         MethodType mt = MethodType.fromMethodDescriptorString(descriptor, null);
@@ -110,14 +109,12 @@ public class MethodTypeDescTest extends SymbolicDescTest {
         for (String r : returnDescs) {
             ClassDesc rc = ClassDesc.ofDescriptor(r);
             MethodTypeDesc newDesc = mtDesc.changeReturnType(rc);
-            assertEquals(newDesc, MethodTypeDesc.of(rc, paramTypes));
+            assertEquals(MethodTypeDesc.of(rc, paramTypes), newDesc);
             testMethodTypeDesc(newDesc, mt.changeReturnType(rc.resolveConstantDesc(LOOKUP)));
         }
 
         // try with null parameter
-        expectThrows(NullPointerException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.changeReturnType(null);
-        });
+        assertThrows(NullPointerException.class, () -> mtDesc.changeReturnType(null));
 
         // changeParamType
         for (int i=0; i<paramTypes.length; i++) {
@@ -126,7 +123,7 @@ public class MethodTypeDescTest extends SymbolicDescTest {
                 ClassDesc[] ps = paramTypes.clone();
                 ps[i] = pc;
                 MethodTypeDesc newDesc = mtDesc.changeParameterType(i, pc);
-                assertEquals(newDesc, MethodTypeDesc.of(returnType, ps));
+                assertEquals(MethodTypeDesc.of(returnType, ps), newDesc);
                 testMethodTypeDesc(newDesc, mt.changeParameterType(i, pc.resolveConstantDesc(LOOKUP)));
             }
         }
@@ -139,7 +136,7 @@ public class MethodTypeDescTest extends SymbolicDescTest {
                                       .mapToObj(j -> paramTypes[j])
                                       .toArray(ClassDesc[]::new);
             MethodTypeDesc newDesc = mtDesc.dropParameterTypes(i, i + 1);
-            assertEquals(newDesc, MethodTypeDesc.of(returnType, ps));
+            assertEquals(MethodTypeDesc.of(returnType, ps), newDesc);
             testMethodTypeDesc(newDesc, mt.dropParameterTypes(i, i+1));
 
             // drop multiple params
@@ -147,7 +144,7 @@ public class MethodTypeDescTest extends SymbolicDescTest {
                 var t = new ArrayList<>(Arrays.asList(paramTypes));
                 t.subList(i, j).clear();
                 MethodTypeDesc multiDrop = mtDesc.dropParameterTypes(i, j);
-                assertEquals(multiDrop, MethodTypeDesc.of(returnType, t.toArray(ClassDesc[]::new)));
+                assertEquals(MethodTypeDesc.of(returnType, t.toArray(ClassDesc[]::new)), multiDrop);
                 testMethodTypeDesc(multiDrop, mt.dropParameterTypes(i, j));
             }
         }
@@ -162,7 +159,7 @@ public class MethodTypeDescTest extends SymbolicDescTest {
                                           .mapToObj(j -> (j < k) ? paramTypes[j] : (j == k) ? p : paramTypes[j-1])
                                           .toArray(ClassDesc[]::new);
                 MethodTypeDesc newDesc = mtDesc.insertParameterTypes(i, p);
-                assertEquals(newDesc, MethodTypeDesc.of(returnType, ps));
+                assertEquals(MethodTypeDesc.of(returnType, ps), newDesc);
                 testMethodTypeDesc(newDesc, mt.insertParameterTypes(i, p.resolveConstantDesc(LOOKUP)));
             }
 
@@ -172,7 +169,7 @@ public class MethodTypeDescTest extends SymbolicDescTest {
             a.addAll(i, Arrays.asList(addition));
 
             MethodTypeDesc newDesc = mtDesc.insertParameterTypes(i, addition);
-            assertEquals(newDesc, MethodTypeDesc.of(returnType, a.toArray(ClassDesc[]::new)));
+            assertEquals(MethodTypeDesc.of(returnType, a.toArray(ClassDesc[]::new)), newDesc);
             testMethodTypeDesc(newDesc, mt.insertParameterTypes(i, Arrays.stream(addition).map(d -> {
                 try {
                     return (Class<?>) d.resolveConstantDesc(LOOKUP);
@@ -190,32 +187,28 @@ public class MethodTypeDescTest extends SymbolicDescTest {
                 IntStream.rangeClosed(0, paramDescTypes.length - 1)
                         .mapToObj(i -> ClassDesc.ofDescriptor(paramDescTypes[i])).toArray(ClassDesc[]::new);
         MethodTypeDesc mtDesc = MethodTypeDesc.of(returnType, paramTypes);
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.insertParameterTypes(-1, paramTypes);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.insertParameterTypes(-1, paramTypes));
 
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.insertParameterTypes(paramTypes.length + 1, paramTypes);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.insertParameterTypes(paramTypes.length + 1, paramTypes));
 
-        expectThrows(IllegalArgumentException.class, () -> {
+        {
             ClassDesc[] newParamTypes = new ClassDesc[1];
             newParamTypes[0] = CD_void;
             MethodTypeDesc newDesc = MethodTypeDesc.of(returnType, CD_int);
-            newDesc = newDesc.insertParameterTypes(0, newParamTypes);
-        });
+            assertThrows(IllegalArgumentException.class, () -> newDesc.insertParameterTypes(0, newParamTypes));
+        }
 
-        expectThrows(NullPointerException.class, () -> {
+        {
             MethodTypeDesc newDesc = MethodTypeDesc.of(returnType, CD_int);
-            newDesc = newDesc.insertParameterTypes(0, null);
-        });
+            assertThrows(NullPointerException.class, () -> newDesc.insertParameterTypes(0, null));
+        }
 
-        expectThrows(NullPointerException.class, () -> {
+        {
             ClassDesc[] newParamTypes = new ClassDesc[1];
             newParamTypes[0] = null;
             MethodTypeDesc newDesc = MethodTypeDesc.of(returnType, CD_int);
-            newDesc = newDesc.insertParameterTypes(0, newParamTypes);
-        });
+            assertThrows(NullPointerException.class, () -> newDesc.insertParameterTypes(0, newParamTypes));
+        }
     }
 
     private void badDropParametersTypes(ClassDesc returnType, String... paramDescTypes) {
@@ -224,27 +217,18 @@ public class MethodTypeDescTest extends SymbolicDescTest {
                         .mapToObj(i -> ClassDesc.ofDescriptor(paramDescTypes[i])).toArray(ClassDesc[]::new);
         MethodTypeDesc mtDesc = MethodTypeDesc.of(returnType, paramTypes);
 
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.dropParameterTypes(-1, 0);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.dropParameterTypes(-1, 0));
 
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.dropParameterTypes(paramTypes.length, 0);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.dropParameterTypes(paramTypes.length, 0));
 
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.dropParameterTypes(paramTypes.length + 1, 0);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.dropParameterTypes(paramTypes.length + 1, 0));
 
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.dropParameterTypes(0, paramTypes.length + 1);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.dropParameterTypes(0, paramTypes.length + 1));
 
-        expectThrows(IndexOutOfBoundsException.class, () -> {
-            MethodTypeDesc newDesc = mtDesc.dropParameterTypes(1, 0);
-        });
+        assertThrows(IndexOutOfBoundsException.class, () -> mtDesc.dropParameterTypes(1, 0));
     }
 
+    @Test
     public void testMethodTypeDesc() throws ReflectiveOperationException {
         for (String r : returnDescs) {
             assertMethodType(ClassDesc.ofDescriptor(r));
@@ -257,6 +241,7 @@ public class MethodTypeDescTest extends SymbolicDescTest {
         }
     }
 
+    @Test
     public void testBadMethodTypeRefs() {
         // ofDescriptor
         List<String> badDescriptors = List.of("()II", "()I;", "(I;)", "(I)", "()L", "(V)V",
@@ -283,29 +268,32 @@ public class MethodTypeDescTest extends SymbolicDescTest {
         assertThrows(IllegalArgumentException.class, () -> MethodTypeDesc.of(CD_int, List.of(CD_void)));
     }
 
+    @Test
     public void testOfArrayImmutability() {
         ClassDesc[] args = {CD_Object, CD_int};
         var mtd = MethodTypeDesc.of(CD_void, args);
 
         args[1] = CD_void;
-        assertEquals(mtd, MethodTypeDesc.of(CD_void, CD_Object, CD_int));
+        assertEquals(MethodTypeDesc.of(CD_void, CD_Object, CD_int), mtd);
 
         mtd.parameterArray()[1] = CD_void;
-        assertEquals(mtd, MethodTypeDesc.of(CD_void, CD_Object, CD_int));
+        assertEquals(MethodTypeDesc.of(CD_void, CD_Object, CD_int), mtd);
     }
 
+    @Test
     public void testOfListImmutability() {
         List<ClassDesc> args = Arrays.asList(CD_Object, CD_int);
         var mtd = MethodTypeDesc.of(CD_void, args);
 
         args.set(1, CD_void);
-        assertEquals(mtd, MethodTypeDesc.of(CD_void, CD_Object, CD_int));
+        assertEquals(MethodTypeDesc.of(CD_void, CD_Object, CD_int), mtd);
 
         assertThrows(UnsupportedOperationException.class, () ->
                 mtd.parameterList().set(1, CD_void));
-        assertEquals(mtd, MethodTypeDesc.of(CD_void, CD_Object, CD_int));
+        assertEquals(MethodTypeDesc.of(CD_void, CD_Object, CD_int), mtd);
     }
 
+    @Test
     public void testMissingClass() {
         var mtd = MTD_void.insertParameterTypes(0, ClassDesc.of("does.not.exist.DoesNotExist"));
         assertThrows(ReflectiveOperationException.class, () -> mtd.resolveConstantDesc(MethodHandles.publicLookup()));
diff --git a/test/jdk/java/lang/constant/NameValidationTest.java b/test/jdk/java/lang/constant/NameValidationTest.java
index be266129370..96296ce290e 100644
--- a/test/jdk/java/lang/constant/NameValidationTest.java
+++ b/test/jdk/java/lang/constant/NameValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,26 +21,22 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8215510
  * @compile NameValidationTest.java
- * @run testng NameValidationTest
+ * @run junit NameValidationTest
  * @summary unit tests for verifying member names
  */
 
 import java.lang.constant.*;
-import java.lang.invoke.*;
-
-import org.testng.annotations.Test;
 
 import static java.lang.constant.DirectMethodHandleDesc.*;
 import static java.lang.constant.ConstantDescs.*;
-import static java.lang.constant.DirectMethodHandleDesc.Kind.VIRTUAL;
 
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class NameValidationTest {
 
     private static final String[] badMemberNames = new String[] {"xx.xx", "zz;zz", "[l", "aa/aa", "<cinit>"};
@@ -49,26 +45,17 @@ public class NameValidationTest {
     private static final String[] badClassNames = new String[] {"zz;zz", "[l", "aa/aa", ".", "a..b"};
     private static final String[] goodClassNames = new String[] {"3", "~", "$", "qq", "a.a"};
 
+    @Test
     public void testMemberNames() {
         DirectMethodHandleDesc mh = MethodHandleDesc.of(Kind.VIRTUAL, CD_String, "isEmpty", "()Z");
         for (String badName : badMemberNames) {
-            try {
-                memberNamesHelper(badName, mh, CD_int, null);
-                fail("Expected failure for name " + badName);
-            } catch (IllegalArgumentException iae) {
-                // expected
-            }
-            try {
-                memberNamesHelper(badName, mh, CD_int, new ConstantDesc[0]);
-                fail("Expected failure for name " + badName);
-            } catch (IllegalArgumentException iae) {
-                // expected
-            }
+            assertThrows(IllegalArgumentException.class, () -> memberNamesHelper(badName, mh, CD_int, null), badName);
+            assertThrows(IllegalArgumentException.class, () -> memberNamesHelper(badName, mh, CD_int, new ConstantDesc[0]), badName);
         }
 
-        for (String badName : goodMemberNames) {
-            memberNamesHelper(badName, mh, CD_int, null);
-            memberNamesHelper(badName, mh, CD_int, new ConstantDesc[0]);
+        for (String goodName : goodMemberNames) {
+            memberNamesHelper(goodName, mh, CD_int, null);
+            memberNamesHelper(goodName, mh, CD_int, new ConstantDesc[0]);
         }
     }
 
@@ -83,14 +70,10 @@ public class NameValidationTest {
         }
     }
 
+    @Test
     public void testClassNames() {
         for (String badName : badClassNames) {
-            try {
-                ClassDesc.of(badName);
-                fail("Expected failure for name " + badName);
-            } catch (IllegalArgumentException iae) {
-                // expected
-            }
+            assertThrows(IllegalArgumentException.class, () -> ClassDesc.of(badName), badName);
         }
 
         for (String goodName : goodClassNames) {
diff --git a/test/jdk/java/lang/constant/SymbolicDescTest.java b/test/jdk/java/lang/constant/SymbolicDescTest.java
index 5eb0ca10da6..8d4fcdf6a2c 100644
--- a/test/jdk/java/lang/constant/SymbolicDescTest.java
+++ b/test/jdk/java/lang/constant/SymbolicDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Base class for XxxDesc tests
@@ -106,7 +106,7 @@ public abstract class SymbolicDescTest {
         if (desc instanceof Constable) {
             Optional<ConstantDesc> opt = (Optional<ConstantDesc>) ((Constable) desc).describeConstable();
             ConstantDesc sr = (ConstantDesc) opt.orElseThrow().resolveConstantDesc(LOOKUP);
-            assertEquals(sr, desc);
+            assertEquals(desc, sr);
         }
     }
 }
diff --git a/test/jdk/java/lang/constant/TypeDescriptorTest.java b/test/jdk/java/lang/constant/TypeDescriptorTest.java
index 9ffbd886f41..9253462e223 100644
--- a/test/jdk/java/lang/constant/TypeDescriptorTest.java
+++ b/test/jdk/java/lang/constant/TypeDescriptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,37 +22,35 @@
  */
 
 import java.lang.invoke.TypeDescriptor;
-import java.lang.constant.ClassDesc;
-
-import org.testng.annotations.Test;
 
 import static java.lang.constant.ConstantDescs.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @compile TypeDescriptorTest.java
- * @run testng TypeDescriptorTest
+ * @run junit TypeDescriptorTest
  * @summary unit tests for implementations of java.lang.invoke.TypeDescriptor
  */
-@Test
 public class TypeDescriptorTest {
     private<F extends TypeDescriptor.OfField<F>> void testArray(F f, boolean isArray, F component, F array) {
         if (isArray) {
             assertTrue(f.isArray());
-            assertEquals(f.arrayType(), array);
-            assertEquals(f.componentType(), component);
+            assertEquals(array, f.arrayType());
+            assertEquals(component, f.componentType());
         }
         else {
             assertFalse(f.isArray());
-            assertEquals(f.arrayType(), array);
+            assertEquals(array, f.arrayType());
             assertNull(f.componentType());
         }
     }
 
+    @Test
     public void testClass() {
         testArray(int.class, false, null, int[].class);
         testArray(int[].class, true, int.class, int[][].class);
@@ -67,6 +65,7 @@ public class TypeDescriptorTest {
         assertFalse(String[].class.isPrimitive());
     }
 
+    @Test
     public void testClassDesc() {
 
         testArray(CD_int, false, null, CD_int.arrayType());
diff --git a/test/jdk/java/lang/constant/boottest/TEST.properties b/test/jdk/java/lang/constant/boottest/TEST.properties
deleted file mode 100644
index 565242e959b..00000000000
--- a/test/jdk/java/lang/constant/boottest/TEST.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file identifies root(s) of the test-ng hierarchy.
-
-TestNG.dirs = .
-lib.dirs = /lib/testlibrary/bootlib
diff --git a/test/jdk/java/lang/constant/java.base/jdk/internal/constant/ConstantAccess.java b/test/jdk/java/lang/constant/java.base/jdk/internal/constant/ConstantAccess.java
new file mode 100644
index 00000000000..a8d7c2f3f99
--- /dev/null
+++ b/test/jdk/java/lang/constant/java.base/jdk/internal/constant/ConstantAccess.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.internal.constant;
+
+// Exposes package-private methods for testing.
+public final class ConstantAccess {
+    public static int skipOverFieldSignature(String descriptor, int start, int end) {
+        return ConstantUtils.skipOverFieldSignature(descriptor, start, end);
+    }
+}
diff --git a/test/jdk/java/lang/invoke/8147078/Test8147078.java b/test/jdk/java/lang/invoke/8147078/Test8147078.java
index 08532d30929..51580aa6f10 100644
--- a/test/jdk/java/lang/invoke/8147078/Test8147078.java
+++ b/test/jdk/java/lang/invoke/8147078/Test8147078.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,17 +23,18 @@
 
 /* @test
  * @bug 8147078
- * @run testng/othervm -ea -esa Test8147078
+ * @run junit/othervm -ea -esa Test8147078
  */
 
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class Test8147078 {
 
@@ -65,16 +66,10 @@ public class Test8147078 {
 
     @Test
     public void testNoExceptionType() {
-        boolean caught = false;
-        try {
+        var cce = assertThrows(ClassCastException.class, () -> {
             MethodHandle eek = (MethodHandle) MH_catchException.invoke(MH_target, String.class, MH_handler);
-        } catch (ClassCastException cce) {
-            assertEquals("java.lang.String", cce.getMessage());
-            caught = true;
-        } catch (Throwable t) {
-            fail("unexpected exception caught: " + t);
-        }
-        assertTrue(caught);
+        });
+        assertEquals("java.lang.String", cce.getMessage());
     }
 
 }
\ No newline at end of file
diff --git a/test/jdk/java/lang/invoke/8177146/TestMethodHandleBind.java b/test/jdk/java/lang/invoke/8177146/TestMethodHandleBind.java
index 134cc9f7514..518d07b1518 100644
--- a/test/jdk/java/lang/invoke/8177146/TestMethodHandleBind.java
+++ b/test/jdk/java/lang/invoke/8177146/TestMethodHandleBind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,17 +23,16 @@
 
 /* @test
  * @bug 8177146
- * @run testng/othervm TestMethodHandleBind
+ * @run junit/othervm TestMethodHandleBind
  */
 
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
 
 import static java.lang.invoke.MethodHandles.lookup;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class TestMethodHandleBind extends pkg.A {
     static class B extends TestMethodHandleBind {}
@@ -42,7 +41,7 @@ public class TestMethodHandleBind extends pkg.A {
     public void testInstanceOfCallerClass() throws Throwable {
         MethodHandle bound = lookup().bind(new TestMethodHandleBind() , "m1", MethodType.methodType(String.class));
         String x = (String)bound.invoke();
-        assertEquals(x, this.getClass().getSimpleName());
+        assertEquals(this.getClass().getSimpleName(), x);
     }
 
     @Test
@@ -50,47 +49,37 @@ public class TestMethodHandleBind extends pkg.A {
         MethodHandle bound = lookup().bind(new B() , "m1", MethodType.methodType(String.class));
         // MethodHandle bound = lookup().findVirtual(B.class,  "m1", MethodType.methodType(String.class)).bindTo(new B());
         String x = (String)bound.invoke();
-        assertEquals(x, "B");
+        assertEquals("B", x);
     }
 
     @Test
     public void testInstanceOfReceiverClass() throws Throwable {
-        try {
-            MethodHandle bound = lookup().bind(new pkg.A() , "m1", MethodType.methodType(String.class));
-            bound.invoke();
-            fail("IllegalAccessException expected");
-        } catch (IllegalAccessException e) {
-        }
+        assertThrows(IllegalAccessException.class, () -> lookup().bind(new pkg.A() , "m1", MethodType.methodType(String.class)));
     }
 
     @Test
     public void testPublicMethod() throws Throwable {
         MethodHandle bound = lookup().bind(new pkg.A() , "m2", MethodType.methodType(String.class));
         String x = (String)bound.invoke();
-        assertEquals(x, "A");
+        assertEquals("A", x);
     }
 
     @Test
     public void testPublicMethod2() throws Throwable {
         MethodHandle bound = lookup().bind(new TestMethodHandleBind(), "m2", MethodType.methodType(String.class));
         String x = (String)bound.invoke();
-        assertEquals(x, this.getClass().getSimpleName());
+        assertEquals(this.getClass().getSimpleName(), x);
     }
 
     @Test
     public void testInstanceOfCallerClassVarargs() throws Throwable {
         MethodHandle bound = lookup().bind(new TestMethodHandleBind() , "m3", MethodType.methodType(String.class, String[].class));
         String x = (String)bound.invoke("a", "b", "c");
-        assertEquals(x, this.getClass().getSimpleName() + "abc");
+        assertEquals(this.getClass().getSimpleName() + "abc", x);
     }
 
     @Test
     public void testInstanceOfReceiverClassVarargs() throws Throwable {
-        try {
-            MethodHandle bound = lookup().bind(new pkg.A(), "m3", MethodType.methodType(String.class, String[].class));
-            bound.invoke();
-            fail("IllegalAccessException expected");
-        } catch (IllegalAccessException e) {
-        }
+        assertThrows(IllegalAccessException.class, () -> lookup().bind(new pkg.A(), "m3", MethodType.methodType(String.class, String[].class)));
     }
 }
diff --git a/test/jdk/java/lang/invoke/AccessControlTest.java b/test/jdk/java/lang/invoke/AccessControlTest.java
index e177f08d876..fcd945a5d7f 100644
--- a/test/jdk/java/lang/invoke/AccessControlTest.java
+++ b/test/jdk/java/lang/invoke/AccessControlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @summary test access checking by java.lang.invoke.MethodHandles.Lookup
  * @compile AccessControlTest.java AccessControlTest_subpkg/Acquaintance_remote.java
- * @run testng/othervm test.java.lang.invoke.AccessControlTest
+ * @run junit/othervm test.java.lang.invoke.AccessControlTest
  */
 
 package test.java.lang.invoke;
@@ -33,12 +33,13 @@ import java.lang.invoke.*;
 import java.lang.reflect.*;
 import java.lang.reflect.Modifier;
 import java.util.*;
-import org.testng.annotations.*;
 
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodHandles.Lookup.*;
 import static java.lang.invoke.MethodType.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
 
 import test.java.lang.invoke.AccessControlTest_subpkg.Acquaintance_remote;
 
@@ -69,7 +70,7 @@ public class AccessControlTest {
             this.prevLookupClass = lookup.previousLookupClass();
             this.lookupModes = lookup.lookupModes();
 
-            assert(lookupString().equals(lookup.toString()));
+            assertEquals(lookupString(), lookup.toString());
             numberOf(lookupClass().getClassLoader()); // assign CL#
         }
         public LookupCase(Class<?> lookupClass, Class<?> prevLookupClass, int lookupModes) {
@@ -96,7 +97,7 @@ public class AccessControlTest {
                 int cmp = c1.getName().compareTo(c2.getName());
                 if (cmp != 0)  return cmp;
                 cmp = numberOf(c1.getClassLoader()) - numberOf(c2.getClassLoader());
-                assert(cmp != 0);
+                assertNotEquals(0, cmp);
                 return cmp;
             } else if (p1 != p2){
                 if (p1 == null)
@@ -106,7 +107,7 @@ public class AccessControlTest {
                 int cmp = p1.getName().compareTo(p2.getName());
                 if (cmp != 0)  return cmp;
                 cmp = numberOf(p1.getClassLoader()) - numberOf(p2.getClassLoader());
-                assert(cmp != 0);
+                assertNotEquals(0, cmp);
                 return cmp;
             }
             return -(this.lookupModes() - that.lookupModes());
@@ -211,8 +212,8 @@ public class AccessControlTest {
                                    c1.getPackageName().equals(c2.getPackageName()));
             boolean sameTopLevel = (topLevelClass(c1) == topLevelClass(c2));
             boolean sameClass = (c1 == c2);
-            assert(samePackage  || !sameTopLevel);
-            assert(sameTopLevel || !sameClass);
+            assertTrue(samePackage  || !sameTopLevel);
+            assertTrue(sameTopLevel || !sameClass);
             boolean accessible = sameClass;
 
             if ((modes1 & PACKAGE) != 0)  accessible |= samePackage;
@@ -251,17 +252,17 @@ public class AccessControlTest {
                 changed |= (PRIVATE|PROTECTED);  // [A5]
             }
             if (sameClass) {
-                assert(changed == 0);       // [A11] (no deprivation if same class)
+                assertEquals(0, changed);       // [A11] (no deprivation if same class)
             }
 
-            if (accessible)  assert((changed & PUBLIC) == 0);
+            if (accessible) assertEquals(0, changed & PUBLIC);
             int modes2 = modes1 & ~changed;
             Class<?> plc = (m1 == m2) ? prevLookupClass() : c1; // [A9] [A10]
             if ((modes1 & UNCONDITIONAL) != 0) plc = null;      // [A8]
             LookupCase l2 = new LookupCase(c2, plc, modes2);
-            assert(l2.lookupClass() == c2);         // [A1]
-            assert((modes1 | modes2) == modes1);    // [A1-a] (no elevation of access)
-            assert(l2.prevLookupClass() == null || (modes2 & MODULE) == 0);
+            assertSame(l2.lookupClass(), c2);         // [A1]
+            assertEquals(modes1, modes1 | modes2);    // [A1-a] (no elevation of access)
+            assertTrue(l2.prevLookupClass() == null || (modes2 & MODULE) == 0);
             return l2;
         }
 
@@ -280,8 +281,8 @@ public class AccessControlTest {
             }
             if (newModes == oldModes) return this;  // return self if no change
             LookupCase l2 = new LookupCase(lookupClass(), prevLookupClass(), newModes);
-            assert((oldModes | newModes) == oldModes);    // [A2] (no elevation of access)
-            assert(l2.prevLookupClass() == null || (newModes & MODULE) == 0);
+            assertEquals(oldModes, oldModes | newModes);    // [A2] (no elevation of access)
+            assertTrue(l2.prevLookupClass() == null || (newModes & MODULE) == 0);
             return l2;
         }
 
@@ -331,7 +332,7 @@ public class AccessControlTest {
                        && Modifier.isPublic(m.getModifiers());
             }
 
-            assert(m1 == m2 && prevLookupClass == null);
+            assertNull(prevLookupClass);
 
             if (!willAccessClass(c2, false))
                 return false;
@@ -380,7 +381,7 @@ public class AccessControlTest {
                     && Modifier.isPublic(c2.getModifiers());
             }
 
-            assert(m1 == m2 && prevLookupClass == null);
+            assertNull(prevLookupClass);
 
             LookupCase lc = this.in(c2);
             int modes1 = lc.lookupModes();
@@ -409,8 +410,8 @@ public class AccessControlTest {
         Class<?> c = cls;
         for (Class<?> ec; (ec = c.getEnclosingClass()) != null; )
             c = ec;
-        assert(c.getEnclosingClass() == null);
-        assert(c == cls || cls.getEnclosingClass() != null);
+        assertNull(c.getEnclosingClass());
+        assertTrue(c == cls || cls.getEnclosingClass() != null);
         return c;
     }
 
@@ -443,14 +444,14 @@ public class AccessControlTest {
         if (edges == null)  CASE_EDGES.put(l2, edges = new TreeSet<>());
         if (edges.add(l1)) {
             Class<?> c1 = l1.lookupClass();
-            assert(l2.lookupClass() == c2); // [A1]
+            assertSame(l2.lookupClass(), c2); // [A1]
             int m1 = l1.lookupModes();
             int m2 = l2.lookupModes();
-            assert((m1 | m2) == m1);        // [A2] (no elevation of access)
+            assertEquals(m1, (m1 | m2));        // [A2] (no elevation of access)
             LookupCase expect = dropAccess == 0 ? l1.in(c2) : l1.in(c2).dropLookupMode(dropAccess);
             if (!expect.equals(l2))
                 System.out.println("*** expect "+l1+" => "+expect+" but got "+l2);
-            assertEquals(l2, expect);
+            assertEquals(expect, l2);
         }
     }
 
@@ -567,7 +568,7 @@ public class AccessControlTest {
         if (willAccess != didAccess) {
             System.out.println(sourceCase+" => "+targetClass.getSimpleName()+(isFindOrAccessClass?"":"."+methodName+methodType));
             System.out.println("fail "+(isFindOrAccessClass?kind:"on "+method)+" ex="+accessError);
-            assertEquals(willAccess, didAccess);
+            assertEquals(didAccess, willAccess);
         }
         testCount++;
         if (!didAccess)  testCountFails++;
@@ -579,10 +580,10 @@ public class AccessControlTest {
             System.out.println(targetClass.getSimpleName()+"."+methodName+methodType);
         try {
             Method method = targetClass.getDeclaredMethod(methodName, methodType.parameterArray());
-            assertEquals(method.getReturnType(), methodType.returnType());
+            assertEquals(methodType.returnType(), method.getReturnType());
             int haveMods = method.getModifiers();
-            assert(Modifier.isStatic(haveMods));
-            assert(targetAccess == fixMods(haveMods));
+            assertTrue(Modifier.isStatic(haveMods));
+            assertEquals(targetAccess, fixMods(haveMods));
             return method;
         } catch (NoSuchMethodException ex) {
             throw new AssertionError(methodName, ex);
@@ -604,7 +605,7 @@ public class AccessControlTest {
         case PACKAGE:    return "pkg_in_";
         case PRIVATE:    return "pri_in_";
         }
-        assert(false);
+        fail();
         return "?";
     }
     private static final int[] ACCESS_CASES = {
diff --git a/test/jdk/java/lang/invoke/ArrayConstructorTest.java b/test/jdk/java/lang/invoke/ArrayConstructorTest.java
index 749bb7926a0..313c2828380 100644
--- a/test/jdk/java/lang/invoke/ArrayConstructorTest.java
+++ b/test/jdk/java/lang/invoke/ArrayConstructorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 8155106
- * @run testng/othervm -ea -esa test.java.lang.invoke.ArrayConstructorTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.ArrayConstructorTest
  */
 package test.java.lang.invoke;
 
@@ -32,30 +32,22 @@ import java.lang.invoke.MethodHandles;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
-
-import org.testng.annotations.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ArrayConstructorTest {
 
     static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
     @Test
-    public static void testFindConstructorArray() {
-        boolean caught = false;
-        try {
-            MethodHandle h = LOOKUP.findConstructor(Object[].class, methodType(void.class));
-        } catch (NoSuchMethodException nsme) {
-            assertEquals("no constructor for array class: [Ljava.lang.Object;", nsme.getMessage());
-            caught = true;
-        } catch (Exception e) {
-            throw new AssertionError("unexpected exception: " + e);
-        }
-        assertTrue(caught);
+    public void testFindConstructorArray() {
+        var nsme = assertThrows(NoSuchMethodException.class, () -> LOOKUP.findConstructor(Object[].class, methodType(void.class)));
+        assertEquals("no constructor for array class: [Ljava.lang.Object;", nsme.getMessage());
     }
 
-    @DataProvider
     static Object[][] arrayConstructorNegative() {
         return new Object[][]{
                 {String.class, IllegalArgumentException.class, "not an array class: java.lang.String"},
@@ -63,34 +55,28 @@ public class ArrayConstructorTest {
         };
     }
 
-    @Test(dataProvider = "arrayConstructorNegative")
-    public static void testArrayConstructorNegative(Class<?> clazz, Class<?> exceptionClass, String message) {
-        boolean caught = false;
-        try {
-            MethodHandle h = MethodHandles.arrayConstructor(clazz);
-        } catch (Exception e) {
-            assertEquals(exceptionClass, e.getClass());
-            if (message != null) {
-                assertEquals(message, e.getMessage());
-            }
-            caught = true;
+    @ParameterizedTest
+    @MethodSource("arrayConstructorNegative")
+    public void testArrayConstructorNegative(Class<?> clazz, Class<? extends Exception> exceptionClass, String message) {
+        var e = assertThrowsExactly(exceptionClass, () -> MethodHandles.arrayConstructor(clazz));
+        if (message != null) {
+            assertEquals(message, e.getMessage());
         }
-        assertTrue(caught);
     }
 
     @Test
-    public static void testArrayConstructor() throws Throwable {
+    public void testArrayConstructor() throws Throwable {
         MethodHandle h = MethodHandles.arrayConstructor(String[].class);
         assertEquals(methodType(String[].class, int.class), h.type());
         String[] a = (String[]) h.invoke(17);
         assertEquals(17, a.length);
     }
 
-    @Test(expectedExceptions = {NegativeArraySizeException.class})
-    public static void testArrayConstructorNegativeIndex() throws Throwable {
+    @Test
+    public void testArrayConstructorNegativeIndex() throws Throwable {
         MethodHandle h = MethodHandles.arrayConstructor(String[].class);
         assertEquals(methodType(String[].class, int.class), h.type());
-        h.invoke(-1); // throws exception
+        assertThrows(NegativeArraySizeException.class, () -> h.invoke(-1));
     }
 
 }
diff --git a/test/jdk/java/lang/invoke/ArrayLengthTest.java b/test/jdk/java/lang/invoke/ArrayLengthTest.java
index 9f3cc6fe240..2ef97442638 100644
--- a/test/jdk/java/lang/invoke/ArrayLengthTest.java
+++ b/test/jdk/java/lang/invoke/ArrayLengthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,36 +22,39 @@
  */
 
 /* @test
- * @run testng/othervm -ea -esa test.java.lang.invoke.ArrayLengthTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.ArrayLengthTest
  */
 package test.java.lang.invoke;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ArrayLengthTest {
 
-    @DataProvider
-    Object[][] arrayClasses() {
-        return new Object[][] {
-                {int[].class},
-                {long[].class},
-                {float[].class},
-                {double[].class},
-                {boolean[].class},
-                {byte[].class},
-                {short[].class},
-                {char[].class},
-                {Object[].class},
-                {StringBuffer[].class}
+    static Object[] arrayClasses() {
+        return new Object[] {
+                int[].class,
+                long[].class,
+                float[].class,
+                double[].class,
+                boolean[].class,
+                byte[].class,
+                short[].class,
+                char[].class,
+                Object[].class,
+                StringBuffer[].class
         };
     }
 
-    @Test(dataProvider = "arrayClasses")
+    @ParameterizedTest
+    @MethodSource("arrayClasses")
     public void testArrayLength(Class<?> arrayClass) throws Throwable {
         MethodHandle arrayLength = MethodHandles.arrayLength(arrayClass);
         assertEquals(int.class, arrayLength.type().returnType());
@@ -60,25 +63,28 @@ public class ArrayLengthTest {
         assertEquals(10, arrayLength.invoke(array));
     }
 
-    @Test(dataProvider = "arrayClasses", expectedExceptions = NullPointerException.class)
+    @ParameterizedTest
+    @MethodSource("arrayClasses")
     public void testArrayLengthInvokeNPE(Class<?> arrayClass) throws Throwable {
         MethodHandle arrayLength = MethodHandles.arrayLength(arrayClass);
-        arrayLength.invoke(null);
+        assertThrows(NullPointerException.class, () -> arrayLength.invoke(null));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testArrayLengthNoArray() {
-        MethodHandles.arrayLength(String.class);
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.arrayLength(String.class));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testArrayLengthNPE() {
-        MethodHandles.arrayLength(null);
+        assertThrows(NullPointerException.class, () -> MethodHandles.arrayLength(null));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testNullReference() throws Throwable {
         MethodHandle arrayLength = MethodHandles.arrayLength(String[].class);
-        int len = (int)arrayLength.invokeExact((String[])null);
+        assertThrows(NullPointerException.class, () -> {
+            int len = (int)arrayLength.invokeExact((String[])null);
+        });
     }
 }
diff --git a/test/jdk/java/lang/invoke/CallerSensitiveMethodHandle.java b/test/jdk/java/lang/invoke/CallerSensitiveMethodHandle.java
index 369c2c2bea1..a2756fc2f23 100644
--- a/test/jdk/java/lang/invoke/CallerSensitiveMethodHandle.java
+++ b/test/jdk/java/lang/invoke/CallerSensitiveMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,20 +22,19 @@
  */
 
 /* @test
- * @run testng/othervm CallerSensitiveMethodHandle
+ * @run junit/othervm CallerSensitiveMethodHandle
  * @summary Check Lookup findVirtual, findStatic and unreflect behavior with
  *          caller sensitive methods with focus on AccessibleObject.setAccessible
  */
 
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Field;
 
 import static java.lang.invoke.MethodType.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CallerSensitiveMethodHandle {
     private static int field = 0;
@@ -46,7 +45,7 @@ public class CallerSensitiveMethodHandle {
         MethodHandle mh = l.findVirtual(Field.class, "setInt", methodType(void.class, Object.class, int.class));
         int newValue = 5;
         mh.invokeExact(f, (Object) null, newValue);
-        assertTrue(field == newValue);
+        assertEquals(newValue, field);
     }
 
     @Test
@@ -55,6 +54,6 @@ public class CallerSensitiveMethodHandle {
         MethodHandle MH_lookup2 = lookup.findStatic(MethodHandles.class, "lookup", methodType(Lookup.class));
         Lookup lookup2 = (Lookup) MH_lookup2.invokeExact();
         System.out.println(lookup2 + " original lookup class " + lookup.lookupClass());
-        assertTrue(lookup2.lookupClass() == lookup.lookupClass());
+        assertSame(lookup.lookupClass(), lookup2.lookupClass());
     }
 }
diff --git a/test/jdk/java/lang/invoke/ClassSpecializerTest.java b/test/jdk/java/lang/invoke/ClassSpecializerTest.java
index 671cf39e217..8bc5c58ad52 100644
--- a/test/jdk/java/lang/invoke/ClassSpecializerTest.java
+++ b/test/jdk/java/lang/invoke/ClassSpecializerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,13 @@
 /* @test
  * @summary Smoke-test class specializer, used to create BoundMethodHandle classes
  * @compile/module=java.base java/lang/invoke/ClassSpecializerHelper.java
- * @run testng/othervm/timeout=250 -ea -esa ClassSpecializerTest
+ * @run junit/othervm/timeout=250 -ea -esa ClassSpecializerTest
  */
 
 // Useful diagnostics to try:
 //   -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true
 //   -Djava.lang.invoke.MethodHandle.DUMP_CLASS_FILES=true
 
-
-import org.testng.annotations.*;
 import java.lang.invoke.*;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,6 +38,11 @@ import java.util.List;
 
 import static java.lang.invoke.ClassSpecializerHelper.*;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
 
 public class ClassSpecializerTest {
     @Test
@@ -58,12 +61,12 @@ public class ClassSpecializerTest {
             }
             args.set(0, key * 1000 + 42);
             Frob f = (Frob) mh.invokeWithArguments(args.toArray());
-            assert(f.kind() == k);
+            assertSame(k, f.kind());
             System.out.println("k.f(...) = " + f.toString());
             List<Object> l = f.asList();
             System.out.println("f.l = " + l);
             args.subList(0,1).clear();  // drop label
-            assert(args.equals(l));
+            assertEquals(args, l);
         }
     }
     private static Object coughUpA(Class<?> pt) throws Throwable {
diff --git a/test/jdk/java/lang/invoke/CompileThresholdBootstrapTest.java b/test/jdk/java/lang/invoke/CompileThresholdBootstrapTest.java
index 848264b83a3..c6e093bd09a 100644
--- a/test/jdk/java/lang/invoke/CompileThresholdBootstrapTest.java
+++ b/test/jdk/java/lang/invoke/CompileThresholdBootstrapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,27 +26,19 @@
  * @bug 8143232
  * @summary Test verifies that LF bootstraps properly when run with COMPILE_THRESHOLD set
  * @compile CompileThresholdBootstrapTest.java
- * @run testng/othervm -Djava.lang.invoke.MethodHandle.COMPILE_THRESHOLD=30 test.java.lang.invoke.CompileThresholdBootstrapTest
+ * @run junit/othervm -Djava.lang.invoke.MethodHandle.COMPILE_THRESHOLD=30 test.java.lang.invoke.CompileThresholdBootstrapTest
  */
 package test.java.lang.invoke;
 
 import java.lang.invoke.MethodHandles;
-import org.testng.*;
-import org.testng.annotations.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public final class CompileThresholdBootstrapTest {
 
     @Test
     public void testBootstrap() throws Throwable {
-        Assert.assertEquals((int)MethodHandles.constant(int.class, (int)0).invokeExact(), 0);
-    }
-
-    public static void main(String ... args) {
-        try {
-            CompileThresholdBootstrapTest test = new CompileThresholdBootstrapTest();
-            test.testBootstrap();
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
+        assertEquals(0, (int)MethodHandles.constant(int.class, (int)0).invokeExact());
     }
 }
diff --git a/test/jdk/java/lang/invoke/ConstantIdentityMHTest.java b/test/jdk/java/lang/invoke/ConstantIdentityMHTest.java
index 320fd29abe6..43770ea023b 100644
--- a/test/jdk/java/lang/invoke/ConstantIdentityMHTest.java
+++ b/test/jdk/java/lang/invoke/ConstantIdentityMHTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @summary unit tests for java.lang.invoke.MethodHandles
- * @run testng/othervm -ea -esa test.java.lang.invoke.ConstantIdentityMHTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.ConstantIdentityMHTest
  */
 package test.java.lang.invoke;
 
@@ -31,13 +31,14 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
-import static org.testng.Assert.*;
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ConstantIdentityMHTest {
 
-    @DataProvider(name = "testZeroData")
-    private Object[][] testZeroData() {
+    private static Object[][] testZeroData() {
        return new Object[][] {
            {void.class, "()void"},
            {int.class, "()int"},
@@ -52,26 +53,27 @@ public class ConstantIdentityMHTest {
        };
     }
 
-    @Test(dataProvider = "testZeroData")
+    @ParameterizedTest
+    @MethodSource("testZeroData")
     public void testZero(Class<?> expectedtype, String expected) throws Throwable {
-        assertEquals(MethodHandles.zero(expectedtype).type().toString(), expected);
+        assertEquals(expected, MethodHandles.zero(expectedtype).type().toString());
     }
 
-    @Test(expectedExceptions={ NullPointerException.class })
+    @Test
     public void testZeroNPE() {
-        MethodHandle mh = MethodHandles.zero(null);
+        assertThrows(NullPointerException.class, () -> MethodHandles.zero(null));
     }
 
     @Test
     void testEmpty() throws Throwable {
         MethodHandle cat = lookup().findVirtual(String.class, "concat", methodType(String.class, String.class));
-        assertEquals((String)cat.invoke("x","y"), "xy");
+        assertEquals("xy", (String)cat.invoke("x","y"));
         MethodHandle mhEmpty = MethodHandles.empty(cat.type());
-        assertEquals((String)mhEmpty.invoke("x","y"), null);
+        assertNull((String) mhEmpty.invoke("x", "y"));
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     void testEmptyNPE() {
-        MethodHandle lenEmptyMH = MethodHandles.empty(null);
+        assertThrows(NullPointerException.class, () -> MethodHandles.empty(null));
     }
 }
diff --git a/test/jdk/java/lang/invoke/DefineClassTest.java b/test/jdk/java/lang/invoke/DefineClassTest.java
index f712c945e59..889607f38f5 100644
--- a/test/jdk/java/lang/invoke/DefineClassTest.java
+++ b/test/jdk/java/lang/invoke/DefineClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @modules java.base/java.lang:open
- * @run testng/othervm test.DefineClassTest
+ * @run junit/othervm test.DefineClassTest
  * @summary Basic test for java.lang.invoke.MethodHandles.Lookup.defineClass
  */
 
@@ -38,7 +38,6 @@ import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.testng.annotations.Test;
 
 import static java.lang.classfile.ClassFile.ACC_PUBLIC;
 import static java.lang.classfile.ClassFile.ACC_STATIC;
@@ -48,7 +47,8 @@ import static java.lang.constant.ConstantDescs.INIT_NAME;
 import static java.lang.constant.ConstantDescs.MTD_void;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodHandles.Lookup.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DefineClassTest {
     private static final String THIS_PACKAGE = DefineClassTest.class.getPackageName();
@@ -60,9 +60,9 @@ public class DefineClassTest {
      * protection domain, as a lookup class.
      */
     void testSameAbode(Class<?> clazz, Class<?> lc) {
-        assertTrue(clazz.getClassLoader() == lc.getClassLoader());
-        assertEquals(clazz.getPackageName(), lc.getPackageName());
-        assertTrue(clazz.getProtectionDomain() == lc.getProtectionDomain());
+        assertSame(lc.getClassLoader(), clazz.getClassLoader());
+        assertEquals(lc.getPackageName(), clazz.getPackageName());
+        assertSame(lc.getProtectionDomain(), clazz.getProtectionDomain());
     }
 
     /**
@@ -72,8 +72,8 @@ public class DefineClassTest {
     void testDiscoverable(Class<?> clazz, Lookup lookup) throws Exception {
         String cn = clazz.getName();
         ClassLoader loader = clazz.getClassLoader();
-        assertTrue(Class.forName(cn, false, loader) == clazz);
-        assertTrue(lookup.findClass(cn) == clazz);
+        assertSame(clazz, Class.forName(cn, false, loader));
+        assertSame(clazz, lookup.findClass(cn));
     }
 
     /**
@@ -86,7 +86,7 @@ public class DefineClassTest {
         Class<?> clazz = lookup.defineClass(generateClass(CLASS_NAME));
 
         // test name
-        assertEquals(clazz.getName(), CLASS_NAME);
+        assertEquals(CLASS_NAME, clazz.getName());
 
         // test loader/package/protection-domain
         testSameAbode(clazz, lookup.lookupClass());
@@ -95,10 +95,8 @@ public class DefineClassTest {
         testDiscoverable(clazz, lookup);
 
         // attempt defineClass again
-        try {
-            lookup.defineClass(generateClass(CLASS_NAME));
-            assertTrue(false);
-        } catch (LinkageError expected) { }
+        var bytes = generateClass(CLASS_NAME);
+        assertThrows(LinkageError.class, () -> lookup.defineClass(bytes));
     }
 
     /**
@@ -126,10 +124,7 @@ public class DefineClassTest {
         classBytes = generateRunner(CLASS_NAME + nextNumber(), THIS_CLASS, "method4");
         Class<?> clazz = lookup.defineClass(classBytes);
         Runnable r = (Runnable) clazz.newInstance();
-        try {
-            r.run();
-            assertTrue(false);
-        } catch (IllegalAccessError expected) { }
+        assertThrows(IllegalAccessError.class, r::run);
     }
 
     public static void method1() { }
@@ -154,12 +149,8 @@ public class DefineClassTest {
         Class<?> clazz = lookup().defineClass(classBytes);
 
         // trigger initializer to run
-        try {
-            clazz.newInstance();
-            assertTrue(false);
-        } catch (ExceptionInInitializerError e) {
-            assertTrue(e.getCause() instanceof IllegalCallerException);
-        }
+        var e = assertThrows(ExceptionInInitializerError.class, clazz::newInstance);
+        assertInstanceOf(IllegalCallerException.class, e.getCause());
     }
 
     static void fail() { throw new IllegalCallerException(); }
@@ -189,9 +180,9 @@ public class DefineClassTest {
         ClassLoader loader = new URLClassLoader(new URL[] { url1, url2 });
         Class<?> target1 = Class.forName("p.C1", false, loader);
         Class<?> target2 = Class.forName("p.C2", false, loader);
-        assertTrue(target1.getClassLoader() == loader);
-        assertTrue(target1.getClassLoader() == loader);
-        assertNotEquals(target1.getProtectionDomain(), target2.getProtectionDomain());
+        assertSame(loader, target1.getClassLoader());
+        assertSame(loader, target1.getClassLoader());
+        assertNotEquals(target2.getProtectionDomain(), target1.getProtectionDomain());
 
         // protection domain 1
         Lookup lookup1 = privateLookupIn(target1, lookup());
@@ -214,43 +205,43 @@ public class DefineClassTest {
     @Test
     public void testBootLoader() throws Exception {
         Lookup lookup = privateLookupIn(Thread.class, lookup());
-        assertTrue(lookup.getClass().getClassLoader() == null);
+        assertNull(lookup.getClass().getClassLoader());
 
         Class<?> clazz = lookup.defineClass(generateClass("java.lang.Foo"));
-        assertEquals(clazz.getName(), "java.lang.Foo");
+        assertEquals("java.lang.Foo", clazz.getName());
         testSameAbode(clazz, Thread.class);
         testDiscoverable(clazz, lookup);
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void testWrongPackage() throws Exception {
-        lookup().defineClass(generateClass("other.C"));
+        assertThrows(IllegalArgumentException.class, () -> lookup().defineClass(generateClass("other.C")));
     }
 
-    @Test(expectedExceptions = { IllegalAccessException.class })
+    @Test
     public void testNoPackageAccess() throws Exception {
         Lookup lookup = lookup().dropLookupMode(PACKAGE);
-        lookup.defineClass(generateClass(THIS_PACKAGE + ".C"));
+        assertThrows(IllegalAccessException.class, () -> lookup.defineClass(generateClass(THIS_PACKAGE + ".C")));
     }
 
-    @Test(expectedExceptions = { ClassFormatError.class })
+    @Test
     public void testTruncatedClassFile() throws Exception {
-        lookup().defineClass(new byte[0]);
+        assertThrows(ClassFormatError.class, () -> lookup().defineClass(new byte[0]));
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void testNull() throws Exception {
-        lookup().defineClass(null);
+        assertThrows(NullPointerException.class, () -> lookup().defineClass(null));
     }
 
-    @Test(expectedExceptions = { NoClassDefFoundError.class })
+    @Test
     public void testLinking() throws Exception {
-        lookup().defineClass(generateNonLinkableClass(THIS_PACKAGE + ".NonLinkableClass"));
+        assertThrows(NoClassDefFoundError.class, () -> lookup().defineClass(generateNonLinkableClass(THIS_PACKAGE + ".NonLinkableClass")));
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void testModuleInfo() throws Exception {
-        lookup().defineClass(generateModuleInfo());
+        assertThrows(IllegalArgumentException.class, () -> lookup().defineClass(generateModuleInfo()));
     }
 
     /**
diff --git a/test/jdk/java/lang/invoke/DropArgumentsTest.java b/test/jdk/java/lang/invoke/DropArgumentsTest.java
index 2df9b5f63ba..fb82bb312cd 100644
--- a/test/jdk/java/lang/invoke/DropArgumentsTest.java
+++ b/test/jdk/java/lang/invoke/DropArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,24 @@
 /* @test
  * @bug  8158169
  * @summary unit tests for java.lang.invoke.MethodHandles
- * @run testng test.java.lang.invoke.DropArgumentsTest
+ * @run junit test.java.lang.invoke.DropArgumentsTest
  */
 package test.java.lang.invoke;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class DropArgumentsTest {
 
@@ -53,8 +58,7 @@ public class DropArgumentsTest {
 
     }
 
-    @DataProvider(name = "dropArgumentsToMatchNPEData")
-    private Object[][] dropArgumentsToMatchNPEData()
+    private static Object[][] dropArgumentsToMatchNPEData()
             throws NoSuchMethodException, IllegalAccessException {
         MethodHandle cat = lookup().findVirtual(String.class, "concat", methodType(String.class, String.class));
         return new Object[][] {
@@ -63,13 +67,13 @@ public class DropArgumentsTest {
         };
     }
 
-    @Test(dataProvider = "dropArgumentsToMatchNPEData", expectedExceptions = { NullPointerException.class })
+    @ParameterizedTest
+    @MethodSource("dropArgumentsToMatchNPEData")
     public void dropArgumentsToMatchNPE(MethodHandle target, int pos, List<Class<?>> valueType, int skip) {
-        MethodHandles.dropArgumentsToMatch(target, pos, valueType , skip);
+        assertThrows(NullPointerException.class, () -> MethodHandles.dropArgumentsToMatch(target, pos, valueType, skip));
     }
 
-    @DataProvider(name = "dropArgumentsToMatchIAEData")
-    private Object[][] dropArgumentsToMatchIAEData()
+    private static Object[][] dropArgumentsToMatchIAEData()
         throws NoSuchMethodException, IllegalAccessException {
         MethodHandle cat = lookup().findVirtual(String.class, "concat", methodType(String.class, String.class));
         MethodType bigType = cat.type().insertParameterTypes(0, String.class, String.class, int.class);
@@ -82,17 +86,20 @@ public class DropArgumentsTest {
         };
     }
 
-    @Test(dataProvider = "dropArgumentsToMatchIAEData", expectedExceptions = { IllegalArgumentException.class })
+    @ParameterizedTest
+    @MethodSource("dropArgumentsToMatchIAEData")
     public void dropArgumentsToMatchIAE(MethodHandle target, int pos, List<Class<?>> valueType, int skip) {
-        MethodHandles.dropArgumentsToMatch(target, pos, valueType , skip);
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.dropArgumentsToMatch(target, pos, valueType, skip));
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void dropArgumentsToMatchTestWithVoid() throws Throwable {
         MethodHandle cat = lookup().findVirtual(String.class, "concat",
-                                   MethodType.methodType(String.class, String.class));
-        MethodType bigTypewithVoid = cat.type().insertParameterTypes(0, void.class, String.class, int.class);
-        MethodHandle handle2 = MethodHandles.dropArgumentsToMatch(cat, 0, bigTypewithVoid.parameterList(), 1);
+                MethodType.methodType(String.class, String.class));
+        List<Class<?>> bigTypewithVoid = new ArrayList<>(cat.type().parameterList());
+        bigTypewithVoid.addAll(0, List.of(void.class, String.class, int.class));
+        assertThrows(IllegalArgumentException.class, () ->
+                MethodHandles.dropArgumentsToMatch(cat, 0, bigTypewithVoid, 1));
     }
 
     public static class MethodSet {
diff --git a/test/jdk/java/lang/invoke/DropLookupModeTest.java b/test/jdk/java/lang/invoke/DropLookupModeTest.java
index 1a4c311be8b..7619793c3c6 100644
--- a/test/jdk/java/lang/invoke/DropLookupModeTest.java
+++ b/test/jdk/java/lang/invoke/DropLookupModeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @run testng DropLookupModeTest
+ * @run junit DropLookupModeTest
  * @summary Basic unit tests Lookup::dropLookupMode
  */
 
@@ -31,83 +31,85 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import static java.lang.invoke.MethodHandles.Lookup.*;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
-@Test
 public class DropLookupModeTest {
 
     /**
      * Basic test of dropLookupMode
      */
+    @Test
     public void testBasic() {
         final Lookup fullPowerLookup = MethodHandles.lookup();
         final Class<?> lc = fullPowerLookup.lookupClass();
-        assertTrue(fullPowerLookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PROTECTED|PRIVATE|ORIGINAL));
+        assertEquals(PUBLIC | MODULE | PACKAGE | PROTECTED | PRIVATE | ORIGINAL, fullPowerLookup.lookupModes());
 
         Lookup lookup = fullPowerLookup.dropLookupMode(PRIVATE);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE | PACKAGE, lookup.lookupModes());
 
         lookup = fullPowerLookup.dropLookupMode(PROTECTED);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE | PACKAGE | PRIVATE, lookup.lookupModes());
 
         lookup = fullPowerLookup.dropLookupMode(PACKAGE);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE, lookup.lookupModes());
 
         lookup = fullPowerLookup.dropLookupMode(MODULE);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC, lookup.lookupModes());
 
         lookup = fullPowerLookup.dropLookupMode(PUBLIC);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == 0);
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(0, lookup.lookupModes());
 
         lookup = fullPowerLookup.dropLookupMode(UNCONDITIONAL);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE | PACKAGE | PRIVATE, lookup.lookupModes());
     }
 
     /**
      * Starting with a full power Lookup, use dropLookupMode to create new Lookups
      * with reduced access.
      */
+    @Test
     public void testReducingAccess() {
         Lookup lookup = MethodHandles.lookup();
         final Class<?> lc = lookup.lookupClass();
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PROTECTED|PRIVATE|ORIGINAL));
+        assertEquals(PUBLIC | MODULE | PACKAGE | PROTECTED | PRIVATE | ORIGINAL, lookup.lookupModes());
 
         lookup = lookup.dropLookupMode(PROTECTED);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE | PACKAGE | PRIVATE, lookup.lookupModes());
 
         lookup = lookup.dropLookupMode(PRIVATE);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE | PACKAGE, lookup.lookupModes());
 
         lookup = lookup.dropLookupMode(PACKAGE);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == (PUBLIC|MODULE));
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC | MODULE, lookup.lookupModes());
 
         lookup = lookup.dropLookupMode(MODULE);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == PUBLIC);
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(PUBLIC, lookup.lookupModes());
 
         lookup = lookup.dropLookupMode(PUBLIC);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == 0);
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(0, lookup.lookupModes());
 
         // repeat with lookup has no access
         lookup = lookup.dropLookupMode(PUBLIC);
-        assertTrue(lookup.lookupClass() == lc);
-        assertTrue(lookup.lookupModes() == 0);
+        assertSame(lc, lookup.lookupClass());
+        assertEquals(0, lookup.lookupModes());
     }
 
-    @DataProvider(name = "unconditionals")
-    public Object[][] unconditionals() {
+    public static Object[][] unconditionals() {
         Lookup publicLookup = MethodHandles.publicLookup();
         return new Object[][] {
             { publicLookup, Object.class },
@@ -120,9 +122,10 @@ public class DropLookupModeTest {
      * Test dropLookupMode on the lookup with public lookup
      * and UNCONDITIONAL
      */
-    @Test(dataProvider = "unconditionals")
+    @ParameterizedTest
+    @MethodSource("unconditionals")
     public void testUnconditionalLookup(Lookup unconditionalLookup, Class<?> expected) {
-        assertTrue(unconditionalLookup.lookupModes() == UNCONDITIONAL);
+        assertEquals(UNCONDITIONAL, unconditionalLookup.lookupModes());
 
         assertPublicLookup(unconditionalLookup.dropLookupMode(PRIVATE), expected);
         assertPublicLookup(unconditionalLookup.dropLookupMode(PROTECTED), expected);
@@ -132,31 +135,27 @@ public class DropLookupModeTest {
 
         // drop all access
         Lookup lookup = unconditionalLookup.dropLookupMode(UNCONDITIONAL);
-        assertTrue(lookup.lookupClass() == expected);
-        assertTrue(lookup.lookupModes() == 0);
+        assertSame(expected, lookup.lookupClass());
+        assertEquals(0, lookup.lookupModes());
     }
 
     private void assertPublicLookup(Lookup lookup, Class<?> expected) {
-        assertTrue(lookup.lookupClass() == expected);
-        assertTrue(lookup.lookupModes() == UNCONDITIONAL);
-    }
-
-    @DataProvider(name = "badInput")
-    public Object[][] badInput() {
-        return new Object[][] {
-                { 0,                        null },
-                { (PACKAGE|PRIVATE),        null },    // two modes
-                { Integer.MAX_VALUE,        null },
-                { Integer.MIN_VALUE,        null },
-        };
+        assertSame(expected, lookup.lookupClass());
+        assertEquals(UNCONDITIONAL, lookup.lookupModes());
     }
 
     /**
      * Check that IllegalArgumentException is thrown for bad input
      */
-    @Test(dataProvider = "badInput", expectedExceptions = {IllegalArgumentException.class})
-    public void testBadInput(Integer modeToDrop, Object ignore) {
-        MethodHandles.lookup().dropLookupMode(modeToDrop);
+    @ParameterizedTest
+    @ValueSource(ints = {
+            0,
+            (PACKAGE|PRIVATE),    // two modes
+            Integer.MAX_VALUE,
+            Integer.MIN_VALUE,
+    })
+    public void testBadInput(int modeToDrop) {
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.lookup().dropLookupMode(modeToDrop));
     }
 
 }
diff --git a/test/jdk/java/lang/invoke/FilterArgumentsTest.java b/test/jdk/java/lang/invoke/FilterArgumentsTest.java
index 3c4884e7c6a..2326799cc1c 100644
--- a/test/jdk/java/lang/invoke/FilterArgumentsTest.java
+++ b/test/jdk/java/lang/invoke/FilterArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8194554
- * @run testng/othervm test.java.lang.invoke.FilterArgumentsTest
+ * @run junit/othervm test.java.lang.invoke.FilterArgumentsTest
  */
 
 package test.java.lang.invoke;
@@ -37,40 +37,40 @@ import java.util.List;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.methodType;
 
-import org.testng.annotations.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class FilterArgumentsTest {
 
     @Test
-    public static void testFilterA_B_C() throws Throwable {
+    public void testFilterA_B_C() throws Throwable {
         FilterTest test = new FilterTest(
             filterArguments(MH_TEST, 0, MH_FILTER_A, MH_FILTER_B, MH_FILTER_C));
         test.run(List.of("A", "B", "C"));
     }
 
     @Test
-    public static void testFilterA_B() throws Throwable {
+    public void testFilterA_B() throws Throwable {
         FilterTest test = new FilterTest(
             filterArguments(MH_TEST, 0, MH_FILTER_A, MH_FILTER_B));
         test.run(List.of("A", "B"));
     }
 
     @Test
-    public static void testFilterB_C() throws Throwable {
+    public void testFilterB_C() throws Throwable {
         FilterTest test = new FilterTest(
             filterArguments(MH_TEST, 1, MH_FILTER_B, MH_FILTER_C));
         test.run(List.of("B", "C"));
     }
 
     @Test
-    public static void testFilterB() throws Throwable {
+    public void testFilterB() throws Throwable {
         FilterTest test = new FilterTest(filterArguments(MH_TEST, 1, MH_FILTER_B));
         test.run(List.of("B"));
     }
 
     @Test
-    public static void testFilterC() throws Throwable {
+    public void testFilterC() throws Throwable {
         FilterTest test = new FilterTest(filterArguments(MH_TEST, 2, MH_FILTER_C));
         test.run(List.of("C"));
     }
@@ -85,8 +85,8 @@ public class FilterArgumentsTest {
 
         void run(List<String> expected) throws Throwable {
             filters.clear();
-            assertEquals((String)mh.invokeExact("x", 0, 'z'), "x-0-z");
-            assertEquals(filters, expected);
+            assertEquals("x-0-z", (String)mh.invokeExact("x", 0, 'z'));
+            assertEquals(expected, filters);
         }
 
         static String filterA(String s) {
diff --git a/test/jdk/java/lang/invoke/FindAccessTest.java b/test/jdk/java/lang/invoke/FindAccessTest.java
index f8602ee22bd..3bcff4f5324 100644
--- a/test/jdk/java/lang/invoke/FindAccessTest.java
+++ b/test/jdk/java/lang/invoke/FindAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 8139885
- * @run testng/othervm -ea -esa test.java.lang.invoke.FindAccessTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.FindAccessTest
  */
 
 package test.java.lang.invoke;
@@ -33,9 +33,10 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * Tests for Lookup.findClass/accessClass extensions added in JEP 274.
@@ -45,7 +46,7 @@ public class FindAccessTest {
     static final Lookup LOOKUP = MethodHandles.lookup();
 
     @Test
-    public static void testFindSpecial() throws Throwable {
+    public void testFindSpecial() throws Throwable {
         FindSpecial.C c = new FindSpecial.C();
         assertEquals("I1.m", c.m());
         MethodType t = MethodType.methodType(String.class);
@@ -54,25 +55,18 @@ public class FindAccessTest {
     }
 
     @Test
-    public static void testFindSpecialAbstract() throws Throwable {
+    public void testFindSpecialAbstract() throws Throwable {
         FindSpecial.C c = new FindSpecial.C();
         assertEquals("q", c.q());
         MethodType t = MethodType.methodType(String.class);
-        boolean caught = false;
-        try {
-            MethodHandle ci3q = LOOKUP.findSpecial(FindSpecial.I3.class, "q", t, FindSpecial.C.class);
-        } catch (Throwable thrown) {
-            if (!(thrown instanceof IllegalAccessException) || !FindSpecial.ABSTRACT_ERROR.equals(thrown.getMessage())) {
-                throw new AssertionError(thrown.getMessage(), thrown);
-            }
-            caught = true;
-        }
-        assertTrue(caught);
+        var thrown = assertThrows(IllegalAccessException.class,
+                () -> LOOKUP.findSpecial(FindSpecial.I3.class, "q", t, FindSpecial.C.class));
+        assertEquals(FindSpecial.ABSTRACT_ERROR, thrown.getMessage());
     }
 
-    @Test(expectedExceptions = {ClassNotFoundException.class})
-    public static void testFindClassCNFE() throws ClassNotFoundException, IllegalAccessException {
-        LOOKUP.findClass("does.not.Exist");
+    @Test
+    public void testFindClassCNFE() throws ClassNotFoundException, IllegalAccessException {
+        assertThrows(ClassNotFoundException.class, () -> LOOKUP.findClass("does.not.Exist"));
     }
 
     static class FindSpecial {
diff --git a/test/jdk/java/lang/invoke/FoldTest.java b/test/jdk/java/lang/invoke/FoldTest.java
index 157cfbffe2e..92ba246ebc8 100644
--- a/test/jdk/java/lang/invoke/FoldTest.java
+++ b/test/jdk/java/lang/invoke/FoldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 8139885
- * @run testng/othervm -ea -esa test.java.lang.invoke.FoldTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.FoldTest
  */
 
 package test.java.lang.invoke;
@@ -36,9 +36,9 @@ import java.lang.invoke.MethodType;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests for the new fold method handle combinator added in JEP 274.
@@ -48,7 +48,7 @@ public class FoldTest {
     static final Lookup LOOKUP = MethodHandles.lookup();
 
     @Test
-    public static void testFold0a() throws Throwable {
+    public void testFold0a() throws Throwable {
         // equivalence to foldArguments(MethodHandle,MethodHandle)
         MethodHandle fold = MethodHandles.foldArguments(Fold.MH_multer, 0, Fold.MH_adder);
         assertEquals(Fold.MT_folded1, fold.type());
@@ -56,7 +56,7 @@ public class FoldTest {
     }
 
     @Test
-    public static void testFold1a() throws Throwable {
+    public void testFold1a() throws Throwable {
         // test foldArguments for folding position 1
         MethodHandle fold = MethodHandles.foldArguments(Fold.MH_multer, 1, Fold.MH_adder1);
         assertEquals(Fold.MT_folded1, fold.type());
@@ -64,7 +64,7 @@ public class FoldTest {
     }
 
     @Test
-    public static void testFold0b() throws Throwable {
+    public void testFold0b() throws Throwable {
         // test foldArguments equivalence with multiple types
         MethodHandle fold = MethodHandles.foldArguments(Fold.MH_str, 0, Fold.MH_comb);
         assertEquals(Fold.MT_folded2, fold.type());
@@ -72,7 +72,7 @@ public class FoldTest {
     }
 
     @Test
-    public static void testFold1b() throws Throwable {
+    public void testFold1b() throws Throwable {
         // test folgArguments for folding position 1, with multiple types
         MethodHandle fold = MethodHandles.foldArguments(Fold.MH_str, 1, Fold.MH_comb2);
         assertEquals(Fold.MT_folded3, fold.type());
@@ -81,7 +81,7 @@ public class FoldTest {
     }
 
     @Test
-    public static void testFoldArgumentsExample() throws Throwable {
+    public void testFoldArgumentsExample() throws Throwable {
         // test the JavaDoc foldArguments-with-pos example
         StringWriter swr = new StringWriter();
         MethodHandle trace = LOOKUP.findVirtual(StringWriter.class, "write", methodType(void.class, String.class)).bindTo(swr);
diff --git a/test/jdk/java/lang/invoke/InvokeGenericTest.java b/test/jdk/java/lang/invoke/InvokeGenericTest.java
index ef201caead1..0be810506de 100644
--- a/test/jdk/java/lang/invoke/InvokeGenericTest.java
+++ b/test/jdk/java/lang/invoke/InvokeGenericTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @summary unit tests for java.lang.invoke.MethodHandle.invoke
  * @compile InvokeGenericTest.java
- * @run testng/othervm test.java.lang.invoke.InvokeGenericTest
+ * @run junit/othervm test.java.lang.invoke.InvokeGenericTest
  */
 
 package test.java.lang.invoke;
@@ -34,9 +34,13 @@ import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
 import java.lang.reflect.*;
 import java.util.*;
-import org.testng.*;
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /**
  *
@@ -68,7 +72,7 @@ public class InvokeGenericTest {
     String testName;
     static int allPosTests, allNegTests;
     int posTests, negTests;
-    @AfterMethod
+    @AfterEach
     public void printCounts() {
         if (verbosity >= 2 && (posTests | negTests) != 0) {
             System.out.println();
@@ -92,14 +96,14 @@ public class InvokeGenericTest {
         testName = name;
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         calledLog.clear();
         calledLog.add(null);
         nextArgVal = INITIAL_ARG_VAL;
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() throws Exception {
         int posTests = allPosTests, negTests = allNegTests;
         if (verbosity >= 2 && (posTests | negTests) != 0) {
@@ -127,7 +131,7 @@ public class InvokeGenericTest {
         System.out.println("actual:     "+actual);
         System.out.println("ex. types:  "+getClasses(expected));
         System.out.println("act. types: "+getClasses(actual));
-        assertEquals("previous method call", expected, actual);
+        assertEquals(expected, actual, "previous method call");
     }
     static void printCalled(MethodHandle target, String name, Object... args) {
         if (verbosity >= 3)
@@ -389,8 +393,7 @@ public class InvokeGenericTest {
     }
     public void testWrongArgumentCount(List<Class<?>> expect, List<Class<?>> observe) throws Throwable {
         countTest(false);
-        if (expect.equals(observe))
-            assert(false);
+        assertNotEquals(expect, observe);
         MethodHandle target = callable(expect);
         Object[] args = zeroArgs(observe);
         Object junk;
@@ -473,28 +476,25 @@ public class InvokeGenericTest {
         mh = MethodHandles.filterReturnValue(mh, toString_MH);
         mh = mh.asType(type);
         Object res = null;
-        if (nargs == 2) {
-            res = mh.invoke((Object)args[0], (Object)args[1]);
-            assertEquals(expectString, res);
-            res = mh.invoke((String)args[0], (Object)args[1]);
-            assertEquals(expectString, res);
-            res = mh.invoke((Object)args[0], (String)args[1]);
-            assertEquals(expectString, res);
-            res = mh.invoke((String)args[0], (String)args[1]);
-            assertEquals(expectString, res);
-            res = mh.invoke((String)args[0], (CharSequence)args[1]);
-            assertEquals(expectString, res);
-            res = mh.invoke((CharSequence)args[0], (Object)args[1]);
-            assertEquals(expectString, res);
-            res = (String) mh.invoke((Object)args[0], (Object)args[1]);
-            assertEquals(expectString, res);
-            res = (String) mh.invoke((String)args[0], (Object)args[1]);
-            assertEquals(expectString, res);
-            res = (CharSequence) mh.invoke((String)args[0], (Object)args[1]);
-            assertEquals(expectString, res);
-        } else {
-            assert(false);  // write this code
-        }
+        assertEquals(2, nargs);
+        res = mh.invoke((Object)args[0], (Object)args[1]);
+        assertEquals(expectString, res);
+        res = mh.invoke((String)args[0], (Object)args[1]);
+        assertEquals(expectString, res);
+        res = mh.invoke((Object)args[0], (String)args[1]);
+        assertEquals(expectString, res);
+        res = mh.invoke((String)args[0], (String)args[1]);
+        assertEquals(expectString, res);
+        res = mh.invoke((String)args[0], (CharSequence)args[1]);
+        assertEquals(expectString, res);
+        res = mh.invoke((CharSequence)args[0], (Object)args[1]);
+        assertEquals(expectString, res);
+        res = (String) mh.invoke((Object)args[0], (Object)args[1]);
+        assertEquals(expectString, res);
+        res = (String) mh.invoke((String)args[0], (Object)args[1]);
+        assertEquals(expectString, res);
+        res = (CharSequence) mh.invoke((String)args[0], (Object)args[1]);
+        assertEquals(expectString, res);
         //System.out.println(res);
     }
 
diff --git a/test/jdk/java/lang/invoke/InvokeMethodHandleWithBadArgument.java b/test/jdk/java/lang/invoke/InvokeMethodHandleWithBadArgument.java
index 2479c22b2f4..f2749cfb164 100644
--- a/test/jdk/java/lang/invoke/InvokeMethodHandleWithBadArgument.java
+++ b/test/jdk/java/lang/invoke/InvokeMethodHandleWithBadArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8157246
  * @summary Tests invocation of MethodHandle with invalid leading argument
- * @run testng/othervm test.java.lang.invoke.InvokeMethodHandleWithBadArgument
+ * @run junit/othervm test.java.lang.invoke.InvokeMethodHandleWithBadArgument
  */
 
 package test.java.lang.invoke;
@@ -38,9 +38,9 @@ import java.lang.invoke.VarHandle;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests invocation of MethodHandle with invalid leading argument such as
@@ -49,86 +49,100 @@ import org.testng.annotations.*;
 public class InvokeMethodHandleWithBadArgument {
     // ---- null array reference ----
 
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testAsSpreaderPosInvokeWithNull() throws Throwable {
+    @Test
+    public void testAsSpreaderPosInvokeWithNull() throws Throwable {
         MethodHandle spreader = MH_spread.asSpreader(1, int[].class, 3);
-        spreader.invoke("A", null, "B");
+        assertThrows(NullPointerException.class, () -> spreader.invoke("A", null, "B"));
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testAsSpreaderInvokeWithNull() throws Throwable {
+    @Test
+    public void testAsSpreaderInvokeWithNull() throws Throwable {
         MethodHandle spreader = MH_String_equals.asSpreader(String[].class, 2);
-        assert ((boolean) spreader.invokeExact(new String[]{"me", "me"}));
-        boolean eq = (boolean) spreader.invokeExact((String[]) null);
+        assertTrue((boolean) spreader.invokeExact(new String[]{"me", "me"}));
+        assertThrows(NullPointerException.class, () -> {
+            boolean eq = (boolean) spreader.invokeExact((String[]) null);
+        });
     }
 
     // ---- incorrect array element count ----
-    @Test(expectedExceptions = {IllegalArgumentException.class})
-    public static void testAsSpreaderPosInvokeWithBadElementCount() throws Throwable {
+    @Test
+    public void testAsSpreaderPosInvokeWithBadElementCount() throws Throwable {
         MethodHandle spreader = MH_spread.asSpreader(1, int[].class, 3);
-        spreader.invoke("A", new int[]{1, 2}, "B");
+        assertThrows(IllegalArgumentException.class, () -> spreader.invoke("A", new int[]{1, 2}, "B"));
     }
 
-    @Test(expectedExceptions = {IllegalArgumentException.class})
-    public static void testAsSpreaderInvokeWithBadElementCount() throws Throwable {
+    @Test
+    public void testAsSpreaderInvokeWithBadElementCount() throws Throwable {
         MethodHandle spreader = MH_String_equals.asSpreader(String[].class, 2);
-        assert (!(boolean) spreader.invokeExact(new String[]{"me", "thee"}));
-        boolean eq = (boolean) spreader.invokeExact(new String[0]);
+        assertFalse((boolean) spreader.invokeExact(new String[]{"me", "thee"}));
+        assertThrows(IllegalArgumentException.class, () -> {
+            boolean eq = (boolean) spreader.invokeExact(new String[0]);
+        });
     }
 
     // ---- spread no argument ----
     @Test
-    public static void testAsSpreaderPosInvokeWithZeroLength() throws Throwable {
+    public void testAsSpreaderPosInvokeWithZeroLength() throws Throwable {
         MethodHandle spreader = MH_spread.asSpreader(1, int[].class, 0);
-        assert("A123B".equals(spreader.invoke("A", (int[])null, 1, 2, 3, "B")));
+        assertEquals("A123B", spreader.invoke("A", (int[]) null, 1, 2, 3, "B"));
     }
 
     @Test
-    public static void testAsSpreaderInvokeWithZeroLength() throws Throwable {
+    public void testAsSpreaderInvokeWithZeroLength() throws Throwable {
         MethodHandle spreader = MH_String_equals.asSpreader(String[].class, 0);
-        assert ((boolean) spreader.invokeExact("me", (Object)"me", new String[0]));
+        assertTrue((boolean) spreader.invokeExact("me", (Object)"me", new String[0]));
         boolean eq = (boolean) spreader.invokeExact("me", (Object)"me", (String[]) null);
     }
 
     // ---- invokers with null method/var handle argument ----
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testInvokerWithNull() throws Throwable {
+    @Test
+    public void testInvokerWithNull() throws Throwable {
         MethodType type = methodType(int.class, int.class, int.class);
         MethodHandle invoker = MethodHandles.invoker(type);
-        assert((int) invoker.invoke(MH_add, 1, 2) == 3);
-        int sum = (int)invoker.invoke((MethodHandle)null, 1, 2);
+        assertEquals(3, (int) invoker.invoke(MH_add, 1, 2));
+        assertThrows(NullPointerException.class, () -> {
+            int sum = (int)invoker.invoke((MethodHandle)null, 1, 2);
+        });
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testExactInvokerWithNull() throws Throwable {
+    @Test
+    public void testExactInvokerWithNull() throws Throwable {
         MethodType type = methodType(int.class, int.class, int.class);
         MethodHandle invoker = MethodHandles.exactInvoker(type);
-        assert((int) invoker.invoke(MH_add, 1, 2) == 3);
-        int sum = (int)invoker.invokeExact((MethodHandle)null, 1, 2);
+        assertEquals(3, (int) invoker.invoke(MH_add, 1, 2));
+        assertThrows(NullPointerException.class, () -> {
+            int sum = (int)invoker.invokeExact((MethodHandle)null, 1, 2);
+        });
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testSpreadInvokerWithNull() throws Throwable {
+    @Test
+    public void testSpreadInvokerWithNull() throws Throwable {
         MethodType type = methodType(boolean.class, String.class, String.class);
         MethodHandle invoker = MethodHandles.spreadInvoker(type, 0);
-        assert ((boolean) invoker.invoke(MH_String_equals, new String[]{"me", "me"}));
-        boolean eq = (boolean) invoker.invoke((MethodHandle)null, new String[]{"me", "me"});
+        assertTrue((boolean) invoker.invoke(MH_String_equals, new String[]{"me", "me"}));
+        assertThrows(NullPointerException.class, () -> {
+            boolean eq = (boolean) invoker.invoke((MethodHandle)null, new String[]{"me", "me"});
+        });
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testVarHandleInvokerWithNull() throws Throwable {
+    @Test
+    public void testVarHandleInvokerWithNull() throws Throwable {
         VarHandle.AccessMode am = VarHandle.AccessMode.GET;
         MethodHandle invoker = MethodHandles.varHandleInvoker(am, VH_array.accessModeType(am));
-        assert ((int) invoker.invoke(VH_array, array, 3) == 3);
-        int value = (int)invoker.invoke((VarHandle)null, array, 3);
+        assertEquals(3, (int) invoker.invoke(VH_array, array, 3));
+        assertThrows(NullPointerException.class, () -> {
+            int value = (int)invoker.invoke((VarHandle)null, array, 3);
+        });
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testVarHandleExactInvokerWithNull() throws Throwable {
+    @Test
+    public void testVarHandleExactInvokerWithNull() throws Throwable {
         VarHandle.AccessMode am = VarHandle.AccessMode.GET;
         MethodHandle invoker = MethodHandles.varHandleExactInvoker(am, VH_array.accessModeType(am));
-        assert ((int) invoker.invoke(VH_array, array, 3) == 3);
-        int value = (int)invoker.invokeExact((VarHandle)null, array, 3);
+        assertEquals(3, (int) invoker.invoke(VH_array, array, 3));
+        assertThrows(NullPointerException.class, () -> {
+            int value = (int)invoker.invokeExact((VarHandle)null, array, 3);
+        });
     }
 
     static final Lookup LOOKUP = MethodHandles.lookup();
diff --git a/test/jdk/java/lang/invoke/InvokeWithArgumentsTest.java b/test/jdk/java/lang/invoke/InvokeWithArgumentsTest.java
index 63a2101bd67..3a705aca699 100644
--- a/test/jdk/java/lang/invoke/InvokeWithArgumentsTest.java
+++ b/test/jdk/java/lang/invoke/InvokeWithArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,19 @@
 
 /* @test
  * @summary basic tests for MethodHandle.invokeWithArguments
- * @run testng test.java.lang.invoke.InvokeWithArgumentsTest
+ * @run junit test.java.lang.invoke.InvokeWithArgumentsTest
  */
 
 package test.java.lang.invoke;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.WrongMethodTypeException;
 
 import static java.lang.invoke.MethodType.methodType;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class InvokeWithArgumentsTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
@@ -49,10 +49,7 @@ public class InvokeWithArgumentsTest {
         MethodHandle mh = L.findStatic(L.lookupClass(), "arity",
                                        methodType(Object[].class, Object.class, Object.class, Object[].class));
 
-        try {
-            mh.invokeWithArguments("");
-            Assert.fail("WrongMethodTypeException expected");
-        } catch (WrongMethodTypeException e) {}
+        assertThrows(WrongMethodTypeException.class, () -> mh.invokeWithArguments(""));
     }
 
     static Object[] passThrough(String... a) {
@@ -72,10 +69,10 @@ public class InvokeWithArgumentsTest {
 
         // Note: the actual array is not preserved, the elements will be
         // unpacked and then packed into a new array before invoking the method
-        String[] expected = (String[]) mh.invokeWithArguments(actual);
+        String[] result = (String[]) mh.invokeWithArguments(actual);
 
-        Assert.assertTrue(actual != expected, "Array should not pass through");
-        Assert.assertEquals(actual, expected, "Array contents should be equal");
+        assertNotSame(actual, result, "Array should not pass through");
+        assertArrayEquals(actual, result, "Array contents should be equal");
     }
 
     @Test
@@ -89,8 +86,8 @@ public class InvokeWithArgumentsTest {
         // will cast to Object become the single element of a new Object[] array
         Object[] expected = (Object[]) mh.invokeWithArguments("", actual);
 
-        Assert.assertEquals(1, expected.length, "Array should contain just one element");
-        Assert.assertTrue(actual == expected[0], "Array should pass through");
+        assertEquals(1, expected.length, "Array should contain just one element");
+        assertSame(actual, expected[0], "Array should pass through");
     }
 
     static void intArray(int... a) {
@@ -100,20 +97,14 @@ public class InvokeWithArgumentsTest {
     public void testPrimitiveArrayWithNull() throws Throwable {
         MethodHandle mh = L.findStatic(L.lookupClass(), "intArray",
                                        methodType(void.class, int[].class));
-        try {
-            mh.invokeWithArguments(null, null);
-            Assert.fail("NullPointerException expected");
-        } catch (NullPointerException e) {}
+        assertThrows(NullPointerException.class, () -> mh.invokeWithArguments(null, null));
     }
 
     @Test
     public void testPrimitiveArrayWithRef() throws Throwable {
         MethodHandle mh = L.findStatic(L.lookupClass(), "intArray",
                                        methodType(void.class, int[].class));
-        try {
-            mh.invokeWithArguments("A", "B");
-            Assert.fail("ClassCastException expected");
-        } catch (ClassCastException e) {}
+        assertThrows(ClassCastException.class, () -> mh.invokeWithArguments("A", "B"));
     }
 
 
@@ -127,9 +118,6 @@ public class InvokeWithArgumentsTest {
         // All numbers, should not throw
         mh.invokeWithArguments(1, 1.0, 1.0F, 1L);
 
-        try {
-            mh.invokeWithArguments("A");
-            Assert.fail("ClassCastException expected");
-        } catch (ClassCastException e) {}
+        assertThrows(ClassCastException.class, () -> mh.invokeWithArguments("A"));
     }
 }
diff --git a/test/jdk/java/lang/invoke/JavaDocExamplesTest.java b/test/jdk/java/lang/invoke/JavaDocExamplesTest.java
index 53257d9876d..0fa2614c83f 100644
--- a/test/jdk/java/lang/invoke/JavaDocExamplesTest.java
+++ b/test/jdk/java/lang/invoke/JavaDocExamplesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @summary example code used in javadoc for java.lang.invoke API
  * @compile JavaDocExamplesTest.java
- * @run testng/othervm test.java.lang.invoke.JavaDocExamplesTest
+ * @run junit/othervm test.java.lang.invoke.JavaDocExamplesTest
  */
 
 package test.java.lang.invoke;
@@ -36,8 +36,8 @@ import static java.lang.invoke.MethodType.*;
 
 import java.util.*;
 
-import org.testng.*;
-import org.testng.annotations.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author jrose
@@ -350,14 +350,14 @@ assertEquals("boojum", (String) catTrace.invokeExact("boo", "jum"));
     static void assertEquals(Object exp, Object act) {
         if (verbosity > 0)
             System.out.println("result: "+act);
-        Assert.assertEquals(exp, act);
+        Assertions.assertEquals(exp, act);
     }
 
     static void assertTrue(boolean b) {
         if (verbosity > 0) {
             System.out.println("result: " + b);
         }
-        Assert.assertTrue(b);
+        Assertions.assertTrue(b);
     }
 
     @Test public void testMethodHandlesSummary() throws Throwable {
diff --git a/test/jdk/java/lang/invoke/JavaUtilConcurrentLookupTest.java b/test/jdk/java/lang/invoke/JavaUtilConcurrentLookupTest.java
index 9715de8fd46..a9a6861bc05 100644
--- a/test/jdk/java/lang/invoke/JavaUtilConcurrentLookupTest.java
+++ b/test/jdk/java/lang/invoke/JavaUtilConcurrentLookupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,11 @@
  * @summary Tests that Lookup can be produced from classes under java.util.concurrent
  * @bug 8154447
  * @compile/module=java.base java/util/concurrent/LookupTester.java
- * @run testng/othervm JavaUtilConcurrentLookupTest
+ * @run junit/othervm JavaUtilConcurrentLookupTest
  */
 
-import org.testng.annotations.Test;
-
 import java.util.concurrent.LookupTester;
+import org.junit.jupiter.api.Test;
 
 public class JavaUtilConcurrentLookupTest {
 
diff --git a/test/jdk/java/lang/invoke/LoopCombinatorTest.java b/test/jdk/java/lang/invoke/LoopCombinatorTest.java
index 15fb9d320a3..91a752f2666 100644
--- a/test/jdk/java/lang/invoke/LoopCombinatorTest.java
+++ b/test/jdk/java/lang/invoke/LoopCombinatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @bug 8154751
  * @bug 8154754
  * @bug 8167974
- * @run testng/othervm -ea -esa test.java.lang.invoke.LoopCombinatorTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.LoopCombinatorTest
  */
 
 package test.java.lang.invoke;
@@ -45,9 +45,12 @@ import java.util.*;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests for the loop combinators introduced in JEP 274.
@@ -57,7 +60,7 @@ public class LoopCombinatorTest {
     static final Lookup LOOKUP = MethodHandles.lookup();
 
     @Test
-    public static void testLoopFac() throws Throwable {
+    public void testLoopFac() throws Throwable {
         MethodHandle[] counterClause = new MethodHandle[]{Fac.MH_zero, Fac.MH_inc};
         MethodHandle[] accumulatorClause = new MethodHandle[]{Fac.MH_one, Fac.MH_mult, Fac.MH_pred, Fac.MH_fin};
         MethodHandle loop = MethodHandles.loop(counterClause, accumulatorClause);
@@ -66,7 +69,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopFacNullInit() throws Throwable {
+    public void testLoopFacNullInit() throws Throwable {
         // null initializer for counter, should initialize to 0
         MethodHandle[] counterClause = new MethodHandle[]{null, Fac.MH_inc};
         MethodHandle[] accumulatorClause = new MethodHandle[]{Fac.MH_one, Fac.MH_mult, Fac.MH_pred, Fac.MH_fin};
@@ -76,7 +79,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopNullInit() throws Throwable {
+    public void testLoopNullInit() throws Throwable {
         // null initializer for counter, should initialize to 0, one-clause loop
         MethodHandle[] counterClause = new MethodHandle[]{null, Loop.MH_inc, Loop.MH_pred, Loop.MH_fin};
         MethodHandle loop = MethodHandles.loop(counterClause);
@@ -85,7 +88,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopVoid1() throws Throwable {
+    public void testLoopVoid1() throws Throwable {
         // construct a post-checked loop that only does one iteration and has a void body and void local state
         MethodHandle loop = MethodHandles.loop(new MethodHandle[]{Empty.MH_f, Empty.MH_f, Empty.MH_pred, null});
         assertEquals(MethodType.methodType(void.class), loop.type());
@@ -93,7 +96,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopVoid2() throws Throwable {
+    public void testLoopVoid2() throws Throwable {
         // construct a post-checked loop that only does one iteration and has a void body and void local state,
         // initialized implicitly from the step type
         MethodHandle loop = MethodHandles.loop(new MethodHandle[]{null, Empty.MH_f, Empty.MH_pred, null});
@@ -102,7 +105,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopVoid3() throws Throwable {
+    public void testLoopVoid3() throws Throwable {
         // construct a post-checked loop that only does one iteration and has a void body and void local state,
         // and that has a void finalizer
         MethodHandle loop = MethodHandles.loop(new MethodHandle[]{null, Empty.MH_f, Empty.MH_pred, Empty.MH_f});
@@ -111,7 +114,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopFacWithVoidState() throws Throwable {
+    public void testLoopFacWithVoidState() throws Throwable {
         // like testLoopFac, but with additional void state that outputs a dot
         MethodHandle[] counterClause = new MethodHandle[]{Fac.MH_zero, Fac.MH_inc};
         MethodHandle[] accumulatorClause = new MethodHandle[]{Fac.MH_one, Fac.MH_mult, Fac.MH_pred, Fac.MH_fin};
@@ -122,7 +125,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopVoidInt() throws Throwable {
+    public void testLoopVoidInt() throws Throwable {
         // construct a post-checked loop that only does one iteration and has a void body and void local state,
         // and that returns a constant
         MethodHandle loop = MethodHandles.loop(new MethodHandle[]{null, Empty.MH_f, Empty.MH_pred, Empty.MH_c});
@@ -131,7 +134,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopWithVirtuals() throws Throwable {
+    public void testLoopWithVirtuals() throws Throwable {
         // construct a loop (to calculate factorial) that uses a mix of static and virtual methods
         MethodHandle[] counterClause = new MethodHandle[]{null, LoopWithVirtuals.permute(LoopWithVirtuals.MH_inc)};
         MethodHandle[] accumulatorClause = new MethodHandle[]{
@@ -147,7 +150,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testLoopOmitPred() throws Throwable {
+    public void testLoopOmitPred() throws Throwable {
         // construct a loop to calculate factorial that omits a predicate
         MethodHandle[] counterClause = new MethodHandle[]{null, Fac.MH_inc, null, Fac.MH_fin};
         MethodHandle[] accumulatorClause = new MethodHandle[]{Fac.MH_one, Fac.MH_mult, Fac.MH_pred, Fac.MH_fin};
@@ -156,7 +159,6 @@ public class LoopCombinatorTest {
         assertEquals(120, loop.invoke(5));
     }
 
-    @DataProvider
     static Object[][] negativeTestData() {
         MethodHandle i0 = MethodHandles.constant(int.class, 0);
         MethodHandle ii = MethodHandles.dropArguments(i0, 0, int.class, int.class);
@@ -214,36 +216,36 @@ public class LoopCombinatorTest {
         }
     }
 
-    @Test(dataProvider = "negativeTestData")
-    public static void testLoopNegative(MethodHandle[][] clauses, String expectedMessage) throws Throwable {
-        boolean caught = false;
-        try {
-            MH_loop.invokeWithArguments((Object[]) clauses);
-        } catch (IllegalArgumentException iae) {
-            assertEquals(expectedMessage, iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+    @ParameterizedTest
+    @MethodSource("negativeTestData")
+    public void testLoopNegative(MethodHandle[][] clauses, String expectedMessage) throws Throwable {
+        var iae = assertThrows(IllegalArgumentException.class, () -> MH_loop.invokeWithArguments((Object[]) clauses));
+        assertEquals(expectedMessage, iae.getMessage());
     }
 
-    @Test(dataProvider = "whileLoopTestData")
-    public static void testWhileLoop(MethodHandle MH_zero,
-                                     MethodHandle MH_pred,
-                                     MethodHandle MH_step,
-                                     String messageOrNull) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("whileLoopPassData")
+    public void testWhileLoop(MethodHandle MH_zero,
+                              MethodHandle MH_pred,
+                              MethodHandle MH_step) throws Throwable {
         // int i = 0; while (i < limit) { ++i; } return i; => limit
-        try {
-            MethodHandle loop = MethodHandles.whileLoop(MH_zero, MH_pred, MH_step);
-            assert messageOrNull == null;
-            if (MH_step.type().equals(While.MH_step.type()))
-                assertEquals(While.MT_while, loop.type());
-            assertEquals(MH_step.type().dropParameterTypes(0, 1), loop.type());
-            while (loop.type().parameterCount() > 1)  loop = snip(loop);
-            assertEquals(23, loop.invoke(23));
-        } catch (IllegalArgumentException iae) {
-            assert messageOrNull != null;
-            assertEqualsFIXME(messageOrNull, iae.getMessage());
-        }
+        MethodHandle loop = MethodHandles.whileLoop(MH_zero, MH_pred, MH_step);
+        if (MH_step.type().equals(While.MH_step.type()))
+            assertEquals(While.MT_while, loop.type());
+        assertEquals(MH_step.type().dropParameterTypes(0, 1), loop.type());
+        while (loop.type().parameterCount() > 1)  loop = snip(loop);
+        assertEquals(23, loop.invoke(23));
+    }
+
+    @ParameterizedTest
+    @MethodSource("whileLoopFailData")
+    public void testWhileLoopFail(MethodHandle MH_zero,
+                                  MethodHandle MH_pred,
+                                  MethodHandle MH_step,
+                                  String message) throws Throwable {
+        // int i = 0; while (i < limit) { ++i; } return i; => limit
+        var iae = assertThrows(IllegalArgumentException.class, () -> MethodHandles.whileLoop(MH_zero, MH_pred, MH_step));
+        assertEqualsFIXME(message, iae.getMessage());
     }
 
     static void assertEqualsFIXME(String expect, String actual) {
@@ -253,8 +255,7 @@ public class LoopCombinatorTest {
         }
     }
 
-    @DataProvider
-    static Object[][] whileLoopTestData() {
+    static Object[][] whileLoopPassData() {
         MethodHandle
             zeroI = While.MH_zero,
             zeroX = snip(zeroI),
@@ -268,28 +269,44 @@ public class LoopCombinatorTest {
             ;
         return new Object[][] {
             // normal while loop clauses, perhaps with effectively-identical reductions
-            {zeroI, predII, stepII, null},
-            {zeroX, predII, stepII, null},
-            {null, predII, stepII, null},
+            {zeroI, predII, stepII},
+            {zeroX, predII, stepII},
+            {null, predII, stepII},
             // expanded while loop clauses
-            {zeroIB, predIIB, stepIIB, null},
-            {zeroI, predIIB, stepIIB, null},
-            {null, predIIB, stepIIB, null},
-            {zeroIB, predII, stepIIB, null},
-            {zeroX, predII, stepIIB, null},
-            {null, predII, stepIIB, null},
-            // short step clauses cause errors
-            {zeroI, predII, stepIX, "loop predicate must match: (int,int)boolean != (int)boolean"},
-            {zeroIB, predIX, stepIX, "loop initializer must match: (int,byte)int != ()int"},
-            // bad body type
-            {zeroI, predII, tweak(stepII, -1, char.class), "body function must match: (int,int)char != (char,int,int)char"},
-            {zeroI, predII, tweak(stepII,  0, char.class), "body function must match: (char,int)int != (int,char,int)int"},
-            // bad pred type
-            {zeroI, tweak(predII, -1, char.class), stepII, "loop predicate must match: (int,int)char != (int,int)boolean"},
-            {zeroI, tweak(predII,  0, char.class), stepII, "loop predicate must match: (char,int)boolean != (int,int)boolean"},
-            // bad init type
-            {tweak(zeroI, -1, char.class), predII, stepII, "loop initializer must match: (int)char != (int)int"},
-            {tweak(zeroI,  0, char.class), predII, stepII, "loop initializer must match: (char)int != (int)int"},
+            {zeroIB, predIIB, stepIIB},
+            {zeroI, predIIB, stepIIB},
+            {null, predIIB, stepIIB},
+            {zeroIB, predII, stepIIB},
+            {zeroX, predII, stepIIB},
+            {null, predII, stepIIB},
+        };
+    }
+
+    static Object[][] whileLoopFailData() {
+        MethodHandle
+                zeroI = While.MH_zero,
+                zeroX = snip(zeroI),
+                zeroIB = slap(zeroI, byte.class),
+                predII = While.MH_pred,
+                predIX = snip(predII),
+                predIIB = slap(predII, byte.class),
+                stepII = While.MH_step,
+                stepIX = snip(stepII),
+                stepIIB = slap(stepII, byte.class)
+                        ;
+        return new Object[][] {
+                // short step clauses cause errors
+                {zeroI, predII, stepIX, "loop predicate must match: (int,int)boolean != (int)boolean"},
+                {zeroIB, predIX, stepIX, "loop initializer must match: (int,byte)int != ()int"},
+                // bad body type
+                {zeroI, predII, tweak(stepII, -1, char.class), "body function must match: (int,int)char != (char,int,int)char"},
+                {zeroI, predII, tweak(stepII,  0, char.class), "body function must match: (char,int)int != (int,char,int)int"},
+                // bad pred type
+                {zeroI, tweak(predII, -1, char.class), stepII, "loop predicate must match: (int,int)char != (int,int)boolean"},
+                {zeroI, tweak(predII,  0, char.class), stepII, "loop predicate must match: (char,int)boolean != (int,int)boolean"},
+                // bad init type
+                {tweak(zeroI, -1, char.class), predII, stepII, "loop initializer must match: (int)char != (int)int"},
+                {tweak(zeroI,  0, char.class), predII, stepII, "loop initializer must match: (char)int != (int)int"},
         };
     }
 
@@ -323,53 +340,50 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testWhileLoopNoIteration() throws Throwable {
+    public void testWhileLoopNoIteration() throws Throwable {
         // a while loop that never executes its body because the predicate evaluates to false immediately
         MethodHandle loop = MethodHandles.whileLoop(While.MH_initString, While.MH_predString, While.MH_stepString);
         assertEquals(While.MT_string, loop.type());
         assertEquals("a", loop.invoke());
     }
 
-    @Test(dataProvider = "whileLoopTestData")
-    public static void testDoWhileLoop(MethodHandle MH_zero,
-                                       MethodHandle MH_pred,
-                                       MethodHandle MH_step,
-                                       String messageOrNull) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("whileLoopPassData")
+    public void testDoWhileLoopPass(MethodHandle MH_zero,
+                                    MethodHandle MH_pred,
+                                    MethodHandle MH_step) throws Throwable {
         // int i = 0; do { ++i; } while (i < limit); return i; => limit
-        try {
-            MethodHandle loop = MethodHandles.doWhileLoop(MH_zero, MH_step, MH_pred);
-            assert messageOrNull == null;
-            if (MH_step.type().equals(While.MH_step.type()))
-                assertEquals(While.MT_while, loop.type());
-            assertEquals(MH_step.type().dropParameterTypes(0, 1), loop.type());
-            while (loop.type().parameterCount() > 1)  loop = snip(loop);
-            assertEquals(23, loop.invoke(23));
-        } catch (IllegalArgumentException iae) {
-            assert messageOrNull != null;
-            if (!messageOrNull.equals(iae.getMessage())) {
-                // just issue a warning
-                System.out.println("*** "+messageOrNull+"\n != "+iae.getMessage());
-            }
-        }
+        MethodHandle loop = MethodHandles.doWhileLoop(MH_zero, MH_step, MH_pred);
+        if (MH_step.type().equals(While.MH_step.type()))
+            assertEquals(While.MT_while, loop.type());
+        assertEquals(MH_step.type().dropParameterTypes(0, 1), loop.type());
+        while (loop.type().parameterCount() > 1)  loop = snip(loop);
+        assertEquals(23, loop.invoke(23));
+    }
+
+    @ParameterizedTest
+    @MethodSource("whileLoopFailData")
+    public void testDoWhileLoopFail(MethodHandle MH_zero,
+                                    MethodHandle MH_pred,
+                                    MethodHandle MH_step,
+                                    String message) throws Throwable {
+        // int i = 0; do { ++i; } while (i < limit); return i; => limit
+        var iae = assertThrows(IllegalArgumentException.class, () -> MethodHandles.doWhileLoop(MH_zero, MH_step, MH_pred));
+        assertEqualsFIXME(message, iae.getMessage());
     }
 
     @Test
-    public static void testDoWhileBadInit() throws Throwable {
-        boolean caught = false;
-        try {
-            While w = new While();
-            MethodHandle loop = MethodHandles.doWhileLoop(MethodHandles.empty(methodType(char.class)),
-                                                          While.MH_voidBody.bindTo(w),
-                                                          While.MH_voidPred.bindTo(w));
-        } catch (IllegalArgumentException iae) {
-            assertEquals("loop initializer must match: ()char != (int)void", iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+    public void testDoWhileBadInit() throws Throwable {
+        While w = new While();
+        var iae = assertThrows(IllegalArgumentException.class, () ->
+                MethodHandles.doWhileLoop(MethodHandles.empty(methodType(char.class)),
+                                          While.MH_voidBody.bindTo(w),
+                                          While.MH_voidPred.bindTo(w)));
+        assertEquals("loop initializer must match: ()char != (int)void", iae.getMessage());
     }
 
     @Test
-    public static void testWhileZip() throws Throwable {
+    public void testWhileZip() throws Throwable {
         MethodHandle loop = MethodHandles.doWhileLoop(While.MH_zipInitZip, While.MH_zipStep, While.MH_zipPred);
         assertEquals(While.MT_zip, loop.type());
         List<String> a = Arrays.asList("a", "b", "c", "d");
@@ -379,22 +393,17 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testWhileBadInit() throws Throwable {
-        boolean caught = false;
-        try {
-            While w = new While();
-            MethodHandle loop = MethodHandles.whileLoop(MethodHandles.empty(methodType(void.class, char.class)),
-                                                        While.MH_voidPred.bindTo(w),
-                                                        While.MH_voidBody.bindTo(w));
-        } catch (IllegalArgumentException iae) {
-            assertEquals("loop initializer must match: (char)void != (int)void", iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+    public void testWhileBadInit() throws Throwable {
+        While w = new While();
+        var iae = assertThrows(IllegalArgumentException.class, () ->
+                MethodHandles.whileLoop(MethodHandles.empty(methodType(void.class, char.class)),
+                                        While.MH_voidPred.bindTo(w),
+                                        While.MH_voidBody.bindTo(w)));
+        assertEquals("loop initializer must match: (char)void != (int)void", iae.getMessage());
     }
 
     @Test
-    public static void testWhileVoidInit() throws Throwable {
+    public void testWhileVoidInit() throws Throwable {
         While w = new While();
         int v = 5;
         MethodHandle loop = MethodHandles.whileLoop(While.MH_voidInit.bindTo(w), While.MH_voidPred.bindTo(w),
@@ -405,7 +414,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testDoWhileVoidInit() throws Throwable {
+    public void testDoWhileVoidInit() throws Throwable {
         While w = new While();
         int v = 5;
         MethodHandle loop = MethodHandles.doWhileLoop(While.MH_voidInit.bindTo(w), While.MH_voidBody.bindTo(w),
@@ -415,24 +424,25 @@ public class LoopCombinatorTest {
         assertEquals(v, w.i);
     }
 
-    @DataProvider
     static Object[][] nullArgs() {
         MethodHandle c = MethodHandles.constant(int.class, 1);
         return new Object[][]{{null, c}, {c, null}};
     }
 
-    @Test(dataProvider = "nullArgs", expectedExceptions = NullPointerException.class)
-    public static void testWhileNullArgs(MethodHandle pred, MethodHandle body) {
-        MethodHandles.whileLoop(null, pred, body);
+    @ParameterizedTest
+    @MethodSource("nullArgs")
+    public void testWhileNullArgs(MethodHandle pred, MethodHandle body) {
+        assertThrows(NullPointerException.class, () -> MethodHandles.whileLoop(null, pred, body));
     }
 
-    @Test(dataProvider = "nullArgs", expectedExceptions = NullPointerException.class)
-    public static void testDoWhileNullArgs(MethodHandle body, MethodHandle pred) {
-        MethodHandles.whileLoop(null, body, pred);
+    @ParameterizedTest
+    @MethodSource("nullArgs")
+    public void testDoWhileNullArgs(MethodHandle body, MethodHandle pred) {
+        assertThrows(NullPointerException.class, () -> MethodHandles.whileLoop(null, body, pred));
     }
 
     @Test
-    public static void testCountedLoop() throws Throwable {
+    public void testCountedLoop() throws Throwable {
         // String s = "Lambdaman!"; for (int i = 0; i < 13; ++i) { s = "na " + s; } return s; => a variation on a well known theme
         MethodHandle fit13 = MethodHandles.dropArguments(MethodHandles.constant(int.class, 13), 0, String.class);
         MethodHandle loop = MethodHandles.countedLoop(fit13, Counted.MH_start, Counted.MH_step);
@@ -441,7 +451,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedLoopVoidInit() throws Throwable {
+    public void testCountedLoopVoidInit() throws Throwable {
         MethodHandle fit5 = MethodHandles.constant(int.class, 5);
         for (int i = 0; i < 8; i++) {
             MethodHandle zero = MethodHandles.zero(void.class);
@@ -465,7 +475,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedArrayLoop() throws Throwable {
+    public void testCountedArrayLoop() throws Throwable {
         // int[] a = new int[]{0}; for (int i = 0; i < 13; ++i) { ++a[0]; } => a[0] == 13
         MethodHandle fit13 = MethodHandles.dropArguments(MethodHandles.constant(int.class, 13), 0, int[].class);
         MethodHandle loop = MethodHandles.countedLoop(fit13, null, Counted.MH_stepUpdateArray);
@@ -476,37 +486,30 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedPrintingLoop() throws Throwable {
+    public void testCountedPrintingLoop() throws Throwable {
         MethodHandle fit5 = MethodHandles.constant(int.class, 5);
         MethodHandle loop = MethodHandles.countedLoop(fit5, null, Counted.MH_printHello);
         assertEquals(Counted.MT_countedPrinting, loop.type());
         loop.invoke();
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
-    public static void testCountedLoopNullBody() throws Throwable {
+    @Test
+    public void testCountedLoopNullBody() throws Throwable {
         MethodHandle h5 = MethodHandles.constant(int.class, 5);
         MethodHandle h13 = MethodHandles.constant(int.class, 13);
-        MethodHandle loop = MethodHandles.countedLoop(h5, h13, null);
-        assertEquals(methodType(int.class), loop.type());
-        assertEquals(13, loop.invoke());
+        assertThrows(NullPointerException.class, () -> MethodHandles.countedLoop(h5, h13, null));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
-    public static void testCountedLoopNullIterations() throws Throwable {
-        MethodHandle loop = MethodHandles.countedLoop(null, null, null);
-        assertEquals(methodType(void.class), loop.type());
-        loop.invoke();
+    @Test
+    public void testCountedLoopNullIterations() throws Throwable {
+        assertThrows(NullPointerException.class, () -> MethodHandles.countedLoop(null, null, null));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
-    public static void testCountedLoopNullInitAndBody() throws Throwable {
-        MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null, null);
-        assertEquals(methodType(void.class), loop.type());
-        loop.invoke();
+    @Test
+    public void testCountedLoopNullInitAndBody() throws Throwable {
+        assertThrows(NullPointerException.class, () -> MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null, null));
     }
 
-    @DataProvider
     static Object[][] countedLoopBodyParameters() {
         Class<?> V = String.class, I = int.class, A = List.class;
         // return types are of these forms:
@@ -531,8 +534,9 @@ public class LoopCombinatorTest {
         };
     }
 
-    @Test(dataProvider = "countedLoopBodyParameters")
-    public static void testCountedLoopBodyParameters(MethodType countType, MethodType initType, MethodType bodyType) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("countedLoopBodyParameters")
+    public void testCountedLoopBodyParameters(MethodType countType, MethodType initType, MethodType bodyType) throws Throwable {
         MethodHandle loop = MethodHandles.countedLoop(
                 MethodHandles.empty(countType),
                 initType == null ? null : MethodHandles.empty(initType),
@@ -546,13 +550,14 @@ public class LoopCombinatorTest {
         assertEquals(expectType, loop.type());
     }
 
-    @Test(dataProvider = "countedLoopBodyParameters")
-    public static void testCountedLoopBodyParametersNullInit(MethodType countType, MethodType initType, MethodType bodyType) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("countedLoopBodyParameters")
+    public void testCountedLoopBodyParametersNullInit(MethodType countType, MethodType initType, MethodType bodyType) throws Throwable {
         testCountedLoopBodyParameters(countType, null, bodyType);
     }
 
     @Test
-    public static void testCountedLoopStateInitializedToNull() throws Throwable {
+    public void testCountedLoopStateInitializedToNull() throws Throwable {
         MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5),
                 MethodHandles.empty(methodType(String.class)), Counted.MH_stateBody);
         assertEquals(Counted.MT_bodyDeterminesState, loop.type());
@@ -560,7 +565,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedLoopArgsDefinedByIterations() throws Throwable {
+    public void testCountedLoopArgsDefinedByIterations() throws Throwable {
         MethodHandle iterations =
                 MethodHandles.dropArguments(MethodHandles.constant(int.class, 3), 0, String.class);
         MethodHandle loop = MethodHandles.countedLoop(iterations,
@@ -570,7 +575,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedRangeLoop() throws Throwable {
+    public void testCountedRangeLoop() throws Throwable {
         // String s = "Lambdaman!"; for (int i = -5; i < 8; ++i) { s = "na " + s; } return s; => a well known theme
         MethodHandle fitm5 = MethodHandles.dropArguments(Counted.MH_m5, 0, String.class);
         MethodHandle fit8 = MethodHandles.dropArguments(Counted.MH_8, 0, String.class);
@@ -580,7 +585,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedLoopCounterInit() throws Throwable {
+    public void testCountedLoopCounterInit() throws Throwable {
         // int x = 0; for (int i = 0; i < 5; ++i) { x += i; } return x; => 10
         // (only if counter's first value in body is 0)
         MethodHandle iter = MethodHandles.constant(int.class, 5);
@@ -592,7 +597,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedLoopEmpty() throws Throwable {
+    public void testCountedLoopEmpty() throws Throwable {
         // for (int i = 0; i < 5; ++i) { /* empty */ }
         MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, 5), null,
                 MethodHandles.empty(methodType(void.class, int.class)));
@@ -601,7 +606,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testCountedRangeLoopEmpty() throws Throwable {
+    public void testCountedRangeLoopEmpty() throws Throwable {
         // for (int i = -5; i < 5; ++i) { /* empty */ }
         MethodHandle loop = MethodHandles.countedLoop(MethodHandles.constant(int.class, -5),
                 MethodHandles.constant(int.class, 5), null, MethodHandles.empty(methodType(void.class, int.class)));
@@ -609,7 +614,6 @@ public class LoopCombinatorTest {
         loop.invoke();
     }
 
-    @DataProvider
     static Object[][] countedLoopNegativeData() {
         MethodHandle dummy = MethodHandles.zero(void.class);
         MethodHandle one = MethodHandles.constant(int.class, 1);
@@ -629,35 +633,30 @@ public class LoopCombinatorTest {
         };
     }
 
-    @Test(dataProvider = "countedLoopNegativeData")
-    public static void testCountedLoopNegative(MethodHandle start, MethodHandle end, MethodHandle init,
+    @ParameterizedTest
+    @MethodSource("countedLoopNegativeData")
+    @Disabled //%%%FIXME%%%%
+    public void testCountedLoopNegative(MethodHandle start, MethodHandle end, MethodHandle init,
                                                MethodHandle body, String msg) {
-        if (true)  return;  //%%%FIXME%%%%
-        boolean caught = false;
-        try {
-            MethodHandles.countedLoop(start, end, init, body);
-        } catch (IllegalArgumentException iae) {
-            assertEquals(msg, iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+        var iae = assertThrows(IllegalArgumentException.class, () -> MethodHandles.countedLoop(start, end, init, body));
+        assertEquals(msg, iae.getMessage());
     }
 
     @Test
-    public static void testIterateSum() throws Throwable {
+    public void testIterateSum() throws Throwable {
         // Integer[] a = new Integer[]{1,2,3,4,5,6}; int sum = 0; for (int e : a) { sum += e; } return sum; => 21
         MethodHandle loop = MethodHandles.iteratedLoop(Iterate.MH_sumIterator, Iterate.MH_sumInit, Iterate.MH_sumStep);
         assertEquals(Iterate.MT_sum, loop.type());
         assertEquals(21, loop.invoke(new Integer[]{1, 2, 3, 4, 5, 6}));
     }
 
-    @DataProvider
     static Object[][] iteratorInits() {
         return new Object[][]{{Iterate.MH_iteratorFromList}, {Iterate.MH_iteratorFromIterable}, {null}};
     }
 
-    @Test(dataProvider = "iteratorInits")
-    public static void testIterateReverse(MethodHandle iterator) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("iteratorInits")
+    public void testIterateReverse(MethodHandle iterator) throws Throwable {
         // this test uses List as its loop state type; don't try to change that
         if (iterator != null)
             iterator = iterator.asType(iterator.type().changeParameterType(0, List.class));
@@ -685,8 +684,9 @@ public class LoopCombinatorTest {
         }
     }
 
-    @Test(dataProvider = "iteratorInits")
-    public static void testIterateLength(MethodHandle iterator) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("iteratorInits")
+    public void testIterateLength(MethodHandle iterator) throws Throwable {
         MethodHandle body = Iterate.MH_lengthStep;
         MethodHandle init = Iterate.MH_lengthInit;
         MethodType expectedType = Iterate.MT_length;
@@ -708,8 +708,9 @@ public class LoopCombinatorTest {
         }
     }
 
-    @Test(dataProvider = "iteratorInits")
-    public static void testIterateMap(MethodHandle iterator) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("iteratorInits")
+    public void testIterateMap(MethodHandle iterator) throws Throwable {
         MethodHandle body = Iterate.MH_mapStep;
         MethodHandle init = Iterate.MH_mapInit;
         MethodType expectedType = Iterate.MT_map;
@@ -731,8 +732,9 @@ public class LoopCombinatorTest {
         }
     }
 
-    @Test(dataProvider = "iteratorInits")
-    public static void testIteratePrint(MethodHandle iterator) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("iteratorInits")
+    public void testIteratePrint(MethodHandle iterator) throws Throwable {
         MethodHandle body = Iterate.MH_printStep;
         MethodType expectedType = Iterate.MT_print;
         int barity = body.type().parameterCount();
@@ -747,32 +749,28 @@ public class LoopCombinatorTest {
         loop.invoke(Arrays.asList("hello", "world"));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
-    public static void testIterateNullBody() {
-        MethodHandles.iteratedLoop(MethodHandles.empty(methodType(Iterator.class, int.class)),
-                MethodHandles.identity(int.class), null);
+    @Test
+    public void testIterateNullBody() {
+        assertThrows(NullPointerException.class, () ->
+                MethodHandles.iteratedLoop(MethodHandles.empty(methodType(Iterator.class, int.class)),
+                                           MethodHandles.identity(int.class), null));
     }
 
-    @DataProvider
     static Object[][] wrongIteratorTypes() {
         return new Object[][]{{void.class}, {Object.class}, {Iterable.class}};
     }
 
-    @Test(dataProvider = "wrongIteratorTypes")
-    public static void testIterateVoidIterator(Class<?> it) {
-        boolean caught = false;
+    @ParameterizedTest
+    @MethodSource("wrongIteratorTypes")
+    public void testIterateVoidIterator(Class<?> it) {
         MethodType v = methodType(it);
-        try {
-            MethodHandles.iteratedLoop(MethodHandles.empty(v), null, MethodHandles.empty(v));
-        } catch(IllegalArgumentException iae) {
-            assertEqualsFIXME("iteratedLoop first argument must have Iterator return type", iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+        var iae = assertThrows(IllegalArgumentException.class, () -> MethodHandles.iteratedLoop(MethodHandles.empty(v), null, MethodHandles.empty(v)));
+        assertEqualsFIXME("iteratedLoop first argument must have Iterator return type", iae.getMessage());
     }
 
-    @Test(dataProvider = "iteratorInits")
-    public static void testIterateVoidInit(MethodHandle iterator) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("iteratorInits")
+    public void testIterateVoidInit(MethodHandle iterator) throws Throwable {
         // this test uses List as its loop state type; don't try to change that
         if (iterator != null)
             iterator = iterator.asType(iterator.type().changeParameterType(0, List.class));
@@ -781,7 +779,6 @@ public class LoopCombinatorTest {
         loop.invoke(Arrays.asList("hello", "world"));
     }
 
-    @DataProvider
     static Object[][] iterateParameters() {
         MethodType i = methodType(int.class);
         MethodType sil_v = methodType(void.class, String.class, int.class, List.class);
@@ -811,8 +808,9 @@ public class LoopCombinatorTest {
         };
     }
 
-    @Test(dataProvider = "iterateParameters")
-    public static void testIterateParameters(MethodType it, MethodType in, MethodType bo, String msg) {
+    @ParameterizedTest
+    @MethodSource("iterateParameters")
+    public void testIterateParameters(MethodType it, MethodType in, MethodType bo, String msg) {
         boolean negative = !msg.isEmpty();
         MethodHandle iterator = it == null ? null : MethodHandles.empty(it);
         MethodHandle init = in == null ? null : MethodHandles.empty(in);
@@ -855,7 +853,7 @@ public class LoopCombinatorTest {
     }
 
     @Test
-    public static void testIteratorSubclass() throws Throwable {
+    public void testIteratorSubclass() throws Throwable {
         MethodHandle loop = MethodHandles.iteratedLoop(MethodHandles.empty(methodType(BogusIterator.class, List.class)),
                 null, MethodHandles.empty(methodType(void.class, String.class, List.class)));
         assertEquals(methodType(void.class, List.class), loop.type());
diff --git a/test/jdk/java/lang/invoke/MethodHandleInvokeUOE.java b/test/jdk/java/lang/invoke/MethodHandleInvokeUOE.java
index e728516fe03..510a65acabf 100644
--- a/test/jdk/java/lang/invoke/MethodHandleInvokeUOE.java
+++ b/test/jdk/java/lang/invoke/MethodHandleInvokeUOE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,20 +24,18 @@
 /* @test
  * @summary Test MethodHandle::invokeExact and MethodHandle::invoke throws
  *          UnsupportedOperationException when called via Method::invoke
- * @run testng test.java.lang.invoke.MethodHandleInvokeUOE
+ * @run junit test.java.lang.invoke.MethodHandleInvokeUOE
  */
 
 package test.java.lang.invoke;
 
-import org.testng.*;
-import org.testng.annotations.*;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import static java.lang.invoke.MethodType.*;
+import org.junit.jupiter.api.Test;
 
 public class MethodHandleInvokeUOE {
     @Test
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java b/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java
index 6acd4fb30e1..2d99db46c2c 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8280377
  * @build m1/* m2/* Unnamed
- * @run testng/othervm m1/p1.Main
- * @run testng/othervm Unnamed
+ * @run junit/othervm m1/p1.Main
+ * @run junit/othervm Unnamed
  * @summary Test MethodHandleProxies::asInterfaceInstance with a default
  *          method with varargs
  */
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java b/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java
index f42071f0427..8cd9a37cc2f 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,23 @@ import java.lang.invoke.MethodHandleProxies;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /*
  * Test MethodHandleProxies::asInterfaceInstance with an inaccessible interface
  */
 public class Unnamed {
-    public static void main(String... args) throws Throwable {
+    @Test
+    void testInaccessible() throws Throwable {
         MethodHandle target = MethodHandles.constant(String.class, "test");
         Class<?> intf = Class.forName("p2.TestIntf");
         Object t = MethodHandleProxies.asInterfaceInstance(intf, target);
 
         // verify that the caller has no access to the proxy created on an
         // inaccessible interface
-        Method m = intf.getMethod("test", Object[].class);
-        assertFalse(m.canAccess(null));
+        Method m = intf.getMethod("test");
+        assertFalse(m.canAccess(t));
     }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java
index 1bdeddce28f..5e0174635fb 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,6 @@
  */
 module m1 {
     requires m2;
-    requires org.testng;
+    requires org.junit.platform.console.standalone;
     exports p1;
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java
index df71809996b..1e4ffcb4aac 100644
--- a/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,8 @@ import java.util.stream.Collectors;
 
 import p2.TestIntf;
 
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Main {
     public interface A {
@@ -57,24 +56,24 @@ public class Main {
      * Test the invocation of default methods with varargs
      */
     @Test
-    public static void testVarargsMethods() throws Throwable {
+    public void testVarargsMethods() throws Throwable {
         MethodHandle target = MethodHandles.lookup().findStatic(Main.class,
                 "concat", MethodType.methodType(String.class, Object[].class));
         C proxy = MethodHandleProxies.asInterfaceInstance(C.class, target);
 
-        assertEquals(proxy.c("a", "b", "c"), "abc");
-        assertEquals(proxy.aConcat("a", "b", "c"), "[a, b, c]");
-        assertEquals(proxy.aConcat(new Object[] { "a", "b", "c" }), "[a, b, c]");
-        assertEquals(proxy.bConcat(new Object[] { "a", "b", "c" }), "[a, b, c]");
+        assertEquals("abc", proxy.c("a", "b", "c"));
+        assertEquals("[a, b, c]", proxy.aConcat("a", "b", "c"));
+        assertEquals("[a, b, c]", proxy.aConcat(new Object[] { "a", "b", "c" }));
+        assertEquals("[a, b, c]", proxy.bConcat(new Object[] { "a", "b", "c" }));
     }
 
     /*
      * Test the invocation of a default method of an accessible interface
      */
     @Test
-    public static void modulePrivateInterface() {
+    public void modulePrivateInterface() {
         MethodHandle target = MethodHandles.constant(String.class, "test");
         TestIntf t = MethodHandleProxies.asInterfaceInstance(TestIntf.class, target);
-        assertEquals(t.test(), "test");
+        assertEquals("test", t.test());
     }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandles/TestDropReturn.java b/test/jdk/java/lang/invoke/MethodHandles/TestDropReturn.java
index ff31dd63f0b..1b8ef6331b3 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/TestDropReturn.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/TestDropReturn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,33 +24,33 @@
 /*
  * @test
  * @bug 8255398
- * @run testng TestDropReturn
+ * @run junit TestDropReturn
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 
 import static java.lang.invoke.MethodType.methodType;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class TestDropReturn {
 
-    @Test(dataProvider = "dropReturnCases")
+    @ParameterizedTest
+    @MethodSource("dropReturnCases")
     public void testDropReturn(Class<?> cls, Object testValue) throws Throwable {
         MethodHandle mh = MethodHandles.identity(cls);
-        assertEquals(mh.type(), methodType(cls, cls));
+        assertEquals(methodType(cls, cls), mh.type());
         Object x = mh.invoke(testValue);
-        assertEquals(x, testValue);
+        assertEquals(testValue, x);
 
         mh = MethodHandles.dropReturn(mh);
-        assertEquals(mh.type(), methodType(void.class, cls));
+        assertEquals(methodType(void.class, cls), mh.type());
         mh.invoke(testValue); // should at least work
     }
 
-    @DataProvider
     public static Object[][] dropReturnCases() {
         return new Object[][]{
             { boolean.class, true         },
diff --git a/test/jdk/java/lang/invoke/MethodHandles/TestTableSwitch.java b/test/jdk/java/lang/invoke/MethodHandles/TestTableSwitch.java
index 4ff1a99cc28..960d98fb387 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/TestTableSwitch.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/TestTableSwitch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,9 @@
 
 /*
  * @test
- * @run testng/othervm -Xverify:all TestTableSwitch
+ * @run junit/othervm -Xverify:all TestTableSwitch
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import javax.management.ObjectName;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -38,7 +34,11 @@ import java.util.List;
 import java.util.function.IntConsumer;
 import java.util.function.IntFunction;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestTableSwitch {
 
@@ -111,7 +111,6 @@ public class TestTableSwitch {
         return args;
     }
 
-    @DataProvider
     public static Object[][] nonVoidCases() {
         List<Object[]> tests = new ArrayList<>();
 
@@ -126,10 +125,11 @@ public class TestTableSwitch {
     }
 
     private static void check(List<Object> testValues, Object[] collectedValues) {
-        assertEquals(collectedValues, testValues.toArray());
+        assertArrayEquals(testValues.toArray(), collectedValues);
     }
 
-    @Test(dataProvider = "nonVoidCases")
+    @ParameterizedTest
+    @MethodSource("nonVoidCases")
     public void testNonVoidHandles(Class<?> type, int numCases, List<Class<?>> additionalTypes) throws Throwable {
         MethodHandle collector = MH_check;
         List<Object> testArguments = new ArrayList<>();
@@ -158,19 +158,19 @@ public class TestTableSwitch {
             testArguments.add(testValue(additionalType));
         }
 
-        assertEquals(mhSwitch.invokeWithArguments(testArguments(-1, testArguments)), defaultReturnValue);
+        assertEquals(defaultReturnValue, mhSwitch.invokeWithArguments(testArguments(-1, testArguments)));
 
         for (int i = 0; i < numCases; i++) {
-            assertEquals(mhSwitch.invokeWithArguments(testArguments(i, testArguments)), returnValues[i]);
+            assertEquals(returnValues[i], mhSwitch.invokeWithArguments(testArguments(i, testArguments)));
         }
 
-        assertEquals(mhSwitch.invokeWithArguments(testArguments(numCases, testArguments)), defaultReturnValue);
+        assertEquals(defaultReturnValue, mhSwitch.invokeWithArguments(testArguments(numCases, testArguments)));
     }
 
     @Test
     public void testVoidHandles() throws Throwable {
         IntFunction<MethodHandle> makeTestCase = expectedIndex -> {
-            IntConsumer test = actualIndex -> assertEquals(actualIndex, expectedIndex);
+            IntConsumer test = actualIndex -> assertEquals(expectedIndex, actualIndex);
             return MH_IntConsumer_accept.bindTo(test);
         };
 
@@ -187,48 +187,48 @@ public class TestTableSwitch {
         mhSwitch.invokeExact((int) 2);
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testNullDefaultHandle() {
-        MethodHandles.tableSwitch(null, simpleTestCase("test"));
+        assertThrows(NullPointerException.class, () -> MethodHandles.tableSwitch(null, simpleTestCase("test")));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testNullCases() {
         MethodHandle[] cases = null;
-        MethodHandles.tableSwitch(simpleTestCase("default"), cases);
+        assertThrows(NullPointerException.class, () ->
+                MethodHandles.tableSwitch(simpleTestCase("default"), cases));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testNullCase() {
-        MethodHandles.tableSwitch(simpleTestCase("default"), simpleTestCase("case"), null);
+        assertThrows(NullPointerException.class, () -> MethodHandles.tableSwitch(simpleTestCase("default"), simpleTestCase("case"), null));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class,
-          expectedExceptionsMessageRegExp = ".*Not enough cases.*")
+    @Test
     public void testNotEnoughCases() {
-        MethodHandles.tableSwitch(simpleTestCase("default"));
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.tableSwitch(simpleTestCase("default")));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class,
-          expectedExceptionsMessageRegExp = ".*Case actions must have int as leading parameter.*")
+    @Test
     public void testNotEnoughParameters() {
         MethodHandle empty = MethodHandles.empty(MethodType.methodType(void.class));
-        MethodHandles.tableSwitch(empty, empty, empty);
+        assertThrows(IllegalArgumentException.class, () ->
+                MethodHandles.tableSwitch(empty, empty, empty));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class,
-          expectedExceptionsMessageRegExp = ".*Case actions must have int as leading parameter.*")
+    @Test
     public void testNoLeadingIntParameter() {
         MethodHandle empty = MethodHandles.empty(MethodType.methodType(void.class, double.class));
-        MethodHandles.tableSwitch(empty, empty, empty);
+        assertThrows(IllegalArgumentException.class, () ->
+                MethodHandles.tableSwitch(empty, empty, empty));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class,
-          expectedExceptionsMessageRegExp = ".*Case actions must have the same type.*")
+    @Test
     public void testWrongCaseType() {
         // doesn't return a String
         MethodHandle wrongType = MethodHandles.empty(MethodType.methodType(void.class, int.class));
-        MethodHandles.tableSwitch(simpleTestCase("default"), simpleTestCase("case"), wrongType);
+        assertThrows(IllegalArgumentException.class, () ->
+                MethodHandles.tableSwitch(simpleTestCase("default"), simpleTestCase("case"), wrongType));
     }
 
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
index 5880761f925..f96a6f23162 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/classData/ClassDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8230501
  * @library /test/lib
- * @run testng/othervm ClassDataTest
+ * @run junit/othervm ClassDataTest
  */
 
 import java.io.IOException;
@@ -54,13 +54,14 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.classfile.ClassFile.*;
 import static java.lang.constant.ConstantDescs.*;
 import static java.lang.invoke.MethodHandles.Lookup.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ClassDataTest {
     private static final Lookup LOOKUP = MethodHandles.lookup();
@@ -72,10 +73,10 @@ public class ClassDataTest {
         assertTrue(lookup.hasFullPrivilegeAccess());
 
         int value = MethodHandles.classData(lookup, "_", int.class);
-        assertEquals(value, 20);
+        assertEquals(20, value);
 
         Integer i = MethodHandles.classData(lookup, "_", Integer.class);
-        assertEquals(i.intValue(), 20);
+        assertEquals(20, i.intValue());
     }
 
     /*
@@ -86,8 +87,7 @@ public class ClassDataTest {
         assertNull(MethodHandles.classData(LOOKUP, "_", Object.class));
     }
 
-    @DataProvider(name = "teleportedLookup")
-    private Object[][] teleportedLookup() throws ReflectiveOperationException {
+    private static Object[][] teleportedLookup() throws ReflectiveOperationException {
         Lookup lookup = hiddenClass(30);
         Class<?> hc = lookup.lookupClass();
         assertClassData(lookup, 30);
@@ -100,32 +100,33 @@ public class ClassDataTest {
         };
     }
 
-    @Test(dataProvider = "teleportedLookup", expectedExceptions = { IllegalAccessException.class })
+    @ParameterizedTest
+    @MethodSource("teleportedLookup")
     public void illegalAccess(Lookup lookup, int access) throws IllegalAccessException {
         int lookupModes = lookup.lookupModes();
-        assertTrue((lookupModes & ORIGINAL) == 0);
-        assertEquals(lookupModes, access);
-        MethodHandles.classData(lookup, "_", int.class);
+        assertEquals(0, lookupModes & ORIGINAL);
+        assertEquals(access, lookupModes);
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.classData(lookup, "_", int.class));
     }
 
-    @Test(expectedExceptions = { ClassCastException.class })
+    @Test
     public void incorrectType() throws IllegalAccessException {
         Lookup lookup = hiddenClass(20);
-        MethodHandles.classData(lookup, "_", Long.class);
+        assertThrows(ClassCastException.class, () -> MethodHandles.classData(lookup, "_", Long.class));
     }
 
-    @Test(expectedExceptions = { IndexOutOfBoundsException.class })
+    @Test
     public void invalidIndex() throws IllegalAccessException {
         Lookup lookup = hiddenClass(List.of());
-        MethodHandles.classDataAt(lookup, "_", Object.class, 0);
+        assertThrows(IndexOutOfBoundsException.class, () -> MethodHandles.classDataAt(lookup, "_", Object.class, 0));
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void unboxNull() throws IllegalAccessException {
         List<Integer> list = new ArrayList<>();
         list.add(null);
         Lookup lookup = hiddenClass(list);
-        MethodHandles.classDataAt(lookup, "_", int.class, 0);
+        assertThrows(NullPointerException.class, () -> MethodHandles.classDataAt(lookup, "_", int.class, 0));
     }
 
     @Test
@@ -133,7 +134,7 @@ public class ClassDataTest {
         List<Object> list = new ArrayList<>();
         list.add(null);
         Lookup lookup = hiddenClass(list);
-        assertTrue(MethodHandles.classDataAt(lookup, "_", Object.class, 0) == null);
+        assertNull(MethodHandles.classDataAt(lookup, "_", Object.class, 0));
     }
 
     @Test
@@ -142,7 +143,7 @@ public class ClassDataTest {
         byte[] bytes = builder.classData(ACC_PUBLIC|ACC_STATIC, int.class).build();
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, 100, true);
         int value = MethodHandles.classData(lookup, "_", int.class);
-        assertEquals(value, 100);
+        assertEquals(100, value);
         // call through condy
         assertClassData(lookup, 100);
     }
@@ -153,7 +154,7 @@ public class ClassDataTest {
         byte[] bytes = builder.classData(ACC_PUBLIC|ACC_STATIC, float.class).build();
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, 0.1234f, true);
         float value = MethodHandles.classData(lookup, "_", float.class);
-        assertEquals(value, 0.1234f);
+        assertEquals(0.1234f, value);
         // call through condy
         assertClassData(lookup, 0.1234f);
     }
@@ -165,7 +166,7 @@ public class ClassDataTest {
         byte[] bytes = builder.classData(ACC_PUBLIC|ACC_STATIC, Class.class).build();
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, hc, true);
         Class<?> value = MethodHandles.classData(lookup, "_", Class.class);
-        assertEquals(value, hc);
+        assertEquals(hc, value);
         // call through condy
         assertClassData(lookup, hc);
     }
@@ -181,7 +182,7 @@ public class ClassDataTest {
         colors[0] = "black";
         // it will get back the modified class data
         String[] value = MethodHandles.classData(lookup, "_", String[].class);
-        assertEquals(value, colors);
+        assertArrayEquals(colors, value);
         // even call through condy as it's not a constant
         assertClassData(lookup, colors);
     }
@@ -194,7 +195,7 @@ public class ClassDataTest {
         int expected = 102;  // element at index=2
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, cd, true);
         int value = MethodHandles.classDataAt(lookup, "_", int.class, 2);
-        assertEquals(value, expected);
+        assertEquals(expected, value);
         // call through condy
         assertClassData(lookup, expected);
     }
@@ -208,7 +209,7 @@ public class ClassDataTest {
         int expected = 101;  // element at index=1
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, cd, true);
         int value = MethodHandles.classDataAt(lookup, "_", int.class, 1);
-        assertEquals(value, expected);
+        assertEquals(expected, value);
         // call through condy
         assertClassData(lookup, expected);
     }
@@ -216,20 +217,12 @@ public class ClassDataTest {
     private static Lookup hiddenClass(int value) {
         ClassByteBuilder builder = new ClassByteBuilder("HC");
         byte[] bytes = builder.classData(ACC_PUBLIC|ACC_STATIC, int.class).build();
-        try {
-            return LOOKUP.defineHiddenClassWithClassData(bytes, value, true);
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
+        return assertDoesNotThrow(() -> LOOKUP.defineHiddenClassWithClassData(bytes, value, true));
     }
     private static Lookup hiddenClass(List<?> list) {
         ClassByteBuilder builder = new ClassByteBuilder("HC");
         byte[] bytes = builder.classData(ACC_PUBLIC|ACC_STATIC, List.class).build();
-        try {
-            return LOOKUP.defineHiddenClassWithClassData(bytes, list, true);
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
+        return assertDoesNotThrow(() -> LOOKUP.defineHiddenClassWithClassData(bytes, list, true));
     }
 
     @Test
@@ -242,7 +235,7 @@ public class ClassDataTest {
         Class<?> hc = hcLookup.lookupClass();
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, hc, true);
         Class<?> value = MethodHandles.classData(lookup, "_", Class.class);
-        assertEquals(value, hc);
+        assertEquals(hc, value);
         // call through condy
         Class<?> c = lookup.lookupClass();
         assertClassData(lookup, c.newInstance(), hc);
@@ -257,7 +250,7 @@ public class ClassDataTest {
         int expected = 102;  // element at index=2
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, cd, true);
         int value = MethodHandles.classDataAt(lookup, "_", int.class, 2);
-        assertEquals(value, expected);
+        assertEquals(expected, value);
         // call through condy
         Class<?> c = lookup.lookupClass();
         assertClassData(lookup, c.newInstance() ,expected);
@@ -285,13 +278,13 @@ public class ClassDataTest {
         Class<?> c = lookup.lookupClass();
         assertClassData(lookup, c.newInstance(), mtype);
         // modify the class data
-        assertTrue(cd.remove(0) == mtype);
+        assertSame(mtype, cd.remove(0));
         cd.add(0,  MethodType.methodType(void.class));
         MethodType newMType = cd.get(0);
         // loading the element using condy returns the original value
         assertClassData(lookup, c.newInstance(), mtype);
         // direct invocation of MethodHandles.classDataAt returns the modified value
-        assertEquals(MethodHandles.classDataAt(lookup, "_", MethodType.class, 0), newMType);
+        assertEquals(newMType, MethodHandles.classDataAt(lookup, "_", MethodType.class, 0));
     }
 
     // helper method to extract from a class data map
@@ -334,7 +327,7 @@ public class ClassDataTest {
         assertEquals(mh, v1);
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void nonDefaultName() throws ReflectiveOperationException {
         ClassByteBuilder builder = new ClassByteBuilder("nonDefaultName");
         byte[] bytes = builder.classData(ACC_PUBLIC|ACC_STATIC, Class.class)
@@ -342,7 +335,7 @@ public class ClassDataTest {
         Lookup lookup = LOOKUP.defineHiddenClassWithClassData(bytes, ClassDataTest.class, true);
         assertClassData(lookup, ClassDataTest.class);
         // throw IAE
-        MethodHandles.classData(lookup, "non_default_name", Class.class);
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.classData(lookup, "non_default_name", Class.class));
     }
 
     static class ClassByteBuilder {
@@ -428,7 +421,7 @@ public class ClassDataTest {
      * Load an int constant from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, int value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, int value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         int v = (int) m.invoke(null);
@@ -439,7 +432,7 @@ public class ClassDataTest {
      * Load an int constant from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, Object o, int value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, Object o, int value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         int v = (int) m.invoke(o);
@@ -450,7 +443,7 @@ public class ClassDataTest {
      * Load a float constant from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, float value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, float value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         float v = (float) m.invoke(null);
@@ -461,7 +454,7 @@ public class ClassDataTest {
      * Load a Class constant from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, Class<?> value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, Class<?> value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         Class<?> v = (Class<?>)m.invoke(null);
@@ -472,7 +465,7 @@ public class ClassDataTest {
      * Load a Class from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, Object o, Class<?> value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, Object o, Class<?> value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         Object v = m.invoke(o);
@@ -483,18 +476,29 @@ public class ClassDataTest {
      * Load an Object from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, Object value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, Object value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         Object v = m.invoke(null);
         assertEquals(value, v);
     }
 
+    /*
+     * Load an Object array from class data via condy and
+     * verify it matches the given value in content.
+     */
+    private static void assertClassData(Lookup lookup, Object[] value) throws ReflectiveOperationException {
+        Class<?> c = lookup.lookupClass();
+        Method m = c.getMethod("classData");
+        Object v = m.invoke(null);
+        assertArrayEquals(value, (Object[]) v);
+    }
+
     /*
      * Load an Object from class data via condy and
      * verify it matches the given value.
      */
-    private void assertClassData(Lookup lookup, Object o, Object value) throws ReflectiveOperationException {
+    private static void assertClassData(Lookup lookup, Object o, Object value) throws ReflectiveOperationException {
         Class<?> c = lookup.lookupClass();
         Method m = c.getMethod("classData");
         Object v = m.invoke(o);
diff --git a/test/jdk/java/lang/invoke/MethodHandles/ensureInitialized/Main.java b/test/jdk/java/lang/invoke/MethodHandles/ensureInitialized/Main.java
index 58146286da1..afb628d31ba 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/ensureInitialized/Main.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/ensureInitialized/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,16 +24,15 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
  * @bug 8235521
  * @summary Tests for Lookup::ensureClassInitialized
  * @build java.base/* m1/* m2/* Main
- * @run testng/othervm --add-modules m1 Main
+ * @run junit/othervm --add-modules m1 Main
  */
 
 public class Main {
@@ -48,20 +47,20 @@ public class Main {
     }
 
     // access denied to package-private java.lang class
-    @Test(expectedExceptions = { IllegalAccessException.class })
+    @Test
     public void testPackagePrivate() throws Exception {
         Class<?> c = Class.forName("java.lang.DefaultInit", false, null);
         assertFalse(Helper.isInitialized(c));
         // access denied
-        MethodHandles.lookup().ensureInitialized(c);
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.lookup().ensureInitialized(c));
     }
 
     // access denied to public class in a non-exported package
-    @Test(expectedExceptions = { IllegalAccessException.class })
+    @Test
     public void testNonExportedPackage() throws Exception {
         Class<?> c = Class.forName("jdk.internal.misc.VM", false, null);
         // access denied
-        MethodHandles.lookup().ensureInitialized(c);
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.lookup().ensureInitialized(c));
     }
 
     // invoke p1.Test::test to test module boundary access
@@ -72,9 +71,9 @@ public class Main {
         m.invoke(null);
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void testArrayType() throws Exception {
         Class<?> arrayType = PublicInit.class.arrayType();
-        MethodHandles.lookup().ensureInitialized(arrayType);
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.lookup().ensureInitialized(arrayType));
     }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java
index 810351bae3e..bf3f1f40913 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/Driver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,6 @@
 /**
  * @test
  * @build test/* m1/* m2/* m3/* Unnamed
- * @run testng/othervm test/p.PrivateLookupInTests
+ * @run junit/othervm test/p.PrivateLookupInTests
  * @summary Unit tests for MethodHandles.privateLookupIn
  */
diff --git a/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java
index da93c879ef1..f364c761aa3 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,6 @@
  */
 
 module test {
-   requires org.testng;
-   exports p to org.testng;   // TestNG invokes the public methods
+   requires org.junit.platform.console.standalone;
+   exports p to org.junit.platform.console.standalone;   // JUnit invokes the public methods in PrivateLookupInTests
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java
index b17204de013..068d2fb534e 100644
--- a/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java
+++ b/test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,14 @@ import java.lang.reflect.Modifier;
 
 import static java.lang.invoke.MethodHandles.Lookup.*;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for MethodHandles.privateLookupIn
  */
 
-@Test
 public class PrivateLookupInTests {
     /**
      * A public and non-public types in the test module but in a different
@@ -52,24 +51,25 @@ public class PrivateLookupInTests {
      *     private static final Object obj = ...
      * }
      */
-    private Class<?> publicType;
-    private Class<?> nonPublicType;
+    private static Class<?> publicType;
+    private static Class<?> nonPublicType;
 
     // initialize and sanity check publicType/nonPublicType
-    @BeforeTest
-    public void init() throws Exception {
+    @BeforeAll
+    public static void init() throws Exception {
         publicType = Class.forName("p.internal.PublicType");
-        assertTrue(this.getClass().getModule() == publicType.getModule());
-        assertNotEquals(this.getClass().getPackageName(), publicType.getPackageName());
+        assertSame(PrivateLookupInTests.class.getModule(), publicType.getModule());
+        assertNotEquals(publicType.getPackageName(), PrivateLookupInTests.class.getPackageName());
         assertTrue(Modifier.isPublic(publicType.getModifiers()));
 
         nonPublicType = Class.forName("p.internal.NonPublicType");
-        assertTrue(this.getClass().getModule() == nonPublicType.getModule());
-        assertNotEquals(this.getClass().getPackageName(), nonPublicType.getPackageName());
+        assertSame(PrivateLookupInTests.class.getModule(), nonPublicType.getModule());
+        assertNotEquals(nonPublicType.getPackageName(), PrivateLookupInTests.class.getPackageName());
         assertFalse(Modifier.isPublic(nonPublicType.getModifiers()));
     }
 
     // Invoke MethodHandles.privateLookupIn with a full-power caller
+    @Test
     public void testAllAccessCallerSameModule() throws Throwable {
         Lookup lookup = MethodHandles.privateLookupIn(nonPublicType, MethodHandles.lookup());
         assertTrue(lookup.lookupClass() == nonPublicType);
@@ -82,29 +82,31 @@ public class PrivateLookupInTests {
     }
 
     // Invoke MethodHandles.privateLookupIn with a reduced-power caller
-    @Test(expectedExceptions = {IllegalAccessException.class})
+    @Test
     public void testReducedAccessCallerSameModule() throws Throwable {
         Lookup caller = MethodHandles.lookup().dropLookupMode(PACKAGE);
-        assertTrue((caller.lookupModes() & PRIVATE) == 0);
-        assertTrue((caller.lookupModes() & PACKAGE) == 0);
-        assertTrue((caller.lookupModes() & MODULE) != 0);
-        assertTrue((caller.lookupModes() & ORIGINAL) == 0);
-
-        Lookup lookup = MethodHandles.privateLookupIn(nonPublicType, caller);
+        assertEquals(0, caller.lookupModes() & PRIVATE);
+        assertEquals(0, caller.lookupModes() & PACKAGE);
+        assertNotEquals(0, caller.lookupModes() & MODULE);
+        assertEquals(0, caller.lookupModes() & ORIGINAL);
+        assertThrows(IllegalAccessException.class, () ->
+                MethodHandles.privateLookupIn(nonPublicType, caller));
     }
 
     // Invoke MethodHandles.privateLookupIn with the public lookup as caller
-    @Test(expectedExceptions = {IllegalAccessException.class})
+    @Test
     public void testPublicLookupSameModule() throws Exception {
         Lookup caller = MethodHandles.publicLookup();
-        Lookup lookup = MethodHandles.privateLookupIn(publicType, caller);
+        assertThrows(IllegalAccessException.class, () ->
+                MethodHandles.privateLookupIn(publicType, caller));
     }
 
     // test reads m1, open module m1 containing p1
+    @Test
     public void testTargetClassInOpenModule() throws Throwable {
         // m1/p1.Type
         Class<?> clazz = Class.forName("p1.Type");
-        assertEquals(clazz.getModule().getName(), "m1");
+        assertEquals("m1", clazz.getModule().getName());
 
         // ensure that this module reads m1
         Module thisModule = getClass().getModule();
@@ -113,9 +115,9 @@ public class PrivateLookupInTests {
         assertTrue(m1.isOpen("p1", thisModule));
 
         Lookup lookup = MethodHandles.privateLookupIn(clazz, MethodHandles.lookup());
-        assertTrue(lookup.lookupClass() == clazz);
-        assertTrue((lookup.lookupModes() & PRIVATE) == PRIVATE);
-        assertTrue((lookup.lookupModes() & MODULE) == 0);
+        assertSame(clazz, lookup.lookupClass());
+        assertEquals(PRIVATE, lookup.lookupModes() & PRIVATE);
+        assertEquals(0, lookup.lookupModes() & MODULE);
 
         // get obj field
         MethodHandle mh = lookup.findStaticGetter(clazz, "obj", Object.class);
@@ -123,6 +125,7 @@ public class PrivateLookupInTests {
     }
 
     // test target class in unnamed module
+    @Test
     public void testTargetClassInUnnamedModule() throws Throwable {
         Class<?> clazz = Class.forName("Unnamed");
         assertFalse(clazz.getModule().isNamed());
@@ -130,76 +133,72 @@ public class PrivateLookupInTests {
         // thisModule does not read the unnamed module
         Module thisModule = getClass().getModule();
         assertFalse(thisModule.canRead(clazz.getModule()));
-        try {
-            MethodHandles.privateLookupIn(clazz, MethodHandles.lookup());
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        var baseLookup = MethodHandles.lookup();
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.privateLookupIn(clazz, baseLookup));
 
         // thisModule reads the unnamed module
         thisModule.addReads(clazz.getModule());
-        Lookup lookup = MethodHandles.privateLookupIn(clazz, MethodHandles.lookup());
-        assertTrue(lookup.lookupClass() == clazz);
-        assertTrue((lookup.lookupModes() & PRIVATE) == PRIVATE);
-        assertTrue((lookup.lookupModes() & MODULE) == 0);
+        Lookup lookup = MethodHandles.privateLookupIn(clazz, baseLookup);
+        assertSame(clazz, lookup.lookupClass());
+        assertEquals(PRIVATE, (lookup.lookupModes() & PRIVATE));
+        assertEquals(0, (lookup.lookupModes() & MODULE));
     }
 
     // test does not read m2, m2 opens p2 to test
-    @Test(expectedExceptions = {IllegalAccessException.class})
+    @Test
     public void testCallerDoesNotRead() throws Throwable {
         // m2/p2.Type
         Class<?> clazz = Class.forName("p2.Type");
-        assertEquals(clazz.getModule().getName(), "m2");
-
+        assertEquals("m2", clazz.getModule().getName());
         Module thisModule = getClass().getModule();
         Module m2 = clazz.getModule();
         assertFalse(thisModule.canRead(m2));
         assertTrue(m2.isOpen("p2", thisModule));
-
-        Lookup lookup = MethodHandles.privateLookupIn(clazz, MethodHandles.lookup());
+        assertThrows(IllegalAccessException.class, () ->
+                MethodHandles.privateLookupIn(clazz, MethodHandles.lookup()));
     }
 
     // test reads m3, m3 does not open p3 to test
-    @Test(expectedExceptions = {IllegalAccessException.class})
+    @Test
     public void testNotOpenToCaller() throws Throwable {
         // m3/p2.Type
         Class<?> clazz = Class.forName("p3.Type");
-        assertEquals(clazz.getModule().getName(), "m3");
-
+        assertEquals("m3", clazz.getModule().getName());
         Module thisModule = getClass().getModule();
         Module m3 = clazz.getModule();
         thisModule.addReads(clazz.getModule());
         assertFalse(m3.isOpen("p3", thisModule));
-
-        Lookup lookup = MethodHandles.privateLookupIn(clazz, MethodHandles.lookup());
+        assertThrows(IllegalAccessException.class, () ->
+                MethodHandles.privateLookupIn(clazz, MethodHandles.lookup()));
     }
 
     // Invoke MethodHandles.privateLookupIn with a primitive class
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test
     public void testPrimitiveClassAsTargetClass() throws Exception {
-        MethodHandles.privateLookupIn(int.class, MethodHandles.lookup());
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.privateLookupIn(int.class, MethodHandles.lookup()));
     }
 
     // Invoke MethodHandles.privateLookupIn with an array class
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test
     public void testArrayClassAsTargetClass() throws Exception {
-        MethodHandles.privateLookupIn(PrivateLookupInTests[].class, MethodHandles.lookup());
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.privateLookupIn(PrivateLookupInTests[].class, MethodHandles.lookup()));
     }
 
     // Invoke MethodHandles.privateLookupIn with a primitive array class
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test
     public void testPrimitiveArrayClassAsTargetClass() throws Exception {
-        MethodHandles.privateLookupIn(int[].class, MethodHandles.lookup());
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.privateLookupIn(int[].class, MethodHandles.lookup()));
     }
 
     // Invoke MethodHandles.privateLookupIn with null
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void testNullTargetClass() throws Exception {
-        MethodHandles.privateLookupIn(null, MethodHandles.lookup());
+        assertThrows(NullPointerException.class, () -> MethodHandles.privateLookupIn(null, MethodHandles.lookup()));
     }
 
     // Invoke MethodHandles.privateLookupIn with null
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void testNullCaller() throws Exception {
-        MethodHandles.privateLookupIn(getClass(), null);
+        assertThrows(NullPointerException.class, () -> MethodHandles.privateLookupIn(getClass(), null));
     }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandlesCollectArgsTest.java b/test/jdk/java/lang/invoke/MethodHandlesCollectArgsTest.java
index 5fc0083d5fb..20f03454d32 100644
--- a/test/jdk/java/lang/invoke/MethodHandlesCollectArgsTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandlesCollectArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,17 @@
 
 /* @test
  * @bug 8259922
- * @run testng/othervm MethodHandlesCollectArgsTest
+ * @run junit/othervm MethodHandlesCollectArgsTest
  */
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class MethodHandlesCollectArgsTest {
 
@@ -43,7 +42,6 @@ public class MethodHandlesCollectArgsTest {
     private static final MethodHandle FILTER_INT = MethodHandles.empty(methodType(int.class, String.class));
     private static final MethodHandle FILTER_VOID = MethodHandles.empty(methodType(void.class, String.class));
 
-    @DataProvider(name = "illegalPos")
     public static Object[][] illegalPos() {
         return new Object[][] {
             {TARGET_II_I, 2, FILTER_INT},
@@ -57,7 +55,6 @@ public class MethodHandlesCollectArgsTest {
         };
     }
 
-    @DataProvider(name = "validPos")
     public static Object[][] validPos() {
         return new Object[][] {
             {TARGET_II_I, 0, FILTER_INT, methodType(int.class, String.class, int.class)},
@@ -69,14 +66,16 @@ public class MethodHandlesCollectArgsTest {
         };
     }
 
-    @Test(dataProvider="illegalPos", expectedExceptions = {IllegalArgumentException.class})
+    @ParameterizedTest
+    @MethodSource("illegalPos")
     public void illegalPosition(MethodHandle target, int position, MethodHandle filter) {
-        MethodHandles.collectArguments(target, position, filter);
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.collectArguments(target, position, filter));
     }
 
-    @Test(dataProvider="validPos")
+    @ParameterizedTest
+    @MethodSource("validPos")
     public void legalPosition(MethodHandle target, int position, MethodHandle filter, MethodType expectedType) {
         MethodHandle result = MethodHandles.collectArguments(target, position, filter);
-        assertEquals(result.type(), expectedType);
+        assertEquals(expectedType, result.type());
     }
 }
diff --git a/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java b/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java
index b60c35fc30b..588227fef15 100644
--- a/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java
+++ b/test/jdk/java/lang/invoke/MethodHandlesGeneralTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,6 +60,7 @@ import java.util.Map;
 
 import static java.lang.invoke.MethodType.methodType;
 import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 public class MethodHandlesGeneralTest extends MethodHandlesTest {
 
@@ -398,7 +399,7 @@ public class MethodHandlesGeneralTest extends MethodHandlesTest {
         Object obj = target.invokeWithArguments(args);
         if (!(defc == Example.class && params.length < 2))
             assertCalled(defc.getSimpleName()+".<init>", args);
-        assertTrue("instance of "+defc.getName(), defc.isInstance(obj));
+        assertInstanceOf(defc, obj);
     }
 
     @Test
@@ -971,8 +972,7 @@ public class MethodHandlesGeneralTest extends MethodHandlesTest {
                 arrayToMH = new SubIntExample[length];
             else
                 return;  // can't make an ArrayStoreException test
-            assert(arrayType.isInstance(arrayToMH))
-                : Arrays.asList(arrayType, arrayToMH.getClass(), testSetter, negTest);
+            assertInstanceOf(arrayType, arrayToMH, () -> Arrays.asList(testSetter, negTest).toString());
             break;
         }
         countTest(positive);
diff --git a/test/jdk/java/lang/invoke/MethodTypeTest.java b/test/jdk/java/lang/invoke/MethodTypeTest.java
index 8ac03d1a7fd..dccc82fa348 100644
--- a/test/jdk/java/lang/invoke/MethodTypeTest.java
+++ b/test/jdk/java/lang/invoke/MethodTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @bug 8366028
  * @summary unit tests for java.lang.invoke.MethodType
  * @compile MethodTypeTest.java
- * @run testng/othervm test.java.lang.invoke.MethodTypeTest
+ * @run junit/othervm test.java.lang.invoke.MethodTypeTest
  */
 
 package test.java.lang.invoke;
@@ -35,11 +35,13 @@ import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 
 import java.util.*;
-import org.testng.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.testng.Assert.assertThrows;
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
@@ -57,7 +59,7 @@ public class MethodTypeTest {
     private MethodType[] GALLERY;
     private Method compareTo;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUp() throws Exception {
         rtype = void.class;
         ptypes = new Class<?>[] { int.class, String.class };
@@ -98,7 +100,7 @@ public class MethodTypeTest {
         };
     }
 
-    @AfterMethod
+    @AfterEach
     public void tearDown() throws Exception {
     }
 
@@ -107,7 +109,7 @@ public class MethodTypeTest {
     public void testDistinct() {
         List<MethodType> gallery2 = new ArrayList<>();
         for (MethodType mt : GALLERY) {
-            assertFalse(mt.toString(), gallery2.contains(mt));
+            assertFalse(gallery2.contains(mt), mt.toString());
             gallery2.add(mt);
         }
         // check self-equality also:
@@ -198,9 +200,9 @@ public class MethodTypeTest {
         for (int i = 0; i < instances.length; i++) {
             MethodType instance = instances[i];
             String result = instance.toMethodDescriptorString();
-            assertEquals("#"+i, expResults[i], result);
+            assertEquals(expResults[i], result, "#"+i);
             MethodType parsed = MethodType.fromMethodDescriptorString(result, loader);
-            assertSame("--#"+i, instance, parsed);
+            assertSame(instance, parsed, "--#"+i);
         }
     }
     private static String concat(Object... parts) {
@@ -221,8 +223,7 @@ public class MethodTypeTest {
         return sb.toString().replace('.', '/');
     }
 
-    @DataProvider(name = "badMethodDescriptorStrings")
-    public String[] badMethodDescriptorStrings() {
+    public static String[] badMethodDescriptorStrings() {
         return new String[] {
                 "(I)",
                 "(V)V",
@@ -239,9 +240,12 @@ public class MethodTypeTest {
     }
 
     // JDK-8366028
-    @Test(dataProvider = "badMethodDescriptorStrings", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("badMethodDescriptorStrings")
     public void testFromMethodDescriptorStringNegatives(String desc) {
-        MethodType.fromMethodDescriptorString(desc, null);
+        assertThrows(IllegalArgumentException.class, () -> {
+            MethodType.fromMethodDescriptorString(desc, null);
+        });
     }
 
     @Test
@@ -251,7 +255,7 @@ public class MethodTypeTest {
         boolean[] expResults =   {true,   false,  true,  false, true,   true,   false,  true};
         for (int i = 0; i < instances.length; i++) {
             boolean result = instances[i].hasPrimitives();
-            assertEquals("#"+i, expResults[i], result);
+            assertEquals(expResults[i], result, "#"+i);
         }
     }
 
@@ -263,7 +267,7 @@ public class MethodTypeTest {
         for (int i = 0; i < instances.length; i++) {
             System.out.println("  hasWrappers "+instances[i]);
             boolean result = instances[i].hasWrappers();
-            assertEquals("#"+i, expResults[i], result);
+            assertEquals(expResults[i], result, "#"+i);
         }
     }
 
@@ -274,7 +278,7 @@ public class MethodTypeTest {
         MethodType[] expResults = {mt_viO, mt_OO2, mt_vv, mt_Ov, mt_iO2, mt_OOi, mt_OO2, mt_iOi};
         for (int i = 0; i < instances.length; i++) {
             MethodType result = instances[i].erase();
-            assertSame("#"+i, expResults[i], result);
+            assertSame(expResults[i], result, "#"+i);
         }
     }
 
@@ -285,7 +289,7 @@ public class MethodTypeTest {
         MethodType[] expResults = {mt_OO2, mt_OO2, mt_Ov, mt_Ov, mt_OO2, mt_OO2, mt_OO2, mt_OO2};
         for (int i = 0; i < instances.length; i++) {
             MethodType result = instances[i].generic();
-            assertSame("#"+i, expResults[i], result);
+            assertSame(expResults[i], result, "#"+i);
         }
     }
 
@@ -296,7 +300,7 @@ public class MethodTypeTest {
         MethodType[] expResults = {mt_VIS, mt_OO2, mt_Vv, mt_Ov, mt_ISI, mt_ISI, mt_ISI, mt_ISI};
         for (int i = 0; i < instances.length; i++) {
             MethodType result = instances[i].wrap();
-            assertSame("#"+i, expResults[i], result);
+            assertSame(expResults[i], result, "#"+i);
         }
     }
 
@@ -307,7 +311,7 @@ public class MethodTypeTest {
         MethodType[] expResults = {mt_viS, mt_OO2, mt_vv, mt_Ov, mt_iSi, mt_iSi, mt_iSi, mt_iSi};
         for (int i = 0; i < instances.length; i++) {
             MethodType result = instances[i].unwrap();
-            assertSame("#"+i, expResults[i], result);
+            assertSame(expResults[i], result, "#"+i);
         }
     }
 
@@ -436,7 +440,7 @@ public class MethodTypeTest {
             MethodType instance = instances[i];
             String result = instance.toString();
             System.out.println("#"+i+":"+result);
-            assertEquals("#"+i, expResults[i], result);
+            assertEquals(expResults[i], result, "#"+i);
         }
     }
 
diff --git a/test/jdk/java/lang/invoke/PermuteArgsReturnVoidTest.java b/test/jdk/java/lang/invoke/PermuteArgsReturnVoidTest.java
index b01a4aa2a99..6bd604dcd36 100644
--- a/test/jdk/java/lang/invoke/PermuteArgsReturnVoidTest.java
+++ b/test/jdk/java/lang/invoke/PermuteArgsReturnVoidTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,21 @@
 /* @test
  * @bug 8184119
  * @summary test permutation when return value is directly derived from an argument
- * @run testng/othervm test.java.lang.invoke.PermuteArgsReturnVoidTest
+ * @run junit/othervm test.java.lang.invoke.PermuteArgsReturnVoidTest
  */
 
 
 package test.java.lang.invoke;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
 import static java.lang.invoke.MethodHandles.dropArguments;
 import static java.lang.invoke.MethodHandles.identity;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PermuteArgsReturnVoidTest {
 
@@ -65,8 +65,8 @@ public class PermuteArgsReturnVoidTest {
         MethodHandle p = MethodHandles.permuteArguments(f, MethodType.methodType(String.class, String.class, int.class, int.class), 0, 2, 1);
 
         String s = (String) p.invoke("IN", 0, 0);
-        Assert.assertEquals(s.getClass(), String.class);
-        Assert.assertEquals(s, "IN");
+        assertEquals(String.class, s.getClass());
+        assertEquals("IN", s);
     }
 
     @Test
@@ -84,7 +84,7 @@ public class PermuteArgsReturnVoidTest {
         MethodHandle p = MethodHandles.permuteArguments(f, MethodType.methodType(String.class, String.class, int.class, int.class), 0, 2, 1);
 
         String s = (String) p.invoke("IN", 0, 0);
-        Assert.assertEquals(s.getClass(), String.class);
-        Assert.assertEquals(s, "IN");
+        assertEquals(String.class, s.getClass());
+        assertEquals("IN", s);
     }
 }
diff --git a/test/jdk/java/lang/invoke/PermuteArgsTest.java b/test/jdk/java/lang/invoke/PermuteArgsTest.java
index 3586dc9382f..77558714d11 100644
--- a/test/jdk/java/lang/invoke/PermuteArgsTest.java
+++ b/test/jdk/java/lang/invoke/PermuteArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @summary unit tests for method handles which permute their arguments
  * @library /test/lib /java/lang/invoke/common
- * @run testng/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -ea -esa -DPermuteArgsTest.MAX_ARITY=8 test.java.lang.invoke.PermuteArgsTest
+ * @run junit/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies -ea -esa -DPermuteArgsTest.MAX_ARITY=8 test.java.lang.invoke.PermuteArgsTest
  */
 
 /* Examples of manual runs:
@@ -35,7 +35,6 @@
 
 package test.java.lang.invoke;
 
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.CodeCacheOverflowProcessor;
 
 import java.lang.invoke.MethodHandle;
@@ -52,6 +51,10 @@ import static java.lang.invoke.MethodHandles.Lookup;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.lang.invoke.MethodHandles.permuteArguments;
 import static java.lang.invoke.MethodType.methodType;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PermuteArgsTest {
     private static final Class<?> CLASS = PermuteArgsTest.class;
@@ -259,11 +262,11 @@ public class PermuteArgsTest {
             reverse(perm, 0, perm.length);
         }
         switch (perm.length) {
-        case 2: assert(testCases - testCases0 == 2); break;
-        case 3: assert(testCases - testCases0 == 6); break;
-        case 4: assert(testCases - testCases0 == 24); break;
-        case 5: assert(testCases - testCases0 == 120); break;
-        case 6: assert(testCases - testCases0 > 720/3); break;
+            case 2 -> assertEquals(2, testCases - testCases0);
+            case 3 -> assertEquals(6, testCases - testCases0);
+            case 4 -> assertEquals(24, testCases - testCases0);
+            case 5 -> assertEquals(120, testCases - testCases0);
+            case 6 -> assertTrue(testCases - testCases0 > 720/3);
         }
     }
 
diff --git a/test/jdk/java/lang/invoke/SpreadCollectTest.java b/test/jdk/java/lang/invoke/SpreadCollectTest.java
index bcddcd449f8..d58ebab3611 100644
--- a/test/jdk/java/lang/invoke/SpreadCollectTest.java
+++ b/test/jdk/java/lang/invoke/SpreadCollectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8139885
  * @bug 8143798
- * @run testng/othervm -ea -esa test.java.lang.invoke.SpreadCollectTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.SpreadCollectTest
  */
 
 package test.java.lang.invoke;
@@ -39,9 +39,11 @@ import java.util.*;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests for the new asSpreader/asCollector API added in JEP 274.
@@ -51,14 +53,14 @@ public class SpreadCollectTest {
     static final Lookup LOOKUP = MethodHandles.lookup();
 
     @Test
-    public static void testAsSpreader() throws Throwable {
+    public void testAsSpreader() throws Throwable {
         MethodHandle spreader = SpreadCollect.MH_forSpreading.asSpreader(1, int[].class, 3);
         assertEquals(SpreadCollect.MT_spreader, spreader.type());
         assertEquals("A456B", (String) spreader.invoke("A", new int[]{4, 5, 6}, "B"));
     }
 
     @Test
-    public static void testAsSpreaderExample() throws Throwable {
+    public void testAsSpreaderExample() throws Throwable {
         // test the JavaDoc asSpreader-with-pos example
         MethodHandle compare = LOOKUP.findStatic(Objects.class, "compare", methodType(int.class, Object.class, Object.class, Comparator.class));
         MethodHandle compare2FromArray = compare.asSpreader(0, Object[].class, 2);
@@ -66,49 +68,43 @@ public class SpreadCollectTest {
         Comparator<Integer> cmp = (a, b) -> a - b;
         assertTrue((int) compare2FromArray.invoke(Arrays.copyOfRange(ints, 0, 2), cmp) < 0);
         assertTrue((int) compare2FromArray.invoke(Arrays.copyOfRange(ints, 1, 3), cmp) > 0);
-        assertTrue((int) compare2FromArray.invoke(Arrays.copyOfRange(ints, 2, 4), cmp) == 0);
+        assertEquals(0, (int) compare2FromArray.invoke(Arrays.copyOfRange(ints, 2, 4), cmp));
     }
 
-    @DataProvider
     static Object[][] asSpreaderIllegalPositions() {
         return new Object[][]{{-7}, {3}, {19}};
     }
 
-    @Test(dataProvider = "asSpreaderIllegalPositions")
-    public static void testAsSpreaderIllegalPos(int p) throws Throwable {
-        boolean caught = false;
-        try {
-            SpreadCollect.MH_forSpreading.asSpreader(p, Object[].class, 3);
-        } catch (IllegalArgumentException iae) {
-            assertEquals("bad spread position", iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
-    }
-
-    @Test(expectedExceptions = {WrongMethodTypeException.class})
-    public static void testAsSpreaderIllegalMethodType() {
-        MethodHandle h = MethodHandles.dropArguments(MethodHandles.constant(String.class, ""), 0, int.class, int.class);
-        MethodHandle s = h.asSpreader(String[].class, 1);
-    }
-
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testAsSpreaderNullArrayType() {
-        SpreadCollect.MH_forSpreading.asSpreader(null, 0);
-    }
-
-    @Test(expectedExceptions = {NullPointerException.class})
-    public static void testAsSpreaderNullArrayNonZeroLength() {
-        SpreadCollect.MH_forSpreading.asSpreader(null, 1);
-    }
-
-    @Test(expectedExceptions = {IllegalArgumentException.class})
-    public static void testAsSpreaderTooManyParams() throws Throwable {
-        SpreadCollect.MH_forSpreading.asSpreader(1, int[].class, 6);
+    @ParameterizedTest
+    @MethodSource("asSpreaderIllegalPositions")
+    public void testAsSpreaderIllegalPos(int p) throws Throwable {
+        var iae = assertThrows(IllegalArgumentException.class, () -> SpreadCollect.MH_forSpreading.asSpreader(p, Object[].class, 3));
+        assertEquals("bad spread position", iae.getMessage());
     }
 
     @Test
-    public static void testAsCollector() throws Throwable {
+    public void testAsSpreaderIllegalMethodType() {
+        MethodHandle h = MethodHandles.dropArguments(MethodHandles.constant(String.class, ""), 0, int.class, int.class);
+        assertThrows(WrongMethodTypeException.class, () -> h.asSpreader(String[].class, 1));
+    }
+
+    @Test
+    public void testAsSpreaderNullArrayType() {
+        assertThrows(NullPointerException.class, () -> SpreadCollect.MH_forSpreading.asSpreader(null, 0));
+    }
+
+    @Test
+    public void testAsSpreaderNullArrayNonZeroLength() {
+        assertThrows(NullPointerException.class, () -> SpreadCollect.MH_forSpreading.asSpreader(null, 1));
+    }
+
+    @Test
+    public void testAsSpreaderTooManyParams() throws Throwable {
+        assertThrows(IllegalArgumentException.class, () -> SpreadCollect.MH_forSpreading.asSpreader(1, int[].class, 6));
+    }
+
+    @Test
+    public void testAsCollector() throws Throwable {
         MethodHandle collector = SpreadCollect.MH_forCollecting.asCollector(1, int[].class, 1);
         assertEquals(SpreadCollect.MT_collector1, collector.type());
         assertEquals("A4B", (String) collector.invoke("A", 4, "B"));
@@ -121,7 +117,7 @@ public class SpreadCollectTest {
     }
 
     @Test
-    public static void testAsCollectorInvokeWithArguments() throws Throwable {
+    public void testAsCollectorInvokeWithArguments() throws Throwable {
         MethodHandle collector = SpreadCollect.MH_forCollecting.asCollector(1, int[].class, 1);
         assertEquals(SpreadCollect.MT_collector1, collector.type());
         assertEquals("A4B", (String) collector.invokeWithArguments("A", 4, "B"));
@@ -134,7 +130,7 @@ public class SpreadCollectTest {
     }
 
     @Test
-    public static void testAsCollectorLeading() throws Throwable {
+    public void testAsCollectorLeading() throws Throwable {
         MethodHandle collector = SpreadCollect.MH_forCollectingLeading.asCollector(0, int[].class, 1);
         assertEquals(SpreadCollect.MT_collectorLeading1, collector.type());
         assertEquals("7Q", (String) collector.invoke(7, "Q"));
@@ -147,7 +143,7 @@ public class SpreadCollectTest {
     }
 
     @Test
-    public static void testAsCollectorLeadingInvokeWithArguments() throws Throwable {
+    public void testAsCollectorLeadingInvokeWithArguments() throws Throwable {
         MethodHandle collector = SpreadCollect.MH_forCollectingLeading.asCollector(0, int[].class, 1);
         assertEquals(SpreadCollect.MT_collectorLeading1, collector.type());
         assertEquals("7Q", (String) collector.invokeWithArguments(7, "Q"));
@@ -160,31 +156,25 @@ public class SpreadCollectTest {
     }
 
     @Test
-    public static void testAsCollectorNone() throws Throwable {
+    public void testAsCollectorNone() throws Throwable {
         MethodHandle collector = SpreadCollect.MH_forCollecting.asCollector(1, int[].class, 0);
         assertEquals(SpreadCollect.MT_collector0, collector.type());
         assertEquals("AB", (String) collector.invoke("A", "B"));
     }
 
-    @DataProvider
     static Object[][] asCollectorIllegalPositions() {
         return new Object[][]{{-1}, {17}};
     }
 
-    @Test(dataProvider = "asCollectorIllegalPositions")
-    public static void testAsCollectorIllegalPos(int p) {
-        boolean caught = false;
-        try {
-            SpreadCollect.MH_forCollecting.asCollector(p, int[].class, 0);
-        } catch (IllegalArgumentException iae) {
-            assertEquals("bad collect position", iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+    @ParameterizedTest
+    @MethodSource("asCollectorIllegalPositions")
+    public void testAsCollectorIllegalPos(int p) {
+        var iae = assertThrows(IllegalArgumentException.class, () -> SpreadCollect.MH_forCollecting.asCollector(p, int[].class, 0));
+        assertEquals("bad collect position", iae.getMessage());
     }
 
     @Test
-    public static void testAsCollectorExample() throws Throwable {
+    public void testAsCollectorExample() throws Throwable {
         // test the JavaDoc asCollector-with-pos example
         StringWriter swr = new StringWriter();
         MethodHandle swWrite = LOOKUP.
diff --git a/test/jdk/java/lang/invoke/TestVHInvokerCaching.java b/test/jdk/java/lang/invoke/TestVHInvokerCaching.java
index 0a1ae5914ca..e5c7d50daa7 100644
--- a/test/jdk/java/lang/invoke/TestVHInvokerCaching.java
+++ b/test/jdk/java/lang/invoke/TestVHInvokerCaching.java
@@ -23,12 +23,9 @@
 
 /* @test
  * @bug 8265079
- * @run testng/othervm -Xverify:all TestVHInvokerCaching
+ * @run junit/othervm -Xverify:all TestVHInvokerCaching
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
@@ -37,12 +34,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static java.lang.invoke.MethodHandles.lookup;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class TestVHInvokerCaching {
 
-    @Test(dataProvider = "testHandles")
-    public static void testVHIInvokerCaching(VarHandle testHandle) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("testHandles")
+    public void testVHIInvokerCaching(VarHandle testHandle) throws Throwable {
         for (VarHandle.AccessMode mode : VarHandle.AccessMode.values()) {
             MethodHandle handle1 = MethodHandles.varHandleInvoker(mode, testHandle.accessModeType(mode));
             MethodHandle handle2 = MethodHandles.varHandleInvoker(mode, testHandle.accessModeType(mode));
@@ -56,7 +57,6 @@ public class TestVHInvokerCaching {
         }
     }
 
-    @DataProvider
     public static Object[][] testHandles() throws NoSuchFieldException, IllegalAccessException {
         List<VarHandle> testHandles = new ArrayList<>();
 
diff --git a/test/jdk/java/lang/invoke/ThrowExceptionsTest.java b/test/jdk/java/lang/invoke/ThrowExceptionsTest.java
index e12bb7040c4..627a056faec 100644
--- a/test/jdk/java/lang/invoke/ThrowExceptionsTest.java
+++ b/test/jdk/java/lang/invoke/ThrowExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,11 @@
 
 /* @test
  * @summary unit tests for method handles which permute their arguments
- * @run testng test.java.lang.invoke.ThrowExceptionsTest
+ * @run junit test.java.lang.invoke.ThrowExceptionsTest
  */
 
 package test.java.lang.invoke;
 
-import org.testng.*;
-import org.testng.annotations.*;
-
 import java.util.*;
 import java.lang.reflect.*;
 
@@ -38,6 +35,10 @@ import java.lang.invoke.*;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ThrowExceptionsTest {
     private static final Class<?> CLASS = ThrowExceptionsTest.class;
     private static final Lookup LOOKUP = lookup();
@@ -51,7 +52,7 @@ public class ThrowExceptionsTest {
         // mostly call testWMTCallee, but sometimes call its void-returning variant
         MethodHandle mh = testWMTCallee();
         MethodHandle mh1 = mh.asType(mh.type().changeReturnType(void.class));
-        assert(mh1 != mh);
+        assertNotSame(mh, mh1);
         testWMT(mh, mh1, 1000);
     }
 
@@ -108,7 +109,7 @@ public class ThrowExceptionsTest {
         MethodHandle[] cell = { null };  // recursion point
         MethodHandle getCell = insertArguments(arrayElementGetter(cell.getClass()), 0, cell, 0);
         MethodHandle invokeCell = foldArguments(exactInvoker(cellType), getCell);
-        assert(invokeCell.type() == cellType);
+        assertSame(cellType, invokeCell.type());
         cell[0] = invokeCell;
         // make it conformable to any type:
         invokeCell = dropArguments(invokeCell, 0, Object[].class).asVarargsCollector(Object[].class);
@@ -189,7 +190,6 @@ public class ThrowExceptionsTest {
             try {
                 // FIXME: should not have to retype this
                 n = (int) mh.invokeExact((Object)this, "x");
-                assertEquals(n, i - catches);
                 // Using the exact type for this causes endless deopt due to
                 // 'non_cached_result' in SystemDictionary::find_method_handle_invoke.
                 // The problem is that the compiler thread needs to access a cached
@@ -198,7 +198,9 @@ public class ThrowExceptionsTest {
             } catch (Exception ex) {
                 savedEx = ex;
                 catches++;
+                continue;
             }
+            assertEquals(i - catches, n);
         }
         //VERBOSE: System.out.println("reps="+reps+" catches="+catches);
         return savedEx;
@@ -220,9 +222,4 @@ public class ThrowExceptionsTest {
         }
         return savedEx;
     }
-
-    private static void assertEquals(Object x, Object y) {
-        if (x == y || x != null && x.equals(y))  return;
-        throw new RuntimeException(x+" != "+y);
-    }
 }
diff --git a/test/jdk/java/lang/invoke/TryFinallyTest.java b/test/jdk/java/lang/invoke/TryFinallyTest.java
index 4a3c255201e..ebe276ede93 100644
--- a/test/jdk/java/lang/invoke/TryFinallyTest.java
+++ b/test/jdk/java/lang/invoke/TryFinallyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 8139885 8150824 8150825 8194238 8233920
- * @run testng/othervm -ea -esa -Xverify:all test.java.lang.invoke.TryFinallyTest
+ * @run junit/othervm -ea -esa -Xverify:all test.java.lang.invoke.TryFinallyTest
  */
 
 package test.java.lang.invoke;
@@ -35,9 +35,12 @@ import java.lang.invoke.MethodType;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * Tests for the tryFinally method handle combinator introduced in JEP 274.
@@ -47,13 +50,12 @@ public class TryFinallyTest {
     static final Lookup LOOKUP = MethodHandles.lookup();
 
     @Test
-    public static void testTryFinally() throws Throwable {
+    public void testTryFinally() throws Throwable {
         MethodHandle hello = MethodHandles.tryFinally(TryFinally.MH_greet, TryFinally.MH_exclaim);
         assertEquals(TryFinally.MT_hello, hello.type());
         assertEquals("Hello, world!", hello.invoke("world"));
     }
 
-    @DataProvider
     static Object[][] tryFinallyArgs() {
         return new Object[][] {
                 { boolean.class, true },
@@ -68,8 +70,9 @@ public class TryFinallyTest {
         };
     }
 
-    @Test(dataProvider = "tryFinallyArgs")
-    public static void testTryFinally(Class<?> argType, Object arg) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("tryFinallyArgs")
+    public void testTryFinally(Class<?> argType, Object arg) throws Throwable {
         MethodHandle identity = MethodHandles.identity(argType);
         MethodHandle tryFinally = MethodHandles.tryFinally(
                 identity,
@@ -78,31 +81,31 @@ public class TryFinallyTest {
         assertEquals(arg, tryFinally.invoke(arg));
     }
 
-    @Test(dataProvider = "tryFinallyArgs", expectedExceptions = TryFinally.T1.class)
-    public static void testTryFinallyException(Class<?> argType, Object arg) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("tryFinallyArgs")
+    public void testTryFinallyException(Class<?> argType, Object arg) throws Throwable {
         MethodHandle identity = TryFinally.MH_throwingTargetIdentity.asType(methodType(argType, argType));
         MethodHandle tryFinally = MethodHandles.tryFinally(
                 identity,
                 MethodHandles.dropArguments(identity, 0, TryFinally.T1.class));
         assertEquals(methodType(argType, argType), tryFinally.type());
-        tryFinally.invoke(arg); // should throw
+        assertThrows(TryFinally.T1.class, () -> tryFinally.invoke(arg));
     }
 
     @Test
-    public static void testTryFinallyVoid() throws Throwable {
+    public void testTryFinallyVoid() throws Throwable {
         MethodHandle tfVoid = MethodHandles.tryFinally(TryFinally.MH_print, TryFinally.MH_printMore);
         assertEquals(TryFinally.MT_printHello, tfVoid.type());
         tfVoid.invoke("world");
     }
 
     @Test
-    public static void testTryFinallySublist() throws Throwable {
+    public void testTryFinallySublist() throws Throwable {
         MethodHandle helloMore = MethodHandles.tryFinally(TryFinally.MH_greetMore, TryFinally.MH_exclaimMore);
         assertEquals(TryFinally.MT_moreHello, helloMore.type());
         assertEquals("Hello, world and universe (but world first)!", helloMore.invoke("world", "universe"));
     }
 
-    @DataProvider
     static Object[][] omitTrailingArguments() {
         MethodHandle c = TryFinally.MH_voidCleanup;
         return new Object[][]{
@@ -114,13 +117,13 @@ public class TryFinallyTest {
         };
     }
 
-    @Test(dataProvider = "omitTrailingArguments")
-    public static void testTryFinallyOmitTrailingArguments(MethodHandle cleanup) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("omitTrailingArguments")
+    public void testTryFinallyOmitTrailingArguments(MethodHandle cleanup) throws Throwable {
         MethodHandle tf = MethodHandles.tryFinally(TryFinally.MH_dummyTarget, cleanup);
         tf.invoke(1, 2L, "a", 23, 42L, "b");
     }
 
-    @DataProvider
     static Object[][] negativeTestData() {
         MethodHandle intid = MethodHandles.identity(int.class);
         MethodHandle intco = MethodHandles.constant(int.class, 0);
@@ -145,29 +148,18 @@ public class TryFinallyTest {
         };
     }
 
-    @Test(dataProvider = "negativeTestData")
-    public static void testTryFinallyNegative(MethodHandle target, MethodHandle cleanup, String expectedMessage) {
-        boolean caught = false;
-        try {
-            MethodHandles.tryFinally(target, cleanup);
-        } catch (IllegalArgumentException iae) {
-            assertEquals(expectedMessage, iae.getMessage());
-            caught = true;
-        }
-        assertTrue(caught);
+    @ParameterizedTest
+    @MethodSource("negativeTestData")
+    public void testTryFinallyNegative(MethodHandle target, MethodHandle cleanup, String expectedMessage) {
+        var iae = assertThrows(IllegalArgumentException.class, () -> MethodHandles.tryFinally(target, cleanup));
+        assertEquals(expectedMessage, iae.getMessage());
     }
 
     @Test
-    public static void testTryFinallyThrowableCheck() {
+    public void testTryFinallyThrowableCheck() {
         MethodHandle mh = MethodHandles.tryFinally(TryFinally.MH_throwingTarget,
                                                    TryFinally.MH_catchingCleanup);
-        try {
-            mh.invoke();
-            fail("ClassCastException expected");
-        } catch (Throwable t) {
-            assertTrue("Throwable not assignable to ClassCastException: " + t,
-                       ClassCastException.class.isAssignableFrom(t.getClass()));
-        }
+        assertThrows(ClassCastException.class, mh::invoke);
     }
 
     static class TryFinally {
diff --git a/test/jdk/java/lang/invoke/VarArgsTest.java b/test/jdk/java/lang/invoke/VarArgsTest.java
index bb17881b514..bcea9a0b54e 100644
--- a/test/jdk/java/lang/invoke/VarArgsTest.java
+++ b/test/jdk/java/lang/invoke/VarArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,18 @@
 
 /* @test
  * @summary unit tests for java.lang.invoke.MethodHandles
- * @run testng/othervm -ea -esa test.java.lang.invoke.VarArgsTest
+ * @run junit/othervm -ea -esa test.java.lang.invoke.VarArgsTest
  */
 package test.java.lang.invoke;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.util.Arrays;
 import java.util.List;
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class VarArgsTest {
 
@@ -61,17 +60,17 @@ public class VarArgsTest {
         MethodHandle asList = publicLookup()
             .findStatic(Arrays.class, "asList", methodType(List.class, Object[].class));
         MethodHandle asListWithVarargs = asList.withVarargs(asList.isVarargsCollector());
-        assert(asListWithVarargs.isVarargsCollector());
+        assertTrue(asListWithVarargs.isVarargsCollector());
         assertEquals("[]", asListWithVarargs.invoke().toString());
         assertEquals("[1]", asListWithVarargs.invoke(1).toString());
         assertEquals("[two, too]", asListWithVarargs.invoke("two", "too").toString());
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void testWithVarargsIAE() throws Throwable {
         MethodHandle lenMH = publicLookup()
-            .findVirtual(String.class, "length", methodType(int.class));
-        MethodHandle lenMHWithVarargs = lenMH.withVarargs(true);
+                .findVirtual(String.class, "length", methodType(int.class));
+        assertThrows(IllegalArgumentException.class, () -> lenMH.withVarargs(true));
     }
 
 }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
index f09ba518e48..c89fcc8289b 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseByteArrayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,6 @@
  * questions.
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -32,6 +29,7 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Function;
+import org.junit.jupiter.api.BeforeAll;
 
 public abstract class VarHandleBaseByteArrayTest extends VarHandleBaseTest {
 
@@ -338,7 +336,7 @@ public abstract class VarHandleBaseByteArrayTest extends VarHandleBaseTest {
         bavss.add(dbb_offset_unaligned_ro);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() {
         setupByteSources();
         vhss = setupVarHandleSources(true);
@@ -346,13 +344,10 @@ public abstract class VarHandleBaseByteArrayTest extends VarHandleBaseTest {
 
     abstract List<VarHandleSource> setupVarHandleSources(boolean same);
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         return vhss.stream().map(cvh -> new Object[]{cvh}).toArray(Object[][]::new);
     }
 
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<java.lang.Class<?>> aepts = Arrays.asList(byte[].class, int.class);
         List<java.lang.Class<?>> bbpts = Arrays.asList(ByteBuffer.class, int.class);
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java
index 0c9a7fd3953..0e029b8f5f7 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ import java.util.Map;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 abstract class VarHandleBaseTest {
     static final int ITERS = Integer.getInteger("iters", 1);
@@ -136,18 +136,7 @@ abstract class VarHandleBaseTest {
     static void checkWithThrowable(Class<? extends Throwable> re,
                                    Object message,
                                    ThrowingRunnable r) {
-        Throwable _e = null;
-        try {
-            r.run();
-        }
-        catch (Throwable e) {
-            _e = e;
-        }
-        message = message == null ? "" : message + ". ";
-        assertNotNull(_e, String.format("%sNo throwable thrown. Expected %s", message, re));
-        if (!re.isInstance(_e)) {
-            fail(String.format("%sIncorrect throwable thrown, %s. Expected %s", message, _e, re), _e);
-        }
+        assertThrows(re, r::run, message == null ? null : message.toString());
     }
 
 
@@ -277,11 +266,11 @@ abstract class VarHandleBaseTest {
     }
 
     private static MethodHandle bind(VarHandle vh, MethodHandle mh, MethodType emt) {
-        assertEquals(mh.type(), emt.insertParameterTypes(0, VarHandle.class),
+        assertEquals(emt.insertParameterTypes(0, VarHandle.class), mh.type(),
                      "MethodHandle type differs from access mode type");
 
         MethodHandleInfo info = MethodHandles.lookup().revealDirect(mh);
-        assertEquals(info.getMethodType(), emt,
+        assertEquals(emt, info.getMethodType(),
                      "MethodHandleInfo method type differs from access mode type");
 
         return mh.bindTo(vh);
@@ -472,39 +461,39 @@ abstract class VarHandleBaseTest {
         for (TestAccessMode accessMode : testAccessModes()) {
             MethodType amt = vh.accessModeType(accessMode.toAccessMode());
 
-            assertEquals(amt.parameterList().subList(0, pts.size()), pts);
+            assertEquals(pts, amt.parameterList().subList(0, pts.size()));
         }
 
         for (TestAccessMode testAccessMode : testAccessModesOfType(TestAccessType.GET)) {
             MethodType mt = vh.accessModeType(testAccessMode.toAccessMode());
-            assertEquals(mt.returnType(), vh.varType());
-            assertEquals(mt.parameterList(), pts);
+            assertEquals(vh.varType(), mt.returnType());
+            assertEquals(pts, mt.parameterList());
         }
 
         for (TestAccessMode testAccessMode : testAccessModesOfType(TestAccessType.SET)) {
             MethodType mt = vh.accessModeType(testAccessMode.toAccessMode());
-            assertEquals(mt.returnType(), void.class);
-            assertEquals(mt.parameterType(mt.parameterCount() - 1), vh.varType());
+            assertEquals(void.class, mt.returnType());
+            assertEquals(vh.varType(), mt.parameterType(mt.parameterCount() - 1));
         }
 
         for (TestAccessMode testAccessMode : testAccessModesOfType(TestAccessType.COMPARE_AND_SET)) {
             MethodType mt = vh.accessModeType(testAccessMode.toAccessMode());
-            assertEquals(mt.returnType(), boolean.class);
-            assertEquals(mt.parameterType(mt.parameterCount() - 1), vh.varType());
-            assertEquals(mt.parameterType(mt.parameterCount() - 2), vh.varType());
+            assertEquals(boolean.class, mt.returnType());
+            assertEquals(vh.varType(), mt.parameterType(mt.parameterCount() - 1));
+            assertEquals(vh.varType(), mt.parameterType(mt.parameterCount() - 2));
         }
 
         for (TestAccessMode testAccessMode : testAccessModesOfType(TestAccessType.COMPARE_AND_EXCHANGE)) {
             MethodType mt = vh.accessModeType(testAccessMode.toAccessMode());
-            assertEquals(mt.returnType(), vh.varType());
-            assertEquals(mt.parameterType(mt.parameterCount() - 1), vh.varType());
-            assertEquals(mt.parameterType(mt.parameterCount() - 2), vh.varType());
+            assertEquals(vh.varType(), mt.returnType());
+            assertEquals(vh.varType(), mt.parameterType(mt.parameterCount() - 1));
+            assertEquals(vh.varType(), mt.parameterType(mt.parameterCount() - 2));
         }
 
         for (TestAccessMode testAccessMode : testAccessModesOfType(TestAccessType.GET_AND_SET, TestAccessType.GET_AND_ADD)) {
             MethodType mt = vh.accessModeType(testAccessMode.toAccessMode());
-            assertEquals(mt.returnType(), vh.varType());
-            assertEquals(mt.parameterType(mt.parameterCount() - 1), vh.varType());
+            assertEquals(vh.varType(), mt.returnType());
+            assertEquals(vh.varType(), mt.parameterType(mt.parameterCount() - 1));
         }
     }
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleMethodReferenceTest.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleMethodReferenceTest.java
index 02de5a3e186..23e46096073 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleMethodReferenceTest.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleMethodReferenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
  * @test
  * @bug 8195650
  * @summary Test linking of method references to VarHandle access methods.
- * @run testng VarHandleMethodReferenceTest
+ * @run junit VarHandleMethodReferenceTest
  */
 
-import org.testng.annotations.Test;
 
 import java.lang.invoke.*;
+import org.junit.jupiter.api.Test;
 
 public class VarHandleMethodReferenceTest {
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
index a9cd5a61655..548e008b09e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessBoolean
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessBoolean
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessBoolean
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessBoolean
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessBoolean
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessBoolean
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessBoolean
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessBoolean
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
     static final boolean static_final_v = true;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessBoolean.class, "final_v", boolean.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(boolean[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessBoolean.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), boolean.class);
+        assertEquals(boolean.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         // Plain
         {
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "get boolean value");
+            assertEquals(true, x, "get boolean value");
         }
 
 
         // Volatile
         {
             boolean x = (boolean) vh.getVolatile(recv);
-            assertEquals(x, true, "getVolatile boolean value");
+            assertEquals(true, x, "getVolatile boolean value");
         }
 
         // Lazy
         {
             boolean x = (boolean) vh.getAcquire(recv);
-            assertEquals(x, true, "getRelease boolean value");
+            assertEquals(true, x, "getRelease boolean value");
         }
 
         // Opaque
         {
             boolean x = (boolean) vh.getOpaque(recv);
-            assertEquals(x, true, "getOpaque boolean value");
+            assertEquals(true, x, "getOpaque boolean value");
         }
     }
 
@@ -357,26 +355,26 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         // Plain
         {
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "get boolean value");
+            assertEquals(true, x, "get boolean value");
         }
 
 
         // Volatile
         {
             boolean x = (boolean) vh.getVolatile();
-            assertEquals(x, true, "getVolatile boolean value");
+            assertEquals(true, x, "getVolatile boolean value");
         }
 
         // Lazy
         {
             boolean x = (boolean) vh.getAcquire();
-            assertEquals(x, true, "getRelease boolean value");
+            assertEquals(true, x, "getRelease boolean value");
         }
 
         // Opaque
         {
             boolean x = (boolean) vh.getOpaque();
-            assertEquals(x, true, "getOpaque boolean value");
+            assertEquals(true, x, "getOpaque boolean value");
         }
     }
 
@@ -418,7 +416,7 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         {
             vh.set(recv, true);
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "set boolean value");
+            assertEquals(true, x, "set boolean value");
         }
 
 
@@ -426,21 +424,21 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, false);
             boolean x = (boolean) vh.getVolatile(recv);
-            assertEquals(x, false, "setVolatile boolean value");
+            assertEquals(false, x, "setVolatile boolean value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, true);
             boolean x = (boolean) vh.getAcquire(recv);
-            assertEquals(x, true, "setRelease boolean value");
+            assertEquals(true, x, "setRelease boolean value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, false);
             boolean x = (boolean) vh.getOpaque(recv);
-            assertEquals(x, false, "setOpaque boolean value");
+            assertEquals(false, x, "setOpaque boolean value");
         }
 
         vh.set(recv, true);
@@ -450,56 +448,56 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, true, false);
             assertEquals(r, true, "success compareAndSet boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "success compareAndSet boolean value");
+            assertEquals(false, x, "success compareAndSet boolean value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, true, false);
             assertEquals(r, false, "failing compareAndSet boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "failing compareAndSet boolean value");
+            assertEquals(false, x, "failing compareAndSet boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchange(recv, false, true);
             assertEquals(r, false, "success compareAndExchange boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "success compareAndExchange boolean value");
+            assertEquals(true, x, "success compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchange(recv, false, false);
             assertEquals(r, true, "failing compareAndExchange boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "failing compareAndExchange boolean value");
+            assertEquals(true, x, "failing compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeAcquire(recv, true, false);
             assertEquals(r, true, "success compareAndExchangeAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "success compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeAcquire(recv, true, false);
             assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "failing compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeRelease(recv, false, true);
             assertEquals(r, false, "success compareAndExchangeRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "success compareAndExchangeRelease boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeRelease(recv, false, false);
             assertEquals(r, true, "failing compareAndExchangeRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "failing compareAndExchangeRelease boolean value");
         }
 
         {
@@ -510,14 +508,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "success weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "success weakCompareAndSetPlain boolean value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, true, false);
             assertEquals(success, false, "failing weakCompareAndSetPlain boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "failing weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetPlain boolean value");
         }
 
         {
@@ -528,14 +526,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "success weakCompareAndSetAcquire boolean");
+            assertEquals(true, x, "success weakCompareAndSetAcquire boolean");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, false, false);
             assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "failing weakCompareAndSetAcquire boolean value");
+            assertEquals(true, x, "failing weakCompareAndSetAcquire boolean value");
         }
 
         {
@@ -546,14 +544,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "success weakCompareAndSetRelease boolean");
+            assertEquals(false, x, "success weakCompareAndSetRelease boolean");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, true, false);
             assertEquals(success, false, "failing weakCompareAndSetRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "failing weakCompareAndSetRelease boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetRelease boolean value");
         }
 
         {
@@ -564,14 +562,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "success weakCompareAndSet boolean value");
+            assertEquals(true, x, "success weakCompareAndSet boolean value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, false, false);
             assertEquals(success, false, "failing weakCompareAndSet boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, true, "failing weakCompareAndSet boolean value");
+            assertEquals(true, x, "failing weakCompareAndSet boolean value");
         }
 
         // Compare set and get
@@ -579,27 +577,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndSet(recv, false);
-            assertEquals(o, true, "getAndSet boolean");
+            assertEquals(true, o, "getAndSet boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "getAndSet boolean value");
+            assertEquals(false, x, "getAndSet boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndSetAcquire(recv, false);
-            assertEquals(o, true, "getAndSetAcquire boolean");
+            assertEquals(true, o, "getAndSetAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "getAndSetAcquire boolean value");
+            assertEquals(false, x, "getAndSetAcquire boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndSetRelease(recv, false);
-            assertEquals(o, true, "getAndSetRelease boolean");
+            assertEquals(true, o, "getAndSetRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, false, "getAndSetRelease boolean value");
+            assertEquals(false, x, "getAndSetRelease boolean value");
         }
 
 
@@ -608,27 +606,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseOr(recv, false);
-            assertEquals(o, true, "getAndBitwiseOr boolean");
+            assertEquals(true, o, "getAndBitwiseOr boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOr boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOr boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseOrAcquire(recv, false);
-            assertEquals(o, true, "getAndBitwiseOrAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseOrAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrAcquire boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrAcquire boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseOrRelease(recv, false);
-            assertEquals(o, true, "getAndBitwiseOrRelease boolean");
+            assertEquals(true, o, "getAndBitwiseOrRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrRelease boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrRelease boolean value");
         }
 
         // get and bitwise and
@@ -636,27 +634,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseAnd(recv, false);
-            assertEquals(o, true, "getAndBitwiseAnd boolean");
+            assertEquals(true, o, "getAndBitwiseAnd boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAnd boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAnd boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseAndAcquire(recv, false);
-            assertEquals(o, true, "getAndBitwiseAndAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseAndAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndAcquire boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndAcquire boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseAndRelease(recv, false);
-            assertEquals(o, true, "getAndBitwiseAndRelease boolean");
+            assertEquals(true, o, "getAndBitwiseAndRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndRelease boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndRelease boolean value");
         }
 
         // get and bitwise xor
@@ -664,27 +662,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseXor(recv, false);
-            assertEquals(o, true, "getAndBitwiseXor boolean");
+            assertEquals(true, o, "getAndBitwiseXor boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXor boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXor boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseXorAcquire(recv, false);
-            assertEquals(o, true, "getAndBitwiseXorAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseXorAcquire boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorAcquire boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorAcquire boolean value");
         }
 
         {
             vh.set(recv, true);
 
             boolean o = (boolean) vh.getAndBitwiseXorRelease(recv, false);
-            assertEquals(o, true, "getAndBitwiseXorRelease boolean");
+            assertEquals(true, o, "getAndBitwiseXorRelease boolean");
             boolean x = (boolean) vh.get(recv);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorRelease boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorRelease boolean value");
         }
     }
 
@@ -710,7 +708,7 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         {
             vh.set(true);
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "set boolean value");
+            assertEquals(true, x, "set boolean value");
         }
 
 
@@ -718,21 +716,21 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
         {
             vh.setVolatile(false);
             boolean x = (boolean) vh.getVolatile();
-            assertEquals(x, false, "setVolatile boolean value");
+            assertEquals(false, x, "setVolatile boolean value");
         }
 
         // Lazy
         {
             vh.setRelease(true);
             boolean x = (boolean) vh.getAcquire();
-            assertEquals(x, true, "setRelease boolean value");
+            assertEquals(true, x, "setRelease boolean value");
         }
 
         // Opaque
         {
             vh.setOpaque(false);
             boolean x = (boolean) vh.getOpaque();
-            assertEquals(x, false, "setOpaque boolean value");
+            assertEquals(false, x, "setOpaque boolean value");
         }
 
         vh.set(true);
@@ -742,56 +740,56 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(true, false);
             assertEquals(r, true, "success compareAndSet boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "success compareAndSet boolean value");
+            assertEquals(false, x, "success compareAndSet boolean value");
         }
 
         {
             boolean r = vh.compareAndSet(true, false);
             assertEquals(r, false, "failing compareAndSet boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "failing compareAndSet boolean value");
+            assertEquals(false, x, "failing compareAndSet boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchange(false, true);
             assertEquals(r, false, "success compareAndExchange boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "success compareAndExchange boolean value");
+            assertEquals(true, x, "success compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchange(false, false);
             assertEquals(r, true, "failing compareAndExchange boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "failing compareAndExchange boolean value");
+            assertEquals(true, x, "failing compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeAcquire(true, false);
             assertEquals(r, true, "success compareAndExchangeAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "success compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeAcquire(true, false);
             assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "failing compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeRelease(false, true);
             assertEquals(r, false, "success compareAndExchangeRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "success compareAndExchangeRelease boolean value");
         }
 
         {
             boolean r = (boolean) vh.compareAndExchangeRelease(false, false);
             assertEquals(r, true, "failing compareAndExchangeRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "failing compareAndExchangeRelease boolean value");
         }
 
         {
@@ -802,14 +800,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "success weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "success weakCompareAndSetPlain boolean value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(true, false);
             assertEquals(success, false, "failing weakCompareAndSetPlain boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "failing weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetPlain boolean value");
         }
 
         {
@@ -820,14 +818,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "success weakCompareAndSetAcquire boolean");
+            assertEquals(true, x, "success weakCompareAndSetAcquire boolean");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(false, false);
             assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "failing weakCompareAndSetAcquire boolean value");
+            assertEquals(true, x, "failing weakCompareAndSetAcquire boolean value");
         }
 
         {
@@ -838,14 +836,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "success weakCompareAndSetRelease boolean");
+            assertEquals(false, x, "success weakCompareAndSetRelease boolean");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(true, false);
             assertEquals(success, false, "failing weakCompareAndSetRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "failing weakCompareAndSetRelease boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetRelease boolean value");
         }
 
         {
@@ -856,14 +854,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "success weakCompareAndSet boolean");
+            assertEquals(true, x, "success weakCompareAndSet boolean");
         }
 
         {
             boolean success = vh.weakCompareAndSet(false, false);
             assertEquals(success, false, "failing weakCompareAndSet boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, true, "failing weakCompareAndSet boolean value");
+            assertEquals(true, x, "failing weakCompareAndSet boolean value");
         }
 
         // Compare set and get
@@ -871,27 +869,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndSet(false);
-            assertEquals(o, true, "getAndSet boolean");
+            assertEquals(true, o, "getAndSet boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "getAndSet boolean value");
+            assertEquals(false, x, "getAndSet boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndSetAcquire(false);
-            assertEquals(o, true, "getAndSetAcquire boolean");
+            assertEquals(true, o, "getAndSetAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "getAndSetAcquire boolean value");
+            assertEquals(false, x, "getAndSetAcquire boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndSetRelease(false);
-            assertEquals(o, true, "getAndSetRelease boolean");
+            assertEquals(true, o, "getAndSetRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, false, "getAndSetRelease boolean value");
+            assertEquals(false, x, "getAndSetRelease boolean value");
         }
 
 
@@ -900,27 +898,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseOr(false);
-            assertEquals(o, true, "getAndBitwiseOr boolean");
+            assertEquals(true, o, "getAndBitwiseOr boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOr boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOr boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseOrAcquire(false);
-            assertEquals(o, true, "getAndBitwiseOrAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseOrAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrAcquire boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrAcquire boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseOrRelease(false);
-            assertEquals(o, true, "getAndBitwiseOrRelease boolean");
+            assertEquals(true, o, "getAndBitwiseOrRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrRelease boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrRelease boolean value");
         }
 
         // get and bitwise and
@@ -928,27 +926,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseAnd(false);
-            assertEquals(o, true, "getAndBitwiseAnd boolean");
+            assertEquals(true, o, "getAndBitwiseAnd boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAnd boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAnd boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseAndAcquire(false);
-            assertEquals(o, true, "getAndBitwiseAndAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseAndAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndAcquire boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndAcquire boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseAndRelease(false);
-            assertEquals(o, true, "getAndBitwiseAndRelease boolean");
+            assertEquals(true, o, "getAndBitwiseAndRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndRelease boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndRelease boolean value");
         }
 
         // get and bitwise xor
@@ -956,27 +954,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseXor(false);
-            assertEquals(o, true, "getAndBitwiseXor boolean");
+            assertEquals(true, o, "getAndBitwiseXor boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXor boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXor boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseXorAcquire(false);
-            assertEquals(o, true, "getAndBitwiseXorAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseXorAcquire boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorAcquire boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorAcquire boolean value");
         }
 
         {
             vh.set(true);
 
             boolean o = (boolean) vh.getAndBitwiseXorRelease(false);
-            assertEquals(o, true, "getAndBitwiseXorRelease boolean");
+            assertEquals(true, o, "getAndBitwiseXorRelease boolean");
             boolean x = (boolean) vh.get();
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorRelease boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorRelease boolean value");
         }
     }
 
@@ -1005,7 +1003,7 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             {
                 vh.set(array, i, true);
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "get boolean value");
+                assertEquals(true, x, "get boolean value");
             }
 
 
@@ -1013,21 +1011,21 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, false);
                 boolean x = (boolean) vh.getVolatile(array, i);
-                assertEquals(x, false, "setVolatile boolean value");
+                assertEquals(false, x, "setVolatile boolean value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, true);
                 boolean x = (boolean) vh.getAcquire(array, i);
-                assertEquals(x, true, "setRelease boolean value");
+                assertEquals(true, x, "setRelease boolean value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, false);
                 boolean x = (boolean) vh.getOpaque(array, i);
-                assertEquals(x, false, "setOpaque boolean value");
+                assertEquals(false, x, "setOpaque boolean value");
             }
 
             vh.set(array, i, true);
@@ -1037,56 +1035,56 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, true, false);
                 assertEquals(r, true, "success compareAndSet boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "success compareAndSet boolean value");
+                assertEquals(false, x, "success compareAndSet boolean value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, true, false);
                 assertEquals(r, false, "failing compareAndSet boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "failing compareAndSet boolean value");
+                assertEquals(false, x, "failing compareAndSet boolean value");
             }
 
             {
                 boolean r = (boolean) vh.compareAndExchange(array, i, false, true);
                 assertEquals(r, false, "success compareAndExchange boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "success compareAndExchange boolean value");
+                assertEquals(true, x, "success compareAndExchange boolean value");
             }
 
             {
                 boolean r = (boolean) vh.compareAndExchange(array, i, false, false);
                 assertEquals(r, true, "failing compareAndExchange boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "failing compareAndExchange boolean value");
+                assertEquals(true, x, "failing compareAndExchange boolean value");
             }
 
             {
                 boolean r = (boolean) vh.compareAndExchangeAcquire(array, i, true, false);
                 assertEquals(r, true, "success compareAndExchangeAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+                assertEquals(false, x, "success compareAndExchangeAcquire boolean value");
             }
 
             {
                 boolean r = (boolean) vh.compareAndExchangeAcquire(array, i, true, false);
                 assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+                assertEquals(false, x, "failing compareAndExchangeAcquire boolean value");
             }
 
             {
                 boolean r = (boolean) vh.compareAndExchangeRelease(array, i, false, true);
                 assertEquals(r, false, "success compareAndExchangeRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+                assertEquals(true, x, "success compareAndExchangeRelease boolean value");
             }
 
             {
                 boolean r = (boolean) vh.compareAndExchangeRelease(array, i, false, false);
                 assertEquals(r, true, "failing compareAndExchangeRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+                assertEquals(true, x, "failing compareAndExchangeRelease boolean value");
             }
 
             {
@@ -1097,14 +1095,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "success weakCompareAndSetPlain boolean value");
+                assertEquals(false, x, "success weakCompareAndSetPlain boolean value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, true, false);
                 assertEquals(success, false, "failing weakCompareAndSetPlain boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "failing weakCompareAndSetPlain boolean value");
+                assertEquals(false, x, "failing weakCompareAndSetPlain boolean value");
             }
 
             {
@@ -1115,14 +1113,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "success weakCompareAndSetAcquire boolean");
+                assertEquals(true, x, "success weakCompareAndSetAcquire boolean");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, false, false);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "failing weakCompareAndSetAcquire boolean value");
+                assertEquals(true, x, "failing weakCompareAndSetAcquire boolean value");
             }
 
             {
@@ -1133,14 +1131,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "success weakCompareAndSetRelease boolean");
+                assertEquals(false, x, "success weakCompareAndSetRelease boolean");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, true, false);
                 assertEquals(success, false, "failing weakCompareAndSetRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "failing weakCompareAndSetRelease boolean value");
+                assertEquals(false, x, "failing weakCompareAndSetRelease boolean value");
             }
 
             {
@@ -1151,14 +1149,14 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "success weakCompareAndSet boolean");
+                assertEquals(true, x, "success weakCompareAndSet boolean");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, false, false);
                 assertEquals(success, false, "failing weakCompareAndSet boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, true, "failing weakCompareAndSet boolean value");
+                assertEquals(true, x, "failing weakCompareAndSet boolean value");
             }
 
             // Compare set and get
@@ -1166,27 +1164,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndSet(array, i, false);
-                assertEquals(o, true, "getAndSet boolean");
+                assertEquals(true, o, "getAndSet boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "getAndSet boolean value");
+                assertEquals(false, x, "getAndSet boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndSetAcquire(array, i, false);
-                assertEquals(o, true, "getAndSetAcquire boolean");
+                assertEquals(true, o, "getAndSetAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "getAndSetAcquire boolean value");
+                assertEquals(false, x, "getAndSetAcquire boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndSetRelease(array, i, false);
-                assertEquals(o, true, "getAndSetRelease boolean");
+                assertEquals(true, o, "getAndSetRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, false, "getAndSetRelease boolean value");
+                assertEquals(false, x, "getAndSetRelease boolean value");
             }
 
 
@@ -1195,27 +1193,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseOr(array, i, false);
-                assertEquals(o, true, "getAndBitwiseOr boolean");
+                assertEquals(true, o, "getAndBitwiseOr boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true | false), "getAndBitwiseOr boolean value");
+                assertEquals((boolean)(true | false), x, "getAndBitwiseOr boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseOrAcquire(array, i, false);
-                assertEquals(o, true, "getAndBitwiseOrAcquire boolean");
+                assertEquals(true, o, "getAndBitwiseOrAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true | false), "getAndBitwiseOrAcquire boolean value");
+                assertEquals((boolean)(true | false), x, "getAndBitwiseOrAcquire boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseOrRelease(array, i, false);
-                assertEquals(o, true, "getAndBitwiseOrRelease boolean");
+                assertEquals(true, o, "getAndBitwiseOrRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true | false), "getAndBitwiseOrRelease boolean value");
+                assertEquals((boolean)(true | false), x, "getAndBitwiseOrRelease boolean value");
             }
 
             // get and bitwise and
@@ -1223,27 +1221,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseAnd(array, i, false);
-                assertEquals(o, true, "getAndBitwiseAnd boolean");
+                assertEquals(true, o, "getAndBitwiseAnd boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true & false), "getAndBitwiseAnd boolean value");
+                assertEquals((boolean)(true & false), x, "getAndBitwiseAnd boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseAndAcquire(array, i, false);
-                assertEquals(o, true, "getAndBitwiseAndAcquire boolean");
+                assertEquals(true, o, "getAndBitwiseAndAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true & false), "getAndBitwiseAndAcquire boolean value");
+                assertEquals((boolean)(true & false), x, "getAndBitwiseAndAcquire boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseAndRelease(array, i, false);
-                assertEquals(o, true, "getAndBitwiseAndRelease boolean");
+                assertEquals(true, o, "getAndBitwiseAndRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true & false), "getAndBitwiseAndRelease boolean value");
+                assertEquals((boolean)(true & false), x, "getAndBitwiseAndRelease boolean value");
             }
 
             // get and bitwise xor
@@ -1251,27 +1249,27 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseXor(array, i, false);
-                assertEquals(o, true, "getAndBitwiseXor boolean");
+                assertEquals(true, o, "getAndBitwiseXor boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXor boolean value");
+                assertEquals((boolean)(true ^ false), x, "getAndBitwiseXor boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseXorAcquire(array, i, false);
-                assertEquals(o, true, "getAndBitwiseXorAcquire boolean");
+                assertEquals(true, o, "getAndBitwiseXorAcquire boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorAcquire boolean value");
+                assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorAcquire boolean value");
             }
 
             {
                 vh.set(array, i, true);
 
                 boolean o = (boolean) vh.getAndBitwiseXorRelease(array, i, false);
-                assertEquals(o, true, "getAndBitwiseXorRelease boolean");
+                assertEquals(true, o, "getAndBitwiseXorRelease boolean");
                 boolean x = (boolean) vh.get(array, i);
-                assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorRelease boolean value");
+                assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorRelease boolean value");
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
index 5dc4bf2d1d5..42c465af75e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessByte
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessByte
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessByte
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessByte
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessByte
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessByte
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessByte
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessByte
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessByte extends VarHandleBaseTest {
     static final byte static_final_v = (byte)0x01;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessByte.class, "final_v", byte.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(byte[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessByte.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), byte.class);
+        assertEquals(byte.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         // Plain
         {
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "get byte value");
+            assertEquals((byte)0x01, x, "get byte value");
         }
 
 
         // Volatile
         {
             byte x = (byte) vh.getVolatile(recv);
-            assertEquals(x, (byte)0x01, "getVolatile byte value");
+            assertEquals((byte)0x01, x, "getVolatile byte value");
         }
 
         // Lazy
         {
             byte x = (byte) vh.getAcquire(recv);
-            assertEquals(x, (byte)0x01, "getRelease byte value");
+            assertEquals((byte)0x01, x, "getRelease byte value");
         }
 
         // Opaque
         {
             byte x = (byte) vh.getOpaque(recv);
-            assertEquals(x, (byte)0x01, "getOpaque byte value");
+            assertEquals((byte)0x01, x, "getOpaque byte value");
         }
     }
 
@@ -346,26 +344,26 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         // Plain
         {
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "get byte value");
+            assertEquals((byte)0x01, x, "get byte value");
         }
 
 
         // Volatile
         {
             byte x = (byte) vh.getVolatile();
-            assertEquals(x, (byte)0x01, "getVolatile byte value");
+            assertEquals((byte)0x01, x, "getVolatile byte value");
         }
 
         // Lazy
         {
             byte x = (byte) vh.getAcquire();
-            assertEquals(x, (byte)0x01, "getRelease byte value");
+            assertEquals((byte)0x01, x, "getRelease byte value");
         }
 
         // Opaque
         {
             byte x = (byte) vh.getOpaque();
-            assertEquals(x, (byte)0x01, "getOpaque byte value");
+            assertEquals((byte)0x01, x, "getOpaque byte value");
         }
     }
 
@@ -396,7 +394,7 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         {
             vh.set(recv, (byte)0x01);
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "set byte value");
+            assertEquals((byte)0x01, x, "set byte value");
         }
 
 
@@ -404,21 +402,21 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, (byte)0x23);
             byte x = (byte) vh.getVolatile(recv);
-            assertEquals(x, (byte)0x23, "setVolatile byte value");
+            assertEquals((byte)0x23, x, "setVolatile byte value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, (byte)0x01);
             byte x = (byte) vh.getAcquire(recv);
-            assertEquals(x, (byte)0x01, "setRelease byte value");
+            assertEquals((byte)0x01, x, "setRelease byte value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, (byte)0x23);
             byte x = (byte) vh.getOpaque(recv);
-            assertEquals(x, (byte)0x23, "setOpaque byte value");
+            assertEquals((byte)0x23, x, "setOpaque byte value");
         }
 
         vh.set(recv, (byte)0x01);
@@ -428,56 +426,56 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, (byte)0x01, (byte)0x23);
             assertEquals(r, true, "success compareAndSet byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "success compareAndSet byte value");
+            assertEquals((byte)0x23, x, "success compareAndSet byte value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, (byte)0x01, (byte)0x45);
             assertEquals(r, false, "failing compareAndSet byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "failing compareAndSet byte value");
+            assertEquals((byte)0x23, x, "failing compareAndSet byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchange(recv, (byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchange byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "success compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchange byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchange(recv, (byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchange byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "failing compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchange byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeAcquire(recv, (byte)0x01, (byte)0x23);
             assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "success compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeAcquire(recv, (byte)0x01, (byte)0x45);
             assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "failing compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeRelease(recv, (byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchangeRelease byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeRelease(recv, (byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchangeRelease byte value");
         }
 
         {
@@ -488,14 +486,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetPlain byte value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, (byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetPlain byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetPlain byte value");
         }
 
         {
@@ -506,14 +504,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "success weakCompareAndSetAcquire byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSetAcquire byte");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, (byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSetAcquire byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSetAcquire byte value");
         }
 
         {
@@ -524,14 +522,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetRelease byte");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetRelease byte");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, (byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetRelease byte value");
         }
 
         {
@@ -542,14 +540,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "success weakCompareAndSet byte value");
+            assertEquals((byte)0x01, x, "success weakCompareAndSet byte value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, (byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSet byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSet byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSet byte value");
         }
 
         // Compare set and get
@@ -557,27 +555,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndSet(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSet byte");
+            assertEquals((byte)0x01, o, "getAndSet byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "getAndSet byte value");
+            assertEquals((byte)0x23, x, "getAndSet byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndSetAcquire(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSetAcquire byte");
+            assertEquals((byte)0x01, o, "getAndSetAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "getAndSetAcquire byte value");
+            assertEquals((byte)0x23, x, "getAndSetAcquire byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndSetRelease(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSetRelease byte");
+            assertEquals((byte)0x01, o, "getAndSetRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)0x23, "getAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "getAndSetRelease byte value");
         }
 
         // get and add, add and get
@@ -585,27 +583,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndAdd(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAdd byte");
+            assertEquals((byte)0x01, o, "getAndAdd byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAdd byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndAddAcquire(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddAcquire byte");
+            assertEquals((byte)0x01, o, "getAndAddAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddAcquire byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddAcquire byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndAddRelease(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddReleasebyte");
+            assertEquals((byte)0x01, o, "getAndAddReleasebyte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddRelease byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddRelease byte value");
         }
 
         // get and bitwise or
@@ -613,27 +611,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseOr(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOr byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOr byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOr byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOr byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseOrAcquire(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrAcquire byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrAcquire byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseOrRelease(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrRelease byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrRelease byte value");
         }
 
         // get and bitwise and
@@ -641,27 +639,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseAnd(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAnd byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAnd byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAnd byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAnd byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseAndAcquire(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndAcquire byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndAcquire byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseAndRelease(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndRelease byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndRelease byte value");
         }
 
         // get and bitwise xor
@@ -669,27 +667,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseXor(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXor byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXor byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXor byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXor byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseXorAcquire(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorAcquire byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorAcquire byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorAcquire byte value");
         }
 
         {
             vh.set(recv, (byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseXorRelease(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorRelease byte");
             byte x = (byte) vh.get(recv);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorRelease byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorRelease byte value");
         }
     }
 
@@ -704,7 +702,7 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         {
             vh.set((byte)0x01);
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "set byte value");
+            assertEquals((byte)0x01, x, "set byte value");
         }
 
 
@@ -712,21 +710,21 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
         {
             vh.setVolatile((byte)0x23);
             byte x = (byte) vh.getVolatile();
-            assertEquals(x, (byte)0x23, "setVolatile byte value");
+            assertEquals((byte)0x23, x, "setVolatile byte value");
         }
 
         // Lazy
         {
             vh.setRelease((byte)0x01);
             byte x = (byte) vh.getAcquire();
-            assertEquals(x, (byte)0x01, "setRelease byte value");
+            assertEquals((byte)0x01, x, "setRelease byte value");
         }
 
         // Opaque
         {
             vh.setOpaque((byte)0x23);
             byte x = (byte) vh.getOpaque();
-            assertEquals(x, (byte)0x23, "setOpaque byte value");
+            assertEquals((byte)0x23, x, "setOpaque byte value");
         }
 
         vh.set((byte)0x01);
@@ -736,56 +734,56 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             boolean r = vh.compareAndSet((byte)0x01, (byte)0x23);
             assertEquals(r, true, "success compareAndSet byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "success compareAndSet byte value");
+            assertEquals((byte)0x23, x, "success compareAndSet byte value");
         }
 
         {
             boolean r = vh.compareAndSet((byte)0x01, (byte)0x45);
             assertEquals(r, false, "failing compareAndSet byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "failing compareAndSet byte value");
+            assertEquals((byte)0x23, x, "failing compareAndSet byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchange((byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchange byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "success compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchange byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchange((byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchange byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "failing compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchange byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeAcquire((byte)0x01, (byte)0x23);
             assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "success compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeAcquire((byte)0x01, (byte)0x45);
             assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "failing compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeRelease((byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchangeRelease byte value");
         }
 
         {
             byte r = (byte) vh.compareAndExchangeRelease((byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchangeRelease byte value");
         }
 
         {
@@ -796,14 +794,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetPlain byte value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain((byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetPlain byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetPlain byte value");
         }
 
         {
@@ -814,14 +812,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "success weakCompareAndSetAcquire byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSetAcquire byte");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire((byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSetAcquire byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSetAcquire byte value");
         }
 
         {
@@ -832,14 +830,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetRelease byte");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetRelease byte");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease((byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetRelease byte value");
         }
 
         {
@@ -850,14 +848,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "success weakCompareAndSet byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSet byte");
         }
 
         {
             boolean success = vh.weakCompareAndSet((byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSet byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSet byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSet byte value");
         }
 
         // Compare set and get
@@ -865,27 +863,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndSet((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSet byte");
+            assertEquals((byte)0x01, o, "getAndSet byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "getAndSet byte value");
+            assertEquals((byte)0x23, x, "getAndSet byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndSetAcquire((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSetAcquire byte");
+            assertEquals((byte)0x01, o, "getAndSetAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "getAndSetAcquire byte value");
+            assertEquals((byte)0x23, x, "getAndSetAcquire byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndSetRelease((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSetRelease byte");
+            assertEquals((byte)0x01, o, "getAndSetRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)0x23, "getAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "getAndSetRelease byte value");
         }
 
         // get and add, add and get
@@ -893,27 +891,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndAdd((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAdd byte");
+            assertEquals((byte)0x01, o, "getAndAdd byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAdd byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndAddAcquire((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddAcquire byte");
+            assertEquals((byte)0x01, o, "getAndAddAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddAcquire byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddAcquire byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndAddRelease((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddReleasebyte");
+            assertEquals((byte)0x01, o, "getAndAddReleasebyte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddRelease byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddRelease byte value");
         }
 
         // get and bitwise or
@@ -921,27 +919,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseOr((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOr byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOr byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOr byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOr byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseOrAcquire((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrAcquire byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrAcquire byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseOrRelease((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrRelease byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrRelease byte value");
         }
 
         // get and bitwise and
@@ -949,27 +947,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseAnd((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAnd byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAnd byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAnd byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAnd byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseAndAcquire((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndAcquire byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndAcquire byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseAndRelease((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndRelease byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndRelease byte value");
         }
 
         // get and bitwise xor
@@ -977,27 +975,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseXor((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXor byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXor byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXor byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXor byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseXorAcquire((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorAcquire byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorAcquire byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorAcquire byte value");
         }
 
         {
             vh.set((byte)0x01);
 
             byte o = (byte) vh.getAndBitwiseXorRelease((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorRelease byte");
             byte x = (byte) vh.get();
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorRelease byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorRelease byte value");
         }
     }
 
@@ -1015,7 +1013,7 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             {
                 vh.set(array, i, (byte)0x01);
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "get byte value");
+                assertEquals((byte)0x01, x, "get byte value");
             }
 
 
@@ -1023,21 +1021,21 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, (byte)0x23);
                 byte x = (byte) vh.getVolatile(array, i);
-                assertEquals(x, (byte)0x23, "setVolatile byte value");
+                assertEquals((byte)0x23, x, "setVolatile byte value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, (byte)0x01);
                 byte x = (byte) vh.getAcquire(array, i);
-                assertEquals(x, (byte)0x01, "setRelease byte value");
+                assertEquals((byte)0x01, x, "setRelease byte value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, (byte)0x23);
                 byte x = (byte) vh.getOpaque(array, i);
-                assertEquals(x, (byte)0x23, "setOpaque byte value");
+                assertEquals((byte)0x23, x, "setOpaque byte value");
             }
 
             vh.set(array, i, (byte)0x01);
@@ -1047,56 +1045,56 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, (byte)0x01, (byte)0x23);
                 assertEquals(r, true, "success compareAndSet byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "success compareAndSet byte value");
+                assertEquals((byte)0x23, x, "success compareAndSet byte value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(r, false, "failing compareAndSet byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "failing compareAndSet byte value");
+                assertEquals((byte)0x23, x, "failing compareAndSet byte value");
             }
 
             {
                 byte r = (byte) vh.compareAndExchange(array, i, (byte)0x23, (byte)0x01);
                 assertEquals(r, (byte)0x23, "success compareAndExchange byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "success compareAndExchange byte value");
+                assertEquals((byte)0x01, x, "success compareAndExchange byte value");
             }
 
             {
                 byte r = (byte) vh.compareAndExchange(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(r, (byte)0x01, "failing compareAndExchange byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "failing compareAndExchange byte value");
+                assertEquals((byte)0x01, x, "failing compareAndExchange byte value");
             }
 
             {
                 byte r = (byte) vh.compareAndExchangeAcquire(array, i, (byte)0x01, (byte)0x23);
                 assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value");
+                assertEquals((byte)0x23, x, "success compareAndExchangeAcquire byte value");
             }
 
             {
                 byte r = (byte) vh.compareAndExchangeAcquire(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value");
+                assertEquals((byte)0x23, x, "failing compareAndExchangeAcquire byte value");
             }
 
             {
                 byte r = (byte) vh.compareAndExchangeRelease(array, i, (byte)0x23, (byte)0x01);
                 assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value");
+                assertEquals((byte)0x01, x, "success compareAndExchangeRelease byte value");
             }
 
             {
                 byte r = (byte) vh.compareAndExchangeRelease(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value");
+                assertEquals((byte)0x01, x, "failing compareAndExchangeRelease byte value");
             }
 
             {
@@ -1107,14 +1105,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "success weakCompareAndSetPlain byte value");
+                assertEquals((byte)0x23, x, "success weakCompareAndSetPlain byte value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSetPlain byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "failing weakCompareAndSetPlain byte value");
+                assertEquals((byte)0x23, x, "failing weakCompareAndSetPlain byte value");
             }
 
             {
@@ -1125,14 +1123,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "success weakCompareAndSetAcquire byte");
+                assertEquals((byte)0x01, x, "success weakCompareAndSetAcquire byte");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "failing weakCompareAndSetAcquire byte value");
+                assertEquals((byte)0x01, x, "failing weakCompareAndSetAcquire byte value");
             }
 
             {
@@ -1143,14 +1141,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "success weakCompareAndSetRelease byte");
+                assertEquals((byte)0x23, x, "success weakCompareAndSetRelease byte");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSetRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "failing weakCompareAndSetRelease byte value");
+                assertEquals((byte)0x23, x, "failing weakCompareAndSetRelease byte value");
             }
 
             {
@@ -1161,14 +1159,14 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "success weakCompareAndSet byte");
+                assertEquals((byte)0x01, x, "success weakCompareAndSet byte");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSet byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x01, "failing weakCompareAndSet byte value");
+                assertEquals((byte)0x01, x, "failing weakCompareAndSet byte value");
             }
 
             // Compare set and get
@@ -1176,27 +1174,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndSet(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndSet byte");
+                assertEquals((byte)0x01, o, "getAndSet byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "getAndSet byte value");
+                assertEquals((byte)0x23, x, "getAndSet byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndSetAcquire(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndSetAcquire byte");
+                assertEquals((byte)0x01, o, "getAndSetAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "getAndSetAcquire byte value");
+                assertEquals((byte)0x23, x, "getAndSetAcquire byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndSetRelease(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndSetRelease byte");
+                assertEquals((byte)0x01, o, "getAndSetRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)0x23, "getAndSetRelease byte value");
+                assertEquals((byte)0x23, x, "getAndSetRelease byte value");
             }
 
             // get and add, add and get
@@ -1204,27 +1202,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndAdd(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndAdd byte");
+                assertEquals((byte)0x01, o, "getAndAdd byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte value");
+                assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAdd byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndAddAcquire(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndAddAcquire byte");
+                assertEquals((byte)0x01, o, "getAndAddAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddAcquire byte value");
+                assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddAcquire byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndAddRelease(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndAddReleasebyte");
+                assertEquals((byte)0x01, o, "getAndAddReleasebyte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddRelease byte value");
+                assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddRelease byte value");
             }
 
             // get and bitwise or
@@ -1232,27 +1230,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseOr(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseOr byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseOr byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOr byte value");
+                assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOr byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseOrAcquire(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseOrAcquire byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseOrAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrAcquire byte value");
+                assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrAcquire byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseOrRelease(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseOrRelease byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseOrRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrRelease byte value");
+                assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrRelease byte value");
             }
 
             // get and bitwise and
@@ -1260,27 +1258,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseAnd(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseAnd byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseAnd byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAnd byte value");
+                assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAnd byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseAndAcquire(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseAndAcquire byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseAndAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndAcquire byte value");
+                assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndAcquire byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseAndRelease(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseAndRelease byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseAndRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndRelease byte value");
+                assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndRelease byte value");
             }
 
             // get and bitwise xor
@@ -1288,27 +1286,27 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseXor(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseXor byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseXor byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXor byte value");
+                assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXor byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseXorAcquire(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseXorAcquire byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseXorAcquire byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorAcquire byte value");
+                assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorAcquire byte value");
             }
 
             {
                 vh.set(array, i, (byte)0x01);
 
                 byte o = (byte) vh.getAndBitwiseXorRelease(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndBitwiseXorRelease byte");
+                assertEquals((byte)0x01, o, "getAndBitwiseXorRelease byte");
                 byte x = (byte) vh.get(array, i);
-                assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorRelease byte value");
+                assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorRelease byte value");
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
index bafde057167..e17e7616609 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessChar
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessChar
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessChar
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessChar
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessChar
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessChar
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessChar
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessChar
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessChar extends VarHandleBaseTest {
     static final char static_final_v = '\u0123';
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessChar.class, "final_v", char.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(char[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessChar.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), char.class);
+        assertEquals(char.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         // Plain
         {
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "get char value");
+            assertEquals('\u0123', x, "get char value");
         }
 
 
         // Volatile
         {
             char x = (char) vh.getVolatile(recv);
-            assertEquals(x, '\u0123', "getVolatile char value");
+            assertEquals('\u0123', x, "getVolatile char value");
         }
 
         // Lazy
         {
             char x = (char) vh.getAcquire(recv);
-            assertEquals(x, '\u0123', "getRelease char value");
+            assertEquals('\u0123', x, "getRelease char value");
         }
 
         // Opaque
         {
             char x = (char) vh.getOpaque(recv);
-            assertEquals(x, '\u0123', "getOpaque char value");
+            assertEquals('\u0123', x, "getOpaque char value");
         }
     }
 
@@ -346,26 +344,26 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         // Plain
         {
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "get char value");
+            assertEquals('\u0123', x, "get char value");
         }
 
 
         // Volatile
         {
             char x = (char) vh.getVolatile();
-            assertEquals(x, '\u0123', "getVolatile char value");
+            assertEquals('\u0123', x, "getVolatile char value");
         }
 
         // Lazy
         {
             char x = (char) vh.getAcquire();
-            assertEquals(x, '\u0123', "getRelease char value");
+            assertEquals('\u0123', x, "getRelease char value");
         }
 
         // Opaque
         {
             char x = (char) vh.getOpaque();
-            assertEquals(x, '\u0123', "getOpaque char value");
+            assertEquals('\u0123', x, "getOpaque char value");
         }
     }
 
@@ -396,7 +394,7 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         {
             vh.set(recv, '\u0123');
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "set char value");
+            assertEquals('\u0123', x, "set char value");
         }
 
 
@@ -404,21 +402,21 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, '\u4567');
             char x = (char) vh.getVolatile(recv);
-            assertEquals(x, '\u4567', "setVolatile char value");
+            assertEquals('\u4567', x, "setVolatile char value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, '\u0123');
             char x = (char) vh.getAcquire(recv);
-            assertEquals(x, '\u0123', "setRelease char value");
+            assertEquals('\u0123', x, "setRelease char value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, '\u4567');
             char x = (char) vh.getOpaque(recv);
-            assertEquals(x, '\u4567', "setOpaque char value");
+            assertEquals('\u4567', x, "setOpaque char value");
         }
 
         vh.set(recv, '\u0123');
@@ -428,56 +426,56 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, '\u0123', '\u4567');
             assertEquals(r, true, "success compareAndSet char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "success compareAndSet char value");
+            assertEquals('\u4567', x, "success compareAndSet char value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, '\u0123', '\u89AB');
             assertEquals(r, false, "failing compareAndSet char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "failing compareAndSet char value");
+            assertEquals('\u4567', x, "failing compareAndSet char value");
         }
 
         {
             char r = (char) vh.compareAndExchange(recv, '\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchange char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "success compareAndExchange char value");
+            assertEquals('\u0123', x, "success compareAndExchange char value");
         }
 
         {
             char r = (char) vh.compareAndExchange(recv, '\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchange char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "failing compareAndExchange char value");
+            assertEquals('\u0123', x, "failing compareAndExchange char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeAcquire(recv, '\u0123', '\u4567');
             assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "success compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeAcquire(recv, '\u0123', '\u89AB');
             assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "failing compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeRelease(recv, '\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchangeRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "success compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "success compareAndExchangeRelease char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeRelease(recv, '\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchangeRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "failing compareAndExchangeRelease char value");
         }
 
         {
@@ -488,14 +486,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "success weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "success weakCompareAndSetPlain char value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, '\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetPlain char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "failing weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetPlain char value");
         }
 
         {
@@ -506,14 +504,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "success weakCompareAndSetAcquire char");
+            assertEquals('\u0123', x, "success weakCompareAndSetAcquire char");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, '\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "failing weakCompareAndSetAcquire char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSetAcquire char value");
         }
 
         {
@@ -524,14 +522,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "success weakCompareAndSetRelease char");
+            assertEquals('\u4567', x, "success weakCompareAndSetRelease char");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, '\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "failing weakCompareAndSetRelease char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetRelease char value");
         }
 
         {
@@ -542,14 +540,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "success weakCompareAndSet char value");
+            assertEquals('\u0123', x, "success weakCompareAndSet char value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, '\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSet char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u0123', "failing weakCompareAndSet char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSet char value");
         }
 
         // Compare set and get
@@ -557,27 +555,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndSet(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndSet char");
+            assertEquals('\u0123', o, "getAndSet char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "getAndSet char value");
+            assertEquals('\u4567', x, "getAndSet char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndSetAcquire(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndSetAcquire char");
+            assertEquals('\u0123', o, "getAndSetAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "getAndSetAcquire char value");
+            assertEquals('\u4567', x, "getAndSetAcquire char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndSetRelease(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndSetRelease char");
+            assertEquals('\u0123', o, "getAndSetRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, '\u4567', "getAndSetRelease char value");
+            assertEquals('\u4567', x, "getAndSetRelease char value");
         }
 
         // get and add, add and get
@@ -585,27 +583,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndAdd(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndAdd char");
+            assertEquals('\u0123', o, "getAndAdd char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAdd char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndAddAcquire(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndAddAcquire char");
+            assertEquals('\u0123', o, "getAndAddAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddAcquire char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddAcquire char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndAddRelease(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndAddReleasechar");
+            assertEquals('\u0123', o, "getAndAddReleasechar");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddRelease char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddRelease char value");
         }
 
         // get and bitwise or
@@ -613,27 +611,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseOr(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOr char");
+            assertEquals('\u0123', o, "getAndBitwiseOr char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOr char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOr char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseOrAcquire(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseOrAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrAcquire char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrAcquire char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseOrRelease(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseOrRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrRelease char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrRelease char value");
         }
 
         // get and bitwise and
@@ -641,27 +639,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseAnd(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAnd char");
+            assertEquals('\u0123', o, "getAndBitwiseAnd char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAnd char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAnd char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseAndAcquire(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseAndAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndAcquire char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndAcquire char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseAndRelease(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseAndRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndRelease char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndRelease char value");
         }
 
         // get and bitwise xor
@@ -669,27 +667,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseXor(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXor char");
+            assertEquals('\u0123', o, "getAndBitwiseXor char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXor char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXor char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseXorAcquire(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseXorAcquire char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorAcquire char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorAcquire char value");
         }
 
         {
             vh.set(recv, '\u0123');
 
             char o = (char) vh.getAndBitwiseXorRelease(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseXorRelease char");
             char x = (char) vh.get(recv);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorRelease char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorRelease char value");
         }
     }
 
@@ -704,7 +702,7 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         {
             vh.set('\u0123');
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "set char value");
+            assertEquals('\u0123', x, "set char value");
         }
 
 
@@ -712,21 +710,21 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
         {
             vh.setVolatile('\u4567');
             char x = (char) vh.getVolatile();
-            assertEquals(x, '\u4567', "setVolatile char value");
+            assertEquals('\u4567', x, "setVolatile char value");
         }
 
         // Lazy
         {
             vh.setRelease('\u0123');
             char x = (char) vh.getAcquire();
-            assertEquals(x, '\u0123', "setRelease char value");
+            assertEquals('\u0123', x, "setRelease char value");
         }
 
         // Opaque
         {
             vh.setOpaque('\u4567');
             char x = (char) vh.getOpaque();
-            assertEquals(x, '\u4567', "setOpaque char value");
+            assertEquals('\u4567', x, "setOpaque char value");
         }
 
         vh.set('\u0123');
@@ -736,56 +734,56 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             boolean r = vh.compareAndSet('\u0123', '\u4567');
             assertEquals(r, true, "success compareAndSet char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "success compareAndSet char value");
+            assertEquals('\u4567', x, "success compareAndSet char value");
         }
 
         {
             boolean r = vh.compareAndSet('\u0123', '\u89AB');
             assertEquals(r, false, "failing compareAndSet char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "failing compareAndSet char value");
+            assertEquals('\u4567', x, "failing compareAndSet char value");
         }
 
         {
             char r = (char) vh.compareAndExchange('\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchange char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "success compareAndExchange char value");
+            assertEquals('\u0123', x, "success compareAndExchange char value");
         }
 
         {
             char r = (char) vh.compareAndExchange('\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchange char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "failing compareAndExchange char value");
+            assertEquals('\u0123', x, "failing compareAndExchange char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeAcquire('\u0123', '\u4567');
             assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "success compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeAcquire('\u0123', '\u89AB');
             assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "failing compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeRelease('\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchangeRelease char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "success compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "success compareAndExchangeRelease char value");
         }
 
         {
             char r = (char) vh.compareAndExchangeRelease('\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchangeRelease char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "failing compareAndExchangeRelease char value");
         }
 
         {
@@ -796,14 +794,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "success weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "success weakCompareAndSetPlain char value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain('\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetPlain char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "failing weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetPlain char value");
         }
 
         {
@@ -814,14 +812,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "success weakCompareAndSetAcquire char");
+            assertEquals('\u0123', x, "success weakCompareAndSetAcquire char");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire('\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "failing weakCompareAndSetAcquire char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSetAcquire char value");
         }
 
         {
@@ -832,14 +830,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "success weakCompareAndSetRelease char");
+            assertEquals('\u4567', x, "success weakCompareAndSetRelease char");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease('\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetRelease char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "failing weakCompareAndSetRelease char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetRelease char value");
         }
 
         {
@@ -850,14 +848,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "success weakCompareAndSet char");
+            assertEquals('\u0123', x, "success weakCompareAndSet char");
         }
 
         {
             boolean success = vh.weakCompareAndSet('\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSet char");
             char x = (char) vh.get();
-            assertEquals(x, '\u0123', "failing weakCompareAndSet char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSet char value");
         }
 
         // Compare set and get
@@ -865,27 +863,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set('\u0123');
 
             char o = (char) vh.getAndSet('\u4567');
-            assertEquals(o, '\u0123', "getAndSet char");
+            assertEquals('\u0123', o, "getAndSet char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "getAndSet char value");
+            assertEquals('\u4567', x, "getAndSet char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndSetAcquire('\u4567');
-            assertEquals(o, '\u0123', "getAndSetAcquire char");
+            assertEquals('\u0123', o, "getAndSetAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "getAndSetAcquire char value");
+            assertEquals('\u4567', x, "getAndSetAcquire char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndSetRelease('\u4567');
-            assertEquals(o, '\u0123', "getAndSetRelease char");
+            assertEquals('\u0123', o, "getAndSetRelease char");
             char x = (char) vh.get();
-            assertEquals(x, '\u4567', "getAndSetRelease char value");
+            assertEquals('\u4567', x, "getAndSetRelease char value");
         }
 
         // get and add, add and get
@@ -893,27 +891,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set('\u0123');
 
             char o = (char) vh.getAndAdd('\u4567');
-            assertEquals(o, '\u0123', "getAndAdd char");
+            assertEquals('\u0123', o, "getAndAdd char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAdd char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndAddAcquire('\u4567');
-            assertEquals(o, '\u0123', "getAndAddAcquire char");
+            assertEquals('\u0123', o, "getAndAddAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddAcquire char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddAcquire char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndAddRelease('\u4567');
-            assertEquals(o, '\u0123', "getAndAddReleasechar");
+            assertEquals('\u0123', o, "getAndAddReleasechar");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddRelease char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddRelease char value");
         }
 
         // get and bitwise or
@@ -921,27 +919,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseOr('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOr char");
+            assertEquals('\u0123', o, "getAndBitwiseOr char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOr char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOr char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseOrAcquire('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseOrAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrAcquire char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrAcquire char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseOrRelease('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseOrRelease char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrRelease char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrRelease char value");
         }
 
         // get and bitwise and
@@ -949,27 +947,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseAnd('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAnd char");
+            assertEquals('\u0123', o, "getAndBitwiseAnd char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAnd char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAnd char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseAndAcquire('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseAndAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndAcquire char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndAcquire char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseAndRelease('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseAndRelease char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndRelease char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndRelease char value");
         }
 
         // get and bitwise xor
@@ -977,27 +975,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseXor('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXor char");
+            assertEquals('\u0123', o, "getAndBitwiseXor char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXor char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXor char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseXorAcquire('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseXorAcquire char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorAcquire char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorAcquire char value");
         }
 
         {
             vh.set('\u0123');
 
             char o = (char) vh.getAndBitwiseXorRelease('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseXorRelease char");
             char x = (char) vh.get();
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorRelease char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorRelease char value");
         }
     }
 
@@ -1015,7 +1013,7 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             {
                 vh.set(array, i, '\u0123');
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "get char value");
+                assertEquals('\u0123', x, "get char value");
             }
 
 
@@ -1023,21 +1021,21 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, '\u4567');
                 char x = (char) vh.getVolatile(array, i);
-                assertEquals(x, '\u4567', "setVolatile char value");
+                assertEquals('\u4567', x, "setVolatile char value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, '\u0123');
                 char x = (char) vh.getAcquire(array, i);
-                assertEquals(x, '\u0123', "setRelease char value");
+                assertEquals('\u0123', x, "setRelease char value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, '\u4567');
                 char x = (char) vh.getOpaque(array, i);
-                assertEquals(x, '\u4567', "setOpaque char value");
+                assertEquals('\u4567', x, "setOpaque char value");
             }
 
             vh.set(array, i, '\u0123');
@@ -1047,56 +1045,56 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, '\u0123', '\u4567');
                 assertEquals(r, true, "success compareAndSet char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "success compareAndSet char value");
+                assertEquals('\u4567', x, "success compareAndSet char value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, '\u0123', '\u89AB');
                 assertEquals(r, false, "failing compareAndSet char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "failing compareAndSet char value");
+                assertEquals('\u4567', x, "failing compareAndSet char value");
             }
 
             {
                 char r = (char) vh.compareAndExchange(array, i, '\u4567', '\u0123');
                 assertEquals(r, '\u4567', "success compareAndExchange char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "success compareAndExchange char value");
+                assertEquals('\u0123', x, "success compareAndExchange char value");
             }
 
             {
                 char r = (char) vh.compareAndExchange(array, i, '\u4567', '\u89AB');
                 assertEquals(r, '\u0123', "failing compareAndExchange char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "failing compareAndExchange char value");
+                assertEquals('\u0123', x, "failing compareAndExchange char value");
             }
 
             {
                 char r = (char) vh.compareAndExchangeAcquire(array, i, '\u0123', '\u4567');
                 assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value");
+                assertEquals('\u4567', x, "success compareAndExchangeAcquire char value");
             }
 
             {
                 char r = (char) vh.compareAndExchangeAcquire(array, i, '\u0123', '\u89AB');
                 assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value");
+                assertEquals('\u4567', x, "failing compareAndExchangeAcquire char value");
             }
 
             {
                 char r = (char) vh.compareAndExchangeRelease(array, i, '\u4567', '\u0123');
                 assertEquals(r, '\u4567', "success compareAndExchangeRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "success compareAndExchangeRelease char value");
+                assertEquals('\u0123', x, "success compareAndExchangeRelease char value");
             }
 
             {
                 char r = (char) vh.compareAndExchangeRelease(array, i, '\u4567', '\u89AB');
                 assertEquals(r, '\u0123', "failing compareAndExchangeRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value");
+                assertEquals('\u0123', x, "failing compareAndExchangeRelease char value");
             }
 
             {
@@ -1107,14 +1105,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "success weakCompareAndSetPlain char value");
+                assertEquals('\u4567', x, "success weakCompareAndSetPlain char value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, '\u0123', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSetPlain char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "failing weakCompareAndSetPlain char value");
+                assertEquals('\u4567', x, "failing weakCompareAndSetPlain char value");
             }
 
             {
@@ -1125,14 +1123,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "success weakCompareAndSetAcquire char");
+                assertEquals('\u0123', x, "success weakCompareAndSetAcquire char");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, '\u4567', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSetAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "failing weakCompareAndSetAcquire char value");
+                assertEquals('\u0123', x, "failing weakCompareAndSetAcquire char value");
             }
 
             {
@@ -1143,14 +1141,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "success weakCompareAndSetRelease char");
+                assertEquals('\u4567', x, "success weakCompareAndSetRelease char");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, '\u0123', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSetRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "failing weakCompareAndSetRelease char value");
+                assertEquals('\u4567', x, "failing weakCompareAndSetRelease char value");
             }
 
             {
@@ -1161,14 +1159,14 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "success weakCompareAndSet char");
+                assertEquals('\u0123', x, "success weakCompareAndSet char");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, '\u4567', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSet char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u0123', "failing weakCompareAndSet char value");
+                assertEquals('\u0123', x, "failing weakCompareAndSet char value");
             }
 
             // Compare set and get
@@ -1176,27 +1174,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndSet(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndSet char");
+                assertEquals('\u0123', o, "getAndSet char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "getAndSet char value");
+                assertEquals('\u4567', x, "getAndSet char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndSetAcquire(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndSetAcquire char");
+                assertEquals('\u0123', o, "getAndSetAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "getAndSetAcquire char value");
+                assertEquals('\u4567', x, "getAndSetAcquire char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndSetRelease(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndSetRelease char");
+                assertEquals('\u0123', o, "getAndSetRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, '\u4567', "getAndSetRelease char value");
+                assertEquals('\u4567', x, "getAndSetRelease char value");
             }
 
             // get and add, add and get
@@ -1204,27 +1202,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndAdd(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndAdd char");
+                assertEquals('\u0123', o, "getAndAdd char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char value");
+                assertEquals((char)('\u0123' + '\u4567'), x, "getAndAdd char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndAddAcquire(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndAddAcquire char");
+                assertEquals('\u0123', o, "getAndAddAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddAcquire char value");
+                assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddAcquire char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndAddRelease(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndAddReleasechar");
+                assertEquals('\u0123', o, "getAndAddReleasechar");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddRelease char value");
+                assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddRelease char value");
             }
 
             // get and bitwise or
@@ -1232,27 +1230,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseOr(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseOr char");
+                assertEquals('\u0123', o, "getAndBitwiseOr char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOr char value");
+                assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOr char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseOrAcquire(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseOrAcquire char");
+                assertEquals('\u0123', o, "getAndBitwiseOrAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrAcquire char value");
+                assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrAcquire char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseOrRelease(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseOrRelease char");
+                assertEquals('\u0123', o, "getAndBitwiseOrRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrRelease char value");
+                assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrRelease char value");
             }
 
             // get and bitwise and
@@ -1260,27 +1258,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseAnd(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseAnd char");
+                assertEquals('\u0123', o, "getAndBitwiseAnd char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAnd char value");
+                assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAnd char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseAndAcquire(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseAndAcquire char");
+                assertEquals('\u0123', o, "getAndBitwiseAndAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndAcquire char value");
+                assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndAcquire char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseAndRelease(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseAndRelease char");
+                assertEquals('\u0123', o, "getAndBitwiseAndRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndRelease char value");
+                assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndRelease char value");
             }
 
             // get and bitwise xor
@@ -1288,27 +1286,27 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseXor(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseXor char");
+                assertEquals('\u0123', o, "getAndBitwiseXor char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXor char value");
+                assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXor char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseXorAcquire(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseXorAcquire char");
+                assertEquals('\u0123', o, "getAndBitwiseXorAcquire char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorAcquire char value");
+                assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorAcquire char value");
             }
 
             {
                 vh.set(array, i, '\u0123');
 
                 char o = (char) vh.getAndBitwiseXorRelease(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndBitwiseXorRelease char");
+                assertEquals('\u0123', o, "getAndBitwiseXorRelease char");
                 char x = (char) vh.get(array, i);
-                assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorRelease char value");
+                assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorRelease char value");
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
index 0edb196076c..29fa6c2886d 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessDouble
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessDouble
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessDouble
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessDouble
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessDouble
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessDouble
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessDouble
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessDouble
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessDouble extends VarHandleBaseTest {
     static final double static_final_v = 1.0d;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessDouble.class, "final_v", double.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(double[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessDouble.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), double.class);
+        assertEquals(double.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         // Plain
         {
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "get double value");
+            assertEquals(1.0d, x, "get double value");
         }
 
 
         // Volatile
         {
             double x = (double) vh.getVolatile(recv);
-            assertEquals(x, 1.0d, "getVolatile double value");
+            assertEquals(1.0d, x, "getVolatile double value");
         }
 
         // Lazy
         {
             double x = (double) vh.getAcquire(recv);
-            assertEquals(x, 1.0d, "getRelease double value");
+            assertEquals(1.0d, x, "getRelease double value");
         }
 
         // Opaque
         {
             double x = (double) vh.getOpaque(recv);
-            assertEquals(x, 1.0d, "getOpaque double value");
+            assertEquals(1.0d, x, "getOpaque double value");
         }
     }
 
@@ -381,26 +379,26 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         // Plain
         {
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "get double value");
+            assertEquals(1.0d, x, "get double value");
         }
 
 
         // Volatile
         {
             double x = (double) vh.getVolatile();
-            assertEquals(x, 1.0d, "getVolatile double value");
+            assertEquals(1.0d, x, "getVolatile double value");
         }
 
         // Lazy
         {
             double x = (double) vh.getAcquire();
-            assertEquals(x, 1.0d, "getRelease double value");
+            assertEquals(1.0d, x, "getRelease double value");
         }
 
         // Opaque
         {
             double x = (double) vh.getOpaque();
-            assertEquals(x, 1.0d, "getOpaque double value");
+            assertEquals(1.0d, x, "getOpaque double value");
         }
     }
 
@@ -466,7 +464,7 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         {
             vh.set(recv, 1.0d);
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "set double value");
+            assertEquals(1.0d, x, "set double value");
         }
 
 
@@ -474,21 +472,21 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, 2.0d);
             double x = (double) vh.getVolatile(recv);
-            assertEquals(x, 2.0d, "setVolatile double value");
+            assertEquals(2.0d, x, "setVolatile double value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, 1.0d);
             double x = (double) vh.getAcquire(recv);
-            assertEquals(x, 1.0d, "setRelease double value");
+            assertEquals(1.0d, x, "setRelease double value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, 2.0d);
             double x = (double) vh.getOpaque(recv);
-            assertEquals(x, 2.0d, "setOpaque double value");
+            assertEquals(2.0d, x, "setOpaque double value");
         }
 
         vh.set(recv, 1.0d);
@@ -498,56 +496,56 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, 1.0d, 2.0d);
             assertEquals(r, true, "success compareAndSet double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "success compareAndSet double value");
+            assertEquals(2.0d, x, "success compareAndSet double value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, 1.0d, 3.0d);
             assertEquals(r, false, "failing compareAndSet double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "failing compareAndSet double value");
+            assertEquals(2.0d, x, "failing compareAndSet double value");
         }
 
         {
             double r = (double) vh.compareAndExchange(recv, 2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchange double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "success compareAndExchange double value");
+            assertEquals(1.0d, x, "success compareAndExchange double value");
         }
 
         {
             double r = (double) vh.compareAndExchange(recv, 2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchange double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "failing compareAndExchange double value");
+            assertEquals(1.0d, x, "failing compareAndExchange double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeAcquire(recv, 1.0d, 2.0d);
             assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "success compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeAcquire(recv, 1.0d, 3.0d);
             assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "failing compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeRelease(recv, 2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "success compareAndExchangeRelease double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeRelease(recv, 2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "failing compareAndExchangeRelease double value");
         }
 
         {
@@ -558,14 +556,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "success weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "success weakCompareAndSetPlain double value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, 1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetPlain double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "failing weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetPlain double value");
         }
 
         {
@@ -576,14 +574,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "success weakCompareAndSetAcquire double");
+            assertEquals(1.0d, x, "success weakCompareAndSetAcquire double");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, 2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetAcquire double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "failing weakCompareAndSetAcquire double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSetAcquire double value");
         }
 
         {
@@ -594,14 +592,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "success weakCompareAndSetRelease double");
+            assertEquals(2.0d, x, "success weakCompareAndSetRelease double");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, 1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetRelease double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "failing weakCompareAndSetRelease double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetRelease double value");
         }
 
         {
@@ -612,14 +610,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "success weakCompareAndSet double value");
+            assertEquals(1.0d, x, "success weakCompareAndSet double value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, 2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSet double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 1.0d, "failing weakCompareAndSet double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSet double value");
         }
 
         // Compare set and get
@@ -627,27 +625,27 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             vh.set(recv, 1.0d);
 
             double o = (double) vh.getAndSet(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndSet double");
+            assertEquals(1.0d, o, "getAndSet double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "getAndSet double value");
+            assertEquals(2.0d, x, "getAndSet double value");
         }
 
         {
             vh.set(recv, 1.0d);
 
             double o = (double) vh.getAndSetAcquire(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndSetAcquire double");
+            assertEquals(1.0d, o, "getAndSetAcquire double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "getAndSetAcquire double value");
+            assertEquals(2.0d, x, "getAndSetAcquire double value");
         }
 
         {
             vh.set(recv, 1.0d);
 
             double o = (double) vh.getAndSetRelease(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndSetRelease double");
+            assertEquals(1.0d, o, "getAndSetRelease double");
             double x = (double) vh.get(recv);
-            assertEquals(x, 2.0d, "getAndSetRelease double value");
+            assertEquals(2.0d, x, "getAndSetRelease double value");
         }
 
         // get and add, add and get
@@ -655,27 +653,27 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             vh.set(recv, 1.0d);
 
             double o = (double) vh.getAndAdd(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndAdd double");
+            assertEquals(1.0d, o, "getAndAdd double");
             double x = (double) vh.get(recv);
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAdd double value");
         }
 
         {
             vh.set(recv, 1.0d);
 
             double o = (double) vh.getAndAddAcquire(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndAddAcquire double");
+            assertEquals(1.0d, o, "getAndAddAcquire double");
             double x = (double) vh.get(recv);
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddAcquire double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddAcquire double value");
         }
 
         {
             vh.set(recv, 1.0d);
 
             double o = (double) vh.getAndAddRelease(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndAddReleasedouble");
+            assertEquals(1.0d, o, "getAndAddReleasedouble");
             double x = (double) vh.get(recv);
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddRelease double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddRelease double value");
         }
 
     }
@@ -726,7 +724,7 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         {
             vh.set(1.0d);
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "set double value");
+            assertEquals(1.0d, x, "set double value");
         }
 
 
@@ -734,21 +732,21 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
         {
             vh.setVolatile(2.0d);
             double x = (double) vh.getVolatile();
-            assertEquals(x, 2.0d, "setVolatile double value");
+            assertEquals(2.0d, x, "setVolatile double value");
         }
 
         // Lazy
         {
             vh.setRelease(1.0d);
             double x = (double) vh.getAcquire();
-            assertEquals(x, 1.0d, "setRelease double value");
+            assertEquals(1.0d, x, "setRelease double value");
         }
 
         // Opaque
         {
             vh.setOpaque(2.0d);
             double x = (double) vh.getOpaque();
-            assertEquals(x, 2.0d, "setOpaque double value");
+            assertEquals(2.0d, x, "setOpaque double value");
         }
 
         vh.set(1.0d);
@@ -758,56 +756,56 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(1.0d, 2.0d);
             assertEquals(r, true, "success compareAndSet double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "success compareAndSet double value");
+            assertEquals(2.0d, x, "success compareAndSet double value");
         }
 
         {
             boolean r = vh.compareAndSet(1.0d, 3.0d);
             assertEquals(r, false, "failing compareAndSet double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "failing compareAndSet double value");
+            assertEquals(2.0d, x, "failing compareAndSet double value");
         }
 
         {
             double r = (double) vh.compareAndExchange(2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchange double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "success compareAndExchange double value");
+            assertEquals(1.0d, x, "success compareAndExchange double value");
         }
 
         {
             double r = (double) vh.compareAndExchange(2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchange double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "failing compareAndExchange double value");
+            assertEquals(1.0d, x, "failing compareAndExchange double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeAcquire(1.0d, 2.0d);
             assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "success compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeAcquire(1.0d, 3.0d);
             assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "failing compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeRelease(2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "success compareAndExchangeRelease double value");
         }
 
         {
             double r = (double) vh.compareAndExchangeRelease(2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "failing compareAndExchangeRelease double value");
         }
 
         {
@@ -818,14 +816,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "success weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "success weakCompareAndSetPlain double value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetPlain double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "failing weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetPlain double value");
         }
 
         {
@@ -836,14 +834,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "success weakCompareAndSetAcquire double");
+            assertEquals(1.0d, x, "success weakCompareAndSetAcquire double");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetAcquire double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "failing weakCompareAndSetAcquire double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSetAcquire double value");
         }
 
         {
@@ -854,14 +852,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "success weakCompareAndSetRelease double");
+            assertEquals(2.0d, x, "success weakCompareAndSetRelease double");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetRelease double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "failing weakCompareAndSetRelease double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetRelease double value");
         }
 
         {
@@ -872,14 +870,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "success weakCompareAndSet double");
+            assertEquals(1.0d, x, "success weakCompareAndSet double");
         }
 
         {
             boolean success = vh.weakCompareAndSet(2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSet double");
             double x = (double) vh.get();
-            assertEquals(x, 1.0d, "failing weakCompareAndSet double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSet double value");
         }
 
         // Compare set and get
@@ -887,27 +885,27 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             vh.set(1.0d);
 
             double o = (double) vh.getAndSet(2.0d);
-            assertEquals(o, 1.0d, "getAndSet double");
+            assertEquals(1.0d, o, "getAndSet double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "getAndSet double value");
+            assertEquals(2.0d, x, "getAndSet double value");
         }
 
         {
             vh.set(1.0d);
 
             double o = (double) vh.getAndSetAcquire(2.0d);
-            assertEquals(o, 1.0d, "getAndSetAcquire double");
+            assertEquals(1.0d, o, "getAndSetAcquire double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "getAndSetAcquire double value");
+            assertEquals(2.0d, x, "getAndSetAcquire double value");
         }
 
         {
             vh.set(1.0d);
 
             double o = (double) vh.getAndSetRelease(2.0d);
-            assertEquals(o, 1.0d, "getAndSetRelease double");
+            assertEquals(1.0d, o, "getAndSetRelease double");
             double x = (double) vh.get();
-            assertEquals(x, 2.0d, "getAndSetRelease double value");
+            assertEquals(2.0d, x, "getAndSetRelease double value");
         }
 
         // get and add, add and get
@@ -915,27 +913,27 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             vh.set(1.0d);
 
             double o = (double) vh.getAndAdd(2.0d);
-            assertEquals(o, 1.0d, "getAndAdd double");
+            assertEquals(1.0d, o, "getAndAdd double");
             double x = (double) vh.get();
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAdd double value");
         }
 
         {
             vh.set(1.0d);
 
             double o = (double) vh.getAndAddAcquire(2.0d);
-            assertEquals(o, 1.0d, "getAndAddAcquire double");
+            assertEquals(1.0d, o, "getAndAddAcquire double");
             double x = (double) vh.get();
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddAcquire double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddAcquire double value");
         }
 
         {
             vh.set(1.0d);
 
             double o = (double) vh.getAndAddRelease(2.0d);
-            assertEquals(o, 1.0d, "getAndAddReleasedouble");
+            assertEquals(1.0d, o, "getAndAddReleasedouble");
             double x = (double) vh.get();
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddRelease double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddRelease double value");
         }
 
     }
@@ -989,7 +987,7 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             {
                 vh.set(array, i, 1.0d);
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "get double value");
+                assertEquals(1.0d, x, "get double value");
             }
 
 
@@ -997,21 +995,21 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, 2.0d);
                 double x = (double) vh.getVolatile(array, i);
-                assertEquals(x, 2.0d, "setVolatile double value");
+                assertEquals(2.0d, x, "setVolatile double value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, 1.0d);
                 double x = (double) vh.getAcquire(array, i);
-                assertEquals(x, 1.0d, "setRelease double value");
+                assertEquals(1.0d, x, "setRelease double value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, 2.0d);
                 double x = (double) vh.getOpaque(array, i);
-                assertEquals(x, 2.0d, "setOpaque double value");
+                assertEquals(2.0d, x, "setOpaque double value");
             }
 
             vh.set(array, i, 1.0d);
@@ -1021,56 +1019,56 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, 1.0d, 2.0d);
                 assertEquals(r, true, "success compareAndSet double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "success compareAndSet double value");
+                assertEquals(2.0d, x, "success compareAndSet double value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, 1.0d, 3.0d);
                 assertEquals(r, false, "failing compareAndSet double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "failing compareAndSet double value");
+                assertEquals(2.0d, x, "failing compareAndSet double value");
             }
 
             {
                 double r = (double) vh.compareAndExchange(array, i, 2.0d, 1.0d);
                 assertEquals(r, 2.0d, "success compareAndExchange double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "success compareAndExchange double value");
+                assertEquals(1.0d, x, "success compareAndExchange double value");
             }
 
             {
                 double r = (double) vh.compareAndExchange(array, i, 2.0d, 3.0d);
                 assertEquals(r, 1.0d, "failing compareAndExchange double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "failing compareAndExchange double value");
+                assertEquals(1.0d, x, "failing compareAndExchange double value");
             }
 
             {
                 double r = (double) vh.compareAndExchangeAcquire(array, i, 1.0d, 2.0d);
                 assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+                assertEquals(2.0d, x, "success compareAndExchangeAcquire double value");
             }
 
             {
                 double r = (double) vh.compareAndExchangeAcquire(array, i, 1.0d, 3.0d);
                 assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+                assertEquals(2.0d, x, "failing compareAndExchangeAcquire double value");
             }
 
             {
                 double r = (double) vh.compareAndExchangeRelease(array, i, 2.0d, 1.0d);
                 assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+                assertEquals(1.0d, x, "success compareAndExchangeRelease double value");
             }
 
             {
                 double r = (double) vh.compareAndExchangeRelease(array, i, 2.0d, 3.0d);
                 assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+                assertEquals(1.0d, x, "failing compareAndExchangeRelease double value");
             }
 
             {
@@ -1081,14 +1079,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "success weakCompareAndSetPlain double value");
+                assertEquals(2.0d, x, "success weakCompareAndSetPlain double value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, 1.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSetPlain double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "failing weakCompareAndSetPlain double value");
+                assertEquals(2.0d, x, "failing weakCompareAndSetPlain double value");
             }
 
             {
@@ -1099,14 +1097,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "success weakCompareAndSetAcquire double");
+                assertEquals(1.0d, x, "success weakCompareAndSetAcquire double");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, 2.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "failing weakCompareAndSetAcquire double value");
+                assertEquals(1.0d, x, "failing weakCompareAndSetAcquire double value");
             }
 
             {
@@ -1117,14 +1115,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "success weakCompareAndSetRelease double");
+                assertEquals(2.0d, x, "success weakCompareAndSetRelease double");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, 1.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSetRelease double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "failing weakCompareAndSetRelease double value");
+                assertEquals(2.0d, x, "failing weakCompareAndSetRelease double value");
             }
 
             {
@@ -1135,14 +1133,14 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "success weakCompareAndSet double");
+                assertEquals(1.0d, x, "success weakCompareAndSet double");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, 2.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSet double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 1.0d, "failing weakCompareAndSet double value");
+                assertEquals(1.0d, x, "failing weakCompareAndSet double value");
             }
 
             // Compare set and get
@@ -1150,27 +1148,27 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 vh.set(array, i, 1.0d);
 
                 double o = (double) vh.getAndSet(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndSet double");
+                assertEquals(1.0d, o, "getAndSet double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "getAndSet double value");
+                assertEquals(2.0d, x, "getAndSet double value");
             }
 
             {
                 vh.set(array, i, 1.0d);
 
                 double o = (double) vh.getAndSetAcquire(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndSetAcquire double");
+                assertEquals(1.0d, o, "getAndSetAcquire double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "getAndSetAcquire double value");
+                assertEquals(2.0d, x, "getAndSetAcquire double value");
             }
 
             {
                 vh.set(array, i, 1.0d);
 
                 double o = (double) vh.getAndSetRelease(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndSetRelease double");
+                assertEquals(1.0d, o, "getAndSetRelease double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, 2.0d, "getAndSetRelease double value");
+                assertEquals(2.0d, x, "getAndSetRelease double value");
             }
 
             // get and add, add and get
@@ -1178,27 +1176,27 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
                 vh.set(array, i, 1.0d);
 
                 double o = (double) vh.getAndAdd(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndAdd double");
+                assertEquals(1.0d, o, "getAndAdd double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double value");
+                assertEquals((double)(1.0d + 2.0d), x, "getAndAdd double value");
             }
 
             {
                 vh.set(array, i, 1.0d);
 
                 double o = (double) vh.getAndAddAcquire(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndAddAcquire double");
+                assertEquals(1.0d, o, "getAndAddAcquire double");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, (double)(1.0d + 2.0d), "getAndAddAcquire double value");
+                assertEquals((double)(1.0d + 2.0d), x, "getAndAddAcquire double value");
             }
 
             {
                 vh.set(array, i, 1.0d);
 
                 double o = (double) vh.getAndAddRelease(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndAddReleasedouble");
+                assertEquals(1.0d, o, "getAndAddReleasedouble");
                 double x = (double) vh.get(array, i);
-                assertEquals(x, (double)(1.0d + 2.0d), "getAndAddRelease double value");
+                assertEquals((double)(1.0d + 2.0d), x, "getAndAddRelease double value");
             }
 
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
index c77a8d68008..750a1bbc408 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessFloat
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessFloat
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessFloat
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessFloat
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessFloat
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessFloat
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessFloat
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessFloat
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessFloat extends VarHandleBaseTest {
     static final float static_final_v = 1.0f;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessFloat.class, "final_v", float.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(float[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessFloat.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), float.class);
+        assertEquals(float.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         // Plain
         {
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "get float value");
+            assertEquals(1.0f, x, "get float value");
         }
 
 
         // Volatile
         {
             float x = (float) vh.getVolatile(recv);
-            assertEquals(x, 1.0f, "getVolatile float value");
+            assertEquals(1.0f, x, "getVolatile float value");
         }
 
         // Lazy
         {
             float x = (float) vh.getAcquire(recv);
-            assertEquals(x, 1.0f, "getRelease float value");
+            assertEquals(1.0f, x, "getRelease float value");
         }
 
         // Opaque
         {
             float x = (float) vh.getOpaque(recv);
-            assertEquals(x, 1.0f, "getOpaque float value");
+            assertEquals(1.0f, x, "getOpaque float value");
         }
     }
 
@@ -381,26 +379,26 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         // Plain
         {
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "get float value");
+            assertEquals(1.0f, x, "get float value");
         }
 
 
         // Volatile
         {
             float x = (float) vh.getVolatile();
-            assertEquals(x, 1.0f, "getVolatile float value");
+            assertEquals(1.0f, x, "getVolatile float value");
         }
 
         // Lazy
         {
             float x = (float) vh.getAcquire();
-            assertEquals(x, 1.0f, "getRelease float value");
+            assertEquals(1.0f, x, "getRelease float value");
         }
 
         // Opaque
         {
             float x = (float) vh.getOpaque();
-            assertEquals(x, 1.0f, "getOpaque float value");
+            assertEquals(1.0f, x, "getOpaque float value");
         }
     }
 
@@ -466,7 +464,7 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         {
             vh.set(recv, 1.0f);
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "set float value");
+            assertEquals(1.0f, x, "set float value");
         }
 
 
@@ -474,21 +472,21 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, 2.0f);
             float x = (float) vh.getVolatile(recv);
-            assertEquals(x, 2.0f, "setVolatile float value");
+            assertEquals(2.0f, x, "setVolatile float value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, 1.0f);
             float x = (float) vh.getAcquire(recv);
-            assertEquals(x, 1.0f, "setRelease float value");
+            assertEquals(1.0f, x, "setRelease float value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, 2.0f);
             float x = (float) vh.getOpaque(recv);
-            assertEquals(x, 2.0f, "setOpaque float value");
+            assertEquals(2.0f, x, "setOpaque float value");
         }
 
         vh.set(recv, 1.0f);
@@ -498,56 +496,56 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, 1.0f, 2.0f);
             assertEquals(r, true, "success compareAndSet float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "success compareAndSet float value");
+            assertEquals(2.0f, x, "success compareAndSet float value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, 1.0f, 3.0f);
             assertEquals(r, false, "failing compareAndSet float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "failing compareAndSet float value");
+            assertEquals(2.0f, x, "failing compareAndSet float value");
         }
 
         {
             float r = (float) vh.compareAndExchange(recv, 2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchange float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "success compareAndExchange float value");
+            assertEquals(1.0f, x, "success compareAndExchange float value");
         }
 
         {
             float r = (float) vh.compareAndExchange(recv, 2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchange float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "failing compareAndExchange float value");
+            assertEquals(1.0f, x, "failing compareAndExchange float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeAcquire(recv, 1.0f, 2.0f);
             assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "success compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeAcquire(recv, 1.0f, 3.0f);
             assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "failing compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeRelease(recv, 2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "success compareAndExchangeRelease float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeRelease(recv, 2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "failing compareAndExchangeRelease float value");
         }
 
         {
@@ -558,14 +556,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "success weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "success weakCompareAndSetPlain float value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, 1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetPlain float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "failing weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetPlain float value");
         }
 
         {
@@ -576,14 +574,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "success weakCompareAndSetAcquire float");
+            assertEquals(1.0f, x, "success weakCompareAndSetAcquire float");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, 2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetAcquire float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "failing weakCompareAndSetAcquire float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSetAcquire float value");
         }
 
         {
@@ -594,14 +592,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "success weakCompareAndSetRelease float");
+            assertEquals(2.0f, x, "success weakCompareAndSetRelease float");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, 1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetRelease float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "failing weakCompareAndSetRelease float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetRelease float value");
         }
 
         {
@@ -612,14 +610,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "success weakCompareAndSet float value");
+            assertEquals(1.0f, x, "success weakCompareAndSet float value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, 2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSet float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 1.0f, "failing weakCompareAndSet float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSet float value");
         }
 
         // Compare set and get
@@ -627,27 +625,27 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             vh.set(recv, 1.0f);
 
             float o = (float) vh.getAndSet(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndSet float");
+            assertEquals(1.0f, o, "getAndSet float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "getAndSet float value");
+            assertEquals(2.0f, x, "getAndSet float value");
         }
 
         {
             vh.set(recv, 1.0f);
 
             float o = (float) vh.getAndSetAcquire(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndSetAcquire float");
+            assertEquals(1.0f, o, "getAndSetAcquire float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "getAndSetAcquire float value");
+            assertEquals(2.0f, x, "getAndSetAcquire float value");
         }
 
         {
             vh.set(recv, 1.0f);
 
             float o = (float) vh.getAndSetRelease(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndSetRelease float");
+            assertEquals(1.0f, o, "getAndSetRelease float");
             float x = (float) vh.get(recv);
-            assertEquals(x, 2.0f, "getAndSetRelease float value");
+            assertEquals(2.0f, x, "getAndSetRelease float value");
         }
 
         // get and add, add and get
@@ -655,27 +653,27 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             vh.set(recv, 1.0f);
 
             float o = (float) vh.getAndAdd(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndAdd float");
+            assertEquals(1.0f, o, "getAndAdd float");
             float x = (float) vh.get(recv);
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAdd float value");
         }
 
         {
             vh.set(recv, 1.0f);
 
             float o = (float) vh.getAndAddAcquire(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndAddAcquire float");
+            assertEquals(1.0f, o, "getAndAddAcquire float");
             float x = (float) vh.get(recv);
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddAcquire float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddAcquire float value");
         }
 
         {
             vh.set(recv, 1.0f);
 
             float o = (float) vh.getAndAddRelease(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndAddReleasefloat");
+            assertEquals(1.0f, o, "getAndAddReleasefloat");
             float x = (float) vh.get(recv);
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddRelease float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddRelease float value");
         }
 
     }
@@ -726,7 +724,7 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         {
             vh.set(1.0f);
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "set float value");
+            assertEquals(1.0f, x, "set float value");
         }
 
 
@@ -734,21 +732,21 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
         {
             vh.setVolatile(2.0f);
             float x = (float) vh.getVolatile();
-            assertEquals(x, 2.0f, "setVolatile float value");
+            assertEquals(2.0f, x, "setVolatile float value");
         }
 
         // Lazy
         {
             vh.setRelease(1.0f);
             float x = (float) vh.getAcquire();
-            assertEquals(x, 1.0f, "setRelease float value");
+            assertEquals(1.0f, x, "setRelease float value");
         }
 
         // Opaque
         {
             vh.setOpaque(2.0f);
             float x = (float) vh.getOpaque();
-            assertEquals(x, 2.0f, "setOpaque float value");
+            assertEquals(2.0f, x, "setOpaque float value");
         }
 
         vh.set(1.0f);
@@ -758,56 +756,56 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(1.0f, 2.0f);
             assertEquals(r, true, "success compareAndSet float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "success compareAndSet float value");
+            assertEquals(2.0f, x, "success compareAndSet float value");
         }
 
         {
             boolean r = vh.compareAndSet(1.0f, 3.0f);
             assertEquals(r, false, "failing compareAndSet float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "failing compareAndSet float value");
+            assertEquals(2.0f, x, "failing compareAndSet float value");
         }
 
         {
             float r = (float) vh.compareAndExchange(2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchange float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "success compareAndExchange float value");
+            assertEquals(1.0f, x, "success compareAndExchange float value");
         }
 
         {
             float r = (float) vh.compareAndExchange(2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchange float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "failing compareAndExchange float value");
+            assertEquals(1.0f, x, "failing compareAndExchange float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeAcquire(1.0f, 2.0f);
             assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "success compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeAcquire(1.0f, 3.0f);
             assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "failing compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeRelease(2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "success compareAndExchangeRelease float value");
         }
 
         {
             float r = (float) vh.compareAndExchangeRelease(2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "failing compareAndExchangeRelease float value");
         }
 
         {
@@ -818,14 +816,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "success weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "success weakCompareAndSetPlain float value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetPlain float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "failing weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetPlain float value");
         }
 
         {
@@ -836,14 +834,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "success weakCompareAndSetAcquire float");
+            assertEquals(1.0f, x, "success weakCompareAndSetAcquire float");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetAcquire float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "failing weakCompareAndSetAcquire float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSetAcquire float value");
         }
 
         {
@@ -854,14 +852,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "success weakCompareAndSetRelease float");
+            assertEquals(2.0f, x, "success weakCompareAndSetRelease float");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetRelease float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "failing weakCompareAndSetRelease float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetRelease float value");
         }
 
         {
@@ -872,14 +870,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "success weakCompareAndSet float");
+            assertEquals(1.0f, x, "success weakCompareAndSet float");
         }
 
         {
             boolean success = vh.weakCompareAndSet(2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSet float");
             float x = (float) vh.get();
-            assertEquals(x, 1.0f, "failing weakCompareAndSet float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSet float value");
         }
 
         // Compare set and get
@@ -887,27 +885,27 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             vh.set(1.0f);
 
             float o = (float) vh.getAndSet(2.0f);
-            assertEquals(o, 1.0f, "getAndSet float");
+            assertEquals(1.0f, o, "getAndSet float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "getAndSet float value");
+            assertEquals(2.0f, x, "getAndSet float value");
         }
 
         {
             vh.set(1.0f);
 
             float o = (float) vh.getAndSetAcquire(2.0f);
-            assertEquals(o, 1.0f, "getAndSetAcquire float");
+            assertEquals(1.0f, o, "getAndSetAcquire float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "getAndSetAcquire float value");
+            assertEquals(2.0f, x, "getAndSetAcquire float value");
         }
 
         {
             vh.set(1.0f);
 
             float o = (float) vh.getAndSetRelease(2.0f);
-            assertEquals(o, 1.0f, "getAndSetRelease float");
+            assertEquals(1.0f, o, "getAndSetRelease float");
             float x = (float) vh.get();
-            assertEquals(x, 2.0f, "getAndSetRelease float value");
+            assertEquals(2.0f, x, "getAndSetRelease float value");
         }
 
         // get and add, add and get
@@ -915,27 +913,27 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             vh.set(1.0f);
 
             float o = (float) vh.getAndAdd(2.0f);
-            assertEquals(o, 1.0f, "getAndAdd float");
+            assertEquals(1.0f, o, "getAndAdd float");
             float x = (float) vh.get();
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAdd float value");
         }
 
         {
             vh.set(1.0f);
 
             float o = (float) vh.getAndAddAcquire(2.0f);
-            assertEquals(o, 1.0f, "getAndAddAcquire float");
+            assertEquals(1.0f, o, "getAndAddAcquire float");
             float x = (float) vh.get();
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddAcquire float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddAcquire float value");
         }
 
         {
             vh.set(1.0f);
 
             float o = (float) vh.getAndAddRelease(2.0f);
-            assertEquals(o, 1.0f, "getAndAddReleasefloat");
+            assertEquals(1.0f, o, "getAndAddReleasefloat");
             float x = (float) vh.get();
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddRelease float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddRelease float value");
         }
 
     }
@@ -989,7 +987,7 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             {
                 vh.set(array, i, 1.0f);
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "get float value");
+                assertEquals(1.0f, x, "get float value");
             }
 
 
@@ -997,21 +995,21 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, 2.0f);
                 float x = (float) vh.getVolatile(array, i);
-                assertEquals(x, 2.0f, "setVolatile float value");
+                assertEquals(2.0f, x, "setVolatile float value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, 1.0f);
                 float x = (float) vh.getAcquire(array, i);
-                assertEquals(x, 1.0f, "setRelease float value");
+                assertEquals(1.0f, x, "setRelease float value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, 2.0f);
                 float x = (float) vh.getOpaque(array, i);
-                assertEquals(x, 2.0f, "setOpaque float value");
+                assertEquals(2.0f, x, "setOpaque float value");
             }
 
             vh.set(array, i, 1.0f);
@@ -1021,56 +1019,56 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, 1.0f, 2.0f);
                 assertEquals(r, true, "success compareAndSet float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "success compareAndSet float value");
+                assertEquals(2.0f, x, "success compareAndSet float value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, 1.0f, 3.0f);
                 assertEquals(r, false, "failing compareAndSet float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "failing compareAndSet float value");
+                assertEquals(2.0f, x, "failing compareAndSet float value");
             }
 
             {
                 float r = (float) vh.compareAndExchange(array, i, 2.0f, 1.0f);
                 assertEquals(r, 2.0f, "success compareAndExchange float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "success compareAndExchange float value");
+                assertEquals(1.0f, x, "success compareAndExchange float value");
             }
 
             {
                 float r = (float) vh.compareAndExchange(array, i, 2.0f, 3.0f);
                 assertEquals(r, 1.0f, "failing compareAndExchange float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "failing compareAndExchange float value");
+                assertEquals(1.0f, x, "failing compareAndExchange float value");
             }
 
             {
                 float r = (float) vh.compareAndExchangeAcquire(array, i, 1.0f, 2.0f);
                 assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+                assertEquals(2.0f, x, "success compareAndExchangeAcquire float value");
             }
 
             {
                 float r = (float) vh.compareAndExchangeAcquire(array, i, 1.0f, 3.0f);
                 assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+                assertEquals(2.0f, x, "failing compareAndExchangeAcquire float value");
             }
 
             {
                 float r = (float) vh.compareAndExchangeRelease(array, i, 2.0f, 1.0f);
                 assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+                assertEquals(1.0f, x, "success compareAndExchangeRelease float value");
             }
 
             {
                 float r = (float) vh.compareAndExchangeRelease(array, i, 2.0f, 3.0f);
                 assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+                assertEquals(1.0f, x, "failing compareAndExchangeRelease float value");
             }
 
             {
@@ -1081,14 +1079,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "success weakCompareAndSetPlain float value");
+                assertEquals(2.0f, x, "success weakCompareAndSetPlain float value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, 1.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSetPlain float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "failing weakCompareAndSetPlain float value");
+                assertEquals(2.0f, x, "failing weakCompareAndSetPlain float value");
             }
 
             {
@@ -1099,14 +1097,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "success weakCompareAndSetAcquire float");
+                assertEquals(1.0f, x, "success weakCompareAndSetAcquire float");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, 2.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "failing weakCompareAndSetAcquire float value");
+                assertEquals(1.0f, x, "failing weakCompareAndSetAcquire float value");
             }
 
             {
@@ -1117,14 +1115,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "success weakCompareAndSetRelease float");
+                assertEquals(2.0f, x, "success weakCompareAndSetRelease float");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, 1.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSetRelease float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "failing weakCompareAndSetRelease float value");
+                assertEquals(2.0f, x, "failing weakCompareAndSetRelease float value");
             }
 
             {
@@ -1135,14 +1133,14 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "success weakCompareAndSet float");
+                assertEquals(1.0f, x, "success weakCompareAndSet float");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, 2.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSet float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 1.0f, "failing weakCompareAndSet float value");
+                assertEquals(1.0f, x, "failing weakCompareAndSet float value");
             }
 
             // Compare set and get
@@ -1150,27 +1148,27 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 vh.set(array, i, 1.0f);
 
                 float o = (float) vh.getAndSet(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndSet float");
+                assertEquals(1.0f, o, "getAndSet float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "getAndSet float value");
+                assertEquals(2.0f, x, "getAndSet float value");
             }
 
             {
                 vh.set(array, i, 1.0f);
 
                 float o = (float) vh.getAndSetAcquire(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndSetAcquire float");
+                assertEquals(1.0f, o, "getAndSetAcquire float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "getAndSetAcquire float value");
+                assertEquals(2.0f, x, "getAndSetAcquire float value");
             }
 
             {
                 vh.set(array, i, 1.0f);
 
                 float o = (float) vh.getAndSetRelease(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndSetRelease float");
+                assertEquals(1.0f, o, "getAndSetRelease float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, 2.0f, "getAndSetRelease float value");
+                assertEquals(2.0f, x, "getAndSetRelease float value");
             }
 
             // get and add, add and get
@@ -1178,27 +1176,27 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
                 vh.set(array, i, 1.0f);
 
                 float o = (float) vh.getAndAdd(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndAdd float");
+                assertEquals(1.0f, o, "getAndAdd float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float value");
+                assertEquals((float)(1.0f + 2.0f), x, "getAndAdd float value");
             }
 
             {
                 vh.set(array, i, 1.0f);
 
                 float o = (float) vh.getAndAddAcquire(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndAddAcquire float");
+                assertEquals(1.0f, o, "getAndAddAcquire float");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, (float)(1.0f + 2.0f), "getAndAddAcquire float value");
+                assertEquals((float)(1.0f + 2.0f), x, "getAndAddAcquire float value");
             }
 
             {
                 vh.set(array, i, 1.0f);
 
                 float o = (float) vh.getAndAddRelease(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndAddReleasefloat");
+                assertEquals(1.0f, o, "getAndAddReleasefloat");
                 float x = (float) vh.get(array, i);
-                assertEquals(x, (float)(1.0f + 2.0f), "getAndAddRelease float value");
+                assertEquals((float)(1.0f + 2.0f), x, "getAndAddRelease float value");
             }
 
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
index d5dfaa4e1c6..4748d699555 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessInt
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessInt
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessInt
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessInt
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessInt
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessInt
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessInt
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessInt
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessInt extends VarHandleBaseTest {
     static final int static_final_v = 0x01234567;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessInt.class, "final_v", int.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(int[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessInt.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), int.class);
+        assertEquals(int.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         // Plain
         {
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "get int value");
+            assertEquals(0x01234567, x, "get int value");
         }
 
 
         // Volatile
         {
             int x = (int) vh.getVolatile(recv);
-            assertEquals(x, 0x01234567, "getVolatile int value");
+            assertEquals(0x01234567, x, "getVolatile int value");
         }
 
         // Lazy
         {
             int x = (int) vh.getAcquire(recv);
-            assertEquals(x, 0x01234567, "getRelease int value");
+            assertEquals(0x01234567, x, "getRelease int value");
         }
 
         // Opaque
         {
             int x = (int) vh.getOpaque(recv);
-            assertEquals(x, 0x01234567, "getOpaque int value");
+            assertEquals(0x01234567, x, "getOpaque int value");
         }
     }
 
@@ -346,26 +344,26 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         // Plain
         {
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "get int value");
+            assertEquals(0x01234567, x, "get int value");
         }
 
 
         // Volatile
         {
             int x = (int) vh.getVolatile();
-            assertEquals(x, 0x01234567, "getVolatile int value");
+            assertEquals(0x01234567, x, "getVolatile int value");
         }
 
         // Lazy
         {
             int x = (int) vh.getAcquire();
-            assertEquals(x, 0x01234567, "getRelease int value");
+            assertEquals(0x01234567, x, "getRelease int value");
         }
 
         // Opaque
         {
             int x = (int) vh.getOpaque();
-            assertEquals(x, 0x01234567, "getOpaque int value");
+            assertEquals(0x01234567, x, "getOpaque int value");
         }
     }
 
@@ -396,7 +394,7 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         {
             vh.set(recv, 0x01234567);
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "set int value");
+            assertEquals(0x01234567, x, "set int value");
         }
 
 
@@ -404,21 +402,21 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, 0x89ABCDEF);
             int x = (int) vh.getVolatile(recv);
-            assertEquals(x, 0x89ABCDEF, "setVolatile int value");
+            assertEquals(0x89ABCDEF, x, "setVolatile int value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, 0x01234567);
             int x = (int) vh.getAcquire(recv);
-            assertEquals(x, 0x01234567, "setRelease int value");
+            assertEquals(0x01234567, x, "setRelease int value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, 0x89ABCDEF);
             int x = (int) vh.getOpaque(recv);
-            assertEquals(x, 0x89ABCDEF, "setOpaque int value");
+            assertEquals(0x89ABCDEF, x, "setOpaque int value");
         }
 
         vh.set(recv, 0x01234567);
@@ -428,56 +426,56 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, 0x01234567, 0x89ABCDEF);
             assertEquals(r, true, "success compareAndSet int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "success compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndSet int value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(r, false, "failing compareAndSet int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "failing compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndSet int value");
         }
 
         {
             int r = (int) vh.compareAndExchange(recv, 0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchange int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "success compareAndExchange int value");
+            assertEquals(0x01234567, x, "success compareAndExchange int value");
         }
 
         {
             int r = (int) vh.compareAndExchange(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchange int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "failing compareAndExchange int value");
+            assertEquals(0x01234567, x, "failing compareAndExchange int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeAcquire(recv, 0x01234567, 0x89ABCDEF);
             assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeAcquire(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeRelease(recv, 0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "success compareAndExchangeRelease int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeRelease(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "failing compareAndExchangeRelease int value");
         }
 
         {
@@ -488,14 +486,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetPlain int value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetPlain int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetPlain int value");
         }
 
         {
@@ -506,14 +504,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "success weakCompareAndSetAcquire int");
+            assertEquals(0x01234567, x, "success weakCompareAndSetAcquire int");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "failing weakCompareAndSetAcquire int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSetAcquire int value");
         }
 
         {
@@ -524,14 +522,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetRelease int");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetRelease int");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetRelease int value");
         }
 
         {
@@ -542,14 +540,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "success weakCompareAndSet int value");
+            assertEquals(0x01234567, x, "success weakCompareAndSet int value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSet int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x01234567, "failing weakCompareAndSet int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSet int value");
         }
 
         // Compare set and get
@@ -557,27 +555,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndSet(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSet int");
+            assertEquals(0x01234567, o, "getAndSet int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "getAndSet int value");
+            assertEquals(0x89ABCDEF, x, "getAndSet int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndSetAcquire(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSetAcquire int");
+            assertEquals(0x01234567, o, "getAndSetAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "getAndSetAcquire int value");
+            assertEquals(0x89ABCDEF, x, "getAndSetAcquire int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndSetRelease(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSetRelease int");
+            assertEquals(0x01234567, o, "getAndSetRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, 0x89ABCDEF, "getAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "getAndSetRelease int value");
         }
 
         // get and add, add and get
@@ -585,27 +583,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndAdd(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAdd int");
+            assertEquals(0x01234567, o, "getAndAdd int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAdd int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndAddAcquire(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddAcquire int");
+            assertEquals(0x01234567, o, "getAndAddAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddAcquire int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddAcquire int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndAddRelease(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddReleaseint");
+            assertEquals(0x01234567, o, "getAndAddReleaseint");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddRelease int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddRelease int value");
         }
 
         // get and bitwise or
@@ -613,27 +611,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseOr(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOr int");
+            assertEquals(0x01234567, o, "getAndBitwiseOr int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOr int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOr int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseOrAcquire(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrAcquire int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrAcquire int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseOrRelease(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrRelease int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrRelease int value");
         }
 
         // get and bitwise and
@@ -641,27 +639,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseAnd(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAnd int");
+            assertEquals(0x01234567, o, "getAndBitwiseAnd int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAnd int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAnd int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseAndAcquire(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndAcquire int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndAcquire int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseAndRelease(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndRelease int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndRelease int value");
         }
 
         // get and bitwise xor
@@ -669,27 +667,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseXor(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXor int");
+            assertEquals(0x01234567, o, "getAndBitwiseXor int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXor int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXor int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseXorAcquire(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorAcquire int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorAcquire int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorAcquire int value");
         }
 
         {
             vh.set(recv, 0x01234567);
 
             int o = (int) vh.getAndBitwiseXorRelease(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorRelease int");
             int x = (int) vh.get(recv);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorRelease int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorRelease int value");
         }
     }
 
@@ -704,7 +702,7 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         {
             vh.set(0x01234567);
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "set int value");
+            assertEquals(0x01234567, x, "set int value");
         }
 
 
@@ -712,21 +710,21 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
         {
             vh.setVolatile(0x89ABCDEF);
             int x = (int) vh.getVolatile();
-            assertEquals(x, 0x89ABCDEF, "setVolatile int value");
+            assertEquals(0x89ABCDEF, x, "setVolatile int value");
         }
 
         // Lazy
         {
             vh.setRelease(0x01234567);
             int x = (int) vh.getAcquire();
-            assertEquals(x, 0x01234567, "setRelease int value");
+            assertEquals(0x01234567, x, "setRelease int value");
         }
 
         // Opaque
         {
             vh.setOpaque(0x89ABCDEF);
             int x = (int) vh.getOpaque();
-            assertEquals(x, 0x89ABCDEF, "setOpaque int value");
+            assertEquals(0x89ABCDEF, x, "setOpaque int value");
         }
 
         vh.set(0x01234567);
@@ -736,56 +734,56 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(0x01234567, 0x89ABCDEF);
             assertEquals(r, true, "success compareAndSet int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "success compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndSet int value");
         }
 
         {
             boolean r = vh.compareAndSet(0x01234567, 0xCAFEBABE);
             assertEquals(r, false, "failing compareAndSet int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "failing compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndSet int value");
         }
 
         {
             int r = (int) vh.compareAndExchange(0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchange int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "success compareAndExchange int value");
+            assertEquals(0x01234567, x, "success compareAndExchange int value");
         }
 
         {
             int r = (int) vh.compareAndExchange(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchange int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "failing compareAndExchange int value");
+            assertEquals(0x01234567, x, "failing compareAndExchange int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeAcquire(0x01234567, 0x89ABCDEF);
             assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeAcquire(0x01234567, 0xCAFEBABE);
             assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeRelease(0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "success compareAndExchangeRelease int value");
         }
 
         {
             int r = (int) vh.compareAndExchangeRelease(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "failing compareAndExchangeRelease int value");
         }
 
         {
@@ -796,14 +794,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetPlain int value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetPlain int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetPlain int value");
         }
 
         {
@@ -814,14 +812,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "success weakCompareAndSetAcquire int");
+            assertEquals(0x01234567, x, "success weakCompareAndSetAcquire int");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "failing weakCompareAndSetAcquire int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSetAcquire int value");
         }
 
         {
@@ -832,14 +830,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetRelease int");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetRelease int");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetRelease int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetRelease int value");
         }
 
         {
@@ -850,14 +848,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "success weakCompareAndSet int");
+            assertEquals(0x01234567, x, "success weakCompareAndSet int");
         }
 
         {
             boolean success = vh.weakCompareAndSet(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSet int");
             int x = (int) vh.get();
-            assertEquals(x, 0x01234567, "failing weakCompareAndSet int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSet int value");
         }
 
         // Compare set and get
@@ -865,27 +863,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndSet(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSet int");
+            assertEquals(0x01234567, o, "getAndSet int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "getAndSet int value");
+            assertEquals(0x89ABCDEF, x, "getAndSet int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndSetAcquire(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSetAcquire int");
+            assertEquals(0x01234567, o, "getAndSetAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "getAndSetAcquire int value");
+            assertEquals(0x89ABCDEF, x, "getAndSetAcquire int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndSetRelease(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSetRelease int");
+            assertEquals(0x01234567, o, "getAndSetRelease int");
             int x = (int) vh.get();
-            assertEquals(x, 0x89ABCDEF, "getAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "getAndSetRelease int value");
         }
 
         // get and add, add and get
@@ -893,27 +891,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndAdd(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAdd int");
+            assertEquals(0x01234567, o, "getAndAdd int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAdd int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndAddAcquire(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddAcquire int");
+            assertEquals(0x01234567, o, "getAndAddAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddAcquire int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddAcquire int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndAddRelease(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddReleaseint");
+            assertEquals(0x01234567, o, "getAndAddReleaseint");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddRelease int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddRelease int value");
         }
 
         // get and bitwise or
@@ -921,27 +919,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseOr(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOr int");
+            assertEquals(0x01234567, o, "getAndBitwiseOr int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOr int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOr int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseOrAcquire(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrAcquire int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrAcquire int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseOrRelease(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrRelease int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrRelease int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrRelease int value");
         }
 
         // get and bitwise and
@@ -949,27 +947,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseAnd(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAnd int");
+            assertEquals(0x01234567, o, "getAndBitwiseAnd int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAnd int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAnd int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseAndAcquire(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndAcquire int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndAcquire int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseAndRelease(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndRelease int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndRelease int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndRelease int value");
         }
 
         // get and bitwise xor
@@ -977,27 +975,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseXor(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXor int");
+            assertEquals(0x01234567, o, "getAndBitwiseXor int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXor int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXor int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseXorAcquire(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorAcquire int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorAcquire int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorAcquire int value");
         }
 
         {
             vh.set(0x01234567);
 
             int o = (int) vh.getAndBitwiseXorRelease(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorRelease int");
             int x = (int) vh.get();
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorRelease int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorRelease int value");
         }
     }
 
@@ -1015,7 +1013,7 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             {
                 vh.set(array, i, 0x01234567);
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "get int value");
+                assertEquals(0x01234567, x, "get int value");
             }
 
 
@@ -1023,21 +1021,21 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, 0x89ABCDEF);
                 int x = (int) vh.getVolatile(array, i);
-                assertEquals(x, 0x89ABCDEF, "setVolatile int value");
+                assertEquals(0x89ABCDEF, x, "setVolatile int value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, 0x01234567);
                 int x = (int) vh.getAcquire(array, i);
-                assertEquals(x, 0x01234567, "setRelease int value");
+                assertEquals(0x01234567, x, "setRelease int value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, 0x89ABCDEF);
                 int x = (int) vh.getOpaque(array, i);
-                assertEquals(x, 0x89ABCDEF, "setOpaque int value");
+                assertEquals(0x89ABCDEF, x, "setOpaque int value");
             }
 
             vh.set(array, i, 0x01234567);
@@ -1047,56 +1045,56 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, 0x01234567, 0x89ABCDEF);
                 assertEquals(r, true, "success compareAndSet int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "success compareAndSet int value");
+                assertEquals(0x89ABCDEF, x, "success compareAndSet int value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(r, false, "failing compareAndSet int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing compareAndSet int value");
+                assertEquals(0x89ABCDEF, x, "failing compareAndSet int value");
             }
 
             {
                 int r = (int) vh.compareAndExchange(array, i, 0x89ABCDEF, 0x01234567);
                 assertEquals(r, 0x89ABCDEF, "success compareAndExchange int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "success compareAndExchange int value");
+                assertEquals(0x01234567, x, "success compareAndExchange int value");
             }
 
             {
                 int r = (int) vh.compareAndExchange(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(r, 0x01234567, "failing compareAndExchange int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "failing compareAndExchange int value");
+                assertEquals(0x01234567, x, "failing compareAndExchange int value");
             }
 
             {
                 int r = (int) vh.compareAndExchangeAcquire(array, i, 0x01234567, 0x89ABCDEF);
                 assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value");
+                assertEquals(0x89ABCDEF, x, "success compareAndExchangeAcquire int value");
             }
 
             {
                 int r = (int) vh.compareAndExchangeAcquire(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value");
+                assertEquals(0x89ABCDEF, x, "failing compareAndExchangeAcquire int value");
             }
 
             {
                 int r = (int) vh.compareAndExchangeRelease(array, i, 0x89ABCDEF, 0x01234567);
                 assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value");
+                assertEquals(0x01234567, x, "success compareAndExchangeRelease int value");
             }
 
             {
                 int r = (int) vh.compareAndExchangeRelease(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value");
+                assertEquals(0x01234567, x, "failing compareAndExchangeRelease int value");
             }
 
             {
@@ -1107,14 +1105,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetPlain int value");
+                assertEquals(0x89ABCDEF, x, "success weakCompareAndSetPlain int value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSetPlain int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetPlain int value");
+                assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetPlain int value");
             }
 
             {
@@ -1125,14 +1123,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "success weakCompareAndSetAcquire int");
+                assertEquals(0x01234567, x, "success weakCompareAndSetAcquire int");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "failing weakCompareAndSetAcquire int value");
+                assertEquals(0x01234567, x, "failing weakCompareAndSetAcquire int value");
             }
 
             {
@@ -1143,14 +1141,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetRelease int");
+                assertEquals(0x89ABCDEF, x, "success weakCompareAndSetRelease int");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSetRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetRelease int value");
+                assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetRelease int value");
             }
 
             {
@@ -1161,14 +1159,14 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "success weakCompareAndSet int");
+                assertEquals(0x01234567, x, "success weakCompareAndSet int");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSet int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x01234567, "failing weakCompareAndSet int value");
+                assertEquals(0x01234567, x, "failing weakCompareAndSet int value");
             }
 
             // Compare set and get
@@ -1176,27 +1174,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndSet(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndSet int");
+                assertEquals(0x01234567, o, "getAndSet int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "getAndSet int value");
+                assertEquals(0x89ABCDEF, x, "getAndSet int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndSetAcquire(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndSetAcquire int");
+                assertEquals(0x01234567, o, "getAndSetAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "getAndSetAcquire int value");
+                assertEquals(0x89ABCDEF, x, "getAndSetAcquire int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndSetRelease(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndSetRelease int");
+                assertEquals(0x01234567, o, "getAndSetRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, 0x89ABCDEF, "getAndSetRelease int value");
+                assertEquals(0x89ABCDEF, x, "getAndSetRelease int value");
             }
 
             // get and add, add and get
@@ -1204,27 +1202,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndAdd(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndAdd int");
+                assertEquals(0x01234567, o, "getAndAdd int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int value");
+                assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAdd int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndAddAcquire(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndAddAcquire int");
+                assertEquals(0x01234567, o, "getAndAddAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddAcquire int value");
+                assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddAcquire int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndAddRelease(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndAddReleaseint");
+                assertEquals(0x01234567, o, "getAndAddReleaseint");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddRelease int value");
+                assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddRelease int value");
             }
 
             // get and bitwise or
@@ -1232,27 +1230,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseOr(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseOr int");
+                assertEquals(0x01234567, o, "getAndBitwiseOr int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOr int value");
+                assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOr int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseOrAcquire(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseOrAcquire int");
+                assertEquals(0x01234567, o, "getAndBitwiseOrAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrAcquire int value");
+                assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrAcquire int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseOrRelease(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseOrRelease int");
+                assertEquals(0x01234567, o, "getAndBitwiseOrRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrRelease int value");
+                assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrRelease int value");
             }
 
             // get and bitwise and
@@ -1260,27 +1258,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseAnd(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseAnd int");
+                assertEquals(0x01234567, o, "getAndBitwiseAnd int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAnd int value");
+                assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAnd int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseAndAcquire(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseAndAcquire int");
+                assertEquals(0x01234567, o, "getAndBitwiseAndAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndAcquire int value");
+                assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndAcquire int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseAndRelease(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseAndRelease int");
+                assertEquals(0x01234567, o, "getAndBitwiseAndRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndRelease int value");
+                assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndRelease int value");
             }
 
             // get and bitwise xor
@@ -1288,27 +1286,27 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseXor(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseXor int");
+                assertEquals(0x01234567, o, "getAndBitwiseXor int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXor int value");
+                assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXor int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseXorAcquire(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseXorAcquire int");
+                assertEquals(0x01234567, o, "getAndBitwiseXorAcquire int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorAcquire int value");
+                assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorAcquire int value");
             }
 
             {
                 vh.set(array, i, 0x01234567);
 
                 int o = (int) vh.getAndBitwiseXorRelease(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndBitwiseXorRelease int");
+                assertEquals(0x01234567, o, "getAndBitwiseXorRelease int");
                 int x = (int) vh.get(array, i);
-                assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorRelease int value");
+                assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorRelease int value");
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
index e40256a8bd5..8bf997bb9a6 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessLong
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessLong
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessLong
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessLong
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessLong
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessLong
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessLong
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessLong
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessLong extends VarHandleBaseTest {
     static final long static_final_v = 0x0123456789ABCDEFL;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessLong.class, "final_v", long.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(long[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessLong.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), long.class);
+        assertEquals(long.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         // Plain
         {
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "get long value");
+            assertEquals(0x0123456789ABCDEFL, x, "get long value");
         }
 
 
         // Volatile
         {
             long x = (long) vh.getVolatile(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "getVolatile long value");
+            assertEquals(0x0123456789ABCDEFL, x, "getVolatile long value");
         }
 
         // Lazy
         {
             long x = (long) vh.getAcquire(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "getRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "getRelease long value");
         }
 
         // Opaque
         {
             long x = (long) vh.getOpaque(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "getOpaque long value");
+            assertEquals(0x0123456789ABCDEFL, x, "getOpaque long value");
         }
     }
 
@@ -346,26 +344,26 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         // Plain
         {
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "get long value");
+            assertEquals(0x0123456789ABCDEFL, x, "get long value");
         }
 
 
         // Volatile
         {
             long x = (long) vh.getVolatile();
-            assertEquals(x, 0x0123456789ABCDEFL, "getVolatile long value");
+            assertEquals(0x0123456789ABCDEFL, x, "getVolatile long value");
         }
 
         // Lazy
         {
             long x = (long) vh.getAcquire();
-            assertEquals(x, 0x0123456789ABCDEFL, "getRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "getRelease long value");
         }
 
         // Opaque
         {
             long x = (long) vh.getOpaque();
-            assertEquals(x, 0x0123456789ABCDEFL, "getOpaque long value");
+            assertEquals(0x0123456789ABCDEFL, x, "getOpaque long value");
         }
     }
 
@@ -396,7 +394,7 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         {
             vh.set(recv, 0x0123456789ABCDEFL);
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "set long value");
+            assertEquals(0x0123456789ABCDEFL, x, "set long value");
         }
 
 
@@ -404,21 +402,21 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, 0xCAFEBABECAFEBABEL);
             long x = (long) vh.getVolatile(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setVolatile long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setVolatile long value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, 0x0123456789ABCDEFL);
             long x = (long) vh.getAcquire(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "setRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "setRelease long value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, 0xCAFEBABECAFEBABEL);
             long x = (long) vh.getOpaque(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setOpaque long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setOpaque long value");
         }
 
         vh.set(recv, 0x0123456789ABCDEFL);
@@ -428,56 +426,56 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, true, "success compareAndSet long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndSet long value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, false, "failing compareAndSet long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndSet long value");
         }
 
         {
             long r = (long) vh.compareAndExchange(recv, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchange long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchange long value");
         }
 
         {
             long r = (long) vh.compareAndExchange(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchange long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchange long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeAcquire(recv, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeAcquire(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeRelease(recv, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchangeRelease long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeRelease(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchangeRelease long value");
         }
 
         {
@@ -488,14 +486,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetPlain long value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetPlain long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetPlain long value");
         }
 
         {
@@ -506,14 +504,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSetAcquire long");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetAcquire long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetAcquire long value");
         }
 
         {
@@ -524,14 +522,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetRelease long");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetRelease long");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetRelease long value");
         }
 
         {
@@ -542,14 +540,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSet long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSet long value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSet long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSet long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSet long value");
         }
 
         // Compare set and get
@@ -557,27 +555,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndSet(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSet long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSet long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSet long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndSetAcquire(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSetAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetAcquire long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndSetRelease(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSetRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSetRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetRelease long value");
         }
 
         // get and add, add and get
@@ -585,27 +583,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndAdd(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAdd long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAdd long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndAddAcquire(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddAcquire long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndAddRelease(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddReleaselong");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddReleaselong");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddRelease long value");
         }
 
         // get and bitwise or
@@ -613,27 +611,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseOr(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOr long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOr long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOr long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOr long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseOrAcquire(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrAcquire long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseOrRelease(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrRelease long value");
         }
 
         // get and bitwise and
@@ -641,27 +639,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseAnd(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAnd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAnd long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAnd long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAnd long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseAndAcquire(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndAcquire long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseAndRelease(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndRelease long value");
         }
 
         // get and bitwise xor
@@ -669,27 +667,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseXor(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXor long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXor long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXor long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXor long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseXorAcquire(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorAcquire long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorAcquire long value");
         }
 
         {
             vh.set(recv, 0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseXorRelease(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorRelease long");
             long x = (long) vh.get(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorRelease long value");
         }
     }
 
@@ -704,7 +702,7 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         {
             vh.set(0x0123456789ABCDEFL);
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "set long value");
+            assertEquals(0x0123456789ABCDEFL, x, "set long value");
         }
 
 
@@ -712,21 +710,21 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
         {
             vh.setVolatile(0xCAFEBABECAFEBABEL);
             long x = (long) vh.getVolatile();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setVolatile long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setVolatile long value");
         }
 
         // Lazy
         {
             vh.setRelease(0x0123456789ABCDEFL);
             long x = (long) vh.getAcquire();
-            assertEquals(x, 0x0123456789ABCDEFL, "setRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "setRelease long value");
         }
 
         // Opaque
         {
             vh.setOpaque(0xCAFEBABECAFEBABEL);
             long x = (long) vh.getOpaque();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setOpaque long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setOpaque long value");
         }
 
         vh.set(0x0123456789ABCDEFL);
@@ -736,56 +734,56 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, true, "success compareAndSet long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndSet long value");
         }
 
         {
             boolean r = vh.compareAndSet(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, false, "failing compareAndSet long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndSet long value");
         }
 
         {
             long r = (long) vh.compareAndExchange(0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchange long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchange long value");
         }
 
         {
             long r = (long) vh.compareAndExchange(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchange long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchange long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeAcquire(0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeAcquire(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeRelease(0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchangeRelease long value");
         }
 
         {
             long r = (long) vh.compareAndExchangeRelease(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchangeRelease long value");
         }
 
         {
@@ -796,14 +794,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetPlain long value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetPlain long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetPlain long value");
         }
 
         {
@@ -814,14 +812,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSetAcquire long");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetAcquire long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetAcquire long value");
         }
 
         {
@@ -832,14 +830,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetRelease long");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetRelease long");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetRelease long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetRelease long value");
         }
 
         {
@@ -850,14 +848,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSet long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSet long");
         }
 
         {
             boolean success = vh.weakCompareAndSet(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSet long");
             long x = (long) vh.get();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSet long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSet long value");
         }
 
         // Compare set and get
@@ -865,27 +863,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndSet(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSet long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSet long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSet long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndSetAcquire(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSetAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetAcquire long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndSetRelease(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSetRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSetRelease long");
             long x = (long) vh.get();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetRelease long value");
         }
 
         // get and add, add and get
@@ -893,27 +891,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndAdd(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAdd long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAdd long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndAddAcquire(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddAcquire long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndAddRelease(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddReleaselong");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddReleaselong");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddRelease long value");
         }
 
         // get and bitwise or
@@ -921,27 +919,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseOr(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOr long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOr long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOr long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOr long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseOrAcquire(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrAcquire long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseOrRelease(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrRelease long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrRelease long value");
         }
 
         // get and bitwise and
@@ -949,27 +947,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseAnd(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAnd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAnd long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAnd long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAnd long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseAndAcquire(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndAcquire long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseAndRelease(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndRelease long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndRelease long value");
         }
 
         // get and bitwise xor
@@ -977,27 +975,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseXor(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXor long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXor long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXor long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXor long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseXorAcquire(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorAcquire long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorAcquire long value");
         }
 
         {
             vh.set(0x0123456789ABCDEFL);
 
             long o = (long) vh.getAndBitwiseXorRelease(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorRelease long");
             long x = (long) vh.get();
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorRelease long value");
         }
     }
 
@@ -1015,7 +1013,7 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "get long value");
+                assertEquals(0x0123456789ABCDEFL, x, "get long value");
             }
 
 
@@ -1023,21 +1021,21 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, 0xCAFEBABECAFEBABEL);
                 long x = (long) vh.getVolatile(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "setVolatile long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "setVolatile long value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, 0x0123456789ABCDEFL);
                 long x = (long) vh.getAcquire(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "setRelease long value");
+                assertEquals(0x0123456789ABCDEFL, x, "setRelease long value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, 0xCAFEBABECAFEBABEL);
                 long x = (long) vh.getOpaque(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "setOpaque long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "setOpaque long value");
             }
 
             vh.set(array, i, 0x0123456789ABCDEFL);
@@ -1047,56 +1045,56 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
                 assertEquals(r, true, "success compareAndSet long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSet long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndSet long value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, false, "failing compareAndSet long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSet long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndSet long value");
             }
 
             {
                 long r = (long) vh.compareAndExchange(array, i, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
                 assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchange long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchange long value");
+                assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchange long value");
             }
 
             {
                 long r = (long) vh.compareAndExchange(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchange long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchange long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchange long value");
             }
 
             {
                 long r = (long) vh.compareAndExchangeAcquire(array, i, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
                 assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndExchangeAcquire long value");
             }
 
             {
                 long r = (long) vh.compareAndExchangeAcquire(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndExchangeAcquire long value");
             }
 
             {
                 long r = (long) vh.compareAndExchangeRelease(array, i, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
                 assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value");
+                assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchangeRelease long value");
             }
 
             {
                 long r = (long) vh.compareAndExchangeRelease(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchangeRelease long value");
             }
 
             {
@@ -1107,14 +1105,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetPlain long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetPlain long value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSetPlain long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetPlain long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetPlain long value");
             }
 
             {
@@ -1125,14 +1123,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSetAcquire long");
+                assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSetAcquire long");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetAcquire long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetAcquire long value");
             }
 
             {
@@ -1143,14 +1141,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetRelease long");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetRelease long");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSetRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetRelease long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetRelease long value");
             }
 
             {
@@ -1161,14 +1159,14 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSet long");
+                assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSet long");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSet long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSet long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSet long value");
             }
 
             // Compare set and get
@@ -1176,27 +1174,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndSet(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndSet long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndSet long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSet long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSet long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndSetAcquire(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndSetAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndSetAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetAcquire long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndSetRelease(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndSetRelease long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndSetRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetRelease long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetRelease long value");
             }
 
             // get and add, add and get
@@ -1204,27 +1202,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndAdd(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndAdd long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long value");
+                assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAdd long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndAddAcquire(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndAddAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndAddAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddAcquire long value");
+                assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddAcquire long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndAddRelease(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndAddReleaselong");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndAddReleaselong");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddRelease long value");
+                assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddRelease long value");
             }
 
             // get and bitwise or
@@ -1232,27 +1230,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseOr(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOr long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOr long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOr long value");
+                assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOr long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseOrAcquire(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrAcquire long value");
+                assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrAcquire long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseOrRelease(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrRelease long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrRelease long value");
+                assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrRelease long value");
             }
 
             // get and bitwise and
@@ -1260,27 +1258,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseAnd(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAnd long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAnd long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAnd long value");
+                assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAnd long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseAndAcquire(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndAcquire long value");
+                assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndAcquire long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseAndRelease(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndRelease long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndRelease long value");
+                assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndRelease long value");
             }
 
             // get and bitwise xor
@@ -1288,27 +1286,27 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseXor(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXor long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXor long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXor long value");
+                assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXor long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseXorAcquire(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorAcquire long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorAcquire long value");
+                assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorAcquire long value");
             }
 
             {
                 vh.set(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) vh.getAndBitwiseXorRelease(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorRelease long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorRelease long");
                 long x = (long) vh.get(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorRelease long value");
+                assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorRelease long value");
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java
index 3365bd923bc..61fc8a53fd0 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,32 +23,34 @@
 
 /*
  * @test
- * @run testng VarHandleTestAccessModeMethodNames
+ * @run junit VarHandleTestAccessModeMethodNames
  * @modules java.base/java.lang.invoke:open
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.VarHandle;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.stream.Stream;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessModeMethodNames {
 
-    @DataProvider
     public static Object[][] accessModesProvider() {
         return Stream.of(VarHandle.AccessMode.values()).
                 map(am -> new Object[]{am}).
                 toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessModesProvider")
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void testMethodName(VarHandle.AccessMode am) {
-        assertEquals(am.methodName(), toMethodName(am.name()));
+        assertEquals(toMethodName(am.name()), am.methodName());
     }
 
     private static String toMethodName(String name) {
@@ -62,9 +64,10 @@ public class VarHandleTestAccessModeMethodNames {
     }
 
 
-    @Test(dataProvider = "accessModesProvider")
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void testReturnType(VarHandle.AccessMode am) throws Exception {
-        assertEquals(getReturnType(am.methodName()), getAccessModeReturnType(am));
+        assertEquals(getAccessModeReturnType(am), getReturnType(am.methodName()));
     }
 
     private static Class<?> getReturnType(String name) throws Exception {
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
index b9daf4880a0..552672c7372 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessShort
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessShort
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessShort
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessShort
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessShort
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessShort
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessShort
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessShort
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessShort extends VarHandleBaseTest {
     static final short static_final_v = (short)0x0123;
 
@@ -108,7 +110,7 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessShort.class, "final_v", short.class);
@@ -125,8 +127,6 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(short[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -156,7 +156,8 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -194,8 +195,6 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessShort.class)});
@@ -205,16 +204,16 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), short.class);
+        assertEquals(short.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -241,8 +240,6 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -284,7 +281,8 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -297,26 +295,26 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         // Plain
         {
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "get short value");
+            assertEquals((short)0x0123, x, "get short value");
         }
 
 
         // Volatile
         {
             short x = (short) vh.getVolatile(recv);
-            assertEquals(x, (short)0x0123, "getVolatile short value");
+            assertEquals((short)0x0123, x, "getVolatile short value");
         }
 
         // Lazy
         {
             short x = (short) vh.getAcquire(recv);
-            assertEquals(x, (short)0x0123, "getRelease short value");
+            assertEquals((short)0x0123, x, "getRelease short value");
         }
 
         // Opaque
         {
             short x = (short) vh.getOpaque(recv);
-            assertEquals(x, (short)0x0123, "getOpaque short value");
+            assertEquals((short)0x0123, x, "getOpaque short value");
         }
     }
 
@@ -346,26 +344,26 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         // Plain
         {
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "get short value");
+            assertEquals((short)0x0123, x, "get short value");
         }
 
 
         // Volatile
         {
             short x = (short) vh.getVolatile();
-            assertEquals(x, (short)0x0123, "getVolatile short value");
+            assertEquals((short)0x0123, x, "getVolatile short value");
         }
 
         // Lazy
         {
             short x = (short) vh.getAcquire();
-            assertEquals(x, (short)0x0123, "getRelease short value");
+            assertEquals((short)0x0123, x, "getRelease short value");
         }
 
         // Opaque
         {
             short x = (short) vh.getOpaque();
-            assertEquals(x, (short)0x0123, "getOpaque short value");
+            assertEquals((short)0x0123, x, "getOpaque short value");
         }
     }
 
@@ -396,7 +394,7 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         {
             vh.set(recv, (short)0x0123);
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "set short value");
+            assertEquals((short)0x0123, x, "set short value");
         }
 
 
@@ -404,21 +402,21 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, (short)0x4567);
             short x = (short) vh.getVolatile(recv);
-            assertEquals(x, (short)0x4567, "setVolatile short value");
+            assertEquals((short)0x4567, x, "setVolatile short value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, (short)0x0123);
             short x = (short) vh.getAcquire(recv);
-            assertEquals(x, (short)0x0123, "setRelease short value");
+            assertEquals((short)0x0123, x, "setRelease short value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, (short)0x4567);
             short x = (short) vh.getOpaque(recv);
-            assertEquals(x, (short)0x4567, "setOpaque short value");
+            assertEquals((short)0x4567, x, "setOpaque short value");
         }
 
         vh.set(recv, (short)0x0123);
@@ -428,56 +426,56 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, (short)0x0123, (short)0x4567);
             assertEquals(r, true, "success compareAndSet short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "success compareAndSet short value");
+            assertEquals((short)0x4567, x, "success compareAndSet short value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, (short)0x0123, (short)0x89AB);
             assertEquals(r, false, "failing compareAndSet short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "failing compareAndSet short value");
+            assertEquals((short)0x4567, x, "failing compareAndSet short value");
         }
 
         {
             short r = (short) vh.compareAndExchange(recv, (short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchange short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "success compareAndExchange short value");
+            assertEquals((short)0x0123, x, "success compareAndExchange short value");
         }
 
         {
             short r = (short) vh.compareAndExchange(recv, (short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchange short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "failing compareAndExchange short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchange short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeAcquire(recv, (short)0x0123, (short)0x4567);
             assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "success compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeAcquire(recv, (short)0x0123, (short)0x89AB);
             assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "failing compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeRelease(recv, (short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "success compareAndExchangeRelease short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeRelease(recv, (short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchangeRelease short value");
         }
 
         {
@@ -488,14 +486,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetPlain short value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, (short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetPlain short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetPlain short value");
         }
 
         {
@@ -506,14 +504,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "success weakCompareAndSetAcquire short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSetAcquire short");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, (short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSetAcquire short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSetAcquire short value");
         }
 
         {
@@ -524,14 +522,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetRelease short");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetRelease short");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, (short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetRelease short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetRelease short value");
         }
 
         {
@@ -542,14 +540,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "success weakCompareAndSet short value");
+            assertEquals((short)0x0123, x, "success weakCompareAndSet short value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, (short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSet short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSet short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSet short value");
         }
 
         // Compare set and get
@@ -557,27 +555,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndSet(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSet short");
+            assertEquals((short)0x0123, o, "getAndSet short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "getAndSet short value");
+            assertEquals((short)0x4567, x, "getAndSet short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndSetAcquire(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSetAcquire short");
+            assertEquals((short)0x0123, o, "getAndSetAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "getAndSetAcquire short value");
+            assertEquals((short)0x4567, x, "getAndSetAcquire short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndSetRelease(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSetRelease short");
+            assertEquals((short)0x0123, o, "getAndSetRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)0x4567, "getAndSetRelease short value");
+            assertEquals((short)0x4567, x, "getAndSetRelease short value");
         }
 
         // get and add, add and get
@@ -585,27 +583,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndAdd(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAdd short");
+            assertEquals((short)0x0123, o, "getAndAdd short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAdd short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndAddAcquire(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddAcquire short");
+            assertEquals((short)0x0123, o, "getAndAddAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddAcquire short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddAcquire short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndAddRelease(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddReleaseshort");
+            assertEquals((short)0x0123, o, "getAndAddReleaseshort");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddRelease short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddRelease short value");
         }
 
         // get and bitwise or
@@ -613,27 +611,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseOr(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOr short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOr short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOr short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOr short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseOrAcquire(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrAcquire short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrAcquire short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseOrRelease(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrRelease short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrRelease short value");
         }
 
         // get and bitwise and
@@ -641,27 +639,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseAnd(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAnd short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAnd short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAnd short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAnd short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseAndAcquire(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndAcquire short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndAcquire short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseAndRelease(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndRelease short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndRelease short value");
         }
 
         // get and bitwise xor
@@ -669,27 +667,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseXor(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXor short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXor short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXor short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXor short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseXorAcquire(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorAcquire short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorAcquire short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorAcquire short value");
         }
 
         {
             vh.set(recv, (short)0x0123);
 
             short o = (short) vh.getAndBitwiseXorRelease(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorRelease short");
             short x = (short) vh.get(recv);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorRelease short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorRelease short value");
         }
     }
 
@@ -704,7 +702,7 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         {
             vh.set((short)0x0123);
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "set short value");
+            assertEquals((short)0x0123, x, "set short value");
         }
 
 
@@ -712,21 +710,21 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
         {
             vh.setVolatile((short)0x4567);
             short x = (short) vh.getVolatile();
-            assertEquals(x, (short)0x4567, "setVolatile short value");
+            assertEquals((short)0x4567, x, "setVolatile short value");
         }
 
         // Lazy
         {
             vh.setRelease((short)0x0123);
             short x = (short) vh.getAcquire();
-            assertEquals(x, (short)0x0123, "setRelease short value");
+            assertEquals((short)0x0123, x, "setRelease short value");
         }
 
         // Opaque
         {
             vh.setOpaque((short)0x4567);
             short x = (short) vh.getOpaque();
-            assertEquals(x, (short)0x4567, "setOpaque short value");
+            assertEquals((short)0x4567, x, "setOpaque short value");
         }
 
         vh.set((short)0x0123);
@@ -736,56 +734,56 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             boolean r = vh.compareAndSet((short)0x0123, (short)0x4567);
             assertEquals(r, true, "success compareAndSet short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "success compareAndSet short value");
+            assertEquals((short)0x4567, x, "success compareAndSet short value");
         }
 
         {
             boolean r = vh.compareAndSet((short)0x0123, (short)0x89AB);
             assertEquals(r, false, "failing compareAndSet short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "failing compareAndSet short value");
+            assertEquals((short)0x4567, x, "failing compareAndSet short value");
         }
 
         {
             short r = (short) vh.compareAndExchange((short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchange short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "success compareAndExchange short value");
+            assertEquals((short)0x0123, x, "success compareAndExchange short value");
         }
 
         {
             short r = (short) vh.compareAndExchange((short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchange short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "failing compareAndExchange short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchange short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeAcquire((short)0x0123, (short)0x4567);
             assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "success compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeAcquire((short)0x0123, (short)0x89AB);
             assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "failing compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeRelease((short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "success compareAndExchangeRelease short value");
         }
 
         {
             short r = (short) vh.compareAndExchangeRelease((short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchangeRelease short value");
         }
 
         {
@@ -796,14 +794,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetPlain short value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain((short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetPlain short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetPlain short value");
         }
 
         {
@@ -814,14 +812,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "success weakCompareAndSetAcquire short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSetAcquire short");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire((short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSetAcquire short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSetAcquire short value");
         }
 
         {
@@ -832,14 +830,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetRelease short");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetRelease short");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease((short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetRelease short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetRelease short value");
         }
 
         {
@@ -850,14 +848,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "success weakCompareAndSet short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSet short");
         }
 
         {
             boolean success = vh.weakCompareAndSet((short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSet short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSet short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSet short value");
         }
 
         // Compare set and get
@@ -865,27 +863,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndSet((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSet short");
+            assertEquals((short)0x0123, o, "getAndSet short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "getAndSet short value");
+            assertEquals((short)0x4567, x, "getAndSet short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndSetAcquire((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSetAcquire short");
+            assertEquals((short)0x0123, o, "getAndSetAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "getAndSetAcquire short value");
+            assertEquals((short)0x4567, x, "getAndSetAcquire short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndSetRelease((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSetRelease short");
+            assertEquals((short)0x0123, o, "getAndSetRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)0x4567, "getAndSetRelease short value");
+            assertEquals((short)0x4567, x, "getAndSetRelease short value");
         }
 
         // get and add, add and get
@@ -893,27 +891,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndAdd((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAdd short");
+            assertEquals((short)0x0123, o, "getAndAdd short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAdd short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndAddAcquire((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddAcquire short");
+            assertEquals((short)0x0123, o, "getAndAddAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddAcquire short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddAcquire short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndAddRelease((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddReleaseshort");
+            assertEquals((short)0x0123, o, "getAndAddReleaseshort");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddRelease short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddRelease short value");
         }
 
         // get and bitwise or
@@ -921,27 +919,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseOr((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOr short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOr short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOr short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOr short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseOrAcquire((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrAcquire short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrAcquire short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseOrRelease((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrRelease short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrRelease short value");
         }
 
         // get and bitwise and
@@ -949,27 +947,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseAnd((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAnd short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAnd short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAnd short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAnd short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseAndAcquire((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndAcquire short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndAcquire short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseAndRelease((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndRelease short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndRelease short value");
         }
 
         // get and bitwise xor
@@ -977,27 +975,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseXor((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXor short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXor short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXor short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXor short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseXorAcquire((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorAcquire short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorAcquire short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorAcquire short value");
         }
 
         {
             vh.set((short)0x0123);
 
             short o = (short) vh.getAndBitwiseXorRelease((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorRelease short");
             short x = (short) vh.get();
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorRelease short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorRelease short value");
         }
     }
 
@@ -1015,7 +1013,7 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             {
                 vh.set(array, i, (short)0x0123);
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "get short value");
+                assertEquals((short)0x0123, x, "get short value");
             }
 
 
@@ -1023,21 +1021,21 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, (short)0x4567);
                 short x = (short) vh.getVolatile(array, i);
-                assertEquals(x, (short)0x4567, "setVolatile short value");
+                assertEquals((short)0x4567, x, "setVolatile short value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, (short)0x0123);
                 short x = (short) vh.getAcquire(array, i);
-                assertEquals(x, (short)0x0123, "setRelease short value");
+                assertEquals((short)0x0123, x, "setRelease short value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, (short)0x4567);
                 short x = (short) vh.getOpaque(array, i);
-                assertEquals(x, (short)0x4567, "setOpaque short value");
+                assertEquals((short)0x4567, x, "setOpaque short value");
             }
 
             vh.set(array, i, (short)0x0123);
@@ -1047,56 +1045,56 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, (short)0x0123, (short)0x4567);
                 assertEquals(r, true, "success compareAndSet short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "success compareAndSet short value");
+                assertEquals((short)0x4567, x, "success compareAndSet short value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(r, false, "failing compareAndSet short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "failing compareAndSet short value");
+                assertEquals((short)0x4567, x, "failing compareAndSet short value");
             }
 
             {
                 short r = (short) vh.compareAndExchange(array, i, (short)0x4567, (short)0x0123);
                 assertEquals(r, (short)0x4567, "success compareAndExchange short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "success compareAndExchange short value");
+                assertEquals((short)0x0123, x, "success compareAndExchange short value");
             }
 
             {
                 short r = (short) vh.compareAndExchange(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(r, (short)0x0123, "failing compareAndExchange short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "failing compareAndExchange short value");
+                assertEquals((short)0x0123, x, "failing compareAndExchange short value");
             }
 
             {
                 short r = (short) vh.compareAndExchangeAcquire(array, i, (short)0x0123, (short)0x4567);
                 assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value");
+                assertEquals((short)0x4567, x, "success compareAndExchangeAcquire short value");
             }
 
             {
                 short r = (short) vh.compareAndExchangeAcquire(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value");
+                assertEquals((short)0x4567, x, "failing compareAndExchangeAcquire short value");
             }
 
             {
                 short r = (short) vh.compareAndExchangeRelease(array, i, (short)0x4567, (short)0x0123);
                 assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value");
+                assertEquals((short)0x0123, x, "success compareAndExchangeRelease short value");
             }
 
             {
                 short r = (short) vh.compareAndExchangeRelease(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value");
+                assertEquals((short)0x0123, x, "failing compareAndExchangeRelease short value");
             }
 
             {
@@ -1107,14 +1105,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "success weakCompareAndSetPlain short value");
+                assertEquals((short)0x4567, x, "success weakCompareAndSetPlain short value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSetPlain short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "failing weakCompareAndSetPlain short value");
+                assertEquals((short)0x4567, x, "failing weakCompareAndSetPlain short value");
             }
 
             {
@@ -1125,14 +1123,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "success weakCompareAndSetAcquire short");
+                assertEquals((short)0x0123, x, "success weakCompareAndSetAcquire short");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "failing weakCompareAndSetAcquire short value");
+                assertEquals((short)0x0123, x, "failing weakCompareAndSetAcquire short value");
             }
 
             {
@@ -1143,14 +1141,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "success weakCompareAndSetRelease short");
+                assertEquals((short)0x4567, x, "success weakCompareAndSetRelease short");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSetRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "failing weakCompareAndSetRelease short value");
+                assertEquals((short)0x4567, x, "failing weakCompareAndSetRelease short value");
             }
 
             {
@@ -1161,14 +1159,14 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "success weakCompareAndSet short");
+                assertEquals((short)0x0123, x, "success weakCompareAndSet short");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSet short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x0123, "failing weakCompareAndSet short value");
+                assertEquals((short)0x0123, x, "failing weakCompareAndSet short value");
             }
 
             // Compare set and get
@@ -1176,27 +1174,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndSet(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndSet short");
+                assertEquals((short)0x0123, o, "getAndSet short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "getAndSet short value");
+                assertEquals((short)0x4567, x, "getAndSet short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndSetAcquire(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndSetAcquire short");
+                assertEquals((short)0x0123, o, "getAndSetAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "getAndSetAcquire short value");
+                assertEquals((short)0x4567, x, "getAndSetAcquire short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndSetRelease(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndSetRelease short");
+                assertEquals((short)0x0123, o, "getAndSetRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)0x4567, "getAndSetRelease short value");
+                assertEquals((short)0x4567, x, "getAndSetRelease short value");
             }
 
             // get and add, add and get
@@ -1204,27 +1202,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndAdd(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndAdd short");
+                assertEquals((short)0x0123, o, "getAndAdd short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short value");
+                assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAdd short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndAddAcquire(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndAddAcquire short");
+                assertEquals((short)0x0123, o, "getAndAddAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddAcquire short value");
+                assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddAcquire short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndAddRelease(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndAddReleaseshort");
+                assertEquals((short)0x0123, o, "getAndAddReleaseshort");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddRelease short value");
+                assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddRelease short value");
             }
 
             // get and bitwise or
@@ -1232,27 +1230,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseOr(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseOr short");
+                assertEquals((short)0x0123, o, "getAndBitwiseOr short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOr short value");
+                assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOr short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseOrAcquire(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseOrAcquire short");
+                assertEquals((short)0x0123, o, "getAndBitwiseOrAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrAcquire short value");
+                assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrAcquire short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseOrRelease(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseOrRelease short");
+                assertEquals((short)0x0123, o, "getAndBitwiseOrRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrRelease short value");
+                assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrRelease short value");
             }
 
             // get and bitwise and
@@ -1260,27 +1258,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseAnd(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseAnd short");
+                assertEquals((short)0x0123, o, "getAndBitwiseAnd short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAnd short value");
+                assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAnd short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseAndAcquire(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseAndAcquire short");
+                assertEquals((short)0x0123, o, "getAndBitwiseAndAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndAcquire short value");
+                assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndAcquire short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseAndRelease(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseAndRelease short");
+                assertEquals((short)0x0123, o, "getAndBitwiseAndRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndRelease short value");
+                assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndRelease short value");
             }
 
             // get and bitwise xor
@@ -1288,27 +1286,27 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseXor(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseXor short");
+                assertEquals((short)0x0123, o, "getAndBitwiseXor short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXor short value");
+                assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXor short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseXorAcquire(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseXorAcquire short");
+                assertEquals((short)0x0123, o, "getAndBitwiseXorAcquire short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorAcquire short value");
+                assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorAcquire short value");
             }
 
             {
                 vh.set(array, i, (short)0x0123);
 
                 short o = (short) vh.getAndBitwiseXorRelease(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndBitwiseXorRelease short");
+                assertEquals((short)0x0123, o, "getAndBitwiseXorRelease short");
                 short x = (short) vh.get(array, i);
-                assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorRelease short value");
+                assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorRelease short value");
             }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
index 8bc30739660..d1a746ba80e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccessString
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccessString
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessString
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessString
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessString
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccessString
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccessString
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccessString
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccessString extends VarHandleBaseTest {
     static final String static_final_v = "foo";
 
@@ -109,7 +111,7 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccessString.class, "final_v", String.class);
@@ -127,8 +129,6 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         vhArrayObject = MethodHandles.arrayElementVarHandle(Object[].class);
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -158,7 +158,8 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -196,8 +197,6 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccessString.class)});
@@ -207,16 +206,16 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), String.class);
+        assertEquals(String.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -243,8 +242,6 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -291,7 +288,8 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -304,26 +302,26 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         // Plain
         {
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "get String value");
+            assertEquals("foo", x, "get String value");
         }
 
 
         // Volatile
         {
             String x = (String) vh.getVolatile(recv);
-            assertEquals(x, "foo", "getVolatile String value");
+            assertEquals("foo", x, "getVolatile String value");
         }
 
         // Lazy
         {
             String x = (String) vh.getAcquire(recv);
-            assertEquals(x, "foo", "getRelease String value");
+            assertEquals("foo", x, "getRelease String value");
         }
 
         // Opaque
         {
             String x = (String) vh.getOpaque(recv);
-            assertEquals(x, "foo", "getOpaque String value");
+            assertEquals("foo", x, "getOpaque String value");
         }
     }
 
@@ -399,26 +397,26 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         // Plain
         {
             String x = (String) vh.get();
-            assertEquals(x, "foo", "get String value");
+            assertEquals("foo", x, "get String value");
         }
 
 
         // Volatile
         {
             String x = (String) vh.getVolatile();
-            assertEquals(x, "foo", "getVolatile String value");
+            assertEquals("foo", x, "getVolatile String value");
         }
 
         // Lazy
         {
             String x = (String) vh.getAcquire();
-            assertEquals(x, "foo", "getRelease String value");
+            assertEquals("foo", x, "getRelease String value");
         }
 
         // Opaque
         {
             String x = (String) vh.getOpaque();
-            assertEquals(x, "foo", "getOpaque String value");
+            assertEquals("foo", x, "getOpaque String value");
         }
     }
 
@@ -495,7 +493,7 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         {
             vh.set(recv, "foo");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "set String value");
+            assertEquals("foo", x, "set String value");
         }
 
 
@@ -503,21 +501,21 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, "bar");
             String x = (String) vh.getVolatile(recv);
-            assertEquals(x, "bar", "setVolatile String value");
+            assertEquals("bar", x, "setVolatile String value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, "foo");
             String x = (String) vh.getAcquire(recv);
-            assertEquals(x, "foo", "setRelease String value");
+            assertEquals("foo", x, "setRelease String value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, "bar");
             String x = (String) vh.getOpaque(recv);
-            assertEquals(x, "bar", "setOpaque String value");
+            assertEquals("bar", x, "setOpaque String value");
         }
 
         vh.set(recv, "foo");
@@ -527,56 +525,56 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, "foo", "bar");
             assertEquals(r, true, "success compareAndSet String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "success compareAndSet String value");
+            assertEquals("bar", x, "success compareAndSet String value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, "foo", "baz");
             assertEquals(r, false, "failing compareAndSet String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "failing compareAndSet String value");
+            assertEquals("bar", x, "failing compareAndSet String value");
         }
 
         {
             String r = (String) vh.compareAndExchange(recv, "bar", "foo");
             assertEquals(r, "bar", "success compareAndExchange String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "success compareAndExchange String value");
+            assertEquals("foo", x, "success compareAndExchange String value");
         }
 
         {
             String r = (String) vh.compareAndExchange(recv, "bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchange String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "failing compareAndExchange String value");
+            assertEquals("foo", x, "failing compareAndExchange String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeAcquire(recv, "foo", "bar");
             assertEquals(r, "foo", "success compareAndExchangeAcquire String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "success compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "success compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeAcquire(recv, "foo", "baz");
             assertEquals(r, "bar", "failing compareAndExchangeAcquire String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "failing compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "failing compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeRelease(recv, "bar", "foo");
             assertEquals(r, "bar", "success compareAndExchangeRelease String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "success compareAndExchangeRelease String value");
+            assertEquals("foo", x, "success compareAndExchangeRelease String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeRelease(recv, "bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchangeRelease String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "failing compareAndExchangeRelease String value");
+            assertEquals("foo", x, "failing compareAndExchangeRelease String value");
         }
 
         {
@@ -587,14 +585,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "success weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "success weakCompareAndSetPlain String value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, "foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetPlain String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "failing weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "failing weakCompareAndSetPlain String value");
         }
 
         {
@@ -605,14 +603,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "success weakCompareAndSetAcquire String");
+            assertEquals("foo", x, "success weakCompareAndSetAcquire String");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, "bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSetAcquire String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "failing weakCompareAndSetAcquire String value");
+            assertEquals("foo", x, "failing weakCompareAndSetAcquire String value");
         }
 
         {
@@ -623,14 +621,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "success weakCompareAndSetRelease String");
+            assertEquals("bar", x, "success weakCompareAndSetRelease String");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, "foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetRelease String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "failing weakCompareAndSetRelease String value");
+            assertEquals("bar", x, "failing weakCompareAndSetRelease String value");
         }
 
         {
@@ -641,14 +639,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "success weakCompareAndSet String value");
+            assertEquals("foo", x, "success weakCompareAndSet String value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, "bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSet String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "foo", "failing weakCompareAndSet String value");
+            assertEquals("foo", x, "failing weakCompareAndSet String value");
         }
 
         // Compare set and get
@@ -656,27 +654,27 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             vh.set(recv, "foo");
 
             String o = (String) vh.getAndSet(recv, "bar");
-            assertEquals(o, "foo", "getAndSet String");
+            assertEquals("foo", o, "getAndSet String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "getAndSet String value");
+            assertEquals("bar", x, "getAndSet String value");
         }
 
         {
             vh.set(recv, "foo");
 
             String o = (String) vh.getAndSetAcquire(recv, "bar");
-            assertEquals(o, "foo", "getAndSetAcquire String");
+            assertEquals("foo", o, "getAndSetAcquire String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "getAndSetAcquire String value");
+            assertEquals("bar", x, "getAndSetAcquire String value");
         }
 
         {
             vh.set(recv, "foo");
 
             String o = (String) vh.getAndSetRelease(recv, "bar");
-            assertEquals(o, "foo", "getAndSetRelease String");
+            assertEquals("foo", o, "getAndSetRelease String");
             String x = (String) vh.get(recv);
-            assertEquals(x, "bar", "getAndSetRelease String value");
+            assertEquals("bar", x, "getAndSetRelease String value");
         }
 
 
@@ -739,7 +737,7 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         {
             vh.set("foo");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "set String value");
+            assertEquals("foo", x, "set String value");
         }
 
 
@@ -747,21 +745,21 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
         {
             vh.setVolatile("bar");
             String x = (String) vh.getVolatile();
-            assertEquals(x, "bar", "setVolatile String value");
+            assertEquals("bar", x, "setVolatile String value");
         }
 
         // Lazy
         {
             vh.setRelease("foo");
             String x = (String) vh.getAcquire();
-            assertEquals(x, "foo", "setRelease String value");
+            assertEquals("foo", x, "setRelease String value");
         }
 
         // Opaque
         {
             vh.setOpaque("bar");
             String x = (String) vh.getOpaque();
-            assertEquals(x, "bar", "setOpaque String value");
+            assertEquals("bar", x, "setOpaque String value");
         }
 
         vh.set("foo");
@@ -771,56 +769,56 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             boolean r = vh.compareAndSet("foo", "bar");
             assertEquals(r, true, "success compareAndSet String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "success compareAndSet String value");
+            assertEquals("bar", x, "success compareAndSet String value");
         }
 
         {
             boolean r = vh.compareAndSet("foo", "baz");
             assertEquals(r, false, "failing compareAndSet String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "failing compareAndSet String value");
+            assertEquals("bar", x, "failing compareAndSet String value");
         }
 
         {
             String r = (String) vh.compareAndExchange("bar", "foo");
             assertEquals(r, "bar", "success compareAndExchange String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "success compareAndExchange String value");
+            assertEquals("foo", x, "success compareAndExchange String value");
         }
 
         {
             String r = (String) vh.compareAndExchange("bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchange String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "failing compareAndExchange String value");
+            assertEquals("foo", x, "failing compareAndExchange String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeAcquire("foo", "bar");
             assertEquals(r, "foo", "success compareAndExchangeAcquire String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "success compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "success compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeAcquire("foo", "baz");
             assertEquals(r, "bar", "failing compareAndExchangeAcquire String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "failing compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "failing compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeRelease("bar", "foo");
             assertEquals(r, "bar", "success compareAndExchangeRelease String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "success compareAndExchangeRelease String value");
+            assertEquals("foo", x, "success compareAndExchangeRelease String value");
         }
 
         {
             String r = (String) vh.compareAndExchangeRelease("bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchangeRelease String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "failing compareAndExchangeRelease String value");
+            assertEquals("foo", x, "failing compareAndExchangeRelease String value");
         }
 
         {
@@ -831,14 +829,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "success weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "success weakCompareAndSetPlain String value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain("foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetPlain String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "failing weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "failing weakCompareAndSetPlain String value");
         }
 
         {
@@ -849,14 +847,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "success weakCompareAndSetAcquire String");
+            assertEquals("foo", x, "success weakCompareAndSetAcquire String");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire("bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSetAcquire String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "failing weakCompareAndSetAcquire String value");
+            assertEquals("foo", x, "failing weakCompareAndSetAcquire String value");
         }
 
         {
@@ -867,14 +865,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "success weakCompareAndSetRelease String");
+            assertEquals("bar", x, "success weakCompareAndSetRelease String");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease("foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetRelease String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "failing weakCompareAndSetRelease String value");
+            assertEquals("bar", x, "failing weakCompareAndSetRelease String value");
         }
 
         {
@@ -885,14 +883,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "success weakCompareAndSet String");
+            assertEquals("foo", x, "success weakCompareAndSet String");
         }
 
         {
             boolean success = vh.weakCompareAndSet("bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSet String");
             String x = (String) vh.get();
-            assertEquals(x, "foo", "failing weakCompareAndSet String value");
+            assertEquals("foo", x, "failing weakCompareAndSet String value");
         }
 
         // Compare set and get
@@ -900,27 +898,27 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             vh.set("foo");
 
             String o = (String) vh.getAndSet("bar");
-            assertEquals(o, "foo", "getAndSet String");
+            assertEquals("foo", o, "getAndSet String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "getAndSet String value");
+            assertEquals("bar", x, "getAndSet String value");
         }
 
         {
             vh.set("foo");
 
             String o = (String) vh.getAndSetAcquire("bar");
-            assertEquals(o, "foo", "getAndSetAcquire String");
+            assertEquals("foo", o, "getAndSetAcquire String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "getAndSetAcquire String value");
+            assertEquals("bar", x, "getAndSetAcquire String value");
         }
 
         {
             vh.set("foo");
 
             String o = (String) vh.getAndSetRelease("bar");
-            assertEquals(o, "foo", "getAndSetRelease String");
+            assertEquals("foo", o, "getAndSetRelease String");
             String x = (String) vh.get();
-            assertEquals(x, "bar", "getAndSetRelease String value");
+            assertEquals("bar", x, "getAndSetRelease String value");
         }
 
 
@@ -986,7 +984,7 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             {
                 vh.set(array, i, "foo");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "get String value");
+                assertEquals("foo", x, "get String value");
             }
 
 
@@ -994,21 +992,21 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, "bar");
                 String x = (String) vh.getVolatile(array, i);
-                assertEquals(x, "bar", "setVolatile String value");
+                assertEquals("bar", x, "setVolatile String value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, "foo");
                 String x = (String) vh.getAcquire(array, i);
-                assertEquals(x, "foo", "setRelease String value");
+                assertEquals("foo", x, "setRelease String value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, "bar");
                 String x = (String) vh.getOpaque(array, i);
-                assertEquals(x, "bar", "setOpaque String value");
+                assertEquals("bar", x, "setOpaque String value");
             }
 
             vh.set(array, i, "foo");
@@ -1018,56 +1016,56 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, "foo", "bar");
                 assertEquals(r, true, "success compareAndSet String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "success compareAndSet String value");
+                assertEquals("bar", x, "success compareAndSet String value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, "foo", "baz");
                 assertEquals(r, false, "failing compareAndSet String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "failing compareAndSet String value");
+                assertEquals("bar", x, "failing compareAndSet String value");
             }
 
             {
                 String r = (String) vh.compareAndExchange(array, i, "bar", "foo");
                 assertEquals(r, "bar", "success compareAndExchange String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "success compareAndExchange String value");
+                assertEquals("foo", x, "success compareAndExchange String value");
             }
 
             {
                 String r = (String) vh.compareAndExchange(array, i, "bar", "baz");
                 assertEquals(r, "foo", "failing compareAndExchange String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "failing compareAndExchange String value");
+                assertEquals("foo", x, "failing compareAndExchange String value");
             }
 
             {
                 String r = (String) vh.compareAndExchangeAcquire(array, i, "foo", "bar");
                 assertEquals(r, "foo", "success compareAndExchangeAcquire String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "success compareAndExchangeAcquire String value");
+                assertEquals("bar", x, "success compareAndExchangeAcquire String value");
             }
 
             {
                 String r = (String) vh.compareAndExchangeAcquire(array, i, "foo", "baz");
                 assertEquals(r, "bar", "failing compareAndExchangeAcquire String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "failing compareAndExchangeAcquire String value");
+                assertEquals("bar", x, "failing compareAndExchangeAcquire String value");
             }
 
             {
                 String r = (String) vh.compareAndExchangeRelease(array, i, "bar", "foo");
                 assertEquals(r, "bar", "success compareAndExchangeRelease String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "success compareAndExchangeRelease String value");
+                assertEquals("foo", x, "success compareAndExchangeRelease String value");
             }
 
             {
                 String r = (String) vh.compareAndExchangeRelease(array, i, "bar", "baz");
                 assertEquals(r, "foo", "failing compareAndExchangeRelease String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "failing compareAndExchangeRelease String value");
+                assertEquals("foo", x, "failing compareAndExchangeRelease String value");
             }
 
             {
@@ -1078,14 +1076,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "success weakCompareAndSetPlain String value");
+                assertEquals("bar", x, "success weakCompareAndSetPlain String value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, "foo", "baz");
                 assertEquals(success, false, "failing weakCompareAndSetPlain String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "failing weakCompareAndSetPlain String value");
+                assertEquals("bar", x, "failing weakCompareAndSetPlain String value");
             }
 
             {
@@ -1096,14 +1094,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "success weakCompareAndSetAcquire String");
+                assertEquals("foo", x, "success weakCompareAndSetAcquire String");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, "bar", "baz");
                 assertEquals(success, false, "failing weakCompareAndSetAcquire String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "failing weakCompareAndSetAcquire String value");
+                assertEquals("foo", x, "failing weakCompareAndSetAcquire String value");
             }
 
             {
@@ -1114,14 +1112,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "success weakCompareAndSetRelease String");
+                assertEquals("bar", x, "success weakCompareAndSetRelease String");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, "foo", "baz");
                 assertEquals(success, false, "failing weakCompareAndSetRelease String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "failing weakCompareAndSetRelease String value");
+                assertEquals("bar", x, "failing weakCompareAndSetRelease String value");
             }
 
             {
@@ -1132,14 +1130,14 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "success weakCompareAndSet String");
+                assertEquals("foo", x, "success weakCompareAndSet String");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, "bar", "baz");
                 assertEquals(success, false, "failing weakCompareAndSet String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "foo", "failing weakCompareAndSet String value");
+                assertEquals("foo", x, "failing weakCompareAndSet String value");
             }
 
             // Compare set and get
@@ -1147,27 +1145,27 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
                 vh.set(array, i, "foo");
 
                 String o = (String) vh.getAndSet(array, i, "bar");
-                assertEquals(o, "foo", "getAndSet String");
+                assertEquals("foo", o, "getAndSet String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "getAndSet String value");
+                assertEquals("bar", x, "getAndSet String value");
             }
 
             {
                 vh.set(array, i, "foo");
 
                 String o = (String) vh.getAndSetAcquire(array, i, "bar");
-                assertEquals(o, "foo", "getAndSetAcquire String");
+                assertEquals("foo", o, "getAndSetAcquire String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "getAndSetAcquire String value");
+                assertEquals("bar", x, "getAndSetAcquire String value");
             }
 
             {
                 vh.set(array, i, "foo");
 
                 String o = (String) vh.getAndSetRelease(array, i, "bar");
-                assertEquals(o, "foo", "getAndSetRelease String");
+                assertEquals("foo", o, "getAndSetRelease String");
                 String x = (String) vh.get(array, i);
-                assertEquals(x, "bar", "getAndSetRelease String value");
+                assertEquals("bar", x, "getAndSetRelease String value");
             }
 
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
index 78c13da45a9..26ac4aab893 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsChar
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsChar
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsChar
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsChar
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsChar
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsChar
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
     static final int SIZE = Character.BYTES;
 
@@ -107,7 +107,8 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -158,17 +159,16 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
             assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), char.class);
+        assertEquals(char.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -230,7 +230,8 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -239,7 +240,6 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -740,7 +740,7 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 char x = (char) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get char value");
+                assertEquals(VALUE_1, x, "get char value");
             }
         }
     }
@@ -759,7 +759,7 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 char x = (char) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get char value");
+                assertEquals(VALUE_1, x, "get char value");
             }
 
             if (iAligned) {
@@ -767,21 +767,21 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     char x = (char) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile char value");
+                    assertEquals(VALUE_2, x, "setVolatile char value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     char x = (char) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease char value");
+                    assertEquals(VALUE_1, x, "setRelease char value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     char x = (char) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque char value");
+                    assertEquals(VALUE_2, x, "setOpaque char value");
                 }
 
 
@@ -807,26 +807,26 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 char x = (char) vh.get(array, i);
-                assertEquals(x, v, "get char value");
+                assertEquals(v, x, "get char value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     char x = (char) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile char value");
+                    assertEquals(v, x, "getVolatile char value");
                 }
 
                 // Lazy
                 {
                     char x = (char) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease char value");
+                    assertEquals(v, x, "getRelease char value");
                 }
 
                 // Opaque
                 {
                     char x = (char) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque char value");
+                    assertEquals(v, x, "getOpaque char value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
index 331b9073e90..a9e1e603c5d 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsDouble
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsDouble
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsDouble
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsDouble
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsDouble
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsDouble
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
     static final int SIZE = Double.BYTES;
 
@@ -107,7 +107,8 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -172,17 +173,16 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
             assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), double.class);
+        assertEquals(double.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -244,7 +244,8 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -253,7 +254,6 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -883,7 +883,7 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 double x = (double) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get double value");
+                assertEquals(VALUE_1, x, "get double value");
             }
         }
     }
@@ -902,7 +902,7 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 double x = (double) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get double value");
+                assertEquals(VALUE_1, x, "get double value");
             }
 
             if (iAligned) {
@@ -910,21 +910,21 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     double x = (double) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile double value");
+                    assertEquals(VALUE_2, x, "setVolatile double value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     double x = (double) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease double value");
+                    assertEquals(VALUE_1, x, "setRelease double value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     double x = (double) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque double value");
+                    assertEquals(VALUE_2, x, "setOpaque double value");
                 }
 
                 vh.set(array, i, VALUE_1);
@@ -934,56 +934,56 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, true, "success compareAndSet double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndSet double value");
+                    assertEquals(VALUE_2, x, "success compareAndSet double value");
                 }
 
                 {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, false, "failing compareAndSet double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndSet double value");
+                    assertEquals(VALUE_2, x, "failing compareAndSet double value");
                 }
 
                 {
                     double r = (double) vh.compareAndExchange(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchange double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchange double value");
+                    assertEquals(VALUE_1, x, "success compareAndExchange double value");
                 }
 
                 {
                     double r = (double) vh.compareAndExchange(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchange double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchange double value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchange double value");
                 }
 
                 {
                     double r = (double) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, VALUE_1, "success compareAndExchangeAcquire double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndExchangeAcquire double value");
+                    assertEquals(VALUE_2, x, "success compareAndExchangeAcquire double value");
                 }
 
                 {
                     double r = (double) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, VALUE_2, "failing compareAndExchangeAcquire double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndExchangeAcquire double value");
+                    assertEquals(VALUE_2, x, "failing compareAndExchangeAcquire double value");
                 }
 
                 {
                     double r = (double) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchangeRelease double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchangeRelease double value");
+                    assertEquals(VALUE_1, x, "success compareAndExchangeRelease double value");
                 }
 
                 {
                     double r = (double) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchangeRelease double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchangeRelease double value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchangeRelease double value");
                 }
 
                 {
@@ -994,14 +994,14 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetPlain double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetPlain double value");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetPlain double value");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetPlain(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetPlain double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetPlain double value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetPlain double value");
                 }
 
                 {
@@ -1012,14 +1012,14 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetAcquire double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSetAcquire double");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSetAcquire double");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetAcquire double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSetAcquire double value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSetAcquire double value");
                 }
 
                 {
@@ -1030,14 +1030,14 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetRelease double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetRelease double");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetRelease double");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetRelease double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetRelease double value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetRelease double value");
                 }
 
                 {
@@ -1048,14 +1048,14 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSet double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSet double");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSet double");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSet(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSet double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSet double value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSet double value");
                 }
 
                 // Compare set and get
@@ -1063,27 +1063,27 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     double o = (double) vh.getAndSet(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSet double");
+                    assertEquals(VALUE_1, o, "getAndSet double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSet double value");
+                    assertEquals(VALUE_2, x, "getAndSet double value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     double o = (double) vh.getAndSetAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetAcquire double");
+                    assertEquals(VALUE_1, o, "getAndSetAcquire double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetAcquire double value");
+                    assertEquals(VALUE_2, x, "getAndSetAcquire double value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     double o = (double) vh.getAndSetRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetRelease double");
+                    assertEquals(VALUE_1, o, "getAndSetRelease double");
                     double x = (double) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetRelease double value");
+                    assertEquals(VALUE_2, x, "getAndSetRelease double value");
                 }
 
 
@@ -1109,26 +1109,26 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 double x = (double) vh.get(array, i);
-                assertEquals(x, v, "get double value");
+                assertEquals(v, x, "get double value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     double x = (double) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile double value");
+                    assertEquals(v, x, "getVolatile double value");
                 }
 
                 // Lazy
                 {
                     double x = (double) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease double value");
+                    assertEquals(v, x, "getRelease double value");
                 }
 
                 // Opaque
                 {
                     double x = (double) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque double value");
+                    assertEquals(v, x, "getOpaque double value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
index 908d61dd597..486487518e9 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsFloat
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsFloat
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsFloat
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsFloat
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsFloat
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsFloat
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
     static final int SIZE = Float.BYTES;
 
@@ -107,7 +107,8 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -172,17 +173,16 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
             assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), float.class);
+        assertEquals(float.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -244,7 +244,8 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -253,7 +254,6 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -883,7 +883,7 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 float x = (float) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get float value");
+                assertEquals(VALUE_1, x, "get float value");
             }
         }
     }
@@ -902,7 +902,7 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 float x = (float) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get float value");
+                assertEquals(VALUE_1, x, "get float value");
             }
 
             if (iAligned) {
@@ -910,21 +910,21 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     float x = (float) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile float value");
+                    assertEquals(VALUE_2, x, "setVolatile float value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     float x = (float) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease float value");
+                    assertEquals(VALUE_1, x, "setRelease float value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     float x = (float) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque float value");
+                    assertEquals(VALUE_2, x, "setOpaque float value");
                 }
 
                 vh.set(array, i, VALUE_1);
@@ -934,56 +934,56 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, true, "success compareAndSet float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndSet float value");
+                    assertEquals(VALUE_2, x, "success compareAndSet float value");
                 }
 
                 {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, false, "failing compareAndSet float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndSet float value");
+                    assertEquals(VALUE_2, x, "failing compareAndSet float value");
                 }
 
                 {
                     float r = (float) vh.compareAndExchange(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchange float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchange float value");
+                    assertEquals(VALUE_1, x, "success compareAndExchange float value");
                 }
 
                 {
                     float r = (float) vh.compareAndExchange(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchange float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchange float value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchange float value");
                 }
 
                 {
                     float r = (float) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, VALUE_1, "success compareAndExchangeAcquire float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndExchangeAcquire float value");
+                    assertEquals(VALUE_2, x, "success compareAndExchangeAcquire float value");
                 }
 
                 {
                     float r = (float) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, VALUE_2, "failing compareAndExchangeAcquire float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndExchangeAcquire float value");
+                    assertEquals(VALUE_2, x, "failing compareAndExchangeAcquire float value");
                 }
 
                 {
                     float r = (float) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchangeRelease float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchangeRelease float value");
+                    assertEquals(VALUE_1, x, "success compareAndExchangeRelease float value");
                 }
 
                 {
                     float r = (float) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchangeRelease float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchangeRelease float value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchangeRelease float value");
                 }
 
                 {
@@ -994,14 +994,14 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetPlain float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetPlain float value");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetPlain float value");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetPlain(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetPlain float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetPlain float value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetPlain float value");
                 }
 
                 {
@@ -1012,14 +1012,14 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetAcquire float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSetAcquire float");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSetAcquire float");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetAcquire float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSetAcquire float value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSetAcquire float value");
                 }
 
                 {
@@ -1030,14 +1030,14 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetRelease float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetRelease float");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetRelease float");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetRelease float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetRelease float value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetRelease float value");
                 }
 
                 {
@@ -1048,14 +1048,14 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSet float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSet float");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSet float");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSet(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSet float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSet float value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSet float value");
                 }
 
                 // Compare set and get
@@ -1063,27 +1063,27 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     float o = (float) vh.getAndSet(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSet float");
+                    assertEquals(VALUE_1, o, "getAndSet float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSet float value");
+                    assertEquals(VALUE_2, x, "getAndSet float value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     float o = (float) vh.getAndSetAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetAcquire float");
+                    assertEquals(VALUE_1, o, "getAndSetAcquire float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetAcquire float value");
+                    assertEquals(VALUE_2, x, "getAndSetAcquire float value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     float o = (float) vh.getAndSetRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetRelease float");
+                    assertEquals(VALUE_1, o, "getAndSetRelease float");
                     float x = (float) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetRelease float value");
+                    assertEquals(VALUE_2, x, "getAndSetRelease float value");
                 }
 
 
@@ -1109,26 +1109,26 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 float x = (float) vh.get(array, i);
-                assertEquals(x, v, "get float value");
+                assertEquals(v, x, "get float value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     float x = (float) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile float value");
+                    assertEquals(v, x, "getVolatile float value");
                 }
 
                 // Lazy
                 {
                     float x = (float) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease float value");
+                    assertEquals(v, x, "getRelease float value");
                 }
 
                 // Opaque
                 {
                     float x = (float) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque float value");
+                    assertEquals(v, x, "getOpaque float value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
index 791510281c1..ce55c3d5e31 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsInt
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsInt
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsInt
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsInt
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsInt
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsInt
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
     static final int SIZE = Integer.BYTES;
 
@@ -107,7 +107,8 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -190,17 +191,16 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), int.class);
+        assertEquals(int.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -262,7 +262,8 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -271,7 +272,6 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -1039,7 +1039,7 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 int x = (int) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get int value");
+                assertEquals(VALUE_1, x, "get int value");
             }
         }
     }
@@ -1058,7 +1058,7 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 int x = (int) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get int value");
+                assertEquals(VALUE_1, x, "get int value");
             }
 
             if (iAligned) {
@@ -1066,21 +1066,21 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     int x = (int) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile int value");
+                    assertEquals(VALUE_2, x, "setVolatile int value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     int x = (int) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease int value");
+                    assertEquals(VALUE_1, x, "setRelease int value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     int x = (int) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque int value");
+                    assertEquals(VALUE_2, x, "setOpaque int value");
                 }
 
                 vh.set(array, i, VALUE_1);
@@ -1090,56 +1090,56 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, true, "success compareAndSet int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndSet int value");
+                    assertEquals(VALUE_2, x, "success compareAndSet int value");
                 }
 
                 {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, false, "failing compareAndSet int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndSet int value");
+                    assertEquals(VALUE_2, x, "failing compareAndSet int value");
                 }
 
                 {
                     int r = (int) vh.compareAndExchange(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchange int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchange int value");
+                    assertEquals(VALUE_1, x, "success compareAndExchange int value");
                 }
 
                 {
                     int r = (int) vh.compareAndExchange(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchange int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchange int value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchange int value");
                 }
 
                 {
                     int r = (int) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, VALUE_1, "success compareAndExchangeAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndExchangeAcquire int value");
+                    assertEquals(VALUE_2, x, "success compareAndExchangeAcquire int value");
                 }
 
                 {
                     int r = (int) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, VALUE_2, "failing compareAndExchangeAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndExchangeAcquire int value");
+                    assertEquals(VALUE_2, x, "failing compareAndExchangeAcquire int value");
                 }
 
                 {
                     int r = (int) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchangeRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchangeRelease int value");
+                    assertEquals(VALUE_1, x, "success compareAndExchangeRelease int value");
                 }
 
                 {
                     int r = (int) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchangeRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchangeRelease int value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchangeRelease int value");
                 }
 
                 {
@@ -1150,14 +1150,14 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetPlain int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetPlain int value");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetPlain int value");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetPlain(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetPlain int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetPlain int value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetPlain int value");
                 }
 
                 {
@@ -1168,14 +1168,14 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSetAcquire int");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSetAcquire int");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSetAcquire int value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSetAcquire int value");
                 }
 
                 {
@@ -1186,14 +1186,14 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetRelease int");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetRelease int");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetRelease int value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetRelease int value");
                 }
 
                 {
@@ -1204,14 +1204,14 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSet int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSet int");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSet int");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSet(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSet int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSet int value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSet int value");
                 }
 
                 // Compare set and get
@@ -1219,27 +1219,27 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndSet(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSet int");
+                    assertEquals(VALUE_1, o, "getAndSet int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSet int value");
+                    assertEquals(VALUE_2, x, "getAndSet int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndSetAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetAcquire int");
+                    assertEquals(VALUE_1, o, "getAndSetAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetAcquire int value");
+                    assertEquals(VALUE_2, x, "getAndSetAcquire int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndSetRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetRelease int");
+                    assertEquals(VALUE_1, o, "getAndSetRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetRelease int value");
+                    assertEquals(VALUE_2, x, "getAndSetRelease int value");
                 }
 
                 // get and add, add and get
@@ -1247,27 +1247,27 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndAdd(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAdd int");
+                    assertEquals(VALUE_1, o, "getAndAdd int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAdd int value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAdd int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndAddAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAddAcquire int");
+                    assertEquals(VALUE_1, o, "getAndAddAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAddAcquire int value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAddAcquire int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndAddRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAddRelease int");
+                    assertEquals(VALUE_1, o, "getAndAddRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAddRelease int value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAddRelease int value");
                 }
 
                 // get and bitwise or
@@ -1275,27 +1275,27 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseOr(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOr int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOr int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOr int value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOr int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseOrAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOrAcquire int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOrAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOrAcquire int value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOrAcquire int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseOrRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOrRelease int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOrRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOrRelease int value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOrRelease int value");
                 }
 
                 // get and bitwise and
@@ -1303,27 +1303,27 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseAnd(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAnd int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAnd int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAnd int value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAnd int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseAndAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAndAcquire int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAndAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAndAcquire int value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAndAcquire int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseAndRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAndRelease int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAndRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAndRelease int value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAndRelease int value");
                 }
 
                 // get and bitwise xor
@@ -1331,27 +1331,27 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseXor(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXor int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXor int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXor int value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXor int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseXorAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXorAcquire int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXorAcquire int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXorAcquire int value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXorAcquire int value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     int o = (int) vh.getAndBitwiseXorRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXorRelease int");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXorRelease int");
                     int x = (int) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXorRelease int value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXorRelease int value");
                 }
             }
         }
@@ -1375,26 +1375,26 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 int x = (int) vh.get(array, i);
-                assertEquals(x, v, "get int value");
+                assertEquals(v, x, "get int value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     int x = (int) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile int value");
+                    assertEquals(v, x, "getVolatile int value");
                 }
 
                 // Lazy
                 {
                     int x = (int) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease int value");
+                    assertEquals(v, x, "getRelease int value");
                 }
 
                 // Opaque
                 {
                     int x = (int) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque int value");
+                    assertEquals(v, x, "getOpaque int value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
index 4188a51a559..763703b6079 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsLong
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsLong
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsLong
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsLong
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsLong
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsLong
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
     static final int SIZE = Long.BYTES;
 
@@ -107,7 +107,8 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -190,17 +191,16 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), long.class);
+        assertEquals(long.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -262,7 +262,8 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -271,7 +272,6 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -1039,7 +1039,7 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 long x = (long) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get long value");
+                assertEquals(VALUE_1, x, "get long value");
             }
         }
     }
@@ -1058,7 +1058,7 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 long x = (long) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get long value");
+                assertEquals(VALUE_1, x, "get long value");
             }
 
             if (iAligned) {
@@ -1066,21 +1066,21 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     long x = (long) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile long value");
+                    assertEquals(VALUE_2, x, "setVolatile long value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     long x = (long) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease long value");
+                    assertEquals(VALUE_1, x, "setRelease long value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     long x = (long) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque long value");
+                    assertEquals(VALUE_2, x, "setOpaque long value");
                 }
 
                 vh.set(array, i, VALUE_1);
@@ -1090,56 +1090,56 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, true, "success compareAndSet long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndSet long value");
+                    assertEquals(VALUE_2, x, "success compareAndSet long value");
                 }
 
                 {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, false, "failing compareAndSet long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndSet long value");
+                    assertEquals(VALUE_2, x, "failing compareAndSet long value");
                 }
 
                 {
                     long r = (long) vh.compareAndExchange(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchange long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchange long value");
+                    assertEquals(VALUE_1, x, "success compareAndExchange long value");
                 }
 
                 {
                     long r = (long) vh.compareAndExchange(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchange long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchange long value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchange long value");
                 }
 
                 {
                     long r = (long) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, VALUE_1, "success compareAndExchangeAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndExchangeAcquire long value");
+                    assertEquals(VALUE_2, x, "success compareAndExchangeAcquire long value");
                 }
 
                 {
                     long r = (long) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, VALUE_2, "failing compareAndExchangeAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndExchangeAcquire long value");
+                    assertEquals(VALUE_2, x, "failing compareAndExchangeAcquire long value");
                 }
 
                 {
                     long r = (long) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchangeRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchangeRelease long value");
+                    assertEquals(VALUE_1, x, "success compareAndExchangeRelease long value");
                 }
 
                 {
                     long r = (long) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchangeRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchangeRelease long value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchangeRelease long value");
                 }
 
                 {
@@ -1150,14 +1150,14 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetPlain long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetPlain long value");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetPlain long value");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetPlain(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetPlain long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetPlain long value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetPlain long value");
                 }
 
                 {
@@ -1168,14 +1168,14 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSetAcquire long");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSetAcquire long");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSetAcquire long value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSetAcquire long value");
                 }
 
                 {
@@ -1186,14 +1186,14 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetRelease long");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetRelease long");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetRelease long value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetRelease long value");
                 }
 
                 {
@@ -1204,14 +1204,14 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSet long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSet long");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSet long");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSet(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSet long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSet long value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSet long value");
                 }
 
                 // Compare set and get
@@ -1219,27 +1219,27 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndSet(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSet long");
+                    assertEquals(VALUE_1, o, "getAndSet long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSet long value");
+                    assertEquals(VALUE_2, x, "getAndSet long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndSetAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetAcquire long");
+                    assertEquals(VALUE_1, o, "getAndSetAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetAcquire long value");
+                    assertEquals(VALUE_2, x, "getAndSetAcquire long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndSetRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetRelease long");
+                    assertEquals(VALUE_1, o, "getAndSetRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetRelease long value");
+                    assertEquals(VALUE_2, x, "getAndSetRelease long value");
                 }
 
                 // get and add, add and get
@@ -1247,27 +1247,27 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndAdd(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAdd long");
+                    assertEquals(VALUE_1, o, "getAndAdd long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAdd long value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAdd long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndAddAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAddAcquire long");
+                    assertEquals(VALUE_1, o, "getAndAddAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAddAcquire long value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAddAcquire long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndAddRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAddRelease long");
+                    assertEquals(VALUE_1, o, "getAndAddRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAddRelease long value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAddRelease long value");
                 }
 
                 // get and bitwise or
@@ -1275,27 +1275,27 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseOr(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOr long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOr long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOr long value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOr long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseOrAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOrAcquire long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOrAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOrAcquire long value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOrAcquire long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseOrRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOrRelease long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOrRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOrRelease long value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOrRelease long value");
                 }
 
                 // get and bitwise and
@@ -1303,27 +1303,27 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseAnd(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAnd long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAnd long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAnd long value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAnd long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseAndAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAndAcquire long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAndAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAndAcquire long value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAndAcquire long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseAndRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAndRelease long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAndRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAndRelease long value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAndRelease long value");
                 }
 
                 // get and bitwise xor
@@ -1331,27 +1331,27 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseXor(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXor long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXor long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXor long value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXor long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseXorAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXorAcquire long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXorAcquire long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXorAcquire long value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXorAcquire long value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     long o = (long) vh.getAndBitwiseXorRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXorRelease long");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXorRelease long");
                     long x = (long) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXorRelease long value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXorRelease long value");
                 }
             }
         }
@@ -1375,26 +1375,26 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 long x = (long) vh.get(array, i);
-                assertEquals(x, v, "get long value");
+                assertEquals(v, x, "get long value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     long x = (long) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile long value");
+                    assertEquals(v, x, "getVolatile long value");
                 }
 
                 // Lazy
                 {
                     long x = (long) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease long value");
+                    assertEquals(v, x, "getRelease long value");
                 }
 
                 // Opaque
                 {
                     long x = (long) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque long value");
+                    assertEquals(v, x, "getOpaque long value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
index 1ecfef0476e..7a3bc069c22 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsShort
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsShort
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsShort
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAsShort
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAsShort
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAsShort
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
     static final int SIZE = Short.BYTES;
 
@@ -107,7 +107,8 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -158,17 +159,16 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
             assertFalse(vh.isAccessModeSupported(VarHandle.AccessMode.GET_AND_BITWISE_XOR_RELEASE));
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), short.class);
+        assertEquals(short.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -230,7 +230,8 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -239,7 +240,6 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -740,7 +740,7 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 short x = (short) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get short value");
+                assertEquals(VALUE_1, x, "get short value");
             }
         }
     }
@@ -759,7 +759,7 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 short x = (short) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get short value");
+                assertEquals(VALUE_1, x, "get short value");
             }
 
             if (iAligned) {
@@ -767,21 +767,21 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     short x = (short) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile short value");
+                    assertEquals(VALUE_2, x, "setVolatile short value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     short x = (short) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease short value");
+                    assertEquals(VALUE_1, x, "setRelease short value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     short x = (short) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque short value");
+                    assertEquals(VALUE_2, x, "setOpaque short value");
                 }
 
 
@@ -807,26 +807,26 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 short x = (short) vh.get(array, i);
-                assertEquals(x, v, "get short value");
+                assertEquals(v, x, "get short value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     short x = (short) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile short value");
+                    assertEquals(v, x, "getVolatile short value");
                 }
 
                 // Lazy
                 {
                     short x = (short) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease short value");
+                    assertEquals(v, x, "getRelease short value");
                 }
 
                 // Opaque
                 {
                     short x = (short) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque short value");
+                    assertEquals(v, x, "getOpaque short value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestExact.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestExact.java
index fc706815bce..9960e08a0c7 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestExact.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestExact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,20 @@
  * @modules java.base/jdk.internal.access.foreign
  * @modules java.base/jdk.internal.foreign.layout
  *
- * @run testng/othervm -Xverify:all
+ * @run junit/othervm -Xverify:all
  *   -Djdk.internal.foreign.SHOULD_ADAPT_HANDLES=false
  *   VarHandleTestExact
- * @run testng/othervm -Xverify:all
+ * @run junit/othervm -Xverify:all
  *   -Djdk.internal.foreign.SHOULD_ADAPT_HANDLES=false
  *   -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true
  *   -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true
  *   VarHandleTestExact
- * @run testng/othervm -Xverify:all
+ * @run junit/othervm -Xverify:all
  *   -Djdk.internal.foreign.SHOULD_ADAPT_HANDLES=false
  *   -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false
  *   -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false
  *   VarHandleTestExact
- * @run testng/othervm -Xverify:all
+ * @run junit/othervm -Xverify:all
  *   -Djdk.internal.foreign.SHOULD_ADAPT_HANDLES=false
  *   -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false
  *   -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true
@@ -50,9 +50,6 @@ import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
 import jdk.internal.foreign.layout.ValueLayouts;
-import org.testng.SkipException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
@@ -64,8 +61,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestExact {
 
     private static class Widget {
@@ -90,12 +92,13 @@ public class VarHandleTestExact {
         final Long aLongField_RO = 1234L;
     }
 
-    @Test(dataProvider = "dataObjectAccess")
+    @ParameterizedTest
+    @MethodSource("dataObjectAccess")
     public void testExactSet(String fieldBaseName, Class<?> fieldType, boolean ro, Object testValue,
                              SetX setter, GetX getter,
                              SetStaticX staticSetter, GetStaticX staticGetter)
             throws NoSuchFieldException, IllegalAccessException {
-        if (ro) throw new SkipException("Can not test setter with read only field");
+        Assumptions.assumeFalse(ro, "Can not test setter with read only field");
         VarHandle vh = MethodHandles.lookup().findVarHandle(Widget.class, fieldBaseName + "_RW", fieldType);
         Widget w = new Widget();
 
@@ -105,7 +108,8 @@ public class VarHandleTestExact {
             ".*\\Qhandle's method type (Widget," + fieldType.getSimpleName() + ")void \\E.*");
     }
 
-    @Test(dataProvider = "dataObjectAccess")
+    @ParameterizedTest
+    @MethodSource("dataObjectAccess")
     public void testExactGet(String fieldBaseName, Class<?> fieldType, boolean ro, Object testValue,
                              SetX setter, GetX getter,
                              SetStaticX staticSetter, GetStaticX staticGetter)
@@ -119,12 +123,13 @@ public class VarHandleTestExact {
             ".*\\Qhandle's method type (Widget)" + fieldType.getSimpleName() + " \\E.*");
     }
 
-    @Test(dataProvider = "dataObjectAccess")
+    @ParameterizedTest
+    @MethodSource("dataObjectAccess")
     public void testExactSetStatic(String fieldBaseName, Class<?> fieldType, boolean ro, Object testValue,
                                    SetX setter, GetX getter,
                                    SetStaticX staticSetter, GetStaticX staticGetter)
             throws NoSuchFieldException, IllegalAccessException {
-        if (ro) throw new SkipException("Can not test setter with read only field");
+        Assumptions.assumeFalse(ro, "Can not test setter with read only field");
         VarHandle vh = MethodHandles.lookup().findStaticVarHandle(Widget.class, fieldBaseName + "_SRW", fieldType);
 
         doTest(vh,
@@ -133,7 +138,8 @@ public class VarHandleTestExact {
             ".*\\Qhandle's method type (" + fieldType.getSimpleName() + ")void \\E.*");
     }
 
-    @Test(dataProvider = "dataObjectAccess")
+    @ParameterizedTest
+    @MethodSource("dataObjectAccess")
     public void testExactGetStatic(String fieldBaseName, Class<?> fieldType, boolean ro, Object testValue,
                                    SetX setter, GetX getter,
                                    SetStaticX staticSetter, GetStaticX staticGetter)
@@ -146,7 +152,8 @@ public class VarHandleTestExact {
             ".*\\Qhandle's method type ()" + fieldType.getSimpleName() + " \\E.*");
     }
 
-    @Test(dataProvider = "dataSetArray")
+    @ParameterizedTest
+    @MethodSource("dataSetArray")
     public void testExactArraySet(Class<?> arrayClass, Object testValue, SetArrayX setter) {
         VarHandle vh = MethodHandles.arrayElementVarHandle(arrayClass);
         Object arr = Array.newInstance(arrayClass.componentType(), 1);
@@ -157,7 +164,8 @@ public class VarHandleTestExact {
             ".*\\Qhandle's method type (" + arrayClass.getSimpleName() + ",int," + arrayClass.componentType().getSimpleName() + ")void \\E.*");
     }
 
-    @Test(dataProvider = "dataSetBuffer")
+    @ParameterizedTest
+    @MethodSource("dataSetBuffer")
     public void testExactBufferSet(Class<?> arrayClass, Object testValue, SetBufferX setter) {
         VarHandle vh = MethodHandles.byteBufferViewVarHandle(arrayClass, ByteOrder.nativeOrder());
         ByteBuffer buff = ByteBuffer.allocateDirect(8);
@@ -168,7 +176,8 @@ public class VarHandleTestExact {
             ".*\\Qhandle's method type (ByteBuffer,int," + arrayClass.componentType().getSimpleName() + ")void \\E.*");
     }
 
-    @Test(dataProvider = "dataSetMemorySegment")
+    @ParameterizedTest
+    @MethodSource("dataSetMemorySegment")
     public void testExactSegmentSet(Class<?> carrier, Object testValue, SetSegmentX setter) {
         VarHandle vh = ValueLayouts.valueLayout(carrier, ByteOrder.nativeOrder()).varHandle();
         try (Arena arena = Arena.ofConfined()) {
@@ -265,7 +274,6 @@ public class VarHandleTestExact {
         cases.add(new Object[] { carrier, testValue, setter });
     }
 
-    @DataProvider
     public static Object[][] dataObjectAccess() {
         List<Object[]> cases = new ArrayList<>();
 
@@ -334,7 +342,6 @@ public class VarHandleTestExact {
         return cases.toArray(Object[][]::new);
     }
 
-    @DataProvider
     public static Object[][] dataSetArray() {
         List<Object[]> cases = new ArrayList<>();
 
@@ -355,7 +362,6 @@ public class VarHandleTestExact {
         return cases.toArray(Object[][]::new);
     }
 
-    @DataProvider
     public static Object[][] dataSetBuffer() {
         List<Object[]> cases = new ArrayList<>();
 
@@ -373,7 +379,6 @@ public class VarHandleTestExact {
         return cases.toArray(Object[][]::new);
     }
 
-    @DataProvider
     public static Object[][] dataSetMemorySegment() {
         List<Object[]> cases = new ArrayList<>();
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
index 14d5c05d3b8..6540693a906 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessBoolean
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessBoolean
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
     static final boolean static_final_v = true;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessBoolean.class, "final_v", boolean.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(boolean[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessBoolean recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "set boolean value");
+            assertEquals(true, x, "set boolean value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, false);
             boolean x = (boolean) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, false, "setVolatile boolean value");
+            assertEquals(false, x, "setVolatile boolean value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, true);
             boolean x = (boolean) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, true, "setRelease boolean value");
+            assertEquals(true, x, "setRelease boolean value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, false);
             boolean x = (boolean) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, false, "setOpaque boolean value");
+            assertEquals(false, x, "setOpaque boolean value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, true);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, true, false);
             assertEquals(r, true, "success compareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "success compareAndSet boolean value");
+            assertEquals(false, x, "success compareAndSet boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, true, false);
             assertEquals(r, false, "failing compareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "failing compareAndSet boolean value");
+            assertEquals(false, x, "failing compareAndSet boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, false, true);
             assertEquals(r, false, "success compareAndExchange boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "success compareAndExchange boolean value");
+            assertEquals(true, x, "success compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, false, false);
             assertEquals(r, true, "failing compareAndExchange boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "failing compareAndExchange boolean value");
+            assertEquals(true, x, "failing compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, true, false);
             assertEquals(r, true, "success compareAndExchangeAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "success compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, true, false);
             assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "failing compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, false, true);
             assertEquals(r, false, "success compareAndExchangeRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "success compareAndExchangeRelease boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, false, false);
             assertEquals(r, true, "failing compareAndExchangeRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "failing compareAndExchangeRelease boolean value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "success weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "success weakCompareAndSetPlain boolean value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, true, false);
             assertEquals(success, false, "failing weakCompareAndSetPlain boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "failing weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetPlain boolean value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "success weakCompareAndSetAcquire boolean");
+            assertEquals(true, x, "success weakCompareAndSetAcquire boolean");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, false, false);
             assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "failing weakCompareAndSetAcquire boolean value");
+            assertEquals(true, x, "failing weakCompareAndSetAcquire boolean value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "success weakCompareAndSetRelease boolean");
+            assertEquals(false, x, "success weakCompareAndSetRelease boolean");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, true, false);
             assertEquals(success, false, "failing weakCompareAndSetRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "failing weakCompareAndSetRelease boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetRelease boolean value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "success weakCompareAndSet boolean");
+            assertEquals(true, x, "success weakCompareAndSet boolean");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, false, false);
             assertEquals(success, false, "failing weakCompareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, true, "failing weakCompareAndSet boolean value");
+            assertEquals(true, x, "failing weakCompareAndSet boolean value");
         }
 
         // Compare set and get
         {
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, false);
-            assertEquals(o, true, "getAndSet boolean");
+            assertEquals(true, o, "getAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, false, "getAndSet boolean value");
+            assertEquals(false, x, "getAndSet boolean value");
         }
 
 
@@ -300,27 +298,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseOr boolean");
+            assertEquals(true, o, "getAndBitwiseOr boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOr boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOr boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseOrAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseOrAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrAcquire boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseOrRelease boolean");
+            assertEquals(true, o, "getAndBitwiseOrRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrRelease boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrRelease boolean value");
         }
 
         // get and bitwise and
@@ -328,27 +326,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseAnd boolean");
+            assertEquals(true, o, "getAndBitwiseAnd boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAnd boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAnd boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseAndAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseAndAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndAcquire boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseAndRelease boolean");
+            assertEquals(true, o, "getAndBitwiseAndRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndRelease boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndRelease boolean value");
         }
 
         // get and bitwise xor
@@ -356,27 +354,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseXor boolean");
+            assertEquals(true, o, "getAndBitwiseXor boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXor boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXor boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseXorAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseXorAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorAcquire boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, false);
-            assertEquals(o, true, "getAndBitwiseXorRelease boolean");
+            assertEquals(true, o, "getAndBitwiseXorRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorRelease boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorRelease boolean value");
         }
     }
 
@@ -396,7 +394,7 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "set boolean value");
+            assertEquals(true, x, "set boolean value");
         }
 
 
@@ -404,21 +402,21 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(false);
             boolean x = (boolean) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, false, "setVolatile boolean value");
+            assertEquals(false, x, "setVolatile boolean value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(true);
             boolean x = (boolean) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, true, "setRelease boolean value");
+            assertEquals(true, x, "setRelease boolean value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(false);
             boolean x = (boolean) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, false, "setOpaque boolean value");
+            assertEquals(false, x, "setOpaque boolean value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(true);
@@ -428,56 +426,56 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(true, false);
             assertEquals(r, true, "success compareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "success compareAndSet boolean value");
+            assertEquals(false, x, "success compareAndSet boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(true, false);
             assertEquals(r, false, "failing compareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "failing compareAndSet boolean value");
+            assertEquals(false, x, "failing compareAndSet boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(false, true);
             assertEquals(r, false, "success compareAndExchange boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "success compareAndExchange boolean value");
+            assertEquals(true, x, "success compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(false, false);
             assertEquals(r, true, "failing compareAndExchange boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "failing compareAndExchange boolean value");
+            assertEquals(true, x, "failing compareAndExchange boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(true, false);
             assertEquals(r, true, "success compareAndExchangeAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "success compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(true, false);
             assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+            assertEquals(false, x, "failing compareAndExchangeAcquire boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(false, true);
             assertEquals(r, false, "success compareAndExchangeRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "success compareAndExchangeRelease boolean value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(false, false);
             assertEquals(r, true, "failing compareAndExchangeRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+            assertEquals(true, x, "failing compareAndExchangeRelease boolean value");
         }
 
         {
@@ -489,14 +487,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "success weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "success weakCompareAndSetPlain boolean value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(true, false);
             assertEquals(success, false, "failing weakCompareAndSetPlain boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "failing weakCompareAndSetPlain boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetPlain boolean value");
         }
 
         {
@@ -508,7 +506,7 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "success weakCompareAndSetAcquire boolean");
+            assertEquals(true, x, "success weakCompareAndSetAcquire boolean");
         }
 
         {
@@ -516,7 +514,7 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact(false, false);
             assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "failing weakCompareAndSetAcquire boolean value");
+            assertEquals(true, x, "failing weakCompareAndSetAcquire boolean value");
         }
 
         {
@@ -528,14 +526,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "success weakCompareAndSetRelease boolean");
+            assertEquals(false, x, "success weakCompareAndSetRelease boolean");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(true, false);
             assertEquals(success, false, "failing weakCompareAndSetRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "failing weakCompareAndSetRelease boolean value");
+            assertEquals(false, x, "failing weakCompareAndSetRelease boolean value");
         }
 
         {
@@ -547,14 +545,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "success weakCompareAndSet boolean");
+            assertEquals(true, x, "success weakCompareAndSet boolean");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(false, false);
             assertEquals(success, false, "failing weakCompareAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, true, "failing weakCompareAndSetRe boolean value");
+            assertEquals(true, x, "failing weakCompareAndSetRe boolean value");
         }
 
         // Compare set and get
@@ -562,9 +560,9 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET).invokeExact(false);
-            assertEquals(o, true, "getAndSet boolean");
+            assertEquals(true, o, "getAndSet boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "getAndSet boolean value");
+            assertEquals(false, x, "getAndSet boolean value");
         }
 
         // Compare set and get
@@ -572,9 +570,9 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(false);
-            assertEquals(o, true, "getAndSetAcquire boolean");
+            assertEquals(true, o, "getAndSetAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "getAndSetAcquire boolean value");
+            assertEquals(false, x, "getAndSetAcquire boolean value");
         }
 
         // Compare set and get
@@ -582,9 +580,9 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(false);
-            assertEquals(o, true, "getAndSetRelease boolean");
+            assertEquals(true, o, "getAndSetRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, false, "getAndSetRelease boolean value");
+            assertEquals(false, x, "getAndSetRelease boolean value");
         }
 
 
@@ -593,27 +591,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseOr boolean");
+            assertEquals(true, o, "getAndBitwiseOr boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOr boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOr boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseOrAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseOrAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrAcquire boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseOrRelease boolean");
+            assertEquals(true, o, "getAndBitwiseOrRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrRelease boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrRelease boolean value");
         }
 
         // get and bitwise and
@@ -621,27 +619,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseAnd boolean");
+            assertEquals(true, o, "getAndBitwiseAnd boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAnd boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAnd boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseAndAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseAndAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndAcquire boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseAndRelease boolean");
+            assertEquals(true, o, "getAndBitwiseAndRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndRelease boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndRelease boolean value");
         }
 
         // get and bitwise xor
@@ -649,27 +647,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseXor boolean");
+            assertEquals(true, o, "getAndBitwiseXor boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXor boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXor boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseXorAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseXorAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorAcquire boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(false);
-            assertEquals(o, true, "getAndBitwiseXorRelease boolean");
+            assertEquals(true, o, "getAndBitwiseXorRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorRelease boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorRelease boolean value");
         }
     }
 
@@ -692,7 +690,7 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, true);
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "get boolean value");
+                assertEquals(true, x, "get boolean value");
             }
 
 
@@ -700,21 +698,21 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, false);
                 boolean x = (boolean) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, false, "setVolatile boolean value");
+                assertEquals(false, x, "setVolatile boolean value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, true);
                 boolean x = (boolean) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, true, "setRelease boolean value");
+                assertEquals(true, x, "setRelease boolean value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, false);
                 boolean x = (boolean) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, false, "setOpaque boolean value");
+                assertEquals(false, x, "setOpaque boolean value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
@@ -724,56 +722,56 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, true, false);
                 assertEquals(r, true, "success compareAndSet boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "success compareAndSet boolean value");
+                assertEquals(false, x, "success compareAndSet boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, true, false);
                 assertEquals(r, false, "failing compareAndSet boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "failing compareAndSet boolean value");
+                assertEquals(false, x, "failing compareAndSet boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, false, true);
                 assertEquals(r, false, "success compareAndExchange boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "success compareAndExchange boolean value");
+                assertEquals(true, x, "success compareAndExchange boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, false, false);
                 assertEquals(r, true, "failing compareAndExchange boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "failing compareAndExchange boolean value");
+                assertEquals(true, x, "failing compareAndExchange boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, true, false);
                 assertEquals(r, true, "success compareAndExchangeAcquire boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "success compareAndExchangeAcquire boolean value");
+                assertEquals(false, x, "success compareAndExchangeAcquire boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, true, false);
                 assertEquals(r, false, "failing compareAndExchangeAcquire boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "failing compareAndExchangeAcquire boolean value");
+                assertEquals(false, x, "failing compareAndExchangeAcquire boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, false, true);
                 assertEquals(r, false, "success compareAndExchangeRelease boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "success compareAndExchangeRelease boolean value");
+                assertEquals(true, x, "success compareAndExchangeRelease boolean value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, false, false);
                 assertEquals(r, true, "failing compareAndExchangeRelease boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "failing compareAndExchangeRelease boolean value");
+                assertEquals(true, x, "failing compareAndExchangeRelease boolean value");
             }
 
             {
@@ -785,14 +783,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "success weakCompareAndSetPlain boolean value");
+                assertEquals(false, x, "success weakCompareAndSetPlain boolean value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, true, false);
                 assertEquals(success, false, "failing weakCompareAndSetPlain boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "failing weakCompareAndSetPlain boolean value");
+                assertEquals(false, x, "failing weakCompareAndSetPlain boolean value");
             }
 
             {
@@ -804,14 +802,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "success weakCompareAndSetAcquire boolean");
+                assertEquals(true, x, "success weakCompareAndSetAcquire boolean");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, false, false);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "failing weakCompareAndSetAcquire boolean value");
+                assertEquals(true, x, "failing weakCompareAndSetAcquire boolean value");
             }
 
             {
@@ -823,14 +821,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "success weakCompareAndSetRelease boolean");
+                assertEquals(false, x, "success weakCompareAndSetRelease boolean");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, true, false);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "failing weakCompareAndSetAcquire boolean value");
+                assertEquals(false, x, "failing weakCompareAndSetAcquire boolean value");
             }
 
             {
@@ -842,14 +840,14 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "success weakCompareAndSet boolean");
+                assertEquals(true, x, "success weakCompareAndSet boolean");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, false, false);
                 assertEquals(success, false, "failing weakCompareAndSet boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, true, "failing weakCompareAndSet boolean value");
+                assertEquals(true, x, "failing weakCompareAndSet boolean value");
             }
 
             // Compare set and get
@@ -857,27 +855,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
                 boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, false);
-                assertEquals(o, true, "getAndSet boolean");
+                assertEquals(true, o, "getAndSet boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "getAndSet boolean value");
+                assertEquals(false, x, "getAndSet boolean value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
                 boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, false);
-                assertEquals(o, true, "getAndSetAcquire boolean");
+                assertEquals(true, o, "getAndSetAcquire boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "getAndSetAcquire boolean value");
+                assertEquals(false, x, "getAndSetAcquire boolean value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
                 boolean o = (boolean) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, false);
-                assertEquals(o, true, "getAndSetRelease boolean");
+                assertEquals(true, o, "getAndSetRelease boolean");
                 boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, false, "getAndSetRelease boolean value");
+                assertEquals(false, x, "getAndSetRelease boolean value");
             }
 
 
@@ -886,27 +884,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseOr boolean");
+            assertEquals(true, o, "getAndBitwiseOr boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOr boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOr boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseOrAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseOrAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrAcquire boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseOrRelease boolean");
+            assertEquals(true, o, "getAndBitwiseOrRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true | false), "getAndBitwiseOrRelease boolean value");
+            assertEquals((boolean)(true | false), x, "getAndBitwiseOrRelease boolean value");
         }
 
         // get and bitwise and
@@ -914,27 +912,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseAnd boolean");
+            assertEquals(true, o, "getAndBitwiseAnd boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAnd boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAnd boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseAndAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseAndAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndAcquire boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseAndRelease boolean");
+            assertEquals(true, o, "getAndBitwiseAndRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true & false), "getAndBitwiseAndRelease boolean value");
+            assertEquals((boolean)(true & false), x, "getAndBitwiseAndRelease boolean value");
         }
 
         // get and bitwise xor
@@ -942,27 +940,27 @@ public class VarHandleTestMethodHandleAccessBoolean extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseXor boolean");
+            assertEquals(true, o, "getAndBitwiseXor boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXor boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXor boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseXorAcquire boolean");
+            assertEquals(true, o, "getAndBitwiseXorAcquire boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorAcquire boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorAcquire boolean value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, true);
 
             boolean o = (boolean) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, false);
-            assertEquals(o, true, "getAndBitwiseXorRelease boolean");
+            assertEquals(true, o, "getAndBitwiseXorRelease boolean");
             boolean x = (boolean) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (boolean)(true ^ false), "getAndBitwiseXorRelease boolean value");
+            assertEquals((boolean)(true ^ false), x, "getAndBitwiseXorRelease boolean value");
         }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
index 5b3eafba63b..6f7f54a57f5 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessByte
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessByte
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
     static final byte static_final_v = (byte)0x01;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessByte.class, "final_v", byte.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(byte[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessByte recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "set byte value");
+            assertEquals((byte)0x01, x, "set byte value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, (byte)0x23);
             byte x = (byte) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "setVolatile byte value");
+            assertEquals((byte)0x23, x, "setVolatile byte value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, (byte)0x01);
             byte x = (byte) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "setRelease byte value");
+            assertEquals((byte)0x01, x, "setRelease byte value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, (byte)0x23);
             byte x = (byte) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "setOpaque byte value");
+            assertEquals((byte)0x23, x, "setOpaque byte value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, (byte)0x01, (byte)0x23);
             assertEquals(r, true, "success compareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "success compareAndSet byte value");
+            assertEquals((byte)0x23, x, "success compareAndSet byte value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, (byte)0x01, (byte)0x45);
             assertEquals(r, false, "failing compareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "failing compareAndSet byte value");
+            assertEquals((byte)0x23, x, "failing compareAndSet byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, (byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchange byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "success compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchange byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, (byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchange byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "failing compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchange byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, (byte)0x01, (byte)0x23);
             assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "success compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, (byte)0x01, (byte)0x45);
             assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "failing compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, (byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchangeRelease byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, (byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchangeRelease byte value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetPlain byte value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, (byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetPlain byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetPlain byte value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "success weakCompareAndSetAcquire byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSetAcquire byte");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, (byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSetAcquire byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSetAcquire byte value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetRelease byte");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetRelease byte");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, (byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetRelease byte value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "success weakCompareAndSet byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSet byte");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, (byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSet byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSet byte value");
         }
 
         // Compare set and get
         {
             byte o = (byte) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSet byte");
+            assertEquals((byte)0x01, o, "getAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)0x23, "getAndSet byte value");
+            assertEquals((byte)0x23, x, "getAndSet byte value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAdd byte");
+            assertEquals((byte)0x01, o, "getAndAdd byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAdd byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddAcquire byte");
+            assertEquals((byte)0x01, o, "getAndAddAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddAcquire byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddRelease byte");
+            assertEquals((byte)0x01, o, "getAndAddRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddRelease byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddRelease byte value");
         }
 
         // get and bitwise or
@@ -327,27 +325,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOr byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOr byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOr byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOr byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrAcquire byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrRelease byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrRelease byte value");
         }
 
         // get and bitwise and
@@ -355,27 +353,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAnd byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAnd byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAnd byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAnd byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndAcquire byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndRelease byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndRelease byte value");
         }
 
         // get and bitwise xor
@@ -383,27 +381,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXor byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXor byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXor byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXor byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorAcquire byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorRelease byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorRelease byte value");
         }
     }
 
@@ -418,7 +416,7 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "set byte value");
+            assertEquals((byte)0x01, x, "set byte value");
         }
 
 
@@ -426,21 +424,21 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact((byte)0x23);
             byte x = (byte) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, (byte)0x23, "setVolatile byte value");
+            assertEquals((byte)0x23, x, "setVolatile byte value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact((byte)0x01);
             byte x = (byte) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, (byte)0x01, "setRelease byte value");
+            assertEquals((byte)0x01, x, "setRelease byte value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact((byte)0x23);
             byte x = (byte) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, (byte)0x23, "setOpaque byte value");
+            assertEquals((byte)0x23, x, "setOpaque byte value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
@@ -450,56 +448,56 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact((byte)0x01, (byte)0x23);
             assertEquals(r, true, "success compareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "success compareAndSet byte value");
+            assertEquals((byte)0x23, x, "success compareAndSet byte value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact((byte)0x01, (byte)0x45);
             assertEquals(r, false, "failing compareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "failing compareAndSet byte value");
+            assertEquals((byte)0x23, x, "failing compareAndSet byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact((byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchange byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "success compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchange byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact((byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchange byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "failing compareAndExchange byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchange byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact((byte)0x01, (byte)0x23);
             assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "success compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact((byte)0x01, (byte)0x45);
             assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value");
+            assertEquals((byte)0x23, x, "failing compareAndExchangeAcquire byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact((byte)0x23, (byte)0x01);
             assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "success compareAndExchangeRelease byte value");
         }
 
         {
             byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact((byte)0x23, (byte)0x45);
             assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value");
+            assertEquals((byte)0x01, x, "failing compareAndExchangeRelease byte value");
         }
 
         {
@@ -511,14 +509,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetPlain byte value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact((byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetPlain byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetPlain byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetPlain byte value");
         }
 
         {
@@ -530,7 +528,7 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "success weakCompareAndSetAcquire byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSetAcquire byte");
         }
 
         {
@@ -538,7 +536,7 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact((byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSetAcquire byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSetAcquire byte value");
         }
 
         {
@@ -550,14 +548,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "success weakCompareAndSetRelease byte");
+            assertEquals((byte)0x23, x, "success weakCompareAndSetRelease byte");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact((byte)0x01, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSetRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "failing weakCompareAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "failing weakCompareAndSetRelease byte value");
         }
 
         {
@@ -569,14 +567,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "success weakCompareAndSet byte");
+            assertEquals((byte)0x01, x, "success weakCompareAndSet byte");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact((byte)0x23, (byte)0x45);
             assertEquals(success, false, "failing weakCompareAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x01, "failing weakCompareAndSetRe byte value");
+            assertEquals((byte)0x01, x, "failing weakCompareAndSetRe byte value");
         }
 
         // Compare set and get
@@ -584,9 +582,9 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_SET).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSet byte");
+            assertEquals((byte)0x01, o, "getAndSet byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "getAndSet byte value");
+            assertEquals((byte)0x23, x, "getAndSet byte value");
         }
 
         // Compare set and get
@@ -594,9 +592,9 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSetAcquire byte");
+            assertEquals((byte)0x01, o, "getAndSetAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "getAndSetAcquire byte value");
+            assertEquals((byte)0x23, x, "getAndSetAcquire byte value");
         }
 
         // Compare set and get
@@ -604,9 +602,9 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndSetRelease byte");
+            assertEquals((byte)0x01, o, "getAndSetRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)0x23, "getAndSetRelease byte value");
+            assertEquals((byte)0x23, x, "getAndSetRelease byte value");
         }
 
         // get and add, add and get
@@ -614,27 +612,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAdd byte");
+            assertEquals((byte)0x01, o, "getAndAdd byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAdd byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddAcquire byte");
+            assertEquals((byte)0x01, o, "getAndAddAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddAcquire byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndAddRelease byte");
+            assertEquals((byte)0x01, o, "getAndAddRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddRelease byte value");
+            assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddRelease byte value");
         }
 
         // get and bitwise or
@@ -642,27 +640,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOr byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOr byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOr byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOr byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrAcquire byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrRelease byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrRelease byte value");
         }
 
         // get and bitwise and
@@ -670,27 +668,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAnd byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAnd byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAnd byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAnd byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndAcquire byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndRelease byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndRelease byte value");
         }
 
         // get and bitwise xor
@@ -698,27 +696,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXor byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXor byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXor byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXor byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorAcquire byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact((byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorRelease byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorRelease byte value");
         }
     }
 
@@ -736,7 +734,7 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "get byte value");
+                assertEquals((byte)0x01, x, "get byte value");
             }
 
 
@@ -744,21 +742,21 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, (byte)0x23);
                 byte x = (byte) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "setVolatile byte value");
+                assertEquals((byte)0x23, x, "setVolatile byte value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, (byte)0x01);
                 byte x = (byte) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "setRelease byte value");
+                assertEquals((byte)0x01, x, "setRelease byte value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, (byte)0x23);
                 byte x = (byte) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "setOpaque byte value");
+                assertEquals((byte)0x23, x, "setOpaque byte value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
@@ -768,56 +766,56 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, (byte)0x01, (byte)0x23);
                 assertEquals(r, true, "success compareAndSet byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "success compareAndSet byte value");
+                assertEquals((byte)0x23, x, "success compareAndSet byte value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(r, false, "failing compareAndSet byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "failing compareAndSet byte value");
+                assertEquals((byte)0x23, x, "failing compareAndSet byte value");
             }
 
             {
                 byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, (byte)0x23, (byte)0x01);
                 assertEquals(r, (byte)0x23, "success compareAndExchange byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "success compareAndExchange byte value");
+                assertEquals((byte)0x01, x, "success compareAndExchange byte value");
             }
 
             {
                 byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(r, (byte)0x01, "failing compareAndExchange byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "failing compareAndExchange byte value");
+                assertEquals((byte)0x01, x, "failing compareAndExchange byte value");
             }
 
             {
                 byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, (byte)0x01, (byte)0x23);
                 assertEquals(r, (byte)0x01, "success compareAndExchangeAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "success compareAndExchangeAcquire byte value");
+                assertEquals((byte)0x23, x, "success compareAndExchangeAcquire byte value");
             }
 
             {
                 byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(r, (byte)0x23, "failing compareAndExchangeAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "failing compareAndExchangeAcquire byte value");
+                assertEquals((byte)0x23, x, "failing compareAndExchangeAcquire byte value");
             }
 
             {
                 byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, (byte)0x23, (byte)0x01);
                 assertEquals(r, (byte)0x23, "success compareAndExchangeRelease byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "success compareAndExchangeRelease byte value");
+                assertEquals((byte)0x01, x, "success compareAndExchangeRelease byte value");
             }
 
             {
                 byte r = (byte) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(r, (byte)0x01, "failing compareAndExchangeRelease byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "failing compareAndExchangeRelease byte value");
+                assertEquals((byte)0x01, x, "failing compareAndExchangeRelease byte value");
             }
 
             {
@@ -829,14 +827,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "success weakCompareAndSetPlain byte value");
+                assertEquals((byte)0x23, x, "success weakCompareAndSetPlain byte value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSetPlain byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "failing weakCompareAndSetPlain byte value");
+                assertEquals((byte)0x23, x, "failing weakCompareAndSetPlain byte value");
             }
 
             {
@@ -848,14 +846,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "success weakCompareAndSetAcquire byte");
+                assertEquals((byte)0x01, x, "success weakCompareAndSetAcquire byte");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "failing weakCompareAndSetAcquire byte value");
+                assertEquals((byte)0x01, x, "failing weakCompareAndSetAcquire byte value");
             }
 
             {
@@ -867,14 +865,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "success weakCompareAndSetRelease byte");
+                assertEquals((byte)0x23, x, "success weakCompareAndSetRelease byte");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, (byte)0x01, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "failing weakCompareAndSetAcquire byte value");
+                assertEquals((byte)0x23, x, "failing weakCompareAndSetAcquire byte value");
             }
 
             {
@@ -886,14 +884,14 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "success weakCompareAndSet byte");
+                assertEquals((byte)0x01, x, "success weakCompareAndSet byte");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, (byte)0x23, (byte)0x45);
                 assertEquals(success, false, "failing weakCompareAndSet byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x01, "failing weakCompareAndSet byte value");
+                assertEquals((byte)0x01, x, "failing weakCompareAndSet byte value");
             }
 
             // Compare set and get
@@ -901,27 +899,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
                 byte o = (byte) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndSet byte");
+                assertEquals((byte)0x01, o, "getAndSet byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "getAndSet byte value");
+                assertEquals((byte)0x23, x, "getAndSet byte value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
                 byte o = (byte) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndSetAcquire byte");
+                assertEquals((byte)0x01, o, "getAndSetAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "getAndSetAcquire byte value");
+                assertEquals((byte)0x23, x, "getAndSetAcquire byte value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
                 byte o = (byte) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndSetRelease byte");
+                assertEquals((byte)0x01, o, "getAndSetRelease byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)0x23, "getAndSetRelease byte value");
+                assertEquals((byte)0x23, x, "getAndSetRelease byte value");
             }
 
             // get and add, add and get
@@ -929,27 +927,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
                 byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndAdd byte");
+                assertEquals((byte)0x01, o, "getAndAdd byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAdd byte value");
+                assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAdd byte value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
                 byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndAddAcquire byte");
+                assertEquals((byte)0x01, o, "getAndAddAcquire byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddAcquire byte value");
+                assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddAcquire byte value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
                 byte o = (byte) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, (byte)0x23);
-                assertEquals(o, (byte)0x01, "getAndAddRelease byte");
+                assertEquals((byte)0x01, o, "getAndAddRelease byte");
                 byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (byte)((byte)0x01 + (byte)0x23), "getAndAddRelease byte value");
+                assertEquals((byte)((byte)0x01 + (byte)0x23), x, "getAndAddRelease byte value");
             }
 
         // get and bitwise or
@@ -957,27 +955,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOr byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOr byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOr byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOr byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrAcquire byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseOrRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseOrRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 | (byte)0x23), "getAndBitwiseOrRelease byte value");
+            assertEquals((byte)((byte)0x01 | (byte)0x23), x, "getAndBitwiseOrRelease byte value");
         }
 
         // get and bitwise and
@@ -985,27 +983,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAnd byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAnd byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAnd byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAnd byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndAcquire byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseAndRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseAndRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 & (byte)0x23), "getAndBitwiseAndRelease byte value");
+            assertEquals((byte)((byte)0x01 & (byte)0x23), x, "getAndBitwiseAndRelease byte value");
         }
 
         // get and bitwise xor
@@ -1013,27 +1011,27 @@ public class VarHandleTestMethodHandleAccessByte extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXor byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXor byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXor byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXor byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorAcquire byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorAcquire byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorAcquire byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorAcquire byte value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (byte)0x01);
 
             byte o = (byte) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, (byte)0x23);
-            assertEquals(o, (byte)0x01, "getAndBitwiseXorRelease byte");
+            assertEquals((byte)0x01, o, "getAndBitwiseXorRelease byte");
             byte x = (byte) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (byte)((byte)0x01 ^ (byte)0x23), "getAndBitwiseXorRelease byte value");
+            assertEquals((byte)((byte)0x01 ^ (byte)0x23), x, "getAndBitwiseXorRelease byte value");
         }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
index d191b507366..3e31ee282ff 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessChar
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessChar
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
     static final char static_final_v = '\u0123';
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessChar.class, "final_v", char.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(char[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessChar recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "set char value");
+            assertEquals('\u0123', x, "set char value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, '\u4567');
             char x = (char) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, '\u4567', "setVolatile char value");
+            assertEquals('\u4567', x, "setVolatile char value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, '\u0123');
             char x = (char) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, '\u0123', "setRelease char value");
+            assertEquals('\u0123', x, "setRelease char value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, '\u4567');
             char x = (char) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, '\u4567', "setOpaque char value");
+            assertEquals('\u4567', x, "setOpaque char value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, '\u0123', '\u4567');
             assertEquals(r, true, "success compareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "success compareAndSet char value");
+            assertEquals('\u4567', x, "success compareAndSet char value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, '\u0123', '\u89AB');
             assertEquals(r, false, "failing compareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "failing compareAndSet char value");
+            assertEquals('\u4567', x, "failing compareAndSet char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, '\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchange char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "success compareAndExchange char value");
+            assertEquals('\u0123', x, "success compareAndExchange char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, '\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchange char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "failing compareAndExchange char value");
+            assertEquals('\u0123', x, "failing compareAndExchange char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, '\u0123', '\u4567');
             assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "success compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, '\u0123', '\u89AB');
             assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "failing compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, '\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchangeRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "success compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "success compareAndExchangeRelease char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, '\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchangeRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "failing compareAndExchangeRelease char value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "success weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "success weakCompareAndSetPlain char value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, '\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetPlain char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "failing weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetPlain char value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "success weakCompareAndSetAcquire char");
+            assertEquals('\u0123', x, "success weakCompareAndSetAcquire char");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, '\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "failing weakCompareAndSetAcquire char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSetAcquire char value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "success weakCompareAndSetRelease char");
+            assertEquals('\u4567', x, "success weakCompareAndSetRelease char");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, '\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "failing weakCompareAndSetRelease char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetRelease char value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "success weakCompareAndSet char");
+            assertEquals('\u0123', x, "success weakCompareAndSet char");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, '\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u0123', "failing weakCompareAndSet char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSet char value");
         }
 
         // Compare set and get
         {
             char o = (char) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndSet char");
+            assertEquals('\u0123', o, "getAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, '\u4567', "getAndSet char value");
+            assertEquals('\u4567', x, "getAndSet char value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndAdd char");
+            assertEquals('\u0123', o, "getAndAdd char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAdd char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndAddAcquire char");
+            assertEquals('\u0123', o, "getAndAddAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddAcquire char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndAddRelease char");
+            assertEquals('\u0123', o, "getAndAddRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddRelease char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddRelease char value");
         }
 
         // get and bitwise or
@@ -327,27 +325,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOr char");
+            assertEquals('\u0123', o, "getAndBitwiseOr char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOr char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOr char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseOrAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrAcquire char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseOrRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrRelease char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrRelease char value");
         }
 
         // get and bitwise and
@@ -355,27 +353,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAnd char");
+            assertEquals('\u0123', o, "getAndBitwiseAnd char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAnd char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAnd char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseAndAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndAcquire char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseAndRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndRelease char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndRelease char value");
         }
 
         // get and bitwise xor
@@ -383,27 +381,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXor char");
+            assertEquals('\u0123', o, "getAndBitwiseXor char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXor char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXor char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseXorAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorAcquire char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseXorRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorRelease char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorRelease char value");
         }
     }
 
@@ -418,7 +416,7 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "set char value");
+            assertEquals('\u0123', x, "set char value");
         }
 
 
@@ -426,21 +424,21 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact('\u4567');
             char x = (char) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, '\u4567', "setVolatile char value");
+            assertEquals('\u4567', x, "setVolatile char value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact('\u0123');
             char x = (char) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, '\u0123', "setRelease char value");
+            assertEquals('\u0123', x, "setRelease char value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact('\u4567');
             char x = (char) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, '\u4567', "setOpaque char value");
+            assertEquals('\u4567', x, "setOpaque char value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact('\u0123');
@@ -450,56 +448,56 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact('\u0123', '\u4567');
             assertEquals(r, true, "success compareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "success compareAndSet char value");
+            assertEquals('\u4567', x, "success compareAndSet char value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact('\u0123', '\u89AB');
             assertEquals(r, false, "failing compareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "failing compareAndSet char value");
+            assertEquals('\u4567', x, "failing compareAndSet char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact('\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchange char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "success compareAndExchange char value");
+            assertEquals('\u0123', x, "success compareAndExchange char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact('\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchange char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "failing compareAndExchange char value");
+            assertEquals('\u0123', x, "failing compareAndExchange char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact('\u0123', '\u4567');
             assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "success compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact('\u0123', '\u89AB');
             assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value");
+            assertEquals('\u4567', x, "failing compareAndExchangeAcquire char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact('\u4567', '\u0123');
             assertEquals(r, '\u4567', "success compareAndExchangeRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "success compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "success compareAndExchangeRelease char value");
         }
 
         {
             char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact('\u4567', '\u89AB');
             assertEquals(r, '\u0123', "failing compareAndExchangeRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value");
+            assertEquals('\u0123', x, "failing compareAndExchangeRelease char value");
         }
 
         {
@@ -511,14 +509,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "success weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "success weakCompareAndSetPlain char value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact('\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetPlain char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "failing weakCompareAndSetPlain char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetPlain char value");
         }
 
         {
@@ -530,7 +528,7 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "success weakCompareAndSetAcquire char");
+            assertEquals('\u0123', x, "success weakCompareAndSetAcquire char");
         }
 
         {
@@ -538,7 +536,7 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact('\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "failing weakCompareAndSetAcquire char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSetAcquire char value");
         }
 
         {
@@ -550,14 +548,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "success weakCompareAndSetRelease char");
+            assertEquals('\u4567', x, "success weakCompareAndSetRelease char");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact('\u0123', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSetRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "failing weakCompareAndSetRelease char value");
+            assertEquals('\u4567', x, "failing weakCompareAndSetRelease char value");
         }
 
         {
@@ -569,14 +567,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "success weakCompareAndSet char");
+            assertEquals('\u0123', x, "success weakCompareAndSet char");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact('\u4567', '\u89AB');
             assertEquals(success, false, "failing weakCompareAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u0123', "failing weakCompareAndSetRe char value");
+            assertEquals('\u0123', x, "failing weakCompareAndSetRe char value");
         }
 
         // Compare set and get
@@ -584,9 +582,9 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_SET).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndSet char");
+            assertEquals('\u0123', o, "getAndSet char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "getAndSet char value");
+            assertEquals('\u4567', x, "getAndSet char value");
         }
 
         // Compare set and get
@@ -594,9 +592,9 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndSetAcquire char");
+            assertEquals('\u0123', o, "getAndSetAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "getAndSetAcquire char value");
+            assertEquals('\u4567', x, "getAndSetAcquire char value");
         }
 
         // Compare set and get
@@ -604,9 +602,9 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndSetRelease char");
+            assertEquals('\u0123', o, "getAndSetRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, '\u4567', "getAndSetRelease char value");
+            assertEquals('\u4567', x, "getAndSetRelease char value");
         }
 
         // get and add, add and get
@@ -614,27 +612,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_ADD).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndAdd char");
+            assertEquals('\u0123', o, "getAndAdd char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAdd char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndAddAcquire char");
+            assertEquals('\u0123', o, "getAndAddAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddAcquire char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndAddRelease char");
+            assertEquals('\u0123', o, "getAndAddRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddRelease char value");
+            assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddRelease char value");
         }
 
         // get and bitwise or
@@ -642,27 +640,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOr char");
+            assertEquals('\u0123', o, "getAndBitwiseOr char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOr char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOr char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseOrAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrAcquire char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseOrRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrRelease char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrRelease char value");
         }
 
         // get and bitwise and
@@ -670,27 +668,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAnd char");
+            assertEquals('\u0123', o, "getAndBitwiseAnd char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAnd char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAnd char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseAndAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndAcquire char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseAndRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndRelease char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndRelease char value");
         }
 
         // get and bitwise xor
@@ -698,27 +696,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXor char");
+            assertEquals('\u0123', o, "getAndBitwiseXor char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXor char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXor char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseXorAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorAcquire char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact('\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact('\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseXorRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorRelease char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorRelease char value");
         }
     }
 
@@ -736,7 +734,7 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "get char value");
+                assertEquals('\u0123', x, "get char value");
             }
 
 
@@ -744,21 +742,21 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, '\u4567');
                 char x = (char) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, '\u4567', "setVolatile char value");
+                assertEquals('\u4567', x, "setVolatile char value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, '\u0123');
                 char x = (char) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, '\u0123', "setRelease char value");
+                assertEquals('\u0123', x, "setRelease char value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, '\u4567');
                 char x = (char) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, '\u4567', "setOpaque char value");
+                assertEquals('\u4567', x, "setOpaque char value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
@@ -768,56 +766,56 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, '\u0123', '\u4567');
                 assertEquals(r, true, "success compareAndSet char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "success compareAndSet char value");
+                assertEquals('\u4567', x, "success compareAndSet char value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, '\u0123', '\u89AB');
                 assertEquals(r, false, "failing compareAndSet char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "failing compareAndSet char value");
+                assertEquals('\u4567', x, "failing compareAndSet char value");
             }
 
             {
                 char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, '\u4567', '\u0123');
                 assertEquals(r, '\u4567', "success compareAndExchange char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "success compareAndExchange char value");
+                assertEquals('\u0123', x, "success compareAndExchange char value");
             }
 
             {
                 char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, '\u4567', '\u89AB');
                 assertEquals(r, '\u0123', "failing compareAndExchange char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "failing compareAndExchange char value");
+                assertEquals('\u0123', x, "failing compareAndExchange char value");
             }
 
             {
                 char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, '\u0123', '\u4567');
                 assertEquals(r, '\u0123', "success compareAndExchangeAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "success compareAndExchangeAcquire char value");
+                assertEquals('\u4567', x, "success compareAndExchangeAcquire char value");
             }
 
             {
                 char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, '\u0123', '\u89AB');
                 assertEquals(r, '\u4567', "failing compareAndExchangeAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "failing compareAndExchangeAcquire char value");
+                assertEquals('\u4567', x, "failing compareAndExchangeAcquire char value");
             }
 
             {
                 char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, '\u4567', '\u0123');
                 assertEquals(r, '\u4567', "success compareAndExchangeRelease char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "success compareAndExchangeRelease char value");
+                assertEquals('\u0123', x, "success compareAndExchangeRelease char value");
             }
 
             {
                 char r = (char) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, '\u4567', '\u89AB');
                 assertEquals(r, '\u0123', "failing compareAndExchangeRelease char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "failing compareAndExchangeRelease char value");
+                assertEquals('\u0123', x, "failing compareAndExchangeRelease char value");
             }
 
             {
@@ -829,14 +827,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "success weakCompareAndSetPlain char value");
+                assertEquals('\u4567', x, "success weakCompareAndSetPlain char value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, '\u0123', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSetPlain char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "failing weakCompareAndSetPlain char value");
+                assertEquals('\u4567', x, "failing weakCompareAndSetPlain char value");
             }
 
             {
@@ -848,14 +846,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "success weakCompareAndSetAcquire char");
+                assertEquals('\u0123', x, "success weakCompareAndSetAcquire char");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, '\u4567', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSetAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "failing weakCompareAndSetAcquire char value");
+                assertEquals('\u0123', x, "failing weakCompareAndSetAcquire char value");
             }
 
             {
@@ -867,14 +865,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "success weakCompareAndSetRelease char");
+                assertEquals('\u4567', x, "success weakCompareAndSetRelease char");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, '\u0123', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSetAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "failing weakCompareAndSetAcquire char value");
+                assertEquals('\u4567', x, "failing weakCompareAndSetAcquire char value");
             }
 
             {
@@ -886,14 +884,14 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "success weakCompareAndSet char");
+                assertEquals('\u0123', x, "success weakCompareAndSet char");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, '\u4567', '\u89AB');
                 assertEquals(success, false, "failing weakCompareAndSet char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u0123', "failing weakCompareAndSet char value");
+                assertEquals('\u0123', x, "failing weakCompareAndSet char value");
             }
 
             // Compare set and get
@@ -901,27 +899,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
                 char o = (char) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndSet char");
+                assertEquals('\u0123', o, "getAndSet char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "getAndSet char value");
+                assertEquals('\u4567', x, "getAndSet char value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
                 char o = (char) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndSetAcquire char");
+                assertEquals('\u0123', o, "getAndSetAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "getAndSetAcquire char value");
+                assertEquals('\u4567', x, "getAndSetAcquire char value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
                 char o = (char) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndSetRelease char");
+                assertEquals('\u0123', o, "getAndSetRelease char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, '\u4567', "getAndSetRelease char value");
+                assertEquals('\u4567', x, "getAndSetRelease char value");
             }
 
             // get and add, add and get
@@ -929,27 +927,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
                 char o = (char) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndAdd char");
+                assertEquals('\u0123', o, "getAndAdd char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAdd char value");
+                assertEquals((char)('\u0123' + '\u4567'), x, "getAndAdd char value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
                 char o = (char) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndAddAcquire char");
+                assertEquals('\u0123', o, "getAndAddAcquire char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddAcquire char value");
+                assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddAcquire char value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
                 char o = (char) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, '\u4567');
-                assertEquals(o, '\u0123', "getAndAddRelease char");
+                assertEquals('\u0123', o, "getAndAddRelease char");
                 char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (char)('\u0123' + '\u4567'), "getAndAddRelease char value");
+                assertEquals((char)('\u0123' + '\u4567'), x, "getAndAddRelease char value");
             }
 
         // get and bitwise or
@@ -957,27 +955,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOr char");
+            assertEquals('\u0123', o, "getAndBitwiseOr char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOr char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOr char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseOrAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrAcquire char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseOrRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseOrRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' | '\u4567'), "getAndBitwiseOrRelease char value");
+            assertEquals((char)('\u0123' | '\u4567'), x, "getAndBitwiseOrRelease char value");
         }
 
         // get and bitwise and
@@ -985,27 +983,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAnd char");
+            assertEquals('\u0123', o, "getAndBitwiseAnd char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAnd char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAnd char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseAndAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndAcquire char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseAndRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseAndRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' & '\u4567'), "getAndBitwiseAndRelease char value");
+            assertEquals((char)('\u0123' & '\u4567'), x, "getAndBitwiseAndRelease char value");
         }
 
         // get and bitwise xor
@@ -1013,27 +1011,27 @@ public class VarHandleTestMethodHandleAccessChar extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXor char");
+            assertEquals('\u0123', o, "getAndBitwiseXor char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXor char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXor char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorAcquire char");
+            assertEquals('\u0123', o, "getAndBitwiseXorAcquire char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorAcquire char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorAcquire char value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, '\u0123');
 
             char o = (char) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, '\u4567');
-            assertEquals(o, '\u0123', "getAndBitwiseXorRelease char");
+            assertEquals('\u0123', o, "getAndBitwiseXorRelease char");
             char x = (char) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (char)('\u0123' ^ '\u4567'), "getAndBitwiseXorRelease char value");
+            assertEquals((char)('\u0123' ^ '\u4567'), x, "getAndBitwiseXorRelease char value");
         }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
index fe0455d2375..056d45478ed 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessDouble
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessDouble
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
     static final double static_final_v = 1.0d;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessDouble.class, "final_v", double.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(double[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessDouble recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0d);
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "set double value");
+            assertEquals(1.0d, x, "set double value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, 2.0d);
             double x = (double) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, 2.0d, "setVolatile double value");
+            assertEquals(2.0d, x, "setVolatile double value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, 1.0d);
             double x = (double) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, 1.0d, "setRelease double value");
+            assertEquals(1.0d, x, "setRelease double value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, 2.0d);
             double x = (double) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, 2.0d, "setOpaque double value");
+            assertEquals(2.0d, x, "setOpaque double value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, 1.0d);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 1.0d, 2.0d);
             assertEquals(r, true, "success compareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "success compareAndSet double value");
+            assertEquals(2.0d, x, "success compareAndSet double value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 1.0d, 3.0d);
             assertEquals(r, false, "failing compareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "failing compareAndSet double value");
+            assertEquals(2.0d, x, "failing compareAndSet double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchange double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "success compareAndExchange double value");
+            assertEquals(1.0d, x, "success compareAndExchange double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchange double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "failing compareAndExchange double value");
+            assertEquals(1.0d, x, "failing compareAndExchange double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 1.0d, 2.0d);
             assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "success compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 1.0d, 3.0d);
             assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "failing compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "success compareAndExchangeRelease double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "failing compareAndExchangeRelease double value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "success weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "success weakCompareAndSetPlain double value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, 1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetPlain double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "failing weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetPlain double value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "success weakCompareAndSetAcquire double");
+            assertEquals(1.0d, x, "success weakCompareAndSetAcquire double");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "failing weakCompareAndSetAcquire double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSetAcquire double value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "success weakCompareAndSetRelease double");
+            assertEquals(2.0d, x, "success weakCompareAndSetRelease double");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "failing weakCompareAndSetRelease double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetRelease double value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "success weakCompareAndSet double");
+            assertEquals(1.0d, x, "success weakCompareAndSet double");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0d, "failing weakCompareAndSet double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSet double value");
         }
 
         // Compare set and get
         {
             double o = (double) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndSet double");
+            assertEquals(1.0d, o, "getAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0d, "getAndSet double value");
+            assertEquals(2.0d, x, "getAndSet double value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndAdd double");
+            assertEquals(1.0d, o, "getAndAdd double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAdd double value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndAddAcquire double");
+            assertEquals(1.0d, o, "getAndAddAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddAcquire double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddAcquire double value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, 2.0d);
-            assertEquals(o, 1.0d, "getAndAddRelease double");
+            assertEquals(1.0d, o, "getAndAddRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddRelease double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddRelease double value");
         }
 
     }
@@ -340,7 +338,7 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "set double value");
+            assertEquals(1.0d, x, "set double value");
         }
 
 
@@ -348,21 +346,21 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(2.0d);
             double x = (double) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, 2.0d, "setVolatile double value");
+            assertEquals(2.0d, x, "setVolatile double value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(1.0d);
             double x = (double) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, 1.0d, "setRelease double value");
+            assertEquals(1.0d, x, "setRelease double value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(2.0d);
             double x = (double) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, 2.0d, "setOpaque double value");
+            assertEquals(2.0d, x, "setOpaque double value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(1.0d);
@@ -372,56 +370,56 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(1.0d, 2.0d);
             assertEquals(r, true, "success compareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "success compareAndSet double value");
+            assertEquals(2.0d, x, "success compareAndSet double value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(1.0d, 3.0d);
             assertEquals(r, false, "failing compareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "failing compareAndSet double value");
+            assertEquals(2.0d, x, "failing compareAndSet double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchange double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "success compareAndExchange double value");
+            assertEquals(1.0d, x, "success compareAndExchange double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchange double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "failing compareAndExchange double value");
+            assertEquals(1.0d, x, "failing compareAndExchange double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(1.0d, 2.0d);
             assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "success compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(1.0d, 3.0d);
             assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+            assertEquals(2.0d, x, "failing compareAndExchangeAcquire double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(2.0d, 1.0d);
             assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "success compareAndExchangeRelease double value");
         }
 
         {
             double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(2.0d, 3.0d);
             assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+            assertEquals(1.0d, x, "failing compareAndExchangeRelease double value");
         }
 
         {
@@ -433,14 +431,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "success weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "success weakCompareAndSetPlain double value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetPlain double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "failing weakCompareAndSetPlain double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetPlain double value");
         }
 
         {
@@ -452,7 +450,7 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "success weakCompareAndSetAcquire double");
+            assertEquals(1.0d, x, "success weakCompareAndSetAcquire double");
         }
 
         {
@@ -460,7 +458,7 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact(2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "failing weakCompareAndSetAcquire double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSetAcquire double value");
         }
 
         {
@@ -472,14 +470,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "success weakCompareAndSetRelease double");
+            assertEquals(2.0d, x, "success weakCompareAndSetRelease double");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(1.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSetRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "failing weakCompareAndSetRelease double value");
+            assertEquals(2.0d, x, "failing weakCompareAndSetRelease double value");
         }
 
         {
@@ -491,14 +489,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "success weakCompareAndSet double");
+            assertEquals(1.0d, x, "success weakCompareAndSet double");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(2.0d, 3.0d);
             assertEquals(success, false, "failing weakCompareAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0d, "failing weakCompareAndSetRe double value");
+            assertEquals(1.0d, x, "failing weakCompareAndSetRe double value");
         }
 
         // Compare set and get
@@ -506,9 +504,9 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_SET).invokeExact(2.0d);
-            assertEquals(o, 1.0d, "getAndSet double");
+            assertEquals(1.0d, o, "getAndSet double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "getAndSet double value");
+            assertEquals(2.0d, x, "getAndSet double value");
         }
 
         // Compare set and get
@@ -516,9 +514,9 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(2.0d);
-            assertEquals(o, 1.0d, "getAndSetAcquire double");
+            assertEquals(1.0d, o, "getAndSetAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "getAndSetAcquire double value");
+            assertEquals(2.0d, x, "getAndSetAcquire double value");
         }
 
         // Compare set and get
@@ -526,9 +524,9 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(2.0d);
-            assertEquals(o, 1.0d, "getAndSetRelease double");
+            assertEquals(1.0d, o, "getAndSetRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0d, "getAndSetRelease double value");
+            assertEquals(2.0d, x, "getAndSetRelease double value");
         }
 
         // get and add, add and get
@@ -536,27 +534,27 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(2.0d);
-            assertEquals(o, 1.0d, "getAndAdd double");
+            assertEquals(1.0d, o, "getAndAdd double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAdd double value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(2.0d);
-            assertEquals(o, 1.0d, "getAndAddAcquire double");
+            assertEquals(1.0d, o, "getAndAddAcquire double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddAcquire double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddAcquire double value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(1.0d);
 
             double o = (double) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(2.0d);
-            assertEquals(o, 1.0d, "getAndAddRelease double");
+            assertEquals(1.0d, o, "getAndAddRelease double");
             double x = (double) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (double)(1.0d + 2.0d), "getAndAddRelease double value");
+            assertEquals((double)(1.0d + 2.0d), x, "getAndAddRelease double value");
         }
 
     }
@@ -580,7 +578,7 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "get double value");
+                assertEquals(1.0d, x, "get double value");
             }
 
 
@@ -588,21 +586,21 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, 2.0d);
                 double x = (double) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, 2.0d, "setVolatile double value");
+                assertEquals(2.0d, x, "setVolatile double value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, 1.0d);
                 double x = (double) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, 1.0d, "setRelease double value");
+                assertEquals(1.0d, x, "setRelease double value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, 2.0d);
                 double x = (double) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, 2.0d, "setOpaque double value");
+                assertEquals(2.0d, x, "setOpaque double value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
@@ -612,56 +610,56 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 1.0d, 2.0d);
                 assertEquals(r, true, "success compareAndSet double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "success compareAndSet double value");
+                assertEquals(2.0d, x, "success compareAndSet double value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 1.0d, 3.0d);
                 assertEquals(r, false, "failing compareAndSet double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "failing compareAndSet double value");
+                assertEquals(2.0d, x, "failing compareAndSet double value");
             }
 
             {
                 double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 2.0d, 1.0d);
                 assertEquals(r, 2.0d, "success compareAndExchange double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "success compareAndExchange double value");
+                assertEquals(1.0d, x, "success compareAndExchange double value");
             }
 
             {
                 double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 2.0d, 3.0d);
                 assertEquals(r, 1.0d, "failing compareAndExchange double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "failing compareAndExchange double value");
+                assertEquals(1.0d, x, "failing compareAndExchange double value");
             }
 
             {
                 double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 1.0d, 2.0d);
                 assertEquals(r, 1.0d, "success compareAndExchangeAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "success compareAndExchangeAcquire double value");
+                assertEquals(2.0d, x, "success compareAndExchangeAcquire double value");
             }
 
             {
                 double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 1.0d, 3.0d);
                 assertEquals(r, 2.0d, "failing compareAndExchangeAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "failing compareAndExchangeAcquire double value");
+                assertEquals(2.0d, x, "failing compareAndExchangeAcquire double value");
             }
 
             {
                 double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 2.0d, 1.0d);
                 assertEquals(r, 2.0d, "success compareAndExchangeRelease double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "success compareAndExchangeRelease double value");
+                assertEquals(1.0d, x, "success compareAndExchangeRelease double value");
             }
 
             {
                 double r = (double) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 2.0d, 3.0d);
                 assertEquals(r, 1.0d, "failing compareAndExchangeRelease double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "failing compareAndExchangeRelease double value");
+                assertEquals(1.0d, x, "failing compareAndExchangeRelease double value");
             }
 
             {
@@ -673,14 +671,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "success weakCompareAndSetPlain double value");
+                assertEquals(2.0d, x, "success weakCompareAndSetPlain double value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, 1.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSetPlain double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "failing weakCompareAndSetPlain double value");
+                assertEquals(2.0d, x, "failing weakCompareAndSetPlain double value");
             }
 
             {
@@ -692,14 +690,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "success weakCompareAndSetAcquire double");
+                assertEquals(1.0d, x, "success weakCompareAndSetAcquire double");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 2.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "failing weakCompareAndSetAcquire double value");
+                assertEquals(1.0d, x, "failing weakCompareAndSetAcquire double value");
             }
 
             {
@@ -711,14 +709,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "success weakCompareAndSetRelease double");
+                assertEquals(2.0d, x, "success weakCompareAndSetRelease double");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 1.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "failing weakCompareAndSetAcquire double value");
+                assertEquals(2.0d, x, "failing weakCompareAndSetAcquire double value");
             }
 
             {
@@ -730,14 +728,14 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "success weakCompareAndSet double");
+                assertEquals(1.0d, x, "success weakCompareAndSet double");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 2.0d, 3.0d);
                 assertEquals(success, false, "failing weakCompareAndSet double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0d, "failing weakCompareAndSet double value");
+                assertEquals(1.0d, x, "failing weakCompareAndSet double value");
             }
 
             // Compare set and get
@@ -745,27 +743,27 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
 
                 double o = (double) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndSet double");
+                assertEquals(1.0d, o, "getAndSet double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "getAndSet double value");
+                assertEquals(2.0d, x, "getAndSet double value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
 
                 double o = (double) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndSetAcquire double");
+                assertEquals(1.0d, o, "getAndSetAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "getAndSetAcquire double value");
+                assertEquals(2.0d, x, "getAndSetAcquire double value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
 
                 double o = (double) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndSetRelease double");
+                assertEquals(1.0d, o, "getAndSetRelease double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0d, "getAndSetRelease double value");
+                assertEquals(2.0d, x, "getAndSetRelease double value");
             }
 
             // get and add, add and get
@@ -773,27 +771,27 @@ public class VarHandleTestMethodHandleAccessDouble extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
 
                 double o = (double) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndAdd double");
+                assertEquals(1.0d, o, "getAndAdd double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (double)(1.0d + 2.0d), "getAndAdd double value");
+                assertEquals((double)(1.0d + 2.0d), x, "getAndAdd double value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
 
                 double o = (double) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndAddAcquire double");
+                assertEquals(1.0d, o, "getAndAddAcquire double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (double)(1.0d + 2.0d), "getAndAddAcquire double value");
+                assertEquals((double)(1.0d + 2.0d), x, "getAndAddAcquire double value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0d);
 
                 double o = (double) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, 2.0d);
-                assertEquals(o, 1.0d, "getAndAddRelease double");
+                assertEquals(1.0d, o, "getAndAddRelease double");
                 double x = (double) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (double)(1.0d + 2.0d), "getAndAddRelease double value");
+                assertEquals((double)(1.0d + 2.0d), x, "getAndAddRelease double value");
             }
 
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
index 256e4723eec..98eb72301cb 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessFloat
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessFloat
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
     static final float static_final_v = 1.0f;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessFloat.class, "final_v", float.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(float[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessFloat recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0f);
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "set float value");
+            assertEquals(1.0f, x, "set float value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, 2.0f);
             float x = (float) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, 2.0f, "setVolatile float value");
+            assertEquals(2.0f, x, "setVolatile float value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, 1.0f);
             float x = (float) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, 1.0f, "setRelease float value");
+            assertEquals(1.0f, x, "setRelease float value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, 2.0f);
             float x = (float) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, 2.0f, "setOpaque float value");
+            assertEquals(2.0f, x, "setOpaque float value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, 1.0f);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 1.0f, 2.0f);
             assertEquals(r, true, "success compareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "success compareAndSet float value");
+            assertEquals(2.0f, x, "success compareAndSet float value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 1.0f, 3.0f);
             assertEquals(r, false, "failing compareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "failing compareAndSet float value");
+            assertEquals(2.0f, x, "failing compareAndSet float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchange float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "success compareAndExchange float value");
+            assertEquals(1.0f, x, "success compareAndExchange float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchange float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "failing compareAndExchange float value");
+            assertEquals(1.0f, x, "failing compareAndExchange float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 1.0f, 2.0f);
             assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "success compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 1.0f, 3.0f);
             assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "failing compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "success compareAndExchangeRelease float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "failing compareAndExchangeRelease float value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "success weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "success weakCompareAndSetPlain float value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, 1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetPlain float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "failing weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetPlain float value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "success weakCompareAndSetAcquire float");
+            assertEquals(1.0f, x, "success weakCompareAndSetAcquire float");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "failing weakCompareAndSetAcquire float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSetAcquire float value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "success weakCompareAndSetRelease float");
+            assertEquals(2.0f, x, "success weakCompareAndSetRelease float");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "failing weakCompareAndSetRelease float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetRelease float value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "success weakCompareAndSet float");
+            assertEquals(1.0f, x, "success weakCompareAndSet float");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 1.0f, "failing weakCompareAndSet float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSet float value");
         }
 
         // Compare set and get
         {
             float o = (float) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndSet float");
+            assertEquals(1.0f, o, "getAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 2.0f, "getAndSet float value");
+            assertEquals(2.0f, x, "getAndSet float value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndAdd float");
+            assertEquals(1.0f, o, "getAndAdd float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAdd float value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndAddAcquire float");
+            assertEquals(1.0f, o, "getAndAddAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddAcquire float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddAcquire float value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, 2.0f);
-            assertEquals(o, 1.0f, "getAndAddRelease float");
+            assertEquals(1.0f, o, "getAndAddRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddRelease float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddRelease float value");
         }
 
     }
@@ -340,7 +338,7 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "set float value");
+            assertEquals(1.0f, x, "set float value");
         }
 
 
@@ -348,21 +346,21 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(2.0f);
             float x = (float) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, 2.0f, "setVolatile float value");
+            assertEquals(2.0f, x, "setVolatile float value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(1.0f);
             float x = (float) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, 1.0f, "setRelease float value");
+            assertEquals(1.0f, x, "setRelease float value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(2.0f);
             float x = (float) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, 2.0f, "setOpaque float value");
+            assertEquals(2.0f, x, "setOpaque float value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(1.0f);
@@ -372,56 +370,56 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(1.0f, 2.0f);
             assertEquals(r, true, "success compareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "success compareAndSet float value");
+            assertEquals(2.0f, x, "success compareAndSet float value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(1.0f, 3.0f);
             assertEquals(r, false, "failing compareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "failing compareAndSet float value");
+            assertEquals(2.0f, x, "failing compareAndSet float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchange float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "success compareAndExchange float value");
+            assertEquals(1.0f, x, "success compareAndExchange float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchange float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "failing compareAndExchange float value");
+            assertEquals(1.0f, x, "failing compareAndExchange float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(1.0f, 2.0f);
             assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "success compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(1.0f, 3.0f);
             assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+            assertEquals(2.0f, x, "failing compareAndExchangeAcquire float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(2.0f, 1.0f);
             assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "success compareAndExchangeRelease float value");
         }
 
         {
             float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(2.0f, 3.0f);
             assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+            assertEquals(1.0f, x, "failing compareAndExchangeRelease float value");
         }
 
         {
@@ -433,14 +431,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "success weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "success weakCompareAndSetPlain float value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetPlain float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "failing weakCompareAndSetPlain float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetPlain float value");
         }
 
         {
@@ -452,7 +450,7 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "success weakCompareAndSetAcquire float");
+            assertEquals(1.0f, x, "success weakCompareAndSetAcquire float");
         }
 
         {
@@ -460,7 +458,7 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact(2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "failing weakCompareAndSetAcquire float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSetAcquire float value");
         }
 
         {
@@ -472,14 +470,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "success weakCompareAndSetRelease float");
+            assertEquals(2.0f, x, "success weakCompareAndSetRelease float");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(1.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSetRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "failing weakCompareAndSetRelease float value");
+            assertEquals(2.0f, x, "failing weakCompareAndSetRelease float value");
         }
 
         {
@@ -491,14 +489,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "success weakCompareAndSet float");
+            assertEquals(1.0f, x, "success weakCompareAndSet float");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(2.0f, 3.0f);
             assertEquals(success, false, "failing weakCompareAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 1.0f, "failing weakCompareAndSetRe float value");
+            assertEquals(1.0f, x, "failing weakCompareAndSetRe float value");
         }
 
         // Compare set and get
@@ -506,9 +504,9 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_SET).invokeExact(2.0f);
-            assertEquals(o, 1.0f, "getAndSet float");
+            assertEquals(1.0f, o, "getAndSet float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "getAndSet float value");
+            assertEquals(2.0f, x, "getAndSet float value");
         }
 
         // Compare set and get
@@ -516,9 +514,9 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(2.0f);
-            assertEquals(o, 1.0f, "getAndSetAcquire float");
+            assertEquals(1.0f, o, "getAndSetAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "getAndSetAcquire float value");
+            assertEquals(2.0f, x, "getAndSetAcquire float value");
         }
 
         // Compare set and get
@@ -526,9 +524,9 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(2.0f);
-            assertEquals(o, 1.0f, "getAndSetRelease float");
+            assertEquals(1.0f, o, "getAndSetRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 2.0f, "getAndSetRelease float value");
+            assertEquals(2.0f, x, "getAndSetRelease float value");
         }
 
         // get and add, add and get
@@ -536,27 +534,27 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(2.0f);
-            assertEquals(o, 1.0f, "getAndAdd float");
+            assertEquals(1.0f, o, "getAndAdd float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAdd float value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(2.0f);
-            assertEquals(o, 1.0f, "getAndAddAcquire float");
+            assertEquals(1.0f, o, "getAndAddAcquire float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddAcquire float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddAcquire float value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(1.0f);
 
             float o = (float) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(2.0f);
-            assertEquals(o, 1.0f, "getAndAddRelease float");
+            assertEquals(1.0f, o, "getAndAddRelease float");
             float x = (float) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (float)(1.0f + 2.0f), "getAndAddRelease float value");
+            assertEquals((float)(1.0f + 2.0f), x, "getAndAddRelease float value");
         }
 
     }
@@ -580,7 +578,7 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "get float value");
+                assertEquals(1.0f, x, "get float value");
             }
 
 
@@ -588,21 +586,21 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, 2.0f);
                 float x = (float) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, 2.0f, "setVolatile float value");
+                assertEquals(2.0f, x, "setVolatile float value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, 1.0f);
                 float x = (float) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, 1.0f, "setRelease float value");
+                assertEquals(1.0f, x, "setRelease float value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, 2.0f);
                 float x = (float) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, 2.0f, "setOpaque float value");
+                assertEquals(2.0f, x, "setOpaque float value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
@@ -612,56 +610,56 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 1.0f, 2.0f);
                 assertEquals(r, true, "success compareAndSet float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "success compareAndSet float value");
+                assertEquals(2.0f, x, "success compareAndSet float value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 1.0f, 3.0f);
                 assertEquals(r, false, "failing compareAndSet float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "failing compareAndSet float value");
+                assertEquals(2.0f, x, "failing compareAndSet float value");
             }
 
             {
                 float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 2.0f, 1.0f);
                 assertEquals(r, 2.0f, "success compareAndExchange float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "success compareAndExchange float value");
+                assertEquals(1.0f, x, "success compareAndExchange float value");
             }
 
             {
                 float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 2.0f, 3.0f);
                 assertEquals(r, 1.0f, "failing compareAndExchange float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "failing compareAndExchange float value");
+                assertEquals(1.0f, x, "failing compareAndExchange float value");
             }
 
             {
                 float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 1.0f, 2.0f);
                 assertEquals(r, 1.0f, "success compareAndExchangeAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "success compareAndExchangeAcquire float value");
+                assertEquals(2.0f, x, "success compareAndExchangeAcquire float value");
             }
 
             {
                 float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 1.0f, 3.0f);
                 assertEquals(r, 2.0f, "failing compareAndExchangeAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "failing compareAndExchangeAcquire float value");
+                assertEquals(2.0f, x, "failing compareAndExchangeAcquire float value");
             }
 
             {
                 float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 2.0f, 1.0f);
                 assertEquals(r, 2.0f, "success compareAndExchangeRelease float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "success compareAndExchangeRelease float value");
+                assertEquals(1.0f, x, "success compareAndExchangeRelease float value");
             }
 
             {
                 float r = (float) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 2.0f, 3.0f);
                 assertEquals(r, 1.0f, "failing compareAndExchangeRelease float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "failing compareAndExchangeRelease float value");
+                assertEquals(1.0f, x, "failing compareAndExchangeRelease float value");
             }
 
             {
@@ -673,14 +671,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "success weakCompareAndSetPlain float value");
+                assertEquals(2.0f, x, "success weakCompareAndSetPlain float value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, 1.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSetPlain float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "failing weakCompareAndSetPlain float value");
+                assertEquals(2.0f, x, "failing weakCompareAndSetPlain float value");
             }
 
             {
@@ -692,14 +690,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "success weakCompareAndSetAcquire float");
+                assertEquals(1.0f, x, "success weakCompareAndSetAcquire float");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 2.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "failing weakCompareAndSetAcquire float value");
+                assertEquals(1.0f, x, "failing weakCompareAndSetAcquire float value");
             }
 
             {
@@ -711,14 +709,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "success weakCompareAndSetRelease float");
+                assertEquals(2.0f, x, "success weakCompareAndSetRelease float");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 1.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "failing weakCompareAndSetAcquire float value");
+                assertEquals(2.0f, x, "failing weakCompareAndSetAcquire float value");
             }
 
             {
@@ -730,14 +728,14 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "success weakCompareAndSet float");
+                assertEquals(1.0f, x, "success weakCompareAndSet float");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 2.0f, 3.0f);
                 assertEquals(success, false, "failing weakCompareAndSet float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 1.0f, "failing weakCompareAndSet float value");
+                assertEquals(1.0f, x, "failing weakCompareAndSet float value");
             }
 
             // Compare set and get
@@ -745,27 +743,27 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
 
                 float o = (float) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndSet float");
+                assertEquals(1.0f, o, "getAndSet float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "getAndSet float value");
+                assertEquals(2.0f, x, "getAndSet float value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
 
                 float o = (float) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndSetAcquire float");
+                assertEquals(1.0f, o, "getAndSetAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "getAndSetAcquire float value");
+                assertEquals(2.0f, x, "getAndSetAcquire float value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
 
                 float o = (float) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndSetRelease float");
+                assertEquals(1.0f, o, "getAndSetRelease float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 2.0f, "getAndSetRelease float value");
+                assertEquals(2.0f, x, "getAndSetRelease float value");
             }
 
             // get and add, add and get
@@ -773,27 +771,27 @@ public class VarHandleTestMethodHandleAccessFloat extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
 
                 float o = (float) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndAdd float");
+                assertEquals(1.0f, o, "getAndAdd float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (float)(1.0f + 2.0f), "getAndAdd float value");
+                assertEquals((float)(1.0f + 2.0f), x, "getAndAdd float value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
 
                 float o = (float) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndAddAcquire float");
+                assertEquals(1.0f, o, "getAndAddAcquire float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (float)(1.0f + 2.0f), "getAndAddAcquire float value");
+                assertEquals((float)(1.0f + 2.0f), x, "getAndAddAcquire float value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 1.0f);
 
                 float o = (float) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, 2.0f);
-                assertEquals(o, 1.0f, "getAndAddRelease float");
+                assertEquals(1.0f, o, "getAndAddRelease float");
                 float x = (float) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (float)(1.0f + 2.0f), "getAndAddRelease float value");
+                assertEquals((float)(1.0f + 2.0f), x, "getAndAddRelease float value");
             }
 
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
index d8558e0b070..920d8453bab 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessInt
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessInt
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
     static final int static_final_v = 0x01234567;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessInt.class, "final_v", int.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(int[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessInt recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "set int value");
+            assertEquals(0x01234567, x, "set int value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, 0x89ABCDEF);
             int x = (int) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "setVolatile int value");
+            assertEquals(0x89ABCDEF, x, "setVolatile int value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, 0x01234567);
             int x = (int) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, 0x01234567, "setRelease int value");
+            assertEquals(0x01234567, x, "setRelease int value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, 0x89ABCDEF);
             int x = (int) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "setOpaque int value");
+            assertEquals(0x89ABCDEF, x, "setOpaque int value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 0x01234567, 0x89ABCDEF);
             assertEquals(r, true, "success compareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "success compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndSet int value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(r, false, "failing compareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "failing compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndSet int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchange int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "success compareAndExchange int value");
+            assertEquals(0x01234567, x, "success compareAndExchange int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchange int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "failing compareAndExchange int value");
+            assertEquals(0x01234567, x, "failing compareAndExchange int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 0x01234567, 0x89ABCDEF);
             assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "success compareAndExchangeRelease int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "failing compareAndExchangeRelease int value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetPlain int value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetPlain int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetPlain int value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "success weakCompareAndSetAcquire int");
+            assertEquals(0x01234567, x, "success weakCompareAndSetAcquire int");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "failing weakCompareAndSetAcquire int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSetAcquire int value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetRelease int");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetRelease int");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetRelease int value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "success weakCompareAndSet int");
+            assertEquals(0x01234567, x, "success weakCompareAndSet int");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x01234567, "failing weakCompareAndSet int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSet int value");
         }
 
         // Compare set and get
         {
             int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSet int");
+            assertEquals(0x01234567, o, "getAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x89ABCDEF, "getAndSet int value");
+            assertEquals(0x89ABCDEF, x, "getAndSet int value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAdd int");
+            assertEquals(0x01234567, o, "getAndAdd int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAdd int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddAcquire int");
+            assertEquals(0x01234567, o, "getAndAddAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddAcquire int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddRelease int");
+            assertEquals(0x01234567, o, "getAndAddRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddRelease int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddRelease int value");
         }
 
         // get and bitwise or
@@ -327,27 +325,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOr int");
+            assertEquals(0x01234567, o, "getAndBitwiseOr int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOr int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOr int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrAcquire int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrRelease int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrRelease int value");
         }
 
         // get and bitwise and
@@ -355,27 +353,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAnd int");
+            assertEquals(0x01234567, o, "getAndBitwiseAnd int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAnd int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAnd int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndAcquire int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndRelease int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndRelease int value");
         }
 
         // get and bitwise xor
@@ -383,27 +381,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXor int");
+            assertEquals(0x01234567, o, "getAndBitwiseXor int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXor int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXor int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorAcquire int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorRelease int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorRelease int value");
         }
     }
 
@@ -418,7 +416,7 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "set int value");
+            assertEquals(0x01234567, x, "set int value");
         }
 
 
@@ -426,21 +424,21 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(0x89ABCDEF);
             int x = (int) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "setVolatile int value");
+            assertEquals(0x89ABCDEF, x, "setVolatile int value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(0x01234567);
             int x = (int) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, 0x01234567, "setRelease int value");
+            assertEquals(0x01234567, x, "setRelease int value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(0x89ABCDEF);
             int x = (int) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "setOpaque int value");
+            assertEquals(0x89ABCDEF, x, "setOpaque int value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(0x01234567);
@@ -450,56 +448,56 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(0x01234567, 0x89ABCDEF);
             assertEquals(r, true, "success compareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "success compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndSet int value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(0x01234567, 0xCAFEBABE);
             assertEquals(r, false, "failing compareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "failing compareAndSet int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndSet int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchange int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "success compareAndExchange int value");
+            assertEquals(0x01234567, x, "success compareAndExchange int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchange int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "failing compareAndExchange int value");
+            assertEquals(0x01234567, x, "failing compareAndExchange int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(0x01234567, 0x89ABCDEF);
             assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "success compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(0x01234567, 0xCAFEBABE);
             assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value");
+            assertEquals(0x89ABCDEF, x, "failing compareAndExchangeAcquire int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(0x89ABCDEF, 0x01234567);
             assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "success compareAndExchangeRelease int value");
         }
 
         {
             int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value");
+            assertEquals(0x01234567, x, "failing compareAndExchangeRelease int value");
         }
 
         {
@@ -511,14 +509,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetPlain int value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetPlain int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetPlain int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetPlain int value");
         }
 
         {
@@ -530,7 +528,7 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "success weakCompareAndSetAcquire int");
+            assertEquals(0x01234567, x, "success weakCompareAndSetAcquire int");
         }
 
         {
@@ -538,7 +536,7 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "failing weakCompareAndSetAcquire int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSetAcquire int value");
         }
 
         {
@@ -550,14 +548,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetRelease int");
+            assertEquals(0x89ABCDEF, x, "success weakCompareAndSetRelease int");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(0x01234567, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetRelease int value");
         }
 
         {
@@ -569,14 +567,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "success weakCompareAndSet int");
+            assertEquals(0x01234567, x, "success weakCompareAndSet int");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(0x89ABCDEF, 0xCAFEBABE);
             assertEquals(success, false, "failing weakCompareAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x01234567, "failing weakCompareAndSetRe int value");
+            assertEquals(0x01234567, x, "failing weakCompareAndSetRe int value");
         }
 
         // Compare set and get
@@ -584,9 +582,9 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSet int");
+            assertEquals(0x01234567, o, "getAndSet int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "getAndSet int value");
+            assertEquals(0x89ABCDEF, x, "getAndSet int value");
         }
 
         // Compare set and get
@@ -594,9 +592,9 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSetAcquire int");
+            assertEquals(0x01234567, o, "getAndSetAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "getAndSetAcquire int value");
+            assertEquals(0x89ABCDEF, x, "getAndSetAcquire int value");
         }
 
         // Compare set and get
@@ -604,9 +602,9 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndSetRelease int");
+            assertEquals(0x01234567, o, "getAndSetRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x89ABCDEF, "getAndSetRelease int value");
+            assertEquals(0x89ABCDEF, x, "getAndSetRelease int value");
         }
 
         // get and add, add and get
@@ -614,27 +612,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAdd int");
+            assertEquals(0x01234567, o, "getAndAdd int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAdd int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddAcquire int");
+            assertEquals(0x01234567, o, "getAndAddAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddAcquire int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndAddRelease int");
+            assertEquals(0x01234567, o, "getAndAddRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddRelease int value");
+            assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddRelease int value");
         }
 
         // get and bitwise or
@@ -642,27 +640,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOr int");
+            assertEquals(0x01234567, o, "getAndBitwiseOr int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOr int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOr int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrAcquire int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrRelease int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrRelease int value");
         }
 
         // get and bitwise and
@@ -670,27 +668,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAnd int");
+            assertEquals(0x01234567, o, "getAndBitwiseAnd int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAnd int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAnd int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndAcquire int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndRelease int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndRelease int value");
         }
 
         // get and bitwise xor
@@ -698,27 +696,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXor int");
+            assertEquals(0x01234567, o, "getAndBitwiseXor int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXor int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXor int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorAcquire int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorRelease int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorRelease int value");
         }
     }
 
@@ -736,7 +734,7 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "get int value");
+                assertEquals(0x01234567, x, "get int value");
             }
 
 
@@ -744,21 +742,21 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, 0x89ABCDEF);
                 int x = (int) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "setVolatile int value");
+                assertEquals(0x89ABCDEF, x, "setVolatile int value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, 0x01234567);
                 int x = (int) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "setRelease int value");
+                assertEquals(0x01234567, x, "setRelease int value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, 0x89ABCDEF);
                 int x = (int) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "setOpaque int value");
+                assertEquals(0x89ABCDEF, x, "setOpaque int value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
@@ -768,56 +766,56 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 0x01234567, 0x89ABCDEF);
                 assertEquals(r, true, "success compareAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "success compareAndSet int value");
+                assertEquals(0x89ABCDEF, x, "success compareAndSet int value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(r, false, "failing compareAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing compareAndSet int value");
+                assertEquals(0x89ABCDEF, x, "failing compareAndSet int value");
             }
 
             {
                 int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 0x89ABCDEF, 0x01234567);
                 assertEquals(r, 0x89ABCDEF, "success compareAndExchange int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "success compareAndExchange int value");
+                assertEquals(0x01234567, x, "success compareAndExchange int value");
             }
 
             {
                 int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(r, 0x01234567, "failing compareAndExchange int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "failing compareAndExchange int value");
+                assertEquals(0x01234567, x, "failing compareAndExchange int value");
             }
 
             {
                 int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 0x01234567, 0x89ABCDEF);
                 assertEquals(r, 0x01234567, "success compareAndExchangeAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "success compareAndExchangeAcquire int value");
+                assertEquals(0x89ABCDEF, x, "success compareAndExchangeAcquire int value");
             }
 
             {
                 int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(r, 0x89ABCDEF, "failing compareAndExchangeAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing compareAndExchangeAcquire int value");
+                assertEquals(0x89ABCDEF, x, "failing compareAndExchangeAcquire int value");
             }
 
             {
                 int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 0x89ABCDEF, 0x01234567);
                 assertEquals(r, 0x89ABCDEF, "success compareAndExchangeRelease int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "success compareAndExchangeRelease int value");
+                assertEquals(0x01234567, x, "success compareAndExchangeRelease int value");
             }
 
             {
                 int r = (int) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(r, 0x01234567, "failing compareAndExchangeRelease int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "failing compareAndExchangeRelease int value");
+                assertEquals(0x01234567, x, "failing compareAndExchangeRelease int value");
             }
 
             {
@@ -829,14 +827,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetPlain int value");
+                assertEquals(0x89ABCDEF, x, "success weakCompareAndSetPlain int value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSetPlain int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetPlain int value");
+                assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetPlain int value");
             }
 
             {
@@ -848,14 +846,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "success weakCompareAndSetAcquire int");
+                assertEquals(0x01234567, x, "success weakCompareAndSetAcquire int");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "failing weakCompareAndSetAcquire int value");
+                assertEquals(0x01234567, x, "failing weakCompareAndSetAcquire int value");
             }
 
             {
@@ -867,14 +865,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "success weakCompareAndSetRelease int");
+                assertEquals(0x89ABCDEF, x, "success weakCompareAndSetRelease int");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 0x01234567, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "failing weakCompareAndSetAcquire int value");
+                assertEquals(0x89ABCDEF, x, "failing weakCompareAndSetAcquire int value");
             }
 
             {
@@ -886,14 +884,14 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "success weakCompareAndSet int");
+                assertEquals(0x01234567, x, "success weakCompareAndSet int");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 0x89ABCDEF, 0xCAFEBABE);
                 assertEquals(success, false, "failing weakCompareAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x01234567, "failing weakCompareAndSet int value");
+                assertEquals(0x01234567, x, "failing weakCompareAndSet int value");
             }
 
             // Compare set and get
@@ -901,27 +899,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
                 int o = (int) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndSet int");
+                assertEquals(0x01234567, o, "getAndSet int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "getAndSet int value");
+                assertEquals(0x89ABCDEF, x, "getAndSet int value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
                 int o = (int) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndSetAcquire int");
+                assertEquals(0x01234567, o, "getAndSetAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "getAndSetAcquire int value");
+                assertEquals(0x89ABCDEF, x, "getAndSetAcquire int value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
                 int o = (int) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndSetRelease int");
+                assertEquals(0x01234567, o, "getAndSetRelease int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x89ABCDEF, "getAndSetRelease int value");
+                assertEquals(0x89ABCDEF, x, "getAndSetRelease int value");
             }
 
             // get and add, add and get
@@ -929,27 +927,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
                 int o = (int) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndAdd int");
+                assertEquals(0x01234567, o, "getAndAdd int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAdd int value");
+                assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAdd int value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
                 int o = (int) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndAddAcquire int");
+                assertEquals(0x01234567, o, "getAndAddAcquire int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddAcquire int value");
+                assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddAcquire int value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
                 int o = (int) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, 0x89ABCDEF);
-                assertEquals(o, 0x01234567, "getAndAddRelease int");
+                assertEquals(0x01234567, o, "getAndAddRelease int");
                 int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (int)(0x01234567 + 0x89ABCDEF), "getAndAddRelease int value");
+                assertEquals((int)(0x01234567 + 0x89ABCDEF), x, "getAndAddRelease int value");
             }
 
         // get and bitwise or
@@ -957,27 +955,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOr int");
+            assertEquals(0x01234567, o, "getAndBitwiseOr int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOr int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOr int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrAcquire int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseOrRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseOrRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 | 0x89ABCDEF), "getAndBitwiseOrRelease int value");
+            assertEquals((int)(0x01234567 | 0x89ABCDEF), x, "getAndBitwiseOrRelease int value");
         }
 
         // get and bitwise and
@@ -985,27 +983,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAnd int");
+            assertEquals(0x01234567, o, "getAndBitwiseAnd int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAnd int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAnd int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndAcquire int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseAndRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseAndRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 & 0x89ABCDEF), "getAndBitwiseAndRelease int value");
+            assertEquals((int)(0x01234567 & 0x89ABCDEF), x, "getAndBitwiseAndRelease int value");
         }
 
         // get and bitwise xor
@@ -1013,27 +1011,27 @@ public class VarHandleTestMethodHandleAccessInt extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXor int");
+            assertEquals(0x01234567, o, "getAndBitwiseXor int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXor int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXor int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorAcquire int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorAcquire int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorAcquire int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorAcquire int value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x01234567);
 
             int o = (int) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, 0x89ABCDEF);
-            assertEquals(o, 0x01234567, "getAndBitwiseXorRelease int");
+            assertEquals(0x01234567, o, "getAndBitwiseXorRelease int");
             int x = (int) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (int)(0x01234567 ^ 0x89ABCDEF), "getAndBitwiseXorRelease int value");
+            assertEquals((int)(0x01234567 ^ 0x89ABCDEF), x, "getAndBitwiseXorRelease int value");
         }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
index 0e73063395d..90f6dd12c47 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessLong
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessLong
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
     static final long static_final_v = 0x0123456789ABCDEFL;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessLong.class, "final_v", long.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(long[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessLong recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "set long value");
+            assertEquals(0x0123456789ABCDEFL, x, "set long value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
             long x = (long) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setVolatile long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setVolatile long value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, 0x0123456789ABCDEFL);
             long x = (long) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "setRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "setRelease long value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
             long x = (long) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setOpaque long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setOpaque long value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, true, "success compareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndSet long value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, false, "failing compareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndSet long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchange long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchange long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchange long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchange long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchangeRelease long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchangeRelease long value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetPlain long value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetPlain long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetPlain long value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSetAcquire long");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetAcquire long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetAcquire long value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetRelease long");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetRelease long");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetRelease long value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSet long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSet long");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSet long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSet long value");
         }
 
         // Compare set and get
         {
             long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSet long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSet long value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAdd long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAdd long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddRelease long value");
         }
 
         // get and bitwise or
@@ -327,27 +325,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOr long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOr long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOr long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOr long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrRelease long value");
         }
 
         // get and bitwise and
@@ -355,27 +353,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAnd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAnd long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAnd long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAnd long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndRelease long value");
         }
 
         // get and bitwise xor
@@ -383,27 +381,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXor long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXor long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXor long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXor long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorRelease long value");
         }
     }
 
@@ -418,7 +416,7 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "set long value");
+            assertEquals(0x0123456789ABCDEFL, x, "set long value");
         }
 
 
@@ -426,21 +424,21 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(0xCAFEBABECAFEBABEL);
             long x = (long) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setVolatile long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setVolatile long value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(0x0123456789ABCDEFL);
             long x = (long) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "setRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "setRelease long value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(0xCAFEBABECAFEBABEL);
             long x = (long) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "setOpaque long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "setOpaque long value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
@@ -450,56 +448,56 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, true, "success compareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndSet long value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, false, "failing compareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndSet long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchange long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchange long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchange long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchange long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchange long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
             assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndExchangeAcquire long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
             assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchangeRelease long value");
         }
 
         {
             long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchangeRelease long value");
         }
 
         {
@@ -511,14 +509,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetPlain long value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetPlain long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetPlain long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetPlain long value");
         }
 
         {
@@ -530,7 +528,7 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSetAcquire long");
         }
 
         {
@@ -538,7 +536,7 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetAcquire long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetAcquire long value");
         }
 
         {
@@ -550,14 +548,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetRelease long");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetRelease long");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetRelease long value");
         }
 
         {
@@ -569,14 +567,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSet long");
+            assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSet long");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
             assertEquals(success, false, "failing weakCompareAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetRe long value");
+            assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetRe long value");
         }
 
         // Compare set and get
@@ -584,9 +582,9 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSet long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSet long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSet long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSet long value");
         }
 
         // Compare set and get
@@ -594,9 +592,9 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSetAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSetAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetAcquire long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetAcquire long value");
         }
 
         // Compare set and get
@@ -604,9 +602,9 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndSetRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndSetRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetRelease long value");
+            assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetRelease long value");
         }
 
         // get and add, add and get
@@ -614,27 +612,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAdd long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAdd long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndAddRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndAddRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddRelease long value");
         }
 
         // get and bitwise or
@@ -642,27 +640,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOr long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOr long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOr long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOr long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrRelease long value");
         }
 
         // get and bitwise and
@@ -670,27 +668,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAnd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAnd long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAnd long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAnd long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndRelease long value");
         }
 
         // get and bitwise xor
@@ -698,27 +696,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXor long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXor long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXor long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXor long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorRelease long value");
         }
     }
 
@@ -736,7 +734,7 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "get long value");
+                assertEquals(0x0123456789ABCDEFL, x, "get long value");
             }
 
 
@@ -744,21 +742,21 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
                 long x = (long) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "setVolatile long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "setVolatile long value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, 0x0123456789ABCDEFL);
                 long x = (long) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "setRelease long value");
+                assertEquals(0x0123456789ABCDEFL, x, "setRelease long value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
                 long x = (long) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "setOpaque long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "setOpaque long value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
@@ -768,56 +766,56 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
                 assertEquals(r, true, "success compareAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndSet long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndSet long value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, false, "failing compareAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndSet long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndSet long value");
             }
 
             {
                 long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
                 assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchange long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchange long value");
+                assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchange long value");
             }
 
             {
                 long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchange long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchange long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchange long value");
             }
 
             {
                 long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 0x0123456789ABCDEFL, 0xCAFEBABECAFEBABEL);
                 assertEquals(r, 0x0123456789ABCDEFL, "success compareAndExchangeAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success compareAndExchangeAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success compareAndExchangeAcquire long value");
             }
 
             {
                 long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing compareAndExchangeAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing compareAndExchangeAcquire long value");
             }
 
             {
                 long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL, 0x0123456789ABCDEFL);
                 assertEquals(r, 0xCAFEBABECAFEBABEL, "success compareAndExchangeRelease long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success compareAndExchangeRelease long value");
+                assertEquals(0x0123456789ABCDEFL, x, "success compareAndExchangeRelease long value");
             }
 
             {
                 long r = (long) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(r, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing compareAndExchangeRelease long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing compareAndExchangeRelease long value");
             }
 
             {
@@ -829,14 +827,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetPlain long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetPlain long value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSetPlain long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetPlain long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetPlain long value");
             }
 
             {
@@ -848,14 +846,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSetAcquire long");
+                assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSetAcquire long");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSetAcquire long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSetAcquire long value");
             }
 
             {
@@ -867,14 +865,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "success weakCompareAndSetRelease long");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "success weakCompareAndSetRelease long");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, 0x0123456789ABCDEFL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "failing weakCompareAndSetAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "failing weakCompareAndSetAcquire long value");
             }
 
             {
@@ -886,14 +884,14 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "success weakCompareAndSet long");
+                assertEquals(0x0123456789ABCDEFL, x, "success weakCompareAndSet long");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, 0xCAFEBABECAFEBABEL, 0xDEADBEEFDEADBEEFL);
                 assertEquals(success, false, "failing weakCompareAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0x0123456789ABCDEFL, "failing weakCompareAndSet long value");
+                assertEquals(0x0123456789ABCDEFL, x, "failing weakCompareAndSet long value");
             }
 
             // Compare set and get
@@ -901,27 +899,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndSet long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndSet long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSet long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSet long value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndSetAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndSetAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetAcquire long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetAcquire long value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndSetRelease long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndSetRelease long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, 0xCAFEBABECAFEBABEL, "getAndSetRelease long value");
+                assertEquals(0xCAFEBABECAFEBABEL, x, "getAndSetRelease long value");
             }
 
             // get and add, add and get
@@ -929,27 +927,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndAdd long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndAdd long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAdd long value");
+                assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAdd long value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndAddAcquire long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndAddAcquire long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddAcquire long value");
+                assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddAcquire long value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
                 long o = (long) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-                assertEquals(o, 0x0123456789ABCDEFL, "getAndAddRelease long");
+                assertEquals(0x0123456789ABCDEFL, o, "getAndAddRelease long");
                 long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), "getAndAddRelease long value");
+                assertEquals((long)(0x0123456789ABCDEFL + 0xCAFEBABECAFEBABEL), x, "getAndAddRelease long value");
             }
 
         // get and bitwise or
@@ -957,27 +955,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOr long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOr long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOr long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOr long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseOrRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseOrRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), "getAndBitwiseOrRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL | 0xCAFEBABECAFEBABEL), x, "getAndBitwiseOrRelease long value");
         }
 
         // get and bitwise and
@@ -985,27 +983,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAnd long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAnd long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAnd long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAnd long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseAndRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseAndRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), "getAndBitwiseAndRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL & 0xCAFEBABECAFEBABEL), x, "getAndBitwiseAndRelease long value");
         }
 
         // get and bitwise xor
@@ -1013,27 +1011,27 @@ public class VarHandleTestMethodHandleAccessLong extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXor long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXor long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXor long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXor long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorAcquire long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorAcquire long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorAcquire long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorAcquire long value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, 0x0123456789ABCDEFL);
 
             long o = (long) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, 0xCAFEBABECAFEBABEL);
-            assertEquals(o, 0x0123456789ABCDEFL, "getAndBitwiseXorRelease long");
+            assertEquals(0x0123456789ABCDEFL, o, "getAndBitwiseXorRelease long");
             long x = (long) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), "getAndBitwiseXorRelease long value");
+            assertEquals((long)(0x0123456789ABCDEFL ^ 0xCAFEBABECAFEBABEL), x, "getAndBitwiseXorRelease long value");
         }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
index 8fb23d7dc55..d8f548fe2d6 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessShort
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessShort
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
     static final short static_final_v = (short)0x0123;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessShort.class, "final_v", short.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(short[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessShort recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "set short value");
+            assertEquals((short)0x0123, x, "set short value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, (short)0x4567);
             short x = (short) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "setVolatile short value");
+            assertEquals((short)0x4567, x, "setVolatile short value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, (short)0x0123);
             short x = (short) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "setRelease short value");
+            assertEquals((short)0x0123, x, "setRelease short value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, (short)0x4567);
             short x = (short) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "setOpaque short value");
+            assertEquals((short)0x4567, x, "setOpaque short value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, (short)0x0123, (short)0x4567);
             assertEquals(r, true, "success compareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "success compareAndSet short value");
+            assertEquals((short)0x4567, x, "success compareAndSet short value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, (short)0x0123, (short)0x89AB);
             assertEquals(r, false, "failing compareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "failing compareAndSet short value");
+            assertEquals((short)0x4567, x, "failing compareAndSet short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, (short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchange short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "success compareAndExchange short value");
+            assertEquals((short)0x0123, x, "success compareAndExchange short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, (short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchange short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "failing compareAndExchange short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchange short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, (short)0x0123, (short)0x4567);
             assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "success compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, (short)0x0123, (short)0x89AB);
             assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "failing compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, (short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "success compareAndExchangeRelease short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, (short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchangeRelease short value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetPlain short value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, (short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetPlain short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetPlain short value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "success weakCompareAndSetAcquire short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSetAcquire short");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, (short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSetAcquire short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSetAcquire short value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetRelease short");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetRelease short");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, (short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetRelease short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetRelease short value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "success weakCompareAndSet short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSet short");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, (short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSet short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSet short value");
         }
 
         // Compare set and get
         {
             short o = (short) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSet short");
+            assertEquals((short)0x0123, o, "getAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)0x4567, "getAndSet short value");
+            assertEquals((short)0x4567, x, "getAndSet short value");
         }
 
         // get and add, add and get
@@ -299,27 +297,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAdd short");
+            assertEquals((short)0x0123, o, "getAndAdd short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAdd short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddAcquire short");
+            assertEquals((short)0x0123, o, "getAndAddAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddAcquire short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddRelease short");
+            assertEquals((short)0x0123, o, "getAndAddRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddRelease short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddRelease short value");
         }
 
         // get and bitwise or
@@ -327,27 +325,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOr short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOr short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOr short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOr short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrAcquire short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrRelease short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrRelease short value");
         }
 
         // get and bitwise and
@@ -355,27 +353,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAnd short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAnd short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAnd short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAnd short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndAcquire short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndRelease short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndRelease short value");
         }
 
         // get and bitwise xor
@@ -383,27 +381,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXor short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXor short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXor short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXor short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorAcquire short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorRelease short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorRelease short value");
         }
     }
 
@@ -418,7 +416,7 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "set short value");
+            assertEquals((short)0x0123, x, "set short value");
         }
 
 
@@ -426,21 +424,21 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact((short)0x4567);
             short x = (short) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, (short)0x4567, "setVolatile short value");
+            assertEquals((short)0x4567, x, "setVolatile short value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact((short)0x0123);
             short x = (short) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, (short)0x0123, "setRelease short value");
+            assertEquals((short)0x0123, x, "setRelease short value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact((short)0x4567);
             short x = (short) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, (short)0x4567, "setOpaque short value");
+            assertEquals((short)0x4567, x, "setOpaque short value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
@@ -450,56 +448,56 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact((short)0x0123, (short)0x4567);
             assertEquals(r, true, "success compareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "success compareAndSet short value");
+            assertEquals((short)0x4567, x, "success compareAndSet short value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact((short)0x0123, (short)0x89AB);
             assertEquals(r, false, "failing compareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "failing compareAndSet short value");
+            assertEquals((short)0x4567, x, "failing compareAndSet short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact((short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchange short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "success compareAndExchange short value");
+            assertEquals((short)0x0123, x, "success compareAndExchange short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact((short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchange short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "failing compareAndExchange short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchange short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact((short)0x0123, (short)0x4567);
             assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "success compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact((short)0x0123, (short)0x89AB);
             assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value");
+            assertEquals((short)0x4567, x, "failing compareAndExchangeAcquire short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact((short)0x4567, (short)0x0123);
             assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "success compareAndExchangeRelease short value");
         }
 
         {
             short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact((short)0x4567, (short)0x89AB);
             assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value");
+            assertEquals((short)0x0123, x, "failing compareAndExchangeRelease short value");
         }
 
         {
@@ -511,14 +509,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetPlain short value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact((short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetPlain short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetPlain short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetPlain short value");
         }
 
         {
@@ -530,7 +528,7 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "success weakCompareAndSetAcquire short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSetAcquire short");
         }
 
         {
@@ -538,7 +536,7 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact((short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSetAcquire short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSetAcquire short value");
         }
 
         {
@@ -550,14 +548,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "success weakCompareAndSetRelease short");
+            assertEquals((short)0x4567, x, "success weakCompareAndSetRelease short");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact((short)0x0123, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSetRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "failing weakCompareAndSetRelease short value");
+            assertEquals((short)0x4567, x, "failing weakCompareAndSetRelease short value");
         }
 
         {
@@ -569,14 +567,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "success weakCompareAndSet short");
+            assertEquals((short)0x0123, x, "success weakCompareAndSet short");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact((short)0x4567, (short)0x89AB);
             assertEquals(success, false, "failing weakCompareAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x0123, "failing weakCompareAndSetRe short value");
+            assertEquals((short)0x0123, x, "failing weakCompareAndSetRe short value");
         }
 
         // Compare set and get
@@ -584,9 +582,9 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_SET).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSet short");
+            assertEquals((short)0x0123, o, "getAndSet short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "getAndSet short value");
+            assertEquals((short)0x4567, x, "getAndSet short value");
         }
 
         // Compare set and get
@@ -594,9 +592,9 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSetAcquire short");
+            assertEquals((short)0x0123, o, "getAndSetAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "getAndSetAcquire short value");
+            assertEquals((short)0x4567, x, "getAndSetAcquire short value");
         }
 
         // Compare set and get
@@ -604,9 +602,9 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndSetRelease short");
+            assertEquals((short)0x0123, o, "getAndSetRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)0x4567, "getAndSetRelease short value");
+            assertEquals((short)0x4567, x, "getAndSetRelease short value");
         }
 
         // get and add, add and get
@@ -614,27 +612,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_ADD).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAdd short");
+            assertEquals((short)0x0123, o, "getAndAdd short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAdd short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddAcquire short");
+            assertEquals((short)0x0123, o, "getAndAddAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddAcquire short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndAddRelease short");
+            assertEquals((short)0x0123, o, "getAndAddRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddRelease short value");
+            assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddRelease short value");
         }
 
         // get and bitwise or
@@ -642,27 +640,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOr short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOr short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOr short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOr short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrAcquire short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrRelease short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrRelease short value");
         }
 
         // get and bitwise and
@@ -670,27 +668,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAnd short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAnd short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAnd short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAnd short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndAcquire short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndRelease short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndRelease short value");
         }
 
         // get and bitwise xor
@@ -698,27 +696,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXor short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXor short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXor short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXor short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorAcquire short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact((short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact((short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorRelease short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorRelease short value");
         }
     }
 
@@ -736,7 +734,7 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "get short value");
+                assertEquals((short)0x0123, x, "get short value");
             }
 
 
@@ -744,21 +742,21 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, (short)0x4567);
                 short x = (short) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "setVolatile short value");
+                assertEquals((short)0x4567, x, "setVolatile short value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, (short)0x0123);
                 short x = (short) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "setRelease short value");
+                assertEquals((short)0x0123, x, "setRelease short value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, (short)0x4567);
                 short x = (short) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "setOpaque short value");
+                assertEquals((short)0x4567, x, "setOpaque short value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
@@ -768,56 +766,56 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, (short)0x0123, (short)0x4567);
                 assertEquals(r, true, "success compareAndSet short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "success compareAndSet short value");
+                assertEquals((short)0x4567, x, "success compareAndSet short value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(r, false, "failing compareAndSet short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "failing compareAndSet short value");
+                assertEquals((short)0x4567, x, "failing compareAndSet short value");
             }
 
             {
                 short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, (short)0x4567, (short)0x0123);
                 assertEquals(r, (short)0x4567, "success compareAndExchange short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "success compareAndExchange short value");
+                assertEquals((short)0x0123, x, "success compareAndExchange short value");
             }
 
             {
                 short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(r, (short)0x0123, "failing compareAndExchange short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "failing compareAndExchange short value");
+                assertEquals((short)0x0123, x, "failing compareAndExchange short value");
             }
 
             {
                 short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, (short)0x0123, (short)0x4567);
                 assertEquals(r, (short)0x0123, "success compareAndExchangeAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "success compareAndExchangeAcquire short value");
+                assertEquals((short)0x4567, x, "success compareAndExchangeAcquire short value");
             }
 
             {
                 short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(r, (short)0x4567, "failing compareAndExchangeAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "failing compareAndExchangeAcquire short value");
+                assertEquals((short)0x4567, x, "failing compareAndExchangeAcquire short value");
             }
 
             {
                 short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, (short)0x4567, (short)0x0123);
                 assertEquals(r, (short)0x4567, "success compareAndExchangeRelease short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "success compareAndExchangeRelease short value");
+                assertEquals((short)0x0123, x, "success compareAndExchangeRelease short value");
             }
 
             {
                 short r = (short) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(r, (short)0x0123, "failing compareAndExchangeRelease short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "failing compareAndExchangeRelease short value");
+                assertEquals((short)0x0123, x, "failing compareAndExchangeRelease short value");
             }
 
             {
@@ -829,14 +827,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "success weakCompareAndSetPlain short value");
+                assertEquals((short)0x4567, x, "success weakCompareAndSetPlain short value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSetPlain short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "failing weakCompareAndSetPlain short value");
+                assertEquals((short)0x4567, x, "failing weakCompareAndSetPlain short value");
             }
 
             {
@@ -848,14 +846,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "success weakCompareAndSetAcquire short");
+                assertEquals((short)0x0123, x, "success weakCompareAndSetAcquire short");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "failing weakCompareAndSetAcquire short value");
+                assertEquals((short)0x0123, x, "failing weakCompareAndSetAcquire short value");
             }
 
             {
@@ -867,14 +865,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "success weakCompareAndSetRelease short");
+                assertEquals((short)0x4567, x, "success weakCompareAndSetRelease short");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, (short)0x0123, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "failing weakCompareAndSetAcquire short value");
+                assertEquals((short)0x4567, x, "failing weakCompareAndSetAcquire short value");
             }
 
             {
@@ -886,14 +884,14 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "success weakCompareAndSet short");
+                assertEquals((short)0x0123, x, "success weakCompareAndSet short");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, (short)0x4567, (short)0x89AB);
                 assertEquals(success, false, "failing weakCompareAndSet short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x0123, "failing weakCompareAndSet short value");
+                assertEquals((short)0x0123, x, "failing weakCompareAndSet short value");
             }
 
             // Compare set and get
@@ -901,27 +899,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
                 short o = (short) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndSet short");
+                assertEquals((short)0x0123, o, "getAndSet short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "getAndSet short value");
+                assertEquals((short)0x4567, x, "getAndSet short value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
                 short o = (short) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndSetAcquire short");
+                assertEquals((short)0x0123, o, "getAndSetAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "getAndSetAcquire short value");
+                assertEquals((short)0x4567, x, "getAndSetAcquire short value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
                 short o = (short) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndSetRelease short");
+                assertEquals((short)0x0123, o, "getAndSetRelease short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)0x4567, "getAndSetRelease short value");
+                assertEquals((short)0x4567, x, "getAndSetRelease short value");
             }
 
             // get and add, add and get
@@ -929,27 +927,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
                 short o = (short) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndAdd short");
+                assertEquals((short)0x0123, o, "getAndAdd short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAdd short value");
+                assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAdd short value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
                 short o = (short) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndAddAcquire short");
+                assertEquals((short)0x0123, o, "getAndAddAcquire short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddAcquire short value");
+                assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddAcquire short value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
                 short o = (short) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, (short)0x4567);
-                assertEquals(o, (short)0x0123, "getAndAddRelease short");
+                assertEquals((short)0x0123, o, "getAndAddRelease short");
                 short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, (short)((short)0x0123 + (short)0x4567), "getAndAddRelease short value");
+                assertEquals((short)((short)0x0123 + (short)0x4567), x, "getAndAddRelease short value");
             }
 
         // get and bitwise or
@@ -957,27 +955,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOr short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOr short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOr short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOr short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrAcquire short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseOrRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseOrRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 | (short)0x4567), "getAndBitwiseOrRelease short value");
+            assertEquals((short)((short)0x0123 | (short)0x4567), x, "getAndBitwiseOrRelease short value");
         }
 
         // get and bitwise and
@@ -985,27 +983,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAnd short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAnd short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAnd short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAnd short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndAcquire short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseAndRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseAndRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 & (short)0x4567), "getAndBitwiseAndRelease short value");
+            assertEquals((short)((short)0x0123 & (short)0x4567), x, "getAndBitwiseAndRelease short value");
         }
 
         // get and bitwise xor
@@ -1013,27 +1011,27 @@ public class VarHandleTestMethodHandleAccessShort extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXor short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXor short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXor short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXor short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorAcquire short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorAcquire short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorAcquire short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorAcquire short value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, (short)0x0123);
 
             short o = (short) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, (short)0x4567);
-            assertEquals(o, (short)0x0123, "getAndBitwiseXorRelease short");
+            assertEquals((short)0x0123, o, "getAndBitwiseXorRelease short");
             short x = (short) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, (short)((short)0x0123 ^ (short)0x4567), "getAndBitwiseXorRelease short value");
+            assertEquals((short)((short)0x0123 ^ (short)0x4567), x, "getAndBitwiseXorRelease short value");
         }
         }
     }
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
index 8ccede760c9..35723f63d27 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessString
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccessString
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
     static final String static_final_v = "foo";
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccessString.class, "final_v", String.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(String[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccessString recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, "foo");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "set String value");
+            assertEquals("foo", x, "set String value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, "bar");
             String x = (String) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, "bar", "setVolatile String value");
+            assertEquals("bar", x, "setVolatile String value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, "foo");
             String x = (String) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, "foo", "setRelease String value");
+            assertEquals("foo", x, "setRelease String value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, "bar");
             String x = (String) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, "bar", "setOpaque String value");
+            assertEquals("bar", x, "setOpaque String value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact(recv, "foo");
@@ -158,56 +156,56 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, "foo", "bar");
             assertEquals(r, true, "success compareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "success compareAndSet String value");
+            assertEquals("bar", x, "success compareAndSet String value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, "foo", "baz");
             assertEquals(r, false, "failing compareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "failing compareAndSet String value");
+            assertEquals("bar", x, "failing compareAndSet String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, "bar", "foo");
             assertEquals(r, "bar", "success compareAndExchange String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "success compareAndExchange String value");
+            assertEquals("foo", x, "success compareAndExchange String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, "bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchange String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "failing compareAndExchange String value");
+            assertEquals("foo", x, "failing compareAndExchange String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, "foo", "bar");
             assertEquals(r, "foo", "success compareAndExchangeAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "success compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "success compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, "foo", "baz");
             assertEquals(r, "bar", "failing compareAndExchangeAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "failing compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "failing compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, "bar", "foo");
             assertEquals(r, "bar", "success compareAndExchangeRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "success compareAndExchangeRelease String value");
+            assertEquals("foo", x, "success compareAndExchangeRelease String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, "bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchangeRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "failing compareAndExchangeRelease String value");
+            assertEquals("foo", x, "failing compareAndExchangeRelease String value");
         }
 
         {
@@ -219,14 +217,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "success weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "success weakCompareAndSetPlain String value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, "foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetPlain String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "failing weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "failing weakCompareAndSetPlain String value");
         }
 
         {
@@ -238,14 +236,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "success weakCompareAndSetAcquire String");
+            assertEquals("foo", x, "success weakCompareAndSetAcquire String");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, "bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "failing weakCompareAndSetAcquire String value");
+            assertEquals("foo", x, "failing weakCompareAndSetAcquire String value");
         }
 
         {
@@ -257,14 +255,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "success weakCompareAndSetRelease String");
+            assertEquals("bar", x, "success weakCompareAndSetRelease String");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, "foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "failing weakCompareAndSetRelease String value");
+            assertEquals("bar", x, "failing weakCompareAndSetRelease String value");
         }
 
         {
@@ -276,22 +274,22 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "success weakCompareAndSet String");
+            assertEquals("foo", x, "success weakCompareAndSet String");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, "bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "foo", "failing weakCompareAndSet String value");
+            assertEquals("foo", x, "failing weakCompareAndSet String value");
         }
 
         // Compare set and get
         {
             String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, "bar");
-            assertEquals(o, "foo", "getAndSet String");
+            assertEquals("foo", o, "getAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, "bar", "getAndSet String value");
+            assertEquals("bar", x, "getAndSet String value");
         }
 
 
@@ -318,7 +316,7 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact("foo");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "set String value");
+            assertEquals("foo", x, "set String value");
         }
 
 
@@ -326,21 +324,21 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact("bar");
             String x = (String) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, "bar", "setVolatile String value");
+            assertEquals("bar", x, "setVolatile String value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact("foo");
             String x = (String) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, "foo", "setRelease String value");
+            assertEquals("foo", x, "setRelease String value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact("bar");
             String x = (String) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, "bar", "setOpaque String value");
+            assertEquals("bar", x, "setOpaque String value");
         }
 
         hs.get(TestAccessMode.SET).invokeExact("foo");
@@ -350,56 +348,56 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact("foo", "bar");
             assertEquals(r, true, "success compareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "success compareAndSet String value");
+            assertEquals("bar", x, "success compareAndSet String value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact("foo", "baz");
             assertEquals(r, false, "failing compareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "failing compareAndSet String value");
+            assertEquals("bar", x, "failing compareAndSet String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact("bar", "foo");
             assertEquals(r, "bar", "success compareAndExchange String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "success compareAndExchange String value");
+            assertEquals("foo", x, "success compareAndExchange String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact("bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchange String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "failing compareAndExchange String value");
+            assertEquals("foo", x, "failing compareAndExchange String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact("foo", "bar");
             assertEquals(r, "foo", "success compareAndExchangeAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "success compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "success compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact("foo", "baz");
             assertEquals(r, "bar", "failing compareAndExchangeAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "failing compareAndExchangeAcquire String value");
+            assertEquals("bar", x, "failing compareAndExchangeAcquire String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact("bar", "foo");
             assertEquals(r, "bar", "success compareAndExchangeRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "success compareAndExchangeRelease String value");
+            assertEquals("foo", x, "success compareAndExchangeRelease String value");
         }
 
         {
             String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact("bar", "baz");
             assertEquals(r, "foo", "failing compareAndExchangeRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "failing compareAndExchangeRelease String value");
+            assertEquals("foo", x, "failing compareAndExchangeRelease String value");
         }
 
         {
@@ -411,14 +409,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "success weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "success weakCompareAndSetPlain String value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact("foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetPlain String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "failing weakCompareAndSetPlain String value");
+            assertEquals("bar", x, "failing weakCompareAndSetPlain String value");
         }
 
         {
@@ -430,7 +428,7 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "success weakCompareAndSetAcquire String");
+            assertEquals("foo", x, "success weakCompareAndSetAcquire String");
         }
 
         {
@@ -438,7 +436,7 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact("bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "failing weakCompareAndSetAcquire String value");
+            assertEquals("foo", x, "failing weakCompareAndSetAcquire String value");
         }
 
         {
@@ -450,14 +448,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "success weakCompareAndSetRelease String");
+            assertEquals("bar", x, "success weakCompareAndSetRelease String");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact("foo", "baz");
             assertEquals(success, false, "failing weakCompareAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "failing weakCompareAndSetRelease String value");
+            assertEquals("bar", x, "failing weakCompareAndSetRelease String value");
         }
 
         {
@@ -469,14 +467,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "success weakCompareAndSet String");
+            assertEquals("foo", x, "success weakCompareAndSet String");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact("bar", "baz");
             assertEquals(success, false, "failing weakCompareAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "foo", "failing weakCompareAndSetRe String value");
+            assertEquals("foo", x, "failing weakCompareAndSetRe String value");
         }
 
         // Compare set and get
@@ -484,9 +482,9 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact("foo");
 
             String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact("bar");
-            assertEquals(o, "foo", "getAndSet String");
+            assertEquals("foo", o, "getAndSet String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "getAndSet String value");
+            assertEquals("bar", x, "getAndSet String value");
         }
 
         // Compare set and get
@@ -494,9 +492,9 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact("foo");
 
             String o = (String) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact("bar");
-            assertEquals(o, "foo", "getAndSetAcquire String");
+            assertEquals("foo", o, "getAndSetAcquire String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "getAndSetAcquire String value");
+            assertEquals("bar", x, "getAndSetAcquire String value");
         }
 
         // Compare set and get
@@ -504,9 +502,9 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact("foo");
 
             String o = (String) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact("bar");
-            assertEquals(o, "foo", "getAndSetRelease String");
+            assertEquals("foo", o, "getAndSetRelease String");
             String x = (String) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, "bar", "getAndSetRelease String value");
+            assertEquals("bar", x, "getAndSetRelease String value");
         }
 
 
@@ -536,7 +534,7 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, "foo");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "get String value");
+                assertEquals("foo", x, "get String value");
             }
 
 
@@ -544,21 +542,21 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, "bar");
                 String x = (String) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, "bar", "setVolatile String value");
+                assertEquals("bar", x, "setVolatile String value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, "foo");
                 String x = (String) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, "foo", "setRelease String value");
+                assertEquals("foo", x, "setRelease String value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, "bar");
                 String x = (String) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, "bar", "setOpaque String value");
+                assertEquals("bar", x, "setOpaque String value");
             }
 
             hs.get(TestAccessMode.SET).invokeExact(array, i, "foo");
@@ -568,56 +566,56 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, "foo", "bar");
                 assertEquals(r, true, "success compareAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "success compareAndSet String value");
+                assertEquals("bar", x, "success compareAndSet String value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, "foo", "baz");
                 assertEquals(r, false, "failing compareAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "failing compareAndSet String value");
+                assertEquals("bar", x, "failing compareAndSet String value");
             }
 
             {
                 String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, "bar", "foo");
                 assertEquals(r, "bar", "success compareAndExchange String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "success compareAndExchange String value");
+                assertEquals("foo", x, "success compareAndExchange String value");
             }
 
             {
                 String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, "bar", "baz");
                 assertEquals(r, "foo", "failing compareAndExchange String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "failing compareAndExchange String value");
+                assertEquals("foo", x, "failing compareAndExchange String value");
             }
 
             {
                 String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, "foo", "bar");
                 assertEquals(r, "foo", "success compareAndExchangeAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "success compareAndExchangeAcquire String value");
+                assertEquals("bar", x, "success compareAndExchangeAcquire String value");
             }
 
             {
                 String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, "foo", "baz");
                 assertEquals(r, "bar", "failing compareAndExchangeAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "failing compareAndExchangeAcquire String value");
+                assertEquals("bar", x, "failing compareAndExchangeAcquire String value");
             }
 
             {
                 String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, "bar", "foo");
                 assertEquals(r, "bar", "success compareAndExchangeRelease String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "success compareAndExchangeRelease String value");
+                assertEquals("foo", x, "success compareAndExchangeRelease String value");
             }
 
             {
                 String r = (String) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, "bar", "baz");
                 assertEquals(r, "foo", "failing compareAndExchangeRelease String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "failing compareAndExchangeRelease String value");
+                assertEquals("foo", x, "failing compareAndExchangeRelease String value");
             }
 
             {
@@ -629,14 +627,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "success weakCompareAndSetPlain String value");
+                assertEquals("bar", x, "success weakCompareAndSetPlain String value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, "foo", "baz");
                 assertEquals(success, false, "failing weakCompareAndSetPlain String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "failing weakCompareAndSetPlain String value");
+                assertEquals("bar", x, "failing weakCompareAndSetPlain String value");
             }
 
             {
@@ -648,14 +646,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "success weakCompareAndSetAcquire String");
+                assertEquals("foo", x, "success weakCompareAndSetAcquire String");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, "bar", "baz");
                 assertEquals(success, false, "failing weakCompareAndSetAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "failing weakCompareAndSetAcquire String value");
+                assertEquals("foo", x, "failing weakCompareAndSetAcquire String value");
             }
 
             {
@@ -667,14 +665,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "success weakCompareAndSetRelease String");
+                assertEquals("bar", x, "success weakCompareAndSetRelease String");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, "foo", "baz");
                 assertEquals(success, false, "failing weakCompareAndSetAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "failing weakCompareAndSetAcquire String value");
+                assertEquals("bar", x, "failing weakCompareAndSetAcquire String value");
             }
 
             {
@@ -686,14 +684,14 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "success weakCompareAndSet String");
+                assertEquals("foo", x, "success weakCompareAndSet String");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, "bar", "baz");
                 assertEquals(success, false, "failing weakCompareAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "foo", "failing weakCompareAndSet String value");
+                assertEquals("foo", x, "failing weakCompareAndSet String value");
             }
 
             // Compare set and get
@@ -701,27 +699,27 @@ public class VarHandleTestMethodHandleAccessString extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, "foo");
 
                 String o = (String) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, "bar");
-                assertEquals(o, "foo", "getAndSet String");
+                assertEquals("foo", o, "getAndSet String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "getAndSet String value");
+                assertEquals("bar", x, "getAndSet String value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, "foo");
 
                 String o = (String) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, "bar");
-                assertEquals(o, "foo", "getAndSetAcquire String");
+                assertEquals("foo", o, "getAndSetAcquire String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "getAndSetAcquire String value");
+                assertEquals("bar", x, "getAndSetAcquire String value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, "foo");
 
                 String o = (String) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, "bar");
-                assertEquals(o, "foo", "getAndSetRelease String");
+                assertEquals("foo", o, "getAndSetRelease String");
                 String x = (String) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, "bar", "getAndSetRelease String value");
+                assertEquals("bar", x, "getAndSetRelease String value");
             }
 
 
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
index eb6327d4c55..b10466a1fc7 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeBoolean
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeBoolean
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeBoolean
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeBoolean
+ * @run junit/othervm VarHandleTestMethodTypeBoolean
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeBoolean
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeBoolean
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeBoolean
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
     static final boolean static_final_v = true;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeBoolean.class, "final_v", boolean.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(boolean[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeBoolean extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeBoolean recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
index 08b834699af..ce8686ebd74 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeByte
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeByte
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeByte
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeByte
+ * @run junit/othervm VarHandleTestMethodTypeByte
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeByte
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeByte
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeByte
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
     static final byte static_final_v = (byte)0x01;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeByte.class, "final_v", byte.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(byte[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeByte extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeByte recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
index 25aa62825b7..d89af7f212c 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeChar
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeChar
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeChar
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeChar
+ * @run junit/othervm VarHandleTestMethodTypeChar
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeChar
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeChar
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeChar
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
     static final char static_final_v = '\u0123';
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeChar.class, "final_v", char.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(char[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeChar extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeChar recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
index c3f8d22435b..0363a996ceb 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeDouble
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeDouble
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeDouble
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeDouble
+ * @run junit/othervm VarHandleTestMethodTypeDouble
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeDouble
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeDouble
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeDouble
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
     static final double static_final_v = 1.0d;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeDouble.class, "final_v", double.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(double[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeDouble extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeDouble recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
index 0d05270b3ac..c8b965e41df 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeFloat
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeFloat
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeFloat
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeFloat
+ * @run junit/othervm VarHandleTestMethodTypeFloat
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeFloat
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeFloat
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeFloat
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
     static final float static_final_v = 1.0f;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeFloat.class, "final_v", float.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(float[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeFloat extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeFloat recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
index a431c0a889e..e09427c55c7 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeInt
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeInt
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeInt
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeInt
+ * @run junit/othervm VarHandleTestMethodTypeInt
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeInt
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeInt
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeInt
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
     static final int static_final_v = 0x01234567;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeInt.class, "final_v", int.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(int[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeInt extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeInt recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
index 53b9257d700..5944e935877 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeLong
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeLong
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeLong
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeLong
+ * @run junit/othervm VarHandleTestMethodTypeLong
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeLong
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeLong
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeLong
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
     static final long static_final_v = 0x0123456789ABCDEFL;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeLong.class, "final_v", long.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(long[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeLong extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeLong recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
index 10dd5832c9b..fdb30ee88aa 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeShort
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeShort
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeShort
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeShort
+ * @run junit/othervm VarHandleTestMethodTypeShort
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeShort
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeShort
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeShort
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
     static final short static_final_v = (short)0x0123;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeShort.class, "final_v", short.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(short[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeShort extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeShort recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
index d823a21d69f..2a5284ca36e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodTypeString
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeString
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeString
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeString
+ * @run junit/othervm VarHandleTestMethodTypeString
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeString
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodTypeString
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodTypeString
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
     static final String static_final_v = "foo";
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodTypeString.class, "final_v", String.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle(String[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodTypeString extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodTypeString recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java
index b20e18d263e..2c22fd5595b 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,9 @@
 
 /*
  * @test
- * @run testng VarHandleTestReflection
+ * @run junit VarHandleTestReflection
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandleInfo;
@@ -36,11 +34,16 @@ import java.lang.invoke.VarHandle;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestReflection extends VarHandleBaseTest {
     String string;
 
-    @DataProvider
     public static Object[][] accessModesProvider() {
         return Stream.of(VarHandle.AccessMode.values()).
                 map(am -> new Object[]{am}).
@@ -52,17 +55,19 @@ public class VarHandleTestReflection extends VarHandleBaseTest {
                 findVarHandle(VarHandleTestReflection.class, "string", String.class);
     }
 
-    @Test(dataProvider = "accessModesProvider", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void methodInvocationArgumentMismatch(VarHandle.AccessMode accessMode) throws Exception {
         VarHandle v = handle();
 
         // Try a reflective invoke using a Method, with no arguments
 
         Method vhm = VarHandle.class.getMethod(accessMode.methodName(), Object[].class);
-        vhm.invoke(v, new Object[]{});
+        assertThrows(IllegalArgumentException.class, () -> vhm.invoke(v, new Object[]{}));
     }
 
-    @Test(dataProvider = "accessModesProvider")
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void methodInvocationMatchingArguments(VarHandle.AccessMode accessMode) throws Exception {
         VarHandle v = handle();
 
@@ -70,17 +75,15 @@ public class VarHandleTestReflection extends VarHandleBaseTest {
 
         Method vhm = VarHandle.class.getMethod(accessMode.methodName(), Object[].class);
         Object arg = new Object[0];
-        try {
-            vhm.invoke(v, arg);
-        } catch (InvocationTargetException e) {
-            if (!(e.getCause() instanceof UnsupportedOperationException)) {
-                throw new RuntimeException("expected UnsupportedOperationException but got: "
-                                           + e.getCause().getClass().getName(), e);
-            }
+        var e = assertThrows(InvocationTargetException.class, () -> vhm.invoke(v, arg));
+        if (!(e.getCause() instanceof UnsupportedOperationException)) {
+            throw new RuntimeException("expected UnsupportedOperationException but got: "
+                    + e.getCause().getClass().getName(), e);
         }
     }
 
-    @Test(dataProvider = "accessModesProvider", expectedExceptions = UnsupportedOperationException.class)
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void methodHandleInvoke(VarHandle.AccessMode accessMode) throws Throwable {
         VarHandle v = handle();
 
@@ -90,10 +93,13 @@ public class VarHandleTestReflection extends VarHandleBaseTest {
                 VarHandle.class.getMethod(accessMode.methodName(), Object[].class));
         // Use invoke to avoid WrongMethodTypeException for
         // non-signature-polymorphic return types
-        Object o = (Object) mh.invoke(v, new Object[]{});
+        assertThrows(UnsupportedOperationException.class, () -> {
+            Object o = (Object) mh.invoke(v, new Object[]{});
+        });
     }
 
-    @Test(dataProvider = "accessModesProvider", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void methodInvocationFromMethodInfo(VarHandle.AccessMode accessMode) throws Exception {
         VarHandle v = handle();
 
@@ -104,10 +110,13 @@ public class VarHandleTestReflection extends VarHandleBaseTest {
                 VarHandle.class.getMethod(accessMode.methodName(), Object[].class));
         MethodHandleInfo info = MethodHandles.lookup().revealDirect(mh);
         Method im = info.reflectAs(Method.class, MethodHandles.lookup());
-        im.invoke(v, new Object[]{});
+        assertThrows(IllegalArgumentException.class, () -> {
+            im.invoke(v, new Object[]{});
+        });
     }
 
-    @Test(dataProvider = "accessModesProvider", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void reflectAsFromVarHandleInvoker(VarHandle.AccessMode accessMode) throws Exception {
         VarHandle v = handle();
 
@@ -116,10 +125,11 @@ public class VarHandleTestReflection extends VarHandleBaseTest {
 
         MethodHandleInfo info = MethodHandles.lookup().revealDirect(mh);
 
-        info.reflectAs(Method.class, MethodHandles.lookup());
+        assertThrows(IllegalArgumentException.class, () -> info.reflectAs(Method.class, MethodHandles.lookup()));
     }
 
-    @Test(dataProvider = "accessModesProvider", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("accessModesProvider")
     public void reflectAsFromFindVirtual(VarHandle.AccessMode accessMode) throws Exception {
         VarHandle v = handle();
 
@@ -128,6 +138,6 @@ public class VarHandleTestReflection extends VarHandleBaseTest {
 
         MethodHandleInfo info = MethodHandles.lookup().revealDirect(mh);
 
-        info.reflectAs(Method.class, MethodHandles.lookup());
+        assertThrows(IllegalArgumentException.class, () -> info.reflectAs(Method.class, MethodHandles.lookup()));
     }
 }
diff --git a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
index f3c90c5e8cc..b18dbb6e1b0 100644
--- a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
+++ b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,28 +23,30 @@
 
 /*
  * @test
- * @run testng/othervm -Diters=10   -Xint                                                   VarHandleTestAccess$Type$
+ * @run junit/othervm -Diters=10   -Xint                                                   VarHandleTestAccess$Type$
  *
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
  *
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccess$Type$
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccess$Type$
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccess$Type$
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestAccess$Type$
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestAccess$Type$
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestAccess$Type$
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
     static final $type$ static_final_v = $value1$;
 
@@ -115,7 +117,7 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         return vhs.toArray(new VarHandle[0]);
     }
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestAccess$Type$.class, "final_v", $type$.class);
@@ -135,8 +137,6 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
 #end[String]
     }
 
-
-    @DataProvider
     public Object[][] varHandlesProvider() throws Exception {
         List<VarHandle> vhs = new ArrayList<>();
         vhs.add(vhField);
@@ -166,7 +166,8 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("varHandlesProvider")
     public void testIsAccessModeSupported(VarHandle vh) {
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.GET));
         assertTrue(vh.isAccessModeSupported(VarHandle.AccessMode.SET));
@@ -236,8 +237,6 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
 #end[Bitwise]
     }
 
-
-    @DataProvider
     public Object[][] typesProvider() throws Exception {
         List<Object[]> types = new ArrayList<>();
         types.add(new Object[] {vhField, Arrays.asList(VarHandleTestAccess$Type$.class)});
@@ -247,16 +246,16 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         return types.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<Class<?>> pts) {
-        assertEquals(vh.varType(), $type$.class);
+        assertEquals($type$.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
     @Test
     public void testLookupInstanceToStatic() {
         checkIAE("Lookup of static final field to instance final field", () -> {
@@ -283,8 +282,6 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         });
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -335,7 +332,8 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -348,26 +346,26 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         // Plain
         {
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "get $type$ value");
+            assertEquals($value1$, x, "get $type$ value");
         }
 
 
         // Volatile
         {
             $type$ x = ($type$) vh.getVolatile(recv);
-            assertEquals(x, $value1$, "getVolatile $type$ value");
+            assertEquals($value1$, x, "getVolatile $type$ value");
         }
 
         // Lazy
         {
             $type$ x = ($type$) vh.getAcquire(recv);
-            assertEquals(x, $value1$, "getRelease $type$ value");
+            assertEquals($value1$, x, "getRelease $type$ value");
         }
 
         // Opaque
         {
             $type$ x = ($type$) vh.getOpaque(recv);
-            assertEquals(x, $value1$, "getOpaque $type$ value");
+            assertEquals($value1$, x, "getOpaque $type$ value");
         }
     }
 
@@ -492,26 +490,26 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         // Plain
         {
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "get $type$ value");
+            assertEquals($value1$, x, "get $type$ value");
         }
 
 
         // Volatile
         {
             $type$ x = ($type$) vh.getVolatile();
-            assertEquals(x, $value1$, "getVolatile $type$ value");
+            assertEquals($value1$, x, "getVolatile $type$ value");
         }
 
         // Lazy
         {
             $type$ x = ($type$) vh.getAcquire();
-            assertEquals(x, $value1$, "getRelease $type$ value");
+            assertEquals($value1$, x, "getRelease $type$ value");
         }
 
         // Opaque
         {
             $type$ x = ($type$) vh.getOpaque();
-            assertEquals(x, $value1$, "getOpaque $type$ value");
+            assertEquals($value1$, x, "getOpaque $type$ value");
         }
     }
 
@@ -637,7 +635,7 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         {
             vh.set(recv, $value1$);
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "set $type$ value");
+            assertEquals($value1$, x, "set $type$ value");
         }
 
 
@@ -645,21 +643,21 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         {
             vh.setVolatile(recv, $value2$);
             $type$ x = ($type$) vh.getVolatile(recv);
-            assertEquals(x, $value2$, "setVolatile $type$ value");
+            assertEquals($value2$, x, "setVolatile $type$ value");
         }
 
         // Lazy
         {
             vh.setRelease(recv, $value1$);
             $type$ x = ($type$) vh.getAcquire(recv);
-            assertEquals(x, $value1$, "setRelease $type$ value");
+            assertEquals($value1$, x, "setRelease $type$ value");
         }
 
         // Opaque
         {
             vh.setOpaque(recv, $value2$);
             $type$ x = ($type$) vh.getOpaque(recv);
-            assertEquals(x, $value2$, "setOpaque $type$ value");
+            assertEquals($value2$, x, "setOpaque $type$ value");
         }
 
 #if[CAS]
@@ -670,56 +668,56 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.compareAndSet(recv, $value1$, $value2$);
             assertEquals(r, true, "success compareAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "success compareAndSet $type$ value");
+            assertEquals($value2$, x, "success compareAndSet $type$ value");
         }
 
         {
             boolean r = vh.compareAndSet(recv, $value1$, $value3$);
             assertEquals(r, false, "failing compareAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "failing compareAndSet $type$ value");
+            assertEquals($value2$, x, "failing compareAndSet $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchange(recv, $value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchange $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "success compareAndExchange $type$ value");
+            assertEquals($value1$, x, "success compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchange(recv, $value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchange $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "failing compareAndExchange $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeAcquire(recv, $value1$, $value2$);
             assertEquals(r, $value1$, "success compareAndExchangeAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "success compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "success compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeAcquire(recv, $value1$, $value3$);
             assertEquals(r, $value2$, "failing compareAndExchangeAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "failing compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "failing compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeRelease(recv, $value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchangeRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "success compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "success compareAndExchangeRelease $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeRelease(recv, $value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchangeRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "failing compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchangeRelease $type$ value");
         }
 
         {
@@ -730,14 +728,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "success weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "success weakCompareAndSetPlain $type$ value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain(recv, $value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "failing weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetPlain $type$ value");
         }
 
         {
@@ -748,14 +746,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "success weakCompareAndSetAcquire $type$");
+            assertEquals($value1$, x, "success weakCompareAndSetAcquire $type$");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire(recv, $value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "failing weakCompareAndSetAcquire $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSetAcquire $type$ value");
         }
 
         {
@@ -766,14 +764,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "success weakCompareAndSetRelease $type$");
+            assertEquals($value2$, x, "success weakCompareAndSetRelease $type$");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease(recv, $value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "failing weakCompareAndSetRelease $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetRelease $type$ value");
         }
 
         {
@@ -784,14 +782,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "success weakCompareAndSet $type$ value");
+            assertEquals($value1$, x, "success weakCompareAndSet $type$ value");
         }
 
         {
             boolean success = vh.weakCompareAndSet(recv, $value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value1$, "failing weakCompareAndSet $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSet $type$ value");
         }
 
         // Compare set and get
@@ -799,27 +797,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndSet(recv, $value2$);
-            assertEquals(o, $value1$, "getAndSet $type$");
+            assertEquals($value1$, o, "getAndSet $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "getAndSet $type$ value");
+            assertEquals($value2$, x, "getAndSet $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndSetAcquire(recv, $value2$);
-            assertEquals(o, $value1$, "getAndSetAcquire $type$");
+            assertEquals($value1$, o, "getAndSetAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "getAndSetAcquire $type$ value");
+            assertEquals($value2$, x, "getAndSetAcquire $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndSetRelease(recv, $value2$);
-            assertEquals(o, $value1$, "getAndSetRelease $type$");
+            assertEquals($value1$, o, "getAndSetRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, $value2$, "getAndSetRelease $type$ value");
+            assertEquals($value2$, x, "getAndSetRelease $type$ value");
         }
 #end[CAS]
 
@@ -829,27 +827,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndAdd(recv, $value2$);
-            assertEquals(o, $value1$, "getAndAdd $type$");
+            assertEquals($value1$, o, "getAndAdd $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAdd $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndAddAcquire(recv, $value2$);
-            assertEquals(o, $value1$, "getAndAddAcquire $type$");
+            assertEquals($value1$, o, "getAndAddAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddAcquire $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddAcquire $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndAddRelease(recv, $value2$);
-            assertEquals(o, $value1$, "getAndAddRelease$type$");
+            assertEquals($value1$, o, "getAndAddRelease$type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddRelease $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddRelease $type$ value");
         }
 #end[AtomicAdd]
 
@@ -859,27 +857,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseOr(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOr $type$");
+            assertEquals($value1$, o, "getAndBitwiseOr $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOr $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOr $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseOrAcquire(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrAcquire $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrAcquire $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseOrRelease(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrRelease $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrRelease $type$ value");
         }
 
         // get and bitwise and
@@ -887,27 +885,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseAnd(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAnd $type$");
+            assertEquals($value1$, o, "getAndBitwiseAnd $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAnd $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAnd $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseAndAcquire(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndAcquire $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndAcquire $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseAndRelease(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndRelease $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndRelease $type$ value");
         }
 
         // get and bitwise xor
@@ -915,27 +913,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseXor(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXor $type$");
+            assertEquals($value1$, o, "getAndBitwiseXor $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXor $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXor $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseXorAcquire(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorAcquire $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorAcquire $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorAcquire $type$ value");
         }
 
         {
             vh.set(recv, $value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseXorRelease(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorRelease $type$");
             $type$ x = ($type$) vh.get(recv);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorRelease $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorRelease $type$ value");
         }
 #end[Bitwise]
     }
@@ -1046,7 +1044,7 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         {
             vh.set($value1$);
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "set $type$ value");
+            assertEquals($value1$, x, "set $type$ value");
         }
 
 
@@ -1054,21 +1052,21 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
         {
             vh.setVolatile($value2$);
             $type$ x = ($type$) vh.getVolatile();
-            assertEquals(x, $value2$, "setVolatile $type$ value");
+            assertEquals($value2$, x, "setVolatile $type$ value");
         }
 
         // Lazy
         {
             vh.setRelease($value1$);
             $type$ x = ($type$) vh.getAcquire();
-            assertEquals(x, $value1$, "setRelease $type$ value");
+            assertEquals($value1$, x, "setRelease $type$ value");
         }
 
         // Opaque
         {
             vh.setOpaque($value2$);
             $type$ x = ($type$) vh.getOpaque();
-            assertEquals(x, $value2$, "setOpaque $type$ value");
+            assertEquals($value2$, x, "setOpaque $type$ value");
         }
 
 #if[CAS]
@@ -1079,56 +1077,56 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             boolean r = vh.compareAndSet($value1$, $value2$);
             assertEquals(r, true, "success compareAndSet $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "success compareAndSet $type$ value");
+            assertEquals($value2$, x, "success compareAndSet $type$ value");
         }
 
         {
             boolean r = vh.compareAndSet($value1$, $value3$);
             assertEquals(r, false, "failing compareAndSet $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "failing compareAndSet $type$ value");
+            assertEquals($value2$, x, "failing compareAndSet $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchange($value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchange $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "success compareAndExchange $type$ value");
+            assertEquals($value1$, x, "success compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchange($value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchange $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "failing compareAndExchange $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeAcquire($value1$, $value2$);
             assertEquals(r, $value1$, "success compareAndExchangeAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "success compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "success compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeAcquire($value1$, $value3$);
             assertEquals(r, $value2$, "failing compareAndExchangeAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "failing compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "failing compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeRelease($value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchangeRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "success compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "success compareAndExchangeRelease $type$ value");
         }
 
         {
             $type$ r = ($type$) vh.compareAndExchangeRelease($value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchangeRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "failing compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchangeRelease $type$ value");
         }
 
         {
@@ -1139,14 +1137,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "success weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "success weakCompareAndSetPlain $type$ value");
         }
 
         {
             boolean success = vh.weakCompareAndSetPlain($value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "failing weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetPlain $type$ value");
         }
 
         {
@@ -1157,14 +1155,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "success weakCompareAndSetAcquire $type$");
+            assertEquals($value1$, x, "success weakCompareAndSetAcquire $type$");
         }
 
         {
             boolean success = vh.weakCompareAndSetAcquire($value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "failing weakCompareAndSetAcquire $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSetAcquire $type$ value");
         }
 
         {
@@ -1175,14 +1173,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "success weakCompareAndSetRelease $type$");
+            assertEquals($value2$, x, "success weakCompareAndSetRelease $type$");
         }
 
         {
             boolean success = vh.weakCompareAndSetRelease($value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "failing weakCompareAndSetRelease $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetRelease $type$ value");
         }
 
         {
@@ -1193,14 +1191,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "success weakCompareAndSet $type$");
+            assertEquals($value1$, x, "success weakCompareAndSet $type$");
         }
 
         {
             boolean success = vh.weakCompareAndSet($value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSet $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value1$, "failing weakCompareAndSet $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSet $type$ value");
         }
 
         // Compare set and get
@@ -1208,27 +1206,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndSet($value2$);
-            assertEquals(o, $value1$, "getAndSet $type$");
+            assertEquals($value1$, o, "getAndSet $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "getAndSet $type$ value");
+            assertEquals($value2$, x, "getAndSet $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndSetAcquire($value2$);
-            assertEquals(o, $value1$, "getAndSetAcquire $type$");
+            assertEquals($value1$, o, "getAndSetAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "getAndSetAcquire $type$ value");
+            assertEquals($value2$, x, "getAndSetAcquire $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndSetRelease($value2$);
-            assertEquals(o, $value1$, "getAndSetRelease $type$");
+            assertEquals($value1$, o, "getAndSetRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, $value2$, "getAndSetRelease $type$ value");
+            assertEquals($value2$, x, "getAndSetRelease $type$ value");
         }
 #end[CAS]
 
@@ -1238,27 +1236,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndAdd($value2$);
-            assertEquals(o, $value1$, "getAndAdd $type$");
+            assertEquals($value1$, o, "getAndAdd $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAdd $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndAddAcquire($value2$);
-            assertEquals(o, $value1$, "getAndAddAcquire $type$");
+            assertEquals($value1$, o, "getAndAddAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddAcquire $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddAcquire $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndAddRelease($value2$);
-            assertEquals(o, $value1$, "getAndAddRelease$type$");
+            assertEquals($value1$, o, "getAndAddRelease$type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddRelease $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddRelease $type$ value");
         }
 #end[AtomicAdd]
 
@@ -1268,27 +1266,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseOr($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOr $type$");
+            assertEquals($value1$, o, "getAndBitwiseOr $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOr $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOr $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseOrAcquire($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrAcquire $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrAcquire $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseOrRelease($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrRelease $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrRelease $type$ value");
         }
 
         // get and bitwise and
@@ -1296,27 +1294,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseAnd($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAnd $type$");
+            assertEquals($value1$, o, "getAndBitwiseAnd $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAnd $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAnd $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseAndAcquire($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndAcquire $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndAcquire $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseAndRelease($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndRelease $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndRelease $type$ value");
         }
 
         // get and bitwise xor
@@ -1324,27 +1322,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseXor($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXor $type$");
+            assertEquals($value1$, o, "getAndBitwiseXor $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXor $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXor $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseXorAcquire($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorAcquire $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorAcquire $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorAcquire $type$ value");
         }
 
         {
             vh.set($value1$);
 
             $type$ o = ($type$) vh.getAndBitwiseXorRelease($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorRelease $type$");
             $type$ x = ($type$) vh.get();
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorRelease $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorRelease $type$ value");
         }
 #end[Bitwise]
     }
@@ -1458,7 +1456,7 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             {
                 vh.set(array, i, $value1$);
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "get $type$ value");
+                assertEquals($value1$, x, "get $type$ value");
             }
 
 
@@ -1466,21 +1464,21 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
             {
                 vh.setVolatile(array, i, $value2$);
                 $type$ x = ($type$) vh.getVolatile(array, i);
-                assertEquals(x, $value2$, "setVolatile $type$ value");
+                assertEquals($value2$, x, "setVolatile $type$ value");
             }
 
             // Lazy
             {
                 vh.setRelease(array, i, $value1$);
                 $type$ x = ($type$) vh.getAcquire(array, i);
-                assertEquals(x, $value1$, "setRelease $type$ value");
+                assertEquals($value1$, x, "setRelease $type$ value");
             }
 
             // Opaque
             {
                 vh.setOpaque(array, i, $value2$);
                 $type$ x = ($type$) vh.getOpaque(array, i);
-                assertEquals(x, $value2$, "setOpaque $type$ value");
+                assertEquals($value2$, x, "setOpaque $type$ value");
             }
 
 #if[CAS]
@@ -1491,56 +1489,56 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 boolean r = vh.compareAndSet(array, i, $value1$, $value2$);
                 assertEquals(r, true, "success compareAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "success compareAndSet $type$ value");
+                assertEquals($value2$, x, "success compareAndSet $type$ value");
             }
 
             {
                 boolean r = vh.compareAndSet(array, i, $value1$, $value3$);
                 assertEquals(r, false, "failing compareAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "failing compareAndSet $type$ value");
+                assertEquals($value2$, x, "failing compareAndSet $type$ value");
             }
 
             {
                 $type$ r = ($type$) vh.compareAndExchange(array, i, $value2$, $value1$);
                 assertEquals(r, $value2$, "success compareAndExchange $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "success compareAndExchange $type$ value");
+                assertEquals($value1$, x, "success compareAndExchange $type$ value");
             }
 
             {
                 $type$ r = ($type$) vh.compareAndExchange(array, i, $value2$, $value3$);
                 assertEquals(r, $value1$, "failing compareAndExchange $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "failing compareAndExchange $type$ value");
+                assertEquals($value1$, x, "failing compareAndExchange $type$ value");
             }
 
             {
                 $type$ r = ($type$) vh.compareAndExchangeAcquire(array, i, $value1$, $value2$);
                 assertEquals(r, $value1$, "success compareAndExchangeAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "success compareAndExchangeAcquire $type$ value");
+                assertEquals($value2$, x, "success compareAndExchangeAcquire $type$ value");
             }
 
             {
                 $type$ r = ($type$) vh.compareAndExchangeAcquire(array, i, $value1$, $value3$);
                 assertEquals(r, $value2$, "failing compareAndExchangeAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "failing compareAndExchangeAcquire $type$ value");
+                assertEquals($value2$, x, "failing compareAndExchangeAcquire $type$ value");
             }
 
             {
                 $type$ r = ($type$) vh.compareAndExchangeRelease(array, i, $value2$, $value1$);
                 assertEquals(r, $value2$, "success compareAndExchangeRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "success compareAndExchangeRelease $type$ value");
+                assertEquals($value1$, x, "success compareAndExchangeRelease $type$ value");
             }
 
             {
                 $type$ r = ($type$) vh.compareAndExchangeRelease(array, i, $value2$, $value3$);
                 assertEquals(r, $value1$, "failing compareAndExchangeRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "failing compareAndExchangeRelease $type$ value");
+                assertEquals($value1$, x, "failing compareAndExchangeRelease $type$ value");
             }
 
             {
@@ -1551,14 +1549,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "success weakCompareAndSetPlain $type$ value");
+                assertEquals($value2$, x, "success weakCompareAndSetPlain $type$ value");
             }
 
             {
                 boolean success = vh.weakCompareAndSetPlain(array, i, $value1$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "failing weakCompareAndSetPlain $type$ value");
+                assertEquals($value2$, x, "failing weakCompareAndSetPlain $type$ value");
             }
 
             {
@@ -1569,14 +1567,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "success weakCompareAndSetAcquire $type$");
+                assertEquals($value1$, x, "success weakCompareAndSetAcquire $type$");
             }
 
             {
                 boolean success = vh.weakCompareAndSetAcquire(array, i, $value2$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "failing weakCompareAndSetAcquire $type$ value");
+                assertEquals($value1$, x, "failing weakCompareAndSetAcquire $type$ value");
             }
 
             {
@@ -1587,14 +1585,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "success weakCompareAndSetRelease $type$");
+                assertEquals($value2$, x, "success weakCompareAndSetRelease $type$");
             }
 
             {
                 boolean success = vh.weakCompareAndSetRelease(array, i, $value1$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSetRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "failing weakCompareAndSetRelease $type$ value");
+                assertEquals($value2$, x, "failing weakCompareAndSetRelease $type$ value");
             }
 
             {
@@ -1605,14 +1603,14 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "success weakCompareAndSet $type$");
+                assertEquals($value1$, x, "success weakCompareAndSet $type$");
             }
 
             {
                 boolean success = vh.weakCompareAndSet(array, i, $value2$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value1$, "failing weakCompareAndSet $type$ value");
+                assertEquals($value1$, x, "failing weakCompareAndSet $type$ value");
             }
 
             // Compare set and get
@@ -1620,27 +1618,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndSet(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndSet $type$");
+                assertEquals($value1$, o, "getAndSet $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "getAndSet $type$ value");
+                assertEquals($value2$, x, "getAndSet $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndSetAcquire(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndSetAcquire $type$");
+                assertEquals($value1$, o, "getAndSetAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "getAndSetAcquire $type$ value");
+                assertEquals($value2$, x, "getAndSetAcquire $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndSetRelease(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndSetRelease $type$");
+                assertEquals($value1$, o, "getAndSetRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, $value2$, "getAndSetRelease $type$ value");
+                assertEquals($value2$, x, "getAndSetRelease $type$ value");
             }
 #end[CAS]
 
@@ -1650,27 +1648,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndAdd(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndAdd $type$");
+                assertEquals($value1$, o, "getAndAdd $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$ value");
+                assertEquals(($type$)($value1$ + $value2$), x, "getAndAdd $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndAddAcquire(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndAddAcquire $type$");
+                assertEquals($value1$, o, "getAndAddAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddAcquire $type$ value");
+                assertEquals(($type$)($value1$ + $value2$), x, "getAndAddAcquire $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndAddRelease(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndAddRelease$type$");
+                assertEquals($value1$, o, "getAndAddRelease$type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddRelease $type$ value");
+                assertEquals(($type$)($value1$ + $value2$), x, "getAndAddRelease $type$ value");
             }
 #end[AtomicAdd]
 
@@ -1680,27 +1678,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseOr(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseOr $type$");
+                assertEquals($value1$, o, "getAndBitwiseOr $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOr $type$ value");
+                assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOr $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseOrAcquire(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseOrAcquire $type$");
+                assertEquals($value1$, o, "getAndBitwiseOrAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrAcquire $type$ value");
+                assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrAcquire $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseOrRelease(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseOrRelease $type$");
+                assertEquals($value1$, o, "getAndBitwiseOrRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrRelease $type$ value");
+                assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrRelease $type$ value");
             }
 
             // get and bitwise and
@@ -1708,27 +1706,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseAnd(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseAnd $type$");
+                assertEquals($value1$, o, "getAndBitwiseAnd $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAnd $type$ value");
+                assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAnd $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseAndAcquire(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseAndAcquire $type$");
+                assertEquals($value1$, o, "getAndBitwiseAndAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndAcquire $type$ value");
+                assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndAcquire $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseAndRelease(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseAndRelease $type$");
+                assertEquals($value1$, o, "getAndBitwiseAndRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndRelease $type$ value");
+                assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndRelease $type$ value");
             }
 
             // get and bitwise xor
@@ -1736,27 +1734,27 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseXor(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseXor $type$");
+                assertEquals($value1$, o, "getAndBitwiseXor $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXor $type$ value");
+                assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXor $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseXorAcquire(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseXorAcquire $type$");
+                assertEquals($value1$, o, "getAndBitwiseXorAcquire $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorAcquire $type$ value");
+                assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorAcquire $type$ value");
             }
 
             {
                 vh.set(array, i, $value1$);
 
                 $type$ o = ($type$) vh.getAndBitwiseXorRelease(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndBitwiseXorRelease $type$");
+                assertEquals($value1$, o, "getAndBitwiseXorRelease $type$");
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorRelease $type$ value");
+                assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorRelease $type$ value");
             }
 #end[Bitwise]
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
index c21709d6d37..9a40bfb2780 100644
--- a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
+++ b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,25 @@
  * @bug 8154556
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAs$Type$
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAs$Type$
- * @run testng/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAs$Type$
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:TieredStopAtLevel=1 VarHandleTestByteArrayAs$Type$
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1                         VarHandleTestByteArrayAs$Type$
+ * @run junit/othervm/timeout=360 -Diters=2000 -XX:CompileThresholdScaling=0.1 -XX:-TieredCompilation  VarHandleTestByteArrayAs$Type$
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
     static final int SIZE = $BoxType$.BYTES;
 
@@ -111,7 +111,8 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
         }
     }
 
-    @Test(dataProvider = "varHandlesProvider")
+    @ParameterizedTest
+    @MethodSource("VarHandleBaseByteArrayTest#varHandlesProvider")
     public void testIsAccessModeSupported(VarHandleSource vhs) {
         VarHandle vh = vhs.s;
 
@@ -206,17 +207,16 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
 #end[Bitwise]
     }
 
-    @Test(dataProvider = "typesProvider")
+    @ParameterizedTest
+    @MethodSource("typesProvider")
     public void testTypes(VarHandle vh, List<java.lang.Class<?>> pts) {
-        assertEquals(vh.varType(), $type$.class);
+        assertEquals($type$.class, vh.varType());
 
-        assertEquals(vh.coordinateTypes(), pts);
+        assertEquals(pts, vh.coordinateTypes());
 
         testTypes(vh);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -278,7 +278,8 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -287,7 +288,6 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
         }
     }
 
-
     static void testArrayNPE(ByteArraySource bs, VarHandleSource vhs) {
         VarHandle vh = vhs.s;
         byte[] array = null;
@@ -1272,7 +1272,7 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get $type$ value");
+                assertEquals(VALUE_1, x, "get $type$ value");
             }
         }
     }
@@ -1291,7 +1291,7 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
             {
                 vh.set(array, i, VALUE_1);
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, VALUE_1, "get $type$ value");
+                assertEquals(VALUE_1, x, "get $type$ value");
             }
 
             if (iAligned) {
@@ -1299,21 +1299,21 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                 {
                     vh.setVolatile(array, i, VALUE_2);
                     $type$ x = ($type$) vh.getVolatile(array, i);
-                    assertEquals(x, VALUE_2, "setVolatile $type$ value");
+                    assertEquals(VALUE_2, x, "setVolatile $type$ value");
                 }
 
                 // Lazy
                 {
                     vh.setRelease(array, i, VALUE_1);
                     $type$ x = ($type$) vh.getAcquire(array, i);
-                    assertEquals(x, VALUE_1, "setRelease $type$ value");
+                    assertEquals(VALUE_1, x, "setRelease $type$ value");
                 }
 
                 // Opaque
                 {
                     vh.setOpaque(array, i, VALUE_2);
                     $type$ x = ($type$) vh.getOpaque(array, i);
-                    assertEquals(x, VALUE_2, "setOpaque $type$ value");
+                    assertEquals(VALUE_2, x, "setOpaque $type$ value");
                 }
 #if[CAS]
 
@@ -1324,56 +1324,56 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, true, "success compareAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndSet $type$ value");
+                    assertEquals(VALUE_2, x, "success compareAndSet $type$ value");
                 }
 
                 {
                     boolean r = vh.compareAndSet(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, false, "failing compareAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndSet $type$ value");
+                    assertEquals(VALUE_2, x, "failing compareAndSet $type$ value");
                 }
 
                 {
                     $type$ r = ($type$) vh.compareAndExchange(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchange $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchange $type$ value");
+                    assertEquals(VALUE_1, x, "success compareAndExchange $type$ value");
                 }
 
                 {
                     $type$ r = ($type$) vh.compareAndExchange(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchange $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchange $type$ value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchange $type$ value");
                 }
 
                 {
                     $type$ r = ($type$) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_2);
                     assertEquals(r, VALUE_1, "success compareAndExchangeAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success compareAndExchangeAcquire $type$ value");
+                    assertEquals(VALUE_2, x, "success compareAndExchangeAcquire $type$ value");
                 }
 
                 {
                     $type$ r = ($type$) vh.compareAndExchangeAcquire(array, i, VALUE_1, VALUE_3);
                     assertEquals(r, VALUE_2, "failing compareAndExchangeAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing compareAndExchangeAcquire $type$ value");
+                    assertEquals(VALUE_2, x, "failing compareAndExchangeAcquire $type$ value");
                 }
 
                 {
                     $type$ r = ($type$) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_1);
                     assertEquals(r, VALUE_2, "success compareAndExchangeRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success compareAndExchangeRelease $type$ value");
+                    assertEquals(VALUE_1, x, "success compareAndExchangeRelease $type$ value");
                 }
 
                 {
                     $type$ r = ($type$) vh.compareAndExchangeRelease(array, i, VALUE_2, VALUE_3);
                     assertEquals(r, VALUE_1, "failing compareAndExchangeRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing compareAndExchangeRelease $type$ value");
+                    assertEquals(VALUE_1, x, "failing compareAndExchangeRelease $type$ value");
                 }
 
                 {
@@ -1384,14 +1384,14 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetPlain $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetPlain $type$ value");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetPlain $type$ value");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetPlain(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetPlain $type$ value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetPlain $type$ value");
                 }
 
                 {
@@ -1402,14 +1402,14 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSetAcquire $type$");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSetAcquire $type$");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetAcquire(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSetAcquire $type$ value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSetAcquire $type$ value");
                 }
 
                 {
@@ -1420,14 +1420,14 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSetRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "success weakCompareAndSetRelease $type$");
+                    assertEquals(VALUE_2, x, "success weakCompareAndSetRelease $type$");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSetRelease(array, i, VALUE_1, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSetRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "failing weakCompareAndSetRelease $type$ value");
+                    assertEquals(VALUE_2, x, "failing weakCompareAndSetRelease $type$ value");
                 }
 
                 {
@@ -1438,14 +1438,14 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     }
                     assertEquals(success, true, "success weakCompareAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "success weakCompareAndSet $type$");
+                    assertEquals(VALUE_1, x, "success weakCompareAndSet $type$");
                 }
 
                 {
                     boolean success = vh.weakCompareAndSet(array, i, VALUE_2, VALUE_3);
                     assertEquals(success, false, "failing weakCompareAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1, "failing weakCompareAndSet $type$ value");
+                    assertEquals(VALUE_1, x, "failing weakCompareAndSet $type$ value");
                 }
 
                 // Compare set and get
@@ -1453,27 +1453,27 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndSet(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSet $type$");
+                    assertEquals(VALUE_1, o, "getAndSet $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSet $type$ value");
+                    assertEquals(VALUE_2, x, "getAndSet $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndSetAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetAcquire $type$");
+                    assertEquals(VALUE_1, o, "getAndSetAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetAcquire $type$ value");
+                    assertEquals(VALUE_2, x, "getAndSetAcquire $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndSetRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndSetRelease $type$");
+                    assertEquals(VALUE_1, o, "getAndSetRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_2, "getAndSetRelease $type$ value");
+                    assertEquals(VALUE_2, x, "getAndSetRelease $type$ value");
                 }
 #end[CAS]
 
@@ -1483,27 +1483,27 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndAdd(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAdd $type$");
+                    assertEquals(VALUE_1, o, "getAndAdd $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAdd $type$ value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAdd $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndAddAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAddAcquire $type$");
+                    assertEquals(VALUE_1, o, "getAndAddAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAddAcquire $type$ value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAddAcquire $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndAddRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndAddRelease $type$");
+                    assertEquals(VALUE_1, o, "getAndAddRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 + VALUE_2, "getAndAddRelease $type$ value");
+                    assertEquals(VALUE_1 + VALUE_2, x,  "getAndAddRelease $type$ value");
                 }
 #end[AtomicAdd]
 
@@ -1513,27 +1513,27 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseOr(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOr $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOr $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOr $type$ value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOr $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseOrAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOrAcquire $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOrAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOrAcquire $type$ value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOrAcquire $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseOrRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseOrRelease $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseOrRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 | VALUE_2, "getAndBitwiseOrRelease $type$ value");
+                    assertEquals(VALUE_1 | VALUE_2, x, "getAndBitwiseOrRelease $type$ value");
                 }
 
                 // get and bitwise and
@@ -1541,27 +1541,27 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseAnd(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAnd $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAnd $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAnd $type$ value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAnd $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseAndAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAndAcquire $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAndAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAndAcquire $type$ value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAndAcquire $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseAndRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseAndRelease $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseAndRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 & VALUE_2, "getAndBitwiseAndRelease $type$ value");
+                    assertEquals(VALUE_1 & VALUE_2, x, "getAndBitwiseAndRelease $type$ value");
                 }
 
                 // get and bitwise xor
@@ -1569,27 +1569,27 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseXor(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXor $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXor $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXor $type$ value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXor $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseXorAcquire(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXorAcquire $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXorAcquire $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXorAcquire $type$ value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXorAcquire $type$ value");
                 }
 
                 {
                     vh.set(array, i, VALUE_1);
 
                     $type$ o = ($type$) vh.getAndBitwiseXorRelease(array, i, VALUE_2);
-                    assertEquals(o, VALUE_1, "getAndBitwiseXorRelease $type$");
+                    assertEquals(VALUE_1, o, "getAndBitwiseXorRelease $type$");
                     $type$ x = ($type$) vh.get(array, i);
-                    assertEquals(x, VALUE_1 ^ VALUE_2, "getAndBitwiseXorRelease $type$ value");
+                    assertEquals(VALUE_1 ^ VALUE_2, x, "getAndBitwiseXorRelease $type$ value");
                 }
 #end[Bitwise]
             }
@@ -1614,26 +1614,26 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
             // Plain
             {
                 $type$ x = ($type$) vh.get(array, i);
-                assertEquals(x, v, "get $type$ value");
+                assertEquals(v, x, "get $type$ value");
             }
 
             if (iAligned) {
                 // Volatile
                 {
                     $type$ x = ($type$) vh.getVolatile(array, i);
-                    assertEquals(x, v, "getVolatile $type$ value");
+                    assertEquals(v, x, "getVolatile $type$ value");
                 }
 
                 // Lazy
                 {
                     $type$ x = ($type$) vh.getAcquire(array, i);
-                    assertEquals(x, v, "getRelease $type$ value");
+                    assertEquals(v, x, "getRelease $type$ value");
                 }
 
                 // Opaque
                 {
                     $type$ x = ($type$) vh.getOpaque(array, i);
-                    assertEquals(x, v, "getOpaque $type$ value");
+                    assertEquals(v, x, "getOpaque $type$ value");
                 }
             }
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
index 4a9fa7c4fe8..a347b232d7e 100644
--- a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
+++ b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodHandleAccess.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,22 @@
  * @test
  * @comment Set CompileThresholdScaling to 0.1 so that the warmup loop sets to 2000 iterations
  *          to hit compilation thresholds
- * @run testng/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccess$Type$
+ * @run junit/othervm -Diters=2000 -XX:CompileThresholdScaling=0.1 VarHandleTestMethodHandleAccess$Type$
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
     static final $type$ static_final_v = $value1$;
 
@@ -60,7 +60,7 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodHandleAccess$Type$.class, "final_v", $type$.class);
@@ -77,8 +77,6 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle($type$[].class);
     }
 
-
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -111,7 +109,8 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -120,13 +119,12 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceField(VarHandleTestMethodHandleAccess$Type$ recv, Handles hs) throws Throwable {
         // Plain
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "set $type$ value");
+            assertEquals($value1$, x, "set $type$ value");
         }
 
 
@@ -134,21 +132,21 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact(recv, $value2$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(recv);
-            assertEquals(x, $value2$, "setVolatile $type$ value");
+            assertEquals($value2$, x, "setVolatile $type$ value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact(recv, $value1$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(recv);
-            assertEquals(x, $value1$, "setRelease $type$ value");
+            assertEquals($value1$, x, "setRelease $type$ value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact(recv, $value2$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(recv);
-            assertEquals(x, $value2$, "setOpaque $type$ value");
+            assertEquals($value2$, x, "setOpaque $type$ value");
         }
 
 #if[CAS]
@@ -159,56 +157,56 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, $value1$, $value2$);
             assertEquals(r, true, "success compareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "success compareAndSet $type$ value");
+            assertEquals($value2$, x, "success compareAndSet $type$ value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(recv, $value1$, $value3$);
             assertEquals(r, false, "failing compareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "failing compareAndSet $type$ value");
+            assertEquals($value2$, x, "failing compareAndSet $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, $value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchange $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "success compareAndExchange $type$ value");
+            assertEquals($value1$, x, "success compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(recv, $value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchange $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "failing compareAndExchange $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, $value1$, $value2$);
             assertEquals(r, $value1$, "success compareAndExchangeAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "success compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "success compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(recv, $value1$, $value3$);
             assertEquals(r, $value2$, "failing compareAndExchangeAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "failing compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "failing compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, $value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchangeRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "success compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "success compareAndExchangeRelease $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(recv, $value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchangeRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "failing compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchangeRelease $type$ value");
         }
 
         {
@@ -220,14 +218,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "success weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "success weakCompareAndSetPlain $type$ value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(recv, $value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "failing weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetPlain $type$ value");
         }
 
         {
@@ -239,14 +237,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "success weakCompareAndSetAcquire $type$");
+            assertEquals($value1$, x, "success weakCompareAndSetAcquire $type$");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(recv, $value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "failing weakCompareAndSetAcquire $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSetAcquire $type$ value");
         }
 
         {
@@ -258,14 +256,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "success weakCompareAndSetRelease $type$");
+            assertEquals($value2$, x, "success weakCompareAndSetRelease $type$");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact(recv, $value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "failing weakCompareAndSetRelease $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetRelease $type$ value");
         }
 
         {
@@ -277,22 +275,22 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "success weakCompareAndSet $type$");
+            assertEquals($value1$, x, "success weakCompareAndSet $type$");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(recv, $value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value1$, "failing weakCompareAndSet $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSet $type$ value");
         }
 
         // Compare set and get
         {
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndSet $type$");
+            assertEquals($value1$, o, "getAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, $value2$, "getAndSet $type$ value");
+            assertEquals($value2$, x, "getAndSet $type$ value");
         }
 #end[CAS]
 
@@ -302,27 +300,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndAdd $type$");
+            assertEquals($value1$, o, "getAndAdd $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAdd $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndAddAcquire $type$");
+            assertEquals($value1$, o, "getAndAddAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddAcquire $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndAddRelease $type$");
+            assertEquals($value1$, o, "getAndAddRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddRelease $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddRelease $type$ value");
         }
 #end[AtomicAdd]
 
@@ -332,27 +330,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOr $type$");
+            assertEquals($value1$, o, "getAndBitwiseOr $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOr $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOr $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrAcquire $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrRelease $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrRelease $type$ value");
         }
 
         // get and bitwise and
@@ -360,27 +358,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAnd $type$");
+            assertEquals($value1$, o, "getAndBitwiseAnd $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAnd $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAnd $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndAcquire $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndRelease $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndRelease $type$ value");
         }
 
         // get and bitwise xor
@@ -388,27 +386,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXor $type$");
+            assertEquals($value1$, o, "getAndBitwiseXor $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXor $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXor $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorAcquire $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(recv, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(recv, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(recv);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorRelease $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorRelease $type$ value");
         }
 #end[Bitwise]
     }
@@ -457,7 +455,7 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "set $type$ value");
+            assertEquals($value1$, x, "set $type$ value");
         }
 
 
@@ -465,21 +463,21 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
         {
             hs.get(TestAccessMode.SET_VOLATILE).invokeExact($value2$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET_VOLATILE).invokeExact();
-            assertEquals(x, $value2$, "setVolatile $type$ value");
+            assertEquals($value2$, x, "setVolatile $type$ value");
         }
 
         // Lazy
         {
             hs.get(TestAccessMode.SET_RELEASE).invokeExact($value1$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact();
-            assertEquals(x, $value1$, "setRelease $type$ value");
+            assertEquals($value1$, x, "setRelease $type$ value");
         }
 
         // Opaque
         {
             hs.get(TestAccessMode.SET_OPAQUE).invokeExact($value2$);
             $type$ x = ($type$) hs.get(TestAccessMode.GET_OPAQUE).invokeExact();
-            assertEquals(x, $value2$, "setOpaque $type$ value");
+            assertEquals($value2$, x, "setOpaque $type$ value");
         }
 
 #if[CAS]
@@ -490,56 +488,56 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact($value1$, $value2$);
             assertEquals(r, true, "success compareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "success compareAndSet $type$ value");
+            assertEquals($value2$, x, "success compareAndSet $type$ value");
         }
 
         {
             boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact($value1$, $value3$);
             assertEquals(r, false, "failing compareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "failing compareAndSet $type$ value");
+            assertEquals($value2$, x, "failing compareAndSet $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact($value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchange $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "success compareAndExchange $type$ value");
+            assertEquals($value1$, x, "success compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact($value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchange $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "failing compareAndExchange $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchange $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact($value1$, $value2$);
             assertEquals(r, $value1$, "success compareAndExchangeAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "success compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "success compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact($value1$, $value3$);
             assertEquals(r, $value2$, "failing compareAndExchangeAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "failing compareAndExchangeAcquire $type$ value");
+            assertEquals($value2$, x, "failing compareAndExchangeAcquire $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact($value2$, $value1$);
             assertEquals(r, $value2$, "success compareAndExchangeRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "success compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "success compareAndExchangeRelease $type$ value");
         }
 
         {
             $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact($value2$, $value3$);
             assertEquals(r, $value1$, "failing compareAndExchangeRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "failing compareAndExchangeRelease $type$ value");
+            assertEquals($value1$, x, "failing compareAndExchangeRelease $type$ value");
         }
 
         {
@@ -551,14 +549,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetPlain $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "success weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "success weakCompareAndSetPlain $type$ value");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact($value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "failing weakCompareAndSetPlain $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetPlain $type$ value");
         }
 
         {
@@ -570,7 +568,7 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "success weakCompareAndSetAcquire $type$");
+            assertEquals($value1$, x, "success weakCompareAndSetAcquire $type$");
         }
 
         {
@@ -578,7 +576,7 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             boolean success = (boolean) mh.invokeExact($value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "failing weakCompareAndSetAcquire $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSetAcquire $type$ value");
         }
 
         {
@@ -590,14 +588,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "success weakCompareAndSetRelease $type$");
+            assertEquals($value2$, x, "success weakCompareAndSetRelease $type$");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_RELEASE).invokeExact($value1$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "failing weakCompareAndSetRelease $type$ value");
+            assertEquals($value2$, x, "failing weakCompareAndSetRelease $type$ value");
         }
 
         {
@@ -609,14 +607,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             }
             assertEquals(success, true, "success weakCompareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "success weakCompareAndSet $type$");
+            assertEquals($value1$, x, "success weakCompareAndSet $type$");
         }
 
         {
             boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact($value2$, $value3$);
             assertEquals(success, false, "failing weakCompareAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value1$, "failing weakCompareAndSetRe $type$ value");
+            assertEquals($value1$, x, "failing weakCompareAndSetRe $type$ value");
         }
 
         // Compare set and get
@@ -624,9 +622,9 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndSet $type$");
+            assertEquals($value1$, o, "getAndSet $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "getAndSet $type$ value");
+            assertEquals($value2$, x, "getAndSet $type$ value");
         }
 
         // Compare set and get
@@ -634,9 +632,9 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndSetAcquire $type$");
+            assertEquals($value1$, o, "getAndSetAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "getAndSetAcquire $type$ value");
+            assertEquals($value2$, x, "getAndSetAcquire $type$ value");
         }
 
         // Compare set and get
@@ -644,9 +642,9 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndSetRelease $type$");
+            assertEquals($value1$, o, "getAndSetRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, $value2$, "getAndSetRelease $type$ value");
+            assertEquals($value2$, x, "getAndSetRelease $type$ value");
         }
 #end[CAS]
 
@@ -656,27 +654,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndAdd $type$");
+            assertEquals($value1$, o, "getAndAdd $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAdd $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndAddAcquire $type$");
+            assertEquals($value1$, o, "getAndAddAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddAcquire $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndAddRelease $type$");
+            assertEquals($value1$, o, "getAndAddRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddRelease $type$ value");
+            assertEquals(($type$)($value1$ + $value2$), x, "getAndAddRelease $type$ value");
         }
 #end[AtomicAdd]
 
@@ -686,27 +684,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOr $type$");
+            assertEquals($value1$, o, "getAndBitwiseOr $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOr $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOr $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrAcquire $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrRelease $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrRelease $type$ value");
         }
 
         // get and bitwise and
@@ -714,27 +712,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAnd $type$");
+            assertEquals($value1$, o, "getAndBitwiseAnd $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAnd $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAnd $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndAcquire $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndRelease $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndRelease $type$ value");
         }
 
         // get and bitwise xor
@@ -742,27 +740,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXor $type$");
+            assertEquals($value1$, o, "getAndBitwiseXor $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXor $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXor $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorAcquire $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact($value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact($value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact();
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorRelease $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorRelease $type$ value");
         }
 #end[Bitwise]
     }
@@ -814,7 +812,7 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "get $type$ value");
+                assertEquals($value1$, x, "get $type$ value");
             }
 
 
@@ -822,21 +820,21 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             {
                 hs.get(TestAccessMode.SET_VOLATILE).invokeExact(array, i, $value2$);
                 $type$ x = ($type$) hs.get(TestAccessMode.GET_VOLATILE).invokeExact(array, i);
-                assertEquals(x, $value2$, "setVolatile $type$ value");
+                assertEquals($value2$, x, "setVolatile $type$ value");
             }
 
             // Lazy
             {
                 hs.get(TestAccessMode.SET_RELEASE).invokeExact(array, i, $value1$);
                 $type$ x = ($type$) hs.get(TestAccessMode.GET_ACQUIRE).invokeExact(array, i);
-                assertEquals(x, $value1$, "setRelease $type$ value");
+                assertEquals($value1$, x, "setRelease $type$ value");
             }
 
             // Opaque
             {
                 hs.get(TestAccessMode.SET_OPAQUE).invokeExact(array, i, $value2$);
                 $type$ x = ($type$) hs.get(TestAccessMode.GET_OPAQUE).invokeExact(array, i);
-                assertEquals(x, $value2$, "setOpaque $type$ value");
+                assertEquals($value2$, x, "setOpaque $type$ value");
             }
 
 #if[CAS]
@@ -847,56 +845,56 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, $value1$, $value2$);
                 assertEquals(r, true, "success compareAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "success compareAndSet $type$ value");
+                assertEquals($value2$, x, "success compareAndSet $type$ value");
             }
 
             {
                 boolean r = (boolean) hs.get(TestAccessMode.COMPARE_AND_SET).invokeExact(array, i, $value1$, $value3$);
                 assertEquals(r, false, "failing compareAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "failing compareAndSet $type$ value");
+                assertEquals($value2$, x, "failing compareAndSet $type$ value");
             }
 
             {
                 $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, $value2$, $value1$);
                 assertEquals(r, $value2$, "success compareAndExchange $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "success compareAndExchange $type$ value");
+                assertEquals($value1$, x, "success compareAndExchange $type$ value");
             }
 
             {
                 $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE).invokeExact(array, i, $value2$, $value3$);
                 assertEquals(r, $value1$, "failing compareAndExchange $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "failing compareAndExchange $type$ value");
+                assertEquals($value1$, x, "failing compareAndExchange $type$ value");
             }
 
             {
                 $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, $value1$, $value2$);
                 assertEquals(r, $value1$, "success compareAndExchangeAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "success compareAndExchangeAcquire $type$ value");
+                assertEquals($value2$, x, "success compareAndExchangeAcquire $type$ value");
             }
 
             {
                 $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_ACQUIRE).invokeExact(array, i, $value1$, $value3$);
                 assertEquals(r, $value2$, "failing compareAndExchangeAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "failing compareAndExchangeAcquire $type$ value");
+                assertEquals($value2$, x, "failing compareAndExchangeAcquire $type$ value");
             }
 
             {
                 $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, $value2$, $value1$);
                 assertEquals(r, $value2$, "success compareAndExchangeRelease $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "success compareAndExchangeRelease $type$ value");
+                assertEquals($value1$, x, "success compareAndExchangeRelease $type$ value");
             }
 
             {
                 $type$ r = ($type$) hs.get(TestAccessMode.COMPARE_AND_EXCHANGE_RELEASE).invokeExact(array, i, $value2$, $value3$);
                 assertEquals(r, $value1$, "failing compareAndExchangeRelease $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "failing compareAndExchangeRelease $type$ value");
+                assertEquals($value1$, x, "failing compareAndExchangeRelease $type$ value");
             }
 
             {
@@ -908,14 +906,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetPlain $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "success weakCompareAndSetPlain $type$ value");
+                assertEquals($value2$, x, "success weakCompareAndSetPlain $type$ value");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_PLAIN).invokeExact(array, i, $value1$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSetPlain $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "failing weakCompareAndSetPlain $type$ value");
+                assertEquals($value2$, x, "failing weakCompareAndSetPlain $type$ value");
             }
 
             {
@@ -927,14 +925,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "success weakCompareAndSetAcquire $type$");
+                assertEquals($value1$, x, "success weakCompareAndSetAcquire $type$");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, $value2$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "failing weakCompareAndSetAcquire $type$ value");
+                assertEquals($value1$, x, "failing weakCompareAndSetAcquire $type$ value");
             }
 
             {
@@ -946,14 +944,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSetRelease $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "success weakCompareAndSetRelease $type$");
+                assertEquals($value2$, x, "success weakCompareAndSetRelease $type$");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET_ACQUIRE).invokeExact(array, i, $value1$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSetAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "failing weakCompareAndSetAcquire $type$ value");
+                assertEquals($value2$, x, "failing weakCompareAndSetAcquire $type$ value");
             }
 
             {
@@ -965,14 +963,14 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 }
                 assertEquals(success, true, "success weakCompareAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "success weakCompareAndSet $type$");
+                assertEquals($value1$, x, "success weakCompareAndSet $type$");
             }
 
             {
                 boolean success = (boolean) hs.get(TestAccessMode.WEAK_COMPARE_AND_SET).invokeExact(array, i, $value2$, $value3$);
                 assertEquals(success, false, "failing weakCompareAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value1$, "failing weakCompareAndSet $type$ value");
+                assertEquals($value1$, x, "failing weakCompareAndSet $type$ value");
             }
 
             // Compare set and get
@@ -980,27 +978,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
                 $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET).invokeExact(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndSet $type$");
+                assertEquals($value1$, o, "getAndSet $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "getAndSet $type$ value");
+                assertEquals($value2$, x, "getAndSet $type$ value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
                 $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET_ACQUIRE).invokeExact(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndSetAcquire $type$");
+                assertEquals($value1$, o, "getAndSetAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "getAndSetAcquire $type$ value");
+                assertEquals($value2$, x, "getAndSetAcquire $type$ value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
                 $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_SET_RELEASE).invokeExact(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndSetRelease $type$");
+                assertEquals($value1$, o, "getAndSetRelease $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, $value2$, "getAndSetRelease $type$ value");
+                assertEquals($value2$, x, "getAndSetRelease $type$ value");
             }
 #end[CAS]
 
@@ -1010,27 +1008,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
                 $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD).invokeExact(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndAdd $type$");
+                assertEquals($value1$, o, "getAndAdd $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$ value");
+                assertEquals(($type$)($value1$ + $value2$), x, "getAndAdd $type$ value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
                 $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD_ACQUIRE).invokeExact(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndAddAcquire $type$");
+                assertEquals($value1$, o, "getAndAddAcquire $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddAcquire $type$ value");
+                assertEquals(($type$)($value1$ + $value2$), x, "getAndAddAcquire $type$ value");
             }
 
             {
                 hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
                 $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_ADD_RELEASE).invokeExact(array, i, $value2$);
-                assertEquals(o, $value1$, "getAndAddRelease $type$");
+                assertEquals($value1$, o, "getAndAddRelease $type$");
                 $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-                assertEquals(x, ($type$)($value1$ + $value2$), "getAndAddRelease $type$ value");
+                assertEquals(($type$)($value1$ + $value2$), x, "getAndAddRelease $type$ value");
             }
 #end[AtomicAdd]
 
@@ -1040,27 +1038,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOr $type$");
+            assertEquals($value1$, o, "getAndBitwiseOr $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOr $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOr $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR_ACQUIRE).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrAcquire $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_OR_RELEASE).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseOrRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseOrRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ | $value2$), "getAndBitwiseOrRelease $type$ value");
+            assertEquals(($type$)($value1$ | $value2$), x, "getAndBitwiseOrRelease $type$ value");
         }
 
         // get and bitwise and
@@ -1068,27 +1066,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAnd $type$");
+            assertEquals($value1$, o, "getAndBitwiseAnd $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAnd $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAnd $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND_ACQUIRE).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndAcquire $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_AND_RELEASE).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseAndRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseAndRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ & $value2$), "getAndBitwiseAndRelease $type$ value");
+            assertEquals(($type$)($value1$ & $value2$), x, "getAndBitwiseAndRelease $type$ value");
         }
 
         // get and bitwise xor
@@ -1096,27 +1094,27 @@ public class VarHandleTestMethodHandleAccess$Type$ extends VarHandleBaseTest {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXor $type$");
+            assertEquals($value1$, o, "getAndBitwiseXor $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXor $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXor $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_ACQUIRE).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorAcquire $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorAcquire $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorAcquire $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorAcquire $type$ value");
         }
 
         {
             hs.get(TestAccessMode.SET).invokeExact(array, i, $value1$);
 
             $type$ o = ($type$) hs.get(TestAccessMode.GET_AND_BITWISE_XOR_RELEASE).invokeExact(array, i, $value2$);
-            assertEquals(o, $value1$, "getAndBitwiseXorRelease $type$");
+            assertEquals($value1$, o, "getAndBitwiseXorRelease $type$");
             $type$ x = ($type$) hs.get(TestAccessMode.GET).invokeExact(array, i);
-            assertEquals(x, ($type$)($value1$ ^ $value2$), "getAndBitwiseXorRelease $type$ value");
+            assertEquals(($type$)($value1$ ^ $value2$), x, "getAndBitwiseXorRelease $type$ value");
         }
 #end[Bitwise]
         }
diff --git a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
index 85ecf9bb95c..77531cc309f 100644
--- a/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
+++ b/test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestMethodType.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,26 @@
 /*
  * @test
  * @bug 8156486
- * @run testng/othervm VarHandleTestMethodType$Type$
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodType$Type$
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodType$Type$
- * @run testng/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodType$Type$
+ * @run junit/othervm VarHandleTestMethodType$Type$
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=true -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodType$Type$
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=false VarHandleTestMethodType$Type$
+ * @run junit/othervm -Djava.lang.invoke.VarHandle.VAR_HANDLE_GUARDS=false -Djava.lang.invoke.VarHandle.VAR_HANDLE_IDENTITY_ADAPT=true VarHandleTestMethodType$Type$
  */
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import static java.lang.invoke.MethodType.*;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
     static final $type$ static_final_v = $value1$;
 
@@ -63,7 +63,7 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
 
     VarHandle vhArray;
 
-    @BeforeClass
+    @BeforeAll
     public void setup() throws Exception {
         vhFinalField = MethodHandles.lookup().findVarHandle(
                 VarHandleTestMethodType$Type$.class, "final_v", $type$.class);
@@ -80,7 +80,6 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         vhArray = MethodHandles.arrayElementVarHandle($type$[].class);
     }
 
-    @DataProvider
     public Object[][] accessTestCaseProvider() throws Exception {
         List<AccessTestCase<?>> cases = new ArrayList<>();
 
@@ -115,7 +114,8 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         return cases.stream().map(tc -> new Object[]{tc.toString(), tc}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "accessTestCaseProvider")
+    @ParameterizedTest
+    @MethodSource("accessTestCaseProvider")
     public <T> void testAccess(String desc, AccessTestCase<T> atc) throws Throwable {
         T t = atc.get();
         int iters = atc.requiresLoop() ? ITERS : 1;
@@ -124,7 +124,6 @@ public class VarHandleTestMethodType$Type$ extends VarHandleBaseTest {
         }
     }
 
-
     static void testInstanceFieldWrongMethodType(VarHandleTestMethodType$Type$ recv, VarHandle vh) throws Throwable {
         // Get
         // Incorrect argument types
diff --git a/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java b/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java
index 343b15a1caf..11cd6ec233c 100644
--- a/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java
+++ b/test/jdk/java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,11 @@
  * @compile TestFieldLookupAccessibility.java
  *          pkg/A.java pkg/B_extends_A.java pkg/C.java
  *          pkg/subpkg/B_extends_A.java pkg/subpkg/C.java
- * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED -DwriteAccess=true TestFieldLookupAccessibility
- * @run testng/othervm --illegal-final-field-mutation=deny -DwriteAccess=false TestFieldLookupAccessibility
+ * @run junit/othervm --enable-final-field-mutation=ALL-UNNAMED -DwriteAccess=true TestFieldLookupAccessibility
+ * @run junit/othervm --illegal-final-field-mutation=deny -DwriteAccess=false TestFieldLookupAccessibility
  */
 
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.*;
 import pkg.B_extends_A;
 
 import java.lang.invoke.MethodHandles;
@@ -48,11 +45,14 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class TestFieldLookupAccessibility {
     static boolean writeAccess;
 
-    @BeforeClass
+    @BeforeAll
     static void setup() {
         String s = System.getProperty("writeAccess");
         assertNotNull(s);
@@ -188,8 +188,7 @@ public class TestFieldLookupAccessibility {
         }
     }
 
-    @DataProvider
-    public Object[][] lookupProvider() throws Exception {
+    public static Object[][] lookupProvider() throws Exception {
         Stream<List<Object>> baseCases = Stream.of(
                 // Look up from same package
                 List.of(pkg.A.class, pkg.A.lookup(), pkg.A.inaccessibleFields()),
@@ -215,7 +214,8 @@ public class TestFieldLookupAccessibility {
         return pl.toArray();
     }
 
-    @Test(dataProvider = "lookupProvider")
+    @ParameterizedTest
+    @MethodSource("lookupProvider")
     public void test(FieldLookup fl, Class<?> src, MethodHandles.Lookup l, Set<String> inaccessibleFields) {
         // Add to the expected failures all inaccessible fields due to accessibility modifiers
         Set<String> expected = fl.inaccessibleFields(inaccessibleFields);
@@ -240,10 +240,10 @@ public class TestFieldLookupAccessibility {
                 collect(Collectors.toSet());
         if (!actualFieldNames.equals(expected)) {
             if (actualFieldNames.isEmpty()) {
-                assertEquals(actualFieldNames, expected, "No accessibility failures:");
+                assertEquals(expected, actualFieldNames, "No accessibility failures:");
             }
             else {
-                assertEquals(actualFieldNames, expected, "Accessibility failures differ:");
+                assertEquals(expected, actualFieldNames, "Accessibility failures differ:");
             }
         }
         else {
diff --git a/test/jdk/java/lang/invoke/WrongMethodTypeTest.java b/test/jdk/java/lang/invoke/WrongMethodTypeTest.java
index be0c59e0d77..32cbfc545ce 100644
--- a/test/jdk/java/lang/invoke/WrongMethodTypeTest.java
+++ b/test/jdk/java/lang/invoke/WrongMethodTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,9 @@
  * questions.
  */
 
-/* @test 8299183
- * @run testng WrongMethodTypeTest
+/* @test
+ * @bug 8299183
+ * @run junit WrongMethodTypeTest
  */
 
 import java.lang.invoke.MethodHandle;
@@ -33,9 +34,10 @@ import java.lang.invoke.WrongMethodTypeException;
 
 import static java.lang.invoke.MethodType.methodType;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class WrongMethodTypeTest {
     static final Lookup LOOKUP = MethodHandles.lookup();
@@ -43,13 +45,11 @@ public class WrongMethodTypeTest {
     @Test
     public void checkExactType() throws Throwable {
         String expectedMessage = "handle's method type (int)int but found ()boolean";
-        try {
-            MethodHandle mh = LOOKUP.findStatic(WrongMethodTypeTest.class, "m", methodType(int.class, int.class));
+        MethodHandle mh = LOOKUP.findStatic(WrongMethodTypeTest.class, "m", methodType(int.class, int.class));
+        var ex = assertThrows(WrongMethodTypeException.class, () -> {
             boolean b = (boolean)mh.invokeExact();
-            fail("Expected WrongMethodTypeException");
-        } catch (WrongMethodTypeException ex) {
-            assertEquals(expectedMessage, ex.getMessage());
-        }
+        });
+        assertEquals(expectedMessage, ex.getMessage());
     }
 
     @Test
@@ -57,11 +57,10 @@ public class WrongMethodTypeTest {
         String expectedMessage = "handle's method type ()int but found ()Void";
         VarHandle vh = LOOKUP.findStaticVarHandle(WrongMethodTypeTest.class, "x", int.class)
                              .withInvokeExactBehavior();
-        try {
+        var ex = assertThrows(WrongMethodTypeException.class, () -> {
             Void o = (Void) vh.get();
-        } catch (WrongMethodTypeException ex) {
-            assertEquals(expectedMessage, ex.getMessage());
-        }
+        });
+        assertEquals(expectedMessage, ex.getMessage());
     }
 
     @Test
@@ -69,11 +68,10 @@ public class WrongMethodTypeTest {
         String expectedMessage = "handle's method type (WrongMethodTypeTest)boolean but found (WrongMethodTypeTest)int";
         VarHandle vh = LOOKUP.findVarHandle(WrongMethodTypeTest.class, "y", boolean.class)
                              .withInvokeExactBehavior();
-        try {
+        var ex = assertThrows(WrongMethodTypeException.class, () -> {
             int o = (int) vh.get(new WrongMethodTypeTest());
-        } catch (WrongMethodTypeException ex) {
-            assertEquals(expectedMessage, ex.getMessage());
-        }
+        });
+        assertEquals(expectedMessage, ex.getMessage());
     }
 
     static int m(int x) {
diff --git a/test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java
index 083a357a430..23893655c0a 100644
--- a/test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestAccessClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8150782 8207027 8266269
  * @compile TestAccessClass.java TestCls.java p/Foo.java q/Bar.java
- * @run testng/othervm -ea -esa test.java.lang.invoke.TestAccessClass
+ * @run junit/othervm -ea -esa test.java.lang.invoke.TestAccessClass
  */
 package test.java.lang.invoke;
 
@@ -36,9 +36,11 @@ import q.Bar;
 
 import static java.lang.invoke.MethodHandles.*;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestAccessClass {
 
@@ -68,17 +70,19 @@ public class TestAccessClass {
         assertEquals(Class1[].class, aClass);
     }
 
-    @DataProvider
-    Object[][] illegalAccessAccess() {
+    static Object[][] illegalAccessAccess() {
         return new Object[][] {
                 {publicLookup(), Class1.class},
                 {publicLookup(), TestCls.getPrivateSIC()}
         };
     }
 
-    @Test(dataProvider = "illegalAccessAccess", expectedExceptions = {IllegalAccessException.class})
+    @ParameterizedTest
+    @MethodSource("illegalAccessAccess")
     public void illegalAccessExceptionTest(Lookup lookup, Class<?> klass) throws IllegalAccessException {
-        lookup.accessClass(klass);
+        assertThrows(IllegalAccessException.class, () -> {
+            lookup.accessClass(klass);
+        });
     }
 
     @Test
@@ -98,8 +102,8 @@ public class TestAccessClass {
         mh.invoke(null);
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void illegalArgument() throws IllegalAccessException {
-        lookup().accessClass(null);
+        assertThrows(NullPointerException.class, () -> lookup().accessClass(null));
     }
 }
diff --git a/test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java
index 54674729fe3..94ec3c54b4f 100644
--- a/test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestFindClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8150782 8207027 8266269
  * @compile TestFindClass.java TestCls.java p/Foo.java q/Bar.java
- * @run testng/othervm -ea -esa test.java.lang.invoke.TestFindClass
+ * @run junit/othervm -ea -esa test.java.lang.invoke.TestFindClass
  */
 package test.java.lang.invoke;
 
@@ -34,9 +34,11 @@ import q.Bar;
 
 import static java.lang.invoke.MethodHandles.*;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import org.testng.annotations.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestFindClass {
 
@@ -68,13 +70,12 @@ public class TestFindClass {
         assertEquals(Class1[].class, aClass);
     }
 
-    @Test(expectedExceptions = {ClassNotFoundException.class})
+    @Test
     public void classNotFoundExceptionTest() throws IllegalAccessException, ClassNotFoundException {
-        lookup().findClass(PACKAGE_PREFIX + "TestFindClass$NonExistent");
+        assertThrows(ClassNotFoundException.class, () -> lookup().findClass(PACKAGE_PREFIX + "TestFindClass$NonExistent"));
     }
 
-    @DataProvider
-    Object[][] illegalAccessFind() {
+    static Object[][] illegalAccessFind() {
         return new Object[][] {
                 {publicLookup(), PACKAGE_PREFIX + "TestFindClass$Class1"},
                 {publicLookup(), PACKAGE_PREFIX + "TestCls$PrivateSIC"}
@@ -84,9 +85,10 @@ public class TestFindClass {
     /**
      * Assertion: @throws IllegalAccessException if the class is not accessible, using the allowed access modes.
      */
-    @Test(dataProvider = "illegalAccessFind", expectedExceptions = {ClassNotFoundException.class})
+    @ParameterizedTest
+    @MethodSource("illegalAccessFind")
     public void illegalAccessExceptionTest(Lookup lookup, String className) throws IllegalAccessException, ClassNotFoundException {
-        lookup.findClass(className);
+        assertThrows(ClassNotFoundException.class, () -> lookup.findClass(className));
     }
 
     @Test
@@ -104,8 +106,8 @@ public class TestFindClass {
         lookup().findClass("[Lp.Foo$T;");
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void illegalArgument() throws IllegalAccessException, ClassNotFoundException {
-        lookup().findClass(null);
+        assertThrows(NullPointerException.class, () -> lookup().findClass(null));
     }
 }
diff --git a/test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java
index 555213bedcc..b0f2e00adbc 100644
--- a/test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java
+++ b/test/jdk/java/lang/invoke/accessClassAndFindClass/TestLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,15 @@
 
 /* @test
  * @compile TestLookup.java TestCls.java
- * @run testng/othervm -ea -esa test.java.lang.invoke.TestLookup
+ * @run junit/othervm -ea -esa test.java.lang.invoke.TestLookup
  */
 package test.java.lang.invoke;
 
-import org.testng.annotations.Test;
-
 import static java.lang.invoke.MethodHandles.*;
 
-import static org.testng.AssertJUnit.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestLookup {
 
@@ -43,10 +43,10 @@ public class TestLookup {
         assertNull(lookup2.lookupClass().getClassLoader());
     }
 
-    @Test(expectedExceptions = {ClassNotFoundException.class})
+    @Test
     public void testPublicCannotLoadUserClass() throws IllegalAccessException, ClassNotFoundException {
         Lookup lookup = publicLookup();
-        lookup.findClass("test.java.lang.invoke.TestCls");
+        assertThrows(ClassNotFoundException.class, () -> lookup.findClass("test.java.lang.invoke.TestCls"));
     }
 
     @Test
diff --git a/test/jdk/java/lang/invoke/callerSensitive/CallerSensitiveAccess.java b/test/jdk/java/lang/invoke/callerSensitive/CallerSensitiveAccess.java
index a6359162629..67aa90ba99c 100644
--- a/test/jdk/java/lang/invoke/callerSensitive/CallerSensitiveAccess.java
+++ b/test/jdk/java/lang/invoke/callerSensitive/CallerSensitiveAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8196830 8235351 8257874
  * @modules java.base/jdk.internal.reflect
- * @run testng/othervm CallerSensitiveAccess
+ * @run junit/othervm CallerSensitiveAccess
  * @summary Check Lookup findVirtual, findStatic and unreflect behavior with
  *          caller sensitive methods with focus on AccessibleObject.setAccessible
  */
@@ -50,17 +50,16 @@ import java.util.stream.Stream;
 
 import jdk.internal.reflect.CallerSensitive;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.NoInjection;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CallerSensitiveAccess {
 
     /**
      * Caller sensitive methods in APIs exported by java.base.
      */
-    @DataProvider(name = "callerSensitiveMethods")
     static Object[][] callerSensitiveMethods() {
         try (Stream<Method> stream = callerSensitiveMethods(Object.class.getModule())) {
             return stream.map(m -> new Object[]{m, shortDescription(m)})
@@ -72,34 +71,35 @@ public class CallerSensitiveAccess {
      * Using publicLookup, attempt to use findVirtual or findStatic to obtain a
      * method handle to a caller sensitive method.
      */
-    @Test(dataProvider = "callerSensitiveMethods",
-            expectedExceptions = IllegalAccessException.class)
-    public void testPublicLookupFind(@NoInjection Method method, String desc) throws Exception {
+    @ParameterizedTest
+    @MethodSource("callerSensitiveMethods")
+    public void testPublicLookupFind(Method method, String desc) throws Exception {
         Lookup lookup = MethodHandles.publicLookup();
         Class<?> refc = method.getDeclaringClass();
         String name = method.getName();
         MethodType mt = MethodType.methodType(method.getReturnType(), method.getParameterTypes());
-        if (Modifier.isStatic(method.getModifiers())) {
-            lookup.findStatic(refc, name, mt);
-        } else {
-            lookup.findVirtual(refc, name, mt);
-        }
+        assertThrows(IllegalAccessException.class, () -> {
+            if (Modifier.isStatic(method.getModifiers())) {
+                lookup.findStatic(refc, name, mt);
+            } else {
+                lookup.findVirtual(refc, name, mt);
+            }
+        });
     }
 
     /**
      * Using publicLookup, attempt to use unreflect to obtain a method handle to a
      * caller sensitive method.
      */
-    @Test(dataProvider = "callerSensitiveMethods",
-            expectedExceptions = IllegalAccessException.class)
-    public void testPublicLookupUnreflect(@NoInjection Method method, String desc) throws Exception {
-        MethodHandles.publicLookup().unreflect(method);
+    @ParameterizedTest
+    @MethodSource("callerSensitiveMethods")
+    public void testPublicLookupUnreflect(Method method, String desc) throws Exception {
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.publicLookup().unreflect(method));
     }
 
     /**
      * public accessible caller sensitive methods in APIs exported by java.base.
      */
-    @DataProvider(name = "accessibleCallerSensitiveMethods")
     static Object[][] accessibleCallerSensitiveMethods() {
         try (Stream<Method> stream = callerSensitiveMethods(Object.class.getModule())) {
             return stream
@@ -114,41 +114,43 @@ public class CallerSensitiveAccess {
      * Using publicLookup, attempt to use unreflect to obtain a method handle to a
      * caller sensitive method.
      */
-    @Test(dataProvider = "accessibleCallerSensitiveMethods",
-            expectedExceptions = IllegalAccessException.class)
-    public void testLookupUnreflect(@NoInjection Method method, String desc) throws Exception {
-        MethodHandles.publicLookup().unreflect(method);
+    @ParameterizedTest
+    @MethodSource("accessibleCallerSensitiveMethods")
+    public void testLookupUnreflect(Method method, String desc) throws Exception {
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.publicLookup().unreflect(method));
     }
 
     /**
      * Using a Lookup with no original access that can't lookup caller-sensitive
      * method
      */
-    @Test(dataProvider = "callerSensitiveMethods",
-            expectedExceptions = IllegalAccessException.class)
-    public void testLookupNoOriginalAccessFind(@NoInjection Method method, String desc) throws Exception {
+    @ParameterizedTest
+    @MethodSource("callerSensitiveMethods")
+    public void testLookupNoOriginalAccessFind(Method method, String desc) throws Exception {
         Lookup lookup = MethodHandles.lookup().dropLookupMode(Lookup.ORIGINAL);
         assertTrue(lookup.hasFullPrivilegeAccess());
         Class<?> refc = method.getDeclaringClass();
         String name = method.getName();
         MethodType mt = MethodType.methodType(method.getReturnType(), method.getParameterTypes());
-        if (Modifier.isStatic(method.getModifiers())) {
-            lookup.findStatic(refc, name, mt);
-        } else {
-            lookup.findVirtual(refc, name, mt);
-        }
+        assertThrows(IllegalAccessException.class, () -> {
+            if (Modifier.isStatic(method.getModifiers())) {
+                lookup.findStatic(refc, name, mt);
+            } else {
+                lookup.findVirtual(refc, name, mt);
+            }
+        });
     }
 
     /**
      * Using a Lookup with no original access that can't unreflect caller-sensitive
      * method
      */
-    @Test(dataProvider = "callerSensitiveMethods",
-            expectedExceptions = IllegalAccessException.class)
-    public void testLookupNoOriginalAccessUnreflect(@NoInjection Method method, String desc) throws Exception {
+    @ParameterizedTest
+    @MethodSource("callerSensitiveMethods")
+    public void testLookupNoOriginalAccessUnreflect(Method method, String desc) throws Exception {
         Lookup lookup = MethodHandles.lookup().dropLookupMode(Lookup.ORIGINAL);
         assertTrue(lookup.hasFullPrivilegeAccess());
-        lookup.unreflect(method);
+        assertThrows(IllegalAccessException.class, () -> lookup.unreflect(method));
     }
 
     // -- Test method handles to setAccessible --
@@ -156,21 +158,12 @@ public class CallerSensitiveAccess {
     private int aField;
 
     Field accessibleField() {
-        try {
-            return getClass().getDeclaredField("aField");
-        } catch (NoSuchFieldException e) {
-            fail();
-            return null;
-        }
+        var clazz = getClass();
+        return assertDoesNotThrow(() -> clazz.getDeclaredField("aField"));
     }
 
     Field inaccessibleField() {
-        try {
-            return String.class.getDeclaredField("hash");
-        } catch (NoSuchFieldException e) {
-            fail();
-            return null;
-        }
+        return assertDoesNotThrow(() -> String.class.getDeclaredField("hash"));
     }
 
     void findAndInvokeSetAccessible(Class<? extends AccessibleObject> refc, Field f) throws Throwable {
@@ -215,23 +208,23 @@ public class CallerSensitiveAccess {
      * Create a method handle to setAccessible and attempt to use it to suppress
      * access to an inaccessible member.
      */
-    @Test(expectedExceptions = InaccessibleObjectException.class)
+    @Test
     public void testSetAccessible5() throws Throwable {
-        findAndInvokeSetAccessible(AccessibleObject.class, inaccessibleField());
+        assertThrows(InaccessibleObjectException.class, () -> findAndInvokeSetAccessible(AccessibleObject.class, inaccessibleField()));
     }
-    @Test(expectedExceptions = InaccessibleObjectException.class)
+    @Test
     public void testSetAccessible6() throws Throwable {
-        findAndInvokeSetAccessible(Field.class, inaccessibleField());
+        assertThrows(InaccessibleObjectException.class, () -> findAndInvokeSetAccessible(Field.class, inaccessibleField()));
     }
-    @Test(expectedExceptions = InaccessibleObjectException.class)
+    @Test
     public void testSetAccessible7() throws Throwable {
         Method m = AccessibleObject.class.getMethod("setAccessible", boolean.class);
-        unreflectAndInvokeSetAccessible(m, inaccessibleField());
+        assertThrows(InaccessibleObjectException.class, () -> unreflectAndInvokeSetAccessible(m, inaccessibleField()));
     }
-    @Test(expectedExceptions = InaccessibleObjectException.class)
+    @Test
     public void testSetAccessible8() throws Throwable {
         Method m = Field.class.getMethod("setAccessible", boolean.class);
-        unreflectAndInvokeSetAccessible(m, inaccessibleField());
+        assertThrows(InaccessibleObjectException.class, () -> unreflectAndInvokeSetAccessible(m, inaccessibleField()));
     }
 
 
@@ -241,7 +234,6 @@ public class CallerSensitiveAccess {
      * Custom AccessibleObject objects. One class overrides setAccessible, the other
      * does not override this method.
      */
-    @DataProvider(name = "customAccessibleObjects")
     static Object[][] customAccessibleObjectClasses() {
         return new Object[][] { { new S1() }, { new S2() } };
     }
@@ -271,20 +263,20 @@ public class CallerSensitiveAccess {
      * Using publicLookup, create a method handle to setAccessible and invoke it
      * on a custom AccessibleObject object.
      */
-    @Test(expectedExceptions = IllegalAccessException.class)
+    @Test
     public void testPublicLookupSubclass1() throws Throwable {
         // S1 does not override setAccessible
-        findAndInvokeSetAccessible(MethodHandles.publicLookup(), new S1());
+        assertThrows(IllegalAccessException.class, () -> findAndInvokeSetAccessible(MethodHandles.publicLookup(), new S1()));
     }
     @Test
     public void testPublicLookupSubclass2() throws Throwable {
         // S2 overrides setAccessible
         findAndInvokeSetAccessible(MethodHandles.publicLookup(), new S2());
     }
-    @Test(expectedExceptions = IllegalAccessException.class)
+    @Test
     public void testPublicLookupSubclass3() throws Throwable {
         // S1 does not override setAccessible
-        unreflectAndInvokeSetAccessible(MethodHandles.publicLookup(), new S1());
+        assertThrows(IllegalAccessException.class, () -> unreflectAndInvokeSetAccessible(MethodHandles.publicLookup(), new S1()));
     }
     @Test
     public void testPublicLookupSubclass4() throws Throwable {
@@ -296,11 +288,13 @@ public class CallerSensitiveAccess {
      * Using a full power lookup, create a method handle to setAccessible and
      * invoke it on a custom AccessibleObject object.
      */
-    @Test(dataProvider = "customAccessibleObjects")
+    @ParameterizedTest
+    @MethodSource("customAccessibleObjectClasses")
     public void testLookupSubclass1(AccessibleObject obj) throws Throwable {
         findAndInvokeSetAccessible(MethodHandles.lookup(), obj);
     }
-    @Test(dataProvider = "customAccessibleObjects")
+    @ParameterizedTest
+    @MethodSource("customAccessibleObjectClasses")
     public void testLookupSubclass2(AccessibleObject obj) throws Throwable {
         unreflectAndInvokeSetAccessible(MethodHandles.lookup(), obj);
     }
@@ -309,13 +303,13 @@ public class CallerSensitiveAccess {
      * Using a full power lookup, create a method handle to setAccessible on a
      * sub-class of AccessibleObject and then attempt to invoke it on a Field object.
      */
-    @Test(dataProvider = "customAccessibleObjects",
-            expectedExceptions = ClassCastException.class)
+    @ParameterizedTest
+    @MethodSource("customAccessibleObjectClasses")
     public void testLookupSubclass3(AccessibleObject obj) throws Throwable {
         MethodType mt = MethodType.methodType(void.class, boolean.class);
         Lookup lookup = MethodHandles.lookup();
         MethodHandle mh = lookup.findVirtual(obj.getClass(), "setAccessible", mt);
-        mh.invoke(accessibleField(), true);  // should throw ClassCastException
+        assertThrows(ClassCastException.class, () -> mh.invoke(accessibleField(), true));
     }
 
     /**
@@ -333,29 +327,29 @@ public class CallerSensitiveAccess {
         mh.invoke(f, true);
         assertTrue(f.isAccessible());
     }
-    @Test(expectedExceptions = InaccessibleObjectException.class)
+    @Test
     public void testLookupSubclass5() throws Throwable {
         // S1 does not override setAccessible
         Method m = S1.class.getMethod("setAccessible", boolean.class);
         assertTrue(m.getDeclaringClass() == AccessibleObject.class);
         MethodHandle mh = MethodHandles.lookup().unreflect(m);
-        mh.invoke(inaccessibleField(), true);  // should throw InaccessibleObjectException
+        assertThrows(InaccessibleObjectException.class, () -> mh.invoke(inaccessibleField(), true));
     }
-    @Test(expectedExceptions = ClassCastException.class)
+    @Test
     public void testLookupSubclass6() throws Throwable {
         // S2 overrides setAccessible
         Method m = S2.class.getMethod("setAccessible", boolean.class);
         assertTrue(m.getDeclaringClass() == S2.class);
         MethodHandle mh = MethodHandles.lookup().unreflect(m);
-        mh.invoke(accessibleField(), true);  // should throw ClassCastException
+        assertThrows(ClassCastException.class, () -> mh.invoke(accessibleField(), true));
     }
-    @Test(expectedExceptions = ClassCastException.class)
+    @Test
     public void testLookupSubclass7() throws Throwable {
         // S2 overrides setAccessible
         Method m = S2.class.getMethod("setAccessible", boolean.class);
         assertTrue(m.getDeclaringClass() == S2.class);
         MethodHandle mh = MethodHandles.lookup().unreflect(m);
-        mh.invoke(inaccessibleField(), true);  // should throw ClassCastException
+        assertThrows(ClassCastException.class, () -> mh.invoke(inaccessibleField(), true));
     }
 
     /**
@@ -373,7 +367,7 @@ public class CallerSensitiveAccess {
         // Field::getInt
         mh = MethodHandles.lookup().findVirtual(Field.class, "getInt", MethodType.methodType(int.class, Object.class));
         int value = (int)mh.invokeExact(f, (Object)null);
-        assertTrue(value == 5);
+        assertEquals(5, value);
     }
 
     private static class Inner {
@@ -400,7 +394,7 @@ public class CallerSensitiveAccess {
      * exported by a named module.
      */
     static Stream<Method> callerSensitiveMethods(Module module) {
-        assert module.isNamed();
+        assertTrue(module.isNamed());
         ModuleReference mref = module.getLayer().configuration()
                 .findModule(module.getName())
                 .orElseThrow(() -> new RuntimeException())
diff --git a/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java
index 0357afce668..4a2ad3f3091 100644
--- a/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java
+++ b/test/jdk/java/lang/invoke/condy/BootstrapMethodJumboArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,10 @@
  * @summary Test bootstrap methods throwing an exception
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng BootstrapMethodJumboArgsTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 BootstrapMethodJumboArgsTest
+ * @run junit BootstrapMethodJumboArgsTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 BootstrapMethodJumboArgsTest
  */
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.invoke.ConstantCallSite;
@@ -43,6 +41,10 @@ import java.util.stream.IntStream;
 
 import static java.lang.invoke.MethodType.methodType;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
 public class BootstrapMethodJumboArgsTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
 
@@ -93,7 +95,7 @@ public class BootstrapMethodJumboArgsTest {
                             Object.class, Object[].class), expected);
 
             Object[] actual = (Object[]) mh.invoke();
-            Assert.assertEquals(actual, expected);
+            assertArrayEquals(expected, actual);
         }
 
         {
@@ -103,7 +105,7 @@ public class BootstrapMethodJumboArgsTest {
                             Object.class, Object.class, Object[].class), expected);
 
             Object[] actual = (Object[]) mh.invoke();
-            Assert.assertEquals(actual, expected);
+            assertArrayEquals(expected, actual);
         }
 
         {
@@ -113,7 +115,7 @@ public class BootstrapMethodJumboArgsTest {
                             Object.class, Object.class, Object.class, Object[].class), expected);
 
             Object[] actual = (Object[]) mh.invoke();
-            Assert.assertEquals(actual, expected);
+            assertArrayEquals(expected, actual);
         }
     }
 
@@ -128,7 +130,7 @@ public class BootstrapMethodJumboArgsTest {
                             Object.class, Object[].class), expected);
 
             Object[] actual = (Object[]) mh.invoke();
-            Assert.assertEquals(actual, expected);
+            assertArrayEquals(expected, actual);
         }
 
         {
@@ -138,7 +140,7 @@ public class BootstrapMethodJumboArgsTest {
                             Object.class, Object.class, Object[].class), expected);
 
             Object[] actual = (Object[]) mh.invoke();
-            Assert.assertEquals(actual, expected);
+            assertArrayEquals(expected, actual);
         }
 
         {
@@ -148,7 +150,7 @@ public class BootstrapMethodJumboArgsTest {
                             Object.class, Object.class, Object.class, Object[].class), expected);
 
             Object[] actual = (Object[]) mh.invoke();
-            Assert.assertEquals(actual, expected);
+            assertArrayEquals(expected, actual);
         }
     }
 }
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMException.java b/test/jdk/java/lang/invoke/condy/CondyBSMException.java
index 7aa25c5cd95..1c9f867bc8b 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMException.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,10 @@
  * @summary Test bootstrap methods throwing an exception
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyBSMException
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMException
+ * @run junit CondyBSMException
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMException
  */
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.invoke.MethodHandle;
@@ -41,6 +39,10 @@ import java.lang.reflect.Constructor;
 
 import static java.lang.invoke.MethodType.methodType;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class CondyBSMException {
 
     @Test
@@ -70,26 +72,17 @@ public class CondyBSMException {
 
     static void test(String message, Class<? extends Throwable>... ts) {
         MethodHandle mh = thrower(message, ts[ts.length - 1]);
-        Throwable caught = null;
-        try {
-            mh.invoke();
-        } catch (Throwable t) {
-            caught = t;
-        }
-
-        if (caught == null) {
-            Assert.fail("Throwable expected");
-        }
+        Throwable caught = assertThrows(Throwable.class, mh::invoke);
 
         String actualMessage = null;
         for (int i = 0; i < ts.length; i++) {
+            int level = i;
+            assertInstanceOf(ts[i], caught, () -> "Level %d".formatted(level));
             actualMessage = caught.getMessage();
-            Assert.assertNotNull(caught);
-            Assert.assertTrue(ts[i].isAssignableFrom(caught.getClass()));
             caught = caught.getCause();
         }
 
-        Assert.assertEquals(actualMessage, message);
+        assertEquals(message, actualMessage);
     }
 
     static Throwable throwingBsm(MethodHandles.Lookup l, String name, Class<Throwable> type) throws Throwable {
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
index e9050126a79..897ee40b444 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,10 @@
  * @summary Test basic invocation of bootstrap methods
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyBSMInvocation
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMInvocation
+ * @run junit CondyBSMInvocation
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMInvocation
  */
 
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.constant.ConstantDesc;
@@ -48,6 +45,10 @@ import java.util.stream.Stream;
 
 import static java.lang.invoke.MethodType.methodType;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class CondyBSMInvocation {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
 
@@ -59,11 +60,7 @@ public class CondyBSMInvocation {
                 "bsm", methodType(Object.class)
         );
 
-        try {
-            mh.invoke();
-            Assert.fail("NoSuchMethodError expected to be thrown");
-        } catch (NoSuchMethodError e) {
-        }
+        assertThrows(NoSuchMethodError.class, mh::invoke);
     }
 
     static MethodHandle[] bsms(String bsmName) {
@@ -114,11 +111,7 @@ public class CondyBSMInvocation {
                     "shape_bsm", bsm.type()
             );
 
-            try {
-                Object r = mh.invoke();
-                Assert.fail("BootstrapMethodError expected to be thrown for " + bsm);
-            } catch (BootstrapMethodError e) {
-            }
+            assertThrows(BootstrapMethodError.class, mh::invoke);
         }
     }
 
@@ -139,11 +132,7 @@ public class CondyBSMInvocation {
                     "sig_bsm", bsm.type()
             );
 
-            try {
-                Object r = mh.invoke();
-                Assert.fail("BootstrapMethodError expected to be thrown for " + bsm);
-            } catch (BootstrapMethodError e) {
-            }
+            assertThrows(BootstrapMethodError.class, mh::invoke);
         }
     }
 
@@ -202,7 +191,7 @@ public class CondyBSMInvocation {
 
     static void assertAll(Object... as) {
         for (int i = 0; i < as.length; i++) {
-            Assert.assertEquals(as[i], i);
+            assertEquals(i, as[i]);
         }
     }
 
@@ -219,7 +208,7 @@ public class CondyBSMInvocation {
             );
 
             Object r = mh.invoke();
-            Assert.assertEquals(r, Integer.toString(n));
+            assertEquals(Integer.toString(n), r);
         }
 
         {
@@ -231,7 +220,7 @@ public class CondyBSMInvocation {
             );
 
             Object r = mh.invoke();
-            Assert.assertEquals(r, Integer.toString(9));
+            assertEquals(Integer.toString(9), r);
 
         }
     }
@@ -248,13 +237,8 @@ public class CondyBSMInvocation {
                     IntStream.range(0, n - 1).boxed().toArray(ConstantDesc[]::new)
             );
 
-            try {
-                Object r = mh.invoke();
-                Assert.fail("BootstrapMethodError expected to be thrown for arrity " + n);
-            } catch (BootstrapMethodError e) {
-                Throwable t = e.getCause();
-                Assert.assertTrue(WrongMethodTypeException.class.isAssignableFrom(t.getClass()));
-            }
+            var e = assertThrows(BootstrapMethodError.class, mh::invoke);
+            assertInstanceOf(WrongMethodTypeException.class, e.getCause());
         }
     }
 }
diff --git a/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java b/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java
index d255202866f..e6c2aacea63 100644
--- a/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyBSMValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,28 +27,29 @@
  * @summary Test invalid name in name and type
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyBSMValidationTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMValidationTest
+ * @run junit CondyBSMValidationTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyBSMValidationTest
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
-import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.stream.Stream;
 
 import static java.lang.invoke.MethodType.methodType;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class CondyBSMValidationTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
     static final String BSM_TYPE = methodType(Object.class, MethodHandles.Lookup.class, String.class, Object.class)
             .toMethodDescriptorString();
 
-    @DataProvider
-    public Object[][] invalidSignaturesProvider() throws Exception {
+    public static Object[][] invalidSignaturesProvider() throws Exception {
         return Stream.of(BSM_TYPE.replace("(", ""),
                         BSM_TYPE.replace(")", ""),
                         BSM_TYPE.replace("(", "").replace(")", ""),
@@ -57,15 +58,13 @@ public class CondyBSMValidationTest {
                 .map(e -> new Object[]{e}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "invalidSignaturesProvider")
+    @ParameterizedTest
+    @MethodSource("invalidSignaturesProvider")
     public void testInvalidBSMSignature(String sig) throws Exception {
-        try {
-            MethodHandle mh = InstructionHelper.ldcDynamicConstant(
-                    L, "name", "Ljava/lang/Object;",
-                    "bsm", sig
-            );
-        } catch (IllegalArgumentException e) {
-            Assert.assertTrue(e.getMessage().contains("Bad method descriptor"));
-        }
+        var e = assertThrows(IllegalArgumentException.class, () -> InstructionHelper.ldcDynamicConstant(
+                L, "name", "Ljava/lang/Object;",
+                "bsm", sig
+        ));
+        assertTrue(e.getMessage().contains("Bad method descriptor"));
     }
 }
diff --git a/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java b/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java
index 9fd35ed21f0..fe477d87657 100644
--- a/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java
+++ b/test/jdk/java/lang/invoke/condy/CondyInterfaceWithOverpassMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,20 +27,20 @@
  * @summary Test for an interface using condy with default overpass methods
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyInterfaceWithOverpassMethods
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyInterfaceWithOverpassMethods
+ * @run junit CondyInterfaceWithOverpassMethods
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyInterfaceWithOverpassMethods
  */
 
 import java.lang.classfile.ClassFile;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.constant.*;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
-@Test
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 public class CondyInterfaceWithOverpassMethods {
     interface A {
         int a();
@@ -52,14 +52,14 @@ public class CondyInterfaceWithOverpassMethods {
 
 
     // Generated class with methods containing condy ldc
-    Class<?> gc;
+    static Class<?> gc;
 
     public static Object bsm(MethodHandles.Lookup l, String name, Class<?> type) {
         return name;
     }
 
-    @BeforeClass
-    public void generateClass() throws Exception {
+    @BeforeAll
+    public static void generateClass() throws Exception {
 //        interface B extends A {
 //            // Overpass for method A.a
 //
diff --git a/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java b/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java
index 6178b85236b..b380c28dc94 100644
--- a/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyNameValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,10 @@
  * @summary Test invalid name in name and type
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyNameValidationTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNameValidationTest
+ * @run junit CondyNameValidationTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNameValidationTest
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.invoke.MethodHandle;
@@ -43,12 +40,17 @@ import java.util.stream.Stream;
 
 import static java.lang.invoke.MethodType.methodType;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class CondyNameValidationTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
     static final MethodType BSM_TYPE = methodType(Object.class, MethodHandles.Lookup.class, String.class, Object.class);
 
-    @DataProvider
-    public Object[][] invalidNamesProvider() {
+    public static Object[][] invalidNamesProvider() {
         return Stream.of(
                         new Object[]{"", "zero-length member name"},
                         new Object[]{".", "Invalid member name"},
@@ -59,26 +61,24 @@ public class CondyNameValidationTest {
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "invalidNamesProvider")
+    @ParameterizedTest
+    @MethodSource("invalidNamesProvider")
     public void testInvalidNames(String name, String errMessContent) throws Exception {
-        try {
-            MethodHandle mh = InstructionHelper.ldcDynamicConstant(
-                    L, name, Object.class,
-                    "bsm", BSM_TYPE
-            );
-        } catch (IllegalArgumentException e) {
-            Assert.assertTrue(e.getMessage().contains(errMessContent));
-        }
+        var e = assertThrows(IllegalArgumentException.class, () -> InstructionHelper.ldcDynamicConstant(
+                L, name, Object.class,
+                "bsm", BSM_TYPE
+        ));
+        assertTrue(e.getMessage().contains(errMessContent));
     }
 
-    @DataProvider
-    public Object[][] validNamesProvider() throws Exception {
+    public static Object[][] validNamesProvider() throws Exception {
         return Stream.of("<clinit>",
                         "<init>")
                 .map(e -> new Object[]{e}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "validNamesProvider")
+    @ParameterizedTest
+    @MethodSource("validNamesProvider")
     public void testValidNames(String name) throws Exception {
         MethodHandle mh = InstructionHelper.ldcDynamicConstant(
                 L, name, Object.class,
diff --git a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
index 8eb71ec93a3..192bbeaa46f 100644
--- a/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyNestedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,25 @@
  * @bug 8186046
  * @summary Test nested dynamic constant declarations that are recursive
  * @compile CondyNestedTest_Code.jcod
- * @run testng CondyNestedTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNestedTest
+ * @run junit CondyNestedTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyNestedTest
  */
 
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class CondyNestedTest {
 
     static final Class[] THROWABLES = {InvocationTargetException.class, StackOverflowError.class};
     private static final MethodHandles.Lookup L = MethodHandles.lookup();
 
-    Class<?> c;
+    static Class<?> c;
 
 //    static final MethodHandles.Lookup L = MethodHandles.lookup();
 //
@@ -243,28 +244,17 @@ public class CondyNestedTest {
 //    }
 
     static void test(Method m, Class<? extends Throwable>... ts) {
-        Throwable caught = null;
-        try {
-            m.invoke(null);
-        } catch (Throwable t) {
-            caught = t;
-        }
+        Throwable caught = assertThrows(Throwable.class, () -> m.invoke(null));
 
-        if (caught == null) {
-            Assert.fail("Throwable expected");
-        }
-
-        String actualMessage = null;
         for (int i = 0; i < ts.length; i++) {
-            actualMessage = caught.getMessage();
-            Assert.assertNotNull(caught);
-            Assert.assertTrue(ts[i].isAssignableFrom(caught.getClass()));
+            int level = i;
+            assertInstanceOf(ts[i], caught, () -> "Level %d".formatted(level));
             caught = caught.getCause();
         }
     }
 
-    @BeforeClass
-    public void findClass() throws Exception {
+    @BeforeAll
+    public static void findClass() throws Exception {
         c = Class.forName("CondyNestedTest_Code");
     }
 
diff --git a/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java b/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
index 7ef5c610150..b7ccb4944fb 100644
--- a/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
+++ b/test/jdk/java/lang/invoke/condy/CondyRepeatFailedResolution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,28 +26,28 @@
  * @bug 8186211
  * @summary Test basic invocation of multiple ldc's of the same dynamic constant that fail resolution
  * @library /java/lang/invoke/common
- * @run testng CondyRepeatFailedResolution
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyRepeatFailedResolution
+ * @run junit CondyRepeatFailedResolution
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyRepeatFailedResolution
  */
 
 import java.lang.classfile.ClassFile;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 import java.lang.constant.*;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-@Test
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class CondyRepeatFailedResolution {
     // Counter used to determine if a given BSM is invoked more than once
     static int bsm_called = 0;
 
     // Generated class with methods containing condy ldc
-    Class<?> gc;
+    static Class<?> gc;
 
     // Bootstrap method used to represent primitive values
     // that cannot be represented directly in the constant pool,
@@ -90,8 +90,8 @@ public class CondyRepeatFailedResolution {
         }
     }
 
-    @BeforeClass
-    public void generateClass() throws Exception {
+    @BeforeAll
+    public static void generateClass() throws Exception {
         String genClassName = CondyRepeatFailedResolution.class.getSimpleName() + "$Code";
         String bsmClassDesc = CondyRepeatFailedResolution.class.descriptorString();
         String bsmMethodName = "intConversion";
@@ -319,29 +319,21 @@ public class CondyRepeatFailedResolution {
         Method m = gc.getDeclaredMethod(name);
 
         bsm_called = 0;
-        try {
+        InvocationTargetException e1 = assertThrows(InvocationTargetException.class, () -> {
             Object r1 = m.invoke(null);
-            Assert.fail("InvocationTargetException expected to be thrown after first invocation");
-        } catch (InvocationTargetException e1) {
-            // bsm_called should have been incremented prior to the exception
-            Assert.assertEquals(bsm_called, 1);
-            Assert.assertTrue(e1.getCause() instanceof BootstrapMethodError);
-            // Try invoking method again to ensure that the bootstrap
-            // method is not invoked twice and a resolution failure
-            // results.
-            try {
-                Object r2 = m.invoke(null);
-                Assert.fail("InvocationTargetException expected to be thrown after second invocation");
-            } catch (InvocationTargetException e2) {
-                // bsm_called should remain at 1 since the bootstrap
-                // method should not have been invoked.
-                Assert.assertEquals(bsm_called, 1);
-                Assert.assertTrue(e2.getCause() instanceof BootstrapMethodError);
-            } catch (Throwable t2) {
-                Assert.fail("InvocationTargetException expected to be thrown");
-            }
-        } catch (Throwable t1) {
-                Assert.fail("InvocationTargetException expected to be thrown");
-        }
+        });
+        // bsm_called should have been incremented prior to the exception
+        assertEquals(1, bsm_called);
+        assertInstanceOf(BootstrapMethodError.class, e1.getCause());
+        // Try invoking method again to ensure that the bootstrap
+        // method is not invoked twice and a resolution failure
+        // results.
+        InvocationTargetException e2 = assertThrows(InvocationTargetException.class, () -> {
+            Object r2 = m.invoke(null);
+        });
+        // bsm_called should remain at 1 since the bootstrap
+        // method should not have been invoked.
+        assertEquals(1, bsm_called);
+        assertInstanceOf(BootstrapMethodError.class, e2.getCause());
     }
 }
diff --git a/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java b/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
index d6c0748c97c..4c0dd42a1a2 100644
--- a/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyReturnPrimitiveTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,22 +25,23 @@
  * @test
  * @bug 8186046
  * @summary Test for condy BSMs returning primitive values or null
- * @run testng CondyReturnPrimitiveTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyReturnPrimitiveTest
+ * @run junit CondyReturnPrimitiveTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyReturnPrimitiveTest
  */
 
 import java.lang.classfile.ClassFile;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 import java.lang.constant.*;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Test
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class CondyReturnPrimitiveTest {
     // Counter for number of BSM calls
     // Use of an AtomicInteger is not strictly necessary in this test
@@ -49,7 +50,7 @@ public class CondyReturnPrimitiveTest {
     // constant so care should be taken if a BSM operates on shared state
     static final AtomicInteger callCount = new AtomicInteger();
     // Generated class with methods containing condy ldc
-    Class<?> gc;
+    static Class<?> gc;
 
     // Bootstrap method used to represent primitive values
     // that cannot be represented directly in the constant pool,
@@ -90,8 +91,8 @@ public class CondyReturnPrimitiveTest {
         }
     }
 
-    @BeforeClass
-    public void generateClass() throws Exception {
+    @BeforeAll
+    public static void generateClass() throws Exception {
         String genClassName = CondyReturnPrimitiveTest.class.getSimpleName() + "$Code";
         String bsmClassDesc = CondyReturnPrimitiveTest.class.descriptorString();
         String bsmMethodName = "intConversion";
@@ -293,7 +294,7 @@ public class CondyReturnPrimitiveTest {
         // Ensure when run a second time that the bootstrap method is not
         // invoked and the constants are cached
         testConstants();
-        Assert.assertEquals(callCount.get(), expectedCallCount);
+        assertEquals(expectedCallCount, callCount.get());
     }
 
     @Test
@@ -318,11 +319,16 @@ public class CondyReturnPrimitiveTest {
         testConstant("S", Short.MAX_VALUE);
         testConstant("Z_F", false);
         testConstant("Z_T", true);
-        testConstant("null", null);
+        testConstant("null", (Object) null);
     }
 
     void testConstant(String name, Object expected) throws Exception {
         Method m = gc.getDeclaredMethod(name);
-        Assert.assertEquals(m.invoke(null), expected);
+        assertEquals(expected, m.invoke(null));
+    }
+
+    void testConstant(String name, Object[] expected) throws Exception {
+        Method m = gc.getDeclaredMethod(name);
+        assertArrayEquals(expected, (Object[]) m.invoke(null));
     }
 }
diff --git a/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java b/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java
index ba3d0e81488..075eaf4e844 100644
--- a/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyStaticArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,10 @@
  * @summary Test bootstrap arguments for condy
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyStaticArgumentsTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyStaticArgumentsTest
+ * @run junit CondyStaticArgumentsTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyStaticArgumentsTest
  */
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.constant.*;
@@ -44,6 +42,9 @@ import java.util.StringJoiner;
 import java.util.stream.Stream;
 
 import static java.lang.invoke.MethodType.methodType;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CondyStaticArgumentsTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
@@ -109,7 +110,7 @@ public class CondyStaticArgumentsTest {
                         mhi.getName(), MethodTypeDesc.ofDescriptor(mhi.getMethodType().descriptorString()))
         );
 
-        Assert.assertEquals(mh.invoke(), "constant-name-String-1-2-3.0-4.0-Number-something-(int,long,float,double)void-11");
+        assertEquals("constant-name-String-1-2-3.0-4.0-Number-something-(int,long,float,double)void-11", mh.invoke());
     }
 
     static MathContext mathContext(MethodHandles.Lookup l, String value, Class<?> type) {
@@ -161,7 +162,7 @@ public class CondyStaticArgumentsTest {
                         )
                 )
         );
-        Assert.assertEquals(mh.invoke(), "big-decimal-math-context-String-3.141593-7");
+        assertEquals("big-decimal-math-context-String-3.141593-7", mh.invoke());
     }
 
 
@@ -194,7 +195,7 @@ public class CondyStaticArgumentsTest {
                                 InstructionHelper.classDesc(MathContext.class)
                         )
                 ));
-        Assert.assertEquals(mh.invoke(), "big-decimal-math-context-()Ljava/lang/String;-3.141593-7");
+        assertEquals("big-decimal-math-context-()Ljava/lang/String;-3.141593-7", mh.invoke());
     }
 
     private static DirectMethodHandleDesc directMhDesc(String methodName) {
diff --git a/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java b/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java
index c44179ce13c..4429468bd34 100644
--- a/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyTypeValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,9 @@
  * @summary Test invalid name in name and type
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyTypeValidationTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyTypeValidationTest
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.invoke.MethodHandle;
@@ -43,14 +40,18 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.lang.invoke.MethodType.methodType;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CondyTypeValidationTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
     static final String BSM_TYPE = methodType(Object.class, MethodHandles.Lookup.class, String.class, Object.class)
             .toMethodDescriptorString();
 
-    @DataProvider
-    public Object[][] invalidTypesProvider() {
+    public static Object[][] invalidTypesProvider() {
         return Stream.of(
 //                         ByteCode API checks for the following invalid types
 //                         "",
@@ -66,20 +67,19 @@ public class CondyTypeValidationTest {
         ).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "invalidTypesProvider")
+    @ParameterizedTest
+    @MethodSource("invalidTypesProvider")
     public void testInvalidTypes(String type, String errMessContent) throws Exception {
-        try {
+        var e = assertThrows(IllegalArgumentException.class, () -> {
             MethodHandle mh = InstructionHelper.ldcDynamicConstant(
                     L, "name", type,
                     "bsm", BSM_TYPE
             );
-        } catch (IllegalArgumentException e) {
-            Assert.assertTrue(e.getMessage().contains(errMessContent));
-        }
+        });
+        assertTrue(e.getMessage().contains(errMessContent));
     }
 
-    @DataProvider
-    public Object[][] validTypesProvider() {
+    public static Object[][] validTypesProvider() {
         List<String> t = new ArrayList<>(List.of("B", "C", "D", "F", "I", "J", "Ljava/lang/Object;", "S", "Z"));
         int l = t.size();
         for (int i = 0; i < l; i++) {
@@ -90,7 +90,8 @@ public class CondyTypeValidationTest {
                 .map(e -> new Object[]{e}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "validTypesProvider")
+    @ParameterizedTest
+    @MethodSource("validTypesProvider")
     public void testValidTypes(String type) throws Exception {
         MethodHandle mh = InstructionHelper.ldcDynamicConstant(
                 L, "name", type,
diff --git a/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java b/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java
index 5e301a193dd..a00f93b69b7 100644
--- a/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java
+++ b/test/jdk/java/lang/invoke/condy/CondyWithGarbageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,21 +27,20 @@
  * @summary Stress test ldc to ensure HotSpot correctly manages oop maps
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyWithGarbageTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWithGarbageTest
+ * @run junit CondyWithGarbageTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWithGarbageTest
  */
 
-
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 import java.lang.constant.*;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 
 import static java.lang.invoke.MethodType.methodType;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static test.java.lang.invoke.lib.InstructionHelper.classDesc;
 
 public class CondyWithGarbageTest {
@@ -54,7 +53,7 @@ public class CondyWithGarbageTest {
         for (int i = 0; i < 100000; i++) {
             l += +((String) mh.invoke()).length();
         }
-        Assert.assertTrue(l > 0);
+        assertTrue(l > 0);
     }
 
     public static Object bsmString(MethodHandles.Lookup l,
@@ -133,7 +132,7 @@ public class CondyWithGarbageTest {
         for (int i = 0; i < 100000; i++) {
             l += +((String) mh.invoke()).length();
         }
-        Assert.assertTrue(l > 0);
+        assertTrue(l > 0);
     }
 
     public static Object bsmStringArray(MethodHandles.Lookup l,
diff --git a/test/jdk/java/lang/invoke/condy/CondyWrongType.java b/test/jdk/java/lang/invoke/condy/CondyWrongType.java
index 42c69e8ab7d..1c00da922fe 100644
--- a/test/jdk/java/lang/invoke/condy/CondyWrongType.java
+++ b/test/jdk/java/lang/invoke/condy/CondyWrongType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,10 @@
  * @summary Test bootstrap methods returning the wrong type
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng CondyWrongType
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWrongType
+ * @run junit CondyWrongType
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 CondyWrongType
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import test.java.lang.invoke.lib.InstructionHelper;
 
 import java.lang.invoke.MethodHandle;
@@ -46,11 +43,15 @@ import java.util.List;
 import java.util.Map;
 
 import static java.lang.invoke.MethodType.methodType;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CondyWrongType {
 
-    @DataProvider
-    public Object[][] primitivesProvider() throws Exception {
+    public static Object[][] primitivesProvider() throws Exception {
         Map<String, Class<?>> typeMap = Map.of(
                 "B", byte.class,
                 "C", char.class,
@@ -81,7 +82,8 @@ public class CondyWrongType {
         return cases.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "primitivesProvider")
+    @ParameterizedTest
+    @MethodSource("primitivesProvider")
     public void testPrimitives(String name, String type, boolean pass) {
         test(name, type, pass);
     }
@@ -106,27 +108,12 @@ public class CondyWrongType {
 
     static void test(String name, String type, boolean pass) {
         MethodHandle mh = caster(name, type);
-        Throwable caught = null;
-        try {
-            mh.invoke();
-        } catch (Throwable t) {
-            caught = t;
+        if (pass) {
+            assertDoesNotThrow(() -> mh.invoke());
+        } else {
+            Throwable caught = assertThrows(BootstrapMethodError.class, () -> mh.invoke());
+            assertInstanceOf(ClassCastException.class, caught.getCause());
         }
-
-        if (caught == null) {
-            if (pass) {
-                return;
-            } else {
-                Assert.fail("Throwable expected");
-            }
-        } else if (pass) {
-            Assert.fail("Throwable not expected");
-        }
-
-        Assert.assertTrue(BootstrapMethodError.class.isAssignableFrom(caught.getClass()));
-        caught = caught.getCause();
-        Assert.assertNotNull(caught);
-        Assert.assertTrue(ClassCastException.class.isAssignableFrom(caught.getClass()));
     }
 
     static Object bsm(MethodHandles.Lookup l, String name, Class<?> type) {
diff --git a/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java b/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
index 829f26704f9..cef5a17eda1 100644
--- a/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
+++ b/test/jdk/java/lang/invoke/condy/ConstantBootstrapsTest.java
@@ -27,27 +27,31 @@
  * @summary Test dynamic constant bootstraps
  * @library /java/lang/invoke/common
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run testng ConstantBootstrapsTest
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 ConstantBootstrapsTest
+ * @run junit ConstantBootstrapsTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:UseBootstrapCallInfo=3 ConstantBootstrapsTest
  */
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import test.java.lang.invoke.lib.InstructionHelper;
-
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.DirectMethodHandleDesc;
 import java.lang.constant.MethodHandleDesc;
-import java.lang.invoke.*;
+import java.lang.invoke.ConstantBootstraps;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.lang.invoke.WrongMethodTypeException;
 import java.math.BigInteger;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import test.java.lang.invoke.lib.InstructionHelper;
+
+import static org.junit.jupiter.api.Assertions.*;
 
-@Test
 public class ConstantBootstrapsTest {
     static final MethodHandles.Lookup L = MethodHandles.lookup();
 
@@ -56,6 +60,7 @@ public class ConstantBootstrapsTest {
                 appendParameterTypes(params);
     }
 
+    @Test
     public void testNullConstant() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(L, "_", Object.class,
                 ConstantBootstraps.class, "nullConstant", lookupMT(Object.class));
@@ -66,12 +71,13 @@ public class ConstantBootstrapsTest {
         assertNull(handle.invoke());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testNullConstantPrimitiveClass() {
-        ConstantBootstraps.nullConstant(MethodHandles.lookup(), null, int.class);
+        assertThrows(IllegalArgumentException.class, () -> ConstantBootstraps.nullConstant(MethodHandles.lookup(), null, int.class));
     }
 
 
+    @Test
     public void testPrimitiveClass() throws Throwable {
         var pm = Map.of(
                 "I", int.class,
@@ -88,69 +94,73 @@ public class ConstantBootstrapsTest {
         for (var desc : pm.keySet()) {
             var handle = InstructionHelper.ldcDynamicConstant(L, desc, Class.class,
                     ConstantBootstraps.class, "primitiveClass", lookupMT(Class.class));
-            assertEquals(handle.invoke(), pm.get(desc));
+            assertEquals(pm.get(desc), handle.invoke());
         }
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testPrimitiveClassNullName() {
-        ConstantBootstraps.primitiveClass(MethodHandles.lookup(), null, Class.class);
+        assertThrows(NullPointerException.class, () -> ConstantBootstraps.primitiveClass(MethodHandles.lookup(), null, Class.class));
     }
 
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void testPrimitiveClassNullType() {
-        ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "I", null);
+        assertThrows(NullPointerException.class, () -> ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "I", null));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testPrimitiveClassEmptyName() {
-        ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "", Class.class);
+        assertThrows(IllegalArgumentException.class, () -> ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "", Class.class));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testPrimitiveClassWrongNameChar() {
-        ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "L", Class.class);
+        assertThrows(IllegalArgumentException.class, () -> ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "L", Class.class));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testPrimitiveClassWrongNameString() {
-        ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "Ljava/lang/Object;", Class.class);
+        assertThrows(IllegalArgumentException.class, () -> ConstantBootstraps.primitiveClass(MethodHandles.lookup(), "Ljava/lang/Object;", Class.class));
     }
 
 
+    @Test
     public void testEnumConstant() throws Throwable {
         for (var v : StackWalker.Option.values()) {
             var handle = InstructionHelper.ldcDynamicConstant(L, v.name(), StackWalker.Option.class,
                     ConstantBootstraps.class, "enumConstant", lookupMT(Enum.class));
-            assertEquals(handle.invoke(), v);
+            assertEquals(v, handle.invoke());
         }
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testEnumConstantUnknown() {
-        ConstantBootstraps.enumConstant(MethodHandles.lookup(), "DOES_NOT_EXIST", StackWalker.Option.class);
+        assertThrows(IllegalArgumentException.class, () -> ConstantBootstraps.enumConstant(MethodHandles.lookup(), "DOES_NOT_EXIST", StackWalker.Option.class));
     }
 
 
+    @Test
     public void testGetStaticDecl() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(L, "TYPE", Class.class,
                 ConstantBootstraps.class, "getStaticFinal", lookupMT(Object.class, Class.class),
                 InstructionHelper.classDesc(Integer.class));
-        assertEquals(handle.invoke(), int.class);
+        assertEquals(int.class, handle.invoke());
     }
 
+    @Test
     public void testGetStaticSelf() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(L, "MAX_VALUE", int.class,
                 ConstantBootstraps.class, "getStaticFinal", lookupMT(Object.class));
-        assertEquals(handle.invoke(), Integer.MAX_VALUE);
+        assertEquals(Integer.MAX_VALUE, handle.invoke());
 
 
         handle = InstructionHelper.ldcDynamicConstant(L, "ZERO", BigInteger.class,
                 ConstantBootstraps.class, "getStaticFinal", lookupMT(Object.class));
-        assertEquals(handle.invoke(), BigInteger.ZERO);
+        assertEquals(BigInteger.ZERO, handle.invoke());
     }
 
 
+    @Test
     public void testInvoke() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(
                 L, "_", List.class,
@@ -159,9 +169,10 @@ public class ConstantBootstrapsTest {
                         MethodType.methodType(List.class, Object[].class).toMethodDescriptorString()),
                 1, 2, 3, 4
         );
-        assertEquals(handle.invoke(), List.of(1, 2, 3, 4));
+        assertEquals(List.of(1, 2, 3, 4), handle.invoke());
     }
 
+    @Test
     public void testInvokeAsType() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(
                 L, "_", int.class,
@@ -170,9 +181,10 @@ public class ConstantBootstrapsTest {
                         MethodType.methodType(Integer.class, String.class).toMethodDescriptorString()),
                 "42"
         );
-        assertEquals(handle.invoke(), 42);
+        assertEquals(42, handle.invoke());
     }
 
+    @Test
     public void testInvokeAsTypeVariableArity() throws Throwable {
         // The constant type is Collection but the invoke return type is List
         var handle = InstructionHelper.ldcDynamicConstant(
@@ -182,21 +194,21 @@ public class ConstantBootstrapsTest {
                         MethodType.methodType(List.class, Object[].class).toMethodDescriptorString()),
                 1, 2, 3, 4
         );
-        assertEquals(handle.invoke(), List.of(1, 2, 3, 4));
+        assertEquals(List.of(1, 2, 3, 4), handle.invoke());
     }
 
-    @Test(expectedExceptions = ClassCastException.class)
+    @Test
     public void testInvokeAsTypeClassCast() throws Throwable {
-        ConstantBootstraps.invoke(MethodHandles.lookup(), "_", String.class,
+        assertThrows(ClassCastException.class, () -> ConstantBootstraps.invoke(MethodHandles.lookup(), "_", String.class,
                 MethodHandles.lookup().findStatic(Integer.class, "valueOf", MethodType.methodType(Integer.class, String.class)),
-                "42");
+                "42"));
     }
 
-    @Test(expectedExceptions = WrongMethodTypeException.class)
+    @Test
     public void testInvokeAsTypeWrongReturnType() throws Throwable {
-        ConstantBootstraps.invoke(MethodHandles.lookup(), "_", short.class,
+        assertThrows(WrongMethodTypeException.class, () -> ConstantBootstraps.invoke(MethodHandles.lookup(), "_", short.class,
                 MethodHandles.lookup().findStatic(Integer.class, "parseInt", MethodType.methodType(int.class, String.class)),
-                "42");
+                "42"));
     }
 
 
@@ -205,6 +217,7 @@ public class ConstantBootstrapsTest {
         public static String sf;
     }
 
+    @Test
     public void testVarHandleField() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(
                 L, "f", VarHandle.class,
@@ -214,10 +227,11 @@ public class ConstantBootstrapsTest {
         );
 
         var vhandle = (VarHandle) handle.invoke();
-        assertEquals(vhandle.varType(), String.class);
-        assertEquals(vhandle.coordinateTypes(), List.of(X.class));
+        assertEquals(String.class, vhandle.varType());
+        assertEquals(List.of(X.class), vhandle.coordinateTypes());
     }
 
+    @Test
     public void testVarHandleStaticField() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(
                 L, "sf", VarHandle.class,
@@ -227,10 +241,11 @@ public class ConstantBootstrapsTest {
         );
 
         var vhandle = (VarHandle) handle.invoke();
-        assertEquals(vhandle.varType(), String.class);
-        assertEquals(vhandle.coordinateTypes(), List.of());
+        assertEquals(String.class, vhandle.varType());
+        assertEquals(List.of(), vhandle.coordinateTypes());
     }
 
+    @Test
     public void testVarHandleArray() throws Throwable {
         var handle = InstructionHelper.ldcDynamicConstant(
                 L, "_", VarHandle.class,
@@ -239,11 +254,10 @@ public class ConstantBootstrapsTest {
         );
 
         var vhandle = (VarHandle) handle.invoke();
-        assertEquals(vhandle.varType(), String.class);
-        assertEquals(vhandle.coordinateTypes(), List.of(String[].class, int.class));
+        assertEquals(String.class, vhandle.varType());
+        assertEquals(List.of(String[].class, int.class), vhandle.coordinateTypes());
     }
 
-    @DataProvider
     public static Object[][] cceCasts() {
         return new Object[][]{
                 { void.class, null },
@@ -252,12 +266,12 @@ public class ConstantBootstrapsTest {
         };
     }
 
-    @Test(dataProvider = "cceCasts", expectedExceptions = ClassCastException.class)
+    @ParameterizedTest
+    @MethodSource("cceCasts")
     public void testBadCasts(Class<?> dstType, Object value) {
-        ConstantBootstraps.explicitCast(null, null, dstType, value);
+        assertThrows(ClassCastException.class, () -> ConstantBootstraps.explicitCast(null, null, dstType, value));
     }
 
-    @DataProvider
     public static Object[][] validCasts() {
         Object o = new Object();
         return new Object[][]{
@@ -278,9 +292,10 @@ public class ConstantBootstrapsTest {
         };
     }
 
-    @Test(dataProvider = "validCasts")
+    @ParameterizedTest
+    @MethodSource("validCasts")
     public void testSuccessfulCasts(Class<?> dstType, Object value, Object expected) {
         Object actual = ConstantBootstraps.explicitCast(null, null, dstType, value);
-        assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 }
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
index 379ae765a6b..097e7c782a5 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *          BadClassFileVersion.jcod
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.compiler.CompilerUtils
- * @run testng/othervm BasicTest
+ * @run junit/othervm BasicTest
  */
 
 import java.io.File;
@@ -52,16 +52,16 @@ import java.util.stream.Stream;
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.Utils;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import static java.lang.classfile.ClassFile.*;
 import static java.lang.constant.ConstantDescs.CD_Enum;
 import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.invoke.MethodHandles.lookup;
 import static java.lang.invoke.MethodHandles.Lookup.ClassOption.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 interface HiddenTest {
     void test();
@@ -75,7 +75,7 @@ public class BasicTest {
 
     private static byte[] hiddenClassBytes;
 
-    @BeforeTest
+    @BeforeAll
     static void setup() throws IOException {
         compileSources(SRC_DIR, CLASSES_DIR);
         hiddenClassBytes = Files.readAllBytes(CLASSES_DIR.resolve("HiddenClass.class"));
@@ -114,9 +114,9 @@ public class BasicTest {
         Class<?>[] intfs = c.getInterfaces();
         assertTrue(c.isHidden());
         assertFalse(c.isPrimitive());
-        assertTrue(intfs.length == 1);
-        assertTrue(intfs[0] == HiddenTest.class);
-        assertTrue(c.getCanonicalName() == null);
+        assertEquals(1, intfs.length);
+        assertSame(HiddenTest.class, intfs[0]);
+        assertNull(c.getCanonicalName());
 
         String hcName = "HiddenClass";
         String hcSuffix = "0x[0-9a-f]+";
@@ -143,7 +143,7 @@ public class BasicTest {
         Object array = Array.newInstance(type, 2);
         Class<?> arrayType = array.getClass();
         assertTrue(arrayType.isArray());
-        assertTrue(Array.getLength(array) == 2);
+        assertEquals(2, Array.getLength(array));
         assertFalse(arrayType.isHidden());
 
         String hcName = "HiddenClass";
@@ -152,11 +152,11 @@ public class BasicTest {
         assertTrue(arrayType.descriptorString().matches("\\[" + "L" + hcName + "." + hcSuffix + ";"));
 
         assertTrue(arrayType.getComponentType().isHidden());
-        assertTrue(arrayType.getComponentType() == type);
+        assertSame(type, arrayType.getComponentType());
         Object t = type.newInstance();
         Array.set(array, 0, t);
         Object o = Array.get(array, 0);
-        assertTrue(o == t);
+        assertSame(t, o);
     }
 
     private void checkSetAccessible(Class<?> c, String name, Class<?>... ptypes) throws Exception {
@@ -170,13 +170,8 @@ public class BasicTest {
     @Test
     public void testLambda() throws Throwable {
         HiddenTest t = (HiddenTest)defineHiddenClass("Lambda").newInstance();
-        try {
-            t.test();
-        } catch (Error e) {
-            if (!e.getMessage().equals("thrown by " + t.getClass().getName())) {
-                throw e;
-            }
-        }
+        var e = assertThrows(Error.class, t::test);
+        assertEquals("thrown by " + t.getClass().getName(), e.getMessage());
     }
 
     // Define a hidden class that uses lambda and contains its implementation
@@ -184,13 +179,8 @@ public class BasicTest {
     @Test
     public void testHiddenLambda() throws Throwable {
         HiddenTest t = (HiddenTest)defineHiddenClass("HiddenLambda").newInstance();
-        try {
-            t.test();
-        } catch (Error e) {
-            if (!e.getMessage().equals("thrown by " + t.getClass().getName())) {
-                throw e;
-            }
-        }
+        var e = assertThrows(Error.class, t::test);
+        assertEquals("thrown by " + t.getClass().getName(), e.getMessage());
     }
 
     // Verify the nest host and nest members of a hidden class and hidden nestmate class
@@ -206,19 +196,18 @@ public class BasicTest {
 
         // test nest membership and reflection API
         assertTrue(host.isNestmateOf(member));
-        assertTrue(host.getNestHost() == host);
+        assertSame(host, host.getNestHost());
         // getNestHost and getNestMembers return the same value when calling
         // on a nest member and the nest host
-        assertTrue(member.getNestHost() == host.getNestHost());
-        assertTrue(Arrays.equals(member.getNestMembers(), host.getNestMembers()));
+        assertSame(host.getNestHost(), member.getNestHost());
+        assertArrayEquals(member.getNestMembers(), host.getNestMembers());
         // getNestMembers includes the nest host that can be a hidden class but
         // only includes static nest members
-        assertTrue(host.getNestMembers().length == 1);
-        assertTrue(host.getNestMembers()[0] == host);
+        assertEquals(1, host.getNestMembers().length);
+        assertSame(host, host.getNestMembers()[0]);
     }
 
-    @DataProvider(name = "hiddenClasses")
-    private Object[][] hiddenClasses() {
+    private static Object[][] hiddenClasses() {
         return new Object[][] {
                 new Object[] { "HiddenInterface", false },
                 new Object[] { "AbstractClass", false },
@@ -240,7 +229,8 @@ public class BasicTest {
      * is not useful as it cannot be referenced and an outer/inner class
      * when defined as a hidden effectively becomes a final top-level class.
      */
-    @Test(dataProvider = "hiddenClasses")
+    @ParameterizedTest
+    @MethodSource("hiddenClasses")
     public void defineHiddenClass(String name, boolean nestmate) throws Exception {
         byte[] bytes = Files.readAllBytes(CLASSES_DIR.resolve(name + ".class"));
         Class<?> hc;
@@ -252,13 +242,12 @@ public class BasicTest {
             hc = lookup().defineHiddenClass(bytes, false).lookupClass();
             host = hc;
         }
-        assertTrue(hc.getNestHost() == host);
-        assertTrue(hc.getNestMembers().length == 1);
-        assertTrue(hc.getNestMembers()[0] == host);
+        assertSame(host, hc.getNestHost());
+        assertEquals(1, hc.getNestMembers().length);
+        assertSame(host, hc.getNestMembers()[0]);
     }
 
-    @DataProvider(name = "emptyClasses")
-    private Object[][] emptyClasses() {
+    private static Object[][] emptyClasses() {
         return new Object[][] {
                 new Object[] { "EmptyHiddenSynthetic", ACC_SYNTHETIC },
                 new Object[] { "EmptyHiddenEnum", ACC_ENUM },
@@ -276,7 +265,8 @@ public class BasicTest {
      * enum class containing constants of its type should not be a hidden
      * class.
      */
-    @Test(dataProvider = "emptyClasses")
+    @ParameterizedTest
+    @MethodSource("emptyClasses")
     public void emptyHiddenClass(String name, int accessFlags) throws Exception {
         byte[] bytes = (accessFlags == ACC_ENUM) ? classBytes(name, CD_Enum, accessFlags)
                 : classBytes(name, accessFlags);
@@ -316,7 +306,7 @@ public class BasicTest {
                 throw new IllegalArgumentException("unexpected access flag: " + accessFlags);
         }
         assertTrue(hc.isHidden());
-        assertTrue(hc.getModifiers() == (ACC_PUBLIC|accessFlags));
+        assertEquals(hc.getModifiers(), ACC_PUBLIC | accessFlags);
         assertFalse(hc.isLocalClass());
         assertFalse(hc.isMemberClass());
         assertFalse(hc.isAnonymousClass());
@@ -324,8 +314,7 @@ public class BasicTest {
     }
 
     // These class files can't be defined as hidden classes
-    @DataProvider(name = "cantBeHiddenClasses")
-    private Object[][] cantBeHiddenClasses() {
+    private static Object[][] cantBeHiddenClasses() {
         return new Object[][] {
                 // a hidden class can't be a field's declaring type
                 // enum class with static final HiddenEnum[] $VALUES:
@@ -342,10 +331,11 @@ public class BasicTest {
     /*
      * These class files
      */
-    @Test(dataProvider = "cantBeHiddenClasses", expectedExceptions = NoClassDefFoundError.class)
+    @ParameterizedTest
+    @MethodSource("cantBeHiddenClasses")
     public void failToDeriveAsHiddenClass(String name) throws Exception {
         byte[] bytes = Files.readAllBytes(CLASSES_DIR.resolve(name + ".class"));
-        Class<?> hc = lookup().defineHiddenClass(bytes, false).lookupClass();
+        assertThrows(NoClassDefFoundError.class, () -> lookup().defineHiddenClass(bytes, false).lookupClass());
     }
 
     /*
@@ -361,22 +351,17 @@ public class BasicTest {
 
         Class<?> c = t.getClass();
         Class<?>[] intfs = c.getInterfaces();
-        assertTrue(intfs.length == 1);
-        assertTrue(intfs[0] == HiddenTest.class);
+        assertEquals(1, intfs.length);
+        assertSame(HiddenTest.class, intfs[0]);
 
-        try {
-            // this would cause loading of class HiddenCantReflect and NCDFE due
-            // to error during verification
-            c.getDeclaredMethods();
-        } catch (NoClassDefFoundError e) {
-            Throwable x = e.getCause();
-            if (x == null || !(x instanceof ClassNotFoundException && x.getMessage().contains("HiddenCantReflect"))) {
-                throw e;
-            }
+        var e = assertThrows(NoClassDefFoundError.class, c::getDeclaredMethods);
+        Throwable x = e.getCause();
+        if (x == null || !(x instanceof ClassNotFoundException && x.getMessage().contains("HiddenCantReflect"))) {
+            throw e;
         }
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void cantDefineModule() throws Throwable {
         Path src = Paths.get("module-info.java");
         Path dir = CLASSES_DIR.resolve("m");
@@ -384,35 +369,34 @@ public class BasicTest {
         compileSources(src, dir);
 
         byte[] bytes = Files.readAllBytes(dir.resolve("module-info.class"));
-        lookup().defineHiddenClass(bytes, false);
+        assertThrows(IllegalArgumentException.class, () -> lookup().defineHiddenClass(bytes, false));
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void cantDefineClassInAnotherPackage() throws Throwable {
         Path src = Paths.get("ClassInAnotherPackage.java");
         Files.write(src, List.of("package p;", "public class ClassInAnotherPackage {}"), StandardCharsets.UTF_8);
         compileSources(src, CLASSES_DIR);
 
         byte[] bytes = Files.readAllBytes(CLASSES_DIR.resolve("p").resolve("ClassInAnotherPackage.class"));
-        lookup().defineHiddenClass(bytes, false);
+        assertThrows(IllegalArgumentException.class, () -> lookup().defineHiddenClass(bytes, false));
     }
 
-    @Test(expectedExceptions = { IllegalAccessException.class })
+    @Test
     public void lessPrivilegedLookup() throws Throwable {
         Lookup lookup = lookup().dropLookupMode(Lookup.PRIVATE);
-        lookup.defineHiddenClass(hiddenClassBytes, false);
+        assertThrows(IllegalAccessException.class, () -> lookup.defineHiddenClass(hiddenClassBytes, false));
     }
 
-    @Test(expectedExceptions = { UnsupportedClassVersionError.class })
+    @Test
     public void badClassFileVersion() throws Throwable {
         Path dir = Paths.get(System.getProperty("test.classes", "."));
         byte[] bytes = Files.readAllBytes(dir.resolve("BadClassFileVersion.class"));
-        lookup().defineHiddenClass(bytes, false);
+        assertThrows(UnsupportedClassVersionError.class, () -> lookup().defineHiddenClass(bytes, false));
     }
 
     // malformed class files
-    @DataProvider(name = "malformedClassFiles")
-    private Object[][] malformedClassFiles() throws IOException {
+    private static Object[][] malformedClassFiles() throws IOException {
         Path dir = Paths.get(System.getProperty("test.classes", "."));
         return new Object[][] {
                 // `this_class` has invalid CP entry
@@ -424,13 +408,13 @@ public class BasicTest {
         };
     }
 
-    @Test(dataProvider = "malformedClassFiles", expectedExceptions = ClassFormatError.class)
+    @ParameterizedTest
+    @MethodSource("malformedClassFiles")
     public void badClassFile(byte[] bytes) throws Throwable {
-        lookup().defineHiddenClass(bytes, false);
+        assertThrows(ClassFormatError.class, () -> lookup().defineHiddenClass(bytes, false));
     }
 
-    @DataProvider(name = "nestedTypesOrAnonymousClass")
-    private Object[][] nestedTypesOrAnonymousClass() {
+    private static Object[][] nestedTypesOrAnonymousClass() {
         return new Object[][] {
                 // class file with bad InnerClasses or EnclosingMethod attribute
                 new Object[] { "Outer", null },
@@ -440,7 +424,8 @@ public class BasicTest {
         };
     }
 
-    @Test(dataProvider = "nestedTypesOrAnonymousClass")
+    @ParameterizedTest
+    @MethodSource("nestedTypesOrAnonymousClass")
     public void hasInnerClassesOrEnclosingMethodAttribute(String className, String badDeclaringClassName) throws Throwable {
         byte[] bytes = Files.readAllBytes(CLASSES_10_DIR.resolve(className + ".class"));
         Class<?> hc = lookup().defineHiddenClass(bytes, false).lookupClass();
@@ -460,21 +445,22 @@ public class BasicTest {
         byte[] bytes = Files.readAllBytes(CLASSES_DIR.resolve("Outer.class"));
         Class<?> hc = lookup().defineHiddenClass(bytes, false).lookupClass();
         assertHiddenClass(hc);
-        assertTrue(hc.getNestHost() == hc);
+        assertSame(hc, hc.getNestHost());
         Class<?>[] members = hc.getNestMembers();
-        assertTrue(members.length == 1 && members[0] == hc);
+        assertEquals(1, members.length);
+        assertSame(hc, members[0]);
     }
 
     // a hidden class with bad InnerClasses or EnclosingMethod attribute
     private void hiddenClassWithBadAttribute(Class<?> hc, String badDeclaringClassName) {
         assertTrue(hc.isHidden());
-        assertTrue(hc.getCanonicalName() == null);
+        assertNull(hc.getCanonicalName());
         assertTrue(hc.getName().contains("/"));
 
         if (badDeclaringClassName == null) {
             // the following reflection API assumes a good name in InnerClasses
             // or EnclosingMethod attribute can successfully be resolved.
-            assertTrue(hc.getSimpleName().length() > 0);
+            assertFalse(hc.getSimpleName().isEmpty());
             assertFalse(hc.isAnonymousClass());
             assertFalse(hc.isLocalClass());
             assertFalse(hc.isMemberClass());
@@ -483,43 +469,34 @@ public class BasicTest {
         }
 
         // validation of nest membership
-        assertTrue(hc.getNestHost() == hc);
+        assertSame(hc, hc.getNestHost());
         // validate the static nest membership
         Class<?>[] members = hc.getNestMembers();
-        assertTrue(members.length == 1 && members[0] == hc);
+        assertEquals(1, members.length);
+        assertSame(hc, members[0]);
     }
 
     // Class::getSimpleName, Class::isMemberClass
     private void declaringClassNotFound(Class<?> c, String cn) {
-        try {
-            // fail to find declaring/enclosing class
-            c.isMemberClass();
-            assertTrue(false);
-        } catch (NoClassDefFoundError e) {
-            if (!e.getMessage().equals(cn)) {
-                throw e;
-            }
+        var e = assertThrows(NoClassDefFoundError.class, c::isMemberClass);
+        if (!e.getMessage().equals(cn)) {
+            throw e;
         }
-        try {
-            // fail to find declaring/enclosing class
-            c.getSimpleName();
-            assertTrue(false);
-        } catch (NoClassDefFoundError e) {
-            if (!e.getMessage().equals(cn)) {
-                throw e;
-            }
+        e = assertThrows(NoClassDefFoundError.class, c::getSimpleName);
+        if (!e.getMessage().equals(cn)) {
+            throw e;
         }
     }
 
     private static void singletonNest(Class<?> hc) {
-        assertTrue(hc.getNestHost() == hc);
-        assertTrue(hc.getNestMembers().length == 1);
-        assertTrue(hc.getNestMembers()[0] == hc);
+        assertSame(hc, hc.getNestHost());
+        assertEquals(1, hc.getNestMembers().length);
+        assertSame(hc, hc.getNestMembers()[0]);
     }
 
     private static void assertHiddenClass(Class<?> hc) {
         assertTrue(hc.isHidden());
-        assertTrue(hc.getCanonicalName() == null);
+        assertNull(hc.getCanonicalName());
         assertTrue(hc.getName().contains("/"));
         assertFalse(hc.isAnonymousClass());
         assertFalse(hc.isLocalClass());
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java
index e026a7a1387..a71029dd229 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib
  * @build  HiddenNestmateTest
- * @run testng/othervm HiddenNestmateTest
+ * @run junit/othervm HiddenNestmateTest
  */
 
 import java.lang.classfile.ClassFile;
@@ -37,9 +37,6 @@ import java.lang.reflect.AccessFlag;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.stream.Stream;
-import java.util.Arrays;
-
-import org.testng.annotations.Test;
 
 import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.constant.ConstantDescs.CD_int;
@@ -48,7 +45,8 @@ import static java.lang.constant.ConstantDescs.MTD_void;
 import static java.lang.invoke.MethodHandles.Lookup.ClassOption.*;
 import static java.lang.invoke.MethodHandles.Lookup.*;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class HiddenNestmateTest {
     private static final ClassDesc CD_HiddenNestmateTest = HiddenNestmateTest.class.describeConstable().orElseThrow();
@@ -61,12 +59,12 @@ public class HiddenNestmateTest {
         Class<?> hiddenClass = lookup.lookupClass();
         Class<?> nestHost = hiddenClass.getNestHost();
         assertTrue(hiddenClass.isHidden());
-        assertTrue(nestHost == MethodHandles.lookup().lookupClass());
+        assertSame(MethodHandles.lookup().lookupClass(), nestHost);
 
         // hidden nestmate is not listed in the return array of getNestMembers
         assertTrue(Stream.of(nestHost.getNestMembers()).noneMatch(k -> k == hiddenClass));
         assertTrue(hiddenClass.isNestmateOf(lookup.lookupClass()));
-        assertTrue(Arrays.equals(hiddenClass.getNestMembers(), nestHost.getNestMembers()));
+        assertArrayEquals(nestHost.getNestMembers(), hiddenClass.getNestMembers());
     }
 
     /*
@@ -78,23 +76,19 @@ public class HiddenNestmateTest {
         Lookup lookup = MethodHandles.lookup().defineHiddenClass(bytes, false);
         Class<?> c = lookup.lookupClass();
         assertTrue(lookup.hasFullPrivilegeAccess());
-        assertTrue((lookup.lookupModes() & ORIGINAL) == ORIGINAL);
-        assertTrue(c.getNestHost() == c);  // host of its own nest
+        assertEquals(ORIGINAL, lookup.lookupModes() & ORIGINAL);
+        assertSame(c, c.getNestHost());  // host of its own nest
         assertTrue(c.isHidden());
 
         // invoke int test(HiddenNestmateTest o) via MethodHandle
         MethodHandle ctor = lookup.findConstructor(c, MethodType.methodType(void.class));
         MethodHandle mh = lookup.findVirtual(c, "test", MethodType.methodType(int.class, HiddenNestmateTest.class));
-        try {
+        assertThrows(IllegalAccessError.class, () -> {
             int x = (int) mh.bindTo(ctor.invoke()).invokeExact(this);
-            throw new RuntimeException("should fail when accessing HiddenNestmateTest.privMethod()");
-        } catch (IllegalAccessError e) {}
+        });
 
         // invoke int test(HiddenNestmateTest o)
-        try {
-            int x1 = testInjectedClass(c);
-            throw new RuntimeException("should fail when accessing HiddenNestmateTest.privMethod()");
-        } catch (IllegalAccessError e) {}
+        assertThrows(IllegalAccessError.class, () -> testInjectedClass(c));
     }
 
     /*
@@ -111,11 +105,11 @@ public class HiddenNestmateTest {
         MethodHandle ctor = lookup.findConstructor(c, MethodType.methodType(void.class));
         MethodHandle mh = lookup.findVirtual(c, "test", MethodType.methodType(int.class, HiddenNestmateTest.class));
         int x = (int)mh.bindTo(ctor.invoke()).invokeExact( this);
-        assertTrue(x == privMethod());
+        assertEquals(privMethod(), x);
 
         // invoke int test(HiddenNestmateTest o)
         int x1 = testInjectedClass(c);
-        assertTrue(x1 == privMethod());
+        assertEquals(privMethod(), x1);
     }
 
     /*
@@ -131,10 +125,10 @@ public class HiddenNestmateTest {
     /*
      * Fail to create a hidden class if dropping PRIVATE lookup mode
      */
-    @Test(expectedExceptions = IllegalAccessException.class)
+    @Test
     public void noPrivateLookupAccess() throws Throwable {
         Lookup lookup = MethodHandles.lookup().dropLookupMode(Lookup.PRIVATE);
-        lookup.defineHiddenClass(bytes, false, NESTMATE);
+        assertThrows(IllegalAccessException.class, () -> lookup.defineHiddenClass(bytes, false, NESTMATE));
     }
 
     public void teleportToNestmate() throws Throwable {
@@ -143,8 +137,8 @@ public class HiddenNestmateTest {
 
         // Teleport to a hidden nestmate
         Lookup lc =  MethodHandles.lookup().in(lookup.lookupClass());
-        assertTrue((lc.lookupModes() & PRIVATE) != 0);
-        assertTrue((lc.lookupModes() & ORIGINAL) == 0);
+        assertNotEquals(0, lc.lookupModes() & PRIVATE);
+        assertEquals(0, lc.lookupModes() & ORIGINAL);
 
         Lookup lc2 = lc.defineHiddenClass(bytes, false, NESTMATE);
         assertNestmate(lc2);
@@ -153,9 +147,9 @@ public class HiddenNestmateTest {
     /*
      * Fail to create a hidden class in a different package from the lookup class' package
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void notSamePackage() throws Throwable {
-        MethodHandles.lookup().defineHiddenClass(classBytes("p/HiddenInjected"), false, NESTMATE);
+        assertThrows(IllegalArgumentException.class, () -> MethodHandles.lookup().defineHiddenClass(classBytes("p/HiddenInjected"), false, NESTMATE));
     }
 
     /*
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java
index 9e3c8a8b318..7524e67bf9e 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary define a lambda proxy class whose target class has an invalid
  *          nest membership
- * @run testng/othervm p.LambdaNestedInnerTest
+ * @run junit/othervm p.LambdaNestedInnerTest
  */
 
 package p;
@@ -41,11 +41,10 @@ import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class LambdaNestedInnerTest {
     private static final String INNER_CLASSNAME = "p.LambdaNestedInnerTest$Inner";
@@ -68,7 +67,7 @@ public class LambdaNestedInnerTest {
             lambda1.run();
         }
 
-        // testng may not be visible to this class
+        // junit may not be visible to this class
         private static void assertTrue(boolean x) {
             if (!x) {
                 throw new AssertionError("expected true but found false");
@@ -79,8 +78,8 @@ public class LambdaNestedInnerTest {
         }
     }
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         String filename = INNER_CLASSNAME.replace('.', File.separatorChar) + ".class";
         Path src = Paths.get(System.getProperty("test.classes"), filename);
         Path dest = Paths.get(DIR, filename);
@@ -93,9 +92,9 @@ public class LambdaNestedInnerTest {
         Class<?> inner = Class.forName(INNER_CLASSNAME);
         // inner class is a nest member of LambdaNestedInnerTest
         Class<?> nestHost = inner.getNestHost();
-        assertTrue(nestHost == LambdaNestedInnerTest.class);
+        assertSame(LambdaNestedInnerTest.class, nestHost);
         Set<Class<?>> members = Arrays.stream(nestHost.getNestMembers()).collect(Collectors.toSet());
-        assertEquals(members, Set.of(nestHost, inner, TestLoader.class));
+        assertEquals(Set.of(nestHost, inner, TestLoader.class), members);
 
         // spin lambda proxy hidden class
         Runnable runnable = (Runnable) inner.newInstance();
@@ -107,8 +106,8 @@ public class LambdaNestedInnerTest {
         URL[] urls = new URL[] { Paths.get(DIR).toUri().toURL() };
         URLClassLoader loader = new URLClassLoader(urls, null);
         Class<?> inner = loader.loadClass(INNER_CLASSNAME);
-        assertTrue(inner.getClassLoader() == loader);
-        assertTrue(inner.getNestHost() == inner);   // linkage error ignored
+        assertSame(loader, inner.getClassLoader());
+        assertSame(inner, inner.getNestHost());   // linkage error ignored
 
         Runnable runnable = (Runnable) inner.newInstance();
         // this validates the lambda proxy class
@@ -125,8 +124,8 @@ public class LambdaNestedInnerTest {
         TestLoader loader = new TestLoader(urls);
 
         Class<?> inner = loader.loadClass(INNER_CLASSNAME);
-        assertTrue(inner.getClassLoader() == loader);
-        assertTrue(inner.getNestHost() == inner);   // linkage error ignored.
+        assertSame(loader, inner.getClassLoader());
+        assertSame(inner, inner.getNestHost());   // linkage error ignored.
 
         Runnable runnable = (Runnable) inner.newInstance();
         // this validates the lambda proxy class
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
index fddbb348517..bd6c87808fe 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @requires !java.enablePreview
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.compiler.CompilerUtils
- * @run testng PreviewHiddenClass
+ * @run junit PreviewHiddenClass
  * @summary verify UnsupportedClassVersionError thrown when defining a hidden class
  *         with preview minor version but --enable-preview is not set
  * @comment This test itself cannot enablePreview, or hidden class definition
@@ -46,15 +46,15 @@ import java.nio.file.Paths;
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.Utils;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PreviewHiddenClass {
 
     private static final Path SRC_DIR = Paths.get(Utils.TEST_SRC, "src");
     private static final Path CLASSES_DIR = Paths.get("classes");
 
-    @Test(expectedExceptions = { UnsupportedClassVersionError.class })
+    @Test
     public void previewNotEnabled() throws Exception {
         // compile a class with --enable-preview
         Path sourceFile = SRC_DIR.resolve("HiddenInterface.java");
@@ -67,7 +67,7 @@ public class PreviewHiddenClass {
         byte[] bytes = Files.readAllBytes(CLASSES_DIR.resolve("HiddenInterface.class"));
         var dis = new DataInputStream(new ByteArrayInputStream(bytes));
         dis.skipBytes(4); // 0xCAFEBABE
-        assertEquals(dis.readUnsignedShort(), 65535); // Minor version
-        MethodHandles.lookup().defineHiddenClass(bytes, false);
+        assertEquals(65535, dis.readUnsignedShort()); // Minor version
+        assertThrows(UnsupportedClassVersionError.class, () -> MethodHandles.lookup().defineHiddenClass(bytes, false));
     }
 }
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java
index 1c95caa97d3..ac0a29c247d 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/StaticInvocableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary hidden class members can't be statically invocable
  * @modules java.base/jdk.internal.misc
  * @build java.base/*
- * @run testng StaticInvocableTest
+ * @run junit StaticInvocableTest
  */
 
 import java.lang.classfile.ClassFile;
@@ -38,7 +38,6 @@ import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.LookupHelper;
 import java.lang.reflect.AccessFlag;
-import org.testng.annotations.Test;
 
 import static java.lang.classfile.ClassFile.ACC_PUBLIC;
 import static java.lang.classfile.ClassFile.ACC_STATIC;
@@ -46,6 +45,7 @@ import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.constant.ConstantDescs.CD_int;
 import static java.lang.constant.ConstantDescs.INIT_NAME;
 import static java.lang.constant.ConstantDescs.MTD_void;
+import org.junit.jupiter.api.Test;
 
 public class StaticInvocableTest {
     public static void main(String[] args) throws Throwable {
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/TypeDescriptorTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/TypeDescriptorTest.java
index e60cb8a5782..575eac1ccd1 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/TypeDescriptorTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/TypeDescriptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,10 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8242013
- * @run testng/othervm test.TypeDescriptorTest
+ * @run junit/othervm test.TypeDescriptorTest
  * @summary Test TypeDescriptor::descriptorString for hidden classes which
  *          cannot be used to produce ConstantDesc via ClassDesc or
  *          MethodTypeDesc factory methods
@@ -42,9 +42,10 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import static java.lang.invoke.MethodType.*;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class TypeDescriptorTest {
     private static final Lookup HC_LOOKUP = defineHiddenClass();
@@ -61,8 +62,7 @@ public class TypeDescriptorTest {
         }
     }
 
-    @DataProvider(name = "constables")
-    private Object[][] constables() throws Exception {
+    private static Object[][] constables() throws Exception {
         Class<?> hcArray = Array.newInstance(HC, 1).getClass();
         return new Object[][] {
                 new Object[] { HC },
@@ -79,7 +79,8 @@ public class TypeDescriptorTest {
      * Hidden classes have no nominal descriptor.
      * Constable::describeConstable returns empty optional.
      */
-    @Test(dataProvider = "constables")
+    @ParameterizedTest
+    @MethodSource("constables")
     public void noNominalDescriptor(Constable constable) {
         assertTrue(constable.describeConstable().isEmpty());
     }
@@ -90,27 +91,13 @@ public class TypeDescriptorTest {
      */
     @Test
     public void testClassDesc() {
-        try {
-            ClassDesc.ofDescriptor(HC.descriptorString());
-            assertFalse(true);
-        } catch (IllegalArgumentException e) {}
-
-        try {
-            ClassDesc.ofDescriptor(HC.getName());
-            assertFalse(true);
-        } catch (IllegalArgumentException e) {}
-        try {
-            ClassDesc.of(HC.getPackageName(), HC.getSimpleName());
-            assertFalse(true);
-        } catch (IllegalArgumentException e) {}
-        try {
-            ClassDesc.of(HC.getName());
-            assertFalse(true);
-        } catch (IllegalArgumentException e) {}
+        assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(HC.descriptorString()));
+        assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(HC.getName()));
+        assertThrows(IllegalArgumentException.class, () -> ClassDesc.of(HC.getPackageName(), HC.getSimpleName()));
+        assertThrows(IllegalArgumentException.class, () -> ClassDesc.of(HC.getName()));
     }
 
-    @DataProvider(name = "typeDescriptors")
-    private Object[][] typeDescriptors() throws Exception {
+    private static Object[][] typeDescriptors() throws Exception {
         Class<?> hcArray = Array.newInstance(HC, 1, 1).getClass();
         return new Object[][] {
                 new Object[] { HC, "Ltest/HiddenClass.0x[0-9a-f]+;"},
@@ -124,26 +111,20 @@ public class TypeDescriptorTest {
     /*
      * Hidden classes have no nominal type descriptor
      */
-    @Test(dataProvider = "typeDescriptors")
+    @ParameterizedTest
+    @MethodSource("typeDescriptors")
     public void testTypeDescriptor(TypeDescriptor td, String regex) throws Exception {
         String desc = td.descriptorString();
         assertTrue(desc.matches(regex));
 
         if (td instanceof Class) {
-            try {
-                ClassDesc.ofDescriptor(desc);
-                assertFalse(true);
-            } catch (IllegalArgumentException e) {}
+            assertThrows(IllegalArgumentException.class, () -> ClassDesc.ofDescriptor(desc));
         } else if (td instanceof MethodType) {
-            try {
-                MethodTypeDesc.ofDescriptor(desc);
-                assertFalse(true);
-            } catch (IllegalArgumentException e) {}
+            assertThrows(IllegalArgumentException.class, () -> MethodTypeDesc.ofDescriptor(desc));
         }
     }
 
-    @DataProvider(name = "methodTypes")
-    private Object[][] methodTypes() throws Exception {
+    private static Object[][] methodTypes() throws Exception {
         Class<?> hcArray = Array.newInstance(HC, 1, 1).getClass();
         return new Object[][] {
                 new Object[] { methodType(HC), "\\(\\)Ltest/HiddenClass.0x[0-9a-f]+;" },
@@ -155,15 +136,13 @@ public class TypeDescriptorTest {
     /*
      * Test MethodType::toMethodDescriptorString with MethodType referencing to hidden class
      */
-    @Test(dataProvider = "methodTypes")
+    @ParameterizedTest
+    @MethodSource("methodTypes")
     public void testToMethodDescriptorString(MethodType mtype, String regex) throws Exception {
         String desc = mtype.toMethodDescriptorString();
         assertTrue(desc.matches(regex));
 
-        try {
-            MethodType.fromMethodDescriptorString(desc, TypeDescriptorTest.class.getClassLoader());
-            assertFalse(true);
-        } catch (IllegalArgumentException e) {}
+        assertThrows(IllegalArgumentException.class, () -> MethodType.fromMethodDescriptorString(desc, TypeDescriptorTest.class.getClassLoader()));
     }
 }
 
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/UnloadingTest.java b/test/jdk/java/lang/invoke/defineHiddenClass/UnloadingTest.java
index b016b2f6899..45728f2ed79 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/UnloadingTest.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/UnloadingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @modules jdk.compiler
  * @library /test/lib/
  * @build jdk.test.lib.util.ForceGC
- * @run testng/othervm UnloadingTest
+ * @run junit/othervm UnloadingTest
  */
 
 import java.io.IOException;
@@ -48,18 +48,16 @@ import jdk.test.lib.util.ForceGC;
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.Utils;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import static java.lang.invoke.MethodHandles.lookup;
 import static java.lang.invoke.MethodHandles.Lookup.ClassOption.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class UnloadingTest {
     private static final Path CLASSES_DIR = Paths.get("classes");
     private static byte[] hiddenClassBytes;
 
-    @BeforeTest
+    @BeforeAll
     static void setup() throws IOException {
         Path src = Paths.get(Utils.TEST_SRC, "src", "LookupHelper.java");
         if (!CompilerUtils.compile(src, CLASSES_DIR)) {
@@ -116,7 +114,7 @@ public class UnloadingTest {
 
         // keep a strong reference to the nest member class
         Class<?> member = unloaders[1].weakRef.get();
-        assertTrue(member != null);
+        assertNotNull(member);
         // nest host and member will not be unloaded
         assertFalse(unloaders[0].tryUnload());
         assertFalse(unloaders[1].tryUnload());
@@ -180,7 +178,7 @@ public class UnloadingTest {
         } else {
             hc = lookup.defineHiddenClass(hiddenClassBytes, false).lookupClass();
         }
-        assertTrue(hc.getClassLoader() == lookup.lookupClass().getClassLoader());
+        assertSame(lookup.lookupClass().getClassLoader(), hc.getClassLoader());
         return new HiddenClassUnloader(hc);
     }
 
@@ -202,7 +200,7 @@ public class UnloadingTest {
         } else {
             member = hostLookup.defineHiddenClass(hiddenClassBytes, false, NESTMATE).lookupClass();
         }
-        assertTrue(member.getNestHost() == host);
+        assertSame(host, member.getNestHost());
         return new HiddenClassUnloader[] { new HiddenClassUnloader(host), new HiddenClassUnloader(member) };
     }
 
diff --git a/test/jdk/java/lang/invoke/findSpecial/FindSpecialTest.java b/test/jdk/java/lang/invoke/findSpecial/FindSpecialTest.java
index 9b6622a7e9c..5bb7f67c000 100644
--- a/test/jdk/java/lang/invoke/findSpecial/FindSpecialTest.java
+++ b/test/jdk/java/lang/invoke/findSpecial/FindSpecialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8209005 8209078
  * @library /test/lib
  * @build m1/* FindSpecialTest
- * @run testng/othervm FindSpecialTest
+ * @run junit/othervm FindSpecialTest
  * @summary Test findSpecial and unreflectSpecial of the declaring class
  *          of the method and the special caller are not in the same module
  *          as the lookup class.
@@ -39,7 +39,7 @@ import java.nio.file.Paths;
 
 import static jdk.test.lib.process.ProcessTools.*;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class FindSpecialTest {
     static final String TEST_CLASSES = System.getProperty("test.classes", ".");
@@ -51,7 +51,7 @@ public class FindSpecialTest {
      * Run test.FindSpecial in unnamed module
      */
     @Test
-    public static void callerInUnnamedModule() throws Throwable {
+    public void callerInUnnamedModule() throws Throwable {
         Path m1 = Paths.get(TEST_CLASSES, "modules", TEST_MODULE);
         if (Files.notExists(m1)) {
             throw new Error(m1 + " not exist");
@@ -66,7 +66,7 @@ public class FindSpecialTest {
      * Run test.FindSpecial in a named module
      */
     @Test
-    public static void callerInNamedModule() throws Throwable {
+    public void callerInNamedModule() throws Throwable {
         Path modules = Paths.get(TEST_CLASSES, "modules");
         if (Files.notExists(modules)) {
             throw new Error(modules + " not exist");
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaFileEncodingSerialization.java b/test/jdk/java/lang/invoke/lambda/LambdaFileEncodingSerialization.java
index 1f950ffce7e..6c505ddf471 100644
--- a/test/jdk/java/lang/invoke/lambda/LambdaFileEncodingSerialization.java
+++ b/test/jdk/java/lang/invoke/lambda/LambdaFileEncodingSerialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,36 +21,33 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8248231
  * @summary Test to verify lambda serialization uses the correct UTF-8 encoding
  * @library /test/lib
  * @build jdk.test.lib.JDKToolFinder
  *        jdk.test.lib.process.ProcessTools
- * @run testng LambdaFileEncodingSerialization
+ * @run junit LambdaFileEncodingSerialization
  */
 import java.io.File;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Arrays;
 import java.util.ArrayList;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import jdk.test.lib.JDKToolFinder;
 import jdk.test.lib.process.ProcessTools;
+import org.junit.jupiter.api.Test;
 
 public class LambdaFileEncodingSerialization {
 
     private static final String TEST_NAME = "TestLambdaFileEncodingSerialization";
 
     @Test
-    public static void testDeserializeLambdaEncoding() throws Throwable {
+    public void testDeserializeLambdaEncoding() throws Throwable {
 
         String javac = JDKToolFinder.getTestJDKTool("javac");
         String java = JDKToolFinder.getTestJDKTool("java");
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaHiddenCaller.java b/test/jdk/java/lang/invoke/lambda/LambdaHiddenCaller.java
index aed19e6ca17..0dbdff79230 100644
--- a/test/jdk/java/lang/invoke/lambda/LambdaHiddenCaller.java
+++ b/test/jdk/java/lang/invoke/lambda/LambdaHiddenCaller.java
@@ -29,8 +29,7 @@ import java.util.function.IntSupplier;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /*
  * @test
@@ -62,7 +61,7 @@ public class LambdaHiddenCaller {
     void testSerializableLambda() {
         var is = hiddenCaller.callSerializableLambda();
         assertEquals(42, is.getAsInt());
-        assertTrue(Serializable.class.isAssignableFrom(is.getClass()));
+        assertInstanceOf(Serializable.class, is);
         // We do not guarantee serialization functionalities yet
     }
 }
diff --git a/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java b/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java
index 60c85753d72..eb013bf01f3 100644
--- a/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java
+++ b/test/jdk/java/lang/invoke/lambda/LogGeneratedClassesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /java/nio/file
  * @modules jdk.compiler
  *          jdk.zipfs
- * @run testng LogGeneratedClassesTest
+ * @run junit LogGeneratedClassesTest
  * @summary tests logging generated classes for lambda
  */
 import java.io.IOException;
@@ -45,24 +45,24 @@ import java.nio.file.attribute.PosixFileAttributeView;
 
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.OutputAnalyzer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.SkipException;
 
 import static java.nio.file.attribute.PosixFilePermissions.*;
 import static jdk.test.lib.process.ProcessTools.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class LogGeneratedClassesTest {
     static final Path DUMP_LAMBDA_PROXY_CLASS_FILES = Path.of("DUMP_LAMBDA_PROXY_CLASS_FILES");
     static final Path CLASSES = Path.of("classes").toAbsolutePath();
-    String longFQCN;
+    static String longFQCN;
 
-    @BeforeClass
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         final List<String> scratch = new ArrayList<>();
         scratch.clear();
         scratch.add("package com.example;");
@@ -102,8 +102,8 @@ public class LogGeneratedClassesTest {
         CompilerUtils.compile(Path.of("."), CLASSES);
     }
 
-    @AfterClass
-    public void cleanup() throws IOException {
+    @AfterAll
+    public static void cleanup() throws IOException {
         Files.delete(Paths.get("TestLambda.java"));
         Files.delete(Paths.get("LongPackageName.java"));
         TestUtil.removeAll(DUMP_LAMBDA_PROXY_CLASS_FILES);
@@ -132,12 +132,11 @@ public class LogGeneratedClassesTest {
         executeProcess(pb).shouldHaveExitValue(0);
 
         // 2 our own class files. We don't care about the others
-        assertEquals(Files.find(
-                        dumpDir,
-                        99,
-                        (p, a) -> p.startsWith(dumpDir.resolve("com/example"))
-                                && a.isRegularFile()).count(),
-                        2, "Two lambda captured");
+        assertEquals(2, Files.find(
+                dumpDir,
+                99,
+                (p, a) -> p.startsWith(dumpDir.resolve("com/example"))
+                        && a.isRegularFile()).count(), "Two lambda captured");
     }
 
     @Test
@@ -155,12 +154,11 @@ public class LogGeneratedClassesTest {
         executeProcess(pb).shouldHaveExitValue(0);
 
         // The dump directory will be created if not exist
-        assertEquals(Files.find(
-                        dumpDir,
-                        99,
-                        (p, a) -> p.startsWith(dumpDir.resolve("com/example"))
-                                && a.isRegularFile()).count(),
-                        2, "Two lambda captured");
+        assertEquals(2, Files.find(
+                dumpDir,
+                99,
+                (p, a) -> p.startsWith(dumpDir.resolve("com/example"))
+                        && a.isRegularFile()).count(), "Two lambda captured");
     }
 
     @Test
@@ -208,12 +206,10 @@ public class LogGeneratedClassesTest {
         try {
             fs = Files.getFileStore(Paths.get("."));
         } catch (IOException e) {
-            throw new SkipException("WARNING: IOException occurred: " + e + ", Skipping testDumpDirNotWritable test.");
-        }
-        if (!fs.supportsFileAttributeView(PosixFileAttributeView.class)) {
-            // No easy way to setup readonly directory without POSIX
-            throw new SkipException("WARNING: POSIX is not supported. Skipping testDumpDirNotWritable test.");
+            Assumptions.assumeTrue(false, "WARNING: IOException occurred: " + e + ", Skipping testDumpDirNotWritable test.");
+            return;
         }
+        Assumptions.assumeFalse(!fs.supportsFileAttributeView(PosixFileAttributeView.class), "WARNING: POSIX is not supported. Skipping testDumpDirNotWritable test."); // No easy way to setup readonly directory without POSIX
 
         Path testDir = Path.of("readOnly");
         Path dumpDir = testDir.resolve(DUMP_LAMBDA_PROXY_CLASS_FILES);
@@ -221,11 +217,8 @@ public class LogGeneratedClassesTest {
         Files.createDirectory(dumpDir,
                               asFileAttribute(fromString("r-xr-xr-x")));
         try {
-            if (isWriteableDirectory(dumpDir)) {
-                // Skipping the test: it's allowed to write into read-only directory
-                // (e.g. current user is super user).
-                throw new SkipException("WARNING: The dump directory is writeable. Skipping testDumpDirNotWritable test.");
-            }
+            Assumptions.assumeFalse(isWriteableDirectory(dumpDir), "WARNING: The dump directory is writeable. Skipping testDumpDirNotWritable test."); // Skipping the test: it's allowed to write into read-only directory
+            // (e.g. current user is super user).
 
             ProcessBuilder pb = createLimitedTestJavaProcessBuilder(
                                    "-cp", CLASSES.toString(),
@@ -251,10 +244,9 @@ public class LogGeneratedClassesTest {
                                longFQCN).directory(testDir.toFile());
         OutputAnalyzer outputAnalyzer = executeProcess(pb);
         outputAnalyzer.shouldHaveExitValue(0);
-        assertEquals(outputAnalyzer.asLines().stream()
-                                  .filter(s -> s.startsWith("WARNING: Exception"))
-                                  .count(),
-                     2, "show error each capture");
+        assertEquals(2, outputAnalyzer.asLines().stream()
+                .filter(s -> s.startsWith("WARNING: Exception"))
+                .count(), "show error each capture");
         // dumpLong/DUMP_LAMBDA_PROXY_CLASS_FILES/com/example/nonsense/nonsense
         Path dumpPath = dumpDir.resolve("com/example/nonsense");
         Predicate<Path> filter = p -> p.getParent() == null || dumpPath.startsWith(p) || p.startsWith(dumpPath);
@@ -269,8 +261,8 @@ public class LogGeneratedClassesTest {
                     }
                  });
         }
-        assertEquals(Files.walk(dumpDir)
+        assertEquals(5, Files.walk(dumpDir)
                 .filter(filter)
-                .count(), 5, "Two lambda captured failed to log");
+                .count(), "Two lambda captured failed to log");
     }
 }
diff --git a/test/jdk/java/lang/invoke/lambda/invokeSpecial/InvokeSpecialMethodTest.java b/test/jdk/java/lang/invoke/lambda/invokeSpecial/InvokeSpecialMethodTest.java
index bf1db0f822e..4b74d05f270 100644
--- a/test/jdk/java/lang/invoke/lambda/invokeSpecial/InvokeSpecialMethodTest.java
+++ b/test/jdk/java/lang/invoke/lambda/invokeSpecial/InvokeSpecialMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,22 +24,22 @@
 /*
  * @test
  * @bug 8274848
- * @run testng InvokeSpecialMethodTest
+ * @run junit InvokeSpecialMethodTest
  * @summary ensure REF_invokeSpecial on a non-private implementation method
  *          behaves as if `super::m` is invoked regardless of its access flag
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.CallSite;
 import java.lang.invoke.LambdaMetafactory;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import static java.lang.invoke.MethodType.methodType;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InvokeSpecialMethodTest {
     static class MethodTest {
@@ -95,8 +95,7 @@ public class InvokeSpecialMethodTest {
         String get();
     }
 
-    @DataProvider
-    public Object[][] methodProvider() {
+    public static Object[][] methodProvider() {
         return new Object[][]{
                 {MethodTest.M_PUBLIC, "test_public"},
                 {MethodTest.M_PROTECTED, "test_protected"},
@@ -104,7 +103,8 @@ public class InvokeSpecialMethodTest {
         };
     }
 
-    @Test(dataProvider = "methodProvider")
+    @ParameterizedTest
+    @MethodSource("methodProvider")
     void test(MethodHandle implMethod, String expected) throws Throwable {
         testMetafactory(implMethod, expected);
         testAltMetafactory(implMethod, expected);
@@ -117,7 +117,7 @@ public class InvokeSpecialMethodTest {
         MethodTest o = new MethodTest.SubClass();
         StringFactory factory = (StringFactory) cs.dynamicInvoker().invokeExact(o);
         String actual = factory.get();
-        Assert.assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 
     static void testAltMetafactory(MethodHandle implMethod, String expected) throws Throwable {
@@ -128,6 +128,6 @@ public class InvokeSpecialMethodTest {
         MethodTest o = new MethodTest.SubClass();
         StringFactory factory = (StringFactory) cs.dynamicInvoker().invokeExact(o);
         String actual = factory.get();
-        Assert.assertEquals(actual, expected);
+        assertEquals(expected, actual);
     }
 }
diff --git a/test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java b/test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java
index a5cf6f68c50..fc730d790ac 100644
--- a/test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java
+++ b/test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.compiler.CompilerUtils
- * @run testng/othervm InheritedProtectedMethod
+ * @run junit/othervm InheritedProtectedMethod
  * @summary Test method reference to a method inherited from its
  *          superclass in a different package.  Such method's modifier
  *          is changed from public to protected.
@@ -37,10 +37,6 @@
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.Utils;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -48,13 +44,15 @@ import java.net.URLClassLoader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class InheritedProtectedMethod {
     private static final Path SRC_DIR = Paths.get(Utils.TEST_SRC, "src");
     private static final Path CLASSES_DIR = Paths.get("classes");
 
-    @BeforeTest
+    @BeforeAll
     static void setup() throws IOException {
         assertTrue(CompilerUtils.compile(SRC_DIR, CLASSES_DIR));
 
@@ -64,13 +62,13 @@ public class InheritedProtectedMethod {
     }
 
     @Test
-    public static void run() throws Exception {
+    public void run() throws Exception {
         URLClassLoader loader = new URLClassLoader("loader", new URL[]{ CLASSES_DIR.toUri().toURL()},
                 ClassLoader.getPlatformClassLoader());
         Class<?> methodInvokeClass = Class.forName("MethodInvoker", false, loader);
         Method invokeMethod = methodInvokeClass.getMethod("invoke");
 
         String result = (String)invokeMethod.invoke(null);
-        assertEquals(result, "protected inherited method");
+        assertEquals("protected inherited method", result);
     }
 }
diff --git a/test/jdk/java/lang/invoke/lambda/superProtectedMethod/ProtectedMethodInOtherPackage.java b/test/jdk/java/lang/invoke/lambda/superProtectedMethod/ProtectedMethodInOtherPackage.java
index 666ba5c254b..980114149a8 100644
--- a/test/jdk/java/lang/invoke/lambda/superProtectedMethod/ProtectedMethodInOtherPackage.java
+++ b/test/jdk/java/lang/invoke/lambda/superProtectedMethod/ProtectedMethodInOtherPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8227415 8254975 8270056
- * @run testng/othervm p.ProtectedMethodInOtherPackage
+ * @run junit/othervm p.ProtectedMethodInOtherPackage
  * @summary method reference to a protected method inherited from its
  *          superclass in a different runtime package where
  *          lambda proxy class has no access to it.
@@ -47,12 +47,12 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Function;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ProtectedMethodInOtherPackage  {
     @Test
-    public static void remotePackageSameLoader() {
+    public void remotePackageSameLoader() {
         Sub_I sub = new Sub_I();
         sub.test(Paths.get("test"));
     }
@@ -76,14 +76,14 @@ public class ProtectedMethodInOtherPackage  {
     }
 
     @Test
-    public static void splitPackage() throws Throwable {
+    public void splitPackage() throws Throwable {
         ClassLoader parent = new Loader("loader-A", null, A.class);
         ClassLoader loader = new Loader("loader-B", parent, B.class);
         Class<?> aClass = Class.forName(A.class.getName(), false, loader);
         Class<?> bClass = Class.forName(B.class.getName(), false, loader);
-        assertTrue(aClass.getClassLoader() == parent);
-        assertTrue(bClass.getClassLoader() == loader);
-        assertEquals(aClass.getPackageName(), bClass.getPackageName());
+        assertSame(parent, aClass.getClassLoader());
+        assertSame(loader, bClass.getClassLoader());
+        assertEquals(bClass.getPackageName(), aClass.getPackageName());
 
         Object b = bClass.getDeclaredConstructor().newInstance();
 
@@ -102,14 +102,14 @@ public class ProtectedMethodInOtherPackage  {
     }
 
     @Test
-    public static void protectedStaticMethodInSplitPackage() throws Throwable {
+    public void protectedStaticMethodInSplitPackage() throws Throwable {
         ClassLoader parent = new Loader("loader-A1", null, A1.class);
         ClassLoader loader = new Loader("loader-B1", parent, B1.class);
         Class<?> aClass1 = Class.forName(A1.class.getName(), false, loader);
         Class<?> bClass1 = Class.forName(B1.class.getName(), false, loader);
-        assertTrue(aClass1.getClassLoader() == parent);
-        assertTrue(bClass1.getClassLoader() == loader);
-        assertEquals(aClass1.getPackageName(), bClass1.getPackageName());
+        assertSame(parent, aClass1.getClassLoader());
+        assertSame(loader, bClass1.getClassLoader());
+        assertEquals(bClass1.getPackageName(), aClass1.getPackageName());
 
         // verify subclass can access a static protected method inherited from
         // its superclass in a split package
diff --git a/test/jdk/java/lang/invoke/lookup/ChainedLookupTest.java b/test/jdk/java/lang/invoke/lookup/ChainedLookupTest.java
index 0e81c6a9eec..15a46e6ca2c 100644
--- a/test/jdk/java/lang/invoke/lookup/ChainedLookupTest.java
+++ b/test/jdk/java/lang/invoke/lookup/ChainedLookupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8013527
- * @run testng/othervm ChainedLookupTest
+ * @run junit/othervm ChainedLookupTest
  * @summary Test MethodHandles.lookup method to produce the Lookup object with
  *          proper lookup class if invoked through reflection and method handle.
  */
@@ -33,11 +33,11 @@ import java.lang.invoke.*;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Method;
 
-import org.testng.annotations.Test;
 
 import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ChainedLookupTest {
     /**
@@ -121,7 +121,7 @@ public class ChainedLookupTest {
     }
 
     void test(Lookup lookup, String msg) throws Throwable {
-        assertTrue(lookup.lookupClass() == ChainedLookupTest.class);
+        assertSame(ChainedLookupTest.class, lookup.lookupClass());
         assertTrue(lookup.hasFullPrivilegeAccess());
 
         MethodHandle mh = lookup.findStatic(lookup.lookupClass(), "say", methodType(void.class, String.class));
diff --git a/test/jdk/java/lang/invoke/lookup/LookupClassTest.java b/test/jdk/java/lang/invoke/lookup/LookupClassTest.java
index 205bd3d893e..5970d0331dd 100644
--- a/test/jdk/java/lang/invoke/lookup/LookupClassTest.java
+++ b/test/jdk/java/lang/invoke/lookup/LookupClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,44 +25,44 @@
  * @test
  * @bug 8173975
  * @summary Lookup::in throws IAE if the target class is a primitive class or array class
- * @run testng/othervm LookupClassTest
+ * @run junit/othervm LookupClassTest
  */
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class LookupClassTest {
     private static final LookupClassTest[] ARRAY = new LookupClassTest[0];
-    @BeforeTest
-    public void test() {
+    @BeforeAll
+    public static void test() {
         assertTrue(ARRAY.getClass().isArray());
         assertSamePackage(MethodHandles.lookup(), ARRAY.getClass());
         assertSamePackage(MethodHandles.publicLookup(), int.class);
     }
 
-    private void assertSamePackage(Lookup lookup, Class<?> targetClass) {
-        assertEquals(lookup.lookupClass().getPackageName(), targetClass.getPackageName());
+    private static void assertSamePackage(Lookup lookup, Class<?> targetClass) {
+        assertEquals(targetClass.getPackageName(), lookup.lookupClass().getPackageName());
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void arrayLookupClass() {
         Lookup lookup = MethodHandles.lookup();
-        lookup.in(ARRAY.getClass());
+        assertThrows(IllegalArgumentException.class, () -> lookup.in(ARRAY.getClass()));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void primitiveLookupClass() {
         Lookup lookup = MethodHandles.publicLookup();
-        lookup.in(int.class);
+        assertThrows(IllegalArgumentException.class, () -> lookup.in(int.class));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void voidLookupClass() {
         Lookup lookup = MethodHandles.publicLookup();
-        lookup.in(void.class);
+        assertThrows(IllegalArgumentException.class, () -> lookup.in(void.class));
     }
 }
diff --git a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
index 31ded727d66..3ff99b9dfda 100644
--- a/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
+++ b/test/jdk/java/lang/invoke/lookup/SpecialStatic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @bug 8032400
  * @summary JSR292: invokeSpecial: InternalError attempting to lookup a method
  * @compile -XDignore.symbol.file SpecialStatic.java
- * @run testng test.java.lang.invoke.lookup.SpecialStatic
+ * @run junit test.java.lang.invoke.lookup.SpecialStatic
  */
 package test.java.lang.invoke.lookup;
 
@@ -38,13 +38,13 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.AccessFlag;
 
-import org.testng.annotations.*;
 
 import static java.lang.classfile.ClassFile.ACC_PUBLIC;
 import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
 import static java.lang.constant.DirectMethodHandleDesc.Kind.SPECIAL;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case:
@@ -105,7 +105,7 @@ public class SpecialStatic {
     public void testConstant() throws Throwable {
         MethodHandle mh = (MethodHandle)t3.getDeclaredMethod("getMethodHandle").invoke(null);
         int result = (int)mh.invoke(t3.newInstance());
-        assertEquals(result, 1); // T1.m should be invoked.
+        assertEquals(1, result); // T1.m should be invoked.
     }
 
     @Test
@@ -113,7 +113,7 @@ public class SpecialStatic {
         MethodHandles.Lookup lookup = (MethodHandles.Lookup)t3.getDeclaredMethod("getLookup").invoke(null);
         MethodHandle mh = lookup.findSpecial(t1, "m", MethodType.methodType(int.class), t3);
         int result = (int)mh.invoke(t3.newInstance());
-        assertEquals(result, 1); // T1.m should be invoked.
+        assertEquals(1, result); // T1.m should be invoked.
     }
 
     public static byte[] dumpT1() {
diff --git a/test/jdk/java/lang/invoke/modules/Driver.java b/test/jdk/java/lang/invoke/modules/Driver.java
index 5c00de3ad47..11c44280309 100644
--- a/test/jdk/java/lang/invoke/modules/Driver.java
+++ b/test/jdk/java/lang/invoke/modules/Driver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @build m1/* m2/* Unnamed
- * @run testng/othervm m1/p1.Main
+ * @run junit/othervm m1/p1.Main
  * @summary Basic test case for module access checks and Lookup.in.
  */
diff --git a/test/jdk/java/lang/invoke/modules/Driver1.java b/test/jdk/java/lang/invoke/modules/Driver1.java
index 654ee04c9e0..4ef7130ff94 100644
--- a/test/jdk/java/lang/invoke/modules/Driver1.java
+++ b/test/jdk/java/lang/invoke/modules/Driver1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8173978
  * @build m3/* m4/* m5/* Unnamed Unnamed1
- * @run testng/othervm m3/jdk.test.ModuleAccessTest
+ * @run junit/othervm m3/jdk.test.ModuleAccessTest
  * @summary Basic test case for module access checks and Lookup.in and
  *          MethodHandles.privateLookupIn
  */
diff --git a/test/jdk/java/lang/invoke/modules/m1/module-info.java b/test/jdk/java/lang/invoke/modules/m1/module-info.java
index db03841b4d0..ecd133ae6a1 100644
--- a/test/jdk/java/lang/invoke/modules/m1/module-info.java
+++ b/test/jdk/java/lang/invoke/modules/m1/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,6 @@
  */
 module m1 {
     requires m2;
-    requires org.testng;
+    requires org.junit.platform.console.standalone;
     exports p1;
 }
diff --git a/test/jdk/java/lang/invoke/modules/m1/p1/Main.java b/test/jdk/java/lang/invoke/modules/m1/p1/Main.java
index 0a4d2fff1db..5a2a7c91999 100644
--- a/test/jdk/java/lang/invoke/modules/m1/p1/Main.java
+++ b/test/jdk/java/lang/invoke/modules/m1/p1/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,26 +30,24 @@ import java.lang.invoke.MethodType;
 
 import static java.lang.invoke.MethodHandles.Lookup.*;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * Basic test case for module access checks and Lookup.in.
  */
-
-@Test
 public class Main {
 
-    private Class<?> p1_Type1;        // m1, exported
-    private Class<?> p2_Type2;        // m1, not exported
-    private Class<?> q1_Type1;        // m2, exported
-    private Class<?> q2_Type2;        // m2, not exported
-    private Class<?> signalClass;     // java.base, not exported
-    private Class<?> unnamedClass;    // class in unnamed module
+    private static Class<?> p1_Type1;        // m1, exported
+    private static Class<?> p2_Type2;        // m1, not exported
+    private static Class<?> q1_Type1;        // m2, exported
+    private static Class<?> q2_Type2;        // m2, not exported
+    private static Class<?> signalClass;     // java.base, not exported
+    private static Class<?> unnamedClass;    // class in unnamed module
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         try {
             p1_Type1 = Class.forName("p1.Type1");
             p2_Type2 = Class.forName("p2.Type2");
@@ -64,15 +62,15 @@ public class Main {
         // check setup
         Module m1 = ModuleLayer.boot().findModule("m1").orElse(null);
         assertNotNull(m1);
-        assertTrue(p1_Type1.getModule() == m1);
-        assertTrue(p2_Type2.getModule() == m1);
+        assertSame(m1, p1_Type1.getModule());
+        assertSame(m1, p2_Type2.getModule());
         assertTrue(m1.isExported("p1"));
         assertFalse(m1.isExported("p2"));
 
         Module m2 = ModuleLayer.boot().findModule("m2").orElse(null);
         assertNotNull(m2);
-        assertTrue(q1_Type1.getModule() == m2);
-        assertTrue(q2_Type2.getModule() == m2);
+        assertSame(m2, q1_Type1.getModule());
+        assertSame(m2, q2_Type2.getModule());
         assertTrue(m2.isExported("q1"));
         assertFalse(m2.isExported("q2"));
 
@@ -91,9 +89,10 @@ public class Main {
      * [A2] can access public types in packages exported by modules that m1 reads
      * [A3] cannot access public types in non-exported modules of modules that m1 reads
      */
+    @Test
     public void testLookup() throws Exception {
         Lookup lookup = MethodHandles.lookup();
-        assertTrue((lookup.lookupModes() & MODULE) == MODULE); // [A0]
+        assertEquals(MODULE, lookup.lookupModes() & MODULE); // [A0]
 
         // m1
         findConstructor(lookup, p1_Type1, void.class); // [A1]
@@ -116,9 +115,10 @@ public class Main {
      *
      * [A0] module and public access is not lost
      */
+    @Test
     public void testToSameModule() throws Exception {
         Lookup lookup = MethodHandles.lookup().in(p2_Type2);
-        assertTrue(lookup.lookupModes() == (MODULE|PUBLIC)); // [A0]
+        assertEquals(MODULE | PUBLIC, lookup.lookupModes()); // [A0]
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);
@@ -142,15 +142,16 @@ public class Main {
      * [A0] has PUBLIC access if accessible; otherwise no access
      * [A1] old lookup class becomes previous lookup class
      */
+    @Test
     public void testFromNamedToNamedModule() throws Exception {
         // m2/q1_Type1 is accessible to m1 whereas m2/q_Type2 is not accessible
         Lookup lookup = MethodHandles.lookup().in(q1_Type1);
-        assertTrue(lookup.lookupModes() == PUBLIC); // [A0]
-        assertTrue(lookup.previousLookupClass() == Main.class); // [A1]
+        assertEquals(PUBLIC, lookup.lookupModes()); // [A0]
+        assertSame(Main.class, lookup.previousLookupClass()); // [A1]
 
         Lookup lookup2 = MethodHandles.lookup().in(q2_Type2);
-        assertTrue(lookup2.lookupModes() == 0);      // [A0]
-        assertTrue(lookup2.previousLookupClass() == Main.class); // [A1]
+        assertEquals(0, lookup2.lookupModes());      // [A0]
+        assertSame(Main.class, lookup2.previousLookupClass()); // [A1]
 
         // m1
         findConstructorExpectingIAE(lookup, p1_Type1, void.class);
@@ -185,9 +186,10 @@ public class Main {
      *
      * [A0] has PUBLIC access
      */
+    @Test
     public void testFromNamedToUnnamedModule() throws Exception {
         Lookup lookup = MethodHandles.lookup().in(unnamedClass);
-        assertTrue(lookup.lookupModes() == PUBLIC); // [A0]
+        assertEquals(PUBLIC, lookup.lookupModes()); // [A0]
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);      // p1 is exported
@@ -210,10 +212,11 @@ public class Main {
      *
      * [A0] retains PUBLIC access
      */
+    @Test
     public void testFromUnnamedToNamedModule() throws Exception {
         Lookup lookup = MethodHandles.lookup();
         lookup = MethodHandles.privateLookupIn(unnamedClass, lookup).in(p1_Type1);
-        assertTrue(lookup.lookupModes() == PUBLIC); // A0
+        assertEquals(PUBLIC, lookup.lookupModes()); // A0
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);
@@ -236,9 +239,10 @@ public class Main {
      *
      * [A0] has UNCONDITIONAL access
      */
+    @Test
     public void testPublicLookup() throws Exception {
         Lookup lookup = MethodHandles.publicLookup();
-        assertTrue(lookup.lookupModes() == UNCONDITIONAL); // A0
+        assertEquals(UNCONDITIONAL, lookup.lookupModes()); // A0
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);
@@ -261,9 +265,10 @@ public class Main {
      *
      * [A0] has UNCONDITIONAL access
      */
+    @Test
     public void testPublicLookupToBaseModule() throws Exception {
         Lookup lookup = MethodHandles.publicLookup().in(String.class);
-        assertTrue(lookup.lookupModes() == UNCONDITIONAL); // A0
+        assertEquals(UNCONDITIONAL, lookup.lookupModes()); // A0
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);
@@ -287,9 +292,10 @@ public class Main {
      *
      * [A0] has UNCONDITIONAL access
      */
+    @Test
     public void testPublicLookupToAccessibleTypeInNamedModule() throws Exception {
         Lookup lookup = MethodHandles.publicLookup().in(p1_Type1);
-        assertTrue(lookup.lookupModes() == UNCONDITIONAL); // A0
+        assertEquals(UNCONDITIONAL, lookup.lookupModes()); // A0
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);
@@ -312,9 +318,10 @@ public class Main {
      *
      * [A0] has no access
      */
+    @Test
     public void testPublicLookupToInaccessibleTypeInNamedModule() throws Exception {
         Lookup lookup = MethodHandles.publicLookup().in(p2_Type2);
-        assertTrue(lookup.lookupModes() == 0); // A0
+        assertEquals(0, lookup.lookupModes()); // A0
 
         // m1
         findConstructorExpectingIAE(lookup, p1_Type1, void.class);
@@ -337,9 +344,10 @@ public class Main {
      *
      * [A0] has UNCONDITIONAL access
      */
+    @Test
     public void testPublicLookupToUnnamedModule() throws Exception {
         Lookup lookup = MethodHandles.publicLookup().in(unnamedClass);
-        assertTrue(lookup.lookupModes() == UNCONDITIONAL); // A0
+        assertEquals(UNCONDITIONAL, lookup.lookupModes()); // A0
 
         // m1
         findConstructor(lookup, p1_Type1, void.class);
@@ -366,10 +374,7 @@ public class Main {
                                             Class<?> clazz,
                                             Class<?> rtype,
                                             Class<?>... ptypes) throws Exception {
-        try {
-            findConstructor(lookup, clazz, rtype, ptypes);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> findConstructor(lookup, clazz, rtype, ptypes));
     }
 
     /**
diff --git a/test/jdk/java/lang/invoke/modules/m3/jdk/test/ModuleAccessTest.java b/test/jdk/java/lang/invoke/modules/m3/jdk/test/ModuleAccessTest.java
index 6a1e8efe103..235c712926d 100644
--- a/test/jdk/java/lang/invoke/modules/m3/jdk/test/ModuleAccessTest.java
+++ b/test/jdk/java/lang/invoke/modules/m3/jdk/test/ModuleAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,15 +23,12 @@
 
 package jdk.test;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 
 import java.lang.invoke.MethodType;
+import java.lang.management.ThreadMXBean;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -42,7 +39,11 @@ import java.util.stream.Stream;
 import e1.CrackM5Access;
 
 import static java.lang.invoke.MethodHandles.Lookup.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ModuleAccessTest {
     static ModuleLookup m3;
@@ -55,8 +56,8 @@ public class ModuleAccessTest {
     static Class<?> unnamed;
     static Class<?> unnamed1;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         m3 = new ModuleLookup("m3", 'C');
         m4 = new ModuleLookup("m4", 'D');
         m5 = new ModuleLookup("m5", 'E');
@@ -76,8 +77,7 @@ public class ModuleAccessTest {
         CrackM5Access.addReads(unnamed.getModule());
     }
 
-    @DataProvider(name = "samePackage")
-    public Object[][] samePackage() throws Exception {
+    public static Object[][] samePackage() throws Exception {
         return new Object[][] {
             { m3.lookup,     m3.type2 },
             { privLookupIn,  m3.type1 },
@@ -93,7 +93,8 @@ public class ModuleAccessTest {
      * [A1] no change in previous lookup class
      * [A2] PROTECTED, PRIVATE and ORIGINAL are dropped
      */
-    @Test(dataProvider = "samePackage")
+    @ParameterizedTest
+    @MethodSource("samePackage")
     public void testLookupInSamePackage(Lookup lookup, Class<?> targetClass) throws Exception {
         Class<?> lookupClass = lookup.lookupClass();
         Lookup lookup2 = lookup.in(targetClass);
@@ -105,8 +106,7 @@ public class ModuleAccessTest {
         assertTrue(lookup2.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE|ORIGINAL)));  // [A2]
     }
 
-    @DataProvider(name = "sameModule")
-    public Object[][] sameModule() throws Exception {
+    public static Object[][] sameModule() throws Exception {
         return new Object[][] {
             { m3.lookup,     m3.type3},
             { privLookupIn,  m3.type3},
@@ -121,20 +121,20 @@ public class ModuleAccessTest {
      * [A1] no change in previous lookup class
      * [A2] PROTECTED, PRIVATE, PACKAGE and ORIGINAL are dropped
      */
-    @Test(dataProvider = "sameModule")
+    @ParameterizedTest
+    @MethodSource("sameModule")
     public void testLookupInSameModule(Lookup lookup, Class<?> targetClass) throws Exception {
         Class<?> lookupClass = lookup.lookupClass();
         Lookup lookup2 = lookup.in(targetClass);
 
-        assertTrue(lookupClass.getPackage() != targetClass.getPackage());
-        assertTrue(lookupClass.getModule() == targetClass.getModule());
-        assertTrue(lookup2.lookupClass() == targetClass);   // [A0]
-        assertTrue(lookup2.previousLookupClass() == lookup.previousLookupClass());  // [A1]
-        assertTrue(lookup2.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE|PACKAGE|ORIGINAL))); // [A2]
+        assertNotSame(targetClass.getPackage(), lookupClass.getPackage());
+        assertSame(targetClass.getModule(), lookupClass.getModule());
+        assertSame(targetClass, lookup2.lookupClass());   // [A0]
+        assertSame(lookup.previousLookupClass(), lookup2.previousLookupClass());  // [A1]
+        assertEquals(lookup.lookupModes() & ~(PROTECTED | PRIVATE | PACKAGE | ORIGINAL), lookup2.lookupModes()); // [A2]
     }
 
-    @DataProvider(name = "anotherModule")
-    public Object[][] anotherModule() throws Exception {
+    public static Object[][] anotherModule() throws Exception {
         return new Object[][] {
             { m3.lookup, m4.type1, m5, m5.accessibleTypesTo(m3.module, m4.module) },
             { m4.lookup, m5.type2, m3, m3.accessibleTypesTo(m4.module, m5.module) },
@@ -154,21 +154,22 @@ public class ModuleAccessTest {
      * [A5] can access public types in m1 exported to m0
      * [A6] can access public types in m2 exported to m0 and m1
      */
-    @Test(dataProvider = "anotherModule")
+    @ParameterizedTest
+    @MethodSource("anotherModule")
     public void testLookupInAnotherModule(Lookup lookup, Class<?> targetClass,
                                           ModuleLookup m2, Set<Class<?>> otherTypes) throws Exception {
         Class<?> lookupClass = lookup.lookupClass();
         Module m0 = lookupClass.getModule();
         Module m1 = targetClass.getModule();
 
-        assertTrue(m0 != m1);
+        assertNotSame(m1, m0);
         assertTrue(m0.canRead(m1));
         assertTrue(m1.isExported(targetClass.getPackageName(), m0));
 
         Lookup lookup2 = lookup.in(targetClass);
-        assertTrue(lookup2.lookupClass() == targetClass);   // [A0]
-        assertTrue(lookup2.previousLookupClass() == lookup.lookupClass());  // [A1]
-        assertTrue(lookup2.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE|PACKAGE|MODULE|ORIGINAL)));  // [A2]
+        assertSame(targetClass, lookup2.lookupClass());   // [A0]
+        assertSame(lookup.lookupClass(), lookup2.previousLookupClass());  // [A1]
+        assertEquals(lookup.lookupModes() & ~(PROTECTED | PRIVATE | PACKAGE | MODULE | ORIGINAL), lookup2.lookupModes());  // [A2]
 
         // [A3] no access to module internal type in m0
         // [A4] if m1 reads m0,
@@ -207,7 +208,7 @@ public class ModuleAccessTest {
         // [A5] can access public types exported from m2 unconditionally
         // [A5] can access public types exported from m2 to m0 and m1
         for (Class<?> type : otherTypes) {
-            assertTrue(type.getModule() == m2.module);
+            assertSame(m2.module, type.getModule());
             testAccess(lookup2, type);
         }
 
@@ -215,10 +216,7 @@ public class ModuleAccessTest {
         for (Class<?> type : Set.of(m2.type1, m2.type2, m2.type3)) {
             if (!otherTypes.contains(type)) {
                 // type is accessible to this lookup
-                try {
-                    lookup2.accessClass(type);
-                    assertTrue(false);
-                } catch (IllegalAccessException e) {}
+                assertThrows(IllegalAccessException.class, () -> lookup2.accessClass(type));
 
                 findConstructorExpectingIAE(lookup2, type, void.class);
             }
@@ -227,7 +225,7 @@ public class ModuleAccessTest {
 
     public void testAccess(Lookup lookup, Class<?> type) throws Exception {
         // type is accessible to this lookup
-        assertTrue(lookup.accessClass(type) == type);
+        assertSame(type, lookup.accessClass(type));
 
         // can find constructor
         findConstructor(lookup, type, void.class);
@@ -237,28 +235,27 @@ public class ModuleAccessTest {
         Module m2 = type.getModule();
 
         assertTrue(m0 != m1 && m0 != null);
-        assertTrue((lookup.lookupModes() & MODULE) == 0);
+        assertEquals(0, lookup.lookupModes() & MODULE);
         assertTrue(m0 != m2 || m1 != m2);
 
         MethodHandles.Lookup lookup2 = lookup.in(type);
         if (m2 == m1) {
             // the same module of the lookup class
-            assertTrue(lookup2.lookupClass() == type);
-            assertTrue(lookup2.previousLookupClass() == lookup.previousLookupClass());
+            assertSame(type, lookup2.lookupClass());
+            assertSame(lookup.previousLookupClass(), lookup2.previousLookupClass());
         } else if (m2 == m0) {
             // hop back to the module of the previous lookup class
-            assertTrue(lookup2.lookupClass() == type);
-            assertTrue(lookup2.previousLookupClass() == lookup.lookupClass());
+            assertSame(type, lookup2.lookupClass());
+            assertSame(lookup.lookupClass(), lookup2.previousLookupClass());
         } else {
             // hop to a third module
-            assertTrue(lookup2.lookupClass() == type);
-            assertTrue(lookup2.previousLookupClass() == lookup.lookupClass());
-            assertTrue(lookup2.lookupModes() == 0);
+            assertSame(type, lookup2.lookupClass());
+            assertSame(lookup.lookupClass(), lookup2.previousLookupClass());
+            assertEquals(0, lookup2.lookupModes());
         }
     }
 
-    @DataProvider(name = "thirdModule")
-    public Object[][] thirdModule() throws Exception {
+    public static Object[][] thirdModule() throws Exception {
         return new Object[][] {
             { m3.lookup, m4.type1, m5.type1},
             { m3.lookup, m4.type2, m5.type1},
@@ -273,7 +270,8 @@ public class ModuleAccessTest {
      * [A1] c1 becomes previous lookup class
      * [A2] all access bits are dropped
      */
-    @Test(dataProvider = "thirdModule")
+    @ParameterizedTest
+    @MethodSource("thirdModule")
     public void testLookupInThirdModule(Lookup lookup, Class<?> c1, Class<?> c2) throws Exception {
         Class<?> c0 = lookup.lookupClass();
         Module m0 = c0.getModule();
@@ -287,18 +285,17 @@ public class ModuleAccessTest {
         assertTrue(m2.isExported(c2.getPackageName(), m0) && m2.isExported(c2.getPackageName(), m1));
 
         Lookup lookup1 = lookup.in(c1);
-        assertTrue(lookup1.lookupClass() == c1);
-        assertTrue(lookup1.previousLookupClass() == c0);
-        assertTrue(lookup1.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE|PACKAGE|MODULE|ORIGINAL)));
+        assertSame(c1, lookup1.lookupClass());
+        assertSame(c0, lookup1.previousLookupClass());
+        assertEquals(lookup.lookupModes() & ~(PROTECTED | PRIVATE | PACKAGE | MODULE | ORIGINAL), lookup1.lookupModes());
 
         Lookup lookup2 = lookup1.in(c2);
-        assertTrue(lookup2.lookupClass() == c2);                    // [A0]
-        assertTrue(lookup2.previousLookupClass() == c1);            // [A1]
-        assertTrue(lookup2.lookupModes() == 0, lookup2.toString()); // [A2]
+        assertSame(c2, lookup2.lookupClass());                    // [A0]
+        assertSame(c1, lookup2.previousLookupClass());            // [A1]
+        assertEquals(0, lookup2.lookupModes(), lookup2.toString()); // [A2]
     }
 
-    @DataProvider(name = "privLookupIn")
-    public Object[][] privLookupIn() throws Exception {
+    public static Object[][] privLookupIn() throws Exception {
         return new Object[][] {
             { m3.lookup,  m4.type1 },
             { m3.lookup,  m5.type1 },
@@ -316,24 +313,22 @@ public class ModuleAccessTest {
      * [A2] the lookup class becomes previous lookup class
      * [A3] IAE thrown if lookup has no MODULE access
      */
-    @Test(dataProvider = "privLookupIn")
+    @ParameterizedTest
+    @MethodSource("privLookupIn")
     public void testPrivateLookupIn(Lookup lookup, Class<?> targetClass) throws Exception {
         Module m0 = lookup.lookupClass().getModule();
         Module m1 = targetClass.getModule();
 
         // privateLookupIn from m0 to m1
-        assertTrue(m0 != m1);
+        assertNotSame(m1, m0);
         assertTrue(m1.isOpen(targetClass.getPackageName(), m0));
         Lookup privLookup1 = MethodHandles.privateLookupIn(targetClass, lookup);
-        assertTrue(privLookup1.lookupModes() == (PROTECTED|PRIVATE|PACKAGE|PUBLIC));  // [A0]
-        assertTrue(privLookup1.lookupClass() == targetClass);                    // [A1]
-        assertTrue(privLookup1.previousLookupClass() == lookup.lookupClass());   // [A2]
+        assertEquals(PROTECTED | PRIVATE | PACKAGE | PUBLIC, privLookup1.lookupModes());  // [A0]
+        assertSame(targetClass, privLookup1.lookupClass());                    // [A1]
+        assertSame(lookup.lookupClass(), privLookup1.previousLookupClass());   // [A2]
 
         // privLookup1 has no MODULE access; can't do privateLookupIn
-        try {
-            Lookup privLookup2 = MethodHandles.privateLookupIn(targetClass, privLookup1); // [A3]
-            assertFalse(privLookup2 != null);
-        } catch (IllegalAccessException e) {}
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.privateLookupIn(targetClass, privLookup1)); // [A3]
     }
 
     /**
@@ -343,9 +338,9 @@ public class ModuleAccessTest {
     public void testPrivateLookupAccess() throws Exception {
         Class<?> staticsClass = e1.Statics.class;
         Lookup privLookup1 = MethodHandles.privateLookupIn(staticsClass, m4.lookup);
-        assertTrue((privLookup1.lookupModes() & MODULE) == 0);
-        assertTrue(privLookup1.lookupClass() == staticsClass);
-        assertTrue(privLookup1.previousLookupClass() == m4.lookup.lookupClass());
+        assertEquals(0, (privLookup1.lookupModes() & MODULE));
+        assertSame(staticsClass, privLookup1.lookupClass());
+        assertSame(m4.lookup.lookupClass(), privLookup1.previousLookupClass());
 
         // access private member and default package member in m5
         MethodType mtype = MethodType.methodType(void.class);
@@ -365,12 +360,9 @@ public class ModuleAccessTest {
         // lose private access
         Lookup privLookup2 = MethodHandles.privateLookupIn(m5.type1, m4.lookup);
         Lookup lookup = privLookup2.in(staticsClass);
-        assertTrue((lookup.lookupModes() & PRIVATE) == 0);
+        assertEquals(0, lookup.lookupModes() & PRIVATE);
         MethodHandle mh3 = lookup.findStatic(staticsClass, "packageMethod", mtype);
-        try {
-            lookup.findStatic(staticsClass, "privateMethod", mtype);
-            assertTrue(false);
-        } catch (IllegalAccessException e) {}
+        assertThrows(IllegalAccessException.class, () -> lookup.findStatic(staticsClass, "privateMethod", mtype));
     }
 
     /**
@@ -380,16 +372,16 @@ public class ModuleAccessTest {
     @Test
     public void testDropLookupMode() throws Exception {
         Lookup lookup = MethodHandles.privateLookupIn(m5.type1, m4.lookup);
-        assertTrue((lookup.lookupModes() & MODULE) == 0);
+        assertEquals(0, lookup.lookupModes() & MODULE);
 
         Lookup lookup1 = lookup.dropLookupMode(PRIVATE);
-        assertTrue(lookup1.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE)));
+        assertEquals(lookup1.lookupModes(), lookup.lookupModes() & ~(PROTECTED | PRIVATE));
         Lookup lookup2 = lookup.dropLookupMode(PACKAGE);
-        assertTrue(lookup2.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE|PACKAGE)));
+        assertEquals(lookup2.lookupModes(), lookup.lookupModes() & ~(PROTECTED | PRIVATE | PACKAGE));
         Lookup lookup3 = lookup.dropLookupMode(MODULE);
-        assertTrue(lookup3.lookupModes() == (lookup.lookupModes() & ~(PROTECTED|PRIVATE|PACKAGE)));
+        assertEquals(lookup3.lookupModes(), lookup.lookupModes() & ~(PROTECTED | PRIVATE | PACKAGE));
         Lookup lookup4 = lookup.dropLookupMode(PUBLIC);
-        assertTrue(lookup4.lookupModes() == 0);
+        assertEquals(0, lookup4.lookupModes());
 
     }
 
@@ -406,11 +398,8 @@ public class ModuleAccessTest {
 
         // drop MODULE access i.e. only PUBLIC access
         Lookup lookup = privLookup.dropLookupMode(MODULE);
-        assertTrue(lookup.lookupModes() == PUBLIC);
-        try {
-            MethodHandle mh2 = lookup.findStatic(nonPUblicType, "publicStatic", mtype);
-            assertFalse(mh2 != null);
-        } catch (IllegalAccessException e) {}
+        assertEquals(PUBLIC, lookup.lookupModes());
+        assertThrows(IllegalAccessException.class, () -> lookup.findStatic(nonPUblicType, "publicStatic", mtype));
     }
 
     @Test
@@ -421,21 +410,18 @@ public class ModuleAccessTest {
         Lookup pub3 = pub2.in(java.lang.management.ThreadMXBean.class);
         Lookup pub4 = pub3.dropLookupMode(UNCONDITIONAL);
 
-        assertTrue(publicLookup.lookupClass() == Object.class);
-        assertTrue(publicLookup.lookupModes() == UNCONDITIONAL);
-        assertTrue(pub1.lookupClass() == m3.type1);
-        assertTrue(pub1.lookupModes() == UNCONDITIONAL);
-        assertTrue(pub2.lookupClass() == String.class);
-        assertTrue(pub2.lookupModes() == UNCONDITIONAL);
-        assertTrue(pub3.lookupClass() == java.lang.management.ThreadMXBean.class);
-        assertTrue(pub3.lookupModes() == UNCONDITIONAL);
-        assertTrue(pub4.lookupModes() == 0);
+        assertSame(Object.class, publicLookup.lookupClass());
+        assertEquals(UNCONDITIONAL, publicLookup.lookupModes());
+        assertSame(m3.type1, pub1.lookupClass());
+        assertEquals(UNCONDITIONAL, pub1.lookupModes());
+        assertSame(String.class, pub2.lookupClass());
+        assertEquals(UNCONDITIONAL, pub2.lookupModes());
+        assertSame(ThreadMXBean.class, pub3.lookupClass());
+        assertEquals(UNCONDITIONAL, pub3.lookupModes());
+        assertEquals(0, pub4.lookupModes());
 
         // publicLookup has no MODULE access; can't do privateLookupIn
-        try {
-            Lookup pub5 = MethodHandles.privateLookupIn(m4.type1, pub1);
-            assertFalse(pub5 != null);
-        } catch (IllegalAccessException e) {}
+        assertThrows(IllegalAccessException.class, () -> MethodHandles.privateLookupIn(m4.type1, pub1));
     }
 
     static class ModuleLookup {
@@ -548,10 +534,7 @@ public class ModuleAccessTest {
                                             Class<?> clazz,
                                             Class<?> rtype,
                                             Class<?>... ptypes) throws Exception {
-        try {
-            MethodHandle mh = findConstructor(lookup, clazz, rtype, ptypes);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> findConstructor(lookup, clazz, rtype, ptypes));
     }
 
     /**
diff --git a/test/jdk/java/lang/invoke/modules/m3/module-info.java b/test/jdk/java/lang/invoke/modules/m3/module-info.java
index 1f47c42c196..c9d8fab20a5 100644
--- a/test/jdk/java/lang/invoke/modules/m3/module-info.java
+++ b/test/jdk/java/lang/invoke/modules/m3/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 module m3 {
     requires m4;
     requires m5;
-    requires org.testng;
+    requires org.junit.platform.console.standalone;
     requires java.management;
     exports c1;
     opens c2 to m5;
diff --git a/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.java b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.java
index de1b22c4075..b093f086ba4 100644
--- a/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.java
+++ b/test/jdk/java/lang/management/MemoryMXBean/LowMemoryTest2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,18 +35,14 @@
  * @test
  * @bug     4982128
  * @summary Test low memory detection of non-heap memory pool
- *
- * @run main/othervm/timeout=600 -Xnoclassgc -XX:MaxMetaspaceSize=32m
- * LowMemoryTest2
- */
-
-/*
- * @test
- * @bug     4982128
- * @summary Test low memory detection of non-heap memory pool
- *
- * @run main/othervm/timeout=600 -Xnoclassgc -XX:MaxMetaspaceSize=16m
- * -XX:CompressedClassSpaceSize=4m LowMemoryTest2
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm/timeout=600 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ *                               -Xnoclassgc -XX:MaxMetaspaceSize=32m LowMemoryTest2
+ * @run main/othervm/timeout=600 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ *                               -Xnoclassgc -XX:MaxMetaspaceSize=16m
+ *                               -XX:CompressedClassSpaceSize=4m LowMemoryTest2
  */
 
 import java.lang.management.*;
@@ -54,6 +50,8 @@ import javax.management.*;
 import javax.management.openmbean.CompositeData;
 import java.util.*;
 
+import jdk.test.whitebox.WhiteBox;
+
 public class LowMemoryTest2 {
 
     private static volatile boolean listenerInvoked = false;
@@ -177,7 +175,7 @@ public class LowMemoryTest2 {
                         // If we don't force a GC we may get an
                         // OutOfMemoryException before the counters are updated.
                         System.out.println("Force GC");
-                        System.gc();
+                        WhiteBox.getWhiteBox().fullGC();
                     }
                     isThresholdCountSet = isAnyThresholdCountSet(pools);
                 }
diff --git a/test/jdk/java/lang/management/RuntimeMXBean/InputArgument.java b/test/jdk/java/lang/management/RuntimeMXBean/InputArgument.java
index 66c3d3f41f5..0e7609b86ed 100644
--- a/test/jdk/java/lang/management/RuntimeMXBean/InputArgument.java
+++ b/test/jdk/java/lang/management/RuntimeMXBean/InputArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,41 +62,60 @@
  * @run main/othervm -Dprops=something InputArgument -Dprops=something
  */
 
+/*
+ * @test
+ * @bug     8378110
+ * @summary RuntimeMXBean.getInputArguments() handling of flags from settings file.
+ *
+ * @run driver InputArgument generateFlagsFile
+ * @run main/othervm -XX:+UseFastJNIAccessors -XX:Flags=InputArgument.flags InputArgument
+ * -XX:+UseFastJNIAccessors -XX:-UseG1GC -XX:+UseParallelGC -XX:MaxHeapSize=100M
+ */
+
 import java.lang.management.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.ListIterator;
 
 public class InputArgument {
     private static RuntimeMXBean rm = ManagementFactory.getRuntimeMXBean();
-    private static String vmOption = null;
 
     public static void main(String args[]) throws Exception {
-        // set the expected input argument
-        if (args.length > 0) {
-            vmOption = args[0];
-        }
-
-        List<String> options = rm.getInputArguments();
-        if (vmOption == null) {
+        if (args.length == 1 && "generateFlagsFile".equals(args[0])) {
+            generateFlagsFile();
             return;
         }
 
-        boolean testFailed = true;
+        String[] vmOptions = args;
+        List<String> options = rm.getInputArguments();
         System.out.println("Number of arguments = " + options.size());
         int i = 0;
         for (String arg : options) {
             System.out.println("Input arg " + i + " = " + arg);
             i++;
-            if (arg.equals(vmOption)) {
-                testFailed = false;
-                break;
-            }
         }
-        if (testFailed) {
-            throw new RuntimeException("TEST FAILED: " +
-                "VM option " + vmOption + " not found");
+
+        for (String expected : vmOptions) {
+            boolean found = false;
+            for (String arg : options) {
+                if (arg.equals(expected)) {
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                throw new RuntimeException("TEST FAILED: " +
+                    "VM option " + expected + " not found");
+            }
         }
 
         System.out.println("Test passed.");
     }
+
+    private static void generateFlagsFile() throws Exception {
+        // 3 types of flag; both boolean cases and 1 numeric
+        Files.writeString(Paths.get("", "InputArgument.flags"),
+            String.format("-UseG1GC%n+UseParallelGC%nMaxHeapSize=100M%n"));
+    }
 }
diff --git a/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
index 61e5914798e..6217a4a8954 100644
--- a/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
+++ b/test/jdk/java/lang/module/ModuleReader/ModuleReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  * @build ModuleReaderTest
  *        jdk.test.lib.compiler.CompilerUtils
  *        jdk.test.lib.util.JarUtils
- * @run testng ModuleReaderTest
+ * @run junit ModuleReaderTest
  * @summary Basic tests for java.lang.module.ModuleReader
  */
 
@@ -48,22 +48,24 @@ import java.nio.ByteBuffer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.spi.ToolProvider;
 import java.util.stream.Stream;
 
 import jdk.internal.module.ModulePath;
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.util.JarUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ModuleReaderTest {
     private static final String TEST_SRC = System.getProperty("test.src");
@@ -150,8 +152,8 @@ public class ModuleReaderTest {
         "p\\Main.class"
     };
 
-    @BeforeTest
-    public void compileTestModule() throws Exception {
+    @BeforeAll
+    public static void compileTestModule() throws Exception {
         // javac -d mods/$TESTMODULE src/$TESTMODULE/**
         boolean compiled = CompilerUtils.compile(SRC_DIR.resolve(TEST_MODULE),
                                                  MODS_DIR.resolve(TEST_MODULE));
@@ -187,51 +189,29 @@ public class ModuleReaderTest {
                 Optional<URI> ouri = reader.find(name);
                 ouri.ifPresent(uri -> {
                     if (name.endsWith("/"))
-                        assertTrue(uri.toString().endsWith("/"));
+                        assertTrue(uri.toString().endsWith("/"),
+                                "mismatched directory URI for '" + name + "': " + uri);
                 });
             }
 
             // test "not found" in java.base module
             for (String name : NOT_BASE_RESOURCES) {
-                assertFalse(reader.find(name).isPresent());
-                assertFalse(reader.open(name).isPresent());
-                assertFalse(reader.read(name).isPresent());
+                assertFalse(reader.find(name).isPresent(), "Unexpected resource found: " + name);
+                assertFalse(reader.open(name).isPresent(), "Unexpected resource opened: " + name);
+                assertFalse(reader.read(name).isPresent(), "Unexpected resource read: " + name);
             }
 
             // test nulls
-            try {
-                reader.find(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
-            try {
-                reader.open(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
-            try {
-                reader.read(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
-            try {
-                reader.release(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
+            assertThrows(NullPointerException.class, () -> reader.find(null));
+            assertThrows(NullPointerException.class, () -> reader.open(null));
+            assertThrows(NullPointerException.class, () -> reader.read(null));
+            assertThrows(NullPointerException.class, () -> reader.release(null));
         }
 
         // test closed ModuleReader
-        try {
-            reader.open(BASE_RESOURCES[0]);
-            assertTrue(false);
-        } catch (IOException expected) { }
-
-
-        try {
-            reader.read(BASE_RESOURCES[0]);
-            assertTrue(false);
-        } catch (IOException expected) { }
+        assertThrows(IOException.class, () -> reader.open(BASE_RESOURCES[0]));
+        assertThrows(IOException.class, () -> reader.read(BASE_RESOURCES[0]));
+        assertThrows(IOException.class, reader::list);
     }
 
     /**
@@ -268,10 +248,10 @@ public class ModuleReaderTest {
         String jmod = dir.resolve("m.jmod").toString();
         String[] args = { "create", "--class-path", cp, jmod };
         ToolProvider jmodTool = ToolProvider.findFirst("jmod")
-            .orElseThrow(() ->
-                new RuntimeException("jmod tool not found")
-            );
-        assertEquals(jmodTool.run(System.out, System.out, args), 0);
+                .orElseThrow(() ->
+                        new RuntimeException("jmod tool not found")
+                );
+        assertEquals(0, jmodTool.run(System.out, System.out, args), "jmod tool failed");
 
         test(dir);
     }
@@ -307,57 +287,30 @@ public class ModuleReaderTest {
                 Optional<URI> ouri = reader.find(name);
                 ouri.ifPresent(uri -> {
                     if (name.endsWith("/"))
-                        assertTrue(uri.toString().endsWith("/"));
+                        assertTrue(uri.toString().endsWith("/"),
+                                "mismatched directory URI for '" + name + "': " + uri);
                 });
             }
 
             // test "not found" in test module
             for (String name : NOT_TEST_RESOURCES) {
                 System.out.println("resource: " + name);
-                assertFalse(reader.find(name).isPresent());
-                assertFalse(reader.open(name).isPresent());
-                assertFalse(reader.read(name).isPresent());
+                assertFalse(reader.find(name).isPresent(), "Unexpected resource found: " + name);
+                assertFalse(reader.open(name).isPresent(), "Unexpected resource open: " + name);
+                assertFalse(reader.read(name).isPresent(), "Unexpected resource read: " + name);
             }
 
             // test nulls
-            try {
-                reader.find(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
-            try {
-                reader.open(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
-            try {
-                reader.read(null);
-                assertTrue(false);
-            } catch (NullPointerException expected) { }
-
-            try {
-                reader.release(null);
-                throw new RuntimeException();
-            } catch (NullPointerException expected) { }
-
+            assertThrows(NullPointerException.class, () -> reader.find(null));
+            assertThrows(NullPointerException.class, () -> reader.open(null));
+            assertThrows(NullPointerException.class, () -> reader.read(null));
+            assertThrows(NullPointerException.class, () -> reader.release(null));
         }
 
         // test closed ModuleReader
-        try {
-            reader.open(TEST_RESOURCES[0]);
-            assertTrue(false);
-        } catch (IOException expected) { }
-
-
-        try {
-            reader.read(TEST_RESOURCES[0]);
-            assertTrue(false);
-        } catch (IOException expected) { }
-
-        try {
-            reader.list();
-            assertTrue(false);
-        } catch (IOException expected) { }
+        assertThrows(IOException.class, () -> reader.open(BASE_RESOURCES[0]));
+        assertThrows(IOException.class, () -> reader.read(BASE_RESOURCES[0]));
+        assertThrows(IOException.class, reader::list);
     }
 
     /**
@@ -367,7 +320,7 @@ public class ModuleReaderTest {
         throws IOException
     {
         Optional<URI> ouri = reader.find(name);
-        assertTrue(ouri.isPresent());
+        assertTrue(ouri.isPresent(), "missing URI for: " + name);
 
         URL url = ouri.get().toURL();
         if (!url.getProtocol().equalsIgnoreCase("jmod")) {
@@ -375,7 +328,7 @@ public class ModuleReaderTest {
             uc.setUseCaches(false);
             try (InputStream in = uc.getInputStream()) {
                 byte[] bytes = in.readAllBytes();
-                assertTrue(Arrays.equals(bytes, expectedBytes));
+                assertArrayEquals(expectedBytes, bytes, "resource bytes differ for: " + name);
             }
         }
     }
@@ -387,12 +340,10 @@ public class ModuleReaderTest {
         throws IOException
     {
         Optional<InputStream> oin = reader.open(name);
-        assertTrue(oin.isPresent());
-
-        InputStream in = oin.get();
-        try (in) {
+        assertTrue(oin.isPresent(), "missing input stream for: " + name);
+        try (InputStream in = oin.get()) {
             byte[] bytes = in.readAllBytes();
-            assertTrue(Arrays.equals(bytes, expectedBytes));
+            assertArrayEquals(expectedBytes, bytes, "resource bytes differ for: " + name);
         }
     }
 
@@ -408,10 +359,10 @@ public class ModuleReaderTest {
         ByteBuffer bb = obb.get();
         try {
             int rem = bb.remaining();
-            assertTrue(rem == expectedBytes.length);
+            assertEquals(expectedBytes.length, rem, "resource lengths differ: " + name);
             byte[] bytes = new byte[rem];
             bb.get(bytes);
-            assertTrue(Arrays.equals(bytes, expectedBytes));
+            assertArrayEquals(expectedBytes, bytes, "resource bytes differ: " + name);
         } finally {
             reader.release(bb);
         }
@@ -426,14 +377,14 @@ public class ModuleReaderTest {
             list = stream.toList();
         }
         Set<String> names = new HashSet<>(list);
-        assertTrue(names.size() == list.size()); // no duplicates
+        assertEquals(names.size(), list.size(), "resource list contains duplicates: " + list);
 
-        assertTrue(names.contains("module-info.class"));
-        assertTrue(names.contains(name));
+        assertTrue(names.contains("module-info.class"), "resource list did not contain 'module-info.class': " + list);
+        assertTrue(names.contains(name), "resource list did not contain '" + name + "'" + list);
 
         // all resources should be locatable via find
         for (String e : names) {
-            assertTrue(reader.find(e).isPresent());
+            assertTrue(reader.find(e).isPresent(), "resource not found: " + name);
         }
     }
 
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/CanAccessTest.java b/test/jdk/java/lang/reflect/AccessibleObject/CanAccessTest.java
index 45e2502b601..ac7a1bad31b 100644
--- a/test/jdk/java/lang/reflect/AccessibleObject/CanAccessTest.java
+++ b/test/jdk/java/lang/reflect/AccessibleObject/CanAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @build CanAccessTest
  * @modules java.base/jdk.internal.misc:+open
- * @run testng/othervm CanAccessTest
+ * @run junit/othervm CanAccessTest
  * @summary Test AccessibleObject::canAccess method
  */
 
@@ -34,31 +34,29 @@ import java.lang.reflect.Method;
 import java.security.SecureClassLoader;
 
 import jdk.internal.misc.Unsafe;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class CanAccessTest {
     private static Unsafe INSTANCE = Unsafe.getUnsafe();
 
     /**
      * null object parameter for Constructor
      */
+    @Test
     public void testConstructor() throws Exception {
         Constructor<?> ctor = Unsafe.class.getDeclaredConstructor();
         assertFalse(ctor.canAccess(null));
         assertTrue(ctor.trySetAccessible());
 
-        try {
-            // non-null object parameter
-            ctor.canAccess(INSTANCE);
-            assertTrue(false);
-        } catch (IllegalArgumentException expected) {}
+        // non-null object parameter
+        assertThrows(IllegalArgumentException.class, () -> ctor.canAccess(INSTANCE));
     }
 
     /**
      * Test protected constructors
      */
+    @Test
     public void testProtectedConstructor() throws Exception {
         TestLoader.testProtectedConstructorNonOpenedPackage();
 
@@ -69,21 +67,20 @@ public class CanAccessTest {
     /**
      * null object parameter  for static members
      */
+    @Test
     public void testStaticMember() throws Exception {
         Method m = Unsafe.class.getDeclaredMethod("throwIllegalAccessError");
         assertFalse(m.canAccess(null));
         assertTrue(m.trySetAccessible());
 
-        try {
-            // non-null object parameter
-            m.canAccess(INSTANCE);
-            assertTrue(false);
-        } catch (IllegalArgumentException expected) { }
+        // non-null object parameter
+        assertThrows(IllegalArgumentException.class, () -> m.canAccess(INSTANCE));
     }
 
     /**
      * Test protected static
      */
+    @Test
     public void testProtectedStatic() throws Exception {
         Method m = TestLoader.testProtectedStatic();
         assertFalse(m.canAccess(null));
@@ -93,28 +90,24 @@ public class CanAccessTest {
      * the specified object must be an instance of the declaring class
      * for instance members
      */
+    @Test
     public void testInstanceMethod() throws Exception {
         Method m = Unsafe.class.getDeclaredMethod("allocateMemory0", long.class);
         assertFalse(m.canAccess(INSTANCE));
 
-        try {
-            m.canAccess(null);
-            assertTrue(false);
-        } catch (IllegalArgumentException expected) { }
+        assertThrows(IllegalArgumentException.class, () -> m.canAccess(null));
     }
 
     /**
      * the specified object must be an instance of the declaring class
      * for instance members
      */
+    @Test
     public void testInvalidInstanceObject() throws Exception {
         Class<?> clazz = Class.forName("sun.security.x509.X500Name");
         Method m = clazz.getDeclaredMethod("size");
 
-        try {
-            m.canAccess(INSTANCE);
-            assertTrue(false);
-        } catch (IllegalArgumentException expected) { }
+        assertThrows(IllegalArgumentException.class, () -> m.canAccess(INSTANCE));
     }
 
 
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java b/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
index 45cebdb552b..7d79a1ac49b 100644
--- a/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
+++ b/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @build ModuleSetAccessibleTest
  * @modules java.base/java.lang:open
  *          java.base/jdk.internal.misc:+open
- * @run testng/othervm ModuleSetAccessibleTest
+ * @run junit/othervm ModuleSetAccessibleTest
  * @summary Test java.lang.reflect.AccessibleObject with modules
  */
 
@@ -40,22 +40,19 @@ import java.security.ProtectionDomain;
 
 import jdk.internal.misc.Unsafe;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class ModuleSetAccessibleTest {
 
     /**
      * Invoke a private constructor on a public class in an exported package
      */
+    @Test
     public void testPrivateConstructorInExportedPackage() throws Exception {
         Constructor<?> ctor = Unsafe.class.getDeclaredConstructor();
 
-        try {
-            ctor.newInstance();
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> ctor.newInstance());
 
         ctor.setAccessible(true);
         Unsafe unsafe = (Unsafe) ctor.newInstance();
@@ -65,34 +62,26 @@ public class ModuleSetAccessibleTest {
     /**
      * Invoke a private method on a public class in an exported package
      */
+    @Test
     public void testPrivateMethodInExportedPackage() throws Exception {
         Method m = Unsafe.class.getDeclaredMethod("throwIllegalAccessError");
-        try {
-            m.invoke(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> m.invoke(null));
 
         m.setAccessible(true);
-        try {
-            m.invoke(null);
-            assertTrue(false);
-        } catch (InvocationTargetException e) {
-            // thrown by throwIllegalAccessError
-            assertTrue(e.getCause() instanceof IllegalAccessError);
-        }
+        InvocationTargetException e = assertThrows(InvocationTargetException.class, () ->
+                m.invoke(null));
+        // thrown by throwIllegalAccessError
+        assertInstanceOf(IllegalAccessError.class, e.getCause());
     }
 
 
     /**
      * Access a private field in a public class that is an exported package
      */
+    @Test
     public void testPrivateFieldInExportedPackage() throws Exception {
         Field f = Unsafe.class.getDeclaredField("theUnsafe");
-
-        try {
-            f.get(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> f.get(null));
 
         f.setAccessible(true);
         Unsafe unsafe = (Unsafe) f.get(null);
@@ -102,19 +91,14 @@ public class ModuleSetAccessibleTest {
     /**
      * Invoke a public constructor on a public class in a non-exported package
      */
+    @Test
     public void testPublicConstructorInNonExportedPackage() throws Exception {
         Class<?> clazz = Class.forName("sun.security.x509.X500Name");
         Constructor<?> ctor = clazz.getConstructor(String.class);
 
-        try {
-            ctor.newInstance("cn=duke");
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> ctor.newInstance("cn=duke"));
 
-        try {
-            ctor.setAccessible(true);
-            assertTrue(false);
-        } catch (InaccessibleObjectException expected) { }
+        assertThrows(InaccessibleObjectException.class, () -> ctor.setAccessible(true));
 
         ctor.setAccessible(false); // should succeed
     }
@@ -123,19 +107,14 @@ public class ModuleSetAccessibleTest {
     /**
      * Access a public field in a public class that in a non-exported package
      */
+    @Test
     public void testPublicFieldInNonExportedPackage() throws Exception {
         Class<?> clazz = Class.forName("sun.security.x509.X500Name");
         Field f = clazz.getField("SERIALNUMBER_OID");
 
-        try {
-            f.get(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> f.get(null));
 
-        try {
-            f.setAccessible(true);
-            assertTrue(false);
-        } catch (InaccessibleObjectException expected) { }
+        assertThrows(InaccessibleObjectException.class, () -> f.setAccessible(true));
 
         f.setAccessible(false); // should succeed
     }
@@ -144,6 +123,7 @@ public class ModuleSetAccessibleTest {
     /**
      * Test that the Class constructor cannot be make accessible.
      */
+    @Test
     public void testJavaLangClass() throws Exception {
 
         // non-public constructor
@@ -152,15 +132,8 @@ public class ModuleSetAccessibleTest {
                                                  ProtectionDomain.class, boolean.class, char.class);
         AccessibleObject[] ctors = { ctor };
 
-        try {
-            ctor.setAccessible(true);
-            assertTrue(false);
-        } catch (SecurityException expected) { }
-
-        try {
-            AccessibleObject.setAccessible(ctors, true);
-            assertTrue(false);
-        } catch (SecurityException expected) { }
+        assertThrows(SecurityException.class, () -> ctor.setAccessible(true));
+        assertThrows(SecurityException.class, () -> AccessibleObject.setAccessible(ctors, true));
 
         // should succeed
         ctor.setAccessible(false);
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java b/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java
index 774ee4d1dad..bd4d0fab23f 100644
--- a/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java
+++ b/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,14 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @build TrySetAccessibleTest
  * @modules java.base/java.lang:open
  *          java.base/jdk.internal.module
  *          java.base/jdk.internal.perf
  *          java.base/jdk.internal.misc:+open
- * @run testng/othervm TrySetAccessibleTest
+ * @run junit/othervm TrySetAccessibleTest
  * @summary Test AccessibleObject::trySetAccessible method
  */
 
@@ -43,21 +43,18 @@ import jdk.internal.module.ModulePath;
 import jdk.internal.perf.Perf;
 import java.security.ProtectionDomain;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
-@Test
 public class TrySetAccessibleTest {
     /**
      * Invoke a private constructor on a public class in an exported package
      */
+    @Test
     public void testPrivateConstructorInExportedPackage() throws Exception {
         Constructor<?> ctor = Perf.class.getDeclaredConstructor();
 
-        try {
-            ctor.newInstance();
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> ctor.newInstance());
 
         assertFalse(ctor.trySetAccessible());
         assertFalse(ctor.canAccess(null));
@@ -66,13 +63,11 @@ public class TrySetAccessibleTest {
     /**
      * Invoke a private constructor on a public class in an open package
      */
+    @Test
     public void testPrivateConstructorInOpenedPackage() throws Exception {
         Constructor<?> ctor = Unsafe.class.getDeclaredConstructor();
 
-        try {
-            ctor.newInstance();
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> ctor.newInstance());
 
         assertTrue(ctor.trySetAccessible());
         assertTrue(ctor.canAccess(null));
@@ -82,12 +77,10 @@ public class TrySetAccessibleTest {
     /**
      * Invoke a private method on a public class in an exported package
      */
+    @Test
     public void testPrivateMethodInExportedPackage() throws Exception {
         Method m = ModulePath.class.getDeclaredMethod("packageName", String.class);
-        try {
-            m.invoke(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> m.invoke(null));
 
         assertFalse(m.trySetAccessible());
         assertFalse(m.canAccess(null));
@@ -97,54 +90,42 @@ public class TrySetAccessibleTest {
     /**
      * Invoke a private method on a public class in an open package
      */
+    @Test
     public void testPrivateMethodInOpenedPackage() throws Exception {
         Method m = Unsafe.class.getDeclaredMethod("throwIllegalAccessError");
         assertFalse(m.canAccess(null));
 
-        try {
-            m.invoke(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> m.invoke(null));
 
         assertTrue(m.trySetAccessible());
         assertTrue(m.canAccess(null));
-        try {
-            m.invoke(null);
-            assertTrue(false);
-        } catch (InvocationTargetException e) {
-            // thrown by throwIllegalAccessError
-            assertTrue(e.getCause() instanceof IllegalAccessError);
-        }
+
+        InvocationTargetException e = assertThrows(InvocationTargetException.class, () ->
+                m.invoke(null));
+        assertInstanceOf(IllegalAccessError.class, e.getCause());
     }
 
     /**
      * Invoke a private method on a public class in an exported package
      */
+    @Test
     public void testPrivateFieldInExportedPackage() throws Exception {
         Field f = Perf.class.getDeclaredField("instance");
-        try {
-            f.get(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> f.get(null));
 
         assertFalse(f.trySetAccessible());
         assertFalse(f.canAccess(null));
-        try {
-            f.get(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) {}
+        assertThrows(IllegalAccessException.class, () -> f.get(null));
     }
 
     /**
      * Access a private field in a public class that is an exported package
      */
+    @Test
     public void testPrivateFieldInOpenedPackage() throws Exception {
         Field f = Unsafe.class.getDeclaredField("theUnsafe");
 
-        try {
-            f.get(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> f.get(null));
 
         assertTrue(f.trySetAccessible());
         assertTrue(f.canAccess(null));
@@ -155,32 +136,29 @@ public class TrySetAccessibleTest {
     /**
      * Invoke a public constructor on a public class in a non-exported package
      */
+    @Test
     public void testPublicConstructorInNonExportedPackage() throws Exception {
         Class<?> clazz = Class.forName("sun.security.x509.X500Name");
         Constructor<?> ctor = clazz.getConstructor(String.class);
 
-        try {
-            ctor.newInstance("cn=duke");
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> ctor.newInstance("cn=duke"));
 
         assertFalse(ctor.trySetAccessible());
         assertFalse(ctor.canAccess(null));
-        assertTrue(ctor.trySetAccessible() == ctor.isAccessible());
+        assertFalse(ctor.trySetAccessible());
+        assertFalse(ctor.isAccessible()); // should match trySetAccessible
     }
 
 
     /**
      * Access a public field in a public class that in a non-exported package
      */
+    @Test
     public void testPublicFieldInNonExportedPackage() throws Exception {
         Class<?> clazz = Class.forName("sun.security.x509.X500Name");
         Field f = clazz.getField("SERIALNUMBER_OID");
 
-        try {
-            f.get(null);
-            assertTrue(false);
-        } catch (IllegalAccessException expected) { }
+        assertThrows(IllegalAccessException.class, () -> f.get(null));
 
         assertFalse(f.trySetAccessible());
         assertFalse(f.canAccess(null));
@@ -190,6 +168,7 @@ public class TrySetAccessibleTest {
     /**
      * Test that the Class constructor cannot be make accessible.
      */
+    @Test
     public void testJavaLangClass() throws Exception {
 
         // non-public constructor
diff --git a/test/jdk/java/lang/reflect/ChainedReflection.java b/test/jdk/java/lang/reflect/ChainedReflection.java
index 212a70345cd..bd76cd13fc8 100644
--- a/test/jdk/java/lang/reflect/ChainedReflection.java
+++ b/test/jdk/java/lang/reflect/ChainedReflection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,11 @@
 
 /*
  * @test
- * @run testng/othervm ChainedReflection
+ * @run junit/othervm ChainedReflection
  * @summary Test Method::invoke and Constructor::newInstance chained calls that
  *          should wrap NPE in InvocationTargetException properly
+ * @comment This test is not using assertThrows given lambdas may affect the
+ *          exception stack trace and therefore test anticipations
  */
 
 import java.lang.reflect.Constructor;
@@ -33,24 +35,28 @@ import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Optional;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class ChainedReflection {
-    public ChainedReflection() {}
 
-    ChainedReflection(Void dummy) throws ReflectiveOperationException {
-        Method m = ChainedReflection.class.getMethod("throwNPE");
-        try {
-            m.invoke(null);
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getTargetException();
-            if (t instanceof NullPointerException npe) {
-                throw npe;
-            } else {
-                throw new RuntimeException("Test failed (InvocationTargetException didn't wrap NullPointerException)");
+    // This inner class is declared with a constructor that ctorCallMethodInvoke
+    // reflects on. Such a constructor cannot be declared in ChainedReflection
+    // because JUnit does not allow a test class to declare multiple constructors.
+    class Inner {
+        Inner() throws ReflectiveOperationException {
+            Method m = ChainedReflection.class.getMethod("throwNPE");
+            try {
+                m.invoke(null);
+            } catch (InvocationTargetException e) {
+                Throwable t = e.getTargetException();
+                if (t instanceof NullPointerException npe) {
+                    throw npe;
+                } else {
+                    throw new RuntimeException("Test failed (InvocationTargetException didn't wrap NullPointerException)");
+                }
+            } catch (Throwable t) {
+                throw new RuntimeException("Test failed (Unexpected exception)", t);
             }
-        } catch (Throwable t) {
-            throw new RuntimeException("Test failed (Unexpected exception)", t);
         }
     }
 
@@ -105,9 +111,9 @@ public class ChainedReflection {
      */
     @Test
     public void ctorCallMethodInvoke() throws ReflectiveOperationException {
-        Constructor<?> ctor = ChainedReflection.class.getDeclaredConstructor(Void.class);
+        Constructor<?> ctor = ChainedReflection.Inner.class.getDeclaredConstructor(ChainedReflection.class);
         try {
-            ctor.newInstance((Void)null);
+            ctor.newInstance(this);
         } catch (InvocationTargetException e) {
             Throwable t = e.getTargetException();
             if (!(t instanceof NullPointerException)) {
diff --git a/test/jdk/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java b/test/jdk/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java
index 1992f31d5de..b8738a383b0 100644
--- a/test/jdk/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java
+++ b/test/jdk/java/lang/reflect/DefaultMethodMembers/FilterNotMostSpecific.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8029674
  * @summary Verify that the right interface methods are returned by
  *          Class.getMethod() and Class.getMethods()
- * @run testng FilterNotMostSpecific
+ * @run junit FilterNotMostSpecific
  */
 
 import java.lang.reflect.*;
@@ -39,14 +39,14 @@ import java.util.HashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class FilterNotMostSpecific {
 
-    @Test(dataProvider="getCases")
+    @ParameterizedTest
+    @MethodSource("getCases")
     public void testGetMethod(Class<?> iface) {
         boolean match = false;
         MethodDesc[] expectedMethods = iface.getAnnotationsByType(MethodDesc.class);
@@ -67,7 +67,8 @@ public class FilterNotMostSpecific {
         assert(match);
     }
 
-    @Test(dataProvider="getCases")
+    @ParameterizedTest
+    @MethodSource("getCases")
     public void testGetMethods(Class<?> iface) {
         List<Method> foundMethods = filterObjectMethods(iface.getMethods());
         MethodDesc[] expectedMethods = iface.getAnnotationsByType(MethodDesc.class);
@@ -84,7 +85,7 @@ public class FilterNotMostSpecific {
                 fail("On: "+ iface +"\nDid not find " + toMethodString(expected) +
                      " among " + foundMethods);
         }
-        assertEquals(foundMethods.size(), expectedMethods.length,
+        assertEquals(expectedMethods.length, foundMethods.size(),
                 "\non: " + iface +
                 "\nexpected: " + toMethodStrings(expectedMethods) +
                 "\nfound: " + foundMethods + "\n");
@@ -565,8 +566,7 @@ public class FilterNotMostSpecific {
     @MethodDesc(name="m", declaringClass=F.class, isGetMethodReturn=true)
     abstract class H extends G implements F {}
 
-    @DataProvider
-    public Object[][] getCases() { return CASES; }
+    public static Object[][] getCases() { return CASES; }
     public static final Class<?>[][] CASES =  {
         { K1.class },
         { K1M.class },
diff --git a/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java b/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java
index 215ee3dd66a..ff7d12502b3 100644
--- a/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java
+++ b/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticInvokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *          in interfaces and/or in inheritance
  * @bug 7184826
  * @build helper.Mod helper.Declared DefaultStaticTestData
- * @run testng DefaultStaticInvokeTest
+ * @run junit DefaultStaticInvokeTest
  * @author Yong Lu
  */
 
@@ -40,23 +40,19 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
-import org.testng.annotations.Test;
-
 import static helper.Mod.*;
 import static helper.Declared.*;
-import helper.Mod;
+import static org.junit.jupiter.api.Assertions.*;
 
+import helper.Mod;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class DefaultStaticInvokeTest {
 
     // getMethods(): Make sure getMethods returns the expected methods.
-    @Test(dataProvider = "testCasesAll",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource({"DefaultStaticTestData#testClasses", "DefaultStaticTestData#testInterfaces"})
     public void testGetMethods(String testTarget, Object param)
             throws Exception {
         testMethods(ALL_METHODS, testTarget, param);
@@ -64,8 +60,8 @@ public class DefaultStaticInvokeTest {
 
 
     // getDeclaredMethods(): Make sure getDeclaredMethods returns the expected methods.
-    @Test(dataProvider = "testCasesAll",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource({"DefaultStaticTestData#testClasses", "DefaultStaticTestData#testInterfaces"})
     public void testGetDeclaredMethods(String testTarget, Object param)
             throws Exception {
         testMethods(DECLARED_ONLY, testTarget, param);
@@ -73,8 +69,8 @@ public class DefaultStaticInvokeTest {
 
 
     // getMethod(): Make sure that getMethod finds all methods it should find.
-    @Test(dataProvider = "testCasesAll",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource({"DefaultStaticTestData#testClasses", "DefaultStaticTestData#testInterfaces"})
     public void testGetMethod(String testTarget, Object param)
             throws Exception {
 
@@ -91,8 +87,8 @@ public class DefaultStaticInvokeTest {
 
 
     // getMethod(): Make sure that getMethod does *not* find certain methods.
-    @Test(dataProvider = "testCasesAll",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource({"DefaultStaticTestData#testClasses", "DefaultStaticTestData#testInterfaces"})
     public void testGetMethodSuperInterfaces(String testTarget, Object param)
             throws Exception {
 
@@ -124,8 +120,8 @@ public class DefaultStaticInvokeTest {
 
 
     // Method.invoke(): Make sure Method.invoke returns the expected value.
-    @Test(dataProvider = "testCasesAll",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource({"DefaultStaticTestData#testClasses", "DefaultStaticTestData#testInterfaces"})
     public void testMethodInvoke(String testTarget, Object param)
             throws Exception {
         Class<?> typeUnderTest = Class.forName(testTarget);
@@ -141,8 +137,8 @@ public class DefaultStaticInvokeTest {
 
 
     // MethodHandle.invoke(): Make sure MethodHandle.invoke returns the expected value.
-    @Test(dataProvider = "testCasesAll",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource({"DefaultStaticTestData#testClasses", "DefaultStaticTestData#testInterfaces"})
     public void testMethodHandleInvoke(String testTarget, Object param)
             throws Throwable {
         Class<?> typeUnderTest = Class.forName(testTarget);
@@ -169,14 +165,14 @@ public class DefaultStaticInvokeTest {
                         : (String) methodHandle.invoke(typeUnderTest.newInstance(), param);
             }
 
-            assertEquals(result, expectedReturn);
+            assertEquals(expectedReturn, result);
         }
 
     }
 
     // Lookup.findStatic / .findVirtual: Make sure IllegalAccessException is thrown as expected.
-    @Test(dataProvider = "testClasses",
-            dataProviderClass = DefaultStaticTestData.class)
+    @ParameterizedTest
+    @MethodSource("DefaultStaticTestData#testClasses")
     public void testIAE(String testTarget, Object param)
             throws ClassNotFoundException {
 
@@ -189,14 +185,8 @@ public class DefaultStaticInvokeTest {
             if (mod != STATIC && typeUnderTest.isInterface()) {
                 continue;
             }
-            Exception caught = null;
-            try {
-                getTestMH(typeUnderTest, mName, param, true);
-            } catch (Exception e) {
-                caught = e;
-            }
-            assertNotNull(caught);
-            assertEquals(caught.getClass(), IllegalAccessException.class);
+            assertThrowsExactly(IllegalAccessException.class, () ->
+                    getTestMH(typeUnderTest, mName, param, true));
         }
     }
 
@@ -254,7 +244,7 @@ public class DefaultStaticInvokeTest {
             }
         }
 
-        assertEquals(myMethods.size(), expectedMethods.length);
+        assertEquals(expectedMethods.length, myMethods.size());
 
         for (MethodDesc toTest : expectedMethods) {
 
@@ -284,16 +274,15 @@ public class DefaultStaticInvokeTest {
                 assertFalse(method.isDefault());
 
                 // Test invoke it
-                assertEquals(tryInvoke(method, null, param), expectedReturn);
+                assertEquals(expectedReturn, tryInvoke(method, null, param));
                 break;
             case DEFAULT:
                 // if typeUnderTest is a class then instantiate and invoke
                 if (!typeUnderTest.isInterface()) {
-                    assertEquals(tryInvoke(
+                    assertEquals(expectedReturn, tryInvoke(
                             method,
                             typeUnderTest,
-                            param),
-                            expectedReturn);
+                            param));
                 }
 
                 //assert candidate is default
@@ -302,11 +291,10 @@ public class DefaultStaticInvokeTest {
                 break;
             case REGULAR:
                 // if typeUnderTest must be a class
-                assertEquals(tryInvoke(
+                assertEquals(expectedReturn, tryInvoke(
                         method,
                         typeUnderTest,
-                        param),
-                        expectedReturn);
+                        param));
 
                 //assert candidate is neither default nor static
                 assertFalse(Modifier.isStatic(method.getModifiers()));
diff --git a/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java b/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java
index 8049712569b..add991e3493 100644
--- a/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java
+++ b/test/jdk/java/lang/reflect/DefaultStaticTest/DefaultStaticTestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,10 @@
  * @author Yong Lu
  */
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.testng.annotations.DataProvider;
-import org.testng.collections.Lists;
-
 import static helper.Mod.*;
 import static helper.Declared.*;
 import helper.Mod;
@@ -379,7 +377,6 @@ public class DefaultStaticTestData {
      * data is the name of the class under test Second data used in test as the
      * arguments used for the method call.
      */
-    @DataProvider
     static Object[][] testClasses() {
         return new Object[][]{
             {"TestClass1", null},
@@ -408,7 +405,6 @@ public class DefaultStaticTestData {
      * data is the name of the interface under test Second data used in test as
      * the arguments used for the method call.
      */
-    @DataProvider
     static Object[][] testInterfaces() {
         return new Object[][]{
             {"TestIF1", null},
@@ -438,12 +434,4 @@ public class DefaultStaticTestData {
             {"TestIF21", null},
         };
     }
-
-    @DataProvider
-    static Object[][] testCasesAll() {
-        List<Object[]> result = Lists.newArrayList();
-        result.addAll(Arrays.asList(testClasses()));
-        result.addAll(Arrays.asList(testInterfaces()));
-        return result.toArray(new Object[result.size()][]);
-    }
 }
diff --git a/test/jdk/java/lang/reflect/Field/NegativeTest.java b/test/jdk/java/lang/reflect/Field/NegativeTest.java
index fe1f2dd7480..186267f4458 100644
--- a/test/jdk/java/lang/reflect/Field/NegativeTest.java
+++ b/test/jdk/java/lang/reflect/Field/NegativeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,20 +21,20 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8277451
  * @summary Test exception thrown due to bad receiver and bad value on
  *          Field with and without setAccessible(true)
- * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED NegativeTest
+ * @run junit/othervm --enable-final-field-mutation=ALL-UNNAMED NegativeTest
  */
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class NegativeTest {
     static class Fields {
@@ -167,8 +167,7 @@ public class NegativeTest {
         }
     }
 
-    @DataProvider(name = "instanceFields")
-    private Object[][] instanceFields() {
+    private static Object[][] instanceFields() {
         return new Object[][]{
                 new Object[]{i_field},
                 new Object[]{c_field},
@@ -217,7 +216,8 @@ public class NegativeTest {
      * IllegalArgumentException is thrown if the receiver is of
      * a bad type.  NullPointerException is thrown if the receiver is null.
      */
-    @Test(dataProvider = "instanceFields")
+    @ParameterizedTest
+    @MethodSource("instanceFields")
     public void testReceiver(Field f) throws ReflectiveOperationException {
         f.get(INSTANCE);     // good receiver
 
@@ -231,15 +231,10 @@ public class NegativeTest {
     private void testBadReceiver(Field f) throws ReflectiveOperationException {
         assertFalse(Modifier.isStatic(f.getModifiers()));  // instance field
         Object badObj = new NegativeTest();
-        try {
-            f.get(badObj);
-            fail("expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
+        assertThrows(IllegalArgumentException.class, () -> f.get(badObj));
         Class<?> fType = f.getType();
         if (fType.isPrimitive()) {
-            try {
+            assertThrows(IllegalArgumentException.class, () -> {
                 switch (fType.descriptorString()) {
                     case "B" -> f.getByte(badObj);
                     case "C" -> f.getChar(badObj);
@@ -250,10 +245,7 @@ public class NegativeTest {
                     case "S" -> f.getShort(badObj);
                     case "Z" -> f.getBoolean(badObj);
                 }
-                fail("expected IllegalArgumentException");
-            } catch (IllegalArgumentException e) {
-                // expected
-            }
+            });
         }
     }
 
@@ -262,16 +254,11 @@ public class NegativeTest {
      */
     private void testNullReceiver(Field f) throws ReflectiveOperationException {
         assertFalse(Modifier.isStatic(f.getModifiers()));  // instance field
-        try {
-            f.get(null);
-            fail("expected NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        assertThrows(NullPointerException.class, () -> f.get(null));
 
         Class<?> fType = f.getType();
         if (fType.isPrimitive()) {
-            try {
+            assertThrows(NullPointerException.class, () -> {
                 switch (fType.descriptorString()) {
                     case "B" -> f.getByte(null);
                     case "C" -> f.getChar(null);
@@ -282,15 +269,11 @@ public class NegativeTest {
                     case "S" -> f.getShort(null);
                     case "Z" -> f.getBoolean(null);
                 }
-                fail("expected NullPointerException");
-            } catch (NullPointerException e) {
-                // expected
-            }
+            });
         }
     }
 
-    @DataProvider(name = "writeableFields")
-    private Object[][] writeableFields() {
+    private static Object[][] writeableFields() {
         Fields obj = new Fields();
         return new Object[][]{
                 // instance fields with and without setAccessible(true)
@@ -352,7 +335,8 @@ public class NegativeTest {
      * NullPointerException is thrown if the receiver of an instance field is null.
      * The receiver is checked
      */
-    @Test(dataProvider = "writeableFields")
+    @ParameterizedTest
+    @MethodSource("writeableFields")
     public void testSetValue(Field f, Object obj, Object value) throws IllegalAccessException {
         f.set(obj, value);
         Class<?> fType = f.getType();
@@ -369,25 +353,14 @@ public class NegativeTest {
             }
 
             // test null value only if it's primitive type
-            try {
-                f.set(obj, null);
-                fail("expected IllegalArgumentException");
-            } catch (IllegalArgumentException e) {
-                // expected
-            }
+            assertThrows(IllegalArgumentException.class, () -> f.set(obj, null));
         }
 
         Object badValue = new NegativeTest();
-        try {
-            f.set(obj, badValue);
-            fail("expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
+        assertThrows(IllegalArgumentException.class, () -> f.set(obj, badValue));
     }
 
-    @DataProvider(name = "readOnlyFinalFields")
-    private Object[][] readOnlyFinalFields() {
+    private static Object[][] readOnlyFinalFields() {
         Object obj = INSTANCE;
         return new Object[][]{
                 // instance final fields
@@ -427,19 +400,15 @@ public class NegativeTest {
      * IllegalAccessException is thrown regardless of whether the value
      * is of a bad type or not.
      */
-    @Test(dataProvider = "readOnlyFinalFields")
+    @ParameterizedTest
+    @MethodSource("readOnlyFinalFields")
     public void testSetValueOnFinalField(Field f, Object obj, Object value) {
         assertTrue(Modifier.isFinal(f.getModifiers()));
-        try {
-            f.set(obj, value);
-            fail("expected IllegalAccessException");
-        } catch (IllegalAccessException e) {
-            // expected
-        }
+        assertThrows(IllegalAccessException.class, () -> f.set(obj, value));
 
         Class<?> fType = f.getType();
         if (fType.isPrimitive()) {
-            try {
+            assertThrows(IllegalAccessException.class, () -> {
                 switch (fType.descriptorString()) {
                     case "B" -> f.setByte(obj, ((Byte)value).byteValue());
                     case "C" -> f.setChar(obj, ((Character)value).charValue());
@@ -450,33 +419,17 @@ public class NegativeTest {
                     case "S" -> f.setShort(obj, ((Short)value).shortValue());
                     case "Z" -> f.setBoolean(obj, ((Boolean)value).booleanValue());
                 }
-                fail("expected IllegalAccessException");
-            } catch (IllegalAccessException e) {
-                // expected
-            }
+            });
 
             // test null value only if it's primitive type
-            try {
-                f.set(obj, null);
-                fail("expected IllegalAccessException");
-            } catch (IllegalAccessException e) {
-                // expected
-            }
+            assertThrows(IllegalAccessException.class, () -> f.set(obj, null));
         }
 
         Object badValue = new NegativeTest();
-        try {
-            f.set(obj, badValue);
-            fail("expected IllegalAccessException");
-        } catch (IllegalAccessException e) {
-            // expected
-        }
+        assertThrows(IllegalAccessException.class, () -> f.set(obj, badValue));
     }
 
-
-
-    @DataProvider(name = "finalInstanceFields")
-    private Object[][] finalInstanceFields() {
+    private static Object[][] finalInstanceFields() {
         return new Object[][]{
                 new Object[]{fi_field, Integer.valueOf(10)},
                 new Object[]{fc_field, Character.valueOf('c')},
@@ -497,54 +450,27 @@ public class NegativeTest {
      * The receiver is checked before the access check is performed and
      * also before the value is checked.
      */
-    @Test(dataProvider = "finalInstanceFields")
+    @ParameterizedTest
+    @MethodSource("finalInstanceFields")
     public void testReceiverOnFinalField(Field f, Object value) {
         assertTrue(Modifier.isFinal(f.getModifiers()));
         Object badReceiver = new NegativeTest();
         // set the field with a bad receiver with a good value
-        try {
-            f.set(badReceiver, value);
-            fail("expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // expected
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException("Expected IllegalArgumentException but got: " + e.getMessage(), e);
-        }
+        assertThrows(IllegalArgumentException.class, () -> f.set(badReceiver, value));
 
         // set the field with a bad receiver with a bad value
         Object badValue = new NegativeTest();
-        try {
-            f.set(badReceiver, badValue);
-            fail("expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // expected
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException("Expected IllegalArgumentException but got: " + e.getMessage(), e);
-        }
+        assertThrows(IllegalArgumentException.class, () -> f.set(badReceiver, badValue));
 
         // set the field with a null receiver with a good value
-        try {
-            f.set(null, value);
-            fail("expected NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException("Expected NullPointerException but got: " + e.getMessage(), e);
-        }
+        assertThrows(NullPointerException.class, () -> f.set(null, value));
         // set the field with a null receiver with a bad value
-        try {
-            f.set(null, badValue);
-            fail("expected NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException("Expected NullPointerException but got: " + e.getMessage(), e);
-        }
+        assertThrows(NullPointerException.class, () -> f.set(null, badValue));
 
         Class<?> fType = f.getType();
         if (fType.isPrimitive()) {
             // test bad receiver
-            try {
+            assertThrows(IllegalArgumentException.class, () -> {
                 switch (fType.descriptorString()) {
                     case "B" -> f.setByte(badReceiver, ((Byte) value).byteValue());
                     case "C" -> f.setChar(badReceiver, ((Character) value).charValue());
@@ -555,12 +481,9 @@ public class NegativeTest {
                     case "S" -> f.setShort(badReceiver, ((Short) value).shortValue());
                     case "Z" -> f.setBoolean(badReceiver, ((Boolean) value).booleanValue());
                 }
-            } catch (IllegalArgumentException e) {
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException("Expected IllegalArgumentException but got: " + e.getMessage(), e);
-            }
+            });
             // test null receiver
-            try {
+            assertThrows(NullPointerException.class, () -> {
                 switch (fType.descriptorString()) {
                     case "B" -> f.setByte(null, ((Byte) value).byteValue());
                     case "C" -> f.setChar(null, ((Character) value).charValue());
@@ -571,11 +494,7 @@ public class NegativeTest {
                     case "S" -> f.setShort(null, ((Short) value).shortValue());
                     case "Z" -> f.setBoolean(null, ((Boolean) value).booleanValue());
                 }
-            } catch (NullPointerException e) {
-                // expected
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException("Expected NullPointerException but got: " + e.getMessage(), e);
-            }
+            });
         }
     }
 }
diff --git a/test/jdk/java/lang/reflect/Generics/ThreadSafety.java b/test/jdk/java/lang/reflect/Generics/ThreadSafety.java
index 1aa1a4e9386..81ca2ae488a 100644
--- a/test/jdk/java/lang/reflect/Generics/ThreadSafety.java
+++ b/test/jdk/java/lang/reflect/Generics/ThreadSafety.java
@@ -21,17 +21,16 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8062771 8016236
  * @summary Test publication of Class objects via a data race
- * @run testng ThreadSafety
+ * @run junit ThreadSafety
  */
 
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.concurrent.BrokenBarrierException;
@@ -43,8 +42,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * A test resulting from an attempt to repro this failure (in guice):
diff --git a/test/jdk/java/lang/reflect/IllegalArgumentsTest.java b/test/jdk/java/lang/reflect/IllegalArgumentsTest.java
index 7260c04c10a..58115523a3d 100644
--- a/test/jdk/java/lang/reflect/IllegalArgumentsTest.java
+++ b/test/jdk/java/lang/reflect/IllegalArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,14 @@
  * @test
  * @bug 8277964
  * @summary Test IllegalArgumentException be thrown when an argument is invalid
- * @run testng/othervm/timeout=720 IllegalArgumentsTest
+ * @comment Avoid using framework utilities; this is effectively a runtime test
+ *          sensitive to stack traces
+ * @run junit/othervm/timeout=720 IllegalArgumentsTest
  */
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class IllegalArgumentsTest {
     static class T {
diff --git a/test/jdk/java/lang/reflect/Method/MethodArityLimit.java b/test/jdk/java/lang/reflect/Method/MethodArityLimit.java
index 536b3a5e317..05d4ef609ef 100644
--- a/test/jdk/java/lang/reflect/Method/MethodArityLimit.java
+++ b/test/jdk/java/lang/reflect/Method/MethodArityLimit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,16 @@
 /*
  * @test
  * @bug 8271820
- * @run testng/othervm MethodArityLimit
+ * @run junit/othervm MethodArityLimit
  * @summary Method exceeds the method handle arity limit (255).
  */
 
-import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Method;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MethodArityLimit {
     @Test
@@ -74,12 +72,10 @@ public class MethodArityLimit {
                 106L, 107L, 108L, 109L, 110L, 111L, 112L, 113L, 114L, 115L, 116L, 117L,
                 118L, 119L, 120L, 121L, 122L, 123L, 124L, 125L, 126L, 127);
 
-        assertEquals(resultViaMethod, 127);
+        assertEquals(127, resultViaMethod);
 
-        try {
-            MethodHandle mh = MethodHandles.lookup().unreflect(m);
-            fail("should fail in creating the method handle");
-        } catch (IllegalArgumentException e) {}
+        var lookup = MethodHandles.lookup();
+        assertThrows(IllegalArgumentException.class, () -> lookup.unreflect(m));
     }
 
     public static long f(long a0, long a1, long a2, long a3, long a4, long a5,
diff --git a/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java b/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java
index b7e6b52b5dc..af72d8dec58 100644
--- a/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java
+++ b/test/jdk/java/lang/reflect/MethodHandleAccessorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8271820 8300924
  * @modules java.base/jdk.internal.reflect
  * @summary Test compliance of ConstructorAccessor, FieldAccessor, MethodAccessor implementations
- * @run testng/othervm --add-exports java.base/jdk.internal.reflect=ALL-UNNAMED -XX:-ShowCodeDetailsInExceptionMessages MethodHandleAccessorsTest
+ * @run junit/othervm -XX:-ShowCodeDetailsInExceptionMessages MethodHandleAccessorsTest
  */
 
 import jdk.internal.reflect.ConstructorAccessor;
@@ -44,8 +44,11 @@ import java.util.Objects;
 import java.util.function.IntUnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class MethodHandleAccessorsTest {
     public static void public_static_V() {}
@@ -446,9 +449,7 @@ public class MethodHandleAccessorsTest {
             new InvocationTargetException(new IllegalArgumentException("IAE"))
     };
 
-
-    @DataProvider(name = "testNoArgMethods")
-    private Object[][] testNoArgMethods() {
+    private static Object[][] testNoArgMethods() {
         MethodHandleAccessorsTest inst = new MethodHandleAccessorsTest();
         Object[] emptyArgs = new Object[]{};
         return new Object[][] {
@@ -468,8 +469,7 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @DataProvider(name = "testOneArgMethods")
-    private Object[][] testOneArgMethods() {
+    private static Object[][] testOneArgMethods() {
         MethodHandleAccessorsTest inst = new MethodHandleAccessorsTest();
         Object wrongInst = new Object();
         return new Object[][]{
@@ -497,8 +497,7 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @DataProvider(name = "testMultiArgMethods")
-    private Object[][] testMultiArgMethods() {
+    private static Object[][] testMultiArgMethods() {
         MethodHandleAccessorsTest inst = new MethodHandleAccessorsTest();
         Class<?>[] params_L3 = new Class<?>[] { Object.class, Object.class, Object.class};
         Class<?>[] params_L4 = new Class<?>[] { Object.class, Object.class, Object.class, Object.class};
@@ -515,8 +514,7 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @DataProvider(name = "testMethodsWithVarargs")
-    private Object[][] testMethodsWithVarargs() {
+    private static Object[][] testMethodsWithVarargs() {
         Class<?>[] paramTypes = new Class<?>[] { int[].class };
         Class<?>[] I_paramTypes = new Class<?>[] { int.class, int[].class };
         Class<?>[] L_paramTypes = new Class<?>[] { String.class, String[].class };
@@ -533,32 +531,35 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @Test(dataProvider = "testNoArgMethods")
+    @ParameterizedTest
+    @MethodSource("testNoArgMethods")
     public void testNoArgMethod(String methodname, Object target, Object[] args,
                                 Object expectedReturn, Throwable[] expectedExpections) throws Exception {
         doTest(MethodHandleAccessorsTest.class.getDeclaredMethod(methodname), target, args, expectedReturn, expectedExpections);
     }
 
-    @Test(dataProvider = "testOneArgMethods")
+    @ParameterizedTest
+    @MethodSource("testOneArgMethods")
     public void testOneArgMethod(String methodname, Class<?> paramType, Object target, Object[] args,
                                  Object expectedReturn, Throwable[] expectedExpections) throws Exception {
         doTest(MethodHandleAccessorsTest.class.getDeclaredMethod(methodname, paramType), target, args, expectedReturn, expectedExpections);
     }
 
-    @Test(dataProvider = "testMultiArgMethods")
+    @ParameterizedTest
+    @MethodSource("testMultiArgMethods")
     public void testMultiArgMethod(String methodname, Class<?>[] paramTypes, Object target, Object[] args,
                                  Object expectedReturn, Throwable[] expectedExpections) throws Exception {
         doTest(MethodHandleAccessorsTest.class.getDeclaredMethod(methodname, paramTypes), target, args, expectedReturn, expectedExpections);
     }
 
-    @Test(dataProvider = "testMethodsWithVarargs")
+    @ParameterizedTest
+    @MethodSource("testMethodsWithVarargs")
     public void testMethodsWithVarargs(String methodname, Class<?>[] paramTypes, Object target, Object[] args,
                                        Object expectedReturn, Throwable[] expectedExpections) throws Exception {
         doTest(MethodHandleAccessorsTest.class.getDeclaredMethod(methodname, paramTypes), target, args, expectedReturn, expectedExpections);
     }
 
-    @DataProvider(name = "testConstructors")
-    private Object[][] testConstructors() {
+    private static Object[][] testConstructors() {
         return new Object[][]{
                 new Object[]{null, new Object[]{}, new Public(), noException},
                 new Object[]{null, null, new Public(), noException},
@@ -584,13 +585,13 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @Test(dataProvider = "testConstructors")
+    @ParameterizedTest
+    @MethodSource("testConstructors")
     public void testPublicConstructors(Class<?>[] paramTypes, Object[] args, Object expectedReturn, Throwable[] expectedExpections) throws Exception {
         doTest(Public.class.getDeclaredConstructor(paramTypes), args, expectedReturn, expectedExpections);
     }
 
-    @DataProvider(name = "testMultiArgConstructors")
-    private Object[][] testMultiArgConstructors() {
+    private static Object[][] testMultiArgConstructors() {
         Class<?>[] params_L3 = new Class<?>[] { Object.class, Object.class, Object.class};
         Class<?>[] params_L4 = new Class<?>[] { Object.class, Object.class, Object.class, Object.class};
         Object o = "arg";
@@ -602,7 +603,8 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @Test(dataProvider = "testMultiArgConstructors")
+    @ParameterizedTest
+    @MethodSource("testMultiArgConstructors")
     public void testMultiArgConstructors(Class<?>[] paramTypes, Object[] args, Object expectedReturn, Throwable[] expectedExpections) throws Exception {
         doTest(Public.class.getDeclaredConstructor(paramTypes), args, expectedReturn, expectedExpections);
     }
@@ -616,8 +618,7 @@ public class MethodHandleAccessorsTest {
         doTest(Abstract.class.getDeclaredConstructor(), null, null, new InstantiationException());
     }
 
-    @DataProvider(name = "throwException")
-    private Object[][] throwException() {
+    private static Object[][] throwException() {
         return new Object[][]{
                 new Object[] {new NullPointerException("NPE"), wrapped_npe},
                 new Object[] {new IllegalArgumentException("IAE"), wrapped_iae},
@@ -629,7 +630,8 @@ public class MethodHandleAccessorsTest {
      * Test Method::invoke and Constructor::newInstance to wrap NPE/CCE/IAE
      * thrown by the member
      */
-    @Test(dataProvider = "throwException")
+    @ParameterizedTest
+    @MethodSource("throwException")
     public void testInvocationTargetException(Throwable ex, Throwable[] expectedExpections) throws Exception {
         Object[] args = new Object[] { ex };
         // test static method
@@ -646,8 +648,7 @@ public class MethodHandleAccessorsTest {
         doTest(applyAsIntMethod, intUnaryOp, new Object[]{12}, 12);
     }
 
-    @DataProvider(name = "readAccess")
-    private Object[][] readAccess() {
+    private static Object[][] readAccess() {
         String wrongInst = new String();
         return new Object[][]{
                 new Object[]{"i", new Public(100), 100, noException},
@@ -657,8 +658,7 @@ public class MethodHandleAccessorsTest {
                 new Object[]{"b", wrongInst, 0, cannot_get_field},
         };
     }
-    @DataProvider(name = "writeAccess")
-    private Object[][] writeAccess() {
+    private static Object[][] writeAccess() {
         Object o = new Object();
         byte b = 1;
         return new Object[][]{
@@ -673,14 +673,16 @@ public class MethodHandleAccessorsTest {
         };
     }
 
-    @Test(dataProvider = "readAccess")
+    @ParameterizedTest
+    @MethodSource("readAccess")
     public void testFieldReadAccess(String name, Object target, Object expectedValue, Throwable[] expectedExpections) throws Exception {
         Field f = Public.class.getDeclaredField(name);
         f.setAccessible(true);
         doTest(f, target, expectedValue, expectedExpections);
     }
 
-    @Test(dataProvider = "writeAccess")
+    @ParameterizedTest
+    @MethodSource("writeAccess")
     public void testFieldWriteAccess(String name, Object target, Object oldValue, Object newValue, Throwable[] expectedExpections) throws Exception {
         Field f = Public.class.getDeclaredField(name);
         f.setAccessible(true);
@@ -693,8 +695,6 @@ public class MethodHandleAccessorsTest {
         Field f = Public.class.getDeclaredField("STATIC_FINAL");
         doTest(f, new Public(), 1, noException);
 
-        try {
-            f.setInt(null, 100);
-        } catch (IllegalAccessException e) { }
+        assertThrows(IllegalAccessException.class, () -> f.setInt(null, 100));
     }
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/DefaultMethods.java b/test/jdk/java/lang/reflect/Proxy/DefaultMethods.java
index 48bb67f405e..e494e623119 100644
--- a/test/jdk/java/lang/reflect/Proxy/DefaultMethods.java
+++ b/test/jdk/java/lang/reflect/Proxy/DefaultMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,19 @@
 
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
+/*
  * @test
  * @bug 8159746
- * @run testng DefaultMethods
+ * @run junit DefaultMethods
  * @summary Basic tests for Proxy::invokeSuper default method
  */
 
@@ -96,15 +96,11 @@ public class DefaultMethods {
     }
 
     private static Method findDefaultMethod(Class<?> refc, Method m) {
-        try {
-            assertTrue(refc.isInterface());
+        assertTrue(refc.isInterface());
 
-            Method method = refc.getMethod(m.getName(), m.getParameterTypes());
-            assertTrue(method.isDefault());
-            return method;
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        }
+        Method method = assertDoesNotThrow(() -> refc.getMethod(m.getName(), m.getParameterTypes()));
+        assertTrue(method.isDefault());
+        return method;
     }
 
     @Test
@@ -115,12 +111,11 @@ public class DefaultMethods {
                     return InvocationHandler.invokeDefault(o, findDefaultMethod(I2.class, method), params);
                 });
         I1 i1 = (I1) proxy;
-        assertEquals(i1.m(), 20);
+        assertEquals(20, i1.m());
     }
 
     // a default method is declared in one of the proxy interfaces
-    @DataProvider(name = "defaultMethods")
-    private Object[][] defaultMethods() {
+    private static Object[][] defaultMethods() {
         return new Object[][]{
             new Object[]{new Class<?>[]{I1.class, I2.class}, true, 10},
             new Object[]{new Class<?>[]{I1.class, I3.class}, true, 10},
@@ -133,13 +128,14 @@ public class DefaultMethods {
         };
     }
 
-    @Test(dataProvider = "defaultMethods")
+    @ParameterizedTest
+    @MethodSource("defaultMethods")
     public void testDefaultMethod(Class<?>[] intfs, boolean isDefault, int expected) throws Throwable {
         InvocationHandler ih = (proxy, method, params) -> {
             System.out.format("invoking %s with parameters: %s%n", method, Arrays.toString(params));
             switch (method.getName()) {
                 case "m":
-                    assertTrue(method.isDefault() == isDefault);
+                    assertEquals(isDefault, method.isDefault());
                     assertTrue(Arrays.stream(proxy.getClass().getInterfaces())
                                      .anyMatch(intf -> method.getDeclaringClass() == intf),
                                Arrays.toString(proxy.getClass().getInterfaces()));
@@ -156,13 +152,12 @@ public class DefaultMethods {
         Object proxy = Proxy.newProxyInstance(DefaultMethods.class.getClassLoader(), intfs, ih);
         Method m = proxy.getClass().getMethod("m");
         int result = (int)m.invoke(proxy);
-        assertEquals(result, expected);
+        assertEquals(expected, result);
     }
 
     // a default method may be declared in a proxy interface or
     // inherited from a superinterface of a proxy interface
-    @DataProvider(name = "supers")
-    private Object[][] supers() {
+    private static Object[][] supers() {
         return new Object[][]{
             // invoke "m" implemented in the first proxy interface
             // same as the method passed to InvocationHandler::invoke
@@ -188,7 +183,8 @@ public class DefaultMethods {
         };
     }
 
-    @Test(dataProvider = "supers")
+    @ParameterizedTest
+    @MethodSource("supers")
     public void testSuper(Class<?>[] intfs, Class<?> proxyInterface, int expected) throws Throwable {
         final InvocationHandler ih = (proxy, method, params) -> {
             switch (method.getName()) {
@@ -203,21 +199,21 @@ public class DefaultMethods {
         Object proxy = Proxy.newProxyInstance(loader, intfs, ih);
         if (proxyInterface == I1.class) {
             I1 i1 = (I1) proxy;
-            assertEquals(i1.m(), expected);
+            assertEquals(expected, i1.m());
         } else if (proxyInterface == I2.class) {
             I2 i2 = (I2) proxy;
-            assertEquals(i2.m(), expected);
+            assertEquals(expected, i2.m());
         } else if (proxyInterface == I3.class) {
             I3 i3 = (I3) proxy;
-            assertEquals(i3.m(), expected);
+            assertEquals(expected, i3.m());
         } else if (proxyInterface == I4.class) {
             I4 i4 = (I4) proxy;
-            assertEquals(i4.m(), expected);
+            assertEquals(expected, i4.m());
         } else {
             throw new UnsupportedOperationException(proxyInterface.toString());
         }
         // invoke via InvocationHandler.invokeDefaultMethod directly
-        assertEquals(InvocationHandler.invokeDefault(proxy, proxyInterface.getMethod("m")), expected);
+        assertEquals(expected, InvocationHandler.invokeDefault(proxy, proxyInterface.getMethod("m")));
     }
 
     // invoke I12 default methods with parameters and var args
@@ -236,12 +232,12 @@ public class DefaultMethods {
         };
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         I12 i12 = (I12) Proxy.newProxyInstance(loader, new Class<?>[] { I12.class }, ih);
-        assertEquals(i12.sum(1, 2), 3);
-        assertEquals(i12.concat(1, 2, 3, 4), new Object[]{1, 2, 3, 4});
+        assertEquals(3, i12.sum(1, 2));
+        assertArrayEquals(new Object[]{1, 2, 3, 4}, i12.concat(1, 2, 3, 4));
         Method m = I12.class.getMethod("concat", Object.class, Object[].class);
         assertTrue(m.isDefault());
-        assertEquals(InvocationHandler.invokeDefault(i12, m, 100, new Object[] {"foo", true, "bar"}),
-                     new Object[] {100, "foo", true, "bar"});
+        assertArrayEquals(new Object[] {100, "foo", true, "bar"}, (Object[])
+                InvocationHandler.invokeDefault(i12, m, 100, new Object[] {"foo", true, "bar"}));
     }
 
     // test a no-arg default method with and without arguments passed in the invocation
@@ -250,13 +246,13 @@ public class DefaultMethods {
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         Object proxy = Proxy.newProxyInstance(loader, new Class<?>[]{I4.class}, HANDLER);
         Method m1 = I4.class.getMethod("m");
-        assertTrue(m1.getDeclaringClass() == I4.class);
+        assertSame(I4.class, m1.getDeclaringClass());
         assertTrue(m1.isDefault());
         InvocationHandler.invokeDefault(proxy, m1);
         InvocationHandler.invokeDefault(proxy, m1, new Object[0]);
 
         Method m2 = I4.class.getMethod("mix", int.class, String.class);
-        assertTrue(m1.getDeclaringClass() == I4.class);
+        assertSame(I4.class, m1.getDeclaringClass());
         assertTrue(m1.isDefault());
         InvocationHandler.invokeDefault(proxy, m2, Integer.valueOf(100), "foo");
     }
@@ -267,38 +263,37 @@ public class DefaultMethods {
         I3 proxy = (I3)Proxy.newProxyInstance(loader, new Class<?>[]{I3.class}, HANDLER);
         Method m = I3.class.getMethod("m3", String[].class);
         assertTrue(m.isVarArgs() && m.isDefault());
-        assertEquals(proxy.m3("a", "b", "cde"), 5);
-        assertEquals(InvocationHandler.invokeDefault(proxy, m, (Object)new String[] { "a", "bc" }), 3);
+        assertEquals(5, proxy.m3("a", "b", "cde"));
+        assertEquals(3, InvocationHandler.invokeDefault(proxy, m, (Object)new String[] { "a", "bc" }));
     }
 
     /*
      * Invoke I12::m which is an abstract method
      */
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test
     public void invokeAbstractMethod() throws Exception {
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         I12 proxy = (I12) Proxy.newProxyInstance(loader, new Class<?>[]{I12.class}, HANDLER);
         Method method = I12.class.getMethod("m");
-        assertTrue(method.getDeclaringClass() == I12.class);
+        assertSame(I12.class, method.getDeclaringClass());
         assertFalse(method.isDefault());
-        proxy.m();
+        assertThrows(IllegalArgumentException.class, () -> proxy.m());
     }
 
     /*
      * Invoke a non proxy (default) method with parameters
      */
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test
     public void invokeNonProxyMethod() throws Throwable {
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         I3 proxy = (I3) Proxy.newProxyInstance(loader, new Class<?>[]{I3.class}, HANDLER);
         Method m = I4.class.getMethod("mix", int.class, String.class);
         assertTrue(m.isDefault());
-        InvocationHandler.invokeDefault(proxy, m);
+        assertThrows(IllegalArgumentException.class, () -> InvocationHandler.invokeDefault(proxy, m));
     }
 
     // negative cases
-    @DataProvider(name = "negativeCases")
-    private Object[][] negativeCases() {
+    private static Object[][] negativeCases() {
         return new Object[][]{
             // I4::m overrides I1::m and I2::m
             new Object[] { new Class<?>[]{I4.class}, I1.class, "m" },
@@ -315,25 +310,20 @@ public class DefaultMethods {
         };
     }
 
-    @Test(dataProvider = "negativeCases", expectedExceptions = {IllegalArgumentException.class})
+    @ParameterizedTest
+    @MethodSource("negativeCases")
     public void testNegativeCase(Class<?>[] interfaces, Class<?> defc, String name)
             throws Throwable {
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         Object proxy = Proxy.newProxyInstance(loader, interfaces, HANDLER);
-        try {
-            Method method = defc.getDeclaredMethod(name);
-            InvocationHandler.invokeDefault(proxy, method);
-        } catch (Throwable e) {
-            System.out.format("%s method %s::%s exception thrown: %s%n",
-                              Arrays.toString(interfaces), defc.getName(), name, e.getMessage());
-            throw e;
-        }
+        Method method = defc.getDeclaredMethod(name);
+        assertThrows(IllegalArgumentException.class, () ->
+                InvocationHandler.invokeDefault(proxy, method));
     }
 
-    @DataProvider(name = "illegalArguments")
-    private Object[][] illegalArguments() {
-        return new Object[][] {
-            new Object[] { new Object[0]},
+    private static Object[] illegalArguments() {
+        return new Object[] {
+            new Object[] { null },
             new Object[] { new Object[] { 100 }},
             new Object[] { new Object[] { 100, "foo", 100 }},
             new Object[] { new Object[] { 100L, "foo" }},
@@ -342,21 +332,18 @@ public class DefaultMethods {
         };
     }
 
-    @Test(dataProvider = "illegalArguments", expectedExceptions = {IllegalArgumentException.class})
+    @ParameterizedTest
+    @MethodSource("illegalArguments")
     public void testIllegalArgument(Object[] args) throws Throwable {
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         I4 proxy = (I4)Proxy.newProxyInstance(loader, new Class<?>[]{I4.class}, HANDLER);
         Method m = I4.class.getMethod("mix", int.class, String.class);
         assertTrue(m.isDefault());
-        if (args.length == 0) {
-            // substitute empty args with null since @DataProvider doesn't allow null array
-            args = null;
-        }
-        InvocationHandler.invokeDefault(proxy, m, args);
+        assertThrows(IllegalArgumentException.class, () ->
+                InvocationHandler.invokeDefault(proxy, m, args));
     }
 
-    @DataProvider(name = "throwables")
-    private Object[][] throwables() {
+    private static Object[][] throwables() {
         return new Object[][] {
             new Object[] { new IOException() },
             new Object[] { new IllegalArgumentException() },
@@ -367,16 +354,14 @@ public class DefaultMethods {
         };
     }
 
-    @Test(dataProvider = "throwables")
+    @ParameterizedTest
+    @MethodSource("throwables")
     public void testInvocationException(Throwable exception) throws Throwable {
         ClassLoader loader = DefaultMethods.class.getClassLoader();
         IX proxy = (IX)Proxy.newProxyInstance(loader, new Class<?>[]{IX.class}, HANDLER);
         Method m = IX.class.getMethod("doThrow", Throwable.class);
-        try {
-            InvocationHandler.invokeDefault(proxy, m, exception);
-        } catch (Throwable e) {
-            assertEquals(e, exception);
-        }
+        assertSame(exception, assertThrows(Throwable.class, () ->
+                InvocationHandler.invokeDefault(proxy, m, exception)));
     }
 
     private static final InvocationHandler HANDLER = (proxy, method, params) -> {
diff --git a/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java b/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java
index e52d3671ab6..fbaf9db6325 100644
--- a/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java
+++ b/test/jdk/java/lang/reflect/Proxy/HiddenProxyInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8250219
- * @run testng HiddenProxyInterface
+ * @run junit HiddenProxyInterface
  */
 
 import java.lang.invoke.MethodHandles;
@@ -35,8 +35,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class HiddenProxyInterface {
     private static final Path CLASSES_DIR = Paths.get(System.getProperty("test.classes"));
@@ -45,18 +45,19 @@ public class HiddenProxyInterface {
         void m();
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void testHiddenInterface() throws Exception {
         Path classFile = CLASSES_DIR.resolve("HiddenProxyInterface$Intf.class");
         byte[] bytes = Files.readAllBytes(classFile);
         Class<?> hiddenIntf = MethodHandles.lookup().defineHiddenClass(bytes, false).lookupClass();
-        Proxy.newProxyInstance(HiddenProxyInterface.class.getClassLoader(),
+        assertThrows(IllegalArgumentException.class, () -> Proxy.newProxyInstance(
+                HiddenProxyInterface.class.getClassLoader(),
                 new Class<?>[]{ hiddenIntf },
                 new InvocationHandler() {
                     @Override
                     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                         return null;
                     }
-                });
+                }));
     }
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/LazyInitializationTest.java b/test/jdk/java/lang/reflect/Proxy/LazyInitializationTest.java
index cb65904cfdb..2a223873275 100644
--- a/test/jdk/java/lang/reflect/Proxy/LazyInitializationTest.java
+++ b/test/jdk/java/lang/reflect/Proxy/LazyInitializationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,15 @@
 
 import java.lang.reflect.Proxy;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /*
  * @test
  * @bug 8285401
  * @summary Avoid initialization of parameter types in proxy construction
- * @run testng LazyInitializationTest
+ * @run junit LazyInitializationTest
  */
 public final class LazyInitializationTest {
     private static volatile boolean initialized = false;
@@ -50,9 +51,9 @@ public final class LazyInitializationTest {
         Intf value = (Intf) Proxy.newProxyInstance(LazyInitializationTest.class.getClassLoader(),
                 new Class<?>[]{ Intf.class },
                 (proxy, method, args) -> null);
-        Assert.assertFalse(initialized, "parameter type initialized unnecessarily");
+        assertFalse(initialized, "parameter type initialized unnecessarily");
 
         value.m(new Parameter());
-        Assert.assertTrue(initialized, "parameter type initialized after instantiation");
+        assertTrue(initialized, "parameter type initialized after instantiation");
     }
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/ProxyClassAccessTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyClassAccessTest.java
index 50fbd150ec7..265f9ce7104 100644
--- a/test/jdk/java/lang/reflect/Proxy/ProxyClassAccessTest.java
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyClassAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,17 @@ import java.util.List;
 import jdk.test.lib.compiler.CompilerUtils;
 import static jdk.test.lib.process.ProcessTools.executeTestJava;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @library /test/lib
  * @modules jdk.compiler
  * @build ProxyClassAccessTest q.NP
  *        jdk.test.lib.compiler.CompilerUtils
- * @run testng ProxyClassAccessTest
+ * @run junit ProxyClassAccessTest
  * @summary Driver for testing proxy class doesn't have access to
  *          types referenced by proxy interfaces
  */
@@ -61,8 +61,8 @@ public class ProxyClassAccessTest {
     /**
      * Compiles all modules used by the test
      */
-    @BeforeTest
-    public void compileAll() throws Exception {
+    @BeforeAll
+    public static void compileAll() throws Exception {
         for (String mn : modules) {
             Path msrc = SRC_DIR.resolve(mn);
             assertTrue(CompilerUtils.compile(msrc, MODS_DIR, "--module-source-path", SRC_DIR.toString()));
@@ -80,7 +80,7 @@ public class ProxyClassAccessTest {
                             .errorTo(System.out)
                             .getExitValue();
 
-        assertTrue(exitValue == 0);
+        assertEquals(0, exitValue);
     }
 
     /**
@@ -105,16 +105,10 @@ public class ProxyClassAccessTest {
     }
 
     private void checkIAE(ClassLoader loader, Class<?>[] interfaces)  throws Throwable {
-        try {
-            Proxy.getProxyClass(loader, interfaces);
-            throw new RuntimeException("Expected IllegalArgumentException thrown");
-        } catch (IllegalArgumentException e) {}
+        assertThrows(IllegalArgumentException.class, () -> Proxy.getProxyClass(loader, interfaces));
 
-        try {
-            Proxy.newProxyInstance(loader, interfaces,
-                (proxy, m, params) -> { throw new RuntimeException(m.toString()); });
-            throw new RuntimeException("Expected IllegalArgumentException thrown");
-        } catch (IllegalArgumentException e) {}
+        assertThrows(IllegalArgumentException.class, () -> Proxy.newProxyInstance(loader, interfaces,
+                (proxy, m, params) -> { throw new RuntimeException(m.toString()); }));
     }
 
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/ProxyLayerTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyLayerTest.java
index 85ebf922a20..d2708e18c0e 100644
--- a/test/jdk/java/lang/reflect/Proxy/ProxyLayerTest.java
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyLayerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,17 +32,18 @@ import java.util.Arrays;
 import jdk.test.lib.compiler.CompilerUtils;
 import static jdk.test.lib.process.ProcessTools.executeTestJava;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
-/**
+/*
  * @test
  * @library /test/lib
  * @modules jdk.compiler
  * @build ProxyTest jdk.test.lib.process.ProcessTools
  *        jdk.test.lib.compiler.CompilerUtils
- * @run testng ProxyLayerTest
+ * @run junit ProxyLayerTest
  * @summary Test proxies to implement interfaces in a layer
  */
 
@@ -62,8 +63,8 @@ public class ProxyLayerTest {
     /**
      * Compiles all modules used by the test
      */
-    @BeforeTest
-    public void compileAll() throws Exception {
+    @BeforeAll
+    public static void compileAll() throws Exception {
         for (String mn : modules) {
             Path msrc = SRC_DIR.resolve(mn);
             assertTrue(CompilerUtils.compile(msrc, MODS_DIR, "--module-source-path", SRC_DIR.toString()));
@@ -102,7 +103,7 @@ public class ProxyLayerTest {
         assertTrue(proxyClass.getModule().isNamed());
         assertTrue(pkg.isSealed());
         assertTrue(proxyClass.getModule().isExported(pkg.getName()));
-        assertEquals(proxyClass.getModule().getLayer(), null);
+        assertNull(proxyClass.getModule().getLayer());
     }
 
     /**
@@ -134,7 +135,7 @@ public class ProxyLayerTest {
         assertTrue(proxyClass.getModule().isNamed());
         assertTrue(pkg.isSealed());
         assertFalse(proxyClass.getModule().isExported(pkg.getName()));
-        assertEquals(proxyClass.getModule().getLayer(), null);
+        assertNull(proxyClass.getModule().getLayer());
     }
 
     /**
@@ -164,15 +165,8 @@ public class ProxyLayerTest {
     }
 
     private void checkIAE(ClassLoader loader, Class<?>[] interfaces) {
-        try {
-            Proxy.getProxyClass(loader, interfaces);
-            throw new RuntimeException("Expected IllegalArgumentException thrown");
-        } catch (IllegalArgumentException e) {}
-
-        try {
-            Proxy.newProxyInstance(loader, interfaces, handler);
-            throw new RuntimeException("Expected IllegalArgumentException thrown");
-        } catch (IllegalArgumentException e) {}
+        assertThrows(IllegalArgumentException.class, () -> Proxy.getProxyClass(loader, interfaces));
+        assertThrows(IllegalArgumentException.class, () -> Proxy.newProxyInstance(loader, interfaces, handler));
     }
 
     private final static InvocationHandler handler =
diff --git a/test/jdk/java/lang/reflect/Proxy/ProxyTest.java b/test/jdk/java/lang/reflect/Proxy/ProxyTest.java
index 811471585a9..1da6a10260a 100644
--- a/test/jdk/java/lang/reflect/Proxy/ProxyTest.java
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,17 @@ import java.util.List;
 import jdk.test.lib.compiler.CompilerUtils;
 import static jdk.test.lib.process.ProcessTools.executeTestJava;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @library /test/lib
  * @modules jdk.compiler
  * @build ProxyTest q.U
  *        jdk.test.lib.compiler.CompilerUtils
- * @run testng ProxyTest
+ * @run junit ProxyTest
  * @summary Driver for testing proxies accessing interfaces in named modules
  */
 
@@ -59,8 +59,8 @@ public class ProxyTest {
     /**
      * Compiles all modules used by the test
      */
-    @BeforeTest
-    public void compileAll() throws Exception {
+    @BeforeAll
+    public static void compileAll() throws Exception {
         for (String mn : modules) {
             Path msrc = SRC_DIR.resolve(mn);
             assertTrue(CompilerUtils.compile(msrc, MODS_DIR, "--module-source-path", SRC_DIR.toString()));
@@ -79,7 +79,7 @@ public class ProxyTest {
                             .errorTo(System.out)
                             .getExitValue();
 
-        assertTrue(exitValue == 0);
+        assertEquals(0, exitValue);
     }
 
     /**
@@ -95,6 +95,6 @@ public class ProxyTest {
                 .errorTo(System.out)
                 .getExitValue();
 
-        assertTrue(exitValue == 0);
+        assertEquals(0, exitValue);
     }
 }
diff --git a/test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java b/test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java
index 1337248f817..822c5d83319 100644
--- a/test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java
+++ b/test/jdk/java/lang/reflect/Proxy/SealedInterfaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,15 @@
 /*
  * @test
  * @bug 8269351
- * @run testng SealedInterfaceTest
+ * @run junit SealedInterfaceTest
  */
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class SealedInterfaceTest {
     sealed interface Intf permits NonSealedInterface {
@@ -43,16 +43,17 @@ public class SealedInterfaceTest {
         void m2();
     }
 
-    @Test(expectedExceptions = { IllegalArgumentException.class })
+    @Test
     public void testSealedInterface() {
-        Proxy.newProxyInstance(SealedInterfaceTest.class.getClassLoader(),
+        assertThrows(IllegalArgumentException.class, () -> Proxy.newProxyInstance(
+                SealedInterfaceTest.class.getClassLoader(),
                 new Class<?>[]{ Intf.class },
                 new InvocationHandler() {
                     @Override
                     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
                         return null;
                     }
-                });
+                }));
     }
 
     @Test
diff --git a/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java b/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java
index a472f75d4b7..b16831c7867 100644
--- a/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java
+++ b/test/jdk/java/lang/reflect/Proxy/TestVarArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,10 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8022795
- * @run testng TestVarArgs
+ * @run junit TestVarArgs
  * @summary Verify if a method defined in a proxy interface has ACC_VARARGS set
  */
 
@@ -34,11 +34,10 @@ import java.lang.invoke.MethodType;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.Arrays;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class TestVarArgs {
     interface I {
@@ -48,8 +47,7 @@ public class TestVarArgs {
         Object call(Object[] values);
     }
 
-    @DataProvider(name = "proxyInterfaces")
-    public Object[][] proxyInterfaces() {
+    public static Object[][] proxyInterfaces() {
         return new Object[][] {
              { new Class<?>[] { I.class }, true},
              { new Class<?>[] { J.class }, false},
@@ -58,11 +56,12 @@ public class TestVarArgs {
         };
     }
 
-    @Test(dataProvider = "proxyInterfaces")
+    @ParameterizedTest
+    @MethodSource("proxyInterfaces")
     public void testMethod(Class<?>[] proxyInterfaces, boolean isVarArgs) throws Throwable {
         // check if the first proxy interface with the method named "call" declares var result
         Method m = proxyInterfaces[0].getMethod("call", Object[].class);
-        assertTrue(m.isVarArgs() == isVarArgs);
+        assertEquals(isVarArgs, m.isVarArgs());
 
         // the method in the generated proxy class should match the method
         // declared in the proxy interface
@@ -71,19 +70,19 @@ public class TestVarArgs {
         Class<?> proxyClass = proxy.getClass();
         assertTrue(Proxy.isProxyClass(proxyClass));
         Method method = proxyClass.getMethod("call", Object[].class);
-        assertTrue(method.isVarArgs() == isVarArgs);
+        assertEquals(isVarArgs, method.isVarArgs());
 
-        Object params = new Object[] { "foo", "bar", "goo" };
-        Object result;
+        Object[] params = new Object[] { "foo", "bar", "goo" };
+        Object[] result;
 
         // test reflection
-        result = method.invoke(proxy, params);
-        assertEquals(result, params);
+        result = (Object[]) method.invoke(proxy, new Object[] {params});
+        assertEquals(params, result);
 
         // test method handle
         MethodHandle mh = MethodHandles.lookup().findVirtual(proxyClass, "call",
                       MethodType.methodType(Object.class, Object[].class));
-        assertTrue(mh.isVarargsCollector() == isVarArgs);
+        assertEquals(isVarArgs, mh.isVarargsCollector());
         MethodHandle mhVarArity = mh;
         MethodHandle mhFixedArity = mh;
         if (isVarArgs) {
@@ -91,18 +90,18 @@ public class TestVarArgs {
         } else {
             mhVarArity = mh.asVarargsCollector(Object[].class);
         }
-        result = mhVarArity.invoke(proxy, "foo", "bar", "goo");
-        assertEquals(result, params);
+        result = (Object[]) mhVarArity.invoke(proxy, "foo", "bar", "goo");
+        assertArrayEquals(params, result);
 
-        result = mhFixedArity.invoke(proxy, params);
-        assertEquals(result, params);
+        result = (Object[]) mhFixedArity.invoke(proxy, params);
+        assertArrayEquals(params, result);
 
         if (!isVarArgs) {
             MethodType mt = MethodType.methodType(Object.class, Object.class, String.class, String.class, String.class);
             mh = mh.asVarargsCollector(Object[].class).asType(mt);
         }
-        result = mh.invoke(proxy, "foo", "bar", "goo");
-        assertEquals(result, params);
+        result = (Object[]) mh.invoke(proxy, "foo", "bar", "goo");
+        assertArrayEquals(params, result);
     }
 
     private static final InvocationHandler IH = new InvocationHandler() {
diff --git a/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/DefaultMethodProxy.java b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/DefaultMethodProxy.java
index daf6f656aab..a304063638c 100644
--- a/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/DefaultMethodProxy.java
+++ b/test/jdk/java/lang/reflect/Proxy/nonPublicProxy/DefaultMethodProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,17 @@ import java.lang.reflect.*;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @bug 8159746
  * @summary Test invoking a default method in a non-public proxy interface
  * @build p.Foo p.Bar p.ProxyMaker
- * @run testng DefaultMethodProxy
+ * @run junit DefaultMethodProxy
  */
 public class DefaultMethodProxy {
     public interface I {
@@ -42,7 +43,7 @@ public class DefaultMethodProxy {
     }
 
     @Test
-    public static void publicInterface() throws ReflectiveOperationException {
+    public void publicInterface() throws ReflectiveOperationException {
         // create a proxy instance of a public proxy interface should succeed
         Proxy proxy = (Proxy)Proxy.newProxyInstance(DefaultMethodProxy.class.getClassLoader(),
                 new Class<?>[] { I.class }, IH);
@@ -50,11 +51,9 @@ public class DefaultMethodProxy {
         testDefaultMethod(proxy, "I");
 
         // can get the invocation handler
-        assertTrue(Proxy.getInvocationHandler(proxy) == IH);
+        assertSame(IH, Proxy.getInvocationHandler(proxy));
     }
 
-
-    @DataProvider(name = "nonPublicIntfs")
     private static Object[][] nonPublicIntfs() throws ClassNotFoundException {
         Class<?> fooClass = Class.forName("p.Foo");
         Class<?> barClass = Class.forName("p.Bar");
@@ -65,8 +64,9 @@ public class DefaultMethodProxy {
         };
     }
 
-    @Test(dataProvider = "nonPublicIntfs")
-    public static void hasPackageAccess(Class<?>[] intfs, String expected) throws ReflectiveOperationException {
+    @ParameterizedTest
+    @MethodSource("nonPublicIntfs")
+    public void hasPackageAccess(Class<?>[] intfs, String expected) throws ReflectiveOperationException {
         Proxy proxy = (Proxy)Proxy.newProxyInstance(DefaultMethodProxy.class.getClassLoader(), intfs, IH);
         testDefaultMethod(proxy, expected);
 
@@ -75,19 +75,13 @@ public class DefaultMethodProxy {
     }
 
     // IAE thrown at invocation time
-    @Test(dataProvider = "nonPublicIntfs", expectedExceptions = {IllegalAccessException.class})
-    public static void noPackageAccess(Class<?>[] intfs, String ignored) throws Throwable {
+    @ParameterizedTest
+    @MethodSource("nonPublicIntfs")
+    public void noPackageAccess(Class<?>[] intfs, String ignored) throws Throwable {
         Proxy proxy = (Proxy)Proxy.newProxyInstance(DefaultMethodProxy.class.getClassLoader(), intfs, IH_NO_ACCESS);
-        try {
-            testDefaultMethod(proxy, "dummy");
-        } catch (InvocationTargetException e) {
-            // unwrap the exception
-            if (e.getCause() instanceof UndeclaredThrowableException) {
-                Throwable cause = e.getCause();
-                throw cause.getCause();
-            }
-            throw e;
-        }
+        InvocationTargetException ite = assertThrows(InvocationTargetException.class, () -> testDefaultMethod(proxy, "dummy"));
+        var ute = assertInstanceOf(UndeclaredThrowableException.class, ite.getCause(), "unwrap the InvocationTargetException");
+        assertInstanceOf(IllegalAccessException.class, ute.getCause(), "unwrap the UndeclaredThrowableException");
     }
 
     /*
diff --git a/test/jdk/java/lang/reflect/annotationSharing/AnnotationSharing.java b/test/jdk/java/lang/reflect/annotationSharing/AnnotationSharing.java
index 98a13d6416c..b29c74637d6 100644
--- a/test/jdk/java/lang/reflect/annotationSharing/AnnotationSharing.java
+++ b/test/jdk/java/lang/reflect/annotationSharing/AnnotationSharing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,13 @@
  * @summary Test sharing of annotations between Executable/Field instances.
  *          Sharing should not be noticeable when performing mutating
  *          operations.
- * @run testng AnnotationSharing
+ * @run junit AnnotationSharing
  */
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class AnnotationSharing {
     @Test
diff --git a/test/jdk/java/lang/reflect/callerCache/CustomLoaderTest.java b/test/jdk/java/lang/reflect/callerCache/CustomLoaderTest.java
index f3a429027d9..6951cc0829c 100644
--- a/test/jdk/java/lang/reflect/callerCache/CustomLoaderTest.java
+++ b/test/jdk/java/lang/reflect/callerCache/CustomLoaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib/
  * @modules jdk.compiler
  * @build CustomLoaderTest jdk.test.lib.compiler.CompilerUtils
- * @run testng/othervm CustomLoaderTest
+ * @run junit/othervm CustomLoaderTest
  *
  * @summary Test method whose parameter types and return type are not visible to the caller.
  */
@@ -42,27 +42,23 @@ import java.nio.file.Paths;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import jdk.test.lib.compiler.CompilerUtils;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class CustomLoaderTest {
     private static final Path CLASSES = Paths.get("classes");
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         String src = System.getProperty("test.src", ".");
         String classpath = System.getProperty("test.classes", ".");
         boolean rc = CompilerUtils.compile(Paths.get(src, "ReflectTest.java"), CLASSES, "-cp", classpath);
         if (!rc) {
-            throw new RuntimeException("fail compilation");
-        }
-        try {
-            Class<?> p = Class.forName("ReflectTest$P");
-            fail("should not be visible to this loader");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+            fail("fail compilation");
         }
+        assertThrows(ClassNotFoundException.class, () -> Class.forName("ReflectTest$P"),
+                "should not be visible to this loader");
     }
 
     @Test
@@ -72,17 +68,17 @@ public class CustomLoaderTest {
         Method m1 = loader1.findMethod();
         Method m2 = loader2.findMethod();
 
-        assertTrue(m1.getDeclaringClass() != m2.getDeclaringClass());
+        assertNotSame(m1.getDeclaringClass(), m2.getDeclaringClass());
 
-        assertTrue(m1.getDeclaringClass() == loader1.c);
-        assertTrue(m2.getDeclaringClass() == loader2.c);
+        assertSame(loader1.c, m1.getDeclaringClass());
+        assertSame(loader2.c, m2.getDeclaringClass());
 
         Object o1 = m1.invoke(loader1.c.newInstance(), loader1.p.newInstance(), loader1.q.newInstance());
         Object o2 = m2.invoke(loader2.c.newInstance(), loader2.p.newInstance(), loader2.q.newInstance());
 
-        assertTrue(o1.getClass() != o2.getClass());
-        assertTrue(o1.getClass() == loader1.r);
-        assertTrue(o2.getClass() == loader2.r);
+        assertNotSame(o1.getClass(), o2.getClass());
+        assertSame(loader1.r, o1.getClass());
+        assertSame(loader2.r, o2.getClass());
     }
 
     static class TestLoader extends URLClassLoader {
diff --git a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java
index b640a5e2150..4513c698a54 100644
--- a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java
+++ b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib/
  * @modules jdk.compiler
  * @build ReflectionCallerCacheTest Members jdk.test.lib.compiler.CompilerUtils
- * @run testng/othervm ReflectionCallerCacheTest
+ * @run junit/othervm ReflectionCallerCacheTest
  */
 
 import java.io.IOException;
@@ -44,16 +44,16 @@ import java.util.concurrent.Callable;
 
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.util.ForceGC;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ReflectionCallerCacheTest {
     private static final Path CLASSES = Paths.get("classes");
     private static final ReflectionCallerCacheTest TEST = new ReflectionCallerCacheTest();
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         String src = System.getProperty("test.src", ".");
         String classpath = System.getProperty("test.classes", ".");
         boolean rc = CompilerUtils.compile(Paths.get(src, "AccessTest.java"), CLASSES, "-cp", classpath);
@@ -61,8 +61,8 @@ public class ReflectionCallerCacheTest {
             throw new RuntimeException("fail compilation");
         }
     }
-    @DataProvider(name = "memberAccess")
-    public Object[][] memberAccess() {
+
+    public static Object[][] memberAccess() {
         return new Object[][] {
             { "AccessTest$PublicConstructor" },
             { "AccessTest$PublicMethod" },
@@ -102,8 +102,9 @@ public class ReflectionCallerCacheTest {
         }
     }
 
-    @Test(dataProvider = "memberAccess")
-    private void load(String classname) throws Exception {
+    @ParameterizedTest
+    @MethodSource("memberAccess")
+    void load(String classname) throws Exception {
         WeakReference<?> weakLoader = loadAndRunClass(classname);
 
         // Force garbage collection to trigger unloading of class loader
diff --git a/test/jdk/java/lang/reflect/records/CheckEqualityIsBasedOnFields.java b/test/jdk/java/lang/reflect/records/CheckEqualityIsBasedOnFields.java
index b5c438e4f9a..c3e4431bd84 100644
--- a/test/jdk/java/lang/reflect/records/CheckEqualityIsBasedOnFields.java
+++ b/test/jdk/java/lang/reflect/records/CheckEqualityIsBasedOnFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,15 @@
  * @test
  * @bug 8257598
  * @summary check that Record::equals uses the fields and not the accessors for the comparison
- * @run testng CheckEqualityIsBasedOnFields
+ * @run junit CheckEqualityIsBasedOnFields
  */
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CheckEqualityIsBasedOnFields {
     public record R01(boolean x) {
@@ -91,8 +89,7 @@ public class CheckEqualityIsBasedOnFields {
         }
     }
 
-    @DataProvider(name = "recordData")
-    public Object[][] recordTypeAndExpectedValue() {
+    public static Object[][] recordTypeAndExpectedValue() {
         return new Object[][] {
                 new Object[] { R01.class, boolean.class, new Object[]{true, false} },
                 new Object[] { R02.class, byte.class, new Object[]{(byte)0, (byte)1, (byte)2, (byte)3, (byte)4, (byte)5,
@@ -112,7 +109,8 @@ public class CheckEqualityIsBasedOnFields {
         };
     }
 
-    @Test(dataProvider = "recordData")
+    @ParameterizedTest
+    @MethodSource("recordTypeAndExpectedValue")
     public void testEqualsDoesntUseAccessors(Class<?> clazz, Class<?> componentClass, Object[] expectedXValues) throws Exception {
         Constructor<?> ctor;
         Method getter, equalsMethod;
@@ -125,8 +123,8 @@ public class CheckEqualityIsBasedOnFields {
             System.out.println(rec1.toString());
             System.out.println(rec2.toString());
             assertFalse((boolean) equalsMethod.invoke(rec1, rec2));
-            assertNotEquals(expectedXValues[i], expectedXValues[i + expectedXValues.length / 2]);
-            assertEquals(getter.invoke(rec1), getter.invoke(rec2));
+            assertNotEquals(expectedXValues[i + expectedXValues.length / 2], expectedXValues[i]);
+            assertEquals(getter.invoke(rec2), getter.invoke(rec1));
         }
     }
 }
diff --git a/test/jdk/java/lang/reflect/records/IsRecordTest.java b/test/jdk/java/lang/reflect/records/IsRecordTest.java
index 4888e6d506e..153329a7832 100644
--- a/test/jdk/java/lang/reflect/records/IsRecordTest.java
+++ b/test/jdk/java/lang/reflect/records/IsRecordTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,32 +26,31 @@
  * @bug 8255560
  * @summary Class::isRecord should check that the current class is final and not abstract
  * @library /test/lib
- * @run testng/othervm IsRecordTest
+ * @run junit/othervm IsRecordTest
  */
 
 import java.lang.classfile.ClassFile;
 import java.lang.constant.ClassDesc;
-import java.lang.reflect.AccessFlag;
 import java.util.List;
 import java.util.Map;
 
 import java.lang.classfile.attribute.RecordAttribute;
 import java.lang.classfile.attribute.RecordComponentInfo;
 import jdk.test.lib.ByteCodeLoader;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.lang.classfile.ClassFile.ACC_ABSTRACT;
 import static java.lang.classfile.ClassFile.ACC_FINAL;
 import static java.lang.constant.ConstantDescs.CD_int;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class IsRecordTest {
 
-    @DataProvider(name = "scenarios")
-    public Object[][] scenarios() {
+    public static Object[][] scenarios() {
         return new Object[][] {
              // isFinal, isAbstract, extendJLR, withRecAttr, expectIsRecord
              {     false,    false,     false,    true,      false    },
@@ -75,7 +74,8 @@ public class IsRecordTest {
      * iii) direct subclass of j.l.Record (or not), along with the presence or
      * absence of a record attribute.
      */
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     public void testDirectSubClass(boolean isFinal,
                                    boolean isAbstract,
                                    boolean extendsJLR,
@@ -92,9 +92,8 @@ public class IsRecordTest {
         Class<?> cls = ByteCodeLoader.load("C", classBytes);
         out.println("cls=%s, Record::isAssignable=%s, isRecord=%s"
                 .formatted(cls, Record.class.isAssignableFrom(cls), cls.isRecord()));
-        assertEquals(cls.isRecord(), expectIsRecord);
-        var getRecordComponents = cls.getRecordComponents();
-        assertTrue(expectIsRecord ? getRecordComponents != null : getRecordComponents == null);
+        assertEquals(expectIsRecord, cls.isRecord());
+        assertEquals(expectIsRecord, cls.getRecordComponents() != null);
     }
 
     /**
@@ -102,7 +101,8 @@ public class IsRecordTest {
      * along with the presence or absence of a record attribute, where the class has
      * a superclass whose superclass is j.l.Record.
      */
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     public void testIndirectSubClass(boolean isFinal,
                                      boolean isAbstract,
                                      boolean unused1,
@@ -127,8 +127,8 @@ public class IsRecordTest {
                     .formatted(cls, Record.class.isAssignableFrom(cls), cls.isRecord()));
         assertFalse(supFooCls.isRecord());
         assertFalse(subFooCls.isRecord());
-        assertEquals(supFooCls.getRecordComponents(), null);
-        assertEquals(subFooCls.getRecordComponents(), null);
+        assertNull(supFooCls.getRecordComponents());
+        assertNull(subFooCls.getRecordComponents());
     }
 
     /** Tests record-ness properties of traditionally compiled classes. */
@@ -137,23 +137,23 @@ public class IsRecordTest {
         out.println("\n--- testBasicRecords ---");
         record EmptyRecord () { }
         assertTrue(EmptyRecord.class.isRecord());
-        assertEquals(EmptyRecord.class.getRecordComponents().length, 0);
+        assertEquals(0, EmptyRecord.class.getRecordComponents().length);
 
         record FooRecord (int x) { }
         assertTrue(FooRecord.class.isRecord());
-        assertTrue(FooRecord.class.getRecordComponents() != null);
+        assertNotNull(FooRecord.class.getRecordComponents());
 
         final record FinalFooRecord (int x) { }
         assertTrue(FinalFooRecord.class.isRecord());
-        assertTrue(FinalFooRecord.class.getRecordComponents() != null);
+        assertNotNull(FinalFooRecord.class.getRecordComponents());
 
         class A { }
         assertFalse(A.class.isRecord());
-        assertFalse(A.class.getRecordComponents() != null);
+        assertNull(A.class.getRecordComponents());
 
         final class B { }
         assertFalse(B.class.isRecord());
-        assertFalse(B.class.getRecordComponents() != null);
+        assertNull(B.class.getRecordComponents());
     }
 
     // --  infra
diff --git a/test/jdk/java/lang/reflect/records/RecordReflectionTest.java b/test/jdk/java/lang/reflect/records/RecordReflectionTest.java
index 0598e88f0c1..5cc2fd4f8eb 100644
--- a/test/jdk/java/lang/reflect/records/RecordReflectionTest.java
+++ b/test/jdk/java/lang/reflect/records/RecordReflectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,17 @@
  * @summary reflection test for records
  * @build R10
  * @compile RecordReflectionTest.java
- * @run testng/othervm RecordReflectionTest
+ * @run junit/othervm RecordReflectionTest
  */
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
 import java.util.List;
-import org.testng.annotations.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@Test
 public class RecordReflectionTest {
 
     class NoRecord {}
@@ -78,8 +79,7 @@ public class RecordReflectionTest {
         R13 {} // compact constructor, will contain mandated parameters
     }
 
-    @DataProvider(name = "recordClasses")
-    public Object[][] recordClassData() {
+    public static Object[][] recordClassData() {
         return List.of(R1.class,
                        R2.class,
                        R3.class,
@@ -96,17 +96,17 @@ public class RecordReflectionTest {
         ).stream().map(c -> new Object[] {c}).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "recordClasses")
+    @ParameterizedTest
+    @MethodSource("recordClassData")
     public void testIsRecord(Class<?> cls) {
         String message = cls.toGenericString();
         assertTrue(cls.isRecord());
-        assertTrue(cls.getSuperclass() == java.lang.Record.class);
-        assertTrue(cls.getRecordComponents() != null);
+        assertSame(Record.class, cls.getSuperclass());
+        assertNotNull(cls.getRecordComponents());
         assertTrue(message.contains("record"), message);
     }
 
-    @DataProvider(name = "notRecordClasses")
-    public Object[][] notRecordClasses() {
+    public static List<Class<?>> notRecordClasses() {
         return List.of(NoRecord.class,
                        NoRecord[].class,
                        Record.class,  // java.lang.Record is not itself a record class
@@ -116,19 +116,18 @@ public class RecordReflectionTest {
                        int.class,
                        int[].class,
                        long.class,
-                       long[].class)
-                   .stream().map(c -> new Object[] {c}).toArray(Object[][]::new);
+                       long[].class);
     }
 
-    @Test(dataProvider = "notRecordClasses")
+    @ParameterizedTest
+    @MethodSource("notRecordClasses")
     public void testNotARecordClass(Class<?> cls) {
         assertFalse(cls.isRecord());
-        assertFalse(cls.getSuperclass() == java.lang.Record.class);
-        assertTrue(cls.getRecordComponents() == null);
+        assertNotSame(Record.class, cls.getSuperclass());
+        assertNull(cls.getRecordComponents());
     }
 
-    @DataProvider(name = "reflectionData")
-    public Object[][] reflectionData() {
+    public static Object[][] reflectionData() {
         return new Object[][] {
             new Object[] { new R1(),
                            0,
@@ -181,7 +180,8 @@ public class RecordReflectionTest {
         };
     }
 
-    @Test(dataProvider = "reflectionData")
+    @ParameterizedTest
+    @MethodSource("reflectionData")
     public void testRecordReflection(Object recordOb,
                                      int numberOfComponents,
                                      Object[] values,
@@ -192,13 +192,13 @@ public class RecordReflectionTest {
         Class<?> recordClass = recordOb.getClass();
         assertTrue(recordClass.isRecord());
         RecordComponent[] recordComponents = recordClass.getRecordComponents();
-        assertEquals(recordComponents.length, numberOfComponents);
+        assertEquals(numberOfComponents, recordComponents.length);
         int i = 0;
         for (RecordComponent rc : recordComponents) {
-            assertEquals(rc.getName(), names[i]);
-            assertEquals(rc.getType(), rc.getAccessor().getReturnType());
-            assertEquals(rc.getAccessor().invoke(recordOb), values[i]);
-            assertEquals(rc.getAccessor().getGenericReturnType().toString(), signatures[i],
+            assertEquals(names[i], rc.getName());
+            assertEquals(rc.getAccessor().getReturnType(), rc.getType());
+            assertEquals(values[i], rc.getAccessor().invoke(recordOb));
+            assertEquals(signatures[i], rc.getAccessor().getGenericReturnType().toString(),
                          String.format("signature of method \"%s\" different from expected signature \"%s\"",
                                  rc.getAccessor().getGenericReturnType(), signatures[i]));
             i++;
@@ -207,7 +207,7 @@ public class RecordReflectionTest {
         var constructor = recordClass.getDeclaredConstructors()[0];
         i = 0;
         for (var p: constructor.getParameters()) {
-            assertEquals(p.getParameterizedType().toString(), signatures[i],
+            assertEquals(signatures[i], p.getParameterizedType().toString(),
                     String.format("signature of method \"%s\" different from expected signature \"%s\"",
                             p.getType().toString(), signatures[i]));
             i++;
@@ -215,7 +215,7 @@ public class RecordReflectionTest {
         // similar as above but testing another API
         i = 0;
         for (var p : constructor.getGenericParameterTypes()) {
-            assertEquals(p.toString(), signatures[i],
+            assertEquals(signatures[i], p.toString(),
                     String.format("signature of method \"%s\" different from expected signature \"%s\"",
                             p.toString(), signatures[i]));
             i++;
@@ -228,16 +228,17 @@ public class RecordReflectionTest {
 
     record AnnotatedRec(@RCA int i) {}
 
+    @Test
     public void testDeclAnnotationsInRecordComp() throws Throwable {
         Class<?> recordClass = AnnotatedRec.class;
         RecordComponent rc = recordClass.getRecordComponents()[0];
         Annotation[] annos = rc.getAnnotations();
-        assertEquals(annos.length, 1);
-        assertEquals(annos[0].toString(), "@RecordReflectionTest.RCA()");
+        assertEquals(1, annos.length);
+        assertEquals("@RecordReflectionTest.RCA()", annos[0].toString());
 
         Field f = recordClass.getDeclaredField("i");
-        assertEquals(f.getAnnotations().length, 1);
-        assertEquals(f.getAnnotations()[0].toString(), annos[0].toString());
+        assertEquals(1, f.getAnnotations().length);
+        assertEquals(annos[0].toString(), f.getAnnotations()[0].toString());
     }
 
     @Retention(RetentionPolicy.RUNTIME)
@@ -246,30 +247,28 @@ public class RecordReflectionTest {
 
     record TypeAnnotatedRec(@TYPE_USE int i) {}
 
+    @Test
     public void testTypeAnnotationsInRecordComp() throws Throwable {
         Class<?> recordClass = TypeAnnotatedRec.class;
         RecordComponent rc = recordClass.getRecordComponents()[0];
         AnnotatedType at = rc.getAnnotatedType();
         Annotation[] annos = at.getAnnotations();
-        assertEquals(annos.length, 1);
-        assertEquals(annos[0].toString(), "@RecordReflectionTest.TYPE_USE()");
+        assertEquals(1, annos.length);
+        assertEquals("@RecordReflectionTest.TYPE_USE()", annos[0].toString());
 
         Field f = recordClass.getDeclaredField("i");
-        assertEquals(f.getAnnotatedType().getAnnotations().length, 1);
-        assertEquals(f.getAnnotatedType().getAnnotations()[0].toString(), annos[0].toString());
+        assertEquals(1, f.getAnnotatedType().getAnnotations().length);
+        assertEquals(annos[0].toString(), f.getAnnotatedType().getAnnotations()[0].toString());
     }
 
+    @Test
     public void testReadOnlyFieldInRecord() throws Throwable {
         R2 o = new R2(1, 2);
         Class<?> recordClass = R2.class;
         String fieldName = "i";
         Field f = recordClass.getDeclaredField(fieldName);
         assertTrue(f.trySetAccessible());
-        assertTrue(f.get(o) != null);
-        try {
-            f.set(o, null);
-            assertTrue(false, "should fail to set " + fieldName);
-        } catch (IllegalAccessException e) {
-        }
+        assertNotNull(f.get(o));
+        assertThrows(IllegalAccessException.class, () -> f.set(o, null));
     }
 }
diff --git a/test/jdk/java/lang/reflect/sealed_classes/SealedClassesReflectionTest.java b/test/jdk/java/lang/reflect/sealed_classes/SealedClassesReflectionTest.java
index 03caebb49e8..6e14a5d540e 100644
--- a/test/jdk/java/lang/reflect/sealed_classes/SealedClassesReflectionTest.java
+++ b/test/jdk/java/lang/reflect/sealed_classes/SealedClassesReflectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,17 @@
  * @bug 8227046
  * @summary reflection test for sealed classes
  * @compile SealedClassesReflectionTest.java
- * @run testng/othervm SealedClassesReflectionTest
+ * @run junit/othervm SealedClassesReflectionTest
  */
 
 import java.lang.annotation.*;
-import java.lang.constant.ClassDesc;
 import java.lang.reflect.*;
 import java.util.Arrays;
 import java.util.List;
-import org.testng.annotations.*;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@Test
 public class SealedClassesReflectionTest {
 
     sealed class SealedClass1 permits FinalSubclass1, NonSealedSubclass1 {}
@@ -68,8 +67,7 @@ public class SealedClassesReflectionTest {
     sealed class SealedSubclass2 implements SealedInt3 permits NonSealedSubclass2 {}
     non-sealed class NonSealedSubclass2 extends SealedSubclass2 {}
 
-    @DataProvider(name = "sealedClasses")
-    public Object[][] sealedClassesData() {
+    public static List<Class<?>> sealedClassesData() {
         return List.of(
                 SealedClass1.class,
                 SealedClass2.class,
@@ -79,19 +77,19 @@ public class SealedClassesReflectionTest {
                 SealedInt2.class,
                 SealedInt3.class,
                 SealedSubInt1.class
-        ).stream().map(c -> new Object[] {c}).toArray(Object[][]::new);
+        );
     }
 
-    @Test(dataProvider = "sealedClasses")
+    @ParameterizedTest
+    @MethodSource("sealedClassesData")
     public void testSealedClasses(Class<?> cls) {
         assertTrue(cls.isSealed());
-        assertTrue(!Modifier.isFinal(cls.getModifiers()));
-        assertTrue(cls.getPermittedSubclasses() != null);
+        assertFalse(Modifier.isFinal(cls.getModifiers()));
+        assertNotNull(cls.getPermittedSubclasses());
         assertTrue(cls.getPermittedSubclasses().length > 0);
     }
 
-    @DataProvider(name = "notSealedClasses")
-    public Object[][] notSealedClassesData() {
+    public static List<Class<?>> notSealedClassesData() {
         return List.of(
                 Object.class,
                 void.class, Void.class, Void[].class,
@@ -104,34 +102,34 @@ public class SealedClassesReflectionTest {
                 double.class, double[].class, Double.class, Double[].class,
                 boolean.class, boolean[].class, Boolean.class, Boolean[].class,
                 String.class, String[].class
-        ).stream().map(c -> new Object[] {c}).toArray(Object[][]::new);
+        );
     }
 
-    @Test(dataProvider = "notSealedClasses")
+    @ParameterizedTest
+    @MethodSource("notSealedClassesData")
     public void testNotSealedClasses(Class<?> cls) {
-        assertTrue(!cls.isSealed());
-        assertTrue(cls.getPermittedSubclasses() == null);
+        assertFalse(cls.isSealed());
+        assertNull(cls.getPermittedSubclasses());
     }
 
-    @DataProvider(name = "non_sealedClasses")
-    public Object[][] non_sealedClassesData() {
+    public static List<Class<?>> non_sealedClassesData() {
         return List.of(
                 NonSealedSubclass1.class,
                 NonSealedSubInt1.class,
                 NonSealedSubclass2.class
-        ).stream().map(c -> new Object[] {c}).toArray(Object[][]::new);
+        );
     }
 
-    @Test(dataProvider = "non_sealedClasses")
+    @ParameterizedTest
+    @MethodSource("non_sealedClassesData")
     public void testnon_sealedClasses(Class<?> cls) {
-        assertTrue(!cls.isSealed());
-        assertTrue(!Modifier.isFinal(cls.getModifiers()));
+        assertFalse(cls.isSealed());
+        assertFalse(Modifier.isFinal(cls.getModifiers()));
         assertTrue((cls.getSuperclass() != null && cls.getSuperclass().isSealed()) || Arrays.stream(cls.getInterfaces()).anyMatch(Class::isSealed));
-        assertTrue(cls.getPermittedSubclasses() == null);
+        assertNull(cls.getPermittedSubclasses());
     }
 
-    @DataProvider(name = "reflectionData")
-    public Object[][] reflectionData() {
+    public static Object[][] reflectionData() {
         return new Object[][] {
                 new Object[] {
                         SealedClass1.class,
@@ -204,7 +202,8 @@ public class SealedClassesReflectionTest {
         SEALED, NON_SEALED, FINAL
     }
 
-    @Test(dataProvider = "reflectionData")
+    @ParameterizedTest
+    @MethodSource("reflectionData")
     public void testSealedReflection(Class<?> sealedClass,
                                      int numberOfSubclasses,
                                      String[] subclassDescriptors,
@@ -213,10 +212,10 @@ public class SealedClassesReflectionTest {
             throws ReflectiveOperationException
     {
         assertTrue(sealedClass.isSealed());
-        assertTrue(sealedClass.getPermittedSubclasses().length == numberOfSubclasses);
+        assertEquals(numberOfSubclasses, sealedClass.getPermittedSubclasses().length);
         int i = 0;
         for (Class<?> cd : sealedClass.getPermittedSubclasses()) {
-            assertTrue(cd.getName().equals(subclassDescriptors[i]), "expected: " + subclassDescriptors[i] + " found: " + cd.getName());
+            assertEquals(subclassDescriptors[i], cd.getName());
             i++;
         }
         i = 0;
diff --git a/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java b/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java
index 6e1ef8e4c9f..3fbdfc5e9ab 100644
--- a/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java
+++ b/test/jdk/java/lang/runtime/ExactnessConversionsSupportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,46 +21,20 @@
  * questions.
  */
 
-import org.testng.annotations.Test;
-
-import java.io.Serializable;
-import java.lang.Enum.EnumDesc;
-import java.lang.classfile.ClassFile;
-import java.lang.constant.ClassDesc;
-import java.lang.constant.ConstantDescs;
-import java.lang.constant.MethodTypeDesc;
-import java.lang.invoke.CallSite;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.lang.reflect.AccessFlag;
 import java.lang.runtime.ExactConversionsSupport;
-import java.lang.runtime.SwitchBootstraps;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
  * @bug 8304487
  * @summary Verify boundary and special cases of exact conversion predicates
  * @compile ExactnessConversionsSupportTest.java
- * @run testng/othervm ExactnessConversionsSupportTest
+ * @run junit/othervm ExactnessConversionsSupportTest
  */
-@Test
 public class ExactnessConversionsSupportTest {
 
-    public static void main(String[] args) {
-        testByte();
-        testShort();
-        testChar();
-        testInt();
-        testLong();
-        testFloat();
-        testDouble();
-    }
-
-    public static void testByte() {
+    @Test
+    public void testByte() {
         assertEquals(true,  ExactConversionsSupport.isIntToByteExact((byte) (Byte.MAX_VALUE)));
         assertEquals(true,  ExactConversionsSupport.isIntToByteExact((byte) (0)));
         assertEquals(true,  ExactConversionsSupport.isIntToByteExact((byte) (Byte.MIN_VALUE)));
@@ -92,7 +66,8 @@ public class ExactnessConversionsSupportTest {
         assertEquals(false, ExactConversionsSupport.isDoubleToByteExact(-0.0d));
         assertEquals(true,  ExactConversionsSupport.isDoubleToByteExact(+0.0d));
     }
-    public static void testShort() {
+    @Test
+    public void testShort() {
         assertEquals(true,  ExactConversionsSupport.isIntToShortExact((byte) (Byte.MAX_VALUE)));
         assertEquals(true,  ExactConversionsSupport.isIntToShortExact((byte) (0)));
         assertEquals(true,  ExactConversionsSupport.isIntToShortExact((byte) (Byte.MIN_VALUE)));
@@ -125,7 +100,8 @@ public class ExactnessConversionsSupportTest {
         assertEquals(false, ExactConversionsSupport.isDoubleToShortExact(-0.0d));
         assertEquals(true,  ExactConversionsSupport.isDoubleToShortExact(+0.0d));
     }
-    public static void testChar() {
+    @Test
+    public void testChar() {
         assertEquals(true,  ExactConversionsSupport.isIntToCharExact((byte) (Byte.MAX_VALUE)));
         assertEquals(true,  ExactConversionsSupport.isIntToCharExact((byte) (0)));
         assertEquals(false, ExactConversionsSupport.isIntToCharExact((byte) (Byte.MIN_VALUE)));
@@ -157,7 +133,8 @@ public class ExactnessConversionsSupportTest {
         assertEquals(false, ExactConversionsSupport.isDoubleToCharExact(-0.0d));
         assertEquals(true,  ExactConversionsSupport.isDoubleToCharExact(+0.0d));
     }
-    public static void testInt() {
+    @Test
+    public void testInt() {
         assertEquals(false, ExactConversionsSupport.isLongToIntExact((Long.MAX_VALUE)));
         assertEquals(true,  ExactConversionsSupport.isLongToIntExact((0L)));
         assertEquals(false, ExactConversionsSupport.isLongToIntExact((Long.MIN_VALUE)));
@@ -178,7 +155,8 @@ public class ExactnessConversionsSupportTest {
         assertEquals(false, ExactConversionsSupport.isDoubleToIntExact((-0.0d)));
         assertEquals(true,  ExactConversionsSupport.isDoubleToIntExact((+0.0d)));
     }
-    public static void testLong() {
+    @Test
+    public void testLong() {
         assertEquals(false, ExactConversionsSupport.isFloatToLongExact((Float.MAX_VALUE)));
         assertEquals(true,  ExactConversionsSupport.isFloatToLongExact(((float) 0)));
         assertEquals(false, ExactConversionsSupport.isFloatToLongExact((Float.MIN_VALUE)));
@@ -196,7 +174,8 @@ public class ExactnessConversionsSupportTest {
         assertEquals(false, ExactConversionsSupport.isDoubleToLongExact((-0.0d)));
         assertEquals(true,  ExactConversionsSupport.isDoubleToLongExact((+0.0d)));
     }
-    public static void testFloat() {
+    @Test
+    public void testFloat() {
         assertEquals(true,  ExactConversionsSupport.isIntToFloatExact(((byte) (Byte.MAX_VALUE))));
         assertEquals(true,  ExactConversionsSupport.isIntToFloatExact(((byte) (0))));
         assertEquals(true,  ExactConversionsSupport.isIntToFloatExact(((byte) (Byte.MIN_VALUE))));
@@ -220,7 +199,8 @@ public class ExactnessConversionsSupportTest {
         assertEquals(true,  ExactConversionsSupport.isDoubleToFloatExact((-0.0d)));
         assertEquals(true,  ExactConversionsSupport.isDoubleToFloatExact((+0.0d)));
     }
-    public static void testDouble() {
+    @Test
+    public void testDouble() {
         assertEquals(false, ExactConversionsSupport.isLongToDoubleExact((Long.MAX_VALUE)));
         assertEquals(true,  ExactConversionsSupport.isLongToDoubleExact((0L)));
         assertEquals(true,  ExactConversionsSupport.isLongToDoubleExact((Long.MIN_VALUE)));
diff --git a/test/jdk/java/lang/runtime/ObjectMethodsTest.java b/test/jdk/java/lang/runtime/ObjectMethodsTest.java
index 62c8b034ed1..d7ca5912273 100644
--- a/test/jdk/java/lang/runtime/ObjectMethodsTest.java
+++ b/test/jdk/java/lang/runtime/ObjectMethodsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8246774
  * @summary Basic tests for ObjectMethods
- * @run testng ObjectMethodsTest
+ * @run junit ObjectMethodsTest
  */
 
 import java.util.List;
@@ -34,14 +34,14 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.runtime.ObjectMethods;
-import org.testng.annotations.Test;
 import static java.lang.invoke.MethodType.methodType;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
-@Test
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ObjectMethodsTest {
 
     public static class C {
@@ -80,6 +80,7 @@ public class ObjectMethodsTest {
 
     static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
 
+    @Test
     public void testEqualsC() throws Throwable {
         CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "equals", C.EQUALS_DESC, C.class, C.NAME_LIST, C.ACCESSORS);
         MethodHandle handle = cs.dynamicInvoker();
@@ -92,6 +93,7 @@ public class ObjectMethodsTest {
         assertFalse((boolean)handle.invokeExact(c, new Object()));
     }
 
+    @Test
     public void testEqualsEmpty() throws Throwable {
         CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "equals", Empty.EQUALS_DESC, Empty.class, Empty.NAME_LIST, Empty.ACCESSORS);
         MethodHandle handle = cs.dynamicInvoker();
@@ -102,45 +104,50 @@ public class ObjectMethodsTest {
         assertFalse((boolean)handle.invokeExact(e, new Object()));
     }
 
+    @Test
     public void testHashCodeC() throws Throwable {
         CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "hashCode", C.HASHCODE_DESC, C.class, "x;y", C.ACCESSORS);
         MethodHandle handle = cs.dynamicInvoker();
         C c = new C(6, 7);
         int hc = (int)handle.invokeExact(c);
-        assertEquals(hc, hashCombiner(c.x(), c.y()));
+        assertEquals(hashCombiner(c.x(), c.y()), hc);
 
-        assertEquals((int)handle.invokeExact(new C(100, 1)),  hashCombiner(100, 1));
-        assertEquals((int)handle.invokeExact(new C(0, 0)),    hashCombiner(0, 0));
-        assertEquals((int)handle.invokeExact(new C(-1, 100)), hashCombiner(-1, 100));
-        assertEquals((int)handle.invokeExact(new C(100, 1)),  hashCombiner(100, 1));
-        assertEquals((int)handle.invokeExact(new C(100, -1)), hashCombiner(100, -1));
+        assertEquals(hashCombiner(100, 1), (int)handle.invokeExact(new C(100, 1)));
+        assertEquals(hashCombiner(0, 0), (int)handle.invokeExact(new C(0, 0)));
+        assertEquals(hashCombiner(-1, 100), (int)handle.invokeExact(new C(-1, 100)));
+        assertEquals(hashCombiner(100, 1), (int)handle.invokeExact(new C(100, 1)));
+        assertEquals(hashCombiner(100, -1), (int)handle.invokeExact(new C(100, -1)));
     }
 
+    @Test
     public void testHashCodeEmpty() throws Throwable {
         CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "hashCode", Empty.HASHCODE_DESC, Empty.class, "", Empty.ACCESSORS);
         MethodHandle handle = cs.dynamicInvoker();
         Empty e = new Empty();
-        assertEquals((int)handle.invokeExact(e), 0);
+        assertEquals(0, (int)handle.invokeExact(e));
     }
 
+    @Test
     public void testToStringC() throws Throwable {
         CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "toString", C.TO_STRING_DESC, C.class, C.NAME_LIST, C.ACCESSORS);
         MethodHandle handle = cs.dynamicInvoker();
-        assertEquals((String)handle.invokeExact(new C(8, 9)),    "C[x=8, y=9]"   );
-        assertEquals((String)handle.invokeExact(new C(10, 11)),  "C[x=10, y=11]" );
-        assertEquals((String)handle.invokeExact(new C(100, -9)), "C[x=100, y=-9]");
-        assertEquals((String)handle.invokeExact(new C(0, 0)),    "C[x=0, y=0]"   );
+        assertEquals("C[x=8, y=9]", (String)handle.invokeExact(new C(8, 9))   );
+        assertEquals("C[x=10, y=11]", (String)handle.invokeExact(new C(10, 11)) );
+        assertEquals("C[x=100, y=-9]", (String)handle.invokeExact(new C(100, -9)));
+        assertEquals("C[x=0, y=0]", (String)handle.invokeExact(new C(0, 0))   );
     }
 
+    @Test
     public void testToStringEmpty() throws Throwable {
         CallSite cs = (CallSite)ObjectMethods.bootstrap(LOOKUP, "toString", Empty.TO_STRING_DESC, Empty.class, Empty.NAME_LIST, Empty.ACCESSORS);
         MethodHandle handle = cs.dynamicInvoker();
-        assertEquals((String)handle.invokeExact(new Empty()),    "Empty[]");
+        assertEquals("Empty[]", (String)handle.invokeExact(new Empty()));
     }
 
-    Class<NullPointerException> NPE = NullPointerException.class;
-    Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+    private static final Class<NullPointerException> NPE = NullPointerException.class;
+    private static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
 
+    @Test
     public void exceptions()  {
         assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, "badName",  C.EQUALS_DESC,    C.class,         C.NAME_LIST, C.ACCESSORS));
         assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, "toString", C.TO_STRING_DESC, C.class,         "x;y;z",     C.ACCESSORS));
@@ -150,25 +157,60 @@ public class ObjectMethodsTest {
         assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, "toString", C.EQUALS_DESC,    C.class, "x;y", C.ACCESSORS));
         assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, "hashCode", C.TO_STRING_DESC, C.class, "x;y", C.ACCESSORS));
         assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, "equals",   C.HASHCODE_DESC,  C.class, "x;y", C.ACCESSORS));
+    }
 
-        record NamePlusType(String mn, MethodType mt) {}
-        List<NamePlusType> namePlusTypeList = List.of(
+    record NamePlusType(String name, MethodType type) {}
+
+    static List<NamePlusType> namePlusTypeList() {
+        return List.of(
                 new NamePlusType("toString", C.TO_STRING_DESC),
                 new NamePlusType("equals", C.EQUALS_DESC),
                 new NamePlusType("hashCode", C.HASHCODE_DESC)
         );
-
-        for (NamePlusType npt : namePlusTypeList) {
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, npt.mn(), npt.mt(), C.class, "x;y", null));
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, npt.mn(), npt.mt(), C.class, "x;y", new MethodHandle[]{null}));
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, npt.mn(), npt.mt(), C.class, null,  C.ACCESSORS));
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, npt.mn(), npt.mt(), null,    "x;y", C.ACCESSORS));
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, npt.mn(), null,     C.class, "x;y", C.ACCESSORS));
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, null,     npt.mt(), C.class, "x;y", C.ACCESSORS));
-            assertThrows(NPE, () -> ObjectMethods.bootstrap(null, npt.mn(),     npt.mt(), C.class, "x;y", C.ACCESSORS));
-        }
     }
 
+    @MethodSource("namePlusTypeList")
+    @ParameterizedTest
+    void commonExceptions(NamePlusType npt) {
+        String name = npt.name();
+        MethodType type = npt.type();
+
+        // Null checks
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, C.class, "x;y", null));
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, C.class, "x;y", new MethodHandle[]{null}));
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, C.class, null,  C.ACCESSORS));
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, null,    "x;y", C.ACCESSORS));
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, name, null, C.class, "x;y", C.ACCESSORS));
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(LOOKUP, null, type, C.class, "x;y", C.ACCESSORS));
+        assertThrows(NPE, () -> ObjectMethods.bootstrap(null,   name, type, C.class, "x;y", C.ACCESSORS));
+
+        // Bad indy call receiver type - change C to this test class
+        assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, name, type.changeParameterType(0, this.getClass()), C.class, "x;y", C.ACCESSORS));
+
+        // Bad getter types
+        var wrongReceiverGetter = assertDoesNotThrow(() -> MethodHandles.lookup().findGetter(this.getClass(), "y", int.class));
+        assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, C.class, "x;y",
+                new MethodHandle[]{
+                        C.ACCESSORS[0],
+                        wrongReceiverGetter,
+                }));
+        var extraArgGetter = MethodHandles.dropArguments(C.ACCESSORS[1], 1, int.class);
+        assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, C.class, "x;y",
+                new MethodHandle[]{
+                        C.ACCESSORS[0],
+                        extraArgGetter,
+                }));
+        var voidReturnGetter = MethodHandles.empty(MethodType.methodType(void.class, C.class));
+        assertThrows(IAE, () -> ObjectMethods.bootstrap(LOOKUP, name, type, C.class, "x;y",
+                new MethodHandle[]{
+                        C.ACCESSORS[0],
+                        voidReturnGetter,
+                }));
+    }
+
+    // same field name and type as C::y, for wrongReceiverGetter
+    private int y;
+
     // Based on the ObjectMethods internal implementation
     private static int hashCombiner(int x, int y) {
         return x*31 + y;
diff --git a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
index 8c6132b2815..061ce2ae241 100644
--- a/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
+++ b/test/jdk/java/lang/runtime/SwitchBootstrapsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,21 +35,20 @@ import java.lang.runtime.SwitchBootstraps;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.lang.classfile.ClassFile;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @test
  * @bug 8318144
  * @enablePreview
  * @compile SwitchBootstrapsTest.java
- * @run testng/othervm SwitchBootstrapsTest
+ * @run junit/othervm SwitchBootstrapsTest
  */
-@Test
 public class SwitchBootstrapsTest {
 
     public static final MethodHandle BSM_TYPE_SWITCH;
@@ -70,14 +69,14 @@ public class SwitchBootstrapsTest {
     private void testType(Object target, int start, int result, Object... labels) throws Throwable {
         MethodType switchType = MethodType.methodType(int.class, Object.class, int.class);
         MethodHandle indy = ((CallSite) BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType, labels)).dynamicInvoker();
-        assertEquals((int) indy.invoke(target, start), result);
+        assertEquals(result, (int) indy.invoke(target, start));
         assertEquals(-1, (int) indy.invoke(null, start));
     }
 
     private void testPrimitiveType(Object target, Class<?> targetType, int start, int result, Object... labels) throws Throwable {
         MethodType switchType = MethodType.methodType(int.class, targetType, int.class);
         MethodHandle indy = ((CallSite) BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType, labels)).dynamicInvoker();
-        assertEquals((int) indy.invoke(target, start), result);
+        assertEquals(result, (int) indy.invoke(target, start));
     }
 
     private void testEnum(Enum<?> target, int start, int result, Object... labels) throws Throwable {
@@ -87,7 +86,7 @@ public class SwitchBootstrapsTest {
     private void testEnum(Class<?> targetClass, Enum<?> target, int start, int result, Object... labels) throws Throwable {
         MethodType switchType = MethodType.methodType(int.class, targetClass, int.class);
         MethodHandle indy = ((CallSite) BSM_ENUM_SWITCH.invoke(MethodHandles.lookup(), "", switchType, labels)).dynamicInvoker();
-        assertEquals((int) indy.invoke(target, start), result);
+        assertEquals(result, (int) indy.invoke(target, start));
         assertEquals(-1, (int) indy.invoke(null, start));
     }
 
@@ -100,6 +99,7 @@ public class SwitchBootstrapsTest {
         C;
     }
 
+    @Test
     public void testTypes() throws Throwable {
         testType("", 0, 0, String.class, Object.class);
         testType("", 0, 0, Object.class);
@@ -138,6 +138,7 @@ public class SwitchBootstrapsTest {
         }, 0, 1, 1L);
     }
 
+    @Test
     public void testPrimitiveTypes() throws Throwable {
         testPrimitiveType((short) 1, short.class, 0, 1, String.class);
         testPrimitiveType((byte) 1, byte.class,0, 1, String.class, byte.class);
@@ -150,52 +151,32 @@ public class SwitchBootstrapsTest {
         testPrimitiveType(true, boolean.class,0, 1, String.class, boolean.class);
     }
 
+    @Test
     public void testEnums() throws Throwable {
         testEnum(E1.A, 0, 2, "B", "C", "A", E1.class);
         testEnum(E1.B, 0, 0, "B", "C", "A", E1.class);
         testEnum(E1.B, 1, 3, "B", "C", "A", E1.class);
-        try {
-            testEnum(E1.B, 0, -1, E2.class);
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, String.class);
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, 10);
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, new Object());
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, new Object[] { null });
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, "");
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, (Object[]) null);
-            fail("Didn't get the expected exception.");
-        } catch (NullPointerException ex) {
-            //OK
-        }
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, E2.class)
+        );
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, String.class)
+        );
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, 10)
+        );
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, new Object())
+        );
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, new Object[] { null })
+        );
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, "")
+        );
+        assertThrows(NullPointerException.class, () ->
+            testEnum(E1.B, 0, -1, (Object[]) null)
+        );
         testEnum(E1.B, 0, 0, "B", "A");
         testEnum(E1.A, 0, 1, "B", "A");
         testEnum(E1.A, 0, 0, "A", "A", "B");
@@ -208,9 +189,10 @@ public class SwitchBootstrapsTest {
         //null invocation name:
         MethodType switchType = MethodType.methodType(int.class, E1.class, int.class);
         MethodHandle indy = ((CallSite) BSM_ENUM_SWITCH.invoke(MethodHandles.lookup(), null, switchType)).dynamicInvoker();
-        assertEquals((int) indy.invoke(E1.A, 0), 0);
+        assertEquals(0, (int) indy.invoke(E1.A, 0));
     }
 
+    @Test
     public void testEnumsWithConstants() throws Throwable {
         enum E {
             A {},
@@ -239,18 +221,16 @@ public class SwitchBootstrapsTest {
         testEnum(E.class, E.C, 2, 2, "A", "B");
     }
 
+    @Test
     public void testWrongSwitchTypes() throws Throwable {
         MethodType[] switchTypes = new MethodType[] {
             MethodType.methodType(int.class, Object.class),
             MethodType.methodType(int.class, Object.class, Integer.class)
         };
         for (MethodType switchType : switchTypes) {
-            try {
-                BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType);
-                fail("Didn't get the expected exception.");
-            } catch (IllegalArgumentException ex) {
-                //OK, expected
-            }
+            assertThrows(IllegalArgumentException.class, () ->
+                BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType)
+            );
         }
         MethodType[] enumSwitchTypes = new MethodType[] {
             MethodType.methodType(int.class, Enum.class),
@@ -259,25 +239,21 @@ public class SwitchBootstrapsTest {
             MethodType.methodType(int.class, Enum.class, Integer.class)
         };
         for (MethodType enumSwitchType : enumSwitchTypes) {
-            try {
-                BSM_ENUM_SWITCH.invoke(MethodHandles.lookup(), "", enumSwitchType);
-                fail("Didn't get the expected exception.");
-            } catch (IllegalArgumentException ex) {
-                //OK, expected
-            }
+            assertThrows(IllegalArgumentException.class, () ->
+                BSM_ENUM_SWITCH.invoke(MethodHandles.lookup(), "", enumSwitchType)
+            );
         }
     }
 
+    @Test
     public void testSwitchLabelTypes() throws Throwable {
         enum E {A}
-        try {
-            testType(E.A, 0, -1, E.A);
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK, expected
-        }
+        assertThrows(IllegalArgumentException.class, () ->
+            testType(E.A, 0, -1, E.A)
+        );
     }
 
+    @Test
     public void testSwitchQualifiedEnum() throws Throwable {
         enum E {A, B, C}
         Object[] labels = new Object[] {
@@ -290,41 +266,31 @@ public class SwitchBootstrapsTest {
         testType(E.C, 0, 2, labels);
     }
 
+    @Test
     public void testNullLabels() throws Throwable {
         MethodType switchType = MethodType.methodType(int.class, Object.class, int.class);
-        try {
-            BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType, (Object[]) null);
-            fail("Didn't get the expected exception.");
-        } catch (NullPointerException ex) {
-            //OK
-        }
-        try {
+        assertThrows(NullPointerException.class, () ->
+            BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType, (Object[]) null)
+        );
+        assertThrows(IllegalArgumentException.class, () ->
             BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType,
-                                   new Object[] {1, null, String.class});
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
+                    new Object[] {1, null, String.class})
+        );
         MethodType enumSwitchType = MethodType.methodType(int.class, E1.class, int.class);
-        try {
-            BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", enumSwitchType, (Object[]) null);
-            fail("Didn't get the expected exception.");
-        } catch (NullPointerException ex) {
-            //OK
-        }
-        try {
+        assertThrows(NullPointerException.class, () ->
+            BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", enumSwitchType, (Object[]) null)
+        );
+        assertThrows(IllegalArgumentException.class, () ->
             BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", enumSwitchType,
-                                   new Object[] {1, null, String.class});
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
+                    new Object[] {1, null, String.class})
+        );
         //null invocationName is OK:
         BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), null, switchType,
                                new Object[] {Object.class});
     }
 
     private static AtomicBoolean enumInitialized = new AtomicBoolean();
+    @Test
     public void testEnumInitialization1() throws Throwable {
         enumInitialized.set(false);
 
@@ -340,13 +306,14 @@ public class SwitchBootstrapsTest {
 
         CallSite invocation = (CallSite) BSM_ENUM_SWITCH.invoke(MethodHandles.lookup(), "", enumSwitchType, new Object[] {"A"});
         assertFalse(enumInitialized.get());
-        assertEquals(invocation.dynamicInvoker().invoke(null, 0), -1);
+        assertEquals(-1, invocation.dynamicInvoker().invoke(null, 0));
         assertFalse(enumInitialized.get());
         E e = E.A;
         assertTrue(enumInitialized.get());
-        assertEquals(invocation.dynamicInvoker().invoke(e, 0), 0);
+        assertEquals(0, invocation.dynamicInvoker().invoke(e, 0));
     }
 
+    @Test
     public void testEnumInitialization2() throws Throwable {
         enumInitialized.set(false);
 
@@ -365,60 +332,46 @@ public class SwitchBootstrapsTest {
         };
         CallSite invocation = (CallSite) BSM_TYPE_SWITCH.invoke(MethodHandles.lookup(), "", switchType, labels);
         assertFalse(enumInitialized.get());
-        assertEquals(invocation.dynamicInvoker().invoke(null, 0), -1);
+        assertEquals(-1, invocation.dynamicInvoker().invoke(null, 0));
         assertFalse(enumInitialized.get());
-        assertEquals(invocation.dynamicInvoker().invoke("test", 0), 1);
+        assertEquals(1, invocation.dynamicInvoker().invoke("test", 0));
         assertFalse(enumInitialized.get());
         E e = E.A;
         assertTrue(enumInitialized.get());
-        assertEquals(invocation.dynamicInvoker().invoke(e, 0), 0);
+        assertEquals(0, invocation.dynamicInvoker().invoke(e, 0));
     }
 
+    @Test
     public void testIncorrectEnumLabels() throws Throwable {
-        try {
-            testEnum(E1.B, 0, -1, "B", 1);
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 0, -1, "B", null);
-            fail("Didn't get the expected exception.");
-        } catch (IllegalArgumentException ex) {
-            //OK
-        }
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, "B", 1)
+        );
+        assertThrows(IllegalArgumentException.class, () ->
+            testEnum(E1.B, 0, -1, "B", null)
+        );
     }
 
+    @Test
     public void testIncorrectEnumStartIndex() throws Throwable {
-        try {
-            testEnum(E1.B, -1, -1, "B");
-            fail("Didn't get the expected exception.");
-        } catch (IndexOutOfBoundsException ex) {
-            //OK
-        }
-        try {
-            testEnum(E1.B, 2, -1, "B");
-            fail("Didn't get the expected exception.");
-        } catch (IndexOutOfBoundsException ex) {
-            //OK
-        }
+        assertThrows(IndexOutOfBoundsException.class, () ->
+            testEnum(E1.B, -1, -1, "B")
+        ); //OK
+        assertThrows(IndexOutOfBoundsException.class, () ->
+            testEnum(E1.B, 2, -1, "B")
+        );
     }
 
+    @Test
     public void testIncorrectTypeStartIndex() throws Throwable {
-        try {
-            testType("", -1, -1, "");
-            fail("Didn't get the expected exception.");
-        } catch (IndexOutOfBoundsException ex) {
-            //OK
-        }
-        try {
-            testType("", 2, -1, "");
-            fail("Didn't get the expected exception.");
-        } catch (IndexOutOfBoundsException ex) {
-            //OK
-        }
+        assertThrows(IndexOutOfBoundsException.class, () ->
+            testType("", -1, -1, "")
+        );
+        assertThrows(IndexOutOfBoundsException.class, () ->
+            testType("", 2, -1, "")
+        );
     }
 
+    @Test
     public void testHiddenClassAsCaseLabel() throws Throwable {
         MethodHandles.Lookup lookup = MethodHandles.lookup();
         byte[] classBytes = createClass();
@@ -447,4 +400,23 @@ public class SwitchBootstrapsTest {
                                });
                     });
     }
+
+    @Test
+    public void testNullLookup() throws Throwable {
+        assertThrows(NullPointerException.class, () -> {
+            MethodType switchType = MethodType.methodType(int.class, Object.class, int.class);
+            BSM_TYPE_SWITCH.invoke(null, "", switchType, Object.class);
+        });
+        enum E {}
+        assertThrows(NullPointerException.class, () -> {
+            MethodType switchType = MethodType.methodType(int.class, E.class, int.class);
+            BSM_ENUM_SWITCH.invoke(null, "", switchType,
+                    new Object[] {});
+        });
+        assertThrows(NullPointerException.class, () -> {
+            MethodType switchType = MethodType.methodType(int.class, E.class, int.class);
+            BSM_ENUM_SWITCH.invoke(null, "", switchType,
+                    new Object[] {"A"});
+        });
+    }
 }
diff --git a/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java b/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java
index 3cea9073199..ded087d35e8 100644
--- a/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java
+++ b/test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@ import java.net.MulticastSocket;
 import java.nio.channels.DatagramChannel;
 import java.util.Random;
 
+import static java.net.StandardSocketOptions.SO_RCVBUF;
+import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.expectThrows;
 
@@ -102,6 +104,10 @@ public class SendReceiveMaxSize {
                                        DatagramSocketSupplier supplier,
                                        Class<? extends Exception> exception) throws IOException {
         try (var receiver = new DatagramSocket(new InetSocketAddress(HOST_ADDR, 0))) {
+            assertTrue(receiver.getOption(SO_RCVBUF) >= capacity,
+                       receiver.getOption(SO_RCVBUF) +
+                       " for UDP receive buffer too small to hold capacity " +
+                       capacity);
             var port = receiver.getLocalPort();
             var addr = new InetSocketAddress(HOST_ADDR, port);
             try (var sender = supplier.open()) {
diff --git a/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java b/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java
index dff8b38d3c1..e5bf0b3822d 100644
--- a/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java
+++ b/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @library /test/lib
  * @modules java.management java.base/java.io:+open java.base/java.net:+open
- *          java.base/sun.net java.base/sun.nio.ch:+open
+ *          java.base/sun.nio.ch:+open
  * @run main/othervm/timeout=480 UnreferencedDatagramSockets
  * @run main/othervm/timeout=480 -Djava.net.preferIPv4Stack=true UnreferencedDatagramSockets
  * @summary Check that unreferenced datagram sockets are closed
@@ -41,15 +41,12 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
-import java.net.DatagramSocketImpl;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.channels.DatagramChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayDeque;
 import java.util.List;
 import java.util.Optional;
@@ -59,7 +56,6 @@ import java.util.concurrent.CountDownLatch;
 import com.sun.management.UnixOperatingSystemMXBean;
 
 import jdk.test.lib.net.IPSupport;
-import sun.net.NetProperties;
 
 public class UnreferencedDatagramSockets {
 
@@ -191,48 +187,27 @@ public class UnreferencedDatagramSockets {
                 : -1L;
     }
 
-    private static boolean usePlainDatagramSocketImpl() {
-        PrivilegedAction<String> pa = () -> NetProperties.get("jdk.net.usePlainDatagramSocketImpl");
-        String s = AccessController.doPrivileged(pa);
-        return (s != null) && (s.isEmpty() || s.equalsIgnoreCase("true"));
-    }
-
     // Reflect to find references in the datagram implementation that will be gc'd
     private static void extractRefs(DatagramSocket s, String name) {
         try {
             Field datagramSocketField = DatagramSocket.class.getDeclaredField("delegate");
             datagramSocketField.setAccessible(true);
 
-            if (!usePlainDatagramSocketImpl()) {
-                // DatagramSocket using DatagramSocketAdaptor
-                Object DatagramSocket = datagramSocketField.get(s);
-                assert DatagramSocket.getClass() == Class.forName("sun.nio.ch.DatagramSocketAdaptor");
+            // DatagramSocket using DatagramSocketAdaptor
+            Object DatagramSocket = datagramSocketField.get(s);
+            assert DatagramSocket.getClass() == Class.forName("sun.nio.ch.DatagramSocketAdaptor");
 
-                Method m = DatagramSocket.class.getDeclaredMethod("getChannel");
-                m.setAccessible(true);
-                DatagramChannel datagramChannel = (DatagramChannel) m.invoke(DatagramSocket);
+            Method m = DatagramSocket.class.getDeclaredMethod("getChannel");
+            m.setAccessible(true);
+            DatagramChannel datagramChannel = (DatagramChannel) m.invoke(DatagramSocket);
 
-                assert datagramChannel.getClass() == Class.forName("sun.nio.ch.DatagramChannelImpl");
+            assert datagramChannel.getClass() == Class.forName("sun.nio.ch.DatagramChannelImpl");
 
-                Field fileDescriptorField = datagramChannel.getClass().getDeclaredField("fd");
-                fileDescriptorField.setAccessible(true);
-                FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramChannel);
-                extractRefs(fileDescriptor, name);
+            Field fileDescriptorField = datagramChannel.getClass().getDeclaredField("fd");
+            fileDescriptorField.setAccessible(true);
+            FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramChannel);
+            extractRefs(fileDescriptor, name);
 
-            } else {
-                // DatagramSocket using PlainDatagramSocketImpl
-                Object DatagramSocket = datagramSocketField.get(s);
-                assert DatagramSocket.getClass() == Class.forName("java.net.NetMulticastSocket");
-
-                Method m = DatagramSocket.getClass().getDeclaredMethod("getImpl");
-                m.setAccessible(true);
-                DatagramSocketImpl datagramSocketImpl = (DatagramSocketImpl) m.invoke(DatagramSocket);
-
-                Field fileDescriptorField = DatagramSocketImpl.class.getDeclaredField("fd");
-                fileDescriptorField.setAccessible(true);
-                FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramSocketImpl);
-                extractRefs(fileDescriptor, name);
-            }
         } catch (Exception ex) {
             ex.printStackTrace();
             throw new AssertionError("missing field", ex);
diff --git a/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java b/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java
index 2a87207c961..0f4faa4065b 100644
--- a/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java
+++ b/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @library /test/lib
  * @modules java.management java.base/java.io:+open java.base/java.net:+open
- *          java.base/sun.net java.base/sun.nio.ch:+open
+ *          java.base/sun.nio.ch:+open
  * @run main/othervm/timeout=480 -Djava.net.preferIPv4Stack=true UnreferencedMulticastSockets
  * @run main/othervm/timeout=480 UnreferencedMulticastSockets
  * @summary Check that unreferenced multicast sockets are closed
@@ -41,7 +41,6 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
-import java.net.DatagramSocketImpl;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
@@ -50,8 +49,6 @@ import java.nio.channels.DatagramChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayDeque;
 import java.util.List;
 import java.util.Optional;
@@ -61,7 +58,6 @@ import java.util.concurrent.TimeUnit;
 import jdk.test.lib.net.IPSupport;
 
 import com.sun.management.UnixOperatingSystemMXBean;
-import sun.net.NetProperties;
 
 public class UnreferencedMulticastSockets {
 
@@ -229,12 +225,6 @@ public class UnreferencedMulticastSockets {
                 : -1L;
     }
 
-    private static boolean usePlainDatagramSocketImpl() {
-        PrivilegedAction<String> pa = () -> NetProperties.get("jdk.net.usePlainDatagramSocketImpl");
-        String s = AccessController.doPrivileged(pa);
-        return (s != null) && (s.isEmpty() || s.equalsIgnoreCase("true"));
-    }
-
     // Reflect to find references in the datagram implementation that will be gc'd
     private static void extractRefs(DatagramSocket s, String name) {
 
@@ -242,35 +232,20 @@ public class UnreferencedMulticastSockets {
             Field datagramSocketField = DatagramSocket.class.getDeclaredField("delegate");
             datagramSocketField.setAccessible(true);
 
-            if (!usePlainDatagramSocketImpl()) {
-                // MulticastSocket using DatagramSocketAdaptor
-                Object MulticastSocket = datagramSocketField.get(s);
+            // MulticastSocket using DatagramSocketAdaptor
+            Object MulticastSocket = datagramSocketField.get(s);
 
-                Method m = DatagramSocket.class.getDeclaredMethod("getChannel");
-                m.setAccessible(true);
-                DatagramChannel datagramChannel = (DatagramChannel) m.invoke(MulticastSocket);
+            Method m = DatagramSocket.class.getDeclaredMethod("getChannel");
+            m.setAccessible(true);
+            DatagramChannel datagramChannel = (DatagramChannel) m.invoke(MulticastSocket);
 
-                assert datagramChannel.getClass() == Class.forName("sun.nio.ch.DatagramChannelImpl");
+            assert datagramChannel.getClass() == Class.forName("sun.nio.ch.DatagramChannelImpl");
 
-                Field fileDescriptorField = datagramChannel.getClass().getDeclaredField("fd");
-                fileDescriptorField.setAccessible(true);
-                FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramChannel);
-                extractRefs(fileDescriptor, name);
+            Field fileDescriptorField = datagramChannel.getClass().getDeclaredField("fd");
+            fileDescriptorField.setAccessible(true);
+            FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramChannel);
+            extractRefs(fileDescriptor, name);
 
-            } else {
-                // MulticastSocket using PlainDatagramSocketImpl
-                Object MulticastSocket = datagramSocketField.get(s);
-                assert MulticastSocket.getClass() == Class.forName("java.net.NetMulticastSocket");
-
-                Method m = MulticastSocket.getClass().getDeclaredMethod("getImpl");
-                m.setAccessible(true);
-                DatagramSocketImpl datagramSocketImpl = (DatagramSocketImpl) m.invoke(MulticastSocket);
-
-                Field fileDescriptorField = DatagramSocketImpl.class.getDeclaredField("fd");
-                fileDescriptorField.setAccessible(true);
-                FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramSocketImpl);
-                extractRefs(fileDescriptor, name);
-            }
         } catch (Exception ex) {
             ex.printStackTrace();
             throw new AssertionError("missing field", ex);
diff --git a/test/jdk/java/net/URLClassLoader/HttpTest.java b/test/jdk/java/net/URLClassLoader/HttpTest.java
index 620eb34dbaa..09ee6dcfa85 100644
--- a/test/jdk/java/net/URLClassLoader/HttpTest.java
+++ b/test/jdk/java/net/URLClassLoader/HttpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,233 +24,298 @@
 /**
  * @test
  * @bug 4636331
+ * @modules jdk.httpserver
  * @library /test/lib
- * @summary Check that URLClassLoader doesn't create excessive http
- *          connections
+ * @summary Check that URLClassLoader with HTTP paths lookups produce the expected http requests
+ * @run junit HttpTest
  */
 import java.net.*;
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
 
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HttpTest {
 
-    /*
-     * Simple http server to service http requests. Auto shutdown
-     * if "idle" (no requests) for 10 seconds. Forks worker thread
-     * to service persistent connections. Work threads shutdown if
-     * "idle" for 5 seconds.
-     */
-    static class HttpServer implements Runnable {
+    // HTTP server used to track requests
+    static HttpServer server;
 
-        private static HttpServer svr = null;
-        private static Counters cnts = null;
-        private static ServerSocket ss;
+    // RequestLog for capturing requests
+    static class RequestLog {
+        List<Request> log = new ArrayList<>();
 
-        private static Object counterLock = new Object();
-        private static int getCount = 0;
-        private static int headCount = 0;
-
-        class Worker extends Thread {
-            Socket s;
-            Worker(Socket s) {
-                this.s = s;
-            }
-
-            public void run() {
-                InputStream in = null;
-                try {
-                    in = s.getInputStream();
-                    for (;;) {
-
-                        // read entire request from client
-                        byte b[] = new byte[1024];
-                        int n, total=0;
-
-                        // max 5 seconds to wait for new request
-                        s.setSoTimeout(5000);
-                        try {
-                            do {
-                                n = in.read(b, total, b.length-total);
-                                // max 0.5 seconds between each segment
-                                // of request.
-                                s.setSoTimeout(500);
-                                if (n > 0) total += n;
-                            } while (n > 0);
-                        } catch (SocketTimeoutException e) { }
-
-                        if (total == 0) {
-                            s.close();
-                            return;
-                        }
-
-                        boolean getRequest = false;
-                        if (b[0] == 'G' && b[1] == 'E' && b[2] == 'T')
-                            getRequest = true;
-
-                        synchronized (counterLock) {
-                            if (getRequest)
-                                getCount++;
-                            else
-                                headCount++;
-                        }
-
-                        // response to client
-                        PrintStream out = new PrintStream(
-                                new BufferedOutputStream(
-                                        s.getOutputStream() ));
-                        out.print("HTTP/1.1 200 OK\r\n");
-
-                        out.print("Content-Length: 75000\r\n");
-                        out.print("\r\n");
-                        if (getRequest) {
-                            for (int i=0; i<75*1000; i++) {
-                                out.write( (byte)'.' );
-                            }
-                        }
-                        out.flush();
-
-                    } // for
-
-                } catch (Exception e) {
-                    unexpected(e);
-                } finally {
-                    if (in != null) { try {in.close(); } catch(IOException e) {unexpected(e);} }
-                }
-            }
+        // Add a request to the log
+        public synchronized void capture(String method, URI uri) {
+            log.add(new Request(method, uri));
         }
 
-        HttpServer() throws Exception {
-            ss = new ServerSocket();
-            ss.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
+        // Clear requests
+        public synchronized void clear() {
+            log.clear();
         }
 
-        public void run() {
-            try {
-                // shutdown if no request in 10 seconds.
-                ss.setSoTimeout(10000);
-                for (;;) {
-                    Socket s = ss.accept();
-                    (new Worker(s)).start();
-                }
-            } catch (Exception e) {
-            }
+        public synchronized List<Request> requests() {
+            return List.copyOf(log);
         }
-
-        void unexpected(Exception e) {
-            System.out.println(e);
-            e.printStackTrace();
-        }
-
-        public static HttpServer create() throws Exception {
-            if (svr != null)
-                return svr;
-            cnts = new Counters();
-            svr = new HttpServer();
-            (new Thread(svr)).start();
-            return svr;
-        }
-
-        public static void shutdown() throws Exception {
-            if (svr != null) {
-                ss.close();
-                svr = null;
-            }
-        }
-
-        public int port() {
-            return ss.getLocalPort();
-        }
-
-        public static class Counters {
-            public void reset() {
-                synchronized (counterLock) {
-                    getCount = 0;
-                    headCount = 0;
-                }
-            }
-
-            public int getCount() {
-                synchronized (counterLock) {
-                    return getCount;
-                }
-            }
-
-            public int headCount() {
-                synchronized (counterLock) {
-                    return headCount;
-                }
-            }
-
-            public String toString() {
-                synchronized (counterLock) {
-                    return "GET count: " + getCount + "; " +
-                       "HEAD count: " + headCount;
-                }
-            }
-        }
-
-        public Counters counters() {
-            return cnts;
-        }
-
     }
 
-    public static void main(String args[]) throws Exception {
-        boolean failed = false;
+    // Represents a single request
+    record Request(String method, URI path) {}
 
-        // create http server
-        HttpServer svr = HttpServer.create();
+    // Request log for this test
+    static RequestLog log = new RequestLog();
 
-        // create class loader
-        URL urls[] = {
-                URIBuilder.newBuilder().scheme("http").loopback().port(svr.port())
-                        .path("/dir1/").toURL(),
-                URIBuilder.newBuilder().scheme("http").loopback().port(svr.port())
-                        .path("/dir2/").toURL(),
+    // Handlers specific to tests
+    static Map<URI, HttpHandler> handlers = new ConcurrentHashMap<>();
+
+    // URLClassLoader with HTTP URL class path
+    private static URLClassLoader loader;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        server = HttpServer.create();
+        server.bind(new InetSocketAddress(
+                InetAddress.getLoopbackAddress(), 0), 0);
+        server.createContext("/", e -> {
+            // Capture request in the log
+            log.capture(e.getRequestMethod(), e.getRequestURI());
+            // Check for custom handler
+            HttpHandler custom = handlers.get(e.getRequestURI());
+            if (custom != null) {
+                custom.handle(e);
+            } else {
+                // Successful responses echo the request path in the body
+                byte[] response = e.getRequestURI().getPath()
+                        .getBytes(StandardCharsets.UTF_8);
+                e.sendResponseHeaders(200, response.length);
+                try (var out = e.getResponseBody()) {
+                    out.write(response);
+                }
+            }
+            e.close();
+        });
+        server.start();
+        int port = server.getAddress().getPort();
+
+        // Create class loader with two HTTP URLs
+        URL[] searchPath = new URL[] {
+                getHttpUri("/dir1/", port),
+                getHttpUri("/dir2/", port)
         };
-        URLClassLoader cl = new URLClassLoader(urls);
+        loader = new URLClassLoader(searchPath);
+    }
 
-        // Test 1 - check that getResource does single HEAD request
-        svr.counters().reset();
-        URL url = cl.getResource("foo.gif");
-        System.out.println(svr.counters());
+    // Create an HTTP URL for the given path and port using the loopback address
+    private static URL getHttpUri(String path, int port) throws Exception {
+        return URIBuilder.newBuilder()
+                .scheme("http")
+                .loopback()
+                .port(port)
+                .path(path).toURL();
+    }
 
-        if (svr.counters().getCount() > 0 ||
-            svr.counters().headCount() > 1) {
-            failed = true;
+    // Add redirect handler for a given path
+    private static void redirect(String path, String target) {
+        handlers.put(URI.create(path), e -> {
+            e.getResponseHeaders().set("Location", target);
+            e.sendResponseHeaders(301, 0);
+        });
+    }
+
+    // Return 404 not found for a given path
+    private static void notFound(String path) {
+        handlers.put(URI.create(path),  e ->
+                e.sendResponseHeaders(404, 0));
+    }
+
+    @AfterAll
+    static void shutdown() {
+        server.stop(2000);
+    }
+
+    @BeforeEach
+    void reset() {
+        synchronized (log) {
+            log.clear();
+        }
+        handlers.clear();
+    }
+
+    // Check that getResource does single HEAD request
+    @Test
+    void getResourceSingleHead() {
+        URL url = loader.getResource("foo.gif");
+        // Expect one HEAD
+        assertRequests(e -> e
+                .request("HEAD", "/dir1/foo.gif")
+        );
+    }
+
+    // Check that getResource follows redirects
+    @Test
+    void getResourceShouldFollowRedirect() {
+        redirect("/dir1/foo.gif", "/dir1/target.gif");
+        URL url = loader.getResource("foo.gif");
+        // Expect extra HEAD for redirect target
+        assertRequests(e -> e
+                .request("HEAD", "/dir1/foo.gif")
+                .request("HEAD", "/dir1/target.gif")
+        );
+
+        /*
+         * Note: Long-standing behavior is that URLClassLoader:getResource
+         * returns a URL for the requested resource, not the location redirected to
+         */
+        assertEquals("/dir1/foo.gif", url.getPath());
+
+    }
+
+    // Check that getResource treats a redirect to a not-found resource as a not-found resource
+    @Test
+    void getResourceRedirectTargetNotFound() {
+        redirect("/dir1/foo.gif", "/dir1/target.gif");
+        notFound("/dir1/target.gif");
+        URL url = loader.getResource("foo.gif");
+        // Expect extra HEAD for redirect target and next URL in search path
+        assertRequests(e -> e
+                .request("HEAD", "/dir1/foo.gif")
+                .request("HEAD", "/dir1/target.gif")
+                .request("HEAD", "/dir2/foo.gif")
+
+        );
+        // Should find URL for /dir2
+        assertEquals("/dir2/foo.gif", url.getPath());
+    }
+
+    // Check that getResourceAsStream does one HEAD and one GET request
+    @Test
+    void getResourceAsStreamSingleGet() throws IOException {
+        // Expect content from the first path
+        try (var in = loader.getResourceAsStream("foo2.gif")) {
+            assertEquals("/dir1/foo2.gif",
+                    new String(in.readAllBytes(), StandardCharsets.UTF_8));
+        }
+        // Expect one HEAD, one GET
+        assertRequests( e -> e
+                .request("HEAD", "/dir1/foo2.gif")
+                .request("GET",  "/dir1/foo2.gif")
+        );
+    }
+
+    // Check that getResourceAsStream follows redirects
+    @Test
+    void getResourceAsStreamFollowRedirect() throws IOException {
+        redirect("/dir1/foo.gif", "/dir1/target.gif");
+        // Expect content from the redirected location
+        try (var in = loader.getResourceAsStream("foo.gif")) {
+            assertEquals("/dir1/target.gif",
+                    new String(in.readAllBytes(), StandardCharsets.UTF_8));
         }
 
-        // Test 2 - check that getResourceAsStream does at most
-        //          one GET request
-        svr.counters().reset();
-        InputStream in = cl.getResourceAsStream("foo2.gif");
-        in.close();
-        System.out.println(svr.counters());
-        if (svr.counters().getCount() > 1) {
-            failed = true;
+        /*
+         * Note: Long standing behavior of URLClassLoader::getResourceAsStream
+         * is to use HEAD during the findResource resource discovery and to not
+         * "remember" the HEAD redirect location when performing the GET. This
+         * explains why we observe two redirects here, one for HEAD, one for GET.
+         */
+        assertRequests( e -> e
+                .request("HEAD", "/dir1/foo.gif")
+                .request("HEAD", "/dir1/target.gif")
+                .request("GET",  "/dir1/foo.gif")
+                .request("GET",  "/dir1/target.gif")
+        );
+    }
+
+    // getResourceAsStream on a 404 should try next path
+    @Test
+    void getResourceTryNextPath() throws IOException {
+        // Make the first path return 404
+        notFound("/dir1/foo.gif");
+        // Expect content from the second path
+        try (var in = loader.getResourceAsStream("foo.gif")) {
+            assertEquals("/dir2/foo.gif",
+                    new String(in.readAllBytes(), StandardCharsets.UTF_8));
         }
+        // Expect two HEADs, one GET
+        assertRequests(e -> e
+                .request("HEAD", "/dir1/foo.gif")
+                .request("HEAD", "/dir2/foo.gif")
+                .request("GET",  "/dir2/foo.gif")
+        );
+    }
 
-        // Test 3 - check that getResources only does HEAD requests
-        svr.counters().reset();
-        Enumeration e = cl.getResources("foos.gif");
-        try {
-            for (;;) {
-                e.nextElement();
-            }
-        } catch (NoSuchElementException exc) { }
-        System.out.println(svr.counters());
-        if (svr.counters().getCount() > 1) {
-            failed = true;
-        }
+    // Check that getResources only does HEAD requests
+    @Test
+    void getResourcesOnlyHead() throws IOException {
+        Collections.list(loader.getResources("foos.gif"));
+        // Expect one HEAD for each path
+        assertRequests(e ->  e
+                .request("HEAD", "/dir1/foos.gif")
+                .request("HEAD", "/dir2/foos.gif")
+        );
+    }
 
-        // shutdown http server
-        svr.shutdown();
+    // Check that getResources skips 404 URL
+    @Test
+    void getResourcesShouldSkipFailedHead() throws IOException {
+        // Make first path fail with 404
+        notFound("/dir1/foos.gif");
+        List<URL> resources = Collections.list(loader.getResources("foos.gif"));
+        // Expect one HEAD for each path
+        assertRequests(e ->  e
+                .request("HEAD", "/dir1/foos.gif")
+                .request("HEAD", "/dir2/foos.gif")
+        );
 
-        if (failed) {
-            throw new Exception("Excessive http connections established - Test failed");
+        // Expect a single URL to be returned
+        assertEquals(1, resources.size());
+    }
+
+    // Utils for asserting requests
+    static class Expect {
+        List<Request> requests = new ArrayList<>();
+
+        Expect request(String method, String path) {
+            requests.add(new Request(method, URI.create(path)));
+            return this;
         }
     }
 
+    static void assertRequests(Consumer<Expect> e) {
+        // Collect expected requests
+        Expect exp = new Expect();
+        e.accept(exp);
+        List<Request> expected = exp.requests;
+
+        // Actual requests
+        List<Request> requests = log.requests();
+
+        // Verify expected number of requests
+        assertEquals(expected.size(), requests.size(), "Unexpected request count");
+
+        // Verify expected requests in order
+        for (int i = 0; i < expected.size(); i++) {
+            Request ex = expected.get(i);
+            Request req = requests.get(i);
+            // Verify method
+            assertEquals(ex.method, req.method,
+                    String.format("Request %s has unexpected method %s", i, ex.method)
+            );
+            // Verify path
+            assertEquals(ex.path, req.path,
+                    String.format("Request %s has unexpected request URI %s", i, ex.path)
+            );
+        }
+    }
 }
diff --git a/test/jdk/java/net/httpclient/AbstractConnectTimeout.java b/test/jdk/java/net/httpclient/AbstractConnectTimeout.java
deleted file mode 100644
index 2c490919181..00000000000
--- a/test/jdk/java/net/httpclient/AbstractConnectTimeout.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.net.NoRouteToHostException;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpClient.Version;
-import java.net.http.HttpConnectTimeoutException;
-import java.net.http.HttpRequest;
-import java.net.http.HttpRequest.BodyPublishers;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.nio.channels.UnresolvedAddressException;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionException;
-import org.testng.annotations.DataProvider;
-import static java.lang.System.out;
-import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static java.net.http.HttpClient.Version.HTTP_1_1;
-import static java.net.http.HttpClient.Version.HTTP_2;
-import static java.time.Duration.*;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static org.testng.Assert.fail;
-
-public abstract class AbstractConnectTimeout {
-
-    static final Duration NO_DURATION = null;
-
-    static List<List<Duration>> TIMEOUTS = List.of(
-                    // connectTimeout   HttpRequest timeout
-            Arrays.asList( NO_DURATION,   ofMillis(100) ),
-            Arrays.asList( NO_DURATION,   ofNanos(1)    ),
-
-            Arrays.asList( ofMillis(100), NO_DURATION   ),
-            Arrays.asList( ofNanos(1),    NO_DURATION   ),
-
-            Arrays.asList( ofMillis(100), ofMinutes(1)  ),
-            Arrays.asList( ofNanos(1),    ofMinutes(1)  )
-    );
-
-    static final List<String> METHODS = List.of("GET", "POST");
-    static final List<Version> VERSIONS = List.of(HTTP_2, HTTP_1_1);
-    static final List<String> SCHEMES = List.of("https", "http");
-
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
-        List<Object[]> l = new ArrayList<>();
-        for (List<Duration> timeouts : TIMEOUTS) {
-           Duration connectTimeout = timeouts.get(0);
-           Duration requestTimeout = timeouts.get(1);
-           for (String method: METHODS) {
-            for (String scheme : SCHEMES) {
-             for (Version requestVersion : VERSIONS) {
-              l.add(new Object[] {requestVersion, scheme, method, connectTimeout, requestTimeout});
-        }}}}
-        return l.stream().toArray(Object[][]::new);
-    }
-
-    static final ProxySelector EXAMPLE_DOT_COM_PROXY = ProxySelector.of(
-            InetSocketAddress.createUnresolved("example.com", 8080));
-
-    //@Test(dataProvider = "variants")
-    protected void timeoutNoProxySync(Version requestVersion,
-                                      String scheme,
-                                      String method,
-                                      Duration connectTimeout,
-                                      Duration requestTimeout)
-        throws Exception
-    {
-        timeoutSync(requestVersion, scheme, method, connectTimeout, requestTimeout, NO_PROXY);
-    }
-
-    //@Test(dataProvider = "variants")
-    protected void timeoutWithProxySync(Version requestVersion,
-                                        String scheme,
-                                        String method,
-                                        Duration connectTimeout,
-                                        Duration requestTimeout)
-        throws Exception
-    {
-        timeoutSync(requestVersion, scheme, method, connectTimeout, requestTimeout, EXAMPLE_DOT_COM_PROXY);
-    }
-
-    private void timeoutSync(Version requestVersion,
-                             String scheme,
-                             String method,
-                             Duration connectTimeout,
-                             Duration requestTimeout,
-                             ProxySelector proxy)
-        throws Exception
-    {
-        out.printf("%ntimeoutSync(requestVersion=%s, scheme=%s, method=%s,"
-                   + " connectTimeout=%s, requestTimeout=%s, proxy=%s)%n",
-                   requestVersion, scheme, method, connectTimeout, requestTimeout, proxy);
-
-        HttpClient client = newClient(connectTimeout, proxy);
-        HttpRequest request = newRequest(scheme, requestVersion, method, requestTimeout);
-
-        for (int i = 0; i < 2; i++) {
-            out.printf("iteration %d%n", i);
-            long startTime = System.nanoTime();
-            try {
-                HttpResponse<?> resp = client.send(request, BodyHandlers.ofString());
-                printResponse(resp);
-                fail("Unexpected response: " + resp);
-            } catch (HttpConnectTimeoutException expected) { // blocking thread-specific exception
-                long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
-                out.printf("Client: received in %d millis%n", elapsedTime);
-                assertExceptionTypeAndCause(expected.getCause());
-            } catch (ConnectException e) {
-                long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
-                out.printf("Client: received in %d millis%n", elapsedTime);
-                Throwable t = e.getCause().getCause();  // blocking thread-specific exception
-                if (!isAcceptableCause(t)) { // tolerate only NRTHE or UAE
-                    e.printStackTrace(out);
-                    fail("Unexpected exception:" + e);
-                } else {
-                    out.printf("Caught ConnectException with "
-                            + " cause: %s - skipping%n", t.getCause());
-                }
-            }
-        }
-    }
-
-    //@Test(dataProvider = "variants")
-    protected void timeoutNoProxyAsync(Version requestVersion,
-                                       String scheme,
-                                       String method,
-                                       Duration connectTimeout,
-                                       Duration requestTimeout) {
-        timeoutAsync(requestVersion, scheme, method, connectTimeout, requestTimeout, NO_PROXY);
-    }
-
-    //@Test(dataProvider = "variants")
-    protected void timeoutWithProxyAsync(Version requestVersion,
-                                         String scheme,
-                                         String method,
-                                         Duration connectTimeout,
-                                         Duration requestTimeout) {
-        timeoutAsync(requestVersion, scheme, method, connectTimeout, requestTimeout, EXAMPLE_DOT_COM_PROXY);
-    }
-
-    private void timeoutAsync(Version requestVersion,
-                              String scheme,
-                              String method,
-                              Duration connectTimeout,
-                              Duration requestTimeout,
-                              ProxySelector proxy) {
-        out.printf("%ntimeoutAsync(requestVersion=%s, scheme=%s, method=%s, "
-                   + "connectTimeout=%s, requestTimeout=%s, proxy=%s)%n",
-                   requestVersion, scheme, method, connectTimeout, requestTimeout, proxy);
-
-        HttpClient client = newClient(connectTimeout, proxy);
-        HttpRequest request = newRequest(scheme, requestVersion, method, requestTimeout);
-        for (int i = 0; i < 2; i++) {
-            out.printf("iteration %d%n", i);
-            long startTime = System.nanoTime();
-            try {
-                HttpResponse<?> resp = client.sendAsync(request, BodyHandlers.ofString()).join();
-                printResponse(resp);
-                fail("Unexpected response: " + resp);
-            } catch (CompletionException e) {
-                long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
-                out.printf("Client: received in %d millis%n", elapsedTime);
-                Throwable t = e.getCause();
-                if (t instanceof ConnectException && isAcceptableCause(t.getCause())) {
-                    // tolerate only NRTHE and UAE
-                    out.printf("Caught ConnectException with "
-                            + "cause: %s - skipping%n", t.getCause());
-                } else {
-                    assertExceptionTypeAndCause(t);
-                }
-            }
-        }
-    }
-
-    static boolean isAcceptableCause(Throwable cause) {
-        if (cause instanceof NoRouteToHostException) return true;
-        if (cause instanceof UnresolvedAddressException) return true;
-        return false;
-    }
-
-    static HttpClient newClient(Duration connectTimeout, ProxySelector proxy) {
-        HttpClient.Builder builder = HttpClient.newBuilder().proxy(proxy);
-        if (connectTimeout != NO_DURATION)
-            builder.connectTimeout(connectTimeout);
-        return builder.build();
-    }
-
-    static HttpRequest newRequest(String scheme,
-                                  Version reqVersion,
-                                  String method,
-                                  Duration requestTimeout) {
-        // Resolvable address. Most tested environments just ignore the TCP SYN,
-        // or occasionally return ICMP no route to host
-        URI uri = URI.create(scheme +"://example.com:81/");
-        HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(uri);
-        reqBuilder = reqBuilder.version(reqVersion);
-        switch (method) {
-            case "GET"   : reqBuilder.GET();                         break;
-            case "POST"  : reqBuilder.POST(BodyPublishers.noBody()); break;
-            default: throw new AssertionError("Unknown method:" + method);
-        }
-        if (requestTimeout != NO_DURATION)
-            reqBuilder.timeout(requestTimeout);
-        return reqBuilder.build();
-    }
-
-    static void assertExceptionTypeAndCause(Throwable t) {
-        if (!(t instanceof HttpConnectTimeoutException)) {
-            t.printStackTrace(out);
-            fail("Expected HttpConnectTimeoutException, got:" + t);
-        }
-        Throwable connEx = t.getCause();
-        if (!(connEx instanceof ConnectException)) {
-            t.printStackTrace(out);
-            fail("Expected ConnectException cause in:" + connEx);
-        }
-        out.printf("Caught expected HttpConnectTimeoutException with ConnectException"
-                + " cause: %n%s%n%s%n", t, connEx);
-        final String EXPECTED_MESSAGE = "HTTP connect timed out"; // impl dependent
-        if (!connEx.getMessage().equals(EXPECTED_MESSAGE))
-            fail("Expected: \"" + EXPECTED_MESSAGE + "\", got: \"" + connEx.getMessage() + "\"");
-
-    }
-
-    static void printResponse(HttpResponse<?> response) {
-        out.println("Unexpected response: " + response);
-        out.println("Headers: " + response.headers());
-        out.println("Body: " + response.body());
-    }
-}
diff --git a/test/jdk/java/net/httpclient/AbstractConnectTimeoutHandshake.java b/test/jdk/java/net/httpclient/AbstractConnectTimeoutHandshake.java
index 3febe7145b4..d60fe4f8bcd 100644
--- a/test/jdk/java/net/httpclient/AbstractConnectTimeoutHandshake.java
+++ b/test/jdk/java/net/httpclient/AbstractConnectTimeoutHandshake.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,24 +46,24 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.time.Duration.*;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
 
 abstract class AbstractConnectTimeoutHandshake {
 
     // The number of iterations each testXXXClient performs.
     static final int TIMES = 2;
 
-    Server server;
-    URI httpsURI;
+    private static Server server;
+    private static URI httpsURI;
 
     static final Duration NO_DURATION = null;
 
@@ -79,8 +79,7 @@ abstract class AbstractConnectTimeoutHandshake {
     static final List<String> METHODS = List.of("GET" , "POST");
     static final List<Version> VERSIONS = List.of(HTTP_2, HTTP_1_1);
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         List<Object[]> l = new ArrayList<>();
         for (List<Duration> timeouts : TIMEOUTS) {
            Duration connectTimeout = timeouts.get(0);
@@ -198,8 +197,8 @@ abstract class AbstractConnectTimeoutHandshake {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         server = new Server();
         httpsURI = URIBuilder.newBuilder()
                 .scheme("https")
@@ -210,8 +209,8 @@ abstract class AbstractConnectTimeoutHandshake {
         out.println("HTTPS URI: " + httpsURI);
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         server.close();
         out.printf("%n--- teardown ---%n");
 
diff --git a/test/jdk/java/net/httpclient/AbstractNoBody.java b/test/jdk/java/net/httpclient/AbstractNoBody.java
index d0908a6e4cd..43847a2eda1 100644
--- a/test/jdk/java/net/httpclient/AbstractNoBody.java
+++ b/test/jdk/java/net/httpclient/AbstractNoBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,9 +38,6 @@ import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
 
 import static java.lang.System.err;
 import static java.lang.System.out;
@@ -49,8 +46,16 @@ import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
 
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+
+// Use TestInstance.Lifecycle.PER_CLASS because we need access
+// to this.getClass() in methods that are called from
+// @BeforeAll and @AfterAll
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractNoBody implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
@@ -76,7 +81,6 @@ public abstract class AbstractNoBody implements HttpServerAdapters {
     // a shared executor helps reduce the amount of threads created by the test
     static final ExecutorService executor = Executors.newFixedThreadPool(ITERATION_COUNT * 2);
     static final ExecutorService serverExecutor = Executors.newFixedThreadPool(ITERATION_COUNT * 4);
-    static final AtomicLong serverCount = new AtomicLong();
     static final AtomicLong clientCount = new AtomicLong();
     static final long start = System.nanoTime();
     public static String now() {
@@ -87,7 +91,6 @@ public abstract class AbstractNoBody implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    @DataProvider(name = "variants")
     public Object[][] variants() {
         return new Object[][]{
                 { http3URI_fixed,   false,},
@@ -145,8 +148,8 @@ public abstract class AbstractNoBody implements HttpServerAdapters {
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         out.println("\n" + now() + "--- HEAD request succeeded ----\n");
         err.println("\n" + now() + "--- HEAD request succeeded ----\n");
         return response;
@@ -182,7 +185,7 @@ public abstract class AbstractNoBody implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
+    @BeforeAll
     public void setup() throws Exception {
         printStamp(START, "setup");
         HttpServerAdapters.enableServerLogging();
@@ -252,7 +255,7 @@ public abstract class AbstractNoBody implements HttpServerAdapters {
         printStamp(END,"setup");
     }
 
-    @AfterTest
+    @AfterAll
     public void teardown() throws Exception {
         printStamp(START, "teardown");
         sharedClient.close();
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java b/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
index ddd9c52fc58..1e8bc461d7f 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 
-/**
+/*
  * This is not a test. Actual tests are implemented by concrete subclasses.
  * The abstract class AbstractThrowingPushPromises provides a base framework
  * to test what happens when push promise handlers and their
@@ -62,7 +62,6 @@ import java.net.http.HttpResponse.BodySubscriber;
 import java.net.http.HttpResponse.PushPromiseHandler;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -104,7 +103,6 @@ import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.extension.TestWatcher;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractThrowingPushPromises implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
@@ -193,14 +191,9 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
 
 
     @AfterAll
-    static final void printFailedTests() {
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
-            // Exceptions should already have been added to FAILURES
-            // var failed = context.getFailedTests().getAllResults().stream()
-            //        .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-            // FAILURES.putAll(failed);
-
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
             if (FAILURES.isEmpty()) return;
@@ -339,7 +332,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
             HttpRequest req = request(uri);
 
             BodyHandler<Stream<String>> handler =
-                    new ThrowingBodyHandler((w) -> {},
+                    new ThrowingBodyHandler<>((w) -> {},
                                             BodyHandlers.ofLines());
             Map<HttpRequest, CompletableFuture<HttpResponse<Stream<String>>>> pushPromises =
                     new ConcurrentHashMap<>();
@@ -387,9 +380,9 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
     }
 
     // @Test(dataProvider = "variants")
-    protected void testThrowingAsStringImpl(String uri,
-                                     boolean sameClient,
-                                     Thrower thrower)
+    void testThrowingAsStringImpl(String uri,
+                                  boolean sameClient,
+                                  Thrower thrower)
             throws Exception
     {
         String test = format("testThrowingAsString(%s, %b, %s)",
@@ -399,7 +392,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
     }
 
     //@Test(dataProvider = "variants")
-    protected void testThrowingAsLinesImpl(String uri,
+    void testThrowingAsLinesImpl(String uri,
                                     boolean sameClient,
                                     Thrower thrower)
             throws Exception
@@ -411,9 +404,9 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
     }
 
     //@Test(dataProvider = "variants")
-    protected void testThrowingAsInputStreamImpl(String uri,
-                                          boolean sameClient,
-                                          Thrower thrower)
+    void testThrowingAsInputStreamImpl(String uri,
+                                       boolean sameClient,
+                                       Thrower thrower)
             throws Exception
     {
         String test = format("testThrowingAsInputStream(%s, %b, %s)",
@@ -424,7 +417,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
 
     private <T,U> void testThrowing(String name, String uri, boolean sameClient,
                                     Supplier<BodyHandler<T>> handlers,
-                                    Finisher finisher, Thrower thrower)
+                                    Finisher<T,U> finisher, Thrower thrower)
             throws Exception
     {
         out.printf("%n%s%s%n", now(), name);
@@ -438,7 +431,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
 
     private <T,U> void testThrowing(String uri, boolean sameClient,
                                     Supplier<BodyHandler<T>> handlers,
-                                    Finisher finisher, Thrower thrower)
+                                    Finisher<T,U> finisher, Thrower thrower)
             throws Exception
     {
         HttpClient client = null;
@@ -452,7 +445,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
             ConcurrentMap<HttpRequest, CompletableFuture<HttpResponse<T>>> promiseMap =
                     new ConcurrentHashMap<>();
             Supplier<BodyHandler<T>> throwing = () ->
-                    new ThrowingBodyHandler(where.select(thrower), handlers.get());
+                    new ThrowingBodyHandler<>(where.select(thrower), handlers.get());
             PushPromiseHandler<T> pushHandler = new ThrowingPromiseHandler<>(
                     where.select(thrower),
                     PushPromiseHandler.of((r) -> throwing.get(), promiseMap));
@@ -540,7 +533,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         return check(w, reqURI, resp, thrower, promises, extractor);
     }
 
-    private final <T> List<String> check(Where w, URI reqURI,
+    private <T> List<String> check(Where w, URI reqURI,
                                  HttpResponse<T> resp,
                                  Thrower thrower,
                                  Map<HttpRequest, CompletableFuture<HttpResponse<T>>> promises,
@@ -697,7 +690,7 @@ public abstract class AbstractThrowingPushPromises implements HttpServerAdapters
         public BodySubscriber<T> apply(HttpResponse.ResponseInfo rinfo) {
             throwing.accept(Where.BODY_HANDLER);
             BodySubscriber<T> subscriber = bodyHandler.apply(rinfo);
-            return new ThrowingBodySubscriber(throwing, subscriber);
+            return new ThrowingBodySubscriber<>(throwing, subscriber);
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
index 608b6489181..175e860c229 100644
--- a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
  *       ReferenceTracker AggregateRequestBodyTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors,headers,frames
  *                     AggregateRequestBodyTest
  * @summary Tests HttpRequest.BodyPublishers::concat
@@ -41,7 +41,6 @@ import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,40 +69,43 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.Assert;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class AggregateRequestBodyTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer http1TestServer;   // HTTP/1.1 ( http )
-    HttpTestServer https1TestServer;  // HTTPS/1.1 ( https  )
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3 )
-    URI http1URI;
-    URI https1URI;
-    URI http2URI;
-    URI https2URI;
-    URI http3URI;
+    private static HttpTestServer http1TestServer;   // HTTP/1.1 ( http )
+    private static HttpTestServer https1TestServer;  // HTTPS/1.1 ( https  )
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3 )
+    private static URI http1URI;
+    private static URI https1URI;
+    private static URI http2URI;
+    private static URI https2URI;
+    private static URI http3URI;
 
     static final int RESPONSE_CODE = 200;
     static final int ITERATION_COUNT = 4;
@@ -123,8 +125,8 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -150,40 +152,40 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
-            var failed = context.getFailedTests().getAllResults().stream()
-                    .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-            FAILURES.putAll(failed);
-
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
             if (FAILURES.isEmpty()) return;
@@ -201,7 +203,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         }
     }
 
-    private URI[] uris() {
+    private static URI[] uris() {
         return new URI[] {
                 http1URI,
                 https1URI,
@@ -211,13 +213,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         };
     }
 
-    static AtomicLong URICOUNT = new AtomicLong();
-
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         URI[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -285,8 +281,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         return s;
     }
 
-    @DataProvider(name = "sparseContent")
-    Object[][] nulls() {
+    static Object[][] nulls() {
         return new Object[][] {
                 {"null array", null},
                 {"null element", strings((String)null)},
@@ -304,8 +299,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
                 .collect(Collectors.toList());
     }
 
-    @DataProvider(name = "contentLengths")
-    Object[][] contentLengths() {
+    static Object[][] contentLengths() {
         return new Object[][] {
                 {-1, lengths(-1)},
                 {-42, lengths(-42)},
@@ -332,8 +326,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         };
     }
 
-    @DataProvider(name="negativeRequests")
-    Object[][] negativeRequests() {
+    static Object[][] negativeRequests() {
         return new Object[][] {
                 {0L}, {-1L}, {-2L}, {Long.MIN_VALUE + 1L}, {Long.MIN_VALUE}
         };
@@ -492,31 +485,33 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
                 () -> new AssertionError("Should not happen!"));
     }
 
-    @Test(dataProvider = "sparseContent") // checks that NPE is thrown
+    @ParameterizedTest // checks that NPE is thrown
+    @MethodSource("nulls")
     public void testNullPointerException(String description, String[] content) {
-        checkSkip();
+        out.printf("%n%s-- testNullPointerException %s%n%n", now(), description);
         BodyPublisher[] publishers = publishers(content);
-        Assert.assertThrows(NullPointerException.class, () -> BodyPublishers.concat(publishers));
+        Assertions.assertThrows(NullPointerException.class, () -> BodyPublishers.concat(publishers));
     }
 
     // Verifies that an empty array creates a "noBody" publisher
     @Test
     public void testEmpty() {
-        checkSkip();
+        out.printf("%n%s-- testEmpty%n%n", now());
         BodyPublisher publisher = BodyPublishers.concat();
         RequestSubscriber subscriber = new RequestSubscriber();
-        assertEquals(publisher.contentLength(), 0);
+        assertEquals(0, publisher.contentLength());
         publisher.subscribe(subscriber);
         subscriber.subscriptionCF.thenAccept(s -> s.request(1));
         List<ByteBuffer> result = subscriber.resultCF.join();
-        assertEquals(result, List.of());
+        assertEquals(List.of(), result);
         assertTrue(subscriber.items.isEmpty());
     }
 
     // verifies that error emitted by upstream publishers are propagated downstream.
-    @Test(dataProvider = "sparseContent") // nulls are replaced with error publisher
+    @ParameterizedTest // nulls are replaced with error publisher
+    @MethodSource("nulls")
     public void testOnError(String description, String[] content) {
-        checkSkip();
+        out.printf("%n%s-- testOnError %s%n%n", now(), description);
         final RequestSubscriber subscriber = new RequestSubscriber();
         final PublishWithError errorPublisher;
         final BodyPublisher[] publishers;
@@ -556,13 +551,13 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         publisher.subscribe(subscriber);
         subscriber.subscriptionCF.thenAccept(s -> s.request(Long.MAX_VALUE));
         if (errorPublisher.hasErrors()) {
-            CompletionException ce = expectThrows(CompletionException.class,
+            CompletionException ce = Assertions.assertThrows(CompletionException.class,
                     () -> subscriber.resultCF.join());
             out.println(description + ": got expected " + ce);
-            assertEquals(ce.getCause().getClass(), Exception.class);
-            assertEquals(stringFromBytes(subscriber.items.stream()) + "<error>", result);
+            assertEquals(Exception.class, ce.getCause().getClass());
+            assertEquals(result, stringFromBytes(subscriber.items.stream()) + "<error>");
         } else {
-            assertEquals(stringFromBytes(subscriber.resultCF.join().stream()), result);
+            assertEquals(result, stringFromBytes(subscriber.resultCF.join().stream()));
             out.println(description + ": got expected result: " + result);
         }
     }
@@ -570,9 +565,10 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
     // Verifies that if an upstream publisher has an unknown length, the
     // aggregate publisher will have an unknown length as well. Otherwise
     // the length should be known.
-    @Test(dataProvider = "sparseContent") // nulls are replaced with unknown length
+    @ParameterizedTest // nulls are replaced with unknown length
+    @MethodSource("nulls")
     public void testUnknownContentLength(String description, String[] content) {
-        checkSkip();
+        out.printf("%n%s-- testUnknownContentLength %s%n%n", now(), description);
         if (content == null) {
             content = BODIES.toArray(String[]::new);
             description = "BODIES (known length)";
@@ -598,9 +594,9 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
                 length += content[i].length();
             }
         }
-        out.printf("testUnknownContentLength(%s): %d%n", description, length);
+        out.printf("%stestUnknownContentLength(%s): %d%n", now(), description, length);
         BodyPublisher publisher = BodyPublishers.concat(publishers);
-        assertEquals(publisher.contentLength(), length,
+        assertEquals(length, publisher.contentLength(),
                 description.replace("null", "length(-1)"));
     }
 
@@ -611,9 +607,10 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         return x.getCause();
     }
 
-    @Test(dataProvider = "negativeRequests")
+    @ParameterizedTest
+    @MethodSource("negativeRequests")
     public void testNegativeRequest(long n) {
-        checkSkip();
+        out.printf("%n%s-- testNegativeRequest %s%n%n", now(), n);
         assert n <= 0 : "test for negative request called with n > 0 : " + n;
         BodyPublisher[] publishers = ContentLengthPublisher.of(List.of(1L, 2L, 3L));
         BodyPublisher publisher = BodyPublishers.concat(publishers);
@@ -621,7 +618,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         publisher.subscribe(subscriber);
         Subscription subscription = subscriber.subscriptionCF.join();
         subscription.request(n);
-        CompletionException expected = expectThrows(CE, () -> subscriber.resultCF.join());
+        CompletionException expected = Assertions.assertThrows(CE, () -> subscriber.resultCF.join());
         Throwable cause = completionCause(expected);
         if (cause instanceof IllegalArgumentException) {
             System.out.printf("Got expected IAE for %d: %s%n", n, cause);
@@ -637,7 +634,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
 
     @Test
     public void testPositiveRequests()  {
-        checkSkip();
+        out.printf("%n%s-- testPositiveRequests%n%n", now());
         // A composite array of publishers
         BodyPublisher[] publishers = Stream.of(
                 Stream.of(ofStrings("Lorem", " ", "ipsum", " ")),
@@ -657,7 +654,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         List<ByteBuffer> list1 = requestSubscriber1.resultCF().join();
         assertTrue(requestSubscriber1.resultCF().isDone());
         String result1 = stringFromBytes(list1.stream());
-        assertEquals(result1, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        assertEquals("Lorem ipsum dolor sit amet, consectetur adipiscing elit.", result1);
         System.out.println("Got expected sentence with one request: \"%s\"".formatted(result1));
 
         // Test that we can split our requests call any which way we want
@@ -675,16 +672,17 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         List<ByteBuffer> list2 = requestSubscriber2.resultCF().join();
         assertTrue(requestSubscriber2.resultCF().isDone());
         String result2 = stringFromBytes(list2.stream());
-        assertEquals(result2, "Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
+        assertEquals("Lorem ipsum dolor sit amet, consectetur adipiscing elit.", result2);
         System.out.println("Got expected sentence with 4 requests: \"%s\"".formatted(result1));
     }
 
-    @Test(dataProvider = "contentLengths")
+    @ParameterizedTest
+    @MethodSource("contentLengths")
     public void testContentLength(long expected, List<Long> lengths) {
-        checkSkip();
+        out.printf("%n%s-- testContentLength expected=%s %s%n%n", now(), expected, lengths);
         BodyPublisher[] publishers = ContentLengthPublisher.of(lengths);
         BodyPublisher aggregate = BodyPublishers.concat(publishers);
-        assertEquals(aggregate.contentLength(), expected,
+        assertEquals(expected, aggregate.contentLength(),
                 "Unexpected result for %s".formatted(lengths));
     }
 
@@ -692,14 +690,13 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
     // publishers are no longer subscribed etc...
     @Test
     public void testCancel() {
-        checkSkip();
+        out.printf("%n%s-- testCancel%n%n", now());
         BodyPublisher[] publishers = BODIES.stream()
                 .map(BodyPublishers::ofString)
                 .toArray(BodyPublisher[]::new);
         BodyPublisher publisher = BodyPublishers.concat(publishers);
 
-        assertEquals(publisher.contentLength(),
-                BODIES.stream().mapToInt(String::length).sum());
+        assertEquals(BODIES.stream().mapToInt(String::length).sum(), publisher.contentLength());
         Map<RequestSubscriber, String> subscribers = new LinkedHashMap<>();
 
         for (int n=0; n < BODIES.size(); n++) {
@@ -731,7 +728,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
 
         // subscription was cancelled, so nothing should be received...
         try {
-            TimeoutException x = Assert.expectThrows(TimeoutException.class,
+            TimeoutException x = Assertions.assertThrows(TimeoutException.class,
                     () -> any.get(5, TimeUnit.SECONDS));
             out.println("Got expected " + x);
         } finally {
@@ -742,8 +739,8 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
                             subscribers.get(rs), rs.resultCF));
         }
         Consumer<RequestSubscriber> check = (rs) -> {
-            Assert.assertTrue(rs.items.isEmpty(), subscribers.get(rs) + " has items");
-            Assert.assertFalse(rs.resultCF.isDone(), subscribers.get(rs) + " was not cancelled");
+            assertTrue(rs.items.isEmpty(), subscribers.get(rs) + " has items");
+            assertFalse(rs.resultCF.isDone(), subscribers.get(rs) + " was not cancelled");
             out.println(subscribers.get(rs) + ": PASSED");
         };
         subscribers.keySet().stream().forEach(check);
@@ -752,13 +749,12 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
     // Verifies that cancelling the subscription is propagated downstream
     @Test
     public void testCancelSubscription() {
-        checkSkip();
+        out.printf("%n%s-- testCancelSubscription%n%n", now());
         PublishWithError upstream = new PublishWithError(BODIES, BODIES.size(),
                 () -> new AssertionError("should not come here"));
         BodyPublisher publisher = BodyPublishers.concat(upstream);
 
-        assertEquals(publisher.contentLength(),
-                BODIES.stream().mapToInt(String::length).sum());
+        assertEquals(BODIES.stream().mapToInt(String::length).sum(), publisher.contentLength());
         Map<RequestSubscriber, String> subscribers = new LinkedHashMap<>();
 
         for (int n=0; n < BODIES.size(); n++) {
@@ -793,7 +789,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
 
         // subscription was cancelled, so nothing should be received...
         try {
-            TimeoutException x = Assert.expectThrows(TimeoutException.class,
+            TimeoutException x = Assertions.assertThrows(TimeoutException.class,
                     () -> any.get(5, TimeUnit.SECONDS));
             out.println("Got expected " + x);
         } finally {
@@ -804,17 +800,19 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
                             subscribers.get(rs), rs.resultCF));
         }
         Consumer<RequestSubscriber> check = (rs) -> {
-            Assert.assertTrue(rs.items.isEmpty(), subscribers.get(rs) + " has items");
-            Assert.assertFalse(rs.resultCF.isDone(), subscribers.get(rs) + " was not cancelled");
+            assertTrue(rs.items.isEmpty(), subscribers.get(rs) + " has items");
+            assertFalse(rs.resultCF.isDone(), subscribers.get(rs) + " was not cancelled");
             out.println(subscribers.get(rs) + ": PASSED");
         };
         subscribers.keySet().stream().forEach(check);
 
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(URI uri, HttpClient.Version version, boolean sameClient) throws Exception {
-        checkSkip();
+        out.printf("%n%s-- test sameClient=%s, version=%s, uri=%s%n%n",
+                now(), sameClient, version, uri);
         System.out.printf("Request to %s (sameClient: %s)%n", uri, sameClient);
         System.err.printf("Request to %s (sameClient: %s)%n", uri, sameClient);
 
@@ -838,13 +836,13 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
             int expectedResponse =  RESPONSE_CODE;
             if (response.statusCode() != expectedResponse)
                 throw new RuntimeException("wrong response code " + Integer.toString(response.statusCode()));
-            assertEquals(response.body(), BODIES.stream().collect(Collectors.joining()));
+            assertEquals(BODIES.stream().collect(Collectors.joining()), response.body());
         }
         if (!sameClient) client.close();
         System.out.println("test: DONE");
     }
 
-    private URI buildURI(String scheme, String path, int port) {
+    private static URI buildURI(String scheme, String path, int port) {
         return URIBuilder.newBuilder()
                 .scheme(scheme)
                 .loopback()
@@ -853,8 +851,8 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
                 .buildUnchecked();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         HttpTestHandler handler = new HttpTestEchoHandler();
         http1TestServer = HttpTestServer.create(HTTP_1_1);
         http1TestServer.addHandler(handler, "/http1/echo/");
@@ -884,8 +882,8 @@ public class AggregateRequestBodyTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         String sharedClientName =
                 sharedClient == null ? null : sharedClient.toString();
         sharedClient.close();
diff --git a/test/jdk/java/net/httpclient/AltServiceUsageTest.java b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
index 41f3aef9bd1..59ad2179b90 100644
--- a/test/jdk/java/net/httpclient/AltServiceUsageTest.java
+++ b/test/jdk/java/net/httpclient/AltServiceUsageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,36 +37,37 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @summary Verifies that the HTTP client correctly handles various alt-svc usages
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
  *
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     AltServiceUsageTest
  */
 public class AltServiceUsageTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer originServer;
-    private HttpTestServer altServer;
+    private static HttpTestServer originServer;
+    private static HttpTestServer altServer;
 
-    private DatagramChannel udpNotResponding;
+    private static DatagramChannel udpNotResponding;
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         // attempt to create an HTTP/3 server, an HTTP/2 server, and a
         // DatagramChannel bound to the same port as the HTTP/2 server
         int count = 0;
@@ -99,7 +100,7 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.err.println("**** All servers started. Test will start shortly ****");
     }
 
-    private void createServers() throws IOException {
+    private static void createServers() throws IOException {
         altServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         altServer.addHandler(new All200OKHandler(), "/foo/");
         altServer.addHandler(new RequireAltUsedHeader(), "/bar/");
@@ -114,8 +115,8 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         originServer.start();
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         safeStop(originServer);
         safeStop(altServer);
         safeClose(udpNotResponding);
@@ -271,14 +272,14 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Issuing request " + reqURI);
         final HttpResponse<String> response = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(response.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(response.body(), H3AltServicePublisher.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, response.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(H3AltServicePublisher.RESPONSE_CONTENT, response.body(),
                 "Unexpected response body");
         final Optional<String> altSvcHeader = response.headers().firstValue("alt-svc");
-        Assert.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
+        Assertions.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
         System.out.println("Received alt-svc header value: " + altSvcHeader.get());
         final String expectedHeader = "h3=\"" + toHostPort(altServer) + "\"";
-        Assert.assertTrue(altSvcHeader.get().contains(expectedHeader),
+        Assertions.assertTrue(altSvcHeader.get().contains(expectedHeader),
                 "Unexpected alt-svc header value: " + altSvcHeader.get()
                         + ", was expected to contain: " + expectedHeader);
 
@@ -286,8 +287,8 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Again issuing request " + reqURI);
         final HttpResponse<String> secondResponse = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(secondResponse.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(secondResponse.body(), All200OKHandler.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, secondResponse.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(All200OKHandler.RESPONSE_CONTENT, secondResponse.body(),
                 "Unexpected response body");
         var TRACKER = ReferenceTracker.INSTANCE;
         var tracker = TRACKER.getTracker(client);
@@ -318,14 +319,14 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Issuing request " + reqURI);
         final HttpResponse<String> response = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(response.statusCode(), 421, "Unexpected response code");
-        Assert.assertEquals(response.body(), H3AltServicePublisher.RESPONSE_CONTENT,
+        Assertions.assertEquals(421, response.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(H3AltServicePublisher.RESPONSE_CONTENT, response.body(),
                 "Unexpected response body");
         final Optional<String> altSvcHeader = response.headers().firstValue("alt-svc");
-        Assert.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
+        Assertions.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
         System.out.println("Received alt-svc header value: " + altSvcHeader.get());
         final String expectedHeader = "h3=\"" + toHostPort(altServer) + "\"";
-        Assert.assertTrue(altSvcHeader.get().contains(expectedHeader),
+        Assertions.assertTrue(altSvcHeader.get().contains(expectedHeader),
                 "Unexpected alt-svc header value: " + altSvcHeader.get()
                         + ", was expected to contain: " + expectedHeader);
 
@@ -333,8 +334,8 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Again issuing request " + reqURI);
         final HttpResponse<String> secondResponse = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(secondResponse.statusCode(), 421, "Unexpected response code");
-        Assert.assertEquals(response.body(), H3AltServicePublisher.RESPONSE_CONTENT,
+        Assertions.assertEquals(421, secondResponse.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(H3AltServicePublisher.RESPONSE_CONTENT, response.body(),
                 "Unexpected response body");
         var TRACKER = ReferenceTracker.INSTANCE;
         var tracker = TRACKER.getTracker(client);
@@ -369,14 +370,14 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Issuing request " + reqURI);
         final HttpResponse<String> response = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(response.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(response.body(), H3AltServicePublisher.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, response.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(H3AltServicePublisher.RESPONSE_CONTENT, response.body(),
                 "Unexpected response body");
         final Optional<String> altSvcHeader = response.headers().firstValue("alt-svc");
-        Assert.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
+        Assertions.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
         System.out.println("Received alt-svc header value: " + altSvcHeader.get());
         final String expectedHeader = "h3=\"" + toHostPort(altServer) + "\"";
-        Assert.assertTrue(altSvcHeader.get().contains(expectedHeader),
+        Assertions.assertTrue(altSvcHeader.get().contains(expectedHeader),
                 "Unexpected alt-svc header value: " + altSvcHeader.get()
                         + ", was expected to contain: " + expectedHeader);
 
@@ -386,8 +387,8 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Again issuing request " + reqURI);
         final HttpResponse<String> secondResponse = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(secondResponse.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(secondResponse.body(), RequireAltUsedHeader.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, secondResponse.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(RequireAltUsedHeader.RESPONSE_CONTENT, secondResponse.body(),
                 "Unexpected response body");
         var TRACKER = ReferenceTracker.INSTANCE;
         var tracker = TRACKER.getTracker(client);
@@ -424,14 +425,14 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Issuing request " + reqURI);
         final HttpResponse<String> response = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(response.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(response.body(), H3AltServicePublisher.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, response.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(H3AltServicePublisher.RESPONSE_CONTENT, response.body(),
                 "Unexpected response body");
         final Optional<String> altSvcHeader = response.headers().firstValue("alt-svc");
-        Assert.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
+        Assertions.assertTrue(altSvcHeader.isPresent(), "alt-svc header is missing in response");
         System.out.println("Received alt-svc header value: " + altSvcHeader.get());
         final String expectedHeader = "h3=\"" + toHostPort(altServer) + "\"";
-        Assert.assertTrue(altSvcHeader.get().contains(expectedHeader),
+        Assertions.assertTrue(altSvcHeader.get().contains(expectedHeader),
                 "Unexpected alt-svc header value: " + altSvcHeader.get()
                         + ", was expected to contain: " + expectedHeader);
 
@@ -439,8 +440,8 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Again issuing request " + reqURI);
         final HttpResponse<String> secondResponse = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(secondResponse.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(secondResponse.body(), All200OKHandler.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, secondResponse.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(All200OKHandler.RESPONSE_CONTENT, secondResponse.body(),
                 "Unexpected response body");
 
         // wait for alt-service to expire
@@ -452,8 +453,8 @@ public class AltServiceUsageTest implements HttpServerAdapters {
         System.out.println("Issuing request for a third time " + reqURI);
         final HttpResponse<String> thirdResponse = client.send(request,
                 HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
-        Assert.assertEquals(thirdResponse.statusCode(), 200, "Unexpected response code");
-        Assert.assertEquals(thirdResponse.body(), H3AltServicePublisher.RESPONSE_CONTENT,
+        Assertions.assertEquals(200, thirdResponse.statusCode(), "Unexpected response code");
+        Assertions.assertEquals(H3AltServicePublisher.RESPONSE_CONTENT, thirdResponse.body(),
                 "Unexpected response body");
         var TRACKER = ReferenceTracker.INSTANCE;
         var tracker = TRACKER.getTracker(client);
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.java b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
index 88bf95dab02..6e9c4e676cf 100644
--- a/test/jdk/java/net/httpclient/AsFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,19 +63,20 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2Handler;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.net.http.HttpResponse.BodyHandlers.ofFileDownload;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -86,24 +87,24 @@ import static org.testng.Assert.fail;
  *        jdk.test.lib.Platform jdk.test.lib.util.FileUtils
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm/timeout=480 AsFileDownloadTest
+ * @run junit/othervm/timeout=480 AsFileDownloadTest
  */
 public class AsFileDownloadTest {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
-    HttpsServer httpsTestServer;       // HTTPS/1.1
-    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
-    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer h3TestServer;       // HTTP/3
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h3URI;
+    private static HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    private static HttpsServer httpsTestServer;       // HTTPS/1.1
+    private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer h3TestServer;       // HTTP/3
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h3URI;
     final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
-    Path tempDir;
+    static Path tempDir;
 
     static final String[][] contentDispositionValues = new String[][] {
           // URI query     Content-Type header value         Expected filename
@@ -151,8 +152,7 @@ public class AsFileDownloadTest {
             { "041", "attachment; filename=\"foo/../../file12.txt\"", "file12.txt" },
     };
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         List<Object[]> list = new ArrayList<>();
 
         Arrays.asList(contentDispositionValues).stream()
@@ -181,7 +181,8 @@ public class AsFileDownloadTest {
         return builder.sslContext(sslContext).proxy(Builder.NO_PROXY).build();
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, String contentDispositionValue, String expectedFilename,
               Optional<Version> requestVersion) throws Exception {
         out.printf("test(%s, %s, %s): starting", uriString, contentDispositionValue, expectedFilename);
@@ -207,14 +208,13 @@ public class AsFileDownloadTest {
             String fileContents = new String(Files.readAllBytes(response.body()), UTF_8);
             out.println("Got body: " + fileContents);
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(body.getFileName().toString(), expectedFilename);
+            assertEquals(200, response.statusCode());
+            assertEquals(expectedFilename, body.getFileName().toString());
             assertTrue(response.headers().firstValue("Content-Disposition").isPresent());
-            assertEquals(response.headers().firstValue("Content-Disposition").get(),
-                    contentDispositionValue);
-            assertEquals(fileContents, "May the luck of the Irish be with you!");
+            assertEquals(                    contentDispositionValue, response.headers().firstValue("Content-Disposition").get());
+            assertEquals("May the luck of the Irish be with you!", fileContents);
             if (requestVersion.isPresent()) {
-                assertEquals(response.version(), requestVersion.get(), "unexpected HTTP version" +
+                assertEquals(requestVersion.get(), response.version(), "unexpected HTTP version" +
                         " in response");
             }
 
@@ -254,8 +254,7 @@ public class AsFileDownloadTest {
 
     };
 
-    @DataProvider(name = "negative")
-    public Object[][] negative() {
+    public static Object[][] negative() {
         List<Object[]> list = new ArrayList<>();
 
         Arrays.asList(contentDispositionBADValues).stream()
@@ -276,7 +275,8 @@ public class AsFileDownloadTest {
         return list.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "negative")
+    @ParameterizedTest
+    @MethodSource("negative")
     void negativeTest(String uriString, String contentDispositionValue,
                       Optional<Version> requestVersion) throws Exception {
         out.printf("negativeTest(%s, %s): starting", uriString, contentDispositionValue);
@@ -330,8 +330,8 @@ public class AsFileDownloadTest {
         return builder;
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         tempDir = Paths.get("asFileDownloadTest.tmp.dir");
         if (Files.exists(tempDir))
             throw new AssertionError("Unexpected test work dir existence: " + tempDir.toString());
@@ -380,8 +380,8 @@ public class AsFileDownloadTest {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
         http2TestServer.stop();
@@ -474,11 +474,11 @@ public class AsFileDownloadTest {
                 for (String name : List.of(headerName.toUpperCase(Locale.ROOT),
                                            headerName.toLowerCase(Locale.ROOT))) {
                     assertTrue(headers.firstValue(name).isPresent());
-                    assertEquals(headers.firstValue(name).get(), headerValue.get(0));
-                    assertEquals(headers.allValues(name).size(), headerValue.size());
-                    assertEquals(headers.allValues(name), headerValue);
-                    assertEquals(headers.map().get(name).size(), headerValue.size());
-                    assertEquals(headers.map().get(name), headerValue);
+                    assertEquals(headerValue.get(0), headers.firstValue(name).get());
+                    assertEquals(headerValue.size(), headers.allValues(name).size());
+                    assertEquals(headerValue, headers.allValues(name));
+                    assertEquals(headerValue.size(), headers.map().get(name).size());
+                    assertEquals(headerValue, headers.map().get(name));
                 }
             }
         } catch (Throwable t) {
diff --git a/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java b/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
index 14ed4f63124..308288bb9bf 100644
--- a/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
+++ b/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       AsyncExecutorShutdown
@@ -68,10 +68,6 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -81,9 +77,14 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class AsyncExecutorShutdown implements HttpServerAdapters {
 
@@ -92,27 +93,26 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
     }
     static final Random RANDOM = RandomFactory.getRandom();
 
-    ExecutorService readerService;
+    private static ExecutorService readerService;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c   )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2    )
-    HttpTestServer h2h3TestServer;        // HTTP/2 ( h2+h3 )
-    HttpTestServer h3TestServer;          // HTTP/2 ( h3    )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h3URI;
-    String h2h3Head;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c   )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2    )
+    private static HttpTestServer h2h3TestServer;        // HTTP/2 ( h2+h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/2 ( h3    )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h3URI;
+    private static String h2h3Head;
 
     static final String MESSAGE = "AsyncExecutorShutdown message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { h2h3URI,   HTTP_3,   h2h3TestServer.h3DiscoveryConfig() },
                 { h3URI,     HTTP_3,   h3TestServer.h3DiscoveryConfig() },
@@ -124,7 +124,7 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
     }
 
     static final AtomicLong requestCounter = new AtomicLong();
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     static Throwable getCause(Throwable t) {
         while (t instanceof CompletionException || t instanceof ExecutionException) {
@@ -165,7 +165,8 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
         throw new AssertionError(what + ": Unexpected exception: " + cause, cause);
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testConcurrent(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting (%s, %s, %s) ----%n%n", uriString, version, config);
         ExecutorService executorService = Executors.newCachedThreadPool();
@@ -206,14 +207,14 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
                     responseCF = client.sendAsync(request, BodyHandlers.ofInputStream())
                             .thenApply((response) -> {
                                 out.println(si + ":  Got response: " + response);
-                                assertEquals(response.statusCode(), 200);
-                                if (si >= head) assertEquals(response.version(), version);
+                                assertEquals(200, response.statusCode());
+                                if (si >= head) assertEquals(version, response.version());
                                 return response;
                             });
                     bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                             .thenApply(AsyncExecutorShutdown::readBody)
                             .thenApply((s) -> {
-                                assertEquals(s, MESSAGE);
+                                assertEquals(MESSAGE, s);
                                 return s;
                             });
                 } catch (RejectedExecutionException x) {
@@ -275,7 +276,8 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
         CompletableFuture.allOf(bodies.toArray(new CompletableFuture<?>[0])).get();
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testSequential(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting (%s, %s, %s) ----%n%n", uriString, version, config);
         ExecutorService executorService = Executors.newCachedThreadPool();
@@ -316,13 +318,13 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
                     responseCF = client.sendAsync(request, BodyHandlers.ofInputStream())
                             .thenApply((response) -> {
                                 out.println(si + ":  Got response: " + response);
-                                assertEquals(response.statusCode(), 200);
-                                if (si > 0) assertEquals(response.version(), version);
+                                assertEquals(200, response.statusCode());
+                                if (si > 0) assertEquals(version, response.version());
                                 return response;
                             });
                     bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                             .thenApply(AsyncExecutorShutdown::readBody)
-                            .thenApply((s) -> {assertEquals(s, MESSAGE); return s;})
+                            .thenApply((s) -> {assertEquals(MESSAGE, s); return s;})
                             .thenApply((s) -> {out.println(si + ":  Got body: " + s); return s;});
                 } catch (RejectedExecutionException x) {
                     out.println(i + ": Got expected exception: " + x);
@@ -397,7 +399,7 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
     static void shutdown(ExecutorService executorService) {
@@ -409,8 +411,8 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("\n**** Setup ****\n");
         readerService = Executors.newCachedThreadPool();
 
@@ -445,8 +447,8 @@ public class AsyncExecutorShutdown implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.checkShutdown(5000);
         try {
diff --git a/test/jdk/java/net/httpclient/AsyncShutdownNow.java b/test/jdk/java/net/httpclient/AsyncShutdownNow.java
index 56b0378cf66..7dc13cf08e2 100644
--- a/test/jdk/java/net/httpclient/AsyncShutdownNow.java
+++ b/test/jdk/java/net/httpclient/AsyncShutdownNow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       AsyncShutdownNow
@@ -70,10 +70,6 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -84,10 +80,15 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class AsyncShutdownNow implements HttpServerAdapters {
 
@@ -96,27 +97,26 @@ public class AsyncShutdownNow implements HttpServerAdapters {
     }
     static final Random RANDOM = RandomFactory.getRandom();
 
-    ExecutorService readerService;
+    private static ExecutorService readerService;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
-    HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h2h3Head;
-    String h3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h2h3Head;
+    private static String h3URI;
 
     static final String MESSAGE = "AsyncShutdownNow message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { h2h3URI,    HTTP_3,   h2h3TestServer.h3DiscoveryConfig()},
                 { h3URI,      HTTP_3,   h3TestServer.h3DiscoveryConfig()},
@@ -168,11 +168,11 @@ public class AsyncShutdownNow implements HttpServerAdapters {
             out.println(step + ":  Got response: " + response);
             out.printf("%s:  expect status 200 and version %s (%s) for %s%n", step, version, config,
                     response.request().uri());
-            assertEquals(response.statusCode(), 200);
+            assertEquals(200, response.statusCode());
             if (step == 0 && version == HTTP_3 && firstVersionMayNotMatch) {
                 out.printf("%s:  version not checked%n", step);
             } else {
-                assertEquals(response.version(), version);
+                assertEquals(version, response.version());
                 out.printf("%s:  got expected version %s%n", step, response.version());
             }
             return this;
@@ -185,7 +185,7 @@ public class AsyncShutdownNow implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
     static boolean hasExpectedMessage(IOException io) {
@@ -223,7 +223,8 @@ public class AsyncShutdownNow implements HttpServerAdapters {
         throw new AssertionError(what + ": Unexpected exception: " + cause, cause);
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testConcurrent(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting concurrent (%s, %s, %s) ----%n%n", uriString, version, config);
         HttpClient client = newClientBuilderForH3()
@@ -260,7 +261,7 @@ public class AsyncShutdownNow implements HttpServerAdapters {
                 bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                         .thenApply(AsyncShutdownNow::readBody)
                         .thenApply((s) -> {
-                            assertEquals(s, MESSAGE);
+                            assertEquals(MESSAGE, s);
                             return s;
                         });
                 long sleep = RANDOM.nextLong(5);
@@ -320,7 +321,8 @@ public class AsyncShutdownNow implements HttpServerAdapters {
         return failed;
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testSequential(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting sequential (%s, %s, %s) ----%n%n",
                 uriString, version, config);
@@ -354,7 +356,7 @@ public class AsyncShutdownNow implements HttpServerAdapters {
                 bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                         .thenApply(AsyncShutdownNow::readBody)
                         .thenApply((s) -> {
-                            assertEquals(s, MESSAGE);
+                            assertEquals(MESSAGE, s);
                             return s;
                         })
                         .thenApply((s) -> {
@@ -403,8 +405,8 @@ public class AsyncShutdownNow implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("\n**** Setup ****\n");
         readerService = Executors.newCachedThreadPool();
 
@@ -439,8 +441,8 @@ public class AsyncShutdownNow implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.checkShutdown(5000);
         try {
diff --git a/test/jdk/java/net/httpclient/AuthFilterCacheTest.java b/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
index 6d64caa1950..0d87055ff51 100644
--- a/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
+++ b/test/jdk/java/net/httpclient/AuthFilterCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,10 +40,6 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
 import com.sun.net.httpserver.HttpsServer;
 import jdk.httpclient.test.lib.common.TestServerConfigurator;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 
@@ -54,7 +50,12 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -63,7 +64,7 @@ import static org.testng.Assert.*;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        DigestEchoServer ReferenceTracker jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm -Dtest.requiresHost=true
+ * @run junit/othervm -Dtest.requiresHost=true
  * -Djdk.httpclient.HttpClient.log=requests,headers,errors,quic
  * -Djdk.internal.httpclient.debug=false
  * AuthFilterCacheTest
@@ -81,29 +82,28 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
         SSLContext.setDefault(context);
     }
 
-    HttpTestServer http1Server;
-    HttpTestServer http2Server;
-    HttpTestServer https1Server;
-    HttpTestServer https2Server;
-    HttpTestServer h3onlyServer;
-    HttpTestServer h3altSvcServer;
-    DigestEchoServer.TunnelingProxy proxy;
-    URI http1URI;
-    URI https1URI;
-    URI http2URI;
-    URI https2URI;
-    URI h3onlyURI;
-    URI h3altSvcURI;
-    InetSocketAddress proxyAddress;
-    ProxySelector proxySelector;
-    MyAuthenticator auth;
-    HttpClient client;
-    ExecutorService serverExecutor = Executors.newCachedThreadPool();
-    ExecutorService virtualExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
+    private static HttpTestServer http1Server;
+    private static HttpTestServer http2Server;
+    private static HttpTestServer https1Server;
+    private static HttpTestServer https2Server;
+    private static HttpTestServer h3onlyServer;
+    private static HttpTestServer h3altSvcServer;
+    private static DigestEchoServer.TunnelingProxy proxy;
+    private static URI http1URI;
+    private static URI https1URI;
+    private static URI http2URI;
+    private static URI https2URI;
+    private static URI h3onlyURI;
+    private static URI h3altSvcURI;
+    private static InetSocketAddress proxyAddress;
+    private static ProxySelector proxySelector;
+    private static MyAuthenticator auth;
+    private static HttpClient client;
+    private static ExecutorService serverExecutor = Executors.newCachedThreadPool();
+    private static ExecutorService virtualExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
             .name("HttpClient-Worker", 0).factory());
 
-    @DataProvider(name = "uris")
-    Object[][] testURIs() {
+    static Object[][] testURIs() {
         Object[][] uris = new Object[][]{
                 {List.of(http1URI.resolve("direct/orig/"),
                         https1URI.resolve("direct/orig/"),
@@ -117,8 +117,8 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
         return uris;
     }
 
-    public HttpClient newHttpClient(ProxySelector ps, Authenticator auth) {
-        HttpClient.Builder builder = newClientBuilderForH3()
+    public static HttpClient newHttpClient(ProxySelector ps, Authenticator auth) {
+        HttpClient.Builder builder = HttpServerAdapters.createClientBuilderForH3()
                 .executor(virtualExecutor)
                 .sslContext(context)
                 .authenticator(auth)
@@ -126,8 +126,8 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
         return builder.build();
     }
 
-    @BeforeClass
-    public void setUp() throws Exception {
+    @BeforeAll
+    public static void setUp() throws Exception {
         try {
             InetSocketAddress sa =
                     new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
@@ -189,8 +189,8 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
                     .version(HTTP_2).build();
             System.out.println("Sending head request: " + headRequest);
             var headResponse = client.send(headRequest, BodyHandlers.ofString());
-            assertEquals(headResponse.statusCode(), 200);
-            assertEquals(headResponse.version(), HTTP_2);
+            assertEquals(200, headResponse.statusCode());
+            assertEquals(HTTP_2, headResponse.version());
 
             System.out.println("Setup: done");
         } catch (Exception x) {
@@ -202,8 +202,8 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
         }
     }
 
-    @AfterClass
-    public void tearDown() {
+    @AfterAll
+    public static void tearDown() {
         proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop);
         http1Server = stop(http1Server, HttpTestServer::stop);
         https1Server = stop(https1Server, HttpTestServer::stop);
@@ -378,7 +378,8 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("testURIs")
     public void test(List<URI> uris) throws Exception {
         System.out.println("Servers listening at "
                 + uris.stream().map(URI::toString)
diff --git a/test/jdk/java/net/httpclient/BasicHTTP2Test.java b/test/jdk/java/net/httpclient/BasicHTTP2Test.java
index 586673d62ab..4175aceea3d 100644
--- a/test/jdk/java/net/httpclient/BasicHTTP2Test.java
+++ b/test/jdk/java/net/httpclient/BasicHTTP2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        ReferenceTracker
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     BasicHTTP2Test
  * @summary Basic HTTP/2 test when HTTP/3 is requested
@@ -44,37 +44,40 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.Builder;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import org.testng.ITestContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
 
 public class BasicHTTP2Test implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    String https2URI;
-    DatagramSocket udp;
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static String https2URI;
+    private static DatagramSocket udp;
 
     // a shared executor helps reduce the amount of threads created by the test
     static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
@@ -91,8 +94,7 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -118,20 +120,37 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            var x = new SkipException("Skipping: some test failed");
-            x.setStackTrace(new StackTraceElement[0]);
-            throw x;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
         }
     }
 
-    @AfterClass
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
     static final void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -152,14 +171,6 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
-        return new String[] {
-                https2URI,
-        };
-    }
-
-    static AtomicLong URICOUNT = new AtomicLong();
-
     private HttpClient makeNewClient() {
         clientCount.incrementAndGet();
         HttpClient client =  HttpClient.newBuilder()
@@ -170,37 +181,6 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         return TRACKER.track(client);
     }
 
-    HttpClient newHttpClient(boolean share) {
-        if (!share) return makeNewClient();
-        HttpClient shared = sharedClient;
-        if (shared != null) return shared;
-        synchronized (this) {
-            shared = sharedClient;
-            if (shared == null) {
-                shared = sharedClient = makeNewClient();
-            }
-            return shared;
-        }
-    }
-
-
-    static void checkStatus(int expected, int found) throws Exception {
-        if (expected != found) {
-            System.err.printf ("Test failed: wrong status code %d/%d\n",
-                expected, found);
-            throw new RuntimeException("Test failed");
-        }
-    }
-
-    static void checkStrings(String expected, String found) throws Exception {
-        if (!expected.equals(found)) {
-            System.err.printf ("Test failed: wrong string %s/%s\n",
-                expected, found);
-            throw new RuntimeException("Test failed");
-        }
-    }
-
-
     @Test
     public void testH2() throws Exception {
 
@@ -220,8 +200,8 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
         out.println("Response #1: " + response);
         out.println("Version  #1: " + response.version());
-        assertEquals(response.statusCode(), 200, "first response status");
-        assertEquals(response.version(), HTTP_2, "first response version");
+        assertEquals(200, response.statusCode(), "first response status");
+        assertEquals(HTTP_2, response.version(), "first response version");
 
         Thread.sleep(1000);
 
@@ -232,16 +212,15 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         response = client.send(request, BodyHandlers.ofString());
         out.println("Response #2: " + response);
         out.println("Version  #2: " + response.version());
-        assertEquals(response.statusCode(), 200, "second response status");
-        assertEquals(response.version(), HTTP_2, "second response version");
+        assertEquals(200, response.statusCode(), "second response status");
+        assertEquals(HTTP_2, response.version(), "second response version");
 
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/2
         HttpTestHandler handler = new Handler();
-        HttpTestHandler h3Handler = new Handler();
 
         https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         https2TestServer.addHandler(handler, "/https2/test204/");
@@ -259,11 +238,8 @@ public class BasicHTTP2Test implements HttpServerAdapters {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
-        String sharedClientName =
-                sharedClient == null ? null : sharedClient.toString();
-        sharedClient = null;
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(500);
         try {
@@ -271,10 +247,7 @@ public class BasicHTTP2Test implements HttpServerAdapters {
             https2TestServer.stop();
         } finally {
             if (fail != null) {
-                if (sharedClientName != null) {
-                    System.err.println("Shared client name is: " + sharedClientName);
-                }
-                throw fail;
+                 throw fail;
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/BasicHTTP3Test.java b/test/jdk/java/net/httpclient/BasicHTTP3Test.java
index 4508b32e544..aec21e421f9 100644
--- a/test/jdk/java/net/httpclient/BasicHTTP3Test.java
+++ b/test/jdk/java/net/httpclient/BasicHTTP3Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.Builder;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -40,28 +39,32 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.internal.net.quic.QuicVersion;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 import static java.lang.System.out;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -70,7 +73,7 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        ReferenceTracker
  *        jdk.httpclient.test.lib.quic.QuicStandaloneServer
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                      -Djavax.net.debug=all
  *                     BasicHTTP3Test
@@ -79,20 +82,20 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 public class BasicHTTP3Test implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    String https2URI;
-    HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
-    String h3URI;
-    HttpTestServer h3qv2TestServer;  // HTTP/2 ( h2 + h3 on Quic v2, incompatible nego)
-    String h3URIQv2;
-    HttpTestServer h3qv2CTestServer;  // HTTP/2 ( h2 + h3 on Quic v2, compatible nego)
-    String h3URIQv2C;
-    HttpTestServer h3mtlsTestServer;  // HTTP/2 ( h2 + h3), h3 requires client cert
-    String h3mtlsURI;
-    HttpTestServer h3TestServerWithRetry;  // h3
-    String h3URIRetry;
-    HttpTestServer h3TestServerWithTLSHelloRetry;  // h3
-    String h3URITLSHelloRetry;
+    static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    static String https2URI;
+    static HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
+    static String h3URI;
+    static HttpTestServer h3qv2TestServer;  // HTTP/2 ( h2 + h3 on Quic v2, incompatible nego)
+    static String h3URIQv2;
+    static HttpTestServer h3qv2CTestServer;  // HTTP/2 ( h2 + h3 on Quic v2, compatible nego)
+    static String h3URIQv2C;
+    static HttpTestServer h3mtlsTestServer;  // HTTP/2 ( h2 + h3), h3 requires client cert
+    static String h3mtlsURI;
+    static HttpTestServer h3TestServerWithRetry;  // h3
+    static String h3URIRetry;
+    static HttpTestServer h3TestServerWithTLSHelloRetry;  // h3
+    static String h3URITLSHelloRetry;
 
     static final int ITERATION_COUNT = 4;
     // a shared executor helps reduce the amount of threads created by the test
@@ -109,8 +112,8 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -136,21 +139,38 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            var x = new SkipException("Skipping: some test failed");
-            x.setStackTrace(new StackTraceElement[0]);
-            throw x;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
         }
     }
 
-    @AfterClass
-    static final void printFailedTests() {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
             out.printf("%n%sCreated %d clients%n",
@@ -170,18 +190,14 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 https2URI,
                 h3URI
         };
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2 * 2][];
         int i = 0;
@@ -196,11 +212,7 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "h3URIs")
-    public Object[][] versions(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] versions() {
         Object[][] result = {
                 {h3URI}, {h3URIRetry},
                 {h3URIQv2}, {h3URIQv2C},
@@ -233,9 +245,11 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(String uri, boolean sameClient, Optional<Version> version) throws Exception {
-        System.out.println("Request to " + uri);
+        System.out.printf("%n%s-- test version=%s, sameClient=%s, uri=%s%n%n",
+                now(), version, sameClient, uri);
 
         HttpClient client = newHttpClient(sameClient);
 
@@ -267,8 +281,10 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         System.out.println("test: DONE");
     }
 
-    @Test(dataProvider = "h3URIs")
+    @ParameterizedTest
+    @MethodSource("versions")
     public void testH3(final String h3URI) throws Exception {
+        System.out.printf("%n%s-- testH3 h3URI=%s%n%n", now(), h3URI);
         HttpClient client = makeNewClient();
         URI uri = URI.create(h3URI);
         Builder builder = HttpRequest.newBuilder(uri)
@@ -278,17 +294,17 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
         out.println("Response #1: " + response);
         out.println("Version  #1: " + response.version());
-        assertEquals(response.statusCode(), 200, "first response status");
-        assertEquals(response.version(), HTTP_2, "first response version");
+        assertEquals(200, response.statusCode(), "first response status");
+        assertEquals(HTTP_2, response.version(), "first response version");
 
         request = builder.version(Version.HTTP_3).build();
         response = client.send(request, BodyHandlers.ofString());
         out.println("Response #2: " + response);
         out.println("Version  #2: " + response.version());
-        assertEquals(response.statusCode(), 200, "second response status");
-        assertEquals(response.version(), Version.HTTP_3, "second response version");
+        assertEquals(200, response.statusCode(), "second response status");
+        assertEquals(Version.HTTP_3, response.version(), "second response version");
 
-        if (h3URI == h3mtlsURI) {
+        if (h3URI.equals(h3mtlsURI)) {
             assertNotNull(response.sslSession().get().getLocalCertificates());
         } else {
             assertNull(response.sslSession().get().getLocalCertificates());
@@ -303,6 +319,7 @@ public class BasicHTTP3Test implements HttpServerAdapters {
     // verify that the client handles HTTP/3 reset stream correctly
     @Test
     public void testH3Reset() throws Exception {
+        System.out.printf("%n%s-- testH3Reset uri=%s%n%n", now(), h3URI);
         HttpClient client = makeNewClient();
         URI uri = URI.create(h3URI);
         Builder builder = HttpRequest.newBuilder(uri)
@@ -312,8 +329,8 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
         out.println("Response #1: " + response);
         out.println("Version  #1: " + response.version());
-        assertEquals(response.statusCode(), 200, "first response status");
-        assertEquals(response.version(), HTTP_2, "first response version");
+        assertEquals(200, response.statusCode(), "first response status");
+        assertEquals(HTTP_2, response.version(), "first response version");
 
         // instruct the server side handler to throw an exception
         // that then causes the test server to reset the stream
@@ -341,8 +358,8 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         if (error != null) throw error;
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         https2TestServer.addHandler(new Handler(), "/https2/test/");
         https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/test/x";
@@ -360,7 +377,7 @@ public class BasicHTTP3Test implements HttpServerAdapters {
                 .enableH3AltServiceOnEphemeralPortWithVersion(QuicVersion.QUIC_V2, false);
         h3qv2TestServer = HttpTestServer.of(h2q2Server);
         h3qv2TestServer.addHandler(h3Handler, "/h3/testH3/");
-        h3URIQv2 = "https://" + h3qv2TestServer.serverAuthority() + "/h3/testH3/h3qv2";;
+        h3URIQv2 = "https://" + h3qv2TestServer.serverAuthority() + "/h3/testH3/h3qv2";
         assertTrue(h3qv2TestServer.canHandle(HTTP_2, Version.HTTP_3), "Server was expected" +
                 " to handle both HTTP2 and HTTP3, but doesn't");
 
@@ -369,7 +386,7 @@ public class BasicHTTP3Test implements HttpServerAdapters {
                 .enableH3AltServiceOnEphemeralPortWithVersion(QuicVersion.QUIC_V2, true);
         h3qv2CTestServer = HttpTestServer.of(h2q2CServer);
         h3qv2CTestServer.addHandler(h3Handler, "/h3/testH3/");
-        h3URIQv2C = "https://" + h3qv2CTestServer.serverAuthority() + "/h3/testH3/h3qv2c";;
+        h3URIQv2C = "https://" + h3qv2CTestServer.serverAuthority() + "/h3/testH3/h3qv2c";
         assertTrue(h3qv2CTestServer.canHandle(HTTP_2, Version.HTTP_3), "Server was expected" +
                 " to handle both HTTP2 and HTTP3, but doesn't");
 
@@ -411,8 +428,8 @@ public class BasicHTTP3Test implements HttpServerAdapters {
         h3TestServerWithTLSHelloRetry.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("=======================================================");
         System.err.println("               Tearing down test");
         System.err.println("=======================================================");
diff --git a/test/jdk/java/net/httpclient/BasicRedirectTest.java b/test/jdk/java/net/httpclient/BasicRedirectTest.java
index d79c39fe47a..d873a64bb1b 100644
--- a/test/jdk/java/net/httpclient/BasicRedirectTest.java
+++ b/test/jdk/java/net/httpclient/BasicRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Basic test for redirect and redirect policies
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       -Djdk.internal.httpclient.debug=true
  *       BasicRedirectTest
@@ -49,10 +49,6 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -61,39 +57,42 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
 
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class BasicRedirectTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    String httpURI;
-    String httpURIToMoreSecure;   // redirects HTTP to HTTPS
-    String httpURIToH3MoreSecure; // redirects HTTP to HTTPS/3
-    String httpsURI;
-    String httpsURIToLessSecure; // redirects HTTPS to HTTP
-    String http2URI;
-    String http2URIToMoreSecure; // redirects HTTP to HTTPS
-    String http2URIToH3MoreSecure; // redirects HTTP to HTTPS/3
-    String https2URI;
-    String https2URIToLessSecure; // redirects HTTPS to HTTP
-    String https3URI;
-    String https3HeadURI;
-    String http3URIToLessSecure; // redirects HTTP3 to HTTP
-    String http3URIToH2cLessSecure; // redirects HTTP3 to h2c
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpURIToMoreSecure;   // redirects HTTP to HTTPS
+    private static String httpURIToH3MoreSecure; // redirects HTTP to HTTPS/3
+    private static String httpsURI;
+    private static String httpsURIToLessSecure; // redirects HTTPS to HTTP
+    private static String http2URI;
+    private static String http2URIToMoreSecure; // redirects HTTP to HTTPS
+    private static String http2URIToH3MoreSecure; // redirects HTTP to HTTPS/3
+    private static String https2URI;
+    private static String https2URIToLessSecure; // redirects HTTPS to HTTP
+    private static String https3URI;
+    private static String https3HeadURI;
+    private static String http3URIToLessSecure; // redirects HTTP3 to HTTP
+    private static String http3URIToH2cLessSecure; // redirects HTTP3 to h2c
 
     static final String MESSAGE = "Is fearr Gaeilge briste, na Bearla cliste";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { httpURI,                 Redirect.ALWAYS, Optional.empty()    },
                 { httpsURI,                Redirect.ALWAYS, Optional.empty()    },
@@ -121,8 +120,8 @@ public class BasicRedirectTest implements HttpServerAdapters {
         };
     }
 
-    HttpClient createClient(Redirect redirectPolicy, Optional<Version> version) throws Exception {
-        var clientBuilder = newClientBuilderForH3()
+    static HttpClient createClient(Redirect redirectPolicy, Optional<Version> version) throws Exception {
+        var clientBuilder = HttpServerAdapters.createClientBuilderForH3()
                 .followRedirects(redirectPolicy)
                 .sslContext(sslContext);
         HttpClient client = version.map(clientBuilder::version)
@@ -135,23 +134,24 @@ public class BasicRedirectTest implements HttpServerAdapters {
             var get = builder.copy().GET().build();
             out.printf("%n---- sending initial head request (%s) -----%n", head.uri());
             var resp = client.send(head, BodyHandlers.ofString());
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(resp.version(), HTTP_2);
+            assertEquals(200, resp.statusCode());
+            assertEquals(HTTP_2, resp.version());
             out.println("HEADERS: " + resp.headers());
             var length = resp.headers().firstValueAsLong("Content-Length")
                     .orElseThrow(AssertionError::new);
             if (length < 0) throw new AssertionError("negative length " + length);
             out.printf("%n---- sending initial HTTP/3 GET request (%s) -----%n", get.uri());
             resp = client.send(get, BodyHandlers.ofString());
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(resp.version(), HTTP_3);
-            assertEquals(resp.body().getBytes(UTF_8).length, length,
+            assertEquals(200, resp.statusCode());
+            assertEquals(HTTP_3, resp.version());
+            assertEquals(length, resp.body().getBytes(UTF_8).length,
                     "body \"" + resp.body() + "\": ");
         }
         return client;
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, Redirect redirectPolicy, Optional<Version> clientVersion) throws Exception {
         out.printf("%n---- starting positive (%s, %s, %s) ----%n", uriString, redirectPolicy,
                 clientVersion.map(Version::name).orElse("empty"));
@@ -169,8 +169,8 @@ public class BasicRedirectTest implements HttpServerAdapters {
             out.println("  Got body Path: " + response.body());
             out.println("  Got response.request: " + response.request());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), MESSAGE);
+            assertEquals(200, response.statusCode());
+            assertEquals(MESSAGE, response.body());
             // asserts redirected URI in response.request().uri()
             assertTrue(response.uri().getPath().endsWith("message"));
             assertPreviousRedirectResponses(request, response, clientVersion);
@@ -193,7 +193,7 @@ public class BasicRedirectTest implements HttpServerAdapters {
             versions.add(response.version());
             assertTrue(300 <= response.statusCode() && response.statusCode() <= 309,
                        "Expected 300 <= code <= 309, got:" + response.statusCode());
-            assertEquals(response.body(), null, "Unexpected body: " + response.body());
+            assertEquals(null, response.body(), "Unexpected body: " + response.body());
             String locationHeader = response.headers().firstValue("Location")
                       .orElseThrow(() -> new RuntimeException("no previous Location"));
             assertTrue(uri.toString().endsWith(locationHeader),
@@ -202,7 +202,7 @@ public class BasicRedirectTest implements HttpServerAdapters {
         } while (response.previousResponse().isPresent());
 
         // initial
-        assertEquals(initialRequest, response.request(),
+        assertEquals(response.request(), initialRequest,
                 String.format("Expected initial request [%s] to equal last prev req [%s]",
                               initialRequest, response.request()));
         if (clientVersion.stream().anyMatch(HTTP_3::equals)) {
@@ -214,8 +214,7 @@ public class BasicRedirectTest implements HttpServerAdapters {
 
     // --  negatives
 
-    @DataProvider(name = "negative")
-    public Object[][] negative() {
+    public static Object[][] negative() {
         return new Object[][] {
                 { httpURI,                 Redirect.NEVER,  Optional.empty()    },
                 { httpsURI,                Redirect.NEVER,  Optional.empty()    },
@@ -238,7 +237,8 @@ public class BasicRedirectTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "negative")
+    @ParameterizedTest
+    @MethodSource("negative")
     void testNegatives(String uriString, Redirect redirectPolicy, Optional<Version> clientVersion)
             throws Exception {
         out.printf("%n---- starting negative (%s, %s, %s) ----%n", uriString, redirectPolicy,
@@ -257,8 +257,8 @@ public class BasicRedirectTest implements HttpServerAdapters {
             out.println("  Got body Path: " + response.body());
             out.println("  Got response.request: " + response.request());
 
-            assertEquals(response.statusCode(), 302);
-            assertEquals(response.body(), "XY");
+            assertEquals(302, response.statusCode());
+            assertEquals("XY", response.body());
             // asserts original URI in response.request().uri()
             assertTrue(response.uri().equals(uri));
             assertFalse(response.previousResponse().isPresent());
@@ -268,8 +268,8 @@ public class BasicRedirectTest implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new BasicHttpRedirectHandler(), "/http1/same/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/same/redirect";
@@ -325,8 +325,8 @@ public class BasicRedirectTest implements HttpServerAdapters {
         createClient(Redirect.NEVER, Optional.of(HTTP_3));
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/BodySubscribersTest.java b/test/jdk/java/net/httpclient/BodySubscribersTest.java
index 21aa4ce3b17..abd86693b83 100644
--- a/test/jdk/java/net/httpclient/BodySubscribersTest.java
+++ b/test/jdk/java/net/httpclient/BodySubscribersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Basic test for the standard BodySubscribers default behavior
  * @bug 8225583 8334028
- * @run testng BodySubscribersTest
+ * @run junit BodySubscribersTest
  */
 
 import java.net.http.HttpResponse.BodySubscriber;
@@ -34,16 +34,18 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Supplier;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpResponse.BodySubscribers.*;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.CREATE;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.expectThrows;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class BodySubscribersTest {
 
@@ -78,8 +80,7 @@ public class BodySubscribersTest {
         @Override public void onComplete() { fail(); }
     }
 
-    @DataProvider(name = "bodySubscriberSuppliers")
-    public Object[][] bodySubscriberSuppliers() { ;
+    public static Object[][] bodySubscriberSuppliers() { ;
         List<Supplier<BodySubscriber<?>>> list = List.of(
             BSSupplier.create("ofByteArray",   () -> ofByteArray()),
             BSSupplier.create("ofInputStream", () -> ofInputStream()),
@@ -102,7 +103,8 @@ public class BodySubscribersTest {
         return list.stream().map(x -> new Object[] { x }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "bodySubscriberSuppliers")
+    @ParameterizedTest
+    @MethodSource("bodySubscriberSuppliers")
     void nulls(Supplier<BodySubscriber<?>> bodySubscriberSupplier) {
         BodySubscriber<?> bodySubscriber = bodySubscriberSupplier.get();
         boolean subscribed = false;
@@ -111,18 +113,18 @@ public class BodySubscribersTest {
             assertNotNull(bodySubscriber.getBody());
             assertNotNull(bodySubscriber.getBody());
             assertNotNull(bodySubscriber.getBody());
-            expectThrows(NPE, () -> bodySubscriber.onSubscribe(null));
-            expectThrows(NPE, () -> bodySubscriber.onSubscribe(null));
-            expectThrows(NPE, () -> bodySubscriber.onSubscribe(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onSubscribe(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onSubscribe(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onSubscribe(null));
 
-            expectThrows(NPE, () -> bodySubscriber.onNext(null));
-            expectThrows(NPE, () -> bodySubscriber.onNext(null));
-            expectThrows(NPE, () -> bodySubscriber.onNext(null));
-            expectThrows(NPE, () -> bodySubscriber.onNext(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onNext(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onNext(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onNext(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onNext(null));
 
-            expectThrows(NPE, () -> bodySubscriber.onError(null));
-            expectThrows(NPE, () -> bodySubscriber.onError(null));
-            expectThrows(NPE, () -> bodySubscriber.onError(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onError(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onError(null));
+            Assertions.assertThrows(NPE, () -> bodySubscriber.onError(null));
 
             if (!subscribed) {
                 out.println("subscribing");
@@ -138,7 +140,8 @@ public class BodySubscribersTest {
         } while (true);
     }
 
-    @Test(dataProvider = "bodySubscriberSuppliers")
+    @ParameterizedTest
+    @MethodSource("bodySubscriberSuppliers")
     void subscribeMoreThanOnce(Supplier<BodySubscriber<?>> bodySubscriberSupplier) {
         BodySubscriber<?> bodySubscriber = bodySubscriberSupplier.get();
         bodySubscriber.onSubscribe(new Flow.Subscription() {
diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
index a4c5bab55dc..4d73ec31280 100644
--- a/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
+++ b/test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,33 +32,34 @@ import java.util.concurrent.SubmissionPublisher;
 import java.util.function.IntSupplier;
 import java.util.stream.IntStream;
 import java.net.http.HttpResponse.BodySubscriber;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.Long.MAX_VALUE;
 import static java.lang.Long.MIN_VALUE;
 import static java.lang.System.out;
 import static java.nio.ByteBuffer.wrap;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.net.http.HttpResponse.BodySubscribers.buffering;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @summary Direct test for HttpResponse.BodySubscriber.buffering() cancellation
- * @run testng/othervm BufferingSubscriberCancelTest
+ * @run junit/othervm BufferingSubscriberCancelTest
  */
 
 public class BufferingSubscriberCancelTest {
 
-    @DataProvider(name = "bufferSizes")
-    public Object[][] bufferSizes() {
+    public static Object[][] bufferSizes() {
         return new Object[][]{
             // bufferSize should be irrelevant
             {1}, {100}, {511}, {512}, {513}, {1024}, {2047}, {2048}
         };
     }
 
-    @Test(dataProvider = "bufferSizes")
+    @ParameterizedTest
+    @MethodSource("bufferSizes")
     public void cancelWithoutAnyItemsPublished(int bufferSize) throws Exception {
         ExecutorService executor = Executors.newFixedThreadPool(1);
         SubmissionPublisher<List<ByteBuffer>> publisher =
@@ -85,8 +86,7 @@ public class BufferingSubscriberCancelTest {
         executor.shutdown();
     }
 
-    @DataProvider(name = "sizeAndItems")
-    public Object[][] sizeAndItems() {
+    public static Object[][] sizeAndItems() {
         return new Object[][] {
             // bufferSize and item bytes must be equal to count onNext calls
             // bufferSize        items
@@ -103,7 +103,8 @@ public class BufferingSubscriberCancelTest {
         };
     }
 
-    @Test(dataProvider = "sizeAndItems")
+    @ParameterizedTest
+    @MethodSource("sizeAndItems")
     public void cancelWithItemsPublished(int bufferSize, List<ByteBuffer> items)
         throws Exception
     {
@@ -125,12 +126,13 @@ public class BufferingSubscriberCancelTest {
         IntStream.range(0, ITERATION_TIMES+1).forEach(x -> publisher.submit(items));
 
         assertEqualsWithRetry(publisher::getNumberOfSubscribers, 0);
-        assertEquals(exposingSubscriber.onNextInvocations, ITERATION_TIMES);
+        assertEquals(ITERATION_TIMES, exposingSubscriber.onNextInvocations);
         executor.shutdown();
     }
 
     // same as above but with more racy conditions, do not wait on the gate
-    @Test(dataProvider = "sizeAndItems")
+    @ParameterizedTest
+    @MethodSource("sizeAndItems")
     public void cancelWithItemsPublishedNoWait(int bufferSize, List<ByteBuffer> items)
         throws Exception
     {
@@ -212,6 +214,6 @@ public class BufferingSubscriberCancelTest {
                 return;
             Thread.sleep(100);
         }
-        assertEquals(actual, expected); // will fail with the usual testng message
+        assertEquals(expected, actual); // will fail with the usual junit message
     }
 }
diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
index 5292f4b9860..255946232be 100644
--- a/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
+++ b/test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,30 +32,31 @@ import java.util.concurrent.Phaser;
 import java.util.concurrent.SubmissionPublisher;
 import java.util.stream.IntStream;
 import java.net.http.HttpResponse.BodySubscriber;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.Long.MAX_VALUE;
 import static java.lang.Long.MIN_VALUE;
 import static java.nio.ByteBuffer.wrap;
 import static java.net.http.HttpResponse.BodySubscribers.buffering;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @summary Test for HttpResponse.BodySubscriber.buffering() onError/onComplete
- * @run testng/othervm BufferingSubscriberErrorCompleteTest
+ * @run junit/othervm BufferingSubscriberErrorCompleteTest
  */
 
 public class BufferingSubscriberErrorCompleteTest {
 
-    @DataProvider(name = "illegalDemand")
-    public Object[][] illegalDemand() {
+    public static Object[][] illegalDemand() {
         return new Object[][]{
             {0L}, {-1L}, {-5L}, {-100L}, {-101L}, {-100_001L}, {MIN_VALUE}
         };
     }
 
-    @Test(dataProvider = "illegalDemand")
+    @ParameterizedTest
+    @MethodSource("illegalDemand")
     public void illegalRequest(long demand) throws Exception {
         ExecutorService executor = Executors.newFixedThreadPool(1);
         SubmissionPublisher<List<ByteBuffer>> publisher =
@@ -72,18 +73,17 @@ public class BufferingSubscriberErrorCompleteTest {
         s.request(demand);
         gate.arriveAndAwaitAdvance();
 
-        assertEquals(previous + 1, exposingSubscriber.onErrorInvocations);
+        assertEquals(exposingSubscriber.onErrorInvocations, previous + 1);
         assertTrue(exposingSubscriber.throwable instanceof IllegalArgumentException,
                 "Expected IAE, got:" + exposingSubscriber.throwable);
 
         furtherCancelsRequestsShouldBeNoOp(s);
-        assertEquals(exposingSubscriber.onErrorInvocations, 1);
+        assertEquals(1, exposingSubscriber.onErrorInvocations);
         executor.shutdown();
     }
 
 
-    @DataProvider(name = "bufferAndItemSizes")
-    public Object[][] bufferAndItemSizes() {
+    public static Object[][] bufferAndItemSizes() {
         List<Object[]> values = new ArrayList<>();
 
         for (int bufferSize : new int[] { 1, 5, 10, 100, 1000 })
@@ -93,7 +93,8 @@ public class BufferingSubscriberErrorCompleteTest {
         return values.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "bufferAndItemSizes")
+    @ParameterizedTest
+    @MethodSource("bufferAndItemSizes")
     public void onErrorFromPublisher(int bufferSize,
                                      int numberOfItems)
         throws Exception
@@ -117,19 +118,19 @@ public class BufferingSubscriberErrorCompleteTest {
 
         Subscription s = exposingSubscriber.subscription;
 
-        assertEquals(exposingSubscriber.onErrorInvocations, 1);
-        assertEquals(exposingSubscriber.onCompleteInvocations, 0);
-        assertEquals(exposingSubscriber.throwable, t);
-        assertEquals(exposingSubscriber.throwable.getMessage(),
-                     "a message from me to me");
+        assertEquals(1, exposingSubscriber.onErrorInvocations);
+        assertEquals(0, exposingSubscriber.onCompleteInvocations);
+        assertEquals(t, exposingSubscriber.throwable);
+        assertEquals("a message from me to me", exposingSubscriber.throwable.getMessage());
 
         furtherCancelsRequestsShouldBeNoOp(s);
-        assertEquals(exposingSubscriber.onErrorInvocations, 1);
-        assertEquals(exposingSubscriber.onCompleteInvocations, 0);
+        assertEquals(1, exposingSubscriber.onErrorInvocations);
+        assertEquals(0, exposingSubscriber.onCompleteInvocations);
         executor.shutdown();
     }
 
-    @Test(dataProvider = "bufferAndItemSizes")
+    @ParameterizedTest
+    @MethodSource("bufferAndItemSizes")
     public void onCompleteFromPublisher(int bufferSize,
                                         int numberOfItems)
         throws Exception
@@ -152,14 +153,14 @@ public class BufferingSubscriberErrorCompleteTest {
 
         Subscription s = exposingSubscriber.subscription;
 
-        assertEquals(exposingSubscriber.onErrorInvocations, 0);
-        assertEquals(exposingSubscriber.onCompleteInvocations, 1);
-        assertEquals(exposingSubscriber.throwable, null);
+        assertEquals(0, exposingSubscriber.onErrorInvocations);
+        assertEquals(1, exposingSubscriber.onCompleteInvocations);
+        assertEquals(null, exposingSubscriber.throwable);
 
         furtherCancelsRequestsShouldBeNoOp(s);
-        assertEquals(exposingSubscriber.onErrorInvocations, 0);
-        assertEquals(exposingSubscriber.onCompleteInvocations, 1);
-        assertEquals(exposingSubscriber.throwable, null);
+        assertEquals(0, exposingSubscriber.onErrorInvocations);
+        assertEquals(1, exposingSubscriber.onCompleteInvocations);
+        assertEquals(null, exposingSubscriber.throwable);
         executor.shutdown();
     }
 
diff --git a/test/jdk/java/net/httpclient/BufferingSubscriberTest.java b/test/jdk/java/net/httpclient/BufferingSubscriberTest.java
index 6d15ba5d3a8..bb33b18ed9c 100644
--- a/test/jdk/java/net/httpclient/BufferingSubscriberTest.java
+++ b/test/jdk/java/net/httpclient/BufferingSubscriberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,15 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.net.http.HttpResponse.BodySubscriber;
 import java.net.http.HttpResponse.BodySubscribers;
 import jdk.test.lib.RandomFactory;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.Long.MAX_VALUE;
-import static java.lang.Long.min;
 import static java.lang.System.out;
 import static java.util.concurrent.CompletableFuture.delayedExecutor;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -54,7 +55,7 @@ import static org.testng.Assert.*;
  * @key randomness
  * @library /test/lib
  * @build jdk.test.lib.RandomFactory
- * @run testng/othervm/timeout=480 -Djdk.internal.httpclient.debug=true BufferingSubscriberTest
+ * @run junit/othervm/timeout=480 -Djdk.internal.httpclient.debug=true BufferingSubscriberTest
  */
 
 public class BufferingSubscriberTest {
@@ -80,37 +81,41 @@ public class BufferingSubscriberTest {
         time = time + ms + "ms";
         out.println(what + "\t ["+time+"]\t "+ String.format(fmt,args));
     }
-    @DataProvider(name = "negatives")
-    public Object[][] negatives() {
+    public static Object[][] negatives() {
         return new Object[][] {  { 0 }, { -1 }, { -1000 } };
     }
 
-    @Test(dataProvider = "negatives", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("negatives")
     public void subscriberThrowsIAE(int bufferSize) {
-        printStamp(START, "subscriberThrowsIAE(%d)", bufferSize);
-        try {
-            BodySubscriber<?> bp = BodySubscribers.ofByteArray();
-            BodySubscribers.buffering(bp, bufferSize);
-        } finally {
-            printStamp(END, "subscriberThrowsIAE(%d)", bufferSize);
-        }
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            printStamp(START, "subscriberThrowsIAE(%d)", bufferSize);
+            try {
+                BodySubscriber<?> bp = BodySubscribers.ofByteArray();
+                BodySubscribers.buffering(bp, bufferSize);
+            } finally {
+                printStamp(END, "subscriberThrowsIAE(%d)", bufferSize);
+            }
+        });
     }
 
-    @Test(dataProvider = "negatives", expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest
+    @MethodSource("negatives")
     public void handlerThrowsIAE(int bufferSize) {
-        printStamp(START, "handlerThrowsIAE(%d)", bufferSize);
-        try {
-            BodyHandler<?> bp = BodyHandlers.ofByteArray();
-            BodyHandlers.buffering(bp, bufferSize);
-        } finally {
-            printStamp(END, "handlerThrowsIAE(%d)", bufferSize);
-        }
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            printStamp(START, "handlerThrowsIAE(%d)", bufferSize);
+            try {
+                BodyHandler<?> bp = BodyHandlers.ofByteArray();
+                BodyHandlers.buffering(bp, bufferSize);
+            } finally {
+                printStamp(END, "handlerThrowsIAE(%d)", bufferSize);
+            }
+        });
     }
 
     // ---
 
-    @DataProvider(name = "config")
-    public Object[][] config() {
+    public static Object[][] config() {
         return new Object[][] {
             // iterations delayMillis numBuffers bufferSize maxBufferSize minBufferSize
             { 1,              0,          1,         1,         2,            1   },
@@ -129,7 +134,8 @@ public class BufferingSubscriberTest {
         };
     }
 
-    @Test(dataProvider = "config")
+    @ParameterizedTest
+    @MethodSource("config")
     public void test(int iterations,
                      int delayMillis,
                      int numBuffers,
@@ -282,8 +288,8 @@ public class BufferingSubscriberTest {
                 }
                 count++;
                 onNextInvocations++;
-                assertNotEquals(sz, 0L, "Unexpected empty buffers");
-                items.stream().forEach(b -> assertEquals(b.position(), 0));
+                assertNotEquals(0L, sz, "Unexpected empty buffers");
+                items.stream().forEach(b -> assertEquals(0, b.position()));
                 assertFalse(noMoreOnNext);
 
                 if (sz != bufferSize) {
@@ -296,20 +302,20 @@ public class BufferingSubscriberTest {
                             "Possibly received last buffer: sz=%d, accumulated=%d, total=%d",
                             sz, totalBytesReceived, totalBytesReceived + sz);
                 } else {
-                    assertEquals(sz, bufferSize, "Expected to receive exactly bufferSize");
+                    assertEquals(bufferSize, sz, "Expected to receive exactly bufferSize");
                 }
                 lastSeenSize = sz;
 
                 // Ensure expected contents
                 for (ByteBuffer b : items) {
                     while (b.hasRemaining()) {
-                        assertEquals(b.get(), (byte) (index % 100));
+                        assertEquals((byte) (index % 100), b.get());
                         index++;
                     }
                 }
 
                 totalBytesReceived += sz;
-                assertEquals(totalBytesReceived, index);
+                assertEquals(index, totalBytesReceived);
                 if (delayMillis > 0 && ((expectedTotalSize - totalBytesReceived) > bufferSize))
                     delayedExecutor.execute(this::requestMore);
                 else
diff --git a/test/jdk/java/net/httpclient/CancelRequestTest.java b/test/jdk/java/net/httpclient/CancelRequestTest.java
index 86e06bb78f7..df808ad2dab 100644
--- a/test/jdk/java/net/httpclient/CancelRequestTest.java
+++ b/test/jdk/java/net/httpclient/CancelRequestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @key randomness
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker CancelRequestTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.enableAllMethodRetry=true
  *                     CancelRequestTest
  */
@@ -38,18 +38,8 @@
 import jdk.internal.net.http.common.OperationTrackers.Tracker;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -62,9 +52,9 @@ import java.net.http.HttpOption.Http3DiscoveryMode;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
@@ -76,7 +66,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
 import static java.lang.System.out;
@@ -85,28 +74,42 @@ import static java.net.http.HttpClient.Version.*;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CancelRequestTest implements HttpServerAdapters {
 
     private static final Random random = RandomFactory.getRandom();
+    private static final ConcurrentHashMap<String, CountDownLatch> latches
+            = new ConcurrentHashMap<>();
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
-    HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h2h3Head;
-    String h3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h2h3Head;
+    private static String h3URI;
 
     static final long SERVER_LATENCY = 75;
     static final int MAX_CLIENT_DELAY = 75;
@@ -117,6 +120,7 @@ public class CancelRequestTest implements HttpServerAdapters {
     static volatile boolean tasksFailed;
     static final AtomicLong serverCount = new AtomicLong();
     static final AtomicLong clientCount = new AtomicLong();
+    static final AtomicLong requestCount = new AtomicLong();
     static final long start = System.nanoTime();
     public static String now() {
         long now = System.nanoTime() - start;
@@ -126,8 +130,8 @@ public class CancelRequestTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -153,38 +157,39 @@ public class CancelRequestTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
-        var failed = context.getFailedTests().getAllResults().stream()
-                .collect(Collectors.toMap(CancelRequestTest::name, ITestResult::getThrowable));
-        FAILURES.putAll(failed);
         try {
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
@@ -202,7 +207,7 @@ public class CancelRequestTest implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 httpURI,
                 httpsURI,
@@ -213,8 +218,7 @@ public class CancelRequestTest implements HttpServerAdapters {
         };
     }
 
-    @DataProvider(name = "asyncurls")
-    public Object[][] asyncurls() {
+    public static Object[][] asyncurls() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2 * 3][];
         //Object[][] result = new Object[uris.length][];
@@ -234,8 +238,7 @@ public class CancelRequestTest implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "urls")
-    public Object[][] alltests() {
+    public static Object[][] alltests() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         //Object[][] result = new Object[uris.length][];
@@ -278,10 +281,12 @@ public class CancelRequestTest implements HttpServerAdapters {
     // set HTTP/3 version on the request when targeting
     // an HTTP/3 server
     private HttpRequest.Builder requestBuilder(String uri) {
-        var builder = HttpRequest.newBuilder(URI.create(uri));
+        var u = URI.create(uri+"?req="+requestCount.incrementAndGet());
+        var builder = HttpRequest.newBuilder(u);
         if (uri.contains("h3")) {
             builder.version(HTTP_3);
         }
+        builder.setHeader("X-expect-exception", "true");
         return builder;
     }
 
@@ -321,13 +326,31 @@ public class CancelRequestTest implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
-    @Test(dataProvider = "asyncurls")
+    private static void releaseLatches() {
+        // release left over latches
+        for (var latch : latches.values()) {
+            latch.countDown();
+        }
+        latches.clear();
+    }
+
+    private static CountDownLatch addLatchFor(HttpRequest req) {
+        // release left over latches
+        releaseLatches();
+        String key = Objects.requireNonNull(req.uri().getRawQuery(), "query");
+        var latch = new CountDownLatch(1);
+        latches.put(key, latch);
+        out.println(now() + "CountDownLatch " + latch + " added for " + req.uri());
+        return latch;
+    }
+
+    @ParameterizedTest
+    @MethodSource("asyncurls")
     public void testGetSendAsync(String uri, boolean sameClient, boolean mayInterruptIfRunning)
             throws Exception {
-        checkSkip();
         HttpClient client = null;
         uri = uri + "/get";
         out.printf("%n%s testGetSendAsync(%s, %b, %b)%n", now(), uri, sameClient, mayInterruptIfRunning);
@@ -343,27 +366,32 @@ public class CancelRequestTest implements HttpServerAdapters {
                     .GET()
                     .setOption(H3_DISCOVERY, config)
                     .build();
+            var requestLatch = addLatchFor(req);
+
             BodyHandler<String> handler = BodyHandlers.ofString();
             CountDownLatch latch = new CountDownLatch(1);
+            out.println(now() + "Sending (async): " + req.uri());
             CompletableFuture<HttpResponse<String>> response = client.sendAsync(req, handler);
             var cf1 = response.whenComplete((r,t) -> System.out.println(t));
             CompletableFuture<HttpResponse<String>> cf2 = cf1.whenComplete((r,t) -> latch.countDown());
-            out.println("iteration: " + i + ", req: " + req.uri());
+            out.println(now() + "iteration: " + i + ", req sent: " + req.uri());
             out.println("response: " + response);
             out.println("cf1: " + cf1);
             out.println("cf2: " + cf2);
             delay();
             cf1.cancel(mayInterruptIfRunning);
-            out.println("response after cancel: " + response);
+            out.println(now() + "response after cancel: " + response);
             out.println("cf1 after cancel: " + cf1);
             out.println("cf2 after cancel: " + cf2);
             try {
                 String body = cf2.get().body();
-                assertEquals(body, String.join("", BODY.split("\\|")));
+                assertEquals(String.join("", BODY.split("\\|")), body);
                 throw new AssertionError("Expected CancellationException not received");
             } catch (ExecutionException x) {
-                out.println("Got expected exception: " + x);
+                out.println(now() + "Got expected exception: " + x);
                 assertTrue(isCancelled(x));
+            } finally {
+                requestLatch.countDown();
             }
 
             // Cancelling the request may cause an IOException instead...
@@ -371,7 +399,7 @@ public class CancelRequestTest implements HttpServerAdapters {
             try {
                 cf1.get();
             } catch (CancellationException | ExecutionException x) {
-                out.println("Got expected exception: " + x);
+                out.println(now() + "Got expected exception: " + x);
                 assertTrue(isCancelled(x));
                 hasCancellationException = x instanceof CancellationException;
             }
@@ -380,7 +408,7 @@ public class CancelRequestTest implements HttpServerAdapters {
             // completed yet - so wait for it here...
             try {
                 String body = response.get().body();
-                assertEquals(body, String.join("", BODY.split("\\|")));
+                assertEquals(String.join("", BODY.split("\\|")), body);
                 if (mayInterruptIfRunning) {
                     // well actually - this could happen... In which case we'll need to
                     // increase the latency in the server handler...
@@ -393,7 +421,7 @@ public class CancelRequestTest implements HttpServerAdapters {
                 if (mayInterruptIfRunning) {
                     if (CancellationException.class.isAssignableFrom(wrapped.getClass())) {
                         cause = wrapped.getCause();
-                        out.println("CancellationException cause: " + x);
+                        out.println(now() + "CancellationException cause: " + x);
                     } else if (!isCancelled(cause)) {
                         throw new RuntimeException("Unexpected cause: " + cause);
                     }
@@ -403,15 +431,15 @@ public class CancelRequestTest implements HttpServerAdapters {
                     }
                 }
                 if (!IOException.class.isInstance(cause)) {
-                    out.println("Unexpected cause: " + cause.getClass());
+                    out.println(now() + "Unexpected cause: " + cause.getClass());
                     cause.printStackTrace(out);
                 }
                 assertTrue(IOException.class.isAssignableFrom(cause.getClass()));
                 if (mayInterruptIfRunning) {
-                    out.println("Got expected exception: " + wrapped);
+                    out.println(now() + "Got expected exception: " + wrapped);
                     out.println("\tcause: " + cause);
                 } else {
-                    out.println("Unexpected exception: " + wrapped);
+                    out.println(now() + "Unexpected exception: " + wrapped);
                     wrapped.printStackTrace(out);
                     throw x;
                 }
@@ -419,10 +447,10 @@ public class CancelRequestTest implements HttpServerAdapters {
 
             assertTrue(response.isDone());
             assertFalse(response.isCancelled());
-            assertEquals(cf1.isCancelled(), hasCancellationException);
+            assertEquals(hasCancellationException, cf1.isCancelled());
             assertTrue(cf2.isDone());
             assertFalse(cf2.isCancelled());
-            assertEquals(latch.getCount(), 0);
+            assertEquals(0, latch.getCount());
 
             var error = TRACKER.check(tracker, 1000,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
@@ -435,10 +463,10 @@ public class CancelRequestTest implements HttpServerAdapters {
         if (!sameClient) client.close();
     }
 
-    @Test(dataProvider = "asyncurls")
+    @ParameterizedTest
+    @MethodSource("asyncurls")
     public void testPostSendAsync(String uri, boolean sameClient, boolean mayInterruptIfRunning)
             throws Exception {
-        checkSkip();
         uri = uri + "/post";
         HttpClient client = null;
         out.printf("%n%s testPostSendAsync(%s, %b, %b)%n", now(), uri, sameClient, mayInterruptIfRunning);
@@ -453,13 +481,13 @@ public class CancelRequestTest implements HttpServerAdapters {
                 @Override
                 public Iterator<byte[]> iterator() {
                     // this is dangerous
-                    out.println("waiting for completion on: " + cancelFuture);
+                    out.println(now() + "waiting for completion on: " + cancelFuture);
                     boolean async = random.nextBoolean();
                     Runnable cancel = () -> {
-                        out.println("Cancelling from " + Thread.currentThread());
+                        out.println(now() + "Cancelling from " + Thread.currentThread());
                         var cf1 = cancelFuture.join();
                         cf1.cancel(mayInterruptIfRunning);
-                        out.println("cancelled " + cf1);
+                        out.println(now() + "cancelled " + cf1);
                     };
                     if (async) executor.execute(cancel);
                     else cancel.run();
@@ -474,25 +502,31 @@ public class CancelRequestTest implements HttpServerAdapters {
                     .POST(HttpRequest.BodyPublishers.ofByteArrays(iterable))
                     .setOption(H3_DISCOVERY, config)
                     .build();
+            var requestLatch = addLatchFor(req);
+
             BodyHandler<String> handler = BodyHandlers.ofString();
             CountDownLatch latch = new CountDownLatch(1);
+            out.println(now() + "Sending (async): " + req.uri());
             CompletableFuture<HttpResponse<String>> response = client.sendAsync(req, handler);
-            var cf1 = response.whenComplete((r,t) -> System.out.println(t));
+            var cf1 = response.whenComplete((r,t) -> System.out.println(now() + t));
             CompletableFuture<HttpResponse<String>> cf2 = cf1.whenComplete((r,t) -> latch.countDown());
+            out.println(now() + "iteration: " + i + ", req sent: " + req.uri());
             out.println("response: " + response);
             out.println("cf1: " + cf1);
             out.println("cf2: " + cf2);
             cancelFuture.complete(cf1);
-            out.println("response after cancel: " + response);
+            out.println(now() + "response after cancel: " + response);
             out.println("cf1 after cancel: " + cf1);
             out.println("cf2 after cancel: " + cf2);
             try {
                 String body = cf2.get().body();
-                assertEquals(body, String.join("", BODY.split("\\|")));
+                assertEquals(String.join("", BODY.split("\\|")), body);
                 throw new AssertionError("Expected CancellationException not received");
             } catch (ExecutionException x) {
-                out.println("Got expected exception: " + x);
+                out.println(now() + "Got expected exception: " + x);
                 assertTrue(isCancelled(x));
+            } finally {
+                requestLatch.countDown();
             }
 
             // Cancelling the request may cause an IOException instead...
@@ -500,7 +534,7 @@ public class CancelRequestTest implements HttpServerAdapters {
             try {
                 cf1.get();
             } catch (CancellationException | ExecutionException x) {
-                out.println("Got expected exception: " + x);
+                out.println(now() + "Got expected exception: " + x);
                 assertTrue(isCancelled(x));
                 hasCancellationException = x instanceof CancellationException;
             }
@@ -509,7 +543,7 @@ public class CancelRequestTest implements HttpServerAdapters {
             // completed yet - so wait for it here...
             try {
                 String body = response.get().body();
-                assertEquals(body, String.join("", BODY.split("\\|")));
+                assertEquals(String.join("", BODY.split("\\|")), body);
                 if (mayInterruptIfRunning) {
                     // well actually - this could happen... In which case we'll need to
                     // increase the latency in the server handler...
@@ -521,7 +555,7 @@ public class CancelRequestTest implements HttpServerAdapters {
                 Throwable cause = wrapped;
                 if (CancellationException.class.isAssignableFrom(wrapped.getClass())) {
                     cause = wrapped.getCause();
-                    out.println("CancellationException cause: " + x);
+                    out.println(now() + "CancellationException cause: " + x);
                 } else if (!isCancelled(cause)) {
                     throw new RuntimeException("Unexpected cause: " + cause);
                 }
@@ -531,10 +565,10 @@ public class CancelRequestTest implements HttpServerAdapters {
                     throw new RuntimeException("Unexpected timeout exception", cause);
                 }
                 if (mayInterruptIfRunning) {
-                    out.println("Got expected exception: " + wrapped);
+                    out.println(now() + "Got expected exception: " + wrapped);
                     out.println("\tcause: " + cause);
                 } else {
-                    out.println("Unexpected exception: " + wrapped);
+                    out.println(now() + "Unexpected exception: " + wrapped);
                     wrapped.printStackTrace(out);
                     throw x;
                 }
@@ -542,10 +576,10 @@ public class CancelRequestTest implements HttpServerAdapters {
 
             assertTrue(response.isDone());
             assertFalse(response.isCancelled());
-            assertEquals(cf1.isCancelled(), hasCancellationException);
+            assertEquals(hasCancellationException, cf1.isCancelled());
             assertTrue(cf2.isDone());
             assertFalse(cf2.isCancelled());
-            assertEquals(latch.getCount(), 0);
+            assertEquals(0, latch.getCount());
 
             var error = TRACKER.check(tracker, 1000,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
@@ -558,10 +592,10 @@ public class CancelRequestTest implements HttpServerAdapters {
         if (!sameClient) client.close();
     }
 
-    @Test(dataProvider = "urls")
+    @ParameterizedTest
+    @MethodSource("alltests")
     public void testPostInterrupt(String uri, boolean sameClient)
             throws Exception {
-        checkSkip();
         HttpClient client = null;
         out.printf("%n%s testPostInterrupt(%s, %b)%n", now(), uri, sameClient);
         for (int i=0; i< ITERATION_COUNT; i++) {
@@ -571,7 +605,7 @@ public class CancelRequestTest implements HttpServerAdapters {
 
             Thread main = Thread.currentThread();
             CompletableFuture<Thread> interruptingThread = new CompletableFuture<>();
-            var uriStr = uri + "/post/req=" + i;
+            var uriStr = uri + "/post/i=" + i;
             Runnable interrupt = () -> {
                 Thread current = Thread.currentThread();
                 out.printf("%s Interrupting main from: %s (%s)%n", now(), current, uriStr);
@@ -593,39 +627,42 @@ public class CancelRequestTest implements HttpServerAdapters {
                     .POST(HttpRequest.BodyPublishers.ofByteArrays(iterable))
                     .setOption(H3_DISCOVERY, config)
                     .build();
+            var requestLatch = addLatchFor(req);
+
             String body = null;
             Exception failed = null;
             try {
-                out.println("Sending: " + uriStr);
+                out.println(now() + "Sending: " + req.uri());
                 body = client.send(req, BodyHandlers.ofString()).body();
             } catch (Exception x) {
                 failed = x;
             }
-            out.println(uriStr + ": got result or exception");
+            requestLatch.countDown();
+            out.println(now() + req.uri() + ": got result or exception");
             if (failed instanceof InterruptedException) {
-                out.println(uriStr + ": Got expected exception: " + failed);
+                out.println(now() + req.uri() + ": Got expected exception: " + failed);
             } else if (failed instanceof IOException) {
-                out.println(uriStr + ": got IOException: " + failed);
+                out.println(now() + req.uri() + ": got IOException: " + failed);
                 // that could be OK if the main thread was interrupted
                 // from the main thread: the interrupted status could have
                 // been caught by writing to the socket from the main
                 // thread.
                 if (interruptingThread.isDone() && interruptingThread.get() == main) {
-                    out.println(uriStr + ": Accepting IOException: " + failed);
+                    out.println(now() + req.uri() + ": Accepting IOException: " + failed);
                     failed.printStackTrace(out);
                 } else {
-                    out.println(uriStr + ": unexpected exception: " + failed);
+                    out.println(now() + req.uri() + ": unexpected exception: " + failed);
                     throw failed;
                 }
             } else if (failed != null) {
-                out.println(uriStr + ": unexpected exception: " + failed);
+                out.println(now() + req.uri() + ": unexpected exception: " + failed);
                 throw failed;
             } else {
                 assert failed == null;
-                out.println(uriStr + ": got body: " + body);
-                assertEquals(body, String.join("", BODY.split("\\|")));
+                out.println(now() + req.uri() + ": got body: " + body);
+                assertEquals(String.join("", BODY.split("\\|")), body);
             }
-            out.println("next iteration");
+            out.println(now() + "next iteration");
 
             var error = TRACKER.check(tracker, 2000,
                     (t) -> t.getOutstandingOperations() > 0 || t.getOutstandingSubscribers() > 0,
@@ -640,8 +677,8 @@ public class CancelRequestTest implements HttpServerAdapters {
 
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpTestHandler h1_chunkHandler = new HTTPSlowHandler();
         httpTestServer = HttpTestServer.create(HTTP_1_1);
@@ -683,8 +720,8 @@ public class CancelRequestTest implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         String sharedClientName =
                 sharedClient == null ? null : sharedClient.toString();
         sharedClient = null;
@@ -700,7 +737,7 @@ public class CancelRequestTest implements HttpServerAdapters {
         } finally {
             if (fail != null) {
                 if (sharedClientName != null) {
-                    System.err.println("Shared client name is: " + sharedClientName);
+                    System.err.println(now() + "Shared client name is: " + sharedClientName);
                 }
                 throw fail;
             }
@@ -719,9 +756,9 @@ public class CancelRequestTest implements HttpServerAdapters {
         @Override
         public void handle(HttpTestExchange t) throws IOException {
             try {
-                out.println("HTTPSlowHandler received request to " + t.getRequestURI());
-                System.err.println("HTTPSlowHandler received request to " + t.getRequestURI());
-
+                out.println(now() + "HTTPSlowHandler received request to " + t.getRequestURI());
+                System.err.println(now() + "HTTPSlowHandler received request to " + t.getRequestURI());
+                var requestLatch = latches.get(t.getRequestURI().getRawQuery());
                 boolean isThreadInterrupt = isThreadInterrupt(t);
                 byte[] req;
                 try (InputStream is = t.getRequestBody()) {
@@ -729,7 +766,7 @@ public class CancelRequestTest implements HttpServerAdapters {
                 }
                 t.sendResponseHeaders(200, -1); // chunked/variable
                 try (OutputStream os = t.getResponseBody()) {
-                    // lets split the response in several chunks...
+                    // let's split the response in several chunks...
                     String msg = (req != null && req.length != 0)
                             ? new String(req, UTF_8)
                             : BODY;
@@ -743,16 +780,29 @@ public class CancelRequestTest implements HttpServerAdapters {
                         } catch (InterruptedException x) {
                             // OK
                         }
-                        out.printf("Server wrote %d bytes%n", req.length);
+                        out.printf(now() + "Server wrote %d bytes%n", req.length);
+                    }
+                    if (requestLatch != null) {
+                        out.printf(now() + "Server awaiting latch %s for %s%n",
+                                requestLatch, t.getRequestURI());
+                        try {
+                            requestLatch.await();
+                        } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
+                        }
+                        out.printf(now() + " ...latch released%n");
                     }
                 }
+            } catch (IOException io) {
+                out.println(now() + "HTTPSlowHandler: IOexception is not unexpected: " + io);
+                throw io;
             } catch (Throwable e) {
-                out.println("HTTPSlowHandler: unexpected exception: " + e);
+                out.println(now() + "HTTPSlowHandler: unexpected exception: " + e);
                 e.printStackTrace();
                 throw e;
             } finally {
-                out.printf("HTTPSlowHandler reply sent: %s%n", t.getRequestURI());
-                System.err.printf("HTTPSlowHandler reply sent: %s%n", t.getRequestURI());
+                out.printf(now() + "HTTPSlowHandler reply sent: %s%n", t.getRequestURI());
+                System.err.printf(now() + "HTTPSlowHandler reply sent: %s%n", t.getRequestURI());
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java b/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
index 0035a3f4302..48f23ebf370 100644
--- a/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
+++ b/test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,19 +29,10 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker CancelStreamedBodyTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     CancelStreamedBodyTest
  */
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -53,7 +44,6 @@ import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -61,7 +51,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
@@ -72,23 +61,34 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CancelStreamedBodyTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String https3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String https3URI;
 
     static final long SERVER_LATENCY = 75;
     static final int ITERATION_COUNT = 3;
@@ -108,8 +108,8 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -135,38 +135,40 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
-        var failed = context.getFailedTests().getAllResults().stream()
-                .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-        FAILURES.putAll(failed);
         try {
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
@@ -184,7 +186,7 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 https3URI,
                 httpURI,
@@ -195,8 +197,7 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
     }
 
 
-    @DataProvider(name = "urls")
-    public Object[][] alltests() {
+    public static Object[][] alltests() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -265,10 +266,10 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
 
     final static String BODY = "Some string |\n that ?\n can |\n be split ?\n several |\n ways.";
 
-    @Test(dataProvider = "urls")
+    @ParameterizedTest
+    @MethodSource("alltests")
     public void testAsLines(String uri, boolean sameClient)
             throws Exception {
-        checkSkip();
         HttpClient client = null;
         uri = uri + "/testAsLines";
         out.printf("%n%s testAsLines(%s, %b)%n", now(), uri, sameClient);
@@ -284,8 +285,8 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
             for (int j = 0; j < 2; j++) {
                 try (Stream<String> body = client.send(req, BodyHandlers.ofLines()).body()) {
                     lines = body.limit(j).toList();
-                    assertEquals(lines, BODY.replaceAll("\\||\\?", "")
-                            .lines().limit(j).toList());
+                    assertEquals(BODY.replaceAll("\\||\\?", "")
+                            .lines().limit(j).toList(), lines);
                 }
                 // Only check our still alive client for outstanding operations
                 // and outstanding subscribers here: it should have none.
@@ -306,10 +307,10 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "urls")
+    @ParameterizedTest
+    @MethodSource("alltests")
     public void testInputStream(String uri, boolean sameClient)
             throws Exception {
-        checkSkip();
         HttpClient client = null;
         uri = uri + "/testInputStream";
         out.printf("%n%s testInputStream(%s, %b)%n", now(), uri, sameClient);
@@ -326,7 +327,7 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
                 try (InputStream is = client.send(req, BodyHandlers.ofInputStream()).body()) {
                     for (int k = 0; k < j; k++) {
                         read = is.read();
-                        assertEquals(read, BODY.charAt(k));
+                        assertEquals(BODY.charAt(k), read);
                     }
                 }
                 // Only check our still alive client for outstanding operations
@@ -350,8 +351,8 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
 
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpTestHandler h1_chunkHandler = new HTTPSlowHandler();
         httpTestServer = HttpTestServer.create(HTTP_1_1);
@@ -385,8 +386,8 @@ public class CancelStreamedBodyTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         String sharedClientName =
                 sharedClient == null ? null : sharedClient.toString();
         sharedClient = null;
diff --git a/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java b/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java
index bb190cfc348..33df36100ad 100644
--- a/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java
+++ b/test/jdk/java/net/httpclient/CancelledPartialResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @bug 8309118
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm/timeout=40  -Djdk.internal.httpclient.debug=false -Djdk.httpclient.HttpClient.log=trace,errors,headers
+ * @run junit/othervm/timeout=40  -Djdk.internal.httpclient.debug=false -Djdk.httpclient.HttpClient.log=trace,errors,headers
  *                              CancelledPartialResponseTest
  */
 
@@ -47,11 +47,6 @@ import jdk.internal.net.http.common.HttpHeadersBuilder;
 import jdk.internal.net.http.frame.ResetFrame;
 import jdk.internal.net.http.http3.Http3Error;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.TestException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
@@ -74,16 +69,22 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class CancelledPartialResponseTest {
 
-    Http2TestServer http2TestServer;
+    private static Http2TestServer http2TestServer;
 
-    HttpTestServer http3TestServer;
+    private static HttpTestServer http3TestServer;
 
     // "NoError" urls complete with an exception. "NoError" or "Error" here refers to the error code in the RST_STREAM frame
     // and not the outcome of the test.
-    URI warmup, h2PartialResponseResetNoError, h2PartialResponseResetError, h2FullResponseResetNoError, h2FullResponseResetError;
-    URI h3PartialResponseStopSending, h3FullResponseStopSending;
+    private static URI warmup, h2PartialResponseResetNoError, h2PartialResponseResetError, h2FullResponseResetNoError, h2FullResponseResetError;
+    private static URI h3PartialResponseStopSending, h3FullResponseStopSending;
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
@@ -91,8 +92,7 @@ public class CancelledPartialResponseTest {
     static PrintStream out = System.out;
 
     // TODO: Investigate further if checking against HTTP/3 Full Response is necessary
-    @DataProvider(name = "testData")
-    public Object[][] testData() {
+    public static Object[][] testData() {
         return new Object[][] {
                 { HTTP_2, h2PartialResponseResetNoError },
                 { HTTP_2, h2PartialResponseResetError },  // Checks RST_STREAM is processed if client sees no END_STREAM
@@ -104,7 +104,8 @@ public class CancelledPartialResponseTest {
     }
 
 
-    @Test(dataProvider = "testData")
+    @ParameterizedTest
+    @MethodSource("testData")
     public void test(Version version, URI uri) {
         out.printf("\nTesting with Version: %s, URI: %s\n", version, uri.toASCIIString());
         err.printf("\nTesting with Version: %s, URI: %s\n", version, uri.toASCIIString());
@@ -161,8 +162,8 @@ public class CancelledPartialResponseTest {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         http2TestServer = new Http2TestServer(false, 0);
         http3TestServer = HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext);
 
@@ -187,8 +188,8 @@ public class CancelledPartialResponseTest {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         http2TestServer.stop();
     }
 
@@ -246,10 +247,10 @@ public class CancelledPartialResponseTest {
                 switch (exchange.getRequestURI().getPath()) {
                     case "/partialResponse/codeNoError" -> testExchange.addResetToOutputQ(ResetFrame.NO_ERROR);
                     case "/partialResponse/codeError" -> testExchange.addResetToOutputQ(ResetFrame.PROTOCOL_ERROR);
-                    default -> throw new TestException("Invalid Request Path");
+                    default -> fail("Invalid Request Path");
                 }
             } else {
-                throw new TestException("Wrong Exchange type used");
+                fail("Wrong Exchange type used");
             }
         }
     }
@@ -268,10 +269,10 @@ public class CancelledPartialResponseTest {
                 switch (exchange.getRequestURI().getPath()) {
                     case "/fullResponse/codeNoError" -> testExchange.addResetToOutputQ(ResetFrame.NO_ERROR);
                     case "/fullResponse/codeError" -> testExchange.addResetToOutputQ(ResetFrame.PROTOCOL_ERROR);
-                    default -> throw new TestException("Invalid Request Path");
+                    default -> fail("Invalid Request Path");
                 }
             } else {
-                throw new TestException("Wrong Exchange type used");
+                fail("Wrong Exchange type used");
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/CancelledResponse2.java b/test/jdk/java/net/httpclient/CancelledResponse2.java
index 48223e84135..6604fadea20 100644
--- a/test/jdk/java/net/httpclient/CancelledResponse2.java
+++ b/test/jdk/java/net/httpclient/CancelledResponse2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.common.OperationTrackers.Tracker;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -57,15 +53,20 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  * @compile ReferenceTracker.java
- * @run testng/othervm -Djdk.internal.httpclient.debug=true CancelledResponse2
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true CancelledResponse2
  */
 // -Djdk.internal.httpclient.debug=true
 public class CancelledResponse2 implements HttpServerAdapters {
@@ -74,17 +75,16 @@ public class CancelledResponse2 implements HttpServerAdapters {
     private static final Random RANDOM = RandomFactory.getRandom();
     private static final int MAX_CLIENT_DELAY = 160;
 
-    HttpTestServer h2TestServer;
-    URI h2TestServerURI;
-    URI h2h3TestServerURI;
-    URI h2h3HeadTestServerURI;
-    URI h3TestServerURI;
-    HttpTestServer h2h3TestServer;
-    HttpTestServer h3TestServer;
+    private static HttpTestServer h2TestServer;
+    private static URI h2TestServerURI;
+    private static URI h2h3TestServerURI;
+    private static URI h2h3HeadTestServerURI;
+    private static URI h3TestServerURI;
+    private static HttpTestServer h2h3TestServer;
+    private static HttpTestServer h3TestServer;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
-    @DataProvider(name = "versions")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][]{
                 { HTTP_2, null, h2TestServerURI },
                 { HTTP_3, null, h2h3TestServerURI },
@@ -101,7 +101,8 @@ public class CancelledResponse2 implements HttpServerAdapters {
             out.println("Unexpected exception: " + x);
         }
     }
-    @Test(dataProvider = "versions")
+    @ParameterizedTest
+    @MethodSource("positive")
     public void test(Version version, Http3DiscoveryMode config, URI uri) throws Exception {
         for (int i = 0; i < 5; i++) {
             HttpClient httpClient = newClientBuilderForH3().sslContext(sslContext).version(version).build();
@@ -147,11 +148,11 @@ public class CancelledResponse2 implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, HttpResponse.BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         h2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         h2TestServer.addHandler(new CancelledResponseHandler(), "/h2");
         h2TestServerURI = URI.create("https://" + h2TestServer.serverAuthority() + "/h2");
@@ -172,8 +173,8 @@ public class CancelledResponse2 implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         h2TestServer.stop();
         h2h3TestServer.stop();
         h3TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/ConcurrentResponses.java b/test/jdk/java/net/httpclient/ConcurrentResponses.java
index c44452bf4d2..53c85b8e383 100644
--- a/test/jdk/java/net/httpclient/ConcurrentResponses.java
+++ b/test/jdk/java/net/httpclient/ConcurrentResponses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      ConcurrentResponses
  */
@@ -75,29 +75,30 @@ import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.net.http.HttpResponse.BodyHandlers.discarding;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ConcurrentResponses {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
-    HttpsServer httpsTestServer;       // HTTPS/1.1
-    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
-    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer https3TestServer;
-    String httpFixedURI, httpsFixedURI, httpChunkedURI, httpsChunkedURI;
-    String http2FixedURI, https2FixedURI, http2VariableURI, https2VariableURI;
-    String https3FixedURI, https3VariableURI;
+    private static HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    private static HttpsServer httpsTestServer;       // HTTPS/1.1
+    private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer https3TestServer;
+    private static String httpFixedURI, httpsFixedURI, httpChunkedURI, httpsChunkedURI;
+    private static String http2FixedURI, https2FixedURI, http2VariableURI, https2VariableURI;
+    private static String https3FixedURI, https3VariableURI;
 
     static final int CONCURRENT_REQUESTS = 13;
     static final AtomicInteger IDS = new AtomicInteger();
@@ -131,7 +132,7 @@ public class ConcurrentResponses {
      */
     static final <T> CompletionStage<HttpResponse<T>>
     assert200ResponseCode(HttpResponse<T> response) {
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         return CompletableFuture.completedFuture(response);
     }
 
@@ -141,12 +142,11 @@ public class ConcurrentResponses {
      */
     static final <T> CompletionStage<HttpResponse<T>>
     assertbody(HttpResponse<T> response, T body) {
-        assertEquals(response.body(), body);
+        assertEquals(body, response.body());
         return CompletableFuture.completedFuture(response);
     }
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpFixedURI },
                 { httpsFixedURI },
@@ -164,7 +164,8 @@ public class ConcurrentResponses {
 
     // The ofString implementation accumulates data, below a certain threshold
     // into the byte buffers it is given.
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsString(String uri) throws Exception {
         int id = IDS.getAndIncrement();
         ExecutorService virtualExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
@@ -204,7 +205,8 @@ public class ConcurrentResponses {
 
     // The custom subscriber aggressively attacks any area, between the limit
     // and the capacity, in the byte buffers it is given, by writing 'X' into it.
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testWithCustomSubscriber(String uri) throws Exception {
         int id = IDS.getAndIncrement();
         ExecutorService virtualExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
@@ -301,8 +303,8 @@ public class ConcurrentResponses {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/fixed", new Http1FixedHandler());
@@ -342,8 +344,8 @@ public class ConcurrentResponses {
         https3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/ConnectExceptionTest.java b/test/jdk/java/net/httpclient/ConnectExceptionTest.java
index 29ffeca7d5e..0745e2af934 100644
--- a/test/jdk/java/net/httpclient/ConnectExceptionTest.java
+++ b/test/jdk/java/net/httpclient/ConnectExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Expect ConnectException for all non-security related connect errors
  * @bug 8204864
- * @run testng/othervm -Djdk.net.hosts.file=HostFileDoesNotExist ConnectExceptionTest
+ * @run junit/othervm -Djdk.net.hosts.file=HostFileDoesNotExist ConnectExceptionTest
  */
 
 import java.io.IOException;
@@ -42,11 +42,12 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ConnectExceptionTest {
 
@@ -64,8 +65,7 @@ public class ConnectExceptionTest {
         @Override public String toString() { return "NO_PROXY"; }
     };
 
-    @DataProvider(name = "uris")
-    public Object[][] uris() {
+    public static Object[][] uris() {
         return new Object[][]{
             { "http://test.invalid/",  NO_PROXY       },
             { "https://test.invalid/", NO_PROXY       },
@@ -74,7 +74,8 @@ public class ConnectExceptionTest {
         };
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("uris")
     void testSynchronousGET(String uriString, ProxySelector proxy) throws Exception {
         out.printf("%n---%ntestSynchronousGET starting uri:%s, proxy:%s%n", uriString, proxy);
         HttpClient client = HttpClient.newBuilder().proxy(proxy).build();
@@ -90,7 +91,8 @@ public class ConnectExceptionTest {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("uris")
     void testSynchronousPOST(String uriString, ProxySelector proxy) throws Exception {
         out.printf("%n---%ntestSynchronousPOST starting uri:%s, proxy:%s%n", uriString, proxy);
         HttpClient client = HttpClient.newBuilder().proxy(proxy).build();
@@ -108,7 +110,8 @@ public class ConnectExceptionTest {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("uris")
     void testAsynchronousGET(String uriString, ProxySelector proxy) throws Exception {
         out.printf("%n---%ntestAsynchronousGET starting uri:%s, proxy:%s%n", uriString, proxy);
         HttpClient client = HttpClient.newBuilder().proxy(proxy).build();
@@ -129,7 +132,8 @@ public class ConnectExceptionTest {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("uris")
     void testAsynchronousPOST(String uriString, ProxySelector proxy) throws Exception {
         out.printf("%n---%ntestAsynchronousPOST starting uri:%s, proxy:%s%n", uriString, proxy);
         HttpClient client = HttpClient.newBuilder().proxy(proxy).build();
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeAsync.java b/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeAsync.java
index 6cdaf594b1d..e1f4aee1d51 100644
--- a/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeAsync.java
+++ b/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,9 @@
 
 import java.net.http.HttpClient.Version;
 import java.time.Duration;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -31,14 +33,15 @@ import org.testng.annotations.Test;
  * @bug 8208391
  * @library /test/lib
  * @build AbstractConnectTimeoutHandshake
- * @run testng/othervm ConnectTimeoutHandshakeAsync
+ * @run junit/othervm ConnectTimeoutHandshakeAsync
  */
 
 public class ConnectTimeoutHandshakeAsync
     extends AbstractConnectTimeoutHandshake
 {
-    @Test(dataProvider = "variants")
     @Override
+    @ParameterizedTest
+    @MethodSource("variants")
     public void timeoutAsync(Version requestVersion,
                              String method,
                              Duration connectTimeout,
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeSync.java b/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeSync.java
index 17ea3041c5b..eb571b2d16c 100644
--- a/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeSync.java
+++ b/test/jdk/java/net/httpclient/ConnectTimeoutHandshakeSync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,9 @@
 
 import java.net.http.HttpClient.Version;
 import java.time.Duration;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -31,14 +33,15 @@ import org.testng.annotations.Test;
  * @bug 8208391
  * @library /test/lib
  * @build AbstractConnectTimeoutHandshake
- * @run testng/othervm ConnectTimeoutHandshakeSync
+ * @run junit/othervm ConnectTimeoutHandshakeSync
  */
 
 public class ConnectTimeoutHandshakeSync
     extends AbstractConnectTimeoutHandshake
 {
-    @Test(dataProvider = "variants")
     @Override
+    @ParameterizedTest
+    @MethodSource("variants")
     public void timeoutSync(Version requestVersion,
                             String method,
                             Duration connectTimeout,
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutNoProxySync.java b/test/jdk/java/net/httpclient/ConnectTimeoutNoProxySync.java
deleted file mode 100644
index f30dea6deea..00000000000
--- a/test/jdk/java/net/httpclient/ConnectTimeoutNoProxySync.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.http.HttpClient.Version;
-import java.time.Duration;
-import org.testng.annotations.Test;
-
-/*
- * @test
- * @summary Tests for connection related timeouts
- * @bug 8208391
- * @run testng/othervm ConnectTimeoutNoProxySync
- */
-
-public class ConnectTimeoutNoProxySync extends AbstractConnectTimeout {
-
-    @Test(dataProvider = "variants")
-    @Override
-    public void timeoutNoProxySync(Version requestVersion,
-                                   String scheme,
-                                   String method,
-                                   Duration connectTimeout,
-                                   Duration requestTimeout)
-        throws Exception
-    {
-        super.timeoutNoProxySync(requestVersion, scheme, method, connectTimeout, requestTimeout);
-    }
-}
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutTest.java b/test/jdk/java/net/httpclient/ConnectTimeoutTest.java
new file mode 100644
index 00000000000..c837071ae7c
--- /dev/null
+++ b/test/jdk/java/net/httpclient/ConnectTimeoutTest.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.Utils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpConnectTimeoutException;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionException;
+import java.util.stream.Stream;
+
+import static java.lang.Boolean.parseBoolean;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
+import static java.time.Duration.*;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/*
+ * @test id=sync
+ * @bug 8208391 8375352
+ * @summary Verifies behavior on `connect()` timeouts
+ * @requires os.family != "windows"
+ * @library /test/lib
+ * @run junit/othervm ${test.main.class}
+ */
+
+/*
+ * @test id=sync-proxy
+ * @bug 8208391 8375352
+ * @summary Verifies behavior on `connect()` timeouts
+ * @requires os.family != "windows"
+ * @library /test/lib
+ * @run junit/othervm -Dtest.proxy=true ${test.main.class}
+ */
+
+/*
+ * @test id=async
+ * @bug 8208391 8375352
+ * @summary Verifies behavior on `connect()` timeouts
+ * @requires os.family != "windows"
+ * @library /test/lib
+ * @run junit/othervm -Dtest.async=true ${test.main.class}
+ */
+
+/*
+ * @test id=async-proxy
+ * @bug 8208391 8375352
+ * @summary Verifies behavior on `connect()` timeouts
+ * @requires os.family != "windows"
+ * @library /test/lib
+ * @run junit/othervm -Dtest.async=true -Dtest.proxy=true ${test.main.class}
+ */
+
+class ConnectTimeoutTest {
+
+    // This test verifies the `HttpClient` behavior on `connect()` failures.
+    //
+    // Earlier, the test was trying to connect `example.com:8080` to trigger a `connect()` failure.
+    // This worked, until it doesn't — `example.com:8080` started responding in certain test environments.
+    //
+    // Now we create a `ServerSocket` and exhaust all its "SYN backlog" and "Accept queue".
+    // The expectation is that the platform socket in this state will block on `connect()`.
+    // Well... It doesn't on Windows, whereas it does on Linux and macOS.
+    // Windows doesn't block and immediately responds with `java.net.ConnectException: Connection refused: connect`.
+    // Neither it is deterministic how many connections are needed to exhaust a socket admission queue.
+    // Hence, we took the following decisions:
+    //
+    // 1. Skip this test on Windows
+    // 2. Exhaust server socket admission queue by going into a loop
+
+    private static final PrintStream LOGGER = System.out;
+
+    private static final int BACKLOG = 1;
+
+    /**
+     * A {@link ServerSocket} whose admission will be blocked by exhausting all its "SYN backlog" and "Accept queue".
+     */
+    private static final ServerSocket SERVER_SOCKET = createServerSocket();
+
+    /**
+     * Client sockets exhausting the admission to {@link #SERVER_SOCKET}.
+     */
+    private static final List<Socket> CLIENT_SOCKETS = createClientSocketsExhaustingServerSocketAdmission();
+
+    private static ServerSocket createServerSocket() {
+        try {
+            LOGGER.println("Creating server socket");
+            return new ServerSocket(0, BACKLOG, InetAddress.getLoopbackAddress());
+        } catch (Exception exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+
+    private static List<Socket> createClientSocketsExhaustingServerSocketAdmission() {
+        List<Socket> sockets = new ArrayList<>();
+        int maxSocketCount = BACKLOG   // To fill up the backlog
+                + 512;                 // Giving some slack, should be enough to exhaust the admission queue.
+        int connectTimeout = Math.toIntExact(Math.addExact(500, Utils.adjustTimeout(500)));
+        int socketIndex = 0;
+        for (; socketIndex < maxSocketCount; socketIndex++) {
+            try {
+                LOGGER.printf(
+                        "Creating client socket %s/%s to exhaust the server socket admission%n",
+                        (socketIndex + 1), maxSocketCount);
+                Socket socket = new Socket();
+                socket.connect(SERVER_SOCKET.getLocalSocketAddress(), connectTimeout);
+                sockets.add(socket);
+            } catch (ConnectException | SocketTimeoutException exception) {
+                LOGGER.printf(
+                        "Received expected `%s` while creating client socket %s/%s%n",
+                        exception.getClass().getName(), (socketIndex + 1), maxSocketCount);
+                return sockets;
+            } catch (IOException ioe) {
+                String message = String.format(
+                        "Received unexpected exception while creating client socket %s/%s",
+                        (socketIndex + 1), maxSocketCount);
+                closeSockets(SERVER_SOCKET, sockets);
+                throw new RuntimeException(message, ioe);
+            }
+        }
+        String message = String.format(
+                "Connected %s sockets, but still could not exhaust the socket admission",
+                maxSocketCount);
+        closeSockets(SERVER_SOCKET, sockets);
+        throw new RuntimeException(message);
+    }
+
+    @AfterAll
+    public static void closeSockets() {
+        closeSockets(SERVER_SOCKET, CLIENT_SOCKETS);
+    }
+
+    private static void closeSockets(ServerSocket serverSocket, List<Socket> clientSockets) {
+        Throwable[] throwable = {null};
+        Stream.concat(clientSockets.stream(), Stream.of(serverSocket)).forEach(closeable -> {
+            try {
+                closeable.close();
+            } catch (Exception exception) {
+                if (throwable[0] == null) {
+                    throwable[0] = exception;
+                } else {
+                    throwable[0].addSuppressed(exception);
+                }
+            }
+        });
+        if (throwable[0] != null) {
+            throwable[0].printStackTrace(System.out);
+        }
+    }
+
+    /**
+     * {@link ProxySelector} <em>always</em> pointing to {@link #SERVER_SOCKET}.
+     */
+    private static final ProxySelector PROXY_SELECTOR = new ProxySelector() {
+
+        private static final List<Proxy> PROXIES =
+                List.of(new Proxy(Proxy.Type.HTTP, SERVER_SOCKET.getLocalSocketAddress()));
+
+        @Override
+        public List<Proxy> select(URI uri) {
+            return PROXIES;
+        }
+
+        @Override
+        public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
+            // Do nothing
+        }
+
+    };
+
+    private static final Duration NO_DURATION = null;
+
+    private static List<List<Duration>> TIMEOUTS = List.of(
+                    // connectTimeout   HttpRequest timeout
+            Arrays.asList( NO_DURATION,   ofMillis(100) ),
+            Arrays.asList( NO_DURATION,   ofNanos(1)    ),
+
+            Arrays.asList( ofMillis(100), NO_DURATION   ),
+            Arrays.asList( ofNanos(1),    NO_DURATION   ),
+
+            Arrays.asList( ofMillis(100), ofMinutes(1)  ),
+            Arrays.asList( ofNanos(1),    ofMinutes(1)  )
+    );
+
+    private static final List<String> METHODS = List.of("GET", "POST");
+    private static final List<Version> VERSIONS = List.of(HTTP_2, HTTP_1_1);
+    private static final List<String> SCHEMES = List.of("https", "http");
+
+    static Object[][] variants() {
+        List<Object[]> l = new ArrayList<>();
+        for (List<Duration> timeouts : TIMEOUTS) {
+           Duration connectTimeout = timeouts.get(0);
+           Duration requestTimeout = timeouts.get(1);
+           for (String method: METHODS) {
+            for (String scheme : SCHEMES) {
+             for (Version requestVersion : VERSIONS) {
+              l.add(new Object[] {requestVersion, scheme, method, connectTimeout, requestTimeout});
+        }}}}
+        return l.stream().toArray(Object[][]::new);
+    }
+
+    @ParameterizedTest
+    @MethodSource("variants")
+    void test(
+            Version requestVersion,
+            String scheme,
+            String method,
+            Duration connectTimeout,
+            Duration requestTimeout)
+            throws Exception {
+        ProxySelector proxySelector = parseBoolean(System.getProperty("test.proxy")) ? PROXY_SELECTOR : NO_PROXY;
+        boolean async = parseBoolean(System.getProperty("test.async"));
+        if (async) {
+            timeoutAsync(requestVersion, scheme, method, connectTimeout, requestTimeout, proxySelector);
+        } else {
+            timeoutSync(requestVersion, scheme, method, connectTimeout, requestTimeout, proxySelector);
+        }
+    }
+
+    private void timeoutSync(Version requestVersion,
+                             String scheme,
+                             String method,
+                             Duration connectTimeout,
+                             Duration requestTimeout,
+                             ProxySelector proxy)
+        throws Exception
+    {
+        HttpClient client = newClient(connectTimeout, proxy);
+        HttpRequest request = newRequest(scheme, requestVersion, method, requestTimeout);
+
+        for (int i = 0; i < 2; i++) {
+            LOGGER.printf("iteration %d%n", i);
+            long startTime = System.nanoTime();
+            try {
+                HttpResponse<?> resp = client.send(request, BodyHandlers.ofString());
+                printResponse(resp);
+                fail("Unexpected response: " + resp);
+            } catch (HttpConnectTimeoutException expected) { // blocking thread-specific exception
+                long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
+                LOGGER.printf("Client: received in %d millis%n", elapsedTime);
+                assertExceptionTypeAndCause(expected.getCause());
+            } catch (ConnectException e) {
+                long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
+                LOGGER.printf("Client: received in %d millis%n", elapsedTime);
+                Throwable t = e.getCause().getCause();  // blocking thread-specific exception
+                e.printStackTrace(LOGGER);
+                fail("Unexpected exception:" + e);
+            }
+        }
+    }
+
+    private void timeoutAsync(Version requestVersion,
+                              String scheme,
+                              String method,
+                              Duration connectTimeout,
+                              Duration requestTimeout,
+                              ProxySelector proxy) {
+        HttpClient client = newClient(connectTimeout, proxy);
+        HttpRequest request = newRequest(scheme, requestVersion, method, requestTimeout);
+        for (int i = 0; i < 2; i++) {
+            LOGGER.printf("iteration %d%n", i);
+            long startTime = System.nanoTime();
+            try {
+                HttpResponse<?> resp = client.sendAsync(request, BodyHandlers.ofString()).join();
+                printResponse(resp);
+                fail("Unexpected response: " + resp);
+            } catch (CompletionException e) {
+                long elapsedTime = NANOSECONDS.toMillis(System.nanoTime() - startTime);
+                LOGGER.printf("Client: received in %d millis%n", elapsedTime);
+                Throwable t = e.getCause();
+                assertExceptionTypeAndCause(t);
+            }
+        }
+    }
+
+    private static HttpClient newClient(Duration connectTimeout, ProxySelector proxy) {
+        HttpClient.Builder builder = HttpClient.newBuilder().proxy(proxy);
+        if (connectTimeout != NO_DURATION)
+            builder.connectTimeout(connectTimeout);
+        return builder.build();
+    }
+
+    private static HttpRequest newRequest(String scheme,
+                                  Version reqVersion,
+                                  String method,
+                                  Duration requestTimeout) {
+        String hostAddress = SERVER_SOCKET.getInetAddress().getHostAddress();
+        int hostPort = SERVER_SOCKET.getLocalPort();
+        URI uri = URI.create(scheme + "://" + hostAddress + ':' + hostPort);
+        HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(uri);
+        reqBuilder = reqBuilder.version(reqVersion);
+        switch (method) {
+            case "GET"   : reqBuilder.GET();                         break;
+            case "POST"  : reqBuilder.POST(BodyPublishers.noBody()); break;
+            default: throw new AssertionError("Unknown method:" + method);
+        }
+        if (requestTimeout != NO_DURATION)
+            reqBuilder.timeout(requestTimeout);
+        return reqBuilder.build();
+    }
+
+    private static void assertExceptionTypeAndCause(Throwable t) {
+        if (!(t instanceof HttpConnectTimeoutException)) {
+            t.printStackTrace(LOGGER);
+            fail("Expected HttpConnectTimeoutException, got:" + t);
+        }
+        Throwable connEx = t.getCause();
+        if (!(connEx instanceof ConnectException)) {
+            t.printStackTrace(LOGGER);
+            fail("Expected ConnectException cause in:" + connEx);
+        }
+        LOGGER.printf("Caught expected HttpConnectTimeoutException with ConnectException"
+                + " cause: %n%s%n%s%n", t, connEx);
+        final String EXPECTED_MESSAGE = "HTTP connect timed out"; // impl dependent
+        if (!connEx.getMessage().equals(EXPECTED_MESSAGE))
+            fail("Expected: \"" + EXPECTED_MESSAGE + "\", got: \"" + connEx.getMessage() + "\"");
+
+    }
+
+    private static void printResponse(HttpResponse<?> response) {
+        LOGGER.println("Unexpected response: " + response);
+        LOGGER.println("Headers: " + response.headers());
+        LOGGER.println("Body: " + response.body());
+    }
+
+}
diff --git a/test/jdk/java/net/httpclient/ConnectTimeoutWithProxySync.java b/test/jdk/java/net/httpclient/ConnectTimeoutWithProxySync.java
deleted file mode 100644
index a61fdc48bcf..00000000000
--- a/test/jdk/java/net/httpclient/ConnectTimeoutWithProxySync.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.net.http.HttpClient.Version;
-import java.time.Duration;
-import org.testng.annotations.Test;
-
-/*
- * @test
- * @summary Tests for connection related timeouts
- * @bug 8208391
- * @run testng/othervm ConnectTimeoutWithProxySync
- */
-
-public class ConnectTimeoutWithProxySync extends AbstractConnectTimeout {
-
-    @Test(dataProvider = "variants")
-    @Override
-    public void timeoutWithProxySync(Version requestVersion,
-                                     String scheme,
-                                     String method,
-                                     Duration connectTimeout,
-                                     Duration requestTimeout)
-        throws Exception
-    {
-        super.timeoutWithProxySync(requestVersion, scheme, method, connectTimeout, requestTimeout);
-    }
-}
diff --git a/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java b/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
index 75c7c984a6b..01c166dcb1b 100644
--- a/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
+++ b/test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @bug 8283544 8358942
- * @run testng/othervm
+ * @run junit/othervm
  *          -Djdk.httpclient.allowRestrictedHeaders=content-length
  *          -Djdk.internal.httpclient.debug=true
  *          ContentLengthHeaderTest
@@ -39,10 +39,6 @@
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -59,19 +55,22 @@ import java.util.Optional;
 import javax.net.ssl.SSLContext;
 import jdk.test.lib.net.URIBuilder;
 
-
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
 
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ContentLengthHeaderTest implements HttpServerAdapters {
 
-    final String NO_BODY_PATH = "/no_body";
-    final String BODY_PATH = "/body";
+    static final String NO_BODY_PATH = "/no_body";
+    static final String BODY_PATH = "/body";
 
     static HttpTestServer testContentLengthServerH1;
     static HttpTestServer testContentLengthServerH2;
@@ -79,13 +78,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
     static PrintStream testLog = System.err;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
-    HttpClient hc;
-    URI testContentLengthURIH1;
-    URI testContentLengthURIH2;
-    URI testContentLengthURIH3;
+    private static HttpClient hc;
+    private static URI testContentLengthURIH1;
+    private static URI testContentLengthURIH2;
+    private static URI testContentLengthURIH3;
 
-    @BeforeTest
-    public void setup() throws IOException, URISyntaxException, InterruptedException {
+    @BeforeAll
+    public static void setup() throws IOException, URISyntaxException, InterruptedException {
         testContentLengthServerH1 = HttpTestServer.create(HTTP_1_1);
         testContentLengthServerH2 = HttpTestServer.create(HTTP_2, sslContext);
         testContentLengthServerH3 = HttpTestServer.create(HTTP_3, sslContext);
@@ -128,7 +127,7 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 + testContentLengthServerH3.getH3AltService().get().getAddress());
         testLog.println("Request URI for Client: " + testContentLengthURIH3);
 
-        hc = newClientBuilderForH3()
+        hc = HttpServerAdapters.createClientBuilderForH3()
                 .proxy(HttpClient.Builder.NO_PROXY)
                 .sslContext(sslContext)
                 .build();
@@ -139,12 +138,12 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .build();
         // populate alt-service registry
         var resp = hc.send(firstReq, BodyHandlers.ofString());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
         testLog.println("**** setup done ****");
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         testLog.println("**** tearing down ****");
         if (testContentLengthServerH1 != null)
             testContentLengthServerH1.stop();
@@ -154,8 +153,7 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
             testContentLengthServerH3.stop();
     }
 
-    @DataProvider(name = "bodies")
-    Object[][] bodies() {
+    static Object[][] bodies() {
         return new Object[][]{
                 {HTTP_1_1, URI.create(testContentLengthURIH1 + BODY_PATH)},
                 {HTTP_2, URI.create(testContentLengthURIH2 + BODY_PATH)},
@@ -163,15 +161,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
         };
     }
 
-    @DataProvider(name = "h1body")
-    Object[][] h1body() {
+    static Object[][] h1body() {
         return new Object[][]{
                 {HTTP_1_1, URI.create(testContentLengthURIH1 + BODY_PATH)}
         };
     }
 
-    @DataProvider(name = "nobodies")
-    Object[][] nobodies() {
+    static Object[][] nobodies() {
         return new Object[][]{
                 {HTTP_1_1, URI.create(testContentLengthURIH1 + NO_BODY_PATH)},
                 {HTTP_2, URI.create(testContentLengthURIH2 + NO_BODY_PATH)},
@@ -179,8 +175,9 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "nobodies")
+    @ParameterizedTest
     // A GET request with no request body should have no Content-length header
+    @MethodSource("nobodies")
     public void getWithNoBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking GET with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -189,12 +186,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "nobodies")
+    @ParameterizedTest
     // A GET request with empty request body should have no Content-length header
+    @MethodSource("nobodies")
     public void getWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking GET with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -203,12 +201,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "bodies")
+    @ParameterizedTest
     // A GET request with empty request body and explicitly added Content-length header
+    @MethodSource("bodies")
     public void getWithZeroContentLength(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking GET with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -218,13 +217,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "bodies")
+    @ParameterizedTest
     // A GET request with a request body should have a Content-length header
     // in HTTP/1.1
+    @MethodSource("bodies")
     public void getWithBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking GET with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -233,12 +233,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "nobodies")
+    @ParameterizedTest
     // A DELETE request with no request body should have no Content-length header
+    @MethodSource("nobodies")
     public void deleteWithNoBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking DELETE with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -247,12 +248,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "nobodies")
+    @ParameterizedTest
     // A DELETE request with empty request body should have no Content-length header
+    @MethodSource("nobodies")
     public void deleteWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking DELETE with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -261,13 +263,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "bodies")
+    @ParameterizedTest
     // A DELETE request with a request body should have a Content-length header
     //   in HTTP/1.1
+    @MethodSource("bodies")
     public void deleteWithBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking DELETE with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -276,12 +279,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "nobodies")
+    @ParameterizedTest
     // A HEAD request with no request body should have no Content-length header
+    @MethodSource("nobodies")
     public void headWithNoBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking HEAD with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -290,12 +294,13 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "nobodies")
+    @ParameterizedTest
     // A HEAD request with empty request body should have no Content-length header
+    @MethodSource("nobodies")
     public void headWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking HEAD with no request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -304,13 +309,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "bodies")
+    @ParameterizedTest
     // A HEAD request with a request body should have a Content-length header
     // in HTTP/1.1
+    @MethodSource("bodies")
     public void headWithBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking HEAD with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -321,13 +327,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
         // Sending this request invokes sendResponseHeaders which emits a warning about including
         // a Content-length header with a HEAD request
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "h1body")
+    @ParameterizedTest
     // A POST request with empty request body should have a Content-length header
     // in HTTP/1.1
+    @MethodSource("h1body")
     public void postWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking POST with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -336,13 +343,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "bodies")
+    @ParameterizedTest
     // A POST request with a request body should have a Content-length header
     // in HTTP/1.1
+    @MethodSource("bodies")
     public void postWithBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking POST with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -351,13 +359,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "h1body")
+    @ParameterizedTest
     // A PUT request with empty request body should have a Content-length header
     // in HTTP/1.1
+    @MethodSource("h1body")
     public void putWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking PUT with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -366,13 +375,14 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
-    @Test(dataProvider = "bodies")
+    @ParameterizedTest
     // A PUT request with a request body should have a Content-length header
     // in HTTP/1.1
+    @MethodSource("bodies")
     public void putWithBody(Version version, URI uri) throws IOException, InterruptedException {
         testLog.println(version + " Checking PUT with request body");
         HttpRequest req = HttpRequest.newBuilder()
@@ -381,8 +391,8 @@ public class ContentLengthHeaderTest implements HttpServerAdapters {
                 .uri(uri)
                 .build();
         HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
-        assertEquals(resp.statusCode(), 200, resp.body());
-        assertEquals(resp.version(), version);
+        assertEquals(200, resp.statusCode(), resp.body());
+        assertEquals(version, resp.version());
     }
 
     public static void handleResponse(long expected, HttpTestExchange ex, String body, int rCode) throws IOException {
diff --git a/test/jdk/java/net/httpclient/CookieHeaderTest.java b/test/jdk/java/net/httpclient/CookieHeaderTest.java
index cd47262825c..62e62680e03 100644
--- a/test/jdk/java/net/httpclient/CookieHeaderTest.java
+++ b/test/jdk/java/net/httpclient/CookieHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,13 @@
  * @summary Test for multiple vs single cookie header for HTTP/2 vs HTTP/1.1
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.tls.acknowledgeCloseNotify=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       CookieHeaderTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLContext;
@@ -78,26 +74,31 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CookieHeaderTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    DummyServer httpDummyServer;
-    DummyServer httpsDummyServer;
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
-    String httpDummy;
-    String httpsDummy;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static DummyServer httpDummyServer;
+    private static DummyServer httpsDummyServer;
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
+    private static String httpDummy;
+    private static String httpsDummy;
 
     static final String MESSAGE = "Basic CookieHeaderTest message body";
     static final int ITERATIONS = 3;
@@ -110,8 +111,7 @@ public class CookieHeaderTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { httpURI, HTTP_1_1  },
                 { httpsURI, HTTP_1_1  },
@@ -129,7 +129,8 @@ public class CookieHeaderTest implements HttpServerAdapters {
 
     static final AtomicLong requestCounter = new AtomicLong();
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, HttpClient.Version version) throws Exception {
         out.printf("%n---- starting (%s) ----%n", uriString);
         ConcurrentHashMap<String, List<String>> cookieHeaders
@@ -169,14 +170,15 @@ public class CookieHeaderTest implements HttpServerAdapters {
                     + ", version=" + response.version());
             out.println("  Got body Path: " + response.body());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), MESSAGE);
-            assertEquals(response.headers().allValues("X-Request-Cookie"),
-                    cookies.stream()
-                            .filter(s -> !s.startsWith("LOC"))
-                            .collect(Collectors.toList()));
+            assertEquals(200, response.statusCode());
+            assertEquals(MESSAGE, response.body());
+            List<String> expectedCookieList = cookies.stream()
+                    .filter(s -> !s.startsWith("LOC")).toList();
+            List<String> actualCookieList = response.headers()
+                    .allValues("X-Request-Cookie");
+            assertEquals(expectedCookieList, actualCookieList);
             if (version == HTTP_3 && i > 0) {
-                assertEquals(response.version(), HTTP_3);
+                assertEquals(HTTP_3, response.version());
             }
             requestBuilder = HttpRequest.newBuilder(uri)
                     .header("X-uuid", "uuid-" + requestCounter.incrementAndGet());
@@ -192,8 +194,8 @@ public class CookieHeaderTest implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieValidationHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
@@ -228,8 +230,8 @@ public class CookieHeaderTest implements HttpServerAdapters {
         httpsDummyServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/CustomRequestPublisher.java b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
index f26def9a44c..c8d22419852 100644
--- a/test/jdk/java/net/httpclient/CustomRequestPublisher.java
+++ b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Checks correct handling of Publishers that call onComplete without demand
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm CustomRequestPublisher
+ * @run junit/othervm CustomRequestPublisher
  */
 
 import java.net.InetAddress;
@@ -51,10 +51,6 @@ import java.net.http.HttpResponse;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -62,27 +58,31 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CustomRequestPublisher implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1        [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1        [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         Supplier<BodyPublisher> fixedSupplier   = () -> new FixedLengthBodyPublisher();
         Supplier<BodyPublisher> unknownSupplier = () -> new UnknownLengthBodyPublisher();
 
@@ -114,12 +114,12 @@ public class CustomRequestPublisher implements HttpServerAdapters {
     /** Asserts HTTP Version, and SSLSession presence when applicable. */
     static void assertVersionAndSession(int step, HttpResponse response, String uri) {
         if (uri.contains("http2") || uri.contains("https2")) {
-            assertEquals(response.version(), HTTP_2);
+            assertEquals(HTTP_2, response.version());
         } else if (uri.contains("http1") || uri.contains("https1")) {
-            assertEquals(response.version(), HTTP_1_1);
+            assertEquals(HTTP_1_1, response.version());
         } else if (uri.contains("http3")) {
-            if (step == 0) assertNotEquals(response.version(), HTTP_1_1);
-            else assertEquals(response.version(), HTTP_3,
+            if (step == 0) assertNotEquals(HTTP_1_1, response.version());
+            else assertEquals(HTTP_3, response.version(),
                     "unexpected response version on step " + step);
         } else {
             fail("Unknown HTTP version in test for: " + uri);
@@ -160,7 +160,8 @@ public class CustomRequestPublisher implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void test(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClient)
             throws Exception
     {
@@ -180,13 +181,14 @@ public class CustomRequestPublisher implements HttpServerAdapters {
             out.println("Got body: " + resp.body());
             assertTrue(resp.statusCode() == 200,
                     "Expected 200, got:" + resp.statusCode());
-            assertEquals(resp.body(), bodyPublisher.bodyAsString());
+            assertEquals(bodyPublisher.bodyAsString(), resp.body());
 
             assertVersionAndSession(i, resp, uri);
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsync(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClient)
             throws Exception
     {
@@ -207,7 +209,7 @@ public class CustomRequestPublisher implements HttpServerAdapters {
             out.println("Got body: " + resp.body());
             assertTrue(resp.statusCode() == 200,
                     "Expected 200, got:" + resp.statusCode());
-            assertEquals(resp.body(), bodyPublisher.bodyAsString());
+            assertEquals(bodyPublisher.bodyAsString(), resp.body());
 
             assertVersionAndSession(0, resp, uri);
         }
@@ -337,8 +339,8 @@ public class CustomRequestPublisher implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new HttpTestEchoHandler(), "/http1/echo");
@@ -367,8 +369,8 @@ public class CustomRequestPublisher implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
index c581491a214..b2695271035 100644
--- a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm CustomResponseSubscriber
+ * @run junit/othervm CustomResponseSubscriber
  */
 
 import java.io.IOException;
@@ -59,37 +59,37 @@ import jdk.httpclient.test.lib.http2.Http2Handler;
 import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CustomResponseSubscriber {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
-    HttpsServer httpsTestServer;       // HTTPS/1.1
-    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
-    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
+    private static HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    private static HttpsServer httpsTestServer;       // HTTPS/1.1
+    private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
 
     static final int ITERATION_COUNT = 10;
     // a shared executor helps reduce the amount of threads created by the test
     static final Executor executor = Executors.newCachedThreadPool();
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpURI_fixed,    false },
                 { httpURI_chunk,    false },
@@ -118,7 +118,8 @@ public class CustomResponseSubscriber {
                          .build();
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsString(String uri, boolean sameClient) throws Exception {
         HttpClient client = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
@@ -130,14 +131,14 @@ public class CustomResponseSubscriber {
             BodyHandler<String> handler = new CRSBodyHandler();
             HttpResponse<String> response = client.send(req, handler);
             String body = response.body();
-            assertEquals(body, "");
+            assertEquals("", body);
         }
     }
 
     static class CRSBodyHandler implements BodyHandler<String> {
         @Override
         public BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
-            assertEquals(rinfo.statusCode(), 200);
+            assertEquals(200, rinfo.statusCode());
             return new CRSBodySubscriber();
         }
     }
@@ -185,8 +186,8 @@ public class CustomResponseSubscriber {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
@@ -226,8 +227,8 @@ public class CustomResponseSubscriber {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/DependentActionsTest.java b/test/jdk/java/net/httpclient/DependentActionsTest.java
index 9a77d377497..fcfbb393e5a 100644
--- a/test/jdk/java/net/httpclient/DependentActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentActionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        DependentActionsTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.quic.maxPtoBackoff=9
  *                      DependentActionsTest
   */
@@ -39,12 +39,6 @@ import java.io.InputStreamReader;
 import java.lang.StackWalker.StackFrame;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -89,28 +83,35 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class DependentActionsTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
-    String http3URI_head;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
+    private static String http3URI_fixed;
+    private static String http3URI_chunk;
+    private static String http3URI_head;
 
     static final StackWalker WALKER =
             StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
@@ -132,7 +133,7 @@ public class DependentActionsTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    private volatile HttpClient sharedClient;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -158,7 +159,7 @@ public class DependentActionsTest implements HttpServerAdapters {
         }
     }
 
-    @AfterClass
+    @AfterAll
     static final void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -179,7 +180,7 @@ public class DependentActionsTest implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 httpURI_fixed,
                 httpURI_chunk,
@@ -206,8 +207,7 @@ public class DependentActionsTest implements HttpServerAdapters {
         }
     }
 
-    @DataProvider(name = "noStalls")
-    public Object[][] noThrows() {
+    public static Object[][] noThrows() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -220,8 +220,7 @@ public class DependentActionsTest implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -237,20 +236,21 @@ public class DependentActionsTest implements HttpServerAdapters {
         return result;
     }
 
-    private HttpClient makeNewClient() {
+    private static HttpClient makeNewClient() {
         clientCount.incrementAndGet();
-        return newClientBuilderForH3()
+        return HttpServerAdapters.createClientBuilderForH3()
                 .proxy(Builder.NO_PROXY)
                 .executor(executor)
                 .sslContext(sslContext)
                 .build();
     }
 
-    HttpClient newHttpClient(boolean share) {
+    private static final Object zis = new Object();
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (zis) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -259,7 +259,8 @@ public class DependentActionsTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "noStalls")
+    @ParameterizedTest
+    @MethodSource("noThrows")
     public void testNoStalls(String uri, boolean sameClient)
             throws Exception {
         HttpClient client = null;
@@ -279,11 +280,12 @@ public class DependentActionsTest implements HttpServerAdapters {
                             BodyHandlers.ofString());
             HttpResponse<String> response = client.send(req, handler);
             String body = response.body();
-            assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+            assertEquals(URI.create(uri).getPath(), URI.create(body).getPath());
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsStringAsync(String uri,
                                   boolean sameClient,
                                   Supplier<Staller> s)
@@ -296,7 +298,8 @@ public class DependentActionsTest implements HttpServerAdapters {
                 this::finish, this::extractString, staller);
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsLinesAsync(String uri,
                                  boolean sameClient,
                                  Supplier<Staller> s)
@@ -309,7 +312,8 @@ public class DependentActionsTest implements HttpServerAdapters {
                 this::finish, this::extractStream, staller);
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsInputStreamAsync(String uri,
                                        boolean sameClient,
                                        Supplier<Staller> s)
@@ -329,11 +333,8 @@ public class DependentActionsTest implements HttpServerAdapters {
                                      Staller staller)
             throws Exception
     {
-        if (errorRef.get() != null) {
-            SkipException sk = new SkipException("skipping due to previous failure: " + name);
-            sk.setStackTrace(new StackTraceElement[0]);
-            throw sk;
-        }
+        Assumptions.assumeTrue(errorRef.get() == null,
+                "skipping due to previous failure: " + name);
         out.printf("%n%s%s%n", now(), name);
         try {
             testDependent(uri, sameClient, handlers, finisher, extractor, staller);
@@ -376,7 +377,7 @@ public class DependentActionsTest implements HttpServerAdapters {
                     // it's possible that the first request still went through HTTP/2
                     // if the config was HTTP3_ANY. Retry it - the next time we should
                     // have HTTP/3
-                    assertEquals(resp.version(), HTTP_3,
+                    assertEquals(HTTP_3, resp.version(),
                             "expected second request to go through HTTP/3 (serverConfig="
                                     + http3TestServer.h3DiscoveryConfig() + ")");
                 }
@@ -479,10 +480,10 @@ public class DependentActionsTest implements HttpServerAdapters {
                 throw new RuntimeException("Test failed in "
                         + w + ": " + response, error);
             }
-            assertEquals(result, List.of(response.request().uri().getPath()));
+            assertEquals(List.of(response.request().uri().getPath()), result);
             var uriStr = response.request().uri().toString();
             if (HTTP_3 != version(uriStr) || http3TestServer.h3DiscoveryConfig() != Http3DiscoveryMode.ANY) {
-                assertEquals(response.version(), version(uriStr), uriStr);
+                assertEquals(version(uriStr), response.version(), uriStr);
             }
             return response;
         } finally {
@@ -619,7 +620,7 @@ public class DependentActionsTest implements HttpServerAdapters {
         return null;
     }
 
-    HttpRequest.Builder newRequestBuilder(String uri) {
+    static HttpRequest.Builder newRequestBuilder(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri));
         if (version(uri) == HTTP_3) {
             builder.version(HTTP_3);
@@ -628,21 +629,21 @@ public class DependentActionsTest implements HttpServerAdapters {
         return builder;
     }
 
-    HttpResponse<String> headRequest(HttpClient client)
+    static HttpResponse<String> headRequest(HttpClient client)
             throws IOException, InterruptedException
     {
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         System.out.println("\n--- HEAD request succeeded ----\n");
         System.err.println("\n--- HEAD request succeeded ----\n");
         return response;
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
@@ -703,8 +704,8 @@ public class DependentActionsTest implements HttpServerAdapters {
         headRequest(newHttpClient(true));
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sharedClient = null;
         httpTestServer.stop();
         httpsTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
index f1b07f7abce..e045f4e22f1 100644
--- a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        DependentPromiseActionsTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
  */
 
 import java.io.BufferedReader;
@@ -37,11 +37,6 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.lang.StackWalker.StackFrame;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -93,21 +88,26 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class DependentPromiseActionsTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
+    private static String http3URI_fixed;
+    private static String http3URI_chunk;
 
     static final StackWalker WALKER =
             StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
@@ -129,7 +129,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    private volatile HttpClient sharedClient;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -155,7 +155,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         }
     }
 
-    @AfterClass
+    @AfterAll
     static final void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -176,7 +176,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 http3URI_fixed,
                 http3URI_chunk,
@@ -201,8 +201,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         }
     }
 
-    @DataProvider(name = "noStalls")
-    public Object[][] noThrows() {
+    public static Object[][] noThrows() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -215,8 +214,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -271,7 +269,8 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         return builder.build();
     }
 
-    @Test(dataProvider = "noStalls")
+    @ParameterizedTest
+    @MethodSource("noThrows")
     public void testNoStalls(String rootUri, boolean sameClient)
             throws Exception {
         if (!FAILURES.isEmpty()) return;
@@ -287,7 +286,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
                 HttpRequest req = request(uri);
 
                 BodyHandler<Stream<String>> handler =
-                        new StallingBodyHandler((w) -> {},
+                        new StallingBodyHandler<>((w) -> {},
                                 BodyHandlers.ofLines());
                 Map<HttpRequest, CompletableFuture<HttpResponse<Stream<String>>>> pushPromises =
                         new ConcurrentHashMap<>();
@@ -304,13 +303,13 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
                 HttpResponse<Stream<String>> response =
                         client.sendAsync(req, BodyHandlers.ofLines(), pushHandler).get();
                 String body = response.body().collect(Collectors.joining("|"));
-                assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+                assertEquals(URI.create(uri).getPath(), URI.create(body).getPath());
                 for (HttpRequest promised : pushPromises.keySet()) {
                     out.printf("%s Received promise: %s%n\tresponse: %s%n",
                             now(), promised, pushPromises.get(promised).get());
                     String promisedBody = pushPromises.get(promised).get().body()
                             .collect(Collectors.joining("|"));
-                    assertEquals(promisedBody, promised.uri().toASCIIString());
+                    assertEquals(promised.uri().toASCIIString(), promisedBody);
                 }
                 assertEquals(3, pushPromises.size());
             }
@@ -321,8 +320,9 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsStringAsync(String uri,
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsStringAsync(String uri,
                                   boolean sameClient,
                                   Supplier<Staller> stallers)
             throws Exception
@@ -334,8 +334,9 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
                 SubscriberType.EAGER);
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsLinesAsync(String uri,
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsLinesAsync(String uri,
                                  boolean sameClient,
                                  Supplier<Staller> stallers)
             throws Exception
@@ -347,8 +348,9 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
                 SubscriberType.LAZZY);
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsInputStreamAsync(String uri,
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsInputStreamAsync(String uri,
                                        boolean sameClient,
                                        Supplier<Staller> stallers)
             throws Exception
@@ -362,7 +364,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
 
     private <T,U> void testDependent(String name, String uri, boolean sameClient,
                                      Supplier<BodyHandler<T>> handlers,
-                                     Finisher finisher,
+                                     Finisher<T> finisher,
                                      Extractor<T> extractor,
                                      Supplier<Staller> stallers,
                                      SubscriberType subscriberType)
@@ -384,7 +386,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
 
     private <T,U> void testDependent(String rootUri, boolean sameClient,
                                      Supplier<BodyHandler<T>> handlers,
-                                     Finisher finisher,
+                                     Finisher<T> finisher,
                                      Extractor<T> extractor,
                                      Supplier<Staller> stallers,
                                      SubscriberType subscriberType)
@@ -424,7 +426,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
     enum Where {
         ON_PUSH_PROMISE, BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF;
         public Consumer<Where> select(Consumer<Where> consumer) {
-            return new Consumer<Where>() {
+            return new Consumer<>() {
                 @Override
                 public void accept(Where where) {
                     if (Where.this == where) {
@@ -475,10 +477,10 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
             staller.acquire();
             assert staller.willStall();
             try {
-                BodyHandler handler = new StallingBodyHandler<>(
+                BodyHandler<T> handler = new StallingBodyHandler<>(
                         where.select(staller), handlers.get());
                 CompletableFuture<HttpResponse<T>> cf = acceptor.apply(handler);
-                Tuple<T> tuple = new Tuple(failed, cf, staller);
+                Tuple<T> tuple = new Tuple<>(failed, cf, staller);
                 promiseMap.putIfAbsent(pushPromiseRequest, tuple);
                 CompletableFuture<?> done = cf.whenComplete(
                         (r, t) -> checkThreadAndStack(thread, failed, r, t));
@@ -567,7 +569,7 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
                 throw new RuntimeException("Test failed in "
                         + w + ": " + uri, error);
             }
-            assertEquals(result, List.of(response.request().uri().toASCIIString()));
+            assertEquals(List.of(response.request().uri().toASCIIString()), result);
         } finally {
             staller.reset();
         }
@@ -582,10 +584,10 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         for (HttpRequest req : ph.promiseMap.keySet()) {
             finish(w, ph.promiseMap.get(req), extractor);
         }
-        assertEquals(ph.promiseMap.size(), 3,
+        assertEquals(3, ph.promiseMap.size(),
                 "Expected 3 push promises for " + w + " in "
                         + response.request().uri());
-        assertEquals(result, List.of(response.request().uri().toASCIIString()));
+        assertEquals(List.of(response.request().uri().toASCIIString()), result);
 
     }
 
@@ -699,8 +701,8 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
     }
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/2
         HttpTestHandler fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler chunkedHandler = new HTTP_ChunkedHandler();
@@ -729,8 +731,8 @@ public class DependentPromiseActionsTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         if (sharedClient != null) {
             sharedClient.close();
         }
diff --git a/test/jdk/java/net/httpclient/EchoHandler.java b/test/jdk/java/net/httpclient/EchoHandler.java
deleted file mode 100644
index 9fd86083801..00000000000
--- a/test/jdk/java/net/httpclient/EchoHandler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.net.httpserver.*;
-import java.net.*;
-import java.net.http.*;
-import java.io.*;
-import java.util.concurrent.*;
-import javax.net.ssl.*;
-import java.nio.file.*;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-import jdk.test.lib.net.SimpleSSLContext;
-import static java.net.http.HttpRequest.*;
-import static java.net.http.HttpResponse.*;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class EchoHandler implements HttpHandler {
-    static final Path CWD = Paths.get(".");
-    public EchoHandler() {}
-
-    @Override
-    public void handle(HttpExchange t)
-            throws IOException {
-        try {
-            System.err.println("EchoHandler received request to " + t.getRequestURI());
-            InputStream is = t.getRequestBody();
-            Headers map = t.getRequestHeaders();
-            Headers map1 = t.getResponseHeaders();
-            map1.add("X-Hello", "world");
-            map1.add("X-Bye", "universe");
-            String fixedrequest = map.getFirst("XFixed");
-            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
-            FileOutputStream fos = new FileOutputStream(outfile);
-            int count = (int) is.transferTo(fos);
-            is.close();
-            fos.close();
-            InputStream is1 = new FileInputStream(outfile);
-            OutputStream os = null;
-            // return the number of bytes received (no echo)
-            String summary = map.getFirst("XSummary");
-            if (fixedrequest != null && summary == null) {
-                t.sendResponseHeaders(200, count);
-                os = t.getResponseBody();
-                is1.transferTo(os);
-            } else {
-                t.sendResponseHeaders(200, 0);
-                os = t.getResponseBody();
-                is1.transferTo(os);
-
-                if (summary != null) {
-                    String s = Integer.toString(count);
-                    os.write(s.getBytes());
-                }
-            }
-            outfile.delete();
-            os.close();
-            is1.close();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new IOException(e);
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/EncodedCharsInURI.java b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
index eab9a29b172..19b0a1d651b 100644
--- a/test/jdk/java/net/httpclient/EncodedCharsInURI.java
+++ b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *        EncodedCharsInURI
- * @run testng/othervm
+ * @run junit/othervm
  *        -Djdk.tls.acknowledgeCloseNotify=true
  *        -Djdk.internal.httpclient.debug=true
  *        -Djdk.httpclient.HttpClient.log=headers,errors EncodedCharsInURI
@@ -38,11 +38,6 @@
 
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLContext;
@@ -83,32 +78,37 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class EncodedCharsInURI implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    DummyServer    httpDummyServer;   // HTTP/1.1    [ 2 servers ]
-    DummyServer    httpsDummyServer;  // HTTPS/1.1
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
-    String http3URI_head;
-    String httpDummy;
-    String httpsDummy;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static DummyServer    httpDummyServer;   // HTTP/1.1    [ 2 servers ]
+    private static DummyServer    httpsDummyServer;  // HTTPS/1.1
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
+    private static String http3URI_fixed;
+    private static String http3URI_chunk;
+    private static String http3URI_head;
+    private static String httpDummy;
+    private static String httpsDummy;
 
     static final int ITERATION_COUNT = 1;
     // a shared executor helps reduce the amount of threads created by the test
@@ -126,7 +126,7 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    private volatile HttpClient sharedClient;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -152,7 +152,7 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         }
     }
 
-    @AfterClass
+    @AfterAll
     static final void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -172,7 +172,7 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 httpDummy,
                 httpsDummy,
@@ -189,8 +189,7 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         };
     }
 
-    @DataProvider(name = "noThrows")
-    public Object[][] noThrows() {
+    public static Object[][] noThrows() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         //Object[][] result = new Object[uris.length][];
@@ -216,7 +215,7 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         return null;
     }
 
-    HttpRequest.Builder newRequestBuilder(String uri) {
+    static HttpRequest.Builder newRequestBuilder(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri));
         if (version(uri) == HTTP_3) {
             builder.version(HTTP_3);
@@ -225,7 +224,7 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         return builder;
     }
 
-    HttpResponse<String> headRequest(HttpClient client)
+    static HttpResponse<String> headRequest(HttpClient client)
             throws IOException, InterruptedException
     {
         out.println("\n" + now() + "--- Sending HEAD request ----\n");
@@ -234,27 +233,28 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         out.println("\n" + now() + "--- HEAD request succeeded ----\n");
         err.println("\n" + now() + "--- HEAD request succeeded ----\n");
         return response;
     }
 
-    private HttpClient makeNewClient() {
+    private static HttpClient makeNewClient() {
         clientCount.incrementAndGet();
-        return newClientBuilderForH3()
+        return HttpServerAdapters.createClientBuilderForH3()
                 .executor(executor)
                 .proxy(NO_PROXY)
                 .sslContext(sslContext)
                 .build();
     }
 
-    HttpClient newHttpClient(boolean share) {
+    private static final Object zis = new Object();
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (zis) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -273,7 +273,8 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "noThrows")
+    @ParameterizedTest
+    @MethodSource("noThrows")
     public void testEncodedChars(String uri, boolean sameClient)
             throws Exception {
         HttpClient client = null;
@@ -302,13 +303,13 @@ public class EncodedCharsInURI implements HttpServerAdapters {
                 } else {
                     out.println("Found expected " + body + " in " + uri);
                 }
-                assertEquals(response.version(), version(uri));
+                assertEquals(version(uri), response.version());
             }
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println(now() + "begin setup");
 
         // HTTP/1.1
@@ -387,8 +388,8 @@ public class EncodedCharsInURI implements HttpServerAdapters {
         err.println(now() + "setup done");
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sharedClient.close();
         httpTestServer.stop();
         httpsTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
index abb0d7d8541..6ef71b7d22d 100644
--- a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
+++ b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @bug 8198716
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=reqeusts,headers
  *       EscapedOctetsInURI
  */
@@ -52,10 +52,6 @@ import java.util.List;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.err;
 import static java.lang.System.out;
@@ -65,24 +61,29 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class EscapedOctetsInURI implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
-    String http3URI_head;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
+    private static String http3URI_head;
 
-    private volatile HttpClient sharedClient;
+    private static volatile HttpClient sharedClient;
 
     static final String[][] pathsAndQueryStrings = new String[][] {
         // partial-path       URI query
@@ -95,8 +96,7 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
         {  "/012/with%20space", "?target=http%3A%2F%2Fwww.w3.org%2Fns%2Foa%23hasBody" },
     };
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         List<Object[]> list = new ArrayList<>();
 
         for (boolean sameClient : new boolean[] { false, true }) {
@@ -140,7 +140,7 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
         return null;
     }
 
-    HttpRequest.Builder newRequestBuilder(String uri) {
+    static HttpRequest.Builder newRequestBuilder(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri));
         if (version(uri) == HTTP_3) {
             builder.version(HTTP_3);
@@ -149,7 +149,7 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
         return builder;
     }
 
-    HttpResponse<String> headRequest(HttpClient client)
+    static HttpResponse<String> headRequest(HttpClient client)
             throws IOException, InterruptedException
     {
         out.println("\n" + now() + "--- Sending HEAD request ----\n");
@@ -158,25 +158,26 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         out.println("\n" + now() + "--- HEAD request succeeded ----\n");
         err.println("\n" + now() + "--- HEAD request succeeded ----\n");
         return response;
     }
 
-    private HttpClient makeNewClient() {
-        return newClientBuilderForH3()
+    private static HttpClient makeNewClient() {
+        return HttpServerAdapters.createClientBuilderForH3()
                 .proxy(NO_PROXY)
                 .sslContext(sslContext)
                 .build();
     }
 
-    HttpClient newHttpClient(boolean share) {
+    private static final Object zis = new Object();
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (zis) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -193,7 +194,8 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void test(String uriString, boolean sameClient) throws Exception {
         System.out.println("\n--- Starting ");
 
@@ -217,19 +219,20 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
 
                 out.println("Got response: " + resp);
                 out.println("Got body: " + resp.body());
-                assertEquals(resp.statusCode(), 200,
+                assertEquals(200, resp.statusCode(),
                         "Expected 200, got:" + resp.statusCode());
 
                 // the response body should contain the exact escaped request URI
                 URI retrievedURI = URI.create(resp.body());
-                assertEquals(retrievedURI.getRawPath(), uri.getRawPath());
-                assertEquals(retrievedURI.getRawQuery(), uri.getRawQuery());
-                assertEquals(resp.version(), version(uriString));
+                assertEquals(uri.getRawPath(), retrievedURI.getRawPath());
+                assertEquals(uri.getRawQuery(), retrievedURI.getRawQuery());
+                assertEquals(version(uriString), resp.version());
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsync(String uriString, boolean sameClient) throws Exception {
         System.out.println("\n--- Starting ");
         URI uri = URI.create(uriString);
@@ -249,22 +252,22 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
                         .thenApply(response -> {
                             out.println("Got response: " + response);
                             out.println("Got body: " + response.body());
-                            assertEquals(response.statusCode(), 200);
-                            assertEquals(response.version(), version(uriString));
+                            assertEquals(200, response.statusCode());
+                            assertEquals(version(uriString), response.version());
                             return response.body();
                         })
                         .thenApply(body -> URI.create(body))
                         .thenAccept(retrievedURI -> {
                             // the body should contain the exact escaped request URI
-                            assertEquals(retrievedURI.getRawPath(), uri.getRawPath());
-                            assertEquals(retrievedURI.getRawQuery(), uri.getRawQuery());
+                            assertEquals(uri.getRawPath(), retrievedURI.getRawPath());
+                            assertEquals(uri.getRawQuery(), retrievedURI.getRawQuery());
                         }).join();
             }
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println(now() + "begin setup");
 
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
@@ -311,8 +314,8 @@ public class EscapedOctetsInURI implements HttpServerAdapters {
         err.println(now() + "setup done");
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sharedClient.close();
         httpTestServer.stop();
         httpsTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/ExecutorShutdown.java b/test/jdk/java/net/httpclient/ExecutorShutdown.java
index a7cfd56b282..a46ea66f3ae 100644
--- a/test/jdk/java/net/httpclient/ExecutorShutdown.java
+++ b/test/jdk/java/net/httpclient/ExecutorShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       ExecutorShutdown
@@ -65,10 +65,6 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -78,8 +74,13 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ExecutorShutdown implements HttpServerAdapters {
 
@@ -89,25 +90,24 @@ public class ExecutorShutdown implements HttpServerAdapters {
     static final Random RANDOM = RandomFactory.getRandom();
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c   )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2    )
-    HttpTestServer h2h3TestServer;        // HTTP/2 ( h2+h3 )
-    HttpTestServer h3TestServer;          // HTTP/2 ( h3    )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h3URI;
-    String h2h3Head;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 6 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c   )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2    )
+    private static HttpTestServer h2h3TestServer;        // HTTP/2 ( h2+h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/2 ( h3    )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h3URI;
+    private static String h2h3Head;
 
     static final String MESSAGE = "ExecutorShutdown message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { h2h3URI,   HTTP_3,   h2h3TestServer.h3DiscoveryConfig() },
                 { h3URI,     HTTP_3,   h3TestServer.h3DiscoveryConfig() },
@@ -119,7 +119,7 @@ public class ExecutorShutdown implements HttpServerAdapters {
     }
 
     static final AtomicLong requestCounter = new AtomicLong();
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     static Throwable getCause(Throwable t) {
         while (t instanceof CompletionException || t instanceof ExecutionException) {
@@ -158,7 +158,8 @@ public class ExecutorShutdown implements HttpServerAdapters {
         throw new AssertionError(what + ": Unexpected exception: " + cause, cause);
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testConcurrent(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting (%s) ----%n", uriString);
         ExecutorService executorService = Executors.newCachedThreadPool();
@@ -209,9 +210,9 @@ public class ExecutorShutdown implements HttpServerAdapters {
                 var cf = responseCF.thenApply((response) -> {
                     out.println(si + ":  Got response: " + response);
                     out.println(si + ":  Got body Path: " + response.body());
-                    assertEquals(response.statusCode(), 200);
-                    if (si >= head) assertEquals(response.version(), version);
-                    assertEquals(response.body(), MESSAGE);
+                    assertEquals(200, response.statusCode());
+                    if (si >= head) assertEquals(version, response.version());
+                    assertEquals(MESSAGE, response.body());
                     return response;
                 }).exceptionally((t) -> {
                     Throwable cause = getCause(t);
@@ -228,7 +229,8 @@ public class ExecutorShutdown implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testSequential(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting (%s, %s, %s) ----%n%n", uriString, version, config);
         ExecutorService executorService = Executors.newCachedThreadPool();
@@ -272,9 +274,9 @@ public class ExecutorShutdown implements HttpServerAdapters {
                 responseCF.thenApply((response) -> {
                     out.println(si + ":  Got response: " + response);
                     out.println(si + ":  Got body Path: " + response.body());
-                    assertEquals(response.statusCode(), 200);
-                    if (si > 0) assertEquals(response.version(), version);
-                    assertEquals(response.body(), MESSAGE);
+                    assertEquals(200, response.statusCode());
+                    if (si > 0) assertEquals(version, response.version());
+                    assertEquals(MESSAGE, response.body());
                     return response;
                 }).handle((r,t) -> {
                     if (t != null) {
@@ -305,11 +307,11 @@ public class ExecutorShutdown implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("\n**** Setup ****\n");
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new ServerRequestHandler(), "/http1/exec/");
@@ -342,8 +344,8 @@ public class ExecutorShutdown implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(5000);
         try {
diff --git a/test/jdk/java/net/httpclient/ExpectContinue.java b/test/jdk/java/net/httpclient/ExpectContinue.java
index a2d928e6f41..e9ae894f3e1 100644
--- a/test/jdk/java/net/httpclient/ExpectContinue.java
+++ b/test/jdk/java/net/httpclient/ExpectContinue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestServerConfigurator
  * @modules java.net.http/jdk.internal.net.http.common
  *          jdk.httpserver
- * @run testng/othervm ExpectContinue
+ * @run junit/othervm ExpectContinue
  */
 
 import com.sun.net.httpserver.HttpExchange;
@@ -51,23 +51,24 @@ import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.TestServerConfigurator;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ExpectContinue {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServer httpTestServer;         // HTTP/1.1    [ 2 servers ]
-    HttpsServer httpsTestServer;       // HTTPS/1.1
-    String httpURI;
-    String httpsURI;
+    private static HttpServer httpTestServer;         // HTTP/1.1    [ 2 servers ]
+    private static HttpsServer httpsTestServer;       // HTTPS/1.1
+    private static String httpURI;
+    private static String httpsURI;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { httpURI,  false, "Billy" },
                 { httpURI,  false, "Bob"   },
@@ -76,7 +77,8 @@ public class ExpectContinue {
         };
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, boolean expectedContinue, String data)
         throws Exception
     {
@@ -94,17 +96,18 @@ public class ExpectContinue {
         HttpResponse<String> response = client.send(request,
                                                     BodyHandlers.ofString());
         System.out.println("First response: " + response);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.body(), data);
+        assertEquals(200, response.statusCode());
+        assertEquals(data, response.body());
 
         // again with the same request, to ensure no Expect header duplication
         response = client.send(request, BodyHandlers.ofString());
         System.out.println("Second response: " + response);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.body(), data);
+        assertEquals(200, response.statusCode());
+        assertEquals(data, response.body());
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testAsync(String uriString, boolean expectedContinue, String data) {
         out.printf("test(%s, %s, %s): starting%n", uriString, expectedContinue, data);
         HttpClient client = HttpClient.newBuilder()
@@ -120,14 +123,14 @@ public class ExpectContinue {
         HttpResponse<String> response = client.sendAsync(request,
                 BodyHandlers.ofString()).join();
         System.out.println("First response: " + response);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.body(), data);
+        assertEquals(200, response.statusCode());
+        assertEquals(data, response.body());
 
         // again with the same request, to ensure no Expect header duplication
         response = client.sendAsync(request, BodyHandlers.ofString()).join();
         System.out.println("Second response: " + response);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.body(), data);
+        assertEquals(200, response.statusCode());
+        assertEquals(data, response.body());
     }
 
     // -- Infrastructure
@@ -137,8 +140,8 @@ public class ExpectContinue {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         httpTestServer = HttpServer.create(sa, 0);
         httpTestServer.createContext("/http1/ec", new Http1ExpectContinueHandler());
@@ -153,8 +156,8 @@ public class ExpectContinue {
         httpsTestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
     }
diff --git a/test/jdk/java/net/httpclient/ExpectContinueTest.java b/test/jdk/java/net/httpclient/ExpectContinueTest.java
index a703fbfaacf..56fa363870a 100644
--- a/test/jdk/java/net/httpclient/ExpectContinueTest.java
+++ b/test/jdk/java/net/httpclient/ExpectContinueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @bug 8286171 8307648
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=errors ExpectContinueTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=errors ExpectContinueTest
  */
 
 
@@ -40,11 +40,6 @@ import jdk.httpclient.test.lib.http2.Http2TestServerConnection;
 import jdk.httpclient.test.lib.http2.Http2TestServerConnection.ResponseHeaders;
 import jdk.internal.net.http.common.HttpHeadersBuilder;
 import jdk.internal.net.http.frame.HeaderFrame;
-import org.testng.TestException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLSession;
@@ -79,23 +74,29 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ExpectContinueTest implements HttpServerAdapters {
 
-    HttpTestServer http1TestServer; // HTTP/1.1
-    Http1HangServer http1HangServer;
-    Http2TestServer http2TestServer; // HTTP/2
+    private static HttpTestServer http1TestServer; // HTTP/1.1
+    private static Http1HangServer http1HangServer;
+    private static Http2TestServer http2TestServer; // HTTP/2
 
-    URI getUri, postUri, forcePostUri, hangUri;
-    URI h2postUri, h2forcePostUri, h2hangUri, h2endStreamUri, h2warmupURI;
+    private static URI getUri, postUri, forcePostUri, hangUri;
+    private static URI h2postUri, h2forcePostUri, h2hangUri, h2endStreamUri, h2warmupURI;
 
     static PrintStream err = new PrintStream(System.err);
     static PrintStream out = new PrintStream(System.out);
     static final String EXPECTATION_FAILED_417 = "417 Expectation Failed";
 
-    @DataProvider(name = "uris")
-    public Object[][] urisData() {
+    public static Object[][] urisData() {
         return new Object[][]{
                 // URI, Expected Status Code, Will finish with Exception, Protocol Version
                 { postUri, 200, false, HTTP_1_1 },
@@ -107,7 +108,8 @@ public class ExpectContinueTest implements HttpServerAdapters {
                 { h2endStreamUri, 200, true, HTTP_2 }, // Error
         };
     }
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("urisData")
     public void test(URI uri, int expectedStatusCode, boolean exceptionally, HttpClient.Version version)
             throws CancellationException, InterruptedException, ExecutionException, IOException {
 
@@ -135,8 +137,8 @@ public class ExpectContinueTest implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         InetSocketAddress saHang = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         http1TestServer = HttpTestServer.create(HTTP_1_1);
         http1TestServer.addHandler(new GetHandler(), "/http1/get");
@@ -173,8 +175,8 @@ public class ExpectContinueTest implements HttpServerAdapters {
         http1HangServer.start();
         http2TestServer.start();
     }
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         http1TestServer.stop();
         http1HangServer.close();
         http2TestServer.stop();
@@ -372,11 +374,11 @@ public class ExpectContinueTest implements HttpServerAdapters {
         }
         if (exceptionally && testThrowable != null) {
             err.println("Finished exceptionally Test throwable: " + testThrowable);
-            assertEquals(testThrowable.getClass(), ProtocolException.class);
+            assertEquals(ProtocolException.class, testThrowable.getClass());
         } else if (exceptionally) {
-            throw new TestException("Expected case to finish with an IOException but testException is null");
+            fail("Expected case to finish with an IOException but testException is null");
         } else if (resp != null) {
-            assertEquals(resp.statusCode(), expectedStatusCode);
+            assertEquals(expectedStatusCode, resp.statusCode());
             err.println("Request completed successfully for path " + path);
             err.println("Response Headers: " + resp.headers());
             err.println("Response Status Code: " + resp.statusCode());
diff --git a/test/jdk/java/net/httpclient/FilePublisherTest.java b/test/jdk/java/net/httpclient/FilePublisherTest.java
index 9501e8054cc..292f770fc30 100644
--- a/test/jdk/java/net/httpclient/FilePublisherTest.java
+++ b/test/jdk/java/net/httpclient/FilePublisherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,10 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm FilePublisherTest
+ * @run junit/othervm FilePublisherTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -58,22 +54,27 @@ import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class FilePublisherTest implements HttpServerAdapters {
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServerAdapters.HttpTestServer httpTestServer;    // HTTP/1.1      [ 4 servers ]
-    HttpServerAdapters.HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpServerAdapters.HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpServerAdapters.HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1      [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
 
-    FileSystem zipFs;
-    Path defaultFsPath;
-    Path zipFsPath;
+    private static FileSystem zipFs;
+    private static Path defaultFsPath;
+    private static Path zipFsPath;
 
     // Default file system set up
     static final String DEFAULT_FS_MSG = "default fs";
@@ -84,12 +85,11 @@ public class FilePublisherTest implements HttpServerAdapters {
             Files.createFile(file);
             Files.writeString(file, DEFAULT_FS_MSG);
         }
-        assertEquals(Files.readString(file), DEFAULT_FS_MSG);
+        assertEquals(DEFAULT_FS_MSG, Files.readString(file));
         return file;
     }
 
-    @DataProvider(name = "defaultFsData")
-    public Object[][] defaultFsData() {
+    public static Object[][] defaultFsData() {
         return new Object[][]{
                 { httpURI,   defaultFsPath, DEFAULT_FS_MSG, true  },
                 { httpsURI,  defaultFsPath, DEFAULT_FS_MSG, true  },
@@ -102,7 +102,8 @@ public class FilePublisherTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "defaultFsData")
+    @ParameterizedTest
+    @MethodSource("defaultFsData")
     public void testDefaultFs(String uriString,
                               Path path,
                               String expectedMsg,
@@ -126,12 +127,11 @@ public class FilePublisherTest implements HttpServerAdapters {
             Files.createFile(file);
             Files.writeString(file, ZIP_FS_MSG);
         }
-        assertEquals(Files.readString(file), ZIP_FS_MSG);
+        assertEquals(ZIP_FS_MSG, Files.readString(file));
         return file;
     }
 
-    @DataProvider(name = "zipFsData")
-    public Object[][] zipFsData() {
+    public static Object[][] zipFsData() {
         return new Object[][]{
                 { httpURI,   zipFsPath, ZIP_FS_MSG, true  },
                 { httpsURI,  zipFsPath, ZIP_FS_MSG, true  },
@@ -144,7 +144,8 @@ public class FilePublisherTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "zipFsData")
+    @ParameterizedTest
+    @MethodSource("zipFsData")
     public void testZipFs(String uriString,
                           Path path,
                           String expectedMsg,
@@ -176,13 +177,13 @@ public class FilePublisherTest implements HttpServerAdapters {
             var resp = client.send(req, HttpResponse.BodyHandlers.ofString());
             out.println("Got response: " + resp);
             out.println("Got body: " + resp.body());
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(resp.body(), expectedMsg);
+            assertEquals(200, resp.statusCode());
+            assertEquals(expectedMsg, resp.body());
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         defaultFsPath = defaultFsFile();
         zipFs = newZipFs();
         zipFsPath = zipFsFile(zipFs);
@@ -209,8 +210,8 @@ public class FilePublisherTest implements HttpServerAdapters {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
index ef9dc7b3077..7fd3061aa3c 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,10 +42,6 @@ import java.net.http.HttpResponse;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import javax.net.ssl.SSLContext;
 
 import static java.net.http.HttpOption.H3_DISCOVERY;
@@ -53,8 +49,14 @@ import static java.util.stream.Collectors.joining;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.net.http.HttpRequest.BodyPublishers.fromPublisher;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -62,25 +64,24 @@ import static org.testng.Assert.fail;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=err FlowAdapterPublisherTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=err FlowAdapterPublisherTest
  */
 
 public class FlowAdapterPublisherTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;     // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;    // HTTPS/1.1
-    HttpTestServer http2TestServer;    // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;   // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;    // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;     // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;    // HTTPS/1.1
+    private static HttpTestServer http2TestServer;    // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;   // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;    // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpURI   },
                 { httpsURI  },
@@ -120,7 +121,8 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testByteBufferPublisherUnknownLength(String uri) {
         String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
                 "when the ", "rain gets ", "warmer." };
@@ -131,13 +133,14 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
             HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, Arrays.stream(body).collect(joining()));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals(Arrays.stream(body).collect(joining()), text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testByteBufferPublisherFixedLength(String uri) {
         String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
                 "when the ", "rain gets ", "warmer." };
@@ -149,15 +152,16 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
             HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, Arrays.stream(body).collect(joining()));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals(Arrays.stream(body).collect(joining()), text);
         }
     }
 
     // Flow.Publisher<MappedByteBuffer>
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testMappedByteBufferPublisherUnknownLength(String uri) {
         String[] body = new String[] { "God invented ", "whiskey to ", "keep the ",
                 "Irish from ", "ruling the ", "world." };
@@ -168,13 +172,14 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
             HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, Arrays.stream(body).collect(joining()));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals(Arrays.stream(body).collect(joining()), text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testMappedByteBufferPublisherFixedLength(String uri) {
         String[] body = new String[] { "God invented ", "whiskey to ", "keep the ",
                 "Irish from ", "ruling the ", "world." };
@@ -186,9 +191,9 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
             HttpResponse<String> response = client.sendAsync(request, ofString(UTF_8)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, Arrays.stream(body).collect(joining()));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals(Arrays.stream(body).collect(joining()), text);
         }
     }
 
@@ -196,7 +201,8 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
     // not ideal, but necessary to discern correct behavior. They should be
     // updated if the exception message is updated.
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testPublishTooFew(String uri) throws InterruptedException {
         String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
                 "when the ", "rain gets ", "warmer." };
@@ -214,7 +220,8 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testPublishTooMany(String uri) throws InterruptedException {
         String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
                 "when the ", "rain gets ", "warmer." };
@@ -356,8 +363,8 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(Version.HTTP_1_1);
         httpTestServer.addHandler(new HttpEchoHandler(), "/http1/echo");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/echo";
@@ -385,8 +392,8 @@ public class FlowAdapterPublisherTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
index 0e175cf0f52..32003023d7f 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,17 +53,19 @@ import java.net.http.HttpResponse.BodySubscribers;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import javax.net.ssl.SSLContext;
 
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -72,22 +74,22 @@ import static org.testng.Assert.assertTrue;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=true FlowAdapterSubscriberTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true FlowAdapterSubscriberTest
  */
 
 public class FlowAdapterSubscriberTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;     // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;    // HTTPS/1.1
-    HttpTestServer http2TestServer;    // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;   // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;    // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;     // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;    // HTTPS/1.1
+    private static HttpTestServer http2TestServer;    // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;   // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;    // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
     static final StackWalker WALKER =
             StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
@@ -101,8 +103,7 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpURI   },
                 { httpsURI  },
@@ -154,7 +155,7 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
         assertThrows(NPE, () -> BodySubscribers.fromSubscriber(new ListSubscriber(), null));
         assertThrows(NPE, () -> BodySubscribers.fromSubscriber(null, null));
 
-        Subscriber subscriber = BodySubscribers.fromSubscriber(new ListSubscriber());
+        Subscriber<?> subscriber = BodySubscribers.fromSubscriber(new ListSubscriber());
         assertThrows(NPE, () -> subscriber.onSubscribe(null));
         assertThrows(NPE, () -> subscriber.onNext(null));
         assertThrows(NPE, () -> subscriber.onError(null));
@@ -162,7 +163,8 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
 
     // List<ByteBuffer>
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testListWithFinisher(String uri) {
         System.out.printf(now() + "testListWithFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -174,13 +176,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, Supplier::get)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "May the luck of the Irish be with you!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("May the luck of the Irish be with you!", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testListWithoutFinisher(String uri) {
         System.out.printf(now() + "testListWithoutFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -192,13 +195,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber)).join();
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "May the luck of the Irish be with you!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("May the luck of the Irish be with you!", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testListWithFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testListWithFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -210,13 +214,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, Supplier::get));
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "May the luck of the Irish be with you!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("May the luck of the Irish be with you!", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testListWithoutFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testListWithoutFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -228,15 +233,16 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber));
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "May the luck of the Irish be with you!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("May the luck of the Irish be with you!", text);
         }
     }
 
     // Collection<ByteBuffer>
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testCollectionWithFinisher(String uri) {
         System.out.printf(now() + "testCollectionWithFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -248,13 +254,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, CollectionSubscriber::get)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "What's the craic?");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("What's the craic?", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testCollectionWithoutFinisher(String uri) {
         System.out.printf(now() + "testCollectionWithoutFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -266,13 +273,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber)).join();
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "What's the craic?");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("What's the craic?", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testCollectionWithFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testCollectionWithFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -284,13 +292,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, CollectionSubscriber::get));
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "What's the craic?");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("What's the craic?", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testCollectionWithoutFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testCollectionWithoutFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -302,15 +311,16 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber));
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "What's the craic?");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("What's the craic?", text);
         }
     }
 
     // Iterable<ByteBuffer>
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testIterableWithFinisher(String uri) {
         System.out.printf(now() + "testIterableWithFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -322,13 +332,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, Supplier::get)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "We're sucking diesel now!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("We're sucking diesel now!", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testIterableWithoutFinisher(String uri) {
         System.out.printf(now() + "testIterableWithoutFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -340,13 +351,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber)).join();
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "We're sucking diesel now!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("We're sucking diesel now!", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testIterableWithFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testIterableWithFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -358,13 +370,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, Supplier::get));
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "We're sucking diesel now!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("We're sucking diesel now!", text);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testIterableWithoutFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testIterableWithoutFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -376,15 +389,16 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber));
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
-            assertEquals(text, "We're sucking diesel now!");
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
+            assertEquals("We're sucking diesel now!", text);
         }
     }
 
     // Subscriber<Object>
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithFinisher(String uri) {
         System.out.printf(now() + "testObjectWithFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -396,13 +410,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, ObjectSubscriber::get)).join();
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
             assertTrue(text.length() != 0);  // what else can be asserted!
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithoutFinisher(String uri) {
         System.out.printf(now() + "testObjectWithoutFinisher(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -414,13 +429,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber)).join();
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
             assertTrue(text.length() != 0);  // what else can be asserted!
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testObjectWithFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -432,13 +448,14 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber, ObjectSubscriber::get));
             String text = response.body();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
             assertTrue(text.length() != 0);  // what else can be asserted!
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithoutFinisherBlocking(String uri) throws Exception {
         System.out.printf(now() + "testObjectWithoutFinisherBlocking(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -450,8 +467,8 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                     BodyHandlers.fromSubscriber(subscriber));
             String text = subscriber.get();
             System.out.println(text);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), version(uri));
+            assertEquals(200, response.statusCode());
+            assertEquals(version(uri), response.version());
             assertTrue(text.length() != 0);  // what else can be asserted!
         }
     }
@@ -459,7 +476,8 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
 
     // -- mapping using convenience handlers
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void mappingFromByteArray(String uri) throws Exception {
         System.out.printf(now() + "mappingFromByteArray(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -470,12 +488,13 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                             bas -> new String(bas.getBody().toCompletableFuture().join(), UTF_8)))
                     .thenApply(FlowAdapterSubscriberTest::assert200ResponseCode)
                     .thenApply(HttpResponse::body)
-                    .thenAccept(body -> assertEquals(body, "We're sucking diesel now!"))
+                    .thenAccept(body -> assertEquals("We're sucking diesel now!", body))
                     .join();
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void mappingFromInputStream(String uri) throws Exception {
         System.out.printf(now() + "mappingFromInputStream(%s) starting%n", uri);
         try (HttpClient client = newHttpClient(uri)) {
@@ -512,7 +531,7 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
                                 finisher))
                         .thenApply(FlowAdapterSubscriberTest::assert200ResponseCode)
                         .thenApply(HttpResponse::body)
-                        .thenAccept(body -> assertEquals(body, "May the wind always be at your back."))
+                        .thenAccept(body -> assertEquals("May the wind always be at your back.", body))
                         .join();
                 var error = failed.get();
                 if (error != null) throw error;
@@ -626,13 +645,13 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
     }
 
     static final <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response) {
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), version(response.request().uri().toString()));
+        assertEquals(200, response.statusCode());
+        assertEquals(version(response.request().uri().toString()), response.version());
         return response;
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(Version.HTTP_1_1);
         httpTestServer.addHandler(new HttpEchoHandler(), "/http1/echo");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/echo";
@@ -660,8 +679,8 @@ public class FlowAdapterSubscriberTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/ForbiddenHeadTest.java b/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
index 57fd627b2b0..f2011766b2b 100644
--- a/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
+++ b/test/jdk/java/net/httpclient/ForbiddenHeadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build DigestEchoServer ForbiddenHeadTest jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.http.auth.tunneling.disabledSchemes
  *       -Djdk.httpclient.HttpClient.log=headers,requests
  *       -Djdk.internal.httpclient.debug=true
@@ -36,15 +36,6 @@
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -61,7 +52,6 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -81,27 +71,40 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+
+import static jdk.httpclient.test.lib.common.HttpServerAdapters.createClientBuilderForH3;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ForbiddenHeadTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    DigestEchoServer.TunnelingProxy proxy;
-    DigestEchoServer.TunnelingProxy authproxy;
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String https3URI;
-    HttpClient authClient;
-    HttpClient noAuthClient;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static DigestEchoServer.TunnelingProxy proxy;
+    private static DigestEchoServer.TunnelingProxy authproxy;
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String https3URI;
+    private static HttpClient authClient;
+    private static HttpClient noAuthClient;
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     static final long SLEEP_AFTER_TEST = 0; // milliseconds
     static final int ITERATIONS = 3;
     static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
@@ -142,34 +145,39 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
             // Exceptions should already have been added to FAILURES
@@ -201,8 +209,7 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
     static final String MESSAGE = "Unauthorized";
 
 
-    @DataProvider(name = "all")
-    public Object[][] allcases() {
+    public static Object[][] allcases() {
         List<Object[]> result = new ArrayList<>();
         for (boolean useAuth : List.of(true, false)) {
             for (boolean async : List.of(true, false)) {
@@ -226,8 +233,6 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
         return result.toArray(new Object[0][0]);
     }
 
-    static final AtomicLong requestCounter = new AtomicLong();
-
     static final Authenticator authenticator = new Authenticator() {
         @Override
         protected PasswordAuthentication getPasswordAuthentication() {
@@ -237,9 +242,9 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
 
     static final AtomicLong sleepCount = new AtomicLong();
 
-    @Test(dataProvider = "all")
+    @ParameterizedTest
+    @MethodSource("allcases")
     void test(String uriString, int code, boolean async, boolean useAuth) throws Throwable {
-        checkSkip();
         HttpClient client = useAuth ? authClient : noAuthClient;
         var name = String.format("test(%s, %d, %s, %s)", uriString, code, async ? "async" : "sync",
                 client.authenticator().isPresent() ? "authClient" : "noAuthClient");
@@ -318,23 +323,23 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
 
 
         out.println("  Got response: " + response);
-        assertEquals(response.statusCode(), forbidden? FORBIDDEN : code);
-        assertEquals(response.body(), expectedValue == null ? null : "");
-        assertEquals(response.headers().firstValue("X-value"), Optional.ofNullable(expectedValue));
+        assertEquals(forbidden? FORBIDDEN : code, response.statusCode());
+        assertEquals(expectedValue == null ? null : "", response.body());
+        assertEquals(Optional.ofNullable(expectedValue), response.headers().firstValue("X-value"));
         // when the CONNECT request fails, its body is discarded - but
         // the response header may still contain its content length.
         // don't check content length in that case.
         if (expectedValue != null) {
             String clen = String.valueOf(expectedValue.getBytes(UTF_8).length);
-            assertEquals(response.headers().firstValue("Content-Length"), Optional.of(clen));
+            assertEquals(Optional.of(clen), response.headers().firstValue("Content-Length"));
         }
 
     }
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new UnauthorizedHandler(), "/http1/");
         httpTestServer.addHandler(new UnauthorizedHandler(), "/http2/proxy/");
@@ -357,7 +362,7 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
         proxy = DigestEchoServer.createHttpsProxyTunnel(DigestEchoServer.HttpAuthSchemeType.NONE);
         authproxy = DigestEchoServer.createHttpsProxyTunnel(DigestEchoServer.HttpAuthSchemeType.BASIC);
 
-        authClient = TRACKER.track(newClientBuilderForH3()
+        authClient = TRACKER.track(createClientBuilderForH3()
                 .proxy(TestProxySelector.of(proxy, authproxy, httpTestServer))
                 .sslContext(sslContext)
                 .executor(executor)
@@ -365,7 +370,7 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
                 .build());
         clientCount.incrementAndGet();
 
-        noAuthClient = TRACKER.track(newClientBuilderForH3()
+        noAuthClient = TRACKER.track(createClientBuilderForH3()
                 .proxy(TestProxySelector.of(proxy, authproxy, httpTestServer))
                 .sslContext(sslContext)
                 .executor(executor)
@@ -384,8 +389,8 @@ public class ForbiddenHeadTest implements HttpServerAdapters {
         serverCount.incrementAndGet();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         authClient = noAuthClient = null;
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(1500);
diff --git a/test/jdk/java/net/httpclient/GZIPInputStreamTest.java b/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
index 948ecd4d7cc..1cbb24d81ce 100644
--- a/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/GZIPInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,11 @@
  * @summary Tests that you can map an InputStream to a GZIPInputStream
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters ReferenceTracker
- * @run testng/othervm GZIPInputStreamTest
+ * @run junit/othervm GZIPInputStreamTest
  */
 
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -46,7 +42,6 @@ import java.net.InetAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
-import java.net.http.HttpOption.Http3DiscoveryMode;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodyHandlers;
@@ -68,21 +63,26 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class GZIPInputStreamTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer https3TestServer;  // HTTP/3
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String https3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer https3TestServer;  // HTTP/3
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String https3URI;
 
     static final int ITERATION_COUNT = 3;
     // a shared executor helps reduce the amount of threads created by the test
@@ -154,8 +154,7 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
 
 
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpURI,   false },
                 { httpURI,   true },
@@ -170,7 +169,7 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         };
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     HttpClient newHttpClient() {
         return TRACKER.track(newClientBuilderForH3()
                          .executor(executor)
@@ -192,7 +191,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
                 .build());
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testPlainSyncAsString(String uri, boolean sameClient) throws Exception {
         out.println("\nSmoke test: verify that the result we get from the server is correct.");
         out.println("Uses plain send() and `asString` to get the plain string.");
@@ -209,7 +209,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testPlainSyncAsInputStream(String uri, boolean sameClient) throws Exception {
         out.println("Uses plain send() and `asInputStream` - calls readAllBytes() from main thread");
         out.println("Uses single threaded executor");
@@ -225,7 +226,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGZIPSyncAsInputStream(String uri, boolean sameClient) throws Exception {
         out.println("Uses plain send() and `asInputStream` - " +
                 "creates GZIPInputStream and calls readAllBytes() from main thread");
@@ -243,7 +245,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGZIPSyncAsGZIPInputStream(String uri, boolean sameClient) throws Exception {
         out.println("Uses plain send() and a mapping subscriber to "+
                 "create the GZIPInputStream. Calls readAllBytes() from main thread");
@@ -262,7 +265,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGZIPSyncAsGZIPInputStreamSupplier(String uri, boolean sameClient) throws Exception {
         out.println("Uses plain send() and a mapping subscriber to "+
                 "create a Supplier<GZIPInputStream>. Calls Supplier.get() " +
@@ -276,7 +280,7 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
             HttpRequest req = buildRequest(URI.create(uri + "/gz/LoremIpsum.txt.gz"));
             // This is dangerous, because the finisher will block.
             // We support this, but the executor must have enough threads.
-            BodyHandler<Supplier<InputStream>> handler = new BodyHandler<Supplier<InputStream>>() {
+            BodyHandler<Supplier<InputStream>> handler = new BodyHandler<>() {
                  public HttpResponse.BodySubscriber<Supplier<InputStream>> apply(
                          HttpResponse.ResponseInfo responseInfo)
                  {
@@ -304,7 +308,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testPlainAsyncAsInputStreamBlocks(String uri, boolean sameClient) throws Exception {
         out.println("Uses sendAsync() and `asInputStream`. Registers a dependent action "+
                 "that calls readAllBytes()");
@@ -331,7 +336,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGZIPAsyncAsGZIPInputStreamBlocks(String uri, boolean sameClient) throws Exception {
         out.println("Uses sendAsync() and a mapping subscriber to create a GZIPInputStream. " +
                  "Registers a dependent action that calls readAllBytes()");
@@ -358,7 +364,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGZIPSyncAsGZIPInputStreamBlocks(String uri, boolean sameClient) throws Exception {
         out.println("Uses sendAsync() and a mapping subscriber to create a GZIPInputStream," +
                 "which is mapped again using a mapping subscriber " +
@@ -386,7 +393,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGZIPSyncAsGZIPInputStreamSupplierInline(String uri, boolean sameClient) throws Exception {
         out.println("Uses plain send() and a mapping subscriber to "+
                 "create a Supplier<GZIPInputStream>. Calls Supplier.get() " +
@@ -432,7 +440,7 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         if (!LOREM_IPSUM.equals(responseBody)) {
             out.println("Response doesn't match");
             out.println("[" + LOREM_IPSUM + "] != [" + responseBody + "]");
-            assertEquals(LOREM_IPSUM, responseBody);
+            assertEquals(responseBody, LOREM_IPSUM);
         } else {
             out.println("Received expected response.");
         }
@@ -487,8 +495,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         HttpTestHandler plainHandler = new LoremIpsumPlainHandler();
         HttpTestHandler gzipHandler  = new LoremIpsumGZIPHandler();
 
@@ -526,8 +534,8 @@ public class GZIPInputStreamTest implements HttpServerAdapters {
         https3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(500);
         try {
diff --git a/test/jdk/java/net/httpclient/HeadTest.java b/test/jdk/java/net/httpclient/HeadTest.java
index 3e05442faf5..3a52cd101b8 100644
--- a/test/jdk/java/net/httpclient/HeadTest.java
+++ b/test/jdk/java/net/httpclient/HeadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,10 @@
  * @summary Tests Client handles HEAD and 304 responses correctly.
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=trace,headers,requests HeadTest
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=trace,headers,requests HeadTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -55,19 +51,24 @@ import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static jdk.httpclient.test.lib.common.HttpServerAdapters.createClientBuilderForH3;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HeadTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer https3TestServer;      // HTTP/3
-    String httpURI, httpsURI;
-    String http2URI, https2URI;
-    String https3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer https3TestServer;      // HTTP/3
+    private static String httpURI, httpsURI;
+    private static String http2URI, https2URI;
+    private static String https3URI;
 
     static final String CONTENT_LEN = "300";
 
@@ -80,8 +81,7 @@ public class HeadTest implements HttpServerAdapters {
     static final int HTTP_OK = 200;
     static final PrintStream out = System.out;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 // HTTP/1.1
                 { httpURI, "GET", HTTP_NOT_MODIFIED, HTTP_1_1  },
@@ -103,7 +103,8 @@ public class HeadTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, String method,
                         int expResp, Version version) throws Exception {
         out.printf("%n---- starting (%s) ----%n", uriString);
@@ -136,17 +137,17 @@ public class HeadTest implements HttpServerAdapters {
 
             out.println("  Got response: " + response);
 
-            assertEquals(response.statusCode(), expResp);
-            assertEquals(response.body(), "");
-            assertEquals(response.headers().firstValue("Content-length").get(), CONTENT_LEN);
-            assertEquals(response.version(), request.version().get());
+            assertEquals(expResp, response.statusCode());
+            assertEquals("", response.body());
+            assertEquals(CONTENT_LEN, response.headers().firstValue("Content-length").get());
+            assertEquals(request.version().get(), response.version());
         }
     }
 
     // -- Infrastructure
     // TODO: See if test performs better with Vthreads, see H3SimplePost and H3SimpleGet
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new HeadHandler(), "/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/";
@@ -173,8 +174,8 @@ public class HeadTest implements HttpServerAdapters {
         https3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java b/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java
index b1e4e569010..00a709a3387 100644
--- a/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java
+++ b/test/jdk/java/net/httpclient/HeadersLowerCaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@ import jdk.internal.net.http.common.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -63,19 +62,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @run junit/othervm -Djdk.internal.httpclient.debug=true HeadersLowerCaseTest
  */
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HeadersLowerCaseTest implements HttpServerAdapters {
 
     private static Set<String> REQUEST_HEADERS;
 
-    private HttpTestServer h2server;
-    private HttpTestServer h3server;
-    private String h2ReqURIBase;
-    private String h3ReqURIBase;
+    private static HttpTestServer h2server;
+    private static HttpTestServer h3server;
+    private static String h2ReqURIBase;
+    private static String h3ReqURIBase;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     @BeforeAll
-    public void beforeAll() throws Exception {
+    public static void beforeAll() throws Exception {
         h2server = HttpTestServer.create(HTTP_2, sslContext);
         h2server.start();
         h2ReqURIBase = "https://" + h2server.serverAuthority();
@@ -100,7 +98,7 @@ public class HeadersLowerCaseTest implements HttpServerAdapters {
     }
 
     @AfterAll
-    public void afterAll() throws Exception {
+    public static void afterAll() throws Exception {
         if (h2server != null) {
             h2server.stop();
         }
@@ -157,14 +155,14 @@ public class HeadersLowerCaseTest implements HttpServerAdapters {
         }
     }
 
-    private Stream<Arguments> params() throws Exception {
+    private static Stream<Arguments> params() throws Exception {
         return Stream.of(
                 Arguments.of(HTTP_2, new URI(h2ReqURIBase + "/h2verifyReqHeaders")),
                 Arguments.of(Version.HTTP_3, new URI(h3ReqURIBase + "/h3verifyReqHeaders")));
     }
 
     /**
-     * Issues a HTTP/2 or HTTP/3 request with header names of varying case (some in lower,
+     * Issues an HTTP/2 or HTTP/3 request with header names of varying case (some in lower,
      * some mixed, some upper case) and expects that the client internally converts them
      * to lower case before encoding and sending to the server. The server side handler verifies
      * that it receives the header names in lower case and if it doesn't then it returns a
diff --git a/test/jdk/java/net/httpclient/HeadersTest1.java b/test/jdk/java/net/httpclient/HeadersTest1.java
index 79932dfc92f..26733c1c928 100644
--- a/test/jdk/java/net/httpclient/HeadersTest1.java
+++ b/test/jdk/java/net/httpclient/HeadersTest1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8153142 8195138
  * @modules java.net.http
  *          jdk.httpserver
- * @run testng/othervm HeadersTest1
+ * @run junit/othervm HeadersTest1
  */
 
 import java.io.IOException;
@@ -48,13 +48,13 @@ import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
-import org.testng.annotations.Test;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class HeadersTest1 {
 
@@ -106,7 +106,7 @@ public class HeadersTest1 {
             for (String headerName : headernames) {
                 List<String> v2 = hd.allValues(headerName);
                 assertNotNull(v2);
-                assertEquals(new HashSet<>(v2), Set.of("resp1", "resp2"));
+                assertEquals(Set.of("resp1", "resp2"), new HashSet<>(v2));
                 TestKit.assertUnmodifiableList(v2);
             }
 
@@ -130,7 +130,7 @@ public class HeadersTest1 {
 
             // quote
             List<String> quote = hd.allValues("X-Quote-Response");
-            assertEquals(quote, List.of(QUOTED));
+            assertEquals(List.of(QUOTED), quote);
         } finally {
             server.stop(0);
             e.shutdownNow();
diff --git a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
index 9f7d2ade62f..a5fb1a39e66 100644
--- a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,9 +51,10 @@ import java.net.http.HttpClient.Version;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.Test;
 import static java.time.Duration.*;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -61,7 +62,7 @@ import static org.testng.Assert.*;
  * @summary HttpClient[.Builder] API and behaviour checks
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run testng HttpClientBuilderTest
+ * @run junit HttpClientBuilderTest
  */
 
 public class HttpClientBuilderTest {
@@ -83,10 +84,10 @@ public class HttpClientBuilderTest {
                 assertFalse(client.connectTimeout().isPresent());
                 assertFalse(client.executor().isPresent());
                 assertFalse(client.proxy().isPresent());
-                assertTrue(client.sslParameters() != null);
-                assertTrue(client.followRedirects().equals(HttpClient.Redirect.NEVER));
-                assertTrue(client.sslContext() == SSLContext.getDefault());
-                assertTrue(client.version().equals(HttpClient.Version.HTTP_2));
+                assertNotNull(client.sslParameters());
+                assertEquals(Redirect.NEVER, client.followRedirects());
+                assertSame(SSLContext.getDefault(), client.sslContext());
+                assertEquals(Version.HTTP_2, client.version());
             }
         }
     }
@@ -133,18 +134,18 @@ public class HttpClientBuilderTest {
         Authenticator a = new TestAuthenticator();
         builder.authenticator(a);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().authenticator().get() == a);
+            assertSame(a, closer.build().authenticator().get());
         }
         Authenticator b = new TestAuthenticator();
         builder.authenticator(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().authenticator().get() == b);
+            assertSame(b, closer.build().authenticator().get());
         }
         assertThrows(NPE, () -> builder.authenticator(null));
         Authenticator c = new TestAuthenticator();
         builder.authenticator(c);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().authenticator().get() == c);
+            assertSame(c, closer.build().authenticator().get());
         }
     }
 
@@ -154,18 +155,18 @@ public class HttpClientBuilderTest {
         CookieHandler a = new CookieManager();
         builder.cookieHandler(a);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().cookieHandler().get() == a);
+            assertSame(a, closer.build().cookieHandler().get());
         }
         CookieHandler b = new CookieManager();
         builder.cookieHandler(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().cookieHandler().get() == b);
+            assertSame(b, closer.build().cookieHandler().get());
         }
         assertThrows(NPE, () -> builder.cookieHandler(null));
         CookieManager c = new CookieManager();
         builder.cookieHandler(c);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().cookieHandler().get() == c);
+            assertSame(c, closer.build().cookieHandler().get());
         }
     }
 
@@ -175,18 +176,18 @@ public class HttpClientBuilderTest {
         Duration a = Duration.ofSeconds(5);
         builder.connectTimeout(a);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().connectTimeout().get() == a);
+            assertSame(a, closer.build().connectTimeout().get());
         }
         Duration b = Duration.ofMinutes(1);
         builder.connectTimeout(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().connectTimeout().get() == b);
+            assertSame(b, closer.build().connectTimeout().get());
         }
         assertThrows(NPE, () -> builder.cookieHandler(null));
         Duration c = Duration.ofHours(100);
         builder.connectTimeout(c);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().connectTimeout().get() == c);
+            assertSame(c, closer.build().connectTimeout().get());
         }
 
         assertThrows(IAE, () -> builder.connectTimeout(ZERO));
@@ -205,18 +206,18 @@ public class HttpClientBuilderTest {
         TestExecutor a = new TestExecutor();
         builder.executor(a);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().executor().get() == a);
+            assertSame(a, closer.build().executor().get());
         }
         TestExecutor b = new TestExecutor();
         builder.executor(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().executor().get() == b);
+            assertSame(b, closer.build().executor().get());
         }
         assertThrows(NPE, () -> builder.executor(null));
         TestExecutor c = new TestExecutor();
         builder.executor(c);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().executor().get() == c);
+            assertSame(c, closer.build().executor().get());
         }
     }
 
@@ -226,18 +227,18 @@ public class HttpClientBuilderTest {
         ProxySelector a = ProxySelector.of(null);
         builder.proxy(a);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().proxy().get() == a);
+            assertSame(a, closer.build().proxy().get());
         }
         ProxySelector b = ProxySelector.of(InetSocketAddress.createUnresolved("foo", 80));
         builder.proxy(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().proxy().get() == b);
+            assertSame(b, closer.build().proxy().get());
         }
         assertThrows(NPE, () -> builder.proxy(null));
         ProxySelector c = ProxySelector.of(InetSocketAddress.createUnresolved("bar", 80));
         builder.proxy(c);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().proxy().get() == c);
+            assertSame(c, closer.build().proxy().get());
         }
     }
 
@@ -249,16 +250,16 @@ public class HttpClientBuilderTest {
         builder.sslParameters(a);
         a.setCipherSuites(new String[] { "Z" });
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslParameters() != (a));
+            assertNotSame(a, closer.build().sslParameters());
         }
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslParameters().getCipherSuites()[0].equals("A"));
+            assertEquals("A", closer.build().sslParameters().getCipherSuites()[0]);
         }
         SSLParameters b = new SSLParameters();
         b.setEnableRetransmissions(true);
         builder.sslParameters(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslParameters() != b);
+            assertNotSame(b, closer.build().sslParameters());
         }
         try (var closer = closeable(builder)) {
             assertTrue(closer.build().sslParameters().getEnableRetransmissions());
@@ -269,21 +270,21 @@ public class HttpClientBuilderTest {
         builder.sslParameters(c);
         c.setProtocols(new String[] { "D" });
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslParameters().getProtocols()[0].equals("C"));
+            assertEquals("C", closer.build().sslParameters().getProtocols()[0]);
         }
         SSLParameters d = new SSLParameters();
         d.setSignatureSchemes(new String[] { "C" });
         builder.sslParameters(d);
         d.setSignatureSchemes(new String[] { "D" });
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslParameters().getSignatureSchemes()[0].equals("C"));
+            assertEquals("C", closer.build().sslParameters().getSignatureSchemes()[0]);
         }
         SSLParameters e = new SSLParameters();
         e.setNamedGroups(new String[] { "C" });
         builder.sslParameters(e);
         e.setNamedGroups(new String[] { "D" });
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslParameters().getNamedGroups()[0].equals("C"));
+            assertEquals("C", closer.build().sslParameters().getNamedGroups()[0]);
         }
         // test defaults for needClientAuth and wantClientAuth
         builder.sslParameters(new SSLParameters());
@@ -321,18 +322,18 @@ public class HttpClientBuilderTest {
         SSLContext a = SimpleSSLContext.findSSLContext();
         builder.sslContext(a);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslContext() == a);
+            assertSame(a, closer.build().sslContext());
         }
         SSLContext b = SimpleSSLContext.findSSLContext();
         builder.sslContext(b);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslContext() == b);
+            assertSame(b, closer.build().sslContext());
         }
         assertThrows(NPE, () -> builder.sslContext(null));
         SSLContext c = SimpleSSLContext.findSSLContext();
         builder.sslContext(c);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().sslContext() == c);
+            assertSame(c, closer.build().sslContext());
         }
     }
 
@@ -341,16 +342,16 @@ public class HttpClientBuilderTest {
         HttpClient.Builder builder = HttpClient.newBuilder();
         builder.followRedirects(Redirect.ALWAYS);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().followRedirects() == Redirect.ALWAYS);
+            assertSame(Redirect.ALWAYS, closer.build().followRedirects());
         }
         builder.followRedirects(Redirect.NEVER);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().followRedirects() == Redirect.NEVER);
+            assertSame(Redirect.NEVER, closer.build().followRedirects());
         }
         assertThrows(NPE, () -> builder.followRedirects(null));
         builder.followRedirects(Redirect.NORMAL);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().followRedirects() == Redirect.NORMAL);
+            assertSame(Redirect.NORMAL, closer.build().followRedirects());
         }
     }
 
@@ -358,37 +359,37 @@ public class HttpClientBuilderTest {
     public void testVersion() {
         HttpClient.Builder builder = HttpClient.newBuilder();
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_2);
+            assertSame(Version.HTTP_2, closer.build().version());
         }
         builder.version(Version.HTTP_3);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_3);
+            assertSame(Version.HTTP_3, closer.build().version());
         }
         builder.version(Version.HTTP_2);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_2);
+            assertSame(Version.HTTP_2, closer.build().version());
         }
         builder.version(Version.HTTP_1_1);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_1_1);
+            assertSame(Version.HTTP_1_1, closer.build().version());
         }
         assertThrows(NPE, () -> builder.version(null));
         builder.version(Version.HTTP_3);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_3);
+            assertSame(Version.HTTP_3, closer.build().version());
         }
         builder.version(Version.HTTP_2);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_2);
+            assertSame(Version.HTTP_2, closer.build().version());
         }
         builder.version(Version.HTTP_1_1);
         try (var closer = closeable(builder)) {
-            assertTrue(closer.build().version() == Version.HTTP_1_1);
+            assertSame(Version.HTTP_1_1, closer.build().version());
         }
     }
 
     @Test
-    static void testPriority() throws Exception {
+    void testPriority() throws Exception {
         HttpClient.Builder builder = HttpClient.newBuilder();
         assertThrows(IAE, () -> builder.priority(-1));
         assertThrows(IAE, () -> builder.priority(0));
@@ -489,7 +490,7 @@ public class HttpClientBuilderTest {
     static final URI uri = URI.create("http://foo.com/");
 
     @Test
-    static void testHttpClientSendArgs() throws Exception {
+    void testHttpClientSendArgs() throws Exception {
         try (HttpClient client = HttpClient.newHttpClient()) {
             HttpRequest request = HttpRequest.newBuilder(uri).build();
 
@@ -527,21 +528,21 @@ public class HttpClientBuilderTest {
     // ---
 
     @Test
-    static void testUnsupportedWebSocket() throws Exception {
+    void testUnsupportedWebSocket() throws Exception {
         //  @implSpec The default implementation of this method throws
         // {@code UnsupportedOperationException}.
         assertThrows(UOE, () -> (new MockHttpClient()).newWebSocketBuilder());
     }
 
     @Test
-    static void testDefaultShutdown() throws Exception {
+    void testDefaultShutdown() throws Exception {
         try (HttpClient client = new MockHttpClient()) {
             client.shutdown(); // does nothing
         }
     }
 
     @Test
-    static void testDefaultShutdownNow() throws Exception {
+    void testDefaultShutdownNow() throws Exception {
         try (HttpClient client = new MockHttpClient()) {
             client.shutdownNow(); // calls shutdown, doesn't wait
         }
@@ -559,18 +560,18 @@ public class HttpClientBuilderTest {
         }
 
         // once from shutdownNow(), and once from close()
-        assertEquals(shutdownCalled.get(), 2);
+        assertEquals(2, shutdownCalled.get());
     }
 
     @Test
-    static void testDefaultIsTerminated() throws Exception {
+    void testDefaultIsTerminated() throws Exception {
         try (HttpClient client = new MockHttpClient()) {
             assertFalse(client.isTerminated());
         }
     }
 
     @Test
-    static void testDefaultAwaitTermination() throws Exception {
+    void testDefaultAwaitTermination() throws Exception {
         try (HttpClient client = new MockHttpClient()) {
             assertTrue(client.awaitTermination(Duration.ofDays(1)));
         }
@@ -581,7 +582,7 @@ public class HttpClientBuilderTest {
     }
 
     @Test
-    static void testDefaultClose() {
+    void testDefaultClose() {
         AtomicInteger shutdownCalled = new AtomicInteger();
         AtomicInteger awaitTerminationCalled = new AtomicInteger();
         AtomicInteger shutdownNowCalled = new AtomicInteger();
@@ -616,9 +617,9 @@ public class HttpClientBuilderTest {
         //      awaitTermination() 0->1 -> false
         //      awaitTermination() 1->2 -> true
         try (HttpClient client = mock) { }
-        assertEquals(shutdownCalled.get(), 1); // called by close()
-        assertEquals(shutdownNowCalled.get(), 0); // not called
-        assertEquals(awaitTerminationCalled.get(), 2); // called by close() twice
+        assertEquals(1, shutdownCalled.get()); // called by close()
+        assertEquals(0, shutdownNowCalled.get()); // not called
+        assertEquals(2, awaitTerminationCalled.get()); // called by close() twice
         assertFalse(Thread.currentThread().isInterrupted());
 
         // second time around:
@@ -629,9 +630,9 @@ public class HttpClientBuilderTest {
         //         calls shutdown() 2->3
         //      awaitTermination() 3->4 -> true
         try (HttpClient client = mock) { }
-        assertEquals(shutdownCalled.get(), 3); // called by close() and shutdownNow()
-        assertEquals(shutdownNowCalled.get(), 1); // called by close() due to interrupt
-        assertEquals(awaitTerminationCalled.get(), 4); // called by close twice
+        assertEquals(3, shutdownCalled.get()); // called by close() and shutdownNow()
+        assertEquals(1, shutdownNowCalled.get()); // called by close() due to interrupt
+        assertEquals(4, awaitTerminationCalled.get()); // called by close twice
         assertTrue(Thread.currentThread().isInterrupted());
         assertTrue(Thread.interrupted());
     }
diff --git a/test/jdk/java/net/httpclient/HttpClientClose.java b/test/jdk/java/net/httpclient/HttpClientClose.java
index e71faa8fe4e..0a3fc03424a 100644
--- a/test/jdk/java/net/httpclient/HttpClientClose.java
+++ b/test/jdk/java/net/httpclient/HttpClientClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       HttpClientClose
@@ -70,10 +70,6 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -84,10 +80,15 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HttpClientClose implements HttpServerAdapters {
 
@@ -96,27 +97,26 @@ public class HttpClientClose implements HttpServerAdapters {
     }
     static final Random RANDOM = RandomFactory.getRandom();
 
-    ExecutorService readerService;
+    private static ExecutorService readerService;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
-    HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h2h3Head;
-    String h3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h2h3Head;
+    private static String h3URI;
 
     static final String MESSAGE = "HttpClientClose message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { h2h3URI,    HTTP_3,   h2h3TestServer.h3DiscoveryConfig()},
                 { h3URI,      HTTP_3,   h3TestServer.h3DiscoveryConfig()},
@@ -128,7 +128,7 @@ public class HttpClientClose implements HttpServerAdapters {
     }
 
     static final AtomicLong requestCounter = new AtomicLong();
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     static String readBody(InputStream body) {
         try (InputStream in = body) {
@@ -138,7 +138,7 @@ public class HttpClientClose implements HttpServerAdapters {
         }
     }
 
-    private static record CancellingSubscriber<U>(ExchangeResult<?> result)
+    private record CancellingSubscriber<U>(ExchangeResult<?> result)
             implements Subscriber<U> {
         @Override
         public void onSubscribe(Subscription subscription) {
@@ -176,15 +176,15 @@ public class HttpClientClose implements HttpServerAdapters {
                              boolean firstVersionMayNotMatch) {
 
         static <U> ExchangeResult<U> afterHead(int step, Version version, Http3DiscoveryMode config) {
-            return new ExchangeResult<U>(step, version, config, null, false);
+            return new ExchangeResult<>(step, version, config, null, false);
         }
 
         static <U> ExchangeResult<U> ofSequential(int step, Version version, Http3DiscoveryMode config) {
-            return new ExchangeResult<U>(step, version, config, null, true);
+            return new ExchangeResult<>(step, version, config, null, true);
         }
 
         ExchangeResult<T> withResponse(HttpResponse<T> response) {
-            return new ExchangeResult<T>(step(), version(), config(), response, firstVersionMayNotMatch());
+            return new ExchangeResult<>(step(), version(), config(), response, firstVersionMayNotMatch());
         }
 
         // Ensures that the input stream gets closed in case of assertion
@@ -193,11 +193,11 @@ public class HttpClientClose implements HttpServerAdapters {
             try {
                 out.printf("%s:  expect status 200 and version %s (%s) for %s%n", step, version, config,
                         response.request().uri());
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
                 if (step == 0 && version == HTTP_3 && firstVersionMayNotMatch) {
                     out.printf("%s:  version not checked%n", step);
                 } else {
-                    assertEquals(response.version(), version);
+                    assertEquals(version, response.version());
                     out.printf("%s:  got expected version %s%n", step, response.version());
                 }
             } catch (AssertionError error) {
@@ -227,10 +227,11 @@ public class HttpClientClose implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testConcurrent(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting concurrent (%s, %s, %s) ----%n%n", uriString, version, config);
         Throwable failed = null;
@@ -266,7 +267,7 @@ public class HttpClientClose implements HttpServerAdapters {
                 bodyCF = responseCF
                         .thenApplyAsync((resp) -> readBody(si, resp), readerService)
                         .thenApply((s) -> {
-                            assertEquals(s, MESSAGE);
+                            assertEquals(MESSAGE, s);
                             return s;
                         });
                 long sleep = RANDOM.nextLong(5);
@@ -289,7 +290,8 @@ public class HttpClientClose implements HttpServerAdapters {
                 failed == null ? "done" : failed.toString());
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testSequential(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting sequential (%s, %s, %s) ----%n%n", uriString, version, config);
         Throwable failed = null;
@@ -320,7 +322,7 @@ public class HttpClientClose implements HttpServerAdapters {
                 bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                         .thenApply(HttpClientClose::readBody)
                         .thenApply((s) -> {
-                            assertEquals(s, MESSAGE);
+                            assertEquals(MESSAGE, s);
                             return s;
                         })
                         .thenApply((s) -> {
@@ -340,8 +342,8 @@ public class HttpClientClose implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("\n**** Setup ****\n");
         readerService = Executors.newCachedThreadPool();
 
@@ -376,8 +378,8 @@ public class HttpClientClose implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.checkShutdown(5000);
         try {
diff --git a/test/jdk/java/net/httpclient/HttpClientExceptionTest.java b/test/jdk/java/net/httpclient/HttpClientExceptionTest.java
index f9c585d955e..dff7219c0c8 100644
--- a/test/jdk/java/net/httpclient/HttpClientExceptionTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,6 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
 import java.io.IOException;
 import java.net.ProtocolFamily;
 import java.net.http.HttpClient;
@@ -34,12 +32,15 @@ import java.nio.channels.Channel;
 import java.nio.channels.spi.AbstractSelector;
 import java.nio.channels.spi.SelectorProvider;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @bug 8248006
  * @summary The test checks if UncheckedIOException is thrown
  * @build  HttpClientExceptionTest
- * @run testng/othervm -Djava.nio.channels.spi.SelectorProvider=HttpClientExceptionTest$CustomSelectorProvider
+ * @run junit/othervm -Djava.nio.channels.spi.SelectorProvider=HttpClientExceptionTest$CustomSelectorProvider
  *                      HttpClientExceptionTest
  */
 
@@ -50,8 +51,8 @@ public class HttpClientExceptionTest {
     @Test
     public void testHttpClientException() {
         for(int i = 0; i < ITERATIONS; i++) {
-            Assert.assertThrows(HttpClient.newBuilder()::build);
-            Assert.assertThrows(HttpClient::newHttpClient);
+            Assertions.assertThrows(Throwable.class, HttpClient.newBuilder()::build);
+            Assertions.assertThrows(Throwable.class, HttpClient::newHttpClient);
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
index 10cca697231..f1e8aecbaa4 100644
--- a/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,6 @@
 
 import jdk.test.lib.net.IPSupport;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.Closeable;
@@ -50,6 +45,12 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /*
  * @test
  * @summary Tests HttpClient usage when configured with a local address to bind
@@ -60,7 +61,7 @@ import static java.net.http.HttpClient.Version.HTTP_2;
  * @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.net.IPSupport
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
  *      -Djdk.internal.httpclient.debug=true
  *      -Dsun.net.httpserver.idleInterval=50000
@@ -81,7 +82,7 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
     private static final AtomicInteger IDS = new AtomicInteger();
 
     // start various HTTP/HTTPS servers that will be invoked against in the tests
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws Exception {
         HttpServerAdapters.HttpTestHandler handler = (exchange) -> {
             // the handler receives a request and sends back a 200 response with the
@@ -126,7 +127,7 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
     }
 
     // stop each of the started servers
-    @AfterClass
+    @AfterAll
     public static void afterClass() throws Exception {
         // stop each of the server and accumulate any exception
         // that might happen during stop and finally throw
@@ -166,8 +167,7 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
         return prevException;
     }
 
-    @DataProvider(name = "params")
-    private Object[][] paramsProvider() throws Exception {
+    private static Object[][] paramsProvider() throws Exception {
         final List<Object[]> testMethodParams = new ArrayList<>();
         final URI[] requestURIs = new URI[]{httpURI, httpsURI, http2URI, https2URI};
         final Predicate<URI> requiresSSLContext = (uri) -> uri.getScheme().equals("https");
@@ -224,7 +224,7 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
     // An object that holds a client and that can be closed
     // Used when closing the client might require closing additional
     // resources, such as an executor
-    sealed interface ClientCloseable extends Closeable {
+    public sealed interface ClientCloseable extends Closeable {
 
         HttpClient client();
 
@@ -261,7 +261,7 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
     }
 
     // A supplier of ClientCloseable
-    sealed interface ClientProvider extends Supplier<ClientCloseable> {
+    public sealed interface ClientProvider extends Supplier<ClientCloseable> {
 
         ClientCloseable get();
 
@@ -323,7 +323,8 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
      * seen by the server side handler is the same one as that is set on the
      * {@code client}
      */
-    @Test(dataProvider = "params")
+    @ParameterizedTest
+    @MethodSource("paramsProvider")
     public void testSend(ClientProvider clientProvider, URI requestURI, InetAddress localAddress) throws Exception {
         try (var c = clientProvider.get()) {
             HttpClient client = c.client();
@@ -332,10 +333,10 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
             // GET request
             var req = HttpRequest.newBuilder(requestURI).build();
             var resp = client.send(req, HttpResponse.BodyHandlers.ofByteArray());
-            Assert.assertEquals(resp.statusCode(), 200, "Unexpected status code");
+            Assertions.assertEquals(200, resp.statusCode(), "Unexpected status code");
             // verify the address only if a specific one was set on the client
             if (localAddress != null && !localAddress.isAnyLocalAddress()) {
-                Assert.assertEquals(resp.body(), localAddress.getAddress(),
+                Assertions.assertArrayEquals(localAddress.getAddress(), resp.body(),
                         "Unexpected client address seen by the server handler");
             }
         }
@@ -347,7 +348,8 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
      * seen by the server side handler is the same one as that is set on the
      * {@code client}
      */
-    @Test(dataProvider = "params")
+    @ParameterizedTest
+    @MethodSource("paramsProvider")
     public void testSendAsync(ClientProvider clientProvider, URI requestURI, InetAddress localAddress) throws Exception {
         try (var c = clientProvider.get()) {
             HttpClient client = c.client();
@@ -359,10 +361,10 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
             var cf = client.sendAsync(req,
                     HttpResponse.BodyHandlers.ofByteArray());
             var resp = cf.get();
-            Assert.assertEquals(resp.statusCode(), 200, "Unexpected status code");
+            Assertions.assertEquals(200, resp.statusCode(), "Unexpected status code");
             // verify the address only if a specific one was set on the client
             if (localAddress != null && !localAddress.isAnyLocalAddress()) {
-                Assert.assertEquals(resp.body(), localAddress.getAddress(),
+                Assertions.assertArrayEquals(localAddress.getAddress(), resp.body(),
                         "Unexpected client address seen by the server handler");
             }
         }
@@ -374,7 +376,8 @@ public class HttpClientLocalAddrTest implements HttpServerAdapters {
      * is used when multiple concurrent threads are involved in sending requests from
      * the {@code client}
      */
-    @Test(dataProvider = "params")
+    @ParameterizedTest
+    @MethodSource("paramsProvider")
     public void testMultiSendRequests(ClientProvider clientProvider,
                                       URI requestURI,
                                       InetAddress localAddress) throws Exception {
diff --git a/test/jdk/java/net/httpclient/HttpClientShutdown.java b/test/jdk/java/net/httpclient/HttpClientShutdown.java
index 4a5583782cb..8532146c1e2 100644
--- a/test/jdk/java/net/httpclient/HttpClientShutdown.java
+++ b/test/jdk/java/net/httpclient/HttpClientShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       HttpClientShutdown
@@ -74,10 +74,6 @@ import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -88,10 +84,15 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HttpClientShutdown implements HttpServerAdapters {
 
@@ -100,27 +101,26 @@ public class HttpClientShutdown implements HttpServerAdapters {
     }
     static final Random RANDOM = RandomFactory.getRandom();
 
-    ExecutorService readerService;
+    private static ExecutorService readerService;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
-    HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h2h3Head;
-    String h3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h2h3Head;
+    private static String h3URI;
 
     static final String MESSAGE = "HttpClientShutdown message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { h2h3URI,    HTTP_3,   h2h3TestServer.h3DiscoveryConfig()},
                 { h3URI,      HTTP_3,   h3TestServer.h3DiscoveryConfig()},
@@ -216,11 +216,11 @@ public class HttpClientShutdown implements HttpServerAdapters {
             try {
                 out.printf(now() + "%s:  expect status 200 and version %s (%s) for %s%n", step, version, config,
                         response.request().uri());
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
                 if (step == 0 && version == HTTP_3 && firstVersionMayNotMatch) {
                     out.printf(now() + "%s:  version not checked%n", step);
                 } else {
-                    assertEquals(response.version(), version);
+                    assertEquals(version, response.version());
                     out.printf(now() + "%s:  got expected version %s%n", step, response.version());
                 }
             } catch (AssertionError error) {
@@ -238,7 +238,7 @@ public class HttpClientShutdown implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
     static boolean hasExpectedMessage(IOException io) {
@@ -272,7 +272,8 @@ public class HttpClientShutdown implements HttpServerAdapters {
         throw new AssertionError(what + ": Unexpected exception: " + cause, cause);
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testConcurrent(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- %sstarting concurrent (%s, %s, %s) ----%n%n",
                 now(), uriString, version, config);
@@ -310,7 +311,7 @@ public class HttpClientShutdown implements HttpServerAdapters {
                 bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                         .thenApply(HttpClientShutdown::readBody)
                         .thenApply((s) -> {
-                            assertEquals(s, MESSAGE);
+                            assertEquals(MESSAGE, s);
                             out.println(now() + si +": Got expected message: " + s);
                             return s;
                         });
@@ -375,7 +376,8 @@ public class HttpClientShutdown implements HttpServerAdapters {
         return failed;
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testSequential(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- %sstarting sequential (%s, %s, %s) ----%n%n",
                 now(), uriString, version, config);
@@ -409,7 +411,7 @@ public class HttpClientShutdown implements HttpServerAdapters {
                 bodyCF = responseCF.thenApplyAsync(HttpResponse::body, readerService)
                         .thenApply(HttpClientShutdown::readBody)
                         .thenApply((s) -> {
-                            assertEquals(s, MESSAGE);
+                            assertEquals(MESSAGE, s);
                             return s;
                         })
                         .thenApply((s) -> {
@@ -461,8 +463,8 @@ public class HttpClientShutdown implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("\n**** Setup ****\n");
         readerService = Executors.newCachedThreadPool();
 
@@ -498,8 +500,8 @@ public class HttpClientShutdown implements HttpServerAdapters {
         start = System.nanoTime();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.checkShutdown(5000);
         try {
diff --git a/test/jdk/java/net/httpclient/HttpEchoHandler.java b/test/jdk/java/net/httpclient/HttpEchoHandler.java
deleted file mode 100644
index 319a5b901f9..00000000000
--- a/test/jdk/java/net/httpclient/HttpEchoHandler.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import com.sun.net.httpserver.*;
-import java.net.*;
-import java.net.http.*;
-import java.io.*;
-import java.util.concurrent.*;
-import javax.net.ssl.*;
-import java.nio.file.*;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Random;
-import jdk.test.lib.net.SimpleSSLContext;
-import static java.net.http.HttpRequest.*;
-import static java.net.http.HttpResponse.*;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class HttpEchoHandler implements HttpHandler {
-    static final Path CWD = Paths.get(".");
-
-    public HttpEchoHandler() {}
-
-    @Override
-    public void handle(HttpExchange t)
-            throws IOException {
-        try {
-            System.err.println("EchoHandler received request to " + t.getRequestURI());
-            InputStream is = t.getRequestBody();
-            Headers map = t.getRequestHeaders();
-            Headers map1 = t.getResponseHeaders();
-            map1.add("X-Hello", "world");
-            map1.add("X-Bye", "universe");
-            String fixedrequest = map.getFirst("XFixed");
-            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
-            FileOutputStream fos = new FileOutputStream(outfile);
-            int count = (int) is.transferTo(fos);
-            is.close();
-            fos.close();
-            InputStream is1 = new FileInputStream(outfile);
-            OutputStream os = null;
-            // return the number of bytes received (no echo)
-            String summary = map.getFirst("XSummary");
-            if (fixedrequest != null && summary == null) {
-                t.sendResponseHeaders(200, count);
-                os = t.getResponseBody();
-                is1.transferTo(os);
-            } else {
-                t.sendResponseHeaders(200, 0);
-                os = t.getResponseBody();
-                is1.transferTo(os);
-
-                if (summary != null) {
-                    String s = Integer.toString(count);
-                    os.write(s.getBytes());
-                }
-            }
-            outfile.delete();
-            os.close();
-            is1.close();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new IOException(e);
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/HttpHeadersOf.java b/test/jdk/java/net/httpclient/HttpHeadersOf.java
index 6194ab0a472..77a800b7cf2 100644
--- a/test/jdk/java/net/httpclient/HttpHeadersOf.java
+++ b/test/jdk/java/net/httpclient/HttpHeadersOf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Tests for HttpHeaders.of factory method
- * @run testng HttpHeadersOf
+ * @run junit HttpHeadersOf
  */
 
 import java.net.http.HttpHeaders;
@@ -33,13 +33,16 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiPredicate;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HttpHeadersOf {
 
@@ -59,12 +62,12 @@ public class HttpHeadersOf {
             @Override public String toString() { return "REJECT_ALL"; }
         };
 
-    @DataProvider(name = "predicates")
-    public Object[][] predicates() {
+    public static Object[][] predicates() {
         return new Object[][] { { ACCEPT_ALL }, { REJECT_ALL } };
     }
 
-    @Test(dataProvider = "predicates")
+    @ParameterizedTest
+    @MethodSource("predicates")
     public void testNull(BiPredicate<String,String> filter) {
         assertThrows(NPE, () -> HttpHeaders.of(null, null));
         assertThrows(NPE, () -> HttpHeaders.of(null, filter));
@@ -80,8 +83,7 @@ public class HttpHeadersOf {
     }
 
 
-    @DataProvider(name = "filterMaps")
-    public Object[][] filterMaps() {
+    public static Object[][] filterMaps() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("A", List.of("B"),           "X", List.of("Y", "Z")),
                 Map.of("A", List.of("B", "C"),      "X", List.of("Y", "Z")),
@@ -90,33 +92,33 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "filterMaps")
+    @ParameterizedTest
+    @MethodSource("filterMaps")
     public void testFilter(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, REJECT_ALL);
-        assertEquals(headers.map().size(), 0);
+        assertEquals(0, headers.map().size());
         assertFalse(headers.firstValue("A").isPresent());
-        assertEquals(headers.allValues("A").size(), 0);
+        assertEquals(0, headers.allValues("A").size());
 
         headers = HttpHeaders.of(map, (name, value) -> {
             if (name.equals("A")) return true; else return false; });
-        assertEquals(headers.map().size(), 1);
+        assertEquals(1, headers.map().size());
         assertTrue(headers.firstValue("A").isPresent());
-        assertEquals(headers.allValues("A"), map.get("A"));
-        assertEquals(headers.allValues("A").size(), map.get("A").size());
+        assertEquals(map.get("A"), headers.allValues("A"));
+        assertEquals(map.get("A").size(), headers.allValues("A").size());
         assertFalse(headers.firstValue("X").isPresent());
 
         headers = HttpHeaders.of(map, (name, value) -> {
             if (name.equals("X")) return true; else return false; });
-        assertEquals(headers.map().size(), 1);
+        assertEquals(1, headers.map().size());
         assertTrue(headers.firstValue("X").isPresent());
-        assertEquals(headers.allValues("X"), map.get("X"));
-        assertEquals(headers.allValues("X").size(), map.get("X").size());
+        assertEquals(map.get("X"), headers.allValues("X"));
+        assertEquals(map.get("X").size(), headers.allValues("X").size());
         assertFalse(headers.firstValue("A").isPresent());
     }
 
 
-    @DataProvider(name = "mapValues")
-    public Object[][] mapValues() {
+    public static Object[][] mapValues() {
         List<Map<String, List<String>>> maps = List.of(
             Map.of("A", List.of("B")),
             Map.of("A", List.of("B", "C")),
@@ -137,18 +139,19 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "mapValues")
+    @ParameterizedTest
+    @MethodSource("mapValues")
     public void testMapValues(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, ACCEPT_ALL);
 
-        assertEquals(headers.map().size(), map.size());
+        assertEquals(map.size(), headers.map().size());
         assertTrue(headers.firstValue("A").isPresent());
         assertTrue(headers.firstValue("a").isPresent());
-        assertEquals(headers.firstValue("A").get(), "B");
-        assertEquals(headers.firstValue("a").get(), "B");
-        assertEquals(headers.allValues("A"), map.get("A"));
-        assertEquals(headers.allValues("a"), map.get("A"));
-        assertEquals(headers.allValues("F").size(), 0);
+        assertEquals("B", headers.firstValue("A").get());
+        assertEquals("B", headers.firstValue("a").get());
+        assertEquals(map.get("A"), headers.allValues("A"));
+        assertEquals(map.get("A"), headers.allValues("a"));
+        assertEquals(0, headers.allValues("F").size());
         assertTrue(headers.map().get("A").contains("B"));
         assertFalse(headers.map().get("A").contains("F"));
         assertThrows(NFE, () -> headers.firstValueAsLong("A"));
@@ -167,8 +170,7 @@ public class HttpHeadersOf {
     }
 
 
-    @DataProvider(name = "caseInsensitivity")
-    public Object[][] caseInsensitivity() {
+    public static Object[][] caseInsensitivity() {
         List<Map<String, List<String>>> maps = List.of(
              Map.of("Accept-Encoding", List.of("gzip, deflate")),
              Map.of("accept-encoding", List.of("gzip, deflate")),
@@ -179,7 +181,8 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "caseInsensitivity")
+    @ParameterizedTest
+    @MethodSource("caseInsensitivity")
     public void testCaseInsensitivity(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, ACCEPT_ALL);
 
@@ -187,11 +190,11 @@ public class HttpHeadersOf {
                                    "aCCept-EnCODing", "accepT-encodinG")) {
             assertTrue(headers.firstValue(name).isPresent());
             assertTrue(headers.allValues(name).contains("gzip, deflate"));
-            assertEquals(headers.firstValue(name).get(), "gzip, deflate");
-            assertEquals(headers.allValues(name).size(), 1);
-            assertEquals(headers.map().size(), 1);
-            assertEquals(headers.map().get(name).size(), 1);
-            assertEquals(headers.map().get(name).get(0), "gzip, deflate");
+            assertEquals("gzip, deflate", headers.firstValue(name).get());
+            assertEquals(1, headers.allValues(name).size());
+            assertEquals(1, headers.map().size());
+            assertEquals(1, headers.map().get(name).size());
+            assertEquals("gzip, deflate", headers.map().get(name).get(0));
         }
     }
 
@@ -212,8 +215,8 @@ public class HttpHeadersOf {
                 HttpHeaders h2 = HttpHeaders.of(m2, ACCEPT_ALL);
                 if (!m1.equals(m2)) mapDiffer++;
                 if (m1.hashCode() != m2.hashCode()) mapHashDiffer++;
-                assertEquals(h1, h2, "HttpHeaders differ");
-                assertEquals(h1.hashCode(), h2.hashCode(),
+                assertEquals(h2, h1, "HttpHeaders differ");
+                assertEquals(h2.hashCode(), h1.hashCode(),
                         "hashCode differ for " + List.of(m1,m2));
             }
         }
@@ -221,8 +224,7 @@ public class HttpHeadersOf {
         assertTrue(mapHashDiffer > 0, "all maps had same hashCode!");
     }
 
-    @DataProvider(name = "valueAsLong")
-    public Object[][] valueAsLong() {
+    public static Object[][] valueAsLong() {
         return new Object[][] {
             new Object[] { Map.of("Content-Length", List.of("10")), 10l },
             new Object[] { Map.of("Content-Length", List.of("101")), 101l },
@@ -232,15 +234,15 @@ public class HttpHeadersOf {
         };
     }
 
-    @Test(dataProvider = "valueAsLong")
+    @ParameterizedTest
+    @MethodSource("valueAsLong")
     public void testValueAsLong(Map<String,List<String>> map, long expected) {
         HttpHeaders headers = HttpHeaders.of(map, ACCEPT_ALL);
-        assertEquals(headers.firstValueAsLong("Content-Length").getAsLong(), expected);
+        assertEquals(expected, headers.firstValueAsLong("Content-Length").getAsLong());
     }
 
 
-    @DataProvider(name = "duplicateNames")
-    public Object[][] duplicateNames() {
+    public static Object[][] duplicateNames() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("X-name", List.of(),
                        "x-name", List.of()),
@@ -262,7 +264,8 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "duplicateNames")
+    @ParameterizedTest
+    @MethodSource("duplicateNames")
     public void testDuplicates(Map<String,List<String>> map) {
         HttpHeaders headers;
         try {
@@ -275,8 +278,7 @@ public class HttpHeadersOf {
     }
 
 
-    @DataProvider(name = "noSplittingJoining")
-    public Object[][] noSplittingJoining() {
+    public static Object[][] noSplittingJoining() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("A", List.of("B")),
                 Map.of("A", List.of("B", "C")),
@@ -296,24 +298,24 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "noSplittingJoining")
+    @ParameterizedTest
+    @MethodSource("noSplittingJoining")
     public void testNoSplittingJoining(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, ACCEPT_ALL);
         Map<String,List<String>> headersMap = headers.map();
 
-        assertEquals(headers.map().size(), map.size());
+        assertEquals(map.size(), headers.map().size());
         for (Map.Entry<String,List<String>> entry : map.entrySet()) {
             String headerName = entry.getKey();
             List<String> headerValues = entry.getValue();
-            assertEquals(headerValues, headersMap.get(headerName));
-            assertEquals(headerValues, headers.allValues(headerName));
-            assertEquals(headerValues.get(0), headers.firstValue(headerName).get());
+            assertEquals(headersMap.get(headerName), headerValues);
+            assertEquals(headers.allValues(headerName), headerValues);
+            assertEquals(headers.firstValue(headerName).get(), headerValues.get(0));
         }
     }
 
 
-    @DataProvider(name = "trimming")
-    public Object[][] trimming() {
+    public static Object[][] trimming() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("A", List.of("B")),
                 Map.of(" A", List.of("B")),
@@ -331,23 +333,23 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "trimming")
+    @ParameterizedTest
+    @MethodSource("trimming")
     public void testTrimming(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, (name, value) -> {
-            assertEquals(name, "A");
-            assertEquals(value, "B");
+            assertEquals("A", name);
+            assertEquals("B", value);
             return true;
         });
 
-        assertEquals(headers.map().size(), 1);
-        assertEquals(headers.firstValue("A").get(), "B");
-        assertEquals(headers.allValues("A"), List.of("B"));
-        assertTrue(headers.map().get("A").equals(List.of("B")));
+        assertEquals(1, headers.map().size());
+        assertEquals("B", headers.firstValue("A").get());
+        assertEquals(List.of("B"), headers.allValues("A"));
+        assertEquals(List.of("B"), headers.map().get("A"));
     }
 
 
-    @DataProvider(name = "emptyKey")
-    public Object[][] emptyKey() {
+    public static Object[][] emptyKey() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("", List.of("B")),
                 Map.of(" ", List.of("B")),
@@ -358,7 +360,8 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "emptyKey")
+    @ParameterizedTest
+    @MethodSource("emptyKey")
     public void testEmptyKey(Map<String,List<String>> map) {
         HttpHeaders headers;
         try {
@@ -371,8 +374,7 @@ public class HttpHeadersOf {
     }
 
 
-    @DataProvider(name = "emptyValue")
-    public Object[][] emptyValue() {
+    public static Object[][] emptyValue() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("A", List.of("")),
                 Map.of("A", List.of("", "")),
@@ -383,40 +385,41 @@ public class HttpHeadersOf {
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "emptyValue")
+    @ParameterizedTest
+    @MethodSource("emptyValue")
     public void testEmptyValue(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, (name, value) -> {
-            assertEquals(value, "");
+            assertEquals("", value);
             return true;
         });
-        assertEquals(headers.map().size(), map.size());
-        assertEquals(headers.map().get("A").get(0), "");
-        headers.allValues("A").forEach(v -> assertEquals(v, ""));
-        assertEquals(headers.firstValue("A").get(), "");
+        assertEquals(map.size(), headers.map().size());
+        assertEquals("", headers.map().get("A").get(0));
+        headers.allValues("A").forEach(v -> assertEquals("", v));
+        assertEquals("", headers.firstValue("A").get());
     }
 
 
-    @DataProvider(name = "noValues")
-    public Object[][] noValues() {
+    public static Object[][] noValues() {
         List<Map<String, List<String>>> maps = List.of(
                 Map.of("A", List.of()),
                 Map.of("A", List.of(), "B", List.of()),
                 Map.of("A", List.of(), "B", List.of(), "C", List.of()),
-                Map.of("A", new ArrayList()),
-                Map.of("A", new LinkedList())
+                Map.of("A", new ArrayList<>()),
+                Map.of("A", new LinkedList<>())
         );
         return maps.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "noValues")
+    @ParameterizedTest
+    @MethodSource("noValues")
     public void testNoValues(Map<String,List<String>> map) {
         HttpHeaders headers = HttpHeaders.of(map, (name, value) -> {
             fail("UNEXPECTED call to filter");
             return true;
         });
-        assertEquals(headers.map().size(), 0);
-        assertEquals(headers.map().get("A"), null);
-        assertEquals(headers.allValues("A").size(), 0);
+        assertEquals(0, headers.map().size());
+        assertNull(headers.map().get("A"));
+        assertEquals(0, headers.allValues("A").size());
         assertFalse(headers.firstValue("A").isPresent());
     }
 }
diff --git a/test/jdk/java/net/httpclient/HttpInputStreamAvailableTest.java b/test/jdk/java/net/httpclient/HttpInputStreamAvailableTest.java
index 5cca88716b6..99897a69a8c 100644
--- a/test/jdk/java/net/httpclient/HttpInputStreamAvailableTest.java
+++ b/test/jdk/java/net/httpclient/HttpInputStreamAvailableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8306040
  * @summary HttpResponseInputStream.available() returns 1 on empty stream
@@ -47,19 +47,17 @@ import java.net.http.HttpResponse;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HttpInputStreamAvailableTest {
 
-    private HttpServer server;
-    private int port;
-    static final String TEST_MESSAGE = "This is test message";
-    static final int ZERO = 0;
+    private static HttpServer server;
+    private static int port;
+    private static final String TEST_MESSAGE = "This is test message";
+    private static final int ZERO = 0;
 
     @BeforeAll
-    void setup() throws Exception {
+    static void setup() throws Exception {
         InetAddress loopback = InetAddress.getLoopbackAddress();
         InetSocketAddress addr = new InetSocketAddress(loopback, 0);
         server = HttpServer.create(addr, 0);
@@ -72,69 +70,71 @@ public class HttpInputStreamAvailableTest {
     }
 
     @AfterAll
-    void teardown() throws Exception {
+    static void teardown() throws Exception {
         server.stop(0);
     }
 
     @Test
     public void test() throws Exception {
-        HttpClient client = HttpClient
+        try (HttpClient client = HttpClient
                 .newBuilder()
                 .proxy(HttpClient.Builder.NO_PROXY)
-                .build();
+                .build()) {
 
-        URI uri = URIBuilder.newBuilder()
-                .scheme("http")
-                .loopback()
-                .port(port)
-                .path("/NonZeroResponse/")
-                .build();
+            URI uri = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(port)
+                    .path("/NonZeroResponse/")
+                    .build();
 
-        HttpRequest request = HttpRequest
-                .newBuilder(uri)
-                .GET()
-                .build();
+            HttpRequest request = HttpRequest
+                    .newBuilder(uri)
+                    .GET()
+                    .build();
 
-        // Send a httpRequest and assert the bytes available
-        HttpResponse<InputStream> response = client.send(request,
-                HttpResponse.BodyHandlers.ofInputStream());
-        try ( InputStream in = response.body()) {
-            in.readNBytes(2);
-            // this is not guaranteed, but a failure here would be surprising
-            assertEquals(TEST_MESSAGE.length() - 2, in.available());
-            //read the remaining data
-            in.readAllBytes();
-            //available should return 0
-            assertEquals(ZERO, in.available());
+            // Send a httpRequest and assert the bytes available
+            HttpResponse<InputStream> response = client.send(request,
+                    HttpResponse.BodyHandlers.ofInputStream());
+            try (InputStream in = response.body()) {
+                in.readNBytes(2);
+                // this is not guaranteed, but a failure here would be surprising
+                assertEquals(TEST_MESSAGE.length() - 2, in.available());
+                //read the remaining data
+                in.readAllBytes();
+                //available should return 0
+                assertEquals(ZERO, in.available());
+            }
         }
     }
 
     @Test
     public void test1() throws Exception {
-        HttpClient client = HttpClient
+        try (HttpClient client = HttpClient
                 .newBuilder()
                 .proxy(HttpClient.Builder.NO_PROXY)
-                .build();
+                .build()) {
 
-        URI uri = URIBuilder.newBuilder()
-                .scheme("http")
-                .loopback()
-                .port(port)
-                .path("/ZeroResponse/")
-                .build();
+            URI uri = URIBuilder.newBuilder()
+                    .scheme("http")
+                    .loopback()
+                    .port(port)
+                    .path("/ZeroResponse/")
+                    .build();
 
-        HttpRequest request = HttpRequest
-                .newBuilder(uri)
-                .GET()
-                .build();
+            HttpRequest request = HttpRequest
+                    .newBuilder(uri)
+                    .GET()
+                    .build();
 
-        // Send a httpRequest and assert the bytes available
-        HttpResponse<InputStream> response = client.send(request,
-                HttpResponse.BodyHandlers.ofInputStream());
-        try ( InputStream in = response.body()) {
-            assertEquals(ZERO, in.available());
-            in.readAllBytes();
-            assertEquals(ZERO, in.available());
+            // Send a httpRequest and assert the bytes available
+            HttpResponse<InputStream> response = client.send(request,
+                    HttpResponse.BodyHandlers.ofInputStream());
+            try (InputStream in = response.body()) {
+                assertEquals(ZERO, in.available());
+                in.readAllBytes();
+                assertEquals(ZERO, in.available());
+            }
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/HttpRedirectTest.java b/test/jdk/java/net/httpclient/HttpRedirectTest.java
index e03a12a049c..2bf90bbe02c 100644
--- a/test/jdk/java/net/httpclient/HttpRedirectTest.java
+++ b/test/jdk/java/net/httpclient/HttpRedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,13 @@
 import com.sun.net.httpserver.HttpsServer;
 import jdk.httpclient.test.lib.common.TestServerConfigurator;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -63,7 +60,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
-/**
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/*
  * @test
  * @bug 8232625
  * @summary This test verifies that the HttpClient works correctly when redirecting a post request.
@@ -71,7 +73,7 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
  * @build jdk.test.lib.net.SimpleSSLContext DigestEchoServer HttpRedirectTest
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm -Dtest.requiresHost=true
+ * @run junit/othervm -Dtest.requiresHost=true
  *                   -Djdk.httpclient.HttpClient.log=headers
  *                   -Djdk.internal.httpclient.debug=false
  *                   HttpRedirectTest
@@ -85,33 +87,30 @@ public class HttpRedirectTest implements HttpServerAdapters {
         SSLContext.setDefault(context);
     }
 
-    final AtomicLong requestCounter = new AtomicLong();
-    final AtomicLong responseCounter = new AtomicLong();
-    HttpTestServer http1Server;
-    HttpTestServer http2Server;
-    HttpTestServer https1Server;
-    HttpTestServer https2Server;
-    HttpTestServer http3Server;
-    DigestEchoServer.TunnelingProxy proxy;
+    static final AtomicLong requestCounter = new AtomicLong();
+    private static HttpTestServer http1Server;
+    private static HttpTestServer http2Server;
+    private static HttpTestServer https1Server;
+    private static HttpTestServer https2Server;
+    private static HttpTestServer http3Server;
+    private static DigestEchoServer.TunnelingProxy proxy;
 
-    URI http1URI;
-    URI https1URI;
-    URI http2URI;
-    URI https2URI;
-    URI http3URI;
-    InetSocketAddress proxyAddress;
-    ProxySelector proxySelector;
-    HttpClient client;
-    List<CompletableFuture<?>>  futures = new CopyOnWriteArrayList<>();
-    Set<URI> pending = new CopyOnWriteArraySet<>();
+    private static URI http1URI;
+    private static URI https1URI;
+    private static URI http2URI;
+    private static URI https2URI;
+    private static URI http3URI;
+    private static InetSocketAddress proxyAddress;
+    private static ProxySelector proxySelector;
+    private static HttpClient client;
 
-    final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10,
+    static final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10,
             TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Shared by HTTP/1.1 servers
-    final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1,
+    static final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1,
             TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Used by the client
 
-    public HttpClient newHttpClient(ProxySelector ps) {
-        HttpClient.Builder builder = newClientBuilderForH3()
+    public static HttpClient newHttpClient(ProxySelector ps) {
+        HttpClient.Builder builder = HttpServerAdapters.createClientBuilderForH3()
                 .sslContext(context)
                 .executor(clientexec)
                 .followRedirects(HttpClient.Redirect.ALWAYS)
@@ -119,8 +118,7 @@ public class HttpRedirectTest implements HttpServerAdapters {
         return builder.build();
     }
 
-    @DataProvider(name="uris")
-    Object[][] testURIs() throws URISyntaxException {
+    static Object[][] testURIs() {
         List<URI> uris = List.of(
                 http3URI.resolve("direct/orig/"),
                 http1URI.resolve("direct/orig/"),
@@ -144,12 +142,11 @@ public class HttpRedirectTest implements HttpServerAdapters {
         );
         Object[][] tests = new Object[redirects.size() * uris.size()][3];
         int count = 0;
-        for (int i=0; i < uris.size(); i++) {
-            URI u = uris.get(i);
-            for (int j=0; j < redirects.size() ; j++) {
-                int code = redirects.get(j).getKey();
-                String m = redirects.get(j).getValue();
-                tests[count][0] = u.resolve(code +"/");
+        for (URI u : uris) {
+            for (Map.Entry<Integer, String> redirect : redirects) {
+                int code = redirect.getKey();
+                String m = redirect.getValue();
+                tests[count][0] = u.resolve(code + "/");
                 tests[count][1] = code;
                 tests[count][2] = m;
                 count++;
@@ -158,8 +155,8 @@ public class HttpRedirectTest implements HttpServerAdapters {
         return tests;
     }
 
-    @BeforeClass
-    public void setUp() throws Exception {
+    @BeforeAll
+    public static void setUp() throws Exception {
         try {
             InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
@@ -208,10 +205,8 @@ public class HttpRedirectTest implements HttpServerAdapters {
             proxySelector = new HttpProxySelector(proxyAddress);
             client = newHttpClient(proxySelector);
             System.out.println("Setup: done");
-        } catch (Exception x) {
+        } catch (Exception | Error x) {
             tearDown(); throw x;
-        } catch (Error e) {
-            tearDown(); throw e;
         }
     }
 
@@ -222,19 +217,19 @@ public class HttpRedirectTest implements HttpServerAdapters {
                 client.sendAsync(request, HttpResponse.BodyHandlers.ofString());
         HttpResponse<String> resp = respCf.join();
         if (method.equals("DO_NOT_FOLLOW")) {
-            assertEquals(resp.statusCode(), code, u + ": status code");
+            assertEquals(code, resp.statusCode(), u + ": status code");
         } else {
-            assertEquals(resp.statusCode(), 200, u + ": status code");
+            assertEquals(200, resp.statusCode(), u + ": status code");
         }
         if (method.equals("POST")) {
-            assertEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertEquals(REQUEST_BODY, resp.body(), u + ": body");
         } else if (code == 304) {
-            assertEquals(resp.body(), "", u + ": body");
+            assertEquals("", resp.body(), u + ": body");
         } else if (method.equals("DO_NOT_FOLLOW")) {
-            assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body");
-            assertNotEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertNotEquals(GET_RESPONSE_BODY, resp.body(), u + ": body");
+            assertNotEquals(REQUEST_BODY, resp.body(), u + ": body");
         } else {
-            assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body");
+            assertEquals(GET_RESPONSE_BODY, resp.body(), u + ": body");
         }
     }
 
@@ -244,21 +239,21 @@ public class HttpRedirectTest implements HttpServerAdapters {
                 client.sendAsync(request, HttpResponse.BodyHandlers.ofString());
         HttpResponse<String> resp = respCf.join();
         if (method.equals("DO_NOT_FOLLOW")) {
-            assertEquals(resp.statusCode(), code, u + ": status code");
+            assertEquals(code, resp.statusCode(), u + ": status code");
         } else {
-            assertEquals(resp.statusCode(), 200, u + ": status code");
+            assertEquals(200, resp.statusCode(), u + ": status code");
         }
         if (method.equals("POST")) {
-            assertEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertEquals(REQUEST_BODY, resp.body(), u + ": body");
         } else if (code == 304) {
-            assertEquals(resp.body(), "", u + ": body");
+            assertEquals("", resp.body(), u + ": body");
         } else if (method.equals("DO_NOT_FOLLOW")) {
-            assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body");
-            assertNotEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertNotEquals(GET_RESPONSE_BODY, resp.body(), u + ": body");
+            assertNotEquals(REQUEST_BODY, resp.body(), u + ": body");
         } else if (code == 303) {
-            assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body");
+            assertEquals(GET_RESPONSE_BODY, resp.body(), u + ": body");
         } else {
-            assertEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertEquals(REQUEST_BODY, resp.body(), u + ": body");
         }
     }
 
@@ -270,7 +265,8 @@ public class HttpRedirectTest implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("testURIs")
     public void testPOST(URI uri, int code, String method) throws Exception {
         URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet());
         HttpRequest request = newRequestBuilder(u)
@@ -279,7 +275,8 @@ public class HttpRedirectTest implements HttpServerAdapters {
         testNonIdempotent(u, request, code, method);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("testURIs")
     public void testPUT(URI uri, int code, String method) throws Exception {
         URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet());
         System.out.println("Testing with " + u);
@@ -289,7 +286,8 @@ public class HttpRedirectTest implements HttpServerAdapters {
         testIdempotent(u, request, code, method);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("testURIs")
     public void testFoo(URI uri, int code, String method) throws Exception {
         URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet());
         System.out.println("Testing with " + u);
@@ -300,7 +298,8 @@ public class HttpRedirectTest implements HttpServerAdapters {
         testIdempotent(u, request, code, method);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("testURIs")
     public void testGet(URI uri, int code, String method) throws Exception {
         URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet());
         System.out.println("Testing with " + u);
@@ -312,24 +311,24 @@ public class HttpRedirectTest implements HttpServerAdapters {
         HttpResponse<String> resp = respCf.join();
         // body will be preserved except for 304 and 303: this is a GET.
         if (method.equals("DO_NOT_FOLLOW")) {
-            assertEquals(resp.statusCode(), code, u + ": status code");
+            assertEquals(code, resp.statusCode(), u + ": status code");
         } else {
-            assertEquals(resp.statusCode(), 200, u + ": status code");
+            assertEquals(200, resp.statusCode(), u + ": status code");
         }
         if (code == 304) {
-            assertEquals(resp.body(), "", u + ": body");
+            assertEquals("", resp.body(), u + ": body");
         } else if (method.equals("DO_NOT_FOLLOW")) {
-            assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body");
-            assertNotEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertNotEquals(GET_RESPONSE_BODY, resp.body(), u + ": body");
+            assertNotEquals(REQUEST_BODY, resp.body(), u + ": body");
         } else if (code == 303) {
-            assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body");
+            assertEquals(GET_RESPONSE_BODY, resp.body(), u + ": body");
         } else {
-            assertEquals(resp.body(), REQUEST_BODY, u + ": body");
+            assertEquals(REQUEST_BODY, resp.body(), u + ": body");
         }
     }
 
-    @AfterClass
-    public void tearDown() {
+    @AfterAll
+    public static void tearDown() {
         proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop);
         http1Server = stop(http1Server, HttpTestServer::stop);
         https1Server = stop(https1Server, HttpTestServer::stop);
@@ -355,7 +354,7 @@ public class HttpRedirectTest implements HttpServerAdapters {
     private interface Stoppable<T> { public void stop(T service) throws Exception; }
 
     static <T>  T stop(T service, Stoppable<T> stop) {
-        try { if (service != null) stop.stop(service); } catch (Throwable x) { };
+        try { if (service != null) stop.stop(service); } catch (Throwable x) { }
         return null;
     }
 
diff --git a/test/jdk/java/net/httpclient/HttpRequestNewBuilderTest.java b/test/jdk/java/net/httpclient/HttpRequestNewBuilderTest.java
index d7598ede3be..19afbfbd99b 100644
--- a/test/jdk/java/net/httpclient/HttpRequestNewBuilderTest.java
+++ b/test/jdk/java/net/httpclient/HttpRequestNewBuilderTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -44,19 +44,21 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
+/*
 * @test
 * @bug 8252304 8276559
 * @summary HttpRequest.newBuilder(HttpRequest) API and behaviour checks
-* @run testng/othervm HttpRequestNewBuilderTest
+* @run junit/othervm HttpRequestNewBuilderTest
 */
 public class HttpRequestNewBuilderTest {
     static final Class<NullPointerException> NPE = NullPointerException.class;
@@ -64,21 +66,19 @@ public class HttpRequestNewBuilderTest {
 
     record NamedAssertion(String name, BiConsumer<HttpRequest, HttpRequest> test) { }
 
-    List<NamedAssertion> REQUEST_ASSERTIONS = List.of(
-            new NamedAssertion("uri", (r1, r2) -> assertEquals(r1.uri(), r2.uri())),
-            new NamedAssertion("timeout", (r1, r2) -> assertEquals(r1.timeout(), r2.timeout())),
-            new NamedAssertion("version", (r1, r2) -> assertEquals(r1.version(), r2.version())),
-            new NamedAssertion("headers", (r1, r2) -> assertEquals(r1.headers(), r2.headers())),
-            new NamedAssertion("options", (r1, r2) -> assertEquals(r1.getOption(H3_DISCOVERY), r2.getOption(H3_DISCOVERY))),
-            new NamedAssertion("expectContinue", (r1, r2) -> assertEquals(r1.expectContinue(), r2.expectContinue())),
+    static List<NamedAssertion> REQUEST_ASSERTIONS = List.of(new NamedAssertion("uri", (r1, r2) -> assertEquals(r2.uri(), r1.uri())),
+            new NamedAssertion("timeout", (r1, r2) -> assertEquals(r2.timeout(), r1.timeout())),
+            new NamedAssertion("version", (r1, r2) -> assertEquals(r2.version(), r1.version())),
+            new NamedAssertion("headers", (r1, r2) -> assertEquals(r2.headers(), r1.headers())),
+            new NamedAssertion("options", (r1, r2) -> assertEquals(r2.getOption(H3_DISCOVERY), r1.getOption(H3_DISCOVERY))),
+            new NamedAssertion("expectContinue", (r1, r2) -> assertEquals(r2.expectContinue(), r1.expectContinue())),
             new NamedAssertion("method", (r1, r2) -> {
-                assertEquals(r1.method(), r2.method());
+                assertEquals(r2.method(), r1.method());
                 assertBodyPublisherEqual(r1, r2);
             })
     );
 
-    @DataProvider(name = "testRequests")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { HttpRequest.newBuilder(URI.create("https://uri-1/")).build() },
                 { HttpRequest.newBuilder(URI.create("https://version-1/")).version(HTTP_1_1).build() },
@@ -152,14 +152,14 @@ public class HttpRequestNewBuilderTest {
     }
 
     // test methods
-    void assertBodyPublisherEqual(HttpRequest r1, HttpRequest r2) {
+    static void assertBodyPublisherEqual(HttpRequest r1, HttpRequest r2) {
         if (r1.bodyPublisher().isPresent()) {
             assertTrue(r2.bodyPublisher().isPresent());
             var bp1 = r1.bodyPublisher().get();
             var bp2 = r2.bodyPublisher().get();
 
-            assertEquals(bp1.getClass(), bp2.getClass());
-            assertEquals(bp1.contentLength(), bp2.contentLength());
+            assertEquals(bp2.getClass(), bp1.getClass());
+            assertEquals(bp2.contentLength(), bp1.contentLength());
 
             final class TestSubscriber implements Flow.Subscriber<ByteBuffer> {
                 final BodySubscriber<String> s;
@@ -181,7 +181,7 @@ public class HttpRequestNewBuilderTest {
             bp2.subscribe(new TestSubscriber(bs2));
             var b2 = bs2.getBody().toCompletableFuture().join().getBytes();
 
-            assertEquals(b1, b2);
+            Assertions.assertArrayEquals(b2, b1);
         } else {
             assertFalse(r2.bodyPublisher().isPresent());
         }
@@ -199,9 +199,9 @@ public class HttpRequestNewBuilderTest {
         var r = HttpRequest.newBuilder(request, (n, v) -> true)
                 .method(methodName, HttpRequest.BodyPublishers.ofString("testData"))
                 .build();
-        assertEquals(r.method(), methodName);
+        assertEquals(methodName, r.method());
         assertTrue(r.bodyPublisher().isPresent());
-        assertEquals(r.bodyPublisher().get().contentLength(), 8);
+        assertEquals(8, r.bodyPublisher().get().contentLength());
         assertAllOtherElementsEqual(r, request, "method");
 
         // method w/o body
@@ -209,9 +209,9 @@ public class HttpRequestNewBuilderTest {
         var r1 = HttpRequest.newBuilder(request, (n, v) -> true)
                 .method(methodName, noBodyPublisher)
                 .build();
-        assertEquals(r1.method(), methodName);
+        assertEquals(methodName, r1.method());
         assertTrue(r1.bodyPublisher().isPresent());
-        assertEquals(r1.bodyPublisher().get(), noBodyPublisher);
+        assertEquals(noBodyPublisher, r1.bodyPublisher().get());
         assertAllOtherElementsEqual(r1, request, "method");
     }
 
@@ -223,113 +223,125 @@ public class HttpRequestNewBuilderTest {
         assertThrows(NPE, () -> HttpRequest.newBuilder(null, null));
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testBuilder(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true).build();
-        assertEquals(r, request);
+        assertEquals(request, r);
         assertAllOtherElementsEqual(r, request);
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testURI(HttpRequest request) {
         URI newURI = URI.create("http://www.newURI.com/");
         var r = HttpRequest.newBuilder(request, (n, v) -> true).uri(newURI).build();
 
-        assertEquals(r.uri(), newURI);
+        assertEquals(newURI, r.uri());
         assertAllOtherElementsEqual(r, request, "uri");
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testTimeout(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true).timeout(Duration.ofSeconds(2)).build();
 
-        assertEquals(r.timeout().get().getSeconds(), 2);
+        assertEquals(2, r.timeout().get().getSeconds());
         assertAllOtherElementsEqual(r, request, "timeout");
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testVersion(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true).version(HTTP_1_1).build();
 
-        assertEquals(r.version().get(), HTTP_1_1);
+        assertEquals(HTTP_1_1, r.version().get());
         assertAllOtherElementsEqual(r, request, "version");
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testGET(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true)
                 .GET()
                 .build();
-        assertEquals(r.method(), "GET");
+        assertEquals("GET", r.method());
         assertTrue(r.bodyPublisher().isEmpty());
         assertAllOtherElementsEqual(r, request, "method");
 
         testBodyPublisher("GET", request);
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testDELETE(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true)
                 .DELETE()
                 .build();
-        assertEquals(r.method(), "DELETE");
+        assertEquals("DELETE", r.method());
         assertTrue(r.bodyPublisher().isEmpty());
         assertAllOtherElementsEqual(r, request, "method");
 
         testBodyPublisher("DELETE", request);
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testPOST(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true)
                 .POST(HttpRequest.BodyPublishers.ofString("testData"))
                 .build();
-        assertEquals(r.method(), "POST");
+        assertEquals("POST", r.method());
         assertTrue(r.bodyPublisher().isPresent());
-        assertEquals(r.bodyPublisher().get().contentLength(), 8);
+        assertEquals(8, r.bodyPublisher().get().contentLength());
         assertAllOtherElementsEqual(r, request, "method");
 
         testBodyPublisher("POST", request);
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testPUT(HttpRequest request) {
         var r = HttpRequest.newBuilder(request, (n, v) -> true)
                 .PUT(HttpRequest.BodyPublishers.ofString("testData"))
                 .build();
-        assertEquals(r.method(), "PUT");
+        assertEquals("PUT", r.method());
         assertTrue(r.bodyPublisher().isPresent());
-        assertEquals(r.bodyPublisher().get().contentLength(), 8);
+        assertEquals(8, r.bodyPublisher().get().contentLength());
         assertAllOtherElementsEqual(r, request, "method");
 
         testBodyPublisher("PUT", request);
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testUserDefinedMethod(HttpRequest request) {
         testBodyPublisher("TEST", request);
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAddHeader(HttpRequest request) {
         BiPredicate<String, String> filter = (n, v) -> true;
 
         var r = HttpRequest.newBuilder(request, filter).headers("newName", "newValue").build();
-        assertEquals(r.headers().firstValue("newName").get(), "newValue");
-        assertEquals(r.headers().allValues("newName").size(), 1);
+        assertEquals("newValue", r.headers().firstValue("newName").get());
+        assertEquals(1, r.headers().allValues("newName").size());
         assertAllOtherElementsEqual(r, request, "headers");
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testSetOption(HttpRequest request) {
         BiPredicate<String, String> filter = (n, v) -> true;
 
         var r = HttpRequest.newBuilder(request, filter).setOption(H3_DISCOVERY, ALT_SVC).build();
-        assertEquals(r.getOption(H3_DISCOVERY).get(), ALT_SVC);
+        assertEquals(ALT_SVC, r.getOption(H3_DISCOVERY).get());
         assertAllOtherElementsEqual(r, request, "options");
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testRemoveHeader(HttpRequest request) {
         if(!request.headers().map().isEmpty()) {
             assertTrue(request.headers().map().containsKey("testName1"));
@@ -338,13 +350,14 @@ public class HttpRequestNewBuilderTest {
 
         var r = HttpRequest.newBuilder(request, filter).build();
         assertFalse(r.headers().map().containsKey("testName1"));
-        assertEquals(r.headers().map(), HttpHeaders.of(request.headers().map(), filter).map());
+        assertEquals(HttpHeaders.of(request.headers().map(), filter).map(), r.headers().map());
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testRemoveOption(HttpRequest request) {
         if(!request.getOption(H3_DISCOVERY).isEmpty()) {
-            assertEquals(request.getOption(H3_DISCOVERY).get(), ANY);
+            assertEquals(ANY, request.getOption(H3_DISCOVERY).get());
         }
 
         var r = HttpRequest.newBuilder(request, (a, b) -> true)
@@ -353,7 +366,8 @@ public class HttpRequestNewBuilderTest {
         assertAllOtherElementsEqual(r, request, "options");
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testRemoveSingleHeaderValue(HttpRequest request) {
         if(!request.headers().map().isEmpty()) {
             assertTrue(request.headers().allValues("testName1").contains("testValue1"));
@@ -363,10 +377,12 @@ public class HttpRequestNewBuilderTest {
 
         var r = HttpRequest.newBuilder(request, filter).build();
         assertFalse(r.headers().map().containsValue("testValue1"));
-        assertEquals(r.headers().map(), HttpHeaders.of(request.headers().map(), filter).map());
+        assertFalse(r.headers().allValues("testName1").contains("testValue1"));
+        assertEquals(HttpHeaders.of(request.headers().map(), filter).map(), r.headers().map());
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testRemoveMultipleHeaders(HttpRequest request) {
         BiPredicate<String, String> isTestName1Value1 = (n ,v) ->
                 n.equalsIgnoreCase("testName1") && v.equals("testValue1");
@@ -375,34 +391,36 @@ public class HttpRequestNewBuilderTest {
         var filter = (isTestName1Value1.or(isTestName2Value2)).negate();
 
         var r = HttpRequest.newBuilder(request, filter).build();
-        assertEquals(r.headers().map(), HttpHeaders.of(request.headers().map(), filter).map());
+        assertEquals(HttpHeaders.of(request.headers().map(), filter).map(), r.headers().map());
 
         BiPredicate<String, String> filter1 = (n, v) ->
                 !(n.equalsIgnoreCase("testName1") && (v.equals("testValue1") || v.equals("testValue2")));
 
         var r1 = HttpRequest.newBuilder(request, filter1).build();
-        assertEquals(r1.headers().map(), HttpHeaders.of(request.headers().map(), filter1).map());
+        assertEquals(HttpHeaders.of(request.headers().map(), filter1).map(), r1.headers().map());
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testRemoveAllHeaders(HttpRequest request) {
         if (!request.headers().map().isEmpty()) {
             BiPredicate<String, String> filter = (n, v) -> false;
 
             var r = HttpRequest.newBuilder(request, filter).build();
             assertTrue(r.headers().map().isEmpty());
-            assertEquals(r.headers().map(), HttpHeaders.of(request.headers().map(), filter).map());
+            assertEquals(HttpHeaders.of(request.headers().map(), filter).map(), r.headers().map());
         }
     }
 
-    @Test(dataProvider = "testRequests")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testRetainAllHeaders(HttpRequest request) {
         if (!request.headers().map().isEmpty()) {
             BiPredicate<String, String> filter = (n, v) -> true;
 
             var r = HttpRequest.newBuilder(request, filter).build();
             assertFalse(r.headers().map().isEmpty());
-            assertEquals(r.headers().map(), HttpHeaders.of(request.headers().map(), filter).map());
+            assertEquals(HttpHeaders.of(request.headers().map(), filter).map(), r.headers().map());
         }
     }
 
@@ -414,7 +432,7 @@ public class HttpRequestNewBuilderTest {
         BiPredicate<String, String> filter = (n, v) -> !n.equalsIgnoreCase("Foo-Bar");
         var r = HttpRequest.newBuilder(request, filter).build();
         assertFalse(r.headers().map().containsKey("Foo-Bar"));
-        assertEquals(r.headers().map(), HttpHeaders.of(request.headers().map(), filter).map());
+        assertEquals(HttpHeaders.of(request.headers().map(), filter).map(), r.headers().map());
     }
 
     @Test
diff --git a/test/jdk/java/net/httpclient/HttpResponseInputStreamInterruptTest.java b/test/jdk/java/net/httpclient/HttpResponseInputStreamInterruptTest.java
index 6468175ab59..3b955b8feb7 100644
--- a/test/jdk/java/net/httpclient/HttpResponseInputStreamInterruptTest.java
+++ b/test/jdk/java/net/httpclient/HttpResponseInputStreamInterruptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@ import jdk.test.lib.net.URIBuilder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,18 +52,17 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class HttpResponseInputStreamInterruptTest {
 
-    HttpServer server;
-    int port;
-    private final CountDownLatch interruptReadyLatch = new CountDownLatch(2);
-    private final CountDownLatch interruptDoneLatch = new CountDownLatch(1);
+    private static HttpServer server;
+    private static int port;
+    private static final CountDownLatch interruptReadyLatch = new CountDownLatch(2);
+    private static final CountDownLatch interruptDoneLatch = new CountDownLatch(1);
     static final String FIRST_MESSAGE = "Should be received";
     static final String SECOND_MESSAGE = "Shouldn't be received";
 
     @BeforeAll
-    void before() throws Exception {
+    static void before() throws Exception {
         InetAddress loopback = InetAddress.getLoopbackAddress();
         InetSocketAddress addr = new InetSocketAddress(loopback, 0);
         server = HttpServer.create(addr, 0);
@@ -75,7 +73,7 @@ public class HttpResponseInputStreamInterruptTest {
     }
 
     @AfterAll
-    void after() throws Exception {
+    static void after() throws Exception {
         server.stop(0);
     }
 
diff --git a/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java b/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
index 2249839e8bb..633c6877716 100644
--- a/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
+++ b/test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,15 +38,14 @@ import java.util.concurrent.Flow;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
  * @bug 8197564 8228970
  * @summary Simple smoke test for BodySubscriber.asInputStream();
- * @run testng/othervm HttpResponseInputStreamTest
+ * @run junit/othervm HttpResponseInputStreamTest
  * @author daniel fuchs
  */
 public class HttpResponseInputStreamTest {
@@ -56,7 +55,7 @@ public class HttpResponseInputStreamTest {
     static class TestException extends IOException {}
 
     public static void main(String[] args) throws InterruptedException, ExecutionException {
-        testOnError();
+        new HttpResponseInputStreamTest().testOnError();
     }
 
     /**
@@ -66,7 +65,7 @@ public class HttpResponseInputStreamTest {
      * @throws ExecutionException
      */
     @Test
-    public static void testOnError() throws InterruptedException, ExecutionException {
+    public void testOnError() throws InterruptedException, ExecutionException {
         CountDownLatch latch = new CountDownLatch(1);
         BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
         ErrorTestSubscription s = new ErrorTestSubscription(isb);
@@ -160,7 +159,7 @@ public class HttpResponseInputStreamTest {
     }
 
     @Test
-    public static void testCloseAndSubscribe()
+    public void testCloseAndSubscribe()
             throws InterruptedException, ExecutionException
     {
         BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
@@ -189,34 +188,34 @@ public class HttpResponseInputStreamTest {
     }
 
     @Test
-    public static void testReadParameters() throws InterruptedException, ExecutionException, IOException {
+    public void testReadParameters() throws InterruptedException, ExecutionException, IOException {
         BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
         InputStream is = isb.getBody().toCompletableFuture().get();
 
         Throwable ex;
 
         // len == 0
-        assertEquals(is.read(new byte[16], 0, 0), 0);
-        assertEquals(is.read(new byte[16], 16, 0), 0);
+        assertEquals(0, is.read(new byte[16], 0, 0));
+        assertEquals(0, is.read(new byte[16], 16, 0));
 
         // index == -1
-        ex = expectThrows(OOB, () -> is.read(new byte[16], -1, 10));
+        ex = assertThrows(OOB, () -> is.read(new byte[16], -1, 10));
         System.out.println("OutOfBoundsException thrown as expected: " + ex);
 
         // large offset
-        ex = expectThrows(OOB, () -> is.read(new byte[16], 17, 10));
+        ex = assertThrows(OOB, () -> is.read(new byte[16], 17, 10));
         System.out.println("OutOfBoundsException thrown as expected: " + ex);
 
-        ex = expectThrows(OOB, () -> is.read(new byte[16], 10, 10));
+        ex = assertThrows(OOB, () -> is.read(new byte[16], 10, 10));
         System.out.println("OutOfBoundsException thrown as expected: " + ex);
 
         // null value
-        ex = expectThrows(NPE, () -> is.read(null, 0, 10));
+        ex = assertThrows(NPE, () -> is.read(null, 0, 10));
         System.out.println("NullPointerException thrown as expected: " + ex);
     }
 
     @Test
-    public static void testSubscribeAndClose()
+    public void testSubscribeAndClose()
             throws InterruptedException, ExecutionException
     {
         BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
diff --git a/test/jdk/java/net/httpclient/HttpVersionsTest.java b/test/jdk/java/net/httpclient/HttpVersionsTest.java
index a55c2727a00..f047e2902e8 100644
--- a/test/jdk/java/net/httpclient/HttpVersionsTest.java
+++ b/test/jdk/java/net/httpclient/HttpVersionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.Platform
- * @run testng/othervm HttpVersionsTest
+ * @run junit/othervm HttpVersionsTest
  */
 
 import java.io.IOException;
@@ -42,30 +42,30 @@ import java.net.http.HttpResponse;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import javax.net.ssl.SSLContext;
-import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.String.format;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class HttpVersionsTest {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    Http2TestServer http2TestServer;
-    Http2TestServer https2TestServer;
-    String http2URI;
-    String https2URI;
+    static Http2TestServer http2TestServer;
+    static Http2TestServer https2TestServer;
+    static String http2URI;
+    static String https2URI;
 
     static final int ITERATIONS = 3;
     static final String[] BODY = new String[] {
@@ -74,10 +74,9 @@ public class HttpVersionsTest {
             "I think I'll drink until I stink",
             "I'll drink until I cannot blink"
     };
-    int nextBodyId;
+    static int nextBodyId;
 
-    @DataProvider(name = "scenarios")
-    public Object[][] scenarios() {
+    public static Object[][] scenarios() {
         return new Object[][] {
                 { http2URI,  true  },
                 { https2URI, true  },
@@ -87,9 +86,10 @@ public class HttpVersionsTest {
     }
 
     /** Checks that an HTTP/2 request receives an HTTP/2 response. */
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     void testHttp2Get(String uri, boolean sameClient) throws Exception {
-        out.println(format("\n--- testHttp2Get uri:%s, sameClient:%s", uri, sameClient));
+        out.printf("\n--- testHttp2Get uri:%s, sameClient:%s%n", uri, sameClient);
         HttpClient client = null;
         for (int i=0; i<ITERATIONS; i++) {
             if (!sameClient || client == null)
@@ -104,17 +104,18 @@ public class HttpVersionsTest {
             out.println("Got response: " + response);
             out.println("Got body: " + response.body());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), HTTP_2);
-            assertEquals(response.body(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals(HTTP_2, response.version());
+            assertEquals("", response.body());
             if (uri.startsWith("https"))
                 assertTrue(response.sslSession().isPresent());
         }
     }
 
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     void testHttp2Post(String uri, boolean sameClient) throws Exception {
-        out.println(format("\n--- testHttp2Post uri:%s, sameClient:%s", uri, sameClient));
+        out.printf("\n--- testHttp2Post uri:%s, sameClient:%s%n", uri, sameClient);
         HttpClient client = null;
         for (int i=0; i<ITERATIONS; i++) {
             if (!sameClient || client == null)
@@ -131,18 +132,19 @@ public class HttpVersionsTest {
             out.println("Got response: " + response);
             out.println("Got body: " + response.body());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), HTTP_2);
-            assertEquals(response.body(), msg);
+            assertEquals(200, response.statusCode());
+            assertEquals(HTTP_2, response.version());
+            assertEquals(msg, response.body());
             if (uri.startsWith("https"))
                 assertTrue(response.sslSession().isPresent());
         }
     }
 
     /** Checks that an HTTP/1.1 request receives an HTTP/1.1 response, from the HTTP/2 server. */
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     void testHttp1dot1Get(String uri, boolean sameClient) throws Exception {
-        out.println(format("\n--- testHttp1dot1Get uri:%s, sameClient:%s", uri, sameClient));
+        out.printf("\n--- testHttp1dot1Get uri:%s, sameClient:%s%n", uri, sameClient);
         HttpClient client = null;
         for (int i=0; i<ITERATIONS; i++) {
             if (!sameClient || client == null)
@@ -158,20 +160,20 @@ public class HttpVersionsTest {
             out.println("Got body: " + response.body());
             response.headers().firstValue("X-Received-Body").ifPresent(s -> out.println("X-Received-Body:" + s));
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), HTTP_1_1);
-            assertEquals(response.body(), "");
-            assertEquals(response.headers().firstValue("X-Magic").get(),
-                         "HTTP/1.1 request received by HTTP/2 server");
-            assertEquals(response.headers().firstValue("X-Received-Body").get(), "");
+            assertEquals(200, response.statusCode());
+            assertEquals(HTTP_1_1, response.version());
+            assertEquals("", response.body());
+            assertEquals("HTTP/1.1 request received by HTTP/2 server", response.headers().firstValue("X-Magic").get());
+            assertEquals("", response.headers().firstValue("X-Received-Body").get());
             if (uri.startsWith("https"))
                 assertTrue(response.sslSession().isPresent());
         }
     }
 
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     void testHttp1dot1Post(String uri, boolean sameClient) throws Exception {
-        out.println(format("\n--- testHttp1dot1Post uri:%s, sameClient:%s", uri, sameClient));
+        out.printf("\n--- testHttp1dot1Post uri:%s, sameClient:%s%n", uri, sameClient);
         HttpClient client = null;
         for (int i=0; i<ITERATIONS; i++) {
             if (!sameClient || client == null)
@@ -188,12 +190,11 @@ public class HttpVersionsTest {
             out.println("Got body: " + response.body());
             response.headers().firstValue("X-Received-Body").ifPresent(s -> out.println("X-Received-Body:" + s));
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.version(), HTTP_1_1);
-            assertEquals(response.body(), "");
-            assertEquals(response.headers().firstValue("X-Magic").get(),
-                         "HTTP/1.1 request received by HTTP/2 server");
-            assertEquals(response.headers().firstValue("X-Received-Body").get(), msg);
+            assertEquals(200, response.statusCode());
+            assertEquals(HTTP_1_1, response.version());
+            assertEquals("", response.body());
+            assertEquals("HTTP/1.1 request received by HTTP/2 server", response.headers().firstValue("X-Magic").get());
+            assertEquals(msg, response.headers().firstValue("X-Received-Body").get());
             if (uri.startsWith("https"))
                 assertTrue(response.sslSession().isPresent());
         }
@@ -203,8 +204,8 @@ public class HttpVersionsTest {
 
     static final ExecutorService executor = Executors.newCachedThreadPool();
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         http2TestServer =  new Http2TestServer("localhost", false, 0, executor, 50, null, null, true);
         http2TestServer.addHandler(new Http2VerEchoHandler(), "/http2/vts");
         http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/vts";
@@ -217,8 +218,8 @@ public class HttpVersionsTest {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         http2TestServer.stop();
         https2TestServer.stop();
         executor.shutdown();
diff --git a/test/jdk/java/net/httpclient/ISO_8859_1_Test.java b/test/jdk/java/net/httpclient/ISO_8859_1_Test.java
index d629a6f3105..103284c9d54 100644
--- a/test/jdk/java/net/httpclient/ISO_8859_1_Test.java
+++ b/test/jdk/java/net/httpclient/ISO_8859_1_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
  *       ReferenceTracker
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     ISO_8859_1_Test
  * @summary Tests that a client is able to receive ISO-8859-1 encoded header values.
@@ -48,7 +48,6 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -60,21 +59,11 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
@@ -82,30 +71,38 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ISO_8859_1_Test implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    DummyServer http1DummyServer;
-    HttpTestServer http1TestServer;   // HTTP/1.1 ( http )
-    HttpTestServer https1TestServer;  // HTTPS/1.1 ( https  )
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String http1Dummy;
-    String http1URI;
-    String https1URI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static DummyServer http1DummyServer;
+    private static HttpTestServer http1TestServer;   // HTTP/1.1 ( http )
+    private static HttpTestServer https1TestServer;  // HTTPS/1.1 ( https  )
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String http1Dummy;
+    private static String http1URI;
+    private static String https1URI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    static final int RESPONSE_CODE = 200;
     static final int ITERATION_COUNT = 4;
-    static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
-    static final Class<CompletionException> CE = CompletionException.class;
     // a shared executor helps reduce the amount of threads created by the test
     static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
     static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
@@ -121,8 +118,8 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -148,40 +145,40 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
-            var failed = context.getFailedTests().getAllResults().stream()
-                    .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-            FAILURES.putAll(failed);
-
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
             if (FAILURES.isEmpty()) return;
@@ -199,7 +196,7 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 http3URI,
                 http1Dummy,
@@ -210,13 +207,7 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         };
     }
 
-    static AtomicLong URICOUNT = new AtomicLong();
-
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -265,7 +256,7 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         }
     }
 
-    private static final Exception completionCause(CompletionException x) {
+    private static Exception completionCause(CompletionException x) {
         Throwable c = x;
         while (c  instanceof CompletionException
                 || c instanceof ExecutionException) {
@@ -285,10 +276,11 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(String uri, boolean sameClient) throws Exception {
-        checkSkip();
-        System.out.println("Request to " + uri);
+
+        System.out.printf("%n%s-- test sameClient=%s uri=%s%n%n", now(), sameClient, uri);
 
         HttpClient client = newHttpClient(uri, sameClient);
 
@@ -307,7 +299,7 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
             var response = cf.get();
             System.out.println("Got: " + response);
             var value = response.headers().firstValue("Header8859").orElse(null);
-            assertEquals(value, "U\u00ffU");
+            assertEquals("U\u00ffU", value);
         }
         System.out.println("HttpClient: PASSED");
         if (uri.contains("http1")) {
@@ -317,10 +309,10 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
             conn.connect();
             conn.getInputStream().readAllBytes();
             var value = conn.getHeaderField("Header8859");
-            assertEquals(value, "U\u00ffU", "legacy stack failed");
+            assertEquals("U\u00ffU", value, "legacy stack failed");
             System.out.println("URLConnection: PASSED");
         }
-        System.out.println("test: DONE");
+        System.out.println(now() + "test: DONE");
     }
 
     static final class DummyServer extends Thread implements AutoCloseable {
@@ -335,8 +327,8 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         static final InetSocketAddress LOOPBACK =
                 new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
         final ServerSocket socket;
-        final CopyOnWriteArrayList<Socket> accepted = new CopyOnWriteArrayList<Socket>();
-        final CompletableFuture<Void> done = new CompletableFuture();
+        final CopyOnWriteArrayList<Socket> accepted = new CopyOnWriteArrayList<>();
+        final CompletableFuture<Void> done = new CompletableFuture<>();
         volatile boolean closed;
         DummyServer() throws IOException  {
             socket = new ServerSocket();
@@ -387,11 +379,11 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
             }
         }
 
-        final void close(AutoCloseable toclose) {
+        void close(AutoCloseable toclose) {
             try { toclose.close(); } catch (Exception x) {};
         }
 
-        final public void close() {
+        public void close() {
             closed = true;
             close(socket);
             accepted.forEach(this::close);
@@ -410,8 +402,8 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         HttpServerAdapters.HttpTestHandler handler = new ISO88591Handler();
         InetSocketAddress loopback = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
@@ -448,8 +440,8 @@ public class ISO_8859_1_Test implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         String sharedClientName =
                 sharedClient == null ? null : sharedClient.toString();
         sharedClient = null;
diff --git a/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java b/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java
index 78984964895..be7e1db0033 100644
--- a/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/IdleConnectionTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,6 @@ import jdk.httpclient.test.lib.quic.QuicServerConnection;
 import jdk.internal.net.http.common.HttpHeadersBuilder;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,7 +54,10 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.net.http.HttpClient.Version.HTTP_2;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -68,45 +69,45 @@ import static org.testng.Assert.assertEquals;
  *        jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.httpclient.test.lib.http3.Http3TestServer
  *
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout=1
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout=1
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout=20
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout=20
  *                                                             IdleConnectionTimeoutTest
  *
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=1
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=1
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=20
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=20
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=abc
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=abc
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=-1
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h2=-1
  *                                                             IdleConnectionTimeoutTest
  *
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=1
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=1
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=20
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=20
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=abc
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=abc
  *                                                             IdleConnectionTimeoutTest
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=-1
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=all -Djdk.httpclient.keepalive.timeout.h3=-1
  *                                                             IdleConnectionTimeoutTest
  */
 public class IdleConnectionTimeoutTest {
 
-    URI timeoutUriH2, noTimeoutUriH2, timeoutUriH3, noTimeoutUriH3, getH3;
+    private static URI timeoutUriH2, noTimeoutUriH2, timeoutUriH3, noTimeoutUriH3, getH3;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static volatile QuicServerConnection latestServerConn;
     final String KEEP_ALIVE_PROPERTY = "jdk.httpclient.keepalive.timeout";
     final String IDLE_CONN_PROPERTY_H2 = "jdk.httpclient.keepalive.timeout.h2";
     final String IDLE_CONN_PROPERTY_H3 = "jdk.httpclient.keepalive.timeout.h3";
-    final String TIMEOUT_PATH = "/serverTimeoutHandler";
-    final String NO_TIMEOUT_PATH = "/noServerTimeoutHandler";
+    static final String TIMEOUT_PATH = "/serverTimeoutHandler";
+    static final String NO_TIMEOUT_PATH = "/noServerTimeoutHandler";
     static Http2TestServer http2TestServer;
     static Http3TestServer http3TestServer;
     static final PrintStream testLog = System.err;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         http2TestServer = new Http2TestServer(false, 0);
         http2TestServer.addHandler(new ServerTimeoutHandlerH2(), TIMEOUT_PATH);
         http2TestServer.addHandler(new ServerNoTimeoutHandlerH2(), NO_TIMEOUT_PATH);
@@ -212,7 +213,7 @@ public class IdleConnectionTimeoutTest {
         HttpRequest hreq = HttpRequest.newBuilder(uri).version(version).GET()
                 .setOption(H3_DISCOVERY, config).build();
         HttpResponse<String> hresp = runRequest(hc, hreq, 2750);
-        assertEquals(hresp.statusCode(), 200, "idleConnectionTimeoutEvent was not expected but occurred");
+        assertEquals(200, hresp.statusCode(), "idleConnectionTimeoutEvent was not expected but occurred");
     }
 
     private void testNoTimeout(HttpClient hc, URI uri, Version version) {
@@ -221,13 +222,13 @@ public class IdleConnectionTimeoutTest {
         HttpRequest hreq = HttpRequest.newBuilder(uri).version(version).GET()
                 .setOption(H3_DISCOVERY,  config).build();
         HttpResponse<String> hresp = runRequest(hc, hreq, 0);
-        assertEquals(hresp.statusCode(), 200, "idleConnectionTimeoutEvent was not expected but occurred");
+        assertEquals(200, hresp.statusCode(), "idleConnectionTimeoutEvent was not expected but occurred");
     }
 
     private HttpResponse<String> runRequest(HttpClient hc, HttpRequest req, int sleepTime) {
         CompletableFuture<HttpResponse<String>> request = hc.sendAsync(req, HttpResponse.BodyHandlers.ofString(UTF_8));
         HttpResponse<String> hresp = request.join();
-        assertEquals(hresp.statusCode(), 200);
+        assertEquals(200, hresp.statusCode());
         try {
             Thread.sleep(sleepTime);
         } catch (InterruptedException e) {
diff --git a/test/jdk/java/net/httpclient/ImmutableFlowItems.java b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
index 3ee4eb28768..e42e2e21a6e 100644
--- a/test/jdk/java/net/httpclient/ImmutableFlowItems.java
+++ b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm ImmutableFlowItems
+ * @run junit/othervm ImmutableFlowItems
  */
 
 import java.io.IOException;
@@ -58,32 +58,33 @@ import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ImmutableFlowItems {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
-    HttpsServer httpsTestServer;       // HTTPS/1.1
-    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
-    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
+    private static HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    private static HttpsServer httpsTestServer;       // HTTPS/1.1
+    private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpURI_fixed   },
                 { httpURI_chunk   },
@@ -104,7 +105,8 @@ public class ImmutableFlowItems {
                 .build();
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsString(String uri) throws Exception {
         HttpClient client = newHttpClient();
 
@@ -114,14 +116,14 @@ public class ImmutableFlowItems {
         BodyHandler<String> handler = new CRSBodyHandler();
         client.sendAsync(req, handler)
                 .thenApply(HttpResponse::body)
-                .thenAccept(body -> assertEquals(body, BODY))
+                .thenAccept(body -> assertEquals(BODY, body))
                 .join();
     }
 
     static class CRSBodyHandler implements BodyHandler<String> {
         @Override
         public BodySubscriber<String> apply(HttpResponse.ResponseInfo rinfo) {
-            assertEquals(rinfo.statusCode(), 200);
+            assertEquals(200, rinfo.statusCode());
             return new CRSBodySubscriber();
         }
     }
@@ -138,7 +140,7 @@ public class ImmutableFlowItems {
         public void onNext(List<ByteBuffer> item) {
             assertUnmodifiableList(item);
             long c = item.stream().filter(ByteBuffer::isReadOnly).count();
-            assertEquals(c, item.size(), "Unexpected writable buffer in: " +item);
+            assertEquals(item.size(), c, "Unexpected writable buffer in: " +item);
             ofString.onNext(item);
         }
 
@@ -173,8 +175,8 @@ public class ImmutableFlowItems {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
@@ -214,8 +216,8 @@ public class ImmutableFlowItems {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
index 10df564bd41..c83d9d67528 100644
--- a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
+++ b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Dtest.http.version=http3
+ * @run junit/othervm -Dtest.http.version=http3
  *      -Djdk.internal.httpclient.debug=true
  *      InvalidInputStreamSubscriptionRequest
  */
@@ -41,7 +41,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Dtest.http.version=http2 InvalidInputStreamSubscriptionRequest
+ * @run junit/othervm -Dtest.http.version=http2 InvalidInputStreamSubscriptionRequest
  */
 /*
  * @test id=http1
@@ -51,16 +51,11 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Dtest.http.version=http1 InvalidInputStreamSubscriptionRequest
+ * @run junit/othervm -Dtest.http.version=http1 InvalidInputStreamSubscriptionRequest
  */
 
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -96,26 +91,31 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
+    private static String http3URI_fixed;
+    private static String http3URI_chunk;
 
     static final int ITERATION_COUNT = 3;
     // a shared executor helps reduce the amount of threads created by the test
@@ -156,7 +156,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
         }
     }
 
-    @AfterClass
+    @AfterAll
     static final void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -200,8 +200,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
     static final Supplier<BodyHandler<InputStream>> OF_INPUTSTREAM =
             BHS.of(BodyHandlers::ofInputStream, "BodyHandlers::ofInputStream");
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         Object[][] http3 = new Object[][]{
                 {http3URI_fixed, false, OF_INPUTSTREAM},
                 {http3URI_chunk, false, OF_INPUTSTREAM},
@@ -244,7 +243,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
 
 
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     HttpClient newHttpClient(String uri) {
         HttpClient.Builder builder = uri.contains("/http3/")
                 ? newClientBuilderForH3()
@@ -265,7 +264,8 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
         return builder;
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testNoBody(String uri, boolean sameClient, BHS handlers)
             throws Exception
     {
@@ -285,7 +285,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
                 HttpResponse<InputStream> response = client.send(req, badHandler);
                 try (InputStream is = response.body()) {
                     String body = new String(is.readAllBytes(), UTF_8);
-                    assertEquals(body, "");
+                    assertEquals("", body);
                     if (uri.endsWith("/chunk")
                             && response.version() == HTTP_1_1) {
                         // with /fixed and 0 length
@@ -324,7 +324,8 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testNoBodyAsync(String uri, boolean sameClient, BHS handlers)
             throws Exception
     {
@@ -352,7 +353,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
                             });
             try {
                 // Get the final result and compare it with the expected body
-                assertEquals(result.get(), "");
+                assertEquals("", result.get());
                 if (uri.endsWith("/chunk")
                         && response.get().version() == HTTP_1_1) {
                     // with /fixed and 0 length
@@ -390,7 +391,8 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsString(String uri, boolean sameClient, BHS handlers)
             throws Exception
     {
@@ -409,7 +411,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
                 HttpResponse<InputStream> response = client.send(req, badHandler);
                 try (InputStream is = response.body()) {
                     String body = new String(is.readAllBytes(), UTF_8);
-                    assertEquals(body, WITH_BODY);
+                    assertEquals(WITH_BODY, body);
                     throw new RuntimeException("Expected IAE not thrown");
                 }
             } catch (Exception x) {
@@ -443,7 +445,8 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsStringAsync(String uri, boolean sameClient, BHS handlers)
             throws Exception
     {
@@ -470,7 +473,7 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
             // Get the final result and compare it with the expected body
             try {
                 String body = result.get();
-                assertEquals(body, WITH_BODY);
+                assertEquals(WITH_BODY, body);
                 throw new RuntimeException("Expected IAE not thrown");
             } catch (Exception x) {
                 Throwable cause = x;
@@ -563,8 +566,8 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
@@ -613,8 +616,8 @@ public class InvalidInputStreamSubscriptionRequest implements HttpServerAdapters
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         AssertionError fail = TRACKER.check(1500);
         try {
             httpTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
index be4d3297dd7..0027a7956d5 100644
--- a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
+++ b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *          when SSL context is not valid.
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=true InvalidSSLContextTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true InvalidSSLContextTest
  */
 
 import java.io.IOException;
@@ -40,7 +40,6 @@ import java.util.concurrent.CompletionException;
 import java.net.SocketException;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLSocket;
 import java.net.http.HttpClient;
@@ -49,32 +48,32 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class InvalidSSLContextTest {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    volatile SSLServerSocket sslServerSocket;
-    volatile String uri;
+    static volatile SSLServerSocket sslServerSocket;
+    static volatile String uri;
 
-    @DataProvider(name = "versions")
-    public Object[][] versions() {
+    public static Object[][] versions() {
         return new Object[][]{
                 { HTTP_1_1 },
                 { HTTP_2   }
         };
     }
 
-    @Test(dataProvider = "versions")
+    @ParameterizedTest
+    @MethodSource("versions")
     public void testSync(Version version) throws Exception {
         // client-side uses a different context to that of the server-side
         HttpClient client = HttpClient.newBuilder()
@@ -88,14 +87,15 @@ public class InvalidSSLContextTest {
 
         try {
             HttpResponse<?> response = client.send(request, BodyHandlers.discarding());
-            Assert.fail("UNEXPECTED response" + response);
+            Assertions.fail("UNEXPECTED response" + response);
         } catch (IOException ex) {
             System.out.println("Caught expected: " + ex);
             assertExceptionOrCause(SSLException.class, ex);
         }
     }
 
-    @Test(dataProvider = "versions")
+    @ParameterizedTest
+    @MethodSource("versions")
     public void testAsync(Version version) throws Exception {
         // client-side uses a different context to that of the server-side
         HttpClient client = HttpClient.newBuilder()
@@ -115,13 +115,13 @@ public class InvalidSSLContextTest {
                                     CompletableFuture<?> stage) {
         stage.handle((result, error) -> {
             if (result != null) {
-                Assert.fail("UNEXPECTED result: " + result);
+                Assertions.fail("UNEXPECTED result: " + result);
                 return null;
             }
             if (error instanceof CompletionException) {
                 Throwable cause = error.getCause();
                 if (cause == null) {
-                    Assert.fail("Unexpected null cause: " + error);
+                    Assertions.fail("Unexpected null cause: " + error);
                 }
                 assertExceptionOrCause(clazz, cause);
             } else {
@@ -133,7 +133,7 @@ public class InvalidSSLContextTest {
 
     static void assertExceptionOrCause(Class<? extends Throwable> clazz, Throwable t) {
         if (t == null) {
-            Assert.fail("Expected " + clazz + ", caught nothing");
+            Assertions.fail("Expected " + clazz + ", caught nothing");
         }
         final Throwable original = t;
         do {
@@ -142,11 +142,11 @@ public class InvalidSSLContextTest {
             }
         } while ((t = t.getCause()) != null);
         original.printStackTrace(System.out);
-        Assert.fail("Expected " + clazz + "in " + original);
+        Assertions.fail("Expected " + clazz + "in " + original);
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // server-side uses a different context to that of the client-side
         sslServerSocket = (SSLServerSocket)sslContext
                 .getServerSocketFactory()
@@ -169,7 +169,7 @@ public class InvalidSSLContextTest {
                         Thread.sleep(500);
                         s.startHandshake();
                         s.close();
-                        Assert.fail("SERVER: UNEXPECTED ");
+                        Assertions.fail("SERVER: UNEXPECTED ");
                     } catch (SSLException | SocketException se) {
                         System.out.println("SERVER: caught expected " + se);
                     } catch (IOException e) {
@@ -187,8 +187,8 @@ public class InvalidSSLContextTest {
         t.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sslServerSocket.close();
     }
 }
diff --git a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
index c16c9f1747c..692e4d0bea4 100644
--- a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
+++ b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,21 +30,15 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm InvalidSubscriptionRequest
+ * @run junit/othervm InvalidSubscriptionRequest
  */
 
-import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.InetAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -74,26 +68,31 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class InvalidSubscriptionRequest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
+    private static String http3URI_fixed;
+    private static String http3URI_chunk;
 
     static final int ITERATION_COUNT = 3;
     // a shared executor helps reduce the amount of threads created by the test
@@ -126,8 +125,7 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
     static final Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> OF_PUBLISHER_API =
             BHS.of(BodyHandlers::ofPublisher, "BodyHandlers::ofPublisher");
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { http3URI_fixed,   false, OF_PUBLISHER_API },
                 { http3URI_chunk,   false, OF_PUBLISHER_API },
@@ -154,7 +152,7 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         };
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     HttpClient newHttpClient(String uri) {
         HttpClient.Builder builder = uri.contains("/http3/")
                 ? newClientBuilderForH3()
@@ -175,8 +173,9 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "variants")
-    public void testNoBody(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testNoBody(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         Throwable failed = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
@@ -196,7 +195,7 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
             // Get the final result and compare it with the expected body
             try {
                 String body = ofString.getBody().toCompletableFuture().get();
-                assertEquals(body, "");
+                assertEquals("", body);
                 if (uri.endsWith("/chunk")
                         && response.version() == HTTP_1_1) {
                     // with /fixed and 0 length
@@ -231,8 +230,9 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testNoBodyAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testNoBodyAsync(String uri, boolean sameClient, BHS handlers) {
         HttpClient client = null;
         Throwable failed = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
@@ -257,7 +257,7 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
                             });
             try {
                 // Get the final result and compare it with the expected body
-                assertEquals(result.get(), "");
+                assertEquals("", result.get());
                 if (uri.endsWith("/chunk")
                         && response.get().version() == HTTP_1_1) {
                     // with /fixed and 0 length
@@ -292,8 +292,9 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsString(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsString(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         Throwable failed = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
@@ -314,7 +315,7 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
             // Get the final result and compare it with the expected body
             try {
                 String body = ofString.getBody().toCompletableFuture().get();
-                assertEquals(body, WITH_BODY);
+                assertEquals(WITH_BODY, body);
                 throw new RuntimeException("Expected IAE not thrown");
             } catch (Exception x) {
                 Throwable cause = x;
@@ -344,8 +345,9 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsStringAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsStringAsync(String uri, boolean sameClient, BHS handlers) {
         HttpClient client = null;
         Throwable failed = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
@@ -369,7 +371,7 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
             // Get the final result and compare it with the expected body
             try {
                 String body = result.get();
-                assertEquals(body, WITH_BODY);
+                assertEquals(WITH_BODY, body);
                 throw new RuntimeException("Expected IAE not thrown");
             } catch (Exception x) {
                 Throwable cause = x;
@@ -454,13 +456,8 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         }
     }
 
-    static String serverAuthority(HttpServer server) {
-        return InetAddress.getLoopbackAddress().getHostName() + ":"
-                + server.getAddress().getPort();
-    }
-
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
@@ -509,8 +506,8 @@ public class InvalidSubscriptionRequest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         AssertionError fail = TRACKER.check(500);
         try {
             httpTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/LightWeightHttpServer.java b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
index 496aa2c5778..9045d00829e 100644
--- a/test/jdk/java/net/httpclient/LightWeightHttpServer.java
+++ b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,6 @@
 /**
  * library /test/lib /
  * build jdk.test.lib.net.SimpleSSLContext ProxyServer
- * compile ../../../com/sun/net/httpserver/LogFilter.java
- * compile ../../../com/sun/net/httpserver/EchoHandler.java
- * compile ../../../com/sun/net/httpserver/FileServerHandler.java
  */
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
@@ -39,6 +36,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.http.HttpClient.Version;
 import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.concurrent.BrokenBarrierException;
@@ -50,14 +48,21 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.net.ssl.SSLContext;
 
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestContext;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestEchoHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestExchange;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestFileServerHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
 import jdk.httpclient.test.lib.common.TestServerConfigurator;
 import jdk.test.lib.net.SimpleSSLContext;
 
 public class LightWeightHttpServer {
 
     static final SSLContext ctx = SimpleSSLContext.findSSLContext();
-    static HttpServer httpServer;
-    static HttpsServer httpsServer;
+    static HttpTestServer httpServer;
+    static HttpTestServer httpsServer;
     static ExecutorService executor;
     static int port;
     static int httpsport;
@@ -82,36 +87,31 @@ public class LightWeightHttpServer {
         ch.setLevel(Level.ALL);
         logger.addHandler(ch);
 
+        executor = Executors.newCachedThreadPool();
+
         String root = System.getProperty("test.src", ".") + "/docs";
         InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
-        httpServer = HttpServer.create(addr, 0);
-        if (httpServer instanceof HttpsServer) {
-            throw new RuntimeException("should not be httpsserver");
-        }
-        httpsServer = HttpsServer.create(addr, 0);
-        HttpHandler h = new FileServerHandler(root);
+        httpServer = HttpTestServer.create(Version.HTTP_1_1, null, executor);
+        httpsServer = HttpTestServer.create(Version.HTTP_1_1, ctx, executor);
+        HttpTestHandler h = new HttpTestFileServerHandler(root);
 
-        HttpContext c1 = httpServer.createContext("/files", h);
-        HttpContext c2 = httpsServer.createContext("/files", h);
-        HttpContext c3 = httpServer.createContext("/echo", new EchoHandler());
+        HttpTestContext c1 = httpServer.createContext("/files", h);
+        HttpTestContext c2 = httpsServer.createContext("/files", h);
+        HttpTestContext c3 = httpServer.createContext("/echo", new EchoHandler());
         redirectHandler = new RedirectHandler("/redirect");
         redirectHandlerSecure = new RedirectHandler("/redirect");
-        HttpContext c4 = httpServer.createContext("/redirect", redirectHandler);
-        HttpContext c41 = httpsServer.createContext("/redirect", redirectHandlerSecure);
-        HttpContext c5 = httpsServer.createContext("/echo", new EchoHandler());
-        HttpContext c6 = httpServer.createContext("/keepalive", new KeepAliveHandler());
+        HttpTestContext c4 = httpServer.createContext("/redirect", redirectHandler);
+        HttpTestContext c41 = httpsServer.createContext("/redirect", redirectHandlerSecure);
+        HttpTestContext c5 = httpsServer.createContext("/echo", new EchoHandler());
+        HttpTestContext c6 = httpServer.createContext("/keepalive", new KeepAliveHandler());
         redirectErrorHandler = new RedirectErrorHandler("/redirecterror");
         redirectErrorHandlerSecure = new RedirectErrorHandler("/redirecterror");
-        HttpContext c7 = httpServer.createContext("/redirecterror", redirectErrorHandler);
-        HttpContext c71 = httpsServer.createContext("/redirecterror", redirectErrorHandlerSecure);
+        HttpTestContext c7 = httpServer.createContext("/redirecterror", redirectErrorHandler);
+        HttpTestContext c71 = httpsServer.createContext("/redirecterror", redirectErrorHandlerSecure);
         delayHandler = new DelayHandler();
-        HttpContext c8 = httpServer.createContext("/delay", delayHandler);
-        HttpContext c81 = httpsServer.createContext("/delay", delayHandler);
+        HttpTestContext c8 = httpServer.createContext("/delay", delayHandler);
+        HttpTestContext c81 = httpsServer.createContext("/delay", delayHandler);
 
-        executor = Executors.newCachedThreadPool();
-        httpServer.setExecutor(executor);
-        httpsServer.setExecutor(executor);
-        httpsServer.setHttpsConfigurator(new TestServerConfigurator(addr.getAddress(), ctx));
         httpServer.start();
         httpsServer.start();
 
@@ -136,10 +136,10 @@ public class LightWeightHttpServer {
 
     public static void stop() throws IOException {
         if (httpServer != null) {
-            httpServer.stop(0);
+            httpServer.stop();
         }
         if (httpsServer != null) {
-            httpsServer.stop(0);
+            httpsServer.stop();
         }
         if (proxy != null) {
             proxy.close();
@@ -149,7 +149,14 @@ public class LightWeightHttpServer {
         }
     }
 
-    static class RedirectErrorHandler implements HttpHandler {
+    static class EchoHandler extends HttpServerAdapters.HttpTestEchoHandler {
+        @Override
+        protected boolean useXFixed() {
+            return true;
+        }
+    }
+
+    static class RedirectErrorHandler implements HttpTestHandler {
 
         String root;
         volatile int count = 1;
@@ -167,23 +174,23 @@ public class LightWeightHttpServer {
         }
 
         @Override
-        public synchronized void handle(HttpExchange t)
+        public synchronized void handle(HttpTestExchange t)
                 throws IOException {
             byte[] buf = new byte[2048];
             try (InputStream is = t.getRequestBody()) {
                 while (is.read(buf) != -1) ;
             }
 
-            Headers map = t.getResponseHeaders();
-            String redirect = root + "/foo/" + Integer.toString(count);
+            var map = t.getResponseHeaders();
+            String redirect = root + "/foo/" + count;
             increment();
-            map.add("Location", redirect);
-            t.sendResponseHeaders(301, -1);
+            map.addHeader("Location", redirect);
+            t.sendResponseHeaders(301, HttpTestExchange.RSPBODY_EMPTY);
             t.close();
         }
     }
 
-    static class RedirectHandler implements HttpHandler {
+    static class RedirectHandler implements HttpTestHandler {
 
         String root;
         volatile int count = 0;
@@ -193,21 +200,21 @@ public class LightWeightHttpServer {
         }
 
         @Override
-        public synchronized void handle(HttpExchange t)
+        public synchronized void handle(HttpTestExchange t)
                 throws IOException {
             byte[] buf = new byte[2048];
             try (InputStream is = t.getRequestBody()) {
                 while (is.read(buf) != -1) ;
             }
 
-            Headers map = t.getResponseHeaders();
+            var map = t.getResponseHeaders();
 
             if (count++ < 1) {
-                map.add("Location", root + "/foo/" + count);
+                map.addHeader("Location", root + "/foo/" + count);
             } else {
-                map.add("Location", SmokeTest.midSizedFilename);
+                map.addHeader("Location", SmokeTest.midSizedFilename);
             }
-            t.sendResponseHeaders(301, -1);
+            t.sendResponseHeaders(301, HttpTestExchange.RSPBODY_EMPTY);
             t.close();
         }
 
@@ -220,7 +227,7 @@ public class LightWeightHttpServer {
         }
     }
 
-    static class KeepAliveHandler implements HttpHandler {
+    static class KeepAliveHandler implements HttpTestHandler {
 
         volatile int counter = 0;
         HashSet<Integer> portSet = new HashSet<>();
@@ -234,7 +241,7 @@ public class LightWeightHttpServer {
         }
 
         @Override
-        public synchronized void handle(HttpExchange t)
+        public synchronized void handle(HttpTestExchange t)
                 throws IOException {
             int remotePort = t.getRemoteAddress().getPort();
             String result = "OK";
@@ -286,14 +293,15 @@ public class LightWeightHttpServer {
             try (InputStream is = t.getRequestBody()) {
                 while (is.read(buf) != -1) ;
             }
-            t.sendResponseHeaders(200, result.length());
+            byte[] bytes = result.getBytes("US-ASCII");
+            t.sendResponseHeaders(200, HttpTestExchange.fixedRsp(bytes.length));
             OutputStream o = t.getResponseBody();
-            o.write(result.getBytes("US-ASCII"));
+            o.write(bytes);
             t.close();
         }
     }
 
-    static class DelayHandler implements HttpHandler {
+    static class DelayHandler implements HttpTestHandler {
 
         CyclicBarrier bar1 = new CyclicBarrier(2);
         CyclicBarrier bar2 = new CyclicBarrier(2);
@@ -308,7 +316,7 @@ public class LightWeightHttpServer {
         }
 
         @Override
-        public synchronized void handle(HttpExchange he) throws IOException {
+        public synchronized void handle(HttpTestExchange he) throws IOException {
             try(InputStream is = he.getRequestBody()) {
                 is.readAllBytes();
                 bar1.await();
@@ -316,7 +324,7 @@ public class LightWeightHttpServer {
             } catch (InterruptedException | BrokenBarrierException e) {
                 throw new IOException(e);
             }
-            he.sendResponseHeaders(200, -1); // will probably fail
+            he.sendResponseHeaders(200, HttpTestExchange.RSPBODY_EMPTY); // will probably fail
             he.close();
         }
     }
diff --git a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
index 45df8d13f7e..ddca2e1f7d2 100644
--- a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
+++ b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,10 +54,6 @@ import java.util.stream.Stream;
 import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -66,11 +62,16 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_16;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.net.http.HttpRequest.BodyPublishers.ofString;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -81,29 +82,28 @@ import static org.testng.Assert.assertTrue;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build ReferenceTracker jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -XX:+UnlockDiagnosticVMOptions -XX:DiagnoseSyncOnValueBasedClasses=1 LineBodyHandlerTest
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:DiagnoseSyncOnValueBasedClasses=1 LineBodyHandlerTest
  */
 
 public class LineBodyHandlerTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    final AtomicInteger clientCount = new AtomicInteger();
-    HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final AtomicInteger clientCount = new AtomicInteger();
+    private static HttpClient sharedClient;
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { http3URI   },
                 { httpURI   },
@@ -171,7 +171,7 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
                     StandardCharsets.US_ASCII, ""));
     }
 
-    private static final List<String> lines(String text, String eol) {
+    private static List<String> lines(String text, String eol) {
         if (eol == null) {
             return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList());
         } else {
@@ -210,7 +210,8 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testStringWithFinisher(String url) {
         String body = "May the luck of the Irish be with you!";
         HttpClient client = newClient();
@@ -226,12 +227,13 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         HttpResponse<String> response = cf.join();
         String text = response.body();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, body);
-        assertEquals(subscriber.list, lines(body, "\n"));
+        assertEquals(200, response.statusCode());
+        assertEquals(body, text);
+        assertEquals(lines(body, "\n"), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsStream(String url) {
         String body = "May the luck of the Irish be with you!";
         HttpClient client = newClient();
@@ -247,13 +249,14 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         List<String> list = stream.collect(Collectors.toList());
         String text = list.stream().collect(Collectors.joining("|"));
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, body);
-        assertEquals(list, List.of(body));
-        assertEquals(list, lines(body, null));
+        assertEquals(200, response.statusCode());
+        assertEquals(body, text);
+        assertEquals(List.of(body), list);
+        assertEquals(lines(body, null), list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testStringWithFinisher2(String url) {
         String body = "May the luck\r\n\r\n of the Irish be with you!";
         HttpClient client = newClient();
@@ -270,12 +273,13 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         HttpResponse<Void> response = cf.join();
         String text = subscriber.get();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, body.replace("\r\n", "\n"));
-        assertEquals(subscriber.list, lines(body, null));
+        assertEquals(200, response.statusCode());
+        assertEquals(body.replace("\r\n", "\n"), text);
+        assertEquals(lines(body, null), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsStreamWithCRLF(String url) {
         String body = "May the luck\r\n\r\n of the Irish be with you!";
         HttpClient client = newClient();
@@ -291,15 +295,16 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         List<String> list = stream.collect(Collectors.toList());
         String text = list.stream().collect(Collectors.joining("|"));
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, "May the luck|| of the Irish be with you!");
-        assertEquals(list, List.of("May the luck",
+        assertEquals(200, response.statusCode());
+        assertEquals("May the luck|| of the Irish be with you!", text);
+        assertEquals(List.of("May the luck",
                                    "",
-                                   " of the Irish be with you!"));
-        assertEquals(list, lines(body, null));
+                                   " of the Irish be with you!"), list);
+        assertEquals(lines(body, null), list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testStringWithFinisherBlocking(String url) throws Exception {
         String body = "May the luck of the Irish be with you!";
         HttpClient client = newClient();
@@ -311,12 +316,13 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
                 BodyHandlers.fromLineSubscriber(subscriber, Supplier::get, "\n"));
         String text = response.body();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, "May the luck of the Irish be with you!");
-        assertEquals(subscriber.list, lines(body, "\n"));
+        assertEquals(200, response.statusCode());
+        assertEquals("May the luck of the Irish be with you!", text);
+        assertEquals(lines(body, "\n"), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testStringWithoutFinisherBlocking(String url) throws Exception {
         String body = "May the luck of the Irish be with you!";
         HttpClient client = newClient();
@@ -328,14 +334,15 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
                 BodyHandlers.fromLineSubscriber(subscriber));
         String text = subscriber.get();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, "May the luck of the Irish be with you!");
-        assertEquals(subscriber.list, lines(body, null));
+        assertEquals(200, response.statusCode());
+        assertEquals("May the luck of the Irish be with you!", text);
+        assertEquals(lines(body, null), subscriber.list);
     }
 
     // Subscriber<Object>
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsStreamWithMixedCRLF(String url) {
         String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
         HttpClient client = newClient();
@@ -351,18 +358,19 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         List<String> list = stream.collect(Collectors.toList());
         String text = list.stream().collect(Collectors.joining("|"));
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May| the wind| always be|at your back.|");
-        assertEquals(list, List.of("May",
+        assertEquals("May| the wind| always be|at your back.|", text);
+        assertEquals(List.of("May",
                                    " the wind",
                                    " always be",
                                    "at your back.",
-                                   ""));
-        assertEquals(list, lines(body, null));
+                                   ""), list);
+        assertEquals(lines(body, null), list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsStreamWithMixedCRLF_UTF8(String url) {
         String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
         HttpClient client = newClient();
@@ -378,17 +386,18 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         List<String> list = stream.collect(Collectors.toList());
         String text = list.stream().collect(Collectors.joining("|"));
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May| the wind| always be|at your back.|");
-        assertEquals(list, List.of("May",
+        assertEquals("May| the wind| always be|at your back.|", text);
+        assertEquals(List.of("May",
                                    " the wind",
                                    " always be",
-                                   "at your back.", ""));
-        assertEquals(list, lines(body, null));
+                                   "at your back.", ""), list);
+        assertEquals(lines(body, null), list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsStreamWithMixedCRLF_UTF16(String url) {
         String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
         HttpClient client = newClient();
@@ -404,18 +413,19 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         List<String> list = stream.collect(Collectors.toList());
         String text = list.stream().collect(Collectors.joining("|"));
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May| the wind| always be|at your back.|");
-        assertEquals(list, List.of("May",
+        assertEquals("May| the wind| always be|at your back.|", text);
+        assertEquals(List.of("May",
                                    " the wind",
                                    " always be",
                                    "at your back.",
-                                   ""));
-        assertEquals(list, lines(body, null));
+                                   ""), list);
+        assertEquals(lines(body, null), list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithFinisher(String url) {
         String body = "May\r\n the wind\r\n always be\rat your back.";
         HttpClient client = newClient();
@@ -431,16 +441,17 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         HttpResponse<String> response = cf.join();
         String text = response.body();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May\n the wind\n always be\rat your back.");
-        assertEquals(subscriber.list, List.of("May",
+        assertEquals("May\n the wind\n always be\rat your back.", text);
+        assertEquals(List.of("May",
                                               " the wind",
-                                              " always be\rat your back."));
-        assertEquals(subscriber.list, lines(body, "\r\n"));
+                                              " always be\rat your back."), subscriber.list);
+        assertEquals(lines(body, "\r\n"), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithFinisher_UTF16(String url) {
         String body = "May\r\n the wind\r\n always be\rat your back.\r\r";
         HttpClient client = newClient();
@@ -455,18 +466,19 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         HttpResponse<String> response = cf.join();
         String text = response.body();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May\n the wind\n always be\nat your back.\n");
-        assertEquals(subscriber.list, List.of("May",
+        assertEquals("May\n the wind\n always be\nat your back.\n", text);
+        assertEquals(List.of("May",
                                               " the wind",
                                               " always be",
                                               "at your back.",
-                                              ""));
-        assertEquals(subscriber.list, lines(body, null));
+                                              ""), subscriber.list);
+        assertEquals(lines(body, null), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithoutFinisher(String url) {
         String body = "May\r\n the wind\r\n always be\rat your back.";
         HttpClient client = newClient();
@@ -482,17 +494,18 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         HttpResponse<Void> response = cf.join();
         String text = subscriber.get();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May\n the wind\n always be\nat your back.");
-        assertEquals(subscriber.list, List.of("May",
+        assertEquals("May\n the wind\n always be\nat your back.", text);
+        assertEquals(List.of("May",
                                               " the wind",
                                               " always be",
-                                              "at your back."));
-        assertEquals(subscriber.list, lines(body, null));
+                                              "at your back."), subscriber.list);
+        assertEquals(lines(body, null), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithFinisherBlocking(String url) throws Exception {
         String body = "May\r\n the wind\r\n always be\nat your back.";
         HttpClient client = newClient();
@@ -507,16 +520,17 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
                                    "\r\n"));
         String text = response.body();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May\n the wind\n always be\nat your back.");
-        assertEquals(subscriber.list, List.of("May",
+        assertEquals("May\n the wind\n always be\nat your back.", text);
+        assertEquals(List.of("May",
                                               " the wind",
-                                              " always be\nat your back."));
-        assertEquals(subscriber.list, lines(body, "\r\n"));
+                                              " always be\nat your back."), subscriber.list);
+        assertEquals(lines(body, "\r\n"), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testObjectWithoutFinisherBlocking(String url) throws Exception {
         String body = "May\r\n the wind\r\n always be\nat your back.";
         HttpClient client = newClient();
@@ -529,14 +543,14 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
                 BodyHandlers.fromLineSubscriber(subscriber));
         String text = subscriber.get();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
+        assertEquals(200, response.statusCode());
         assertTrue(text.length() != 0);  // what else can be asserted!
-        assertEquals(text, "May\n the wind\n always be\nat your back.");
-        assertEquals(subscriber.list, List.of("May",
+        assertEquals("May\n the wind\n always be\nat your back.", text);
+        assertEquals(List.of("May",
                                               " the wind",
                                               " always be",
-                                              "at your back."));
-        assertEquals(subscriber.list, lines(body, null));
+                                              "at your back."), subscriber.list);
+        assertEquals(lines(body, null), subscriber.list);
     }
 
     static private final String LINE = "Bient\u00f4t nous plongerons dans les" +
@@ -551,7 +565,8 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         return res.toString();
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testBigTextFromLineSubscriber(String url) {
         HttpClient client = newClient();
         String bigtext = bigtext();
@@ -567,12 +582,13 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         HttpResponse<String> response = cf.join();
         String text = response.body();
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, bigtext.replace("\r\n", "\n"));
-        assertEquals(subscriber.list, lines(bigtext, "\r\n"));
+        assertEquals(200, response.statusCode());
+        assertEquals(bigtext.replace("\r\n", "\n"), text);
+        assertEquals(lines(bigtext, "\r\n"), subscriber.list);
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testBigTextAsStream(String url) {
         HttpClient client = newClient();
         String bigtext = bigtext();
@@ -588,10 +604,10 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         List<String> list = stream.collect(Collectors.toList());
         String text = list.stream().collect(Collectors.joining("|"));
         System.out.println(text);
-        assertEquals(response.statusCode(), 200);
-        assertEquals(text, bigtext.replace("\r\n", "|"));
-        assertEquals(list, List.of(bigtext.split("\r\n")));
-        assertEquals(list, lines(bigtext, null));
+        assertEquals(200, response.statusCode());
+        assertEquals(bigtext.replace("\r\n", "|"), text);
+        assertEquals(List.of(bigtext.split("\r\n")), list);
+        assertEquals(lines(bigtext, null), list);
     }
 
     /** An abstract Subscriber that converts all received data into a String. */
@@ -675,8 +691,8 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         return Executors.newCachedThreadPool(factory);
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1, null,
                 executorFor("HTTP/1.1 Server Thread"));
         httpTestServer.addHandler(new HttpTestEchoHandler(), "/http1/echo");
@@ -706,8 +722,8 @@ public class LineBodyHandlerTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sharedClient = null;
         try {
             System.gc();
diff --git a/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java b/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java
index e082398f3c7..01a7ee9fdbf 100644
--- a/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java
+++ b/test/jdk/java/net/httpclient/LineStreamsAndSurrogatesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,10 +37,11 @@ import java.util.concurrent.SubmissionPublisher;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.testng.annotations.Test;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.charset.StandardCharsets.UTF_16;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -48,7 +49,7 @@ import static org.testng.Assert.assertEquals;
  *       In particular tests that surrogate characters are handled
  *       correctly.
  * @modules java.net.http java.logging
- * @run testng/othervm LineStreamsAndSurrogatesTest
+ * @run junit/othervm LineStreamsAndSurrogatesTest
  */
 
 public class LineStreamsAndSurrogatesTest {
@@ -56,7 +57,7 @@ public class LineStreamsAndSurrogatesTest {
 
     static final Class<NullPointerException> NPE = NullPointerException.class;
 
-    private static final List<String> lines(String text) {
+    private static List<String> lines(String text) {
         return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList());
     }
 
@@ -100,14 +101,14 @@ public class LineStreamsAndSurrogatesTest {
             String resp2 = reader.lines().collect(Collectors.joining(""));
             System.out.println("***** Got2: " + resp2);
 
-            assertEquals(resp, resp2);
-            assertEquals(list, List.of("Bient\u00f4t",
+            assertEquals(resp2, resp);
+            assertEquals(List.of("Bient\u00f4t",
                                        " nous plongerons",
                                        " dans",
                                        " les",
                                        "",
                                        " fr\u00f4\ud801\udc00des",
-                                       " t\u00e9n\u00e8bres\ufffd"));
+                                       " t\u00e9n\u00e8bres\ufffd"), list);
         } catch (ExecutionException x) {
             Throwable cause = x.getCause();
             if (cause instanceof MalformedInputException) {
@@ -151,18 +152,18 @@ public class LineStreamsAndSurrogatesTest {
         List<String> list = stream.collect(Collectors.toList());
         String resp = list.stream().collect(Collectors.joining("|"));
         System.out.println("***** Got: " + resp);
-        assertEquals(resp, text.replace("\r\n", "|")
+        assertEquals(text.replace("\r\n", "|")
                                .replace("\n","|")
-                               .replace("\r","|"));
-        assertEquals(list, List.of("Bient\u00f4t",
+                               .replace("\r","|"), resp);
+        assertEquals(List.of("Bient\u00f4t",
                 " nous plongerons",
                 " dans",
                 "",
                 " les",
                 "",
                 " fr\u00f4\ud801\udc00des",
-                " t\u00e9n\u00e8bres"));
-        assertEquals(list, lines(text));
+                " t\u00e9n\u00e8bres"), list);
+        assertEquals(lines(text), list);
         if (errorRef.get() != null) {
             throw new RuntimeException("Unexpected exception", errorRef.get());
         }
@@ -201,15 +202,15 @@ public class LineStreamsAndSurrogatesTest {
         System.out.println("***** Got: " + resp);
         String expected = Stream.of(text.split("\r\n|\r|\n"))
                 .collect(Collectors.joining(""));
-        assertEquals(resp, expected);
-        assertEquals(list, List.of("Bient\u00f4t",
+        assertEquals(expected, resp);
+        assertEquals(List.of("Bient\u00f4t",
                 " nous plongerons",
                 " dans",
                 "",
                 " les fr\u00f4\ud801\udc00des",
                 " t\u00e9n\u00e8bres",
-                ""));
-        assertEquals(list, lines(text));
+                ""), list);
+        assertEquals(lines(text), list);
         if (errorRef.get() != null) {
             throw new RuntimeException("Unexpected exception", errorRef.get());
         }
@@ -246,16 +247,16 @@ public class LineStreamsAndSurrogatesTest {
         List<String> list = stream.collect(Collectors.toList());
         String resp = list.stream().collect(Collectors.joining(""));
         System.out.println("***** Got: " + resp);
-        assertEquals(resp, text.replace("\n","").replace("\r",""));
-        assertEquals(list, List.of("Bient\u00f4t",
+        assertEquals(text.replace("\n","").replace("\r",""), resp);
+        assertEquals(List.of("Bient\u00f4t",
                 " nous plongerons",
                 " dans",
                 "",
                 " les",
                 "",
                 " fr\u00f4\ud801\udc00des",
-                " t\u00e9n\u00e8bres"));
-        assertEquals(list, lines(text));
+                " t\u00e9n\u00e8bres"), list);
+        assertEquals(lines(text), list);
         if (errorRef.get() != null) {
             throw new RuntimeException("Unexpected exception", errorRef.get());
         }
@@ -294,15 +295,15 @@ public class LineStreamsAndSurrogatesTest {
         System.out.println("***** Got: " + resp);
         String expected = Stream.of(text.split("\r\n|\r|\n"))
                 .collect(Collectors.joining(""));
-        assertEquals(resp, expected);
-        assertEquals(list, List.of("Bient\u00f4t",
+        assertEquals(expected, resp);
+        assertEquals(List.of("Bient\u00f4t",
                 " nous plongerons",
                 " dans",
                 "",
                 " les fr\u00f4\ud801\udc00des",
                 " t\u00e9n\u00e8bres",
-                ""));
-        assertEquals(list, lines(text));
+                ""), list);
+        assertEquals(lines(text), list);
         if (errorRef.get() != null) {
             throw new RuntimeException("Unexpected exception", errorRef.get());
         }
diff --git a/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java b/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java
index 543ff6e94a1..7932744a4db 100644
--- a/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java
+++ b/test/jdk/java/net/httpclient/LineSubscribersAndSurrogatesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,10 +42,11 @@ import java.util.concurrent.SubmissionPublisher;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.testng.annotations.Test;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.charset.StandardCharsets.UTF_16;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -53,7 +54,7 @@ import static org.testng.Assert.assertEquals;
  *       In particular tests that surrogate characters are handled
  *       correctly.
  * @modules java.net.http java.logging
- * @run testng/othervm LineSubscribersAndSurrogatesTest
+ * @run junit/othervm LineSubscribersAndSurrogatesTest
  */
 
 public class LineSubscribersAndSurrogatesTest {
@@ -61,7 +62,7 @@ public class LineSubscribersAndSurrogatesTest {
 
     static final Class<NullPointerException> NPE = NullPointerException.class;
 
-    private static final List<String> lines(String text, String eol) {
+    private static List<String> lines(String text, String eol) {
         if (eol == null) {
             return new BufferedReader(new StringReader(text)).lines().collect(Collectors.toList());
         } else {
@@ -104,14 +105,14 @@ public class LineSubscribersAndSurrogatesTest {
             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
             BufferedReader reader = new BufferedReader(new InputStreamReader(bais, UTF_8));
             String resp2 = reader.lines().collect(Collectors.joining(""));
-            assertEquals(resp, resp2);
-            assertEquals(subscriber.list, List.of("Bient\u00f4t",
+            assertEquals(resp2, resp);
+            assertEquals(List.of("Bient\u00f4t",
                     " nous plongerons",
                     " dans",
                     " les",
                     "",
                     " fr\u00f4\ud801\udc00des",
-                    " t\u00e9n\u00e8bres\ufffd"));
+                    " t\u00e9n\u00e8bres\ufffd"), subscriber.list);
         } catch (ExecutionException x) {
             Throwable cause = x.getCause();
             if (cause instanceof MalformedInputException) {
@@ -147,10 +148,10 @@ public class LineSubscribersAndSurrogatesTest {
                 "",
                 " fr\u00f4\ud801\udc00des\r",
                 " t\u00e9n\u00e8bres\r");
-        assertEquals(subscriber.list, expected);
-        assertEquals(resp, Stream.of(text.split("\n")).collect(Collectors.joining("")));
-        assertEquals(resp, expected.stream().collect(Collectors.joining("")));
-        assertEquals(subscriber.list, lines(text, "\n"));
+        assertEquals(expected, subscriber.list);
+        assertEquals(Stream.of(text.split("\n")).collect(Collectors.joining("")), resp);
+        assertEquals(expected.stream().collect(Collectors.joining("")), resp);
+        assertEquals(lines(text, "\n"), subscriber.list);
     }
 
 
@@ -172,14 +173,14 @@ public class LineSubscribersAndSurrogatesTest {
         publisher.close();
         String resp = bodySubscriber.getBody().toCompletableFuture().get();
         System.out.println("***** Got: " + resp);
-        assertEquals(resp, text.replace("\r", ""));
-        assertEquals(subscriber.list, List.of("Bient\u00f4t",
+        assertEquals(text.replace("\r", ""), resp);
+        assertEquals(List.of("Bient\u00f4t",
                 "\n nous plongerons",
                 "\n dans",
                 " les fr\u00f4\ud801\udc00des",
                 "\n t\u00e9n\u00e8bres",
-                ""));
-        assertEquals(subscriber.list, lines(text, "\r"));
+                ""), subscriber.list);
+        assertEquals(lines(text, "\r"), subscriber.list);
     }
 
     @Test
@@ -200,12 +201,12 @@ public class LineSubscribersAndSurrogatesTest {
         publisher.close();
         String resp = bodySubscriber.getBody().toCompletableFuture().get();
         System.out.println("***** Got: " + resp);
-        assertEquals(resp, text.replace("\r\n",""));
-        assertEquals(subscriber.list, List.of("Bient\u00f4t",
+        assertEquals(text.replace("\r\n",""), resp);
+        assertEquals(List.of("Bient\u00f4t",
                 " nous plongerons",
                 " dans\r les fr\u00f4\ud801\udc00des",
-                " t\u00e9n\u00e8bres"));
-        assertEquals(subscriber.list, lines(text, "\r\n"));
+                " t\u00e9n\u00e8bres"), subscriber.list);
+        assertEquals(lines(text, "\r\n"), subscriber.list);
     }
 
 
@@ -234,9 +235,9 @@ public class LineSubscribersAndSurrogatesTest {
                 "",
                 " fr\u00f4\ud801\udc00des",
                 " t\u00e9n\u00e8bres");
-        assertEquals(subscriber.list, expected);
-        assertEquals(resp, expected.stream().collect(Collectors.joining("")));
-        assertEquals(subscriber.list, lines(text, null));
+        assertEquals(expected, subscriber.list);
+        assertEquals(expected.stream().collect(Collectors.joining("")), resp);
+        assertEquals(lines(text, null), subscriber.list);
     }
 
     @Test
@@ -265,9 +266,9 @@ public class LineSubscribersAndSurrogatesTest {
                 " fr\u00f4\ud801\udc00des",
                 " t\u00e9n\u00e8bres",
                 "");
-        assertEquals(resp, expected.stream().collect(Collectors.joining("")));
-        assertEquals(subscriber.list, expected);
-        assertEquals(subscriber.list, lines(text, null));
+        assertEquals(expected.stream().collect(Collectors.joining("")), resp);
+        assertEquals(expected, subscriber.list);
+        assertEquals(lines(text, null), subscriber.list);
     }
 
     void testStringWithoutFinisherBR() throws Exception {
@@ -293,9 +294,9 @@ public class LineSubscribersAndSurrogatesTest {
                 "",
                 " fr\u00f4\ud801\udc00des",
                 " t\u00e9n\u00e8bres");
-        assertEquals(subscriber.text, expected.stream().collect(Collectors.joining("")));
-        assertEquals(subscriber.list, expected);
-        assertEquals(subscriber.list, lines(text, null));
+        assertEquals(expected.stream().collect(Collectors.joining("")), subscriber.text);
+        assertEquals(expected, subscriber.list);
+        assertEquals(lines(text, null), subscriber.list);
     }
 
 
diff --git a/test/jdk/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java
index ee79ac80b68..3609aa8337a 100644
--- a/test/jdk/java/net/httpclient/ManyRequests.java
+++ b/test/jdk/java/net/httpclient/ManyRequests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,8 @@
  * @test
  * @bug 8087112 8180044 8256459
  * @key intermittent
- * @modules java.net.http/jdk.internal.net.http.common
- *          java.logging
- *          jdk.httpserver
  * @library /test/lib /test/jdk/java/net/httpclient/lib
- * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestServerConfigurator
- * @compile ../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../com/sun/net/httpserver/EchoHandler.java
- * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
+ * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
  * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests
  * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=channel -Dtest.insertDelay=true ManyRequests
  * @run main/othervm/timeout=160 -Djdk.httpclient.HttpClient.log=channel -Dtest.chunkSize=64 ManyRequests
@@ -41,19 +35,14 @@
  */
  // * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=ssl,channel ManyRequests
 
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsParameters;
-import com.sun.net.httpserver.HttpsServer;
-import com.sun.net.httpserver.HttpExchange;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Builder;
+import java.net.http.HttpClient.Version;
 import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
@@ -61,7 +50,6 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Formatter;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Random;
@@ -77,15 +65,14 @@ import java.util.logging.Level;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLParameters;
 
-import jdk.httpclient.test.lib.common.TestServerConfigurator;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.Platform;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
 
-public class ManyRequests {
+public class ManyRequests implements HttpServerAdapters {
 
     static final int MAX_COUNT = 50;
     static final int MAX_LIMIT = 40;
@@ -106,11 +93,8 @@ public class ManyRequests {
                          + ", XFixed=" + XFIXED);
         SSLContext ctx = SimpleSSLContext.findSSLContext();
 
-        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
-        HttpsServer server = HttpsServer.create(addr, 0);
         ExecutorService executor = executorFor("HTTPS/1.1 Server Thread");
-        server.setHttpsConfigurator(new Configurator(addr.getAddress(), ctx));
-        server.setExecutor(executor);
+        HttpTestServer server = HttpTestServer.create(Version.HTTP_1_1, ctx, executor);
         ExecutorService virtualExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
                 .name("HttpClient-Worker", 0).factory());
 
@@ -125,7 +109,7 @@ public class ManyRequests {
             System.out.println("OK");
         } finally {
             client.close();
-            server.stop(0);
+            server.stop();
             virtualExecutor.close();
             executor.shutdownNow();
         }
@@ -138,15 +122,15 @@ public class ManyRequests {
            Integer.parseInt(System.getProperty("test.chunkSize", "0")));
     static final boolean XFIXED = Boolean.getBoolean("test.XFixed");
 
-    static class TestEchoHandler extends EchoHandler {
+    static class TestEchoHandler extends HttpTestEchoHandler {
         final Random rand = RANDOM;
         @Override
-        public void handle(HttpExchange e) throws IOException {
+        public void handle(HttpTestExchange e) throws IOException {
             System.out.println("Server: received " + e.getRequestURI());
             super.handle(e);
         }
         @Override
-        protected void close(HttpExchange t, OutputStream os) throws IOException {
+        protected void close(HttpTestExchange t, OutputStream os) throws IOException {
             if (INSERT_DELAY) {
                 try { Thread.sleep(rand.nextInt(200)); }
                 catch (InterruptedException e) {}
@@ -155,7 +139,7 @@ public class ManyRequests {
             super.close(t, os);
         }
         @Override
-        protected void close(HttpExchange t, InputStream is) throws IOException {
+        protected void close(HttpTestExchange t, InputStream is) throws IOException {
             if (INSERT_DELAY) {
                 try { Thread.sleep(rand.nextInt(200)); }
                 catch (InterruptedException e) {}
@@ -181,7 +165,7 @@ public class ManyRequests {
         return s;
     }
 
-    static void test(HttpsServer server, HttpClient client) throws Exception {
+    static void test(HttpTestServer server, HttpClient client) throws Exception {
         int port = server.getAddress().getPort();
 
         URI baseURI = URIBuilder.newBuilder()
@@ -213,8 +197,11 @@ public class ManyRequests {
                 byte[] buf = new byte[(i + 1) * CHUNK_SIZE + i + 1];  // different size bodies
                 rand.nextBytes(buf);
                 URI uri = new URI(baseURI.toString() + String.valueOf(i + 1));
-                HttpRequest r = HttpRequest.newBuilder(uri)
-                        .header("XFixed", "true")
+                HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(uri);
+                if (XFIXED) {
+                    reqBuilder.header("XFixed", "yes");
+                }
+                HttpRequest r = reqBuilder
                         .POST(BodyPublishers.ofByteArray(buf))
                         .build();
                 bodies.put(r, buf);
@@ -367,21 +354,6 @@ public class ManyRequests {
         throw new RuntimeException(sb.toString());
     }
 
-    static class Configurator extends HttpsConfigurator {
-        private final InetAddress serverAddr;
-        public Configurator(InetAddress serverAddr, SSLContext ctx) {
-            super(ctx);
-            this.serverAddr = serverAddr;
-        }
-
-        @Override
-        public void configure(HttpsParameters params) {
-            final SSLParameters parameters = getSSLContext().getSupportedSSLParameters();
-            TestServerConfigurator.addSNIMatcher(this.serverAddr, parameters);
-            params.setSSLParameters(parameters);
-        }
-    }
-
     private static ExecutorService executorFor(String serverThreadName) {
         ThreadFactory factory = new ThreadFactory() {
             final AtomicInteger counter = new AtomicInteger();
diff --git a/test/jdk/java/net/httpclient/ManyRequests2.java b/test/jdk/java/net/httpclient/ManyRequests2.java
index a1e2307b820..09fdc18f687 100644
--- a/test/jdk/java/net/httpclient/ManyRequests2.java
+++ b/test/jdk/java/net/httpclient/ManyRequests2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,8 @@
 /*
  * @test
  * @bug 8087112 8180044 8256459
- * @modules java.net.http/jdk.internal.net.http.common
- *          java.logging
- *          jdk.httpserver
  * @library /test/lib /test/jdk/java/net/httpclient/lib
- * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestServerConfigurator
- * @compile ../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../com/sun/net/httpserver/EchoHandler.java
- * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
+ * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
  * @build ManyRequests ManyRequests2
  * @run main/othervm/timeout=400 -Dsun.net.httpserver.idleInterval=400 -Dtest.XFixed=true
  *                              -Djdk.httpclient.HttpClient.log=channel ManyRequests2
diff --git a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
index 2e58ee50bff..f1c4f881058 100644
--- a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
+++ b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,14 +23,8 @@
 
 /*
  * @test
- * @modules java.net.http/jdk.internal.net.http.common
- *          java.logging
- *          jdk.httpserver
  * @library /test/lib /test/jdk/java/net/httpclient/lib
- * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestServerConfigurator
- * @compile ../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../com/sun/net/httpserver/EchoHandler.java
- * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
+ * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
  * @run main/othervm/timeout=80 -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
  * @run main/othervm/timeout=80 -Dtest.insertDelay=true -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
  * @run main/othervm/timeout=80 -Dtest.chunkSize=64 -Dsun.net.httpserver.idleInterval=50000 ManyRequestsLegacy
@@ -44,16 +38,11 @@
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.HostnameVerifier;
 
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsParameters;
-import com.sun.net.httpserver.HttpsServer;
-import com.sun.net.httpserver.HttpExchange;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
-import java.net.InetAddress;
 import java.net.URI;
 import java.net.URLConnection;
 import java.util.Map;
@@ -62,10 +51,12 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSession;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
@@ -73,22 +64,22 @@ import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
-import java.net.InetSocketAddress;
 import java.util.Arrays;
 import java.util.Formatter;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Random;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
-import jdk.httpclient.test.lib.common.TestServerConfigurator;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.Platform;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+
 import static java.net.Proxy.NO_PROXY;
 
-public class ManyRequestsLegacy {
+public class ManyRequestsLegacy implements HttpServerAdapters {
 
     static final int MAX_COUNT = 20;
     static final int MAX_LIMIT = 40;
@@ -112,9 +103,8 @@ public class ManyRequestsLegacy {
                     return true;
                 }
             });
-        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
-        HttpsServer server = HttpsServer.create(addr, 0);
-        server.setHttpsConfigurator(new Configurator(addr.getAddress(), ctx));
+        ExecutorService executor = executorFor("HTTPS/1.1 Server Thread");
+        HttpTestServer server = HttpTestServer.create(Version.HTTP_1_1, ctx, executor);
 
         LegacyHttpClient client = new LegacyHttpClient();
 
@@ -122,7 +112,7 @@ public class ManyRequestsLegacy {
             test(server, client);
             System.out.println("OK");
         } finally {
-            server.stop(0);
+            server.stop();
         }
     }
 
@@ -210,15 +200,15 @@ public class ManyRequestsLegacy {
         }
     }
 
-    static class TestEchoHandler extends EchoHandler {
+    static class TestEchoHandler extends HttpTestEchoHandler {
         final Random rand = RANDOM;
         @Override
-        public void handle(HttpExchange e) throws IOException {
+        public void handle(HttpTestExchange e) throws IOException {
             System.out.println("Server: received " + e.getRequestURI());
             super.handle(e);
         }
         @Override
-        protected void close(HttpExchange t, OutputStream os) throws IOException {
+        protected void close(HttpTestExchange t, OutputStream os) throws IOException {
             if (INSERT_DELAY) {
                 try { Thread.sleep(rand.nextInt(200)); }
                 catch (InterruptedException e) {}
@@ -227,7 +217,7 @@ public class ManyRequestsLegacy {
             os.close();
         }
         @Override
-        protected void close(HttpExchange t, InputStream is) throws IOException {
+        protected void close(HttpTestExchange t, InputStream is) throws IOException {
             if (INSERT_DELAY) {
                 try { Thread.sleep(rand.nextInt(200)); }
                 catch (InterruptedException e) {}
@@ -253,9 +243,13 @@ public class ManyRequestsLegacy {
         return s;
     }
 
-    static void test(HttpsServer server, LegacyHttpClient client) throws Exception {
+    static void test(HttpTestServer server, LegacyHttpClient client) throws Exception {
         int port = server.getAddress().getPort();
-        URI baseURI = new URI("https://localhost:" + port + "/foo/x");
+        URI baseURI = URIBuilder.newBuilder()
+                .scheme("https")
+                .loopback()
+                .port(port)
+                .path("/foo/x").build();
         server.createContext("/foo", new TestEchoHandler());
         server.start();
 
@@ -279,8 +273,11 @@ public class ManyRequestsLegacy {
                 byte[] buf = new byte[(i + 1) * CHUNK_SIZE + i + 1];  // different size bodies
                 rand.nextBytes(buf);
                 URI uri = new URI(baseURI.toString() + String.valueOf(i + 1));
-                HttpRequest r = HttpRequest.newBuilder(uri)
-                        .header("XFixed", "true")
+                HttpRequest.Builder reqBuilder = HttpRequest.newBuilder(uri);
+                if (XFIXED) {
+                    reqBuilder.header("XFixed", "yes");
+                }
+                HttpRequest r = reqBuilder
                         .POST(BodyPublishers.ofByteArray(buf))
                         .build();
                 bodies.put(r, buf);
@@ -432,19 +429,16 @@ public class ManyRequestsLegacy {
         throw new RuntimeException(sb.toString());
     }
 
-    static class Configurator extends HttpsConfigurator {
-        private final InetAddress serverAddr;
-
-        public Configurator(InetAddress serverAddr, SSLContext ctx) {
-            super(ctx);
-            this.serverAddr = serverAddr;
-        }
-
-        @Override
-        public void configure(HttpsParameters params) {
-            final SSLParameters parameters = getSSLContext().getSupportedSSLParameters();
-            TestServerConfigurator.addSNIMatcher(this.serverAddr, parameters);
-            params.setSSLParameters(parameters);
-        }
+    private static ExecutorService executorFor(String serverThreadName) {
+        ThreadFactory factory = new ThreadFactory() {
+            final AtomicInteger counter = new AtomicInteger();
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread thread = new Thread(r);
+                thread.setName(serverThreadName + "#" + counter.incrementAndGet());
+                return thread;
+            }
+        };
+        return Executors.newCachedThreadPool(factory);
     }
 }
diff --git a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
index 445b4a59e24..75454923e49 100644
--- a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *      MappingResponseSubscriber
  */
@@ -64,30 +64,32 @@ import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.test.lib.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class MappingResponseSubscriber {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
-    HttpsServer httpsTestServer;       // HTTPS/1.1
-    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
-    Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
+    private static HttpServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    private static HttpsServer httpsTestServer;       // HTTPS/1.1
+    private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static Http2TestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
 
     static final int ITERATION_COUNT = 3;
     // a shared executor helps reduce the amount of threads created by the test
@@ -95,8 +97,7 @@ public class MappingResponseSubscriber {
 
     static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { httpURI_fixed,    false },
                 { httpURI_chunk,    false },
@@ -125,7 +126,8 @@ public class MappingResponseSubscriber {
                          .build();
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsBytes(String uri, boolean sameClient) throws Exception {
         HttpClient client = null;
         for (int i = 0; i < ITERATION_COUNT; i++) {
@@ -137,7 +139,7 @@ public class MappingResponseSubscriber {
             BodyHandler<byte[]> handler = new CRSBodyHandler();
             HttpResponse<byte[]> response = client.send(req, handler);
             byte[] body = response.body();
-            assertEquals(body, bytes);
+            Assertions.assertArrayEquals(bytes, body);
 
             // if sameClient we will reuse the client for the next
             // operation, so there's nothing more to do.
@@ -163,7 +165,7 @@ public class MappingResponseSubscriber {
     static class CRSBodyHandler implements BodyHandler<byte[]> {
         @Override
         public BodySubscriber<byte[]> apply(HttpResponse.ResponseInfo rinfo) {
-            assertEquals(rinfo.statusCode(), 200);
+            assertEquals(200, rinfo.statusCode());
             return BodySubscribers.mapping(
                 new CRSBodySubscriber(), (s) -> s.getBytes(UTF_8)
             );
@@ -213,8 +215,8 @@ public class MappingResponseSubscriber {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler();
         HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler();
@@ -254,8 +256,8 @@ public class MappingResponseSubscriber {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop(0);
         httpsTestServer.stop(0);
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/MaxStreams.java b/test/jdk/java/net/httpclient/MaxStreams.java
index b25f931be9d..00875aceb6f 100644
--- a/test/jdk/java/net/httpclient/MaxStreams.java
+++ b/test/jdk/java/net/httpclient/MaxStreams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Should HttpClient support SETTINGS_MAX_CONCURRENT_STREAMS from the server
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm MaxStreams
+ * @run junit/othervm MaxStreams
  */
 
 import java.io.IOException;
@@ -53,24 +53,24 @@ import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class MaxStreams {
 
-    Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
-    Http2TestServer https2TestServer;   // HTTP/2 ( h2 )
-    final Http2FixedHandler handler = new Http2FixedHandler();
+    private static Http2TestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static Http2TestServer https2TestServer;   // HTTP/2 ( h2 )
+    private static final Http2FixedHandler handler = new Http2FixedHandler();
     private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
-    String http2FixedURI;
-    String https2FixedURI;
-    ExecutorService exec;
+    private static String http2FixedURI;
+    private static String https2FixedURI;
+    private static ExecutorService exec;
 
     // we send an initial warm up request, then MAX_STREAMS+1 requests
     // in parallel. The last of them should hit the limit.
@@ -81,8 +81,7 @@ public class MaxStreams {
     static final int MAX_STREAMS = 10;
     static final String RESPONSE = "Hello world";
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 {http2FixedURI},
                 {https2FixedURI},
@@ -92,7 +91,8 @@ public class MaxStreams {
     }
 
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsString(String uri) throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
         handler.setLatch(latch);
@@ -161,8 +161,8 @@ public class MaxStreams {
         System.err.println("Test OK");
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         exec = Executors.newCachedThreadPool();
 
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
@@ -180,13 +180,13 @@ public class MaxStreams {
         https2TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("Stopping test server now");
         http2TestServer.stop();
     }
 
-    class Http2FixedHandler implements Http2Handler {
+    static class Http2FixedHandler implements Http2Handler {
         final AtomicInteger counter = new AtomicInteger(0);
         volatile CountDownLatch latch;
 
diff --git a/test/jdk/java/net/httpclient/NoBodyPartOne.java b/test/jdk/java/net/httpclient/NoBodyPartOne.java
index 7c7a51c92e7..980f4d8d100 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartOne.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartOne.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Test response body handlers/subscribers when there is no body
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=all
  *      NoBodyPartOne
@@ -42,16 +42,21 @@ import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodyHandlers;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+// @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+// is inherited from the super class
 public class NoBodyPartOne extends AbstractNoBody {
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsString(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testAsString(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -70,12 +75,13 @@ public class NoBodyPartOne extends AbstractNoBody {
                         : BodyHandlers.ofString(UTF_8);
                 HttpResponse<String> response = client.send(req, handler);
                 String body = response.body();
-                assertEquals(body, "");
+                assertEquals("", body);
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsFile(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testAsFile(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -94,14 +100,15 @@ public class NoBodyPartOne extends AbstractNoBody {
                 Path p = Paths.get("NoBody_testAsFile.txt");
                 HttpResponse<Path> response = client.send(req, BodyHandlers.ofFile(p));
                 Path bodyPath = response.body();
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
                 assertTrue(Files.exists(bodyPath));
-                assertEquals(Files.size(bodyPath), 0, Files.readString(bodyPath));
+                assertEquals(0, Files.size(bodyPath), Files.readString(bodyPath));
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsByteArray(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testAsByteArray(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -119,7 +126,7 @@ public class NoBodyPartOne extends AbstractNoBody {
                         .build();
                 HttpResponse<byte[]> response = client.send(req, BodyHandlers.ofByteArray());
                 byte[] body = response.body();
-                assertEquals(body.length, 0);
+                assertEquals(0, body.length);
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/NoBodyPartThree.java b/test/jdk/java/net/httpclient/NoBodyPartThree.java
index d5e310d1914..7020f7e2c25 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartThree.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartThree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Test request and response body handlers/subscribers when there is no body
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.httpclient.HttpClient.log=quic,errors
  *      -Djdk.httpclient.HttpClient.log=all
  *      NoBodyPartThree
@@ -46,19 +46,24 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 
 import jdk.internal.net.http.common.Utils;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+// @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+// is inherited from the super class
 public class NoBodyPartThree extends AbstractNoBody {
 
     static final AtomicInteger REQID = new AtomicInteger();
 
     volatile boolean consumerHasBeenCalled;
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsByteArrayPublisher(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testAsByteArrayPublisher(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -83,7 +88,7 @@ public class NoBodyPartThree extends AbstractNoBody {
                 consumerHasBeenCalled = false;
                 var response = client.send(req, BodyHandlers.ofByteArrayConsumer(consumer));
                 assertTrue(consumerHasBeenCalled);
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
 
                 u = uri + "/testAsByteArrayPublisher/second/" + REQID.getAndIncrement();
                 req = newRequestBuilder(u + "?echo")
@@ -93,12 +98,13 @@ public class NoBodyPartThree extends AbstractNoBody {
                 consumerHasBeenCalled = false;
                 response = client.send(req, BodyHandlers.ofByteArrayConsumer(consumer));
                 assertTrue(consumerHasBeenCalled);
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testStringPublisher(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testStringPublisher(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -116,14 +122,15 @@ public class NoBodyPartThree extends AbstractNoBody {
                         .build();
                 System.out.println("sending " + req);
                 HttpResponse<InputStream> response = client.send(req, BodyHandlers.ofInputStream());
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
                 byte[] body = response.body().readAllBytes();
-                assertEquals(body.length, 0);
+                assertEquals(0, body.length);
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testInputStreamPublisherBuffering(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testInputStreamPublisherBuffering(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -142,14 +149,15 @@ public class NoBodyPartThree extends AbstractNoBody {
                 System.out.println("sending " + req);
                 HttpResponse<byte[]> response = client.send(req,
                         BodyHandlers.buffering(BodyHandlers.ofByteArray(), 1024));
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
                 byte[] body = response.body();
-                assertEquals(body.length, 0);
+                assertEquals(0, body.length);
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testEmptyArrayPublisher(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testEmptyArrayPublisher(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -167,8 +175,8 @@ public class NoBodyPartThree extends AbstractNoBody {
                         .build();
                 System.out.println("sending " + req);
                 var response = client.send(req, BodyHandlers.ofLines());
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.body().toList(), List.of());
+                assertEquals(200, response.statusCode());
+                assertEquals(List.of(), response.body().toList());
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/NoBodyPartTwo.java b/test/jdk/java/net/httpclient/NoBodyPartTwo.java
index f7d331cb526..9e7ceb11c55 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartTwo.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartTwo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Test response body handlers/subscribers when there is no body
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=all
  *      NoBodyPartTwo
@@ -44,17 +44,22 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 
 import jdk.internal.net.http.common.Utils;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+// @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+// is inherited from the super class
 public class NoBodyPartTwo extends AbstractNoBody {
 
     volatile boolean consumerHasBeenCalled;
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsByteArrayConsumer(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testAsByteArrayConsumer(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -81,7 +86,8 @@ public class NoBodyPartTwo extends AbstractNoBody {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsInputStream(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testAsInputStream(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -98,12 +104,13 @@ public class NoBodyPartTwo extends AbstractNoBody {
                         .build();
                 HttpResponse<InputStream> response = client.send(req, BodyHandlers.ofInputStream());
                 byte[] body = response.body().readAllBytes();
-                assertEquals(body.length, 0);
+                assertEquals(0, body.length);
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testBuffering(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testBuffering(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -121,12 +128,13 @@ public class NoBodyPartTwo extends AbstractNoBody {
                 HttpResponse<byte[]> response = client.send(req,
                         BodyHandlers.buffering(BodyHandlers.ofByteArray(), 1024));
                 byte[] body = response.body();
-                assertEquals(body.length, 0);
+                assertEquals(0, body.length);
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testDiscard(String uri, boolean sameClient) throws Exception {
         printStamp(START, "testDiscard(\"%s\", %s)", uri, sameClient);
         HttpClient client = null;
@@ -143,7 +151,7 @@ public class NoBodyPartTwo extends AbstractNoBody {
                         .build();
                 Object obj = new Object();
                 HttpResponse<Object> response = client.send(req, BodyHandlers.replacing(obj));
-                assertEquals(response.body(), obj);
+                assertEquals(obj, response.body());
             }
         }
     }
diff --git a/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java b/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
index 0a0da6366ad..2e53479a6ee 100644
--- a/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
+++ b/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  * @compile -encoding utf-8 NonAsciiCharsInURI.java
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=requests,headers,errors,quic
  *       NonAsciiCharsInURI
  */
@@ -51,10 +51,6 @@ import java.util.List;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.err;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
@@ -63,24 +59,29 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class NonAsciiCharsInURI implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;         // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;        // HTTPS/1.1
-    HttpTestServer http2TestServer;        // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;       // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;        // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
-    String http3URI_head;
+    private static HttpTestServer httpTestServer;         // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;        // HTTPS/1.1
+    private static HttpTestServer http2TestServer;        // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;       // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;        // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
+    private static String http3URI_head;
 
-    private volatile HttpClient sharedClient;
+    private static volatile HttpClient sharedClient;
 
     // € = '\u20AC' => 0xE20x820xAC
     static final String[][] pathsAndQueryStrings = new String[][] {
@@ -93,8 +94,7 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
             {  "/006/x?url=https://ja.wikipedia.org/wiki/エリザベス1世_(イングランド女王)" },
     };
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         List<Object[]> list = new ArrayList<>();
 
         for (boolean sameClient : new boolean[] { false, true }) {
@@ -136,7 +136,7 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
         return null;
     }
 
-    HttpRequest.Builder newRequestBuilder(String uri) {
+    static HttpRequest.Builder newRequestBuilder(String uri) {
         var builder = HttpRequest.newBuilder(URI.create(uri));
         if (version(uri) == HTTP_3) {
             builder.version(HTTP_3);
@@ -145,7 +145,7 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
         return builder;
     }
 
-    HttpResponse<String> headRequest(HttpClient client)
+    static HttpResponse<String> headRequest(HttpClient client)
             throws IOException, InterruptedException
     {
         out.println("\n" + now() + "--- Sending HEAD request ----\n");
@@ -154,25 +154,26 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
         var request = newRequestBuilder(http3URI_head)
                 .HEAD().version(HTTP_2).build();
         var response = client.send(request, BodyHandlers.ofString());
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_2);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_2, response.version());
         out.println("\n" + now() + "--- HEAD request succeeded ----\n");
         err.println("\n" + now() + "--- HEAD request succeeded ----\n");
         return response;
     }
 
-    private HttpClient makeNewClient() {
-        return newClientBuilderForH3()
+    private static HttpClient makeNewClient() {
+        return HttpServerAdapters.createClientBuilderForH3()
                 .proxy(NO_PROXY)
                 .sslContext(sslContext)
                 .build();
     }
 
-    HttpClient newHttpClient(boolean share) {
+    private static final Object zis = new Object();
+    static HttpClient newHttpClient(boolean share) {
         if (!share) return makeNewClient();
         HttpClient shared = sharedClient;
         if (shared != null) return shared;
-        synchronized (this) {
+        synchronized (zis) {
             shared = sharedClient;
             if (shared == null) {
                 shared = sharedClient = makeNewClient();
@@ -191,7 +192,8 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
 
     static final int ITERATION_COUNT = 3; // checks upgrade and re-use
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void test(String uriString, boolean sameClient) throws Exception {
         out.println("\n--- Starting ");
         // The single-argument factory requires any illegal characters in its
@@ -215,7 +217,7 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
 
                 out.println("Got response: " + resp);
                 out.println("Got body: " + resp.body());
-                assertEquals(resp.statusCode(), 200,
+                assertEquals(200, resp.statusCode(),
                         "Expected 200, got:" + resp.statusCode());
 
                 // the response body should contain the toASCIIString
@@ -228,12 +230,13 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
                 } else {
                     out.println("Found expected " + resp.body() + " in " + expectedURIString);
                 }
-                assertEquals(resp.version(), version(uriString));
+                assertEquals(version(uriString), resp.version());
             }
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsync(String uriString, boolean sameClient) throws Exception {
         out.println("\n--- Starting ");
         URI uri = URI.create(uriString);
@@ -254,8 +257,8 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
                         .thenApply(response -> {
                             out.println("Got response: " + response);
                             out.println("Got body: " + response.body());
-                            assertEquals(response.statusCode(), 200);
-                            assertEquals(response.version(), version(uriString));
+                            assertEquals(200, response.statusCode());
+                            assertEquals(version(uriString), response.version());
                             return response.body();
                         })
                         .thenAccept(body -> {
@@ -276,8 +279,8 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println(now() + "begin setup");
 
         HttpTestHandler handler = new HttpUriStringHandler();
@@ -324,8 +327,8 @@ public class NonAsciiCharsInURI implements HttpServerAdapters {
         err.println(now() + "setup done");
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sharedClient.close();
         httpTestServer.stop();
         httpsTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/NullReturningBodyHandlerTest.java b/test/jdk/java/net/httpclient/NullReturningBodyHandlerTest.java
new file mode 100644
index 00000000000..2b2e6b2135d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/NullReturningBodyHandlerTest.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpOption;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.ResponseInfo;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import javax.net.ssl.SSLContext;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestEchoHandler;
+import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/*
+ * @test
+ * @bug 8377796
+ * @summary Verify that HttpClient.send()/sendAsync() complete exceptionally
+ *          when BodyHandler.apply() returns null
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.httpclient.test.lib.common.HttpServerAdapters
+ *        jdk.test.lib.net.SimpleSSLContext
+ *        jdk.test.lib.net.URIBuilder
+ * @run junit ${test.main.class}
+ */
+class NullReturningBodyHandlerTest {
+    private static final String CTX_PATH = "/" + NullReturningBodyHandlerTest.class.getName();
+
+    private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
+    private static HttpClient client;
+
+    private static HttpTestServer h1HttpServer;
+    private static HttpTestServer h1HttpsServer;
+
+    private static HttpTestServer h2HttpServer;
+    private static HttpTestServer h2HttpsServer;
+
+    private static HttpTestServer h3Server;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        h1HttpServer = HttpTestServer.create(Version.HTTP_1_1);
+        h1HttpServer.addHandler(new HttpTestEchoHandler(false), CTX_PATH);
+        h1HttpServer.start();
+        System.err.println("HTTP/1.1 http server started at " + h1HttpServer.getAddress());
+
+        h1HttpsServer = HttpTestServer.create(Version.HTTP_1_1, sslContext);
+        h1HttpsServer.addHandler(new HttpTestEchoHandler(false), CTX_PATH);
+        h1HttpsServer.start();
+        System.err.println("HTTP/1.1 https server started at " + h1HttpsServer.getAddress());
+
+        h2HttpServer = HttpTestServer.create(Version.HTTP_2);
+        h2HttpServer.addHandler(new HttpTestEchoHandler(false), CTX_PATH);
+        h2HttpServer.start();
+        System.err.println("HTTP/2 http server started at " + h2HttpServer.getAddress());
+
+        h2HttpsServer = HttpTestServer.create(Version.HTTP_2, sslContext);
+        h2HttpsServer.addHandler(new HttpTestEchoHandler(false), CTX_PATH);
+        h2HttpsServer.start();
+        System.err.println("HTTP/2 https server started at " + h2HttpsServer.getAddress());
+
+        h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
+        h3Server.addHandler(new HttpTestEchoHandler(false), CTX_PATH);
+        h3Server.start();
+        System.err.println("HTTP/3 server started at " + h3Server.getAddress());
+
+        client = HttpServerAdapters.createClientBuilderForH3()
+                .sslContext(sslContext)
+                .proxy(NO_PROXY)
+                .build();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        close(h1HttpServer);
+        close(h1HttpsServer);
+
+        close(h2HttpServer);
+        close(h2HttpsServer);
+
+        close(h3Server);
+
+        close(client);
+    }
+
+    private static void close(final AutoCloseable resource) throws Exception {
+        if (resource == null) {
+            return;
+        }
+        System.err.println("closing " + resource);
+        resource.close();
+    }
+
+    static List<Arguments> params() throws Exception {
+        final List<Arguments> args = new ArrayList<>();
+
+        final URI h1HttpsReq = URIBuilder.newBuilder()
+                .scheme("https")
+                .host(h1HttpsServer.getAddress().getAddress())
+                .port(h1HttpsServer.getAddress().getPort())
+                .path(CTX_PATH)
+                .query("reqVersion=h1")
+                .build();
+        args.add(Arguments.of(h1HttpsReq, Version.HTTP_1_1, false));
+
+        final URI h1HttpReq = URIBuilder.newBuilder()
+                .scheme("http")
+                .host(h1HttpServer.getAddress().getAddress())
+                .port(h1HttpServer.getAddress().getPort())
+                .path(CTX_PATH)
+                .query("reqVersion=h1&scheme=http")
+                .build();
+        args.add(Arguments.of(h1HttpReq, Version.HTTP_1_1, false));
+
+        final URI h2Req = URIBuilder.newBuilder()
+                .scheme("https")
+                .host(h2HttpsServer.getAddress().getAddress())
+                .port(h2HttpsServer.getAddress().getPort())
+                .path(CTX_PATH)
+                .query("reqVersion=h2")
+                .build();
+        args.add(Arguments.of(h2Req, Version.HTTP_2, false));
+
+        final URI h2HttpReq = URIBuilder.newBuilder()
+                .scheme("http")
+                .host(h2HttpServer.getAddress().getAddress())
+                .port(h2HttpServer.getAddress().getPort())
+                .path(CTX_PATH)
+                .query("reqVersion=h2&scheme=http")
+                .build();
+        // test for HTTP/2 upgrade when there are no already established connections
+        args.add(Arguments.of(h2HttpReq, Version.HTTP_2, false));
+        // test for HTTP/2 upgrade when there is an established connection
+        args.add(Arguments.of(h2HttpReq, Version.HTTP_2, true));
+
+        final URI h3Req = URIBuilder.newBuilder()
+                .scheme("https")
+                .host(h3Server.getAddress().getAddress())
+                .port(h3Server.getAddress().getPort())
+                .path(CTX_PATH)
+                .query("reqVersion=h3")
+                .build();
+        args.add(Arguments.of(h3Req, Version.HTTP_3, false));
+        return args;
+    }
+
+    /*
+     * Issues a HTTP request with a BodyHandler implementation that returns a null
+     * BodySubscriber. The test then verifies that the request fails and the exception
+     * that's raised contains the expected NullPointerException (raised due to
+     * BodyHandler.apply(...) returning null).
+     */
+    @ParameterizedTest
+    @MethodSource("params")
+    void test(final URI reqURI, final Version version,
+              final boolean requiresWarmupHEADRequest) throws Exception {
+        if (requiresWarmupHEADRequest) {
+            // the test only issues a warmup request for HTTP/2 requests
+            assertEquals(Version.HTTP_2, version, "unexpected HTTP version");
+            final HttpRequest head = HttpRequest.newBuilder().HEAD()
+                    .version(version)
+                    .uri(reqURI)
+                    .build();
+            System.err.println("issuing warmup head request " + head);
+            HttpResponse<Void> headResp = client.send(head, HttpResponse.BodyHandlers.discarding());
+            assertEquals(200, headResp.statusCode(), "unexpected status code for HEAD request");
+        }
+        // now run the actual test
+        final HttpRequest.Builder builder = HttpRequest.newBuilder()
+                .version(version)
+                .uri(reqURI);
+        if (version == Version.HTTP_3) {
+            builder.setOption(HttpOption.H3_DISCOVERY, HTTP_3_URI_ONLY);
+        }
+        final HttpRequest req = builder.build();
+        // test synchronous send()
+        System.err.println("issuing request " + reqURI);
+        final IOException ioe = assertThrows(IOException.class,
+                () -> client.send(req, new AlwaysReturnsNull()));
+        if (!(ioe.getCause() instanceof NullPointerException)) {
+            throw ioe; // propagate the original exception
+        }
+        // now test with sendAsync()
+        System.err.println("issuing async request " + reqURI);
+        final Future<HttpResponse<String>> f = client.sendAsync(req, new AlwaysReturnsNull());
+        final ExecutionException ee = assertThrows(ExecutionException.class, f::get);
+        if (!(ee.getCause() instanceof IOException cause)
+                || !(cause.getCause() instanceof NullPointerException)) {
+            throw ee; // propagate the original exception
+        }
+    }
+
+    private static final class AlwaysReturnsNull implements BodyHandler<String> {
+        @Override
+        public BodySubscriber<String> apply(final ResponseInfo responseInfo) {
+            return null;
+        }
+    }
+}
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
index eb397d37b7a..92d359e32c6 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileDownloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,15 +37,11 @@
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.Platform
  *        jdk.test.lib.util.FileUtils
- * @run testng/othervm BodyHandlerOfFileDownloadTest
+ * @run junit/othervm BodyHandlerOfFileDownloadTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -73,28 +69,35 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
 import static java.nio.file.StandardOpenOption.WRITE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
     static final String MSG = "msg";
     static final String contentDispositionValue = "attachment; filename=example.html";
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    FileSystem zipFs;
-    Path defaultFsPath;
-    Path zipFsPath;
+    private static FileSystem zipFs;
+    private static Path defaultFsPath;
+    private static Path zipFsPath;
 
     // Default file system
 
@@ -106,12 +109,10 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
         return dir;
     }
 
-    @DataProvider(name = "defaultFsData")
-    public Object[][] defaultFsData() {
+    public static Object[][] defaultFsData() {
         return new Object[][]{
                 {  http3URI,   defaultFsPath,  MSG,  true   },
                 {  http3URI,   defaultFsPath,  MSG,  false  },
-
                 {  httpURI,    defaultFsPath,  MSG,  true   },
                 {  httpsURI,   defaultFsPath,  MSG,  true   },
                 {  http2URI,   defaultFsPath,  MSG,  true   },
@@ -123,7 +124,8 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "defaultFsData")
+    @ParameterizedTest
+    @MethodSource("defaultFsData")
     public void testDefaultFs(String uriString,
                               Path path,
                               String expectedMsg,
@@ -171,10 +173,10 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
             out.printf("Resp code: %s\n", resp.statusCode());
             out.println("Resp body Path: " + resp.body());
             out.printf("Resp body written to file: %s\n", msg);
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(msg, expectedMsg);
+            assertEquals(200, resp.statusCode());
+            assertEquals(expectedMsg, msg);
             assertTrue(resp.headers().firstValue("Content-Disposition").isPresent());
-            assertEquals(resp.headers().firstValue("Content-Disposition").get(), contentDispositionValue);
+            assertEquals(contentDispositionValue, resp.headers().firstValue("Content-Disposition").get());
             if (!sameClient) {
                 client.close();
             }
@@ -199,15 +201,17 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
         return dir;
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void testZipFs() {
-        out.printf("\n\n--- testZipFs(): starting\n");
-        BodyHandlers.ofFileDownload(zipFsPath, CREATE, TRUNCATE_EXISTING, WRITE);
+        Assertions.assertThrows(IllegalArgumentException.class, () -> {
+            out.printf("\n\n--- testZipFs(): starting\n");
+            BodyHandlers.ofFileDownload(zipFsPath, CREATE, TRUNCATE_EXISTING, WRITE);
+        });
     }
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         defaultFsPath = defaultFsDir();
         zipFs = newZipFs();
         zipFsPath = zipFsDir(zipFs);
@@ -239,8 +243,8 @@ public class BodyHandlerOfFileDownloadTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         if (Files.exists(zipFsPath))
             FileUtils.deleteFileTreeWithRetry(zipFsPath);
         if (Files.exists(defaultFsPath))
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
index 13871933eac..53b8607f294 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodyHandlerOfFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,15 +36,11 @@
  *        jdk.httpclient.test.lib.http2.Queue
  *        jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.Platform jdk.test.lib.util.FileUtils
- * @run testng/othervm BodyHandlerOfFileTest
+ * @run junit/othervm BodyHandlerOfFileTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -56,7 +52,10 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Map;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import static java.lang.System.out;
@@ -66,26 +65,31 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BodyHandlerOfFileTest implements HttpServerAdapters {
     static final String MSG = "msg";
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    FileSystem zipFs;
-    Path defaultFsPath;
-    Path zipFsPath;
+    private static FileSystem zipFs;
+    private static Path defaultFsPath;
+    private static Path zipFsPath;
 
     // Default file system set-up
 
@@ -97,8 +101,7 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
         return file;
     }
 
-    @DataProvider(name = "defaultFsData")
-    public Object[][] defaultFsData() {
+    public static Object[][] defaultFsData() {
         return new Object[][]{
                 {  http3URI,   defaultFsPath,  MSG,  true   },
                 {  http3URI,   defaultFsPath,  MSG,  false  },
@@ -114,7 +117,8 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "defaultFsData")
+    @ParameterizedTest
+    @MethodSource("defaultFsData")
     public void testDefaultFs(String uriString,
                               Path path,
                               String expectedMsg,
@@ -139,8 +143,7 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
         return file;
     }
 
-    @DataProvider(name = "zipFsData")
-    public Object[][] zipFsData() {
+    public static Object[][] zipFsData() {
         return new Object[][]{
                 {  http3URI,   zipFsPath,  MSG,  true   },
                 {  http3URI,   zipFsPath,  MSG,  false  },
@@ -156,7 +159,8 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "zipFsData")
+    @ParameterizedTest
+    @MethodSource("zipFsData")
     public void testZipFs(String uriString,
                           Path path,
                           String expectedMsg,
@@ -203,8 +207,8 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
             String msg = Files.readString(path, StandardCharsets.UTF_8);
             out.printf("Resp code: %s\n", resp.statusCode());
             out.printf("Msg written to %s: %s\n", resp.body(), msg);
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(msg, expectedMsg);
+            assertEquals(200, resp.statusCode());
+            assertEquals(expectedMsg, msg);
             if (!sameClient) {
                 client.close();
             }
@@ -214,8 +218,8 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         defaultFsPath = defaultFsFile();
         zipFs = newZipFs();
         zipFsPath = zipFsFile(zipFs);
@@ -247,8 +251,8 @@ public class BodyHandlerOfFileTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         if (Files.exists(zipFsPath))
             FileUtils.deleteFileTreeWithRetry(zipFsPath);
         if (Files.exists(defaultFsPath))
diff --git a/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java b/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
index d7c9a3af4f1..da0c7220b6b 100644
--- a/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
+++ b/test/jdk/java/net/httpclient/PathSubscriber/BodySubscriberOfFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,15 +35,11 @@
  *        jdk.httpclient.test.lib.http2.OutgoingPushPromise
  *        jdk.httpclient.test.lib.http2.Queue jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.Platform jdk.test.lib.util.FileUtils
- * @run testng/othervm BodySubscriberOfFileTest
+ * @run junit/othervm BodySubscriberOfFileTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.util.FileUtils;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -58,7 +54,10 @@ import java.net.http.HttpResponse.BodySubscribers;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Map;
 import java.util.concurrent.Flow;
 import java.util.stream.IntStream;
@@ -70,26 +69,32 @@ import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BodySubscriberOfFileTest implements HttpServerAdapters {
     static final String MSG = "msg";
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1      [ 5 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
-    FileSystem zipFs;
-    Path defaultFsPath;
-    Path zipFsPath;
+    private static FileSystem zipFs;
+    private static Path defaultFsPath;
+    private static Path zipFsPath;
 
     // Default file system set-up
 
@@ -101,8 +106,7 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
         return file;
     }
 
-    @DataProvider(name = "defaultFsData")
-    public Object[][] defaultFsData() {
+    public static Object[][] defaultFsData() {
         return new Object[][]{
                 {  http3URI,   defaultFsPath,  MSG,  true   },
                 {  http3URI,   defaultFsPath,  MSG,  false  },
@@ -118,7 +122,8 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "defaultFsData")
+    @ParameterizedTest
+    @MethodSource("defaultFsData")
     public void testDefaultFs(String uriString,
                               Path path,
                               String expectedMsg,
@@ -143,8 +148,7 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
         return file;
     }
 
-    @DataProvider(name = "zipFsData")
-    public Object[][] zipFsData() {
+    public static Object[][] zipFsData() {
         return new Object[][]{
                 {  http3URI,   zipFsPath,  MSG,  true   },
                 {  http3URI,   zipFsPath,  MSG,  false  },
@@ -160,7 +164,8 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "zipFsData")
+    @ParameterizedTest
+    @MethodSource("zipFsData")
     public void testZipFs(String uriString,
                           Path path,
                           String expectedMsg,
@@ -209,8 +214,8 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
             String msg = Files.readString(path, StandardCharsets.UTF_8);
             out.printf("Resp code: %s\n", resp.statusCode());
             out.printf("Msg written to %s: %s\n", resp.body(), msg);
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(msg, expectedMsg);
+            assertEquals(200, resp.statusCode());
+            assertEquals(expectedMsg, msg);
             if (!sameClient) {
                 client.close();
             }
@@ -240,12 +245,12 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
         });
         subscriber.onNext(buffers);
         subscriber.onComplete();
-        buffers.forEach(b -> assertEquals(b.remaining(), 0) );
+        buffers.forEach(b -> assertEquals(0, b.remaining()) );
         assertEquals(expectedSize, Files.size(defaultFsPath));
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         defaultFsPath = defaultFsFile();
         zipFs = newZipFs();
         zipFsPath = zipFsFile(zipFs);
@@ -277,8 +282,8 @@ public class BodySubscriberOfFileTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         if (Files.exists(zipFsPath))
             FileUtils.deleteFileTreeWithRetry(zipFsPath);
         if (Files.exists(defaultFsPath))
diff --git a/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java b/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java
index c2fab85f8ff..cd7049285f1 100644
--- a/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java
+++ b/test/jdk/java/net/httpclient/PlainProxyConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -208,9 +208,9 @@ public class PlainProxyConnectionTest {
         System.out.println("Server is: " + server.getAddress().toString());
         URI uri = new URI("http", null,
                 server.getAddress().getAddress().getHostAddress(),
-                server.getAddress().getPort(), PATH + "x",
+                server.getAddress().getPort(), PATH + "/x",
                 null, null);
-        URI proxiedURI = new URI("http://some.host.that.does.not.exist:4242" + PATH + "x");
+        URI proxiedURI = new URI("http://some.host.that.does.not.exist:4242" + PATH + "/x");
 
         performSanityTest(server, uri, proxiedURI);
 
diff --git a/test/jdk/java/net/httpclient/ProxySelectorTest.java b/test/jdk/java/net/httpclient/ProxySelectorTest.java
index bf63e5a77b5..bb339e91bdc 100644
--- a/test/jdk/java/net/httpclient/ProxySelectorTest.java
+++ b/test/jdk/java/net/httpclient/ProxySelectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,34 +27,20 @@
  * @summary checks that a different proxy returned for
  *          the same host:port is taken into account
  * @library /test/lib /test/jdk/java/net/httpclient/lib
- * @build DigestEchoServer ProxySelectorTest jdk.httpclient.test.lib.http2.Http2TestServer
+ * @build DigestEchoServer ProxySelectorTest
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.http.auth.tunneling.disabledSchemes
  *       -Djdk.httpclient.HttpClient.log=headers,requests
  *       -Djdk.internal.httpclient.debug=true
  *       ProxySelectorTest
  */
 
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.ProxySelector;
 import java.net.SocketAddress;
@@ -63,7 +49,6 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -73,37 +58,44 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2TestServer;
 
 import static java.lang.System.err;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ProxySelectorTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;            // HTTP/1.1
-    HttpTestServer proxyHttpTestServer;       // HTTP/1.1
-    HttpTestServer authProxyHttpTestServer;   // HTTP/1.1
-    HttpTestServer http2TestServer;           // HTTP/2 ( h2c )
-    HttpTestServer httpsTestServer;           // HTTPS/1.1
-    HttpTestServer https2TestServer;          // HTTP/2 ( h2  )
-    DigestEchoServer.TunnelingProxy proxy;
-    DigestEchoServer.TunnelingProxy authproxy;
-    String httpURI;
-    String httpsURI;
-    String proxyHttpURI;
-    String authProxyHttpURI;
-    String http2URI;
-    String https2URI;
-    HttpClient client;
+    private static HttpTestServer httpTestServer;            // HTTP/1.1
+    private static HttpTestServer proxyHttpTestServer;       // HTTP/1.1
+    private static HttpTestServer authProxyHttpTestServer;   // HTTP/1.1
+    private static HttpTestServer http2TestServer;           // HTTP/2 ( h2c )
+    private static HttpTestServer httpsTestServer;           // HTTPS/1.1
+    private static HttpTestServer https2TestServer;          // HTTP/2 ( h2  )
+    private static DigestEchoServer.TunnelingProxy proxy;
+    private static DigestEchoServer.TunnelingProxy authproxy;
+    private static String httpURI;
+    private static String httpsURI;
+    private static String proxyHttpURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static HttpClient client;
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     static final long SLEEP_AFTER_TEST = 0; // milliseconds
     static final int ITERATIONS = 3;
     static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
@@ -144,34 +136,38 @@ public class ProxySelectorTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests() {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
             // Exceptions should already have been added to FAILURES
@@ -204,12 +200,10 @@ public class ProxySelectorTest implements HttpServerAdapters {
     static final int UNAUTHORIZED = 401;
     static final int PROXY_UNAUTHORIZED = 407;
     static final int HTTP_OK = 200;
-    static final String MESSAGE = "Unauthorized";
     enum Schemes {
         HTTP, HTTPS
     }
-    @DataProvider(name = "all")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { Schemes.HTTP,  HTTP_1_1, httpURI,   true},
                 { Schemes.HTTP,  HttpClient.Version.HTTP_2,   http2URI,  true},
@@ -222,15 +216,13 @@ public class ProxySelectorTest implements HttpServerAdapters {
         };
     }
 
-    static final AtomicLong requestCounter = new AtomicLong();
-
     static final AtomicLong sleepCount = new AtomicLong();
 
-    @Test(dataProvider = "all")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(Schemes scheme, HttpClient.Version version, String uri, boolean async)
             throws Throwable
     {
-        checkSkip();
         var name = String.format("test(%s, %s, %s)", scheme, version, async);
         out.printf("%n---- starting %s ----%n", name);
 
@@ -260,7 +252,7 @@ public class ProxySelectorTest implements HttpServerAdapters {
         HttpRequest request = requestBuilder.build();
         out.println("Sending request: " + request.uri());
 
-        HttpResponse<T> response = null;
+        HttpResponse<T> response;
         if (async) {
             response = client.send(request, handler);
         } else {
@@ -288,9 +280,11 @@ public class ProxySelectorTest implements HttpServerAdapters {
         // A plain server or https server should serve it, and we should get 200 OK
         response = send(client, uri1, BodyHandlers.ofString(), async);
         out.println("Got response from plain server: " + response);
-        assertEquals(response.statusCode(), HTTP_OK);
-        assertEquals(response.headers().firstValue("X-value"),
-                scheme == Schemes.HTTPS ? Optional.of("https-server") : Optional.of("plain-server"));
+        assertEquals(HTTP_OK, response.statusCode());
+        assertEquals(scheme == Schemes.HTTPS
+                ? Optional.of("https-server")
+                : Optional.of("plain-server"),
+                response.headers().firstValue("X-value"));
 
         // Second request should go through a non authenticating proxy.
         // For a clear connection - a proxy-server should serve it, and we should get 200 OK
@@ -298,9 +292,11 @@ public class ProxySelectorTest implements HttpServerAdapters {
         // authenticating proxy - and we should receive 200 OK from an https-server
         response = send(client, uri2, BodyHandlers.ofString(), async);
         out.println("Got response through noauth proxy: " + response);
-        assertEquals(response.statusCode(), HTTP_OK);
-        assertEquals(response.headers().firstValue("X-value"),
-                scheme == Schemes.HTTPS ? Optional.of("https-server") : Optional.of("proxy-server"));
+        assertEquals(HTTP_OK, response.statusCode());
+        assertEquals(scheme == Schemes.HTTPS
+                ? Optional.of("https-server")
+                : Optional.of("proxy-server"),
+                response.headers().firstValue("X-value"));
 
         // Third request should go through an authenticating proxy.
         // For a clear connection - an auth-proxy-server should serve it, and we
@@ -310,16 +306,18 @@ public class ProxySelectorTest implements HttpServerAdapters {
         // proxy - so the X-value header will be absent
         response = send(client, uri3, BodyHandlers.ofString(), async);
         out.println("Got response through auth proxy: " + response);
-        assertEquals(response.statusCode(), PROXY_UNAUTHORIZED);
-        assertEquals(response.headers().firstValue("X-value"),
-                scheme == Schemes.HTTPS ? Optional.empty() : Optional.of("auth-proxy-server"));
+        assertEquals(PROXY_UNAUTHORIZED, response.statusCode());
+        assertEquals(scheme == Schemes.HTTPS
+                ? Optional.empty()
+                : Optional.of("auth-proxy-server"),
+                response.headers().firstValue("X-value"));
 
     }
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new PlainServerHandler("plain-server"), "/http1/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1";
@@ -368,8 +366,8 @@ public class ProxySelectorTest implements HttpServerAdapters {
         serverCount.incrementAndGet();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         client = null;
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(1500);
@@ -387,7 +385,7 @@ public class ProxySelectorTest implements HttpServerAdapters {
         }
     }
 
-    class TestProxySelector extends ProxySelector {
+    static final class TestProxySelector extends ProxySelector {
         @Override
         public List<Proxy> select(URI uri) {
             String path = uri.getPath();
@@ -426,11 +424,8 @@ public class ProxySelectorTest implements HttpServerAdapters {
             String path = t.getRequestURI().getPath();
             HttpTestRequestHeaders  reqh = t.getRequestHeaders();
             HttpTestResponseHeaders rsph = t.getResponseHeaders();
-
-            String xValue = serverType;
             rsph.addHeader("X-value", serverType);
 
-            t.getResponseHeaders().addHeader("X-value", xValue);
             byte[] body = "RESPONSE".getBytes(UTF_8);
             t.sendResponseHeaders(HTTP_OK, body.length);
             try (var out = t.getResponseBody()) {
@@ -449,20 +444,16 @@ public class ProxySelectorTest implements HttpServerAdapters {
         @Override
         public void handle(HttpTestExchange t) throws IOException {
             readAllRequestData(t); // shouldn't be any
-            String method = t.getRequestMethod();
             String path = t.getRequestURI().getPath();
-            HttpTestRequestHeaders  reqh = t.getRequestHeaders();
             HttpTestResponseHeaders rsph = t.getResponseHeaders();
 
-            String xValue = serverType;
-            String srv = path.contains("/proxy/") ? "proxy" : "server";
             String prefix = path.contains("/proxy/") ? "Proxy-" : "WWW-";
             int code = path.contains("/proxy/") ? PROXY_UNAUTHORIZED : UNAUTHORIZED;
             String resp = prefix + "Unauthorized";
             rsph.addHeader(prefix + "Authenticate", "Basic realm=\"earth\", charset=\"UTF-8\"");
 
             byte[] body = resp.getBytes(UTF_8);
-            t.getResponseHeaders().addHeader("X-value", xValue);
+            rsph.addHeader("X-value", serverType);
             t.sendResponseHeaders(code, body.length);
             try (var out = t.getResponseBody()) {
                 out.write(body);
diff --git a/test/jdk/java/net/httpclient/RedirectMethodChange.java b/test/jdk/java/net/httpclient/RedirectMethodChange.java
index b0b130921f5..73e27f6efff 100644
--- a/test/jdk/java/net/httpclient/RedirectMethodChange.java
+++ b/test/jdk/java/net/httpclient/RedirectMethodChange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Method change during redirection
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm RedirectMethodChange
+ * @run junit/othervm RedirectMethodChange
  */
 
 import javax.net.ssl.SSLContext;
@@ -41,33 +41,34 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class RedirectMethodChange implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpClient client;
+    private static HttpClient client;
 
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;      // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
     static final String RESPONSE = "Hello world";
     static final String POST_BODY = "This is the POST body 123909090909090";
@@ -86,8 +87,7 @@ public class RedirectMethodChange implements HttpServerAdapters {
         }
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][] {
                 { http3URI, "GET",  301, "GET"  },
                 { http3URI, "GET",  302, "GET"  },
@@ -180,7 +180,8 @@ public class RedirectMethodChange implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(String uriString,
                      String method,
                      int redirectCode,
@@ -195,15 +196,15 @@ public class RedirectMethodChange implements HttpServerAdapters {
         HttpResponse<String> resp = client.send(req, BodyHandlers.ofString());
 
         System.out.println("Response: " + resp + ", body: " + resp.body());
-        assertEquals(resp.statusCode(), 200);
-        assertEquals(resp.body(), RESPONSE);
+        assertEquals(200, resp.statusCode());
+        assertEquals(RESPONSE, resp.body());
     }
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
-        client = newClientBuilderForH3()
+    @BeforeAll
+    public static void setup() throws Exception {
+        client = HttpServerAdapters.createClientBuilderForH3()
                 .followRedirects(HttpClient.Redirect.NORMAL)
                 .sslContext(sslContext)
                 .build();
@@ -245,8 +246,8 @@ public class RedirectMethodChange implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         client.close();
         httpTestServer.stop();
         httpsTestServer.stop();
diff --git a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
index e51f394f845..8c2fa8707ae 100644
--- a/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/RedirectTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,11 @@
  *          an HttpTimeoutException during the redirected request.
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=errors,trace -Djdk.internal.httpclient.debug=false RedirectTimeoutTest
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=errors,trace -Djdk.internal.httpclient.debug=false RedirectTimeoutTest
  */
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.TestException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -64,6 +59,12 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static jdk.test.lib.Utils.adjustTimeout;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class RedirectTimeoutTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
@@ -75,8 +76,8 @@ public class RedirectTimeoutTest implements HttpServerAdapters {
     public static final int ITERATIONS = 4;
     private static final PrintStream out = System.out;
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         h1TestServer = HttpTestServer.create(HTTP_1_1);
         h2TestServer = HttpTestServer.create(HTTP_2);
         h3TestServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
@@ -101,15 +102,14 @@ public class RedirectTimeoutTest implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         h1TestServer.stop();
         h2TestServer.stop();
         h3TestServer.stop();
     }
 
-    @DataProvider(name = "testData")
-    public Object[][] testData() {
+    public static Object[][] testData() {
         return new Object[][] {
                 { HTTP_3, h3Uri, h3RedirectUri },
                 { HTTP_1_1, h1Uri, h1RedirectUri },
@@ -117,7 +117,8 @@ public class RedirectTimeoutTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "testData")
+    @ParameterizedTest
+    @MethodSource("testData")
     public void test(Version version, URI uri, URI redirectURI) throws InterruptedException {
         out.println("Testing for " + version);
         testRedirectURI = redirectURI;
@@ -159,7 +160,7 @@ public class RedirectTimeoutTest implements HttpServerAdapters {
         } catch (IOException e) {
             if (e.getClass() == HttpTimeoutException.class) {
                 e.printStackTrace(System.out);
-                throw new TestException("Timeout from original HttpRequest expired on redirect when it should have been cancelled.");
+                fail("Timeout from original HttpRequest expired on redirect when it should have been cancelled.");
             } else {
                 throw new RuntimeException(e);
             }
diff --git a/test/jdk/java/net/httpclient/RedirectWithCookie.java b/test/jdk/java/net/httpclient/RedirectWithCookie.java
index b4a4df38721..ad94b124132 100644
--- a/test/jdk/java/net/httpclient/RedirectWithCookie.java
+++ b/test/jdk/java/net/httpclient/RedirectWithCookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Test for cookie handling when redirecting
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       RedirectWithCookie
  */
@@ -45,10 +45,6 @@ import java.util.List;
 import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -56,28 +52,32 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class RedirectWithCookie implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
     static final String MESSAGE = "BasicRedirectTest message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { http3URI,   },
                 { httpURI,    },
@@ -96,7 +96,8 @@ public class RedirectWithCookie implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString) throws Exception {
         out.printf("%n---- starting (%s) ----%n", uriString);
         var builder = uriString.contains("/http3/")
@@ -120,8 +121,8 @@ public class RedirectWithCookie implements HttpServerAdapters {
             out.println("  Got response: " + response);
             out.println("  Got body Path: " + response.body());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), MESSAGE);
+            assertEquals(200, response.statusCode());
+            assertEquals(MESSAGE, response.body());
             // asserts redirected URI in response.request().uri()
             assertTrue(response.uri().getPath().endsWith("message"));
             assertPreviousRedirectResponses(request, response);
@@ -142,7 +143,7 @@ public class RedirectWithCookie implements HttpServerAdapters {
             response = response.previousResponse().get();
             assertTrue(300 <= response.statusCode() && response.statusCode() <= 309,
                     "Expected 300 <= code <= 309, got:" + response.statusCode());
-            assertEquals(response.body(), null, "Unexpected body: " + response.body());
+            assertEquals(null, response.body(), "Unexpected body: " + response.body());
             String locationHeader = response.headers().firstValue("Location")
                     .orElseThrow(() -> new RuntimeException("no previous Location"));
             assertTrue(uri.toString().endsWith(locationHeader),
@@ -151,15 +152,15 @@ public class RedirectWithCookie implements HttpServerAdapters {
         } while (response.previousResponse().isPresent());
 
         // initial
-        assertEquals(initialRequest, response.request(),
+        assertEquals(response.request(), initialRequest,
                 String.format("Expected initial request [%s] to equal last prev req [%s]",
                         initialRequest, response.request()));
     }
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieRedirectHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/redirect";
@@ -185,8 +186,8 @@ public class RedirectWithCookie implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.java b/test/jdk/java/net/httpclient/RequestBodyTest.java
index 668e834e1f0..e87cbc694c7 100644
--- a/test/jdk/java/net/httpclient/RequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/RequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,38 +47,33 @@ import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.*;
 import static java.nio.file.StandardOpenOption.*;
 
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @bug 8087112
- * @modules java.net.http/jdk.internal.net.http.common
- *          java.logging
- *          jdk.httpserver
  * @library /test/lib /test/jdk/java/net/httpclient/lib
- * @compile ../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../com/sun/net/httpserver/EchoHandler.java
- * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
- * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestServerConfigurator
+ * @build jdk.test.lib.net.SimpleSSLContext
+ *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @build LightWeightHttpServer
  * @build jdk.test.lib.Platform
  * @build jdk.test.lib.util.FileUtils
- * @run testng/othervm RequestBodyTest
+ * @run junit/othervm RequestBodyTest
  */
 public class RequestBodyTest {
 
     static final String fileroot = System.getProperty("test.src", ".") + "/docs";
     static final String midSizedFilename = "/files/notsobigfile.txt";
     static final String smallFilename = "/files/smallfile.txt";
-    final ConcurrentHashMap<String,Throwable> failures = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<String,Throwable> failures = new ConcurrentHashMap<>();
 
-    HttpClient client;
-    String httpURI;
-    String httpsURI;
+    private static HttpClient client;
+    private static String httpURI;
+    private static String httpsURI;
 
     enum RequestBody {
         BYTE_ARRAY,
@@ -100,8 +95,8 @@ public class RequestBodyTest {
         STRING_WITH_CHARSET,
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         LightWeightHttpServer.initServer();
         httpURI = LightWeightHttpServer.httproot + "echo/foo";
         httpsURI = LightWeightHttpServer.httpsroot + "echo/foo";
@@ -114,8 +109,8 @@ public class RequestBodyTest {
                            .build();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         try {
             LightWeightHttpServer.stop();
         } finally {
@@ -132,8 +127,7 @@ public class RequestBodyTest {
         }
     }
 
-    @DataProvider
-    public Object[][] exchanges() throws Exception {
+    public static Object[][] exchanges() throws Exception {
         List<Object[]> values = new ArrayList<>();
 
         for (boolean async : new boolean[] { false, true })
@@ -148,7 +142,8 @@ public class RequestBodyTest {
         return values.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "exchanges")
+    @ParameterizedTest
+    @MethodSource("exchanges")
     void exchange(String target,
                   RequestBody requestBodyType,
                   ResponseBody responseBodyType,
@@ -244,8 +239,8 @@ public class RequestBodyTest {
                 BodyHandler<byte[]> bh = BodyHandlers.ofByteArray();
                 if (bufferResponseBody) bh = BodyHandlers.buffering(bh, 50);
                 HttpResponse<byte[]> bar = getResponse(client, request, bh, async);
-                assertEquals(bar.statusCode(), 200);
-                assertEquals(bar.body(), fileAsBytes);
+                assertEquals(200, bar.statusCode());
+                assertArrayEquals(fileAsBytes, bar.body());
                 break;
             case BYTE_ARRAY_CONSUMER:
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -254,46 +249,46 @@ public class RequestBodyTest {
                 if (bufferResponseBody) bh1 = BodyHandlers.buffering(bh1, 49);
                 HttpResponse<Void> v = getResponse(client, request, bh1, async);
                 byte[] ba = baos.toByteArray();
-                assertEquals(v.statusCode(), 200);
-                assertEquals(ba, fileAsBytes);
+                assertEquals(200, v.statusCode());
+                assertArrayEquals(fileAsBytes, ba);
                 break;
             case DISCARD:
                 Object o = new Object();
                 BodyHandler<Object> bh2 = BodyHandlers.replacing(o);
                 if (bufferResponseBody) bh2 = BodyHandlers.buffering(bh2, 51);
                 HttpResponse<Object> or = getResponse(client, request, bh2, async);
-                assertEquals(or.statusCode(), 200);
+                assertEquals(200, or.statusCode());
                 assertSame(or.body(), o);
                 break;
             case FILE:
                 BodyHandler<Path> bh3 = BodyHandlers.ofFile(tempFile);
                 if (bufferResponseBody) bh3 = BodyHandlers.buffering(bh3, 48);
                 HttpResponse<Path> fr = getResponse(client, request, bh3, async);
-                assertEquals(fr.statusCode(), 200);
-                assertEquals(Files.size(tempFile), fileAsString.length());
-                assertEquals(Files.readAllBytes(tempFile), fileAsBytes);
+                assertEquals(200, fr.statusCode());
+                assertEquals(fileAsString.length(), Files.size(tempFile));
+                assertArrayEquals(fileAsBytes, Files.readAllBytes(tempFile));
                 break;
             case FILE_WITH_OPTION:
                 BodyHandler<Path> bh4 = BodyHandlers.ofFile(tempFile, CREATE_NEW, WRITE);
                 if (bufferResponseBody) bh4 = BodyHandlers.buffering(bh4, 52);
                 fr = getResponse(client, request, bh4, async);
-                assertEquals(fr.statusCode(), 200);
-                assertEquals(Files.size(tempFile), fileAsString.length());
-                assertEquals(Files.readAllBytes(tempFile), fileAsBytes);
+                assertEquals(200, fr.statusCode());
+                assertEquals(fileAsString.length(), Files.size(tempFile));
+                assertArrayEquals(fileAsBytes, Files.readAllBytes(tempFile));
                 break;
             case STRING:
                 BodyHandler<String> bh5 = BodyHandlers.ofString();
                 if(bufferResponseBody) bh5 = BodyHandlers.buffering(bh5, 47);
                 HttpResponse<String> sr = getResponse(client, request, bh5, async);
-                assertEquals(sr.statusCode(), 200);
-                assertEquals(sr.body(), fileAsString);
+                assertEquals(200, sr.statusCode());
+                assertEquals(fileAsString, sr.body());
                 break;
             case STRING_WITH_CHARSET:
                 BodyHandler<String> bh6 = BodyHandlers.ofString(StandardCharsets.UTF_8);
                 if (bufferResponseBody) bh6 = BodyHandlers.buffering(bh6, 53);
                 HttpResponse<String> r = getResponse(client, request, bh6, async);
-                assertEquals(r.statusCode(), 200);
-                assertEquals(r.body(), fileAsString);
+                assertEquals(200, r.statusCode());
+                assertEquals(fileAsString, r.body());
                 break;
             default:
                 throw new AssertionError("Unknown response body:" + responseBodyType);
diff --git a/test/jdk/java/net/httpclient/RequestBuilderTest.java b/test/jdk/java/net/httpclient/RequestBuilderTest.java
index a83c12f592e..12af908457b 100644
--- a/test/jdk/java/net/httpclient/RequestBuilderTest.java
+++ b/test/jdk/java/net/httpclient/RequestBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8276559
  * @summary HttpRequest[.Builder] API and behaviour checks
- * @run testng RequestBuilderTest
+ * @run junit RequestBuilderTest
  */
 
 import java.net.URI;
@@ -49,9 +49,9 @@ import static java.time.Duration.ofNanos;
 import static java.time.Duration.ofMinutes;
 import static java.time.Duration.ofSeconds;
 import static java.time.Duration.ZERO;
-import static org.testng.Assert.*;
 
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class RequestBuilderTest {
 
@@ -70,12 +70,12 @@ public class RequestBuilderTest {
                                                      newBuilder(uri).copy());
         for (HttpRequest.Builder builder : builders) {
             assertFalse(builder.build().expectContinue());
-            assertEquals(builder.build().method(), "GET");
+            assertEquals("GET", builder.build().method());
             assertFalse(builder.build().bodyPublisher().isPresent());
             assertFalse(builder.build().version().isPresent());
             assertFalse(builder.build().timeout().isPresent());
             assertTrue(builder.build().headers() != null);
-            assertEquals(builder.build().headers().map().size(), 0);
+            assertEquals(0, builder.build().headers().map().size());
         }
     }
 
@@ -128,61 +128,61 @@ public class RequestBuilderTest {
             assertThrows(IAE, () -> newBuilder().uri(u));
         }
 
-        assertEquals(newBuilder(uri).build().uri(), uri);
-        assertEquals(newBuilder().uri(uri).build().uri(), uri);
+        assertEquals(uri, newBuilder(uri).build().uri());
+        assertEquals(uri, newBuilder().uri(uri).build().uri());
         URI https = URI.create("https://foo.com");
-        assertEquals(newBuilder(https).build().uri(), https);
-        assertEquals(newBuilder().uri(https).build().uri(), https);
+        assertEquals(https, newBuilder(https).build().uri());
+        assertEquals(https, newBuilder().uri(https).build().uri());
     }
 
     @Test
     public void testMethod() {
         HttpRequest request = newBuilder(uri).build();
-        assertEquals(request.method(), "GET");
+        assertEquals("GET", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).GET().build();
-        assertEquals(request.method(), "GET");
+        assertEquals("GET", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).POST(BodyPublishers.ofString("")).GET().build();
-        assertEquals(request.method(), "GET");
+        assertEquals("GET", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).PUT(BodyPublishers.ofString("")).GET().build();
-        assertEquals(request.method(), "GET");
+        assertEquals("GET", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).DELETE().GET().build();
-        assertEquals(request.method(), "GET");
+        assertEquals("GET", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).POST(BodyPublishers.ofString("")).build();
-        assertEquals(request.method(), "POST");
+        assertEquals("POST", request.method());
         assertTrue(request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).PUT(BodyPublishers.ofString("")).build();
-        assertEquals(request.method(), "PUT");
+        assertEquals("PUT", request.method());
         assertTrue(request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).DELETE().build();
-        assertEquals(request.method(), "DELETE");
+        assertEquals("DELETE", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).HEAD().build();
-        assertEquals(request.method(), "HEAD");
+        assertEquals("HEAD", request.method());
         assertFalse(request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).GET().POST(BodyPublishers.ofString("")).build();
-        assertEquals(request.method(), "POST");
+        assertEquals("POST", request.method());
         assertTrue(request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).GET().PUT(BodyPublishers.ofString("")).build();
-        assertEquals(request.method(), "PUT");
+        assertEquals("PUT", request.method());
         assertTrue(request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).GET().DELETE().build();
-        assertEquals(request.method(), "DELETE");
+        assertEquals("DELETE", request.method());
         assertTrue(!request.bodyPublisher().isPresent());
 
         // CONNECT is disallowed in the implementation, since it is used for
@@ -190,11 +190,11 @@ public class RequestBuilderTest {
         assertThrows(IAE, () -> newBuilder(uri).method("CONNECT", BodyPublishers.noBody()).build());
 
         request = newBuilder(uri).method("GET", BodyPublishers.noBody()).build();
-        assertEquals(request.method(), "GET");
+        assertEquals("GET", request.method());
         assertTrue(request.bodyPublisher().isPresent());
 
         request = newBuilder(uri).method("POST", BodyPublishers.ofString("")).build();
-        assertEquals(request.method(), "POST");
+        assertEquals("POST", request.method());
         assertTrue(request.bodyPublisher().isPresent());
     }
 
@@ -207,7 +207,7 @@ public class RequestBuilderTest {
         assertThrows(IAE, () -> builder.headers("1").build());
         assertThrows(IAE, () -> builder.headers("1", "2", "3").build());
         assertThrows(IAE, () -> builder.headers("1", "2", "3", "4", "5").build());
-        assertEquals(builder.build().headers().map().size(),0);
+        assertEquals(0, builder.build().headers().map().size());
 
         List<HttpRequest> requests = List.of(
                 // same header built from different combinations of the API
@@ -219,13 +219,13 @@ public class RequestBuilderTest {
         );
 
         for (HttpRequest r : requests) {
-            assertEquals(r.headers().map().size(), 1);
+            assertEquals(1, r.headers().map().size());
             assertTrue(r.headers().firstValue("A").isPresent());
             assertTrue(r.headers().firstValue("a").isPresent());
-            assertEquals(r.headers().firstValue("A").get(), "B");
-            assertEquals(r.headers().allValues("A"), List.of("B"));
-            assertEquals(r.headers().allValues("C").size(), 0);
-            assertEquals(r.headers().map().get("A"), List.of("B"));
+            assertEquals("B", r.headers().firstValue("A").get());
+            assertEquals(List.of("B"), r.headers().allValues("A"));
+            assertEquals(0, r.headers().allValues("C").size());
+            assertEquals(List.of("B"), r.headers().map().get("A"));
             assertThrows(NFE, () -> r.headers().firstValueAsLong("A"));
             assertFalse(r.headers().firstValue("C").isPresent());
             // a non-exhaustive list of mutators
@@ -265,14 +265,14 @@ public class RequestBuilderTest {
         );
 
         for (HttpRequest r : requests) {
-            assertEquals(r.headers().map().size(), 2);
+            assertEquals(2, r.headers().map().size());
             assertTrue(r.headers().firstValue("A").isPresent());
-            assertEquals(r.headers().firstValue("A").get(), "B");
-            assertEquals(r.headers().allValues("A"), List.of("B"));
+            assertEquals("B", r.headers().firstValue("A").get());
+            assertEquals(List.of("B"), r.headers().allValues("A"));
             assertTrue(r.headers().firstValue("C").isPresent());
-            assertEquals(r.headers().firstValue("C").get(), "D");
-            assertEquals(r.headers().allValues("C"), List.of("D"));
-            assertEquals(r.headers().map().get("C"), List.of("D"));
+            assertEquals("D", r.headers().firstValue("C").get());
+            assertEquals(List.of("D"), r.headers().allValues("C"));
+            assertEquals(List.of("D"), r.headers().map().get("C"));
             assertThrows(NFE, () -> r.headers().firstValueAsLong("C"));
             assertFalse(r.headers().firstValue("E").isPresent());
             // a smaller non-exhaustive list of mutators
@@ -304,11 +304,11 @@ public class RequestBuilderTest {
         );
 
         for (HttpRequest r : requests) {
-            assertEquals(r.headers().map().size(), 1);
+            assertEquals(1, r.headers().map().size());
             assertTrue(r.headers().firstValue("A").isPresent());
             assertTrue(r.headers().allValues("A").containsAll(List.of("B", "C")));
-            assertEquals(r.headers().allValues("C").size(), 0);
-            assertEquals(r.headers().map().get("A"), List.of("B", "C"));
+            assertEquals(0, r.headers().allValues("C").size());
+            assertEquals(List.of("B", "C"), r.headers().map().get("A"));
             assertThrows(NFE, () -> r.headers().firstValueAsLong("A"));
             assertFalse(r.headers().firstValue("C").isPresent());
             // a non-exhaustive list of mutators
@@ -340,11 +340,11 @@ public class RequestBuilderTest {
                                        "aCCept-EnCODing", "accepT-encodinG")) {
                 assertTrue(r.headers().firstValue(name).isPresent());
                 assertTrue(r.headers().allValues(name).contains("gzip, deflate"));
-                assertEquals(r.headers().firstValue(name).get(), "gzip, deflate");
-                assertEquals(r.headers().allValues(name).size(), 1);
-                assertEquals(r.headers().map().size(), 1);
-                assertEquals(r.headers().map().get(name).size(), 1);
-                assertEquals(r.headers().map().get(name).get(0), "gzip, deflate");
+                assertEquals("gzip, deflate", r.headers().firstValue(name).get());
+                assertEquals(1, r.headers().allValues(name).size());
+                assertEquals(1, r.headers().map().size());
+                assertEquals(1, r.headers().map().get(name).size());
+                assertEquals("gzip, deflate", r.headers().map().get(name).get(0));
             }
         }
     }
@@ -391,7 +391,7 @@ public class RequestBuilderTest {
                         .GET(), "x-" + name, value).build();
                 String v = req.headers().firstValue("x-" + name).orElseThrow(
                         () -> new RuntimeException("header x-" + name + " not set"));
-                assertEquals(v, value);
+                assertEquals(value, v);
                 try {
                     f.withHeader(HttpRequest.newBuilder(uri)
                             .GET(), name, value).build();
@@ -419,27 +419,27 @@ public class RequestBuilderTest {
         builder.GET().timeout(ofSeconds(5)).version(HTTP_2).setHeader("A", "C");
 
         HttpRequest copyRequest = copy.build();
-        assertEquals(copyRequest.uri(), uri);
-        assertEquals(copyRequest.expectContinue(), true);
-        assertEquals(copyRequest.headers().map().get("A"), List.of("B"));
-        assertEquals(copyRequest.method(), "POST");
-        assertEquals(copyRequest.bodyPublisher().isPresent(), true);
-        assertEquals(copyRequest.timeout().get(), ofSeconds(30));
+        assertEquals(uri, copyRequest.uri());
+        assertEquals(true, copyRequest.expectContinue());
+        assertEquals(List.of("B"), copyRequest.headers().map().get("A"));
+        assertEquals("POST", copyRequest.method());
+        assertEquals(true, copyRequest.bodyPublisher().isPresent());
+        assertEquals(ofSeconds(30), copyRequest.timeout().get());
         assertTrue(copyRequest.version().isPresent());
-        assertEquals(copyRequest.version().get(), HTTP_1_1);
+        assertEquals(HTTP_1_1, copyRequest.version().get());
         assertTrue(copyRequest.getOption(H3_DISCOVERY).isPresent());
-        assertEquals(copyRequest.getOption(H3_DISCOVERY).get(), HTTP_3_URI_ONLY);
+        assertEquals(HTTP_3_URI_ONLY, copyRequest.getOption(H3_DISCOVERY).get());
 
         // lazy set URI ( maybe builder as a template )
         copyRequest = newBuilder().copy().uri(uri).build();
-        assertEquals(copyRequest.uri(), uri);
+        assertEquals(uri, copyRequest.uri());
 
         builder = newBuilder().header("C", "D");
         copy = builder.copy();
         copy.uri(uri);
         copyRequest = copy.build();
-        assertEquals(copyRequest.uri(), uri);
-        assertEquals(copyRequest.headers().firstValue("C").get(), "D");
+        assertEquals(uri, copyRequest.uri());
+        assertEquals("D", copyRequest.headers().firstValue("C").get());
     }
 
     @Test
@@ -449,42 +449,41 @@ public class RequestBuilderTest {
         assertThrows(IAE, () -> builder.timeout(ofSeconds(0)));
         assertThrows(IAE, () -> builder.timeout(ofSeconds(-1)));
         assertThrows(IAE, () -> builder.timeout(ofNanos(-100)));
-        assertEquals(builder.timeout(ofNanos(15)).build().timeout().get(), ofNanos(15));
-        assertEquals(builder.timeout(ofSeconds(50)).build().timeout().get(), ofSeconds(50));
-        assertEquals(builder.timeout(ofMinutes(30)).build().timeout().get(), ofMinutes(30));
+        assertEquals(ofNanos(15), builder.timeout(ofNanos(15)).build().timeout().get());
+        assertEquals(ofSeconds(50), builder.timeout(ofSeconds(50)).build().timeout().get());
+        assertEquals(ofMinutes(30), builder.timeout(ofMinutes(30)).build().timeout().get());
     }
 
     @Test
     public void testExpect() {
         HttpRequest.Builder builder = newBuilder(uri);
-        assertEquals(builder.build().expectContinue(), false);
-        assertEquals(builder.expectContinue(true).build().expectContinue(), true);
-        assertEquals(builder.expectContinue(false).build().expectContinue(), false);
-        assertEquals(builder.expectContinue(true).build().expectContinue(), true);
+        assertEquals(false, builder.build().expectContinue());
+        assertEquals(true, builder.expectContinue(true).build().expectContinue());
+        assertEquals(false, builder.expectContinue(false).build().expectContinue());
+        assertEquals(true, builder.expectContinue(true).build().expectContinue());
     }
 
     @Test
     public void testEquals() {
-        assertNotEquals(newBuilder(URI.create("http://foo.com")),
-                        newBuilder(URI.create("http://bar.com")));
+        assertNotEquals(                        newBuilder(URI.create("http://bar.com")), newBuilder(URI.create("http://foo.com")));
 
         HttpRequest.Builder builder = newBuilder(uri);
         assertEquals(builder.build(), builder.build());
-        assertEquals(builder.build(), newBuilder(uri).build());
+        assertEquals(newBuilder(uri).build(), builder.build());
 
         builder.POST(BodyPublishers.noBody());
         assertEquals(builder.build(), builder.build());
-        assertEquals(builder.build(), newBuilder(uri).POST(BodyPublishers.noBody()).build());
-        assertEquals(builder.build(), newBuilder(uri).POST(BodyPublishers.ofString("")).build());
-        assertNotEquals(builder.build(), newBuilder(uri).build());
-        assertNotEquals(builder.build(), newBuilder(uri).GET().build());
-        assertNotEquals(builder.build(), newBuilder(uri).PUT(BodyPublishers.noBody()).build());
+        assertEquals(newBuilder(uri).POST(BodyPublishers.noBody()).build(), builder.build());
+        assertEquals(newBuilder(uri).POST(BodyPublishers.ofString("")).build(), builder.build());
+        assertNotEquals(newBuilder(uri).build(), builder.build());
+        assertNotEquals(newBuilder(uri).GET().build(), builder.build());
+        assertNotEquals(newBuilder(uri).PUT(BodyPublishers.noBody()).build(), builder.build());
 
         builder = newBuilder(uri).header("x", "y");
         assertEquals(builder.build(), builder.build());
-        assertEquals(builder.build(), newBuilder(uri).header("x", "y").build());
-        assertNotEquals(builder.build(), newBuilder(uri).header("x", "Z").build());
-        assertNotEquals(builder.build(), newBuilder(uri).header("z", "y").build());
+        assertEquals(newBuilder(uri).header("x", "y").build(), builder.build());
+        assertNotEquals(newBuilder(uri).header("x", "Z").build(), builder.build());
+        assertNotEquals(newBuilder(uri).header("z", "y").build(), builder.build());
     }
 
     @Test
diff --git a/test/jdk/java/net/httpclient/Response1xxTest.java b/test/jdk/java/net/httpclient/Response1xxTest.java
index 5cff7a69259..9b54f852510 100644
--- a/test/jdk/java/net/httpclient/Response1xxTest.java
+++ b/test/jdk/java/net/httpclient/Response1xxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,10 +42,6 @@ import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -54,39 +50,44 @@ import static java.net.http.HttpClient.Version.valueOf;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
-/**
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/*
  * @test
  * @bug 8292044
  * @summary Tests behaviour of HttpClient when server responds with 102 or 103 status codes
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                    -Djdk.httpclient.HttpClient.log=headers,requests,responses,errors Response1xxTest
  */
 public class Response1xxTest implements HttpServerAdapters {
     private static final String EXPECTED_RSP_BODY = "Hello World";
 
-    private ServerSocket serverSocket;
-    private Http11Server server;
-    private String http1RequestURIBase;
+    private static ServerSocket serverSocket;
+    private static Http11Server server;
+    private static String http1RequestURIBase;
 
 
-    private HttpTestServer http2Server; // h2c
-    private String http2RequestURIBase;
+    private static HttpTestServer http2Server; // h2c
+    private static String http2RequestURIBase;
 
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer https2Server;  // h2
-    private String https2RequestURIBase;
+    private static HttpTestServer https2Server;  // h2
+    private static String https2RequestURIBase;
 
-    private HttpTestServer http3Server;  // h3
-    private String http3RequestURIBase;
+    private static HttpTestServer http3Server;  // h3
+    private static String http3RequestURIBase;
 
-    private final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
-    @BeforeClass
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         serverSocket = new ServerSocket(0, 0, InetAddress.getLoopbackAddress());
         server = new Http11Server(serverSocket);
         new Thread(server).start();
@@ -130,8 +131,8 @@ public class Response1xxTest implements HttpServerAdapters {
 
     }
 
-    @AfterClass
-    public void teardown() throws Throwable {
+    @AfterAll
+    public static void teardown() throws Throwable {
         try {
             assertNoOutstandingClientOps();
         } finally {
@@ -269,7 +270,7 @@ public class Response1xxTest implements HttpServerAdapters {
 
         static String readRequestLine(final Socket sock) throws IOException {
             final InputStream is = sock.getInputStream();
-            final StringBuilder sb = new StringBuilder("");
+            final StringBuilder sb = new StringBuilder();
             byte[] buf = new byte[1024];
             while (!sb.toString().endsWith("\r\n\r\n")) {
                 final int numRead = is.read(buf);
@@ -424,10 +425,10 @@ public class Response1xxTest implements HttpServerAdapters {
             System.out.println("Issuing request to " + requestURI);
             final HttpResponse<String> response = client.send(request,
                     BodyHandlers.ofString(StandardCharsets.UTF_8));
-            Assert.assertEquals(response.version(), version,
+            Assertions.assertEquals(version, response.version(),
                     "Unexpected HTTP version in response");
-            Assert.assertEquals(response.statusCode(), 200, "Unexpected response code");
-            Assert.assertEquals(response.body(), EXPECTED_RSP_BODY, "Unexpected response body");
+            Assertions.assertEquals(200, response.statusCode(), "Unexpected response code");
+            Assertions.assertEquals(EXPECTED_RSP_BODY, response.body(), "Unexpected response body");
         }
     }
 
@@ -484,7 +485,7 @@ public class Response1xxTest implements HttpServerAdapters {
                 .build();
         System.out.println("Issuing request to " + requestURI);
         // we expect the request to timeout
-        Assert.assertThrows(HttpTimeoutException.class, () -> {
+        Assertions.assertThrows(HttpTimeoutException.class, () -> {
             client.send(request, BodyHandlers.ofString(StandardCharsets.UTF_8));
         });
     }
@@ -561,7 +562,7 @@ public class Response1xxTest implements HttpServerAdapters {
         final HttpRequest request = requestBuilder.build();
         System.out.println("Issuing request to " + requestURI);
         // we expect the request to fail because the server sent an unexpected 101
-        Assert.assertThrows(ProtocolException.class,
+        Assertions.assertThrows(ProtocolException.class,
                 () -> client.send(request, BodyHandlers.ofString(StandardCharsets.UTF_8)));
     }
 
@@ -571,11 +572,11 @@ public class Response1xxTest implements HttpServerAdapters {
         final HttpRequest request = HttpRequest.newBuilder(requestURI).build();
         System.out.println("Issuing (warmup) request to " + requestURI);
         final HttpResponse<Void> response = client.send(request, HttpResponse.BodyHandlers.discarding());
-        Assert.assertEquals(response.statusCode(), 200, "Unexpected response code");
+        Assertions.assertEquals(200, response.statusCode(), "Unexpected response code");
     }
 
     // verifies that the HttpClient being tracked has no outstanding operations
-    private void assertNoOutstandingClientOps() throws AssertionError {
+    private static void assertNoOutstandingClientOps() throws AssertionError {
         System.gc();
         final AssertionError refCheckFailure = TRACKER.check(1000);
         if (refCheckFailure != null) {
diff --git a/test/jdk/java/net/httpclient/Response204V2Test.java b/test/jdk/java/net/httpclient/Response204V2Test.java
index c9dbd8eccf9..835f7aa65f7 100644
--- a/test/jdk/java/net/httpclient/Response204V2Test.java
+++ b/test/jdk/java/net/httpclient/Response204V2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *       ReferenceTracker jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     Response204V2Test
  * @summary Tests that streams are closed after receiving a 204 response.
@@ -44,7 +44,6 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -52,19 +51,9 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 
@@ -74,15 +63,25 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class Response204V2Test implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
     static final int RESPONSE_CODE = 204;
     static final int ITERATION_COUNT = 4;
@@ -101,8 +100,8 @@ public class Response204V2Test implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -128,40 +127,40 @@ public class Response204V2Test implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static final void printFailedTests() {
         out.println("\n=========================");
         try {
-            var failed = context.getFailedTests().getAllResults().stream()
-                    .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-            FAILURES.putAll(failed);
-
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
             if (FAILURES.isEmpty()) return;
@@ -179,7 +178,7 @@ public class Response204V2Test implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 http3URI,
                 http2URI,
@@ -187,13 +186,7 @@ public class Response204V2Test implements HttpServerAdapters {
         };
     }
 
-    static AtomicLong URICOUNT = new AtomicLong();
-
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         int i = 0;
@@ -232,23 +225,6 @@ public class Response204V2Test implements HttpServerAdapters {
         }
     }
 
-
-    static void checkStatus(int expected, int found) throws Exception {
-        if (expected != found) {
-            System.err.printf ("Test failed: wrong status code %d/%d\n",
-                expected, found);
-            throw new RuntimeException("Test failed");
-        }
-    }
-
-    static void checkStrings(String expected, String found) throws Exception {
-        if (!expected.equals(found)) {
-            System.err.printf ("Test failed: wrong string %s/%s\n",
-                expected, found);
-            throw new RuntimeException("Test failed");
-        }
-    }
-
     private HttpRequest.Builder newRequestBuilder(URI uri) {
         var builder = HttpRequest.newBuilder(uri);
         if (uri.getRawPath().contains("/http3/")) {
@@ -258,10 +234,10 @@ public class Response204V2Test implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void test(String uri, boolean sameClient) throws Exception {
-        checkSkip();
-        out.println("Request to " + uri);
+        out.printf("%n%s-- test sameClient=%s, uri=%s%n%n", now(), sameClient, uri);
 
         HttpClient client = newHttpClient(uri, sameClient);
 
@@ -282,8 +258,8 @@ public class Response204V2Test implements HttpServerAdapters {
         out.println("test: DONE");
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/2
         HttpTestHandler handler204 = new Handler204();
 
@@ -305,8 +281,8 @@ public class Response204V2Test implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         String sharedClientName =
                 sharedClient == null ? null : sharedClient.toString();
         sharedClient = null;
diff --git a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
index 123e47e2ac9..19393d99ee9 100644
--- a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
+++ b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @modules java.net.http/jdk.internal.net.http.common
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm/timeout=480 ResponseBodyBeforeError
+ * @run junit/othervm/timeout=480 ResponseBodyBeforeError
  */
 
 import java.io.Closeable;
@@ -54,10 +54,6 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Flow;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocketFactory;
 
@@ -67,28 +63,32 @@ import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ResponseBodyBeforeError {
 
-    ReplyingServer variableLengthServer;
-    ReplyingServer variableLengthHttpsServer;
-    ReplyingServer fixedLengthServer;
-    ReplyingServer fixedLengthHttpsServer;
+    private static ReplyingServer variableLengthServer;
+    private static ReplyingServer variableLengthHttpsServer;
+    private static ReplyingServer fixedLengthServer;
+    private static ReplyingServer fixedLengthHttpsServer;
 
-    String httpURIVarLen;
-    String httpsURIVarLen;
-    String httpURIFixLen;
-    String httpsURIFixLen;
+    private static String httpURIVarLen;
+    private static String httpsURIVarLen;
+    private static String httpURIFixLen;
+    private static String httpsURIFixLen;
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static final String EXPECTED_RESPONSE_BODY =
             "<html><body><h1>Heading</h1><p>Some Text</p></body></html>";
 
-    @DataProvider(name = "sanity")
-    public Object[][] sanity() {
+    public static Object[][] sanity() {
         return new Object[][]{
                 { httpURIVarLen   + "?length=all" },
                 { httpsURIVarLen  + "?length=all" },
@@ -97,7 +97,8 @@ public class ResponseBodyBeforeError {
         };
     }
 
-    @Test(dataProvider = "sanity")
+    @ParameterizedTest
+    @MethodSource("sanity")
     void sanity(String url) throws Exception {
         HttpClient client = HttpClient.newBuilder()
                 .proxy(NO_PROXY)
@@ -106,15 +107,14 @@ public class ResponseBodyBeforeError {
         HttpRequest request = HttpRequest.newBuilder(URI.create(url)).build();
         HttpResponse<String> response = client.send(request, ofString());
         String body = response.body();
-        assertEquals(body, EXPECTED_RESPONSE_BODY);
+        assertEquals(EXPECTED_RESPONSE_BODY, body);
         client.sendAsync(request, ofString())
                 .thenApply(resp -> resp.body())
-                .thenAccept(b -> assertEquals(b, EXPECTED_RESPONSE_BODY))
+                .thenAccept(b -> assertEquals(EXPECTED_RESPONSE_BODY, b))
                 .join();
     }
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         Object[][] cases = new Object[][] {
             // The length query string is the total number of response body
             // bytes in the reply, before the server closes the connection. The
@@ -182,7 +182,8 @@ public class ResponseBodyBeforeError {
     static final int ITERATION_COUNT = 3;
     static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testSynchronousAllRequestBody(String url,
                                        String expectedPatrialBody,
                                        boolean sameClient)
@@ -210,7 +211,7 @@ public class ResponseBodyBeforeError {
                 } catch (IOException expected) {
                     String pm = bs.receivedAsString();
                     out.println("partial body received: " + pm);
-                    assertEquals(pm, expectedPatrialBody);
+                    assertEquals(expectedPatrialBody, pm);
                 }
             }
         } finally {
@@ -221,7 +222,8 @@ public class ResponseBodyBeforeError {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsynchronousAllRequestBody(String url,
                                         String expectedPatrialBody,
                                         boolean sameClient)
@@ -250,7 +252,7 @@ public class ResponseBodyBeforeError {
                     if (ee.getCause() instanceof IOException) {
                         String pm = bs.receivedAsString();
                         out.println("partial body received: " + pm);
-                        assertEquals(pm, expectedPatrialBody);
+                        assertEquals(expectedPatrialBody, pm);
                     } else {
                         throw ee;
                     }
@@ -536,8 +538,8 @@ public class ResponseBodyBeforeError {
                 + server.getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         SSLContext.setDefault(sslContext);
 
         variableLengthServer = new PlainVariableLengthServer();
@@ -557,8 +559,8 @@ public class ResponseBodyBeforeError {
                 + "/https1/fixed/foz";
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         variableLengthServer.close();
         variableLengthHttpsServer.close();
         fixedLengthServer.close();
diff --git a/test/jdk/java/net/httpclient/ResponsePublisher.java b/test/jdk/java/net/httpclient/ResponsePublisher.java
index ce86a0a3cf5..be135e84b31 100644
--- a/test/jdk/java/net/httpclient/ResponsePublisher.java
+++ b/test/jdk/java/net/httpclient/ResponsePublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,22 +28,16 @@
  *          immediately with a Publisher<List<ByteBuffer>>
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm/timeout=480 ResponsePublisher
+ * @run junit/othervm/timeout=480 ResponsePublisher
  */
 
-import com.sun.net.httpserver.HttpServer;
 import jdk.internal.net.http.common.OperationTrackers;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.InetAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -73,28 +67,33 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ResponsePublisher implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;   // HTTPS/1.1
-    HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
-    String httpURI_fixed;
-    String httpURI_chunk;
-    String httpsURI_fixed;
-    String httpsURI_chunk;
-    String http2URI_fixed;
-    String http2URI_chunk;
-    String https2URI_fixed;
-    String https2URI_chunk;
-    String http3URI_fixed;
-    String http3URI_chunk;
+    private static HttpTestServer httpTestServer;    // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;   // HTTPS/1.1
+    private static HttpTestServer http2TestServer;   // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3  )
+    private static String httpURI_fixed;
+    private static String httpURI_chunk;
+    private static String httpsURI_fixed;
+    private static String httpsURI_chunk;
+    private static String http2URI_fixed;
+    private static String http2URI_chunk;
+    private static String https2URI_fixed;
+    private static String https2URI_chunk;
+    private static String http3URI_fixed;
+    private static String http3URI_chunk;
 
     static final int ITERATION_COUNT = 3;
     // a shared executor helps reduce the amount of threads created by the test
@@ -139,8 +138,7 @@ public class ResponsePublisher implements HttpServerAdapters {
     static final Supplier<BodyHandler<Publisher<List<ByteBuffer>>>> OF_PUBLISHER_TEST =
             BHS.of(PublishingBodyHandler::new, "PublishingBodyHandler::new");
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][]{
                 { http3URI_fixed,   false, OF_PUBLISHER_API },
                 { http3URI_chunk,   false, OF_PUBLISHER_API },
@@ -190,7 +188,7 @@ public class ResponsePublisher implements HttpServerAdapters {
         };
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
     HttpClient newHttpClient(String uri) {
         var builder = uri.contains("/http3/")
                 ? newClientBuilderForH3()
@@ -210,8 +208,9 @@ public class ResponsePublisher implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "variants")
-    public void testExceptions(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testExceptions(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
@@ -247,7 +246,7 @@ public class ResponsePublisher implements HttpServerAdapters {
             }
             // Get the final result and compare it with the expected body
             String body = ofString.getBody().toCompletableFuture().get();
-            assertEquals(body, "");
+            assertEquals("", body);
             // ensure client closes before next iteration
             if (!sameClient) {
                 var tracker = TRACKER.getTracker(client);
@@ -257,8 +256,9 @@ public class ResponsePublisher implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testNoBody(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testNoBody(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
@@ -276,7 +276,7 @@ public class ResponsePublisher implements HttpServerAdapters {
             response.body().subscribe(ofString);
             // Get the final result and compare it with the expected body
             String body = ofString.getBody().toCompletableFuture().get();
-            assertEquals(body, "");
+            assertEquals("", body);
             // ensure client closes before next iteration
             if (!sameClient) {
                 var tracker = TRACKER.getTracker(client);
@@ -286,8 +286,9 @@ public class ResponsePublisher implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testNoBodyAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testNoBodyAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
@@ -308,7 +309,7 @@ public class ResponsePublisher implements HttpServerAdapters {
                                 return ofString.getBody();
                             });
             // Get the final result and compare it with the expected body
-            assertEquals(result.get(), "");
+            assertEquals("", result.get());
             // ensure client closes before next iteration
             if (!sameClient) {
                 var tracker = TRACKER.getTracker(client);
@@ -318,8 +319,9 @@ public class ResponsePublisher implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsString(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsString(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
@@ -337,7 +339,7 @@ public class ResponsePublisher implements HttpServerAdapters {
             response.body().subscribe(ofString);
             // Get the final result and compare it with the expected body
             String body = ofString.getBody().toCompletableFuture().get();
-            assertEquals(body, WITH_BODY);
+            assertEquals(WITH_BODY, body);
             // ensure client closes before next iteration
             if (!sameClient) {
                 var tracker = TRACKER.getTracker(client);
@@ -347,8 +349,9 @@ public class ResponsePublisher implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
-    public void testAsStringAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
+    @ParameterizedTest
+    @MethodSource("variants")
+    void testAsStringAsync(String uri, boolean sameClient, BHS handlers) throws Exception {
         HttpClient client = null;
         for (int i=0; i< ITERATION_COUNT; i++) {
             if (!sameClient || client == null)
@@ -369,7 +372,7 @@ public class ResponsePublisher implements HttpServerAdapters {
                     });
             // Get the final result and compare it with the expected body
             String body = result.get();
-            assertEquals(body, WITH_BODY);
+            assertEquals(WITH_BODY, body);
             // ensure client closes before next iteration
             if (!sameClient) {
                 var tracker = TRACKER.getTracker(client);
@@ -383,7 +386,7 @@ public class ResponsePublisher implements HttpServerAdapters {
     static class PublishingBodyHandler implements BodyHandler<Publisher<List<ByteBuffer>>> {
         @Override
         public BodySubscriber<Publisher<List<ByteBuffer>>> apply(HttpResponse.ResponseInfo rinfo) {
-            assertEquals(rinfo.statusCode(), 200);
+            assertEquals(200, rinfo.statusCode());
             return new PublishingBodySubscriber();
         }
     }
@@ -392,7 +395,7 @@ public class ResponsePublisher implements HttpServerAdapters {
     static class PublishingBodySubscriber implements BodySubscriber<Publisher<List<ByteBuffer>>> {
         private final CompletableFuture<Flow.Subscription> subscriptionCF = new CompletableFuture<>();
         private final CompletableFuture<Flow.Subscriber<? super List<ByteBuffer>>> subscribedCF = new CompletableFuture<>();
-        private AtomicReference<Flow.Subscriber<? super List<ByteBuffer>>> subscriberRef = new AtomicReference<>();
+        private final AtomicReference<Flow.Subscriber<? super List<ByteBuffer>>> subscriberRef = new AtomicReference<>();
         private final CompletionStage<Publisher<List<ByteBuffer>>> body =
                 subscriptionCF.thenCompose((s) -> CompletableFuture.completedStage(this::subscribe));
                 //CompletableFuture.completedStage(this::subscribe);
@@ -449,13 +452,8 @@ public class ResponsePublisher implements HttpServerAdapters {
         }
     }
 
-    static String serverAuthority(HttpServer server) {
-        return InetAddress.getLoopbackAddress().getHostName() + ":"
-                + server.getAddress().getPort();
-    }
-
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // HTTP/1.1
         HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
         HttpTestHandler h1_chunkHandler = new HTTP_VariableLengthHandler();
@@ -504,8 +502,8 @@ public class ResponsePublisher implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(500);
         try {
diff --git a/test/jdk/java/net/httpclient/RetryPost.java b/test/jdk/java/net/httpclient/RetryPost.java
index ccd5dbb2922..67969306acc 100644
--- a/test/jdk/java/net/httpclient/RetryPost.java
+++ b/test/jdk/java/net/httpclient/RetryPost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
 /*
  * @test
  * @summary Ensure that the POST method is retied when the property is set.
- * @run testng/othervm -Djdk.httpclient.enableAllMethodRetry RetryPost
- * @run testng/othervm -Djdk.httpclient.enableAllMethodRetry=true RetryPost
+ * @run junit/othervm -Djdk.httpclient.enableAllMethodRetry RetryPost
+ * @run junit/othervm -Djdk.httpclient.enableAllMethodRetry=true RetryPost
  */
 
 import java.io.IOException;
@@ -41,26 +41,26 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class RetryPost {
 
-    FixedLengthServer fixedLengthServer;
-    String httpURIFixLen;
+    private static FixedLengthServer fixedLengthServer;
+    private static String httpURIFixLen;
 
     static final String RESPONSE_BODY =
             "You use a glass mirror to see your face: you use works of art to see your soul.";
 
-    @DataProvider(name = "uris")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][] {
                 { httpURIFixLen, true  },
                 { httpURIFixLen, false },
@@ -71,7 +71,8 @@ public class RetryPost {
 
     static final String REQUEST_BODY = "Body";
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testSynchronousPOST(String url, boolean sameClient) throws Exception  {
         out.print("---\n");
         HttpClient client = null;
@@ -84,12 +85,13 @@ public class RetryPost {
             HttpResponse<String> response = client.send(request, ofString());
             String body = response.body();
             out.println(response + ": " + body);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(body, RESPONSE_BODY);
+            assertEquals(200, response.statusCode());
+            assertEquals(RESPONSE_BODY, body);
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsynchronousPOST(String url, boolean sameClient) {
         out.print("---\n");
         HttpClient client = null;
@@ -101,9 +103,9 @@ public class RetryPost {
                     .build();
             client.sendAsync(request, ofString())
                     .thenApply(r -> { out.println(r + ": " + r.body()); return r; })
-                    .thenApply(r -> { assertEquals(r.statusCode(), 200); return r; })
+                    .thenApply(r -> { assertEquals(200, r.statusCode()); return r; })
                     .thenApply(HttpResponse::body)
-                    .thenAccept(b -> assertEquals(b, RESPONSE_BODY))
+                    .thenAccept(b -> assertEquals(RESPONSE_BODY, b))
                     .join();
         }
     }
@@ -223,15 +225,15 @@ public class RetryPost {
                 + server.getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         fixedLengthServer = new FixedLengthServer();
         httpURIFixLen = "http://" + serverAuthority(fixedLengthServer)
                 + "/http1/fixed/baz";
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         fixedLengthServer.close();
     }
 }
diff --git a/test/jdk/java/net/httpclient/RetryWithCookie.java b/test/jdk/java/net/httpclient/RetryWithCookie.java
index 782d8a0b956..8638693b50d 100644
--- a/test/jdk/java/net/httpclient/RetryWithCookie.java
+++ b/test/jdk/java/net/httpclient/RetryWithCookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,12 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       RetryWithCookie
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -67,28 +63,32 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class RetryWithCookie implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 5 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 5 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
     static final String MESSAGE = "BasicRedirectTest message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { http3URI,   },
                 { httpURI,    },
@@ -99,7 +99,7 @@ public class RetryWithCookie implements HttpServerAdapters {
     }
 
     static final AtomicLong requestCounter = new AtomicLong();
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     private HttpRequest.Builder newRequestBuilder(URI uri) {
         var builder = HttpRequest.newBuilder(uri);
@@ -110,7 +110,8 @@ public class RetryWithCookie implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString) throws Exception {
         out.printf("%n---- starting (%s) ----%n", uriString);
         CookieManager cookieManager = new CookieManager();
@@ -145,9 +146,9 @@ public class RetryWithCookie implements HttpServerAdapters {
             out.println("  Got response: " + response);
             out.println("  Got body Path: " + response.body());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), MESSAGE);
-            assertEquals(response.headers().allValues("X-Request-Cookie"), cookies);
+            assertEquals(200, response.statusCode());
+            assertEquals(MESSAGE, response.body());
+            assertEquals(cookies, response.headers().allValues("X-Request-Cookie"));
             request = newRequestBuilder(uri)
                     .header("X-uuid", "uuid-" + requestCounter.incrementAndGet())
                     .build();
@@ -156,8 +157,8 @@ public class RetryWithCookie implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieRetryHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
@@ -183,8 +184,8 @@ public class RetryWithCookie implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(500);
         try {
diff --git a/test/jdk/java/net/httpclient/SSLExceptionTest.java b/test/jdk/java/net/httpclient/SSLExceptionTest.java
index 4fa17c875c3..cf94d1b50f7 100644
--- a/test/jdk/java/net/httpclient/SSLExceptionTest.java
+++ b/test/jdk/java/net/httpclient/SSLExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,11 @@
 import java.io.UncheckedIOException;
 import java.net.http.HttpClient;
 import java.security.NoSuchAlgorithmException;
-import org.testng.annotations.Test;
-import static org.testng.Assert.expectThrows;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -34,7 +36,7 @@ import static org.testng.Assert.fail;
  * @summary This test verifies exception when resources for
  * SSLcontext used by HttpClient are not available
  * @build SSLExceptionTest
- * @run testng/othervm -Djdk.tls.client.protocols="InvalidTLSv1.4"
+ * @run junit/othervm -Djdk.tls.client.protocols="InvalidTLSv1.4"
  *                      SSLExceptionTest
  */
 
@@ -47,12 +49,12 @@ public class SSLExceptionTest  {
     @Test
     public void testHttpClientsslException() {
         for (int i = 0; i < ITERATIONS; i++) {
-            excp = expectThrows(UncheckedIOException.class, HttpClient.newBuilder()::build);
+            excp = Assertions.assertThrows(UncheckedIOException.class, HttpClient.newBuilder()::build);
             noSuchAlgo = excp.getCause().getCause();
             if ( !(noSuchAlgo instanceof NoSuchAlgorithmException) ) {
                 fail("Test failed due to wrong exception cause : " + noSuchAlgo);
             }
-            excp = expectThrows(UncheckedIOException.class, HttpClient::newHttpClient);
+            excp = Assertions.assertThrows(UncheckedIOException.class, HttpClient::newHttpClient);
             noSuchAlgo = excp.getCause().getCause();
             if ( !(noSuchAlgo instanceof NoSuchAlgorithmException) ) {
                 fail("Test failed due to wrong exception cause : " + noSuchAlgo);
diff --git a/test/jdk/java/net/httpclient/SendResponseHeadersTest.java b/test/jdk/java/net/httpclient/SendResponseHeadersTest.java
index df8bc3b0844..2998522616f 100644
--- a/test/jdk/java/net/httpclient/SendResponseHeadersTest.java
+++ b/test/jdk/java/net/httpclient/SendResponseHeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,13 @@
  * @library /test/lib
  * @summary Check that sendResponseHeaders throws an IOException when headers
  *  have already been sent
- * @run testng/othervm SendResponseHeadersTest
+ * @run junit/othervm SendResponseHeadersTest
  */
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,16 +51,21 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.expectThrows;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class SendResponseHeadersTest {
-    URI uri;
-    HttpServer server;
-    ExecutorService executor;
+    private static URI uri;
+    private static HttpServer server;
+    private static ExecutorService executor;
 
-    @BeforeTest
-    public void setUp() throws IOException, URISyntaxException {
+    @BeforeAll
+    public static void setUp() throws IOException, URISyntaxException {
         var loopback = InetAddress.getLoopbackAddress();
         var addr = new InetSocketAddress(loopback, 0);
         server = HttpServer.create(addr, 0);
@@ -94,8 +96,8 @@ public class SendResponseHeadersTest {
             fail(response.body());
     }
 
-    @AfterTest
-    public void tearDown() {
+    @AfterAll
+    public static void tearDown() {
         server.stop(0);
         executor.shutdown();
     }
@@ -108,7 +110,7 @@ public class SendResponseHeadersTest {
                 is.readAllBytes();
                 exchange.sendResponseHeaders(200, 0);
                 try {
-                    IOException io = expectThrows(IOException.class,
+                    IOException io = Assertions.assertThrows(IOException.class,
                             () -> exchange.sendResponseHeaders(200, 0));
                     System.out.println("Got expected exception: " + io);
                 } catch (Throwable t) {
diff --git a/test/jdk/java/net/httpclient/ServerCloseTest.java b/test/jdk/java/net/httpclient/ServerCloseTest.java
index 65eb6cfc589..d5e762b15a4 100644
--- a/test/jdk/java/net/httpclient/ServerCloseTest.java
+++ b/test/jdk/java/net/httpclient/ServerCloseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,16 +28,11 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.tls.acknowledgeCloseNotify=true ServerCloseTest
+ * @run junit/othervm -Djdk.tls.acknowledgeCloseNotify=true ServerCloseTest
  */
 //*        -Djdk.internal.httpclient.debug=true
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLContext;
@@ -70,18 +65,22 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2TestServer;
 
 import static java.lang.System.out;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class ServerCloseTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    DummyServer    httpDummyServer;    // HTTP/1.1    [ 2 servers ]
-    DummyServer    httpsDummyServer;   // HTTPS/1.1
-    String httpDummy;
-    String httpsDummy;
+    private static DummyServer    httpDummyServer;    // HTTP/1.1    [ 2 servers ]
+    private static DummyServer    httpsDummyServer;   // HTTPS/1.1
+    private static String httpDummy;
+    private static String httpsDummy;
 
     static final int ITERATION_COUNT = 3;
     // a shared executor helps reduce the amount of threads created by the test
@@ -99,7 +98,7 @@ public class ServerCloseTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    private volatile HttpClient sharedClient;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -125,8 +124,8 @@ public class ServerCloseTest implements HttpServerAdapters {
         }
     }
 
-    @AfterClass
-    static final void printFailedTests() {
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
             out.printf("%n%sCreated %d servers and %d clients%n",
@@ -145,15 +144,14 @@ public class ServerCloseTest implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 httpDummy,
                 httpsDummy,
         };
     }
 
-    @DataProvider(name = "servers")
-    public Object[][] noThrows() {
+    public static Object[][] noThrows() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2][];
         //Object[][] result = new Object[uris.length][];
@@ -192,7 +190,8 @@ public class ServerCloseTest implements HttpServerAdapters {
 
     final String ENCODED = "/01%252F03/";
 
-    @Test(dataProvider = "servers")
+    @ParameterizedTest
+    @MethodSource("noThrows")
     public void testServerClose(String uri, boolean sameClient) {
         HttpClient client = null;
         out.printf("%n%s testServerClose(%s, %b)%n", now(), uri, sameClient);
@@ -224,8 +223,8 @@ public class ServerCloseTest implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
 
         // DummyServer
@@ -240,8 +239,8 @@ public class ServerCloseTest implements HttpServerAdapters {
         httpsDummyServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         sharedClient = null;
         httpDummyServer.stopServer();
         httpsDummyServer.stopServer();
@@ -324,7 +323,7 @@ public class ServerCloseTest implements HttpServerAdapters {
                     // Read all headers until we find the empty line that
                     // signals the end of all headers.
                     String line = requestLine;
-                    while (!line.equals("")) {
+                    while (!line.isEmpty()) {
                         System.out.println(now() + getName() + ": Reading header: "
                                 + (line = readLine(ccis)));
                         headers.append(line).append("\r\n");
@@ -338,7 +337,7 @@ public class ServerCloseTest implements HttpServerAdapters {
                     byte[] b = uri.toString().getBytes(UTF_8);
                     if (index >= 0) {
                         index = index + "content-length: ".length();
-                        String cl = headers.toString().substring(index);
+                        String cl = headers.substring(index);
                         StringTokenizer tk = new StringTokenizer(cl);
                         int len = Integer.parseInt(tk.nextToken());
                         assert len < b.length * 2;
diff --git a/test/jdk/java/net/httpclient/ShortResponseBody.java b/test/jdk/java/net/httpclient/ShortResponseBody.java
index b4fd83585ee..5f931cd1ed3 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBody.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,24 +36,16 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLServerSocketFactory;
@@ -64,28 +56,40 @@ import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.util.stream.Collectors.toList;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public abstract class ShortResponseBody {
 
-    Server closeImmediatelyServer;
-    Server closeImmediatelyHttpsServer;
-    Server variableLengthServer;
-    Server variableLengthHttpsServer;
-    Server fixedLengthServer;
+    private static Server closeImmediatelyServer;
+    private static Server closeImmediatelyHttpsServer;
+    private static Server variableLengthServer;
+    private static Server variableLengthHttpsServer;
+    private static Server fixedLengthServer;
 
-    String httpURIClsImed;
-    String httpsURIClsImed;
-    String httpURIVarLen;
-    String httpsURIVarLen;
-    String httpURIFixLen;
+    private static String httpURIClsImed;
+    private static String httpsURIClsImed;
+    private static String httpURIVarLen;
+    private static String httpsURIVarLen;
+    private static String httpURIFixLen;
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    SSLParameters sslParameters;
-    HttpClient client;
-    int numberOfRequests;
+    private static SSLParameters sslParameters;
+    protected static HttpClient client;
+    private static int numberOfRequests;
 
     static final int REQUESTS_PER_CLIENT = 10; // create new client every 10 requests
     static final long PAUSE_FOR_GC = 5; // 5ms to let gc work
@@ -99,7 +103,7 @@ public abstract class ShortResponseBody {
     static final AtomicLong reqnb = new AtomicLong();
 
     static final AtomicLong ids = new AtomicLong();
-    final ThreadFactory factory = new ThreadFactory() {
+    private static final ThreadFactory factory = new ThreadFactory() {
         @Override
         public Thread newThread(Runnable r) {
             Thread thread = new Thread(r,  "HttpClient-Worker-" + ids.incrementAndGet());
@@ -107,21 +111,49 @@ public abstract class ShortResponseBody {
             return thread;
         }
     };
-    final ExecutorService service = Executors.newCachedThreadPool(factory);
-
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
+    private static final ExecutorService service = Executors.newCachedThreadPool(factory);
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
+    private static boolean stopAfterFirstFailure() {
+        return Boolean.getBoolean("jdk.internal.httpclient.debug");
+    }
+
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
+    }
+
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @BeforeEach
+    void beforeMethod() {
         if (client == null || numberOfRequests == REQUESTS_PER_CLIENT) {
             numberOfRequests = 0;
             out.println("--- new client");
@@ -134,22 +166,12 @@ public abstract class ShortResponseBody {
             }
         }
         numberOfRequests++;
-        if (context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
-            }
-        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================\n");
         try {
-            var FAILURES = context.getFailedTests().getAllResults().stream()
-                    .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-
             if (FAILURES.isEmpty()) return;
             out.println("Failed tests: ");
             FAILURES.entrySet().forEach((e) -> {
@@ -162,8 +184,7 @@ public abstract class ShortResponseBody {
         }
     }
 
-    @DataProvider(name = "sanity")
-    public Object[][] sanity() {
+    public static Object[][] sanity() {
         return new Object[][]{
             { httpURIVarLen  + "?length=all" },
             { httpsURIVarLen + "?length=all" },
@@ -175,22 +196,22 @@ public abstract class ShortResponseBody {
         return url.replace("%reqnb%", String.valueOf(reqnb.incrementAndGet()));
     }
 
-    @Test(dataProvider = "sanity")
+    @ParameterizedTest
+    @MethodSource("sanity")
     void sanity(String url) throws Exception {
         url = uniqueURL(url);
         HttpRequest request = HttpRequest.newBuilder(URI.create(url)).build();
         out.println("Request: " + request);
         HttpResponse<String> response = client.send(request, ofString());
         String body = response.body();
-        assertEquals(body, EXPECTED_RESPONSE_BODY);
+        assertEquals(EXPECTED_RESPONSE_BODY, body);
         client.sendAsync(request, ofString())
                 .thenApply(resp -> resp.body())
-                .thenAccept(b -> assertEquals(b, EXPECTED_RESPONSE_BODY))
+                .thenAccept(b -> assertEquals(EXPECTED_RESPONSE_BODY, b))
                 .join();
     }
 
-    @DataProvider(name = "sanityBadRequest")
-    public Object[][] sanityBadRequest() {
+    public static Object[][] sanityBadRequest() {
         return new Object[][]{
                 { httpURIVarLen  }, // no query string
                 { httpsURIVarLen },
@@ -198,18 +219,18 @@ public abstract class ShortResponseBody {
         };
     }
 
-    @Test(dataProvider = "sanityBadRequest")
+    @ParameterizedTest
+    @MethodSource("sanityBadRequest")
     void sanityBadRequest(String url) throws Exception {
         url = uniqueURL(url);
         HttpRequest request = HttpRequest.newBuilder(URI.create(url)).build();
         out.println("Request: " + request);
         HttpResponse<String> response = client.send(request, ofString());
-        assertEquals(response.statusCode(), 400);
-        assertEquals(response.body(), "");
+        assertEquals(400, response.statusCode());
+        assertEquals("", response.body());
     }
 
-    @DataProvider(name = "uris")
-    public Object[][] variants(ITestContext context) {
+    public static Object[][] variants() {
         String[][] cases = new String[][] {
             // The length query string is the total number of bytes in the reply,
             // including headers, before the server closes the connection. The
@@ -268,13 +289,6 @@ public abstract class ShortResponseBody {
             { httpsURIClsImed, "no bytes"},
         };
 
-        if (context.getFailedTests().size() > 0) {
-            // Shorten the log output by preventing useless
-            // skip traces to be printed for subsequent methods
-            // if one of the previous @Test method has failed.
-            return new Object[0][];
-        }
-
         return cases;
     }
 
@@ -618,7 +632,7 @@ public abstract class ShortResponseBody {
         String response( ) { return RESPONSE; }
     }
 
-    /** A server that issues a, possibly-partial, chunked reply over SSL. */
+    /** A server that issues a possibly-partial, chunked reply over SSL. */
     static final class SSLVariableLengthServer extends PlainVariableLengthServer {
         SSLVariableLengthServer() throws IOException {
             super("SSLVariableLengthServer");
@@ -655,8 +669,8 @@ public abstract class ShortResponseBody {
                 + server.getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         SSLContext.setDefault(sslContext);
 
         sslParameters = new SSLParameters();
@@ -682,8 +696,8 @@ public abstract class ShortResponseBody {
                 + "/http1/fixed/req=%reqnb%/baz";
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         closeImmediatelyServer.close();
         closeImmediatelyHttpsServer.close();
         variableLengthServer.close();
diff --git a/test/jdk/java/net/httpclient/ShortResponseBodyGet.java b/test/jdk/java/net/httpclient/ShortResponseBodyGet.java
index 0a9041020a5..47be508c8c1 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBodyGet.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBodyGet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *          received before a socket exception or eof.
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext ShortResponseBody ShortResponseBodyGet
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=headers,errors,channel
  *       ShortResponseBodyGet
  */
@@ -38,21 +38,24 @@ import java.net.URI;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.concurrent.ExecutionException;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import static java.lang.System.out;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ShortResponseBodyGet extends ShortResponseBody {
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testSynchronousGET(String urlp, String expectedMsg)
         throws Exception
     {
-        checkSkip();
         String url = uniqueURL(urlp);
         HttpRequest request = HttpRequest.newBuilder(URI.create(url)).build();
-        out.println("Request: " + request);
+        out.printf("%n%s-- testSynchronousGET Request: %s%n%n", now(), request);
         try {
             HttpResponse<String> response = client.send(request, ofString());
             String body = response.body();
@@ -67,14 +70,14 @@ public class ShortResponseBodyGet extends ShortResponseBody {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsynchronousGET(String urlp, String expectedMsg)
         throws Exception
     {
-        checkSkip();
         String url = uniqueURL(urlp);
         HttpRequest request = HttpRequest.newBuilder(URI.create(url)).build();
-        out.println("Request: " + request);
+        out.printf("%n%s-- testAsynchronousGET Request: %s%n%n", now(), request);
         try {
             HttpResponse<String> response = client.sendAsync(request, ofString()).get();
             String body = response.body();
diff --git a/test/jdk/java/net/httpclient/ShortResponseBodyPost.java b/test/jdk/java/net/httpclient/ShortResponseBodyPost.java
index c72540c5990..60d2796b34f 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBodyPost.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBodyPost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *          received before a socket exception or eof.
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext ShortResponseBody ShortResponseBodyPost
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=headers,errors,channel
  *       -Djdk.internal.httpclient.debug=true
  *       ShortResponseBodyPost
@@ -42,10 +42,14 @@ import java.net.http.HttpResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import static java.lang.System.out;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class ShortResponseBodyPost extends ShortResponseBody {
 
     // POST tests are racy in what may be received before writing may cause a
@@ -56,16 +60,16 @@ public class ShortResponseBodyPost extends ShortResponseBody {
             List.of("no bytes", "status line", "header");
 
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testSynchronousPOST(String urlp, String expectedMsg)
         throws Exception
     {
-        checkSkip();
         String url = uniqueURL(urlp);
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
                 .POST(BodyPublishers.ofInputStream(() -> new InfiniteInputStream()))
                 .build();
-        out.println("Request: " + request);
+        out.printf("%n%s-- testSynchronousPOST Request: %s%n%n", now(), request);
         try {
             HttpResponse<String> response = client.send(request, ofString());
             String body = response.body();
@@ -86,16 +90,16 @@ public class ShortResponseBodyPost extends ShortResponseBody {
         }
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsynchronousPOST(String urlp, String expectedMsg)
         throws Exception
     {
-        checkSkip();
         String url = uniqueURL(urlp);
         HttpRequest request = HttpRequest.newBuilder(URI.create(url))
                 .POST(BodyPublishers.ofInputStream(() -> new InfiniteInputStream()))
                 .build();
-        out.println("Request: " + request);
+        out.printf("%n%s-- testAsynchronousPOST Request: %s%n%n", now(), request);
         try {
             HttpResponse<String> response = client.sendAsync(request, ofString()).get();
             String body = response.body();
diff --git a/test/jdk/java/net/httpclient/ShortResponseBodyPostWithRetry.java b/test/jdk/java/net/httpclient/ShortResponseBodyPostWithRetry.java
index bd234690526..0ab404e556a 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBodyPostWithRetry.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBodyPostWithRetry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  * @build ShortResponseBody ShortResponseBodyPost
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=headers,errors,channel
  *       -Djdk.httpclient.enableAllMethodRetry
  *       -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/ShutdownNow.java b/test/jdk/java/net/httpclient/ShutdownNow.java
index 4f9eabbeb4d..e48667d2c69 100644
--- a/test/jdk/java/net/httpclient/ShutdownNow.java
+++ b/test/jdk/java/net/httpclient/ShutdownNow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
  *        jdk.test.lib.RandomFactory jdk.test.lib.Utils
  *        ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       ShutdownNow
@@ -66,10 +66,6 @@ import javax.net.ssl.SSLContext;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
@@ -80,9 +76,14 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ShutdownNow implements HttpServerAdapters {
 
@@ -92,25 +93,24 @@ public class ShutdownNow implements HttpServerAdapters {
     static final Random RANDOM = RandomFactory.getRandom();
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
-    HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String h2h3URI;
-    String h2h3Head;
-    String h3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer h2h3TestServer;        // HTTP/3 ( h2 + h3 )
+    private static HttpTestServer h3TestServer;          // HTTP/3 ( h3 )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String h2h3URI;
+    private static String h2h3Head;
+    private static String h3URI;
 
     static final String MESSAGE = "ShutdownNow message body";
     static final int ITERATIONS = 3;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { h2h3URI,    HTTP_3,   h2h3TestServer.h3DiscoveryConfig()},
                 { h3URI,      HTTP_3,   h3TestServer.h3DiscoveryConfig()},
@@ -122,7 +122,7 @@ public class ShutdownNow implements HttpServerAdapters {
     }
 
     static final AtomicLong requestCounter = new AtomicLong();
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     static Throwable getCause(Throwable t) {
         while (t instanceof CompletionException || t instanceof ExecutionException) {
@@ -137,7 +137,7 @@ public class ShutdownNow implements HttpServerAdapters {
                 .HEAD()
                 .build();
         var resp = client.send(request, BodyHandlers.discarding());
-        assertEquals(resp.statusCode(), 200);
+        assertEquals(200, resp.statusCode());
     }
 
     static boolean hasExpectedMessage(IOException io) {
@@ -176,7 +176,8 @@ public class ShutdownNow implements HttpServerAdapters {
         throw new AssertionError(what + ": Unexpected exception: " + cause, cause);
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testConcurrent(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting concurrent (%s, %s, %s) ----%n%n", uriString, version, config);
         HttpClient client = newClientBuilderForH3()
@@ -217,8 +218,8 @@ public class ShutdownNow implements HttpServerAdapters {
                 var cf = responseCF.thenApply((response) -> {
                     out.println(si + ":  Got response: " + response);
                     out.println(si + ":  Got body Path: " + response.body());
-                    assertEquals(response.statusCode(), 200);
-                    assertEquals(response.body(), MESSAGE);
+                    assertEquals(200, response.statusCode());
+                    assertEquals(MESSAGE, response.body());
                     return response;
                 }).exceptionally((t) -> {
                     Throwable cause = getCause(t);
@@ -243,7 +244,8 @@ public class ShutdownNow implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void testSequential(String uriString, Version version, Http3DiscoveryMode config) throws Exception {
         out.printf("%n---- starting sequential (%s, %s, %s) ----%n%n",
                 uriString, version, config);
@@ -284,8 +286,8 @@ public class ShutdownNow implements HttpServerAdapters {
                 responseCF.thenApply((response) -> {
                     out.println(si + ":  Got response: " + response);
                     out.println(si + ":  Got body Path: " + response.body());
-                    assertEquals(response.statusCode(), 200);
-                    assertEquals(response.body(), MESSAGE);
+                    assertEquals(200, response.statusCode());
+                    assertEquals(MESSAGE, response.body());
                     return response;
                 }).handle((r,t) -> {
                     if (t != null) {
@@ -318,8 +320,8 @@ public class ShutdownNow implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("\n**** Setup ****\n");
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new ServerRequestHandler(), "/http1/exec/");
@@ -352,8 +354,8 @@ public class ShutdownNow implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         Thread.sleep(100);
         AssertionError fail = TRACKER.check(5000);
         try {
diff --git a/test/jdk/java/net/httpclient/SmokeTest.java b/test/jdk/java/net/httpclient/SmokeTest.java
index 42c082a5e0f..f87cc462fac 100644
--- a/test/jdk/java/net/httpclient/SmokeTest.java
+++ b/test/jdk/java/net/httpclient/SmokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,39 +24,25 @@
 /*
  * @test
  * @bug 8087112 8178699 8338569
- * @modules java.net.http/jdk.internal.net.http.common
- *          java.logging
- *          jdk.httpserver
  * @library /test/lib /test/jdk/java/net/httpclient/lib /
  * @build jdk.test.lib.net.SimpleSSLContext ProxyServer
  *        jdk.httpclient.test.lib.common.TestServerConfigurator
- * @compile ../../../com/sun/net/httpserver/LogFilter.java
- * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=errors,ssl,trace
  *      SmokeTest
  */
 
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpContext;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsParameters;
-import com.sun.net.httpserver.HttpsServer;
-
 import java.net.InetAddress;
 import java.net.Proxy;
 import java.net.SocketAddress;
+import java.net.http.HttpClient.Version;
 import java.net.http.HttpHeaders;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
@@ -94,7 +80,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import jdk.httpclient.test.lib.common.TestServerConfigurator;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
 import static java.nio.file.StandardOpenOption.WRITE;
@@ -120,11 +106,11 @@ import java.util.logging.Logger;
  * Uses a FileServerHandler serving a couple of known files
  * in docs directory.
  */
-public class SmokeTest {
+public class SmokeTest implements HttpServerAdapters {
     private static final SSLContext ctx = SimpleSSLContext.findSSLContext();
     static SSLParameters sslparams;
-    static HttpServer s1 ;
-    static HttpsServer s2;
+    static HttpTestServer s1 ;
+    static HttpTestServer s2;
     static ExecutorService executor;
     static int port;
     static int httpsport;
@@ -142,19 +128,10 @@ public class SmokeTest {
     static Path smallFile;
     static String fileroot;
 
-    static class HttpEchoHandler implements HttpHandler {
-
+    static class HttpEchoHandler extends HttpTestEchoHandler {
         @Override
-        public void handle(HttpExchange exchange) throws IOException {
-            try (InputStream is = exchange.getRequestBody();
-                 OutputStream os = exchange.getResponseBody()) {
-                byte[] bytes = is.readAllBytes();
-                long responseLength = bytes.length == 0 ? -1 : bytes.length;
-                boolean fixedLength = "yes".equals(exchange.getRequestHeaders()
-                        .getFirst("XFixed"));
-                exchange.sendResponseHeaders(200, fixedLength ? responseLength : 0);
-                os.write(bytes);
-            }
+        protected boolean useXFixed() {
+            return true;
         }
     }
 
@@ -242,8 +219,8 @@ public class SmokeTest {
             //test12(httproot + "delay/foo", delayHandler);
 
         } finally {
-            s1.stop(0);
-            s2.stop(0);
+            s1.stop();
+            s2.stop();
             proxy.close();
             e.shutdownNow();
             executor.shutdownNow();
@@ -779,38 +756,31 @@ public class SmokeTest {
         ch.setLevel(Level.SEVERE);
         logger.addHandler(ch);
 
-        String root = System.getProperty ("test.src", ".")+ "/docs";
-        InetSocketAddress addr = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
-        s1 = HttpServer.create (addr, 0);
-        if (s1 instanceof HttpsServer) {
-            throw new RuntimeException ("should not be httpsserver");
-        }
-        s2 = HttpsServer.create (addr, 0);
-        HttpHandler h = new FileServerHandler(root);
+        sslparams = ctx.getDefaultSSLParameters();
+        executor = Executors.newCachedThreadPool();
 
-        HttpContext c1 = s1.createContext("/files", h);
-        HttpContext c2 = s2.createContext("/files", h);
-        HttpContext c3 = s1.createContext("/echo", new HttpEchoHandler());
+        String root = System.getProperty ("test.src", ".")+ "/docs";
+        s1 = HttpTestServer.create(Version.HTTP_1_1, null, executor);
+        s2 = HttpTestServer.create(Version.HTTP_1_1, ctx, executor);
+        HttpTestHandler h = new HttpTestFileServerHandler(root);
+
+        HttpTestContext c1 = s1.createContext("/files", h);
+        HttpTestContext c2 = s2.createContext("/files", h);
+        HttpTestContext c3 = s1.createContext("/echo", new HttpEchoHandler());
         redirectHandler = new RedirectHandler("/redirect");
         redirectHandlerSecure = new RedirectHandler("/redirect");
-        HttpContext c4 = s1.createContext("/redirect", redirectHandler);
-        HttpContext c41 = s2.createContext("/redirect", redirectHandlerSecure);
-        HttpContext c5 = s2.createContext("/echo", new HttpEchoHandler());
-        HttpContext c6 = s1.createContext("/keepalive", new KeepAliveHandler());
+        HttpTestContext c4 = s1.createContext("/redirect", redirectHandler);
+        HttpTestContext c41 = s2.createContext("/redirect", redirectHandlerSecure);
+        HttpTestContext c5 = s2.createContext("/echo", new HttpEchoHandler());
+        HttpTestContext c6 = s1.createContext("/keepalive", new KeepAliveHandler());
         redirectErrorHandler = new RedirectErrorHandler("/redirecterror");
         redirectErrorHandlerSecure = new RedirectErrorHandler("/redirecterror");
-        HttpContext c7 = s1.createContext("/redirecterror", redirectErrorHandler);
-        HttpContext c71 = s2.createContext("/redirecterror", redirectErrorHandlerSecure);
+        HttpTestContext c7 = s1.createContext("/redirecterror", redirectErrorHandler);
+        HttpTestContext c71 = s2.createContext("/redirecterror", redirectErrorHandlerSecure);
         delayHandler = new DelayHandler();
-        HttpContext c8 = s1.createContext("/delay", delayHandler);
-        HttpContext c81 = s2.createContext("/delay", delayHandler);
+        HttpTestContext c8 = s1.createContext("/delay", delayHandler);
+        HttpTestContext c81 = s2.createContext("/delay", delayHandler);
 
-        executor = Executors.newCachedThreadPool();
-        s1.setExecutor(executor);
-        s2.setExecutor(executor);
-        sslparams = ctx.getDefaultSSLParameters();
-        //sslparams.setProtocols(new String[]{"TLSv1.2"});
-        s2.setHttpsConfigurator(new Configurator(addr.getAddress(), ctx));
         s1.start();
         s2.start();
 
@@ -839,7 +809,7 @@ public class SmokeTest {
         }
     }
 
-    static class RedirectHandler implements HttpHandler {
+    static class RedirectHandler implements HttpTestHandler {
         private final String root;
         private volatile int count = 0;
 
@@ -848,17 +818,17 @@ public class SmokeTest {
         }
 
         @Override
-        public synchronized void handle(HttpExchange t) throws IOException {
+        public synchronized void handle(HttpTestExchange t) throws IOException {
             try (InputStream is = t.getRequestBody()) {
                 is.readAllBytes();
             }
 
-            Headers responseHeaders = t.getResponseHeaders();
+            var responseHeaders = t.getResponseHeaders();
 
             if (count++ < 1) {
-                responseHeaders.add("Location", root + "/foo/" + count);
+                responseHeaders.addHeader("Location", root + "/foo/" + count);
             } else {
-                responseHeaders.add("Location", SmokeTest.midSizedFilename);
+                responseHeaders.addHeader("Location", SmokeTest.midSizedFilename);
             }
             t.sendResponseHeaders(301, 64 * 1024);
             byte[] bb = new byte[1024];
@@ -879,7 +849,7 @@ public class SmokeTest {
         }
     }
 
-    static class RedirectErrorHandler implements HttpHandler {
+    static class RedirectErrorHandler implements HttpTestHandler {
         private final String root;
         private volatile int count = 1;
 
@@ -896,21 +866,21 @@ public class SmokeTest {
         }
 
         @Override
-        public synchronized void handle(HttpExchange t) throws IOException {
+        public synchronized void handle(HttpTestExchange t) throws IOException {
             try (InputStream is = t.getRequestBody()) {
                 is.readAllBytes();
             }
 
-            Headers map = t.getResponseHeaders();
-            String redirect = root + "/foo/" + Integer.toString(count);
+            var map = t.getResponseHeaders();
+            String redirect = root + "/foo/" + count;
             increment();
-            map.add("Location", redirect);
-            t.sendResponseHeaders(301, -1);
+            map.addHeader("Location", redirect);
+            t.sendResponseHeaders(301, HttpTestExchange.RSPBODY_EMPTY);
             t.close();
         }
     }
 
-    static class DelayHandler implements HttpHandler {
+    static class DelayHandler implements HttpTestHandler {
 
         CyclicBarrier bar1 = new CyclicBarrier(2);
         CyclicBarrier bar2 = new CyclicBarrier(2);
@@ -925,34 +895,17 @@ public class SmokeTest {
         }
 
         @Override
-        public synchronized void handle(HttpExchange he) throws IOException {
+        public synchronized void handle(HttpTestExchange he) throws IOException {
             he.getRequestBody().readAllBytes();
             try {
                 bar1.await();
                 bar2.await();
             } catch (Exception e) { }
-            he.sendResponseHeaders(200, -1); // will probably fail
+            he.sendResponseHeaders(200, HttpTestExchange.RSPBODY_EMPTY); // will probably fail
             he.close();
         }
     }
 
-    static class Configurator extends HttpsConfigurator {
-        private final InetAddress serverAddr;
-
-        public Configurator(InetAddress serverAddr, SSLContext ctx) {
-            super(ctx);
-            this.serverAddr = serverAddr;
-        }
-
-        @Override
-        public void configure(final HttpsParameters params) {
-            final SSLParameters p = getSSLContext().getDefaultSSLParameters();
-            TestServerConfigurator.addSNIMatcher(this.serverAddr, p);
-            //p.setProtocols(new String[]{"TLSv1.2"});
-            params.setSSLParameters(p);
-        }
-    }
-
     static final Path CWD = Paths.get(".");
 
     static Path getTempFile(int size) throws IOException {
@@ -971,120 +924,132 @@ public class SmokeTest {
         fos.close();
         return f.toPath();
     }
-}
 
-// check for simple hardcoded sequence and use remote address
-// to check.
-// First 4 requests executed in sequence (should use same connection/address)
-// Next 4 requests parallel (should use different addresses)
-// Then send 4 requests in parallel x 100 times (same four addresses used all time)
 
-class KeepAliveHandler implements HttpHandler {
-    final AtomicInteger counter = new AtomicInteger(0);
-    final AtomicInteger nparallel = new AtomicInteger(0);
+    // check for simple hardcoded sequence and use remote address
+    // to check.
+    // First 4 requests executed in sequence (should use same connection/address)
+    // Next 4 requests parallel (should use different addresses)
+    // Then send 4 requests in parallel x 100 times (same four addresses used all time)
 
-    final Set<Integer> portSet = Collections.synchronizedSet(new HashSet<>());
+    static class KeepAliveHandler implements HttpTestHandler {
+        final AtomicInteger counter = new AtomicInteger(0);
+        final AtomicInteger nparallel = new AtomicInteger(0);
 
-    final int[] ports = new int[8];
+        final Set<Integer> portSet = Collections.synchronizedSet(new HashSet<>());
 
-    void sleep(int n) {
-        try {
-            Thread.sleep(n);
-        } catch (InterruptedException e) {}
-    }
+        final int[] ports = new int[8];
 
-    synchronized void setPort(int index, int value) {
-        ports[index] = value;
-    }
-
-    synchronized int getPort(int index) {
-        return ports[index];
-    }
-
-    synchronized void getPorts(int[] dest, int from) {
-        dest[0] = ports[from+0];
-        dest[1] = ports[from+1];
-        dest[2] = ports[from+2];
-        dest[3] = ports[from+3];
-    }
-
-    static final CountDownLatch latch = new CountDownLatch(4);
-    static final CountDownLatch latch7 = new CountDownLatch(4);
-    static final CountDownLatch latch8 = new CountDownLatch(1);
-
-    @Override
-    public void handle (HttpExchange t)
-        throws IOException
-    {
-        int np = nparallel.incrementAndGet();
-        int remotePort = t.getRemoteAddress().getPort();
-        String result = "OK";
-        int[] lports = new int[4];
-
-        int n = counter.getAndIncrement();
-
-        /// First test
-        if (n < 4) {
-            setPort(n, remotePort);
-        }
-        if (n == 3) {
-            getPorts(lports, 0);
-            // check all values in ports[] are the same
-            if (lports[0] != lports[1] || lports[2] != lports[3]
-                    || lports[0] != lports[2]) {
-                result = "Error " + Integer.toString(n);
-                System.out.println(result);
-            }
-        }
-        // Second test
-        if (n >=4 && n < 8) {
-            // delay so that this connection doesn't get reused
-            // before all 4 requests sent
-            setPort(n, remotePort);
-            latch.countDown();
-            try {latch.await();} catch (InterruptedException e) {}
-            latch7.countDown();
-        }
-        if (n == 7) {
-            // wait until all n <= 7 have called setPort(...)
-            try {latch7.await();} catch (InterruptedException e) {}
-            getPorts(lports, 4);
-            // should be all different
-            if (lports[0] == lports[1] || lports[2] == lports[3]
-                    || lports[0] == lports[2]) {
-                result = "Error " + Integer.toString(n);
-                System.out.println(result);
-            }
-            // setup for third test
-            for (int i=0; i<4; i++) {
-                portSet.add(lports[i]);
-            }
-            System.out.printf("Ports: %d, %d, %d, %d\n", lports[0], lports[1], lports[2], lports[3]);
-            latch8.countDown();
-        }
-        // Third test
-        if (n > 7) {
-            // wait until all n == 7 has updated portSet
-            try {latch8.await();} catch (InterruptedException e) {}
-            if (np > 4) {
-                System.err.println("XXX np = " + np);
-            }
-            // just check that port is one of the ones in portSet
-            if (!portSet.contains(remotePort)) {
-                System.out.println ("UNEXPECTED REMOTE PORT "
-                        + remotePort + " not in " + portSet);
-                result = "Error " + Integer.toString(n);
-                System.out.println(result);
+        void sleep(int n) {
+            try {
+                Thread.sleep(n);
+            } catch (InterruptedException e) {
             }
         }
 
-        try (InputStream is = t.getRequestBody()) {
-            is.readAllBytes();
+        synchronized void setPort(int index, int value) {
+            ports[index] = value;
+        }
+
+        synchronized int getPort(int index) {
+            return ports[index];
+        }
+
+        synchronized void getPorts(int[] dest, int from) {
+            dest[0] = ports[from + 0];
+            dest[1] = ports[from + 1];
+            dest[2] = ports[from + 2];
+            dest[3] = ports[from + 3];
+        }
+
+        static final CountDownLatch latch = new CountDownLatch(4);
+        static final CountDownLatch latch7 = new CountDownLatch(4);
+        static final CountDownLatch latch8 = new CountDownLatch(1);
+
+        @Override
+        public void handle(HttpTestExchange t)
+                throws IOException {
+            int np = nparallel.incrementAndGet();
+            int remotePort = t.getRemoteAddress().getPort();
+            String result = "OK";
+            int[] lports = new int[4];
+
+            int n = counter.getAndIncrement();
+
+            /// First test
+            if (n < 4) {
+                setPort(n, remotePort);
+            }
+            if (n == 3) {
+                getPorts(lports, 0);
+                // check all values in ports[] are the same
+                if (lports[0] != lports[1] || lports[2] != lports[3]
+                        || lports[0] != lports[2]) {
+                    result = "Error " + Integer.toString(n);
+                    System.out.println(result);
+                }
+            }
+            // Second test
+            if (n >= 4 && n < 8) {
+                // delay so that this connection doesn't get reused
+                // before all 4 requests sent
+                setPort(n, remotePort);
+                latch.countDown();
+                try {
+                    latch.await();
+                } catch (InterruptedException e) {
+                }
+                latch7.countDown();
+            }
+            if (n == 7) {
+                // wait until all n <= 7 have called setPort(...)
+                try {
+                    latch7.await();
+                } catch (InterruptedException e) {
+                }
+                getPorts(lports, 4);
+                // should be all different
+                if (lports[0] == lports[1] || lports[2] == lports[3]
+                        || lports[0] == lports[2]) {
+                    result = "Error " + Integer.toString(n);
+                    System.out.println(result);
+                }
+                // setup for third test
+                for (int i = 0; i < 4; i++) {
+                    portSet.add(lports[i]);
+                }
+                System.out.printf("Ports: %d, %d, %d, %d\n", lports[0], lports[1], lports[2], lports[3]);
+                latch8.countDown();
+            }
+            // Third test
+            if (n > 7) {
+                // wait until all n == 7 has updated portSet
+                try {
+                    latch8.await();
+                } catch (InterruptedException e) {
+                }
+                if (np > 4) {
+                    System.err.println("XXX np = " + np);
+                }
+                // just check that port is one of the ones in portSet
+                if (!portSet.contains(remotePort)) {
+                    System.out.println("UNEXPECTED REMOTE PORT "
+                            + remotePort + " not in " + portSet);
+                    result = "Error " + Integer.toString(n);
+                    System.out.println(result);
+                }
+            }
+
+            try (InputStream is = t.getRequestBody()) {
+                is.readAllBytes();
+            }
+            byte[] bytes = result.getBytes(StandardCharsets.UTF_8);
+            long responseLength = HttpTestExchange.fixedRsp(bytes.length);
+            t.sendResponseHeaders(200, responseLength);
+            OutputStream o = t.getResponseBody();
+            o.write(bytes);
+            t.close();
+            nparallel.getAndDecrement();
         }
-        t.sendResponseHeaders(200, result.length());
-        OutputStream o = t.getResponseBody();
-        o.write(result.getBytes(StandardCharsets.UTF_8));
-        t.close();
-        nparallel.getAndDecrement();
     }
 }
diff --git a/test/jdk/java/net/httpclient/SpecialHeadersTest.java b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
index d33135dd4ce..d4d5f2a85e2 100644
--- a/test/jdk/java/net/httpclient/SpecialHeadersTest.java
+++ b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,35 +31,22 @@
  *        jdk.httpclient.test.lib.http2.Http2TestServer
  *        jdk.test.lib.net.SimpleSSLContext
  * @requires (vm.compMode != "Xcomp")
- * @run testng/othervm/timeout=480
+ * @run junit/othervm/timeout=480
  *       -Djdk.httpclient.HttpClient.log=requests,headers,errors
  *       SpecialHeadersTest
- * @run testng/othervm/timeout=480 -Djdk.httpclient.allowRestrictedHeaders=Host
+ * @run junit/othervm/timeout=480 -Djdk.httpclient.allowRestrictedHeaders=Host
  *       -Djdk.httpclient.HttpClient.log=requests,headers,errors
  *       SpecialHeadersTest
  */
 
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsServer;
 import jdk.internal.net.http.common.OperationTrackers.Tracker;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
@@ -83,9 +70,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2TestServer;
 
 import static java.lang.System.err;
 import static java.lang.System.out;
@@ -93,22 +78,37 @@ import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
+import static java.net.http.HttpOption.H3_DISCOVERY;
+import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.nio.charset.StandardCharsets.US_ASCII;
-import org.testng.Assert;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class SpecialHeadersTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;        // HTTPS/1.1
-    HttpTestServer http2TestServer;        // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;       // HTTP/2 ( h2  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
+    private static HttpTestServer httpTestServer;         // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;        // HTTPS/1.1
+    private static HttpTestServer http2TestServer;        // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;       // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;        // HTTP/3
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String https3URI;
 
     static final String[][] headerNamesAndValues = new String[][]{
             {"User-Agent: <DEFAULT>"},
@@ -132,8 +132,7 @@ public class SpecialHeadersTest implements HttpServerAdapters {
             {"hoSt: mixed"}
     };
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         String prop = System.getProperty("jdk.httpclient.allowRestrictedHeaders");
         boolean hostTest = prop != null && prop.equalsIgnoreCase("host");
         final String[][] testInput = hostTest ? headerNamesAndValues1 : headerNamesAndValues;
@@ -153,6 +152,9 @@ public class SpecialHeadersTest implements HttpServerAdapters {
             Arrays.asList(testInput).stream()
                     .map(e -> new Object[] {https2URI, e[0], sameClient})
                     .forEach(list::add);
+            Arrays.asList(testInput).stream()
+                    .map(e -> new Object[] {https3URI, e[0], sameClient})
+                    .forEach(list::add);
         }
         return list.stream().toArray(Object[][]::new);
     }
@@ -173,8 +175,8 @@ public class SpecialHeadersTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    private volatile HttpClient sharedClient;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static volatile HttpClient sharedClient;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -209,38 +211,39 @@ public class SpecialHeadersTest implements HttpServerAdapters {
 
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    final AtomicReference<SkipException> skiptests = new AtomicReference<>();
-    void checkSkip() {
-        var skip = skiptests.get();
-        if (skip != null) throw skip;
-    }
-    static String name(ITestResult result) {
-        var params = result.getParameters();
-        return result.getName()
-                + (params == null ? "()" : Arrays.toString(result.getParameters()));
-    }
-
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            if (skiptests.get() == null) {
-                SkipException skip = new SkipException("some tests failed");
-                skip.setStackTrace(new StackTraceElement[0]);
-                skiptests.compareAndSet(null, skip);
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
             }
         }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
     }
 
-    @AfterClass
-    static final void printFailedTests(ITestContext context) {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
-        var failed = context.getFailedTests().getAllResults().stream()
-                .collect(Collectors.toMap(r -> name(r), ITestResult::getThrowable));
-        FAILURES.putAll(failed);
         try {
             out.printf("%n%sCreated %d servers and %d clients%n",
                     now(), serverCount.get(), clientCount.get());
@@ -260,7 +263,7 @@ public class SpecialHeadersTest implements HttpServerAdapters {
 
     private HttpClient makeNewClient() {
         clientCount.incrementAndGet();
-        return HttpClient.newBuilder()
+        return newClientBuilderForH3()
                 .proxy(NO_PROXY)
                 .executor(executor)
                 .sslContext(sslContext)
@@ -307,7 +310,8 @@ public class SpecialHeadersTest implements HttpServerAdapters {
         if (throwable instanceof Error e) throw e;
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void test(String uriString,
               String headerNameAndValue,
               boolean sameClient)
@@ -335,6 +339,10 @@ public class SpecialHeadersTest implements HttpServerAdapters {
                 }
 
                 HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri);
+                if (uriString.contains("/http3")) {
+                    requestBuilder.version(HTTP_3);
+                    requestBuilder.setOption(H3_DISCOVERY, HTTP_3_URI_ONLY);
+                }
                 if (!useDefault) {
                     requestBuilder.header(name, value);
                 }
@@ -343,7 +351,7 @@ public class SpecialHeadersTest implements HttpServerAdapters {
 
                 out.println("Got response: " + resp);
                 out.println("Got body: " + resp.body());
-                assertEquals(resp.statusCode(), 200,
+                assertEquals(200, resp.statusCode(),
                         "Expected 200, got:" + resp.statusCode());
 
                 boolean isInitialRequest = i == 0;
@@ -366,10 +374,10 @@ public class SpecialHeadersTest implements HttpServerAdapters {
                             : resp.headers().firstValue("X-" + key).get();
                     out.println("Got X-" + key + ": " + resp.headers().allValues("X-" + key));
                     if (value != null) {
-                        assertEquals(receivedHeaderString, value);
-                        assertEquals(resp.headers().allValues("X-" + key), List.of(value));
+                        assertEquals(value, receivedHeaderString);
+                        assertEquals(List.of(value), resp.headers().allValues("X-" + key));
                     } else {
-                        assertEquals(resp.headers().allValues("X-" + key).size(), 0);
+                        assertEquals(0, resp.headers().allValues("X-" + key).size());
                     }
                 }
             } catch (Throwable x) {
@@ -389,7 +397,8 @@ public class SpecialHeadersTest implements HttpServerAdapters {
         }
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testHomeMadeIllegalHeader(String uriString,
                                    String headerNameAndValue,
                                    boolean sameClient)
@@ -443,7 +452,7 @@ public class SpecialHeadersTest implements HttpServerAdapters {
 
             try {
                 HttpResponse<String> response = client.send(req, BodyHandlers.ofString());
-                Assert.fail("Unexpected reply: " + response);
+                Assertions.fail("Unexpected reply: " + response);
             } catch (IllegalArgumentException ee) {
                 out.println("Got IAE as expected");
             }
@@ -465,7 +474,8 @@ public class SpecialHeadersTest implements HttpServerAdapters {
 
 
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsync(String uriString, String headerNameAndValue, boolean sameClient)
             throws Exception
     {
@@ -490,6 +500,10 @@ public class SpecialHeadersTest implements HttpServerAdapters {
                 }
 
                 HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri);
+                if (uriString.contains("/http3")) {
+                    requestBuilder.version(HTTP_3);
+                    requestBuilder.setOption(H3_DISCOVERY, HTTP_3_URI_ONLY);
+                }
                 if (!useDefault) {
                     requestBuilder.header(name, value);
                 }
@@ -504,7 +518,7 @@ public class SpecialHeadersTest implements HttpServerAdapters {
                         .thenApply(response -> {
                             out.println("Got response: " + response);
                             out.println("Got body: " + response.body());
-                            assertEquals(response.statusCode(), 200);
+                            assertEquals(200, response.statusCode());
                             return response;
                         })
                         .thenAccept(resp -> {
@@ -522,10 +536,10 @@ public class SpecialHeadersTest implements HttpServerAdapters {
                                         : resp.headers().firstValue("X-" + key).orElse(null);
                                 out.println("Got X-" + key + ": " + resp.headers().allValues("X-" + key));
                                 if (value != null) {
-                                    assertEquals(receivedHeaderString, value);
-                                    assertEquals(resp.headers().allValues("X-" + key), List.of(value));
+                                    assertEquals(value, receivedHeaderString);
+                                    assertEquals(List.of(value), resp.headers().allValues("X-" + key));
                                 } else {
-                                    assertEquals(resp.headers().allValues("X-" + key).size(), 1);
+                                    assertEquals(1, resp.headers().allValues("X-" + key).size());
                                 }
                             }
                         })
@@ -552,8 +566,8 @@ public class SpecialHeadersTest implements HttpServerAdapters {
                 + server.getAddress().getPort();
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         out.println("--- Starting setup " + now());
 
         HttpTestHandler handler = new HttpUriStringHandler();
@@ -573,14 +587,19 @@ public class SpecialHeadersTest implements HttpServerAdapters {
         https2TestServer.addHandler(handler, "/https2");
         https2URI = "https://" + https2TestServer.serverAuthority() + "/https2";
 
+        http3TestServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
+        http3TestServer.addHandler(handler, "/http3");
+        https3URI = "https://" + http3TestServer.serverAuthority() + "/http3";
+
         httpTestServer.start();
         httpsTestServer.start();
         http2TestServer.start();
         https2TestServer.start();
+        http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         out.println("\n--- Teardown " + now());
         HttpClient shared = sharedClient;
         String sharedClientName =
@@ -595,6 +614,7 @@ public class SpecialHeadersTest implements HttpServerAdapters {
             httpsTestServer.stop();
             http2TestServer.stop();
             https2TestServer.stop();
+            http3TestServer.start();
             executor.shutdown();
         } finally {
             if (fail != null) {
diff --git a/test/jdk/java/net/httpclient/StreamCloseTest.java b/test/jdk/java/net/httpclient/StreamCloseTest.java
index fcb00188581..7b228e69de2 100644
--- a/test/jdk/java/net/httpclient/StreamCloseTest.java
+++ b/test/jdk/java/net/httpclient/StreamCloseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, NTT DATA.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +30,7 @@
  * @library /test/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm StreamCloseTest
+ * @run junit/othervm StreamCloseTest
  */
 
 import java.io.InputStream;
@@ -44,10 +44,10 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.net.URI;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.Assert;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class StreamCloseTest {
 
@@ -82,8 +82,8 @@ public class StreamCloseTest {
 
     private static HttpServerAdapters.HttpTestServer httpTestServer;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpServerAdapters.HttpTestServer.create(Version.HTTP_1_1);
         httpTestServer.addHandler(new HttpServerAdapters.HttpTestEchoHandler(), "/");
         URI uri = URI.create("http://" + httpTestServer.serverAuthority() + "/");
@@ -96,8 +96,8 @@ public class StreamCloseTest {
         requestBuilder = HttpRequest.newBuilder(uri);
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
     }
 
@@ -108,7 +108,7 @@ public class StreamCloseTest {
                                             .POST(BodyPublishers.ofInputStream(() -> in))
                                             .build();
         client.send(request, BodyHandlers.discarding());
-        Assert.assertTrue(in.closeCalled, "InputStream was not closed!");
+        Assertions.assertTrue(in.closeCalled, "InputStream was not closed!");
     }
 
     @Test
@@ -120,9 +120,9 @@ public class StreamCloseTest {
         try {
             client.send(request, BodyHandlers.discarding());
         } catch (IOException e) { // expected
-            Assert.assertTrue(in.closeCalled, "InputStream was not closed!");
+            Assertions.assertTrue(in.closeCalled, "InputStream was not closed!");
             return;
         }
-        Assert.fail("IOException should be occurred!");
+        Assertions.fail("IOException should be occurred!");
     }
 }
diff --git a/test/jdk/java/net/httpclient/StreamingBody.java b/test/jdk/java/net/httpclient/StreamingBody.java
index c2ad19cf7b7..d0577596038 100644
--- a/test/jdk/java/net/httpclient/StreamingBody.java
+++ b/test/jdk/java/net/httpclient/StreamingBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,12 @@
  * @test
  * @summary Exercise a streaming subscriber ( InputStream ) without holding a
  *          strong (or any ) reference to the client.
+ * @key randomness
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
- *       StreamingBody
+ *       ${test.main.class}
  */
 
 import java.io.IOException;
@@ -40,13 +41,15 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -55,27 +58,134 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class StreamingBody implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 4 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
 
+    static final AtomicLong clientCount = new AtomicLong();
+    static final AtomicLong serverCount = new AtomicLong();
+    static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+    private static boolean stopAfterFirstFailure() {
+        return true;
+    }
+
+    static final long start = System.nanoTime();
+    public static String now() {
+        long now = System.nanoTime() - start;
+        long secs = now / 1000_000_000;
+        long mill = (now % 1000_000_000) / 1000_000;
+        long nan = now % 1000_000;
+        return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+    }
+
+    final static class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
+        }
+    }
+
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    /// The GCTrigger triggers GC at random intervals to
+    /// help garbage collecting HttpClient intances. This test
+    /// wants to verify that HttpClient instances which are no
+    /// longer strongly referenced are not garbage collected
+    /// before pending HTTP requests are finished. The test
+    /// creates many client instances (up to 500) and relies
+    /// on the GC to collect them, since it does not want to
+    /// keep a strong reference, and therefore cannot not call
+    /// close(). This can put extra load on the machine since
+    /// we can't (and don't want to) control when the GC will
+    /// intervene. The purpose of this class is to trigger the
+    /// GC at random intervals to 1. help garbage collect client
+    /// instances earlier, thus reducing the load on the machine,
+    /// and 2. potentially trigger bugs if the client gets
+    /// inadvertently GC'ed before the request is finished
+    /// (which is the bug we're testing for here).
+    static class GCTrigger {
+        private final long gcinterval;
+        private final Thread runner;
+        private volatile boolean stop;
+        private final static Random RANDOM = RandomFactory.getRandom();
+
+        GCTrigger(long gcinterval) {
+            this.gcinterval = Math.clamp(gcinterval, 100, Long.MAX_VALUE/2);
+            runner = Thread.ofPlatform().daemon().unstarted(this::loop);
+        }
+
+        private void loop() {
+            long min = gcinterval / 2;
+            long max = gcinterval + min;
+            while (!stop) {
+                try {
+                    Thread.sleep(RANDOM.nextLong(min, max));
+                } catch (InterruptedException x) {
+                    stop = true;
+                    break;
+                }
+                out.println(now() + "triggering gc");
+                System.gc();
+            }
+        }
+
+        public void start() {
+            runner.start();
+        }
+
+        public void stop() throws InterruptedException {
+            stop = true;
+            runner.interrupt();
+            runner.join();
+        }
+    }
+
+    static GCTrigger gcTrigger;
     static final String MESSAGE = "StreamingBody message body";
     static final int ITERATIONS = 100;
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { http3URI,   },
                 { httpURI,    },
@@ -94,72 +204,118 @@ public class StreamingBody implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString) throws Exception {
-        out.printf("%n---- starting (%s) ----%n", uriString);
+        out.printf("%n%s---- starting (%s) ----%n", now(), uriString);
         URI uri = URI.create(uriString);
         HttpRequest request = newRequestBuilder(uri).build();
 
         for (int i=0; i< ITERATIONS; i++) {
-            out.println("iteration: " + i);
-            var builder = uriString.contains("/http3/")
-                    ? newClientBuilderForH3()
-                    : HttpClient.newBuilder();
-            HttpResponse<InputStream> response = builder
-                    .sslContext(sslContext)
-                    .proxy(NO_PROXY)
-                    .build()
-                    .sendAsync(request, BodyHandlers.ofInputStream())
-                    .join();
+            try {
+                out.println(now() + "iteration: " + i);
+                var builder = uriString.contains("/http3/")
+                        ? newClientBuilderForH3()
+                        : HttpClient.newBuilder();
+                clientCount.incrementAndGet();
 
-            String body = new String(response.body().readAllBytes(), UTF_8);
-            out.println("Got response: " + response);
-            out.println("Got body Path: " + body);
+                // we want to relinquish the reference to the HttpClient facade
+                // as soon as possible. We're using `ofInputStream()` because
+                // the HttpResponse will be returned almost immediately, before
+                // the response is read. Similarly we use sendAsync() because
+                // this will return a CompletableFuture and not wait for the
+                // request to complete within a method called on the client
+                // facade.
+                HttpResponse<InputStream> response = builder
+                        .sslContext(sslContext)
+                        .proxy(NO_PROXY)
+                        .build()
+                        .sendAsync(request, BodyHandlers.ofInputStream())
+                        .join();
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(body, MESSAGE);
+                String body = new String(response.body().readAllBytes(), UTF_8);
+                out.println("Got response: " + response);
+                out.println("Got body Path: " + body);
+
+                assertEquals(200, response.statusCode());
+                assertEquals(MESSAGE, body);
+            } catch (Throwable t) {
+                String msg = "%stest(%s)[%s] failed: %s"
+                        .formatted(now(), uriString, i, t);
+                out.println(msg);
+                throw new AssertionError(msg, t);
+            }
         }
     }
 
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new MessageHandler(), "/http1/streamingbody/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/streamingbody/w";
+        serverCount.incrementAndGet();
 
         httpsTestServer = HttpTestServer.create(HTTP_1_1, sslContext);
         httpsTestServer.addHandler(new MessageHandler(),"/https1/streamingbody/");
         httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/streamingbody/x";
+        serverCount.incrementAndGet();
 
         http2TestServer = HttpTestServer.create(HTTP_2);
         http2TestServer.addHandler(new MessageHandler(), "/http2/streamingbody/");
         http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/streamingbody/y";
+        serverCount.incrementAndGet();
 
         https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         https2TestServer.addHandler(new MessageHandler(), "/https2/streamingbody/");
         https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/streamingbody/z";
+        serverCount.incrementAndGet();
 
         http3TestServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         http3TestServer.addHandler(new MessageHandler(), "/http3/streamingbody/");
         http3URI = "https://" + http3TestServer.serverAuthority() + "/http3/streamingbody/z";
+        serverCount.incrementAndGet();
+
+        gcTrigger = new GCTrigger(500);
 
         httpTestServer.start();
         httpsTestServer.start();
         http2TestServer.start();
         https2TestServer.start();
         http3TestServer.start();
+        gcTrigger.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
-        httpTestServer.stop();
-        httpsTestServer.stop();
-        http2TestServer.stop();
-        https2TestServer.stop();
-        http3TestServer.stop();
+    @AfterAll
+    public static void teardown() throws Exception {
+        try {
+            httpTestServer.stop();
+            httpsTestServer.stop();
+            http2TestServer.stop();
+            https2TestServer.stop();
+            http3TestServer.stop();
+            gcTrigger.stop();
+        } finally {
+            printFailedTests();
+        }
+    }
+
+    static void printFailedTests() {
+        out.println("\n=========================");
+        try {
+            out.printf("%n%sCreated %s servers and %s clients%n",
+                    now(), serverCount.get(), clientCount.get());
+            if (FAILURES.isEmpty()) return;
+            out.println("Failed tests: ");
+            FAILURES.entrySet().forEach((e) -> {
+                out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+                e.getValue().printStackTrace(out);
+            });
+        } finally {
+            out.println("\n=========================\n");
+        }
     }
 
     static class MessageHandler implements HttpTestHandler {
diff --git a/test/jdk/java/net/httpclient/SubscriberAPIExceptions.java b/test/jdk/java/net/httpclient/SubscriberAPIExceptions.java
index bf0f7c0bda7..93f55d066e9 100644
--- a/test/jdk/java/net/httpclient/SubscriberAPIExceptions.java
+++ b/test/jdk/java/net/httpclient/SubscriberAPIExceptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,26 +36,26 @@ import java.net.http.HttpResponse.BodySubscriber;
 import java.net.http.HttpResponse.BodySubscribers;
 import java.util.function.Function;
 
-import org.testng.annotations.Test;
 
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE;
 import static java.nio.file.StandardOpenOption.WRITE;
 import static java.nio.file.StandardOpenOption.READ;
-import static org.testng.Assert.assertThrows;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
  * @summary Basic tests for API specified exceptions from Handler,
  *          and Subscriber convenience static factory methods.
- * @run testng SubscriberAPIExceptions
+ * @run junit SubscriberAPIExceptions
  */
 
 public class SubscriberAPIExceptions {
 
     static final Class<NullPointerException> NPE = NullPointerException.class;
     static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
-    static final Class<IndexOutOfBoundsException> IOB = IndexOutOfBoundsException.class;
 
     @Test
     public void handlerAPIExceptions() throws Exception {
diff --git a/test/jdk/java/net/httpclient/TestKitTest.java b/test/jdk/java/net/httpclient/TestKitTest.java
index 25f39d90305..2aba794426f 100644
--- a/test/jdk/java/net/httpclient/TestKitTest.java
+++ b/test/jdk/java/net/httpclient/TestKitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,6 @@
  * questions.
  */
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,15 +32,16 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
  * @compile TestKit.java
- * @run testng TestKitTest
+ * @run junit TestKitTest
  */
 public final class TestKitTest {
 
@@ -50,15 +50,14 @@ public final class TestKitTest {
         Integer integer = TestKit.assertNotThrows(
                 () -> TestKit.assertNotThrows(() -> 1)
         );
-        assertEquals(integer, Integer.valueOf(1));
+        assertEquals(Integer.valueOf(1), integer);
 
         RuntimeException re = TestKit.assertThrows(
                 RuntimeException.class,
                 () -> TestKit.assertNotThrows(() -> { throw new IOException(); })
         );
-        assertEquals(re.getMessage(),
-                "Expected to run normally, but threw "
-                        + "java.io.IOException");
+        assertEquals("Expected to run normally, but threw "
+                        + "java.io.IOException", re.getMessage());
 
         TestKit.assertNotThrows(
                 () -> TestKit.assertNotThrows(() -> { })
@@ -68,9 +67,8 @@ public final class TestKitTest {
                 RuntimeException.class,
                 () ->  TestKit.assertNotThrows((TestKit.ThrowingProcedure) () -> { throw new IOException(); })
         );
-        assertEquals(re.getMessage(),
-                "Expected to run normally, but threw "
-                        + "java.io.IOException");
+        assertEquals("Expected to run normally, but threw "
+                        + "java.io.IOException", re.getMessage());
     }
 
     @Test
@@ -87,13 +85,13 @@ public final class TestKitTest {
                 () -> TestKit.assertThrows(IOException.class, null)
         );
         assertNotNull(npe);
-        assertEquals(npe.getMessage(), "code");
+        assertEquals("code", npe.getMessage());
 
         npe = TestKit.assertThrows(
                 NullPointerException.class,
                 () -> TestKit.assertThrows(null, () -> { })
         );
-        assertEquals(npe.getMessage(), "clazz");
+        assertEquals("clazz", npe.getMessage());
 
         npe = TestKit.assertThrows(
                 NullPointerException.class,
@@ -101,16 +99,15 @@ public final class TestKitTest {
         );
         assertNotNull(npe);
         assertNull(npe.getMessage());
-        assertEquals(npe.getClass(), NullPointerException.class);
+        assertEquals(NullPointerException.class, npe.getClass());
 
         RuntimeException re = TestKit.assertThrows(
                 RuntimeException.class,
                 () -> TestKit.assertThrows(NullPointerException.class, () -> { })
         );
-        assertEquals(re.getClass(), RuntimeException.class);
-        assertEquals(re.getMessage(),
-                "Expected to catch an exception of type "
-                        + "java.lang.NullPointerException, but caught nothing");
+        assertEquals(RuntimeException.class, re.getClass());
+        assertEquals("Expected to catch an exception of type "
+                        + "java.lang.NullPointerException, but caught nothing", re.getMessage());
 
         re = TestKit.assertThrows(
                 RuntimeException.class,
@@ -118,7 +115,7 @@ public final class TestKitTest {
         );
         assertNotNull(re);
         assertNull(re.getMessage());
-        assertEquals(re.getClass(), NullPointerException.class);
+        assertEquals(NullPointerException.class, re.getClass());
 
         re = TestKit.assertThrows(
                 RuntimeException.class,
@@ -127,10 +124,9 @@ public final class TestKitTest {
                         () -> { throw new IndexOutOfBoundsException(); }
                 ));
         assertNotNull(re);
-        assertEquals(re.getClass(), RuntimeException.class);
-        assertEquals(re.getMessage(),
-                "Expected to catch an exception of type java.util.IllegalFormatException"
-                        + ", but caught java.lang.IndexOutOfBoundsException");
+        assertEquals(RuntimeException.class, re.getClass());
+        assertEquals("Expected to catch an exception of type java.util.IllegalFormatException"
+                        + ", but caught java.lang.IndexOutOfBoundsException", re.getMessage());
     }
 
     @Test
diff --git a/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java b/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
index 67b993eef0b..2d8ff05dbd2 100644
--- a/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
+++ b/test/jdk/java/net/httpclient/TimeoutResponseTestSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,8 @@ public class TimeoutResponseTestSupport {
     private static final SSLContext SSL_CONTEXT = SimpleSSLContext.findSSLContext();
 
     protected static final Duration REQUEST_TIMEOUT =
-            Duration.ofMillis(Long.parseLong(System.getProperty("test.requestTimeoutMillis")));
+            Duration.ofMillis(jdk.test.lib.Utils.adjustTimeout(
+                Long.parseLong(System.getProperty("test.requestTimeoutMillis"))));
 
     static {
         assertTrue(
@@ -87,7 +88,8 @@ public class TimeoutResponseTestSupport {
             Integer.parseInt(System.getProperty("jdk.httpclient.redirects.retrylimit", "0"));
 
     private static final long RESPONSE_FAILURE_WAIT_DURATION_MILLIS =
-            Long.parseLong(System.getProperty("test.responseFailureWaitDurationMillis", "0"));
+            jdk.test.lib.Utils.adjustTimeout(
+                Long.parseLong(System.getProperty("test.responseFailureWaitDurationMillis", "0")));
 
     static {
         if (RETRY_LIMIT > 0) {
diff --git a/test/jdk/java/net/httpclient/TlsContextTest.java b/test/jdk/java/net/httpclient/TlsContextTest.java
index 8a5cc99aad3..95cb501d24c 100644
--- a/test/jdk/java/net/httpclient/TlsContextTest.java
+++ b/test/jdk/java/net/httpclient/TlsContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,19 +36,22 @@ import javax.net.ssl.SSLParameters;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import jdk.test.lib.security.SecurityUtils;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /*
  * @test
  * @bug 8239594 8371887
@@ -56,7 +59,7 @@ import jdk.test.lib.security.SecurityUtils;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext TlsContextTest
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Dtest.requiresHost=true
+ * @run junit/othervm -Dtest.requiresHost=true
  *                   -Djdk.httpclient.HttpClient.log=headers
  *                   -Djdk.internal.httpclient.disableHostnameVerification
  *                   -Djdk.internal.httpclient.debug=false
@@ -67,11 +70,11 @@ public class TlsContextTest implements HttpServerAdapters {
 
     static HttpTestServer https2Server;
     static String https2URI;
-    SSLContext server;
+    static SSLContext server;
     final static Integer ITERATIONS = 3;
 
-    @BeforeTest
-    public void setUp() throws Exception {
+    @BeforeAll
+    public static void setUp() throws Exception {
         // Re-enable TLSv1 and TLSv1.1 since test depends on them
         SecurityUtils.removeFromDisabledTlsAlgs("TLSv1", "TLSv1.1");
 
@@ -86,8 +89,7 @@ public class TlsContextTest implements HttpServerAdapters {
         https2URI = "https://" + https2Server.serverAuthority() + "/server/";
     }
 
-    @DataProvider(name = "scenarios")
-    public Object[][] scenarios() throws Exception {
+    public static Object[][] scenarios() throws Exception {
         return new Object[][]{
                 { SimpleSSLContext.findSSLContext("TLS"),     HTTP_2,   "TLSv1.3" },
                 { SimpleSSLContext.findSSLContext("TLSv1.2"), HTTP_2,   "TLSv1.2" },
@@ -102,7 +104,8 @@ public class TlsContextTest implements HttpServerAdapters {
     /**
      * Tests various scenarios between client and server tls handshake with valid http
      */
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     public void testVersionProtocolsNoParams(SSLContext context,
                                      Version version,
                                      String expectedProtocol) throws Exception {
@@ -113,7 +116,8 @@ public class TlsContextTest implements HttpServerAdapters {
      * Tests various scenarios between client and server tls handshake with valid http,
      * but with empty SSLParameters
      */
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("scenarios")
     public void testVersionProtocolsEmptyParams(SSLContext context,
                                              Version version,
                                              String expectedProtocol) throws Exception {
@@ -150,24 +154,24 @@ public class TlsContextTest implements HttpServerAdapters {
 
     private void testAllProtocols(HttpResponse<String> response,
                                   String expectedProtocol,
-                                  Version clientVersion) throws Exception {
+                                  Version clientVersion) {
         String protocol = response.sslSession().get().getProtocol();
         int statusCode = response.statusCode();
         Version version = response.version();
         out.println("Got Body " + response.body());
         out.println("The protocol negotiated is :" + protocol);
-        assertEquals(statusCode, 200);
-        assertEquals(protocol, expectedProtocol);
+        assertEquals(200, statusCode);
+        assertEquals(expectedProtocol, protocol);
         if (clientVersion == HTTP_3) {
-            assertEquals(version, expectedProtocol.equals("TLSv1.1") ? HTTP_1_1 :
-                    expectedProtocol.equals("TLSv1.2") ? HTTP_2 : HTTP_3);
+            assertEquals(expectedProtocol.equals("TLSv1.1") ? HTTP_1_1 :
+                    expectedProtocol.equals("TLSv1.2") ? HTTP_2 : HTTP_3, version);
         } else {
-            assertEquals(version, expectedProtocol.equals("TLSv1.1") ? HTTP_1_1 : HTTP_2);
+            assertEquals(expectedProtocol.equals("TLSv1.1") ? HTTP_1_1 : HTTP_2, version);
         }
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         https2Server.stop();
     }
 
diff --git a/test/jdk/java/net/httpclient/UnauthorizedTest.java b/test/jdk/java/net/httpclient/UnauthorizedTest.java
index 628130f9ffc..1c72bac6cc9 100644
--- a/test/jdk/java/net/httpclient/UnauthorizedTest.java
+++ b/test/jdk/java/net/httpclient/UnauthorizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,16 +32,12 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext ReferenceTracker
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.httpclient.HttpClient.log=headers
  *       UnauthorizedTest
  */
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -65,24 +61,29 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class UnauthorizedTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
-    HttpClient authClient;
-    HttpClient noAuthClient;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
+    private static HttpClient authClient;
+    private static HttpClient noAuthClient;
 
     static final int ITERATIONS = 3;
 
@@ -100,8 +101,7 @@ public class UnauthorizedTest implements HttpServerAdapters {
         return new WeakReference<>(client);
     }
 
-    @DataProvider(name = "all")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { http3URI  + "/server", UNAUTHORIZED, true, ref(authClient)},
                 { http3URI  + "/server", UNAUTHORIZED, false, ref(authClient)},
@@ -144,8 +144,6 @@ public class UnauthorizedTest implements HttpServerAdapters {
         };
     }
 
-    static final AtomicLong requestCounter = new AtomicLong();
-
     static final Authenticator authenticator = new Authenticator() {
     };
 
@@ -158,7 +156,8 @@ public class UnauthorizedTest implements HttpServerAdapters {
         return builder;
     }
 
-    @Test(dataProvider = "all")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, int code, boolean async, WeakReference<HttpClient> clientRef) throws Throwable {
         HttpClient client = clientRef.get();
         out.printf("%n---- starting (%s, %d, %s, %s) ----%n",
@@ -195,9 +194,8 @@ public class UnauthorizedTest implements HttpServerAdapters {
         }
 
         out.println("  Got response: " + response);
-        assertEquals(response.statusCode(), code);
-        assertEquals(response.body(),
-                (code == UNAUTHORIZED ? "WWW-" : "Proxy-") + MESSAGE);
+        assertEquals(code, response.statusCode());
+        assertEquals(                (code == UNAUTHORIZED ? "WWW-" : "Proxy-") + MESSAGE, response.body());
         if (shouldThrow) {
             throw new RuntimeException("Expected IOException not thrown.");
         }
@@ -205,8 +203,8 @@ public class UnauthorizedTest implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new UnauthorizedHandler(), "/http1/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1";
@@ -225,13 +223,13 @@ public class UnauthorizedTest implements HttpServerAdapters {
         http3TestServer.addHandler(new UnauthorizedHandler(), "/http3/");
         http3URI = "https://" + http3TestServer.serverAuthority() + "/http3";
 
-        authClient = newClientBuilderForH3()
+        authClient = HttpServerAdapters.createClientBuilderForH3()
                 .proxy(HttpClient.Builder.NO_PROXY)
                 .sslContext(sslContext)
                 .authenticator(authenticator)
                 .build();
 
-        noAuthClient = newClientBuilderForH3()
+        noAuthClient = HttpServerAdapters.createClientBuilderForH3()
                 .proxy(HttpClient.Builder.NO_PROXY)
                 .sslContext(sslContext)
                 .build();
@@ -243,8 +241,8 @@ public class UnauthorizedTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         // authClient.close();
         // noAuthClient.close();
         var TRACKER = ReferenceTracker.INSTANCE;
diff --git a/test/jdk/java/net/httpclient/UserCookieTest.java b/test/jdk/java/net/httpclient/UserCookieTest.java
index 3d202914050..f49f44c157c 100644
--- a/test/jdk/java/net/httpclient/UserCookieTest.java
+++ b/test/jdk/java/net/httpclient/UserCookieTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *          server-cookies for HTTP/2 vs HTTP/1.1
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.tls.acknowledgeCloseNotify=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       UserCookieTest
@@ -68,10 +68,6 @@ import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_1_1;
@@ -80,25 +76,30 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class UserCookieTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer httpTestServer;        // HTTP/1.1    [ 7 servers ]
-    HttpTestServer httpsTestServer;       // HTTPS/1.1
-    HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
-    HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
-    HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
-    DummyServer httpDummyServer;
-    DummyServer httpsDummyServer;
-    String httpURI;
-    String httpsURI;
-    String http2URI;
-    String https2URI;
-    String http3URI;
-    String httpDummy;
-    String httpsDummy;
+    private static HttpTestServer httpTestServer;        // HTTP/1.1    [ 7 servers ]
+    private static HttpTestServer httpsTestServer;       // HTTPS/1.1
+    private static HttpTestServer http2TestServer;       // HTTP/2 ( h2c )
+    private static HttpTestServer https2TestServer;      // HTTP/2 ( h2  )
+    private static HttpTestServer http3TestServer;       // HTTP/3 ( h3  )
+    private static DummyServer httpDummyServer;
+    private static DummyServer httpsDummyServer;
+    private static String httpURI;
+    private static String httpsURI;
+    private static String http2URI;
+    private static String https2URI;
+    private static String http3URI;
+    private static String httpDummy;
+    private static String httpsDummy;
 
     static final String MESSAGE = "Basic CookieHeaderTest message body";
     static final int ITERATIONS = 3;
@@ -111,8 +112,7 @@ public class UserCookieTest implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    @DataProvider(name = "positive")
-    public Object[][] positive() {
+    public static Object[][] positive() {
         return new Object[][] {
                 { http3URI, HTTP_3  },
                 { httpURI, HTTP_1_1  },
@@ -130,7 +130,8 @@ public class UserCookieTest implements HttpServerAdapters {
 
     static final AtomicLong requestCounter = new AtomicLong();
 
-    @Test(dataProvider = "positive")
+    @ParameterizedTest
+    @MethodSource("positive")
     void test(String uriString, HttpClient.Version version) throws Exception {
         out.printf("%n---- starting (%s) ----%n", uriString);
         ConcurrentHashMap<String, List<String>> cookieHeaders
@@ -178,12 +179,13 @@ public class UserCookieTest implements HttpServerAdapters {
             out.println("  Got response: " + response);
             out.println("  Got body Path: " + response.body());
 
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), MESSAGE);
-            assertEquals(response.headers().allValues("X-Request-Cookie"),
-                    expectedCookies.stream()
-                            .filter(s -> !s.startsWith("LOC"))
-                            .toList());
+            assertEquals(200, response.statusCode());
+            assertEquals(MESSAGE, response.body());
+            List<String> expectedCookieList = expectedCookies.stream()
+                    .filter(s -> !s.startsWith("LOC")).toList();
+            List<String> actualCookieList = response.headers()
+                    .allValues("X-Request-Cookie");
+            assertEquals(expectedCookieList, actualCookieList);
             requestBuilder = HttpRequest.newBuilder(uri)
                     .header("X-uuid", "uuid-" + requestCounter.incrementAndGet())
                     .header("Cookie", userCookie);
@@ -200,8 +202,8 @@ public class UserCookieTest implements HttpServerAdapters {
 
     // -- Infrastructure
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         httpTestServer = HttpTestServer.create(HTTP_1_1);
         httpTestServer.addHandler(new CookieValidationHandler(), "/http1/cookie/");
         httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/cookie/retry";
@@ -236,8 +238,8 @@ public class UserCookieTest implements HttpServerAdapters {
         httpsDummyServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
@@ -575,6 +577,5 @@ public class UserCookieTest implements HttpServerAdapters {
             return new DummyServer(ss, true);
         }
 
-
     }
 }
diff --git a/test/jdk/java/net/httpclient/http2/BasicTest.java b/test/jdk/java/net/httpclient/http2/BasicTest.java
index 58ab191fc6f..ddcf707e875 100644
--- a/test/jdk/java/net/httpclient/http2/BasicTest.java
+++ b/test/jdk/java/net/httpclient/http2/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@
  * @library /test/jdk/java/net/httpclient/lib
  *          /test/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer
- *        jdk.httpclient.test.lib.http2.Http2TestExchange
- *        jdk.httpclient.test.lib.http2.Http2EchoHandler
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
@@ -49,9 +47,9 @@ import java.util.concurrent.*;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import jdk.httpclient.test.lib.http2.Http2TestExchange;
-import jdk.httpclient.test.lib.http2.Http2EchoHandler;
 import jdk.test.lib.net.SimpleSSLContext;
 import org.junit.jupiter.api.Test;
 
@@ -60,13 +58,13 @@ import static jdk.test.lib.Asserts.assertFileContentsEqual;
 import static jdk.test.lib.Utils.createTempFile;
 import static jdk.test.lib.Utils.createTempFileOfSize;
 
-public class BasicTest {
+public class BasicTest implements HttpServerAdapters {
 
     private static final String TEMP_FILE_PREFIX =
             HttpClient.class.getPackageName() + '-' + BasicTest.class.getSimpleName() + '-';
 
     static int httpPort, httpsPort;
-    static Http2TestServer httpServer, httpsServer;
+    static HttpTestServer httpServer, httpsServer;
     static HttpClient client = null;
     static ExecutorService clientExec;
     static ExecutorService serverExec;
@@ -77,18 +75,20 @@ public class BasicTest {
     static void initialize() throws Exception {
         try {
             client = getClient();
-            httpServer = new Http2TestServer(false, 0, serverExec, sslContext);
-            httpServer.addHandler(new Http2EchoHandler(), "/");
+            httpServer = HttpTestServer.of(
+                    new Http2TestServer(false, 0, serverExec, sslContext));
+            httpServer.addHandler(new HttpTestFileEchoHandler(), "/");
             httpServer.addHandler(new EchoWithPingHandler(), "/ping");
             httpPort = httpServer.getAddress().getPort();
 
-            httpsServer = new Http2TestServer(true, 0, serverExec, sslContext);
-            httpsServer.addHandler(new Http2EchoHandler(), "/");
+            httpsServer = HttpTestServer.of(
+                    new Http2TestServer(true, 0, serverExec, sslContext));
+            httpsServer.addHandler(new HttpTestFileEchoHandler(), "/");
 
             httpsPort = httpsServer.getAddress().getPort();
-            httpURIString = "http://localhost:" + httpPort + "/foo/";
-            pingURIString = "http://localhost:" + httpPort + "/ping/";
-            httpsURIString = "https://localhost:" + httpsPort + "/bar/";
+            httpURIString = "http://" + httpServer.serverAuthority() + "/foo/";
+            pingURIString = "http://" + httpServer.serverAuthority() + "/ping/";
+            httpsURIString = "https://" + httpsServer.serverAuthority() + "/bar/";
 
             httpServer.start();
             httpsServer.start();
@@ -104,11 +104,11 @@ public class BasicTest {
 
     static CompletableFuture<Long> currentCF;
 
-    static class EchoWithPingHandler extends Http2EchoHandler {
+    static class EchoWithPingHandler extends HttpTestFileEchoHandler {
         private final Object lock = new Object();
 
         @Override
-        public void handle(Http2TestExchange exchange) throws IOException {
+        public void handle(HttpTestExchange exchange) throws IOException {
             // for now only one ping active at a time. don't want to saturate
             synchronized(lock) {
                 CompletableFuture<Long> cf = currentCF;
@@ -221,17 +221,17 @@ public class BasicTest {
     }
 
     static void paramsTest() throws Exception {
-        httpsServer.addHandler((t -> {
+        httpsServer.addHandler(((HttpTestExchange t) -> {
             SSLSession s = t.getSSLSession();
             String prot = s.getProtocol();
             if (prot.equals("TLSv1.2") || prot.equals("TLSv1.3")) {
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, HttpTestExchange.RSPBODY_EMPTY);
             } else {
                 System.err.printf("Protocols =%s\n", prot);
-                t.sendResponseHeaders(500, -1);
+                t.sendResponseHeaders(500, HttpTestExchange.RSPBODY_EMPTY);
             }
         }), "/");
-        URI u = new URI("https://localhost:"+httpsPort+"/foo");
+        URI u = new URI("https://" + httpsServer.serverAuthority() + "/foo");
         HttpClient client = getClient();
         HttpRequest req = HttpRequest.newBuilder(u).build();
         HttpResponse<String> resp = client.send(req, BodyHandlers.ofString());
diff --git a/test/jdk/java/net/httpclient/http2/ErrorTest.java b/test/jdk/java/net/httpclient/http2/ErrorTest.java
index 6ecc27441e1..6b36529b38f 100644
--- a/test/jdk/java/net/httpclient/http2/ErrorTest.java
+++ b/test/jdk/java/net/httpclient/http2/ErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,9 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import jdk.httpclient.test.lib.http2.Http2EchoHandler;
 
 import jdk.test.lib.net.SimpleSSLContext;
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -73,7 +74,7 @@ import org.testng.annotations.Test;
  * But, the exception that was thrown was not being returned up to application
  * causing hang problems
  */
-public class ErrorTest {
+public class ErrorTest implements HttpServerAdapters {
 
     static final String[] CIPHER_SUITES = new String[]{ "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" };
 
@@ -91,16 +92,17 @@ public class ErrorTest {
                                       .version(HTTP_2)
                                       .build();
 
-        Http2TestServer httpsServer = null;
+        HttpTestServer httpsServer = null;
         try {
             SSLContext serverContext = SimpleSSLContext.findSSLContext();
             SSLParameters p = serverContext.getSupportedSSLParameters();
             p.setApplicationProtocols(new String[]{"h2"});
-            httpsServer = new Http2TestServer(true,
+            Http2TestServer httpsServerImpl = new Http2TestServer(true,
                                               0,
                                               exec,
                                               serverContext);
-            httpsServer.addHandler(new Http2EchoHandler(), "/");
+            httpsServer = HttpTestServer.of(httpsServerImpl);
+            httpsServer.addHandler(new HttpTestFileEchoHandler(), "/");
             int httpsPort = httpsServer.getAddress().getPort();
             String httpsURIString = "https://localhost:" + httpsPort + "/bar/";
 
diff --git a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
index 0f807c33dff..2378b0b6982 100644
--- a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
+++ b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @library /test/jdk/java/net/httpclient/lib
  *          /test/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestServer
- *        jdk.httpclient.test.lib.http2.Http2EchoHandler
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
@@ -41,8 +40,10 @@ import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.*;
 import java.nio.file.*;
 import java.util.concurrent.*;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import jdk.httpclient.test.lib.http2.Http2EchoHandler;
 import jdk.test.lib.net.SimpleSSLContext;
 
 import static java.net.http.HttpClient.Version.HTTP_2;
@@ -52,14 +53,13 @@ import static jdk.test.lib.Utils.createTempFileOfSize;
 
 import org.testng.annotations.Test;
 
-@Test
-public class FixedThreadPoolTest {
+public class FixedThreadPoolTest implements HttpServerAdapters {
 
     private static final String TEMP_FILE_PREFIX =
             HttpClient.class.getPackageName() + '-' + FixedThreadPoolTest.class.getSimpleName() + '-';
 
     static int httpPort, httpsPort;
-    static Http2TestServer httpServer, httpsServer;
+    static HttpTestServer httpServer, httpsServer;
     static HttpClient client = null;
     static ExecutorService exec;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
@@ -69,16 +69,18 @@ public class FixedThreadPoolTest {
     static void initialize() throws Exception {
         try {
             client = getClient();
-            httpServer = new Http2TestServer(false, 0, exec, sslContext);
-            httpServer.addHandler(new Http2EchoHandler(), "/");
+            httpServer = HttpTestServer.of(
+                    new Http2TestServer(false, 0, exec, sslContext));
+            httpServer.addHandler(new HttpTestFileEchoHandler(), "/");
             httpPort = httpServer.getAddress().getPort();
 
-            httpsServer = new Http2TestServer(true, 0, exec, sslContext);
-            httpsServer.addHandler(new Http2EchoHandler(), "/");
+            httpsServer = HttpTestServer.of(
+                    new Http2TestServer(true, 0, exec, sslContext));
+            httpsServer.addHandler(new HttpTestFileEchoHandler(), "/");
 
             httpsPort = httpsServer.getAddress().getPort();
-            httpURIString = "http://localhost:" + httpPort + "/foo/";
-            httpsURIString = "https://localhost:" + httpsPort + "/bar/";
+            httpURIString = "http://" + httpServer.serverAuthority() + "/foo/";
+            httpsURIString = "https://" + httpsServer.serverAuthority() + "/bar/";
 
             httpServer.start();
             httpsServer.start();
@@ -193,7 +195,7 @@ public class FixedThreadPoolTest {
     static void paramsTest() throws Exception {
         System.err.println("paramsTest");
         Http2TestServer server = new Http2TestServer(true, 0, exec, sslContext);
-        server.addHandler((t -> {
+        server.addHandler(((Http2TestExchange t) -> {
             SSLSession s = t.getSSLSession();
             String prot = s.getProtocol();
             if (prot.equals(expectedTLSVersion(sslContext))) {
diff --git a/test/jdk/java/net/httpclient/http2/RedirectTest.java b/test/jdk/java/net/httpclient/http2/RedirectTest.java
index 1d7b894bc40..e2acd807bd5 100644
--- a/test/jdk/java/net/httpclient/http2/RedirectTest.java
+++ b/test/jdk/java/net/httpclient/http2/RedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.http2.Http2TestExchange
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- *        jdk.httpclient.test.lib.http2.Http2EchoHandler
  *        jdk.httpclient.test.lib.http2.Http2RedirectHandler
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.net.SimpleSSLContext
@@ -48,16 +47,17 @@ import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.Arrays;
 import java.util.Iterator;
+
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
-import jdk.httpclient.test.lib.http2.Http2EchoHandler;
 import jdk.httpclient.test.lib.http2.Http2RedirectHandler;
 import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_2;
 
-public class RedirectTest {
+public class RedirectTest implements HttpServerAdapters {
     static int httpPort;
-    static Http2TestServer httpServer;
+    static HttpTestServer httpServer;
     static HttpClient client;
 
     static String httpURIString, altURIString1, altURIString2;
@@ -105,23 +105,26 @@ public class RedirectTest {
     static void initialize() throws Exception {
         try {
             client = getClient();
-            httpServer = new Http2TestServer(false, 0, null, null);
+            Http2TestServer http2ServerImpl =
+                    new Http2TestServer(false, 0, null, null);
+            httpServer = HttpTestServer.of(http2ServerImpl);
             httpPort = httpServer.getAddress().getPort();
 
             // urls are accessed in sequence below. The first two are on
             // different servers. Third on same server as second. So, the
             // client should use the same http connection.
-            httpURIString = "http://localhost:" + httpPort + "/foo/";
+            httpURIString = "http://" + httpServer.serverAuthority() + "/foo/";
             httpURI = URI.create(httpURIString);
-            altURIString1 = "http://localhost:" + httpPort + "/redir";
+            altURIString1 = "http://" + httpServer.serverAuthority() + "/redir";
             altURI1 = URI.create(altURIString1);
-            altURIString2 = "http://localhost:" + httpPort + "/redir_again";
+            altURIString2 = "http://" + httpServer.serverAuthority() + "/redir_again";
             altURI2 = URI.create(altURIString2);
 
+            // TODO: remove dependency on Http2RedirectHandler
             Redirector r = new Redirector(sup(altURIString1, altURIString2));
-            httpServer.addHandler(r, "/foo");
-            httpServer.addHandler(r, "/redir");
-            httpServer.addHandler(new Http2EchoHandler(), "/redir_again");
+            http2ServerImpl.addHandler(r, "/foo");
+            http2ServerImpl.addHandler(r, "/redir");
+            httpServer.addHandler(new HttpTestFileEchoHandler(), "/redir_again");
 
             httpServer.start();
         } catch (Throwable e) {
diff --git a/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java b/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java
index 727f2c78352..fdfc498b21e 100644
--- a/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java
+++ b/test/jdk/java/net/httpclient/http3/BadCipherSuiteErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @bug 8157105
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm/timeout=60 -Djavax.net.debug=ssl -Djdk.httpclient.HttpClient.log=all BadCipherSuiteErrorTest
+ * @run junit/othervm/timeout=60 -Djavax.net.debug=ssl -Djdk.httpclient.HttpClient.log=all BadCipherSuiteErrorTest
  * @summary check exception thrown when bad TLS parameters selected
  */
 
@@ -49,7 +49,7 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * When selecting an unacceptable cipher suite the TLS handshake will fail.
diff --git a/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java b/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
index 17fc33f3aa5..800a02eb2c4 100644
--- a/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
+++ b/test/jdk/java/net/httpclient/http3/GetHTTP3Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,30 +44,31 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLContext;
 
 import jdk.test.lib.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import org.testng.ITestContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.*;
 import static java.lang.System.out;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
@@ -76,7 +77,7 @@ import static java.lang.System.out;
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.Utils
  * @compile ../ReferenceTracker.java
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     GetHTTP3Test
  * @summary Basic HTTP/3 GET test
@@ -92,8 +93,8 @@ public class GetHTTP3Test implements HttpServerAdapters {
             """;
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
-    String h3URI;
+    private static HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
+    private static String h3URI;
 
     static final int ITERATION_COUNT = 4;
     // a shared executor helps reduce the amount of threads created by the test
@@ -111,10 +112,10 @@ public class GetHTTP3Test implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    final Set<String> sharedClientHasH3 = ConcurrentHashMap.newKeySet();
-    private volatile HttpClient sharedClient;
-    private boolean directQuicConnectionSupported;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final Set<String> sharedClientHasH3 = ConcurrentHashMap.newKeySet();
+    private static volatile HttpClient sharedClient;
+    private static boolean directQuicConnectionSupported;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -140,21 +141,38 @@ public class GetHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            var x = new SkipException("Skipping: some test failed");
-            x.setStackTrace(new StackTraceElement[0]);
-            throw x;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
         }
     }
 
-    @AfterClass
-    final void printFailedTests() {
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
+    static void printFailedTests() {
         out.println("\n=========================");
         try {
             out.printf("%n%sCreated %d servers and %d clients%n",
@@ -174,24 +192,20 @@ public class GetHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 h3URI,
         };
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2 * 2 * 2][];
         int i = 0;
         for (var version : List.of(Optional.empty(), Optional.of(HTTP_3))) {
             for (Version firstRequestVersion : List.of(HTTP_2, HTTP_3)) {
                 for (boolean sameClient : List.of(false, true)) {
-                    for (String uri : uris()) {
+                    for (String uri : uris) {
                         result[i++] = new Object[]{uri, firstRequestVersion, sameClient, version};
                     }
                 }
@@ -201,15 +215,6 @@ public class GetHTTP3Test implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "uris")
-    public Object[][] uris(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
-        Object[][] result = {{h3URI}};
-        return result;
-    }
-
     private HttpClient makeNewClient() {
         clientCount.incrementAndGet();
         HttpClient client = newClientBuilderForH3()
@@ -235,7 +240,8 @@ public class GetHTTP3Test implements HttpServerAdapters {
     }
 
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsync(String uri, Version firstRequestVersion, boolean sameClient, Optional<Version> version) throws Exception {
         System.out.println("Request to " + uri +"/Async/*" +
                 ", firstRequestVersion=" + firstRequestVersion +
@@ -263,17 +269,17 @@ public class GetHTTP3Test implements HttpServerAdapters {
         }
 
         HttpResponse<String> response1 = client.send(headBuilder.build(), BodyHandlers.ofString());
-        assertEquals(response1.statusCode(), 200, "Unexpected first response code");
-        assertEquals(response1.body(), "", "Unexpected first response body");
+        assertEquals(200, response1.statusCode(), "Unexpected first response code");
+        assertEquals("", response1.body(), "Unexpected first response body");
         boolean expectH3 = sameClient && sharedClientHasH3.contains(headURI.getRawAuthority());
         if (firstRequestVersion == HTTP_3) {
             if (expectH3) {
                 out.println("Expecting HEAD response over HTTP_3");
-                assertEquals(response1.version(), HTTP_3, "Unexpected first response version");
+                assertEquals(HTTP_3, response1.version(), "Unexpected first response version");
             }
         } else {
             out.println("Expecting HEAD response over HTTP_2");
-            assertEquals(response1.version(), HTTP_2, "Unexpected first response version");
+            assertEquals(HTTP_2, response1.version(), "Unexpected first response version");
         }
         out.println("HEAD response version: " + response1.version());
         if (response1.version() == HTTP_2) {
@@ -329,10 +335,10 @@ public class GetHTTP3Test implements HttpServerAdapters {
                 out.println("Checking response: " + u);
                 var response = e.getValue().get();
                 out.println("Response is: " + response + ", [version: " + response.version() + "]");
-                assertEquals(response.statusCode(), 200,"status for " + u);
-                assertEquals(response.body(), BODY,"body for " + u);
+                assertEquals(200, response.statusCode(), "status for " + u);
+                assertEquals(BODY, response.body(), "body for " + u);
                 if (expectH3) {
-                    assertEquals(response.version(), HTTP_3, "version for " + u);
+                    assertEquals(HTTP_3, response.version(), "version for " + u);
                 }
                 if (response.version() == HTTP_3) {
                     h3Count++;
@@ -354,7 +360,8 @@ public class GetHTTP3Test implements HttpServerAdapters {
         System.out.println("test: DONE");
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("uris")
     public void testSync(String h3URI) throws Exception {
         HttpClient client = makeNewClient();
         Builder builder = HttpRequest.newBuilder(URI.create(h3URI + "/Sync/GET/1"))
@@ -374,22 +381,22 @@ public class GetHTTP3Test implements HttpServerAdapters {
         HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
         out.println("Response #1: " + response);
         out.println("Version  #1: " + response.version());
-        assertEquals(response.statusCode(), 200, "first response status");
+        assertEquals(200, response.statusCode(), "first response status");
         if (directQuicConnectionSupported) {
             // TODO unreliable assertion
             //assertEquals(response.version(), HTTP_3, "Unexpected first response version");
         } else {
-            assertEquals(response.version(), HTTP_2, "Unexpected first response version");
+            assertEquals(HTTP_2, response.version(), "Unexpected first response version");
         }
-        assertEquals(response.body(), BODY, "first response body");
+        assertEquals(BODY, response.body(), "first response body");
 
         request = builder.uri(URI.create(h3URI + "/Sync/GET/2")).build();
         response = client.send(request, BodyHandlers.ofString());
         out.println("Response #2: " + response);
         out.println("Version  #2: " + response.version());
-        assertEquals(response.statusCode(), 200, "second response status");
-        assertEquals(response.version(), HTTP_3, "second response version");
-        assertEquals(response.body(), BODY, "second response body");
+        assertEquals(200, response.statusCode(), "second response status");
+        assertEquals(HTTP_3, response.version(), "second response version");
+        assertEquals(BODY, response.body(), "second response body");
 
         var tracker = TRACKER.getTracker(client);
         client = null;
@@ -398,8 +405,8 @@ public class GetHTTP3Test implements HttpServerAdapters {
         if (error != null) throw error;
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         final Http2TestServer h2WithAltService = new Http2TestServer("localhost", true,
                 sslContext).enableH3AltServiceOnSamePort();
         h3TestServer = HttpTestServer.of(h2WithAltService);
@@ -410,8 +417,8 @@ public class GetHTTP3Test implements HttpServerAdapters {
         directQuicConnectionSupported = h2WithAltService.supportsH3DirectConnection();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("=======================================================");
         System.err.println("               Tearing down test");
         System.err.println("=======================================================");
@@ -453,7 +460,7 @@ public class GetHTTP3Test implements HttpServerAdapters {
                 }
                 try (InputStream is = t.getRequestBody();
                      OutputStream os = t.getResponseBody()) {
-                    assertEquals(is.readAllBytes().length, 0);
+                    assertEquals(0, is.readAllBytes().length);
                     if (!"HEAD".equals(t.getRequestMethod())) {
                         String[] body = BODY.split("\n");
                         for (String line : body) {
diff --git a/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java b/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java
index fb0e1ef3085..fff11f4ceb4 100644
--- a/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3BadHeadersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,13 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
  * @compile ../ReferenceTracker.java
- * @run testng/othervm -Djdk.internal.httpclient.debug=true H3BadHeadersTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true H3BadHeadersTest
  * @summary this test verifies the behaviour of the HttpClient when presented
  *          with bad headers
  */
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
@@ -57,10 +53,17 @@ import java.util.concurrent.ExecutionException;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.util.List.of;
 import static java.util.Map.entry;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class H3BadHeadersTest implements HttpServerAdapters  {
 
@@ -76,14 +79,13 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
     static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer http3TestServer;   // HTTP/3 ( h3 only )
-    HttpTestServer https2TestServer;  // HTTP/2 ( h2 + h3 )
-    String http3URI;
-    String https2URI;
+    private static HttpTestServer http3TestServer;   // HTTP/3 ( h3 only )
+    private static HttpTestServer https2TestServer;  // HTTP/2 ( h2 + h3 )
+    private static String http3URI;
+    private static String https2URI;
 
 
-    @DataProvider(name = "variants")
-    public Object[][] variants() {
+    public static Object[][] variants() {
         return new Object[][] {
                 { http3URI,  false},
                 { https2URI, false},
@@ -93,7 +95,8 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
     }
 
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void test(String uri,
               boolean sameClient)
         throws Exception
@@ -126,8 +129,8 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
                         .HEAD().setOption(H3_DISCOVERY, config).build();
                 System.out.println("\nSending HEAD request: " + head);
                 var headResponse = client.send(head, BodyHandlers.ofString());
-                assertEquals(headResponse.statusCode(), 200);
-                assertEquals(headResponse.version(), Version.HTTP_2);
+                assertEquals(200, headResponse.statusCode());
+                assertEquals(Version.HTTP_2, headResponse.version());
             }
 
             URI uriWithQuery = URI.create(uri +  "?BAD_HEADERS=" + i);
@@ -163,7 +166,8 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
         System.err.printf("%ntest %s, %s, DONE%n%n", uri, sameClient);
     }
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     void testAsync(String uri,
                    boolean sameClient) throws Exception
     {
@@ -199,8 +203,8 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
                 System.out.println("\nSending HEAD request: " + head);
 
                 var headResponse = client.send(head, BodyHandlers.ofString());
-                assertEquals(headResponse.statusCode(), 200);
-                assertEquals(headResponse.version(), Version.HTTP_2);
+                assertEquals(200, headResponse.statusCode());
+                assertEquals(Version.HTTP_2, headResponse.version());
             }
 
             URI uriWithQuery = URI.create(uri +  "?BAD_HEADERS=" + i);
@@ -246,8 +250,7 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
     // sync with implementation.
     static void assertDetailMessage(Throwable throwable, int iterationIndex) {
         try {
-            assertTrue(throwable instanceof IOException,
-                    "Expected IOException, got, " + throwable);
+            assertInstanceOf(IOException.class, throwable, "Expected IOException, got, " + throwable);
             assertNotNull(throwable.getMessage(), "No message for " + throwable);
             assertTrue(throwable.getMessage().contains("malformed response"),
                     "Expected \"malformed response\" in: " + throwable.getMessage());
@@ -269,8 +272,8 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         System.out.println("creating servers");
         http3TestServer =  HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext);
         http3TestServer.addHandler(new BadHeadersHandler(), "/http3/echo");
@@ -285,8 +288,8 @@ public class H3BadHeadersTest implements HttpServerAdapters  {
         System.out.println("server started");
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("\n\n**** stopping servers\n");
         System.out.println("stopping servers");
         http3TestServer.stop();
diff --git a/test/jdk/java/net/httpclient/http3/H3BasicTest.java b/test/jdk/java/net/httpclient/http3/H3BasicTest.java
index 79002d98995..bddb9879ae9 100644
--- a/test/jdk/java/net/httpclient/http3/H3BasicTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors
  *                     -Djdk.internal.httpclient.debug=true
  *                     H3BasicTest
  */
@@ -57,12 +57,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import jdk.httpclient.test.lib.http2.Http2TestExchange;
-import jdk.httpclient.test.lib.http2.Http2EchoHandler;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
@@ -72,6 +69,8 @@ import static jdk.test.lib.Asserts.assertFileContentsEqual;
 import static jdk.test.lib.Utils.createTempFile;
 import static jdk.test.lib.Utils.createTempFileOfSize;
 
+import org.junit.jupiter.api.Test;
+
 public class H3BasicTest implements HttpServerAdapters {
 
     private static final Random RANDOM = RandomFactory.getRandom();
@@ -79,8 +78,8 @@ public class H3BasicTest implements HttpServerAdapters {
     private static final String CLASS_NAME = H3BasicTest.class.getSimpleName();
 
     static int http3Port, https2Port;
-    static Http3TestServer http3OnlyServer;
-    static Http2TestServer https2AltSvcServer;
+    static HttpTestServer http3OnlyServer;
+    static HttpTestServer https2AltSvcServer;
     static HttpClient client = null;
     static ExecutorService clientExec;
     static ExecutorService serverExec;
@@ -92,20 +91,21 @@ public class H3BasicTest implements HttpServerAdapters {
             client = getClient();
 
             // server that only supports HTTP/3
-            http3OnlyServer = new Http3TestServer(sslContext, serverExec);
-            http3OnlyServer.addHandler("/", new Http2EchoHandler());
-            http3OnlyServer.addHandler("/ping", new EchoWithPingHandler());
+            http3OnlyServer = HttpTestServer.of(new Http3TestServer(sslContext, serverExec));
+            http3OnlyServer.createContext("/", new HttpTestFileEchoHandler());
+            http3OnlyServer.createContext("/ping", new EchoWithPingHandler());
             http3Port = http3OnlyServer.getAddress().getPort();
             System.out.println("HTTP/3 server started at localhost:" + http3Port);
 
             // server that supports both HTTP/2 and HTTP/3, with HTTP/3 on an altSvc port.
-            https2AltSvcServer = new Http2TestServer(true, 0, serverExec, sslContext);
+            Http2TestServer http2ServerImpl = new Http2TestServer(true, 0, serverExec, sslContext);
             if (RANDOM.nextBoolean()) {
-                https2AltSvcServer.enableH3AltServiceOnEphemeralPort();
+                http2ServerImpl.enableH3AltServiceOnEphemeralPort();
             } else {
-                https2AltSvcServer.enableH3AltServiceOnSamePort();
+                http2ServerImpl.enableH3AltServiceOnSamePort();
             }
-            https2AltSvcServer.addHandler(new Http2EchoHandler(), "/");
+            https2AltSvcServer = HttpTestServer.of(http2ServerImpl);
+            https2AltSvcServer.addHandler(new HttpTestFileEchoHandler(), "/");
             https2Port = https2AltSvcServer.getAddress().getPort();
             if (https2AltSvcServer.supportsH3DirectConnection()) {
                 System.out.println("HTTP/2 server (same HTTP/3 origin) started at localhost:" + https2Port);
@@ -113,9 +113,9 @@ public class H3BasicTest implements HttpServerAdapters {
                 System.out.println("HTTP/2 server (different HTTP/3 origin) started at localhost:" + https2Port);
             }
 
-            http3URIString = "https://localhost:" + http3Port + "/foo/";
-            pingURIString = "https://localhost:" + http3Port + "/ping/";
-            https2URIString = "https://localhost:" + https2Port + "/bar/";
+            http3URIString = "https://" + http3OnlyServer.serverAuthority() + "/foo/";
+            pingURIString = "https://" + http3OnlyServer.serverAuthority() + "/ping/";
+            https2URIString = "https://" + https2AltSvcServer.serverAuthority() + "/bar/";
 
             http3OnlyServer.start();
             https2AltSvcServer.start();
@@ -131,11 +131,11 @@ public class H3BasicTest implements HttpServerAdapters {
 
     static CompletableFuture<Long> currentCF;
 
-    static class EchoWithPingHandler extends Http2EchoHandler {
+    static class EchoWithPingHandler extends HttpTestFileEchoHandler {
         private final Object lock = new Object();
 
         @Override
-        public void handle(Http2TestExchange exchange) throws IOException {
+        public void handle(HttpTestExchange exchange) throws IOException {
             // for now only one ping active at a time. don't want to saturate
             System.out.println("PING handler invoked for " + exchange.getRequestURI());
             synchronized(lock) {
@@ -152,7 +152,7 @@ public class H3BasicTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void test() throws Exception {
+    public void test() throws Exception {
         try {
             initialize();
             System.out.println("servers initialized");
@@ -292,16 +292,16 @@ public class H3BasicTest implements HttpServerAdapters {
     }
 
     static void paramsTest() throws Exception {
-        URI u = new URI("https://localhost:"+https2Port+"/foo");
+        URI u = new URI("https://" + https2AltSvcServer.serverAuthority() + "/foo");
         System.out.println("paramsTest: Request to " + u);
-        https2AltSvcServer.addHandler((t -> {
+        https2AltSvcServer.addHandler(((HttpTestExchange t) -> {
             SSLSession s = t.getSSLSession();
             String prot = s.getProtocol();
             if (prot.equals("TLSv1.3")) {
-                t.sendResponseHeaders(200, -1);
+                t.sendResponseHeaders(200, HttpTestExchange.RSPBODY_EMPTY);
             } else {
                 System.err.printf("Protocols =%s\n", prot);
-                t.sendResponseHeaders(500, -1);
+                t.sendResponseHeaders(500, HttpTestExchange.RSPBODY_EMPTY);
             }
         }), "/");
         HttpClient client = getClient();
diff --git a/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java b/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java
index 0cdb2f900fd..4392f829258 100644
--- a/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java
+++ b/test/jdk/java/net/httpclient/http3/H3ConcurrentPush.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace
  *      -Djdk.httpclient.http3.maxConcurrentPushStreams=45
@@ -73,17 +73,18 @@ import java.util.function.Supplier;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.common.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class H3ConcurrentPush implements HttpServerAdapters {
 
@@ -92,7 +93,7 @@ public class H3ConcurrentPush implements HttpServerAdapters {
     static final PrintStream err = System.err;
     static final PrintStream out = System.out;
 
-    static Map<String,String> PUSH_PROMISES = Map.of(
+    static final Map<String,String> PUSH_PROMISES = Map.of(
             "/x/y/z/1", "the first push promise body",
             "/x/y/z/2", "the second push promise body",
             "/x/y/z/3", "the third push promise body",
@@ -105,13 +106,13 @@ public class H3ConcurrentPush implements HttpServerAdapters {
     );
     static final String MAIN_RESPONSE_BODY = "the main response body";
 
-    HttpTestServer  server;
-    URI uri;
-    URI headURI;
-    ServerPushHandler pushHandler;
+    private static HttpTestServer server;
+    private static URI uri;
+    private static URI headURI;
+    private static ServerPushHandler pushHandler;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY, PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
@@ -122,14 +123,14 @@ public class H3ConcurrentPush implements HttpServerAdapters {
         headURI = new URI("https://" + server.serverAuthority() + "/head/x");
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         server.stop();
     }
 
     static <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response) {
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), Version.HTTP_3);
+        assertEquals(200, response.statusCode());
+        assertEquals(Version.HTTP_3, response.version());
         return response;
     }
 
@@ -137,8 +138,8 @@ public class H3ConcurrentPush implements HttpServerAdapters {
         HttpRequest headRequest = HttpRequest.newBuilder(headURI)
                 .HEAD().version(Version.HTTP_2).build();
         var headResponse = client.send(headRequest, BodyHandlers.ofString());
-        assertEquals(headResponse.statusCode(), 200);
-        assertEquals(headResponse.version(), Version.HTTP_2);
+        assertEquals(200, headResponse.statusCode());
+        assertEquals(Version.HTTP_2, headResponse.version());
     }
 
     static final class TestPushPromiseHandler<T> implements PushPromiseHandler<T> {
@@ -233,16 +234,16 @@ public class H3ConcurrentPush implements HttpServerAdapters {
 
                 promises.forEach((request, value) -> {
                     HttpResponse<String> response = value.join();
-                    assertEquals(response.statusCode(), 200);
+                    assertEquals(200, response.statusCode());
                     if (PUSH_PROMISES.containsKey(request.uri().getPath())) {
-                        assertEquals(response.body(), PUSH_PROMISES.get(request.uri().getPath()));
+                        assertEquals(PUSH_PROMISES.get(request.uri().getPath()), response.body());
                     } else {
-                        assertEquals(response.body(), MAIN_RESPONSE_BODY);
+                        assertEquals(MAIN_RESPONSE_BODY, response.body());
                     }
                 });
 
                 int expectedPushes = Math.min(PUSH_PROMISES.size(), maxPushes) + 5;
-                assertEquals(promises.size(), expectedPushes);
+                assertEquals(expectedPushes, promises.size());
 
                 promises.clear();
 
@@ -251,12 +252,12 @@ public class H3ConcurrentPush implements HttpServerAdapters {
                     client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandlers.ofString())
                             .thenApply(H3ConcurrentPush::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                 } catch (CompletionException c) {
                     throw new AssertionError(c.getCause());
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // Send with no promise handler, but use pushId bigger than allowed.
                 // This should cause the connection to get closed
@@ -268,7 +269,7 @@ public class H3ConcurrentPush implements HttpServerAdapters {
                     client.sendAsync(bigger, BodyHandlers.ofString())
                             .thenApply(H3ConcurrentPush::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                     throw new AssertionError("Expected IOException not thrown");
                 } catch (CompletionException c) {
@@ -287,7 +288,7 @@ public class H3ConcurrentPush implements HttpServerAdapters {
                         throw new AssertionError("Unexpected exception: " + c.getCause(), c.getCause());
                     }
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // the next time around we should have a new connection,
                 // so we can restart from scratch
@@ -298,7 +299,7 @@ public class H3ConcurrentPush implements HttpServerAdapters {
             var error = errors.stream().findFirst().orElse(null);
             if (error != null) throw error;
             var notified = custom.notified;
-            assertEquals(notified.size(), 9*4*2, "Unexpected notification: " + notified);
+            assertEquals(9*4*2, notified.size(), "Unexpected notification: " + notified);
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java b/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java
index 0449db3e961..614d564005b 100644
--- a/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3ConnectionPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:hs
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:hs
  *                     -Djdk.internal.httpclient.debug=false
  *                     H3ConnectionPoolTest
  */
@@ -40,7 +40,6 @@ import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -51,12 +50,9 @@ import java.util.function.Supplier;
 import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
-import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import jdk.httpclient.test.lib.http2.Http2EchoHandler;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
@@ -68,22 +64,24 @@ import static jdk.test.lib.Asserts.assertEquals;
 import static jdk.test.lib.Asserts.assertNotEquals;
 import static jdk.test.lib.Asserts.assertTrue;
 
+import org.junit.jupiter.api.Test;
+
 public class H3ConnectionPoolTest implements HttpServerAdapters {
 
     private static final String CLASS_NAME = H3ConnectionPoolTest.class.getSimpleName();
 
     static int altsvcPort, https2Port, http3Port;
-    static Http3TestServer http3OnlyServer;
-    static Http2TestServer https2AltSvcServer;
+    static HttpTestServer http3OnlyServer;
+    static HttpTestServer https2AltSvcServer;
     static volatile HttpClient client = null;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     static volatile String http3OnlyURIString, https2URIString, http3AltSvcURIString, http3DirectURIString;
 
     static void initialize(boolean samePort) throws Exception {
-        initialize(samePort, Http2EchoHandler::new);
+        initialize(samePort, HttpTestFileEchoHandler::new);
     }
 
-    static void initialize(boolean samePort, Supplier<Http2Handler> handlers) throws Exception {
+    static void initialize(boolean samePort, Supplier<HttpTestHandler> handlers) throws Exception {
         System.out.println("\nConfiguring for advertised AltSvc on "
                 + (samePort ? "same port" : "ephemeral port"));
         try {
@@ -91,16 +89,17 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
             client = getClient();
 
             // server that supports both HTTP/2 and HTTP/3, with HTTP/3 on an altSvc port.
-            https2AltSvcServer = new Http2TestServer(true, sslContext);
+            Http2TestServer serverImpl = new Http2TestServer(true, sslContext);
             if (samePort) {
                 System.out.println("Attempting to enable advertised HTTP/3 service on same port");
-                https2AltSvcServer.enableH3AltServiceOnSamePort();
+                serverImpl.enableH3AltServiceOnSamePort();
                 System.out.println("Advertised AltSvc on same port " +
-                        (https2AltSvcServer.supportsH3DirectConnection() ? "enabled" : " not enabled"));
+                        (serverImpl.supportsH3DirectConnection() ? "enabled" : " not enabled"));
             } else {
                 System.out.println("Attempting to enable advertised HTTP/3 service on different port");
-                https2AltSvcServer.enableH3AltServiceOnEphemeralPort();
+                serverImpl.enableH3AltServiceOnEphemeralPort();
             }
+            https2AltSvcServer = HttpTestServer.of(serverImpl);
             https2AltSvcServer.addHandler(handlers.get(), "/" + CLASS_NAME + "/https2/");
             https2AltSvcServer.addHandler(handlers.get(), "/" + CLASS_NAME + "/h2h3/");
             https2Port = https2AltSvcServer.getAddress().getPort();
@@ -113,18 +112,20 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
             //   one advertised (the alt service endpoint og the HTTP/2 server)
             //   one non advertised (the direct endpoint, at the same authority as HTTP/2, but which
             //   is in fact our http3OnlyServer)
+            Http3TestServer http3ServerImpl;
             try {
-                http3OnlyServer = new Http3TestServer(sslContext, samePort ? 0 : https2Port);
+                http3ServerImpl = new Http3TestServer(sslContext, samePort ? 0 : https2Port);
                 System.out.println("Unadvertised service enabled on "
                         + (samePort ? "ephemeral port" : "same port"));
             } catch (IOException ex) {
                 System.out.println("Can't create HTTP/3 server on same port: " + ex);
-                http3OnlyServer = new Http3TestServer(sslContext, 0);
+                http3ServerImpl = new Http3TestServer(sslContext, 0);
             }
-            http3OnlyServer.addHandler("/" + CLASS_NAME + "/http3/", handlers.get());
-            http3OnlyServer.addHandler("/" + CLASS_NAME + "/h2h3/", handlers.get());
+            http3OnlyServer = HttpTestServer.of(http3ServerImpl);
+            http3OnlyServer.createContext("/" + CLASS_NAME + "/http3/", handlers.get());
+            http3OnlyServer.createContext("/" + CLASS_NAME + "/h2h3/", handlers.get());
             http3OnlyServer.start();
-            http3Port = http3OnlyServer.getQuicServer().getAddress().getPort();
+            http3Port = http3ServerImpl.getQuicServer().getAddress().getPort();
 
             if (http3Port == https2Port) {
                 System.out.println("HTTP/3 server enabled on same port than HTTP/2 server");
@@ -172,7 +173,7 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void testH3Only() throws Exception {
+    public void testH3Only() throws Exception {
         System.out.println("\nTesting HTTP/3 only");
         initialize(true);
         try (HttpClient client = getClient()) {
@@ -212,12 +213,12 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void testH2H3WithTwoAltSVC() throws Exception {
+    public void testH2H3WithTwoAltSVC() throws Exception {
         testH2H3(false);
     }
 
     @Test
-    public static void testH2H3WithAltSVCOnSamePort() throws Exception {
+    public void testH2H3WithAltSVCOnSamePort() throws Exception {
         testH2H3(true);
     }
 
@@ -309,7 +310,7 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
                 // fourth request with HTTP_3_URI_ONLY should reuse the first connection,
                 // and not reuse the second.
                 HttpRequest request4 = req1Builder.copy().build();
-                HttpResponse<String> response4 = client.send(request1, BodyHandlers.ofString());
+                HttpResponse<String> response4 = client.send(request4, BodyHandlers.ofString());
                 assertEquals(HTTP_3, response4.version());
                 assertEquals(response4.connectionLabel().get(), response1.connectionLabel().get());
                 assertNotEquals(response4.connectionLabel().get(), response3.connectionLabel().get());
@@ -345,12 +346,12 @@ public class H3ConnectionPoolTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void testParallelH2H3WithTwoAltSVC() throws Exception {
+    public void testParallelH2H3WithTwoAltSVC() throws Exception {
         testH2H3Concurrent(false);
     }
 
     @Test
-    public static void testParallelH2H3WithAltSVCOnSamePort() throws Exception {
+    public void testParallelH2H3WithAltSVCOnSamePort() throws Exception {
         testH2H3Concurrent(true);
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java b/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java
index 9f509b5440a..8a83b51a174 100644
--- a/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3DataLimitsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,6 @@
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.ITestContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -44,18 +36,29 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpRequest.Builder;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 
 /*
@@ -64,7 +67,7 @@ import static org.testng.Assert.assertEquals;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.quic.QuicStandaloneServer
- * @run testng/othervm/timeout=480 -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm/timeout=480 -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     -Djavax.net.debug=all
  *                     H3DataLimitsTest
@@ -73,8 +76,8 @@ import static org.testng.Assert.assertEquals;
 public class H3DataLimitsTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer h3TestServer;
-    String h3URI;
+    private static HttpTestServer h3TestServer;
+    private static String h3URI;
 
     static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
     static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
@@ -114,20 +117,37 @@ public class H3DataLimitsTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            var x = new SkipException("Skipping: some test failed");
-            x.setStackTrace(new StackTraceElement[0]);
-            throw x;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
         }
     }
 
-    @AfterClass
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
     static void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -148,13 +168,8 @@ public class H3DataLimitsTest implements HttpServerAdapters {
         }
     }
 
-    @DataProvider(name = "h3URIs")
-    public Object[][] versions(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
-        Object[][] result = {{h3URI}};
-        return result;
+    public static Object[][] versions() {
+        return new Object[][] {{h3URI}};
     }
 
     private HttpClient makeNewClient() {
@@ -168,7 +183,8 @@ public class H3DataLimitsTest implements HttpServerAdapters {
         return client;
     }
 
-    @Test(dataProvider = "h3URIs")
+    @ParameterizedTest
+    @MethodSource("versions")
     public void testHugeResponse(final String h3URI) throws Exception {
         HttpClient client = makeNewClient();
         URI uri = URI.create(h3URI + "?16000000");
@@ -180,17 +196,18 @@ public class H3DataLimitsTest implements HttpServerAdapters {
         HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
         out.println("Response #1: " + response);
         out.println("Version  #1: " + response.version());
-        assertEquals(response.statusCode(), 200, "first response status");
-        assertEquals(response.version(), HTTP_3, "first response version");
+        assertEquals(200, response.statusCode(), "first response status");
+        assertEquals(HTTP_3, response.version(), "first response version");
 
         response = client.send(request, BodyHandlers.ofString());
         out.println("Response #2: " + response);
         out.println("Version  #2: " + response.version());
-        assertEquals(response.statusCode(), 200, "second response status");
-        assertEquals(response.version(), HTTP_3, "second response version");
+        assertEquals(200, response.statusCode(), "second response status");
+        assertEquals(HTTP_3, response.version(), "second response version");
     }
 
-    @Test(dataProvider = "h3URIs")
+    @ParameterizedTest
+    @MethodSource("versions")
     public void testManySmallResponses(final String h3URI) throws Exception {
         HttpClient client = makeNewClient();
         URI uri = URI.create(h3URI + "?160000");
@@ -203,13 +220,13 @@ public class H3DataLimitsTest implements HttpServerAdapters {
             HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
             out.println("Response #" + i + ": " + response);
             out.println("Version  #" + i + ": " + response.version());
-            assertEquals(response.statusCode(), 200, "response status");
-            assertEquals(response.version(), HTTP_3, "response version");
+            assertEquals(200, response.statusCode(), "response status");
+            assertEquals(HTTP_3, response.version(), "response version");
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         // An HTTP/3 server that only supports HTTP/3
         h3TestServer = HttpTestServer.of(new Http3TestServer(sslContext));
         final HttpTestHandler h3Handler = new Handler();
@@ -220,8 +237,8 @@ public class H3DataLimitsTest implements HttpServerAdapters {
         h3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("=======================================================");
         System.err.println("               Tearing down test");
         System.err.println("=======================================================");
diff --git a/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java
index c513cd092c7..fd0e8214361 100644
--- a/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3FixedThreadPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,17 @@
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
  * @compile ../ReferenceTracker.java
- * @run testng/othervm  -Djdk.internal.httpclient.debug=err
+ *
+ * @comment This test failed on Tier 7, but the failure could not be reproduced.
+ *          The QUIC idle timeout has been increased to a value higher than the
+ *          JTreg on Tier 7 so that, if the client becomes wedged again, the
+ *          JTreg timeout handlers can collect more diagnostic information.
+ *
+ * @run junit/othervm  -Djdk.internal.httpclient.debug=err
  *                      -Djdk.httpclient.HttpClient.log=ssl,headers,requests,responses,errors
- *                       H3FixedThreadPoolTest
+ *                      -Djdk.httpclient.quic.idleTimeout=666666
+ *                      -Djdk.test.server.quic.idleTimeout=666666
+ *                      ${test.main.class}
  */
 
 import java.net.URI;
@@ -61,7 +69,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 import static jdk.test.lib.Asserts.assertFileContentsEqual;
 import static jdk.test.lib.Utils.createTempFileOfSize;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 public class H3FixedThreadPoolTest implements HttpServerAdapters {
 
@@ -110,7 +118,7 @@ public class H3FixedThreadPoolTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void test() throws Exception {
+    public void test() throws Exception {
         try {
             initialize();
             simpleTest(false);
diff --git a/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java b/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java
index b48ef9a33f3..d5864989436 100644
--- a/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3HeaderSizeLimitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.net.http.HttpClient.Version;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 
 import javax.net.ssl.SSLContext;
@@ -39,16 +38,16 @@ import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.httpclient.test.lib.quic.QuicServer;
 import jdk.internal.net.http.Http3ConnectionAccess;
 import jdk.internal.net.http.http3.ConnectionSettings;
-import jdk.test.lib.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @summary Verifies that the HTTP client respects the SETTINGS_MAX_FIELD_SECTION_SIZE setting on HTTP3 connection
@@ -57,7 +56,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @build java.net.http/jdk.internal.net.http.Http3ConnectionAccess
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.internal.httpclient.debug=true
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors H3HeaderSizeLimitTest
  */
@@ -65,11 +64,11 @@ public class H3HeaderSizeLimitTest implements HttpServerAdapters {
 
     private static final long HEADER_SIZE_LIMIT_BYTES = 1024;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer h3Server;
-    private String requestURIBase;
+    private static HttpTestServer h3Server;
+    private static String requestURIBase;
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         final QuicServer quicServer = Http3TestServer.quicServerBuilder()
                 .sslContext(sslContext)
                 .build();
@@ -82,8 +81,8 @@ public class H3HeaderSizeLimitTest implements HttpServerAdapters {
                 .port(h3Server.getAddress().getPort()).build().toString();
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (h3Server != null) {
             System.out.println("Stopping server " + h3Server.getAddress());
             h3Server.stop();
@@ -111,7 +110,7 @@ public class H3HeaderSizeLimitTest implements HttpServerAdapters {
             final HttpResponse<Void> response = client.send(
                     reqBuilder.build(),
                     BodyHandlers.discarding());
-            Assert.assertEquals(response.statusCode(), 200, "Unexpected status code");
+            Assertions.assertEquals(200, response.statusCode(), "Unexpected status code");
             if (i == 3) {
                 var cf = Http3ConnectionAccess.peerSettings(client, response);
                 if (!cf.isDone()) {
@@ -131,14 +130,14 @@ public class H3HeaderSizeLimitTest implements HttpServerAdapters {
         }
         final HttpRequest request = reqBuilder.build();
         System.out.println("Issuing request to " + reqURI);
-        final IOException thrown = Assert.expectThrows(ProtocolException.class,
+        final IOException thrown = Assertions.assertThrows(ProtocolException.class,
                 () -> client.send(request, BodyHandlers.discarding()));
         if (!thrown.getMessage().equals("Request headers size exceeds limit set by peer")) {
             throw thrown;
         }
         // test same with async
         System.out.println("Issuing async request to " + reqURI);
-        final ExecutionException asyncThrown = Assert.expectThrows(ExecutionException.class,
+        final ExecutionException asyncThrown = Assertions.assertThrows(ExecutionException.class,
                 () -> client.sendAsync(request, BodyHandlers.discarding()).get());
         if (!(asyncThrown.getCause() instanceof ProtocolException)) {
             System.err.println("Received unexpected cause");
diff --git a/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java b/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java
index 44ccfac4a6a..6b7b24f049d 100644
--- a/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java
+++ b/test/jdk/java/net/httpclient/http3/H3HeadersEncoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.net.SimpleSSLContext
  * @compile ../ReferenceTracker.java
- * @run testng/othervm -Djdk.httpclient.qpack.encoderTableCapacityLimit=4096
+ * @run junit/othervm -Djdk.httpclient.qpack.encoderTableCapacityLimit=4096
  *                     -Djdk.httpclient.qpack.decoderMaxTableCapacity=4096
  *                     -Dhttp3.test.server.encoderAllowedHeaders=*
  *                     -Dhttp3.test.server.decoderMaxTableCapacity=4096
@@ -40,9 +40,6 @@
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -72,17 +69,21 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static jdk.httpclient.test.lib.common.HttpServerAdapters.*;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 public class H3HeadersEncoding {
 
     private static final int REQUESTS_COUNT = 500;
     private static final int HEADERS_PER_REQUEST = 20;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer http3TestServer;
-    HeadersHandler serverHeadersHandler;
-    String http3URI;
+    private static HttpTestServer http3TestServer;
+    private static HeadersHandler serverHeadersHandler;
+    private static String http3URI;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         System.out.println("Creating servers");
         http3TestServer = HttpTestServer.create(Http3DiscoveryMode.HTTP_3_URI_ONLY, sslContext);
         serverHeadersHandler = new HeadersHandler();
@@ -92,8 +93,8 @@ public class H3HeadersEncoding {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void tearDown() {
+    @AfterAll
+    public static void tearDown() {
         http3TestServer.stop();
     }
 
@@ -272,7 +273,7 @@ public class H3HeadersEncoding {
     }
 
 
-    private class HeadersHandler implements HttpTestHandler {
+    private static class HeadersHandler implements HttpTestHandler {
         @Override
         public void handle(HttpTestExchange t) throws IOException {
 
diff --git a/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java b/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
index 1028eefe828..8f39ea7b850 100644
--- a/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
+++ b/test/jdk/java/net/httpclient/http3/H3IdleExceedsQuicIdleTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestExchange;
 import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestHandler;
 import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
@@ -63,6 +64,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  *          systems
  * @run junit/othervm/timeout=180 -Djdk.httpclient.quic.idleTimeout=30
  *                    -Djdk.httpclient.keepalive.timeout.h3=120
+ *                    -Djdk.httpclient.HttpClient.log=quic:hs
  *                    ${test.main.class}
  */
 class H3IdleExceedsQuicIdleTimeout {
@@ -106,7 +108,7 @@ class H3IdleExceedsQuicIdleTimeout {
         assertEquals(120,
                 Integer.parseInt(System.getProperty("jdk.httpclient.keepalive.timeout.h3")),
                 "unexpected HTTP/3 idle timeout");
-        try (final HttpClient client = HttpClient.newBuilder()
+        try (final HttpClient client = HttpServerAdapters.createClientBuilderForH3()
                 .sslContext(sslCtx)
                 .proxy(NO_PROXY)
                 .version(HTTP_3)
diff --git a/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java b/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java
index 130ccd40cd6..570f84ad620 100644
--- a/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java
+++ b/test/jdk/java/net/httpclient/http3/H3ImplicitPushCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace
  *      H3ImplicitPushCancel
@@ -56,17 +56,18 @@ import java.util.concurrent.ConcurrentMap;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.common.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class H3ImplicitPushCancel implements HttpServerAdapters {
 
-    static Map<String,String> PUSH_PROMISES = Map.of(
+    static final Map<String,String> PUSH_PROMISES = Map.of(
             "/x/y/z/1", "the first push promise body",
             "/x/y/z/2", "the second push promise body",
             "/x/y/z/3", "the third push promise body",
@@ -79,12 +80,12 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
     );
     static final String MAIN_RESPONSE_BODY = "the main response body";
 
-    HttpTestServer  server;
-    URI uri;
-    URI headURI;
+    private static HttpTestServer server;
+    private static URI uri;
+    private static URI headURI;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         HttpTestHandler pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY,
                                                      PUSH_PROMISES);
@@ -96,14 +97,14 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
         headURI = new URI("https://" + server.serverAuthority() + "/head/x");
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         server.stop();
     }
 
     static <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response) {
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), Version.HTTP_3);
+        assertEquals(200, response.statusCode());
+        assertEquals(Version.HTTP_3, response.version());
         return response;
     }
 
@@ -111,8 +112,8 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
         HttpRequest headRequest = HttpRequest.newBuilder(headURI)
                 .HEAD().version(Version.HTTP_2).build();
         var headResponse = client.send(headRequest, BodyHandlers.ofString());
-        assertEquals(headResponse.statusCode(), 200);
-        assertEquals(headResponse.version(), Version.HTTP_2);
+        assertEquals(200, headResponse.statusCode());
+        assertEquals(Version.HTTP_2, headResponse.version());
     }
 
     /*
@@ -136,7 +137,7 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
                                 .build(), BodyHandlers.ofString())
                         .thenApply(H3ImplicitPushCancel::assert200ResponseCode)
                         .thenApply(HttpResponse::body)
-                        .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                        .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                         .join();
                 System.out.println("Got result before error was raised");
                 throw new AssertionError("should have failed");
@@ -171,14 +172,14 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
             promises.putIfAbsent(main.request(), CompletableFuture.completedFuture(main));
             promises.forEach((request, value) -> {
                 HttpResponse<String> response = value.join();
-                assertEquals(response.statusCode(), 200);
+                assertEquals(200, response.statusCode());
                 if (PUSH_PROMISES.containsKey(request.uri().getPath())) {
-                    assertEquals(response.body(), PUSH_PROMISES.get(request.uri().getPath()));
+                    assertEquals(PUSH_PROMISES.get(request.uri().getPath()), response.body());
                 } else {
-                    assertEquals(response.body(), MAIN_RESPONSE_BODY);
+                    assertEquals(MAIN_RESPONSE_BODY, response.body());
                 }
             });
-            assertEquals(promises.size(), PUSH_PROMISES.size() + 1);
+            assertEquals(PUSH_PROMISES.size() + 1, promises.size());
 
             promises.clear();
 
@@ -187,13 +188,13 @@ public class H3ImplicitPushCancel implements HttpServerAdapters {
                 client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandlers.ofString())
                         .thenApply(H3ImplicitPushCancel::assert200ResponseCode)
                         .thenApply(HttpResponse::body)
-                        .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                        .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                         .join();
             } catch (CompletionException c) {
                 throw new AssertionError(c.getCause());
             }
 
-            assertEquals(promises.size(), 0);
+            assertEquals(0, promises.size());
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java b/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java
index ff38cd4fa98..6eabc23677a 100644
--- a/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3InsertionsLimitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,8 @@ import jdk.httpclient.test.lib.quic.QuicServer;
 import jdk.internal.net.http.http3.ConnectionSettings;
 import jdk.internal.net.http.qpack.Encoder;
 import jdk.internal.net.http.qpack.TableEntry;
-import jdk.test.lib.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -44,12 +39,16 @@ import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
-import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @summary Verifies that the HTTP client respects the maxLiteralWithIndexing
@@ -59,7 +58,7 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @build java.net.http/jdk.internal.net.http.Http3ConnectionAccess
- * @run testng/othervm -Djdk.httpclient.qpack.encoderTableCapacityLimit=4096
+ * @run junit/othervm -Djdk.httpclient.qpack.encoderTableCapacityLimit=4096
  *                     -Djdk.internal.httpclient.qpack.allowBlockingEncoding=true
  *                     -Djdk.httpclient.qpack.decoderMaxTableCapacity=4096
  *                     -Djdk.httpclient.qpack.decoderBlockedStreams=1024
@@ -75,8 +74,8 @@ public class H3InsertionsLimitTest implements HttpServerAdapters {
     private static final long HEADER_SIZE_LIMIT_BYTES = 8192;
     private static final long MAX_SERVER_DT_CAPACITY = 4096;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer h3Server;
-    private String requestURIBase;
+    private static HttpTestServer h3Server;
+    private static String requestURIBase;
     public static final long MAX_LITERALS_WITH_INDEXING = 32L;
     private static final CountDownLatch WAIT_FOR_FAILURE = new CountDownLatch(1);
 
@@ -120,8 +119,8 @@ public class H3InsertionsLimitTest implements HttpServerAdapters {
         exchange.sendResponseHeaders(200, 0);
     }
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         final QuicServer quicServer = Http3TestServer.quicServerBuilder()
                 .bindAddress(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0))
                 .sslContext(sslContext)
@@ -138,8 +137,8 @@ public class H3InsertionsLimitTest implements HttpServerAdapters {
                 .port(h3Server.getAddress().getPort()).build().toString();
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (h3Server != null) {
             System.out.println("Stopping server " + h3Server.getAddress());
             h3Server.stop();
@@ -161,10 +160,10 @@ public class H3InsertionsLimitTest implements HttpServerAdapters {
         System.out.println("Issuing request to " + reqURI);
         try {
             client.send(request, BodyHandlers.discarding());
-            Assert.fail("IOException expected");
+            Assertions.fail("IOException expected");
         } catch (IOException ioe) {
             System.out.println("Got IOException: " + ioe);
-            Assert.assertTrue(ioe.getMessage()
+            Assertions.assertTrue(ioe.getMessage()
                                  .contains("Too many literal with indexing"));
         } finally {
             WAIT_FOR_FAILURE.countDown();
diff --git a/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java b/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
index f7a258c069c..85a4b6113f0 100644
--- a/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
+++ b/test/jdk/java/net/httpclient/http3/H3LogHandshakeErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,8 @@
 import java.io.IOException;
 import java.net.BindException;
 import java.net.ServerSocket;
-import java.net.Socket;
 import java.net.URI;
 import java.net.http.HttpClient;
-import java.net.http.HttpOption;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
@@ -44,16 +42,16 @@ import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.quic.QuicConnectionImpl;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -63,7 +61,7 @@ import static org.testng.Assert.*;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.httpclient.HttpClient.log=errors
  *              H3LogHandshakeErrors
  */
@@ -71,14 +69,14 @@ import static org.testng.Assert.*;
 public class H3LogHandshakeErrors implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer h3Server;
-    private ServerSocket tcpServerSocket = null;
-    private Thread tcpServerThread = null;
-    private String requestURI;
+    private static HttpTestServer h3Server;
+    private static ServerSocket tcpServerSocket = null;
+    private static Thread tcpServerThread = null;
+    private static String requestURI;
     private static Logger clientLogger;
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         // create an H3 only server
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
@@ -113,8 +111,8 @@ public class H3LogHandshakeErrors implements HttpServerAdapters {
         }
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (h3Server != null) {
             System.out.println("Stopping server " + h3Server.getAddress());
             h3Server.stop();
diff --git a/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java b/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java
index 27eec672bcd..a93c6a37594 100644
--- a/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3MaxInitialTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,25 +39,29 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.ITestContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 
 /*
@@ -68,15 +72,15 @@ import static org.testng.Assert.assertEquals;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.quic.QuicStandaloneServer
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors,quic:controls
  *                     -Djdk.httpclient.quic.maxInitialTimeout=1
  *                     H3MaxInitialTimeoutTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors,quic:controls
  *                     -Djdk.httpclient.quic.maxInitialTimeout=2
  *                     H3MaxInitialTimeoutTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors,quic:controls
  *                     -Djdk.httpclient.quic.maxInitialTimeout=2147483647
  *                     H3MaxInitialTimeoutTest
@@ -84,8 +88,8 @@ import static org.testng.Assert.assertEquals;
 public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    DatagramChannel receiver;
-    String h3URI;
+    static DatagramChannel receiver;
+    static String h3URI;
 
     static final Executor executor = new TestExecutor(Executors.newVirtualThreadPerTaskExecutor());
     static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
@@ -125,20 +129,37 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            var x = new SkipException("Skipping: some test failed");
-            x.setStackTrace(new StackTraceElement[0]);
-            throw x;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
         }
     }
 
-    @AfterClass
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
     static void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -159,13 +180,8 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
         }
     }
 
-    @DataProvider(name = "h3URIs")
-    public Object[][] versions(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
-        Object[][] result = {{h3URI}};
-        return result;
+    public static Object[][] versions() {
+        return new Object[][] {{h3URI}};
     }
 
     private HttpClient makeNewClient(long connectionTimeout) {
@@ -180,7 +196,8 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
         return client;
     }
 
-    @Test(dataProvider = "h3URIs")
+    @ParameterizedTest
+    @MethodSource("versions")
     public void testTimeout(final String h3URI) throws Exception {
         long timeout = Long.getLong("jdk.httpclient.quic.maxInitialTimeout", 30);
         long connectionTimeout = timeout == Integer.MAX_VALUE ? 2 : 10 * timeout;
@@ -196,8 +213,8 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
                 HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
                 out.println("Response #1: " + response);
                 out.println("Version  #1: " + response.version());
-                assertEquals(response.statusCode(), 200, "first response status");
-                assertEquals(response.version(), HTTP_3, "first response version");
+                assertEquals(200, response.statusCode(), "first response status");
+                assertEquals(HTTP_3, response.version(), "first response version");
                 throw new AssertionError("Expected ConnectException not thrown");
             } catch (ConnectException c) {
                 String msg = c.getMessage();
@@ -222,8 +239,8 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
     }
 
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         receiver = DatagramChannel.open();
         receiver.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
         h3URI = URIBuilder.newBuilder()
@@ -235,8 +252,8 @@ public class H3MaxInitialTimeoutTest implements HttpServerAdapters {
                 .toString();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("=======================================================");
         System.err.println("               Tearing down test");
         System.err.println("=======================================================");
diff --git a/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java b/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java
index c9474be51c2..2fcb7388f7b 100644
--- a/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3MemoryHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,9 +30,6 @@ import jdk.internal.net.http.quic.streams.QuicBidiStream;
 import jdk.internal.net.quic.QuicVersion;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -52,7 +49,11 @@ import java.util.concurrent.TimeUnit;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -62,7 +63,7 @@ import static org.testng.Assert.*;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @build java.net.http/jdk.internal.net.http.Http3ConnectionAccess
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.internal.httpclient.debug=true
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *              -Djdk.httpclient.quic.maxStreamInitialData=16384
@@ -71,11 +72,11 @@ import static org.testng.Assert.*;
 public class H3MemoryHandlingTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private QuicStandaloneServer server;
-    private String requestURIBase;
+    private static QuicStandaloneServer server;
+    private static String requestURIBase;
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
                 .sslContext(sslContext)
@@ -87,8 +88,8 @@ public class H3MemoryHandlingTest implements HttpServerAdapters {
                 .port(server.getAddress().getPort()).build().toString();
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (server != null) {
             System.out.println("Stopping server " + server.getAddress());
             server.close();
@@ -125,19 +126,16 @@ public class H3MemoryHandlingTest implements HttpServerAdapters {
                 serverAllWritesDone.complete(false);
             }
         });
-        HttpClient client = getHttpClient();
-        try {
+        try (HttpClient client = getHttpClient()) {
             HttpRequest request = getRequest();
             final HttpResponse<InputStream> response1 = client.send(
                     request, BodyHandlers.ofInputStream());
-            assertEquals(response1.statusCode(), 200);
+            assertEquals(200, response1.statusCode());
             assertFalse(errorCF.isDone(), "Expected the connection to be open");
             assertFalse(serverAllWritesDone.isDone());
             response1.body().close();
             final boolean done = serverAllWritesDone.get(10, TimeUnit.SECONDS);
             assertFalse(done, "Too much data was buffered by the client");
-        } finally {
-            client.close();
         }
     }
 
@@ -176,12 +174,12 @@ public class H3MemoryHandlingTest implements HttpServerAdapters {
                 handlerCF.completeExceptionally(e);
             }
         });
-        HttpClient client = getHttpClient();
-        try {
+
+        try (HttpClient client = getHttpClient()) {
             HttpRequest request = getRequest();
             final HttpResponse<InputStream> response1 = client.send(
-                            request, BodyHandlers.ofInputStream());
-            assertEquals(response1.statusCode(), 200);
+                    request, BodyHandlers.ofInputStream());
+            assertEquals(200, response1.statusCode());
             assertFalse(errorCF.isDone(), "Expected the connection to be open");
             assertFalse(handlerCF.isDone());
             assertTrue(writerBlocked.await(10, TimeUnit.SECONDS),
@@ -191,10 +189,8 @@ public class H3MemoryHandlingTest implements HttpServerAdapters {
             try (InputStream body = response1.body()) {
                 receivedResponse = body.readAllBytes();
             }
-            assertEquals(receivedResponse.length, 32768,
+            assertEquals(32768, receivedResponse.length,
                     "Unexpected response length");
-        } finally {
-            client.close();
         }
         assertTrue(handlerCF.get(10, TimeUnit.SECONDS),
                 "Unexpected result");
diff --git a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
index 14149da7815..67ac821b6f7 100644
--- a/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
+++ b/test/jdk/java/net/httpclient/http3/H3MultipleConnectionsToSameHost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.httpclient.quic.minPtoBackoffTime=60
  *                     -Djdk.httpclient.quic.maxPtoBackoffTime=90
  *                     -Djdk.httpclient.quic.maxPtoBackoff=10
@@ -52,7 +52,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.httpclient.quic.minPtoBackoffTime=45
  *                     -Djdk.httpclient.quic.maxPtoBackoffTime=60
  *                     -Djdk.httpclient.quic.maxPtoBackoff=9
@@ -75,7 +75,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.httpclient.quic.idleTimeout=120
  *                     -Djdk.httpclient.keepalive.timeout.h3=120
  *                     -Djdk.test.server.quic.idleTimeout=90
@@ -100,7 +100,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=360 -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.httpclient.quic.idleTimeout=120
  *                     -Djdk.httpclient.keepalive.timeout.h3=120
  *                     -Djdk.test.server.quic.idleTimeout=90
@@ -161,14 +161,15 @@ import javax.net.ssl.SSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.common.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static jdk.internal.net.http.Http3ClientProperties.MAX_STREAM_LIMIT_WAIT_TIMEOUT;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
@@ -223,11 +224,11 @@ public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
     }
 
     public static void main(String[] args) throws Exception {
-        test();
+        new H3MultipleConnectionsToSameHost().test();
     }
 
     @Test
-    public static void test() throws Exception {
+    public void test() throws Exception {
         try {
             long prestart = System.nanoTime();
             initialize();
@@ -244,7 +245,7 @@ public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
                     .GET().build();
             long start = System.nanoTime();
             var resp = client.send(request, BodyHandlers.ofByteArrayConsumer(b-> {}));
-            Assert.assertEquals(resp.statusCode(), 200);
+            Assertions.assertEquals(200, resp.statusCode());
             long elapsed = System.nanoTime() - start;
             System.out.println("First request took: " + elapsed + " nanos (" + TimeUnit.NANOSECONDS.toMillis(elapsed) + " ms)");
             final int max = property("simpleget.requests", 50);
@@ -298,7 +299,7 @@ public class H3MultipleConnectionsToSameHost implements HttpServerAdapters {
 
                 }
             }
-            list.forEach((cf) -> Assert.assertEquals(cf.join().statusCode(), 200));
+            list.forEach((cf) -> Assertions.assertEquals(200, cf.join().statusCode()));
             client.close();
         } catch (Throwable tt) {
             System.err.println("tt caught");
diff --git a/test/jdk/java/net/httpclient/http3/H3PushCancel.java b/test/jdk/java/net/httpclient/http3/H3PushCancel.java
index 324942b67d0..b9e15b7d8e5 100644
--- a/test/jdk/java/net/httpclient/http3/H3PushCancel.java
+++ b/test/jdk/java/net/httpclient/http3/H3PushCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace
  *      -Djdk.httpclient.http3.maxConcurrentPushStreams=5
@@ -69,18 +69,19 @@ import java.util.function.Function;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.common.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class H3PushCancel implements HttpServerAdapters {
 
-    static Map<String,String> PUSH_PROMISES = Map.of(
+    static final Map<String,String> PUSH_PROMISES = Map.of(
             "/x/y/z/1", "the first push promise body",
             "/x/y/z/2", "the second push promise body",
             "/x/y/z/3", "the third push promise body",
@@ -93,13 +94,13 @@ public class H3PushCancel implements HttpServerAdapters {
     );
     static final String MAIN_RESPONSE_BODY = "the main response body";
 
-    HttpTestServer  server;
-    URI uri;
-    URI headURI;
-    ServerPushHandler pushHandler;
+    private static HttpTestServer server;
+    private static URI uri;
+    private static URI headURI;
+    private static ServerPushHandler pushHandler;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY, PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
@@ -110,14 +111,14 @@ public class H3PushCancel implements HttpServerAdapters {
         headURI = new URI("https://" + server.serverAuthority() + "/head/x");
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         server.stop();
     }
 
     static <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response) {
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), Version.HTTP_3);
+        assertEquals(200, response.statusCode());
+        assertEquals(Version.HTTP_3, response.version());
         return response;
     }
 
@@ -125,8 +126,8 @@ public class H3PushCancel implements HttpServerAdapters {
         HttpRequest headRequest = HttpRequest.newBuilder(headURI)
                 .HEAD().version(Version.HTTP_2).build();
         var headResponse = client.send(headRequest, BodyHandlers.ofString());
-        assertEquals(headResponse.statusCode(), 200);
-        assertEquals(headResponse.version(), Version.HTTP_2);
+        assertEquals(200, headResponse.statusCode());
+        assertEquals(Version.HTTP_2, headResponse.version());
     }
 
     @Test
@@ -173,14 +174,14 @@ public class H3PushCancel implements HttpServerAdapters {
                     promises.putIfAbsent(main.request(), CompletableFuture.completedFuture(main));
                     promises.forEach((request, value) -> {
                         HttpResponse<String> response = value.join();
-                        assertEquals(response.statusCode(), 200);
+                        assertEquals(200, response.statusCode());
                         if (PUSH_PROMISES.containsKey(request.uri().getPath())) {
-                            assertEquals(response.body(), PUSH_PROMISES.get(request.uri().getPath()));
+                            assertEquals(PUSH_PROMISES.get(request.uri().getPath()), response.body());
                         } else {
-                            assertEquals(response.body(), MAIN_RESPONSE_BODY);
+                            assertEquals(MAIN_RESPONSE_BODY, response.body());
                         }
                     });
-                    assertEquals(promises.size(), Math.min(PUSH_PROMISES.size(), maxPushes) + 1);
+                    assertEquals(Math.min(PUSH_PROMISES.size(), maxPushes) + 1, promises.size());
 
                     promises.clear();
                 }
@@ -190,12 +191,12 @@ public class H3PushCancel implements HttpServerAdapters {
                     client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandlers.ofString())
                             .thenApply(H3PushCancel::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                 } catch (CompletionException c) {
                     throw new AssertionError(c.getCause());
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // Send with no promise handler, but use pushId bigger than allowed.
                 // This should cause the connection to get closed
@@ -207,7 +208,7 @@ public class H3PushCancel implements HttpServerAdapters {
                     client.sendAsync(bigger, BodyHandlers.ofString())
                             .thenApply(H3PushCancel::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                     throw new AssertionError("Expected IOException not thrown");
                 } catch (CompletionException c) {
@@ -226,7 +227,7 @@ public class H3PushCancel implements HttpServerAdapters {
                         throw new AssertionError("Unexpected exception: " + c.getCause(), c.getCause());
                     }
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // the next time around we should have a new connection
                 // so we can restart from scratch
@@ -315,16 +316,16 @@ public class H3PushCancel implements HttpServerAdapters {
                     promises.putIfAbsent(main.request(), CompletableFuture.completedFuture(main));
                     promises.forEach((request, value) -> {
                         HttpResponse<String> response = value.join();
-                        assertEquals(response.statusCode(), 200);
+                        assertEquals(200, response.statusCode());
                         if (PUSH_PROMISES.containsKey(request.uri().getPath())) {
-                            assertEquals(response.body(), PUSH_PROMISES.get(request.uri().getPath()));
+                            assertEquals(PUSH_PROMISES.get(request.uri().getPath()), response.body());
                         } else {
-                            assertEquals(response.body(), MAIN_RESPONSE_BODY);
+                            assertEquals(MAIN_RESPONSE_BODY, response.body());
                         }
                     });
                     int expectedPushes = Math.min(PUSH_PROMISES.size(), maxPushes) + 1;
                     if (i == 0) expectedPushes--; // pushId == 1 was cancelled
-                    assertEquals(promises.size(), expectedPushes);
+                    assertEquals(expectedPushes, promises.size());
 
                     promises.clear();
                 }
@@ -334,12 +335,12 @@ public class H3PushCancel implements HttpServerAdapters {
                     client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandlers.ofString())
                             .thenApply(H3PushCancel::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                 } catch (CompletionException c) {
                     throw new AssertionError(c.getCause());
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // Send with no promise handler, but use pushId bigger than allowed.
                 // This should cause the connection to get closed
@@ -351,7 +352,7 @@ public class H3PushCancel implements HttpServerAdapters {
                     client.sendAsync(bigger, BodyHandlers.ofString())
                             .thenApply(H3PushCancel::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body ->assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body ->assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                     throw new AssertionError("Expected IOException not thrown");
                 } catch (CompletionException c) {
@@ -370,7 +371,7 @@ public class H3PushCancel implements HttpServerAdapters {
                         throw new AssertionError("Unexpected exception: " + c.getCause(), c.getCause());
                     }
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // the next time around we should have a new connection
                 // so we can restart from scratch
@@ -379,7 +380,7 @@ public class H3PushCancel implements HttpServerAdapters {
             errors.forEach(t -> t.printStackTrace(System.out));
             var error = errors.stream().findFirst().orElse(null);
             if (error != null) throw error;
-            assertEquals(notified.size(), 0, "Unexpected notification: " + notified);
+            assertEquals(0, notified.size(), "Unexpected notification: " + notified);
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3RedirectTest.java b/test/jdk/java/net/httpclient/http3/H3RedirectTest.java
index 0a5546bc1c1..67a7d99fa71 100644
--- a/test/jdk/java/net/httpclient/http3/H3RedirectTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3RedirectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @compile ../ReferenceTracker.java
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.httpclient.HttpClient.log=frames,ssl,requests,responses,errors
  *      -Djdk.internal.httpclient.debug=true
  *      H3RedirectTest
@@ -50,11 +50,12 @@ import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.Test;
+
 public class H3RedirectTest implements HttpServerAdapters {
     static int httpPort;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
@@ -135,7 +136,7 @@ public class H3RedirectTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void test() throws Exception {
+    public void test() throws Exception {
         try {
             initialize();
             simpleTest();
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPush.java b/test/jdk/java/net/httpclient/http3/H3ServerPush.java
index 83f68a15579..50aa817b155 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPush.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPush.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  *        jdk.httpclient.test.lib.http2.PushHandler
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm/timeout=960
+ * @run junit/othervm/timeout=960
  *      -Djdk.httpclient.HttpClient.log=errors,requests,headers
  *      -Djdk.internal.httpclient.debug=false
  *      H3ServerPush
@@ -66,13 +66,14 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.PushHandler;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static jdk.test.lib.Utils.createTempFileOfSize;
-import static org.testng.Assert.assertEquals;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class H3ServerPush implements HttpServerAdapters {
 
@@ -81,14 +82,14 @@ public class H3ServerPush implements HttpServerAdapters {
     static final int LOOPS = 13;
     static final int FILE_SIZE = 512 * 1024 + 343;
 
-    static Path tempFile;
+    private static Path tempFile;
 
-    HttpTestServer server;
-    URI uri;
-    URI headURI;
+    private static HttpTestServer server;
+    private static URI uri;
+    private static URI headURI;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         tempFile = createTempFileOfSize(CLASS_NAME, ".dat", FILE_SIZE);
         var sslContext = SimpleSSLContext.findSSLContext();
         var h2Server = new Http2TestServer(true, sslContext);
@@ -109,12 +110,12 @@ public class H3ServerPush implements HttpServerAdapters {
         HttpRequest headRequest = HttpRequest.newBuilder(headURI)
                 .HEAD().version(Version.HTTP_2).build();
         var headResponse = client.send(headRequest, BodyHandlers.ofString());
-        assertEquals(headResponse.statusCode(), 200);
-        assertEquals(headResponse.version(), Version.HTTP_2);
+        assertEquals(200, headResponse.statusCode());
+        assertEquals(Version.HTTP_2, headResponse.version());
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         server.stop();
     }
 
@@ -144,7 +145,7 @@ public class H3ServerPush implements HttpServerAdapters {
             resultMap.put(request, cf);
             System.out.println("waiting for response");
             var resp = cf.join();
-            assertEquals(resp.version(), Version.HTTP_3);
+            assertEquals(Version.HTTP_3, resp.version());
             var seen = new HashSet<>();
             resultMap.forEach((k, v) -> {
                 if (seen.add(k)) {
@@ -158,16 +159,16 @@ public class H3ServerPush implements HttpServerAdapters {
             for (HttpRequest r : resultMap.keySet()) {
                 System.out.println("Checking " + r);
                 HttpResponse<String> response = resultMap.get(r).join();
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.version(), Version.HTTP_3);
-                assertEquals(response.body(), tempFileAsString);
+                assertEquals(200, response.statusCode());
+                assertEquals(Version.HTTP_3, response.version());
+                assertEquals(tempFileAsString, response.body());
             }
             resultMap.forEach((k, v) -> {
                 if (seen.add(k)) {
                     System.out.println("Got " + v.join());
                 }
             });
-            assertEquals(resultMap.size(), LOOPS + 1);
+            assertEquals(LOOPS + 1, resultMap.size());
         }
     }
 
@@ -194,11 +195,11 @@ public class H3ServerPush implements HttpServerAdapters {
             System.err.println("results.size: " + resultMap.size());
             for (HttpRequest r : resultMap.keySet()) {
                 HttpResponse<String> response = resultMap.get(r).join();
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.version(), Version.HTTP_3);
-                assertEquals(response.body(), tempFileAsString);
+                assertEquals(200, response.statusCode());
+                assertEquals(Version.HTTP_3, response.version());
+                assertEquals(tempFileAsString, response.body());
             }
-            assertEquals(resultMap.size(), LOOPS + 1);
+            assertEquals(LOOPS + 1, resultMap.size());
         }
     }
 
@@ -242,12 +243,12 @@ public class H3ServerPush implements HttpServerAdapters {
             resultsMap.put(request, cf);
             for (HttpRequest r : resultsMap.keySet()) {
                 HttpResponse<Path> response = resultsMap.get(r).join();
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.version(), Version.HTTP_3);
+                assertEquals(200, response.statusCode());
+                assertEquals(Version.HTTP_3, response.version());
                 String fileAsString = Files.readString(response.body());
-                assertEquals(fileAsString, tempFileAsString);
+                assertEquals(tempFileAsString, fileAsString);
             }
-            assertEquals(resultsMap.size(), LOOPS + 1);
+            assertEquals(LOOPS + 1, resultsMap.size());
         }
     }
 
@@ -274,12 +275,12 @@ public class H3ServerPush implements HttpServerAdapters {
             resultsMap.put(request, cf);
             for (HttpRequest r : resultsMap.keySet()) {
                 HttpResponse<Path> response = resultsMap.get(r).join();
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.version(), Version.HTTP_3);
+                assertEquals(200, response.statusCode());
+                assertEquals(Version.HTTP_3, response.version());
                 String fileAsString = Files.readString(response.body());
-                assertEquals(fileAsString, tempFileAsString);
+                assertEquals(tempFileAsString, fileAsString);
             }
-            assertEquals(resultsMap.size(), LOOPS + 1);
+            assertEquals(LOOPS + 1, resultsMap.size());
         }
     }
 
@@ -340,13 +341,13 @@ public class H3ServerPush implements HttpServerAdapters {
             resultsMap.put(request, cf);
             for (HttpRequest r : resultsMap.keySet()) {
                 HttpResponse<Void> response = resultsMap.get(r).join();
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.version(), Version.HTTP_3);
+                assertEquals(200, response.statusCode());
+                assertEquals(Version.HTTP_3, response.version());
                 byte[] ba = byteArrayConsumerMap.get(r).getAccumulatedBytes();
                 String result = new String(ba, UTF_8);
-                assertEquals(result, tempFileAsString);
+                assertEquals(tempFileAsString, result);
             }
-            assertEquals(resultsMap.size(), LOOPS + 1);
+            assertEquals(LOOPS + 1, resultsMap.size());
         }
     }
 
@@ -384,13 +385,13 @@ public class H3ServerPush implements HttpServerAdapters {
             resultsMap.put(request, cf);
             for (HttpRequest r : resultsMap.keySet()) {
                 HttpResponse<Void> response = resultsMap.get(r).join();
-                assertEquals(response.statusCode(), 200);
-                assertEquals(response.version(), Version.HTTP_3);
+                assertEquals(200, response.statusCode());
+                assertEquals(Version.HTTP_3, response.version());
                 byte[] ba = byteArrayConsumerMap.get(r).getAccumulatedBytes();
                 String result = new String(ba, UTF_8);
-                assertEquals(result, tempFileAsString);
+                assertEquals(tempFileAsString, result);
             }
-            assertEquals(resultsMap.size(), LOOPS + 1);
+            assertEquals(LOOPS + 1, resultsMap.size());
         }
     }
 }
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java b/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java
index 312b9ac507d..b34e2a1567e 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPushCancel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=true
  *      -Djdk.httpclient.HttpClient.log=errors,requests,responses,trace
  *      -Djdk.httpclient.http3.maxConcurrentPushStreams=45
@@ -73,9 +73,6 @@ import java.util.function.Supplier;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.common.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
@@ -83,10 +80,14 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class H3ServerPushCancel implements HttpServerAdapters {
 
@@ -95,7 +96,7 @@ public class H3ServerPushCancel implements HttpServerAdapters {
     static final PrintStream err = System.err;
     static final PrintStream out = System.out;
 
-    static Map<String,String> PUSH_PROMISES = Map.of(
+    static final Map<String,String> PUSH_PROMISES = Map.of(
             "/x/y/z/1", "the first push promise body",
             "/x/y/z/2", "the second push promise body",
             "/x/y/z/3", "the third push promise body",
@@ -109,13 +110,13 @@ public class H3ServerPushCancel implements HttpServerAdapters {
     static final String MAIN_RESPONSE_BODY = "the main response body";
     static final int REQUESTS = 5;
 
-    HttpTestServer  server;
-    URI uri;
-    URI headURI;
-    ServerPushHandler pushHandler;
+    private static HttpTestServer server;
+    private static URI uri;
+    private static URI headURI;
+    private static ServerPushHandler pushHandler;
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         server = HttpTestServer.create(ANY, SimpleSSLContext.findSSLContext());
         pushHandler = new ServerPushHandler(MAIN_RESPONSE_BODY, PUSH_PROMISES);
         server.addHandler(pushHandler, "/push/");
@@ -126,14 +127,14 @@ public class H3ServerPushCancel implements HttpServerAdapters {
         headURI = new URI("https://" + server.serverAuthority() + "/head/x");
     }
 
-    @AfterTest
-    public void teardown() {
+    @AfterAll
+    public static void teardown() {
         server.stop();
     }
 
     static <T> HttpResponse<T> assert200ResponseCode(HttpResponse<T> response) {
-        assertEquals(response.statusCode(), 200);
-        assertEquals(response.version(), HTTP_3);
+        assertEquals(200, response.statusCode());
+        assertEquals(HTTP_3, response.version());
         return response;
     }
 
@@ -141,8 +142,8 @@ public class H3ServerPushCancel implements HttpServerAdapters {
         HttpRequest headRequest = HttpRequest.newBuilder(headURI)
                 .HEAD().version(HTTP_2).build();
         var headResponse = client.send(headRequest, BodyHandlers.ofString());
-        assertEquals(headResponse.statusCode(), 200);
-        assertEquals(headResponse.version(), HTTP_2);
+        assertEquals(200, headResponse.statusCode());
+        assertEquals(HTTP_2, headResponse.version());
     }
 
     static final class TestPushPromiseHandler<T> implements PushPromiseHandler<T> {
@@ -283,14 +284,14 @@ public class H3ServerPushCancel implements HttpServerAdapters {
                                     throw new AssertionError("Unexpected message: " + msg, ex);
                                 }
                             } else {
-                                assertEquals(join(value).body(), PUSH_PROMISES.get(request.uri().getPath()));
+                                assertEquals(PUSH_PROMISES.get(request.uri().getPath()), join(value).body());
                             }
                             expectedPushIds.add(pushId);
-                        } else assertEquals(pushId.getClass(), Http3PushId.class);
+                        } else assertEquals(Http3PushId.class, pushId.getClass());
                     } else {
                         HttpResponse<String> response = join(value);
-                        assertEquals(response.statusCode(), 200);
-                        assertEquals(response.body(), MAIN_RESPONSE_BODY);
+                        assertEquals(200, response.statusCode());
+                        assertEquals(MAIN_RESPONSE_BODY, response.body());
                     }
                 });
 
@@ -311,12 +312,12 @@ public class H3ServerPushCancel implements HttpServerAdapters {
                     client.sendAsync(HttpRequest.newBuilder(uri).build(), BodyHandlers.ofString())
                             .thenApply(H3ServerPushCancel::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                 } catch (CompletionException c) {
                     throw new AssertionError(c.getCause());
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // Send with no promise handler, but use pushId bigger than allowed.
                 // This should cause the connection to get closed
@@ -328,7 +329,7 @@ public class H3ServerPushCancel implements HttpServerAdapters {
                     client.sendAsync(bigger, BodyHandlers.ofString())
                             .thenApply(H3ServerPushCancel::assert200ResponseCode)
                             .thenApply(HttpResponse::body)
-                            .thenAccept(body -> assertEquals(body, MAIN_RESPONSE_BODY))
+                            .thenAccept(body -> assertEquals(MAIN_RESPONSE_BODY, body))
                             .join();
                     throw new AssertionError("Expected IOException not thrown");
                 } catch (CompletionException c) {
@@ -347,7 +348,7 @@ public class H3ServerPushCancel implements HttpServerAdapters {
                         throw new AssertionError("Unexpected exception: " + c.getCause(), c.getCause());
                     }
                 }
-                assertEquals(promises.size(), 0);
+                assertEquals(0, promises.size());
 
                 // the next time around we should have a new connection,
                 // so we can restart from scratch
@@ -408,7 +409,7 @@ public class H3ServerPushCancel implements HttpServerAdapters {
             // excluding those that got cancelled,
             // we should have received REQUEST-1 notifications
             // per push promise and per connection
-            assertEquals(count, (PUSH_PROMISES.size()-3)*2*(REQUESTS-1),
+            assertEquals((PUSH_PROMISES.size()-3)*2*(REQUESTS-1), count,
                     "Unexpected notification: " + notified);
         }
     }
diff --git a/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java b/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java
index d00012826ef..a863db43c29 100644
--- a/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java
+++ b/test/jdk/java/net/httpclient/http3/H3ServerPushWithDiffTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm
+ * @run junit/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=errors,requests,responses
  *       H3ServerPushWithDiffTypes
@@ -65,11 +65,12 @@ import java.util.function.BiPredicate;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class H3ServerPushWithDiffTypes implements HttpServerAdapters {
 
@@ -89,8 +90,8 @@ public class H3ServerPushWithDiffTypes implements HttpServerAdapters {
         HttpRequest headRequest = HttpRequest.newBuilder(headURI)
                 .HEAD().version(Version.HTTP_2).build();
         var headResponse = client.send(headRequest, BodyHandlers.ofString());
-        assertEquals(headResponse.statusCode(), 200);
-        assertEquals(headResponse.version(), Version.HTTP_2);
+        assertEquals(200, headResponse.statusCode());
+        assertEquals(Version.HTTP_2, headResponse.version());
     }
 
     @Test
@@ -127,13 +128,13 @@ public class H3ServerPushWithDiffTypes implements HttpServerAdapters {
                 results.put(request, cf);
                 cf.join();
 
-                assertEquals(results.size(), PUSH_PROMISES.size() + 1);
+                assertEquals(PUSH_PROMISES.size() + 1, results.size());
 
                 for (HttpRequest r : results.keySet()) {
                     URI u = r.uri();
                     var resp = results.get(r).get();
-                    assertEquals(resp.statusCode(), 200);
-                    assertEquals(resp.version(), Version.HTTP_3);
+                    assertEquals(200, resp.statusCode());
+                    assertEquals(Version.HTTP_3, resp.version());
                     BodyAndType<?> body = resp.body();
                     String result;
                     // convert all body types to String for easier comparison
@@ -153,7 +154,7 @@ public class H3ServerPushWithDiffTypes implements HttpServerAdapters {
                     String expected = PUSH_PROMISES.get(r.uri().getPath());
                     if (expected == null)
                         expected = "the main response body";
-                    assertEquals(result, expected);
+                    assertEquals(expected, result);
                 }
             }
         }
diff --git a/test/jdk/java/net/httpclient/http3/H3SimpleGet.java b/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
index 3745c32afbf..ae113322cd3 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimpleGet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,14 +30,14 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.httpclient.retryOnStreamlimit=20
  *                     -Djdk.httpclient.redirects.retrylimit=21
  *                     -Dsimpleget.repeat=1 -Dsimpleget.chunks=1 -Dsimpleget.requests=1000
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Dsimpleget.requests=150
  *                     -Dsimpleget.chunks=16384
  *                     -Djdk.httpclient.retryOnStreamlimit=5
@@ -53,14 +53,14 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.httpclient.retryOnStreamlimit=20
  *                     -Djdk.httpclient.redirects.retrylimit=21
  *                     -Dsimpleget.repeat=1 -Dsimpleget.chunks=1 -Dsimpleget.requests=1000
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Dsimpleget.requests=150
  *                     -Dsimpleget.chunks=16384
  *                     -Djdk.httpclient.retryOnStreamlimit=5
@@ -77,16 +77,16 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations
  *                     -Djdk.httpclient.retryOnStreamlimit=20
  *                     -Djdk.httpclient.redirects.retrylimit=21
  *                     -Dsimpleget.repeat=1 -Dsimpleget.chunks=1 -Dsimpleget.requests=1000
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations
  *                     -Dsimpleget.requests=150
  *                     -Dsimpleget.chunks=16384
@@ -103,16 +103,16 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     -Djdk.httpclient.retryOnStreamlimit=20
  *                     -Djdk.httpclient.redirects.retrylimit=21
  *                     -Dsimpleget.repeat=1 -Dsimpleget.chunks=1 -Dsimpleget.requests=1000
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     -Dsimpleget.requests=150
  *                     -Dsimpleget.chunks=16384
@@ -129,16 +129,16 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     -Djdk.httpclient.retryOnStreamlimit=20
  *                     -Djdk.httpclient.redirects.retrylimit=21
  *                     -Dsimpleget.repeat=1 -Dsimpleget.chunks=1 -Dsimpleget.requests=1000
  *                     H3SimpleGet
- * @run testng/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
+ * @run junit/othervm/timeout=480 -XX:+HeapDumpOnOutOfMemoryError -XX:+CrashOnOutOfMemoryError
  *                     -Djdk.internal.httpclient.quic.useNioSelector=true
  *                     -Dsimpleget.requests=150
  *                     -Dsimpleget.chunks=16384
@@ -154,7 +154,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 -Djdk.internal.httpclient.quic.congestionController=reno
+ * @run junit/othervm/timeout=480 -Djdk.internal.httpclient.quic.congestionController=reno
  *                     H3SimpleGet
  * @summary send multiple GET requests using Reno congestion controller
  */
@@ -198,13 +198,14 @@ import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 public class H3SimpleGet implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
@@ -261,13 +262,13 @@ public class H3SimpleGet implements HttpServerAdapters {
     }
 
     public static void main(String[] args) throws Exception {
-        test();
+        new H3SimpleGet().test();
     }
 
     static volatile boolean waitBeforeTest = false;
 
     @Test
-    public static void test() throws Exception {
+    public void test() throws Exception {
         try {
             if (waitBeforeTest) {
                 Thread.sleep(20000);
@@ -283,7 +284,7 @@ public class H3SimpleGet implements HttpServerAdapters {
                     .GET().build();
             long start = System.nanoTime();
             var resp = client.send(request, BodyHandlers.ofByteArrayConsumer(b-> {}));
-            Assert.assertEquals(resp.statusCode(), 200);
+            Assertions.assertEquals(200, resp.statusCode());
             long elapsed = System.nanoTime() - start;
             System.out.println("Stat: First request took: " + elapsed
                     + " nanos (" + TimeUnit.NANOSECONDS.toMillis(elapsed) + " ms)");
@@ -314,7 +315,7 @@ public class H3SimpleGet implements HttpServerAdapters {
                             + connections.size() + " connections");
                 }
             }
-            list.forEach((cf) -> Assert.assertEquals(cf.join().statusCode(), 200));
+            list.forEach((cf) -> Assertions.assertEquals(200, cf.join().statusCode()));
         } catch (Throwable tt) {
             System.err.println("tt caught");
             tt.printStackTrace();
diff --git a/test/jdk/java/net/httpclient/http3/H3SimplePost.java b/test/jdk/java/net/httpclient/http3/H3SimplePost.java
index 4cf46988873..0294f2f69da 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimplePost.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimplePost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.http2.Http2TestServer
- * @run testng/othervm/timeout=480 H3SimplePost
+ * @run junit/othervm/timeout=480 H3SimplePost
  */
 // -Djdk.httpclient.HttpClient.log=requests,errors,quic
 // -Djdk.httpclient.quic.defaultMTU=64000
@@ -37,8 +37,6 @@
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -61,6 +59,9 @@ import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 public class H3SimplePost implements HttpServerAdapters {
     static HttpTestServer httpsServer;
     static HttpClient client = null;
@@ -115,11 +116,11 @@ public class H3SimplePost implements HttpServerAdapters {
     }
 
     public static void main(String[] args) throws Exception {
-        test();
+        new H3SimplePost().test();
     }
 
     @Test
-    public static void test() throws Exception {
+    public void test() throws Exception {
         try {
             long prestart = System.nanoTime();
             initialize();
@@ -140,7 +141,7 @@ public class H3SimplePost implements HttpServerAdapters {
                     .build();
             long start = System.nanoTime();
             var resp = client.send(getRequest, BodyHandlers.ofByteArrayConsumer(b-> {}));
-            Assert.assertEquals(resp.statusCode(), 200);
+            Assertions.assertEquals(200, resp.statusCode());
             long elapsed = System.nanoTime() - start;
             System.out.println("First GET request took: " + elapsed + " nanos (" + TimeUnit.NANOSECONDS.toMillis(elapsed) + " ms)");
             final int max = 50;
@@ -155,7 +156,7 @@ public class H3SimplePost implements HttpServerAdapters {
             System.out.println("Next " + max + " POST requests took: " + elapsed2 + " nanos ("
                     + TimeUnit.NANOSECONDS.toMillis(elapsed2) + "ms for " + max + " requests): "
                     + elapsed2 / max + " nanos per request (" + TimeUnit.NANOSECONDS.toMillis(elapsed2) / max + " ms)");
-            list.forEach((cf) -> Assert.assertEquals(cf.join().statusCode(), 200));
+            list.forEach((cf) -> Assertions.assertEquals(200, cf.join().statusCode()));
         } catch (Throwable tt) {
             System.err.println("tt caught");
             tt.printStackTrace();
diff --git a/test/jdk/java/net/httpclient/http3/H3SimpleTest.java b/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
index 1880d436501..4258f3bac73 100644
--- a/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3SimpleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,16 +32,17 @@ import javax.net.ssl.SSLContext;
 
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @summary Basic test to verify that simple GET/POST/HEAD
@@ -50,21 +51,21 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.internal.httpclient.debug=true
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *              H3SimpleTest
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.internal.httpclient.debug=true
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *              -Djava.net.preferIPv6Addresses=true
  *              H3SimpleTest
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.internal.httpclient.debug=true
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *              -Djava.net.preferIPv4Stack=true
  *              H3SimpleTest
- * @run testng/othervm
+ * @run junit/othervm
  *              -Djdk.internal.httpclient.debug=true
  *              -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *              -Djdk.internal.httpclient.quic.congestionController=reno
@@ -74,11 +75,11 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
 public class H3SimpleTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer h3Server;
-    private String requestURI;
+    private static HttpTestServer h3Server;
+    private static String requestURI;
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         // create an H3 only server
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler((exchange) -> exchange.sendResponseHeaders(200, 0), "/hello");
@@ -87,8 +88,8 @@ public class H3SimpleTest implements HttpServerAdapters {
         requestURI = "https://" + h3Server.serverAuthority() + "/hello";
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (h3Server != null) {
             System.out.println("Stopping server " + h3Server.getAddress());
             h3Server.stop();
@@ -113,18 +114,18 @@ public class H3SimpleTest implements HttpServerAdapters {
         final HttpRequest req1 = reqBuilder.copy().GET().build();
         System.out.println("Issuing request: " + req1);
         final HttpResponse<Void> resp1 = client.send(req1, BodyHandlers.discarding());
-        Assert.assertEquals(resp1.statusCode(), 200, "unexpected response code for GET request");
+        Assertions.assertEquals(200, resp1.statusCode(), "unexpected response code for GET request");
 
         // POST
         final HttpRequest req2 = reqBuilder.copy().POST(BodyPublishers.ofString("foo")).build();
         System.out.println("Issuing request: " + req2);
         final HttpResponse<Void> resp2 = client.send(req2, BodyHandlers.discarding());
-        Assert.assertEquals(resp2.statusCode(), 200, "unexpected response code for POST request");
+        Assertions.assertEquals(200, resp2.statusCode(), "unexpected response code for POST request");
 
         // HEAD
         final HttpRequest req3 = reqBuilder.copy().HEAD().build();
         System.out.println("Issuing request: " + req3);
         final HttpResponse<Void> resp3 = client.send(req3, BodyHandlers.discarding());
-        Assert.assertEquals(resp3.statusCode(), 200, "unexpected response code for HEAD request");
+        Assertions.assertEquals(200, resp3.statusCode(), "unexpected response code for HEAD request");
     }
 }
diff --git a/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java b/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java
index 5b017c15d9b..86b12a1dae6 100644
--- a/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3StopSendingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @summary Verifies that the client reacts correctly to the receipt of a STOP_SENDING frame.
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm/timeout=40  -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=trace,errors,headers
+ * @run junit/othervm/timeout=40  -Djdk.internal.httpclient.debug=true -Djdk.httpclient.HttpClient.log=trace,errors,headers
  *                              H3StopSendingTest
  */
 
@@ -35,9 +35,6 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestHandler;
 import jdk.httpclient.test.lib.common.HttpServerAdapters.HttpTestServer;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.internal.net.http.http3.Http3Error;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -53,14 +50,18 @@ import java.util.concurrent.ExecutionException;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class H3StopSendingTest {
 
-    HttpTestServer h3TestServer;
-    HttpRequest postRequestNoError, postRequestError;
-    HttpRequest postRequestNoErrorWithData, postRequestErrorWithData;
-    URI h3TestServerUriNoError, h3TestServerUriError;
+    private static HttpTestServer h3TestServer;
+    private static HttpRequest postRequestNoError, postRequestError;
+    private static HttpRequest postRequestNoErrorWithData, postRequestErrorWithData;
+    private static URI h3TestServerUriNoError, h3TestServerUriError;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
     static final String TEST_ROOT_PATH = "/h3_stop_sending_test";
@@ -81,13 +82,13 @@ public class H3StopSendingTest {
             err.println(resp.headers());
             err.println(resp.body());
             err.println(resp.statusCode());
-            assertEquals(resp.statusCode(), 200);
+            assertEquals(200, resp.statusCode());
             resp = client.sendAsync(postRequestNoErrorWithData, HttpResponse.BodyHandlers.ofString()).get();
             err.println(resp.headers());
             err.println(resp.body());
             err.println(resp.statusCode());
-            assertEquals(resp.statusCode(), 200);
-            assertEquals(resp.body(), RESPONSE_MESSAGE.repeat(MESSAGE_REPEAT));
+            assertEquals(200, resp.statusCode());
+            assertEquals(RESPONSE_MESSAGE.repeat(MESSAGE_REPEAT), resp.body());
         }
     }
 
@@ -125,8 +126,8 @@ public class H3StopSendingTest {
         }
     }
 
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
 
         h3TestServer = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3TestServer.addHandler(new ServerRequestStopSendingHandler(), TEST_ROOT_PATH);
@@ -162,8 +163,8 @@ public class H3StopSendingTest {
                 .build();
     }
 
-    @AfterTest
-    public void afterTest() {
+    @AfterAll
+    public static void afterTest() {
         h3TestServer.stop();
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java b/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
index a4524b9ae5e..1ac4a750d77 100644
--- a/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
+++ b/test/jdk/java/net/httpclient/http3/H3StreamLimitReachedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:control
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:control
  *                     -Djdk.internal.httpclient.debug=false
  *                     -Djdk.internal.httpclient.quic.maxBidiStreams=1
  *                     H3StreamLimitReachedTest
@@ -77,7 +77,7 @@
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.Utils
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:control
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors,http3,quic:control
  *                     -Djdk.internal.httpclient.debug=false
  *                     -Djdk.internal.httpclient.quic.maxBidiStreams=1
  *                     -Djdk.httpclient.http3.maxStreamLimitTimeout=0
@@ -114,7 +114,6 @@ import jdk.httpclient.test.lib.http2.Http2TestExchange;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
@@ -125,7 +124,9 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static jdk.test.lib.Asserts.assertEquals;
 import static jdk.test.lib.Asserts.assertNotEquals;
 import static jdk.test.lib.Asserts.assertTrue;
-import static org.testng.Assert.assertFalse;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Test;
 
 public class H3StreamLimitReachedTest implements HttpServerAdapters {
 
@@ -329,7 +330,7 @@ public class H3StreamLimitReachedTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void testH3Only() throws Exception {
+    public void testH3Only() throws Exception {
         System.out.println("\nTesting HTTP/3 only");
         initialize(true);
         try (HttpClient client = getClient()) {
@@ -402,12 +403,12 @@ public class H3StreamLimitReachedTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void testH2H3WithTwoAltSVC() throws Exception {
+    public void testH2H3WithTwoAltSVC() throws Exception {
         testH2H3(false);
     }
 
     @Test
-    public static void testH2H3WithAltSVCOnSamePort() throws Exception {
+    public void testH2H3WithAltSVCOnSamePort() throws Exception {
         testH2H3(true);
     }
 
@@ -627,12 +628,12 @@ public class H3StreamLimitReachedTest implements HttpServerAdapters {
     }
 
     @Test
-    public static void testParallelH2H3WithTwoAltSVC() throws Exception {
+    public void testParallelH2H3WithTwoAltSVC() throws Exception {
         testH2H3Concurrent(false);
     }
 
     @Test
-    public static void testParallelH2H3WithAltSVCOnSamePort() throws Exception {
+    public void testParallelH2H3WithAltSVCOnSamePort() throws Exception {
         testH2H3Concurrent(true);
     }
 
diff --git a/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java b/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java
index 601e40c7dc6..b43ce8dcf79 100644
--- a/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java
+++ b/test/jdk/java/net/httpclient/http3/HTTP3NoBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  *        jdk.httpclient.test.lib.http3.Http3TestServer
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @compile ../ReferenceTracker.java
- * @run testng/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors
+ * @run junit/othervm -Djdk.httpclient.HttpClient.log=ssl,requests,responses,errors
  *       -Djdk.internal.httpclient.debug=true
  *       HTTP3NoBodyTest
  * @summary this is a copy of http2/NoBodyTest over HTTP/3
@@ -38,8 +38,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.*;
-import javax.net.ssl.*;
+import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
@@ -48,9 +47,12 @@ import java.net.http.HttpOption.Http3DiscoveryMode;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.Random;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.net.ssl.SSLContext;
+
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
 import jdk.httpclient.test.lib.http2.Http2TestExchange;
@@ -58,7 +60,6 @@ import jdk.httpclient.test.lib.http2.Http2Handler;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.RandomFactory;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
@@ -66,7 +67,8 @@ import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
-@Test
+import org.junit.jupiter.api.Test;
+
 public class HTTP3NoBodyTest {
     private static final Random RANDOM = RandomFactory.getRandom();
 
@@ -119,7 +121,7 @@ public class HTTP3NoBodyTest {
     }
 
     @Test
-    public static void runtest() throws Exception {
+    public void runtest() throws Exception {
         try {
             initialize();
             warmup(false);
diff --git a/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java b/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java
index 53ce6a68d38..1cf6900ed5d 100644
--- a/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java
+++ b/test/jdk/java/net/httpclient/http3/Http3ExpectContinueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @library /test/lib /test/jdk/java/net/httpclient/lib
  * @compile ../ReferenceTracker.java
  * @build jdk.httpclient.test.lib.common.HttpServerAdapters
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=errors,requests,headers
  *                     Http3ExpectContinueTest
  */
@@ -36,11 +36,6 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http3.Http3TestServer;
 import jdk.httpclient.test.lib.quic.QuicServer;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.TestException;
-import org.testng.annotations.Test;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -60,15 +55,20 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 import static java.net.http.HttpClient.Version.HTTP_3;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class Http3ExpectContinueTest implements HttpServerAdapters {
 
-    ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
 
-    Http3TestServer http3TestServer;
+    private static Http3TestServer http3TestServer;
 
-    URI h3postUri, h3forcePostUri, h3hangUri;
+    private static URI h3postUri, h3forcePostUri, h3hangUri;
 
     static PrintStream err = new PrintStream(System.err);
     static PrintStream out = new PrintStream(System.out);
@@ -78,8 +78,7 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
     static final String BODY = "Post body";
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
 
-    @DataProvider(name = "uris")
-    public Object[][] urisData() {
+    public static Object[][] urisData() {
         return new Object[][]{
                 // URI, Expected Status Code, Will finish with Exception
                 { h3postUri, 200, false },
@@ -88,7 +87,8 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
         };
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("urisData")
     public void test(URI uri, int expectedStatusCode, boolean exceptionally)
             throws CancellationException, InterruptedException, ExecutionException, IOException {
 
@@ -149,8 +149,8 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
         }
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         final QuicServer quicServer = Http3TestServer.quicServerBuilder()
                 .sslContext(sslContext)
                 .build();
@@ -167,8 +167,8 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
         http3TestServer.start();
     }
 
-    @AfterTest
-    public void teardown() throws IOException {
+    @AfterAll
+    public static void teardown() throws IOException {
         var error = TRACKER.check(500);
         if (error != null) throw error;
         http3TestServer.stop();
@@ -233,11 +233,11 @@ public class Http3ExpectContinueTest implements HttpServerAdapters {
         }
         if (exceptionally && testThrowable != null) {
             err.println("Finished exceptionally Test throwable: " + testThrowable);
-            assertEquals(IOException.class, testThrowable.getClass());
+            assertEquals(testThrowable.getClass(), IOException.class);
         } else if (exceptionally) {
-            throw new TestException("Expected case to finish with an IOException but testException is null");
+            fail("Expected case to finish with an IOException but testException is null");
         } else if (resp != null) {
-            assertEquals(resp.statusCode(), expectedStatusCode);
+            assertEquals(expectedStatusCode, resp.statusCode());
             err.println("Request completed successfully for path " + path);
             err.println("Response Headers: " + resp.headers());
             err.println("Response Status Code: " + resp.statusCode());
diff --git a/test/jdk/java/net/httpclient/http3/PeerUniStreamDispatcherTest.java b/test/jdk/java/net/httpclient/http3/PeerUniStreamDispatcherTest.java
index be1b8304bf1..fc6d43bb472 100644
--- a/test/jdk/java/net/httpclient/http3/PeerUniStreamDispatcherTest.java
+++ b/test/jdk/java/net/httpclient/http3/PeerUniStreamDispatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @run testng/othervm
+ * @run junit/othervm
  *      -Djdk.internal.httpclient.debug=out
  *      PeerUniStreamDispatcherTest
  * @summary Unit test for the PeerUniStreamDispatcher
@@ -45,8 +45,8 @@ import jdk.internal.net.http.quic.streams.QuicReceiverStream;
 import jdk.internal.net.http.quic.streams.QuicStreamReader;
 import jdk.internal.net.http.quic.streams.QuicStreams;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PeerUniStreamDispatcherTest {
 
@@ -301,7 +301,7 @@ public class PeerUniStreamDispatcherTest {
         assertTrue(reader.connected());
         int size = VariableLengthEncoder.getEncodedSize(code);
         ByteBuffer buffer = ByteBuffer.allocate(size);
-        assertEquals(buffer.remaining(), size);
+        assertEquals(size, buffer.remaining());
         VariableLengthEncoder.encode(buffer, code);
         buffer.flip();
         stream.buffers.add(buffer);
@@ -313,7 +313,7 @@ public class PeerUniStreamDispatcherTest {
             // will loop correctly.
             size = VariableLengthEncoder.getEncodedSize(1L << 62 - 5);
             ByteBuffer buffer2 = ByteBuffer.allocate(size);
-            assertEquals(buffer2.remaining(), size);
+            assertEquals(size, buffer2.remaining());
             VariableLengthEncoder.encode(buffer2, 1L << 62 - 5);
             buffer2.flip();
             stream.buffers.add(ByteBuffer.wrap(new byte[] {buffer2.get()}));
@@ -328,7 +328,7 @@ public class PeerUniStreamDispatcherTest {
         assertFalse(reader.connected());
         assertFalse(dispatcher.dispatched.isEmpty());
         assertTrue(stream.buffers.isEmpty());
-        assertEquals(dispatcher.dispatched.size(), 1);
+        assertEquals(1, dispatcher.dispatched.size());
         var dispatched = dispatcher.dispatched.get(0);
         checkDispatched(type, code, stream, dispatched);
     }
@@ -343,30 +343,30 @@ public class PeerUniStreamDispatcherTest {
             case RESERVED -> DispatchedStream.ReservedStream.class;
             case UNKNOWN -> DispatchedStream.UnknownStream.class;
         };
-        assertEquals(dispatched.getClass(), streamClass,
+        assertEquals(streamClass, dispatched.getClass(),
                 "unexpected dispatched class " + dispatched + " for " + type);
         if (dispatched instanceof DispatchedStream.StandardStream st) {
             System.out.println("Got expected stream: " + st);
-            assertEquals(st.type(), type);
-            assertEquals(st.stream, stream);
+            assertEquals(type, st.type());
+            assertEquals(stream, st.stream);
         } else if (dispatched instanceof  DispatchedStream.ReservedStream res) {
             System.out.println("Got expected stream: " + res);
-            assertEquals(res.type(), type);
-            assertEquals(res.stream, stream);
-            assertEquals(res.code(), code);
+            assertEquals(type, res.type());
+            assertEquals(stream, res.stream);
+            assertEquals(code, res.code());
             assertTrue(Http3Streams.isReserved(res.code()));
         } else if (dispatched instanceof  DispatchedStream.UnknownStream unk) {
             System.out.println("Got expected stream: " + unk);
-            assertEquals(unk.type(), type);
-            assertEquals(unk.stream, stream);
-            assertEquals(unk.code(), code);
+            assertEquals(type, unk.type());
+            assertEquals(stream, unk.stream);
+            assertEquals(code, unk.code());
             assertFalse(Http3Streams.isReserved(unk.code()));
         } else if (dispatched instanceof DispatchedStream.PushStream push) {
             System.out.println("Got expected stream: " + push);
-            assertEquals(push.type(), type);
-            assertEquals(push.stream, stream);
-            assertEquals(push.pushId, 1L << 62 - 5);
-            assertEquals(push.type(), DISPATCHED_STREAM.PUSH);
+            assertEquals(type, push.type());
+            assertEquals(stream, push.stream);
+            assertEquals(1L << 62 - 5, push.pushId);
+            assertEquals(DISPATCHED_STREAM.PUSH, push.type());
         }
 
     }
@@ -406,9 +406,9 @@ public class PeerUniStreamDispatcherTest {
         SequentialScheduler scheduler = stream.scheduler;
         assertTrue(reader.connected());
         int size = VariableLengthEncoder.getEncodedSize(code);
-        assertEquals(size, 8);
+        assertEquals(8, size);
         ByteBuffer buffer = ByteBuffer.allocate(size);
-        assertEquals(buffer.remaining(), size);
+        assertEquals(size, buffer.remaining());
         VariableLengthEncoder.encode(buffer, code);
         buffer.flip();
         dispatcher.start();
@@ -428,7 +428,7 @@ public class PeerUniStreamDispatcherTest {
         assertFalse(reader.connected());
         assertFalse(dispatcher.dispatched.isEmpty());
         assertTrue(stream.buffers.isEmpty());
-        assertEquals(dispatcher.dispatched.size(), 1);
+        assertEquals(1, dispatcher.dispatched.size());
         var dispatched = dispatcher.dispatched.get(0);
         checkDispatched(type, code, stream, dispatched);
     }
diff --git a/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java b/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
index 90f2c41f4e5..1f109e27ebc 100644
--- a/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
+++ b/test/jdk/java/net/httpclient/http3/PostHTTP3Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 import javax.net.ssl.SSLContext;
 
@@ -56,24 +57,25 @@ import jdk.test.lib.Utils;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.httpclient.test.lib.http2.Http2TestServer;
-import org.testng.ITestContext;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ALT_SVC;
 import static java.net.http.HttpOption.Http3DiscoveryMode.ANY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
-import static org.testng.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.*;
 import static java.lang.System.out;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 /*
  * @test
  * @library /test/lib /test/jdk/java/net/httpclient/lib
@@ -81,7 +83,7 @@ import static java.lang.System.out;
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.test.lib.Utils
  * @compile  ../ReferenceTracker.java
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *                     -Djdk.httpclient.HttpClient.log=requests,responses,errors
  *                     PostHTTP3Test
  * @summary Basic HTTP/3 POST test
@@ -97,8 +99,8 @@ public class PostHTTP3Test implements HttpServerAdapters {
             """;
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
-    String h3URI;
+    static HttpTestServer h3TestServer;  // HTTP/2 ( h2 + h3)
+    static String h3URI;
 
     static final int ITERATION_COUNT = 4;
     // a shared executor helps reduce the amount of threads created by the test
@@ -116,10 +118,10 @@ public class PostHTTP3Test implements HttpServerAdapters {
         return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
     }
 
-    final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
-    final Set<String> sharedClientHasH3 = ConcurrentHashMap.newKeySet();
-    private volatile HttpClient sharedClient;
-    private boolean directQuicConnectionSupported;
+    private static final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
+    private static final Set<String> sharedClientHasH3 = ConcurrentHashMap.newKeySet();
+    private static volatile HttpClient sharedClient;
+    private static boolean directQuicConnectionSupported;
 
     static class TestExecutor implements Executor {
         final AtomicLong tasks = new AtomicLong();
@@ -145,20 +147,37 @@ public class PostHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    protected boolean stopAfterFirstFailure() {
+    private static boolean stopAfterFirstFailure() {
         return Boolean.getBoolean("jdk.internal.httpclient.debug");
     }
 
-    @BeforeMethod
-    void beforeMethod(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            var x = new SkipException("Skipping: some test failed");
-            x.setStackTrace(new StackTraceElement[0]);
-            throw x;
+    static final class TestStopper implements TestWatcher, BeforeEachCallback {
+        final AtomicReference<String> failed = new AtomicReference<>();
+        TestStopper() { }
+        @Override
+        public void testFailed(ExtensionContext context, Throwable cause) {
+            if (stopAfterFirstFailure()) {
+                String msg = "Aborting due to: " + cause;
+                failed.compareAndSet(null, msg);
+                FAILURES.putIfAbsent(context.getDisplayName(), cause);
+                System.out.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+                System.err.printf("%nTEST FAILED: %s%s%n\tAborting due to %s%n%n",
+                        now(), context.getDisplayName(), cause);
+            }
+        }
+
+        @Override
+        public void beforeEach(ExtensionContext context) {
+            String msg = failed.get();
+            Assumptions.assumeTrue(msg == null, msg);
         }
     }
 
-    @AfterClass
+    @RegisterExtension
+    static final TestStopper stopper = new TestStopper();
+
+    @AfterAll
     static void printFailedTests() {
         out.println("\n=========================");
         try {
@@ -179,24 +198,20 @@ public class PostHTTP3Test implements HttpServerAdapters {
         }
     }
 
-    private String[] uris() {
+    private static String[] uris() {
         return new String[] {
                 h3URI,
         };
     }
 
-    @DataProvider(name = "variants")
-    public Object[][] variants(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
+    public static Object[][] variants() {
         String[] uris = uris();
         Object[][] result = new Object[uris.length * 2 * 2 * 2][];
         int i = 0;
         for (var version : List.of(Optional.empty(), Optional.of(HTTP_3))) {
             for (Version firstRequestVersion : List.of(HTTP_2, HTTP_3)) {
                 for (boolean sameClient : List.of(false, true)) {
-                    for (String uri : uris()) {
+                    for (String uri : uris) {
                         result[i++] = new Object[]{uri, firstRequestVersion, sameClient, version};
                     }
                 }
@@ -206,15 +221,6 @@ public class PostHTTP3Test implements HttpServerAdapters {
         return result;
     }
 
-    @DataProvider(name = "uris")
-    public Object[][] uris(ITestContext context) {
-        if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
-            return new Object[0][];
-        }
-        Object[][] result = {{h3URI}};
-        return result;
-    }
-
     private HttpClient makeNewClient() {
         clientCount.incrementAndGet();
         HttpClient client =  newClientBuilderForH3()
@@ -259,7 +265,8 @@ public class PostHTTP3Test implements HttpServerAdapters {
     }
 
 
-    @Test(dataProvider = "variants")
+    @ParameterizedTest
+    @MethodSource("variants")
     public void testAsync(String uri, Version firstRequestVersion, boolean sameClient, Optional<Version> version) throws Exception {
         System.out.println("Request to " + uri +"/Async/*" +
                 ", firstRequestVersion=" + firstRequestVersion +
@@ -287,17 +294,17 @@ public class PostHTTP3Test implements HttpServerAdapters {
         }
 
         HttpResponse<String> response1 = client.send(headBuilder.build(), BodyHandlers.ofString());
-        assertEquals(response1.statusCode(), 200, "Unexpected first response code");
-        assertEquals(response1.body(), "", "Unexpected first response body");
+        assertEquals(200, response1.statusCode(), "Unexpected first response code");
+        assertEquals("", response1.body(), "Unexpected first response body");
         boolean expectH3 = sameClient && sharedClientHasH3.contains(headURI.getRawAuthority());
         if (firstRequestVersion == HTTP_3) {
             if (expectH3) {
                 out.println("Expecting HEAD response over HTTP_3");
-                assertEquals(response1.version(), HTTP_3, "Unexpected first response version");
+                assertEquals(HTTP_3, response1.version(), "Unexpected first response version");
             }
         } else {
             out.println("Expecting HEAD response over HTTP_2");
-            assertEquals(response1.version(), HTTP_2, "Unexpected first response version");
+            assertEquals(HTTP_2, response1.version(), "Unexpected first response version");
         }
         out.println("HEAD response version: " + response1.version());
         if (response1.version() == HTTP_2) {
@@ -356,10 +363,10 @@ public class PostHTTP3Test implements HttpServerAdapters {
                 out.println("Checking response: " + u);
                 var response = e.getValue().get();
                 out.println("Response is: " + response + ", [version: " + response.version() + "]");
-                assertEquals(response.statusCode(), 200,"status for " + u);
-                assertEquals(response.body(), BODY,"body for " + u);
+                assertEquals(200, response.statusCode(), "status for " + u);
+                assertEquals(BODY, response.body(), "body for " + u);
                 if (expectH3) {
-                    assertEquals(response.version(), HTTP_3, "version for " + u);
+                    assertEquals(HTTP_3, response.version(), "version for " + u);
                 }
                 if (response.version() == HTTP_3) {
                     h3Count++;
@@ -381,7 +388,8 @@ public class PostHTTP3Test implements HttpServerAdapters {
         System.out.println("test: DONE");
     }
 
-    @Test(dataProvider = "uris")
+    @ParameterizedTest
+    @MethodSource("uris")
     public void testSync(String h3URI) throws Exception {
         HttpClient client = makeNewClient();
         Builder builder = HttpRequest.newBuilder(URI.create(h3URI + "/Sync/1"))
@@ -403,14 +411,14 @@ public class PostHTTP3Test implements HttpServerAdapters {
         out.println("Response #1: " + response);
         out.println("Version  #1: " + response.version());
         out.println("Body     #1:\n" + response.body().indent(4));
-        assertEquals(response.statusCode(), 200, "first response status");
+        assertEquals(200, response.statusCode(), "first response status");
         if (directQuicConnectionSupported) {
             // TODO unreliable assertion
             //assertEquals(response.version(), HTTP_3, "Unexpected first response version");
         } else {
-            assertEquals(response.version(), HTTP_2, "Unexpected first response version");
+            assertEquals(HTTP_2, response.version(), "Unexpected first response version");
         }
-        assertEquals(response.body(), BODY, "first response body");
+        assertEquals(BODY, response.body(), "first response body");
 
         request = builder.uri(URI.create(h3URI + "/Sync/2"))
                 .POST(oflines(true, BODY.split("\n")))
@@ -419,9 +427,9 @@ public class PostHTTP3Test implements HttpServerAdapters {
         out.println("Response #2: " + response);
         out.println("Version  #2: " + response.version());
         out.println("Body     #2:\n" + response.body().indent(4));
-        assertEquals(response.statusCode(), 200, "second response status");
-        assertEquals(response.version(), HTTP_3, "second response version");
-        assertEquals(response.body(), BODY, "second response body");
+        assertEquals(200, response.statusCode(), "second response status");
+        assertEquals(HTTP_3, response.version(), "second response version");
+        assertEquals(BODY, response.body(), "second response body");
 
         request = builder.uri(URI.create(h3URI + "/Sync/3"))
                 .POST(oflines(true, BODY.split("\n")))
@@ -430,9 +438,9 @@ public class PostHTTP3Test implements HttpServerAdapters {
         out.println("Response #3: " + response);
         out.println("Version  #3: " + response.version());
         out.println("Body     #3:\n" + response.body().indent(4));
-        assertEquals(response.statusCode(), 200, "third response status");
-        assertEquals(response.version(), HTTP_3, "third response version");
-        assertEquals(response.body(), BODY, "third response body");
+        assertEquals(200, response.statusCode(), "third response status");
+        assertEquals(HTTP_3, response.version(), "third response version");
+        assertEquals(BODY, response.body(), "third response body");
 
         var tracker = TRACKER.getTracker(client);
         client = null;
@@ -441,8 +449,8 @@ public class PostHTTP3Test implements HttpServerAdapters {
         if (error != null) throw error;
     }
 
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         final Http2TestServer h2WithAltService = new Http2TestServer("localhost", true, sslContext)
                 .enableH3AltServiceOnSamePort();
         h3TestServer = HttpTestServer.of(h2WithAltService);
@@ -454,8 +462,8 @@ public class PostHTTP3Test implements HttpServerAdapters {
         directQuicConnectionSupported = h2WithAltService.supportsH3DirectConnection();
     }
 
-    @AfterTest
-    public void teardown() throws Exception {
+    @AfterAll
+    public static void teardown() throws Exception {
         System.err.println("=======================================================");
         System.err.println("               Tearing down test");
         System.err.println("=======================================================");
diff --git a/test/jdk/java/net/httpclient/http3/StopSendingTest.java b/test/jdk/java/net/httpclient/http3/StopSendingTest.java
index ff1b8db7bc8..8c9a6f84b65 100644
--- a/test/jdk/java/net/httpclient/http3/StopSendingTest.java
+++ b/test/jdk/java/net/httpclient/http3/StopSendingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,14 +44,15 @@ import jdk.httpclient.test.lib.common.HttpServerAdapters;
 import jdk.internal.net.http.ResponseSubscribers;
 import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpOption.Http3DiscoveryMode.HTTP_3_URI_ONLY;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @summary Exercises the HTTP3 client to send a STOP_SENDING frame
@@ -59,17 +60,17 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  * @compile ../ReferenceTracker.java
- * @run testng/othervm -Djdk.internal.httpclient.debug=true
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true
  *             -Djdk.httpclient.HttpClient.log=requests,responses,errors StopSendingTest
  */
 public class StopSendingTest implements HttpServerAdapters {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer h3Server;
-    private String requestURIBase;
+    private static HttpTestServer h3Server;
+    private static String requestURIBase;
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         h3Server = HttpTestServer.create(HTTP_3_URI_ONLY, sslContext);
         h3Server.addHandler(new Handler(), "/hello");
         h3Server.start();
@@ -79,8 +80,8 @@ public class StopSendingTest implements HttpServerAdapters {
 
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (h3Server != null) {
             System.out.println("Stopping server " + h3Server.getAddress());
             h3Server.stop();
@@ -154,7 +155,7 @@ public class StopSendingTest implements HttpServerAdapters {
             // of the Future instance, sometimes the Future.cancel(true) results
             // in an ExecutionException which wraps the CancellationException.
             // TODO: fix the actual race condition and then expect only CancellationException here
-            final Exception actualException = Assert.expectThrows(Exception.class, futureResp::get);
+            final Exception actualException = Assertions.assertThrows(Exception.class, futureResp::get);
             if (actualException instanceof CancellationException) {
                 // expected
                 System.out.println("Received the expected CancellationException");
diff --git a/test/jdk/java/net/httpclient/http3/StreamLimitTest.java b/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
index e0610cf89b8..9e15db9ceb9 100644
--- a/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
+++ b/test/jdk/java/net/httpclient/http3/StreamLimitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,14 +45,15 @@ import jdk.httpclient.test.lib.quic.QuicServerConnection;
 import jdk.internal.net.http.quic.QuicTransportParameters;
 import jdk.internal.net.http.quic.QuicTransportParameters.ParameterId;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.net.http.HttpClient.Version.HTTP_3;
 import static java.net.http.HttpOption.H3_DISCOVERY;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 /*
  * @test
  * @summary verifies that when the Quic stream limit is reached
@@ -64,17 +65,17 @@ import static java.net.http.HttpOption.H3_DISCOVERY;
  * @build jdk.test.lib.net.SimpleSSLContext
  *        jdk.httpclient.test.lib.common.HttpServerAdapters
  *        jdk.httpclient.test.lib.http3.Http3TestServer
- * @run testng/othervm -Djdk.internal.httpclient.debug=true StreamLimitTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true StreamLimitTest
  */
 public class StreamLimitTest {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private HttpTestServer server;
-    private QuicServer quicServer;
-    private URI requestURI;
-    private volatile QuicServerConnection latestServerConn;
+    private static HttpTestServer server;
+    private static QuicServer quicServer;
+    private static URI requestURI;
+    private static volatile QuicServerConnection latestServerConn;
 
-    private final class Handler implements HttpTestHandler {
+    private static final class Handler implements HttpTestHandler {
 
         @Override
         public void handle(HttpTestExchange exchange) throws IOException {
@@ -97,8 +98,8 @@ public class StreamLimitTest {
         }
     }
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         quicServer = Http3TestServer.quicServerBuilder().sslContext(sslContext).build();
         final Http3TestServer h3Server = new Http3TestServer(quicServer) {
             @Override
@@ -118,8 +119,8 @@ public class StreamLimitTest {
         requestURI = new URI("https://" + server.serverAuthority() + "/foo");
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         latestServerConn = null;
         if (server != null) {
             server.stop();
@@ -161,8 +162,8 @@ public class StreamLimitTest {
             System.out.println("Sending request " + i + " to " + requestURI);
             final HttpResponse<String> resp = client.send(req,
                     HttpResponse.BodyHandlers.ofString());
-            Assert.assertEquals(resp.version(), HTTP_3, "Unexpected response version");
-            Assert.assertEquals(resp.statusCode(), 200, "Unexpected response code");
+            Assertions.assertEquals(HTTP_3, resp.version(), "Unexpected response version");
+            Assertions.assertEquals(200, resp.statusCode(), "Unexpected response code");
             final String respBody = resp.body();
             System.out.println("Request " + i + " was handled by server connection: " + respBody);
             if (i == 1) {
@@ -170,7 +171,7 @@ public class StreamLimitTest {
                 // to this request
                 requestHandledBy = respBody;
             } else {
-                Assert.assertEquals(respBody, requestHandledBy, "Request was handled by an" +
+                Assertions.assertEquals(requestHandledBy, respBody, "Request was handled by an" +
                         " unexpected server connection");
             }
         }
@@ -193,20 +194,20 @@ public class StreamLimitTest {
                     + requestURI);
             final HttpResponse<String> resp = client.send(reqWithTimeout,
                     HttpResponse.BodyHandlers.ofString());
-            Assert.assertEquals(resp.version(), HTTP_3, "Unexpected response version");
-            Assert.assertEquals(resp.statusCode(), 200, "Unexpected response code");
+            Assertions.assertEquals(HTTP_3, resp.version(), "Unexpected response version");
+            Assertions.assertEquals(200, resp.statusCode(), "Unexpected response code");
             final String respBody = resp.body();
             System.out.println("Request " + i + " was handled by server connection: " + respBody);
             if (i == 1) {
                 // first request after the limit was hit.
                 // verify that it was handled by a new connection and not the one that handled
                 // the previous N requests
-                Assert.assertNotEquals(respBody, requestHandledBy, "Request was expected to be" +
+                Assertions.assertNotEquals(requestHandledBy, respBody, "Request was expected to be" +
                         " handled by a new server connection, but wasn't");
                 // keep track this new server connection id which responded to this request
                 requestHandledBy = respBody;
             } else {
-                Assert.assertEquals(respBody, requestHandledBy, "Request was handled by an" +
+                Assertions.assertEquals(requestHandledBy, respBody, "Request was handled by an" +
                         " unexpected server connection");
             }
         }
@@ -231,13 +232,13 @@ public class StreamLimitTest {
                     " to " + requestURI);
             final HttpResponse<String> resp = client.send(reqWithTimeout,
                     HttpResponse.BodyHandlers.ofString());
-            Assert.assertEquals(resp.version(), HTTP_3, "Unexpected response version");
-            Assert.assertEquals(resp.statusCode(), 200, "Unexpected response code");
+            Assertions.assertEquals(HTTP_3, resp.version(), "Unexpected response version");
+            Assertions.assertEquals(200, resp.statusCode(), "Unexpected response code");
             final String respBody = resp.body();
             System.out.println("Request " + i + " was handled by server connection: " + respBody);
             // all these requests should be handled by the same server connection which handled
             // the previous requests
-            Assert.assertEquals(respBody, requestHandledBy, "Request was handled by an" +
+            Assertions.assertEquals(requestHandledBy, respBody, "Request was handled by an" +
                     " unexpected server connection");
         }
         // at this point the newer limit for bidi stream creation has reached on the client.
@@ -254,12 +255,12 @@ public class StreamLimitTest {
         System.out.println("Sending request, without timeout, to " + requestURI);
         final HttpResponse<String> finalResp = client.send(finalReq,
                 HttpResponse.BodyHandlers.ofString());
-        Assert.assertEquals(finalResp.version(), HTTP_3, "Unexpected response version");
-        Assert.assertEquals(finalResp.statusCode(), 200, "Unexpected response code");
+        Assertions.assertEquals(HTTP_3, finalResp.version(), "Unexpected response version");
+        Assertions.assertEquals(200, finalResp.statusCode(), "Unexpected response code");
         final String finalRespBody = finalResp.body();
         System.out.println("Request was handled by server connection: " + finalRespBody);
         // this request should have been handled by a new server connection
-        Assert.assertNotEquals(finalRespBody, requestHandledBy, "Request was handled by an" +
+        Assertions.assertNotEquals(requestHandledBy, finalRespBody, "Request was handled by an" +
                 " unexpected server connection");
     }
 }
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
index 10633340a66..b40cef5d4e6 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -251,6 +251,60 @@ public interface HttpServerAdapters {
      * A version agnostic adapter class for HTTP Server Exchange.
      */
     public static abstract class HttpTestExchange implements AutoCloseable {
+        /**
+         * This constant can be passed to {@link #sendResponseHeaders(int, long)}
+         * to indicate an empty response.
+         */
+        public static final int RSPBODY_EMPTY = 0;
+        /**
+         * This constant can be passed to {@link #sendResponseHeaders(int, long)}
+         * to indicate that the response will be chunked.
+         */
+        public static final int RSPBODY_CHUNKED = -1;
+
+        /**
+         * {@return the response length to pass to {@link #sendResponseHeaders(int, long)}
+         * if the response is not chunked}
+         * @param bytes the response length
+         */
+        public static long fixedRsp(long bytes) {
+            return bytes == 0 ? RSPBODY_EMPTY : bytes;
+        }
+
+        /**
+         * {@return the response length to pass to {@link #sendResponseHeaders(int, long)}}
+         * This is the response length when `chunked` is false, and
+         * {@link #RSPBODY_CHUNKED} otherwise.
+         * @param length   The number of bytes to send
+         * @param chunked  Whether the response should be chunked
+         */
+        public static long responseLength(long length, boolean chunked) {
+            return chunked ? HttpTestExchange.RSPBODY_CHUNKED : fixedRsp(length);
+        }
+
+        /**
+         * {@return true if the {@linkplain #getRequestHeaders() request headers}
+         * contain {@code XFixed: yes}}
+         */
+        public boolean rspFixedRequested() {
+            return "yes".equals(getRequestHeaders()
+                    .firstValue("XFixed")
+                    .orElse(null));
+        }
+
+        /**
+         * {@return the length to be passed to {@link #sendResponseHeaders(int, long)},
+         *  taking into account whether using {@linkplain #rspFixedRequested()
+         *  fixed length was requested} in the {@linkplain #getRequestHeaders()
+         *  request headers}.}
+         * By default, returns {@link #RSPBODY_CHUNKED} unless {@linkplain
+         * #rspFixedRequested() fixed length was requested}.
+         * @param length the length to use in content-length if fixed length is used.
+         */
+        public long responseLength(long length) {
+            return responseLength(length, !rspFixedRequested());
+        }
+
         public abstract Version getServerVersion();
         public abstract Version getExchangeVersion();
         public abstract InputStream   getRequestBody();
@@ -265,6 +319,10 @@ public interface HttpServerAdapters {
         public abstract InetSocketAddress getLocalAddress();
         public abstract String getConnectionKey();
         public abstract SSLSession getSSLSession();
+        public CompletableFuture<Long> sendPing() {
+            throw new UnsupportedOperationException("sendPing not supported on "
+                    + getExchangeVersion());
+        }
         public void serverPush(URI uri, HttpHeaders reqHeaders, byte[] body) throws IOException {
             ByteArrayInputStream bais = new ByteArrayInputStream(body);
             serverPush(uri, reqHeaders, bais);
@@ -543,6 +601,11 @@ public interface HttpServerAdapters {
                 throws IOException {
                 exchange.serverPush(uri, reqHeaders, rspHeaders, body);
             }
+            @Override
+            public CompletableFuture<Long> sendPing() {
+                return exchange.sendPing();
+            }
+
             @Override
             public void requestStopSending(long errorCode) {
                 exchange.requestStopSending(errorCode);
@@ -701,7 +764,8 @@ public interface HttpServerAdapters {
 
     /**
      * An echo handler that can be used to transfer large amount of data, and
-     * uses file on the file system to download the input.
+     * uses file on the file system to download the input. This handler honors
+     * the {@code XFixed} header.
      */
     // TODO: it would be good if we could merge this with the Http2EchoHandler,
     //       from which this code was copied and adapted.
@@ -737,7 +801,7 @@ public interface HttpServerAdapters {
                         assertFileContentsEqual(check, outfile.toPath());
                     } catch (Throwable x) {
                         System.err.println("Files do not match: " + x);
-                        t.sendResponseHeaders(500, -1);
+                        t.sendResponseHeaders(500, HttpTestExchange.RSPBODY_EMPTY);
                         outfile.delete();
                         os.close();
                         return;
@@ -747,7 +811,7 @@ public interface HttpServerAdapters {
                 // return the number of bytes received (no echo)
                 String summary = requestHeaders.firstValue("XSummary").orElse(null);
                 if (fixedrequest != null && summary == null) {
-                    t.sendResponseHeaders(200, count);
+                    t.sendResponseHeaders(200, HttpTestExchange.fixedRsp(count));
                     os = t.getResponseBody();
                     if (!t.getRequestMethod().equals("HEAD")) {
                         long count1 = is1.transferTo(os);
@@ -756,7 +820,7 @@ public interface HttpServerAdapters {
                         System.err.printf("EchoHandler HEAD received, no bytes sent%n");
                     }
                 } else {
-                    t.sendResponseHeaders(200, -1);
+                    t.sendResponseHeaders(200, HttpTestExchange.RSPBODY_CHUNKED);
                     os = t.getResponseBody();
                     if (!t.getRequestMethod().equals("HEAD")) {
                         long count1 = is1.transferTo(os);
@@ -780,6 +844,14 @@ public interface HttpServerAdapters {
         }
     }
 
+    /**
+     * An echo handler that can be used to transfer small amounts of data.
+     * All the request data is read in memory in a single byte array before
+     * being sent back. If the handler is {@linkplain #useXFixed() configured
+     * to honor the {@code XFixed} header}, and the request headers do not
+     * specify {@code XFixed: yes}, the data is sent back in chunk mode.
+     * Otherwise, chunked mode is not used (this is the default).
+     */
     public static class HttpTestEchoHandler implements HttpTestHandler {
 
         private final boolean printBytes;
@@ -791,10 +863,26 @@ public interface HttpServerAdapters {
             this.printBytes = printBytes;
         }
 
+        /**
+         * {@return whether the {@code XFixed} header should be
+         * honored. If this method returns false, chunked mode will
+         * not be used. If this method returns true, chunked mode
+         * will be used unless the request headers contain
+         * {@code XFixed: yes}}
+         */
+        protected boolean useXFixed() {
+            return false;
+        }
+
         @Override
         public void handle(HttpTestExchange t) throws IOException {
-            try (InputStream is = t.getRequestBody();
-                 OutputStream os = t.getResponseBody()) {
+            System.err.printf("EchoHandler received request to %s from %s (version %s)%n",
+                    t.getRequestURI(), t.getRemoteAddress(), t.getExchangeVersion());
+            InputStream is = null;
+            OutputStream os = null;
+            try {
+                is = t.getRequestBody();
+                os = t.getResponseBody();
                 byte[] bytes = is.readAllBytes();
                 if (printBytes) {
                     printBytes(System.out, "Echo server got "
@@ -804,12 +892,31 @@ public interface HttpServerAdapters {
                     t.getResponseHeaders().addHeader("Content-type",
                             t.getRequestHeaders().firstValue("Content-type").get());
                 }
-                t.sendResponseHeaders(200, bytes.length);
-                if (!t.getRequestMethod().equals("HEAD")) {
+
+                long responseLength = useXFixed()
+                        ? t.responseLength(bytes.length)
+                        : HttpTestExchange.fixedRsp(bytes.length);
+                t.sendResponseHeaders(200, responseLength);
+                if (!t.getRequestMethod().equals("HEAD") && bytes.length > 0) {
                     os.write(bytes);
                 }
+            } finally {
+                if (os != null) close(t, os);
+                if (is != null) close(t, is);
             }
         }
+        protected void close(OutputStream os) throws IOException {
+            os.close();
+        }
+        protected void close(InputStream is) throws IOException {
+            is.close();
+        }
+        protected void close(HttpTestExchange t, OutputStream os) throws IOException {
+            close(os);
+        }
+        protected void close(HttpTestExchange t, InputStream is) throws IOException {
+            close(is);
+        }
     }
 
     public static class HttpTestRedirectHandler implements HttpTestHandler {
@@ -854,6 +961,117 @@ public interface HttpServerAdapters {
         }
     }
 
+    /**
+     * A simple FileServerHandler that understand "XFixed" header.
+     * If the request headers contain {@code XFixed: yes}, a fixed
+     * length response is sent. Otherwise, the response will be
+     * chunked. Note that for directories the response is always
+     * chunked.
+     */
+    class HttpTestFileServerHandler implements HttpTestHandler {
+
+        String docroot;
+
+        public HttpTestFileServerHandler(String docroot) {
+            this.docroot = docroot;
+        }
+
+        public void handle(HttpTestExchange t)
+                throws IOException
+        {
+            InputStream is = t.getRequestBody();
+            var rspHeaders = t.getResponseHeaders();
+            URI uri = t.getRequestURI();
+            String path = uri.getPath();
+
+            int x = 0;
+            while (is.read() != -1) x++;
+            is.close();
+            File f = new File(docroot, path);
+            if (!f.exists()) {
+                notfound(t, path);
+                return;
+            }
+
+            String method = t.getRequestMethod();
+            if (method.equals("HEAD")) {
+                rspHeaders.addHeader("Content-Length", Long.toString(f.length()));
+                t.sendResponseHeaders(200, HttpTestExchange.RSPBODY_EMPTY);
+                t.close();
+            } else if (!method.equals("GET")) {
+                t.sendResponseHeaders(405, HttpTestExchange.RSPBODY_EMPTY);
+                t.close();
+                return;
+            }
+
+            if (path.endsWith(".html") || path.endsWith(".htm")) {
+                rspHeaders.addHeader("Content-Type", "text/html");
+            } else {
+                rspHeaders.addHeader("Content-Type", "text/plain");
+            }
+            if (f.isDirectory()) {
+                if (!path.endsWith("/")) {
+                    moved (t);
+                    return;
+                }
+                rspHeaders.addHeader("Content-Type", "text/html");
+                t.sendResponseHeaders(200, HttpTestExchange.RSPBODY_CHUNKED);
+                String[] list = f.list();
+                try (final OutputStream os = t.getResponseBody();
+                     final PrintStream p = new PrintStream(os)) {
+                    p.println("<h2>Directory listing for: " + path + "</h2>");
+                    p.println("<ul>");
+                    for (int i = 0; i < list.length; i++) {
+                        p.println("<li><a href=\"" + list[i] + "\">" + list[i] + "</a></li>");
+                    }
+                    p.println("</ul><p><hr>");
+                    p.flush();
+                }
+            } else {
+                long clen = f.length();
+                t.sendResponseHeaders(200, t.responseLength(clen));
+                long count = 0;
+                try (final OutputStream os = t.getResponseBody();
+                     final FileInputStream fis = new FileInputStream (f)) {
+                    byte[] buf = new byte [16 * 1024];
+                    int len;
+                    while ((len=fis.read(buf)) != -1) {
+                        os.write(buf, 0, len);
+                        count += len;
+                    }
+                    if (clen != count) {
+                        System.err.println("FileServerHandler: WARNING: count of bytes sent does not match content-length");
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        void moved(HttpTestExchange t) throws IOException {
+            var req = t.getRequestHeaders();
+            var rsp = t.getResponseHeaders();
+            URI uri = t.getRequestURI();
+            String host = req.firstValue("Host").get();
+            String location = "http://"+host+uri.getPath() + "/";
+            rsp.addHeader("Content-Type", "text/html");
+            rsp.addHeader("Location", location);
+            t.sendResponseHeaders(301, HttpTestExchange.RSPBODY_EMPTY);
+            t.close();
+        }
+
+        void notfound(HttpTestExchange t, String p) throws IOException {
+            t.getResponseHeaders().addHeader("Content-Type", "text/html");
+            t.sendResponseHeaders(404, HttpTestExchange.RSPBODY_CHUNKED);
+            OutputStream os = t.getResponseBody();
+            String s = "<h2>File not found</h2>";
+            s = s + p + "<p>";
+            os.write(s.getBytes());
+            os.close();
+            t.close();
+        }
+    }
+
     public static boolean expectException(HttpTestExchange e) {
         HttpTestRequestHeaders h = e.getRequestHeaders();
         Optional<String> expectException = h.firstValue("X-expect-exception");
@@ -1144,6 +1362,22 @@ public interface HttpServerAdapters {
         public abstract InetSocketAddress getAddress();
         public abstract Version getVersion();
 
+        /**
+         * Adds a new handler and return its context.
+         * @implSpec
+         * This method just returns {@link #addHandler(HttpTestHandler, String)
+         * addHandler(context, root)}
+         * @apiNote
+         * This is a convenience method to help migrate from
+         * {@link HttpServer#createContext(String, HttpHandler)}.
+         * @param root     The context root
+         * @param handler  The handler to attach to the context
+         * @return the context to which the new handler is attached
+         */
+        public HttpTestContext createContext(String root, HttpTestHandler handler) {
+            return addHandler(handler, root);
+        }
+
         /**
          * {@return the HTTP3 test server which is acting as an alt-service for this server,
          * if any}
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/EchoHandler.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/EchoHandler.java
deleted file mode 100644
index 047b52b3699..00000000000
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/EchoHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.httpclient.test.lib.http2;
-
-import java.io.*;
-import java.net.http.HttpHeaders;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import jdk.internal.net.http.common.HttpHeadersBuilder;
-
-public class EchoHandler implements Http2Handler {
-    static final Path CWD = Paths.get(".");
-
-    public EchoHandler() {}
-
-    @Override
-    public void handle(Http2TestExchange t)
-            throws IOException {
-        try {
-            System.err.println("EchoHandler received request to " + t.getRequestURI());
-            InputStream is = t.getRequestBody();
-            HttpHeaders map = t.getRequestHeaders();
-            HttpHeadersBuilder map1 = t.getResponseHeaders();
-            map1.addHeader("X-Hello", "world");
-            map1.addHeader("X-Bye", "universe");
-            String fixedrequest = map.firstValue("XFixed").orElse(null);
-            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
-            //System.err.println ("QQQ = " + outfile.toString());
-            FileOutputStream fos = new FileOutputStream(outfile);
-            int count = (int) is.transferTo(fos);
-            System.err.printf("EchoHandler read %d bytes\n", count);
-            is.close();
-            fos.close();
-            InputStream is1 = new FileInputStream(outfile);
-            OutputStream os = null;
-            // return the number of bytes received (no echo)
-            String summary = map.firstValue("XSummary").orElse(null);
-            if (fixedrequest != null && summary == null) {
-                t.sendResponseHeaders(200, count);
-                os = t.getResponseBody();
-                int count1 = (int)is1.transferTo(os);
-                System.err.printf("EchoHandler wrote %d bytes\n", count1);
-            } else {
-                t.sendResponseHeaders(200, 0);
-                os = t.getResponseBody();
-                int count1 = (int)is1.transferTo(os);
-                System.err.printf("EchoHandler wrote %d bytes\n", count1);
-
-                if (summary != null) {
-                    String s = Integer.toString(count);
-                    os.write(s.getBytes());
-                }
-            }
-            outfile.delete();
-            os.close();
-            is1.close();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new IOException(e);
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2EchoHandler.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2EchoHandler.java
deleted file mode 100644
index fd0b03ac691..00000000000
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2EchoHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.httpclient.test.lib.http2;
-
-import java.io.*;
-import java.net.http.HttpHeaders;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import jdk.internal.net.http.common.HttpHeadersBuilder;
-
-import static jdk.test.lib.Asserts.assertFileContentsEqual;
-
-public class Http2EchoHandler implements Http2Handler {
-    static final Path CWD = Paths.get(".");
-
-    public Http2EchoHandler() {}
-
-    @Override
-    public void handle(Http2TestExchange t)
-            throws IOException {
-        try {
-            System.err.printf("EchoHandler received request to %s from %s\n",
-                              t.getRequestURI(), t.getRemoteAddress());
-            InputStream is = t.getRequestBody();
-            HttpHeaders map = t.getRequestHeaders();
-            HttpHeadersBuilder headersBuilder = t.getResponseHeaders();
-            headersBuilder.addHeader("X-Hello", "world");
-            headersBuilder.addHeader("X-Bye", "universe");
-            String fixedrequest = map.firstValue("XFixed").orElse(null);
-            File outfile = Files.createTempFile(CWD, "foo", "bar").toFile();
-            //System.err.println ("QQQ = " + outfile.toString());
-            FileOutputStream fos = new FileOutputStream(outfile);
-            long count = is.transferTo(fos);
-            System.err.printf("EchoHandler read %s bytes\n", count);
-            is.close();
-            fos.close();
-            InputStream is1 = new FileInputStream(outfile);
-            OutputStream os = null;
-
-            Path check = map.firstValue("X-Compare").map((String s) -> Path.of(s)).orElse(null);
-            if (check != null) {
-                System.err.println("EchoHandler checking file match: " + check);
-                try {
-                    assertFileContentsEqual(check, outfile.toPath());
-                } catch (Throwable x) {
-                    System.err.println("Files do not match: " + x);
-                    t.sendResponseHeaders(500, -1);
-                    outfile.delete();
-                    os.close();
-                    return;
-                }
-            }
-
-            // return the number of bytes received (no echo)
-            String summary = map.firstValue("XSummary").orElse(null);
-            if (fixedrequest != null && summary == null) {
-                t.sendResponseHeaders(200, count);
-                os = t.getResponseBody();
-                long count1 = is1.transferTo(os);
-                System.err.printf("EchoHandler wrote %s bytes\n", count1);
-            } else {
-                t.sendResponseHeaders(200, 0);
-                os = t.getResponseBody();
-                long count1 = is1.transferTo(os);
-                System.err.printf("EchoHandler wrote %s bytes\n", count1);
-
-                if (summary != null) {
-                    String s = Long.toString(count);
-                    os.write(s.getBytes());
-                }
-            }
-            outfile.delete();
-            os.close();
-            is1.close();
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new IOException(e);
-        }
-    }
-}
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java
index c127abf3c0f..1c61f00d164 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -175,7 +175,7 @@ public final class Http3ServerExchange implements Http2TestExchange {
             }
             serverStream.writer.reset(Http3Error.H3_INTERNAL_ERROR.code());
         }
-        is.close(io);
+        is.resetStream(io);
         os.closeInternal();
         close();
     }
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerStreamImpl.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerStreamImpl.java
index c5a8709346c..ebe92fa3bac 100644
--- a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerStreamImpl.java
+++ b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http3/Http3ServerStreamImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -264,7 +265,7 @@ final class Http3ServerStreamImpl {
             // nothing to do - let the response be sent to the client, but throw an
             // exception if `is` is used again.
             exchangeCF.thenApply(en -> {
-                en.is.close(new IOException("stopSendingRequested"));
+                en.is.resetStream(new IOException("stopSendingRequested"));
                 return en;
             });
             return;
@@ -292,38 +293,37 @@ final class Http3ServerStreamImpl {
     }
 
     class RequestBodyInputStream extends InputStream {
-        volatile IOException error;
-        volatile boolean closed;
+        // Non-null if the stream is terminated.
+        // Points to an IOException on error, or Boolean.TRUE on EOF.
+        private final AtomicReference<Object> closeReason = new AtomicReference<>();
         // uses an unbounded blocking queue in which the readrLoop
         // publishes the DataFrames payload...
         ByteBuffer current;
-        // Use lock to avoid pinned threads on the blocking queue
-        final ReentrantLock lock = new ReentrantLock();
 
         ByteBuffer current() throws IOException {
-            lock.lock();
-            try {
-                while (true) {
-                    if (current != null && current.hasRemaining()) {
-                        return current;
-                    }
-                    if (current == QuicStreamReader.EOF) return current;
-                    try {
-                        if (debug.on())
-                            debug.log("Taking buffer from queue");
-                        // Blocking call
-                        current = requestBodyQueue.take();
-                    } catch (InterruptedException e) {
-                        var io = new InterruptedIOException();
-                        Thread.currentThread().interrupt();
-                        io.initCause(e);
-                        close(io);
-                        var error = this.error;
-                        if (error != null) throw error;
+            while (true) {
+                Object reason = closeReason.get();
+                if (reason != null) {
+                    if (reason == Boolean.TRUE) {
+                        throw new IOException("Stream is closed");
+                    } else {
+                        throw new IOException((IOException)reason);
                     }
                 }
-            } finally {
-                lock.unlock();
+                if (current != null && (current.hasRemaining() || current == QuicStreamReader.EOF)) {
+                    return current;
+                }
+                try {
+                    if (debug.on())
+                        debug.log("Taking buffer from queue");
+                    // Blocking call
+                    current = requestBodyQueue.take();
+                } catch (InterruptedException e) {
+                    var io = new InterruptedIOException();
+                    Thread.currentThread().interrupt();
+                    io.initCause(e);
+                    throw io;
+                }
             }
         }
 
@@ -331,9 +331,7 @@ final class Http3ServerStreamImpl {
         public int read() throws IOException {
             ByteBuffer buffer = current();
             if (buffer == QuicStreamReader.EOF) {
-                var error = this.error;
-                if (error == null) return -1;
-                throw error;
+                return -1;
             }
             return buffer.get() & 0xFF;
         }
@@ -345,11 +343,7 @@ final class Http3ServerStreamImpl {
             while (remaining > 0) {
                 ByteBuffer buffer = current();
                 if (buffer == QuicStreamReader.EOF) {
-                    if (len == remaining) {
-                        var error = this.error;
-                        if (error == null) return -1;
-                        throw error;
-                    } else return len - remaining;
+                    return len == remaining ? -1 : len - remaining;
                 }
                 int count = Math.min(buffer.remaining(), remaining);
                 buffer.get(b, off + (len - remaining), count);
@@ -360,33 +354,20 @@ final class Http3ServerStreamImpl {
 
         @Override
         public void close() throws IOException {
-            lock.lock();
-            try {
-                if (closed) return;
-                closed = true;
-
-            } finally {
-                lock.unlock();
-            }
+            if (closeReason.getAndSet(Boolean.TRUE) == Boolean.TRUE) return;
             if (debug.on())
                 debug.log("Closing request body input stream");
             requestBodyQueue.add(QuicStreamReader.EOF);
+            stream.requestStopSending(Http3Error.H3_NO_ERROR.code());
         }
 
-        void close(IOException io) {
-            lock.lock();
-            try {
-                if (closed) return;
-                closed = true;
-                error = io;
-            } finally {
-                lock.unlock();
-            }
+        void resetStream(IOException io) {
+            if (!closeReason.compareAndSet(null, io)) return;
             if (debug.on()) {
                 debug.log("Closing request body input stream: " + io);
             }
-            requestBodyQueue.clear();
             requestBodyQueue.add(QuicStreamReader.EOF);
+            stream.requestStopSending(Http3Error.H3_NO_ERROR.code());
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/offline/OfflineTesting.java b/test/jdk/java/net/httpclient/offline/OfflineTesting.java
index 2f4833bf179..f36a457022e 100644
--- a/test/jdk/java/net/httpclient/offline/OfflineTesting.java
+++ b/test/jdk/java/net/httpclient/offline/OfflineTesting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Demonstrates how to achieve testing without network connections
  * @build DelegatingHttpClient FixedHttpResponse FixedResponseHttpClient
- * @run testng/othervm OfflineTesting
+ * @run junit/othervm OfflineTesting
  */
 
 import java.io.IOException;
@@ -40,13 +40,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiPredicate;
-import org.testng.annotations.Test;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class OfflineTesting {
 
@@ -72,9 +74,9 @@ public class OfflineTesting {
             client.sendAsync(request, BodyHandlers.ofString())
                     .thenAccept(response -> {
                         System.out.println("response: " + response);
-                        assertEquals(response.statusCode(), 200);
+                        assertEquals(200, response.statusCode());
                         assertTrue(response.headers().firstValue("Server").isPresent());
-                        assertEquals(response.body(), "A response message");
+                        assertEquals("A response message", response.body());
                     })
                     .join();
         }
@@ -91,9 +93,9 @@ public class OfflineTesting {
             client.sendAsync(request, BodyHandlers.ofByteArray())
                     .thenAccept(response -> {
                         System.out.println("response: " + response);
-                        assertEquals(response.statusCode(), 200);
+                        assertEquals(200, response.statusCode());
                         assertTrue(response.headers().firstValue("Content-Type").isPresent());
-                        assertEquals(response.body(), "A response message".getBytes(UTF_8));
+                        Assertions.assertArrayEquals("A response message".getBytes(UTF_8), response.body());
                     })
                     .join();
         }
@@ -125,9 +127,9 @@ public class OfflineTesting {
         try (var client = fixedClient) {
             client.sendAsync(request, BodyHandlers.ofString())
                     .thenAccept(response -> {
-                        assertEquals(response.statusCode(), 404);
+                        assertEquals(404, response.statusCode());
                         response.headers().firstValue("Content-Type")
-                                .ifPresentOrElse(type -> assertEquals(type, "text/html"),
+                                .ifPresentOrElse(type -> assertEquals("text/html", type),
                                         () -> fail("Content-Type not present"));
                         assertTrue(response.body().contains("404 Not Found"));
                     })
@@ -151,8 +153,8 @@ public class OfflineTesting {
             client.sendAsync(request, BodyHandlers.ofString())
                     .thenAccept(response -> {
                         System.out.println("response: " + response);
-                        assertEquals(response.statusCode(), 200);
-                        assertEquals(response.body(), "Hello World");
+                        assertEquals(200, response.statusCode());
+                        assertEquals("Hello World", response.body());
                     })
                     .join();
         }
@@ -172,8 +174,8 @@ public class OfflineTesting {
 
             HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
             System.out.println("response: " + response);
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "Hello chegar!!");
+            assertEquals(200, response.statusCode());
+            assertEquals("Hello chegar!!", response.body());
         }
     }
 
diff --git a/test/jdk/java/net/httpclient/quic/AckElicitingTest.java b/test/jdk/java/net/httpclient/quic/AckElicitingTest.java
index 47fdb935598..7fbc00f9148 100644
--- a/test/jdk/java/net/httpclient/quic/AckElicitingTest.java
+++ b/test/jdk/java/net/httpclient/quic/AckElicitingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,8 +71,6 @@ import jdk.internal.net.quic.QuicTLSEngine;
 import jdk.internal.net.quic.QuicTransportException;
 import jdk.internal.net.quic.QuicTransportParametersConsumer;
 import jdk.test.lib.RandomFactory;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.crypto.AEADBadTagException;
 import javax.net.ssl.SSLParameters;
@@ -80,16 +78,19 @@ import javax.net.ssl.SSLSession;
 
 import static jdk.internal.net.http.quic.frames.QuicFrame.*;
 import static jdk.internal.net.http.quic.frames.ConnectionCloseFrame.CONNECTION_CLOSE_VARIANT;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
 
-/**
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/*
  * @test
  * @summary tests the logic to decide whether a packet or
  *          a frame is ACK-eliciting.
  * @library /test/lib
- * @run testng AckElicitingTest
- * @run testng/othervm -Dseed=-7997973196290088038 AckElicitingTest
+ * @run junit AckElicitingTest
+ * @run junit/othervm -Dseed=-7997973196290088038 AckElicitingTest
  */
 public class AckElicitingTest {
 
@@ -307,7 +308,7 @@ public class AckElicitingTest {
      *                 {@code obj.ackEliciting()}
      * @param <T> A concrete subclass of {@link QuicFrame} or {@link QuicPacket}
      */
-    static record TestCase<T>(Class<? extends T> type,
+    record TestCase<T>(Class<? extends T> type,
                        Function<T, String> describer,
                        Predicate<? super T> ackEliciting,
                        T obj,
@@ -336,7 +337,7 @@ public class AckElicitingTest {
          */
         public static <T extends QuicFrame> TestCase<T>
                     of(Class<? extends T> type, T frame, boolean expected) {
-            return new TestCase<T>(type, TestCase::describeFrame,
+            return new TestCase<>(type, TestCase::describeFrame,
                     QuicFrame::isAckEliciting, frame, expected);
         }
 
@@ -349,7 +350,7 @@ public class AckElicitingTest {
          * @return a new instance of {@code TestCase}
          */
         public static <T extends QuicFrame> TestCase<T> of(T frame, boolean expected) {
-            return new TestCase<T>((Class<T>)frame.getClass(),
+            return new TestCase<>((Class<T>)frame.getClass(),
                     TestCase::describeFrame,
                     QuicFrame::isAckEliciting,
                     frame, expected);
@@ -391,7 +392,7 @@ public class AckElicitingTest {
      * @param <T> a concrete subclass of {@code QuicFrame}
      * @return a new instance of the given concrete class.
      */
-    <T extends QuicFrame> T newFrame(Class<T> frameClass) {
+    static <T extends QuicFrame> T newFrame(Class<T> frameClass) {
         var frameType = QuicFrame.frameTypeOf(frameClass);
         if (frameType == CONNECTION_CLOSE) {
             if (RANDOM.nextBoolean()) {
@@ -454,7 +455,7 @@ public class AckElicitingTest {
      * @return a list of {@code TestCase} to test all possible concrete
      *         subclasses of {@code QuicFrame}
      */
-    public List<TestCase<? extends QuicFrame>> createFramesTests() {
+    static List<TestCase<? extends QuicFrame>> createFramesTests() {
         List<TestCase<? extends QuicFrame>> frames = new ArrayList<>();
         frames.add(of(newFrame(AckFrame.class), false));
         frames.add(of(newFrame(ConnectionCloseFrame.class), false));
@@ -476,7 +477,7 @@ public class AckElicitingTest {
      * @param frames a list of frames
      * @return a new instance of {@code QuicPacket}
      */
-    QuicPacket createPacket(List<QuicFrame> frames) {
+    static QuicPacket createPacket(List<QuicFrame> frames) {
         PacketType[] values = PacketType.values();
         int index = PacketType.NONE.ordinal();
         while (index == PacketType.NONE.ordinal()) {
@@ -506,9 +507,9 @@ public class AckElicitingTest {
      * pseudo random list of concrete {@link QuicFrame} instances.
      * @param ackEliciting whether the returned packet should be
      *                     ack eliciting.
-     * @return
+     * @return a new QuicPacket
      */
-    QuicPacket createPacket(boolean ackEliciting) {
+    static QuicPacket createPacket(boolean ackEliciting) {
         List<QuicFrame> frames = new ArrayList<>();
         int mincount = ackEliciting ? 1 : 0;
         int ackCount = RANDOM.nextInt(mincount, 5);
@@ -542,7 +543,7 @@ public class AckElicitingTest {
         return createPacket(mergeConsecutivePaddingFrames(frames));
     }
 
-    private List<QuicFrame> mergeConsecutivePaddingFrames(List<QuicFrame> frames) {
+    private static List<QuicFrame> mergeConsecutivePaddingFrames(List<QuicFrame> frames) {
         var iterator = frames.listIterator();
         QuicFrame previous = null;
 
@@ -567,7 +568,7 @@ public class AckElicitingTest {
      * @return a list of {@code TestCase} to test random instances of
      *         {@code QuicPacket} containing random instances of {@link QuicFrame}
      */
-    public List<TestCase<? extends QuicPacket>> createPacketsTests() {
+    static List<TestCase<? extends QuicPacket>> createPacketsTests() {
         List<TestCase<? extends QuicPacket>> packets = new ArrayList<>();
         packets.add(of(createPacket(List.of(newFrame(AckFrame.class))), false));
         packets.add(of(createPacket(List.of(newFrame(ConnectionCloseFrame.class))), false));
@@ -593,8 +594,7 @@ public class AckElicitingTest {
      * @return test case to test
      *        {@link QuicFrame#isAckEliciting()}
      */
-    @DataProvider(name = "frames")
-    public Object[][] framesDataProvider() {
+    public static Object[][] framesDataProvider() {
         return createFramesTests().stream()
                 .map(List::of)
                 .map(List::toArray)
@@ -607,8 +607,7 @@ public class AckElicitingTest {
      * @return test case to test
      *        {@link QuicPacket#isAckEliciting()}
      */
-    @DataProvider(name = "packets")
-    public Object[][] packetsDataProvider() {
+    public static Object[][] packetsDataProvider() {
         return createPacketsTests().stream()
                 .map(List::of)
                 .map(List::toArray)
@@ -621,8 +620,9 @@ public class AckElicitingTest {
      * @param test the test inputs
      * @param <T> a concrete subclass of QuicFrame
      */
-    @Test(dataProvider = "frames")
-    public <T extends QuicFrame> void testFrames(TestCase<T> test) {
+    @ParameterizedTest
+    @MethodSource("framesDataProvider")
+    <T extends QuicFrame> void testFrames(TestCase<T> test) {
         testAckEliciting(test.type(),
                 test.describer(),
                 test.ackEliciting(),
@@ -636,8 +636,9 @@ public class AckElicitingTest {
      * @param test the test inputs
      * @param <T> a concrete subclass of QuickPacket
      */
-    @Test(dataProvider = "packets")
-    public <T extends QuicPacket> void testPackets(TestCase<T> test) {
+    @ParameterizedTest
+    @MethodSource("packetsDataProvider")
+    <T extends QuicPacket> void testPackets(TestCase<T> test) {
         testAckEliciting(test.type(),
                 test.describer(),
                 test.ackEliciting(),
@@ -664,7 +665,7 @@ public class AckElicitingTest {
                 type.getSimpleName(),
                 describer.apply(obj),
                 expected);
-        assertEquals(ackEliciting.test(obj), expected, describer.apply(obj));
+        assertEquals(expected, ackEliciting.test(obj), describer.apply(obj));
         if (obj instanceof QuicFrame frame) {
             checkFrame(frame);
         } else if (obj instanceof QuicPacket packet) {
@@ -695,10 +696,10 @@ public class AckElicitingTest {
         System.out.printf("Comparing frames: %s with %s%n",
                 decoded.getClass().getSimpleName(),
                 expected.getClass().getSimpleName());
-        assertEquals(decoded.getClass(), expected.getClass());
-        assertEquals(decoded.size(), expected.size());
-        assertEquals(decoded.getTypeField(), expected.getTypeField());
-        assertEquals(decoded.isAckEliciting(), expected.isAckEliciting());
+        assertEquals(expected.getClass(), decoded.getClass());
+        assertEquals(expected.size(), decoded.size());
+        assertEquals(expected.getTypeField(), decoded.getTypeField());
+        assertEquals(expected.isAckEliciting(), decoded.isAckEliciting());
     }
 
     // This is not a full-fledged test for packet encoding/decoding.
@@ -714,13 +715,13 @@ public class AckElicitingTest {
             encoder.encode(packet, buffer, CONTEXT);
             buffer.flip();
             var decoded = decoder.decode(buffer, CONTEXT);
-            assertEquals(decoded.size(), packet.size());
-            assertEquals(decoded.packetType(), packet.packetType());
-            assertEquals(decoded.payloadSize(), packet.payloadSize());
-            assertEquals(decoded.isAckEliciting(), packet.isAckEliciting());
+            assertEquals(packet.size(), decoded.size());
+            assertEquals(packet.packetType(), decoded.packetType());
+            assertEquals(packet.payloadSize(), decoded.payloadSize());
+            assertEquals(packet.isAckEliciting(), decoded.isAckEliciting());
             var frames = packet.frames();
             var decodedFrames = decoded.frames();
-            assertEquals(decodedFrames.size(), frames.size());
+            assertEquals(frames.size(), decodedFrames.size());
         } catch (Exception x) {
             throw new AssertionError(packet.getClass().getName(), x);
         }
diff --git a/test/jdk/java/net/httpclient/quic/AckFrameTest.java b/test/jdk/java/net/httpclient/quic/AckFrameTest.java
index 129394f126c..3c8c027e73b 100644
--- a/test/jdk/java/net/httpclient/quic/AckFrameTest.java
+++ b/test/jdk/java/net/httpclient/quic/AckFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,20 +21,12 @@
  * questions.
  */
 
-import jdk.internal.net.http.quic.CodingContext;
 import jdk.internal.net.http.quic.frames.AckFrame;
 import jdk.internal.net.http.quic.frames.AckFrame.AckFrameBuilder;
 import jdk.internal.net.http.quic.frames.AckFrame.AckRange;
 import jdk.internal.net.http.quic.frames.QuicFrame;
-import jdk.internal.net.http.quic.packets.QuicPacket;
-import jdk.internal.net.http.quic.packets.QuicPacket.PacketNumberSpace;
-import jdk.internal.net.http.quic.QuicConnectionId;
-import jdk.internal.net.quic.QuicTLSEngine;
 import jdk.test.lib.RandomFactory;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,66 +35,24 @@ import java.util.Random;
 import java.util.function.LongPredicate;
 import java.util.stream.LongStream;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
+/*
  * @test
  * @summary tests the logic to build an AckFrame
  * @library /test/lib
- * @run testng AckFrameTest
+ * @run junit AckFrameTest
  */
 public class AckFrameTest {
 
     static final Random RANDOM = RandomFactory.getRandom();
 
-    private static abstract class TestCodingContext implements CodingContext {
-        TestCodingContext() { }
-        @Override
-        public int writePacket(QuicPacket packet, ByteBuffer buffer) {
-            throw new AssertionError("should not come here!");
-        }
-        @Override
-        public QuicPacket parsePacket(ByteBuffer src) throws IOException {
-            throw new AssertionError("should not come here!");
-        }
-        @Override
-        public boolean verifyToken(QuicConnectionId destinationID, byte[] token) {
-            return true;
-        }
-        @Override
-        public QuicTLSEngine getTLSEngine() {
-            throw new AssertionError("should not come here!");
-        }
-    }
-
-    static final int CIDLEN = RANDOM.nextInt(5, QuicConnectionId.MAX_CONNECTION_ID_LENGTH + 1);
-
-    private static final TestCodingContext CONTEXT = new TestCodingContext() {
-
-        @Override
-        public long largestProcessedPN(PacketNumberSpace packetSpace) {
-            return 0;
-        }
-
-        @Override
-        public long largestAckedPN(PacketNumberSpace packetSpace) {
-            return 0;
-        }
-
-        @Override
-        public int connectionIdLength() {
-            return CIDLEN;
-        }
-
-        @Override
-        public QuicConnectionId originalServerConnId() {
-            return null;
-        }
-    };
-
-    public static record Acknowledged(long first, long last) {
+    public record Acknowledged(long first, long last) {
         public boolean contains(long packet) {
             return first <= packet && last >= packet;
         }
@@ -116,7 +66,7 @@ public class AckFrameTest {
             return List.copyOf(res);
         }
     }
-    public static record Packet(long packetNumber) {
+    public record Packet(long packetNumber) {
         static List<Packet> ofAcks(List<Acknowledged> acks) {
             return packets(acks);
         }
@@ -125,7 +75,7 @@ public class AckFrameTest {
         }
     }
 
-    public static record TestCase(List<Acknowledged> acks, List<Packet> packets, boolean shuffled) {
+    public record TestCase(List<Acknowledged> acks, List<Packet> packets, boolean shuffled) {
         public TestCase(List<Acknowledged> acks) {
             this(acks, Packet.ofAcks(acks), false);
         }
@@ -137,7 +87,7 @@ public class AckFrameTest {
         }
     }
 
-    List<TestCase> generateTests() {
+    static List<TestCase> generateTests() {
         List<TestCase> tests = new ArrayList<>();
         List<TestCase> simples = List.of(
                 new TestCase(List.of(new Acknowledged(5,5))),
@@ -177,7 +127,7 @@ public class AckFrameTest {
         return tests;
     }
 
-    List<Acknowledged> generateAcks() {
+    static List<Acknowledged> generateAcks() {
         int count = RANDOM.nextInt(3, 10);
         List<Acknowledged> acks = new ArrayList<>(count);
         long prev = -1;
@@ -202,22 +152,19 @@ public class AckFrameTest {
         return res;
     }
 
-    @DataProvider(name = "tests")
-    public Object[][] tests() {
+    public static Object[][] tests() {
         return generateTests().stream()
                 .map(List::of)
                 .map(List::toArray)
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "tests")
+    @ParameterizedTest
+    @MethodSource("tests")
     public void testAckFrames(TestCase testCase) {
         AckFrameBuilder builder = new AckFrameBuilder();
         List<Acknowledged> acks = testCase.acks;
         List<Packet> packets = testCase.packets;
-        long largest = packets.stream()
-                .mapToLong(Packet::packetNumber)
-                .max().getAsLong();
         System.out.printf("%ntestAckFrames(%s, %s)%n", acks, testCase.shuffled);
         builder.ackDelay(250);
         packets.stream().mapToLong(Packet::packetNumber).forEach(builder::addAck);
@@ -227,8 +174,8 @@ public class AckFrameTest {
         checkAcknowledging(builder::isAcknowledging, testCase, packets);
 
         AckFrameBuilder dup = new AckFrameBuilder(frame);
-        assertEquals(frame, dup.build());
-        assertEquals(frame, builder.build());
+        assertEquals(dup.build(), frame);
+        assertEquals(builder.build(), frame);
         checkAcknowledging(dup::isAcknowledging, testCase, packets);
 
         packets.stream().mapToLong(Packet::packetNumber).forEach(builder::addAck);
@@ -255,25 +202,25 @@ public class AckFrameTest {
         long largest = testCase.packets.stream()
                 .mapToLong(Packet::packetNumber)
                 .max().getAsLong();
-        assertEquals(frame.largestAcknowledged(), largest);
+        assertEquals(largest, frame.largestAcknowledged());
         checkAcknowledging(frame::isAcknowledging, testCase, packets);
         for (var ack : testCase.acks) {
             checkRangeAcknowledged(frame, ack.first, ack.last);
         }
-        assertEquals(frame, reference);
+        assertEquals(reference, frame);
         int size = frame.size();
         ByteBuffer buffer = ByteBuffer.allocate(size + 10);
         buffer.position(5);
         buffer.limit(size + 5);
         try {
             frame.encode(buffer);
-            assertEquals(buffer.position(), buffer.limit());
+            assertEquals(buffer.limit(), buffer.position());
             buffer.position(5);
             buffer.limit(buffer.capacity());
             var decoded = QuicFrame.decode(buffer);
-            assertEquals(buffer.position(), size + 5);
-            assertEquals(decoded, frame);
-            assertEquals(decoded, reference);
+            assertEquals(size + 5, buffer.position());
+            assertEquals(frame, decoded);
+            assertEquals(reference, decoded);
         } catch (Exception e) {
             throw new AssertionError("Can't encode or decode frame: " + frame, e);
         }
@@ -327,14 +274,14 @@ public class AckFrameTest {
             if (isAcknowledging != expected && testCase.shuffled) {
                 System.out.printf("   -> %s%n", packets);
             }
-            assertEquals(isAcknowledging, expected, String.valueOf(pn));
+            assertEquals(expected, isAcknowledging, String.valueOf(pn));
         }
         for (var p : testCase.packets) {
             boolean isAcknowledging = isAckPredicate.test(p.packetNumber);
             if (!isAcknowledging && testCase.shuffled) {
                 System.out.printf("   -> %s%n", packets);
             }
-            assertEquals(isAcknowledging, true, p.toString());
+            assertEquals(true, isAcknowledging, p.toString());
         }
     }
 
@@ -345,9 +292,9 @@ public class AckFrameTest {
         assertTrue(frame.isAcknowledging(1), "1 should be acked");
         assertFalse(frame.isAcknowledging(0), "0 should not be acked");
         assertFalse(frame.isAcknowledging(2), "2 should not be acked");
-        assertEquals(frame.smallestAcknowledged(), 1);
-        assertEquals(frame.largestAcknowledged(), 1);
-        assertEquals(frame.acknowledged().toArray(), new long[] {1L});
+        assertEquals(1, frame.smallestAcknowledged());
+        assertEquals(1, frame.largestAcknowledged());
+        assertEquals(List.of(1L), frame.acknowledged().boxed().toList());
         assertTrue(frame.isRangeAcknowledged(1,1), "[1,1] should be acked");
         assertFalse(frame.isRangeAcknowledged(0, 1), "[0,1] should not be acked");
         assertFalse(frame.isRangeAcknowledged(1, 2), "[1,2] should not be acked");
@@ -358,9 +305,9 @@ public class AckFrameTest {
         assertTrue(frame.isAcknowledging(1), "1 should be acked");
         assertTrue(frame.isAcknowledging(0), "0 should be acked");
         assertFalse(frame.isAcknowledging(2), "2 should not be acked");
-        assertEquals(frame.smallestAcknowledged(), 0);
-        assertEquals(frame.largestAcknowledged(), 1);
-        assertEquals(frame.acknowledged().toArray(), new long[] {1L, 0L});
+        assertEquals(0, frame.smallestAcknowledged());
+        assertEquals(1, frame.largestAcknowledged());
+        assertEquals(List.of(1L, 0L), frame.acknowledged().boxed().toList());
         assertTrue(frame.isRangeAcknowledged(0,0), "[0,0] should be acked");
         assertTrue(frame.isRangeAcknowledged(1,1), "[1,1] should be acked");
         assertTrue(frame.isRangeAcknowledged(0, 1), "[0,1] should be acked");
diff --git a/test/jdk/java/net/httpclient/quic/BuffersReaderVLTest.java b/test/jdk/java/net/httpclient/quic/BuffersReaderVLTest.java
index 5064bbd5cb3..100a6112de5 100644
--- a/test/jdk/java/net/httpclient/quic/BuffersReaderVLTest.java
+++ b/test/jdk/java/net/httpclient/quic/BuffersReaderVLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,29 +27,26 @@ import java.util.List;
 import jdk.internal.net.http.quic.BuffersReader;
 import jdk.internal.net.http.quic.BuffersReader.ListBuffersReader;
 import jdk.internal.net.http.quic.VariableLengthEncoder;
-import jtreg.SkippedException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @library /test/lib
  * @modules java.net.http/jdk.internal.net.http.quic
- * @run testng/othervm BuffersReaderVLTest
+ * @run junit/othervm BuffersReaderVLTest
  * @summary Tests to check quic/util methods encode/decodeVariableLength methods
  *  work as expected.
  */
 public class BuffersReaderVLTest {
     static final Class<? extends Throwable> IAE = IllegalArgumentException.class;
 
-    @DataProvider(name = "decode invariants")
-    public Object[][] decodeInvariants() {
+    public static Object[][] decodeInvariants() {
         return new Object[][]
             {
                 { new byte[]{7},                                                        7, 1 }, // 00
@@ -61,8 +58,7 @@ public class BuffersReaderVLTest {
                 { new byte[]{-65},                                                     -1, 0 },
             };
     }
-    @DataProvider(name = "prefix invariants")
-    public Object[][] prefixInvariants() {
+    public static Object[][] prefixInvariants() {
         return new Object[][]
             {
                 { Long.MAX_VALUE,          0, IAE  },
@@ -101,44 +97,47 @@ public class BuffersReaderVLTest {
             };
     }
 
-    @Test(dataProvider = "decode invariants")
+    @ParameterizedTest
+    @MethodSource("decodeInvariants")
     public void testDecode(byte[] values, long expectedLength, int expectedPosition) {
         ByteBuffer bb = ByteBuffer.wrap(values);
         BuffersReader br = BuffersReader.list(bb);
         var actualLength = VariableLengthEncoder.decode(br);
-        assertEquals(actualLength, expectedLength);
+        assertEquals(expectedLength, actualLength);
 
         var actualPosition = bb.position();
-        assertEquals(actualPosition, expectedPosition);
-        assertEquals(br.position(), expectedPosition);
+        assertEquals(expectedPosition, actualPosition);
+        assertEquals(expectedPosition, br.position());
         br.release();
-        assertEquals(br.read(), expectedPosition);
+        assertEquals(expectedPosition, br.read());
     }
 
-    @Test(dataProvider = "decode invariants")
+    @ParameterizedTest
+    @MethodSource("decodeInvariants")
     public void testPeek(byte[] values, long expectedLength, int expectedPosition) {
         ByteBuffer bb = ByteBuffer.wrap(values);
         BuffersReader br = BuffersReader.list(bb);
         var actualLength = VariableLengthEncoder.peekEncodedValue(br, 0);
-        assertEquals(actualLength, expectedLength);
+        assertEquals(expectedLength, actualLength);
 
         var actualPosition = bb.position();
-        assertEquals(actualPosition, 0);
-        assertEquals(br.position(), 0);
+        assertEquals(0, actualPosition);
+        assertEquals(0, br.position());
         br.release();
-        assertEquals(br.read(), 0);
+        assertEquals(0, br.read());
     }
 
     // Encode the given length and then decodes it and compares
     // the results, asserting various invariants along the way.
-    @Test(dataProvider = "prefix invariants")
+    @ParameterizedTest
+    @MethodSource("prefixInvariants")
     public void testEncodeDecode(long length, int expectedPrefix,  Class<? extends Exception> exception) {
         if (exception != null) {
             assertThrows(exception, () -> VariableLengthEncoder.getEncodedSize(length));
             assertThrows(exception, () -> VariableLengthEncoder.encode(ByteBuffer.allocate(16), length));
         } else {
             var actualSize = VariableLengthEncoder.getEncodedSize(length);
-            assertEquals(actualSize, 1 << expectedPrefix);
+            assertEquals(1 << expectedPrefix, actualSize);
             assertTrue(actualSize > 0, "length is negative or zero: " + actualSize);
             assertTrue(actualSize < 9, "length is too big: " + actualSize);
 
@@ -158,33 +157,33 @@ public class BuffersReaderVLTest {
                 longer.position(offset);
 
                 // attempt to encode with a buffer too short
-                expectThrows(IAE, () -> VariableLengthEncoder.encode(shorter, length));
-                assertEquals(shorter.position(), offset);
-                assertEquals(shorter.limit(), shorter.capacity());
+                assertThrows(IAE, () -> VariableLengthEncoder.encode(shorter, length));
+                assertEquals(offset, shorter.position());
+                assertEquals(shorter.capacity(), shorter.limit());
 
-                assertEquals(shorter.mismatch(shorterref), -1);
-                assertEquals(shorterref.mismatch(shorter), -1);
+                assertEquals(-1, shorter.mismatch(shorterref));
+                assertEquals(-1, shorterref.mismatch(shorter));
 
                 // attempt to encode with a buffer that has the exact size
                 var exactres = VariableLengthEncoder.encode(exact, length);
-                assertEquals(exactres, actualSize);
-                assertEquals(exact.position(), actualSize + offset);
+                assertEquals(actualSize, exactres);
+                assertEquals(actualSize + offset, exact.position());
                 assertFalse(exact.hasRemaining());
 
                 // attempt to encode with a buffer that has more bytes
                 var longres = VariableLengthEncoder.encode(longer, length);
-                assertEquals(longres, actualSize);
-                assertEquals(longer.position(), offset + actualSize);
-                assertEquals(longer.limit(), longer.capacity());
-                assertEquals(longer.remaining(), 10);
+                assertEquals(actualSize, longres);
+                assertEquals(offset + actualSize, longer.position());
+                assertEquals(longer.capacity(), longer.limit());
+                assertEquals(10, longer.remaining());
 
                 // compare encodings
 
                 // first reset buffer positions for reading.
                 exact.position(offset);
                 longer.position(offset);
-                assertEquals(longer.mismatch(exact), actualSize);
-                assertEquals(exact.mismatch(longer), actualSize);
+                assertEquals(actualSize, longer.mismatch(exact));
+                assertEquals(actualSize, exact.mismatch(longer));
 
                 // decode with a buffer that is missing the last
                 // byte...
@@ -193,23 +192,23 @@ public class BuffersReaderVLTest {
                 shortSlice.limit(offset + actualSize -1);
                 ListBuffersReader br = BuffersReader.list(shortSlice);
                 var actualLength = VariableLengthEncoder.decode(br);
-                assertEquals(actualLength, -1L);
-                assertEquals(shortSlice.position(), offset);
-                assertEquals(shortSlice.limit(), offset + actualSize - 1);
-                assertEquals(br.position(), offset);
-                assertEquals(br.limit(), offset + actualSize - 1);
+                assertEquals(-1L, actualLength);
+                assertEquals(offset, shortSlice.position());
+                assertEquals(offset + actualSize - 1, shortSlice.limit());
+                assertEquals(offset, br.position());
+                assertEquals(offset + actualSize - 1, br.limit());
                 br.release();
 
                 // decode with the exact buffer
                 br = BuffersReader.list(exact);
                 actualLength = VariableLengthEncoder.decode(br);
-                assertEquals(actualLength, length);
-                assertEquals(exact.position(), offset + actualSize);
+                assertEquals(length, actualLength);
+                assertEquals(offset + actualSize, exact.position());
                 assertFalse(exact.hasRemaining());
-                assertEquals(br.position(), offset + actualSize);
+                assertEquals(offset + actualSize, br.position());
                 assertFalse(br.hasRemaining());
                 br.release();
-                assertEquals(br.read(), actualSize);
+                assertEquals(actualSize, br.read());
                 assertFalse(br.hasRemaining());
 
 
@@ -217,14 +216,14 @@ public class BuffersReaderVLTest {
                 long read = br.read();
                 br.add(longer);
                 actualLength = VariableLengthEncoder.decode(br);
-                assertEquals(actualLength, length);
-                assertEquals(longer.position(), offset + actualSize);
-                assertEquals(longer.remaining(), 10);
-                assertEquals(br.position(), offset + actualSize);
-                assertEquals(br.remaining(), 10);
+                assertEquals(length, actualLength);
+                assertEquals(offset + actualSize, longer.position());
+                assertEquals(10, longer.remaining());
+                assertEquals(offset + actualSize, br.position());
+                assertEquals(10, br.remaining());
                 br.release();
-                assertEquals(br.read() - read, actualSize);
-                assertEquals(br.remaining(), 10);
+                assertEquals(actualSize, br.read() - read);
+                assertEquals(10, br.remaining());
             }
 
         }
@@ -232,7 +231,8 @@ public class BuffersReaderVLTest {
 
     // Encode the given length and then peeks it and compares
     // the results, asserting various invariants along the way.
-    @Test(dataProvider = "prefix invariants")
+    @ParameterizedTest
+    @MethodSource("prefixInvariants")
     public void testEncodePeek(long length, int expectedPrefix,  Class<? extends Exception> exception) {
         if (exception != null) {
             assertThrows(exception, () -> VariableLengthEncoder.getEncodedSize(length));
@@ -241,7 +241,7 @@ public class BuffersReaderVLTest {
         }
 
         var actualSize = VariableLengthEncoder.getEncodedSize(length);
-        assertEquals(actualSize, 1 << expectedPrefix);
+        assertEquals(1 << expectedPrefix, actualSize);
         assertTrue(actualSize > 0, "length is negative or zero: " + actualSize);
         assertTrue(actualSize < 9, "length is too big: " + actualSize);
 
@@ -258,24 +258,24 @@ public class BuffersReaderVLTest {
 
             // attempt to encode with a buffer that has the exact size
             var exactres = VariableLengthEncoder.encode(exact, length);
-            assertEquals(exactres, actualSize);
-            assertEquals(exact.position(), actualSize + offset);
+            assertEquals(actualSize, exactres);
+            assertEquals(actualSize + offset, exact.position());
             assertFalse(exact.hasRemaining());
 
             // attempt to encode with a buffer that has more bytes
             var longres = VariableLengthEncoder.encode(longer, length);
-            assertEquals(longres, actualSize);
-            assertEquals(longer.position(), offset + actualSize);
-            assertEquals(longer.limit(), longer.capacity());
-            assertEquals(longer.remaining(), 10);
+            assertEquals(actualSize, longres);
+            assertEquals(offset + actualSize, longer.position());
+            assertEquals(longer.capacity(), longer.limit());
+            assertEquals(10, longer.remaining());
 
             // compare encodings
 
             // first reset buffer positions for reading.
             exact.position(offset);
             longer.position(offset);
-            assertEquals(longer.mismatch(exact), actualSize);
-            assertEquals(exact.mismatch(longer), actualSize);
+            assertEquals(actualSize, longer.mismatch(exact));
+            assertEquals(actualSize, exact.mismatch(longer));
             exact.position(0);
             longer.position(0);
             exact.limit(exact.capacity());
@@ -288,38 +288,26 @@ public class BuffersReaderVLTest {
             shortSlice.limit(offset + actualSize - 1);
             // need at least one byte to decode the size len...
             var expectedSize = shortSlice.limit() <= offset ? -1 : actualSize;
-            assertEquals(VariableLengthEncoder.peekEncodedValueSize(shortSlice, offset), expectedSize);
+            assertEquals(expectedSize, VariableLengthEncoder.peekEncodedValueSize(shortSlice, offset));
             var actualLength = VariableLengthEncoder.peekEncodedValue(shortSlice, offset);
-            assertEquals(actualLength, -1L);
-            assertEquals(shortSlice.position(), 0);
-            assertEquals(shortSlice.limit(), offset + actualSize - 1);
+            assertEquals(-1L, actualLength);
+            assertEquals(0, shortSlice.position());
+            assertEquals(offset + actualSize - 1, shortSlice.limit());
 
             // decode with the exact buffer
-            assertEquals(VariableLengthEncoder.peekEncodedValueSize(exact, offset), actualSize);
+            assertEquals(actualSize, VariableLengthEncoder.peekEncodedValueSize(exact, offset));
             actualLength = VariableLengthEncoder.peekEncodedValue(exact, offset);
-            assertEquals(actualLength, length);
-            assertEquals(exact.position(), 0);
-            assertEquals(exact.limit(), exact.capacity());
+            assertEquals(length, actualLength);
+            assertEquals(0, exact.position());
+            assertEquals(exact.capacity(), exact.limit());
 
             // decode with the longer buffer
-            assertEquals(VariableLengthEncoder.peekEncodedValueSize(longer, offset), actualSize);
+            assertEquals(actualSize, VariableLengthEncoder.peekEncodedValueSize(longer, offset));
             actualLength = VariableLengthEncoder.peekEncodedValue(longer, offset);
-            assertEquals(actualLength, length);
-            assertEquals(longer.position(), 0);
-            assertEquals(longer.limit(), longer.capacity());
+            assertEquals(length, actualLength);
+            assertEquals(0, longer.position());
+            assertEquals(longer.capacity(), longer.limit());
         }
 
     }
-
-
-    private ByteBuffer getTestBuffer(long length, int capacity) {
-        return switch (capacity) {
-            case 0 -> ByteBuffer.allocate(1).put((byte) length);
-            case 1 -> ByteBuffer.allocate(capacity).put((byte) length);
-            case 2 -> ByteBuffer.allocate(capacity).putShort((short) length);
-            case 4 -> ByteBuffer.allocate(capacity).putInt((int) length);
-            case 8 -> ByteBuffer.allocate(capacity).putLong(length);
-            default -> throw new SkippedException("bad value used for capacity");
-        };
-    }
 }
diff --git a/test/jdk/java/net/httpclient/quic/ConnectionIDSTest.java b/test/jdk/java/net/httpclient/quic/ConnectionIDSTest.java
index e7fabeeecac..96aeace0898 100644
--- a/test/jdk/java/net/httpclient/quic/ConnectionIDSTest.java
+++ b/test/jdk/java/net/httpclient/quic/ConnectionIDSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,13 @@ import java.util.List;
 import java.util.Map;
 
 import jdk.internal.net.http.quic.QuicConnectionIdFactory;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
 
-/**
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
+/*
  * @test
- * @run testng/othervm ConnectionIDSTest
+ * @run junit/othervm ConnectionIDSTest
  */
 public class ConnectionIDSTest {
 
@@ -76,14 +77,14 @@ public class ConnectionIDSTest {
             int expectedLength = Math.min(length, 20);
             expectedLength = Math.max(9, expectedLength);
             long token = idFactory.newToken();
-            assertEquals(token, previous +1);
+            assertEquals(previous +1, token);
             previous = token;
             var id = idFactory.newConnectionId(length, token);
             var cid = new ConnID(token, id);
             System.out.printf("%s: %s/%s%n", length, token, cid);
-            assertEquals(id.length, expectedLength);
-            assertEquals(idFactory.getConnectionIdLength(id), expectedLength);
-            assertEquals(idFactory.getConnectionIdToken(id), token);
+            assertEquals(expectedLength, id.length);
+            assertEquals(expectedLength, idFactory.getConnectionIdLength(id));
+            assertEquals(token, idFactory.getConnectionIdToken(id));
             ids.add(cid);
         }
 
@@ -101,9 +102,9 @@ public class ConnectionIDSTest {
                 var id = idFactory.newConnectionId(length, token);
                 var cid = new ConnID(expectedToken, id);
                 System.out.printf("%s: %s/%s%n", length, token, cid);
-                assertEquals(id.length, length);
-                assertEquals(idFactory.getConnectionIdLength(id), length);
-                assertEquals(idFactory.getConnectionIdToken(id), expectedToken);
+                assertEquals(length, id.length);
+                assertEquals(length, idFactory.getConnectionIdLength(id));
+                assertEquals(expectedToken, idFactory.getConnectionIdToken(id));
                 ids.add(cid);
             }
         }
@@ -119,15 +120,15 @@ public class ConnectionIDSTest {
                 var id = idFactory.newConnectionId(length, token);
                 var cid = new ConnID(expectedToken, id);
                 System.out.printf("%s: %s/%s%n", length, token, cid);
-                assertEquals(id.length, length);
-                assertEquals(idFactory.getConnectionIdLength(id), length);
-                assertEquals(idFactory.getConnectionIdToken(id), expectedToken);
+                assertEquals(length, id.length);
+                assertEquals(length, idFactory.getConnectionIdLength(id));
+                assertEquals(expectedToken, idFactory.getConnectionIdToken(id));
                 ids.add(cid);
             }
         }
 
         // now verify uniqueness
-        Map<ConnID, ConnID> tested = new HashMap();
+        Map<ConnID, ConnID> tested = new HashMap<>();
         record duplicates(ConnID first, ConnID second) {}
         List<duplicates> duplicates = new ArrayList<>();
         for (var cid : ids) {
@@ -144,9 +145,9 @@ public class ConnectionIDSTest {
         // and the token value is too big; check and remove them
         for (var iter = duplicates.iterator(); iter.hasNext(); ) {
             var dup = iter.next();
-            assertEquals(dup.first.token(), dup.second.token());
-            assertEquals(dup.first.bytes().length, dup.second.bytes().length);
-            assertEquals(dup.first.bytes(), dup.second.bytes());
+            assertEquals(dup.second.token(), dup.first.token());
+            assertEquals(dup.second.bytes().length, dup.first.bytes().length);
+            assertArrayEquals(dup.second.bytes(), dup.first.bytes());
             long mask = 0x00FFFFFF00000000L;
             for (int i=0; i<3; i++) {
                 mask = mask << 8;
@@ -165,6 +166,6 @@ public class ConnectionIDSTest {
         for (var dup : duplicates) {
             System.out.println("unexpected duplicate: " + dup);
         }
-        assertEquals(duplicates.size(), 0);
+        assertEquals(0, duplicates.size());
     }
 }
diff --git a/test/jdk/java/net/httpclient/quic/CryptoWriterQueueTest.java b/test/jdk/java/net/httpclient/quic/CryptoWriterQueueTest.java
index cfc62625605..422d71ca964 100644
--- a/test/jdk/java/net/httpclient/quic/CryptoWriterQueueTest.java
+++ b/test/jdk/java/net/httpclient/quic/CryptoWriterQueueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,18 @@
 
 import jdk.internal.net.http.quic.frames.CryptoFrame;
 import jdk.internal.net.http.quic.streams.CryptoWriterQueue;
-import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
-/**
+/*
  * @test
  * @summary Tests jdk.internal.net.http.quic.streams,CryptoWriterQueue
  * @modules java.net.http/jdk.internal.net.http.quic.streams
  * java.net.http/jdk.internal.net.http.quic.frames
- * @run testng CryptoWriterQueueTest
+ * @run junit CryptoWriterQueueTest
  */
 public class CryptoWriterQueueTest {
 
@@ -54,7 +54,7 @@ public class CryptoWriterQueueTest {
         writerQueue.enqueue(buff2);
         writerQueue.enqueue(buff3);
         final int expectedRemaining = buff1.remaining() + buff2.remaining() + buff3.remaining();
-        assertEquals(writerQueue.remaining(), expectedRemaining,
+        assertEquals(expectedRemaining, writerQueue.remaining(),
                 "Unexpected remaining bytes in CryptoWriterQueue");
         // create frame(s) from the enqueued buffers
         final int maxPayloadSize = 1134;
diff --git a/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java b/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java
index d6d287be9e0..d13b8d9b865 100644
--- a/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java
+++ b/test/jdk/java/net/httpclient/quic/KeyUpdateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,12 +48,14 @@ import jdk.internal.net.quic.QuicKeyUnavailableException;
 import jdk.internal.net.quic.QuicTLSContext;
 import jdk.internal.net.quic.QuicVersion;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+
 import sun.security.ssl.QuicTLSEngineImpl;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -78,22 +80,22 @@ import static org.testng.Assert.assertTrue;
  *        jdk.test.lib.net.SimpleSSLContext
  * @comment the test is run with -Djava.security.properties=<URL> to augment
  *          the master java.security file
- * @run testng/othervm -Djava.security.properties=${test.src}/quic-tls-keylimits-java.security
+ * @run junit/othervm -Djava.security.properties=${test.src}/quic-tls-keylimits-java.security
  *                     -Djdk.internal.httpclient.debug=true
  *                     -Djavax.net.debug=all
  *                     KeyUpdateTest
  */
 public class KeyUpdateTest {
 
-    private QuicStandaloneServer server;
+    private static QuicStandaloneServer server;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private ExecutorService executor;
+    private static ExecutorService executor;
 
     private static final byte[] HELLO_MSG = "Hello Quic".getBytes(StandardCharsets.UTF_8);
     private static final EchoHandler handler = new EchoHandler(HELLO_MSG.length);
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         executor = Executors.newCachedThreadPool();
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
@@ -105,8 +107,8 @@ public class KeyUpdateTest {
         System.out.println("Server started at " + server.getAddress());
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (server != null) {
             System.out.println("Stopping server " + server.getAddress());
             server.close();
@@ -163,7 +165,7 @@ public class KeyUpdateTest {
                 // keep track of the 1-RTT key phase that was used by the client connection
                 final int invocation = i;
                 getKeyPhase(conn.underlyingQuicConnection()).ifPresent((keyPhase) -> {
-                    if (clientConnKeyPhases.empty() || clientConnKeyPhases.peek() != keyPhase) {
+                    if (clientConnKeyPhases.empty() || !keyPhase.equals(clientConnKeyPhases.peek())) {
                         // new key phase detected, add it
                         clientConnKeyPhases.push(keyPhase);
                         System.out.println("Detected client 1-RTT key phase " + keyPhase
@@ -223,7 +225,7 @@ public class KeyUpdateTest {
             // keep track of the 1-RTT key phase that was used by the server connection
             getKeyPhase(conn).ifPresent((keyPhase) -> {
                 if (this.serverConnKeyPhases.empty()
-                        || this.serverConnKeyPhases.peek() != keyPhase) {
+                        || !keyPhase.equals(this.serverConnKeyPhases.peek())) {
                     // new key phase detected, add it
                     this.serverConnKeyPhases.push(keyPhase);
                     System.out.println("Detected server 1-RTT key phase " + keyPhase
diff --git a/test/jdk/java/net/httpclient/quic/OrderedFlowTest.java b/test/jdk/java/net/httpclient/quic/OrderedFlowTest.java
index cb95620c00e..a1fafba8760 100644
--- a/test/jdk/java/net/httpclient/quic/OrderedFlowTest.java
+++ b/test/jdk/java/net/httpclient/quic/OrderedFlowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,24 +37,24 @@ import jdk.internal.net.http.quic.OrderedFlow;
 import jdk.internal.net.http.quic.frames.CryptoFrame;
 import jdk.internal.net.http.quic.frames.QuicFrame;
 import jdk.internal.net.http.quic.frames.StreamFrame;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
+/*
  * @test
  * @summary tests the reordering logic implemented by OrderedFlow
  *          and its two concrete subclasses
  * @library /test/lib
- * @run testng OrderedFlowTest
- * @run testng/othervm -Dseed=-2680947227866359853 OrderedFlowTest
- * @run testng/othervm -Dseed=-273117134353023275 OrderedFlowTest
- * @run testng/othervm -Dseed=3649132517916066643 OrderedFlowTest
- * @run testng/othervm -Dseed=4568737726943220431 OrderedFlowTest
+ * @run junit OrderedFlowTest
+ * @run junit/othervm -Dseed=-2680947227866359853 OrderedFlowTest
+ * @run junit/othervm -Dseed=-273117134353023275 OrderedFlowTest
+ * @run junit/othervm -Dseed=3649132517916066643 OrderedFlowTest
+ * @run junit/othervm -Dseed=4568737726943220431 OrderedFlowTest
  */
 public class OrderedFlowTest {
 
@@ -135,13 +135,13 @@ public class OrderedFlowTest {
             """;
 
     interface FramesFactory<T extends QuicFrame> {
-        public T create(int offset, String payload, boolean fin);
-        public int length(T frame);
-        public long offset(T frame);
-        public String getPayload(T frame);
-        public OrderedFlow<T> flow();
-        public Class<T> frameType();
-        public Comparator<T> comparator();
+        T create(int offset, String payload, boolean fin);
+        int length(T frame);
+        long offset(T frame);
+        String getPayload(T frame);
+        OrderedFlow<T> flow();
+        Class<T> frameType();
+        Comparator<T> comparator();
     }
 
     static class StreamFrameFactory implements FramesFactory<StreamFrame> {
@@ -307,7 +307,7 @@ public class OrderedFlowTest {
     // not be buffered.
     static <T extends QuicFrame> TestData<T> reversed(TestData<T> data) {
         List<T> sorted = new ArrayList<>(data.frames());
-        Collections.sort(sorted, data.framesComparator().reversed());
+        sorted.sort(data.framesComparator().reversed());
         return new TestData<>(data.frameType(),data.flowSupplier(), data.payloadAccessor(),
                 data.framesComparator(), List.copyOf(sorted), data.expectedResult(),
                 data.duplicates(), true);
@@ -336,8 +336,7 @@ public class OrderedFlowTest {
         return List.copyOf(result);
     }
 
-    @DataProvider(name="CryptoFrame")
-    Object[][] generateCryptoFrames() {
+    static Object[][] generateCryptoFrames() {
         return generateData(new CryptoFrameFactory())
                 .stream()
                 .map(List::of)
@@ -345,8 +344,7 @@ public class OrderedFlowTest {
                 .toArray(Object[][]::new);
     }
 
-    @DataProvider(name="StreamFrame")
-    Object[][] generateStreanFrames() {
+    static Object[][] generateStreanFrames() {
         return generateData(new StreamFrameFactory())
                 .stream()
                 .map(List::of)
@@ -380,21 +378,23 @@ public class OrderedFlowTest {
                     "buffered data %s exceeds or equals payload size %s".formatted(buffered, size));
             while (received != null) {
                 var payload = testData.payloadAccessor.apply(received);
-                assertNotEquals(payload, "", "empty frames not expected: " + received);
+                assertNotEquals("", payload, "empty frames not expected: " + received);
                 result.append(payload);
                 received = flow.poll();
             }
         }
-        assertEquals(result.toString(), testData.expectedResult);
+        assertEquals(testData.expectedResult, result.toString());
     }
 
-    @Test(dataProvider = "CryptoFrame")
-    public void testCryptoFlow(TestData<CryptoFrame> testData) {
+    @ParameterizedTest
+    @MethodSource("generateCryptoFrames")
+    void testCryptoFlow(TestData<CryptoFrame> testData) {
         testOrderedFlow(testData, CryptoFrame::offset);
     }
 
-    @Test(dataProvider = "StreamFrame")
-    public void testStreamFlow(TestData<StreamFrame> testData) {
+    @ParameterizedTest
+    @MethodSource("generateStreanFrames")
+    void testStreamFlow(TestData<StreamFrame> testData) {
         testOrderedFlow(testData, StreamFrame::offset);
     }
 
diff --git a/test/jdk/java/net/httpclient/quic/PacerTest.java b/test/jdk/java/net/httpclient/quic/PacerTest.java
index d54f4125a46..aebbbce34d3 100644
--- a/test/jdk/java/net/httpclient/quic/PacerTest.java
+++ b/test/jdk/java/net/httpclient/quic/PacerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,21 @@ import jdk.internal.net.http.quic.QuicCongestionController;
 import jdk.internal.net.http.quic.QuicPacer;
 import jdk.internal.net.http.quic.QuicRttEstimator;
 import jdk.internal.net.http.quic.packets.QuicPacket;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.time.temporal.ChronoUnit;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
- * @run testng/othervm -Djdk.httpclient.quic.timerFrequency=1000 PacerTest
+ * @run junit/othervm -Djdk.httpclient.quic.timerFrequency=1000 PacerTest
  */
 public class PacerTest {
 
@@ -136,8 +137,7 @@ public class PacerTest {
                            int initialPermit, int periodicPermit, boolean slowStart) {
     }
 
-    @DataProvider
-    public Object[][] pacerFirstFlight() {
+    public static Object[][] pacerFirstFlight() {
         return List.of(
                         // Should permit initial window before blocking
                         new TestCase(1200, 10, 32, 16, 10, 4, true),
@@ -150,7 +150,8 @@ public class PacerTest {
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "pacerFirstFlight")
+    @ParameterizedTest
+    @MethodSource("pacerFirstFlight")
     public void testBasicPacing(TestCase test) {
         int maxDatagramSize = test.maxDatagramSize;
         int packetsInIW = test.packetsInIW;
diff --git a/test/jdk/java/net/httpclient/quic/PacketEncodingTest.java b/test/jdk/java/net/httpclient/quic/PacketEncodingTest.java
index 495e8d41403..a96904c8410 100644
--- a/test/jdk/java/net/httpclient/quic/PacketEncodingTest.java
+++ b/test/jdk/java/net/httpclient/quic/PacketEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,6 @@ import jdk.internal.net.http.quic.QuicConnectionId;
 import jdk.internal.net.quic.QuicTLSEngine;
 import jdk.internal.net.quic.QuicTransportParametersConsumer;
 import jdk.internal.net.http.quic.VariableLengthEncoder;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.crypto.AEADBadTagException;
 import javax.net.ssl.SSLParameters;
@@ -71,29 +69,32 @@ import java.util.function.IntFunction;
 import java.util.stream.Collectors;
 
 import static jdk.internal.net.http.quic.packets.QuicPacketNumbers.computePacketNumberLength;
-import static org.testng.Assert.*;
 
-/**
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/*
  * @test
  * @library /test/lib
  * @summary test packet encoding and decoding in unencrypted form and without
  *          any network involvement.
- * @run testng/othervm -Dseed=2646683818688275736 PacketEncodingTest
- * @run testng/othervm -Dseed=-3723256402256409075 PacketEncodingTest
- * @run testng/othervm -Dseed=-3689060484817342283 PacketEncodingTest
- * @run testng/othervm -Dseed=2425718686525936108 PacketEncodingTest
- * @run testng/othervm -Dseed=-2996954753243104355 PacketEncodingTest
- * @run testng/othervm -Dseed=8750823652999067800 PacketEncodingTest
- * @run testng/othervm -Dseed=2906555779406889127 PacketEncodingTest
- * @run testng/othervm -Dseed=902801756808168822 PacketEncodingTest
- * @run testng/othervm -Dseed=5643545543196691308 PacketEncodingTest
- * @run testng/othervm -Dseed=2646683818688275736 PacketEncodingTest
- * @run testng/othervm -Djdk.internal.httpclient.debug=true PacketEncodingTest
+ * @run junit/othervm -Dseed=2646683818688275736 PacketEncodingTest
+ * @run junit/othervm -Dseed=-3723256402256409075 PacketEncodingTest
+ * @run junit/othervm -Dseed=-3689060484817342283 PacketEncodingTest
+ * @run junit/othervm -Dseed=2425718686525936108 PacketEncodingTest
+ * @run junit/othervm -Dseed=-2996954753243104355 PacketEncodingTest
+ * @run junit/othervm -Dseed=8750823652999067800 PacketEncodingTest
+ * @run junit/othervm -Dseed=2906555779406889127 PacketEncodingTest
+ * @run junit/othervm -Dseed=902801756808168822 PacketEncodingTest
+ * @run junit/othervm -Dseed=5643545543196691308 PacketEncodingTest
+ * @run junit/othervm -Dseed=2646683818688275736 PacketEncodingTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true PacketEncodingTest
  */
 public class PacketEncodingTest {
 
-    @DataProvider
-    public Object[][] longHeaderPacketProvider() {
+    public static Object[][] longHeaderPacketProvider() {
         final QuicVersion[] quicVersions = QuicVersion.values();
         final List<Object[]> params = new ArrayList<>();
         for (final QuicVersion version : quicVersions) {
@@ -117,8 +118,7 @@ public class PacketEncodingTest {
         return params.toArray(Object[][]::new);
     }
 
-    @DataProvider
-    public Object[][] shortHeaderPacketProvider() {
+    public static Object[][] shortHeaderPacketProvider() {
         final QuicVersion[] quicVersions = QuicVersion.values();
         final List<Object[]> params = new ArrayList<>();
         for (final QuicVersion version : quicVersions) {
@@ -141,8 +141,7 @@ public class PacketEncodingTest {
         return params.toArray(Object[][]::new);
     }
 
-    @DataProvider
-    public Object[][] versionAndRetryProvider() {
+    public static Object[][] versionAndRetryProvider() {
         final QuicVersion[] quicVersions = QuicVersion.values();
         final List<Object[]> params = new ArrayList<>();
         for (final QuicVersion version : quicVersions) {
@@ -393,23 +392,23 @@ public class PacketEncodingTest {
                                        QuicConnectionId destConnectionId,
                                        List<QuicFrame> payload) {
         // Check created packet
-        assertEquals(packet.headersType(), HeadersType.LONG);
-        assertEquals(packet.packetType(), packetType);
+        assertEquals(HeadersType.LONG, packet.headersType());
+        assertEquals(packetType, packet.packetType());
         boolean hasLength = switch (packetType) {
             case VERSIONS, RETRY -> false;
             default -> true;
         };
-        assertEquals(packet.hasLength(), hasLength);
-        assertEquals(packet.numberSpace(), packetNumberSpace);
+        assertEquals(hasLength, packet.hasLength());
+        assertEquals(packetNumberSpace, packet.numberSpace());
         if (payload == null) {
             assertTrue(packet.frames().isEmpty());
         } else {
-            assertEquals(getBuffers(packet.frames()), getBuffers(payload));
+            assertEquals(getBuffers(payload), getBuffers(packet.frames()));
         }
-        assertEquals(packet.version(), versionNumber);
-        assertEquals(packet.packetNumber(), packetNumber);
-        assertEquals(packet.sourceId(), srcConnectionId);
-        assertEquals(packet.destinationId(), destConnectionId);
+        assertEquals(versionNumber, packet.version());
+        assertEquals(packetNumber, packet.packetNumber());
+        assertEquals(srcConnectionId, packet.sourceId());
+        assertEquals(destConnectionId, packet.destinationId());
 
     }
 
@@ -446,11 +445,11 @@ public class PacketEncodingTest {
                                          PacketType packetType, int versionNumber,
                                          QuicConnectionId srcConnectionId,
                                          QuicConnectionId destConnectionId) {
-        assertEquals(QuicPacketDecoder.peekHeaderType(datagram, offset), HeadersType.LONG);
-        assertEquals(QuicPacketDecoder.of(datagram, offset).peekPacketType(datagram, offset), packetType);
+        assertEquals(HeadersType.LONG, QuicPacketDecoder.peekHeaderType(datagram, offset));
+        assertEquals(packetType, QuicPacketDecoder.of(datagram, offset).peekPacketType(datagram, offset));
         LongHeader header = QuicPacketDecoder.peekLongHeader(datagram, offset);
         assertNotNull(header, "Could not parse packet header");
-        assertEquals(header.version(), versionNumber);
+        assertEquals(versionNumber, header.version());
         assertTrue(header.destinationId()
                 .matches(destConnectionId.asReadOnlyBuffer()), "Destination ID doesn't match");
         assertTrue(header.sourceId()
@@ -494,10 +493,10 @@ public class PacketEncodingTest {
             padding.encode(buf);
         }
         if (insert) {
-            assertEquals(buf.position(), remaining);
-            assertEquals(buf.remaining(), payloadSize - remaining);
+            assertEquals(remaining, buf.position());
+            assertEquals(payloadSize - remaining, buf.remaining());
         } else {
-            assertEquals(buf.remaining(), 0);
+            assertEquals(0, buf.remaining());
         }
         return List.copyOf(frames);
     }
@@ -507,7 +506,7 @@ public class PacketEncodingTest {
         int size = outgoingQuicPacket.size();
         ByteBuffer buffer = ByteBuffer.allocate(size);
         encoder.encode(outgoingQuicPacket, buffer, context);
-        assertEquals(buffer.position(), size, " for " + outgoingQuicPacket);
+        assertEquals(size, buffer.position(), " for " + outgoingQuicPacket);
         buffer.flip();
         return buffer;
     }
@@ -520,33 +519,34 @@ public class PacketEncodingTest {
                                         List<QuicFrame> payload,
                                         int minSize) {
         // Check created packet
-        assertEquals(packet.headersType(), HeadersType.SHORT);
-        assertEquals(packet.packetType(), packetType);
-        assertEquals(packet.hasLength(), false);
-        assertEquals(packet.numberSpace(), packetNumberSpace);
-        assertEquals(getBuffers(packet.frames()), getBuffers(payload, minSize));
-        assertEquals(packet.packetNumber(), packetNumber);
-        assertEquals(packet.destinationId(), destConnectionId);
+        assertEquals(HeadersType.SHORT, packet.headersType());
+        assertEquals(packetType, packet.packetType());
+        assertEquals(false, packet.hasLength());
+        assertEquals(packetNumberSpace, packet.numberSpace());
+        assertEquals(getBuffers(payload, minSize), getBuffers(packet.frames()));
+        assertEquals(packetNumber, packet.packetNumber());
+        assertEquals(destConnectionId, packet.destinationId());
     }
 
     private void checkShortHeaderPacketAt(ByteBuffer datagram, int offset,
                                           PacketType packetType,
                                           QuicConnectionId destConnectionId,
                                           CodingContext context) {
-        assertEquals(QuicPacketDecoder.peekHeaderType(datagram, offset), HeadersType.SHORT);
-        assertEquals(QuicPacketDecoder.of(QuicVersion.QUIC_V1).peekPacketType(datagram, offset), packetType);
-        assertEquals(QuicPacketDecoder.peekVersion(datagram, offset), 0);
+        assertEquals(HeadersType.SHORT, QuicPacketDecoder.peekHeaderType(datagram, offset));
+        assertEquals(packetType, QuicPacketDecoder.of(QuicVersion.QUIC_V1).peekPacketType(datagram, offset));
+        assertEquals(0, QuicPacketDecoder.peekVersion(datagram, offset));
         int pos = datagram.position();
         if (pos != offset) datagram.position(offset);
         try {
-            assertEquals(QuicPacketDecoder.peekShortConnectionId(datagram, destConnectionId.length())
-                    .mismatch(destConnectionId.asReadOnlyBuffer()), -1);
+            assertEquals(-1, QuicPacketDecoder.peekShortConnectionId(datagram, destConnectionId.length())
+                    .mismatch(destConnectionId.asReadOnlyBuffer()));
         } finally {
             if (pos != offset) datagram.position(pos);
         }
     }
 
-    @Test(dataProvider = "longHeaderPacketProvider")
+    @ParameterizedTest
+    @MethodSource("longHeaderPacketProvider")
     public void testInitialPacket(QuicVersion quicVersion, int srcIdLength, int destIdLength,
                                   long packetNumber, long largestAcked) throws Exception {
         System.out.printf("%ntestInitialPacket(qv:%s, scid:%d, dcid:%d, pn:%d, ack:%d)%n",
@@ -557,12 +557,12 @@ public class PacketEncodingTest {
                 .newConnectionId(destIdLength, IDS.incrementAndGet());
         assert destid.length <= 20;
         final QuicConnectionId destConnectionId = new PeerConnectionId(destid);
-        assertEquals(destid.length, destConnectionId.length(), "dcid length");
+        assertEquals(destConnectionId.length(), destid.length, "dcid length");
         destIdLength = destid.length;
 
         byte[] srcid = randomIdBytes(srcIdLength);
         final QuicConnectionId srcConnectionId = new PeerConnectionId(srcid);
-        assertEquals(srcid.length, srcConnectionId.length(), "scid length");
+        assertEquals(srcConnectionId.length(), srcid.length, "scid length");
 
         int bound = MAX_DATAGRAM_IPV6 - srcIdLength - destid.length - 7
                 - QuicPacketNumbers.computePacketNumberLength(packetNumber, largestAcked)
@@ -603,8 +603,8 @@ public class PacketEncodingTest {
 
         byte[] payload = new byte[payloadSize];
         List<QuicFrame> frames = frames(payload, padding != 0);
-        assertEquals(frames.stream().mapToInt(QuicFrame::size)
-                .reduce(0, Math::addExact), payloadSize);
+        assertEquals(payloadSize, frames.stream().mapToInt(QuicFrame::size)
+                .reduce(0, Math::addExact));
 
 
         // Create an initial packet
@@ -626,7 +626,7 @@ public class PacketEncodingTest {
                     largestAcked,
                     frames2,
                     context);
-            assertEquals(padding, padding + (1200 - packet2.size()));
+            assertEquals(padding + (1200 - packet2.size()), padding);
         }
 
         // Check created packet
@@ -640,10 +640,10 @@ public class PacketEncodingTest {
         checkLongHeaderPacket(initialPacket, PacketType.INITIAL, quicVersion.versionNumber(),
                 PacketNumberSpace.INITIAL, packetNumber,
                 srcConnectionId, destConnectionId, frames, padding);
-        assertEquals(initialPacket.tokenLength(), tokenLength);
-        assertEquals(initialPacket.token(), token);
-        assertEquals(initialPacket.hasLength(), true);
-        assertEquals(initialPacket.length(), packetNumberLength + payloadSize + padding);
+        assertEquals(tokenLength, initialPacket.tokenLength());
+        assertEquals(token, initialPacket.token());
+        assertEquals(true, initialPacket.hasLength());
+        assertEquals(packetNumberLength + payloadSize + padding, initialPacket.length());
 
         // Check that peeking at the encoded packet returns correct information
 
@@ -682,9 +682,9 @@ public class PacketEncodingTest {
         datagram.position(0);
         datagram.limit(datagram.capacity());
         decoder.skipPacket(datagram, offset);
-        assertEquals(datagram.position(), second);
+        assertEquals(second, datagram.position());
         decoder.skipPacket(datagram, second);
-        assertEquals(datagram.remaining(), offset);
+        assertEquals(offset, datagram.remaining());
 
         datagram.position(offset);
         int size = second - offset;
@@ -692,23 +692,24 @@ public class PacketEncodingTest {
             int pos = datagram.position();
             System.out.printf("Decoding packet: %d at %d%n", (i+1), pos);
             var decodedPacket = decoder.decode(datagram, context);
-            assertEquals(datagram.position(), pos + size);
+            assertEquals(pos + size, datagram.position());
             assertTrue(decodedPacket instanceof InitialPacket, "decoded: " + decodedPacket);
             InitialPacket initialDecoded = InitialPacket.class.cast(decodedPacket);
             checkLongHeaderPacket(initialDecoded, PacketType.INITIAL, quicVersion.versionNumber(),
                     PacketNumberSpace.INITIAL, packetNumber,
                     srcConnectionId, destConnectionId, frames, padding);
-            assertEquals(decodedPacket.size(), packet.size());
-            assertEquals(decodedPacket.size(), size);
-            assertEquals(initialDecoded.tokenLength(), tokenLength);
-            assertEquals(initialDecoded.token(), token);
-            assertEquals(initialDecoded.length(), initialPacket.length());
-            assertEquals(initialDecoded.length(), packetNumberLength + payloadSize + padding);
+            assertEquals(packet.size(), decodedPacket.size());
+            assertEquals(size, decodedPacket.size());
+            assertEquals(tokenLength, initialDecoded.tokenLength());
+            assertArrayEquals(token, initialDecoded.token());
+            assertEquals(initialPacket.length(), initialDecoded.length());
+            assertEquals(packetNumberLength + payloadSize + padding, initialDecoded.length());
         }
-        assertEquals(datagram.position(), second + second - offset);
+        assertEquals(second + second - offset, datagram.position());
     }
 
-    @Test(dataProvider = "longHeaderPacketProvider")
+    @ParameterizedTest
+    @MethodSource("longHeaderPacketProvider")
     public void testHandshakePacket(QuicVersion quicVersion, int srcIdLength, int destIdLength,
                                   long packetNumber, long largestAcked) throws Exception {
         System.out.printf("%ntestHandshakePacket(qv:%s, scid:%d, dcid:%d, pn:%d, ack:%d)%n",
@@ -757,8 +758,8 @@ public class PacketEncodingTest {
         checkLongHeaderPacket(handshakePacket, PacketType.HANDSHAKE, quicVersion.versionNumber(),
                 PacketNumberSpace.HANDSHAKE, packetNumber,
                 srcConnectionId, destConnectionId, frames);
-        assertEquals(handshakePacket.hasLength(), true);
-        assertEquals(handshakePacket.length(), packetNumberLength + payloadSize);
+        assertEquals(true, handshakePacket.hasLength());
+        assertEquals(packetNumberLength + payloadSize, handshakePacket.length());
 
         // Decode the two packets in the datagram
         // Check that peeking at the encoded packet returns correct information
@@ -797,9 +798,9 @@ public class PacketEncodingTest {
         datagram.position(0);
         datagram.limit(datagram.capacity());
         decoder.skipPacket(datagram, offset);
-        assertEquals(datagram.position(), second);
+        assertEquals(second, datagram.position());
         decoder.skipPacket(datagram, second);
-        assertEquals(datagram.remaining(), offset);
+        assertEquals(offset, datagram.remaining());
 
         datagram.position(offset);
         int size = second - offset;
@@ -807,21 +808,22 @@ public class PacketEncodingTest {
             int pos = datagram.position();
             System.out.printf("Decoding packet: %d at %d%n", (i+1), pos);
             var decodedPacket = decoder.decode(datagram, context);
-            assertEquals(datagram.position(), pos + size);
+            assertEquals(pos + size, datagram.position());
             assertTrue(decodedPacket instanceof HandshakePacket, "decoded: " + decodedPacket);
             HandshakePacket handshakeDecoded = HandshakePacket.class.cast(decodedPacket);
             checkLongHeaderPacket(handshakeDecoded, PacketType.HANDSHAKE, quicVersion.versionNumber(),
                     PacketNumberSpace.HANDSHAKE, packetNumber,
                     srcConnectionId, destConnectionId, frames);
-            assertEquals(decodedPacket.size(), packet.size());
-            assertEquals(decodedPacket.size(), size);
-            assertEquals(handshakeDecoded.length(), handshakePacket.length());
-            assertEquals(handshakeDecoded.length(), packetNumberLength + payloadSize);
+            assertEquals(packet.size(), decodedPacket.size());
+            assertEquals(size, decodedPacket.size());
+            assertEquals(handshakePacket.length(), handshakeDecoded.length());
+            assertEquals(packetNumberLength + payloadSize, handshakeDecoded.length());
         }
-        assertEquals(datagram.position(), second + second - offset);
+        assertEquals(second + second - offset, datagram.position());
     }
 
-    @Test(dataProvider = "longHeaderPacketProvider")
+    @ParameterizedTest
+    @MethodSource("longHeaderPacketProvider")
     public void testZeroRTTPacket(QuicVersion quicVersion, int srcIdLength, int destIdLength,
                                     long packetNumber, long largestAcked) throws Exception {
         System.out.printf("%ntestZeroRTTPacket(qv:%s, scid:%d, dcid:%d, pn:%d, ack:%d)%n",
@@ -870,8 +872,8 @@ public class PacketEncodingTest {
         checkLongHeaderPacket(zeroRttPacket, PacketType.ZERORTT, quicVersion.versionNumber(),
                 PacketNumberSpace.APPLICATION, packetNumber,
                 srcConnectionId, destConnectionId, frames);
-        assertEquals(zeroRttPacket.hasLength(), true);
-        assertEquals(zeroRttPacket.length(), packetNumberLength + payloadSize);
+        assertEquals(true, zeroRttPacket.hasLength());
+        assertEquals(packetNumberLength + payloadSize, zeroRttPacket.length());
 
         // Check that peeking at the encoded packet returns correct information
         ByteBuffer encoded = toByteBuffer(encoder, packet, context);
@@ -909,9 +911,9 @@ public class PacketEncodingTest {
         datagram.position(0);
         datagram.limit(datagram.capacity());
         decoder.skipPacket(datagram, offset);
-        assertEquals(datagram.position(), second);
+        assertEquals(second, datagram.position());
         decoder.skipPacket(datagram, second);
-        assertEquals(datagram.remaining(), offset);
+        assertEquals(offset, datagram.remaining());
 
         // Decode the two packets in the datagram
         datagram.position(offset);
@@ -920,21 +922,22 @@ public class PacketEncodingTest {
             int pos = datagram.position();
             System.out.printf("Decoding packet: %d at %d%n", (i+1), pos);
             var decodedPacket = decoder.decode(datagram, context);
-            assertEquals(datagram.position(), pos + size);
+            assertEquals(pos + size, datagram.position());
             assertTrue(decodedPacket instanceof ZeroRttPacket, "decoded: " + decodedPacket);
             ZeroRttPacket zeroRttDecoded = ZeroRttPacket.class.cast(decodedPacket);
             checkLongHeaderPacket(zeroRttDecoded, PacketType.ZERORTT, quicVersion.versionNumber(),
                     PacketNumberSpace.APPLICATION, packetNumber,
                     srcConnectionId, destConnectionId, frames);
-            assertEquals(decodedPacket.size(), packet.size());
-            assertEquals(decodedPacket.size(), size);
-            assertEquals(zeroRttDecoded.length(), zeroRttPacket.length());
-            assertEquals(zeroRttDecoded.length(), packetNumberLength + payloadSize);
+            assertEquals(packet.size(), decodedPacket.size());
+            assertEquals(size, decodedPacket.size());
+            assertEquals(zeroRttPacket.length(), zeroRttDecoded.length());
+            assertEquals(packetNumberLength + payloadSize, zeroRttDecoded.length());
         }
-        assertEquals(datagram.position(), second + second - offset);
+        assertEquals(second + second - offset, datagram.position());
     }
 
-    @Test(dataProvider = "versionAndRetryProvider")
+    @ParameterizedTest
+    @MethodSource("versionAndRetryProvider")
     public void testVersionNegotiationPacket(QuicVersion quicVersion, int srcIdLength, int destIdLength)
             throws Exception {
         System.out.printf("%ntestVersionNegotiationPacket(qv:%s, scid:%d, dcid:%d, pn:%d, ack:%d)%n",
@@ -965,9 +968,9 @@ public class PacketEncodingTest {
         checkLongHeaderPacket(versionPacket, PacketType.VERSIONS, 0,
                 PacketNumberSpace.NONE, -1,
                 srcConnectionId, destConnectionId, null);
-        assertEquals(versionPacket.hasLength(), false);
-        assertEquals(versionPacket.supportedVersions(),
-                versionList.stream().mapToInt(Integer::intValue).toArray());
+        assertEquals(false, versionPacket.hasLength());
+        assertArrayEquals(versionList.stream().mapToInt(Integer::intValue).toArray(),
+                versionPacket.supportedVersions());
 
         CodingContext context = new TestCodingContext() {
             @Override public long largestProcessedPN(PacketNumberSpace packetSpace) {
@@ -1009,8 +1012,8 @@ public class PacketEncodingTest {
         datagram.position(0);
         datagram.limit(datagram.capacity());
         decoder.skipPacket(datagram, offset);
-        assertEquals(datagram.position(), end);
-        assertEquals(datagram.remaining(), 0);
+        assertEquals(end, datagram.position());
+        assertEquals(0, datagram.remaining());
 
         // Decode the two packets in the datagram
         datagram.position(offset);
@@ -1019,21 +1022,22 @@ public class PacketEncodingTest {
             int pos = datagram.position();
             System.out.printf("Decoding packet: %d at %d%n", (i+1), pos);
             var decodedPacket = decoder.decode(datagram, context);
-            assertEquals(datagram.position(), pos + size);
+            assertEquals(pos + size, datagram.position());
             assertTrue(decodedPacket instanceof VersionNegotiationPacket, "decoded: " + decodedPacket);
             VersionNegotiationPacket decodedVersion = VersionNegotiationPacket.class.cast(decodedPacket);
             checkLongHeaderPacket(decodedVersion, PacketType.VERSIONS, 0,
                     PacketNumberSpace.NONE, -1,
                     srcConnectionId, destConnectionId, null);
-            assertEquals(decodedPacket.size(), packet.size());
-            assertEquals(decodedPacket.size(), size);
-            assertEquals(decodedVersion.supportedVersions(),
-                    versionList.stream().mapToInt(Integer::intValue).toArray());
+            assertEquals(packet.size(), decodedPacket.size());
+            assertEquals(size, decodedPacket.size());
+            assertArrayEquals(versionList.stream().mapToInt(Integer::intValue).toArray(),
+                    decodedVersion.supportedVersions());
         }
-        assertEquals(datagram.position(), end);
+        assertEquals(end, datagram.position());
     }
 
-    @Test(dataProvider = "versionAndRetryProvider")
+    @ParameterizedTest
+    @MethodSource("versionAndRetryProvider")
     public void testRetryPacket(QuicVersion quicVersion, int srcIdLength, int destIdLength)
             throws Exception {
         System.out.printf("%ntestRetryPacket(qv:%s, scid:%d, dcid:%d, pn:%d, ack:%d)%n",
@@ -1067,9 +1071,9 @@ public class PacketEncodingTest {
         checkLongHeaderPacket(retryPacket, PacketType.RETRY, quicVersion.versionNumber(),
                 PacketNumberSpace.NONE, -1,
                 srcConnectionId, destConnectionId, null);
-        assertEquals(retryPacket.hasLength(), false);
-        assertEquals(retryPacket.retryToken(), retryToken);
-        assertEquals(retryPacket.size(), expectedSize);
+        assertEquals(false, retryPacket.hasLength());
+        assertArrayEquals(retryToken, retryPacket.retryToken());
+        assertEquals(expectedSize, retryPacket.size());
 
         CodingContext context = new TestCodingContext() {
             @Override public long largestProcessedPN(PacketNumberSpace packetSpace) {
@@ -1112,8 +1116,8 @@ public class PacketEncodingTest {
         datagram.position(0);
         datagram.limit(datagram.capacity());
         decoder.skipPacket(datagram, offset);
-        assertEquals(datagram.position(), end);
-        assertEquals(datagram.remaining(), 0);
+        assertEquals(end, datagram.position());
+        assertEquals(0, datagram.remaining());
 
         // Decode the two packets in the datagram
         datagram.position(offset);
@@ -1122,21 +1126,22 @@ public class PacketEncodingTest {
             int pos = datagram.position();
             System.out.printf("Decoding packet: %d at %d%n", (i+1), pos);
             var decodedPacket = decoder.decode(datagram, context);
-            assertEquals(datagram.position(), pos + size);
+            assertEquals(pos + size, datagram.position());
             assertTrue(decodedPacket instanceof RetryPacket, "decoded: " + decodedPacket);
             RetryPacket decodedRetry = RetryPacket.class.cast(decodedPacket);
             checkLongHeaderPacket(decodedRetry, PacketType.RETRY, quicVersion.versionNumber(),
                     PacketNumberSpace.NONE, -1,
                     srcConnectionId, destConnectionId, null);
-            assertEquals(decodedPacket.size(), packet.size());
-            assertEquals(decodedPacket.size(), size);
-            assertEquals(decodedPacket.size(), expectedSize);
-            assertEquals(decodedRetry.retryToken(), retryToken);
+            assertEquals(packet.size(), decodedPacket.size());
+            assertEquals(size, decodedPacket.size());
+            assertEquals(expectedSize, decodedPacket.size());
+            assertArrayEquals(retryToken, decodedRetry.retryToken());
         }
-        assertEquals(datagram.position(), end);
+        assertEquals(end, datagram.position());
     }
 
-    @Test(dataProvider = "shortHeaderPacketProvider")
+    @ParameterizedTest
+    @MethodSource("shortHeaderPacketProvider")
     public void testOneRTTPacket(QuicVersion quicVersion, int destIdLength,
                                   long packetNumber, long largestAcked) throws Exception {
         System.out.printf("%ntestOneRTTPacket(qv:%s, dcid:%d, pn:%d, ack:%d)%n",
@@ -1186,8 +1191,8 @@ public class PacketEncodingTest {
         checkShortHeaderPacket(packet, PacketType.ONERTT,
                 PacketNumberSpace.APPLICATION, packetNumber,
                 destConnectionId, frames, minPayloadSize);
-        assertEquals(packet.hasLength(), false);
-        assertEquals(packet.size(), expectedSize);
+        assertEquals(false, packet.hasLength());
+        assertEquals(expectedSize, packet.size());
 
         // Check that peeking at the encoded packet returns correct information
         ByteBuffer encoded = toByteBuffer(encoder, packet, context);
@@ -1218,9 +1223,9 @@ public class PacketEncodingTest {
         datagram.position(0);
         datagram.limit(end);
         decoder.skipPacket(datagram, offset);
-        assertEquals(datagram.position(), offset + expectedSize);
-        assertEquals(datagram.position(), datagram.limit());
-        assertEquals(datagram.position(), datagram.capacity() - offset);
+        assertEquals(offset + expectedSize, datagram.position());
+        assertEquals(datagram.limit(), datagram.position());
+        assertEquals(datagram.capacity() - offset, datagram.position());
 
 
         // Decode the packet in the datagram
@@ -1230,7 +1235,7 @@ public class PacketEncodingTest {
             int pos = datagram.position();
             System.out.printf("Decoding packet: %d at %d%n", (i+1), pos);
             var decodedPacket = decoder.decode(datagram, context);
-            assertEquals(datagram.position(), pos + size);
+            assertEquals(pos + size, datagram.position());
             assertTrue(decodedPacket instanceof OneRttPacket, "decoded: " + decodedPacket);
             OneRttPacket oneRttDecoded = OneRttPacket.class.cast(decodedPacket);
             List<QuicFrame> expectedFrames = frames;
@@ -1258,12 +1263,12 @@ public class PacketEncodingTest {
             checkShortHeaderPacket(oneRttDecoded, PacketType.ONERTT,
                     PacketNumberSpace.APPLICATION, packetNumber,
                     destConnectionId, expectedFrames, minPayloadSize);
-            assertEquals(decodedPacket.size(), packet.size());
-            assertEquals(decodedPacket.size(), size);
+            assertEquals(packet.size(), decodedPacket.size());
+            assertEquals(size, decodedPacket.size());
         }
-        assertEquals(datagram.position(), offset + size);
-        assertEquals(datagram.remaining(), 0);
-        assertEquals(datagram.limit(), end);
+        assertEquals(offset + size, datagram.position());
+        assertEquals(0, datagram.remaining());
+        assertEquals(end, datagram.limit());
 
     }
 
@@ -1299,15 +1304,15 @@ public class PacketEncodingTest {
                 ByteBuffer.wrap(new byte[] {16, 17}),
                 ByteBuffer.wrap(new byte[] {18, 19, 20})
         );
-        assertEquals(Utils.mismatch(match1, match1), -1);
-        assertEquals(Utils.mismatch(match2, match2), -1);
-        assertEquals(Utils.mismatch(match3, match3), -1);
-        assertEquals(Utils.mismatch(match1, match2), -1);
-        assertEquals(Utils.mismatch(match2, match1), -1);
-        assertEquals(Utils.mismatch(match1, match3), -1);
-        assertEquals(Utils.mismatch(match3, match1), -1);
-        assertEquals(Utils.mismatch(match2, match3), -1);
-        assertEquals(Utils.mismatch(match3, match2), -1);
+        assertEquals(-1, Utils.mismatch(match1, match1));
+        assertEquals(-1, Utils.mismatch(match2, match2));
+        assertEquals(-1, Utils.mismatch(match3, match3));
+        assertEquals(-1, Utils.mismatch(match1, match2));
+        assertEquals(-1, Utils.mismatch(match2, match1));
+        assertEquals(-1, Utils.mismatch(match1, match3));
+        assertEquals(-1, Utils.mismatch(match3, match1));
+        assertEquals(-1, Utils.mismatch(match2, match3));
+        assertEquals(-1, Utils.mismatch(match3, match2));
     }
 
     @Test
@@ -1413,25 +1418,25 @@ public class PacketEncodingTest {
                 ByteBuffer.wrap(new byte[] {18, 19, 20, 41, 42, 43})
         );
 
-        assertEquals(Utils.mismatch(nomatch0, nomatch0), -1L);
-        assertEquals(Utils.mismatch(nomatch10, nomatch10), -1L);
-        assertEquals(Utils.mismatch(nomatch19, nomatch19), -1L);
-        assertEquals(Utils.mismatch(morematch1, morematch1), -1L);
-        assertEquals(Utils.mismatch(morematch2, morematch2), -1L);
-        assertEquals(Utils.mismatch(morematch3, morematch3), -1L);
-        assertEquals(Utils.mismatch(morematch2, morematch3), -1L);
-        assertEquals(Utils.mismatch(morematch3, morematch2), -1L);
+        assertEquals(-1L, Utils.mismatch(nomatch0, nomatch0));
+        assertEquals(-1L, Utils.mismatch(nomatch10, nomatch10));
+        assertEquals(-1L, Utils.mismatch(nomatch19, nomatch19));
+        assertEquals(-1L, Utils.mismatch(morematch1, morematch1));
+        assertEquals(-1L, Utils.mismatch(morematch2, morematch2));
+        assertEquals(-1L, Utils.mismatch(morematch3, morematch3));
+        assertEquals(-1L, Utils.mismatch(morematch2, morematch3));
+        assertEquals(-1L, Utils.mismatch(morematch3, morematch2));
 
         for (var match : List.of(match1, match2, match3)) {
-            assertEquals(Utils.mismatch(match, nomatch0), 0L);
-            assertEquals(Utils.mismatch(match, nomatch10), 10L);
-            assertEquals(Utils.mismatch(match, nomatch19), 19L);
-            assertEquals(Utils.mismatch(nomatch0, match), 0L);
-            assertEquals(Utils.mismatch(nomatch10, match), 10L);
-            assertEquals(Utils.mismatch(nomatch19, match), 19L);
+            assertEquals(0L, Utils.mismatch(match, nomatch0));
+            assertEquals(10L, Utils.mismatch(match, nomatch10));
+            assertEquals(19L, Utils.mismatch(match, nomatch19));
+            assertEquals(0L, Utils.mismatch(nomatch0, match));
+            assertEquals(10L, Utils.mismatch(nomatch10, match));
+            assertEquals(19L, Utils.mismatch(nomatch19, match));
             for (var morematch : List.of(morematch1, morematch2, morematch3)) {
-                assertEquals(Utils.mismatch(match, morematch), 20L);
-                assertEquals(Utils.mismatch(morematch, match), 20L);
+                assertEquals(20L, Utils.mismatch(match, morematch));
+                assertEquals(20L, Utils.mismatch(morematch, match));
             }
 
         }
diff --git a/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java b/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java
index 3a4237d0847..c018079ea4e 100644
--- a/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java
+++ b/test/jdk/java/net/httpclient/quic/PacketNumbersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,17 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
 import jdk.internal.net.http.quic.packets.QuicPacketNumbers;
-import org.testng.SkipException;
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.expectThrows;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
+/*
  * @test
- * @run testng PacketNumbersTest
+ * @run junit PacketNumbersTest
  */
 public class PacketNumbersTest {
 
@@ -85,8 +86,7 @@ public class PacketNumbersTest {
         }
     }
 
-    @DataProvider
-    public Object[][] encode() {
+    public static Object[][] encode() {
         return List.of(
                 // these first three test cases are extracted from RFC 9000, appendix A.2 and A.3
                 new TestCase("success",  0xa82f9b32L, 0xa82f30eaL, EncodeResult.success(0x9b32)),
@@ -127,19 +127,18 @@ public class PacketNumbersTest {
                 .toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "encode")
+    @ParameterizedTest
+    @MethodSource("encode")
     public void testEncodePacketNumber(TestCase test) {
         System.out.println(test);
         if (test.result().assertion()) {
-            if (!QuicPacketNumbers.class.desiredAssertionStatus()) {
-                throw new SkipException("needs assertion enabled (-esa)");
-            }
-            Throwable t = expectThrows(test.result().failure(), test::encode);
+            Assumptions.assumeFalse(!QuicPacketNumbers.class.desiredAssertionStatus(), "needs assertion enabled (-esa)");
+            Throwable t = Assertions.assertThrows(test.result().failure(), test::encode);
             System.out.println("Got expected assertion: " + t);
             return;
         }
         if (test.result().fail()) {
-            Throwable t = expectThrows(test.result().failure(), test::encode);
+            Throwable t = Assertions.assertThrows(test.result().failure(), test::encode);
             System.out.println("Got expected exception: " + t);
             return;
 
@@ -152,8 +151,8 @@ public class PacketNumbersTest {
         }
 
         // encode the full PN - check that the truncated PN == expected
-        assertEquals(truncated, test.result().expected());
+        assertEquals(test.result().expected(), truncated);
         // check that decode(encoded) == fullPN
-        assertEquals(test.decode(), test.fullPN());
+        assertEquals(test.fullPN(), test.decode());
     }
 }
diff --git a/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java b/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java
index 40497ec13da..fe3b748a2fa 100644
--- a/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java
+++ b/test/jdk/java/net/httpclient/quic/PacketSpaceManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,34 +73,35 @@ import jdk.internal.net.quic.QuicVersion;
 import jdk.internal.net.quic.QuicTransportException;
 import jdk.internal.net.quic.QuicTransportParametersConsumer;
 import jdk.test.lib.RandomFactory;
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import javax.crypto.AEADBadTagException;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSession;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-/**
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/*
  * @test
  * @summary tests the logic to build an AckFrame
  * @library /test/lib
  * @library ../debug
  * @build java.net.http/jdk.internal.net.http.common.TestLoggerUtil
- * @run testng/othervm PacketSpaceManagerTest
- * @run testng/othervm -Dseed=-7947549564260911920 PacketSpaceManagerTest
- * @run testng/othervm -Dseed=-5413111674202728207 PacketSpaceManagerTest
- * @run testng/othervm -Dseed=-176652423987357212 PacketSpaceManagerTest
- * @run testng/othervm -Dseed=6550551791799910315 PacketSpaceManagerTest
- * @run testng/othervm -Dseed=-4159871071396382784 PacketSpaceManagerTest
- * @run testng/othervm -Dseed=2252276218459363615 PacketSpaceManagerTest
- * @run testng/othervm -Dseed=-5130588140709404919 PacketSpaceManagerTest
+ * @run junit/othervm PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=-7947549564260911920 PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=-5413111674202728207 PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=-176652423987357212 PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=6550551791799910315 PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=-4159871071396382784 PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=2252276218459363615 PacketSpaceManagerTest
+ * @run junit/othervm -Dseed=-5130588140709404919 PacketSpaceManagerTest
  */
 // -Djdk.internal.httpclient.debug=true
 public class PacketSpaceManagerTest {
@@ -337,7 +338,7 @@ public class PacketSpaceManagerTest {
      * @param first the first packet acknowledged, inclusive
      * @param last  the last packet acknowledged, inclusive
      */
-    public static record Acknowledged(long first, long last) {
+    public record Acknowledged(long first, long last) {
         public Acknowledged {
             assert first >= 0 && first <= last;
         }
@@ -360,7 +361,7 @@ public class PacketSpaceManagerTest {
      * @param packetNumber the packet number of the packet to send
      * @param delay a delay before the next packet should be emitted
      */
-    public static record Packet(long packetNumber, long delay) {
+    public record Packet(long packetNumber, long delay) {
         Packet(long packetNumber) {
             this(packetNumber, RANDOM.nextLong(1, 255));
         }
@@ -391,7 +392,7 @@ public class PacketSpaceManagerTest {
      *                  before it's been emitted).
      * @param shuffled whether the list of packets is shuffled.
      */
-    public static record TestCase(List<Acknowledged> acks,
+    public record TestCase(List<Acknowledged> acks,
                                   List<Packet> packets,
                                   List<AckFrame> ackframes,
                                   boolean shuffled) {
@@ -440,7 +441,7 @@ public class PacketSpaceManagerTest {
      * a list of special testcases, and a list of random testcases.
      * @return A list of TestCases to test.
      */
-    List<TestCase> generateTests() {
+    static List<TestCase> generateTests() {
         List<TestCase> tests = new ArrayList<>();
         List<TestCase> simples = List.of(
                 new TestCase(List.of(new Acknowledged(5,5))),
@@ -485,7 +486,7 @@ public class PacketSpaceManagerTest {
      * A packet should only be present once.
      * @return a random list of increasing acknowledgement ranges.
      */
-    List<Acknowledged> generateAcks() {
+    static List<Acknowledged> generateAcks() {
         int count = RANDOM.nextInt(3, 10);
         List<Acknowledged> acks = new ArrayList<>(count);
         long prev = -1;
@@ -516,8 +517,7 @@ public class PacketSpaceManagerTest {
         return res;
     }
 
-    @DataProvider(name = "tests")
-    public Object[][] tests() {
+    public static Object[][] tests() {
         return generateTests().stream()
                 .map(List::of)
                 .map(List::toArray)
@@ -757,7 +757,7 @@ public class PacketSpaceManagerTest {
         final CopyOnWriteArrayList<Retransmission> retransmissions = new CopyOnWriteArrayList<>();
         final CopyOnWriteArrayList<Retransmission> successfulExpectations = new CopyOnWriteArrayList<>();
 
-        static record Retransmission(long packetNumber, Deadline atOrAfter, long largestAckSent) {
+        record Retransmission(long packetNumber, Deadline atOrAfter, long largestAckSent) {
             boolean isFor(long number) {
                 return number == packetNumber;
             }
@@ -774,7 +774,7 @@ public class PacketSpaceManagerTest {
          * the test.
          * This method checks that the retransmission logic works as
          * expected.
-         * @throws Exception
+         * @throws Exception if the call fails
          */
         // TODO: in the end we need to check that everything that was
         //       expected to happen happened. What is missing is to
@@ -890,7 +890,7 @@ public class PacketSpaceManagerTest {
                             .stream().filter(AckFrame.class::isInstance)
                             .map(AckFrame.class::cast)
                             .toList();
-                    assertEquals(frames.size(), 1,
+                    assertEquals(1, frames.size(),
                             "unexpected ack frames: " + frames);
                     AckFrame ackFrame = ackFrames.get(0);
                     LongStream.range(firstAckPaket, lastAckPacket + 1)
@@ -1029,10 +1029,11 @@ public class PacketSpaceManagerTest {
         void check() {
             assertFalse(now().isBefore(timeSource.first.plusMillis(timeline)));
             assertTrue(expectedRetransmissions.isEmpty());
-            assertEquals(retransmissions.stream()
+            assertEquals(successfulExpectations.stream()
                             .map(Retransmission::packetNumber)
                             .filter(pn -> pn <= maxPacketNumber).toList(),
-                    successfulExpectations.stream().map(Retransmission::packetNumber)
+                        retransmissions.stream()
+                            .map(Retransmission::packetNumber)
                             .filter(pn -> pn <= maxPacketNumber).toList());
             for (Retransmission r : retransmissions) {
                 if (r.packetNumber > maxPacketNumber ||
@@ -1040,14 +1041,14 @@ public class PacketSpaceManagerTest {
                 List<Retransmission> succesful = successfulExpectations.stream()
                         .filter(s -> s.isFor(r.packetNumber))
                         .toList();
-                assertEquals(succesful.size(), 1);
+                assertEquals(1, succesful.size());
                 succesful.forEach(s -> assertFalse(s.atOrAfter.isAfter(r.atOrAfter)));
             }
 
             List<Long> acknowledged = new ArrayList<>(acknowledgePackets(allAcks.build()));
             Collections.sort(acknowledged);
-            assertEquals(acknowledged, test.packets.stream()
-                    .map(Packet::packetNumber).sorted().toList());
+            assertEquals(test.packets.stream()
+                    .map(Packet::packetNumber).sorted().toList(), acknowledged);
         }
 
         // TODO: add a LongStream acknowledged() to AckFrame - write a spliterator
@@ -1073,8 +1074,8 @@ public class PacketSpaceManagerTest {
             default String negation() {
                 return (this == FALSE) ? "doesn't " : "";
             }
-            Assertion TRUE = Assert::assertTrue;
-            Assertion FALSE = Assert::assertFalse;
+            Assertion TRUE = Assertions::assertTrue;
+            Assertion FALSE = Assertions::assertFalse;
         }
         static void assertContains(Assertion assertion, List<Long> list, long number, String desc) {
             assertion.check(list.contains(number),
@@ -1115,7 +1116,8 @@ public class PacketSpaceManagerTest {
         }
     }
 
-    @Test(dataProvider = "tests")
+    @ParameterizedTest
+    @MethodSource("tests")
     public void testPacketSpaceManager(TestCase testCase) throws Exception {
         System.out.printf("%n -------  testPacketSpaceManager ------- %n");
         SynchronousTestDriver driver = new SynchronousTestDriver(testCase);
diff --git a/test/jdk/java/net/httpclient/quic/QuicFramesDecoderTest.java b/test/jdk/java/net/httpclient/quic/QuicFramesDecoderTest.java
index f0d4b316e46..ef0801e6c18 100644
--- a/test/jdk/java/net/httpclient/quic/QuicFramesDecoderTest.java
+++ b/test/jdk/java/net/httpclient/quic/QuicFramesDecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,20 +24,20 @@
 import jdk.internal.net.http.quic.frames.QuicFrame;
 import jdk.internal.net.quic.QuicTransportErrors;
 import jdk.internal.net.quic.QuicTransportException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 import java.util.HexFormat;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 
 /*
  * @test
  * @library /test/lib
  * @summary Tests to check QUIC frame decoding errors are handled correctly
- * @run testng/othervm QuicFramesDecoderTest
+ * @run junit/othervm QuicFramesDecoderTest
  */
 public class QuicFramesDecoderTest {
 
@@ -181,7 +181,6 @@ public class QuicFramesDecoderTest {
     private static final byte[] NEW_CONNECTION_ID_ZERO = HexFormat.of().parseHex("181716"+
             "00"+"0f0e0d0c0b0a09080706050403020100");
 
-    @DataProvider
     public static Object[][] goodFrames() {
         return new Object[][]{
                 new Object[]{"ack without ecn", ACK_BASE, false},
@@ -226,7 +225,6 @@ public class QuicFramesDecoderTest {
         };
     }
 
-    @DataProvider
     public static Object[][] badFrames() {
         return new Object[][]{
                 new Object[]{"ack without ecn, negative pn", ACK_NEG_BASE},
@@ -242,7 +240,8 @@ public class QuicFramesDecoderTest {
         };
     }
 
-    @Test(dataProvider = "goodFrames")
+    @ParameterizedTest
+    @MethodSource("goodFrames")
     public void testReencode(String desc, byte[] frame, boolean bloated) throws Exception {
         // check if the goodFrames provider indeed contains good frames
         ByteBuffer buf = ByteBuffer.wrap(frame);
@@ -250,16 +249,17 @@ public class QuicFramesDecoderTest {
         assertFalse(buf.hasRemaining(), buf.remaining() + " bytes left in buffer after parsing");
         // some frames deliberately use suboptimal encoding, skip them
         if (bloated) return;
-        assertEquals(qf.size(), frame.length, "Frame size mismatch");
+        assertEquals(frame.length, qf.size(), "Frame size mismatch");
         buf.clear();
         ByteBuffer encoded = ByteBuffer.allocate(frame.length);
         qf.encode(encoded);
         assertFalse(encoded.hasRemaining(), "Actual frame length mismatch");
         encoded.flip();
-        assertEquals(buf, encoded, "Encoded buffer is different from the original one");
+        assertEquals(encoded, buf, "Encoded buffer is different from the original one");
     }
 
-    @Test(dataProvider = "goodFrames")
+    @ParameterizedTest
+    @MethodSource("goodFrames")
     public void testToString(String desc, byte[] frame, boolean bloated) throws Exception {
         // check if the goodFrames provider indeed contains good frames
         ByteBuffer buf = ByteBuffer.wrap(frame);
@@ -268,7 +268,8 @@ public class QuicFramesDecoderTest {
         System.out.println(qf); // should not throw
     }
 
-    @Test(dataProvider = "goodFrames")
+    @ParameterizedTest
+    @MethodSource("goodFrames")
     public void testTruncatedFrame(String desc, byte[] frame, boolean bloated) throws Exception {
         // check if parsing a truncated frame throws the right error
         ByteBuffer buf = ByteBuffer.wrap(frame);
@@ -279,12 +280,13 @@ public class QuicFramesDecoderTest {
                 var qf = QuicFrame.decode(buf);
                 fail("Expected the decoder to throw on length " + i + ", got: " + qf);
             } catch (QuicTransportException e) {
-                assertEquals(e.getErrorCode(), QuicTransportErrors.FRAME_ENCODING_ERROR.code());
+                assertEquals(QuicTransportErrors.FRAME_ENCODING_ERROR.code(), e.getErrorCode());
             }
         }
     }
 
-    @Test(dataProvider = "badFrames")
+    @ParameterizedTest
+    @MethodSource("badFrames")
     public void testBadFrame(String desc, byte[] frame) throws Exception {
         // check if parsing a bad frame throws the right error
         ByteBuffer buf = ByteBuffer.wrap(frame);
@@ -292,7 +294,7 @@ public class QuicFramesDecoderTest {
             var qf = QuicFrame.decode(buf);
             fail("Expected the decoder to throw, got: "+qf);
         } catch (QuicTransportException e) {
-            assertEquals(e.getErrorCode(), QuicTransportErrors.FRAME_ENCODING_ERROR.code());
+            assertEquals(QuicTransportErrors.FRAME_ENCODING_ERROR.code(), e.getErrorCode());
         }
     }
 }
diff --git a/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java b/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java
index 9d5c35f5414..208e284cefd 100644
--- a/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java
+++ b/test/jdk/java/net/httpclient/quic/QuicRequestResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,9 +43,10 @@ import jdk.internal.net.http.quic.QuicClient;
 import jdk.internal.net.quic.QuicTLSContext;
 import jdk.internal.net.quic.QuicVersion;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -54,18 +55,18 @@ import org.testng.annotations.Test;
  *        jdk.httpclient.test.lib.quic.ClientConnection
  *        jdk.httpclient.test.lib.common.TestUtil
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=true QuicRequestResponseTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true QuicRequestResponseTest
  */
 public class QuicRequestResponseTest {
 
-    private QuicStandaloneServer server;
+    private static QuicStandaloneServer server;
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
-    private ExecutorService executor;
+    private static ExecutorService executor;
 
     private static final byte[] HELLO_MSG = "Hello Quic".getBytes(StandardCharsets.UTF_8);
 
-    @BeforeClass
-    public void beforeClass() throws Exception {
+    @BeforeAll
+    public static void beforeClass() throws Exception {
         executor = Executors.newCachedThreadPool();
         server = QuicStandaloneServer.newBuilder()
                 .availableVersions(new QuicVersion[]{QuicVersion.QUIC_V1})
@@ -77,8 +78,8 @@ public class QuicRequestResponseTest {
         System.out.println("Server started at " + server.getAddress());
     }
 
-    @AfterClass
-    public void afterClass() throws Exception {
+    @AfterAll
+    public static void afterClass() throws Exception {
         if (server != null) {
             System.out.println("Stopping server " + server.getAddress());
             server.close();
diff --git a/test/jdk/java/net/httpclient/quic/VariableLengthTest.java b/test/jdk/java/net/httpclient/quic/VariableLengthTest.java
index aec3e999812..cf05b91b18f 100644
--- a/test/jdk/java/net/httpclient/quic/VariableLengthTest.java
+++ b/test/jdk/java/net/httpclient/quic/VariableLengthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,32 +22,31 @@
  */
 import jdk.internal.net.http.quic.VariableLengthEncoder;
 import jtreg.SkippedException;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertThrows;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /*
  * @test
  * @library /test/lib
  * @modules java.net.http/jdk.internal.net.http.quic
- * @run testng/othervm VariableLengthTest
+ * @run junit/othervm VariableLengthTest
  * @summary Tests to check quic/util methods encode/decodeVariableLength methods
  *  work as expected.
  */
 public class VariableLengthTest {
     static final Class<? extends Throwable> IAE = IllegalArgumentException.class;
 
-    @DataProvider(name = "decode invariants")
-    public Object[][] decodeInvariants() {
+    public static Object[][] decodeInvariants() {
         return new Object[][]
             {
                 { new byte[]{7},                                                        7, 1 }, // 00
@@ -59,8 +58,7 @@ public class VariableLengthTest {
                 { new byte[]{-65},                                                     -1, 0 },
             };
     }
-    @DataProvider(name = "encode invariants")
-    public Object[][] encodeInvariants() {
+    public static Object[][] encodeInvariants() {
         return new Object[][]
             {
                 { 7,                      1, null }, // 00
@@ -71,8 +69,7 @@ public class VariableLengthTest {
                 { -1,                     0, IAE  },
             };
     }
-    @DataProvider(name = "prefix invariants")
-    public Object[][] prefixInvariants() {
+    public static Object[][] prefixInvariants() {
         return new Object[][]
             {
                 { Long.MAX_VALUE,          0, IAE  },
@@ -111,27 +108,30 @@ public class VariableLengthTest {
             };
     }
 
-    @Test(dataProvider = "decode invariants")
+    @ParameterizedTest
+    @MethodSource("decodeInvariants")
     public void testDecode(byte[] values, long expectedLength, int expectedPosition) {
         ByteBuffer bb = ByteBuffer.wrap(values);
         var actualLength = VariableLengthEncoder.decode(bb);
-        assertEquals(actualLength, expectedLength);
+        assertEquals(expectedLength, actualLength);
 
         var actualPosition = bb.position();
-        assertEquals(actualPosition, expectedPosition);
+        assertEquals(expectedPosition, actualPosition);
     }
 
-    @Test(dataProvider = "decode invariants")
+    @ParameterizedTest
+    @MethodSource("decodeInvariants")
     public void testPeek(byte[] values, long expectedLength, int expectedPosition) {
         ByteBuffer bb = ByteBuffer.wrap(values);
         var actualLength = VariableLengthEncoder.peekEncodedValue(bb, 0);
-        assertEquals(actualLength, expectedLength);
+        assertEquals(expectedLength, actualLength);
 
         var actualPosition = bb.position();
-        assertEquals(actualPosition, 0);
+        assertEquals(0, actualPosition);
     }
 
-    @Test(dataProvider = "encode invariants")
+    @ParameterizedTest
+    @MethodSource("encodeInvariants")
     public void testEncode(long length, int capacity, Class<? extends Exception> exception) throws IOException {
         var actualBuffer = ByteBuffer.allocate(capacity);
         var expectedBuffer = getTestBuffer(length, capacity);
@@ -140,46 +140,48 @@ public class VariableLengthTest {
             assertThrows(exception, () -> VariableLengthEncoder.encode(actualBuffer, length));
             // if method fails ensure that position hasn't changed
             var actualPosition = actualBuffer.position();
-            assertEquals(actualPosition, capacity);
+            assertEquals(capacity, actualPosition);
         } else {
             VariableLengthEncoder.encode(actualBuffer, length);
             var actualPosition = actualBuffer.position();
-            assertEquals(actualPosition, capacity);
+            assertEquals(capacity, actualPosition);
 
             // check length prefix
             int firstByte = actualBuffer.get(0) & 0xFF;
             int lengthPrefix = firstByte & 0xC0;
             lengthPrefix >>= 6;
             int expectedValue = (int)(Math.log(capacity) / Math.log(2));
-            assertEquals(lengthPrefix, expectedValue);
+            assertEquals(expectedValue, lengthPrefix);
 
             // check length encoded in buffer correctly
             int b  = firstByte & 0x3F;
             actualBuffer.put(0, (byte) b);
-            assertEquals(actualBuffer.compareTo(expectedBuffer), 0);
+            assertEquals(0, actualBuffer.compareTo(expectedBuffer));
         }
     }
 
-    @Test(dataProvider = "prefix invariants")
+    @ParameterizedTest
+    @MethodSource("prefixInvariants")
     public void testLengthPrefix(long length, int expectedPrefix,  Class<? extends Exception> exception) {
         if (exception != null) {
             assertThrows(exception, () -> VariableLengthEncoder.getVariableLengthPrefix(length));
         } else {
             var actualValue = VariableLengthEncoder.getVariableLengthPrefix(length);
-            assertEquals(actualValue, expectedPrefix);
+            assertEquals(expectedPrefix, actualValue);
         }
     }
 
     // Encode the given length and then decodes it and compares
     // the results, asserting various invariants along the way.
-    @Test(dataProvider = "prefix invariants")
+    @ParameterizedTest
+    @MethodSource("prefixInvariants")
     public void testEncodeDecode(long length, int expectedPrefix,  Class<? extends Exception> exception) {
         if (exception != null) {
             assertThrows(exception, () -> VariableLengthEncoder.getEncodedSize(length));
             assertThrows(exception, () -> VariableLengthEncoder.encode(ByteBuffer.allocate(16), length));
         } else {
             var actualSize = VariableLengthEncoder.getEncodedSize(length);
-            assertEquals(actualSize, 1 << expectedPrefix);
+            assertEquals(1 << expectedPrefix, actualSize);
             assertTrue(actualSize > 0, "length is negative or zero: " + actualSize);
             assertTrue(actualSize < 9, "length is too big: " + actualSize);
 
@@ -199,33 +201,33 @@ public class VariableLengthTest {
                 longer.position(offset);
 
                 // attempt to encode with a buffer too short
-                expectThrows(IAE, () -> VariableLengthEncoder.encode(shorter, length));
-                assertEquals(shorter.position(), offset);
-                assertEquals(shorter.limit(), shorter.capacity());
+                assertThrows(IAE, () -> VariableLengthEncoder.encode(shorter, length));
+                assertEquals(offset, shorter.position());
+                assertEquals(shorter.capacity(), shorter.limit());
 
-                assertEquals(shorter.mismatch(shorterref), -1);
-                assertEquals(shorterref.mismatch(shorter), -1);
+                assertEquals(-1, shorter.mismatch(shorterref));
+                assertEquals(-1, shorterref.mismatch(shorter));
 
                 // attempt to encode with a buffer that has the exact size
                 var exactres = VariableLengthEncoder.encode(exact, length);
-                assertEquals(exactres, actualSize);
-                assertEquals(exact.position(), actualSize + offset);
+                assertEquals(actualSize, exactres);
+                assertEquals(actualSize + offset, exact.position());
                 assertFalse(exact.hasRemaining());
 
                 // attempt to encode with a buffer that has more bytes
                 var longres = VariableLengthEncoder.encode(longer, length);
-                assertEquals(longres, actualSize);
-                assertEquals(longer.position(), offset + actualSize);
-                assertEquals(longer.limit(), longer.capacity());
-                assertEquals(longer.remaining(), 10);
+                assertEquals(actualSize, longres);
+                assertEquals(offset + actualSize, longer.position());
+                assertEquals(longer.capacity(), longer.limit());
+                assertEquals(10, longer.remaining());
 
                 // compare encodings
 
                 // first reset buffer positions for reading.
                 exact.position(offset);
                 longer.position(offset);
-                assertEquals(longer.mismatch(exact), actualSize);
-                assertEquals(exact.mismatch(longer), actualSize);
+                assertEquals(actualSize, longer.mismatch(exact));
+                assertEquals(actualSize, exact.mismatch(longer));
 
                 // decode with a buffer that is missing the last
                 // byte...
@@ -233,21 +235,21 @@ public class VariableLengthTest {
                 shortSlice.position(offset);
                 shortSlice.limit(offset + actualSize -1);
                 var actualLength = VariableLengthEncoder.decode(shortSlice);
-                assertEquals(actualLength, -1L);
-                assertEquals(shortSlice.position(), offset);
-                assertEquals(shortSlice.limit(), offset + actualSize - 1);
+                assertEquals(-1L, actualLength);
+                assertEquals(offset, shortSlice.position());
+                assertEquals(offset + actualSize - 1, shortSlice.limit());
 
                 // decode with the exact buffer
                 actualLength = VariableLengthEncoder.decode(exact);
-                assertEquals(actualLength, length);
-                assertEquals(exact.position(), offset + actualSize);
+                assertEquals(length, actualLength);
+                assertEquals(offset + actualSize, exact.position());
                 assertFalse(exact.hasRemaining());
 
                 // decode with the longer buffer
                 actualLength = VariableLengthEncoder.decode(longer);
-                assertEquals(actualLength, length);
-                assertEquals(longer.position(), offset + actualSize);
-                assertEquals(longer.remaining(), 10);
+                assertEquals(length, actualLength);
+                assertEquals(offset + actualSize, longer.position());
+                assertEquals(10, longer.remaining());
             }
 
         }
@@ -255,7 +257,8 @@ public class VariableLengthTest {
 
     // Encode the given length and then peeks it and compares
     // the results, asserting various invariants along the way.
-    @Test(dataProvider = "prefix invariants")
+    @ParameterizedTest
+    @MethodSource("prefixInvariants")
     public void testEncodePeek(long length, int expectedPrefix,  Class<? extends Exception> exception) {
         if (exception != null) {
             assertThrows(exception, () -> VariableLengthEncoder.getEncodedSize(length));
@@ -264,7 +267,7 @@ public class VariableLengthTest {
         }
 
         var actualSize = VariableLengthEncoder.getEncodedSize(length);
-        assertEquals(actualSize, 1 << expectedPrefix);
+        assertEquals(1 << expectedPrefix, actualSize);
         assertTrue(actualSize > 0, "length is negative or zero: " + actualSize);
         assertTrue(actualSize < 9, "length is too big: " + actualSize);
 
@@ -281,24 +284,24 @@ public class VariableLengthTest {
 
             // attempt to encode with a buffer that has the exact size
             var exactres = VariableLengthEncoder.encode(exact, length);
-            assertEquals(exactres, actualSize);
-            assertEquals(exact.position(), actualSize + offset);
+            assertEquals(actualSize, exactres);
+            assertEquals(actualSize + offset, exact.position());
             assertFalse(exact.hasRemaining());
 
             // attempt to encode with a buffer that has more bytes
             var longres = VariableLengthEncoder.encode(longer, length);
-            assertEquals(longres, actualSize);
-            assertEquals(longer.position(), offset + actualSize);
-            assertEquals(longer.limit(), longer.capacity());
-            assertEquals(longer.remaining(), 10);
+            assertEquals(actualSize, longres);
+            assertEquals(offset + actualSize, longer.position());
+            assertEquals(longer.capacity(), longer.limit());
+            assertEquals(10, longer.remaining());
 
             // compare encodings
 
             // first reset buffer positions for reading.
             exact.position(offset);
             longer.position(offset);
-            assertEquals(longer.mismatch(exact), actualSize);
-            assertEquals(exact.mismatch(longer), actualSize);
+            assertEquals(actualSize, longer.mismatch(exact));
+            assertEquals(actualSize, exact.mismatch(longer));
             exact.position(0);
             longer.position(0);
             exact.limit(exact.capacity());
@@ -311,25 +314,25 @@ public class VariableLengthTest {
             shortSlice.limit(offset + actualSize - 1);
             // need at least one byte to decode the size len...
             var expectedSize = shortSlice.limit() <= offset ? -1 : actualSize;
-            assertEquals(VariableLengthEncoder.peekEncodedValueSize(shortSlice, offset), expectedSize);
+            assertEquals(expectedSize, VariableLengthEncoder.peekEncodedValueSize(shortSlice, offset));
             var actualLength = VariableLengthEncoder.peekEncodedValue(shortSlice, offset);
-            assertEquals(actualLength, -1L);
-            assertEquals(shortSlice.position(), 0);
-            assertEquals(shortSlice.limit(), offset + actualSize - 1);
+            assertEquals(-1L, actualLength);
+            assertEquals(0, shortSlice.position());
+            assertEquals(offset + actualSize - 1, shortSlice.limit());
 
             // decode with the exact buffer
-            assertEquals(VariableLengthEncoder.peekEncodedValueSize(exact, offset), actualSize);
+            assertEquals(actualSize, VariableLengthEncoder.peekEncodedValueSize(exact, offset));
             actualLength = VariableLengthEncoder.peekEncodedValue(exact, offset);
-            assertEquals(actualLength, length);
-            assertEquals(exact.position(), 0);
-            assertEquals(exact.limit(), exact.capacity());
+            assertEquals(length, actualLength);
+            assertEquals(0, exact.position());
+            assertEquals(exact.capacity(), exact.limit());
 
             // decode with the longer buffer
-            assertEquals(VariableLengthEncoder.peekEncodedValueSize(longer, offset), actualSize);
+            assertEquals(actualSize, VariableLengthEncoder.peekEncodedValueSize(longer, offset));
             actualLength = VariableLengthEncoder.peekEncodedValue(longer, offset);
-            assertEquals(actualLength, length);
-            assertEquals(longer.position(), 0);
-            assertEquals(longer.limit(), longer.capacity());
+            assertEquals(length, actualLength);
+            assertEquals(0, longer.position());
+            assertEquals(longer.capacity(), longer.limit());
         }
 
     }
diff --git a/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java b/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java
index 973477a63dc..bd5bbae0170 100644
--- a/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java
+++ b/test/jdk/java/net/httpclient/quic/VersionNegotiationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,13 +41,15 @@ import jdk.internal.net.http.quic.QuicClient;
 import jdk.internal.net.quic.QuicTLSContext;
 import jdk.internal.net.quic.QuicVersion;
 import jdk.test.lib.net.SimpleSSLContext;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
@@ -57,19 +59,19 @@ import static org.testng.Assert.expectThrows;
  *        jdk.httpclient.test.lib.common.TestUtil
  *        jdk.httpclient.test.lib.quic.ClientConnection
  *        jdk.test.lib.net.SimpleSSLContext
- * @run testng/othervm -Djdk.internal.httpclient.debug=true VersionNegotiationTest
+ * @run junit/othervm -Djdk.internal.httpclient.debug=true VersionNegotiationTest
  */
 public class VersionNegotiationTest {
 
     private static final SSLContext sslContext = SimpleSSLContext.findSSLContext();
     private static ExecutorService executor;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() throws Exception {
         executor = Executors.newCachedThreadPool();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() throws Exception {
         if (executor != null) executor.shutdown();
     }
@@ -96,7 +98,7 @@ public class VersionNegotiationTest {
             try (final QuicServer server = createAndStartServer(serverVersion)) {
                 System.out.println("Attempting to connect " + client.getAvailableVersions()
                         + " client to a " + server.getAvailableVersions() + " server");
-                final IOException thrown = expectThrows(IOException.class,
+                final IOException thrown = Assertions.assertThrows(IOException.class,
                         () -> ClientConnection.establishConnection(client, server.getAddress()));
                 // a version negotiation failure (since it happens during a QUIC connection
                 // handshake) gets thrown as a SSLHandshakeException
@@ -105,7 +107,7 @@ public class VersionNegotiationTest {
                 }
                 System.out.println("Received (potentially expected) exception: " + sslhe);
                 // additional check to make sure it was thrown for the right reason
-                assertEquals(sslhe.getMessage(), "QUIC connection establishment failed");
+                assertEquals("QUIC connection establishment failed", sslhe.getMessage());
                 // underlying cause of SSLHandshakeException should be version negotiation failure
                 final Throwable underlyingCause = sslhe.getCause();
                 assertNotNull(underlyingCause, "missing cause in SSLHandshakeException");
diff --git a/test/jdk/java/net/httpclient/quic/tls/PacketEncryptionTest.java b/test/jdk/java/net/httpclient/quic/tls/PacketEncryptionTest.java
index ed1cbc08de0..d80e473696a 100644
--- a/test/jdk/java/net/httpclient/quic/tls/PacketEncryptionTest.java
+++ b/test/jdk/java/net/httpclient/quic/tls/PacketEncryptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ import jdk.internal.net.quic.QuicKeyUnavailableException;
 import jdk.internal.net.quic.QuicTLSContext;
 import jdk.internal.net.quic.QuicTLSEngine;
 import jdk.internal.net.quic.QuicTransportException;
-import org.testng.annotations.Test;
 import sun.security.ssl.QuicTLSEngineImpl;
 import sun.security.ssl.QuicTLSEngineImplAccessor;
 
@@ -40,8 +39,11 @@ import java.util.HexFormat;
 import java.util.function.IntFunction;
 
 import static jdk.internal.net.quic.QuicVersion.QUIC_V1;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
@@ -50,7 +52,7 @@ import static org.testng.Assert.fail;
  *          java.base/jdk.internal.net.quic
  * @build java.base/sun.security.ssl.QuicTLSEngineImplAccessor
  * @summary known-answer test for packet encryption and decryption
- * @run testng/othervm PacketEncryptionTest
+ * @run junit/othervm PacketEncryptionTest
  */
 public class PacketEncryptionTest {
 
@@ -183,7 +185,7 @@ public class PacketEncryptionTest {
         clientEngine.encryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_C_PN, new FixedHeaderContent(header), payload, packet);
         protect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_C_PN_OFFSET, INITIAL_C_PAYLOAD_OFFSET - INITIAL_C_PN_OFFSET, clientEngine, 0x0f);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), ENCRYPTED_C_PAYLOAD);
+        assertEquals(ENCRYPTED_C_PAYLOAD, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -202,26 +204,25 @@ public class PacketEncryptionTest {
 
         String expectedContents = INITIAL_C_HEADER + INITIAL_C_PAYLOAD;
 
-        assertEquals(HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()), expectedContents);
+        assertEquals(expectedContents, HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()));
     }
 
-    @Test(expectedExceptions = AEADBadTagException.class)
-    public void testDecryptClientInitialPacketBadTag() throws Exception {
-        QuicTLSEngine serverEngine = getQuicV1Engine(SSLContext.getDefault(), false);
-        ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
-        serverEngine.deriveInitialKeys(QUIC_V1, dcid);
-
-        ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_C_PAYLOAD));
-        unprotect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_C_PN_OFFSET, INITIAL_C_PAYLOAD_OFFSET - INITIAL_C_PN_OFFSET, serverEngine, 0x0f);
-        ByteBuffer src = packet.asReadOnlyBuffer();
-        packet.position(INITIAL_C_PAYLOAD_OFFSET);
-
-        // change one byte of AEAD tag
-        packet.put(packet.limit() - 1, (byte)0);
-
-        serverEngine.decryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_C_PN, -1,
-                src, INITIAL_C_PAYLOAD_OFFSET, packet);
-        fail("Decryption should have failed");
+    @Test
+    public void testDecryptClientInitialPacketBadTag() {
+        Assertions.assertThrows(AEADBadTagException.class, () -> {
+            QuicTLSEngine serverEngine = getQuicV1Engine(SSLContext.getDefault(), false);
+            ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
+            serverEngine.deriveInitialKeys(QUIC_V1, dcid);
+            ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_C_PAYLOAD));
+            unprotect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_C_PN_OFFSET, INITIAL_C_PAYLOAD_OFFSET - INITIAL_C_PN_OFFSET, serverEngine, 0x0f);
+            ByteBuffer src = packet.asReadOnlyBuffer();
+            packet.position(INITIAL_C_PAYLOAD_OFFSET);
+            // change one byte of AEAD tag
+            packet.put(packet.limit() - 1, (byte)0);
+            serverEngine.decryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_C_PN, -1,
+                    src, INITIAL_C_PAYLOAD_OFFSET, packet);
+            fail("Decryption should have failed");
+        });
     }
 
     @Test
@@ -242,7 +243,7 @@ public class PacketEncryptionTest {
         serverEngine.encryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_S_PN, new FixedHeaderContent(header), payload, packet);
         protect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_S_PN_OFFSET, INITIAL_S_PAYLOAD_OFFSET - INITIAL_S_PN_OFFSET, serverEngine, 0x0f);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), ENCRYPTED_S_PAYLOAD);
+        assertEquals(ENCRYPTED_S_PAYLOAD, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -261,7 +262,7 @@ public class PacketEncryptionTest {
 
         String expectedContents = INITIAL_S_HEADER + INITIAL_S_PAYLOAD;
 
-        assertEquals(HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()), expectedContents);
+        assertEquals(expectedContents, HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()));
     }
 
     @Test
@@ -302,7 +303,7 @@ public class PacketEncryptionTest {
 
         clientEngine.signRetryPacket(QUIC_V1, dcid, src, packet);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), SIGNED_RETRY);
+        assertEquals(SIGNED_RETRY, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -315,17 +316,17 @@ public class PacketEncryptionTest {
         clientEngine.verifyRetryPacket(QUIC_V1, dcid, packet);
     }
 
-    @Test(expectedExceptions = AEADBadTagException.class)
-    public void testVerifyBadRetry() throws NoSuchAlgorithmException, AEADBadTagException, QuicTransportException {
-        QuicTLSEngine clientEngine = getQuicV1Engine(SSLContext.getDefault(), true);
-        ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
-
-        ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(SIGNED_RETRY));
-
-        // change one byte of AEAD tag
-        packet.put(packet.limit() - 1, (byte)0);
-        clientEngine.verifyRetryPacket(QUIC_V1, dcid, packet);
-        fail("Verification should have failed");
+    @Test
+    public void testVerifyBadRetry() {
+        Assertions.assertThrows(AEADBadTagException.class, () -> {
+            QuicTLSEngine clientEngine = getQuicV1Engine(SSLContext.getDefault(), true);
+            ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
+            ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(SIGNED_RETRY));
+            // change one byte of AEAD tag
+            packet.put(packet.limit() - 1, (byte)0);
+            clientEngine.verifyRetryPacket(QUIC_V1, dcid, packet);
+            fail("Verification should have failed");
+        });
     }
 
     @Test
@@ -346,7 +347,7 @@ public class PacketEncryptionTest {
         clientEngine.encryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN , new FixedHeaderContent(header), payload, packet);
         protect(QuicTLSEngine.KeySpace.ONE_RTT, packet, ONERTT_PN_OFFSET, ONERTT_PAYLOAD_OFFSET - ONERTT_PN_OFFSET, clientEngine, 0x1f);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), ENCRYPTED_ONERTT_PAYLOAD);
+        assertEquals(ENCRYPTED_ONERTT_PAYLOAD, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -367,7 +368,7 @@ public class PacketEncryptionTest {
 
         String expectedContents = ONERTT_HEADER + ONERTT_PAYLOAD;
 
-        assertEquals(HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()), expectedContents);
+        assertEquals(expectedContents, HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()));
     }
 
     @Test
@@ -397,25 +398,24 @@ public class PacketEncryptionTest {
         serverEngine.decryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN, keyPhase, src, ONERTT_PAYLOAD_OFFSET, packet);
     }
 
-    @Test(expectedExceptions = AEADBadTagException.class)
-    public void testDecryptChaChaBadTag() throws Exception {
-        QuicTLSEngineImpl serverEngine = (QuicTLSEngineImpl) getQuicV1Engine(SSLContext.getDefault(), false);
-        // mark the TLS handshake as FINISHED
-        QuicTLSEngineImplAccessor.completeHandshake(serverEngine);
-        SecretKey key = new SecretKeySpec(HexFormat.of().parseHex(ONERTT_SECRET), 0, 32, "ChaCha20-Poly1305");
-        QuicTLSEngineImplAccessor.testDeriveOneRTTKeys(QUIC_V1, serverEngine, key, key, "TLS_CHACHA20_POLY1305_SHA256", false);
-
-        ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_ONERTT_PAYLOAD));
-        unprotect(QuicTLSEngine.KeySpace.ONE_RTT, packet, ONERTT_PN_OFFSET, ONERTT_PAYLOAD_OFFSET - ONERTT_PN_OFFSET, serverEngine, 0x1f);
-        ByteBuffer src = packet.asReadOnlyBuffer();
-        packet.position(ONERTT_PAYLOAD_OFFSET);
-
-        // change one byte of AEAD tag
-        packet.put(packet.limit() - 1, (byte)0);
-
-        serverEngine.decryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN, (byte) 0,
-                src, ONERTT_PAYLOAD_OFFSET, packet);
-        fail("Decryption should have failed");
+    @Test
+    public void testDecryptChaChaBadTag() {
+        Assertions.assertThrows(AEADBadTagException.class, () -> {
+            QuicTLSEngineImpl serverEngine = (QuicTLSEngineImpl) getQuicV1Engine(SSLContext.getDefault(), false);
+            // mark the TLS handshake as FINISHED
+            QuicTLSEngineImplAccessor.completeHandshake(serverEngine);
+            SecretKey key = new SecretKeySpec(HexFormat.of().parseHex(ONERTT_SECRET), 0, 32, "ChaCha20-Poly1305");
+            QuicTLSEngineImplAccessor.testDeriveOneRTTKeys(QUIC_V1, serverEngine, key, key, "TLS_CHACHA20_POLY1305_SHA256", false);
+            ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_ONERTT_PAYLOAD));
+            unprotect(QuicTLSEngine.KeySpace.ONE_RTT, packet, ONERTT_PN_OFFSET, ONERTT_PAYLOAD_OFFSET - ONERTT_PN_OFFSET, serverEngine, 0x1f);
+            ByteBuffer src = packet.asReadOnlyBuffer();
+            packet.position(ONERTT_PAYLOAD_OFFSET);
+            // change one byte of AEAD tag
+            packet.put(packet.limit() - 1, (byte)0);
+            serverEngine.decryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN, (byte) 0,
+                    src, ONERTT_PAYLOAD_OFFSET, packet);
+            fail("Decryption should have failed");
+        });
     }
 
 
diff --git a/test/jdk/java/net/httpclient/quic/tls/Quicv2PacketEncryptionTest.java b/test/jdk/java/net/httpclient/quic/tls/Quicv2PacketEncryptionTest.java
index a506495ed5e..285fa2e4cd4 100644
--- a/test/jdk/java/net/httpclient/quic/tls/Quicv2PacketEncryptionTest.java
+++ b/test/jdk/java/net/httpclient/quic/tls/Quicv2PacketEncryptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ import jdk.internal.net.quic.QuicKeyUnavailableException;
 import jdk.internal.net.quic.QuicTLSContext;
 import jdk.internal.net.quic.QuicTLSEngine;
 import jdk.internal.net.quic.QuicTransportException;
-import org.testng.annotations.Test;
 import sun.security.ssl.QuicTLSEngineImpl;
 import sun.security.ssl.QuicTLSEngineImplAccessor;
 
@@ -40,8 +39,11 @@ import java.util.HexFormat;
 import java.util.function.IntFunction;
 
 import static jdk.internal.net.quic.QuicVersion.QUIC_V2;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
@@ -50,7 +52,7 @@ import static org.testng.Assert.fail;
  *          java.base/jdk.internal.net.quic
  * @build java.base/sun.security.ssl.QuicTLSEngineImplAccessor
  * @summary known-answer test for packet encryption and decryption with Quic v2
- * @run testng/othervm Quicv2PacketEncryptionTest
+ * @run junit/othervm Quicv2PacketEncryptionTest
  */
 public class Quicv2PacketEncryptionTest {
 
@@ -182,7 +184,7 @@ public class Quicv2PacketEncryptionTest {
         clientEngine.encryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_C_PN, new FixedHeaderContent(header), payload, packet);
         protect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_C_PN_OFFSET, INITIAL_C_PAYLOAD_OFFSET - INITIAL_C_PN_OFFSET, clientEngine, 0x0f);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), ENCRYPTED_C_PAYLOAD);
+        assertEquals(ENCRYPTED_C_PAYLOAD, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -200,25 +202,24 @@ public class Quicv2PacketEncryptionTest {
 
         String expectedContents = INITIAL_C_HEADER + INITIAL_C_PAYLOAD;
 
-        assertEquals(HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()), expectedContents);
+        assertEquals(expectedContents, HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()));
     }
 
-    @Test(expectedExceptions = AEADBadTagException.class)
+    @Test
     public void testDecryptClientInitialPacketBadTag() throws Exception {
-        QuicTLSEngine serverEngine = getQuicV2Engine(SSLContext.getDefault(), false);
-        ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
-        serverEngine.deriveInitialKeys(QUIC_V2, dcid);
-
-        ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_C_PAYLOAD));
-        unprotect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_C_PN_OFFSET, INITIAL_C_PAYLOAD_OFFSET - INITIAL_C_PN_OFFSET, serverEngine, 0x0f);
-        ByteBuffer src = packet.asReadOnlyBuffer();
-        packet.position(INITIAL_C_PAYLOAD_OFFSET);
-
-        // change one byte of AEAD tag
-        packet.put(packet.limit() - 1, (byte)0);
-
-        serverEngine.decryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_C_PN, -1, src, INITIAL_C_PAYLOAD_OFFSET, packet);
-        fail("Decryption should have failed");
+        Assertions.assertThrows(AEADBadTagException.class, () -> {
+            QuicTLSEngine serverEngine = getQuicV2Engine(SSLContext.getDefault(), false);
+            ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
+            serverEngine.deriveInitialKeys(QUIC_V2, dcid);
+            ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_C_PAYLOAD));
+            unprotect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_C_PN_OFFSET, INITIAL_C_PAYLOAD_OFFSET - INITIAL_C_PN_OFFSET, serverEngine, 0x0f);
+            ByteBuffer src = packet.asReadOnlyBuffer();
+            packet.position(INITIAL_C_PAYLOAD_OFFSET);
+            // change one byte of AEAD tag
+            packet.put(packet.limit() - 1, (byte)0);
+            serverEngine.decryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_C_PN, -1, src, INITIAL_C_PAYLOAD_OFFSET, packet);
+            fail("Decryption should have failed");
+        });
     }
 
     @Test
@@ -239,7 +240,7 @@ public class Quicv2PacketEncryptionTest {
         serverEngine.encryptPacket(QuicTLSEngine.KeySpace.INITIAL, INITIAL_S_PN, new FixedHeaderContent(header), payload, packet);
         protect(QuicTLSEngine.KeySpace.INITIAL, packet, INITIAL_S_PN_OFFSET, INITIAL_S_PAYLOAD_OFFSET - INITIAL_S_PN_OFFSET, serverEngine, 0x0f);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), ENCRYPTED_S_PAYLOAD);
+        assertEquals(ENCRYPTED_S_PAYLOAD, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -257,7 +258,7 @@ public class Quicv2PacketEncryptionTest {
 
         String expectedContents = INITIAL_S_HEADER + INITIAL_S_PAYLOAD;
 
-        assertEquals(HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()), expectedContents);
+        assertEquals(expectedContents, HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()));
     }
 
     @Test
@@ -298,7 +299,7 @@ public class Quicv2PacketEncryptionTest {
 
         clientEngine.signRetryPacket(QUIC_V2, dcid, src, packet);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), SIGNED_RETRY);
+        assertEquals(SIGNED_RETRY, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -311,17 +312,17 @@ public class Quicv2PacketEncryptionTest {
         clientEngine.verifyRetryPacket(QUIC_V2, dcid, packet);
     }
 
-    @Test(expectedExceptions = AEADBadTagException.class)
+    @Test
     public void testVerifyBadRetry() throws NoSuchAlgorithmException, AEADBadTagException, QuicTransportException {
-        QuicTLSEngine clientEngine = getQuicV2Engine(SSLContext.getDefault(), true);
-        ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
-
-        ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(SIGNED_RETRY));
-
-        // change one byte of AEAD tag
-        packet.put(packet.limit() - 1, (byte)0);
-        clientEngine.verifyRetryPacket(QUIC_V2, dcid, packet);
-        fail("Verification should have failed");
+        Assertions.assertThrows(AEADBadTagException.class, () -> {
+            QuicTLSEngine clientEngine = getQuicV2Engine(SSLContext.getDefault(), true);
+            ByteBuffer dcid = ByteBuffer.wrap(HexFormat.of().parseHex(INITIAL_DCID));
+            ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(SIGNED_RETRY));
+            // change one byte of AEAD tag
+            packet.put(packet.limit() - 1, (byte)0);
+            clientEngine.verifyRetryPacket(QUIC_V2, dcid, packet);
+            fail("Verification should have failed");
+        });
     }
 
     @Test
@@ -342,7 +343,7 @@ public class Quicv2PacketEncryptionTest {
         clientEngine.encryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN , new FixedHeaderContent(header), payload, packet);
         protect(QuicTLSEngine.KeySpace.ONE_RTT, packet, ONERTT_PN_OFFSET, ONERTT_PAYLOAD_OFFSET - ONERTT_PN_OFFSET, clientEngine, 0x1f);
 
-        assertEquals(HexFormat.of().formatHex(packet.array()), ENCRYPTED_ONERTT_PAYLOAD);
+        assertEquals(ENCRYPTED_ONERTT_PAYLOAD, HexFormat.of().formatHex(packet.array()));
     }
 
     @Test
@@ -362,7 +363,7 @@ public class Quicv2PacketEncryptionTest {
 
         String expectedContents = ONERTT_HEADER + ONERTT_PAYLOAD;
 
-        assertEquals(HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()), expectedContents);
+        assertEquals(expectedContents, HexFormat.of().formatHex(packet.array()).substring(0, expectedContents.length()));
     }
 
     @Test
@@ -392,24 +393,23 @@ public class Quicv2PacketEncryptionTest {
         serverEngine.decryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN, keyphase, src, ONERTT_PAYLOAD_OFFSET, packet);
     }
 
-    @Test(expectedExceptions = AEADBadTagException.class)
+    @Test
     public void testDecryptChaChaBadTag() throws Exception {
-        QuicTLSEngineImpl serverEngine = (QuicTLSEngineImpl) getQuicV2Engine(SSLContext.getDefault(), false);
-        // mark the TLS handshake as FINISHED
-        QuicTLSEngineImplAccessor.completeHandshake(serverEngine);
-        SecretKey key = new SecretKeySpec(HexFormat.of().parseHex(ONERTT_SECRET), 0, 32, "ChaCha20-Poly1305");
-        QuicTLSEngineImplAccessor.testDeriveOneRTTKeys(QUIC_V2, serverEngine, key, key, "TLS_CHACHA20_POLY1305_SHA256", false);
-
-        ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_ONERTT_PAYLOAD));
-        unprotect(QuicTLSEngine.KeySpace.ONE_RTT, packet, ONERTT_PN_OFFSET, ONERTT_PAYLOAD_OFFSET - ONERTT_PN_OFFSET, serverEngine, 0x1f);
-        ByteBuffer src = packet.asReadOnlyBuffer();
-        packet.position(ONERTT_PAYLOAD_OFFSET);
-
-        // change one byte of AEAD tag
-        packet.put(packet.limit() - 1, (byte)0);
-
-        serverEngine.decryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN, 0, src, ONERTT_PAYLOAD_OFFSET, packet);
-        fail("Decryption should have failed");
+        Assertions.assertThrows(AEADBadTagException.class, () -> {
+            QuicTLSEngineImpl serverEngine = (QuicTLSEngineImpl) getQuicV2Engine(SSLContext.getDefault(), false);
+            // mark the TLS handshake as FINISHED
+            QuicTLSEngineImplAccessor.completeHandshake(serverEngine);
+            SecretKey key = new SecretKeySpec(HexFormat.of().parseHex(ONERTT_SECRET), 0, 32, "ChaCha20-Poly1305");
+            QuicTLSEngineImplAccessor.testDeriveOneRTTKeys(QUIC_V2, serverEngine, key, key, "TLS_CHACHA20_POLY1305_SHA256", false);
+            ByteBuffer packet = ByteBuffer.wrap(HexFormat.of().parseHex(ENCRYPTED_ONERTT_PAYLOAD));
+            unprotect(QuicTLSEngine.KeySpace.ONE_RTT, packet, ONERTT_PN_OFFSET, ONERTT_PAYLOAD_OFFSET - ONERTT_PN_OFFSET, serverEngine, 0x1f);
+            ByteBuffer src = packet.asReadOnlyBuffer();
+            packet.position(ONERTT_PAYLOAD_OFFSET);
+            // change one byte of AEAD tag
+            packet.put(packet.limit() - 1, (byte)0);
+            serverEngine.decryptPacket(QuicTLSEngine.KeySpace.ONE_RTT, ONERTT_PN, 0, src, ONERTT_PAYLOAD_OFFSET, packet);
+            fail("Decryption should have failed");
+        });
     }
 
 
diff --git a/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java b/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
index c8920771727..361b053fe43 100644
--- a/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
+++ b/test/jdk/java/net/httpclient/security/filePerms/FileProcessorPermissionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Basic checks for File Processors
- * @run testng/othervm FileProcessorPermissionTest
+ * @run junit/othervm FileProcessorPermissionTest
  */
 
 import java.nio.file.Path;
@@ -32,9 +32,9 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse.BodyHandlers;
-import org.testng.annotations.Test;
 import static java.nio.file.StandardOpenOption.*;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.Test;
 
 public class FileProcessorPermissionTest {
 
diff --git a/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java b/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
index d54e27b89ce..c8d7bb64b36 100644
--- a/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
+++ b/test/jdk/java/net/httpclient/security/filePerms/SecurityBeforeFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifies security checks are performed before existence checks
  *          in pre-defined body processors APIs
- * @run testng/othervm SecurityBeforeFile
+ * @run junit/othervm SecurityBeforeFile
  */
 
 import java.io.FileNotFoundException;
@@ -35,11 +35,13 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse.BodyHandlers;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 import static java.lang.System.out;
 import static java.nio.file.StandardOpenOption.*;
-import static org.testng.Assert.*;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class SecurityBeforeFile {
 
@@ -57,8 +59,7 @@ public class SecurityBeforeFile {
         }
     }
 
-    @DataProvider(name = "handlerOpenOptions")
-    public Object[][] handlerOpenOptions() {
+    public static Object[][] handlerOpenOptions() {
         return new Object[][] {
                 { new OpenOption[] {               } },
                 { new OpenOption[] { CREATE        } },
@@ -66,7 +67,8 @@ public class SecurityBeforeFile {
         };
     }
 
-    @Test(dataProvider = "handlerOpenOptions")
+    @ParameterizedTest
+    @MethodSource("handlerOpenOptions")
     public void BodyHandlersOfFileDownload(OpenOption[] openOptions) {
         Path p = Paths.get("doesNotExistDir");
         if (Files.exists(p))
diff --git a/test/jdk/java/net/vthread/BlockingSocketOps.java b/test/jdk/java/net/vthread/BlockingSocketOps.java
index ef58e06b915..d3db734f36a 100644
--- a/test/jdk/java/net/vthread/BlockingSocketOps.java
+++ b/test/jdk/java/net/vthread/BlockingSocketOps.java
@@ -35,6 +35,7 @@
  * @library /test/lib
  * @run junit/othervm -Djdk.pollerMode=1 BlockingSocketOps
  * @run junit/othervm -Djdk.pollerMode=2 BlockingSocketOps
+ * @run junit/othervm -Djdk.pollerMode=3 BlockingSocketOps
  */
 
 /*
diff --git a/test/jdk/java/nio/channels/SocketChannel/ConnectionRefusedMessage.java b/test/jdk/java/nio/channels/SocketChannel/ConnectionRefusedMessage.java
new file mode 100644
index 00000000000..d71bc6569cb
--- /dev/null
+++ b/test/jdk/java/nio/channels/SocketChannel/ConnectionRefusedMessage.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
+import java.time.Duration;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+/*
+ * @test
+ * @bug 8376290
+ * @summary Verify that when a SocketChannel is registered with a Selector
+ *          with an interest in CONNECT operation, then SocketChannel.finishConnect()
+ *          throws the correct exception message, if the connect() fails
+ * @run junit/othervm -Djdk.includeInExceptions=hostInfoExclSocket ${test.main.class}
+ * @run junit/othervm -Djdk.includeInExceptions=hostInfo -Dcheck.relaxed=true ${test.main.class}
+ */
+class ConnectionRefusedMessage {
+
+    /*
+     * On a non-blocking SocketChannel, registered with a Selector, this test method
+     * attempts a SocketChannel.connect() against an address that is expected to return
+     * Connection refused. The test then calls SocketChannel.finishConnect() when the
+     * Selector makes available the ready key for this connect operation and expects
+     * that finishConnect() throws a ConnectException with the expected exception message.
+     */
+    @Test
+    void testFinishConnect() throws Exception {
+        // find a suitable address against which the connect() attempt
+        // will result in a Connection refused exception
+        final InetSocketAddress destAddr = findSuitableRefusedAddress();
+        // skip the test if we couldn't find a port which would raise a connection refused error
+        assumeTrue(destAddr != null,
+                "couldn't find a suitable port which will generate a connection refused error");
+        try (Selector selector = Selector.open();
+             SocketChannel sc = SocketChannel.open()) {
+
+            // non-blocking
+            sc.configureBlocking(false);
+            sc.register(selector, SelectionKey.OP_CONNECT);
+
+            System.err.println("establishing connection to " + destAddr);
+            boolean connected;
+            try {
+                connected = sc.connect(destAddr);
+            } catch (ConnectException ce) {
+                // Connect failed immediately, which is OK.
+                System.err.println("SocketChannel.connect() threw ConnectException - " + ce);
+                assertExceptionMessage(ce);
+                return; // nothing more to test
+            }
+            // this test checks the exception message of a ConnectException, so it's
+            // OK to skip the test if something unexpectedly accepted the connection
+            assumeFalse(connected, "unexpectedly connected to " + destAddr);
+            // wait for ready ops
+            int numReady = selector.select(Duration.ofMinutes(10).toMillis());
+            System.err.println("Num ready keys = " + numReady);
+            for (SelectionKey readyKey : selector.selectedKeys()) {
+                System.err.println("ready key: " + readyKey);
+                assertTrue(readyKey.isConnectable(), "unexpected key, readyOps = "
+                        + readyKey.readyOps());
+                readyKey.cancel();
+                try {
+                    boolean success = sc.finishConnect();
+                    // this test checks the exception message of a ConnectException, so it's
+                    // OK to skip the test if something unexpectedly accepted the connection
+                    assumeFalse(success, "unexpectedly connected to " + destAddr);
+                    // this test doesn't expect finishConnect() to return normally
+                    // with a return value of false
+                    fail("ConnectException was not thrown");
+                } catch (ConnectException ce) {
+                    System.err.println("got (expected) ConnectException from " +
+                            "SocketChannel.finishConnect() - " + ce);
+                    // verify exception message
+                    assertExceptionMessage(ce);
+                }
+            }
+        }
+    }
+
+    private static void assertExceptionMessage(final ConnectException ce) {
+        if ("Connection refused".equals(ce.getMessage())) {
+            return;
+        }
+        if (Boolean.getBoolean("check.relaxed") && ce.getMessage() != null && ce.getMessage().startsWith("Connection refused")) {
+            return;
+        }
+        // propagate the original exception
+        fail("unexpected exception message: " + ce.getMessage(), ce);
+    }
+
+    // Try to find a suitable port to provoke a "Connection Refused" error.
+    private static InetSocketAddress findSuitableRefusedAddress() throws IOException {
+        final InetAddress loopbackAddr = InetAddress.getLoopbackAddress();
+        // Ports 47, 51, 61 are in the IANA reserved port list, and
+        // are currently unassigned to any specific service.
+        // We use them here on the assumption that there won't be
+        // any service listening on them.
+        InetSocketAddress destAddr = new InetSocketAddress(loopbackAddr, 47);
+        try (SocketChannel sc1 = SocketChannel.open(destAddr)) {
+            // we managed to connect (unexpectedly), let's try the next reserved port
+            destAddr = new InetSocketAddress(loopbackAddr, 51);
+            try (SocketChannel sc2 = SocketChannel.open(destAddr)) {
+            }
+            // we managed to connect (unexpectedly again), let's try the next reserved port
+            // as a last attempt
+            destAddr = new InetSocketAddress(loopbackAddr, 61);
+            try (SocketChannel sc3 = SocketChannel.open(destAddr)) {
+            }
+            return null;
+        } catch (ConnectException x) {
+        }
+        // the address which will generate a connection refused, when a connection is attempted
+        return destAddr;
+    }
+}
diff --git a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
index eb2229d927a..7e934301892 100644
--- a/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
+++ b/test/jdk/java/nio/channels/vthread/BlockingChannelOps.java
@@ -35,6 +35,7 @@
  * @library /test/lib
  * @run junit/othervm/timeout=480 -Djdk.pollerMode=1 BlockingChannelOps
  * @run junit/othervm/timeout=480 -Djdk.pollerMode=2 BlockingChannelOps
+ * @run junit/othervm/timeout=480 -Djdk.pollerMode=3 BlockingChannelOps
  */
 
 /*
diff --git a/test/jdk/java/nio/channels/vthread/SelectorOps.java b/test/jdk/java/nio/channels/vthread/SelectorOps.java
index 81821a85791..11fe98a3a01 100644
--- a/test/jdk/java/nio/channels/vthread/SelectorOps.java
+++ b/test/jdk/java/nio/channels/vthread/SelectorOps.java
@@ -34,6 +34,7 @@
  * @library /test/lib
  * @run junit/othervm/native -Djdk.pollerMode=1 --enable-native-access=ALL-UNNAMED SelectorOps
  * @run junit/othervm/native -Djdk.pollerMode=2 --enable-native-access=ALL-UNNAMED SelectorOps
+ * @run junit/othervm/native -Djdk.pollerMode=3 --enable-native-access=ALL-UNNAMED SelectorOps
  */
 
 /*
diff --git a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java
index d5d4b1904ea..870a84a8927 100644
--- a/test/jdk/java/nio/file/DirectoryStream/SecureDS.java
+++ b/test/jdk/java/nio/file/DirectoryStream/SecureDS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @requires (os.family == "linux" | os.family == "mac" | os.family == "aix")
  * @library .. /test/lib
  * @build jdk.test.lib.Platform
- * @run main SecureDS
+ * @run junit SecureDS
  */
 
 import java.nio.file.*;
@@ -35,23 +35,34 @@ import static java.nio.file.Files.*;
 import static java.nio.file.StandardOpenOption.*;
 import static java.nio.file.LinkOption.*;
 import java.nio.file.attribute.*;
-import java.nio.channels.*;
 import java.io.IOException;
 import java.util.*;
 
 import jdk.test.lib.Platform;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class SecureDS {
     static boolean supportsSymbolicLinks;
 
-    public static void main(String[] args) throws IOException {
-        Path dir = TestUtil.createTemporaryDirectory();
+    @ParameterizedTest
+    @ValueSource(strings = {"tmp","cwd"})
+    public void testSecureDS(String mode) throws IOException {
+        Path dir;
+        if (mode.equals("cwd")) {
+            dir = TestUtil.createTemporaryDirectory(System.getProperty("user.dir"));
+        } else {
+            dir = TestUtil.createTemporaryDirectory();
+        }
         try {
             DirectoryStream<Path> stream = newDirectoryStream(dir);
             stream.close();
-            if (!(stream instanceof SecureDirectoryStream)) {
-                throw new AssertionError("SecureDirectoryStream not supported.");
-            }
+            assumeTrue(stream instanceof SecureDirectoryStream);
 
             supportsSymbolicLinks = TestUtil.supportsSymbolicLinks(dir);
 
@@ -94,7 +105,7 @@ public class SecureDS {
         // Test: iterate over all entries
         int count = 0;
         for (Path entry: stream) { count++; }
-        assertTrue(count == (supportsSymbolicLinks ? 4 : 2));
+        assertEquals((supportsSymbolicLinks ? 4 : 2), count);
 
         // Test: getFileAttributeView to access directory's attributes
         assertTrue(stream
@@ -143,13 +154,12 @@ public class SecureDS {
         stream.newByteChannel(fileEntry, opts).close();
         if (supportsSymbolicLinks) {
             stream.newByteChannel(link1Entry, opts).close();
-            try {
+            assertThrows(IOException.class, () -> {
                 Set<OpenOption> mixed = new HashSet<>();
                 mixed.add(READ);
                 mixed.add(NOFOLLOW_LINKS);
                 stream.newByteChannel(link1Entry, mixed).close();
-                shouldNotGetHere();
-            } catch (IOException x) { }
+            });
         }
 
         // Test: newDirectoryStream
@@ -157,11 +167,10 @@ public class SecureDS {
         stream.newDirectoryStream(dirEntry, LinkOption.NOFOLLOW_LINKS).close();
         if (supportsSymbolicLinks) {
             stream.newDirectoryStream(link2Entry).close();
-            try {
+            assertThrows(IOException.class, () -> {
                 stream.newDirectoryStream(link2Entry, LinkOption.NOFOLLOW_LINKS)
                     .close();
-                shouldNotGetHere();
-            } catch (IOException x) { }
+            });
         }
 
         // Test: delete
@@ -189,10 +198,10 @@ public class SecureDS {
 
             // Test setting permission on directory with no permissions
             setPosixFilePermissions(aDir, noperms);
-            assertTrue(getPosixFilePermissions(aDir).equals(noperms));
+            assertEquals(noperms, getPosixFilePermissions(aDir));
             PosixFileAttributeView view = stream.getFileAttributeView(PosixFileAttributeView.class);
             view.setPermissions(permsDir);
-            assertTrue(getPosixFilePermissions(aDir).equals(permsDir));
+            assertEquals(permsDir, getPosixFilePermissions(aDir));
 
             if (supportsSymbolicLinks) {
                 // Create a file and a link to the file
@@ -206,22 +215,21 @@ public class SecureDS {
                 // Test following link to file
                 view = stream.getFileAttributeView(link, PosixFileAttributeView.class);
                 view.setPermissions(noperms);
-                assertTrue(getPosixFilePermissions(file).equals(noperms));
-                assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(permsLink));
+                assertEquals(noperms, getPosixFilePermissions(file));
+                assertEquals(permsLink, getPosixFilePermissions(link, NOFOLLOW_LINKS));
                 view.setPermissions(permsFile);
-                assertTrue(getPosixFilePermissions(file).equals(permsFile));
-                assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(permsLink));
-
+                assertEquals(permsFile, getPosixFilePermissions(file));
+                assertEquals(permsLink, getPosixFilePermissions(link, NOFOLLOW_LINKS));
                 // Symbolic link permissions do not apply on Linux
                 if (!Platform.isLinux()) {
                     // Test not following link to file
                     view = stream.getFileAttributeView(link, PosixFileAttributeView.class, NOFOLLOW_LINKS);
                     view.setPermissions(noperms);
-                    assertTrue(getPosixFilePermissions(file).equals(permsFile));
-                    assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(noperms));
+                    assertEquals(permsFile, getPosixFilePermissions(file));
+                    assertEquals(noperms, getPosixFilePermissions(link, NOFOLLOW_LINKS));
                     view.setPermissions(permsLink);
-                    assertTrue(getPosixFilePermissions(file).equals(permsFile));
-                    assertTrue(getPosixFilePermissions(link, NOFOLLOW_LINKS).equals(permsLink));
+                    assertEquals(permsFile, getPosixFilePermissions(file));
+                    assertEquals(permsLink, getPosixFilePermissions(link, NOFOLLOW_LINKS));
                 }
 
                 delete(link);
@@ -283,18 +291,42 @@ public class SecureDS {
                 SecureDirectoryStream<Path> ts =
                     (SecureDirectoryStream<Path>)newDirectoryStream(testDir);
                 createFile(dir1.resolve(fileEntry));
-                try {
+                assertThrows(AtomicMoveNotSupportedException.class, () -> {
                     stream1.move(fileEntry, ts, target);
-                    shouldNotGetHere();
-                } catch (AtomicMoveNotSupportedException x) { }
+                });
                 ts.close();
                 stream1.deleteFile(fileEntry);
             }
         }
 
-        // clean-up
-        delete(dir1);
-        delete(dir2);
+        // Test: move to cwd
+        final String TEXT = "Sous le pont Mirabeau coule la Seine";
+        Path file = Path.of("file");
+        Path filepath = dir.resolve(file);
+        Path cwd = Path.of(System.getProperty("user.dir"));
+        Path result = cwd.resolve(file);
+        Files.writeString(filepath, TEXT);
+        try (DirectoryStream<Path> ds = Files.newDirectoryStream(dir);) {
+            if (ds instanceof SecureDirectoryStream<Path> sds) {
+                try {
+                    sds.move(file, null, file);
+                } catch (AtomicMoveNotSupportedException e) {
+                    assumeTrue(Files.getFileStore(cwd).equals(Files.getFileStore(dir)));
+                    // re-throw if move between same volume
+                    throw e;
+                }
+                assertEquals(TEXT, Files.readString(result), result + " content incorrect");
+            } else {
+                fail("Not a SecureDirectoryStream");
+            }
+        } finally {
+            boolean fileDeleted = Files.deleteIfExists(filepath);
+            if (!fileDeleted)
+                Files.deleteIfExists(result);
+            // clean-up
+            delete(dir1);
+            delete(dir2);
+        }
     }
 
     // null and ClosedDirectoryStreamException
@@ -306,86 +338,59 @@ public class SecureDS {
             (SecureDirectoryStream<Path>)newDirectoryStream(dir);
 
         // NullPointerException
-        try {
+        assertThrows(NullPointerException.class, () -> {
             stream.getFileAttributeView(null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.getFileAttributeView(null, BasicFileAttributeView.class);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.getFileAttributeView(file, null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.newByteChannel(null, EnumSet.of(CREATE,WRITE));
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.newByteChannel(null, EnumSet.of(CREATE,WRITE,null));
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.newByteChannel(file, null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.move(null, stream, file);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
-            stream.move(file, null, file);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.move(file, stream, null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.newDirectoryStream(null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.deleteFile(null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
-        try {
+        });
+        assertThrows(NullPointerException.class, () -> {
             stream.deleteDirectory(null);
-            shouldNotGetHere();
-        } catch (NullPointerException x) { }
+        });
 
         // close stream
         stream.close();
         stream.close();     // should be no-op
 
         // ClosedDirectoryStreamException
-        try {
+        assertThrows(ClosedDirectoryStreamException.class, () -> {
             stream.newDirectoryStream(file);
-            shouldNotGetHere();
-        } catch (ClosedDirectoryStreamException x) { }
-        try {
+        });
+        assertThrows(ClosedDirectoryStreamException.class, () -> {
             stream.newByteChannel(file, EnumSet.of(READ));
-            shouldNotGetHere();
-        } catch (ClosedDirectoryStreamException x) { }
-        try {
+        });
+        assertThrows(ClosedDirectoryStreamException.class, () -> {
             stream.move(file, stream, file);
-            shouldNotGetHere();
-        } catch (ClosedDirectoryStreamException x) { }
-        try {
+        });
+        assertThrows(ClosedDirectoryStreamException.class, () -> {
             stream.deleteFile(file);
-            shouldNotGetHere();
-        } catch (ClosedDirectoryStreamException x) { }
+        });
 
         // clean-up
         delete(dir.resolve(file));
     }
-
-    static void assertTrue(boolean b) {
-        if (!b) throw new RuntimeException("Assertion failed");
-    }
-
-    static void shouldNotGetHere() {
-        assertTrue(false);
-    }
 }
diff --git a/test/jdk/java/nio/file/FileStore/Basic.java b/test/jdk/java/nio/file/FileStore/Basic.java
index 052348c1f02..14450aa525b 100644
--- a/test/jdk/java/nio/file/FileStore/Basic.java
+++ b/test/jdk/java/nio/file/FileStore/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,39 +28,53 @@
  * @library .. /test/lib
  * @build jdk.test.lib.Platform
  *        jdk.test.lib.util.FileUtils
- * @run main Basic
+ * @run junit Basic
  */
 
-import java.nio.file.*;
-import java.nio.file.attribute.*;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.FileStore;
+import java.nio.file.FileSystemException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.attribute.AclFileAttributeView;
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.DosFileAttributeView;
+import java.nio.file.attribute.FileAttributeView;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.nio.file.attribute.UserDefinedFileAttributeView;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.StreamSupport;
+
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import jdk.test.lib.Platform;
 import jdk.test.lib.util.FileUtils;
-import static jdk.test.lib.Asserts.*;
 
 public class Basic {
 
     static final long G = 1024L * 1024L * 1024L;
 
-    public static void main(String[] args) throws IOException {
-        Path dir = TestUtil.createTemporaryDirectory();
-        try {
-            doTests(dir);
-        } finally {
-            TestUtil.removeAll(dir);
-        }
+    static Path[] factory(@TempDir Path tempDir) {
+        return new Path[] { tempDir };
     }
 
     static void checkWithin1GB(String space, long expected, long actual) {
         long diff = Math.abs(actual - expected);
-        if (diff > G) {
-            String msg = String.format("%s: |actual %d - expected %d| = %d (%f G)",
+        assertTrue(diff <= G, () -> String.format("%s: |actual %d - expected %d| = %d (%f G)",
                                        space, actual, expected, diff,
-                                       (float)diff/G);
-            throw new RuntimeException(msg);
-        }
+                                       (float)diff/G));
     }
 
     static <V extends FileAttributeView> void testFileAttributes(Path file,
@@ -68,7 +82,7 @@ public class Basic {
                                                                  String viewName) throws IOException {
         FileStore store = Files.getFileStore(file);
         boolean supported = store.supportsFileAttributeView(viewClass);
-        assertTrue(store.supportsFileAttributeView(viewName) == supported);
+        assertEquals(store.supportsFileAttributeView(viewName), supported);
         // If the file attribute view is supported by the FileStore then
         // Files.getFileAttributeView should return that view
         if (supported) {
@@ -76,103 +90,124 @@ public class Basic {
         }
     }
 
-    static void doTests(Path dir) throws IOException {
-        /**
-         * Test: Directory should be on FileStore that is writable
-         */
-        assertTrue(!Files.getFileStore(dir).isReadOnly());
+    /*
+     * Test: Directory should be on FileStore that is writable
+     */
+    @ParameterizedTest
+    @MethodSource("factory")
+    void testDirectoryWritable(Path dir) throws IOException {
+        assertFalse(Files.getFileStore(dir).isReadOnly());
+    }
 
-        /**
-         * Test: Two files should have the same FileStore
-         */
+    /*
+     * Test: Two files should have the same FileStore
+     */
+    @ParameterizedTest
+    @MethodSource("factory")
+    void testEquality(Path dir) throws IOException {
         Path file1 = Files.createFile(dir.resolve("foo"));
         Path file2 = Files.createFile(dir.resolve("bar"));
         FileStore store1 = Files.getFileStore(file1);
         FileStore store2 = Files.getFileStore(file2);
-        assertTrue(store1.equals(store2));
-        assertTrue(store2.equals(store1));
-        assertTrue(store1.hashCode() == store2.hashCode());
+        assertEquals(store1, store2);
+        assertEquals(store2, store1);
+        assertEquals(store1.hashCode(), store2.hashCode());
+    }
 
-        if (Platform.isWindows()) {
-            /**
-             * Test: FileStore.equals() should not be case sensitive
-             */
-            FileStore upper = Files.getFileStore(Path.of("C:\\"));
-            FileStore lower = Files.getFileStore(Path.of("c:\\"));
-            assertTrue(lower.equals(upper));
-        }
+    /*
+     * Test: FileStore should not be case sensitive
+     */
+    @ParameterizedTest
+    @MethodSource("factory")
+    @EnabledOnOs({OS.WINDOWS})
+    void testCaseSensitivity(Path dir) throws IOException {
+        FileStore upper = Files.getFileStore(Path.of("C:\\"));
+        FileStore lower = Files.getFileStore(Path.of("c:\\"));
+        assertEquals(lower, upper);
+    }
 
-        /**
-         * Test: File and FileStore attributes
-         */
-        assertTrue(store1.supportsFileAttributeView("basic"));
+    /*
+     * Test: File and FileStore attributes
+     */
+    @ParameterizedTest
+    @MethodSource("factory")
+    void testAttributes(Path dir) throws IOException {
+        Path file = Files.createFile(dir.resolve("foo"));
+        FileStore store = Files.getFileStore(file);
+        assertTrue(store.supportsFileAttributeView("basic"));
         testFileAttributes(dir, BasicFileAttributeView.class, "basic");
         testFileAttributes(dir, PosixFileAttributeView.class, "posix");
         testFileAttributes(dir, DosFileAttributeView.class, "dos");
         testFileAttributes(dir, AclFileAttributeView.class, "acl");
         testFileAttributes(dir, UserDefinedFileAttributeView.class, "user");
+    }
 
-        /**
-         * Test: Space atributes
-         */
-        File f = file1.toFile();
+    /*
+     * Test: Space attributes
+     */
+    @ParameterizedTest
+    @MethodSource("factory")
+    void testSpaceAttributes(Path dir) throws IOException {
+        Path file = Files.createFile(dir.resolve("foo"));
+        FileStore store = Files.getFileStore(file);
+        File f = file.toFile();
 
         // check values are "close"
-        checkWithin1GB("total",  f.getTotalSpace(),  store1.getTotalSpace());
-        checkWithin1GB("free",   f.getFreeSpace(),   store1.getUnallocatedSpace());
-        checkWithin1GB("usable", f.getUsableSpace(), store1.getUsableSpace());
+        checkWithin1GB("total",  f.getTotalSpace(),  store.getTotalSpace());
+        checkWithin1GB("free",   f.getFreeSpace(),   store.getUnallocatedSpace());
+        checkWithin1GB("usable", f.getUsableSpace(), store.getUsableSpace());
 
         // get values by name
         checkWithin1GB("total",  f.getTotalSpace(),
-                       (Long)store1.getAttribute("totalSpace"));
+                       (Long)store.getAttribute("totalSpace"));
         checkWithin1GB("free",   f.getFreeSpace(),
-                       (Long)store1.getAttribute("unallocatedSpace"));
+                       (Long)store.getAttribute("unallocatedSpace"));
         checkWithin1GB("usable", f.getUsableSpace(),
-                       (Long)store1.getAttribute("usableSpace"));
+                       (Long)store.getAttribute("usableSpace"));
+    }
 
-        /**
-         * Test: Enumerate all FileStores
-         */
-        if (FileUtils.areMountPointsAccessibleAndUnique()) {
-            FileStore prev = null;
-            for (FileStore store: FileSystems.getDefault().getFileStores()) {
-                System.out.format("%s (name=%s type=%s)\n", store, store.name(),
-                    store.type());
+    /*
+     * Test: Enumerate all FileStores
+     */
+    @ParameterizedTest
+    @MethodSource("factory")
+    void testEnumerateFileStores(Path dir) throws IOException {
+        assumeTrue(FileUtils.areMountPointsAccessibleAndUnique());
+        List<FileStore> stores = StreamSupport.stream(FileSystems.getDefault()
+                                 .getFileStores().spliterator(), false)
+                                 .toList();
+        Set<FileStore> uniqueStores = new HashSet<>(stores);
+        assertEquals(stores.size(), uniqueStores.size(), "FileStores should be unique");
+        for (FileStore store: stores) {
+            System.err.format("%s (name=%s type=%s)\n", store, store.name(),
+                store.type());
 
-                // check space attributes are accessible
-                try {
-                    store.getTotalSpace();
-                    store.getUnallocatedSpace();
-                    store.getUsableSpace();
-                } catch (NoSuchFileException nsfe) {
-                    // ignore exception as the store could have been
-                    // deleted since the iterator was instantiated
-                    System.err.format("%s was not found\n", store);
-                } catch (AccessDeniedException ade) {
-                    // ignore exception as the lack of ability to access the
-                    // store due to lack of file permission or similar does not
-                    // reflect whether the space attributes would be accessible
-                    // were access to be permitted
-                    System.err.format("%s is inaccessible\n", store);
-                } catch (FileSystemException fse) {
-                    // On Linux, ignore the FSE if the path is one of the
-                    // /run/user/$UID mounts created by pam_systemd(8) as it
-                    // might be mounted as a fuse.portal filesystem and
-                    // its access attempt might fail with EPERM
-                    if (!Platform.isLinux() || store.toString().indexOf("/run/user") == -1) {
-                        throw new RuntimeException(fse);
-                    } else {
-                        System.err.format("%s error: %s\n", store, fse);
-                    }
+            // check space attributes are accessible
+            try {
+                store.getTotalSpace();
+                store.getUnallocatedSpace();
+                store.getUsableSpace();
+            } catch (NoSuchFileException nsfe) {
+                // ignore exception as the store could have been
+                // deleted since the iterator was instantiated
+                System.err.format("%s was not found\n", store);
+            } catch (AccessDeniedException ade) {
+                // ignore exception as the lack of ability to access the
+                // store due to lack of file permission or similar does not
+                // reflect whether the space attributes would be accessible
+                // were access to be permitted
+                System.err.format("%s is inaccessible\n", store);
+            } catch (FileSystemException fse) {
+                // On Linux, ignore the FSE if the path is one of the
+                // /run/user/$UID mounts created by pam_systemd(8) as it
+                // might be mounted as a fuse.portal filesystem and
+                // its access attempt might fail with EPERM
+                if (!Platform.isLinux() || store.toString().indexOf("/run/user") == -1) {
+                    throw new RuntimeException(fse);
+                } else {
+                    System.err.format("%s error: %s\n", store, fse);
                 }
-
-                // two distinct FileStores should not be equal
-                assertTrue(!store.equals(prev));
-                prev = store;
             }
-        } else {
-            System.err.println
-                ("Skipping FileStore check due to file system access failure");
         }
     }
 }
diff --git a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
index 4586c33521f..b729438812f 100644
--- a/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
+++ b/test/jdk/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,12 @@
 /* @test
  * @bug 4313887 6838333 8273922
  * @summary Unit test for java.nio.file.attribute.UserDefinedFileAttributeView
+ *     (use -Dseed=X to set PRNG seed)
  * @library ../.. /test/lib
  * @key randomness
  * @build jdk.test.lib.Platform
+ * @build jdk.test.lib.RandomFactory
+ * @build jtreg.SkippedException
  * @run main Basic
  */
 
@@ -38,17 +41,20 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
-import static java.nio.file.LinkOption.*;
-import java.nio.file.attribute.*;
+import java.nio.file.attribute.UserDefinedFileAttributeView;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Random;
+
 import jdk.test.lib.Platform;
+import jdk.test.lib.RandomFactory;
+
+import jtreg.SkippedException;
 
 public class Basic {
 
     // Must be indeterministic
-    private static final Random rand = new Random();
+    private static final Random rand = RandomFactory.getRandom();
 
     private static final String ATTR_NAME = "mime_type";
     private static final String ATTR_VALUE = "text/plain";
@@ -281,10 +287,8 @@ public class Basic {
         // create temporary directory to run tests
         Path dir = TestUtil.createTemporaryDirectory();
         try {
-            if (!Files.getFileStore(dir).supportsFileAttributeView("user")) {
-                System.out.println("UserDefinedFileAttributeView not supported - skip test");
-                return;
-            }
+            if (!Files.getFileStore(dir).supportsFileAttributeView("user"))
+                throw new SkippedException("UserDefinedFileAttributeView not supported");
 
             // test access to user defined attributes of regular file
             Path file = dir.resolve("foo.html");
@@ -310,7 +314,7 @@ public class Basic {
                 Path link = dir.resolve("link");
                 Files.createSymbolicLink(link, target);
                 try {
-                    test(link, NOFOLLOW_LINKS);
+                    test(link, LinkOption.NOFOLLOW_LINKS);
                 } catch (IOException x) {
                     // access to attributes of sym link may not be supported
                 } finally {
diff --git a/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java
index 3fa349fd671..e7c990ebdbd 100644
--- a/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java
+++ b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,9 @@
  * may be delayed longer than expected.  While this is not a spec violation
  * (because there are no timeliness guarantees for any of these garbage
  * collection-related events), the user might expect that an unreferenced()
- * invocation for an object whose last client has terminated abnorally
+ * invocation for an object whose last client has terminated abnormally
  * should occur on relatively the same time order as the lease value
  * granted.
- * @author Peter Jones
  *
  * @library ../../../testlibrary
  * @modules java.rmi/sun.rmi.registry
@@ -47,40 +46,39 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
 import java.rmi.server.Unreferenced;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.concurrent.CountDownLatch;
 
 public class LeaseCheckInterval implements Remote, Unreferenced {
 
     public static final String BINDING = "LeaseCheckInterval";
+    // lease expiry time (milliseconds)
     private static final long LEASE_VALUE = 10000;
-    private static final long TIMEOUT = 20000;
+    // the maximum allowed duration between the lease expiration and
+    // the Unreferenced.unreferenced() callback method to be invoked
+    private static final Duration EXPECTED_MAX_DURATION = Duration.ofMinutes(1);
 
-    private Object lock = new Object();
-    private boolean unreferencedInvoked = false;
+    // will be counted down when Unreferenced.unreferenced() is invoked
+    private static final CountDownLatch callbackInvocationLatch = new CountDownLatch(1);
 
+    @Override
     public void unreferenced() {
-        System.err.println("unreferenced() method invoked");
-        synchronized (lock) {
-            unreferencedInvoked = true;
-            lock.notify();
-        }
+        System.err.println("[" + Instant.now() + "] unreferenced() method invoked");
+        callbackInvocationLatch.countDown();
     }
 
     public static void main(String[] args) throws Exception {
-
-        System.err.println("\nRegression test for bug 4285878\n");
-
         /*
          * Set the duration of leases granted to a very small value, so that
          * we can test if expirations are detected in a roughly comparable
          * time.
          */
-        System.setProperty("java.rmi.dgc.leaseValue",
-                           String.valueOf(LEASE_VALUE));
-
+        System.setProperty("java.rmi.dgc.leaseValue", String.valueOf(LEASE_VALUE));
+        System.err.println("running test with java.rmi.dgc.leaseValue set to " + LEASE_VALUE);
         LeaseCheckInterval obj = new LeaseCheckInterval();
         JavaVM jvm = null;
 
@@ -90,37 +88,32 @@ public class LeaseCheckInterval implements Remote, Unreferenced {
 
             Registry localRegistry = TestLibrary.createRegistryOnEphemeralPort();
             int registryPort = TestLibrary.getRegistryPort(localRegistry);
-            System.err.println("created local registry");
+            System.err.println("created local registry on port " + registryPort);
 
             localRegistry.bind(BINDING, obj);
             System.err.println("bound remote object in local registry");
 
-            synchronized (obj.lock) {
-                System.err.println("starting remote client VM...");
-                jvm = new JavaVM("SelfTerminator", "-Drmi.registry.port=" +
-                            registryPort, "");
-                jvm.start();
-
-                System.err.println("waiting for unreferenced() callback...");
-                obj.lock.wait(TIMEOUT);
-
-                if (obj.unreferencedInvoked) {
-                    System.err.println("TEST PASSED: " +
-                        "unreferenced() invoked in timely fashion");
-                } else {
-                    throw new RuntimeException(
-                        "TEST FAILED: unreferenced() not invoked after " +
-                        ((double) TIMEOUT / 1000.0) + " seconds");
-                }
-            }
-
-        } catch (Exception e) {
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            } else {
-                throw new RuntimeException(
-                    "TEST FAILED: unexpected exception: " + e.toString());
+            System.err.println("starting remote client VM...");
+            jvm = new JavaVM("SelfTerminator", "-Drmi.registry.port=" + registryPort, "");
+            // launch the self terminating java application which will lookup
+            // the bound object (thus creating a lease) and then terminate itself (thus
+            // creating the condition for a lease expiry).
+            jvm.start();
+            final Instant startTime = Instant.now();
+            System.err.println("waiting for SelfTerminator process to complete");
+            final int exitCode = jvm.waitFor();
+            if (exitCode != 0) {
+                throw new AssertionError("SelfTerminator process exited with" +
+                        " a non-zero exit code: " + exitCode);
             }
+            System.err.println("SelfTerminator process completed in "
+                    + Duration.between(startTime, Instant.now())
+                    + ", now waiting for Unreferenced.unreferenced() callback to be invoked");
+            callbackInvocationLatch.await();
+            final Instant waitEndedAt = Instant.now();
+            final Duration waitDuration = assertWithinExpectedTimeLimit(waitEndedAt, startTime);
+            System.err.println("TEST PASSED: unreferenced() invoked in timely" +
+                    " fashion (duration=" + waitDuration + ")");
         } finally {
             if (jvm != null) {
                 jvm.destroy();
@@ -135,4 +128,22 @@ public class LeaseCheckInterval implements Remote, Unreferenced {
             }
         }
     }
+
+    /*
+     * Verifies that the duration between the lease expiration and the callback
+     * invocation is within the expected limit. Throws an exception if the wait
+     * duration is larger than expected limit, else returns the actual wait duration.
+     */
+    private static Duration assertWithinExpectedTimeLimit(final Instant waitEndedAt,
+                                                          final Instant terminationStartedAt) {
+
+        final Duration waitDuration = Duration.between(terminationStartedAt, waitEndedAt);
+        System.out.println("wait completed in " + waitDuration);
+        if (waitDuration.compareTo(EXPECTED_MAX_DURATION) > 0) {
+            throw new RuntimeException("Took unexpectedly long (duration=" +
+                    waitDuration + ") to invoke Unreferenced.unreferenced()," +
+                    " expected max duration=" + EXPECTED_MAX_DURATION);
+        }
+        return waitDuration;
+    }
 }
diff --git a/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java
index 4875634dbb3..36ebbf05bf1 100644
--- a/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java
+++ b/test/jdk/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,26 +21,32 @@
  * questions.
  */
 
-/*
- *
- */
-
 import java.rmi.Remote;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
+import java.time.Instant;
 
 public class SelfTerminator {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         try {
+            log("main() invoked");
             int registryPort =
                 Integer.parseInt(System.getProperty("rmi.registry.port"));
             Registry registry =
                 LocateRegistry.getRegistry("", registryPort);
             Remote stub = registry.lookup(LeaseCheckInterval.BINDING);
+            log("looked up binding, now terminating the process");
             Runtime.getRuntime().halt(0);
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (Throwable t) {
+            log("failure: " + t);
+            t.printStackTrace();
+            throw t; // propagate any failures and fail the process
         }
     }
+
+    private static void log(final String message) {
+        final Instant now = Instant.now();
+        System.err.println("[" + now + "] " + SelfTerminator.class.getName() + " - " + message);
+    }
 }
diff --git a/test/jdk/java/security/CodeSource/CodeSourceNoInputs.java b/test/jdk/java/security/CodeSource/CodeSourceNoInputs.java
new file mode 100644
index 00000000000..e1d2497667b
--- /dev/null
+++ b/test/jdk/java/security/CodeSource/CodeSourceNoInputs.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+
+/**
+ * @test
+ * @bug 8366522
+ * @summary Verify that getCertificates() and getCodeSigners() return correct
+ *          results when CodeSource is created with empty or null Certificate[]
+ *          or CodeSigner[] arguments, or there are no X509 certificates in
+ *          certs. Make sure that NPE is not thrown from
+ *          CodeSource.getCodeSigners()
+ */
+public class CodeSourceNoInputs {
+    private static final Certificate NON_X509_CERT = new Certificate("") {
+        @Override
+        public byte[] getEncoded() {
+            return new byte[0];
+        }
+
+        @Override
+        public void verify(PublicKey key) {
+        }
+
+        @Override
+        public void verify(PublicKey key, String sigProvider) {
+        }
+
+        @Override
+        public String toString() {
+            return "";
+        }
+
+        @Override
+        public PublicKey getPublicKey() {
+            return null;
+        }
+    };
+
+    public static void main(String[] args) throws Exception {
+        CodeSource cs;
+
+        cs = new CodeSource(null, (Certificate[]) null);
+        if (cs.getCodeSigners() != null || cs.getCertificates() != null) {
+
+            throw new SecurityException("Both CodeSource.getCodeSigners() " +
+                "and CodeSource.getCertificates() should return null for " +
+                "new CodeSource(null, (Certificate[]) null)");
+        }
+
+        cs = new CodeSource(null, (CodeSigner[]) null);
+        if (cs.getCodeSigners() != null || cs.getCertificates() != null) {
+
+            throw new SecurityException("Both CodeSource.getCodeSigners() " +
+                "and CodeSource.getCertificates() should return null for " +
+                "new CodeSource(null, (CodeSigners[]) null)");
+        }
+
+        cs = new CodeSource(null, new Certificate[0]);
+        if (cs.getCodeSigners().length != 0
+            || cs.getCertificates().length != 0) {
+
+            throw new SecurityException("Both CodeSource.getCodeSigners()" +
+                "and CodeSource.getCertificates() should return empty arrays " +
+                "for new CodeSource(null, new Certificate[0])");
+
+        }
+
+        cs = new CodeSource(null, new CodeSigner[0]);
+        if (cs.getCodeSigners().length != 0
+            || cs.getCertificates().length != 0) {
+
+            throw new SecurityException("Both CodeSource.getCodeSigners() and" +
+                " CodeSource.getCertificates() should return empty arrays for" +
+                " new CodeSource(null, new CodeSigners[0])");
+        }
+
+        cs = new CodeSource(null, new Certificate[]{NON_X509_CERT});
+        if (cs.getCodeSigners().length != 0 || cs.getCertificates() == null) {
+
+            throw new SecurityException("Both CodeSource.getCodeSigners() and" +
+                " CodeSource.getCertificates() should return arrays for new" +
+                " CodeSource(null, new CodeSigners[1]{NON-X509-CERTIFICATE})");
+        }
+    }
+}
diff --git a/test/jdk/java/security/KeyStore/DisabledKnownType.java b/test/jdk/java/security/KeyStore/DisabledKnownType.java
new file mode 100644
index 00000000000..70b7228f4c2
--- /dev/null
+++ b/test/jdk/java/security/KeyStore/DisabledKnownType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8373690
+ * @summary verify that the exception message indicates the keystore type
+ *         when the type is disabled instead of being unrecognized
+ * @run main/othervm -Djdk.crypto.disabledAlgorithms=KeyStore.PKCS12 DisabledKnownType
+ */
+
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+
+public class DisabledKnownType {
+    public static void main(String[] args) throws Exception {
+        String cacertsPath = System.getProperty("java.home") +
+                "/lib/security/cacerts";
+        try {
+            KeyStore ks = KeyStore.getInstance(new java.io.File(cacertsPath),
+                    "changeit".toCharArray());
+            throw new RuntimeException("Expected KeyStoreException not thrown");
+        } catch (KeyStoreException kse) {
+            if (kse.getMessage().contains("PKCS12")) {
+                System.out.println("Passed: expected ex thrown: " + kse);
+            } else {
+                // pass it up
+                throw kse;
+            }
+        }
+    }
+}
+
diff --git a/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java b/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java
index 8218c9cb48a..e39793cf1b7 100644
--- a/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java
+++ b/test/jdk/java/security/KeyStore/TestKeyStoreBasic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,18 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.security.*;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.PEMDecoder;
+import java.security.PrivateKey;
+import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
+import java.time.Instant;
 
 /*
  * @test
- * @bug 8048621 8133090 8167371 8236671
+ * @bug 8048621 8133090 8167371 8236671 8374808
  * @enablePreview
  * @summary Test basic operations with keystores (jks, jceks, pkcs12)
  * @author Yu-Ching Valerie PENG
@@ -177,6 +182,8 @@ public class TestKeyStoreBasic {
 
         // compare the creation date of the 2 key stores for all aliases
         compareCreationDate(ks, ks2, numEntries);
+        compareCreationInstant(ks, ks2, numEntries);
+
         // remove the last entry from the 2nd key store
         numEntries--;
         ks2.deleteEntry(ALIAS_HEAD + numEntries);
@@ -213,6 +220,7 @@ public class TestKeyStoreBasic {
 
         // compare the creation date of the 2 key stores for all aliases
         compareCreationDate(ks, ks2, numEntries);
+        compareCreationInstant(ks, ks2, numEntries);
 
         // check setEntry/getEntry with a password protection algorithm
         if ("PKCS12".equalsIgnoreCase(ks.getType())) {
@@ -284,6 +292,23 @@ public class TestKeyStoreBasic {
         }
     }
 
+    // compare the creation instants - true if all the same
+    private void compareCreationInstant(KeyStore o1, KeyStore o2, int range)
+            throws KeyStoreException {
+        String alias;
+        for (int k = 0; k < range; k++) {
+            alias = ALIAS_HEAD + k;
+            final Instant instant1 = o1.getCreationInstant(alias);
+            final Instant instant2 = o2.getCreationInstant(alias);
+            if (!(instant1.equals(instant2))) {
+                throw new RuntimeException("ERROR: entry creation time (" + k
+                                           + ") differs Instants {"
+                                           + instant1 + " - "
+                                           + instant2 + "}");
+            }
+        }
+    }
+
     // checks if an exception was caused by specified exception class
     private static boolean causedBy(Exception e, Class klass) {
         Throwable cause = e;
diff --git a/test/jdk/java/sql/JavatimeTest.java b/test/jdk/java/sql/JavatimeTest.java
deleted file mode 100644
index 89344d7cdc6..00000000000
--- a/test/jdk/java/sql/JavatimeTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- *@test
- *@bug 8007520
- *@summary Test those bridge methods to/from java.time date/time classes
- * @key randomness
- */
-
-import java.util.Random;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
-public class JavatimeTest {
-
-    static final int NANOS_PER_SECOND = 1000000000;
-
-    public static void main(String[] args) throws Throwable {
-        int N = 10000;
-        long t1970 = new java.util.Date(70, 0, 01).getTime();
-        Random r = new Random();
-        for (int i = 0; i < N; i++) {
-            int days  = r.nextInt(50) * 365 + r.nextInt(365);
-            long secs = t1970 + days * 86400 + r.nextInt(86400);
-            int nanos = r.nextInt(NANOS_PER_SECOND);
-            int nanos_ms = nanos / 1000000 * 1000000; // millis precision
-            long millis = secs * 1000 + r.nextInt(1000);
-
-            LocalDateTime ldt = LocalDateTime.ofEpochSecond(secs, nanos, ZoneOffset.UTC);
-            LocalDateTime ldt_ms = LocalDateTime.ofEpochSecond(secs, nanos_ms, ZoneOffset.UTC);
-            Instant inst = Instant.ofEpochSecond(secs, nanos);
-            Instant inst_ms = Instant.ofEpochSecond(secs, nanos_ms);
-            //System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-
-            /////////// Timestamp ////////////////////////////////
-            Timestamp ta = new Timestamp(millis);
-            ta.setNanos(nanos);
-            if (!isEqual(ta.toLocalDateTime(), ta)) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                print(ta.toLocalDateTime(), ta);
-                throw new RuntimeException("FAILED: j.s.ts -> ldt");
-            }
-            if (!isEqual(ldt, Timestamp.valueOf(ldt))) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                print(ldt, Timestamp.valueOf(ldt));
-                throw new RuntimeException("FAILED: ldt -> j.s.ts");
-            }
-            Instant inst0 = ta.toInstant();
-            if (ta.getTime() != inst0.toEpochMilli() ||
-                ta.getNanos() != inst0.getNano() ||
-                !ta.equals(Timestamp.from(inst0))) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                throw new RuntimeException("FAILED: j.s.ts -> instant -> j.s.ts");
-            }
-            inst = Instant.ofEpochSecond(secs, nanos);
-            Timestamp ta0 = Timestamp.from(inst);
-            if (ta0.getTime() != inst.toEpochMilli() ||
-                ta0.getNanos() != inst.getNano() ||
-                !inst.equals(ta0.toInstant())) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                throw new RuntimeException("FAILED: instant -> timestamp -> instant");
-            }
-
-            ////////// java.sql.Date /////////////////////////////
-            // j.s.d/t uses j.u.d.equals() !!!!!!!!
-            java.sql.Date jsd = new java.sql.Date(millis);
-            if (!isEqual(jsd.toLocalDate(), jsd)) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                print(jsd.toLocalDate(), jsd);
-                throw new RuntimeException("FAILED: j.s.d -> ld");
-            }
-            LocalDate ld = ldt.toLocalDate();
-            if (!isEqual(ld, java.sql.Date.valueOf(ld))) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                print(ld, java.sql.Date.valueOf(ld));
-                throw new RuntimeException("FAILED: ld -> j.s.d");
-            }
-            ////////// java.sql.Time /////////////////////////////
-            java.sql.Time jst = new java.sql.Time(millis);
-            if (!isEqual(jst.toLocalTime(), jst)) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                print(jst.toLocalTime(), jst);
-                throw new RuntimeException("FAILED: j.s.t -> lt");
-            }
-            // millis precision
-            LocalTime lt = ldt_ms.toLocalTime();
-            if (!isEqual(lt, java.sql.Time.valueOf(lt))) {
-                System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-                print(lt, java.sql.Time.valueOf(lt));
-                throw new RuntimeException("FAILED: lt -> j.s.t");
-            }
-        }
-        System.out.println("Passed!");
-    }
-
-    private static boolean isEqual(LocalDateTime ldt, Timestamp ts) {
-        ZonedDateTime zdt = ZonedDateTime.of(ldt, ZoneId.systemDefault());
-        return zdt.getYear() == ts.getYear() + 1900 &&
-               zdt.getMonthValue() == ts.getMonth() + 1 &&
-               zdt.getDayOfMonth() == ts.getDate() &&
-               zdt.getHour() == ts.getHours() &&
-               zdt.getMinute() == ts.getMinutes() &&
-               zdt.getSecond() == ts.getSeconds() &&
-               zdt.getNano() == ts.getNanos();
-    }
-
-    private static void print(LocalDateTime ldt, Timestamp ts) {
-        ZonedDateTime zdt = ZonedDateTime.of(ldt, ZoneId.systemDefault());
-        System.out.printf("ldt:ts  %d/%d, %d/%d, %d/%d, %d/%d, %d/%d, %d/%d, nano:[%d/%d]%n",
-               zdt.getYear(), ts.getYear() + 1900,
-               zdt.getMonthValue(), ts.getMonth() + 1,
-               zdt.getDayOfMonth(), ts.getDate(),
-               zdt.getHour(), ts.getHours(),
-               zdt.getMinute(), ts.getMinutes(),
-               zdt.getSecond(), ts.getSeconds(),
-               zdt.getNano(), ts.getNanos());
-    }
-
-    private static boolean isEqual(LocalDate ld, java.sql.Date d) {
-        return ld.getYear() == d.getYear() + 1900 &&
-               ld.getMonthValue() == d.getMonth() + 1 &&
-               ld.getDayOfMonth() == d.getDate();
-    }
-
-    private static void print(LocalDate ld, java.sql.Date d) {
-        System.out.printf("%d/%d, %d/%d, %d/%d%n",
-               ld.getYear(), d.getYear() + 1900,
-               ld.getMonthValue(), d.getMonth() + 1,
-               ld.getDayOfMonth(), d.getDate());
-    }
-
-    private static boolean isEqual(LocalTime lt, java.sql.Time t) {
-        return lt.getHour() == t.getHours() &&
-               lt.getMinute() == t.getMinutes() &&
-               lt.getSecond() == t.getSeconds();
-    }
-
-    private static void print(LocalTime lt, java.sql.Time t) {
-        System.out.printf("%d/%d, %d/%d, %d/%d%n",
-                          lt.getHour(), t.getHours(),
-                          lt.getMinute(), t.getMinutes(),
-                          lt.getSecond(), t.getSeconds());
-    }
-}
diff --git a/test/jdk/java/sql/test/TEST.properties b/test/jdk/java/sql/test/TEST.properties
new file mode 100644
index 00000000000..97c9e7bbe18
--- /dev/null
+++ b/test/jdk/java/sql/test/TEST.properties
@@ -0,0 +1,3 @@
+# JDBC unit tests uses JUnit
+JUnit.dirs= .
+lib.dirs = /java/sql/util
diff --git a/test/jdk/java/sql/testng/test/sql/BatchUpdateExceptionTests.java b/test/jdk/java/sql/test/sql/BatchUpdateExceptionTests.java
similarity index 98%
rename from test/jdk/java/sql/testng/test/sql/BatchUpdateExceptionTests.java
rename to test/jdk/java/sql/test/sql/BatchUpdateExceptionTests.java
index 2b1111b7526..2d010b50e41 100644
--- a/test/jdk/java/sql/testng/test/sql/BatchUpdateExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/BatchUpdateExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -28,8 +28,10 @@ import java.io.ObjectInputStream;
 import java.sql.BatchUpdateException;
 import java.sql.SQLException;
 import java.util.Arrays;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.SerializedBatchUpdateException;
 import util.BaseTest;
 
diff --git a/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java b/test/jdk/java/sql/test/sql/CallableStatementTests.java
similarity index 62%
rename from test/jdk/java/sql/testng/test/sql/CallableStatementTests.java
rename to test/jdk/java/sql/test/sql/CallableStatementTests.java
index 7a4fe15ecac..dc5c347ef50 100644
--- a/test/jdk/java/sql/testng/test/sql/CallableStatementTests.java
+++ b/test/jdk/java/sql/test/sql/CallableStatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,28 +20,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
 import java.sql.CallableStatement;
 import java.sql.SQLException;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.jupiter.api.AfterEach;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class CallableStatementTests extends BaseTest {
     private CallableStatement cstmt;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         cstmt = new StubConnection().prepareCall("{call SuperHero_Proc(?)}");
     }
 
-    @AfterMethod
+    @AfterEach
     public void tearDownMethod() throws Exception {
         cstmt.close();
     }
@@ -50,80 +55,84 @@ public class CallableStatementTests extends BaseTest {
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedLiteralValues")
     public void test00(String s, String expected) throws SQLException {
-        assertEquals(cstmt.enquoteLiteral(s), expected);
+        assertEquals(expected, cstmt.enquoteLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test01() throws SQLException {
-        cstmt.enquoteLiteral(null);
+        assertThrows(NullPointerException.class, () -> cstmt.enquoteLiteral(null));
     }
 
     /*
      * Validate that enquoteIdentifier returns the expected value
      */
-    @Test(dataProvider = "validIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedIdentifierValues")
     public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
-        assertEquals(cstmt.enquoteIdentifier(s, alwaysQuote), expected);
+        assertEquals(expected, cstmt.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate that a SQLException is thrown for values that are not valid
      * for a SQL identifier
      */
-    @Test(dataProvider = "invalidIdentifierValues",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidEnquotedIdentifierValues")
     public void test03(String s, boolean alwaysQuote) throws SQLException {
-        cstmt.enquoteIdentifier(s, alwaysQuote);
+        assertThrows(SQLException.class, () -> cstmt.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate a NullPointerException is thrown is the string passed to
      * enquoteIdentiifer is null
      */
-    @Test(dataProvider = "trueFalse",
-            expectedExceptions = NullPointerException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
-        cstmt.enquoteIdentifier(null, alwaysQuote);
+        assertThrows(NullPointerException.class, () -> cstmt.enquoteIdentifier(null, alwaysQuote));
     }
 
     /*
      * Validate that isSimpleIdentifier returns the expected value
      */
-    @Test(dataProvider = "simpleIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("simpleIdentifierValues")
     public void test05(String s, boolean expected) throws SQLException {
-        assertEquals(cstmt.isSimpleIdentifier(s), expected);
+        assertEquals(expected, cstmt.isSimpleIdentifier(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * isSimpleIdentifier is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test06() throws SQLException {
-        cstmt.isSimpleIdentifier(null);
+        assertThrows(NullPointerException.class, () -> cstmt.isSimpleIdentifier(null));
     }
 
     /*
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedNCharLiteralValues")
     public void test07(String s, String expected) throws SQLException {
-        assertEquals(cstmt.enquoteNCharLiteral(s), expected);
+        assertEquals(expected, cstmt.enquoteNCharLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteNCharLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test08() throws SQLException {
-        cstmt.enquoteNCharLiteral(null);
+        assertThrows(NullPointerException.class, () -> cstmt.enquoteNCharLiteral(null));
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/ConnectionTests.java b/test/jdk/java/sql/test/sql/ConnectionTests.java
similarity index 63%
rename from test/jdk/java/sql/testng/test/sql/ConnectionTests.java
rename to test/jdk/java/sql/test/sql/ConnectionTests.java
index f40c2784e4a..534b5d7d96a 100644
--- a/test/jdk/java/sql/testng/test/sql/ConnectionTests.java
+++ b/test/jdk/java/sql/test/sql/ConnectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,22 +20,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
 import java.sql.SQLException;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ConnectionTests extends BaseTest {
 
     protected StubConnection conn;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         conn = new StubConnection();
     }
@@ -44,80 +47,84 @@ public class ConnectionTests extends BaseTest {
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedLiteralValues")
     public void test00(String s, String expected) throws SQLException {
-        assertEquals(conn.enquoteLiteral(s), expected);
+        assertEquals(expected, conn.enquoteLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test01() throws SQLException {
-        conn.enquoteLiteral(null);
+        assertThrows(NullPointerException.class, () -> conn.enquoteLiteral(null));
     }
 
     /*
      * Validate that enquoteIdentifier returns the expected value
      */
-    @Test(dataProvider = "validIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedIdentifierValues")
     public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
-        assertEquals(conn.enquoteIdentifier(s, alwaysQuote), expected);
+        assertEquals(expected, conn.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate that a SQLException is thrown for values that are not valid
      * for a SQL identifier
      */
-    @Test(dataProvider = "invalidIdentifierValues",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidEnquotedIdentifierValues")
     public void test03(String s, boolean alwaysQuote) throws SQLException {
-        conn.enquoteIdentifier(s, alwaysQuote);
+        assertThrows(SQLException.class, () -> conn.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate a NullPointerException is thrown is the string passed to
      * enquoteIdentiifer is null
      */
-    @Test(dataProvider = "trueFalse",
-            expectedExceptions = NullPointerException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
-        conn.enquoteIdentifier(null, alwaysQuote);
+        assertThrows(NullPointerException.class, () -> conn.enquoteIdentifier(null, alwaysQuote));
     }
 
     /*
      * Validate that isSimpleIdentifier returns the expected value
      */
-    @Test(dataProvider = "simpleIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("simpleIdentifierValues")
     public void test05(String s, boolean expected) throws SQLException {
-        assertEquals(conn.isSimpleIdentifier(s), expected);
+        assertEquals(expected, conn.isSimpleIdentifier(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * isSimpleIdentifier is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test06() throws SQLException {
-        conn.isSimpleIdentifier(null);
+        assertThrows(NullPointerException.class, () -> conn.isSimpleIdentifier(null));
     }
 
     /*
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedNCharLiteralValues")
     public void test07(String s, String expected) throws SQLException {
-        assertEquals(conn.enquoteNCharLiteral(s), expected);
+        assertEquals(expected, conn.enquoteNCharLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteNCharLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test08() throws SQLException {
-        conn.enquoteNCharLiteral(null);
+        assertThrows(NullPointerException.class, () -> conn.enquoteNCharLiteral(null));
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/DataTruncationTests.java b/test/jdk/java/sql/test/sql/DataTruncationTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/DataTruncationTests.java
rename to test/jdk/java/sql/test/sql/DataTruncationTests.java
index fbf7eebe90a..9d221b4a037 100644
--- a/test/jdk/java/sql/testng/test/sql/DataTruncationTests.java
+++ b/test/jdk/java/sql/test/sql/DataTruncationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.DataTruncation;
 import java.sql.SQLException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class DataTruncationTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/DateTests.java b/test/jdk/java/sql/test/sql/DateTests.java
similarity index 80%
rename from test/jdk/java/sql/testng/test/sql/DateTests.java
rename to test/jdk/java/sql/test/sql/DateTests.java
index ae6c276c4f6..0c66dd15c98 100644
--- a/test/jdk/java/sql/testng/test/sql/DateTests.java
+++ b/test/jdk/java/sql/test/sql/DateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,14 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.Date;
-import java.time.Instant;
 import java.time.LocalDate;
-import static org.testng.Assert.*;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.BaseTest;
 
 public class DateTests extends BaseTest {
@@ -35,17 +39,18 @@ public class DateTests extends BaseTest {
     /*
      * Validate an IllegalArgumentException is thrown for an invalid Date string
      */
-    @Test(dataProvider = "invalidDateValues",
-            expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidDateValues")
     public void test(String d) throws Exception {
-        Date.valueOf(d);
+        assertThrows(IllegalArgumentException.class, () -> Date.valueOf(d));
     }
 
     /*
      * Test that a date created from a date string is equal to the value
      * returned from toString()
      */
-    @Test(dataProvider = "validDateValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validDateValues")
     public void test00(String d, String expectedD) {
         Date d1 = Date.valueOf(d);
         Date d2 = Date.valueOf(expectedD);
@@ -207,20 +212,20 @@ public class DateTests extends BaseTest {
     /*
      * Validate an NPE occurs when a null LocalDate is passed to valueOf
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test15() throws Exception {
         LocalDate ld = null;
-        Date.valueOf(ld);
+        assertThrows(NullPointerException.class, () -> Date.valueOf(ld));
     }
 
     /*
      * Validate an UnsupportedOperationException occurs when toInstant() is
      * called
      */
-    @Test(expectedExceptions = UnsupportedOperationException.class)
+    @Test
     public void test16() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        Instant instant = d.toInstant();
+        assertThrows(UnsupportedOperationException.class, d::toInstant);
     }
 
     /*
@@ -271,55 +276,55 @@ public class DateTests extends BaseTest {
     /*
      * Validate an IllegalArgumentException is thrown for calling getHours
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test21() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        d.getHours();
+        assertThrows(IllegalArgumentException.class, d::getHours);
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling getMinutes
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test22() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        d.getMinutes();
+        assertThrows(IllegalArgumentException.class, d::getMinutes);
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling getSeconds
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test23() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        d.getSeconds();
+        assertThrows(IllegalArgumentException.class, d::getSeconds);
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling setHours
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test24() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        d.setHours(8);
+        assertThrows(IllegalArgumentException.class, () -> d.setHours(8));
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling setMinutes
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test25() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        d.setMinutes(0);
+        assertThrows(IllegalArgumentException.class, () -> d.setMinutes(0));
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling setSeconds
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test26() throws Exception {
         Date d = Date.valueOf("1961-08-30");
-        d.setSeconds(0);
+        assertThrows(IllegalArgumentException.class, () -> d.setSeconds(0));
     }
 
     /*
@@ -327,32 +332,31 @@ public class DateTests extends BaseTest {
      * to validate that an IllegalArgumentException will be thrown from the
      * valueOf method
      */
-    @DataProvider(name = "invalidDateValues")
-    private Object[][] invalidDateValues() {
-        return new Object[][]{
-            {"20009-11-01"},
-            {"09-11-01"},
-            {"-11-01"},
-            {"2009-111-01"},
-            {"2009--01"},
-            {"2009-13-01"},
-            {"2009-11-011"},
-            {"2009-11-"},
-            {"2009-11-00"},
-            {"2009-11-33"},
-            {"--"},
-            {""},
-            {null},
-            {"-"},
-            {"2009"},
-            {"2009-01"},
-            {"---"},
-            {"2009-13--1"},
-            {"1900-1-0"},
-            {"2009-01-01 10:50:01"},
-            {"1996-12-10 12:26:19.1"},
-            {"10:50:01"}
-        };
+    private Stream<String> invalidDateValues() {
+        return Stream.of(
+            "20009-11-01",
+            "09-11-01",
+            "-11-01",
+            "2009-111-01",
+            "2009--01",
+            "2009-13-01",
+            "2009-11-011",
+            "2009-11-",
+            "2009-11-00",
+            "2009-11-33",
+            "--",
+            "",
+            null,
+            "-",
+            "2009",
+            "2009-01",
+            "---",
+            "2009-13--1",
+            "1900-1-0",
+            "2009-01-01 10:50:01",
+            "1996-12-10 12:26:19.1",
+            "10:50:01"
+        );
     }
 
     /*
@@ -360,14 +364,12 @@ public class DateTests extends BaseTest {
      * to validate that an IllegalArgumentException will not be thrown from the
      * valueOf method and the corect value from toString() is returned
      */
-    @DataProvider(name = "validDateValues")
-    private Object[][] validDateValues() {
-        return new Object[][]{
-            {"2009-08-30", "2009-08-30"},
-            {"2009-01-8", "2009-01-08"},
-            {"2009-1-01", "2009-01-01"},
-            {"2009-1-1", "2009-01-01"}
-
-        };
+    private Stream<Arguments> validDateValues() {
+        return Stream.of(
+            Arguments.of("2009-08-30", "2009-08-30"),
+            Arguments.of("2009-01-8", "2009-01-08"),
+            Arguments.of("2009-1-01", "2009-01-01"),
+            Arguments.of("2009-1-1", "2009-01-01")
+        );
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/DriverManagerTests.java b/test/jdk/java/sql/test/sql/DriverManagerTests.java
similarity index 84%
rename from test/jdk/java/sql/testng/test/sql/DriverManagerTests.java
rename to test/jdk/java/sql/test/sql/DriverManagerTests.java
index 6b6e8386835..3797b625d21 100644
--- a/test/jdk/java/sql/testng/test/sql/DriverManagerTests.java
+++ b/test/jdk/java/sql/test/sql/DriverManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -39,12 +39,10 @@ import java.util.Collections;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.StubDriver;
 
 public class DriverManagerTests {
@@ -58,23 +56,11 @@ public class DriverManagerTests {
     public DriverManagerTests() {
     }
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         removeAllDrivers();
     }
 
-    @AfterMethod
-    public void tearDownMethod() throws Exception {
-    }
-
     /**
      * Utility method to remove all registered drivers
      */
@@ -113,7 +99,7 @@ public class DriverManagerTests {
         int[] vals = {-1, 0, 5};
         for (int val : vals) {
             DriverManager.setLoginTimeout(val);
-            assertEquals(val, DriverManager.getLoginTimeout());
+            assertEquals(DriverManager.getLoginTimeout(), val);
         }
     }
 
@@ -121,20 +107,22 @@ public class DriverManagerTests {
      * Validate that NullPointerException is thrown when null is passed to
      * registerDriver
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test1() throws Exception {
         Driver d = null;
-        DriverManager.registerDriver(d);
+        assertThrows(NullPointerException.class,
+                () -> DriverManager.registerDriver(d));
     }
 
     /**
      * Validate that NullPointerException is thrown when null is passed to
      * registerDriver
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test2() throws Exception {
         Driver d = null;
-        DriverManager.registerDriver(d, null);
+        assertThrows(NullPointerException.class, () ->
+                DriverManager.registerDriver(d, null));
     }
 
     /**
@@ -150,68 +138,68 @@ public class DriverManagerTests {
      * Validate that SQLException is thrown when there is no Driver to service
      * the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test4() throws Exception {
-        DriverManager.getConnection(InvalidURL);
+        assertThrows(SQLException.class, () -> DriverManager.getConnection(InvalidURL));
     }
 
     /**
      * Validate that SQLException is thrown when there is no Driver to service
      * the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test5() throws Exception {
-        DriverManager.getConnection(InvalidURL, new Properties());
+        assertThrows(SQLException.class, () -> DriverManager.getConnection(InvalidURL, new Properties()));
     }
 
     /**
      * Validate that SQLException is thrown when there is no Driver to service
      * the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test6() throws Exception {
-        DriverManager.getConnection(InvalidURL, "LuckyDog", "tennisanyone");
+        assertThrows(SQLException.class, () -> DriverManager.getConnection(InvalidURL, "LuckyDog", "tennisanyone"));
     }
 
     /**
      * Validate that SQLException is thrown when null is passed for the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test7() throws Exception {
-        DriverManager.getConnection(null);
+        assertThrows(SQLException.class, () -> DriverManager.getConnection(null));
     }
 
     /**
      * Validate that SQLException is thrown when null is passed for the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test8() throws Exception {
-        DriverManager.getConnection(null, new Properties());
+        assertThrows(SQLException.class, () -> DriverManager.getConnection(null, new Properties()));
     }
 
     /**
      * Validate that SQLException is thrown when null is passed for the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test9() throws Exception {
-        DriverManager.getConnection(null, "LuckyDog", "tennisanyone");
+        assertThrows(SQLException.class, () -> DriverManager.getConnection(null, "LuckyDog", "tennisanyone"));
     }
 
     /**
      * Validate that SQLException is thrown when there is no Driver to service
      * the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test10() throws Exception {
-        DriverManager.getDriver(InvalidURL);
+        assertThrows(SQLException.class, () -> DriverManager.getDriver(InvalidURL));
     }
 
     /**
      * Validate that SQLException is thrown when null is passed for the URL
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test11() throws Exception {
-        DriverManager.getDriver(null);
+        assertThrows(SQLException.class, () -> DriverManager.getDriver(null));
     }
 
     /**
@@ -229,10 +217,10 @@ public class DriverManagerTests {
      * Validate that SQLException is thrown when the URL is not valid for any of
      * the registered drivers
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test13() throws Exception {
         DriverManager.registerDriver(new StubDriver());
-        DriverManager.getDriver(InvalidURL);
+        assertThrows(SQLException.class, () -> DriverManager.getDriver(InvalidURL));
     }
 
     /**
@@ -370,9 +358,9 @@ public class DriverManagerTests {
         }
 
         Collection<Driver> expectedDrivers = Collections.list(DriverManager.getDrivers());
-        assertEquals(expectedDrivers.size(), n);
+        assertEquals(n, expectedDrivers.size());
         Collection<Driver> drivers = DriverManager.drivers().collect(Collectors.toList());
 
-        assertEquals(drivers, expectedDrivers);
+        assertEquals(expectedDrivers, drivers);
     }
 }
diff --git a/test/jdk/java/sql/test/sql/JavatimeTest.java b/test/jdk/java/sql/test/sql/JavatimeTest.java
new file mode 100644
index 00000000000..acc0ac3e841
--- /dev/null
+++ b/test/jdk/java/sql/test/sql/JavatimeTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sql;
+
+/*
+ * @test
+ * @bug 8007520
+ * @summary Test those bridge methods to/from java.time date/time classes
+ * @key randomness
+ */
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.FieldSource;
+
+import java.util.List;
+import java.util.Random;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.stream.IntStream;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JavatimeTest {
+
+    private static final int NANOS_PER_SECOND = 1000000000;
+    private static final long t1970 = new java.util.Date(70, 0, 01).getTime();
+    private static final Random R = new Random();
+    // Data provider contains 10,000 randomized arguments
+    // which are used as the dates and times for the tests
+    private static final List<Arguments> DATE_TIME_ARGS = IntStream.range(0, 10_000)
+            .mapToObj(i -> {
+                int days = R.nextInt(50) * 365 + R.nextInt(365);
+                long secs = t1970 + days * 86400 + R.nextInt(86400);
+                int nanos = R.nextInt(NANOS_PER_SECOND);
+                int nanos_ms = nanos / 1000000 * 1000000; // millis precision
+                long millis = secs * 1000 + R.nextInt(1000);
+                LocalDateTime ldt = LocalDateTime.ofEpochSecond(secs, nanos, ZoneOffset.UTC);
+                return Arguments.of(millis, nanos, ldt, secs, nanos_ms);
+            }).toList();
+
+    @ParameterizedTest(autoCloseArguments = false)
+    @FieldSource("DATE_TIME_ARGS")
+    void timestampTest(long millis, int nanos, LocalDateTime ldt, long secs) {
+        Timestamp ta = new Timestamp(millis);
+        ta.setNanos(nanos);
+        assertTrue(isEqual(ta.toLocalDateTime(), ta),
+                errMsg("j.s.ts -> ldt", millis, nanos, ldt, results(ta.toLocalDateTime(), ta)));
+
+        assertTrue(isEqual(ldt, Timestamp.valueOf(ldt)),
+                errMsg("ldt -> j.s.ts", millis, nanos, ldt, results(ldt, Timestamp.valueOf(ldt))));
+
+        Instant inst0 = ta.toInstant();
+        assertAll(errMsg("j.s.ts -> instant -> j.s.ts", millis, nanos, ldt),
+                () -> assertEquals(ta.getTime(), inst0.toEpochMilli()),
+                () -> assertEquals(ta.getNanos(), inst0.getNano()),
+                () -> assertEquals(ta, Timestamp.from(inst0))
+        );
+
+        Instant inst = Instant.ofEpochSecond(secs, nanos);
+        Timestamp ta0 = Timestamp.from(inst);
+        assertAll(errMsg("instant -> timestamp -> instant", millis, nanos, ldt),
+                () -> assertEquals(ta0.getTime(), inst.toEpochMilli()),
+                () -> assertEquals(ta0.getNanos(), inst.getNano()),
+                () -> assertEquals(inst, ta0.toInstant())
+        );
+    }
+
+    @ParameterizedTest(autoCloseArguments = false)
+    @FieldSource("DATE_TIME_ARGS")
+    void sqlDateTest(long millis, int nanos, LocalDateTime ldt) {
+        // j.s.d/t uses j.u.d.equals() !!!!!!!!
+        java.sql.Date jsd = new java.sql.Date(millis);
+        assertTrue(isEqual(jsd.toLocalDate(), jsd),
+                errMsg("j.s.d -> ld", millis, nanos, ldt, results(jsd.toLocalDate(), jsd)));
+
+        LocalDate ld = ldt.toLocalDate();
+        assertTrue(isEqual(ld, java.sql.Date.valueOf(ld)),
+                errMsg("ld -> j.s.d", millis, nanos, ldt, results(ld, java.sql.Date.valueOf(ld))));
+    }
+
+    @ParameterizedTest(autoCloseArguments = false)
+    @FieldSource("DATE_TIME_ARGS")
+    void sqlTimeTest(long millis, int nanos, LocalDateTime ldt, long secs, int nanos_ms) {
+        java.sql.Time jst = new java.sql.Time(millis);
+        assertTrue(isEqual(jst.toLocalTime(), jst),
+                errMsg("j.s.t -> lt", millis, nanos, ldt, results(jst.toLocalTime(), jst)));
+
+        // millis precision
+        LocalDateTime ldt_ms = LocalDateTime.ofEpochSecond(secs, nanos_ms, ZoneOffset.UTC);
+        LocalTime lt = ldt_ms.toLocalTime();
+        assertTrue(isEqual(lt, java.sql.Time.valueOf(lt)),
+                errMsg("lt -> j.s.t", millis, nanos, ldt, results(lt, java.sql.Time.valueOf(lt))));
+    }
+
+    private static boolean isEqual(LocalDateTime ldt, Timestamp ts) {
+        ZonedDateTime zdt = ZonedDateTime.of(ldt, ZoneId.systemDefault());
+        return zdt.getYear() == ts.getYear() + 1900 &&
+               zdt.getMonthValue() == ts.getMonth() + 1 &&
+               zdt.getDayOfMonth() == ts.getDate() &&
+               zdt.getHour() == ts.getHours() &&
+               zdt.getMinute() == ts.getMinutes() &&
+               zdt.getSecond() == ts.getSeconds() &&
+               zdt.getNano() == ts.getNanos();
+    }
+
+    private static String results(LocalDateTime ldt, Timestamp ts) {
+        ZonedDateTime zdt = ZonedDateTime.of(ldt, ZoneId.systemDefault());
+        return "ldt:ts  %d/%d, %d/%d, %d/%d, %d/%d, %d/%d, %d/%d, nano:[%d/%d]%n".formatted(
+               zdt.getYear(), ts.getYear() + 1900,
+               zdt.getMonthValue(), ts.getMonth() + 1,
+               zdt.getDayOfMonth(), ts.getDate(),
+               zdt.getHour(), ts.getHours(),
+               zdt.getMinute(), ts.getMinutes(),
+               zdt.getSecond(), ts.getSeconds(),
+               zdt.getNano(), ts.getNanos());
+    }
+
+    private static boolean isEqual(LocalDate ld, java.sql.Date d) {
+        return ld.getYear() == d.getYear() + 1900 &&
+               ld.getMonthValue() == d.getMonth() + 1 &&
+               ld.getDayOfMonth() == d.getDate();
+    }
+
+    private static String results(LocalDate ld, java.sql.Date d) {
+        return "%d/%d, %d/%d, %d/%d%n".formatted(
+               ld.getYear(), d.getYear() + 1900,
+               ld.getMonthValue(), d.getMonth() + 1,
+               ld.getDayOfMonth(), d.getDate());
+    }
+
+    private static boolean isEqual(LocalTime lt, java.sql.Time t) {
+        return lt.getHour() == t.getHours() &&
+               lt.getMinute() == t.getMinutes() &&
+               lt.getSecond() == t.getSeconds();
+    }
+
+    private static String results(LocalTime lt, java.sql.Time t) {
+        return "%d/%d, %d/%d, %d/%d%n".formatted(
+                lt.getHour(), t.getHours(),
+                lt.getMinute(), t.getMinutes(),
+                lt.getSecond(), t.getSeconds());
+    }
+
+    private static String errMsg(String testCase, long millis, int nanos,
+                                 LocalDateTime ldt, String results) {
+        return "FAILED: %s%n INPUTS: ms: %16d  ns: %10d  ldt:[%s]%n ACTUAL: %s"
+                .formatted(testCase, millis, nanos, ldt, results);
+    }
+
+    private static String errMsg(String testCase, long millis, int nanos,
+                                 LocalDateTime ldt) {
+        return "FAILED: %s%n INPUTS: ms: %16d  ns: %10d  ldt:[%s]%n"
+                .formatted(testCase, millis, nanos, ldt);
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java b/test/jdk/java/sql/test/sql/PreparedStatementTests.java
similarity index 62%
rename from test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java
rename to test/jdk/java/sql/test/sql/PreparedStatementTests.java
index 7813038361d..574b0369b4e 100644
--- a/test/jdk/java/sql/testng/test/sql/PreparedStatementTests.java
+++ b/test/jdk/java/sql/test/sql/PreparedStatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,29 +20,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.jupiter.api.AfterEach;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class PreparedStatementTests extends BaseTest {
 
     private PreparedStatement pstmt;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         pstmt = new StubConnection().prepareStatement("Select * from foo were bar = ?");
     }
 
-    @AfterMethod
+    @AfterEach
     public void tearDownMethod() throws Exception {
         pstmt.close();
     }
@@ -51,80 +56,84 @@ public class PreparedStatementTests extends BaseTest {
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedLiteralValues")
     public void test00(String s, String expected) throws SQLException {
-        assertEquals(pstmt.enquoteLiteral(s), expected);
+        assertEquals(expected, pstmt.enquoteLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test01() throws SQLException {
-        pstmt.enquoteLiteral(null);
+        assertThrows(NullPointerException.class, () -> pstmt.enquoteLiteral(null));
     }
 
     /*
      * Validate that enquoteIdentifier returns the expected value
      */
-    @Test(dataProvider = "validIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedIdentifierValues")
     public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
-        assertEquals(pstmt.enquoteIdentifier(s, alwaysQuote), expected);
+        assertEquals(expected, pstmt.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate that a SQLException is thrown for values that are not valid
      * for a SQL identifier
      */
-    @Test(dataProvider = "invalidIdentifierValues",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidEnquotedIdentifierValues")
     public void test03(String s, boolean alwaysQuote) throws SQLException {
-        pstmt.enquoteIdentifier(s, alwaysQuote);
+        assertThrows(SQLException.class, () -> pstmt.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate a NullPointerException is thrown is the string passed to
      * enquoteIdentiifer is null
      */
-    @Test(dataProvider = "trueFalse",
-            expectedExceptions = NullPointerException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
-        pstmt.enquoteIdentifier(null, alwaysQuote);
+        assertThrows(NullPointerException.class, () -> pstmt.enquoteIdentifier(null, alwaysQuote));
     }
 
     /*
      * Validate that isSimpleIdentifier returns the expected value
      */
-    @Test(dataProvider = "simpleIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("simpleIdentifierValues")
     public void test05(String s, boolean expected) throws SQLException {
-        assertEquals(pstmt.isSimpleIdentifier(s), expected);
+        assertEquals(expected, pstmt.isSimpleIdentifier(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * isSimpleIdentifier is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test06() throws SQLException {
-        pstmt.isSimpleIdentifier(null);
+        assertThrows(NullPointerException.class, () -> pstmt.isSimpleIdentifier(null));
     }
 
     /*
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedNCharLiteralValues")
     public void test07(String s, String expected) throws SQLException {
-        assertEquals(pstmt.enquoteNCharLiteral(s), expected);
+        assertEquals(expected, pstmt.enquoteNCharLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteNCharLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test08() throws SQLException {
-        pstmt.enquoteNCharLiteral(null);
+        assertThrows(NullPointerException.class, () -> pstmt.enquoteNCharLiteral(null));
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java b/test/jdk/java/sql/test/sql/SQLClientInfoExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLClientInfoExceptionTests.java
index 84230b86758..bea35d95c1c 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLClientInfoExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLClientInfoExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,14 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.ClientInfoStatus;
 import java.sql.SQLClientInfoException;
 import java.sql.SQLException;
 import java.util.HashMap;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLClientInfoExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLDataExceptionTests.java b/test/jdk/java/sql/test/sql/SQLDataExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLDataExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLDataExceptionTests.java
index 8a5f8d1a2c1..a18f6406e66 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLDataExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLDataExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLDataException;
 import java.sql.SQLException;
 import java.sql.SQLNonTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLDataExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLExceptionTests.java b/test/jdk/java/sql/test/sql/SQLExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLExceptionTests.java
index e3643ef119c..8a7850d8fd9 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,11 +20,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java b/test/jdk/java/sql/test/sql/SQLFeatureNotSupportedExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLFeatureNotSupportedExceptionTests.java
index 5b95894412c..24049addfa1 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLFeatureNotSupportedExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLFeatureNotSupportedExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.SQLNonTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLFeatureNotSupportedExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java b/test/jdk/java/sql/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
index 082e0af15c8..c8c0958e3f3 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLIntegrityConstraintViolationExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLIntegrityConstraintViolationException;
 import java.sql.SQLNonTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLIntegrityConstraintViolationExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java b/test/jdk/java/sql/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
index 6e4eaa567ee..82a9a345a0e 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLInvalidAuthorizationSpecExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLInvalidAuthorizationSpecException;
 import java.sql.SQLNonTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLInvalidAuthorizationSpecExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java b/test/jdk/java/sql/test/sql/SQLNonTransientConnectionExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLNonTransientConnectionExceptionTests.java
index dbd8b685844..fa4c75ed672 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLNonTransientConnectionExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLNonTransientConnectionExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLNonTransientConnectionException;
 import java.sql.SQLNonTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLNonTransientConnectionExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java b/test/jdk/java/sql/test/sql/SQLNonTransientExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLNonTransientExceptionTests.java
index 061ffe20840..0f37f905fa7 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLNonTransientExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLNonTransientExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLNonTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLNonTransientExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java b/test/jdk/java/sql/test/sql/SQLRecoverableExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLRecoverableExceptionTests.java
index d23a131dbcd..d447e08593c 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLRecoverableExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLRecoverableExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLRecoverableException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLRecoverableExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java b/test/jdk/java/sql/test/sql/SQLSyntaxErrorExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLSyntaxErrorExceptionTests.java
index 863213cfcb8..c859f5aa0d2 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLSyntaxErrorExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLSyntaxErrorExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLNonTransientException;
 import java.sql.SQLSyntaxErrorException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLSyntaxErrorExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java b/test/jdk/java/sql/test/sql/SQLTimeoutExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLTimeoutExceptionTests.java
index dfe341545e4..a4e249658d9 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLTimeoutExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLTimeoutExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLTimeoutException;
 import java.sql.SQLTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLTimeoutExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java b/test/jdk/java/sql/test/sql/SQLTransactionRollbackExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLTransactionRollbackExceptionTests.java
index 8453ebe1364..7a7d94cd060 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLTransactionRollbackExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLTransactionRollbackExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLTransactionRollbackException;
 import java.sql.SQLTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLTransactionRollbackExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java b/test/jdk/java/sql/test/sql/SQLTransientConnectionExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLTransientConnectionExceptionTests.java
index 7999253b1fa..8ac6ef98222 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLTransientConnectionExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLTransientConnectionExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLTransientConnectionException;
 import java.sql.SQLTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLTransientConnectionExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLTransientExceptionTests.java b/test/jdk/java/sql/test/sql/SQLTransientExceptionTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLTransientExceptionTests.java
rename to test/jdk/java/sql/test/sql/SQLTransientExceptionTests.java
index d86f86b8fc6..4c43b6c693e 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLTransientExceptionTests.java
+++ b/test/jdk/java/sql/test/sql/SQLTransientExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLTransientException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLTransientExceptionTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/SQLWarningTests.java b/test/jdk/java/sql/test/sql/SQLWarningTests.java
similarity index 97%
rename from test/jdk/java/sql/testng/test/sql/SQLWarningTests.java
rename to test/jdk/java/sql/test/sql/SQLWarningTests.java
index 2856742dc5c..ab15a877dbd 100644
--- a/test/jdk/java/sql/testng/test/sql/SQLWarningTests.java
+++ b/test/jdk/java/sql/test/sql/SQLWarningTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,12 +20,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.SQLWarning;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SQLWarningTests extends BaseTest {
diff --git a/test/jdk/java/sql/testng/test/sql/StatementTests.java b/test/jdk/java/sql/test/sql/StatementTests.java
similarity index 62%
rename from test/jdk/java/sql/testng/test/sql/StatementTests.java
rename to test/jdk/java/sql/test/sql/StatementTests.java
index f2bfe712eb5..42e971cc971 100644
--- a/test/jdk/java/sql/testng/test/sql/StatementTests.java
+++ b/test/jdk/java/sql/test/sql/StatementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,14 +20,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.jupiter.api.AfterEach;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.testng.annotations.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 import util.StubConnection;
 
@@ -35,12 +42,12 @@ public class StatementTests extends BaseTest {
 
     private Statement stmt;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         stmt = new StubConnection().createStatement();
     }
 
-    @AfterMethod
+    @AfterEach
     public void tearDownMethod() throws Exception {
         stmt.close();
     }
@@ -48,80 +55,84 @@ public class StatementTests extends BaseTest {
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedLiteralValues")
     public void test00(String s, String expected) throws SQLException {
-        assertEquals(stmt.enquoteLiteral(s), expected);
+        assertEquals(expected, stmt.enquoteLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test01() throws SQLException {
-        stmt.enquoteLiteral(null);
+        assertThrows(NullPointerException.class, () -> stmt.enquoteLiteral(null));
     }
 
     /*
      * Validate that enquoteIdentifier returns the expected value
      */
-    @Test(dataProvider = "validIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedIdentifierValues")
     public void test02(String s, boolean alwaysQuote, String expected) throws SQLException {
-        assertEquals(stmt.enquoteIdentifier(s, alwaysQuote), expected);
+        assertEquals(expected, stmt.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate that a SQLException is thrown for values that are not valid
      * for a SQL identifier
      */
-    @Test(dataProvider = "invalidIdentifierValues",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidEnquotedIdentifierValues")
     public void test03(String s, boolean alwaysQuote) throws SQLException {
-        stmt.enquoteIdentifier(s, alwaysQuote);
+        assertThrows(SQLException.class, () -> stmt.enquoteIdentifier(s, alwaysQuote));
     }
 
     /*
      * Validate a NullPointerException is thrown is the string passed to
      * enquoteIdentiifer is null
      */
-    @Test(dataProvider = "trueFalse",
-            expectedExceptions = NullPointerException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @ValueSource(booleans = {true, false})
     public void test04(boolean alwaysQuote) throws SQLException {
-        stmt.enquoteIdentifier(null, alwaysQuote);
+        assertThrows(NullPointerException.class, () -> stmt.enquoteIdentifier(null, alwaysQuote));
     }
 
     /*
      * Validate that isSimpleIdentifier returns the expected value
      */
-    @Test(dataProvider = "simpleIdentifierValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("simpleIdentifierValues")
     public void test05(String s, boolean expected) throws SQLException {
-        assertEquals(stmt.isSimpleIdentifier(s), expected);
+        assertEquals(expected, stmt.isSimpleIdentifier(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * isSimpleIdentifier is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test06() throws SQLException {
-        stmt.isSimpleIdentifier(null);
+        assertThrows(NullPointerException.class, () -> stmt.isSimpleIdentifier(null));
     }
 
     /*
      * Verify that enquoteLiteral creates a  valid literal and converts every
      * single quote to two single quotes
      */
-    @Test(dataProvider = "validEnquotedNCharLiteralValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validEnquotedNCharLiteralValues")
     public void test07(String s, String expected) throws SQLException {
-        assertEquals(stmt.enquoteNCharLiteral(s), expected);
+        assertEquals(expected, stmt.enquoteNCharLiteral(s));
     }
 
     /*
      * Validate a NullPointerException is thrown if the string passed to
      * enquoteNCharLiteral is null
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test08() throws SQLException {
-        stmt.enquoteNCharLiteral(null);
+        assertThrows(NullPointerException.class, () -> stmt.enquoteNCharLiteral(null));
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/TimeTests.java b/test/jdk/java/sql/test/sql/TimeTests.java
similarity index 76%
rename from test/jdk/java/sql/testng/test/sql/TimeTests.java
rename to test/jdk/java/sql/test/sql/TimeTests.java
index 7b99679754b..71208f03222 100644
--- a/test/jdk/java/sql/testng/test/sql/TimeTests.java
+++ b/test/jdk/java/sql/test/sql/TimeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.Time;
 import java.time.LocalTime;
-import static org.testng.Assert.*;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.BaseTest;
 
 public class TimeTests extends BaseTest {
@@ -34,73 +39,73 @@ public class TimeTests extends BaseTest {
     /*
      * Validate an IllegalArgumentException is thrown for calling getYear
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test01() {
         Time t = Time.valueOf("08:30:59");
-        t.getYear();
+        assertThrows(IllegalArgumentException.class, t::getYear);
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling getMonth
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test02() {
         Time t = Time.valueOf("08:30:59");
-        t.getMonth();
+        assertThrows(IllegalArgumentException.class, t::getMonth);
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling getDay
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test03() {
         Time t = Time.valueOf("08:30:59");
-        t.getDay();
+        assertThrows(IllegalArgumentException.class, t::getDay);
     }
 
     /**
      * Validate an IllegalArgumentException is thrown for calling getDate
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test04() {
         Time t = Time.valueOf("08:30:59");
-        t.getDate();
+        assertThrows(IllegalArgumentException.class, t::getDate);
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling setYear
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test05() {
         Time t = Time.valueOf("08:30:59");
-        t.setYear(8);
+        assertThrows(IllegalArgumentException.class, () -> t.setYear(8));
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling setMonth
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test06() {
         Time t = Time.valueOf("08:30:59");
-        t.setMonth(8);
+        assertThrows(IllegalArgumentException.class, () -> t.setMonth(8));
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling setDate
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test07() {
         Time t = Time.valueOf("08:30:59");
-        t.setDate(30);
+        assertThrows(IllegalArgumentException.class, () -> t.setDate(30));
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for calling getDate
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test08() {
         Time t = Time.valueOf("08:30:59");
-        t.getDate();
+        assertThrows(IllegalArgumentException.class, t::getDate);
     }
 
     /*
@@ -128,20 +133,20 @@ public class TimeTests extends BaseTest {
     /*
      * Validate an NPE occurs when a null LocalDate is passed to valueOf
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test11() throws Exception {
         LocalTime ld = null;
-        Time.valueOf(ld);
+        assertThrows(NullPointerException.class, () -> Time.valueOf(ld));
     }
 
     /*
      * Validate an UnsupportedOperationException occurs when toInstant() is
      * called
      */
-    @Test(expectedExceptions = UnsupportedOperationException.class)
+    @Test
     public void test12() throws Exception {
         Time t = new Time(System.currentTimeMillis());
-        t.toInstant();
+        assertThrows(UnsupportedOperationException.class, t::toInstant);
     }
 
     /*
@@ -149,7 +154,8 @@ public class TimeTests extends BaseTest {
      * toString() of the other and that the correct value is returned from
      * toString()
      */
-    @Test(dataProvider = "validTimeValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validTimeValues")
     public void test13(String time, String expected) {
         Time t1 = Time.valueOf(time);
         Time t2 = Time.valueOf(t1.toString());
@@ -182,10 +188,10 @@ public class TimeTests extends BaseTest {
     /*
      * Validate an IllegalArgumentException is thrown for an invalid Time string
      */
-    @Test(dataProvider = "invalidTimeValues",
-            expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidTimeValues")
     public void test16(String time) throws Exception {
-        Time.valueOf(time);
+        assertThrows(IllegalArgumentException.class, () -> Time.valueOf(time));
     }
 
     /*
@@ -299,29 +305,28 @@ public class TimeTests extends BaseTest {
      * to validate that an IllegalArgumentException will be thrown from the
      * valueOf method
      */
-    @DataProvider(name = "invalidTimeValues")
-    private Object[][] invalidTimeValues() {
-        return new Object[][]{
-            {"2009-11-01 10:50:01"},
-            {"1961-08-30 10:50:01.1"},
-            {"1961-08-30"},
-            {"00:00:00."},
-            {"10:50:0.1"},
-            {":00:00"},
-            {"00::00"},
-            {"00:00:"},
-            {"::"},
-            {" : : "},
-            {"0a:00:00"},
-            {"00:bb:00"},
-            {"00:01:cc"},
-            {"08:10:Batman"},
-            {"08:10:10:10"},
-            {"08:10"},
-            {"a:b:c"},
-            {null},
-            {"8:"}
-        };
+    private Stream<String> invalidTimeValues() {
+        return Stream.of(
+            "2009-11-01 10:50:01",
+            "1961-08-30 10:50:01.1",
+            "1961-08-30",
+            "00:00:00.",
+            "10:50:0.1",
+            ":00:00",
+            "00::00",
+            "00:00:",
+            "::",
+            " : : ",
+            "0a:00:00",
+            "00:bb:00",
+            "00:01:cc",
+            "08:10:Batman",
+            "08:10:10:10",
+            "08:10",
+            "a:b:c",
+            null,
+            "8:"
+        );
     }
 
     /*
@@ -330,19 +335,18 @@ public class TimeTests extends BaseTest {
      * valueOf method.  It also contains the expected return value from
      * toString()
      */
-    @DataProvider(name = "validTimeValues")
-    private Object[][] validTimeValues() {
-        return new Object[][]{
-            {"10:50:01", "10:50:01"},
-            {"01:1:1", "01:01:01"},
-            {"01:01:1", "01:01:01"},
-            {"1:01:1", "01:01:01"},
-            {"2:02:02", "02:02:02"},
-            {"2:02:2", "02:02:02"},
-            {"10:50:1", "10:50:01"},
-            {"00:00:00", "00:00:00"},
-            {"08:30:59", "08:30:59"},
-            {"9:0:1", "09:00:01"}
-        };
+    private Stream<Arguments> validTimeValues() {
+        return Stream.of(
+            Arguments.of("10:50:01", "10:50:01"),
+            Arguments.of("01:1:1", "01:01:01"),
+            Arguments.of("01:01:1", "01:01:01"),
+            Arguments.of("1:01:1", "01:01:01"),
+            Arguments.of("2:02:02", "02:02:02"),
+            Arguments.of("2:02:2", "02:02:02"),
+            Arguments.of("10:50:1", "10:50:01"),
+            Arguments.of("00:00:00", "00:00:00"),
+            Arguments.of("08:30:59", "08:30:59"),
+            Arguments.of("9:0:1", "09:00:01")
+        );
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/TimestampTests.java b/test/jdk/java/sql/test/sql/TimestampTests.java
similarity index 73%
rename from test/jdk/java/sql/testng/test/sql/TimestampTests.java
rename to test/jdk/java/sql/test/sql/TimestampTests.java
index 6baea9fa26f..33a58c8d857 100644
--- a/test/jdk/java/sql/testng/test/sql/TimestampTests.java
+++ b/test/jdk/java/sql/test/sql/TimestampTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql;
+package sql;
 
 import java.sql.Date;
 import java.sql.Time;
@@ -30,11 +30,16 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.TimeZone;
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.BaseTest;
 
 public class TimestampTests extends BaseTest {
@@ -45,7 +50,7 @@ public class TimestampTests extends BaseTest {
      * Need to set and use a custom TimeZone which does not
      * observe daylight savings time for this test.
      */
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         defaultTimeZone = TimeZone.getDefault();
         TimeZone tzone = TimeZone.getTimeZone("GMT+01");
@@ -56,7 +61,7 @@ public class TimestampTests extends BaseTest {
     /*
      * Conservatively reset the default time zone after test.
      */
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() throws Exception {
         TimeZone.setDefault(defaultTimeZone);
     }
@@ -64,10 +69,10 @@ public class TimestampTests extends BaseTest {
     /*
      * Validate an IllegalArgumentException is thrown for an invalid Timestamp
      */
-    @Test(dataProvider = "invalidTimestampValues",
-            expectedExceptions = IllegalArgumentException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidTimestampValues")
     public void test(String ts) throws Exception {
-        Timestamp.valueOf(ts);
+        assertThrows(IllegalArgumentException.class, () -> Timestamp.valueOf(ts));
     }
 
     /*
@@ -80,7 +85,7 @@ public class TimestampTests extends BaseTest {
         String ExpectedTS = "2009-01-01 10:50:0";
         Timestamp ts = Timestamp.valueOf(testTS);
         Timestamp ts2 = Timestamp.valueOf(ExpectedTS);
-        assertEquals(ts, ts2, "Error ts1 != ts2");
+        assertEquals(ts2, ts, "Error ts1 != ts2");
     }
 
     /*
@@ -91,7 +96,7 @@ public class TimestampTests extends BaseTest {
         String testTS = "2009-01-01 10:50:0";
         Timestamp ts = Timestamp.valueOf(testTS);
         Timestamp ts2 = Timestamp.valueOf(testTS);
-        assertEquals(ts, ts2, "Error ts1 != ts2");
+        assertEquals(ts2, ts, "Error ts1 != ts2");
     }
 
     /*
@@ -104,7 +109,7 @@ public class TimestampTests extends BaseTest {
         String ExpectedTS = "2009-01-01 10:50:0";
         Timestamp ts = Timestamp.valueOf(testTS);
         Timestamp ts2 = Timestamp.valueOf(ExpectedTS);
-        assertEquals(ts, ts2, "Error ts1 != ts2");
+        assertEquals(ts2, ts, "Error ts1 != ts2");
     }
 
     /*
@@ -117,7 +122,7 @@ public class TimestampTests extends BaseTest {
         String ExpectedTS = "2009-01-01 10:50:0";
         Timestamp ts = Timestamp.valueOf(testTS);
         Timestamp ts2 = Timestamp.valueOf(ExpectedTS);
-        assertEquals(ts, ts2, "Error ts1 != ts2");
+        assertEquals(ts2, ts, "Error ts1 != ts2");
     }
 
     /*
@@ -130,7 +135,7 @@ public class TimestampTests extends BaseTest {
         String ExpectedTS = "2009-01-01 10:50:0";
         Timestamp ts = Timestamp.valueOf(testTS);
         Timestamp ts2 = Timestamp.valueOf(ExpectedTS);
-        assertEquals(ts, ts2, "Error ts1 != ts2");
+        assertEquals(ts2, ts, "Error ts1 != ts2");
     }
 
     /*
@@ -142,7 +147,7 @@ public class TimestampTests extends BaseTest {
         String ExpectedTS = "2005-01-01 10:20:50.00";
         Timestamp ts = Timestamp.valueOf(testTS);
         Timestamp ts2 = Timestamp.valueOf(ExpectedTS);
-        assertEquals(ts, ts2, "Error ts1 != ts2");
+        assertEquals(ts2, ts, "Error ts1 != ts2");
     }
 
     /*
@@ -219,7 +224,8 @@ public class TimestampTests extends BaseTest {
      * Validate that two Timestamps are equal when one is created from the
      * toString() of the other
      */
-    @Test(dataProvider = "validTimestampValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validTimestampValues")
     public void test13(String ts, String expectedTS) {
         Timestamp ts1 = Timestamp.valueOf(ts);
         Timestamp ts2 = Timestamp.valueOf(ts1.toString());
@@ -263,10 +269,10 @@ public class TimestampTests extends BaseTest {
      * Validate that a NullPointerException is thrown if a null is passed to
      * the before method
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test17() throws Exception {
         Timestamp ts1 = Timestamp.valueOf("1996-12-13 14:15:25.745634");
-        ts1.before(null);
+        assertThrows(NullPointerException.class, () -> ts1.before(null));
     }
 
     /*
@@ -316,10 +322,10 @@ public class TimestampTests extends BaseTest {
      * Validate that a NullPointerException is thrown if a null is passed to the
      * after method
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test22() throws Exception {
         Timestamp ts1 = Timestamp.valueOf("1966-08-30 08:08:08");
-        ts1.after(null);
+        assertThrows(NullPointerException.class, () -> ts1.after(null));
     }
 
     /*
@@ -476,21 +482,21 @@ public class TimestampTests extends BaseTest {
     /*
      * Validate an IllegalArgumentException is thrown for an invalid nanos value
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test38() throws Exception {
         Timestamp ts1 = Timestamp.valueOf("1961-08-30 00:00:00");
-        ts1.setNanos(-1);
+        assertThrows(IllegalArgumentException.class, () -> ts1.setNanos(-1));
 
     }
 
     /*
      * Validate an IllegalArgumentException is thrown for an invalid nanos value
      */
-    @Test(expectedExceptions = IllegalArgumentException.class)
+    @Test
     public void test39() throws Exception {
         int nanos = 999999999;
         Timestamp ts1 = Timestamp.valueOf("1961-08-30 00:00:00");
-        ts1.setNanos(nanos + 1);
+        assertThrows(IllegalArgumentException.class, () -> ts1.setNanos(nanos + 1));
     }
 
     /*
@@ -541,10 +547,10 @@ public class TimestampTests extends BaseTest {
     /*
      * Validate an NPE occurs when a null LocalDateTime is passed to valueOF
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test44() throws Exception {
         LocalDateTime ldt = null;
-        Timestamp.valueOf(ldt);
+        assertThrows(NullPointerException.class, () -> Timestamp.valueOf(ldt));
     }
 
     /*
@@ -572,10 +578,10 @@ public class TimestampTests extends BaseTest {
     /*
      * Validate an NPE occurs when a null instant is passed to from
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test47() throws Exception {
         Instant instant = null;
-        Timestamp.from(instant);
+        assertThrows(NullPointerException.class, () -> Timestamp.from(instant));
     }
 
     // Added SQE tests
@@ -628,7 +634,8 @@ public class TimestampTests extends BaseTest {
      * Validate that two Timestamps are equal when one is created from the
      * toString() of the other
      */
-    @Test(dataProvider = "validateNanos")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validateNanos")
     public void test51(String ts, int nanos) {
         Timestamp ts1 = Timestamp.valueOf(ts);
         Timestamp ts2 = Timestamp.valueOf(ts1.toString());
@@ -636,35 +643,36 @@ public class TimestampTests extends BaseTest {
                 "Error with Nanos");
     }
 
-    @Test(dataProvider = "validTimestampLongValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validTimestampLongValues")
     public void test52(long value, String ts) {
         Timestamp ts1 = new Timestamp(value);
-        assertEquals(ts1.toString(), ts, "ts1.toString() != ts");
+        assertEquals(ts, ts1.toString(), "ts1.toString() != ts");
     }
 
     @Test
     public void test53() {
         // The latest Instant that can be converted to a Timestamp.
         Instant instant1 = Instant.ofEpochSecond(Long.MAX_VALUE / 1000, 999_999_999);
-        assertEquals(Timestamp.from(instant1).toInstant(), instant1);
+        assertEquals(instant1, Timestamp.from(instant1).toInstant());
 
         // One nanosecond more, and converting it gets an overflow.
         Instant instant2 = instant1.plusNanos(1);
-        expectThrows(IllegalArgumentException.class, () -> Timestamp.from(instant2));
+        assertThrows(IllegalArgumentException.class, () -> Timestamp.from(instant2));
 
         // The earliest Instant that can be converted to a Timestamp.
         Instant instant3 = Instant.ofEpochSecond(Long.MIN_VALUE / 1000, 0);
-        assertEquals(Timestamp.from(instant3).toInstant(), instant3);
+        assertEquals(instant3, Timestamp.from(instant3).toInstant());
 
         // One nanosecond less, and converting it gets an overflow.
         Instant instant4 = instant3.minusNanos(1);
-        expectThrows(IllegalArgumentException.class, () -> Timestamp.from(instant4));
+        assertThrows(IllegalArgumentException.class, () -> Timestamp.from(instant4));
 
         // The latest possible Instant will certainly overflow.
-        expectThrows(IllegalArgumentException.class, () -> Timestamp.from(Instant.MAX));
+        assertThrows(IllegalArgumentException.class, () -> Timestamp.from(Instant.MAX));
 
         // The earliest possible Instant will certainly overflow.
-        expectThrows(IllegalArgumentException.class, () -> Timestamp.from(Instant.MIN));
+        assertThrows(IllegalArgumentException.class, () -> Timestamp.from(Instant.MIN));
     }
 
     /*
@@ -683,7 +691,7 @@ public class TimestampTests extends BaseTest {
         assertTrue(ts1.equals(ts2));
         // As the Timestamp values, including the nanos are the same, the hashCode's
         // should be equal
-        assertEquals(ts1.hashCode(), ts2.hashCode());
+        assertEquals(ts2.hashCode(), ts1.hashCode());
     }
 
     /*
@@ -702,7 +710,7 @@ public class TimestampTests extends BaseTest {
         assertTrue(ts2.equals(ts2));
         assertFalse(ts1.equals(ts2));
         // As the nanos differ, the hashCode values should differ
-        assertNotEquals(ts1.hashCode(), ts2.hashCode());
+        assertNotEquals(ts2.hashCode(), ts1.hashCode());
     }
 
     /*
@@ -710,33 +718,32 @@ public class TimestampTests extends BaseTest {
      * to validate that an IllegalArgumentException will be thrown from the
      * valueOf method
      */
-    @DataProvider(name = "invalidTimestampValues")
-    private Object[][] invalidTimestampValues() {
-        return new Object[][]{
-            {"2009-11-01-01 10:50:01"},
-            {"aaaa-11-01-01 10:50"},
-            {"aaaa-11-01 10:50"},
-            {"1961--30 00:00:00"},
-            {"--30 00:00:00"},
-            {"-- 00:00:00"},
-            {"1961-1- 00:00:00"},
-            {"2009-11-01"},
-            {"10:50:01"},
-            {"1961-a-30 00:00:00"},
-            {"1961-01-bb 00:00:00"},
-            {"1961-08-30 00:00:00."},
-            {"1961-08-30 :00:00"},
-            {"1961-08-30 00::00"},
-            {"1961-08-30 00:00:"},
-            {"1961-08-30 ::"},
-            {"1961-08-30 0a:00:00"},
-            {"1961-08-30 00:bb:00"},
-            {"1961-08-30 00:01:cc"},
-            {"1961-08-30 00:00:00.01a"},
-            {"1961-08-30 00:00:00.a"},
-            {"1996-12-10 12:26:19.1234567890"},
-            {null}
-        };
+    private Stream<String> invalidTimestampValues() {
+        return Stream.of(
+            "2009-11-01-01 10:50:01",
+            "aaaa-11-01-01 10:50",
+            "aaaa-11-01 10:50",
+            "1961--30 00:00:00",
+            "--30 00:00:00",
+            "-- 00:00:00",
+            "1961-1- 00:00:00",
+            "2009-11-01",
+            "10:50:01",
+            "1961-a-30 00:00:00",
+            "1961-01-bb 00:00:00",
+            "1961-08-30 00:00:00.",
+            "1961-08-30 :00:00",
+            "1961-08-30 00::00",
+            "1961-08-30 00:00:",
+            "1961-08-30 ::",
+            "1961-08-30 0a:00:00",
+            "1961-08-30 00:bb:00",
+            "1961-08-30 00:01:cc",
+            "1961-08-30 00:00:00.01a",
+            "1961-08-30 00:00:00.a",
+            "1996-12-10 12:26:19.1234567890",
+            null
+        );
     }
 
     /*
@@ -744,67 +751,65 @@ public class TimestampTests extends BaseTest {
      * to validate that an IllegalArgumentException will not be thrown from the
      * valueOf method and the corect value from toString() is returned
      */
-    @DataProvider(name = "validTimestampValues")
-    private Object[][] validTimestampValues() {
-        return new Object[][]{
-            {"1961-08-30 00:00:00", "1961-08-30 00:00:00.0"},
-            {"1961-08-30 11:22:33", "1961-08-30 11:22:33.0"},
-            {"1961-8-30 00:00:00", "1961-08-30 00:00:00.0"},
-            {"1966-08-1 00:00:00", "1966-08-01 00:00:00.0"},
-            {"1996-12-10 12:26:19.1", "1996-12-10 12:26:19.1"},
-            {"1996-12-10 12:26:19.12", "1996-12-10 12:26:19.12"},
-            {"1996-12-10 12:26:19.123", "1996-12-10 12:26:19.123"},
-            {"1996-12-10 12:26:19.1234", "1996-12-10 12:26:19.1234"},
-            {"1996-12-10 12:26:19.12345", "1996-12-10 12:26:19.12345"},
-            {"1996-12-10 12:26:19.123456", "1996-12-10 12:26:19.123456"},
-            {"1996-12-10 12:26:19.1234567", "1996-12-10 12:26:19.1234567"},
-            {"1996-12-10 12:26:19.12345678", "1996-12-10 12:26:19.12345678"},
-            {"1996-12-10 12:26:19.123456789", "1996-12-10 12:26:19.123456789"},
-            {"1996-12-10 12:26:19.000000001", "1996-12-10 12:26:19.000000001"},
-            {"1996-12-10 12:26:19.000000012", "1996-12-10 12:26:19.000000012"},
-            {"1996-12-10 12:26:19.000000123", "1996-12-10 12:26:19.000000123"},
-            {"1996-12-10 12:26:19.000001234", "1996-12-10 12:26:19.000001234"},
-            {"1996-12-10 12:26:19.000012345", "1996-12-10 12:26:19.000012345"},
-            {"1996-12-10 12:26:19.000123456", "1996-12-10 12:26:19.000123456"},
-            {"1996-12-10 12:26:19.001234567", "1996-12-10 12:26:19.001234567"},
-            {"1996-12-10 12:26:19.12345678", "1996-12-10 12:26:19.12345678"},
-            {"1996-12-10 12:26:19.0", "1996-12-10 12:26:19.0"},
-            {"1996-12-10 12:26:19.01230", "1996-12-10 12:26:19.0123"}
-        };
+    private Stream<Arguments> validTimestampValues() {
+        return Stream.of(
+            Arguments.of("1961-08-30 00:00:00", "1961-08-30 00:00:00.0"),
+            Arguments.of("1961-08-30 11:22:33", "1961-08-30 11:22:33.0"),
+            Arguments.of("1961-8-30 00:00:00", "1961-08-30 00:00:00.0"),
+            Arguments.of("1966-08-1 00:00:00", "1966-08-01 00:00:00.0"),
+            Arguments.of("1996-12-10 12:26:19.1", "1996-12-10 12:26:19.1"),
+            Arguments.of("1996-12-10 12:26:19.12", "1996-12-10 12:26:19.12"),
+            Arguments.of("1996-12-10 12:26:19.123", "1996-12-10 12:26:19.123"),
+            Arguments.of("1996-12-10 12:26:19.1234", "1996-12-10 12:26:19.1234"),
+            Arguments.of("1996-12-10 12:26:19.12345", "1996-12-10 12:26:19.12345"),
+            Arguments.of("1996-12-10 12:26:19.123456", "1996-12-10 12:26:19.123456"),
+            Arguments.of("1996-12-10 12:26:19.1234567", "1996-12-10 12:26:19.1234567"),
+            Arguments.of("1996-12-10 12:26:19.12345678", "1996-12-10 12:26:19.12345678"),
+            Arguments.of("1996-12-10 12:26:19.123456789", "1996-12-10 12:26:19.123456789"),
+            Arguments.of("1996-12-10 12:26:19.000000001", "1996-12-10 12:26:19.000000001"),
+            Arguments.of("1996-12-10 12:26:19.000000012", "1996-12-10 12:26:19.000000012"),
+            Arguments.of("1996-12-10 12:26:19.000000123", "1996-12-10 12:26:19.000000123"),
+            Arguments.of("1996-12-10 12:26:19.000001234", "1996-12-10 12:26:19.000001234"),
+            Arguments.of("1996-12-10 12:26:19.000012345", "1996-12-10 12:26:19.000012345"),
+            Arguments.of("1996-12-10 12:26:19.000123456", "1996-12-10 12:26:19.000123456"),
+            Arguments.of("1996-12-10 12:26:19.001234567", "1996-12-10 12:26:19.001234567"),
+            Arguments.of("1996-12-10 12:26:19.12345678", "1996-12-10 12:26:19.12345678"),
+            Arguments.of("1996-12-10 12:26:19.0", "1996-12-10 12:26:19.0"),
+            Arguments.of("1996-12-10 12:26:19.01230", "1996-12-10 12:26:19.0123")
+        );
     }
 
-    @DataProvider(name = "validTimestampLongValues")
-    private Object[][] validTimestampLongValues() {
-        return new Object[][]{
-            {1L, "1970-01-01 01:00:00.001"},
-            {-3600*1000L - 1, "1969-12-31 23:59:59.999"},
-            {-(20000L*365*24*60*60*1000), "18018-08-28 01:00:00.0"},
-            {Timestamp.valueOf("1961-08-30 11:22:33").getTime(), "1961-08-30 11:22:33.0"},
-            {Timestamp.valueOf("1961-08-30 11:22:33.54321000").getTime(), "1961-08-30 11:22:33.543"}, // nanoprecision lost
-            {new Timestamp(114, 10, 10, 10, 10, 10, 100000000).getTime(), "2014-11-10 10:10:10.1"},
-            {new Timestamp(0, 10, 10, 10, 10, 10, 100000).getTime(), "1900-11-10 10:10:10.0"}, // nanoprecision lost
-            {new Date(114, 10, 10).getTime(), "2014-11-10 00:00:00.0"},
-            {new Date(0, 10, 10).getTime(), "1900-11-10 00:00:00.0"},
-            {LocalDateTime.of(1960, 10, 10, 10, 10, 10, 50000).atZone(ZoneId.of("America/Los_Angeles"))
-                .toInstant().toEpochMilli(), "1960-10-10 19:10:10.0"},
+    private Stream<Arguments> validTimestampLongValues() {
+        return Stream.of(
+            Arguments.of(1L, "1970-01-01 01:00:00.001"),
+            Arguments.of(-3600*1000L - 1, "1969-12-31 23:59:59.999"),
+            Arguments.of(-(20000L*365*24*60*60*1000), "18018-08-28 01:00:00.0"),
+            Arguments.of(Timestamp.valueOf("1961-08-30 11:22:33").getTime(), "1961-08-30 11:22:33.0"),
+            Arguments.of(Timestamp.valueOf("1961-08-30 11:22:33.54321000").getTime(), "1961-08-30 11:22:33.543"), // nanoprecision lost
+            Arguments.of(new Timestamp(114, 10, 10, 10, 10, 10, 100000000).getTime(), "2014-11-10 10:10:10.1"),
+            Arguments.of(new Timestamp(0, 10, 10, 10, 10, 10, 100000).getTime(), "1900-11-10 10:10:10.0"), // nanoprecision lost
+            Arguments.of(new Date(114, 10, 10).getTime(), "2014-11-10 00:00:00.0"),
+            Arguments.of(new Date(0, 10, 10).getTime(), "1900-11-10 00:00:00.0"),
+            Arguments.of(LocalDateTime.of(1960, 10, 10, 10, 10, 10, 50000).atZone(ZoneId.of("America/Los_Angeles"))
+                .toInstant().toEpochMilli(), "1960-10-10 19:10:10.0"),
 
             // millisecond timestamps wraps around at year 1, so Long.MIN_VALUE looks similar
             // Long.MAX_VALUE, while actually representing 292278994 BCE
-            {Long.MIN_VALUE, "292278994-08-17 08:12:55.192"},
-            {Long.MAX_VALUE + 1, "292278994-08-17 08:12:55.192"},
-            {Long.MAX_VALUE, "292278994-08-17 08:12:55.807"},
-            {Long.MIN_VALUE - 1, "292278994-08-17 08:12:55.807"},
+            Arguments.of(Long.MIN_VALUE, "292278994-08-17 08:12:55.192"),
+            Arguments.of(Long.MAX_VALUE + 1, "292278994-08-17 08:12:55.192"),
+            Arguments.of(Long.MAX_VALUE, "292278994-08-17 08:12:55.807"),
+            Arguments.of(Long.MIN_VALUE - 1, "292278994-08-17 08:12:55.807"),
 
             // wrap around point near 0001-01-01, test that we never get a negative year:
-            {-(1970L*365*24*60*60*1000), "0001-04-25 01:00:00.0"},
-            {-(1970L*365*24*60*60*1000 + 115*24*60*60*1000L), "0001-12-31 01:00:00.0"},
-            {-(1970L*365*24*60*60*1000 + 115*24*60*60*1000L - 23*60*60*1000L), "0001-01-01 00:00:00.0"},
+            Arguments.of(-(1970L*365*24*60*60*1000), "0001-04-25 01:00:00.0"),
+            Arguments.of(-(1970L*365*24*60*60*1000 + 115*24*60*60*1000L), "0001-12-31 01:00:00.0"),
+            Arguments.of(-(1970L*365*24*60*60*1000 + 115*24*60*60*1000L - 23*60*60*1000L), "0001-01-01 00:00:00.0"),
 
-            {LocalDateTime.of(0, 1, 1, 10, 10, 10, 50000).atZone(ZoneId.of("America/Los_Angeles"))
-                .toInstant().toEpochMilli() - 2*24*60*60*1000L, "0001-01-01 19:03:08.0"}, // 1 BCE
-            {LocalDateTime.of(0, 1, 1, 10, 10, 10, 50000).atZone(ZoneId.of("America/Los_Angeles"))
-                .toInstant().toEpochMilli() - 3*24*60*60*1000L, "0002-12-31 19:03:08.0"} // 2 BCE
-        };
+            Arguments.of(LocalDateTime.of(0, 1, 1, 10, 10, 10, 50000).atZone(ZoneId.of("America/Los_Angeles"))
+                .toInstant().toEpochMilli() - 2*24*60*60*1000L, "0001-01-01 19:03:08.0"), // 1 BCE
+            Arguments.of(LocalDateTime.of(0, 1, 1, 10, 10, 10, 50000).atZone(ZoneId.of("America/Los_Angeles"))
+                .toInstant().toEpochMilli() - 3*24*60*60*1000L, "0002-12-31 19:03:08.0") // 2 BCE
+        );
     }
 
     /*
@@ -812,29 +817,28 @@ public class TimestampTests extends BaseTest {
      * validate that the correct Nanos value is generated from the specified
      * Timestamp
      */
-    @DataProvider(name = "validateNanos")
-    private Object[][] validateNanos() {
-        return new Object[][]{
-            {"1961-08-30 00:00:00", 0},
-            {"1996-12-10 12:26:19.1", 100000000},
-            {"1996-12-10 12:26:19.12", 120000000},
-            {"1996-12-10 12:26:19.123", 123000000},
-            {"1996-12-10 12:26:19.1234", 123400000},
-            {"1996-12-10 12:26:19.12345", 123450000},
-            {"1996-12-10 12:26:19.123456", 123456000},
-            {"1996-12-10 12:26:19.1234567", 123456700},
-            {"1996-12-10 12:26:19.12345678", 123456780},
-            {"1996-12-10 12:26:19.123456789", 123456789},
-            {"1996-12-10 12:26:19.000000001", 1},
-            {"1996-12-10 12:26:19.000000012", 12},
-            {"1996-12-10 12:26:19.000000123", 123},
-            {"1996-12-10 12:26:19.000001234", 1234},
-            {"1996-12-10 12:26:19.000012345", 12345},
-            {"1996-12-10 12:26:19.000123456", 123456},
-            {"1996-12-10 12:26:19.001234567", 1234567},
-            {"1996-12-10 12:26:19.012345678", 12345678},
-            {"1996-12-10 12:26:19.0", 0},
-            {"1996-12-10 12:26:19.01230", 12300000}
-        };
+    private Stream<Arguments> validateNanos() {
+        return Stream.of(
+            Arguments.of("1961-08-30 00:00:00", 0),
+            Arguments.of("1996-12-10 12:26:19.1", 100000000),
+            Arguments.of("1996-12-10 12:26:19.12", 120000000),
+            Arguments.of("1996-12-10 12:26:19.123", 123000000),
+            Arguments.of("1996-12-10 12:26:19.1234", 123400000),
+            Arguments.of("1996-12-10 12:26:19.12345", 123450000),
+            Arguments.of("1996-12-10 12:26:19.123456", 123456000),
+            Arguments.of("1996-12-10 12:26:19.1234567", 123456700),
+            Arguments.of("1996-12-10 12:26:19.12345678", 123456780),
+            Arguments.of("1996-12-10 12:26:19.123456789", 123456789),
+            Arguments.of("1996-12-10 12:26:19.000000001", 1),
+            Arguments.of("1996-12-10 12:26:19.000000012", 12),
+            Arguments.of("1996-12-10 12:26:19.000000123", 123),
+            Arguments.of("1996-12-10 12:26:19.000001234", 1234),
+            Arguments.of("1996-12-10 12:26:19.000012345", 12345),
+            Arguments.of("1996-12-10 12:26:19.000123456", 123456),
+            Arguments.of("1996-12-10 12:26:19.001234567", 1234567),
+            Arguments.of("1996-12-10 12:26:19.012345678", 12345678),
+            Arguments.of("1996-12-10 12:26:19.0", 0),
+            Arguments.of("1996-12-10 12:26:19.01230", 12300000)
+        );
     }
 }
diff --git a/test/jdk/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java b/test/jdk/java/sql/test/sql/drivermanager/DriverManagerInitTests.java
similarity index 93%
rename from test/jdk/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java
rename to test/jdk/java/sql/test/sql/drivermanager/DriverManagerInitTests.java
index d2570993533..f77fde4b166 100644
--- a/test/jdk/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java
+++ b/test/jdk/java/sql/test/sql/drivermanager/DriverManagerInitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.sql.othervm;
+package sql.drivermanager;
 
 import java.io.BufferedReader;
 import java.io.CharArrayReader;
@@ -33,8 +33,8 @@ import java.util.Enumeration;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DriverManagerInitTests {
 
diff --git a/test/jdk/java/sql/driverModuleTests/DriverManagerModuleTests.java b/test/jdk/java/sql/test/sql/drivermanager/DriverManagerModuleTests.java
similarity index 84%
rename from test/jdk/java/sql/driverModuleTests/DriverManagerModuleTests.java
rename to test/jdk/java/sql/test/sql/drivermanager/DriverManagerModuleTests.java
index aad39cdb1dd..083153ac38f 100644
--- a/test/jdk/java/sql/driverModuleTests/DriverManagerModuleTests.java
+++ b/test/jdk/java/sql/test/sql/drivermanager/DriverManagerModuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,23 +20,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package sql.drivermanager;
 
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /*
  * @test
- * @library /java/sql/modules
  * @build luckydogdriver/* mystubdriver/*
- * @run testng/othervm DriverManagerModuleTests
  * @summary Tests that a JDBC Driver that is a module can be loaded
  * via the service-provider loading mechanism.
  */
@@ -46,28 +42,12 @@ public class DriverManagerModuleTests {
     private static final String STUBDRIVERURL = "jdbc:stub:myDB";
     private static final String CONNECTION_CLASS_NAME = "com.luckydogtennis.StubConnection";
 
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @BeforeMethod
-    public void setUpMethod() throws Exception {
-    }
-
-    @AfterMethod
-    public void tearDownMethod() throws Exception {
-    }
-
     /**
      * Validate JDBC drivers as modules will be accessible. One driver will be
      * loaded and registered via the service-provider loading mechanism. The
      * other driver will need to be explictly loaded
      *
-     * @throws java.lang.Exception
+     * @throws Exception
      */
     @Test
     public void test() throws Exception {
@@ -101,7 +81,7 @@ public class DriverManagerModuleTests {
      * Validate that a Connection can be obtained from a JDBC driver which is a
      * module and loaded via the service-provider loading mechanism.
      *
-     * @throws java.lang.Exception
+     * @throws Exception
      */
     @Test
     public void test00() throws Exception {
diff --git a/test/jdk/java/sql/test/sql/drivermanager/TEST.properties b/test/jdk/java/sql/test/sql/drivermanager/TEST.properties
new file mode 100644
index 00000000000..0fed686adad
--- /dev/null
+++ b/test/jdk/java/sql/test/sql/drivermanager/TEST.properties
@@ -0,0 +1,4 @@
+# drivermanager tests are run in othervm
+othervm.dirs = .
+# Required by DriverManagerModuleTests.java
+lib.dirs = /java/sql/modules
diff --git a/test/jdk/java/sql/testng/TEST.properties b/test/jdk/java/sql/testng/TEST.properties
deleted file mode 100644
index 66b1566374a..00000000000
--- a/test/jdk/java/sql/testng/TEST.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# JDBC unit tests uses TestNG
-TestNG.dirs = .
-othervm.dirs = test/sql/othervm
-
diff --git a/test/jdk/java/sql/testng/util/BaseTest.java b/test/jdk/java/sql/util/BaseTest.java
similarity index 54%
rename from test/jdk/java/sql/testng/util/BaseTest.java
rename to test/jdk/java/sql/util/BaseTest.java
index 8751183726d..1a1b14e795a 100644
--- a/test/jdk/java/sql/testng/util/BaseTest.java
+++ b/test/jdk/java/sql/util/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.sql.JDBCType;
 import java.sql.SQLException;
+import java.util.stream.Stream;
 
-import org.testng.annotations.DataProvider;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.provider.Arguments;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class BaseTest {
 
     protected final String reason = "reason";
@@ -73,29 +76,11 @@ public class BaseTest {
         return o1;
     }
 
-    /*
-     * DataProvider used to specify the value to set and check for
-     * methods using boolean values
-     */
-    @DataProvider(name = "trueFalse")
-    protected Object[][] trueFalse() {
-        return new Object[][]{
-            {true},
-            {false}
-        };
-    }
-
     /*
      * DataProvider used to specify the standard JDBC Types
      */
-    @DataProvider(name = "jdbcTypes")
-    protected Object[][] jdbcTypes() {
-        Object[][] o = new Object[JDBCType.values().length][1];
-        int pos = 0;
-        for (JDBCType c : JDBCType.values()) {
-            o[pos++][0] = c.getVendorTypeNumber();
-        }
-        return o;
+    protected Stream<Integer> jdbcTypes() {
+        return Stream.of(JDBCType.values()).map(JDBCType::getVendorTypeNumber);
     }
 
     /*
@@ -103,15 +88,14 @@ public class BaseTest {
      * that enquoteLiteral converts a string to a literal and every instance of
      * a single quote will be converted into two single quotes in the literal.
      */
-    @DataProvider(name = "validEnquotedLiteralValues")
-    protected Object[][] validEnquotedLiteralValues() {
-        return new Object[][]{
-                {"Hello", "'Hello'"},
-                {"G'Day", "'G''Day'"},
-                {"'G''Day'", "'''G''''Day'''"},
-                {"I'''M", "'I''''''M'"},
-                {"The Dark Knight", "'The Dark Knight'"},
-        };
+    protected Stream<Arguments> validEnquotedLiteralValues() {
+        return Stream.of(
+                Arguments.of("Hello", "'Hello'"),
+                Arguments.of("G'Day", "'G''Day'"),
+                Arguments.of("'G''Day'", "'''G''''Day'''"),
+                Arguments.of("I'''M", "'I''''''M'"),
+                Arguments.of("The Dark Knight", "'The Dark Knight'")
+        );
     }
 
     /*
@@ -119,37 +103,37 @@ public class BaseTest {
      * that enqouteIdentifier returns a simple SQL Identifier or a
      * quoted identifier
      */
-    @DataProvider(name = "validIdentifierValues")
-    protected Object[][] validEnquotedIdentifierValues() {
-        return new Object[][]{
-                {"b", false, "b"},
-                {"b", true, "\"b\""},
-                {MAX_LENGTH_IDENTIFIER, false, MAX_LENGTH_IDENTIFIER},
-                {MAX_LENGTH_IDENTIFIER, true, "\"" + MAX_LENGTH_IDENTIFIER + "\""},
-                {"Hello", false, "Hello"},
-                {"Hello", true, "\"Hello\""},
-                {"G'Day", false, "\"G'Day\""},
-                {"G'Day", true, "\"G'Day\""},
-                {"Bruce Wayne", false, "\"Bruce Wayne\""},
-                {"Bruce Wayne", true, "\"Bruce Wayne\""},
-                {"select", false, "\"select\""},
-                {"table", true, "\"table\""},
-                {"GoodDay$", false, "\"GoodDay$\""},
-                {"GoodDay$", true, "\"GoodDay$\""},};
+    protected Stream<Arguments> validEnquotedIdentifierValues() {
+        return Stream.of(
+                Arguments.of("b", false, "b"),
+                Arguments.of("b", true, "\"b\""),
+                Arguments.of(MAX_LENGTH_IDENTIFIER, false, MAX_LENGTH_IDENTIFIER),
+                Arguments.of(MAX_LENGTH_IDENTIFIER, true, "\"" + MAX_LENGTH_IDENTIFIER + "\""),
+                Arguments.of("Hello", false, "Hello"),
+                Arguments.of("Hello", true, "\"Hello\""),
+                Arguments.of("G'Day", false, "\"G'Day\""),
+                Arguments.of("G'Day", true, "\"G'Day\""),
+                Arguments.of("Bruce Wayne", false, "\"Bruce Wayne\""),
+                Arguments.of("Bruce Wayne", true, "\"Bruce Wayne\""),
+                Arguments.of("select", false, "\"select\""),
+                Arguments.of("table", true, "\"table\""),
+                Arguments.of("GoodDay$", false, "\"GoodDay$\""),
+                Arguments.of("GoodDay$", true, "\"GoodDay$\"")
+        );
     }
 
     /*
      * DataProvider used to provide strings are invalid for enquoteIdentifier
      * resulting in a SQLException being thrown
      */
-    @DataProvider(name = "invalidIdentifierValues")
-    protected Object[][] invalidEnquotedIdentifierValues() {
-        return new Object[][]{
-                {"Hel\"lo", false},
-                {"\"Hel\"lo\"", true},
-                {"Hello" + '\0', false},
-                {"", false},
-                {MAX_LENGTH_IDENTIFIER + 'a', false},};
+    protected Stream<Arguments> invalidEnquotedIdentifierValues() {
+        return Stream.of(
+                Arguments.of("Hel\"lo", false),
+                Arguments.of("\"Hel\"lo\"", true),
+                Arguments.of("Hello" + '\0', false),
+                Arguments.of("", false),
+                Arguments.of(MAX_LENGTH_IDENTIFIER + 'a', false)
+        );
     }
 
     /*
@@ -157,22 +141,21 @@ public class BaseTest {
      * that isSimpleIdentifier returns the correct value based on the
      * identifier specified.
      */
-    @DataProvider(name = "simpleIdentifierValues")
-    protected Object[][] simpleIdentifierValues() {
-        return new Object[][]{
-                {"b", true},
-                {"Hello", true},
-                {"\"Gotham\"", false},
-                {"G'Day", false},
-                {"Bruce Wayne", false},
-                {"GoodDay$", false},
-                {"Dick_Grayson", true},
-                {"Batmobile1966", true},
-                {MAX_LENGTH_IDENTIFIER, true},
-                {MAX_LENGTH_IDENTIFIER + 'a', false},
-                {"", false},
-                {"select", false}
-            };
+    protected Stream<Arguments> simpleIdentifierValues() {
+        return Stream.of(
+                Arguments.of("b", true),
+                Arguments.of("Hello", true),
+                Arguments.of("\"Gotham\"", false),
+                Arguments.of("G'Day", false),
+                Arguments.of("Bruce Wayne", false),
+                Arguments.of("GoodDay$", false),
+                Arguments.of("Dick_Grayson", true),
+                Arguments.of("Batmobile1966", true),
+                Arguments.of(MAX_LENGTH_IDENTIFIER, true),
+                Arguments.of(MAX_LENGTH_IDENTIFIER + 'a', false),
+                Arguments.of("", false),
+                Arguments.of("select", false)
+            );
     }
 
     /*
@@ -181,15 +164,14 @@ public class BaseTest {
      * literal and every instance of
      * a single quote will be converted into two single quotes in the literal.
      */
-    @DataProvider(name = "validEnquotedNCharLiteralValues")
-    protected Object[][] validEnquotedNCharLiteralValues() {
-        return new Object[][]{
-                {"Hello", "N'Hello'"},
-                {"G'Day", "N'G''Day'"},
-                {"'G''Day'", "N'''G''''Day'''"},
-                {"I'''M", "N'I''''''M'"},
-                {"N'Hello'", "N'N''Hello'''"},
-                {"The Dark Knight", "N'The Dark Knight'"}
-        };
+    protected Stream<Arguments> validEnquotedNCharLiteralValues() {
+        return Stream.of(
+                Arguments.of("Hello", "N'Hello'"),
+                Arguments.of("G'Day", "N'G''Day'"),
+                Arguments.of("'G''Day'", "N'''G''''Day'''"),
+                Arguments.of("I'''M", "N'I''''''M'"),
+                Arguments.of("N'Hello'", "N'N''Hello'''"),
+                Arguments.of("The Dark Knight", "N'The Dark Knight'")
+        );
     }
 }
diff --git a/test/jdk/java/sql/testng/util/DriverActionImpl.java b/test/jdk/java/sql/util/DriverActionImpl.java
similarity index 94%
rename from test/jdk/java/sql/testng/util/DriverActionImpl.java
rename to test/jdk/java/sql/util/DriverActionImpl.java
index 4a286ad8f3c..48fed8086a7 100644
--- a/test/jdk/java/sql/testng/util/DriverActionImpl.java
+++ b/test/jdk/java/sql/util/DriverActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/SerializedBatchUpdateException.java b/test/jdk/java/sql/util/SerializedBatchUpdateException.java
similarity index 99%
rename from test/jdk/java/sql/testng/util/SerializedBatchUpdateException.java
rename to test/jdk/java/sql/util/SerializedBatchUpdateException.java
index 00efc5275a7..08473e6a184 100644
--- a/test/jdk/java/sql/testng/util/SerializedBatchUpdateException.java
+++ b/test/jdk/java/sql/util/SerializedBatchUpdateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubCallableStatement.java b/test/jdk/java/sql/util/StubCallableStatement.java
similarity index 99%
rename from test/jdk/java/sql/testng/util/StubCallableStatement.java
rename to test/jdk/java/sql/util/StubCallableStatement.java
index 4a7c27314bb..4700699c4ba 100644
--- a/test/jdk/java/sql/testng/util/StubCallableStatement.java
+++ b/test/jdk/java/sql/util/StubCallableStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubConnection.java b/test/jdk/java/sql/util/StubConnection.java
similarity index 99%
rename from test/jdk/java/sql/testng/util/StubConnection.java
rename to test/jdk/java/sql/util/StubConnection.java
index cd013572adc..e1a60efc323 100644
--- a/test/jdk/java/sql/testng/util/StubConnection.java
+++ b/test/jdk/java/sql/util/StubConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubDatabaseMetaData.java b/test/jdk/java/sql/util/StubDatabaseMetaData.java
similarity index 99%
rename from test/jdk/java/sql/testng/util/StubDatabaseMetaData.java
rename to test/jdk/java/sql/util/StubDatabaseMetaData.java
index 3bf70afaa8f..3c95ac94793 100644
--- a/test/jdk/java/sql/testng/util/StubDatabaseMetaData.java
+++ b/test/jdk/java/sql/util/StubDatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubDriver.java b/test/jdk/java/sql/util/StubDriver.java
similarity index 96%
rename from test/jdk/java/sql/testng/util/StubDriver.java
rename to test/jdk/java/sql/util/StubDriver.java
index 12253080377..c45b9ec9919 100644
--- a/test/jdk/java/sql/testng/util/StubDriver.java
+++ b/test/jdk/java/sql/util/StubDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubDriverDA.java b/test/jdk/java/sql/util/StubDriverDA.java
similarity index 96%
rename from test/jdk/java/sql/testng/util/StubDriverDA.java
rename to test/jdk/java/sql/util/StubDriverDA.java
index 5b23f0846d8..f134a9d28cf 100644
--- a/test/jdk/java/sql/testng/util/StubDriverDA.java
+++ b/test/jdk/java/sql/util/StubDriverDA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubPreparedStatement.java b/test/jdk/java/sql/util/StubPreparedStatement.java
similarity index 99%
rename from test/jdk/java/sql/testng/util/StubPreparedStatement.java
rename to test/jdk/java/sql/util/StubPreparedStatement.java
index a3b95a65f4e..fdb90df4797 100644
--- a/test/jdk/java/sql/testng/util/StubPreparedStatement.java
+++ b/test/jdk/java/sql/util/StubPreparedStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/sql/testng/util/StubStatement.java b/test/jdk/java/sql/util/StubStatement.java
similarity index 99%
rename from test/jdk/java/sql/testng/util/StubStatement.java
rename to test/jdk/java/sql/util/StubStatement.java
index c8f6a3ac071..00ed6268856 100644
--- a/test/jdk/java/sql/testng/util/StubStatement.java
+++ b/test/jdk/java/sql/util/StubStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/java/time/tck/java/time/TCKOffsetTime.java b/test/jdk/java/time/tck/java/time/TCKOffsetTime.java
index 7ea9504edbc..8aab9f53977 100644
--- a/test/jdk/java/time/tck/java/time/TCKOffsetTime.java
+++ b/test/jdk/java/time/tck/java/time/TCKOffsetTime.java
@@ -421,7 +421,6 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
                 {"00;00"},
                 {"12-00"},
                 {"-01:00"},
-                {"00:00:00-09"},
                 {"00:00:00,09"},
                 {"00:00:abs"},
                 {"11"},
@@ -436,6 +435,11 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         Assertions.assertThrows(DateTimeParseException.class, () -> OffsetTime.parse(unparsable));
     }
 
+    @Test
+    public void factory_parse_hourOnlyOffset() {
+        Assertions.assertDoesNotThrow(() -> OffsetTime.parse("00:00:00-09"));
+    }
+
     //-----------------------------------------------------------------------s
     @Test
     public void factory_parse_illegalHour() {
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java
index 2ccc0da8f58..d6c73f6bc74 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@
  */
 package test.java.time.format;
 
+import static java.time.format.DateTimeFormatter.*;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -93,15 +94,19 @@ import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAccessor;
 import java.util.Locale;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Test DateTimeFormatter.
- * @bug 8085887 8293146
+ * @bug 8085887 8293146 8210336
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestDateTimeFormatter {
@@ -333,4 +338,49 @@ public class TestDateTimeFormatter {
             assertThrows(DateTimeException.class, () -> LocalDate.parse(weekDate, f));
         }
     }
+
+    private static Stream<Arguments> data_iso_short_offset_parse() {
+        return Stream.of(
+            Arguments.of("20260123-01", BASIC_ISO_DATE, "20260123-0100"),
+            Arguments.of("20260123+00", BASIC_ISO_DATE, "20260123Z"),
+            Arguments.of("20260123-00", BASIC_ISO_DATE, "20260123Z"),
+            Arguments.of("2026-01-23-01", ISO_DATE, "2026-01-23-01:00"),
+            Arguments.of("2026-01-23+00", ISO_DATE, "2026-01-23Z"),
+            Arguments.of("2026-01-23-00", ISO_DATE, "2026-01-23Z"),
+            Arguments.of("2026-01-23T11:30:59-01", ISO_DATE_TIME, "2026-01-23T11:30:59-01:00"),
+            Arguments.of("2026-01-23T11:30:59+00", ISO_DATE_TIME, "2026-01-23T11:30:59Z"),
+            Arguments.of("2026-01-23T11:30:59-00", ISO_DATE_TIME, "2026-01-23T11:30:59Z"),
+            Arguments.of("11:30:59-01", ISO_TIME, "11:30:59-01:00"),
+            Arguments.of("11:30:59+00", ISO_TIME, "11:30:59Z"),
+            Arguments.of("11:30:59-00", ISO_TIME, "11:30:59Z"),
+            Arguments.of("2026-01-23-01", ISO_OFFSET_DATE, "2026-01-23-01:00"),
+            Arguments.of("2026-01-23+00", ISO_OFFSET_DATE, "2026-01-23Z"),
+            Arguments.of("2026-01-23-00", ISO_OFFSET_DATE, "2026-01-23Z"),
+            Arguments.of("2026-01-23T11:30:59-01", ISO_OFFSET_DATE_TIME, "2026-01-23T11:30:59-01:00"),
+            Arguments.of("2026-01-23T11:30:59+00", ISO_OFFSET_DATE_TIME, "2026-01-23T11:30:59Z"),
+            Arguments.of("2026-01-23T11:30:59-00", ISO_OFFSET_DATE_TIME, "2026-01-23T11:30:59Z"),
+            Arguments.of("11:30:59-01", ISO_OFFSET_TIME, "11:30:59-01:00"),
+            Arguments.of("11:30:59+00", ISO_OFFSET_TIME, "11:30:59Z"),
+            Arguments.of("11:30:59-00", ISO_OFFSET_TIME, "11:30:59Z"),
+            Arguments.of("2026-023-01", ISO_ORDINAL_DATE, "2026-023-01:00"),
+            Arguments.of("2026-023+00", ISO_ORDINAL_DATE, "2026-023Z"),
+            Arguments.of("2026-023-00", ISO_ORDINAL_DATE, "2026-023Z"),
+            Arguments.of("2026-W04-5-01", ISO_WEEK_DATE, "2026-W04-5-01:00"),
+            Arguments.of("2026-W04-5+00", ISO_WEEK_DATE, "2026-W04-5Z"),
+            Arguments.of("2026-W04-5-00", ISO_WEEK_DATE, "2026-W04-5Z"),
+            Arguments.of("2026-01-23T11:30:59-01", ISO_ZONED_DATE_TIME, "2026-01-23T11:30:59-01:00"),
+            Arguments.of("2026-01-23T11:30:59+00", ISO_ZONED_DATE_TIME, "2026-01-23T11:30:59Z"),
+            Arguments.of("2026-01-23T11:30:59-00", ISO_ZONED_DATE_TIME, "2026-01-23T11:30:59Z"),
+            Arguments.of("2026-01-23T11:30:59-01", ISO_INSTANT, "2026-01-23T12:30:59Z"),
+            Arguments.of("2026-01-23T11:30:59+00", ISO_INSTANT, "2026-01-23T11:30:59Z"),
+            Arguments.of("2026-01-23T11:30:59-00", ISO_INSTANT, "2026-01-23T11:30:59Z")
+        );
+    }
+
+    // Checks if predefined ISO formatters can parse hour-only offsets
+    @ParameterizedTest
+    @MethodSource("data_iso_short_offset_parse")
+    public void test_iso_short_offset_parse(String text, DateTimeFormatter formatter, String expected) {
+        assertEquals(expected, formatter.format(formatter.parse(text)));
+    }
 }
diff --git a/test/jdk/java/util/ServiceLoader/BadProvidersTest.java b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java
index 8560126eb00..0a734a2b214 100644
--- a/test/jdk/java/util/ServiceLoader/BadProvidersTest.java
+++ b/test/jdk/java/util/ServiceLoader/BadProvidersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @library /test/lib
  * @modules jdk.compiler
  * @build jdk.test.lib.compiler.CompilerUtils
- * @run testng/othervm BadProvidersTest
+ * @run junit/othervm BadProvidersTest
  * @summary Basic test of ServiceLoader with bad provider and bad provider
  *          factories deployed on the module path
  */
@@ -50,8 +50,6 @@ import java.util.stream.Collectors;
 
 import jdk.test.lib.compiler.CompilerUtils;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.DataProvider;
 
 import static java.lang.classfile.ClassFile.ACC_PUBLIC;
 import static java.lang.classfile.ClassFile.ACC_STATIC;
@@ -59,13 +57,16 @@ import static java.lang.constant.ConstantDescs.CD_Object;
 import static java.lang.constant.ConstantDescs.INIT_NAME;
 import static java.lang.constant.ConstantDescs.MTD_void;
 
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 /**
  * Basic test of `provides S with PF` and `provides S with P` where the provider
  * factory or provider
  */
-
 public class BadProvidersTest {
 
     private static final String TEST_SRC = System.getProperty("test.src");
@@ -137,22 +138,10 @@ public class BadProvidersTest {
         assertTrue(p != null);
     }
 
-
-    @DataProvider(name = "badfactories")
-    public Object[][] createBadFactories() {
-        return new Object[][] {
-                { "classnotpublic",     null },
-                { "methodnotpublic",    null },
-                { "badreturntype",      null },
-                { "returnsnull",        null },
-                { "throwsexception",    null },
-        };
-    }
-
-
-    @Test(dataProvider = "badfactories",
-          expectedExceptions = ServiceConfigurationError.class)
-    public void testBadFactory(String testName, String ignore) throws Exception {
+    @ParameterizedTest
+    @ValueSource(strings = { "classnotpublic", "methodnotpublic", "badreturntype",
+            "returnsnull", "throwsexception" })
+    public void testBadFactory(String testName) throws Exception {
         Path mods = compileTest(TEST1_MODULE);
 
         // compile the bad factory
@@ -164,28 +153,18 @@ public class BadProvidersTest {
         // copy the compiled class into the module
         Path classFile = Paths.get("p", "ProviderFactory.class");
         Files.copy(output.resolve(classFile),
-                   mods.resolve(TEST1_MODULE).resolve(classFile),
-                   StandardCopyOption.REPLACE_EXISTING);
+                mods.resolve(TEST1_MODULE).resolve(classFile),
+                StandardCopyOption.REPLACE_EXISTING);
 
-        // load providers and instantiate each one
-        loadProviders(mods, TEST1_MODULE).forEach(Provider::get);
+        Assertions.assertThrows(ServiceConfigurationError.class,
+                // load providers and instantiate each one
+                () -> loadProviders(mods, TEST1_MODULE).forEach(Provider::get)
+        );
     }
 
-
-    @DataProvider(name = "badproviders")
-    public Object[][] createBadProviders() {
-        return new Object[][] {
-                { "notpublic",          null },
-                { "ctornotpublic",      null },
-                { "notasubtype",        null },
-                { "throwsexception",    null }
-        };
-    }
-
-
-    @Test(dataProvider = "badproviders",
-          expectedExceptions = ServiceConfigurationError.class)
-    public void testBadProvider(String testName, String ignore) throws Exception {
+    @ParameterizedTest
+    @ValueSource(strings = { "notpublic", "ctornotpublic", "notasubtype", "throwsexception" })
+    public void testBadProvider(String testName) throws Exception {
         Path mods = compileTest(TEST2_MODULE);
 
         // compile the bad provider
@@ -197,11 +176,13 @@ public class BadProvidersTest {
         // copy the compiled class into the module
         Path classFile = Paths.get("p", "Provider.class");
         Files.copy(output.resolve(classFile),
-                   mods.resolve(TEST2_MODULE).resolve(classFile),
-                   StandardCopyOption.REPLACE_EXISTING);
+                mods.resolve(TEST2_MODULE).resolve(classFile),
+                StandardCopyOption.REPLACE_EXISTING);
 
-        // load providers and instantiate each one
-        loadProviders(mods, TEST2_MODULE).forEach(Provider::get);
+        Assertions.assertThrows(ServiceConfigurationError.class,
+                // load providers and instantiate each one
+                () -> loadProviders(mods, TEST2_MODULE).forEach(Provider::get)
+        );
     }
 
 
@@ -209,7 +190,7 @@ public class BadProvidersTest {
      * Test a service provider that defines more than one no-args
      * public static "provider" method.
      */
-    @Test(expectedExceptions = ServiceConfigurationError.class)
+    @Test
     public void testWithTwoFactoryMethods() throws Exception {
         Path mods = compileTest(TEST1_MODULE);
 
@@ -244,8 +225,10 @@ public class BadProvidersTest {
                 .resolve("ProviderFactory.class");
         Files.write(classFile, bytes);
 
-        // load providers and instantiate each one
-        loadProviders(mods, TEST1_MODULE).forEach(Provider::get);
+        Assertions.assertThrows(ServiceConfigurationError.class,
+                // load providers and instantiate each one
+                () -> loadProviders(mods, TEST1_MODULE).forEach(Provider::get)
+        );
     }
 
 }
diff --git a/test/jdk/java/util/ServiceLoader/CachingTest.java b/test/jdk/java/util/ServiceLoader/CachingTest.java
index 264c646b5af..138b6b6862f 100644
--- a/test/jdk/java/util/ServiceLoader/CachingTest.java
+++ b/test/jdk/java/util/ServiceLoader/CachingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /**
  * @test
  * @summary Test ServiceLoader caches
- * @run testng CachingTest
+ * @run junit CachingTest
  */
 
 import java.nio.file.Files;
@@ -38,9 +38,9 @@ import java.util.ServiceLoader.Provider;
 import java.util.Spliterator;
 import java.util.stream.Collectors;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class CachingTest {
 
@@ -52,17 +52,17 @@ public class CachingTest {
 
     public static class S2 implements S { }
 
-    private ClassLoader testClassLoader;
+    private static ClassLoader testClassLoader;
 
     // creates the services configuration file and sets the ClassLoader
-    @BeforeClass
-    void setup() throws Exception {
+    @BeforeAll
+    static void setup() throws Exception {
         String classes = System.getProperty("test.classes");
         Path dir = Paths.get(classes, "META-INF", "services");
         Files.createDirectories(dir);
         Path config = dir.resolve(S.class.getName());
         Files.write(config, List.of(S1.class.getName(), S2.class.getName()));
-        this.testClassLoader = CachingTest.class.getClassLoader();
+        testClassLoader = CachingTest.class.getClassLoader();
     }
 
     private void checkLists(List<?> list1, List<?> list2) {
diff --git a/test/jdk/java/util/ServiceLoader/ModulesTest.java b/test/jdk/java/util/ServiceLoader/ModulesTest.java
index 002b8458865..d265ce18f60 100644
--- a/test/jdk/java/util/ServiceLoader/ModulesTest.java
+++ b/test/jdk/java/util/ServiceLoader/ModulesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @build jdk.test.lib.util.JarUtils
  * @compile classpath/pearscript/org/pear/PearScriptEngineFactory.java
  *          classpath/pearscript/org/pear/PearScript.java
- * @run testng/othervm ModulesTest
+ * @run junit/othervm ModulesTest
  * @summary Basic test for ServiceLoader with a provider deployed as a module.
  */
 
@@ -55,9 +55,10 @@ import javax.script.ScriptEngineFactory;
 
 import jdk.test.lib.util.JarUtils;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeTest;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * Basic test for ServiceLoader. The test make use of two service providers:
@@ -67,12 +68,11 @@ import static org.testng.Assert.*;
  * 2. PearScriptEngine - a ScriptEngineFactory deployed on the class path
  *    with a service configuration file.
  */
-
 public class ModulesTest {
 
     // Copy the services configuration file for "pearscript" into place.
-    @BeforeTest
-    public void setup() throws Exception {
+    @BeforeAll
+    public static void setup() throws Exception {
         Path src = Paths.get(System.getProperty("test.src"));
         Path classes = Paths.get(System.getProperty("test.classes"));
         String st = ScriptEngineFactory.class.getName();
@@ -428,30 +428,36 @@ public class ModulesTest {
 
     // -- nulls --
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void testLoadNull1() {
-        ServiceLoader.load(null);
+        Assertions.assertThrows(NullPointerException.class,
+                () -> ServiceLoader.load(null));
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void testLoadNull2() {
-        ServiceLoader.load((Class<?>) null, ClassLoader.getSystemClassLoader());
+        Assertions.assertThrows(NullPointerException.class,
+                () -> ServiceLoader.load((Class<?>) null, ClassLoader.getSystemClassLoader()));
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void testLoadNull3() {
         class S { }
-        ServiceLoader.load((ModuleLayer) null, S.class);
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            ServiceLoader.load((ModuleLayer) null, S.class);
+        });
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void testLoadNull4() {
-        ServiceLoader.load(ModuleLayer.empty(), null);
+        Assertions.assertThrows(NullPointerException.class,
+                () -> ServiceLoader.load(ModuleLayer.empty(), null));
     }
 
-    @Test(expectedExceptions = { NullPointerException.class })
+    @Test
     public void testLoadNull5() {
-        ServiceLoader.loadInstalled(null);
+        Assertions.assertThrows(NullPointerException.class,
+                () -> ServiceLoader.loadInstalled(null));
     }
 
     /**
diff --git a/test/jdk/java/util/ServiceLoader/NoInterferenceTest.java b/test/jdk/java/util/ServiceLoader/NoInterferenceTest.java
index ff83b836e20..d91bc9c759f 100644
--- a/test/jdk/java/util/ServiceLoader/NoInterferenceTest.java
+++ b/test/jdk/java/util/ServiceLoader/NoInterferenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @library /test/lib
  * @modules jdk.compiler
  * @build jdk.test.lib.compiler.CompilerUtils
- * @run testng NoInterferenceTest
+ * @run junit NoInterferenceTest
  * @summary Basic test of ServiceLoader that ensures there is no interference
  *          when there are two service interfaces of the same name in a layer
  *          or overridden in a child layer.
@@ -46,9 +46,9 @@ import java.util.Set;
 
 import jdk.test.lib.compiler.CompilerUtils;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class NoInterferenceTest {
 
@@ -57,8 +57,8 @@ public class NoInterferenceTest {
     private static final Path MODS_DIR = Paths.get("mods");
     private static final List<String> MODULES = Arrays.asList("s1", "p1", "s2", "p2");
 
-    @BeforeTest
-    void compile() throws Exception {
+    @BeforeAll
+    static void compile() throws Exception {
         Files.createDirectory(MODS_DIR);
         for (String name : MODULES) {
             Path src = SRC_DIR.resolve(name);
diff --git a/test/jdk/java/util/ServiceLoader/ReloadTest.java b/test/jdk/java/util/ServiceLoader/ReloadTest.java
index d48b5c29f4d..be2c0d68773 100644
--- a/test/jdk/java/util/ServiceLoader/ReloadTest.java
+++ b/test/jdk/java/util/ServiceLoader/ReloadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
  * @modules java.scripting
  * @library modules classpath/pearscript
  * @build ReloadTest org.pear.PearScript org.pear.PearScriptEngineFactory bananascript/*
- * @run testng/othervm ReloadTest
+ * @run junit/othervm ReloadTest
  * @summary Basic test of ServiceLoader.reload
  */
 
@@ -40,12 +40,14 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import static java.util.ServiceLoader.*;
 import javax.script.ScriptEngineFactory;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
 
-@Test
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 public class ReloadTest {
 
+    @Test
     public void testReload() {
         ServiceLoader<ScriptEngineFactory> sl = load(ScriptEngineFactory.class);
         List<String> names1 = sl.stream()
@@ -58,41 +60,42 @@ public class ReloadTest {
                 .map(Provider::get)
                 .map(ScriptEngineFactory::getEngineName)
                 .collect(Collectors.toList());
-        assertEquals(names1, names2);
+        assertEquals(names2, names1);
     }
 
-    @Test(expectedExceptions = { ConcurrentModificationException.class })
+    @Test
     public void testIteratorHasNext() {
         ServiceLoader<ScriptEngineFactory> sl = load(ScriptEngineFactory.class);
         Iterator<ScriptEngineFactory> iterator = sl.iterator();
         sl.reload();
-        iterator.hasNext();
+        Assertions.assertThrows(ConcurrentModificationException.class, iterator::hasNext);
     }
 
-    @Test(expectedExceptions = { ConcurrentModificationException.class })
+    @Test
     public void testIteratorNext() {
         ServiceLoader<ScriptEngineFactory> sl = load(ScriptEngineFactory.class);
         Iterator<ScriptEngineFactory> iterator = sl.iterator();
         assertTrue(iterator.hasNext());
         sl.reload();
-        iterator.next();
+        Assertions.assertThrows(ConcurrentModificationException.class, iterator::next);
     }
 
-    @Test(expectedExceptions = { ConcurrentModificationException.class })
+    @Test
     public void testStreamFindAny() {
         ServiceLoader<ScriptEngineFactory> sl = load(ScriptEngineFactory.class);
         Stream<Provider<ScriptEngineFactory>> stream = sl.stream();
         sl.reload();
-        stream.findAny();
+        Assertions.assertThrows(ConcurrentModificationException.class, stream::findAny);
     }
 
-    @Test(expectedExceptions = { ConcurrentModificationException.class })
+    @Test
     public void testSpliteratorTryAdvance() {
         ServiceLoader<ScriptEngineFactory> sl = load(ScriptEngineFactory.class);
         Stream<Provider<ScriptEngineFactory>> stream = sl.stream();
         Spliterator<Provider<ScriptEngineFactory>> spliterator = stream.spliterator();
         sl.reload();
-        spliterator.tryAdvance(System.out::println);
+        Assertions.assertThrows(ConcurrentModificationException.class,
+                () -> spliterator.tryAdvance(System.out::println));
     }
 
 }
diff --git a/test/jdk/java/util/ServiceLoader/TwoIterators.java b/test/jdk/java/util/ServiceLoader/TwoIterators.java
index ddb9cc09508..b86cc45f17f 100644
--- a/test/jdk/java/util/ServiceLoader/TwoIterators.java
+++ b/test/jdk/java/util/ServiceLoader/TwoIterators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Test ServiceLoader with two iterators, interleaving their use
  *   to test that they don't interfere with each other
- * @run testng TwoIterators
+ * @run junit TwoIterators
  */
 
 import java.nio.file.Files;
@@ -35,9 +35,9 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class TwoIterators {
 
@@ -48,18 +48,17 @@ public class TwoIterators {
     public static class S1 implements S { }
     public static class S2 implements S { }
 
-    private ClassLoader testClassLoader;
+    private static ClassLoader testClassLoader;
 
     // creates the services configuration file and sets the ClassLoader
-    @BeforeClass
-    void setup() throws Exception {
+    @BeforeAll
+    static void setup() throws Exception {
         String classes = System.getProperty("test.classes");
         Path dir = Paths.get(classes, "META-INF", "services");
         Files.createDirectories(dir);
         Path config = dir.resolve(S.class.getName());
         Files.write(config, Arrays.asList(S1.class.getName(), S2.class.getName()));
-
-        this.testClassLoader = TwoIterators.class.getClassLoader();
+        testClassLoader = TwoIterators.class.getClassLoader();
     }
 
     @Test
diff --git a/test/jdk/java/util/ServiceLoader/basic/ServiceLoaderBasicTest.java b/test/jdk/java/util/ServiceLoader/basic/ServiceLoaderBasicTest.java
index 91aba564cd1..4a9bc808851 100644
--- a/test/jdk/java/util/ServiceLoader/basic/ServiceLoaderBasicTest.java
+++ b/test/jdk/java/util/ServiceLoader/basic/ServiceLoaderBasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @build jdk.test.lib.process.*
  *        jdk.test.lib.util.JarUtils
  *        Basic Load FooService FooProvider1 FooProvider2 FooProvider3 BarProvider
- * @run testng ServiceLoaderBasicTest
+ * @run junit ServiceLoaderBasicTest
  */
 
 
@@ -44,14 +44,16 @@ import jdk.test.lib.Utils;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.JarUtils;
 
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.Arrays.asList;
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
 public class ServiceLoaderBasicTest {
 
     private static final String METAINFO = "META-INF/services/FooService";
@@ -79,8 +81,8 @@ public class ServiceLoaderBasicTest {
     private static final String XTESTXMETA_CP = XTEST_CP + XMETA;
     private static final String XTESTXMETAP2_CP = XTESTXMETA_CP + P2;
 
-    @BeforeClass
-    public void initialize() throws Exception {
+    @BeforeAll
+    public static void initialize() throws Exception {
         createProviderConfig(XTEST_CONFIG, "FooProvider1");
         createProviderConfig(XMETA_CONFIG, "FooProvider42");
         createJar(P2JAR, "FooProvider2", List.of("FooProvider2"));
@@ -88,8 +90,7 @@ public class ServiceLoaderBasicTest {
         Files.copy(P2JAR, P2DUPJAR, REPLACE_EXISTING);
     }
 
-    @DataProvider
-    public Object[][] testCases() {
+    private static Object[][] testCases() {
         return new Object[][]{
             //       CLI options,            Test,       Runtime arguments
             // Success cases
@@ -110,23 +111,14 @@ public class ServiceLoaderBasicTest {
         };
     }
 
-    @DataProvider
-    public Object[][] negativeTestCases() {
-        return new Object[][]{
-            {"blah blah"},
-            {"9234"},
-            {"X!"},
-            {"BarProvider"},
-            {"FooProvider42"}
-        };
-    }
-
-    @Test(dataProvider = "testCases")
+    @ParameterizedTest
+    @MethodSource("testCases")
     public void testProvider(List<String> args) throws Throwable {
         runJava(args);
     }
 
-    @Test(dataProvider = "negativeTestCases")
+    @ParameterizedTest // negative test cases
+    @ValueSource(strings = { "blah blah", "9234", "X!", "BarProvider", "FooProvider42" })
     public void testBadProvider(String providerName) throws Throwable {
         Files.write(XMETA_CONFIG, providerName.getBytes());
         runJava(List.of("-cp", XMETA_CP, "Load", "fail"));
@@ -144,12 +136,12 @@ public class ServiceLoaderBasicTest {
                     .shouldHaveExitValue(0);
     }
 
-    private void createProviderConfig(Path config, String providerName) throws Exception {
+    private static void createProviderConfig(Path config, String providerName) throws Exception {
         Files.createDirectories(config.getParent());
         Files.write(config, providerName.getBytes(), CREATE);
     }
 
-    private void createJar(Path jar, String provider, List<String> files) throws Exception {
+    private static void createJar(Path jar, String provider, List<String> files) throws Exception {
         Path xdir = Path.of(provider);
         createProviderConfig(xdir.resolve(METAINFO), provider);
 
diff --git a/test/jdk/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java b/test/jdk/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java
index ece63bfe813..c8f882b599d 100644
--- a/test/jdk/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java
+++ b/test/jdk/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -126,12 +126,19 @@ public class SpliteratorTraversingAndSplittingTest extends SpliteratorTestHelper
 
         List<T> exp;
 
+        List<T> expRev;
+
         Map<T, T> mExp;
 
+        Map<T, T> mExpRev;
+
         SpliteratorDataBuilder(List<Object[]> data, List<T> exp) {
             this.data = data;
             this.exp = exp;
+            this.expRev = new ArrayList<>(exp);
+            Collections.reverse(this.expRev);
             this.mExp = createMap(exp);
+            this.mExpRev = createMap(expRev);
         }
 
         Map<T, T> createMap(List<T> l) {
@@ -166,12 +173,23 @@ public class SpliteratorTraversingAndSplittingTest extends SpliteratorTestHelper
             addMap(m, description);
         }
 
+        void addDescendingMap(Function<Map<T, T>, ? extends Map<T, T>> m) {
+            String description = "new " + m.apply(Collections.<T, T>emptyMap()).getClass().getName();
+            addDescendingMap(m, description);
+        }
+
         void addMap(Function<Map<T, T>, ? extends Map<T, T>> m, String description) {
             add(description + ".keySet().spliterator()", () -> m.apply(mExp).keySet().spliterator());
             add(description + ".values().spliterator()", () -> m.apply(mExp).values().spliterator());
             add(description + ".entrySet().spliterator()", mExp.entrySet(), () -> m.apply(mExp).entrySet().spliterator());
         }
 
+        void addDescendingMap(Function<Map<T, T>, ? extends Map<T, T>> m, String description) {
+            add(description + ".keySet().spliterator()", expRev, () -> m.apply(mExp).keySet().spliterator());
+            add(description + ".values().spliterator()", expRev, () -> m.apply(mExp).values().spliterator());
+            add(description + ".entrySet().spliterator()", mExpRev.entrySet(), () -> m.apply(mExp).entrySet().spliterator());
+        }
+
         StringBuilder joiner(String description) {
             return new StringBuilder(description).
                     append(" {").
@@ -639,8 +657,14 @@ public class SpliteratorTraversingAndSplittingTest extends SpliteratorTestHelper
                 return cm;
             }, "new java.util.WeakHashMap(1, size + 1)");
 
-            // @@@  Descending maps etc
             db.addMap(TreeMap::new);
+            db.addMap(m -> new TreeMap<>(m).tailMap(Integer.MIN_VALUE));
+            db.addMap(m -> new TreeMap<>(m).headMap(Integer.MAX_VALUE));
+            db.addMap(m -> new TreeMap<>(m).subMap(Integer.MIN_VALUE, Integer.MAX_VALUE));
+            db.addDescendingMap(m -> new TreeMap<>(m).descendingMap());
+            db.addDescendingMap(m -> new TreeMap<>(m).descendingMap().tailMap(Integer.MAX_VALUE));
+            db.addDescendingMap(m -> new TreeMap<>(m).descendingMap().headMap(Integer.MIN_VALUE));
+            db.addDescendingMap(m -> new TreeMap<>(m).descendingMap().subMap(Integer.MAX_VALUE, Integer.MIN_VALUE));
 
             db.addMap(ConcurrentHashMap::new);
 
diff --git a/test/jdk/java/util/StringJoiner/MergeTest.java b/test/jdk/java/util/StringJoiner/MergeTest.java
index f47ed3ee094..574124b9bdd 100644
--- a/test/jdk/java/util/StringJoiner/MergeTest.java
+++ b/test/jdk/java/util/StringJoiner/MergeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,18 @@
  * @summary test  StringJoiner::merge
  * @modules java.base/jdk.internal.util
  * @requires vm.bits == "64" & os.maxMemory > 4G
- * @run testng/othervm -Xmx4g -XX:+CompactStrings MergeTest
+ * @run junit/othervm -Xmx4g -XX:+CompactStrings MergeTest
  */
 
 import java.util.StringJoiner;
 import java.util.stream.Stream;
-import org.testng.annotations.Test;
 import static jdk.internal.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
 
-@Test
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
 public class MergeTest {
     private static final String[] PREFIXES = {"", "{", "@#$%"};
     private static final String[] SUFFIXES = {"", "}", "*&%$"};
@@ -69,12 +70,13 @@ public class MergeTest {
         return builder.build();
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void testNull() {
         StringJoiner sj = new StringJoiner(",", "{", "}");
-        sj.merge(null);
+        Assertions.assertThrows(NullPointerException.class, () -> sj.merge(null));
     }
 
+    @Test
     public void testSimple() {
         fixesStream().forEach(fixes -> {
             StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
@@ -83,10 +85,11 @@ public class MergeTest {
             Stream.of("d", "e", "f").forEachOrdered(other::add);
 
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + "a,b,c,d,e,f" + fixes.suf0);
+            assertEquals(fixes.pre0 + "a,b,c,d,e,f" + fixes.suf0, sj.toString());
         });
     }
 
+    @Test
     public void testEmptyOther() {
         fixesStream().forEach(fixes -> {
             StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
@@ -94,14 +97,15 @@ public class MergeTest {
             Stream.of("a", "b", "c").forEachOrdered(sj::add);
 
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + "a,b,c" + fixes.suf0);
+            assertEquals(fixes.pre0 + "a,b,c" + fixes.suf0, sj.toString());
 
             other.setEmptyValue("EMPTY");
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + "a,b,c" + fixes.suf0);
+            assertEquals(fixes.pre0 + "a,b,c" + fixes.suf0, sj.toString());
         });
     }
 
+    @Test
     public void testEmptyThis() {
         fixesStream().forEach(fixes -> {
             StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
@@ -109,34 +113,36 @@ public class MergeTest {
             Stream.of("d", "e", "f").forEachOrdered(other::add);
 
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + "d:e:f" + fixes.suf0);
+            assertEquals(fixes.pre0 + "d:e:f" + fixes.suf0, sj.toString());
 
             sj = new StringJoiner(",", fixes.pre0, fixes.suf0).setEmptyValue("EMPTY");
-            assertEquals(sj.toString(), "EMPTY");
+            assertEquals("EMPTY", sj.toString());
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + "d:e:f" + fixes.suf0);
+            assertEquals(fixes.pre0 + "d:e:f" + fixes.suf0, sj.toString());
         });
     }
 
+    @Test
     public void testEmptyBoth() {
         fixesStream().forEach(fixes -> {
             StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
             StringJoiner other = new StringJoiner(":", fixes.pre1, fixes.suf1);
 
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + fixes.suf0);
+            assertEquals(fixes.pre0 + fixes.suf0, sj.toString());
 
             other.setEmptyValue("NOTHING");
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + fixes.suf0);
+            assertEquals(fixes.pre0 + fixes.suf0, sj.toString());
 
             sj = new StringJoiner(",", fixes.pre0, fixes.suf0).setEmptyValue("EMPTY");
-            assertEquals(sj.toString(), "EMPTY");
+            assertEquals("EMPTY", sj.toString());
             sj.merge(other);
-            assertEquals(sj.toString(), "EMPTY");
+            assertEquals("EMPTY", sj.toString());
         });
     }
 
+    @Test
     public void testCascadeEmpty() {
         fixesStream().forEach(fixes -> {
             StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
@@ -144,13 +150,14 @@ public class MergeTest {
             StringJoiner o2 = new StringJoiner(",", "<", ">").setEmptyValue("Empty2");
 
             o1.merge(o2);
-            assertEquals(o1.toString(), "Empty1");
+            assertEquals("Empty1", o1.toString());
 
             sj.merge(o1);
-            assertEquals(sj.toString(), fixes.pre0 + fixes.suf0);
+            assertEquals(fixes.pre0 + fixes.suf0, sj.toString());
         });
     }
 
+    @Test
     public void testDelimiter() {
         fixesStream().forEach(fixes -> {
             StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0);
@@ -159,18 +166,20 @@ public class MergeTest {
             Stream.of("d", "e", "f").forEachOrdered(other::add);
 
             sj.merge(other);
-            assertEquals(sj.toString(), fixes.pre0 + "a,b,c,d:e:f" + fixes.suf0);
+            assertEquals(fixes.pre0 + "a,b,c,d:e:f" + fixes.suf0, sj.toString());
         });
     }
 
+    @Test
     public void testMergeSelf() {
         fixesStream().forEach(fixes -> {
             final StringJoiner sj = new StringJoiner(",", fixes.pre0, fixes.suf0).add("a").add("b");
-            assertEquals(sj.merge(sj).toString(), fixes.pre0 + "a,b,a,b" + fixes.suf0);
-            assertEquals(sj.merge(sj).toString(), fixes.pre0 + "a,b,a,b,a,b,a,b" + fixes.suf0);
+            assertEquals(fixes.pre0 + "a,b,a,b" + fixes.suf0, sj.merge(sj).toString());
+            assertEquals(fixes.pre0 + "a,b,a,b,a,b,a,b" + fixes.suf0, sj.merge(sj).toString());
         });
     }
 
+    @Test
     public void OOM() {
         String maxString = "*".repeat(SOFT_MAX_ARRAY_LENGTH);
 
diff --git a/test/jdk/java/util/StringJoiner/StringJoinerOomUtf16Test.java b/test/jdk/java/util/StringJoiner/StringJoinerOomUtf16Test.java
index b45e66b4d8b..7fde8b36ffa 100644
--- a/test/jdk/java/util/StringJoiner/StringJoinerOomUtf16Test.java
+++ b/test/jdk/java/util/StringJoiner/StringJoinerOomUtf16Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,23 @@
  * @summary tests StringJoiner OOME when joining sub-max-length Strings
  * @modules java.base/jdk.internal.util
  * @requires vm.bits == "64" & os.maxMemory > 4G
- * @run testng/othervm -Xmx4g -XX:+CompactStrings StringJoinerOomUtf16Test
+ * @run junit/othervm -Xmx4g -XX:+CompactStrings StringJoinerOomUtf16Test
  */
 
-import org.testng.annotations.Test;
 
 import static jdk.internal.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
-import static org.testng.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.StringJoiner;
 
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
 
-@Test(groups = {"unit","string","util","libs"})
+@Tag("unit")
+@Tag("string")
+@Tag("util")
+@Tag("libs")
 public class StringJoinerOomUtf16Test {
 
     // the sum of lengths of the following two strings is way less than
@@ -48,6 +53,7 @@ public class StringJoinerOomUtf16Test {
     private static final String OVERFLOW_UTF16_STRING =
         "\u017D".repeat(((Integer.MAX_VALUE - SOFT_MAX_ARRAY_LENGTH) >> 1) + 1);
 
+    @Test
     public void OOM1() {
         try {
             new StringJoiner("")
@@ -60,6 +66,7 @@ public class StringJoinerOomUtf16Test {
         }
     }
 
+    @Test
     public void OOM2() {
         try {
             new StringJoiner(HALF_MAX_LATIN1_STRING)
@@ -72,6 +79,7 @@ public class StringJoinerOomUtf16Test {
         }
     }
 
+    @Test
     public void OOM3() {
         try {
             new StringJoiner(OVERFLOW_UTF16_STRING)
@@ -84,6 +92,7 @@ public class StringJoinerOomUtf16Test {
         }
     }
 
+    @Test
     public void OOM4() {
         try {
             new StringJoiner("", HALF_MAX_LATIN1_STRING, OVERFLOW_UTF16_STRING)
diff --git a/test/jdk/java/util/StringJoiner/StringJoinerTest.java b/test/jdk/java/util/StringJoiner/StringJoinerTest.java
index 25948fb8e55..aa25623dbc3 100644
--- a/test/jdk/java/util/StringJoiner/StringJoinerTest.java
+++ b/test/jdk/java/util/StringJoiner/StringJoinerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,25 @@
  * @summary tests StringJoinerTest
  * @modules java.base/jdk.internal.util
  * @requires vm.bits == "64" & os.maxMemory > 4G
- * @run testng/othervm -Xmx4g -XX:+CompactStrings StringJoinerTest
+ * @run junit/othervm -Xmx4g -XX:+CompactStrings StringJoinerTest
  * @author Jim Gish
  */
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
 import java.util.ArrayList;
 import java.util.StringJoiner;
-import org.testng.annotations.Test;
+
 import static jdk.internal.util.ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
-
-@Test(groups = {"unit","string","util","libs"})
+@Tag("unit")
+@Tag("string")
+@Tag("util")
+@Tag("libs")
 public class StringJoinerTest {
 
     private static final String EMPTY = "EMPTY";
@@ -51,6 +58,7 @@ public class StringJoinerTest {
     private static final String DASH = "-";
     private static final String MAX_STRING = "*".repeat(SOFT_MAX_ARRAY_LENGTH);
 
+    @Test
     public void addAddAll() {
         StringJoiner sj = new StringJoiner(DASH, "{", "}");
         sj.add(ONE);
@@ -61,7 +69,7 @@ public class StringJoinerTest {
         nextOne.stream().forEachOrdered(sj::add);
 
         String expected = "{"+ONE+DASH+TWO+DASH+THREE+"}";
-        assertEquals(sj.toString(), expected);
+        assertEquals(expected, sj.toString());
     }
 
     void addAlladd() {
@@ -75,10 +83,11 @@ public class StringJoinerTest {
         sj.add(THREE);
 
         String expected = "{"+ONE+DASH+TWO+DASH+THREE+"}";
-        assertEquals(sj.toString(), expected);
+        assertEquals(expected, sj.toString());
     }
 
     // The following tests do two successive adds of different types
+    @Test
     public void addAlladdAll() {
         StringJoiner sj = new StringJoiner(DASH, "{", "}");
         ArrayList<String> firstOne = new ArrayList<>();
@@ -93,9 +102,10 @@ public class StringJoinerTest {
         nextOne.stream().forEachOrdered(sj::add);
 
         String expected = "{"+ONE+DASH+TWO+DASH+THREE+DASH+FOUR+DASH+FIVE+"}";
-        assertEquals(sj.toString(), expected);
+        assertEquals(expected, sj.toString());
     }
 
+    @Test
     public void addCharSequence() {
         StringJoiner sj = new StringJoiner(",");
         CharSequence cs_one = ONE;
@@ -104,13 +114,13 @@ public class StringJoinerTest {
         sj.add(cs_one);
         sj.add(cs_two);
 
-        assertEquals(sj.toString(), ONE + "," + TWO);
+        assertEquals(ONE + "," + TWO, sj.toString());
 
         sj = new StringJoiner(DASH, "{", "}");
         sj.add(cs_one);
         sj.add(cs_two);
 
-        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+        assertEquals("{" + ONE + DASH + TWO + "}", sj.toString());
 
         StringBuilder builder = new StringBuilder(ONE);
         StringBuffer buffer = new StringBuffer(THREE);
@@ -118,13 +128,14 @@ public class StringJoinerTest {
         sj.add(builder).add(buffer);
         builder.append(TWO);
         buffer.append(FOUR);
-        assertEquals(sj.toString(), "{ " + ONE + ", " + THREE + " }",
+        assertEquals("{ " + ONE + ", " + THREE + " }", sj.toString(),
                 "CharSequence is copied when add");
         sj.add(builder);
-        assertEquals(sj.toString(), "{ " + ONE + ", " + THREE + ", " + ONE +
-                TWO + " }");
+        assertEquals("{ " + ONE + ", " + THREE + ", " + ONE +
+                TWO + " }", sj.toString());
     }
 
+    @Test
     public void addCharSequenceWithEmptyValue() {
         StringJoiner sj = new StringJoiner(",").setEmptyValue(EMPTY);
         CharSequence cs_one = ONE;
@@ -133,189 +144,200 @@ public class StringJoinerTest {
         sj.add(cs_one);
         sj.add(cs_two);
 
-        assertEquals(sj.toString(), ONE + "," + TWO);
+        assertEquals(ONE + "," + TWO, sj.toString());
 
         sj = new StringJoiner(DASH, "{", "}");
         sj.add(cs_one);
         sj.add(cs_two);
-        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+        assertEquals("{" + ONE + DASH + TWO + "}", sj.toString());
 
         sj = new StringJoiner(DASH, "{", "}");
-        assertEquals(sj.toString(), "{}");
+        assertEquals("{}", sj.toString());
 
         sj = new StringJoiner("=", "{", "}").setEmptyValue("");
-        assertEquals(sj.toString(), "");
+        assertEquals("", sj.toString());
 
         sj = new StringJoiner(DASH, "{", "}").setEmptyValue(EMPTY);
-        assertEquals(sj.toString(), EMPTY);
+        assertEquals(EMPTY, sj.toString());
 
         sj.add(cs_one);
         sj.add(cs_two);
-        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+        assertEquals("{" + ONE + DASH + TWO + "}", sj.toString());
     }
 
+    @Test
     public void addString() {
         StringJoiner sj = new StringJoiner(DASH);
         sj.add(ONE);
-        assertEquals(sj.toString(), ONE);
+        assertEquals(ONE, sj.toString());
 
         sj = new StringJoiner(DASH, "{", "}");
         sj.add(ONE);
-        assertEquals(sj.toString(), "{" + ONE + "}");
+        assertEquals("{" + ONE + "}", sj.toString());
 
         sj.add(TWO);
-        assertEquals(sj.toString(), "{" + ONE + DASH + TWO + "}");
+        assertEquals("{" + ONE + DASH + TWO + "}", sj.toString());
     }
 
+    @Test
     public void lengthWithCustomEmptyValue() {
         StringJoiner sj = new StringJoiner(DASH, "<", ">").setEmptyValue(EMPTY);
-        assertEquals(sj.length(), EMPTY.length());
+        assertEquals(EMPTY.length(), sj.length());
         sj.add("");
-        assertEquals(sj.length(), "<>".length());
+        assertEquals("<>".length(), sj.length());
         sj.add("");
-        assertEquals(sj.length(), "<->".length());
+        assertEquals("<->".length(), sj.length());
         sj.add(ONE);
-        assertEquals(sj.length(), 4 + ONE_LEN);
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals(4 + ONE_LEN, sj.length());
+        assertEquals(sj.length(), sj.toString().length());
         sj.add(TWO);
-        assertEquals(sj.length(), 5 + ONE_LEN + TWO_LEN);
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals(5 + ONE_LEN + TWO_LEN, sj.length());
+        assertEquals(sj.length(), sj.toString().length());
         sj = new StringJoiner("||", "<", "-->");
-        assertEquals(sj.length(), 4);
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals(4, sj.length());
+        assertEquals(sj.length(), sj.toString().length());
         sj.add("abcdef");
-        assertEquals(sj.length(), 10);
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals(10, sj.length());
+        assertEquals(sj.length(), sj.toString().length());
         sj.add("xyz");
-        assertEquals(sj.length(), 15);
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals(15, sj.length());
+        assertEquals(sj.length(), sj.toString().length());
     }
 
+    @Test
     public void noAddAndEmptyValue() {
         StringJoiner sj = new StringJoiner(DASH, "", "").setEmptyValue(EMPTY);
-        assertEquals(sj.toString(), EMPTY);
+        assertEquals(EMPTY, sj.toString());
 
         sj = new StringJoiner(DASH, "<..", "");
-        assertEquals(sj.toString(), "<..");
+        assertEquals("<..", sj.toString());
 
         sj = new StringJoiner(DASH, "<..", "");
-        assertEquals(sj.toString(), "<..");
+        assertEquals("<..", sj.toString());
 
         sj = new StringJoiner(DASH, "", "==>");
-        assertEquals(sj.toString(), "==>");
+        assertEquals("==>", sj.toString());
 
         sj = new StringJoiner(DASH, "{", "}");
-        assertEquals(sj.toString(), "{}");
+        assertEquals("{}", sj.toString());
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void setEmptyValueNull() {
-        new StringJoiner(DASH, "{", "}").setEmptyValue(null);
+        Assertions.assertThrows(NullPointerException.class,
+                () -> new StringJoiner(DASH, "{", "}").setEmptyValue(null));
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void setDelimiterNull() {
-        new StringJoiner(null);
+        Assertions.assertThrows(NullPointerException.class,
+                () -> new StringJoiner(null));
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void setPrefixNull() {
-        new StringJoiner(DASH, null, "}");
+        Assertions.assertThrows(NullPointerException.class,
+                () -> new StringJoiner(DASH, null, "}"));
     }
 
-    @Test(expectedExceptions = {NullPointerException.class})
+    @Test
     public void setSuffixNull() {
-        new StringJoiner(DASH, "{", null);
+        Assertions.assertThrows(NullPointerException.class,
+                () -> new StringJoiner(DASH, "{", null));
     }
 
+    @Test
     public void stringFromtoString() {
         StringJoiner sj = new StringJoiner(", ");
-        assertEquals(sj.toString(), "");
+        assertEquals("", sj.toString());
         sj = new StringJoiner(",", "{", "}");
-        assertEquals(sj.toString(), "{}");
+        assertEquals("{}", sj.toString());
 
         sj = new StringJoiner(",");
         sj.add(ONE);
-        assertEquals(sj.toString(), ONE);
+        assertEquals(ONE, sj.toString());
 
         sj.add(TWO);
-        assertEquals(sj.toString(), ONE + "," + TWO);
+        assertEquals(ONE + "," + TWO, sj.toString());
 
         sj = new StringJoiner(",", "{--", "--}");
         sj.add(ONE);
         sj.add(TWO);
-        assertEquals(sj.toString(), "{--" + ONE + "," + TWO + "--}");
+        assertEquals("{--" + ONE + "," + TWO + "--}", sj.toString());
 
     }
 
+    @Test
     public void stringFromtoStringWithEmptyValue() {
         StringJoiner sj = new StringJoiner(" ", "", "");
-        assertEquals(sj.toString(), "");
+        assertEquals("", sj.toString());
         sj = new StringJoiner(", ");
-        assertEquals(sj.toString(), "");
+        assertEquals("", sj.toString());
         sj = new StringJoiner(",", "{", "}");
-        assertEquals(sj.toString(), "{}");
+        assertEquals("{}", sj.toString());
 
         sj = new StringJoiner(",", "{", "}").setEmptyValue("");
-        assertEquals(sj.toString(), "");
+        assertEquals("", sj.toString());
 
         sj = new StringJoiner(",");
         sj.add(ONE);
-        assertEquals(sj.toString(), ONE);
+        assertEquals(ONE, sj.toString());
 
         sj.add(TWO);
-        assertEquals(sj.toString(), ONE + "," + TWO);
+        assertEquals(ONE + "," + TWO, sj.toString());
 
         sj = new StringJoiner(",", "{--", "--}");
         sj.add(ONE);
-        assertEquals(sj.toString(), "{--" + ONE + "--}" );
+        assertEquals("{--" + ONE + "--}", sj.toString() );
 
         sj.add(TWO);
-        assertEquals(sj.toString(), "{--" + ONE + "," + TWO + "--}");
+        assertEquals("{--" + ONE + "," + TWO + "--}", sj.toString());
 
     }
 
+    @Test
     public void toStringWithCustomEmptyValue() {
         StringJoiner sj = new StringJoiner(DASH, "<", ">").setEmptyValue(EMPTY);
-        assertEquals(sj.toString(), EMPTY);
+        assertEquals(EMPTY, sj.toString());
         sj.add("");
-        assertEquals(sj.toString(), "<>");
+        assertEquals("<>", sj.toString());
         sj.add("");
-        assertEquals(sj.toString(), "<->");
+        assertEquals("<->", sj.toString());
     }
 
     private void testCombos(String infix, String prefix, String suffix) {
         StringJoiner sj = new StringJoiner(infix, prefix, suffix);
-        assertEquals(sj.toString(), prefix + suffix);
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals(prefix + suffix, sj.toString());
+        assertEquals(sj.length(), sj.toString().length());
         // EmptyValue
         sj = new StringJoiner(infix, prefix, suffix).setEmptyValue("<NONE>");
-        assertEquals(sj.toString(), "<NONE>");
-        assertEquals(sj.toString().length(), sj.length());
+        assertEquals("<NONE>", sj.toString());
+        assertEquals(sj.length(), sj.toString().length());
 
         // empty in front
         sj.add("");
-        assertEquals(sj.toString(), prefix + suffix);
+        assertEquals(prefix + suffix, sj.toString());
         // empty in middle
         sj.add("");
-        assertEquals(sj.toString(), prefix + infix + suffix);
+        assertEquals(prefix + infix + suffix, sj.toString());
         sj.add("1");
-        assertEquals(sj.toString(), prefix + infix + infix + "1" + suffix);
+        assertEquals(prefix + infix + infix + "1" + suffix, sj.toString());
         // empty at end
         sj.add("");
-        assertEquals(sj.toString(), prefix + infix + infix + "1" + infix + suffix);
+        assertEquals(prefix + infix + infix + "1" + infix + suffix, sj.toString());
 
         sj = new StringJoiner(infix, prefix, suffix).setEmptyValue("<NONE>");
         sj.add("1");
-        assertEquals(sj.toString(), prefix + "1" + suffix);
+        assertEquals(prefix + "1" + suffix, sj.toString());
         sj.add("2");
-        assertEquals(sj.toString(), prefix + "1" + infix + "2" + suffix);
+        assertEquals(prefix + "1" + infix + "2" + suffix, sj.toString());
         sj.add("");
-        assertEquals(sj.toString(), prefix + "1" + infix + "2" + infix + suffix);
+        assertEquals(prefix + "1" + infix + "2" + infix + suffix, sj.toString());
         sj.add("3");
-        assertEquals(sj.toString(), prefix + "1" + infix + "2" + infix + infix + "3" + suffix);
+        assertEquals(prefix + "1" + infix + "2" + infix + infix + "3" + suffix, sj.toString());
     }
 
+    @Test
     public void testDelimiterCombinations() {
         testCombos("", "", "");
         testCombos("", "<", "");
@@ -327,6 +349,7 @@ public class StringJoinerTest {
         testCombos(",", "<", ">");
     }
 
+    @Test
     public void OOM1() {
         try {
             new StringJoiner(MAX_STRING, MAX_STRING, MAX_STRING).toString();
@@ -336,6 +359,7 @@ public class StringJoinerTest {
         }
     }
 
+    @Test
     public void OOM2() {
         try {
             new StringJoiner(MAX_STRING, MAX_STRING, "").toString();
@@ -345,6 +369,7 @@ public class StringJoinerTest {
         }
     }
 
+    @Test
     public void OOM3() {
         try {
             new StringJoiner(MAX_STRING, "", MAX_STRING).toString();
@@ -354,6 +379,7 @@ public class StringJoinerTest {
         }
     }
 
+    @Test
     public void OOM4() {
         try {
             new StringJoiner("", MAX_STRING, MAX_STRING).toString();
diff --git a/test/jdk/java/util/Vector/ArrayManagement.java b/test/jdk/java/util/Vector/ArrayManagement.java
index ce4e695487c..c1fa6d1c9bc 100644
--- a/test/jdk/java/util/Vector/ArrayManagement.java
+++ b/test/jdk/java/util/Vector/ArrayManagement.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2016 Google, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,7 +26,7 @@
  * @test
  * @bug 8148174
  * @summary brittle white box test of internal array management
- * @run testng ArrayManagement
+ * @run junit ArrayManagement
  */
 
 import java.lang.reflect.Field;
@@ -35,8 +36,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.SplittableRandom;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ArrayManagement {
 
@@ -61,9 +62,9 @@ public class ArrayManagement {
             super.ensureCapacity(minCapacity);
             assertTrue(capacity() >= minCapacity);
             if (minCapacity <= oldCapacity)
-                assertEquals(capacity(), oldCapacity);
+                assertEquals(oldCapacity, capacity());
             if (minCapacity > 0)
-                assertEquals(modCount(), oldModCount + 1);
+                assertEquals(oldModCount + 1, modCount());
         }
     }
 
@@ -89,117 +90,117 @@ public class ArrayManagement {
         case 3: assertTrue(list.addAll(size, singletonList())); break;
         default: throw new AssertionError();
         }
-        assertEquals(list.modCount(), modCount + 1);
-        assertEquals(list.size(), size + 1);
+        assertEquals(modCount + 1, list.modCount());
+        assertEquals(size + 1, list.size());
     }
 
     @Test public void defaultCapacity() {
         PublicVector<Object> list = new PublicVector<>();
-        assertEquals(new PublicVector<Object>().capacity(), DEFAULT_CAPACITY);
+        assertEquals(DEFAULT_CAPACITY, new PublicVector<Object>().capacity());
         for (int i = 0; i < DEFAULT_CAPACITY; i++) {
             addOneElement(list);
-            assertEquals(list.capacity(), DEFAULT_CAPACITY);
+            assertEquals(DEFAULT_CAPACITY, list.capacity());
         }
         addOneElement(list);
-        assertEquals(list.capacity(), newCapacity(DEFAULT_CAPACITY));
+        assertEquals(newCapacity(DEFAULT_CAPACITY), list.capacity());
     }
 
     @Test public void defaultCapacityEnsureCapacity() {
         PublicVector<Object> list = new PublicVector<>();
         for (int i = 0; i <= DEFAULT_CAPACITY; i++) {
             list.ensureCapacity(i);     // no-op!
-            assertEquals(list.capacity(), DEFAULT_CAPACITY);
+            assertEquals(DEFAULT_CAPACITY, list.capacity());
         }
         for (int i = 0; i < DEFAULT_CAPACITY; i++) {
             addOneElement(list);
-            assertEquals(list.capacity(), DEFAULT_CAPACITY);
+            assertEquals(DEFAULT_CAPACITY, list.capacity());
         }
         addOneElement(list);
-        assertEquals(list.capacity(), newCapacity(DEFAULT_CAPACITY));
+        assertEquals(newCapacity(DEFAULT_CAPACITY), list.capacity());
         {
             int capacity = list.capacity();
             list.ensureCapacity(capacity + 1);
-            assertEquals(list.capacity(), newCapacity(capacity));
+            assertEquals(newCapacity(capacity), list.capacity());
         }
         {
             int capacity = list.capacity();
             list.ensureCapacity(3 * capacity);
-            assertEquals(list.capacity(), 3 * capacity);
+            assertEquals(3 * capacity, list.capacity());
         }
     }
 
     @Test public void ensureCapacityBeyondDefaultCapacity() {
         PublicVector<Object> list = new PublicVector<>();
         list.ensureCapacity(DEFAULT_CAPACITY + 1);
-        assertEquals(list.capacity(), newCapacity(DEFAULT_CAPACITY));
+        assertEquals(newCapacity(DEFAULT_CAPACITY), list.capacity());
     }
 
     @Test public void explicitZeroCapacity() {
         PublicVector<Object> list = new PublicVector<>(0);
-        assertEquals(list.capacity(), 0);
+        assertEquals(0, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 1);
+        assertEquals(1, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 2);
+        assertEquals(2, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 4);
+        assertEquals(4, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 4);
+        assertEquals(4, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 8);
+        assertEquals(8, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 8);
+        assertEquals(8, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 8);
+        assertEquals(8, list.capacity());
         list.clear();
-        assertEquals(list.capacity(), 8);
+        assertEquals(8, list.capacity());
     }
 
     @Test public void explicitZeroCapacityWithCapacityIncrement() {
         PublicVector<Object> list = new PublicVector<>(0, 2);
-        assertEquals(list.capacity(), 0);
+        assertEquals(0, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 2);
+        assertEquals(2, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 2);
+        assertEquals(2, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 4);
+        assertEquals(4, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 4);
+        assertEquals(4, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 6);
+        assertEquals(6, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 6);
+        assertEquals(6, list.capacity());
         addOneElement(list);
-        assertEquals(list.capacity(), 8);
+        assertEquals(8, list.capacity());
         list.clear();
-        assertEquals(list.capacity(), 8);
+        assertEquals(8, list.capacity());
     }
 
     @Test public void explicitLargeCapacity() {
         int n = DEFAULT_CAPACITY * 3;
         PublicVector<Object> list = new PublicVector<>(n);
-        assertEquals(list.capacity(), n);
+        assertEquals(n, list.capacity());
         list.ensureCapacity(0);
         list.ensureCapacity(n);
         for (int i = 0; i < n; i++) addOneElement(list);
-        assertEquals(list.capacity(), n);
+        assertEquals(n, list.capacity());
 
         addOneElement(list);
-        assertEquals(list.capacity(), newCapacity(n));
+        assertEquals(newCapacity(n), list.capacity());
     }
 
     @Test public void explicitLargeCapacityWithCapacityIncrement() {
         int n = DEFAULT_CAPACITY * 3;
         PublicVector<Object> list = new PublicVector<>(n, 2);
-        assertEquals(list.capacity(), n);
+        assertEquals(n, list.capacity());
         list.ensureCapacity(0);
         list.ensureCapacity(n);
         for (int i = 0; i < n; i++) addOneElement(list);
-        assertEquals(list.capacity(), n);
+        assertEquals(n, list.capacity());
 
         addOneElement(list);
-        assertEquals(list.capacity(), n + 2);
+        assertEquals(n + 2, list.capacity());
     }
 
     @Test public void emptyArraysAreNotShared() {
diff --git a/test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java b/test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java
index e6afff5b329..014272a8f96 100644
--- a/test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java
+++ b/test/jdk/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,13 +171,9 @@ public class ConcurrentAssociateTest {
             String lockName;
             if ("Signal Dispatcher".equals(name))
                 continue;
-            if ("Reference Handler".equals(name)
-                && (lockName = info.getLockName()) != null
-                && lockName.startsWith("java.lang.ref.Reference$Lock"))
+            if ("Reference Handler".equals(name))
                 continue;
-            if ("Finalizer".equals(name)
-                && (lockName = info.getLockName()) != null
-                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
+            if ("Finalizer".equals(name))
                 continue;
             System.err.print(info);
         }
diff --git a/test/jdk/java/util/concurrent/CopyOnWriteArraySet/SerializationTest.java b/test/jdk/java/util/concurrent/CopyOnWriteArraySet/SerializationTest.java
new file mode 100644
index 00000000000..7700eda6cd6
--- /dev/null
+++ b/test/jdk/java/util/concurrent/CopyOnWriteArraySet/SerializationTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8365058
+ * @summary Check basic correctness of de-serialization
+ * @run junit SerializationTest
+ */
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SerializationTest {
+
+    // Ensure basic serialization round trip correctness
+    @ParameterizedTest
+    @MethodSource
+    void roundTripTest(CopyOnWriteArraySet<?> expected) {
+        var bytes = ser(expected);
+        var actual = deSer(bytes);
+        assertEquals(CopyOnWriteArraySet.class, actual.getClass());
+        assertEquals(expected, actual);
+    }
+
+    private static Stream<CopyOnWriteArraySet<?>> roundTripTest() {
+        return Stream.of(
+                new CopyOnWriteArraySet<>(),
+                new CopyOnWriteArraySet<>(List.of(1, 2, 3)),
+                new CopyOnWriteArraySet<>(Set.of("Foo", "Bar", "Baz"))
+        );
+    }
+
+    private static byte[] ser(Object obj) {
+        return assertDoesNotThrow(() -> {
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                 ObjectOutputStream oos = new ObjectOutputStream(byteArrayOutputStream)) {
+                oos.writeObject(obj);
+                return byteArrayOutputStream.toByteArray();
+            }
+        }, "Unexpected error during serialization");
+    }
+
+    private static Object deSer(byte[] bytes) {
+        return assertDoesNotThrow(() -> {
+            try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
+                 ObjectInputStream ois = new ObjectInputStream(byteArrayInputStream)) {
+                return ois.readObject();
+            }
+        }, "Unexpected error during de-serialization");
+    }
+}
diff --git a/test/jdk/java/util/concurrent/Phaser/Basic.java b/test/jdk/java/util/concurrent/Phaser/Basic.java
index 2ea09dced99..500e106891b 100644
--- a/test/jdk/java/util/concurrent/Phaser/Basic.java
+++ b/test/jdk/java/util/concurrent/Phaser/Basic.java
@@ -434,11 +434,9 @@ public class Basic {
             String name = info.getThreadName();
             if ("Signal Dispatcher".equals(name))
                 continue;
-            if ("Reference Handler".equals(name)
-                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
+            if ("Reference Handler".equals(name))
                 continue;
-            if ("Finalizer".equals(name)
-                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
+            if ("Finalizer".equals(name))
                 continue;
             if (name.startsWith("process reaper"))
                 continue;
diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
index f1f32bee310..641fbf2e495 100644
--- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
+++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java
@@ -37,7 +37,9 @@
 /*
  * @test id=default
  * @summary Conformance testing variant of JSR-166 tck tests.
+ * @library /test/lib
  * @build *
+ * @build jdk.test.lib.Platform
  * @modules java.management java.base/jdk.internal.util
  * @run junit/othervm/timeout=1000 JSR166TestCase
  */
@@ -46,7 +48,9 @@
  * @test id=forkjoinpool-common-parallelism
  * @summary Test implementation details variant of JSR-166
  *          tck tests with ForkJoinPool common parallelism.
+ * @library /test/lib
  * @build *
+ * @build jdk.test.lib.Platform
  * @modules java.management java.base/jdk.internal.util
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
@@ -68,7 +72,9 @@
  * @summary Remaining test implementation details variant of
  *          JSR-166 tck tests apart from ForkJoinPool common
  *          parallelism.
+ * @library /test/lib
  * @build *
+ * @build jdk.test.lib.Platform
  * @modules java.management java.base/jdk.internal.util
  * @run junit/othervm/timeout=1000
  *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
@@ -135,6 +141,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
+import jdk.test.lib.Platform;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestResult;
@@ -624,6 +631,13 @@ public class JSR166TestCase extends TestCase {
                 "SynchronousQueue20Test",
                 "ReentrantReadWriteLock20Test"
             };
+
+            if (Platform.isS390x()) {
+                java20TestClassNames = new String[] {
+                    "ForkJoinPool20Test",
+                };
+            }
+
             addNamedTestClasses(suite, java20TestClassNames);
         }
 
diff --git a/test/jdk/java/util/jar/Attributes/IterationOrder.java b/test/jdk/java/util/jar/Attributes/IterationOrder.java
index 4028d71e7c4..edd1d9b8bc8 100644
--- a/test/jdk/java/util/jar/Attributes/IterationOrder.java
+++ b/test/jdk/java/util/jar/Attributes/IterationOrder.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Google, Inc.  All Rights Reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +25,26 @@
 /* @test
  * @bug 8062194
  * @summary Ensure Attribute iteration order is the insertion order.
+ * @run junit IterationOrder
  */
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.util.Arrays;
 import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class IterationOrder {
-    static void checkOrder(Attributes.Name k0, String v0,
+
+    @ParameterizedTest
+    @MethodSource
+    void checkOrderTest(Attributes.Name k0, String v0,
                            Attributes.Name k1, String v1,
                            Attributes.Name k2, String v2) {
         Attributes x = new Attributes();
@@ -48,7 +60,7 @@ public class IterationOrder {
               && entries[1].getValue() == v1
               && entries[2].getKey() == k2
               && entries[2].getValue() == v2)) {
-            throw new AssertionError(Arrays.toString(entries));
+            fail(Arrays.toString(entries));
         }
 
         Object[] keys = x.keySet().toArray();
@@ -56,19 +68,21 @@ public class IterationOrder {
               && keys[0] == k0
               && keys[1] == k1
               && keys[2] == k2)) {
-             throw new AssertionError(Arrays.toString(keys));
+             fail(Arrays.toString(keys));
         }
     }
 
-    public static void main(String[] args) throws Exception {
+    static Stream<Arguments> checkOrderTest() {
         Attributes.Name k0 = Name.MANIFEST_VERSION;
         Attributes.Name k1 = Name.MAIN_CLASS;
         Attributes.Name k2 = Name.SEALED;
         String v0 = "42.0";
         String v1 = "com.google.Hello";
         String v2 = "yes";
-        checkOrder(k0, v0, k1, v1, k2, v2);
-        checkOrder(k1, v1, k0, v0, k2, v2);
-        checkOrder(k2, v2, k1, v1, k0, v0);
+        return Stream.of(
+                Arguments.of(k0, v0, k1, v1, k2, v2),
+                Arguments.of(k1, v1, k0, v0, k2, v2),
+                Arguments.of(k2, v2, k1, v1, k0, v0)
+        );
     }
 }
diff --git a/test/jdk/java/util/jar/Attributes/Name.java b/test/jdk/java/util/jar/Attributes/Name.java
index 78306028698..843038cb820 100644
--- a/test/jdk/java/util/jar/Attributes/Name.java
+++ b/test/jdk/java/util/jar/Attributes/Name.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,20 @@
    @bug 4199981
    @summary Make sure empty string is not a valid
             Attributes name.
-   */
+   @run junit Name
+ */
 
+import org.junit.jupiter.api.Test;
 
 import java.util.jar.Attributes;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class Name {
-    public static void main(String[] args) throws Exception {
-        try {
-            Attributes.Name name = new Attributes.Name("");
-            throw new Exception("empty string should be rejected");
-        } catch (IllegalArgumentException e) {
-        }
+
+    @Test
+    void emptyStringTest() {
+        assertThrows(IllegalArgumentException.class, () -> new Attributes.Name(""),
+                "empty string should be rejected");
     }
 }
diff --git a/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java b/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java
index c62ddcced8a..e99825d235e 100644
--- a/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java
+++ b/test/jdk/java/util/jar/Attributes/NullAndEmptyKeysAndValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,6 @@
  * questions.
  */
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -31,14 +29,16 @@ import java.util.jar.Manifest;
 import java.util.jar.Attributes.Name;
 import java.lang.reflect.Field;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @test
  * @bug 8066619
  * @modules java.base/java.util.jar:+open
- * @run testng/othervm --enable-final-field-mutation=ALL-UNNAMED NullAndEmptyKeysAndValues
+ * @run junit/othervm --enable-final-field-mutation=ALL-UNNAMED NullAndEmptyKeysAndValues
  * @summary Tests manifests with {@code null} and empty string {@code ""}
  * values as section name, header name, or value in both main and named
  * attributes sections.
@@ -108,7 +108,7 @@ public class NullAndEmptyKeysAndValues {
         attr.set(mf, mainAtts);
         mf.getMainAttributes().put(Name.MANIFEST_VERSION, "1.0");
         mf = writeAndRead(mf);
-        assertEquals(mf.getMainAttributes().getValue(SOME_KEY), NULL_TEXT);
+        assertEquals(NULL_TEXT, mf.getMainAttributes().getValue(SOME_KEY));
     }
 
     @Test
@@ -122,7 +122,7 @@ public class NullAndEmptyKeysAndValues {
         attr.set(mf, mainAtts);
         mf.getMainAttributes().put(Name.MANIFEST_VERSION, "1.0");
         mf = writeAndRead(mf);
-        assertEquals(mf.getMainAttributes().getValue(SOME_KEY), EMPTY_STR);
+        assertEquals(EMPTY_STR, mf.getMainAttributes().getValue(SOME_KEY));
     }
 
     @Test
@@ -171,8 +171,7 @@ public class NullAndEmptyKeysAndValues {
             map.put(new Name(SOME_KEY), null);
         }});
         mf = writeAndRead(mf);
-        assertEquals(mf.getEntries().get(SOME_KEY).getValue(SOME_KEY),
-                NULL_TEXT);
+        assertEquals(NULL_TEXT, mf.getEntries().get(SOME_KEY).getValue(SOME_KEY));
     }
 
     @Test
@@ -183,8 +182,7 @@ public class NullAndEmptyKeysAndValues {
             map.put(new Name(SOME_KEY), EMPTY_STR);
         }});
         mf = writeAndRead(mf);
-        assertEquals(mf.getEntries().get(SOME_KEY).getValue(SOME_KEY),
-                EMPTY_STR);
+        assertEquals(EMPTY_STR, mf.getEntries().get(SOME_KEY).getValue(SOME_KEY));
     }
 
     static Manifest writeAndRead(Manifest mf) throws IOException {
diff --git a/test/jdk/java/util/jar/Attributes/PutAndPutAll.java b/test/jdk/java/util/jar/Attributes/PutAndPutAll.java
index f459daf8c2e..bd61ba1e92d 100644
--- a/test/jdk/java/util/jar/Attributes/PutAndPutAll.java
+++ b/test/jdk/java/util/jar/Attributes/PutAndPutAll.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,31 +25,27 @@
    @bug 4165833 4167600
    @summary Test if put and putAll will test for illegal
             arguments.
-   */
+   @run junit PutAndPutAll
+  */
 
 
+import org.junit.jupiter.api.Test;
+
 import java.util.jar.Attributes;
 import java.util.HashMap;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class PutAndPutAll {
-    public static void main(String[] args) throws Exception {
+
+    @Test
+    void classCastTest() {
         Attributes at = new Attributes();
-        try{
-            at.put("this is not an Attributes.Name", "value");
-            throw new Exception("put should check for non Attributes.Name names");
-        } catch (ClassCastException e) {
-        }
-
-        try{
-            at.put(new Attributes.Name("name"), new Integer(0));
-            throw new Exception("put should check for non String values");
-        } catch (ClassCastException e) {
-        }
-
-        try {
-            at.putAll(new HashMap());
-            throw new Exception("putAll should check for non Attributes maps");
-        } catch (ClassCastException e) {
-        }
+        assertThrows(ClassCastException.class,
+                () -> at.put("this is not an Attributes.Name", "value"), "put should check for non Attributes.Name names");
+        assertThrows(ClassCastException.class,
+                () -> at.put(new Attributes.Name("name"), new Integer(0)), "put should check for non String values");
+        assertThrows(ClassCastException.class,
+                () -> at.putAll(new HashMap()), "putAll should check for non Attributes maps");
     }
 }
diff --git a/test/jdk/java/util/jar/Attributes/TestAttrsNL.java b/test/jdk/java/util/jar/Attributes/TestAttrsNL.java
index 34f7e4c4502..abfd3df6cd7 100644
--- a/test/jdk/java/util/jar/Attributes/TestAttrsNL.java
+++ b/test/jdk/java/util/jar/Attributes/TestAttrsNL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,19 +24,28 @@
 /* @test
  * @bug 8200530
  * @summary Test Attributes newline
+ * @run junit TestAttrsNL
  */
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.IOException;
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
 import java.io.ByteArrayInputStream;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestAttrsNL {
 
-    public static void main(String[] args) throws Throwable {
+    static Stream<Arguments> newLineAttributesTest() throws IOException {
 
         String manifestStr =
             "Manifest-Version: 1.0\r\n" +
@@ -68,16 +77,16 @@ public class TestAttrsNL {
                 new Name("key44"), "value44"
         );
 
-        test(new Manifest(new ByteArrayInputStream(manifestStr.getBytes(UTF_8))),
-             mainAttrsExped, attrsExped);
+        var normal = Arguments.of(new Manifest(new ByteArrayInputStream(manifestStr.getBytes(UTF_8))),
+                mainAttrsExped, attrsExped);
 
-        test(new Manifest(new ByteArrayInputStream(
-                    manifestStr.replaceAll("\r\n", "\r").getBytes(UTF_8))),
-             mainAttrsExped, attrsExped);
+        var carriage = Arguments.of(new Manifest(new ByteArrayInputStream(
+                        manifestStr.replaceAll("\r\n", "\r").getBytes(UTF_8))),
+                mainAttrsExped, attrsExped);
 
-        test(new Manifest(new ByteArrayInputStream(
-                    manifestStr.replaceAll("\r\n", "\n").getBytes(UTF_8))),
-             mainAttrsExped, attrsExped);
+        var newLine = Arguments.of(new Manifest(new ByteArrayInputStream(
+                        manifestStr.replaceAll("\r\n", "\n").getBytes(UTF_8))),
+                mainAttrsExped, attrsExped);
 
         // mixed
         manifestStr =
@@ -93,31 +102,33 @@ public class TestAttrsNL {
             "key22: value22\n END\r\n" +
             "key33: value33\r \n" +
             "key44: value44\n";
-        test(new Manifest(new ByteArrayInputStream(manifestStr.getBytes(UTF_8))),
+        var mixed = Arguments.of(new Manifest(new ByteArrayInputStream(manifestStr.getBytes(UTF_8))),
              mainAttrsExped, attrsExped);
 
-
+        return Stream.of(normal, carriage, newLine, mixed);
     }
 
-    private static void test(Manifest m,
+    @ParameterizedTest
+    @MethodSource
+    void newLineAttributesTest(Manifest m,
                              Map<Name, String> mainAttrsExped,
                              Map<Name, String> attrsExped) {
         Attributes mainAttrs = m.getMainAttributes();
         mainAttrsExped.forEach( (k, v) -> {
-            if (!mainAttrs.containsKey(k) || !mainAttrs.get(k).equals(v)) {
-                System.out.printf(" containsKey(%s) : %b%n", k, mainAttrs.containsKey(k));
-                System.out.printf("         get(%s) : %s%n", k, mainAttrs.get(k));
-                throw new RuntimeException("expected attr: k=<" + k + ">, v=<" + v + ">");
-            }
+            var expectedMsg = "expected attr: k=<" + k + ">, v=<" + v + ">";
+            assertTrue(mainAttrs.containsKey(k),
+                    " containsKey(%s) : %b%n%s".formatted(k, mainAttrs.containsKey(k), expectedMsg));
+            assertEquals(v, mainAttrs.get(k),
+                    "         get(%s) : %s%n%s".formatted(k, mainAttrs.get(k), expectedMsg));
         });
 
         Attributes attrs = m.getAttributes("Hello");
         attrs.forEach( (k, v) -> {
-            if (!attrs.containsKey(k) || !attrs.get(k).equals(v)) {
-                System.out.printf(" containsKey(%s) : %b%n", k, attrs.containsKey(k));
-                System.out.printf("         get(%s) : %s%n", k, attrs.get(k));
-                throw new RuntimeException("expected attr: k=<" + k + ">, v=<" + v + ">");
-            }
+            var expectedMsg = "expected attr: k=<" + k + ">, v=<" + v + ">";
+            assertTrue(attrs.containsKey(k),
+                    " containsKey(%s) : %b%n%s".formatted(k, attrs.containsKey(k), expectedMsg));
+            assertEquals(v, attrs.get(k),
+                    "         get(%s) : %s%n%s".formatted(k, attrs.get(k), expectedMsg));
         });
     }
 }
diff --git a/test/jdk/java/util/jar/JarEntry/GetMethodsReturnClones.java b/test/jdk/java/util/jar/JarEntry/GetMethodsReturnClones.java
index 3c4f06dd6f0..a9b35220de3 100644
--- a/test/jdk/java/util/jar/JarEntry/GetMethodsReturnClones.java
+++ b/test/jdk/java/util/jar/JarEntry/GetMethodsReturnClones.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,20 +26,28 @@
  * @bug 6337925
  * @summary Ensure that callers cannot modify the internal JarEntry cert and
  *          codesigner arrays.
- * @author Sean Mullan
+ * @run junit GetMethodsReturnClones
  */
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
 import java.io.InputStream;
 import java.security.CodeSigner;
 import java.security.cert.Certificate;
 import java.util.*;
 import java.util.jar.*;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class GetMethodsReturnClones {
 
     private static final String BASE = System.getProperty("test.src", ".") +
         System.getProperty("file.separator");
+    private static List<JarEntry> jarEntries;
 
-    public static void main(String[] args) throws Exception {
+    @BeforeAll()
+    static void setupEntries() throws IOException {
         List<JarEntry> entries = new ArrayList<>();
         try (JarFile jf = new JarFile(BASE + "test.jar", true)) {
             byte[] buffer = new byte[8192];
@@ -55,23 +63,29 @@ public class GetMethodsReturnClones {
                 }
             }
         }
+        jarEntries = entries;
+    }
 
-        for (JarEntry je : entries) {
+    @Test
+    void certsTest() {
+        for (JarEntry je : jarEntries) {
             Certificate[] certs = je.getCertificates();
-            CodeSigner[] signers = je.getCodeSigners();
             if (certs != null) {
                 certs[0] = null;
                 certs = je.getCertificates();
-                if (certs[0] == null) {
-                    throw new Exception("Modified internal certs array");
-                }
+                assertNotNull(certs[0], "Modified internal certs array");
             }
+        }
+    }
+
+    @Test
+    void signersTest() {
+        for (JarEntry je : jarEntries) {
+            CodeSigner[] signers = je.getCodeSigners();
             if (signers != null) {
                 signers[0] = null;
                 signers = je.getCodeSigners();
-                if (signers[0] == null) {
-                    throw new Exception("Modified internal codesigners array");
-                }
+                assertNotNull(signers[0], "Modified internal codesigners array");
             }
         }
     }
diff --git a/test/jdk/java/util/jar/JarFile/Constructor.java b/test/jdk/java/util/jar/JarFile/Constructor.java
index 8c1a8623e61..071c68fdd9e 100644
--- a/test/jdk/java/util/jar/JarFile/Constructor.java
+++ b/test/jdk/java/util/jar/JarFile/Constructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,55 +21,45 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 4842702 8211765
  * @summary Check that constructors throw specified exceptions
- * @author Martin Buchholz
+ * @run junit Constructor
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.util.jar.JarFile;
 import java.io.File;
 import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class Constructor {
-    private static void Unreached (Object o)
-        throws Exception
-    {
-        // Should never get here
-        throw new Exception ("Expected exception was not thrown");
-    }
 
-    public static void main(String[] args)
-        throws Exception
-    {
-        try { Unreached (new JarFile ((File) null, true, JarFile.OPEN_READ)); }
-        catch (NullPointerException e) {}
+    @Test
+    void constructorTest() {
 
-        try { Unreached (new JarFile ((File) null, true)); }
-        catch (NullPointerException e) {}
+        assertThrows(NullPointerException.class, () -> new JarFile ((File) null, true, JarFile.OPEN_READ));
 
-        try { Unreached (new JarFile ((File) null)); }
-        catch (NullPointerException e) {}
+        assertThrows(NullPointerException.class, () -> new JarFile ((File) null, true));
 
-        try { Unreached (new JarFile ((String) null, true)); }
-        catch (NullPointerException e) {}
+        assertThrows(NullPointerException.class, () -> new JarFile ((File) null));
 
-        try { Unreached (new JarFile ((String) null)); }
-        catch (NullPointerException e) {}
+        assertThrows(NullPointerException.class, () -> new JarFile ((String) null, true));
 
-        try { Unreached (new JarFile ("NoSuchJar.jar")); }
-        catch (IOException e) {}
+        assertThrows(NullPointerException.class, () -> new JarFile ((String) null));
 
-        try { Unreached (new JarFile (new File ("NoSuchJar.jar"))); }
-        catch (IOException e) {}
+        assertThrows(IOException.class, () -> new JarFile ("NoSuchJar.jar"));
+
+        assertThrows(IOException.class, () -> new JarFile (new File ("NoSuchJar.jar")));
 
         // Test that an IOExcception is thrown when an invalid charater
         // is part of the path on Windows and Unix
         final String invalidOSPath = System.getProperty("os.name")
                 .startsWith("Windows") ? "C:\\*" : "foo\u0000bar";
 
-        try { Unreached (new JarFile (invalidOSPath)); }
-        catch (IOException e) {}
+        assertThrows(IOException.class, () -> new JarFile (invalidOSPath));
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/IgnoreUnrelatedSignatureFiles.java b/test/jdk/java/util/jar/JarFile/IgnoreUnrelatedSignatureFiles.java
index 0f55702c1f6..e5a32dfde73 100644
--- a/test/jdk/java/util/jar/JarFile/IgnoreUnrelatedSignatureFiles.java
+++ b/test/jdk/java/util/jar/JarFile/IgnoreUnrelatedSignatureFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8300140
  * @summary Make sure signature related files in subdirectories of META-INF are not considered for verification
@@ -29,12 +29,14 @@
  * @modules java.base/sun.security.util
  * @modules java.base/sun.security.tools.keytool
  * @modules jdk.jartool/sun.security.tools.jarsigner
- * @run main/othervm IgnoreUnrelatedSignatureFiles
+ * @run junit/othervm IgnoreUnrelatedSignatureFiles
  */
 
 import jdk.internal.access.JavaUtilZipFileAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.security.jarsigner.JarSigner;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import sun.security.tools.jarsigner.Main;
 import sun.security.util.SignatureFileVerifier;
 
@@ -62,6 +64,10 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class IgnoreUnrelatedSignatureFiles {
 
     private static final JavaUtilZipFileAccess JUZA = SharedSecrets.getJavaUtilZipFileAccess();
@@ -69,56 +75,76 @@ public class IgnoreUnrelatedSignatureFiles {
     // This path resides in a subdirectory of META-INF, so it should not be considered signature related
     public static final String SUBDIR_SF_PATH = "META-INF/subdirectory/META-INF/SIGNER.SF";
 
+    // Jars used for testing. See `setupJars` below for setup
+    static Path j;
+    static Path s;
+    static Path m;
+    static Path sm;
+    static Path ca;
+    static Path cas;
 
-    public static void main(String[] args) throws Exception {
-
+    @BeforeAll
+    static void setupJars() throws Exception {
         // Regular signed JAR
-        Path j = createJarFile();
-        Path s = signJarFile(j, "SIGNER1", "signed");
+        j = createJarFile();
+        s = signJarFile(j, "SIGNER1", "signed");
 
         // Singed JAR with unrelated signature files
-        Path m = moveSignatureRelated(s);
-        Path sm = signJarFile(m, "SIGNER2", "modified-signed");
+        m = moveSignatureRelated(s);
+        sm = signJarFile(m, "SIGNER2", "modified-signed");
 
         // Signed JAR with custom SIG-* files
-        Path ca = createCustomAlgJar();
-        Path cas = signJarFile(ca, "SIGNER1", "custom-signed");
+        ca = createCustomAlgJar();
+        cas = signJarFile(ca, "SIGNER1", "custom-signed");
+    }
 
-        // 0: Sanity check that the basic signed JAR verifies
+    // Sanity check that the basic signed JAR verifies
+    @Test
+    void signedJarVerifyTest() throws IOException {
         try (JarFile jf = new JarFile(s.toFile(), true)) {
             Map<String, Attributes> entries = jf.getManifest().getEntries();
-            if (entries.size() != 1) {
-                throw new Exception("Expected a single manifest entry for the digest of a.txt, instead found entries: " + entries.keySet());
-            }
+            assertEquals(1, entries.size(),
+                    "Expected a single manifest entry for the digest of a.txt, instead found entries: " + entries.keySet());
             JarEntry entry = jf.getJarEntry("a.txt");
             try (InputStream in = jf.getInputStream(entry)) {
                 in.transferTo(OutputStream.nullOutputStream());
             }
         }
-        // 1: Check ZipFile.Source.isSignatureRelated
+    }
+
+    // Check ZipFile.Source.isSignatureRelated
+    @Test
+    void zipFileSourceIsSignatureRelatedTest() throws IOException {
         try (JarFile jarFile = new JarFile(m.toFile())) {
             List<String> manifestAndSignatureRelatedFiles = JUZA.getManifestAndSignatureRelatedFiles(jarFile);
             for (String signatureRelatedFile : manifestAndSignatureRelatedFiles) {
                 String dir = signatureRelatedFile.substring(0, signatureRelatedFile.lastIndexOf("/"));
-                if (!"META-INF".equals(dir)) {
-                    throw new Exception("Signature related file does not reside directly in META-INF/ : " + signatureRelatedFile);
-                }
+                assertEquals("META-INF", dir,
+                        "Signature related file does not reside directly in META-INF/ : " + signatureRelatedFile);
             }
         }
+    }
 
-        // 2: Check SignatureFileVerifier.isSigningRelated
-        if (SignatureFileVerifier.isSigningRelated(SUBDIR_SF_PATH)) {
-            throw new Exception("Signature related file does not reside directly in META-INF/ : " + SUBDIR_SF_PATH);
-        }
+    // Check SignatureFileVerifier.isSigningRelated
+    @Test
+    void sigFileVerifierIsSigningRelatedTest() {
+        assertFalse(SignatureFileVerifier.isSigningRelated(SUBDIR_SF_PATH),
+                "Signature related file does not reside directly in META-INF/ : " + SUBDIR_SF_PATH);
+    }
 
-        // 3: Check JarInputStream with doVerify = true
+    // Check JarInputStream with doVerify = true
+    @Test
+    void jarIStreamDoVerifyTest() throws IOException {
         try (JarInputStream in = new JarInputStream(Files.newInputStream(m), true)) {
-             while (in.getNextEntry() != null) {
+            while (in.getNextEntry() != null) {
                 in.transferTo(OutputStream.nullOutputStream());
             }
         }
+    }
 
-        // 4: Check that a JAR containing unrelated .SF, .RSA files is signed as-if it is unsigned
+    // Check that a JAR containing unrelated .SF, .RSA files is signed as-if it is unsigned
+    @Test
+    void unrelatedFilesUnsignedTest() throws IOException {
         try (ZipFile zf = new ZipFile(sm.toFile())) {
             ZipEntry mf = zf.getEntry("META-INF/MANIFEST.MF");
             try (InputStream stream = zf.getInputStream(mf)) {
@@ -126,19 +152,24 @@ public class IgnoreUnrelatedSignatureFiles {
                 // When JarSigner considers a jar to not be already signed,
                 // the 'Manifest-Version' attributed name will be case-normalized
                 // Assert that manifest-version is not in lowercase
-                if (manifest.startsWith("manifest-version")) {
-                    throw new Exception("JarSigner unexpectedly treated unsigned jar as signed");
-                }
+                assertFalse(manifest.startsWith("manifest-version"),
+                        "JarSigner unexpectedly treated unsigned jar as signed");
             }
         }
+    }
 
-        // 5: Check that a JAR containing non signature related .SF, .RSA files can be signed
+    // Check that a JAR containing non signature related .SF, .RSA files can be signed
+    @Test
+    void nonSigFileIsSignableTest() throws Exception {
         try (JarFile jf = new JarFile(sm.toFile(), true)) {
             checkSignedBy(jf, "a.txt", "CN=SIGNER2");
             checkSignedBy(jf, "META-INF/subdirectory/META-INF/SIGNER1.SF", "CN=SIGNER2");
         }
+    }
 
-        // 6: Check that JarSigner does not move unrelated [SF,RSA] files to the beginning of signed JARs
+    // Check that JarSigner does not move unrelated [SF,RSA] files to the beginning of signed JARs
+    @Test
+    void jarSignerDoesNotMoveUnrelatedTest() throws IOException {
         try (JarFile zf = new JarFile(sm.toFile())) {
 
             List<String> actualOrder = zf.stream().map(ZipEntry::getName).toList();
@@ -154,23 +185,25 @@ public class IgnoreUnrelatedSignatureFiles {
                     "META-INF/subdirectory2/META-INF/SIGNER1.RSA"
             );
 
-            if (!expectedOrder.equals(actualOrder)) {
-                String msg = ("""
+            assertEquals(expectedOrder, actualOrder, ("""
                         Unexpected file order in JAR with unrelated SF,RSA files
                         Expected order: %s
                         Actual order: %s""")
-                        .formatted(expectedOrder, actualOrder);
-                throw new Exception(msg);
-            }
+                    .formatted(expectedOrder, actualOrder));
         }
+    }
 
-        // 7: Check that jarsigner ignores unrelated signature files
+    // Check that jarsigner ignores unrelated signature files
+    @Test
+    void jarSignerIgnoresUnrelatedTest() throws Exception {
         String message = jarSignerVerify(m);
-        if (message.contains("WARNING")) {
-            throw new Exception("jarsigner output contains unexpected  warning: " +message);
-        }
+        assertFalse(message.contains("WARNING"),
+                "jarsigner output contains unexpected  warning: " + message);
+    }
 
-        // 8: Check that SignatureFileVerifier.isSigningRelated handles custom SIG-* files correctly
+    //  Check that SignatureFileVerifier.isSigningRelated handles custom SIG-* files correctly
+    @Test
+    void customSIGFilesTest() throws IOException {
         try (JarFile jf = new JarFile(cas.toFile(), true)) {
 
             // These files are not signature-related and should be signed
@@ -185,10 +218,9 @@ public class IgnoreUnrelatedSignatureFiles {
 
             Set<String> actualSigned = jf.getManifest().getEntries().keySet();
 
-            if (!expectedSigned.equals(actualSigned)) {
-                throw new Exception("Unexpected MANIFEST entries. Expected %s, got %s"
-                        .formatted(expectedSigned, actualSigned));
-            }
+            assertEquals(expectedSigned, actualSigned,
+                    "Unexpected MANIFEST entries. Expected %s, got %s"
+                            .formatted(expectedSigned, actualSigned));
         }
     }
 
@@ -220,22 +252,17 @@ public class IgnoreUnrelatedSignatureFiles {
 
         // Verify that the entry is signed
         CodeSigner[] signers = je.getCodeSigners();
-        if (signers == null) {
-            throw new Exception(String.format("Expected %s to be signed", name));
-        }
+        assertNotNull(signers, "Expected %s to be signed".formatted(name));
 
         // There should be a single signer
-        if (signers.length != 1) {
-            throw new Exception(String.format("Expected %s to be signed by exactly one signer", name));
-        }
+        assertEquals(1, signers.length,
+                "Expected %s to be signed by exactly one signer".formatted(name));
 
         String actualSigner = ((X509Certificate) signers[0]
                 .getSignerCertPath().getCertificates().get(0))
                 .getIssuerX500Principal().getName();
-
-        if (!actualSigner.equals(expectedSigner)) {
-            throw new Exception(String.format("Expected %s to be signed by %s, was signed by %s", name, expectedSigner, actualSigner));
-        }
+        assertEquals(expectedSigner, actualSigner,
+                "Expected %s to be signed by %s, was signed by %s".formatted(name, expectedSigner, actualSigner));
     }
 
     /**
diff --git a/test/jdk/java/util/jar/JarFile/JarBacktickManifest.java b/test/jdk/java/util/jar/JarFile/JarBacktickManifest.java
index 65d54a67a47..66edf3ae3ee 100644
--- a/test/jdk/java/util/jar/JarFile/JarBacktickManifest.java
+++ b/test/jdk/java/util/jar/JarFile/JarBacktickManifest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * @summary Make sure scanning manifest doesn't throw AIOOBE on certain strings containing backticks.
  * @library /test/lib/
  * @build jdk.test.lib.util.JarBuilder
- * @run testng JarBacktickManifest
+ * @run junit JarBacktickManifest
  */
 
 import java.io.File;
@@ -35,19 +35,20 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.jar.JarFile;
 
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 import jdk.test.lib.util.JarBuilder;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 public class JarBacktickManifest {
 
     public static final String VERIFY_MANIFEST_JAR = "verifyManifest.jar";
 
-    @BeforeClass
-    public void initialize() throws Exception {
+    @BeforeAll
+    public static void initialize() throws Exception {
         JarBuilder jb = new JarBuilder(VERIFY_MANIFEST_JAR);
         jb.addAttribute("Test", " Class-`Path` ");
         jb.addAttribute("Test2", " Multi-`Release ");
@@ -55,14 +56,14 @@ public class JarBacktickManifest {
     }
 
     @Test
-    public void test() throws Exception {
+    public void backtickTest() throws Exception {
         try (JarFile jf = new JarFile(VERIFY_MANIFEST_JAR)) {  // do not set runtime versioning
-            Assert.assertFalse(jf.isMultiRelease(), "Shouldn't be multi-release");
+            assertFalse(jf.isMultiRelease(), "Shouldn't be multi-release");
         }
     }
 
-    @AfterClass
-    public void close() throws IOException {
+    @AfterAll
+    public static void close() throws IOException {
         Files.delete(new File(VERIFY_MANIFEST_JAR).toPath());
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/JarNoManifest.java b/test/jdk/java/util/jar/JarFile/JarNoManifest.java
index 971ce92f9e9..31301e28975 100644
--- a/test/jdk/java/util/jar/JarFile/JarNoManifest.java
+++ b/test/jdk/java/util/jar/JarFile/JarNoManifest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,18 +24,25 @@
 /* @test
    @bug 4771616
    @summary JarFile.maybeInstantiateVerifier must check for absence of manifest
+   @run junit JarNoManifest
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.io.*;
 import java.util.jar.*;
 import java.util.zip.*;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 public class JarNoManifest {
-  public static void main(String[] args) throws Exception {
-    File f = new File(System.getProperty("test.src","."), "no-manifest.jar");
-    JarFile jar = new JarFile(f);
-    ZipEntry entry = jar.getEntry("JarNoManifest.java");
-    // The following throws a NullPointerException when the bug is present
-    InputStream in = jar.getInputStream(entry);
-  }
+
+    @Test
+    void absentManifestTest() throws IOException {
+        File f = new File(System.getProperty("test.src", "."), "no-manifest.jar");
+        JarFile jar = new JarFile(f);
+        ZipEntry entry = jar.getEntry("JarNoManifest.java");
+        // The following throws a NullPointerException when the bug is present
+        assertDoesNotThrow(() -> jar.getInputStream(entry));
+    }
 }
diff --git a/test/jdk/java/util/jar/JarFile/MevNPE.java b/test/jdk/java/util/jar/JarFile/MevNPE.java
index f8627d33324..20ac9f2d796 100644
--- a/test/jdk/java/util/jar/JarFile/MevNPE.java
+++ b/test/jdk/java/util/jar/JarFile/MevNPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,22 +24,27 @@
 /* @test
  * @bug 7023056
  * @summary NPE from sun.security.util.ManifestEntryVerifier.verify during Maven build
+ * @run junit MevNPE
  */
+import org.junit.jupiter.api.Test;
+
 import java.io.*;
 import java.util.jar.*;
 
 public class MevNPE {
-    public static void main(String[] args) throws Exception {
+
+    @Test
+    void noNpeTest() throws IOException {
         File f = new File(System.getProperty("test.src", "."), "Signed.jar");
         try (JarFile jf = new JarFile(f, true)) {
             try (InputStream s1 = jf.getInputStream(
                     jf.getJarEntry(JarFile.MANIFEST_NAME))) {
                 s1.read(new byte[10000]);
-            };
+            }
             try (InputStream s2 = jf.getInputStream(
                     jf.getJarEntry(JarFile.MANIFEST_NAME))) {
                 s2.read(new byte[10000]);
-            };
+            }
         }
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/ScanSignedJar.java b/test/jdk/java/util/jar/JarFile/ScanSignedJar.java
index fe49cea24aa..75b4732645d 100644
--- a/test/jdk/java/util/jar/JarFile/ScanSignedJar.java
+++ b/test/jdk/java/util/jar/JarFile/ScanSignedJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,29 +21,35 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 4953126
  * @summary Check that a signed JAR file containing an unsupported signer info
  *          attribute can be parsed successfully.
+ * @run junit ScanSignedJar
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
-import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.jar.*;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class ScanSignedJar {
 
-    public static void main(String[] args) throws Exception {
+    @Test
+    void unsupportedSignerTest() throws IOException {
         boolean isSigned = false;
         try (JarFile file = new JarFile(new File(System.getProperty("test.src","."),
-                 "bogus-signerinfo-attr.jar"))) {
+                "bogus-signerinfo-attr.jar"))) {
             byte[] buffer = new byte[8192];
 
-            for (Enumeration entries = file.entries(); entries.hasMoreElements();) {
-                JarEntry entry = (JarEntry) entries.nextElement();
+            for (Enumeration<JarEntry> entries = file.entries(); entries.hasMoreElements();) {
+                JarEntry entry = entries.nextElement();
                 try (InputStream jis = file.getInputStream(entry)) {
                     while (jis.read(buffer, 0, buffer.length) != -1) {
                         // read the jar entry
@@ -53,14 +59,9 @@ public class ScanSignedJar {
                     isSigned = true;
                 }
                 System.out.println((isSigned ? "[signed] " : "\t ") +
-                    entry.getName());
+                        entry.getName());
             }
         }
-
-        if (isSigned) {
-            System.out.println("\nJAR file has signed entries");
-        } else {
-            throw new Exception("Failed to detect that the JAR file is signed");
-        }
+        assertTrue(isSigned, "Failed to detect that the JAR file is signed");
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/SignedJarFileGetInputStream.java b/test/jdk/java/util/jar/JarFile/SignedJarFileGetInputStream.java
index 84ad357079d..9e524d5afd0 100644
--- a/test/jdk/java/util/jar/JarFile/SignedJarFileGetInputStream.java
+++ b/test/jdk/java/util/jar/JarFile/SignedJarFileGetInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,45 +24,38 @@
 /* @test
  * @bug 4845692 8206863
  * @summary JarFile.getInputStream should not throw when jar file is signed
- * @author Martin Buchholz
+ * @run junit SignedJarFileGetInputStream
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
 import java.util.zip.*;
 
-public class SignedJarFileGetInputStream {
-    public static void main(String args[]) throws Throwable {
-        JarFile jar = new JarFile(
-            new File(System.getProperty("test.src", "."), "Signed.jar"));
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
+public class SignedJarFileGetInputStream {
+
+    @Test
+    void signedJarTest() throws IOException {
+        JarFile jar = new JarFile(
+                new File(System.getProperty("test.src", "."), "Signed.jar"));
         for (Enumeration e = jar.entries(); e.hasMoreElements();) {
             JarEntry entry = (JarEntry) e.nextElement();
-            InputStream is = jar.getInputStream(new ZipEntry(entry.getName()));
+            InputStream is = assertDoesNotThrow(() -> jar.getInputStream(new ZipEntry(entry.getName())));
             is.close();
         }
-
         // read(), available() on closed stream should throw IOException
         InputStream is = jar.getInputStream(new ZipEntry("Test.class"));
         is.close();
         byte[] buffer = new byte[1];
 
-        try {
-            is.read();
-            throw new AssertionError("Should have thrown IOException");
-        } catch (IOException success) {}
-        try {
-            is.read(buffer);
-            throw new AssertionError("Should have thrown IOException");
-        } catch (IOException success) {}
-        try {
-            is.read(buffer, 0, buffer.length);
-            throw new AssertionError("Should have thrown IOException");
-        } catch (IOException success) {}
-        try {
-            is.available();
-            throw new AssertionError("Should have thrown IOException");
-        } catch (IOException success) {}
+        assertThrows(IOException.class, () -> is.read());
+        assertThrows(IOException.class, () -> is.read(buffer));
+        assertThrows(IOException.class, () -> is.read(buffer, 0, buffer.length));
+        assertThrows(IOException.class, () -> is.available());
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/SignedJarPendingBlock.java b/test/jdk/java/util/jar/JarFile/SignedJarPendingBlock.java
index a6f9955a507..a6326be622a 100644
--- a/test/jdk/java/util/jar/JarFile/SignedJarPendingBlock.java
+++ b/test/jdk/java/util/jar/JarFile/SignedJarPendingBlock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,21 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @modules java.base/sun.security.tools.keytool
  * @summary JARs with pending block files (where .RSA comes before .SF) should verify correctly
+ * @run junit SignedJarPendingBlock
  */
 
 import jdk.security.jarsigner.JarSigner;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.FieldSource;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
@@ -42,32 +48,47 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class SignedJarPendingBlock {
 
-    public static void main(String[] args) throws Exception {
+    static Path signed;
+    static Path pendingBlocks;
+    static Path invalid;
+
+    // Construct the test data
+    @BeforeAll
+    static void setup() throws Exception {
         Path jar = createJarFile();
-        Path signed = signJarFile(jar);
-        Path pendingBlocks = moveBlockFirst(signed);
-        Path invalid = invalidate(pendingBlocks);
-
-        // 1: Regular signed JAR with no pending blocks should verify
-        checkSigned(signed);
-
-        // 2: Signed jar with pending blocks should verify
-        checkSigned(pendingBlocks);
-
-        // 3: Invalid signed jar with pending blocks should throw SecurityException
-        try {
-            checkSigned(invalid);
-            throw new Exception("Expected invalid digest to be detected");
-        } catch (SecurityException se) {
-            // Ignore
-        }
+        signed = signJarFile(jar);
+        pendingBlocks = moveBlockFirst(signed);
+        invalid = invalidate(pendingBlocks);
     }
 
-    private static void checkSigned(Path b) throws Exception {
-        try (JarFile jf = new JarFile(b.toFile(), true)) {
+    // Regular signed JAR with no pending blocks should verify
+    @Test
+    void checkValidSignedJar() {
+        assertDoesNotThrow(() -> checkSigned(signed),
+                "Valid digest should not fail");
+    }
 
+    // Signed jar with pending blocks should verify
+    @Test
+    void checkValidSignedPendingJar() {
+        assertDoesNotThrow(() -> checkSigned(pendingBlocks),
+                "Valid digest should not fail");
+    }
+
+    // Invalid signed jar with pending blocks should throw SecurityException
+    @Test
+    void checkInvalidSignedJar() {
+        assertThrows(SecurityException.class, () -> checkSigned(invalid),
+                "Expected invalid digest to be detected");
+    }
+
+    private static void checkSigned(Path b) throws IOException {
+        try (JarFile jf = new JarFile(b.toFile(), true)) {
             JarEntry je = jf.getJarEntry("a.txt");
             try (InputStream in = jf.getInputStream(je)) {
                 in.transferTo(OutputStream.nullOutputStream());
diff --git a/test/jdk/java/util/jar/JarFile/SorryClosed.java b/test/jdk/java/util/jar/JarFile/SorryClosed.java
index 19481347394..38950539c57 100644
--- a/test/jdk/java/util/jar/JarFile/SorryClosed.java
+++ b/test/jdk/java/util/jar/JarFile/SorryClosed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,43 +24,49 @@
 /* @test
  * @bug 4910572
  * @summary Accessing a closed jar file should generate IllegalStateException.
- * @author Martin Buchholz
+ * @run junit SorryClosed
 */
 
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.io.File;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class SorryClosed {
-    public static void main(String args[]) throws IOException {
 
-        File file = new File(System.getProperty("test.src","."), "test.jar");
-        String testEntryName = "test.class";
+    private static final File file = new File(System.getProperty("test.src", "."), "test.jar");
+    private static final String testEntryName = "test.class";
 
-        try {
-            JarFile f = new JarFile(file);
-            ZipEntry e = f.getEntry(testEntryName);
-            f.close();
-            f.getInputStream(e);
-        } catch (IllegalStateException e) {} // OK
+    @Test
+    void getInputStreamTest() throws IOException {
+        JarFile f = new JarFile(file);
+        ZipEntry e = f.getEntry(testEntryName);
+        f.close();
+        assertThrows(IllegalStateException.class, () -> f.getInputStream(e));
+    }
 
-        try {
-            JarFile f = new JarFile(file);
-            f.close();
-            f.getEntry(testEntryName);
-        } catch (IllegalStateException e) {} // OK
+    @Test
+    void getEntryTest() throws IOException {
+        JarFile f = new JarFile(file);
+        f.close();
+        assertThrows(IllegalStateException.class, () -> f.getEntry(testEntryName));
+    }
 
-        try {
-            JarFile f = new JarFile(file);
-            f.close();
-            f.getJarEntry(testEntryName);
-        } catch (IllegalStateException e) {} // OK
+    @Test
+    void getJarEntryTest() throws IOException {
+        JarFile f = new JarFile(file);
+        f.close();
+        assertThrows(IllegalStateException.class, () -> f.getJarEntry(testEntryName));
+    }
 
-        try {
-            JarFile f = new JarFile(file);
-            f.close();
-            f.getManifest();
-        } catch (IllegalStateException e) {} // OK
+    @Test
+    void getManifestTest() throws IOException {
+        JarFile f = new JarFile(file);
+        f.close();
+        assertThrows(IllegalStateException.class, f::getManifest);
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/TurkCert.java b/test/jdk/java/util/jar/JarFile/TurkCert.java
index 68e3d83e002..216fd535e2b 100644
--- a/test/jdk/java/util/jar/JarFile/TurkCert.java
+++ b/test/jdk/java/util/jar/JarFile/TurkCert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,38 +21,35 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 4624534
  * @summary Make sure jar certificates work for Turkish locale
- * @author kladko
+ * @run junit/othervm -Duser.language=tr -Duser.country=TR TurkCert
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.util.*;
 import java.util.jar.*;
 import java.security.cert.*;
 import java.io.*;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class TurkCert {
-    public static void main(String[] args) throws Exception{
-        Locale reservedLocale = Locale.getDefault();
-        try {
-            Locale.setDefault(Locale.of("tr", "TR"));
-            File f = new File(System.getProperty("test.src","."), "test.jar");
-            try (JarFile jf = new JarFile(f, true)) {
-                JarEntry je = (JarEntry)jf.getEntry("test.class");
-                try (InputStream is = jf.getInputStream(je)) {
-                    byte[] b = new byte[1024];
-                    while (is.read(b) != -1) {
-                    }
-                }
-                if (je.getCertificates() == null) {
-                    throw new Exception("Null certificate for test.class.");
+
+    @Test
+    void turkishLocaleTest() throws IOException {
+        File f = new File(System.getProperty("test.src", "."), "test.jar");
+        try (JarFile jf = new JarFile(f, true)) {
+            JarEntry je = (JarEntry)jf.getEntry("test.class");
+            try (InputStream is = jf.getInputStream(je)) {
+                byte[] b = new byte[1024];
+                while (is.read(b) != -1) {
                 }
             }
-        } finally {
-            // restore the default locale
-            Locale.setDefault(reservedLocale);
+            assertNotNull(je.getCertificates(), "Null certificate for test.class.");
         }
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/VerifySignedJar.java b/test/jdk/java/util/jar/JarFile/VerifySignedJar.java
index bd5490502c9..e1602c0aa46 100644
--- a/test/jdk/java/util/jar/JarFile/VerifySignedJar.java
+++ b/test/jdk/java/util/jar/JarFile/VerifySignedJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,18 +21,20 @@
  * questions.
  */
 
-/**
+/*
  * @test
- * @library /test/lib
  * @modules java.base/sun.security.x509
  * @modules java.base/sun.security.tools.keytool
  * @bug 4419266 4842702
  * @summary Make sure verifying signed Jar doesn't throw SecurityException
+ * @run junit VerifySignedJar
  */
 import jdk.security.jarsigner.JarSigner;
+import org.junit.jupiter.api.Test;
 import sun.security.tools.keytool.CertAndKeyGen;
 import sun.security.x509.X500Name;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -40,21 +42,24 @@ import java.security.KeyStore;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static jdk.test.lib.Utils.runAndCheckException;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 public class VerifySignedJar {
 
-    public static void main(String[] args) throws Exception {
-
+    @Test
+    void signedJarSecurityExceptionTest() throws Exception {
         Path j = createJar();
         Path s = signJar(j, keyEntry("cn=duke"));
 
@@ -70,38 +75,30 @@ public class VerifySignedJar {
             }
 
             // Read ZIP and JAR entries by name
-            Objects.requireNonNull(jf.getEntry("getprop.class"));
-            Objects.requireNonNull(jf.getJarEntry("getprop.class"));
+            assertNotNull(jf.getEntry("getprop.class"));
+            assertNotNull(jf.getJarEntry("getprop.class"));
 
             // Make sure we throw NPE on null parameters
-            runAndCheckException(() -> jf.getEntry(null), NullPointerException.class);
-            runAndCheckException(() -> jf.getJarEntry(null), NullPointerException.class);
-            runAndCheckException(() -> jf.getInputStream(null), NullPointerException.class);
+            assertThrows(NullPointerException.class, () -> jf.getEntry(null));
+            assertThrows(NullPointerException.class, () -> jf.getJarEntry(null));
+            assertThrows(NullPointerException.class, () -> jf.getInputStream(null));
 
         } catch (SecurityException se) {
-            throw new Exception("Got SecurityException when verifying signed " +
-                "jar:" + se);
+            fail("Got SecurityException when verifying signed jar:" + se);
         }
     }
 
     // Check that a JAR entry is signed by an expected DN
-    private static void checkSignedBy(JarEntry e, String expectedDn) throws Exception {
+    private static void checkSignedBy(JarEntry e, String expectedDn) {
         Certificate[] certs = e.getCertificates();
-        if (certs == null || certs.length == 0) {
-            throw new Exception("JarEntry has no certificates: " + e.getName());
-        }
-
-        if (certs[0] instanceof X509Certificate x) {
-            String name = x.getSubjectX500Principal().getName();
-            if (!name.equalsIgnoreCase(expectedDn)) {
-                throw new Exception("Expected entry signed by %s, was %s".formatted(name, expectedDn));
-            }
-        } else {
-            throw new Exception("Expected JarEntry.getCertificate to return X509Certificate");
-        }
+        assertNotNull(certs, "JarEntry has no certificates: " + e.getName());
+        assertNotEquals(0, certs.length, "JarEntry has no certificates: " + e.getName());
+        var x = assertInstanceOf(X509Certificate.class, certs[0], "Expected JarEntry.getCertificate to return X509Certificate");
+        String name = x.getSubjectX500Principal().getName();
+        assertTrue(name.equalsIgnoreCase(expectedDn), "Expected entry signed by %s, was %s".formatted(name, expectedDn));
     }
 
-    private static Path createJar() throws Exception {
+    private static Path createJar() throws IOException {
         Path j = Path.of("unsigned.jar");
         try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(j))){
             out.putNextEntry(new JarEntry("getprop.class"));
diff --git a/test/jdk/java/util/jar/JarFile/jarVerification/MultiProviderTest.java b/test/jdk/java/util/jar/JarFile/jarVerification/MultiProviderTest.java
index 4d191d7b3cd..b4b7fda081e 100644
--- a/test/jdk/java/util/jar/JarFile/jarVerification/MultiProviderTest.java
+++ b/test/jdk/java/util/jar/JarFile/jarVerification/MultiProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,7 @@
  *        jdk.test.lib.JDKToolLauncher
  *        MultiThreadLoad FooService
  * @modules java.base/jdk.internal.access:+open
- * @run main MultiProviderTest
- * @run main MultiProviderTest sign
+ * @run junit MultiProviderTest
  */
 
 import java.io.File;
@@ -51,27 +50,33 @@ import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.util.JarUtils;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 public class MultiProviderTest {
 
     private static final String METAINFO = "META-INF/services/FooService";
-    private static String COMBO_CP = Utils.TEST_CLASS_PATH + File.pathSeparator;
     private static String TEST_CLASS_PATH = System.getProperty("test.classes", ".");
-    private static boolean signJars = false;
     static final int NUM_JARS = 5;
 
+    // Reset per each test run under JUnit default lifecycle
+    private boolean signJars = false;
+    private String COMBO_CP = Utils.TEST_CLASS_PATH + File.pathSeparator;
 
     private static final String KEYSTORE = "keystore.jks";
     private static final String ALIAS = "JavaTest";
     private static final String STOREPASS = "changeit";
     private static final String KEYPASS = "changeit";
 
-    public static void main(String[] args) throws Throwable {
-        signJars = args.length >=1 && args[0].equals("sign");
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void classLoadingTest(boolean sign) throws Throwable {
+        signJars = sign;
         initialize();
         List<String> cmds = new ArrayList<>();
         cmds.add(JDKToolFinder.getJDKTool("java"));
@@ -86,18 +91,16 @@ public class MultiProviderTest {
                 "MultiThreadLoad",
                 TEST_CLASS_PATH));
 
-        try {
+        assertDoesNotThrow(() -> {
             OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(cmds.stream()
-                    .filter(t -> !t.isEmpty())
-                    .toArray(String[]::new))
+                            .filter(t -> !t.isEmpty())
+                            .toArray(String[]::new))
                     .shouldHaveExitValue(0);
             System.out.println("Output:" + outputAnalyzer.getOutput());
-        } catch (Throwable t) {
-            throw new RuntimeException("Unexpected fail.", t);
-        }
+        });
     }
 
-    public static void initialize() throws Throwable {
+    public void initialize() throws Throwable {
         if (signJars) {
             genKey();
         }
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
index e8abec354ed..1ba25ef6985 100644
--- a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
+++ b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *        CreateMultiReleaseTestJars
  *        jdk.test.lib.compiler.Compiler
  *        jdk.test.lib.util.JarBuilder
- * @run testng MultiReleaseJarAPI
+ * @run junit MultiReleaseJarAPI
  */
 
 import java.io.File;
@@ -44,37 +44,41 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.jar.JarFile;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 import jdk.test.lib.RandomFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MultiReleaseJarAPI {
 
     private static final Random RANDOM = RandomFactory.getRandom();
 
-    String userdir = System.getProperty("user.dir",".");
-    CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
-    File unversioned = new File(userdir, "unversioned.jar");
-    File multirelease = new File(userdir, "multi-release.jar");
-    File signedmultirelease = new File(userdir, "signed-multi-release.jar");
+    private static final String userdir = System.getProperty("user.dir", ".");
+    private static final CreateMultiReleaseTestJars creator = new CreateMultiReleaseTestJars();
+    private static final File unversioned = new File(userdir, "unversioned.jar");
+    private static final File multirelease = new File(userdir, "multi-release.jar");
+    private static final File signedmultirelease = new File(userdir, "signed-multi-release.jar");
 
-
-    @BeforeClass
-    public void initialize() throws Exception {
+    @BeforeAll
+    public static void initialize() throws Exception {
         creator.compileEntries();
         creator.buildUnversionedJar();
         creator.buildMultiReleaseJar();
         creator.buildSignedMultiReleaseJar();
     }
 
-    @AfterClass
-    public void close() throws IOException {
+    @AfterAll
+    public static void close() throws IOException {
         Files.delete(unversioned.toPath());
         Files.delete(multirelease.toPath());
         Files.delete(signedmultirelease.toPath());
@@ -83,19 +87,19 @@ public class MultiReleaseJarAPI {
     @Test
     public void isMultiReleaseJar() throws Exception {
         try (JarFile jf = new JarFile(unversioned)) {
-            Assert.assertFalse(jf.isMultiRelease());
+            assertFalse(jf.isMultiRelease());
         }
 
         try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, Runtime.version())) {
-            Assert.assertFalse(jf.isMultiRelease());
+            assertFalse(jf.isMultiRelease());
         }
 
         try (JarFile jf = new JarFile(multirelease)) {
-            Assert.assertTrue(jf.isMultiRelease());
+            assertTrue(jf.isMultiRelease());
         }
 
         try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.version())) {
-            Assert.assertTrue(jf.isMultiRelease());
+            assertTrue(jf.isMultiRelease());
         }
 
         testCustomMultiReleaseValue("true", true);
@@ -155,45 +159,46 @@ public class MultiReleaseJarAPI {
         creator.buildCustomMultiReleaseJar(fileName, value, extraAttributes);
         File custom = new File(userdir, fileName);
         try (JarFile jf = new JarFile(custom, true, ZipFile.OPEN_READ, Runtime.version())) {
-            Assert.assertEquals(jf.isMultiRelease(), expected);
+            assertEquals(expected, jf.isMultiRelease());
         }
         Files.delete(custom.toPath());
     }
 
-    @DataProvider(name = "versions")
-    public Object[][] createVersionData() throws Exception {
-        return new Object[][]{
-                {JarFile.baseVersion(), 8},
-                {JarFile.runtimeVersion(), Runtime.version().major()},
-                {Runtime.version(), Runtime.version().major()},
-                {Runtime.Version.parse("7.1"), JarFile.baseVersion().major()},
-                {Runtime.Version.parse("9"), 9},
-                {Runtime.Version.parse("9.1.5-ea+200"), 9}
-        };
+    public static Stream<Arguments> createVersionData() {
+        return Stream.of(
+                Arguments.of(JarFile.baseVersion(), 8),
+                Arguments.of(JarFile.runtimeVersion(), Runtime.version().major()),
+                Arguments.of(Runtime.version(), Runtime.version().major()),
+                Arguments.of(Runtime.Version.parse("7.1"), JarFile.baseVersion().major()),
+                Arguments.of(Runtime.Version.parse("9"), 9),
+                Arguments.of(Runtime.Version.parse("9.1.5-ea+200"), 9)
+        );
     }
 
-    @Test(dataProvider="versions")
+    @ParameterizedTest
+    @MethodSource("createVersionData")
     public void testVersioning(Runtime.Version value, int xpected) throws Exception {
         Runtime.Version expected = Runtime.Version.parse(String.valueOf(xpected));
         Runtime.Version base = JarFile.baseVersion();
 
         // multi-release jar, opened as unversioned
         try (JarFile jar = new JarFile(multirelease)) {
-            Assert.assertEquals(jar.getVersion(), base);
+            assertEquals(base, jar.getVersion());
         }
 
         System.err.println("test versioning for Release " + value);
         try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, value)) {
-            Assert.assertEquals(jf.getVersion(), expected);
+            assertEquals(expected, jf.getVersion());
         }
 
         // regular, unversioned, jar
         try (JarFile jf = new JarFile(unversioned, true, ZipFile.OPEN_READ, value)) {
-            Assert.assertEquals(jf.getVersion(), base);
+            assertEquals(base, jf.getVersion());
         }
     }
 
-    @Test(dataProvider="versions")
+    @ParameterizedTest
+    @MethodSource("createVersionData")
     public void testAliasing(Runtime.Version version, int xpected) throws Exception {
         int n = Math.max(version.major(), JarFile.baseVersion().major());
         Runtime.Version value = Runtime.Version.parse(String.valueOf(n));
@@ -231,7 +236,7 @@ public class MultiReleaseJarAPI {
         }
         assert versionedBytes.length > 0;
 
-        Assert.assertTrue(Arrays.equals(baseBytes, versionedBytes));
+        assertTrue(Arrays.equals(baseBytes, versionedBytes));
     }
 
     @Test
@@ -243,11 +248,11 @@ public class MultiReleaseJarAPI {
         try (JarFile jf = new JarFile(multirelease)) {
             ze1 = jf.getEntry(vname);
         }
-        Assert.assertEquals(ze1.getName(), vname);
+        assertEquals(vname, ze1.getName());
         try (JarFile jf = new JarFile(multirelease, true, ZipFile.OPEN_READ, Runtime.Version.parse("9"))) {
             ze2 = jf.getEntry(rname);
         }
-        Assert.assertEquals(ze2.getName(), rname);
-        Assert.assertNotEquals(ze1.getName(), ze2.getName());
+        assertEquals(rname, ze2.getName());
+        assertNotEquals(ze2.getName(), ze1.getName());
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java
index 16f764c6674..7d3a933a619 100644
--- a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java
+++ b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarHttpProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,17 @@
  * @build CreateMultiReleaseTestJars
  *        jdk.test.lib.compiler.Compiler
  *        jdk.test.lib.util.JarBuilder
- * @run testng MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=0   MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=8   MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=9   MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=100 MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarHttpProperties
- * @run testng/othervm -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarHttpProperties
+ * @run junit MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=0   MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=8   MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=9   MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=100 MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarHttpProperties
+ * @run junit/othervm -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarHttpProperties
  */
 
 import java.io.IOException;
@@ -56,16 +56,19 @@ import java.util.concurrent.Executors;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.SimpleFileServer;
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class MultiReleaseJarHttpProperties extends MultiReleaseJarProperties {
     private HttpServer server;
     private ExecutorService executor;
     static final String TESTCONTEXT = "/multi-release.jar";  //mapped to local file path
 
-    @BeforeClass
+    @BeforeAll
     public void initialize() throws Exception {
         server = SimpleFileServer.createFileServer(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0),
                 Path.of(System.getProperty("user.dir", ".")), SimpleFileServer.OutputLevel.INFO);
@@ -86,7 +89,7 @@ public class MultiReleaseJarHttpProperties extends MultiReleaseJarProperties {
         rootClass = cldr.loadClass("version.Main");
     }
 
-    @AfterClass
+    @AfterAll
     public void close() throws IOException {
         // Windows requires server to stop before file is deleted
         if (server != null) {
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
index cbc9516542e..a742a593868 100644
--- a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
+++ b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,17 +29,17 @@
  * @build CreateMultiReleaseTestJars
  *        jdk.test.lib.compiler.Compiler
  *        jdk.test.lib.util.JarBuilder
- * @run testng MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=0   MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=8   MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=9   MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=100 MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarProperties
- * @run testng/othervm -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarProperties
+ * @run junit MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=0   MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=8   MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=9   MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=100 MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=8   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.version=9   -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.enableMultiRelease=false MultiReleaseJarProperties
+ * @run junit/othervm -Djdk.util.jar.enableMultiRelease=force MultiReleaseJarProperties
  */
 
 import java.io.File;
@@ -54,12 +54,15 @@ import java.nio.file.Files;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class MultiReleaseJarProperties {
     final static int BASE_VERSION = JarFile.baseVersion().major();
 
@@ -70,7 +73,7 @@ public class MultiReleaseJarProperties {
     protected ClassLoader cldr;
     protected Class<?> rootClass;
 
-    @BeforeClass
+    @BeforeAll
     public void initialize() throws Exception {
         CreateMultiReleaseTestJars creator = new CreateMultiReleaseTestJars();
         creator.compileEntries();
@@ -97,7 +100,7 @@ public class MultiReleaseJarProperties {
         rootClass = cldr.loadClass("version.Main");
     }
 
-    @AfterClass
+    @AfterAll
     public void close() throws IOException {
         ((URLClassLoader) cldr).close();
         Files.delete(multirelease.toPath());
@@ -115,7 +118,7 @@ public class MultiReleaseJarProperties {
     protected void invokeMethod(Class<?> vcls, int expected) throws Throwable {
         MethodType mt = MethodType.methodType(int.class);
         MethodHandle mh = MethodHandles.lookup().findVirtual(vcls, "getVersion", mt);
-        Assert.assertEquals(expected, (int) mh.invoke(vcls.newInstance()));
+        assertEquals(expected, (int) mh.invoke(vcls.newInstance()));
     }
 
     /*
@@ -177,7 +180,7 @@ public class MultiReleaseJarProperties {
             resource = new String(bytes);
         }
         String match = "return " + rtVersion + ";";
-        Assert.assertTrue(resource.contains(match));
+        assertTrue(resource.contains(match));
     }
 
     @Test
@@ -194,6 +197,6 @@ public class MultiReleaseJarProperties {
             resource = new String(bytes);
         }
         String match = "return " + rtVersion + ";";
-        Assert.assertTrue(resource.contains(match));
+        assertTrue(resource.contains(match));
     }
 }
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
index ec18cad0817..7e0bb2c1ca7 100644
--- a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
+++ b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @build CreateMultiReleaseTestJars
  *        jdk.test.lib.compiler.Compiler
  *        jdk.test.lib.util.JarBuilder
- * @run testng MultiReleaseJarSecurity
+ * @run junit MultiReleaseJarSecurity
  */
 
 import java.io.File;
@@ -38,45 +38,45 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.security.CodeSigner;
 import java.security.cert.Certificate;
-import java.util.Arrays;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
 
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MultiReleaseJarSecurity {
 
     static final int MAJOR_VERSION = Runtime.version().major();
 
-    String userdir = System.getProperty("user.dir",".");
-    File multirelease = new File(userdir, "multi-release.jar");
-    File signedmultirelease = new File(userdir, "signed-multi-release.jar");
+    static final String USER_DIR = System.getProperty("user.dir", ".");
+    static final File MULTI_RELEASE = new File(USER_DIR, "multi-release.jar");
+    static final File SIGNED_MULTI_RELEASE = new File(USER_DIR, "signed-multi-release.jar");
 
-    @BeforeClass
-    public void initialize() throws Exception {
+    @BeforeAll
+    public static void initialize() throws Exception {
         CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
         creator.compileEntries();
         creator.buildMultiReleaseJar();
         creator.buildSignedMultiReleaseJar();
     }
 
-    @AfterClass
-    public void close() throws IOException {
-        Files.delete(multirelease.toPath());
-        Files.delete(signedmultirelease.toPath());
+    @AfterAll
+    public static void close() throws IOException {
+        Files.delete(MULTI_RELEASE.toPath());
+        Files.delete(SIGNED_MULTI_RELEASE.toPath());
     }
 
     @Test
     public void testCertsAndSigners() throws IOException {
-        try (JarFile jf = new JarFile(signedmultirelease, true, ZipFile.OPEN_READ, Runtime.version())) {
+        try (JarFile jf = new JarFile(SIGNED_MULTI_RELEASE, true, ZipFile.OPEN_READ, Runtime.version())) {
             CertsAndSigners vcas = new CertsAndSigners(jf, jf.getJarEntry("version/Version.class"));
             CertsAndSigners rcas = new CertsAndSigners(jf, jf.getJarEntry("META-INF/versions/" + MAJOR_VERSION + "/version/Version.class"));
-            Assert.assertTrue(Arrays.equals(rcas.getCertificates(), vcas.getCertificates()));
-            Assert.assertTrue(Arrays.equals(rcas.getCodeSigners(), vcas.getCodeSigners()));
+            assertArrayEquals(rcas.getCertificates(), vcas.getCertificates());
+            assertArrayEquals(rcas.getCodeSigners(), vcas.getCodeSigners());
         }
     }
 
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java b/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java
index dbff39f814e..f88ab0821ae 100644
--- a/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java
+++ b/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @build jdk.test.lib.Platform
  *        jdk.test.lib.util.FileUtils
- * @run testng TestVersionedStream
+ * @run junit TestVersionedStream
  */
 
 import java.io.File;
@@ -41,7 +41,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -54,18 +53,20 @@ import java.util.stream.Stream;
 import java.util.zip.ZipFile;
 
 import jdk.test.lib.util.FileUtils;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestVersionedStream {
-    private final Path userdir;
-    private final Set<String> unversionedEntryNames;
 
+    private static final Path userdir;
+    private static final Set<String> unversionedEntryNames;
     private static final int LATEST_VERSION = Runtime.version().feature();
 
-    public TestVersionedStream() throws IOException {
+    static {
         userdir = Paths.get(System.getProperty("user.dir", "."));
 
         // These are not real class files even though they end with .class.
@@ -91,8 +92,7 @@ public class TestVersionedStream {
             "--release " + LATEST_VERSION + " -C v" + LATEST_VERSION + " .");
 
         System.out.println("Contents of mmr.jar\n=======");
-
-        try(JarFile jf = new JarFile("mmr.jar")) {
+        try (JarFile jf = new JarFile("mmr.jar")) {
             unversionedEntryNames = jf.stream()
                     .map(je -> je.getName())
                     .peek(System.out::println)
@@ -100,13 +100,14 @@ public class TestVersionedStream {
                             ? nm.replaceFirst("META-INF/versions/\\d+/", "")
                             : nm)
                     .collect(Collectors.toCollection(LinkedHashSet::new));
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to init \"unversionedEntryNames\"", e);
         }
-
         System.out.println("=======");
     }
 
-    @AfterClass
-    public void close() throws IOException {
+    @AfterAll
+    public static void close() throws IOException {
         Files.walk(userdir, 1)
                 .filter(p -> !p.equals(userdir))
                 .forEach(p -> {
@@ -122,53 +123,41 @@ public class TestVersionedStream {
                 });
     }
 
-    @DataProvider
-    public Object[][] data() {
-        return new Object[][] {
-            {Runtime.Version.parse("8")},
-            {Runtime.Version.parse("9")},
-            {Runtime.Version.parse("10")},
-            {Runtime.Version.parse(Integer.toString(LATEST_VERSION))},
-            {JarFile.baseVersion()},
-            {JarFile.runtimeVersion()}
-        };
+    public static Stream<Runtime.Version> arguments() {
+        return Stream.of(
+            Runtime.Version.parse("8"),
+            Runtime.Version.parse("9"),
+            Runtime.Version.parse("10"),
+            Runtime.Version.parse(Integer.toString(LATEST_VERSION)),
+            JarFile.baseVersion(),
+            JarFile.runtimeVersion()
+        );
     }
 
-    @Test(dataProvider="data")
-    public void test(Runtime.Version version) throws Exception {
+    @ParameterizedTest
+    @MethodSource("arguments")
+    public void versionTest(Runtime.Version version) throws Exception {
         try (JarFile jf = new JarFile(new File("mmr.jar"), false, ZipFile.OPEN_READ, version);
              Stream<JarEntry> jes = jf.versionedStream())
         {
-            Assert.assertNotNull(jes);
+            assertNotNull(jes);
 
             // put versioned entries in list so we can reuse them
             List<JarEntry> versionedEntries = jes.collect(Collectors.toList());
 
-            Assert.assertTrue(versionedEntries.size() > 0);
+            assertTrue(versionedEntries.size() > 0);
 
             // also keep the names
-            List<String> versionedNames = new ArrayList<>(versionedEntries.size());
+            List<String> versionedNames = versionedEntries.stream()
+                    .map(JarEntry::getName)
+                    .collect(Collectors.toList());
 
             // verify the correct order while building enames
-            Iterator<String> allIt = unversionedEntryNames.iterator();
-            Iterator<JarEntry> verIt = versionedEntries.iterator();
-            boolean match = false;
+            List<String> unversionedOrder = new ArrayList<>(unversionedEntryNames);
+            unversionedOrder.retainAll(versionedNames);
 
-            while (verIt.hasNext()) {
-                match = false;
-                if (!allIt.hasNext()) break;
-                String name = verIt.next().getName();
-                versionedNames.add(name);
-                while (allIt.hasNext()) {
-                    if (name.equals(allIt.next())) {
-                        match = true;
-                        break;
-                    }
-                }
-            }
-            if (!match) {
-                Assert.fail("versioned entries not in same order as unversioned entries");
-            }
+            assertIterableEquals(unversionedOrder, versionedNames,
+                    "versioned entries not in same order as unversioned entries");
 
             // verify the contents:
             // value.[0] end of the path
@@ -205,21 +194,21 @@ public class TestVersionedStream {
                         expected.put("q/Bar.class",
                                      new String[] { "q/Bar.class", "META-INF/versions/10/q/Bar.class"});
                     } else {
-                        Assert.fail("Test out of date, please add more cases");
+                        fail("Test out of date, please add more cases");
                     }
             }
 
             expected.entrySet().stream().forEach(e -> {
                 String name = e.getKey();
                 int i = versionedNames.indexOf(name);
-                Assert.assertTrue(i != -1, name + " not in enames");
+                assertTrue(i != -1, name + " not in enames");
                 JarEntry je = versionedEntries.get(i);
                 try (InputStream is = jf.getInputStream(je)) {
                     String s = new String(is.readAllBytes()).replaceAll(System.lineSeparator(), "");
                     // end of the path
-                    Assert.assertTrue(s.endsWith(e.getValue()[0]), s);
+                    assertTrue(s.endsWith(e.getValue()[0]), s);
                     // getRealName()
-                    Assert.assertTrue(je.getRealName().equals(e.getValue()[1]));
+                    assertTrue(je.getRealName().equals(e.getValue()[1]));
                 } catch (IOException x) {
                     throw new UncheckedIOException(x);
                 }
@@ -227,12 +216,12 @@ public class TestVersionedStream {
 
             if (!unversionedEntryNames.contains("META-INF/Foo.class") ||
                 versionedNames.indexOf("META-INF/Foo.class") != -1) {
-                Assert.fail("versioned META-INF/Foo.class test failed");
+                fail("versioned META-INF/Foo.class test failed");
             }
         }
     }
 
-    private void createFiles(String... files) {
+    private static void createFiles(String... files) {
         ArrayList<String> list = new ArrayList();
         Arrays.stream(files)
                 .map(f -> Paths.get(userdir.toAbsolutePath().toString(), f))
@@ -248,7 +237,7 @@ public class TestVersionedStream {
                     }});
     }
 
-    private void jar(String args) {
+    private static void jar(String args) {
         ToolProvider jar = ToolProvider.findFirst("jar").orElseThrow();
         jar.run(System.out, System.err, args.split(" +"));
     }
diff --git a/test/jdk/java/util/jar/JarInputStream/EmptyJar.java b/test/jdk/java/util/jar/JarInputStream/EmptyJar.java
index 9762455460c..ff961844685 100644
--- a/test/jdk/java/util/jar/JarInputStream/EmptyJar.java
+++ b/test/jdk/java/util/jar/JarInputStream/EmptyJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,18 +26,22 @@
    @summary Make sure JarInputStream constructor will not
             throw NullPointerException when the JAR file is
             empty.
-   */
+   @run junit EmptyJar
+ */
+
+import org.junit.jupiter.api.Test;
 
 import java.util.jar.*;
 import java.io.*;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 public class EmptyJar {
-    public static void main(String args[]) throws Exception {
-        try {
-            JarInputStream is = new JarInputStream
-                (new ByteArrayInputStream(new byte[0]));
-        } catch (NullPointerException e) {
-            throw new Exception("unexpected NullPointerException");
-        }
+
+    @Test
+    void npeTest() {
+        // Ensure no NPE is thrown
+        assertDoesNotThrow(() -> new JarInputStream(new ByteArrayInputStream(new byte[0])),
+                "unexpected NullPointerException");
     }
 }
diff --git a/test/jdk/java/util/jar/JarInputStream/ExtraFileInMetaInf.java b/test/jdk/java/util/jar/JarInputStream/ExtraFileInMetaInf.java
index 45865ec0b8f..fe88d225444 100644
--- a/test/jdk/java/util/jar/JarInputStream/ExtraFileInMetaInf.java
+++ b/test/jdk/java/util/jar/JarInputStream/ExtraFileInMetaInf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,24 @@
  * @summary JarInputStream doesn't provide certificates for some file under META-INF
  * @modules java.base/sun.security.tools.keytool
  *          jdk.jartool/sun.security.tools.jarsigner
+ * @run junit ExtraFileInMetaInf
  */
 
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
 import java.util.jar.*;
 import java.io.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-public class ExtraFileInMetaInf {
-    public static void main(String args[]) throws Exception {
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
+public class ExtraFileInMetaInf {
+
+    @BeforeAll
+    static void setup() throws Exception {
         // Create a zip file with 2 entries
         try (ZipOutputStream zos =
                      new ZipOutputStream(new FileOutputStream("x.jar"))) {
@@ -44,7 +52,6 @@ public class ExtraFileInMetaInf {
             zos.write(new byte[10]);
             zos.putNextEntry(new ZipEntry("x"));
             zos.write(new byte[10]);
-            zos.close();
         }
 
         // Sign it
@@ -54,7 +61,10 @@ public class ExtraFileInMetaInf {
                         "-keyalg rsa -alias a -dname CN=A -genkeypair").split(" "));
         sun.security.tools.jarsigner.Main.main(
                 "-keystore ks -storepass changeit x.jar a".split(" "));
+    }
 
+    @Test
+    void checkSignedTest() throws IOException {
         // Check if the entries are signed
         try (JarInputStream jis =
                      new JarInputStream(new FileInputStream("x.jar"))) {
@@ -63,9 +73,7 @@ public class ExtraFileInMetaInf {
                 String name = je.toString();
                 if (name.equals("META-INF/SUB/file") || name.equals("x")) {
                     while (jis.read(new byte[1000]) >= 0);
-                    if (je.getCertificates() == null) {
-                        throw new Exception(name + " not signed");
-                    }
+                    assertNotNull(je.getCertificates(), name + " not signed");
                 }
             }
         }
diff --git a/test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java b/test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java
index 86dbf793e74..23e0a81c4cf 100644
--- a/test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java
+++ b/test/jdk/java/util/jar/JarInputStream/ScanSignedJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,13 +25,19 @@
  * @test
  * @bug 6284489
  * @summary Confirm that JarEntry.getCertificates identifies signed entries.
+ * @run junit ScanSignedJar
  */
 
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
 import java.net.URL;
 import java.security.CodeSigner;
 import java.security.cert.Certificate;
 import java.util.jar.*;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 /*
  * Confirm that the signed entries in a JAR file are identified correctly
  * when JarEntry.getCertificates is used to extract the signer's certificates.
@@ -43,13 +49,13 @@ import java.util.jar.*;
 public class ScanSignedJar {
 
     private static final String JAR_LOCATION =
-        "file:" +
-        System.getProperty("test.src", ".") +
-        System.getProperty("file.separator") +
-        "signed.jar";
-
-    public static void main(String[] args) throws Exception {
+            "file:" +
+                    System.getProperty("test.src", ".") +
+                    System.getProperty("file.separator") +
+                    "signed.jar";
 
+    @Test
+    void signedJarTest() throws IOException {
         System.out.println("Opening " + JAR_LOCATION + "...");
         JarInputStream inStream =
             new JarInputStream(new URL(JAR_LOCATION).openStream(), true);
@@ -71,7 +77,7 @@ public class ScanSignedJar {
                 System.out.println("[unsigned]\t" + name + "\t(" + size +
                     " bytes)");
                 if (name.equals("Count.class")) {
-                    throw new Exception("Count.class should be signed");
+                    fail("Count.class should be signed");
                 }
             } else if (signers != null && certificates != null) {
                 System.out.println("[" + signers.length +
@@ -80,7 +86,7 @@ public class ScanSignedJar {
             } else {
                 System.out.println("[*ERROR*]\t" + name + "\t(" + size +
                     " bytes)");
-                throw new Exception("Cannot determine whether the entry is " +
+                fail("Cannot determine whether the entry is " +
                     "signed or unsigned (signers[] doesn't match certs[]).");
             }
         }
diff --git a/test/jdk/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java b/test/jdk/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java
index 2e74eb10069..47dc572aa6b 100644
--- a/test/jdk/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java
+++ b/test/jdk/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,32 +26,32 @@
  * @bug 6544278
  * @summary Confirm the JarInputStream throws the SecurityException when
  *          verifying an indexed jar file with corrupted signature
+ * @run junit TestIndexedJarWithBadSignature
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.io.FileInputStream;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class TestIndexedJarWithBadSignature {
 
-    public static void main(String...args) throws Throwable {
+    @Test
+    void securityExceptionTest() throws IOException {
         try (JarInputStream jis = new JarInputStream(
-                 new FileInputStream(System.getProperty("test.src", ".") +
-                                     System.getProperty("file.separator") +
-                                     "BadSignedJar.jar")))
-        {
-            JarEntry je1 = jis.getNextJarEntry();
-            while(je1!=null){
-                System.out.println("Jar Entry1==>"+je1.getName());
-                je1 = jis.getNextJarEntry(); // This should throw Security Exception
-            }
-            throw new RuntimeException(
-                "Test Failed:Security Exception not being thrown");
-        } catch (IOException ie){
-            ie.printStackTrace();
-        } catch (SecurityException e) {
-            System.out.println("Test passed: Security Exception thrown as expected");
+                new FileInputStream(System.getProperty("test.src", ".") +
+                        System.getProperty("file.separator") +
+                        "BadSignedJar.jar"))) {
+            assertThrows(SecurityException.class, () -> {
+                JarEntry je1;
+                while ((je1 = jis.getNextJarEntry()) != null) {
+                    System.out.println("Jar Entry1==>" + je1.getName());
+                }
+            });
         }
     }
 }
diff --git a/test/jdk/java/util/jar/Manifest/CreateManifest.java b/test/jdk/java/util/jar/Manifest/CreateManifest.java
index 6655089b56d..2eee24fb0be 100644
--- a/test/jdk/java/util/jar/Manifest/CreateManifest.java
+++ b/test/jdk/java/util/jar/Manifest/CreateManifest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,40 +27,43 @@
  * @summary Jar tools fails to generate manifest correctly when boundary condition hit
  * @modules jdk.jartool/sun.tools.jar
  * @compile -XDignore.symbol.file=true CreateManifest.java
- * @run main CreateManifest
+ * @run junit CreateManifest
  */
 
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.jar.*;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class CreateManifest {
 
-public static void main(String arg[]) throws Exception {
+    @Test
+    void boundaryTest() throws IOException {
+        String jarFileName = "test.jar";
+        String ManifestName = "MANIFEST.MF";
 
-    String jarFileName = "test.jar";
-    String ManifestName = "MANIFEST.MF";
+        // create the MANIFEST.MF file
+        Files.write(Paths.get(ManifestName), FILE_CONTENTS.getBytes());
 
-    // create the MANIFEST.MF file
-    Files.write(Paths.get(ManifestName), FILE_CONTENTS.getBytes());
+        String [] args = new String [] { "cvfm", jarFileName, ManifestName};
+        sun.tools.jar.Main jartool =
+                new sun.tools.jar.Main(System.out, System.err, "jar");
+        jartool.run(args);
 
-    String [] args = new String [] { "cvfm", jarFileName, ManifestName};
-    sun.tools.jar.Main jartool =
-            new sun.tools.jar.Main(System.out, System.err, "jar");
-    jartool.run(args);
-
-    try (JarFile jf = new JarFile(jarFileName)) {
-        Manifest m = jf.getManifest();
-        String result = m.getMainAttributes().getValue("Class-path");
-        if (result == null)
-            throw new RuntimeException("Failed to add Class-path attribute to manifest");
-    } finally {
-        Files.deleteIfExists(Paths.get(jarFileName));
-        Files.deleteIfExists(Paths.get(ManifestName));
+        try (JarFile jf = new JarFile(jarFileName)) {
+            Manifest m = jf.getManifest();
+            String result = m.getMainAttributes().getValue("Class-path");
+            assertNotNull(result, "Failed to add Class-path attribute to manifest");
+        } finally {
+            Files.deleteIfExists(Paths.get(jarFileName));
+            Files.deleteIfExists(Paths.get(ManifestName));
+        }
     }
 
-}
-
 private static final String FILE_CONTENTS =
  "Class-path: \n" +
  " /ade/dtsao_re/oracle/emcore//lib/em-core-testconsole-uimodel.jar \n" +
diff --git a/test/jdk/java/util/jar/Manifest/IncludeInExceptionsTest.java b/test/jdk/java/util/jar/Manifest/IncludeInExceptionsTest.java
index 1e272015087..bb3cd6e23ef 100644
--- a/test/jdk/java/util/jar/Manifest/IncludeInExceptionsTest.java
+++ b/test/jdk/java/util/jar/Manifest/IncludeInExceptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,9 @@
  * questions.
  */
 
-import java.io.File;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -30,23 +32,29 @@ import java.util.concurrent.Callable;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
+import java.util.stream.Stream;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
-/**
+/*
  * @test
  * @bug 8216362
- * @run main/othervm -Djdk.includeInExceptions=jar IncludeInExceptionsTest yes
- * @run main/othervm IncludeInExceptionsTest
- * @summary Verify that the property jdk.net.includeInExceptions works as expected
+ * @run junit/othervm -Djdk.includeInExceptions=jar IncludeInExceptionsTest
+ * @run junit/othervm IncludeInExceptionsTest
+ * @summary Verify that the property jdk.includeInExceptions works as expected
  * when an error occurs while reading an invalid Manifest file.
  */
+
 /*
  * @see Manifest#Manifest(JarVerifier,InputStream,String)
  * @see Manifest#getErrorPosition
  */
 public class IncludeInExceptionsTest {
 
+    private static final boolean includeInExceptions = System.getProperty("jdk.includeInExceptions") != null;
+
     static final String FILENAME = "Unique-Filename-Expected-In_Msg.jar";
 
     static final byte[] INVALID_MANIFEST = (
@@ -66,36 +74,26 @@ public class IncludeInExceptionsTest {
         return jar;
     }
 
-    static void test(Callable<?> attempt, boolean includeInExceptions) throws Exception {
-        try {
-            attempt.call();
-            throw new AssertionError("Excpected Exception not thrown");
-        } catch (IOException e) {
-            boolean foundFileName = e.getMessage().contains(FILENAME);
-            if(includeInExceptions && !foundFileName) {
-                throw new AssertionError("JAR file name expected but not found in error message");
-            } else if (foundFileName && !includeInExceptions) {
-                throw new AssertionError("JAR file name found but should not be in error message");
-            }
+    @ParameterizedTest
+    @MethodSource("manifests")
+    void testInvalidManifest(Callable<?> attempt) {
+        var ioException = assertThrows(IOException.class, attempt::call);
+        boolean foundFileName = ioException.getMessage().contains(FILENAME);
+        if (includeInExceptions && !foundFileName) {
+            fail("JAR file name expected but not found in error message");
+        } else if (foundFileName && !includeInExceptions) {
+            fail("JAR file name found but should not be in error message");
         }
     }
 
-    public static void main(String[] args) throws Exception {
-
-        boolean includeInExceptions;
-        if(args.length > 0) {
-            includeInExceptions = true;
-            System.out.println("**** Running test WITH -Djdk.includeInExceptions=jar");
-        } else {
-            includeInExceptions = false;
-            System.out.println("**** Running test WITHOUT -Djdk.includeInExceptions=jar");
-        }
-
-        test(() -> new JarFile(createJarInvalidManifest(FILENAME)).getManifest(),
-                includeInExceptions);
-        test(() -> new JarFile(createJarInvalidManifest("Verifying-" + FILENAME),
-                true).getManifest(), includeInExceptions);
+    static Stream<Callable<?>> manifests() {
+        Callable<?> jarName = () -> new JarFile(createJarInvalidManifest(FILENAME)).getManifest();
+        Callable<?> jarNameVerify = () -> new JarFile(createJarInvalidManifest("Verifying-" + FILENAME),
+                true).getManifest();
+        return Stream.of(
+                jarName,
+                jarNameVerify
+        );
     }
-
 }
 
diff --git a/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java b/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java
index 8009db75601..f33bd7a276f 100644
--- a/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java
+++ b/test/jdk/java/util/jar/Manifest/LineBreakLineWidth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,23 +21,22 @@
  * questions.
  */
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @test
  * @bug 6372077
- * @run testng LineBreakLineWidth
+ * @run junit LineBreakLineWidth
  * @summary write valid manifests with respect to line breaks
  *          and read any line width
  */
@@ -99,16 +98,10 @@ public class LineBreakLineWidth {
         assertMainAndSectionValues(mf, name, value);
     }
 
-    static void writeInvalidManifestThrowsException(String name, String value)
-            throws IOException {
-        try {
-            writeManifest(name, value);
-        } catch (IllegalArgumentException e) {
-            // no invalid manifest was produced which is considered acceptable
-            return;
-        }
-
-        fail("no error writing manifest considered invalid");
+    static void writeInvalidManifestThrowsException(String name, String value) {
+        // no invalid manifest was produced which is considered acceptable
+        assertThrows(IllegalArgumentException.class,
+                () -> writeManifest(name, value), "no error writing manifest considered invalid");
     }
 
     /**
@@ -278,8 +271,8 @@ public class LineBreakLineWidth {
         String mainValue = mf.getMainAttributes().getValue(name);
         String sectionValue = mf.getAttributes(name).getValue(name);
 
-        assertEquals(value, mainValue, "value different in main section");
-        assertEquals(value, sectionValue, "value different in named section");
+        assertEquals(mainValue, value, "value different in main section");
+        assertEquals(sectionValue, value, "value different in named section");
     }
 
 }
diff --git a/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java b/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java
index 28921bba868..cad0048f098 100644
--- a/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java
+++ b/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,6 @@
  * questions.
  */
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,13 +30,15 @@ import java.util.jar.Manifest;
 import java.util.List;
 import java.util.ArrayList;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @test
  * @bug 8066619 8351567
- * @run testng ValueUtf8Coding
+ * @run junit ValueUtf8Coding
  * @summary Tests encoding and decoding manifest header values to and from
  * UTF-8 with the complete Unicode character set.
  */ /*
@@ -187,11 +187,11 @@ public class ValueUtf8Coding {
             String value = values.get(i);
             Name name = azName(i);
 
-            assertEquals(mf.getMainAttributes().getValue(name), value,
+            assertEquals(value, mf.getMainAttributes().getValue(name),
                     "main attributes header value");
             Attributes attributes = mf.getAttributes(value);
             assertNotNull(attributes, "named section");
-            assertEquals(attributes.getValue(name), value,
+            assertEquals(value, attributes.getValue(name),
                     "named section attributes value");
         }
     }
diff --git a/test/jdk/java/util/jar/Manifest/WriteBinaryStructure.java b/test/jdk/java/util/jar/Manifest/WriteBinaryStructure.java
index 379de6b1adb..f91b518aa6c 100644
--- a/test/jdk/java/util/jar/Manifest/WriteBinaryStructure.java
+++ b/test/jdk/java/util/jar/Manifest/WriteBinaryStructure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,22 +21,22 @@
  * questions.
  */
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
 import java.util.jar.Manifest;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
 
-/**
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
  * @test
  * @bug 8066619
- * @run testng WriteBinaryStructure
  * @summary Tests that jar manifests are written in a particular structure
+ * @run junit WriteBinaryStructure
  */
 public class WriteBinaryStructure {
 
@@ -47,10 +47,11 @@ public class WriteBinaryStructure {
         mf.getMainAttributes().put(new Name("Key"), "Value");
         ByteArrayOutputStream buf = new ByteArrayOutputStream();
         mf.write(buf);
-        assertEquals(buf.toByteArray(), (
+        assertArrayEquals((
                 "Manifest-Version: 1.0\r\n" +
                 "Key: Value\r\n" +
-                "\r\n").getBytes(UTF_8));
+                "\r\n").getBytes(UTF_8),
+                buf.toByteArray());
     }
 
     @Test
@@ -62,12 +63,12 @@ public class WriteBinaryStructure {
         attributes.put(new Name("Key"), "Value");
         ByteArrayOutputStream buf = new ByteArrayOutputStream();
         mf.write(buf);
-        assertEquals(buf.toByteArray(), (
+        assertArrayEquals((
                 "Manifest-Version: 1.0\r\n" +
                 "\r\n" +
                 "Name: Individual-Section-Name\r\n" +
                 "Key: Value\r\n" +
-                "\r\n").getBytes(UTF_8));
+                "\r\n").getBytes(UTF_8),
+                buf.toByteArray());
     }
-
 }
diff --git a/test/jdk/java/util/jar/TestExtra.java b/test/jdk/java/util/jar/TestExtra.java
index fa6408ba570..776b5e67d14 100644
--- a/test/jdk/java/util/jar/TestExtra.java
+++ b/test/jdk/java/util/jar/TestExtra.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,180 +21,84 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6480504 6303183
  * @summary Test that client-provided data in the extra field is written and
  * read correctly, taking into account the JAR_MAGIC written into the extra
- * field of the first entry of JAR files.
- * @author Dave Bristor
+ * field of the first entry of JAR files. ZIP file specific.
+ * @run junit TestExtra
  */
 
+import org.junit.jupiter.api.Test;
+
 import java.io.*;
 import java.nio.charset.Charset;
-import java.util.Arrays;
+import java.nio.charset.StandardCharsets;
 import java.util.jar.*;
 import java.util.zip.*;
 
-/**
- * Tests that the get/set operations on extra data in zip and jar files work
- * as advertised.  The base class tests ZIP files, the member class
- * TestJarExtra checks JAR files.
- */
-public class TestExtra {
-    static final int JAR_MAGIC = 0xcafe; // private IN JarOutputStream.java
-    static final int TEST_HEADER = 0xbabe;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-    static final Charset ascii = Charset.forName("ASCII");
+// Tests that the get/set operations on extra data in ZIP files work as advertised.
+public class TestExtra {
+
+    static final int TEST_HEADER = 0xbabe;
+    static final Charset ascii = StandardCharsets.US_ASCII;
 
     // ZipEntry extra data
     static final byte[][] extra = new byte[][] {
-        ascii.encode("hello, world").array(),
-        ascii.encode("foo bar").array()
+            ascii.encode("hello, world").array(),
+            ascii.encode("foo bar").array()
     };
 
-    // For naming entries in JAR/ZIP streams
-    int count = 1;
+    // For naming entries in ZIP streams
+    static int count = 1;
 
     // Use byte arrays instead of files
-    ByteArrayOutputStream baos;
+    ByteArrayOutputStream baos  = new ByteArrayOutputStream();
 
-    // JAR/ZIP content written here.
-    ZipOutputStream zos;
+    // ZIP content written here.
+    ZipOutputStream zos = assertDoesNotThrow(() -> getOutputStream(baos));
 
-    public static void realMain(String[] args) throws Throwable{
-        new TestExtra().testHeaderPlusData();
-
-        new TestJarExtra().testHeaderPlusData();
-        new TestJarExtra().testHeaderOnly();
-        new TestJarExtra().testClientJarMagic();
-    }
-
-    TestExtra() {
-        try {
-            baos = new ByteArrayOutputStream();
-            zos = getOutputStream(baos);
-        } catch (Throwable t) {
-            unexpected(t);
-        }
-    }
-
-    /** Test that a header + data set by client works. */
+    // Test that a header + data set by client works.
+    @Test
     void testHeaderPlusData() throws IOException {
         for (byte[] b : extra) {
             ZipEntry ze = getEntry();
             byte[] data = new byte[b.length + 4];
             set16(data, 0, TEST_HEADER);
             set16(data, 2, b.length);
-            for (int i = 0; i < b.length; i++) {
-                data[i + 4] = b[i];
-            }
+            System.arraycopy(b, 0, data, 4, b.length);
             ze.setExtra(data);
             zos.putNextEntry(ze);
         }
         zos.close();
-
         ZipInputStream zis = getInputStream();
-
         ZipEntry ze = zis.getNextEntry();
         checkEntry(ze, 0, extra[0].length);
-
         ze = zis.getNextEntry();
         checkEntry(ze, 1, extra[1].length);
     }
 
-    /** Test that a header only (i.e., no extra "data") set by client works. */
-    void testHeaderOnly() throws IOException {
-        ZipEntry ze = getEntry();
-        byte[] data = new byte[4];
-        set16(data, 0, TEST_HEADER);
-        set16(data, 2, 0); // Length of data is 0.
-        ze.setExtra(data);
-        zos.putNextEntry(ze);
-
-        zos.close();
-
-        ZipInputStream zis = getInputStream();
-
-        ze = zis.getNextEntry();
-        checkExtra(data, ze.getExtra());
-        checkEntry(ze, 0, 0);
-    }
-
-    /** Tests the client providing extra data which uses JAR_MAGIC header. */
-    void testClientJarMagic() throws IOException {
-        ZipEntry ze = getEntry();
-        byte[] data = new byte[8];
-
-        set16(data, 0, TEST_HEADER);
-        set16(data, 2, 0); // Length of data is 0.
-        set16(data, 4, JAR_MAGIC);
-        set16(data, 6, 0); // Length of data is 0.
-
-        ze.setExtra(data);
-        zos.putNextEntry(ze);
-
-        zos.close();
-
-        ZipInputStream zis = getInputStream();
-        ze = zis.getNextEntry();
-        byte[] e = ze.getExtra();
-        checkExtra(data, ze.getExtra());
-        checkEntry(ze, 0, 0);
-    }
-
-    // check if all "expected" extra fields equal to their
-    // corresponding fields in "extra". The "extra" might have
-    // timestamp fields added by ZOS.
-    static void checkExtra(byte[] expected, byte[] extra) {
-        if (expected == null)
-            return;
-        int off = 0;
-        int len = expected.length;
-        while (off + 4 < len) {
-            int tag = get16(expected, off);
-            int sz = get16(expected, off + 2);
-            int off0 = 0;
-            int len0 = extra.length;
-            boolean matched = false;
-            while (off0 + 4 < len0) {
-                int tag0 = get16(extra, off0);
-                int sz0 = get16(extra, off0 + 2);
-                if (tag == tag0 && sz == sz0) {
-                    matched = true;
-                    for (int i = 0; i < sz; i++) {
-                        if (expected[off + i] != extra[off0 +i])
-                            matched = false;
-                    }
-                    break;
-                }
-                off0 += (4 + sz0);
-            }
-            if (!matched) {
-                fail("Expected extra data [tag=" + tag + "sz=" + sz + "] check failed");
-            }
-            off += (4 + sz);
-        }
-    }
-
-    /** Check that the entry's extra data is correct. */
+    // Check that the entry's extra data is correct.
     void checkEntry(ZipEntry ze, int count, int dataLength) {
         byte[] extraData = ze.getExtra();
         byte[] data = getField(TEST_HEADER, extraData);
-        if (!check(data != null, "unexpected null data for TEST_HEADER")) {
-            return;
-        }
-
+        assertNotNull(data, "unexpected null data for TEST_HEADER");
         if (dataLength == 0) {
-            check(data.length == 0, "unexpected non-zero data length for TEST_HEADER");
+            assertEquals(0, data.length, "unexpected non-zero data length for TEST_HEADER");
         } else {
-            check(Arrays.equals(extra[count], data),
-                  "failed to get entry " + ze.getName()
-                  + ", expected " + new String(extra[count]) + ", got '" + new String(data) + "'");
+            assertArrayEquals(data, extra[count],
+                    "failed to get entry " + ze.getName()
+                            + ", expected " + new String(extra[count]) + ", got '" + new String(data) + "'");
         }
     }
 
-    /** Look up descriptor in data, returning corresponding byte[]. */
+    // Look up descriptor in data, returning corresponding byte[].
     static byte[] getField(int descriptor, byte[] data) {
         byte[] rc = null;
         try {
@@ -218,69 +122,23 @@ public class TestExtra {
 
     ZipInputStream getInputStream() {
         return new ZipInputStream(
-            new ByteArrayInputStream(baos.toByteArray()));
+                new ByteArrayInputStream(baos.toByteArray()));
     }
 
-    ZipOutputStream getOutputStream(ByteArrayOutputStream baos) throws IOException {
+    ZipOutputStream getOutputStream(ByteArrayOutputStream baos) {
         return new ZipOutputStream(baos);
     }
 
-    ZipInputStream getInputStream(ByteArrayInputStream bais) throws IOException {
-        return new ZipInputStream(bais);
+    ZipEntry getEntry() {
+        return new ZipEntry("zip" + count++ + ".txt");
     }
 
-    ZipEntry getEntry() { return new ZipEntry("zip" + count++ + ".txt"); }
-
-
-    private static int get16(byte[] b, int off) {
-        return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8);
+    static int get16(byte[] b, int off) {
+        return (b[off] & 0xff) | ((b[off + 1] & 0xff) << 8);
     }
 
-    private static void set16(byte[] b, int off, int value) {
-        b[off+0] = (byte)value;
-        b[off+1] = (byte)(value >> 8);
+    static void set16(byte[] b, int off, int value) {
+        b[off + 0] = (byte) value;
+        b[off + 1] = (byte) (value >> 8);
     }
-
-    /** Test extra field of a JAR file. */
-    static class TestJarExtra extends TestExtra {
-        ZipOutputStream getOutputStream(ByteArrayOutputStream baos) throws IOException {
-            return new JarOutputStream(baos);
-        }
-
-        ZipInputStream getInputStream(ByteArrayInputStream bais) throws IOException {
-            return new JarInputStream(bais);
-        }
-
-        ZipEntry getEntry() { return new ZipEntry("jar" + count++ + ".txt"); }
-
-        void checkEntry(ZipEntry ze, int count, int dataLength) {
-            // zeroth entry should have JAR_MAGIC
-            if (count == 0) {
-                byte[] extraData = ze.getExtra();
-                byte[] data = getField(JAR_MAGIC, extraData);
-                if (!check(data != null, "unexpected null data for JAR_MAGIC")) {
-                    check(data.length != 0, "unexpected non-zero data length for JAR_MAGIC");
-                }
-            }
-            // In a jar file, the first ZipEntry should have both JAR_MAGIC
-            // and the TEST_HEADER, so check that also.
-            super.checkEntry(ze, count, dataLength);
-        }
-    }
-
-    //--------------------- Infrastructure ---------------------------
-    static volatile int passed = 0, failed = 0;
-    static void pass() {passed++;}
-    static void fail() {failed++; Thread.dumpStack();}
-    static void fail(String msg) {System.out.println(msg); fail();}
-    static void unexpected(Throwable t) {failed++; t.printStackTrace();}
-    static void check(boolean cond) {if (cond) pass(); else fail();}
-    static boolean check(boolean cond, String msg) {if (cond) pass(); else fail(msg); return cond; }
-    static void equal(Object x, Object y) {
-        if (x == null ? y == null : x.equals(y)) pass();
-        else fail(x + " not equal to " + y);}
-    public static void main(String[] args) throws Throwable {
-        try {realMain(args);} catch (Throwable t) {unexpected(t);}
-        System.out.println("\nPassed = " + passed + " failed = " + failed);
-        if (failed > 0) throw new Error("Some tests failed");}
 }
diff --git a/test/jdk/java/util/jar/TestJarExtra.java b/test/jdk/java/util/jar/TestJarExtra.java
new file mode 100644
index 00000000000..6619727bfe8
--- /dev/null
+++ b/test/jdk/java/util/jar/TestJarExtra.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6480504 6303183
+ * @summary Test that client-provided data in the extra field is written and
+ * read correctly, taking into account the JAR_MAGIC written into the extra
+ * field of the first entry of JAR files. Jar file specific.
+ * @run junit TestJarExtra
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+// Tests that the get/set operations on extra data in JAR files work as advertised.
+public class TestJarExtra {
+
+    static final int JAR_MAGIC = 0xcafe; // private IN JarOutputStream.java
+    static final int TEST_HEADER = 0xbabe;
+    // For naming entries in JAR streams
+    static int count = 1;
+    static final Charset ascii = StandardCharsets.US_ASCII;
+    // ZipEntry extra data
+    static final byte[][] extra = new byte[][] {
+            ascii.encode("hello, world").array(),
+            ascii.encode("foo bar").array()
+    };
+
+    // Use byte arrays instead of files
+    ByteArrayOutputStream baos  = new ByteArrayOutputStream();
+
+    // JAR content written here.
+    JarOutputStream jos = assertDoesNotThrow(() -> getOutputStream(baos));
+
+    // Test that a header + data set by client works.
+    @Test
+    void testHeaderPlusData() throws IOException {
+        for (byte[] b : extra) {
+            ZipEntry ze = getEntry();
+            byte[] data = new byte[b.length + 4];
+            set16(data, 0, TEST_HEADER);
+            set16(data, 2, b.length);
+            System.arraycopy(b, 0, data, 4, b.length);
+            ze.setExtra(data);
+            jos.putNextEntry(ze);
+        }
+        jos.close();
+        ZipInputStream zis = getInputStream();
+        ZipEntry ze = zis.getNextEntry();
+        checkEntry(ze, 0, extra[0].length);
+        ze = zis.getNextEntry();
+        checkEntry(ze, 1, extra[1].length);
+    }
+
+    // Test that a header only (i.e., no extra "data") set by client works.
+    @Test
+    void testHeaderOnly() throws IOException {
+        ZipEntry ze = getEntry();
+        byte[] data = new byte[4];
+        set16(data, 0, TEST_HEADER);
+        set16(data, 2, 0); // Length of data is 0.
+        ze.setExtra(data);
+        jos.putNextEntry(ze);
+        jos.close();
+        ZipInputStream zis = getInputStream();
+        ze = zis.getNextEntry();
+        checkExtra(data, ze.getExtra());
+        checkEntry(ze, 0, 0);
+    }
+
+    // Tests the client providing extra data which uses JAR_MAGIC header.
+    @Test
+    void testClientJarMagic() throws IOException {
+        ZipEntry ze = getEntry();
+        byte[] data = new byte[8];
+        set16(data, 0, TEST_HEADER);
+        set16(data, 2, 0); // Length of data is 0.
+        set16(data, 4, JAR_MAGIC);
+        set16(data, 6, 0); // Length of data is 0.
+        ze.setExtra(data);
+        jos.putNextEntry(ze);
+        jos.close();
+        ZipInputStream zis = getInputStream();
+        ze = zis.getNextEntry();
+        byte[] e = ze.getExtra();
+        checkExtra(data, ze.getExtra());
+        checkEntry(ze, 0, 0);
+    }
+
+    JarOutputStream getOutputStream(ByteArrayOutputStream baos) throws IOException {
+        return new JarOutputStream(baos);
+    }
+
+    ZipInputStream getInputStream() {
+        return new ZipInputStream(
+                new ByteArrayInputStream(baos.toByteArray()));
+    }
+
+    ZipEntry getEntry() {
+        return new ZipEntry("jar" + count++ + ".txt");
+    }
+
+    // check if all "expected" extra fields equal to their
+    // corresponding fields in "extra". The "extra" might have
+    // timestamp fields added by ZOS.
+    static void checkExtra(byte[] expected, byte[] extra) {
+        if (expected == null)
+            return;
+        int off = 0;
+        int len = expected.length;
+        while (off + 4 < len) {
+            int tag = get16(expected, off);
+            int sz = get16(expected, off + 2);
+            int off0 = 0;
+            int len0 = extra.length;
+            boolean matched = false;
+            while (off0 + 4 < len0) {
+                int tag0 = get16(extra, off0);
+                int sz0 = get16(extra, off0 + 2);
+                if (tag == tag0 && sz == sz0) {
+                    matched = true;
+                    for (int i = 0; i < sz; i++) {
+                        if (expected[off + i] != extra[off0 + i])
+                            matched = false;
+                    }
+                    break;
+                }
+                off0 += (4 + sz0);
+            }
+            if (!matched) {
+                fail("Expected extra data [tag=" + tag + "sz=" + sz + "] check failed");
+            }
+            off += (4 + sz);
+        }
+    }
+
+    void checkEntry(ZipEntry ze, int count, int dataLength) {
+        // zeroth entry should have JAR_MAGIC
+        if (count == 0) {
+            byte[] extraData = ze.getExtra();
+            byte[] data = getField(JAR_MAGIC, extraData);
+            assertNotNull(data, "unexpected null data for JAR_MAGIC");
+            assertEquals(0, data.length, "unexpected non-zero data length for JAR_MAGIC");
+        }
+        // In a JAR file, the first ZipEntry should have both JAR_MAGIC
+        // and the TEST_HEADER, so check that also.
+        byte[] extraData = ze.getExtra();
+        byte[] data = getField(TEST_HEADER, extraData);
+        assertNotNull(data, "unexpected null data for TEST_HEADER");
+        if (dataLength == 0) {
+            assertEquals(0, data.length, "unexpected non-zero data length for TEST_HEADER");
+        } else {
+            assertArrayEquals(data, extra[count],
+                    "failed to get entry " + ze.getName()
+                            + ", expected " + new String(extra[count]) + ", got '" + new String(data) + "'");
+        }
+    }
+
+    // Look up descriptor in data, returning corresponding byte[].
+    static byte[] getField(int descriptor, byte[] data) {
+        byte[] rc = null;
+        try {
+            int i = 0;
+            while (i < data.length) {
+                if (get16(data, i) == descriptor) {
+                    int length = get16(data, i + 2);
+                    rc = new byte[length];
+                    for (int j = 0; j < length; j++) {
+                        rc[j] = data[i + 4 + j];
+                    }
+                    return rc;
+                }
+                i += get16(data, i + 2) + 4;
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            // descriptor not found
+        }
+        return rc;
+    }
+
+    static int get16(byte[] b, int off) {
+        return (b[off] & 0xff) | ((b[off + 1] & 0xff) << 8);
+    }
+
+    static void set16(byte[] b, int off, int value) {
+        b[off + 0] = (byte) value;
+        b[off + 1] = (byte) (value >> 8);
+    }
+}
diff --git a/test/jdk/java/util/logging/ParentLoggersTest.java b/test/jdk/java/util/logging/ParentLoggersTest.java
index 9150675c017..8aae7e95d74 100644
--- a/test/jdk/java/util/logging/ParentLoggersTest.java
+++ b/test/jdk/java/util/logging/ParentLoggersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     6498300
+ * @bug     6498300 8377457
  *
  * @summary regression: parent loggers are not properly registered
  * @author  ss45998
@@ -77,6 +77,8 @@ public class ParentLoggersTest {
                 initialLoggerNames.add(logger);
             }
         }
+        System.out.println("# default loggers are: " + defaultLoggers);
+        System.out.println("# initial loggers are: " + initialLoggerNames);
 
         String tstSrc = System.getProperty(TST_SRC_PROP);
         File   fname  = new File(tstSrc, LM_PROP_FNAME);
@@ -131,7 +133,10 @@ public class ParentLoggersTest {
             }
 
         }
-        System.out.println(returnedLoggerNames);
+        System.out.println("# Created loggers are: " +
+                createdLoggers.stream().map(Logger::getName).toList());
+        System.out.println("# Expected loggers are: " + expectedLoggerNames);
+        System.out.println("# Returned loggers are: " + returnedLoggerNames);
         return checkNames(expectedLoggerNames, returnedLoggerNames, failMsg);
     }
 
diff --git a/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java b/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
index af314581a9e..992d5b98fb9 100644
--- a/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
+++ b/test/jdk/java/util/zip/CloseInflaterDeflaterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,29 @@
  * @test
  * @bug 8193682 8278794 8284771
  * @summary Test Infinite loop while writing on closed Deflater and Inflater.
- * @run testng CloseInflaterDeflaterTest
+ * @run junit CloseInflaterDeflaterTest
  */
-import java.io.*;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Random;
 import java.util.jar.JarOutputStream;
+import java.util.stream.Stream;
 import java.util.zip.DeflaterInputStream;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.InflaterOutputStream;
-import java.util.zip.ZipOutputStream;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertThrows;
-
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class CloseInflaterDeflaterTest {
 
@@ -75,36 +81,28 @@ public class CloseInflaterDeflaterTest {
     private static Random rand = new Random();
 
     /**
-     * DataProvider to specify whether to use close() or finish() of OutputStream
+     * MethodSource to specify whether to use close() or finish() of OutputStream
      *
-     * @return Entry object indicating which method to use for closing OutputStream
+     * @return Stream indicating which method to use for closing OutputStream
      */
-    @DataProvider
-    public Object[][] testOutputStreams() {
-     return new Object[][] {
-      { true },
-      { false },
-     };
+    public static Stream<Boolean> testOutputStreams() {
+        return Stream.of(true, false);
     }
 
     /**
-     * DataProvider to specify on which outputstream closeEntry() has to be called
+     * MethodSource to specify on which outputstream closeEntry() has to be called
      *
-     * @return Entry object returning either JarOutputStream or ZipOutputStream
+     * @return Stream consisting of either a JarOutputStream or ZipOutputStream
      */
-    @DataProvider
-    public Object[][] testZipAndJar() throws IOException{
-     return new Object[][] {
-      { new JarOutputStream(outStream)},
-      { new ZipOutputStream(outStream)},
-     };
+    public static Stream<ZipOutputStream> testZipAndJar() throws IOException{
+        return Stream.of(new JarOutputStream(outStream), new ZipOutputStream(outStream));
     }
 
     /**
      * Add inputBytes array with random bytes to write into OutputStream
      */
-    @BeforeTest
-    public void before_test()
+    @BeforeAll
+    public static void before_test()
     {
        rand.nextBytes(inputBytes);
     }
@@ -115,7 +113,8 @@ public class CloseInflaterDeflaterTest {
      * @param useCloseMethod indicates whether to use Close() or finish() method
      * @throws IOException if an error occurs
      */
-    @Test(dataProvider = "testOutputStreams")
+    @ParameterizedTest
+    @MethodSource("testOutputStreams")
     public void testGZip(boolean useCloseMethod) throws IOException {
         GZIPOutputStream gzip = new GZIPOutputStream(outStream);
         gzip.write(inputBytes, 0, INPUT_LENGTH);
@@ -137,7 +136,8 @@ public class CloseInflaterDeflaterTest {
      * @param useCloseMethod indicates whether to use Close() or finish() method
      * @throws IOException if an error occurs
      */
-    @Test(dataProvider = "testOutputStreams")
+    @ParameterizedTest
+    @MethodSource("testOutputStreams")
     public void testDeflaterOutputStream(boolean useCloseMethod) throws IOException {
         DeflaterOutputStream def = new DeflaterOutputStream(outStream);
         assertThrows(IOException.class , () -> def.write(inputBytes, 0, INPUT_LENGTH));
@@ -175,7 +175,9 @@ public class CloseInflaterDeflaterTest {
      * @param useCloseMethod indicates whether to use Close() or finish() method
      * @throws IOException if an error occurs
      */
-    @Test(dataProvider = "testOutputStreams",enabled=false)
+    @Disabled
+    @ParameterizedTest
+    @MethodSource("testOutputStreams")
     public void testInflaterOutputStream(boolean useCloseMethod) throws IOException {
         InflaterOutputStream inf = new InflaterOutputStream(outStream);
         assertThrows(IOException.class , () -> inf.write(inputBytes, 0, INPUT_LENGTH));
@@ -197,7 +199,8 @@ public class CloseInflaterDeflaterTest {
      * @param zip will be the instance of either JarOutputStream or ZipOutputStream
      * @throws IOException if an error occurs
      */
-    @Test(dataProvider = "testZipAndJar")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("testZipAndJar")
     public void testZipCloseEntry(ZipOutputStream zip) throws IOException {
         assertThrows(IOException.class , () -> zip.putNextEntry(new ZipEntry("")));
         zip.write(inputBytes, 0, INPUT_LENGTH);
diff --git a/test/jdk/java/util/zip/DeflaterDictionaryTests.java b/test/jdk/java/util/zip/DeflaterDictionaryTests.java
index 570de5408ee..56d5ef24200 100644
--- a/test/jdk/java/util/zip/DeflaterDictionaryTests.java
+++ b/test/jdk/java/util/zip/DeflaterDictionaryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,23 +21,26 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.stream.IntStream;
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @test
  * @bug 8252739
  * @summary Verify Deflater.setDictionary(dictionary, offset, length) uses the offset
- * @run testng/othervm DeflaterDictionaryTests
+ * @run junit/othervm DeflaterDictionaryTests
  */
 public class DeflaterDictionaryTests {
     // Output buffer size
@@ -50,31 +53,21 @@ public class DeflaterDictionaryTests {
     private static final int DICTIONARY_LENGTH = 3;
 
     /**
-     * DataProvider with offsets which should be valid for setDictionary
+     * MethodSource with offsets which should be valid for setDictionary
      *
-     * @return valid offset values
+     * @return Stream of valid offset values
      */
-    @DataProvider(name = "validDictionaryOffsets")
-    protected Object[][] validDictionaryOffsets() {
-        return new Object[][]{
-                {0},
-                {DICTIONARY_OFFSET},
-                {DICTIONARY_LENGTH}
-        };
+    protected static IntStream validDictionaryOffsets() {
+        return IntStream.of(0, DICTIONARY_OFFSET, DICTIONARY_LENGTH);
     }
 
     /**
-     * DataProvider with  invalid offsets for setDictionary
+     * MethodSource with invalid offsets for setDictionary
      *
-     * @return invalid offset values
+     * @return Stream of invalid offset values
      */
-    @DataProvider(name = "invalidDictionaryOffsets")
-    protected Object[][] invalidDictionaryOffsets() {
-        return new Object[][]{
-                {-1},
-                {DICTIONARY_LENGTH + 2},
-                {DICTIONARY.length()}
-        };
+    protected static IntStream invalidDictionaryOffsets() {
+        return IntStream.of(-1, DICTIONARY_LENGTH + 2, DICTIONARY.length());
     }
 
     /**
@@ -83,7 +76,8 @@ public class DeflaterDictionaryTests {
      * @param dictionary_offset offset value to be used
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validDictionaryOffsets")
+    @ParameterizedTest
+    @MethodSource("validDictionaryOffsets")
     public void testByteArray(int dictionary_offset) throws Exception {
         byte[] input = SRC_DATA.getBytes(UTF_8);
         byte[] output = new byte[RESULT_SIZE];
@@ -115,8 +109,8 @@ public class DeflaterDictionaryTests {
             System.out.printf("Inflater::getAdler:%d, length: %d%n",
                     inflater.getAdler(), resultLength);
 
-            Assert.assertEquals(SRC_DATA.length(), resultLength);
-            Assert.assertEquals(input, Arrays.copyOf(result, resultLength));
+            assertEquals(SRC_DATA.length(), resultLength);
+            assertArrayEquals(input, Arrays.copyOf(result, resultLength));
         } finally {
             // Release Resources
             deflater.end();
@@ -163,8 +157,8 @@ public class DeflaterDictionaryTests {
             System.out.printf("Inflater::getAdler:%d, length: %d%n",
                     inflater.getAdler(), resultLength);
 
-            Assert.assertEquals(SRC_DATA.length(), resultLength);
-            Assert.assertEquals(input, Arrays.copyOf(result, resultLength));
+            assertEquals(resultLength, SRC_DATA.length());
+            assertArrayEquals(Arrays.copyOf(result, resultLength), input);
         } finally {
             // Release Resources
             deflater.end();
@@ -217,8 +211,8 @@ public class DeflaterDictionaryTests {
             System.out.printf("Inflater::getAdler:%d, length: %d%n",
                     inflater.getAdler(), resultLength);
 
-            Assert.assertEquals(SRC_DATA.length(), resultLength);
-            Assert.assertEquals(input, Arrays.copyOf(result, resultLength));
+            assertEquals(resultLength, SRC_DATA.length());
+            assertArrayEquals(Arrays.copyOf(result, resultLength), input);
         } finally {
             // Release Resources
             deflater.end();
@@ -232,7 +226,8 @@ public class DeflaterDictionaryTests {
      *
      * @param dictionary_offset offset value to be used
      */
-    @Test(dataProvider = "invalidDictionaryOffsets")
+    @ParameterizedTest
+    @MethodSource("invalidDictionaryOffsets")
     public void testInvalidOffsets(int dictionary_offset) {
         byte[] dictionary = DICTIONARY.getBytes(UTF_8);
 
diff --git a/test/jdk/java/util/zip/GZIP/GZIPOutputStreamHeaderTest.java b/test/jdk/java/util/zip/GZIP/GZIPOutputStreamHeaderTest.java
index 93c2e91fea8..5fdad3d3b07 100644
--- a/test/jdk/java/util/zip/GZIP/GZIPOutputStreamHeaderTest.java
+++ b/test/jdk/java/util/zip/GZIP/GZIPOutputStreamHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,7 @@
  * questions.
  */
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -30,12 +29,15 @@ import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 /**
  * @test
  * @bug 8244706
  * @summary Verify that the OS header flag in the stream written out by java.util.zip.GZIPOutputStream
  * has the correct expected value
- * @run testng GZIPOutputStreamHeaderTest
+ * @run junit GZIPOutputStreamHeaderTest
  */
 public class GZIPOutputStreamHeaderTest {
 
@@ -54,8 +56,8 @@ public class GZIPOutputStreamHeaderTest {
             gzipOutputStream.write(data.getBytes(StandardCharsets.UTF_8));
         }
         final byte[] compressed = baos.toByteArray();
-        Assert.assertNotNull(compressed, "Compressed data is null");
-        Assert.assertEquals(toUnsignedByte(compressed[OS_HEADER_INDEX]), HEADER_VALUE_OS_UNKNOWN,
+        assertNotNull(compressed, "Compressed data is null");
+        assertEquals(HEADER_VALUE_OS_UNKNOWN, toUnsignedByte(compressed[OS_HEADER_INDEX]),
                 "Unexpected value for OS header");
         // finally verify that the compressed data is readable back to the original
         final String uncompressed;
@@ -65,7 +67,7 @@ public class GZIPOutputStreamHeaderTest {
             gzipInputStream.transferTo(os);
             uncompressed = new String(os.toByteArray(), StandardCharsets.UTF_8);
         }
-        Assert.assertEquals(uncompressed, data, "Unexpected data read from GZIPInputStream");
+        assertEquals(data, uncompressed, "Unexpected data read from GZIPInputStream");
     }
 
     private static int toUnsignedByte(final byte b) {
diff --git a/test/jdk/java/util/zip/ZipFile/EndOfCenValidation.java b/test/jdk/java/util/zip/ZipFile/EndOfCenValidation.java
index 7adcfb9c128..7ca71c9890a 100644
--- a/test/jdk/java/util/zip/ZipFile/EndOfCenValidation.java
+++ b/test/jdk/java/util/zip/ZipFile/EndOfCenValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,33 +25,26 @@
  * @bug 8272746
  * @modules java.base/jdk.internal.util
  * @summary Verify that ZipFile rejects files with CEN sizes exceeding the implementation limit
+ * @library /test/lib
+ * @build jdk.test.lib.util.ZipUtils
  * @run junit/othervm EndOfCenValidation
  */
 
 import jdk.internal.util.ArraysSupport;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HexFormat;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static jdk.test.lib.util.ZipUtils.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * This test augments {@link TestTooManyEntries}. It creates sparse ZIPs where
@@ -65,36 +58,13 @@ import static org.junit.jupiter.api.Assertions.*;
 public class EndOfCenValidation {
 
     // Zip files produced by this test
-    public static final Path CEN_TOO_LARGE_ZIP = Path.of("cen-size-too-large.zip");
-    public static final Path INVALID_CEN_SIZE = Path.of("invalid-zen-size.zip");
-    public static final Path BAD_CEN_OFFSET_ZIP = Path.of("bad-cen-offset.zip");
-    // Some ZipFile constants for manipulating the 'End of central directory record' (END header)
-    private static final int ENDHDR = ZipFile.ENDHDR; // End of central directory record size
-    private static final int ENDSIZ = ZipFile.ENDSIZ; // Offset of CEN size field within ENDHDR
-    private static final int ENDOFF = ZipFile.ENDOFF; // Offset of CEN offset field within ENDHDR
+    static final Path CEN_TOO_LARGE_ZIP = Path.of("cen-size-too-large.zip");
+    static final Path INVALID_CEN_SIZE = Path.of("invalid-zen-size.zip");
+    static final Path BAD_CEN_OFFSET_ZIP = Path.of("bad-cen-offset.zip");
+    static final Path BAD_ENTRY_COUNT_ZIP = Path.of("bad-entry-count.zip");
+
     // Maximum allowed CEN size allowed by ZipFile
-    private static final int MAX_CEN_SIZE = ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
-
-    // Expected message when CEN size does not match file size
-    private static final String INVALID_CEN_BAD_SIZE = "invalid END header (bad central directory size)";
-    // Expected message when CEN offset is too large
-    private static final String INVALID_CEN_BAD_OFFSET = "invalid END header (bad central directory offset)";
-    // Expected message when CEN size is too large
-    private static final String INVALID_CEN_SIZE_TOO_LARGE = "invalid END header (central directory size too large)";
-    // Expected message when total entry count is too large
-    private static final String INVALID_BAD_ENTRY_COUNT = "invalid END header (total entries count too large)";
-
-    // A valid ZIP file, used as a template
-    private byte[] zipBytes;
-
-    /**
-     * Create a valid ZIP file, used as a template
-     * @throws IOException if an error occurs
-     */
-    @BeforeEach
-    public void setup() throws IOException {
-        zipBytes = templateZip();
-    }
+    static final int MAX_CEN_SIZE = ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
 
     /**
      * Delete big files after test, in case the file system did not support sparse files.
@@ -105,6 +75,7 @@ public class EndOfCenValidation {
         Files.deleteIfExists(CEN_TOO_LARGE_ZIP);
         Files.deleteIfExists(INVALID_CEN_SIZE);
         Files.deleteIfExists(BAD_CEN_OFFSET_ZIP);
+        Files.deleteIfExists(BAD_ENTRY_COUNT_ZIP);
     }
 
     /**
@@ -115,14 +86,8 @@ public class EndOfCenValidation {
     @Test
     public void shouldRejectTooLargeCenSize() throws IOException {
         int size = MAX_CEN_SIZE + 1;
-
         Path zip = zipWithModifiedEndRecord(size, true, 0, CEN_TOO_LARGE_ZIP);
-
-        ZipException ex = assertThrows(ZipException.class, () -> {
-            new ZipFile(zip.toFile());
-        });
-
-        assertEquals(INVALID_CEN_SIZE_TOO_LARGE, ex.getMessage());
+        verifyRejection(zip, INVALID_CEN_SIZE_TOO_LARGE);
     }
 
     /**
@@ -133,16 +98,9 @@ public class EndOfCenValidation {
      */
     @Test
     public void shouldRejectInvalidCenSize() throws IOException {
-
         int size = MAX_CEN_SIZE;
-
         Path zip = zipWithModifiedEndRecord(size, false, 0, INVALID_CEN_SIZE);
-
-        ZipException ex = assertThrows(ZipException.class, () -> {
-            new ZipFile(zip.toFile());
-        });
-
-        assertEquals(INVALID_CEN_BAD_SIZE, ex.getMessage());
+        verifyRejection(zip, INVALID_CEN_BAD_SIZE);
     }
 
     /**
@@ -153,16 +111,9 @@ public class EndOfCenValidation {
      */
     @Test
     public void shouldRejectInvalidCenOffset() throws IOException {
-
         int size = MAX_CEN_SIZE;
-
         Path zip = zipWithModifiedEndRecord(size, true, 100, BAD_CEN_OFFSET_ZIP);
-
-        ZipException ex = assertThrows(ZipException.class, () -> {
-            new ZipFile(zip.toFile());
-        });
-
-        assertEquals(INVALID_CEN_BAD_OFFSET, ex.getMessage());
+        verifyRejection(zip, INVALID_CEN_BAD_OFFSET);
     }
 
     /**
@@ -181,192 +132,20 @@ public class EndOfCenValidation {
             Long.MAX_VALUE        // Unreasonably large
     })
     public void shouldRejectBadTotalEntries(long totalEntries) throws IOException {
-        /**
-         * A small ZIP using the ZIP64 format.
-         *
-         * ZIP created using: "echo -n hello | zip zip64.zip -"
-         * Hex encoded using: "cat zip64.zip | xxd -ps"
-         *
-         * The file has the following structure:
-         *
-         * 0000 LOCAL HEADER #1       04034B50
-         * 0004 Extract Zip Spec      2D '4.5'
-         * 0005 Extract OS            00 'MS-DOS'
-         * 0006 General Purpose Flag  0000
-         * 0008 Compression Method    0000 'Stored'
-         * 000A Last Mod Time         5947AB78 'Mon Oct  7 21:27:48 2024'
-         * 000E CRC                   363A3020
-         * 0012 Compressed Length     FFFFFFFF
-         * 0016 Uncompressed Length   FFFFFFFF
-         * 001A Filename Length       0001
-         * 001C Extra Length          0014
-         * 001E Filename              '-'
-         * 001F Extra ID #0001        0001 'ZIP64'
-         * 0021   Length              0010
-         * 0023   Uncompressed Size   0000000000000006
-         * 002B   Compressed Size     0000000000000006
-         * 0033 PAYLOAD               hello.
-         *
-         * 0039 CENTRAL HEADER #1     02014B50
-         * 003D Created Zip Spec      1E '3.0'
-         * 003E Created OS            03 'Unix'
-         * 003F Extract Zip Spec      2D '4.5'
-         * 0040 Extract OS            00 'MS-DOS'
-         * 0041 General Purpose Flag  0000
-         * 0043 Compression Method    0000 'Stored'
-         * 0045 Last Mod Time         5947AB78 'Mon Oct  7 21:27:48 2024'
-         * 0049 CRC                   363A3020
-         * 004D Compressed Length     00000006
-         * 0051 Uncompressed Length   FFFFFFFF
-         * 0055 Filename Length       0001
-         * 0057 Extra Length          000C
-         * 0059 Comment Length        0000
-         * 005B Disk Start            0000
-         * 005D Int File Attributes   0001
-         *      [Bit 0]               1 Text Data
-         * 005F Ext File Attributes   11B00000
-         * 0063 Local Header Offset   00000000
-         * 0067 Filename              '-'
-         * 0068 Extra ID #0001        0001 'ZIP64'
-         * 006A   Length              0008
-         * 006C   Uncompressed Size   0000000000000006
-         *
-         * 0074 ZIP64 END CENTRAL DIR 06064B50
-         *      RECORD
-         * 0078 Size of record        000000000000002C
-         * 0080 Created Zip Spec      1E '3.0'
-         * 0081 Created OS            03 'Unix'
-         * 0082 Extract Zip Spec      2D '4.5'
-         * 0083 Extract OS            00 'MS-DOS'
-         * 0084 Number of this disk   00000000
-         * 0088 Central Dir Disk no   00000000
-         * 008C Entries in this disk  0000000000000001
-         * 0094 Total Entries         0000000000000001
-         * 009C Size of Central Dir   000000000000003B
-         * 00A4 Offset to Central dir 0000000000000039
-         *
-         * 00AC ZIP64 END CENTRAL DIR 07064B50
-         *      LOCATOR
-         * 00B0 Central Dir Disk no   00000000
-         * 00B4 Offset to Central dir 0000000000000074
-         * 00BC Total no of Disks     00000001
-         *
-         * 00C0 END CENTRAL HEADER    06054B50
-         * 00C4 Number of this disk   0000
-         * 00C6 Central Dir Disk no   0000
-         * 00C8 Entries in this disk  0001
-         * 00CA Total Entries         0001
-         * 00CC Size of Central Dir   0000003B
-         * 00D0 Offset to Central Dir FFFFFFFF
-         * 00D4 Comment Length        0000
-         */
+        Path zip = zip64WithModifiedTotalEntries(BAD_ENTRY_COUNT_ZIP, totalEntries);
+        verifyRejection(zip, INVALID_BAD_ENTRY_COUNT);
+    }
 
-        byte[] zipBytes = HexFormat.of().parseHex("""
-                504b03042d000000000078ab475920303a36ffffffffffffffff01001400
-                2d010010000600000000000000060000000000000068656c6c6f0a504b01
-                021e032d000000000078ab475920303a3606000000ffffffff01000c0000
-                00000001000000b011000000002d010008000600000000000000504b0606
-                2c000000000000001e032d00000000000000000001000000000000000100
-                0000000000003b000000000000003900000000000000504b060700000000
-                740000000000000001000000504b050600000000010001003b000000ffff
-                ffff0000
-                """.replaceAll("\n",""));
-
-        // Buffer to manipulate the above ZIP
-        ByteBuffer buf = ByteBuffer.wrap(zipBytes).order(ByteOrder.LITTLE_ENDIAN);
-        // Offset of the 'total entries' in the 'ZIP64 END CENTRAL DIR' record
-        // Update ZIP64 entry count to a value which cannot possibly fit in the small CEN
-        buf.putLong(0x94, totalEntries);
-        // The corresponding END field needs the ZIP64 magic value
-        buf.putShort(0xCA, (short) 0xFFFF);
-        // Write the ZIP to disk
-        Path zipFile = Path.of("bad-entry-count.zip");
-        Files.write(zipFile, zipBytes);
-
-        // Verify that the END header is rejected
+    /**
+     * Verify that ZipFile rejects the ZIP file with a ZipException
+     * with the given message
+     * @param zip ZIP file to open
+     * @param msg exception message to expect
+     */
+    private static void verifyRejection(Path zip, String msg) {
         ZipException ex = assertThrows(ZipException.class, () -> {
-            try (var zf = new ZipFile(zipFile.toFile())) {
-            }
+            new ZipFile(zip.toFile());
         });
-
-        assertEquals(INVALID_BAD_ENTRY_COUNT, ex.getMessage());
-    }
-
-    /**
-     * Create an ZIP file with a single entry, then modify the CEN size
-     * in the 'End of central directory record' (END header)  to the given size.
-     *
-     * The CEN is optionally "inflated" with trailing zero bytes such that
-     * its actual size matches the one stated in the END header.
-     *
-     * The CEN offset is optiontially adjusted by the given amount
-     *
-     * The resulting ZIP is technically not valid, but it does allow us
-     * to test that large or invalid CEN sizes are rejected
-     * @param cenSize the CEN size to put in the END record
-     * @param inflateCen if true, zero-pad the CEN to the desired size
-     * @param cenOffAdjust Adjust the CEN offset field of the END record with this amount
-     * @throws IOException if an error occurs
-     */
-    private Path zipWithModifiedEndRecord(int cenSize,
-                                          boolean inflateCen,
-                                          int cenOffAdjust,
-                                          Path zip) throws IOException {
-
-        // A byte buffer for reading the END
-        ByteBuffer buffer = ByteBuffer.wrap(zipBytes.clone()).order(ByteOrder.LITTLE_ENDIAN);
-
-        // Offset of the END header
-        int endOffset = buffer.limit() - ENDHDR;
-
-        // Modify the CEN size
-        int sizeOffset = endOffset + ENDSIZ;
-        int currentCenSize = buffer.getInt(sizeOffset);
-        buffer.putInt(sizeOffset, cenSize);
-
-        // Optionally modify the CEN offset
-        if (cenOffAdjust != 0) {
-            int offOffset = endOffset + ENDOFF;
-            int currentCenOff = buffer.getInt(offOffset);
-            buffer.putInt(offOffset, currentCenOff + cenOffAdjust);
-        }
-
-        // When creating a sparse file, the file must not already exit
-        Files.deleteIfExists(zip);
-
-        // Open a FileChannel for writing a sparse file
-        EnumSet<StandardOpenOption> options = EnumSet.of(StandardOpenOption.CREATE_NEW,
-                StandardOpenOption.WRITE,
-                StandardOpenOption.SPARSE);
-
-        try (FileChannel channel = FileChannel.open(zip, options)) {
-
-            // Write everything up to END
-            channel.write(buffer.slice(0, buffer.limit() - ENDHDR));
-
-            if (inflateCen) {
-                // Inject "empty bytes" to make the actual CEN size match the END
-                int injectBytes = cenSize - currentCenSize;
-                channel.position(channel.position() + injectBytes);
-            }
-            // Write the modified END
-            channel.write(buffer.slice(buffer.limit() - ENDHDR, ENDHDR));
-        }
-        return zip;
-    }
-
-    /**
-     * Produce a byte array of a ZIP with a single entry
-     *
-     * @throws IOException if an error occurs
-     */
-    private byte[] templateZip() throws IOException {
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        try (ZipOutputStream zo = new ZipOutputStream(bout)) {
-            ZipEntry entry = new ZipEntry("duke.txt");
-            zo.putNextEntry(entry);
-            zo.write("duke".getBytes(StandardCharsets.UTF_8));
-        }
-        return bout.toByteArray();
+        assertEquals(msg, ex.getMessage());
     }
 }
diff --git a/test/jdk/java/util/zip/ZipFile/GetInputStreamNPETest.java b/test/jdk/java/util/zip/ZipFile/GetInputStreamNPETest.java
index ec7f0fc7d45..a4111ecef35 100644
--- a/test/jdk/java/util/zip/ZipFile/GetInputStreamNPETest.java
+++ b/test/jdk/java/util/zip/ZipFile/GetInputStreamNPETest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,12 @@
  *
  */
 
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -34,16 +36,20 @@ import java.util.Arrays;
 import java.util.Formatter;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @test
  * @bug 8280409
  * @summary Validate that Zip/JarFile::getInputStream will throw a NullPointerException
- * @run testng/othervm GetInputStreamNPETest
+ * @run junit/othervm GetInputStreamNPETest
  */
 public class GetInputStreamNPETest {
     // Name used to create a JAR with an invalid entry name
@@ -750,33 +756,31 @@ public class GetInputStreamNPETest {
     };
 
     /**
-     * DataProvider used to specify valid jars and whether to verify them
+     * MethodSource used to specify valid jars and whether to verify them
      *
-     * @return Entry object indicating the jar file and whether it will be verified
+     * @return Stream of Arguments which indicate the jar file and whether it will be verified
      */
-    @DataProvider
-    public Object[][] validJars() {
-        return new Object[][]{
-                {SIGNED_VALID_ENTRY_NAME_JAR, true},
-                {SIGNED_VALID_ENTRY_NAME_JAR, false},
-                {VALID_ENTRY_NAME_JAR, true},
-                {VALID_ENTRY_NAME_JAR, false},
-        };
+    public static Stream<Arguments> validJars() {
+        return Stream.of(
+                Arguments.of(SIGNED_VALID_ENTRY_NAME_JAR, true),
+                Arguments.of(SIGNED_VALID_ENTRY_NAME_JAR, false),
+                Arguments.of(VALID_ENTRY_NAME_JAR, true),
+                Arguments.of(VALID_ENTRY_NAME_JAR, false)
+        );
     }
 
     /**
-     * DataProvider used to specify invalid jars and whether to verify them
+     * MethodSource used to specify invalid jars and whether to verify them
      *
-     * @return Entry object indicating the jar file and whether it will be verified
+     * @return Stream of Arguments which indicate the jar file and whether it will be verified
      */
-    @DataProvider
-    public Object[][] inValidJars() {
-        return new Object[][]{
-                {SIGNED_INVALID_ENTRY_NAME_JAR, true},
-                {SIGNED_INVALID_ENTRY_NAME_JAR, false},
-                {INVALID_ENTRY_NAME_JAR, true},
-                {INVALID_ENTRY_NAME_JAR, false},
-        };
+    public static Stream<Arguments> inValidJars() {
+        return Stream.of(
+                Arguments.of(SIGNED_INVALID_ENTRY_NAME_JAR, true),
+                Arguments.of(SIGNED_INVALID_ENTRY_NAME_JAR, false),
+                Arguments.of(INVALID_ENTRY_NAME_JAR, true),
+                Arguments.of(INVALID_ENTRY_NAME_JAR, false)
+        );
     }
 
     /**
@@ -796,7 +800,7 @@ public class GetInputStreamNPETest {
      * @throws IOException If an error occurs
      *
      */
-    @BeforeTest
+    @BeforeAll
     public static void setup() throws IOException {
 
         // Create valid jar
@@ -832,7 +836,7 @@ public class GetInputStreamNPETest {
      *
      * @throws IOException If an error occurs
      */
-    @AfterTest
+    @AfterAll
     public static void cleanup() throws IOException {
         Files.deleteIfExists(VALID_ENTRY_NAME_JAR);
         Files.deleteIfExists(SIGNED_VALID_ENTRY_NAME_JAR);
@@ -849,8 +853,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void validJarFileZipEntryTest(Path jar, boolean verify) throws Exception {
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void validJarFileZipEntryTest(Path jar, boolean verify) throws Exception {
         try (JarFile jf = new JarFile(jar.toFile(), verify)) {
             ZipEntry ze = jf.getEntry(CEN_FILENAME_TO_MODIFY);
             var is = jf.getInputStream(ze);
@@ -868,8 +873,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void validJarFileJarEntryTest(Path jar, boolean verify) throws Exception {
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void validJarFileJarEntryTest(Path jar, boolean verify) throws Exception {
         try (JarFile jf = new JarFile(jar.toFile(), verify)) {
             ZipEntry ze = jf.getEntry(CEN_FILENAME_TO_MODIFY);
             var is = jf.getInputStream(ze);
@@ -886,8 +892,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified(not used)
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void validZipFileZipEntryTest(Path jar, boolean verify) throws Exception {
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void validZipFileZipEntryTest(Path jar, boolean verify) throws Exception {
         try (ZipFile jf = new ZipFile(jar.toFile())) {
             ZipEntry ze = jf.getEntry(CEN_FILENAME_TO_MODIFY);
             var is = jf.getInputStream(ze);
@@ -904,12 +911,13 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified(not used)
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "inValidJars")
-    public static void invalidJarFileZipEntry(Path jar, boolean verify) throws Exception {
+    @ParameterizedTest
+    @MethodSource("inValidJars")
+    public void invalidJarFileZipEntry(Path jar, boolean verify) throws Exception {
         try (JarFile jf = new JarFile(jar.toFile(), verify)) {
             // The entry will not be found resulting in the ZipEntry being null
             ZipEntry ze = jf.getEntry(CEN_FILENAME_TO_MODIFY);
-            var ex= expectThrows(NullPointerException.class,
+            var ex= assertThrows(NullPointerException.class,
                     () -> jf.getInputStream(ze) );
             // Validate that we receive the expected message from Objects.requireNonNull
             assertTrue( ex != null && ex.getMessage().equals("ze"));
@@ -923,12 +931,13 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified(not used)
      * @throws IOException if an error occurs
      */
-    @Test(dataProvider = "inValidJars")
-    public static void invalidZipFileZipEntry(Path jar, boolean verify) throws Exception {
+    @ParameterizedTest
+    @MethodSource("inValidJars")
+    public void invalidZipFileZipEntry(Path jar, boolean verify) throws Exception {
         try (ZipFile jf = new ZipFile(jar.toFile())) {
             // The entry will not be found resulting in the ZipEntry being null
             ZipEntry ze = jf.getEntry(CEN_FILENAME_TO_MODIFY);
-            var ex= expectThrows(NullPointerException.class,
+            var ex= assertThrows(NullPointerException.class,
                     () -> jf.getInputStream(ze) );
             // Validate that we receive the expected message from Objects.requireNonNull
             assertTrue( ex != null && ex.getMessage().equals("entry"));
@@ -943,8 +952,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void JarFileZipEntryDoesNotExistGetInputStreamTest(
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void JarFileZipEntryDoesNotExistGetInputStreamTest(
             Path jar, boolean verify) throws Exception {
 
         try (JarFile jf = new JarFile(jar.toFile(), verify)) {
@@ -962,8 +972,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified(not used)
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void ZipFileZipEntryDoesNotExistGetInputStreamTest(
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void ZipFileZipEntryDoesNotExistGetInputStreamTest(
             Path jar, boolean verify) throws Exception {
         try (ZipFile jf = new ZipFile(jar.toFile())) {
             var ze = new ZipEntry(ZIP_ENTRY_THAT_DOES_NOT_EXIST);
@@ -980,8 +991,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void JarFileJarEntryEntryDoesNotExistGetInputStreamTest (
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void JarFileJarEntryEntryDoesNotExistGetInputStreamTest (
             Path jar, boolean verify) throws Exception {
         try (JarFile jf = new JarFile(jar.toFile(), verify)) {
             var je = new JarEntry(ZIP_ENTRY_THAT_DOES_NOT_EXIST);
@@ -999,8 +1011,9 @@ public class GetInputStreamNPETest {
      * @param verify indicates whether the jar should be verified
      * @throws Exception if an error occurs
      */
-    @Test(dataProvider = "validJars")
-    public static void JarFileZipEntryGetNameNullTest(Path jar, boolean verify) throws Exception {
+    @ParameterizedTest
+    @MethodSource("validJars")
+    public void JarFileZipEntryGetNameNullTest(Path jar, boolean verify) throws Exception {
 
         // Signed Jar is used for the next checks
         try (JarFile jf = new JarFile(jar.toFile(), verify)) {
diff --git a/test/jdk/java/util/zip/ZipFile/IncorrectEndTot.java b/test/jdk/java/util/zip/ZipFile/IncorrectEndTot.java
new file mode 100644
index 00000000000..0b6fc4a35fd
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/IncorrectEndTot.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Verify that ZipFile::size reports the actual number of entries
+ *          even with an incorrect ENDTOT field
+ * @run junit IncorrectEndTot
+ */
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.file.Files;
+import java.util.Collections;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class IncorrectEndTot {
+
+    // File to use for this test
+    File file = new File("incorrect-end-centot.zip");
+
+    // Return scenarios for correct and incorrect ENDTOT fields
+    public static Stream<Arguments> scenarios() {
+        return Stream.of(
+                Arguments.of(10, 10), // CEN agrees with ENDTOT
+                Arguments.of(10, 11), // CEN has one less than ENDTOT
+                Arguments.of(11, 10), // CEN has one more than ENDTOT
+                Arguments.of(0, 0),   // Empty ZIP, correct ENDTOT
+                Arguments.of(0, 10)   // Empty ZIP, incorrect ENDTOT
+        );
+    }
+
+    /**
+     * Delete the file used by this test
+     */
+    @AfterEach
+    public void cleanup() {
+        file.delete();
+    }
+
+    /**
+     * Verify that ZipFile::size reports the actual number of CEN records,
+     * regardless of the ENDTOT field.
+     *
+     * @param actual number of entries in the ZIP file
+     * @param reported number reported in ENDTOT
+     * @throws IOException if an unexpected error occurs
+     */
+    @ParameterizedTest
+    @MethodSource("scenarios")
+    public void shouldCountActualEntries(int actual, int reported) throws IOException {
+        createZip(file, actual, reported);
+        try (ZipFile zf = new ZipFile(file)) {
+            assertEquals(actual, zf.size());
+            assertEquals(actual, Collections.list(zf.entries()).size());
+            assertEquals(actual, zf.stream().count());
+        }
+    }
+
+    /**
+     * Create a ZIP file with a number of entries, possibly reporting an incorrect number in
+     * the ENDTOT field
+     * @param file the file to write to
+     * @param numEntries the number of entries to generate
+     * @param reported the number of entries to report in the END header's ENDTOT field
+     * @throws IOException
+     */
+    private static void createZip(File file, int numEntries, int reported) throws IOException {
+        // Create a ZIP
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (ZipOutputStream zo = new ZipOutputStream(out)) {
+            for (int i = 0; i < numEntries; i++) {
+                zo.putNextEntry(new ZipEntry("entry_" + i));
+            }
+        }
+        byte[] bytes = out.toByteArray();
+
+        // Update the ENDTOT field to report a possibly incorrect number
+        ByteBuffer buf = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
+        buf.putShort(bytes.length - ZipFile.ENDHDR + ZipFile.ENDTOT, (short) reported);
+
+        // Write to disk
+        Files.write(file.toPath(), bytes);
+    }
+}
diff --git a/test/jdk/java/util/zip/ZipFile/InvalidBytesInEntryNameOrComment.java b/test/jdk/java/util/zip/ZipFile/InvalidBytesInEntryNameOrComment.java
index c43157248f4..71086abb325 100644
--- a/test/jdk/java/util/zip/ZipFile/InvalidBytesInEntryNameOrComment.java
+++ b/test/jdk/java/util/zip/ZipFile/InvalidBytesInEntryNameOrComment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,7 +169,7 @@ public class InvalidBytesInEntryNameOrComment {
     }
 
     /**
-     * The DataProvider of CEN offsets to modify with an invalid UTF-8 byte
+     * The MethodSource of CEN offsets to modify with an invalid UTF-8 byte
      * sequence
      *
      * @return Arguments used in each test run
diff --git a/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java b/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java
index 1910107f0d3..7ba33bee740 100644
--- a/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java
+++ b/test/jdk/java/util/zip/ZipFile/InvalidCommentLengthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,10 @@
  *
  */
 
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -35,14 +36,16 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @test
  * @bug 8280404
  * @summary Validate that Zip/JarFile will throw a ZipException when the CEN
  * comment length field contains an incorrect value
- * @run testng/othervm InvalidCommentLengthTest
+ * @run junit/othervm InvalidCommentLengthTest
  */
 public class InvalidCommentLengthTest {
 
@@ -264,8 +267,8 @@ public class InvalidCommentLengthTest {
      *
      * @throws IOException If an error occurs
      */
-    @BeforeTest
-    public void setup() throws IOException {
+    @BeforeAll
+    public static void setup() throws IOException {
         Files.deleteIfExists(VALID_CEN_COMMENT_LENGTH_JAR);
         Files.deleteIfExists(INVALID_CEN_COMMENT_LENGTH_JAR);
         // Create the valid jar
@@ -285,7 +288,7 @@ public class InvalidCommentLengthTest {
      *
      * @throws IOException If an error occurs
      */
-    @AfterTest
+    @AfterAll
     public static void cleanup() throws IOException {
         Files.deleteIfExists(VALID_CEN_COMMENT_LENGTH_JAR);
         Files.deleteIfExists(INVALID_CEN_COMMENT_LENGTH_JAR);
@@ -297,11 +300,11 @@ public class InvalidCommentLengthTest {
      * @throws IOException If an error occurs
      */
     @Test
-    public static void ZipFileValidCommentLengthTest() throws IOException {
+    public void ZipFileValidCommentLengthTest() throws IOException {
         try (ZipFile jf = new ZipFile(VALID_CEN_COMMENT_LENGTH_JAR.toFile())) {
             ZipEntry ze = jf.getEntry(META_INF_MANIFEST_MF);
             assertNotNull(ze);
-            assertEquals(ze.getName(), META_INF_MANIFEST_MF);
+            assertEquals(META_INF_MANIFEST_MF, ze.getName());
         }
     }
 
@@ -311,11 +314,11 @@ public class InvalidCommentLengthTest {
      * @throws IOException If an error occurs
      */
     @Test
-    public static void JarFileValidCommentLengthTest() throws IOException {
+    public void JarFileValidCommentLengthTest() throws IOException {
         try (JarFile jf = new JarFile(VALID_CEN_COMMENT_LENGTH_JAR.toFile())) {
             ZipEntry ze = jf.getEntry(META_INF_MANIFEST_MF);
             assertNotNull(ze);
-            assertEquals(ze.getName(), META_INF_MANIFEST_MF);
+            assertEquals(META_INF_MANIFEST_MF, ze.getName());
         }
     }
 
@@ -325,10 +328,10 @@ public class InvalidCommentLengthTest {
      * the Jar file is opened by {@code ZipFile}
      */
     @Test
-    public static void ZipFileInValidCommentLengthTest() {
-        var ex= expectThrows(ZipException.class,
+    public void ZipFileInValidCommentLengthTest() {
+        var ex= assertThrows(ZipException.class,
                 () -> new ZipFile(INVALID_CEN_COMMENT_LENGTH_JAR.toFile()));
-        assertEquals(ex.getMessage(), INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT);
+        assertEquals(INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT, ex.getMessage());
     }
 
     /**
@@ -337,9 +340,9 @@ public class InvalidCommentLengthTest {
      * the Jar file is opened by  {@code JarFile}
      */
     @Test
-    public static void JarFileInValidCommentLengthTest()  {
-        var ex= expectThrows(ZipException.class,
+    public void JarFileInValidCommentLengthTest() {
+        var ex= assertThrows(ZipException.class,
                 () -> new JarFile(INVALID_CEN_COMMENT_LENGTH_JAR.toFile()));
-        assertEquals(ex.getMessage(), INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT);
+        assertEquals(INVALID_CEN_HEADER_BAD_ENTRY_NAME_OR_COMMENT, ex.getMessage());
     }
 }
diff --git a/test/jdk/java/util/zip/ZipFile/MissingZIP64EntriesTest.java b/test/jdk/java/util/zip/ZipFile/MissingZIP64EntriesTest.java
index 51a6d0b58ee..4920fa724ce 100644
--- a/test/jdk/java/util/zip/ZipFile/MissingZIP64EntriesTest.java
+++ b/test/jdk/java/util/zip/ZipFile/MissingZIP64EntriesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -480,7 +480,7 @@ public class MissingZIP64EntriesTest {
     private ByteBuffer buffer;
 
     /**
-     * The DataProvider returning a byte array representing the Zip file,
+     * The MethodSource returning a byte array representing the Zip file,
      * CEN offsets to set to 0xFFFFFFFF and the expected
      * ZipException error message when there are missing Zip64 Extra header fields
      * @return Arguments used in each test run
@@ -501,7 +501,7 @@ public class MissingZIP64EntriesTest {
     }
 
     /**
-     * The DataProvider of CEN offsets to set to 0xFFFFFFFF or 0xFFFF when the Extra Length
+     * The MethodSource of CEN offsets to set to 0xFFFFFFFF or 0xFFFF when the Extra Length
      * size is 0 for the Zip file created using ZIP_WITH_NO_EXTRA_LEN_BYTEARRAY
      * @return Arguments used in each test run
      */
@@ -519,7 +519,7 @@ public class MissingZIP64EntriesTest {
     }
 
     /**
-     * The DataProvider of CEN offsets to set to 0xFFFFFFFF when the ZIP64 extra header
+     * The MethodSource of CEN offsets to set to 0xFFFFFFFF when the ZIP64 extra header
      * Length size is 0 for the Zip file created using
      * ZIP_WITH_ZEROLEN_ZIP64_EXTRAHDR_BYTEARRAY
      * @return Arguments used in each test run
@@ -536,7 +536,7 @@ public class MissingZIP64EntriesTest {
     }
 
     /**
-     * The DataProvider which will return a byte array representing a
+     * The MethodSource which will return a byte array representing a
      * valid Zip file and the expected content for the Zip file entry 'Hello.txt'.
      * @return Arguments used in each test run
      */
diff --git a/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java b/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java
index 4e271912345..d8692ee3261 100644
--- a/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java
+++ b/test/jdk/java/util/zip/ZipFile/TestZipFileEncodings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,13 @@
  * @bug 8243254
  * @summary Tests a simple set of operations on Zip files in various encodings
  *          focusing on ensuring metadata is properly encoded and read.
- * @run testng/timeout=480 TestZipFileEncodings
+ * @run junit/timeout=480 TestZipFileEncodings
  */
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -38,7 +40,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -50,8 +51,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
@@ -60,7 +59,10 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestZipFileEncodings {
 
@@ -76,50 +78,49 @@ public class TestZipFileEncodings {
         return ThreadLocalRandom.current();
     }
 
-    @DataProvider(name = "non-unicode-charsets")
-    public Object[][] nonUnicodeCharsets() {
-        return new Object[][] {
-                { "ISO-8859-1" },
-                { "IBM01149" },
-                { "IBM037" },
-                { "IBM-Thai" }
-        };
+    public static Stream<String> nonUnicodeCharsets() {
+        return Stream.of(
+                "ISO-8859-1",
+                "IBM01149",
+                "IBM037",
+                "IBM-Thai"
+        );
     }
 
-    @DataProvider(name = "unicode-charsets")
-    public Object[][] unicodeCharsets() {
-        return new Object[][] {
-                { "UTF-8" },
-                { "UTF-16" },
-                { "UTF-16LE" },
-                { "UTF-16BE" },
-                { "UTF-32" }
-        };
+    public static Stream<String> unicodeCharsets() {
+        return Stream.of(
+                "UTF-8",
+                "UTF-16",
+                "UTF-16LE",
+                "UTF-16BE",
+                "UTF-32"
+        );
     }
 
-    @DataProvider(name = "all-charsets")
-    public Object[][] allCharsets() {
-        return Stream.concat(Stream.of(nonUnicodeCharsets()),
-                        Stream.of(unicodeCharsets()))
-                .toArray(Object[][]::new);
+    public static Stream<String> allCharsets() {
+        return Stream.concat(nonUnicodeCharsets(), unicodeCharsets());
     }
 
-    @Test(dataProvider = "non-unicode-charsets")
+    @ParameterizedTest
+    @MethodSource("nonUnicodeCharsets")
     public void testNonUnicode(String charsetName) throws Throwable {
         test(NUM_ENTRIES, 100 + random().nextInt(ENTRY_SIZE), false, Charset.forName(charsetName));
     }
 
-    @Test(dataProvider = "unicode-charsets")
+    @ParameterizedTest
+    @MethodSource("unicodeCharsets")
     public void testUnicode(String charsetName) throws Throwable {
         test(NUM_ENTRIES, 100 + random().nextInt(ENTRY_SIZE), true, Charset.forName(charsetName));
     }
 
-    @Test(dataProvider = "non-unicode-charsets")
+    @ParameterizedTest
+    @MethodSource("nonUnicodeCharsets")
     public void testNonUnicodeManyEntries(String charsetName) throws Throwable {
         test(70000, 10, false, Charset.forName(charsetName));
     }
 
-    @Test(dataProvider = "unicode-charsets")
+    @ParameterizedTest
+    @MethodSource("unicodeCharsets")
     public void testUnicodeManyEntries(String charsetName) throws Throwable {
         test(70000, 10, true, Charset.forName(charsetName));
     }
@@ -160,7 +161,8 @@ public class TestZipFileEncodings {
      * since it explicity provokes this rare condition.
      *
      */
-    @Test(dataProvider = "all-charsets")
+    @ParameterizedTest
+    @MethodSource("allCharsets")
     public void sameHashAndLengthDirLookup(String charsetName) throws IOException {
         // Two directory names with colliding hash codes and same length
         // (found in a brute force search)
@@ -187,15 +189,15 @@ public class TestZipFileEncodings {
         try (ZipFile z = new ZipFile(zip.toFile(), charset)) {
 
             ZipEntry second = z.getEntry("_____-408231241");
-            assertEquals(second.getComment(), "Entry two");
+            assertEquals("Entry two", second.getComment());
 
             ZipEntry first = z.getEntry("_____1637461950");
-            assertEquals(first.getComment(), "Entry one");
+            assertEquals("Entry one", first.getComment());
         }
     }
 
-    @AfterClass
-    public void tearDown() {
+    @AfterAll
+    public static void tearDown() {
         for (Path path : paths) {
             path.toFile().deleteOnExit();
         }
@@ -208,14 +210,14 @@ public class TestZipFileEncodings {
     }
 
     static void checkEqual(ZipEntry x, ZipEntry y) {
-        assertEquals(x.getName(), y.getName());
-        assertEquals(x.isDirectory(), y.isDirectory());
-        assertEquals(x.getMethod(), y.getMethod());
-        assertEquals((x.getTime() / 2000), y.getTime() / 2000);
-        assertEquals(x.getSize(), y.getSize());
-        assertEquals(x.getCompressedSize(), y.getCompressedSize());
-        assertEquals(x.getCrc(), y.getCrc());
-        assertEquals(x.getComment(), y.getComment());
+        assertEquals(y.getName(), x.getName());
+        assertEquals(y.isDirectory(), x.isDirectory());
+        assertEquals(y.getMethod(), x.getMethod());
+        assertEquals(y.getTime() / 2000, (x.getTime() / 2000));
+        assertEquals(y.getSize(), x.getSize());
+        assertEquals(y.getCompressedSize(), x.getCompressedSize());
+        assertEquals(y.getCrc(), x.getCrc());
+        assertEquals(y.getComment(), x.getComment());
     }
 
     static void doTest(Zip zip) throws Throwable {
@@ -226,7 +228,7 @@ public class TestZipFileEncodings {
 
     static void doTest0(Zip zip, ZipFile zf) throws Throwable {
         // (0) check zero-length entry name, no AIOOBE
-        assertEquals(zf.getEntry(""), null);
+        assertEquals(null, zf.getEntry(""));
 
         List<ZipEntry> list = new ArrayList(zip.entries.keySet());
         // check each entry and its bytes
@@ -238,7 +240,7 @@ public class TestZipFileEncodings {
             if (!e.isDirectory()) {
                 // check with readAllBytes
                 try (InputStream is = zf.getInputStream(e)) {
-                    assertEquals(data, is.readAllBytes());
+                    assertArrayEquals(is.readAllBytes(), data);
                 }
                 int slash = name.indexOf('/');
                 if (slash > 0) {
diff --git a/test/jdk/java/util/zip/ZipFile/ZipEntryTimeBounds.java b/test/jdk/java/util/zip/ZipFile/ZipEntryTimeBounds.java
index ab0c2c3f3b0..0bc6b6c628b 100644
--- a/test/jdk/java/util/zip/ZipFile/ZipEntryTimeBounds.java
+++ b/test/jdk/java/util/zip/ZipFile/ZipEntryTimeBounds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,8 @@
  * questions.
  */
 
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -34,13 +35,14 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /* @test
  * @bug 8246129
  * @summary JDK add metadata to zip files with entries timestamped at the
  *          lower bound of the DOS time epoch, i.e., 1980-01-01T00:00:00Z
- * @run testng/othervm ZipEntryTimeBounds
+ * @run junit/othervm ZipEntryTimeBounds
  */
 public class ZipEntryTimeBounds {
 
@@ -59,17 +61,17 @@ public class ZipEntryTimeBounds {
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
         File f2 = createTempFile();
         makeZip(f2, new GregorianCalendar(1980, Calendar.JANUARY, 1, 0, 0, 0).getTimeInMillis());
-        assertEquals(Files.mismatch(f1.toPath(), f2.toPath()), -1L);
+        assertEquals(-1L, Files.mismatch(f1.toPath(), f2.toPath()));
 
         TimeZone.setDefault(TimeZone.getTimeZone("GMT+01"));
         File f3 = createTempFile();
         makeZip(f3, new GregorianCalendar(1980, Calendar.JANUARY, 1, 0, 0, 0).getTimeInMillis());
-        assertEquals(Files.mismatch(f1.toPath(), f3.toPath()), -1L);
+        assertEquals(-1L, Files.mismatch(f1.toPath(), f3.toPath()));
 
         // Check that the milliseconds part of the time is exactly preserved
-        assertEquals(new ZipFile(f1).getEntry("entry.txt").getTime() % 60000, 0);
-        assertEquals(new ZipFile(f2).getEntry("entry.txt").getTime() % 60000, 0);
-        assertEquals(new ZipFile(f3).getEntry("entry.txt").getTime() % 60000, 0);
+        assertEquals(0, new ZipFile(f1).getEntry("entry.txt").getTime() % 60000);
+        assertEquals(0, new ZipFile(f2).getEntry("entry.txt").getTime() % 60000);
+        assertEquals(0, new ZipFile(f3).getEntry("entry.txt").getTime() % 60000);
     }
 
     @Test
@@ -85,22 +87,22 @@ public class ZipEntryTimeBounds {
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
         File f2 = createTempFile();
         makeZip(f2, new GregorianCalendar(1980, Calendar.JANUARY, 1, 0, 0, 1).getTimeInMillis());
-        assertEquals(Files.mismatch(f1.toPath(), f2.toPath()), -1L);
+        assertEquals(-1L, Files.mismatch(f1.toPath(), f2.toPath()));
 
         TimeZone.setDefault(TimeZone.getTimeZone("GMT+01"));
         File f3 = createTempFile();
         makeZip(f3, new GregorianCalendar(1980, Calendar.JANUARY, 1, 0, 0, 1).getTimeInMillis() + 999);
-        assertEquals(Files.mismatch(f1.toPath(), f3.toPath()), -1L);
+        assertEquals(-1L, Files.mismatch(f1.toPath(), f3.toPath()));
 
         // Check that the seconds part of the time is lossily preserved,
         // rounding down to the previous 2s step since epoch
-        assertEquals(new ZipFile(f1).getEntry("entry.txt").getTime() % 60000, 0);
-        assertEquals(new ZipFile(f2).getEntry("entry.txt").getTime() % 60000, 0);
-        assertEquals(new ZipFile(f3).getEntry("entry.txt").getTime() % 60000, 0);
+        assertEquals(0, new ZipFile(f1).getEntry("entry.txt").getTime() % 60000);
+        assertEquals(0, new ZipFile(f2).getEntry("entry.txt").getTime() % 60000);
+        assertEquals(0, new ZipFile(f3).getEntry("entry.txt").getTime() % 60000);
 
         File f4 = createTempFile();
         makeZip(f4, new GregorianCalendar(1980, Calendar.JANUARY, 1, 0, 0, 2).getTimeInMillis());
-        assertEquals(new ZipFile(f4).getEntry("entry.txt").getTime() % 60000, 2000);
+        assertEquals(2000, new ZipFile(f4).getEntry("entry.txt").getTime() % 60000);
     }
 
     @Test
@@ -116,20 +118,20 @@ public class ZipEntryTimeBounds {
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
         File f2 = createTempFile();
         makeZip(f2, new GregorianCalendar(1979, Calendar.DECEMBER, 31, 23, 59, 59).getTimeInMillis());
-        assertNotEquals(Files.mismatch(f1.toPath(), f2.toPath()), -1L);
+        assertNotEquals(-1L, Files.mismatch(f1.toPath(), f2.toPath()));
 
         TimeZone.setDefault(TimeZone.getTimeZone("GMT+01"));
         File f3 = createTempFile();
         makeZip(f3, new GregorianCalendar(1979, Calendar.DECEMBER, 31, 23, 59, 59).getTimeInMillis() + 500);
-        assertNotEquals(Files.mismatch(f1.toPath(), f3.toPath()), -1L);
+        assertNotEquals(-1L, Files.mismatch(f1.toPath(), f3.toPath()));
 
         // Check that the time is preserved at second precision, no rounding
         // to 2s
-        assertEquals(new ZipFile(f1).getEntry("entry.txt").getTime() % 60000, 59000);
-        assertEquals(new ZipFile(f2).getEntry("entry.txt").getTime() % 60000, 59000);
+        assertEquals(59000, new ZipFile(f1).getEntry("entry.txt").getTime() % 60000);
+        assertEquals(59000, new ZipFile(f2).getEntry("entry.txt").getTime() % 60000);
         // Milliseconds are discarded even when storing entries with extended
         // time metadata
-        assertEquals(new ZipFile(f3).getEntry("entry.txt").getTime() % 60000, 59000);
+        assertEquals(59000, new ZipFile(f3).getEntry("entry.txt").getTime() % 60000);
     }
 
     private static void makeZip(File f, long time) throws Exception {
diff --git a/test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java b/test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java
index 95a223c8e1f..1fe9bd4c203 100644
--- a/test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java
+++ b/test/jdk/java/util/zip/ZipFile/ZipFileDuplicateEntryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,12 @@
  *
  */
 
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
@@ -45,19 +47,24 @@ import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @test
  * @bug 8276123
  * @summary ZipFile::getEntry will not return a file entry when there is a
  * directory entry of the same name within a Zip File
- * @run testng/othervm ZipFileDuplicateEntryTest
+ * @run junit/othervm ZipFileDuplicateEntryTest
  */
 public class ZipFileDuplicateEntryTest {
 
@@ -158,7 +165,7 @@ public class ZipFileDuplicateEntryTest {
      *
      * @throws IOException If an error occurs
      */
-    @BeforeTest
+    @BeforeAll
     public static void setup() throws IOException {
 
         /**
@@ -209,7 +216,7 @@ public class ZipFileDuplicateEntryTest {
      *
      * @throws IOException If an error occurs
      */
-    @AfterTest
+    @AfterAll
     public static void cleanup() throws IOException {
         Files.deleteIfExists(ZIP_FILE);
         Files.deleteIfExists(ZIP_FILE2);
@@ -218,16 +225,12 @@ public class ZipFileDuplicateEntryTest {
     }
 
     /**
-     * DataProvider used to specify the Zip entries to use
+     * MethodSource used to specify the Zip entries to use
      *
-     * @return The Entry to use within the test
+     * @return Stream that indicates which Entry to use within the test
      */
-    @DataProvider
-    public Object[][] entries() {
-        return new Object[][]{
-                {FILE_ENTRY},
-                {DIR_ENTRY}
-        };
+    public static Stream<Entry> entries() {
+        return Stream.of(FILE_ENTRY, DIR_ENTRY);
     }
 
     /**
@@ -252,7 +255,7 @@ public class ZipFileDuplicateEntryTest {
                     System.out.printf("name: %s, isDirectory: %s, payload= %s%n",
                             ze.getName(), ze.isDirectory(), new String(bytes));
                 }
-                assertEquals(bytes, DIR_ENTRY.bytes,
+                assertArrayEquals(DIR_ENTRY.bytes, bytes,
                         String.format("Expected payload: %s",
                                 new String(DIR_ENTRY.bytes)));
             }
@@ -266,7 +269,8 @@ public class ZipFileDuplicateEntryTest {
      * @param entry The entry to search for
      * @throws IOException If an error occurs
      */
-    @Test(dataProvider = "entries")
+    @ParameterizedTest
+    @MethodSource("entries")
     public void testSameFileDirEntryName(Entry entry) throws IOException {
         System.out.printf("%n%n**** testSameFileDirEntryName ***%n");
 
@@ -282,7 +286,7 @@ public class ZipFileDuplicateEntryTest {
                     System.out.printf("name: %s, isDirectory: %s, payload= %s%n",
                             ze.getName(), ze.isDirectory(), new String(bytes));
                 }
-                assertEquals(entry.bytes, bytes,
+                assertArrayEquals(entry.bytes, bytes,
                         String.format("Expected payload: %s", new String(entry.bytes)));
             }
         }
@@ -310,7 +314,7 @@ public class ZipFileDuplicateEntryTest {
                     System.out.printf("name: %s, isDirectory: %s, payload= %s%n",
                             ze.getName(), ze.isDirectory(), new String(bytes));
                 }
-                assertEquals(bytes, DUPLICATE_FILE_ENTRY.bytes,
+                assertArrayEquals(DUPLICATE_FILE_ENTRY.bytes, bytes,
                         String.format("Expected payload: %s", new String(DUPLICATE_FILE_ENTRY.bytes)));
             }
         }
@@ -339,8 +343,8 @@ public class ZipFileDuplicateEntryTest {
                     throw new RuntimeException(
                             String.format("Invalid Zip entry: %s", zipEntry.getName()));
                 }
-                assertEquals(zipEntry.getMethod(), e.method);
-                assertEquals(zis.readAllBytes(), e.bytes,
+                assertEquals(e.method, zipEntry.getMethod());
+                assertArrayEquals(e.bytes, zis.readAllBytes(),
                         String.format("Expected payload: %s", new String(e.bytes)));
                 zipEntry = zis.getNextEntry();
             }
@@ -372,8 +376,9 @@ public class ZipFileDuplicateEntryTest {
      * @param entry The entry to validate
      * @throws IOException If an error occurs
      */
-    @Test(dataProvider = "entries")
-    public static void JarFileInputStreamTest(Entry entry) throws IOException {
+    @ParameterizedTest
+    @MethodSource("entries")
+    public void JarFileInputStreamTest(Entry entry) throws IOException {
         System.out.printf("%n%n**** JarFileInputStreamTest ***%n");
         try (JarFile jarFile = new JarFile(TEST_JAR.toFile())) {
             JarEntry je = jarFile.getJarEntry(entry.name);
@@ -389,7 +394,7 @@ public class ZipFileDuplicateEntryTest {
                     System.out.printf("bytes= %s, expected=%s%n",
                             new String(bytes), new String(entry.bytes));
                 }
-                assertEquals(bytes, entry.bytes,
+                assertArrayEquals(entry.bytes, bytes,
                         String.format("Expected payload: %s", new String(entry.bytes)));
             }
         }
@@ -418,8 +423,8 @@ public class ZipFileDuplicateEntryTest {
                     throw new RuntimeException(
                             String.format("Invalid Jar entry: %s", jarEntry.getName()));
                 }
-                assertEquals(jarEntry.getMethod(), e.method);
-                assertEquals(jis.readAllBytes(), e.bytes,
+                assertEquals(e.method, jarEntry.getMethod());
+                assertArrayEquals(e.bytes, jis.readAllBytes(),
                         String.format("Expected payload: %s", new String(e.bytes)));
                 jarEntry = jis.getNextJarEntry();
             }
@@ -433,7 +438,8 @@ public class ZipFileDuplicateEntryTest {
      * @param entry The entry to validate
      * @throws IOException If an error occurs
      */
-    @Test(dataProvider = "entries")
+    @ParameterizedTest
+    @MethodSource("entries")
     public void JarURLConnectionTest(Entry entry) throws Exception {
         System.out.printf("%n%n**** JarURLConnectionTest ***%n");
         URL url = new URL("jar:" + TEST_JAR.toUri().toURL() + "!/" + entry.name);
@@ -449,10 +455,10 @@ public class ZipFileDuplicateEntryTest {
             assertNull(con.getAttributes());
             assertNull(con.getMainAttributes());
             assertNull(con.getManifest());
-            assertEquals(je.getName(), entry.name);
-            assertEquals(con.getEntryName(), entry.name);
-            assertEquals(je.getMethod(), entry.method);
-            assertEquals(con.getJarFileURL(), TEST_JAR.toUri().toURL());
+            assertEquals(entry.name, je.getName());
+            assertEquals(entry.name, con.getEntryName());
+            assertEquals(entry.method, je.getMethod());
+            assertEquals(TEST_JAR.toUri().toURL(), con.getJarFileURL());
             if (DEBUG) {
                 System.out.printf("   getEntryName: %s,  getJarFileURL:%s%n",
                         con.getEntryName(), con.getJarFileURL());
@@ -464,7 +470,7 @@ public class ZipFileDuplicateEntryTest {
                 if (DEBUG) {
                     System.out.printf("   Bytes read:%s%n", new String(bytes));
                 }
-                assertEquals(bytes, entry.bytes,
+                assertArrayEquals(entry.bytes, bytes,
                         String.format("Expected payload: %s", new String(entry.bytes)));
             }
         }
diff --git a/test/jdk/java/util/zip/ZipFile/ZipFileInputStreamSkipTest.java b/test/jdk/java/util/zip/ZipFile/ZipFileInputStreamSkipTest.java
index e1c17200764..1b7b93785af 100644
--- a/test/jdk/java/util/zip/ZipFile/ZipFileInputStreamSkipTest.java
+++ b/test/jdk/java/util/zip/ZipFile/ZipFileInputStreamSkipTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,11 @@
  *
  */
 
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,32 +41,35 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @test
  * @bug 8231451
  * @summary Basic tests for ZipFileInputStream::skip
  * @modules jdk.zipfs
- * @run testng/othervm ZipFileInputStreamSkipTest
+ * @run junit/othervm ZipFileInputStreamSkipTest
  */
 public class ZipFileInputStreamSkipTest {
 
     // Stored and Deflated Zip File paths used by the tests
-    private final Path STORED_ZIPFILE = Path.of("skipStoredEntries.zip");
-    private final Path DEFLATED_ZIPFILE = Path.of("skipDeflatedEntries.zip");
+    private static final Path STORED_ZIPFILE = Path.of("skipStoredEntries.zip");
+    private static final Path DEFLATED_ZIPFILE = Path.of("skipDeflatedEntries.zip");
 
     // Saved Entries added to the relevant Zip file
-    private final HashMap<String, Entry> STORED_ZIP_ENTRIES = new HashMap<>();
-    private final HashMap<String, Entry> DEFLATED_ZIP_ENTRIES = new HashMap<>();
+    private static final HashMap<String, Entry> STORED_ZIP_ENTRIES = new HashMap<>();
+    private static final HashMap<String, Entry> DEFLATED_ZIP_ENTRIES = new HashMap<>();
 
     /**
      * Create the Zip Files used by the tests
      *
      * @throws IOException If an error occurs creating the Zip Files
      */
-    @BeforeClass
-    private void createZip() throws IOException {
+    @BeforeAll
+    static void createZip() throws IOException {
         Entry e0 = Entry.of("Entry-0", ZipEntry.STORED, "Tennis Pro");
         Entry e1 = Entry.of("Entry-1", ZipEntry.STORED,
                 "United States Tennis Association");
@@ -92,8 +97,8 @@ public class ZipFileInputStreamSkipTest {
      *
      * @throws IOException If an error occurs during cleanup
      */
-    @AfterClass
-    private void cleanUp() throws IOException {
+    @AfterAll
+    static void cleanUp() throws IOException {
         Files.deleteIfExists(STORED_ZIPFILE);
         Files.deleteIfExists(DEFLATED_ZIPFILE);
     }
@@ -119,28 +124,28 @@ public class ZipFileInputStreamSkipTest {
 
                     // Check that if we specify 0, that we return the correct
                     // skip value value
-                    assertEquals(in.skip(0), 0);
+                    assertEquals(0, in.skip(0));
 
                     // Try to skip past EOF and should return remaining bytes
-                    assertEquals(in.skip(entrySize + 100), entrySize);
+                    assertEquals(entrySize, in.skip(entrySize + 100));
 
                     // Return to BOF and then specify a value which would
                     // overflow the projected skip value and return the
                     // number of bytes moved to reach EOF
-                    assertEquals(in.skip(-entrySize), -entrySize);
-                    assertEquals(in.skip(Long.MAX_VALUE), entrySize);
+                    assertEquals(-entrySize, in.skip(-entrySize));
+                    assertEquals(entrySize, in.skip(Long.MAX_VALUE));
 
                     // From midpoint, try to skip past EOF and then skip back
                     // to BOF
-                    assertEquals(in.skip(-entrySize), -entrySize);
-                    assertEquals(in.skip(midpoint), midpoint);
-                    assertEquals(in.skip(1000), entrySize - midpoint);
-                    assertEquals(in.skip(-entrySize), -entrySize);
+                    assertEquals(-entrySize, in.skip(-entrySize));
+                    assertEquals(midpoint, in.skip(midpoint));
+                    assertEquals(entrySize - midpoint, in.skip(1000));
+                    assertEquals(-entrySize, in.skip(-entrySize));
 
                     // Read remaining bytes and validate against expected bytes
                     byte[] bytes = in.readAllBytes();
-                    assertEquals(bytes, expected.bytes);
-                    assertEquals(bytes.length, expected.bytes.length);
+                    assertArrayEquals(expected.bytes, bytes);
+                    assertEquals(expected.bytes.length, bytes.length);
                 }
             }
         }
@@ -167,25 +172,25 @@ public class ZipFileInputStreamSkipTest {
 
                     // Check that if you try to move past BOF
                     // that we return the correct value
-                    assertEquals(in.skip(-1), 0);
-                    assertEquals(in.skip(-100), 0);
-                    assertEquals(in.skip(Long.MIN_VALUE), 0);
+                    assertEquals(0, in.skip(-1));
+                    assertEquals(0, in.skip(-100));
+                    assertEquals(0, in.skip(Long.MIN_VALUE));
 
                     // Go to midpoint in file; then specify a value before
                     // BOF which should result in the number of
                     // bytes to BOF returned
-                    assertEquals(in.skip(midpoint), midpoint);
-                    assertEquals(in.skip(-(midpoint + 10)), -midpoint);
+                    assertEquals(midpoint, in.skip(midpoint));
+                    assertEquals(-midpoint, in.skip(-(midpoint + 10)));
 
                     // From midpoint, move back a couple of bytes
-                    assertEquals(in.skip(midpoint), midpoint);
-                    assertEquals(in.skip(-2), -2);
+                    assertEquals(midpoint, in.skip(midpoint));
+                    assertEquals(-2, in.skip(-2));
 
                     // Read the remaining bytes and compare to the expected bytes
                     byte[] bytes = in.readAllBytes();
-                    assertEquals(bytes, Arrays.copyOfRange(expected.bytes,
-                            (int)midpoint - 2, (int) entrySize));
-                    assertEquals(bytes.length, entrySize - midpoint + 2);
+                    assertArrayEquals(Arrays.copyOfRange(expected.bytes,
+                            (int)midpoint - 2, (int) entrySize), bytes);
+                    assertEquals(entrySize - midpoint + 2, bytes.length);
                 }
             }
         }
@@ -207,12 +212,12 @@ public class ZipFileInputStreamSkipTest {
                 Entry expected = DEFLATED_ZIP_ENTRIES.get(entry.getName());
                 assertNotNull(expected);
                 try (InputStream in = zf.getInputStream(entry)) {
-                    assertEquals(in.skip(toSkip), toSkip);
+                    assertEquals(toSkip, in.skip(toSkip));
                     byte[] bytes = in.readAllBytes();
                     var ebytes = Arrays.copyOfRange(expected.bytes,
                             toSkip, expected.bytes.length);
-                    assertEquals(bytes, ebytes);
-                    assertEquals(bytes.length, expected.bytes.length - toSkip);
+                    assertArrayEquals(ebytes, bytes);
+                    assertEquals(expected.bytes.length - toSkip, bytes.length);
                 }
             }
         }
@@ -248,7 +253,7 @@ public class ZipFileInputStreamSkipTest {
      * @param entries The entries to add to the Zip File
      * @throws IOException If an error occurs while creating the Zip file
      */
-    private void createZipFile(Path zipFile, Map<String, String> env,
+    private static void createZipFile(Path zipFile, Map<String, String> env,
                                Entry... entries) throws IOException {
         try (FileSystem zipfs =
                      FileSystems.newFileSystem(zipFile, env)) {
diff --git a/test/jdk/java/util/zip/ZipOutputStream/EmptyComment.java b/test/jdk/java/util/zip/ZipOutputStream/EmptyComment.java
index 0f52844f3f6..28c7569243c 100644
--- a/test/jdk/java/util/zip/ZipOutputStream/EmptyComment.java
+++ b/test/jdk/java/util/zip/ZipOutputStream/EmptyComment.java
@@ -1,5 +1,6 @@
 /*
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,34 +22,36 @@
  * questions.
  */
 
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import java.io.ByteArrayOutputStream;
 import java.util.function.Consumer;
+import java.util.stream.IntStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @test
  * @bug 8277087
  * @summary Verifies various use cases when the zip comment should be empty
- * @run testng EmptyComment
+ * @run junit EmptyComment
  */
 public final class EmptyComment {
 
-    @DataProvider()
-    Object[][] longLengths() {
-        return new Object[][]{{0xFFFF + 1}, {0xFFFF + 2}, {0xFFFF * 2}};
+    static IntStream longLengths() {
+        return IntStream.of(0xFFFF + 1, 0xFFFF + 2, 0xFFFF * 2);
     }
 
     /**
      * Overflow, the text is too long to be stored as a comment.
      */
-    @Test(dataProvider = "longLengths")
+    @ParameterizedTest
+    @MethodSource("longLengths")
     void testOverflow(int length) throws Exception {
         test(zos -> assertThrows(IllegalArgumentException.class, () -> {
             zos.setComment("X".repeat(length));
diff --git a/test/jdk/javax/accessibility/8377428/TestVoiceOverHiddenComponentNavigation.java b/test/jdk/javax/accessibility/8377428/TestVoiceOverHiddenComponentNavigation.java
new file mode 100644
index 00000000000..f8af95159c2
--- /dev/null
+++ b/test/jdk/javax/accessibility/8377428/TestVoiceOverHiddenComponentNavigation.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.accessibility.AccessibleComponent;
+import javax.accessibility.AccessibleContext;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+/*
+ * @test
+ * @key headful
+ * @bug 8377428
+ * @summary manual test for VoiceOver reading hidden components
+ * @requires os.family == "mac"
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestVoiceOverHiddenComponentNavigation
+ */
+
+public class TestVoiceOverHiddenComponentNavigation {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                Test UI contains four rows. Each row contains a JButton.
+                Two of the rows are hidden, and two are visible.
+
+                Follow these steps to test the behaviour:
+
+                1. Start the VoiceOver (Press Command + F5) application
+                2. Move VoiceOver cursor to one of the visible buttons.
+                3. Press CTRL + ALT + LEFT to move the VoiceOver cursor back
+                4. Repeat step 3 until you reach the "Close" button.
+
+                If VoiceOver ever references a "Hidden Button": then this test
+                fails.
+                """;
+
+        PassFailJFrame.builder()
+                .title("TestVoiceOverHiddenComponentNavigation Instruction")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(TestVoiceOverHiddenComponentNavigation::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createUI() {
+        JPanel rows = new JPanel();
+        rows.setLayout(new BoxLayout(rows, BoxLayout.Y_AXIS));
+        rows.add(createRow("Hidden Button", "Row 1", false, false));
+        rows.add(createRow("Hidden Button", "Row 2", false, true));
+        rows.add(createRow("Visible Button", "Row 3", true, false));
+        rows.add(createRow("Visible Button", "Row 4", true, true));
+
+        JFrame frame = new JFrame("A Frame hidden JButtons");
+        frame.getContentPane().add(rows);
+        frame.pack();
+        return frame;
+    }
+
+    /**
+     * Create a row to add to this demo frame.
+     *
+     * @param buttonText the button name/text
+     * @param panelAXName the panel accessible name
+     * @param isVisible whether JPanel.isVisible() should be true
+     * @param useNullAXComponent if true then
+     *                           AccessibleJPanel.getAccessibleComponent
+     *                           returns null. This was added to test a
+     *                           particular code path.
+     * @return a row for the demo frame
+     */
+    private static JPanel createRow(String buttonText, String panelAXName,
+                                    boolean isVisible,
+                                    boolean useNullAXComponent) {
+        JPanel returnValue = new JPanel() {
+            @Override
+            public AccessibleContext getAccessibleContext() {
+                if (accessibleContext == null) {
+                    accessibleContext = new AccessibleJPanel() {
+                        @Override
+                        public AccessibleComponent getAccessibleComponent() {
+                            if (useNullAXComponent) {
+                                return null;
+                            } else {
+                                return super.getAccessibleComponent();
+                            }
+                        }
+                    };
+                    accessibleContext.setAccessibleName(panelAXName);
+                }
+                return accessibleContext;
+            }
+        };
+        returnValue.setVisible(isVisible);
+        JButton button = new JButton(buttonText);
+        returnValue.add(button);
+        return returnValue;
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/8377745/VoiceOverHyperlinkRole.java b/test/jdk/javax/accessibility/8377745/VoiceOverHyperlinkRole.java
new file mode 100644
index 00000000000..0d18d320360
--- /dev/null
+++ b/test/jdk/javax/accessibility/8377745/VoiceOverHyperlinkRole.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.border.EmptyBorder;
+
+/*
+ * @test
+ * @key headful
+ * @bug 8377745
+ * @summary manual test for VoiceOver reading links correctly
+ * @requires os.family == "mac"
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual VoiceOverHyperlinkRole
+ */
+
+public class VoiceOverHyperlinkRole {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = "INSTRUCTIONS (Mac-only):\n" +
+                "1. Open VoiceOver\n" +
+                "2. Move the VoiceOver cursor over the link.\n" +
+                "3. Observe how VoiceOver identifies the link.\n\n" +
+                "Expected behavior: VoiceOver should identify it as a " +
+                "\"link\". It should not say \"text element\", \"text\" " +
+                "or \"hyperlink\".\n\n" +
+                "If you select the link using \"Accessibility " +
+                "Inspector\": it should identify its role as AXLink.";
+
+        PassFailJFrame.builder()
+                .title("VoiceOverHyperlinkRole Instruction")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(VoiceOverHyperlinkRole::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createUI() {
+        JPanel p = new JPanel();
+        p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
+
+        p.add(createText("This button uses `AccessibleRole.HYPERLINK:`"));
+        p.add(createLink(AccessibleRole.HYPERLINK));
+
+        // for debugging / experimentation:
+        boolean tryOtherRoles = false;
+        if (tryOtherRoles) {
+            p.add(createText(
+                    "This button uses `new AccessibleRole(\"Link\") {}`:"));
+            p.add(createLink(new AccessibleRole("Link") {}));
+            p.add(createText(
+                    "This button uses `new AccessibleRole(\"link\") {}`:"));
+            p.add(createLink(new AccessibleRole("link") {}));
+            p.add(createText(
+                    "This button uses `new AccessibleRole(\"AXLink\") {}`:"));
+            p.add(createLink(new AccessibleRole("AXLink") {}));
+        }
+
+        JFrame frame = new JFrame();
+        frame.getContentPane().add(p);
+        frame.pack();
+        return frame;
+    }
+
+    private static JTextArea createText(String text) {
+        JTextArea textArea = new JTextArea(text);
+        textArea.setOpaque(false);
+        textArea.setEditable(false);
+        textArea.setBorder(new EmptyBorder(20, 10, 3, 10));
+        return textArea;
+    }
+
+    private static JButton createLink(AccessibleRole role) {
+        String text = "<html><u>https://bugs.openjdk.org/</u></html>";
+        JButton button = new JButton(text) {
+            public AccessibleContext getAccessibleContext() {
+                if (accessibleContext == null) {
+                    accessibleContext = new AccessibleJButton() {
+                        @Override
+                        public AccessibleRole getAccessibleRole() {
+                            return role;
+                        }
+                    };
+                }
+                return accessibleContext;
+            }
+        };
+        button.setContentAreaFilled(false);
+        button.setBorderPainted(false);
+        return button;
+    }
+}
diff --git a/test/jdk/javax/accessibility/JSpinner/CustomSpinnerAccessibilityTest.java b/test/jdk/javax/accessibility/JSpinner/CustomSpinnerAccessibilityTest.java
new file mode 100644
index 00000000000..12c98c95110
--- /dev/null
+++ b/test/jdk/javax/accessibility/JSpinner/CustomSpinnerAccessibilityTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.GridLayout;
+import java.lang.reflect.InvocationTargetException;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerListModel;
+
+/*
+ * @test
+ * @bug 8286258
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @requires (os.family == "mac")
+ * @summary Checks that JSpinner with custom model announces
+ *          the value every time it is changed
+ * @run main/manual CustomSpinnerAccessibilityTest
+ */
+
+public class CustomSpinnerAccessibilityTest extends JPanel {
+    private static final String INSTRUCTIONS = """
+            1. Turn on VoiceOver
+            2. In the window named "Test UI" click on the text editor inside the
+               spinner component
+            3. Using up and down arrows change current month
+            4. Wait for the VoiceOver to finish speaking
+            5. Repeat steps 3 and 4 couple more times
+
+            If every time value of the spinner is changed VoiceOver
+            announces the new value click "Pass".
+            If instead the value is narrated only partially
+            and the new value is never fully narrated press "Fail".
+            """;
+
+    public CustomSpinnerAccessibilityTest() {
+        super(new GridLayout(0, 2));
+        String[] monthStrings = new java.text.DateFormatSymbols().getMonths();
+        int lastIndex = monthStrings.length - 1;
+        if (monthStrings[lastIndex] == null
+                || monthStrings[lastIndex].length() <= 0) {
+            String[] tmp = new String[lastIndex];
+            System.arraycopy(monthStrings, 0,
+                    tmp, 0, lastIndex);
+            monthStrings = tmp;
+        }
+
+        SpinnerListModel model = new SpinnerListModel(monthStrings);
+        JLabel label = new JLabel("Month: ");
+        add(label);
+        JSpinner spinner = new JSpinner(model);
+        label.setLabelFor(spinner);
+        add(spinner);
+    }
+
+    public static void main(String[] args) throws InterruptedException,
+            InvocationTargetException {
+        PassFailJFrame.builder()
+                .title("Custom Spinner Accessibility Test")
+                .instructions(INSTRUCTIONS)
+                .testUI(CustomSpinnerAccessibilityTest::new)
+                .build()
+                .awaitAndCheck();
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java b/test/jdk/javax/crypto/Cipher/TestDisabledWithOids.java
similarity index 53%
rename from test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
rename to test/jdk/javax/crypto/Cipher/TestDisabledWithOids.java
index 7cad887a5d9..d1d9fa7a5bb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/ExerciseGC.java
+++ b/test/jdk/javax/crypto/Cipher/TestDisabledWithOids.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -19,29 +19,29 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
-/*
+/**
  * @test
- * @summary Exercise GC with shared strings
- * @requires vm.cds.write.mapped.java.heap
- * @library /test/hotspot/jtreg/runtime/cds/appcds /test/lib
- * @build HelloStringGC jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run driver ExerciseGC
+ * @bug 8375549
+ * @summary Test JCE layer algorithm restriction using algorithms w/ oids
+ * @library /test/lib
+ * @run main/othervm -Djdk.crypto.disabledAlgorithms=Cipher.DES,Cipher.RSA/ECB/PKCS1Padding TestDisabledWithOids
+ * @run main/othervm -Djdk.crypto.disabledAlgorithms=Cipher.RSA/ECB/PKCS1Padding,Cipher.DES TestDisabledWithOids
  */
-public class ExerciseGC {
+import java.security.NoSuchAlgorithmException;
+import javax.crypto.Cipher;
+import jdk.test.lib.Utils;
+
+public class TestDisabledWithOids {
     public static void main(String[] args) throws Exception {
-        SharedStringsUtils.run(args, ExerciseGC::test);
-    }
-    public static void test(String[] args) throws Exception {
-        SharedStringsUtils.buildJarAndWhiteBox("HelloStringGC");
+        String algo1 = "RSA/ECB/PKCS1Padding";
+        String algo2 = "DES";
 
-        SharedStringsUtils.dumpWithWhiteBox(TestCommon.list("HelloStringGC"),
-            "SharedStringsBasic.txt", "-Xlog:cds,aot+hashtables");
-
-        SharedStringsUtils.runWithArchiveAndWhiteBox("HelloStringGC",
-            "-XX:+UnlockDiagnosticVMOptions", "-XX:+VerifyBeforeGC");
+        Utils.runAndCheckException(() -> Cipher.getInstance(algo1),
+                            NoSuchAlgorithmException.class);
+        Utils.runAndCheckException(() -> Cipher.getInstance(algo2),
+                            NoSuchAlgorithmException.class);
+        System.out.println("Done");
     }
 }
diff --git a/test/jdk/javax/imageio/ReadAbortTest.java b/test/jdk/javax/imageio/ReadAbortTest.java
index 7476dbe0de8..bda17aa4204 100644
--- a/test/jdk/javax/imageio/ReadAbortTest.java
+++ b/test/jdk/javax/imageio/ReadAbortTest.java
@@ -30,16 +30,17 @@
  *          calling IIOReadProgressListener.readAborted() for all readers.
  * @run     main ReadAbortTest
  */
+import java.awt.Color;
+import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.nio.file.Files;
 import java.util.Iterator;
+
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.event.IIOReadProgressListener;
 import javax.imageio.stream.ImageInputStream;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.nio.file.Files;
 
 public class ReadAbortTest implements IIOReadProgressListener {
 
@@ -103,7 +104,9 @@ public class ReadAbortTest implements IIOReadProgressListener {
         } catch (Exception e) {
             throw e;
         } finally {
-            Files.delete(file.toPath());
+            if (file != null && file.exists()) {
+                Files.delete(file.toPath());
+            }
         }
     }
 
diff --git a/test/jdk/javax/imageio/WriteAbortTest.java b/test/jdk/javax/imageio/WriteAbortTest.java
index 624ce16c94e..43abd703d7d 100644
--- a/test/jdk/javax/imageio/WriteAbortTest.java
+++ b/test/jdk/javax/imageio/WriteAbortTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,15 +30,16 @@
  *          calling IIOWriteProgressListener.readAborted() for all readers.
  * @run     main WriteAbortTest
  */
-import java.awt.image.BufferedImage;
-import java.io.File;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageInputStream;
 import java.awt.Color;
 import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
 import java.nio.file.Files;
+
+import javax.imageio.ImageIO;
 import javax.imageio.ImageWriter;
 import javax.imageio.event.IIOWriteProgressListener;
+import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
 
 public class WriteAbortTest implements IIOWriteProgressListener {
@@ -98,7 +99,9 @@ public class WriteAbortTest implements IIOWriteProgressListener {
                         + format);
             }
         } finally {
-            Files.delete(file.toPath());
+            if (file != null && file.exists()) {
+                Files.delete(file.toPath());
+            }
         }
     }
 
diff --git a/test/jdk/javax/management/security/SecurityTest.java b/test/jdk/javax/management/security/SecurityTest.java
index 7212aea883f..b46bbfa759f 100644
--- a/test/jdk/javax/management/security/SecurityTest.java
+++ b/test/jdk/javax/management/security/SecurityTest.java
@@ -402,6 +402,8 @@ public class SecurityTest {
         opts.add(JDKToolFinder.getJDKTool("java"));
         opts.addAll(Arrays.asList(jdk.test.lib.Utils.getTestJavaOpts()));
 
+        opts.add("-Djdk.rmi.ssl.client.enableEndpointIdentification=false");
+
         // We need to forward some properties to the client side
         opts.add("-Dtest.src=" + System.getProperty("test.src"));
 
diff --git a/test/jdk/javax/net/ssl/SSLParameters/NamedGroups.java b/test/jdk/javax/net/ssl/SSLParameters/NamedGroups.java
index 25f73606b96..786b907b79a 100644
--- a/test/jdk/javax/net/ssl/SSLParameters/NamedGroups.java
+++ b/test/jdk/javax/net/ssl/SSLParameters/NamedGroups.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (C) 2022, Tencent. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,7 +27,7 @@
 
 /*
  * @test
- * @bug 8281236
+ * @bug 8281236 8314323
  * @summary Check TLS connection behaviors for named groups configuration
  * @library /javax/net/ssl/templates
  * @run main/othervm NamedGroups
@@ -136,6 +137,60 @@ public class NamedGroups extends SSLSocketTemplate {
                         "secp256r1"
                 },
                 true);
+
+        runTest(new String[] {
+                        "X25519MLKEM768"
+                },
+                new String[] {
+                        "X25519MLKEM768"
+                },
+                false);
+
+        runTest(new String[] {
+                        "SecP256r1MLKEM768"
+                },
+                new String[] {
+                        "SecP256r1MLKEM768"
+                },
+                false);
+
+        runTest(new String[] {
+                        "SecP384r1MLKEM1024"
+                },
+                new String[] {
+                        "SecP384r1MLKEM1024"
+                },
+                false);
+
+        runTest(new String[] {
+                        "X25519MLKEM768"
+                },
+                new String[] {
+                        "SecP256r1MLKEM768"
+                },
+                true);
+
+        runTest(new String[] {
+                        "X25519MLKEM768"
+                },
+                new String[0],
+                true);
+
+        runTest(new String[] {
+                        "SecP256r1MLKEM768"
+                },
+                null,
+                true);
+
+        runTest(new String[] {
+                        "X25519MLKEM768",
+                        "x25519"
+                },
+                new String[] {
+                        "X25519MLKEM768",
+                        "x25519"
+                },
+                false);
     }
 
     private static void runTest(String[] serverNamedGroups,
diff --git a/test/jdk/javax/net/ssl/TLSCommon/NamedGroup.java b/test/jdk/javax/net/ssl/TLSCommon/NamedGroup.java
index ec89fe0d5b5..432a2bd1b0d 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/NamedGroup.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/NamedGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,11 @@ public enum NamedGroup {
     FFDHE3072("ffdhe3072"),
     FFDHE4096("ffdhe4096"),
     FFDHE6144("ffdhe6144"),
-    FFDHE8192("ffdhe8192");
+    FFDHE8192("ffdhe8192"),
+
+    X25519MLKEM768("X25519MLKEM768"),
+    SECP256R1MLKEM768("SecP256r1MLKEM768"),
+    SECP384R1MLKEM1024("SecP384r1MLKEM1024");
 
     public final String name;
 
diff --git a/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java b/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java
index efb9895b33c..ed26cf90a8c 100644
--- a/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java
+++ b/test/jdk/javax/net/ssl/TLSv13/ClientHelloKeyShares.java
@@ -26,16 +26,21 @@
 
 /*
  * @test
- * @bug 8247630
+ * @bug 8247630 8314323
  * @summary Use two key share entries
- * @run main/othervm ClientHelloKeyShares 29 23
+ * @run main/othervm ClientHelloKeyShares 4588 29
  * @run main/othervm -Djdk.tls.namedGroups=secp384r1,secp521r1,x448,ffdhe2048 ClientHelloKeyShares 24 30
  * @run main/othervm -Djdk.tls.namedGroups=sect163k1,sect163r1,x25519 ClientHelloKeyShares 29
  * @run main/othervm -Djdk.tls.namedGroups=sect163k1,sect163r1,secp256r1 ClientHelloKeyShares 23
  * @run main/othervm -Djdk.tls.namedGroups=sect163k1,sect163r1,ffdhe2048,ffdhe3072,ffdhe4096 ClientHelloKeyShares 256
  * @run main/othervm -Djdk.tls.namedGroups=sect163k1,ffdhe2048,x25519,secp256r1 ClientHelloKeyShares 256 29
  * @run main/othervm -Djdk.tls.namedGroups=secp256r1,secp384r1,ffdhe2048,x25519 ClientHelloKeyShares 23 256
- */
+ * @run main/othervm -Djdk.tls.namedGroups=X25519MLKEM768 ClientHelloKeyShares 4588
+ * @run main/othervm -Djdk.tls.namedGroups=x25519,X25519MLKEM768 ClientHelloKeyShares 29 4588
+ * @run main/othervm -Djdk.tls.namedGroups=SecP256r1MLKEM768,x25519 ClientHelloKeyShares 4587 29
+ * @run main/othervm -Djdk.tls.namedGroups=SecP384r1MLKEM1024,secp256r1 ClientHelloKeyShares 4589 23
+ * @run main/othervm -Djdk.tls.namedGroups=X25519MLKEM768,SecP256r1MLKEM768,X25519,secp256r1 ClientHelloKeyShares 4588 29
+*/
 
 import javax.net.ssl.*;
 import javax.net.ssl.SSLEngineResult.*;
@@ -62,10 +67,6 @@ public class ClientHelloKeyShares {
     private static final int HELLO_EXT_SUPP_VERS = 43;
     private static final int HELLO_EXT_KEY_SHARE = 51;
     private static final int TLS_PROT_VER_13 = 0x0304;
-    private static final int NG_SECP256R1 = 0x0017;
-    private static final int NG_SECP384R1 = 0x0018;
-    private static final int NG_X25519 = 0x001D;
-    private static final int NG_X448 = 0x001E;
 
     public static void main(String args[]) throws Exception {
         if (debug) {
diff --git a/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java b/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java
index 560faf87049..bd14e465e65 100644
--- a/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java
+++ b/test/jdk/javax/net/ssl/TLSv13/HRRKeyShares.java
@@ -26,10 +26,12 @@
 
 /*
  * @test
- * @bug 8247630
+ * @bug 8247630 8314323
  * @summary Use two key share entries
  * @library /test/lib
- * @run main/othervm -Djdk.tls.namedGroups=x25519,secp256r1,secp384r1 HRRKeyShares
+ * @run main/othervm
+ *     -Djdk.tls.namedGroups=x25519,secp256r1,secp384r1,X25519MLKEM768,SecP256r1MLKEM768,SecP384r1MLKEM1024
+ *     HRRKeyShares
  */
 
 import java.io.ByteArrayOutputStream;
@@ -72,6 +74,10 @@ public class HRRKeyShares {
     private static final int NG_SECP384R1 = 0x0018;
     private static final int NG_X25519 = 0x001D;
     private static final int NG_X448 = 0x001E;
+    private static final int NG_X25519_MLKEM768 = 0x11EC;
+    private static final int NG_SECP256R1_MLKEM768 = 0x11EB;
+    private static final int NG_SECP384R1_MLKEM1024 = 0x11ED;
+
     private static final int NG_GC512A = 0x0026;
     private static final int COMP_NONE = 0;
     private static final int ALERT_TYPE_FATAL = 2;
@@ -238,6 +244,18 @@ public class HRRKeyShares {
         System.out.println("Test 4: Bad HRR using known / unasserted x448");
         hrrKeyShareTest(NG_X448, false);
         System.out.println();
+
+        System.out.println("Test 5: Good HRR exchange using X25519MLKEM768");
+        hrrKeyShareTest(NG_X25519_MLKEM768, true);
+        System.out.println();
+
+        System.out.println("Test 6: Good HRR exchange using SecP256r1MLKEM768");
+        hrrKeyShareTest(NG_SECP256R1_MLKEM768, true);
+        System.out.println();
+
+        System.out.println("Test 7: Good HRR exchange using SecP384r1MLKEM1024");
+        hrrKeyShareTest(NG_SECP384R1_MLKEM1024, true);
+        System.out.println();
     }
 
     private static void logResult(String str, SSLEngineResult result) {
@@ -348,7 +366,8 @@ public class HRRKeyShares {
 
         try {
             // Now we're expecting to reissue the ClientHello, this time
-            // with a secp384r1 share.
+            // with a key share for the HRR requested named
+            // group (hrrNamedGroup).
             cTOs.compact();
             clientResult = engine.wrap(clientOut, cTOs);
             logResult("client wrap: ", clientResult);
diff --git a/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java b/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java
index c16fe0e5a82..8125b656de4 100644
--- a/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java
+++ b/test/jdk/javax/print/PrintServiceLookup/FlushCustomClassLoader.java
@@ -56,17 +56,6 @@ public final class FlushCustomClassLoader {
     }
 
     private static Reference<ClassLoader> getLoader(String m) throws Exception {
-        /*
-         * The print services are stored per the AppContext, and each AppContext
-         * caches the "current" class loader during creation.
-         * see javax.print.PrintServiceLookup.
-         *
-         * To prevent AppContext from cache our test loader we force AppContext
-         * creation early by the invokeAndWait.
-         * The "EventQueue.invokeAndWait(() -> {});" can be removed when the
-         * AppContext usage will be deleted in the PrintServiceLookup
-         */
-        EventQueue.invokeAndWait(() -> {});
 
         URL url = FlushCustomClassLoader.class.getProtectionDomain()
                                               .getCodeSource().getLocation();
diff --git a/test/jdk/javax/print/PrintablePrintDPI.java b/test/jdk/javax/print/PrintablePrintDPI.java
index 6cae2be532c..6b5e83df233 100644
--- a/test/jdk/javax/print/PrintablePrintDPI.java
+++ b/test/jdk/javax/print/PrintablePrintDPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2025, BELLSOFT. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -54,7 +54,7 @@ import java.awt.print.PrinterJob;
 
 /*
  * @test
- * @bug 8251928
+ * @bug 8251928 8375221
  * @key printer
  * @summary Printable.print method should reflect printer's DPI
  * @library /java/awt/regtesthelpers
@@ -201,7 +201,9 @@ public class PrintablePrintDPI implements Printable {
             attributeSet.add(OrientationRequested.PORTRAIT);
             job.setPrintService(printService);
             job.setPrintable(this);
-            job.print(attributeSet);
+            if (job.printDialog(attributeSet)) {
+                job.print(attributeSet);
+            }
         } catch (PrinterException ex) {
             throw new RuntimeException(ex);
         }
diff --git a/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java b/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
index 3aa7a98c394..7616b112e39 100644
--- a/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
+++ b/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
@@ -137,6 +137,7 @@ public class SSLSocketParametersTest extends SSLContextTemplate {
     }
 
     public static void main(String[] args) throws Exception {
+        System.setProperty("jdk.rmi.ssl.client.enableEndpointIdentification", "false");
         SSLSocketParametersTest test = new SSLSocketParametersTest();
         test.runTest(Integer.parseInt(args[0]));
     }
diff --git a/test/jdk/javax/sound/sampled/Clip/AutoCloseTimeCheck.java b/test/jdk/javax/sound/sampled/Clip/AutoCloseTimeCheck.java
index f823175ede8..edacc50fa42 100644
--- a/test/jdk/javax/sound/sampled/Clip/AutoCloseTimeCheck.java
+++ b/test/jdk/javax/sound/sampled/Clip/AutoCloseTimeCheck.java
@@ -39,6 +39,7 @@ import static javax.sound.sampled.AudioSystem.NOT_SPECIFIED;
 
 /**
  * @test
+ * @key sound
  * @bug 8202264
  */
 public final class AutoCloseTimeCheck {
diff --git a/test/jdk/javax/sound/sampled/Clip/bug5070081.java b/test/jdk/javax/sound/sampled/Clip/bug5070081.java
index e7bf7e30de2..89e9d591d28 100644
--- a/test/jdk/javax/sound/sampled/Clip/bug5070081.java
+++ b/test/jdk/javax/sound/sampled/Clip/bug5070081.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,8 @@ import javax.sound.sampled.LineUnavailableException;
 
 /*
  * @test
- * @bug 5070081
+ * @key sound
+ * @bug 5070081 8376152
  * @summary Tests that javax.sound.sampled.Clip does not loses position through
  *          stop/start
  */
diff --git a/test/jdk/javax/sql/testng/TEST.properties b/test/jdk/javax/sql/TEST.properties
similarity index 68%
rename from test/jdk/javax/sql/testng/TEST.properties
rename to test/jdk/javax/sql/TEST.properties
index cb97c160507..d9ed805344a 100644
--- a/test/jdk/javax/sql/testng/TEST.properties
+++ b/test/jdk/javax/sql/TEST.properties
@@ -1,7 +1,7 @@
-# JDBC unit tests uses TestNG
-TestNG.dirs= .
+# JDBC unit tests uses JUnit
+JUnit.dirs= .
 othervm.dirs= .
-lib.dirs = /java/sql/testng
+lib.dirs = /java/sql/util
 modules = java.sql.rowset/com.sun.rowset \
           java.sql.rowset/com.sun.rowset.internal \
           java.sql.rowset/com.sun.rowset.providers
diff --git a/test/jdk/javax/sql/testng/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory b/test/jdk/javax/sql/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory
similarity index 100%
rename from test/jdk/javax/sql/testng/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory
rename to test/jdk/javax/sql/jars/badFactory/META-INF/services/javax.sql.rowset.RowSetFactory
diff --git a/test/jdk/javax/sql/testng/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory b/test/jdk/javax/sql/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory
similarity index 100%
rename from test/jdk/javax/sql/testng/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory
rename to test/jdk/javax/sql/jars/goodFactory/META-INF/services/javax.sql.rowset.RowSetFactory
diff --git a/test/jdk/javax/sql/rowset/TEST.properties b/test/jdk/javax/sql/rowset/TEST.properties
deleted file mode 100644
index 6c5a2c7aceb..00000000000
--- a/test/jdk/javax/sql/rowset/TEST.properties
+++ /dev/null
@@ -1 +0,0 @@
-modules = java.sql.rowset
diff --git a/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java b/test/jdk/javax/sql/test/rowset/BaseRowSetTests.java
similarity index 83%
rename from test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/BaseRowSetTests.java
index c1d2d9a2ed0..8c47415db39 100644
--- a/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/BaseRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,14 +40,19 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Calendar;
+import java.util.stream.Stream;
 import javax.sql.RowSet;
 import javax.sql.rowset.serial.SerialArray;
 import javax.sql.rowset.serial.SerialBlob;
 import javax.sql.rowset.serial.SerialClob;
 import javax.sql.rowset.serial.SerialRef;
-import static org.testng.Assert.*;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.StubArray;
 import util.StubBaseRowSet;
 import util.StubBlob;
@@ -67,7 +72,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyCursorMoved is called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0000(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -78,7 +84,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowChanged is called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0001(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -89,7 +96,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowSetChanged is called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0002(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -101,7 +109,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyRowSetChanged
      * is called on all listeners
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0003(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         TestRowSetListener rsl2 = new TestRowSetListener();
@@ -116,7 +125,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyRowChanged
      * is called on all listeners
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0004(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         TestRowSetListener rsl2 = new TestRowSetListener();
@@ -131,7 +141,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyCursorMoved
      * is called on all listeners
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0005(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         TestRowSetListener rsl2 = new TestRowSetListener();
@@ -146,7 +157,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create a RowSetListener and validate that notifyRowSetChanged,
      * notifyRowChanged() and notifyCursorMoved are called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0006(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -163,7 +175,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Create multiple RowSetListeners and validate that notifyRowSetChanged,
      * notifyRowChanged() and notifyCursorMoved are called on all listeners
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0007(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         TestRowSetListener rsl2 = new TestRowSetListener();
@@ -185,7 +198,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * remove the listener, invoke notifyRowSetChanged again and verify the
      * listner is not called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0008(StubBaseRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -202,7 +216,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Set the base parameters and validate that the value set is
      * the correct type and value
      */
-    @Test(dataProvider = "testBaseParameters")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("testBaseParameters")
     public void baseRowSetTest0009(int pos, Object o) throws Exception {
         assertTrue(getParam(pos, o).getClass().isInstance(o));
         assertTrue(o.equals(getParam(pos, o)));
@@ -212,7 +227,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Set the complex parameters and validate that the value set is
      * the correct type
      */
-    @Test(dataProvider = "testAdvancedParameters")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("testAdvancedParameters")
     public void baseRowSetTest0010(int pos, Object o) throws Exception {
         assertTrue(getParam(pos, o).getClass().isInstance(o));
     }
@@ -220,7 +236,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Validate setNull specifying the supported type values
      */
-    @Test(dataProvider = "jdbcTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("jdbcTypes")
     public void baseRowSetTest0011(Integer type) throws Exception {
         brs = new StubBaseRowSet();
         brs.setNull(1, type);
@@ -231,7 +248,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
      * Validate setNull specifying the supported type values and that
      * typeName is set internally
      */
-    @Test(dataProvider = "jdbcTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("jdbcTypes")
     public void baseRowSetTest0012(Integer type) throws Exception {
         brs = new StubBaseRowSet();
         brs.setNull(1, type, "SUPERHERO");
@@ -274,7 +292,8 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * Validate that initParams() initializes the parameters
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void baseRowSetTest0016(StubBaseRowSet rs) throws Exception {
         rs.setInt(1, 1);
         rs.initParams();
@@ -285,8 +304,7 @@ public class BaseRowSetTests extends CommonRowSetTests {
     /*
      * DataProvider used to set parameters for basic types that are supported
      */
-    @DataProvider(name = "testBaseParameters")
-    private Object[][] testBaseParameters() throws SQLException {
+    private Stream<Arguments> testBaseParameters() throws SQLException {
         Integer aInt = 1;
         Long aLong = Long.MAX_VALUE;
         Short aShort = Short.MIN_VALUE;
@@ -320,34 +338,32 @@ public class BaseRowSetTests extends CommonRowSetTests {
         brs.setObject(17, query, Types.CHAR);
         brs.setObject(18, query, Types.CHAR, 0);
 
-        return new Object[][]{
-            {1, aInt},
-            {2, query},
-            {3, aLong},
-            {4, aBoolean},
-            {5, aShort},
-            {6, aDouble},
-            {7, bd},
-            {8, aFloat},
-            {9, aByte},
-            {10, aDate},
-            {11, aTime},
-            {12, aTimeStamp},
-            {13, aDate},
-            {14, aTime},
-            {15, aTimeStamp},
-            {16, query},
-            {17, query},
-            {18, query}
-
-        };
+        return Stream.of(
+            Arguments.of(1, aInt),
+            Arguments.of(2, query),
+            Arguments.of(3, aLong),
+            Arguments.of(4, aBoolean),
+            Arguments.of(5, aShort),
+            Arguments.of(6, aDouble),
+            Arguments.of(7, bd),
+            Arguments.of(8, aFloat),
+            Arguments.of(9, aByte),
+            Arguments.of(10, aDate),
+            Arguments.of(11, aTime),
+            Arguments.of(12, aTimeStamp),
+            Arguments.of(13, aDate),
+            Arguments.of(14, aTime),
+            Arguments.of(15, aTimeStamp),
+            Arguments.of(16, query),
+            Arguments.of(17, query),
+            Arguments.of(18, query)
+        );
     }
 
     /*
      * DataProvider used to set advanced parameters for types that are supported
      */
-    @DataProvider(name = "testAdvancedParameters")
-    private Object[][] testAdvancedParameters() throws SQLException {
+    private Stream<Arguments> testAdvancedParameters() throws SQLException {
 
         byte[] bytes = new byte[10];
         Ref aRef = new SerialRef(new StubRef("INTEGER", query));
@@ -367,17 +383,17 @@ public class BaseRowSetTests extends CommonRowSetTests {
         brs.setUnicodeStream(8, is, query.length());
         brs.setCharacterStream(9, rdr, query.length());
 
-        return new Object[][]{
-            {1, bytes},
-            {2, is},
-            {3, aRef},
-            {4, aArray},
-            {5, aBlob},
-            {6, aClob},
-            {7, is},
-            {8, is},
-            {9, rdr}
-        };
+        return Stream.of(
+            Arguments.of(1, bytes),
+            Arguments.of(2, is),
+            Arguments.of(3, aRef),
+            Arguments.of(4, aArray),
+            Arguments.of(5, aBlob),
+            Arguments.of(6, aClob),
+            Arguments.of(7, is),
+            Arguments.of(8, is),
+            Arguments.of(9, rdr)
+        );
     }
 
     /*
diff --git a/test/jdk/javax/sql/testng/test/rowset/CommonRowSetTests.java b/test/jdk/javax/sql/test/rowset/CommonRowSetTests.java
similarity index 67%
rename from test/jdk/javax/sql/testng/test/rowset/CommonRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/CommonRowSetTests.java
index 89492aefed5..5e8163fbf05 100644
--- a/test/jdk/javax/sql/testng/test/rowset/CommonRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/CommonRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,17 +43,23 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 import javax.sql.RowSet;
 import javax.sql.rowset.BaseRowSet;
 import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetMetaDataImpl;
 import javax.sql.rowset.RowSetProvider;
-import org.testng.Assert;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.BaseTest;
 import util.StubBlob;
 import util.StubClob;
@@ -98,7 +104,7 @@ public abstract class CommonRowSetTests extends BaseTest {
         try {
             rsf = RowSetProvider.newFactory();
         } catch (SQLException ex) {
-            Assert.fail(ex.getMessage());
+            fail(ex.getMessage());
         }
     }
 
@@ -111,84 +117,76 @@ public abstract class CommonRowSetTests extends BaseTest {
      * DataProvider used to specify the value to set and check for the
      * methods for fetch direction
      */
-    @DataProvider(name = "rowSetFetchDirection")
-    protected Object[][] rowSetFetchDirection() throws Exception {
+    protected Stream<Arguments> rowSetFetchDirection() throws Exception {
         RowSet rs = newInstance();
-        return new Object[][]{
-            {rs, ResultSet.FETCH_FORWARD},
-            {rs, ResultSet.FETCH_REVERSE},
-            {rs, ResultSet.FETCH_UNKNOWN}
-        };
+        return Stream.of(
+            Arguments.of(rs, ResultSet.FETCH_FORWARD),
+            Arguments.of(rs, ResultSet.FETCH_REVERSE),
+            Arguments.of(rs, ResultSet.FETCH_UNKNOWN)
+        );
     }
 
     /*
      * DataProvider used to specify the value to set and check for the
      * methods for Cursor Scroll Type
      */
-    @DataProvider(name = "rowSetScrollTypes")
-    protected Object[][] rowSetScrollTypes() throws Exception {
+    protected Stream<Arguments> rowSetScrollTypes() throws Exception {
         RowSet rs = newInstance();
 
-        return new Object[][]{
-            {rs, ResultSet.TYPE_FORWARD_ONLY},
-            {rs, ResultSet.TYPE_SCROLL_INSENSITIVE},
-            {rs, ResultSet.TYPE_SCROLL_SENSITIVE}
-        };
+        return Stream.of(
+            Arguments.of(rs, ResultSet.TYPE_FORWARD_ONLY),
+            Arguments.of(rs, ResultSet.TYPE_SCROLL_INSENSITIVE),
+            Arguments.of(rs, ResultSet.TYPE_SCROLL_SENSITIVE)
+        );
     }
 
     /*
      * DataProvider used to specify the value to set and check for
      * methods using transaction isolation types
      */
-    @DataProvider(name = "rowSetIsolationTypes")
-    protected Object[][] rowSetIsolationTypes() throws Exception {
+    protected Stream<Arguments> rowSetIsolationTypes() throws Exception {
         RowSet rs = newInstance();
 
-        return new Object[][]{
-            {rs, Connection.TRANSACTION_NONE},
-            {rs, Connection.TRANSACTION_READ_COMMITTED},
-            {rs, Connection.TRANSACTION_READ_UNCOMMITTED},
-            {rs, Connection.TRANSACTION_REPEATABLE_READ},
-            {rs, Connection.TRANSACTION_SERIALIZABLE}
-        };
+        return Stream.of(
+            Arguments.of(rs, Connection.TRANSACTION_NONE),
+            Arguments.of(rs, Connection.TRANSACTION_READ_COMMITTED),
+            Arguments.of(rs, Connection.TRANSACTION_READ_UNCOMMITTED),
+            Arguments.of(rs, Connection.TRANSACTION_REPEATABLE_READ),
+            Arguments.of(rs, Connection.TRANSACTION_SERIALIZABLE)
+        );
     }
 
     /*
      * DataProvider used to specify the value to set and check for the
      * methods for Concurrency
      */
-    @DataProvider(name = "rowSetConcurrencyTypes")
-    protected Object[][] rowSetConcurrencyTypes() throws Exception {
+    protected Stream<Arguments> rowSetConcurrencyTypes() throws Exception {
         RowSet rs = newInstance();
-        return new Object[][]{
-            {rs, ResultSet.CONCUR_READ_ONLY},
-            {rs, ResultSet.CONCUR_UPDATABLE}
-        };
+        return Stream.of(
+            Arguments.of(rs, ResultSet.CONCUR_READ_ONLY),
+            Arguments.of(rs, ResultSet.CONCUR_UPDATABLE)
+        );
     }
 
     /*
      * DataProvider used to specify the value to set and check for
      * methods using boolean values
      */
-    @DataProvider(name = "rowSetTrueFalse")
-    protected Object[][] rowSetTrueFalse() throws Exception {
+    protected Stream<Arguments> rowSetTrueFalse() throws Exception {
         RowSet rs = newInstance();
-        return new Object[][]{
-            {rs, true},
-            {rs, false}
-        };
+        return Stream.of(
+            Arguments.of(rs, true),
+            Arguments.of(rs, false)
+        );
     }
     /*
      * DataProvider used to specify the type of RowSet to use.  We also must
      * initialize the RowSet
      */
-    @DataProvider(name = "rowSetType")
-    protected Object[][] rowSetType() throws Exception {
+    protected Stream<RowSet> rowSetType() throws Exception {
 
         RowSet rs = newInstance();
-        return new Object[][]{
-            {rs}
-        };
+        return Stream.of(rs);
     }
 
     /*
@@ -503,7 +501,8 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCommand() returns null by default
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0000(RowSet rs) {
         assertNull(rs.getCommand());
     }
@@ -511,7 +510,8 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCommand() returns command specified to setCommand
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0001(RowSet rs) throws Exception {
         rs.setCommand(query);
         assertTrue(rs.getCommand().equals(query));
@@ -521,7 +521,8 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCurrency() returns the correct default value
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0002(RowSet rs) throws Exception {
         assertTrue(rs.getConcurrency() == ResultSet.CONCUR_UPDATABLE);
     }
@@ -530,7 +531,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getCurrency() returns the correct value
      * after a call to setConcurrency())
      */
-    @Test(dataProvider = "rowSetConcurrencyTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetConcurrencyTypes")
     public void commonRowSetTest0003(RowSet rs, int concurType) throws Exception {
         rs.setConcurrency(concurType);
         assertTrue(rs.getConcurrency() == concurType);
@@ -539,15 +541,17 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getCurrency() throws a SQLException for an invalid value
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0004(RowSet rs) throws Exception {
-        rs.setConcurrency(ResultSet.CLOSE_CURSORS_AT_COMMIT);
+        assertThrows(SQLException.class, () -> rs.setConcurrency(ResultSet.CLOSE_CURSORS_AT_COMMIT));
     }
 
     /*
      * Validate that getDataSourceName() returns null by default
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0005(RowSet rs) throws Exception {
         assertTrue(rs.getDataSourceName() == null);
     }
@@ -556,7 +560,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getDataSourceName() returns the value specified
      * by setDataSourceName() and getUrl() returns null
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0006(RowSet rs) throws Exception {
         rs.setUrl(url);
         rs.setDataSourceName(dsName);
@@ -568,16 +573,20 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that setDataSourceName() throws a SQLException for an empty
      * String specified for the data source name
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0007(RowSet rs) throws Exception {
-        String dsname = "";
-        rs.setDataSourceName(dsname);
+        assertThrows(SQLException.class, () -> {
+            String dsname = "";
+            rs.setDataSourceName(dsname);
+        });
     }
 
     /*
      * Validate that getEscapeProcessing() returns false by default
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0008(RowSet rs) throws Exception {
         assertTrue(rs.getEscapeProcessing());
     }
@@ -586,7 +595,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getEscapeProcessing() returns value set by
      * setEscapeProcessing()
      */
-    @Test(dataProvider = "rowSetTrueFalse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetTrueFalse")
     public void commonRowSetTest0009(RowSet rs, boolean val) throws Exception {
         rs.setEscapeProcessing(val);
         assertTrue(rs.getEscapeProcessing() == val);
@@ -595,7 +605,8 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getFetchDirection() returns the correct default value
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0010(RowSet rs) throws Exception {
         assertTrue(rs.getFetchDirection() == ResultSet.FETCH_FORWARD);
     }
@@ -604,7 +615,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getFetchDirection() returns the value set by
      * setFetchDirection()
      */
-    @Test(dataProvider = "rowSetFetchDirection")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetFetchDirection")
     public void commonRowSetTest0011(RowSet rs, int direction) throws Exception {
         rs.setFetchDirection(direction);
         assertTrue(rs.getFetchDirection() == direction);
@@ -613,26 +625,31 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that setFetchSize() throws a SQLException for an invalid value
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0013(RowSet rs) throws Exception {
-        rs.setFetchSize(-1);
+        assertThrows(SQLException.class, () -> rs.setFetchSize(-1));
     }
 
     /*
      * Validate that setFetchSize() throws a SQLException for a
      * value greater than getMaxRows()
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0014(RowSet rs) throws Exception {
-        rs.setMaxRows(5);
-        rs.setFetchSize(rs.getMaxRows() + 1);
+        assertThrows(SQLException.class, () -> {
+            rs.setMaxRows(5);
+            rs.setFetchSize(rs.getMaxRows() + 1);
+        });
     }
 
     /*
      * Validate that getFetchSize() returns the correct value after
      * setFetchSize() has been called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0015(RowSet rs) throws Exception {
         int maxRows = 150;
         rs.setFetchSize(0);
@@ -647,16 +664,18 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that setMaxFieldSize() throws a SQLException for an invalid value
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0016(RowSet rs) throws Exception {
-        rs.setMaxFieldSize(-1);
+        assertThrows(SQLException.class, () -> rs.setMaxFieldSize(-1));
     }
 
     /*
      * Validate that getMaxFieldSize() returns the value set by
      * setMaxFieldSize()
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0017(RowSet rs) throws Exception {
         rs.setMaxFieldSize(0);
         assertTrue(rs.getMaxFieldSize() == 0);
@@ -670,7 +689,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that isReadOnly() returns value set by
      * setReadOnly()
      */
-    @Test(dataProvider = "rowSetTrueFalse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetTrueFalse")
     public void commonRowSetTest0018(RowSet rs, boolean val) throws Exception {
         rs.setReadOnly(val);
         assertTrue(rs.isReadOnly() == val);
@@ -680,7 +700,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getTransactionIsolation() returns value set by
      * setTransactionIsolation()
      */
-    @Test(dataProvider = "rowSetIsolationTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetIsolationTypes")
     public void commonRowSetTest0019(RowSet rs, int val) throws Exception {
         rs.setTransactionIsolation(val);
         assertTrue(rs.getTransactionIsolation() == val);
@@ -689,7 +710,8 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Validate that getType() returns value set by setType()
      */
-    @Test(dataProvider = "rowSetScrollTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetScrollTypes")
     public void commonRowSetTest0020(RowSet rs, int val) throws Exception {
         rs.setType(val);
         assertTrue(rs.getType() == val);
@@ -699,7 +721,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getEscapeProcessing() returns value set by
      * setEscapeProcessing()
      */
-    @Test(dataProvider = "rowSetTrueFalse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetTrueFalse")
     public void commonRowSetTest0021(BaseRowSet rs, boolean val) throws Exception {
         rs.setShowDeleted(val);
         assertTrue(rs.getShowDeleted() == val);
@@ -709,7 +732,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getTypeMap() returns same value set by
      * setTypeMap()
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0022(RowSet rs) throws Exception {
         Map<String, Class<?>> map = new HashMap<>();
         map.put("SUPERHERO", Class.forName("util.SuperHero"));
@@ -721,7 +745,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getUsername() returns same value set by
      * setUsername()
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0023(RowSet rs) throws Exception {
         rs.setUsername(user);
         assertTrue(rs.getUsername().equals(user));
@@ -731,7 +756,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getPassword() returns same password set by
      * setPassword()
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0024(RowSet rs) throws Exception {
         rs.setPassword(password);
         assertTrue(rs.getPassword().equals(password));
@@ -741,7 +767,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getQueryTimeout() returns same value set by
      * setQueryTimeout() and that 0 is a valid timeout value
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0025(RowSet rs) throws Exception {
         int timeout = 0;
         rs.setQueryTimeout(timeout);
@@ -752,7 +779,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getQueryTimeout() returns same value set by
      * setQueryTimeout() and that 0 is a valid timeout value
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0026(RowSet rs) throws Exception {
         int timeout = 10000;
         rs.setQueryTimeout(timeout);
@@ -763,9 +791,10 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that setQueryTimeout() throws a SQLException for a timeout
      * value < 0
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0027(RowSet rs) throws Exception {
-        rs.setQueryTimeout(-1);
+        assertThrows(SQLException.class, () -> rs.setQueryTimeout(-1));
     }
 
 
@@ -773,7 +802,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate addRowSetListener does not throw an Exception when null is
      * passed as the parameter
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0028(RowSet rs) throws Exception {
         rs.addRowSetListener(null);
     }
@@ -782,7 +812,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate removeRowSetListener does not throw an Exception when null is
      * passed as the parameter
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0029(RowSet rs) throws Exception {
         rs.removeRowSetListener(null);
     }
@@ -790,7 +821,8 @@ public abstract class CommonRowSetTests extends BaseTest {
     /*
      * Set two parameters and then validate clearParameters() will clear them
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0030(BaseRowSet rs) throws Exception {
         rs.setInt(1, 1);
         rs.setString(2, query);
@@ -803,7 +835,8 @@ public abstract class CommonRowSetTests extends BaseTest {
      * Validate that getURL() returns same value set by
      * setURL()
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0031(RowSet rs) throws Exception {
         rs.setUrl(url);
         assertTrue(rs.getUrl().equals(url));
@@ -813,560 +846,614 @@ public abstract class CommonRowSetTests extends BaseTest {
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0100(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setAsciiStream(1, is);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setAsciiStream(1, is);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0101(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setAsciiStream("one", is);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setAsciiStream("one", is);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0102(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setAsciiStream("one", is, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setAsciiStream("one", is, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0103(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setBinaryStream(1, is);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setBinaryStream(1, is);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0104(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setBinaryStream("one", is);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setBinaryStream("one", is);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0105(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setBinaryStream("one", is, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setBinaryStream("one", is, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0106(RowSet rs) throws Exception {
-        rs.setBigDecimal("one", BigDecimal.ONE);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setBigDecimal("one", BigDecimal.ONE));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0107(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setBlob(1, is);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setBlob(1, is);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0108(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setBlob("one", is);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setBlob("one", is);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0109(RowSet rs) throws Exception {
-        InputStream is = null;
-        rs.setBlob("one", is, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            InputStream is = null;
+            rs.setBlob("one", is, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0110(RowSet rs) throws Exception {
-        rs.setBlob("one", new StubBlob());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setBlob("one", new StubBlob()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0111(RowSet rs) throws Exception {
-        rs.setBoolean("one", true);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setBoolean("one", true));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0112(RowSet rs) throws Exception {
-        byte b = 1;
-        rs.setByte("one", b);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            byte b = 1;
+            rs.setByte("one", b);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0113(RowSet rs) throws Exception {
-        byte b = 1;
-        rs.setBytes("one", new byte[10]);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            byte b = 1;
+            rs.setBytes("one", new byte[10]);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0114(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setCharacterStream("one", rdr, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setCharacterStream("one", rdr, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0115(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setCharacterStream("one", rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setCharacterStream("one", rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0116(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setCharacterStream(1, rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setCharacterStream(1, rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0117(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setClob(1, rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setClob(1, rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0118(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setClob("one", rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setClob("one", rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0119(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setClob("one", rdr, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setClob("one", rdr, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0120(RowSet rs) throws Exception {
-        rs.setClob("one", new StubClob());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setClob("one", new StubClob()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0121(RowSet rs) throws Exception {
-        rs.setDate("one", Date.valueOf(LocalDate.now()));
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setDate("one", Date.valueOf(LocalDate.now())));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0122(RowSet rs) throws Exception {
-        rs.setDate("one", Date.valueOf(LocalDate.now()),
-                Calendar.getInstance());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setDate("one", Date.valueOf(LocalDate.now()),
+                Calendar.getInstance()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0123(RowSet rs) throws Exception {
-        rs.setTime("one", Time.valueOf(LocalTime.now()));
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setTime("one", Time.valueOf(LocalTime.now())));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0124(RowSet rs) throws Exception {
-        rs.setTime("one", Time.valueOf(LocalTime.now()),
-                Calendar.getInstance());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setTime("one", Time.valueOf(LocalTime.now()),
+                Calendar.getInstance()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0125(RowSet rs) throws Exception {
-        rs.setTimestamp("one", Timestamp.valueOf(LocalDateTime.now()));
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setTimestamp("one", Timestamp.valueOf(LocalDateTime.now())));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0126(RowSet rs) throws Exception {
-        rs.setTimestamp("one", Timestamp.valueOf(LocalDateTime.now()),
-                Calendar.getInstance());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setTimestamp("one", Timestamp.valueOf(LocalDateTime.now()),
+                Calendar.getInstance()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0127(RowSet rs) throws Exception {
-        rs.setDouble("one", 2.0d);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setDouble("one", 2.0d));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0128(RowSet rs) throws Exception {
-        rs.setFloat("one", 2.0f);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setFloat("one", 2.0f));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0129(RowSet rs) throws Exception {
-        rs.setInt("one", 21);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setInt("one", 21));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0130(RowSet rs) throws Exception {
-        rs.setLong("one", 21l);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setLong("one", 21l));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0131(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setNCharacterStream("one", rdr, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setNCharacterStream("one", rdr, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0132(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setNCharacterStream("one", rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setNCharacterStream("one", rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0133(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setNCharacterStream(1, rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setNCharacterStream(1, rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0134(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setNCharacterStream(1, rdr, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setNCharacterStream(1, rdr, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0135(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setClob("one", rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setClob("one", rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0136(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setClob("one", rdr, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setClob("one", rdr, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0137(RowSet rs) throws Exception {
-        rs.setNClob("one", new StubNClob());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNClob("one", new StubNClob()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0138(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setNClob(1, rdr);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setNClob(1, rdr);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0139(RowSet rs) throws Exception {
-        Reader rdr = null;
-        rs.setNClob(1, rdr, query.length());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            Reader rdr = null;
+            rs.setNClob(1, rdr, query.length());
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0140(RowSet rs) throws Exception {
-        rs.setNClob(1, new StubNClob());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNClob(1, new StubNClob()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0141(RowSet rs) throws Exception {
-        rs.setNString(1, query);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNString(1, query));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0142(RowSet rs) throws Exception {
-        rs.setNull("one", Types.INTEGER);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNull("one", Types.INTEGER));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0143(RowSet rs) throws Exception {
-        rs.setNull("one", Types.INTEGER, "my.type");
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNull("one", Types.INTEGER, "my.type"));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0144(RowSet rs) throws Exception {
-        rs.setObject("one", query, Types.VARCHAR);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setObject("one", query, Types.VARCHAR));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0145(RowSet rs) throws Exception {
-        rs.setObject("one", query, Types.VARCHAR, 0);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setObject("one", query, Types.VARCHAR, 0));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0146(RowSet rs) throws Exception {
-        rs.setObject("one", query);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setObject("one", query));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0147(RowSet rs) throws Exception {
-        RowId aRowid = null;
-        rs.setRowId("one", aRowid);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            RowId aRowid = null;
+            rs.setRowId("one", aRowid);
+        });
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0148(RowSet rs) throws Exception {
-        rs.setSQLXML("one", new StubSQLXML());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setSQLXML("one", new StubSQLXML()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0149(RowSet rs) throws Exception {
-        rs.setSQLXML(1, new StubSQLXML());
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setSQLXML(1, new StubSQLXML()));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0150(RowSet rs) throws Exception {
-        rs.setNString(1, query);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNString(1, query));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0151(RowSet rs) throws Exception {
-        rs.setNString("one", query);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> rs.setNString("one", query));
     }
 
     /*
      * This method is currently not implemented in BaseRowSet and will
      * throw a SQLFeatureNotSupportedException
      */
-    @Test(dataProvider = "rowSetType",
-            expectedExceptions = SQLFeatureNotSupportedException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonRowSetTest0152(RowSet rs) throws Exception {
-        short val = 21;
-        rs.setShort("one", val);
+        assertThrows(SQLFeatureNotSupportedException.class, () -> {
+            short val = 21;
+            rs.setShort("one", val);
+        });
     }
 
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/RowSetFactoryTests.java b/test/jdk/javax/sql/test/rowset/RowSetFactoryTests.java
similarity index 80%
rename from test/jdk/javax/sql/testng/test/rowset/RowSetFactoryTests.java
rename to test/jdk/javax/sql/test/rowset/RowSetFactoryTests.java
index 72a4341c7aa..480033afc2b 100644
--- a/test/jdk/javax/sql/testng/test/rowset/RowSetFactoryTests.java
+++ b/test/jdk/javax/sql/test/rowset/RowSetFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,15 @@
 package test.rowset;
 
 import java.sql.SQLException;
+import java.util.stream.Stream;
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetProvider;
-import static org.testng.Assert.*;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.BaseTest;
 
 public class RowSetFactoryTests extends BaseTest {
@@ -50,7 +54,8 @@ public class RowSetFactoryTests extends BaseTest {
      * Validate that the RowSetFactory returned by RowSetProvider.newFactory()
      * returns the correct RowSet implementations
      */
-    @Test(dataProvider = "RowSetValues", enabled = true)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("RowSetValues")
     public void test(RowSetFactory rsf, String impl) throws SQLException {
         validateRowSetImpl(rsf, impl);
     }
@@ -98,22 +103,20 @@ public class RowSetFactoryTests extends BaseTest {
      * DataProvider used to provide the RowSetFactory and the RowSet
      * implementation that should be returned
      */
-    @DataProvider(name = "RowSetValues")
-    private Object[][] RowSetValues() throws SQLException {
+    private Stream<Arguments> RowSetValues() throws SQLException {
         RowSetFactory rsf = RowSetProvider.newFactory();
         RowSetFactory rsf1 = RowSetProvider.newFactory(STUB_FACTORY_CLASSNAME, null);
-        return new Object[][]{
-            {rsf, DEFAULT_CACHEDROWSET_CLASSNAME},
-            {rsf, DEFAULT_FILTEREDROWSET_CLASSNAME},
-            {rsf, DEFAULT_JDBCROWSET_CLASSNAME},
-            {rsf, DEFAULT_JOINROWSET_CLASSNAME},
-            {rsf, DEFAULT_WEBROWSET_CLASSNAME},
-            {rsf1, STUB_CACHEDROWSET_CLASSNAME},
-            {rsf1, STUB_FILTEREDROWSET_CLASSNAME},
-            {rsf1, STUB_JDBCROWSET_CLASSNAME},
-            {rsf1, STUB_JOINROWSET_CLASSNAME},
-            {rsf1, STUB_WEBROWSET_CLASSNAME}
-
-        };
+        return Stream.of(
+            Arguments.of(rsf, DEFAULT_CACHEDROWSET_CLASSNAME),
+            Arguments.of(rsf, DEFAULT_FILTEREDROWSET_CLASSNAME),
+            Arguments.of(rsf, DEFAULT_JDBCROWSET_CLASSNAME),
+            Arguments.of(rsf, DEFAULT_JOINROWSET_CLASSNAME),
+            Arguments.of(rsf, DEFAULT_WEBROWSET_CLASSNAME),
+            Arguments.of(rsf1, STUB_CACHEDROWSET_CLASSNAME),
+            Arguments.of(rsf1, STUB_FILTEREDROWSET_CLASSNAME),
+            Arguments.of(rsf1, STUB_JDBCROWSET_CLASSNAME),
+            Arguments.of(rsf1, STUB_JOINROWSET_CLASSNAME),
+            Arguments.of(rsf1, STUB_WEBROWSET_CLASSNAME)
+        );
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/RowSetMetaDataTests.java b/test/jdk/javax/sql/test/rowset/RowSetMetaDataTests.java
similarity index 55%
rename from test/jdk/javax/sql/testng/test/rowset/RowSetMetaDataTests.java
rename to test/jdk/javax/sql/test/rowset/RowSetMetaDataTests.java
index 8a944a8bbb1..59dc4f43033 100644
--- a/test/jdk/javax/sql/testng/test/rowset/RowSetMetaDataTests.java
+++ b/test/jdk/javax/sql/test/rowset/RowSetMetaDataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,19 @@ package test.rowset;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import javax.sql.RowSetMetaData;
 import javax.sql.rowset.RowSetMetaDataImpl;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.junit.jupiter.params.provider.ValueSource;
 import util.BaseTest;
 
 public class RowSetMetaDataTests extends BaseTest {
@@ -40,7 +47,7 @@ public class RowSetMetaDataTests extends BaseTest {
     // Instance to be used within the tests
     private RowSetMetaDataImpl rsmd;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         rsmd = new RowSetMetaDataImpl();
         rsmd.setColumnCount(MAX_COLUMNS);
@@ -49,325 +56,325 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test(Integer col) throws Exception {
-        rsmd.getCatalogName(col);
+        assertThrows(SQLException.class, () -> rsmd.getCatalogName(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test01(Integer col) throws Exception {
-        rsmd.getColumnClassName(col);
+        assertThrows(SQLException.class, () -> rsmd.getColumnClassName(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test02(Integer col) throws Exception {
-        rsmd.getColumnDisplaySize(col);
+        assertThrows(SQLException.class, () -> rsmd.getColumnDisplaySize(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test03(Integer col) throws Exception {
-        rsmd.getColumnLabel(col);
+        assertThrows(SQLException.class, () -> rsmd.getColumnLabel(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test04(Integer col) throws Exception {
-        rsmd.getColumnName(col);
+        assertThrows(SQLException.class, () -> rsmd.getColumnName(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test05(Integer col) throws Exception {
-        rsmd.getColumnType(col);
+        assertThrows(SQLException.class, () -> rsmd.getColumnType(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test06(Integer col) throws Exception {
-        rsmd.getColumnTypeName(col);
+        assertThrows(SQLException.class, () -> rsmd.getColumnTypeName(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test07(Integer col) throws Exception {
-        rsmd.getPrecision(col);
+        assertThrows(SQLException.class, () -> rsmd.getPrecision(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test08(Integer col) throws Exception {
-        rsmd.getScale(col);
+        assertThrows(SQLException.class, () -> rsmd.getScale(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test09(Integer col) throws Exception {
-        rsmd.getSchemaName(col);
+        assertThrows(SQLException.class, () -> rsmd.getSchemaName(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test10(Integer col) throws Exception {
-        rsmd.getTableName(col);
+        assertThrows(SQLException.class, () -> rsmd.getTableName(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test11(Integer col) throws Exception {
-        rsmd.isAutoIncrement(col);
+        assertThrows(SQLException.class, () -> rsmd.isAutoIncrement(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test12(Integer col) throws Exception {
-        rsmd.isCaseSensitive(col);
+        assertThrows(SQLException.class, () -> rsmd.isCaseSensitive(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test13(Integer col) throws Exception {
-        rsmd.isCurrency(col);
+        assertThrows(SQLException.class, () -> rsmd.isCurrency(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test14(Integer col) throws Exception {
-        rsmd.isDefinitelyWritable(col);
+        assertThrows(SQLException.class, () -> rsmd.isDefinitelyWritable(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test15(Integer col) throws Exception {
-        rsmd.isNullable(col);
+        assertThrows(SQLException.class, () -> rsmd.isNullable(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test16(Integer col) throws Exception {
-        rsmd.isReadOnly(col);
+        assertThrows(SQLException.class, () -> rsmd.isReadOnly(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test17(Integer col) throws Exception {
-        rsmd.isSearchable(col);
+        assertThrows(SQLException.class, () -> rsmd.isSearchable(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test18(Integer col) throws Exception {
-        rsmd.isSigned(col);
+        assertThrows(SQLException.class, () -> rsmd.isSigned(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test19(Integer col) throws Exception {
-        rsmd.isWritable(col);
+        assertThrows(SQLException.class, () -> rsmd.isWritable(col));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test20(Integer col) throws Exception {
-        rsmd.setAutoIncrement(col, true);
+        assertThrows(SQLException.class, () -> rsmd.setAutoIncrement(col, true));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test21(Integer col) throws Exception {
-        rsmd.setCaseSensitive(col, true);
+        assertThrows(SQLException.class, () -> rsmd.setCaseSensitive(col, true));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test22(Integer col) throws Exception {
-        rsmd.setCatalogName(col, null);
+        assertThrows(SQLException.class, () -> rsmd.setCatalogName(col, null));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test23(Integer col) throws Exception {
-        rsmd.setColumnDisplaySize(col, 5);
+        assertThrows(SQLException.class, () -> rsmd.setColumnDisplaySize(col, 5));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test24(Integer col) throws Exception {
-        rsmd.setColumnLabel(col, "label");
+        assertThrows(SQLException.class, () -> rsmd.setColumnLabel(col, "label"));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test25(Integer col) throws Exception {
-        rsmd.setColumnName(col, "F1");
+        assertThrows(SQLException.class, () -> rsmd.setColumnName(col, "F1"));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test26(Integer col) throws Exception {
-        rsmd.setColumnType(col, Types.CHAR);
+        assertThrows(SQLException.class, () -> rsmd.setColumnType(col, Types.CHAR));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test27(Integer col) throws Exception {
-        rsmd.setColumnTypeName(col, "F1");
+        assertThrows(SQLException.class, () -> rsmd.setColumnTypeName(col, "F1"));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test28(Integer col) throws Exception {
-        rsmd.setCurrency(col, true);
+        assertThrows(SQLException.class, () -> rsmd.setCurrency(col, true));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test29(Integer col) throws Exception {
-        rsmd.setNullable(col, ResultSetMetaData.columnNoNulls);
+        assertThrows(SQLException.class, () -> rsmd.setNullable(col, ResultSetMetaData.columnNoNulls));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test30(Integer col) throws Exception {
-        rsmd.setPrecision(col, 2);
+        assertThrows(SQLException.class, () -> rsmd.setPrecision(col, 2));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test31(Integer col) throws Exception {
-        rsmd.setScale(col, 2);
+        assertThrows(SQLException.class, () -> rsmd.setScale(col, 2));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test32(Integer col) throws Exception {
-        rsmd.setSchemaName(col, "Gotham");
+        assertThrows(SQLException.class, () -> rsmd.setSchemaName(col, "Gotham"));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test33(Integer col) throws Exception {
-        rsmd.setSearchable(col, false);
+        assertThrows(SQLException.class, () -> rsmd.setSearchable(col, false));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test34(Integer col) throws Exception {
-        rsmd.setSigned(col, false);
+        assertThrows(SQLException.class, () -> rsmd.setSigned(col, false));
     }
 
     /*
      * Validate a SQLException is thrown for an invalid column index
      */
-    @Test(dataProvider = "invalidColumnRanges",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("invalidColumnRanges")
     public void test35(Integer col) throws Exception {
-        rsmd.setTableName(col, "SUPERHEROS");
+        assertThrows(SQLException.class, () -> rsmd.setTableName(col, "SUPERHEROS"));
     }
 
     /*
@@ -375,7 +382,8 @@ public class RowSetMetaDataTests extends BaseTest {
      * Note:  Once setColumnClassName is added to RowSetMetaData, this
      * method will need to change.
      */
-    @Test(dataProvider = "columnClassNames")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("columnClassNames")
     public void test36(Integer type, String name) throws Exception {
         rsmd.setColumnType(1, type);
         assertTrue(rsmd.getColumnClassName(1).equals(name));
@@ -385,7 +393,8 @@ public class RowSetMetaDataTests extends BaseTest {
      * Validate that all of the methods are accessible and the correct value
      * is returned for each column
      */
-    @Test(dataProvider = "columnRanges")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("columnRanges")
     public void test37(Integer col) throws Exception {
         rsmd.setAutoIncrement(col, true);
         assertTrue(rsmd.isAutoIncrement(col));
@@ -429,7 +438,8 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate that the proper values are accepted by setNullable
      */
-    @Test(dataProvider = "validSetNullableValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("validSetNullableValues")
     public void test38(Integer val) throws Exception {
         rsmd.setNullable(1, val);
     }
@@ -437,7 +447,8 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate that the correct type is returned for the column
      */
-    @Test(dataProvider = "jdbcTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("jdbcTypes")
     public void test39(Integer type) throws Exception {
         rsmd.setColumnType(1, type);
         assertTrue(type == rsmd.getColumnType(1));
@@ -446,7 +457,8 @@ public class RowSetMetaDataTests extends BaseTest {
     /*
      * Validate that the correct value is returned from the isXXX methods
      */
-    @Test(dataProvider = "trueFalse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @ValueSource(booleans = {true, false})
     public void test40(Boolean b) throws Exception {
         rsmd.setAutoIncrement(1, b);
         rsmd.setCaseSensitive(1, b);
@@ -483,73 +495,62 @@ public class RowSetMetaDataTests extends BaseTest {
      * to validate that an IllegalArgumentException will be thrown from the
      * valueOf method
      */
-    @DataProvider(name = "validSetNullableValues")
-    private Object[][] validSetNullableValues() {
-        return new Object[][]{
-            {ResultSetMetaData.columnNoNulls},
-            {ResultSetMetaData.columnNullable},
-            {ResultSetMetaData.columnNullableUnknown}
-        };
+    private Stream<Integer> validSetNullableValues() {
+        return Stream.of(
+            ResultSetMetaData.columnNoNulls,
+            ResultSetMetaData.columnNullable,
+            ResultSetMetaData.columnNullableUnknown
+        );
     }
 
     /*
      * DataProvider used to provide column indexes that are out of range so that
      * SQLException is thrown
      */
-    @DataProvider(name = "invalidColumnRanges")
-    private Object[][] invalidColumnRanges() {
-        return new Object[][]{
-            {-1},
-            {0},
-            {MAX_COLUMNS + 1}
-        };
+    private Stream<Integer> invalidColumnRanges() {
+        return Stream.of(
+            -1,
+            0,
+            MAX_COLUMNS + 1
+        );
     }
 
     /*
      * DataProvider used to provide the valid column ranges for the
      * RowSetMetaDataImpl object
      */
-    @DataProvider(name = "columnRanges")
-    private Object[][] columnRanges() {
-        Object[][] o = new Object[MAX_COLUMNS][1];
-        for (int i = 1; i <= MAX_COLUMNS; i++) {
-            o[i - 1][0] = i;
-        }
-        return o;
+    private Stream<Integer> columnRanges() {
+        return IntStream.rangeClosed(1, MAX_COLUMNS).boxed();
     }
 
     /*
      * DataProvider used to specify the value to set via setColumnType and
      * the expected value to be returned from getColumnClassName
      */
-    @DataProvider(name = "columnClassNames")
-    private Object[][] columnClassNames() {
-        return new Object[][]{
-            {Types.CHAR, "java.lang.String"},
-            {Types.NCHAR, "java.lang.String"},
-            {Types.VARCHAR, "java.lang.String"},
-            {Types.NVARCHAR, "java.lang.String"},
-            {Types.LONGVARCHAR, "java.lang.String"},
-            {Types.LONGNVARCHAR, "java.lang.String"},
-            {Types.NUMERIC, "java.math.BigDecimal"},
-            {Types.DECIMAL, "java.math.BigDecimal"},
-            {Types.BIT, "java.lang.Boolean"},
-            {Types.TINYINT, "java.lang.Byte"},
-            {Types.SMALLINT, "java.lang.Short"},
-            {Types.INTEGER, "java.lang.Integer"},
-            {Types.FLOAT, "java.lang.Double"},
-            {Types.DOUBLE, "java.lang.Double"},
-            {Types.BINARY, "byte[]"},
-            {Types.VARBINARY, "byte[]"},
-            {Types.LONGVARBINARY, "byte[]"},
-            {Types.DATE, "java.sql.Date"},
-            {Types.TIME, "java.sql.Time"},
-            {Types.TIMESTAMP, "java.sql.Timestamp"},
-            {Types.CLOB, "java.sql.Clob"},
-            {Types.BLOB, "java.sql.Blob"}
-
-        };
-
+    private Stream<Arguments> columnClassNames() {
+        return Stream.of(
+            Arguments.of(Types.CHAR, "java.lang.String"),
+            Arguments.of(Types.NCHAR, "java.lang.String"),
+            Arguments.of(Types.VARCHAR, "java.lang.String"),
+            Arguments.of(Types.NVARCHAR, "java.lang.String"),
+            Arguments.of(Types.LONGVARCHAR, "java.lang.String"),
+            Arguments.of(Types.LONGNVARCHAR, "java.lang.String"),
+            Arguments.of(Types.NUMERIC, "java.math.BigDecimal"),
+            Arguments.of(Types.DECIMAL, "java.math.BigDecimal"),
+            Arguments.of(Types.BIT, "java.lang.Boolean"),
+            Arguments.of(Types.TINYINT, "java.lang.Byte"),
+            Arguments.of(Types.SMALLINT, "java.lang.Short"),
+            Arguments.of(Types.INTEGER, "java.lang.Integer"),
+            Arguments.of(Types.FLOAT, "java.lang.Double"),
+            Arguments.of(Types.DOUBLE, "java.lang.Double"),
+            Arguments.of(Types.BINARY, "byte[]"),
+            Arguments.of(Types.VARBINARY, "byte[]"),
+            Arguments.of(Types.LONGVARBINARY, "byte[]"),
+            Arguments.of(Types.DATE, "java.sql.Date"),
+            Arguments.of(Types.TIME, "java.sql.Time"),
+            Arguments.of(Types.TIMESTAMP, "java.sql.Timestamp"),
+            Arguments.of(Types.CLOB, "java.sql.Clob"),
+            Arguments.of(Types.BLOB, "java.sql.Blob")
+        );
     }
-
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/RowSetProviderTests.java b/test/jdk/javax/sql/test/rowset/RowSetProviderTests.java
similarity index 79%
rename from test/jdk/javax/sql/testng/test/rowset/RowSetProviderTests.java
rename to test/jdk/javax/sql/test/rowset/RowSetProviderTests.java
index 47a5cdb1eb0..25422cf0950 100644
--- a/test/jdk/javax/sql/testng/test/rowset/RowSetProviderTests.java
+++ b/test/jdk/javax/sql/test/rowset/RowSetProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,19 @@ import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.sql.SQLException;
+import java.util.stream.Stream;
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetProvider;
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import util.BaseTest;
 import util.StubRowSetFactory;
 
@@ -57,7 +62,7 @@ public class RowSetProviderTests extends BaseTest {
      * Save off the original property value for javax.sql.rowset.RowSetFactory,
      * original classloader and define the path to the jars directory
      */
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         origFactoryProperty = System.getProperty("javax.sql.rowset.RowSetFactory");
         cl = Thread.currentThread().getContextClassLoader();
@@ -68,7 +73,7 @@ public class RowSetProviderTests extends BaseTest {
     /*
      * Install the original javax.sql.rowset.RowSetFactory property value
      */
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() throws Exception {
         if (origFactoryProperty != null) {
             System.setProperty("javax.sql.rowset.RowSetFactory",
@@ -80,7 +85,7 @@ public class RowSetProviderTests extends BaseTest {
      * Clear the javax.sql.rowset.RowSetFactory property value and
      * reset the classloader to its original value
      */
-    @AfterMethod
+    @AfterEach
     public void tearDownMethod() throws Exception {
         System.clearProperty("javax.sql.rowset.RowSetFactory");
         Thread.currentThread().setContextClassLoader(cl);
@@ -89,7 +94,8 @@ public class RowSetProviderTests extends BaseTest {
     /*
      * Validate that the correct RowSetFactory is returned by newFactory().
      */
-    @Test(dataProvider = "RowSetFactoryValues")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("RowSetFactoryValues")
     public void test(RowSetFactory rsf, String impl) throws SQLException {
         validateProvider(rsf, impl);
     }
@@ -109,7 +115,7 @@ public class RowSetProviderTests extends BaseTest {
      * Validate that the correct RowSetFactory is returned by newFactory()
      * when specified by the javax.sql.rowset.RowSetFactory property.
      */
-    @Test(enabled = true)
+    @Test
     public void test02() throws SQLException {
         System.setProperty("javax.sql.rowset.RowSetFactory", STUB_FACTORY_CLASSNAME);
         validateProvider(RowSetProvider.newFactory(), STUB_FACTORY_CLASSNAME);
@@ -120,11 +126,13 @@ public class RowSetProviderTests extends BaseTest {
      * when specified  RowSetFactory specified by the
      * javax.sql.rowset.RowSetFactory property is not valid.
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test03() throws SQLException {
-        System.setProperty("javax.sql.rowset.RowSetFactory",
-                "invalid.RowSetFactoryImpl");
-        RowSetFactory rsf = RowSetProvider.newFactory();
+        assertThrows(SQLException.class, () -> {
+            System.setProperty("javax.sql.rowset.RowSetFactory",
+                    "invalid.RowSetFactoryImpl");
+            RowSetFactory rsf = RowSetProvider.newFactory();
+        });
     }
 
     /*
@@ -144,13 +152,15 @@ public class RowSetProviderTests extends BaseTest {
      * Validate that a SQLException is thrown by newFactory() if the default
      * RowSetFactory specified by the ServiceLoader API is not valid
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test05() throws Exception {
-        File f = new File(jarPath + "badFactory");
-        URLClassLoader loader = new URLClassLoader(new URL[]{
-            new URL(f.toURI().toString())}, getClass().getClassLoader());
-        Thread.currentThread().setContextClassLoader(loader);
-        RowSetProvider.newFactory();
+        assertThrows(SQLException.class, () -> {
+            File f = new File(jarPath + "badFactory");
+            URLClassLoader loader = new URLClassLoader(new URL[]{
+                new URL(f.toURI().toString())}, getClass().getClassLoader());
+            Thread.currentThread().setContextClassLoader(loader);
+            RowSetProvider.newFactory();
+        });
     }
 
     /*
@@ -174,16 +184,15 @@ public class RowSetProviderTests extends BaseTest {
      * DataProvider used to provide a RowSetFactory and the expected
      * RowSetFactory implementation that should be returned
      */
-    @DataProvider(name = "RowSetFactoryValues")
-    private Object[][] RowSetFactoryValues() throws SQLException {
+    private Stream<Arguments> RowSetFactoryValues() throws SQLException {
         RowSetFactory rsf = RowSetProvider.newFactory();
         RowSetFactory rsf1 = RowSetProvider.newFactory(STUB_FACTORY_CLASSNAME, null);
         RowSetFactory rsf2 = RowSetProvider.newFactory(DEFFAULT_FACTORY_CLASSNAME, null);
-        return new Object[][]{
-            {rsf, NO_VALADATE_IMPL},
-            {rsf, DEFFAULT_FACTORY_CLASSNAME},
-            {rsf1, STUB_FACTORY_CLASSNAME},
-            {rsf2, DEFFAULT_FACTORY_CLASSNAME}
-        };
+        return Stream.of(
+            Arguments.of(rsf, NO_VALADATE_IMPL),
+            Arguments.of(rsf, DEFFAULT_FACTORY_CLASSNAME),
+            Arguments.of(rsf1, STUB_FACTORY_CLASSNAME),
+            Arguments.of(rsf2, DEFFAULT_FACTORY_CLASSNAME)
+        );
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/RowSetWarningTests.java b/test/jdk/javax/sql/test/rowset/RowSetWarningTests.java
similarity index 97%
rename from test/jdk/javax/sql/testng/test/rowset/RowSetWarningTests.java
rename to test/jdk/javax/sql/test/rowset/RowSetWarningTests.java
index 41b52c4ef57..81ae97af785 100644
--- a/test/jdk/javax/sql/testng/test/rowset/RowSetWarningTests.java
+++ b/test/jdk/javax/sql/test/rowset/RowSetWarningTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,10 @@ package test.rowset;
 
 import java.sql.SQLException;
 import javax.sql.rowset.RowSetWarning;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class RowSetWarningTests extends BaseTest {
diff --git a/test/jdk/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java b/test/jdk/javax/sql/test/rowset/cachedrowset/CachedRowSetTests.java
similarity index 94%
rename from test/jdk/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/cachedrowset/CachedRowSetTests.java
index 1155a889187..5fd473924c3 100644
--- a/test/jdk/javax/sql/testng/test/rowset/cachedrowset/CachedRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/cachedrowset/CachedRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java b/test/jdk/javax/sql/test/rowset/cachedrowset/CommonCachedRowSetTests.java
similarity index 79%
rename from test/jdk/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/cachedrowset/CommonCachedRowSetTests.java
index 642c03c9a45..bc63ce28497 100644
--- a/test/jdk/javax/sql/testng/test/rowset/cachedrowset/CommonCachedRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/cachedrowset/CommonCachedRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Collection;
+import java.util.stream.Stream;
 import javax.sql.RowSet;
 import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.RowSetMetaDataImpl;
@@ -44,12 +45,18 @@ import javax.sql.rowset.serial.SerialRef;
 import javax.sql.rowset.spi.SyncFactory;
 import javax.sql.rowset.spi.SyncProvider;
 import javax.sql.rowset.spi.SyncProviderException;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.rowset.CommonRowSetTests;
 import util.StubArray;
 import util.StubRef;
@@ -83,52 +90,43 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * DataProvider that uses a RowSet with the COFFEE_HOUSES Table
      */
-    @DataProvider(name = "rowsetUsingCoffeeHouses")
-    protected Object[][] rowsetUsingCoffeeHouses() throws Exception {
-        RowSet rs = createCoffeeHousesRowSet();
-        return new Object[][]{
-            {rs}
-        };
+    protected Stream<RowSet> rowsetUsingCoffeeHouses() throws Exception {
+        return Stream.of(createCoffeeHousesRowSet());
     }
 
     /*
      * DataProvider that uses a RowSet with the COFFEES Table
      */
-    @DataProvider(name = "rowsetUsingCoffees")
-    protected Object[][] rowsetUsingCoffees() throws Exception {
-        RowSet rs = createCoffeesRowSet();
-        return new Object[][]{
-            {rs}
-        };
+    protected Stream<RowSet> rowsetUsingCoffees() throws Exception {
+        return Stream.of(createCoffeesRowSet());
     }
 
     /*
      * DataProvider that uses a RowSet with the DATAYPES Table and
      * used to validate the various supported data types
      */
-    @DataProvider(name = "rowsetUsingDataTypes")
-    protected Object[][] rowsetUsingDataTypes() throws Exception {
+    protected Stream<Arguments> rowsetUsingDataTypes() throws Exception {
 
         CachedRowSet rs = createDataTypesRowSet();
-        return new Object[][]{
-            {rs, JDBCType.INTEGER},
-            {rs, JDBCType.CHAR},
-            {rs, JDBCType.VARCHAR},
-            {rs, JDBCType.BIGINT},
-            {rs, JDBCType.BOOLEAN},
-            {rs, JDBCType.SMALLINT},
-            {rs, JDBCType.DOUBLE},
-            {rs, JDBCType.DECIMAL},
-            {rs, JDBCType.REAL},
-            {rs, JDBCType.TINYINT},
-            {rs, JDBCType.DATE},
-            {rs, JDBCType.TIME},
-            {rs, JDBCType.TIMESTAMP},
-            {rs, JDBCType.VARBINARY},
-            {rs, JDBCType.ARRAY},
-            {rs, JDBCType.REF},
-            {rs, JDBCType.FLOAT}
-        };
+        return Stream.of(
+            Arguments.of(rs, JDBCType.INTEGER),
+            Arguments.of(rs, JDBCType.CHAR),
+            Arguments.of(rs, JDBCType.VARCHAR),
+            Arguments.of(rs, JDBCType.BIGINT),
+            Arguments.of(rs, JDBCType.BOOLEAN),
+            Arguments.of(rs, JDBCType.SMALLINT),
+            Arguments.of(rs, JDBCType.DOUBLE),
+            Arguments.of(rs, JDBCType.DECIMAL),
+            Arguments.of(rs, JDBCType.REAL),
+            Arguments.of(rs, JDBCType.TINYINT),
+            Arguments.of(rs, JDBCType.DATE),
+            Arguments.of(rs, JDBCType.TIME),
+            Arguments.of(rs, JDBCType.TIMESTAMP),
+            Arguments.of(rs, JDBCType.VARBINARY),
+            Arguments.of(rs, JDBCType.ARRAY),
+            Arguments.of(rs, JDBCType.REF),
+            Arguments.of(rs, JDBCType.FLOAT)
+        );
     }
 
     /*
@@ -254,7 +252,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     private void compareMetaData(ResultSetMetaData rsmd,
             ResultSetMetaData rsmd1) throws SQLException {
 
-        assertEquals(rsmd1.getColumnCount(), rsmd.getColumnCount());
+        assertEquals(rsmd.getColumnCount(), rsmd1.getColumnCount());
         int cols = rsmd.getColumnCount();
         for (int i = 1; i <= cols; i++) {
             assertTrue(rsmd1.getCatalogName(i).equals(rsmd.getCatalogName(i)));
@@ -356,26 +354,33 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SyncProviderException is thrown when acceptChanges is called
      * but there is not a way to make a connection to the datasource
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SyncProviderException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0000(CachedRowSet rs) throws Exception {
-        rs.acceptChanges();
-        rs.close();
+        assertThrows(SyncProviderException.class, () -> {
+            rs.acceptChanges();
+            rs.close();
+        });
     }
 
     /*
      * Validate SyncProviderException is thrown when acceptChanges is called
      * when null is passed as the datasource
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SyncProviderException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0001(CachedRowSet rs) throws Exception {
-        rs.acceptChanges(null);
-        rs.close();
+        assertThrows(SyncProviderException.class, () -> {
+            rs.acceptChanges(null);
+            rs.close();
+        });
     }
 
     /*
      * Validate that that RIOPtimsticProvider is the default SyncProvider
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0002(CachedRowSet rs) throws SQLException {
         SyncProvider sp = rs.getSyncProvider();
         assertTrue(sp instanceof com.sun.rowset.providers.RIOptimisticProvider);
@@ -385,7 +390,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that you can specify a SyncProvider
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0003(CachedRowSet rs) throws SQLException {
 
         // Register a provider and make sure it is avaiable
@@ -400,7 +406,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowSetChanged is called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0004(CachedRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -412,7 +419,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowSetChanged is called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0005(CachedRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -424,7 +432,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyRowChanged is called
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0006(RowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -443,7 +452,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Create a multiple RowSetListeners and validate that notifyRowChanged,
      * notifiyMoved is called on all listners
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0007(RowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         TestRowSetListener rsl2 = new TestRowSetListener();
@@ -467,7 +477,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Create a RowSetListener and validate that notifyRowChanged  and
      * notifyCursorMoved are  called
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0008(CachedRowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -487,7 +498,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Create a RowSetListener and validate that notifyCursorMoved is called
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0009(RowSet rs) throws Exception {
         TestRowSetListener rsl = new TestRowSetListener();
         rs.addRowSetListener(rsl);
@@ -499,7 +511,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that getTableName() returns the proper values
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0010(CachedRowSet rs) throws Exception {
         assertNull(rs.getTableName());
         rs.setTableName(COFFEE_HOUSES_TABLE);
@@ -510,12 +523,13 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that getKeyColumns() returns the proper values
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0011(CachedRowSet rs) throws Exception {
         int[] pkeys = {1, 3};
         assertNull(rs.getKeyColumns());
         rs.setKeyColumns(pkeys);
-        assertEquals(rs.getKeyColumns(), pkeys);
+        assertArrayEquals(pkeys, rs.getKeyColumns());
         rs.close();
     }
 
@@ -523,52 +537,62 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0012(CachedRowSet rs) throws Exception {
-        rs.setMatchColumn(-1);
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setMatchColumn(-1);
+            rs.close();
+        });
     }
 
     /*
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0013(CachedRowSet rs) throws Exception {
-        int[] cols = {1, -1};
-        rs.setMatchColumn(cols);
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            int[] cols = {1, -1};
+            rs.setMatchColumn(cols);
+            rs.close();
+        });
     }
 
     /*
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0014(CachedRowSet rs) throws Exception {
-        rs.setMatchColumn((String) null);
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setMatchColumn((String) null);
+            rs.close();
+        });
     }
 
     /*
      * Validate that setMatchColumn throws a SQLException if the column
      * index specified is out of range
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0015(CachedRowSet rs) throws Exception {
-        String[] cols = {"ID", null};
-        rs.setMatchColumn(cols);
+        assertThrows(SQLException.class, () -> {
+            String[] cols = {"ID", null};
+            rs.setMatchColumn(cols);
+        });
     }
 
     /*
      * Validate that getMatchColumn returns the same value specified by
      * setMatchColumn
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0016(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1};
         String[] expectedColNames = {"ID"};
@@ -578,8 +602,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
         for (int i = 0; i < actualCols.length; i++) {
             System.out.println(actualCols[i]);
         }
-        assertEquals(actualCols, expectedCols);
-        assertEquals(actualColNames, expectedColNames);
+        assertArrayEquals(expectedCols, actualCols);
+        assertArrayEquals(expectedColNames, actualColNames);
         rs.close();
     }
 
@@ -587,15 +611,17 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumn returns the same value specified by
      * setMatchColumn
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0017(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1};
         String[] expectedColNames = {"ID"};
         rs.setMatchColumn(expectedColNames[0]);
         int[] actualCols = rs.getMatchColumnIndexes();
         String[] actualColNames = rs.getMatchColumnNames();
-        assertEquals(actualCols, expectedCols);
-        assertEquals(actualColNames, expectedColNames);
+        assertArrayEquals(expectedCols, actualCols);
+        assertArrayEquals(expectedColNames, actualColNames);
         rs.close();
     }
 
@@ -603,16 +629,18 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumn returns the same valid value specified by
      * setMatchColumn
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0018(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1, 3};
         String[] expectedColNames = {"COF_ID", "SUP_ID"};
         rs.setMatchColumn(expectedCols);
         int[] actualCols = rs.getMatchColumnIndexes();
         String[] actualColNames = rs.getMatchColumnNames();
-        assertEquals(actualCols, expectedCols);
-        assertEquals(actualColNames, expectedColNames);
-        assertEquals(actualCols, expectedCols);
+        assertArrayEquals(expectedCols, actualCols);
+        assertArrayEquals(expectedColNames, actualColNames);
+        assertArrayEquals(expectedCols, actualCols);
         rs.close();
     }
 
@@ -620,15 +648,17 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumn returns the same valid value specified by
      * setMatchColumn
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0019(CachedRowSet rs) throws Exception {
         int[] expectedCols = {1, 3};
         String[] expectedColNames = {"COF_ID", "SUP_ID"};
         rs.setMatchColumn(expectedColNames);
         int[] actualCols = rs.getMatchColumnIndexes();
         String[] actualColNames = rs.getMatchColumnNames();
-        assertEquals(actualCols, expectedCols);
-        assertEquals(actualColNames, expectedColNames);
+        assertArrayEquals(expectedCols, actualCols);
+        assertArrayEquals(expectedColNames, actualColNames);
         rs.close();
     }
 
@@ -636,69 +666,78 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that getMatchColumnIndexes throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0020(CachedRowSet rs) throws Exception {
-        rs.setMatchColumn(1);
-        int[] actualCols = rs.getMatchColumnIndexes();
-        assertTrue(actualCols != null);
-        rs.unsetMatchColumn(1);
-        actualCols = rs.getMatchColumnIndexes();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setMatchColumn(1);
+            int[] actualCols = rs.getMatchColumnIndexes();
+            assertTrue(actualCols != null);
+            rs.unsetMatchColumn(1);
+            actualCols = rs.getMatchColumnIndexes();
+            rs.close();
+        });
     }
 
     /*
      * Validate that getMatchColumnNames throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0021(CachedRowSet rs) throws Exception {
-        String matchColumn = "ID";
-        rs.setMatchColumn(matchColumn);
-        String[] actualColNames = rs.getMatchColumnNames();
-        assertTrue(actualColNames != null);
-        rs.unsetMatchColumn(matchColumn);
-        actualColNames = rs.getMatchColumnNames();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            String matchColumn = "ID";
+            rs.setMatchColumn(matchColumn);
+            String[] actualColNames = rs.getMatchColumnNames();
+            assertTrue(actualColNames != null);
+            rs.unsetMatchColumn(matchColumn);
+            actualColNames = rs.getMatchColumnNames();
+            rs.close();
+        });
     }
 
     /*
      * Validate that getMatchColumnIndexes throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0022(CachedRowSet rs) throws Exception {
-        int[] expectedCols = {1, 3};
-        rs.setMatchColumn(expectedCols);
-        int[] actualCols = rs.getMatchColumnIndexes();
-        assertTrue(actualCols != null);
-        rs.unsetMatchColumn(expectedCols);
-        actualCols = rs.getMatchColumnIndexes();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            int[] expectedCols = {1, 3};
+            rs.setMatchColumn(expectedCols);
+            int[] actualCols = rs.getMatchColumnIndexes();
+            assertTrue(actualCols != null);
+            rs.unsetMatchColumn(expectedCols);
+            actualCols = rs.getMatchColumnIndexes();
+            rs.close();
+        });
     }
 
     /*
      * Validate that getMatchColumnNames throws a SQLException if
      * unsetMatchColumn has been called
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0023(CachedRowSet rs) throws Exception {
-        String[] expectedColNames = {"COF_ID", "SUP_ID"};
-        rs.setMatchColumn(expectedColNames);
-        String[] actualColNames = rs.getMatchColumnNames();
-        assertTrue(actualColNames != null);
-        rs.unsetMatchColumn(expectedColNames);
-        actualColNames = rs.getMatchColumnNames();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            String[] expectedColNames = {"COF_ID", "SUP_ID"};
+            rs.setMatchColumn(expectedColNames);
+            String[] actualColNames = rs.getMatchColumnNames();
+            assertTrue(actualColNames != null);
+            rs.unsetMatchColumn(expectedColNames);
+            actualColNames = rs.getMatchColumnNames();
+            rs.close();
+        });
     }
 
     /*
      * Validate size() returns the correct number of rows
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0024(CachedRowSet rs) throws Exception {
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
         rs.close();
@@ -708,9 +747,10 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that the correct rows are returned comparing the primary
      * keys
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0025(RowSet rs) throws SQLException {
-        assertEquals(getPrimaryKeys(rs), COFFEE_HOUSES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEE_HOUSES_PRIMARY_KEYS, getPrimaryKeys(rs));
         rs.close();
     }
 
@@ -719,7 +759,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate the visibility of the row depending on the value of
      * setShowdelete
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0026(CachedRowSet rs) throws Exception {
         Object[] afterDelete = {
             10023, 33002, 10040, 32001, 10042, 10024, 10039, 10041,
@@ -727,13 +768,13 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
         };
         int rowToDelete = 10035;
         // All rows should be found
-        assertEquals(getPrimaryKeys(rs), COFFEE_HOUSES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEE_HOUSES_PRIMARY_KEYS, getPrimaryKeys(rs));
         // Delete the row
         assertTrue(deleteRowByPrimaryKey(rs, rowToDelete, 1));
         // With setShowDeleted(false) which is the default,
         // the deleted row should not be visible
         assertFalse(findRowByPrimaryKey(rs, rowToDelete, 1));
-        assertEquals(getPrimaryKeys(rs), afterDelete);
+        assertArrayEquals(afterDelete, getPrimaryKeys(rs));
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
         // With setShowDeleted(true), the deleted row should be visible
         rs.setShowDeleted(true);
@@ -744,7 +785,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that there is no page size by default
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0027(CachedRowSet rs) throws Exception {
         assertTrue(rs.getPageSize() == 0);
         rs.close();
@@ -754,7 +796,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate the value you set via setPageSize is returned by getPageSize
      * then reset to having no limit
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0028(CachedRowSet rs) throws Exception {
         int rows = 100;
         rs.setPageSize(rows);
@@ -768,30 +811,39 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when an invalid value is specified
      * for setPageSize
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0029(CachedRowSet rs) throws Exception {
-        rs.setPageSize(-1);
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setPageSize(-1);
+            rs.close();
+        });
     }
 
     /*
      * Validate SQLException is thrown when nextPage is called without a
      * call to populate or execute
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0030(CachedRowSet rs) throws Exception {
-        rs.nextPage();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.nextPage();
+            rs.close();
+        });
     }
 
     /*
      * Validate SQLException is thrown when previousPage is called without a
      * call to populate or execute
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0031(CachedRowSet rs) throws Exception {
-        rs.previousPage();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.previousPage();
+            rs.close();
+        });
     }
 
 
@@ -799,40 +851,48 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate SQLException is thrown when execute is called
      * but there is not a way to make a connection to the datasource
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0032(CachedRowSet rs) throws Exception {
-        rs.execute(null);
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.execute(null);
+            rs.close();
+        });
     }
 
     /*
      * Validate SQLException is thrown when execute is called
      * but there is not a way to make a connection to the datasource
      */
-    @Test(dataProvider = "rowSetType", expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0033(CachedRowSet rs) throws Exception {
-        rs.execute();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.execute();
+            rs.close();
+        });
     }
 
     /*
      * Validate that toCollection(<column>) returns the proper values
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0034(CachedRowSet rs) throws Exception {
         Object[] cities = {"Mendocino", "Seattle", "SF", "Portland", "SF",
             "Sacramento", "Carmel", "LA", "Olympia", "Seattle", "SF",
             "LA", "San Jose", "Eugene"};
         rs.beforeFirst();
-        assertEquals(rs.toCollection(2).toArray(), cities);
-        assertEquals(rs.toCollection("CITY").toArray(), cities);
+        assertArrayEquals(cities, rs.toCollection(2).toArray());
+        assertArrayEquals(cities, rs.toCollection("CITY").toArray());
         rs.close();
     }
 
     /*
      * Validate that toCollection() returns the proper values
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0035(CachedRowSet rs) throws Exception {
         Collection<?> col = rs.toCollection();
         assertTrue(rs.size() == col.size());
@@ -850,7 +910,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that createCopy() returns the proper values
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0036(CachedRowSet rs) throws Exception {
         try (CachedRowSet crs1 = rs.createCopy()) {
             compareRowSets(rs, crs1);
@@ -861,7 +922,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
     /*
      * Validate that createCopySchema() returns the proper values
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0037(CachedRowSet rs) throws Exception {
         try (CachedRowSet crs1 = rs.createCopySchema()) {
             assertTrue(crs1.size() == 0);
@@ -875,7 +937,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * and getMatchColumnIndexes should throw a SQLException. This test
      * specifies setMatchColumn(int)
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0038(CachedRowSet rs) throws Exception {
         rs.setMatchColumn(1);
         try (CachedRowSet crs1 = rs.createCopyNoConstraints()) {
@@ -904,7 +967,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * and getMatchColumnIndexes should throw a SQLException. This test
      * specifies setMatchColumn(String)
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0039(CachedRowSet rs) throws Exception {
         rs.setMatchColumn("ID");
         try (CachedRowSet crs1 = rs.createCopyNoConstraints()) {
@@ -932,7 +996,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that columnUpdated works with the various datatypes specifying
      * the column index
      */
-    @Test(dataProvider = "rowsetUsingDataTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingDataTypes")
     public void commonCachedRowSetTest0040(CachedRowSet rs, JDBCType type) throws Exception {
         rs.beforeFirst();
         assertTrue(rs.next());
@@ -1029,7 +1094,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that columnUpdated works with the various datatypes specifying
      * the column name
      */
-    @Test(dataProvider = "rowsetUsingDataTypes")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingDataTypes")
     public void commonCachedRowSetTest0041(CachedRowSet rs, JDBCType type) throws Exception {
         rs.beforeFirst();
         assertTrue(rs.next());
@@ -1127,7 +1193,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate isBeforeFirst(), isFirst() and first() return the correct
      * results
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0042(RowSet rs) throws Exception {
         assertFalse(rs.isBeforeFirst());
         assertFalse(rs.isFirst());
@@ -1150,7 +1217,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate isAfterLast(), isLast() and last() return the correct
      * results
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0043(RowSet rs) throws Exception {
         assertFalse(rs.isAfterLast());
         assertFalse(rs.isLast());
@@ -1173,121 +1241,140 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate a SQLException is thrown when undoDelete is called on the
      * insertRow
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0044(CachedRowSet rs) throws Exception {
-        rs.insertRow();
-        rs.undoDelete();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.insertRow();
+            rs.undoDelete();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoDelete is called when
      * cursor is before the first row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0045(CachedRowSet rs) throws Exception {
-        rs.setShowDeleted(true);
-        rs.beforeFirst();
-        rs.undoDelete();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setShowDeleted(true);
+            rs.beforeFirst();
+            rs.undoDelete();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoDelete is called when
      * cursor is after the last row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0046(CachedRowSet rs) throws Exception {
-        rs.setShowDeleted(true);
-        rs.afterLast();
-        rs.undoDelete();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setShowDeleted(true);
+            rs.afterLast();
+            rs.undoDelete();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoUpdate is called on the
      * insertRow
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0047(CachedRowSet rs) throws Exception {
-        rs.insertRow();
-        rs.undoUpdate();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.insertRow();
+            rs.undoUpdate();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoUpdate is called when
      * cursor is before the first row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0048(CachedRowSet rs) throws Exception {
-        rs.setShowDeleted(true);
-        rs.beforeFirst();
-        rs.undoUpdate();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setShowDeleted(true);
+            rs.beforeFirst();
+            rs.undoUpdate();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoUpdate is called when
      * cursor is after the last row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0049(CachedRowSet rs) throws Exception {
-        rs.setShowDeleted(true);
-        rs.afterLast();
-        rs.undoUpdate();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setShowDeleted(true);
+            rs.afterLast();
+            rs.undoUpdate();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoInsert is called on the
      * insertRow
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0050(CachedRowSet rs) throws Exception {
-        rs.insertRow();
-        rs.undoInsert();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.insertRow();
+            rs.undoInsert();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoInsert is called when
      * cursor is before the first row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0051(CachedRowSet rs) throws Exception {
-        rs.setShowDeleted(true);
-        rs.beforeFirst();
-        rs.undoInsert();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setShowDeleted(true);
+            rs.beforeFirst();
+            rs.undoInsert();
+            rs.close();
+        });
     }
 
     /*
      * Validate a SQLException is thrown when undoInsert is called when
      * cursor is after the last row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses",
-            expectedExceptions = SQLException.class)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0052(CachedRowSet rs) throws Exception {
-        rs.setShowDeleted(true);
-        rs.afterLast();
-        rs.undoInsert();
-        rs.close();
+        assertThrows(SQLException.class, () -> {
+            rs.setShowDeleted(true);
+            rs.afterLast();
+            rs.undoInsert();
+            rs.close();
+        });
     }
 
     /*
      * Insert a row, then call undoInsert to roll back the insert and validate
      * the row is not there
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0053(CachedRowSet rs) throws Exception {
         int rowToInsert = 1961;
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
@@ -1314,7 +1401,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Insert a row, delete the row and then call undoDelete to make sure it
      * is comes back
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0054(CachedRowSet rs) throws Exception {
         int rowToDelete = 1961;
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
@@ -1348,7 +1436,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Insert a row, modify a field and then call undoUpdate to revert the
      * insert
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0055(CachedRowSet rs) throws Exception {
         int rowToInsert = 1961;
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
@@ -1385,7 +1474,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate getOriginal returns a ResultSet which is a copy of the original
      * RowSet
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0056(CachedRowSet rs) throws Exception {
         String coffee = "Hazelnut";
         int sales = 100;
@@ -1414,12 +1504,12 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
             assertTrue(rs1.getInt(1) == origId);
             assertTrue(rs1.getString(2).equals(origCoffee));
             assertTrue(rs1.getInt(5) == origSales);
-            assertEquals(getPrimaryKeys(rs1), COFFEES_PRIMARY_KEYS);
+            assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(rs1));
             // Check current rowset
             assertTrue(rs.getInt(1) == id);
             assertTrue(rs.getString(2).equals(coffee));
             assertTrue(rs.getInt(5) == sales);
-            assertEquals(getPrimaryKeys(rs), updatedPkeys);
+            assertArrayEquals(updatedPkeys, getPrimaryKeys(rs));
         }
         rs.close();
     }
@@ -1428,7 +1518,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate getOriginalRow returns a ResultSet which is a copy of the
      * original row that was modified
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0057(CachedRowSet rs) throws Exception {
         String coffee = "Hazelnut";
         int sales = 100;
@@ -1463,7 +1554,7 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
             assertTrue(rs.getInt(1) == id);
             assertTrue(rs.getString(2).equals(coffee));
             assertTrue(rs.getInt(5) == sales);
-            assertEquals(getPrimaryKeys(rs), updatedPkeys);
+            assertArrayEquals(updatedPkeys, getPrimaryKeys(rs));
         }
         rs.close();
     }
@@ -1472,7 +1563,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that restoreOrginal will restore the RowSet to its
      * state prior to the insert of a row
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0058(CachedRowSet rs) throws Exception {
         int rowToInsert = 1961;
         assertTrue(rs.size() == COFFEE_HOUSES_ROWS);
@@ -1509,7 +1601,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that restoreOrginal will restore the RowSet to its
      * state prior to deleting a row
      */
-    @Test(dataProvider = "rowsetUsingCoffees", enabled = true)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0059(CachedRowSet rs) throws Exception {
         int rowToDelete = 2;
         try (CachedRowSet crs1 = rsf.createCachedRowSet()) {
@@ -1540,7 +1633,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate that restoreOrginal will restore the RowSet to its
      * state prior to updating a row
      */
-    @Test(dataProvider = "rowsetUsingCoffees", enabled = true)
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void commonCachedRowSetTest0060(CachedRowSet rs) throws Exception {
         int rowToUpdate = 2;
         String coffee = "Hazelnut";
@@ -1578,7 +1672,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Initialize a RowSet via the populate method. Validate it matches
      * the original ResultSet
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0061(CachedRowSet rs) throws Exception {
         try (CachedRowSet crs1 = rsf.createCachedRowSet()) {
             rs.beforeFirst();
@@ -1593,7 +1688,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
      * Validate it matches the original ResultSet starting for the specofied
      * offset
      */
-    @Test(dataProvider = "rowsetUsingCoffeeHouses")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffeeHouses")
     public void commonCachedRowSetTest0062(CachedRowSet rs) throws Exception {
         Object[] expectedRows = {
             32001, 10042, 10024, 10039, 10041, 33005, 33010, 10035, 10037,
@@ -1603,8 +1699,8 @@ public abstract class CommonCachedRowSetTests extends CommonRowSetTests {
         try (CachedRowSet crs1 = rsf.createCachedRowSet()) {
             rs.beforeFirst();
             crs1.populate(rs, startingRow);
-            assertEquals(crs1.size(), COFFEE_HOUSES_ROWS - startingRow + 1);
-            assertEquals(getPrimaryKeys(crs1), expectedRows);
+            assertEquals(COFFEE_HOUSES_ROWS - startingRow + 1, crs1.size());
+            assertArrayEquals(expectedRows, getPrimaryKeys(crs1));
         }
         rs.close();
     }
diff --git a/test/jdk/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java b/test/jdk/javax/sql/test/rowset/filteredrowset/CityFilter.java
similarity index 97%
rename from test/jdk/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java
rename to test/jdk/javax/sql/test/rowset/filteredrowset/CityFilter.java
index 2188c4eed08..458088ccb45 100644
--- a/test/jdk/javax/sql/testng/test/rowset/filteredrowset/CityFilter.java
+++ b/test/jdk/javax/sql/test/rowset/filteredrowset/CityFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java b/test/jdk/javax/sql/test/rowset/filteredrowset/FilteredRowSetTests.java
similarity index 81%
rename from test/jdk/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/filteredrowset/FilteredRowSetTests.java
index 263a79a68b6..55d9323f373 100644
--- a/test/jdk/javax/sql/testng/test/rowset/filteredrowset/FilteredRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/filteredrowset/FilteredRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,24 +26,30 @@ import java.sql.SQLException;
 import javax.sql.RowSet;
 import javax.sql.rowset.FilteredRowSet;
 import javax.sql.rowset.Predicate;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.AfterEach;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.rowset.webrowset.CommonWebRowSetTests;
 
 public class FilteredRowSetTests extends CommonWebRowSetTests {
 
     private FilteredRowSet frs;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         frs = createCoffeeHousesRowSet();
     }
 
-    @AfterMethod
+    @AfterEach
     public void tearDownMethod() throws Exception {
         frs.close();
     }
@@ -83,7 +89,7 @@ public class FilteredRowSetTests extends CommonWebRowSetTests {
             10023, 10040, 10042, 10024, 10039, 10041, 10035, 10037, 10034
         };
         frs.setFilter(new PrimaryKeyFilter(10000, 10999, 1));
-        assertEquals(getPrimaryKeys(frs), expectedKeys);
+        assertArrayEquals(expectedKeys, getPrimaryKeys(frs));
     }
 
     /*
@@ -96,7 +102,7 @@ public class FilteredRowSetTests extends CommonWebRowSetTests {
             10023, 10040, 10042, 10024, 10039, 10041, 10035, 10037, 10034
         };
         frs.setFilter(new PrimaryKeyFilter(10000, 10999, "STORE_ID"));
-        assertEquals(getPrimaryKeys(frs), expectedKeys);
+        assertArrayEquals(expectedKeys, getPrimaryKeys(frs));
 
     }
 
@@ -111,7 +117,7 @@ public class FilteredRowSetTests extends CommonWebRowSetTests {
         };
         String[] cityArray = {"SF", "LA"};
         frs.setFilter(new CityFilter(cityArray, 2));
-        assertEquals(getPrimaryKeys(frs), expectedKeys);
+        assertArrayEquals(expectedKeys, getPrimaryKeys(frs));
     }
 
     /*
@@ -125,14 +131,16 @@ public class FilteredRowSetTests extends CommonWebRowSetTests {
         };
         String[] cityArray = {"SF", "LA"};
         frs.setFilter(new CityFilter(cityArray, "CITY"));
-        assertEquals(getPrimaryKeys(frs), expectedKeys);
+        assertArrayEquals(expectedKeys, getPrimaryKeys(frs));
     }
 
 
     // Tests that are common but need to be disabled due to an implementation bug
 
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0043(RowSet rs) throws Exception {
         // Need to fix bug in FilteredRowSets
     }
diff --git a/test/jdk/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java b/test/jdk/javax/sql/test/rowset/filteredrowset/PrimaryKeyFilter.java
similarity index 97%
rename from test/jdk/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java
rename to test/jdk/javax/sql/test/rowset/filteredrowset/PrimaryKeyFilter.java
index 2a748314006..0353312419c 100644
--- a/test/jdk/javax/sql/testng/test/rowset/filteredrowset/PrimaryKeyFilter.java
+++ b/test/jdk/javax/sql/test/rowset/filteredrowset/PrimaryKeyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/test/rowset/jdbcrowset/JdbcRowSetDriverManagerTest.java b/test/jdk/javax/sql/test/rowset/jdbcrowset/JdbcRowSetDriverManagerTest.java
similarity index 95%
rename from test/jdk/javax/sql/testng/test/rowset/jdbcrowset/JdbcRowSetDriverManagerTest.java
rename to test/jdk/javax/sql/test/rowset/jdbcrowset/JdbcRowSetDriverManagerTest.java
index be86798177a..5b135e16b5c 100644
--- a/test/jdk/javax/sql/testng/test/rowset/jdbcrowset/JdbcRowSetDriverManagerTest.java
+++ b/test/jdk/javax/sql/test/rowset/jdbcrowset/JdbcRowSetDriverManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,9 @@ import java.sql.SQLException;
 import javax.sql.rowset.JdbcRowSet;
 import javax.sql.rowset.RowSetFactory;
 import javax.sql.rowset.RowSetProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubDriver;
 
@@ -41,7 +43,7 @@ public class JdbcRowSetDriverManagerTest extends BaseTest {
      * Validate that JDBCRowSetImpl can connect to a JDBC driver that is
      * register by DriverManager.
      */
-    @Test(enabled = true)
+    @Test
     public void test0000() throws SQLException {
 
         DriverManager.registerDriver(new StubDriver());
diff --git a/test/jdk/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java b/test/jdk/javax/sql/test/rowset/joinrowset/JoinRowSetTests.java
similarity index 83%
rename from test/jdk/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/joinrowset/JoinRowSetTests.java
index b84453e9a3b..92ce09bcf85 100644
--- a/test/jdk/javax/sql/testng/test/rowset/joinrowset/JoinRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/joinrowset/JoinRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,22 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 import javax.sql.RowSet;
 import javax.sql.rowset.CachedRowSet;
 import javax.sql.rowset.JoinRowSet;
 import javax.sql.rowset.RowSetMetaDataImpl;
 import javax.sql.rowset.WebRowSet;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.rowset.webrowset.CommonWebRowSetTests;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
 public class JoinRowSetTests extends CommonWebRowSetTests {
 
     private final String SUPPLIERS_TABLE = "SUPPLIERS";
@@ -150,8 +156,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * DataProvider used to set parameters for basic types that are supported
      */
-    @DataProvider(name = "createCachedRowSetsToUse")
-    private Object[][] createCachedRowSetsToUse() throws SQLException {
+    private Stream<Arguments> createCachedRowSetsToUse() throws SQLException {
         CachedRowSet crs = rsf.createCachedRowSet();
         initCoffeesMetaData(crs);
         createCoffeesRows(crs);
@@ -162,9 +167,7 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
         createSuppiersRows(crs1);
         // Make sure you are not on the insertRow
         crs1.moveToCurrentRow();
-        return new Object[][]{
-            {crs, crs1}
-        };
+        return Stream.of(Arguments.of(crs, crs1));
     }
 
     /*
@@ -178,13 +181,14 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
                 results.add(jrs.getInt("COF_ID"));
             }
         }
-        assertEquals(results.toArray(), EXPECTED);
+        assertArrayEquals(EXPECTED, results.toArray());
     }
 
     /*
      * Join two CachedRowSets specifying a column name to join against
      */
-    @Test(dataProvider = "createCachedRowSetsToUse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0000(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
 
@@ -200,7 +204,8 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column index to join against
      */
-    @Test(dataProvider = "createCachedRowSetsToUse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0001(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
 
@@ -216,7 +221,8 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column name to join against
      */
-    @Test(dataProvider = "createCachedRowSetsToUse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0002(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
 
@@ -233,7 +239,8 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column index to join against
      */
-    @Test(dataProvider = "createCachedRowSetsToUse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0003(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
 
@@ -251,7 +258,8 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column name to join against
      */
-    @Test(dataProvider = "createCachedRowSetsToUse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0005(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
 
@@ -269,7 +277,8 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     /*
      * Join two CachedRowSets specifying a column index to join against
      */
-    @Test(dataProvider = "createCachedRowSetsToUse")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("createCachedRowSetsToUse")
     public void joinRowSetTests0006(CachedRowSet crs, CachedRowSet crs1)
             throws Exception {
 
@@ -286,39 +295,56 @@ public class JoinRowSetTests extends CommonWebRowSetTests {
     }
 
     // Disabled tests due to bugs in JoinRowSet
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0004(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0005(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0008(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0026(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0027(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0053(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0054(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void commonCachedRowSetTest0055(CachedRowSet rs) throws Exception {
     }
 
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0009(WebRowSet wrs1) throws Exception {
     }
 }
diff --git a/test/jdk/javax/sql/test/rowset/resourcebundle/TEST.properties b/test/jdk/javax/sql/test/rowset/resourcebundle/TEST.properties
new file mode 100644
index 00000000000..045227a0c2b
--- /dev/null
+++ b/test/jdk/javax/sql/test/rowset/resourcebundle/TEST.properties
@@ -0,0 +1,2 @@
+# Enabled for ValidateGetBundle.java
+modules = java.sql.rowset/com.sun.rowset:+open
diff --git a/test/jdk/javax/sql/resourceBundleTests/ValidateGetBundle.java b/test/jdk/javax/sql/test/rowset/resourcebundle/ValidateGetBundle.java
similarity index 94%
rename from test/jdk/javax/sql/resourceBundleTests/ValidateGetBundle.java
rename to test/jdk/javax/sql/test/rowset/resourcebundle/ValidateGetBundle.java
index be17caed5c8..63f12740c09 100644
--- a/test/jdk/javax/sql/resourceBundleTests/ValidateGetBundle.java
+++ b/test/jdk/javax/sql/test/rowset/resourcebundle/ValidateGetBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package test.rowset.resourcebundle;
 
 import com.sun.rowset.JdbcRowSetResourceBundle;
 
@@ -35,8 +36,6 @@ import org.junit.jupiter.params.provider.Arguments;
  * @test
  * @bug 8294989
  * @summary Check JDBC RowSet resource bundle access
- * @modules java.sql.rowset/com.sun.rowset:+open
- * @run junit/othervm ValidateGetBundle
  */
 public class ValidateGetBundle{
 
diff --git a/test/jdk/javax/sql/testng/test/rowset/ValidateResourceBundleAccess.java b/test/jdk/javax/sql/test/rowset/resourcebundle/ValidateResourceBundleAccess.java
similarity index 89%
rename from test/jdk/javax/sql/testng/test/rowset/ValidateResourceBundleAccess.java
rename to test/jdk/javax/sql/test/rowset/resourcebundle/ValidateResourceBundleAccess.java
index 7591891c42b..5deca26cb25 100644
--- a/test/jdk/javax/sql/testng/test/rowset/ValidateResourceBundleAccess.java
+++ b/test/jdk/javax/sql/test/rowset/resourcebundle/ValidateResourceBundleAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,21 +20,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package test.rowset;
+package test.rowset.resourcebundle;
 
 import java.util.Locale;
 import java.sql.SQLException;
 import javax.sql.rowset.RowSetProvider;
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeClass;
-import static org.testng.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
  * @bug 8294989
  * @summary Check that the resource bundle can be accessed
  * @throws SQLException if an unexpected error occurs
- * @run testng/othervm
  */
 public class ValidateResourceBundleAccess{
     // Expected JDBCResourceBundle message, jdbcrowsetimpl.invalstate
@@ -43,8 +43,8 @@ public class ValidateResourceBundleAccess{
     private static final String RSREADERERROR = "Internal Error in RowSetReader: no connection or command";
 
     // Checking against English messages, set to US Locale
-    @BeforeClass
-    public void setEnglishEnvironment() {
+    @BeforeAll
+    public static void setEnglishEnvironment() {
         Locale.setDefault(Locale.US);
     }
 
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java b/test/jdk/javax/sql/test/rowset/serial/SQLInputImplTests.java
similarity index 92%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SQLInputImplTests.java
index 5bd10ed8848..33efda61c4e 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SQLInputImplTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,11 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import javax.sql.rowset.serial.SQLInputImpl;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubArray;
 import util.StubBlob;
@@ -54,7 +56,7 @@ public class SQLInputImplTests extends BaseTest {
     private SuperHero hero;
     private final String sqlType = "SUPERHERO";
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         map = new HashMap<>();
         impl = new TestSQLDataImpl("TestSQLData");
@@ -68,18 +70,22 @@ public class SQLInputImplTests extends BaseTest {
      * Validate that a SQLException is thrown if the attribute value is
      * null
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test() throws Exception {
-        SQLInputImpl x = new SQLInputImpl(null, map);
+        assertThrows(SQLException.class, () -> {
+            SQLInputImpl x = new SQLInputImpl(null, map);
+        });
     }
 
     /*
      * Validate that a SQLException is thrown if the map value is
      * null
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test02() throws Exception {
-        SQLInputImpl x = new SQLInputImpl(typeValues, null);
+        assertThrows(SQLException.class, () -> {
+            SQLInputImpl x = new SQLInputImpl(typeValues, null);
+        });
     }
 
     /*
@@ -124,7 +130,7 @@ public class SQLInputImplTests extends BaseTest {
     /*
      * Validate a Array can be read
      */
-    @Test(enabled = true)
+    @Test
     public void test06() throws Exception {
         Object[] coffees = new Object[]{"Espresso", "Colombian", "French Roast",
             "Cappuccino"};
@@ -139,7 +145,7 @@ public class SQLInputImplTests extends BaseTest {
     /*
      * Validate a Blob can be read
      */
-    @Test(enabled = true)
+    @Test
     public void test07() throws Exception {
         Blob b = new StubBlob();
         Object[] values = {b};
@@ -153,7 +159,7 @@ public class SQLInputImplTests extends BaseTest {
     /*
      * Validate a Clob can be read
      */
-    @Test(enabled = true)
+    @Test
     public void test08() throws Exception {
         Clob c = new StubClob();
         Object[] values = {c};
@@ -166,7 +172,7 @@ public class SQLInputImplTests extends BaseTest {
     /*
      * Validate a Ref can be read
      */
-    @Test(enabled = true)
+    @Test
     public void test09() throws Exception {
         Ref ref = new StubRef(sqlType, hero);
         Object[] values = {ref};
@@ -179,7 +185,7 @@ public class SQLInputImplTests extends BaseTest {
     /*
      * Validate a URL can be read
      */
-    @Test(enabled = true)
+    @Test
     public void test10() throws Exception {
         URL u = new URL("http://www.oracle.com/");
         Object[] values = {u};
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java b/test/jdk/javax/sql/test/rowset/serial/SQLOutputImplTests.java
similarity index 91%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SQLOutputImplTests.java
index 1f90c9981a7..83712e81396 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SQLOutputImplTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SQLOutputImplTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,9 +41,11 @@ import javax.sql.rowset.serial.SerialClob;
 import javax.sql.rowset.serial.SerialDatalink;
 import javax.sql.rowset.serial.SerialRef;
 import javax.sql.rowset.serial.SerialStruct;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubArray;
 import util.StubBlob;
@@ -64,7 +66,7 @@ public class SQLOutputImplTests extends BaseTest {
     private SuperHero hero;
     private SQLOutputImpl outImpl;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         results = new Vector();
         impl = new TestSQLDataImpl("TestSQLData");
@@ -78,18 +80,22 @@ public class SQLOutputImplTests extends BaseTest {
      * Validate that a SQLException is thrown if the attribute value is
      * null
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test() throws Exception {
-        SQLOutputImpl x = new SQLOutputImpl(null, map);
+        assertThrows(SQLException.class, () -> {
+            SQLOutputImpl x = new SQLOutputImpl(null, map);
+        });
     }
 
     /*
      * Validate that a SQLException is thrown if the map value is
      * null
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test02() throws Exception {
-        SQLOutputImpl x = new SQLOutputImpl(results, null);
+        assertThrows(SQLException.class, () -> {
+            SQLOutputImpl x = new SQLOutputImpl(results, null);
+        });
     }
 
     /*
@@ -109,7 +115,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate a Array can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test04() throws Exception {
         Object[] coffees = new Object[]{"Espresso", "Colombian", "French Roast",
             "Cappuccino"};
@@ -123,7 +129,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate a Blob can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test05() throws Exception {
         Blob b = new StubBlob();
         outImpl.writeBlob(b);
@@ -136,7 +142,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate a Clob can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test06() throws Exception {
         Clob c = new StubClob();
         outImpl.writeClob(c);
@@ -148,7 +154,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate a Ref can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test07() throws Exception {
         Ref ref = new StubRef(sqlType, hero);
         outImpl.writeRef(ref);
@@ -159,7 +165,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate a Struct can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test08() throws Exception {
         Object[] attributes = new Object[]{"Bruce", "Wayne", 1939,
             "Batman"};
@@ -173,7 +179,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate a DataLink can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test09() throws Exception {
         URL u = new URL("http://www.oracle.com/");
         outImpl.writeURL(u);
@@ -186,7 +192,7 @@ public class SQLOutputImplTests extends BaseTest {
     /*
      * Validate an Object implementing SQLData can be written and returned
      */
-    @Test(enabled = true)
+    @Test
     public void test10() throws Exception {
         Object[] attributes = new Object[]{"Bruce", "Wayne", 1939,
             "Batman"};
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialArrayTests.java
similarity index 72%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialArrayTests.java
index 345315b7f05..892de9416a1 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialArrayTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,11 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.sql.rowset.serial.SerialArray;
 import javax.sql.rowset.serial.SerialException;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubArray;
 
@@ -42,7 +44,7 @@ public class SerialArrayTests extends BaseTest {
     private Array a;
     private Map<String, Class<?>> map;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         coffees = new Object[]{"Espresso", "Colombian", "French Roast",
             "Cappuccino"};
@@ -61,111 +63,133 @@ public class SerialArrayTests extends BaseTest {
     /*
      * Validate a SQLException is thrown if the map is null
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test02() throws Exception {
-        SerialArray sa = new SerialArray(a, null);
+        assertThrows(SQLException.class, () -> {
+            SerialArray sa = new SerialArray(a, null);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when getResultSet() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test03() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.getResultSet();
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.getResultSet();
+        });
     }
 
     /*
      * Validate a SerialException is thrown when getResultSet() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test04() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.getResultSet(null);
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.getResultSet(null);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when getResultSet() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test05() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.getResultSet(1, 1);
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.getResultSet(1, 1);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when getResultSet() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test06() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.getResultSet(1, 1, null);
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.getResultSet(1, 1, null);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when  getArray() is invoked after
      * free() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test07() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.free();
-        sa.getArray();
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.free();
+            sa.getArray();
+        });
     }
 
     /*
      * Validate a SerialException is thrown when  getArray() is invoked after
      * free() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test08() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.free();
-        sa.getArray(map);
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.free();
+            sa.getArray(map);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when  getArray() is invoked after
      * free() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test09() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.free();
-        sa.getArray(1, 1, map);
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.free();
+            sa.getArray(1, 1, map);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when  getArray() is invoked after
      * free() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test10() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.free();
-        sa.getArray(1, 1);
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.free();
+            sa.getArray(1, 1);
+        });
     }
 
     /*
      * Validate a SerialException is thrown when  getBaseType() is invoked after
      * free() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test11() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.free();
-        sa.getBaseType();
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.free();
+            sa.getBaseType();
+        });
     }
 
     /*
      * Validate a SerialException is thrown when  getBaseTypeName() is invoked after
      * free() is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test12() throws Exception {
-        SerialArray sa = new SerialArray(a);
-        sa.free();
-        sa.getBaseTypeName();
+        assertThrows(SerialException.class, () -> {
+            SerialArray sa = new SerialArray(a);
+            sa.free();
+            sa.getBaseTypeName();
+        });
     }
 
     /*
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialBlobTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialBlobTests.java
similarity index 69%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialBlobTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialBlobTests.java
index f3f6c327683..f4a32bc19d7 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialBlobTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialBlobTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,11 +24,14 @@ package test.rowset.serial;
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.sql.SQLException;
 import java.util.Arrays;
 import javax.sql.rowset.serial.SerialBlob;
 import javax.sql.rowset.serial.SerialException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubBlob;
 
@@ -37,6 +40,16 @@ public class SerialBlobTests extends BaseTest {
     // byte[] used to populate SerialBlob
     private byte[] bytes = new byte[]{1, 2, 3, 4, 5};
 
+    /*
+     * Validate calling setBinaryStream() on a SerialBlob constructed from a
+     * byte array throws SerialException. Bug 7077451.
+     */
+    @Test
+    void setBinaryStreamExceptionTest() throws SQLException {
+        SerialBlob blob = new SerialBlob(new byte[0]);
+        assertThrows(SerialException.class, () -> blob.setBinaryStream(0));
+    }
+
     /*
      * Validate calling free() does not throw an Exception
      */
@@ -50,110 +63,130 @@ public class SerialBlobTests extends BaseTest {
      * Validate calling getBinaryStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test01() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.getBinaryStream();
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.getBinaryStream();
+        });
     }
 
     /*
      * Validate calling getBinaryStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test02() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.getBinaryStream(1, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.getBinaryStream(1, 5);
+        });
     }
 
     /*
      * Validate calling getBytes() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test03() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.getBytes(1, 1);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.getBytes(1, 1);
+        });
     }
 
     /*
      * Validate calling getLength() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test04() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.length();
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.length();
+        });
     }
 
     /*
      * Validate calling position() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test05() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.position(new byte[5], 1);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.position(new byte[5], 1);
+        });
     }
 
     /*
      * Validate calling position() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test06() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.position(new StubBlob(), 1);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.position(new StubBlob(), 1);
+        });
     }
 
     /*
      * Validate calling free() after calling setBinaryStream() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test07() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.setBinaryStream(5);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.setBinaryStream(5);
+        });
     }
 
     /*
      * Validate calling free() after calling setBytes() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test08() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.setBytes(1, new byte[5]);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.setBytes(1, new byte[5]);
+        });
     }
 
     /*
      * Validate calling setBytes() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test09() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.setBytes(1, new byte[10], 0, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.setBytes(1, new byte[10], 0, 5);
+        });
     }
 
     /*
      * Validate calling truncate() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test10() throws Exception {
-        SerialBlob sb = new SerialBlob(new StubBlob());
-        sb.free();
-        sb.truncate(1);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(new StubBlob());
+            sb.free();
+            sb.truncate(1);
+        });
     }
 
     /*
@@ -173,56 +206,68 @@ public class SerialBlobTests extends BaseTest {
     /*
      * Validate a SerialException is thrown if pos < 0 for getBinaryStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test12() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        InputStream is = sb.getBinaryStream(-1, 3);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            InputStream is = sb.getBinaryStream(-1, 3);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if pos = 0 for getBinaryStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test13() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        InputStream is = sb.getBinaryStream(0, 3);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            InputStream is = sb.getBinaryStream(0, 3);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if len > the length of the stream
      * for getBinaryStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test14() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        InputStream is = sb.getBinaryStream(0, 3);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            InputStream is = sb.getBinaryStream(0, 3);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if length < 1
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test15() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        InputStream is = sb.getBinaryStream(1, 0);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            InputStream is = sb.getBinaryStream(1, 0);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if length > byte array length
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test16() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        InputStream is = sb.getBinaryStream(1, 6);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            InputStream is = sb.getBinaryStream(1, 6);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if pos > byte array length
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test17() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        InputStream is = sb.getBinaryStream(bytes.length + 2, 6);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            InputStream is = sb.getBinaryStream(bytes.length + 2, 6);
+        });
     }
 
     /*
@@ -241,12 +286,14 @@ public class SerialBlobTests extends BaseTest {
     /*
      * Test clone after free has been called that the clone is not accessible
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test19() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        sb.free();
-        SerialBlob sb2 = (SerialBlob) sb.clone();
-        InputStream is = sb2.getBinaryStream(1, 3);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            sb.free();
+            SerialBlob sb2 = (SerialBlob) sb.clone();
+            InputStream is = sb2.getBinaryStream(1, 3);
+        });
     }
 
     /*
@@ -264,10 +311,12 @@ public class SerialBlobTests extends BaseTest {
      * Validate a SerialException is thrown if byte[] is used to
      * create the SeriablBlob and setBinaryStream is called
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test21() throws Exception {
-        SerialBlob sb = new SerialBlob(bytes);
-        sb.setBinaryStream(3);
+        assertThrows(SerialException.class, () -> {
+            SerialBlob sb = new SerialBlob(bytes);
+            sb.setBinaryStream(3);
+        });
     }
 
     /*
@@ -281,7 +330,7 @@ public class SerialBlobTests extends BaseTest {
         byte[] expected = new byte[]{1, 7, 8, 9, 5};
         SerialBlob sb = new SerialBlob(bytes);
         int written = sb.setBytes(2, diff);
-        assertEquals(written, diff.length);
+        assertEquals(diff.length, written);
         assertTrue(
                 Arrays.equals(sb.getBytes(1, (int) sb.length()),
                         expected),
@@ -300,7 +349,7 @@ public class SerialBlobTests extends BaseTest {
         byte[] expected = new byte[]{1, 8, 9, 0, 5};
         SerialBlob sb = new SerialBlob(bytes);
         int written = sb.setBytes(2, diff, 1, bytesToWrite);
-        assertEquals(written, bytesToWrite);
+        assertEquals(bytesToWrite, written);
         assertTrue(
                 Arrays.equals(sb.getBytes(1, (int) sb.length()),
                         expected),
@@ -355,7 +404,7 @@ public class SerialBlobTests extends BaseTest {
         byte[] pattern = new byte[]{3, 4};
         SerialBlob sb = new SerialBlob(bytes);
         long pos = sb.position(pattern, 1);
-        assertEquals(pos, expectedPos);
+        assertEquals(expectedPos, pos);
     }
 
     /*
@@ -368,7 +417,7 @@ public class SerialBlobTests extends BaseTest {
         byte[] pattern = new byte[]{3, 4, 5};
         SerialBlob sb = new SerialBlob(bytes);
         long pos = sb.position(pattern, 2);
-        assertEquals(pos, expectedPos);
+        assertEquals(expectedPos, pos);
     }
 
     /*
@@ -381,7 +430,7 @@ public class SerialBlobTests extends BaseTest {
         byte[] pattern = new byte[]{4, 6};
         SerialBlob sb = new SerialBlob(new StubBlob());
         long pos = sb.position(pattern, 1);
-        assertEquals(pos, expectedPos);
+        assertEquals(expectedPos, pos);
     }
 
     /*
@@ -394,7 +443,7 @@ public class SerialBlobTests extends BaseTest {
         byte[] pattern = new byte[]{6, 8};
         SerialBlob sb = new SerialBlob(new StubBlob());
         long pos = sb.position(pattern, 2);
-        assertEquals(pos, expectedPos);
+        assertEquals(expectedPos, pos);
     }
 
     /*
@@ -411,8 +460,8 @@ public class SerialBlobTests extends BaseTest {
         byte[] expected = new byte[]{1, 2, 3, 4, 7};
         SerialBlob sb = new SerialBlob(bytes);
         int written = sb.setBytes(writePos, diff, 0, bytesToWrite);
-        assertEquals(written, bytesToWrite);
-        assertEquals(sb.getBytes(1, (int) sb.length()), expected);
+        assertEquals(bytesToWrite, written);
+        assertArrayEquals(expected, sb.getBytes(1, (int) sb.length()));
     }
 
     /*
@@ -428,8 +477,8 @@ public class SerialBlobTests extends BaseTest {
         byte[] expected = new byte[]{1, 2, 3, 4, 8, 9};
         SerialBlob sb = new SerialBlob(bytes);
         int written = sb.setBytes(writePos, diff, 1, bytesToWrite);
-        assertEquals(written, bytesToWrite);
-        assertEquals(sb.getBytes(1, (int) sb.length()), expected);
+        assertEquals(bytesToWrite, written);
+        assertArrayEquals(expected, sb.getBytes(1, (int) sb.length()));
     }
 
     /*
@@ -445,29 +494,33 @@ public class SerialBlobTests extends BaseTest {
         byte[] expected = new byte[]{1, 2, 3, 4, 5, 8, 9, 0};
         SerialBlob sb = new SerialBlob(bytes);
         int written = sb.setBytes(writePos, diff, 1, bytesToWrite);
-        assertEquals(written, bytesToWrite);
-        assertEquals(sb.getBytes(1, (int) sb.length()), expected);
+        assertEquals(bytesToWrite, written);
+        assertArrayEquals(expected, sb.getBytes(1, (int) sb.length()));
     }
 
     /*
      * Validate a SerialException is thrown if length < 0 for setBytes
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test34() throws Exception {
-        int length = -1;
-        SerialBlob sb = new SerialBlob(bytes);
-        int written = sb.setBytes(1, new byte[]{1}, 1, length);
+        assertThrows(SerialException.class, () -> {
+            int length = -1;
+            SerialBlob sb = new SerialBlob(bytes);
+            int written = sb.setBytes(1, new byte[]{1}, 1, length);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if length + offset >
      * Integer.MAX_VALUE for setBytes
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test35() throws Exception {
-        int offset = 1;
-        int length = Integer.MAX_VALUE;
-        SerialBlob sb = new SerialBlob(bytes);
-        int written = sb.setBytes(1, new byte[]{1, 2, 3}, offset, length);
+        assertThrows(SerialException.class, () -> {
+            int offset = 1;
+            int length = Integer.MAX_VALUE;
+            SerialBlob sb = new SerialBlob(bytes);
+            int written = sb.setBytes(1, new byte[]{1, 2, 3}, offset, length);
+        });
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialClobTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialClobTests.java
similarity index 72%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialClobTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialClobTests.java
index 95c5f6f64a7..2636c3b6a84 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialClobTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialClobTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,14 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
+import java.sql.SQLException;
 import javax.sql.rowset.serial.SerialClob;
 import javax.sql.rowset.serial.SerialException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubClob;
 
@@ -43,6 +47,26 @@ public class SerialClobTests extends BaseTest {
             'o', 'r', 'l', 'd'};
     }
 
+    /*
+     * Validate calling setAsciiStream() on a SerialClob constructed from a
+     * char array throws SerialException. Bug 7077451.
+     */
+    @Test
+    void setAsciiStreamExceptionTest() throws SQLException {
+        SerialClob clob = new SerialClob(new char[0]);
+        assertThrows(SerialException.class, () -> clob.setAsciiStream(0));
+    }
+
+    /*
+     * Validate calling setCharacterStream() on a SerialClob constructed from a
+     * char array throws SerialException. Bug 7077451.
+     */
+    @Test
+    void setCharacterStreamExceptionTest() throws SQLException {
+        SerialClob clob = new SerialClob(new char[0]);
+        assertThrows(SerialException.class, () -> clob.setCharacterStream(0));
+    }
+
     /*
      * Validate calling free() does not throw an Exception
      */
@@ -56,192 +80,228 @@ public class SerialClobTests extends BaseTest {
      * Validate calling getCharacterStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test01() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.getCharacterStream();
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.getCharacterStream();
+        });
     }
 
     /*
      * Validate calling getCharacterStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test02() throws Exception {
-        SerialClob sc = new SerialClob(chars);
-        sc.free();
-        sc.getCharacterStream();
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(chars);
+            sc.free();
+            sc.getCharacterStream();
+        });
     }
 
     /*
      * Validate calling getCharacterStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test03() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.getCharacterStream(1, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.getCharacterStream(1, 5);
+        });
     }
 
     /*
      * Validate calling getSubString() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test04() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.getSubString(1, 1);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.getSubString(1, 1);
+        });
     }
 
     /*
      * Validate calling truncate() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test05() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.truncate(1);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.truncate(1);
+        });
     }
 
     /*
      * Validate calling getAsciiStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test06() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.getAsciiStream();
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.getAsciiStream();
+        });
     }
 
     /*
      * Validate calling length() after calling free() throws an SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test07() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.length();
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.length();
+        });
     }
 
     /*
      * Validate calling position() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test08() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.position("hello", 1);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.position("hello", 1);
+        });
     }
 
     /*
      * Validate calling position() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test09() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.position(new StubClob(), 1);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.position(new StubClob(), 1);
+        });
     }
 
     /*
      * Validate calling setAsciiStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test10() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.setAsciiStream(5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.setAsciiStream(5);
+        });
     }
 
     /*
      * Validate calling setCharacterStream() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test11() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.setCharacterStream(5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.setCharacterStream(5);
+        });
     }
 
     /*
      * Validate calling setString() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test12() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.setString(1, "hello");
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.setString(1, "hello");
+        });
     }
 
     /*
      * Validate calling setString() after calling free() throws an
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test13() throws Exception {
-        SerialClob sc = new SerialClob(new StubClob());
-        sc.free();
-        sc.setString(1, "hello", 0, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(new StubClob());
+            sc.free();
+            sc.setString(1, "hello", 0, 5);
+        });
     }
 
     /*
      * Test that SerialException is thrown if pos < 0 on a call to
      * getCharacterStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test14() throws Exception {
-        SerialClob sc = new SerialClob(chars);
-        sc.getCharacterStream(-1, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(chars);
+            sc.getCharacterStream(-1, 5);
+        });
     }
 
     /*
      * Test that SerialException is thrown if pos = 0 on a call to
      * getCharacterStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test15() throws Exception {
-        SerialClob sc = new SerialClob(chars);
-        sc.getCharacterStream(0, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(chars);
+            sc.getCharacterStream(0, 5);
+        });
     }
 
     /*
      * Test that SerialException is thrown if pos = 0 on a call to
      * getCharacterStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test16() throws Exception {
-        SerialClob sc = new SerialClob(chars);
-        sc.getCharacterStream(1, 100);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(chars);
+            sc.getCharacterStream(1, 100);
+        });
     }
 
     /*
      * Test that SerialException is thrown if length = 0 on a call to
      * getCharacterStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test17() throws Exception {
-        SerialClob sc = new SerialClob(chars);
-        sc.getCharacterStream(1, 0);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(chars);
+            sc.getCharacterStream(1, 0);
+        });
     }
 
     /*
      * Test that SerialException is thrown if pos > length on a call to
      * getCharacterStream
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test18() throws Exception {
-        SerialClob sc = new SerialClob(chars);
-        sc.getCharacterStream(100, 5);
+        assertThrows(SerialException.class, () -> {
+            SerialClob sc = new SerialClob(chars);
+            sc.getCharacterStream(100, 5);
+        });
     }
 
     /*
@@ -401,7 +461,7 @@ public class SerialClobTests extends BaseTest {
         String expected = "Hello, I am the Batman!";
         SerialClob sc = new SerialClob(val.toCharArray());
         int written = sc.setString(13, val1);
-        assertEquals(val1.length(), written);
+        assertEquals(written, val1.length());
         assertTrue(expected.equals(sc.getSubString(1, (int) sc.length())));
     }
 
@@ -420,8 +480,8 @@ public class SerialClobTests extends BaseTest {
         String expected = "Hi, I am the Joker!!!!!";
         SerialClob sc = new SerialClob(val.toCharArray());
         int written = sc.setString(writePos, val1, offset, expectedWritten);
-        assertEquals(written, expectedWritten);
-        assertEquals(sc.getSubString(1, (int) sc.length()), expected);
+        assertEquals(expectedWritten, written);
+        assertEquals(expected, sc.getSubString(1, (int) sc.length()));
     }
 
     /*
@@ -478,7 +538,8 @@ public class SerialClobTests extends BaseTest {
      * Check that getCharacterStream() returns a Reader and that the char[] that
      * was specified to create the SerialClob can be returned via the Reader
      */
-    @Test(enabled = false)
+    @Test
+    @Disabled
     public void test37() throws Exception {
         SerialClob sc = new SerialClob(chars);
         String expected = "ello w";
@@ -504,12 +565,14 @@ public class SerialClobTests extends BaseTest {
      * Check calling setString() with offset > val1.length() throws a
      * SerialException
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test39() throws Exception {
-        String val1 = "hello";
-        int offset = val1.length() + 1;
-        SerialClob sc = new SerialClob(chars);
-        sc.setString(1, val1, offset, 0);
+        assertThrows(SerialException.class, () -> {
+            String val1 = "hello";
+            int offset = val1.length() + 1;
+            SerialClob sc = new SerialClob(chars);
+            sc.setString(1, val1, offset, 0);
+        });
     }
 
     /*
@@ -526,8 +589,8 @@ public class SerialClobTests extends BaseTest {
         String expected = "Hello, I am the Joker, who are you?!";
         SerialClob sc = new SerialClob(val.toCharArray());
         int written = sc.setString(writePos, val1, offset, expectedWritten);
-        assertEquals(written, expectedWritten);
-        assertEquals(sc.getSubString(1, (int) sc.length()), expected);
+        assertEquals(expectedWritten, written);
+        assertEquals(expected, sc.getSubString(1, (int) sc.length()));
     }
 
     /*
@@ -544,29 +607,33 @@ public class SerialClobTests extends BaseTest {
         String expected = "Hi, I am the Joker!";
         SerialClob sc = new SerialClob(val.toCharArray());
         int written = sc.setString(writePos, val1, offset, expectedWritten);
-        assertEquals(written, expectedWritten);
-        assertEquals(sc.getSubString(1, (int) sc.length()), expected);
+        assertEquals(expectedWritten, written);
+        assertEquals(expected, sc.getSubString(1, (int) sc.length()));
     }
 
     /*
      * Validate a SerialException is thrown if length < 0 for setString
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test42() throws Exception {
-        int length = -1;
-        SerialClob sc = new SerialClob(chars);
-        int written = sc.setString(1, "hello", 1, length);
+        assertThrows(SerialException.class, () -> {
+            int length = -1;
+            SerialClob sc = new SerialClob(chars);
+            int written = sc.setString(1, "hello", 1, length);
+        });
     }
 
     /*
      * Validate a SerialException is thrown if length + offset >
      * Integer.MAX_VALUE for setString
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test43() throws Exception {
-        int offset = 1;
-        int length = Integer.MAX_VALUE;
-        SerialClob sc = new SerialClob(chars);
-        int written = sc.setString(1, "hello", offset, length);
+        assertThrows(SerialException.class, () -> {
+            int offset = 1;
+            int length = Integer.MAX_VALUE;
+            SerialClob sc = new SerialClob(chars);
+            int written = sc.setString(1, "hello", offset, length);
+        });
     }
 }
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialDataLinkTests.java
similarity index 90%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialDataLinkTests.java
index 0c7f19e85b1..12c1341161d 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialDataLinkTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialDataLinkTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,11 @@ package test.rowset.serial;
 import java.net.URL;
 import javax.sql.rowset.serial.SerialDatalink;
 import javax.sql.rowset.serial.SerialException;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SerialDataLinkTests extends BaseTest {
@@ -36,7 +38,7 @@ public class SerialDataLinkTests extends BaseTest {
     private URL u1;
     private SerialDatalink dl;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         u = new URL("http://www.oracle.com/");
         u1 = new URL("http://www.usatoday.com/");
@@ -46,9 +48,11 @@ public class SerialDataLinkTests extends BaseTest {
     /*
      * Validate that a SerialException is thrown if the URL is null
      */
-    @Test(expectedExceptions = SerialException.class)
+    @Test
     public void test() throws Exception {
-        SerialDatalink dl1 = new SerialDatalink(null);
+        assertThrows(SerialException.class, () -> {
+            SerialDatalink dl1 = new SerialDatalink(null);
+        });
     }
 
     /*
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialExceptionTests.java
similarity index 95%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialExceptionTests.java
index 8ef215584a9..51c733b995a 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,10 @@ package test.rowset.serial;
 
 import java.sql.SQLException;
 import javax.sql.rowset.serial.SerialException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SerialExceptionTests extends BaseTest {
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialJavaObjectTests.java
similarity index 86%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialJavaObjectTests.java
index c2fcf2fa48f..e521125df97 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialJavaObjectTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialJavaObjectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,11 @@ import java.util.Arrays;
 import javax.sql.rowset.RowSetMetaDataImpl;
 import javax.sql.rowset.serial.SerialException;
 import javax.sql.rowset.serial.SerialJavaObject;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SerialJavaObjectTests extends BaseTest {
@@ -37,18 +40,23 @@ public class SerialJavaObjectTests extends BaseTest {
      * Validate that an NPE is thrown when null is specified to create
      * the SerialJavaObject
      */
-    @Test(expectedExceptions = NullPointerException.class)
+    @Test
     public void test() throws Exception {
-        SerialJavaObject sjo = new SerialJavaObject(null);
+        assertThrows(NullPointerException.class, () -> {
+            SerialJavaObject sjo = new SerialJavaObject(null);
+        });
     }
 
     /*
      * Validate that a SerialException is thrown when the object specified
      * contains public static fields
      */
-    @Test(expectedExceptions = SerialException.class, enabled = false)
+    @Test
+    @Disabled
     public void test01() throws Exception {
-        SerialJavaObject sjo = new SerialJavaObject(new RowSetMetaDataImpl());
+        assertThrows(SerialException.class, () -> {
+            SerialJavaObject sjo = new SerialJavaObject(new RowSetMetaDataImpl());
+        });
     }
 
     /*
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialRefTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialRefTests.java
similarity index 86%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialRefTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialRefTests.java
index 8f23de70aa6..1b4e72593b0 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialRefTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialRefTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,12 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 import javax.sql.rowset.serial.SerialRef;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubRef;
 import util.SuperHero;
@@ -41,7 +44,7 @@ public class SerialRefTests extends BaseTest {
     private final String sqlType = "SUPERHERO";
     private SuperHero hero;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         map.put(sqlType, Class.forName("util.SuperHero"));
         hero = new SuperHero(sqlType, "Bruce", "Wayne", 1939, "Batman");
@@ -51,18 +54,22 @@ public class SerialRefTests extends BaseTest {
     /*
      * Validate that a SQLException() is thrown if the Ref is null
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test01() throws Exception {
-        SerialRef sr = new SerialRef(null);
+        assertThrows(SQLException.class, () -> {
+            SerialRef sr = new SerialRef(null);
+        });
     }
 
     /*
      * Validate that a SQLException() is thrown if the typeName is null in the
      * Ref used to create the SerialRef
      */
-    @Test(expectedExceptions = SQLException.class)
+    @Test
     public void test02() throws Exception {
-        SerialRef sr = new SerialRef(new StubRef(null, hero));
+        assertThrows(SQLException.class, () -> {
+            SerialRef sr = new SerialRef(new StubRef(null, hero));
+        });
     }
 
     /*
@@ -72,7 +79,7 @@ public class SerialRefTests extends BaseTest {
     @Test
     public void test03() throws Exception {
         SerialRef sr = new SerialRef(ref);
-        assertEquals(sr.getBaseTypeName(), sqlType);
+        assertEquals(sqlType, sr.getBaseTypeName());
     }
 
     /*
@@ -87,7 +94,8 @@ public class SerialRefTests extends BaseTest {
     /*
      * Validate that getObject() returns the same object used to create the Ref
      */
-    @Test(enabled = false)
+    @Test
+    @Disabled
     public void test05() throws Exception {
         SerialRef sr = new SerialRef(ref);
         assertTrue(hero.equals(sr.getObject(map)));
diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java b/test/jdk/javax/sql/test/rowset/serial/SerialStructTests.java
similarity index 92%
rename from test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java
rename to test/jdk/javax/sql/test/rowset/serial/SerialStructTests.java
index 79ac2421c9a..dfc34b60e2b 100644
--- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java
+++ b/test/jdk/javax/sql/test/rowset/serial/SerialStructTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,11 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import javax.sql.rowset.serial.SerialStruct;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubStruct;
 import util.SuperHero;
@@ -42,7 +44,7 @@ public class SerialStructTests extends BaseTest {
     private final String sqlType = "SUPERHERO";
     private SuperHero hero;
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         attributes = new Object[]{"Bruce", "Wayne", 1939,
             "Batman"};
@@ -58,7 +60,7 @@ public class SerialStructTests extends BaseTest {
     @Test
     public void test01() throws Exception {
         SerialStruct ss = new SerialStruct(struct, map);
-        assertEquals(ss.getSQLTypeName(), sqlType);
+        assertEquals(sqlType, ss.getSQLTypeName());
     }
 
     /*
@@ -68,7 +70,7 @@ public class SerialStructTests extends BaseTest {
     @Test
     public void test02() throws Exception {
         SerialStruct ss = new SerialStruct(hero, map);
-        assertEquals(ss.getSQLTypeName(), sqlType);
+        assertEquals(sqlType, ss.getSQLTypeName());
     }
 
     /*
diff --git a/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java b/test/jdk/javax/sql/test/rowset/spi/SyncFactoryExceptionTests.java
similarity index 95%
rename from test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java
rename to test/jdk/javax/sql/test/rowset/spi/SyncFactoryExceptionTests.java
index e93a6109ec7..b747c48989d 100644
--- a/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryExceptionTests.java
+++ b/test/jdk/javax/sql/test/rowset/spi/SyncFactoryExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,10 @@ package test.rowset.spi;
 
 import java.sql.SQLException;
 import javax.sql.rowset.spi.SyncFactoryException;
-import static org.testng.Assert.*;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 
 public class SyncFactoryExceptionTests extends BaseTest {
diff --git a/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java b/test/jdk/javax/sql/test/rowset/spi/SyncFactoryTests.java
similarity index 92%
rename from test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java
rename to test/jdk/javax/sql/test/rowset/spi/SyncFactoryTests.java
index 415488abb9f..260cf150f59 100644
--- a/test/jdk/javax/sql/testng/test/rowset/spi/SyncFactoryTests.java
+++ b/test/jdk/javax/sql/test/rowset/spi/SyncFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,11 @@ import javax.naming.Context;
 import javax.sql.rowset.spi.SyncFactory;
 import javax.sql.rowset.spi.SyncFactoryException;
 import javax.sql.rowset.spi.SyncProvider;
-import static org.testng.Assert.*;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.PropertyStubProvider;
 import util.StubSyncProvider;
 import util.StubContext;
@@ -67,7 +69,7 @@ public class SyncFactoryTests {
         ctx = new StubContext();
     }
 
-    @BeforeMethod
+    @BeforeEach
     public void setUpMethod() throws Exception {
         // Make sure the provider provider that is registered is removed
         // before each run
@@ -120,17 +122,21 @@ public class SyncFactoryTests {
     /*
      * Validate that a SyncFactoryException is thrown if the ProviderID is null
      */
-    @Test(expectedExceptions = SyncFactoryException.class)
+    @Test
     public void test03() throws SyncFactoryException {
-        SyncProvider p = SyncFactory.getInstance(null);
+        assertThrows(SyncFactoryException.class, () -> {
+            SyncProvider p = SyncFactory.getInstance(null);
+        });
     }
 
     /*
      * Validate that a SyncFactoryException is thrown if the Logger is null
      */
-    @Test(expectedExceptions = SyncFactoryException.class,enabled=true)
+    @Test
     public void test04() throws SyncFactoryException {
-        Logger l = SyncFactory.getLogger();
+        assertThrows(SyncFactoryException.class, () -> {
+            Logger l = SyncFactory.getLogger();
+        });
     }
 
     /*
@@ -179,15 +185,15 @@ public class SyncFactoryTests {
      * Validate that setJNDIContext throws a SyncFactoryException if the
      * context is null
      */
-    @Test(expectedExceptions = SyncFactoryException.class, enabled=true)
+    @Test
     public void test08() throws Exception {
-        SyncFactory.setJNDIContext(null);
+        assertThrows(SyncFactoryException.class, () -> SyncFactory.setJNDIContext(null));
     }
 
     /*
      * Validate that setJNDIContext succeeds
      */
-    @Test(enabled=true)
+    @Test
     public void test09() throws Exception {
         SyncFactory.setJNDIContext(ctx);
     }
diff --git a/test/jdk/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java b/test/jdk/javax/sql/test/rowset/spi/SyncProviderExceptionTests.java
similarity index 96%
rename from test/jdk/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java
rename to test/jdk/javax/sql/test/rowset/spi/SyncProviderExceptionTests.java
index 22863b0f6bb..f8786f1b429 100644
--- a/test/jdk/javax/sql/testng/test/rowset/spi/SyncProviderExceptionTests.java
+++ b/test/jdk/javax/sql/test/rowset/spi/SyncProviderExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,12 @@ import java.sql.SQLException;
 import javax.sql.rowset.spi.SyncProviderException;
 import javax.sql.rowset.spi.SyncResolver;
 
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import util.BaseTest;
 import util.StubSyncResolver;
 
@@ -40,16 +41,16 @@ public class SyncProviderExceptionTests extends BaseTest {
     // Used by SyncProviderException::getSyncResolver tests
     private SyncResolver resolver;
 
-    @BeforeClass
+    @BeforeAll
     public static void setUpClass() throws Exception {
         System.out.println(System.getProperty("java.naming.factory.initial"));
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownClass() throws Exception {
     }
 
-    @BeforeMethod
+    @BeforeEach
     public void setupTest() {
         resolver = new SyncProviderException().getSyncResolver();
     }
diff --git a/test/jdk/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java b/test/jdk/javax/sql/test/rowset/webrowset/CommonWebRowSetTests.java
similarity index 81%
rename from test/jdk/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/webrowset/CommonWebRowSetTests.java
index ce0801e0fe4..023adc8254b 100644
--- a/test/jdk/javax/sql/testng/test/rowset/webrowset/CommonWebRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/webrowset/CommonWebRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,11 +35,15 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Arrays;
 import javax.sql.rowset.WebRowSet;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertEqualsNoOrder;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import org.testng.annotations.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import test.rowset.cachedrowset.CommonCachedRowSetTests;
 
 public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
@@ -131,10 +135,11 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
     /*
      * Validate the expected Rows are contained within the RowSet
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0000(WebRowSet wrs) throws Exception {
-        assertEquals(getPrimaryKeys(wrs), COFFEES_PRIMARY_KEYS);
-        assertEquals(wrs.size(), COFFEES_ROWS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs));
+        assertEquals(COFFEES_ROWS, wrs.size());
         wrs.close();
     }
 
@@ -142,14 +147,15 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the expected Rows are contained within the RowSet
      * populated by readXML(Reader)
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0001(WebRowSet wrs1) throws Exception {
 
         try (FileReader fr = new FileReader(COFFEE_ROWS_XML)) {
             wrs1.readXml(fr);
         }
-        assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
-        assertEquals(wrs1.size(), COFFEES_ROWS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
+        assertEquals(COFFEES_ROWS, wrs1.size());
         wrs1.close();
 
     }
@@ -158,13 +164,14 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the expected Rows are contained within the RowSet
      * populated by readXML(InputStream)
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0002(WebRowSet wrs1) throws Exception {
         try (FileInputStream fis = new FileInputStream(COFFEE_ROWS_XML)) {
             wrs1.readXml(fis);
         }
-        assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
-        assertEquals(wrs1.size(), COFFEES_ROWS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
+        assertEquals(COFFEES_ROWS, wrs1.size());
         wrs1.close();
     }
 
@@ -173,12 +180,13 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(InputStream) and validate the primary  keys
      * are the same
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0003(WebRowSet wrs) throws Exception {
         ByteArrayOutputStream baos = writeWebRowSetWithOutputStream(wrs);
         try (WebRowSet wrs1 = readWebRowSetWithOInputStream(baos)) {
-            assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
-            assertEquals(wrs1.size(), COFFEES_ROWS);
+            assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
+            assertEquals(COFFEES_ROWS, wrs1.size());
         }
     }
 
@@ -187,14 +195,15 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(InputStream) and validate the primary  keys
      * are the same
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0004(WebRowSet wrs) throws Exception {
         ResultSet rs = wrs;
         rs.beforeFirst();
         ByteArrayOutputStream baos = writeWebRowSetWithOutputStream(rs);
         try (WebRowSet wrs1 = readWebRowSetWithOInputStream(baos)) {
-            assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
-            assertEquals(wrs1.size(), COFFEES_ROWS);
+            assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
+            assertEquals(COFFEES_ROWS, wrs1.size());
         }
     }
 
@@ -203,12 +212,13 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(Reader) and validate the primary  keys
      * are the same
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0005(WebRowSet wrs) throws Exception {
         ByteArrayOutputStream baos = writeWebRowSetWithOutputStreamWithWriter(wrs);
         try (WebRowSet wrs1 = readWebRowSetWithOInputStreamWithReader(baos)) {
-            assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
-            assertEquals(wrs1.size(), COFFEES_ROWS);
+            assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
+            assertEquals(COFFEES_ROWS, wrs1.size());
         }
     }
 
@@ -217,14 +227,15 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * back via readXML(Reader) and validate the primary  keys
      * are the same
      */
-    @Test(dataProvider = "rowsetUsingCoffees")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0006(WebRowSet wrs) throws Exception {
         ResultSet rs = wrs;
         rs.beforeFirst();
         ByteArrayOutputStream baos = writeWebRowSetWithOutputStreamWithWriter(rs);
         try (WebRowSet wrs1 = readWebRowSetWithOInputStreamWithReader(baos)) {
-            assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
-            assertEquals(wrs1.size(), COFFEES_ROWS);
+            assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
+            assertEquals(COFFEES_ROWS, wrs1.size());
         }
     }
 
@@ -232,11 +243,13 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the expected Rows are contained within the RowSet
      * after deleting the specified rows
      */
-    @Test(dataProvider = "rowsetUsingCoffees", enabled = false)
+    @Disabled
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowsetUsingCoffees")
     public void WebRowSetTest0007(WebRowSet wrs) throws Exception {
-        assertEquals(getPrimaryKeys(wrs), COFFEES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs));
         int[] rowsToDelete = {2, 4};
-        assertEquals(getPrimaryKeys(wrs), COFFEES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs));
         for (int row : rowsToDelete) {
             assertTrue(deleteRowByPrimaryKey(wrs, row, 1));
         }
@@ -262,12 +275,13 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * that was populated by reading an xml file with all rows
      * marked as a currentRow
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0008(WebRowSet wrs1) throws Exception {
         FileInputStream fis = new FileInputStream(COFFEE_ROWS_XML);
         wrs1.readXml(fis);
         assertTrue(wrs1.size() == COFFEES_ROWS);
-        assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
         // Validate that the rows are not marked as deleted, inserted or updated
         wrs1.beforeFirst();
         while (wrs1.next()) {
@@ -284,14 +298,15 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Also validate that they are or are not visible based on the
      * setShowDeleted value
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0009(WebRowSet wrs1) throws Exception {
         int[] rowsToDelete = {2, 4};
         Object[] expectedRows = {1, 3, 5};
         FileInputStream fis = new FileInputStream(DELETED_COFFEE_ROWS_XML);
         wrs1.readXml(fis);
         assertTrue(wrs1.size() == COFFEES_ROWS);
-        assertEquals(getPrimaryKeys(wrs1), expectedRows);
+        assertArrayEquals(expectedRows, getPrimaryKeys(wrs1));
         // With setShowDeleted(false) which is the default,
         // the deleted row should not be visible
         for (int row : rowsToDelete) {
@@ -302,7 +317,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
         for (int row : rowsToDelete) {
             assertTrue(findRowByPrimaryKey(wrs1, row, 1));
         }
-        assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
         wrs1.close();
 
     }
@@ -311,12 +326,13 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate that the correct row in the WebRowSet that had been created
      * from an xml file is marked as updated and contains the correct values
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0010(WebRowSet wrs1) throws Exception {
         FileInputStream fis = new FileInputStream(UPDATED_COFFEE_ROWS_XML);
         wrs1.readXml(fis);
         assertTrue(wrs1.size() == COFFEES_ROWS);
-        assertEquals(getPrimaryKeys(wrs1), COFFEES_PRIMARY_KEYS);
+        assertArrayEquals(COFFEES_PRIMARY_KEYS, getPrimaryKeys(wrs1));
         wrs1.beforeFirst();
         while (wrs1.next()) {
             if (wrs1.getInt(1) == 3) {
@@ -337,7 +353,8 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
      * Validate the correct row is marked as inserted in a WebRowSet
      * that is read from an xml file
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0011(WebRowSet wrs1) throws Exception {
         int expectedSize = COFFEES_ROWS + 2;
         int addedRowPK = 15;
@@ -348,7 +365,10 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
         FileInputStream fis = new FileInputStream(INSERTED_COFFEE_ROWS_XML);
         wrs1.readXml(fis);
         assertTrue(wrs1.size() == expectedSize);
-        assertEqualsNoOrder(getPrimaryKeys(wrs1), expected);
+        var actual = getPrimaryKeys(wrs1);
+        Arrays.sort(actual);
+        Arrays.sort(expected);
+        assertArrayEquals(expected, actual);
         wrs1.beforeFirst();
         while (wrs1.next()) {
             if (wrs1.getInt(1) == 15 || wrs1.getInt(1) == 20) {
@@ -367,7 +387,8 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
     /*
      * Read an xml file which contains a row that was inserted and updated
      */
-    @Test(dataProvider = "rowSetType")
+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("rowSetType")
     public void WebRowSetTest0012(WebRowSet wrs1) throws Exception {
         int expectedSize = COFFEES_ROWS + 1;
         int addedRowPK = 100;
@@ -376,7 +397,7 @@ public abstract class CommonWebRowSetTests extends CommonCachedRowSetTests {
         FileInputStream fis = new FileInputStream(UPDATED_INSERTED_COFFEE_ROWS_XML);
         wrs1.readXml(fis);
         assertTrue(wrs1.size() == expectedSize);
-        assertEquals(getPrimaryKeys(wrs1), expected);
+        assertArrayEquals(expected, getPrimaryKeys(wrs1));
         wrs1.beforeFirst();
         while (wrs1.next()) {
             if (wrs1.getInt(1) == addedRowPK) {
diff --git a/test/jdk/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java b/test/jdk/javax/sql/test/rowset/webrowset/WebRowSetTests.java
similarity index 94%
rename from test/jdk/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java
rename to test/jdk/javax/sql/test/rowset/webrowset/WebRowSetTests.java
index 5f2890e0b5b..4692c0cee84 100644
--- a/test/jdk/javax/sql/testng/test/rowset/webrowset/WebRowSetTests.java
+++ b/test/jdk/javax/sql/test/rowset/webrowset/WebRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/PropertyStubProvider.java b/test/jdk/javax/sql/util/PropertyStubProvider.java
similarity index 92%
rename from test/jdk/javax/sql/testng/util/PropertyStubProvider.java
rename to test/jdk/javax/sql/util/PropertyStubProvider.java
index d397cc1c7d4..1cadcef26bb 100644
--- a/test/jdk/javax/sql/testng/util/PropertyStubProvider.java
+++ b/test/jdk/javax/sql/util/PropertyStubProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubArray.java b/test/jdk/javax/sql/util/StubArray.java
similarity index 97%
rename from test/jdk/javax/sql/testng/util/StubArray.java
rename to test/jdk/javax/sql/util/StubArray.java
index 1d2ef0e5b6f..b57760679a0 100644
--- a/test/jdk/javax/sql/testng/util/StubArray.java
+++ b/test/jdk/javax/sql/util/StubArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubBaseRowSet.java b/test/jdk/javax/sql/util/StubBaseRowSet.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubBaseRowSet.java
rename to test/jdk/javax/sql/util/StubBaseRowSet.java
index e003b522ed9..94be7f8e348 100644
--- a/test/jdk/javax/sql/testng/util/StubBaseRowSet.java
+++ b/test/jdk/javax/sql/util/StubBaseRowSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubBlob.java b/test/jdk/javax/sql/util/StubBlob.java
similarity index 97%
rename from test/jdk/javax/sql/testng/util/StubBlob.java
rename to test/jdk/javax/sql/util/StubBlob.java
index 727e8a926d5..f86fd540841 100644
--- a/test/jdk/javax/sql/testng/util/StubBlob.java
+++ b/test/jdk/javax/sql/util/StubBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubCachedRowSetImpl.java b/test/jdk/javax/sql/util/StubCachedRowSetImpl.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubCachedRowSetImpl.java
rename to test/jdk/javax/sql/util/StubCachedRowSetImpl.java
index 9000deb1b65..65e8169dbb6 100644
--- a/test/jdk/javax/sql/testng/util/StubCachedRowSetImpl.java
+++ b/test/jdk/javax/sql/util/StubCachedRowSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubClob.java b/test/jdk/javax/sql/util/StubClob.java
similarity index 97%
rename from test/jdk/javax/sql/testng/util/StubClob.java
rename to test/jdk/javax/sql/util/StubClob.java
index cb1e0c0a62a..b0db14b3526 100644
--- a/test/jdk/javax/sql/testng/util/StubClob.java
+++ b/test/jdk/javax/sql/util/StubClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubContext.java b/test/jdk/javax/sql/util/StubContext.java
similarity index 98%
rename from test/jdk/javax/sql/testng/util/StubContext.java
rename to test/jdk/javax/sql/util/StubContext.java
index af03534d991..6f03a1abd48 100644
--- a/test/jdk/javax/sql/testng/util/StubContext.java
+++ b/test/jdk/javax/sql/util/StubContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubFilteredRowSetImpl.java b/test/jdk/javax/sql/util/StubFilteredRowSetImpl.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubFilteredRowSetImpl.java
rename to test/jdk/javax/sql/util/StubFilteredRowSetImpl.java
index 8fcbfa4c085..0b73abc6c01 100644
--- a/test/jdk/javax/sql/testng/util/StubFilteredRowSetImpl.java
+++ b/test/jdk/javax/sql/util/StubFilteredRowSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubJdbcRowSetImpl.java b/test/jdk/javax/sql/util/StubJdbcRowSetImpl.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubJdbcRowSetImpl.java
rename to test/jdk/javax/sql/util/StubJdbcRowSetImpl.java
index ec59eb6c556..441b662ddc6 100644
--- a/test/jdk/javax/sql/testng/util/StubJdbcRowSetImpl.java
+++ b/test/jdk/javax/sql/util/StubJdbcRowSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubJoinRowSetImpl.java b/test/jdk/javax/sql/util/StubJoinRowSetImpl.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubJoinRowSetImpl.java
rename to test/jdk/javax/sql/util/StubJoinRowSetImpl.java
index c7ece7cd523..1f506f830ef 100644
--- a/test/jdk/javax/sql/testng/util/StubJoinRowSetImpl.java
+++ b/test/jdk/javax/sql/util/StubJoinRowSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubNClob.java b/test/jdk/javax/sql/util/StubNClob.java
similarity index 93%
rename from test/jdk/javax/sql/testng/util/StubNClob.java
rename to test/jdk/javax/sql/util/StubNClob.java
index 10682578b9a..0664aa42795 100644
--- a/test/jdk/javax/sql/testng/util/StubNClob.java
+++ b/test/jdk/javax/sql/util/StubNClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubRef.java b/test/jdk/javax/sql/util/StubRef.java
similarity index 95%
rename from test/jdk/javax/sql/testng/util/StubRef.java
rename to test/jdk/javax/sql/util/StubRef.java
index 052bd92c740..54a42df1e1c 100644
--- a/test/jdk/javax/sql/testng/util/StubRef.java
+++ b/test/jdk/javax/sql/util/StubRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubRowId.java b/test/jdk/javax/sql/util/StubRowId.java
similarity index 93%
rename from test/jdk/javax/sql/testng/util/StubRowId.java
rename to test/jdk/javax/sql/util/StubRowId.java
index f8e90d49867..d3bc51b9320 100644
--- a/test/jdk/javax/sql/testng/util/StubRowId.java
+++ b/test/jdk/javax/sql/util/StubRowId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubRowSetFactory.java b/test/jdk/javax/sql/util/StubRowSetFactory.java
similarity index 96%
rename from test/jdk/javax/sql/testng/util/StubRowSetFactory.java
rename to test/jdk/javax/sql/util/StubRowSetFactory.java
index 624c53af1e7..abc34894a18 100644
--- a/test/jdk/javax/sql/testng/util/StubRowSetFactory.java
+++ b/test/jdk/javax/sql/util/StubRowSetFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubSQLXML.java b/test/jdk/javax/sql/util/StubSQLXML.java
similarity index 97%
rename from test/jdk/javax/sql/testng/util/StubSQLXML.java
rename to test/jdk/javax/sql/util/StubSQLXML.java
index 44d1351b357..5e4d1647853 100644
--- a/test/jdk/javax/sql/testng/util/StubSQLXML.java
+++ b/test/jdk/javax/sql/util/StubSQLXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubStruct.java b/test/jdk/javax/sql/util/StubStruct.java
similarity index 95%
rename from test/jdk/javax/sql/testng/util/StubStruct.java
rename to test/jdk/javax/sql/util/StubStruct.java
index 1dee8028a2c..a5a2004a09d 100644
--- a/test/jdk/javax/sql/testng/util/StubStruct.java
+++ b/test/jdk/javax/sql/util/StubStruct.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubSyncProvider.java b/test/jdk/javax/sql/util/StubSyncProvider.java
similarity index 97%
rename from test/jdk/javax/sql/testng/util/StubSyncProvider.java
rename to test/jdk/javax/sql/util/StubSyncProvider.java
index 8947455c701..a6a44e0f509 100644
--- a/test/jdk/javax/sql/testng/util/StubSyncProvider.java
+++ b/test/jdk/javax/sql/util/StubSyncProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubSyncResolver.java b/test/jdk/javax/sql/util/StubSyncResolver.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubSyncResolver.java
rename to test/jdk/javax/sql/util/StubSyncResolver.java
index 02477c7f9be..f24c3ec4b13 100644
--- a/test/jdk/javax/sql/testng/util/StubSyncResolver.java
+++ b/test/jdk/javax/sql/util/StubSyncResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/StubWebRowSetImpl.java b/test/jdk/javax/sql/util/StubWebRowSetImpl.java
similarity index 99%
rename from test/jdk/javax/sql/testng/util/StubWebRowSetImpl.java
rename to test/jdk/javax/sql/util/StubWebRowSetImpl.java
index 918d5bd0482..48c237e73ae 100644
--- a/test/jdk/javax/sql/testng/util/StubWebRowSetImpl.java
+++ b/test/jdk/javax/sql/util/StubWebRowSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/SuperHero.java b/test/jdk/javax/sql/util/SuperHero.java
similarity index 97%
rename from test/jdk/javax/sql/testng/util/SuperHero.java
rename to test/jdk/javax/sql/util/SuperHero.java
index c8afb3831de..2d6e68a7c9e 100644
--- a/test/jdk/javax/sql/testng/util/SuperHero.java
+++ b/test/jdk/javax/sql/util/SuperHero.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/TestRowSetListener.java b/test/jdk/javax/sql/util/TestRowSetListener.java
similarity index 96%
rename from test/jdk/javax/sql/testng/util/TestRowSetListener.java
rename to test/jdk/javax/sql/util/TestRowSetListener.java
index 069ade29ca2..4f71f12da2e 100644
--- a/test/jdk/javax/sql/testng/util/TestRowSetListener.java
+++ b/test/jdk/javax/sql/util/TestRowSetListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/util/TestSQLDataImpl.java b/test/jdk/javax/sql/util/TestSQLDataImpl.java
similarity index 98%
rename from test/jdk/javax/sql/testng/util/TestSQLDataImpl.java
rename to test/jdk/javax/sql/util/TestSQLDataImpl.java
index 0694add3ef9..f02eeb6fece 100644
--- a/test/jdk/javax/sql/testng/util/TestSQLDataImpl.java
+++ b/test/jdk/javax/sql/util/TestSQLDataImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/test/jdk/javax/sql/testng/xml/COFFEE_ROWS.xml b/test/jdk/javax/sql/xml/COFFEE_ROWS.xml
similarity index 100%
rename from test/jdk/javax/sql/testng/xml/COFFEE_ROWS.xml
rename to test/jdk/javax/sql/xml/COFFEE_ROWS.xml
diff --git a/test/jdk/javax/sql/testng/xml/DELETED_COFFEE_ROWS.xml b/test/jdk/javax/sql/xml/DELETED_COFFEE_ROWS.xml
similarity index 100%
rename from test/jdk/javax/sql/testng/xml/DELETED_COFFEE_ROWS.xml
rename to test/jdk/javax/sql/xml/DELETED_COFFEE_ROWS.xml
diff --git a/test/jdk/javax/sql/testng/xml/INSERTED_COFFEE_ROWS.xml b/test/jdk/javax/sql/xml/INSERTED_COFFEE_ROWS.xml
similarity index 100%
rename from test/jdk/javax/sql/testng/xml/INSERTED_COFFEE_ROWS.xml
rename to test/jdk/javax/sql/xml/INSERTED_COFFEE_ROWS.xml
diff --git a/test/jdk/javax/sql/testng/xml/MODFIED_DELETED_COFFEE_ROWS.xml b/test/jdk/javax/sql/xml/MODFIED_DELETED_COFFEE_ROWS.xml
similarity index 100%
rename from test/jdk/javax/sql/testng/xml/MODFIED_DELETED_COFFEE_ROWS.xml
rename to test/jdk/javax/sql/xml/MODFIED_DELETED_COFFEE_ROWS.xml
diff --git a/test/jdk/javax/sql/testng/xml/UPDATED_COFFEE_ROWS.xml b/test/jdk/javax/sql/xml/UPDATED_COFFEE_ROWS.xml
similarity index 100%
rename from test/jdk/javax/sql/testng/xml/UPDATED_COFFEE_ROWS.xml
rename to test/jdk/javax/sql/xml/UPDATED_COFFEE_ROWS.xml
diff --git a/test/jdk/javax/sql/testng/xml/UPDATED_INSERTED_COFFEE_ROWS.xml b/test/jdk/javax/sql/xml/UPDATED_INSERTED_COFFEE_ROWS.xml
similarity index 100%
rename from test/jdk/javax/sql/testng/xml/UPDATED_INSERTED_COFFEE_ROWS.xml
rename to test/jdk/javax/sql/xml/UPDATED_INSERTED_COFFEE_ROWS.xml
diff --git a/test/jdk/javax/swing/JFileChooser/4966171/bug4966171.java b/test/jdk/javax/swing/JFileChooser/4966171/bug4966171.java
index f3b3ba684e6..27f26d570be 100644
--- a/test/jdk/javax/swing/JFileChooser/4966171/bug4966171.java
+++ b/test/jdk/javax/swing/JFileChooser/4966171/bug4966171.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,8 +50,8 @@ public final class bug4966171 {
     }
 
     private static void test() {
-        // Will run the test no more than 10 seconds per L&F
-        long endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(10);
+        // Will run the test no more than 5 seconds per L&F
+        long endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
         while (System.nanoTime() < endtime) {
             try {
                 var byteOut = new ByteArrayOutputStream();
diff --git a/test/jdk/javax/swing/JFileChooser/FileSystemView/SystemIconPixelDataTest.java b/test/jdk/javax/swing/JFileChooser/FileSystemView/SystemIconPixelDataTest.java
new file mode 100644
index 00000000000..c71c7a3e6a9
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/FileSystemView/SystemIconPixelDataTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.EventQueue;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.swing.Icon;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.filechooser.FileSystemView;
+
+/**
+ * @test
+ * @bug 8376253
+ * @summary FileSystemView may not report system icons when -Xcheck:jni enabled
+ * @key headful
+ * @run main SystemIconPixelDataTest
+ * @run main/othervm -Xcheck:jni SystemIconPixelDataTest
+ */
+public final class SystemIconPixelDataTest {
+
+    public static void main(String[] args) throws Exception {
+        for (LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+            AtomicBoolean ok = new AtomicBoolean();
+            EventQueue.invokeAndWait(() -> ok.set(setLookAndFeel(laf)));
+            if (ok.get()) {
+                EventQueue.invokeAndWait(SystemIconPixelDataTest::test);
+            }
+        }
+    }
+
+    private static boolean setLookAndFeel(LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+            System.out.println("LookAndFeel: " + laf.getClassName());
+            return true;
+        } catch (UnsupportedLookAndFeelException ignored) {
+            return false;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void test() {
+        FileSystemView fsv = FileSystemView.getFileSystemView();
+        File home = fsv.getHomeDirectory();
+        Icon icon = fsv.getSystemIcon(home);
+        if (icon == null) {
+            return;
+        }
+        int w = icon.getIconWidth();
+        int h = icon.getIconHeight();
+        if (w <= 0 || h <= 0) {
+            throw new RuntimeException("Invalid icon size: " + w + "x" + h);
+        }
+        var img = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = img.createGraphics();
+        icon.paintIcon(null, g, 0, 0);
+        g.dispose();
+        for (int y = 0; y < h; y++) {
+            for (int x = 0; x < w; x++) {
+                if (img.getRGB(x, y) != 0) {
+                    return;
+                }
+            }
+        }
+        throw new RuntimeException("All pixels are zero");
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuItem/LargeMenuTextArrowIconPosition.java b/test/jdk/javax/swing/JMenuItem/LargeMenuTextArrowIconPosition.java
new file mode 100644
index 00000000000..72512560cff
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/LargeMenuTextArrowIconPosition.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8374506
+ * @summary Verify if arrow icon positioning is correct in
+ *          parent JMenu in Windows L&F
+ * @requires (os.family == "windows")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual LargeMenuTextArrowIconPosition
+ */
+
+import java.awt.BorderLayout;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.UIManager;
+
+public class LargeMenuTextArrowIconPosition {
+
+    private static final String INSTRUCTIONS = """
+        A frame will be shown with a label.
+        Right click on the label.
+
+        Check the arrow icon at the end of
+        "Really long Menu-Text" text.
+        If it overlaps with the menu text,
+        press Fail else press Pass.""";
+
+    public static void main(String[] args) throws Throwable {
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+
+         PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(LargeMenuTextArrowIconPosition::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+
+        JFrame frame = new JFrame("LargeMenuTextArrowIcon");
+        frame.setSize(300, 150);
+        frame.setLayout(new BorderLayout());
+
+        JPopupMenu popupMenu = new JPopupMenu();
+        popupMenu.add(new JCheckBoxMenuItem("CheckBox On", true));
+        popupMenu.add(new JCheckBoxMenuItem("CheckBox Icon On",
+                          UIManager.getIcon("FileView.floppyDriveIcon"), true));
+        popupMenu.add(new JCheckBoxMenuItem("CheckBox Icon Off",
+                          UIManager.getIcon("FileView.floppyDriveIcon"), false));
+
+        JMenu menu = new JMenu("Really long Menu-Text");
+        menu.add(new JMenuItem("Sub-MenuItem"));
+        menu.add(new JCheckBoxMenuItem("Sub-CheckBox On", true));
+
+        popupMenu.add(menu);
+
+        JLabel lbl = new JLabel("Right click to invoke popupMenu");
+        lbl.setComponentPopupMenu(popupMenu);
+        frame.add(lbl, BorderLayout.CENTER);
+
+        return frame;
+    }
+
+}
diff --git a/test/jdk/javax/swing/JOptionPane/TestJOptionHTMLTag.java b/test/jdk/javax/swing/JOptionPane/TestJOptionHTMLTag.java
deleted file mode 100644
index 94318492bd9..00000000000
--- a/test/jdk/javax/swing/JOptionPane/TestJOptionHTMLTag.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/* @test
- * @bug 5074006
- * @key headful
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @summary Swing JOptionPane shows <html> tag as a string after newline
- * @run main/manual TestJOptionHTMLTag
-*/
-
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
-public class TestJOptionHTMLTag {
-    static String instructions
-            = """
-            INSTRUCTIONS:
-                A dialog will be shown.
-                If it does not contain </html> string, press Pass else press Fail.
-            """;
-    static PassFailJFrame passFailJFrame;
-
-    public static void main(String[] args) throws Exception {
-
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                String message = "<html>" + "This is a test\n" + "</html>";
-                JOptionPane optionPane = new JOptionPane();
-                optionPane.setMessage(message);
-                optionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
-                JDialog dialog = new JDialog();
-                dialog.setContentPane(optionPane);
-                dialog.pack();
-                dialog.setVisible(true);
-
-                passFailJFrame = new PassFailJFrame(instructions);
-                PassFailJFrame.addTestWindow(dialog);
-                PassFailJFrame.positionTestWindow(dialog, PassFailJFrame.Position.HORIZONTAL);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        });
-        passFailJFrame.awaitAndCheck();
-    }
-}
-
diff --git a/test/jdk/javax/swing/JPopupMenu/6495920/bug6495920.java b/test/jdk/javax/swing/JPopupMenu/6495920/bug6495920.java
index 6a8c132c4e4..cc37cb97b18 100644
--- a/test/jdk/javax/swing/JPopupMenu/6495920/bug6495920.java
+++ b/test/jdk/javax/swing/JPopupMenu/6495920/bug6495920.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,9 @@
             interaction with GNOME is not crippled
  * @author Sergey Malenkov
  * @library ../..
- * @modules java.desktop/sun.awt
  * @modules java.desktop/javax.swing.plaf.basic:open
  */
 
-import sun.awt.AppContext;
-
 import java.awt.Point;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
@@ -92,12 +89,12 @@ public class bug6495920 implements Thread.UncaughtExceptionHandler {
     }
 
     public void thirdValidate() throws Exception {
-        Field key = BasicPopupMenuUI.class.getDeclaredField("MOUSE_GRABBER_KEY");
+        Field key = BasicPopupMenuUI.class.getDeclaredField("mouseGrabber");
         key.setAccessible(true);
 
-        Object grabber = AppContext.getAppContext().get(key.get(null));
+        Object grabber = key.get(null);
         if (grabber == null) {
-            throw new Exception("cannot find a mouse grabber in app's context");
+            throw new Exception("cannot find a mouse grabber");
         }
 
         Field field = grabber.getClass().getDeclaredField("grabbedWindow");
diff --git a/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java b/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
index c8ddfe67999..a3dc658df0e 100644
--- a/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
+++ b/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,14 @@
 
 /*
  * @test
- * @bug 4938801
+ * @bug 4938801 8376169
  * @key headful
  * @summary Verifies popup is removed when the component is removed
  * @run main TestPopupInvoker
  */
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Robot;
 import java.util.concurrent.CountDownLatch;
@@ -48,6 +49,7 @@ public class TestPopupInvoker {
     static JFrame frame;
     static JLabel label;
     static Container pane;
+    static volatile Component invoker;
 
     private static final CountDownLatch popupShown = new CountDownLatch(1);
     private static final CountDownLatch popupHidden = new CountDownLatch(1);
@@ -73,6 +75,7 @@ public class TestPopupInvoker {
             @Override
             public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
                 popupHidden.countDown();
+                popupMenu.setInvoker(null);
             }
 
             @Override
@@ -106,6 +109,11 @@ public class TestPopupInvoker {
             if (!popupHidden.await(1, SECONDS)) {
                 throw new RuntimeException("Popup is visible after component is removed");
             }
+
+            SwingUtilities.invokeAndWait(() -> invoker = popupMenu.getInvoker());
+            if (invoker != null) {
+                throw new RuntimeException("Invoker is not null");
+            }
         } finally {
             SwingUtilities.invokeAndWait(() -> {
                 if (frame != null) {
diff --git a/test/jdk/javax/swing/JTable/JTableSerialization.java b/test/jdk/javax/swing/JTable/JTableSerialization.java
new file mode 100644
index 00000000000..29d8837bb26
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/JTableSerialization.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/**
+ * @test
+ * @bug 6441373
+ * @summary Checks that editing/non-editing JTable is serializable
+ * @run main/timeout=260/othervm -Xmx32m JTableSerialization
+ */
+public final class JTableSerialization {
+
+    private static JTable table;
+    private static final int ROW = 1;
+    private static final int COLUMN = 1;
+    private static final String SOME_TEST_LABEL = "Some TEST label";
+    private static final String TEST_EDIT_VALUE = "Test EDIT value";
+
+    public static void main(String[] argv) throws Exception {
+        for (UIManager.LookAndFeelInfo laf : getInstalledLookAndFeels()) {
+            AtomicBoolean go = new AtomicBoolean(false);
+            EventQueue.invokeAndWait(() -> go.set(tryLookAndFeel(laf)));
+            if (!go.get()) {
+                continue;
+            }
+            for (boolean editing : new boolean[]{true, false}) {
+                EventQueue.invokeAndWait(JTableSerialization::init);
+                long endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(20);
+                while (System.nanoTime() < endtime) {
+                    // need to jump to/from EDT to flush all pending events
+                    EventQueue.invokeAndWait(() -> test(editing));
+                }
+                EventQueue.invokeAndWait(JTableSerialization::validate);
+            }
+        }
+    }
+
+    private static void init() {
+        JLabel label = new JLabel(SOME_TEST_LABEL);
+        table = new JTable(2, 2);
+        table.add(label);
+        table.setValueAt(TEST_EDIT_VALUE, ROW, COLUMN);
+        checkNonEditingState(table);
+    }
+
+    private static void test(boolean editing) {
+        if (editing) {
+            table.editCellAt(ROW, COLUMN);
+            checkEditingState(table);
+        }
+        table = copyTable(table);
+        checkNonEditingState(table);
+    }
+
+    private static void validate() {
+        Object value = table.getValueAt(ROW, COLUMN);
+        if (!value.equals(TEST_EDIT_VALUE)) {
+            throw new RuntimeException("Wrong value: " + value);
+        }
+        for (Component component : table.getComponents()) {
+            if (component instanceof JLabel) {
+                if (((JLabel) component).getText().equals(SOME_TEST_LABEL)) {
+                    return;
+                }
+            }
+        }
+        throw new RuntimeException("JLabel is not found");
+    }
+
+
+    private static void checkNonEditingState(JTable jt) {
+        if (jt.isEditing()) {
+            throw new RuntimeException("Should not be editing");
+        }
+        if (jt.getEditorComponent() != null) {
+            throw new RuntimeException("Editor should be null");
+        }
+        int row = jt.getEditingRow();
+        if (row != -1) {
+            throw new RuntimeException("Expected row -1 but was: " + row);
+        }
+        int column = jt.getEditingColumn();
+        if (column != -1) {
+            throw new RuntimeException("Expected column -1 but was: " + column);
+        }
+    }
+
+    private static void checkEditingState(JTable jt) {
+        if (!jt.isEditing()) {
+            throw new RuntimeException("Should be editing");
+        }
+        if (jt.getEditorComponent() == null) {
+            throw new RuntimeException("Editor should not be null");
+        }
+        if (jt.getEditingRow() != ROW) {
+            throw new RuntimeException("Row should be: " + ROW);
+        }
+        if (jt.getEditingColumn() != COLUMN) {
+            throw new RuntimeException("Column should be: " + COLUMN);
+        }
+    }
+
+    private static JTable copyTable(JTable jt) {
+        try {
+            byte[] bdata;
+            try (var baos = new ByteArrayOutputStream();
+                 var oos = new ObjectOutputStream(baos))
+            {
+                oos.writeObject(jt);
+                bdata = baos.toByteArray();
+            }
+            try (var bais = new ByteArrayInputStream(bdata);
+                 var ois = new ObjectInputStream(bais))
+            {
+                return (JTable) ois.readObject();
+            }
+        } catch (IOException | ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static boolean tryLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+            System.out.println("LookAndFeel: " + laf.getClassName());
+            return true;
+        } catch (UnsupportedLookAndFeelException ignored) {
+            return false;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JTable/TestJTableColWidth.java b/test/jdk/javax/swing/JTable/TestJTableColWidth.java
new file mode 100644
index 00000000000..542c4d0ffa1
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/TestJTableColWidth.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8192888
+ * @key headful
+ * @summary Verifies JTable doesn't ignore setPreferredWidth during
+ *          initial layout when AUTO_RESIZE_LAST_COLUMN is enabled
+ * @run main TestJTableColWidth
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumnModel;
+import javax.swing.SwingUtilities;
+
+public class TestJTableColWidth {
+    static JFrame frame;
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            try {
+                frame = new JFrame("JTable colwidth");
+
+                String[] cols = {"ID", "Name", "Description", "Status"};
+                Object[][] data = {{1, "Mimi", "Testing Java 25 Regression", "Pending"}};
+
+                DefaultTableModel model = new DefaultTableModel(data, cols);
+                final JTable tab = new JTable(model);
+
+                tab.getTableHeader().setReorderingAllowed(false);
+                tab.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
+
+                TableColumnModel columnModel = tab.getColumnModel();
+                // Defined widths
+                int[] widths = {30, 200, 100, 50};
+
+                for (int i = 0; i < widths.length; i++) {
+                    columnModel.getColumn(i).setPreferredWidth(widths[i]);
+                }
+
+                frame.add(new JScrollPane(tab));
+                frame.setSize(600, 200);
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+
+                System.out.println("Actual column widths on screen:");
+                for (int i = 0; i < columnModel.getColumnCount(); i++) {
+                    System.out.println("Column " + i + ": " +
+                                        columnModel.getColumn(i).getWidth() + "px");
+                }
+                if (columnModel.getColumn(0).getWidth()
+                    == columnModel.getColumn(1).getWidth()) {
+                    throw new RuntimeException("JTable ignores setPreferredWidth during" +
+                                  " initial layout when AUTO_RESIZE_LAST_COLUMN is enabled");
+                }
+            } finally {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            }
+        });
+    }
+}
diff --git a/test/jdk/javax/swing/Security/6938813/bug6938813.java b/test/jdk/javax/swing/Security/6938813/bug6938813.java
deleted file mode 100644
index 8f5e3fc3505..00000000000
--- a/test/jdk/javax/swing/Security/6938813/bug6938813.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 6938813
- * @summary Swing mutable statics
- * @author Pavel Porvatov
- * @modules java.desktop/javax.swing.text.html.parser:open
- * @modules java.desktop/sun.awt
- */
-
-import sun.awt.AppContext;
-import sun.awt.SunToolkit;
-
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.StyleSheet;
-import javax.swing.text.html.parser.DTD;
-import javax.swing.text.html.parser.ParserDelegator;
-import java.lang.reflect.Field;
-
-public class bug6938813 {
-    public static final String DTD_KEY = "dtd_key";
-
-    private static volatile StyleSheet styleSheet;
-
-    public static void main(String[] args) throws Exception {
-        // Run validation and init values for this AppContext
-        validate();
-
-        Thread thread = new ThreadInAnotherAppContext();
-
-        thread.start();
-        thread.join();
-    }
-
-    private static void validate() throws Exception {
-        AppContext appContext = AppContext.getAppContext();
-
-        assertTrue(DTD.getDTD(DTD_KEY).getName().equals(DTD_KEY), "DTD.getDTD() mixed AppContexts");
-
-        // Spoil hash value
-        DTD invalidDtd = DTD.getDTD("invalid DTD");
-
-        DTD.putDTDHash(DTD_KEY, invalidDtd);
-
-        assertTrue(DTD.getDTD(DTD_KEY) == invalidDtd, "Something wrong with DTD.getDTD()");
-
-        Object dtdKey = getParserDelegator_DTD_KEY();
-
-        assertTrue(appContext.get(dtdKey) == null, "ParserDelegator mixed AppContexts");
-
-        // Init default DTD
-        new ParserDelegator();
-
-        Object dtdValue = appContext.get(dtdKey);
-
-        assertTrue(dtdValue != null, "ParserDelegator.defaultDTD isn't initialized");
-
-        // Try reinit default DTD
-        new ParserDelegator();
-
-        assertTrue(dtdValue == appContext.get(dtdKey), "ParserDelegator.defaultDTD created a duplicate");
-
-        HTMLEditorKit htmlEditorKit = new HTMLEditorKit();
-
-        if (styleSheet == null) {
-            // First AppContext
-            styleSheet = htmlEditorKit.getStyleSheet();
-
-            assertTrue(styleSheet != null, "htmlEditorKit.getStyleSheet() returns null");
-            assertTrue(htmlEditorKit.getStyleSheet() == styleSheet, "Something wrong with htmlEditorKit.getStyleSheet()");
-        } else {
-            assertTrue(htmlEditorKit.getStyleSheet() != styleSheet, "HtmlEditorKit.getStyleSheet() mixed AppContexts");
-        }
-    }
-
-    private static void assertTrue(boolean b, String msg) {
-        if (!b) {
-            throw new RuntimeException("Test failed: " + msg);
-        }
-    }
-
-    private static Object getParserDelegator_DTD_KEY() throws Exception {
-        Field field = ParserDelegator.class.getDeclaredField("DTD_KEY");
-
-        field.setAccessible(true);
-
-        return field.get(null);
-    }
-
-    private static class ThreadInAnotherAppContext extends Thread {
-        public ThreadInAnotherAppContext() {
-            super(new ThreadGroup("6938813"), "ThreadInAnotherAppContext");
-        }
-
-        public void run() {
-            SunToolkit.createNewAppContext();
-
-            try {
-                validate();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/ToolTipManager/Test6657026.java b/test/jdk/javax/swing/ToolTipManager/Test6657026.java
deleted file mode 100644
index 0678d57f768..00000000000
--- a/test/jdk/javax/swing/ToolTipManager/Test6657026.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6657026
- * @summary Tests shared ToolTipManager in different application contexts
- * @author Sergey Malenkov
- * @modules java.desktop/sun.awt
- */
-
-import sun.awt.SunToolkit;
-import javax.swing.ToolTipManager;
-
-public class Test6657026 implements Runnable {
-
-    private static final int DISMISS = 4000;
-    private static final int INITIAL = 750;
-    private static final int RESHOW = 500;
-
-    public static void main(String[] args) throws InterruptedException {
-        ToolTipManager manager = ToolTipManager.sharedInstance();
-        if (DISMISS != manager.getDismissDelay()) {
-            throw new Error("unexpected dismiss delay");
-        }
-        if (INITIAL != manager.getInitialDelay()) {
-            throw new Error("unexpected initial delay");
-        }
-        if (RESHOW != manager.getReshowDelay()) {
-            throw new Error("unexpected reshow delay");
-        }
-        manager.setDismissDelay(DISMISS + 1);
-        manager.setInitialDelay(INITIAL + 1);
-        manager.setReshowDelay(RESHOW + 1);
-
-        ThreadGroup group = new ThreadGroup("$$$");
-        Thread thread = new Thread(group, new Test6657026());
-        thread.start();
-        thread.join();
-    }
-
-    public void run() {
-        SunToolkit.createNewAppContext();
-        ToolTipManager manager = ToolTipManager.sharedInstance();
-        if (DISMISS != manager.getDismissDelay()) {
-            throw new Error("shared dismiss delay");
-        }
-        if (INITIAL != manager.getInitialDelay()) {
-            throw new Error("shared initial delay");
-        }
-        if (RESHOW != manager.getReshowDelay()) {
-            throw new Error("shared reshow delay");
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/UIManager/Test6657026.java b/test/jdk/javax/swing/UIManager/Test6657026.java
deleted file mode 100644
index 5ce1ea73de4..00000000000
--- a/test/jdk/javax/swing/UIManager/Test6657026.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6657026
- * @summary Tests shared UIManager in different application contexts
- * @author Sergey Malenkov
- * @modules java.desktop/sun.awt
- */
-
-import sun.awt.SunToolkit;
-
-import javax.swing.UIManager;
-import javax.swing.UIManager.LookAndFeelInfo;
-
-public class Test6657026 implements Runnable {
-
-    public static void main(String[] args) throws Exception {
-        if (UIManager.getInstalledLookAndFeels().length == 0) {
-            throw new Error("unexpected amount of look&feels");
-        }
-        UIManager.setInstalledLookAndFeels(new LookAndFeelInfo[0]);
-        if (UIManager.getInstalledLookAndFeels().length != 0) {
-            throw new Error("unexpected amount of look&feels");
-        }
-
-        ThreadGroup group = new ThreadGroup("$$$");
-        Thread thread = new Thread(group, new Test6657026());
-        thread.start();
-        thread.join();
-    }
-
-    public void run() {
-        SunToolkit.createNewAppContext();
-        if (UIManager.getInstalledLookAndFeels().length == 0) {
-            throw new Error("shared look&feels");
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/plaf/metal/MetalBumps/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalBumps/Test6657026.java
deleted file mode 100644
index b5737479325..00000000000
--- a/test/jdk/javax/swing/plaf/metal/MetalBumps/Test6657026.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6657026
- * @summary Tests shared MetalBumps in different application contexts
- * @author Sergey Malenkov
- * @modules java.desktop/sun.awt
- */
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.text.AttributedCharacterIterator;
-
-import javax.swing.JToolBar;
-import javax.swing.plaf.metal.MetalBorders.ToolBarBorder;
-
-import sun.awt.SunToolkit;
-
-public class Test6657026 extends ToolBarBorder implements Runnable {
-
-    public static void main(String[] args) throws Exception {
-        new Test6657026().test();
-
-        ThreadGroup group = new ThreadGroup("$$$");
-        Thread thread = new Thread(group, new Test6657026());
-        thread.start();
-        thread.join();
-    }
-
-    public void run() {
-        SunToolkit.createNewAppContext();
-        test();
-    }
-
-    private void test() {
-        MyGraphics mg = new MyGraphics();
-        ToolBarBorder border = new ToolBarBorder();
-        border.paintBorder(mg.component, mg, 0, 0, 10, 10);
-        if (mg.image != null) {
-            boolean failed = true;
-            int value = mg.image.getRGB(0, 0);
-            for (int x = 0; x < mg.image.getWidth(); x++) {
-                for (int y = 0; y < mg.image.getHeight(); y++) {
-                    int current = mg.image.getRGB(x, y);
-                    if (current != value) {
-                        mg.image.setRGB(x, y, value);
-                        failed = false;
-                    }
-
-                }
-            }
-            if (failed) {
-                throw new Error("shared metal bumps");
-            }
-        }
-    }
-
-    private static class MyGraphics extends Graphics {
-
-        private final Component component = new JToolBar() {};
-        private BufferedImage image;
-
-        public Graphics create() {
-            return null;  // TODO: check
-        }
-
-        public void translate(int x, int y) {
-            // TODO: check
-        }
-
-        public Color getColor() {
-            return null;  // TODO: check
-        }
-
-        public void setColor(Color color) {
-            // TODO: check
-        }
-
-        public void setPaintMode() {
-            // TODO: check
-        }
-
-        public void setXORMode(Color c1) {
-            // TODO: check
-        }
-
-        public Font getFont() {
-            return null;  // TODO: check
-        }
-
-        public void setFont(Font font) {
-            // TODO: check
-        }
-
-        public FontMetrics getFontMetrics(Font font) {
-            return null;  // TODO: check
-        }
-
-        public Rectangle getClipBounds() {
-            return null;  // TODO: check
-        }
-
-        public void clipRect(int x, int y, int width, int height) {
-            // TODO: check
-        }
-
-        public void setClip(int x, int y, int width, int height) {
-            // TODO: check
-        }
-
-        public Shape getClip() {
-            return null;  // TODO: check
-        }
-
-        public void setClip(Shape clip) {
-            // TODO: check
-        }
-
-        public void copyArea(int x, int y, int width, int height, int dx, int dy) {
-            // TODO: check
-        }
-
-        public void drawLine(int x1, int y1, int x2, int y2) {
-            // TODO: check
-        }
-
-        public void fillRect(int x, int y, int width, int height) {
-            // TODO: check
-        }
-
-        public void clearRect(int x, int y, int width, int height) {
-            // TODO: check
-        }
-
-        public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-            // TODO: check
-        }
-
-        public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) {
-            // TODO: check
-        }
-
-        public void drawOval(int x, int y, int width, int height) {
-            // TODO: check
-        }
-
-        public void fillOval(int x, int y, int width, int height) {
-            // TODO: check
-        }
-
-        public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-            // TODO: check
-        }
-
-        public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-            // TODO: check
-        }
-
-        public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) {
-            // TODO: check
-        }
-
-        public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
-            // TODO: check
-        }
-
-        public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) {
-            // TODO: check
-        }
-
-        public void drawString(String str, int x, int y) {
-            // TODO: check
-        }
-
-        public void drawString(AttributedCharacterIterator iterator, int x, int y) {
-            // TODO: check
-        }
-
-        public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
-            return false;  // TODO: check
-        }
-
-        public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) {
-            return false;  // TODO: check
-        }
-
-        public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
-            return false;  // TODO: check
-        }
-
-        public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) {
-            return false;  // TODO: check
-        }
-
-        public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver observer) {
-            if (img instanceof BufferedImage) {
-                this.image = (BufferedImage) img;
-            }
-            return false;  // TODO: check
-        }
-
-        public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, Color bgcolor, ImageObserver observer) {
-            return false;  // TODO: check
-        }
-
-        public void dispose() {
-            // TODO: check
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java
deleted file mode 100644
index 158c743375c..00000000000
--- a/test/jdk/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6657026
- * @summary Tests shared MetalInternalFrameUI in different application contexts
- * @author Sergey Malenkov
- * @modules java.desktop/sun.awt
- */
-
-import sun.awt.SunToolkit;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.plaf.metal.MetalInternalFrameUI;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-
-public class Test6657026 extends MetalInternalFrameUI implements Runnable {
-
-    public static void main(String[] args) throws Exception {
-        UIManager.setLookAndFeel(new MetalLookAndFeel());
-
-        ThreadGroup group = new ThreadGroup("$$$");
-        Thread thread = new Thread(group, new Test6657026());
-        thread.start();
-        thread.join();
-
-        new JInternalFrame().setContentPane(new JPanel());
-    }
-
-    public Test6657026() {
-        super(null);
-    }
-
-    public void run() {
-        SunToolkit.createNewAppContext();
-        IS_PALETTE = JInternalFrame.CONTENT_PANE_PROPERTY;
-    }
-}
diff --git a/test/jdk/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java b/test/jdk/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java
deleted file mode 100644
index b8ea5e2bd07..00000000000
--- a/test/jdk/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6657026 7077259
- * @summary Tests shared MetalSliderUI in different application contexts
- * @author Sergey Malenkov
- * @modules java.desktop/sun.awt
- * @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel Test6657026
- */
-
-import javax.swing.JSlider;
-import javax.swing.UIManager;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-import javax.swing.plaf.metal.MetalSliderUI;
-import sun.awt.SunToolkit;
-
-public class Test6657026 extends MetalSliderUI implements Runnable {
-
-    public static void main(String[] args) throws Exception {
-        JSlider slider = new JSlider();
-        test(slider);
-
-        ThreadGroup group = new ThreadGroup("$$$");
-        Thread thread = new Thread(group, new Test6657026());
-        thread.start();
-        thread.join();
-
-        test(slider);
-    }
-
-    public void run() {
-        SunToolkit.createNewAppContext();
-        JSlider slider = new JSlider();
-        test(slider);
-        tickLength = -10000;
-    }
-
-    private static void test(JSlider slider) {
-        MetalSliderUI ui = (MetalSliderUI) slider.getUI();
-        int actual = ui.getTickLength();
-        if (actual != 11) {
-            throw new Error(actual + ", but expected 11");
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/plaf/metal/MetalTitlePaneBug.java b/test/jdk/javax/swing/plaf/metal/MetalTitlePaneBug.java
new file mode 100644
index 00000000000..dde6249752d
--- /dev/null
+++ b/test/jdk/javax/swing/plaf/metal/MetalTitlePaneBug.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8078744
+ * @summary Verifies right half of system menu icon on title bar
+ *          activates when clicked
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual MetalTitlePaneBug
+ */
+
+import javax.swing.JFrame;
+import javax.swing.UIManager;
+
+public class MetalTitlePaneBug {
+
+    static final String INSTRUCTIONS = """
+        A Frame is shown with a titlepane.
+        Click on the left edge of the system menu icon on the title pane.
+        It should show "Restore", "Minimize", "Maximize", "Close" menu.
+        Click on the right edge of the system menu icon.
+        It should also show "Restore", "Minimize", "Maximize", "Close" menu.
+        If it shows, press Pass else press Fail.
+    """;
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        PassFailJFrame.builder()
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(MetalTitlePaneBug::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JFrame createUI() {
+        JFrame.setDefaultLookAndFeelDecorated(true);
+        JFrame frame = new JFrame();
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setSize(200, 100);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/plaf/metal/MetalUtils/bug6190373.java b/test/jdk/javax/swing/plaf/metal/MetalUtils/bug6190373.java
deleted file mode 100644
index 07211c7a569..00000000000
--- a/test/jdk/javax/swing/plaf/metal/MetalUtils/bug6190373.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.Graphics;
-import java.awt.image.BufferedImage;
-import java.util.concurrent.CyclicBarrier;
-
-import javax.swing.JButton;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-import sun.awt.AppContext;
-import sun.awt.SunToolkit;
-
-import static javax.swing.UIManager.getInstalledLookAndFeels;
-
-/**
- * @test
- * @bug 6190373
- * @summary Tests 6190373
- * @author Scott Violet
- * @modules java.desktop/sun.awt
- */
-public final class bug6190373 {
-
-    private static AppContext app1;
-    private static AppContext app2;
-    private static final int LOOP_COUNT = 10000;
-    private static final CyclicBarrier barrier = new CyclicBarrier(2);
-
-    public static void main(final String[] args) throws Exception {
-        final Thread t1 = new Thread(new ThreadGroup("firstGroup"), () -> {
-            app1 = SunToolkit.createNewAppContext();
-            test(true);
-        });
-        final Thread t2 = new Thread(new ThreadGroup("secondGroup"), () -> {
-            app2 = SunToolkit.createNewAppContext();
-            test(false);
-        });
-
-        t1.start();
-        t2.start();
-        t1.join();
-        t2.join();
-        app1.dispose();
-        app2.dispose();
-    }
-
-    private static void test(final boolean lock) {
-        for (final UIManager.LookAndFeelInfo laf : getInstalledLookAndFeels()) {
-            try {
-                SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
-                barrier.await();
-                SwingUtilities.invokeAndWait(() -> slam(lock));
-                barrier.await();
-            } catch (final Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    private static void slam(final boolean lock) {
-        JButton button = new JButton("HI");
-        button.setSize(100, 100);
-        BufferedImage image = new BufferedImage(100, 100,
-                                                BufferedImage.TYPE_INT_RGB);
-        for (int i = 0; i < LOOP_COUNT; i++) {
-            Graphics g = image.getGraphics();
-            if (lock) {
-                synchronized (button.getTreeLock()) {
-                    button.paint(g);
-                }
-            } else {
-                button.paint(g);
-            }
-            g.dispose();
-        }
-    }
-
-    private static void setLookAndFeel(final UIManager.LookAndFeelInfo laf) {
-        try {
-            UIManager.setLookAndFeel(laf.getClassName());
-            System.out.println("LookAndFeel: " + laf.getClassName());
-        } catch (final UnsupportedLookAndFeelException ignored){
-            System.out.println("Unsupported LookAndFeel: " + laf.getClassName());
-        } catch (ClassNotFoundException | InstantiationException |
-                IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/plaf/synth/7143614/bug7143614.java b/test/jdk/javax/swing/plaf/synth/7143614/bug7143614.java
deleted file mode 100644
index f1e1cbb94aa..00000000000
--- a/test/jdk/javax/swing/plaf/synth/7143614/bug7143614.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 7143614
- * @summary Issues with Synth Look&Feel
- * @author Pavel Porvatov
- * @modules java.desktop/javax.swing.plaf.synth:open
- * @modules java.desktop/sun.awt
- */
-
-import sun.awt.SunToolkit;
-
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.basic.BasicButtonUI;
-import javax.swing.plaf.synth.SynthConstants;
-import javax.swing.plaf.synth.SynthLookAndFeel;
-import java.lang.reflect.Method;
-
-public class bug7143614 {
-    private static Method setSelectedUIMethod;
-
-    private static ComponentUI componentUI = new BasicButtonUI();
-
-    public static void main(String[] args) throws Exception {
-        setSelectedUIMethod = SynthLookAndFeel.class.getDeclaredMethod("setSelectedUI", ComponentUI.class,
-                boolean.class, boolean.class, boolean.class, boolean.class);
-        setSelectedUIMethod.setAccessible(true);
-
-        setSelectedUIMethod.invoke(null, componentUI, true, true, true, true);
-
-        validate();
-
-        Thread thread = new ThreadInAnotherAppContext();
-
-        thread.start();
-        thread.join();
-
-        validate();
-
-        System.out.println("Test bug7143614 passed.");
-    }
-
-    private static void validate() throws Exception {
-        Method getSelectedUIMethod = SynthLookAndFeel.class.getDeclaredMethod("getSelectedUI");
-
-        getSelectedUIMethod.setAccessible(true);
-
-        Method getSelectedUIStateMethod = SynthLookAndFeel.class.getDeclaredMethod("getSelectedUIState");
-
-        getSelectedUIStateMethod.setAccessible(true);
-
-        if (getSelectedUIMethod.invoke(null) != componentUI) {
-            throw new RuntimeException("getSelectedUI returns invalid value");
-        }
-        if (((Integer) getSelectedUIStateMethod.invoke(null)).intValue() !=
-                (SynthConstants.SELECTED | SynthConstants.FOCUSED)) {
-            throw new RuntimeException("getSelectedUIState returns invalid value");
-        }
-
-    }
-
-    private static class ThreadInAnotherAppContext extends Thread {
-        public ThreadInAnotherAppContext() {
-            super(new ThreadGroup("7143614"), "ThreadInAnotherAppContext");
-        }
-
-        public void run() {
-            SunToolkit.createNewAppContext();
-
-            try {
-                setSelectedUIMethod.invoke(null, null, false, false, false, false);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/plaf/synth/Test6660049.java b/test/jdk/javax/swing/plaf/synth/Test6660049.java
deleted file mode 100644
index a7486eb86c8..00000000000
--- a/test/jdk/javax/swing/plaf/synth/Test6660049.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @key headful
- * @bug 6660049 6849518
- * @summary Tests the Region initialization
- * @author Sergey Malenkov
- * @modules java.desktop/sun.awt
- */
-
-import sun.awt.SunToolkit;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-import javax.swing.plaf.synth.Region;
-import javax.swing.plaf.synth.SynthLookAndFeel;
-
-public class Test6660049 implements Runnable {
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(new Test6660049(
-                javax.swing.JButton.class,
-                javax.swing.JCheckBox.class,
-                javax.swing.JCheckBoxMenuItem.class,
-                javax.swing.JColorChooser.class,
-                javax.swing.JComboBox.class,
-                javax.swing.JDesktopPane.class,
-                javax.swing.JEditorPane.class,
-                javax.swing.JFileChooser.class,
-                javax.swing.JFormattedTextField.class,
-                javax.swing.JInternalFrame.class,
-                javax.swing.JLabel.class,
-                javax.swing.JList.class,
-                javax.swing.JMenu.class,
-                javax.swing.JMenuBar.class,
-                javax.swing.JMenuItem.class,
-                javax.swing.JOptionPane.class,
-                javax.swing.JPanel.class,
-                javax.swing.JPasswordField.class,
-                javax.swing.JPopupMenu.class,
-                javax.swing.JProgressBar.class,
-                javax.swing.JRadioButton.class,
-                javax.swing.JRadioButtonMenuItem.class,
-                javax.swing.JRootPane.class,
-                javax.swing.JScrollBar.class,
-                javax.swing.JScrollPane.class,
-                javax.swing.JSeparator.class,
-                javax.swing.JSlider.class,
-                javax.swing.JSpinner.class,
-                javax.swing.JSplitPane.class,
-                javax.swing.JTabbedPane.class,
-                javax.swing.JTable.class,
-                javax.swing.JTextArea.class,
-                javax.swing.JTextField.class,
-                javax.swing.JTextPane.class,
-                javax.swing.JToggleButton.class,
-                javax.swing.JToolBar.class,
-                javax.swing.JToolTip.class,
-                javax.swing.JTree.class,
-                javax.swing.JViewport.class,
-                javax.swing.table.JTableHeader.class));
-    }
-
-    private final Class<? extends JComponent>[] types;
-    private final Region region;
-
-    private Test6660049(Class<? extends JComponent>... types) {
-        this.types = types;
-        run();
-
-        this.region = new Region("Button", "ButtonUI", true) {
-            @Override
-            public String getName() {
-                throw new Error("6660049: exploit is available");
-            }
-        };
-    }
-
-    public void run() {
-        if (this.region != null) {
-            SunToolkit.createNewAppContext();
-        }
-        for (Class<? extends JComponent> type : this.types) {
-            Region region = getRegion(type);
-            if (region == null) {
-                throw new Error("6849518: region is not initialized");
-            }
-        }
-        getRegion(JButton.class).getName();
-    }
-
-    private static Region getRegion(Class<? extends JComponent> type) {
-        try {
-            return SynthLookAndFeel.getRegion(type.newInstance());
-        }
-        catch (IllegalAccessException exception) {
-            throw new Error("unexpected exception", exception);
-        }
-        catch (InstantiationException exception) {
-            throw new Error("unexpected exception", exception);
-        }
-    }
-}
diff --git a/test/jdk/javax/swing/text/LayoutQueue/Test6588003.java b/test/jdk/javax/swing/text/LayoutQueue/Test6588003.java
deleted file mode 100644
index 561ac594a47..00000000000
--- a/test/jdk/javax/swing/text/LayoutQueue/Test6588003.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* @test
-   @bug 6588003
-   @summary LayoutQueue should not share its DefaultQueue across AppContexts
-   @author Peter Zhelezniakov
-   @modules java.desktop/sun.awt
-   @run main Test6588003
-*/
-
-import javax.swing.text.LayoutQueue;
-import sun.awt.SunToolkit;
-
-public class Test6588003 implements Runnable {
-    private static final LayoutQueue DEFAULT = new LayoutQueue();
-
-    public static void main(String[] args) throws InterruptedException {
-        LayoutQueue.setDefaultQueue(DEFAULT);
-
-        ThreadGroup group = new ThreadGroup("Test6588003");
-        Thread thread = new Thread(group, new Test6588003());
-        thread.start();
-        thread.join();
-
-        if (LayoutQueue.getDefaultQueue() != DEFAULT) {
-            throw new RuntimeException("Sharing detected");
-        }
-    }
-
-    public void run() {
-        SunToolkit.createNewAppContext();
-
-        if (LayoutQueue.getDefaultQueue() == DEFAULT) {
-            throw new RuntimeException("Sharing detected");
-        }
-
-        LayoutQueue.setDefaultQueue(new LayoutQueue());
-    }
-}
diff --git a/test/jdk/javax/swing/text/html/parser/Test8017492.java b/test/jdk/javax/swing/text/html/parser/Test8017492.java
deleted file mode 100644
index dbc1e125cf7..00000000000
--- a/test/jdk/javax/swing/text/html/parser/Test8017492.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.Vector;
-import javax.swing.text.html.HTML;
-import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.parser.DTD;
-import javax.swing.text.html.parser.Element;
-import sun.awt.SunToolkit;
-
-/*
- * @test
- * @bug 8017492
- * @modules java.desktop/sun.awt
- * @run main/othervm Test8017492
- * @summary Tests for OutOfMemoryError/NegativeArraySizeException
- * @author Sergey Malenkov
- */
-
-public class Test8017492 {
-    public static void main(String[] args) throws Exception {
-        Runnable task = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    SunToolkit.createNewAppContext();
-                    DTD dtd = DTD.getDTD("dtd");
-                    dtd.elements = new Vector<Element>() {
-                        @Override
-                        public synchronized int size() {
-                            return Integer.MAX_VALUE;
-                        }
-                    };
-                    dtd.getElement("element");
-                }
-                catch (Exception exception) {
-                    throw new Error("unexpected", exception);
-                }
-            }
-        };
-        // run task with different AppContext
-        Thread thread = new Thread(new ThreadGroup("$$$"), task);
-        thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                throwable.printStackTrace();
-                throw new RuntimeException(throwable);
-            }
-        });
-        thread.start();
-        thread.join();
-        // add error handling
-        SunToolkit.createNewAppContext();
-        HTMLDocument document = new HTMLDocument() {
-            @Override
-            public HTMLEditorKit.ParserCallback getReader(int pos) {
-                return getReader(pos, 0, 0, null);
-            }
-
-            @Override
-            public HTMLEditorKit.ParserCallback getReader(int pos, int popDepth, int pushDepth, HTML.Tag insertTag) {
-                return new HTMLDocument.HTMLReader(pos, popDepth, pushDepth, insertTag) {
-                    @Override
-                    public void handleError(String error, int pos) {
-                        throw new Error(error);
-                    }
-                };
-            }
-        };
-        // run parser
-        new HTMLEditorKit().insertHTML(document, 0, "<html><body>text", 0, 0, null);
-    }
-}
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteVector128LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector128LoadStoreTests.java
index e450e3ead7e..0fa23ef55e1 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector128LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Byte128VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ByteVector128LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ByteVector128LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_128;
 
@@ -61,14 +61,29 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -957,11 +972,11 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -972,11 +987,11 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
         }
     }
 
@@ -992,7 +1007,7 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(byte[] r, byte[] a, int[] indexMap) {
@@ -1005,7 +1020,7 @@ public class Byte128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java b/test/jdk/jdk/incubator/vector/ByteVector128Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Byte128VectorTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector128Tests.java
index 3ad6d6f320f..91148fd5d66 100644
--- a/test/jdk/jdk/incubator/vector/Byte128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector128Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Byte128VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ByteVector128Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Byte128VectorTests extends AbstractVectorTest {
+public class ByteVector128Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_128;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final byte CONST_SHIFT = Byte.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final byte ADD_IDENTITY = (byte)0;
+    private static final byte AND_IDENTITY = (byte)-1;
+    private static final byte FIRST_NONZERO_IDENTITY = (byte)0;
+    private static final byte MAX_IDENTITY = Byte.MIN_VALUE;
+    private static final byte MIN_IDENTITY = Byte.MAX_VALUE;
+    private static final byte MUL_IDENTITY = (byte)1;
+    private static final byte OR_IDENTITY = (byte)0;
+    private static final byte SUADD_IDENTITY = (byte)0;
+    private static final byte UMAX_IDENTITY = (byte)0;   // Minimum unsigned value
+    private static final byte UMIN_IDENTITY = (byte)-1;  // Maximum unsigned value
+    private static final byte XOR_IDENTITY = (byte)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
     static void assertArraysStrictlyEquals(byte[] r, byte[] a) {
@@ -84,10 +139,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Byte128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (byte)0);
+                    assertEquals(r[i + k], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Byte128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (byte)0);
+                        assertEquals(r[i + j], (byte)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Byte128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Byte128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Byte128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1013,10 +1068,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1024,10 +1079,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1035,10 +1090,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1574,7 +1629,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ByteVector a = io.add((byte)1); //[1,2]
         ByteVector b = a.neg();  //[-1,-2]
         byte[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1589,19 +1644,19 @@ public class Byte128VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Byte> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Byte> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ByteVector uab0 = zab0.rearrange(unz0,zab1);
         ByteVector uab1 = zab0.rearrange(unz1,zab1);
         byte[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1616,7 +1671,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1650,7 +1705,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1663,7 +1718,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::ADD);
+        assertArraysEquals(r, a, b, ByteVector128Tests::ADD);
     }
 
     static byte add(byte a, byte b) {
@@ -1671,7 +1726,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1682,11 +1737,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::add);
+        assertArraysEquals(r, a, b, ByteVector128Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1702,11 +1757,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1720,7 +1775,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::add);
     }
 
     static byte SUB(byte a, byte b) {
@@ -1728,7 +1783,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void SUBByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUBByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1741,7 +1796,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::SUB);
+        assertArraysEquals(r, a, b, ByteVector128Tests::SUB);
     }
 
     static byte sub(byte a, byte b) {
@@ -1749,7 +1804,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1760,11 +1815,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::sub);
+        assertArraysEquals(r, a, b, ByteVector128Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void SUBByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUBByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1780,11 +1835,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1798,7 +1853,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::sub);
     }
 
     static byte MUL(byte a, byte b) {
@@ -1806,7 +1861,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MULByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MULByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1819,7 +1874,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::MUL);
+        assertArraysEquals(r, a, b, ByteVector128Tests::MUL);
     }
 
     static byte mul(byte a, byte b) {
@@ -1827,7 +1882,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1838,11 +1893,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::mul);
+        assertArraysEquals(r, a, b, ByteVector128Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void MULByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void MULByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1858,11 +1913,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1876,7 +1931,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::mul);
     }
 
     static byte DIV(byte a, byte b) {
@@ -1884,7 +1939,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void DIVByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void DIVByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1899,7 +1954,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::DIV);
+        assertArraysEquals(r, a, b, ByteVector128Tests::DIV);
     }
 
     static byte div(byte a, byte b) {
@@ -1907,7 +1962,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1922,11 +1977,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::div);
+        assertArraysEquals(r, a, b, ByteVector128Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void DIVByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void DIVByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1944,11 +1999,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1966,7 +2021,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1974,7 +2029,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void FIRST_NONZEROByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void FIRST_NONZEROByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1987,11 +2042,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ByteVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void FIRST_NONZEROByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void FIRST_NONZEROByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2007,7 +2062,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -2015,7 +2070,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2028,7 +2083,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::AND);
+        assertArraysEquals(r, a, b, ByteVector128Tests::AND);
     }
 
     static byte and(byte a, byte b) {
@@ -2036,7 +2091,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2047,11 +2102,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::and);
+        assertArraysEquals(r, a, b, ByteVector128Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2067,7 +2122,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::AND);
     }
 
     static byte AND_NOT(byte a, byte b) {
@@ -2075,7 +2130,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void AND_NOTByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void AND_NOTByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2088,11 +2143,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ByteVector128Tests::AND_NOT);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void AND_NOTByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void AND_NOTByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2108,7 +2163,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::AND_NOT);
     }
 
     static byte OR(byte a, byte b) {
@@ -2116,7 +2171,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2129,7 +2184,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::OR);
+        assertArraysEquals(r, a, b, ByteVector128Tests::OR);
     }
 
     static byte or(byte a, byte b) {
@@ -2137,7 +2192,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2148,11 +2203,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::or);
+        assertArraysEquals(r, a, b, ByteVector128Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2168,7 +2223,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::OR);
     }
 
     static byte XOR(byte a, byte b) {
@@ -2176,7 +2231,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void XORByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void XORByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2189,11 +2244,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::XOR);
+        assertArraysEquals(r, a, b, ByteVector128Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void XORByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void XORByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2209,11 +2264,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2223,11 +2278,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2240,11 +2295,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector128Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2254,11 +2309,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2271,11 +2326,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector128Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2285,11 +2340,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2302,11 +2357,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector128Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2318,11 +2373,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2392,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector128Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2406,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2365,11 +2420,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2382,11 +2437,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector128Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2396,11 +2451,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2410,11 +2465,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2427,11 +2482,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector128Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector128TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2441,11 +2496,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector128Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2458,11 +2513,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector128Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector128TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2472,11 +2527,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector128Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2489,7 +2544,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector128Tests::ADD);
     }
 
     static byte LSHL(byte a, byte b) {
@@ -2497,7 +2552,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2510,11 +2565,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ByteVector128Tests::LSHL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2530,7 +2585,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::LSHL);
     }
 
     static byte ASHR(byte a, byte b) {
@@ -2538,7 +2593,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2551,11 +2606,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ByteVector128Tests::ASHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2571,7 +2626,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::ASHR);
     }
 
     static byte LSHR(byte a, byte b) {
@@ -2579,7 +2634,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2592,11 +2647,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ByteVector128Tests::LSHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2612,7 +2667,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::LSHR);
     }
 
     static byte LSHL_unary(byte a, byte b) {
@@ -2620,7 +2675,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte128VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector128TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2632,11 +2687,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector128Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte128VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector128TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2651,7 +2706,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector128Tests::LSHL_unary);
     }
 
     static byte LSHR_unary(byte a, byte b) {
@@ -2659,7 +2714,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte128VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector128TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2671,11 +2726,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector128Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte128VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector128TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2690,7 +2745,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector128Tests::LSHR_unary);
     }
 
     static byte ASHR_unary(byte a, byte b) {
@@ -2698,7 +2753,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte128VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector128TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2710,11 +2765,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector128Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte128VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector128TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2729,7 +2784,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector128Tests::ASHR_unary);
     }
 
     static byte ROR(byte a, byte b) {
@@ -2737,7 +2792,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2750,11 +2805,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::ROR);
+        assertArraysEquals(r, a, b, ByteVector128Tests::ROR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2770,7 +2825,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::ROR);
     }
 
     static byte ROL(byte a, byte b) {
@@ -2778,7 +2833,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2791,11 +2846,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::ROL);
+        assertArraysEquals(r, a, b, ByteVector128Tests::ROL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2811,7 +2866,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::ROL);
     }
 
     static byte ROR_unary(byte a, byte b) {
@@ -2819,7 +2874,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte128VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector128TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2831,11 +2886,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector128Tests::ROR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte128VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector128TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2850,7 +2905,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector128Tests::ROR_unary);
     }
 
     static byte ROL_unary(byte a, byte b) {
@@ -2858,7 +2913,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte128VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector128TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2870,11 +2925,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector128Tests::ROL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte128VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector128TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2889,14 +2944,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector128Tests::ROL_unary);
     }
     static byte LSHR_binary_const(byte a) {
         return (byte)(((a & 0xFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHRByte128VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHRByteVector128TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2907,11 +2962,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector128Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHRByte128VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHRByteVector128TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2925,7 +2980,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector128Tests::LSHR_binary_const);
     }
 
     static byte LSHL_binary_const(byte a) {
@@ -2933,7 +2988,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHLByte128VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHLByteVector128TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2944,11 +2999,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector128Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHLByte128VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHLByteVector128TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2962,7 +3017,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector128Tests::LSHL_binary_const);
     }
 
     static byte ASHR_binary_const(byte a) {
@@ -2970,7 +3025,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ASHRByte128VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ASHRByteVector128TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2981,11 +3036,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector128Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ASHRByte128VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ASHRByteVector128TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2999,7 +3054,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector128Tests::ASHR_binary_const);
     }
 
     static byte ROR_binary_const(byte a) {
@@ -3007,7 +3062,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void RORByte128VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void RORByteVector128TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3018,11 +3073,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector128Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void RORByte128VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void RORByteVector128TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3036,7 +3091,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector128Tests::ROR_binary_const);
     }
 
     static byte ROL_binary_const(byte a) {
@@ -3044,7 +3099,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ROLByte128VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ROLByteVector128TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3055,11 +3110,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector128Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ROLByte128VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ROLByteVector128TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3073,14 +3128,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector128Tests::ROL_binary_const);
     }
 
 
     static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MINByteVector128TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3091,13 +3146,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, ByteVector128Tests::MIN);
     }
 
     static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void minByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void minByteVector128TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3108,13 +3163,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::min);
+        assertArraysEquals(r, a, (byte)10, ByteVector128Tests::min);
     }
 
     static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINByte128VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINByteVector128TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3127,13 +3182,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte128VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector128Tests::MIN);
     }
 
     static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MAXByteVector128TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3144,13 +3199,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, ByteVector128Tests::MAX);
     }
 
     static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void maxByte128VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void maxByteVector128TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3161,13 +3216,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte128VectorTests::max);
+        assertArraysEquals(r, a, (byte)10, ByteVector128Tests::max);
     }
 
     static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXByte128VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXByteVector128TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3180,7 +3235,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte128VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector128Tests::MAX);
     }
 
     static byte MIN(byte a, byte b) {
@@ -3188,7 +3243,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3201,7 +3256,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::MIN);
+        assertArraysEquals(r, a, b, ByteVector128Tests::MIN);
     }
 
     static byte min(byte a, byte b) {
@@ -3209,7 +3264,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3220,7 +3275,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::min);
+        assertArraysEquals(r, a, b, ByteVector128Tests::min);
     }
 
     static byte MAX(byte a, byte b) {
@@ -3228,7 +3283,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3241,7 +3296,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::MAX);
+        assertArraysEquals(r, a, b, ByteVector128Tests::MAX);
     }
 
     static byte max(byte a, byte b) {
@@ -3249,7 +3304,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3260,7 +3315,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::max);
+        assertArraysEquals(r, a, b, ByteVector128Tests::max);
     }
 
     static byte UMIN(byte a, byte b) {
@@ -3268,7 +3323,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMINByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMINByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3281,11 +3336,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ByteVector128Tests::UMIN);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMINByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMINByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3301,7 +3356,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::UMIN);
     }
 
     static byte UMAX(byte a, byte b) {
@@ -3309,7 +3364,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMAXByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMAXByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3322,11 +3377,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ByteVector128Tests::UMAX);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMAXByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMAXByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3342,7 +3397,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::UMAX);
     }
 
     static byte SADD(byte a, byte b) {
@@ -3350,7 +3405,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SADDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SADDByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3363,11 +3418,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::SADD);
+        assertArraysEquals(r, a, b, ByteVector128Tests::SADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SADDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SADDByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3383,7 +3438,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::SADD);
     }
 
     static byte SSUB(byte a, byte b) {
@@ -3391,7 +3446,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SSUBByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SSUBByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3404,11 +3459,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ByteVector128Tests::SSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SSUBByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SSUBByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3424,7 +3479,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::SSUB);
     }
 
     static byte SUADD(byte a, byte b) {
@@ -3432,7 +3487,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUADDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUADDByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3445,11 +3500,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ByteVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUADDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3465,7 +3520,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::SUADD);
     }
 
     static byte SUSUB(byte a, byte b) {
@@ -3473,7 +3528,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUSUBByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUSUBByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3486,11 +3541,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ByteVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUSUBByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUSUBByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3506,11 +3561,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3520,11 +3575,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3534,11 +3589,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3548,11 +3603,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3562,10 +3617,10 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ByteVector128Tests::max);
     }
     @Test(dataProvider = "byteSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SUADDAssocByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -3582,11 +3637,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Byte128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ByteVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDAssocByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                      IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3607,11 +3662,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Byte128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ByteVector128Tests::SUADD);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3620,7 +3675,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAll(byte[] a) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3629,32 +3684,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ANDReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ANDReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                byte v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::ANDReduce, Byte128VectorTests::ANDReduceAll);
+                ByteVector128Tests::ANDReduce, ByteVector128Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = AND_IDENTITY;
+
+        assertEquals((byte) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id & x), x);
+                assertEquals((byte) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static byte ANDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3664,7 +3737,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3673,34 +3746,29 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ANDReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                byte v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::ANDReduceMasked, Byte128VectorTests::ANDReduceAllMasked);
+                ByteVector128Tests::ANDReduceMasked, ByteVector128Tests::ANDReduceAllMasked);
     }
 
     static byte ORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3709,7 +3777,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3718,32 +3786,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ORReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ORReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                byte v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::ORReduce, Byte128VectorTests::ORReduceAll);
+                ByteVector128Tests::ORReduce, ByteVector128Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = OR_IDENTITY;
+
+        assertEquals((byte) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id | x), x);
+                assertEquals((byte) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static byte ORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3753,7 +3839,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3762,7 +3848,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ORReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3770,26 +3856,21 @@ public class Byte128VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                byte v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::ORReduceMasked, Byte128VectorTests::ORReduceAllMasked);
+                ByteVector128Tests::ORReduceMasked, ByteVector128Tests::ORReduceAllMasked);
     }
 
     static byte XORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3798,7 +3879,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3807,32 +3888,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void XORReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void XORReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                byte v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::XORReduce, Byte128VectorTests::XORReduceAll);
+                ByteVector128Tests::XORReduce, ByteVector128Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = XOR_IDENTITY;
+
+        assertEquals((byte) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id ^ x), x);
+                assertEquals((byte) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static byte XORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3842,7 +3941,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3851,7 +3950,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void XORReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3859,26 +3958,21 @@ public class Byte128VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                byte v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::XORReduceMasked, Byte128VectorTests::XORReduceAllMasked);
+                ByteVector128Tests::XORReduceMasked, ByteVector128Tests::XORReduceAllMasked);
     }
 
     static byte ADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3887,7 +3981,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3896,32 +3990,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                byte v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::ADDReduce, Byte128VectorTests::ADDReduceAll);
+                ByteVector128Tests::ADDReduce, ByteVector128Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = ADD_IDENTITY;
+
+        assertEquals((byte) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id + x), x);
+                assertEquals((byte) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3931,7 +4043,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3940,7 +4052,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3948,26 +4060,21 @@ public class Byte128VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                byte v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::ADDReduceMasked, Byte128VectorTests::ADDReduceAllMasked);
+                ByteVector128Tests::ADDReduceMasked, ByteVector128Tests::ADDReduceAllMasked);
     }
 
     static byte MULReduce(byte[] a, int idx) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3976,7 +4083,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAll(byte[] a) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3985,32 +4092,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MULReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void MULReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                byte v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::MULReduce, Byte128VectorTests::MULReduceAll);
+                ByteVector128Tests::MULReduce, ByteVector128Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MUL_IDENTITY;
+
+        assertEquals((byte) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id * x), x);
+                assertEquals((byte) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4020,7 +4145,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4029,34 +4154,29 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MULReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                byte v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::MULReduceMasked, Byte128VectorTests::MULReduceAllMasked);
+                ByteVector128Tests::MULReduceMasked, ByteVector128Tests::MULReduceAllMasked);
     }
 
     static byte MINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.min(res, a[i]);
         }
@@ -4065,7 +4185,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduce(a, i));
         }
@@ -4074,32 +4194,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void MINReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                byte v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::MINReduce, Byte128VectorTests::MINReduceAll);
+                ByteVector128Tests::MINReduce, ByteVector128Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MIN_IDENTITY;
+
+        assertEquals((byte) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.min(id, x), x);
+                assertEquals((byte) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.min(res, a[i]);
@@ -4109,7 +4247,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4118,34 +4256,29 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::MINReduceMasked, Byte128VectorTests::MINReduceAllMasked);
+                ByteVector128Tests::MINReduceMasked, ByteVector128Tests::MINReduceAllMasked);
     }
 
     static byte MAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.max(res, a[i]);
         }
@@ -4154,7 +4287,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduce(a, i));
         }
@@ -4163,32 +4296,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void MAXReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                byte v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::MAXReduce, Byte128VectorTests::MAXReduceAll);
+                ByteVector128Tests::MAXReduce, ByteVector128Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MAX_IDENTITY;
+
+        assertEquals((byte) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.max(id, x), x);
+                assertEquals((byte) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.max(res, a[i]);
@@ -4198,7 +4349,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4207,34 +4358,29 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::MAXReduceMasked, Byte128VectorTests::MAXReduceAllMasked);
+                ByteVector128Tests::MAXReduceMasked, ByteVector128Tests::MAXReduceAllMasked);
     }
 
     static byte UMINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4243,7 +4389,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4252,32 +4398,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMINReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void UMINReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                byte v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::UMINReduce, Byte128VectorTests::UMINReduceAll);
+                ByteVector128Tests::UMINReduce, ByteVector128Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMIN_IDENTITY;
+
+        assertEquals((byte) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.minUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static byte UMINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.minUnsigned(res, a[i]);
@@ -4287,7 +4451,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4296,34 +4460,29 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMINReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::UMINReduceMasked, Byte128VectorTests::UMINReduceAllMasked);
+                ByteVector128Tests::UMINReduceMasked, ByteVector128Tests::UMINReduceAllMasked);
     }
 
     static byte UMAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4332,7 +4491,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4341,32 +4500,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMAXReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void UMAXReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                byte v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::UMAXReduce, Byte128VectorTests::UMAXReduceAll);
+                ByteVector128Tests::UMAXReduce, ByteVector128Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMAX_IDENTITY;
+
+        assertEquals((byte) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static byte UMAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.maxUnsigned(res, a[i]);
@@ -4376,7 +4553,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4385,34 +4562,29 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMAXReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::UMAXReduceMasked, Byte128VectorTests::UMAXReduceAllMasked);
+                ByteVector128Tests::UMAXReduceMasked, ByteVector128Tests::UMAXReduceAllMasked);
     }
 
     static byte FIRST_NONZEROReduce(byte[] a, int idx) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4421,7 +4593,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAll(byte[] a) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4430,32 +4602,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void FIRST_NONZEROReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void FIRST_NONZEROReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::FIRST_NONZEROReduce, Byte128VectorTests::FIRST_NONZEROReduceAll);
+                ByteVector128Tests::FIRST_NONZEROReduce, ByteVector128Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static byte FIRST_NONZEROReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4465,7 +4655,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4474,30 +4664,25 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::FIRST_NONZEROReduceMasked, Byte128VectorTests::FIRST_NONZEROReduceAllMasked);
+                ByteVector128Tests::FIRST_NONZEROReduceMasked, ByteVector128Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4510,7 +4695,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueByte128VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueByteVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4521,7 +4706,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector128Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4534,7 +4719,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueByte128VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueByteVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4545,11 +4730,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector128Tests::allTrue);
     }
 
     static byte SUADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4558,7 +4743,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4567,32 +4752,50 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingUnaryOpProvider")
-    static void SUADDReduceByte128VectorTests(IntFunction<byte[]> fa) {
+    static void SUADDReduceByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                byte v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte128VectorTests::SUADDReduce, Byte128VectorTests::SUADDReduceAll);
+                ByteVector128Tests::SUADDReduce, ByteVector128Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = SUADD_IDENTITY;
+
+        assertEquals((byte) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static byte SUADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4602,7 +4805,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4610,7 +4813,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "byteSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4618,26 +4821,21 @@ public class Byte128VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                byte v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::SUADDReduceMasked, Byte128VectorTests::SUADDReduceAllMasked);
+                ByteVector128Tests::SUADDReduceMasked, ByteVector128Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void withByte128VectorTests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
+    static void withByteVector128Tests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -4660,7 +4858,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_DEFAULTByte128VectorTests(IntFunction<byte[]> fa) {
+    static void IS_DEFAULTByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4670,14 +4868,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4690,7 +4888,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4701,7 +4899,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_NEGATIVEByte128VectorTests(IntFunction<byte[]> fa) {
+    static void IS_NEGATIVEByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4711,14 +4909,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4731,14 +4929,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4750,14 +4948,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4769,14 +4967,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LTByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4792,14 +4990,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GTByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GTByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4811,14 +5009,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GTByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GTByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4834,14 +5032,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4853,14 +5051,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4872,14 +5070,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void EQByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4895,14 +5093,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void NEByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void NEByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4914,14 +5112,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void NEByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void NEByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4937,14 +5135,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LEByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LEByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4956,14 +5154,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LEByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LEByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4979,14 +5177,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GEByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GEByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4998,14 +5196,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GEByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GEByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5021,14 +5219,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULTByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULTByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5040,14 +5238,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULTByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULTByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5063,14 +5261,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGTByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGTByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5082,14 +5280,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGTByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGTByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5105,14 +5303,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULEByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULEByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5124,14 +5322,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULEByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULEByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5147,14 +5345,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGEByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGEByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5166,14 +5364,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGEByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGEByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5189,14 +5387,14 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5206,13 +5404,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5226,13 +5424,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector128TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5242,13 +5440,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5262,13 +5460,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5278,13 +5476,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5298,13 +5496,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector128TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5314,13 +5512,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5334,7 +5532,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
             }
         }
     }
@@ -5344,7 +5542,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5360,11 +5558,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ByteVector128Tests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
-    static void RearrangeByte128VectorTests(IntFunction<byte[]> fa,
+    static void RearrangeByteVector128Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5381,7 +5579,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
-    static void RearrangeByte128VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void RearrangeByteVector128TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -5399,7 +5597,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void compressByte128VectorTests(IntFunction<byte[]> fa,
+    static void compressByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5417,7 +5615,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void expandByte128VectorTests(IntFunction<byte[]> fa,
+    static void expandByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5435,7 +5633,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void getByte128VectorTests(IntFunction<byte[]> fa) {
+    static void getByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -5591,7 +5789,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastByte128VectorTests(IntFunction<byte[]> fa) {
+    static void BroadcastByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5605,7 +5803,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZeroByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ZeroByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5615,7 +5813,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static byte[] sliceUnary(byte[] a, int origin, int idx) {
@@ -5630,7 +5828,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void sliceUnaryByte128VectorTests(IntFunction<byte[]> fa) {
+    static void sliceUnaryByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5641,7 +5839,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector128Tests::sliceUnary);
     }
 
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
@@ -5658,7 +5856,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void sliceBinaryByte128VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void sliceBinaryByteVector128TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5671,7 +5869,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Byte128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ByteVector128Tests::sliceBinary);
     }
 
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
@@ -5688,7 +5886,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void sliceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void sliceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5705,7 +5903,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Byte128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ByteVector128Tests::slice);
     }
 
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
@@ -5722,7 +5920,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void unsliceUnaryByte128VectorTests(IntFunction<byte[]> fa) {
+    static void unsliceUnaryByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5733,7 +5931,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector128Tests::unsliceUnary);
     }
 
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
@@ -5759,7 +5957,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void unsliceBinaryByte128VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void unsliceBinaryByteVector128TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5773,7 +5971,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Byte128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ByteVector128Tests::unsliceBinary);
     }
 
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5813,7 +6011,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void unsliceByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void unsliceByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5830,7 +6028,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Byte128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ByteVector128Tests::unslice);
     }
 
     static byte BITWISE_BLEND(byte a, byte b, byte c) {
@@ -5842,7 +6040,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5857,11 +6055,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5874,11 +6072,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ByteVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5896,11 +6094,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5911,11 +6109,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte128VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector128TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5926,11 +6124,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5941,11 +6139,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte128VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector128TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5956,11 +6154,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5975,11 +6173,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector128TestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5994,11 +6192,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte128VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector128TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6009,11 +6207,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte128VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector128TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6024,11 +6222,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector128TestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6042,7 +6240,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteVector128Tests::BITWISE_BLEND);
     }
 
     static byte NEG(byte a) {
@@ -6054,7 +6252,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NEGByte128VectorTests(IntFunction<byte[]> fa) {
+    static void NEGByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6065,11 +6263,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::NEG);
+        assertArraysEquals(r, a, ByteVector128Tests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void negByte128VectorTests(IntFunction<byte[]> fa) {
+    static void negByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6080,11 +6278,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::neg);
+        assertArraysEquals(r, a, ByteVector128Tests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NEGMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void NEGMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6098,7 +6296,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -6110,7 +6308,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ABSByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ABSByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6121,11 +6319,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::ABS);
+        assertArraysEquals(r, a, ByteVector128Tests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void absByte128VectorTests(IntFunction<byte[]> fa) {
+    static void absByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6136,11 +6334,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::abs);
+        assertArraysEquals(r, a, ByteVector128Tests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ABSMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void ABSMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6154,7 +6352,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::ABS);
     }
 
     static byte NOT(byte a) {
@@ -6166,7 +6364,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NOTByte128VectorTests(IntFunction<byte[]> fa) {
+    static void NOTByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6177,11 +6375,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::NOT);
+        assertArraysEquals(r, a, ByteVector128Tests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void notByte128VectorTests(IntFunction<byte[]> fa) {
+    static void notByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6192,11 +6390,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::not);
+        assertArraysEquals(r, a, ByteVector128Tests::not);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NOTMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void NOTMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6210,7 +6408,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::NOT);
     }
 
     static byte ZOMO(byte a) {
@@ -6218,7 +6416,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZOMOByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ZOMOByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6229,11 +6427,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::ZOMO);
+        assertArraysEquals(r, a, ByteVector128Tests::ZOMO);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ZOMOMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void ZOMOMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6247,7 +6445,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::ZOMO);
     }
 
     static byte BIT_COUNT(byte a) {
@@ -6255,7 +6453,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BIT_COUNTByte128VectorTests(IntFunction<byte[]> fa) {
+    static void BIT_COUNTByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6266,11 +6464,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ByteVector128Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void BIT_COUNTMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6284,7 +6482,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::BIT_COUNT);
     }
 
     static byte TRAILING_ZEROS_COUNT(byte a) {
@@ -6292,7 +6490,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTByte128VectorTests(IntFunction<byte[]> fa) {
+    static void TRAILING_ZEROS_COUNTByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6303,11 +6501,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6321,7 +6519,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     static byte LEADING_ZEROS_COUNT(byte a) {
@@ -6329,7 +6527,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTByte128VectorTests(IntFunction<byte[]> fa) {
+    static void LEADING_ZEROS_COUNTByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6340,11 +6538,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6358,7 +6556,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     static byte REVERSE(byte a) {
@@ -6366,7 +6564,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSEByte128VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSEByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6377,11 +6575,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::REVERSE);
+        assertArraysEquals(r, a, ByteVector128Tests::REVERSE);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSEMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void REVERSEMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6395,7 +6593,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::REVERSE);
     }
 
     static byte REVERSE_BYTES(byte a) {
@@ -6403,7 +6601,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSE_BYTESByte128VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSE_BYTESByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6414,11 +6612,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ByteVector128Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedByte128VectorTests(IntFunction<byte[]> fa,
+    static void REVERSE_BYTESMaskedByteVector128Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6432,7 +6630,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ByteVector128Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6440,7 +6638,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandByteVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6453,7 +6651,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::band);
+        assertArraysEquals(r, a, b, ByteVector128Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6461,7 +6659,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorByteVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6474,7 +6672,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::bor);
+        assertArraysEquals(r, a, b, ByteVector128Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6482,7 +6680,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorByteVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6495,7 +6693,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::bxor);
+        assertArraysEquals(r, a, b, ByteVector128Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6503,7 +6701,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotByteVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6516,7 +6714,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ByteVector128Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6524,7 +6722,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqByteVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6537,7 +6735,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte128VectorTests::beq);
+        assertArraysEquals(r, a, b, ByteVector128Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6545,7 +6743,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotByte128VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotByteVector128Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6556,7 +6754,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte128VectorTests::unot);
+        assertArraysEquals(r, a, ByteVector128Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6565,15 +6763,15 @@ public class Byte128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte128VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongByteVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6587,7 +6785,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte128VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector128TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6597,13 +6795,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte128VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector128TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6613,13 +6811,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toIntArrayByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toIntArrayByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6630,7 +6828,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toLongArrayByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toLongArrayByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6641,7 +6839,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toDoubleArrayByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toDoubleArrayByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6652,7 +6850,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toStringByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toStringByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6665,7 +6863,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void hashCodeByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void hashCodeByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6679,7 +6877,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void reinterpretAsBytesByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void reinterpretAsBytesByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6709,7 +6907,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceLongByte128VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceLongByteVector128Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6725,7 +6923,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Byte128VectorTests::ADDReduceLong, Byte128VectorTests::ADDReduceAllLong);
+                ByteVector128Tests::ADDReduceLong, ByteVector128Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(byte[] a, int idx, boolean[] mask) {
@@ -6748,7 +6946,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceLongByte128VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongByteVector128TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6766,11 +6964,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Byte128VectorTests::ADDReduceLongMasked, Byte128VectorTests::ADDReduceAllLongMasked);
+                ByteVector128Tests::ADDReduceLongMasked, ByteVector128Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastLongByte128VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void BroadcastLongByteVector128TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6781,7 +6979,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte128VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector128TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6795,12 +6993,12 @@ public class Byte128VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector128Tests::blend);
     }
 
 
     @Test(dataProvider = "byteUnaryOpSelectFromProvider")
-    static void SelectFromByte128VectorTests(IntFunction<byte[]> fa,
+    static void SelectFromByteVector128Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,byte[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] order = fs.apply(a.length, SPECIES.length());
@@ -6816,7 +7014,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorByte128VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SelectFromTwoVectorByteVector128Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] idx = fc.apply(SPECIES.length());
@@ -6834,7 +7032,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
-    static void SelectFromByte128VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void SelectFromByteVector128TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                            BiFunction<Integer,Integer,byte[]> fs,
                                                            IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6853,7 +7051,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousByte128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousByteVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6864,12 +7062,12 @@ public class Byte128VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringByte128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringByteVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6883,7 +7081,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsByte128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsByteVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6892,12 +7090,12 @@ public class Byte128VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsByteVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6907,13 +7105,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeByteVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6935,7 +7133,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountByteVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6946,7 +7144,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte128VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ByteVector128Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6960,7 +7158,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueByteVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6971,7 +7169,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte128VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector128Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6985,7 +7183,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueByteVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6996,11 +7194,11 @@ public class Byte128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte128VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector128Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressByte128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressByteVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7010,7 +7208,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7028,7 +7226,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeByte128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeByteVector128TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7036,13 +7234,13 @@ public class Byte128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongByte128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongByteVector128TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7050,7 +7248,7 @@ public class Byte128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7069,36 +7267,36 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundByte128VectorTestsSmokeTest(int length) {
+    static void loopBoundByteVector128TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongByte128VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongByteVector128TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeByte128VectorTestsSmokeTest() {
+    static void ElementSizeByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Byte.SIZE);
+        assertEquals(elsize, Byte.SIZE);
     }
 
     @Test
-    static void VectorShapeByte128VectorTestsSmokeTest() {
+    static void VectorShapeByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_128_BIT));
     }
 
     @Test
-    static void ShapeWithLanesByte128VectorTestsSmokeTest() {
+    static void ShapeWithLanesByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(byte.class);
@@ -7106,32 +7304,32 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeByte128VectorTestsSmokeTest() {
+    static void ElementTypeByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementType() == byte.class);
     }
 
     @Test
-    static void SpeciesElementSizeByte128VectorTestsSmokeTest() {
+    static void SpeciesElementSizeByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementSize() == Byte.SIZE);
     }
 
     @Test
-    static void VectorTypeByte128VectorTestsSmokeTest() {
+    static void VectorTypeByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesByte128VectorTestsSmokeTest() {
+    static void WithLanesByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(byte.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeByte128VectorTestsSmokeTest() {
+    static void WithShapeByteVector128TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7139,9 +7337,9 @@ public class Byte128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueByte128VectorTestsSmokeTest() {
+    static void MaskAllTrueByteVector128TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteVector256LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector256LoadStoreTests.java
index a818043aedc..f57bc3e65b9 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector256LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Byte256VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ByteVector256LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ByteVector256LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_256;
 
@@ -61,14 +61,29 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -957,11 +972,11 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -972,11 +987,11 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
         }
     }
 
@@ -992,7 +1007,7 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(byte[] r, byte[] a, int[] indexMap) {
@@ -1005,7 +1020,7 @@ public class Byte256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java b/test/jdk/jdk/incubator/vector/ByteVector256Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Byte256VectorTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector256Tests.java
index d64caa3424f..1173a4b7783 100644
--- a/test/jdk/jdk/incubator/vector/Byte256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector256Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Byte256VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ByteVector256Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Byte256VectorTests extends AbstractVectorTest {
+public class ByteVector256Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_256;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final byte CONST_SHIFT = Byte.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final byte ADD_IDENTITY = (byte)0;
+    private static final byte AND_IDENTITY = (byte)-1;
+    private static final byte FIRST_NONZERO_IDENTITY = (byte)0;
+    private static final byte MAX_IDENTITY = Byte.MIN_VALUE;
+    private static final byte MIN_IDENTITY = Byte.MAX_VALUE;
+    private static final byte MUL_IDENTITY = (byte)1;
+    private static final byte OR_IDENTITY = (byte)0;
+    private static final byte SUADD_IDENTITY = (byte)0;
+    private static final byte UMAX_IDENTITY = (byte)0;   // Minimum unsigned value
+    private static final byte UMIN_IDENTITY = (byte)-1;  // Maximum unsigned value
+    private static final byte XOR_IDENTITY = (byte)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
     static void assertArraysStrictlyEquals(byte[] r, byte[] a) {
@@ -84,10 +139,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Byte256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (byte)0);
+                    assertEquals(r[i + k], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Byte256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (byte)0);
+                        assertEquals(r[i + j], (byte)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Byte256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Byte256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Byte256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1013,10 +1068,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1024,10 +1079,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1035,10 +1090,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1574,7 +1629,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ByteVector a = io.add((byte)1); //[1,2]
         ByteVector b = a.neg();  //[-1,-2]
         byte[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1589,19 +1644,19 @@ public class Byte256VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Byte> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Byte> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ByteVector uab0 = zab0.rearrange(unz0,zab1);
         ByteVector uab1 = zab0.rearrange(unz1,zab1);
         byte[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1616,7 +1671,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1650,7 +1705,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1663,7 +1718,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::ADD);
+        assertArraysEquals(r, a, b, ByteVector256Tests::ADD);
     }
 
     static byte add(byte a, byte b) {
@@ -1671,7 +1726,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1682,11 +1737,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::add);
+        assertArraysEquals(r, a, b, ByteVector256Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1702,11 +1757,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1720,7 +1775,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::add);
     }
 
     static byte SUB(byte a, byte b) {
@@ -1728,7 +1783,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void SUBByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUBByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1741,7 +1796,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::SUB);
+        assertArraysEquals(r, a, b, ByteVector256Tests::SUB);
     }
 
     static byte sub(byte a, byte b) {
@@ -1749,7 +1804,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1760,11 +1815,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::sub);
+        assertArraysEquals(r, a, b, ByteVector256Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void SUBByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUBByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1780,11 +1835,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1798,7 +1853,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::sub);
     }
 
     static byte MUL(byte a, byte b) {
@@ -1806,7 +1861,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MULByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MULByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1819,7 +1874,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::MUL);
+        assertArraysEquals(r, a, b, ByteVector256Tests::MUL);
     }
 
     static byte mul(byte a, byte b) {
@@ -1827,7 +1882,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1838,11 +1893,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::mul);
+        assertArraysEquals(r, a, b, ByteVector256Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void MULByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void MULByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1858,11 +1913,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1876,7 +1931,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::mul);
     }
 
     static byte DIV(byte a, byte b) {
@@ -1884,7 +1939,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void DIVByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void DIVByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1899,7 +1954,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::DIV);
+        assertArraysEquals(r, a, b, ByteVector256Tests::DIV);
     }
 
     static byte div(byte a, byte b) {
@@ -1907,7 +1962,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1922,11 +1977,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::div);
+        assertArraysEquals(r, a, b, ByteVector256Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void DIVByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void DIVByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1944,11 +1999,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1966,7 +2021,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1974,7 +2029,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void FIRST_NONZEROByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void FIRST_NONZEROByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1987,11 +2042,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ByteVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void FIRST_NONZEROByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void FIRST_NONZEROByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2007,7 +2062,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -2015,7 +2070,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2028,7 +2083,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::AND);
+        assertArraysEquals(r, a, b, ByteVector256Tests::AND);
     }
 
     static byte and(byte a, byte b) {
@@ -2036,7 +2091,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2047,11 +2102,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::and);
+        assertArraysEquals(r, a, b, ByteVector256Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2067,7 +2122,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::AND);
     }
 
     static byte AND_NOT(byte a, byte b) {
@@ -2075,7 +2130,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void AND_NOTByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void AND_NOTByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2088,11 +2143,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ByteVector256Tests::AND_NOT);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void AND_NOTByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void AND_NOTByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2108,7 +2163,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::AND_NOT);
     }
 
     static byte OR(byte a, byte b) {
@@ -2116,7 +2171,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2129,7 +2184,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::OR);
+        assertArraysEquals(r, a, b, ByteVector256Tests::OR);
     }
 
     static byte or(byte a, byte b) {
@@ -2137,7 +2192,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2148,11 +2203,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::or);
+        assertArraysEquals(r, a, b, ByteVector256Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2168,7 +2223,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::OR);
     }
 
     static byte XOR(byte a, byte b) {
@@ -2176,7 +2231,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void XORByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void XORByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2189,11 +2244,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::XOR);
+        assertArraysEquals(r, a, b, ByteVector256Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void XORByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void XORByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2209,11 +2264,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2223,11 +2278,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2240,11 +2295,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector256Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2254,11 +2309,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2271,11 +2326,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector256Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2285,11 +2340,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2302,11 +2357,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector256Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2318,11 +2373,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2392,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector256Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2406,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2365,11 +2420,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2382,11 +2437,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector256Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2396,11 +2451,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2410,11 +2465,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2427,11 +2482,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector256Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector256TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2441,11 +2496,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector256Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2458,11 +2513,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector256Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector256TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2472,11 +2527,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector256Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2489,7 +2544,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector256Tests::ADD);
     }
 
     static byte LSHL(byte a, byte b) {
@@ -2497,7 +2552,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2510,11 +2565,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ByteVector256Tests::LSHL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2530,7 +2585,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::LSHL);
     }
 
     static byte ASHR(byte a, byte b) {
@@ -2538,7 +2593,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2551,11 +2606,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ByteVector256Tests::ASHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2571,7 +2626,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::ASHR);
     }
 
     static byte LSHR(byte a, byte b) {
@@ -2579,7 +2634,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2592,11 +2647,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ByteVector256Tests::LSHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2612,7 +2667,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::LSHR);
     }
 
     static byte LSHL_unary(byte a, byte b) {
@@ -2620,7 +2675,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte256VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector256TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2632,11 +2687,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector256Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte256VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector256TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2651,7 +2706,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector256Tests::LSHL_unary);
     }
 
     static byte LSHR_unary(byte a, byte b) {
@@ -2659,7 +2714,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte256VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector256TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2671,11 +2726,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector256Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte256VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector256TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2690,7 +2745,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector256Tests::LSHR_unary);
     }
 
     static byte ASHR_unary(byte a, byte b) {
@@ -2698,7 +2753,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte256VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector256TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2710,11 +2765,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector256Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte256VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector256TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2729,7 +2784,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector256Tests::ASHR_unary);
     }
 
     static byte ROR(byte a, byte b) {
@@ -2737,7 +2792,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2750,11 +2805,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::ROR);
+        assertArraysEquals(r, a, b, ByteVector256Tests::ROR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2770,7 +2825,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::ROR);
     }
 
     static byte ROL(byte a, byte b) {
@@ -2778,7 +2833,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2791,11 +2846,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::ROL);
+        assertArraysEquals(r, a, b, ByteVector256Tests::ROL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2811,7 +2866,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::ROL);
     }
 
     static byte ROR_unary(byte a, byte b) {
@@ -2819,7 +2874,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte256VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector256TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2831,11 +2886,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector256Tests::ROR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte256VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector256TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2850,7 +2905,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector256Tests::ROR_unary);
     }
 
     static byte ROL_unary(byte a, byte b) {
@@ -2858,7 +2913,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte256VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector256TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2870,11 +2925,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector256Tests::ROL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte256VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector256TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2889,14 +2944,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector256Tests::ROL_unary);
     }
     static byte LSHR_binary_const(byte a) {
         return (byte)(((a & 0xFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHRByte256VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHRByteVector256TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2907,11 +2962,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector256Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHRByte256VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHRByteVector256TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2925,7 +2980,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector256Tests::LSHR_binary_const);
     }
 
     static byte LSHL_binary_const(byte a) {
@@ -2933,7 +2988,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHLByte256VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHLByteVector256TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2944,11 +2999,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector256Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHLByte256VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHLByteVector256TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2962,7 +3017,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector256Tests::LSHL_binary_const);
     }
 
     static byte ASHR_binary_const(byte a) {
@@ -2970,7 +3025,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ASHRByte256VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ASHRByteVector256TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2981,11 +3036,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector256Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ASHRByte256VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ASHRByteVector256TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2999,7 +3054,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector256Tests::ASHR_binary_const);
     }
 
     static byte ROR_binary_const(byte a) {
@@ -3007,7 +3062,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void RORByte256VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void RORByteVector256TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3018,11 +3073,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector256Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void RORByte256VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void RORByteVector256TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3036,7 +3091,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector256Tests::ROR_binary_const);
     }
 
     static byte ROL_binary_const(byte a) {
@@ -3044,7 +3099,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ROLByte256VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ROLByteVector256TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3055,11 +3110,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector256Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ROLByte256VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ROLByteVector256TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3073,14 +3128,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector256Tests::ROL_binary_const);
     }
 
 
     static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MINByteVector256TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3091,13 +3146,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, ByteVector256Tests::MIN);
     }
 
     static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void minByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void minByteVector256TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3108,13 +3163,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::min);
+        assertArraysEquals(r, a, (byte)10, ByteVector256Tests::min);
     }
 
     static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINByte256VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINByteVector256TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3127,13 +3182,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte256VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector256Tests::MIN);
     }
 
     static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MAXByteVector256TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3144,13 +3199,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, ByteVector256Tests::MAX);
     }
 
     static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void maxByte256VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void maxByteVector256TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3161,13 +3216,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte256VectorTests::max);
+        assertArraysEquals(r, a, (byte)10, ByteVector256Tests::max);
     }
 
     static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXByte256VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXByteVector256TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3180,7 +3235,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte256VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector256Tests::MAX);
     }
 
     static byte MIN(byte a, byte b) {
@@ -3188,7 +3243,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3201,7 +3256,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::MIN);
+        assertArraysEquals(r, a, b, ByteVector256Tests::MIN);
     }
 
     static byte min(byte a, byte b) {
@@ -3209,7 +3264,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3220,7 +3275,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::min);
+        assertArraysEquals(r, a, b, ByteVector256Tests::min);
     }
 
     static byte MAX(byte a, byte b) {
@@ -3228,7 +3283,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3241,7 +3296,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::MAX);
+        assertArraysEquals(r, a, b, ByteVector256Tests::MAX);
     }
 
     static byte max(byte a, byte b) {
@@ -3249,7 +3304,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3260,7 +3315,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::max);
+        assertArraysEquals(r, a, b, ByteVector256Tests::max);
     }
 
     static byte UMIN(byte a, byte b) {
@@ -3268,7 +3323,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMINByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMINByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3281,11 +3336,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ByteVector256Tests::UMIN);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMINByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMINByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3301,7 +3356,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::UMIN);
     }
 
     static byte UMAX(byte a, byte b) {
@@ -3309,7 +3364,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMAXByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMAXByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3322,11 +3377,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ByteVector256Tests::UMAX);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMAXByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMAXByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3342,7 +3397,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::UMAX);
     }
 
     static byte SADD(byte a, byte b) {
@@ -3350,7 +3405,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SADDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SADDByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3363,11 +3418,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::SADD);
+        assertArraysEquals(r, a, b, ByteVector256Tests::SADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SADDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SADDByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3383,7 +3438,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::SADD);
     }
 
     static byte SSUB(byte a, byte b) {
@@ -3391,7 +3446,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SSUBByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SSUBByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3404,11 +3459,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ByteVector256Tests::SSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SSUBByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SSUBByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3424,7 +3479,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::SSUB);
     }
 
     static byte SUADD(byte a, byte b) {
@@ -3432,7 +3487,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUADDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUADDByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3445,11 +3500,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ByteVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUADDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3465,7 +3520,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::SUADD);
     }
 
     static byte SUSUB(byte a, byte b) {
@@ -3473,7 +3528,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUSUBByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUSUBByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3486,11 +3541,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ByteVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUSUBByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUSUBByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3506,11 +3561,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3520,11 +3575,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3534,11 +3589,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3548,11 +3603,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3562,10 +3617,10 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ByteVector256Tests::max);
     }
     @Test(dataProvider = "byteSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SUADDAssocByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -3582,11 +3637,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Byte256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ByteVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDAssocByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                      IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3607,11 +3662,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Byte256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ByteVector256Tests::SUADD);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3620,7 +3675,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAll(byte[] a) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3629,32 +3684,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ANDReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ANDReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                byte v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::ANDReduce, Byte256VectorTests::ANDReduceAll);
+                ByteVector256Tests::ANDReduce, ByteVector256Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = AND_IDENTITY;
+
+        assertEquals((byte) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id & x), x);
+                assertEquals((byte) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static byte ANDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3664,7 +3737,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3673,34 +3746,29 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ANDReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                byte v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::ANDReduceMasked, Byte256VectorTests::ANDReduceAllMasked);
+                ByteVector256Tests::ANDReduceMasked, ByteVector256Tests::ANDReduceAllMasked);
     }
 
     static byte ORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3709,7 +3777,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3718,32 +3786,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ORReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ORReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                byte v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::ORReduce, Byte256VectorTests::ORReduceAll);
+                ByteVector256Tests::ORReduce, ByteVector256Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = OR_IDENTITY;
+
+        assertEquals((byte) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id | x), x);
+                assertEquals((byte) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static byte ORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3753,7 +3839,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3762,7 +3848,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ORReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3770,26 +3856,21 @@ public class Byte256VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                byte v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::ORReduceMasked, Byte256VectorTests::ORReduceAllMasked);
+                ByteVector256Tests::ORReduceMasked, ByteVector256Tests::ORReduceAllMasked);
     }
 
     static byte XORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3798,7 +3879,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3807,32 +3888,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void XORReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void XORReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                byte v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::XORReduce, Byte256VectorTests::XORReduceAll);
+                ByteVector256Tests::XORReduce, ByteVector256Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = XOR_IDENTITY;
+
+        assertEquals((byte) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id ^ x), x);
+                assertEquals((byte) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static byte XORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3842,7 +3941,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3851,7 +3950,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void XORReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3859,26 +3958,21 @@ public class Byte256VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                byte v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::XORReduceMasked, Byte256VectorTests::XORReduceAllMasked);
+                ByteVector256Tests::XORReduceMasked, ByteVector256Tests::XORReduceAllMasked);
     }
 
     static byte ADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3887,7 +3981,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3896,32 +3990,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                byte v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::ADDReduce, Byte256VectorTests::ADDReduceAll);
+                ByteVector256Tests::ADDReduce, ByteVector256Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = ADD_IDENTITY;
+
+        assertEquals((byte) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id + x), x);
+                assertEquals((byte) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3931,7 +4043,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3940,7 +4052,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3948,26 +4060,21 @@ public class Byte256VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                byte v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::ADDReduceMasked, Byte256VectorTests::ADDReduceAllMasked);
+                ByteVector256Tests::ADDReduceMasked, ByteVector256Tests::ADDReduceAllMasked);
     }
 
     static byte MULReduce(byte[] a, int idx) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3976,7 +4083,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAll(byte[] a) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3985,32 +4092,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MULReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void MULReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                byte v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::MULReduce, Byte256VectorTests::MULReduceAll);
+                ByteVector256Tests::MULReduce, ByteVector256Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MUL_IDENTITY;
+
+        assertEquals((byte) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id * x), x);
+                assertEquals((byte) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4020,7 +4145,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4029,34 +4154,29 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MULReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                byte v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::MULReduceMasked, Byte256VectorTests::MULReduceAllMasked);
+                ByteVector256Tests::MULReduceMasked, ByteVector256Tests::MULReduceAllMasked);
     }
 
     static byte MINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.min(res, a[i]);
         }
@@ -4065,7 +4185,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduce(a, i));
         }
@@ -4074,32 +4194,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void MINReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                byte v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::MINReduce, Byte256VectorTests::MINReduceAll);
+                ByteVector256Tests::MINReduce, ByteVector256Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MIN_IDENTITY;
+
+        assertEquals((byte) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.min(id, x), x);
+                assertEquals((byte) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.min(res, a[i]);
@@ -4109,7 +4247,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4118,34 +4256,29 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::MINReduceMasked, Byte256VectorTests::MINReduceAllMasked);
+                ByteVector256Tests::MINReduceMasked, ByteVector256Tests::MINReduceAllMasked);
     }
 
     static byte MAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.max(res, a[i]);
         }
@@ -4154,7 +4287,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduce(a, i));
         }
@@ -4163,32 +4296,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void MAXReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                byte v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::MAXReduce, Byte256VectorTests::MAXReduceAll);
+                ByteVector256Tests::MAXReduce, ByteVector256Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MAX_IDENTITY;
+
+        assertEquals((byte) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.max(id, x), x);
+                assertEquals((byte) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.max(res, a[i]);
@@ -4198,7 +4349,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4207,34 +4358,29 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::MAXReduceMasked, Byte256VectorTests::MAXReduceAllMasked);
+                ByteVector256Tests::MAXReduceMasked, ByteVector256Tests::MAXReduceAllMasked);
     }
 
     static byte UMINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4243,7 +4389,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4252,32 +4398,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMINReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void UMINReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                byte v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::UMINReduce, Byte256VectorTests::UMINReduceAll);
+                ByteVector256Tests::UMINReduce, ByteVector256Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMIN_IDENTITY;
+
+        assertEquals((byte) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.minUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static byte UMINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.minUnsigned(res, a[i]);
@@ -4287,7 +4451,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4296,34 +4460,29 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMINReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::UMINReduceMasked, Byte256VectorTests::UMINReduceAllMasked);
+                ByteVector256Tests::UMINReduceMasked, ByteVector256Tests::UMINReduceAllMasked);
     }
 
     static byte UMAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4332,7 +4491,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4341,32 +4500,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMAXReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void UMAXReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                byte v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::UMAXReduce, Byte256VectorTests::UMAXReduceAll);
+                ByteVector256Tests::UMAXReduce, ByteVector256Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMAX_IDENTITY;
+
+        assertEquals((byte) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static byte UMAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.maxUnsigned(res, a[i]);
@@ -4376,7 +4553,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4385,34 +4562,29 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMAXReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::UMAXReduceMasked, Byte256VectorTests::UMAXReduceAllMasked);
+                ByteVector256Tests::UMAXReduceMasked, ByteVector256Tests::UMAXReduceAllMasked);
     }
 
     static byte FIRST_NONZEROReduce(byte[] a, int idx) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4421,7 +4593,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAll(byte[] a) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4430,32 +4602,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void FIRST_NONZEROReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void FIRST_NONZEROReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::FIRST_NONZEROReduce, Byte256VectorTests::FIRST_NONZEROReduceAll);
+                ByteVector256Tests::FIRST_NONZEROReduce, ByteVector256Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static byte FIRST_NONZEROReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4465,7 +4655,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4474,30 +4664,25 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::FIRST_NONZEROReduceMasked, Byte256VectorTests::FIRST_NONZEROReduceAllMasked);
+                ByteVector256Tests::FIRST_NONZEROReduceMasked, ByteVector256Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4510,7 +4695,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueByte256VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueByteVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4521,7 +4706,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector256Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4534,7 +4719,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueByte256VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueByteVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4545,11 +4730,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector256Tests::allTrue);
     }
 
     static byte SUADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4558,7 +4743,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4567,32 +4752,50 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingUnaryOpProvider")
-    static void SUADDReduceByte256VectorTests(IntFunction<byte[]> fa) {
+    static void SUADDReduceByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                byte v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte256VectorTests::SUADDReduce, Byte256VectorTests::SUADDReduceAll);
+                ByteVector256Tests::SUADDReduce, ByteVector256Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = SUADD_IDENTITY;
+
+        assertEquals((byte) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static byte SUADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4602,7 +4805,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4610,7 +4813,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "byteSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4618,26 +4821,21 @@ public class Byte256VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                byte v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::SUADDReduceMasked, Byte256VectorTests::SUADDReduceAllMasked);
+                ByteVector256Tests::SUADDReduceMasked, ByteVector256Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void withByte256VectorTests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
+    static void withByteVector256Tests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -4660,7 +4858,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_DEFAULTByte256VectorTests(IntFunction<byte[]> fa) {
+    static void IS_DEFAULTByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4670,14 +4868,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4690,7 +4888,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4701,7 +4899,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_NEGATIVEByte256VectorTests(IntFunction<byte[]> fa) {
+    static void IS_NEGATIVEByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4711,14 +4909,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4731,14 +4929,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4750,14 +4948,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4769,14 +4967,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LTByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4792,14 +4990,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GTByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GTByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4811,14 +5009,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GTByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GTByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4834,14 +5032,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4853,14 +5051,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4872,14 +5070,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void EQByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4895,14 +5093,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void NEByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void NEByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4914,14 +5112,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void NEByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void NEByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4937,14 +5135,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LEByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LEByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4956,14 +5154,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LEByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LEByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4979,14 +5177,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GEByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GEByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4998,14 +5196,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GEByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GEByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5021,14 +5219,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULTByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULTByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5040,14 +5238,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULTByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULTByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5063,14 +5261,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGTByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGTByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5082,14 +5280,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGTByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGTByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5105,14 +5303,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULEByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULEByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5124,14 +5322,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULEByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULEByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5147,14 +5345,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGEByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGEByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5166,14 +5364,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGEByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGEByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5189,14 +5387,14 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5206,13 +5404,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5226,13 +5424,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector256TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5242,13 +5440,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5262,13 +5460,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5278,13 +5476,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5298,13 +5496,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector256TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5314,13 +5512,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5334,7 +5532,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
             }
         }
     }
@@ -5344,7 +5542,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5360,11 +5558,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ByteVector256Tests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
-    static void RearrangeByte256VectorTests(IntFunction<byte[]> fa,
+    static void RearrangeByteVector256Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5381,7 +5579,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
-    static void RearrangeByte256VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void RearrangeByteVector256TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -5399,7 +5597,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void compressByte256VectorTests(IntFunction<byte[]> fa,
+    static void compressByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5417,7 +5615,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void expandByte256VectorTests(IntFunction<byte[]> fa,
+    static void expandByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5435,7 +5633,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void getByte256VectorTests(IntFunction<byte[]> fa) {
+    static void getByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -5591,7 +5789,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastByte256VectorTests(IntFunction<byte[]> fa) {
+    static void BroadcastByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5605,7 +5803,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZeroByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ZeroByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5615,7 +5813,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static byte[] sliceUnary(byte[] a, int origin, int idx) {
@@ -5630,7 +5828,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void sliceUnaryByte256VectorTests(IntFunction<byte[]> fa) {
+    static void sliceUnaryByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5641,7 +5839,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector256Tests::sliceUnary);
     }
 
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
@@ -5658,7 +5856,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void sliceBinaryByte256VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void sliceBinaryByteVector256TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5671,7 +5869,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Byte256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ByteVector256Tests::sliceBinary);
     }
 
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
@@ -5688,7 +5886,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void sliceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void sliceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5705,7 +5903,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Byte256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ByteVector256Tests::slice);
     }
 
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
@@ -5722,7 +5920,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void unsliceUnaryByte256VectorTests(IntFunction<byte[]> fa) {
+    static void unsliceUnaryByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5733,7 +5931,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector256Tests::unsliceUnary);
     }
 
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
@@ -5759,7 +5957,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void unsliceBinaryByte256VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void unsliceBinaryByteVector256TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5773,7 +5971,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Byte256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ByteVector256Tests::unsliceBinary);
     }
 
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5813,7 +6011,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void unsliceByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void unsliceByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5830,7 +6028,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Byte256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ByteVector256Tests::unslice);
     }
 
     static byte BITWISE_BLEND(byte a, byte b, byte c) {
@@ -5842,7 +6040,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5857,11 +6055,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5874,11 +6072,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ByteVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5896,11 +6094,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5911,11 +6109,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte256VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector256TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5926,11 +6124,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5941,11 +6139,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte256VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector256TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5956,11 +6154,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5975,11 +6173,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector256TestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5994,11 +6192,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte256VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector256TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6009,11 +6207,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte256VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector256TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6024,11 +6222,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector256TestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6042,7 +6240,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteVector256Tests::BITWISE_BLEND);
     }
 
     static byte NEG(byte a) {
@@ -6054,7 +6252,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NEGByte256VectorTests(IntFunction<byte[]> fa) {
+    static void NEGByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6065,11 +6263,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::NEG);
+        assertArraysEquals(r, a, ByteVector256Tests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void negByte256VectorTests(IntFunction<byte[]> fa) {
+    static void negByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6080,11 +6278,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::neg);
+        assertArraysEquals(r, a, ByteVector256Tests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NEGMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void NEGMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6098,7 +6296,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -6110,7 +6308,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ABSByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ABSByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6121,11 +6319,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::ABS);
+        assertArraysEquals(r, a, ByteVector256Tests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void absByte256VectorTests(IntFunction<byte[]> fa) {
+    static void absByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6136,11 +6334,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::abs);
+        assertArraysEquals(r, a, ByteVector256Tests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ABSMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void ABSMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6154,7 +6352,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::ABS);
     }
 
     static byte NOT(byte a) {
@@ -6166,7 +6364,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NOTByte256VectorTests(IntFunction<byte[]> fa) {
+    static void NOTByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6177,11 +6375,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::NOT);
+        assertArraysEquals(r, a, ByteVector256Tests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void notByte256VectorTests(IntFunction<byte[]> fa) {
+    static void notByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6192,11 +6390,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::not);
+        assertArraysEquals(r, a, ByteVector256Tests::not);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NOTMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void NOTMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6210,7 +6408,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::NOT);
     }
 
     static byte ZOMO(byte a) {
@@ -6218,7 +6416,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZOMOByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ZOMOByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6229,11 +6427,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::ZOMO);
+        assertArraysEquals(r, a, ByteVector256Tests::ZOMO);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ZOMOMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void ZOMOMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6247,7 +6445,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::ZOMO);
     }
 
     static byte BIT_COUNT(byte a) {
@@ -6255,7 +6453,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BIT_COUNTByte256VectorTests(IntFunction<byte[]> fa) {
+    static void BIT_COUNTByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6266,11 +6464,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ByteVector256Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void BIT_COUNTMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6284,7 +6482,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::BIT_COUNT);
     }
 
     static byte TRAILING_ZEROS_COUNT(byte a) {
@@ -6292,7 +6490,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTByte256VectorTests(IntFunction<byte[]> fa) {
+    static void TRAILING_ZEROS_COUNTByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6303,11 +6501,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6321,7 +6519,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     static byte LEADING_ZEROS_COUNT(byte a) {
@@ -6329,7 +6527,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTByte256VectorTests(IntFunction<byte[]> fa) {
+    static void LEADING_ZEROS_COUNTByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6340,11 +6538,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6358,7 +6556,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     static byte REVERSE(byte a) {
@@ -6366,7 +6564,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSEByte256VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSEByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6377,11 +6575,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::REVERSE);
+        assertArraysEquals(r, a, ByteVector256Tests::REVERSE);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSEMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void REVERSEMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6395,7 +6593,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::REVERSE);
     }
 
     static byte REVERSE_BYTES(byte a) {
@@ -6403,7 +6601,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSE_BYTESByte256VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSE_BYTESByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6414,11 +6612,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ByteVector256Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedByte256VectorTests(IntFunction<byte[]> fa,
+    static void REVERSE_BYTESMaskedByteVector256Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6432,7 +6630,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ByteVector256Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6440,7 +6638,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandByteVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6453,7 +6651,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::band);
+        assertArraysEquals(r, a, b, ByteVector256Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6461,7 +6659,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorByteVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6474,7 +6672,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::bor);
+        assertArraysEquals(r, a, b, ByteVector256Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6482,7 +6680,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorByteVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6495,7 +6693,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::bxor);
+        assertArraysEquals(r, a, b, ByteVector256Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6503,7 +6701,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotByteVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6516,7 +6714,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ByteVector256Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6524,7 +6722,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqByteVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6537,7 +6735,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte256VectorTests::beq);
+        assertArraysEquals(r, a, b, ByteVector256Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6545,7 +6743,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotByte256VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotByteVector256Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6556,7 +6754,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte256VectorTests::unot);
+        assertArraysEquals(r, a, ByteVector256Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6565,15 +6763,15 @@ public class Byte256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte256VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongByteVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6587,7 +6785,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte256VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector256TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6597,13 +6795,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte256VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector256TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6613,13 +6811,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toIntArrayByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toIntArrayByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6630,7 +6828,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toLongArrayByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toLongArrayByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6641,7 +6839,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toDoubleArrayByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toDoubleArrayByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6652,7 +6850,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toStringByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toStringByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6665,7 +6863,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void hashCodeByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void hashCodeByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6679,7 +6877,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void reinterpretAsBytesByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void reinterpretAsBytesByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6709,7 +6907,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceLongByte256VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceLongByteVector256Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6725,7 +6923,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Byte256VectorTests::ADDReduceLong, Byte256VectorTests::ADDReduceAllLong);
+                ByteVector256Tests::ADDReduceLong, ByteVector256Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(byte[] a, int idx, boolean[] mask) {
@@ -6748,7 +6946,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceLongByte256VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongByteVector256TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6766,11 +6964,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Byte256VectorTests::ADDReduceLongMasked, Byte256VectorTests::ADDReduceAllLongMasked);
+                ByteVector256Tests::ADDReduceLongMasked, ByteVector256Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastLongByte256VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void BroadcastLongByteVector256TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6781,7 +6979,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte256VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector256TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6795,12 +6993,12 @@ public class Byte256VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector256Tests::blend);
     }
 
 
     @Test(dataProvider = "byteUnaryOpSelectFromProvider")
-    static void SelectFromByte256VectorTests(IntFunction<byte[]> fa,
+    static void SelectFromByteVector256Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,byte[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] order = fs.apply(a.length, SPECIES.length());
@@ -6816,7 +7014,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorByte256VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SelectFromTwoVectorByteVector256Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] idx = fc.apply(SPECIES.length());
@@ -6834,7 +7032,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
-    static void SelectFromByte256VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void SelectFromByteVector256TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                            BiFunction<Integer,Integer,byte[]> fs,
                                                            IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6853,7 +7051,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousByte256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousByteVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6864,12 +7062,12 @@ public class Byte256VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringByte256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringByteVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6883,7 +7081,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsByte256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsByteVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6892,12 +7090,12 @@ public class Byte256VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsByteVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6907,13 +7105,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeByteVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6935,7 +7133,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountByteVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6946,7 +7144,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte256VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ByteVector256Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6960,7 +7158,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueByteVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6971,7 +7169,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte256VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector256Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6985,7 +7183,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueByteVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6996,11 +7194,11 @@ public class Byte256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte256VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector256Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressByte256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressByteVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7010,7 +7208,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7028,7 +7226,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeByte256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeByteVector256TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7036,13 +7234,13 @@ public class Byte256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongByte256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongByteVector256TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7050,7 +7248,7 @@ public class Byte256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7069,36 +7267,36 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundByte256VectorTestsSmokeTest(int length) {
+    static void loopBoundByteVector256TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongByte256VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongByteVector256TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeByte256VectorTestsSmokeTest() {
+    static void ElementSizeByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Byte.SIZE);
+        assertEquals(elsize, Byte.SIZE);
     }
 
     @Test
-    static void VectorShapeByte256VectorTestsSmokeTest() {
+    static void VectorShapeByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_256_BIT));
     }
 
     @Test
-    static void ShapeWithLanesByte256VectorTestsSmokeTest() {
+    static void ShapeWithLanesByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(byte.class);
@@ -7106,32 +7304,32 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeByte256VectorTestsSmokeTest() {
+    static void ElementTypeByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementType() == byte.class);
     }
 
     @Test
-    static void SpeciesElementSizeByte256VectorTestsSmokeTest() {
+    static void SpeciesElementSizeByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementSize() == Byte.SIZE);
     }
 
     @Test
-    static void VectorTypeByte256VectorTestsSmokeTest() {
+    static void VectorTypeByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesByte256VectorTestsSmokeTest() {
+    static void WithLanesByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(byte.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeByte256VectorTestsSmokeTest() {
+    static void WithShapeByteVector256TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7139,9 +7337,9 @@ public class Byte256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueByte256VectorTestsSmokeTest() {
+    static void MaskAllTrueByteVector256TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteVector512LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector512LoadStoreTests.java
index 7df9c1fbf10..0a9189927b1 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector512LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Byte512VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ByteVector512LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ByteVector512LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_512;
 
@@ -61,14 +61,29 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -957,11 +972,11 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -972,11 +987,11 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
         }
     }
 
@@ -992,7 +1007,7 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(byte[] r, byte[] a, int[] indexMap) {
@@ -1005,7 +1020,7 @@ public class Byte512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java b/test/jdk/jdk/incubator/vector/ByteVector512Tests.java
similarity index 78%
rename from test/jdk/jdk/incubator/vector/Byte512VectorTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector512Tests.java
index f494e3d3ae8..02da1889dc8 100644
--- a/test/jdk/jdk/incubator/vector/Byte512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector512Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Byte512VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ByteVector512Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Byte512VectorTests extends AbstractVectorTest {
+public class ByteVector512Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final byte CONST_SHIFT = Byte.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final byte ADD_IDENTITY = (byte)0;
+    private static final byte AND_IDENTITY = (byte)-1;
+    private static final byte FIRST_NONZERO_IDENTITY = (byte)0;
+    private static final byte MAX_IDENTITY = Byte.MIN_VALUE;
+    private static final byte MIN_IDENTITY = Byte.MAX_VALUE;
+    private static final byte MUL_IDENTITY = (byte)1;
+    private static final byte OR_IDENTITY = (byte)0;
+    private static final byte SUADD_IDENTITY = (byte)0;
+    private static final byte UMAX_IDENTITY = (byte)0;   // Minimum unsigned value
+    private static final byte UMIN_IDENTITY = (byte)-1;  // Maximum unsigned value
+    private static final byte XOR_IDENTITY = (byte)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
     static void assertArraysStrictlyEquals(byte[] r, byte[] a) {
@@ -84,10 +139,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Byte512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (byte)0);
+                    assertEquals(r[i + k], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Byte512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (byte)0);
+                        assertEquals(r[i + j], (byte)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Byte512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Byte512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Byte512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1013,10 +1068,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1024,10 +1079,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1035,10 +1090,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1574,7 +1629,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ByteVector a = io.add((byte)1); //[1,2]
         ByteVector b = a.neg();  //[-1,-2]
         byte[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1589,19 +1644,19 @@ public class Byte512VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Byte> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Byte> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ByteVector uab0 = zab0.rearrange(unz0,zab1);
         ByteVector uab1 = zab0.rearrange(unz1,zab1);
         byte[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1616,7 +1671,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1650,7 +1705,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1663,7 +1718,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::ADD);
+        assertArraysEquals(r, a, b, ByteVector512Tests::ADD);
     }
 
     static byte add(byte a, byte b) {
@@ -1671,7 +1726,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1682,11 +1737,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::add);
+        assertArraysEquals(r, a, b, ByteVector512Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1702,11 +1757,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1720,7 +1775,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::add);
     }
 
     static byte SUB(byte a, byte b) {
@@ -1728,7 +1783,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void SUBByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUBByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1741,7 +1796,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::SUB);
+        assertArraysEquals(r, a, b, ByteVector512Tests::SUB);
     }
 
     static byte sub(byte a, byte b) {
@@ -1749,7 +1804,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1760,11 +1815,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::sub);
+        assertArraysEquals(r, a, b, ByteVector512Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void SUBByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUBByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1780,11 +1835,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1798,7 +1853,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::sub);
     }
 
     static byte MUL(byte a, byte b) {
@@ -1806,7 +1861,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MULByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MULByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1819,7 +1874,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::MUL);
+        assertArraysEquals(r, a, b, ByteVector512Tests::MUL);
     }
 
     static byte mul(byte a, byte b) {
@@ -1827,7 +1882,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1838,11 +1893,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::mul);
+        assertArraysEquals(r, a, b, ByteVector512Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void MULByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void MULByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1858,11 +1913,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1876,7 +1931,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::mul);
     }
 
     static byte DIV(byte a, byte b) {
@@ -1884,7 +1939,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void DIVByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void DIVByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1899,7 +1954,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::DIV);
+        assertArraysEquals(r, a, b, ByteVector512Tests::DIV);
     }
 
     static byte div(byte a, byte b) {
@@ -1907,7 +1962,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1922,11 +1977,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::div);
+        assertArraysEquals(r, a, b, ByteVector512Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void DIVByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void DIVByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1944,11 +1999,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1966,7 +2021,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1974,7 +2029,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void FIRST_NONZEROByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void FIRST_NONZEROByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1987,11 +2042,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ByteVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void FIRST_NONZEROByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void FIRST_NONZEROByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2007,7 +2062,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -2015,7 +2070,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2028,7 +2083,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::AND);
+        assertArraysEquals(r, a, b, ByteVector512Tests::AND);
     }
 
     static byte and(byte a, byte b) {
@@ -2036,7 +2091,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2047,11 +2102,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::and);
+        assertArraysEquals(r, a, b, ByteVector512Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2067,7 +2122,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::AND);
     }
 
     static byte AND_NOT(byte a, byte b) {
@@ -2075,7 +2130,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void AND_NOTByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void AND_NOTByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2088,11 +2143,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ByteVector512Tests::AND_NOT);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void AND_NOTByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void AND_NOTByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2108,7 +2163,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::AND_NOT);
     }
 
     static byte OR(byte a, byte b) {
@@ -2116,7 +2171,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2129,7 +2184,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::OR);
+        assertArraysEquals(r, a, b, ByteVector512Tests::OR);
     }
 
     static byte or(byte a, byte b) {
@@ -2137,7 +2192,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2148,11 +2203,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::or);
+        assertArraysEquals(r, a, b, ByteVector512Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2168,7 +2223,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::OR);
     }
 
     static byte XOR(byte a, byte b) {
@@ -2176,7 +2231,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void XORByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void XORByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2189,11 +2244,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::XOR);
+        assertArraysEquals(r, a, b, ByteVector512Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void XORByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void XORByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2209,11 +2264,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2223,11 +2278,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2240,11 +2295,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector512Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2254,11 +2309,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2271,11 +2326,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector512Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2285,11 +2340,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2302,11 +2357,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector512Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2318,11 +2373,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2392,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector512Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2406,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2365,11 +2420,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2382,11 +2437,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector512Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2396,11 +2451,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2410,11 +2465,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2427,11 +2482,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector512Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector512TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2441,11 +2496,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector512Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2458,11 +2513,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector512Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector512TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2472,11 +2527,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector512Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2489,7 +2544,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector512Tests::ADD);
     }
 
     static byte LSHL(byte a, byte b) {
@@ -2497,7 +2552,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2510,11 +2565,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ByteVector512Tests::LSHL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2530,7 +2585,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::LSHL);
     }
 
     static byte ASHR(byte a, byte b) {
@@ -2538,7 +2593,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2551,11 +2606,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ByteVector512Tests::ASHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2571,7 +2626,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::ASHR);
     }
 
     static byte LSHR(byte a, byte b) {
@@ -2579,7 +2634,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2592,11 +2647,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ByteVector512Tests::LSHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2612,7 +2667,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::LSHR);
     }
 
     static byte LSHL_unary(byte a, byte b) {
@@ -2620,7 +2675,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte512VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector512TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2632,11 +2687,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector512Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte512VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector512TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2651,7 +2706,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector512Tests::LSHL_unary);
     }
 
     static byte LSHR_unary(byte a, byte b) {
@@ -2659,7 +2714,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte512VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector512TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2671,11 +2726,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector512Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte512VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector512TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2690,7 +2745,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector512Tests::LSHR_unary);
     }
 
     static byte ASHR_unary(byte a, byte b) {
@@ -2698,7 +2753,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte512VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector512TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2710,11 +2765,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector512Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte512VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector512TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2729,7 +2784,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector512Tests::ASHR_unary);
     }
 
     static byte ROR(byte a, byte b) {
@@ -2737,7 +2792,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2750,11 +2805,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::ROR);
+        assertArraysEquals(r, a, b, ByteVector512Tests::ROR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2770,7 +2825,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::ROR);
     }
 
     static byte ROL(byte a, byte b) {
@@ -2778,7 +2833,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2791,11 +2846,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::ROL);
+        assertArraysEquals(r, a, b, ByteVector512Tests::ROL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2811,7 +2866,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::ROL);
     }
 
     static byte ROR_unary(byte a, byte b) {
@@ -2819,7 +2874,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte512VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector512TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2831,11 +2886,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector512Tests::ROR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte512VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector512TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2850,7 +2905,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector512Tests::ROR_unary);
     }
 
     static byte ROL_unary(byte a, byte b) {
@@ -2858,7 +2913,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte512VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector512TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2870,11 +2925,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector512Tests::ROL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte512VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector512TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2889,14 +2944,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector512Tests::ROL_unary);
     }
     static byte LSHR_binary_const(byte a) {
         return (byte)(((a & 0xFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHRByte512VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHRByteVector512TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2907,11 +2962,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector512Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHRByte512VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHRByteVector512TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2925,7 +2980,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector512Tests::LSHR_binary_const);
     }
 
     static byte LSHL_binary_const(byte a) {
@@ -2933,7 +2988,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHLByte512VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHLByteVector512TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2944,11 +2999,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector512Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHLByte512VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHLByteVector512TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2962,7 +3017,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector512Tests::LSHL_binary_const);
     }
 
     static byte ASHR_binary_const(byte a) {
@@ -2970,7 +3025,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ASHRByte512VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ASHRByteVector512TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2981,11 +3036,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector512Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ASHRByte512VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ASHRByteVector512TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2999,7 +3054,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector512Tests::ASHR_binary_const);
     }
 
     static byte ROR_binary_const(byte a) {
@@ -3007,7 +3062,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void RORByte512VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void RORByteVector512TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3018,11 +3073,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector512Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void RORByte512VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void RORByteVector512TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3036,7 +3091,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector512Tests::ROR_binary_const);
     }
 
     static byte ROL_binary_const(byte a) {
@@ -3044,7 +3099,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ROLByte512VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ROLByteVector512TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3055,11 +3110,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector512Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ROLByte512VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ROLByteVector512TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3073,14 +3128,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector512Tests::ROL_binary_const);
     }
 
 
     static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MINByteVector512TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3091,13 +3146,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, ByteVector512Tests::MIN);
     }
 
     static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void minByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void minByteVector512TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3108,13 +3163,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::min);
+        assertArraysEquals(r, a, (byte)10, ByteVector512Tests::min);
     }
 
     static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINByte512VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINByteVector512TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3127,13 +3182,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte512VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector512Tests::MIN);
     }
 
     static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MAXByteVector512TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3144,13 +3199,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, ByteVector512Tests::MAX);
     }
 
     static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void maxByte512VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void maxByteVector512TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3161,13 +3216,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte512VectorTests::max);
+        assertArraysEquals(r, a, (byte)10, ByteVector512Tests::max);
     }
 
     static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXByte512VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXByteVector512TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3180,7 +3235,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte512VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector512Tests::MAX);
     }
 
     static byte MIN(byte a, byte b) {
@@ -3188,7 +3243,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3201,7 +3256,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::MIN);
+        assertArraysEquals(r, a, b, ByteVector512Tests::MIN);
     }
 
     static byte min(byte a, byte b) {
@@ -3209,7 +3264,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3220,7 +3275,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::min);
+        assertArraysEquals(r, a, b, ByteVector512Tests::min);
     }
 
     static byte MAX(byte a, byte b) {
@@ -3228,7 +3283,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3241,7 +3296,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::MAX);
+        assertArraysEquals(r, a, b, ByteVector512Tests::MAX);
     }
 
     static byte max(byte a, byte b) {
@@ -3249,7 +3304,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3260,7 +3315,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::max);
+        assertArraysEquals(r, a, b, ByteVector512Tests::max);
     }
 
     static byte UMIN(byte a, byte b) {
@@ -3268,7 +3323,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMINByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMINByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3281,11 +3336,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ByteVector512Tests::UMIN);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMINByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMINByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3301,7 +3356,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::UMIN);
     }
 
     static byte UMAX(byte a, byte b) {
@@ -3309,7 +3364,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMAXByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMAXByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3322,11 +3377,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ByteVector512Tests::UMAX);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMAXByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMAXByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3342,7 +3397,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::UMAX);
     }
 
     static byte SADD(byte a, byte b) {
@@ -3350,7 +3405,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SADDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SADDByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3363,11 +3418,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::SADD);
+        assertArraysEquals(r, a, b, ByteVector512Tests::SADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SADDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SADDByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3383,7 +3438,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::SADD);
     }
 
     static byte SSUB(byte a, byte b) {
@@ -3391,7 +3446,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SSUBByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SSUBByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3404,11 +3459,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ByteVector512Tests::SSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SSUBByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SSUBByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3424,7 +3479,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::SSUB);
     }
 
     static byte SUADD(byte a, byte b) {
@@ -3432,7 +3487,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUADDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUADDByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3445,11 +3500,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ByteVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUADDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3465,7 +3520,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::SUADD);
     }
 
     static byte SUSUB(byte a, byte b) {
@@ -3473,7 +3528,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUSUBByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUSUBByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3486,11 +3541,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ByteVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUSUBByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUSUBByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3506,11 +3561,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3520,11 +3575,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3534,11 +3589,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3548,11 +3603,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3562,10 +3617,10 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ByteVector512Tests::max);
     }
     @Test(dataProvider = "byteSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SUADDAssocByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -3582,11 +3637,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Byte512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ByteVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDAssocByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                      IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3607,11 +3662,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Byte512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ByteVector512Tests::SUADD);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3620,7 +3675,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAll(byte[] a) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3629,32 +3684,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ANDReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ANDReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                byte v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::ANDReduce, Byte512VectorTests::ANDReduceAll);
+                ByteVector512Tests::ANDReduce, ByteVector512Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = AND_IDENTITY;
+
+        assertEquals((byte) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id & x), x);
+                assertEquals((byte) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static byte ANDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3664,7 +3737,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3673,34 +3746,29 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ANDReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                byte v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::ANDReduceMasked, Byte512VectorTests::ANDReduceAllMasked);
+                ByteVector512Tests::ANDReduceMasked, ByteVector512Tests::ANDReduceAllMasked);
     }
 
     static byte ORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3709,7 +3777,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3718,32 +3786,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ORReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ORReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                byte v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::ORReduce, Byte512VectorTests::ORReduceAll);
+                ByteVector512Tests::ORReduce, ByteVector512Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = OR_IDENTITY;
+
+        assertEquals((byte) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id | x), x);
+                assertEquals((byte) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static byte ORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3753,7 +3839,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3762,7 +3848,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ORReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3770,26 +3856,21 @@ public class Byte512VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                byte v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::ORReduceMasked, Byte512VectorTests::ORReduceAllMasked);
+                ByteVector512Tests::ORReduceMasked, ByteVector512Tests::ORReduceAllMasked);
     }
 
     static byte XORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3798,7 +3879,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3807,32 +3888,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void XORReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void XORReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                byte v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::XORReduce, Byte512VectorTests::XORReduceAll);
+                ByteVector512Tests::XORReduce, ByteVector512Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = XOR_IDENTITY;
+
+        assertEquals((byte) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id ^ x), x);
+                assertEquals((byte) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static byte XORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3842,7 +3941,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3851,7 +3950,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void XORReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3859,26 +3958,21 @@ public class Byte512VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                byte v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::XORReduceMasked, Byte512VectorTests::XORReduceAllMasked);
+                ByteVector512Tests::XORReduceMasked, ByteVector512Tests::XORReduceAllMasked);
     }
 
     static byte ADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3887,7 +3981,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3896,32 +3990,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                byte v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::ADDReduce, Byte512VectorTests::ADDReduceAll);
+                ByteVector512Tests::ADDReduce, ByteVector512Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = ADD_IDENTITY;
+
+        assertEquals((byte) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id + x), x);
+                assertEquals((byte) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3931,7 +4043,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3940,7 +4052,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3948,26 +4060,21 @@ public class Byte512VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                byte v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::ADDReduceMasked, Byte512VectorTests::ADDReduceAllMasked);
+                ByteVector512Tests::ADDReduceMasked, ByteVector512Tests::ADDReduceAllMasked);
     }
 
     static byte MULReduce(byte[] a, int idx) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3976,7 +4083,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAll(byte[] a) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3985,32 +4092,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MULReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void MULReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                byte v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::MULReduce, Byte512VectorTests::MULReduceAll);
+                ByteVector512Tests::MULReduce, ByteVector512Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MUL_IDENTITY;
+
+        assertEquals((byte) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id * x), x);
+                assertEquals((byte) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4020,7 +4145,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4029,34 +4154,29 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MULReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                byte v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::MULReduceMasked, Byte512VectorTests::MULReduceAllMasked);
+                ByteVector512Tests::MULReduceMasked, ByteVector512Tests::MULReduceAllMasked);
     }
 
     static byte MINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.min(res, a[i]);
         }
@@ -4065,7 +4185,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduce(a, i));
         }
@@ -4074,32 +4194,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void MINReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                byte v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::MINReduce, Byte512VectorTests::MINReduceAll);
+                ByteVector512Tests::MINReduce, ByteVector512Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MIN_IDENTITY;
+
+        assertEquals((byte) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.min(id, x), x);
+                assertEquals((byte) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.min(res, a[i]);
@@ -4109,7 +4247,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4118,34 +4256,29 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::MINReduceMasked, Byte512VectorTests::MINReduceAllMasked);
+                ByteVector512Tests::MINReduceMasked, ByteVector512Tests::MINReduceAllMasked);
     }
 
     static byte MAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.max(res, a[i]);
         }
@@ -4154,7 +4287,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduce(a, i));
         }
@@ -4163,32 +4296,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void MAXReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                byte v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::MAXReduce, Byte512VectorTests::MAXReduceAll);
+                ByteVector512Tests::MAXReduce, ByteVector512Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MAX_IDENTITY;
+
+        assertEquals((byte) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.max(id, x), x);
+                assertEquals((byte) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.max(res, a[i]);
@@ -4198,7 +4349,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4207,34 +4358,29 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::MAXReduceMasked, Byte512VectorTests::MAXReduceAllMasked);
+                ByteVector512Tests::MAXReduceMasked, ByteVector512Tests::MAXReduceAllMasked);
     }
 
     static byte UMINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4243,7 +4389,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4252,32 +4398,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMINReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void UMINReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                byte v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::UMINReduce, Byte512VectorTests::UMINReduceAll);
+                ByteVector512Tests::UMINReduce, ByteVector512Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMIN_IDENTITY;
+
+        assertEquals((byte) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.minUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static byte UMINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.minUnsigned(res, a[i]);
@@ -4287,7 +4451,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4296,34 +4460,29 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMINReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::UMINReduceMasked, Byte512VectorTests::UMINReduceAllMasked);
+                ByteVector512Tests::UMINReduceMasked, ByteVector512Tests::UMINReduceAllMasked);
     }
 
     static byte UMAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4332,7 +4491,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4341,32 +4500,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMAXReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void UMAXReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                byte v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::UMAXReduce, Byte512VectorTests::UMAXReduceAll);
+                ByteVector512Tests::UMAXReduce, ByteVector512Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMAX_IDENTITY;
+
+        assertEquals((byte) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static byte UMAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.maxUnsigned(res, a[i]);
@@ -4376,7 +4553,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4385,34 +4562,29 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMAXReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::UMAXReduceMasked, Byte512VectorTests::UMAXReduceAllMasked);
+                ByteVector512Tests::UMAXReduceMasked, ByteVector512Tests::UMAXReduceAllMasked);
     }
 
     static byte FIRST_NONZEROReduce(byte[] a, int idx) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4421,7 +4593,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAll(byte[] a) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4430,32 +4602,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void FIRST_NONZEROReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void FIRST_NONZEROReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::FIRST_NONZEROReduce, Byte512VectorTests::FIRST_NONZEROReduceAll);
+                ByteVector512Tests::FIRST_NONZEROReduce, ByteVector512Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static byte FIRST_NONZEROReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4465,7 +4655,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4474,30 +4664,25 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::FIRST_NONZEROReduceMasked, Byte512VectorTests::FIRST_NONZEROReduceAllMasked);
+                ByteVector512Tests::FIRST_NONZEROReduceMasked, ByteVector512Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4510,7 +4695,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueByte512VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueByteVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4521,7 +4706,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector512Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4534,7 +4719,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueByte512VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueByteVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4545,11 +4730,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector512Tests::allTrue);
     }
 
     static byte SUADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4558,7 +4743,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4567,32 +4752,50 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingUnaryOpProvider")
-    static void SUADDReduceByte512VectorTests(IntFunction<byte[]> fa) {
+    static void SUADDReduceByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                byte v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte512VectorTests::SUADDReduce, Byte512VectorTests::SUADDReduceAll);
+                ByteVector512Tests::SUADDReduce, ByteVector512Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = SUADD_IDENTITY;
+
+        assertEquals((byte) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static byte SUADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4602,7 +4805,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4610,7 +4813,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "byteSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4618,26 +4821,21 @@ public class Byte512VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                byte v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::SUADDReduceMasked, Byte512VectorTests::SUADDReduceAllMasked);
+                ByteVector512Tests::SUADDReduceMasked, ByteVector512Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void withByte512VectorTests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
+    static void withByteVector512Tests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -4660,7 +4858,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_DEFAULTByte512VectorTests(IntFunction<byte[]> fa) {
+    static void IS_DEFAULTByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4670,14 +4868,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4690,7 +4888,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4701,7 +4899,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_NEGATIVEByte512VectorTests(IntFunction<byte[]> fa) {
+    static void IS_NEGATIVEByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4711,14 +4909,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4731,14 +4929,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4750,14 +4948,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4769,14 +4967,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LTByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4792,14 +4990,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GTByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GTByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4811,14 +5009,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GTByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GTByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4834,14 +5032,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4853,14 +5051,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4872,14 +5070,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void EQByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4895,14 +5093,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void NEByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void NEByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4914,14 +5112,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void NEByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void NEByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4937,14 +5135,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LEByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LEByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4956,14 +5154,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LEByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LEByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4979,14 +5177,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GEByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GEByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4998,14 +5196,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GEByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GEByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5021,14 +5219,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULTByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULTByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5040,14 +5238,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULTByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULTByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5063,14 +5261,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGTByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGTByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5082,14 +5280,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGTByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGTByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5105,14 +5303,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULEByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULEByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5124,14 +5322,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULEByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULEByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5147,14 +5345,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGEByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGEByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5166,14 +5364,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGEByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGEByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5189,14 +5387,14 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5206,13 +5404,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5226,13 +5424,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector512TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5242,13 +5440,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5262,13 +5460,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5278,13 +5476,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5298,13 +5496,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector512TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5314,13 +5512,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5334,7 +5532,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
             }
         }
     }
@@ -5344,7 +5542,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5360,11 +5558,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ByteVector512Tests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
-    static void RearrangeByte512VectorTests(IntFunction<byte[]> fa,
+    static void RearrangeByteVector512Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5381,7 +5579,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
-    static void RearrangeByte512VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void RearrangeByteVector512TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -5399,7 +5597,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void compressByte512VectorTests(IntFunction<byte[]> fa,
+    static void compressByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5417,7 +5615,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void expandByte512VectorTests(IntFunction<byte[]> fa,
+    static void expandByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5435,7 +5633,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void getByte512VectorTests(IntFunction<byte[]> fa) {
+    static void getByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -5591,7 +5789,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastByte512VectorTests(IntFunction<byte[]> fa) {
+    static void BroadcastByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5605,7 +5803,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZeroByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ZeroByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5615,7 +5813,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static byte[] sliceUnary(byte[] a, int origin, int idx) {
@@ -5630,7 +5828,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void sliceUnaryByte512VectorTests(IntFunction<byte[]> fa) {
+    static void sliceUnaryByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5641,7 +5839,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector512Tests::sliceUnary);
     }
 
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
@@ -5658,7 +5856,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void sliceBinaryByte512VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void sliceBinaryByteVector512TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5671,7 +5869,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Byte512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ByteVector512Tests::sliceBinary);
     }
 
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
@@ -5688,7 +5886,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void sliceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void sliceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5705,7 +5903,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Byte512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ByteVector512Tests::slice);
     }
 
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
@@ -5722,7 +5920,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void unsliceUnaryByte512VectorTests(IntFunction<byte[]> fa) {
+    static void unsliceUnaryByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5733,7 +5931,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector512Tests::unsliceUnary);
     }
 
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
@@ -5759,7 +5957,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void unsliceBinaryByte512VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void unsliceBinaryByteVector512TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5773,7 +5971,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Byte512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ByteVector512Tests::unsliceBinary);
     }
 
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5813,7 +6011,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void unsliceByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void unsliceByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5830,7 +6028,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Byte512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ByteVector512Tests::unslice);
     }
 
     static byte BITWISE_BLEND(byte a, byte b, byte c) {
@@ -5842,7 +6040,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5857,11 +6055,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5874,11 +6072,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ByteVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5896,11 +6094,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5911,11 +6109,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte512VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector512TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5926,11 +6124,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5941,11 +6139,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte512VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector512TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5956,11 +6154,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5975,11 +6173,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector512TestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5994,11 +6192,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte512VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector512TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6009,11 +6207,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte512VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector512TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6024,11 +6222,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector512TestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6042,7 +6240,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteVector512Tests::BITWISE_BLEND);
     }
 
     static byte NEG(byte a) {
@@ -6054,7 +6252,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NEGByte512VectorTests(IntFunction<byte[]> fa) {
+    static void NEGByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6065,11 +6263,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::NEG);
+        assertArraysEquals(r, a, ByteVector512Tests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void negByte512VectorTests(IntFunction<byte[]> fa) {
+    static void negByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6080,11 +6278,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::neg);
+        assertArraysEquals(r, a, ByteVector512Tests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NEGMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void NEGMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6098,7 +6296,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -6110,7 +6308,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ABSByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ABSByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6121,11 +6319,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::ABS);
+        assertArraysEquals(r, a, ByteVector512Tests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void absByte512VectorTests(IntFunction<byte[]> fa) {
+    static void absByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6136,11 +6334,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::abs);
+        assertArraysEquals(r, a, ByteVector512Tests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ABSMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void ABSMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6154,7 +6352,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::ABS);
     }
 
     static byte NOT(byte a) {
@@ -6166,7 +6364,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NOTByte512VectorTests(IntFunction<byte[]> fa) {
+    static void NOTByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6177,11 +6375,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::NOT);
+        assertArraysEquals(r, a, ByteVector512Tests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void notByte512VectorTests(IntFunction<byte[]> fa) {
+    static void notByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6192,11 +6390,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::not);
+        assertArraysEquals(r, a, ByteVector512Tests::not);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NOTMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void NOTMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6210,7 +6408,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::NOT);
     }
 
     static byte ZOMO(byte a) {
@@ -6218,7 +6416,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZOMOByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ZOMOByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6229,11 +6427,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::ZOMO);
+        assertArraysEquals(r, a, ByteVector512Tests::ZOMO);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ZOMOMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void ZOMOMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6247,7 +6445,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::ZOMO);
     }
 
     static byte BIT_COUNT(byte a) {
@@ -6255,7 +6453,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BIT_COUNTByte512VectorTests(IntFunction<byte[]> fa) {
+    static void BIT_COUNTByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6266,11 +6464,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ByteVector512Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void BIT_COUNTMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6284,7 +6482,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::BIT_COUNT);
     }
 
     static byte TRAILING_ZEROS_COUNT(byte a) {
@@ -6292,7 +6490,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTByte512VectorTests(IntFunction<byte[]> fa) {
+    static void TRAILING_ZEROS_COUNTByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6303,11 +6501,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6321,7 +6519,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     static byte LEADING_ZEROS_COUNT(byte a) {
@@ -6329,7 +6527,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTByte512VectorTests(IntFunction<byte[]> fa) {
+    static void LEADING_ZEROS_COUNTByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6340,11 +6538,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6358,7 +6556,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     static byte REVERSE(byte a) {
@@ -6366,7 +6564,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSEByte512VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSEByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6377,11 +6575,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::REVERSE);
+        assertArraysEquals(r, a, ByteVector512Tests::REVERSE);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSEMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void REVERSEMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6395,7 +6593,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::REVERSE);
     }
 
     static byte REVERSE_BYTES(byte a) {
@@ -6403,7 +6601,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSE_BYTESByte512VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSE_BYTESByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6414,11 +6612,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ByteVector512Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedByte512VectorTests(IntFunction<byte[]> fa,
+    static void REVERSE_BYTESMaskedByteVector512Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6432,7 +6630,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ByteVector512Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6440,7 +6638,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandByteVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6453,7 +6651,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::band);
+        assertArraysEquals(r, a, b, ByteVector512Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6461,7 +6659,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorByteVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6474,7 +6672,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::bor);
+        assertArraysEquals(r, a, b, ByteVector512Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6482,7 +6680,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorByteVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6495,7 +6693,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::bxor);
+        assertArraysEquals(r, a, b, ByteVector512Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6503,7 +6701,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotByteVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6516,7 +6714,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ByteVector512Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6524,7 +6722,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqByteVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6537,7 +6735,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte512VectorTests::beq);
+        assertArraysEquals(r, a, b, ByteVector512Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6545,7 +6743,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotByte512VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotByteVector512Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6556,7 +6754,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte512VectorTests::unot);
+        assertArraysEquals(r, a, ByteVector512Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6565,15 +6763,15 @@ public class Byte512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte512VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongByteVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6587,7 +6785,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte512VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector512TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6597,13 +6795,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte512VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector512TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6613,13 +6811,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toIntArrayByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toIntArrayByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6630,7 +6828,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toLongArrayByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toLongArrayByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6641,7 +6839,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toDoubleArrayByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toDoubleArrayByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6652,7 +6850,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toStringByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toStringByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6665,7 +6863,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void hashCodeByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void hashCodeByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6679,7 +6877,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void reinterpretAsBytesByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void reinterpretAsBytesByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6709,7 +6907,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceLongByte512VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceLongByteVector512Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6725,7 +6923,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Byte512VectorTests::ADDReduceLong, Byte512VectorTests::ADDReduceAllLong);
+                ByteVector512Tests::ADDReduceLong, ByteVector512Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(byte[] a, int idx, boolean[] mask) {
@@ -6748,7 +6946,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceLongByte512VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongByteVector512TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6766,11 +6964,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Byte512VectorTests::ADDReduceLongMasked, Byte512VectorTests::ADDReduceAllLongMasked);
+                ByteVector512Tests::ADDReduceLongMasked, ByteVector512Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastLongByte512VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void BroadcastLongByteVector512TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6781,7 +6979,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte512VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector512TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6795,12 +6993,12 @@ public class Byte512VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector512Tests::blend);
     }
 
 
     @Test(dataProvider = "byteUnaryOpSelectFromProvider")
-    static void SelectFromByte512VectorTests(IntFunction<byte[]> fa,
+    static void SelectFromByteVector512Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,byte[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] order = fs.apply(a.length, SPECIES.length());
@@ -6816,7 +7014,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorByte512VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SelectFromTwoVectorByteVector512Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] idx = fc.apply(SPECIES.length());
@@ -6834,7 +7032,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
-    static void SelectFromByte512VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void SelectFromByteVector512TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                            BiFunction<Integer,Integer,byte[]> fs,
                                                            IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6853,7 +7051,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousByte512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousByteVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6864,12 +7062,12 @@ public class Byte512VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringByte512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringByteVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6883,7 +7081,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsByte512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsByteVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6892,12 +7090,12 @@ public class Byte512VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsByte512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsByteVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6907,13 +7105,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeByteVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6935,7 +7133,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountByteVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6946,7 +7144,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte512VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ByteVector512Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6960,7 +7158,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueByteVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6971,7 +7169,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte512VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector512Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6985,7 +7183,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueByteVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6996,11 +7194,11 @@ public class Byte512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte512VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector512Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressByte512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressByteVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7010,7 +7208,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7028,7 +7226,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeByte512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeByteVector512TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7036,13 +7234,13 @@ public class Byte512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongByte512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongByteVector512TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7050,7 +7248,7 @@ public class Byte512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7069,36 +7267,36 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundByte512VectorTestsSmokeTest(int length) {
+    static void loopBoundByteVector512TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongByte512VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongByteVector512TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeByte512VectorTestsSmokeTest() {
+    static void ElementSizeByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Byte.SIZE);
+        assertEquals(elsize, Byte.SIZE);
     }
 
     @Test
-    static void VectorShapeByte512VectorTestsSmokeTest() {
+    static void VectorShapeByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_512_BIT));
     }
 
     @Test
-    static void ShapeWithLanesByte512VectorTestsSmokeTest() {
+    static void ShapeWithLanesByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(byte.class);
@@ -7106,32 +7304,32 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeByte512VectorTestsSmokeTest() {
+    static void ElementTypeByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementType() == byte.class);
     }
 
     @Test
-    static void SpeciesElementSizeByte512VectorTestsSmokeTest() {
+    static void SpeciesElementSizeByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementSize() == Byte.SIZE);
     }
 
     @Test
-    static void VectorTypeByte512VectorTestsSmokeTest() {
+    static void VectorTypeByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesByte512VectorTestsSmokeTest() {
+    static void WithLanesByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(byte.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeByte512VectorTestsSmokeTest() {
+    static void WithShapeByteVector512TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7139,9 +7337,9 @@ public class Byte512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueByte512VectorTestsSmokeTest() {
+    static void MaskAllTrueByteVector512TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteVector64LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector64LoadStoreTests.java
index 870b9f9b8fb..2b9637d28dc 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector64LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Byte64VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ByteVector64LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ByteVector64LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_64;
 
@@ -61,14 +61,29 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -957,11 +972,11 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -972,11 +987,11 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
         }
     }
 
@@ -992,7 +1007,7 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(byte[] r, byte[] a, int[] indexMap) {
@@ -1005,7 +1020,7 @@ public class Byte64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java b/test/jdk/jdk/incubator/vector/ByteVector64Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Byte64VectorTests.java
rename to test/jdk/jdk/incubator/vector/ByteVector64Tests.java
index da2961cd97b..ce671440d2e 100644
--- a/test/jdk/jdk/incubator/vector/Byte64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVector64Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Byte64VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ByteVector64Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Byte64VectorTests extends AbstractVectorTest {
+public class ByteVector64Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_64;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final byte CONST_SHIFT = Byte.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final byte ADD_IDENTITY = (byte)0;
+    private static final byte AND_IDENTITY = (byte)-1;
+    private static final byte FIRST_NONZERO_IDENTITY = (byte)0;
+    private static final byte MAX_IDENTITY = Byte.MIN_VALUE;
+    private static final byte MIN_IDENTITY = Byte.MAX_VALUE;
+    private static final byte MUL_IDENTITY = (byte)1;
+    private static final byte OR_IDENTITY = (byte)0;
+    private static final byte SUADD_IDENTITY = (byte)0;
+    private static final byte UMAX_IDENTITY = (byte)0;   // Minimum unsigned value
+    private static final byte UMIN_IDENTITY = (byte)-1;  // Maximum unsigned value
+    private static final byte XOR_IDENTITY = (byte)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
     static void assertArraysStrictlyEquals(byte[] r, byte[] a) {
@@ -84,10 +139,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Byte64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (byte)0);
+                    assertEquals(r[i + k], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Byte64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (byte)0);
+                        assertEquals(r[i + j], (byte)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Byte64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Byte64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Byte64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1013,10 +1068,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1024,10 +1079,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1035,10 +1090,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1574,7 +1629,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ByteVector a = io.add((byte)1); //[1,2]
         ByteVector b = a.neg();  //[-1,-2]
         byte[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1589,19 +1644,19 @@ public class Byte64VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Byte> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Byte> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ByteVector uab0 = zab0.rearrange(unz0,zab1);
         ByteVector uab1 = zab0.rearrange(unz1,zab1);
         byte[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1616,7 +1671,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1650,7 +1705,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1663,7 +1718,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::ADD);
+        assertArraysEquals(r, a, b, ByteVector64Tests::ADD);
     }
 
     static byte add(byte a, byte b) {
@@ -1671,7 +1726,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1682,11 +1737,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::add);
+        assertArraysEquals(r, a, b, ByteVector64Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1702,11 +1757,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1720,7 +1775,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::add);
     }
 
     static byte SUB(byte a, byte b) {
@@ -1728,7 +1783,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void SUBByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUBByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1741,7 +1796,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::SUB);
+        assertArraysEquals(r, a, b, ByteVector64Tests::SUB);
     }
 
     static byte sub(byte a, byte b) {
@@ -1749,7 +1804,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1760,11 +1815,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::sub);
+        assertArraysEquals(r, a, b, ByteVector64Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void SUBByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUBByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1780,11 +1835,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1798,7 +1853,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::sub);
     }
 
     static byte MUL(byte a, byte b) {
@@ -1806,7 +1861,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MULByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MULByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1819,7 +1874,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::MUL);
+        assertArraysEquals(r, a, b, ByteVector64Tests::MUL);
     }
 
     static byte mul(byte a, byte b) {
@@ -1827,7 +1882,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1838,11 +1893,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::mul);
+        assertArraysEquals(r, a, b, ByteVector64Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void MULByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void MULByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1858,11 +1913,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1876,7 +1931,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::mul);
     }
 
     static byte DIV(byte a, byte b) {
@@ -1884,7 +1939,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void DIVByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void DIVByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1899,7 +1954,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::DIV);
+        assertArraysEquals(r, a, b, ByteVector64Tests::DIV);
     }
 
     static byte div(byte a, byte b) {
@@ -1907,7 +1962,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1922,11 +1977,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::div);
+        assertArraysEquals(r, a, b, ByteVector64Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void DIVByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void DIVByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1944,11 +1999,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1966,7 +2021,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1974,7 +2029,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void FIRST_NONZEROByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void FIRST_NONZEROByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1987,11 +2042,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ByteVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void FIRST_NONZEROByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void FIRST_NONZEROByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2007,7 +2062,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -2015,7 +2070,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2028,7 +2083,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::AND);
+        assertArraysEquals(r, a, b, ByteVector64Tests::AND);
     }
 
     static byte and(byte a, byte b) {
@@ -2036,7 +2091,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2047,11 +2102,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::and);
+        assertArraysEquals(r, a, b, ByteVector64Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2067,7 +2122,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::AND);
     }
 
     static byte AND_NOT(byte a, byte b) {
@@ -2075,7 +2130,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void AND_NOTByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void AND_NOTByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2088,11 +2143,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ByteVector64Tests::AND_NOT);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void AND_NOTByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void AND_NOTByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2108,7 +2163,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::AND_NOT);
     }
 
     static byte OR(byte a, byte b) {
@@ -2116,7 +2171,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2129,7 +2184,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::OR);
+        assertArraysEquals(r, a, b, ByteVector64Tests::OR);
     }
 
     static byte or(byte a, byte b) {
@@ -2137,7 +2192,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2148,11 +2203,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::or);
+        assertArraysEquals(r, a, b, ByteVector64Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2168,7 +2223,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::OR);
     }
 
     static byte XOR(byte a, byte b) {
@@ -2176,7 +2231,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void XORByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void XORByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2189,11 +2244,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::XOR);
+        assertArraysEquals(r, a, b, ByteVector64Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void XORByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void XORByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2209,11 +2264,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2223,11 +2278,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2240,11 +2295,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector64Tests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2254,11 +2309,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2271,11 +2326,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector64Tests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2285,11 +2340,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2302,11 +2357,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector64Tests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2318,11 +2373,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2392,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector64Tests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2406,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2365,11 +2420,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2382,11 +2437,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector64Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2396,11 +2451,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2410,11 +2465,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2427,11 +2482,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Byte64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVector64Tests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVector64TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2441,11 +2496,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector64Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByte64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2458,11 +2513,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector64Tests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVector64TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2472,11 +2527,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Byte64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVector64Tests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByte64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2489,7 +2544,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector64Tests::ADD);
     }
 
     static byte LSHL(byte a, byte b) {
@@ -2497,7 +2552,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2510,11 +2565,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ByteVector64Tests::LSHL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2530,7 +2585,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::LSHL);
     }
 
     static byte ASHR(byte a, byte b) {
@@ -2538,7 +2593,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2551,11 +2606,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ByteVector64Tests::ASHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2571,7 +2626,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::ASHR);
     }
 
     static byte LSHR(byte a, byte b) {
@@ -2579,7 +2634,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2592,11 +2647,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ByteVector64Tests::LSHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2612,7 +2667,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::LSHR);
     }
 
     static byte LSHL_unary(byte a, byte b) {
@@ -2620,7 +2675,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByte64VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVector64TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2632,11 +2687,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector64Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByte64VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVector64TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2651,7 +2706,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector64Tests::LSHL_unary);
     }
 
     static byte LSHR_unary(byte a, byte b) {
@@ -2659,7 +2714,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByte64VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVector64TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2671,11 +2726,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector64Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByte64VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVector64TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2690,7 +2745,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector64Tests::LSHR_unary);
     }
 
     static byte ASHR_unary(byte a, byte b) {
@@ -2698,7 +2753,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByte64VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVector64TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2710,11 +2765,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector64Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByte64VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVector64TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2729,7 +2784,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector64Tests::ASHR_unary);
     }
 
     static byte ROR(byte a, byte b) {
@@ -2737,7 +2792,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2750,11 +2805,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::ROR);
+        assertArraysEquals(r, a, b, ByteVector64Tests::ROR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2770,7 +2825,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::ROR);
     }
 
     static byte ROL(byte a, byte b) {
@@ -2778,7 +2833,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2791,11 +2846,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::ROL);
+        assertArraysEquals(r, a, b, ByteVector64Tests::ROL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2811,7 +2866,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::ROL);
     }
 
     static byte ROR_unary(byte a, byte b) {
@@ -2819,7 +2874,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByte64VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVector64TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2831,11 +2886,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector64Tests::ROR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByte64VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVector64TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2850,7 +2905,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector64Tests::ROR_unary);
     }
 
     static byte ROL_unary(byte a, byte b) {
@@ -2858,7 +2913,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByte64VectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVector64TestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2870,11 +2925,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Byte64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVector64Tests::ROL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByte64VectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVector64TestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2889,14 +2944,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Byte64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVector64Tests::ROL_unary);
     }
     static byte LSHR_binary_const(byte a) {
         return (byte)(((a & 0xFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHRByte64VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHRByteVector64TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2907,11 +2962,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector64Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHRByte64VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHRByteVector64TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2925,7 +2980,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector64Tests::LSHR_binary_const);
     }
 
     static byte LSHL_binary_const(byte a) {
@@ -2933,7 +2988,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHLByte64VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHLByteVector64TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2944,11 +2999,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector64Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHLByte64VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHLByteVector64TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2962,7 +3017,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector64Tests::LSHL_binary_const);
     }
 
     static byte ASHR_binary_const(byte a) {
@@ -2970,7 +3025,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ASHRByte64VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ASHRByteVector64TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2981,11 +3036,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector64Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ASHRByte64VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ASHRByteVector64TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2999,7 +3054,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector64Tests::ASHR_binary_const);
     }
 
     static byte ROR_binary_const(byte a) {
@@ -3007,7 +3062,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void RORByte64VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void RORByteVector64TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3018,11 +3073,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ByteVector64Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void RORByte64VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void RORByteVector64TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3036,7 +3091,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector64Tests::ROR_binary_const);
     }
 
     static byte ROL_binary_const(byte a) {
@@ -3044,7 +3099,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ROLByte64VectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ROLByteVector64TestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3055,11 +3110,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Byte64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ByteVector64Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ROLByte64VectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ROLByteVector64TestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3073,14 +3128,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Byte64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVector64Tests::ROL_binary_const);
     }
 
 
     static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MINByteVector64TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3091,13 +3146,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, ByteVector64Tests::MIN);
     }
 
     static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void minByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void minByteVector64TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3108,13 +3163,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::min);
+        assertArraysEquals(r, a, (byte)10, ByteVector64Tests::min);
     }
 
     static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINByte64VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINByteVector64TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3127,13 +3182,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte64VectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector64Tests::MIN);
     }
 
     static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MAXByteVector64TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3144,13 +3199,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, ByteVector64Tests::MAX);
     }
 
     static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void maxByte64VectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void maxByteVector64TestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3161,13 +3216,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, Byte64VectorTests::max);
+        assertArraysEquals(r, a, (byte)10, ByteVector64Tests::max);
     }
 
     static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXByte64VectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXByteVector64TestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3180,7 +3235,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, Byte64VectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVector64Tests::MAX);
     }
 
     static byte MIN(byte a, byte b) {
@@ -3188,7 +3243,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3201,7 +3256,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::MIN);
+        assertArraysEquals(r, a, b, ByteVector64Tests::MIN);
     }
 
     static byte min(byte a, byte b) {
@@ -3209,7 +3264,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3220,7 +3275,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::min);
+        assertArraysEquals(r, a, b, ByteVector64Tests::min);
     }
 
     static byte MAX(byte a, byte b) {
@@ -3228,7 +3283,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3241,7 +3296,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::MAX);
+        assertArraysEquals(r, a, b, ByteVector64Tests::MAX);
     }
 
     static byte max(byte a, byte b) {
@@ -3249,7 +3304,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3260,7 +3315,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::max);
+        assertArraysEquals(r, a, b, ByteVector64Tests::max);
     }
 
     static byte UMIN(byte a, byte b) {
@@ -3268,7 +3323,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMINByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMINByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3281,11 +3336,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ByteVector64Tests::UMIN);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMINByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMINByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3301,7 +3356,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::UMIN);
     }
 
     static byte UMAX(byte a, byte b) {
@@ -3309,7 +3364,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMAXByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMAXByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3322,11 +3377,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ByteVector64Tests::UMAX);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMAXByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMAXByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3342,7 +3397,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::UMAX);
     }
 
     static byte SADD(byte a, byte b) {
@@ -3350,7 +3405,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SADDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SADDByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3363,11 +3418,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::SADD);
+        assertArraysEquals(r, a, b, ByteVector64Tests::SADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SADDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SADDByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3383,7 +3438,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::SADD);
     }
 
     static byte SSUB(byte a, byte b) {
@@ -3391,7 +3446,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SSUBByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SSUBByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3404,11 +3459,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ByteVector64Tests::SSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SSUBByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SSUBByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3424,7 +3479,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::SSUB);
     }
 
     static byte SUADD(byte a, byte b) {
@@ -3432,7 +3487,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUADDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUADDByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3445,11 +3500,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ByteVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUADDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3465,7 +3520,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::SUADD);
     }
 
     static byte SUSUB(byte a, byte b) {
@@ -3473,7 +3528,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUSUBByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUSUBByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3486,11 +3541,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ByteVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUSUBByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUSUBByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3506,11 +3561,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3520,11 +3575,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3534,11 +3589,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3548,11 +3603,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3562,10 +3617,10 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Byte64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ByteVector64Tests::max);
     }
     @Test(dataProvider = "byteSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SUADDAssocByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -3582,11 +3637,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Byte64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ByteVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDAssocByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                      IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3607,11 +3662,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Byte64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ByteVector64Tests::SUADD);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3620,7 +3675,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAll(byte[] a) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3629,32 +3684,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ANDReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ANDReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                byte v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::ANDReduce, Byte64VectorTests::ANDReduceAll);
+                ByteVector64Tests::ANDReduce, ByteVector64Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = AND_IDENTITY;
+
+        assertEquals((byte) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id & x), x);
+                assertEquals((byte) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static byte ANDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3664,7 +3737,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3673,34 +3746,29 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ANDReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                byte v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::ANDReduceMasked, Byte64VectorTests::ANDReduceAllMasked);
+                ByteVector64Tests::ANDReduceMasked, ByteVector64Tests::ANDReduceAllMasked);
     }
 
     static byte ORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3709,7 +3777,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3718,32 +3786,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ORReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ORReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                byte v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::ORReduce, Byte64VectorTests::ORReduceAll);
+                ByteVector64Tests::ORReduce, ByteVector64Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = OR_IDENTITY;
+
+        assertEquals((byte) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id | x), x);
+                assertEquals((byte) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static byte ORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3753,7 +3839,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3762,7 +3848,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ORReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3770,26 +3856,21 @@ public class Byte64VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                byte v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::ORReduceMasked, Byte64VectorTests::ORReduceAllMasked);
+                ByteVector64Tests::ORReduceMasked, ByteVector64Tests::ORReduceAllMasked);
     }
 
     static byte XORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3798,7 +3879,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3807,32 +3888,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void XORReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void XORReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                byte v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::XORReduce, Byte64VectorTests::XORReduceAll);
+                ByteVector64Tests::XORReduce, ByteVector64Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = XOR_IDENTITY;
+
+        assertEquals((byte) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id ^ x), x);
+                assertEquals((byte) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static byte XORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3842,7 +3941,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3851,7 +3950,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void XORReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3859,26 +3958,21 @@ public class Byte64VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                byte v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::XORReduceMasked, Byte64VectorTests::XORReduceAllMasked);
+                ByteVector64Tests::XORReduceMasked, ByteVector64Tests::XORReduceAllMasked);
     }
 
     static byte ADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3887,7 +3981,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3896,32 +3990,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                byte v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::ADDReduce, Byte64VectorTests::ADDReduceAll);
+                ByteVector64Tests::ADDReduce, ByteVector64Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = ADD_IDENTITY;
+
+        assertEquals((byte) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id + x), x);
+                assertEquals((byte) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3931,7 +4043,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3940,7 +4052,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3948,26 +4060,21 @@ public class Byte64VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                byte v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::ADDReduceMasked, Byte64VectorTests::ADDReduceAllMasked);
+                ByteVector64Tests::ADDReduceMasked, ByteVector64Tests::ADDReduceAllMasked);
     }
 
     static byte MULReduce(byte[] a, int idx) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3976,7 +4083,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAll(byte[] a) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3985,32 +4092,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MULReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void MULReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                byte v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::MULReduce, Byte64VectorTests::MULReduceAll);
+                ByteVector64Tests::MULReduce, ByteVector64Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MUL_IDENTITY;
+
+        assertEquals((byte) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id * x), x);
+                assertEquals((byte) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4020,7 +4145,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4029,34 +4154,29 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MULReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                byte v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::MULReduceMasked, Byte64VectorTests::MULReduceAllMasked);
+                ByteVector64Tests::MULReduceMasked, ByteVector64Tests::MULReduceAllMasked);
     }
 
     static byte MINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.min(res, a[i]);
         }
@@ -4065,7 +4185,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduce(a, i));
         }
@@ -4074,32 +4194,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void MINReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                byte v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::MINReduce, Byte64VectorTests::MINReduceAll);
+                ByteVector64Tests::MINReduce, ByteVector64Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MIN_IDENTITY;
+
+        assertEquals((byte) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.min(id, x), x);
+                assertEquals((byte) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.min(res, a[i]);
@@ -4109,7 +4247,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4118,34 +4256,29 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::MINReduceMasked, Byte64VectorTests::MINReduceAllMasked);
+                ByteVector64Tests::MINReduceMasked, ByteVector64Tests::MINReduceAllMasked);
     }
 
     static byte MAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.max(res, a[i]);
         }
@@ -4154,7 +4287,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduce(a, i));
         }
@@ -4163,32 +4296,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void MAXReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                byte v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::MAXReduce, Byte64VectorTests::MAXReduceAll);
+                ByteVector64Tests::MAXReduce, ByteVector64Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MAX_IDENTITY;
+
+        assertEquals((byte) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.max(id, x), x);
+                assertEquals((byte) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.max(res, a[i]);
@@ -4198,7 +4349,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4207,34 +4358,29 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::MAXReduceMasked, Byte64VectorTests::MAXReduceAllMasked);
+                ByteVector64Tests::MAXReduceMasked, ByteVector64Tests::MAXReduceAllMasked);
     }
 
     static byte UMINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4243,7 +4389,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4252,32 +4398,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMINReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void UMINReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                byte v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::UMINReduce, Byte64VectorTests::UMINReduceAll);
+                ByteVector64Tests::UMINReduce, ByteVector64Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMIN_IDENTITY;
+
+        assertEquals((byte) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.minUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static byte UMINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.minUnsigned(res, a[i]);
@@ -4287,7 +4451,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4296,34 +4460,29 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMINReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::UMINReduceMasked, Byte64VectorTests::UMINReduceAllMasked);
+                ByteVector64Tests::UMINReduceMasked, ByteVector64Tests::UMINReduceAllMasked);
     }
 
     static byte UMAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4332,7 +4491,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4341,32 +4500,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMAXReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void UMAXReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                byte v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::UMAXReduce, Byte64VectorTests::UMAXReduceAll);
+                ByteVector64Tests::UMAXReduce, ByteVector64Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMAX_IDENTITY;
+
+        assertEquals((byte) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static byte UMAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.maxUnsigned(res, a[i]);
@@ -4376,7 +4553,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4385,34 +4562,29 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMAXReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::UMAXReduceMasked, Byte64VectorTests::UMAXReduceAllMasked);
+                ByteVector64Tests::UMAXReduceMasked, ByteVector64Tests::UMAXReduceAllMasked);
     }
 
     static byte FIRST_NONZEROReduce(byte[] a, int idx) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4421,7 +4593,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAll(byte[] a) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4430,32 +4602,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void FIRST_NONZEROReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void FIRST_NONZEROReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::FIRST_NONZEROReduce, Byte64VectorTests::FIRST_NONZEROReduceAll);
+                ByteVector64Tests::FIRST_NONZEROReduce, ByteVector64Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static byte FIRST_NONZEROReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4465,7 +4655,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4474,30 +4664,25 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::FIRST_NONZEROReduceMasked, Byte64VectorTests::FIRST_NONZEROReduceAllMasked);
+                ByteVector64Tests::FIRST_NONZEROReduceMasked, ByteVector64Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4510,7 +4695,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueByte64VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueByteVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4521,7 +4706,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector64Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4534,7 +4719,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueByte64VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueByteVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4545,11 +4730,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Byte64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVector64Tests::allTrue);
     }
 
     static byte SUADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4558,7 +4743,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4567,32 +4752,50 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingUnaryOpProvider")
-    static void SUADDReduceByte64VectorTests(IntFunction<byte[]> fa) {
+    static void SUADDReduceByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                byte v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Byte64VectorTests::SUADDReduce, Byte64VectorTests::SUADDReduceAll);
+                ByteVector64Tests::SUADDReduce, ByteVector64Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = SUADD_IDENTITY;
+
+        assertEquals((byte) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static byte SUADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4602,7 +4805,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4610,7 +4813,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "byteSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4618,26 +4821,21 @@ public class Byte64VectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                byte v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::SUADDReduceMasked, Byte64VectorTests::SUADDReduceAllMasked);
+                ByteVector64Tests::SUADDReduceMasked, ByteVector64Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void withByte64VectorTests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
+    static void withByteVector64Tests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -4660,7 +4858,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_DEFAULTByte64VectorTests(IntFunction<byte[]> fa) {
+    static void IS_DEFAULTByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4670,14 +4868,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4690,7 +4888,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4701,7 +4899,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_NEGATIVEByte64VectorTests(IntFunction<byte[]> fa) {
+    static void IS_NEGATIVEByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4711,14 +4909,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4731,14 +4929,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4750,14 +4948,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4769,14 +4967,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LTByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4792,14 +4990,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GTByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GTByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4811,14 +5009,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GTByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GTByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4834,14 +5032,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4853,14 +5051,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4872,14 +5070,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void EQByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4895,14 +5093,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void NEByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void NEByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4914,14 +5112,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void NEByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void NEByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4937,14 +5135,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LEByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LEByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4956,14 +5154,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LEByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LEByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4979,14 +5177,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GEByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GEByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4998,14 +5196,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GEByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GEByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5021,14 +5219,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULTByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULTByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5040,14 +5238,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULTByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULTByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5063,14 +5261,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGTByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGTByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5082,14 +5280,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGTByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGTByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5105,14 +5303,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULEByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULEByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5124,14 +5322,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULEByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULEByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5147,14 +5345,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGEByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGEByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5166,14 +5364,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGEByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGEByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5189,14 +5387,14 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5206,13 +5404,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5226,13 +5424,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVector64TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5242,13 +5440,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByte64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5262,13 +5460,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5278,13 +5476,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5298,13 +5496,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVector64TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5314,13 +5512,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByte64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5334,7 +5532,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
             }
         }
     }
@@ -5344,7 +5542,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5360,11 +5558,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Byte64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ByteVector64Tests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
-    static void RearrangeByte64VectorTests(IntFunction<byte[]> fa,
+    static void RearrangeByteVector64Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5381,7 +5579,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
-    static void RearrangeByte64VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void RearrangeByteVector64TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -5399,7 +5597,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void compressByte64VectorTests(IntFunction<byte[]> fa,
+    static void compressByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5417,7 +5615,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void expandByte64VectorTests(IntFunction<byte[]> fa,
+    static void expandByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5435,7 +5633,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void getByte64VectorTests(IntFunction<byte[]> fa) {
+    static void getByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -5591,7 +5789,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastByte64VectorTests(IntFunction<byte[]> fa) {
+    static void BroadcastByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5605,7 +5803,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZeroByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ZeroByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5615,7 +5813,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static byte[] sliceUnary(byte[] a, int origin, int idx) {
@@ -5630,7 +5828,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void sliceUnaryByte64VectorTests(IntFunction<byte[]> fa) {
+    static void sliceUnaryByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5641,7 +5839,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector64Tests::sliceUnary);
     }
 
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
@@ -5658,7 +5856,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void sliceBinaryByte64VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void sliceBinaryByteVector64TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5671,7 +5869,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Byte64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ByteVector64Tests::sliceBinary);
     }
 
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
@@ -5688,7 +5886,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void sliceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void sliceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5705,7 +5903,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Byte64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ByteVector64Tests::slice);
     }
 
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
@@ -5722,7 +5920,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void unsliceUnaryByte64VectorTests(IntFunction<byte[]> fa) {
+    static void unsliceUnaryByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5733,7 +5931,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Byte64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ByteVector64Tests::unsliceUnary);
     }
 
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
@@ -5759,7 +5957,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void unsliceBinaryByte64VectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void unsliceBinaryByteVector64TestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5773,7 +5971,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Byte64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ByteVector64Tests::unsliceBinary);
     }
 
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5813,7 +6011,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void unsliceByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void unsliceByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5830,7 +6028,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Byte64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ByteVector64Tests::unslice);
     }
 
     static byte BITWISE_BLEND(byte a, byte b, byte c) {
@@ -5842,7 +6040,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5857,11 +6055,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5874,11 +6072,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ByteVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5896,11 +6094,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5911,11 +6109,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte64VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector64TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5926,11 +6124,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5941,11 +6139,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte64VectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector64TestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5956,11 +6154,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5975,11 +6173,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector64TestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5994,11 +6192,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByte64VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVector64TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6009,11 +6207,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByte64VectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVector64TestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6024,11 +6222,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Byte64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByte64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVector64TestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6042,7 +6240,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Byte64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteVector64Tests::BITWISE_BLEND);
     }
 
     static byte NEG(byte a) {
@@ -6054,7 +6252,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NEGByte64VectorTests(IntFunction<byte[]> fa) {
+    static void NEGByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6065,11 +6263,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::NEG);
+        assertArraysEquals(r, a, ByteVector64Tests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void negByte64VectorTests(IntFunction<byte[]> fa) {
+    static void negByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6080,11 +6278,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::neg);
+        assertArraysEquals(r, a, ByteVector64Tests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NEGMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void NEGMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6098,7 +6296,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -6110,7 +6308,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ABSByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ABSByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6121,11 +6319,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::ABS);
+        assertArraysEquals(r, a, ByteVector64Tests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void absByte64VectorTests(IntFunction<byte[]> fa) {
+    static void absByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6136,11 +6334,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::abs);
+        assertArraysEquals(r, a, ByteVector64Tests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ABSMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void ABSMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6154,7 +6352,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::ABS);
     }
 
     static byte NOT(byte a) {
@@ -6166,7 +6364,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NOTByte64VectorTests(IntFunction<byte[]> fa) {
+    static void NOTByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6177,11 +6375,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::NOT);
+        assertArraysEquals(r, a, ByteVector64Tests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void notByte64VectorTests(IntFunction<byte[]> fa) {
+    static void notByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6192,11 +6390,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::not);
+        assertArraysEquals(r, a, ByteVector64Tests::not);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NOTMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void NOTMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6210,7 +6408,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::NOT);
     }
 
     static byte ZOMO(byte a) {
@@ -6218,7 +6416,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZOMOByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ZOMOByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6229,11 +6427,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::ZOMO);
+        assertArraysEquals(r, a, ByteVector64Tests::ZOMO);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ZOMOMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void ZOMOMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6247,7 +6445,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::ZOMO);
     }
 
     static byte BIT_COUNT(byte a) {
@@ -6255,7 +6453,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BIT_COUNTByte64VectorTests(IntFunction<byte[]> fa) {
+    static void BIT_COUNTByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6266,11 +6464,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ByteVector64Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void BIT_COUNTMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6284,7 +6482,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::BIT_COUNT);
     }
 
     static byte TRAILING_ZEROS_COUNT(byte a) {
@@ -6292,7 +6490,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTByte64VectorTests(IntFunction<byte[]> fa) {
+    static void TRAILING_ZEROS_COUNTByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6303,11 +6501,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6321,7 +6519,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     static byte LEADING_ZEROS_COUNT(byte a) {
@@ -6329,7 +6527,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTByte64VectorTests(IntFunction<byte[]> fa) {
+    static void LEADING_ZEROS_COUNTByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6340,11 +6538,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6358,7 +6556,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     static byte REVERSE(byte a) {
@@ -6366,7 +6564,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSEByte64VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSEByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6377,11 +6575,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::REVERSE);
+        assertArraysEquals(r, a, ByteVector64Tests::REVERSE);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSEMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void REVERSEMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6395,7 +6593,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::REVERSE);
     }
 
     static byte REVERSE_BYTES(byte a) {
@@ -6403,7 +6601,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSE_BYTESByte64VectorTests(IntFunction<byte[]> fa) {
+    static void REVERSE_BYTESByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6414,11 +6612,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ByteVector64Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedByte64VectorTests(IntFunction<byte[]> fa,
+    static void REVERSE_BYTESMaskedByteVector64Tests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6432,7 +6630,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Byte64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ByteVector64Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6440,7 +6638,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandByteVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6453,7 +6651,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::band);
+        assertArraysEquals(r, a, b, ByteVector64Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6461,7 +6659,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorByteVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6474,7 +6672,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::bor);
+        assertArraysEquals(r, a, b, ByteVector64Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6482,7 +6680,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorByteVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6495,7 +6693,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::bxor);
+        assertArraysEquals(r, a, b, ByteVector64Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6503,7 +6701,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotByteVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6516,7 +6714,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ByteVector64Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6524,7 +6722,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqByteVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6537,7 +6735,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Byte64VectorTests::beq);
+        assertArraysEquals(r, a, b, ByteVector64Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6545,7 +6743,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotByte64VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotByteVector64Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6556,7 +6754,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Byte64VectorTests::unot);
+        assertArraysEquals(r, a, ByteVector64Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6565,15 +6763,15 @@ public class Byte64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByte64VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongByteVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6587,7 +6785,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByte64VectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVector64TestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6597,13 +6795,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByte64VectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVector64TestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6613,13 +6811,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toIntArrayByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toIntArrayByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6630,7 +6828,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toLongArrayByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toLongArrayByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6641,7 +6839,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toDoubleArrayByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toDoubleArrayByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6652,7 +6850,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toStringByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toStringByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6665,7 +6863,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void hashCodeByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void hashCodeByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6679,7 +6877,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void reinterpretAsBytesByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void reinterpretAsBytesByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6709,7 +6907,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceLongByte64VectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceLongByteVector64Tests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6725,7 +6923,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Byte64VectorTests::ADDReduceLong, Byte64VectorTests::ADDReduceAllLong);
+                ByteVector64Tests::ADDReduceLong, ByteVector64Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(byte[] a, int idx, boolean[] mask) {
@@ -6748,7 +6946,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceLongByte64VectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongByteVector64TestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6766,11 +6964,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Byte64VectorTests::ADDReduceLongMasked, Byte64VectorTests::ADDReduceAllLongMasked);
+                ByteVector64Tests::ADDReduceLongMasked, ByteVector64Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastLongByte64VectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void BroadcastLongByteVector64TestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6781,7 +6979,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByte64VectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVector64TestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6795,12 +6993,12 @@ public class Byte64VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Byte64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVector64Tests::blend);
     }
 
 
     @Test(dataProvider = "byteUnaryOpSelectFromProvider")
-    static void SelectFromByte64VectorTests(IntFunction<byte[]> fa,
+    static void SelectFromByteVector64Tests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,byte[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] order = fs.apply(a.length, SPECIES.length());
@@ -6816,7 +7014,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorByte64VectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SelectFromTwoVectorByteVector64Tests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] idx = fc.apply(SPECIES.length());
@@ -6834,7 +7032,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
-    static void SelectFromByte64VectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void SelectFromByteVector64TestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                            BiFunction<Integer,Integer,byte[]> fs,
                                                            IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6853,7 +7051,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousByte64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousByteVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6864,12 +7062,12 @@ public class Byte64VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringByte64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringByteVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6883,7 +7081,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsByte64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsByteVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6892,12 +7090,12 @@ public class Byte64VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsByte64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsByteVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6907,13 +7105,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeByteVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6935,7 +7133,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountByteVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6946,7 +7144,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte64VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ByteVector64Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6960,7 +7158,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueByteVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6971,7 +7169,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte64VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector64Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6985,7 +7183,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueByteVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6996,11 +7194,11 @@ public class Byte64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Byte64VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVector64Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressByte64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressByteVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7010,7 +7208,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7028,7 +7226,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeByte64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeByteVector64TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7036,13 +7234,13 @@ public class Byte64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongByte64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongByteVector64TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7050,7 +7248,7 @@ public class Byte64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7069,36 +7267,36 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundByte64VectorTestsSmokeTest(int length) {
+    static void loopBoundByteVector64TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongByte64VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongByteVector64TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeByte64VectorTestsSmokeTest() {
+    static void ElementSizeByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Byte.SIZE);
+        assertEquals(elsize, Byte.SIZE);
     }
 
     @Test
-    static void VectorShapeByte64VectorTestsSmokeTest() {
+    static void VectorShapeByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_64_BIT));
     }
 
     @Test
-    static void ShapeWithLanesByte64VectorTestsSmokeTest() {
+    static void ShapeWithLanesByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(byte.class);
@@ -7106,32 +7304,32 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeByte64VectorTestsSmokeTest() {
+    static void ElementTypeByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementType() == byte.class);
     }
 
     @Test
-    static void SpeciesElementSizeByte64VectorTestsSmokeTest() {
+    static void SpeciesElementSizeByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementSize() == Byte.SIZE);
     }
 
     @Test
-    static void VectorTypeByte64VectorTestsSmokeTest() {
+    static void VectorTypeByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesByte64VectorTestsSmokeTest() {
+    static void WithLanesByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(byte.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeByte64VectorTestsSmokeTest() {
+    static void WithShapeByteVector64TestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7139,9 +7337,9 @@ public class Byte64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueByte64VectorTestsSmokeTest() {
+    static void MaskAllTrueByteVector64TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ByteVectorMaxLoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ByteVectorMaxLoadStoreTests.java
index bd5afc3f05a..93af9674906 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVectorMaxLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
  * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
- *      -XX:-TieredCompilation ByteMaxVectorLoadStoreTests
+ *      -XX:-TieredCompilation ByteVectorMaxLoadStoreTests
  *
  */
 
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ByteVectorMaxLoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_MAX;
 
@@ -68,14 +68,29 @@ public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
         }
     }
 
@@ -329,7 +344,7 @@ public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "byteProviderForIOOBE")
@@ -964,11 +979,11 @@ public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -979,11 +994,11 @@ public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (byte) 0, "at index #" + j);
         }
     }
 
@@ -999,7 +1014,7 @@ public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(byte[] r, byte[] a, int[] indexMap) {
@@ -1012,7 +1027,7 @@ public class ByteMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
rename to test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java
index a5872219f10..c2d8188c090 100644
--- a/test/jdk/jdk/incubator/vector/ByteMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ByteVectorMaxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ByteMaxVectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ByteVectorMaxTests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,12 +56,55 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class ByteMaxVectorTests extends AbstractVectorTest {
+public class ByteVectorMaxTests extends AbstractVectorTest {
 
     static final VectorSpecies<Byte> SPECIES =
                 ByteVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(byte actual, byte expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte actual, byte expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(byte actual, byte expected, byte delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(byte [] actual, byte [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(byte [] actual, byte [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
 
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
@@ -71,6 +114,19 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
     private static final byte CONST_SHIFT = Byte.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final byte ADD_IDENTITY = (byte)0;
+    private static final byte AND_IDENTITY = (byte)-1;
+    private static final byte FIRST_NONZERO_IDENTITY = (byte)0;
+    private static final byte MAX_IDENTITY = Byte.MIN_VALUE;
+    private static final byte MIN_IDENTITY = Byte.MAX_VALUE;
+    private static final byte MUL_IDENTITY = (byte)1;
+    private static final byte OR_IDENTITY = (byte)0;
+    private static final byte SUADD_IDENTITY = (byte)0;
+    private static final byte UMAX_IDENTITY = (byte)0;   // Minimum unsigned value
+    private static final byte UMIN_IDENTITY = (byte)-1;  // Maximum unsigned value
+    private static final byte XOR_IDENTITY = (byte)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
     static void assertArraysStrictlyEquals(byte[] r, byte[] a) {
@@ -89,10 +145,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +160,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a[i]);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +176,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -139,13 +195,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -161,13 +217,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -183,13 +239,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -205,13 +261,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -223,10 +279,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -238,10 +294,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -250,12 +306,12 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -266,20 +322,20 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (byte)0);
+                    assertEquals(r[i + k], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -291,19 +347,19 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (byte)0);
+                        assertEquals(r[i + j], (byte)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (byte)0, "at index #" + idx);
+                assertEquals(r[idx], (byte)0, "at index #" + idx);
             }
         }
     }
@@ -319,11 +375,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -332,12 +388,12 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -347,17 +403,17 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -367,17 +423,17 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (byte)0);
+                         assertEquals(r[i+j], (byte)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (byte)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -391,10 +447,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -406,10 +462,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -421,10 +477,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -445,18 +501,18 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -471,18 +527,18 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -490,10 +546,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -501,10 +557,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -512,10 +568,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -524,10 +580,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -540,10 +596,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -555,10 +611,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -570,10 +626,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -588,10 +644,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (byte)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -604,11 +660,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -622,11 +678,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -648,11 +704,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -666,11 +722,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -690,10 +746,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -705,10 +761,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -717,10 +773,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -730,10 +786,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -749,11 +805,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -770,11 +826,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -785,11 +841,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -806,11 +862,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -828,13 +884,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +911,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -876,13 +932,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(r, a, i, mask, b, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -903,13 +959,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -923,13 +979,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -944,13 +1000,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -965,13 +1021,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -987,13 +1043,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             byte[] ref = f.apply(a, b, origin, part, mask, i);
             byte[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1006,10 +1062,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1018,10 +1074,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1029,10 +1085,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1040,10 +1096,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1322,7 +1378,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     static final List<BiFunction<Integer,Integer,byte[]>> BYTE_SHUFFLE_GENERATORS = List.of(
             withToStringBi("shuffle[random]", (Integer l, Integer m) -> {
                 byte[] a = new byte[l];
-                int upper = Math.min(Byte.MAX_VALUE + 1, m);
+                int upper = m;
                 for (int i = 0; i < 1; i++) {
                     a[i] = (byte)RAND.nextInt(upper);
                 }
@@ -1579,7 +1635,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ByteVector a = io.add((byte)1); //[1,2]
         ByteVector b = a.neg();  //[-1,-2]
         byte[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1594,19 +1650,19 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Byte> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Byte> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ByteVector uab0 = zab0.rearrange(unz0,zab1);
         ByteVector uab1 = zab0.rearrange(unz1,zab1);
         byte[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ByteVector io = (ByteVector) SPECIES.broadcast(0).addIndex(1);
         ByteVector io2 = (ByteVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1621,7 +1677,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1655,7 +1711,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1668,7 +1724,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::ADD);
     }
 
     static byte add(byte a, byte b) {
@@ -1676,7 +1732,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1687,11 +1743,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::add);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1707,11 +1763,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1725,7 +1781,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::add);
     }
 
     static byte SUB(byte a, byte b) {
@@ -1733,7 +1789,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void SUBByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUBByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1746,7 +1802,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::SUB);
     }
 
     static byte sub(byte a, byte b) {
@@ -1754,7 +1810,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1765,11 +1821,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void SUBByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUBByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1785,11 +1841,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::SUB);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1803,7 +1859,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::sub);
     }
 
     static byte MUL(byte a, byte b) {
@@ -1811,7 +1867,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MULByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MULByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1824,7 +1880,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::MUL);
     }
 
     static byte mul(byte a, byte b) {
@@ -1832,7 +1888,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1843,11 +1899,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void MULByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void MULByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1863,11 +1919,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::MUL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1881,7 +1937,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::mul);
     }
 
     static byte DIV(byte a, byte b) {
@@ -1889,7 +1945,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void DIVByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void DIVByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1904,7 +1960,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::DIV);
     }
 
     static byte div(byte a, byte b) {
@@ -1912,7 +1968,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1927,11 +1983,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::div);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void DIVByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void DIVByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1949,11 +2005,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::DIV);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -1971,7 +2027,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::div);
     }
 
     static byte FIRST_NONZERO(byte a, byte b) {
@@ -1979,7 +2035,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void FIRST_NONZEROByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void FIRST_NONZEROByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -1992,11 +2048,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void FIRST_NONZEROByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void FIRST_NONZEROByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2012,7 +2068,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::FIRST_NONZERO);
     }
 
     static byte AND(byte a, byte b) {
@@ -2020,7 +2076,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2033,7 +2089,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::AND);
     }
 
     static byte and(byte a, byte b) {
@@ -2041,7 +2097,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2052,11 +2108,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::and);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2072,7 +2128,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::AND);
     }
 
     static byte AND_NOT(byte a, byte b) {
@@ -2080,7 +2136,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void AND_NOTByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void AND_NOTByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2093,11 +2149,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::AND_NOT);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void AND_NOTByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void AND_NOTByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2113,7 +2169,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::AND_NOT);
     }
 
     static byte OR(byte a, byte b) {
@@ -2121,7 +2177,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2134,7 +2190,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::OR);
     }
 
     static byte or(byte a, byte b) {
@@ -2142,7 +2198,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2153,11 +2209,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::or);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2173,7 +2229,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::OR);
     }
 
     static byte XOR(byte a, byte b) {
@@ -2181,7 +2237,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void XORByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void XORByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2194,11 +2250,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void XORByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void XORByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2214,11 +2270,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::XOR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void addByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void addByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2228,11 +2284,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void addByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void addByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2245,11 +2301,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVectorMaxTests::add);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void subByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void subByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2259,11 +2315,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void subByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void subByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2276,11 +2332,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void mulByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void mulByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2290,11 +2346,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void mulByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void mulByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2307,11 +2363,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void divByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void divByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2323,11 +2379,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void divByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void divByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2342,11 +2398,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVectorMaxTests::div);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2356,11 +2412,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void orByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void orByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2370,11 +2426,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::or);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2387,11 +2443,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ANDByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ANDByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2401,11 +2457,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void andByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void andByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2415,11 +2471,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::and);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ANDByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ANDByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2432,11 +2488,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ByteMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ByteVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ORByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ORByteVectorMaxTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2446,11 +2502,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, ByteMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ORByteMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ORByteVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2463,11 +2519,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, ByteMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ADDByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ADDByteVectorMaxTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2477,11 +2533,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, ByteMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ByteVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ADDByteMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ADDByteVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2494,7 +2550,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, ByteMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVectorMaxTests::ADD);
     }
 
     static byte LSHL(byte a, byte b) {
@@ -2502,7 +2558,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2515,11 +2571,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::LSHL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2535,7 +2591,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::LSHL);
     }
 
     static byte ASHR(byte a, byte b) {
@@ -2543,7 +2599,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2556,11 +2612,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::ASHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2576,7 +2632,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::ASHR);
     }
 
     static byte LSHR(byte a, byte b) {
@@ -2584,7 +2640,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2597,11 +2653,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::LSHR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2617,7 +2673,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::LSHR);
     }
 
     static byte LSHL_unary(byte a, byte b) {
@@ -2625,7 +2681,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHLByteMaxVectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHLByteVectorMaxTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2637,11 +2693,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVectorMaxTests::LSHL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHLByteMaxVectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHLByteVectorMaxTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2656,7 +2712,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVectorMaxTests::LSHL_unary);
     }
 
     static byte LSHR_unary(byte a, byte b) {
@@ -2664,7 +2720,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void LSHRByteMaxVectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LSHRByteVectorMaxTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2676,11 +2732,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVectorMaxTests::LSHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void LSHRByteMaxVectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LSHRByteVectorMaxTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2695,7 +2751,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVectorMaxTests::LSHR_unary);
     }
 
     static byte ASHR_unary(byte a, byte b) {
@@ -2703,7 +2759,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ASHRByteMaxVectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ASHRByteVectorMaxTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2715,11 +2771,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVectorMaxTests::ASHR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ASHRByteMaxVectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ASHRByteVectorMaxTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2734,7 +2790,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVectorMaxTests::ASHR_unary);
     }
 
     static byte ROR(byte a, byte b) {
@@ -2742,7 +2798,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2755,11 +2811,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::ROR);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2775,7 +2831,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::ROR);
     }
 
     static byte ROL(byte a, byte b) {
@@ -2783,7 +2839,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2796,11 +2852,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::ROL);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2816,7 +2872,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::ROL);
     }
 
     static byte ROR_unary(byte a, byte b) {
@@ -2824,7 +2880,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void RORByteMaxVectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void RORByteVectorMaxTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2836,11 +2892,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ByteVectorMaxTests::ROR_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void RORByteMaxVectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void RORByteVectorMaxTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2855,7 +2911,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVectorMaxTests::ROR_unary);
     }
 
     static byte ROL_unary(byte a, byte b) {
@@ -2863,7 +2919,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void ROLByteMaxVectorTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ROLByteVectorMaxTestsScalarShift(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2875,11 +2931,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ByteMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ByteVectorMaxTests::ROL_unary);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void ROLByteMaxVectorTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ROLByteVectorMaxTestsScalarShiftMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -2894,14 +2950,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ByteMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ByteVectorMaxTests::ROL_unary);
     }
     static byte LSHR_binary_const(byte a) {
         return (byte)(((a & 0xFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHRByteMaxVectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHRByteVectorMaxTestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2912,11 +2968,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ByteMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVectorMaxTests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHRByteMaxVectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHRByteVectorMaxTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2930,7 +2986,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ByteMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVectorMaxTests::LSHR_binary_const);
     }
 
     static byte LSHL_binary_const(byte a) {
@@ -2938,7 +2994,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LSHLByteMaxVectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void LSHLByteVectorMaxTestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2949,11 +3005,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ByteMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ByteVectorMaxTests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LSHLByteMaxVectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void LSHLByteVectorMaxTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -2967,7 +3023,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ByteMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVectorMaxTests::LSHL_binary_const);
     }
 
     static byte ASHR_binary_const(byte a) {
@@ -2975,7 +3031,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ASHRByteMaxVectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ASHRByteVectorMaxTestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -2986,11 +3042,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ByteMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ByteVectorMaxTests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ASHRByteMaxVectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ASHRByteVectorMaxTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3004,7 +3060,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ByteMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVectorMaxTests::ASHR_binary_const);
     }
 
     static byte ROR_binary_const(byte a) {
@@ -3012,7 +3068,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void RORByteMaxVectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void RORByteVectorMaxTestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3023,11 +3079,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ByteMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ByteVectorMaxTests::ROR_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void RORByteMaxVectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void RORByteVectorMaxTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3041,7 +3097,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ByteMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVectorMaxTests::ROR_binary_const);
     }
 
     static byte ROL_binary_const(byte a) {
@@ -3049,7 +3105,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ROLByteMaxVectorTestsScalarShiftConst(IntFunction<byte[]> fa) {
+    static void ROLByteVectorMaxTestsScalarShiftConst(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3060,11 +3116,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ByteMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ByteVectorMaxTests::ROL_binary_const);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ROLByteMaxVectorTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
+    static void ROLByteVectorMaxTestsScalarShiftMaskedConst(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3078,14 +3134,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ByteMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ByteVectorMaxTests::ROL_binary_const);
     }
 
 
     static ByteVector bv_MIN = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MINByteVectorMaxTestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3096,13 +3152,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, ByteVectorMaxTests::MIN);
     }
 
     static ByteVector bv_min = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void minByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void minByteVectorMaxTestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3113,13 +3169,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::min);
+        assertArraysEquals(r, a, (byte)10, ByteVectorMaxTests::min);
     }
 
     static ByteVector bv_MIN_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINByteMaxVectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINByteVectorMaxTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3132,13 +3188,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, ByteMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVectorMaxTests::MIN);
     }
 
     static ByteVector bv_MAX = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void MAXByteVectorMaxTestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3149,13 +3205,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, ByteVectorMaxTests::MAX);
     }
 
     static ByteVector bv_max = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void maxByteMaxVectorTestsWithMemOp(IntFunction<byte[]> fa) {
+    static void maxByteVectorMaxTestsWithMemOp(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -3166,13 +3222,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, ByteMaxVectorTests::max);
+        assertArraysEquals(r, a, (byte)10, ByteVectorMaxTests::max);
     }
 
     static ByteVector bv_MAX_M = ByteVector.broadcast(SPECIES, (byte)10);
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXByteMaxVectorTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXByteVectorMaxTestsMaskedWithMemOp(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3185,7 +3241,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (byte)10, mask, ByteMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (byte)10, mask, ByteVectorMaxTests::MAX);
     }
 
     static byte MIN(byte a, byte b) {
@@ -3193,7 +3249,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3206,7 +3262,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::MIN);
     }
 
     static byte min(byte a, byte b) {
@@ -3214,7 +3270,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3225,7 +3281,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::min);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::min);
     }
 
     static byte MAX(byte a, byte b) {
@@ -3233,7 +3289,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3246,7 +3302,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::MAX);
     }
 
     static byte max(byte a, byte b) {
@@ -3254,7 +3310,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3265,7 +3321,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::max);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::max);
     }
 
     static byte UMIN(byte a, byte b) {
@@ -3273,7 +3329,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMINByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMINByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3286,11 +3342,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::UMIN);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMINByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMINByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3306,7 +3362,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::UMIN);
     }
 
     static byte UMAX(byte a, byte b) {
@@ -3314,7 +3370,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void UMAXByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UMAXByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3327,11 +3383,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::UMAX);
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void UMAXByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UMAXByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3347,7 +3403,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::UMAX);
     }
 
     static byte SADD(byte a, byte b) {
@@ -3355,7 +3411,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SADDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SADDByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3368,11 +3424,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::SADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SADDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SADDByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3388,7 +3444,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::SADD);
     }
 
     static byte SSUB(byte a, byte b) {
@@ -3396,7 +3452,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SSUBByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SSUBByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3409,11 +3465,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::SSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SSUBByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SSUBByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3429,7 +3485,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::SSUB);
     }
 
     static byte SUADD(byte a, byte b) {
@@ -3437,7 +3493,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUADDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUADDByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3450,11 +3506,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUADDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3470,7 +3526,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::SUADD);
     }
 
     static byte SUSUB(byte a, byte b) {
@@ -3478,7 +3534,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpProvider")
-    static void SUSUBByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void SUSUBByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3491,11 +3547,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpMaskProvider")
-    static void SUSUBByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUSUBByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3511,11 +3567,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MINByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MINByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3525,11 +3581,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::MIN);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void minByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void minByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3539,11 +3595,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::min);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void MAXByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void MAXByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3553,11 +3609,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::MAX);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void maxByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void maxByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -3567,10 +3623,10 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ByteMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ByteVectorMaxTests::max);
     }
     @Test(dataProvider = "byteSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SUADDAssocByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -3587,11 +3643,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, ByteMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ByteVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "byteSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void SUADDAssocByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                      IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -3612,11 +3668,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ByteMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ByteVectorMaxTests::SUADD);
     }
 
     static byte ANDReduce(byte[] a, int idx) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3625,7 +3681,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAll(byte[] a) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3634,32 +3690,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ANDReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ANDReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                byte v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::ANDReduce, ByteMaxVectorTests::ANDReduceAll);
+                ByteVectorMaxTests::ANDReduce, ByteVectorMaxTests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = AND_IDENTITY;
+
+        assertEquals((byte) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id & x), x);
+                assertEquals((byte) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static byte ANDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3669,7 +3743,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte ANDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = -1;
+        byte res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3678,34 +3752,29 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ANDReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = -1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                byte v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::ANDReduceMasked, ByteMaxVectorTests::ANDReduceAllMasked);
+                ByteVectorMaxTests::ANDReduceMasked, ByteVectorMaxTests::ANDReduceAllMasked);
     }
 
     static byte ORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3714,7 +3783,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3723,32 +3792,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ORReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ORReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                byte v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::ORReduce, ByteMaxVectorTests::ORReduceAll);
+                ByteVectorMaxTests::ORReduce, ByteVectorMaxTests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = OR_IDENTITY;
+
+        assertEquals((byte) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id | x), x);
+                assertEquals((byte) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static byte ORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3758,7 +3845,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte ORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3767,7 +3854,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ORReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3775,26 +3862,21 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                byte v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::ORReduceMasked, ByteMaxVectorTests::ORReduceAllMasked);
+                ByteVectorMaxTests::ORReduceMasked, ByteVectorMaxTests::ORReduceAllMasked);
     }
 
     static byte XORReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3803,7 +3885,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3812,32 +3894,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void XORReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void XORReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                byte v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::XORReduce, ByteMaxVectorTests::XORReduceAll);
+                ByteVectorMaxTests::XORReduce, ByteVectorMaxTests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = XOR_IDENTITY;
+
+        assertEquals((byte) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id ^ x), x);
+                assertEquals((byte) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static byte XORReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3847,7 +3947,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte XORReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3856,7 +3956,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void XORReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3864,26 +3964,21 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                byte v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::XORReduceMasked, ByteMaxVectorTests::XORReduceAllMasked);
+                ByteVectorMaxTests::XORReduceMasked, ByteVectorMaxTests::XORReduceAllMasked);
     }
 
     static byte ADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3892,7 +3987,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3901,32 +3996,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                byte v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::ADDReduce, ByteMaxVectorTests::ADDReduceAll);
+                ByteVectorMaxTests::ADDReduce, ByteVectorMaxTests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = ADD_IDENTITY;
+
+        assertEquals((byte) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id + x), x);
+                assertEquals((byte) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static byte ADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3936,7 +4049,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte ADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3945,7 +4058,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3953,26 +4066,21 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                byte v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::ADDReduceMasked, ByteMaxVectorTests::ADDReduceAllMasked);
+                ByteVectorMaxTests::ADDReduceMasked, ByteVectorMaxTests::ADDReduceAllMasked);
     }
 
     static byte MULReduce(byte[] a, int idx) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3981,7 +4089,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAll(byte[] a) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3990,32 +4098,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MULReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void MULReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                byte v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::MULReduce, ByteMaxVectorTests::MULReduceAll);
+                ByteVectorMaxTests::MULReduce, ByteVectorMaxTests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MUL_IDENTITY;
+
+        assertEquals((byte) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) (id * x), x);
+                assertEquals((byte) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static byte MULReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4025,7 +4151,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte MULReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 1;
+        byte res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4034,34 +4160,29 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MULReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = 1;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                byte v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::MULReduceMasked, ByteMaxVectorTests::MULReduceAllMasked);
+                ByteVectorMaxTests::MULReduceMasked, ByteVectorMaxTests::MULReduceAllMasked);
     }
 
     static byte MINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.min(res, a[i]);
         }
@@ -4070,7 +4191,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduce(a, i));
         }
@@ -4079,32 +4200,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MINReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void MINReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                byte v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::MINReduce, ByteMaxVectorTests::MINReduceAll);
+                ByteVectorMaxTests::MINReduce, ByteVectorMaxTests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MIN_IDENTITY;
+
+        assertEquals((byte) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.min(id, x), x);
+                assertEquals((byte) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static byte MINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.min(res, a[i]);
@@ -4114,7 +4253,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte MINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4123,34 +4262,29 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MINReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (byte) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::MINReduceMasked, ByteMaxVectorTests::MINReduceAllMasked);
+                ByteVectorMaxTests::MINReduceMasked, ByteVectorMaxTests::MINReduceAllMasked);
     }
 
     static byte MAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) Math.max(res, a[i]);
         }
@@ -4159,7 +4293,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduce(a, i));
         }
@@ -4168,32 +4302,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void MAXReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void MAXReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                byte v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::MAXReduce, ByteMaxVectorTests::MAXReduceAll);
+                ByteVectorMaxTests::MAXReduce, ByteVectorMaxTests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = MAX_IDENTITY;
+
+        assertEquals((byte) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) Math.max(id, x), x);
+                assertEquals((byte) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static byte MAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) Math.max(res, a[i]);
@@ -4203,7 +4355,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte MAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4212,34 +4364,29 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void MAXReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (byte) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::MAXReduceMasked, ByteMaxVectorTests::MAXReduceAllMasked);
+                ByteVectorMaxTests::MAXReduceMasked, ByteVectorMaxTests::MAXReduceAllMasked);
     }
 
     static byte UMINReduce(byte[] a, int idx) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4248,7 +4395,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAll(byte[] a) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4257,32 +4404,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMINReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void UMINReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                byte v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::UMINReduce, ByteMaxVectorTests::UMINReduceAll);
+                ByteVectorMaxTests::UMINReduce, ByteVectorMaxTests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMIN_IDENTITY;
+
+        assertEquals((byte) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.minUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static byte UMINReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.minUnsigned(res, a[i]);
@@ -4292,7 +4457,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte UMINReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MAX_VALUE;
+        byte res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4301,34 +4466,29 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMINReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MAX_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::UMINReduceMasked, ByteMaxVectorTests::UMINReduceAllMasked);
+                ByteVectorMaxTests::UMINReduceMasked, ByteVectorMaxTests::UMINReduceAllMasked);
     }
 
     static byte UMAXReduce(byte[] a, int idx) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4337,7 +4497,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAll(byte[] a) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4346,32 +4506,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void UMAXReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void UMAXReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                byte v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::UMAXReduce, ByteMaxVectorTests::UMAXReduceAll);
+                ByteVectorMaxTests::UMAXReduce, ByteVectorMaxTests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = UMAX_IDENTITY;
+
+        assertEquals((byte) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static byte UMAXReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.maxUnsigned(res, a[i]);
@@ -4381,7 +4559,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte UMAXReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = Byte.MIN_VALUE;
+        byte res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4390,34 +4568,29 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void UMAXReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = Byte.MIN_VALUE;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Byte.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                byte v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::UMAXReduceMasked, ByteMaxVectorTests::UMAXReduceAllMasked);
+                ByteVectorMaxTests::UMAXReduceMasked, ByteVectorMaxTests::UMAXReduceAllMasked);
     }
 
     static byte FIRST_NONZEROReduce(byte[] a, int idx) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4426,7 +4599,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAll(byte[] a) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4435,32 +4608,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void FIRST_NONZEROReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void FIRST_NONZEROReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::FIRST_NONZEROReduce, ByteMaxVectorTests::FIRST_NONZEROReduceAll);
+                ByteVectorMaxTests::FIRST_NONZEROReduce, ByteVectorMaxTests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "byteUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static byte FIRST_NONZEROReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4470,7 +4661,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte FIRST_NONZEROReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = (byte) 0;
+        byte res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4479,30 +4670,25 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Byte> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        byte ra = (byte) 0;
+        byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (byte) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                byte v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::FIRST_NONZEROReduceMasked, ByteMaxVectorTests::FIRST_NONZEROReduceAllMasked);
+                ByteVectorMaxTests::FIRST_NONZEROReduceMasked, ByteVectorMaxTests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4515,7 +4701,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueByteMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueByteVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4526,7 +4712,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, ByteMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVectorMaxTests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4539,7 +4725,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueByteMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueByteVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4550,11 +4736,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, ByteMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ByteVectorMaxTests::allTrue);
     }
 
     static byte SUADDReduce(byte[] a, int idx) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4563,7 +4749,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAll(byte[] a) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4572,32 +4758,50 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSaturatingUnaryOpProvider")
-    static void SUADDReduceByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void SUADDReduceByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                byte v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ByteMaxVectorTests::SUADDReduce, ByteMaxVectorTests::SUADDReduceAll);
+                ByteVectorMaxTests::SUADDReduce, ByteVectorMaxTests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "byteSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<byte[]> fa) {
+        byte[] a = fa.apply(SPECIES.length());
+        byte id = SUADD_IDENTITY;
+
+        assertEquals((byte) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        byte x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((byte) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static byte SUADDReduceMasked(byte[] a, int idx, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (byte) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4607,7 +4811,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     static byte SUADDReduceAllMasked(byte[] a, boolean[] mask) {
-        byte res = 0;
+        byte res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (byte) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4615,7 +4819,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "byteSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4623,26 +4827,21 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         byte ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ByteVector av = ByteVector.fromArray(SPECIES, a, i);
-                ra = (byte) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                byte v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (byte) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::SUADDReduceMasked, ByteMaxVectorTests::SUADDReduceAllMasked);
+                ByteVectorMaxTests::SUADDReduceMasked, ByteVectorMaxTests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void withByteMaxVectorTests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
+    static void withByteVectorMaxTests(IntFunction<byte []> fa, IntFunction<byte []> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -4665,7 +4864,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_DEFAULTByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void IS_DEFAULTByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4675,14 +4874,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_DEFAULTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void IS_DEFAULTMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4695,7 +4894,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4706,7 +4905,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTestOpProvider")
-    static void IS_NEGATIVEByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void IS_NEGATIVEByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4716,14 +4915,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void IS_NEGATIVEMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4736,14 +4935,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4755,14 +4954,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4774,14 +4973,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LTByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4797,14 +4996,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GTByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GTByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4816,14 +5015,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GTByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GTByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4839,14 +5038,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4858,14 +5057,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4877,14 +5076,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void EQByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4900,14 +5099,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void NEByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void NEByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4919,14 +5118,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void NEByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void NEByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4942,14 +5141,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LEByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LEByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -4961,14 +5160,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LEByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void LEByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -4984,14 +5183,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void GEByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void GEByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5003,14 +5202,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void GEByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void GEByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5026,14 +5225,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULTByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULTByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5045,14 +5244,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULTByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULTByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5068,14 +5267,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGTByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGTByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5087,14 +5286,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGTByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGTByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5110,14 +5309,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ULEByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ULEByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5129,14 +5328,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void ULEByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void ULEByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5152,14 +5351,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void UGEByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void UGEByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5171,14 +5370,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void UGEByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void UGEByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5194,14 +5393,14 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5211,13 +5410,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5231,13 +5430,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void LTByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void LTByteVectorMaxTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5247,13 +5446,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void LTByteMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void LTByteVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5267,13 +5466,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (byte)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5283,13 +5482,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5303,13 +5502,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void EQByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void EQByteVectorMaxTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -5319,13 +5518,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (byte)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpMaskProvider")
-    static void EQByteMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void EQByteVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<byte[]> fa,
                                 IntFunction<byte[]> fb, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5339,7 +5538,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (byte)((long)b[i])));
             }
         }
     }
@@ -5349,7 +5548,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5365,11 +5564,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ByteMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ByteVectorMaxTests::blend);
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleProvider")
-    static void RearrangeByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void RearrangeByteVectorMaxTests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5386,7 +5585,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpShuffleMaskProvider")
-    static void RearrangeByteMaxVectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void RearrangeByteVectorMaxTestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -5404,7 +5603,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void compressByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void compressByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5422,7 +5621,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void expandByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void expandByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -5440,7 +5639,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void getByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void getByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -5596,7 +5795,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void BroadcastByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5610,7 +5809,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZeroByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ZeroByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -5620,7 +5819,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static byte[] sliceUnary(byte[] a, int origin, int idx) {
@@ -5635,7 +5834,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void sliceUnaryByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void sliceUnaryByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5646,7 +5845,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, ByteMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ByteVectorMaxTests::sliceUnary);
     }
 
     static byte[] sliceBinary(byte[] a, byte[] b, int origin, int idx) {
@@ -5663,7 +5862,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void sliceBinaryByteMaxVectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void sliceBinaryByteVectorMaxTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5676,7 +5875,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, ByteMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ByteVectorMaxTests::sliceBinary);
     }
 
     static byte[] slice(byte[] a, byte[] b, int origin, boolean[] mask, int idx) {
@@ -5693,7 +5892,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void sliceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void sliceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5710,7 +5909,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, ByteMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ByteVectorMaxTests::slice);
     }
 
     static byte[] unsliceUnary(byte[] a, int origin, int idx) {
@@ -5727,7 +5926,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void unsliceUnaryByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void unsliceUnaryByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5738,7 +5937,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, ByteMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ByteVectorMaxTests::unsliceUnary);
     }
 
     static byte[] unsliceBinary(byte[] a, byte[] b, int origin, int part, int idx) {
@@ -5764,7 +5963,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpProvider")
-    static void unsliceBinaryByteMaxVectorTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void unsliceBinaryByteVectorMaxTestsBinary(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] r = new byte[a.length];
@@ -5778,7 +5977,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, ByteMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ByteVectorMaxTests::unsliceBinary);
     }
 
     static byte[] unslice(byte[] a, byte[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5818,7 +6017,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void unsliceByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void unsliceByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
     IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5835,7 +6034,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, ByteMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ByteVectorMaxTests::unslice);
     }
 
     static byte BITWISE_BLEND(byte a, byte b, byte c) {
@@ -5847,7 +6046,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5862,11 +6061,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5879,11 +6078,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ByteVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5901,11 +6100,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5916,11 +6115,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVectorMaxTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5931,11 +6130,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5946,11 +6145,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             ByteVector bv = ByteVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ByteVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByteMaxVectorTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVectorMaxTestsAltBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -5961,11 +6160,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             ByteVector cv = ByteVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ByteVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5980,11 +6179,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVectorMaxTestsAltBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -5999,11 +6198,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void BITWISE_BLENDByteVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6014,11 +6213,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "byteTernaryOpProvider")
-    static void bitwiseBlendByteMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void bitwiseBlendByteVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] c = fc.apply(SPECIES.length());
@@ -6029,11 +6228,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ByteVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "byteTernaryOpMaskProvider")
-    static void BITWISE_BLENDByteMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void BITWISE_BLENDByteVectorMaxTestsDoubleBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<byte[]> fc, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6047,7 +6246,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ByteVectorMaxTests::BITWISE_BLEND);
     }
 
     static byte NEG(byte a) {
@@ -6059,7 +6258,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NEGByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void NEGByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6070,11 +6269,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::NEG);
+        assertArraysEquals(r, a, ByteVectorMaxTests::NEG);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void negByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void negByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6085,11 +6284,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::neg);
+        assertArraysEquals(r, a, ByteVectorMaxTests::neg);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NEGMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void NEGMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6103,7 +6302,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::NEG);
     }
 
     static byte ABS(byte a) {
@@ -6115,7 +6314,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ABSByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ABSByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6126,11 +6325,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::ABS);
+        assertArraysEquals(r, a, ByteVectorMaxTests::ABS);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void absByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void absByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6141,11 +6340,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::abs);
+        assertArraysEquals(r, a, ByteVectorMaxTests::abs);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ABSMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void ABSMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6159,7 +6358,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::ABS);
     }
 
     static byte NOT(byte a) {
@@ -6171,7 +6370,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void NOTByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void NOTByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6182,11 +6381,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::NOT);
+        assertArraysEquals(r, a, ByteVectorMaxTests::NOT);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void notByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void notByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6197,11 +6396,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::not);
+        assertArraysEquals(r, a, ByteVectorMaxTests::not);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void NOTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void NOTMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6215,7 +6414,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::NOT);
     }
 
     static byte ZOMO(byte a) {
@@ -6223,7 +6422,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ZOMOByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ZOMOByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6234,11 +6433,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, ByteVectorMaxTests::ZOMO);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ZOMOMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void ZOMOMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6252,7 +6451,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::ZOMO);
     }
 
     static byte BIT_COUNT(byte a) {
@@ -6260,7 +6459,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BIT_COUNTByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void BIT_COUNTByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6271,11 +6470,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ByteVectorMaxTests::BIT_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void BIT_COUNTMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6289,7 +6488,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::BIT_COUNT);
     }
 
     static byte TRAILING_ZEROS_COUNT(byte a) {
@@ -6297,7 +6496,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void TRAILING_ZEROS_COUNTByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6308,11 +6507,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6326,7 +6525,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     static byte LEADING_ZEROS_COUNT(byte a) {
@@ -6334,7 +6533,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void LEADING_ZEROS_COUNTByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6345,11 +6544,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ByteVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6363,7 +6562,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     static byte REVERSE(byte a) {
@@ -6371,7 +6570,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSEByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void REVERSEByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6382,11 +6581,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, ByteVectorMaxTests::REVERSE);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSEMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void REVERSEMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6400,7 +6599,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::REVERSE);
     }
 
     static byte REVERSE_BYTES(byte a) {
@@ -6408,7 +6607,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void REVERSE_BYTESByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void REVERSE_BYTESByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
 
@@ -6419,11 +6618,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ByteVectorMaxTests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void REVERSE_BYTESMaskedByteVectorMaxTests(IntFunction<byte[]> fa,
                                                 IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = fr.apply(SPECIES.length());
@@ -6437,7 +6636,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ByteMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ByteVectorMaxTests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6445,7 +6644,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandByteVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6458,7 +6657,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::band);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6466,7 +6665,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorByteVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6479,7 +6678,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::bor);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6487,7 +6686,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorByteVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6500,7 +6699,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::bxor);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6508,7 +6707,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotByteVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6521,7 +6720,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::bandNot);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6529,7 +6728,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqByteVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6542,7 +6741,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ByteMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, ByteVectorMaxTests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6550,7 +6749,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotByteMaxVectorTests(IntFunction<boolean[]> fa) {
+    static void masknotByteVectorMaxTests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6561,7 +6760,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ByteMaxVectorTests::unot);
+        assertArraysEquals(r, a, ByteVectorMaxTests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6570,15 +6769,15 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongByteMaxVectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongByteVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6592,7 +6791,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void ltByteMaxVectorTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void ltByteVectorMaxTestsBroadcastSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6602,13 +6801,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteCompareOpProvider")
-    static void eqByteMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
+    static void eqByteVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
 
@@ -6618,13 +6817,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toIntArrayByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toIntArrayByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6635,7 +6834,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toLongArrayByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toLongArrayByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6646,7 +6845,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toDoubleArrayByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toDoubleArrayByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6657,7 +6856,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void toStringByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void toStringByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6670,7 +6869,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void hashCodeByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void hashCodeByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6684,7 +6883,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void reinterpretAsBytesByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void reinterpretAsBytesByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6714,7 +6913,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void ADDReduceLongByteMaxVectorTests(IntFunction<byte[]> fa) {
+    static void ADDReduceLongByteVectorMaxTests(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6730,7 +6929,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                ByteMaxVectorTests::ADDReduceLong, ByteMaxVectorTests::ADDReduceAllLong);
+                ByteVectorMaxTests::ADDReduceLong, ByteVectorMaxTests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(byte[] a, int idx, boolean[] mask) {
@@ -6753,7 +6952,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpMaskProvider")
-    static void ADDReduceLongByteMaxVectorTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongByteVectorMaxTestsMasked(IntFunction<byte[]> fa, IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6771,11 +6970,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                ByteMaxVectorTests::ADDReduceLongMasked, ByteMaxVectorTests::ADDReduceAllLongMasked);
+                ByteVectorMaxTests::ADDReduceLongMasked, ByteVectorMaxTests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "byteUnaryOpProvider")
-    static void BroadcastLongByteMaxVectorTestsSmokeTest(IntFunction<byte[]> fa) {
+    static void BroadcastLongByteVectorMaxTestsSmokeTest(IntFunction<byte[]> fa) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] r = new byte[a.length];
 
@@ -6786,7 +6985,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteBinaryOpMaskProvider")
-    static void blendByteMaxVectorTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
+    static void blendByteVectorMaxTestsBroadcastLongSmokeTest(IntFunction<byte[]> fa, IntFunction<byte[]> fb,
                                           IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
@@ -6800,12 +6999,12 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, ByteMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ByteVectorMaxTests::blend);
     }
 
 
     @Test(dataProvider = "byteUnaryOpSelectFromProvider")
-    static void SelectFromByteMaxVectorTests(IntFunction<byte[]> fa,
+    static void SelectFromByteVectorMaxTests(IntFunction<byte[]> fa,
                                            BiFunction<Integer,Integer,byte[]> fs) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] order = fs.apply(a.length, SPECIES.length());
@@ -6821,7 +7020,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorByteMaxVectorTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
+    static void SelectFromTwoVectorByteVectorMaxTests(IntFunction<byte[]> fa, IntFunction<byte[]> fb, IntFunction<byte[]> fc) {
         byte[] a = fa.apply(SPECIES.length());
         byte[] b = fb.apply(SPECIES.length());
         byte[] idx = fc.apply(SPECIES.length());
@@ -6839,7 +7038,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "byteUnaryOpSelectFromMaskProvider")
-    static void SelectFromByteMaxVectorTestsMaskedSmokeTest(IntFunction<byte[]> fa,
+    static void SelectFromByteVectorMaxTestsMaskedSmokeTest(IntFunction<byte[]> fa,
                                                            BiFunction<Integer,Integer,byte[]> fs,
                                                            IntFunction<boolean[]> fm) {
         byte[] a = fa.apply(SPECIES.length());
@@ -6858,7 +7057,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousByteMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousByteVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6869,12 +7068,12 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringByteMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringByteVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6888,7 +7087,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsByteMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsByteVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6897,12 +7096,12 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsByteMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsByteVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6912,13 +7111,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeByteVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6940,7 +7139,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountByteVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6951,7 +7150,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, ByteMaxVectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ByteVectorMaxTests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6965,7 +7164,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueByteVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6976,7 +7175,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, ByteMaxVectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVectorMaxTests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6990,7 +7189,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueByteVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7001,11 +7200,11 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, ByteMaxVectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ByteVectorMaxTests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressByteMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressByteVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7015,7 +7214,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7033,7 +7232,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeByteMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeByteVectorMaxTestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7041,13 +7240,13 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongByteMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongByteVectorMaxTestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7055,7 +7254,7 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7074,36 +7273,36 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundByteMaxVectorTestsSmokeTest(int length) {
+    static void loopBoundByteVectorMaxTestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongByteMaxVectorTestsSmokeTest(int _length) {
+    static void loopBoundLongByteVectorMaxTestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeByteMaxVectorTestsSmokeTest() {
+    static void ElementSizeByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Byte.SIZE);
+        assertEquals(elsize, Byte.SIZE);
     }
 
     @Test
-    static void VectorShapeByteMaxVectorTestsSmokeTest() {
+    static void VectorShapeByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_Max_BIT));
     }
 
     @Test
-    static void ShapeWithLanesByteMaxVectorTestsSmokeTest() {
+    static void ShapeWithLanesByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(byte.class);
@@ -7111,32 +7310,32 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeByteMaxVectorTestsSmokeTest() {
+    static void ElementTypeByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementType() == byte.class);
     }
 
     @Test
-    static void SpeciesElementSizeByteMaxVectorTestsSmokeTest() {
+    static void SpeciesElementSizeByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().elementSize() == Byte.SIZE);
     }
 
     @Test
-    static void VectorTypeByteMaxVectorTestsSmokeTest() {
+    static void VectorTypeByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesByteMaxVectorTestsSmokeTest() {
+    static void WithLanesByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(byte.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeByteMaxVectorTestsSmokeTest() {
+    static void WithShapeByteVectorMaxTestsSmokeTest() {
         ByteVector av = ByteVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7144,9 +7343,9 @@ public class ByteMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueByteMaxVectorTestsSmokeTest() {
+    static void MaskAllTrueByteVectorMaxTestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleVector128LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector128LoadStoreTests.java
index fed75349f68..68349a6afd9 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector128LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Double128VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation DoubleVector128LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class DoubleVector128LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_128;
 
@@ -61,14 +61,29 @@ public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(double[] r, double[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Double128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/DoubleVector128Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Double128VectorTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector128Tests.java
index 215edbb3a66..7b4b587b142 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector128Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Double128VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation DoubleVector128Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,57 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Double128VectorTests extends AbstractVectorTest {
+public class DoubleVector128Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_128;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(double actual, double expected, double delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(double actual, double expected, double delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final double ADD_IDENTITY = (double)0;
+    private static final double FIRST_NONZERO_IDENTITY = (double)0;
+    private static final double MAX_IDENTITY = Double.NEGATIVE_INFINITY;
+    private static final double MIN_IDENTITY = Double.POSITIVE_INFINITY;
+    private static final double MUL_IDENTITY = (double)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
 
@@ -89,10 +132,10 @@ public class Double128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +147,13 @@ public class Double128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +163,10 @@ public class Double128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +188,13 @@ public class Double128VectorTests extends AbstractVectorTest {
                                             double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +216,14 @@ public class Double128VectorTests extends AbstractVectorTest {
                                             double relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +239,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +261,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +279,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +294,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +306,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +322,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (double)0);
+                    assertEquals(r[i + k], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +347,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (double)0);
+                        assertEquals(r[i + j], (double)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +375,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +388,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +403,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +423,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +447,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +462,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +477,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +501,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +527,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +546,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +557,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +568,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +580,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +596,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +611,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +626,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +644,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +660,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +678,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +704,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +722,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +746,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +761,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +773,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +786,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +805,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +826,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +841,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +862,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +958,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +985,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1006,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1033,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1053,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1074,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1095,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1117,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1169,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1215,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1578,7 +1621,7 @@ relativeError));
         // Do some zipping and shuffling.
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         DoubleVector a = io.add((double)1); //[1,2]
         DoubleVector b = a.neg();  //[-1,-2]
         double[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1593,19 +1636,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Double> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Double> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         DoubleVector uab0 = zab0.rearrange(unz0,zab1);
         DoubleVector uab1 = zab0.rearrange(unz1,zab1);
         double[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1622,15 +1665,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static double ADD(double a, double b) {
@@ -1638,7 +1681,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1651,7 +1694,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::ADD);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::ADD);
     }
 
     static double add(double a, double b) {
@@ -1659,7 +1702,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1670,11 +1713,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::add);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1690,11 +1733,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1708,7 +1751,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::add);
     }
 
     static double SUB(double a, double b) {
@@ -1716,7 +1759,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void SUBDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void SUBDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1729,7 +1772,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::SUB);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::SUB);
     }
 
     static double sub(double a, double b) {
@@ -1737,7 +1780,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1748,11 +1791,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::sub);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void SUBDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void SUBDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1768,11 +1811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1786,7 +1829,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::sub);
     }
 
     static double MUL(double a, double b) {
@@ -1794,7 +1837,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MULDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MULDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1807,7 +1850,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::MUL);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::MUL);
     }
 
     static double mul(double a, double b) {
@@ -1815,7 +1858,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1826,11 +1869,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::mul);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void MULDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void MULDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1846,11 +1889,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1864,7 +1907,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1872,7 +1915,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void DIVDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void DIVDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1885,7 +1928,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::DIV);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::DIV);
     }
 
     static double div(double a, double b) {
@@ -1893,7 +1936,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1904,11 +1947,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::div);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void DIVDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void DIVDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1924,11 +1967,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1942,7 +1985,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::div);
     }
 
     static double FIRST_NONZERO(double a, double b) {
@@ -1950,7 +1993,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void FIRST_NONZERODouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void FIRST_NONZERODoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1963,11 +2006,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void FIRST_NONZERODouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FIRST_NONZERODoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1983,11 +2026,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1997,11 +2040,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2014,11 +2057,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector128Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2028,11 +2071,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2045,11 +2088,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector128Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2059,11 +2102,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2076,11 +2119,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector128Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2090,11 +2133,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2107,11 +2150,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector128Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble128VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector128TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2121,11 +2164,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Double128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, DoubleVector128Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2138,13 +2181,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector128Tests::ADD);
     }
 
     static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MINDoubleVector128TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2155,13 +2198,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double128VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, DoubleVector128Tests::MIN);
     }
 
     static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void minDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void minDoubleVector128TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2172,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double128VectorTests::min);
+        assertArraysEquals(r, a, (double)10, DoubleVector128Tests::min);
     }
 
     static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINDouble128VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINDoubleVector128TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2191,13 +2234,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double128VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector128Tests::MIN);
     }
 
     static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MAXDoubleVector128TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2208,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double128VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, DoubleVector128Tests::MAX);
     }
 
     static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void maxDouble128VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void maxDoubleVector128TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2225,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double128VectorTests::max);
+        assertArraysEquals(r, a, (double)10, DoubleVector128Tests::max);
     }
 
     static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXDouble128VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXDoubleVector128TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2244,7 +2287,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double128VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector128Tests::MAX);
     }
 
     static double MIN(double a, double b) {
@@ -2252,7 +2295,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2265,7 +2308,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::MIN);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::MIN);
     }
 
     static double min(double a, double b) {
@@ -2273,7 +2316,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2284,7 +2327,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::min);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::min);
     }
 
     static double MAX(double a, double b) {
@@ -2292,7 +2335,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2305,7 +2348,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::MAX);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::MAX);
     }
 
     static double max(double a, double b) {
@@ -2313,7 +2356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2324,11 +2367,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::max);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2338,11 +2381,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2352,11 +2395,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2366,11 +2409,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2380,11 +2423,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector128Tests::max);
     }
 
     static double ADDReduce(double[] a, int idx) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2393,7 +2436,7 @@ relativeError));
     }
 
     static double ADDReduceAll(double[] a) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2402,32 +2445,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                double v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::ADDReduce, Double128VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector128Tests::ADDReduce, DoubleVector128Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = ADD_IDENTITY;
+
+        assertEquals((double) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id + x), x);
+                assertEquals((double) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2437,7 +2498,7 @@ relativeError));
     }
 
     static double ADDReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2446,7 +2507,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2454,26 +2515,21 @@ relativeError));
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                double v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::ADDReduceMasked, Double128VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector128Tests::ADDReduceMasked, DoubleVector128Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2482,7 +2538,7 @@ relativeError));
     }
 
     static double MULReduceAll(double[] a) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2491,32 +2547,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MULReduceDouble128VectorTests(IntFunction<double[]> fa) {
+    static void MULReduceDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                double v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::MULReduce, Double128VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector128Tests::MULReduce, DoubleVector128Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MUL_IDENTITY;
+
+        assertEquals((double) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id * x), x);
+                assertEquals((double) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2526,7 +2600,7 @@ relativeError));
     }
 
     static double MULReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2535,34 +2609,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MULReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                double v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::MULReduceMasked, Double128VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector128Tests::MULReduceMasked, DoubleVector128Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.min(res, a[i]);
         }
@@ -2571,7 +2640,7 @@ relativeError));
     }
 
     static double MINReduceAll(double[] a) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduce(a, i));
         }
@@ -2580,32 +2649,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINReduceDouble128VectorTests(IntFunction<double[]> fa) {
+    static void MINReduceDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                double v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::MINReduce, Double128VectorTests::MINReduceAll);
+                DoubleVector128Tests::MINReduce, DoubleVector128Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MIN_IDENTITY;
+
+        assertEquals((double) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.min(id, x), x);
+                assertEquals((double) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.min(res, a[i]);
@@ -2615,7 +2702,7 @@ relativeError));
     }
 
     static double MINReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2624,34 +2711,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                double v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::MINReduceMasked, Double128VectorTests::MINReduceAllMasked);
+                DoubleVector128Tests::MINReduceMasked, DoubleVector128Tests::MINReduceAllMasked);
     }
 
     static double MAXReduce(double[] a, int idx) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.max(res, a[i]);
         }
@@ -2660,7 +2742,7 @@ relativeError));
     }
 
     static double MAXReduceAll(double[] a) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduce(a, i));
         }
@@ -2669,32 +2751,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXReduceDouble128VectorTests(IntFunction<double[]> fa) {
+    static void MAXReduceDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                double v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::MAXReduce, Double128VectorTests::MAXReduceAll);
+                DoubleVector128Tests::MAXReduce, DoubleVector128Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MAX_IDENTITY;
+
+        assertEquals((double) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.max(id, x), x);
+                assertEquals((double) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.max(res, a[i]);
@@ -2704,7 +2804,7 @@ relativeError));
     }
 
     static double MAXReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2713,34 +2813,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                double v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::MAXReduceMasked, Double128VectorTests::MAXReduceAllMasked);
+                DoubleVector128Tests::MAXReduceMasked, DoubleVector128Tests::MAXReduceAllMasked);
     }
 
     static double FIRST_NONZEROReduce(double[] a, int idx) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2749,7 +2844,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAll(double[] a) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2758,32 +2853,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void FIRST_NONZEROReduceDouble128VectorTests(IntFunction<double[]> fa) {
+    static void FIRST_NONZEROReduceDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::FIRST_NONZEROReduce, Double128VectorTests::FIRST_NONZEROReduceAll);
+                DoubleVector128Tests::FIRST_NONZEROReduce, DoubleVector128Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static double FIRST_NONZEROReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2793,7 +2906,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAllMasked(double[] a, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2802,34 +2915,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::FIRST_NONZEROReduceMasked, Double128VectorTests::FIRST_NONZEROReduceAllMasked);
+                DoubleVector128Tests::FIRST_NONZEROReduceMasked, DoubleVector128Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void withDouble128VectorTests(IntFunction<double []> fa, IntFunction<double []> fb) {
+    static void withDoubleVector128Tests(IntFunction<double []> fa, IntFunction<double []> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2852,7 +2960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_DEFAULTDouble128VectorTests(IntFunction<double[]> fa) {
+    static void IS_DEFAULTDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2862,14 +2970,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2882,7 +2990,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2893,7 +3001,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NEGATIVEDouble128VectorTests(IntFunction<double[]> fa) {
+    static void IS_NEGATIVEDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2903,14 +3011,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2923,7 +3031,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2934,7 +3042,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_FINITEDouble128VectorTests(IntFunction<double[]> fa) {
+    static void IS_FINITEDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2944,14 +3052,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2964,7 +3072,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2975,7 +3083,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NANDouble128VectorTests(IntFunction<double[]> fa) {
+    static void IS_NANDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2985,14 +3093,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void IS_NANMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3005,7 +3113,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3016,7 +3124,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_INFINITEDouble128VectorTests(IntFunction<double[]> fa) {
+    static void IS_INFINITEDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3026,14 +3134,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3046,14 +3154,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3065,14 +3173,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3084,14 +3192,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LTDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3107,14 +3215,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GTDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GTDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3126,14 +3234,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GTDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GTDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3149,14 +3257,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3168,14 +3276,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3187,14 +3295,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void EQDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3210,14 +3318,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void NEDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void NEDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3229,14 +3337,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void NEDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void NEDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3252,14 +3360,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LEDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LEDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3271,14 +3379,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LEDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LEDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3294,14 +3402,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GEDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GEDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3313,14 +3421,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GEDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GEDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3336,14 +3444,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3353,13 +3461,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3373,13 +3481,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble128VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector128TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3389,13 +3497,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3409,13 +3517,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3425,13 +3533,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3445,13 +3553,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble128VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector128TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3461,13 +3569,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3481,7 +3589,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
             }
         }
     }
@@ -3491,7 +3599,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3507,11 +3615,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, DoubleVector128Tests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
-    static void RearrangeDouble128VectorTests(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector128Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3528,7 +3636,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
-    static void RearrangeDouble128VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector128TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -3546,7 +3654,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void compressDouble128VectorTests(IntFunction<double[]> fa,
+    static void compressDoubleVector128Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3564,7 +3672,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void expandDouble128VectorTests(IntFunction<double[]> fa,
+    static void expandDoubleVector128Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3582,7 +3690,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void getDouble128VectorTests(IntFunction<double[]> fa) {
+    static void getDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -3738,7 +3846,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void BroadcastDouble128VectorTests(IntFunction<double[]> fa) {
+    static void BroadcastDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3752,7 +3860,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ZeroDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ZeroDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3762,7 +3870,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static double[] sliceUnary(double[] a, int origin, int idx) {
@@ -3777,7 +3885,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sliceUnaryDouble128VectorTests(IntFunction<double[]> fa) {
+    static void sliceUnaryDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3788,7 +3896,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector128Tests::sliceUnary);
     }
 
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
@@ -3805,7 +3913,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void sliceBinaryDouble128VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void sliceBinaryDoubleVector128TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3818,7 +3926,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Double128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, DoubleVector128Tests::sliceBinary);
     }
 
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
@@ -3835,7 +3943,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void sliceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void sliceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3852,7 +3960,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Double128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, DoubleVector128Tests::slice);
     }
 
     static double[] unsliceUnary(double[] a, int origin, int idx) {
@@ -3869,7 +3977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void unsliceUnaryDouble128VectorTests(IntFunction<double[]> fa) {
+    static void unsliceUnaryDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3880,7 +3988,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector128Tests::unsliceUnary);
     }
 
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
@@ -3906,7 +4014,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void unsliceBinaryDouble128VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void unsliceBinaryDoubleVector128TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3920,7 +4028,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Double128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, DoubleVector128Tests::unsliceBinary);
     }
 
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3960,7 +4068,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void unsliceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void unsliceDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3977,7 +4085,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Double128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, DoubleVector128Tests::unslice);
     }
 
     static double SIN(double a) {
@@ -3989,7 +4097,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINDouble128VectorTests(IntFunction<double[]> fa) {
+    static void SINDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4000,7 +4108,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::SIN, Double128VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::SIN, DoubleVector128Tests::strictSIN);
     }
 
     static double EXP(double a) {
@@ -4012,7 +4120,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPDouble128VectorTests(IntFunction<double[]> fa) {
+    static void EXPDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4023,7 +4131,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::EXP, Double128VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::EXP, DoubleVector128Tests::strictEXP);
     }
 
     static double LOG1P(double a) {
@@ -4035,7 +4143,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG1PDouble128VectorTests(IntFunction<double[]> fa) {
+    static void LOG1PDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4046,7 +4154,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::LOG1P, Double128VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::LOG1P, DoubleVector128Tests::strictLOG1P);
     }
 
     static double LOG(double a) {
@@ -4058,7 +4166,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOGDouble128VectorTests(IntFunction<double[]> fa) {
+    static void LOGDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4069,7 +4177,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::LOG, Double128VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::LOG, DoubleVector128Tests::strictLOG);
     }
 
     static double LOG10(double a) {
@@ -4081,7 +4189,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG10Double128VectorTests(IntFunction<double[]> fa) {
+    static void LOG10DoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4092,7 +4200,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::LOG10, Double128VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::LOG10, DoubleVector128Tests::strictLOG10);
     }
 
     static double EXPM1(double a) {
@@ -4104,7 +4212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPM1Double128VectorTests(IntFunction<double[]> fa) {
+    static void EXPM1DoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4115,7 +4223,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::EXPM1, Double128VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::EXPM1, DoubleVector128Tests::strictEXPM1);
     }
 
     static double COS(double a) {
@@ -4127,7 +4235,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSDouble128VectorTests(IntFunction<double[]> fa) {
+    static void COSDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4138,7 +4246,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::COS, Double128VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::COS, DoubleVector128Tests::strictCOS);
     }
 
     static double TAN(double a) {
@@ -4150,7 +4258,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANDouble128VectorTests(IntFunction<double[]> fa) {
+    static void TANDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4161,7 +4269,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::TAN, Double128VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::TAN, DoubleVector128Tests::strictTAN);
     }
 
     static double SINH(double a) {
@@ -4173,7 +4281,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINHDouble128VectorTests(IntFunction<double[]> fa) {
+    static void SINHDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4184,7 +4292,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::SINH, Double128VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::SINH, DoubleVector128Tests::strictSINH);
     }
 
     static double COSH(double a) {
@@ -4196,7 +4304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSHDouble128VectorTests(IntFunction<double[]> fa) {
+    static void COSHDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4207,7 +4315,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::COSH, Double128VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::COSH, DoubleVector128Tests::strictCOSH);
     }
 
     static double TANH(double a) {
@@ -4219,7 +4327,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANHDouble128VectorTests(IntFunction<double[]> fa) {
+    static void TANHDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4230,7 +4338,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::TANH, Double128VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::TANH, DoubleVector128Tests::strictTANH);
     }
 
     static double ASIN(double a) {
@@ -4242,7 +4350,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ASINDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ASINDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4253,7 +4361,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::ASIN, Double128VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::ASIN, DoubleVector128Tests::strictASIN);
     }
 
     static double ACOS(double a) {
@@ -4265,7 +4373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ACOSDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ACOSDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4276,7 +4384,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::ACOS, Double128VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::ACOS, DoubleVector128Tests::strictACOS);
     }
 
     static double ATAN(double a) {
@@ -4288,7 +4396,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ATANDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ATANDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4299,7 +4407,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::ATAN, Double128VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::ATAN, DoubleVector128Tests::strictATAN);
     }
 
     static double CBRT(double a) {
@@ -4311,7 +4419,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void CBRTDouble128VectorTests(IntFunction<double[]> fa) {
+    static void CBRTDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4322,7 +4430,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double128VectorTests::CBRT, Double128VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector128Tests::CBRT, DoubleVector128Tests::strictCBRT);
     }
 
     static double HYPOT(double a, double b) {
@@ -4334,7 +4442,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void HYPOTDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void HYPOTDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4347,7 +4455,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::HYPOT, Double128VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector128Tests::HYPOT, DoubleVector128Tests::strictHYPOT);
     }
 
 
@@ -4360,7 +4468,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4373,7 +4481,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::POW, Double128VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector128Tests::POW, DoubleVector128Tests::strictPOW);
     }
 
 
@@ -4386,7 +4494,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4399,7 +4507,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::pow, Double128VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector128Tests::pow, DoubleVector128Tests::strictpow);
     }
 
 
@@ -4412,7 +4520,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ATAN2Double128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ATAN2DoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4425,12 +4533,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::ATAN2, Double128VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector128Tests::ATAN2, DoubleVector128Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4440,12 +4548,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::POW, Double128VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector128Tests::POW, DoubleVector128Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4455,7 +4563,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double128VectorTests::pow, Double128VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector128Tests::pow, DoubleVector128Tests::strictpow);
     }
 
 
@@ -4468,7 +4576,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4490,11 +4598,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Double128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4514,11 +4622,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Double128VectorTests::fma);
+        assertArraysEquals(r, a, b, c, DoubleVector128Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4543,11 +4651,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4558,11 +4666,11 @@ relativeError));
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Double128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble128VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector128TestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4573,11 +4681,11 @@ relativeError));
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Double128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4592,11 +4700,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector128TestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4611,11 +4719,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble128VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector128TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4633,11 +4741,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector128Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble128VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector128TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4655,11 +4763,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double128VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector128Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector128TestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4680,7 +4788,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleVector128Tests::FMA);
     }
 
     static double NEG(double a) {
@@ -4692,7 +4800,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void NEGDouble128VectorTests(IntFunction<double[]> fa) {
+    static void NEGDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4703,11 +4811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::NEG);
+        assertArraysEquals(r, a, DoubleVector128Tests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void negDouble128VectorTests(IntFunction<double[]> fa) {
+    static void negDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4718,11 +4826,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::neg);
+        assertArraysEquals(r, a, DoubleVector128Tests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void NEGMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void NEGMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4736,7 +4844,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, DoubleVector128Tests::NEG);
     }
 
     static double ABS(double a) {
@@ -4748,7 +4856,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ABSDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ABSDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4759,11 +4867,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::ABS);
+        assertArraysEquals(r, a, DoubleVector128Tests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void absDouble128VectorTests(IntFunction<double[]> fa) {
+    static void absDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4774,11 +4882,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::abs);
+        assertArraysEquals(r, a, DoubleVector128Tests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ABSMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void ABSMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4792,7 +4900,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, DoubleVector128Tests::ABS);
     }
 
     static double SQRT(double a) {
@@ -4804,7 +4912,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SQRTDouble128VectorTests(IntFunction<double[]> fa) {
+    static void SQRTDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4815,11 +4923,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::SQRT);
+        assertArraysEquals(r, a, DoubleVector128Tests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sqrtDouble128VectorTests(IntFunction<double[]> fa) {
+    static void sqrtDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4830,11 +4938,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::sqrt);
+        assertArraysEquals(r, a, DoubleVector128Tests::sqrt);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void SQRTMaskedDouble128VectorTests(IntFunction<double[]> fa,
+    static void SQRTMaskedDoubleVector128Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4848,7 +4956,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double128VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, DoubleVector128Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4856,7 +4964,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandDoubleVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4869,7 +4977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::band);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4877,7 +4985,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorDoubleVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4890,7 +4998,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::bor);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4898,7 +5006,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorDoubleVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4911,7 +5019,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::bxor);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4919,7 +5027,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotDoubleVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4932,7 +5040,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::bandNot);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4940,7 +5048,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqDoubleVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4953,7 +5061,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double128VectorTests::beq);
+        assertArraysEquals(r, a, b, DoubleVector128Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4961,7 +5069,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotDouble128VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotDoubleVector128Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4972,7 +5080,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double128VectorTests::unot);
+        assertArraysEquals(r, a, DoubleVector128Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4981,15 +5089,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble128VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongDoubleVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5003,7 +5111,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble128VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector128TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5013,13 +5121,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble128VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector128TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5029,13 +5137,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubletoIntUnaryOpProvider")
-    static void toIntArrayDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toIntArrayDoubleVector128TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5046,7 +5154,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void toLongArrayDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toLongArrayDoubleVector128TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5058,7 +5166,7 @@ relativeError));
 
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void toStringDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toStringDoubleVector128TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5071,7 +5179,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void hashCodeDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void hashCodeDoubleVector128TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5104,7 +5212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceLongDouble128VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceLongDoubleVector128Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5120,7 +5228,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Double128VectorTests::ADDReduceLong, Double128VectorTests::ADDReduceAllLong);
+                DoubleVector128Tests::ADDReduceLong, DoubleVector128Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(double[] a, int idx, boolean[] mask) {
@@ -5143,7 +5251,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceLongDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongDoubleVector128TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5161,11 +5269,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::ADDReduceLongMasked, Double128VectorTests::ADDReduceAllLongMasked);
+                DoubleVector128Tests::ADDReduceLongMasked, DoubleVector128Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void BroadcastLongDouble128VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void BroadcastLongDoubleVector128TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -5176,7 +5284,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble128VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector128TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -5190,12 +5298,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector128Tests::blend);
     }
 
 
     @Test(dataProvider = "doubleUnaryOpSelectFromProvider")
-    static void SelectFromDouble128VectorTests(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector128Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,double[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         double[] order = fs.apply(a.length, SPECIES.length());
@@ -5211,7 +5319,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorDouble128VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void SelectFromTwoVectorDoubleVector128Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] idx = fc.apply(SPECIES.length());
@@ -5229,7 +5337,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
-    static void SelectFromDouble128VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector128TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                            BiFunction<Integer,Integer,double[]> fs,
                                                            IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -5248,7 +5356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousDouble128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousDoubleVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5259,12 +5367,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringDouble128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringDoubleVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5278,7 +5386,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsDouble128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsDoubleVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5287,12 +5395,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsDouble128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsDoubleVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5302,13 +5410,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeDoubleVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5330,7 +5438,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountDoubleVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5341,7 +5449,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double128VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, DoubleVector128Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5355,7 +5463,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueDoubleVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5366,7 +5474,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double128VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector128Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5380,7 +5488,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueDoubleVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5391,11 +5499,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double128VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector128Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressDouble128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressDoubleVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5405,7 +5513,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5423,7 +5531,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeDouble128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeDoubleVector128TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5431,13 +5539,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongDouble128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongDoubleVector128TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5445,7 +5553,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5464,36 +5572,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundDouble128VectorTestsSmokeTest(int length) {
+    static void loopBoundDoubleVector128TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongDouble128VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongDoubleVector128TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeDouble128VectorTestsSmokeTest() {
+    static void ElementSizeDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Double.SIZE);
+        assertEquals(elsize, Double.SIZE);
     }
 
     @Test
-    static void VectorShapeDouble128VectorTestsSmokeTest() {
+    static void VectorShapeDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_128_BIT));
     }
 
     @Test
-    static void ShapeWithLanesDouble128VectorTestsSmokeTest() {
+    static void ShapeWithLanesDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(double.class);
@@ -5501,32 +5609,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeDouble128VectorTestsSmokeTest() {
+    static void ElementTypeDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementType() == double.class);
     }
 
     @Test
-    static void SpeciesElementSizeDouble128VectorTestsSmokeTest() {
+    static void SpeciesElementSizeDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementSize() == Double.SIZE);
     }
 
     @Test
-    static void VectorTypeDouble128VectorTestsSmokeTest() {
+    static void VectorTypeDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesDouble128VectorTestsSmokeTest() {
+    static void WithLanesDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(double.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeDouble128VectorTestsSmokeTest() {
+    static void WithShapeDoubleVector128TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5534,9 +5642,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueDouble128VectorTestsSmokeTest() {
+    static void MaskAllTrueDoubleVector128TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleVector256LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector256LoadStoreTests.java
index d8a7eca2bda..b966bafb299 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector256LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Double256VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation DoubleVector256LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class DoubleVector256LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_256;
 
@@ -61,14 +61,29 @@ public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(double[] r, double[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Double256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/DoubleVector256Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Double256VectorTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector256Tests.java
index 14d52320ce8..4d650d7b407 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector256Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Double256VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation DoubleVector256Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,57 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Double256VectorTests extends AbstractVectorTest {
+public class DoubleVector256Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_256;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(double actual, double expected, double delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(double actual, double expected, double delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final double ADD_IDENTITY = (double)0;
+    private static final double FIRST_NONZERO_IDENTITY = (double)0;
+    private static final double MAX_IDENTITY = Double.NEGATIVE_INFINITY;
+    private static final double MIN_IDENTITY = Double.POSITIVE_INFINITY;
+    private static final double MUL_IDENTITY = (double)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
 
@@ -89,10 +132,10 @@ public class Double256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +147,13 @@ public class Double256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +163,10 @@ public class Double256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +188,13 @@ public class Double256VectorTests extends AbstractVectorTest {
                                             double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +216,14 @@ public class Double256VectorTests extends AbstractVectorTest {
                                             double relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +239,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +261,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +279,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +294,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +306,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +322,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (double)0);
+                    assertEquals(r[i + k], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +347,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (double)0);
+                        assertEquals(r[i + j], (double)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +375,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +388,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +403,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +423,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +447,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +462,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +477,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +501,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +527,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +546,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +557,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +568,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +580,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +596,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +611,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +626,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +644,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +660,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +678,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +704,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +722,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +746,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +761,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +773,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +786,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +805,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +826,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +841,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +862,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +958,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +985,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1006,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1033,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1053,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1074,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1095,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1117,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1169,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1215,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1578,7 +1621,7 @@ relativeError));
         // Do some zipping and shuffling.
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         DoubleVector a = io.add((double)1); //[1,2]
         DoubleVector b = a.neg();  //[-1,-2]
         double[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1593,19 +1636,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Double> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Double> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         DoubleVector uab0 = zab0.rearrange(unz0,zab1);
         DoubleVector uab1 = zab0.rearrange(unz1,zab1);
         double[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1622,15 +1665,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static double ADD(double a, double b) {
@@ -1638,7 +1681,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1651,7 +1694,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::ADD);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::ADD);
     }
 
     static double add(double a, double b) {
@@ -1659,7 +1702,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1670,11 +1713,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::add);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1690,11 +1733,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1708,7 +1751,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::add);
     }
 
     static double SUB(double a, double b) {
@@ -1716,7 +1759,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void SUBDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void SUBDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1729,7 +1772,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::SUB);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::SUB);
     }
 
     static double sub(double a, double b) {
@@ -1737,7 +1780,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1748,11 +1791,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::sub);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void SUBDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void SUBDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1768,11 +1811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1786,7 +1829,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::sub);
     }
 
     static double MUL(double a, double b) {
@@ -1794,7 +1837,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MULDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MULDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1807,7 +1850,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::MUL);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::MUL);
     }
 
     static double mul(double a, double b) {
@@ -1815,7 +1858,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1826,11 +1869,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::mul);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void MULDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void MULDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1846,11 +1889,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1864,7 +1907,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1872,7 +1915,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void DIVDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void DIVDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1885,7 +1928,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::DIV);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::DIV);
     }
 
     static double div(double a, double b) {
@@ -1893,7 +1936,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1904,11 +1947,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::div);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void DIVDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void DIVDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1924,11 +1967,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1942,7 +1985,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::div);
     }
 
     static double FIRST_NONZERO(double a, double b) {
@@ -1950,7 +1993,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void FIRST_NONZERODouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void FIRST_NONZERODoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1963,11 +2006,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void FIRST_NONZERODouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FIRST_NONZERODoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1983,11 +2026,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1997,11 +2040,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2014,11 +2057,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector256Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2028,11 +2071,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2045,11 +2088,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector256Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2059,11 +2102,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2076,11 +2119,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector256Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2090,11 +2133,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2107,11 +2150,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector256Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble256VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector256TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2121,11 +2164,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Double256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, DoubleVector256Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2138,13 +2181,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector256Tests::ADD);
     }
 
     static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MINDoubleVector256TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2155,13 +2198,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double256VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, DoubleVector256Tests::MIN);
     }
 
     static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void minDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void minDoubleVector256TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2172,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double256VectorTests::min);
+        assertArraysEquals(r, a, (double)10, DoubleVector256Tests::min);
     }
 
     static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINDouble256VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINDoubleVector256TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2191,13 +2234,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double256VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector256Tests::MIN);
     }
 
     static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MAXDoubleVector256TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2208,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double256VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, DoubleVector256Tests::MAX);
     }
 
     static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void maxDouble256VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void maxDoubleVector256TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2225,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double256VectorTests::max);
+        assertArraysEquals(r, a, (double)10, DoubleVector256Tests::max);
     }
 
     static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXDouble256VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXDoubleVector256TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2244,7 +2287,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double256VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector256Tests::MAX);
     }
 
     static double MIN(double a, double b) {
@@ -2252,7 +2295,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2265,7 +2308,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::MIN);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::MIN);
     }
 
     static double min(double a, double b) {
@@ -2273,7 +2316,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2284,7 +2327,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::min);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::min);
     }
 
     static double MAX(double a, double b) {
@@ -2292,7 +2335,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2305,7 +2348,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::MAX);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::MAX);
     }
 
     static double max(double a, double b) {
@@ -2313,7 +2356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2324,11 +2367,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::max);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2338,11 +2381,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2352,11 +2395,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2366,11 +2409,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2380,11 +2423,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector256Tests::max);
     }
 
     static double ADDReduce(double[] a, int idx) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2393,7 +2436,7 @@ relativeError));
     }
 
     static double ADDReduceAll(double[] a) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2402,32 +2445,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                double v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::ADDReduce, Double256VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector256Tests::ADDReduce, DoubleVector256Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = ADD_IDENTITY;
+
+        assertEquals((double) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id + x), x);
+                assertEquals((double) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2437,7 +2498,7 @@ relativeError));
     }
 
     static double ADDReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2446,7 +2507,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2454,26 +2515,21 @@ relativeError));
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                double v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::ADDReduceMasked, Double256VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector256Tests::ADDReduceMasked, DoubleVector256Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2482,7 +2538,7 @@ relativeError));
     }
 
     static double MULReduceAll(double[] a) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2491,32 +2547,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MULReduceDouble256VectorTests(IntFunction<double[]> fa) {
+    static void MULReduceDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                double v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::MULReduce, Double256VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector256Tests::MULReduce, DoubleVector256Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MUL_IDENTITY;
+
+        assertEquals((double) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id * x), x);
+                assertEquals((double) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2526,7 +2600,7 @@ relativeError));
     }
 
     static double MULReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2535,34 +2609,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MULReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                double v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::MULReduceMasked, Double256VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector256Tests::MULReduceMasked, DoubleVector256Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.min(res, a[i]);
         }
@@ -2571,7 +2640,7 @@ relativeError));
     }
 
     static double MINReduceAll(double[] a) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduce(a, i));
         }
@@ -2580,32 +2649,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINReduceDouble256VectorTests(IntFunction<double[]> fa) {
+    static void MINReduceDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                double v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::MINReduce, Double256VectorTests::MINReduceAll);
+                DoubleVector256Tests::MINReduce, DoubleVector256Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MIN_IDENTITY;
+
+        assertEquals((double) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.min(id, x), x);
+                assertEquals((double) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.min(res, a[i]);
@@ -2615,7 +2702,7 @@ relativeError));
     }
 
     static double MINReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2624,34 +2711,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                double v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::MINReduceMasked, Double256VectorTests::MINReduceAllMasked);
+                DoubleVector256Tests::MINReduceMasked, DoubleVector256Tests::MINReduceAllMasked);
     }
 
     static double MAXReduce(double[] a, int idx) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.max(res, a[i]);
         }
@@ -2660,7 +2742,7 @@ relativeError));
     }
 
     static double MAXReduceAll(double[] a) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduce(a, i));
         }
@@ -2669,32 +2751,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXReduceDouble256VectorTests(IntFunction<double[]> fa) {
+    static void MAXReduceDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                double v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::MAXReduce, Double256VectorTests::MAXReduceAll);
+                DoubleVector256Tests::MAXReduce, DoubleVector256Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MAX_IDENTITY;
+
+        assertEquals((double) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.max(id, x), x);
+                assertEquals((double) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.max(res, a[i]);
@@ -2704,7 +2804,7 @@ relativeError));
     }
 
     static double MAXReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2713,34 +2813,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                double v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::MAXReduceMasked, Double256VectorTests::MAXReduceAllMasked);
+                DoubleVector256Tests::MAXReduceMasked, DoubleVector256Tests::MAXReduceAllMasked);
     }
 
     static double FIRST_NONZEROReduce(double[] a, int idx) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2749,7 +2844,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAll(double[] a) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2758,32 +2853,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void FIRST_NONZEROReduceDouble256VectorTests(IntFunction<double[]> fa) {
+    static void FIRST_NONZEROReduceDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::FIRST_NONZEROReduce, Double256VectorTests::FIRST_NONZEROReduceAll);
+                DoubleVector256Tests::FIRST_NONZEROReduce, DoubleVector256Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static double FIRST_NONZEROReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2793,7 +2906,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAllMasked(double[] a, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2802,34 +2915,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::FIRST_NONZEROReduceMasked, Double256VectorTests::FIRST_NONZEROReduceAllMasked);
+                DoubleVector256Tests::FIRST_NONZEROReduceMasked, DoubleVector256Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void withDouble256VectorTests(IntFunction<double []> fa, IntFunction<double []> fb) {
+    static void withDoubleVector256Tests(IntFunction<double []> fa, IntFunction<double []> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2852,7 +2960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_DEFAULTDouble256VectorTests(IntFunction<double[]> fa) {
+    static void IS_DEFAULTDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2862,14 +2970,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2882,7 +2990,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2893,7 +3001,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NEGATIVEDouble256VectorTests(IntFunction<double[]> fa) {
+    static void IS_NEGATIVEDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2903,14 +3011,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2923,7 +3031,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2934,7 +3042,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_FINITEDouble256VectorTests(IntFunction<double[]> fa) {
+    static void IS_FINITEDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2944,14 +3052,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2964,7 +3072,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2975,7 +3083,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NANDouble256VectorTests(IntFunction<double[]> fa) {
+    static void IS_NANDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2985,14 +3093,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void IS_NANMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3005,7 +3113,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3016,7 +3124,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_INFINITEDouble256VectorTests(IntFunction<double[]> fa) {
+    static void IS_INFINITEDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3026,14 +3134,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3046,14 +3154,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3065,14 +3173,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3084,14 +3192,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LTDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3107,14 +3215,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GTDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GTDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3126,14 +3234,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GTDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GTDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3149,14 +3257,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3168,14 +3276,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3187,14 +3295,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void EQDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3210,14 +3318,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void NEDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void NEDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3229,14 +3337,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void NEDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void NEDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3252,14 +3360,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LEDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LEDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3271,14 +3379,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LEDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LEDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3294,14 +3402,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GEDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GEDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3313,14 +3421,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GEDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GEDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3336,14 +3444,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3353,13 +3461,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3373,13 +3481,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble256VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector256TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3389,13 +3497,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3409,13 +3517,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3425,13 +3533,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3445,13 +3553,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble256VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector256TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3461,13 +3569,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3481,7 +3589,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
             }
         }
     }
@@ -3491,7 +3599,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3507,11 +3615,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, DoubleVector256Tests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
-    static void RearrangeDouble256VectorTests(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector256Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3528,7 +3636,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
-    static void RearrangeDouble256VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector256TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -3546,7 +3654,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void compressDouble256VectorTests(IntFunction<double[]> fa,
+    static void compressDoubleVector256Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3564,7 +3672,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void expandDouble256VectorTests(IntFunction<double[]> fa,
+    static void expandDoubleVector256Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3582,7 +3690,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void getDouble256VectorTests(IntFunction<double[]> fa) {
+    static void getDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -3738,7 +3846,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void BroadcastDouble256VectorTests(IntFunction<double[]> fa) {
+    static void BroadcastDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3752,7 +3860,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ZeroDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ZeroDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3762,7 +3870,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static double[] sliceUnary(double[] a, int origin, int idx) {
@@ -3777,7 +3885,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sliceUnaryDouble256VectorTests(IntFunction<double[]> fa) {
+    static void sliceUnaryDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3788,7 +3896,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector256Tests::sliceUnary);
     }
 
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
@@ -3805,7 +3913,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void sliceBinaryDouble256VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void sliceBinaryDoubleVector256TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3818,7 +3926,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Double256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, DoubleVector256Tests::sliceBinary);
     }
 
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
@@ -3835,7 +3943,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void sliceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void sliceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3852,7 +3960,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Double256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, DoubleVector256Tests::slice);
     }
 
     static double[] unsliceUnary(double[] a, int origin, int idx) {
@@ -3869,7 +3977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void unsliceUnaryDouble256VectorTests(IntFunction<double[]> fa) {
+    static void unsliceUnaryDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3880,7 +3988,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector256Tests::unsliceUnary);
     }
 
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
@@ -3906,7 +4014,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void unsliceBinaryDouble256VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void unsliceBinaryDoubleVector256TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3920,7 +4028,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Double256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, DoubleVector256Tests::unsliceBinary);
     }
 
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3960,7 +4068,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void unsliceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void unsliceDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3977,7 +4085,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Double256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, DoubleVector256Tests::unslice);
     }
 
     static double SIN(double a) {
@@ -3989,7 +4097,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINDouble256VectorTests(IntFunction<double[]> fa) {
+    static void SINDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4000,7 +4108,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::SIN, Double256VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::SIN, DoubleVector256Tests::strictSIN);
     }
 
     static double EXP(double a) {
@@ -4012,7 +4120,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPDouble256VectorTests(IntFunction<double[]> fa) {
+    static void EXPDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4023,7 +4131,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::EXP, Double256VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::EXP, DoubleVector256Tests::strictEXP);
     }
 
     static double LOG1P(double a) {
@@ -4035,7 +4143,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG1PDouble256VectorTests(IntFunction<double[]> fa) {
+    static void LOG1PDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4046,7 +4154,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::LOG1P, Double256VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::LOG1P, DoubleVector256Tests::strictLOG1P);
     }
 
     static double LOG(double a) {
@@ -4058,7 +4166,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOGDouble256VectorTests(IntFunction<double[]> fa) {
+    static void LOGDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4069,7 +4177,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::LOG, Double256VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::LOG, DoubleVector256Tests::strictLOG);
     }
 
     static double LOG10(double a) {
@@ -4081,7 +4189,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG10Double256VectorTests(IntFunction<double[]> fa) {
+    static void LOG10DoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4092,7 +4200,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::LOG10, Double256VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::LOG10, DoubleVector256Tests::strictLOG10);
     }
 
     static double EXPM1(double a) {
@@ -4104,7 +4212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPM1Double256VectorTests(IntFunction<double[]> fa) {
+    static void EXPM1DoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4115,7 +4223,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::EXPM1, Double256VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::EXPM1, DoubleVector256Tests::strictEXPM1);
     }
 
     static double COS(double a) {
@@ -4127,7 +4235,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSDouble256VectorTests(IntFunction<double[]> fa) {
+    static void COSDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4138,7 +4246,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::COS, Double256VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::COS, DoubleVector256Tests::strictCOS);
     }
 
     static double TAN(double a) {
@@ -4150,7 +4258,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANDouble256VectorTests(IntFunction<double[]> fa) {
+    static void TANDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4161,7 +4269,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::TAN, Double256VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::TAN, DoubleVector256Tests::strictTAN);
     }
 
     static double SINH(double a) {
@@ -4173,7 +4281,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINHDouble256VectorTests(IntFunction<double[]> fa) {
+    static void SINHDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4184,7 +4292,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::SINH, Double256VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::SINH, DoubleVector256Tests::strictSINH);
     }
 
     static double COSH(double a) {
@@ -4196,7 +4304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSHDouble256VectorTests(IntFunction<double[]> fa) {
+    static void COSHDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4207,7 +4315,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::COSH, Double256VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::COSH, DoubleVector256Tests::strictCOSH);
     }
 
     static double TANH(double a) {
@@ -4219,7 +4327,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANHDouble256VectorTests(IntFunction<double[]> fa) {
+    static void TANHDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4230,7 +4338,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::TANH, Double256VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::TANH, DoubleVector256Tests::strictTANH);
     }
 
     static double ASIN(double a) {
@@ -4242,7 +4350,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ASINDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ASINDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4253,7 +4361,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::ASIN, Double256VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::ASIN, DoubleVector256Tests::strictASIN);
     }
 
     static double ACOS(double a) {
@@ -4265,7 +4373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ACOSDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ACOSDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4276,7 +4384,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::ACOS, Double256VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::ACOS, DoubleVector256Tests::strictACOS);
     }
 
     static double ATAN(double a) {
@@ -4288,7 +4396,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ATANDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ATANDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4299,7 +4407,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::ATAN, Double256VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::ATAN, DoubleVector256Tests::strictATAN);
     }
 
     static double CBRT(double a) {
@@ -4311,7 +4419,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void CBRTDouble256VectorTests(IntFunction<double[]> fa) {
+    static void CBRTDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4322,7 +4430,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double256VectorTests::CBRT, Double256VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector256Tests::CBRT, DoubleVector256Tests::strictCBRT);
     }
 
     static double HYPOT(double a, double b) {
@@ -4334,7 +4442,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void HYPOTDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void HYPOTDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4347,7 +4455,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::HYPOT, Double256VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector256Tests::HYPOT, DoubleVector256Tests::strictHYPOT);
     }
 
 
@@ -4360,7 +4468,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4373,7 +4481,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::POW, Double256VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector256Tests::POW, DoubleVector256Tests::strictPOW);
     }
 
 
@@ -4386,7 +4494,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4399,7 +4507,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::pow, Double256VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector256Tests::pow, DoubleVector256Tests::strictpow);
     }
 
 
@@ -4412,7 +4520,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ATAN2Double256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ATAN2DoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4425,12 +4533,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::ATAN2, Double256VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector256Tests::ATAN2, DoubleVector256Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4440,12 +4548,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::POW, Double256VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector256Tests::POW, DoubleVector256Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4455,7 +4563,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double256VectorTests::pow, Double256VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector256Tests::pow, DoubleVector256Tests::strictpow);
     }
 
 
@@ -4468,7 +4576,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4490,11 +4598,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Double256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4514,11 +4622,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Double256VectorTests::fma);
+        assertArraysEquals(r, a, b, c, DoubleVector256Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4543,11 +4651,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4558,11 +4666,11 @@ relativeError));
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Double256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble256VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector256TestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4573,11 +4681,11 @@ relativeError));
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Double256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4592,11 +4700,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector256TestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4611,11 +4719,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble256VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector256TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4633,11 +4741,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector256Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble256VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector256TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4655,11 +4763,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double256VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector256Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector256TestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4680,7 +4788,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleVector256Tests::FMA);
     }
 
     static double NEG(double a) {
@@ -4692,7 +4800,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void NEGDouble256VectorTests(IntFunction<double[]> fa) {
+    static void NEGDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4703,11 +4811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::NEG);
+        assertArraysEquals(r, a, DoubleVector256Tests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void negDouble256VectorTests(IntFunction<double[]> fa) {
+    static void negDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4718,11 +4826,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::neg);
+        assertArraysEquals(r, a, DoubleVector256Tests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void NEGMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void NEGMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4736,7 +4844,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, DoubleVector256Tests::NEG);
     }
 
     static double ABS(double a) {
@@ -4748,7 +4856,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ABSDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ABSDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4759,11 +4867,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::ABS);
+        assertArraysEquals(r, a, DoubleVector256Tests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void absDouble256VectorTests(IntFunction<double[]> fa) {
+    static void absDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4774,11 +4882,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::abs);
+        assertArraysEquals(r, a, DoubleVector256Tests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ABSMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void ABSMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4792,7 +4900,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, DoubleVector256Tests::ABS);
     }
 
     static double SQRT(double a) {
@@ -4804,7 +4912,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SQRTDouble256VectorTests(IntFunction<double[]> fa) {
+    static void SQRTDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4815,11 +4923,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::SQRT);
+        assertArraysEquals(r, a, DoubleVector256Tests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sqrtDouble256VectorTests(IntFunction<double[]> fa) {
+    static void sqrtDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4830,11 +4938,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::sqrt);
+        assertArraysEquals(r, a, DoubleVector256Tests::sqrt);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void SQRTMaskedDouble256VectorTests(IntFunction<double[]> fa,
+    static void SQRTMaskedDoubleVector256Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4848,7 +4956,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double256VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, DoubleVector256Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4856,7 +4964,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandDoubleVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4869,7 +4977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::band);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4877,7 +4985,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorDoubleVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4890,7 +4998,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::bor);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4898,7 +5006,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorDoubleVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4911,7 +5019,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::bxor);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4919,7 +5027,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotDoubleVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4932,7 +5040,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::bandNot);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4940,7 +5048,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqDoubleVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4953,7 +5061,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double256VectorTests::beq);
+        assertArraysEquals(r, a, b, DoubleVector256Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4961,7 +5069,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotDouble256VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotDoubleVector256Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4972,7 +5080,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double256VectorTests::unot);
+        assertArraysEquals(r, a, DoubleVector256Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4981,15 +5089,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble256VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongDoubleVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5003,7 +5111,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble256VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector256TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5013,13 +5121,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble256VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector256TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5029,13 +5137,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubletoIntUnaryOpProvider")
-    static void toIntArrayDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toIntArrayDoubleVector256TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5046,7 +5154,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void toLongArrayDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toLongArrayDoubleVector256TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5058,7 +5166,7 @@ relativeError));
 
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void toStringDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toStringDoubleVector256TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5071,7 +5179,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void hashCodeDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void hashCodeDoubleVector256TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5104,7 +5212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceLongDouble256VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceLongDoubleVector256Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5120,7 +5228,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Double256VectorTests::ADDReduceLong, Double256VectorTests::ADDReduceAllLong);
+                DoubleVector256Tests::ADDReduceLong, DoubleVector256Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(double[] a, int idx, boolean[] mask) {
@@ -5143,7 +5251,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceLongDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongDoubleVector256TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5161,11 +5269,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::ADDReduceLongMasked, Double256VectorTests::ADDReduceAllLongMasked);
+                DoubleVector256Tests::ADDReduceLongMasked, DoubleVector256Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void BroadcastLongDouble256VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void BroadcastLongDoubleVector256TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -5176,7 +5284,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble256VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector256TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -5190,12 +5298,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector256Tests::blend);
     }
 
 
     @Test(dataProvider = "doubleUnaryOpSelectFromProvider")
-    static void SelectFromDouble256VectorTests(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector256Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,double[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         double[] order = fs.apply(a.length, SPECIES.length());
@@ -5211,7 +5319,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorDouble256VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void SelectFromTwoVectorDoubleVector256Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] idx = fc.apply(SPECIES.length());
@@ -5229,7 +5337,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
-    static void SelectFromDouble256VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector256TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                            BiFunction<Integer,Integer,double[]> fs,
                                                            IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -5248,7 +5356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousDouble256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousDoubleVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5259,12 +5367,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringDouble256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringDoubleVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5278,7 +5386,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsDouble256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsDoubleVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5287,12 +5395,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsDouble256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsDoubleVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5302,13 +5410,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeDoubleVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5330,7 +5438,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountDoubleVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5341,7 +5449,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double256VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, DoubleVector256Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5355,7 +5463,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueDoubleVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5366,7 +5474,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double256VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector256Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5380,7 +5488,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueDoubleVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5391,11 +5499,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double256VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector256Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressDouble256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressDoubleVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5405,7 +5513,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5423,7 +5531,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeDouble256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeDoubleVector256TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5431,13 +5539,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongDouble256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongDoubleVector256TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5445,7 +5553,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5464,36 +5572,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundDouble256VectorTestsSmokeTest(int length) {
+    static void loopBoundDoubleVector256TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongDouble256VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongDoubleVector256TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeDouble256VectorTestsSmokeTest() {
+    static void ElementSizeDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Double.SIZE);
+        assertEquals(elsize, Double.SIZE);
     }
 
     @Test
-    static void VectorShapeDouble256VectorTestsSmokeTest() {
+    static void VectorShapeDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_256_BIT));
     }
 
     @Test
-    static void ShapeWithLanesDouble256VectorTestsSmokeTest() {
+    static void ShapeWithLanesDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(double.class);
@@ -5501,32 +5609,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeDouble256VectorTestsSmokeTest() {
+    static void ElementTypeDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementType() == double.class);
     }
 
     @Test
-    static void SpeciesElementSizeDouble256VectorTestsSmokeTest() {
+    static void SpeciesElementSizeDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementSize() == Double.SIZE);
     }
 
     @Test
-    static void VectorTypeDouble256VectorTestsSmokeTest() {
+    static void VectorTypeDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesDouble256VectorTestsSmokeTest() {
+    static void WithLanesDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(double.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeDouble256VectorTestsSmokeTest() {
+    static void WithShapeDoubleVector256TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5534,9 +5642,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueDouble256VectorTestsSmokeTest() {
+    static void MaskAllTrueDoubleVector256TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleVector512LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector512LoadStoreTests.java
index ddf76df1f3a..cb60f7363af 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector512LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Double512VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation DoubleVector512LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class DoubleVector512LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_512;
 
@@ -61,14 +61,29 @@ public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(double[] r, double[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Double512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/DoubleVector512Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Double512VectorTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector512Tests.java
index 91a4669a1b1..534470e194c 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector512Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Double512VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation DoubleVector512Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,57 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Double512VectorTests extends AbstractVectorTest {
+public class DoubleVector512Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(double actual, double expected, double delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(double actual, double expected, double delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final double ADD_IDENTITY = (double)0;
+    private static final double FIRST_NONZERO_IDENTITY = (double)0;
+    private static final double MAX_IDENTITY = Double.NEGATIVE_INFINITY;
+    private static final double MIN_IDENTITY = Double.POSITIVE_INFINITY;
+    private static final double MUL_IDENTITY = (double)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
 
@@ -89,10 +132,10 @@ public class Double512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +147,13 @@ public class Double512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +163,10 @@ public class Double512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +188,13 @@ public class Double512VectorTests extends AbstractVectorTest {
                                             double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +216,14 @@ public class Double512VectorTests extends AbstractVectorTest {
                                             double relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +239,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +261,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +279,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +294,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +306,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +322,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (double)0);
+                    assertEquals(r[i + k], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +347,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (double)0);
+                        assertEquals(r[i + j], (double)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +375,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +388,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +403,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +423,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +447,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +462,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +477,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +501,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +527,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +546,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +557,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +568,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +580,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +596,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +611,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +626,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +644,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +660,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +678,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +704,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +722,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +746,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +761,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +773,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +786,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +805,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +826,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +841,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +862,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +958,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +985,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1006,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1033,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1053,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1074,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1095,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1117,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1169,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1215,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1578,7 +1621,7 @@ relativeError));
         // Do some zipping and shuffling.
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         DoubleVector a = io.add((double)1); //[1,2]
         DoubleVector b = a.neg();  //[-1,-2]
         double[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1593,19 +1636,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Double> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Double> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         DoubleVector uab0 = zab0.rearrange(unz0,zab1);
         DoubleVector uab1 = zab0.rearrange(unz1,zab1);
         double[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1622,15 +1665,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static double ADD(double a, double b) {
@@ -1638,7 +1681,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1651,7 +1694,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::ADD);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::ADD);
     }
 
     static double add(double a, double b) {
@@ -1659,7 +1702,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1670,11 +1713,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::add);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1690,11 +1733,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1708,7 +1751,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::add);
     }
 
     static double SUB(double a, double b) {
@@ -1716,7 +1759,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void SUBDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void SUBDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1729,7 +1772,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::SUB);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::SUB);
     }
 
     static double sub(double a, double b) {
@@ -1737,7 +1780,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1748,11 +1791,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::sub);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void SUBDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void SUBDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1768,11 +1811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1786,7 +1829,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::sub);
     }
 
     static double MUL(double a, double b) {
@@ -1794,7 +1837,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MULDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MULDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1807,7 +1850,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::MUL);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::MUL);
     }
 
     static double mul(double a, double b) {
@@ -1815,7 +1858,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1826,11 +1869,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::mul);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void MULDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void MULDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1846,11 +1889,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1864,7 +1907,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1872,7 +1915,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void DIVDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void DIVDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1885,7 +1928,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::DIV);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::DIV);
     }
 
     static double div(double a, double b) {
@@ -1893,7 +1936,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1904,11 +1947,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::div);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void DIVDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void DIVDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1924,11 +1967,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1942,7 +1985,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::div);
     }
 
     static double FIRST_NONZERO(double a, double b) {
@@ -1950,7 +1993,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void FIRST_NONZERODouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void FIRST_NONZERODoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1963,11 +2006,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void FIRST_NONZERODouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FIRST_NONZERODoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1983,11 +2026,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1997,11 +2040,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2014,11 +2057,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector512Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2028,11 +2071,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2045,11 +2088,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector512Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2059,11 +2102,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2076,11 +2119,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector512Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2090,11 +2133,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2107,11 +2150,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector512Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble512VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector512TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2121,11 +2164,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Double512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, DoubleVector512Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2138,13 +2181,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector512Tests::ADD);
     }
 
     static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MINDoubleVector512TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2155,13 +2198,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double512VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, DoubleVector512Tests::MIN);
     }
 
     static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void minDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void minDoubleVector512TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2172,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double512VectorTests::min);
+        assertArraysEquals(r, a, (double)10, DoubleVector512Tests::min);
     }
 
     static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINDouble512VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINDoubleVector512TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2191,13 +2234,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double512VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector512Tests::MIN);
     }
 
     static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MAXDoubleVector512TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2208,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double512VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, DoubleVector512Tests::MAX);
     }
 
     static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void maxDouble512VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void maxDoubleVector512TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2225,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double512VectorTests::max);
+        assertArraysEquals(r, a, (double)10, DoubleVector512Tests::max);
     }
 
     static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXDouble512VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXDoubleVector512TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2244,7 +2287,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double512VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector512Tests::MAX);
     }
 
     static double MIN(double a, double b) {
@@ -2252,7 +2295,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2265,7 +2308,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::MIN);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::MIN);
     }
 
     static double min(double a, double b) {
@@ -2273,7 +2316,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2284,7 +2327,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::min);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::min);
     }
 
     static double MAX(double a, double b) {
@@ -2292,7 +2335,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2305,7 +2348,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::MAX);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::MAX);
     }
 
     static double max(double a, double b) {
@@ -2313,7 +2356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2324,11 +2367,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::max);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2338,11 +2381,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2352,11 +2395,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2366,11 +2409,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2380,11 +2423,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector512Tests::max);
     }
 
     static double ADDReduce(double[] a, int idx) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2393,7 +2436,7 @@ relativeError));
     }
 
     static double ADDReduceAll(double[] a) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2402,32 +2445,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                double v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::ADDReduce, Double512VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector512Tests::ADDReduce, DoubleVector512Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = ADD_IDENTITY;
+
+        assertEquals((double) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id + x), x);
+                assertEquals((double) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2437,7 +2498,7 @@ relativeError));
     }
 
     static double ADDReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2446,7 +2507,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2454,26 +2515,21 @@ relativeError));
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                double v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::ADDReduceMasked, Double512VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector512Tests::ADDReduceMasked, DoubleVector512Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2482,7 +2538,7 @@ relativeError));
     }
 
     static double MULReduceAll(double[] a) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2491,32 +2547,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MULReduceDouble512VectorTests(IntFunction<double[]> fa) {
+    static void MULReduceDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                double v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::MULReduce, Double512VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector512Tests::MULReduce, DoubleVector512Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MUL_IDENTITY;
+
+        assertEquals((double) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id * x), x);
+                assertEquals((double) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2526,7 +2600,7 @@ relativeError));
     }
 
     static double MULReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2535,34 +2609,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MULReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                double v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::MULReduceMasked, Double512VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector512Tests::MULReduceMasked, DoubleVector512Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.min(res, a[i]);
         }
@@ -2571,7 +2640,7 @@ relativeError));
     }
 
     static double MINReduceAll(double[] a) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduce(a, i));
         }
@@ -2580,32 +2649,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINReduceDouble512VectorTests(IntFunction<double[]> fa) {
+    static void MINReduceDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                double v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::MINReduce, Double512VectorTests::MINReduceAll);
+                DoubleVector512Tests::MINReduce, DoubleVector512Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MIN_IDENTITY;
+
+        assertEquals((double) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.min(id, x), x);
+                assertEquals((double) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.min(res, a[i]);
@@ -2615,7 +2702,7 @@ relativeError));
     }
 
     static double MINReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2624,34 +2711,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                double v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::MINReduceMasked, Double512VectorTests::MINReduceAllMasked);
+                DoubleVector512Tests::MINReduceMasked, DoubleVector512Tests::MINReduceAllMasked);
     }
 
     static double MAXReduce(double[] a, int idx) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.max(res, a[i]);
         }
@@ -2660,7 +2742,7 @@ relativeError));
     }
 
     static double MAXReduceAll(double[] a) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduce(a, i));
         }
@@ -2669,32 +2751,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXReduceDouble512VectorTests(IntFunction<double[]> fa) {
+    static void MAXReduceDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                double v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::MAXReduce, Double512VectorTests::MAXReduceAll);
+                DoubleVector512Tests::MAXReduce, DoubleVector512Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MAX_IDENTITY;
+
+        assertEquals((double) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.max(id, x), x);
+                assertEquals((double) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.max(res, a[i]);
@@ -2704,7 +2804,7 @@ relativeError));
     }
 
     static double MAXReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2713,34 +2813,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                double v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::MAXReduceMasked, Double512VectorTests::MAXReduceAllMasked);
+                DoubleVector512Tests::MAXReduceMasked, DoubleVector512Tests::MAXReduceAllMasked);
     }
 
     static double FIRST_NONZEROReduce(double[] a, int idx) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2749,7 +2844,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAll(double[] a) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2758,32 +2853,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void FIRST_NONZEROReduceDouble512VectorTests(IntFunction<double[]> fa) {
+    static void FIRST_NONZEROReduceDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::FIRST_NONZEROReduce, Double512VectorTests::FIRST_NONZEROReduceAll);
+                DoubleVector512Tests::FIRST_NONZEROReduce, DoubleVector512Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static double FIRST_NONZEROReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2793,7 +2906,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAllMasked(double[] a, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2802,34 +2915,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::FIRST_NONZEROReduceMasked, Double512VectorTests::FIRST_NONZEROReduceAllMasked);
+                DoubleVector512Tests::FIRST_NONZEROReduceMasked, DoubleVector512Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void withDouble512VectorTests(IntFunction<double []> fa, IntFunction<double []> fb) {
+    static void withDoubleVector512Tests(IntFunction<double []> fa, IntFunction<double []> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2852,7 +2960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_DEFAULTDouble512VectorTests(IntFunction<double[]> fa) {
+    static void IS_DEFAULTDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2862,14 +2970,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2882,7 +2990,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2893,7 +3001,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NEGATIVEDouble512VectorTests(IntFunction<double[]> fa) {
+    static void IS_NEGATIVEDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2903,14 +3011,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2923,7 +3031,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2934,7 +3042,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_FINITEDouble512VectorTests(IntFunction<double[]> fa) {
+    static void IS_FINITEDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2944,14 +3052,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2964,7 +3072,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2975,7 +3083,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NANDouble512VectorTests(IntFunction<double[]> fa) {
+    static void IS_NANDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2985,14 +3093,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void IS_NANMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3005,7 +3113,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3016,7 +3124,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_INFINITEDouble512VectorTests(IntFunction<double[]> fa) {
+    static void IS_INFINITEDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3026,14 +3134,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3046,14 +3154,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3065,14 +3173,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3084,14 +3192,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LTDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3107,14 +3215,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GTDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GTDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3126,14 +3234,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GTDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GTDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3149,14 +3257,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3168,14 +3276,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3187,14 +3295,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void EQDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3210,14 +3318,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void NEDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void NEDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3229,14 +3337,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void NEDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void NEDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3252,14 +3360,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LEDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LEDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3271,14 +3379,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LEDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LEDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3294,14 +3402,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GEDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GEDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3313,14 +3421,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GEDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GEDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3336,14 +3444,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3353,13 +3461,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3373,13 +3481,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble512VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector512TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3389,13 +3497,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3409,13 +3517,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3425,13 +3533,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3445,13 +3553,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble512VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector512TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3461,13 +3569,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3481,7 +3589,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
             }
         }
     }
@@ -3491,7 +3599,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3507,11 +3615,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, DoubleVector512Tests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
-    static void RearrangeDouble512VectorTests(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector512Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3528,7 +3636,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
-    static void RearrangeDouble512VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector512TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -3546,7 +3654,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void compressDouble512VectorTests(IntFunction<double[]> fa,
+    static void compressDoubleVector512Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3564,7 +3672,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void expandDouble512VectorTests(IntFunction<double[]> fa,
+    static void expandDoubleVector512Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3582,7 +3690,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void getDouble512VectorTests(IntFunction<double[]> fa) {
+    static void getDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -3738,7 +3846,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void BroadcastDouble512VectorTests(IntFunction<double[]> fa) {
+    static void BroadcastDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3752,7 +3860,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ZeroDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ZeroDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3762,7 +3870,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static double[] sliceUnary(double[] a, int origin, int idx) {
@@ -3777,7 +3885,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sliceUnaryDouble512VectorTests(IntFunction<double[]> fa) {
+    static void sliceUnaryDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3788,7 +3896,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector512Tests::sliceUnary);
     }
 
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
@@ -3805,7 +3913,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void sliceBinaryDouble512VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void sliceBinaryDoubleVector512TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3818,7 +3926,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Double512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, DoubleVector512Tests::sliceBinary);
     }
 
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
@@ -3835,7 +3943,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void sliceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void sliceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3852,7 +3960,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Double512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, DoubleVector512Tests::slice);
     }
 
     static double[] unsliceUnary(double[] a, int origin, int idx) {
@@ -3869,7 +3977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void unsliceUnaryDouble512VectorTests(IntFunction<double[]> fa) {
+    static void unsliceUnaryDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3880,7 +3988,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector512Tests::unsliceUnary);
     }
 
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
@@ -3906,7 +4014,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void unsliceBinaryDouble512VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void unsliceBinaryDoubleVector512TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3920,7 +4028,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Double512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, DoubleVector512Tests::unsliceBinary);
     }
 
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3960,7 +4068,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void unsliceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void unsliceDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3977,7 +4085,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Double512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, DoubleVector512Tests::unslice);
     }
 
     static double SIN(double a) {
@@ -3989,7 +4097,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINDouble512VectorTests(IntFunction<double[]> fa) {
+    static void SINDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4000,7 +4108,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::SIN, Double512VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::SIN, DoubleVector512Tests::strictSIN);
     }
 
     static double EXP(double a) {
@@ -4012,7 +4120,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPDouble512VectorTests(IntFunction<double[]> fa) {
+    static void EXPDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4023,7 +4131,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::EXP, Double512VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::EXP, DoubleVector512Tests::strictEXP);
     }
 
     static double LOG1P(double a) {
@@ -4035,7 +4143,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG1PDouble512VectorTests(IntFunction<double[]> fa) {
+    static void LOG1PDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4046,7 +4154,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::LOG1P, Double512VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::LOG1P, DoubleVector512Tests::strictLOG1P);
     }
 
     static double LOG(double a) {
@@ -4058,7 +4166,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOGDouble512VectorTests(IntFunction<double[]> fa) {
+    static void LOGDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4069,7 +4177,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::LOG, Double512VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::LOG, DoubleVector512Tests::strictLOG);
     }
 
     static double LOG10(double a) {
@@ -4081,7 +4189,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG10Double512VectorTests(IntFunction<double[]> fa) {
+    static void LOG10DoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4092,7 +4200,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::LOG10, Double512VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::LOG10, DoubleVector512Tests::strictLOG10);
     }
 
     static double EXPM1(double a) {
@@ -4104,7 +4212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPM1Double512VectorTests(IntFunction<double[]> fa) {
+    static void EXPM1DoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4115,7 +4223,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::EXPM1, Double512VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::EXPM1, DoubleVector512Tests::strictEXPM1);
     }
 
     static double COS(double a) {
@@ -4127,7 +4235,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSDouble512VectorTests(IntFunction<double[]> fa) {
+    static void COSDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4138,7 +4246,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::COS, Double512VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::COS, DoubleVector512Tests::strictCOS);
     }
 
     static double TAN(double a) {
@@ -4150,7 +4258,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANDouble512VectorTests(IntFunction<double[]> fa) {
+    static void TANDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4161,7 +4269,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::TAN, Double512VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::TAN, DoubleVector512Tests::strictTAN);
     }
 
     static double SINH(double a) {
@@ -4173,7 +4281,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINHDouble512VectorTests(IntFunction<double[]> fa) {
+    static void SINHDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4184,7 +4292,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::SINH, Double512VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::SINH, DoubleVector512Tests::strictSINH);
     }
 
     static double COSH(double a) {
@@ -4196,7 +4304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSHDouble512VectorTests(IntFunction<double[]> fa) {
+    static void COSHDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4207,7 +4315,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::COSH, Double512VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::COSH, DoubleVector512Tests::strictCOSH);
     }
 
     static double TANH(double a) {
@@ -4219,7 +4327,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANHDouble512VectorTests(IntFunction<double[]> fa) {
+    static void TANHDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4230,7 +4338,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::TANH, Double512VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::TANH, DoubleVector512Tests::strictTANH);
     }
 
     static double ASIN(double a) {
@@ -4242,7 +4350,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ASINDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ASINDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4253,7 +4361,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::ASIN, Double512VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::ASIN, DoubleVector512Tests::strictASIN);
     }
 
     static double ACOS(double a) {
@@ -4265,7 +4373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ACOSDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ACOSDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4276,7 +4384,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::ACOS, Double512VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::ACOS, DoubleVector512Tests::strictACOS);
     }
 
     static double ATAN(double a) {
@@ -4288,7 +4396,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ATANDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ATANDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4299,7 +4407,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::ATAN, Double512VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::ATAN, DoubleVector512Tests::strictATAN);
     }
 
     static double CBRT(double a) {
@@ -4311,7 +4419,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void CBRTDouble512VectorTests(IntFunction<double[]> fa) {
+    static void CBRTDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4322,7 +4430,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double512VectorTests::CBRT, Double512VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector512Tests::CBRT, DoubleVector512Tests::strictCBRT);
     }
 
     static double HYPOT(double a, double b) {
@@ -4334,7 +4442,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void HYPOTDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void HYPOTDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4347,7 +4455,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::HYPOT, Double512VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector512Tests::HYPOT, DoubleVector512Tests::strictHYPOT);
     }
 
 
@@ -4360,7 +4468,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4373,7 +4481,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::POW, Double512VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector512Tests::POW, DoubleVector512Tests::strictPOW);
     }
 
 
@@ -4386,7 +4494,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4399,7 +4507,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::pow, Double512VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector512Tests::pow, DoubleVector512Tests::strictpow);
     }
 
 
@@ -4412,7 +4520,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ATAN2Double512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ATAN2DoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4425,12 +4533,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::ATAN2, Double512VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector512Tests::ATAN2, DoubleVector512Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4440,12 +4548,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::POW, Double512VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector512Tests::POW, DoubleVector512Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4455,7 +4563,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double512VectorTests::pow, Double512VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector512Tests::pow, DoubleVector512Tests::strictpow);
     }
 
 
@@ -4468,7 +4576,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4490,11 +4598,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Double512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4514,11 +4622,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Double512VectorTests::fma);
+        assertArraysEquals(r, a, b, c, DoubleVector512Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4543,11 +4651,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4558,11 +4666,11 @@ relativeError));
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Double512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble512VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector512TestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4573,11 +4681,11 @@ relativeError));
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Double512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4592,11 +4700,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector512TestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4611,11 +4719,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble512VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector512TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4633,11 +4741,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector512Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble512VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector512TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4655,11 +4763,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double512VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector512Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector512TestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4680,7 +4788,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleVector512Tests::FMA);
     }
 
     static double NEG(double a) {
@@ -4692,7 +4800,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void NEGDouble512VectorTests(IntFunction<double[]> fa) {
+    static void NEGDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4703,11 +4811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::NEG);
+        assertArraysEquals(r, a, DoubleVector512Tests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void negDouble512VectorTests(IntFunction<double[]> fa) {
+    static void negDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4718,11 +4826,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::neg);
+        assertArraysEquals(r, a, DoubleVector512Tests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void NEGMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void NEGMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4736,7 +4844,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, DoubleVector512Tests::NEG);
     }
 
     static double ABS(double a) {
@@ -4748,7 +4856,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ABSDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ABSDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4759,11 +4867,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::ABS);
+        assertArraysEquals(r, a, DoubleVector512Tests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void absDouble512VectorTests(IntFunction<double[]> fa) {
+    static void absDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4774,11 +4882,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::abs);
+        assertArraysEquals(r, a, DoubleVector512Tests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ABSMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void ABSMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4792,7 +4900,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, DoubleVector512Tests::ABS);
     }
 
     static double SQRT(double a) {
@@ -4804,7 +4912,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SQRTDouble512VectorTests(IntFunction<double[]> fa) {
+    static void SQRTDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4815,11 +4923,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::SQRT);
+        assertArraysEquals(r, a, DoubleVector512Tests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sqrtDouble512VectorTests(IntFunction<double[]> fa) {
+    static void sqrtDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4830,11 +4938,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::sqrt);
+        assertArraysEquals(r, a, DoubleVector512Tests::sqrt);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void SQRTMaskedDouble512VectorTests(IntFunction<double[]> fa,
+    static void SQRTMaskedDoubleVector512Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4848,7 +4956,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double512VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, DoubleVector512Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4856,7 +4964,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandDoubleVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4869,7 +4977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::band);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4877,7 +4985,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorDoubleVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4890,7 +4998,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::bor);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4898,7 +5006,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorDoubleVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4911,7 +5019,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::bxor);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4919,7 +5027,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotDoubleVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4932,7 +5040,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::bandNot);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4940,7 +5048,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqDoubleVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4953,7 +5061,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double512VectorTests::beq);
+        assertArraysEquals(r, a, b, DoubleVector512Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4961,7 +5069,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotDouble512VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotDoubleVector512Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4972,7 +5080,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double512VectorTests::unot);
+        assertArraysEquals(r, a, DoubleVector512Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4981,15 +5089,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble512VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongDoubleVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5003,7 +5111,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble512VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector512TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5013,13 +5121,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble512VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector512TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5029,13 +5137,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubletoIntUnaryOpProvider")
-    static void toIntArrayDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toIntArrayDoubleVector512TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5046,7 +5154,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void toLongArrayDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toLongArrayDoubleVector512TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5058,7 +5166,7 @@ relativeError));
 
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void toStringDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toStringDoubleVector512TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5071,7 +5179,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void hashCodeDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void hashCodeDoubleVector512TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5104,7 +5212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceLongDouble512VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceLongDoubleVector512Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5120,7 +5228,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Double512VectorTests::ADDReduceLong, Double512VectorTests::ADDReduceAllLong);
+                DoubleVector512Tests::ADDReduceLong, DoubleVector512Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(double[] a, int idx, boolean[] mask) {
@@ -5143,7 +5251,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceLongDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongDoubleVector512TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5161,11 +5269,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::ADDReduceLongMasked, Double512VectorTests::ADDReduceAllLongMasked);
+                DoubleVector512Tests::ADDReduceLongMasked, DoubleVector512Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void BroadcastLongDouble512VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void BroadcastLongDoubleVector512TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -5176,7 +5284,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble512VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector512TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -5190,12 +5298,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector512Tests::blend);
     }
 
 
     @Test(dataProvider = "doubleUnaryOpSelectFromProvider")
-    static void SelectFromDouble512VectorTests(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector512Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,double[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         double[] order = fs.apply(a.length, SPECIES.length());
@@ -5211,7 +5319,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorDouble512VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void SelectFromTwoVectorDoubleVector512Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] idx = fc.apply(SPECIES.length());
@@ -5229,7 +5337,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
-    static void SelectFromDouble512VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector512TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                            BiFunction<Integer,Integer,double[]> fs,
                                                            IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -5248,7 +5356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousDouble512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousDoubleVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5259,12 +5367,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringDouble512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringDoubleVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5278,7 +5386,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsDouble512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsDoubleVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5287,12 +5395,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsDouble512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsDoubleVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5302,13 +5410,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeDoubleVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5330,7 +5438,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountDoubleVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5341,7 +5449,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double512VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, DoubleVector512Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5355,7 +5463,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueDoubleVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5366,7 +5474,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double512VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector512Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5380,7 +5488,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueDoubleVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5391,11 +5499,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double512VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector512Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressDouble512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressDoubleVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5405,7 +5513,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5423,7 +5531,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeDouble512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeDoubleVector512TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5431,13 +5539,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongDouble512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongDoubleVector512TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5445,7 +5553,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5464,36 +5572,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundDouble512VectorTestsSmokeTest(int length) {
+    static void loopBoundDoubleVector512TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongDouble512VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongDoubleVector512TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeDouble512VectorTestsSmokeTest() {
+    static void ElementSizeDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Double.SIZE);
+        assertEquals(elsize, Double.SIZE);
     }
 
     @Test
-    static void VectorShapeDouble512VectorTestsSmokeTest() {
+    static void VectorShapeDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_512_BIT));
     }
 
     @Test
-    static void ShapeWithLanesDouble512VectorTestsSmokeTest() {
+    static void ShapeWithLanesDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(double.class);
@@ -5501,32 +5609,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeDouble512VectorTestsSmokeTest() {
+    static void ElementTypeDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementType() == double.class);
     }
 
     @Test
-    static void SpeciesElementSizeDouble512VectorTestsSmokeTest() {
+    static void SpeciesElementSizeDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementSize() == Double.SIZE);
     }
 
     @Test
-    static void VectorTypeDouble512VectorTestsSmokeTest() {
+    static void VectorTypeDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesDouble512VectorTestsSmokeTest() {
+    static void WithLanesDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(double.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeDouble512VectorTestsSmokeTest() {
+    static void WithShapeDoubleVector512TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5534,9 +5642,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueDouble512VectorTestsSmokeTest() {
+    static void MaskAllTrueDoubleVector512TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleVector64LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector64LoadStoreTests.java
index e2c48d84529..f07f5be00db 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector64LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Double64VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation DoubleVector64LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class DoubleVector64LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_64;
 
@@ -61,14 +61,29 @@ public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(double[] r, double[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Double64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/DoubleVector64Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Double64VectorTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVector64Tests.java
index 659e18cd8af..7f9f8986f1f 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVector64Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Double64VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation DoubleVector64Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,57 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Double64VectorTests extends AbstractVectorTest {
+public class DoubleVector64Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_64;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(double actual, double expected, double delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(double actual, double expected, double delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final double ADD_IDENTITY = (double)0;
+    private static final double FIRST_NONZERO_IDENTITY = (double)0;
+    private static final double MAX_IDENTITY = Double.NEGATIVE_INFINITY;
+    private static final double MIN_IDENTITY = Double.POSITIVE_INFINITY;
+    private static final double MUL_IDENTITY = (double)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
 
@@ -89,10 +132,10 @@ public class Double64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +147,13 @@ public class Double64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +163,10 @@ public class Double64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +188,13 @@ public class Double64VectorTests extends AbstractVectorTest {
                                             double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +216,14 @@ public class Double64VectorTests extends AbstractVectorTest {
                                             double relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +239,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +261,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +279,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +294,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +306,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +322,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (double)0);
+                    assertEquals(r[i + k], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +347,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (double)0);
+                        assertEquals(r[i + j], (double)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +375,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +388,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +403,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +423,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +447,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +462,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +477,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +501,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +527,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +546,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +557,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +568,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +580,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +596,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +611,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +626,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +644,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +660,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +678,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +704,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +722,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +746,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +761,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +773,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +786,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +805,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +826,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +841,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +862,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +958,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +985,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1006,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1033,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1053,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1074,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1095,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1117,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1169,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1215,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1578,7 +1621,7 @@ relativeError));
         // Do some zipping and shuffling.
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         DoubleVector a = io.add((double)1); //[1,2]
         DoubleVector b = a.neg();  //[-1,-2]
         double[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1593,19 +1636,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Double> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Double> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         DoubleVector uab0 = zab0.rearrange(unz0,zab1);
         DoubleVector uab1 = zab0.rearrange(unz1,zab1);
         double[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1622,15 +1665,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static double ADD(double a, double b) {
@@ -1638,7 +1681,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1651,7 +1694,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::ADD);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::ADD);
     }
 
     static double add(double a, double b) {
@@ -1659,7 +1702,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1670,11 +1713,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::add);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1690,11 +1733,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1708,7 +1751,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::add);
     }
 
     static double SUB(double a, double b) {
@@ -1716,7 +1759,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void SUBDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void SUBDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1729,7 +1772,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::SUB);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::SUB);
     }
 
     static double sub(double a, double b) {
@@ -1737,7 +1780,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1748,11 +1791,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::sub);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void SUBDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void SUBDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1768,11 +1811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1786,7 +1829,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::sub);
     }
 
     static double MUL(double a, double b) {
@@ -1794,7 +1837,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MULDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MULDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1807,7 +1850,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::MUL);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::MUL);
     }
 
     static double mul(double a, double b) {
@@ -1815,7 +1858,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1826,11 +1869,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::mul);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void MULDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void MULDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1846,11 +1889,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1864,7 +1907,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1872,7 +1915,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void DIVDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void DIVDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1885,7 +1928,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::DIV);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::DIV);
     }
 
     static double div(double a, double b) {
@@ -1893,7 +1936,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1904,11 +1947,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::div);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void DIVDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void DIVDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1924,11 +1967,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1942,7 +1985,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::div);
     }
 
     static double FIRST_NONZERO(double a, double b) {
@@ -1950,7 +1993,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void FIRST_NONZERODouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void FIRST_NONZERODoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1963,11 +2006,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void FIRST_NONZERODouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FIRST_NONZERODoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1983,11 +2026,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1997,11 +2040,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2014,11 +2057,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector64Tests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2028,11 +2071,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2045,11 +2088,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector64Tests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2059,11 +2102,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2076,11 +2119,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector64Tests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2090,11 +2133,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2107,11 +2150,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Double64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVector64Tests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDouble64VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVector64TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2121,11 +2164,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Double64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, DoubleVector64Tests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDouble64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2138,13 +2181,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector64Tests::ADD);
     }
 
     static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MINDoubleVector64TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2155,13 +2198,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double64VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, DoubleVector64Tests::MIN);
     }
 
     static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void minDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void minDoubleVector64TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2172,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double64VectorTests::min);
+        assertArraysEquals(r, a, (double)10, DoubleVector64Tests::min);
     }
 
     static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINDouble64VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINDoubleVector64TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2191,13 +2234,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double64VectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector64Tests::MIN);
     }
 
     static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MAXDoubleVector64TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2208,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double64VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, DoubleVector64Tests::MAX);
     }
 
     static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void maxDouble64VectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void maxDoubleVector64TestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2225,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, Double64VectorTests::max);
+        assertArraysEquals(r, a, (double)10, DoubleVector64Tests::max);
     }
 
     static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXDouble64VectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXDoubleVector64TestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2244,7 +2287,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, Double64VectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVector64Tests::MAX);
     }
 
     static double MIN(double a, double b) {
@@ -2252,7 +2295,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2265,7 +2308,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::MIN);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::MIN);
     }
 
     static double min(double a, double b) {
@@ -2273,7 +2316,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2284,7 +2327,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::min);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::min);
     }
 
     static double MAX(double a, double b) {
@@ -2292,7 +2335,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2305,7 +2348,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::MAX);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::MAX);
     }
 
     static double max(double a, double b) {
@@ -2313,7 +2356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2324,11 +2367,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::max);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2338,11 +2381,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2352,11 +2395,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2366,11 +2409,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2380,11 +2423,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Double64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, DoubleVector64Tests::max);
     }
 
     static double ADDReduce(double[] a, int idx) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2393,7 +2436,7 @@ relativeError));
     }
 
     static double ADDReduceAll(double[] a) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2402,32 +2445,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                double v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::ADDReduce, Double64VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector64Tests::ADDReduce, DoubleVector64Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = ADD_IDENTITY;
+
+        assertEquals((double) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id + x), x);
+                assertEquals((double) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2437,7 +2498,7 @@ relativeError));
     }
 
     static double ADDReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2446,7 +2507,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2454,26 +2515,21 @@ relativeError));
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                double v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::ADDReduceMasked, Double64VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVector64Tests::ADDReduceMasked, DoubleVector64Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2482,7 +2538,7 @@ relativeError));
     }
 
     static double MULReduceAll(double[] a) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2491,32 +2547,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MULReduceDouble64VectorTests(IntFunction<double[]> fa) {
+    static void MULReduceDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                double v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::MULReduce, Double64VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector64Tests::MULReduce, DoubleVector64Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MUL_IDENTITY;
+
+        assertEquals((double) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id * x), x);
+                assertEquals((double) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2526,7 +2600,7 @@ relativeError));
     }
 
     static double MULReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2535,34 +2609,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MULReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                double v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::MULReduceMasked, Double64VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVector64Tests::MULReduceMasked, DoubleVector64Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.min(res, a[i]);
         }
@@ -2571,7 +2640,7 @@ relativeError));
     }
 
     static double MINReduceAll(double[] a) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduce(a, i));
         }
@@ -2580,32 +2649,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINReduceDouble64VectorTests(IntFunction<double[]> fa) {
+    static void MINReduceDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                double v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::MINReduce, Double64VectorTests::MINReduceAll);
+                DoubleVector64Tests::MINReduce, DoubleVector64Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MIN_IDENTITY;
+
+        assertEquals((double) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.min(id, x), x);
+                assertEquals((double) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.min(res, a[i]);
@@ -2615,7 +2702,7 @@ relativeError));
     }
 
     static double MINReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2624,34 +2711,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                double v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::MINReduceMasked, Double64VectorTests::MINReduceAllMasked);
+                DoubleVector64Tests::MINReduceMasked, DoubleVector64Tests::MINReduceAllMasked);
     }
 
     static double MAXReduce(double[] a, int idx) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.max(res, a[i]);
         }
@@ -2660,7 +2742,7 @@ relativeError));
     }
 
     static double MAXReduceAll(double[] a) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduce(a, i));
         }
@@ -2669,32 +2751,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXReduceDouble64VectorTests(IntFunction<double[]> fa) {
+    static void MAXReduceDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                double v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::MAXReduce, Double64VectorTests::MAXReduceAll);
+                DoubleVector64Tests::MAXReduce, DoubleVector64Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MAX_IDENTITY;
+
+        assertEquals((double) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.max(id, x), x);
+                assertEquals((double) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.max(res, a[i]);
@@ -2704,7 +2804,7 @@ relativeError));
     }
 
     static double MAXReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2713,34 +2813,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                double v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::MAXReduceMasked, Double64VectorTests::MAXReduceAllMasked);
+                DoubleVector64Tests::MAXReduceMasked, DoubleVector64Tests::MAXReduceAllMasked);
     }
 
     static double FIRST_NONZEROReduce(double[] a, int idx) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2749,7 +2844,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAll(double[] a) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2758,32 +2853,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void FIRST_NONZEROReduceDouble64VectorTests(IntFunction<double[]> fa) {
+    static void FIRST_NONZEROReduceDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::FIRST_NONZEROReduce, Double64VectorTests::FIRST_NONZEROReduceAll);
+                DoubleVector64Tests::FIRST_NONZEROReduce, DoubleVector64Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static double FIRST_NONZEROReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2793,7 +2906,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAllMasked(double[] a, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2802,34 +2915,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::FIRST_NONZEROReduceMasked, Double64VectorTests::FIRST_NONZEROReduceAllMasked);
+                DoubleVector64Tests::FIRST_NONZEROReduceMasked, DoubleVector64Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void withDouble64VectorTests(IntFunction<double []> fa, IntFunction<double []> fb) {
+    static void withDoubleVector64Tests(IntFunction<double []> fa, IntFunction<double []> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2852,7 +2960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_DEFAULTDouble64VectorTests(IntFunction<double[]> fa) {
+    static void IS_DEFAULTDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2862,14 +2970,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2882,7 +2990,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2893,7 +3001,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NEGATIVEDouble64VectorTests(IntFunction<double[]> fa) {
+    static void IS_NEGATIVEDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2903,14 +3011,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2923,7 +3031,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2934,7 +3042,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_FINITEDouble64VectorTests(IntFunction<double[]> fa) {
+    static void IS_FINITEDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2944,14 +3052,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2964,7 +3072,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2975,7 +3083,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NANDouble64VectorTests(IntFunction<double[]> fa) {
+    static void IS_NANDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2985,14 +3093,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void IS_NANMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3005,7 +3113,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3016,7 +3124,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_INFINITEDouble64VectorTests(IntFunction<double[]> fa) {
+    static void IS_INFINITEDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3026,14 +3134,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3046,14 +3154,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3065,14 +3173,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3084,14 +3192,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LTDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3107,14 +3215,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GTDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GTDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3126,14 +3234,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GTDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GTDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3149,14 +3257,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3168,14 +3276,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3187,14 +3295,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void EQDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3210,14 +3318,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void NEDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void NEDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3229,14 +3337,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void NEDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void NEDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3252,14 +3360,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LEDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LEDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3271,14 +3379,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LEDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LEDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3294,14 +3402,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GEDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GEDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3313,14 +3421,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GEDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GEDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3336,14 +3444,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3353,13 +3461,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3373,13 +3481,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDouble64VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVector64TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3389,13 +3497,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDouble64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3409,13 +3517,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3425,13 +3533,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3445,13 +3553,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDouble64VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVector64TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3461,13 +3569,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDouble64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3481,7 +3589,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
             }
         }
     }
@@ -3491,7 +3599,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3507,11 +3615,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Double64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, DoubleVector64Tests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
-    static void RearrangeDouble64VectorTests(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector64Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3528,7 +3636,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
-    static void RearrangeDouble64VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void RearrangeDoubleVector64TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -3546,7 +3654,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void compressDouble64VectorTests(IntFunction<double[]> fa,
+    static void compressDoubleVector64Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3564,7 +3672,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void expandDouble64VectorTests(IntFunction<double[]> fa,
+    static void expandDoubleVector64Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3582,7 +3690,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void getDouble64VectorTests(IntFunction<double[]> fa) {
+    static void getDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -3738,7 +3846,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void BroadcastDouble64VectorTests(IntFunction<double[]> fa) {
+    static void BroadcastDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3752,7 +3860,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ZeroDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ZeroDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3762,7 +3870,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static double[] sliceUnary(double[] a, int origin, int idx) {
@@ -3777,7 +3885,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sliceUnaryDouble64VectorTests(IntFunction<double[]> fa) {
+    static void sliceUnaryDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3788,7 +3896,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector64Tests::sliceUnary);
     }
 
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
@@ -3805,7 +3913,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void sliceBinaryDouble64VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void sliceBinaryDoubleVector64TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3818,7 +3926,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Double64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, DoubleVector64Tests::sliceBinary);
     }
 
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
@@ -3835,7 +3943,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void sliceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void sliceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3852,7 +3960,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Double64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, DoubleVector64Tests::slice);
     }
 
     static double[] unsliceUnary(double[] a, int origin, int idx) {
@@ -3869,7 +3977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void unsliceUnaryDouble64VectorTests(IntFunction<double[]> fa) {
+    static void unsliceUnaryDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3880,7 +3988,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Double64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVector64Tests::unsliceUnary);
     }
 
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
@@ -3906,7 +4014,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void unsliceBinaryDouble64VectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void unsliceBinaryDoubleVector64TestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3920,7 +4028,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Double64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, DoubleVector64Tests::unsliceBinary);
     }
 
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3960,7 +4068,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void unsliceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void unsliceDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3977,7 +4085,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Double64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, DoubleVector64Tests::unslice);
     }
 
     static double SIN(double a) {
@@ -3989,7 +4097,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINDouble64VectorTests(IntFunction<double[]> fa) {
+    static void SINDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4000,7 +4108,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::SIN, Double64VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::SIN, DoubleVector64Tests::strictSIN);
     }
 
     static double EXP(double a) {
@@ -4012,7 +4120,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPDouble64VectorTests(IntFunction<double[]> fa) {
+    static void EXPDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4023,7 +4131,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::EXP, Double64VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::EXP, DoubleVector64Tests::strictEXP);
     }
 
     static double LOG1P(double a) {
@@ -4035,7 +4143,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG1PDouble64VectorTests(IntFunction<double[]> fa) {
+    static void LOG1PDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4046,7 +4154,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::LOG1P, Double64VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::LOG1P, DoubleVector64Tests::strictLOG1P);
     }
 
     static double LOG(double a) {
@@ -4058,7 +4166,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOGDouble64VectorTests(IntFunction<double[]> fa) {
+    static void LOGDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4069,7 +4177,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::LOG, Double64VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::LOG, DoubleVector64Tests::strictLOG);
     }
 
     static double LOG10(double a) {
@@ -4081,7 +4189,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG10Double64VectorTests(IntFunction<double[]> fa) {
+    static void LOG10DoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4092,7 +4200,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::LOG10, Double64VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::LOG10, DoubleVector64Tests::strictLOG10);
     }
 
     static double EXPM1(double a) {
@@ -4104,7 +4212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPM1Double64VectorTests(IntFunction<double[]> fa) {
+    static void EXPM1DoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4115,7 +4223,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::EXPM1, Double64VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::EXPM1, DoubleVector64Tests::strictEXPM1);
     }
 
     static double COS(double a) {
@@ -4127,7 +4235,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSDouble64VectorTests(IntFunction<double[]> fa) {
+    static void COSDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4138,7 +4246,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::COS, Double64VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::COS, DoubleVector64Tests::strictCOS);
     }
 
     static double TAN(double a) {
@@ -4150,7 +4258,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANDouble64VectorTests(IntFunction<double[]> fa) {
+    static void TANDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4161,7 +4269,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::TAN, Double64VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::TAN, DoubleVector64Tests::strictTAN);
     }
 
     static double SINH(double a) {
@@ -4173,7 +4281,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINHDouble64VectorTests(IntFunction<double[]> fa) {
+    static void SINHDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4184,7 +4292,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::SINH, Double64VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::SINH, DoubleVector64Tests::strictSINH);
     }
 
     static double COSH(double a) {
@@ -4196,7 +4304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSHDouble64VectorTests(IntFunction<double[]> fa) {
+    static void COSHDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4207,7 +4315,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::COSH, Double64VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::COSH, DoubleVector64Tests::strictCOSH);
     }
 
     static double TANH(double a) {
@@ -4219,7 +4327,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANHDouble64VectorTests(IntFunction<double[]> fa) {
+    static void TANHDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4230,7 +4338,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::TANH, Double64VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::TANH, DoubleVector64Tests::strictTANH);
     }
 
     static double ASIN(double a) {
@@ -4242,7 +4350,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ASINDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ASINDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4253,7 +4361,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::ASIN, Double64VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::ASIN, DoubleVector64Tests::strictASIN);
     }
 
     static double ACOS(double a) {
@@ -4265,7 +4373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ACOSDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ACOSDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4276,7 +4384,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::ACOS, Double64VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::ACOS, DoubleVector64Tests::strictACOS);
     }
 
     static double ATAN(double a) {
@@ -4288,7 +4396,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ATANDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ATANDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4299,7 +4407,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::ATAN, Double64VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::ATAN, DoubleVector64Tests::strictATAN);
     }
 
     static double CBRT(double a) {
@@ -4311,7 +4419,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void CBRTDouble64VectorTests(IntFunction<double[]> fa) {
+    static void CBRTDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4322,7 +4430,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Double64VectorTests::CBRT, Double64VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVector64Tests::CBRT, DoubleVector64Tests::strictCBRT);
     }
 
     static double HYPOT(double a, double b) {
@@ -4334,7 +4442,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void HYPOTDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void HYPOTDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4347,7 +4455,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::HYPOT, Double64VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector64Tests::HYPOT, DoubleVector64Tests::strictHYPOT);
     }
 
 
@@ -4360,7 +4468,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4373,7 +4481,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::POW, Double64VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector64Tests::POW, DoubleVector64Tests::strictPOW);
     }
 
 
@@ -4386,7 +4494,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4399,7 +4507,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::pow, Double64VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector64Tests::pow, DoubleVector64Tests::strictpow);
     }
 
 
@@ -4412,7 +4520,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ATAN2Double64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ATAN2DoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4425,12 +4533,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::ATAN2, Double64VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVector64Tests::ATAN2, DoubleVector64Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4440,12 +4548,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::POW, Double64VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector64Tests::POW, DoubleVector64Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4455,7 +4563,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Double64VectorTests::pow, Double64VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVector64Tests::pow, DoubleVector64Tests::strictpow);
     }
 
 
@@ -4468,7 +4576,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4490,11 +4598,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Double64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4514,11 +4622,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Double64VectorTests::fma);
+        assertArraysEquals(r, a, b, c, DoubleVector64Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4543,11 +4651,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4558,11 +4666,11 @@ relativeError));
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Double64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble64VectorTestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector64TestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4573,11 +4681,11 @@ relativeError));
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Double64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4592,11 +4700,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector64TestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4611,11 +4719,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADouble64VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVector64TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4633,11 +4741,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector64Tests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDouble64VectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVector64TestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4655,11 +4763,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Double64VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVector64Tests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADouble64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVector64TestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4680,7 +4788,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Double64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleVector64Tests::FMA);
     }
 
     static double NEG(double a) {
@@ -4692,7 +4800,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void NEGDouble64VectorTests(IntFunction<double[]> fa) {
+    static void NEGDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4703,11 +4811,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::NEG);
+        assertArraysEquals(r, a, DoubleVector64Tests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void negDouble64VectorTests(IntFunction<double[]> fa) {
+    static void negDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4718,11 +4826,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::neg);
+        assertArraysEquals(r, a, DoubleVector64Tests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void NEGMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void NEGMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4736,7 +4844,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, DoubleVector64Tests::NEG);
     }
 
     static double ABS(double a) {
@@ -4748,7 +4856,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ABSDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ABSDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4759,11 +4867,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::ABS);
+        assertArraysEquals(r, a, DoubleVector64Tests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void absDouble64VectorTests(IntFunction<double[]> fa) {
+    static void absDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4774,11 +4882,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::abs);
+        assertArraysEquals(r, a, DoubleVector64Tests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ABSMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void ABSMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4792,7 +4900,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, DoubleVector64Tests::ABS);
     }
 
     static double SQRT(double a) {
@@ -4804,7 +4912,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SQRTDouble64VectorTests(IntFunction<double[]> fa) {
+    static void SQRTDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4815,11 +4923,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::SQRT);
+        assertArraysEquals(r, a, DoubleVector64Tests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sqrtDouble64VectorTests(IntFunction<double[]> fa) {
+    static void sqrtDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4830,11 +4938,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::sqrt);
+        assertArraysEquals(r, a, DoubleVector64Tests::sqrt);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void SQRTMaskedDouble64VectorTests(IntFunction<double[]> fa,
+    static void SQRTMaskedDoubleVector64Tests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4848,7 +4956,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Double64VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, DoubleVector64Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4856,7 +4964,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandDoubleVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4869,7 +4977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::band);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4877,7 +4985,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorDoubleVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4890,7 +4998,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::bor);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4898,7 +5006,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorDoubleVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4911,7 +5019,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::bxor);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4919,7 +5027,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotDoubleVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4932,7 +5040,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::bandNot);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4940,7 +5048,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqDoubleVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4953,7 +5061,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Double64VectorTests::beq);
+        assertArraysEquals(r, a, b, DoubleVector64Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4961,7 +5069,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotDouble64VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotDoubleVector64Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4972,7 +5080,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Double64VectorTests::unot);
+        assertArraysEquals(r, a, DoubleVector64Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4981,15 +5089,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDouble64VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongDoubleVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5003,7 +5111,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDouble64VectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVector64TestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5013,13 +5121,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDouble64VectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVector64TestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5029,13 +5137,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubletoIntUnaryOpProvider")
-    static void toIntArrayDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toIntArrayDoubleVector64TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5046,7 +5154,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void toLongArrayDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toLongArrayDoubleVector64TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5058,7 +5166,7 @@ relativeError));
 
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void toStringDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toStringDoubleVector64TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5071,7 +5179,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void hashCodeDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void hashCodeDoubleVector64TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5104,7 +5212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceLongDouble64VectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceLongDoubleVector64Tests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5120,7 +5228,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Double64VectorTests::ADDReduceLong, Double64VectorTests::ADDReduceAllLong);
+                DoubleVector64Tests::ADDReduceLong, DoubleVector64Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(double[] a, int idx, boolean[] mask) {
@@ -5143,7 +5251,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceLongDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongDoubleVector64TestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5161,11 +5269,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::ADDReduceLongMasked, Double64VectorTests::ADDReduceAllLongMasked);
+                DoubleVector64Tests::ADDReduceLongMasked, DoubleVector64Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void BroadcastLongDouble64VectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void BroadcastLongDoubleVector64TestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -5176,7 +5284,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDouble64VectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVector64TestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -5190,12 +5298,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Double64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVector64Tests::blend);
     }
 
 
     @Test(dataProvider = "doubleUnaryOpSelectFromProvider")
-    static void SelectFromDouble64VectorTests(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector64Tests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,double[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         double[] order = fs.apply(a.length, SPECIES.length());
@@ -5211,7 +5319,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorDouble64VectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void SelectFromTwoVectorDoubleVector64Tests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] idx = fc.apply(SPECIES.length());
@@ -5229,7 +5337,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
-    static void SelectFromDouble64VectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void SelectFromDoubleVector64TestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                            BiFunction<Integer,Integer,double[]> fs,
                                                            IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -5248,7 +5356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousDouble64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousDoubleVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5259,12 +5367,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringDouble64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringDoubleVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5278,7 +5386,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsDouble64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsDoubleVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5287,12 +5395,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsDouble64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsDoubleVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5302,13 +5410,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeDoubleVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5330,7 +5438,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountDoubleVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5341,7 +5449,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double64VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, DoubleVector64Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5355,7 +5463,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueDoubleVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5366,7 +5474,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double64VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector64Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5380,7 +5488,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueDoubleVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5391,11 +5499,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Double64VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVector64Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressDouble64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressDoubleVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5405,7 +5513,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5423,7 +5531,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeDouble64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeDoubleVector64TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5431,13 +5539,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongDouble64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongDoubleVector64TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5445,7 +5553,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5464,36 +5572,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundDouble64VectorTestsSmokeTest(int length) {
+    static void loopBoundDoubleVector64TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongDouble64VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongDoubleVector64TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeDouble64VectorTestsSmokeTest() {
+    static void ElementSizeDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Double.SIZE);
+        assertEquals(elsize, Double.SIZE);
     }
 
     @Test
-    static void VectorShapeDouble64VectorTestsSmokeTest() {
+    static void VectorShapeDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_64_BIT));
     }
 
     @Test
-    static void ShapeWithLanesDouble64VectorTestsSmokeTest() {
+    static void ShapeWithLanesDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(double.class);
@@ -5501,32 +5609,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeDouble64VectorTestsSmokeTest() {
+    static void ElementTypeDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementType() == double.class);
     }
 
     @Test
-    static void SpeciesElementSizeDouble64VectorTestsSmokeTest() {
+    static void SpeciesElementSizeDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementSize() == Double.SIZE);
     }
 
     @Test
-    static void VectorTypeDouble64VectorTestsSmokeTest() {
+    static void VectorTypeDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesDouble64VectorTestsSmokeTest() {
+    static void WithLanesDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(double.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeDouble64VectorTestsSmokeTest() {
+    static void WithShapeDoubleVector64TestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5534,9 +5642,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueDouble64VectorTestsSmokeTest() {
+    static void MaskAllTrueDoubleVector64TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/DoubleVectorMaxLoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVectorMaxLoadStoreTests.java
index f8ea6d7c4a2..e52ce2aa0d4 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVectorMaxLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
  * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
- *      -XX:-TieredCompilation DoubleMaxVectorLoadStoreTests
+ *      -XX:-TieredCompilation DoubleVectorMaxLoadStoreTests
  *
  */
 
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class DoubleVectorMaxLoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_MAX;
 
@@ -68,14 +68,29 @@ public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(double[] r, double[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (double) 0, "at index #" + i);
         }
     }
 
@@ -329,7 +344,7 @@ public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "doubleProviderForIOOBE")
@@ -877,11 +892,11 @@ public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -892,11 +907,11 @@ public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (double) 0, "at index #" + j);
         }
     }
 
@@ -912,7 +927,7 @@ public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(double[] r, double[] a, int[] indexMap) {
@@ -925,7 +940,7 @@ public class DoubleMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
rename to test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java
index ac85f0bd07b..c4dda942e83 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleVectorMaxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation DoubleMaxVectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation DoubleVectorMaxTests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,12 +55,49 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class DoubleMaxVectorTests extends AbstractVectorTest {
+public class DoubleVectorMaxTests extends AbstractVectorTest {
 
     static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(double actual, double expected, double delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(double actual, double expected, double delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(double [] actual, double [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double [] actual, double [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
 
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
@@ -68,6 +105,13 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
 
     private static final int Max = 256;  // juts so we can do N/Max
 
+    // Identity values for reduction operations
+    private static final double ADD_IDENTITY = (double)0;
+    private static final double FIRST_NONZERO_IDENTITY = (double)0;
+    private static final double MAX_IDENTITY = Double.NEGATIVE_INFINITY;
+    private static final double MIN_IDENTITY = Double.POSITIVE_INFINITY;
+    private static final double MUL_IDENTITY = (double)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
 
@@ -94,10 +138,10 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -109,13 +153,13 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a[i]);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -125,10 +169,10 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -150,13 +194,13 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
                                             double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -178,14 +222,14 @@ public class DoubleMaxVectorTests extends AbstractVectorTest {
                                             double relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -201,13 +245,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -223,13 +267,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -241,10 +285,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -256,10 +300,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -268,12 +312,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -284,20 +328,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (double)0);
+                    assertEquals(r[i + k], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -309,19 +353,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (double)0);
+                        assertEquals(r[i + j], (double)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (double)0, "at index #" + idx);
+                assertEquals(r[idx], (double)0, "at index #" + idx);
             }
         }
     }
@@ -337,11 +381,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -350,12 +394,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -365,17 +409,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -385,17 +429,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (double)0);
+                         assertEquals(r[i+j], (double)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (double)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -409,10 +453,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -424,10 +468,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -439,10 +483,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -463,18 +507,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -489,18 +533,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -508,10 +552,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -519,10 +563,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -530,10 +574,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -542,10 +586,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -558,10 +602,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -573,10 +617,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -588,10 +632,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -606,10 +650,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (double)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -622,11 +666,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -640,11 +684,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -666,11 +710,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -684,11 +728,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -708,10 +752,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -723,10 +767,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -735,10 +779,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -748,10 +792,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -767,11 +811,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -788,11 +832,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -803,11 +847,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -824,11 +868,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -920,13 +964,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -947,13 +991,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -968,13 +1012,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(r, a, i, mask, b, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -995,13 +1039,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1015,13 +1059,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1036,13 +1080,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1057,13 +1101,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1079,13 +1123,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             double[] ref = f.apply(a, b, origin, part, mask, i);
             double[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1131,10 +1175,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1177,10 +1221,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1583,7 +1627,7 @@ relativeError));
         // Do some zipping and shuffling.
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         DoubleVector a = io.add((double)1); //[1,2]
         DoubleVector b = a.neg();  //[-1,-2]
         double[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1598,19 +1642,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Double> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Double> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         DoubleVector uab0 = zab0.rearrange(unz0,zab1);
         DoubleVector uab1 = zab0.rearrange(unz1,zab1);
         double[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         DoubleVector io = (DoubleVector) SPECIES.broadcast(0).addIndex(1);
         DoubleVector io2 = (DoubleVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1627,15 +1671,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static double ADD(double a, double b) {
@@ -1643,7 +1687,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1656,7 +1700,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::ADD);
     }
 
     static double add(double a, double b) {
@@ -1664,7 +1708,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1675,11 +1719,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::add);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1695,11 +1739,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1713,7 +1757,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::add);
     }
 
     static double SUB(double a, double b) {
@@ -1721,7 +1765,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void SUBDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void SUBDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1734,7 +1778,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::SUB);
     }
 
     static double sub(double a, double b) {
@@ -1742,7 +1786,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1753,11 +1797,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void SUBDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void SUBDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1773,11 +1817,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::SUB);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1791,7 +1835,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::sub);
     }
 
     static double MUL(double a, double b) {
@@ -1799,7 +1843,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MULDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MULDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1812,7 +1856,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::MUL);
     }
 
     static double mul(double a, double b) {
@@ -1820,7 +1864,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1831,11 +1875,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void MULDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void MULDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1851,11 +1895,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::MUL);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1869,7 +1913,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::mul);
     }
 
     static double DIV(double a, double b) {
@@ -1877,7 +1921,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void DIVDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void DIVDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1890,7 +1934,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::DIV);
     }
 
     static double div(double a, double b) {
@@ -1898,7 +1942,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1909,11 +1953,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::div);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void DIVDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void DIVDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1929,11 +1973,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::DIV);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1947,7 +1991,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::div);
     }
 
     static double FIRST_NONZERO(double a, double b) {
@@ -1955,7 +1999,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void FIRST_NONZERODoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void FIRST_NONZERODoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -1968,11 +2012,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void FIRST_NONZERODoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FIRST_NONZERODoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -1988,11 +2032,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void addDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void addDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2002,11 +2046,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void addDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void addDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2019,11 +2063,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVectorMaxTests::add);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void subDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void subDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2033,11 +2077,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void subDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void subDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2050,11 +2094,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void mulDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void mulDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2064,11 +2108,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void mulDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void mulDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2081,11 +2125,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void divDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void divDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2095,11 +2139,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void divDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void divDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2112,11 +2156,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, DoubleMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, DoubleVectorMaxTests::div);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ADDDoubleMaxVectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ADDDoubleVectorMaxTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2126,11 +2170,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, DoubleMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, DoubleVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void ADDDoubleMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void ADDDoubleVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -2143,13 +2187,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVectorMaxTests::ADD);
     }
 
     static DoubleVector bv_MIN = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MINDoubleVectorMaxTestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2160,13 +2204,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, DoubleVectorMaxTests::MIN);
     }
 
     static DoubleVector bv_min = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void minDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void minDoubleVectorMaxTestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2177,13 +2221,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::min);
+        assertArraysEquals(r, a, (double)10, DoubleVectorMaxTests::min);
     }
 
     static DoubleVector bv_MIN_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINDoubleMaxVectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINDoubleVectorMaxTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2196,13 +2240,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, DoubleMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVectorMaxTests::MIN);
     }
 
     static DoubleVector bv_MAX = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void MAXDoubleVectorMaxTestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2213,13 +2257,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, DoubleVectorMaxTests::MAX);
     }
 
     static DoubleVector bv_max = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void maxDoubleMaxVectorTestsWithMemOp(IntFunction<double[]> fa) {
+    static void maxDoubleVectorMaxTestsWithMemOp(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -2230,13 +2274,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, DoubleMaxVectorTests::max);
+        assertArraysEquals(r, a, (double)10, DoubleVectorMaxTests::max);
     }
 
     static DoubleVector bv_MAX_M = DoubleVector.broadcast(SPECIES, (double)10);
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXDoubleMaxVectorTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXDoubleVectorMaxTestsMaskedWithMemOp(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2249,7 +2293,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (double)10, mask, DoubleMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (double)10, mask, DoubleVectorMaxTests::MAX);
     }
 
     static double MIN(double a, double b) {
@@ -2257,7 +2301,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2270,7 +2314,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::MIN);
     }
 
     static double min(double a, double b) {
@@ -2278,7 +2322,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2289,7 +2333,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::min);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::min);
     }
 
     static double MAX(double a, double b) {
@@ -2297,7 +2341,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2310,7 +2354,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::MAX);
     }
 
     static double max(double a, double b) {
@@ -2318,7 +2362,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2329,11 +2373,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::max);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::max);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MINDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MINDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2343,11 +2387,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::MIN);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void minDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void minDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2357,11 +2401,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::min);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void MAXDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void MAXDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2371,11 +2415,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::MAX);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void maxDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void maxDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2385,11 +2429,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, DoubleMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, DoubleVectorMaxTests::max);
     }
 
     static double ADDReduce(double[] a, int idx) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2398,7 +2442,7 @@ relativeError));
     }
 
     static double ADDReduceAll(double[] a) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2407,32 +2451,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                double v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::ADDReduce, DoubleMaxVectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVectorMaxTests::ADDReduce, DoubleVectorMaxTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = ADD_IDENTITY;
+
+        assertEquals((double) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id + x), x);
+                assertEquals((double) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2442,7 +2504,7 @@ relativeError));
     }
 
     static double ADDReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 0;
+        double res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2451,7 +2513,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2459,26 +2521,21 @@ relativeError));
         double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                double v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::ADDReduceMasked, DoubleMaxVectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                DoubleVectorMaxTests::ADDReduceMasked, DoubleVectorMaxTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2487,7 +2544,7 @@ relativeError));
     }
 
     static double MULReduceAll(double[] a) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2496,32 +2553,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MULReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void MULReduceDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                double v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::MULReduce, DoubleMaxVectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVectorMaxTests::MULReduce, DoubleVectorMaxTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MUL_IDENTITY;
+
+        assertEquals((double) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) (id * x), x);
+                assertEquals((double) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2531,7 +2606,7 @@ relativeError));
     }
 
     static double MULReduceAllMasked(double[] a, boolean[] mask) {
-        double res = 1;
+        double res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2540,34 +2615,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MULReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = 1;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                double v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::MULReduceMasked, DoubleMaxVectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                DoubleVectorMaxTests::MULReduceMasked, DoubleVectorMaxTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.min(res, a[i]);
         }
@@ -2576,7 +2646,7 @@ relativeError));
     }
 
     static double MINReduceAll(double[] a) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduce(a, i));
         }
@@ -2585,32 +2655,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MINReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void MINReduceDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                double v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::MINReduce, DoubleMaxVectorTests::MINReduceAll);
+                DoubleVectorMaxTests::MINReduce, DoubleVectorMaxTests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MIN_IDENTITY;
+
+        assertEquals((double) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.min(id, x), x);
+                assertEquals((double) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static double MINReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.min(res, a[i]);
@@ -2620,7 +2708,7 @@ relativeError));
     }
 
     static double MINReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.POSITIVE_INFINITY;
+        double res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2629,34 +2717,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MINReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.POSITIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                double v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (double) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::MINReduceMasked, DoubleMaxVectorTests::MINReduceAllMasked);
+                DoubleVectorMaxTests::MINReduceMasked, DoubleVectorMaxTests::MINReduceAllMasked);
     }
 
     static double MAXReduce(double[] a, int idx) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (double) Math.max(res, a[i]);
         }
@@ -2665,7 +2748,7 @@ relativeError));
     }
 
     static double MAXReduceAll(double[] a) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduce(a, i));
         }
@@ -2674,32 +2757,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void MAXReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void MAXReduceDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                double v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::MAXReduce, DoubleMaxVectorTests::MAXReduceAll);
+                DoubleVectorMaxTests::MAXReduce, DoubleVectorMaxTests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = MAX_IDENTITY;
+
+        assertEquals((double) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((double) Math.max(id, x), x);
+                assertEquals((double) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((double) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((double) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static double MAXReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (double) Math.max(res, a[i]);
@@ -2709,7 +2810,7 @@ relativeError));
     }
 
     static double MAXReduceAllMasked(double[] a, boolean[] mask) {
-        double res = Double.NEGATIVE_INFINITY;
+        double res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (double) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2718,34 +2819,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void MAXReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = Double.NEGATIVE_INFINITY;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Double.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = (double) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                double v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (double) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::MAXReduceMasked, DoubleMaxVectorTests::MAXReduceAllMasked);
+                DoubleVectorMaxTests::MAXReduceMasked, DoubleVectorMaxTests::MAXReduceAllMasked);
     }
 
     static double FIRST_NONZEROReduce(double[] a, int idx) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2754,7 +2850,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAll(double[] a) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2763,32 +2859,50 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void FIRST_NONZEROReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void FIRST_NONZEROReduceDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::FIRST_NONZEROReduce, DoubleMaxVectorTests::FIRST_NONZEROReduceAll);
+                DoubleVectorMaxTests::FIRST_NONZEROReduce, DoubleVectorMaxTests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "doubleUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<double[]> fa) {
+        double[] a = fa.apply(SPECIES.length());
+        double id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        double x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static double FIRST_NONZEROReduceMasked(double[] a, int idx, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2798,7 +2912,7 @@ relativeError));
     }
 
     static double FIRST_NONZEROReduceAllMasked(double[] a, boolean[] mask) {
-        double res = (double) 0;
+        double res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2807,34 +2921,29 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Double> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        double ra = (double) 0;
+        double ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (double) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                double v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::FIRST_NONZEROReduceMasked, DoubleMaxVectorTests::FIRST_NONZEROReduceAllMasked);
+                DoubleVectorMaxTests::FIRST_NONZEROReduceMasked, DoubleVectorMaxTests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void withDoubleMaxVectorTests(IntFunction<double []> fa, IntFunction<double []> fb) {
+    static void withDoubleVectorMaxTests(IntFunction<double []> fa, IntFunction<double []> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -2857,7 +2966,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_DEFAULTDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void IS_DEFAULTDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2867,14 +2976,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_DEFAULTMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void IS_DEFAULTMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2887,7 +2996,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2898,7 +3007,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NEGATIVEDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void IS_NEGATIVEDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2908,14 +3017,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void IS_NEGATIVEMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2928,7 +3037,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2939,7 +3048,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_FINITEDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void IS_FINITEDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2949,14 +3058,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_FINITEMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void IS_FINITEMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2969,7 +3078,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2980,7 +3089,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_NANDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void IS_NANDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2990,14 +3099,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_NANMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void IS_NANMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3010,7 +3119,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3021,7 +3130,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTestOpProvider")
-    static void IS_INFINITEDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void IS_INFINITEDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3031,14 +3140,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleTestOpMaskProvider")
-    static void IS_INFINITEMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void IS_INFINITEMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3051,14 +3160,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3070,14 +3179,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3089,14 +3198,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LTDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3112,14 +3221,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GTDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GTDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3131,14 +3240,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GTDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GTDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3154,14 +3263,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3173,14 +3282,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3192,14 +3301,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void EQDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3215,14 +3324,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void NEDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void NEDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3234,14 +3343,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void NEDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void NEDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3257,14 +3366,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LEDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LEDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3276,14 +3385,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LEDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void LEDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3299,14 +3408,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void GEDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void GEDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3318,14 +3427,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void GEDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void GEDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3341,14 +3450,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3358,13 +3467,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3378,13 +3487,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void LTDoubleMaxVectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void LTDoubleVectorMaxTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3394,13 +3503,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void LTDoubleMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void LTDoubleVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3414,13 +3523,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (double)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3430,13 +3539,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3450,13 +3559,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void EQDoubleMaxVectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void EQDoubleVectorMaxTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -3466,13 +3575,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (double)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpMaskProvider")
-    static void EQDoubleMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
+    static void EQDoubleVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<double[]> fa,
                                 IntFunction<double[]> fb, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3486,7 +3595,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (double)((long)b[i])));
             }
         }
     }
@@ -3496,7 +3605,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3512,11 +3621,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, DoubleMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, DoubleVectorMaxTests::blend);
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleProvider")
-    static void RearrangeDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void RearrangeDoubleVectorMaxTests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3533,7 +3642,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpShuffleMaskProvider")
-    static void RearrangeDoubleMaxVectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void RearrangeDoubleVectorMaxTestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -3551,7 +3660,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void compressDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void compressDoubleVectorMaxTests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3569,7 +3678,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void expandDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void expandDoubleVectorMaxTests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -3587,7 +3696,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void getDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void getDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -3743,7 +3852,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void BroadcastDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void BroadcastDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3757,7 +3866,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ZeroDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ZeroDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -3767,7 +3876,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static double[] sliceUnary(double[] a, int origin, int idx) {
@@ -3782,7 +3891,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sliceUnaryDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void sliceUnaryDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3793,7 +3902,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, DoubleMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVectorMaxTests::sliceUnary);
     }
 
     static double[] sliceBinary(double[] a, double[] b, int origin, int idx) {
@@ -3810,7 +3919,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void sliceBinaryDoubleMaxVectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void sliceBinaryDoubleVectorMaxTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3823,7 +3932,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, DoubleMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, DoubleVectorMaxTests::sliceBinary);
     }
 
     static double[] slice(double[] a, double[] b, int origin, boolean[] mask, int idx) {
@@ -3840,7 +3949,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void sliceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void sliceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3857,7 +3966,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, DoubleMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, DoubleVectorMaxTests::slice);
     }
 
     static double[] unsliceUnary(double[] a, int origin, int idx) {
@@ -3874,7 +3983,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void unsliceUnaryDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void unsliceUnaryDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3885,7 +3994,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, DoubleMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, DoubleVectorMaxTests::unsliceUnary);
     }
 
     static double[] unsliceBinary(double[] a, double[] b, int origin, int part, int idx) {
@@ -3911,7 +4020,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void unsliceBinaryDoubleMaxVectorTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void unsliceBinaryDoubleVectorMaxTestsBinary(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = new double[a.length];
@@ -3925,7 +4034,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, DoubleMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, DoubleVectorMaxTests::unsliceBinary);
     }
 
     static double[] unslice(double[] a, double[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3965,7 +4074,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void unsliceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void unsliceDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
     IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -3982,7 +4091,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, DoubleMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, DoubleVectorMaxTests::unslice);
     }
 
     static double SIN(double a) {
@@ -3994,7 +4103,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void SINDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4005,7 +4114,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::SIN, DoubleMaxVectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::SIN, DoubleVectorMaxTests::strictSIN);
     }
 
     static double EXP(double a) {
@@ -4017,7 +4126,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void EXPDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4028,7 +4137,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::EXP, DoubleMaxVectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::EXP, DoubleVectorMaxTests::strictEXP);
     }
 
     static double LOG1P(double a) {
@@ -4040,7 +4149,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG1PDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void LOG1PDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4051,7 +4160,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::LOG1P, DoubleMaxVectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::LOG1P, DoubleVectorMaxTests::strictLOG1P);
     }
 
     static double LOG(double a) {
@@ -4063,7 +4172,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOGDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void LOGDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4074,7 +4183,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::LOG, DoubleMaxVectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::LOG, DoubleVectorMaxTests::strictLOG);
     }
 
     static double LOG10(double a) {
@@ -4086,7 +4195,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void LOG10DoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void LOG10DoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4097,7 +4206,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::LOG10, DoubleMaxVectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::LOG10, DoubleVectorMaxTests::strictLOG10);
     }
 
     static double EXPM1(double a) {
@@ -4109,7 +4218,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void EXPM1DoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void EXPM1DoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4120,7 +4229,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::EXPM1, DoubleMaxVectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::EXPM1, DoubleVectorMaxTests::strictEXPM1);
     }
 
     static double COS(double a) {
@@ -4132,7 +4241,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void COSDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4143,7 +4252,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::COS, DoubleMaxVectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::COS, DoubleVectorMaxTests::strictCOS);
     }
 
     static double TAN(double a) {
@@ -4155,7 +4264,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void TANDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4166,7 +4275,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::TAN, DoubleMaxVectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::TAN, DoubleVectorMaxTests::strictTAN);
     }
 
     static double SINH(double a) {
@@ -4178,7 +4287,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SINHDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void SINHDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4189,7 +4298,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::SINH, DoubleMaxVectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::SINH, DoubleVectorMaxTests::strictSINH);
     }
 
     static double COSH(double a) {
@@ -4201,7 +4310,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void COSHDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void COSHDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4212,7 +4321,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::COSH, DoubleMaxVectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::COSH, DoubleVectorMaxTests::strictCOSH);
     }
 
     static double TANH(double a) {
@@ -4224,7 +4333,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void TANHDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void TANHDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4235,7 +4344,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::TANH, DoubleMaxVectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::TANH, DoubleVectorMaxTests::strictTANH);
     }
 
     static double ASIN(double a) {
@@ -4247,7 +4356,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ASINDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ASINDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4258,7 +4367,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::ASIN, DoubleMaxVectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::ASIN, DoubleVectorMaxTests::strictASIN);
     }
 
     static double ACOS(double a) {
@@ -4270,7 +4379,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ACOSDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ACOSDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4281,7 +4390,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::ACOS, DoubleMaxVectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::ACOS, DoubleVectorMaxTests::strictACOS);
     }
 
     static double ATAN(double a) {
@@ -4293,7 +4402,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ATANDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ATANDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4304,7 +4413,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::ATAN, DoubleMaxVectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::ATAN, DoubleVectorMaxTests::strictATAN);
     }
 
     static double CBRT(double a) {
@@ -4316,7 +4425,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void CBRTDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void CBRTDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4327,7 +4436,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, DoubleMaxVectorTests::CBRT, DoubleMaxVectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, DoubleVectorMaxTests::CBRT, DoubleVectorMaxTests::strictCBRT);
     }
 
     static double HYPOT(double a, double b) {
@@ -4339,7 +4448,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void HYPOTDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void HYPOTDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4352,7 +4461,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::HYPOT, DoubleMaxVectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVectorMaxTests::HYPOT, DoubleVectorMaxTests::strictHYPOT);
     }
 
 
@@ -4365,7 +4474,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4378,7 +4487,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::POW, DoubleMaxVectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVectorMaxTests::POW, DoubleVectorMaxTests::strictPOW);
     }
 
 
@@ -4391,7 +4500,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4404,7 +4513,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::pow, DoubleMaxVectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVectorMaxTests::pow, DoubleVectorMaxTests::strictpow);
     }
 
 
@@ -4417,7 +4526,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void ATAN2DoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ATAN2DoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4430,12 +4539,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::ATAN2, DoubleMaxVectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, DoubleVectorMaxTests::ATAN2, DoubleVectorMaxTests::strictATAN2);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void POWDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void POWDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4445,12 +4554,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::POW, DoubleMaxVectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVectorMaxTests::POW, DoubleVectorMaxTests::strictPOW);
     }
 
 
     @Test(dataProvider = "doubleBinaryOpProvider")
-    static void powDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void powDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4460,7 +4569,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleMaxVectorTests::pow, DoubleMaxVectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, DoubleVectorMaxTests::pow, DoubleVectorMaxTests::strictpow);
     }
 
 
@@ -4473,7 +4582,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4495,11 +4604,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4519,11 +4628,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, DoubleMaxVectorTests::fma);
+        assertArraysEquals(r, a, b, c, DoubleVectorMaxTests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4548,11 +4657,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4563,11 +4672,11 @@ relativeError));
             DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADoubleMaxVectorTestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVectorMaxTestsAltBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] c = fc.apply(SPECIES.length());
@@ -4578,11 +4687,11 @@ relativeError));
             DoubleVector cv = DoubleVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4597,11 +4706,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADoubleMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVectorMaxTestsAltBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -4616,11 +4725,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void FMADoubleMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void FMADoubleVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("FMA") {
         case "fma": case "lanewise_FMA":
@@ -4638,11 +4747,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "doubleTernaryOpProvider")
-    static void fmaDoubleMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void fmaDoubleVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         int count = INVOC_COUNT;
         switch ("fma") {
         case "fma": case "lanewise_FMA":
@@ -4660,11 +4769,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleMaxVectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, DoubleVectorMaxTests::fma);
     }
 
     @Test(dataProvider = "doubleTernaryOpMaskProvider")
-    static void FMADoubleMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void FMADoubleVectorMaxTestsDoubleBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<double[]> fc, IntFunction<boolean[]> fm) {
         int count = INVOC_COUNT;
         switch ("FMA") {
@@ -4685,7 +4794,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, DoubleVectorMaxTests::FMA);
     }
 
     static double NEG(double a) {
@@ -4697,7 +4806,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void NEGDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void NEGDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4708,11 +4817,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::NEG);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::NEG);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void negDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void negDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4723,11 +4832,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::neg);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::neg);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void NEGMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void NEGMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4741,7 +4850,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, DoubleMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, DoubleVectorMaxTests::NEG);
     }
 
     static double ABS(double a) {
@@ -4753,7 +4862,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ABSDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ABSDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4764,11 +4873,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::ABS);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::ABS);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void absDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void absDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4779,11 +4888,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::abs);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::abs);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ABSMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void ABSMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4797,7 +4906,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, DoubleMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, DoubleVectorMaxTests::ABS);
     }
 
     static double SQRT(double a) {
@@ -4809,7 +4918,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void SQRTDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void SQRTDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4820,11 +4929,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::SQRT);
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void sqrtDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void sqrtDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
 
@@ -4835,11 +4944,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::sqrt);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::sqrt);
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void SQRTMaskedDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void SQRTMaskedDoubleVectorMaxTests(IntFunction<double[]> fa,
                                                 IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.length());
@@ -4853,7 +4962,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, DoubleMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, mask, DoubleVectorMaxTests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4861,7 +4970,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandDoubleVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4874,7 +4983,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::band);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4882,7 +4991,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorDoubleVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4895,7 +5004,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bor);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4903,7 +5012,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorDoubleVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4916,7 +5025,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bxor);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4924,7 +5033,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotDoubleVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4937,7 +5046,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::bandNot);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4945,7 +5054,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqDoubleVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4958,7 +5067,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, DoubleMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, DoubleVectorMaxTests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4966,7 +5075,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotDoubleMaxVectorTests(IntFunction<boolean[]> fa) {
+    static void masknotDoubleVectorMaxTests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4977,7 +5086,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, DoubleMaxVectorTests::unot);
+        assertArraysEquals(r, a, DoubleVectorMaxTests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4986,15 +5095,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongDoubleMaxVectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongDoubleVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5008,7 +5117,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void ltDoubleMaxVectorTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void ltDoubleVectorMaxTestsBroadcastSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5018,13 +5127,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubleCompareOpProvider")
-    static void eqDoubleMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
+    static void eqDoubleVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
 
@@ -5034,13 +5143,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "doubletoIntUnaryOpProvider")
-    static void toIntArrayDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toIntArrayDoubleVectorMaxTestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5051,7 +5160,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void toLongArrayDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toLongArrayDoubleVectorMaxTestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5063,7 +5172,7 @@ relativeError));
 
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void toStringDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void toStringDoubleVectorMaxTestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5076,7 +5185,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void hashCodeDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void hashCodeDoubleVectorMaxTestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5109,7 +5218,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpProvider")
-    static void ADDReduceLongDoubleMaxVectorTests(IntFunction<double[]> fa) {
+    static void ADDReduceLongDoubleVectorMaxTests(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5125,7 +5234,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::ADDReduceLong, DoubleMaxVectorTests::ADDReduceAllLong);
+                DoubleVectorMaxTests::ADDReduceLong, DoubleVectorMaxTests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(double[] a, int idx, boolean[] mask) {
@@ -5148,7 +5257,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpMaskProvider")
-    static void ADDReduceLongDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongDoubleVectorMaxTestsMasked(IntFunction<double[]> fa, IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5166,11 +5275,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::ADDReduceLongMasked, DoubleMaxVectorTests::ADDReduceAllLongMasked);
+                DoubleVectorMaxTests::ADDReduceLongMasked, DoubleVectorMaxTests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "doubletoLongUnaryOpProvider")
-    static void BroadcastLongDoubleMaxVectorTestsSmokeTest(IntFunction<double[]> fa) {
+    static void BroadcastLongDoubleVectorMaxTestsSmokeTest(IntFunction<double[]> fa) {
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
 
@@ -5181,7 +5290,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleBinaryOpMaskProvider")
-    static void blendDoubleMaxVectorTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
+    static void blendDoubleVectorMaxTestsBroadcastLongSmokeTest(IntFunction<double[]> fa, IntFunction<double[]> fb,
                                           IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
@@ -5195,12 +5304,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, DoubleVectorMaxTests::blend);
     }
 
 
     @Test(dataProvider = "doubleUnaryOpSelectFromProvider")
-    static void SelectFromDoubleMaxVectorTests(IntFunction<double[]> fa,
+    static void SelectFromDoubleVectorMaxTests(IntFunction<double[]> fa,
                                            BiFunction<Integer,Integer,double[]> fs) {
         double[] a = fa.apply(SPECIES.length());
         double[] order = fs.apply(a.length, SPECIES.length());
@@ -5216,7 +5325,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorDoubleMaxVectorTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
+    static void SelectFromTwoVectorDoubleVectorMaxTests(IntFunction<double[]> fa, IntFunction<double[]> fb, IntFunction<double[]> fc) {
         double[] a = fa.apply(SPECIES.length());
         double[] b = fb.apply(SPECIES.length());
         double[] idx = fc.apply(SPECIES.length());
@@ -5234,7 +5343,7 @@ relativeError));
     }
 
     @Test(dataProvider = "doubleUnaryOpSelectFromMaskProvider")
-    static void SelectFromDoubleMaxVectorTestsMaskedSmokeTest(IntFunction<double[]> fa,
+    static void SelectFromDoubleVectorMaxTestsMaskedSmokeTest(IntFunction<double[]> fa,
                                                            BiFunction<Integer,Integer,double[]> fs,
                                                            IntFunction<boolean[]> fm) {
         double[] a = fa.apply(SPECIES.length());
@@ -5253,7 +5362,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousDoubleMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousDoubleVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5264,12 +5373,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringDoubleMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringDoubleVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5283,7 +5392,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsDoubleMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsDoubleVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5292,12 +5401,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsDoubleMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsDoubleVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5307,13 +5416,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeDoubleVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5335,7 +5444,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountDoubleVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5346,7 +5455,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, DoubleMaxVectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, DoubleVectorMaxTests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5360,7 +5469,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueDoubleVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5371,7 +5480,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, DoubleMaxVectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVectorMaxTests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5385,7 +5494,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueDoubleVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5396,11 +5505,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, DoubleMaxVectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, DoubleVectorMaxTests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressDoubleMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressDoubleVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5410,7 +5519,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5428,7 +5537,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeDoubleMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeDoubleVectorMaxTestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5436,13 +5545,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongDoubleMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongDoubleVectorMaxTestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5450,7 +5559,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5469,36 +5578,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundDoubleMaxVectorTestsSmokeTest(int length) {
+    static void loopBoundDoubleVectorMaxTestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongDoubleMaxVectorTestsSmokeTest(int _length) {
+    static void loopBoundLongDoubleVectorMaxTestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeDoubleMaxVectorTestsSmokeTest() {
+    static void ElementSizeDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Double.SIZE);
+        assertEquals(elsize, Double.SIZE);
     }
 
     @Test
-    static void VectorShapeDoubleMaxVectorTestsSmokeTest() {
+    static void VectorShapeDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_Max_BIT));
     }
 
     @Test
-    static void ShapeWithLanesDoubleMaxVectorTestsSmokeTest() {
+    static void ShapeWithLanesDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(double.class);
@@ -5506,32 +5615,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeDoubleMaxVectorTestsSmokeTest() {
+    static void ElementTypeDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementType() == double.class);
     }
 
     @Test
-    static void SpeciesElementSizeDoubleMaxVectorTestsSmokeTest() {
+    static void SpeciesElementSizeDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().elementSize() == Double.SIZE);
     }
 
     @Test
-    static void VectorTypeDoubleMaxVectorTestsSmokeTest() {
+    static void VectorTypeDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesDoubleMaxVectorTestsSmokeTest() {
+    static void WithLanesDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(double.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeDoubleMaxVectorTestsSmokeTest() {
+    static void WithShapeDoubleVectorMaxTestsSmokeTest() {
         DoubleVector av = DoubleVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5539,9 +5648,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueDoubleMaxVectorTestsSmokeTest() {
+    static void MaskAllTrueDoubleVectorMaxTestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatVector128LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector128LoadStoreTests.java
index 4421c355c14..5ef419f940d 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector128LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Float128VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation FloatVector128LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class FloatVector128LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_128;
 
@@ -61,14 +61,29 @@ public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(float[] r, float[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Float128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/FloatVector128Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Float128VectorTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector128Tests.java
index 32b93293fb9..51e6365b01b 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector128Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Float128VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation FloatVector128Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,63 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Float128VectorTests extends AbstractVectorTest {
+public class FloatVector128Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_128;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(float actual, float expected, float delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(float actual, float expected, float delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final float ADD_IDENTITY = (float)0;
+    private static final float FIRST_NONZERO_IDENTITY = (float)0;
+    private static final float MAX_IDENTITY = Float.NEGATIVE_INFINITY;
+    private static final float MIN_IDENTITY = Float.POSITIVE_INFINITY;
+    private static final float MUL_IDENTITY = (float)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
 
@@ -89,10 +138,10 @@ public class Float128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +153,13 @@ public class Float128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +169,10 @@ public class Float128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +194,13 @@ public class Float128VectorTests extends AbstractVectorTest {
                                             float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +222,14 @@ public class Float128VectorTests extends AbstractVectorTest {
                                             float relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +245,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +267,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +285,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +300,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +312,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +328,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (float)0);
+                    assertEquals(r[i + k], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +353,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (float)0);
+                        assertEquals(r[i + j], (float)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +381,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +394,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +409,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +429,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +453,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +468,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +483,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +507,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +533,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +552,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +563,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +574,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +586,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +602,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +617,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +632,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +650,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +666,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +684,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +710,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +728,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +752,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +767,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +779,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +792,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +811,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +832,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +847,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +868,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +964,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +991,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1012,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1039,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1059,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1080,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1101,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1123,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1175,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1221,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1183,10 +1232,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1589,7 +1638,7 @@ relativeError));
         // Do some zipping and shuffling.
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         FloatVector a = io.add((float)1); //[1,2]
         FloatVector b = a.neg();  //[-1,-2]
         float[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1604,19 +1653,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Float> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Float> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         FloatVector uab0 = zab0.rearrange(unz0,zab1);
         FloatVector uab1 = zab0.rearrange(unz1,zab1);
         float[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1633,15 +1682,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static float ADD(float a, float b) {
@@ -1649,7 +1698,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1662,7 +1711,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::ADD);
+        assertArraysEquals(r, a, b, FloatVector128Tests::ADD);
     }
 
     static float add(float a, float b) {
@@ -1670,7 +1719,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1681,11 +1730,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::add);
+        assertArraysEquals(r, a, b, FloatVector128Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1701,11 +1750,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1719,7 +1768,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::add);
     }
 
     static float SUB(float a, float b) {
@@ -1727,7 +1776,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void SUBFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void SUBFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1740,7 +1789,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::SUB);
+        assertArraysEquals(r, a, b, FloatVector128Tests::SUB);
     }
 
     static float sub(float a, float b) {
@@ -1748,7 +1797,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1759,11 +1808,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::sub);
+        assertArraysEquals(r, a, b, FloatVector128Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void SUBFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void SUBFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1779,11 +1828,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1797,7 +1846,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::sub);
     }
 
     static float MUL(float a, float b) {
@@ -1805,7 +1854,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MULFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MULFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1818,7 +1867,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::MUL);
+        assertArraysEquals(r, a, b, FloatVector128Tests::MUL);
     }
 
     static float mul(float a, float b) {
@@ -1826,7 +1875,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1837,11 +1886,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::mul);
+        assertArraysEquals(r, a, b, FloatVector128Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void MULFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void MULFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1857,11 +1906,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1875,7 +1924,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1883,7 +1932,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void DIVFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void DIVFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1896,7 +1945,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::DIV);
+        assertArraysEquals(r, a, b, FloatVector128Tests::DIV);
     }
 
     static float div(float a, float b) {
@@ -1904,7 +1953,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1915,11 +1964,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::div);
+        assertArraysEquals(r, a, b, FloatVector128Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void DIVFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void DIVFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1984,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1953,7 +2002,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::div);
     }
 
     static float FIRST_NONZERO(float a, float b) {
@@ -1961,7 +2010,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void FIRST_NONZEROFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void FIRST_NONZEROFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1974,11 +2023,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, FloatVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void FIRST_NONZEROFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FIRST_NONZEROFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1994,11 +2043,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2008,11 +2057,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2025,11 +2074,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector128Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2039,11 +2088,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2056,11 +2105,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector128Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2070,11 +2119,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2087,11 +2136,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector128Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2101,11 +2150,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2118,11 +2167,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector128Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat128VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector128TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Float128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, FloatVector128Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2149,13 +2198,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector128Tests::ADD);
     }
 
     static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MINFloatVector128TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2166,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float128VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, FloatVector128Tests::MIN);
     }
 
     static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void minFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void minFloatVector128TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2183,13 +2232,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float128VectorTests::min);
+        assertArraysEquals(r, a, (float)10, FloatVector128Tests::min);
     }
 
     static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINFloat128VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINFloatVector128TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2202,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float128VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector128Tests::MIN);
     }
 
     static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MAXFloatVector128TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2219,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float128VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, FloatVector128Tests::MAX);
     }
 
     static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void maxFloat128VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void maxFloatVector128TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2236,13 +2285,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float128VectorTests::max);
+        assertArraysEquals(r, a, (float)10, FloatVector128Tests::max);
     }
 
     static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXFloat128VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXFloatVector128TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2255,7 +2304,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float128VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector128Tests::MAX);
     }
 
     static float MIN(float a, float b) {
@@ -2263,7 +2312,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2276,7 +2325,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::MIN);
+        assertArraysEquals(r, a, b, FloatVector128Tests::MIN);
     }
 
     static float min(float a, float b) {
@@ -2284,7 +2333,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2295,7 +2344,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::min);
+        assertArraysEquals(r, a, b, FloatVector128Tests::min);
     }
 
     static float MAX(float a, float b) {
@@ -2303,7 +2352,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2316,7 +2365,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::MAX);
+        assertArraysEquals(r, a, b, FloatVector128Tests::MAX);
     }
 
     static float max(float a, float b) {
@@ -2324,7 +2373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2335,11 +2384,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::max);
+        assertArraysEquals(r, a, b, FloatVector128Tests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2349,11 +2398,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2363,11 +2412,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2377,11 +2426,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2391,11 +2440,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, FloatVector128Tests::max);
     }
 
     static float ADDReduce(float[] a, int idx) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2404,7 +2453,7 @@ relativeError));
     }
 
     static float ADDReduceAll(float[] a) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2413,32 +2462,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                float v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::ADDReduce, Float128VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector128Tests::ADDReduce, FloatVector128Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = ADD_IDENTITY;
+
+        assertEquals((float) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id + x), x);
+                assertEquals((float) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2448,7 +2515,7 @@ relativeError));
     }
 
     static float ADDReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2457,7 +2524,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2465,26 +2532,21 @@ relativeError));
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                float v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::ADDReduceMasked, Float128VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector128Tests::ADDReduceMasked, FloatVector128Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2493,7 +2555,7 @@ relativeError));
     }
 
     static float MULReduceAll(float[] a) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2502,32 +2564,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MULReduceFloat128VectorTests(IntFunction<float[]> fa) {
+    static void MULReduceFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                float v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::MULReduce, Float128VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector128Tests::MULReduce, FloatVector128Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MUL_IDENTITY;
+
+        assertEquals((float) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id * x), x);
+                assertEquals((float) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2537,7 +2617,7 @@ relativeError));
     }
 
     static float MULReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2546,34 +2626,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MULReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                float v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::MULReduceMasked, Float128VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector128Tests::MULReduceMasked, FloatVector128Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.min(res, a[i]);
         }
@@ -2582,7 +2657,7 @@ relativeError));
     }
 
     static float MINReduceAll(float[] a) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduce(a, i));
         }
@@ -2591,32 +2666,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINReduceFloat128VectorTests(IntFunction<float[]> fa) {
+    static void MINReduceFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                float v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::MINReduce, Float128VectorTests::MINReduceAll);
+                FloatVector128Tests::MINReduce, FloatVector128Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MIN_IDENTITY;
+
+        assertEquals((float) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.min(id, x), x);
+                assertEquals((float) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.min(res, a[i]);
@@ -2626,7 +2719,7 @@ relativeError));
     }
 
     static float MINReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2635,34 +2728,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                float v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::MINReduceMasked, Float128VectorTests::MINReduceAllMasked);
+                FloatVector128Tests::MINReduceMasked, FloatVector128Tests::MINReduceAllMasked);
     }
 
     static float MAXReduce(float[] a, int idx) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.max(res, a[i]);
         }
@@ -2671,7 +2759,7 @@ relativeError));
     }
 
     static float MAXReduceAll(float[] a) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduce(a, i));
         }
@@ -2680,32 +2768,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXReduceFloat128VectorTests(IntFunction<float[]> fa) {
+    static void MAXReduceFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                float v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::MAXReduce, Float128VectorTests::MAXReduceAll);
+                FloatVector128Tests::MAXReduce, FloatVector128Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MAX_IDENTITY;
+
+        assertEquals((float) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.max(id, x), x);
+                assertEquals((float) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.max(res, a[i]);
@@ -2715,7 +2821,7 @@ relativeError));
     }
 
     static float MAXReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2724,34 +2830,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                float v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::MAXReduceMasked, Float128VectorTests::MAXReduceAllMasked);
+                FloatVector128Tests::MAXReduceMasked, FloatVector128Tests::MAXReduceAllMasked);
     }
 
     static float FIRST_NONZEROReduce(float[] a, int idx) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2760,7 +2861,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAll(float[] a) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2769,32 +2870,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void FIRST_NONZEROReduceFloat128VectorTests(IntFunction<float[]> fa) {
+    static void FIRST_NONZEROReduceFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::FIRST_NONZEROReduce, Float128VectorTests::FIRST_NONZEROReduceAll);
+                FloatVector128Tests::FIRST_NONZEROReduce, FloatVector128Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static float FIRST_NONZEROReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2804,7 +2923,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAllMasked(float[] a, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2813,34 +2932,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::FIRST_NONZEROReduceMasked, Float128VectorTests::FIRST_NONZEROReduceAllMasked);
+                FloatVector128Tests::FIRST_NONZEROReduceMasked, FloatVector128Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void withFloat128VectorTests(IntFunction<float []> fa, IntFunction<float []> fb) {
+    static void withFloatVector128Tests(IntFunction<float []> fa, IntFunction<float []> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2863,7 +2977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_DEFAULTFloat128VectorTests(IntFunction<float[]> fa) {
+    static void IS_DEFAULTFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2873,14 +2987,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2893,7 +3007,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2904,7 +3018,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NEGATIVEFloat128VectorTests(IntFunction<float[]> fa) {
+    static void IS_NEGATIVEFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2914,14 +3028,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2934,7 +3048,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2945,7 +3059,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_FINITEFloat128VectorTests(IntFunction<float[]> fa) {
+    static void IS_FINITEFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2955,14 +3069,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2975,7 +3089,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2986,7 +3100,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NANFloat128VectorTests(IntFunction<float[]> fa) {
+    static void IS_NANFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2996,14 +3110,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3016,7 +3130,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3027,7 +3141,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_INFINITEFloat128VectorTests(IntFunction<float[]> fa) {
+    static void IS_INFINITEFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3037,14 +3151,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3057,14 +3171,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3076,14 +3190,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3095,14 +3209,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LTFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3118,14 +3232,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GTFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GTFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3137,14 +3251,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GTFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GTFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3160,14 +3274,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3179,14 +3293,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3198,14 +3312,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void EQFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3221,14 +3335,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void NEFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void NEFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3240,14 +3354,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void NEFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void NEFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3263,14 +3377,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LEFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LEFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3282,14 +3396,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LEFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LEFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3305,14 +3419,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GEFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GEFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3324,14 +3438,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GEFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GEFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3347,14 +3461,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3364,13 +3478,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3384,13 +3498,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat128VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector128TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3400,13 +3514,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3420,13 +3534,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3436,13 +3550,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3456,13 +3570,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat128VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector128TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3472,13 +3586,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3492,7 +3606,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
             }
         }
     }
@@ -3502,7 +3616,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3518,11 +3632,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, FloatVector128Tests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
-    static void RearrangeFloat128VectorTests(IntFunction<float[]> fa,
+    static void RearrangeFloatVector128Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3539,7 +3653,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
-    static void RearrangeFloat128VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void RearrangeFloatVector128TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -3557,7 +3671,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void compressFloat128VectorTests(IntFunction<float[]> fa,
+    static void compressFloatVector128Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3575,7 +3689,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void expandFloat128VectorTests(IntFunction<float[]> fa,
+    static void expandFloatVector128Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3593,7 +3707,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void getFloat128VectorTests(IntFunction<float[]> fa) {
+    static void getFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -3749,7 +3863,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void BroadcastFloat128VectorTests(IntFunction<float[]> fa) {
+    static void BroadcastFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3763,7 +3877,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ZeroFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ZeroFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3773,7 +3887,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static float[] sliceUnary(float[] a, int origin, int idx) {
@@ -3788,7 +3902,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sliceUnaryFloat128VectorTests(IntFunction<float[]> fa) {
+    static void sliceUnaryFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3799,7 +3913,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector128Tests::sliceUnary);
     }
 
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
@@ -3816,7 +3930,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void sliceBinaryFloat128VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void sliceBinaryFloatVector128TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3829,7 +3943,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Float128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, FloatVector128Tests::sliceBinary);
     }
 
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
@@ -3846,7 +3960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void sliceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void sliceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3863,7 +3977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Float128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, FloatVector128Tests::slice);
     }
 
     static float[] unsliceUnary(float[] a, int origin, int idx) {
@@ -3880,7 +3994,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void unsliceUnaryFloat128VectorTests(IntFunction<float[]> fa) {
+    static void unsliceUnaryFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3891,7 +4005,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector128Tests::unsliceUnary);
     }
 
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
@@ -3917,7 +4031,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void unsliceBinaryFloat128VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void unsliceBinaryFloatVector128TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3931,7 +4045,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Float128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, FloatVector128Tests::unsliceBinary);
     }
 
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3971,7 +4085,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void unsliceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void unsliceFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3988,7 +4102,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Float128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, FloatVector128Tests::unslice);
     }
 
     static float SIN(float a) {
@@ -4000,7 +4114,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINFloat128VectorTests(IntFunction<float[]> fa) {
+    static void SINFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4011,7 +4125,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::SIN, Float128VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::SIN, FloatVector128Tests::strictSIN);
     }
 
     static float EXP(float a) {
@@ -4023,7 +4137,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPFloat128VectorTests(IntFunction<float[]> fa) {
+    static void EXPFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4034,7 +4148,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::EXP, Float128VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::EXP, FloatVector128Tests::strictEXP);
     }
 
     static float LOG1P(float a) {
@@ -4046,7 +4160,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG1PFloat128VectorTests(IntFunction<float[]> fa) {
+    static void LOG1PFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4057,7 +4171,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::LOG1P, Float128VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::LOG1P, FloatVector128Tests::strictLOG1P);
     }
 
     static float LOG(float a) {
@@ -4069,7 +4183,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOGFloat128VectorTests(IntFunction<float[]> fa) {
+    static void LOGFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4080,7 +4194,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::LOG, Float128VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::LOG, FloatVector128Tests::strictLOG);
     }
 
     static float LOG10(float a) {
@@ -4092,7 +4206,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG10Float128VectorTests(IntFunction<float[]> fa) {
+    static void LOG10FloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4103,7 +4217,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::LOG10, Float128VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::LOG10, FloatVector128Tests::strictLOG10);
     }
 
     static float EXPM1(float a) {
@@ -4115,7 +4229,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPM1Float128VectorTests(IntFunction<float[]> fa) {
+    static void EXPM1FloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4126,7 +4240,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::EXPM1, Float128VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::EXPM1, FloatVector128Tests::strictEXPM1);
     }
 
     static float COS(float a) {
@@ -4138,7 +4252,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSFloat128VectorTests(IntFunction<float[]> fa) {
+    static void COSFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4149,7 +4263,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::COS, Float128VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::COS, FloatVector128Tests::strictCOS);
     }
 
     static float TAN(float a) {
@@ -4161,7 +4275,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANFloat128VectorTests(IntFunction<float[]> fa) {
+    static void TANFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4172,7 +4286,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::TAN, Float128VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::TAN, FloatVector128Tests::strictTAN);
     }
 
     static float SINH(float a) {
@@ -4184,7 +4298,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINHFloat128VectorTests(IntFunction<float[]> fa) {
+    static void SINHFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4195,7 +4309,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::SINH, Float128VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::SINH, FloatVector128Tests::strictSINH);
     }
 
     static float COSH(float a) {
@@ -4207,7 +4321,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSHFloat128VectorTests(IntFunction<float[]> fa) {
+    static void COSHFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4218,7 +4332,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::COSH, Float128VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::COSH, FloatVector128Tests::strictCOSH);
     }
 
     static float TANH(float a) {
@@ -4230,7 +4344,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANHFloat128VectorTests(IntFunction<float[]> fa) {
+    static void TANHFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4241,7 +4355,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::TANH, Float128VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::TANH, FloatVector128Tests::strictTANH);
     }
 
     static float ASIN(float a) {
@@ -4253,7 +4367,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ASINFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ASINFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4264,7 +4378,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::ASIN, Float128VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::ASIN, FloatVector128Tests::strictASIN);
     }
 
     static float ACOS(float a) {
@@ -4276,7 +4390,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ACOSFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ACOSFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4287,7 +4401,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::ACOS, Float128VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::ACOS, FloatVector128Tests::strictACOS);
     }
 
     static float ATAN(float a) {
@@ -4299,7 +4413,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ATANFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ATANFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4310,7 +4424,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::ATAN, Float128VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::ATAN, FloatVector128Tests::strictATAN);
     }
 
     static float CBRT(float a) {
@@ -4322,7 +4436,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void CBRTFloat128VectorTests(IntFunction<float[]> fa) {
+    static void CBRTFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4333,7 +4447,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float128VectorTests::CBRT, Float128VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector128Tests::CBRT, FloatVector128Tests::strictCBRT);
     }
 
     static float HYPOT(float a, float b) {
@@ -4345,7 +4459,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void HYPOTFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void HYPOTFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4358,7 +4472,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::HYPOT, Float128VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector128Tests::HYPOT, FloatVector128Tests::strictHYPOT);
     }
 
 
@@ -4371,7 +4485,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4384,7 +4498,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::POW, Float128VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector128Tests::POW, FloatVector128Tests::strictPOW);
     }
 
 
@@ -4397,7 +4511,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4410,7 +4524,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::pow, Float128VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector128Tests::pow, FloatVector128Tests::strictpow);
     }
 
 
@@ -4423,7 +4537,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ATAN2Float128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ATAN2FloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4436,12 +4550,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::ATAN2, Float128VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector128Tests::ATAN2, FloatVector128Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4451,12 +4565,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::POW, Float128VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector128Tests::POW, FloatVector128Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4466,7 +4580,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float128VectorTests::pow, Float128VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector128Tests::pow, FloatVector128Tests::strictpow);
     }
 
 
@@ -4479,7 +4593,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4494,11 +4608,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Float128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4511,11 +4625,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Float128VectorTests::fma);
+        assertArraysEquals(r, a, b, c, FloatVector128Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4533,11 +4647,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4548,11 +4662,11 @@ relativeError));
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Float128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat128VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector128TestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4563,11 +4677,11 @@ relativeError));
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Float128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4582,11 +4696,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector128TestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4601,11 +4715,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat128VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector128TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4616,11 +4730,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector128Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat128VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector128TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4631,11 +4745,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float128VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector128Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector128TestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4649,7 +4763,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float128VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatVector128Tests::FMA);
     }
 
     static float NEG(float a) {
@@ -4661,7 +4775,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void NEGFloat128VectorTests(IntFunction<float[]> fa) {
+    static void NEGFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4672,11 +4786,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::NEG);
+        assertArraysEquals(r, a, FloatVector128Tests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void negFloat128VectorTests(IntFunction<float[]> fa) {
+    static void negFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4687,11 +4801,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::neg);
+        assertArraysEquals(r, a, FloatVector128Tests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void NEGMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void NEGMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4705,7 +4819,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, FloatVector128Tests::NEG);
     }
 
     static float ABS(float a) {
@@ -4717,7 +4831,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ABSFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ABSFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4728,11 +4842,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::ABS);
+        assertArraysEquals(r, a, FloatVector128Tests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void absFloat128VectorTests(IntFunction<float[]> fa) {
+    static void absFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4743,11 +4857,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::abs);
+        assertArraysEquals(r, a, FloatVector128Tests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ABSMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void ABSMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4761,7 +4875,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, FloatVector128Tests::ABS);
     }
 
     static float SQRT(float a) {
@@ -4773,7 +4887,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SQRTFloat128VectorTests(IntFunction<float[]> fa) {
+    static void SQRTFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4784,11 +4898,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::SQRT);
+        assertArraysEquals(r, a, FloatVector128Tests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sqrtFloat128VectorTests(IntFunction<float[]> fa) {
+    static void sqrtFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4799,11 +4913,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::sqrt);
+        assertArraysEquals(r, a, FloatVector128Tests::sqrt);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void SQRTMaskedFloat128VectorTests(IntFunction<float[]> fa,
+    static void SQRTMaskedFloatVector128Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4817,7 +4931,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float128VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, FloatVector128Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4825,7 +4939,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandFloatVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4838,7 +4952,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::band);
+        assertArraysEquals(r, a, b, FloatVector128Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4846,7 +4960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorFloatVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4859,7 +4973,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::bor);
+        assertArraysEquals(r, a, b, FloatVector128Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4867,7 +4981,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorFloatVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4880,7 +4994,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::bxor);
+        assertArraysEquals(r, a, b, FloatVector128Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4888,7 +5002,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotFloatVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4901,7 +5015,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::bandNot);
+        assertArraysEquals(r, a, b, FloatVector128Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4909,7 +5023,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqFloatVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4922,7 +5036,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float128VectorTests::beq);
+        assertArraysEquals(r, a, b, FloatVector128Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4930,7 +5044,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotFloat128VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotFloatVector128Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4941,7 +5055,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float128VectorTests::unot);
+        assertArraysEquals(r, a, FloatVector128Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4950,15 +5064,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat128VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongFloatVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -4972,7 +5086,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat128VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector128TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4982,13 +5096,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat128VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector128TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4998,13 +5112,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floattoIntUnaryOpProvider")
-    static void toIntArrayFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toIntArrayFloatVector128TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5015,7 +5129,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void toLongArrayFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toLongArrayFloatVector128TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5026,7 +5140,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toDoubleArrayFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toDoubleArrayFloatVector128TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5037,7 +5151,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toStringFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toStringFloatVector128TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5050,7 +5164,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void hashCodeFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void hashCodeFloatVector128TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5083,7 +5197,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceLongFloat128VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceLongFloatVector128Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5099,7 +5213,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Float128VectorTests::ADDReduceLong, Float128VectorTests::ADDReduceAllLong);
+                FloatVector128Tests::ADDReduceLong, FloatVector128Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(float[] a, int idx, boolean[] mask) {
@@ -5122,7 +5236,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceLongFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongFloatVector128TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5140,11 +5254,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::ADDReduceLongMasked, Float128VectorTests::ADDReduceAllLongMasked);
+                FloatVector128Tests::ADDReduceLongMasked, FloatVector128Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void BroadcastLongFloat128VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void BroadcastLongFloatVector128TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -5155,7 +5269,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat128VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector128TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -5169,12 +5283,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector128Tests::blend);
     }
 
 
     @Test(dataProvider = "floatUnaryOpSelectFromProvider")
-    static void SelectFromFloat128VectorTests(IntFunction<float[]> fa,
+    static void SelectFromFloatVector128Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,float[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         float[] order = fs.apply(a.length, SPECIES.length());
@@ -5190,7 +5304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorFloat128VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void SelectFromTwoVectorFloatVector128Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] idx = fc.apply(SPECIES.length());
@@ -5208,7 +5322,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
-    static void SelectFromFloat128VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void SelectFromFloatVector128TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                            BiFunction<Integer,Integer,float[]> fs,
                                                            IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -5227,7 +5341,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousFloat128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousFloatVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5238,12 +5352,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringFloat128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringFloatVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5257,7 +5371,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsFloat128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsFloatVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5266,12 +5380,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsFloat128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsFloatVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5281,13 +5395,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeFloatVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5309,7 +5423,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountFloatVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5320,7 +5434,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float128VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, FloatVector128Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5334,7 +5448,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueFloatVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5345,7 +5459,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float128VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector128Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5359,7 +5473,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueFloatVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5370,11 +5484,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float128VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector128Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressFloat128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressFloatVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5384,7 +5498,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5402,7 +5516,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeFloat128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeFloatVector128TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5410,13 +5524,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongFloat128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongFloatVector128TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5424,7 +5538,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5443,36 +5557,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundFloat128VectorTestsSmokeTest(int length) {
+    static void loopBoundFloatVector128TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongFloat128VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongFloatVector128TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeFloat128VectorTestsSmokeTest() {
+    static void ElementSizeFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Float.SIZE);
+        assertEquals(elsize, Float.SIZE);
     }
 
     @Test
-    static void VectorShapeFloat128VectorTestsSmokeTest() {
+    static void VectorShapeFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_128_BIT));
     }
 
     @Test
-    static void ShapeWithLanesFloat128VectorTestsSmokeTest() {
+    static void ShapeWithLanesFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(float.class);
@@ -5480,32 +5594,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeFloat128VectorTestsSmokeTest() {
+    static void ElementTypeFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementType() == float.class);
     }
 
     @Test
-    static void SpeciesElementSizeFloat128VectorTestsSmokeTest() {
+    static void SpeciesElementSizeFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementSize() == Float.SIZE);
     }
 
     @Test
-    static void VectorTypeFloat128VectorTestsSmokeTest() {
+    static void VectorTypeFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesFloat128VectorTestsSmokeTest() {
+    static void WithLanesFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(float.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeFloat128VectorTestsSmokeTest() {
+    static void WithShapeFloatVector128TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5513,9 +5627,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueFloat128VectorTestsSmokeTest() {
+    static void MaskAllTrueFloatVector128TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatVector256LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector256LoadStoreTests.java
index 0ad426d9954..a889bb5e8c8 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector256LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Float256VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation FloatVector256LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class FloatVector256LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_256;
 
@@ -61,14 +61,29 @@ public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(float[] r, float[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Float256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/FloatVector256Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Float256VectorTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector256Tests.java
index 9847865eacb..b7d16ecc7f7 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector256Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Float256VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation FloatVector256Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,63 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Float256VectorTests extends AbstractVectorTest {
+public class FloatVector256Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_256;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(float actual, float expected, float delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(float actual, float expected, float delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final float ADD_IDENTITY = (float)0;
+    private static final float FIRST_NONZERO_IDENTITY = (float)0;
+    private static final float MAX_IDENTITY = Float.NEGATIVE_INFINITY;
+    private static final float MIN_IDENTITY = Float.POSITIVE_INFINITY;
+    private static final float MUL_IDENTITY = (float)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
 
@@ -89,10 +138,10 @@ public class Float256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +153,13 @@ public class Float256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +169,10 @@ public class Float256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +194,13 @@ public class Float256VectorTests extends AbstractVectorTest {
                                             float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +222,14 @@ public class Float256VectorTests extends AbstractVectorTest {
                                             float relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +245,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +267,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +285,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +300,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +312,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +328,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (float)0);
+                    assertEquals(r[i + k], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +353,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (float)0);
+                        assertEquals(r[i + j], (float)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +381,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +394,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +409,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +429,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +453,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +468,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +483,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +507,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +533,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +552,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +563,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +574,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +586,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +602,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +617,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +632,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +650,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +666,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +684,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +710,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +728,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +752,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +767,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +779,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +792,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +811,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +832,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +847,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +868,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +964,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +991,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1012,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1039,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1059,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1080,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1101,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1123,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1175,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1221,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1183,10 +1232,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1589,7 +1638,7 @@ relativeError));
         // Do some zipping and shuffling.
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         FloatVector a = io.add((float)1); //[1,2]
         FloatVector b = a.neg();  //[-1,-2]
         float[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1604,19 +1653,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Float> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Float> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         FloatVector uab0 = zab0.rearrange(unz0,zab1);
         FloatVector uab1 = zab0.rearrange(unz1,zab1);
         float[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1633,15 +1682,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static float ADD(float a, float b) {
@@ -1649,7 +1698,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1662,7 +1711,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::ADD);
+        assertArraysEquals(r, a, b, FloatVector256Tests::ADD);
     }
 
     static float add(float a, float b) {
@@ -1670,7 +1719,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1681,11 +1730,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::add);
+        assertArraysEquals(r, a, b, FloatVector256Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1701,11 +1750,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1719,7 +1768,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::add);
     }
 
     static float SUB(float a, float b) {
@@ -1727,7 +1776,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void SUBFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void SUBFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1740,7 +1789,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::SUB);
+        assertArraysEquals(r, a, b, FloatVector256Tests::SUB);
     }
 
     static float sub(float a, float b) {
@@ -1748,7 +1797,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1759,11 +1808,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::sub);
+        assertArraysEquals(r, a, b, FloatVector256Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void SUBFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void SUBFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1779,11 +1828,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1797,7 +1846,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::sub);
     }
 
     static float MUL(float a, float b) {
@@ -1805,7 +1854,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MULFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MULFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1818,7 +1867,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::MUL);
+        assertArraysEquals(r, a, b, FloatVector256Tests::MUL);
     }
 
     static float mul(float a, float b) {
@@ -1826,7 +1875,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1837,11 +1886,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::mul);
+        assertArraysEquals(r, a, b, FloatVector256Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void MULFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void MULFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1857,11 +1906,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1875,7 +1924,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1883,7 +1932,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void DIVFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void DIVFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1896,7 +1945,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::DIV);
+        assertArraysEquals(r, a, b, FloatVector256Tests::DIV);
     }
 
     static float div(float a, float b) {
@@ -1904,7 +1953,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1915,11 +1964,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::div);
+        assertArraysEquals(r, a, b, FloatVector256Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void DIVFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void DIVFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1984,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1953,7 +2002,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::div);
     }
 
     static float FIRST_NONZERO(float a, float b) {
@@ -1961,7 +2010,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void FIRST_NONZEROFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void FIRST_NONZEROFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1974,11 +2023,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, FloatVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void FIRST_NONZEROFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FIRST_NONZEROFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1994,11 +2043,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2008,11 +2057,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2025,11 +2074,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector256Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2039,11 +2088,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2056,11 +2105,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector256Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2070,11 +2119,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2087,11 +2136,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector256Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2101,11 +2150,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2118,11 +2167,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector256Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat256VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector256TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Float256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, FloatVector256Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2149,13 +2198,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector256Tests::ADD);
     }
 
     static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MINFloatVector256TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2166,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float256VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, FloatVector256Tests::MIN);
     }
 
     static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void minFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void minFloatVector256TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2183,13 +2232,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float256VectorTests::min);
+        assertArraysEquals(r, a, (float)10, FloatVector256Tests::min);
     }
 
     static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINFloat256VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINFloatVector256TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2202,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float256VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector256Tests::MIN);
     }
 
     static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MAXFloatVector256TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2219,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float256VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, FloatVector256Tests::MAX);
     }
 
     static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void maxFloat256VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void maxFloatVector256TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2236,13 +2285,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float256VectorTests::max);
+        assertArraysEquals(r, a, (float)10, FloatVector256Tests::max);
     }
 
     static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXFloat256VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXFloatVector256TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2255,7 +2304,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float256VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector256Tests::MAX);
     }
 
     static float MIN(float a, float b) {
@@ -2263,7 +2312,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2276,7 +2325,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::MIN);
+        assertArraysEquals(r, a, b, FloatVector256Tests::MIN);
     }
 
     static float min(float a, float b) {
@@ -2284,7 +2333,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2295,7 +2344,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::min);
+        assertArraysEquals(r, a, b, FloatVector256Tests::min);
     }
 
     static float MAX(float a, float b) {
@@ -2303,7 +2352,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2316,7 +2365,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::MAX);
+        assertArraysEquals(r, a, b, FloatVector256Tests::MAX);
     }
 
     static float max(float a, float b) {
@@ -2324,7 +2373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2335,11 +2384,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::max);
+        assertArraysEquals(r, a, b, FloatVector256Tests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2349,11 +2398,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2363,11 +2412,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2377,11 +2426,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2391,11 +2440,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, FloatVector256Tests::max);
     }
 
     static float ADDReduce(float[] a, int idx) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2404,7 +2453,7 @@ relativeError));
     }
 
     static float ADDReduceAll(float[] a) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2413,32 +2462,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                float v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::ADDReduce, Float256VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector256Tests::ADDReduce, FloatVector256Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = ADD_IDENTITY;
+
+        assertEquals((float) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id + x), x);
+                assertEquals((float) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2448,7 +2515,7 @@ relativeError));
     }
 
     static float ADDReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2457,7 +2524,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2465,26 +2532,21 @@ relativeError));
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                float v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::ADDReduceMasked, Float256VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector256Tests::ADDReduceMasked, FloatVector256Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2493,7 +2555,7 @@ relativeError));
     }
 
     static float MULReduceAll(float[] a) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2502,32 +2564,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MULReduceFloat256VectorTests(IntFunction<float[]> fa) {
+    static void MULReduceFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                float v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::MULReduce, Float256VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector256Tests::MULReduce, FloatVector256Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MUL_IDENTITY;
+
+        assertEquals((float) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id * x), x);
+                assertEquals((float) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2537,7 +2617,7 @@ relativeError));
     }
 
     static float MULReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2546,34 +2626,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MULReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                float v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::MULReduceMasked, Float256VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector256Tests::MULReduceMasked, FloatVector256Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.min(res, a[i]);
         }
@@ -2582,7 +2657,7 @@ relativeError));
     }
 
     static float MINReduceAll(float[] a) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduce(a, i));
         }
@@ -2591,32 +2666,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINReduceFloat256VectorTests(IntFunction<float[]> fa) {
+    static void MINReduceFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                float v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::MINReduce, Float256VectorTests::MINReduceAll);
+                FloatVector256Tests::MINReduce, FloatVector256Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MIN_IDENTITY;
+
+        assertEquals((float) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.min(id, x), x);
+                assertEquals((float) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.min(res, a[i]);
@@ -2626,7 +2719,7 @@ relativeError));
     }
 
     static float MINReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2635,34 +2728,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                float v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::MINReduceMasked, Float256VectorTests::MINReduceAllMasked);
+                FloatVector256Tests::MINReduceMasked, FloatVector256Tests::MINReduceAllMasked);
     }
 
     static float MAXReduce(float[] a, int idx) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.max(res, a[i]);
         }
@@ -2671,7 +2759,7 @@ relativeError));
     }
 
     static float MAXReduceAll(float[] a) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduce(a, i));
         }
@@ -2680,32 +2768,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXReduceFloat256VectorTests(IntFunction<float[]> fa) {
+    static void MAXReduceFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                float v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::MAXReduce, Float256VectorTests::MAXReduceAll);
+                FloatVector256Tests::MAXReduce, FloatVector256Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MAX_IDENTITY;
+
+        assertEquals((float) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.max(id, x), x);
+                assertEquals((float) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.max(res, a[i]);
@@ -2715,7 +2821,7 @@ relativeError));
     }
 
     static float MAXReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2724,34 +2830,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                float v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::MAXReduceMasked, Float256VectorTests::MAXReduceAllMasked);
+                FloatVector256Tests::MAXReduceMasked, FloatVector256Tests::MAXReduceAllMasked);
     }
 
     static float FIRST_NONZEROReduce(float[] a, int idx) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2760,7 +2861,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAll(float[] a) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2769,32 +2870,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void FIRST_NONZEROReduceFloat256VectorTests(IntFunction<float[]> fa) {
+    static void FIRST_NONZEROReduceFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::FIRST_NONZEROReduce, Float256VectorTests::FIRST_NONZEROReduceAll);
+                FloatVector256Tests::FIRST_NONZEROReduce, FloatVector256Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static float FIRST_NONZEROReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2804,7 +2923,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAllMasked(float[] a, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2813,34 +2932,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::FIRST_NONZEROReduceMasked, Float256VectorTests::FIRST_NONZEROReduceAllMasked);
+                FloatVector256Tests::FIRST_NONZEROReduceMasked, FloatVector256Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void withFloat256VectorTests(IntFunction<float []> fa, IntFunction<float []> fb) {
+    static void withFloatVector256Tests(IntFunction<float []> fa, IntFunction<float []> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2863,7 +2977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_DEFAULTFloat256VectorTests(IntFunction<float[]> fa) {
+    static void IS_DEFAULTFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2873,14 +2987,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2893,7 +3007,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2904,7 +3018,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NEGATIVEFloat256VectorTests(IntFunction<float[]> fa) {
+    static void IS_NEGATIVEFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2914,14 +3028,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2934,7 +3048,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2945,7 +3059,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_FINITEFloat256VectorTests(IntFunction<float[]> fa) {
+    static void IS_FINITEFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2955,14 +3069,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2975,7 +3089,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2986,7 +3100,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NANFloat256VectorTests(IntFunction<float[]> fa) {
+    static void IS_NANFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2996,14 +3110,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3016,7 +3130,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3027,7 +3141,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_INFINITEFloat256VectorTests(IntFunction<float[]> fa) {
+    static void IS_INFINITEFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3037,14 +3151,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3057,14 +3171,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3076,14 +3190,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3095,14 +3209,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LTFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3118,14 +3232,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GTFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GTFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3137,14 +3251,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GTFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GTFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3160,14 +3274,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3179,14 +3293,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3198,14 +3312,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void EQFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3221,14 +3335,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void NEFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void NEFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3240,14 +3354,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void NEFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void NEFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3263,14 +3377,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LEFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LEFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3282,14 +3396,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LEFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LEFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3305,14 +3419,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GEFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GEFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3324,14 +3438,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GEFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GEFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3347,14 +3461,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3364,13 +3478,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3384,13 +3498,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat256VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector256TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3400,13 +3514,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3420,13 +3534,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3436,13 +3550,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3456,13 +3570,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat256VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector256TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3472,13 +3586,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3492,7 +3606,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
             }
         }
     }
@@ -3502,7 +3616,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3518,11 +3632,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, FloatVector256Tests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
-    static void RearrangeFloat256VectorTests(IntFunction<float[]> fa,
+    static void RearrangeFloatVector256Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3539,7 +3653,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
-    static void RearrangeFloat256VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void RearrangeFloatVector256TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -3557,7 +3671,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void compressFloat256VectorTests(IntFunction<float[]> fa,
+    static void compressFloatVector256Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3575,7 +3689,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void expandFloat256VectorTests(IntFunction<float[]> fa,
+    static void expandFloatVector256Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3593,7 +3707,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void getFloat256VectorTests(IntFunction<float[]> fa) {
+    static void getFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -3749,7 +3863,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void BroadcastFloat256VectorTests(IntFunction<float[]> fa) {
+    static void BroadcastFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3763,7 +3877,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ZeroFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ZeroFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3773,7 +3887,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static float[] sliceUnary(float[] a, int origin, int idx) {
@@ -3788,7 +3902,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sliceUnaryFloat256VectorTests(IntFunction<float[]> fa) {
+    static void sliceUnaryFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3799,7 +3913,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector256Tests::sliceUnary);
     }
 
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
@@ -3816,7 +3930,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void sliceBinaryFloat256VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void sliceBinaryFloatVector256TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3829,7 +3943,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Float256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, FloatVector256Tests::sliceBinary);
     }
 
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
@@ -3846,7 +3960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void sliceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void sliceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3863,7 +3977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Float256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, FloatVector256Tests::slice);
     }
 
     static float[] unsliceUnary(float[] a, int origin, int idx) {
@@ -3880,7 +3994,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void unsliceUnaryFloat256VectorTests(IntFunction<float[]> fa) {
+    static void unsliceUnaryFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3891,7 +4005,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector256Tests::unsliceUnary);
     }
 
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
@@ -3917,7 +4031,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void unsliceBinaryFloat256VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void unsliceBinaryFloatVector256TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3931,7 +4045,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Float256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, FloatVector256Tests::unsliceBinary);
     }
 
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3971,7 +4085,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void unsliceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void unsliceFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3988,7 +4102,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Float256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, FloatVector256Tests::unslice);
     }
 
     static float SIN(float a) {
@@ -4000,7 +4114,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINFloat256VectorTests(IntFunction<float[]> fa) {
+    static void SINFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4011,7 +4125,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::SIN, Float256VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::SIN, FloatVector256Tests::strictSIN);
     }
 
     static float EXP(float a) {
@@ -4023,7 +4137,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPFloat256VectorTests(IntFunction<float[]> fa) {
+    static void EXPFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4034,7 +4148,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::EXP, Float256VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::EXP, FloatVector256Tests::strictEXP);
     }
 
     static float LOG1P(float a) {
@@ -4046,7 +4160,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG1PFloat256VectorTests(IntFunction<float[]> fa) {
+    static void LOG1PFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4057,7 +4171,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::LOG1P, Float256VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::LOG1P, FloatVector256Tests::strictLOG1P);
     }
 
     static float LOG(float a) {
@@ -4069,7 +4183,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOGFloat256VectorTests(IntFunction<float[]> fa) {
+    static void LOGFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4080,7 +4194,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::LOG, Float256VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::LOG, FloatVector256Tests::strictLOG);
     }
 
     static float LOG10(float a) {
@@ -4092,7 +4206,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG10Float256VectorTests(IntFunction<float[]> fa) {
+    static void LOG10FloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4103,7 +4217,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::LOG10, Float256VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::LOG10, FloatVector256Tests::strictLOG10);
     }
 
     static float EXPM1(float a) {
@@ -4115,7 +4229,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPM1Float256VectorTests(IntFunction<float[]> fa) {
+    static void EXPM1FloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4126,7 +4240,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::EXPM1, Float256VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::EXPM1, FloatVector256Tests::strictEXPM1);
     }
 
     static float COS(float a) {
@@ -4138,7 +4252,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSFloat256VectorTests(IntFunction<float[]> fa) {
+    static void COSFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4149,7 +4263,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::COS, Float256VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::COS, FloatVector256Tests::strictCOS);
     }
 
     static float TAN(float a) {
@@ -4161,7 +4275,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANFloat256VectorTests(IntFunction<float[]> fa) {
+    static void TANFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4172,7 +4286,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::TAN, Float256VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::TAN, FloatVector256Tests::strictTAN);
     }
 
     static float SINH(float a) {
@@ -4184,7 +4298,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINHFloat256VectorTests(IntFunction<float[]> fa) {
+    static void SINHFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4195,7 +4309,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::SINH, Float256VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::SINH, FloatVector256Tests::strictSINH);
     }
 
     static float COSH(float a) {
@@ -4207,7 +4321,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSHFloat256VectorTests(IntFunction<float[]> fa) {
+    static void COSHFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4218,7 +4332,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::COSH, Float256VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::COSH, FloatVector256Tests::strictCOSH);
     }
 
     static float TANH(float a) {
@@ -4230,7 +4344,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANHFloat256VectorTests(IntFunction<float[]> fa) {
+    static void TANHFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4241,7 +4355,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::TANH, Float256VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::TANH, FloatVector256Tests::strictTANH);
     }
 
     static float ASIN(float a) {
@@ -4253,7 +4367,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ASINFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ASINFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4264,7 +4378,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::ASIN, Float256VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::ASIN, FloatVector256Tests::strictASIN);
     }
 
     static float ACOS(float a) {
@@ -4276,7 +4390,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ACOSFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ACOSFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4287,7 +4401,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::ACOS, Float256VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::ACOS, FloatVector256Tests::strictACOS);
     }
 
     static float ATAN(float a) {
@@ -4299,7 +4413,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ATANFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ATANFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4310,7 +4424,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::ATAN, Float256VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::ATAN, FloatVector256Tests::strictATAN);
     }
 
     static float CBRT(float a) {
@@ -4322,7 +4436,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void CBRTFloat256VectorTests(IntFunction<float[]> fa) {
+    static void CBRTFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4333,7 +4447,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float256VectorTests::CBRT, Float256VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector256Tests::CBRT, FloatVector256Tests::strictCBRT);
     }
 
     static float HYPOT(float a, float b) {
@@ -4345,7 +4459,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void HYPOTFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void HYPOTFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4358,7 +4472,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::HYPOT, Float256VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector256Tests::HYPOT, FloatVector256Tests::strictHYPOT);
     }
 
 
@@ -4371,7 +4485,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4384,7 +4498,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::POW, Float256VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector256Tests::POW, FloatVector256Tests::strictPOW);
     }
 
 
@@ -4397,7 +4511,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4410,7 +4524,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::pow, Float256VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector256Tests::pow, FloatVector256Tests::strictpow);
     }
 
 
@@ -4423,7 +4537,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ATAN2Float256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ATAN2FloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4436,12 +4550,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::ATAN2, Float256VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector256Tests::ATAN2, FloatVector256Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4451,12 +4565,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::POW, Float256VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector256Tests::POW, FloatVector256Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4466,7 +4580,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float256VectorTests::pow, Float256VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector256Tests::pow, FloatVector256Tests::strictpow);
     }
 
 
@@ -4479,7 +4593,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4494,11 +4608,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Float256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4511,11 +4625,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Float256VectorTests::fma);
+        assertArraysEquals(r, a, b, c, FloatVector256Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4533,11 +4647,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4548,11 +4662,11 @@ relativeError));
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Float256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat256VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector256TestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4563,11 +4677,11 @@ relativeError));
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Float256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4582,11 +4696,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector256TestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4601,11 +4715,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat256VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector256TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4616,11 +4730,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector256Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat256VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector256TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4631,11 +4745,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float256VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector256Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector256TestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4649,7 +4763,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float256VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatVector256Tests::FMA);
     }
 
     static float NEG(float a) {
@@ -4661,7 +4775,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void NEGFloat256VectorTests(IntFunction<float[]> fa) {
+    static void NEGFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4672,11 +4786,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::NEG);
+        assertArraysEquals(r, a, FloatVector256Tests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void negFloat256VectorTests(IntFunction<float[]> fa) {
+    static void negFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4687,11 +4801,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::neg);
+        assertArraysEquals(r, a, FloatVector256Tests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void NEGMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void NEGMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4705,7 +4819,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, FloatVector256Tests::NEG);
     }
 
     static float ABS(float a) {
@@ -4717,7 +4831,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ABSFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ABSFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4728,11 +4842,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::ABS);
+        assertArraysEquals(r, a, FloatVector256Tests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void absFloat256VectorTests(IntFunction<float[]> fa) {
+    static void absFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4743,11 +4857,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::abs);
+        assertArraysEquals(r, a, FloatVector256Tests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ABSMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void ABSMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4761,7 +4875,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, FloatVector256Tests::ABS);
     }
 
     static float SQRT(float a) {
@@ -4773,7 +4887,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SQRTFloat256VectorTests(IntFunction<float[]> fa) {
+    static void SQRTFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4784,11 +4898,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::SQRT);
+        assertArraysEquals(r, a, FloatVector256Tests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sqrtFloat256VectorTests(IntFunction<float[]> fa) {
+    static void sqrtFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4799,11 +4913,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::sqrt);
+        assertArraysEquals(r, a, FloatVector256Tests::sqrt);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void SQRTMaskedFloat256VectorTests(IntFunction<float[]> fa,
+    static void SQRTMaskedFloatVector256Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4817,7 +4931,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float256VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, FloatVector256Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4825,7 +4939,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandFloatVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4838,7 +4952,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::band);
+        assertArraysEquals(r, a, b, FloatVector256Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4846,7 +4960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorFloatVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4859,7 +4973,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::bor);
+        assertArraysEquals(r, a, b, FloatVector256Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4867,7 +4981,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorFloatVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4880,7 +4994,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::bxor);
+        assertArraysEquals(r, a, b, FloatVector256Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4888,7 +5002,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotFloatVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4901,7 +5015,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::bandNot);
+        assertArraysEquals(r, a, b, FloatVector256Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4909,7 +5023,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqFloatVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4922,7 +5036,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float256VectorTests::beq);
+        assertArraysEquals(r, a, b, FloatVector256Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4930,7 +5044,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotFloat256VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotFloatVector256Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4941,7 +5055,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float256VectorTests::unot);
+        assertArraysEquals(r, a, FloatVector256Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4950,15 +5064,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat256VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongFloatVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -4972,7 +5086,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat256VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector256TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4982,13 +5096,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat256VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector256TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4998,13 +5112,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floattoIntUnaryOpProvider")
-    static void toIntArrayFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toIntArrayFloatVector256TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5015,7 +5129,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void toLongArrayFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toLongArrayFloatVector256TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5026,7 +5140,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toDoubleArrayFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toDoubleArrayFloatVector256TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5037,7 +5151,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toStringFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toStringFloatVector256TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5050,7 +5164,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void hashCodeFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void hashCodeFloatVector256TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5083,7 +5197,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceLongFloat256VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceLongFloatVector256Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5099,7 +5213,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Float256VectorTests::ADDReduceLong, Float256VectorTests::ADDReduceAllLong);
+                FloatVector256Tests::ADDReduceLong, FloatVector256Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(float[] a, int idx, boolean[] mask) {
@@ -5122,7 +5236,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceLongFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongFloatVector256TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5140,11 +5254,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::ADDReduceLongMasked, Float256VectorTests::ADDReduceAllLongMasked);
+                FloatVector256Tests::ADDReduceLongMasked, FloatVector256Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void BroadcastLongFloat256VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void BroadcastLongFloatVector256TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -5155,7 +5269,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat256VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector256TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -5169,12 +5283,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector256Tests::blend);
     }
 
 
     @Test(dataProvider = "floatUnaryOpSelectFromProvider")
-    static void SelectFromFloat256VectorTests(IntFunction<float[]> fa,
+    static void SelectFromFloatVector256Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,float[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         float[] order = fs.apply(a.length, SPECIES.length());
@@ -5190,7 +5304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorFloat256VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void SelectFromTwoVectorFloatVector256Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] idx = fc.apply(SPECIES.length());
@@ -5208,7 +5322,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
-    static void SelectFromFloat256VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void SelectFromFloatVector256TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                            BiFunction<Integer,Integer,float[]> fs,
                                                            IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -5227,7 +5341,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousFloat256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousFloatVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5238,12 +5352,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringFloat256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringFloatVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5257,7 +5371,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsFloat256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsFloatVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5266,12 +5380,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsFloat256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsFloatVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5281,13 +5395,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeFloatVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5309,7 +5423,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountFloatVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5320,7 +5434,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float256VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, FloatVector256Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5334,7 +5448,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueFloatVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5345,7 +5459,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float256VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector256Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5359,7 +5473,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueFloatVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5370,11 +5484,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float256VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector256Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressFloat256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressFloatVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5384,7 +5498,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5402,7 +5516,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeFloat256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeFloatVector256TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5410,13 +5524,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongFloat256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongFloatVector256TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5424,7 +5538,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5443,36 +5557,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundFloat256VectorTestsSmokeTest(int length) {
+    static void loopBoundFloatVector256TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongFloat256VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongFloatVector256TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeFloat256VectorTestsSmokeTest() {
+    static void ElementSizeFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Float.SIZE);
+        assertEquals(elsize, Float.SIZE);
     }
 
     @Test
-    static void VectorShapeFloat256VectorTestsSmokeTest() {
+    static void VectorShapeFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_256_BIT));
     }
 
     @Test
-    static void ShapeWithLanesFloat256VectorTestsSmokeTest() {
+    static void ShapeWithLanesFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(float.class);
@@ -5480,32 +5594,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeFloat256VectorTestsSmokeTest() {
+    static void ElementTypeFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementType() == float.class);
     }
 
     @Test
-    static void SpeciesElementSizeFloat256VectorTestsSmokeTest() {
+    static void SpeciesElementSizeFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementSize() == Float.SIZE);
     }
 
     @Test
-    static void VectorTypeFloat256VectorTestsSmokeTest() {
+    static void VectorTypeFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesFloat256VectorTestsSmokeTest() {
+    static void WithLanesFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(float.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeFloat256VectorTestsSmokeTest() {
+    static void WithShapeFloatVector256TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5513,9 +5627,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueFloat256VectorTestsSmokeTest() {
+    static void MaskAllTrueFloatVector256TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatVector512LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector512LoadStoreTests.java
index 56da27f1149..3a33f0175b4 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector512LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Float512VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation FloatVector512LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class FloatVector512LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_512;
 
@@ -61,14 +61,29 @@ public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(float[] r, float[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Float512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/FloatVector512Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Float512VectorTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector512Tests.java
index 0daa5310ff0..17493778826 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector512Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Float512VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation FloatVector512Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,63 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Float512VectorTests extends AbstractVectorTest {
+public class FloatVector512Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(float actual, float expected, float delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(float actual, float expected, float delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final float ADD_IDENTITY = (float)0;
+    private static final float FIRST_NONZERO_IDENTITY = (float)0;
+    private static final float MAX_IDENTITY = Float.NEGATIVE_INFINITY;
+    private static final float MIN_IDENTITY = Float.POSITIVE_INFINITY;
+    private static final float MUL_IDENTITY = (float)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
 
@@ -89,10 +138,10 @@ public class Float512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +153,13 @@ public class Float512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +169,10 @@ public class Float512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +194,13 @@ public class Float512VectorTests extends AbstractVectorTest {
                                             float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +222,14 @@ public class Float512VectorTests extends AbstractVectorTest {
                                             float relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +245,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +267,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +285,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +300,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +312,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +328,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (float)0);
+                    assertEquals(r[i + k], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +353,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (float)0);
+                        assertEquals(r[i + j], (float)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +381,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +394,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +409,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +429,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +453,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +468,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +483,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +507,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +533,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +552,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +563,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +574,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +586,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +602,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +617,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +632,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +650,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +666,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +684,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +710,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +728,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +752,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +767,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +779,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +792,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +811,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +832,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +847,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +868,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +964,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +991,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1012,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1039,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1059,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1080,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1101,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1123,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1175,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1221,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1183,10 +1232,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1589,7 +1638,7 @@ relativeError));
         // Do some zipping and shuffling.
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         FloatVector a = io.add((float)1); //[1,2]
         FloatVector b = a.neg();  //[-1,-2]
         float[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1604,19 +1653,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Float> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Float> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         FloatVector uab0 = zab0.rearrange(unz0,zab1);
         FloatVector uab1 = zab0.rearrange(unz1,zab1);
         float[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1633,15 +1682,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static float ADD(float a, float b) {
@@ -1649,7 +1698,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1662,7 +1711,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::ADD);
+        assertArraysEquals(r, a, b, FloatVector512Tests::ADD);
     }
 
     static float add(float a, float b) {
@@ -1670,7 +1719,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1681,11 +1730,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::add);
+        assertArraysEquals(r, a, b, FloatVector512Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1701,11 +1750,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1719,7 +1768,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::add);
     }
 
     static float SUB(float a, float b) {
@@ -1727,7 +1776,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void SUBFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void SUBFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1740,7 +1789,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::SUB);
+        assertArraysEquals(r, a, b, FloatVector512Tests::SUB);
     }
 
     static float sub(float a, float b) {
@@ -1748,7 +1797,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1759,11 +1808,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::sub);
+        assertArraysEquals(r, a, b, FloatVector512Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void SUBFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void SUBFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1779,11 +1828,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1797,7 +1846,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::sub);
     }
 
     static float MUL(float a, float b) {
@@ -1805,7 +1854,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MULFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MULFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1818,7 +1867,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::MUL);
+        assertArraysEquals(r, a, b, FloatVector512Tests::MUL);
     }
 
     static float mul(float a, float b) {
@@ -1826,7 +1875,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1837,11 +1886,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::mul);
+        assertArraysEquals(r, a, b, FloatVector512Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void MULFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void MULFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1857,11 +1906,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1875,7 +1924,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1883,7 +1932,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void DIVFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void DIVFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1896,7 +1945,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::DIV);
+        assertArraysEquals(r, a, b, FloatVector512Tests::DIV);
     }
 
     static float div(float a, float b) {
@@ -1904,7 +1953,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1915,11 +1964,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::div);
+        assertArraysEquals(r, a, b, FloatVector512Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void DIVFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void DIVFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1984,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1953,7 +2002,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::div);
     }
 
     static float FIRST_NONZERO(float a, float b) {
@@ -1961,7 +2010,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void FIRST_NONZEROFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void FIRST_NONZEROFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1974,11 +2023,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, FloatVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void FIRST_NONZEROFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FIRST_NONZEROFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1994,11 +2043,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2008,11 +2057,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2025,11 +2074,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector512Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2039,11 +2088,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2056,11 +2105,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector512Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2070,11 +2119,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2087,11 +2136,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector512Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2101,11 +2150,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2118,11 +2167,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector512Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat512VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector512TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Float512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, FloatVector512Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2149,13 +2198,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector512Tests::ADD);
     }
 
     static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MINFloatVector512TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2166,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float512VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, FloatVector512Tests::MIN);
     }
 
     static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void minFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void minFloatVector512TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2183,13 +2232,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float512VectorTests::min);
+        assertArraysEquals(r, a, (float)10, FloatVector512Tests::min);
     }
 
     static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINFloat512VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINFloatVector512TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2202,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float512VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector512Tests::MIN);
     }
 
     static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MAXFloatVector512TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2219,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float512VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, FloatVector512Tests::MAX);
     }
 
     static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void maxFloat512VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void maxFloatVector512TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2236,13 +2285,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float512VectorTests::max);
+        assertArraysEquals(r, a, (float)10, FloatVector512Tests::max);
     }
 
     static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXFloat512VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXFloatVector512TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2255,7 +2304,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float512VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector512Tests::MAX);
     }
 
     static float MIN(float a, float b) {
@@ -2263,7 +2312,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2276,7 +2325,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::MIN);
+        assertArraysEquals(r, a, b, FloatVector512Tests::MIN);
     }
 
     static float min(float a, float b) {
@@ -2284,7 +2333,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2295,7 +2344,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::min);
+        assertArraysEquals(r, a, b, FloatVector512Tests::min);
     }
 
     static float MAX(float a, float b) {
@@ -2303,7 +2352,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2316,7 +2365,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::MAX);
+        assertArraysEquals(r, a, b, FloatVector512Tests::MAX);
     }
 
     static float max(float a, float b) {
@@ -2324,7 +2373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2335,11 +2384,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::max);
+        assertArraysEquals(r, a, b, FloatVector512Tests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2349,11 +2398,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2363,11 +2412,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2377,11 +2426,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2391,11 +2440,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, FloatVector512Tests::max);
     }
 
     static float ADDReduce(float[] a, int idx) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2404,7 +2453,7 @@ relativeError));
     }
 
     static float ADDReduceAll(float[] a) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2413,32 +2462,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                float v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::ADDReduce, Float512VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector512Tests::ADDReduce, FloatVector512Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = ADD_IDENTITY;
+
+        assertEquals((float) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id + x), x);
+                assertEquals((float) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2448,7 +2515,7 @@ relativeError));
     }
 
     static float ADDReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2457,7 +2524,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2465,26 +2532,21 @@ relativeError));
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                float v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::ADDReduceMasked, Float512VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector512Tests::ADDReduceMasked, FloatVector512Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2493,7 +2555,7 @@ relativeError));
     }
 
     static float MULReduceAll(float[] a) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2502,32 +2564,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MULReduceFloat512VectorTests(IntFunction<float[]> fa) {
+    static void MULReduceFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                float v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::MULReduce, Float512VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector512Tests::MULReduce, FloatVector512Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MUL_IDENTITY;
+
+        assertEquals((float) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id * x), x);
+                assertEquals((float) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2537,7 +2617,7 @@ relativeError));
     }
 
     static float MULReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2546,34 +2626,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MULReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                float v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::MULReduceMasked, Float512VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector512Tests::MULReduceMasked, FloatVector512Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.min(res, a[i]);
         }
@@ -2582,7 +2657,7 @@ relativeError));
     }
 
     static float MINReduceAll(float[] a) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduce(a, i));
         }
@@ -2591,32 +2666,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINReduceFloat512VectorTests(IntFunction<float[]> fa) {
+    static void MINReduceFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                float v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::MINReduce, Float512VectorTests::MINReduceAll);
+                FloatVector512Tests::MINReduce, FloatVector512Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MIN_IDENTITY;
+
+        assertEquals((float) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.min(id, x), x);
+                assertEquals((float) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.min(res, a[i]);
@@ -2626,7 +2719,7 @@ relativeError));
     }
 
     static float MINReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2635,34 +2728,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                float v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::MINReduceMasked, Float512VectorTests::MINReduceAllMasked);
+                FloatVector512Tests::MINReduceMasked, FloatVector512Tests::MINReduceAllMasked);
     }
 
     static float MAXReduce(float[] a, int idx) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.max(res, a[i]);
         }
@@ -2671,7 +2759,7 @@ relativeError));
     }
 
     static float MAXReduceAll(float[] a) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduce(a, i));
         }
@@ -2680,32 +2768,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXReduceFloat512VectorTests(IntFunction<float[]> fa) {
+    static void MAXReduceFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                float v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::MAXReduce, Float512VectorTests::MAXReduceAll);
+                FloatVector512Tests::MAXReduce, FloatVector512Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MAX_IDENTITY;
+
+        assertEquals((float) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.max(id, x), x);
+                assertEquals((float) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.max(res, a[i]);
@@ -2715,7 +2821,7 @@ relativeError));
     }
 
     static float MAXReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2724,34 +2830,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                float v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::MAXReduceMasked, Float512VectorTests::MAXReduceAllMasked);
+                FloatVector512Tests::MAXReduceMasked, FloatVector512Tests::MAXReduceAllMasked);
     }
 
     static float FIRST_NONZEROReduce(float[] a, int idx) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2760,7 +2861,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAll(float[] a) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2769,32 +2870,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void FIRST_NONZEROReduceFloat512VectorTests(IntFunction<float[]> fa) {
+    static void FIRST_NONZEROReduceFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::FIRST_NONZEROReduce, Float512VectorTests::FIRST_NONZEROReduceAll);
+                FloatVector512Tests::FIRST_NONZEROReduce, FloatVector512Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static float FIRST_NONZEROReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2804,7 +2923,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAllMasked(float[] a, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2813,34 +2932,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::FIRST_NONZEROReduceMasked, Float512VectorTests::FIRST_NONZEROReduceAllMasked);
+                FloatVector512Tests::FIRST_NONZEROReduceMasked, FloatVector512Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void withFloat512VectorTests(IntFunction<float []> fa, IntFunction<float []> fb) {
+    static void withFloatVector512Tests(IntFunction<float []> fa, IntFunction<float []> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2863,7 +2977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_DEFAULTFloat512VectorTests(IntFunction<float[]> fa) {
+    static void IS_DEFAULTFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2873,14 +2987,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2893,7 +3007,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2904,7 +3018,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NEGATIVEFloat512VectorTests(IntFunction<float[]> fa) {
+    static void IS_NEGATIVEFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2914,14 +3028,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2934,7 +3048,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2945,7 +3059,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_FINITEFloat512VectorTests(IntFunction<float[]> fa) {
+    static void IS_FINITEFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2955,14 +3069,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2975,7 +3089,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2986,7 +3100,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NANFloat512VectorTests(IntFunction<float[]> fa) {
+    static void IS_NANFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2996,14 +3110,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3016,7 +3130,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3027,7 +3141,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_INFINITEFloat512VectorTests(IntFunction<float[]> fa) {
+    static void IS_INFINITEFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3037,14 +3151,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3057,14 +3171,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3076,14 +3190,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3095,14 +3209,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LTFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3118,14 +3232,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GTFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GTFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3137,14 +3251,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GTFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GTFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3160,14 +3274,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3179,14 +3293,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3198,14 +3312,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void EQFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3221,14 +3335,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void NEFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void NEFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3240,14 +3354,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void NEFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void NEFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3263,14 +3377,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LEFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LEFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3282,14 +3396,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LEFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LEFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3305,14 +3419,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GEFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GEFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3324,14 +3438,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GEFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GEFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3347,14 +3461,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3364,13 +3478,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3384,13 +3498,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat512VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector512TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3400,13 +3514,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3420,13 +3534,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3436,13 +3550,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3456,13 +3570,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat512VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector512TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3472,13 +3586,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3492,7 +3606,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
             }
         }
     }
@@ -3502,7 +3616,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3518,11 +3632,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, FloatVector512Tests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
-    static void RearrangeFloat512VectorTests(IntFunction<float[]> fa,
+    static void RearrangeFloatVector512Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3539,7 +3653,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
-    static void RearrangeFloat512VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void RearrangeFloatVector512TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -3557,7 +3671,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void compressFloat512VectorTests(IntFunction<float[]> fa,
+    static void compressFloatVector512Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3575,7 +3689,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void expandFloat512VectorTests(IntFunction<float[]> fa,
+    static void expandFloatVector512Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3593,7 +3707,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void getFloat512VectorTests(IntFunction<float[]> fa) {
+    static void getFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -3749,7 +3863,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void BroadcastFloat512VectorTests(IntFunction<float[]> fa) {
+    static void BroadcastFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3763,7 +3877,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ZeroFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ZeroFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3773,7 +3887,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static float[] sliceUnary(float[] a, int origin, int idx) {
@@ -3788,7 +3902,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sliceUnaryFloat512VectorTests(IntFunction<float[]> fa) {
+    static void sliceUnaryFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3799,7 +3913,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector512Tests::sliceUnary);
     }
 
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
@@ -3816,7 +3930,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void sliceBinaryFloat512VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void sliceBinaryFloatVector512TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3829,7 +3943,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Float512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, FloatVector512Tests::sliceBinary);
     }
 
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
@@ -3846,7 +3960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void sliceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void sliceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3863,7 +3977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Float512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, FloatVector512Tests::slice);
     }
 
     static float[] unsliceUnary(float[] a, int origin, int idx) {
@@ -3880,7 +3994,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void unsliceUnaryFloat512VectorTests(IntFunction<float[]> fa) {
+    static void unsliceUnaryFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3891,7 +4005,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector512Tests::unsliceUnary);
     }
 
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
@@ -3917,7 +4031,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void unsliceBinaryFloat512VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void unsliceBinaryFloatVector512TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3931,7 +4045,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Float512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, FloatVector512Tests::unsliceBinary);
     }
 
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3971,7 +4085,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void unsliceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void unsliceFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3988,7 +4102,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Float512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, FloatVector512Tests::unslice);
     }
 
     static float SIN(float a) {
@@ -4000,7 +4114,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINFloat512VectorTests(IntFunction<float[]> fa) {
+    static void SINFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4011,7 +4125,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::SIN, Float512VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::SIN, FloatVector512Tests::strictSIN);
     }
 
     static float EXP(float a) {
@@ -4023,7 +4137,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPFloat512VectorTests(IntFunction<float[]> fa) {
+    static void EXPFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4034,7 +4148,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::EXP, Float512VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::EXP, FloatVector512Tests::strictEXP);
     }
 
     static float LOG1P(float a) {
@@ -4046,7 +4160,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG1PFloat512VectorTests(IntFunction<float[]> fa) {
+    static void LOG1PFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4057,7 +4171,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::LOG1P, Float512VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::LOG1P, FloatVector512Tests::strictLOG1P);
     }
 
     static float LOG(float a) {
@@ -4069,7 +4183,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOGFloat512VectorTests(IntFunction<float[]> fa) {
+    static void LOGFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4080,7 +4194,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::LOG, Float512VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::LOG, FloatVector512Tests::strictLOG);
     }
 
     static float LOG10(float a) {
@@ -4092,7 +4206,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG10Float512VectorTests(IntFunction<float[]> fa) {
+    static void LOG10FloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4103,7 +4217,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::LOG10, Float512VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::LOG10, FloatVector512Tests::strictLOG10);
     }
 
     static float EXPM1(float a) {
@@ -4115,7 +4229,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPM1Float512VectorTests(IntFunction<float[]> fa) {
+    static void EXPM1FloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4126,7 +4240,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::EXPM1, Float512VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::EXPM1, FloatVector512Tests::strictEXPM1);
     }
 
     static float COS(float a) {
@@ -4138,7 +4252,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSFloat512VectorTests(IntFunction<float[]> fa) {
+    static void COSFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4149,7 +4263,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::COS, Float512VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::COS, FloatVector512Tests::strictCOS);
     }
 
     static float TAN(float a) {
@@ -4161,7 +4275,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANFloat512VectorTests(IntFunction<float[]> fa) {
+    static void TANFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4172,7 +4286,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::TAN, Float512VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::TAN, FloatVector512Tests::strictTAN);
     }
 
     static float SINH(float a) {
@@ -4184,7 +4298,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINHFloat512VectorTests(IntFunction<float[]> fa) {
+    static void SINHFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4195,7 +4309,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::SINH, Float512VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::SINH, FloatVector512Tests::strictSINH);
     }
 
     static float COSH(float a) {
@@ -4207,7 +4321,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSHFloat512VectorTests(IntFunction<float[]> fa) {
+    static void COSHFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4218,7 +4332,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::COSH, Float512VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::COSH, FloatVector512Tests::strictCOSH);
     }
 
     static float TANH(float a) {
@@ -4230,7 +4344,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANHFloat512VectorTests(IntFunction<float[]> fa) {
+    static void TANHFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4241,7 +4355,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::TANH, Float512VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::TANH, FloatVector512Tests::strictTANH);
     }
 
     static float ASIN(float a) {
@@ -4253,7 +4367,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ASINFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ASINFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4264,7 +4378,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::ASIN, Float512VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::ASIN, FloatVector512Tests::strictASIN);
     }
 
     static float ACOS(float a) {
@@ -4276,7 +4390,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ACOSFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ACOSFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4287,7 +4401,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::ACOS, Float512VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::ACOS, FloatVector512Tests::strictACOS);
     }
 
     static float ATAN(float a) {
@@ -4299,7 +4413,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ATANFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ATANFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4310,7 +4424,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::ATAN, Float512VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::ATAN, FloatVector512Tests::strictATAN);
     }
 
     static float CBRT(float a) {
@@ -4322,7 +4436,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void CBRTFloat512VectorTests(IntFunction<float[]> fa) {
+    static void CBRTFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4333,7 +4447,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float512VectorTests::CBRT, Float512VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector512Tests::CBRT, FloatVector512Tests::strictCBRT);
     }
 
     static float HYPOT(float a, float b) {
@@ -4345,7 +4459,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void HYPOTFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void HYPOTFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4358,7 +4472,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::HYPOT, Float512VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector512Tests::HYPOT, FloatVector512Tests::strictHYPOT);
     }
 
 
@@ -4371,7 +4485,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4384,7 +4498,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::POW, Float512VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector512Tests::POW, FloatVector512Tests::strictPOW);
     }
 
 
@@ -4397,7 +4511,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4410,7 +4524,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::pow, Float512VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector512Tests::pow, FloatVector512Tests::strictpow);
     }
 
 
@@ -4423,7 +4537,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ATAN2Float512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ATAN2FloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4436,12 +4550,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::ATAN2, Float512VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector512Tests::ATAN2, FloatVector512Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4451,12 +4565,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::POW, Float512VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector512Tests::POW, FloatVector512Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4466,7 +4580,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float512VectorTests::pow, Float512VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector512Tests::pow, FloatVector512Tests::strictpow);
     }
 
 
@@ -4479,7 +4593,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4494,11 +4608,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Float512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4511,11 +4625,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Float512VectorTests::fma);
+        assertArraysEquals(r, a, b, c, FloatVector512Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4533,11 +4647,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4548,11 +4662,11 @@ relativeError));
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Float512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat512VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector512TestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4563,11 +4677,11 @@ relativeError));
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Float512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4582,11 +4696,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector512TestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4601,11 +4715,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat512VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector512TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4616,11 +4730,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector512Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat512VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector512TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4631,11 +4745,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float512VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector512Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector512TestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4649,7 +4763,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float512VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatVector512Tests::FMA);
     }
 
     static float NEG(float a) {
@@ -4661,7 +4775,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void NEGFloat512VectorTests(IntFunction<float[]> fa) {
+    static void NEGFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4672,11 +4786,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::NEG);
+        assertArraysEquals(r, a, FloatVector512Tests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void negFloat512VectorTests(IntFunction<float[]> fa) {
+    static void negFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4687,11 +4801,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::neg);
+        assertArraysEquals(r, a, FloatVector512Tests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void NEGMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void NEGMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4705,7 +4819,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, FloatVector512Tests::NEG);
     }
 
     static float ABS(float a) {
@@ -4717,7 +4831,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ABSFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ABSFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4728,11 +4842,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::ABS);
+        assertArraysEquals(r, a, FloatVector512Tests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void absFloat512VectorTests(IntFunction<float[]> fa) {
+    static void absFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4743,11 +4857,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::abs);
+        assertArraysEquals(r, a, FloatVector512Tests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ABSMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void ABSMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4761,7 +4875,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, FloatVector512Tests::ABS);
     }
 
     static float SQRT(float a) {
@@ -4773,7 +4887,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SQRTFloat512VectorTests(IntFunction<float[]> fa) {
+    static void SQRTFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4784,11 +4898,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::SQRT);
+        assertArraysEquals(r, a, FloatVector512Tests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sqrtFloat512VectorTests(IntFunction<float[]> fa) {
+    static void sqrtFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4799,11 +4913,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::sqrt);
+        assertArraysEquals(r, a, FloatVector512Tests::sqrt);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void SQRTMaskedFloat512VectorTests(IntFunction<float[]> fa,
+    static void SQRTMaskedFloatVector512Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4817,7 +4931,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float512VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, FloatVector512Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4825,7 +4939,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandFloatVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4838,7 +4952,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::band);
+        assertArraysEquals(r, a, b, FloatVector512Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4846,7 +4960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorFloatVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4859,7 +4973,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::bor);
+        assertArraysEquals(r, a, b, FloatVector512Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4867,7 +4981,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorFloatVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4880,7 +4994,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::bxor);
+        assertArraysEquals(r, a, b, FloatVector512Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4888,7 +5002,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotFloatVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4901,7 +5015,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::bandNot);
+        assertArraysEquals(r, a, b, FloatVector512Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4909,7 +5023,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqFloatVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4922,7 +5036,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float512VectorTests::beq);
+        assertArraysEquals(r, a, b, FloatVector512Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4930,7 +5044,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotFloat512VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotFloatVector512Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4941,7 +5055,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float512VectorTests::unot);
+        assertArraysEquals(r, a, FloatVector512Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4950,15 +5064,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat512VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongFloatVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -4972,7 +5086,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat512VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector512TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4982,13 +5096,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat512VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector512TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4998,13 +5112,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floattoIntUnaryOpProvider")
-    static void toIntArrayFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toIntArrayFloatVector512TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5015,7 +5129,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void toLongArrayFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toLongArrayFloatVector512TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5026,7 +5140,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toDoubleArrayFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toDoubleArrayFloatVector512TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5037,7 +5151,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toStringFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toStringFloatVector512TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5050,7 +5164,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void hashCodeFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void hashCodeFloatVector512TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5083,7 +5197,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceLongFloat512VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceLongFloatVector512Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5099,7 +5213,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Float512VectorTests::ADDReduceLong, Float512VectorTests::ADDReduceAllLong);
+                FloatVector512Tests::ADDReduceLong, FloatVector512Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(float[] a, int idx, boolean[] mask) {
@@ -5122,7 +5236,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceLongFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongFloatVector512TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5140,11 +5254,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::ADDReduceLongMasked, Float512VectorTests::ADDReduceAllLongMasked);
+                FloatVector512Tests::ADDReduceLongMasked, FloatVector512Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void BroadcastLongFloat512VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void BroadcastLongFloatVector512TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -5155,7 +5269,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat512VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector512TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -5169,12 +5283,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector512Tests::blend);
     }
 
 
     @Test(dataProvider = "floatUnaryOpSelectFromProvider")
-    static void SelectFromFloat512VectorTests(IntFunction<float[]> fa,
+    static void SelectFromFloatVector512Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,float[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         float[] order = fs.apply(a.length, SPECIES.length());
@@ -5190,7 +5304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorFloat512VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void SelectFromTwoVectorFloatVector512Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] idx = fc.apply(SPECIES.length());
@@ -5208,7 +5322,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
-    static void SelectFromFloat512VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void SelectFromFloatVector512TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                            BiFunction<Integer,Integer,float[]> fs,
                                                            IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -5227,7 +5341,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousFloat512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousFloatVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5238,12 +5352,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringFloat512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringFloatVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5257,7 +5371,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsFloat512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsFloatVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5266,12 +5380,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsFloat512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsFloatVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5281,13 +5395,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeFloatVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5309,7 +5423,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountFloatVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5320,7 +5434,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float512VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, FloatVector512Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5334,7 +5448,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueFloatVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5345,7 +5459,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float512VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector512Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5359,7 +5473,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueFloatVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5370,11 +5484,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float512VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector512Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressFloat512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressFloatVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5384,7 +5498,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5402,7 +5516,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeFloat512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeFloatVector512TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5410,13 +5524,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongFloat512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongFloatVector512TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5424,7 +5538,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5443,36 +5557,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundFloat512VectorTestsSmokeTest(int length) {
+    static void loopBoundFloatVector512TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongFloat512VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongFloatVector512TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeFloat512VectorTestsSmokeTest() {
+    static void ElementSizeFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Float.SIZE);
+        assertEquals(elsize, Float.SIZE);
     }
 
     @Test
-    static void VectorShapeFloat512VectorTestsSmokeTest() {
+    static void VectorShapeFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_512_BIT));
     }
 
     @Test
-    static void ShapeWithLanesFloat512VectorTestsSmokeTest() {
+    static void ShapeWithLanesFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(float.class);
@@ -5480,32 +5594,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeFloat512VectorTestsSmokeTest() {
+    static void ElementTypeFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementType() == float.class);
     }
 
     @Test
-    static void SpeciesElementSizeFloat512VectorTestsSmokeTest() {
+    static void SpeciesElementSizeFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementSize() == Float.SIZE);
     }
 
     @Test
-    static void VectorTypeFloat512VectorTestsSmokeTest() {
+    static void VectorTypeFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesFloat512VectorTestsSmokeTest() {
+    static void WithLanesFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(float.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeFloat512VectorTestsSmokeTest() {
+    static void WithShapeFloatVector512TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5513,9 +5627,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueFloat512VectorTestsSmokeTest() {
+    static void MaskAllTrueFloatVector512TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatVector64LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector64LoadStoreTests.java
index b3ee68a4aca..359558abbd1 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector64LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Float64VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation FloatVector64LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class FloatVector64LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_64;
 
@@ -61,14 +61,29 @@ public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(float[] r, float[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Float64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/FloatVector64Tests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/Float64VectorTests.java
rename to test/jdk/jdk/incubator/vector/FloatVector64Tests.java
index 921264fc4e2..663a56dfe26 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVector64Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Float64VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation FloatVector64Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,14 +55,63 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Float64VectorTests extends AbstractVectorTest {
+public class FloatVector64Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_64;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(float actual, float expected, float delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(float actual, float expected, float delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
+    // Identity values for reduction operations
+    private static final float ADD_IDENTITY = (float)0;
+    private static final float FIRST_NONZERO_IDENTITY = (float)0;
+    private static final float MAX_IDENTITY = Float.NEGATIVE_INFINITY;
+    private static final float MIN_IDENTITY = Float.POSITIVE_INFINITY;
+    private static final float MUL_IDENTITY = (float)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
 
@@ -89,10 +138,10 @@ public class Float64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +153,13 @@ public class Float64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +169,10 @@ public class Float64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -145,13 +194,13 @@ public class Float64VectorTests extends AbstractVectorTest {
                                             float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -173,14 +222,14 @@ public class Float64VectorTests extends AbstractVectorTest {
                                             float relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -196,13 +245,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -218,13 +267,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -236,10 +285,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -251,10 +300,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -263,12 +312,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -279,20 +328,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (float)0);
+                    assertEquals(r[i + k], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -304,19 +353,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (float)0);
+                        assertEquals(r[i + j], (float)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -332,11 +381,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -345,12 +394,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -360,17 +409,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -380,17 +429,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -404,10 +453,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -419,10 +468,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -434,10 +483,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,18 +507,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -484,18 +533,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -503,10 +552,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -514,10 +563,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -525,10 +574,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -537,10 +586,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -553,10 +602,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -568,10 +617,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -583,10 +632,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -601,10 +650,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -617,11 +666,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -635,11 +684,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -661,11 +710,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -679,11 +728,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -703,10 +752,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -718,10 +767,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -730,10 +779,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -743,10 +792,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -762,11 +811,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -783,11 +832,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -798,11 +847,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -819,11 +868,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -915,13 +964,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -942,13 +991,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -963,13 +1012,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -990,13 +1039,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1010,13 +1059,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1031,13 +1080,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1052,13 +1101,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1074,13 +1123,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1126,10 +1175,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1172,10 +1221,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1183,10 +1232,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1589,7 +1638,7 @@ relativeError));
         // Do some zipping and shuffling.
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         FloatVector a = io.add((float)1); //[1,2]
         FloatVector b = a.neg();  //[-1,-2]
         float[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1604,19 +1653,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Float> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Float> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         FloatVector uab0 = zab0.rearrange(unz0,zab1);
         FloatVector uab1 = zab0.rearrange(unz1,zab1);
         float[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1633,15 +1682,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static float ADD(float a, float b) {
@@ -1649,7 +1698,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1662,7 +1711,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::ADD);
+        assertArraysEquals(r, a, b, FloatVector64Tests::ADD);
     }
 
     static float add(float a, float b) {
@@ -1670,7 +1719,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1681,11 +1730,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::add);
+        assertArraysEquals(r, a, b, FloatVector64Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1701,11 +1750,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1719,7 +1768,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::add);
     }
 
     static float SUB(float a, float b) {
@@ -1727,7 +1776,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void SUBFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void SUBFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1740,7 +1789,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::SUB);
+        assertArraysEquals(r, a, b, FloatVector64Tests::SUB);
     }
 
     static float sub(float a, float b) {
@@ -1748,7 +1797,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1759,11 +1808,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::sub);
+        assertArraysEquals(r, a, b, FloatVector64Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void SUBFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void SUBFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1779,11 +1828,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1797,7 +1846,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::sub);
     }
 
     static float MUL(float a, float b) {
@@ -1805,7 +1854,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MULFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MULFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1818,7 +1867,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::MUL);
+        assertArraysEquals(r, a, b, FloatVector64Tests::MUL);
     }
 
     static float mul(float a, float b) {
@@ -1826,7 +1875,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1837,11 +1886,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::mul);
+        assertArraysEquals(r, a, b, FloatVector64Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void MULFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void MULFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1857,11 +1906,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1875,7 +1924,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1883,7 +1932,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void DIVFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void DIVFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1896,7 +1945,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::DIV);
+        assertArraysEquals(r, a, b, FloatVector64Tests::DIV);
     }
 
     static float div(float a, float b) {
@@ -1904,7 +1953,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1915,11 +1964,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::div);
+        assertArraysEquals(r, a, b, FloatVector64Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void DIVFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void DIVFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1984,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1953,7 +2002,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::div);
     }
 
     static float FIRST_NONZERO(float a, float b) {
@@ -1961,7 +2010,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void FIRST_NONZEROFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void FIRST_NONZEROFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1974,11 +2023,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, FloatVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void FIRST_NONZEROFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FIRST_NONZEROFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1994,11 +2043,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2008,11 +2057,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2025,11 +2074,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector64Tests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2039,11 +2088,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2056,11 +2105,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector64Tests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2070,11 +2119,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2087,11 +2136,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector64Tests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2101,11 +2150,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2118,11 +2167,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Float64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVector64Tests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloat64VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVector64TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Float64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, FloatVector64Tests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloat64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2149,13 +2198,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector64Tests::ADD);
     }
 
     static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MINFloatVector64TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2166,13 +2215,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float64VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, FloatVector64Tests::MIN);
     }
 
     static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void minFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void minFloatVector64TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2183,13 +2232,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float64VectorTests::min);
+        assertArraysEquals(r, a, (float)10, FloatVector64Tests::min);
     }
 
     static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINFloat64VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINFloatVector64TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2202,13 +2251,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float64VectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector64Tests::MIN);
     }
 
     static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MAXFloatVector64TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2219,13 +2268,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float64VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, FloatVector64Tests::MAX);
     }
 
     static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void maxFloat64VectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void maxFloatVector64TestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2236,13 +2285,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, Float64VectorTests::max);
+        assertArraysEquals(r, a, (float)10, FloatVector64Tests::max);
     }
 
     static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXFloat64VectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXFloatVector64TestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2255,7 +2304,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, Float64VectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, mask, FloatVector64Tests::MAX);
     }
 
     static float MIN(float a, float b) {
@@ -2263,7 +2312,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2276,7 +2325,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::MIN);
+        assertArraysEquals(r, a, b, FloatVector64Tests::MIN);
     }
 
     static float min(float a, float b) {
@@ -2284,7 +2333,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2295,7 +2344,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::min);
+        assertArraysEquals(r, a, b, FloatVector64Tests::min);
     }
 
     static float MAX(float a, float b) {
@@ -2303,7 +2352,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2316,7 +2365,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::MAX);
+        assertArraysEquals(r, a, b, FloatVector64Tests::MAX);
     }
 
     static float max(float a, float b) {
@@ -2324,7 +2373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2335,11 +2384,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::max);
+        assertArraysEquals(r, a, b, FloatVector64Tests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2349,11 +2398,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2363,11 +2412,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2377,11 +2426,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2391,11 +2440,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Float64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, FloatVector64Tests::max);
     }
 
     static float ADDReduce(float[] a, int idx) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2404,7 +2453,7 @@ relativeError));
     }
 
     static float ADDReduceAll(float[] a) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2413,32 +2462,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                float v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::ADDReduce, Float64VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector64Tests::ADDReduce, FloatVector64Tests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = ADD_IDENTITY;
+
+        assertEquals((float) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id + x), x);
+                assertEquals((float) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2448,7 +2515,7 @@ relativeError));
     }
 
     static float ADDReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2457,7 +2524,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2465,26 +2532,21 @@ relativeError));
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                float v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::ADDReduceMasked, Float64VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVector64Tests::ADDReduceMasked, FloatVector64Tests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2493,7 +2555,7 @@ relativeError));
     }
 
     static float MULReduceAll(float[] a) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2502,32 +2564,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MULReduceFloat64VectorTests(IntFunction<float[]> fa) {
+    static void MULReduceFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                float v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::MULReduce, Float64VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector64Tests::MULReduce, FloatVector64Tests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MUL_IDENTITY;
+
+        assertEquals((float) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id * x), x);
+                assertEquals((float) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2537,7 +2617,7 @@ relativeError));
     }
 
     static float MULReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2546,34 +2626,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MULReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                float v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::MULReduceMasked, Float64VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVector64Tests::MULReduceMasked, FloatVector64Tests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.min(res, a[i]);
         }
@@ -2582,7 +2657,7 @@ relativeError));
     }
 
     static float MINReduceAll(float[] a) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduce(a, i));
         }
@@ -2591,32 +2666,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINReduceFloat64VectorTests(IntFunction<float[]> fa) {
+    static void MINReduceFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                float v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::MINReduce, Float64VectorTests::MINReduceAll);
+                FloatVector64Tests::MINReduce, FloatVector64Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MIN_IDENTITY;
+
+        assertEquals((float) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.min(id, x), x);
+                assertEquals((float) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.min(res, a[i]);
@@ -2626,7 +2719,7 @@ relativeError));
     }
 
     static float MINReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2635,34 +2728,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                float v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::MINReduceMasked, Float64VectorTests::MINReduceAllMasked);
+                FloatVector64Tests::MINReduceMasked, FloatVector64Tests::MINReduceAllMasked);
     }
 
     static float MAXReduce(float[] a, int idx) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.max(res, a[i]);
         }
@@ -2671,7 +2759,7 @@ relativeError));
     }
 
     static float MAXReduceAll(float[] a) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduce(a, i));
         }
@@ -2680,32 +2768,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXReduceFloat64VectorTests(IntFunction<float[]> fa) {
+    static void MAXReduceFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                float v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::MAXReduce, Float64VectorTests::MAXReduceAll);
+                FloatVector64Tests::MAXReduce, FloatVector64Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MAX_IDENTITY;
+
+        assertEquals((float) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.max(id, x), x);
+                assertEquals((float) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.max(res, a[i]);
@@ -2715,7 +2821,7 @@ relativeError));
     }
 
     static float MAXReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2724,34 +2830,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                float v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::MAXReduceMasked, Float64VectorTests::MAXReduceAllMasked);
+                FloatVector64Tests::MAXReduceMasked, FloatVector64Tests::MAXReduceAllMasked);
     }
 
     static float FIRST_NONZEROReduce(float[] a, int idx) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2760,7 +2861,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAll(float[] a) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2769,32 +2870,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void FIRST_NONZEROReduceFloat64VectorTests(IntFunction<float[]> fa) {
+    static void FIRST_NONZEROReduceFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::FIRST_NONZEROReduce, Float64VectorTests::FIRST_NONZEROReduceAll);
+                FloatVector64Tests::FIRST_NONZEROReduce, FloatVector64Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static float FIRST_NONZEROReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2804,7 +2923,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAllMasked(float[] a, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2813,34 +2932,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::FIRST_NONZEROReduceMasked, Float64VectorTests::FIRST_NONZEROReduceAllMasked);
+                FloatVector64Tests::FIRST_NONZEROReduceMasked, FloatVector64Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void withFloat64VectorTests(IntFunction<float []> fa, IntFunction<float []> fb) {
+    static void withFloatVector64Tests(IntFunction<float []> fa, IntFunction<float []> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2863,7 +2977,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_DEFAULTFloat64VectorTests(IntFunction<float[]> fa) {
+    static void IS_DEFAULTFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2873,14 +2987,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2893,7 +3007,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2904,7 +3018,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NEGATIVEFloat64VectorTests(IntFunction<float[]> fa) {
+    static void IS_NEGATIVEFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2914,14 +3028,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2934,7 +3048,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2945,7 +3059,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_FINITEFloat64VectorTests(IntFunction<float[]> fa) {
+    static void IS_FINITEFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2955,14 +3069,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2975,7 +3089,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2986,7 +3100,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NANFloat64VectorTests(IntFunction<float[]> fa) {
+    static void IS_NANFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2996,14 +3110,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3016,7 +3130,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3027,7 +3141,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_INFINITEFloat64VectorTests(IntFunction<float[]> fa) {
+    static void IS_INFINITEFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3037,14 +3151,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3057,14 +3171,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3076,14 +3190,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3095,14 +3209,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LTFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3118,14 +3232,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GTFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GTFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3137,14 +3251,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GTFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GTFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3160,14 +3274,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3179,14 +3293,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3198,14 +3312,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void EQFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3221,14 +3335,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void NEFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void NEFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3240,14 +3354,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void NEFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void NEFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3263,14 +3377,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LEFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LEFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3282,14 +3396,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LEFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LEFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3305,14 +3419,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GEFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GEFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3324,14 +3438,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GEFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GEFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3347,14 +3461,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3364,13 +3478,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3384,13 +3498,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloat64VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVector64TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3400,13 +3514,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloat64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3420,13 +3534,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3436,13 +3550,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3456,13 +3570,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloat64VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVector64TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3472,13 +3586,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloat64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3492,7 +3606,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
             }
         }
     }
@@ -3502,7 +3616,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3518,11 +3632,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Float64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, FloatVector64Tests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
-    static void RearrangeFloat64VectorTests(IntFunction<float[]> fa,
+    static void RearrangeFloatVector64Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3539,7 +3653,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
-    static void RearrangeFloat64VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void RearrangeFloatVector64TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -3557,7 +3671,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void compressFloat64VectorTests(IntFunction<float[]> fa,
+    static void compressFloatVector64Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3575,7 +3689,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void expandFloat64VectorTests(IntFunction<float[]> fa,
+    static void expandFloatVector64Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3593,7 +3707,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void getFloat64VectorTests(IntFunction<float[]> fa) {
+    static void getFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -3749,7 +3863,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void BroadcastFloat64VectorTests(IntFunction<float[]> fa) {
+    static void BroadcastFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3763,7 +3877,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ZeroFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ZeroFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3773,7 +3887,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static float[] sliceUnary(float[] a, int origin, int idx) {
@@ -3788,7 +3902,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sliceUnaryFloat64VectorTests(IntFunction<float[]> fa) {
+    static void sliceUnaryFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3799,7 +3913,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector64Tests::sliceUnary);
     }
 
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
@@ -3816,7 +3930,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void sliceBinaryFloat64VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void sliceBinaryFloatVector64TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3829,7 +3943,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Float64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, FloatVector64Tests::sliceBinary);
     }
 
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
@@ -3846,7 +3960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void sliceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void sliceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3863,7 +3977,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Float64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, FloatVector64Tests::slice);
     }
 
     static float[] unsliceUnary(float[] a, int origin, int idx) {
@@ -3880,7 +3994,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void unsliceUnaryFloat64VectorTests(IntFunction<float[]> fa) {
+    static void unsliceUnaryFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3891,7 +4005,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, Float64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, FloatVector64Tests::unsliceUnary);
     }
 
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
@@ -3917,7 +4031,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void unsliceBinaryFloat64VectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void unsliceBinaryFloatVector64TestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3931,7 +4045,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Float64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, FloatVector64Tests::unsliceBinary);
     }
 
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3971,7 +4085,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void unsliceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void unsliceFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3988,7 +4102,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Float64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, FloatVector64Tests::unslice);
     }
 
     static float SIN(float a) {
@@ -4000,7 +4114,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINFloat64VectorTests(IntFunction<float[]> fa) {
+    static void SINFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4011,7 +4125,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::SIN, Float64VectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::SIN, FloatVector64Tests::strictSIN);
     }
 
     static float EXP(float a) {
@@ -4023,7 +4137,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPFloat64VectorTests(IntFunction<float[]> fa) {
+    static void EXPFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4034,7 +4148,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::EXP, Float64VectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::EXP, FloatVector64Tests::strictEXP);
     }
 
     static float LOG1P(float a) {
@@ -4046,7 +4160,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG1PFloat64VectorTests(IntFunction<float[]> fa) {
+    static void LOG1PFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4057,7 +4171,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::LOG1P, Float64VectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::LOG1P, FloatVector64Tests::strictLOG1P);
     }
 
     static float LOG(float a) {
@@ -4069,7 +4183,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOGFloat64VectorTests(IntFunction<float[]> fa) {
+    static void LOGFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4080,7 +4194,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::LOG, Float64VectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::LOG, FloatVector64Tests::strictLOG);
     }
 
     static float LOG10(float a) {
@@ -4092,7 +4206,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG10Float64VectorTests(IntFunction<float[]> fa) {
+    static void LOG10FloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4103,7 +4217,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::LOG10, Float64VectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::LOG10, FloatVector64Tests::strictLOG10);
     }
 
     static float EXPM1(float a) {
@@ -4115,7 +4229,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPM1Float64VectorTests(IntFunction<float[]> fa) {
+    static void EXPM1FloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4126,7 +4240,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::EXPM1, Float64VectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::EXPM1, FloatVector64Tests::strictEXPM1);
     }
 
     static float COS(float a) {
@@ -4138,7 +4252,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSFloat64VectorTests(IntFunction<float[]> fa) {
+    static void COSFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4149,7 +4263,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::COS, Float64VectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::COS, FloatVector64Tests::strictCOS);
     }
 
     static float TAN(float a) {
@@ -4161,7 +4275,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANFloat64VectorTests(IntFunction<float[]> fa) {
+    static void TANFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4172,7 +4286,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::TAN, Float64VectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::TAN, FloatVector64Tests::strictTAN);
     }
 
     static float SINH(float a) {
@@ -4184,7 +4298,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINHFloat64VectorTests(IntFunction<float[]> fa) {
+    static void SINHFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4195,7 +4309,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::SINH, Float64VectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::SINH, FloatVector64Tests::strictSINH);
     }
 
     static float COSH(float a) {
@@ -4207,7 +4321,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSHFloat64VectorTests(IntFunction<float[]> fa) {
+    static void COSHFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4218,7 +4332,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::COSH, Float64VectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::COSH, FloatVector64Tests::strictCOSH);
     }
 
     static float TANH(float a) {
@@ -4230,7 +4344,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANHFloat64VectorTests(IntFunction<float[]> fa) {
+    static void TANHFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4241,7 +4355,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::TANH, Float64VectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::TANH, FloatVector64Tests::strictTANH);
     }
 
     static float ASIN(float a) {
@@ -4253,7 +4367,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ASINFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ASINFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4264,7 +4378,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::ASIN, Float64VectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::ASIN, FloatVector64Tests::strictASIN);
     }
 
     static float ACOS(float a) {
@@ -4276,7 +4390,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ACOSFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ACOSFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4287,7 +4401,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::ACOS, Float64VectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::ACOS, FloatVector64Tests::strictACOS);
     }
 
     static float ATAN(float a) {
@@ -4299,7 +4413,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ATANFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ATANFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4310,7 +4424,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::ATAN, Float64VectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::ATAN, FloatVector64Tests::strictATAN);
     }
 
     static float CBRT(float a) {
@@ -4322,7 +4436,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void CBRTFloat64VectorTests(IntFunction<float[]> fa) {
+    static void CBRTFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4333,7 +4447,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, Float64VectorTests::CBRT, Float64VectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVector64Tests::CBRT, FloatVector64Tests::strictCBRT);
     }
 
     static float HYPOT(float a, float b) {
@@ -4345,7 +4459,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void HYPOTFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void HYPOTFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4358,7 +4472,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::HYPOT, Float64VectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector64Tests::HYPOT, FloatVector64Tests::strictHYPOT);
     }
 
 
@@ -4371,7 +4485,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4384,7 +4498,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::POW, Float64VectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector64Tests::POW, FloatVector64Tests::strictPOW);
     }
 
 
@@ -4397,7 +4511,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4410,7 +4524,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::pow, Float64VectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector64Tests::pow, FloatVector64Tests::strictpow);
     }
 
 
@@ -4423,7 +4537,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ATAN2Float64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ATAN2FloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4436,12 +4550,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::ATAN2, Float64VectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVector64Tests::ATAN2, FloatVector64Tests::strictATAN2);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4451,12 +4565,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::POW, Float64VectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector64Tests::POW, FloatVector64Tests::strictPOW);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4466,7 +4580,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, Float64VectorTests::pow, Float64VectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVector64Tests::pow, FloatVector64Tests::strictpow);
     }
 
 
@@ -4479,7 +4593,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4494,11 +4608,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, Float64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4511,11 +4625,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Float64VectorTests::fma);
+        assertArraysEquals(r, a, b, c, FloatVector64Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4533,11 +4647,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4548,11 +4662,11 @@ relativeError));
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Float64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat64VectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector64TestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4563,11 +4677,11 @@ relativeError));
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Float64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4582,11 +4696,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector64TestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4601,11 +4715,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloat64VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVector64TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4616,11 +4730,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector64Tests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloat64VectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVector64TestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4631,11 +4745,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Float64VectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVector64Tests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloat64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVector64TestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4649,7 +4763,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Float64VectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatVector64Tests::FMA);
     }
 
     static float NEG(float a) {
@@ -4661,7 +4775,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void NEGFloat64VectorTests(IntFunction<float[]> fa) {
+    static void NEGFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4672,11 +4786,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::NEG);
+        assertArraysEquals(r, a, FloatVector64Tests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void negFloat64VectorTests(IntFunction<float[]> fa) {
+    static void negFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4687,11 +4801,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::neg);
+        assertArraysEquals(r, a, FloatVector64Tests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void NEGMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void NEGMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4705,7 +4819,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, FloatVector64Tests::NEG);
     }
 
     static float ABS(float a) {
@@ -4717,7 +4831,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ABSFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ABSFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4728,11 +4842,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::ABS);
+        assertArraysEquals(r, a, FloatVector64Tests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void absFloat64VectorTests(IntFunction<float[]> fa) {
+    static void absFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4743,11 +4857,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::abs);
+        assertArraysEquals(r, a, FloatVector64Tests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ABSMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void ABSMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4761,7 +4875,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, FloatVector64Tests::ABS);
     }
 
     static float SQRT(float a) {
@@ -4773,7 +4887,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SQRTFloat64VectorTests(IntFunction<float[]> fa) {
+    static void SQRTFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4784,11 +4898,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::SQRT);
+        assertArraysEquals(r, a, FloatVector64Tests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sqrtFloat64VectorTests(IntFunction<float[]> fa) {
+    static void sqrtFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4799,11 +4913,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::sqrt);
+        assertArraysEquals(r, a, FloatVector64Tests::sqrt);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void SQRTMaskedFloat64VectorTests(IntFunction<float[]> fa,
+    static void SQRTMaskedFloatVector64Tests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4817,7 +4931,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, Float64VectorTests::SQRT);
+        assertArraysEquals(r, a, mask, FloatVector64Tests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4825,7 +4939,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandFloatVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4838,7 +4952,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::band);
+        assertArraysEquals(r, a, b, FloatVector64Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4846,7 +4960,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorFloatVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4859,7 +4973,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::bor);
+        assertArraysEquals(r, a, b, FloatVector64Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4867,7 +4981,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorFloatVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4880,7 +4994,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::bxor);
+        assertArraysEquals(r, a, b, FloatVector64Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4888,7 +5002,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotFloatVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4901,7 +5015,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::bandNot);
+        assertArraysEquals(r, a, b, FloatVector64Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4909,7 +5023,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqFloatVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4922,7 +5036,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, Float64VectorTests::beq);
+        assertArraysEquals(r, a, b, FloatVector64Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4930,7 +5044,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotFloat64VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotFloatVector64Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4941,7 +5055,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, Float64VectorTests::unot);
+        assertArraysEquals(r, a, FloatVector64Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4950,15 +5064,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloat64VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongFloatVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -4972,7 +5086,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloat64VectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVector64TestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4982,13 +5096,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloat64VectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVector64TestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4998,13 +5112,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floattoIntUnaryOpProvider")
-    static void toIntArrayFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toIntArrayFloatVector64TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5015,7 +5129,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void toLongArrayFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toLongArrayFloatVector64TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5026,7 +5140,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toDoubleArrayFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toDoubleArrayFloatVector64TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5037,7 +5151,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toStringFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toStringFloatVector64TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5050,7 +5164,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void hashCodeFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void hashCodeFloatVector64TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5083,7 +5197,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceLongFloat64VectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceLongFloatVector64Tests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5099,7 +5213,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Float64VectorTests::ADDReduceLong, Float64VectorTests::ADDReduceAllLong);
+                FloatVector64Tests::ADDReduceLong, FloatVector64Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(float[] a, int idx, boolean[] mask) {
@@ -5122,7 +5236,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceLongFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongFloatVector64TestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5140,11 +5254,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::ADDReduceLongMasked, Float64VectorTests::ADDReduceAllLongMasked);
+                FloatVector64Tests::ADDReduceLongMasked, FloatVector64Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void BroadcastLongFloat64VectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void BroadcastLongFloatVector64TestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -5155,7 +5269,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloat64VectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVector64TestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -5169,12 +5283,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Float64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVector64Tests::blend);
     }
 
 
     @Test(dataProvider = "floatUnaryOpSelectFromProvider")
-    static void SelectFromFloat64VectorTests(IntFunction<float[]> fa,
+    static void SelectFromFloatVector64Tests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,float[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         float[] order = fs.apply(a.length, SPECIES.length());
@@ -5190,7 +5304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorFloat64VectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void SelectFromTwoVectorFloatVector64Tests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] idx = fc.apply(SPECIES.length());
@@ -5208,7 +5322,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
-    static void SelectFromFloat64VectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void SelectFromFloatVector64TestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                            BiFunction<Integer,Integer,float[]> fs,
                                                            IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -5227,7 +5341,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousFloat64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousFloatVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5238,12 +5352,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringFloat64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringFloatVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5257,7 +5371,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsFloat64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsFloatVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5266,12 +5380,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsFloat64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsFloatVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5281,13 +5395,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeFloatVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5309,7 +5423,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountFloatVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5320,7 +5434,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float64VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, FloatVector64Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5334,7 +5448,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueFloatVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5345,7 +5459,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float64VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector64Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5359,7 +5473,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueFloatVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5370,11 +5484,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Float64VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVector64Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressFloat64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressFloatVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5384,7 +5498,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5402,7 +5516,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeFloat64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeFloatVector64TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5410,13 +5524,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongFloat64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongFloatVector64TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5424,7 +5538,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5443,36 +5557,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundFloat64VectorTestsSmokeTest(int length) {
+    static void loopBoundFloatVector64TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongFloat64VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongFloatVector64TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeFloat64VectorTestsSmokeTest() {
+    static void ElementSizeFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Float.SIZE);
+        assertEquals(elsize, Float.SIZE);
     }
 
     @Test
-    static void VectorShapeFloat64VectorTestsSmokeTest() {
+    static void VectorShapeFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_64_BIT));
     }
 
     @Test
-    static void ShapeWithLanesFloat64VectorTestsSmokeTest() {
+    static void ShapeWithLanesFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(float.class);
@@ -5480,32 +5594,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeFloat64VectorTestsSmokeTest() {
+    static void ElementTypeFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementType() == float.class);
     }
 
     @Test
-    static void SpeciesElementSizeFloat64VectorTestsSmokeTest() {
+    static void SpeciesElementSizeFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementSize() == Float.SIZE);
     }
 
     @Test
-    static void VectorTypeFloat64VectorTestsSmokeTest() {
+    static void VectorTypeFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesFloat64VectorTestsSmokeTest() {
+    static void WithLanesFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(float.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeFloat64VectorTestsSmokeTest() {
+    static void WithShapeFloatVector64TestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5513,9 +5627,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueFloat64VectorTestsSmokeTest() {
+    static void MaskAllTrueFloatVector64TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/FloatVectorMaxLoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/FloatVectorMaxLoadStoreTests.java
index 5c86ab350d2..d1832ea8e3a 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVectorMaxLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
  * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
- *      -XX:-TieredCompilation FloatMaxVectorLoadStoreTests
+ *      -XX:-TieredCompilation FloatVectorMaxLoadStoreTests
  *
  */
 
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class FloatVectorMaxLoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_MAX;
 
@@ -68,14 +68,29 @@ public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(float[] r, float[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (float) 0, "at index #" + i);
         }
     }
 
@@ -329,7 +344,7 @@ public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "floatProviderForIOOBE")
@@ -877,11 +892,11 @@ public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -892,11 +907,11 @@ public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (float) 0, "at index #" + j);
         }
     }
 
@@ -912,7 +927,7 @@ public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(float[] r, float[] a, int[] indexMap) {
@@ -925,7 +940,7 @@ public class FloatMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java
similarity index 80%
rename from test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
rename to test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java
index 07c9b7d0ef9..9d272f43863 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatVectorMaxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation FloatMaxVectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation FloatVectorMaxTests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -55,12 +55,55 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class FloatMaxVectorTests extends AbstractVectorTest {
+public class FloatVectorMaxTests extends AbstractVectorTest {
 
     static final VectorSpecies<Float> SPECIES =
                 FloatVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(float actual, float expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float actual, float expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(float actual, float expected, float delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(float actual, float expected, float delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(float [] actual, float [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(float [] actual, float [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
 
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
@@ -68,6 +111,13 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
 
     private static final int Max = 256;  // juts so we can do N/Max
 
+    // Identity values for reduction operations
+    private static final float ADD_IDENTITY = (float)0;
+    private static final float FIRST_NONZERO_IDENTITY = (float)0;
+    private static final float MAX_IDENTITY = Float.NEGATIVE_INFINITY;
+    private static final float MIN_IDENTITY = Float.POSITIVE_INFINITY;
+    private static final float MUL_IDENTITY = (float)1;
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
 
@@ -94,10 +144,10 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -109,13 +159,13 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a[i]);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -125,10 +175,10 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -150,13 +200,13 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
                                             float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -178,14 +228,14 @@ public class FloatMaxVectorTests extends AbstractVectorTest {
                                             float relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 
@@ -201,13 +251,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -223,13 +273,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -241,10 +291,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -256,10 +306,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -268,12 +318,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -284,20 +334,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (float)0);
+                    assertEquals(r[i + k], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -309,19 +359,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (float)0);
+                        assertEquals(r[i + j], (float)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (float)0, "at index #" + idx);
+                assertEquals(r[idx], (float)0, "at index #" + idx);
             }
         }
     }
@@ -337,11 +387,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -350,12 +400,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -365,17 +415,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -385,17 +435,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (float)0);
+                         assertEquals(r[i+j], (float)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (float)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -409,10 +459,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -424,10 +474,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -439,10 +489,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -463,18 +513,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -489,18 +539,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -508,10 +558,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -519,10 +569,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -530,10 +580,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -542,10 +592,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -558,10 +608,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -573,10 +623,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -588,10 +638,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -606,10 +656,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (float)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -622,11 +672,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -640,11 +690,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -666,11 +716,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -684,11 +734,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -708,10 +758,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -723,10 +773,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -735,10 +785,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -748,10 +798,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -767,11 +817,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -788,11 +838,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -803,11 +853,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -824,11 +874,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -920,13 +970,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -947,13 +997,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -968,13 +1018,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(r, a, i, mask, b, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -995,13 +1045,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1015,13 +1065,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1036,13 +1086,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1057,13 +1107,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1079,13 +1129,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             float[] ref = f.apply(a, b, origin, part, mask, i);
             float[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1131,10 +1181,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1177,10 +1227,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1188,10 +1238,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1594,7 +1644,7 @@ relativeError));
         // Do some zipping and shuffling.
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         FloatVector a = io.add((float)1); //[1,2]
         FloatVector b = a.neg();  //[-1,-2]
         float[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1609,19 +1659,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Float> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Float> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         FloatVector uab0 = zab0.rearrange(unz0,zab1);
         FloatVector uab1 = zab0.rearrange(unz1,zab1);
         float[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         FloatVector io = (FloatVector) SPECIES.broadcast(0).addIndex(1);
         FloatVector io2 = (FloatVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1638,15 +1688,15 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
     }
 
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 
     static float ADD(float a, float b) {
@@ -1654,7 +1704,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1667,7 +1717,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::ADD);
     }
 
     static float add(float a, float b) {
@@ -1675,7 +1725,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1686,11 +1736,11 @@ relativeError));
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::add);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1706,11 +1756,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1724,7 +1774,7 @@ relativeError));
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::add);
     }
 
     static float SUB(float a, float b) {
@@ -1732,7 +1782,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void SUBFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void SUBFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1745,7 +1795,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::SUB);
     }
 
     static float sub(float a, float b) {
@@ -1753,7 +1803,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1764,11 +1814,11 @@ relativeError));
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void SUBFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void SUBFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1784,11 +1834,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::SUB);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1802,7 +1852,7 @@ relativeError));
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::sub);
     }
 
     static float MUL(float a, float b) {
@@ -1810,7 +1860,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MULFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MULFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1823,7 +1873,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::MUL);
     }
 
     static float mul(float a, float b) {
@@ -1831,7 +1881,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1842,11 +1892,11 @@ relativeError));
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void MULFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void MULFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1862,11 +1912,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::MUL);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1880,7 +1930,7 @@ relativeError));
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::mul);
     }
 
     static float DIV(float a, float b) {
@@ -1888,7 +1938,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void DIVFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void DIVFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1901,7 +1951,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::DIV);
     }
 
     static float div(float a, float b) {
@@ -1909,7 +1959,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1920,11 +1970,11 @@ relativeError));
             av.div(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::div);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void DIVFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void DIVFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1940,11 +1990,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::DIV);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1958,7 +2008,7 @@ relativeError));
             av.div(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::div);
     }
 
     static float FIRST_NONZERO(float a, float b) {
@@ -1966,7 +2016,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void FIRST_NONZEROFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void FIRST_NONZEROFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -1979,11 +2029,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void FIRST_NONZEROFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FIRST_NONZEROFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -1999,11 +2049,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void addFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void addFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2013,11 +2063,11 @@ relativeError));
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void addFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void addFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2030,11 +2080,11 @@ relativeError));
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVectorMaxTests::add);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void subFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void subFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2044,11 +2094,11 @@ relativeError));
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void subFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void subFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2061,11 +2111,11 @@ relativeError));
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void mulFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void mulFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2075,11 +2125,11 @@ relativeError));
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void mulFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void mulFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2092,11 +2142,11 @@ relativeError));
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void divFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void divFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2106,11 +2156,11 @@ relativeError));
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void divFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void divFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2123,11 +2173,11 @@ relativeError));
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, FloatMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, FloatVectorMaxTests::div);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ADDFloatMaxVectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ADDFloatVectorMaxTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2137,11 +2187,11 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, FloatMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, FloatVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void ADDFloatMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void ADDFloatVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -2154,13 +2204,13 @@ relativeError));
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, FloatMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVectorMaxTests::ADD);
     }
 
     static FloatVector bv_MIN = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MINFloatVectorMaxTestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2171,13 +2221,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, FloatVectorMaxTests::MIN);
     }
 
     static FloatVector bv_min = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void minFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void minFloatVectorMaxTestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2188,13 +2238,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::min);
+        assertArraysEquals(r, a, (float)10, FloatVectorMaxTests::min);
     }
 
     static FloatVector bv_MIN_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINFloatMaxVectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINFloatVectorMaxTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2207,13 +2257,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, FloatMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (float)10, mask, FloatVectorMaxTests::MIN);
     }
 
     static FloatVector bv_MAX = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void MAXFloatVectorMaxTestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2224,13 +2274,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, FloatVectorMaxTests::MAX);
     }
 
     static FloatVector bv_max = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void maxFloatMaxVectorTestsWithMemOp(IntFunction<float[]> fa) {
+    static void maxFloatVectorMaxTestsWithMemOp(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -2241,13 +2291,13 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, FloatMaxVectorTests::max);
+        assertArraysEquals(r, a, (float)10, FloatVectorMaxTests::max);
     }
 
     static FloatVector bv_MAX_M = FloatVector.broadcast(SPECIES, (float)10);
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXFloatMaxVectorTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXFloatVectorMaxTestsMaskedWithMemOp(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2260,7 +2310,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, (float)10, mask, FloatMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (float)10, mask, FloatVectorMaxTests::MAX);
     }
 
     static float MIN(float a, float b) {
@@ -2268,7 +2318,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2281,7 +2331,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::MIN);
     }
 
     static float min(float a, float b) {
@@ -2289,7 +2339,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2300,7 +2350,7 @@ relativeError));
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::min);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::min);
     }
 
     static float MAX(float a, float b) {
@@ -2308,7 +2358,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2321,7 +2371,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::MAX);
     }
 
     static float max(float a, float b) {
@@ -2329,7 +2379,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2340,11 +2390,11 @@ relativeError));
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::max);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::max);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MINFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MINFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2354,11 +2404,11 @@ relativeError));
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::MIN);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void minFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void minFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2368,11 +2418,11 @@ relativeError));
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::min);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void MAXFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void MAXFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2382,11 +2432,11 @@ relativeError));
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::MAX);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void maxFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void maxFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2396,11 +2446,11 @@ relativeError));
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, FloatMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, FloatVectorMaxTests::max);
     }
 
     static float ADDReduce(float[] a, int idx) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -2409,7 +2459,7 @@ relativeError));
     }
 
     static float ADDReduceAll(float[] a) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -2418,32 +2468,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                float v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::ADDReduce, FloatMaxVectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVectorMaxTests::ADDReduce, FloatVectorMaxTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = ADD_IDENTITY;
+
+        assertEquals((float) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id + x), x);
+                assertEquals((float) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -2453,7 +2521,7 @@ relativeError));
     }
 
     static float ADDReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 0;
+        float res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -2462,7 +2530,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2470,26 +2538,21 @@ relativeError));
         float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                float v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::ADDReduceMasked, FloatMaxVectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
+                FloatVectorMaxTests::ADDReduceMasked, FloatVectorMaxTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -2498,7 +2561,7 @@ relativeError));
     }
 
     static float MULReduceAll(float[] a) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -2507,32 +2570,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MULReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void MULReduceFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                float v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::MULReduce, FloatMaxVectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVectorMaxTests::MULReduce, FloatVectorMaxTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MUL_IDENTITY;
+
+        assertEquals((float) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) (id * x), x);
+                assertEquals((float) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -2542,7 +2623,7 @@ relativeError));
     }
 
     static float MULReduceAllMasked(float[] a, boolean[] mask) {
-        float res = 1;
+        float res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -2551,34 +2632,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MULReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = 1;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                float v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::MULReduceMasked, FloatMaxVectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
+                FloatVectorMaxTests::MULReduceMasked, FloatVectorMaxTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.min(res, a[i]);
         }
@@ -2587,7 +2663,7 @@ relativeError));
     }
 
     static float MINReduceAll(float[] a) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduce(a, i));
         }
@@ -2596,32 +2672,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MINReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void MINReduceFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                float v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::MINReduce, FloatMaxVectorTests::MINReduceAll);
+                FloatVectorMaxTests::MINReduce, FloatVectorMaxTests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MIN_IDENTITY;
+
+        assertEquals((float) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.min(id, x), x);
+                assertEquals((float) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static float MINReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.min(res, a[i]);
@@ -2631,7 +2725,7 @@ relativeError));
     }
 
     static float MINReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.POSITIVE_INFINITY;
+        float res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -2640,34 +2734,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MINReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.POSITIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.POSITIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                float v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (float) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::MINReduceMasked, FloatMaxVectorTests::MINReduceAllMasked);
+                FloatVectorMaxTests::MINReduceMasked, FloatVectorMaxTests::MINReduceAllMasked);
     }
 
     static float MAXReduce(float[] a, int idx) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (float) Math.max(res, a[i]);
         }
@@ -2676,7 +2765,7 @@ relativeError));
     }
 
     static float MAXReduceAll(float[] a) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduce(a, i));
         }
@@ -2685,32 +2774,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void MAXReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void MAXReduceFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                float v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::MAXReduce, FloatMaxVectorTests::MAXReduceAll);
+                FloatVectorMaxTests::MAXReduce, FloatVectorMaxTests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = MAX_IDENTITY;
+
+        assertEquals((float) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((float) Math.max(id, x), x);
+                assertEquals((float) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((float) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((float) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static float MAXReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (float) Math.max(res, a[i]);
@@ -2720,7 +2827,7 @@ relativeError));
     }
 
     static float MAXReduceAllMasked(float[] a, boolean[] mask) {
-        float res = Float.NEGATIVE_INFINITY;
+        float res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (float) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -2729,34 +2836,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void MAXReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = Float.NEGATIVE_INFINITY;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Float.NEGATIVE_INFINITY;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = (float) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                float v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (float) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::MAXReduceMasked, FloatMaxVectorTests::MAXReduceAllMasked);
+                FloatVectorMaxTests::MAXReduceMasked, FloatVectorMaxTests::MAXReduceAllMasked);
     }
 
     static float FIRST_NONZEROReduce(float[] a, int idx) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -2765,7 +2867,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAll(float[] a) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -2774,32 +2876,50 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void FIRST_NONZEROReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void FIRST_NONZEROReduceFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::FIRST_NONZEROReduce, FloatMaxVectorTests::FIRST_NONZEROReduceAll);
+                FloatVectorMaxTests::FIRST_NONZEROReduce, FloatVectorMaxTests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "floatUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<float[]> fa) {
+        float[] a = fa.apply(SPECIES.length());
+        float id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        float x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static float FIRST_NONZEROReduceMasked(float[] a, int idx, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -2809,7 +2929,7 @@ relativeError));
     }
 
     static float FIRST_NONZEROReduceAllMasked(float[] a, boolean[] mask) {
-        float res = (float) 0;
+        float res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -2818,34 +2938,29 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Float> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        float ra = (float) 0;
+        float ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (float) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                FloatVector av = FloatVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                float v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::FIRST_NONZEROReduceMasked, FloatMaxVectorTests::FIRST_NONZEROReduceAllMasked);
+                FloatVectorMaxTests::FIRST_NONZEROReduceMasked, FloatVectorMaxTests::FIRST_NONZEROReduceAllMasked);
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void withFloatMaxVectorTests(IntFunction<float []> fa, IntFunction<float []> fb) {
+    static void withFloatVectorMaxTests(IntFunction<float []> fa, IntFunction<float []> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -2868,7 +2983,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_DEFAULTFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void IS_DEFAULTFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2878,14 +2993,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_DEFAULTMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void IS_DEFAULTMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2898,7 +3013,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -2909,7 +3024,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NEGATIVEFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void IS_NEGATIVEFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2919,14 +3034,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void IS_NEGATIVEMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2939,7 +3054,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
@@ -2950,7 +3065,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_FINITEFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void IS_FINITEFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -2960,14 +3075,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_FINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_FINITEMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void IS_FINITEMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -2980,7 +3095,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_FINITE(a[i + j]));
                 }
             }
         }
@@ -2991,7 +3106,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_NANFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void IS_NANFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3001,14 +3116,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NAN(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_NANMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void IS_NANMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3021,7 +3136,7 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NAN(a[i + j]));
                 }
             }
         }
@@ -3032,7 +3147,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTestOpProvider")
-    static void IS_INFINITEFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void IS_INFINITEFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -3042,14 +3157,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatTestOpMaskProvider")
-    static void IS_INFINITEMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void IS_INFINITEMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3062,14 +3177,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_INFINITE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3081,14 +3196,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3100,14 +3215,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LTFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3123,14 +3238,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GTFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GTFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3142,14 +3257,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GTFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GTFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3165,14 +3280,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3184,14 +3299,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3203,14 +3318,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void EQFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3226,14 +3341,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void NEFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void NEFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3245,14 +3360,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void NEFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void NEFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3268,14 +3383,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LEFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LEFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3287,14 +3402,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LEFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void LEFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3310,14 +3425,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void GEFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void GEFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3329,14 +3444,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void GEFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void GEFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3352,14 +3467,14 @@ relativeError));
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3369,13 +3484,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3389,13 +3504,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void LTFloatMaxVectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void LTFloatVectorMaxTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3405,13 +3520,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void LTFloatMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void LTFloatVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3425,13 +3540,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (float)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3441,13 +3556,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3461,13 +3576,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void EQFloatMaxVectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void EQFloatVectorMaxTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -3477,13 +3592,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (float)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpMaskProvider")
-    static void EQFloatMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
+    static void EQFloatVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<float[]> fa,
                                 IntFunction<float[]> fb, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3497,7 +3612,7 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (float)((long)b[i])));
             }
         }
     }
@@ -3507,7 +3622,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3523,11 +3638,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, mask, FloatMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, FloatVectorMaxTests::blend);
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleProvider")
-    static void RearrangeFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void RearrangeFloatVectorMaxTests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -3544,7 +3659,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpShuffleMaskProvider")
-    static void RearrangeFloatMaxVectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void RearrangeFloatVectorMaxTestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -3562,7 +3677,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void compressFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void compressFloatVectorMaxTests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3580,7 +3695,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void expandFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void expandFloatVectorMaxTests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -3598,7 +3713,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void getFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void getFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -3754,7 +3869,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void BroadcastFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void BroadcastFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3768,7 +3883,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ZeroFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ZeroFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -3778,7 +3893,7 @@ relativeError));
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static float[] sliceUnary(float[] a, int origin, int idx) {
@@ -3793,7 +3908,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sliceUnaryFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void sliceUnaryFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3804,7 +3919,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, FloatMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, FloatVectorMaxTests::sliceUnary);
     }
 
     static float[] sliceBinary(float[] a, float[] b, int origin, int idx) {
@@ -3821,7 +3936,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void sliceBinaryFloatMaxVectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void sliceBinaryFloatVectorMaxTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3834,7 +3949,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, FloatMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, FloatVectorMaxTests::sliceBinary);
     }
 
     static float[] slice(float[] a, float[] b, int origin, boolean[] mask, int idx) {
@@ -3851,7 +3966,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void sliceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void sliceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3868,7 +3983,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, FloatMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, FloatVectorMaxTests::slice);
     }
 
     static float[] unsliceUnary(float[] a, int origin, int idx) {
@@ -3885,7 +4000,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void unsliceUnaryFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void unsliceUnaryFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -3896,7 +4011,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, origin, FloatMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, FloatVectorMaxTests::unsliceUnary);
     }
 
     static float[] unsliceBinary(float[] a, float[] b, int origin, int part, int idx) {
@@ -3922,7 +4037,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void unsliceBinaryFloatMaxVectorTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void unsliceBinaryFloatVectorMaxTestsBinary(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = new float[a.length];
@@ -3936,7 +4051,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, FloatMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, FloatVectorMaxTests::unsliceBinary);
     }
 
     static float[] unslice(float[] a, float[] b, int origin, int part, boolean[] mask, int idx) {
@@ -3976,7 +4091,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void unsliceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void unsliceFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
     IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -3993,7 +4108,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, FloatMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, FloatVectorMaxTests::unslice);
     }
 
     static float SIN(float a) {
@@ -4005,7 +4120,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void SINFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4016,7 +4131,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::SIN, FloatMaxVectorTests::strictSIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::SIN, FloatVectorMaxTests::strictSIN);
     }
 
     static float EXP(float a) {
@@ -4028,7 +4143,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void EXPFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4039,7 +4154,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::EXP, FloatMaxVectorTests::strictEXP);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::EXP, FloatVectorMaxTests::strictEXP);
     }
 
     static float LOG1P(float a) {
@@ -4051,7 +4166,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG1PFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void LOG1PFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4062,7 +4177,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::LOG1P, FloatMaxVectorTests::strictLOG1P);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::LOG1P, FloatVectorMaxTests::strictLOG1P);
     }
 
     static float LOG(float a) {
@@ -4074,7 +4189,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOGFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void LOGFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4085,7 +4200,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::LOG, FloatMaxVectorTests::strictLOG);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::LOG, FloatVectorMaxTests::strictLOG);
     }
 
     static float LOG10(float a) {
@@ -4097,7 +4212,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void LOG10FloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void LOG10FloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4108,7 +4223,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::LOG10, FloatMaxVectorTests::strictLOG10);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::LOG10, FloatVectorMaxTests::strictLOG10);
     }
 
     static float EXPM1(float a) {
@@ -4120,7 +4235,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void EXPM1FloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void EXPM1FloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4131,7 +4246,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::EXPM1, FloatMaxVectorTests::strictEXPM1);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::EXPM1, FloatVectorMaxTests::strictEXPM1);
     }
 
     static float COS(float a) {
@@ -4143,7 +4258,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void COSFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4154,7 +4269,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::COS, FloatMaxVectorTests::strictCOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::COS, FloatVectorMaxTests::strictCOS);
     }
 
     static float TAN(float a) {
@@ -4166,7 +4281,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void TANFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4177,7 +4292,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::TAN, FloatMaxVectorTests::strictTAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::TAN, FloatVectorMaxTests::strictTAN);
     }
 
     static float SINH(float a) {
@@ -4189,7 +4304,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SINHFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void SINHFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4200,7 +4315,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::SINH, FloatMaxVectorTests::strictSINH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::SINH, FloatVectorMaxTests::strictSINH);
     }
 
     static float COSH(float a) {
@@ -4212,7 +4327,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void COSHFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void COSHFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4223,7 +4338,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::COSH, FloatMaxVectorTests::strictCOSH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::COSH, FloatVectorMaxTests::strictCOSH);
     }
 
     static float TANH(float a) {
@@ -4235,7 +4350,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void TANHFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void TANHFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4246,7 +4361,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::TANH, FloatMaxVectorTests::strictTANH);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::TANH, FloatVectorMaxTests::strictTANH);
     }
 
     static float ASIN(float a) {
@@ -4258,7 +4373,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ASINFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ASINFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4269,7 +4384,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::ASIN, FloatMaxVectorTests::strictASIN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::ASIN, FloatVectorMaxTests::strictASIN);
     }
 
     static float ACOS(float a) {
@@ -4281,7 +4396,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ACOSFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ACOSFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4292,7 +4407,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::ACOS, FloatMaxVectorTests::strictACOS);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::ACOS, FloatVectorMaxTests::strictACOS);
     }
 
     static float ATAN(float a) {
@@ -4304,7 +4419,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ATANFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ATANFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4315,7 +4430,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::ATAN, FloatMaxVectorTests::strictATAN);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::ATAN, FloatVectorMaxTests::strictATAN);
     }
 
     static float CBRT(float a) {
@@ -4327,7 +4442,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void CBRTFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void CBRTFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4338,7 +4453,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, FloatMaxVectorTests::CBRT, FloatMaxVectorTests::strictCBRT);
+        assertArraysEqualsWithinOneUlp(r, a, FloatVectorMaxTests::CBRT, FloatVectorMaxTests::strictCBRT);
     }
 
     static float HYPOT(float a, float b) {
@@ -4350,7 +4465,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void HYPOTFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void HYPOTFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4363,7 +4478,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::HYPOT, FloatMaxVectorTests::strictHYPOT);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVectorMaxTests::HYPOT, FloatVectorMaxTests::strictHYPOT);
     }
 
 
@@ -4376,7 +4491,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4389,7 +4504,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::POW, FloatMaxVectorTests::strictPOW);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVectorMaxTests::POW, FloatVectorMaxTests::strictPOW);
     }
 
 
@@ -4402,7 +4517,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4415,7 +4530,7 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::pow, FloatMaxVectorTests::strictpow);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVectorMaxTests::pow, FloatVectorMaxTests::strictpow);
     }
 
 
@@ -4428,7 +4543,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void ATAN2FloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ATAN2FloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4441,12 +4556,12 @@ relativeError));
             }
         }
 
-        assertArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::ATAN2, FloatMaxVectorTests::strictATAN2);
+        assertArraysEqualsWithinOneUlp(r, a, b, FloatVectorMaxTests::ATAN2, FloatVectorMaxTests::strictATAN2);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void POWFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void POWFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4456,12 +4571,12 @@ relativeError));
             av.lanewise(VectorOperators.POW, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::POW, FloatMaxVectorTests::strictPOW);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVectorMaxTests::POW, FloatVectorMaxTests::strictPOW);
     }
 
 
     @Test(dataProvider = "floatBinaryOpProvider")
-    static void powFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void powFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4471,7 +4586,7 @@ relativeError));
             av.pow(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatMaxVectorTests::pow, FloatMaxVectorTests::strictpow);
+        assertBroadcastArraysEqualsWithinOneUlp(r, a, b, FloatVectorMaxTests::pow, FloatVectorMaxTests::strictpow);
     }
 
 
@@ -4484,7 +4599,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4499,11 +4614,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4516,11 +4631,11 @@ relativeError));
             av.fma(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, FloatMaxVectorTests::fma);
+        assertArraysEquals(r, a, b, c, FloatVectorMaxTests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4538,11 +4653,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
+        assertArraysEquals(r, a, b, c, mask, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4553,11 +4668,11 @@ relativeError));
             FloatVector bv = FloatVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.FMA, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloatMaxVectorTestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVectorMaxTestsAltBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4568,11 +4683,11 @@ relativeError));
             FloatVector cv = FloatVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.FMA, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4587,11 +4702,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
+        assertBroadcastArraysEquals(r, a, b, c, mask, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloatMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVectorMaxTestsAltBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4606,11 +4721,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void FMAFloatMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void FMAFloatVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4621,11 +4736,11 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVectorMaxTests::FMA);
     }
 
     @Test(dataProvider = "floatTernaryOpProvider")
-    static void fmaFloatMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void fmaFloatVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] c = fc.apply(SPECIES.length());
@@ -4636,11 +4751,11 @@ relativeError));
             av.fma(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatMaxVectorTests::fma);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, FloatVectorMaxTests::fma);
     }
 
     @Test(dataProvider = "floatTernaryOpMaskProvider")
-    static void FMAFloatMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void FMAFloatVectorMaxTestsDoubleBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<float[]> fc, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -4654,7 +4769,7 @@ relativeError));
             av.lanewise(VectorOperators.FMA, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatMaxVectorTests::FMA);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, FloatVectorMaxTests::FMA);
     }
 
     static float NEG(float a) {
@@ -4666,7 +4781,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void NEGFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void NEGFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4677,11 +4792,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::NEG);
+        assertArraysEquals(r, a, FloatVectorMaxTests::NEG);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void negFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void negFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4692,11 +4807,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::neg);
+        assertArraysEquals(r, a, FloatVectorMaxTests::neg);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void NEGMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void NEGMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4710,7 +4825,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, FloatMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, FloatVectorMaxTests::NEG);
     }
 
     static float ABS(float a) {
@@ -4722,7 +4837,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ABSFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ABSFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4733,11 +4848,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::ABS);
+        assertArraysEquals(r, a, FloatVectorMaxTests::ABS);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void absFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void absFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4748,11 +4863,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::abs);
+        assertArraysEquals(r, a, FloatVectorMaxTests::abs);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ABSMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void ABSMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4766,7 +4881,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, FloatMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, FloatVectorMaxTests::ABS);
     }
 
     static float SQRT(float a) {
@@ -4778,7 +4893,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void SQRTFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void SQRTFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4789,11 +4904,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, FloatVectorMaxTests::SQRT);
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void sqrtFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void sqrtFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
 
@@ -4804,11 +4919,11 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::sqrt);
+        assertArraysEquals(r, a, FloatVectorMaxTests::sqrt);
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void SQRTMaskedFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void SQRTMaskedFloatVectorMaxTests(IntFunction<float[]> fa,
                                                 IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = fr.apply(SPECIES.length());
@@ -4822,7 +4937,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, mask, FloatMaxVectorTests::SQRT);
+        assertArraysEquals(r, a, mask, FloatVectorMaxTests::SQRT);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -4830,7 +4945,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandFloatVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4843,7 +4958,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::band);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -4851,7 +4966,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorFloatVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4864,7 +4979,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::bor);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -4872,7 +4987,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorFloatVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4885,7 +5000,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::bxor);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -4893,7 +5008,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotFloatVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4906,7 +5021,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::bandNot);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -4914,7 +5029,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqFloatVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -4927,7 +5042,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, b, FloatMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, FloatVectorMaxTests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -4935,7 +5050,7 @@ relativeError));
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotFloatMaxVectorTests(IntFunction<boolean[]> fa) {
+    static void masknotFloatVectorMaxTests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -4946,7 +5061,7 @@ relativeError));
             }
         }
 
-        assertArraysEquals(r, a, FloatMaxVectorTests::unot);
+        assertArraysEquals(r, a, FloatVectorMaxTests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -4955,15 +5070,15 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongFloatMaxVectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongFloatVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -4977,7 +5092,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void ltFloatMaxVectorTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void ltFloatVectorMaxTestsBroadcastSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -4987,13 +5102,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floatCompareOpProvider")
-    static void eqFloatMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
+    static void eqFloatVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
 
@@ -5003,13 +5118,13 @@ relativeError));
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "floattoIntUnaryOpProvider")
-    static void toIntArrayFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toIntArrayFloatVectorMaxTestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5020,7 +5135,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void toLongArrayFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toLongArrayFloatVectorMaxTestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5031,7 +5146,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toDoubleArrayFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toDoubleArrayFloatVectorMaxTestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5042,7 +5157,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void toStringFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void toStringFloatVectorMaxTestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5055,7 +5170,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void hashCodeFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void hashCodeFloatVectorMaxTestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5088,7 +5203,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpProvider")
-    static void ADDReduceLongFloatMaxVectorTests(IntFunction<float[]> fa) {
+    static void ADDReduceLongFloatVectorMaxTests(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -5104,7 +5219,7 @@ relativeError));
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                FloatMaxVectorTests::ADDReduceLong, FloatMaxVectorTests::ADDReduceAllLong);
+                FloatVectorMaxTests::ADDReduceLong, FloatVectorMaxTests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(float[] a, int idx, boolean[] mask) {
@@ -5127,7 +5242,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpMaskProvider")
-    static void ADDReduceLongFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongFloatVectorMaxTestsMasked(IntFunction<float[]> fa, IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -5145,11 +5260,11 @@ relativeError));
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::ADDReduceLongMasked, FloatMaxVectorTests::ADDReduceAllLongMasked);
+                FloatVectorMaxTests::ADDReduceLongMasked, FloatVectorMaxTests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "floattoLongUnaryOpProvider")
-    static void BroadcastLongFloatMaxVectorTestsSmokeTest(IntFunction<float[]> fa) {
+    static void BroadcastLongFloatVectorMaxTestsSmokeTest(IntFunction<float[]> fa) {
         float[] a = fa.apply(SPECIES.length());
         float[] r = new float[a.length];
 
@@ -5160,7 +5275,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatBinaryOpMaskProvider")
-    static void blendFloatMaxVectorTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
+    static void blendFloatVectorMaxTestsBroadcastLongSmokeTest(IntFunction<float[]> fa, IntFunction<float[]> fb,
                                           IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
@@ -5174,12 +5289,12 @@ relativeError));
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, FloatMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, FloatVectorMaxTests::blend);
     }
 
 
     @Test(dataProvider = "floatUnaryOpSelectFromProvider")
-    static void SelectFromFloatMaxVectorTests(IntFunction<float[]> fa,
+    static void SelectFromFloatVectorMaxTests(IntFunction<float[]> fa,
                                            BiFunction<Integer,Integer,float[]> fs) {
         float[] a = fa.apply(SPECIES.length());
         float[] order = fs.apply(a.length, SPECIES.length());
@@ -5195,7 +5310,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorFloatMaxVectorTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
+    static void SelectFromTwoVectorFloatVectorMaxTests(IntFunction<float[]> fa, IntFunction<float[]> fb, IntFunction<float[]> fc) {
         float[] a = fa.apply(SPECIES.length());
         float[] b = fb.apply(SPECIES.length());
         float[] idx = fc.apply(SPECIES.length());
@@ -5213,7 +5328,7 @@ relativeError));
     }
 
     @Test(dataProvider = "floatUnaryOpSelectFromMaskProvider")
-    static void SelectFromFloatMaxVectorTestsMaskedSmokeTest(IntFunction<float[]> fa,
+    static void SelectFromFloatVectorMaxTestsMaskedSmokeTest(IntFunction<float[]> fa,
                                                            BiFunction<Integer,Integer,float[]> fs,
                                                            IntFunction<boolean[]> fm) {
         float[] a = fa.apply(SPECIES.length());
@@ -5232,7 +5347,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousFloatMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousFloatVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5243,12 +5358,12 @@ relativeError));
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringFloatMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringFloatVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5262,7 +5377,7 @@ relativeError));
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsFloatMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsFloatVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -5271,12 +5386,12 @@ relativeError));
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsFloatMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsFloatVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -5286,13 +5401,13 @@ relativeError));
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeFloatVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -5314,7 +5429,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountFloatVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5325,7 +5440,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, FloatMaxVectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, FloatVectorMaxTests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -5339,7 +5454,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueFloatVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5350,7 +5465,7 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, FloatMaxVectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVectorMaxTests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -5364,7 +5479,7 @@ relativeError));
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueFloatVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5375,11 +5490,11 @@ relativeError));
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, FloatMaxVectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, FloatVectorMaxTests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressFloatMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressFloatVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -5389,7 +5504,7 @@ relativeError));
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -5407,7 +5522,7 @@ relativeError));
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeFloatMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeFloatVectorMaxTestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5415,13 +5530,13 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongFloatMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongFloatVectorMaxTestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -5429,7 +5544,7 @@ relativeError));
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -5448,36 +5563,36 @@ relativeError));
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundFloatMaxVectorTestsSmokeTest(int length) {
+    static void loopBoundFloatVectorMaxTestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongFloatMaxVectorTestsSmokeTest(int _length) {
+    static void loopBoundLongFloatVectorMaxTestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeFloatMaxVectorTestsSmokeTest() {
+    static void ElementSizeFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Float.SIZE);
+        assertEquals(elsize, Float.SIZE);
     }
 
     @Test
-    static void VectorShapeFloatMaxVectorTestsSmokeTest() {
+    static void VectorShapeFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_Max_BIT));
     }
 
     @Test
-    static void ShapeWithLanesFloatMaxVectorTestsSmokeTest() {
+    static void ShapeWithLanesFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(float.class);
@@ -5485,32 +5600,32 @@ relativeError));
     }
 
     @Test
-    static void ElementTypeFloatMaxVectorTestsSmokeTest() {
+    static void ElementTypeFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementType() == float.class);
     }
 
     @Test
-    static void SpeciesElementSizeFloatMaxVectorTestsSmokeTest() {
+    static void SpeciesElementSizeFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().elementSize() == Float.SIZE);
     }
 
     @Test
-    static void VectorTypeFloatMaxVectorTestsSmokeTest() {
+    static void VectorTypeFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesFloatMaxVectorTestsSmokeTest() {
+    static void WithLanesFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(float.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeFloatMaxVectorTestsSmokeTest() {
+    static void WithShapeFloatVectorMaxTestsSmokeTest() {
         FloatVector av = FloatVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -5518,9 +5633,9 @@ relativeError));
     }
 
     @Test
-    static void MaskAllTrueFloatMaxVectorTestsSmokeTest() {
+    static void MaskAllTrueFloatVectorMaxTestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntVector128LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/IntVector128LoadStoreTests.java
index f2448365138..dd865141e08 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector128LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Int128VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation IntVector128LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class IntVector128LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_128;
 
@@ -61,14 +61,29 @@ public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(int[] r, int[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Int128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Int128VectorTests.java b/test/jdk/jdk/incubator/vector/IntVector128Tests.java
similarity index 78%
rename from test/jdk/jdk/incubator/vector/Int128VectorTests.java
rename to test/jdk/jdk/incubator/vector/IntVector128Tests.java
index 93912243ecd..ecdb23eb40d 100644
--- a/test/jdk/jdk/incubator/vector/Int128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector128Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Int128VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation IntVector128Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Int128VectorTests extends AbstractVectorTest {
+public class IntVector128Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_128;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(int actual, int expected, int delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(int actual, int expected, int delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final int CONST_SHIFT = Integer.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final int ADD_IDENTITY = (int)0;
+    private static final int AND_IDENTITY = (int)-1;
+    private static final int FIRST_NONZERO_IDENTITY = (int)0;
+    private static final int MAX_IDENTITY = Integer.MIN_VALUE;
+    private static final int MIN_IDENTITY = Integer.MAX_VALUE;
+    private static final int MUL_IDENTITY = (int)1;
+    private static final int OR_IDENTITY = (int)0;
+    private static final int SUADD_IDENTITY = (int)0;
+    private static final int UMAX_IDENTITY = (int)0;   // Minimum unsigned value
+    private static final int UMIN_IDENTITY = (int)-1;  // Maximum unsigned value
+    private static final int XOR_IDENTITY = (int)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
     static void assertArraysStrictlyEquals(int[] r, int[] a) {
@@ -84,10 +139,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Int128VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Int128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Int128VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Int128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Int128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (int)0);
+                    assertEquals(r[i + k], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Int128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (int)0);
+                        assertEquals(r[i + j], (int)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Int128VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Int128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Int128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Int128VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Int128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1531,7 +1586,7 @@ public class Int128VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         IntVector a = io.add((int)1); //[1,2]
         IntVector b = a.neg();  //[-1,-2]
         int[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1546,19 +1601,19 @@ public class Int128VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Integer> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Integer> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         IntVector uab0 = zab0.rearrange(unz0,zab1);
         IntVector uab1 = zab0.rearrange(unz1,zab1);
         int[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1573,7 +1628,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1581,9 +1636,9 @@ public class Int128VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1612,7 +1667,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1625,7 +1680,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::ADD);
+        assertArraysEquals(r, a, b, IntVector128Tests::ADD);
     }
 
     static int add(int a, int b) {
@@ -1633,7 +1688,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1644,11 +1699,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::add);
+        assertArraysEquals(r, a, b, IntVector128Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1664,11 +1719,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1682,7 +1737,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::add);
     }
 
     static int SUB(int a, int b) {
@@ -1690,7 +1745,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void SUBInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUBIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1703,7 +1758,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::SUB);
+        assertArraysEquals(r, a, b, IntVector128Tests::SUB);
     }
 
     static int sub(int a, int b) {
@@ -1711,7 +1766,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1722,11 +1777,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::sub);
+        assertArraysEquals(r, a, b, IntVector128Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void SUBInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUBIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1742,11 +1797,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1760,7 +1815,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::sub);
     }
 
     static int MUL(int a, int b) {
@@ -1768,7 +1823,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MULInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MULIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1781,7 +1836,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::MUL);
+        assertArraysEquals(r, a, b, IntVector128Tests::MUL);
     }
 
     static int mul(int a, int b) {
@@ -1789,7 +1844,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1800,11 +1855,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::mul);
+        assertArraysEquals(r, a, b, IntVector128Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void MULInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void MULIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1820,11 +1875,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1838,7 +1893,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::mul);
     }
 
     static int DIV(int a, int b) {
@@ -1846,7 +1901,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void DIVInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void DIVIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1861,7 +1916,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::DIV);
+        assertArraysEquals(r, a, b, IntVector128Tests::DIV);
     }
 
     static int div(int a, int b) {
@@ -1869,7 +1924,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1884,11 +1939,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::div);
+        assertArraysEquals(r, a, b, IntVector128Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void DIVInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void DIVIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1906,11 +1961,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1928,7 +1983,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1936,7 +1991,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void FIRST_NONZEROInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void FIRST_NONZEROIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1949,11 +2004,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, IntVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void FIRST_NONZEROInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void FIRST_NONZEROIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1969,7 +2024,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1977,7 +2032,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1990,7 +2045,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::AND);
+        assertArraysEquals(r, a, b, IntVector128Tests::AND);
     }
 
     static int and(int a, int b) {
@@ -1998,7 +2053,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2009,11 +2064,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::and);
+        assertArraysEquals(r, a, b, IntVector128Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2029,7 +2084,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::AND);
     }
 
     static int AND_NOT(int a, int b) {
@@ -2037,7 +2092,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void AND_NOTInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void AND_NOTIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2050,11 +2105,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, IntVector128Tests::AND_NOT);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void AND_NOTInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void AND_NOTIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2070,7 +2125,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::AND_NOT);
     }
 
     static int OR(int a, int b) {
@@ -2078,7 +2133,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2091,7 +2146,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::OR);
+        assertArraysEquals(r, a, b, IntVector128Tests::OR);
     }
 
     static int or(int a, int b) {
@@ -2099,7 +2154,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2110,11 +2165,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::or);
+        assertArraysEquals(r, a, b, IntVector128Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2130,7 +2185,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::OR);
     }
 
     static int XOR(int a, int b) {
@@ -2138,7 +2193,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void XORInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void XORIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2151,11 +2206,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::XOR);
+        assertArraysEquals(r, a, b, IntVector128Tests::XOR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void XORInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void XORIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2171,7 +2226,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::XOR);
     }
 
     static int COMPRESS_BITS(int a, int b) {
@@ -2179,7 +2234,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void COMPRESS_BITSInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void COMPRESS_BITSIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2192,11 +2247,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, IntVector128Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void COMPRESS_BITSInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void COMPRESS_BITSIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2212,7 +2267,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::COMPRESS_BITS);
     }
 
     static int EXPAND_BITS(int a, int b) {
@@ -2220,7 +2275,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void EXPAND_BITSInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EXPAND_BITSIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2233,11 +2288,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, IntVector128Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void EXPAND_BITSInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EXPAND_BITSIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2253,11 +2308,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2267,11 +2322,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2284,11 +2339,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector128Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2298,11 +2353,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2315,11 +2370,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector128Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2329,11 +2384,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2346,11 +2401,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector128Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2362,11 +2417,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2381,11 +2436,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector128Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2395,11 +2450,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2409,11 +2464,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2426,11 +2481,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector128Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2440,11 +2495,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2454,11 +2509,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2471,11 +2526,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector128Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector128TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2485,11 +2540,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector128Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2502,11 +2557,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector128Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector128TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2516,11 +2571,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector128Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2533,7 +2588,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector128Tests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2541,7 +2596,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2554,11 +2609,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, IntVector128Tests::LSHL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2574,7 +2629,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::LSHL);
     }
 
     static int ASHR(int a, int b) {
@@ -2582,7 +2637,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2595,11 +2650,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, IntVector128Tests::ASHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2615,7 +2670,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::ASHR);
     }
 
     static int LSHR(int a, int b) {
@@ -2623,7 +2678,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2636,11 +2691,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, IntVector128Tests::LSHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2656,7 +2711,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::LSHR);
     }
 
     static int LSHL_unary(int a, int b) {
@@ -2664,7 +2719,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt128VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector128TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2676,11 +2731,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector128Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt128VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector128TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2695,7 +2750,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector128Tests::LSHL_unary);
     }
 
     static int LSHR_unary(int a, int b) {
@@ -2703,7 +2758,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt128VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector128TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2715,11 +2770,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector128Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt128VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector128TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2734,7 +2789,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector128Tests::LSHR_unary);
     }
 
     static int ASHR_unary(int a, int b) {
@@ -2742,7 +2797,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt128VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector128TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2754,11 +2809,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector128Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt128VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector128TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2773,7 +2828,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector128Tests::ASHR_unary);
     }
 
     static int ROR(int a, int b) {
@@ -2781,7 +2836,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2794,11 +2849,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::ROR);
+        assertArraysEquals(r, a, b, IntVector128Tests::ROR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2814,7 +2869,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::ROR);
     }
 
     static int ROL(int a, int b) {
@@ -2822,7 +2877,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2835,11 +2890,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::ROL);
+        assertArraysEquals(r, a, b, IntVector128Tests::ROL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2855,7 +2910,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::ROL);
     }
 
     static int ROR_unary(int a, int b) {
@@ -2863,7 +2918,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt128VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector128TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2875,11 +2930,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector128Tests::ROR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt128VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector128TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2894,7 +2949,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector128Tests::ROR_unary);
     }
 
     static int ROL_unary(int a, int b) {
@@ -2902,7 +2957,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt128VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector128TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2914,11 +2969,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector128Tests::ROL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt128VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector128TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2933,14 +2988,14 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector128Tests::ROL_unary);
     }
     static int LSHR_binary_const(int a) {
         return (int)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHRInt128VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHRIntVector128TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2951,11 +3006,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector128Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHRInt128VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHRIntVector128TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2969,7 +3024,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector128Tests::LSHR_binary_const);
     }
 
     static int LSHL_binary_const(int a) {
@@ -2977,7 +3032,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHLInt128VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHLIntVector128TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2988,11 +3043,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, IntVector128Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHLInt128VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHLIntVector128TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3006,7 +3061,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector128Tests::LSHL_binary_const);
     }
 
     static int ASHR_binary_const(int a) {
@@ -3014,7 +3069,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ASHRInt128VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ASHRIntVector128TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3025,11 +3080,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector128Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ASHRInt128VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ASHRIntVector128TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3043,7 +3098,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector128Tests::ASHR_binary_const);
     }
 
     static int ROR_binary_const(int a) {
@@ -3051,7 +3106,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void RORInt128VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void RORIntVector128TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3062,11 +3117,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, IntVector128Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void RORInt128VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void RORIntVector128TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3080,7 +3135,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector128Tests::ROR_binary_const);
     }
 
     static int ROL_binary_const(int a) {
@@ -3088,7 +3143,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ROLInt128VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ROLIntVector128TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3099,11 +3154,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, IntVector128Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ROLInt128VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ROLIntVector128TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3117,14 +3172,14 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector128Tests::ROL_binary_const);
     }
 
 
     static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MINIntVector128TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int128VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, IntVector128Tests::MIN);
     }
 
     static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void minInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void minIntVector128TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int128VectorTests::min);
+        assertArraysEquals(r, a, (int)10, IntVector128Tests::min);
     }
 
     static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINInt128VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINIntVector128TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,13 +3226,13 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int128VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, mask, IntVector128Tests::MIN);
     }
 
     static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MAXIntVector128TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3188,13 +3243,13 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int128VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, IntVector128Tests::MAX);
     }
 
     static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void maxInt128VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void maxIntVector128TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3205,13 +3260,13 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int128VectorTests::max);
+        assertArraysEquals(r, a, (int)10, IntVector128Tests::max);
     }
 
     static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXInt128VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXIntVector128TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3224,7 +3279,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int128VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, mask, IntVector128Tests::MAX);
     }
 
     static int MIN(int a, int b) {
@@ -3232,7 +3287,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3245,7 +3300,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::MIN);
+        assertArraysEquals(r, a, b, IntVector128Tests::MIN);
     }
 
     static int min(int a, int b) {
@@ -3253,7 +3308,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3264,7 +3319,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::min);
+        assertArraysEquals(r, a, b, IntVector128Tests::min);
     }
 
     static int MAX(int a, int b) {
@@ -3272,7 +3327,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3285,7 +3340,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::MAX);
+        assertArraysEquals(r, a, b, IntVector128Tests::MAX);
     }
 
     static int max(int a, int b) {
@@ -3293,7 +3348,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3304,7 +3359,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::max);
+        assertArraysEquals(r, a, b, IntVector128Tests::max);
     }
 
     static int UMIN(int a, int b) {
@@ -3312,7 +3367,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMINInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMINIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3325,11 +3380,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, IntVector128Tests::UMIN);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMINInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMINIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3345,7 +3400,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::UMIN);
     }
 
     static int UMAX(int a, int b) {
@@ -3353,7 +3408,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMAXInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMAXIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3366,11 +3421,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, IntVector128Tests::UMAX);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMAXInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMAXIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3386,7 +3441,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::UMAX);
     }
 
     static int SADD(int a, int b) {
@@ -3394,7 +3449,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SADDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SADDIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3407,11 +3462,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::SADD);
+        assertArraysEquals(r, a, b, IntVector128Tests::SADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SADDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SADDIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3427,7 +3482,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::SADD);
     }
 
     static int SSUB(int a, int b) {
@@ -3435,7 +3490,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SSUBInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SSUBIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3448,11 +3503,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, IntVector128Tests::SSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SSUBInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SSUBIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3468,7 +3523,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::SSUB);
     }
 
     static int SUADD(int a, int b) {
@@ -3476,7 +3531,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUADDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUADDIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3489,11 +3544,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, IntVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUADDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3509,7 +3564,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::SUADD);
     }
 
     static int SUSUB(int a, int b) {
@@ -3517,7 +3572,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUSUBInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUSUBIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3530,11 +3585,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, IntVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUSUBInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUSUBIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3550,11 +3605,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3564,11 +3619,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3578,11 +3633,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3592,11 +3647,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3606,10 +3661,10 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, IntVector128Tests::max);
     }
     @Test(dataProvider = "intSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SUADDAssocIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -3626,11 +3681,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Int128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, IntVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDAssocIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                      IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3651,11 +3706,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Int128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, IntVector128Tests::SUADD);
     }
 
     static int ANDReduce(int[] a, int idx) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3664,7 +3719,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAll(int[] a) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3673,32 +3728,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ANDReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void ANDReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                int v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::ANDReduce, Int128VectorTests::ANDReduceAll);
+                IntVector128Tests::ANDReduce, IntVector128Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = AND_IDENTITY;
+
+        assertEquals((int) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id & x), x);
+                assertEquals((int) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static int ANDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3708,7 +3781,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3717,34 +3790,29 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ANDReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                int v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::ANDReduceMasked, Int128VectorTests::ANDReduceAllMasked);
+                IntVector128Tests::ANDReduceMasked, IntVector128Tests::ANDReduceAllMasked);
     }
 
     static int ORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3753,7 +3821,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAll(int[] a) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3762,32 +3830,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ORReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void ORReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                int v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::ORReduce, Int128VectorTests::ORReduceAll);
+                IntVector128Tests::ORReduce, IntVector128Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = OR_IDENTITY;
+
+        assertEquals((int) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id | x), x);
+                assertEquals((int) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static int ORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3797,7 +3883,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3806,7 +3892,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ORReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3814,26 +3900,21 @@ public class Int128VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                int v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::ORReduceMasked, Int128VectorTests::ORReduceAllMasked);
+                IntVector128Tests::ORReduceMasked, IntVector128Tests::ORReduceAllMasked);
     }
 
     static int XORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3842,7 +3923,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAll(int[] a) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3851,32 +3932,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void XORReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void XORReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                int v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::XORReduce, Int128VectorTests::XORReduceAll);
+                IntVector128Tests::XORReduce, IntVector128Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = XOR_IDENTITY;
+
+        assertEquals((int) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id ^ x), x);
+                assertEquals((int) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static int XORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3886,7 +3985,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3895,7 +3994,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void XORReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3903,26 +4002,21 @@ public class Int128VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                int v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::XORReduceMasked, Int128VectorTests::XORReduceAllMasked);
+                IntVector128Tests::XORReduceMasked, IntVector128Tests::XORReduceAllMasked);
     }
 
     static int ADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3931,7 +4025,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAll(int[] a) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3940,32 +4034,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                int v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::ADDReduce, Int128VectorTests::ADDReduceAll);
+                IntVector128Tests::ADDReduce, IntVector128Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = ADD_IDENTITY;
+
+        assertEquals((int) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id + x), x);
+                assertEquals((int) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3975,7 +4087,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3984,7 +4096,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3992,26 +4104,21 @@ public class Int128VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                int v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::ADDReduceMasked, Int128VectorTests::ADDReduceAllMasked);
+                IntVector128Tests::ADDReduceMasked, IntVector128Tests::ADDReduceAllMasked);
     }
 
     static int MULReduce(int[] a, int idx) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4020,7 +4127,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAll(int[] a) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4029,32 +4136,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MULReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void MULReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                int v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::MULReduce, Int128VectorTests::MULReduceAll);
+                IntVector128Tests::MULReduce, IntVector128Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MUL_IDENTITY;
+
+        assertEquals((int) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id * x), x);
+                assertEquals((int) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4064,7 +4189,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4073,34 +4198,29 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MULReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                int v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::MULReduceMasked, Int128VectorTests::MULReduceAllMasked);
+                IntVector128Tests::MULReduceMasked, IntVector128Tests::MULReduceAllMasked);
     }
 
     static int MINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.min(res, a[i]);
         }
@@ -4109,7 +4229,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduce(a, i));
         }
@@ -4118,32 +4238,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void MINReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                int v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::MINReduce, Int128VectorTests::MINReduceAll);
+                IntVector128Tests::MINReduce, IntVector128Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MIN_IDENTITY;
+
+        assertEquals((int) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.min(id, x), x);
+                assertEquals((int) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.min(res, a[i]);
@@ -4153,7 +4291,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4162,34 +4300,29 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                int v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::MINReduceMasked, Int128VectorTests::MINReduceAllMasked);
+                IntVector128Tests::MINReduceMasked, IntVector128Tests::MINReduceAllMasked);
     }
 
     static int MAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.max(res, a[i]);
         }
@@ -4198,7 +4331,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduce(a, i));
         }
@@ -4207,32 +4340,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void MAXReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                int v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::MAXReduce, Int128VectorTests::MAXReduceAll);
+                IntVector128Tests::MAXReduce, IntVector128Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MAX_IDENTITY;
+
+        assertEquals((int) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.max(id, x), x);
+                assertEquals((int) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.max(res, a[i]);
@@ -4242,7 +4393,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4251,34 +4402,29 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                int v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::MAXReduceMasked, Int128VectorTests::MAXReduceAllMasked);
+                IntVector128Tests::MAXReduceMasked, IntVector128Tests::MAXReduceAllMasked);
     }
 
     static int UMINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4287,7 +4433,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4296,32 +4442,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMINReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void UMINReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                int v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::UMINReduce, Int128VectorTests::UMINReduceAll);
+                IntVector128Tests::UMINReduce, IntVector128Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMIN_IDENTITY;
+
+        assertEquals((int) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.minUnsigned(id, x), x);
+                assertEquals((int) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static int UMINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.minUnsigned(res, a[i]);
@@ -4331,7 +4495,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4340,34 +4504,29 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMINReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                int v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::UMINReduceMasked, Int128VectorTests::UMINReduceAllMasked);
+                IntVector128Tests::UMINReduceMasked, IntVector128Tests::UMINReduceAllMasked);
     }
 
     static int UMAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4376,7 +4535,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4385,32 +4544,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMAXReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void UMAXReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                int v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::UMAXReduce, Int128VectorTests::UMAXReduceAll);
+                IntVector128Tests::UMAXReduce, IntVector128Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMAX_IDENTITY;
+
+        assertEquals((int) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((int) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static int UMAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.maxUnsigned(res, a[i]);
@@ -4420,7 +4597,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4429,34 +4606,29 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMAXReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                int v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::UMAXReduceMasked, Int128VectorTests::UMAXReduceAllMasked);
+                IntVector128Tests::UMAXReduceMasked, IntVector128Tests::UMAXReduceAllMasked);
     }
 
     static int FIRST_NONZEROReduce(int[] a, int idx) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4465,7 +4637,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAll(int[] a) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4474,32 +4646,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void FIRST_NONZEROReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void FIRST_NONZEROReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::FIRST_NONZEROReduce, Int128VectorTests::FIRST_NONZEROReduceAll);
+                IntVector128Tests::FIRST_NONZEROReduce, IntVector128Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static int FIRST_NONZEROReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4509,7 +4699,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAllMasked(int[] a, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4518,30 +4708,25 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::FIRST_NONZEROReduceMasked, Int128VectorTests::FIRST_NONZEROReduceAllMasked);
+                IntVector128Tests::FIRST_NONZEROReduceMasked, IntVector128Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4554,7 +4739,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueInt128VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueIntVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4565,7 +4750,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector128Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4578,7 +4763,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueInt128VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueIntVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4589,11 +4774,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector128Tests::allTrue);
     }
 
     static int SUADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4602,7 +4787,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAll(int[] a) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4611,32 +4796,50 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingUnaryOpProvider")
-    static void SUADDReduceInt128VectorTests(IntFunction<int[]> fa) {
+    static void SUADDReduceIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                int v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int128VectorTests::SUADDReduce, Int128VectorTests::SUADDReduceAll);
+                IntVector128Tests::SUADDReduce, IntVector128Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "intSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = SUADD_IDENTITY;
+
+        assertEquals((int) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static int SUADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4646,7 +4849,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4654,7 +4857,7 @@ public class Int128VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "intSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4662,26 +4865,21 @@ public class Int128VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                int v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::SUADDReduceMasked, Int128VectorTests::SUADDReduceAllMasked);
+                IntVector128Tests::SUADDReduceMasked, IntVector128Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void withInt128VectorTests(IntFunction<int []> fa, IntFunction<int []> fb) {
+    static void withIntVector128Tests(IntFunction<int []> fa, IntFunction<int []> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -4704,7 +4902,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_DEFAULTInt128VectorTests(IntFunction<int[]> fa) {
+    static void IS_DEFAULTIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4714,14 +4912,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedIntVector128Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4734,7 +4932,7 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4745,7 +4943,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_NEGATIVEInt128VectorTests(IntFunction<int[]> fa) {
+    static void IS_NEGATIVEIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4755,14 +4953,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedIntVector128Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4775,14 +4973,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4794,14 +4992,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4813,14 +5011,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LTIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4836,14 +5034,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GTInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GTIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4855,14 +5053,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GTInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GTIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4878,14 +5076,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4897,14 +5095,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4916,14 +5114,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EQIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4939,14 +5137,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void NEInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void NEIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4958,14 +5156,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void NEInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void NEIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4981,14 +5179,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LEInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LEIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5000,14 +5198,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LEInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LEIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5023,14 +5221,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GEInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GEIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5042,14 +5240,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GEInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GEIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5065,14 +5263,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULTInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULTIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5084,14 +5282,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULTInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULTIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5107,14 +5305,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGTInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGTIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5126,14 +5324,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGTInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGTIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5149,14 +5347,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULEInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULEIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5168,14 +5366,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULEInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULEIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5191,14 +5389,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGEInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGEIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5210,14 +5408,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGEInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGEIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5233,14 +5431,14 @@ public class Int128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5250,13 +5448,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5270,13 +5468,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector128TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5286,13 +5484,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5306,13 +5504,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5322,13 +5520,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5342,13 +5540,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector128TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5358,13 +5556,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5378,7 +5576,7 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
             }
         }
     }
@@ -5388,7 +5586,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5404,11 +5602,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, IntVector128Tests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void RearrangeInt128VectorTests(IntFunction<int[]> fa,
+    static void RearrangeIntVector128Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5425,7 +5623,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void RearrangeInt128VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void RearrangeIntVector128TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -5443,7 +5641,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void compressInt128VectorTests(IntFunction<int[]> fa,
+    static void compressIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5461,7 +5659,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void expandInt128VectorTests(IntFunction<int[]> fa,
+    static void expandIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5479,7 +5677,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void getInt128VectorTests(IntFunction<int[]> fa) {
+    static void getIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -5635,7 +5833,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastInt128VectorTests(IntFunction<int[]> fa) {
+    static void BroadcastIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5649,7 +5847,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZeroInt128VectorTests(IntFunction<int[]> fa) {
+    static void ZeroIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5659,7 +5857,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static int[] sliceUnary(int[] a, int origin, int idx) {
@@ -5674,7 +5872,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void sliceUnaryInt128VectorTests(IntFunction<int[]> fa) {
+    static void sliceUnaryIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5685,7 +5883,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, IntVector128Tests::sliceUnary);
     }
 
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
@@ -5702,7 +5900,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void sliceBinaryInt128VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void sliceBinaryIntVector128TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5715,7 +5913,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Int128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, IntVector128Tests::sliceBinary);
     }
 
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
@@ -5732,7 +5930,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void sliceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void sliceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5749,7 +5947,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Int128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, IntVector128Tests::slice);
     }
 
     static int[] unsliceUnary(int[] a, int origin, int idx) {
@@ -5766,7 +5964,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void unsliceUnaryInt128VectorTests(IntFunction<int[]> fa) {
+    static void unsliceUnaryIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5777,7 +5975,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, IntVector128Tests::unsliceUnary);
     }
 
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
@@ -5803,7 +6001,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void unsliceBinaryInt128VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void unsliceBinaryIntVector128TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5817,7 +6015,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Int128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, IntVector128Tests::unsliceBinary);
     }
 
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5857,7 +6055,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void unsliceInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void unsliceIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5874,7 +6072,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Int128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, IntVector128Tests::unslice);
     }
 
     static int BITWISE_BLEND(int a, int b, int c) {
@@ -5886,7 +6084,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5901,11 +6099,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5918,11 +6116,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, IntVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5940,11 +6138,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5955,11 +6153,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt128VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector128TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5970,11 +6168,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt128VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector128TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6019,11 +6217,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector128TestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6038,11 +6236,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt128VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector128TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6053,11 +6251,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt128VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector128TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6068,11 +6266,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector128TestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6086,7 +6284,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntVector128Tests::BITWISE_BLEND);
     }
 
     static int NEG(int a) {
@@ -6098,7 +6296,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NEGInt128VectorTests(IntFunction<int[]> fa) {
+    static void NEGIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6109,11 +6307,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::NEG);
+        assertArraysEquals(r, a, IntVector128Tests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void negInt128VectorTests(IntFunction<int[]> fa) {
+    static void negIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6124,11 +6322,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::neg);
+        assertArraysEquals(r, a, IntVector128Tests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NEGMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void NEGMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6142,7 +6340,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, IntVector128Tests::NEG);
     }
 
     static int ABS(int a) {
@@ -6154,7 +6352,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ABSInt128VectorTests(IntFunction<int[]> fa) {
+    static void ABSIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6165,11 +6363,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::ABS);
+        assertArraysEquals(r, a, IntVector128Tests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void absInt128VectorTests(IntFunction<int[]> fa) {
+    static void absIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6180,11 +6378,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::abs);
+        assertArraysEquals(r, a, IntVector128Tests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ABSMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void ABSMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6198,7 +6396,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, IntVector128Tests::ABS);
     }
 
     static int NOT(int a) {
@@ -6210,7 +6408,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NOTInt128VectorTests(IntFunction<int[]> fa) {
+    static void NOTIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6221,11 +6419,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::NOT);
+        assertArraysEquals(r, a, IntVector128Tests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void notInt128VectorTests(IntFunction<int[]> fa) {
+    static void notIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6236,11 +6434,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::not);
+        assertArraysEquals(r, a, IntVector128Tests::not);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NOTMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void NOTMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6254,7 +6452,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, IntVector128Tests::NOT);
     }
 
     static int ZOMO(int a) {
@@ -6262,7 +6460,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZOMOInt128VectorTests(IntFunction<int[]> fa) {
+    static void ZOMOIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6273,11 +6471,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::ZOMO);
+        assertArraysEquals(r, a, IntVector128Tests::ZOMO);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ZOMOMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void ZOMOMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6291,7 +6489,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, IntVector128Tests::ZOMO);
     }
 
     static int BIT_COUNT(int a) {
@@ -6299,7 +6497,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BIT_COUNTInt128VectorTests(IntFunction<int[]> fa) {
+    static void BIT_COUNTIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6310,11 +6508,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, IntVector128Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void BIT_COUNTMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6328,7 +6526,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, IntVector128Tests::BIT_COUNT);
     }
 
     static int TRAILING_ZEROS_COUNT(int a) {
@@ -6336,7 +6534,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTInt128VectorTests(IntFunction<int[]> fa) {
+    static void TRAILING_ZEROS_COUNTIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6347,11 +6545,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6365,7 +6563,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     static int LEADING_ZEROS_COUNT(int a) {
@@ -6373,7 +6571,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTInt128VectorTests(IntFunction<int[]> fa) {
+    static void LEADING_ZEROS_COUNTIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6384,11 +6582,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6402,7 +6600,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     static int REVERSE(int a) {
@@ -6410,7 +6608,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSEInt128VectorTests(IntFunction<int[]> fa) {
+    static void REVERSEIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6421,11 +6619,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::REVERSE);
+        assertArraysEquals(r, a, IntVector128Tests::REVERSE);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSEMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void REVERSEMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6439,7 +6637,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, IntVector128Tests::REVERSE);
     }
 
     static int REVERSE_BYTES(int a) {
@@ -6447,7 +6645,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSE_BYTESInt128VectorTests(IntFunction<int[]> fa) {
+    static void REVERSE_BYTESIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6458,11 +6656,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, IntVector128Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedInt128VectorTests(IntFunction<int[]> fa,
+    static void REVERSE_BYTESMaskedIntVector128Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6476,7 +6674,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, IntVector128Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6484,7 +6682,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandIntVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6497,7 +6695,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::band);
+        assertArraysEquals(r, a, b, IntVector128Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6505,7 +6703,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorIntVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6518,7 +6716,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::bor);
+        assertArraysEquals(r, a, b, IntVector128Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6526,7 +6724,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorIntVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6539,7 +6737,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::bxor);
+        assertArraysEquals(r, a, b, IntVector128Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6547,7 +6745,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotIntVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6560,7 +6758,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::bandNot);
+        assertArraysEquals(r, a, b, IntVector128Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6568,7 +6766,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqIntVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6581,7 +6779,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int128VectorTests::beq);
+        assertArraysEquals(r, a, b, IntVector128Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6589,7 +6787,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotInt128VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotIntVector128Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6600,7 +6798,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int128VectorTests::unot);
+        assertArraysEquals(r, a, IntVector128Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6609,15 +6807,15 @@ public class Int128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt128VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongIntVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6631,7 +6829,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt128VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector128TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6641,13 +6839,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt128VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector128TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6657,13 +6855,13 @@ public class Int128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toIntArrayInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toIntArrayIntVector128TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6674,7 +6872,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toLongArrayInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toLongArrayIntVector128TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6685,7 +6883,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toDoubleArrayInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toDoubleArrayIntVector128TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6696,7 +6894,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toStringInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toStringIntVector128TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6709,7 +6907,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void hashCodeInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void hashCodeIntVector128TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6742,7 +6940,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceLongInt128VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceLongIntVector128Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6758,7 +6956,7 @@ public class Int128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Int128VectorTests::ADDReduceLong, Int128VectorTests::ADDReduceAllLong);
+                IntVector128Tests::ADDReduceLong, IntVector128Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(int[] a, int idx, boolean[] mask) {
@@ -6781,7 +6979,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceLongInt128VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongIntVector128TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6799,11 +6997,11 @@ public class Int128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Int128VectorTests::ADDReduceLongMasked, Int128VectorTests::ADDReduceAllLongMasked);
+                IntVector128Tests::ADDReduceLongMasked, IntVector128Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastLongInt128VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void BroadcastLongIntVector128TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6814,7 +7012,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt128VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector128TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6828,12 +7026,12 @@ public class Int128VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector128Tests::blend);
     }
 
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void SelectFromInt128VectorTests(IntFunction<int[]> fa,
+    static void SelectFromIntVector128Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -6849,7 +7047,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorInt128VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SelectFromTwoVectorIntVector128Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] idx = fc.apply(SPECIES.length());
@@ -6867,7 +7065,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void SelectFromInt128VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void SelectFromIntVector128TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                            BiFunction<Integer,Integer,int[]> fs,
                                                            IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -6886,7 +7084,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousInt128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousIntVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6897,12 +7095,12 @@ public class Int128VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringInt128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringIntVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6916,7 +7114,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsInt128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsIntVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6925,12 +7123,12 @@ public class Int128VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsInt128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsIntVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6940,13 +7138,13 @@ public class Int128VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeIntVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6968,7 +7166,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountIntVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6979,7 +7177,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int128VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, IntVector128Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6993,7 +7191,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueIntVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7004,7 +7202,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int128VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector128Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -7018,7 +7216,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueIntVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7029,11 +7227,11 @@ public class Int128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int128VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector128Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressInt128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressIntVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7043,7 +7241,7 @@ public class Int128VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7061,7 +7259,7 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeInt128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeIntVector128TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7069,13 +7267,13 @@ public class Int128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongInt128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongIntVector128TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7083,7 +7281,7 @@ public class Int128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7102,36 +7300,36 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundInt128VectorTestsSmokeTest(int length) {
+    static void loopBoundIntVector128TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongInt128VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongIntVector128TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeInt128VectorTestsSmokeTest() {
+    static void ElementSizeIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Integer.SIZE);
+        assertEquals(elsize, Integer.SIZE);
     }
 
     @Test
-    static void VectorShapeInt128VectorTestsSmokeTest() {
+    static void VectorShapeIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_128_BIT));
     }
 
     @Test
-    static void ShapeWithLanesInt128VectorTestsSmokeTest() {
+    static void ShapeWithLanesIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(int.class);
@@ -7139,32 +7337,32 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeInt128VectorTestsSmokeTest() {
+    static void ElementTypeIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementType() == int.class);
     }
 
     @Test
-    static void SpeciesElementSizeInt128VectorTestsSmokeTest() {
+    static void SpeciesElementSizeIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementSize() == Integer.SIZE);
     }
 
     @Test
-    static void VectorTypeInt128VectorTestsSmokeTest() {
+    static void VectorTypeIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesInt128VectorTestsSmokeTest() {
+    static void WithLanesIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(int.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeInt128VectorTestsSmokeTest() {
+    static void WithShapeIntVector128TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7172,9 +7370,9 @@ public class Int128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueInt128VectorTestsSmokeTest() {
+    static void MaskAllTrueIntVector128TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntVector256LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/IntVector256LoadStoreTests.java
index 1a8c113d3b9..ea98a287ded 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector256LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Int256VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation IntVector256LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class IntVector256LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_256;
 
@@ -61,14 +61,29 @@ public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(int[] r, int[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Int256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Int256VectorTests.java b/test/jdk/jdk/incubator/vector/IntVector256Tests.java
similarity index 78%
rename from test/jdk/jdk/incubator/vector/Int256VectorTests.java
rename to test/jdk/jdk/incubator/vector/IntVector256Tests.java
index e8d6f3311ac..7100ebd1693 100644
--- a/test/jdk/jdk/incubator/vector/Int256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector256Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Int256VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation IntVector256Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Int256VectorTests extends AbstractVectorTest {
+public class IntVector256Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_256;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(int actual, int expected, int delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(int actual, int expected, int delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final int CONST_SHIFT = Integer.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final int ADD_IDENTITY = (int)0;
+    private static final int AND_IDENTITY = (int)-1;
+    private static final int FIRST_NONZERO_IDENTITY = (int)0;
+    private static final int MAX_IDENTITY = Integer.MIN_VALUE;
+    private static final int MIN_IDENTITY = Integer.MAX_VALUE;
+    private static final int MUL_IDENTITY = (int)1;
+    private static final int OR_IDENTITY = (int)0;
+    private static final int SUADD_IDENTITY = (int)0;
+    private static final int UMAX_IDENTITY = (int)0;   // Minimum unsigned value
+    private static final int UMIN_IDENTITY = (int)-1;  // Maximum unsigned value
+    private static final int XOR_IDENTITY = (int)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
     static void assertArraysStrictlyEquals(int[] r, int[] a) {
@@ -84,10 +139,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Int256VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Int256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Int256VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Int256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Int256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (int)0);
+                    assertEquals(r[i + k], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Int256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (int)0);
+                        assertEquals(r[i + j], (int)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Int256VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Int256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Int256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Int256VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Int256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1531,7 +1586,7 @@ public class Int256VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         IntVector a = io.add((int)1); //[1,2]
         IntVector b = a.neg();  //[-1,-2]
         int[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1546,19 +1601,19 @@ public class Int256VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Integer> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Integer> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         IntVector uab0 = zab0.rearrange(unz0,zab1);
         IntVector uab1 = zab0.rearrange(unz1,zab1);
         int[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1573,7 +1628,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1581,9 +1636,9 @@ public class Int256VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1612,7 +1667,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1625,7 +1680,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::ADD);
+        assertArraysEquals(r, a, b, IntVector256Tests::ADD);
     }
 
     static int add(int a, int b) {
@@ -1633,7 +1688,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1644,11 +1699,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::add);
+        assertArraysEquals(r, a, b, IntVector256Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1664,11 +1719,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1682,7 +1737,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::add);
     }
 
     static int SUB(int a, int b) {
@@ -1690,7 +1745,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void SUBInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUBIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1703,7 +1758,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::SUB);
+        assertArraysEquals(r, a, b, IntVector256Tests::SUB);
     }
 
     static int sub(int a, int b) {
@@ -1711,7 +1766,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1722,11 +1777,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::sub);
+        assertArraysEquals(r, a, b, IntVector256Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void SUBInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUBIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1742,11 +1797,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1760,7 +1815,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::sub);
     }
 
     static int MUL(int a, int b) {
@@ -1768,7 +1823,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MULInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MULIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1781,7 +1836,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::MUL);
+        assertArraysEquals(r, a, b, IntVector256Tests::MUL);
     }
 
     static int mul(int a, int b) {
@@ -1789,7 +1844,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1800,11 +1855,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::mul);
+        assertArraysEquals(r, a, b, IntVector256Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void MULInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void MULIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1820,11 +1875,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1838,7 +1893,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::mul);
     }
 
     static int DIV(int a, int b) {
@@ -1846,7 +1901,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void DIVInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void DIVIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1861,7 +1916,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::DIV);
+        assertArraysEquals(r, a, b, IntVector256Tests::DIV);
     }
 
     static int div(int a, int b) {
@@ -1869,7 +1924,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1884,11 +1939,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::div);
+        assertArraysEquals(r, a, b, IntVector256Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void DIVInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void DIVIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1906,11 +1961,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1928,7 +1983,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1936,7 +1991,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void FIRST_NONZEROInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void FIRST_NONZEROIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1949,11 +2004,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, IntVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void FIRST_NONZEROInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void FIRST_NONZEROIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1969,7 +2024,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1977,7 +2032,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1990,7 +2045,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::AND);
+        assertArraysEquals(r, a, b, IntVector256Tests::AND);
     }
 
     static int and(int a, int b) {
@@ -1998,7 +2053,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2009,11 +2064,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::and);
+        assertArraysEquals(r, a, b, IntVector256Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2029,7 +2084,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::AND);
     }
 
     static int AND_NOT(int a, int b) {
@@ -2037,7 +2092,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void AND_NOTInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void AND_NOTIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2050,11 +2105,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, IntVector256Tests::AND_NOT);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void AND_NOTInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void AND_NOTIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2070,7 +2125,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::AND_NOT);
     }
 
     static int OR(int a, int b) {
@@ -2078,7 +2133,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2091,7 +2146,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::OR);
+        assertArraysEquals(r, a, b, IntVector256Tests::OR);
     }
 
     static int or(int a, int b) {
@@ -2099,7 +2154,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2110,11 +2165,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::or);
+        assertArraysEquals(r, a, b, IntVector256Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2130,7 +2185,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::OR);
     }
 
     static int XOR(int a, int b) {
@@ -2138,7 +2193,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void XORInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void XORIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2151,11 +2206,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::XOR);
+        assertArraysEquals(r, a, b, IntVector256Tests::XOR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void XORInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void XORIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2171,7 +2226,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::XOR);
     }
 
     static int COMPRESS_BITS(int a, int b) {
@@ -2179,7 +2234,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void COMPRESS_BITSInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void COMPRESS_BITSIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2192,11 +2247,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, IntVector256Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void COMPRESS_BITSInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void COMPRESS_BITSIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2212,7 +2267,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::COMPRESS_BITS);
     }
 
     static int EXPAND_BITS(int a, int b) {
@@ -2220,7 +2275,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void EXPAND_BITSInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EXPAND_BITSIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2233,11 +2288,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, IntVector256Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void EXPAND_BITSInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EXPAND_BITSIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2253,11 +2308,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2267,11 +2322,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2284,11 +2339,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector256Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2298,11 +2353,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2315,11 +2370,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector256Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2329,11 +2384,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2346,11 +2401,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector256Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2362,11 +2417,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2381,11 +2436,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector256Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2395,11 +2450,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2409,11 +2464,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2426,11 +2481,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector256Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2440,11 +2495,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2454,11 +2509,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2471,11 +2526,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector256Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector256TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2485,11 +2540,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector256Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2502,11 +2557,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector256Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector256TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2516,11 +2571,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector256Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2533,7 +2588,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector256Tests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2541,7 +2596,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2554,11 +2609,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, IntVector256Tests::LSHL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2574,7 +2629,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::LSHL);
     }
 
     static int ASHR(int a, int b) {
@@ -2582,7 +2637,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2595,11 +2650,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, IntVector256Tests::ASHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2615,7 +2670,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::ASHR);
     }
 
     static int LSHR(int a, int b) {
@@ -2623,7 +2678,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2636,11 +2691,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, IntVector256Tests::LSHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2656,7 +2711,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::LSHR);
     }
 
     static int LSHL_unary(int a, int b) {
@@ -2664,7 +2719,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt256VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector256TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2676,11 +2731,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector256Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt256VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector256TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2695,7 +2750,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector256Tests::LSHL_unary);
     }
 
     static int LSHR_unary(int a, int b) {
@@ -2703,7 +2758,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt256VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector256TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2715,11 +2770,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector256Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt256VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector256TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2734,7 +2789,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector256Tests::LSHR_unary);
     }
 
     static int ASHR_unary(int a, int b) {
@@ -2742,7 +2797,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt256VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector256TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2754,11 +2809,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector256Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt256VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector256TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2773,7 +2828,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector256Tests::ASHR_unary);
     }
 
     static int ROR(int a, int b) {
@@ -2781,7 +2836,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2794,11 +2849,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::ROR);
+        assertArraysEquals(r, a, b, IntVector256Tests::ROR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2814,7 +2869,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::ROR);
     }
 
     static int ROL(int a, int b) {
@@ -2822,7 +2877,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2835,11 +2890,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::ROL);
+        assertArraysEquals(r, a, b, IntVector256Tests::ROL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2855,7 +2910,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::ROL);
     }
 
     static int ROR_unary(int a, int b) {
@@ -2863,7 +2918,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt256VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector256TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2875,11 +2930,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector256Tests::ROR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt256VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector256TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2894,7 +2949,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector256Tests::ROR_unary);
     }
 
     static int ROL_unary(int a, int b) {
@@ -2902,7 +2957,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt256VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector256TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2914,11 +2969,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector256Tests::ROL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt256VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector256TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2933,14 +2988,14 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector256Tests::ROL_unary);
     }
     static int LSHR_binary_const(int a) {
         return (int)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHRInt256VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHRIntVector256TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2951,11 +3006,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector256Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHRInt256VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHRIntVector256TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2969,7 +3024,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector256Tests::LSHR_binary_const);
     }
 
     static int LSHL_binary_const(int a) {
@@ -2977,7 +3032,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHLInt256VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHLIntVector256TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2988,11 +3043,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, IntVector256Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHLInt256VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHLIntVector256TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3006,7 +3061,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector256Tests::LSHL_binary_const);
     }
 
     static int ASHR_binary_const(int a) {
@@ -3014,7 +3069,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ASHRInt256VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ASHRIntVector256TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3025,11 +3080,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector256Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ASHRInt256VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ASHRIntVector256TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3043,7 +3098,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector256Tests::ASHR_binary_const);
     }
 
     static int ROR_binary_const(int a) {
@@ -3051,7 +3106,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void RORInt256VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void RORIntVector256TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3062,11 +3117,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, IntVector256Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void RORInt256VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void RORIntVector256TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3080,7 +3135,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector256Tests::ROR_binary_const);
     }
 
     static int ROL_binary_const(int a) {
@@ -3088,7 +3143,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ROLInt256VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ROLIntVector256TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3099,11 +3154,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, IntVector256Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ROLInt256VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ROLIntVector256TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3117,14 +3172,14 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector256Tests::ROL_binary_const);
     }
 
 
     static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MINIntVector256TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int256VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, IntVector256Tests::MIN);
     }
 
     static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void minInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void minIntVector256TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int256VectorTests::min);
+        assertArraysEquals(r, a, (int)10, IntVector256Tests::min);
     }
 
     static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINInt256VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINIntVector256TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,13 +3226,13 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int256VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, mask, IntVector256Tests::MIN);
     }
 
     static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MAXIntVector256TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3188,13 +3243,13 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int256VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, IntVector256Tests::MAX);
     }
 
     static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void maxInt256VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void maxIntVector256TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3205,13 +3260,13 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int256VectorTests::max);
+        assertArraysEquals(r, a, (int)10, IntVector256Tests::max);
     }
 
     static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXInt256VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXIntVector256TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3224,7 +3279,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int256VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, mask, IntVector256Tests::MAX);
     }
 
     static int MIN(int a, int b) {
@@ -3232,7 +3287,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3245,7 +3300,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::MIN);
+        assertArraysEquals(r, a, b, IntVector256Tests::MIN);
     }
 
     static int min(int a, int b) {
@@ -3253,7 +3308,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3264,7 +3319,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::min);
+        assertArraysEquals(r, a, b, IntVector256Tests::min);
     }
 
     static int MAX(int a, int b) {
@@ -3272,7 +3327,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3285,7 +3340,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::MAX);
+        assertArraysEquals(r, a, b, IntVector256Tests::MAX);
     }
 
     static int max(int a, int b) {
@@ -3293,7 +3348,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3304,7 +3359,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::max);
+        assertArraysEquals(r, a, b, IntVector256Tests::max);
     }
 
     static int UMIN(int a, int b) {
@@ -3312,7 +3367,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMINInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMINIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3325,11 +3380,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, IntVector256Tests::UMIN);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMINInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMINIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3345,7 +3400,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::UMIN);
     }
 
     static int UMAX(int a, int b) {
@@ -3353,7 +3408,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMAXInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMAXIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3366,11 +3421,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, IntVector256Tests::UMAX);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMAXInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMAXIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3386,7 +3441,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::UMAX);
     }
 
     static int SADD(int a, int b) {
@@ -3394,7 +3449,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SADDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SADDIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3407,11 +3462,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::SADD);
+        assertArraysEquals(r, a, b, IntVector256Tests::SADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SADDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SADDIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3427,7 +3482,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::SADD);
     }
 
     static int SSUB(int a, int b) {
@@ -3435,7 +3490,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SSUBInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SSUBIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3448,11 +3503,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, IntVector256Tests::SSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SSUBInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SSUBIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3468,7 +3523,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::SSUB);
     }
 
     static int SUADD(int a, int b) {
@@ -3476,7 +3531,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUADDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUADDIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3489,11 +3544,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, IntVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUADDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3509,7 +3564,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::SUADD);
     }
 
     static int SUSUB(int a, int b) {
@@ -3517,7 +3572,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUSUBInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUSUBIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3530,11 +3585,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, IntVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUSUBInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUSUBIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3550,11 +3605,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3564,11 +3619,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3578,11 +3633,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3592,11 +3647,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3606,10 +3661,10 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, IntVector256Tests::max);
     }
     @Test(dataProvider = "intSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SUADDAssocIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -3626,11 +3681,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Int256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, IntVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDAssocIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                      IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3651,11 +3706,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Int256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, IntVector256Tests::SUADD);
     }
 
     static int ANDReduce(int[] a, int idx) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3664,7 +3719,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAll(int[] a) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3673,32 +3728,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ANDReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void ANDReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                int v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::ANDReduce, Int256VectorTests::ANDReduceAll);
+                IntVector256Tests::ANDReduce, IntVector256Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = AND_IDENTITY;
+
+        assertEquals((int) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id & x), x);
+                assertEquals((int) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static int ANDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3708,7 +3781,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3717,34 +3790,29 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ANDReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                int v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::ANDReduceMasked, Int256VectorTests::ANDReduceAllMasked);
+                IntVector256Tests::ANDReduceMasked, IntVector256Tests::ANDReduceAllMasked);
     }
 
     static int ORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3753,7 +3821,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAll(int[] a) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3762,32 +3830,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ORReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void ORReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                int v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::ORReduce, Int256VectorTests::ORReduceAll);
+                IntVector256Tests::ORReduce, IntVector256Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = OR_IDENTITY;
+
+        assertEquals((int) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id | x), x);
+                assertEquals((int) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static int ORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3797,7 +3883,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3806,7 +3892,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ORReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3814,26 +3900,21 @@ public class Int256VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                int v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::ORReduceMasked, Int256VectorTests::ORReduceAllMasked);
+                IntVector256Tests::ORReduceMasked, IntVector256Tests::ORReduceAllMasked);
     }
 
     static int XORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3842,7 +3923,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAll(int[] a) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3851,32 +3932,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void XORReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void XORReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                int v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::XORReduce, Int256VectorTests::XORReduceAll);
+                IntVector256Tests::XORReduce, IntVector256Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = XOR_IDENTITY;
+
+        assertEquals((int) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id ^ x), x);
+                assertEquals((int) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static int XORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3886,7 +3985,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3895,7 +3994,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void XORReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3903,26 +4002,21 @@ public class Int256VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                int v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::XORReduceMasked, Int256VectorTests::XORReduceAllMasked);
+                IntVector256Tests::XORReduceMasked, IntVector256Tests::XORReduceAllMasked);
     }
 
     static int ADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3931,7 +4025,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAll(int[] a) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3940,32 +4034,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                int v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::ADDReduce, Int256VectorTests::ADDReduceAll);
+                IntVector256Tests::ADDReduce, IntVector256Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = ADD_IDENTITY;
+
+        assertEquals((int) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id + x), x);
+                assertEquals((int) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3975,7 +4087,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3984,7 +4096,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3992,26 +4104,21 @@ public class Int256VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                int v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::ADDReduceMasked, Int256VectorTests::ADDReduceAllMasked);
+                IntVector256Tests::ADDReduceMasked, IntVector256Tests::ADDReduceAllMasked);
     }
 
     static int MULReduce(int[] a, int idx) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4020,7 +4127,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAll(int[] a) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4029,32 +4136,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MULReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void MULReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                int v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::MULReduce, Int256VectorTests::MULReduceAll);
+                IntVector256Tests::MULReduce, IntVector256Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MUL_IDENTITY;
+
+        assertEquals((int) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id * x), x);
+                assertEquals((int) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4064,7 +4189,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4073,34 +4198,29 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MULReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                int v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::MULReduceMasked, Int256VectorTests::MULReduceAllMasked);
+                IntVector256Tests::MULReduceMasked, IntVector256Tests::MULReduceAllMasked);
     }
 
     static int MINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.min(res, a[i]);
         }
@@ -4109,7 +4229,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduce(a, i));
         }
@@ -4118,32 +4238,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void MINReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                int v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::MINReduce, Int256VectorTests::MINReduceAll);
+                IntVector256Tests::MINReduce, IntVector256Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MIN_IDENTITY;
+
+        assertEquals((int) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.min(id, x), x);
+                assertEquals((int) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.min(res, a[i]);
@@ -4153,7 +4291,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4162,34 +4300,29 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                int v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::MINReduceMasked, Int256VectorTests::MINReduceAllMasked);
+                IntVector256Tests::MINReduceMasked, IntVector256Tests::MINReduceAllMasked);
     }
 
     static int MAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.max(res, a[i]);
         }
@@ -4198,7 +4331,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduce(a, i));
         }
@@ -4207,32 +4340,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void MAXReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                int v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::MAXReduce, Int256VectorTests::MAXReduceAll);
+                IntVector256Tests::MAXReduce, IntVector256Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MAX_IDENTITY;
+
+        assertEquals((int) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.max(id, x), x);
+                assertEquals((int) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.max(res, a[i]);
@@ -4242,7 +4393,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4251,34 +4402,29 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                int v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::MAXReduceMasked, Int256VectorTests::MAXReduceAllMasked);
+                IntVector256Tests::MAXReduceMasked, IntVector256Tests::MAXReduceAllMasked);
     }
 
     static int UMINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4287,7 +4433,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4296,32 +4442,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMINReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void UMINReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                int v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::UMINReduce, Int256VectorTests::UMINReduceAll);
+                IntVector256Tests::UMINReduce, IntVector256Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMIN_IDENTITY;
+
+        assertEquals((int) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.minUnsigned(id, x), x);
+                assertEquals((int) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static int UMINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.minUnsigned(res, a[i]);
@@ -4331,7 +4495,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4340,34 +4504,29 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMINReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                int v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::UMINReduceMasked, Int256VectorTests::UMINReduceAllMasked);
+                IntVector256Tests::UMINReduceMasked, IntVector256Tests::UMINReduceAllMasked);
     }
 
     static int UMAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4376,7 +4535,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4385,32 +4544,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMAXReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void UMAXReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                int v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::UMAXReduce, Int256VectorTests::UMAXReduceAll);
+                IntVector256Tests::UMAXReduce, IntVector256Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMAX_IDENTITY;
+
+        assertEquals((int) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((int) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static int UMAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.maxUnsigned(res, a[i]);
@@ -4420,7 +4597,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4429,34 +4606,29 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMAXReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                int v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::UMAXReduceMasked, Int256VectorTests::UMAXReduceAllMasked);
+                IntVector256Tests::UMAXReduceMasked, IntVector256Tests::UMAXReduceAllMasked);
     }
 
     static int FIRST_NONZEROReduce(int[] a, int idx) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4465,7 +4637,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAll(int[] a) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4474,32 +4646,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void FIRST_NONZEROReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void FIRST_NONZEROReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::FIRST_NONZEROReduce, Int256VectorTests::FIRST_NONZEROReduceAll);
+                IntVector256Tests::FIRST_NONZEROReduce, IntVector256Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static int FIRST_NONZEROReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4509,7 +4699,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAllMasked(int[] a, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4518,30 +4708,25 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::FIRST_NONZEROReduceMasked, Int256VectorTests::FIRST_NONZEROReduceAllMasked);
+                IntVector256Tests::FIRST_NONZEROReduceMasked, IntVector256Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4554,7 +4739,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueInt256VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueIntVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4565,7 +4750,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector256Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4578,7 +4763,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueInt256VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueIntVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4589,11 +4774,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector256Tests::allTrue);
     }
 
     static int SUADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4602,7 +4787,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAll(int[] a) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4611,32 +4796,50 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingUnaryOpProvider")
-    static void SUADDReduceInt256VectorTests(IntFunction<int[]> fa) {
+    static void SUADDReduceIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                int v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int256VectorTests::SUADDReduce, Int256VectorTests::SUADDReduceAll);
+                IntVector256Tests::SUADDReduce, IntVector256Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "intSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = SUADD_IDENTITY;
+
+        assertEquals((int) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static int SUADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4646,7 +4849,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4654,7 +4857,7 @@ public class Int256VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "intSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4662,26 +4865,21 @@ public class Int256VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                int v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::SUADDReduceMasked, Int256VectorTests::SUADDReduceAllMasked);
+                IntVector256Tests::SUADDReduceMasked, IntVector256Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void withInt256VectorTests(IntFunction<int []> fa, IntFunction<int []> fb) {
+    static void withIntVector256Tests(IntFunction<int []> fa, IntFunction<int []> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -4704,7 +4902,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_DEFAULTInt256VectorTests(IntFunction<int[]> fa) {
+    static void IS_DEFAULTIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4714,14 +4912,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedIntVector256Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4734,7 +4932,7 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4745,7 +4943,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_NEGATIVEInt256VectorTests(IntFunction<int[]> fa) {
+    static void IS_NEGATIVEIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4755,14 +4953,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedIntVector256Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4775,14 +4973,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4794,14 +4992,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4813,14 +5011,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LTIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4836,14 +5034,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GTInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GTIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4855,14 +5053,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GTInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GTIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4878,14 +5076,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4897,14 +5095,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4916,14 +5114,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EQIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4939,14 +5137,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void NEInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void NEIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4958,14 +5156,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void NEInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void NEIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4981,14 +5179,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LEInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LEIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5000,14 +5198,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LEInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LEIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5023,14 +5221,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GEInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GEIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5042,14 +5240,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GEInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GEIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5065,14 +5263,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULTInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULTIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5084,14 +5282,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULTInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULTIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5107,14 +5305,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGTInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGTIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5126,14 +5324,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGTInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGTIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5149,14 +5347,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULEInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULEIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5168,14 +5366,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULEInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULEIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5191,14 +5389,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGEInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGEIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5210,14 +5408,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGEInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGEIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5233,14 +5431,14 @@ public class Int256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5250,13 +5448,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5270,13 +5468,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector256TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5286,13 +5484,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5306,13 +5504,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5322,13 +5520,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5342,13 +5540,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector256TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5358,13 +5556,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5378,7 +5576,7 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
             }
         }
     }
@@ -5388,7 +5586,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5404,11 +5602,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, IntVector256Tests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void RearrangeInt256VectorTests(IntFunction<int[]> fa,
+    static void RearrangeIntVector256Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5425,7 +5623,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void RearrangeInt256VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void RearrangeIntVector256TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -5443,7 +5641,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void compressInt256VectorTests(IntFunction<int[]> fa,
+    static void compressIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5461,7 +5659,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void expandInt256VectorTests(IntFunction<int[]> fa,
+    static void expandIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5479,7 +5677,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void getInt256VectorTests(IntFunction<int[]> fa) {
+    static void getIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -5635,7 +5833,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastInt256VectorTests(IntFunction<int[]> fa) {
+    static void BroadcastIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5649,7 +5847,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZeroInt256VectorTests(IntFunction<int[]> fa) {
+    static void ZeroIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5659,7 +5857,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static int[] sliceUnary(int[] a, int origin, int idx) {
@@ -5674,7 +5872,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void sliceUnaryInt256VectorTests(IntFunction<int[]> fa) {
+    static void sliceUnaryIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5685,7 +5883,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, IntVector256Tests::sliceUnary);
     }
 
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
@@ -5702,7 +5900,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void sliceBinaryInt256VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void sliceBinaryIntVector256TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5715,7 +5913,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Int256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, IntVector256Tests::sliceBinary);
     }
 
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
@@ -5732,7 +5930,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void sliceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void sliceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5749,7 +5947,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Int256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, IntVector256Tests::slice);
     }
 
     static int[] unsliceUnary(int[] a, int origin, int idx) {
@@ -5766,7 +5964,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void unsliceUnaryInt256VectorTests(IntFunction<int[]> fa) {
+    static void unsliceUnaryIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5777,7 +5975,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, IntVector256Tests::unsliceUnary);
     }
 
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
@@ -5803,7 +6001,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void unsliceBinaryInt256VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void unsliceBinaryIntVector256TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5817,7 +6015,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Int256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, IntVector256Tests::unsliceBinary);
     }
 
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5857,7 +6055,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void unsliceInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void unsliceIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5874,7 +6072,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Int256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, IntVector256Tests::unslice);
     }
 
     static int BITWISE_BLEND(int a, int b, int c) {
@@ -5886,7 +6084,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5901,11 +6099,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5918,11 +6116,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, IntVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5940,11 +6138,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5955,11 +6153,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt256VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector256TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5970,11 +6168,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt256VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector256TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6019,11 +6217,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector256TestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6038,11 +6236,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt256VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector256TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6053,11 +6251,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt256VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector256TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6068,11 +6266,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector256TestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6086,7 +6284,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntVector256Tests::BITWISE_BLEND);
     }
 
     static int NEG(int a) {
@@ -6098,7 +6296,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NEGInt256VectorTests(IntFunction<int[]> fa) {
+    static void NEGIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6109,11 +6307,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::NEG);
+        assertArraysEquals(r, a, IntVector256Tests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void negInt256VectorTests(IntFunction<int[]> fa) {
+    static void negIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6124,11 +6322,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::neg);
+        assertArraysEquals(r, a, IntVector256Tests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NEGMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void NEGMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6142,7 +6340,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, IntVector256Tests::NEG);
     }
 
     static int ABS(int a) {
@@ -6154,7 +6352,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ABSInt256VectorTests(IntFunction<int[]> fa) {
+    static void ABSIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6165,11 +6363,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::ABS);
+        assertArraysEquals(r, a, IntVector256Tests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void absInt256VectorTests(IntFunction<int[]> fa) {
+    static void absIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6180,11 +6378,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::abs);
+        assertArraysEquals(r, a, IntVector256Tests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ABSMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void ABSMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6198,7 +6396,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, IntVector256Tests::ABS);
     }
 
     static int NOT(int a) {
@@ -6210,7 +6408,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NOTInt256VectorTests(IntFunction<int[]> fa) {
+    static void NOTIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6221,11 +6419,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::NOT);
+        assertArraysEquals(r, a, IntVector256Tests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void notInt256VectorTests(IntFunction<int[]> fa) {
+    static void notIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6236,11 +6434,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::not);
+        assertArraysEquals(r, a, IntVector256Tests::not);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NOTMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void NOTMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6254,7 +6452,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, IntVector256Tests::NOT);
     }
 
     static int ZOMO(int a) {
@@ -6262,7 +6460,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZOMOInt256VectorTests(IntFunction<int[]> fa) {
+    static void ZOMOIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6273,11 +6471,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::ZOMO);
+        assertArraysEquals(r, a, IntVector256Tests::ZOMO);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ZOMOMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void ZOMOMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6291,7 +6489,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, IntVector256Tests::ZOMO);
     }
 
     static int BIT_COUNT(int a) {
@@ -6299,7 +6497,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BIT_COUNTInt256VectorTests(IntFunction<int[]> fa) {
+    static void BIT_COUNTIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6310,11 +6508,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, IntVector256Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void BIT_COUNTMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6328,7 +6526,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, IntVector256Tests::BIT_COUNT);
     }
 
     static int TRAILING_ZEROS_COUNT(int a) {
@@ -6336,7 +6534,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTInt256VectorTests(IntFunction<int[]> fa) {
+    static void TRAILING_ZEROS_COUNTIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6347,11 +6545,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6365,7 +6563,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     static int LEADING_ZEROS_COUNT(int a) {
@@ -6373,7 +6571,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTInt256VectorTests(IntFunction<int[]> fa) {
+    static void LEADING_ZEROS_COUNTIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6384,11 +6582,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6402,7 +6600,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     static int REVERSE(int a) {
@@ -6410,7 +6608,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSEInt256VectorTests(IntFunction<int[]> fa) {
+    static void REVERSEIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6421,11 +6619,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::REVERSE);
+        assertArraysEquals(r, a, IntVector256Tests::REVERSE);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSEMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void REVERSEMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6439,7 +6637,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, IntVector256Tests::REVERSE);
     }
 
     static int REVERSE_BYTES(int a) {
@@ -6447,7 +6645,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSE_BYTESInt256VectorTests(IntFunction<int[]> fa) {
+    static void REVERSE_BYTESIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6458,11 +6656,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, IntVector256Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedInt256VectorTests(IntFunction<int[]> fa,
+    static void REVERSE_BYTESMaskedIntVector256Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6476,7 +6674,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, IntVector256Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6484,7 +6682,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandIntVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6497,7 +6695,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::band);
+        assertArraysEquals(r, a, b, IntVector256Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6505,7 +6703,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorIntVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6518,7 +6716,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::bor);
+        assertArraysEquals(r, a, b, IntVector256Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6526,7 +6724,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorIntVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6539,7 +6737,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::bxor);
+        assertArraysEquals(r, a, b, IntVector256Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6547,7 +6745,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotIntVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6560,7 +6758,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::bandNot);
+        assertArraysEquals(r, a, b, IntVector256Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6568,7 +6766,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqIntVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6581,7 +6779,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int256VectorTests::beq);
+        assertArraysEquals(r, a, b, IntVector256Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6589,7 +6787,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotInt256VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotIntVector256Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6600,7 +6798,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int256VectorTests::unot);
+        assertArraysEquals(r, a, IntVector256Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6609,15 +6807,15 @@ public class Int256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt256VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongIntVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6631,7 +6829,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt256VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector256TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6641,13 +6839,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt256VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector256TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6657,13 +6855,13 @@ public class Int256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toIntArrayInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toIntArrayIntVector256TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6674,7 +6872,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toLongArrayInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toLongArrayIntVector256TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6685,7 +6883,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toDoubleArrayInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toDoubleArrayIntVector256TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6696,7 +6894,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toStringInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toStringIntVector256TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6709,7 +6907,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void hashCodeInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void hashCodeIntVector256TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6742,7 +6940,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceLongInt256VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceLongIntVector256Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6758,7 +6956,7 @@ public class Int256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Int256VectorTests::ADDReduceLong, Int256VectorTests::ADDReduceAllLong);
+                IntVector256Tests::ADDReduceLong, IntVector256Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(int[] a, int idx, boolean[] mask) {
@@ -6781,7 +6979,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceLongInt256VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongIntVector256TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6799,11 +6997,11 @@ public class Int256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Int256VectorTests::ADDReduceLongMasked, Int256VectorTests::ADDReduceAllLongMasked);
+                IntVector256Tests::ADDReduceLongMasked, IntVector256Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastLongInt256VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void BroadcastLongIntVector256TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6814,7 +7012,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt256VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector256TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6828,12 +7026,12 @@ public class Int256VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector256Tests::blend);
     }
 
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void SelectFromInt256VectorTests(IntFunction<int[]> fa,
+    static void SelectFromIntVector256Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -6849,7 +7047,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorInt256VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SelectFromTwoVectorIntVector256Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] idx = fc.apply(SPECIES.length());
@@ -6867,7 +7065,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void SelectFromInt256VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void SelectFromIntVector256TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                            BiFunction<Integer,Integer,int[]> fs,
                                                            IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -6886,7 +7084,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousInt256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousIntVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6897,12 +7095,12 @@ public class Int256VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringInt256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringIntVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6916,7 +7114,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsInt256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsIntVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6925,12 +7123,12 @@ public class Int256VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsInt256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsIntVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6940,13 +7138,13 @@ public class Int256VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeIntVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6968,7 +7166,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountIntVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6979,7 +7177,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int256VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, IntVector256Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6993,7 +7191,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueIntVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7004,7 +7202,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int256VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector256Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -7018,7 +7216,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueIntVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7029,11 +7227,11 @@ public class Int256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int256VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector256Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressInt256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressIntVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7043,7 +7241,7 @@ public class Int256VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7061,7 +7259,7 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeInt256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeIntVector256TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7069,13 +7267,13 @@ public class Int256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongInt256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongIntVector256TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7083,7 +7281,7 @@ public class Int256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7102,36 +7300,36 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundInt256VectorTestsSmokeTest(int length) {
+    static void loopBoundIntVector256TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongInt256VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongIntVector256TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeInt256VectorTestsSmokeTest() {
+    static void ElementSizeIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Integer.SIZE);
+        assertEquals(elsize, Integer.SIZE);
     }
 
     @Test
-    static void VectorShapeInt256VectorTestsSmokeTest() {
+    static void VectorShapeIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_256_BIT));
     }
 
     @Test
-    static void ShapeWithLanesInt256VectorTestsSmokeTest() {
+    static void ShapeWithLanesIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(int.class);
@@ -7139,32 +7337,32 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeInt256VectorTestsSmokeTest() {
+    static void ElementTypeIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementType() == int.class);
     }
 
     @Test
-    static void SpeciesElementSizeInt256VectorTestsSmokeTest() {
+    static void SpeciesElementSizeIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementSize() == Integer.SIZE);
     }
 
     @Test
-    static void VectorTypeInt256VectorTestsSmokeTest() {
+    static void VectorTypeIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesInt256VectorTestsSmokeTest() {
+    static void WithLanesIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(int.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeInt256VectorTestsSmokeTest() {
+    static void WithShapeIntVector256TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7172,9 +7370,9 @@ public class Int256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueInt256VectorTestsSmokeTest() {
+    static void MaskAllTrueIntVector256TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntVector512LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/IntVector512LoadStoreTests.java
index 4c4ab6c4bc5..189a5540f7d 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector512LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Int512VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation IntVector512LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class IntVector512LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_512;
 
@@ -61,14 +61,29 @@ public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(int[] r, int[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Int512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Int512VectorTests.java b/test/jdk/jdk/incubator/vector/IntVector512Tests.java
similarity index 78%
rename from test/jdk/jdk/incubator/vector/Int512VectorTests.java
rename to test/jdk/jdk/incubator/vector/IntVector512Tests.java
index 932d9ee4487..468d3b15efe 100644
--- a/test/jdk/jdk/incubator/vector/Int512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector512Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Int512VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation IntVector512Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Int512VectorTests extends AbstractVectorTest {
+public class IntVector512Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(int actual, int expected, int delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(int actual, int expected, int delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final int CONST_SHIFT = Integer.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final int ADD_IDENTITY = (int)0;
+    private static final int AND_IDENTITY = (int)-1;
+    private static final int FIRST_NONZERO_IDENTITY = (int)0;
+    private static final int MAX_IDENTITY = Integer.MIN_VALUE;
+    private static final int MIN_IDENTITY = Integer.MAX_VALUE;
+    private static final int MUL_IDENTITY = (int)1;
+    private static final int OR_IDENTITY = (int)0;
+    private static final int SUADD_IDENTITY = (int)0;
+    private static final int UMAX_IDENTITY = (int)0;   // Minimum unsigned value
+    private static final int UMIN_IDENTITY = (int)-1;  // Maximum unsigned value
+    private static final int XOR_IDENTITY = (int)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
     static void assertArraysStrictlyEquals(int[] r, int[] a) {
@@ -84,10 +139,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Int512VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Int512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Int512VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Int512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Int512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (int)0);
+                    assertEquals(r[i + k], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Int512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (int)0);
+                        assertEquals(r[i + j], (int)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Int512VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Int512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Int512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Int512VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Int512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1531,7 +1586,7 @@ public class Int512VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         IntVector a = io.add((int)1); //[1,2]
         IntVector b = a.neg();  //[-1,-2]
         int[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1546,19 +1601,19 @@ public class Int512VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Integer> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Integer> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         IntVector uab0 = zab0.rearrange(unz0,zab1);
         IntVector uab1 = zab0.rearrange(unz1,zab1);
         int[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1573,7 +1628,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1581,9 +1636,9 @@ public class Int512VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1612,7 +1667,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1625,7 +1680,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::ADD);
+        assertArraysEquals(r, a, b, IntVector512Tests::ADD);
     }
 
     static int add(int a, int b) {
@@ -1633,7 +1688,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1644,11 +1699,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::add);
+        assertArraysEquals(r, a, b, IntVector512Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1664,11 +1719,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1682,7 +1737,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::add);
     }
 
     static int SUB(int a, int b) {
@@ -1690,7 +1745,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void SUBInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUBIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1703,7 +1758,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::SUB);
+        assertArraysEquals(r, a, b, IntVector512Tests::SUB);
     }
 
     static int sub(int a, int b) {
@@ -1711,7 +1766,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1722,11 +1777,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::sub);
+        assertArraysEquals(r, a, b, IntVector512Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void SUBInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUBIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1742,11 +1797,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1760,7 +1815,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::sub);
     }
 
     static int MUL(int a, int b) {
@@ -1768,7 +1823,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MULInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MULIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1781,7 +1836,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::MUL);
+        assertArraysEquals(r, a, b, IntVector512Tests::MUL);
     }
 
     static int mul(int a, int b) {
@@ -1789,7 +1844,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1800,11 +1855,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::mul);
+        assertArraysEquals(r, a, b, IntVector512Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void MULInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void MULIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1820,11 +1875,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1838,7 +1893,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::mul);
     }
 
     static int DIV(int a, int b) {
@@ -1846,7 +1901,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void DIVInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void DIVIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1861,7 +1916,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::DIV);
+        assertArraysEquals(r, a, b, IntVector512Tests::DIV);
     }
 
     static int div(int a, int b) {
@@ -1869,7 +1924,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1884,11 +1939,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::div);
+        assertArraysEquals(r, a, b, IntVector512Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void DIVInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void DIVIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1906,11 +1961,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1928,7 +1983,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1936,7 +1991,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void FIRST_NONZEROInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void FIRST_NONZEROIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1949,11 +2004,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, IntVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void FIRST_NONZEROInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void FIRST_NONZEROIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1969,7 +2024,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1977,7 +2032,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1990,7 +2045,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::AND);
+        assertArraysEquals(r, a, b, IntVector512Tests::AND);
     }
 
     static int and(int a, int b) {
@@ -1998,7 +2053,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2009,11 +2064,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::and);
+        assertArraysEquals(r, a, b, IntVector512Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2029,7 +2084,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::AND);
     }
 
     static int AND_NOT(int a, int b) {
@@ -2037,7 +2092,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void AND_NOTInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void AND_NOTIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2050,11 +2105,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, IntVector512Tests::AND_NOT);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void AND_NOTInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void AND_NOTIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2070,7 +2125,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::AND_NOT);
     }
 
     static int OR(int a, int b) {
@@ -2078,7 +2133,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2091,7 +2146,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::OR);
+        assertArraysEquals(r, a, b, IntVector512Tests::OR);
     }
 
     static int or(int a, int b) {
@@ -2099,7 +2154,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2110,11 +2165,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::or);
+        assertArraysEquals(r, a, b, IntVector512Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2130,7 +2185,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::OR);
     }
 
     static int XOR(int a, int b) {
@@ -2138,7 +2193,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void XORInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void XORIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2151,11 +2206,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::XOR);
+        assertArraysEquals(r, a, b, IntVector512Tests::XOR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void XORInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void XORIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2171,7 +2226,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::XOR);
     }
 
     static int COMPRESS_BITS(int a, int b) {
@@ -2179,7 +2234,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void COMPRESS_BITSInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void COMPRESS_BITSIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2192,11 +2247,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, IntVector512Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void COMPRESS_BITSInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void COMPRESS_BITSIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2212,7 +2267,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::COMPRESS_BITS);
     }
 
     static int EXPAND_BITS(int a, int b) {
@@ -2220,7 +2275,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void EXPAND_BITSInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EXPAND_BITSIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2233,11 +2288,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, IntVector512Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void EXPAND_BITSInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EXPAND_BITSIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2253,11 +2308,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2267,11 +2322,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2284,11 +2339,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector512Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2298,11 +2353,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2315,11 +2370,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector512Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2329,11 +2384,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2346,11 +2401,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector512Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2362,11 +2417,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2381,11 +2436,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector512Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2395,11 +2450,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2409,11 +2464,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2426,11 +2481,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector512Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2440,11 +2495,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2454,11 +2509,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2471,11 +2526,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector512Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector512TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2485,11 +2540,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector512Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2502,11 +2557,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector512Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector512TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2516,11 +2571,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector512Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2533,7 +2588,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector512Tests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2541,7 +2596,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2554,11 +2609,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, IntVector512Tests::LSHL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2574,7 +2629,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::LSHL);
     }
 
     static int ASHR(int a, int b) {
@@ -2582,7 +2637,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2595,11 +2650,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, IntVector512Tests::ASHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2615,7 +2670,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::ASHR);
     }
 
     static int LSHR(int a, int b) {
@@ -2623,7 +2678,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2636,11 +2691,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, IntVector512Tests::LSHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2656,7 +2711,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::LSHR);
     }
 
     static int LSHL_unary(int a, int b) {
@@ -2664,7 +2719,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt512VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector512TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2676,11 +2731,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector512Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt512VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector512TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2695,7 +2750,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector512Tests::LSHL_unary);
     }
 
     static int LSHR_unary(int a, int b) {
@@ -2703,7 +2758,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt512VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector512TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2715,11 +2770,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector512Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt512VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector512TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2734,7 +2789,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector512Tests::LSHR_unary);
     }
 
     static int ASHR_unary(int a, int b) {
@@ -2742,7 +2797,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt512VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector512TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2754,11 +2809,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector512Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt512VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector512TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2773,7 +2828,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector512Tests::ASHR_unary);
     }
 
     static int ROR(int a, int b) {
@@ -2781,7 +2836,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2794,11 +2849,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::ROR);
+        assertArraysEquals(r, a, b, IntVector512Tests::ROR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2814,7 +2869,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::ROR);
     }
 
     static int ROL(int a, int b) {
@@ -2822,7 +2877,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2835,11 +2890,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::ROL);
+        assertArraysEquals(r, a, b, IntVector512Tests::ROL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2855,7 +2910,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::ROL);
     }
 
     static int ROR_unary(int a, int b) {
@@ -2863,7 +2918,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt512VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector512TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2875,11 +2930,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector512Tests::ROR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt512VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector512TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2894,7 +2949,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector512Tests::ROR_unary);
     }
 
     static int ROL_unary(int a, int b) {
@@ -2902,7 +2957,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt512VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector512TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2914,11 +2969,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector512Tests::ROL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt512VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector512TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2933,14 +2988,14 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector512Tests::ROL_unary);
     }
     static int LSHR_binary_const(int a) {
         return (int)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHRInt512VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHRIntVector512TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2951,11 +3006,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector512Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHRInt512VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHRIntVector512TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2969,7 +3024,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector512Tests::LSHR_binary_const);
     }
 
     static int LSHL_binary_const(int a) {
@@ -2977,7 +3032,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHLInt512VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHLIntVector512TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2988,11 +3043,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, IntVector512Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHLInt512VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHLIntVector512TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3006,7 +3061,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector512Tests::LSHL_binary_const);
     }
 
     static int ASHR_binary_const(int a) {
@@ -3014,7 +3069,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ASHRInt512VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ASHRIntVector512TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3025,11 +3080,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector512Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ASHRInt512VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ASHRIntVector512TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3043,7 +3098,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector512Tests::ASHR_binary_const);
     }
 
     static int ROR_binary_const(int a) {
@@ -3051,7 +3106,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void RORInt512VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void RORIntVector512TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3062,11 +3117,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, IntVector512Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void RORInt512VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void RORIntVector512TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3080,7 +3135,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector512Tests::ROR_binary_const);
     }
 
     static int ROL_binary_const(int a) {
@@ -3088,7 +3143,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ROLInt512VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ROLIntVector512TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3099,11 +3154,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, IntVector512Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ROLInt512VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ROLIntVector512TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3117,14 +3172,14 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector512Tests::ROL_binary_const);
     }
 
 
     static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MINIntVector512TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int512VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, IntVector512Tests::MIN);
     }
 
     static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void minInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void minIntVector512TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int512VectorTests::min);
+        assertArraysEquals(r, a, (int)10, IntVector512Tests::min);
     }
 
     static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINInt512VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINIntVector512TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,13 +3226,13 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int512VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, mask, IntVector512Tests::MIN);
     }
 
     static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MAXIntVector512TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3188,13 +3243,13 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int512VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, IntVector512Tests::MAX);
     }
 
     static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void maxInt512VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void maxIntVector512TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3205,13 +3260,13 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int512VectorTests::max);
+        assertArraysEquals(r, a, (int)10, IntVector512Tests::max);
     }
 
     static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXInt512VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXIntVector512TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3224,7 +3279,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int512VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, mask, IntVector512Tests::MAX);
     }
 
     static int MIN(int a, int b) {
@@ -3232,7 +3287,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3245,7 +3300,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::MIN);
+        assertArraysEquals(r, a, b, IntVector512Tests::MIN);
     }
 
     static int min(int a, int b) {
@@ -3253,7 +3308,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3264,7 +3319,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::min);
+        assertArraysEquals(r, a, b, IntVector512Tests::min);
     }
 
     static int MAX(int a, int b) {
@@ -3272,7 +3327,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3285,7 +3340,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::MAX);
+        assertArraysEquals(r, a, b, IntVector512Tests::MAX);
     }
 
     static int max(int a, int b) {
@@ -3293,7 +3348,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3304,7 +3359,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::max);
+        assertArraysEquals(r, a, b, IntVector512Tests::max);
     }
 
     static int UMIN(int a, int b) {
@@ -3312,7 +3367,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMINInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMINIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3325,11 +3380,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, IntVector512Tests::UMIN);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMINInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMINIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3345,7 +3400,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::UMIN);
     }
 
     static int UMAX(int a, int b) {
@@ -3353,7 +3408,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMAXInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMAXIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3366,11 +3421,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, IntVector512Tests::UMAX);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMAXInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMAXIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3386,7 +3441,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::UMAX);
     }
 
     static int SADD(int a, int b) {
@@ -3394,7 +3449,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SADDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SADDIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3407,11 +3462,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::SADD);
+        assertArraysEquals(r, a, b, IntVector512Tests::SADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SADDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SADDIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3427,7 +3482,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::SADD);
     }
 
     static int SSUB(int a, int b) {
@@ -3435,7 +3490,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SSUBInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SSUBIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3448,11 +3503,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, IntVector512Tests::SSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SSUBInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SSUBIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3468,7 +3523,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::SSUB);
     }
 
     static int SUADD(int a, int b) {
@@ -3476,7 +3531,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUADDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUADDIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3489,11 +3544,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, IntVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUADDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3509,7 +3564,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::SUADD);
     }
 
     static int SUSUB(int a, int b) {
@@ -3517,7 +3572,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUSUBInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUSUBIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3530,11 +3585,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, IntVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUSUBInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUSUBIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3550,11 +3605,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3564,11 +3619,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3578,11 +3633,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3592,11 +3647,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3606,10 +3661,10 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, IntVector512Tests::max);
     }
     @Test(dataProvider = "intSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SUADDAssocIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -3626,11 +3681,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Int512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, IntVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDAssocIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                      IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3651,11 +3706,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Int512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, IntVector512Tests::SUADD);
     }
 
     static int ANDReduce(int[] a, int idx) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3664,7 +3719,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAll(int[] a) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3673,32 +3728,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ANDReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void ANDReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                int v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::ANDReduce, Int512VectorTests::ANDReduceAll);
+                IntVector512Tests::ANDReduce, IntVector512Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = AND_IDENTITY;
+
+        assertEquals((int) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id & x), x);
+                assertEquals((int) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static int ANDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3708,7 +3781,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3717,34 +3790,29 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ANDReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                int v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::ANDReduceMasked, Int512VectorTests::ANDReduceAllMasked);
+                IntVector512Tests::ANDReduceMasked, IntVector512Tests::ANDReduceAllMasked);
     }
 
     static int ORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3753,7 +3821,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAll(int[] a) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3762,32 +3830,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ORReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void ORReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                int v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::ORReduce, Int512VectorTests::ORReduceAll);
+                IntVector512Tests::ORReduce, IntVector512Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = OR_IDENTITY;
+
+        assertEquals((int) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id | x), x);
+                assertEquals((int) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static int ORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3797,7 +3883,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3806,7 +3892,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ORReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3814,26 +3900,21 @@ public class Int512VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                int v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::ORReduceMasked, Int512VectorTests::ORReduceAllMasked);
+                IntVector512Tests::ORReduceMasked, IntVector512Tests::ORReduceAllMasked);
     }
 
     static int XORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3842,7 +3923,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAll(int[] a) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3851,32 +3932,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void XORReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void XORReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                int v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::XORReduce, Int512VectorTests::XORReduceAll);
+                IntVector512Tests::XORReduce, IntVector512Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = XOR_IDENTITY;
+
+        assertEquals((int) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id ^ x), x);
+                assertEquals((int) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static int XORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3886,7 +3985,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3895,7 +3994,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void XORReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3903,26 +4002,21 @@ public class Int512VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                int v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::XORReduceMasked, Int512VectorTests::XORReduceAllMasked);
+                IntVector512Tests::XORReduceMasked, IntVector512Tests::XORReduceAllMasked);
     }
 
     static int ADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3931,7 +4025,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAll(int[] a) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3940,32 +4034,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                int v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::ADDReduce, Int512VectorTests::ADDReduceAll);
+                IntVector512Tests::ADDReduce, IntVector512Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = ADD_IDENTITY;
+
+        assertEquals((int) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id + x), x);
+                assertEquals((int) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3975,7 +4087,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3984,7 +4096,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3992,26 +4104,21 @@ public class Int512VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                int v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::ADDReduceMasked, Int512VectorTests::ADDReduceAllMasked);
+                IntVector512Tests::ADDReduceMasked, IntVector512Tests::ADDReduceAllMasked);
     }
 
     static int MULReduce(int[] a, int idx) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4020,7 +4127,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAll(int[] a) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4029,32 +4136,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MULReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void MULReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                int v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::MULReduce, Int512VectorTests::MULReduceAll);
+                IntVector512Tests::MULReduce, IntVector512Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MUL_IDENTITY;
+
+        assertEquals((int) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id * x), x);
+                assertEquals((int) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4064,7 +4189,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4073,34 +4198,29 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MULReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                int v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::MULReduceMasked, Int512VectorTests::MULReduceAllMasked);
+                IntVector512Tests::MULReduceMasked, IntVector512Tests::MULReduceAllMasked);
     }
 
     static int MINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.min(res, a[i]);
         }
@@ -4109,7 +4229,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduce(a, i));
         }
@@ -4118,32 +4238,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void MINReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                int v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::MINReduce, Int512VectorTests::MINReduceAll);
+                IntVector512Tests::MINReduce, IntVector512Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MIN_IDENTITY;
+
+        assertEquals((int) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.min(id, x), x);
+                assertEquals((int) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.min(res, a[i]);
@@ -4153,7 +4291,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4162,34 +4300,29 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                int v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::MINReduceMasked, Int512VectorTests::MINReduceAllMasked);
+                IntVector512Tests::MINReduceMasked, IntVector512Tests::MINReduceAllMasked);
     }
 
     static int MAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.max(res, a[i]);
         }
@@ -4198,7 +4331,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduce(a, i));
         }
@@ -4207,32 +4340,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void MAXReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                int v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::MAXReduce, Int512VectorTests::MAXReduceAll);
+                IntVector512Tests::MAXReduce, IntVector512Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MAX_IDENTITY;
+
+        assertEquals((int) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.max(id, x), x);
+                assertEquals((int) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.max(res, a[i]);
@@ -4242,7 +4393,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4251,34 +4402,29 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                int v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::MAXReduceMasked, Int512VectorTests::MAXReduceAllMasked);
+                IntVector512Tests::MAXReduceMasked, IntVector512Tests::MAXReduceAllMasked);
     }
 
     static int UMINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4287,7 +4433,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4296,32 +4442,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMINReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void UMINReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                int v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::UMINReduce, Int512VectorTests::UMINReduceAll);
+                IntVector512Tests::UMINReduce, IntVector512Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMIN_IDENTITY;
+
+        assertEquals((int) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.minUnsigned(id, x), x);
+                assertEquals((int) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static int UMINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.minUnsigned(res, a[i]);
@@ -4331,7 +4495,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4340,34 +4504,29 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMINReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                int v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::UMINReduceMasked, Int512VectorTests::UMINReduceAllMasked);
+                IntVector512Tests::UMINReduceMasked, IntVector512Tests::UMINReduceAllMasked);
     }
 
     static int UMAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4376,7 +4535,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4385,32 +4544,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMAXReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void UMAXReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                int v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::UMAXReduce, Int512VectorTests::UMAXReduceAll);
+                IntVector512Tests::UMAXReduce, IntVector512Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMAX_IDENTITY;
+
+        assertEquals((int) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((int) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static int UMAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.maxUnsigned(res, a[i]);
@@ -4420,7 +4597,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4429,34 +4606,29 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMAXReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                int v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::UMAXReduceMasked, Int512VectorTests::UMAXReduceAllMasked);
+                IntVector512Tests::UMAXReduceMasked, IntVector512Tests::UMAXReduceAllMasked);
     }
 
     static int FIRST_NONZEROReduce(int[] a, int idx) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4465,7 +4637,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAll(int[] a) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4474,32 +4646,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void FIRST_NONZEROReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void FIRST_NONZEROReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::FIRST_NONZEROReduce, Int512VectorTests::FIRST_NONZEROReduceAll);
+                IntVector512Tests::FIRST_NONZEROReduce, IntVector512Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static int FIRST_NONZEROReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4509,7 +4699,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAllMasked(int[] a, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4518,30 +4708,25 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::FIRST_NONZEROReduceMasked, Int512VectorTests::FIRST_NONZEROReduceAllMasked);
+                IntVector512Tests::FIRST_NONZEROReduceMasked, IntVector512Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4554,7 +4739,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueInt512VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueIntVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4565,7 +4750,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector512Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4578,7 +4763,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueInt512VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueIntVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4589,11 +4774,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector512Tests::allTrue);
     }
 
     static int SUADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4602,7 +4787,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAll(int[] a) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4611,32 +4796,50 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingUnaryOpProvider")
-    static void SUADDReduceInt512VectorTests(IntFunction<int[]> fa) {
+    static void SUADDReduceIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                int v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int512VectorTests::SUADDReduce, Int512VectorTests::SUADDReduceAll);
+                IntVector512Tests::SUADDReduce, IntVector512Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "intSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = SUADD_IDENTITY;
+
+        assertEquals((int) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static int SUADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4646,7 +4849,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4654,7 +4857,7 @@ public class Int512VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "intSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4662,26 +4865,21 @@ public class Int512VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                int v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::SUADDReduceMasked, Int512VectorTests::SUADDReduceAllMasked);
+                IntVector512Tests::SUADDReduceMasked, IntVector512Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void withInt512VectorTests(IntFunction<int []> fa, IntFunction<int []> fb) {
+    static void withIntVector512Tests(IntFunction<int []> fa, IntFunction<int []> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -4704,7 +4902,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_DEFAULTInt512VectorTests(IntFunction<int[]> fa) {
+    static void IS_DEFAULTIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4714,14 +4912,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedIntVector512Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4734,7 +4932,7 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4745,7 +4943,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_NEGATIVEInt512VectorTests(IntFunction<int[]> fa) {
+    static void IS_NEGATIVEIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4755,14 +4953,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedIntVector512Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4775,14 +4973,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4794,14 +4992,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4813,14 +5011,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LTIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4836,14 +5034,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GTInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GTIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4855,14 +5053,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GTInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GTIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4878,14 +5076,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4897,14 +5095,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4916,14 +5114,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EQIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4939,14 +5137,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void NEInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void NEIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4958,14 +5156,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void NEInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void NEIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4981,14 +5179,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LEInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LEIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5000,14 +5198,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LEInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LEIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5023,14 +5221,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GEInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GEIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5042,14 +5240,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GEInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GEIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5065,14 +5263,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULTInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULTIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5084,14 +5282,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULTInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULTIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5107,14 +5305,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGTInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGTIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5126,14 +5324,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGTInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGTIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5149,14 +5347,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULEInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULEIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5168,14 +5366,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULEInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULEIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5191,14 +5389,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGEInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGEIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5210,14 +5408,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGEInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGEIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5233,14 +5431,14 @@ public class Int512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5250,13 +5448,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5270,13 +5468,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector512TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5286,13 +5484,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5306,13 +5504,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5322,13 +5520,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5342,13 +5540,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector512TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5358,13 +5556,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5378,7 +5576,7 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
             }
         }
     }
@@ -5388,7 +5586,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5404,11 +5602,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, IntVector512Tests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void RearrangeInt512VectorTests(IntFunction<int[]> fa,
+    static void RearrangeIntVector512Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5425,7 +5623,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void RearrangeInt512VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void RearrangeIntVector512TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -5443,7 +5641,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void compressInt512VectorTests(IntFunction<int[]> fa,
+    static void compressIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5461,7 +5659,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void expandInt512VectorTests(IntFunction<int[]> fa,
+    static void expandIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5479,7 +5677,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void getInt512VectorTests(IntFunction<int[]> fa) {
+    static void getIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -5635,7 +5833,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastInt512VectorTests(IntFunction<int[]> fa) {
+    static void BroadcastIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5649,7 +5847,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZeroInt512VectorTests(IntFunction<int[]> fa) {
+    static void ZeroIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5659,7 +5857,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static int[] sliceUnary(int[] a, int origin, int idx) {
@@ -5674,7 +5872,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void sliceUnaryInt512VectorTests(IntFunction<int[]> fa) {
+    static void sliceUnaryIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5685,7 +5883,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, IntVector512Tests::sliceUnary);
     }
 
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
@@ -5702,7 +5900,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void sliceBinaryInt512VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void sliceBinaryIntVector512TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5715,7 +5913,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Int512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, IntVector512Tests::sliceBinary);
     }
 
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
@@ -5732,7 +5930,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void sliceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void sliceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5749,7 +5947,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Int512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, IntVector512Tests::slice);
     }
 
     static int[] unsliceUnary(int[] a, int origin, int idx) {
@@ -5766,7 +5964,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void unsliceUnaryInt512VectorTests(IntFunction<int[]> fa) {
+    static void unsliceUnaryIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5777,7 +5975,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, IntVector512Tests::unsliceUnary);
     }
 
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
@@ -5803,7 +6001,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void unsliceBinaryInt512VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void unsliceBinaryIntVector512TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5817,7 +6015,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Int512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, IntVector512Tests::unsliceBinary);
     }
 
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5857,7 +6055,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void unsliceInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void unsliceIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5874,7 +6072,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Int512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, IntVector512Tests::unslice);
     }
 
     static int BITWISE_BLEND(int a, int b, int c) {
@@ -5886,7 +6084,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5901,11 +6099,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5918,11 +6116,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, IntVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5940,11 +6138,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5955,11 +6153,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt512VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector512TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5970,11 +6168,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt512VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector512TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6019,11 +6217,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector512TestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6038,11 +6236,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt512VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector512TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6053,11 +6251,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt512VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector512TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6068,11 +6266,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector512TestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6086,7 +6284,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntVector512Tests::BITWISE_BLEND);
     }
 
     static int NEG(int a) {
@@ -6098,7 +6296,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NEGInt512VectorTests(IntFunction<int[]> fa) {
+    static void NEGIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6109,11 +6307,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::NEG);
+        assertArraysEquals(r, a, IntVector512Tests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void negInt512VectorTests(IntFunction<int[]> fa) {
+    static void negIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6124,11 +6322,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::neg);
+        assertArraysEquals(r, a, IntVector512Tests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NEGMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void NEGMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6142,7 +6340,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, IntVector512Tests::NEG);
     }
 
     static int ABS(int a) {
@@ -6154,7 +6352,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ABSInt512VectorTests(IntFunction<int[]> fa) {
+    static void ABSIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6165,11 +6363,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::ABS);
+        assertArraysEquals(r, a, IntVector512Tests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void absInt512VectorTests(IntFunction<int[]> fa) {
+    static void absIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6180,11 +6378,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::abs);
+        assertArraysEquals(r, a, IntVector512Tests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ABSMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void ABSMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6198,7 +6396,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, IntVector512Tests::ABS);
     }
 
     static int NOT(int a) {
@@ -6210,7 +6408,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NOTInt512VectorTests(IntFunction<int[]> fa) {
+    static void NOTIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6221,11 +6419,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::NOT);
+        assertArraysEquals(r, a, IntVector512Tests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void notInt512VectorTests(IntFunction<int[]> fa) {
+    static void notIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6236,11 +6434,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::not);
+        assertArraysEquals(r, a, IntVector512Tests::not);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NOTMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void NOTMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6254,7 +6452,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, IntVector512Tests::NOT);
     }
 
     static int ZOMO(int a) {
@@ -6262,7 +6460,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZOMOInt512VectorTests(IntFunction<int[]> fa) {
+    static void ZOMOIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6273,11 +6471,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::ZOMO);
+        assertArraysEquals(r, a, IntVector512Tests::ZOMO);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ZOMOMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void ZOMOMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6291,7 +6489,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, IntVector512Tests::ZOMO);
     }
 
     static int BIT_COUNT(int a) {
@@ -6299,7 +6497,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BIT_COUNTInt512VectorTests(IntFunction<int[]> fa) {
+    static void BIT_COUNTIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6310,11 +6508,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, IntVector512Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void BIT_COUNTMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6328,7 +6526,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, IntVector512Tests::BIT_COUNT);
     }
 
     static int TRAILING_ZEROS_COUNT(int a) {
@@ -6336,7 +6534,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTInt512VectorTests(IntFunction<int[]> fa) {
+    static void TRAILING_ZEROS_COUNTIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6347,11 +6545,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6365,7 +6563,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     static int LEADING_ZEROS_COUNT(int a) {
@@ -6373,7 +6571,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTInt512VectorTests(IntFunction<int[]> fa) {
+    static void LEADING_ZEROS_COUNTIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6384,11 +6582,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6402,7 +6600,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     static int REVERSE(int a) {
@@ -6410,7 +6608,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSEInt512VectorTests(IntFunction<int[]> fa) {
+    static void REVERSEIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6421,11 +6619,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::REVERSE);
+        assertArraysEquals(r, a, IntVector512Tests::REVERSE);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSEMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void REVERSEMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6439,7 +6637,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, IntVector512Tests::REVERSE);
     }
 
     static int REVERSE_BYTES(int a) {
@@ -6447,7 +6645,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSE_BYTESInt512VectorTests(IntFunction<int[]> fa) {
+    static void REVERSE_BYTESIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6458,11 +6656,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, IntVector512Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedInt512VectorTests(IntFunction<int[]> fa,
+    static void REVERSE_BYTESMaskedIntVector512Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6476,7 +6674,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, IntVector512Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6484,7 +6682,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandIntVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6497,7 +6695,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::band);
+        assertArraysEquals(r, a, b, IntVector512Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6505,7 +6703,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorIntVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6518,7 +6716,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::bor);
+        assertArraysEquals(r, a, b, IntVector512Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6526,7 +6724,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorIntVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6539,7 +6737,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::bxor);
+        assertArraysEquals(r, a, b, IntVector512Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6547,7 +6745,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotIntVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6560,7 +6758,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::bandNot);
+        assertArraysEquals(r, a, b, IntVector512Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6568,7 +6766,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqIntVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6581,7 +6779,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int512VectorTests::beq);
+        assertArraysEquals(r, a, b, IntVector512Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6589,7 +6787,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotInt512VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotIntVector512Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6600,7 +6798,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int512VectorTests::unot);
+        assertArraysEquals(r, a, IntVector512Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6609,15 +6807,15 @@ public class Int512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt512VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongIntVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6631,7 +6829,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt512VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector512TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6641,13 +6839,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt512VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector512TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6657,13 +6855,13 @@ public class Int512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toIntArrayInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toIntArrayIntVector512TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6674,7 +6872,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toLongArrayInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toLongArrayIntVector512TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6685,7 +6883,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toDoubleArrayInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toDoubleArrayIntVector512TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6696,7 +6894,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toStringInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toStringIntVector512TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6709,7 +6907,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void hashCodeInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void hashCodeIntVector512TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6742,7 +6940,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceLongInt512VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceLongIntVector512Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6758,7 +6956,7 @@ public class Int512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Int512VectorTests::ADDReduceLong, Int512VectorTests::ADDReduceAllLong);
+                IntVector512Tests::ADDReduceLong, IntVector512Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(int[] a, int idx, boolean[] mask) {
@@ -6781,7 +6979,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceLongInt512VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongIntVector512TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6799,11 +6997,11 @@ public class Int512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Int512VectorTests::ADDReduceLongMasked, Int512VectorTests::ADDReduceAllLongMasked);
+                IntVector512Tests::ADDReduceLongMasked, IntVector512Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastLongInt512VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void BroadcastLongIntVector512TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6814,7 +7012,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt512VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector512TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6828,12 +7026,12 @@ public class Int512VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector512Tests::blend);
     }
 
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void SelectFromInt512VectorTests(IntFunction<int[]> fa,
+    static void SelectFromIntVector512Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -6849,7 +7047,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorInt512VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SelectFromTwoVectorIntVector512Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] idx = fc.apply(SPECIES.length());
@@ -6867,7 +7065,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void SelectFromInt512VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void SelectFromIntVector512TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                            BiFunction<Integer,Integer,int[]> fs,
                                                            IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -6886,7 +7084,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousInt512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousIntVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6897,12 +7095,12 @@ public class Int512VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringInt512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringIntVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6916,7 +7114,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsInt512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsIntVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6925,12 +7123,12 @@ public class Int512VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsInt512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsIntVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6940,13 +7138,13 @@ public class Int512VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeIntVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6968,7 +7166,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountIntVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6979,7 +7177,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int512VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, IntVector512Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6993,7 +7191,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueIntVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7004,7 +7202,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int512VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector512Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -7018,7 +7216,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueIntVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7029,11 +7227,11 @@ public class Int512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int512VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector512Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressInt512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressIntVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7043,7 +7241,7 @@ public class Int512VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7061,7 +7259,7 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeInt512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeIntVector512TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7069,13 +7267,13 @@ public class Int512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongInt512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongIntVector512TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7083,7 +7281,7 @@ public class Int512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7102,36 +7300,36 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundInt512VectorTestsSmokeTest(int length) {
+    static void loopBoundIntVector512TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongInt512VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongIntVector512TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeInt512VectorTestsSmokeTest() {
+    static void ElementSizeIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Integer.SIZE);
+        assertEquals(elsize, Integer.SIZE);
     }
 
     @Test
-    static void VectorShapeInt512VectorTestsSmokeTest() {
+    static void VectorShapeIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_512_BIT));
     }
 
     @Test
-    static void ShapeWithLanesInt512VectorTestsSmokeTest() {
+    static void ShapeWithLanesIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(int.class);
@@ -7139,32 +7337,32 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeInt512VectorTestsSmokeTest() {
+    static void ElementTypeIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementType() == int.class);
     }
 
     @Test
-    static void SpeciesElementSizeInt512VectorTestsSmokeTest() {
+    static void SpeciesElementSizeIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementSize() == Integer.SIZE);
     }
 
     @Test
-    static void VectorTypeInt512VectorTestsSmokeTest() {
+    static void VectorTypeIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesInt512VectorTestsSmokeTest() {
+    static void WithLanesIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(int.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeInt512VectorTestsSmokeTest() {
+    static void WithShapeIntVector512TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7172,9 +7370,9 @@ public class Int512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueInt512VectorTestsSmokeTest() {
+    static void MaskAllTrueIntVector512TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntVector64LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/IntVector64LoadStoreTests.java
index a1fa9a8b16c..418a8bb8581 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector64LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Int64VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation IntVector64LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class IntVector64LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_64;
 
@@ -61,14 +61,29 @@ public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(int[] r, int[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Int64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Int64VectorTests.java b/test/jdk/jdk/incubator/vector/IntVector64Tests.java
similarity index 78%
rename from test/jdk/jdk/incubator/vector/Int64VectorTests.java
rename to test/jdk/jdk/incubator/vector/IntVector64Tests.java
index 3c00904a70e..0715981e050 100644
--- a/test/jdk/jdk/incubator/vector/Int64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVector64Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Int64VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation IntVector64Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Int64VectorTests extends AbstractVectorTest {
+public class IntVector64Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_64;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(int actual, int expected, int delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(int actual, int expected, int delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final int CONST_SHIFT = Integer.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final int ADD_IDENTITY = (int)0;
+    private static final int AND_IDENTITY = (int)-1;
+    private static final int FIRST_NONZERO_IDENTITY = (int)0;
+    private static final int MAX_IDENTITY = Integer.MIN_VALUE;
+    private static final int MIN_IDENTITY = Integer.MAX_VALUE;
+    private static final int MUL_IDENTITY = (int)1;
+    private static final int OR_IDENTITY = (int)0;
+    private static final int SUADD_IDENTITY = (int)0;
+    private static final int UMAX_IDENTITY = (int)0;   // Minimum unsigned value
+    private static final int UMIN_IDENTITY = (int)-1;  // Maximum unsigned value
+    private static final int XOR_IDENTITY = (int)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
     static void assertArraysStrictlyEquals(int[] r, int[] a) {
@@ -84,10 +139,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Int64VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Int64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Int64VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Int64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Int64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (int)0);
+                    assertEquals(r[i + k], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Int64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (int)0);
+                        assertEquals(r[i + j], (int)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Int64VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Int64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Int64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Int64VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Int64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1531,7 +1586,7 @@ public class Int64VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         IntVector a = io.add((int)1); //[1,2]
         IntVector b = a.neg();  //[-1,-2]
         int[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1546,19 +1601,19 @@ public class Int64VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Integer> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Integer> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         IntVector uab0 = zab0.rearrange(unz0,zab1);
         IntVector uab1 = zab0.rearrange(unz1,zab1);
         int[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1573,7 +1628,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1581,9 +1636,9 @@ public class Int64VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1612,7 +1667,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1625,7 +1680,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::ADD);
+        assertArraysEquals(r, a, b, IntVector64Tests::ADD);
     }
 
     static int add(int a, int b) {
@@ -1633,7 +1688,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1644,11 +1699,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::add);
+        assertArraysEquals(r, a, b, IntVector64Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1664,11 +1719,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1682,7 +1737,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::add);
     }
 
     static int SUB(int a, int b) {
@@ -1690,7 +1745,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void SUBInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUBIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1703,7 +1758,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::SUB);
+        assertArraysEquals(r, a, b, IntVector64Tests::SUB);
     }
 
     static int sub(int a, int b) {
@@ -1711,7 +1766,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1722,11 +1777,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::sub);
+        assertArraysEquals(r, a, b, IntVector64Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void SUBInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUBIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1742,11 +1797,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1760,7 +1815,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::sub);
     }
 
     static int MUL(int a, int b) {
@@ -1768,7 +1823,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MULInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MULIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1781,7 +1836,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::MUL);
+        assertArraysEquals(r, a, b, IntVector64Tests::MUL);
     }
 
     static int mul(int a, int b) {
@@ -1789,7 +1844,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1800,11 +1855,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::mul);
+        assertArraysEquals(r, a, b, IntVector64Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void MULInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void MULIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1820,11 +1875,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1838,7 +1893,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::mul);
     }
 
     static int DIV(int a, int b) {
@@ -1846,7 +1901,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void DIVInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void DIVIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1861,7 +1916,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::DIV);
+        assertArraysEquals(r, a, b, IntVector64Tests::DIV);
     }
 
     static int div(int a, int b) {
@@ -1869,7 +1924,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1884,11 +1939,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::div);
+        assertArraysEquals(r, a, b, IntVector64Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void DIVInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void DIVIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1906,11 +1961,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1928,7 +1983,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1936,7 +1991,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void FIRST_NONZEROInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void FIRST_NONZEROIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1949,11 +2004,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, IntVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void FIRST_NONZEROInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void FIRST_NONZEROIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1969,7 +2024,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1977,7 +2032,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1990,7 +2045,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::AND);
+        assertArraysEquals(r, a, b, IntVector64Tests::AND);
     }
 
     static int and(int a, int b) {
@@ -1998,7 +2053,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2009,11 +2064,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::and);
+        assertArraysEquals(r, a, b, IntVector64Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2029,7 +2084,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::AND);
     }
 
     static int AND_NOT(int a, int b) {
@@ -2037,7 +2092,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void AND_NOTInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void AND_NOTIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2050,11 +2105,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, IntVector64Tests::AND_NOT);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void AND_NOTInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void AND_NOTIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2070,7 +2125,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::AND_NOT);
     }
 
     static int OR(int a, int b) {
@@ -2078,7 +2133,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2091,7 +2146,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::OR);
+        assertArraysEquals(r, a, b, IntVector64Tests::OR);
     }
 
     static int or(int a, int b) {
@@ -2099,7 +2154,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2110,11 +2165,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::or);
+        assertArraysEquals(r, a, b, IntVector64Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2130,7 +2185,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::OR);
     }
 
     static int XOR(int a, int b) {
@@ -2138,7 +2193,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void XORInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void XORIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2151,11 +2206,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::XOR);
+        assertArraysEquals(r, a, b, IntVector64Tests::XOR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void XORInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void XORIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2171,7 +2226,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::XOR);
     }
 
     static int COMPRESS_BITS(int a, int b) {
@@ -2179,7 +2234,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void COMPRESS_BITSInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void COMPRESS_BITSIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2192,11 +2247,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, IntVector64Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void COMPRESS_BITSInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void COMPRESS_BITSIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2212,7 +2267,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::COMPRESS_BITS);
     }
 
     static int EXPAND_BITS(int a, int b) {
@@ -2220,7 +2275,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void EXPAND_BITSInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EXPAND_BITSIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2233,11 +2288,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, IntVector64Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void EXPAND_BITSInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EXPAND_BITSIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2253,11 +2308,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2267,11 +2322,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2284,11 +2339,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector64Tests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2298,11 +2353,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2315,11 +2370,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector64Tests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2329,11 +2384,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2346,11 +2401,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector64Tests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2362,11 +2417,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2381,11 +2436,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector64Tests::div);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2395,11 +2450,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2409,11 +2464,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2426,11 +2481,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector64Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2440,11 +2495,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2454,11 +2509,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2471,11 +2526,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Int64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVector64Tests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVector64TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2485,11 +2540,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector64Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORInt64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2502,11 +2557,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector64Tests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVector64TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2516,11 +2571,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Int64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, IntVector64Tests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDInt64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2533,7 +2588,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector64Tests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2541,7 +2596,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2554,11 +2609,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, IntVector64Tests::LSHL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2574,7 +2629,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::LSHL);
     }
 
     static int ASHR(int a, int b) {
@@ -2582,7 +2637,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2595,11 +2650,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, IntVector64Tests::ASHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2615,7 +2670,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::ASHR);
     }
 
     static int LSHR(int a, int b) {
@@ -2623,7 +2678,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2636,11 +2691,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, IntVector64Tests::LSHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2656,7 +2711,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::LSHR);
     }
 
     static int LSHL_unary(int a, int b) {
@@ -2664,7 +2719,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLInt64VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVector64TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2676,11 +2731,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector64Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLInt64VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVector64TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2695,7 +2750,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector64Tests::LSHL_unary);
     }
 
     static int LSHR_unary(int a, int b) {
@@ -2703,7 +2758,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRInt64VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVector64TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2715,11 +2770,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector64Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRInt64VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVector64TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2734,7 +2789,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector64Tests::LSHR_unary);
     }
 
     static int ASHR_unary(int a, int b) {
@@ -2742,7 +2797,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRInt64VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVector64TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2754,11 +2809,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector64Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRInt64VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVector64TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2773,7 +2828,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector64Tests::ASHR_unary);
     }
 
     static int ROR(int a, int b) {
@@ -2781,7 +2836,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2794,11 +2849,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::ROR);
+        assertArraysEquals(r, a, b, IntVector64Tests::ROR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2814,7 +2869,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::ROR);
     }
 
     static int ROL(int a, int b) {
@@ -2822,7 +2877,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2835,11 +2890,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::ROL);
+        assertArraysEquals(r, a, b, IntVector64Tests::ROL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2855,7 +2910,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::ROL);
     }
 
     static int ROR_unary(int a, int b) {
@@ -2863,7 +2918,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORInt64VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVector64TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2875,11 +2930,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, IntVector64Tests::ROR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORInt64VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVector64TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2894,7 +2949,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector64Tests::ROR_unary);
     }
 
     static int ROL_unary(int a, int b) {
@@ -2902,7 +2957,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLInt64VectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVector64TestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2914,11 +2969,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Int64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, IntVector64Tests::ROL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLInt64VectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVector64TestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2933,14 +2988,14 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Int64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVector64Tests::ROL_unary);
     }
     static int LSHR_binary_const(int a) {
         return (int)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHRInt64VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHRIntVector64TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2951,11 +3006,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector64Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHRInt64VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHRIntVector64TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2969,7 +3024,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector64Tests::LSHR_binary_const);
     }
 
     static int LSHL_binary_const(int a) {
@@ -2977,7 +3032,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHLInt64VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHLIntVector64TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2988,11 +3043,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, IntVector64Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHLInt64VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHLIntVector64TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3006,7 +3061,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector64Tests::LSHL_binary_const);
     }
 
     static int ASHR_binary_const(int a) {
@@ -3014,7 +3069,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ASHRInt64VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ASHRIntVector64TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3025,11 +3080,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, IntVector64Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ASHRInt64VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ASHRIntVector64TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3043,7 +3098,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector64Tests::ASHR_binary_const);
     }
 
     static int ROR_binary_const(int a) {
@@ -3051,7 +3106,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void RORInt64VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void RORIntVector64TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3062,11 +3117,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, IntVector64Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void RORInt64VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void RORIntVector64TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3080,7 +3135,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector64Tests::ROR_binary_const);
     }
 
     static int ROL_binary_const(int a) {
@@ -3088,7 +3143,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ROLInt64VectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ROLIntVector64TestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3099,11 +3154,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Int64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, IntVector64Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ROLInt64VectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ROLIntVector64TestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3117,14 +3172,14 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Int64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVector64Tests::ROL_binary_const);
     }
 
 
     static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MINIntVector64TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int64VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, IntVector64Tests::MIN);
     }
 
     static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void minInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void minIntVector64TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int64VectorTests::min);
+        assertArraysEquals(r, a, (int)10, IntVector64Tests::min);
     }
 
     static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINInt64VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINIntVector64TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,13 +3226,13 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int64VectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, mask, IntVector64Tests::MIN);
     }
 
     static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MAXIntVector64TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3188,13 +3243,13 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int64VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, IntVector64Tests::MAX);
     }
 
     static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void maxInt64VectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void maxIntVector64TestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3205,13 +3260,13 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, Int64VectorTests::max);
+        assertArraysEquals(r, a, (int)10, IntVector64Tests::max);
     }
 
     static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXInt64VectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXIntVector64TestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3224,7 +3279,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, Int64VectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, mask, IntVector64Tests::MAX);
     }
 
     static int MIN(int a, int b) {
@@ -3232,7 +3287,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3245,7 +3300,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::MIN);
+        assertArraysEquals(r, a, b, IntVector64Tests::MIN);
     }
 
     static int min(int a, int b) {
@@ -3253,7 +3308,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3264,7 +3319,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::min);
+        assertArraysEquals(r, a, b, IntVector64Tests::min);
     }
 
     static int MAX(int a, int b) {
@@ -3272,7 +3327,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3285,7 +3340,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::MAX);
+        assertArraysEquals(r, a, b, IntVector64Tests::MAX);
     }
 
     static int max(int a, int b) {
@@ -3293,7 +3348,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3304,7 +3359,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::max);
+        assertArraysEquals(r, a, b, IntVector64Tests::max);
     }
 
     static int UMIN(int a, int b) {
@@ -3312,7 +3367,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMINInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMINIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3325,11 +3380,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, IntVector64Tests::UMIN);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMINInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMINIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3345,7 +3400,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::UMIN);
     }
 
     static int UMAX(int a, int b) {
@@ -3353,7 +3408,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMAXInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMAXIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3366,11 +3421,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, IntVector64Tests::UMAX);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMAXInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMAXIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3386,7 +3441,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::UMAX);
     }
 
     static int SADD(int a, int b) {
@@ -3394,7 +3449,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SADDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SADDIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3407,11 +3462,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::SADD);
+        assertArraysEquals(r, a, b, IntVector64Tests::SADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SADDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SADDIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3427,7 +3482,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::SADD);
     }
 
     static int SSUB(int a, int b) {
@@ -3435,7 +3490,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SSUBInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SSUBIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3448,11 +3503,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, IntVector64Tests::SSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SSUBInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SSUBIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3468,7 +3523,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::SSUB);
     }
 
     static int SUADD(int a, int b) {
@@ -3476,7 +3531,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUADDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUADDIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3489,11 +3544,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, IntVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUADDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3509,7 +3564,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::SUADD);
     }
 
     static int SUSUB(int a, int b) {
@@ -3517,7 +3572,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUSUBInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUSUBIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3530,11 +3585,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, IntVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUSUBInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUSUBIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3550,11 +3605,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3564,11 +3619,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3578,11 +3633,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3592,11 +3647,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3606,10 +3661,10 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Int64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, IntVector64Tests::max);
     }
     @Test(dataProvider = "intSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SUADDAssocIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -3626,11 +3681,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Int64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, IntVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDAssocIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                      IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3651,11 +3706,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Int64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, IntVector64Tests::SUADD);
     }
 
     static int ANDReduce(int[] a, int idx) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3664,7 +3719,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAll(int[] a) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3673,32 +3728,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ANDReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void ANDReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                int v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::ANDReduce, Int64VectorTests::ANDReduceAll);
+                IntVector64Tests::ANDReduce, IntVector64Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = AND_IDENTITY;
+
+        assertEquals((int) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id & x), x);
+                assertEquals((int) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static int ANDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3708,7 +3781,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3717,34 +3790,29 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ANDReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                int v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::ANDReduceMasked, Int64VectorTests::ANDReduceAllMasked);
+                IntVector64Tests::ANDReduceMasked, IntVector64Tests::ANDReduceAllMasked);
     }
 
     static int ORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3753,7 +3821,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAll(int[] a) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3762,32 +3830,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ORReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void ORReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                int v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::ORReduce, Int64VectorTests::ORReduceAll);
+                IntVector64Tests::ORReduce, IntVector64Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = OR_IDENTITY;
+
+        assertEquals((int) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id | x), x);
+                assertEquals((int) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static int ORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3797,7 +3883,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3806,7 +3892,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ORReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3814,26 +3900,21 @@ public class Int64VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                int v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::ORReduceMasked, Int64VectorTests::ORReduceAllMasked);
+                IntVector64Tests::ORReduceMasked, IntVector64Tests::ORReduceAllMasked);
     }
 
     static int XORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3842,7 +3923,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAll(int[] a) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3851,32 +3932,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void XORReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void XORReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                int v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::XORReduce, Int64VectorTests::XORReduceAll);
+                IntVector64Tests::XORReduce, IntVector64Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = XOR_IDENTITY;
+
+        assertEquals((int) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id ^ x), x);
+                assertEquals((int) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static int XORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3886,7 +3985,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3895,7 +3994,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void XORReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3903,26 +4002,21 @@ public class Int64VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                int v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::XORReduceMasked, Int64VectorTests::XORReduceAllMasked);
+                IntVector64Tests::XORReduceMasked, IntVector64Tests::XORReduceAllMasked);
     }
 
     static int ADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3931,7 +4025,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAll(int[] a) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3940,32 +4034,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                int v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::ADDReduce, Int64VectorTests::ADDReduceAll);
+                IntVector64Tests::ADDReduce, IntVector64Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = ADD_IDENTITY;
+
+        assertEquals((int) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id + x), x);
+                assertEquals((int) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3975,7 +4087,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3984,7 +4096,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3992,26 +4104,21 @@ public class Int64VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                int v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::ADDReduceMasked, Int64VectorTests::ADDReduceAllMasked);
+                IntVector64Tests::ADDReduceMasked, IntVector64Tests::ADDReduceAllMasked);
     }
 
     static int MULReduce(int[] a, int idx) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4020,7 +4127,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAll(int[] a) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4029,32 +4136,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MULReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void MULReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                int v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::MULReduce, Int64VectorTests::MULReduceAll);
+                IntVector64Tests::MULReduce, IntVector64Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MUL_IDENTITY;
+
+        assertEquals((int) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id * x), x);
+                assertEquals((int) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4064,7 +4189,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4073,34 +4198,29 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MULReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                int v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::MULReduceMasked, Int64VectorTests::MULReduceAllMasked);
+                IntVector64Tests::MULReduceMasked, IntVector64Tests::MULReduceAllMasked);
     }
 
     static int MINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.min(res, a[i]);
         }
@@ -4109,7 +4229,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduce(a, i));
         }
@@ -4118,32 +4238,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void MINReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                int v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::MINReduce, Int64VectorTests::MINReduceAll);
+                IntVector64Tests::MINReduce, IntVector64Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MIN_IDENTITY;
+
+        assertEquals((int) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.min(id, x), x);
+                assertEquals((int) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.min(res, a[i]);
@@ -4153,7 +4291,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4162,34 +4300,29 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                int v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::MINReduceMasked, Int64VectorTests::MINReduceAllMasked);
+                IntVector64Tests::MINReduceMasked, IntVector64Tests::MINReduceAllMasked);
     }
 
     static int MAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.max(res, a[i]);
         }
@@ -4198,7 +4331,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduce(a, i));
         }
@@ -4207,32 +4340,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void MAXReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                int v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::MAXReduce, Int64VectorTests::MAXReduceAll);
+                IntVector64Tests::MAXReduce, IntVector64Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MAX_IDENTITY;
+
+        assertEquals((int) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.max(id, x), x);
+                assertEquals((int) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.max(res, a[i]);
@@ -4242,7 +4393,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4251,34 +4402,29 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                int v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::MAXReduceMasked, Int64VectorTests::MAXReduceAllMasked);
+                IntVector64Tests::MAXReduceMasked, IntVector64Tests::MAXReduceAllMasked);
     }
 
     static int UMINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4287,7 +4433,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4296,32 +4442,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMINReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void UMINReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                int v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::UMINReduce, Int64VectorTests::UMINReduceAll);
+                IntVector64Tests::UMINReduce, IntVector64Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMIN_IDENTITY;
+
+        assertEquals((int) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.minUnsigned(id, x), x);
+                assertEquals((int) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static int UMINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.minUnsigned(res, a[i]);
@@ -4331,7 +4495,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4340,34 +4504,29 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMINReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                int v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::UMINReduceMasked, Int64VectorTests::UMINReduceAllMasked);
+                IntVector64Tests::UMINReduceMasked, IntVector64Tests::UMINReduceAllMasked);
     }
 
     static int UMAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4376,7 +4535,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4385,32 +4544,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMAXReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void UMAXReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                int v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::UMAXReduce, Int64VectorTests::UMAXReduceAll);
+                IntVector64Tests::UMAXReduce, IntVector64Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMAX_IDENTITY;
+
+        assertEquals((int) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((int) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static int UMAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.maxUnsigned(res, a[i]);
@@ -4420,7 +4597,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4429,34 +4606,29 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMAXReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                int v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::UMAXReduceMasked, Int64VectorTests::UMAXReduceAllMasked);
+                IntVector64Tests::UMAXReduceMasked, IntVector64Tests::UMAXReduceAllMasked);
     }
 
     static int FIRST_NONZEROReduce(int[] a, int idx) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4465,7 +4637,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAll(int[] a) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4474,32 +4646,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void FIRST_NONZEROReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void FIRST_NONZEROReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::FIRST_NONZEROReduce, Int64VectorTests::FIRST_NONZEROReduceAll);
+                IntVector64Tests::FIRST_NONZEROReduce, IntVector64Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static int FIRST_NONZEROReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4509,7 +4699,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAllMasked(int[] a, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4518,30 +4708,25 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::FIRST_NONZEROReduceMasked, Int64VectorTests::FIRST_NONZEROReduceAllMasked);
+                IntVector64Tests::FIRST_NONZEROReduceMasked, IntVector64Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4554,7 +4739,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueInt64VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueIntVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4565,7 +4750,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector64Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4578,7 +4763,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueInt64VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueIntVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4589,11 +4774,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Int64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVector64Tests::allTrue);
     }
 
     static int SUADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4602,7 +4787,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAll(int[] a) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4611,32 +4796,50 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingUnaryOpProvider")
-    static void SUADDReduceInt64VectorTests(IntFunction<int[]> fa) {
+    static void SUADDReduceIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                int v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Int64VectorTests::SUADDReduce, Int64VectorTests::SUADDReduceAll);
+                IntVector64Tests::SUADDReduce, IntVector64Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "intSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = SUADD_IDENTITY;
+
+        assertEquals((int) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static int SUADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4646,7 +4849,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4654,7 +4857,7 @@ public class Int64VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "intSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4662,26 +4865,21 @@ public class Int64VectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                int v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::SUADDReduceMasked, Int64VectorTests::SUADDReduceAllMasked);
+                IntVector64Tests::SUADDReduceMasked, IntVector64Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void withInt64VectorTests(IntFunction<int []> fa, IntFunction<int []> fb) {
+    static void withIntVector64Tests(IntFunction<int []> fa, IntFunction<int []> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -4704,7 +4902,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_DEFAULTInt64VectorTests(IntFunction<int[]> fa) {
+    static void IS_DEFAULTIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4714,14 +4912,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedIntVector64Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4734,7 +4932,7 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4745,7 +4943,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_NEGATIVEInt64VectorTests(IntFunction<int[]> fa) {
+    static void IS_NEGATIVEIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4755,14 +4953,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedIntVector64Tests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4775,14 +4973,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4794,14 +4992,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4813,14 +5011,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LTIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4836,14 +5034,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GTInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GTIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4855,14 +5053,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GTInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GTIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4878,14 +5076,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4897,14 +5095,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4916,14 +5114,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EQIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4939,14 +5137,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void NEInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void NEIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4958,14 +5156,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void NEInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void NEIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4981,14 +5179,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LEInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LEIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5000,14 +5198,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LEInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LEIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5023,14 +5221,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GEInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GEIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5042,14 +5240,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GEInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GEIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5065,14 +5263,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULTInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULTIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5084,14 +5282,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULTInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULTIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5107,14 +5305,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGTInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGTIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5126,14 +5324,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGTInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGTIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5149,14 +5347,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULEInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULEIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5168,14 +5366,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULEInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULEIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5191,14 +5389,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGEInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGEIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5210,14 +5408,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGEInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGEIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5233,14 +5431,14 @@ public class Int64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5250,13 +5448,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5270,13 +5468,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVector64TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5286,13 +5484,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTInt64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5306,13 +5504,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5322,13 +5520,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5342,13 +5540,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVector64TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5358,13 +5556,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQInt64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5378,7 +5576,7 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
             }
         }
     }
@@ -5388,7 +5586,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5404,11 +5602,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Int64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, IntVector64Tests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void RearrangeInt64VectorTests(IntFunction<int[]> fa,
+    static void RearrangeIntVector64Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5425,7 +5623,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void RearrangeInt64VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void RearrangeIntVector64TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -5443,7 +5641,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void compressInt64VectorTests(IntFunction<int[]> fa,
+    static void compressIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5461,7 +5659,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void expandInt64VectorTests(IntFunction<int[]> fa,
+    static void expandIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5479,7 +5677,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void getInt64VectorTests(IntFunction<int[]> fa) {
+    static void getIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -5635,7 +5833,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastInt64VectorTests(IntFunction<int[]> fa) {
+    static void BroadcastIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5649,7 +5847,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZeroInt64VectorTests(IntFunction<int[]> fa) {
+    static void ZeroIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5659,7 +5857,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static int[] sliceUnary(int[] a, int origin, int idx) {
@@ -5674,7 +5872,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void sliceUnaryInt64VectorTests(IntFunction<int[]> fa) {
+    static void sliceUnaryIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5685,7 +5883,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, IntVector64Tests::sliceUnary);
     }
 
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
@@ -5702,7 +5900,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void sliceBinaryInt64VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void sliceBinaryIntVector64TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5715,7 +5913,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Int64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, IntVector64Tests::sliceBinary);
     }
 
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
@@ -5732,7 +5930,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void sliceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void sliceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5749,7 +5947,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Int64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, IntVector64Tests::slice);
     }
 
     static int[] unsliceUnary(int[] a, int origin, int idx) {
@@ -5766,7 +5964,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void unsliceUnaryInt64VectorTests(IntFunction<int[]> fa) {
+    static void unsliceUnaryIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5777,7 +5975,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Int64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, IntVector64Tests::unsliceUnary);
     }
 
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
@@ -5803,7 +6001,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void unsliceBinaryInt64VectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void unsliceBinaryIntVector64TestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5817,7 +6015,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Int64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, IntVector64Tests::unsliceBinary);
     }
 
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5857,7 +6055,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void unsliceInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void unsliceIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5874,7 +6072,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Int64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, IntVector64Tests::unslice);
     }
 
     static int BITWISE_BLEND(int a, int b, int c) {
@@ -5886,7 +6084,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5901,11 +6099,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5918,11 +6116,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, IntVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5940,11 +6138,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5955,11 +6153,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt64VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector64TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5970,11 +6168,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, IntVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt64VectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector64TestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6019,11 +6217,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector64TestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6038,11 +6236,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDInt64VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVector64TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6053,11 +6251,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendInt64VectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVector64TestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6068,11 +6266,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Int64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDInt64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVector64TestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6086,7 +6284,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Int64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntVector64Tests::BITWISE_BLEND);
     }
 
     static int NEG(int a) {
@@ -6098,7 +6296,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NEGInt64VectorTests(IntFunction<int[]> fa) {
+    static void NEGIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6109,11 +6307,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::NEG);
+        assertArraysEquals(r, a, IntVector64Tests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void negInt64VectorTests(IntFunction<int[]> fa) {
+    static void negIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6124,11 +6322,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::neg);
+        assertArraysEquals(r, a, IntVector64Tests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NEGMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void NEGMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6142,7 +6340,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, IntVector64Tests::NEG);
     }
 
     static int ABS(int a) {
@@ -6154,7 +6352,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ABSInt64VectorTests(IntFunction<int[]> fa) {
+    static void ABSIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6165,11 +6363,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::ABS);
+        assertArraysEquals(r, a, IntVector64Tests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void absInt64VectorTests(IntFunction<int[]> fa) {
+    static void absIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6180,11 +6378,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::abs);
+        assertArraysEquals(r, a, IntVector64Tests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ABSMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void ABSMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6198,7 +6396,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, IntVector64Tests::ABS);
     }
 
     static int NOT(int a) {
@@ -6210,7 +6408,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NOTInt64VectorTests(IntFunction<int[]> fa) {
+    static void NOTIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6221,11 +6419,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::NOT);
+        assertArraysEquals(r, a, IntVector64Tests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void notInt64VectorTests(IntFunction<int[]> fa) {
+    static void notIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6236,11 +6434,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::not);
+        assertArraysEquals(r, a, IntVector64Tests::not);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NOTMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void NOTMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6254,7 +6452,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, IntVector64Tests::NOT);
     }
 
     static int ZOMO(int a) {
@@ -6262,7 +6460,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZOMOInt64VectorTests(IntFunction<int[]> fa) {
+    static void ZOMOIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6273,11 +6471,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::ZOMO);
+        assertArraysEquals(r, a, IntVector64Tests::ZOMO);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ZOMOMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void ZOMOMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6291,7 +6489,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, IntVector64Tests::ZOMO);
     }
 
     static int BIT_COUNT(int a) {
@@ -6299,7 +6497,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BIT_COUNTInt64VectorTests(IntFunction<int[]> fa) {
+    static void BIT_COUNTIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6310,11 +6508,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, IntVector64Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void BIT_COUNTMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6328,7 +6526,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, IntVector64Tests::BIT_COUNT);
     }
 
     static int TRAILING_ZEROS_COUNT(int a) {
@@ -6336,7 +6534,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTInt64VectorTests(IntFunction<int[]> fa) {
+    static void TRAILING_ZEROS_COUNTIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6347,11 +6545,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6365,7 +6563,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     static int LEADING_ZEROS_COUNT(int a) {
@@ -6373,7 +6571,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTInt64VectorTests(IntFunction<int[]> fa) {
+    static void LEADING_ZEROS_COUNTIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6384,11 +6582,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6402,7 +6600,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     static int REVERSE(int a) {
@@ -6410,7 +6608,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSEInt64VectorTests(IntFunction<int[]> fa) {
+    static void REVERSEIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6421,11 +6619,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::REVERSE);
+        assertArraysEquals(r, a, IntVector64Tests::REVERSE);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSEMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void REVERSEMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6439,7 +6637,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, IntVector64Tests::REVERSE);
     }
 
     static int REVERSE_BYTES(int a) {
@@ -6447,7 +6645,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSE_BYTESInt64VectorTests(IntFunction<int[]> fa) {
+    static void REVERSE_BYTESIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6458,11 +6656,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, IntVector64Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedInt64VectorTests(IntFunction<int[]> fa,
+    static void REVERSE_BYTESMaskedIntVector64Tests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6476,7 +6674,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Int64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, IntVector64Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6484,7 +6682,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandIntVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6497,7 +6695,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::band);
+        assertArraysEquals(r, a, b, IntVector64Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6505,7 +6703,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorIntVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6518,7 +6716,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::bor);
+        assertArraysEquals(r, a, b, IntVector64Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6526,7 +6724,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorIntVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6539,7 +6737,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::bxor);
+        assertArraysEquals(r, a, b, IntVector64Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6547,7 +6745,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotIntVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6560,7 +6758,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::bandNot);
+        assertArraysEquals(r, a, b, IntVector64Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6568,7 +6766,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqIntVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6581,7 +6779,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Int64VectorTests::beq);
+        assertArraysEquals(r, a, b, IntVector64Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6589,7 +6787,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotInt64VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotIntVector64Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6600,7 +6798,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Int64VectorTests::unot);
+        assertArraysEquals(r, a, IntVector64Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6609,15 +6807,15 @@ public class Int64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongInt64VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongIntVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6631,7 +6829,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltInt64VectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVector64TestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6641,13 +6839,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqInt64VectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVector64TestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6657,13 +6855,13 @@ public class Int64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toIntArrayInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toIntArrayIntVector64TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6674,7 +6872,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toLongArrayInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toLongArrayIntVector64TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6685,7 +6883,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toDoubleArrayInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toDoubleArrayIntVector64TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6696,7 +6894,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toStringInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toStringIntVector64TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6709,7 +6907,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void hashCodeInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void hashCodeIntVector64TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6742,7 +6940,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceLongInt64VectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceLongIntVector64Tests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6758,7 +6956,7 @@ public class Int64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Int64VectorTests::ADDReduceLong, Int64VectorTests::ADDReduceAllLong);
+                IntVector64Tests::ADDReduceLong, IntVector64Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(int[] a, int idx, boolean[] mask) {
@@ -6781,7 +6979,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceLongInt64VectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongIntVector64TestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6799,11 +6997,11 @@ public class Int64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Int64VectorTests::ADDReduceLongMasked, Int64VectorTests::ADDReduceAllLongMasked);
+                IntVector64Tests::ADDReduceLongMasked, IntVector64Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastLongInt64VectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void BroadcastLongIntVector64TestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6814,7 +7012,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendInt64VectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVector64TestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6828,12 +7026,12 @@ public class Int64VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Int64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVector64Tests::blend);
     }
 
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void SelectFromInt64VectorTests(IntFunction<int[]> fa,
+    static void SelectFromIntVector64Tests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -6849,7 +7047,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorInt64VectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SelectFromTwoVectorIntVector64Tests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] idx = fc.apply(SPECIES.length());
@@ -6867,7 +7065,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void SelectFromInt64VectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void SelectFromIntVector64TestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                            BiFunction<Integer,Integer,int[]> fs,
                                                            IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -6886,7 +7084,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousInt64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousIntVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6897,12 +7095,12 @@ public class Int64VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringInt64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringIntVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6916,7 +7114,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsInt64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsIntVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6925,12 +7123,12 @@ public class Int64VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsInt64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsIntVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6940,13 +7138,13 @@ public class Int64VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeIntVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6968,7 +7166,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountIntVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6979,7 +7177,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int64VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, IntVector64Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6993,7 +7191,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueIntVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7004,7 +7202,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int64VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector64Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -7018,7 +7216,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueIntVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7029,11 +7227,11 @@ public class Int64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Int64VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, IntVector64Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressInt64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressIntVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7043,7 +7241,7 @@ public class Int64VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7061,7 +7259,7 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeInt64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeIntVector64TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7069,13 +7267,13 @@ public class Int64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongInt64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongIntVector64TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7083,7 +7281,7 @@ public class Int64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7102,36 +7300,36 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundInt64VectorTestsSmokeTest(int length) {
+    static void loopBoundIntVector64TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongInt64VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongIntVector64TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeInt64VectorTestsSmokeTest() {
+    static void ElementSizeIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Integer.SIZE);
+        assertEquals(elsize, Integer.SIZE);
     }
 
     @Test
-    static void VectorShapeInt64VectorTestsSmokeTest() {
+    static void VectorShapeIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_64_BIT));
     }
 
     @Test
-    static void ShapeWithLanesInt64VectorTestsSmokeTest() {
+    static void ShapeWithLanesIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(int.class);
@@ -7139,32 +7337,32 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeInt64VectorTestsSmokeTest() {
+    static void ElementTypeIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementType() == int.class);
     }
 
     @Test
-    static void SpeciesElementSizeInt64VectorTestsSmokeTest() {
+    static void SpeciesElementSizeIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementSize() == Integer.SIZE);
     }
 
     @Test
-    static void VectorTypeInt64VectorTestsSmokeTest() {
+    static void VectorTypeIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesInt64VectorTestsSmokeTest() {
+    static void WithLanesIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(int.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeInt64VectorTestsSmokeTest() {
+    static void WithShapeIntVector64TestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7172,9 +7370,9 @@ public class Int64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueInt64VectorTestsSmokeTest() {
+    static void MaskAllTrueIntVector64TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/IntVectorMaxLoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/IntVectorMaxLoadStoreTests.java
index 564849e22fd..c9adfe802b6 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVectorMaxLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
  * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
- *      -XX:-TieredCompilation IntMaxVectorLoadStoreTests
+ *      -XX:-TieredCompilation IntVectorMaxLoadStoreTests
  *
  */
 
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class IntVectorMaxLoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_MAX;
 
@@ -68,14 +68,29 @@ public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(int[] r, int[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (int) 0, "at index #" + i);
         }
     }
 
@@ -329,7 +344,7 @@ public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "intProviderForIOOBE")
@@ -877,11 +892,11 @@ public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -892,11 +907,11 @@ public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (int) 0, "at index #" + j);
         }
     }
 
@@ -912,7 +927,7 @@ public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(int[] r, int[] a, int[] indexMap) {
@@ -925,7 +940,7 @@ public class IntMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java b/test/jdk/jdk/incubator/vector/IntVectorMaxTests.java
similarity index 78%
rename from test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
rename to test/jdk/jdk/incubator/vector/IntVectorMaxTests.java
index 42659bfe44e..ad519b36dc9 100644
--- a/test/jdk/jdk/incubator/vector/IntMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/IntVectorMaxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation IntMaxVectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation IntVectorMaxTests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,12 +56,55 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class IntMaxVectorTests extends AbstractVectorTest {
+public class IntVectorMaxTests extends AbstractVectorTest {
 
     static final VectorSpecies<Integer> SPECIES =
                 IntVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(int actual, int expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int actual, int expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(int actual, int expected, int delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(int actual, int expected, int delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(int [] actual, int [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(int [] actual, int [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
 
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
@@ -71,6 +114,19 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
     private static final int CONST_SHIFT = Integer.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final int ADD_IDENTITY = (int)0;
+    private static final int AND_IDENTITY = (int)-1;
+    private static final int FIRST_NONZERO_IDENTITY = (int)0;
+    private static final int MAX_IDENTITY = Integer.MIN_VALUE;
+    private static final int MIN_IDENTITY = Integer.MAX_VALUE;
+    private static final int MUL_IDENTITY = (int)1;
+    private static final int OR_IDENTITY = (int)0;
+    private static final int SUADD_IDENTITY = (int)0;
+    private static final int UMAX_IDENTITY = (int)0;   // Minimum unsigned value
+    private static final int UMIN_IDENTITY = (int)-1;  // Maximum unsigned value
+    private static final int XOR_IDENTITY = (int)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
     static void assertArraysStrictlyEquals(int[] r, int[] a) {
@@ -89,10 +145,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +160,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a[i]);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +176,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -139,13 +195,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -161,13 +217,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -183,13 +239,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -205,13 +261,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -223,10 +279,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -238,10 +294,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -250,12 +306,12 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -266,20 +322,20 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (int)0);
+                    assertEquals(r[i + k], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -291,19 +347,19 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (int)0);
+                        assertEquals(r[i + j], (int)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (int)0, "at index #" + idx);
+                assertEquals(r[idx], (int)0, "at index #" + idx);
             }
         }
     }
@@ -319,11 +375,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -332,12 +388,12 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -347,17 +403,17 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -367,17 +423,17 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (int)0);
+                         assertEquals(r[i+j], (int)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (int)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -391,10 +447,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -406,10 +462,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -421,10 +477,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -445,18 +501,18 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -471,18 +527,18 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -490,10 +546,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -501,10 +557,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -512,10 +568,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -524,10 +580,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -540,10 +596,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -555,10 +611,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -570,10 +626,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -588,10 +644,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (int)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -604,11 +660,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -622,11 +678,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -648,11 +704,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -666,11 +722,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -690,10 +746,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -705,10 +761,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -717,10 +773,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -730,10 +786,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -749,11 +805,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -770,11 +826,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -785,11 +841,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -806,11 +862,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -828,13 +884,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +911,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -876,13 +932,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(r, a, i, mask, b, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -903,13 +959,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -923,13 +979,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -944,13 +1000,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -965,13 +1021,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -987,13 +1043,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             int[] ref = f.apply(a, b, origin, part, mask, i);
             int[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1006,10 +1062,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1019,10 +1075,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1030,10 +1086,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1536,7 +1592,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         IntVector a = io.add((int)1); //[1,2]
         IntVector b = a.neg();  //[-1,-2]
         int[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1551,19 +1607,19 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Integer> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Integer> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         IntVector uab0 = zab0.rearrange(unz0,zab1);
         IntVector uab1 = zab0.rearrange(unz1,zab1);
         int[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         IntVector io = (IntVector) SPECIES.broadcast(0).addIndex(1);
         IntVector io2 = (IntVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1578,7 +1634,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1586,9 +1642,9 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1617,7 +1673,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1630,7 +1686,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::ADD);
     }
 
     static int add(int a, int b) {
@@ -1638,7 +1694,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1649,11 +1705,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::add);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1669,11 +1725,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1687,7 +1743,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::add);
     }
 
     static int SUB(int a, int b) {
@@ -1695,7 +1751,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void SUBIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUBIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1708,7 +1764,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::SUB);
     }
 
     static int sub(int a, int b) {
@@ -1716,7 +1772,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1727,11 +1783,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void SUBIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUBIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1747,11 +1803,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::SUB);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1765,7 +1821,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::sub);
     }
 
     static int MUL(int a, int b) {
@@ -1773,7 +1829,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MULIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MULIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1786,7 +1842,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::MUL);
     }
 
     static int mul(int a, int b) {
@@ -1794,7 +1850,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1805,11 +1861,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void MULIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void MULIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1825,11 +1881,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::MUL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1843,7 +1899,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::mul);
     }
 
     static int DIV(int a, int b) {
@@ -1851,7 +1907,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void DIVIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void DIVIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1866,7 +1922,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::DIV);
     }
 
     static int div(int a, int b) {
@@ -1874,7 +1930,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1889,11 +1945,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::div);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void DIVIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void DIVIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1911,11 +1967,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::DIV);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1933,7 +1989,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::div);
     }
 
     static int FIRST_NONZERO(int a, int b) {
@@ -1941,7 +1997,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void FIRST_NONZEROIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void FIRST_NONZEROIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1954,11 +2010,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void FIRST_NONZEROIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void FIRST_NONZEROIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -1974,7 +2030,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::FIRST_NONZERO);
     }
 
     static int AND(int a, int b) {
@@ -1982,7 +2038,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -1995,7 +2051,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::AND);
     }
 
     static int and(int a, int b) {
@@ -2003,7 +2059,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2014,11 +2070,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::and);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2034,7 +2090,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::AND);
     }
 
     static int AND_NOT(int a, int b) {
@@ -2042,7 +2098,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void AND_NOTIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void AND_NOTIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2055,11 +2111,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::AND_NOT);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void AND_NOTIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void AND_NOTIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2075,7 +2131,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::AND_NOT);
     }
 
     static int OR(int a, int b) {
@@ -2083,7 +2139,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2096,7 +2152,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::OR);
     }
 
     static int or(int a, int b) {
@@ -2104,7 +2160,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2115,11 +2171,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::or);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2135,7 +2191,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::OR);
     }
 
     static int XOR(int a, int b) {
@@ -2143,7 +2199,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void XORIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void XORIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2156,11 +2212,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::XOR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void XORIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void XORIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2176,7 +2232,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::XOR);
     }
 
     static int COMPRESS_BITS(int a, int b) {
@@ -2184,7 +2240,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void COMPRESS_BITSIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void COMPRESS_BITSIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2197,11 +2253,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void COMPRESS_BITSIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void COMPRESS_BITSIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2217,7 +2273,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::COMPRESS_BITS);
     }
 
     static int EXPAND_BITS(int a, int b) {
@@ -2225,7 +2281,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void EXPAND_BITSIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EXPAND_BITSIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2238,11 +2294,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void EXPAND_BITSIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EXPAND_BITSIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2258,11 +2314,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void addIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void addIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2272,11 +2328,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void addIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void addIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2289,11 +2345,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVectorMaxTests::add);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void subIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void subIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2303,11 +2359,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void subIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void subIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2320,11 +2376,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void mulIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void mulIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2334,11 +2390,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void mulIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void mulIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2351,11 +2407,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void divIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void divIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2367,11 +2423,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::div);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void divIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void divIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2386,11 +2442,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVectorMaxTests::div);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2400,11 +2456,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void orIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void orIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2414,11 +2470,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::or);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2431,11 +2487,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ANDIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ANDIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2445,11 +2501,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void andIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void andIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2459,11 +2515,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::and);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ANDIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ANDIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2476,11 +2532,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, IntMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, IntVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ORIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ORIntVectorMaxTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2490,11 +2546,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, IntMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, IntVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ORIntMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ORIntVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2507,11 +2563,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, IntMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ADDIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ADDIntVectorMaxTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2521,11 +2577,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, IntMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, IntVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ADDIntMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ADDIntVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2538,7 +2594,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, IntMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVectorMaxTests::ADD);
     }
 
     static int LSHL(int a, int b) {
@@ -2546,7 +2602,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2559,11 +2615,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::LSHL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2579,7 +2635,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::LSHL);
     }
 
     static int ASHR(int a, int b) {
@@ -2587,7 +2643,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2600,11 +2656,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::ASHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2620,7 +2676,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::ASHR);
     }
 
     static int LSHR(int a, int b) {
@@ -2628,7 +2684,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2641,11 +2697,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::LSHR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2661,7 +2717,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::LSHR);
     }
 
     static int LSHL_unary(int a, int b) {
@@ -2669,7 +2725,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHLIntMaxVectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHLIntVectorMaxTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2681,11 +2737,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, IntVectorMaxTests::LSHL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHLIntMaxVectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHLIntVectorMaxTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2700,7 +2756,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVectorMaxTests::LSHL_unary);
     }
 
     static int LSHR_unary(int a, int b) {
@@ -2708,7 +2764,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void LSHRIntMaxVectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LSHRIntVectorMaxTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2720,11 +2776,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVectorMaxTests::LSHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void LSHRIntMaxVectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LSHRIntVectorMaxTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2739,7 +2795,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVectorMaxTests::LSHR_unary);
     }
 
     static int ASHR_unary(int a, int b) {
@@ -2747,7 +2803,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ASHRIntMaxVectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ASHRIntVectorMaxTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2759,11 +2815,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, IntVectorMaxTests::ASHR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ASHRIntMaxVectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ASHRIntVectorMaxTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2778,7 +2834,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVectorMaxTests::ASHR_unary);
     }
 
     static int ROR(int a, int b) {
@@ -2786,7 +2842,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2799,11 +2855,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::ROR);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2819,7 +2875,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::ROR);
     }
 
     static int ROL(int a, int b) {
@@ -2827,7 +2883,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2840,11 +2896,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::ROL);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2860,7 +2916,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::ROL);
     }
 
     static int ROR_unary(int a, int b) {
@@ -2868,7 +2924,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void RORIntMaxVectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void RORIntVectorMaxTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2880,11 +2936,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, IntVectorMaxTests::ROR_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void RORIntMaxVectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void RORIntVectorMaxTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2899,7 +2955,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVectorMaxTests::ROR_unary);
     }
 
     static int ROL_unary(int a, int b) {
@@ -2907,7 +2963,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void ROLIntMaxVectorTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ROLIntVectorMaxTestsScalarShift(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2919,11 +2975,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, IntMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, IntVectorMaxTests::ROL_unary);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void ROLIntMaxVectorTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ROLIntVectorMaxTestsScalarShiftMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -2938,14 +2994,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, IntMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, IntVectorMaxTests::ROL_unary);
     }
     static int LSHR_binary_const(int a) {
         return (int)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHRIntMaxVectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHRIntVectorMaxTestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2956,11 +3012,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, IntMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, IntVectorMaxTests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHRIntMaxVectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHRIntVectorMaxTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -2974,7 +3030,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, IntMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVectorMaxTests::LSHR_binary_const);
     }
 
     static int LSHL_binary_const(int a) {
@@ -2982,7 +3038,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LSHLIntMaxVectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void LSHLIntVectorMaxTestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -2993,11 +3049,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, IntMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, IntVectorMaxTests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LSHLIntMaxVectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void LSHLIntVectorMaxTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3011,7 +3067,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, IntMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVectorMaxTests::LSHL_binary_const);
     }
 
     static int ASHR_binary_const(int a) {
@@ -3019,7 +3075,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ASHRIntMaxVectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ASHRIntVectorMaxTestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3030,11 +3086,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, IntMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, IntVectorMaxTests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ASHRIntMaxVectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ASHRIntVectorMaxTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3048,7 +3104,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, IntMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVectorMaxTests::ASHR_binary_const);
     }
 
     static int ROR_binary_const(int a) {
@@ -3056,7 +3112,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void RORIntMaxVectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void RORIntVectorMaxTestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3067,11 +3123,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, IntMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, IntVectorMaxTests::ROR_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void RORIntMaxVectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void RORIntVectorMaxTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3085,7 +3141,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, IntMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVectorMaxTests::ROR_binary_const);
     }
 
     static int ROL_binary_const(int a) {
@@ -3093,7 +3149,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ROLIntMaxVectorTestsScalarShiftConst(IntFunction<int[]> fa) {
+    static void ROLIntVectorMaxTestsScalarShiftConst(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3104,11 +3160,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, IntMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, IntVectorMaxTests::ROL_binary_const);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ROLIntMaxVectorTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
+    static void ROLIntVectorMaxTestsScalarShiftMaskedConst(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3122,14 +3178,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, IntMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, IntVectorMaxTests::ROL_binary_const);
     }
 
 
     static IntVector bv_MIN = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MINIntVectorMaxTestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3140,13 +3196,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, IntVectorMaxTests::MIN);
     }
 
     static IntVector bv_min = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void minIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void minIntVectorMaxTestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3157,13 +3213,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::min);
+        assertArraysEquals(r, a, (int)10, IntVectorMaxTests::min);
     }
 
     static IntVector bv_MIN_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINIntMaxVectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINIntVectorMaxTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3176,13 +3232,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, IntMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (int)10, mask, IntVectorMaxTests::MIN);
     }
 
     static IntVector bv_MAX = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void MAXIntVectorMaxTestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3193,13 +3249,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, IntVectorMaxTests::MAX);
     }
 
     static IntVector bv_max = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void maxIntMaxVectorTestsWithMemOp(IntFunction<int[]> fa) {
+    static void maxIntVectorMaxTestsWithMemOp(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -3210,13 +3266,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, IntMaxVectorTests::max);
+        assertArraysEquals(r, a, (int)10, IntVectorMaxTests::max);
     }
 
     static IntVector bv_MAX_M = IntVector.broadcast(SPECIES, (int)10);
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXIntMaxVectorTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXIntVectorMaxTestsMaskedWithMemOp(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3229,7 +3285,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (int)10, mask, IntMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (int)10, mask, IntVectorMaxTests::MAX);
     }
 
     static int MIN(int a, int b) {
@@ -3237,7 +3293,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3250,7 +3306,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::MIN);
     }
 
     static int min(int a, int b) {
@@ -3258,7 +3314,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3269,7 +3325,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::min);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::min);
     }
 
     static int MAX(int a, int b) {
@@ -3277,7 +3333,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3290,7 +3346,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::MAX);
     }
 
     static int max(int a, int b) {
@@ -3298,7 +3354,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3309,7 +3365,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::max);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::max);
     }
 
     static int UMIN(int a, int b) {
@@ -3317,7 +3373,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMINIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMINIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3330,11 +3386,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::UMIN);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMINIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMINIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3350,7 +3406,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::UMIN);
     }
 
     static int UMAX(int a, int b) {
@@ -3358,7 +3414,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void UMAXIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UMAXIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3371,11 +3427,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::UMAX);
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void UMAXIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UMAXIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3391,7 +3447,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::UMAX);
     }
 
     static int SADD(int a, int b) {
@@ -3399,7 +3455,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SADDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SADDIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3412,11 +3468,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::SADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SADDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SADDIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3432,7 +3488,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::SADD);
     }
 
     static int SSUB(int a, int b) {
@@ -3440,7 +3496,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SSUBIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SSUBIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3453,11 +3509,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::SSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SSUBIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SSUBIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3473,7 +3529,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::SSUB);
     }
 
     static int SUADD(int a, int b) {
@@ -3481,7 +3537,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUADDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUADDIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3494,11 +3550,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUADDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3514,7 +3570,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::SUADD);
     }
 
     static int SUSUB(int a, int b) {
@@ -3522,7 +3578,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpProvider")
-    static void SUSUBIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void SUSUBIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3535,11 +3591,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpMaskProvider")
-    static void SUSUBIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUSUBIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3555,11 +3611,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MINIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MINIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3569,11 +3625,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::MIN);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void minIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void minIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3583,11 +3639,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::min);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void MAXIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void MAXIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3597,11 +3653,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::MAX);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void maxIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void maxIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -3611,10 +3667,10 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, IntMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, IntVectorMaxTests::max);
     }
     @Test(dataProvider = "intSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SUADDAssocIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -3631,11 +3687,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, IntMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, IntVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "intSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void SUADDAssocIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                      IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -3656,11 +3712,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, IntMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, IntVectorMaxTests::SUADD);
     }
 
     static int ANDReduce(int[] a, int idx) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3669,7 +3725,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAll(int[] a) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3678,32 +3734,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ANDReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ANDReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                int v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::ANDReduce, IntMaxVectorTests::ANDReduceAll);
+                IntVectorMaxTests::ANDReduce, IntVectorMaxTests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = AND_IDENTITY;
+
+        assertEquals((int) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id & x), x);
+                assertEquals((int) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static int ANDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3713,7 +3787,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int ANDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = -1;
+        int res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3722,34 +3796,29 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ANDReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = -1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                int v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::ANDReduceMasked, IntMaxVectorTests::ANDReduceAllMasked);
+                IntVectorMaxTests::ANDReduceMasked, IntVectorMaxTests::ANDReduceAllMasked);
     }
 
     static int ORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3758,7 +3827,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAll(int[] a) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3767,32 +3836,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ORReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ORReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                int v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::ORReduce, IntMaxVectorTests::ORReduceAll);
+                IntVectorMaxTests::ORReduce, IntVectorMaxTests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = OR_IDENTITY;
+
+        assertEquals((int) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id | x), x);
+                assertEquals((int) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static int ORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3802,7 +3889,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int ORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3811,7 +3898,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ORReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3819,26 +3906,21 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                int v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::ORReduceMasked, IntMaxVectorTests::ORReduceAllMasked);
+                IntVectorMaxTests::ORReduceMasked, IntVectorMaxTests::ORReduceAllMasked);
     }
 
     static int XORReduce(int[] a, int idx) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3847,7 +3929,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAll(int[] a) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3856,32 +3938,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void XORReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void XORReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                int v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::XORReduce, IntMaxVectorTests::XORReduceAll);
+                IntVectorMaxTests::XORReduce, IntVectorMaxTests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = XOR_IDENTITY;
+
+        assertEquals((int) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id ^ x), x);
+                assertEquals((int) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static int XORReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3891,7 +3991,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int XORReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3900,7 +4000,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void XORReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3908,26 +4008,21 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                int v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::XORReduceMasked, IntMaxVectorTests::XORReduceAllMasked);
+                IntVectorMaxTests::XORReduceMasked, IntVectorMaxTests::XORReduceAllMasked);
     }
 
     static int ADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3936,7 +4031,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAll(int[] a) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3945,32 +4040,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                int v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::ADDReduce, IntMaxVectorTests::ADDReduceAll);
+                IntVectorMaxTests::ADDReduce, IntVectorMaxTests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = ADD_IDENTITY;
+
+        assertEquals((int) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id + x), x);
+                assertEquals((int) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static int ADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3980,7 +4093,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int ADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3989,7 +4102,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3997,26 +4110,21 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                int v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::ADDReduceMasked, IntMaxVectorTests::ADDReduceAllMasked);
+                IntVectorMaxTests::ADDReduceMasked, IntVectorMaxTests::ADDReduceAllMasked);
     }
 
     static int MULReduce(int[] a, int idx) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4025,7 +4133,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAll(int[] a) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4034,32 +4142,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MULReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void MULReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                int v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::MULReduce, IntMaxVectorTests::MULReduceAll);
+                IntVectorMaxTests::MULReduce, IntVectorMaxTests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MUL_IDENTITY;
+
+        assertEquals((int) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) (id * x), x);
+                assertEquals((int) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static int MULReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4069,7 +4195,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int MULReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 1;
+        int res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4078,34 +4204,29 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MULReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = 1;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                int v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::MULReduceMasked, IntMaxVectorTests::MULReduceAllMasked);
+                IntVectorMaxTests::MULReduceMasked, IntVectorMaxTests::MULReduceAllMasked);
     }
 
     static int MINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.min(res, a[i]);
         }
@@ -4114,7 +4235,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduce(a, i));
         }
@@ -4123,32 +4244,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MINReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void MINReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                int v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::MINReduce, IntMaxVectorTests::MINReduceAll);
+                IntVectorMaxTests::MINReduce, IntVectorMaxTests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MIN_IDENTITY;
+
+        assertEquals((int) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.min(id, x), x);
+                assertEquals((int) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static int MINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.min(res, a[i]);
@@ -4158,7 +4297,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int MINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4167,34 +4306,29 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MINReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                int v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (int) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::MINReduceMasked, IntMaxVectorTests::MINReduceAllMasked);
+                IntVectorMaxTests::MINReduceMasked, IntVectorMaxTests::MINReduceAllMasked);
     }
 
     static int MAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) Math.max(res, a[i]);
         }
@@ -4203,7 +4337,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduce(a, i));
         }
@@ -4212,32 +4346,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void MAXReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void MAXReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                int v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::MAXReduce, IntMaxVectorTests::MAXReduceAll);
+                IntVectorMaxTests::MAXReduce, IntVectorMaxTests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = MAX_IDENTITY;
+
+        assertEquals((int) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) Math.max(id, x), x);
+                assertEquals((int) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static int MAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) Math.max(res, a[i]);
@@ -4247,7 +4399,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int MAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4256,34 +4408,29 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void MAXReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                int v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (int) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::MAXReduceMasked, IntMaxVectorTests::MAXReduceAllMasked);
+                IntVectorMaxTests::MAXReduceMasked, IntVectorMaxTests::MAXReduceAllMasked);
     }
 
     static int UMINReduce(int[] a, int idx) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4292,7 +4439,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAll(int[] a) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4301,32 +4448,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMINReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void UMINReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                int v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::UMINReduce, IntMaxVectorTests::UMINReduceAll);
+                IntVectorMaxTests::UMINReduce, IntVectorMaxTests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMIN_IDENTITY;
+
+        assertEquals((int) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.minUnsigned(id, x), x);
+                assertEquals((int) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static int UMINReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.minUnsigned(res, a[i]);
@@ -4336,7 +4501,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int UMINReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MAX_VALUE;
+        int res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4345,34 +4510,29 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMINReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MAX_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                int v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::UMINReduceMasked, IntMaxVectorTests::UMINReduceAllMasked);
+                IntVectorMaxTests::UMINReduceMasked, IntVectorMaxTests::UMINReduceAllMasked);
     }
 
     static int UMAXReduce(int[] a, int idx) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4381,7 +4541,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAll(int[] a) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4390,32 +4550,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void UMAXReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void UMAXReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                int v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::UMAXReduce, IntMaxVectorTests::UMAXReduceAll);
+                IntVectorMaxTests::UMAXReduce, IntVectorMaxTests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = UMAX_IDENTITY;
+
+        assertEquals((int) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((int) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static int UMAXReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.maxUnsigned(res, a[i]);
@@ -4425,7 +4603,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int UMAXReduceAllMasked(int[] a, boolean[] mask) {
-        int res = Integer.MIN_VALUE;
+        int res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4434,34 +4612,29 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void UMAXReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = Integer.MIN_VALUE;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Integer.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                int v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::UMAXReduceMasked, IntMaxVectorTests::UMAXReduceAllMasked);
+                IntVectorMaxTests::UMAXReduceMasked, IntVectorMaxTests::UMAXReduceAllMasked);
     }
 
     static int FIRST_NONZEROReduce(int[] a, int idx) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4470,7 +4643,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAll(int[] a) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4479,32 +4652,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void FIRST_NONZEROReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void FIRST_NONZEROReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::FIRST_NONZEROReduce, IntMaxVectorTests::FIRST_NONZEROReduceAll);
+                IntVectorMaxTests::FIRST_NONZEROReduce, IntVectorMaxTests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "intUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static int FIRST_NONZEROReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4514,7 +4705,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int FIRST_NONZEROReduceAllMasked(int[] a, boolean[] mask) {
-        int res = (int) 0;
+        int res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4523,30 +4714,25 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Integer> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        int ra = (int) 0;
+        int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (int) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                int v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::FIRST_NONZEROReduceMasked, IntMaxVectorTests::FIRST_NONZEROReduceAllMasked);
+                IntVectorMaxTests::FIRST_NONZEROReduceMasked, IntVectorMaxTests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4559,7 +4745,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueIntMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueIntVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4570,7 +4756,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, IntMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVectorMaxTests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4583,7 +4769,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueIntMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueIntVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4594,11 +4780,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, IntMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, IntVectorMaxTests::allTrue);
     }
 
     static int SUADDReduce(int[] a, int idx) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4607,7 +4793,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAll(int[] a) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4616,32 +4802,50 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSaturatingUnaryOpProvider")
-    static void SUADDReduceIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void SUADDReduceIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                int v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                IntMaxVectorTests::SUADDReduce, IntMaxVectorTests::SUADDReduceAll);
+                IntVectorMaxTests::SUADDReduce, IntVectorMaxTests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "intSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<int[]> fa) {
+        int[] a = fa.apply(SPECIES.length());
+        int id = SUADD_IDENTITY;
+
+        assertEquals((int) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        int x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((int) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((int) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static int SUADDReduceMasked(int[] a, int idx, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (int) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4651,7 +4855,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     static int SUADDReduceAllMasked(int[] a, boolean[] mask) {
-        int res = 0;
+        int res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (int) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4659,7 +4863,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "intSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4667,26 +4871,21 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 IntVector av = IntVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                IntVector av = IntVector.fromArray(SPECIES, a, i);
-                ra = (int) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                int v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (int) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::SUADDReduceMasked, IntMaxVectorTests::SUADDReduceAllMasked);
+                IntVectorMaxTests::SUADDReduceMasked, IntVectorMaxTests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void withIntMaxVectorTests(IntFunction<int []> fa, IntFunction<int []> fb) {
+    static void withIntVectorMaxTests(IntFunction<int []> fa, IntFunction<int []> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -4709,7 +4908,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_DEFAULTIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void IS_DEFAULTIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4719,14 +4918,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_DEFAULTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void IS_DEFAULTMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4739,7 +4938,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4750,7 +4949,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTestOpProvider")
-    static void IS_NEGATIVEIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void IS_NEGATIVEIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4760,14 +4959,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void IS_NEGATIVEMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4780,14 +4979,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4799,14 +4998,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4818,14 +5017,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LTIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4841,14 +5040,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GTIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GTIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4860,14 +5059,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GTIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GTIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4883,14 +5082,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4902,14 +5101,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4921,14 +5120,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void EQIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4944,14 +5143,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void NEIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void NEIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -4963,14 +5162,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void NEIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void NEIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -4986,14 +5185,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LEIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LEIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5005,14 +5204,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LEIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void LEIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5028,14 +5227,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void GEIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void GEIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5047,14 +5246,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void GEIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void GEIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5070,14 +5269,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULTIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULTIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5089,14 +5288,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULTIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULTIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5112,14 +5311,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGTIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGTIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5131,14 +5330,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGTIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGTIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5154,14 +5353,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ULEIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ULEIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5173,14 +5372,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void ULEIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void ULEIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5196,14 +5395,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void UGEIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void UGEIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5215,14 +5414,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void UGEIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void UGEIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5238,14 +5437,14 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5255,13 +5454,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5275,13 +5474,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void LTIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void LTIntVectorMaxTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5291,13 +5490,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void LTIntMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void LTIntVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5311,13 +5510,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (int)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5327,13 +5526,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5347,13 +5546,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void EQIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void EQIntVectorMaxTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -5363,13 +5562,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (int)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpMaskProvider")
-    static void EQIntMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
+    static void EQIntVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<int[]> fa,
                                 IntFunction<int[]> fb, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5383,7 +5582,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (int)((long)b[i])));
             }
         }
     }
@@ -5393,7 +5592,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5409,11 +5608,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, IntMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, IntVectorMaxTests::blend);
     }
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void RearrangeIntMaxVectorTests(IntFunction<int[]> fa,
+    static void RearrangeIntVectorMaxTests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5430,7 +5629,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void RearrangeIntMaxVectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void RearrangeIntVectorMaxTestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -5448,7 +5647,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void compressIntMaxVectorTests(IntFunction<int[]> fa,
+    static void compressIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5466,7 +5665,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void expandIntMaxVectorTests(IntFunction<int[]> fa,
+    static void expandIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -5484,7 +5683,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void getIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void getIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -5640,7 +5839,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void BroadcastIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5654,7 +5853,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZeroIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ZeroIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -5664,7 +5863,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static int[] sliceUnary(int[] a, int origin, int idx) {
@@ -5679,7 +5878,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void sliceUnaryIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void sliceUnaryIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5690,7 +5889,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, IntMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, IntVectorMaxTests::sliceUnary);
     }
 
     static int[] sliceBinary(int[] a, int[] b, int origin, int idx) {
@@ -5707,7 +5906,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void sliceBinaryIntMaxVectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void sliceBinaryIntVectorMaxTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5720,7 +5919,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, IntMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, IntVectorMaxTests::sliceBinary);
     }
 
     static int[] slice(int[] a, int[] b, int origin, boolean[] mask, int idx) {
@@ -5737,7 +5936,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void sliceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void sliceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5754,7 +5953,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, IntMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, IntVectorMaxTests::slice);
     }
 
     static int[] unsliceUnary(int[] a, int origin, int idx) {
@@ -5771,7 +5970,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void unsliceUnaryIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void unsliceUnaryIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5782,7 +5981,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, IntMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, IntVectorMaxTests::unsliceUnary);
     }
 
     static int[] unsliceBinary(int[] a, int[] b, int origin, int part, int idx) {
@@ -5808,7 +6007,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpProvider")
-    static void unsliceBinaryIntMaxVectorTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void unsliceBinaryIntVectorMaxTestsBinary(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] r = new int[a.length];
@@ -5822,7 +6021,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, IntMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, IntVectorMaxTests::unsliceBinary);
     }
 
     static int[] unslice(int[] a, int[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5862,7 +6061,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void unsliceIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void unsliceIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
     IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5879,7 +6078,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, IntMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, IntVectorMaxTests::unslice);
     }
 
     static int BITWISE_BLEND(int a, int b, int c) {
@@ -5891,7 +6090,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5906,11 +6105,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5923,11 +6122,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, IntVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -5945,11 +6144,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5960,11 +6159,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVectorMaxTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5975,11 +6174,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -5990,11 +6189,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             IntVector bv = IntVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, IntVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendIntMaxVectorTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVectorMaxTestsAltBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6005,11 +6204,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             IntVector cv = IntVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, IntVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6024,11 +6223,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVectorMaxTestsAltBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6043,11 +6242,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void BITWISE_BLENDIntVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6058,11 +6257,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "intTernaryOpProvider")
-    static void bitwiseBlendIntMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void bitwiseBlendIntVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] c = fc.apply(SPECIES.length());
@@ -6073,11 +6272,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, IntMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, IntVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "intTernaryOpMaskProvider")
-    static void BITWISE_BLENDIntMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void BITWISE_BLENDIntVectorMaxTestsDoubleBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<int[]> fc, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6091,7 +6290,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, IntVectorMaxTests::BITWISE_BLEND);
     }
 
     static int NEG(int a) {
@@ -6103,7 +6302,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NEGIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void NEGIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6114,11 +6313,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::NEG);
+        assertArraysEquals(r, a, IntVectorMaxTests::NEG);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void negIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void negIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6129,11 +6328,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::neg);
+        assertArraysEquals(r, a, IntVectorMaxTests::neg);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NEGMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void NEGMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6147,7 +6346,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::NEG);
     }
 
     static int ABS(int a) {
@@ -6159,7 +6358,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ABSIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ABSIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6170,11 +6369,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::ABS);
+        assertArraysEquals(r, a, IntVectorMaxTests::ABS);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void absIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void absIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6185,11 +6384,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::abs);
+        assertArraysEquals(r, a, IntVectorMaxTests::abs);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ABSMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void ABSMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6203,7 +6402,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::ABS);
     }
 
     static int NOT(int a) {
@@ -6215,7 +6414,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void NOTIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void NOTIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6226,11 +6425,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::NOT);
+        assertArraysEquals(r, a, IntVectorMaxTests::NOT);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void notIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void notIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6241,11 +6440,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::not);
+        assertArraysEquals(r, a, IntVectorMaxTests::not);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void NOTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void NOTMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6259,7 +6458,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::NOT);
     }
 
     static int ZOMO(int a) {
@@ -6267,7 +6466,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ZOMOIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ZOMOIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6278,11 +6477,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, IntVectorMaxTests::ZOMO);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ZOMOMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void ZOMOMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6296,7 +6495,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::ZOMO);
     }
 
     static int BIT_COUNT(int a) {
@@ -6304,7 +6503,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BIT_COUNTIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void BIT_COUNTIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6315,11 +6514,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, IntVectorMaxTests::BIT_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void BIT_COUNTMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6333,7 +6532,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::BIT_COUNT);
     }
 
     static int TRAILING_ZEROS_COUNT(int a) {
@@ -6341,7 +6540,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void TRAILING_ZEROS_COUNTIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6352,11 +6551,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6370,7 +6569,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     static int LEADING_ZEROS_COUNT(int a) {
@@ -6378,7 +6577,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void LEADING_ZEROS_COUNTIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6389,11 +6588,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, IntVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6407,7 +6606,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     static int REVERSE(int a) {
@@ -6415,7 +6614,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSEIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void REVERSEIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6426,11 +6625,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, IntVectorMaxTests::REVERSE);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSEMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void REVERSEMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6444,7 +6643,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::REVERSE);
     }
 
     static int REVERSE_BYTES(int a) {
@@ -6452,7 +6651,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void REVERSE_BYTESIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void REVERSE_BYTESIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
 
@@ -6463,11 +6662,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, IntVectorMaxTests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedIntMaxVectorTests(IntFunction<int[]> fa,
+    static void REVERSE_BYTESMaskedIntVectorMaxTests(IntFunction<int[]> fa,
                                                 IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = fr.apply(SPECIES.length());
@@ -6481,7 +6680,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, IntMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, IntVectorMaxTests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6489,7 +6688,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandIntVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6502,7 +6701,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::band);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6510,7 +6709,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorIntVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6523,7 +6722,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::bor);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6531,7 +6730,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorIntVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6544,7 +6743,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::bxor);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6552,7 +6751,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotIntVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6565,7 +6764,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::bandNot);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6573,7 +6772,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqIntVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6586,7 +6785,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, IntMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, IntVectorMaxTests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6594,7 +6793,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotIntMaxVectorTests(IntFunction<boolean[]> fa) {
+    static void masknotIntVectorMaxTests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6605,7 +6804,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, IntMaxVectorTests::unot);
+        assertArraysEquals(r, a, IntVectorMaxTests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6614,15 +6813,15 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongIntMaxVectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongIntVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6636,7 +6835,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void ltIntMaxVectorTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void ltIntVectorMaxTestsBroadcastSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6646,13 +6845,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intCompareOpProvider")
-    static void eqIntMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
+    static void eqIntVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
 
@@ -6662,13 +6861,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toIntArrayIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toIntArrayIntVectorMaxTestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6679,7 +6878,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toLongArrayIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toLongArrayIntVectorMaxTestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6690,7 +6889,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toDoubleArrayIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toDoubleArrayIntVectorMaxTestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6701,7 +6900,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void toStringIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void toStringIntVectorMaxTestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6714,7 +6913,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void hashCodeIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void hashCodeIntVectorMaxTestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6747,7 +6946,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void ADDReduceLongIntMaxVectorTests(IntFunction<int[]> fa) {
+    static void ADDReduceLongIntVectorMaxTests(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6763,7 +6962,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                IntMaxVectorTests::ADDReduceLong, IntMaxVectorTests::ADDReduceAllLong);
+                IntVectorMaxTests::ADDReduceLong, IntVectorMaxTests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(int[] a, int idx, boolean[] mask) {
@@ -6786,7 +6985,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpMaskProvider")
-    static void ADDReduceLongIntMaxVectorTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongIntVectorMaxTestsMasked(IntFunction<int[]> fa, IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6804,11 +7003,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                IntMaxVectorTests::ADDReduceLongMasked, IntMaxVectorTests::ADDReduceAllLongMasked);
+                IntVectorMaxTests::ADDReduceLongMasked, IntVectorMaxTests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "intUnaryOpProvider")
-    static void BroadcastLongIntMaxVectorTestsSmokeTest(IntFunction<int[]> fa) {
+    static void BroadcastLongIntVectorMaxTestsSmokeTest(IntFunction<int[]> fa) {
         int[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6819,7 +7018,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intBinaryOpMaskProvider")
-    static void blendIntMaxVectorTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
+    static void blendIntVectorMaxTestsBroadcastLongSmokeTest(IntFunction<int[]> fa, IntFunction<int[]> fb,
                                           IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
@@ -6833,12 +7032,12 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, IntMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, IntVectorMaxTests::blend);
     }
 
 
     @Test(dataProvider = "intUnaryOpShuffleProvider")
-    static void SelectFromIntMaxVectorTests(IntFunction<int[]> fa,
+    static void SelectFromIntVectorMaxTests(IntFunction<int[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -6854,7 +7053,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorIntMaxVectorTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
+    static void SelectFromTwoVectorIntVectorMaxTests(IntFunction<int[]> fa, IntFunction<int[]> fb, IntFunction<int[]> fc) {
         int[] a = fa.apply(SPECIES.length());
         int[] b = fb.apply(SPECIES.length());
         int[] idx = fc.apply(SPECIES.length());
@@ -6872,7 +7071,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "intUnaryOpShuffleMaskProvider")
-    static void SelectFromIntMaxVectorTestsMaskedSmokeTest(IntFunction<int[]> fa,
+    static void SelectFromIntVectorMaxTestsMaskedSmokeTest(IntFunction<int[]> fa,
                                                            BiFunction<Integer,Integer,int[]> fs,
                                                            IntFunction<boolean[]> fm) {
         int[] a = fa.apply(SPECIES.length());
@@ -6891,7 +7090,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousIntMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousIntVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6902,12 +7101,12 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringIntMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringIntVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6921,7 +7120,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsIntMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsIntVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6930,12 +7129,12 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsIntMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsIntVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6945,13 +7144,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeIntVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6973,7 +7172,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountIntVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6984,7 +7183,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, IntMaxVectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, IntVectorMaxTests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6998,7 +7197,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueIntVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7009,7 +7208,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, IntMaxVectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, IntVectorMaxTests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -7023,7 +7222,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueIntVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -7034,11 +7233,11 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, IntMaxVectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, IntVectorMaxTests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressIntMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressIntVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -7048,7 +7247,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7066,7 +7265,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeIntMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeIntVectorMaxTestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7074,13 +7273,13 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongIntMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongIntVectorMaxTestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7088,7 +7287,7 @@ public class IntMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7107,36 +7306,36 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundIntMaxVectorTestsSmokeTest(int length) {
+    static void loopBoundIntVectorMaxTestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongIntMaxVectorTestsSmokeTest(int _length) {
+    static void loopBoundLongIntVectorMaxTestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeIntMaxVectorTestsSmokeTest() {
+    static void ElementSizeIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Integer.SIZE);
+        assertEquals(elsize, Integer.SIZE);
     }
 
     @Test
-    static void VectorShapeIntMaxVectorTestsSmokeTest() {
+    static void VectorShapeIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_Max_BIT));
     }
 
     @Test
-    static void ShapeWithLanesIntMaxVectorTestsSmokeTest() {
+    static void ShapeWithLanesIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(int.class);
@@ -7144,32 +7343,32 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeIntMaxVectorTestsSmokeTest() {
+    static void ElementTypeIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementType() == int.class);
     }
 
     @Test
-    static void SpeciesElementSizeIntMaxVectorTestsSmokeTest() {
+    static void SpeciesElementSizeIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().elementSize() == Integer.SIZE);
     }
 
     @Test
-    static void VectorTypeIntMaxVectorTestsSmokeTest() {
+    static void VectorTypeIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesIntMaxVectorTestsSmokeTest() {
+    static void WithLanesIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(int.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeIntMaxVectorTestsSmokeTest() {
+    static void WithShapeIntVectorMaxTestsSmokeTest() {
         IntVector av = IntVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7177,9 +7376,9 @@ public class IntMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueIntMaxVectorTestsSmokeTest() {
+    static void MaskAllTrueIntVectorMaxTestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongVector128LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/LongVector128LoadStoreTests.java
index 57a0880aed3..3aa9c93e0d7 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector128LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Long128VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation LongVector128LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class LongVector128LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_128;
 
@@ -61,14 +61,29 @@ public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(long[] r, long[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Long128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Long128VectorTests.java b/test/jdk/jdk/incubator/vector/LongVector128Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Long128VectorTests.java
rename to test/jdk/jdk/incubator/vector/LongVector128Tests.java
index 6c305a5c2b4..1d3af1684b9 100644
--- a/test/jdk/jdk/incubator/vector/Long128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector128Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Long128VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation LongVector128Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,65 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Long128VectorTests extends AbstractVectorTest {
+public class LongVector128Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_128;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected, long delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(long actual, long expected, long delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final long CONST_SHIFT = Long.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final long ADD_IDENTITY = (long)0;
+    private static final long AND_IDENTITY = (long)-1;
+    private static final long FIRST_NONZERO_IDENTITY = (long)0;
+    private static final long MAX_IDENTITY = Long.MIN_VALUE;
+    private static final long MIN_IDENTITY = Long.MAX_VALUE;
+    private static final long MUL_IDENTITY = (long)1;
+    private static final long OR_IDENTITY = (long)0;
+    private static final long SUADD_IDENTITY = (long)0;
+    private static final long UMAX_IDENTITY = (long)0;   // Minimum unsigned value
+    private static final long UMIN_IDENTITY = (long)-1;  // Maximum unsigned value
+    private static final long XOR_IDENTITY = (long)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
     static void assertArraysStrictlyEquals(long[] r, long[] a) {
@@ -84,10 +133,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +148,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +164,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +183,13 @@ public class Long128VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +205,13 @@ public class Long128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -175,10 +224,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -190,10 +239,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -202,12 +251,12 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -218,20 +267,20 @@ public class Long128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (long)0);
+                    assertEquals(r[i + k], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -243,19 +292,19 @@ public class Long128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (long)0);
+                        assertEquals(r[i + j], (long)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -271,11 +320,11 @@ public class Long128VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -284,12 +333,12 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -299,17 +348,17 @@ public class Long128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -319,17 +368,17 @@ public class Long128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -343,10 +392,10 @@ public class Long128VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -358,10 +407,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -373,10 +422,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -397,18 +446,18 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -423,18 +472,18 @@ public class Long128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -442,10 +491,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -453,10 +502,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -464,10 +513,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -476,10 +525,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -492,10 +541,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -507,10 +556,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -522,10 +571,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -540,10 +589,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -556,11 +605,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -574,11 +623,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -600,11 +649,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -618,11 +667,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -642,10 +691,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -657,10 +706,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -669,10 +718,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -682,10 +731,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -701,11 +750,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -722,11 +771,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -737,11 +786,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -758,11 +807,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -780,13 +829,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -807,13 +856,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -828,13 +877,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +904,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -875,13 +924,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -896,13 +945,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -917,13 +966,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -939,13 +988,13 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -991,10 +1040,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1004,10 +1053,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1015,10 +1064,10 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1553,7 +1602,7 @@ public class Long128VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         LongVector a = io.add((long)1); //[1,2]
         LongVector b = a.neg();  //[-1,-2]
         long[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1568,19 +1617,19 @@ public class Long128VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Long> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Long> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         LongVector uab0 = zab0.rearrange(unz0,zab1);
         LongVector uab1 = zab0.rearrange(unz1,zab1);
         long[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1595,7 +1644,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1603,9 +1652,9 @@ public class Long128VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1634,7 +1683,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1647,7 +1696,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::ADD);
+        assertArraysEquals(r, a, b, LongVector128Tests::ADD);
     }
 
     static long add(long a, long b) {
@@ -1655,7 +1704,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1666,11 +1715,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::add);
+        assertArraysEquals(r, a, b, LongVector128Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1686,11 +1735,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1704,7 +1753,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::add);
     }
 
     static long SUB(long a, long b) {
@@ -1712,7 +1761,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void SUBLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUBLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1725,7 +1774,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::SUB);
+        assertArraysEquals(r, a, b, LongVector128Tests::SUB);
     }
 
     static long sub(long a, long b) {
@@ -1733,7 +1782,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1744,11 +1793,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::sub);
+        assertArraysEquals(r, a, b, LongVector128Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void SUBLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUBLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1764,11 +1813,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1782,7 +1831,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::sub);
     }
 
     static long MUL(long a, long b) {
@@ -1790,7 +1839,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MULLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MULLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1803,7 +1852,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::MUL);
+        assertArraysEquals(r, a, b, LongVector128Tests::MUL);
     }
 
     static long mul(long a, long b) {
@@ -1811,7 +1860,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1822,11 +1871,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::mul);
+        assertArraysEquals(r, a, b, LongVector128Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void MULLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void MULLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1842,11 +1891,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1860,7 +1909,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::mul);
     }
 
     static long DIV(long a, long b) {
@@ -1868,7 +1917,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void DIVLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void DIVLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1883,7 +1932,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::DIV);
+        assertArraysEquals(r, a, b, LongVector128Tests::DIV);
     }
 
     static long div(long a, long b) {
@@ -1891,7 +1940,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1906,11 +1955,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::div);
+        assertArraysEquals(r, a, b, LongVector128Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void DIVLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void DIVLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1928,11 +1977,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1950,7 +1999,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1958,7 +2007,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void FIRST_NONZEROLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void FIRST_NONZEROLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1971,11 +2020,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, LongVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void FIRST_NONZEROLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void FIRST_NONZEROLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1991,7 +2040,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1999,7 +2048,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2012,7 +2061,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::AND);
+        assertArraysEquals(r, a, b, LongVector128Tests::AND);
     }
 
     static long and(long a, long b) {
@@ -2020,7 +2069,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2031,11 +2080,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::and);
+        assertArraysEquals(r, a, b, LongVector128Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2051,7 +2100,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::AND);
     }
 
     static long AND_NOT(long a, long b) {
@@ -2059,7 +2108,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void AND_NOTLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void AND_NOTLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2072,11 +2121,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, LongVector128Tests::AND_NOT);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void AND_NOTLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void AND_NOTLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2092,7 +2141,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::AND_NOT);
     }
 
     static long OR(long a, long b) {
@@ -2100,7 +2149,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2113,7 +2162,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::OR);
+        assertArraysEquals(r, a, b, LongVector128Tests::OR);
     }
 
     static long or(long a, long b) {
@@ -2121,7 +2170,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::or);
+        assertArraysEquals(r, a, b, LongVector128Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2152,7 +2201,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::OR);
     }
 
     static long XOR(long a, long b) {
@@ -2160,7 +2209,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void XORLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void XORLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2173,11 +2222,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::XOR);
+        assertArraysEquals(r, a, b, LongVector128Tests::XOR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void XORLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void XORLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2193,7 +2242,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::XOR);
     }
 
     static long COMPRESS_BITS(long a, long b) {
@@ -2201,7 +2250,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void COMPRESS_BITSLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void COMPRESS_BITSLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2263,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, LongVector128Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void COMPRESS_BITSLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void COMPRESS_BITSLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2234,7 +2283,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::COMPRESS_BITS);
     }
 
     static long EXPAND_BITS(long a, long b) {
@@ -2242,7 +2291,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void EXPAND_BITSLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EXPAND_BITSLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2255,11 +2304,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, LongVector128Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void EXPAND_BITSLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EXPAND_BITSLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2275,11 +2324,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2289,11 +2338,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2306,11 +2355,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector128Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2320,11 +2369,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2386,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector128Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2400,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2368,11 +2417,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector128Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2384,11 +2433,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2403,11 +2452,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector128Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2417,11 +2466,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2431,11 +2480,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2448,11 +2497,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector128Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2462,11 +2511,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2476,11 +2525,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2493,11 +2542,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector128Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong128VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector128TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2507,11 +2556,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector128Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2524,11 +2573,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector128Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong128VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector128TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2538,11 +2587,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector128Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2555,7 +2604,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector128Tests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2563,7 +2612,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2576,11 +2625,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, LongVector128Tests::LSHL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2596,7 +2645,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::LSHL);
     }
 
     static long ASHR(long a, long b) {
@@ -2604,7 +2653,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2617,11 +2666,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, LongVector128Tests::ASHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2637,7 +2686,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::ASHR);
     }
 
     static long LSHR(long a, long b) {
@@ -2645,7 +2694,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2658,11 +2707,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, LongVector128Tests::LSHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2678,7 +2727,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::LSHR);
     }
 
     static long LSHL_unary(long a, long b) {
@@ -2686,7 +2735,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong128VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector128TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2698,11 +2747,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector128Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong128VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector128TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2717,7 +2766,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector128Tests::LSHL_unary);
     }
 
     static long LSHR_unary(long a, long b) {
@@ -2725,7 +2774,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong128VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector128TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2737,11 +2786,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector128Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong128VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector128TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2756,7 +2805,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector128Tests::LSHR_unary);
     }
 
     static long ASHR_unary(long a, long b) {
@@ -2764,7 +2813,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong128VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector128TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2776,11 +2825,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector128Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong128VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector128TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2795,7 +2844,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector128Tests::ASHR_unary);
     }
 
     static long ROR(long a, long b) {
@@ -2803,7 +2852,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2816,11 +2865,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::ROR);
+        assertArraysEquals(r, a, b, LongVector128Tests::ROR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2836,7 +2885,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::ROR);
     }
 
     static long ROL(long a, long b) {
@@ -2844,7 +2893,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2857,11 +2906,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::ROL);
+        assertArraysEquals(r, a, b, LongVector128Tests::ROL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2877,7 +2926,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::ROL);
     }
 
     static long ROR_unary(long a, long b) {
@@ -2885,7 +2934,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong128VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector128TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2897,11 +2946,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector128Tests::ROR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong128VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector128TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2916,7 +2965,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector128Tests::ROR_unary);
     }
 
     static long ROL_unary(long a, long b) {
@@ -2924,7 +2973,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong128VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector128TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2936,11 +2985,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector128Tests::ROL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong128VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector128TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2955,14 +3004,14 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector128Tests::ROL_unary);
     }
     static long LSHR_binary_const(long a) {
         return (long)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHRLong128VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHRLongVector128TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -2973,11 +3022,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector128Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHRLong128VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHRLongVector128TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2991,7 +3040,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector128Tests::LSHR_binary_const);
     }
 
     static long LSHL_binary_const(long a) {
@@ -2999,7 +3048,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHLLong128VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHLLongVector128TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3010,11 +3059,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, LongVector128Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHLLong128VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHLLongVector128TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3028,7 +3077,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector128Tests::LSHL_binary_const);
     }
 
     static long ASHR_binary_const(long a) {
@@ -3036,7 +3085,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ASHRLong128VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ASHRLongVector128TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3047,11 +3096,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector128Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ASHRLong128VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ASHRLongVector128TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3065,7 +3114,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector128Tests::ASHR_binary_const);
     }
 
     static long ROR_binary_const(long a) {
@@ -3073,7 +3122,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void RORLong128VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void RORLongVector128TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3084,11 +3133,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, LongVector128Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void RORLong128VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void RORLongVector128TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3102,7 +3151,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector128Tests::ROR_binary_const);
     }
 
     static long ROL_binary_const(long a) {
@@ -3110,7 +3159,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ROLLong128VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ROLLongVector128TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3121,11 +3170,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, LongVector128Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ROLLong128VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ROLLongVector128TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3139,14 +3188,14 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector128Tests::ROL_binary_const);
     }
 
 
     static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MINLongVector128TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3157,13 +3206,13 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long128VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, LongVector128Tests::MIN);
     }
 
     static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void minLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void minLongVector128TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3174,13 +3223,13 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long128VectorTests::min);
+        assertArraysEquals(r, a, (long)10, LongVector128Tests::min);
     }
 
     static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINLong128VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINLongVector128TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3193,13 +3242,13 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long128VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, mask, LongVector128Tests::MIN);
     }
 
     static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MAXLongVector128TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3210,13 +3259,13 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long128VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, LongVector128Tests::MAX);
     }
 
     static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void maxLong128VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void maxLongVector128TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3227,13 +3276,13 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long128VectorTests::max);
+        assertArraysEquals(r, a, (long)10, LongVector128Tests::max);
     }
 
     static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXLong128VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXLongVector128TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3246,7 +3295,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long128VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, mask, LongVector128Tests::MAX);
     }
 
     static long MIN(long a, long b) {
@@ -3254,7 +3303,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3267,7 +3316,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::MIN);
+        assertArraysEquals(r, a, b, LongVector128Tests::MIN);
     }
 
     static long min(long a, long b) {
@@ -3275,7 +3324,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3286,7 +3335,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::min);
+        assertArraysEquals(r, a, b, LongVector128Tests::min);
     }
 
     static long MAX(long a, long b) {
@@ -3294,7 +3343,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3307,7 +3356,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::MAX);
+        assertArraysEquals(r, a, b, LongVector128Tests::MAX);
     }
 
     static long max(long a, long b) {
@@ -3315,7 +3364,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3326,7 +3375,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::max);
+        assertArraysEquals(r, a, b, LongVector128Tests::max);
     }
 
     static long UMIN(long a, long b) {
@@ -3334,7 +3383,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMINLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMINLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3347,11 +3396,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, LongVector128Tests::UMIN);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMINLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMINLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3367,7 +3416,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::UMIN);
     }
 
     static long UMAX(long a, long b) {
@@ -3375,7 +3424,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMAXLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMAXLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3388,11 +3437,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, LongVector128Tests::UMAX);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMAXLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMAXLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3408,7 +3457,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::UMAX);
     }
 
     static long SADD(long a, long b) {
@@ -3416,7 +3465,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SADDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SADDLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3429,11 +3478,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::SADD);
+        assertArraysEquals(r, a, b, LongVector128Tests::SADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SADDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SADDLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3449,7 +3498,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::SADD);
     }
 
     static long SSUB(long a, long b) {
@@ -3457,7 +3506,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SSUBLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SSUBLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3470,11 +3519,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, LongVector128Tests::SSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SSUBLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SSUBLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3490,7 +3539,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::SSUB);
     }
 
     static long SUADD(long a, long b) {
@@ -3498,7 +3547,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUADDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUADDLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3560,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, LongVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUADDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3531,7 +3580,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::SUADD);
     }
 
     static long SUSUB(long a, long b) {
@@ -3539,7 +3588,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUSUBLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUSUBLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3552,11 +3601,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, LongVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUSUBLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUSUBLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3572,11 +3621,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3586,11 +3635,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3600,11 +3649,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3614,11 +3663,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3628,10 +3677,10 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, LongVector128Tests::max);
     }
     @Test(dataProvider = "longSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SUADDAssocLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -3648,11 +3697,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Long128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, LongVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDAssocLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                      IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3673,11 +3722,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Long128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, LongVector128Tests::SUADD);
     }
 
     static long ANDReduce(long[] a, int idx) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3686,7 +3735,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAll(long[] a) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3695,32 +3744,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ANDReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void ANDReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                long v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::ANDReduce, Long128VectorTests::ANDReduceAll);
+                LongVector128Tests::ANDReduce, LongVector128Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = AND_IDENTITY;
+
+        assertEquals((long) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id & x), x);
+                assertEquals((long) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static long ANDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3730,7 +3797,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3739,34 +3806,29 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ANDReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                long v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::ANDReduceMasked, Long128VectorTests::ANDReduceAllMasked);
+                LongVector128Tests::ANDReduceMasked, LongVector128Tests::ANDReduceAllMasked);
     }
 
     static long ORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3775,7 +3837,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAll(long[] a) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3784,32 +3846,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ORReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void ORReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                long v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::ORReduce, Long128VectorTests::ORReduceAll);
+                LongVector128Tests::ORReduce, LongVector128Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = OR_IDENTITY;
+
+        assertEquals((long) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id | x), x);
+                assertEquals((long) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static long ORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3819,7 +3899,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3828,7 +3908,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ORReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3836,26 +3916,21 @@ public class Long128VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                long v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::ORReduceMasked, Long128VectorTests::ORReduceAllMasked);
+                LongVector128Tests::ORReduceMasked, LongVector128Tests::ORReduceAllMasked);
     }
 
     static long XORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3864,7 +3939,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAll(long[] a) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3873,32 +3948,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void XORReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void XORReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                long v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::XORReduce, Long128VectorTests::XORReduceAll);
+                LongVector128Tests::XORReduce, LongVector128Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = XOR_IDENTITY;
+
+        assertEquals((long) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id ^ x), x);
+                assertEquals((long) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static long XORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3908,7 +4001,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3917,7 +4010,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void XORReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3925,26 +4018,21 @@ public class Long128VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                long v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::XORReduceMasked, Long128VectorTests::XORReduceAllMasked);
+                LongVector128Tests::XORReduceMasked, LongVector128Tests::XORReduceAllMasked);
     }
 
     static long ADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3953,7 +4041,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAll(long[] a) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3962,32 +4050,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                long v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::ADDReduce, Long128VectorTests::ADDReduceAll);
+                LongVector128Tests::ADDReduce, LongVector128Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = ADD_IDENTITY;
+
+        assertEquals((long) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id + x), x);
+                assertEquals((long) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3997,7 +4103,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -4006,7 +4112,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4014,26 +4120,21 @@ public class Long128VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                long v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::ADDReduceMasked, Long128VectorTests::ADDReduceAllMasked);
+                LongVector128Tests::ADDReduceMasked, LongVector128Tests::ADDReduceAllMasked);
     }
 
     static long MULReduce(long[] a, int idx) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4042,7 +4143,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAll(long[] a) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4051,32 +4152,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MULReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void MULReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                long v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::MULReduce, Long128VectorTests::MULReduceAll);
+                LongVector128Tests::MULReduce, LongVector128Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MUL_IDENTITY;
+
+        assertEquals((long) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id * x), x);
+                assertEquals((long) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4086,7 +4205,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4095,34 +4214,29 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MULReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                long v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::MULReduceMasked, Long128VectorTests::MULReduceAllMasked);
+                LongVector128Tests::MULReduceMasked, LongVector128Tests::MULReduceAllMasked);
     }
 
     static long MINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.min(res, a[i]);
         }
@@ -4131,7 +4245,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduce(a, i));
         }
@@ -4140,32 +4254,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void MINReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                long v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::MINReduce, Long128VectorTests::MINReduceAll);
+                LongVector128Tests::MINReduce, LongVector128Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MIN_IDENTITY;
+
+        assertEquals((long) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.min(id, x), x);
+                assertEquals((long) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.min(res, a[i]);
@@ -4175,7 +4307,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4184,34 +4316,29 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                long v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::MINReduceMasked, Long128VectorTests::MINReduceAllMasked);
+                LongVector128Tests::MINReduceMasked, LongVector128Tests::MINReduceAllMasked);
     }
 
     static long MAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.max(res, a[i]);
         }
@@ -4220,7 +4347,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduce(a, i));
         }
@@ -4229,32 +4356,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void MAXReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                long v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::MAXReduce, Long128VectorTests::MAXReduceAll);
+                LongVector128Tests::MAXReduce, LongVector128Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MAX_IDENTITY;
+
+        assertEquals((long) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.max(id, x), x);
+                assertEquals((long) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.max(res, a[i]);
@@ -4264,7 +4409,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4273,34 +4418,29 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                long v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::MAXReduceMasked, Long128VectorTests::MAXReduceAllMasked);
+                LongVector128Tests::MAXReduceMasked, LongVector128Tests::MAXReduceAllMasked);
     }
 
     static long UMINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4309,7 +4449,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4318,32 +4458,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMINReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void UMINReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                long v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::UMINReduce, Long128VectorTests::UMINReduceAll);
+                LongVector128Tests::UMINReduce, LongVector128Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMIN_IDENTITY;
+
+        assertEquals((long) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.minUnsigned(id, x), x);
+                assertEquals((long) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static long UMINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.minUnsigned(res, a[i]);
@@ -4353,7 +4511,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4362,34 +4520,29 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMINReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                long v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::UMINReduceMasked, Long128VectorTests::UMINReduceAllMasked);
+                LongVector128Tests::UMINReduceMasked, LongVector128Tests::UMINReduceAllMasked);
     }
 
     static long UMAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4398,7 +4551,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4407,32 +4560,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMAXReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void UMAXReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                long v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::UMAXReduce, Long128VectorTests::UMAXReduceAll);
+                LongVector128Tests::UMAXReduce, LongVector128Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMAX_IDENTITY;
+
+        assertEquals((long) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((long) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static long UMAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.maxUnsigned(res, a[i]);
@@ -4442,7 +4613,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4451,34 +4622,29 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMAXReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                long v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::UMAXReduceMasked, Long128VectorTests::UMAXReduceAllMasked);
+                LongVector128Tests::UMAXReduceMasked, LongVector128Tests::UMAXReduceAllMasked);
     }
 
     static long FIRST_NONZEROReduce(long[] a, int idx) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4487,7 +4653,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAll(long[] a) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4496,32 +4662,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void FIRST_NONZEROReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void FIRST_NONZEROReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::FIRST_NONZEROReduce, Long128VectorTests::FIRST_NONZEROReduceAll);
+                LongVector128Tests::FIRST_NONZEROReduce, LongVector128Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static long FIRST_NONZEROReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4531,7 +4715,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAllMasked(long[] a, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4540,30 +4724,25 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::FIRST_NONZEROReduceMasked, Long128VectorTests::FIRST_NONZEROReduceAllMasked);
+                LongVector128Tests::FIRST_NONZEROReduceMasked, LongVector128Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4576,7 +4755,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueLong128VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueLongVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4587,7 +4766,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector128Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4600,7 +4779,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueLong128VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueLongVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4611,11 +4790,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector128Tests::allTrue);
     }
 
     static long SUADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4624,7 +4803,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAll(long[] a) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4633,32 +4812,50 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingUnaryOpProvider")
-    static void SUADDReduceLong128VectorTests(IntFunction<long[]> fa) {
+    static void SUADDReduceLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                long v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::SUADDReduce, Long128VectorTests::SUADDReduceAll);
+                LongVector128Tests::SUADDReduce, LongVector128Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "longSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = SUADD_IDENTITY;
+
+        assertEquals((long) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static long SUADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4668,7 +4865,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4676,7 +4873,7 @@ public class Long128VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "longSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4684,26 +4881,21 @@ public class Long128VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                long v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::SUADDReduceMasked, Long128VectorTests::SUADDReduceAllMasked);
+                LongVector128Tests::SUADDReduceMasked, LongVector128Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void withLong128VectorTests(IntFunction<long []> fa, IntFunction<long []> fb) {
+    static void withLongVector128Tests(IntFunction<long []> fa, IntFunction<long []> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -4726,7 +4918,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_DEFAULTLong128VectorTests(IntFunction<long[]> fa) {
+    static void IS_DEFAULTLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4736,14 +4928,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLongVector128Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4756,7 +4948,7 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4767,7 +4959,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_NEGATIVELong128VectorTests(IntFunction<long[]> fa) {
+    static void IS_NEGATIVELongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4777,14 +4969,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLongVector128Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4797,14 +4989,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4816,14 +5008,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4835,14 +5027,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LTLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4858,14 +5050,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GTLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GTLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4877,14 +5069,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GTLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GTLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4900,14 +5092,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4919,14 +5111,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4938,14 +5130,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EQLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4961,14 +5153,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void NELong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void NELongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4980,14 +5172,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void NELong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void NELongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5003,14 +5195,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LELong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LELongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5022,14 +5214,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LELong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LELongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5045,14 +5237,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GELong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GELongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5064,14 +5256,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GELong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GELongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5087,14 +5279,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULTLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULTLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5106,14 +5298,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULTLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULTLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5129,14 +5321,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGTLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGTLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5148,14 +5340,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGTLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGTLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5171,14 +5363,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULELong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULELongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5190,14 +5382,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULELong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULELongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5213,14 +5405,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGELong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGELongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5232,14 +5424,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGELong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGELongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5255,14 +5447,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5272,13 +5464,13 @@ public class Long128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void LTLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5292,14 +5484,14 @@ public class Long128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5309,13 +5501,13 @@ public class Long128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void EQLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5329,7 +5521,7 @@ public class Long128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
@@ -5340,7 +5532,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void blendLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void blendLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5356,11 +5548,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, LongVector128Tests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
-    static void RearrangeLong128VectorTests(IntFunction<long[]> fa,
+    static void RearrangeLongVector128Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5377,7 +5569,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
-    static void RearrangeLong128VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void RearrangeLongVector128TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -5395,7 +5587,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void compressLong128VectorTests(IntFunction<long[]> fa,
+    static void compressLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5413,7 +5605,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void expandLong128VectorTests(IntFunction<long[]> fa,
+    static void expandLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5431,7 +5623,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void getLong128VectorTests(IntFunction<long[]> fa) {
+    static void getLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -5587,7 +5779,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BroadcastLong128VectorTests(IntFunction<long[]> fa) {
+    static void BroadcastLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5601,7 +5793,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZeroLong128VectorTests(IntFunction<long[]> fa) {
+    static void ZeroLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5611,7 +5803,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static long[] sliceUnary(long[] a, int origin, int idx) {
@@ -5626,7 +5818,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void sliceUnaryLong128VectorTests(IntFunction<long[]> fa) {
+    static void sliceUnaryLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5637,7 +5829,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, LongVector128Tests::sliceUnary);
     }
 
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
@@ -5654,7 +5846,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void sliceBinaryLong128VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void sliceBinaryLongVector128TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5667,7 +5859,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Long128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, LongVector128Tests::sliceBinary);
     }
 
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
@@ -5684,7 +5876,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void sliceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void sliceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5701,7 +5893,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Long128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, LongVector128Tests::slice);
     }
 
     static long[] unsliceUnary(long[] a, int origin, int idx) {
@@ -5718,7 +5910,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void unsliceUnaryLong128VectorTests(IntFunction<long[]> fa) {
+    static void unsliceUnaryLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5729,7 +5921,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, LongVector128Tests::unsliceUnary);
     }
 
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
@@ -5755,7 +5947,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void unsliceBinaryLong128VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void unsliceBinaryLongVector128TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5769,7 +5961,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Long128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, LongVector128Tests::unsliceBinary);
     }
 
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5809,7 +6001,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void unsliceLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void unsliceLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5826,7 +6018,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Long128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, LongVector128Tests::unslice);
     }
 
     static long BITWISE_BLEND(long a, long b, long c) {
@@ -5838,7 +6030,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5853,11 +6045,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5870,11 +6062,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, LongVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5892,11 +6084,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5907,11 +6099,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong128VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector128TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5922,11 +6114,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5937,11 +6129,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong128VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector128TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5952,11 +6144,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5971,11 +6163,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector128TestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5990,11 +6182,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong128VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector128TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6005,11 +6197,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong128VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector128TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6020,11 +6212,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector128TestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -6038,7 +6230,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongVector128Tests::BITWISE_BLEND);
     }
 
     static long NEG(long a) {
@@ -6050,7 +6242,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NEGLong128VectorTests(IntFunction<long[]> fa) {
+    static void NEGLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6061,11 +6253,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::NEG);
+        assertArraysEquals(r, a, LongVector128Tests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void negLong128VectorTests(IntFunction<long[]> fa) {
+    static void negLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6076,11 +6268,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::neg);
+        assertArraysEquals(r, a, LongVector128Tests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NEGMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void NEGMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6094,7 +6286,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, LongVector128Tests::NEG);
     }
 
     static long ABS(long a) {
@@ -6106,7 +6298,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ABSLong128VectorTests(IntFunction<long[]> fa) {
+    static void ABSLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6117,11 +6309,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::ABS);
+        assertArraysEquals(r, a, LongVector128Tests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void absLong128VectorTests(IntFunction<long[]> fa) {
+    static void absLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6132,11 +6324,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::abs);
+        assertArraysEquals(r, a, LongVector128Tests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ABSMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void ABSMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6150,7 +6342,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, LongVector128Tests::ABS);
     }
 
     static long NOT(long a) {
@@ -6162,7 +6354,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NOTLong128VectorTests(IntFunction<long[]> fa) {
+    static void NOTLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6173,11 +6365,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::NOT);
+        assertArraysEquals(r, a, LongVector128Tests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void notLong128VectorTests(IntFunction<long[]> fa) {
+    static void notLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6188,11 +6380,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::not);
+        assertArraysEquals(r, a, LongVector128Tests::not);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NOTMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void NOTMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6206,7 +6398,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, LongVector128Tests::NOT);
     }
 
     static long ZOMO(long a) {
@@ -6214,7 +6406,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZOMOLong128VectorTests(IntFunction<long[]> fa) {
+    static void ZOMOLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6225,11 +6417,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::ZOMO);
+        assertArraysEquals(r, a, LongVector128Tests::ZOMO);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ZOMOMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void ZOMOMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6243,7 +6435,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, LongVector128Tests::ZOMO);
     }
 
     static long BIT_COUNT(long a) {
@@ -6251,7 +6443,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BIT_COUNTLong128VectorTests(IntFunction<long[]> fa) {
+    static void BIT_COUNTLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6262,11 +6454,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, LongVector128Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void BIT_COUNTMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6280,7 +6472,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, LongVector128Tests::BIT_COUNT);
     }
 
     static long TRAILING_ZEROS_COUNT(long a) {
@@ -6288,7 +6480,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTLong128VectorTests(IntFunction<long[]> fa) {
+    static void TRAILING_ZEROS_COUNTLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6299,11 +6491,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6317,7 +6509,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     static long LEADING_ZEROS_COUNT(long a) {
@@ -6325,7 +6517,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTLong128VectorTests(IntFunction<long[]> fa) {
+    static void LEADING_ZEROS_COUNTLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6336,11 +6528,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6354,7 +6546,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     static long REVERSE(long a) {
@@ -6362,7 +6554,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSELong128VectorTests(IntFunction<long[]> fa) {
+    static void REVERSELongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6373,11 +6565,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::REVERSE);
+        assertArraysEquals(r, a, LongVector128Tests::REVERSE);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSEMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void REVERSEMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6391,7 +6583,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, LongVector128Tests::REVERSE);
     }
 
     static long REVERSE_BYTES(long a) {
@@ -6399,7 +6591,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSE_BYTESLong128VectorTests(IntFunction<long[]> fa) {
+    static void REVERSE_BYTESLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6410,11 +6602,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, LongVector128Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedLong128VectorTests(IntFunction<long[]> fa,
+    static void REVERSE_BYTESMaskedLongVector128Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6428,7 +6620,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, LongVector128Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6436,7 +6628,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandLongVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6449,7 +6641,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::band);
+        assertArraysEquals(r, a, b, LongVector128Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6457,7 +6649,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorLongVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6470,7 +6662,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::bor);
+        assertArraysEquals(r, a, b, LongVector128Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6478,7 +6670,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorLongVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6491,7 +6683,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::bxor);
+        assertArraysEquals(r, a, b, LongVector128Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6499,7 +6691,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotLongVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6512,7 +6704,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::bandNot);
+        assertArraysEquals(r, a, b, LongVector128Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6520,7 +6712,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqLongVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6533,7 +6725,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long128VectorTests::beq);
+        assertArraysEquals(r, a, b, LongVector128Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6541,7 +6733,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotLong128VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotLongVector128Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6552,7 +6744,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long128VectorTests::unot);
+        assertArraysEquals(r, a, LongVector128Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6561,15 +6753,15 @@ public class Long128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong128VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6583,7 +6775,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong128VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector128TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6593,13 +6785,13 @@ public class Long128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong128VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector128TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6609,13 +6801,13 @@ public class Long128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longtoIntUnaryOpProvider")
-    static void toIntArrayLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toIntArrayLongVector128TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6626,7 +6818,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toLongArrayLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toLongArrayLongVector128TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6637,7 +6829,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toDoubleArrayLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toDoubleArrayLongVector128TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6648,7 +6840,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toStringLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toStringLongVector128TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6661,7 +6853,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void hashCodeLong128VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void hashCodeLongVector128TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6677,7 +6869,7 @@ public class Long128VectorTests extends AbstractVectorTest {
 
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLongLong128VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongLongVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
@@ -6693,11 +6885,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long128VectorTests::ADDReduce, Long128VectorTests::ADDReduceAll);
+                LongVector128Tests::ADDReduce, LongVector128Tests::ADDReduceAll);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLongLong128VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongLongVector128TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6715,11 +6907,11 @@ public class Long128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long128VectorTests::ADDReduceMasked, Long128VectorTests::ADDReduceAllMasked);
+                LongVector128Tests::ADDReduceMasked, LongVector128Tests::ADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromProvider")
-    static void SelectFromLong128VectorTests(IntFunction<long[]> fa,
+    static void SelectFromLongVector128Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,long[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         long[] order = fs.apply(a.length, SPECIES.length());
@@ -6735,7 +6927,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorLong128VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SelectFromTwoVectorLongVector128Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] idx = fc.apply(SPECIES.length());
@@ -6753,7 +6945,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
-    static void SelectFromLong128VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void SelectFromLongVector128TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                            BiFunction<Integer,Integer,long[]> fs,
                                                            IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -6772,7 +6964,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousLong128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousLongVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6783,12 +6975,12 @@ public class Long128VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringLong128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringLongVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6802,7 +6994,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsLong128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsLongVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6811,12 +7003,12 @@ public class Long128VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsLong128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsLongVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6826,13 +7018,13 @@ public class Long128VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeLongVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6854,7 +7046,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountLongVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6865,7 +7057,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long128VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, LongVector128Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6879,7 +7071,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueLongVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6890,7 +7082,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long128VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector128Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6904,7 +7096,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueLongVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6915,11 +7107,11 @@ public class Long128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long128VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector128Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressLong128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressLongVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6929,7 +7121,7 @@ public class Long128VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -6947,7 +7139,7 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLong128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongVector128TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6955,13 +7147,13 @@ public class Long128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongLong128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongLongVector128TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6969,7 +7161,7 @@ public class Long128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -6988,36 +7180,36 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLong128VectorTestsSmokeTest(int length) {
+    static void loopBoundLongVector128TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongLong128VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongLongVector128TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeLong128VectorTestsSmokeTest() {
+    static void ElementSizeLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Long.SIZE);
+        assertEquals(elsize, Long.SIZE);
     }
 
     @Test
-    static void VectorShapeLong128VectorTestsSmokeTest() {
+    static void VectorShapeLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_128_BIT));
     }
 
     @Test
-    static void ShapeWithLanesLong128VectorTestsSmokeTest() {
+    static void ShapeWithLanesLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(long.class);
@@ -7025,32 +7217,32 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeLong128VectorTestsSmokeTest() {
+    static void ElementTypeLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementType() == long.class);
     }
 
     @Test
-    static void SpeciesElementSizeLong128VectorTestsSmokeTest() {
+    static void SpeciesElementSizeLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementSize() == Long.SIZE);
     }
 
     @Test
-    static void VectorTypeLong128VectorTestsSmokeTest() {
+    static void VectorTypeLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesLong128VectorTestsSmokeTest() {
+    static void WithLanesLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(long.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeLong128VectorTestsSmokeTest() {
+    static void WithShapeLongVector128TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7058,9 +7250,9 @@ public class Long128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueLong128VectorTestsSmokeTest() {
+    static void MaskAllTrueLongVector128TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongVector256LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/LongVector256LoadStoreTests.java
index f07cf3e68b7..411c48dc7cb 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector256LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Long256VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation LongVector256LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class LongVector256LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_256;
 
@@ -61,14 +61,29 @@ public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(long[] r, long[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Long256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Long256VectorTests.java b/test/jdk/jdk/incubator/vector/LongVector256Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Long256VectorTests.java
rename to test/jdk/jdk/incubator/vector/LongVector256Tests.java
index 3b276391cb7..a766abe920f 100644
--- a/test/jdk/jdk/incubator/vector/Long256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector256Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Long256VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation LongVector256Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,65 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Long256VectorTests extends AbstractVectorTest {
+public class LongVector256Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_256;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected, long delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(long actual, long expected, long delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final long CONST_SHIFT = Long.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final long ADD_IDENTITY = (long)0;
+    private static final long AND_IDENTITY = (long)-1;
+    private static final long FIRST_NONZERO_IDENTITY = (long)0;
+    private static final long MAX_IDENTITY = Long.MIN_VALUE;
+    private static final long MIN_IDENTITY = Long.MAX_VALUE;
+    private static final long MUL_IDENTITY = (long)1;
+    private static final long OR_IDENTITY = (long)0;
+    private static final long SUADD_IDENTITY = (long)0;
+    private static final long UMAX_IDENTITY = (long)0;   // Minimum unsigned value
+    private static final long UMIN_IDENTITY = (long)-1;  // Maximum unsigned value
+    private static final long XOR_IDENTITY = (long)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
     static void assertArraysStrictlyEquals(long[] r, long[] a) {
@@ -84,10 +133,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +148,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +164,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +183,13 @@ public class Long256VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +205,13 @@ public class Long256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -175,10 +224,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -190,10 +239,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -202,12 +251,12 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -218,20 +267,20 @@ public class Long256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (long)0);
+                    assertEquals(r[i + k], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -243,19 +292,19 @@ public class Long256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (long)0);
+                        assertEquals(r[i + j], (long)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -271,11 +320,11 @@ public class Long256VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -284,12 +333,12 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -299,17 +348,17 @@ public class Long256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -319,17 +368,17 @@ public class Long256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -343,10 +392,10 @@ public class Long256VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -358,10 +407,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -373,10 +422,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -397,18 +446,18 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -423,18 +472,18 @@ public class Long256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -442,10 +491,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -453,10 +502,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -464,10 +513,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -476,10 +525,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -492,10 +541,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -507,10 +556,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -522,10 +571,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -540,10 +589,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -556,11 +605,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -574,11 +623,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -600,11 +649,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -618,11 +667,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -642,10 +691,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -657,10 +706,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -669,10 +718,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -682,10 +731,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -701,11 +750,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -722,11 +771,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -737,11 +786,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -758,11 +807,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -780,13 +829,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -807,13 +856,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -828,13 +877,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +904,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -875,13 +924,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -896,13 +945,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -917,13 +966,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -939,13 +988,13 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -991,10 +1040,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1004,10 +1053,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1015,10 +1064,10 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1553,7 +1602,7 @@ public class Long256VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         LongVector a = io.add((long)1); //[1,2]
         LongVector b = a.neg();  //[-1,-2]
         long[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1568,19 +1617,19 @@ public class Long256VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Long> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Long> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         LongVector uab0 = zab0.rearrange(unz0,zab1);
         LongVector uab1 = zab0.rearrange(unz1,zab1);
         long[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1595,7 +1644,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1603,9 +1652,9 @@ public class Long256VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1634,7 +1683,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1647,7 +1696,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::ADD);
+        assertArraysEquals(r, a, b, LongVector256Tests::ADD);
     }
 
     static long add(long a, long b) {
@@ -1655,7 +1704,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1666,11 +1715,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::add);
+        assertArraysEquals(r, a, b, LongVector256Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1686,11 +1735,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1704,7 +1753,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::add);
     }
 
     static long SUB(long a, long b) {
@@ -1712,7 +1761,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void SUBLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUBLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1725,7 +1774,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::SUB);
+        assertArraysEquals(r, a, b, LongVector256Tests::SUB);
     }
 
     static long sub(long a, long b) {
@@ -1733,7 +1782,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1744,11 +1793,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::sub);
+        assertArraysEquals(r, a, b, LongVector256Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void SUBLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUBLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1764,11 +1813,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1782,7 +1831,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::sub);
     }
 
     static long MUL(long a, long b) {
@@ -1790,7 +1839,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MULLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MULLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1803,7 +1852,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::MUL);
+        assertArraysEquals(r, a, b, LongVector256Tests::MUL);
     }
 
     static long mul(long a, long b) {
@@ -1811,7 +1860,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1822,11 +1871,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::mul);
+        assertArraysEquals(r, a, b, LongVector256Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void MULLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void MULLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1842,11 +1891,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1860,7 +1909,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::mul);
     }
 
     static long DIV(long a, long b) {
@@ -1868,7 +1917,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void DIVLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void DIVLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1883,7 +1932,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::DIV);
+        assertArraysEquals(r, a, b, LongVector256Tests::DIV);
     }
 
     static long div(long a, long b) {
@@ -1891,7 +1940,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1906,11 +1955,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::div);
+        assertArraysEquals(r, a, b, LongVector256Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void DIVLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void DIVLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1928,11 +1977,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1950,7 +1999,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1958,7 +2007,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void FIRST_NONZEROLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void FIRST_NONZEROLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1971,11 +2020,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, LongVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void FIRST_NONZEROLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void FIRST_NONZEROLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1991,7 +2040,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1999,7 +2048,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2012,7 +2061,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::AND);
+        assertArraysEquals(r, a, b, LongVector256Tests::AND);
     }
 
     static long and(long a, long b) {
@@ -2020,7 +2069,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2031,11 +2080,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::and);
+        assertArraysEquals(r, a, b, LongVector256Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2051,7 +2100,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::AND);
     }
 
     static long AND_NOT(long a, long b) {
@@ -2059,7 +2108,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void AND_NOTLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void AND_NOTLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2072,11 +2121,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, LongVector256Tests::AND_NOT);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void AND_NOTLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void AND_NOTLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2092,7 +2141,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::AND_NOT);
     }
 
     static long OR(long a, long b) {
@@ -2100,7 +2149,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2113,7 +2162,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::OR);
+        assertArraysEquals(r, a, b, LongVector256Tests::OR);
     }
 
     static long or(long a, long b) {
@@ -2121,7 +2170,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::or);
+        assertArraysEquals(r, a, b, LongVector256Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2152,7 +2201,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::OR);
     }
 
     static long XOR(long a, long b) {
@@ -2160,7 +2209,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void XORLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void XORLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2173,11 +2222,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::XOR);
+        assertArraysEquals(r, a, b, LongVector256Tests::XOR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void XORLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void XORLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2193,7 +2242,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::XOR);
     }
 
     static long COMPRESS_BITS(long a, long b) {
@@ -2201,7 +2250,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void COMPRESS_BITSLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void COMPRESS_BITSLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2263,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, LongVector256Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void COMPRESS_BITSLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void COMPRESS_BITSLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2234,7 +2283,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::COMPRESS_BITS);
     }
 
     static long EXPAND_BITS(long a, long b) {
@@ -2242,7 +2291,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void EXPAND_BITSLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EXPAND_BITSLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2255,11 +2304,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, LongVector256Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void EXPAND_BITSLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EXPAND_BITSLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2275,11 +2324,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2289,11 +2338,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2306,11 +2355,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector256Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2320,11 +2369,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2386,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector256Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2400,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2368,11 +2417,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector256Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2384,11 +2433,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2403,11 +2452,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector256Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2417,11 +2466,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2431,11 +2480,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2448,11 +2497,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector256Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2462,11 +2511,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2476,11 +2525,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2493,11 +2542,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector256Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong256VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector256TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2507,11 +2556,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector256Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2524,11 +2573,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector256Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong256VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector256TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2538,11 +2587,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector256Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2555,7 +2604,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector256Tests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2563,7 +2612,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2576,11 +2625,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, LongVector256Tests::LSHL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2596,7 +2645,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::LSHL);
     }
 
     static long ASHR(long a, long b) {
@@ -2604,7 +2653,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2617,11 +2666,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, LongVector256Tests::ASHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2637,7 +2686,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::ASHR);
     }
 
     static long LSHR(long a, long b) {
@@ -2645,7 +2694,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2658,11 +2707,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, LongVector256Tests::LSHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2678,7 +2727,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::LSHR);
     }
 
     static long LSHL_unary(long a, long b) {
@@ -2686,7 +2735,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong256VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector256TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2698,11 +2747,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector256Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong256VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector256TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2717,7 +2766,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector256Tests::LSHL_unary);
     }
 
     static long LSHR_unary(long a, long b) {
@@ -2725,7 +2774,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong256VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector256TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2737,11 +2786,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector256Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong256VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector256TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2756,7 +2805,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector256Tests::LSHR_unary);
     }
 
     static long ASHR_unary(long a, long b) {
@@ -2764,7 +2813,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong256VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector256TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2776,11 +2825,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector256Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong256VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector256TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2795,7 +2844,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector256Tests::ASHR_unary);
     }
 
     static long ROR(long a, long b) {
@@ -2803,7 +2852,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2816,11 +2865,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::ROR);
+        assertArraysEquals(r, a, b, LongVector256Tests::ROR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2836,7 +2885,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::ROR);
     }
 
     static long ROL(long a, long b) {
@@ -2844,7 +2893,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2857,11 +2906,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::ROL);
+        assertArraysEquals(r, a, b, LongVector256Tests::ROL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2877,7 +2926,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::ROL);
     }
 
     static long ROR_unary(long a, long b) {
@@ -2885,7 +2934,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong256VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector256TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2897,11 +2946,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector256Tests::ROR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong256VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector256TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2916,7 +2965,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector256Tests::ROR_unary);
     }
 
     static long ROL_unary(long a, long b) {
@@ -2924,7 +2973,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong256VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector256TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2936,11 +2985,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector256Tests::ROL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong256VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector256TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2955,14 +3004,14 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector256Tests::ROL_unary);
     }
     static long LSHR_binary_const(long a) {
         return (long)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHRLong256VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHRLongVector256TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -2973,11 +3022,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector256Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHRLong256VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHRLongVector256TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2991,7 +3040,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector256Tests::LSHR_binary_const);
     }
 
     static long LSHL_binary_const(long a) {
@@ -2999,7 +3048,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHLLong256VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHLLongVector256TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3010,11 +3059,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, LongVector256Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHLLong256VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHLLongVector256TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3028,7 +3077,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector256Tests::LSHL_binary_const);
     }
 
     static long ASHR_binary_const(long a) {
@@ -3036,7 +3085,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ASHRLong256VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ASHRLongVector256TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3047,11 +3096,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector256Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ASHRLong256VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ASHRLongVector256TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3065,7 +3114,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector256Tests::ASHR_binary_const);
     }
 
     static long ROR_binary_const(long a) {
@@ -3073,7 +3122,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void RORLong256VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void RORLongVector256TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3084,11 +3133,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, LongVector256Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void RORLong256VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void RORLongVector256TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3102,7 +3151,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector256Tests::ROR_binary_const);
     }
 
     static long ROL_binary_const(long a) {
@@ -3110,7 +3159,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ROLLong256VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ROLLongVector256TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3121,11 +3170,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, LongVector256Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ROLLong256VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ROLLongVector256TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3139,14 +3188,14 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector256Tests::ROL_binary_const);
     }
 
 
     static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MINLongVector256TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3157,13 +3206,13 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long256VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, LongVector256Tests::MIN);
     }
 
     static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void minLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void minLongVector256TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3174,13 +3223,13 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long256VectorTests::min);
+        assertArraysEquals(r, a, (long)10, LongVector256Tests::min);
     }
 
     static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINLong256VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINLongVector256TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3193,13 +3242,13 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long256VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, mask, LongVector256Tests::MIN);
     }
 
     static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MAXLongVector256TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3210,13 +3259,13 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long256VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, LongVector256Tests::MAX);
     }
 
     static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void maxLong256VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void maxLongVector256TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3227,13 +3276,13 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long256VectorTests::max);
+        assertArraysEquals(r, a, (long)10, LongVector256Tests::max);
     }
 
     static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXLong256VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXLongVector256TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3246,7 +3295,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long256VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, mask, LongVector256Tests::MAX);
     }
 
     static long MIN(long a, long b) {
@@ -3254,7 +3303,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3267,7 +3316,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::MIN);
+        assertArraysEquals(r, a, b, LongVector256Tests::MIN);
     }
 
     static long min(long a, long b) {
@@ -3275,7 +3324,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3286,7 +3335,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::min);
+        assertArraysEquals(r, a, b, LongVector256Tests::min);
     }
 
     static long MAX(long a, long b) {
@@ -3294,7 +3343,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3307,7 +3356,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::MAX);
+        assertArraysEquals(r, a, b, LongVector256Tests::MAX);
     }
 
     static long max(long a, long b) {
@@ -3315,7 +3364,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3326,7 +3375,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::max);
+        assertArraysEquals(r, a, b, LongVector256Tests::max);
     }
 
     static long UMIN(long a, long b) {
@@ -3334,7 +3383,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMINLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMINLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3347,11 +3396,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, LongVector256Tests::UMIN);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMINLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMINLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3367,7 +3416,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::UMIN);
     }
 
     static long UMAX(long a, long b) {
@@ -3375,7 +3424,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMAXLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMAXLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3388,11 +3437,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, LongVector256Tests::UMAX);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMAXLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMAXLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3408,7 +3457,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::UMAX);
     }
 
     static long SADD(long a, long b) {
@@ -3416,7 +3465,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SADDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SADDLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3429,11 +3478,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::SADD);
+        assertArraysEquals(r, a, b, LongVector256Tests::SADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SADDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SADDLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3449,7 +3498,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::SADD);
     }
 
     static long SSUB(long a, long b) {
@@ -3457,7 +3506,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SSUBLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SSUBLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3470,11 +3519,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, LongVector256Tests::SSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SSUBLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SSUBLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3490,7 +3539,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::SSUB);
     }
 
     static long SUADD(long a, long b) {
@@ -3498,7 +3547,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUADDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUADDLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3560,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, LongVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUADDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3531,7 +3580,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::SUADD);
     }
 
     static long SUSUB(long a, long b) {
@@ -3539,7 +3588,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUSUBLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUSUBLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3552,11 +3601,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, LongVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUSUBLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUSUBLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3572,11 +3621,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3586,11 +3635,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3600,11 +3649,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3614,11 +3663,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3628,10 +3677,10 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, LongVector256Tests::max);
     }
     @Test(dataProvider = "longSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SUADDAssocLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -3648,11 +3697,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Long256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, LongVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDAssocLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                      IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3673,11 +3722,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Long256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, LongVector256Tests::SUADD);
     }
 
     static long ANDReduce(long[] a, int idx) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3686,7 +3735,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAll(long[] a) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3695,32 +3744,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ANDReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void ANDReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                long v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::ANDReduce, Long256VectorTests::ANDReduceAll);
+                LongVector256Tests::ANDReduce, LongVector256Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = AND_IDENTITY;
+
+        assertEquals((long) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id & x), x);
+                assertEquals((long) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static long ANDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3730,7 +3797,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3739,34 +3806,29 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ANDReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                long v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::ANDReduceMasked, Long256VectorTests::ANDReduceAllMasked);
+                LongVector256Tests::ANDReduceMasked, LongVector256Tests::ANDReduceAllMasked);
     }
 
     static long ORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3775,7 +3837,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAll(long[] a) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3784,32 +3846,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ORReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void ORReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                long v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::ORReduce, Long256VectorTests::ORReduceAll);
+                LongVector256Tests::ORReduce, LongVector256Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = OR_IDENTITY;
+
+        assertEquals((long) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id | x), x);
+                assertEquals((long) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static long ORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3819,7 +3899,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3828,7 +3908,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ORReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3836,26 +3916,21 @@ public class Long256VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                long v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::ORReduceMasked, Long256VectorTests::ORReduceAllMasked);
+                LongVector256Tests::ORReduceMasked, LongVector256Tests::ORReduceAllMasked);
     }
 
     static long XORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3864,7 +3939,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAll(long[] a) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3873,32 +3948,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void XORReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void XORReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                long v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::XORReduce, Long256VectorTests::XORReduceAll);
+                LongVector256Tests::XORReduce, LongVector256Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = XOR_IDENTITY;
+
+        assertEquals((long) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id ^ x), x);
+                assertEquals((long) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static long XORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3908,7 +4001,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3917,7 +4010,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void XORReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3925,26 +4018,21 @@ public class Long256VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                long v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::XORReduceMasked, Long256VectorTests::XORReduceAllMasked);
+                LongVector256Tests::XORReduceMasked, LongVector256Tests::XORReduceAllMasked);
     }
 
     static long ADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3953,7 +4041,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAll(long[] a) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3962,32 +4050,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                long v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::ADDReduce, Long256VectorTests::ADDReduceAll);
+                LongVector256Tests::ADDReduce, LongVector256Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = ADD_IDENTITY;
+
+        assertEquals((long) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id + x), x);
+                assertEquals((long) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3997,7 +4103,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -4006,7 +4112,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4014,26 +4120,21 @@ public class Long256VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                long v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::ADDReduceMasked, Long256VectorTests::ADDReduceAllMasked);
+                LongVector256Tests::ADDReduceMasked, LongVector256Tests::ADDReduceAllMasked);
     }
 
     static long MULReduce(long[] a, int idx) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4042,7 +4143,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAll(long[] a) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4051,32 +4152,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MULReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void MULReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                long v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::MULReduce, Long256VectorTests::MULReduceAll);
+                LongVector256Tests::MULReduce, LongVector256Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MUL_IDENTITY;
+
+        assertEquals((long) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id * x), x);
+                assertEquals((long) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4086,7 +4205,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4095,34 +4214,29 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MULReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                long v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::MULReduceMasked, Long256VectorTests::MULReduceAllMasked);
+                LongVector256Tests::MULReduceMasked, LongVector256Tests::MULReduceAllMasked);
     }
 
     static long MINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.min(res, a[i]);
         }
@@ -4131,7 +4245,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduce(a, i));
         }
@@ -4140,32 +4254,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void MINReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                long v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::MINReduce, Long256VectorTests::MINReduceAll);
+                LongVector256Tests::MINReduce, LongVector256Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MIN_IDENTITY;
+
+        assertEquals((long) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.min(id, x), x);
+                assertEquals((long) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.min(res, a[i]);
@@ -4175,7 +4307,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4184,34 +4316,29 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                long v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::MINReduceMasked, Long256VectorTests::MINReduceAllMasked);
+                LongVector256Tests::MINReduceMasked, LongVector256Tests::MINReduceAllMasked);
     }
 
     static long MAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.max(res, a[i]);
         }
@@ -4220,7 +4347,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduce(a, i));
         }
@@ -4229,32 +4356,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void MAXReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                long v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::MAXReduce, Long256VectorTests::MAXReduceAll);
+                LongVector256Tests::MAXReduce, LongVector256Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MAX_IDENTITY;
+
+        assertEquals((long) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.max(id, x), x);
+                assertEquals((long) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.max(res, a[i]);
@@ -4264,7 +4409,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4273,34 +4418,29 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                long v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::MAXReduceMasked, Long256VectorTests::MAXReduceAllMasked);
+                LongVector256Tests::MAXReduceMasked, LongVector256Tests::MAXReduceAllMasked);
     }
 
     static long UMINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4309,7 +4449,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4318,32 +4458,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMINReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void UMINReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                long v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::UMINReduce, Long256VectorTests::UMINReduceAll);
+                LongVector256Tests::UMINReduce, LongVector256Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMIN_IDENTITY;
+
+        assertEquals((long) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.minUnsigned(id, x), x);
+                assertEquals((long) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static long UMINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.minUnsigned(res, a[i]);
@@ -4353,7 +4511,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4362,34 +4520,29 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMINReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                long v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::UMINReduceMasked, Long256VectorTests::UMINReduceAllMasked);
+                LongVector256Tests::UMINReduceMasked, LongVector256Tests::UMINReduceAllMasked);
     }
 
     static long UMAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4398,7 +4551,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4407,32 +4560,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMAXReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void UMAXReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                long v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::UMAXReduce, Long256VectorTests::UMAXReduceAll);
+                LongVector256Tests::UMAXReduce, LongVector256Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMAX_IDENTITY;
+
+        assertEquals((long) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((long) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static long UMAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.maxUnsigned(res, a[i]);
@@ -4442,7 +4613,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4451,34 +4622,29 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMAXReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                long v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::UMAXReduceMasked, Long256VectorTests::UMAXReduceAllMasked);
+                LongVector256Tests::UMAXReduceMasked, LongVector256Tests::UMAXReduceAllMasked);
     }
 
     static long FIRST_NONZEROReduce(long[] a, int idx) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4487,7 +4653,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAll(long[] a) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4496,32 +4662,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void FIRST_NONZEROReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void FIRST_NONZEROReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::FIRST_NONZEROReduce, Long256VectorTests::FIRST_NONZEROReduceAll);
+                LongVector256Tests::FIRST_NONZEROReduce, LongVector256Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static long FIRST_NONZEROReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4531,7 +4715,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAllMasked(long[] a, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4540,30 +4724,25 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::FIRST_NONZEROReduceMasked, Long256VectorTests::FIRST_NONZEROReduceAllMasked);
+                LongVector256Tests::FIRST_NONZEROReduceMasked, LongVector256Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4576,7 +4755,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueLong256VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueLongVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4587,7 +4766,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector256Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4600,7 +4779,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueLong256VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueLongVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4611,11 +4790,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector256Tests::allTrue);
     }
 
     static long SUADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4624,7 +4803,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAll(long[] a) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4633,32 +4812,50 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingUnaryOpProvider")
-    static void SUADDReduceLong256VectorTests(IntFunction<long[]> fa) {
+    static void SUADDReduceLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                long v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::SUADDReduce, Long256VectorTests::SUADDReduceAll);
+                LongVector256Tests::SUADDReduce, LongVector256Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "longSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = SUADD_IDENTITY;
+
+        assertEquals((long) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static long SUADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4668,7 +4865,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4676,7 +4873,7 @@ public class Long256VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "longSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4684,26 +4881,21 @@ public class Long256VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                long v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::SUADDReduceMasked, Long256VectorTests::SUADDReduceAllMasked);
+                LongVector256Tests::SUADDReduceMasked, LongVector256Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void withLong256VectorTests(IntFunction<long []> fa, IntFunction<long []> fb) {
+    static void withLongVector256Tests(IntFunction<long []> fa, IntFunction<long []> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -4726,7 +4918,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_DEFAULTLong256VectorTests(IntFunction<long[]> fa) {
+    static void IS_DEFAULTLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4736,14 +4928,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLongVector256Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4756,7 +4948,7 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4767,7 +4959,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_NEGATIVELong256VectorTests(IntFunction<long[]> fa) {
+    static void IS_NEGATIVELongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4777,14 +4969,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLongVector256Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4797,14 +4989,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4816,14 +5008,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4835,14 +5027,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LTLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4858,14 +5050,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GTLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GTLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4877,14 +5069,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GTLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GTLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4900,14 +5092,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4919,14 +5111,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4938,14 +5130,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EQLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4961,14 +5153,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void NELong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void NELongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4980,14 +5172,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void NELong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void NELongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5003,14 +5195,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LELong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LELongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5022,14 +5214,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LELong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LELongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5045,14 +5237,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GELong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GELongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5064,14 +5256,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GELong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GELongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5087,14 +5279,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULTLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULTLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5106,14 +5298,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULTLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULTLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5129,14 +5321,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGTLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGTLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5148,14 +5340,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGTLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGTLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5171,14 +5363,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULELong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULELongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5190,14 +5382,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULELong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULELongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5213,14 +5405,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGELong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGELongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5232,14 +5424,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGELong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGELongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5255,14 +5447,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5272,13 +5464,13 @@ public class Long256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void LTLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5292,14 +5484,14 @@ public class Long256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5309,13 +5501,13 @@ public class Long256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void EQLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5329,7 +5521,7 @@ public class Long256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
@@ -5340,7 +5532,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void blendLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void blendLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5356,11 +5548,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, LongVector256Tests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
-    static void RearrangeLong256VectorTests(IntFunction<long[]> fa,
+    static void RearrangeLongVector256Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5377,7 +5569,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
-    static void RearrangeLong256VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void RearrangeLongVector256TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -5395,7 +5587,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void compressLong256VectorTests(IntFunction<long[]> fa,
+    static void compressLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5413,7 +5605,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void expandLong256VectorTests(IntFunction<long[]> fa,
+    static void expandLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5431,7 +5623,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void getLong256VectorTests(IntFunction<long[]> fa) {
+    static void getLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -5587,7 +5779,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BroadcastLong256VectorTests(IntFunction<long[]> fa) {
+    static void BroadcastLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5601,7 +5793,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZeroLong256VectorTests(IntFunction<long[]> fa) {
+    static void ZeroLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5611,7 +5803,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static long[] sliceUnary(long[] a, int origin, int idx) {
@@ -5626,7 +5818,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void sliceUnaryLong256VectorTests(IntFunction<long[]> fa) {
+    static void sliceUnaryLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5637,7 +5829,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, LongVector256Tests::sliceUnary);
     }
 
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
@@ -5654,7 +5846,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void sliceBinaryLong256VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void sliceBinaryLongVector256TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5667,7 +5859,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Long256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, LongVector256Tests::sliceBinary);
     }
 
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
@@ -5684,7 +5876,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void sliceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void sliceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5701,7 +5893,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Long256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, LongVector256Tests::slice);
     }
 
     static long[] unsliceUnary(long[] a, int origin, int idx) {
@@ -5718,7 +5910,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void unsliceUnaryLong256VectorTests(IntFunction<long[]> fa) {
+    static void unsliceUnaryLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5729,7 +5921,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, LongVector256Tests::unsliceUnary);
     }
 
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
@@ -5755,7 +5947,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void unsliceBinaryLong256VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void unsliceBinaryLongVector256TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5769,7 +5961,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Long256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, LongVector256Tests::unsliceBinary);
     }
 
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5809,7 +6001,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void unsliceLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void unsliceLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5826,7 +6018,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Long256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, LongVector256Tests::unslice);
     }
 
     static long BITWISE_BLEND(long a, long b, long c) {
@@ -5838,7 +6030,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5853,11 +6045,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5870,11 +6062,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, LongVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5892,11 +6084,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5907,11 +6099,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong256VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector256TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5922,11 +6114,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5937,11 +6129,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong256VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector256TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5952,11 +6144,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5971,11 +6163,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector256TestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5990,11 +6182,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong256VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector256TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6005,11 +6197,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong256VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector256TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6020,11 +6212,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector256TestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -6038,7 +6230,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongVector256Tests::BITWISE_BLEND);
     }
 
     static long NEG(long a) {
@@ -6050,7 +6242,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NEGLong256VectorTests(IntFunction<long[]> fa) {
+    static void NEGLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6061,11 +6253,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::NEG);
+        assertArraysEquals(r, a, LongVector256Tests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void negLong256VectorTests(IntFunction<long[]> fa) {
+    static void negLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6076,11 +6268,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::neg);
+        assertArraysEquals(r, a, LongVector256Tests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NEGMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void NEGMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6094,7 +6286,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, LongVector256Tests::NEG);
     }
 
     static long ABS(long a) {
@@ -6106,7 +6298,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ABSLong256VectorTests(IntFunction<long[]> fa) {
+    static void ABSLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6117,11 +6309,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::ABS);
+        assertArraysEquals(r, a, LongVector256Tests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void absLong256VectorTests(IntFunction<long[]> fa) {
+    static void absLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6132,11 +6324,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::abs);
+        assertArraysEquals(r, a, LongVector256Tests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ABSMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void ABSMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6150,7 +6342,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, LongVector256Tests::ABS);
     }
 
     static long NOT(long a) {
@@ -6162,7 +6354,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NOTLong256VectorTests(IntFunction<long[]> fa) {
+    static void NOTLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6173,11 +6365,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::NOT);
+        assertArraysEquals(r, a, LongVector256Tests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void notLong256VectorTests(IntFunction<long[]> fa) {
+    static void notLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6188,11 +6380,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::not);
+        assertArraysEquals(r, a, LongVector256Tests::not);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NOTMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void NOTMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6206,7 +6398,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, LongVector256Tests::NOT);
     }
 
     static long ZOMO(long a) {
@@ -6214,7 +6406,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZOMOLong256VectorTests(IntFunction<long[]> fa) {
+    static void ZOMOLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6225,11 +6417,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::ZOMO);
+        assertArraysEquals(r, a, LongVector256Tests::ZOMO);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ZOMOMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void ZOMOMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6243,7 +6435,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, LongVector256Tests::ZOMO);
     }
 
     static long BIT_COUNT(long a) {
@@ -6251,7 +6443,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BIT_COUNTLong256VectorTests(IntFunction<long[]> fa) {
+    static void BIT_COUNTLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6262,11 +6454,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, LongVector256Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void BIT_COUNTMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6280,7 +6472,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, LongVector256Tests::BIT_COUNT);
     }
 
     static long TRAILING_ZEROS_COUNT(long a) {
@@ -6288,7 +6480,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTLong256VectorTests(IntFunction<long[]> fa) {
+    static void TRAILING_ZEROS_COUNTLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6299,11 +6491,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6317,7 +6509,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     static long LEADING_ZEROS_COUNT(long a) {
@@ -6325,7 +6517,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTLong256VectorTests(IntFunction<long[]> fa) {
+    static void LEADING_ZEROS_COUNTLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6336,11 +6528,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6354,7 +6546,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     static long REVERSE(long a) {
@@ -6362,7 +6554,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSELong256VectorTests(IntFunction<long[]> fa) {
+    static void REVERSELongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6373,11 +6565,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::REVERSE);
+        assertArraysEquals(r, a, LongVector256Tests::REVERSE);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSEMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void REVERSEMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6391,7 +6583,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, LongVector256Tests::REVERSE);
     }
 
     static long REVERSE_BYTES(long a) {
@@ -6399,7 +6591,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSE_BYTESLong256VectorTests(IntFunction<long[]> fa) {
+    static void REVERSE_BYTESLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6410,11 +6602,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, LongVector256Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedLong256VectorTests(IntFunction<long[]> fa,
+    static void REVERSE_BYTESMaskedLongVector256Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6428,7 +6620,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, LongVector256Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6436,7 +6628,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandLongVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6449,7 +6641,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::band);
+        assertArraysEquals(r, a, b, LongVector256Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6457,7 +6649,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorLongVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6470,7 +6662,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::bor);
+        assertArraysEquals(r, a, b, LongVector256Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6478,7 +6670,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorLongVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6491,7 +6683,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::bxor);
+        assertArraysEquals(r, a, b, LongVector256Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6499,7 +6691,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotLongVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6512,7 +6704,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::bandNot);
+        assertArraysEquals(r, a, b, LongVector256Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6520,7 +6712,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqLongVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6533,7 +6725,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long256VectorTests::beq);
+        assertArraysEquals(r, a, b, LongVector256Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6541,7 +6733,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotLong256VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotLongVector256Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6552,7 +6744,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long256VectorTests::unot);
+        assertArraysEquals(r, a, LongVector256Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6561,15 +6753,15 @@ public class Long256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong256VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6583,7 +6775,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong256VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector256TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6593,13 +6785,13 @@ public class Long256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong256VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector256TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6609,13 +6801,13 @@ public class Long256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longtoIntUnaryOpProvider")
-    static void toIntArrayLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toIntArrayLongVector256TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6626,7 +6818,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toLongArrayLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toLongArrayLongVector256TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6637,7 +6829,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toDoubleArrayLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toDoubleArrayLongVector256TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6648,7 +6840,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toStringLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toStringLongVector256TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6661,7 +6853,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void hashCodeLong256VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void hashCodeLongVector256TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6677,7 +6869,7 @@ public class Long256VectorTests extends AbstractVectorTest {
 
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLongLong256VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongLongVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
@@ -6693,11 +6885,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long256VectorTests::ADDReduce, Long256VectorTests::ADDReduceAll);
+                LongVector256Tests::ADDReduce, LongVector256Tests::ADDReduceAll);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLongLong256VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongLongVector256TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6715,11 +6907,11 @@ public class Long256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long256VectorTests::ADDReduceMasked, Long256VectorTests::ADDReduceAllMasked);
+                LongVector256Tests::ADDReduceMasked, LongVector256Tests::ADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromProvider")
-    static void SelectFromLong256VectorTests(IntFunction<long[]> fa,
+    static void SelectFromLongVector256Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,long[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         long[] order = fs.apply(a.length, SPECIES.length());
@@ -6735,7 +6927,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorLong256VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SelectFromTwoVectorLongVector256Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] idx = fc.apply(SPECIES.length());
@@ -6753,7 +6945,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
-    static void SelectFromLong256VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void SelectFromLongVector256TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                            BiFunction<Integer,Integer,long[]> fs,
                                                            IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -6772,7 +6964,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousLong256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousLongVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6783,12 +6975,12 @@ public class Long256VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringLong256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringLongVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6802,7 +6994,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsLong256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsLongVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6811,12 +7003,12 @@ public class Long256VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsLong256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsLongVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6826,13 +7018,13 @@ public class Long256VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeLongVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6854,7 +7046,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountLongVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6865,7 +7057,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long256VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, LongVector256Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6879,7 +7071,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueLongVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6890,7 +7082,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long256VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector256Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6904,7 +7096,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueLongVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6915,11 +7107,11 @@ public class Long256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long256VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector256Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressLong256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressLongVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6929,7 +7121,7 @@ public class Long256VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -6947,7 +7139,7 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLong256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongVector256TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6955,13 +7147,13 @@ public class Long256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongLong256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongLongVector256TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6969,7 +7161,7 @@ public class Long256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -6988,36 +7180,36 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLong256VectorTestsSmokeTest(int length) {
+    static void loopBoundLongVector256TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongLong256VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongLongVector256TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeLong256VectorTestsSmokeTest() {
+    static void ElementSizeLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Long.SIZE);
+        assertEquals(elsize, Long.SIZE);
     }
 
     @Test
-    static void VectorShapeLong256VectorTestsSmokeTest() {
+    static void VectorShapeLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_256_BIT));
     }
 
     @Test
-    static void ShapeWithLanesLong256VectorTestsSmokeTest() {
+    static void ShapeWithLanesLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(long.class);
@@ -7025,32 +7217,32 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeLong256VectorTestsSmokeTest() {
+    static void ElementTypeLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementType() == long.class);
     }
 
     @Test
-    static void SpeciesElementSizeLong256VectorTestsSmokeTest() {
+    static void SpeciesElementSizeLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementSize() == Long.SIZE);
     }
 
     @Test
-    static void VectorTypeLong256VectorTestsSmokeTest() {
+    static void VectorTypeLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesLong256VectorTestsSmokeTest() {
+    static void WithLanesLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(long.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeLong256VectorTestsSmokeTest() {
+    static void WithShapeLongVector256TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7058,9 +7250,9 @@ public class Long256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueLong256VectorTestsSmokeTest() {
+    static void MaskAllTrueLongVector256TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongVector512LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/LongVector512LoadStoreTests.java
index 1b70f8d1ba4..095616595f8 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector512LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Long512VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation LongVector512LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class LongVector512LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_512;
 
@@ -61,14 +61,29 @@ public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(long[] r, long[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Long512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Long512VectorTests.java b/test/jdk/jdk/incubator/vector/LongVector512Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Long512VectorTests.java
rename to test/jdk/jdk/incubator/vector/LongVector512Tests.java
index 181116cf399..503bd7942f2 100644
--- a/test/jdk/jdk/incubator/vector/Long512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector512Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Long512VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation LongVector512Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,65 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Long512VectorTests extends AbstractVectorTest {
+public class LongVector512Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected, long delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(long actual, long expected, long delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final long CONST_SHIFT = Long.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final long ADD_IDENTITY = (long)0;
+    private static final long AND_IDENTITY = (long)-1;
+    private static final long FIRST_NONZERO_IDENTITY = (long)0;
+    private static final long MAX_IDENTITY = Long.MIN_VALUE;
+    private static final long MIN_IDENTITY = Long.MAX_VALUE;
+    private static final long MUL_IDENTITY = (long)1;
+    private static final long OR_IDENTITY = (long)0;
+    private static final long SUADD_IDENTITY = (long)0;
+    private static final long UMAX_IDENTITY = (long)0;   // Minimum unsigned value
+    private static final long UMIN_IDENTITY = (long)-1;  // Maximum unsigned value
+    private static final long XOR_IDENTITY = (long)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
     static void assertArraysStrictlyEquals(long[] r, long[] a) {
@@ -84,10 +133,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +148,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +164,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +183,13 @@ public class Long512VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +205,13 @@ public class Long512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -175,10 +224,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -190,10 +239,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -202,12 +251,12 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -218,20 +267,20 @@ public class Long512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (long)0);
+                    assertEquals(r[i + k], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -243,19 +292,19 @@ public class Long512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (long)0);
+                        assertEquals(r[i + j], (long)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -271,11 +320,11 @@ public class Long512VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -284,12 +333,12 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -299,17 +348,17 @@ public class Long512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -319,17 +368,17 @@ public class Long512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -343,10 +392,10 @@ public class Long512VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -358,10 +407,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -373,10 +422,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -397,18 +446,18 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -423,18 +472,18 @@ public class Long512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -442,10 +491,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -453,10 +502,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -464,10 +513,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -476,10 +525,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -492,10 +541,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -507,10 +556,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -522,10 +571,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -540,10 +589,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -556,11 +605,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -574,11 +623,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -600,11 +649,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -618,11 +667,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -642,10 +691,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -657,10 +706,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -669,10 +718,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -682,10 +731,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -701,11 +750,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -722,11 +771,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -737,11 +786,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -758,11 +807,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -780,13 +829,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -807,13 +856,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -828,13 +877,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +904,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -875,13 +924,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -896,13 +945,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -917,13 +966,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -939,13 +988,13 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -991,10 +1040,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1004,10 +1053,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1015,10 +1064,10 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1553,7 +1602,7 @@ public class Long512VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         LongVector a = io.add((long)1); //[1,2]
         LongVector b = a.neg();  //[-1,-2]
         long[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1568,19 +1617,19 @@ public class Long512VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Long> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Long> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         LongVector uab0 = zab0.rearrange(unz0,zab1);
         LongVector uab1 = zab0.rearrange(unz1,zab1);
         long[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1595,7 +1644,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1603,9 +1652,9 @@ public class Long512VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1634,7 +1683,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1647,7 +1696,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::ADD);
+        assertArraysEquals(r, a, b, LongVector512Tests::ADD);
     }
 
     static long add(long a, long b) {
@@ -1655,7 +1704,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1666,11 +1715,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::add);
+        assertArraysEquals(r, a, b, LongVector512Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1686,11 +1735,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1704,7 +1753,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::add);
     }
 
     static long SUB(long a, long b) {
@@ -1712,7 +1761,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void SUBLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUBLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1725,7 +1774,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::SUB);
+        assertArraysEquals(r, a, b, LongVector512Tests::SUB);
     }
 
     static long sub(long a, long b) {
@@ -1733,7 +1782,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1744,11 +1793,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::sub);
+        assertArraysEquals(r, a, b, LongVector512Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void SUBLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUBLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1764,11 +1813,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1782,7 +1831,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::sub);
     }
 
     static long MUL(long a, long b) {
@@ -1790,7 +1839,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MULLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MULLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1803,7 +1852,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::MUL);
+        assertArraysEquals(r, a, b, LongVector512Tests::MUL);
     }
 
     static long mul(long a, long b) {
@@ -1811,7 +1860,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1822,11 +1871,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::mul);
+        assertArraysEquals(r, a, b, LongVector512Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void MULLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void MULLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1842,11 +1891,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1860,7 +1909,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::mul);
     }
 
     static long DIV(long a, long b) {
@@ -1868,7 +1917,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void DIVLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void DIVLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1883,7 +1932,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::DIV);
+        assertArraysEquals(r, a, b, LongVector512Tests::DIV);
     }
 
     static long div(long a, long b) {
@@ -1891,7 +1940,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1906,11 +1955,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::div);
+        assertArraysEquals(r, a, b, LongVector512Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void DIVLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void DIVLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1928,11 +1977,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1950,7 +1999,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1958,7 +2007,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void FIRST_NONZEROLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void FIRST_NONZEROLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1971,11 +2020,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, LongVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void FIRST_NONZEROLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void FIRST_NONZEROLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1991,7 +2040,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1999,7 +2048,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2012,7 +2061,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::AND);
+        assertArraysEquals(r, a, b, LongVector512Tests::AND);
     }
 
     static long and(long a, long b) {
@@ -2020,7 +2069,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2031,11 +2080,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::and);
+        assertArraysEquals(r, a, b, LongVector512Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2051,7 +2100,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::AND);
     }
 
     static long AND_NOT(long a, long b) {
@@ -2059,7 +2108,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void AND_NOTLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void AND_NOTLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2072,11 +2121,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, LongVector512Tests::AND_NOT);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void AND_NOTLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void AND_NOTLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2092,7 +2141,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::AND_NOT);
     }
 
     static long OR(long a, long b) {
@@ -2100,7 +2149,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2113,7 +2162,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::OR);
+        assertArraysEquals(r, a, b, LongVector512Tests::OR);
     }
 
     static long or(long a, long b) {
@@ -2121,7 +2170,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::or);
+        assertArraysEquals(r, a, b, LongVector512Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2152,7 +2201,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::OR);
     }
 
     static long XOR(long a, long b) {
@@ -2160,7 +2209,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void XORLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void XORLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2173,11 +2222,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::XOR);
+        assertArraysEquals(r, a, b, LongVector512Tests::XOR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void XORLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void XORLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2193,7 +2242,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::XOR);
     }
 
     static long COMPRESS_BITS(long a, long b) {
@@ -2201,7 +2250,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void COMPRESS_BITSLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void COMPRESS_BITSLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2263,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, LongVector512Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void COMPRESS_BITSLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void COMPRESS_BITSLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2234,7 +2283,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::COMPRESS_BITS);
     }
 
     static long EXPAND_BITS(long a, long b) {
@@ -2242,7 +2291,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void EXPAND_BITSLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EXPAND_BITSLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2255,11 +2304,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, LongVector512Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void EXPAND_BITSLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EXPAND_BITSLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2275,11 +2324,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2289,11 +2338,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2306,11 +2355,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector512Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2320,11 +2369,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2386,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector512Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2400,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2368,11 +2417,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector512Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2384,11 +2433,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2403,11 +2452,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector512Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2417,11 +2466,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2431,11 +2480,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2448,11 +2497,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector512Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2462,11 +2511,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2476,11 +2525,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2493,11 +2542,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector512Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong512VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector512TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2507,11 +2556,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector512Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2524,11 +2573,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector512Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong512VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector512TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2538,11 +2587,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector512Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2555,7 +2604,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector512Tests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2563,7 +2612,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2576,11 +2625,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, LongVector512Tests::LSHL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2596,7 +2645,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::LSHL);
     }
 
     static long ASHR(long a, long b) {
@@ -2604,7 +2653,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2617,11 +2666,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, LongVector512Tests::ASHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2637,7 +2686,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::ASHR);
     }
 
     static long LSHR(long a, long b) {
@@ -2645,7 +2694,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2658,11 +2707,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, LongVector512Tests::LSHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2678,7 +2727,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::LSHR);
     }
 
     static long LSHL_unary(long a, long b) {
@@ -2686,7 +2735,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong512VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector512TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2698,11 +2747,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector512Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong512VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector512TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2717,7 +2766,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector512Tests::LSHL_unary);
     }
 
     static long LSHR_unary(long a, long b) {
@@ -2725,7 +2774,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong512VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector512TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2737,11 +2786,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector512Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong512VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector512TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2756,7 +2805,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector512Tests::LSHR_unary);
     }
 
     static long ASHR_unary(long a, long b) {
@@ -2764,7 +2813,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong512VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector512TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2776,11 +2825,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector512Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong512VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector512TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2795,7 +2844,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector512Tests::ASHR_unary);
     }
 
     static long ROR(long a, long b) {
@@ -2803,7 +2852,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2816,11 +2865,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::ROR);
+        assertArraysEquals(r, a, b, LongVector512Tests::ROR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2836,7 +2885,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::ROR);
     }
 
     static long ROL(long a, long b) {
@@ -2844,7 +2893,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2857,11 +2906,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::ROL);
+        assertArraysEquals(r, a, b, LongVector512Tests::ROL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2877,7 +2926,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::ROL);
     }
 
     static long ROR_unary(long a, long b) {
@@ -2885,7 +2934,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong512VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector512TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2897,11 +2946,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector512Tests::ROR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong512VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector512TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2916,7 +2965,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector512Tests::ROR_unary);
     }
 
     static long ROL_unary(long a, long b) {
@@ -2924,7 +2973,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong512VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector512TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2936,11 +2985,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector512Tests::ROL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong512VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector512TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2955,14 +3004,14 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector512Tests::ROL_unary);
     }
     static long LSHR_binary_const(long a) {
         return (long)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHRLong512VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHRLongVector512TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -2973,11 +3022,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector512Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHRLong512VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHRLongVector512TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2991,7 +3040,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector512Tests::LSHR_binary_const);
     }
 
     static long LSHL_binary_const(long a) {
@@ -2999,7 +3048,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHLLong512VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHLLongVector512TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3010,11 +3059,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, LongVector512Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHLLong512VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHLLongVector512TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3028,7 +3077,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector512Tests::LSHL_binary_const);
     }
 
     static long ASHR_binary_const(long a) {
@@ -3036,7 +3085,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ASHRLong512VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ASHRLongVector512TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3047,11 +3096,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector512Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ASHRLong512VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ASHRLongVector512TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3065,7 +3114,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector512Tests::ASHR_binary_const);
     }
 
     static long ROR_binary_const(long a) {
@@ -3073,7 +3122,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void RORLong512VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void RORLongVector512TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3084,11 +3133,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, LongVector512Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void RORLong512VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void RORLongVector512TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3102,7 +3151,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector512Tests::ROR_binary_const);
     }
 
     static long ROL_binary_const(long a) {
@@ -3110,7 +3159,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ROLLong512VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ROLLongVector512TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3121,11 +3170,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, LongVector512Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ROLLong512VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ROLLongVector512TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3139,14 +3188,14 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector512Tests::ROL_binary_const);
     }
 
 
     static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MINLongVector512TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3157,13 +3206,13 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long512VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, LongVector512Tests::MIN);
     }
 
     static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void minLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void minLongVector512TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3174,13 +3223,13 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long512VectorTests::min);
+        assertArraysEquals(r, a, (long)10, LongVector512Tests::min);
     }
 
     static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINLong512VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINLongVector512TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3193,13 +3242,13 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long512VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, mask, LongVector512Tests::MIN);
     }
 
     static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MAXLongVector512TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3210,13 +3259,13 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long512VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, LongVector512Tests::MAX);
     }
 
     static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void maxLong512VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void maxLongVector512TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3227,13 +3276,13 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long512VectorTests::max);
+        assertArraysEquals(r, a, (long)10, LongVector512Tests::max);
     }
 
     static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXLong512VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXLongVector512TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3246,7 +3295,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long512VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, mask, LongVector512Tests::MAX);
     }
 
     static long MIN(long a, long b) {
@@ -3254,7 +3303,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3267,7 +3316,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::MIN);
+        assertArraysEquals(r, a, b, LongVector512Tests::MIN);
     }
 
     static long min(long a, long b) {
@@ -3275,7 +3324,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3286,7 +3335,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::min);
+        assertArraysEquals(r, a, b, LongVector512Tests::min);
     }
 
     static long MAX(long a, long b) {
@@ -3294,7 +3343,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3307,7 +3356,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::MAX);
+        assertArraysEquals(r, a, b, LongVector512Tests::MAX);
     }
 
     static long max(long a, long b) {
@@ -3315,7 +3364,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3326,7 +3375,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::max);
+        assertArraysEquals(r, a, b, LongVector512Tests::max);
     }
 
     static long UMIN(long a, long b) {
@@ -3334,7 +3383,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMINLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMINLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3347,11 +3396,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, LongVector512Tests::UMIN);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMINLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMINLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3367,7 +3416,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::UMIN);
     }
 
     static long UMAX(long a, long b) {
@@ -3375,7 +3424,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMAXLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMAXLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3388,11 +3437,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, LongVector512Tests::UMAX);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMAXLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMAXLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3408,7 +3457,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::UMAX);
     }
 
     static long SADD(long a, long b) {
@@ -3416,7 +3465,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SADDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SADDLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3429,11 +3478,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::SADD);
+        assertArraysEquals(r, a, b, LongVector512Tests::SADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SADDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SADDLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3449,7 +3498,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::SADD);
     }
 
     static long SSUB(long a, long b) {
@@ -3457,7 +3506,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SSUBLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SSUBLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3470,11 +3519,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, LongVector512Tests::SSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SSUBLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SSUBLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3490,7 +3539,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::SSUB);
     }
 
     static long SUADD(long a, long b) {
@@ -3498,7 +3547,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUADDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUADDLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3560,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, LongVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUADDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3531,7 +3580,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::SUADD);
     }
 
     static long SUSUB(long a, long b) {
@@ -3539,7 +3588,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUSUBLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUSUBLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3552,11 +3601,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, LongVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUSUBLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUSUBLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3572,11 +3621,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3586,11 +3635,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3600,11 +3649,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3614,11 +3663,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3628,10 +3677,10 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, LongVector512Tests::max);
     }
     @Test(dataProvider = "longSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SUADDAssocLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -3648,11 +3697,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Long512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, LongVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDAssocLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                      IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3673,11 +3722,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Long512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, LongVector512Tests::SUADD);
     }
 
     static long ANDReduce(long[] a, int idx) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3686,7 +3735,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAll(long[] a) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3695,32 +3744,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ANDReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void ANDReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                long v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::ANDReduce, Long512VectorTests::ANDReduceAll);
+                LongVector512Tests::ANDReduce, LongVector512Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = AND_IDENTITY;
+
+        assertEquals((long) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id & x), x);
+                assertEquals((long) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static long ANDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3730,7 +3797,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3739,34 +3806,29 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ANDReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                long v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::ANDReduceMasked, Long512VectorTests::ANDReduceAllMasked);
+                LongVector512Tests::ANDReduceMasked, LongVector512Tests::ANDReduceAllMasked);
     }
 
     static long ORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3775,7 +3837,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAll(long[] a) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3784,32 +3846,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ORReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void ORReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                long v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::ORReduce, Long512VectorTests::ORReduceAll);
+                LongVector512Tests::ORReduce, LongVector512Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = OR_IDENTITY;
+
+        assertEquals((long) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id | x), x);
+                assertEquals((long) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static long ORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3819,7 +3899,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3828,7 +3908,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ORReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3836,26 +3916,21 @@ public class Long512VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                long v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::ORReduceMasked, Long512VectorTests::ORReduceAllMasked);
+                LongVector512Tests::ORReduceMasked, LongVector512Tests::ORReduceAllMasked);
     }
 
     static long XORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3864,7 +3939,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAll(long[] a) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3873,32 +3948,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void XORReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void XORReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                long v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::XORReduce, Long512VectorTests::XORReduceAll);
+                LongVector512Tests::XORReduce, LongVector512Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = XOR_IDENTITY;
+
+        assertEquals((long) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id ^ x), x);
+                assertEquals((long) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static long XORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3908,7 +4001,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3917,7 +4010,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void XORReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3925,26 +4018,21 @@ public class Long512VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                long v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::XORReduceMasked, Long512VectorTests::XORReduceAllMasked);
+                LongVector512Tests::XORReduceMasked, LongVector512Tests::XORReduceAllMasked);
     }
 
     static long ADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3953,7 +4041,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAll(long[] a) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3962,32 +4050,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                long v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::ADDReduce, Long512VectorTests::ADDReduceAll);
+                LongVector512Tests::ADDReduce, LongVector512Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = ADD_IDENTITY;
+
+        assertEquals((long) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id + x), x);
+                assertEquals((long) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3997,7 +4103,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -4006,7 +4112,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4014,26 +4120,21 @@ public class Long512VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                long v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::ADDReduceMasked, Long512VectorTests::ADDReduceAllMasked);
+                LongVector512Tests::ADDReduceMasked, LongVector512Tests::ADDReduceAllMasked);
     }
 
     static long MULReduce(long[] a, int idx) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4042,7 +4143,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAll(long[] a) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4051,32 +4152,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MULReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void MULReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                long v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::MULReduce, Long512VectorTests::MULReduceAll);
+                LongVector512Tests::MULReduce, LongVector512Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MUL_IDENTITY;
+
+        assertEquals((long) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id * x), x);
+                assertEquals((long) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4086,7 +4205,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4095,34 +4214,29 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MULReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                long v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::MULReduceMasked, Long512VectorTests::MULReduceAllMasked);
+                LongVector512Tests::MULReduceMasked, LongVector512Tests::MULReduceAllMasked);
     }
 
     static long MINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.min(res, a[i]);
         }
@@ -4131,7 +4245,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduce(a, i));
         }
@@ -4140,32 +4254,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void MINReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                long v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::MINReduce, Long512VectorTests::MINReduceAll);
+                LongVector512Tests::MINReduce, LongVector512Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MIN_IDENTITY;
+
+        assertEquals((long) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.min(id, x), x);
+                assertEquals((long) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.min(res, a[i]);
@@ -4175,7 +4307,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4184,34 +4316,29 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                long v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::MINReduceMasked, Long512VectorTests::MINReduceAllMasked);
+                LongVector512Tests::MINReduceMasked, LongVector512Tests::MINReduceAllMasked);
     }
 
     static long MAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.max(res, a[i]);
         }
@@ -4220,7 +4347,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduce(a, i));
         }
@@ -4229,32 +4356,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void MAXReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                long v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::MAXReduce, Long512VectorTests::MAXReduceAll);
+                LongVector512Tests::MAXReduce, LongVector512Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MAX_IDENTITY;
+
+        assertEquals((long) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.max(id, x), x);
+                assertEquals((long) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.max(res, a[i]);
@@ -4264,7 +4409,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4273,34 +4418,29 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                long v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::MAXReduceMasked, Long512VectorTests::MAXReduceAllMasked);
+                LongVector512Tests::MAXReduceMasked, LongVector512Tests::MAXReduceAllMasked);
     }
 
     static long UMINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4309,7 +4449,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4318,32 +4458,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMINReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void UMINReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                long v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::UMINReduce, Long512VectorTests::UMINReduceAll);
+                LongVector512Tests::UMINReduce, LongVector512Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMIN_IDENTITY;
+
+        assertEquals((long) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.minUnsigned(id, x), x);
+                assertEquals((long) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static long UMINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.minUnsigned(res, a[i]);
@@ -4353,7 +4511,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4362,34 +4520,29 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMINReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                long v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::UMINReduceMasked, Long512VectorTests::UMINReduceAllMasked);
+                LongVector512Tests::UMINReduceMasked, LongVector512Tests::UMINReduceAllMasked);
     }
 
     static long UMAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4398,7 +4551,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4407,32 +4560,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMAXReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void UMAXReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                long v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::UMAXReduce, Long512VectorTests::UMAXReduceAll);
+                LongVector512Tests::UMAXReduce, LongVector512Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMAX_IDENTITY;
+
+        assertEquals((long) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((long) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static long UMAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.maxUnsigned(res, a[i]);
@@ -4442,7 +4613,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4451,34 +4622,29 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMAXReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                long v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::UMAXReduceMasked, Long512VectorTests::UMAXReduceAllMasked);
+                LongVector512Tests::UMAXReduceMasked, LongVector512Tests::UMAXReduceAllMasked);
     }
 
     static long FIRST_NONZEROReduce(long[] a, int idx) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4487,7 +4653,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAll(long[] a) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4496,32 +4662,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void FIRST_NONZEROReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void FIRST_NONZEROReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::FIRST_NONZEROReduce, Long512VectorTests::FIRST_NONZEROReduceAll);
+                LongVector512Tests::FIRST_NONZEROReduce, LongVector512Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static long FIRST_NONZEROReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4531,7 +4715,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAllMasked(long[] a, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4540,30 +4724,25 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::FIRST_NONZEROReduceMasked, Long512VectorTests::FIRST_NONZEROReduceAllMasked);
+                LongVector512Tests::FIRST_NONZEROReduceMasked, LongVector512Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4576,7 +4755,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueLong512VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueLongVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4587,7 +4766,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector512Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4600,7 +4779,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueLong512VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueLongVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4611,11 +4790,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector512Tests::allTrue);
     }
 
     static long SUADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4624,7 +4803,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAll(long[] a) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4633,32 +4812,50 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingUnaryOpProvider")
-    static void SUADDReduceLong512VectorTests(IntFunction<long[]> fa) {
+    static void SUADDReduceLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                long v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::SUADDReduce, Long512VectorTests::SUADDReduceAll);
+                LongVector512Tests::SUADDReduce, LongVector512Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "longSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = SUADD_IDENTITY;
+
+        assertEquals((long) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static long SUADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4668,7 +4865,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4676,7 +4873,7 @@ public class Long512VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "longSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4684,26 +4881,21 @@ public class Long512VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                long v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::SUADDReduceMasked, Long512VectorTests::SUADDReduceAllMasked);
+                LongVector512Tests::SUADDReduceMasked, LongVector512Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void withLong512VectorTests(IntFunction<long []> fa, IntFunction<long []> fb) {
+    static void withLongVector512Tests(IntFunction<long []> fa, IntFunction<long []> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -4726,7 +4918,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_DEFAULTLong512VectorTests(IntFunction<long[]> fa) {
+    static void IS_DEFAULTLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4736,14 +4928,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLongVector512Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4756,7 +4948,7 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4767,7 +4959,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_NEGATIVELong512VectorTests(IntFunction<long[]> fa) {
+    static void IS_NEGATIVELongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4777,14 +4969,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLongVector512Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4797,14 +4989,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4816,14 +5008,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4835,14 +5027,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LTLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4858,14 +5050,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GTLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GTLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4877,14 +5069,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GTLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GTLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4900,14 +5092,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4919,14 +5111,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4938,14 +5130,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EQLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4961,14 +5153,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void NELong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void NELongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4980,14 +5172,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void NELong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void NELongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5003,14 +5195,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LELong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LELongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5022,14 +5214,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LELong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LELongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5045,14 +5237,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GELong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GELongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5064,14 +5256,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GELong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GELongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5087,14 +5279,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULTLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULTLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5106,14 +5298,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULTLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULTLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5129,14 +5321,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGTLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGTLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5148,14 +5340,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGTLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGTLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5171,14 +5363,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULELong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULELongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5190,14 +5382,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULELong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULELongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5213,14 +5405,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGELong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGELongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5232,14 +5424,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGELong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGELongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5255,14 +5447,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5272,13 +5464,13 @@ public class Long512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void LTLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5292,14 +5484,14 @@ public class Long512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5309,13 +5501,13 @@ public class Long512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void EQLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5329,7 +5521,7 @@ public class Long512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
@@ -5340,7 +5532,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void blendLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void blendLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5356,11 +5548,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, LongVector512Tests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
-    static void RearrangeLong512VectorTests(IntFunction<long[]> fa,
+    static void RearrangeLongVector512Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5377,7 +5569,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
-    static void RearrangeLong512VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void RearrangeLongVector512TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -5395,7 +5587,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void compressLong512VectorTests(IntFunction<long[]> fa,
+    static void compressLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5413,7 +5605,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void expandLong512VectorTests(IntFunction<long[]> fa,
+    static void expandLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5431,7 +5623,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void getLong512VectorTests(IntFunction<long[]> fa) {
+    static void getLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -5587,7 +5779,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BroadcastLong512VectorTests(IntFunction<long[]> fa) {
+    static void BroadcastLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5601,7 +5793,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZeroLong512VectorTests(IntFunction<long[]> fa) {
+    static void ZeroLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5611,7 +5803,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static long[] sliceUnary(long[] a, int origin, int idx) {
@@ -5626,7 +5818,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void sliceUnaryLong512VectorTests(IntFunction<long[]> fa) {
+    static void sliceUnaryLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5637,7 +5829,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, LongVector512Tests::sliceUnary);
     }
 
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
@@ -5654,7 +5846,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void sliceBinaryLong512VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void sliceBinaryLongVector512TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5667,7 +5859,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Long512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, LongVector512Tests::sliceBinary);
     }
 
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
@@ -5684,7 +5876,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void sliceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void sliceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5701,7 +5893,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Long512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, LongVector512Tests::slice);
     }
 
     static long[] unsliceUnary(long[] a, int origin, int idx) {
@@ -5718,7 +5910,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void unsliceUnaryLong512VectorTests(IntFunction<long[]> fa) {
+    static void unsliceUnaryLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5729,7 +5921,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, LongVector512Tests::unsliceUnary);
     }
 
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
@@ -5755,7 +5947,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void unsliceBinaryLong512VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void unsliceBinaryLongVector512TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5769,7 +5961,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Long512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, LongVector512Tests::unsliceBinary);
     }
 
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5809,7 +6001,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void unsliceLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void unsliceLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5826,7 +6018,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Long512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, LongVector512Tests::unslice);
     }
 
     static long BITWISE_BLEND(long a, long b, long c) {
@@ -5838,7 +6030,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5853,11 +6045,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5870,11 +6062,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, LongVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5892,11 +6084,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5907,11 +6099,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong512VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector512TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5922,11 +6114,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5937,11 +6129,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong512VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector512TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5952,11 +6144,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5971,11 +6163,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector512TestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5990,11 +6182,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong512VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector512TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6005,11 +6197,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong512VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector512TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6020,11 +6212,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector512TestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -6038,7 +6230,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongVector512Tests::BITWISE_BLEND);
     }
 
     static long NEG(long a) {
@@ -6050,7 +6242,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NEGLong512VectorTests(IntFunction<long[]> fa) {
+    static void NEGLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6061,11 +6253,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::NEG);
+        assertArraysEquals(r, a, LongVector512Tests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void negLong512VectorTests(IntFunction<long[]> fa) {
+    static void negLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6076,11 +6268,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::neg);
+        assertArraysEquals(r, a, LongVector512Tests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NEGMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void NEGMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6094,7 +6286,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, LongVector512Tests::NEG);
     }
 
     static long ABS(long a) {
@@ -6106,7 +6298,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ABSLong512VectorTests(IntFunction<long[]> fa) {
+    static void ABSLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6117,11 +6309,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::ABS);
+        assertArraysEquals(r, a, LongVector512Tests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void absLong512VectorTests(IntFunction<long[]> fa) {
+    static void absLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6132,11 +6324,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::abs);
+        assertArraysEquals(r, a, LongVector512Tests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ABSMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void ABSMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6150,7 +6342,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, LongVector512Tests::ABS);
     }
 
     static long NOT(long a) {
@@ -6162,7 +6354,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NOTLong512VectorTests(IntFunction<long[]> fa) {
+    static void NOTLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6173,11 +6365,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::NOT);
+        assertArraysEquals(r, a, LongVector512Tests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void notLong512VectorTests(IntFunction<long[]> fa) {
+    static void notLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6188,11 +6380,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::not);
+        assertArraysEquals(r, a, LongVector512Tests::not);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NOTMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void NOTMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6206,7 +6398,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, LongVector512Tests::NOT);
     }
 
     static long ZOMO(long a) {
@@ -6214,7 +6406,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZOMOLong512VectorTests(IntFunction<long[]> fa) {
+    static void ZOMOLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6225,11 +6417,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::ZOMO);
+        assertArraysEquals(r, a, LongVector512Tests::ZOMO);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ZOMOMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void ZOMOMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6243,7 +6435,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, LongVector512Tests::ZOMO);
     }
 
     static long BIT_COUNT(long a) {
@@ -6251,7 +6443,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BIT_COUNTLong512VectorTests(IntFunction<long[]> fa) {
+    static void BIT_COUNTLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6262,11 +6454,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, LongVector512Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void BIT_COUNTMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6280,7 +6472,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, LongVector512Tests::BIT_COUNT);
     }
 
     static long TRAILING_ZEROS_COUNT(long a) {
@@ -6288,7 +6480,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTLong512VectorTests(IntFunction<long[]> fa) {
+    static void TRAILING_ZEROS_COUNTLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6299,11 +6491,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6317,7 +6509,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     static long LEADING_ZEROS_COUNT(long a) {
@@ -6325,7 +6517,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTLong512VectorTests(IntFunction<long[]> fa) {
+    static void LEADING_ZEROS_COUNTLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6336,11 +6528,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6354,7 +6546,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     static long REVERSE(long a) {
@@ -6362,7 +6554,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSELong512VectorTests(IntFunction<long[]> fa) {
+    static void REVERSELongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6373,11 +6565,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::REVERSE);
+        assertArraysEquals(r, a, LongVector512Tests::REVERSE);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSEMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void REVERSEMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6391,7 +6583,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, LongVector512Tests::REVERSE);
     }
 
     static long REVERSE_BYTES(long a) {
@@ -6399,7 +6591,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSE_BYTESLong512VectorTests(IntFunction<long[]> fa) {
+    static void REVERSE_BYTESLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6410,11 +6602,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, LongVector512Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedLong512VectorTests(IntFunction<long[]> fa,
+    static void REVERSE_BYTESMaskedLongVector512Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6428,7 +6620,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, LongVector512Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6436,7 +6628,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandLongVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6449,7 +6641,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::band);
+        assertArraysEquals(r, a, b, LongVector512Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6457,7 +6649,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorLongVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6470,7 +6662,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::bor);
+        assertArraysEquals(r, a, b, LongVector512Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6478,7 +6670,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorLongVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6491,7 +6683,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::bxor);
+        assertArraysEquals(r, a, b, LongVector512Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6499,7 +6691,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotLongVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6512,7 +6704,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::bandNot);
+        assertArraysEquals(r, a, b, LongVector512Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6520,7 +6712,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqLongVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6533,7 +6725,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long512VectorTests::beq);
+        assertArraysEquals(r, a, b, LongVector512Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6541,7 +6733,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotLong512VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotLongVector512Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6552,7 +6744,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long512VectorTests::unot);
+        assertArraysEquals(r, a, LongVector512Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6561,15 +6753,15 @@ public class Long512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong512VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6583,7 +6775,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong512VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector512TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6593,13 +6785,13 @@ public class Long512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong512VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector512TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6609,13 +6801,13 @@ public class Long512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longtoIntUnaryOpProvider")
-    static void toIntArrayLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toIntArrayLongVector512TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6626,7 +6818,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toLongArrayLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toLongArrayLongVector512TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6637,7 +6829,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toDoubleArrayLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toDoubleArrayLongVector512TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6648,7 +6840,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toStringLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toStringLongVector512TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6661,7 +6853,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void hashCodeLong512VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void hashCodeLongVector512TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6677,7 +6869,7 @@ public class Long512VectorTests extends AbstractVectorTest {
 
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLongLong512VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongLongVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
@@ -6693,11 +6885,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long512VectorTests::ADDReduce, Long512VectorTests::ADDReduceAll);
+                LongVector512Tests::ADDReduce, LongVector512Tests::ADDReduceAll);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLongLong512VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongLongVector512TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6715,11 +6907,11 @@ public class Long512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long512VectorTests::ADDReduceMasked, Long512VectorTests::ADDReduceAllMasked);
+                LongVector512Tests::ADDReduceMasked, LongVector512Tests::ADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromProvider")
-    static void SelectFromLong512VectorTests(IntFunction<long[]> fa,
+    static void SelectFromLongVector512Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,long[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         long[] order = fs.apply(a.length, SPECIES.length());
@@ -6735,7 +6927,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorLong512VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SelectFromTwoVectorLongVector512Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] idx = fc.apply(SPECIES.length());
@@ -6753,7 +6945,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
-    static void SelectFromLong512VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void SelectFromLongVector512TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                            BiFunction<Integer,Integer,long[]> fs,
                                                            IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -6772,7 +6964,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousLong512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousLongVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6783,12 +6975,12 @@ public class Long512VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringLong512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringLongVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6802,7 +6994,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsLong512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsLongVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6811,12 +7003,12 @@ public class Long512VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsLong512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsLongVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6826,13 +7018,13 @@ public class Long512VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeLongVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6854,7 +7046,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountLongVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6865,7 +7057,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long512VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, LongVector512Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6879,7 +7071,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueLongVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6890,7 +7082,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long512VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector512Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6904,7 +7096,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueLongVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6915,11 +7107,11 @@ public class Long512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long512VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector512Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressLong512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressLongVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6929,7 +7121,7 @@ public class Long512VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -6947,7 +7139,7 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLong512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongVector512TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6955,13 +7147,13 @@ public class Long512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongLong512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongLongVector512TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6969,7 +7161,7 @@ public class Long512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -6988,36 +7180,36 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLong512VectorTestsSmokeTest(int length) {
+    static void loopBoundLongVector512TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongLong512VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongLongVector512TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeLong512VectorTestsSmokeTest() {
+    static void ElementSizeLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Long.SIZE);
+        assertEquals(elsize, Long.SIZE);
     }
 
     @Test
-    static void VectorShapeLong512VectorTestsSmokeTest() {
+    static void VectorShapeLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_512_BIT));
     }
 
     @Test
-    static void ShapeWithLanesLong512VectorTestsSmokeTest() {
+    static void ShapeWithLanesLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(long.class);
@@ -7025,32 +7217,32 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeLong512VectorTestsSmokeTest() {
+    static void ElementTypeLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementType() == long.class);
     }
 
     @Test
-    static void SpeciesElementSizeLong512VectorTestsSmokeTest() {
+    static void SpeciesElementSizeLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementSize() == Long.SIZE);
     }
 
     @Test
-    static void VectorTypeLong512VectorTestsSmokeTest() {
+    static void VectorTypeLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesLong512VectorTestsSmokeTest() {
+    static void WithLanesLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(long.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeLong512VectorTestsSmokeTest() {
+    static void WithShapeLongVector512TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7058,9 +7250,9 @@ public class Long512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueLong512VectorTestsSmokeTest() {
+    static void MaskAllTrueLongVector512TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongVector64LoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/LongVector64LoadStoreTests.java
index 53df5e4e092..c1eb1e87561 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector64LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Long64VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation LongVector64LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class LongVector64LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_64;
 
@@ -61,14 +61,29 @@ public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -870,11 +885,11 @@ public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -885,11 +900,11 @@ public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
         }
     }
 
@@ -905,7 +920,7 @@ public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(long[] r, long[] a, int[] indexMap) {
@@ -918,7 +933,7 @@ public class Long64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Long64VectorTests.java b/test/jdk/jdk/incubator/vector/LongVector64Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Long64VectorTests.java
rename to test/jdk/jdk/incubator/vector/LongVector64Tests.java
index cb052925778..6ca3c63054a 100644
--- a/test/jdk/jdk/incubator/vector/Long64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVector64Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Long64VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation LongVector64Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,65 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Long64VectorTests extends AbstractVectorTest {
+public class LongVector64Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_64;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected, long delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(long actual, long expected, long delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final long CONST_SHIFT = Long.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final long ADD_IDENTITY = (long)0;
+    private static final long AND_IDENTITY = (long)-1;
+    private static final long FIRST_NONZERO_IDENTITY = (long)0;
+    private static final long MAX_IDENTITY = Long.MIN_VALUE;
+    private static final long MIN_IDENTITY = Long.MAX_VALUE;
+    private static final long MUL_IDENTITY = (long)1;
+    private static final long OR_IDENTITY = (long)0;
+    private static final long SUADD_IDENTITY = (long)0;
+    private static final long UMAX_IDENTITY = (long)0;   // Minimum unsigned value
+    private static final long UMIN_IDENTITY = (long)-1;  // Maximum unsigned value
+    private static final long XOR_IDENTITY = (long)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
     static void assertArraysStrictlyEquals(long[] r, long[] a) {
@@ -84,10 +133,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +148,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +164,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +183,13 @@ public class Long64VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +205,13 @@ public class Long64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -175,10 +224,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -190,10 +239,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -202,12 +251,12 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -218,20 +267,20 @@ public class Long64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (long)0);
+                    assertEquals(r[i + k], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -243,19 +292,19 @@ public class Long64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (long)0);
+                        assertEquals(r[i + j], (long)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -271,11 +320,11 @@ public class Long64VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -284,12 +333,12 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -299,17 +348,17 @@ public class Long64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -319,17 +368,17 @@ public class Long64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -343,10 +392,10 @@ public class Long64VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -358,10 +407,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -373,10 +422,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -397,18 +446,18 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -423,18 +472,18 @@ public class Long64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -442,10 +491,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -453,10 +502,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -464,10 +513,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -476,10 +525,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -492,10 +541,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -507,10 +556,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -522,10 +571,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -540,10 +589,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -556,11 +605,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -574,11 +623,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -600,11 +649,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -618,11 +667,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -642,10 +691,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -657,10 +706,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -669,10 +718,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -682,10 +731,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -701,11 +750,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -722,11 +771,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -737,11 +786,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -758,11 +807,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -780,13 +829,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -807,13 +856,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -828,13 +877,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +904,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -875,13 +924,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -896,13 +945,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -917,13 +966,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -939,13 +988,13 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -991,10 +1040,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1004,10 +1053,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1015,10 +1064,10 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1553,7 +1602,7 @@ public class Long64VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         LongVector a = io.add((long)1); //[1,2]
         LongVector b = a.neg();  //[-1,-2]
         long[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1568,19 +1617,19 @@ public class Long64VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Long> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Long> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         LongVector uab0 = zab0.rearrange(unz0,zab1);
         LongVector uab1 = zab0.rearrange(unz1,zab1);
         long[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1595,7 +1644,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1603,9 +1652,9 @@ public class Long64VectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1634,7 +1683,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1647,7 +1696,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::ADD);
+        assertArraysEquals(r, a, b, LongVector64Tests::ADD);
     }
 
     static long add(long a, long b) {
@@ -1655,7 +1704,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1666,11 +1715,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::add);
+        assertArraysEquals(r, a, b, LongVector64Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1686,11 +1735,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1704,7 +1753,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::add);
     }
 
     static long SUB(long a, long b) {
@@ -1712,7 +1761,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void SUBLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUBLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1725,7 +1774,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::SUB);
+        assertArraysEquals(r, a, b, LongVector64Tests::SUB);
     }
 
     static long sub(long a, long b) {
@@ -1733,7 +1782,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1744,11 +1793,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::sub);
+        assertArraysEquals(r, a, b, LongVector64Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void SUBLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUBLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1764,11 +1813,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1782,7 +1831,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::sub);
     }
 
     static long MUL(long a, long b) {
@@ -1790,7 +1839,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MULLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MULLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1803,7 +1852,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::MUL);
+        assertArraysEquals(r, a, b, LongVector64Tests::MUL);
     }
 
     static long mul(long a, long b) {
@@ -1811,7 +1860,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1822,11 +1871,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::mul);
+        assertArraysEquals(r, a, b, LongVector64Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void MULLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void MULLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1842,11 +1891,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1860,7 +1909,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::mul);
     }
 
     static long DIV(long a, long b) {
@@ -1868,7 +1917,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void DIVLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void DIVLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1883,7 +1932,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::DIV);
+        assertArraysEquals(r, a, b, LongVector64Tests::DIV);
     }
 
     static long div(long a, long b) {
@@ -1891,7 +1940,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1906,11 +1955,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::div);
+        assertArraysEquals(r, a, b, LongVector64Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void DIVLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void DIVLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1928,11 +1977,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1950,7 +1999,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1958,7 +2007,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void FIRST_NONZEROLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void FIRST_NONZEROLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1971,11 +2020,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, LongVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void FIRST_NONZEROLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void FIRST_NONZEROLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1991,7 +2040,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -1999,7 +2048,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2012,7 +2061,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::AND);
+        assertArraysEquals(r, a, b, LongVector64Tests::AND);
     }
 
     static long and(long a, long b) {
@@ -2020,7 +2069,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2031,11 +2080,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::and);
+        assertArraysEquals(r, a, b, LongVector64Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2051,7 +2100,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::AND);
     }
 
     static long AND_NOT(long a, long b) {
@@ -2059,7 +2108,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void AND_NOTLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void AND_NOTLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2072,11 +2121,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, LongVector64Tests::AND_NOT);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void AND_NOTLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void AND_NOTLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2092,7 +2141,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::AND_NOT);
     }
 
     static long OR(long a, long b) {
@@ -2100,7 +2149,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2113,7 +2162,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::OR);
+        assertArraysEquals(r, a, b, LongVector64Tests::OR);
     }
 
     static long or(long a, long b) {
@@ -2121,7 +2170,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2132,11 +2181,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::or);
+        assertArraysEquals(r, a, b, LongVector64Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2152,7 +2201,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::OR);
     }
 
     static long XOR(long a, long b) {
@@ -2160,7 +2209,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void XORLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void XORLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2173,11 +2222,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::XOR);
+        assertArraysEquals(r, a, b, LongVector64Tests::XOR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void XORLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void XORLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2193,7 +2242,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::XOR);
     }
 
     static long COMPRESS_BITS(long a, long b) {
@@ -2201,7 +2250,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void COMPRESS_BITSLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void COMPRESS_BITSLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2263,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, LongVector64Tests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void COMPRESS_BITSLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void COMPRESS_BITSLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2234,7 +2283,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::COMPRESS_BITS);
     }
 
     static long EXPAND_BITS(long a, long b) {
@@ -2242,7 +2291,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void EXPAND_BITSLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EXPAND_BITSLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2255,11 +2304,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, LongVector64Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void EXPAND_BITSLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EXPAND_BITSLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2275,11 +2324,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2289,11 +2338,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2306,11 +2355,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector64Tests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2320,11 +2369,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2337,11 +2386,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector64Tests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2351,11 +2400,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2368,11 +2417,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector64Tests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2384,11 +2433,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2403,11 +2452,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector64Tests::div);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2417,11 +2466,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2431,11 +2480,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2448,11 +2497,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector64Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2462,11 +2511,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2476,11 +2525,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2493,11 +2542,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Long64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVector64Tests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLong64VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVector64TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2507,11 +2556,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector64Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLong64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2524,11 +2573,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector64Tests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLong64VectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVector64TestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2538,11 +2587,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Long64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, LongVector64Tests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLong64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2555,7 +2604,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Long64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVector64Tests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2563,7 +2612,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2576,11 +2625,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, LongVector64Tests::LSHL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2596,7 +2645,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::LSHL);
     }
 
     static long ASHR(long a, long b) {
@@ -2604,7 +2653,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2617,11 +2666,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, LongVector64Tests::ASHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2637,7 +2686,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::ASHR);
     }
 
     static long LSHR(long a, long b) {
@@ -2645,7 +2694,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2658,11 +2707,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, LongVector64Tests::LSHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2678,7 +2727,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::LSHR);
     }
 
     static long LSHL_unary(long a, long b) {
@@ -2686,7 +2735,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLong64VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVector64TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2698,11 +2747,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector64Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLong64VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVector64TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2717,7 +2766,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector64Tests::LSHL_unary);
     }
 
     static long LSHR_unary(long a, long b) {
@@ -2725,7 +2774,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLong64VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVector64TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2737,11 +2786,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector64Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLong64VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVector64TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2756,7 +2805,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector64Tests::LSHR_unary);
     }
 
     static long ASHR_unary(long a, long b) {
@@ -2764,7 +2813,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLong64VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVector64TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2776,11 +2825,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector64Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLong64VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVector64TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2795,7 +2844,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector64Tests::ASHR_unary);
     }
 
     static long ROR(long a, long b) {
@@ -2803,7 +2852,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2816,11 +2865,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::ROR);
+        assertArraysEquals(r, a, b, LongVector64Tests::ROR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2836,7 +2885,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::ROR);
     }
 
     static long ROL(long a, long b) {
@@ -2844,7 +2893,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2857,11 +2906,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::ROL);
+        assertArraysEquals(r, a, b, LongVector64Tests::ROL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2877,7 +2926,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::ROL);
     }
 
     static long ROR_unary(long a, long b) {
@@ -2885,7 +2934,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLong64VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVector64TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2897,11 +2946,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, LongVector64Tests::ROR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLong64VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVector64TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2916,7 +2965,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector64Tests::ROR_unary);
     }
 
     static long ROL_unary(long a, long b) {
@@ -2924,7 +2973,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLong64VectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVector64TestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2936,11 +2985,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Long64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, LongVector64Tests::ROL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLong64VectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVector64TestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2955,14 +3004,14 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Long64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVector64Tests::ROL_unary);
     }
     static long LSHR_binary_const(long a) {
         return (long)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHRLong64VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHRLongVector64TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -2973,11 +3022,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector64Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHRLong64VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHRLongVector64TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2991,7 +3040,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector64Tests::LSHR_binary_const);
     }
 
     static long LSHL_binary_const(long a) {
@@ -2999,7 +3048,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHLLong64VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHLLongVector64TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3010,11 +3059,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, LongVector64Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHLLong64VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHLLongVector64TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3028,7 +3077,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector64Tests::LSHL_binary_const);
     }
 
     static long ASHR_binary_const(long a) {
@@ -3036,7 +3085,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ASHRLong64VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ASHRLongVector64TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3047,11 +3096,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, LongVector64Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ASHRLong64VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ASHRLongVector64TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3065,7 +3114,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector64Tests::ASHR_binary_const);
     }
 
     static long ROR_binary_const(long a) {
@@ -3073,7 +3122,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void RORLong64VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void RORLongVector64TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3084,11 +3133,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, LongVector64Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void RORLong64VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void RORLongVector64TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3102,7 +3151,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector64Tests::ROR_binary_const);
     }
 
     static long ROL_binary_const(long a) {
@@ -3110,7 +3159,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ROLLong64VectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ROLLongVector64TestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3121,11 +3170,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Long64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, LongVector64Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ROLLong64VectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ROLLongVector64TestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3139,14 +3188,14 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Long64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVector64Tests::ROL_binary_const);
     }
 
 
     static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MINLongVector64TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3157,13 +3206,13 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long64VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, LongVector64Tests::MIN);
     }
 
     static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void minLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void minLongVector64TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3174,13 +3223,13 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long64VectorTests::min);
+        assertArraysEquals(r, a, (long)10, LongVector64Tests::min);
     }
 
     static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINLong64VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINLongVector64TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3193,13 +3242,13 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long64VectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, mask, LongVector64Tests::MIN);
     }
 
     static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MAXLongVector64TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3210,13 +3259,13 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long64VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, LongVector64Tests::MAX);
     }
 
     static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void maxLong64VectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void maxLongVector64TestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3227,13 +3276,13 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, Long64VectorTests::max);
+        assertArraysEquals(r, a, (long)10, LongVector64Tests::max);
     }
 
     static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXLong64VectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXLongVector64TestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3246,7 +3295,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, Long64VectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, mask, LongVector64Tests::MAX);
     }
 
     static long MIN(long a, long b) {
@@ -3254,7 +3303,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3267,7 +3316,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::MIN);
+        assertArraysEquals(r, a, b, LongVector64Tests::MIN);
     }
 
     static long min(long a, long b) {
@@ -3275,7 +3324,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3286,7 +3335,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::min);
+        assertArraysEquals(r, a, b, LongVector64Tests::min);
     }
 
     static long MAX(long a, long b) {
@@ -3294,7 +3343,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3307,7 +3356,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::MAX);
+        assertArraysEquals(r, a, b, LongVector64Tests::MAX);
     }
 
     static long max(long a, long b) {
@@ -3315,7 +3364,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3326,7 +3375,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::max);
+        assertArraysEquals(r, a, b, LongVector64Tests::max);
     }
 
     static long UMIN(long a, long b) {
@@ -3334,7 +3383,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMINLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMINLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3347,11 +3396,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, LongVector64Tests::UMIN);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMINLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMINLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3367,7 +3416,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::UMIN);
     }
 
     static long UMAX(long a, long b) {
@@ -3375,7 +3424,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMAXLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMAXLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3388,11 +3437,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, LongVector64Tests::UMAX);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMAXLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMAXLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3408,7 +3457,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::UMAX);
     }
 
     static long SADD(long a, long b) {
@@ -3416,7 +3465,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SADDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SADDLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3429,11 +3478,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::SADD);
+        assertArraysEquals(r, a, b, LongVector64Tests::SADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SADDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SADDLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3449,7 +3498,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::SADD);
     }
 
     static long SSUB(long a, long b) {
@@ -3457,7 +3506,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SSUBLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SSUBLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3470,11 +3519,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, LongVector64Tests::SSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SSUBLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SSUBLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3490,7 +3539,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::SSUB);
     }
 
     static long SUADD(long a, long b) {
@@ -3498,7 +3547,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUADDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUADDLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3560,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, LongVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUADDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3531,7 +3580,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::SUADD);
     }
 
     static long SUSUB(long a, long b) {
@@ -3539,7 +3588,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUSUBLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUSUBLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3552,11 +3601,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, LongVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUSUBLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUSUBLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3572,11 +3621,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3586,11 +3635,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3600,11 +3649,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3614,11 +3663,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3628,10 +3677,10 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Long64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, LongVector64Tests::max);
     }
     @Test(dataProvider = "longSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SUADDAssocLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -3648,11 +3697,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Long64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, LongVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDAssocLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                      IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3673,11 +3722,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Long64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, LongVector64Tests::SUADD);
     }
 
     static long ANDReduce(long[] a, int idx) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3686,7 +3735,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAll(long[] a) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3695,32 +3744,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ANDReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void ANDReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                long v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::ANDReduce, Long64VectorTests::ANDReduceAll);
+                LongVector64Tests::ANDReduce, LongVector64Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = AND_IDENTITY;
+
+        assertEquals((long) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id & x), x);
+                assertEquals((long) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static long ANDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3730,7 +3797,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3739,34 +3806,29 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ANDReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                long v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::ANDReduceMasked, Long64VectorTests::ANDReduceAllMasked);
+                LongVector64Tests::ANDReduceMasked, LongVector64Tests::ANDReduceAllMasked);
     }
 
     static long ORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3775,7 +3837,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAll(long[] a) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3784,32 +3846,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ORReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void ORReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                long v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::ORReduce, Long64VectorTests::ORReduceAll);
+                LongVector64Tests::ORReduce, LongVector64Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = OR_IDENTITY;
+
+        assertEquals((long) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id | x), x);
+                assertEquals((long) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static long ORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3819,7 +3899,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3828,7 +3908,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ORReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3836,26 +3916,21 @@ public class Long64VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                long v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::ORReduceMasked, Long64VectorTests::ORReduceAllMasked);
+                LongVector64Tests::ORReduceMasked, LongVector64Tests::ORReduceAllMasked);
     }
 
     static long XORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3864,7 +3939,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAll(long[] a) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3873,32 +3948,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void XORReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void XORReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                long v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::XORReduce, Long64VectorTests::XORReduceAll);
+                LongVector64Tests::XORReduce, LongVector64Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = XOR_IDENTITY;
+
+        assertEquals((long) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id ^ x), x);
+                assertEquals((long) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static long XORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3908,7 +4001,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3917,7 +4010,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void XORReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3925,26 +4018,21 @@ public class Long64VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                long v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::XORReduceMasked, Long64VectorTests::XORReduceAllMasked);
+                LongVector64Tests::XORReduceMasked, LongVector64Tests::XORReduceAllMasked);
     }
 
     static long ADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3953,7 +4041,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAll(long[] a) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3962,32 +4050,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                long v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::ADDReduce, Long64VectorTests::ADDReduceAll);
+                LongVector64Tests::ADDReduce, LongVector64Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = ADD_IDENTITY;
+
+        assertEquals((long) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id + x), x);
+                assertEquals((long) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3997,7 +4103,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -4006,7 +4112,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4014,26 +4120,21 @@ public class Long64VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                long v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::ADDReduceMasked, Long64VectorTests::ADDReduceAllMasked);
+                LongVector64Tests::ADDReduceMasked, LongVector64Tests::ADDReduceAllMasked);
     }
 
     static long MULReduce(long[] a, int idx) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4042,7 +4143,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAll(long[] a) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4051,32 +4152,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MULReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void MULReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                long v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::MULReduce, Long64VectorTests::MULReduceAll);
+                LongVector64Tests::MULReduce, LongVector64Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MUL_IDENTITY;
+
+        assertEquals((long) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id * x), x);
+                assertEquals((long) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4086,7 +4205,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4095,34 +4214,29 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MULReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                long v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::MULReduceMasked, Long64VectorTests::MULReduceAllMasked);
+                LongVector64Tests::MULReduceMasked, LongVector64Tests::MULReduceAllMasked);
     }
 
     static long MINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.min(res, a[i]);
         }
@@ -4131,7 +4245,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduce(a, i));
         }
@@ -4140,32 +4254,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void MINReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                long v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::MINReduce, Long64VectorTests::MINReduceAll);
+                LongVector64Tests::MINReduce, LongVector64Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MIN_IDENTITY;
+
+        assertEquals((long) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.min(id, x), x);
+                assertEquals((long) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.min(res, a[i]);
@@ -4175,7 +4307,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4184,34 +4316,29 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                long v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::MINReduceMasked, Long64VectorTests::MINReduceAllMasked);
+                LongVector64Tests::MINReduceMasked, LongVector64Tests::MINReduceAllMasked);
     }
 
     static long MAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.max(res, a[i]);
         }
@@ -4220,7 +4347,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduce(a, i));
         }
@@ -4229,32 +4356,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void MAXReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                long v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::MAXReduce, Long64VectorTests::MAXReduceAll);
+                LongVector64Tests::MAXReduce, LongVector64Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MAX_IDENTITY;
+
+        assertEquals((long) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.max(id, x), x);
+                assertEquals((long) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.max(res, a[i]);
@@ -4264,7 +4409,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4273,34 +4418,29 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                long v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::MAXReduceMasked, Long64VectorTests::MAXReduceAllMasked);
+                LongVector64Tests::MAXReduceMasked, LongVector64Tests::MAXReduceAllMasked);
     }
 
     static long UMINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4309,7 +4449,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4318,32 +4458,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMINReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void UMINReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                long v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::UMINReduce, Long64VectorTests::UMINReduceAll);
+                LongVector64Tests::UMINReduce, LongVector64Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMIN_IDENTITY;
+
+        assertEquals((long) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.minUnsigned(id, x), x);
+                assertEquals((long) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static long UMINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.minUnsigned(res, a[i]);
@@ -4353,7 +4511,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4362,34 +4520,29 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMINReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                long v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::UMINReduceMasked, Long64VectorTests::UMINReduceAllMasked);
+                LongVector64Tests::UMINReduceMasked, LongVector64Tests::UMINReduceAllMasked);
     }
 
     static long UMAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4398,7 +4551,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4407,32 +4560,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMAXReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void UMAXReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                long v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::UMAXReduce, Long64VectorTests::UMAXReduceAll);
+                LongVector64Tests::UMAXReduce, LongVector64Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMAX_IDENTITY;
+
+        assertEquals((long) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((long) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static long UMAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.maxUnsigned(res, a[i]);
@@ -4442,7 +4613,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4451,34 +4622,29 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMAXReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                long v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::UMAXReduceMasked, Long64VectorTests::UMAXReduceAllMasked);
+                LongVector64Tests::UMAXReduceMasked, LongVector64Tests::UMAXReduceAllMasked);
     }
 
     static long FIRST_NONZEROReduce(long[] a, int idx) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4487,7 +4653,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAll(long[] a) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4496,32 +4662,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void FIRST_NONZEROReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void FIRST_NONZEROReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::FIRST_NONZEROReduce, Long64VectorTests::FIRST_NONZEROReduceAll);
+                LongVector64Tests::FIRST_NONZEROReduce, LongVector64Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static long FIRST_NONZEROReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4531,7 +4715,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAllMasked(long[] a, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4540,30 +4724,25 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::FIRST_NONZEROReduceMasked, Long64VectorTests::FIRST_NONZEROReduceAllMasked);
+                LongVector64Tests::FIRST_NONZEROReduceMasked, LongVector64Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4576,7 +4755,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueLong64VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueLongVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4587,7 +4766,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector64Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4600,7 +4779,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueLong64VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueLongVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4611,11 +4790,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Long64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVector64Tests::allTrue);
     }
 
     static long SUADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4624,7 +4803,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAll(long[] a) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4633,32 +4812,50 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingUnaryOpProvider")
-    static void SUADDReduceLong64VectorTests(IntFunction<long[]> fa) {
+    static void SUADDReduceLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                long v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::SUADDReduce, Long64VectorTests::SUADDReduceAll);
+                LongVector64Tests::SUADDReduce, LongVector64Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "longSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = SUADD_IDENTITY;
+
+        assertEquals((long) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static long SUADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4668,7 +4865,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4676,7 +4873,7 @@ public class Long64VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "longSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4684,26 +4881,21 @@ public class Long64VectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                long v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::SUADDReduceMasked, Long64VectorTests::SUADDReduceAllMasked);
+                LongVector64Tests::SUADDReduceMasked, LongVector64Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void withLong64VectorTests(IntFunction<long []> fa, IntFunction<long []> fb) {
+    static void withLongVector64Tests(IntFunction<long []> fa, IntFunction<long []> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -4726,7 +4918,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_DEFAULTLong64VectorTests(IntFunction<long[]> fa) {
+    static void IS_DEFAULTLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4736,14 +4928,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLongVector64Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4756,7 +4948,7 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4767,7 +4959,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_NEGATIVELong64VectorTests(IntFunction<long[]> fa) {
+    static void IS_NEGATIVELongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4777,14 +4969,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLongVector64Tests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4797,14 +4989,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4816,14 +5008,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4835,14 +5027,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LTLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4858,14 +5050,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GTLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GTLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4877,14 +5069,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GTLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GTLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4900,14 +5092,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4919,14 +5111,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4938,14 +5130,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EQLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4961,14 +5153,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void NELong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void NELongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4980,14 +5172,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void NELong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void NELongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5003,14 +5195,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LELong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LELongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5022,14 +5214,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LELong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LELongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5045,14 +5237,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GELong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GELongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5064,14 +5256,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GELong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GELongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5087,14 +5279,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULTLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULTLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5106,14 +5298,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULTLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULTLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5129,14 +5321,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGTLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGTLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5148,14 +5340,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGTLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGTLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5171,14 +5363,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULELong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULELongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5190,14 +5382,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULELong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULELongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5213,14 +5405,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGELong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGELongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5232,14 +5424,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGELong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGELongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5255,14 +5447,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5272,13 +5464,13 @@ public class Long64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void LTLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5292,14 +5484,14 @@ public class Long64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5309,13 +5501,13 @@ public class Long64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void EQLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5329,7 +5521,7 @@ public class Long64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
@@ -5340,7 +5532,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void blendLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void blendLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5356,11 +5548,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Long64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, LongVector64Tests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
-    static void RearrangeLong64VectorTests(IntFunction<long[]> fa,
+    static void RearrangeLongVector64Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5377,7 +5569,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
-    static void RearrangeLong64VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void RearrangeLongVector64TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -5395,7 +5587,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void compressLong64VectorTests(IntFunction<long[]> fa,
+    static void compressLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5413,7 +5605,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void expandLong64VectorTests(IntFunction<long[]> fa,
+    static void expandLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5431,7 +5623,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void getLong64VectorTests(IntFunction<long[]> fa) {
+    static void getLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -5587,7 +5779,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BroadcastLong64VectorTests(IntFunction<long[]> fa) {
+    static void BroadcastLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5601,7 +5793,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZeroLong64VectorTests(IntFunction<long[]> fa) {
+    static void ZeroLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5611,7 +5803,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static long[] sliceUnary(long[] a, int origin, int idx) {
@@ -5626,7 +5818,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void sliceUnaryLong64VectorTests(IntFunction<long[]> fa) {
+    static void sliceUnaryLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5637,7 +5829,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, LongVector64Tests::sliceUnary);
     }
 
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
@@ -5654,7 +5846,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void sliceBinaryLong64VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void sliceBinaryLongVector64TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5667,7 +5859,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Long64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, LongVector64Tests::sliceBinary);
     }
 
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
@@ -5684,7 +5876,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void sliceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void sliceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5701,7 +5893,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Long64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, LongVector64Tests::slice);
     }
 
     static long[] unsliceUnary(long[] a, int origin, int idx) {
@@ -5718,7 +5910,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void unsliceUnaryLong64VectorTests(IntFunction<long[]> fa) {
+    static void unsliceUnaryLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5729,7 +5921,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Long64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, LongVector64Tests::unsliceUnary);
     }
 
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
@@ -5755,7 +5947,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void unsliceBinaryLong64VectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void unsliceBinaryLongVector64TestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5769,7 +5961,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Long64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, LongVector64Tests::unsliceBinary);
     }
 
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5809,7 +6001,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void unsliceLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void unsliceLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5826,7 +6018,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Long64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, LongVector64Tests::unslice);
     }
 
     static long BITWISE_BLEND(long a, long b, long c) {
@@ -5838,7 +6030,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5853,11 +6045,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5870,11 +6062,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, LongVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5892,11 +6084,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5907,11 +6099,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong64VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector64TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5922,11 +6114,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5937,11 +6129,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, LongVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong64VectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector64TestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5952,11 +6144,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5971,11 +6163,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector64TestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5990,11 +6182,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLong64VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVector64TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6005,11 +6197,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLong64VectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVector64TestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6020,11 +6212,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Long64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLong64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVector64TestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -6038,7 +6230,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Long64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongVector64Tests::BITWISE_BLEND);
     }
 
     static long NEG(long a) {
@@ -6050,7 +6242,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NEGLong64VectorTests(IntFunction<long[]> fa) {
+    static void NEGLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6061,11 +6253,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::NEG);
+        assertArraysEquals(r, a, LongVector64Tests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void negLong64VectorTests(IntFunction<long[]> fa) {
+    static void negLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6076,11 +6268,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::neg);
+        assertArraysEquals(r, a, LongVector64Tests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NEGMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void NEGMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6094,7 +6286,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, LongVector64Tests::NEG);
     }
 
     static long ABS(long a) {
@@ -6106,7 +6298,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ABSLong64VectorTests(IntFunction<long[]> fa) {
+    static void ABSLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6117,11 +6309,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::ABS);
+        assertArraysEquals(r, a, LongVector64Tests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void absLong64VectorTests(IntFunction<long[]> fa) {
+    static void absLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6132,11 +6324,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::abs);
+        assertArraysEquals(r, a, LongVector64Tests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ABSMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void ABSMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6150,7 +6342,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, LongVector64Tests::ABS);
     }
 
     static long NOT(long a) {
@@ -6162,7 +6354,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NOTLong64VectorTests(IntFunction<long[]> fa) {
+    static void NOTLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6173,11 +6365,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::NOT);
+        assertArraysEquals(r, a, LongVector64Tests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void notLong64VectorTests(IntFunction<long[]> fa) {
+    static void notLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6188,11 +6380,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::not);
+        assertArraysEquals(r, a, LongVector64Tests::not);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NOTMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void NOTMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6206,7 +6398,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, LongVector64Tests::NOT);
     }
 
     static long ZOMO(long a) {
@@ -6214,7 +6406,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZOMOLong64VectorTests(IntFunction<long[]> fa) {
+    static void ZOMOLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6225,11 +6417,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::ZOMO);
+        assertArraysEquals(r, a, LongVector64Tests::ZOMO);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ZOMOMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void ZOMOMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6243,7 +6435,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, LongVector64Tests::ZOMO);
     }
 
     static long BIT_COUNT(long a) {
@@ -6251,7 +6443,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BIT_COUNTLong64VectorTests(IntFunction<long[]> fa) {
+    static void BIT_COUNTLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6262,11 +6454,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, LongVector64Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void BIT_COUNTMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6280,7 +6472,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, LongVector64Tests::BIT_COUNT);
     }
 
     static long TRAILING_ZEROS_COUNT(long a) {
@@ -6288,7 +6480,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTLong64VectorTests(IntFunction<long[]> fa) {
+    static void TRAILING_ZEROS_COUNTLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6299,11 +6491,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6317,7 +6509,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     static long LEADING_ZEROS_COUNT(long a) {
@@ -6325,7 +6517,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTLong64VectorTests(IntFunction<long[]> fa) {
+    static void LEADING_ZEROS_COUNTLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6336,11 +6528,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6354,7 +6546,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     static long REVERSE(long a) {
@@ -6362,7 +6554,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSELong64VectorTests(IntFunction<long[]> fa) {
+    static void REVERSELongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6373,11 +6565,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::REVERSE);
+        assertArraysEquals(r, a, LongVector64Tests::REVERSE);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSEMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void REVERSEMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6391,7 +6583,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, LongVector64Tests::REVERSE);
     }
 
     static long REVERSE_BYTES(long a) {
@@ -6399,7 +6591,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSE_BYTESLong64VectorTests(IntFunction<long[]> fa) {
+    static void REVERSE_BYTESLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6410,11 +6602,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, LongVector64Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedLong64VectorTests(IntFunction<long[]> fa,
+    static void REVERSE_BYTESMaskedLongVector64Tests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6428,7 +6620,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Long64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, LongVector64Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6436,7 +6628,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandLongVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6449,7 +6641,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::band);
+        assertArraysEquals(r, a, b, LongVector64Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6457,7 +6649,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorLongVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6470,7 +6662,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::bor);
+        assertArraysEquals(r, a, b, LongVector64Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6478,7 +6670,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorLongVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6491,7 +6683,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::bxor);
+        assertArraysEquals(r, a, b, LongVector64Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6499,7 +6691,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotLongVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6512,7 +6704,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::bandNot);
+        assertArraysEquals(r, a, b, LongVector64Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6520,7 +6712,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqLongVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6533,7 +6725,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Long64VectorTests::beq);
+        assertArraysEquals(r, a, b, LongVector64Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6541,7 +6733,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotLong64VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotLongVector64Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6552,7 +6744,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Long64VectorTests::unot);
+        assertArraysEquals(r, a, LongVector64Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6561,15 +6753,15 @@ public class Long64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLong64VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6583,7 +6775,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLong64VectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVector64TestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6593,13 +6785,13 @@ public class Long64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLong64VectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVector64TestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6609,13 +6801,13 @@ public class Long64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longtoIntUnaryOpProvider")
-    static void toIntArrayLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toIntArrayLongVector64TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6626,7 +6818,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toLongArrayLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toLongArrayLongVector64TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6637,7 +6829,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toDoubleArrayLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toDoubleArrayLongVector64TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6648,7 +6840,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toStringLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toStringLongVector64TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6661,7 +6853,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void hashCodeLong64VectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void hashCodeLongVector64TestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6677,7 +6869,7 @@ public class Long64VectorTests extends AbstractVectorTest {
 
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLongLong64VectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongLongVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
@@ -6693,11 +6885,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Long64VectorTests::ADDReduce, Long64VectorTests::ADDReduceAll);
+                LongVector64Tests::ADDReduce, LongVector64Tests::ADDReduceAll);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLongLong64VectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongLongVector64TestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6715,11 +6907,11 @@ public class Long64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Long64VectorTests::ADDReduceMasked, Long64VectorTests::ADDReduceAllMasked);
+                LongVector64Tests::ADDReduceMasked, LongVector64Tests::ADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromProvider")
-    static void SelectFromLong64VectorTests(IntFunction<long[]> fa,
+    static void SelectFromLongVector64Tests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,long[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         long[] order = fs.apply(a.length, SPECIES.length());
@@ -6735,7 +6927,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorLong64VectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SelectFromTwoVectorLongVector64Tests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] idx = fc.apply(SPECIES.length());
@@ -6753,7 +6945,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
-    static void SelectFromLong64VectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void SelectFromLongVector64TestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                            BiFunction<Integer,Integer,long[]> fs,
                                                            IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -6772,7 +6964,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousLong64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousLongVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6783,12 +6975,12 @@ public class Long64VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringLong64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringLongVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6802,7 +6994,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsLong64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsLongVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6811,12 +7003,12 @@ public class Long64VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsLong64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsLongVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6826,13 +7018,13 @@ public class Long64VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeLongVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6854,7 +7046,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountLongVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6865,7 +7057,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long64VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, LongVector64Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6879,7 +7071,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueLongVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6890,7 +7082,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long64VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector64Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6904,7 +7096,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueLongVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6915,11 +7107,11 @@ public class Long64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Long64VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, LongVector64Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressLong64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressLongVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6929,7 +7121,7 @@ public class Long64VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -6947,7 +7139,7 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLong64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongVector64TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6955,13 +7147,13 @@ public class Long64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongLong64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongLongVector64TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6969,7 +7161,7 @@ public class Long64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -6988,36 +7180,36 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLong64VectorTestsSmokeTest(int length) {
+    static void loopBoundLongVector64TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongLong64VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongLongVector64TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeLong64VectorTestsSmokeTest() {
+    static void ElementSizeLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Long.SIZE);
+        assertEquals(elsize, Long.SIZE);
     }
 
     @Test
-    static void VectorShapeLong64VectorTestsSmokeTest() {
+    static void VectorShapeLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_64_BIT));
     }
 
     @Test
-    static void ShapeWithLanesLong64VectorTestsSmokeTest() {
+    static void ShapeWithLanesLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(long.class);
@@ -7025,32 +7217,32 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeLong64VectorTestsSmokeTest() {
+    static void ElementTypeLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementType() == long.class);
     }
 
     @Test
-    static void SpeciesElementSizeLong64VectorTestsSmokeTest() {
+    static void SpeciesElementSizeLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementSize() == Long.SIZE);
     }
 
     @Test
-    static void VectorTypeLong64VectorTestsSmokeTest() {
+    static void VectorTypeLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesLong64VectorTestsSmokeTest() {
+    static void WithLanesLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(long.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeLong64VectorTestsSmokeTest() {
+    static void WithShapeLongVector64TestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7058,9 +7250,9 @@ public class Long64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueLong64VectorTestsSmokeTest() {
+    static void MaskAllTrueLongVector64TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/LongVectorMaxLoadStoreTests.java
similarity index 96%
rename from test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/LongVectorMaxLoadStoreTests.java
index e0f8b548228..cb5bb74424a 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVectorMaxLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
  * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
- *      -XX:-TieredCompilation LongMaxVectorLoadStoreTests
+ *      -XX:-TieredCompilation LongVectorMaxLoadStoreTests
  *
  */
 
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class LongVectorMaxLoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_MAX;
 
@@ -68,14 +68,29 @@ public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(long[] r, long[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (long) 0, "at index #" + i);
         }
     }
 
@@ -329,7 +344,7 @@ public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "longProviderForIOOBE")
@@ -877,11 +892,11 @@ public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -892,11 +907,11 @@ public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (long) 0, "at index #" + j);
         }
     }
 
@@ -912,7 +927,7 @@ public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(long[] r, long[] a, int[] indexMap) {
@@ -925,7 +940,7 @@ public class LongMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java b/test/jdk/jdk/incubator/vector/LongVectorMaxTests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
rename to test/jdk/jdk/incubator/vector/LongVectorMaxTests.java
index 6fe189867c2..aef89af5893 100644
--- a/test/jdk/jdk/incubator/vector/LongMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/LongVectorMaxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation LongMaxVectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation LongVectorMaxTests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,12 +56,49 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class LongMaxVectorTests extends AbstractVectorTest {
+public class LongVectorMaxTests extends AbstractVectorTest {
 
     static final VectorSpecies<Long> SPECIES =
                 LongVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected, long delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(long actual, long expected, long delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(long [] actual, long [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long [] actual, long [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
 
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
@@ -71,6 +108,19 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
     private static final long CONST_SHIFT = Long.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final long ADD_IDENTITY = (long)0;
+    private static final long AND_IDENTITY = (long)-1;
+    private static final long FIRST_NONZERO_IDENTITY = (long)0;
+    private static final long MAX_IDENTITY = Long.MIN_VALUE;
+    private static final long MIN_IDENTITY = Long.MAX_VALUE;
+    private static final long MUL_IDENTITY = (long)1;
+    private static final long OR_IDENTITY = (long)0;
+    private static final long SUADD_IDENTITY = (long)0;
+    private static final long UMAX_IDENTITY = (long)0;   // Minimum unsigned value
+    private static final long UMIN_IDENTITY = (long)-1;  // Maximum unsigned value
+    private static final long XOR_IDENTITY = (long)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
     static void assertArraysStrictlyEquals(long[] r, long[] a) {
@@ -89,10 +139,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +154,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a[i]);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +170,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -139,13 +189,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -161,13 +211,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -180,10 +230,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -195,10 +245,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -207,12 +257,12 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -223,20 +273,20 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (long)0);
+                    assertEquals(r[i + k], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -248,19 +298,19 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (long)0);
+                        assertEquals(r[i + j], (long)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (long)0, "at index #" + idx);
+                assertEquals(r[idx], (long)0, "at index #" + idx);
             }
         }
     }
@@ -276,11 +326,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -289,12 +339,12 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -304,17 +354,17 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -324,17 +374,17 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (long)0);
+                         assertEquals(r[i+j], (long)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (long)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -348,10 +398,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -363,10 +413,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -378,10 +428,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -402,18 +452,18 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -428,18 +478,18 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -447,10 +497,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -458,10 +508,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -469,10 +519,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -481,10 +531,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -497,10 +547,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -512,10 +562,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -527,10 +577,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -545,10 +595,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (long)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -561,11 +611,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -579,11 +629,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -605,11 +655,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -623,11 +673,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -647,10 +697,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -662,10 +712,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -674,10 +724,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -687,10 +737,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -706,11 +756,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -727,11 +777,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -742,11 +792,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -763,11 +813,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -785,13 +835,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -812,13 +862,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -833,13 +883,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(r, a, i, mask, b, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -860,13 +910,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -880,13 +930,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -901,13 +951,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -922,13 +972,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -944,13 +994,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             long[] ref = f.apply(a, b, origin, part, mask, i);
             long[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -996,10 +1046,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1009,10 +1059,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1020,10 +1070,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1558,7 +1608,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         LongVector a = io.add((long)1); //[1,2]
         LongVector b = a.neg();  //[-1,-2]
         long[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1573,19 +1623,19 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Long> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Long> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         LongVector uab0 = zab0.rearrange(unz0,zab1);
         LongVector uab1 = zab0.rearrange(unz1,zab1);
         long[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         LongVector io = (LongVector) SPECIES.broadcast(0).addIndex(1);
         LongVector io2 = (LongVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1600,7 +1650,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test
@@ -1608,9 +1658,9 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 
     @Test
@@ -1639,7 +1689,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1652,7 +1702,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::ADD);
     }
 
     static long add(long a, long b) {
@@ -1660,7 +1710,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1671,11 +1721,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::add);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1691,11 +1741,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1709,7 +1759,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::add);
     }
 
     static long SUB(long a, long b) {
@@ -1717,7 +1767,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void SUBLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUBLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1730,7 +1780,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::SUB);
     }
 
     static long sub(long a, long b) {
@@ -1738,7 +1788,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1749,11 +1799,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void SUBLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUBLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1769,11 +1819,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::SUB);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1787,7 +1837,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::sub);
     }
 
     static long MUL(long a, long b) {
@@ -1795,7 +1845,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MULLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MULLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1808,7 +1858,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::MUL);
     }
 
     static long mul(long a, long b) {
@@ -1816,7 +1866,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1827,11 +1877,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void MULLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void MULLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1847,11 +1897,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::MUL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1865,7 +1915,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::mul);
     }
 
     static long DIV(long a, long b) {
@@ -1873,7 +1923,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void DIVLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void DIVLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1888,7 +1938,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::DIV);
     }
 
     static long div(long a, long b) {
@@ -1896,7 +1946,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1911,11 +1961,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::div);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void DIVLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void DIVLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1933,11 +1983,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::DIV);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1955,7 +2005,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::div);
     }
 
     static long FIRST_NONZERO(long a, long b) {
@@ -1963,7 +2013,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void FIRST_NONZEROLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void FIRST_NONZEROLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -1976,11 +2026,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void FIRST_NONZEROLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void FIRST_NONZEROLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -1996,7 +2046,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::FIRST_NONZERO);
     }
 
     static long AND(long a, long b) {
@@ -2004,7 +2054,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2017,7 +2067,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::AND);
     }
 
     static long and(long a, long b) {
@@ -2025,7 +2075,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2036,11 +2086,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::and);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2056,7 +2106,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::AND);
     }
 
     static long AND_NOT(long a, long b) {
@@ -2064,7 +2114,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void AND_NOTLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void AND_NOTLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2077,11 +2127,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::AND_NOT);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void AND_NOTLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void AND_NOTLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2097,7 +2147,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::AND_NOT);
     }
 
     static long OR(long a, long b) {
@@ -2105,7 +2155,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2118,7 +2168,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::OR);
     }
 
     static long or(long a, long b) {
@@ -2126,7 +2176,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2137,11 +2187,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::or);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2157,7 +2207,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::OR);
     }
 
     static long XOR(long a, long b) {
@@ -2165,7 +2215,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void XORLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void XORLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2178,11 +2228,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::XOR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void XORLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void XORLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2198,7 +2248,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::XOR);
     }
 
     static long COMPRESS_BITS(long a, long b) {
@@ -2206,7 +2256,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void COMPRESS_BITSLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void COMPRESS_BITSLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2219,11 +2269,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::COMPRESS_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void COMPRESS_BITSLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void COMPRESS_BITSLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2239,7 +2289,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::COMPRESS_BITS);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::COMPRESS_BITS);
     }
 
     static long EXPAND_BITS(long a, long b) {
@@ -2247,7 +2297,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void EXPAND_BITSLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EXPAND_BITSLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2260,11 +2310,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void EXPAND_BITSLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EXPAND_BITSLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2280,11 +2330,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::EXPAND_BITS);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::EXPAND_BITS);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void addLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void addLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2294,11 +2344,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void addLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void addLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2311,11 +2361,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVectorMaxTests::add);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void subLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void subLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2325,11 +2375,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void subLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void subLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2342,11 +2392,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void mulLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void mulLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2356,11 +2406,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void mulLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void mulLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2373,11 +2423,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void divLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void divLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2389,11 +2439,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::div);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void divLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void divLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2408,11 +2458,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVectorMaxTests::div);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2422,11 +2472,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void orLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void orLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2436,11 +2486,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::or);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2453,11 +2503,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ANDLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ANDLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2467,11 +2517,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void andLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void andLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2481,11 +2531,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::and);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ANDLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ANDLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2498,11 +2548,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, LongMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, LongVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ORLongMaxVectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ORLongVectorMaxTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2512,11 +2562,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, LongMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, LongVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ORLongMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ORLongVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2529,11 +2579,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, LongMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ADDLongMaxVectorTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ADDLongVectorMaxTestsBroadcastLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2543,11 +2593,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, LongMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, LongVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ADDLongMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ADDLongVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2560,7 +2610,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, LongMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, LongVectorMaxTests::ADD);
     }
 
     static long LSHL(long a, long b) {
@@ -2568,7 +2618,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2581,11 +2631,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::LSHL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2601,7 +2651,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::LSHL);
     }
 
     static long ASHR(long a, long b) {
@@ -2609,7 +2659,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2622,11 +2672,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::ASHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2642,7 +2692,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::ASHR);
     }
 
     static long LSHR(long a, long b) {
@@ -2650,7 +2700,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2663,11 +2713,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::LSHR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2683,7 +2733,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::LSHR);
     }
 
     static long LSHL_unary(long a, long b) {
@@ -2691,7 +2741,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHLLongMaxVectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHLLongVectorMaxTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2703,11 +2753,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, LongVectorMaxTests::LSHL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHLLongMaxVectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHLLongVectorMaxTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2722,7 +2772,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVectorMaxTests::LSHL_unary);
     }
 
     static long LSHR_unary(long a, long b) {
@@ -2730,7 +2780,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void LSHRLongMaxVectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LSHRLongVectorMaxTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2742,11 +2792,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVectorMaxTests::LSHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void LSHRLongMaxVectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LSHRLongVectorMaxTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2761,7 +2811,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVectorMaxTests::LSHR_unary);
     }
 
     static long ASHR_unary(long a, long b) {
@@ -2769,7 +2819,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ASHRLongMaxVectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ASHRLongVectorMaxTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2781,11 +2831,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, LongVectorMaxTests::ASHR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ASHRLongMaxVectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ASHRLongVectorMaxTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2800,7 +2850,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVectorMaxTests::ASHR_unary);
     }
 
     static long ROR(long a, long b) {
@@ -2808,7 +2858,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2821,11 +2871,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::ROR);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2841,7 +2891,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::ROR);
     }
 
     static long ROL(long a, long b) {
@@ -2849,7 +2899,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2862,11 +2912,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::ROL);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2882,7 +2932,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::ROL);
     }
 
     static long ROR_unary(long a, long b) {
@@ -2890,7 +2940,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void RORLongMaxVectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void RORLongVectorMaxTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2902,11 +2952,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, LongVectorMaxTests::ROR_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void RORLongMaxVectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void RORLongVectorMaxTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2921,7 +2971,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVectorMaxTests::ROR_unary);
     }
 
     static long ROL_unary(long a, long b) {
@@ -2929,7 +2979,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void ROLLongMaxVectorTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ROLLongVectorMaxTestsScalarShift(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2941,11 +2991,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, LongMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, LongVectorMaxTests::ROL_unary);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void ROLLongMaxVectorTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ROLLongVectorMaxTestsScalarShiftMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -2960,14 +3010,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, LongMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, LongVectorMaxTests::ROL_unary);
     }
     static long LSHR_binary_const(long a) {
         return (long)((a >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHRLongMaxVectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHRLongVectorMaxTestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -2978,11 +3028,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, LongMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, LongVectorMaxTests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHRLongMaxVectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHRLongVectorMaxTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -2996,7 +3046,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, LongMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVectorMaxTests::LSHR_binary_const);
     }
 
     static long LSHL_binary_const(long a) {
@@ -3004,7 +3054,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LSHLLongMaxVectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void LSHLLongVectorMaxTestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3015,11 +3065,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, LongMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, LongVectorMaxTests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LSHLLongMaxVectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void LSHLLongVectorMaxTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3033,7 +3083,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, LongMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVectorMaxTests::LSHL_binary_const);
     }
 
     static long ASHR_binary_const(long a) {
@@ -3041,7 +3091,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ASHRLongMaxVectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ASHRLongVectorMaxTestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3052,11 +3102,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, LongMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, LongVectorMaxTests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ASHRLongMaxVectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ASHRLongVectorMaxTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3070,7 +3120,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, LongMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVectorMaxTests::ASHR_binary_const);
     }
 
     static long ROR_binary_const(long a) {
@@ -3078,7 +3128,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void RORLongMaxVectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void RORLongVectorMaxTestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3089,11 +3139,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, LongMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, LongVectorMaxTests::ROR_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void RORLongMaxVectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void RORLongVectorMaxTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3107,7 +3157,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, LongMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVectorMaxTests::ROR_binary_const);
     }
 
     static long ROL_binary_const(long a) {
@@ -3115,7 +3165,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ROLLongMaxVectorTestsScalarShiftConst(IntFunction<long[]> fa) {
+    static void ROLLongVectorMaxTestsScalarShiftConst(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3126,11 +3176,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, LongMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, LongVectorMaxTests::ROL_binary_const);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ROLLongMaxVectorTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
+    static void ROLLongVectorMaxTestsScalarShiftMaskedConst(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3144,14 +3194,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, LongMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, LongVectorMaxTests::ROL_binary_const);
     }
 
 
     static LongVector bv_MIN = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MINLongVectorMaxTestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3162,13 +3212,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, LongVectorMaxTests::MIN);
     }
 
     static LongVector bv_min = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void minLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void minLongVectorMaxTestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3179,13 +3229,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::min);
+        assertArraysEquals(r, a, (long)10, LongVectorMaxTests::min);
     }
 
     static LongVector bv_MIN_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINLongMaxVectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINLongVectorMaxTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3198,13 +3248,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, LongMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (long)10, mask, LongVectorMaxTests::MIN);
     }
 
     static LongVector bv_MAX = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void MAXLongVectorMaxTestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3215,13 +3265,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, LongVectorMaxTests::MAX);
     }
 
     static LongVector bv_max = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void maxLongMaxVectorTestsWithMemOp(IntFunction<long[]> fa) {
+    static void maxLongVectorMaxTestsWithMemOp(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -3232,13 +3282,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, LongMaxVectorTests::max);
+        assertArraysEquals(r, a, (long)10, LongVectorMaxTests::max);
     }
 
     static LongVector bv_MAX_M = LongVector.broadcast(SPECIES, (long)10);
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXLongMaxVectorTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXLongVectorMaxTestsMaskedWithMemOp(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3251,7 +3301,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (long)10, mask, LongMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (long)10, mask, LongVectorMaxTests::MAX);
     }
 
     static long MIN(long a, long b) {
@@ -3259,7 +3309,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3272,7 +3322,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::MIN);
     }
 
     static long min(long a, long b) {
@@ -3280,7 +3330,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3291,7 +3341,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::min);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::min);
     }
 
     static long MAX(long a, long b) {
@@ -3299,7 +3349,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3312,7 +3362,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::MAX);
     }
 
     static long max(long a, long b) {
@@ -3320,7 +3370,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3331,7 +3381,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::max);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::max);
     }
 
     static long UMIN(long a, long b) {
@@ -3339,7 +3389,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMINLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMINLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3352,11 +3402,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::UMIN);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMINLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMINLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3372,7 +3422,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::UMIN);
     }
 
     static long UMAX(long a, long b) {
@@ -3380,7 +3430,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void UMAXLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UMAXLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3393,11 +3443,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::UMAX);
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void UMAXLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UMAXLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3413,7 +3463,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::UMAX);
     }
 
     static long SADD(long a, long b) {
@@ -3421,7 +3471,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SADDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SADDLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3434,11 +3484,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::SADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SADDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SADDLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3454,7 +3504,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::SADD);
     }
 
     static long SSUB(long a, long b) {
@@ -3462,7 +3512,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SSUBLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SSUBLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3475,11 +3525,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::SSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SSUBLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SSUBLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3495,7 +3545,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::SSUB);
     }
 
     static long SUADD(long a, long b) {
@@ -3503,7 +3553,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUADDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUADDLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3516,11 +3566,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUADDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3536,7 +3586,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::SUADD);
     }
 
     static long SUSUB(long a, long b) {
@@ -3544,7 +3594,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpProvider")
-    static void SUSUBLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void SUSUBLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3557,11 +3607,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpMaskProvider")
-    static void SUSUBLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUSUBLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3577,11 +3627,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MINLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MINLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3591,11 +3641,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::MIN);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void minLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void minLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3605,11 +3655,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::min);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void MAXLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void MAXLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3619,11 +3669,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::MAX);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void maxLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void maxLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -3633,10 +3683,10 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, LongMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, LongVectorMaxTests::max);
     }
     @Test(dataProvider = "longSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SUADDAssocLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -3653,11 +3703,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, LongMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, LongVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "longSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void SUADDAssocLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                      IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -3678,11 +3728,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, LongMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, LongVectorMaxTests::SUADD);
     }
 
     static long ANDReduce(long[] a, int idx) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3691,7 +3741,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAll(long[] a) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3700,32 +3750,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ANDReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ANDReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                long v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::ANDReduce, LongMaxVectorTests::ANDReduceAll);
+                LongVectorMaxTests::ANDReduce, LongVectorMaxTests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = AND_IDENTITY;
+
+        assertEquals((long) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id & x), x);
+                assertEquals((long) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static long ANDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3735,7 +3803,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long ANDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = -1;
+        long res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3744,34 +3812,29 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ANDReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = -1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                long v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::ANDReduceMasked, LongMaxVectorTests::ANDReduceAllMasked);
+                LongVectorMaxTests::ANDReduceMasked, LongVectorMaxTests::ANDReduceAllMasked);
     }
 
     static long ORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3780,7 +3843,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAll(long[] a) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3789,32 +3852,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ORReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ORReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                long v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::ORReduce, LongMaxVectorTests::ORReduceAll);
+                LongVectorMaxTests::ORReduce, LongVectorMaxTests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = OR_IDENTITY;
+
+        assertEquals((long) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id | x), x);
+                assertEquals((long) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static long ORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3824,7 +3905,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long ORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3833,7 +3914,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ORReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3841,26 +3922,21 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                long v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::ORReduceMasked, LongMaxVectorTests::ORReduceAllMasked);
+                LongVectorMaxTests::ORReduceMasked, LongVectorMaxTests::ORReduceAllMasked);
     }
 
     static long XORReduce(long[] a, int idx) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3869,7 +3945,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAll(long[] a) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3878,32 +3954,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void XORReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void XORReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                long v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::XORReduce, LongMaxVectorTests::XORReduceAll);
+                LongVectorMaxTests::XORReduce, LongVectorMaxTests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = XOR_IDENTITY;
+
+        assertEquals((long) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id ^ x), x);
+                assertEquals((long) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static long XORReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3913,7 +4007,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long XORReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3922,7 +4016,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void XORReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3930,26 +4024,21 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                long v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::XORReduceMasked, LongMaxVectorTests::XORReduceAllMasked);
+                LongVectorMaxTests::XORReduceMasked, LongVectorMaxTests::XORReduceAllMasked);
     }
 
     static long ADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3958,7 +4047,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAll(long[] a) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3967,32 +4056,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                long v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::ADDReduce, LongMaxVectorTests::ADDReduceAll);
+                LongVectorMaxTests::ADDReduce, LongVectorMaxTests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = ADD_IDENTITY;
+
+        assertEquals((long) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id + x), x);
+                assertEquals((long) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static long ADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -4002,7 +4109,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long ADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -4011,7 +4118,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4019,26 +4126,21 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                long v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::ADDReduceMasked, LongMaxVectorTests::ADDReduceAllMasked);
+                LongVectorMaxTests::ADDReduceMasked, LongVectorMaxTests::ADDReduceAllMasked);
     }
 
     static long MULReduce(long[] a, int idx) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -4047,7 +4149,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAll(long[] a) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -4056,32 +4158,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MULReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void MULReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                long v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::MULReduce, LongMaxVectorTests::MULReduceAll);
+                LongVectorMaxTests::MULReduce, LongVectorMaxTests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MUL_IDENTITY;
+
+        assertEquals((long) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) (id * x), x);
+                assertEquals((long) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static long MULReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4091,7 +4211,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long MULReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 1;
+        long res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4100,34 +4220,29 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MULReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = 1;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                long v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::MULReduceMasked, LongMaxVectorTests::MULReduceAllMasked);
+                LongVectorMaxTests::MULReduceMasked, LongVectorMaxTests::MULReduceAllMasked);
     }
 
     static long MINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.min(res, a[i]);
         }
@@ -4136,7 +4251,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduce(a, i));
         }
@@ -4145,32 +4260,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MINReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void MINReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                long v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::MINReduce, LongMaxVectorTests::MINReduceAll);
+                LongVectorMaxTests::MINReduce, LongVectorMaxTests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MIN_IDENTITY;
+
+        assertEquals((long) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.min(id, x), x);
+                assertEquals((long) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static long MINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.min(res, a[i]);
@@ -4180,7 +4313,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long MINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4189,34 +4322,29 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MINReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                long v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (long) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::MINReduceMasked, LongMaxVectorTests::MINReduceAllMasked);
+                LongVectorMaxTests::MINReduceMasked, LongVectorMaxTests::MINReduceAllMasked);
     }
 
     static long MAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) Math.max(res, a[i]);
         }
@@ -4225,7 +4353,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduce(a, i));
         }
@@ -4234,32 +4362,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void MAXReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void MAXReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                long v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::MAXReduce, LongMaxVectorTests::MAXReduceAll);
+                LongVectorMaxTests::MAXReduce, LongVectorMaxTests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = MAX_IDENTITY;
+
+        assertEquals((long) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) Math.max(id, x), x);
+                assertEquals((long) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static long MAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) Math.max(res, a[i]);
@@ -4269,7 +4415,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long MAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4278,34 +4424,29 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void MAXReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                long v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (long) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::MAXReduceMasked, LongMaxVectorTests::MAXReduceAllMasked);
+                LongVectorMaxTests::MAXReduceMasked, LongVectorMaxTests::MAXReduceAllMasked);
     }
 
     static long UMINReduce(long[] a, int idx) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4314,7 +4455,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAll(long[] a) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4323,32 +4464,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMINReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void UMINReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                long v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::UMINReduce, LongMaxVectorTests::UMINReduceAll);
+                LongVectorMaxTests::UMINReduce, LongVectorMaxTests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMIN_IDENTITY;
+
+        assertEquals((long) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.minUnsigned(id, x), x);
+                assertEquals((long) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static long UMINReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.minUnsigned(res, a[i]);
@@ -4358,7 +4517,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long UMINReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MAX_VALUE;
+        long res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4367,34 +4526,29 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMINReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MAX_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                long v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::UMINReduceMasked, LongMaxVectorTests::UMINReduceAllMasked);
+                LongVectorMaxTests::UMINReduceMasked, LongVectorMaxTests::UMINReduceAllMasked);
     }
 
     static long UMAXReduce(long[] a, int idx) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4403,7 +4557,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAll(long[] a) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4412,32 +4566,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void UMAXReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void UMAXReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                long v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::UMAXReduce, LongMaxVectorTests::UMAXReduceAll);
+                LongVectorMaxTests::UMAXReduce, LongVectorMaxTests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = UMAX_IDENTITY;
+
+        assertEquals((long) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((long) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static long UMAXReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.maxUnsigned(res, a[i]);
@@ -4447,7 +4619,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long UMAXReduceAllMasked(long[] a, boolean[] mask) {
-        long res = Long.MIN_VALUE;
+        long res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4456,34 +4628,29 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void UMAXReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = Long.MIN_VALUE;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Long.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                long v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::UMAXReduceMasked, LongMaxVectorTests::UMAXReduceAllMasked);
+                LongVectorMaxTests::UMAXReduceMasked, LongVectorMaxTests::UMAXReduceAllMasked);
     }
 
     static long FIRST_NONZEROReduce(long[] a, int idx) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4492,7 +4659,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAll(long[] a) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4501,32 +4668,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void FIRST_NONZEROReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void FIRST_NONZEROReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::FIRST_NONZEROReduce, LongMaxVectorTests::FIRST_NONZEROReduceAll);
+                LongVectorMaxTests::FIRST_NONZEROReduce, LongVectorMaxTests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "longUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static long FIRST_NONZEROReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4536,7 +4721,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long FIRST_NONZEROReduceAllMasked(long[] a, boolean[] mask) {
-        long res = (long) 0;
+        long res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4545,30 +4730,25 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Long> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        long ra = (long) 0;
+        long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (long) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                long v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::FIRST_NONZEROReduceMasked, LongMaxVectorTests::FIRST_NONZEROReduceAllMasked);
+                LongVectorMaxTests::FIRST_NONZEROReduceMasked, LongVectorMaxTests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4581,7 +4761,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueLongMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueLongVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4592,7 +4772,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, LongMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVectorMaxTests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4605,7 +4785,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueLongMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueLongVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4616,11 +4796,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, LongMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, LongVectorMaxTests::allTrue);
     }
 
     static long SUADDReduce(long[] a, int idx) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4629,7 +4809,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAll(long[] a) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4638,32 +4818,50 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSaturatingUnaryOpProvider")
-    static void SUADDReduceLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void SUADDReduceLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                long v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::SUADDReduce, LongMaxVectorTests::SUADDReduceAll);
+                LongVectorMaxTests::SUADDReduce, LongVectorMaxTests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "longSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<long[]> fa) {
+        long[] a = fa.apply(SPECIES.length());
+        long id = SUADD_IDENTITY;
+
+        assertEquals((long) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        long x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((long) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((long) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static long SUADDReduceMasked(long[] a, int idx, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (long) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4673,7 +4871,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     static long SUADDReduceAllMasked(long[] a, boolean[] mask) {
-        long res = 0;
+        long res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (long) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4681,7 +4879,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "longSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4689,26 +4887,21 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         long ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 LongVector av = LongVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                LongVector av = LongVector.fromArray(SPECIES, a, i);
-                ra = (long) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                long v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (long) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::SUADDReduceMasked, LongMaxVectorTests::SUADDReduceAllMasked);
+                LongVectorMaxTests::SUADDReduceMasked, LongVectorMaxTests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void withLongMaxVectorTests(IntFunction<long []> fa, IntFunction<long []> fb) {
+    static void withLongVectorMaxTests(IntFunction<long []> fa, IntFunction<long []> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -4731,7 +4924,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_DEFAULTLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void IS_DEFAULTLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4741,14 +4934,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_DEFAULTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void IS_DEFAULTMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4761,7 +4954,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4772,7 +4965,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTestOpProvider")
-    static void IS_NEGATIVELongMaxVectorTests(IntFunction<long[]> fa) {
+    static void IS_NEGATIVELongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4782,14 +4975,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void IS_NEGATIVEMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4802,14 +4995,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4821,14 +5014,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4840,14 +5033,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LTLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4863,14 +5056,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GTLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GTLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4882,14 +5075,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GTLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GTLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4905,14 +5098,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4924,14 +5117,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4943,14 +5136,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void EQLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -4966,14 +5159,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void NELongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void NELongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -4985,14 +5178,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void NELongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void NELongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5008,14 +5201,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LELongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LELongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5027,14 +5220,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LELongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void LELongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5050,14 +5243,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void GELongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void GELongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5069,14 +5262,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void GELongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void GELongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5092,14 +5285,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULTLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULTLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5111,14 +5304,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULTLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULTLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5134,14 +5327,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGTLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGTLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5153,14 +5346,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGTLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGTLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5176,14 +5369,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ULELongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ULELongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5195,14 +5388,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void ULELongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void ULELongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5218,14 +5411,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void UGELongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void UGELongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5237,14 +5430,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void UGELongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void UGELongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5260,14 +5453,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void LTLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void LTLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5277,13 +5470,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void LTLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void LTLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5297,14 +5490,14 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void EQLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void EQLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -5314,13 +5507,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpMaskProvider")
-    static void EQLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
+    static void EQLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa,
                                 IntFunction<long[]> fb, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5334,7 +5527,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
@@ -5345,7 +5538,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void blendLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void blendLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5361,11 +5554,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, LongMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, LongVectorMaxTests::blend);
     }
 
     @Test(dataProvider = "longUnaryOpShuffleProvider")
-    static void RearrangeLongMaxVectorTests(IntFunction<long[]> fa,
+    static void RearrangeLongVectorMaxTests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5382,7 +5575,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpShuffleMaskProvider")
-    static void RearrangeLongMaxVectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void RearrangeLongVectorMaxTestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -5400,7 +5593,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void compressLongMaxVectorTests(IntFunction<long[]> fa,
+    static void compressLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5418,7 +5611,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void expandLongMaxVectorTests(IntFunction<long[]> fa,
+    static void expandLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -5436,7 +5629,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void getLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void getLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -5592,7 +5785,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BroadcastLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void BroadcastLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5606,7 +5799,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZeroLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ZeroLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -5616,7 +5809,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static long[] sliceUnary(long[] a, int origin, int idx) {
@@ -5631,7 +5824,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void sliceUnaryLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void sliceUnaryLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5642,7 +5835,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, LongMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, LongVectorMaxTests::sliceUnary);
     }
 
     static long[] sliceBinary(long[] a, long[] b, int origin, int idx) {
@@ -5659,7 +5852,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void sliceBinaryLongMaxVectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void sliceBinaryLongVectorMaxTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5672,7 +5865,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, LongMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, LongVectorMaxTests::sliceBinary);
     }
 
     static long[] slice(long[] a, long[] b, int origin, boolean[] mask, int idx) {
@@ -5689,7 +5882,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void sliceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void sliceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5706,7 +5899,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, LongMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, LongVectorMaxTests::slice);
     }
 
     static long[] unsliceUnary(long[] a, int origin, int idx) {
@@ -5723,7 +5916,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void unsliceUnaryLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void unsliceUnaryLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5734,7 +5927,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, LongMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, LongVectorMaxTests::unsliceUnary);
     }
 
     static long[] unsliceBinary(long[] a, long[] b, int origin, int part, int idx) {
@@ -5760,7 +5953,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpProvider")
-    static void unsliceBinaryLongMaxVectorTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void unsliceBinaryLongVectorMaxTestsBinary(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] r = new long[a.length];
@@ -5774,7 +5967,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, LongMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, LongVectorMaxTests::unsliceBinary);
     }
 
     static long[] unslice(long[] a, long[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5814,7 +6007,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longBinaryOpMaskProvider")
-    static void unsliceLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void unsliceLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
     IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5831,7 +6024,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, LongMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, LongVectorMaxTests::unslice);
     }
 
     static long BITWISE_BLEND(long a, long b, long c) {
@@ -5843,7 +6036,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5858,11 +6051,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5875,11 +6068,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, LongVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5897,11 +6090,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5912,11 +6105,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVectorMaxTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5927,11 +6120,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5942,11 +6135,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             LongVector bv = LongVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, LongVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLongMaxVectorTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVectorMaxTestsAltBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -5957,11 +6150,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             LongVector cv = LongVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, LongVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5976,11 +6169,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVectorMaxTestsAltBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -5995,11 +6188,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void BITWISE_BLENDLongVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6010,11 +6203,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "longTernaryOpProvider")
-    static void bitwiseBlendLongMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void bitwiseBlendLongVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] c = fc.apply(SPECIES.length());
@@ -6025,11 +6218,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, LongMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, LongVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "longTernaryOpMaskProvider")
-    static void BITWISE_BLENDLongMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
+    static void BITWISE_BLENDLongVectorMaxTestsDoubleBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb,
                                           IntFunction<long[]> fc, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
@@ -6043,7 +6236,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, LongVectorMaxTests::BITWISE_BLEND);
     }
 
     static long NEG(long a) {
@@ -6055,7 +6248,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NEGLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void NEGLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6066,11 +6259,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::NEG);
+        assertArraysEquals(r, a, LongVectorMaxTests::NEG);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void negLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void negLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6081,11 +6274,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::neg);
+        assertArraysEquals(r, a, LongVectorMaxTests::neg);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NEGMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void NEGMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6099,7 +6292,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::NEG);
     }
 
     static long ABS(long a) {
@@ -6111,7 +6304,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ABSLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ABSLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6122,11 +6315,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::ABS);
+        assertArraysEquals(r, a, LongVectorMaxTests::ABS);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void absLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void absLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6137,11 +6330,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::abs);
+        assertArraysEquals(r, a, LongVectorMaxTests::abs);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ABSMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void ABSMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6155,7 +6348,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::ABS);
     }
 
     static long NOT(long a) {
@@ -6167,7 +6360,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void NOTLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void NOTLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6178,11 +6371,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::NOT);
+        assertArraysEquals(r, a, LongVectorMaxTests::NOT);
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void notLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void notLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6193,11 +6386,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::not);
+        assertArraysEquals(r, a, LongVectorMaxTests::not);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void NOTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void NOTMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6211,7 +6404,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::NOT);
     }
 
     static long ZOMO(long a) {
@@ -6219,7 +6412,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ZOMOLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ZOMOLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6230,11 +6423,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, LongVectorMaxTests::ZOMO);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ZOMOMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void ZOMOMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6248,7 +6441,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::ZOMO);
     }
 
     static long BIT_COUNT(long a) {
@@ -6256,7 +6449,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void BIT_COUNTLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void BIT_COUNTLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6267,11 +6460,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, LongVectorMaxTests::BIT_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void BIT_COUNTMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6285,7 +6478,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::BIT_COUNT);
     }
 
     static long TRAILING_ZEROS_COUNT(long a) {
@@ -6293,7 +6486,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void TRAILING_ZEROS_COUNTLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6304,11 +6497,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6322,7 +6515,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     static long LEADING_ZEROS_COUNT(long a) {
@@ -6330,7 +6523,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void LEADING_ZEROS_COUNTLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6341,11 +6534,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, LongVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6359,7 +6552,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     static long REVERSE(long a) {
@@ -6367,7 +6560,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSELongMaxVectorTests(IntFunction<long[]> fa) {
+    static void REVERSELongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6378,11 +6571,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, LongVectorMaxTests::REVERSE);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSEMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void REVERSEMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6396,7 +6589,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::REVERSE);
     }
 
     static long REVERSE_BYTES(long a) {
@@ -6404,7 +6597,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void REVERSE_BYTESLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void REVERSE_BYTESLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
 
@@ -6415,11 +6608,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, LongVectorMaxTests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedLongMaxVectorTests(IntFunction<long[]> fa,
+    static void REVERSE_BYTESMaskedLongVectorMaxTests(IntFunction<long[]> fa,
                                                 IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
@@ -6433,7 +6626,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, LongMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, LongVectorMaxTests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6441,7 +6634,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandLongVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6454,7 +6647,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::band);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6462,7 +6655,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorLongVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6475,7 +6668,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::bor);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6483,7 +6676,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorLongVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6496,7 +6689,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::bxor);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6504,7 +6697,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotLongVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6517,7 +6710,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::bandNot);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6525,7 +6718,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqLongVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6538,7 +6731,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, LongMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, LongVectorMaxTests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6546,7 +6739,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotLongMaxVectorTests(IntFunction<boolean[]> fa) {
+    static void masknotLongVectorMaxTests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6557,7 +6750,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, LongMaxVectorTests::unot);
+        assertArraysEquals(r, a, LongVectorMaxTests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6566,15 +6759,15 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6588,7 +6781,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void ltLongMaxVectorTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void ltLongVectorMaxTestsBroadcastSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6598,13 +6791,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longCompareOpProvider")
-    static void eqLongMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
+    static void eqLongVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<long[]> fa, IntFunction<long[]> fb) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
 
@@ -6614,13 +6807,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "longtoIntUnaryOpProvider")
-    static void toIntArrayLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toIntArrayLongVectorMaxTestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6631,7 +6824,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toLongArrayLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toLongArrayLongVectorMaxTestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6642,7 +6835,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toDoubleArrayLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toDoubleArrayLongVectorMaxTestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6653,7 +6846,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void toStringLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void toStringLongVectorMaxTestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6666,7 +6859,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void hashCodeLongMaxVectorTestsSmokeTest(IntFunction<long[]> fa) {
+    static void hashCodeLongVectorMaxTestsSmokeTest(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6682,7 +6875,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
 
 
     @Test(dataProvider = "longUnaryOpProvider")
-    static void ADDReduceLongLongMaxVectorTests(IntFunction<long[]> fa) {
+    static void ADDReduceLongLongVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         long ra = 0;
@@ -6698,11 +6891,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                LongMaxVectorTests::ADDReduce, LongMaxVectorTests::ADDReduceAll);
+                LongVectorMaxTests::ADDReduce, LongVectorMaxTests::ADDReduceAll);
     }
 
     @Test(dataProvider = "longUnaryOpMaskProvider")
-    static void ADDReduceLongLongMaxVectorTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongLongVectorMaxTestsMasked(IntFunction<long[]> fa, IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6720,11 +6913,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                LongMaxVectorTests::ADDReduceMasked, LongMaxVectorTests::ADDReduceAllMasked);
+                LongVectorMaxTests::ADDReduceMasked, LongVectorMaxTests::ADDReduceAllMasked);
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromProvider")
-    static void SelectFromLongMaxVectorTests(IntFunction<long[]> fa,
+    static void SelectFromLongVectorMaxTests(IntFunction<long[]> fa,
                                            BiFunction<Integer,Integer,long[]> fs) {
         long[] a = fa.apply(SPECIES.length());
         long[] order = fs.apply(a.length, SPECIES.length());
@@ -6740,7 +6933,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorLongMaxVectorTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
+    static void SelectFromTwoVectorLongVectorMaxTests(IntFunction<long[]> fa, IntFunction<long[]> fb, IntFunction<long[]> fc) {
         long[] a = fa.apply(SPECIES.length());
         long[] b = fb.apply(SPECIES.length());
         long[] idx = fc.apply(SPECIES.length());
@@ -6758,7 +6951,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "longUnaryOpSelectFromMaskProvider")
-    static void SelectFromLongMaxVectorTestsMaskedSmokeTest(IntFunction<long[]> fa,
+    static void SelectFromLongVectorMaxTestsMaskedSmokeTest(IntFunction<long[]> fa,
                                                            BiFunction<Integer,Integer,long[]> fs,
                                                            IntFunction<boolean[]> fm) {
         long[] a = fa.apply(SPECIES.length());
@@ -6777,7 +6970,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousLongMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousLongVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6788,12 +6981,12 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringLongMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringLongVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6807,7 +7000,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsLongMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsLongVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6816,12 +7009,12 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsLongMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsLongVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6831,13 +7024,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeLongVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6859,7 +7052,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountLongVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6870,7 +7063,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, LongMaxVectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, LongVectorMaxTests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6884,7 +7077,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueLongVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6895,7 +7088,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, LongMaxVectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, LongVectorMaxTests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6909,7 +7102,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueLongVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6920,11 +7113,11 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, LongMaxVectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, LongVectorMaxTests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressLongMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressLongVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6934,7 +7127,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -6952,7 +7145,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongVectorMaxTestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6960,13 +7153,13 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongLongMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongLongVectorMaxTestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -6974,7 +7167,7 @@ public class LongMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -6993,36 +7186,36 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongMaxVectorTestsSmokeTest(int length) {
+    static void loopBoundLongVectorMaxTestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongLongMaxVectorTestsSmokeTest(int _length) {
+    static void loopBoundLongLongVectorMaxTestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeLongMaxVectorTestsSmokeTest() {
+    static void ElementSizeLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Long.SIZE);
+        assertEquals(elsize, Long.SIZE);
     }
 
     @Test
-    static void VectorShapeLongMaxVectorTestsSmokeTest() {
+    static void VectorShapeLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_Max_BIT));
     }
 
     @Test
-    static void ShapeWithLanesLongMaxVectorTestsSmokeTest() {
+    static void ShapeWithLanesLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(long.class);
@@ -7030,32 +7223,32 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeLongMaxVectorTestsSmokeTest() {
+    static void ElementTypeLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementType() == long.class);
     }
 
     @Test
-    static void SpeciesElementSizeLongMaxVectorTestsSmokeTest() {
+    static void SpeciesElementSizeLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().elementSize() == Long.SIZE);
     }
 
     @Test
-    static void VectorTypeLongMaxVectorTestsSmokeTest() {
+    static void VectorTypeLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesLongMaxVectorTestsSmokeTest() {
+    static void WithLanesLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(long.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeLongMaxVectorTestsSmokeTest() {
+    static void WithShapeLongVectorMaxTestsSmokeTest() {
         LongVector av = LongVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7063,9 +7256,9 @@ public class LongMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueLongMaxVectorTestsSmokeTest() {
+    static void MaskAllTrueLongVectorMaxTestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortVector128LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector128LoadStoreTests.java
index 5a71c5550f3..2c9a9198be9 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector128LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Short128VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ShortVector128LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ShortVector128LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_128;
 
@@ -61,14 +61,29 @@ public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -1114,11 +1129,11 @@ public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -1129,11 +1144,11 @@ public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
         }
     }
 
@@ -1149,7 +1164,7 @@ public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(short[] r, short[] a, int[] indexMap) {
@@ -1162,7 +1177,7 @@ public class Short128VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Short128VectorTests.java b/test/jdk/jdk/incubator/vector/ShortVector128Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Short128VectorTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector128Tests.java
index be39a01a4e7..7cf49513620 100644
--- a/test/jdk/jdk/incubator/vector/Short128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector128Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Short128VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ShortVector128Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Short128VectorTests extends AbstractVectorTest {
+public class ShortVector128Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_128;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(short actual, short expected, short delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(short actual, short expected, short delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final short CONST_SHIFT = Short.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final short ADD_IDENTITY = (short)0;
+    private static final short AND_IDENTITY = (short)-1;
+    private static final short FIRST_NONZERO_IDENTITY = (short)0;
+    private static final short MAX_IDENTITY = Short.MIN_VALUE;
+    private static final short MIN_IDENTITY = Short.MAX_VALUE;
+    private static final short MUL_IDENTITY = (short)1;
+    private static final short OR_IDENTITY = (short)0;
+    private static final short SUADD_IDENTITY = (short)0;
+    private static final short UMAX_IDENTITY = (short)0;   // Minimum unsigned value
+    private static final short UMIN_IDENTITY = (short)-1;  // Maximum unsigned value
+    private static final short XOR_IDENTITY = (short)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
     static void assertArraysStrictlyEquals(short[] r, short[] a) {
@@ -84,10 +139,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Short128VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Short128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Short128VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Short128VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Short128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (short)0);
+                    assertEquals(r[i + k], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Short128VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (short)0);
+                        assertEquals(r[i + j], (short)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Short128VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Short128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Short128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Short128VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Short128VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1565,7 +1620,7 @@ public class Short128VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ShortVector a = io.add((short)1); //[1,2]
         ShortVector b = a.neg();  //[-1,-2]
         short[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1580,19 +1635,19 @@ public class Short128VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Short> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Short> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ShortVector uab0 = zab0.rearrange(unz0,zab1);
         ShortVector uab1 = zab0.rearrange(unz1,zab1);
         short[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1607,7 +1662,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1641,7 +1696,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1654,7 +1709,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::ADD);
+        assertArraysEquals(r, a, b, ShortVector128Tests::ADD);
     }
 
     static short add(short a, short b) {
@@ -1662,7 +1717,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1673,11 +1728,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::add);
+        assertArraysEquals(r, a, b, ShortVector128Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1693,11 +1748,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1711,7 +1766,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::add);
     }
 
     static short SUB(short a, short b) {
@@ -1719,7 +1774,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void SUBShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUBShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1732,7 +1787,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::SUB);
+        assertArraysEquals(r, a, b, ShortVector128Tests::SUB);
     }
 
     static short sub(short a, short b) {
@@ -1740,7 +1795,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1751,11 +1806,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::sub);
+        assertArraysEquals(r, a, b, ShortVector128Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void SUBShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUBShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1771,11 +1826,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1789,7 +1844,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::sub);
     }
 
     static short MUL(short a, short b) {
@@ -1797,7 +1852,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MULShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MULShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1810,7 +1865,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::MUL);
+        assertArraysEquals(r, a, b, ShortVector128Tests::MUL);
     }
 
     static short mul(short a, short b) {
@@ -1818,7 +1873,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1829,11 +1884,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::mul);
+        assertArraysEquals(r, a, b, ShortVector128Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void MULShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void MULShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1849,11 +1904,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1867,7 +1922,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::mul);
     }
 
     static short DIV(short a, short b) {
@@ -1875,7 +1930,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void DIVShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void DIVShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1890,7 +1945,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::DIV);
+        assertArraysEquals(r, a, b, ShortVector128Tests::DIV);
     }
 
     static short div(short a, short b) {
@@ -1898,7 +1953,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1913,11 +1968,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::div);
+        assertArraysEquals(r, a, b, ShortVector128Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void DIVShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void DIVShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1990,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1957,7 +2012,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1965,7 +2020,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void FIRST_NONZEROShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void FIRST_NONZEROShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1978,11 +2033,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ShortVector128Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void FIRST_NONZEROShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void FIRST_NONZEROShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1998,7 +2053,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -2006,7 +2061,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2019,7 +2074,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::AND);
+        assertArraysEquals(r, a, b, ShortVector128Tests::AND);
     }
 
     static short and(short a, short b) {
@@ -2027,7 +2082,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2038,11 +2093,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::and);
+        assertArraysEquals(r, a, b, ShortVector128Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2058,7 +2113,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::AND);
     }
 
     static short AND_NOT(short a, short b) {
@@ -2066,7 +2121,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void AND_NOTShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void AND_NOTShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2079,11 +2134,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ShortVector128Tests::AND_NOT);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void AND_NOTShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void AND_NOTShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2099,7 +2154,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::AND_NOT);
     }
 
     static short OR(short a, short b) {
@@ -2107,7 +2162,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2120,7 +2175,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::OR);
+        assertArraysEquals(r, a, b, ShortVector128Tests::OR);
     }
 
     static short or(short a, short b) {
@@ -2128,7 +2183,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2139,11 +2194,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::or);
+        assertArraysEquals(r, a, b, ShortVector128Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2159,7 +2214,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::OR);
     }
 
     static short XOR(short a, short b) {
@@ -2167,7 +2222,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void XORShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void XORShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2180,11 +2235,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::XOR);
+        assertArraysEquals(r, a, b, ShortVector128Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void XORShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void XORShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2200,11 +2255,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2269,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2231,11 +2286,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector128Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2245,11 +2300,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2262,11 +2317,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector128Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2276,11 +2331,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2293,11 +2348,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector128Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2309,11 +2364,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2328,11 +2383,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector128Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2342,11 +2397,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2356,11 +2411,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2373,11 +2428,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector128Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2387,11 +2442,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2401,11 +2456,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2418,11 +2473,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short128VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector128Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector128TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2432,11 +2487,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector128Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2449,11 +2504,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short128VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector128Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector128TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2463,11 +2518,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector128Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort128VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector128TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2480,7 +2535,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short128VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector128Tests::ADD);
     }
 
     static short LSHL(short a, short b) {
@@ -2488,7 +2543,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2501,11 +2556,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ShortVector128Tests::LSHL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2521,7 +2576,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::LSHL);
     }
 
     static short ASHR(short a, short b) {
@@ -2529,7 +2584,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2542,11 +2597,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ShortVector128Tests::ASHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2562,7 +2617,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::ASHR);
     }
 
     static short LSHR(short a, short b) {
@@ -2570,7 +2625,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2583,11 +2638,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ShortVector128Tests::LSHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2603,7 +2658,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::LSHR);
     }
 
     static short LSHL_unary(short a, short b) {
@@ -2611,7 +2666,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort128VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector128TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2623,11 +2678,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector128Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort128VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector128TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2642,7 +2697,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector128Tests::LSHL_unary);
     }
 
     static short LSHR_unary(short a, short b) {
@@ -2650,7 +2705,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort128VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector128TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2662,11 +2717,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector128Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort128VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector128TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2681,7 +2736,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector128Tests::LSHR_unary);
     }
 
     static short ASHR_unary(short a, short b) {
@@ -2689,7 +2744,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort128VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector128TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2701,11 +2756,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector128Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort128VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector128TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2720,7 +2775,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector128Tests::ASHR_unary);
     }
 
     static short ROR(short a, short b) {
@@ -2728,7 +2783,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2741,11 +2796,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::ROR);
+        assertArraysEquals(r, a, b, ShortVector128Tests::ROR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2761,7 +2816,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::ROR);
     }
 
     static short ROL(short a, short b) {
@@ -2769,7 +2824,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2782,11 +2837,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::ROL);
+        assertArraysEquals(r, a, b, ShortVector128Tests::ROL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2802,7 +2857,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::ROL);
     }
 
     static short ROR_unary(short a, short b) {
@@ -2810,7 +2865,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort128VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector128TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2822,11 +2877,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector128Tests::ROR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort128VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector128TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2841,7 +2896,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector128Tests::ROR_unary);
     }
 
     static short ROL_unary(short a, short b) {
@@ -2849,7 +2904,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort128VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector128TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2861,11 +2916,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector128Tests::ROL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort128VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector128TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2880,14 +2935,14 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short128VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector128Tests::ROL_unary);
     }
     static short LSHR_binary_const(short a) {
         return (short)(((a & 0xFFFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHRShort128VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHRShortVector128TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2898,11 +2953,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector128Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHRShort128VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHRShortVector128TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2916,7 +2971,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short128VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector128Tests::LSHR_binary_const);
     }
 
     static short LSHL_binary_const(short a) {
@@ -2924,7 +2979,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHLShort128VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHLShortVector128TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2935,11 +2990,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector128Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHLShort128VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHLShortVector128TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2953,7 +3008,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short128VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector128Tests::LSHL_binary_const);
     }
 
     static short ASHR_binary_const(short a) {
@@ -2961,7 +3016,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ASHRShort128VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ASHRShortVector128TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2972,11 +3027,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector128Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ASHRShort128VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ASHRShortVector128TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2990,7 +3045,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short128VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector128Tests::ASHR_binary_const);
     }
 
     static short ROR_binary_const(short a) {
@@ -2998,7 +3053,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void RORShort128VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void RORShortVector128TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3009,11 +3064,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector128Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void RORShort128VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void RORShortVector128TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3027,7 +3082,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short128VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector128Tests::ROR_binary_const);
     }
 
     static short ROL_binary_const(short a) {
@@ -3035,7 +3090,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ROLShort128VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ROLShortVector128TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3046,11 +3101,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector128Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ROLShort128VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ROLShortVector128TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3064,14 +3119,14 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short128VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector128Tests::ROL_binary_const);
     }
 
 
     static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MINShortVector128TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3082,13 +3137,13 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short128VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, ShortVector128Tests::MIN);
     }
 
     static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void minShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void minShortVector128TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3099,13 +3154,13 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short128VectorTests::min);
+        assertArraysEquals(r, a, (short)10, ShortVector128Tests::min);
     }
 
     static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINShort128VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINShortVector128TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3118,13 +3173,13 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short128VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector128Tests::MIN);
     }
 
     static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MAXShortVector128TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short128VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, ShortVector128Tests::MAX);
     }
 
     static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void maxShort128VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void maxShortVector128TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short128VectorTests::max);
+        assertArraysEquals(r, a, (short)10, ShortVector128Tests::max);
     }
 
     static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXShort128VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXShortVector128TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,7 +3226,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short128VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector128Tests::MAX);
     }
 
     static short MIN(short a, short b) {
@@ -3179,7 +3234,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3192,7 +3247,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::MIN);
+        assertArraysEquals(r, a, b, ShortVector128Tests::MIN);
     }
 
     static short min(short a, short b) {
@@ -3200,7 +3255,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3211,7 +3266,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::min);
+        assertArraysEquals(r, a, b, ShortVector128Tests::min);
     }
 
     static short MAX(short a, short b) {
@@ -3219,7 +3274,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3232,7 +3287,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::MAX);
+        assertArraysEquals(r, a, b, ShortVector128Tests::MAX);
     }
 
     static short max(short a, short b) {
@@ -3240,7 +3295,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3251,7 +3306,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::max);
+        assertArraysEquals(r, a, b, ShortVector128Tests::max);
     }
 
     static short UMIN(short a, short b) {
@@ -3259,7 +3314,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMINShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMINShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3272,11 +3327,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ShortVector128Tests::UMIN);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMINShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMINShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3292,7 +3347,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::UMIN);
     }
 
     static short UMAX(short a, short b) {
@@ -3300,7 +3355,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMAXShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMAXShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3313,11 +3368,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ShortVector128Tests::UMAX);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMAXShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMAXShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3333,7 +3388,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::UMAX);
     }
 
     static short SADD(short a, short b) {
@@ -3341,7 +3396,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SADDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SADDShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3354,11 +3409,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::SADD);
+        assertArraysEquals(r, a, b, ShortVector128Tests::SADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SADDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SADDShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3374,7 +3429,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::SADD);
     }
 
     static short SSUB(short a, short b) {
@@ -3382,7 +3437,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SSUBShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SSUBShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3395,11 +3450,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ShortVector128Tests::SSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SSUBShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SSUBShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3415,7 +3470,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::SSUB);
     }
 
     static short SUADD(short a, short b) {
@@ -3423,7 +3478,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUADDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUADDShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3436,11 +3491,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ShortVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUADDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3456,7 +3511,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::SUADD);
     }
 
     static short SUSUB(short a, short b) {
@@ -3464,7 +3519,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUSUBShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUSUBShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3477,11 +3532,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ShortVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUSUBShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUSUBShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3497,11 +3552,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3566,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3525,11 +3580,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3539,11 +3594,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3553,10 +3608,10 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short128VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ShortVector128Tests::max);
     }
     @Test(dataProvider = "shortSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SUADDAssocShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -3573,11 +3628,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Short128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ShortVector128Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDAssocShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                      IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3598,11 +3653,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Short128VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ShortVector128Tests::SUADD);
     }
 
     static short ANDReduce(short[] a, int idx) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3611,7 +3666,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAll(short[] a) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3620,32 +3675,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ANDReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void ANDReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                short v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::ANDReduce, Short128VectorTests::ANDReduceAll);
+                ShortVector128Tests::ANDReduce, ShortVector128Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = AND_IDENTITY;
+
+        assertEquals((short) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id & x), x);
+                assertEquals((short) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static short ANDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3655,7 +3728,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3664,34 +3737,29 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ANDReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                short v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::ANDReduceMasked, Short128VectorTests::ANDReduceAllMasked);
+                ShortVector128Tests::ANDReduceMasked, ShortVector128Tests::ANDReduceAllMasked);
     }
 
     static short ORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3700,7 +3768,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAll(short[] a) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3709,32 +3777,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ORReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void ORReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                short v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::ORReduce, Short128VectorTests::ORReduceAll);
+                ShortVector128Tests::ORReduce, ShortVector128Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = OR_IDENTITY;
+
+        assertEquals((short) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id | x), x);
+                assertEquals((short) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static short ORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3744,7 +3830,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3753,7 +3839,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ORReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3761,26 +3847,21 @@ public class Short128VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                short v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::ORReduceMasked, Short128VectorTests::ORReduceAllMasked);
+                ShortVector128Tests::ORReduceMasked, ShortVector128Tests::ORReduceAllMasked);
     }
 
     static short XORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3789,7 +3870,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAll(short[] a) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3798,32 +3879,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void XORReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void XORReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                short v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::XORReduce, Short128VectorTests::XORReduceAll);
+                ShortVector128Tests::XORReduce, ShortVector128Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = XOR_IDENTITY;
+
+        assertEquals((short) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id ^ x), x);
+                assertEquals((short) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static short XORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3833,7 +3932,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3842,7 +3941,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void XORReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3850,26 +3949,21 @@ public class Short128VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                short v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::XORReduceMasked, Short128VectorTests::XORReduceAllMasked);
+                ShortVector128Tests::XORReduceMasked, ShortVector128Tests::XORReduceAllMasked);
     }
 
     static short ADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3878,7 +3972,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAll(short[] a) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3887,32 +3981,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                short v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::ADDReduce, Short128VectorTests::ADDReduceAll);
+                ShortVector128Tests::ADDReduce, ShortVector128Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = ADD_IDENTITY;
+
+        assertEquals((short) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id + x), x);
+                assertEquals((short) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3922,7 +4034,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3931,7 +4043,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3939,26 +4051,21 @@ public class Short128VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                short v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::ADDReduceMasked, Short128VectorTests::ADDReduceAllMasked);
+                ShortVector128Tests::ADDReduceMasked, ShortVector128Tests::ADDReduceAllMasked);
     }
 
     static short MULReduce(short[] a, int idx) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3967,7 +4074,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAll(short[] a) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3976,32 +4083,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MULReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void MULReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                short v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::MULReduce, Short128VectorTests::MULReduceAll);
+                ShortVector128Tests::MULReduce, ShortVector128Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MUL_IDENTITY;
+
+        assertEquals((short) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id * x), x);
+                assertEquals((short) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4011,7 +4136,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4020,34 +4145,29 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MULReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                short v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::MULReduceMasked, Short128VectorTests::MULReduceAllMasked);
+                ShortVector128Tests::MULReduceMasked, ShortVector128Tests::MULReduceAllMasked);
     }
 
     static short MINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.min(res, a[i]);
         }
@@ -4056,7 +4176,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduce(a, i));
         }
@@ -4065,32 +4185,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void MINReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                short v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::MINReduce, Short128VectorTests::MINReduceAll);
+                ShortVector128Tests::MINReduce, ShortVector128Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MIN_IDENTITY;
+
+        assertEquals((short) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.min(id, x), x);
+                assertEquals((short) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.min(res, a[i]);
@@ -4100,7 +4238,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4109,34 +4247,29 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                short v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::MINReduceMasked, Short128VectorTests::MINReduceAllMasked);
+                ShortVector128Tests::MINReduceMasked, ShortVector128Tests::MINReduceAllMasked);
     }
 
     static short MAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.max(res, a[i]);
         }
@@ -4145,7 +4278,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduce(a, i));
         }
@@ -4154,32 +4287,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void MAXReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                short v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::MAXReduce, Short128VectorTests::MAXReduceAll);
+                ShortVector128Tests::MAXReduce, ShortVector128Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MAX_IDENTITY;
+
+        assertEquals((short) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.max(id, x), x);
+                assertEquals((short) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.max(res, a[i]);
@@ -4189,7 +4340,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4198,34 +4349,29 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                short v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::MAXReduceMasked, Short128VectorTests::MAXReduceAllMasked);
+                ShortVector128Tests::MAXReduceMasked, ShortVector128Tests::MAXReduceAllMasked);
     }
 
     static short UMINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4234,7 +4380,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4243,32 +4389,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMINReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void UMINReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                short v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::UMINReduce, Short128VectorTests::UMINReduceAll);
+                ShortVector128Tests::UMINReduce, ShortVector128Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMIN_IDENTITY;
+
+        assertEquals((short) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.minUnsigned(id, x), x);
+                assertEquals((short) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static short UMINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.minUnsigned(res, a[i]);
@@ -4278,7 +4442,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4287,34 +4451,29 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMINReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                short v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::UMINReduceMasked, Short128VectorTests::UMINReduceAllMasked);
+                ShortVector128Tests::UMINReduceMasked, ShortVector128Tests::UMINReduceAllMasked);
     }
 
     static short UMAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4323,7 +4482,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4332,32 +4491,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMAXReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void UMAXReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                short v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::UMAXReduce, Short128VectorTests::UMAXReduceAll);
+                ShortVector128Tests::UMAXReduce, ShortVector128Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMAX_IDENTITY;
+
+        assertEquals((short) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((short) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static short UMAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.maxUnsigned(res, a[i]);
@@ -4367,7 +4544,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4376,34 +4553,29 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMAXReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                short v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::UMAXReduceMasked, Short128VectorTests::UMAXReduceAllMasked);
+                ShortVector128Tests::UMAXReduceMasked, ShortVector128Tests::UMAXReduceAllMasked);
     }
 
     static short FIRST_NONZEROReduce(short[] a, int idx) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4412,7 +4584,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAll(short[] a) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4421,32 +4593,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void FIRST_NONZEROReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void FIRST_NONZEROReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::FIRST_NONZEROReduce, Short128VectorTests::FIRST_NONZEROReduceAll);
+                ShortVector128Tests::FIRST_NONZEROReduce, ShortVector128Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static short FIRST_NONZEROReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4456,7 +4646,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAllMasked(short[] a, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4465,30 +4655,25 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::FIRST_NONZEROReduceMasked, Short128VectorTests::FIRST_NONZEROReduceAllMasked);
+                ShortVector128Tests::FIRST_NONZEROReduceMasked, ShortVector128Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4501,7 +4686,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueShort128VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueShortVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4512,7 +4697,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short128VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector128Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4525,7 +4710,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueShort128VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueShortVector128Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4536,11 +4721,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short128VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector128Tests::allTrue);
     }
 
     static short SUADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4549,7 +4734,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAll(short[] a) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4558,32 +4743,50 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingUnaryOpProvider")
-    static void SUADDReduceShort128VectorTests(IntFunction<short[]> fa) {
+    static void SUADDReduceShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                short v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short128VectorTests::SUADDReduce, Short128VectorTests::SUADDReduceAll);
+                ShortVector128Tests::SUADDReduce, ShortVector128Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = SUADD_IDENTITY;
+
+        assertEquals((short) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static short SUADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4593,7 +4796,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4601,7 +4804,7 @@ public class Short128VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "shortSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4609,26 +4812,21 @@ public class Short128VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                short v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::SUADDReduceMasked, Short128VectorTests::SUADDReduceAllMasked);
+                ShortVector128Tests::SUADDReduceMasked, ShortVector128Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void withShort128VectorTests(IntFunction<short []> fa, IntFunction<short []> fb) {
+    static void withShortVector128Tests(IntFunction<short []> fa, IntFunction<short []> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -4651,7 +4849,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_DEFAULTShort128VectorTests(IntFunction<short[]> fa) {
+    static void IS_DEFAULTShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4661,14 +4859,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShortVector128Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4681,7 +4879,7 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4692,7 +4890,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_NEGATIVEShort128VectorTests(IntFunction<short[]> fa) {
+    static void IS_NEGATIVEShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4702,14 +4900,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShortVector128Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4722,14 +4920,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4741,14 +4939,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4760,14 +4958,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LTShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4783,14 +4981,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GTShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GTShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4802,14 +5000,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GTShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GTShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4825,14 +5023,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4844,14 +5042,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4863,14 +5061,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void EQShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4886,14 +5084,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void NEShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void NEShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4905,14 +5103,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void NEShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void NEShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4928,14 +5126,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LEShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LEShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4947,14 +5145,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LEShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LEShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4970,14 +5168,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GEShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GEShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4989,14 +5187,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GEShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GEShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5012,14 +5210,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULTShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULTShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5031,14 +5229,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULTShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULTShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5054,14 +5252,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGTShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGTShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5073,14 +5271,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGTShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGTShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5096,14 +5294,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULEShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULEShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5115,14 +5313,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULEShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULEShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5138,14 +5336,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGEShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGEShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5157,14 +5355,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGEShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGEShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5180,14 +5378,14 @@ public class Short128VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5197,13 +5395,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5217,13 +5415,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector128TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5233,13 +5431,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5253,13 +5451,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5269,13 +5467,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5289,13 +5487,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector128TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5305,13 +5503,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort128VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector128TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5325,7 +5523,7 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
             }
         }
     }
@@ -5335,7 +5533,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5351,11 +5549,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short128VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ShortVector128Tests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
-    static void RearrangeShort128VectorTests(IntFunction<short[]> fa,
+    static void RearrangeShortVector128Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5372,7 +5570,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
-    static void RearrangeShort128VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void RearrangeShortVector128TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -5390,7 +5588,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void compressShort128VectorTests(IntFunction<short[]> fa,
+    static void compressShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5408,7 +5606,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void expandShort128VectorTests(IntFunction<short[]> fa,
+    static void expandShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5426,7 +5624,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void getShort128VectorTests(IntFunction<short[]> fa) {
+    static void getShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -5582,7 +5780,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastShort128VectorTests(IntFunction<short[]> fa) {
+    static void BroadcastShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5596,7 +5794,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZeroShort128VectorTests(IntFunction<short[]> fa) {
+    static void ZeroShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5606,7 +5804,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static short[] sliceUnary(short[] a, int origin, int idx) {
@@ -5621,7 +5819,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void sliceUnaryShort128VectorTests(IntFunction<short[]> fa) {
+    static void sliceUnaryShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5632,7 +5830,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short128VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector128Tests::sliceUnary);
     }
 
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
@@ -5649,7 +5847,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void sliceBinaryShort128VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void sliceBinaryShortVector128TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5662,7 +5860,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Short128VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ShortVector128Tests::sliceBinary);
     }
 
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
@@ -5679,7 +5877,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void sliceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void sliceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5696,7 +5894,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Short128VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ShortVector128Tests::slice);
     }
 
     static short[] unsliceUnary(short[] a, int origin, int idx) {
@@ -5713,7 +5911,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void unsliceUnaryShort128VectorTests(IntFunction<short[]> fa) {
+    static void unsliceUnaryShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5724,7 +5922,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short128VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector128Tests::unsliceUnary);
     }
 
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
@@ -5750,7 +5948,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void unsliceBinaryShort128VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void unsliceBinaryShortVector128TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5764,7 +5962,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Short128VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ShortVector128Tests::unsliceBinary);
     }
 
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5804,7 +6002,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void unsliceShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void unsliceShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5821,7 +6019,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Short128VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ShortVector128Tests::unslice);
     }
 
     static short BITWISE_BLEND(short a, short b, short c) {
@@ -5833,7 +6031,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5848,11 +6046,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5865,11 +6063,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ShortVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5887,11 +6085,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5902,11 +6100,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort128VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector128TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5917,11 +6115,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5932,11 +6130,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort128VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector128TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5947,11 +6145,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5966,11 +6164,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort128VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector128TestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort128VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector128TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector128Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort128VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector128TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6015,11 +6213,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short128VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector128Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort128VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector128TestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6033,7 +6231,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short128VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortVector128Tests::BITWISE_BLEND);
     }
 
     static short NEG(short a) {
@@ -6045,7 +6243,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NEGShort128VectorTests(IntFunction<short[]> fa) {
+    static void NEGShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6056,11 +6254,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::NEG);
+        assertArraysEquals(r, a, ShortVector128Tests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void negShort128VectorTests(IntFunction<short[]> fa) {
+    static void negShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6071,11 +6269,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::neg);
+        assertArraysEquals(r, a, ShortVector128Tests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NEGMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void NEGMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6089,7 +6287,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::NEG);
     }
 
     static short ABS(short a) {
@@ -6101,7 +6299,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ABSShort128VectorTests(IntFunction<short[]> fa) {
+    static void ABSShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6112,11 +6310,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::ABS);
+        assertArraysEquals(r, a, ShortVector128Tests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void absShort128VectorTests(IntFunction<short[]> fa) {
+    static void absShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6127,11 +6325,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::abs);
+        assertArraysEquals(r, a, ShortVector128Tests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ABSMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void ABSMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6145,7 +6343,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::ABS);
     }
 
     static short NOT(short a) {
@@ -6157,7 +6355,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NOTShort128VectorTests(IntFunction<short[]> fa) {
+    static void NOTShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6168,11 +6366,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::NOT);
+        assertArraysEquals(r, a, ShortVector128Tests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void notShort128VectorTests(IntFunction<short[]> fa) {
+    static void notShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6183,11 +6381,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::not);
+        assertArraysEquals(r, a, ShortVector128Tests::not);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NOTMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void NOTMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6201,7 +6399,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::NOT);
     }
 
     static short ZOMO(short a) {
@@ -6209,7 +6407,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZOMOShort128VectorTests(IntFunction<short[]> fa) {
+    static void ZOMOShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6220,11 +6418,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::ZOMO);
+        assertArraysEquals(r, a, ShortVector128Tests::ZOMO);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ZOMOMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void ZOMOMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6238,7 +6436,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::ZOMO);
     }
 
     static short BIT_COUNT(short a) {
@@ -6246,7 +6444,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BIT_COUNTShort128VectorTests(IntFunction<short[]> fa) {
+    static void BIT_COUNTShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6257,11 +6455,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ShortVector128Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void BIT_COUNTMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6275,7 +6473,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::BIT_COUNT);
     }
 
     static short TRAILING_ZEROS_COUNT(short a) {
@@ -6283,7 +6481,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTShort128VectorTests(IntFunction<short[]> fa) {
+    static void TRAILING_ZEROS_COUNTShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6294,11 +6492,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6312,7 +6510,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::TRAILING_ZEROS_COUNT);
     }
 
     static short LEADING_ZEROS_COUNT(short a) {
@@ -6320,7 +6518,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTShort128VectorTests(IntFunction<short[]> fa) {
+    static void LEADING_ZEROS_COUNTShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6331,11 +6529,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6349,7 +6547,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::LEADING_ZEROS_COUNT);
     }
 
     static short REVERSE(short a) {
@@ -6357,7 +6555,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSEShort128VectorTests(IntFunction<short[]> fa) {
+    static void REVERSEShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6368,11 +6566,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::REVERSE);
+        assertArraysEquals(r, a, ShortVector128Tests::REVERSE);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSEMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void REVERSEMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6386,7 +6584,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::REVERSE);
     }
 
     static short REVERSE_BYTES(short a) {
@@ -6394,7 +6592,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSE_BYTESShort128VectorTests(IntFunction<short[]> fa) {
+    static void REVERSE_BYTESShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6405,11 +6603,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ShortVector128Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedShort128VectorTests(IntFunction<short[]> fa,
+    static void REVERSE_BYTESMaskedShortVector128Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6423,7 +6621,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short128VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ShortVector128Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6431,7 +6629,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandShortVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6444,7 +6642,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::band);
+        assertArraysEquals(r, a, b, ShortVector128Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6452,7 +6650,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorShortVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6465,7 +6663,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::bor);
+        assertArraysEquals(r, a, b, ShortVector128Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6473,7 +6671,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorShortVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6486,7 +6684,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::bxor);
+        assertArraysEquals(r, a, b, ShortVector128Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6494,7 +6692,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotShortVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6507,7 +6705,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ShortVector128Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6515,7 +6713,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqShortVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6528,7 +6726,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short128VectorTests::beq);
+        assertArraysEquals(r, a, b, ShortVector128Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6536,7 +6734,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotShort128VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotShortVector128Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6547,7 +6745,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short128VectorTests::unot);
+        assertArraysEquals(r, a, ShortVector128Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6556,15 +6754,15 @@ public class Short128VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort128VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongShortVector128Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6578,7 +6776,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort128VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector128TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6588,13 +6786,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort128VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector128TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6604,13 +6802,13 @@ public class Short128VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toIntArrayShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toIntArrayShortVector128TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6621,7 +6819,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toLongArrayShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toLongArrayShortVector128TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6632,7 +6830,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toDoubleArrayShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toDoubleArrayShortVector128TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6643,7 +6841,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toStringShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toStringShortVector128TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6656,7 +6854,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void hashCodeShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void hashCodeShortVector128TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6689,7 +6887,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceLongShort128VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceLongShortVector128Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6705,7 +6903,7 @@ public class Short128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Short128VectorTests::ADDReduceLong, Short128VectorTests::ADDReduceAllLong);
+                ShortVector128Tests::ADDReduceLong, ShortVector128Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(short[] a, int idx, boolean[] mask) {
@@ -6728,7 +6926,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceLongShort128VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongShortVector128TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6746,11 +6944,11 @@ public class Short128VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Short128VectorTests::ADDReduceLongMasked, Short128VectorTests::ADDReduceAllLongMasked);
+                ShortVector128Tests::ADDReduceLongMasked, ShortVector128Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastLongShort128VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void BroadcastLongShortVector128TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -6761,7 +6959,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort128VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector128TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6775,12 +6973,12 @@ public class Short128VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short128VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector128Tests::blend);
     }
 
 
     @Test(dataProvider = "shortUnaryOpSelectFromProvider")
-    static void SelectFromShort128VectorTests(IntFunction<short[]> fa,
+    static void SelectFromShortVector128Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,short[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         short[] order = fs.apply(a.length, SPECIES.length());
@@ -6796,7 +6994,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorShort128VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SelectFromTwoVectorShortVector128Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] idx = fc.apply(SPECIES.length());
@@ -6814,7 +7012,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
-    static void SelectFromShort128VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void SelectFromShortVector128TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                            BiFunction<Integer,Integer,short[]> fs,
                                                            IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -6833,7 +7031,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousShort128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousShortVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6844,12 +7042,12 @@ public class Short128VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringShort128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringShortVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6863,7 +7061,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsShort128VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsShortVector128TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6872,12 +7070,12 @@ public class Short128VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsShort128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsShortVector128Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6887,13 +7085,13 @@ public class Short128VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeShortVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6915,7 +7113,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountShortVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6926,7 +7124,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short128VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ShortVector128Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6940,7 +7138,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueShortVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6951,7 +7149,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short128VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector128Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6965,7 +7163,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueShortVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6976,11 +7174,11 @@ public class Short128VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short128VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector128Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressShort128VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressShortVector128TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6990,7 +7188,7 @@ public class Short128VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7008,7 +7206,7 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeShort128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeShortVector128TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7016,13 +7214,13 @@ public class Short128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongShort128VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongShortVector128TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7030,7 +7228,7 @@ public class Short128VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7049,36 +7247,36 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundShort128VectorTestsSmokeTest(int length) {
+    static void loopBoundShortVector128TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongShort128VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongShortVector128TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeShort128VectorTestsSmokeTest() {
+    static void ElementSizeShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Short.SIZE);
+        assertEquals(elsize, Short.SIZE);
     }
 
     @Test
-    static void VectorShapeShort128VectorTestsSmokeTest() {
+    static void VectorShapeShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_128_BIT));
     }
 
     @Test
-    static void ShapeWithLanesShort128VectorTestsSmokeTest() {
+    static void ShapeWithLanesShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(short.class);
@@ -7086,32 +7284,32 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeShort128VectorTestsSmokeTest() {
+    static void ElementTypeShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementType() == short.class);
     }
 
     @Test
-    static void SpeciesElementSizeShort128VectorTestsSmokeTest() {
+    static void SpeciesElementSizeShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementSize() == Short.SIZE);
     }
 
     @Test
-    static void VectorTypeShort128VectorTestsSmokeTest() {
+    static void VectorTypeShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesShort128VectorTestsSmokeTest() {
+    static void WithLanesShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(short.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeShort128VectorTestsSmokeTest() {
+    static void WithShapeShortVector128TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7119,9 +7317,9 @@ public class Short128VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueShort128VectorTestsSmokeTest() {
+    static void MaskAllTrueShortVector128TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortVector256LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector256LoadStoreTests.java
index 335d51add59..70ed351908f 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector256LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Short256VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ShortVector256LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ShortVector256LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_256;
 
@@ -61,14 +61,29 @@ public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -1114,11 +1129,11 @@ public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -1129,11 +1144,11 @@ public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
         }
     }
 
@@ -1149,7 +1164,7 @@ public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(short[] r, short[] a, int[] indexMap) {
@@ -1162,7 +1177,7 @@ public class Short256VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Short256VectorTests.java b/test/jdk/jdk/incubator/vector/ShortVector256Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Short256VectorTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector256Tests.java
index 0b6ae53710e..5104e3724f7 100644
--- a/test/jdk/jdk/incubator/vector/Short256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector256Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Short256VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ShortVector256Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Short256VectorTests extends AbstractVectorTest {
+public class ShortVector256Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_256;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(short actual, short expected, short delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(short actual, short expected, short delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final short CONST_SHIFT = Short.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final short ADD_IDENTITY = (short)0;
+    private static final short AND_IDENTITY = (short)-1;
+    private static final short FIRST_NONZERO_IDENTITY = (short)0;
+    private static final short MAX_IDENTITY = Short.MIN_VALUE;
+    private static final short MIN_IDENTITY = Short.MAX_VALUE;
+    private static final short MUL_IDENTITY = (short)1;
+    private static final short OR_IDENTITY = (short)0;
+    private static final short SUADD_IDENTITY = (short)0;
+    private static final short UMAX_IDENTITY = (short)0;   // Minimum unsigned value
+    private static final short UMIN_IDENTITY = (short)-1;  // Maximum unsigned value
+    private static final short XOR_IDENTITY = (short)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
     static void assertArraysStrictlyEquals(short[] r, short[] a) {
@@ -84,10 +139,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Short256VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Short256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Short256VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Short256VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Short256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (short)0);
+                    assertEquals(r[i + k], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Short256VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (short)0);
+                        assertEquals(r[i + j], (short)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Short256VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Short256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Short256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Short256VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Short256VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1565,7 +1620,7 @@ public class Short256VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ShortVector a = io.add((short)1); //[1,2]
         ShortVector b = a.neg();  //[-1,-2]
         short[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1580,19 +1635,19 @@ public class Short256VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Short> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Short> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ShortVector uab0 = zab0.rearrange(unz0,zab1);
         ShortVector uab1 = zab0.rearrange(unz1,zab1);
         short[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1607,7 +1662,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1641,7 +1696,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1654,7 +1709,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::ADD);
+        assertArraysEquals(r, a, b, ShortVector256Tests::ADD);
     }
 
     static short add(short a, short b) {
@@ -1662,7 +1717,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1673,11 +1728,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::add);
+        assertArraysEquals(r, a, b, ShortVector256Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1693,11 +1748,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1711,7 +1766,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::add);
     }
 
     static short SUB(short a, short b) {
@@ -1719,7 +1774,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void SUBShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUBShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1732,7 +1787,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::SUB);
+        assertArraysEquals(r, a, b, ShortVector256Tests::SUB);
     }
 
     static short sub(short a, short b) {
@@ -1740,7 +1795,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1751,11 +1806,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::sub);
+        assertArraysEquals(r, a, b, ShortVector256Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void SUBShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUBShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1771,11 +1826,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1789,7 +1844,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::sub);
     }
 
     static short MUL(short a, short b) {
@@ -1797,7 +1852,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MULShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MULShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1810,7 +1865,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::MUL);
+        assertArraysEquals(r, a, b, ShortVector256Tests::MUL);
     }
 
     static short mul(short a, short b) {
@@ -1818,7 +1873,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1829,11 +1884,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::mul);
+        assertArraysEquals(r, a, b, ShortVector256Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void MULShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void MULShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1849,11 +1904,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1867,7 +1922,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::mul);
     }
 
     static short DIV(short a, short b) {
@@ -1875,7 +1930,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void DIVShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void DIVShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1890,7 +1945,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::DIV);
+        assertArraysEquals(r, a, b, ShortVector256Tests::DIV);
     }
 
     static short div(short a, short b) {
@@ -1898,7 +1953,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1913,11 +1968,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::div);
+        assertArraysEquals(r, a, b, ShortVector256Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void DIVShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void DIVShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1990,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1957,7 +2012,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1965,7 +2020,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void FIRST_NONZEROShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void FIRST_NONZEROShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1978,11 +2033,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ShortVector256Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void FIRST_NONZEROShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void FIRST_NONZEROShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1998,7 +2053,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -2006,7 +2061,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2019,7 +2074,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::AND);
+        assertArraysEquals(r, a, b, ShortVector256Tests::AND);
     }
 
     static short and(short a, short b) {
@@ -2027,7 +2082,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2038,11 +2093,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::and);
+        assertArraysEquals(r, a, b, ShortVector256Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2058,7 +2113,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::AND);
     }
 
     static short AND_NOT(short a, short b) {
@@ -2066,7 +2121,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void AND_NOTShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void AND_NOTShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2079,11 +2134,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ShortVector256Tests::AND_NOT);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void AND_NOTShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void AND_NOTShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2099,7 +2154,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::AND_NOT);
     }
 
     static short OR(short a, short b) {
@@ -2107,7 +2162,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2120,7 +2175,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::OR);
+        assertArraysEquals(r, a, b, ShortVector256Tests::OR);
     }
 
     static short or(short a, short b) {
@@ -2128,7 +2183,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2139,11 +2194,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::or);
+        assertArraysEquals(r, a, b, ShortVector256Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2159,7 +2214,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::OR);
     }
 
     static short XOR(short a, short b) {
@@ -2167,7 +2222,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void XORShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void XORShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2180,11 +2235,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::XOR);
+        assertArraysEquals(r, a, b, ShortVector256Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void XORShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void XORShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2200,11 +2255,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2269,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2231,11 +2286,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector256Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2245,11 +2300,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2262,11 +2317,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector256Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2276,11 +2331,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2293,11 +2348,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector256Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2309,11 +2364,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2328,11 +2383,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector256Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2342,11 +2397,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2356,11 +2411,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2373,11 +2428,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector256Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2387,11 +2442,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2401,11 +2456,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2418,11 +2473,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short256VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector256Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector256TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2432,11 +2487,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector256Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2449,11 +2504,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short256VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector256Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector256TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2463,11 +2518,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector256Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort256VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector256TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2480,7 +2535,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short256VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector256Tests::ADD);
     }
 
     static short LSHL(short a, short b) {
@@ -2488,7 +2543,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2501,11 +2556,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ShortVector256Tests::LSHL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2521,7 +2576,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::LSHL);
     }
 
     static short ASHR(short a, short b) {
@@ -2529,7 +2584,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2542,11 +2597,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ShortVector256Tests::ASHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2562,7 +2617,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::ASHR);
     }
 
     static short LSHR(short a, short b) {
@@ -2570,7 +2625,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2583,11 +2638,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ShortVector256Tests::LSHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2603,7 +2658,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::LSHR);
     }
 
     static short LSHL_unary(short a, short b) {
@@ -2611,7 +2666,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort256VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector256TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2623,11 +2678,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector256Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort256VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector256TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2642,7 +2697,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector256Tests::LSHL_unary);
     }
 
     static short LSHR_unary(short a, short b) {
@@ -2650,7 +2705,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort256VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector256TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2662,11 +2717,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector256Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort256VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector256TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2681,7 +2736,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector256Tests::LSHR_unary);
     }
 
     static short ASHR_unary(short a, short b) {
@@ -2689,7 +2744,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort256VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector256TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2701,11 +2756,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector256Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort256VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector256TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2720,7 +2775,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector256Tests::ASHR_unary);
     }
 
     static short ROR(short a, short b) {
@@ -2728,7 +2783,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2741,11 +2796,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::ROR);
+        assertArraysEquals(r, a, b, ShortVector256Tests::ROR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2761,7 +2816,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::ROR);
     }
 
     static short ROL(short a, short b) {
@@ -2769,7 +2824,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2782,11 +2837,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::ROL);
+        assertArraysEquals(r, a, b, ShortVector256Tests::ROL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2802,7 +2857,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::ROL);
     }
 
     static short ROR_unary(short a, short b) {
@@ -2810,7 +2865,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort256VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector256TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2822,11 +2877,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector256Tests::ROR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort256VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector256TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2841,7 +2896,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector256Tests::ROR_unary);
     }
 
     static short ROL_unary(short a, short b) {
@@ -2849,7 +2904,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort256VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector256TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2861,11 +2916,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector256Tests::ROL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort256VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector256TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2880,14 +2935,14 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short256VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector256Tests::ROL_unary);
     }
     static short LSHR_binary_const(short a) {
         return (short)(((a & 0xFFFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHRShort256VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHRShortVector256TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2898,11 +2953,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector256Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHRShort256VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHRShortVector256TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2916,7 +2971,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short256VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector256Tests::LSHR_binary_const);
     }
 
     static short LSHL_binary_const(short a) {
@@ -2924,7 +2979,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHLShort256VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHLShortVector256TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2935,11 +2990,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector256Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHLShort256VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHLShortVector256TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2953,7 +3008,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short256VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector256Tests::LSHL_binary_const);
     }
 
     static short ASHR_binary_const(short a) {
@@ -2961,7 +3016,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ASHRShort256VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ASHRShortVector256TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2972,11 +3027,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector256Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ASHRShort256VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ASHRShortVector256TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2990,7 +3045,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short256VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector256Tests::ASHR_binary_const);
     }
 
     static short ROR_binary_const(short a) {
@@ -2998,7 +3053,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void RORShort256VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void RORShortVector256TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3009,11 +3064,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector256Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void RORShort256VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void RORShortVector256TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3027,7 +3082,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short256VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector256Tests::ROR_binary_const);
     }
 
     static short ROL_binary_const(short a) {
@@ -3035,7 +3090,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ROLShort256VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ROLShortVector256TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3046,11 +3101,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector256Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ROLShort256VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ROLShortVector256TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3064,14 +3119,14 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short256VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector256Tests::ROL_binary_const);
     }
 
 
     static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MINShortVector256TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3082,13 +3137,13 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short256VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, ShortVector256Tests::MIN);
     }
 
     static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void minShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void minShortVector256TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3099,13 +3154,13 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short256VectorTests::min);
+        assertArraysEquals(r, a, (short)10, ShortVector256Tests::min);
     }
 
     static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINShort256VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINShortVector256TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3118,13 +3173,13 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short256VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector256Tests::MIN);
     }
 
     static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MAXShortVector256TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short256VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, ShortVector256Tests::MAX);
     }
 
     static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void maxShort256VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void maxShortVector256TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short256VectorTests::max);
+        assertArraysEquals(r, a, (short)10, ShortVector256Tests::max);
     }
 
     static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXShort256VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXShortVector256TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,7 +3226,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short256VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector256Tests::MAX);
     }
 
     static short MIN(short a, short b) {
@@ -3179,7 +3234,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3192,7 +3247,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::MIN);
+        assertArraysEquals(r, a, b, ShortVector256Tests::MIN);
     }
 
     static short min(short a, short b) {
@@ -3200,7 +3255,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3211,7 +3266,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::min);
+        assertArraysEquals(r, a, b, ShortVector256Tests::min);
     }
 
     static short MAX(short a, short b) {
@@ -3219,7 +3274,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3232,7 +3287,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::MAX);
+        assertArraysEquals(r, a, b, ShortVector256Tests::MAX);
     }
 
     static short max(short a, short b) {
@@ -3240,7 +3295,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3251,7 +3306,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::max);
+        assertArraysEquals(r, a, b, ShortVector256Tests::max);
     }
 
     static short UMIN(short a, short b) {
@@ -3259,7 +3314,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMINShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMINShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3272,11 +3327,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ShortVector256Tests::UMIN);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMINShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMINShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3292,7 +3347,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::UMIN);
     }
 
     static short UMAX(short a, short b) {
@@ -3300,7 +3355,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMAXShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMAXShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3313,11 +3368,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ShortVector256Tests::UMAX);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMAXShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMAXShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3333,7 +3388,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::UMAX);
     }
 
     static short SADD(short a, short b) {
@@ -3341,7 +3396,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SADDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SADDShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3354,11 +3409,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::SADD);
+        assertArraysEquals(r, a, b, ShortVector256Tests::SADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SADDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SADDShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3374,7 +3429,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::SADD);
     }
 
     static short SSUB(short a, short b) {
@@ -3382,7 +3437,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SSUBShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SSUBShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3395,11 +3450,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ShortVector256Tests::SSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SSUBShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SSUBShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3415,7 +3470,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::SSUB);
     }
 
     static short SUADD(short a, short b) {
@@ -3423,7 +3478,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUADDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUADDShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3436,11 +3491,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ShortVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUADDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3456,7 +3511,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::SUADD);
     }
 
     static short SUSUB(short a, short b) {
@@ -3464,7 +3519,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUSUBShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUSUBShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3477,11 +3532,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ShortVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUSUBShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUSUBShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3497,11 +3552,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3566,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3525,11 +3580,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3539,11 +3594,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3553,10 +3608,10 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short256VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ShortVector256Tests::max);
     }
     @Test(dataProvider = "shortSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SUADDAssocShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -3573,11 +3628,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Short256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ShortVector256Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDAssocShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                      IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3598,11 +3653,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Short256VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ShortVector256Tests::SUADD);
     }
 
     static short ANDReduce(short[] a, int idx) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3611,7 +3666,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAll(short[] a) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3620,32 +3675,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ANDReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void ANDReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                short v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::ANDReduce, Short256VectorTests::ANDReduceAll);
+                ShortVector256Tests::ANDReduce, ShortVector256Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = AND_IDENTITY;
+
+        assertEquals((short) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id & x), x);
+                assertEquals((short) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static short ANDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3655,7 +3728,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3664,34 +3737,29 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ANDReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                short v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::ANDReduceMasked, Short256VectorTests::ANDReduceAllMasked);
+                ShortVector256Tests::ANDReduceMasked, ShortVector256Tests::ANDReduceAllMasked);
     }
 
     static short ORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3700,7 +3768,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAll(short[] a) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3709,32 +3777,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ORReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void ORReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                short v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::ORReduce, Short256VectorTests::ORReduceAll);
+                ShortVector256Tests::ORReduce, ShortVector256Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = OR_IDENTITY;
+
+        assertEquals((short) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id | x), x);
+                assertEquals((short) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static short ORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3744,7 +3830,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3753,7 +3839,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ORReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3761,26 +3847,21 @@ public class Short256VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                short v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::ORReduceMasked, Short256VectorTests::ORReduceAllMasked);
+                ShortVector256Tests::ORReduceMasked, ShortVector256Tests::ORReduceAllMasked);
     }
 
     static short XORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3789,7 +3870,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAll(short[] a) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3798,32 +3879,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void XORReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void XORReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                short v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::XORReduce, Short256VectorTests::XORReduceAll);
+                ShortVector256Tests::XORReduce, ShortVector256Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = XOR_IDENTITY;
+
+        assertEquals((short) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id ^ x), x);
+                assertEquals((short) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static short XORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3833,7 +3932,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3842,7 +3941,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void XORReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3850,26 +3949,21 @@ public class Short256VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                short v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::XORReduceMasked, Short256VectorTests::XORReduceAllMasked);
+                ShortVector256Tests::XORReduceMasked, ShortVector256Tests::XORReduceAllMasked);
     }
 
     static short ADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3878,7 +3972,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAll(short[] a) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3887,32 +3981,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                short v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::ADDReduce, Short256VectorTests::ADDReduceAll);
+                ShortVector256Tests::ADDReduce, ShortVector256Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = ADD_IDENTITY;
+
+        assertEquals((short) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id + x), x);
+                assertEquals((short) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3922,7 +4034,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3931,7 +4043,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3939,26 +4051,21 @@ public class Short256VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                short v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::ADDReduceMasked, Short256VectorTests::ADDReduceAllMasked);
+                ShortVector256Tests::ADDReduceMasked, ShortVector256Tests::ADDReduceAllMasked);
     }
 
     static short MULReduce(short[] a, int idx) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3967,7 +4074,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAll(short[] a) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3976,32 +4083,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MULReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void MULReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                short v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::MULReduce, Short256VectorTests::MULReduceAll);
+                ShortVector256Tests::MULReduce, ShortVector256Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MUL_IDENTITY;
+
+        assertEquals((short) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id * x), x);
+                assertEquals((short) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4011,7 +4136,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4020,34 +4145,29 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MULReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                short v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::MULReduceMasked, Short256VectorTests::MULReduceAllMasked);
+                ShortVector256Tests::MULReduceMasked, ShortVector256Tests::MULReduceAllMasked);
     }
 
     static short MINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.min(res, a[i]);
         }
@@ -4056,7 +4176,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduce(a, i));
         }
@@ -4065,32 +4185,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void MINReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                short v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::MINReduce, Short256VectorTests::MINReduceAll);
+                ShortVector256Tests::MINReduce, ShortVector256Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MIN_IDENTITY;
+
+        assertEquals((short) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.min(id, x), x);
+                assertEquals((short) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.min(res, a[i]);
@@ -4100,7 +4238,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4109,34 +4247,29 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                short v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::MINReduceMasked, Short256VectorTests::MINReduceAllMasked);
+                ShortVector256Tests::MINReduceMasked, ShortVector256Tests::MINReduceAllMasked);
     }
 
     static short MAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.max(res, a[i]);
         }
@@ -4145,7 +4278,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduce(a, i));
         }
@@ -4154,32 +4287,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void MAXReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                short v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::MAXReduce, Short256VectorTests::MAXReduceAll);
+                ShortVector256Tests::MAXReduce, ShortVector256Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MAX_IDENTITY;
+
+        assertEquals((short) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.max(id, x), x);
+                assertEquals((short) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.max(res, a[i]);
@@ -4189,7 +4340,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4198,34 +4349,29 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                short v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::MAXReduceMasked, Short256VectorTests::MAXReduceAllMasked);
+                ShortVector256Tests::MAXReduceMasked, ShortVector256Tests::MAXReduceAllMasked);
     }
 
     static short UMINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4234,7 +4380,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4243,32 +4389,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMINReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void UMINReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                short v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::UMINReduce, Short256VectorTests::UMINReduceAll);
+                ShortVector256Tests::UMINReduce, ShortVector256Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMIN_IDENTITY;
+
+        assertEquals((short) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.minUnsigned(id, x), x);
+                assertEquals((short) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static short UMINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.minUnsigned(res, a[i]);
@@ -4278,7 +4442,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4287,34 +4451,29 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMINReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                short v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::UMINReduceMasked, Short256VectorTests::UMINReduceAllMasked);
+                ShortVector256Tests::UMINReduceMasked, ShortVector256Tests::UMINReduceAllMasked);
     }
 
     static short UMAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4323,7 +4482,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4332,32 +4491,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMAXReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void UMAXReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                short v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::UMAXReduce, Short256VectorTests::UMAXReduceAll);
+                ShortVector256Tests::UMAXReduce, ShortVector256Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMAX_IDENTITY;
+
+        assertEquals((short) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((short) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static short UMAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.maxUnsigned(res, a[i]);
@@ -4367,7 +4544,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4376,34 +4553,29 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMAXReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                short v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::UMAXReduceMasked, Short256VectorTests::UMAXReduceAllMasked);
+                ShortVector256Tests::UMAXReduceMasked, ShortVector256Tests::UMAXReduceAllMasked);
     }
 
     static short FIRST_NONZEROReduce(short[] a, int idx) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4412,7 +4584,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAll(short[] a) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4421,32 +4593,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void FIRST_NONZEROReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void FIRST_NONZEROReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::FIRST_NONZEROReduce, Short256VectorTests::FIRST_NONZEROReduceAll);
+                ShortVector256Tests::FIRST_NONZEROReduce, ShortVector256Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static short FIRST_NONZEROReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4456,7 +4646,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAllMasked(short[] a, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4465,30 +4655,25 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::FIRST_NONZEROReduceMasked, Short256VectorTests::FIRST_NONZEROReduceAllMasked);
+                ShortVector256Tests::FIRST_NONZEROReduceMasked, ShortVector256Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4501,7 +4686,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueShort256VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueShortVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4512,7 +4697,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short256VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector256Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4525,7 +4710,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueShort256VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueShortVector256Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4536,11 +4721,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short256VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector256Tests::allTrue);
     }
 
     static short SUADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4549,7 +4734,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAll(short[] a) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4558,32 +4743,50 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingUnaryOpProvider")
-    static void SUADDReduceShort256VectorTests(IntFunction<short[]> fa) {
+    static void SUADDReduceShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                short v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short256VectorTests::SUADDReduce, Short256VectorTests::SUADDReduceAll);
+                ShortVector256Tests::SUADDReduce, ShortVector256Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = SUADD_IDENTITY;
+
+        assertEquals((short) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static short SUADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4593,7 +4796,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4601,7 +4804,7 @@ public class Short256VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "shortSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4609,26 +4812,21 @@ public class Short256VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                short v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::SUADDReduceMasked, Short256VectorTests::SUADDReduceAllMasked);
+                ShortVector256Tests::SUADDReduceMasked, ShortVector256Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void withShort256VectorTests(IntFunction<short []> fa, IntFunction<short []> fb) {
+    static void withShortVector256Tests(IntFunction<short []> fa, IntFunction<short []> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -4651,7 +4849,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_DEFAULTShort256VectorTests(IntFunction<short[]> fa) {
+    static void IS_DEFAULTShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4661,14 +4859,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShortVector256Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4681,7 +4879,7 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4692,7 +4890,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_NEGATIVEShort256VectorTests(IntFunction<short[]> fa) {
+    static void IS_NEGATIVEShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4702,14 +4900,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShortVector256Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4722,14 +4920,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4741,14 +4939,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4760,14 +4958,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LTShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4783,14 +4981,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GTShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GTShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4802,14 +5000,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GTShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GTShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4825,14 +5023,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4844,14 +5042,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4863,14 +5061,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void EQShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4886,14 +5084,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void NEShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void NEShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4905,14 +5103,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void NEShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void NEShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4928,14 +5126,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LEShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LEShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4947,14 +5145,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LEShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LEShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4970,14 +5168,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GEShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GEShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4989,14 +5187,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GEShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GEShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5012,14 +5210,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULTShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULTShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5031,14 +5229,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULTShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULTShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5054,14 +5252,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGTShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGTShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5073,14 +5271,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGTShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGTShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5096,14 +5294,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULEShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULEShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5115,14 +5313,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULEShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULEShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5138,14 +5336,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGEShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGEShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5157,14 +5355,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGEShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGEShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5180,14 +5378,14 @@ public class Short256VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5197,13 +5395,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5217,13 +5415,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector256TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5233,13 +5431,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5253,13 +5451,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5269,13 +5467,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5289,13 +5487,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector256TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5305,13 +5503,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort256VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector256TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5325,7 +5523,7 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
             }
         }
     }
@@ -5335,7 +5533,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5351,11 +5549,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short256VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ShortVector256Tests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
-    static void RearrangeShort256VectorTests(IntFunction<short[]> fa,
+    static void RearrangeShortVector256Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5372,7 +5570,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
-    static void RearrangeShort256VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void RearrangeShortVector256TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -5390,7 +5588,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void compressShort256VectorTests(IntFunction<short[]> fa,
+    static void compressShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5408,7 +5606,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void expandShort256VectorTests(IntFunction<short[]> fa,
+    static void expandShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5426,7 +5624,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void getShort256VectorTests(IntFunction<short[]> fa) {
+    static void getShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -5582,7 +5780,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastShort256VectorTests(IntFunction<short[]> fa) {
+    static void BroadcastShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5596,7 +5794,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZeroShort256VectorTests(IntFunction<short[]> fa) {
+    static void ZeroShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5606,7 +5804,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static short[] sliceUnary(short[] a, int origin, int idx) {
@@ -5621,7 +5819,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void sliceUnaryShort256VectorTests(IntFunction<short[]> fa) {
+    static void sliceUnaryShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5632,7 +5830,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short256VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector256Tests::sliceUnary);
     }
 
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
@@ -5649,7 +5847,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void sliceBinaryShort256VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void sliceBinaryShortVector256TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5662,7 +5860,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Short256VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ShortVector256Tests::sliceBinary);
     }
 
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
@@ -5679,7 +5877,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void sliceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void sliceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5696,7 +5894,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Short256VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ShortVector256Tests::slice);
     }
 
     static short[] unsliceUnary(short[] a, int origin, int idx) {
@@ -5713,7 +5911,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void unsliceUnaryShort256VectorTests(IntFunction<short[]> fa) {
+    static void unsliceUnaryShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5724,7 +5922,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short256VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector256Tests::unsliceUnary);
     }
 
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
@@ -5750,7 +5948,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void unsliceBinaryShort256VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void unsliceBinaryShortVector256TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5764,7 +5962,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Short256VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ShortVector256Tests::unsliceBinary);
     }
 
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5804,7 +6002,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void unsliceShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void unsliceShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5821,7 +6019,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Short256VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ShortVector256Tests::unslice);
     }
 
     static short BITWISE_BLEND(short a, short b, short c) {
@@ -5833,7 +6031,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5848,11 +6046,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5865,11 +6063,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ShortVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5887,11 +6085,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5902,11 +6100,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort256VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector256TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5917,11 +6115,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5932,11 +6130,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort256VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector256TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5947,11 +6145,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5966,11 +6164,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort256VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector256TestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort256VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector256TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector256Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort256VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector256TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6015,11 +6213,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short256VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector256Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort256VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector256TestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6033,7 +6231,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short256VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortVector256Tests::BITWISE_BLEND);
     }
 
     static short NEG(short a) {
@@ -6045,7 +6243,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NEGShort256VectorTests(IntFunction<short[]> fa) {
+    static void NEGShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6056,11 +6254,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::NEG);
+        assertArraysEquals(r, a, ShortVector256Tests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void negShort256VectorTests(IntFunction<short[]> fa) {
+    static void negShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6071,11 +6269,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::neg);
+        assertArraysEquals(r, a, ShortVector256Tests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NEGMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void NEGMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6089,7 +6287,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::NEG);
     }
 
     static short ABS(short a) {
@@ -6101,7 +6299,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ABSShort256VectorTests(IntFunction<short[]> fa) {
+    static void ABSShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6112,11 +6310,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::ABS);
+        assertArraysEquals(r, a, ShortVector256Tests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void absShort256VectorTests(IntFunction<short[]> fa) {
+    static void absShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6127,11 +6325,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::abs);
+        assertArraysEquals(r, a, ShortVector256Tests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ABSMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void ABSMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6145,7 +6343,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::ABS);
     }
 
     static short NOT(short a) {
@@ -6157,7 +6355,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NOTShort256VectorTests(IntFunction<short[]> fa) {
+    static void NOTShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6168,11 +6366,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::NOT);
+        assertArraysEquals(r, a, ShortVector256Tests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void notShort256VectorTests(IntFunction<short[]> fa) {
+    static void notShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6183,11 +6381,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::not);
+        assertArraysEquals(r, a, ShortVector256Tests::not);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NOTMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void NOTMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6201,7 +6399,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::NOT);
     }
 
     static short ZOMO(short a) {
@@ -6209,7 +6407,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZOMOShort256VectorTests(IntFunction<short[]> fa) {
+    static void ZOMOShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6220,11 +6418,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::ZOMO);
+        assertArraysEquals(r, a, ShortVector256Tests::ZOMO);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ZOMOMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void ZOMOMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6238,7 +6436,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::ZOMO);
     }
 
     static short BIT_COUNT(short a) {
@@ -6246,7 +6444,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BIT_COUNTShort256VectorTests(IntFunction<short[]> fa) {
+    static void BIT_COUNTShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6257,11 +6455,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ShortVector256Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void BIT_COUNTMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6275,7 +6473,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::BIT_COUNT);
     }
 
     static short TRAILING_ZEROS_COUNT(short a) {
@@ -6283,7 +6481,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTShort256VectorTests(IntFunction<short[]> fa) {
+    static void TRAILING_ZEROS_COUNTShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6294,11 +6492,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6312,7 +6510,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::TRAILING_ZEROS_COUNT);
     }
 
     static short LEADING_ZEROS_COUNT(short a) {
@@ -6320,7 +6518,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTShort256VectorTests(IntFunction<short[]> fa) {
+    static void LEADING_ZEROS_COUNTShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6331,11 +6529,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6349,7 +6547,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::LEADING_ZEROS_COUNT);
     }
 
     static short REVERSE(short a) {
@@ -6357,7 +6555,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSEShort256VectorTests(IntFunction<short[]> fa) {
+    static void REVERSEShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6368,11 +6566,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::REVERSE);
+        assertArraysEquals(r, a, ShortVector256Tests::REVERSE);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSEMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void REVERSEMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6386,7 +6584,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::REVERSE);
     }
 
     static short REVERSE_BYTES(short a) {
@@ -6394,7 +6592,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSE_BYTESShort256VectorTests(IntFunction<short[]> fa) {
+    static void REVERSE_BYTESShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6405,11 +6603,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ShortVector256Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedShort256VectorTests(IntFunction<short[]> fa,
+    static void REVERSE_BYTESMaskedShortVector256Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6423,7 +6621,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short256VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ShortVector256Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6431,7 +6629,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandShortVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6444,7 +6642,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::band);
+        assertArraysEquals(r, a, b, ShortVector256Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6452,7 +6650,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorShortVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6465,7 +6663,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::bor);
+        assertArraysEquals(r, a, b, ShortVector256Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6473,7 +6671,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorShortVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6486,7 +6684,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::bxor);
+        assertArraysEquals(r, a, b, ShortVector256Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6494,7 +6692,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotShortVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6507,7 +6705,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ShortVector256Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6515,7 +6713,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqShortVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6528,7 +6726,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short256VectorTests::beq);
+        assertArraysEquals(r, a, b, ShortVector256Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6536,7 +6734,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotShort256VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotShortVector256Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6547,7 +6745,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short256VectorTests::unot);
+        assertArraysEquals(r, a, ShortVector256Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6556,15 +6754,15 @@ public class Short256VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort256VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongShortVector256Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6578,7 +6776,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort256VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector256TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6588,13 +6786,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort256VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector256TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6604,13 +6802,13 @@ public class Short256VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toIntArrayShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toIntArrayShortVector256TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6621,7 +6819,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toLongArrayShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toLongArrayShortVector256TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6632,7 +6830,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toDoubleArrayShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toDoubleArrayShortVector256TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6643,7 +6841,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toStringShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toStringShortVector256TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6656,7 +6854,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void hashCodeShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void hashCodeShortVector256TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6689,7 +6887,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceLongShort256VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceLongShortVector256Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6705,7 +6903,7 @@ public class Short256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Short256VectorTests::ADDReduceLong, Short256VectorTests::ADDReduceAllLong);
+                ShortVector256Tests::ADDReduceLong, ShortVector256Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(short[] a, int idx, boolean[] mask) {
@@ -6728,7 +6926,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceLongShort256VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongShortVector256TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6746,11 +6944,11 @@ public class Short256VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Short256VectorTests::ADDReduceLongMasked, Short256VectorTests::ADDReduceAllLongMasked);
+                ShortVector256Tests::ADDReduceLongMasked, ShortVector256Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastLongShort256VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void BroadcastLongShortVector256TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -6761,7 +6959,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort256VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector256TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6775,12 +6973,12 @@ public class Short256VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short256VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector256Tests::blend);
     }
 
 
     @Test(dataProvider = "shortUnaryOpSelectFromProvider")
-    static void SelectFromShort256VectorTests(IntFunction<short[]> fa,
+    static void SelectFromShortVector256Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,short[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         short[] order = fs.apply(a.length, SPECIES.length());
@@ -6796,7 +6994,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorShort256VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SelectFromTwoVectorShortVector256Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] idx = fc.apply(SPECIES.length());
@@ -6814,7 +7012,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
-    static void SelectFromShort256VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void SelectFromShortVector256TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                            BiFunction<Integer,Integer,short[]> fs,
                                                            IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -6833,7 +7031,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousShort256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousShortVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6844,12 +7042,12 @@ public class Short256VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringShort256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringShortVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6863,7 +7061,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsShort256VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsShortVector256TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6872,12 +7070,12 @@ public class Short256VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsShort256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsShortVector256Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6887,13 +7085,13 @@ public class Short256VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeShortVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6915,7 +7113,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountShortVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6926,7 +7124,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short256VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ShortVector256Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6940,7 +7138,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueShortVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6951,7 +7149,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short256VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector256Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6965,7 +7163,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueShortVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6976,11 +7174,11 @@ public class Short256VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short256VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector256Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressShort256VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressShortVector256TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6990,7 +7188,7 @@ public class Short256VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7008,7 +7206,7 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeShort256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeShortVector256TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7016,13 +7214,13 @@ public class Short256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongShort256VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongShortVector256TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7030,7 +7228,7 @@ public class Short256VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7049,36 +7247,36 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundShort256VectorTestsSmokeTest(int length) {
+    static void loopBoundShortVector256TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongShort256VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongShortVector256TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeShort256VectorTestsSmokeTest() {
+    static void ElementSizeShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Short.SIZE);
+        assertEquals(elsize, Short.SIZE);
     }
 
     @Test
-    static void VectorShapeShort256VectorTestsSmokeTest() {
+    static void VectorShapeShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_256_BIT));
     }
 
     @Test
-    static void ShapeWithLanesShort256VectorTestsSmokeTest() {
+    static void ShapeWithLanesShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(short.class);
@@ -7086,32 +7284,32 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeShort256VectorTestsSmokeTest() {
+    static void ElementTypeShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementType() == short.class);
     }
 
     @Test
-    static void SpeciesElementSizeShort256VectorTestsSmokeTest() {
+    static void SpeciesElementSizeShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementSize() == Short.SIZE);
     }
 
     @Test
-    static void VectorTypeShort256VectorTestsSmokeTest() {
+    static void VectorTypeShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesShort256VectorTestsSmokeTest() {
+    static void WithLanesShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(short.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeShort256VectorTestsSmokeTest() {
+    static void WithShapeShortVector256TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7119,9 +7317,9 @@ public class Short256VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueShort256VectorTestsSmokeTest() {
+    static void MaskAllTrueShortVector256TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortVector512LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector512LoadStoreTests.java
index 7a273986bef..74e485e3391 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector512LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Short512VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ShortVector512LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ShortVector512LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_512;
 
@@ -61,14 +61,29 @@ public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -1114,11 +1129,11 @@ public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -1129,11 +1144,11 @@ public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
         }
     }
 
@@ -1149,7 +1164,7 @@ public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(short[] r, short[] a, int[] indexMap) {
@@ -1162,7 +1177,7 @@ public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Short512VectorTests.java b/test/jdk/jdk/incubator/vector/ShortVector512Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Short512VectorTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector512Tests.java
index d4568068b6a..69dc6d8019f 100644
--- a/test/jdk/jdk/incubator/vector/Short512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector512Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Short512VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ShortVector512Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Short512VectorTests extends AbstractVectorTest {
+public class ShortVector512Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(short actual, short expected, short delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(short actual, short expected, short delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final short CONST_SHIFT = Short.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final short ADD_IDENTITY = (short)0;
+    private static final short AND_IDENTITY = (short)-1;
+    private static final short FIRST_NONZERO_IDENTITY = (short)0;
+    private static final short MAX_IDENTITY = Short.MIN_VALUE;
+    private static final short MIN_IDENTITY = Short.MAX_VALUE;
+    private static final short MUL_IDENTITY = (short)1;
+    private static final short OR_IDENTITY = (short)0;
+    private static final short SUADD_IDENTITY = (short)0;
+    private static final short UMAX_IDENTITY = (short)0;   // Minimum unsigned value
+    private static final short UMIN_IDENTITY = (short)-1;  // Maximum unsigned value
+    private static final short XOR_IDENTITY = (short)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
     static void assertArraysStrictlyEquals(short[] r, short[] a) {
@@ -84,10 +139,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Short512VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Short512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Short512VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Short512VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Short512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (short)0);
+                    assertEquals(r[i + k], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Short512VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (short)0);
+                        assertEquals(r[i + j], (short)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Short512VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Short512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Short512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Short512VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Short512VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1565,7 +1620,7 @@ public class Short512VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ShortVector a = io.add((short)1); //[1,2]
         ShortVector b = a.neg();  //[-1,-2]
         short[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1580,19 +1635,19 @@ public class Short512VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Short> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Short> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ShortVector uab0 = zab0.rearrange(unz0,zab1);
         ShortVector uab1 = zab0.rearrange(unz1,zab1);
         short[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1607,7 +1662,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1641,7 +1696,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1654,7 +1709,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::ADD);
+        assertArraysEquals(r, a, b, ShortVector512Tests::ADD);
     }
 
     static short add(short a, short b) {
@@ -1662,7 +1717,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1673,11 +1728,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::add);
+        assertArraysEquals(r, a, b, ShortVector512Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1693,11 +1748,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1711,7 +1766,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::add);
     }
 
     static short SUB(short a, short b) {
@@ -1719,7 +1774,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void SUBShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUBShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1732,7 +1787,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::SUB);
+        assertArraysEquals(r, a, b, ShortVector512Tests::SUB);
     }
 
     static short sub(short a, short b) {
@@ -1740,7 +1795,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1751,11 +1806,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::sub);
+        assertArraysEquals(r, a, b, ShortVector512Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void SUBShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUBShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1771,11 +1826,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1789,7 +1844,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::sub);
     }
 
     static short MUL(short a, short b) {
@@ -1797,7 +1852,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MULShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MULShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1810,7 +1865,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::MUL);
+        assertArraysEquals(r, a, b, ShortVector512Tests::MUL);
     }
 
     static short mul(short a, short b) {
@@ -1818,7 +1873,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1829,11 +1884,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::mul);
+        assertArraysEquals(r, a, b, ShortVector512Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void MULShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void MULShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1849,11 +1904,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1867,7 +1922,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::mul);
     }
 
     static short DIV(short a, short b) {
@@ -1875,7 +1930,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void DIVShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void DIVShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1890,7 +1945,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::DIV);
+        assertArraysEquals(r, a, b, ShortVector512Tests::DIV);
     }
 
     static short div(short a, short b) {
@@ -1898,7 +1953,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1913,11 +1968,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::div);
+        assertArraysEquals(r, a, b, ShortVector512Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void DIVShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void DIVShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1990,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1957,7 +2012,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1965,7 +2020,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void FIRST_NONZEROShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void FIRST_NONZEROShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1978,11 +2033,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ShortVector512Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void FIRST_NONZEROShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void FIRST_NONZEROShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1998,7 +2053,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -2006,7 +2061,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2019,7 +2074,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::AND);
+        assertArraysEquals(r, a, b, ShortVector512Tests::AND);
     }
 
     static short and(short a, short b) {
@@ -2027,7 +2082,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2038,11 +2093,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::and);
+        assertArraysEquals(r, a, b, ShortVector512Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2058,7 +2113,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::AND);
     }
 
     static short AND_NOT(short a, short b) {
@@ -2066,7 +2121,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void AND_NOTShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void AND_NOTShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2079,11 +2134,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ShortVector512Tests::AND_NOT);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void AND_NOTShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void AND_NOTShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2099,7 +2154,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::AND_NOT);
     }
 
     static short OR(short a, short b) {
@@ -2107,7 +2162,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2120,7 +2175,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::OR);
+        assertArraysEquals(r, a, b, ShortVector512Tests::OR);
     }
 
     static short or(short a, short b) {
@@ -2128,7 +2183,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2139,11 +2194,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::or);
+        assertArraysEquals(r, a, b, ShortVector512Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2159,7 +2214,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::OR);
     }
 
     static short XOR(short a, short b) {
@@ -2167,7 +2222,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void XORShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void XORShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2180,11 +2235,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::XOR);
+        assertArraysEquals(r, a, b, ShortVector512Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void XORShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void XORShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2200,11 +2255,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2269,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2231,11 +2286,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector512Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2245,11 +2300,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2262,11 +2317,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector512Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2276,11 +2331,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2293,11 +2348,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector512Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2309,11 +2364,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2328,11 +2383,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector512Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2342,11 +2397,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2356,11 +2411,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2373,11 +2428,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector512Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2387,11 +2442,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2401,11 +2456,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2418,11 +2473,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short512VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector512Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector512TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2432,11 +2487,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector512Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2449,11 +2504,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short512VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector512Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector512TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2463,11 +2518,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector512Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort512VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector512TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2480,7 +2535,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short512VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector512Tests::ADD);
     }
 
     static short LSHL(short a, short b) {
@@ -2488,7 +2543,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2501,11 +2556,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ShortVector512Tests::LSHL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2521,7 +2576,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::LSHL);
     }
 
     static short ASHR(short a, short b) {
@@ -2529,7 +2584,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2542,11 +2597,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ShortVector512Tests::ASHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2562,7 +2617,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::ASHR);
     }
 
     static short LSHR(short a, short b) {
@@ -2570,7 +2625,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2583,11 +2638,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ShortVector512Tests::LSHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2603,7 +2658,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::LSHR);
     }
 
     static short LSHL_unary(short a, short b) {
@@ -2611,7 +2666,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort512VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector512TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2623,11 +2678,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector512Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort512VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector512TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2642,7 +2697,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector512Tests::LSHL_unary);
     }
 
     static short LSHR_unary(short a, short b) {
@@ -2650,7 +2705,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort512VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector512TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2662,11 +2717,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector512Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort512VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector512TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2681,7 +2736,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector512Tests::LSHR_unary);
     }
 
     static short ASHR_unary(short a, short b) {
@@ -2689,7 +2744,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort512VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector512TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2701,11 +2756,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector512Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort512VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector512TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2720,7 +2775,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector512Tests::ASHR_unary);
     }
 
     static short ROR(short a, short b) {
@@ -2728,7 +2783,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2741,11 +2796,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::ROR);
+        assertArraysEquals(r, a, b, ShortVector512Tests::ROR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2761,7 +2816,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::ROR);
     }
 
     static short ROL(short a, short b) {
@@ -2769,7 +2824,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2782,11 +2837,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::ROL);
+        assertArraysEquals(r, a, b, ShortVector512Tests::ROL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2802,7 +2857,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::ROL);
     }
 
     static short ROR_unary(short a, short b) {
@@ -2810,7 +2865,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort512VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector512TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2822,11 +2877,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector512Tests::ROR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort512VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector512TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2841,7 +2896,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector512Tests::ROR_unary);
     }
 
     static short ROL_unary(short a, short b) {
@@ -2849,7 +2904,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort512VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector512TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2861,11 +2916,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector512Tests::ROL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort512VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector512TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2880,14 +2935,14 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short512VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector512Tests::ROL_unary);
     }
     static short LSHR_binary_const(short a) {
         return (short)(((a & 0xFFFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHRShort512VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHRShortVector512TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2898,11 +2953,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector512Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHRShort512VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHRShortVector512TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2916,7 +2971,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short512VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector512Tests::LSHR_binary_const);
     }
 
     static short LSHL_binary_const(short a) {
@@ -2924,7 +2979,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHLShort512VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHLShortVector512TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2935,11 +2990,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector512Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHLShort512VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHLShortVector512TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2953,7 +3008,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short512VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector512Tests::LSHL_binary_const);
     }
 
     static short ASHR_binary_const(short a) {
@@ -2961,7 +3016,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ASHRShort512VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ASHRShortVector512TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2972,11 +3027,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector512Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ASHRShort512VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ASHRShortVector512TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2990,7 +3045,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short512VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector512Tests::ASHR_binary_const);
     }
 
     static short ROR_binary_const(short a) {
@@ -2998,7 +3053,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void RORShort512VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void RORShortVector512TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3009,11 +3064,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector512Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void RORShort512VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void RORShortVector512TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3027,7 +3082,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short512VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector512Tests::ROR_binary_const);
     }
 
     static short ROL_binary_const(short a) {
@@ -3035,7 +3090,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ROLShort512VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ROLShortVector512TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3046,11 +3101,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector512Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ROLShort512VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ROLShortVector512TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3064,14 +3119,14 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short512VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector512Tests::ROL_binary_const);
     }
 
 
     static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MINShortVector512TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3082,13 +3137,13 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short512VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, ShortVector512Tests::MIN);
     }
 
     static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void minShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void minShortVector512TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3099,13 +3154,13 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short512VectorTests::min);
+        assertArraysEquals(r, a, (short)10, ShortVector512Tests::min);
     }
 
     static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINShort512VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINShortVector512TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3118,13 +3173,13 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short512VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector512Tests::MIN);
     }
 
     static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MAXShortVector512TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short512VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, ShortVector512Tests::MAX);
     }
 
     static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void maxShort512VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void maxShortVector512TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short512VectorTests::max);
+        assertArraysEquals(r, a, (short)10, ShortVector512Tests::max);
     }
 
     static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXShort512VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXShortVector512TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,7 +3226,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short512VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector512Tests::MAX);
     }
 
     static short MIN(short a, short b) {
@@ -3179,7 +3234,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3192,7 +3247,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::MIN);
+        assertArraysEquals(r, a, b, ShortVector512Tests::MIN);
     }
 
     static short min(short a, short b) {
@@ -3200,7 +3255,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3211,7 +3266,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::min);
+        assertArraysEquals(r, a, b, ShortVector512Tests::min);
     }
 
     static short MAX(short a, short b) {
@@ -3219,7 +3274,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3232,7 +3287,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::MAX);
+        assertArraysEquals(r, a, b, ShortVector512Tests::MAX);
     }
 
     static short max(short a, short b) {
@@ -3240,7 +3295,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3251,7 +3306,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::max);
+        assertArraysEquals(r, a, b, ShortVector512Tests::max);
     }
 
     static short UMIN(short a, short b) {
@@ -3259,7 +3314,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMINShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMINShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3272,11 +3327,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ShortVector512Tests::UMIN);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMINShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMINShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3292,7 +3347,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::UMIN);
     }
 
     static short UMAX(short a, short b) {
@@ -3300,7 +3355,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMAXShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMAXShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3313,11 +3368,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ShortVector512Tests::UMAX);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMAXShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMAXShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3333,7 +3388,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::UMAX);
     }
 
     static short SADD(short a, short b) {
@@ -3341,7 +3396,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SADDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SADDShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3354,11 +3409,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::SADD);
+        assertArraysEquals(r, a, b, ShortVector512Tests::SADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SADDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SADDShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3374,7 +3429,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::SADD);
     }
 
     static short SSUB(short a, short b) {
@@ -3382,7 +3437,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SSUBShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SSUBShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3395,11 +3450,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ShortVector512Tests::SSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SSUBShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SSUBShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3415,7 +3470,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::SSUB);
     }
 
     static short SUADD(short a, short b) {
@@ -3423,7 +3478,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUADDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUADDShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3436,11 +3491,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ShortVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUADDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3456,7 +3511,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::SUADD);
     }
 
     static short SUSUB(short a, short b) {
@@ -3464,7 +3519,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUSUBShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUSUBShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3477,11 +3532,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ShortVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUSUBShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUSUBShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3497,11 +3552,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3566,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3525,11 +3580,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3539,11 +3594,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3553,10 +3608,10 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short512VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ShortVector512Tests::max);
     }
     @Test(dataProvider = "shortSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SUADDAssocShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -3573,11 +3628,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Short512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ShortVector512Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDAssocShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                      IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3598,11 +3653,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Short512VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ShortVector512Tests::SUADD);
     }
 
     static short ANDReduce(short[] a, int idx) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3611,7 +3666,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAll(short[] a) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3620,32 +3675,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ANDReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void ANDReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                short v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::ANDReduce, Short512VectorTests::ANDReduceAll);
+                ShortVector512Tests::ANDReduce, ShortVector512Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = AND_IDENTITY;
+
+        assertEquals((short) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id & x), x);
+                assertEquals((short) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static short ANDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3655,7 +3728,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3664,34 +3737,29 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ANDReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                short v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::ANDReduceMasked, Short512VectorTests::ANDReduceAllMasked);
+                ShortVector512Tests::ANDReduceMasked, ShortVector512Tests::ANDReduceAllMasked);
     }
 
     static short ORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3700,7 +3768,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAll(short[] a) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3709,32 +3777,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ORReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void ORReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                short v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::ORReduce, Short512VectorTests::ORReduceAll);
+                ShortVector512Tests::ORReduce, ShortVector512Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = OR_IDENTITY;
+
+        assertEquals((short) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id | x), x);
+                assertEquals((short) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static short ORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3744,7 +3830,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3753,7 +3839,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ORReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3761,26 +3847,21 @@ public class Short512VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                short v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::ORReduceMasked, Short512VectorTests::ORReduceAllMasked);
+                ShortVector512Tests::ORReduceMasked, ShortVector512Tests::ORReduceAllMasked);
     }
 
     static short XORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3789,7 +3870,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAll(short[] a) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3798,32 +3879,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void XORReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void XORReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                short v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::XORReduce, Short512VectorTests::XORReduceAll);
+                ShortVector512Tests::XORReduce, ShortVector512Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = XOR_IDENTITY;
+
+        assertEquals((short) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id ^ x), x);
+                assertEquals((short) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static short XORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3833,7 +3932,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3842,7 +3941,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void XORReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3850,26 +3949,21 @@ public class Short512VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                short v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::XORReduceMasked, Short512VectorTests::XORReduceAllMasked);
+                ShortVector512Tests::XORReduceMasked, ShortVector512Tests::XORReduceAllMasked);
     }
 
     static short ADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3878,7 +3972,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAll(short[] a) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3887,32 +3981,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                short v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::ADDReduce, Short512VectorTests::ADDReduceAll);
+                ShortVector512Tests::ADDReduce, ShortVector512Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = ADD_IDENTITY;
+
+        assertEquals((short) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id + x), x);
+                assertEquals((short) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3922,7 +4034,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3931,7 +4043,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3939,26 +4051,21 @@ public class Short512VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                short v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::ADDReduceMasked, Short512VectorTests::ADDReduceAllMasked);
+                ShortVector512Tests::ADDReduceMasked, ShortVector512Tests::ADDReduceAllMasked);
     }
 
     static short MULReduce(short[] a, int idx) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3967,7 +4074,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAll(short[] a) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3976,32 +4083,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MULReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void MULReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                short v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::MULReduce, Short512VectorTests::MULReduceAll);
+                ShortVector512Tests::MULReduce, ShortVector512Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MUL_IDENTITY;
+
+        assertEquals((short) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id * x), x);
+                assertEquals((short) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4011,7 +4136,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4020,34 +4145,29 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MULReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                short v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::MULReduceMasked, Short512VectorTests::MULReduceAllMasked);
+                ShortVector512Tests::MULReduceMasked, ShortVector512Tests::MULReduceAllMasked);
     }
 
     static short MINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.min(res, a[i]);
         }
@@ -4056,7 +4176,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduce(a, i));
         }
@@ -4065,32 +4185,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void MINReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                short v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::MINReduce, Short512VectorTests::MINReduceAll);
+                ShortVector512Tests::MINReduce, ShortVector512Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MIN_IDENTITY;
+
+        assertEquals((short) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.min(id, x), x);
+                assertEquals((short) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.min(res, a[i]);
@@ -4100,7 +4238,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4109,34 +4247,29 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                short v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::MINReduceMasked, Short512VectorTests::MINReduceAllMasked);
+                ShortVector512Tests::MINReduceMasked, ShortVector512Tests::MINReduceAllMasked);
     }
 
     static short MAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.max(res, a[i]);
         }
@@ -4145,7 +4278,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduce(a, i));
         }
@@ -4154,32 +4287,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void MAXReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                short v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::MAXReduce, Short512VectorTests::MAXReduceAll);
+                ShortVector512Tests::MAXReduce, ShortVector512Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MAX_IDENTITY;
+
+        assertEquals((short) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.max(id, x), x);
+                assertEquals((short) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.max(res, a[i]);
@@ -4189,7 +4340,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4198,34 +4349,29 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                short v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::MAXReduceMasked, Short512VectorTests::MAXReduceAllMasked);
+                ShortVector512Tests::MAXReduceMasked, ShortVector512Tests::MAXReduceAllMasked);
     }
 
     static short UMINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4234,7 +4380,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4243,32 +4389,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMINReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void UMINReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                short v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::UMINReduce, Short512VectorTests::UMINReduceAll);
+                ShortVector512Tests::UMINReduce, ShortVector512Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMIN_IDENTITY;
+
+        assertEquals((short) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.minUnsigned(id, x), x);
+                assertEquals((short) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static short UMINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.minUnsigned(res, a[i]);
@@ -4278,7 +4442,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4287,34 +4451,29 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMINReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                short v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::UMINReduceMasked, Short512VectorTests::UMINReduceAllMasked);
+                ShortVector512Tests::UMINReduceMasked, ShortVector512Tests::UMINReduceAllMasked);
     }
 
     static short UMAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4323,7 +4482,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4332,32 +4491,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMAXReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void UMAXReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                short v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::UMAXReduce, Short512VectorTests::UMAXReduceAll);
+                ShortVector512Tests::UMAXReduce, ShortVector512Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMAX_IDENTITY;
+
+        assertEquals((short) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((short) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static short UMAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.maxUnsigned(res, a[i]);
@@ -4367,7 +4544,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4376,34 +4553,29 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMAXReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                short v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::UMAXReduceMasked, Short512VectorTests::UMAXReduceAllMasked);
+                ShortVector512Tests::UMAXReduceMasked, ShortVector512Tests::UMAXReduceAllMasked);
     }
 
     static short FIRST_NONZEROReduce(short[] a, int idx) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4412,7 +4584,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAll(short[] a) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4421,32 +4593,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void FIRST_NONZEROReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void FIRST_NONZEROReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::FIRST_NONZEROReduce, Short512VectorTests::FIRST_NONZEROReduceAll);
+                ShortVector512Tests::FIRST_NONZEROReduce, ShortVector512Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static short FIRST_NONZEROReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4456,7 +4646,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAllMasked(short[] a, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4465,30 +4655,25 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::FIRST_NONZEROReduceMasked, Short512VectorTests::FIRST_NONZEROReduceAllMasked);
+                ShortVector512Tests::FIRST_NONZEROReduceMasked, ShortVector512Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4501,7 +4686,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueShort512VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueShortVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4512,7 +4697,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short512VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector512Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4525,7 +4710,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueShort512VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueShortVector512Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4536,11 +4721,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short512VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector512Tests::allTrue);
     }
 
     static short SUADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4549,7 +4734,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAll(short[] a) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4558,32 +4743,50 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingUnaryOpProvider")
-    static void SUADDReduceShort512VectorTests(IntFunction<short[]> fa) {
+    static void SUADDReduceShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                short v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short512VectorTests::SUADDReduce, Short512VectorTests::SUADDReduceAll);
+                ShortVector512Tests::SUADDReduce, ShortVector512Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = SUADD_IDENTITY;
+
+        assertEquals((short) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static short SUADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4593,7 +4796,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4601,7 +4804,7 @@ public class Short512VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "shortSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4609,26 +4812,21 @@ public class Short512VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                short v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::SUADDReduceMasked, Short512VectorTests::SUADDReduceAllMasked);
+                ShortVector512Tests::SUADDReduceMasked, ShortVector512Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void withShort512VectorTests(IntFunction<short []> fa, IntFunction<short []> fb) {
+    static void withShortVector512Tests(IntFunction<short []> fa, IntFunction<short []> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -4651,7 +4849,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_DEFAULTShort512VectorTests(IntFunction<short[]> fa) {
+    static void IS_DEFAULTShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4661,14 +4859,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShortVector512Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4681,7 +4879,7 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4692,7 +4890,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_NEGATIVEShort512VectorTests(IntFunction<short[]> fa) {
+    static void IS_NEGATIVEShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4702,14 +4900,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShortVector512Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4722,14 +4920,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4741,14 +4939,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4760,14 +4958,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LTShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4783,14 +4981,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GTShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GTShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4802,14 +5000,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GTShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GTShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4825,14 +5023,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4844,14 +5042,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4863,14 +5061,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void EQShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4886,14 +5084,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void NEShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void NEShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4905,14 +5103,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void NEShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void NEShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4928,14 +5126,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LEShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LEShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4947,14 +5145,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LEShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LEShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4970,14 +5168,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GEShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GEShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4989,14 +5187,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GEShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GEShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5012,14 +5210,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULTShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULTShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5031,14 +5229,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULTShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULTShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5054,14 +5252,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGTShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGTShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5073,14 +5271,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGTShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGTShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5096,14 +5294,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULEShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULEShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5115,14 +5313,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULEShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULEShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5138,14 +5336,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGEShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGEShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5157,14 +5355,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGEShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGEShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5180,14 +5378,14 @@ public class Short512VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5197,13 +5395,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5217,13 +5415,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector512TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5233,13 +5431,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5253,13 +5451,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5269,13 +5467,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5289,13 +5487,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector512TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5305,13 +5503,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort512VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector512TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5325,7 +5523,7 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
             }
         }
     }
@@ -5335,7 +5533,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5351,11 +5549,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short512VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ShortVector512Tests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
-    static void RearrangeShort512VectorTests(IntFunction<short[]> fa,
+    static void RearrangeShortVector512Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5372,7 +5570,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
-    static void RearrangeShort512VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void RearrangeShortVector512TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -5390,7 +5588,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void compressShort512VectorTests(IntFunction<short[]> fa,
+    static void compressShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5408,7 +5606,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void expandShort512VectorTests(IntFunction<short[]> fa,
+    static void expandShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5426,7 +5624,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void getShort512VectorTests(IntFunction<short[]> fa) {
+    static void getShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -5582,7 +5780,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastShort512VectorTests(IntFunction<short[]> fa) {
+    static void BroadcastShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5596,7 +5794,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZeroShort512VectorTests(IntFunction<short[]> fa) {
+    static void ZeroShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5606,7 +5804,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static short[] sliceUnary(short[] a, int origin, int idx) {
@@ -5621,7 +5819,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void sliceUnaryShort512VectorTests(IntFunction<short[]> fa) {
+    static void sliceUnaryShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5632,7 +5830,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short512VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector512Tests::sliceUnary);
     }
 
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
@@ -5649,7 +5847,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void sliceBinaryShort512VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void sliceBinaryShortVector512TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5662,7 +5860,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Short512VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ShortVector512Tests::sliceBinary);
     }
 
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
@@ -5679,7 +5877,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void sliceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void sliceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5696,7 +5894,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Short512VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ShortVector512Tests::slice);
     }
 
     static short[] unsliceUnary(short[] a, int origin, int idx) {
@@ -5713,7 +5911,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void unsliceUnaryShort512VectorTests(IntFunction<short[]> fa) {
+    static void unsliceUnaryShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5724,7 +5922,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short512VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector512Tests::unsliceUnary);
     }
 
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
@@ -5750,7 +5948,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void unsliceBinaryShort512VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void unsliceBinaryShortVector512TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5764,7 +5962,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Short512VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ShortVector512Tests::unsliceBinary);
     }
 
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5804,7 +6002,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void unsliceShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void unsliceShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5821,7 +6019,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Short512VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ShortVector512Tests::unslice);
     }
 
     static short BITWISE_BLEND(short a, short b, short c) {
@@ -5833,7 +6031,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5848,11 +6046,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5865,11 +6063,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ShortVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5887,11 +6085,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5902,11 +6100,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort512VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector512TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5917,11 +6115,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5932,11 +6130,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort512VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector512TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5947,11 +6145,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5966,11 +6164,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort512VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector512TestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort512VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector512TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector512Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort512VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector512TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6015,11 +6213,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short512VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector512Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort512VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector512TestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6033,7 +6231,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short512VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortVector512Tests::BITWISE_BLEND);
     }
 
     static short NEG(short a) {
@@ -6045,7 +6243,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NEGShort512VectorTests(IntFunction<short[]> fa) {
+    static void NEGShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6056,11 +6254,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::NEG);
+        assertArraysEquals(r, a, ShortVector512Tests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void negShort512VectorTests(IntFunction<short[]> fa) {
+    static void negShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6071,11 +6269,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::neg);
+        assertArraysEquals(r, a, ShortVector512Tests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NEGMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void NEGMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6089,7 +6287,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::NEG);
     }
 
     static short ABS(short a) {
@@ -6101,7 +6299,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ABSShort512VectorTests(IntFunction<short[]> fa) {
+    static void ABSShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6112,11 +6310,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::ABS);
+        assertArraysEquals(r, a, ShortVector512Tests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void absShort512VectorTests(IntFunction<short[]> fa) {
+    static void absShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6127,11 +6325,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::abs);
+        assertArraysEquals(r, a, ShortVector512Tests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ABSMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void ABSMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6145,7 +6343,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::ABS);
     }
 
     static short NOT(short a) {
@@ -6157,7 +6355,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NOTShort512VectorTests(IntFunction<short[]> fa) {
+    static void NOTShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6168,11 +6366,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::NOT);
+        assertArraysEquals(r, a, ShortVector512Tests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void notShort512VectorTests(IntFunction<short[]> fa) {
+    static void notShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6183,11 +6381,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::not);
+        assertArraysEquals(r, a, ShortVector512Tests::not);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NOTMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void NOTMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6201,7 +6399,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::NOT);
     }
 
     static short ZOMO(short a) {
@@ -6209,7 +6407,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZOMOShort512VectorTests(IntFunction<short[]> fa) {
+    static void ZOMOShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6220,11 +6418,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::ZOMO);
+        assertArraysEquals(r, a, ShortVector512Tests::ZOMO);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ZOMOMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void ZOMOMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6238,7 +6436,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::ZOMO);
     }
 
     static short BIT_COUNT(short a) {
@@ -6246,7 +6444,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BIT_COUNTShort512VectorTests(IntFunction<short[]> fa) {
+    static void BIT_COUNTShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6257,11 +6455,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ShortVector512Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void BIT_COUNTMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6275,7 +6473,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::BIT_COUNT);
     }
 
     static short TRAILING_ZEROS_COUNT(short a) {
@@ -6283,7 +6481,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTShort512VectorTests(IntFunction<short[]> fa) {
+    static void TRAILING_ZEROS_COUNTShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6294,11 +6492,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6312,7 +6510,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::TRAILING_ZEROS_COUNT);
     }
 
     static short LEADING_ZEROS_COUNT(short a) {
@@ -6320,7 +6518,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTShort512VectorTests(IntFunction<short[]> fa) {
+    static void LEADING_ZEROS_COUNTShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6331,11 +6529,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6349,7 +6547,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::LEADING_ZEROS_COUNT);
     }
 
     static short REVERSE(short a) {
@@ -6357,7 +6555,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSEShort512VectorTests(IntFunction<short[]> fa) {
+    static void REVERSEShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6368,11 +6566,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::REVERSE);
+        assertArraysEquals(r, a, ShortVector512Tests::REVERSE);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSEMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void REVERSEMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6386,7 +6584,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::REVERSE);
     }
 
     static short REVERSE_BYTES(short a) {
@@ -6394,7 +6592,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSE_BYTESShort512VectorTests(IntFunction<short[]> fa) {
+    static void REVERSE_BYTESShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6405,11 +6603,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ShortVector512Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedShort512VectorTests(IntFunction<short[]> fa,
+    static void REVERSE_BYTESMaskedShortVector512Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6423,7 +6621,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short512VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ShortVector512Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6431,7 +6629,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandShortVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6444,7 +6642,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::band);
+        assertArraysEquals(r, a, b, ShortVector512Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6452,7 +6650,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorShortVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6465,7 +6663,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::bor);
+        assertArraysEquals(r, a, b, ShortVector512Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6473,7 +6671,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorShortVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6486,7 +6684,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::bxor);
+        assertArraysEquals(r, a, b, ShortVector512Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6494,7 +6692,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotShortVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6507,7 +6705,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ShortVector512Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6515,7 +6713,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqShortVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6528,7 +6726,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short512VectorTests::beq);
+        assertArraysEquals(r, a, b, ShortVector512Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6536,7 +6734,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotShort512VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotShortVector512Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6547,7 +6745,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short512VectorTests::unot);
+        assertArraysEquals(r, a, ShortVector512Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6556,15 +6754,15 @@ public class Short512VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort512VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongShortVector512Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6578,7 +6776,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort512VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector512TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6588,13 +6786,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort512VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector512TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6604,13 +6802,13 @@ public class Short512VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toIntArrayShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toIntArrayShortVector512TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6621,7 +6819,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toLongArrayShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toLongArrayShortVector512TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6632,7 +6830,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toDoubleArrayShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toDoubleArrayShortVector512TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6643,7 +6841,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toStringShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toStringShortVector512TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6656,7 +6854,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void hashCodeShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void hashCodeShortVector512TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6689,7 +6887,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceLongShort512VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceLongShortVector512Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6705,7 +6903,7 @@ public class Short512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Short512VectorTests::ADDReduceLong, Short512VectorTests::ADDReduceAllLong);
+                ShortVector512Tests::ADDReduceLong, ShortVector512Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(short[] a, int idx, boolean[] mask) {
@@ -6728,7 +6926,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceLongShort512VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongShortVector512TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6746,11 +6944,11 @@ public class Short512VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Short512VectorTests::ADDReduceLongMasked, Short512VectorTests::ADDReduceAllLongMasked);
+                ShortVector512Tests::ADDReduceLongMasked, ShortVector512Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastLongShort512VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void BroadcastLongShortVector512TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -6761,7 +6959,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort512VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector512TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6775,12 +6973,12 @@ public class Short512VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short512VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector512Tests::blend);
     }
 
 
     @Test(dataProvider = "shortUnaryOpSelectFromProvider")
-    static void SelectFromShort512VectorTests(IntFunction<short[]> fa,
+    static void SelectFromShortVector512Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,short[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         short[] order = fs.apply(a.length, SPECIES.length());
@@ -6796,7 +6994,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorShort512VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SelectFromTwoVectorShortVector512Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] idx = fc.apply(SPECIES.length());
@@ -6814,7 +7012,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
-    static void SelectFromShort512VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void SelectFromShortVector512TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                            BiFunction<Integer,Integer,short[]> fs,
                                                            IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -6833,7 +7031,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousShort512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousShortVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6844,12 +7042,12 @@ public class Short512VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringShort512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringShortVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6863,7 +7061,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsShort512VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsShortVector512TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6872,12 +7070,12 @@ public class Short512VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsShort512VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsShortVector512Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6887,13 +7085,13 @@ public class Short512VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeShortVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6915,7 +7113,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountShortVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6926,7 +7124,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short512VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ShortVector512Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6940,7 +7138,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueShortVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6951,7 +7149,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short512VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector512Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6965,7 +7163,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueShortVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6976,11 +7174,11 @@ public class Short512VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short512VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector512Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressShort512VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressShortVector512TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6990,7 +7188,7 @@ public class Short512VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7008,7 +7206,7 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeShort512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeShortVector512TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7016,13 +7214,13 @@ public class Short512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongShort512VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongShortVector512TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7030,7 +7228,7 @@ public class Short512VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7049,36 +7247,36 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundShort512VectorTestsSmokeTest(int length) {
+    static void loopBoundShortVector512TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongShort512VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongShortVector512TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeShort512VectorTestsSmokeTest() {
+    static void ElementSizeShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Short.SIZE);
+        assertEquals(elsize, Short.SIZE);
     }
 
     @Test
-    static void VectorShapeShort512VectorTestsSmokeTest() {
+    static void VectorShapeShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_512_BIT));
     }
 
     @Test
-    static void ShapeWithLanesShort512VectorTestsSmokeTest() {
+    static void ShapeWithLanesShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(short.class);
@@ -7086,32 +7284,32 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeShort512VectorTestsSmokeTest() {
+    static void ElementTypeShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementType() == short.class);
     }
 
     @Test
-    static void SpeciesElementSizeShort512VectorTestsSmokeTest() {
+    static void SpeciesElementSizeShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementSize() == Short.SIZE);
     }
 
     @Test
-    static void VectorTypeShort512VectorTestsSmokeTest() {
+    static void VectorTypeShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesShort512VectorTestsSmokeTest() {
+    static void WithLanesShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(short.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeShort512VectorTestsSmokeTest() {
+    static void WithShapeShortVector512TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7119,9 +7317,9 @@ public class Short512VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueShort512VectorTestsSmokeTest() {
+    static void MaskAllTrueShortVector512TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortVector64LoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector64LoadStoreTests.java
index 952d71c80a6..d48c781886c 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector64LoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
- * @run testng/othervm -XX:-TieredCompilation Short64VectorLoadStoreTests
+ * @run testng/othervm -XX:-TieredCompilation ShortVector64LoadStoreTests
  *
  */
 
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ShortVector64LoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_64;
 
@@ -61,14 +61,29 @@ public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
@@ -322,7 +337,7 @@ public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -1114,11 +1129,11 @@ public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -1129,11 +1144,11 @@ public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
         }
     }
 
@@ -1149,7 +1164,7 @@ public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(short[] r, short[] a, int[] indexMap) {
@@ -1162,7 +1177,7 @@ public class Short64VectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/Short64VectorTests.java b/test/jdk/jdk/incubator/vector/ShortVector64Tests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/Short64VectorTests.java
rename to test/jdk/jdk/incubator/vector/ShortVector64Tests.java
index 83d5cfd18e8..dd9f7125853 100644
--- a/test/jdk/jdk/incubator/vector/Short64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVector64Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation Short64VectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ShortVector64Tests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,16 +56,71 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class Short64VectorTests extends AbstractVectorTest {
+public class ShortVector64Tests extends AbstractVectorTest {
 
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_64;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(short actual, short expected, short delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(short actual, short expected, short delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 
     private static final short CONST_SHIFT = Short.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final short ADD_IDENTITY = (short)0;
+    private static final short AND_IDENTITY = (short)-1;
+    private static final short FIRST_NONZERO_IDENTITY = (short)0;
+    private static final short MAX_IDENTITY = Short.MIN_VALUE;
+    private static final short MIN_IDENTITY = Short.MAX_VALUE;
+    private static final short MUL_IDENTITY = (short)1;
+    private static final short OR_IDENTITY = (short)0;
+    private static final short SUADD_IDENTITY = (short)0;
+    private static final short UMAX_IDENTITY = (short)0;   // Minimum unsigned value
+    private static final short UMIN_IDENTITY = (short)-1;  // Maximum unsigned value
+    private static final short XOR_IDENTITY = (short)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
     static void assertArraysStrictlyEquals(short[] r, short[] a) {
@@ -84,10 +139,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -99,13 +154,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -115,10 +170,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -134,13 +189,13 @@ public class Short64VectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -156,13 +211,13 @@ public class Short64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -178,13 +233,13 @@ public class Short64VectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -200,13 +255,13 @@ public class Short64VectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -218,10 +273,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -233,10 +288,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -245,12 +300,12 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -261,20 +316,20 @@ public class Short64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (short)0);
+                    assertEquals(r[i + k], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -286,19 +341,19 @@ public class Short64VectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (short)0);
+                        assertEquals(r[i + j], (short)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -314,11 +369,11 @@ public class Short64VectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -327,12 +382,12 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -342,17 +397,17 @@ public class Short64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -362,17 +417,17 @@ public class Short64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -386,10 +441,10 @@ public class Short64VectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -401,10 +456,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -416,10 +471,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -440,18 +495,18 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -466,18 +521,18 @@ public class Short64VectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -485,10 +540,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -496,10 +551,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -507,10 +562,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -519,10 +574,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -535,10 +590,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -550,10 +605,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -565,10 +620,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -583,10 +638,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -599,11 +654,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -617,11 +672,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -643,11 +698,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -661,11 +716,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -685,10 +740,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -700,10 +755,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -712,10 +767,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -725,10 +780,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -744,11 +799,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -765,11 +820,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -780,11 +835,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -801,11 +856,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -823,13 +878,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -850,13 +905,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -871,13 +926,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -898,13 +953,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -918,13 +973,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -939,13 +994,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -960,13 +1015,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -982,13 +1037,13 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1001,10 +1056,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1014,10 +1069,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1025,10 +1080,10 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1565,7 +1620,7 @@ public class Short64VectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ShortVector a = io.add((short)1); //[1,2]
         ShortVector b = a.neg();  //[-1,-2]
         short[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1580,19 +1635,19 @@ public class Short64VectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Short> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Short> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ShortVector uab0 = zab0.rearrange(unz0,zab1);
         ShortVector uab1 = zab0.rearrange(unz1,zab1);
         short[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1607,7 +1662,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1641,7 +1696,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1654,7 +1709,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::ADD);
+        assertArraysEquals(r, a, b, ShortVector64Tests::ADD);
     }
 
     static short add(short a, short b) {
@@ -1662,7 +1717,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1673,11 +1728,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::add);
+        assertArraysEquals(r, a, b, ShortVector64Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1693,11 +1748,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1711,7 +1766,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::add);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::add);
     }
 
     static short SUB(short a, short b) {
@@ -1719,7 +1774,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void SUBShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUBShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1732,7 +1787,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::SUB);
+        assertArraysEquals(r, a, b, ShortVector64Tests::SUB);
     }
 
     static short sub(short a, short b) {
@@ -1740,7 +1795,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1751,11 +1806,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::sub);
+        assertArraysEquals(r, a, b, ShortVector64Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void SUBShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUBShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1771,11 +1826,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1789,7 +1844,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::sub);
     }
 
     static short MUL(short a, short b) {
@@ -1797,7 +1852,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MULShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MULShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1810,7 +1865,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::MUL);
+        assertArraysEquals(r, a, b, ShortVector64Tests::MUL);
     }
 
     static short mul(short a, short b) {
@@ -1818,7 +1873,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1829,11 +1884,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::mul);
+        assertArraysEquals(r, a, b, ShortVector64Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void MULShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void MULShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1849,11 +1904,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1867,7 +1922,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::mul);
     }
 
     static short DIV(short a, short b) {
@@ -1875,7 +1930,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void DIVShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void DIVShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1890,7 +1945,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::DIV);
+        assertArraysEquals(r, a, b, ShortVector64Tests::DIV);
     }
 
     static short div(short a, short b) {
@@ -1898,7 +1953,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1913,11 +1968,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::div);
+        assertArraysEquals(r, a, b, ShortVector64Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void DIVShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void DIVShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1935,11 +1990,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1957,7 +2012,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::div);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1965,7 +2020,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void FIRST_NONZEROShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void FIRST_NONZEROShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1978,11 +2033,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ShortVector64Tests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void FIRST_NONZEROShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void FIRST_NONZEROShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1998,7 +2053,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -2006,7 +2061,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2019,7 +2074,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::AND);
+        assertArraysEquals(r, a, b, ShortVector64Tests::AND);
     }
 
     static short and(short a, short b) {
@@ -2027,7 +2082,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2038,11 +2093,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::and);
+        assertArraysEquals(r, a, b, ShortVector64Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2058,7 +2113,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::AND);
     }
 
     static short AND_NOT(short a, short b) {
@@ -2066,7 +2121,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void AND_NOTShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void AND_NOTShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2079,11 +2134,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ShortVector64Tests::AND_NOT);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void AND_NOTShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void AND_NOTShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2099,7 +2154,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::AND_NOT);
     }
 
     static short OR(short a, short b) {
@@ -2107,7 +2162,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2120,7 +2175,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::OR);
+        assertArraysEquals(r, a, b, ShortVector64Tests::OR);
     }
 
     static short or(short a, short b) {
@@ -2128,7 +2183,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2139,11 +2194,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::or);
+        assertArraysEquals(r, a, b, ShortVector64Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2159,7 +2214,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::OR);
     }
 
     static short XOR(short a, short b) {
@@ -2167,7 +2222,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void XORShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void XORShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2180,11 +2235,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::XOR);
+        assertArraysEquals(r, a, b, ShortVector64Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void XORShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void XORShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2200,11 +2255,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2214,11 +2269,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2231,11 +2286,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector64Tests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2245,11 +2300,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2262,11 +2317,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector64Tests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2276,11 +2331,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2293,11 +2348,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector64Tests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2309,11 +2364,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2328,11 +2383,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector64Tests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2342,11 +2397,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2356,11 +2411,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2373,11 +2428,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector64Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2387,11 +2442,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2401,11 +2456,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2418,11 +2473,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, Short64VectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVector64Tests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVector64TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2432,11 +2487,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector64Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShort64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2449,11 +2504,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short64VectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector64Tests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVector64TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2463,11 +2518,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, Short64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVector64Tests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShort64VectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVector64TestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2480,7 +2535,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short64VectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector64Tests::ADD);
     }
 
     static short LSHL(short a, short b) {
@@ -2488,7 +2543,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2501,11 +2556,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, ShortVector64Tests::LSHL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2521,7 +2576,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::LSHL);
     }
 
     static short ASHR(short a, short b) {
@@ -2529,7 +2584,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2542,11 +2597,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, ShortVector64Tests::ASHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2562,7 +2617,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::ASHR);
     }
 
     static short LSHR(short a, short b) {
@@ -2570,7 +2625,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2583,11 +2638,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, ShortVector64Tests::LSHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2603,7 +2658,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::LSHR);
     }
 
     static short LSHL_unary(short a, short b) {
@@ -2611,7 +2666,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShort64VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVector64TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2623,11 +2678,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector64Tests::LSHL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShort64VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVector64TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2642,7 +2697,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector64Tests::LSHL_unary);
     }
 
     static short LSHR_unary(short a, short b) {
@@ -2650,7 +2705,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShort64VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVector64TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2662,11 +2717,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector64Tests::LSHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShort64VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVector64TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2681,7 +2736,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector64Tests::LSHR_unary);
     }
 
     static short ASHR_unary(short a, short b) {
@@ -2689,7 +2744,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShort64VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVector64TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2701,11 +2756,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector64Tests::ASHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShort64VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVector64TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2720,7 +2775,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector64Tests::ASHR_unary);
     }
 
     static short ROR(short a, short b) {
@@ -2728,7 +2783,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2741,11 +2796,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::ROR);
+        assertArraysEquals(r, a, b, ShortVector64Tests::ROR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2761,7 +2816,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::ROR);
     }
 
     static short ROL(short a, short b) {
@@ -2769,7 +2824,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2782,11 +2837,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::ROL);
+        assertArraysEquals(r, a, b, ShortVector64Tests::ROL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2802,7 +2857,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::ROL);
     }
 
     static short ROR_unary(short a, short b) {
@@ -2810,7 +2865,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShort64VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVector64TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2822,11 +2877,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector64Tests::ROR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShort64VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVector64TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2841,7 +2896,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector64Tests::ROR_unary);
     }
 
     static short ROL_unary(short a, short b) {
@@ -2849,7 +2904,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShort64VectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVector64TestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2861,11 +2916,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, Short64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVector64Tests::ROL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShort64VectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVector64TestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2880,14 +2935,14 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, Short64VectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVector64Tests::ROL_unary);
     }
     static short LSHR_binary_const(short a) {
         return (short)(((a & 0xFFFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHRShort64VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHRShortVector64TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2898,11 +2953,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector64Tests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHRShort64VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHRShortVector64TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2916,7 +2971,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short64VectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector64Tests::LSHR_binary_const);
     }
 
     static short LSHL_binary_const(short a) {
@@ -2924,7 +2979,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHLShort64VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHLShortVector64TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2935,11 +2990,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector64Tests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHLShort64VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHLShortVector64TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2953,7 +3008,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short64VectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector64Tests::LSHL_binary_const);
     }
 
     static short ASHR_binary_const(short a) {
@@ -2961,7 +3016,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ASHRShort64VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ASHRShortVector64TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2972,11 +3027,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector64Tests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ASHRShort64VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ASHRShortVector64TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2990,7 +3045,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short64VectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector64Tests::ASHR_binary_const);
     }
 
     static short ROR_binary_const(short a) {
@@ -2998,7 +3053,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void RORShort64VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void RORShortVector64TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3009,11 +3064,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ShortVector64Tests::ROR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void RORShort64VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void RORShortVector64TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3027,7 +3082,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short64VectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector64Tests::ROR_binary_const);
     }
 
     static short ROL_binary_const(short a) {
@@ -3035,7 +3090,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ROLShort64VectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ROLShortVector64TestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3046,11 +3101,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, Short64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ShortVector64Tests::ROL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ROLShort64VectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ROLShortVector64TestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3064,14 +3119,14 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, Short64VectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVector64Tests::ROL_binary_const);
     }
 
 
     static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MINShortVector64TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3082,13 +3137,13 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short64VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, ShortVector64Tests::MIN);
     }
 
     static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void minShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void minShortVector64TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3099,13 +3154,13 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short64VectorTests::min);
+        assertArraysEquals(r, a, (short)10, ShortVector64Tests::min);
     }
 
     static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINShort64VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINShortVector64TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3118,13 +3173,13 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short64VectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector64Tests::MIN);
     }
 
     static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MAXShortVector64TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3135,13 +3190,13 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short64VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, ShortVector64Tests::MAX);
     }
 
     static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void maxShort64VectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void maxShortVector64TestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3152,13 +3207,13 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, Short64VectorTests::max);
+        assertArraysEquals(r, a, (short)10, ShortVector64Tests::max);
     }
 
     static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXShort64VectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXShortVector64TestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3171,7 +3226,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, Short64VectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, mask, ShortVector64Tests::MAX);
     }
 
     static short MIN(short a, short b) {
@@ -3179,7 +3234,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3192,7 +3247,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::MIN);
+        assertArraysEquals(r, a, b, ShortVector64Tests::MIN);
     }
 
     static short min(short a, short b) {
@@ -3200,7 +3255,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3211,7 +3266,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::min);
+        assertArraysEquals(r, a, b, ShortVector64Tests::min);
     }
 
     static short MAX(short a, short b) {
@@ -3219,7 +3274,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3232,7 +3287,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::MAX);
+        assertArraysEquals(r, a, b, ShortVector64Tests::MAX);
     }
 
     static short max(short a, short b) {
@@ -3240,7 +3295,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3251,7 +3306,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::max);
+        assertArraysEquals(r, a, b, ShortVector64Tests::max);
     }
 
     static short UMIN(short a, short b) {
@@ -3259,7 +3314,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMINShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMINShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3272,11 +3327,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, ShortVector64Tests::UMIN);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMINShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMINShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3292,7 +3347,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::UMIN);
     }
 
     static short UMAX(short a, short b) {
@@ -3300,7 +3355,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMAXShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMAXShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3313,11 +3368,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, ShortVector64Tests::UMAX);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMAXShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMAXShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3333,7 +3388,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::UMAX);
     }
 
     static short SADD(short a, short b) {
@@ -3341,7 +3396,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SADDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SADDShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3354,11 +3409,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::SADD);
+        assertArraysEquals(r, a, b, ShortVector64Tests::SADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SADDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SADDShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3374,7 +3429,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::SADD);
     }
 
     static short SSUB(short a, short b) {
@@ -3382,7 +3437,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SSUBShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SSUBShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3395,11 +3450,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, ShortVector64Tests::SSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SSUBShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SSUBShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3415,7 +3470,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::SSUB);
     }
 
     static short SUADD(short a, short b) {
@@ -3423,7 +3478,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUADDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUADDShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3436,11 +3491,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, ShortVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUADDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3456,7 +3511,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::SUADD);
     }
 
     static short SUSUB(short a, short b) {
@@ -3464,7 +3519,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUSUBShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUSUBShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3477,11 +3532,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ShortVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUSUBShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUSUBShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3497,11 +3552,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::SUSUB);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3511,11 +3566,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3525,11 +3580,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3539,11 +3594,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3553,10 +3608,10 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, Short64VectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ShortVector64Tests::max);
     }
     @Test(dataProvider = "shortSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SUADDAssocShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -3573,11 +3628,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, Short64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ShortVector64Tests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDAssocShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                      IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3598,11 +3653,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, Short64VectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ShortVector64Tests::SUADD);
     }
 
     static short ANDReduce(short[] a, int idx) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3611,7 +3666,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAll(short[] a) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3620,32 +3675,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ANDReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void ANDReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                short v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::ANDReduce, Short64VectorTests::ANDReduceAll);
+                ShortVector64Tests::ANDReduce, ShortVector64Tests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = AND_IDENTITY;
+
+        assertEquals((short) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id & x), x);
+                assertEquals((short) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static short ANDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3655,7 +3728,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3664,34 +3737,29 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ANDReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                short v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::ANDReduceMasked, Short64VectorTests::ANDReduceAllMasked);
+                ShortVector64Tests::ANDReduceMasked, ShortVector64Tests::ANDReduceAllMasked);
     }
 
     static short ORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3700,7 +3768,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAll(short[] a) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3709,32 +3777,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ORReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void ORReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                short v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::ORReduce, Short64VectorTests::ORReduceAll);
+                ShortVector64Tests::ORReduce, ShortVector64Tests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = OR_IDENTITY;
+
+        assertEquals((short) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id | x), x);
+                assertEquals((short) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static short ORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3744,7 +3830,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3753,7 +3839,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ORReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3761,26 +3847,21 @@ public class Short64VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                short v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::ORReduceMasked, Short64VectorTests::ORReduceAllMasked);
+                ShortVector64Tests::ORReduceMasked, ShortVector64Tests::ORReduceAllMasked);
     }
 
     static short XORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3789,7 +3870,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAll(short[] a) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3798,32 +3879,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void XORReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void XORReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                short v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::XORReduce, Short64VectorTests::XORReduceAll);
+                ShortVector64Tests::XORReduce, ShortVector64Tests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = XOR_IDENTITY;
+
+        assertEquals((short) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id ^ x), x);
+                assertEquals((short) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static short XORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3833,7 +3932,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3842,7 +3941,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void XORReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3850,26 +3949,21 @@ public class Short64VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                short v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::XORReduceMasked, Short64VectorTests::XORReduceAllMasked);
+                ShortVector64Tests::XORReduceMasked, ShortVector64Tests::XORReduceAllMasked);
     }
 
     static short ADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3878,7 +3972,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAll(short[] a) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3887,32 +3981,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                short v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::ADDReduce, Short64VectorTests::ADDReduceAll);
+                ShortVector64Tests::ADDReduce, ShortVector64Tests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = ADD_IDENTITY;
+
+        assertEquals((short) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id + x), x);
+                assertEquals((short) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3922,7 +4034,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3931,7 +4043,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3939,26 +4051,21 @@ public class Short64VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                short v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::ADDReduceMasked, Short64VectorTests::ADDReduceAllMasked);
+                ShortVector64Tests::ADDReduceMasked, ShortVector64Tests::ADDReduceAllMasked);
     }
 
     static short MULReduce(short[] a, int idx) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3967,7 +4074,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAll(short[] a) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3976,32 +4083,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MULReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void MULReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                short v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::MULReduce, Short64VectorTests::MULReduceAll);
+                ShortVector64Tests::MULReduce, ShortVector64Tests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MUL_IDENTITY;
+
+        assertEquals((short) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id * x), x);
+                assertEquals((short) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4011,7 +4136,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4020,34 +4145,29 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MULReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                short v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::MULReduceMasked, Short64VectorTests::MULReduceAllMasked);
+                ShortVector64Tests::MULReduceMasked, ShortVector64Tests::MULReduceAllMasked);
     }
 
     static short MINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.min(res, a[i]);
         }
@@ -4056,7 +4176,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduce(a, i));
         }
@@ -4065,32 +4185,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void MINReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                short v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::MINReduce, Short64VectorTests::MINReduceAll);
+                ShortVector64Tests::MINReduce, ShortVector64Tests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MIN_IDENTITY;
+
+        assertEquals((short) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.min(id, x), x);
+                assertEquals((short) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.min(res, a[i]);
@@ -4100,7 +4238,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4109,34 +4247,29 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                short v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::MINReduceMasked, Short64VectorTests::MINReduceAllMasked);
+                ShortVector64Tests::MINReduceMasked, ShortVector64Tests::MINReduceAllMasked);
     }
 
     static short MAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.max(res, a[i]);
         }
@@ -4145,7 +4278,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduce(a, i));
         }
@@ -4154,32 +4287,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void MAXReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                short v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::MAXReduce, Short64VectorTests::MAXReduceAll);
+                ShortVector64Tests::MAXReduce, ShortVector64Tests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MAX_IDENTITY;
+
+        assertEquals((short) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.max(id, x), x);
+                assertEquals((short) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.max(res, a[i]);
@@ -4189,7 +4340,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4198,34 +4349,29 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                short v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::MAXReduceMasked, Short64VectorTests::MAXReduceAllMasked);
+                ShortVector64Tests::MAXReduceMasked, ShortVector64Tests::MAXReduceAllMasked);
     }
 
     static short UMINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4234,7 +4380,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4243,32 +4389,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMINReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void UMINReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                short v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::UMINReduce, Short64VectorTests::UMINReduceAll);
+                ShortVector64Tests::UMINReduce, ShortVector64Tests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMIN_IDENTITY;
+
+        assertEquals((short) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.minUnsigned(id, x), x);
+                assertEquals((short) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static short UMINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.minUnsigned(res, a[i]);
@@ -4278,7 +4442,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4287,34 +4451,29 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMINReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                short v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::UMINReduceMasked, Short64VectorTests::UMINReduceAllMasked);
+                ShortVector64Tests::UMINReduceMasked, ShortVector64Tests::UMINReduceAllMasked);
     }
 
     static short UMAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4323,7 +4482,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4332,32 +4491,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMAXReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void UMAXReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                short v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::UMAXReduce, Short64VectorTests::UMAXReduceAll);
+                ShortVector64Tests::UMAXReduce, ShortVector64Tests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMAX_IDENTITY;
+
+        assertEquals((short) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((short) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static short UMAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.maxUnsigned(res, a[i]);
@@ -4367,7 +4544,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4376,34 +4553,29 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMAXReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                short v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::UMAXReduceMasked, Short64VectorTests::UMAXReduceAllMasked);
+                ShortVector64Tests::UMAXReduceMasked, ShortVector64Tests::UMAXReduceAllMasked);
     }
 
     static short FIRST_NONZEROReduce(short[] a, int idx) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4412,7 +4584,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAll(short[] a) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4421,32 +4593,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void FIRST_NONZEROReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void FIRST_NONZEROReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::FIRST_NONZEROReduce, Short64VectorTests::FIRST_NONZEROReduceAll);
+                ShortVector64Tests::FIRST_NONZEROReduce, ShortVector64Tests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static short FIRST_NONZEROReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4456,7 +4646,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAllMasked(short[] a, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4465,30 +4655,25 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::FIRST_NONZEROReduceMasked, Short64VectorTests::FIRST_NONZEROReduceAllMasked);
+                ShortVector64Tests::FIRST_NONZEROReduceMasked, ShortVector64Tests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4501,7 +4686,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueShort64VectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueShortVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4512,7 +4697,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short64VectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector64Tests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4525,7 +4710,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueShort64VectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueShortVector64Tests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4536,11 +4721,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, Short64VectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVector64Tests::allTrue);
     }
 
     static short SUADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4549,7 +4734,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAll(short[] a) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4558,32 +4743,50 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingUnaryOpProvider")
-    static void SUADDReduceShort64VectorTests(IntFunction<short[]> fa) {
+    static void SUADDReduceShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                short v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Short64VectorTests::SUADDReduce, Short64VectorTests::SUADDReduceAll);
+                ShortVector64Tests::SUADDReduce, ShortVector64Tests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = SUADD_IDENTITY;
+
+        assertEquals((short) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static short SUADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4593,7 +4796,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4601,7 +4804,7 @@ public class Short64VectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "shortSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4609,26 +4812,21 @@ public class Short64VectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                short v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::SUADDReduceMasked, Short64VectorTests::SUADDReduceAllMasked);
+                ShortVector64Tests::SUADDReduceMasked, ShortVector64Tests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void withShort64VectorTests(IntFunction<short []> fa, IntFunction<short []> fb) {
+    static void withShortVector64Tests(IntFunction<short []> fa, IntFunction<short []> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -4651,7 +4849,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_DEFAULTShort64VectorTests(IntFunction<short[]> fa) {
+    static void IS_DEFAULTShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4661,14 +4859,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShortVector64Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4681,7 +4879,7 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4692,7 +4890,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_NEGATIVEShort64VectorTests(IntFunction<short[]> fa) {
+    static void IS_NEGATIVEShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4702,14 +4900,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShortVector64Tests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4722,14 +4920,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4741,14 +4939,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4760,14 +4958,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LTShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4783,14 +4981,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GTShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GTShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4802,14 +5000,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GTShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GTShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4825,14 +5023,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4844,14 +5042,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4863,14 +5061,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void EQShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4886,14 +5084,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void NEShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void NEShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4905,14 +5103,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void NEShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void NEShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4928,14 +5126,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LEShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LEShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4947,14 +5145,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LEShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LEShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4970,14 +5168,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GEShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GEShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4989,14 +5187,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GEShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GEShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5012,14 +5210,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULTShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULTShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5031,14 +5229,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULTShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULTShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5054,14 +5252,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGTShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGTShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5073,14 +5271,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGTShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGTShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5096,14 +5294,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULEShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULEShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5115,14 +5313,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULEShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULEShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5138,14 +5336,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGEShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGEShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5157,14 +5355,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGEShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGEShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5180,14 +5378,14 @@ public class Short64VectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5197,13 +5395,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5217,13 +5415,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVector64TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5233,13 +5431,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShort64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5253,13 +5451,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5269,13 +5467,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5289,13 +5487,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVector64TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5305,13 +5503,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShort64VectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVector64TestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5325,7 +5523,7 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
             }
         }
     }
@@ -5335,7 +5533,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5351,11 +5549,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, Short64VectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ShortVector64Tests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
-    static void RearrangeShort64VectorTests(IntFunction<short[]> fa,
+    static void RearrangeShortVector64Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5372,7 +5570,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
-    static void RearrangeShort64VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void RearrangeShortVector64TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -5390,7 +5588,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void compressShort64VectorTests(IntFunction<short[]> fa,
+    static void compressShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5408,7 +5606,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void expandShort64VectorTests(IntFunction<short[]> fa,
+    static void expandShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5426,7 +5624,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void getShort64VectorTests(IntFunction<short[]> fa) {
+    static void getShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -5582,7 +5780,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastShort64VectorTests(IntFunction<short[]> fa) {
+    static void BroadcastShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5596,7 +5794,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZeroShort64VectorTests(IntFunction<short[]> fa) {
+    static void ZeroShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5606,7 +5804,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static short[] sliceUnary(short[] a, int origin, int idx) {
@@ -5621,7 +5819,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void sliceUnaryShort64VectorTests(IntFunction<short[]> fa) {
+    static void sliceUnaryShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5632,7 +5830,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short64VectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector64Tests::sliceUnary);
     }
 
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
@@ -5649,7 +5847,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void sliceBinaryShort64VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void sliceBinaryShortVector64TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5662,7 +5860,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, Short64VectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ShortVector64Tests::sliceBinary);
     }
 
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
@@ -5679,7 +5877,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void sliceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void sliceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5696,7 +5894,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, Short64VectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ShortVector64Tests::slice);
     }
 
     static short[] unsliceUnary(short[] a, int origin, int idx) {
@@ -5713,7 +5911,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void unsliceUnaryShort64VectorTests(IntFunction<short[]> fa) {
+    static void unsliceUnaryShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5724,7 +5922,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, Short64VectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ShortVector64Tests::unsliceUnary);
     }
 
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
@@ -5750,7 +5948,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void unsliceBinaryShort64VectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void unsliceBinaryShortVector64TestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5764,7 +5962,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, Short64VectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ShortVector64Tests::unsliceBinary);
     }
 
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5804,7 +6002,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void unsliceShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void unsliceShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5821,7 +6019,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, Short64VectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ShortVector64Tests::unslice);
     }
 
     static short BITWISE_BLEND(short a, short b, short c) {
@@ -5833,7 +6031,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5848,11 +6046,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5865,11 +6063,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ShortVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5887,11 +6085,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5902,11 +6100,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort64VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector64TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5917,11 +6115,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5932,11 +6130,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort64VectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector64TestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5947,11 +6145,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5966,11 +6164,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort64VectorTestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector64TestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5985,11 +6183,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShort64VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVector64TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6000,11 +6198,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector64Tests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShort64VectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVector64TestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6015,11 +6213,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, Short64VectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVector64Tests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShort64VectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVector64TestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6033,7 +6231,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, Short64VectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortVector64Tests::BITWISE_BLEND);
     }
 
     static short NEG(short a) {
@@ -6045,7 +6243,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NEGShort64VectorTests(IntFunction<short[]> fa) {
+    static void NEGShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6056,11 +6254,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::NEG);
+        assertArraysEquals(r, a, ShortVector64Tests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void negShort64VectorTests(IntFunction<short[]> fa) {
+    static void negShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6071,11 +6269,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::neg);
+        assertArraysEquals(r, a, ShortVector64Tests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NEGMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void NEGMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6089,7 +6287,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::NEG);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::NEG);
     }
 
     static short ABS(short a) {
@@ -6101,7 +6299,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ABSShort64VectorTests(IntFunction<short[]> fa) {
+    static void ABSShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6112,11 +6310,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::ABS);
+        assertArraysEquals(r, a, ShortVector64Tests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void absShort64VectorTests(IntFunction<short[]> fa) {
+    static void absShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6127,11 +6325,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::abs);
+        assertArraysEquals(r, a, ShortVector64Tests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ABSMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void ABSMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6145,7 +6343,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::ABS);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::ABS);
     }
 
     static short NOT(short a) {
@@ -6157,7 +6355,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NOTShort64VectorTests(IntFunction<short[]> fa) {
+    static void NOTShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6168,11 +6366,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::NOT);
+        assertArraysEquals(r, a, ShortVector64Tests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void notShort64VectorTests(IntFunction<short[]> fa) {
+    static void notShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6183,11 +6381,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::not);
+        assertArraysEquals(r, a, ShortVector64Tests::not);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NOTMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void NOTMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6201,7 +6399,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::NOT);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::NOT);
     }
 
     static short ZOMO(short a) {
@@ -6209,7 +6407,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZOMOShort64VectorTests(IntFunction<short[]> fa) {
+    static void ZOMOShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6220,11 +6418,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::ZOMO);
+        assertArraysEquals(r, a, ShortVector64Tests::ZOMO);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ZOMOMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void ZOMOMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6238,7 +6436,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::ZOMO);
     }
 
     static short BIT_COUNT(short a) {
@@ -6246,7 +6444,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BIT_COUNTShort64VectorTests(IntFunction<short[]> fa) {
+    static void BIT_COUNTShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6257,11 +6455,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ShortVector64Tests::BIT_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void BIT_COUNTMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6275,7 +6473,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::BIT_COUNT);
     }
 
     static short TRAILING_ZEROS_COUNT(short a) {
@@ -6283,7 +6481,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTShort64VectorTests(IntFunction<short[]> fa) {
+    static void TRAILING_ZEROS_COUNTShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6294,11 +6492,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6312,7 +6510,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::TRAILING_ZEROS_COUNT);
     }
 
     static short LEADING_ZEROS_COUNT(short a) {
@@ -6320,7 +6518,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTShort64VectorTests(IntFunction<short[]> fa) {
+    static void LEADING_ZEROS_COUNTShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6331,11 +6529,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6349,7 +6547,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::LEADING_ZEROS_COUNT);
     }
 
     static short REVERSE(short a) {
@@ -6357,7 +6555,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSEShort64VectorTests(IntFunction<short[]> fa) {
+    static void REVERSEShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6368,11 +6566,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::REVERSE);
+        assertArraysEquals(r, a, ShortVector64Tests::REVERSE);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSEMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void REVERSEMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6386,7 +6584,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::REVERSE);
     }
 
     static short REVERSE_BYTES(short a) {
@@ -6394,7 +6592,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSE_BYTESShort64VectorTests(IntFunction<short[]> fa) {
+    static void REVERSE_BYTESShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6405,11 +6603,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ShortVector64Tests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedShort64VectorTests(IntFunction<short[]> fa,
+    static void REVERSE_BYTESMaskedShortVector64Tests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6423,7 +6621,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, Short64VectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ShortVector64Tests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6431,7 +6629,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandShortVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6444,7 +6642,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::band);
+        assertArraysEquals(r, a, b, ShortVector64Tests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6452,7 +6650,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorShortVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6465,7 +6663,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::bor);
+        assertArraysEquals(r, a, b, ShortVector64Tests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6473,7 +6671,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorShortVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6486,7 +6684,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::bxor);
+        assertArraysEquals(r, a, b, ShortVector64Tests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6494,7 +6692,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotShortVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6507,7 +6705,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::bandNot);
+        assertArraysEquals(r, a, b, ShortVector64Tests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6515,7 +6713,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqShortVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6528,7 +6726,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, Short64VectorTests::beq);
+        assertArraysEquals(r, a, b, ShortVector64Tests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6536,7 +6734,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotShort64VectorTests(IntFunction<boolean[]> fa) {
+    static void masknotShortVector64Tests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6547,7 +6745,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, Short64VectorTests::unot);
+        assertArraysEquals(r, a, ShortVector64Tests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6556,15 +6754,15 @@ public class Short64VectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShort64VectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongShortVector64Tests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6578,7 +6776,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShort64VectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVector64TestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6588,13 +6786,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShort64VectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVector64TestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6604,13 +6802,13 @@ public class Short64VectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toIntArrayShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toIntArrayShortVector64TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6621,7 +6819,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toLongArrayShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toLongArrayShortVector64TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6632,7 +6830,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toDoubleArrayShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toDoubleArrayShortVector64TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6643,7 +6841,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toStringShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toStringShortVector64TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6656,7 +6854,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void hashCodeShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void hashCodeShortVector64TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6689,7 +6887,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceLongShort64VectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceLongShortVector64Tests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6705,7 +6903,7 @@ public class Short64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                Short64VectorTests::ADDReduceLong, Short64VectorTests::ADDReduceAllLong);
+                ShortVector64Tests::ADDReduceLong, ShortVector64Tests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(short[] a, int idx, boolean[] mask) {
@@ -6728,7 +6926,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceLongShort64VectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongShortVector64TestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6746,11 +6944,11 @@ public class Short64VectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                Short64VectorTests::ADDReduceLongMasked, Short64VectorTests::ADDReduceAllLongMasked);
+                ShortVector64Tests::ADDReduceLongMasked, ShortVector64Tests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastLongShort64VectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void BroadcastLongShortVector64TestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -6761,7 +6959,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShort64VectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVector64TestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6775,12 +6973,12 @@ public class Short64VectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, Short64VectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVector64Tests::blend);
     }
 
 
     @Test(dataProvider = "shortUnaryOpSelectFromProvider")
-    static void SelectFromShort64VectorTests(IntFunction<short[]> fa,
+    static void SelectFromShortVector64Tests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,short[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         short[] order = fs.apply(a.length, SPECIES.length());
@@ -6796,7 +6994,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorShort64VectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SelectFromTwoVectorShortVector64Tests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] idx = fc.apply(SPECIES.length());
@@ -6814,7 +7012,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
-    static void SelectFromShort64VectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void SelectFromShortVector64TestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                            BiFunction<Integer,Integer,short[]> fs,
                                                            IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -6833,7 +7031,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousShort64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousShortVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6844,12 +7042,12 @@ public class Short64VectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringShort64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringShortVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6863,7 +7061,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsShort64VectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsShortVector64TestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6872,12 +7070,12 @@ public class Short64VectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsShort64VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsShortVector64Tests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6887,13 +7085,13 @@ public class Short64VectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeShortVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6915,7 +7113,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountShortVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6926,7 +7124,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short64VectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ShortVector64Tests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6940,7 +7138,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueShortVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6951,7 +7149,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short64VectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector64Tests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6965,7 +7163,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueShortVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6976,11 +7174,11 @@ public class Short64VectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, Short64VectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVector64Tests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressShort64VectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressShortVector64TestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6990,7 +7188,7 @@ public class Short64VectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7008,7 +7206,7 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeShort64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeShortVector64TestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7016,13 +7214,13 @@ public class Short64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongShort64VectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongShortVector64TestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7030,7 +7228,7 @@ public class Short64VectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7049,36 +7247,36 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundShort64VectorTestsSmokeTest(int length) {
+    static void loopBoundShortVector64TestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongShort64VectorTestsSmokeTest(int _length) {
+    static void loopBoundLongShortVector64TestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeShort64VectorTestsSmokeTest() {
+    static void ElementSizeShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Short.SIZE);
+        assertEquals(elsize, Short.SIZE);
     }
 
     @Test
-    static void VectorShapeShort64VectorTestsSmokeTest() {
+    static void VectorShapeShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_64_BIT));
     }
 
     @Test
-    static void ShapeWithLanesShort64VectorTestsSmokeTest() {
+    static void ShapeWithLanesShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(short.class);
@@ -7086,32 +7284,32 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeShort64VectorTestsSmokeTest() {
+    static void ElementTypeShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementType() == short.class);
     }
 
     @Test
-    static void SpeciesElementSizeShort64VectorTestsSmokeTest() {
+    static void SpeciesElementSizeShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementSize() == Short.SIZE);
     }
 
     @Test
-    static void VectorTypeShort64VectorTestsSmokeTest() {
+    static void VectorTypeShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesShort64VectorTestsSmokeTest() {
+    static void WithLanesShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(short.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeShort64VectorTestsSmokeTest() {
+    static void WithShapeShortVector64TestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7119,9 +7317,9 @@ public class Short64VectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueShort64VectorTestsSmokeTest() {
+    static void MaskAllTrueShortVector64TestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java b/test/jdk/jdk/incubator/vector/ShortVectorMaxLoadStoreTests.java
similarity index 97%
rename from test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
rename to test/jdk/jdk/incubator/vector/ShortVectorMaxLoadStoreTests.java
index 91db367808a..24683f1e5d7 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVectorMaxLoadStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules jdk.incubator.vector java.base/jdk.internal.vm.annotation
  * @run testng/othervm --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
- *      -XX:-TieredCompilation ShortMaxVectorLoadStoreTests
+ *      -XX:-TieredCompilation ShortVectorMaxLoadStoreTests
  *
  */
 
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.function.*;
 
 @Test
-public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
+public class ShortVectorMaxLoadStoreTests extends AbstractVectorLoadStoreTest {
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_MAX;
 
@@ -68,14 +68,29 @@ public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals(short[] r, short[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
         }
     }
 
@@ -329,7 +344,7 @@ public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "shortProviderForIOOBE")
@@ -1121,11 +1136,11 @@ public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -1136,11 +1151,11 @@ public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: (short) 0, "at index #" + j);
         }
     }
 
@@ -1156,7 +1171,7 @@ public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals(short[] r, short[] a, int[] indexMap) {
@@ -1169,7 +1184,7 @@ public class ShortMaxVectorLoadStoreTests extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java b/test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java
similarity index 79%
rename from test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
rename to test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java
index 45ba8db51c1..65234fb3173 100644
--- a/test/jdk/jdk/incubator/vector/ShortMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/ShortVectorMaxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  *
  * @library /test/lib
  * @modules jdk.incubator.vector
- * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ShortMaxVectorTests
+ * @run testng/othervm/timeout=300 -ea -esa -Xbatch -XX:-TieredCompilation ShortVectorMaxTests
  */
 
 // -- This file was mechanically generated: Do not edit! -- //
@@ -56,12 +56,55 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Test
-public class ShortMaxVectorTests extends AbstractVectorTest {
+public class ShortVectorMaxTests extends AbstractVectorTest {
 
     static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals(short actual, short expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short actual, short expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(short actual, short expected, short delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals(short actual, short expected, short delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals(short [] actual, short [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(short [] actual, short [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
 
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
@@ -71,6 +114,19 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
     private static final short CONST_SHIFT = Short.SIZE / 2;
 
+    // Identity values for reduction operations
+    private static final short ADD_IDENTITY = (short)0;
+    private static final short AND_IDENTITY = (short)-1;
+    private static final short FIRST_NONZERO_IDENTITY = (short)0;
+    private static final short MAX_IDENTITY = Short.MIN_VALUE;
+    private static final short MIN_IDENTITY = Short.MAX_VALUE;
+    private static final short MUL_IDENTITY = (short)1;
+    private static final short OR_IDENTITY = (short)0;
+    private static final short SUADD_IDENTITY = (short)0;
+    private static final short UMAX_IDENTITY = (short)0;   // Minimum unsigned value
+    private static final short UMIN_IDENTITY = (short)-1;  // Maximum unsigned value
+    private static final short XOR_IDENTITY = (short)0;
+
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
     static void assertArraysStrictlyEquals(short[] r, short[] a) {
@@ -89,10 +145,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -104,13 +160,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a[i]);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -120,10 +176,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -139,13 +195,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                                             FReductionOp f, FReductionAllOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -161,13 +217,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOp f, FReductionAllMaskedOp fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -183,13 +239,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -205,13 +261,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 
@@ -223,10 +279,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -238,10 +294,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -250,12 +306,12 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -266,20 +322,20 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], (short)0);
+                    assertEquals(r[i + k], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -291,19 +347,19 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], (short)0);
+                        assertEquals(r[i + j], (short)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], (short)0, "at index #" + idx);
+                assertEquals(r[idx], (short)0, "at index #" + idx);
             }
         }
     }
@@ -319,11 +375,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -332,12 +388,12 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -347,17 +403,17 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -367,17 +423,17 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], (short)0);
+                         assertEquals(r[i+j], (short)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], (short)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -391,10 +447,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -406,10 +462,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -421,10 +477,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -445,18 +501,18 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -471,18 +527,18 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -490,10 +546,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -501,10 +557,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -512,10 +568,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -524,10 +580,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -540,10 +596,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -555,10 +611,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -570,10 +626,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -588,10 +644,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], (short)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -604,11 +660,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -622,11 +678,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -648,11 +704,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -666,11 +722,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -690,10 +746,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -705,10 +761,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -717,10 +773,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -730,10 +786,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -749,11 +805,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -770,11 +826,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -785,11 +841,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -806,11 +862,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -828,13 +884,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -855,13 +911,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -876,13 +932,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(r, a, i, mask, b, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -903,13 +959,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -923,13 +979,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -944,13 +1000,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -965,13 +1021,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -987,13 +1043,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             short[] ref = f.apply(a, b, origin, part, mask, i);
             short[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1006,10 +1062,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1019,10 +1075,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1030,10 +1086,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1570,7 +1626,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         // Do some zipping and shuffling.
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         ShortVector a = io.add((short)1); //[1,2]
         ShortVector b = a.neg();  //[-1,-2]
         short[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1585,19 +1641,19 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<Short> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<Short> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         ShortVector uab0 = zab0.rearrange(unz0,zab1);
         ShortVector uab1 = zab0.rearrange(unz1,zab1);
         short[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         ShortVector io = (ShortVector) SPECIES.broadcast(0).addIndex(1);
         ShortVector io2 = (ShortVector) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1612,7 +1668,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     @Test
     void viewAsIntegeralLanesTest() {
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
     }
 
     @Test(expectedExceptions = UnsupportedOperationException.class)
@@ -1646,7 +1702,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1659,7 +1715,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::ADD);
     }
 
     static short add(short a, short b) {
@@ -1667,7 +1723,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1678,11 +1734,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.add(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::add);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1698,11 +1754,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::ADD);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1716,7 +1772,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.add(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::add);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::add);
     }
 
     static short SUB(short a, short b) {
@@ -1724,7 +1780,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void SUBShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUBShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1737,7 +1793,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::SUB);
     }
 
     static short sub(short a, short b) {
@@ -1745,7 +1801,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1756,11 +1812,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.sub(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void SUBShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUBShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1776,11 +1832,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::SUB);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::SUB);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1794,7 +1850,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.sub(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::sub);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::sub);
     }
 
     static short MUL(short a, short b) {
@@ -1802,7 +1858,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MULShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MULShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1815,7 +1871,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::MUL);
     }
 
     static short mul(short a, short b) {
@@ -1823,7 +1879,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1834,11 +1890,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.mul(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void MULShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void MULShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1854,11 +1910,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::MUL);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::MUL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1872,7 +1928,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.mul(bv, vmask).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::mul);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::mul);
     }
 
     static short DIV(short a, short b) {
@@ -1880,7 +1936,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void DIVShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void DIVShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1895,7 +1951,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::DIV);
     }
 
     static short div(short a, short b) {
@@ -1903,7 +1959,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1918,11 +1974,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::div);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void DIVShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void DIVShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1940,11 +1996,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::DIV);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::DIV);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -1962,7 +2018,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::div);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::div);
     }
 
     static short FIRST_NONZERO(short a, short b) {
@@ -1970,7 +2026,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void FIRST_NONZEROShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void FIRST_NONZEROShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -1983,11 +2039,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::FIRST_NONZERO);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void FIRST_NONZEROShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void FIRST_NONZEROShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2003,7 +2059,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::FIRST_NONZERO);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::FIRST_NONZERO);
     }
 
     static short AND(short a, short b) {
@@ -2011,7 +2067,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2024,7 +2080,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::AND);
     }
 
     static short and(short a, short b) {
@@ -2032,7 +2088,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2043,11 +2099,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.and(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::and);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2063,7 +2119,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::AND);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::AND);
     }
 
     static short AND_NOT(short a, short b) {
@@ -2071,7 +2127,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void AND_NOTShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void AND_NOTShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2084,11 +2140,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::AND_NOT);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void AND_NOTShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void AND_NOTShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2104,7 +2160,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::AND_NOT);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::AND_NOT);
     }
 
     static short OR(short a, short b) {
@@ -2112,7 +2168,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2125,7 +2181,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::OR);
     }
 
     static short or(short a, short b) {
@@ -2133,7 +2189,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2144,11 +2200,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.or(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::or);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2164,7 +2220,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::OR);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::OR);
     }
 
     static short XOR(short a, short b) {
@@ -2172,7 +2228,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void XORShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void XORShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2185,11 +2241,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void XORShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void XORShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2205,11 +2261,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::XOR);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::XOR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void addShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void addShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2219,11 +2275,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.add(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void addShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void addShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2236,11 +2292,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.add(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::add);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVectorMaxTests::add);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void subShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void subShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2250,11 +2306,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void subShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void subShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2267,11 +2323,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.sub(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::sub);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVectorMaxTests::sub);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void mulShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void mulShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2281,11 +2337,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void mulShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void mulShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2298,11 +2354,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.mul(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::mul);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVectorMaxTests::mul);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void divShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void divShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2314,11 +2370,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.div(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void divShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void divShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2333,11 +2389,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.div(b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::div);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVectorMaxTests::div);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2347,11 +2403,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void orShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void orShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2361,11 +2417,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.or(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::or);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::or);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2378,11 +2434,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::OR);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ANDShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ANDShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2392,11 +2448,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void andShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void andShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2406,11 +2462,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.and(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::and);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::and);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ANDShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ANDShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2423,11 +2479,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.AND, b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, mask, ShortMaxVectorTests::AND);
+        assertBroadcastArraysEquals(r, a, b, mask, ShortVectorMaxTests::AND);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ORShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ORShortVectorMaxTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2437,11 +2493,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, ShortMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ORShortMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ORShortVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2454,11 +2510,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.OR, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, ShortMaxVectorTests::OR);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVectorMaxTests::OR);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ADDShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ADDShortVectorMaxTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2468,11 +2524,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i]).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, ShortMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, ShortVectorMaxTests::ADD);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ADDShortMaxVectorTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ADDShortVectorMaxTestsBroadcastMaskedLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2485,7 +2541,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.ADD, (long)b[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastLongArraysEquals(r, a, b, mask, ShortMaxVectorTests::ADD);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVectorMaxTests::ADD);
     }
 
     static short LSHL(short a, short b) {
@@ -2493,7 +2549,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2506,11 +2562,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::LSHL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2526,7 +2582,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHL);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::LSHL);
     }
 
     static short ASHR(short a, short b) {
@@ -2534,7 +2590,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2547,11 +2603,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::ASHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2567,7 +2623,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::ASHR);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::ASHR);
     }
 
     static short LSHR(short a, short b) {
@@ -2575,7 +2631,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2588,11 +2644,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::LSHR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2608,7 +2664,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHR);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::LSHR);
     }
 
     static short LSHL_unary(short a, short b) {
@@ -2616,7 +2672,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHLShortMaxVectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHLShortVectorMaxTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2628,11 +2684,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVectorMaxTests::LSHL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHLShortMaxVectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHLShortVectorMaxTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2647,7 +2703,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVectorMaxTests::LSHL_unary);
     }
 
     static short LSHR_unary(short a, short b) {
@@ -2655,7 +2711,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void LSHRShortMaxVectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LSHRShortVectorMaxTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2667,11 +2723,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVectorMaxTests::LSHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void LSHRShortMaxVectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LSHRShortVectorMaxTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2686,7 +2742,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::LSHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVectorMaxTests::LSHR_unary);
     }
 
     static short ASHR_unary(short a, short b) {
@@ -2694,7 +2750,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ASHRShortMaxVectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ASHRShortVectorMaxTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2706,11 +2762,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVectorMaxTests::ASHR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ASHRShortMaxVectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ASHRShortVectorMaxTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2725,7 +2781,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::ASHR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVectorMaxTests::ASHR_unary);
     }
 
     static short ROR(short a, short b) {
@@ -2733,7 +2789,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2746,11 +2802,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::ROR);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2766,7 +2822,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::ROR);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::ROR);
     }
 
     static short ROL(short a, short b) {
@@ -2774,7 +2830,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2787,11 +2843,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::ROL);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2807,7 +2863,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::ROL);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::ROL);
     }
 
     static short ROR_unary(short a, short b) {
@@ -2815,7 +2871,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void RORShortMaxVectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void RORShortVectorMaxTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2827,11 +2883,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, ShortVectorMaxTests::ROR_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void RORShortMaxVectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void RORShortVectorMaxTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2846,7 +2902,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::ROR_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVectorMaxTests::ROR_unary);
     }
 
     static short ROL_unary(short a, short b) {
@@ -2854,7 +2910,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void ROLShortMaxVectorTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ROLShortVectorMaxTestsScalarShift(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2866,11 +2922,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, ShortMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, ShortVectorMaxTests::ROL_unary);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void ROLShortMaxVectorTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ROLShortVectorMaxTestsScalarShiftMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -2885,14 +2941,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftArraysEquals(r, a, b, mask, ShortMaxVectorTests::ROL_unary);
+        assertShiftArraysEquals(r, a, b, mask, ShortVectorMaxTests::ROL_unary);
     }
     static short LSHR_binary_const(short a) {
         return (short)(((a & 0xFFFF) >>> CONST_SHIFT));
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHRShortMaxVectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHRShortVectorMaxTestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2903,11 +2959,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ShortMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVectorMaxTests::LSHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHRShortMaxVectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHRShortVectorMaxTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2921,7 +2977,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ShortMaxVectorTests::LSHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVectorMaxTests::LSHR_binary_const);
     }
 
     static short LSHL_binary_const(short a) {
@@ -2929,7 +2985,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LSHLShortMaxVectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void LSHLShortVectorMaxTestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2940,11 +2996,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ShortMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, ShortVectorMaxTests::LSHL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LSHLShortMaxVectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void LSHLShortVectorMaxTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2958,7 +3014,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ShortMaxVectorTests::LSHL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVectorMaxTests::LSHL_binary_const);
     }
 
     static short ASHR_binary_const(short a) {
@@ -2966,7 +3022,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ASHRShortMaxVectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ASHRShortVectorMaxTestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -2977,11 +3033,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ShortMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, ShortVectorMaxTests::ASHR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ASHRShortMaxVectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ASHRShortVectorMaxTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -2995,7 +3051,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ShortMaxVectorTests::ASHR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVectorMaxTests::ASHR_binary_const);
     }
 
     static short ROR_binary_const(short a) {
@@ -3003,7 +3059,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void RORShortMaxVectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void RORShortVectorMaxTestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3014,11 +3070,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ShortMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, ShortVectorMaxTests::ROR_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void RORShortMaxVectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void RORShortVectorMaxTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3032,7 +3088,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ShortMaxVectorTests::ROR_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVectorMaxTests::ROR_binary_const);
     }
 
     static short ROL_binary_const(short a) {
@@ -3040,7 +3096,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ROLShortMaxVectorTestsScalarShiftConst(IntFunction<short[]> fa) {
+    static void ROLShortVectorMaxTestsScalarShiftConst(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3051,11 +3107,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, ShortMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, ShortVectorMaxTests::ROL_binary_const);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ROLShortMaxVectorTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
+    static void ROLShortVectorMaxTestsScalarShiftMaskedConst(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3069,14 +3125,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertShiftConstEquals(r, a, mask, ShortMaxVectorTests::ROL_binary_const);
+        assertShiftConstEquals(r, a, mask, ShortVectorMaxTests::ROL_binary_const);
     }
 
 
     static ShortVector bv_MIN = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MINShortVectorMaxTestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3087,13 +3143,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, ShortVectorMaxTests::MIN);
     }
 
     static ShortVector bv_min = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void minShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void minShortVectorMaxTestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3104,13 +3160,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::min);
+        assertArraysEquals(r, a, (short)10, ShortVectorMaxTests::min);
     }
 
     static ShortVector bv_MIN_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINShortMaxVectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINShortVectorMaxTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3123,13 +3179,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, ShortMaxVectorTests::MIN);
+        assertArraysEquals(r, a, (short)10, mask, ShortVectorMaxTests::MIN);
     }
 
     static ShortVector bv_MAX = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void MAXShortVectorMaxTestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3140,13 +3196,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, ShortVectorMaxTests::MAX);
     }
 
     static ShortVector bv_max = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void maxShortMaxVectorTestsWithMemOp(IntFunction<short[]> fa) {
+    static void maxShortVectorMaxTestsWithMemOp(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -3157,13 +3213,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, ShortMaxVectorTests::max);
+        assertArraysEquals(r, a, (short)10, ShortVectorMaxTests::max);
     }
 
     static ShortVector bv_MAX_M = ShortVector.broadcast(SPECIES, (short)10);
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXShortMaxVectorTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXShortVectorMaxTestsMaskedWithMemOp(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3176,7 +3232,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, (short)10, mask, ShortMaxVectorTests::MAX);
+        assertArraysEquals(r, a, (short)10, mask, ShortVectorMaxTests::MAX);
     }
 
     static short MIN(short a, short b) {
@@ -3184,7 +3240,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3197,7 +3253,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::MIN);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::MIN);
     }
 
     static short min(short a, short b) {
@@ -3205,7 +3261,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3216,7 +3272,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.min(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::min);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::min);
     }
 
     static short MAX(short a, short b) {
@@ -3224,7 +3280,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3237,7 +3293,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::MAX);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::MAX);
     }
 
     static short max(short a, short b) {
@@ -3245,7 +3301,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3256,7 +3312,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.max(bv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::max);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::max);
     }
 
     static short UMIN(short a, short b) {
@@ -3264,7 +3320,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMINShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMINShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3277,11 +3333,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::UMIN);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMINShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMINShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3297,7 +3353,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::UMIN);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::UMIN);
     }
 
     static short UMAX(short a, short b) {
@@ -3305,7 +3361,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void UMAXShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UMAXShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3318,11 +3374,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::UMAX);
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void UMAXShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UMAXShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3338,7 +3394,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::UMAX);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::UMAX);
     }
 
     static short SADD(short a, short b) {
@@ -3346,7 +3402,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SADDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SADDShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3359,11 +3415,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::SADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SADDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SADDShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3379,7 +3435,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::SADD);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::SADD);
     }
 
     static short SSUB(short a, short b) {
@@ -3387,7 +3443,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SSUBShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SSUBShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3400,11 +3456,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::SSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SSUBShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SSUBShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3420,7 +3476,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::SSUB);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::SSUB);
     }
 
     static short SUADD(short a, short b) {
@@ -3428,7 +3484,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUADDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUADDShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3441,11 +3497,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUADDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3461,7 +3517,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::SUADD);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::SUADD);
     }
 
     static short SUSUB(short a, short b) {
@@ -3469,7 +3525,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpProvider")
-    static void SUSUBShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void SUSUBShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3482,11 +3538,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpMaskProvider")
-    static void SUSUBShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUSUBShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3502,11 +3558,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::SUSUB);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::SUSUB);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MINShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MINShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3516,11 +3572,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MIN, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::MIN);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::MIN);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void minShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void minShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3530,11 +3586,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.min(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::min);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::min);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void MAXShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void MAXShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3544,11 +3600,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.MAX, b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::MAX);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::MAX);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void maxShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void maxShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -3558,10 +3614,10 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.max(b[i]).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, ShortMaxVectorTests::max);
+        assertBroadcastArraysEquals(r, a, b, ShortVectorMaxTests::max);
     }
     @Test(dataProvider = "shortSaturatingBinaryOpAssocProvider")
-    static void SUADDAssocShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SUADDAssocShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -3578,11 +3634,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, ShortMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, ShortVectorMaxTests::SUADD);
     }
 
     @Test(dataProvider = "shortSaturatingBinaryOpAssocMaskProvider")
-    static void SUADDAssocShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void SUADDAssocShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                      IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -3603,11 +3659,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ShortMaxVectorTests::SUADD);
+        assertArraysEqualsAssociative(rl, rr, a, b, c, mask, ShortVectorMaxTests::SUADD);
     }
 
     static short ANDReduce(short[] a, int idx) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res &= a[i];
         }
@@ -3616,7 +3672,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAll(short[] a) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduce(a, i);
         }
@@ -3625,32 +3681,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ANDReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ANDReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND);
+                short v = av.reduceLanes(VectorOperators.AND);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::ANDReduce, ShortMaxVectorTests::ANDReduceAll);
+                ShortVectorMaxTests::ANDReduce, ShortVectorMaxTests::ANDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ANDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = AND_IDENTITY;
+
+        assertEquals((short) (id & id), id,
+                            "AND(AND_IDENTITY, AND_IDENTITY) != AND_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id & x), x);
+                assertEquals((short) (x & id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id & x), x,
+                                "AND(AND_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x & id), x,
+                                "AND(" + x + ", AND_IDENTITY) != " + x);
+        }
     }
 
     static short ANDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res &= a[i];
@@ -3660,7 +3734,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short ANDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = -1;
+        short res = AND_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res &= ANDReduceMasked(a, i, mask);
         }
@@ -3669,34 +3743,29 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ANDReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ANDReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = -1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = AND_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.AND, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = -1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra &= av.reduceLanes(VectorOperators.AND, vmask);
+                short v = av.reduceLanes(VectorOperators.AND, vmask);
+                r[i] = v;
+                ra &= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::ANDReduceMasked, ShortMaxVectorTests::ANDReduceAllMasked);
+                ShortVectorMaxTests::ANDReduceMasked, ShortVectorMaxTests::ANDReduceAllMasked);
     }
 
     static short ORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res |= a[i];
         }
@@ -3705,7 +3774,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAll(short[] a) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduce(a, i);
         }
@@ -3714,32 +3783,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ORReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ORReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR);
+                short v = av.reduceLanes(VectorOperators.OR);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::ORReduce, ShortMaxVectorTests::ORReduceAll);
+                ShortVectorMaxTests::ORReduce, ShortVectorMaxTests::ORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = OR_IDENTITY;
+
+        assertEquals((short) (id | id), id,
+                            "OR(OR_IDENTITY, OR_IDENTITY) != OR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id | x), x);
+                assertEquals((short) (x | id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id | x), x,
+                                "OR(OR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x | id), x,
+                                "OR(" + x + ", OR_IDENTITY) != " + x);
+        }
     }
 
     static short ORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res |= a[i];
@@ -3749,7 +3836,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short ORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = OR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res |= ORReduceMasked(a, i, mask);
         }
@@ -3758,7 +3845,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ORReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ORReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3766,26 +3853,21 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = OR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.OR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra |= av.reduceLanes(VectorOperators.OR, vmask);
+                short v = av.reduceLanes(VectorOperators.OR, vmask);
+                r[i] = v;
+                ra |= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::ORReduceMasked, ShortMaxVectorTests::ORReduceAllMasked);
+                ShortVectorMaxTests::ORReduceMasked, ShortVectorMaxTests::ORReduceAllMasked);
     }
 
     static short XORReduce(short[] a, int idx) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res ^= a[i];
         }
@@ -3794,7 +3876,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAll(short[] a) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduce(a, i);
         }
@@ -3803,32 +3885,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void XORReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void XORReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR);
+                short v = av.reduceLanes(VectorOperators.XOR);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::XORReduce, ShortMaxVectorTests::XORReduceAll);
+                ShortVectorMaxTests::XORReduce, ShortVectorMaxTests::XORReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void XORReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = XOR_IDENTITY;
+
+        assertEquals((short) (id ^ id), id,
+                            "XOR(XOR_IDENTITY, XOR_IDENTITY) != XOR_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id ^ x), x);
+                assertEquals((short) (x ^ id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id ^ x), x,
+                                "XOR(XOR_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x ^ id), x,
+                                "XOR(" + x + ", XOR_IDENTITY) != " + x);
+        }
     }
 
     static short XORReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res ^= a[i];
@@ -3838,7 +3938,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short XORReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = XOR_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res ^= XORReduceMasked(a, i, mask);
         }
@@ -3847,7 +3947,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void XORReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void XORReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3855,26 +3955,21 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = XOR_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.XOR, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra ^= av.reduceLanes(VectorOperators.XOR, vmask);
+                short v = av.reduceLanes(VectorOperators.XOR, vmask);
+                r[i] = v;
+                ra ^= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::XORReduceMasked, ShortMaxVectorTests::XORReduceAllMasked);
+                ShortVectorMaxTests::XORReduceMasked, ShortVectorMaxTests::XORReduceAllMasked);
     }
 
     static short ADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res += a[i];
         }
@@ -3883,7 +3978,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAll(short[] a) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduce(a, i);
         }
@@ -3892,32 +3987,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD);
+                short v = av.reduceLanes(VectorOperators.ADD);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::ADDReduce, ShortMaxVectorTests::ADDReduceAll);
+                ShortVectorMaxTests::ADDReduce, ShortVectorMaxTests::ADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void ADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = ADD_IDENTITY;
+
+        assertEquals((short) (id + id), id,
+                            "ADD(ADD_IDENTITY, ADD_IDENTITY) != ADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id + x), x);
+                assertEquals((short) (x + id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id + x), x,
+                                "ADD(ADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x + id), x,
+                                "ADD(" + x + ", ADD_IDENTITY) != " + x);
+        }
     }
 
     static short ADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res += a[i];
@@ -3927,7 +4040,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short ADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = ADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res += ADDReduceMasked(a, i, mask);
         }
@@ -3936,7 +4049,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -3944,26 +4057,21 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = ADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.ADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra += av.reduceLanes(VectorOperators.ADD, vmask);
+                short v = av.reduceLanes(VectorOperators.ADD, vmask);
+                r[i] = v;
+                ra += v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::ADDReduceMasked, ShortMaxVectorTests::ADDReduceAllMasked);
+                ShortVectorMaxTests::ADDReduceMasked, ShortVectorMaxTests::ADDReduceAllMasked);
     }
 
     static short MULReduce(short[] a, int idx) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res *= a[i];
         }
@@ -3972,7 +4080,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAll(short[] a) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduce(a, i);
         }
@@ -3981,32 +4089,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MULReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void MULReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL);
+                short v = av.reduceLanes(VectorOperators.MUL);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::MULReduce, ShortMaxVectorTests::MULReduceAll);
+                ShortVectorMaxTests::MULReduce, ShortVectorMaxTests::MULReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MULReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MUL_IDENTITY;
+
+        assertEquals((short) (id * id), id,
+                            "MUL(MUL_IDENTITY, MUL_IDENTITY) != MUL_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) (id * x), x);
+                assertEquals((short) (x * id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) (id * x), x,
+                                "MUL(MUL_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) (x * id), x,
+                                "MUL(" + x + ", MUL_IDENTITY) != " + x);
+        }
     }
 
     static short MULReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res *= a[i];
@@ -4016,7 +4142,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short MULReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 1;
+        short res = MUL_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res *= MULReduceMasked(a, i, mask);
         }
@@ -4025,34 +4151,29 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MULReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MULReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = 1;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MUL_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MUL, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 1;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra *= av.reduceLanes(VectorOperators.MUL, vmask);
+                short v = av.reduceLanes(VectorOperators.MUL, vmask);
+                r[i] = v;
+                ra *= v;
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::MULReduceMasked, ShortMaxVectorTests::MULReduceAllMasked);
+                ShortVectorMaxTests::MULReduceMasked, ShortVectorMaxTests::MULReduceAllMasked);
     }
 
     static short MINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.min(res, a[i]);
         }
@@ -4061,7 +4182,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduce(a, i));
         }
@@ -4070,32 +4191,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MINReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void MINReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN));
+                short v = av.reduceLanes(VectorOperators.MIN);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::MINReduce, ShortMaxVectorTests::MINReduceAll);
+                ShortVectorMaxTests::MINReduce, ShortVectorMaxTests::MINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MIN_IDENTITY;
+
+        assertEquals((short) Math.min(id, id), id,
+                            "MIN(MIN_IDENTITY, MIN_IDENTITY) != MIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.min(id, x), x);
+                assertEquals((short) Math.min(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.min(id, x), x,
+                                "MIN(MIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.min(x, id), x,
+                                "MIN(" + x + ", MIN_IDENTITY) != " + x);
+        }
     }
 
     static short MINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.min(res, a[i]);
@@ -4105,7 +4244,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short MINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = MIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.min(res, MINReduceMasked(a, i, mask));
         }
@@ -4114,34 +4253,29 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MINReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MINReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.min(ra, av.reduceLanes(VectorOperators.MIN, vmask));
+                short v = av.reduceLanes(VectorOperators.MIN, vmask);
+                r[i] = v;
+                ra = (short) Math.min(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::MINReduceMasked, ShortMaxVectorTests::MINReduceAllMasked);
+                ShortVectorMaxTests::MINReduceMasked, ShortVectorMaxTests::MINReduceAllMasked);
     }
 
     static short MAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) Math.max(res, a[i]);
         }
@@ -4150,7 +4284,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduce(a, i));
         }
@@ -4159,32 +4293,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void MAXReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void MAXReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX));
+                short v = av.reduceLanes(VectorOperators.MAX);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::MAXReduce, ShortMaxVectorTests::MAXReduceAll);
+                ShortVectorMaxTests::MAXReduce, ShortVectorMaxTests::MAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void MAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = MAX_IDENTITY;
+
+        assertEquals((short) Math.max(id, id), id,
+                            "MAX(MAX_IDENTITY, MAX_IDENTITY) != MAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) Math.max(id, x), x);
+                assertEquals((short) Math.max(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) Math.max(id, x), x,
+                                "MAX(MAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) Math.max(x, id), x,
+                                "MAX(" + x + ", MAX_IDENTITY) != " + x);
+        }
     }
 
     static short MAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) Math.max(res, a[i]);
@@ -4194,7 +4346,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short MAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = MAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) Math.max(res, MAXReduceMasked(a, i, mask));
         }
@@ -4203,34 +4355,29 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void MAXReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void MAXReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = MAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.MAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) Math.max(ra, av.reduceLanes(VectorOperators.MAX, vmask));
+                short v = av.reduceLanes(VectorOperators.MAX, vmask);
+                r[i] = v;
+                ra = (short) Math.max(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::MAXReduceMasked, ShortMaxVectorTests::MAXReduceAllMasked);
+                ShortVectorMaxTests::MAXReduceMasked, ShortVectorMaxTests::MAXReduceAllMasked);
     }
 
     static short UMINReduce(short[] a, int idx) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.minUnsigned(res, a[i]);
         }
@@ -4239,7 +4386,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAll(short[] a) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduce(a, i));
         }
@@ -4248,32 +4395,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMINReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void UMINReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN));
+                short v = av.reduceLanes(VectorOperators.UMIN);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::UMINReduce, ShortMaxVectorTests::UMINReduceAll);
+                ShortVectorMaxTests::UMINReduce, ShortVectorMaxTests::UMINReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMINReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMIN_IDENTITY;
+
+        assertEquals((short) VectorMath.minUnsigned(id, id), id,
+                            "UMIN(UMIN_IDENTITY, UMIN_IDENTITY) != UMIN_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.minUnsigned(id, x), x);
+                assertEquals((short) VectorMath.minUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.minUnsigned(id, x), x,
+                                "UMIN(UMIN_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.minUnsigned(x, id), x,
+                                "UMIN(" + x + ", UMIN_IDENTITY) != " + x);
+        }
     }
 
     static short UMINReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.minUnsigned(res, a[i]);
@@ -4283,7 +4448,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short UMINReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MAX_VALUE;
+        short res = UMIN_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.minUnsigned(res, UMINReduceMasked(a, i, mask));
         }
@@ -4292,34 +4457,29 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMINReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMINReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MAX_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMIN_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMIN, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MAX_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.minUnsigned(ra, av.reduceLanes(VectorOperators.UMIN, vmask));
+                short v = av.reduceLanes(VectorOperators.UMIN, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.minUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::UMINReduceMasked, ShortMaxVectorTests::UMINReduceAllMasked);
+                ShortVectorMaxTests::UMINReduceMasked, ShortVectorMaxTests::UMINReduceAllMasked);
     }
 
     static short UMAXReduce(short[] a, int idx) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.maxUnsigned(res, a[i]);
         }
@@ -4328,7 +4488,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAll(short[] a) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduce(a, i));
         }
@@ -4337,32 +4497,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void UMAXReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void UMAXReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX));
+                short v = av.reduceLanes(VectorOperators.UMAX);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::UMAXReduce, ShortMaxVectorTests::UMAXReduceAll);
+                ShortVectorMaxTests::UMAXReduce, ShortVectorMaxTests::UMAXReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void UMAXReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = UMAX_IDENTITY;
+
+        assertEquals((short) VectorMath.maxUnsigned(id, id), id,
+                            "UMAX(UMAX_IDENTITY, UMAX_IDENTITY) != UMAX_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.maxUnsigned(id, x), x);
+                assertEquals((short) VectorMath.maxUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.maxUnsigned(id, x), x,
+                                "UMAX(UMAX_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.maxUnsigned(x, id), x,
+                                "UMAX(" + x + ", UMAX_IDENTITY) != " + x);
+        }
     }
 
     static short UMAXReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.maxUnsigned(res, a[i]);
@@ -4372,7 +4550,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short UMAXReduceAllMasked(short[] a, boolean[] mask) {
-        short res = Short.MIN_VALUE;
+        short res = UMAX_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.maxUnsigned(res, UMAXReduceMasked(a, i, mask));
         }
@@ -4381,34 +4559,29 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void UMAXReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void UMAXReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = Short.MIN_VALUE;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = UMAX_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.UMAX, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = Short.MIN_VALUE;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.maxUnsigned(ra, av.reduceLanes(VectorOperators.UMAX, vmask));
+                short v = av.reduceLanes(VectorOperators.UMAX, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.maxUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::UMAXReduceMasked, ShortMaxVectorTests::UMAXReduceAllMasked);
+                ShortVectorMaxTests::UMAXReduceMasked, ShortVectorMaxTests::UMAXReduceAllMasked);
     }
 
     static short FIRST_NONZEROReduce(short[] a, int idx) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = firstNonZero(res, a[i]);
         }
@@ -4417,7 +4590,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAll(short[] a) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduce(a, i));
         }
@@ -4426,32 +4599,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void FIRST_NONZEROReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void FIRST_NONZEROReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::FIRST_NONZEROReduce, ShortMaxVectorTests::FIRST_NONZEROReduceAll);
+                ShortVectorMaxTests::FIRST_NONZEROReduce, ShortVectorMaxTests::FIRST_NONZEROReduceAll);
+    }
+
+    @Test(dataProvider = "shortUnaryOpProvider")
+    static void FIRST_NONZEROReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = FIRST_NONZERO_IDENTITY;
+
+        assertEquals(firstNonZero(id, id), id,
+                            "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, FIRST_NONZERO_IDENTITY) != FIRST_NONZERO_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(firstNonZero(id, x), x);
+                assertEquals(firstNonZero(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(firstNonZero(id, x), x,
+                                "FIRST_NONZERO(FIRST_NONZERO_IDENTITY, " + x + ") != " + x);
+            assertEquals(firstNonZero(x, id), x,
+                                "FIRST_NONZERO(" + x + ", FIRST_NONZERO_IDENTITY) != " + x);
+        }
     }
 
     static short FIRST_NONZEROReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = firstNonZero(res, a[i]);
@@ -4461,7 +4652,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short FIRST_NONZEROReduceAllMasked(short[] a, boolean[] mask) {
-        short res = (short) 0;
+        short res = FIRST_NONZERO_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = firstNonZero(res, FIRST_NONZEROReduceMasked(a, i, mask));
         }
@@ -4470,30 +4661,25 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void FIRST_NONZEROReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void FIRST_NONZEROReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<Short> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        short ra = (short) 0;
+        short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = FIRST_NONZERO_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = (short) 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = firstNonZero(ra, av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask));
+                short v = av.reduceLanes(VectorOperators.FIRST_NONZERO, vmask);
+                r[i] = v;
+                ra = firstNonZero(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::FIRST_NONZEROReduceMasked, ShortMaxVectorTests::FIRST_NONZEROReduceAllMasked);
+                ShortVectorMaxTests::FIRST_NONZEROReduceMasked, ShortVectorMaxTests::FIRST_NONZEROReduceAllMasked);
     }
 
     static boolean anyTrue(boolean[] a, int idx) {
@@ -4506,7 +4692,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void anyTrueShortMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void anyTrueShortVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4517,7 +4703,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, ShortMaxVectorTests::anyTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVectorMaxTests::anyTrue);
     }
 
     static boolean allTrue(boolean[] a, int idx) {
@@ -4530,7 +4716,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolUnaryOpProvider")
-    static void allTrueShortMaxVectorTests(IntFunction<boolean[]> fm) {
+    static void allTrueShortVectorMaxTests(IntFunction<boolean[]> fm) {
         boolean[] mask = fm.apply(SPECIES.length());
         boolean[] r = fmr.apply(SPECIES.length());
 
@@ -4541,11 +4727,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertReductionBoolArraysEquals(r, mask, ShortMaxVectorTests::allTrue);
+        assertReductionBoolArraysEquals(r, mask, ShortVectorMaxTests::allTrue);
     }
 
     static short SUADDReduce(short[] a, int idx) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
         }
@@ -4554,7 +4740,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAll(short[] a) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduce(a, i));
         }
@@ -4563,32 +4749,50 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSaturatingUnaryOpProvider")
-    static void SUADDReduceShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void SUADDReduceShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD));
+                short v = av.reduceLanes(VectorOperators.SUADD);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEquals(r, ra, a,
-                ShortMaxVectorTests::SUADDReduce, ShortMaxVectorTests::SUADDReduceAll);
+                ShortVectorMaxTests::SUADDReduce, ShortVectorMaxTests::SUADDReduceAll);
+    }
+
+    @Test(dataProvider = "shortSaturatingUnaryOpProvider")
+    static void SUADDReduceIdentityValueTests(IntFunction<short[]> fa) {
+        short[] a = fa.apply(SPECIES.length());
+        short id = SUADD_IDENTITY;
+
+        assertEquals((short) VectorMath.addSaturatingUnsigned(id, id), id,
+                            "SUADD(SUADD_IDENTITY, SUADD_IDENTITY) != SUADD_IDENTITY");
+
+        short x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x);
+                assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals((short) VectorMath.addSaturatingUnsigned(id, x), x,
+                                "SUADD(SUADD_IDENTITY, " + x + ") != " + x);
+            assertEquals((short) VectorMath.addSaturatingUnsigned(x, id), x,
+                                "SUADD(" + x + ", SUADD_IDENTITY) != " + x);
+        }
     }
 
     static short SUADDReduceMasked(short[] a, int idx, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = idx; i < (idx + SPECIES.length()); i++) {
             if (mask[i % SPECIES.length()])
                 res = (short) VectorMath.addSaturatingUnsigned(res, a[i]);
@@ -4598,7 +4802,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     static short SUADDReduceAllMasked(short[] a, boolean[] mask) {
-        short res = 0;
+        short res = SUADD_IDENTITY;
         for (int i = 0; i < a.length; i += SPECIES.length()) {
             res = (short) VectorMath.addSaturatingUnsigned(res, SUADDReduceMasked(a, i, mask));
         }
@@ -4606,7 +4810,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         return res;
     }
     @Test(dataProvider = "shortSaturatingUnaryOpMaskProvider")
-    static void SUADDReduceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void SUADDReduceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4614,26 +4818,21 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         short ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
+            ra = SUADD_IDENTITY;
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.SUADD, vmask);
-            }
-        }
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            ra = 0;
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                ShortVector av = ShortVector.fromArray(SPECIES, a, i);
-                ra = (short) VectorMath.addSaturatingUnsigned(ra, av.reduceLanes(VectorOperators.SUADD, vmask));
+                short v = av.reduceLanes(VectorOperators.SUADD, vmask);
+                r[i] = v;
+                ra = (short) VectorMath.addSaturatingUnsigned(ra, v);
             }
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::SUADDReduceMasked, ShortMaxVectorTests::SUADDReduceAllMasked);
+                ShortVectorMaxTests::SUADDReduceMasked, ShortVectorMaxTests::SUADDReduceAllMasked);
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void withShortMaxVectorTests(IntFunction<short []> fa, IntFunction<short []> fb) {
+    static void withShortVectorMaxTests(IntFunction<short []> fa, IntFunction<short []> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -4656,7 +4855,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_DEFAULTShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void IS_DEFAULTShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4666,14 +4865,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_DEFAULT(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_DEFAULTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void IS_DEFAULTMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4686,7 +4885,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_DEFAULT(a[i + j]));
                 }
             }
         }
@@ -4697,7 +4896,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTestOpProvider")
-    static void IS_NEGATIVEShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void IS_NEGATIVEShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -4707,14 +4906,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j), testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortTestOpMaskProvider")
-    static void IS_NEGATIVEMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void IS_NEGATIVEMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -4727,14 +4926,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && testIS_NEGATIVE(a[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4746,14 +4945,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4765,14 +4964,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LTShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4788,14 +4987,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && lt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GTShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GTShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4807,14 +5006,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GTShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GTShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4830,14 +5029,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && gt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4849,14 +5048,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4868,14 +5067,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void EQShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4891,14 +5090,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && eq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void NEShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void NEShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4910,14 +5109,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void NEShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void NEShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4933,14 +5132,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && neq(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LEShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LEShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4952,14 +5151,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LEShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void LEShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -4975,14 +5174,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && le(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void GEShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void GEShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -4994,14 +5193,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void GEShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void GEShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5017,14 +5216,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULTShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULTShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5036,14 +5235,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULTShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULTShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5059,14 +5258,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ult(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGTShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGTShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5078,14 +5277,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGTShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGTShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5101,14 +5300,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ugt(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ULEShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ULEShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5120,14 +5319,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void ULEShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void ULEShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5143,14 +5342,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && ule(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void UGEShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void UGEShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5162,14 +5361,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void UGEShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void UGEShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5185,14 +5384,14 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && uge(a[i + j], b[i + j]));
                 }
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5202,13 +5401,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5222,13 +5421,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void LTShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void LTShortVectorMaxTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5238,13 +5437,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] < (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void LTShortMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void LTShortVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5258,13 +5457,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] < (short)((long)b[i])));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5274,13 +5473,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5294,13 +5493,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void EQShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void EQShortVectorMaxTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -5310,13 +5509,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] == (short)((long)b[i]));
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpMaskProvider")
-    static void EQShortMaxVectorTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
+    static void EQShortVectorMaxTestsBroadcastLongMaskedSmokeTest(IntFunction<short[]> fa,
                                 IntFunction<short[]> fb, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5330,7 +5529,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] == (short)((long)b[i])));
             }
         }
     }
@@ -5340,7 +5539,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5356,11 +5555,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, mask, ShortMaxVectorTests::blend);
+        assertArraysEquals(r, a, b, mask, ShortVectorMaxTests::blend);
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleProvider")
-    static void RearrangeShortMaxVectorTests(IntFunction<short[]> fa,
+    static void RearrangeShortVectorMaxTests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,int[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         int[] order = fs.apply(a.length, SPECIES.length());
@@ -5377,7 +5576,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpShuffleMaskProvider")
-    static void RearrangeShortMaxVectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void RearrangeShortVectorMaxTestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                           BiFunction<Integer,Integer,int[]> fs,
                                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -5395,7 +5594,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void compressShortMaxVectorTests(IntFunction<short[]> fa,
+    static void compressShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5413,7 +5612,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void expandShortMaxVectorTests(IntFunction<short[]> fa,
+    static void expandShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -5431,7 +5630,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void getShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void getShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -5587,7 +5786,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void BroadcastShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5601,7 +5800,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZeroShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ZeroShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -5611,7 +5810,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
 
     static short[] sliceUnary(short[] a, int origin, int idx) {
@@ -5626,7 +5825,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void sliceUnaryShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void sliceUnaryShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5637,7 +5836,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, ShortMaxVectorTests::sliceUnary);
+        assertArraysEquals(r, a, origin, ShortVectorMaxTests::sliceUnary);
     }
 
     static short[] sliceBinary(short[] a, short[] b, int origin, int idx) {
@@ -5654,7 +5853,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void sliceBinaryShortMaxVectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void sliceBinaryShortVectorMaxTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5667,7 +5866,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, ShortMaxVectorTests::sliceBinary);
+        assertArraysEquals(r, a, b, origin, ShortVectorMaxTests::sliceBinary);
     }
 
     static short[] slice(short[] a, short[] b, int origin, boolean[] mask, int idx) {
@@ -5684,7 +5883,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void sliceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void sliceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5701,7 +5900,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, mask, ShortMaxVectorTests::slice);
+        assertArraysEquals(r, a, b, origin, mask, ShortVectorMaxTests::slice);
     }
 
     static short[] unsliceUnary(short[] a, int origin, int idx) {
@@ -5718,7 +5917,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void unsliceUnaryShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void unsliceUnaryShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         int origin = RAND.nextInt(SPECIES.length());
@@ -5729,7 +5928,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, origin, ShortMaxVectorTests::unsliceUnary);
+        assertArraysEquals(r, a, origin, ShortVectorMaxTests::unsliceUnary);
     }
 
     static short[] unsliceBinary(short[] a, short[] b, int origin, int part, int idx) {
@@ -5755,7 +5954,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpProvider")
-    static void unsliceBinaryShortMaxVectorTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void unsliceBinaryShortVectorMaxTestsBinary(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] r = new short[a.length];
@@ -5769,7 +5968,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, ShortMaxVectorTests::unsliceBinary);
+        assertArraysEquals(r, a, b, origin, part, ShortVectorMaxTests::unsliceBinary);
     }
 
     static short[] unslice(short[] a, short[] b, int origin, int part, boolean[] mask, int idx) {
@@ -5809,7 +6008,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void unsliceShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void unsliceShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
     IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5826,7 +6025,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, origin, part, mask, ShortMaxVectorTests::unslice);
+        assertArraysEquals(r, a, b, origin, part, mask, ShortVectorMaxTests::unslice);
     }
 
     static short BITWISE_BLEND(short a, short b, short c) {
@@ -5838,7 +6037,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5853,11 +6052,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5870,11 +6069,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(bv, cv).intoArray(r, i);
         }
 
-        assertArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
+        assertArraysEquals(r, a, b, c, ShortVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5892,11 +6091,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertArraysEquals(r, a, b, c, mask, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5907,11 +6106,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVectorMaxTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5922,11 +6121,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5937,11 +6136,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             ShortVector bv = ShortVector.fromArray(SPECIES, b, i);
             av.bitwiseBlend(bv, c[i]).intoArray(r, i);
         }
-        assertBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
+        assertBroadcastArraysEquals(r, a, b, c, ShortVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShortMaxVectorTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVectorMaxTestsAltBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -5952,11 +6151,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             ShortVector cv = ShortVector.fromArray(SPECIES, c, i);
             av.bitwiseBlend(b[i], cv).intoArray(r, i);
         }
-        assertAltBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
+        assertAltBroadcastArraysEquals(r, a, b, c, ShortVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5971,11 +6170,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, bv, c[i], vmask).intoArray(r, i);
         }
 
-        assertBroadcastArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertBroadcastArraysEquals(r, a, b, c, mask, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVectorMaxTestsAltBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -5990,11 +6189,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], cv, vmask).intoArray(r, i);
         }
 
-        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertAltBroadcastArraysEquals(r, a, b, c, mask, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void BITWISE_BLENDShortVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6005,11 +6204,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     @Test(dataProvider = "shortTernaryOpProvider")
-    static void bitwiseBlendShortMaxVectorTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void bitwiseBlendShortVectorMaxTestsDoubleBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] c = fc.apply(SPECIES.length());
@@ -6020,11 +6219,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.bitwiseBlend(b[i], c[i]).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortMaxVectorTests::bitwiseBlend);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, ShortVectorMaxTests::bitwiseBlend);
     }
 
     @Test(dataProvider = "shortTernaryOpMaskProvider")
-    static void BITWISE_BLENDShortMaxVectorTestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void BITWISE_BLENDShortVectorMaxTestsDoubleBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<short[]> fc, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6038,7 +6237,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             av.lanewise(VectorOperators.BITWISE_BLEND, b[i], c[i], vmask).intoArray(r, i);
         }
 
-        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortMaxVectorTests::BITWISE_BLEND);
+        assertDoubleBroadcastArraysEquals(r, a, b, c, mask, ShortVectorMaxTests::BITWISE_BLEND);
     }
 
     static short NEG(short a) {
@@ -6050,7 +6249,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NEGShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void NEGShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6061,11 +6260,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::NEG);
+        assertArraysEquals(r, a, ShortVectorMaxTests::NEG);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void negShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void negShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6076,11 +6275,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::neg);
+        assertArraysEquals(r, a, ShortVectorMaxTests::neg);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NEGMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void NEGMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6094,7 +6293,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::NEG);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::NEG);
     }
 
     static short ABS(short a) {
@@ -6106,7 +6305,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ABSShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ABSShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6117,11 +6316,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::ABS);
+        assertArraysEquals(r, a, ShortVectorMaxTests::ABS);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void absShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void absShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6132,11 +6331,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::abs);
+        assertArraysEquals(r, a, ShortVectorMaxTests::abs);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ABSMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void ABSMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6150,7 +6349,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::ABS);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::ABS);
     }
 
     static short NOT(short a) {
@@ -6162,7 +6361,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void NOTShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void NOTShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6173,11 +6372,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::NOT);
+        assertArraysEquals(r, a, ShortVectorMaxTests::NOT);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void notShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void notShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6188,11 +6387,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::not);
+        assertArraysEquals(r, a, ShortVectorMaxTests::not);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void NOTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void NOTMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6206,7 +6405,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::NOT);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::NOT);
     }
 
     static short ZOMO(short a) {
@@ -6214,7 +6413,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ZOMOShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ZOMOShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6225,11 +6424,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, ShortVectorMaxTests::ZOMO);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ZOMOMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void ZOMOMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6243,7 +6442,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::ZOMO);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::ZOMO);
     }
 
     static short BIT_COUNT(short a) {
@@ -6251,7 +6450,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BIT_COUNTShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void BIT_COUNTShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6262,11 +6461,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, ShortVectorMaxTests::BIT_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void BIT_COUNTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void BIT_COUNTMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6280,7 +6479,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::BIT_COUNT);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::BIT_COUNT);
     }
 
     static short TRAILING_ZEROS_COUNT(short a) {
@@ -6288,7 +6487,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void TRAILING_ZEROS_COUNTShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void TRAILING_ZEROS_COUNTShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6299,11 +6498,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void TRAILING_ZEROS_COUNTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void TRAILING_ZEROS_COUNTMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6317,7 +6516,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::TRAILING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::TRAILING_ZEROS_COUNT);
     }
 
     static short LEADING_ZEROS_COUNT(short a) {
@@ -6325,7 +6524,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void LEADING_ZEROS_COUNTShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void LEADING_ZEROS_COUNTShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6336,11 +6535,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, ShortVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void LEADING_ZEROS_COUNTMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void LEADING_ZEROS_COUNTMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6354,7 +6553,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::LEADING_ZEROS_COUNT);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::LEADING_ZEROS_COUNT);
     }
 
     static short REVERSE(short a) {
@@ -6362,7 +6561,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSEShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void REVERSEShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6373,11 +6572,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, ShortVectorMaxTests::REVERSE);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSEMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void REVERSEMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6391,7 +6590,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::REVERSE);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::REVERSE);
     }
 
     static short REVERSE_BYTES(short a) {
@@ -6399,7 +6598,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void REVERSE_BYTESShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void REVERSE_BYTESShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
 
@@ -6410,11 +6609,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, ShortVectorMaxTests::REVERSE_BYTES);
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void REVERSE_BYTESMaskedShortMaxVectorTests(IntFunction<short[]> fa,
+    static void REVERSE_BYTESMaskedShortVectorMaxTests(IntFunction<short[]> fa,
                                                 IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = fr.apply(SPECIES.length());
@@ -6428,7 +6627,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, mask, ShortMaxVectorTests::REVERSE_BYTES);
+        assertArraysEquals(r, a, mask, ShortVectorMaxTests::REVERSE_BYTES);
     }
 
     static boolean band(boolean a, boolean b) {
@@ -6436,7 +6635,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandShortVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6449,7 +6648,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::band);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::band);
     }
 
     static boolean bor(boolean a, boolean b) {
@@ -6457,7 +6656,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskorShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskorShortVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6470,7 +6669,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::bor);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::bor);
     }
 
     static boolean bxor(boolean a, boolean b) {
@@ -6478,7 +6677,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskxorShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskxorShortVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6491,7 +6690,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::bxor);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::bxor);
     }
 
     static boolean bandNot(boolean a, boolean b) {
@@ -6499,7 +6698,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskandNotShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskandNotShortVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6512,7 +6711,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::bandNot);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::bandNot);
     }
 
     static boolean beq(boolean a, boolean b) {
@@ -6520,7 +6719,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskeqShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskeqShortVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
@@ -6533,7 +6732,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, b, ShortMaxVectorTests::beq);
+        assertArraysEquals(r, a, b, ShortVectorMaxTests::beq);
     }
 
     static boolean unot(boolean a) {
@@ -6541,7 +6740,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "boolMaskUnaryOpProvider")
-    static void masknotShortMaxVectorTests(IntFunction<boolean[]> fa) {
+    static void masknotShortVectorMaxTests(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] r = new boolean[a.length];
 
@@ -6552,7 +6751,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertArraysEquals(r, a, ShortMaxVectorTests::unot);
+        assertArraysEquals(r, a, ShortVectorMaxTests::unot);
     }
 
     private static final long LONG_MASK_BITS = 0xFFFFFFFFFFFFFFFFL >>> (64 - SPECIES.length());
@@ -6561,15 +6760,15 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
     @Test(dataProvider = "longMaskProvider")
-    static void maskFromToLongShortMaxVectorTests(IntFunction<long[]> fa) {
+    static void maskFromToLongShortVectorMaxTests(IntFunction<long[]> fa) {
         long[] a = fa.apply(SPECIES.length());
         long[] r = new long[a.length];
 
@@ -6583,7 +6782,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void ltShortMaxVectorTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void ltShortVectorMaxTestsBroadcastSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6593,13 +6792,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortCompareOpProvider")
-    static void eqShortMaxVectorTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
+    static void eqShortVectorMaxTestsBroadcastMaskedSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
 
@@ -6609,13 +6808,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toIntArrayShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toIntArrayShortVectorMaxTestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6626,7 +6825,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toLongArrayShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toLongArrayShortVectorMaxTestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6637,7 +6836,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toDoubleArrayShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toDoubleArrayShortVectorMaxTestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6648,7 +6847,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void toStringShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void toStringShortVectorMaxTestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6661,7 +6860,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void hashCodeShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void hashCodeShortVectorMaxTestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6694,7 +6893,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void ADDReduceLongShortMaxVectorTests(IntFunction<short[]> fa) {
+    static void ADDReduceLongShortVectorMaxTests(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         long ra = 0;
@@ -6710,7 +6909,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEquals(r, ra, a,
-                ShortMaxVectorTests::ADDReduceLong, ShortMaxVectorTests::ADDReduceAllLong);
+                ShortVectorMaxTests::ADDReduceLong, ShortVectorMaxTests::ADDReduceAllLong);
     }
 
     static long ADDReduceLongMasked(short[] a, int idx, boolean[] mask) {
@@ -6733,7 +6932,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpMaskProvider")
-    static void ADDReduceLongShortMaxVectorTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
+    static void ADDReduceLongShortVectorMaxTestsMasked(IntFunction<short[]> fa, IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         long[] r = lfr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
@@ -6751,11 +6950,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
         }
 
         assertReductionLongArraysEqualsMasked(r, ra, a, mask,
-                ShortMaxVectorTests::ADDReduceLongMasked, ShortMaxVectorTests::ADDReduceAllLongMasked);
+                ShortVectorMaxTests::ADDReduceLongMasked, ShortVectorMaxTests::ADDReduceAllLongMasked);
     }
 
     @Test(dataProvider = "shortUnaryOpProvider")
-    static void BroadcastLongShortMaxVectorTestsSmokeTest(IntFunction<short[]> fa) {
+    static void BroadcastLongShortVectorMaxTestsSmokeTest(IntFunction<short[]> fa) {
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
 
@@ -6766,7 +6965,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortBinaryOpMaskProvider")
-    static void blendShortMaxVectorTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
+    static void blendShortVectorMaxTestsBroadcastLongSmokeTest(IntFunction<short[]> fa, IntFunction<short[]> fb,
                                           IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
@@ -6780,12 +6979,12 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                 av.blend((long)b[i], vmask).intoArray(r, i);
             }
         }
-        assertBroadcastLongArraysEquals(r, a, b, mask, ShortMaxVectorTests::blend);
+        assertBroadcastLongArraysEquals(r, a, b, mask, ShortVectorMaxTests::blend);
     }
 
 
     @Test(dataProvider = "shortUnaryOpSelectFromProvider")
-    static void SelectFromShortMaxVectorTests(IntFunction<short[]> fa,
+    static void SelectFromShortVectorMaxTests(IntFunction<short[]> fa,
                                            BiFunction<Integer,Integer,short[]> fs) {
         short[] a = fa.apply(SPECIES.length());
         short[] order = fs.apply(a.length, SPECIES.length());
@@ -6801,7 +7000,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortSelectFromTwoVectorOpProvider")
-    static void SelectFromTwoVectorShortMaxVectorTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
+    static void SelectFromTwoVectorShortVectorMaxTests(IntFunction<short[]> fa, IntFunction<short[]> fb, IntFunction<short[]> fc) {
         short[] a = fa.apply(SPECIES.length());
         short[] b = fb.apply(SPECIES.length());
         short[] idx = fc.apply(SPECIES.length());
@@ -6819,7 +7018,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shortUnaryOpSelectFromMaskProvider")
-    static void SelectFromShortMaxVectorTestsMaskedSmokeTest(IntFunction<short[]> fa,
+    static void SelectFromShortVectorMaxTestsMaskedSmokeTest(IntFunction<short[]> fa,
                                                            BiFunction<Integer,Integer,short[]> fs,
                                                            IntFunction<boolean[]> fm) {
         short[] a = fa.apply(SPECIES.length());
@@ -6838,7 +7037,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleMiscellaneousShortMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleMiscellaneousShortVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6849,12 +7048,12 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
     @Test(dataProvider = "shuffleProvider")
-    static void shuffleToStringShortMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
+    static void shuffleToStringShortVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fs) {
         int[] a = fs.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6868,7 +7067,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "shuffleCompareOpProvider")
-    static void shuffleEqualsShortMaxVectorTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
+    static void shuffleEqualsShortVectorMaxTestsSmokeTest(BiFunction<Integer,Integer,int[]> fa, BiFunction<Integer,Integer,int[]> fb) {
         int[] a = fa.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
         int[] b = fb.apply(SPECIES.length() * BUFFER_REPS, SPECIES.length());
 
@@ -6877,12 +7076,12 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
     @Test(dataProvider = "boolMaskBinaryOpProvider")
-    static void maskEqualsShortMaxVectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
+    static void maskEqualsShortVectorMaxTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
         boolean[] a = fa.apply(SPECIES.length());
         boolean[] b = fb.apply(SPECIES.length());
 
@@ -6892,13 +7091,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskHashCodeShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskHashCodeShortVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
 
         for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -6920,7 +7119,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskTrueCountShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskTrueCountShortVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6931,7 +7130,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, ShortMaxVectorTests::maskTrueCount);
+        assertMaskReductionArraysEquals(r, a, ShortVectorMaxTests::maskTrueCount);
     }
 
     static int maskLastTrue(boolean[] a, int idx) {
@@ -6945,7 +7144,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskLastTrueShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskLastTrueShortVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6956,7 +7155,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, ShortMaxVectorTests::maskLastTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVectorMaxTests::maskLastTrue);
     }
 
     static int maskFirstTrue(boolean[] a, int idx) {
@@ -6970,7 +7169,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskFirstTrueShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskFirstTrueShortVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         boolean[] a = fa.apply(SPECIES.length());
         int[] r = new int[a.length];
 
@@ -6981,11 +7180,11 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             }
         }
 
-        assertMaskReductionArraysEquals(r, a, ShortMaxVectorTests::maskFirstTrue);
+        assertMaskReductionArraysEquals(r, a, ShortVectorMaxTests::maskFirstTrue);
     }
 
     @Test(dataProvider = "maskProvider")
-    static void maskCompressShortMaxVectorTestsSmokeTest(IntFunction<boolean[]> fa) {
+    static void maskCompressShortVectorMaxTestsSmokeTest(IntFunction<boolean[]> fa) {
         int trueCount = 0;
         boolean[] a = fa.apply(SPECIES.length());
 
@@ -6995,7 +7194,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -7013,7 +7212,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeShortMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeShortVectorMaxTestsSmokeTest(int offset) {
         int limit = SPECIES.length() * BUFFER_REPS;
         for (int i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7021,13 +7220,13 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
 
     @Test(dataProvider = "offsetProvider")
-    static void indexInRangeLongShortMaxVectorTestsSmokeTest(int offset) {
+    static void indexInRangeLongShortVectorMaxTestsSmokeTest(int offset) {
         long limit = SPECIES.length() * BUFFER_REPS;
         for (long i = 0; i < limit; i += SPECIES.length()) {
             var actualMask = SPECIES.indexInRange(i + offset, limit);
@@ -7035,7 +7234,7 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -7054,36 +7253,36 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundShortMaxVectorTestsSmokeTest(int length) {
+    static void loopBoundShortVectorMaxTestsSmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
-    static void loopBoundLongShortMaxVectorTestsSmokeTest(int _length) {
+    static void loopBoundLongShortVectorMaxTestsSmokeTest(int _length) {
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
-    static void ElementSizeShortMaxVectorTestsSmokeTest() {
+    static void ElementSizeShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, Short.SIZE);
+        assertEquals(elsize, Short.SIZE);
     }
 
     @Test
-    static void VectorShapeShortMaxVectorTestsSmokeTest() {
+    static void VectorShapeShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         assert(vsh.equals(VectorShape.S_Max_BIT));
     }
 
     @Test
-    static void ShapeWithLanesShortMaxVectorTestsSmokeTest() {
+    static void ShapeWithLanesShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = vsh.withLanes(short.class);
@@ -7091,32 +7290,32 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void ElementTypeShortMaxVectorTestsSmokeTest() {
+    static void ElementTypeShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementType() == short.class);
     }
 
     @Test
-    static void SpeciesElementSizeShortMaxVectorTestsSmokeTest() {
+    static void SpeciesElementSizeShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().elementSize() == Short.SIZE);
     }
 
     @Test
-    static void VectorTypeShortMaxVectorTestsSmokeTest() {
+    static void VectorTypeShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         assert(av.species().vectorType() == av.getClass());
     }
 
     @Test
-    static void WithLanesShortMaxVectorTestsSmokeTest() {
+    static void WithLanesShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorSpecies species = av.species().withLanes(short.class);
         assert(species.equals(SPECIES));
     }
 
     @Test
-    static void WithShapeShortMaxVectorTestsSmokeTest() {
+    static void WithShapeShortVectorMaxTestsSmokeTest() {
         ShortVector av = ShortVector.zero(SPECIES);
         VectorShape vsh = av.shape();
         VectorSpecies species = av.species().withShape(vsh);
@@ -7124,9 +7323,9 @@ public class ShortMaxVectorTests extends AbstractVectorTest {
     }
 
     @Test
-    static void MaskAllTrueShortMaxVectorTestsSmokeTest() {
+    static void MaskAllTrueShortVectorMaxTestsSmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
 }
diff --git a/test/jdk/jdk/incubator/vector/gen-template.sh b/test/jdk/jdk/incubator/vector/gen-template.sh
index d9bae116da2..d2528b13b78 100644
--- a/test/jdk/jdk/incubator/vector/gen-template.sh
+++ b/test/jdk/jdk/incubator/vector/gen-template.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -511,23 +511,23 @@ gen_binary_bcst_op_no_masked "MAX+max" "Math.max(a, b)"
 gen_saturating_binary_op_associative "SUADD" "VectorMath.addSaturatingUnsigned(a, b)" "BITWISE"
 
 # Reductions.
-gen_reduction_op "AND" "\&" "BITWISE" "-1"
-gen_reduction_op "OR" "|" "BITWISE" "0"
-gen_reduction_op "XOR" "^" "BITWISE" "0"
-gen_reduction_op "ADD" "+" "" "0"
-gen_reduction_op "MUL" "*" "" "1"
-gen_reduction_op_func "MIN" "(\$type\$) Math.min" "" "\$Wideboxtype\$.\$MaxValue\$"
-gen_reduction_op_func "MAX" "(\$type\$) Math.max" "" "\$Wideboxtype\$.\$MinValue\$"
-gen_reduction_op_func "UMIN" "(\$type\$) VectorMath.minUnsigned" "BITWISE" "\$Wideboxtype\$.\$MaxValue\$"
-gen_reduction_op_func "UMAX" "(\$type\$) VectorMath.maxUnsigned" "BITWISE" "\$Wideboxtype\$.\$MinValue\$"
-gen_reduction_op_func "FIRST_NONZERO" "firstNonZero" "" "(\$type\$) 0"
+gen_reduction_op "AND" "\&" "BITWISE" "AND_IDENTITY"
+gen_reduction_op "OR" "|" "BITWISE" "OR_IDENTITY"
+gen_reduction_op "XOR" "^" "BITWISE" "XOR_IDENTITY"
+gen_reduction_op "ADD" "+" "" "ADD_IDENTITY"
+gen_reduction_op "MUL" "*" "" "MUL_IDENTITY"
+gen_reduction_op_func "MIN" "(\$type\$) Math.min" "" "MIN_IDENTITY"
+gen_reduction_op_func "MAX" "(\$type\$) Math.max" "" "MAX_IDENTITY"
+gen_reduction_op_func "UMIN" "(\$type\$) VectorMath.minUnsigned" "BITWISE" "UMIN_IDENTITY"
+gen_reduction_op_func "UMAX" "(\$type\$) VectorMath.maxUnsigned" "BITWISE" "UMAX_IDENTITY"
+gen_reduction_op_func "FIRST_NONZERO" "firstNonZero" "" "FIRST_NONZERO_IDENTITY"
 
 # Boolean reductions.
 gen_bool_reduction_op "anyTrue" "|" "BITWISE" "false"
 gen_bool_reduction_op "allTrue" "\&" "BITWISE" "true"
 
 # Saturating reductions.
-gen_saturating_reduction_op "SUADD" "(\$type\$) VectorMath.addSaturatingUnsigned" "BITWISE" "0"
+gen_saturating_reduction_op "SUADD" "(\$type\$) VectorMath.addSaturatingUnsigned" "BITWISE" "SUADD_IDENTITY"
 
 #Insert
 gen_with_op "withLane" "" "" ""
diff --git a/test/jdk/jdk/incubator/vector/gen-tests.sh b/test/jdk/jdk/incubator/vector/gen-tests.sh
index 8b87d9d9efb..8b5c4cac616 100644
--- a/test/jdk/jdk/incubator/vector/gen-tests.sh
+++ b/test/jdk/jdk/incubator/vector/gen-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ do
   MinValue=MIN_VALUE
 
   kind=BITWISE
+  fpkind=BITWISE
 
   bitstype=$type
   Bitstype=$Type
@@ -99,6 +100,7 @@ do
       ;;
     float)
       kind=FP
+      fpkind=FP32
       bitstype=int
       Bitstype=Int
       Boxbitstype=Integer
@@ -108,6 +110,7 @@ do
       ;;
     double)
       kind=FP
+      fpkind=FP64
       bitstype=long
       Bitstype=Long
       Boxbitstype=Long
@@ -117,13 +120,12 @@ do
       ;;
   esac
 
-  args="$args -K$kind -K$Type -DBoxtype=$Boxtype -DWideboxtype=$Wideboxtype -DMaxValue=$MaxValue -DMinValue=$MinValue"
+  args="$args -K$kind -K$fpkind -K$Type -DBoxtype=$Boxtype -DWideboxtype=$Wideboxtype -DMaxValue=$MaxValue -DMinValue=$MinValue"
   args="$args -Dbitstype=$bitstype -DBitstype=$Bitstype -DBoxbitstype=$Boxbitstype"
   args="$args -Dfptype=$fptype -DFptype=$Fptype -DBoxfptype=$Boxfptype"
 
   abstractvectortype=${typeprefix}${Type}Vector
   abstractvectorteststype=${typeprefix}${Type}VectorTests
-  abstractbitsvectortype=${typeprefix}${Bitstype}Vector
   abstractfpvectortype=${typeprefix}${Fptype}Vector
   args="$args -Dabstractvectortype=$abstractvectortype -Dabstractvectorteststype=$abstractvectorteststype -Dabstractbitsvectortype=$abstractbitsvectortype -Dabstractfpvectortype=$abstractfpvectortype"
 
@@ -133,12 +135,12 @@ do
 
   for bits in 64 128 256 512 Max
   do
-    vectortype=${typeprefix}${Type}${bits}Vector
-    vectorteststype=${typeprefix}${Type}${bits}VectorTests
-    vectorbenchtype=${typeprefix}${Type}${bits}Vector
-    masktype=${typeprefix}${Type}${bits}Mask
-    bitsvectortype=${typeprefix}${Bitstype}${bits}Vector
-    fpvectortype=${typeprefix}${Fptype}${bits}Vector
+    vectortype=${typeprefix}${Type}$Vector{bits}
+    vectorteststype=${typeprefix}${Type}Vector${bits}Tests
+    vectorbenchtype=${typeprefix}${Type}Vector${bits}
+    masktype=${typeprefix}${Type}$Mask{bits}
+    bitsvectortype=${typeprefix}${Bitstype}Vector${bits}
+    fpvectortype=${typeprefix}${Fptype}Vector${bits}
     shape=S${bits}Bit
     Shape=S_${bits}_BIT
     if [[ "${vectortype}" == "ByteMaxVector" ]]; then
@@ -208,12 +210,12 @@ do
   # For each size
   for bits in 64 128 256 512 Max
   do
-    vectortype=${typeprefix}${Type}${bits}Vector
-    vectorteststype=${typeprefix}${Type}${bits}VectorLoadStoreTests
-    vectorbenchtype=${typeprefix}${Type}${bits}VectorLoadStore
-    masktype=${typeprefix}${Type}${bits}Mask
-    bitsvectortype=${typeprefix}${Bitstype}${bits}Vector
-    fpvectortype=${typeprefix}${Fptype}${bits}Vector
+    vectortype=${typeprefix}${Type}Vector${bits}
+    vectorteststype=${typeprefix}${Type}Vector${bits}LoadStoreTests
+    vectorbenchtype=${typeprefix}${Type}Vector${bits}LoadStore
+    masktype=${typeprefix}${Type}Mask${bits}
+    bitsvectortype=${typeprefix}${Bitstype}Vector${bits}
+    fpvectortype=${typeprefix}${Fptype}Vector${bits}
     shape=S${bits}Bit
     Shape=S_${bits}_BIT
     if [[ "${vectortype}" == "ByteMaxVector" ]]; then
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op-func.template b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op-func.template
index bf03a4d0430..73e02bf68dd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op-func.template
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op-func.template
@@ -2,20 +2,15 @@
         $type$[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<$Wideboxtype$> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        $type$ ra = [[TEST_INIT]];
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.[[TEST]], vmask);
-            }
-        }
+        $type$ ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             ra = [[TEST_INIT]];
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                ra = [[TEST_OP]](ra, av.reduceLanes(VectorOperators.[[TEST]], vmask));
+                $type$ v = av.reduceLanes(VectorOperators.[[TEST]], vmask);
+                r[i] = v;
+                ra = [[TEST_OP]](ra, v);
             }
         }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op.template
index f108491523e..82e20d594b6 100644
--- a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-Masked-op.template
@@ -2,20 +2,15 @@
         $type$[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<$Wideboxtype$> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        $type$ ra = [[TEST_INIT]];
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.[[TEST]], vmask);
-            }
-        }
+        $type$ ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             ra = [[TEST_INIT]];
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                ra [[TEST_OP]]= av.reduceLanes(VectorOperators.[[TEST]], vmask);
+                $type$ v = av.reduceLanes(VectorOperators.[[TEST]], vmask);
+                r[i] = v;
+                ra [[TEST_OP]]= v;
             }
         }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op-func.template b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op-func.template
index 7082ff0795e..94fae420cdd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op-func.template
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op-func.template
@@ -1,19 +1,14 @@
         $type$[] a = fa.apply(SPECIES.length());
         $type$[] r = fr.apply(SPECIES.length());
-        $type$ ra = [[TEST_INIT]];
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.[[TEST]]);
-            }
-        }
+        $type$ ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             ra = [[TEST_INIT]];
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                ra = [[TEST_OP]](ra, av.reduceLanes(VectorOperators.[[TEST]]));
+                $type$ v = av.reduceLanes(VectorOperators.[[TEST]]);
+                r[i] = v;
+                ra = [[TEST_OP]](ra, v);
             }
         }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op.template
index 66250c09213..3edc2b27e3e 100644
--- a/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-Reduction-op.template
@@ -1,19 +1,14 @@
         $type$[] a = fa.apply(SPECIES.length());
         $type$[] r = fr.apply(SPECIES.length());
-        $type$ ra = [[TEST_INIT]];
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.[[TEST]]);
-            }
-        }
+        $type$ ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             ra = [[TEST_INIT]];
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                ra [[TEST_OP]]= av.reduceLanes(VectorOperators.[[TEST]]);
+                $type$ v = av.reduceLanes(VectorOperators.[[TEST]]);
+                r[i] = v;
+                ra [[TEST_OP]]= v;
             }
         }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-Masked-op.template
index bf03a4d0430..73e02bf68dd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-Masked-op.template
@@ -2,20 +2,15 @@
         $type$[] r = fr.apply(SPECIES.length());
         boolean[] mask = fm.apply(SPECIES.length());
         VectorMask<$Wideboxtype$> vmask = VectorMask.fromArray(SPECIES, mask, 0);
-        $type$ ra = [[TEST_INIT]];
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.[[TEST]], vmask);
-            }
-        }
+        $type$ ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             ra = [[TEST_INIT]];
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                ra = [[TEST_OP]](ra, av.reduceLanes(VectorOperators.[[TEST]], vmask));
+                $type$ v = av.reduceLanes(VectorOperators.[[TEST]], vmask);
+                r[i] = v;
+                ra = [[TEST_OP]](ra, v);
             }
         }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-op.template b/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-op.template
index 7082ff0795e..94fae420cdd 100644
--- a/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Kernel-SaturatingReduction-op.template
@@ -1,19 +1,14 @@
         $type$[] a = fa.apply(SPECIES.length());
         $type$[] r = fr.apply(SPECIES.length());
-        $type$ ra = [[TEST_INIT]];
-
-        for (int ic = 0; ic < INVOC_COUNT; ic++) {
-            for (int i = 0; i < a.length; i += SPECIES.length()) {
-                $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                r[i] = av.reduceLanes(VectorOperators.[[TEST]]);
-            }
-        }
+        $type$ ra = 0;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             ra = [[TEST_INIT]];
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
-                ra = [[TEST_OP]](ra, av.reduceLanes(VectorOperators.[[TEST]]));
+                $type$ v = av.reduceLanes(VectorOperators.[[TEST]]);
+                r[i] = v;
+                ra = [[TEST_OP]](ra, v);
             }
         }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Broadcast.template b/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Broadcast.template
index e3fcdf57e83..92e612e8184 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Broadcast.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Broadcast.template
@@ -10,7 +10,7 @@
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] [[TEST_OP]] b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] [[TEST_OP]] b[i]);
             }
         }
     }
@@ -30,7 +30,7 @@
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] [[TEST_OP]] b[i]));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] [[TEST_OP]] b[i]));
             }
         }
     }
@@ -47,7 +47,7 @@
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] [[TEST_OP]] ($type$)((long)b[i]));
+                assertEquals(mv.laneIsSet(j), a[i + j] [[TEST_OP]] ($type$)((long)b[i]));
             }
         }
     }
@@ -67,7 +67,7 @@
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] [[TEST_OP]] ($type$)((long)b[i])));
+                assertEquals(mv.laneIsSet(j), mask[j] && (a[i + j] [[TEST_OP]] ($type$)((long)b[i])));
             }
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Masked.template b/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Masked.template
index b34658ffc4c..6620dc679b8 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Masked.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Compare-Masked.template
@@ -16,7 +16,7 @@
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), mask[j] && [[TEST_OP]](a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), mask[j] && [[TEST_OP]](a[i + j], b[i + j]));
                 }
             }
         }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Compare.template b/test/jdk/jdk/incubator/vector/templates/Unit-Compare.template
index 47ddfaf4ab0..f3c7b52f70f 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Compare.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Compare.template
@@ -12,7 +12,7 @@
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), [[TEST_OP]](a[i + j], b[i + j]));
+                    assertEquals(mv.laneIsSet(j), [[TEST_OP]](a[i + j], b[i + j]));
                 }
             }
         }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template b/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template
index 784ef5f81b9..3f8bd186ca4 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Mask-FromToLong.template
@@ -5,10 +5,10 @@
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i] & bits);
+                assertEquals(r[i], a[i] & bits);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], a[i] & bits, "(" + a[i] + ") at index #" + i);
         }
     }
 
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template b/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
index 460f7624f2c..8411565628d 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Miscellaneous.template
@@ -10,7 +10,7 @@
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] < b[i]);
             }
         }
     }
@@ -26,7 +26,7 @@
 
             // Check results as part of computation.
             for (int j = 0; j < SPECIES.length(); j++) {
-                Assert.assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
+                assertEquals(mv.laneIsSet(j), a[i + j] == b[i]);
             }
         }
     }
@@ -350,7 +350,7 @@
             int subarr[] = Arrays.copyOfRange(a, i, i + SPECIES.length());
             int expectedHash = Objects.hash(SPECIES, Arrays.hashCode(subarr));
             Assert.assertTrue(hash == expectedHash, "at index " + i + ", hash should be = " + expectedHash + ", but is = " + hash);
-            Assert.assertEquals(length, SPECIES.length());
+            assertEquals(length, SPECIES.length());
         }
     }
 
@@ -378,7 +378,7 @@
             var bv = VectorShuffle.fromArray(SPECIES, b, i);
             boolean eq = av.equals(bv);
             int to = i + SPECIES.length();
-            Assert.assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
+            assertEquals(eq, Arrays.equals(a, i, to, b, i, to));
         }
     }
 
@@ -393,7 +393,7 @@
                 var bv = SPECIES.loadMask(b, i);
                 boolean equals = av.equals(bv);
                 int to = i + SPECIES.length();
-                Assert.assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
+                assertEquals(equals, Arrays.equals(a, i, to, b, i, to));
             }
         }
     }
@@ -496,7 +496,7 @@
                 trueCount = vmask.trueCount();
                 var rmask = vmask.compress();
                 for (int j = 0; j < SPECIES.length(); j++)  {
-                    Assert.assertEquals(rmask.laneIsSet(j), j < trueCount);
+                    assertEquals(rmask.laneIsSet(j), j < trueCount);
                 }
             }
         }
@@ -522,7 +522,7 @@
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 int index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -536,7 +536,7 @@
             assert(actualMask.equals(expectedMask));
             for (int j = 0; j < SPECIES.length(); j++)  {
                 long index = i + j + offset;
-                Assert.assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
+                assertEquals(actualMask.laneIsSet(j), index >= 0 && index < limit);
             }
         }
     }
@@ -558,7 +558,7 @@
     static void loopBound$vectorteststype$SmokeTest(int length) {
         int actualLoopBound = SPECIES.loopBound(length);
         int expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test(dataProvider = "lengthProvider")
@@ -566,14 +566,14 @@
         long length = _length;
         long actualLoopBound = SPECIES.loopBound(length);
         long expectedLoopBound = length - Math.floorMod(length, SPECIES.length());
-        Assert.assertEquals(actualLoopBound, expectedLoopBound);
+        assertEquals(actualLoopBound, expectedLoopBound);
     }
 
     @Test
     static void ElementSize$vectorteststype$SmokeTest() {
         $abstractvectortype$ av = $abstractvectortype$.zero(SPECIES);
         int elsize = av.elementSize();
-        Assert.assertEquals(elsize, $Wideboxtype$.SIZE);
+        assertEquals(elsize, $Wideboxtype$.SIZE);
     }
 
     @Test
@@ -627,6 +627,6 @@
     @Test
     static void MaskAllTrue$vectorteststype$SmokeTest() {
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-          Assert.assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
+          assertEquals(SPECIES.maskAll(true).toLong(), -1L >>> (64 - SPECIES.length()));
         }
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op-func.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op-func.template
index e6bcdb83c2e..4be33efd57c 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op-func.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op-func.template
@@ -5,3 +5,26 @@
         assertReductionArraysEquals(r, ra, a,
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
     }
+
+    @Test(dataProvider = "$type$UnaryOpProvider")
+    static void [[TEST]]ReduceIdentityValueTests(IntFunction<$type$[]> fa) {
+        $type$[] a = fa.apply(SPECIES.length());
+        $type$ id = [[TEST_INIT]];
+
+        assertEquals([[TEST_OP]](id, id), id,
+                            "[[TEST]]([[TEST_INIT]], [[TEST_INIT]]) != [[TEST_INIT]]");
+
+        $type$ x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals([[TEST_OP]](id, x), x);
+                assertEquals([[TEST_OP]](x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals([[TEST_OP]](id, x), x,
+                                "[[TEST]]([[TEST_INIT]], " + x + ") != " + x);
+            assertEquals([[TEST_OP]](x, id), x,
+                                "[[TEST]](" + x + ", [[TEST_INIT]]) != " + x);
+        }
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
index 5638940045d..25ae3ba2f12 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
@@ -9,3 +9,26 @@
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
 #end[FP]
     }
+
+    @Test(dataProvider = "$type$UnaryOpProvider")
+    static void [[TEST]]ReduceIdentityValueTests(IntFunction<$type$[]> fa) {
+        $type$[] a = fa.apply(SPECIES.length());
+        $type$ id = [[TEST_INIT]];
+
+        assertEquals(($type$) (id [[TEST_OP]] id), id,
+                            "[[TEST]]([[TEST_INIT]], [[TEST_INIT]]) != [[TEST_INIT]]");
+
+        $type$ x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals(($type$) (id [[TEST_OP]] x), x);
+                assertEquals(($type$) (x [[TEST_OP]] id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals(($type$) (id [[TEST_OP]] x), x,
+                                "[[TEST]]([[TEST_INIT]], " + x + ") != " + x);
+            assertEquals(($type$) (x [[TEST_OP]] id), x,
+                                "[[TEST]](" + x + ", [[TEST_INIT]]) != " + x);
+        }
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-SaturatingReduction-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-SaturatingReduction-op.template
index fdd9e47167e..4769b67fe3e 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-SaturatingReduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-SaturatingReduction-op.template
@@ -5,3 +5,26 @@
         assertReductionArraysEquals(r, ra, a,
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
     }
+
+    @Test(dataProvider = "$type$SaturatingUnaryOpProvider")
+    static void [[TEST]]ReduceIdentityValueTests(IntFunction<$type$[]> fa) {
+        $type$[] a = fa.apply(SPECIES.length());
+        $type$ id = [[TEST_INIT]];
+
+        assertEquals([[TEST_OP]](id, id), id,
+                            "[[TEST]]([[TEST_INIT]], [[TEST_INIT]]) != [[TEST_INIT]]");
+
+        $type$ x = 0;
+        try {
+            for (int i = 0; i < a.length; i++) {
+                x = a[i];
+                assertEquals([[TEST_OP]](id, x), x);
+                assertEquals([[TEST_OP]](x, id), x);
+            }
+        } catch (AssertionError e) {
+            assertEquals([[TEST_OP]](id, x), x,
+                                "[[TEST]]([[TEST_INIT]], " + x + ") != " + x);
+            assertEquals([[TEST_OP]](x, id), x,
+                                "[[TEST]](" + x + ", [[TEST_INIT]]) != " + x);
+        }
+    }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Test.template b/test/jdk/jdk/incubator/vector/templates/Unit-Test.template
index 080773ede1a..8af517cfe56 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Test.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Test.template
@@ -14,7 +14,7 @@
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j), test[[TEST]](a[i + j]));
+                    assertEquals(mv.laneIsSet(j), test[[TEST]](a[i + j]));
                 }
             }
         }
@@ -34,7 +34,7 @@
 
                 // Check results as part of computation.
                 for (int j = 0; j < SPECIES.length(); j++) {
-                    Assert.assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && test[[TEST]](a[i + j]));
+                    assertEquals(mv.laneIsSet(j),  vmask.laneIsSet(j) && test[[TEST]](a[i + j]));
                 }
             }
         }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Zero.template b/test/jdk/jdk/incubator/vector/templates/Unit-Zero.template
index a277d66ae3e..a5b13c1ab00 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Zero.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Zero.template
@@ -2,5 +2,5 @@
     @Test(dataProvider = "$type$UnaryOpProvider")
     static void Zero$vectorteststype$(IntFunction<$type$[]> fa) {
 [[KERNEL]]
-        Assert.assertEquals(a, r);
+        assertEquals(a, r);
     }
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
index 7e00cb1678c..00a7766492c 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,19 +86,84 @@ public class $vectorteststype$ extends AbstractVectorTest {
 #end[MaxBit]
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
+    static void assertEquals($type$ actual, $type$ expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals($type$ actual, $type$ expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+    static void assertEquals($type$ actual, $type$ expected, $type$ delta) {
+        Assert.assertEquals(actual, expected, delta);
+    }
+    static void assertEquals($type$ actual, $type$ expected, $type$ delta, String msg) {
+        Assert.assertEquals(actual, expected, delta, msg);
+    }
+    static void assertEquals($type$ [] actual, $type$ [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals($type$ [] actual, $type$ [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+#if[!long]
+    static void assertEquals(long actual, long expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(long actual, long expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+#end[!long]
+    static void assertEquals(String actual, String expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(Object actual, Object expected) {
+        Assert.assertEquals(actual, expected);
+    }
+#if[!FP64]
+    static void assertEquals(double actual, double expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(double actual, double expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+#end[!FP64]
+    static void assertEquals(boolean actual, boolean expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals(boolean actual, boolean expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
 
 #if[MaxBit]
+
     static VectorShape getMaxBit() {
         return VectorShape.S_Max_BIT;
     }
 
     private static final int Max = 256;  // juts so we can do N/$bits$
 #end[MaxBit]
-
 #if[BITWISE]
+
     private static final $type$ CONST_SHIFT = $Boxtype$.SIZE / 2;
 #end[BITWISE]
+
+    // Identity values for reduction operations
+    private static final $type$ ADD_IDENTITY = ($type$)0;
+#if[BITWISE]
+    private static final $type$ AND_IDENTITY = ($type$)-1;
+#end[BITWISE]
+    private static final $type$ FIRST_NONZERO_IDENTITY = ($type$)0;
+    private static final $type$ MAX_IDENTITY = $Wideboxtype$.$MinValue$;
+    private static final $type$ MIN_IDENTITY = $Wideboxtype$.$MaxValue$;
+    private static final $type$ MUL_IDENTITY = ($type$)1;
+#if[BITWISE]
+    private static final $type$ OR_IDENTITY = ($type$)0;
+    private static final $type$ SUADD_IDENTITY = ($type$)0;
+    private static final $type$ UMAX_IDENTITY = ($type$)0;   // Minimum unsigned value
+    private static final $type$ UMIN_IDENTITY = ($type$)-1;  // Maximum unsigned value
+    private static final $type$ XOR_IDENTITY = ($type$)0;
+#end[BITWISE]
 #if[FP]
+
     // for floating point addition reduction ops that may introduce rounding errors
     private static final $type$ RELATIVE_ROUNDING_ERROR_FACTOR_ADD = ($type$)10.0;
 
@@ -136,10 +201,10 @@ public class $vectorteststype$ extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], f.apply(a[i]), "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -151,13 +216,13 @@ public class $vectorteststype$ extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a[i]));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a[i]);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -167,10 +232,10 @@ public class $vectorteststype$ extends AbstractVectorTest {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? f.apply(a[i]) : a[i], "at index #" + i + ", input = " + a[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -189,13 +254,13 @@ public class $vectorteststype$ extends AbstractVectorTest {
 #else[FP]
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
 #end[FP]
     }
@@ -206,13 +271,13 @@ public class $vectorteststype$ extends AbstractVectorTest {
                                             $type$ relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
+                assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
+            assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 #end[FP]
@@ -232,13 +297,13 @@ public class $vectorteststype$ extends AbstractVectorTest {
 #else[FP]
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
 #end[FP]
     }
@@ -249,14 +314,14 @@ public class $vectorteststype$ extends AbstractVectorTest {
                                             $type$ relativeError) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
+                assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] *
 relativeError));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), Math.abs(rc * relativeError), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), Math.abs(r[i] * relativeError), "at index #" + i);
         }
     }
 #end[FP]
@@ -274,13 +339,13 @@ relativeError));
                                             FReductionOpLong f, FReductionAllOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a));
+            assertEquals(rc, fa.apply(a));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(rc, fa.apply(a), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -296,13 +361,13 @@ relativeError));
                                             FReductionMaskedOpLong f, FReductionAllMaskedOpLong fa) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a, mask));
+            assertEquals(rc, fa.apply(a, mask));
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i, mask));
+                assertEquals(r[i], f.apply(a, i, mask));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
+            assertEquals(rc, fa.apply(a, mask), "Final result is incorrect!");
+            assertEquals(r[i], f.apply(a, i, mask), "at index #" + i);
         }
     }
 #end[!Long]
@@ -315,10 +380,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -330,10 +395,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i));
+                assertEquals(r[i], f.apply(a, i));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a, i), "at index #" + i);
+            assertEquals(r[i], f.apply(a, i), "at index #" + i);
         }
     }
 
@@ -342,12 +407,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                    assertEquals(r[i+j], a[i+order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
+            assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]]);
         }
     }
 
@@ -358,20 +423,20 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + k], a[i + j]);
+                        assertEquals(r[i + k], a[i + j]);
                         k++;
                     }
                 }
                 for (; k < vector_len; k++) {
-                    Assert.assertEquals(r[i + k], ($type$)0);
+                    assertEquals(r[i + k], ($type$)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + k;
             if (m[(i + j) % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + j], "at index #" + idx);
+                assertEquals(r[idx], a[i + j], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], ($type$)0, "at index #" + idx);
+                assertEquals(r[idx], ($type$)0, "at index #" + idx);
             }
         }
     }
@@ -383,19 +448,19 @@ relativeError));
                 k = 0;
                 for (j = 0; j < vector_len; j++) {
                     if (m[(i + j) % SPECIES.length()]) {
-                        Assert.assertEquals(r[i + j], a[i + k]);
+                        assertEquals(r[i + j], a[i + k]);
                         k++;
                     } else {
-                        Assert.assertEquals(r[i + j], ($type$)0);
+                        assertEquals(r[i + j], ($type$)0);
                     }
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (m[idx % SPECIES.length()]) {
-                Assert.assertEquals(r[idx], a[i + k], "at index #" + idx);
+                assertEquals(r[idx], a[i + k], "at index #" + idx);
             } else {
-                Assert.assertEquals(r[idx], ($type$)0, "at index #" + idx);
+                assertEquals(r[idx], ($type$)0, "at index #" + idx);
             }
         }
     }
@@ -411,11 +476,11 @@ relativeError));
                     wrapped_index = Math.floorMod((int)order[idx], 2 * vector_len);
                     is_exceptional_idx = wrapped_index >= vector_len;
                     oidx = is_exceptional_idx ? (wrapped_index - vector_len) : wrapped_index;
-                    Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
+                    assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
+            assertEquals(r[idx], (is_exceptional_idx ? b[i + oidx] : a[i + oidx]), "at index #" + idx + ", order = " + order[idx] + ", a = " + a[i + oidx] + ", b = " + b[i + oidx]);
         }
     }
 
@@ -424,12 +489,12 @@ relativeError));
         try {
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
-                    Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                    assertEquals(r[i+j], a[i+(int)order[i+j]]);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
-            Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
+            assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]]);
         }
     }
 
@@ -439,17 +504,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+order[i+j]]);
+                         assertEquals(r[i+j], a[i+order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], ($type$)0);
+                         assertEquals(r[i+j], ($type$)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+order[i+j]], "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], ($type$)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], ($type$)0, "at index #" + idx + ", input = " + a[i+order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -459,17 +524,17 @@ relativeError));
             for (; i < a.length; i += vector_len) {
                 for (j = 0; j < vector_len; j++) {
                     if (mask[j % SPECIES.length()])
-                         Assert.assertEquals(r[i+j], a[i+(int)order[i+j]]);
+                         assertEquals(r[i+j], a[i+(int)order[i+j]]);
                     else
-                         Assert.assertEquals(r[i+j], ($type$)0);
+                         assertEquals(r[i+j], ($type$)0);
                 }
             }
         } catch (AssertionError e) {
             int idx = i + j;
             if (mask[j % SPECIES.length()])
-                Assert.assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], a[i+(int)order[i+j]], "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
             else
-                Assert.assertEquals(r[i+j], ($type$)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
+                assertEquals(r[i+j], ($type$)0, "at index #" + idx + ", input = " + a[i+(int)order[i+j]] + ", mask = " + mask[j % SPECIES.length()]);
         }
     }
 
@@ -483,10 +548,10 @@ relativeError));
 
         try {
             for (i = 0; i < a.length; i++) {
-                Assert.assertEquals(r[i], a[i]);
+                assertEquals(r[i], a[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
+            assertEquals(r[i], a[i], "at index #" + i + ", input = " + a[i]);
         }
     }
 
@@ -498,10 +563,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i]));
+                assertEquals(r[i], f.apply(a[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i]), "(" + a[i] + ") at index #" + i);
         }
     }
 
@@ -513,10 +578,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -537,18 +602,18 @@ relativeError));
         try {
             for (; i < a.length; i++) {
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i]), c[i]), "left associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i])), "right associative test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -563,18 +628,18 @@ relativeError));
             for (; i < a.length; i++) {
                 mask_bit = mask[i % SPECIES.length()];
                 //Left associative
-                Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
+                assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit));
 
                 //Right associative
-                Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
+                assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit));
 
                 //Results equal sanity check
-                Assert.assertEquals(rl[i], rr[i]);
+                assertEquals(rl[i], rr[i]);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
-            Assert.assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
+            assertEquals(rl[i], f.apply(f.apply(a[i], b[i], mask_bit), c[i], mask_bit), "left associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rr[i], f.apply(a[i], f.apply(b[i], c[i], mask_bit), mask_bit), "right associative masked test at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i] + ", mask = " + mask_bit);
+            assertEquals(rl[i], rr[i], "Result checks not equal at index #" + i + "leftRes = " + rl[i] + ", rightRes = " + rr[i]);
         }
     }
 
@@ -582,10 +647,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i]));
+                assertEquals(r[i], f.apply(a[i], b[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b[i]), "(" + a[i] + ", " + b[i] + ") at index #" + i);
         }
     }
 
@@ -593,10 +658,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b));
+                assertEquals(r[i], f.apply(a[i], b));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
+            assertEquals(r[i], f.apply(a[i], b), "(" + a[i] + ", " + b + ") at index #" + i);
         }
     }
 
@@ -604,10 +669,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()]),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -616,10 +681,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
+                assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()])));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
+            assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()])),
                                 "(" + a[i] + ", " + b[(i / SPECIES.length()) * SPECIES.length()] + ") at index #" + i);
         }
     }
@@ -632,10 +697,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -647,10 +712,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
+            assertEquals(r[i], f.apply(a[i], b, mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
 
@@ -662,10 +727,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -680,10 +745,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()]), mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
+            assertEquals(r[i], f.apply(a[i], ($type$)((long)b[(i / SPECIES.length()) * SPECIES.length()]),
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -696,11 +761,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -714,11 +779,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], b[j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", input2 = " + b[j] + ", mask = " + mask[i]);
         }
     }
 
@@ -740,11 +805,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j]));
+                    assertEquals(r[i+j], f.apply(a[i+j]));
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
+            assertEquals(r[i+j], f.apply(a[i+j]), "at index #" + i + ", " + j);
         }
     }
 
@@ -758,11 +823,11 @@ relativeError));
         try {
             for (; j < a.length; j += SPECIES.length()) {
                 for (i = 0; i < SPECIES.length(); i++) {
-                    Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
+                    assertEquals(r[i+j], f.apply(a[i+j], mask[i]));
                 }
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
+            assertEquals(r[i+j], f.apply(a[i+j], mask[i]), "at index #" + i + ", input1 = " + a[i+j] + ", mask = " + mask[i]);
         }
     }
 
@@ -782,10 +847,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
+            assertEquals(r[i], f.apply(a[i], b[i], c[i]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " + c[i]);
         }
     }
 
@@ -797,10 +862,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
+            assertEquals(r[i], f.apply(a[i], b[i], c[i], mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = "
               + b[i] + ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
         }
     }
@@ -809,10 +874,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " + b[i] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
         }
@@ -822,10 +887,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i]), "at index #" +
                                 i + ", input1 = " + a[i] + ", input2 = " +
                                 b[(i / SPECIES.length()) * SPECIES.length()] + ",  input3 = " + c[i]);
         }
@@ -841,11 +906,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[i], c[(i / SPECIES.length()) * SPECIES.length()],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] + ", input2 = " +
                                 b[i] + ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
                                 mask[i % SPECIES.length()]);
@@ -862,11 +927,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                     mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()], c[i],
                                 mask[i % SPECIES.length()]), "at index #" + i + ", input1 = " + a[i] +
                                 ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[i] + ", mask = " + mask[i % SPECIES.length()]);
@@ -877,11 +942,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()]), "at index #" + i + ", input1 = " + a[i]
                                 + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] + ", input3 = " +
                                 c[(i / SPECIES.length()) * SPECIES.length()]);
@@ -898,11 +963,11 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+                assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                     c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]));
             }
         } catch (AssertionError err) {
-            Assert.assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
+            assertEquals(r[i], f.apply(a[i], b[(i / SPECIES.length()) * SPECIES.length()],
                                 c[(i / SPECIES.length()) * SPECIES.length()], mask[i % SPECIES.length()]), "at index #"
                                 + i + ", input1 = " + a[i] + ", input2 = " + b[(i / SPECIES.length()) * SPECIES.length()] +
                                 ", input3 = " + c[(i / SPECIES.length()) * SPECIES.length()] + ", mask = " +
@@ -996,13 +1061,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, b, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, i, b, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -1023,13 +1088,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, i, mask, b, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -1044,13 +1109,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(r, a, i, mask, b, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(r, a, i, mask, b, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref,
+            assertEquals(res, ref,
               "(ref: " + Arrays.toString(ref) + ", res: " + Arrays.toString(res) + ", a: "
               + Arrays.toString(Arrays.copyOfRange(a, i, i+SPECIES.length()))
               + ", b: "
@@ -1071,13 +1136,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, origin, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, origin, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i);
         }
@@ -1091,13 +1156,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1112,13 +1177,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, mask, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, mask, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin);
@@ -1133,13 +1198,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, part, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1155,13 +1220,13 @@ relativeError));
         int i = 0;
         try {
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
+                assertEquals(Arrays.copyOfRange(r, i, i+SPECIES.length()),
                   f.apply(a, b, origin, part, mask, i));
             }
         } catch (AssertionError e) {
             $type$[] ref = f.apply(a, b, origin, part, mask, i);
             $type$[] res = Arrays.copyOfRange(r, i, i+SPECIES.length());
-            Assert.assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
+            assertEquals(res, ref, "(ref: " + Arrays.toString(ref)
               + ", res: " + Arrays.toString(res)
               + "), at index #" + i
               + ", at origin #" + origin
@@ -1211,10 +1276,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (int)(a[i+offs]));
+                assertEquals(r[i], (int)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (int)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 
@@ -1261,10 +1326,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 #end[byte]
@@ -1273,10 +1338,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (long)(a[i+offs]));
+                assertEquals(r[i], (long)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (long)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 #if[!Double]
@@ -1285,10 +1350,10 @@ relativeError));
         int i = 0;
         try {
             for (; i < r.length; i++) {
-                Assert.assertEquals(r[i], (double)(a[i+offs]));
+                assertEquals(r[i], (double)(a[i+offs]));
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
+            assertEquals(r[i], (double)(a[i+offs]), "at index #" + i + ", input = " + a[i+offs]);
         }
     }
 #end[!Double]
@@ -1940,7 +2005,7 @@ relativeError));
         // Do some zipping and shuffling.
         $abstractvectortype$ io = ($abstractvectortype$) SPECIES.broadcast(0).addIndex(1);
         $abstractvectortype$ io2 = ($abstractvectortype$) VectorShuffle.iota(SPECIES,0,1,false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
         $abstractvectortype$ a = io.add(($type$)1); //[1,2]
         $abstractvectortype$ b = a.neg();  //[-1,-2]
         $type$[] abValues = bothToArray(a,b); //[1,2,-1,-2]
@@ -1955,19 +2020,19 @@ relativeError));
             manual[i+0] = abValues[i/2];
             manual[i+1] = abValues[a.length() + i/2];
         }
-        Assert.assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
+        assertEquals(Arrays.toString(zabValues), Arrays.toString(manual));
         VectorShuffle<$Boxtype$> unz0 = VectorShuffle.makeUnzip(SPECIES, 0);
         VectorShuffle<$Boxtype$> unz1 = VectorShuffle.makeUnzip(SPECIES, 1);
         $abstractvectortype$ uab0 = zab0.rearrange(unz0,zab1);
         $abstractvectortype$ uab1 = zab0.rearrange(unz1,zab1);
         $type$[] abValues1 = bothToArray(uab0, uab1);
-        Assert.assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
+        assertEquals(Arrays.toString(abValues), Arrays.toString(abValues1));
     }
 
     static void iotaShuffle() {
         $abstractvectortype$ io = ($abstractvectortype$) SPECIES.broadcast(0).addIndex(1);
         $abstractvectortype$ io2 = ($abstractvectortype$) VectorShuffle.iota(SPECIES, 0 , 1, false).toVector();
-        Assert.assertEquals(io, io2);
+        assertEquals(io, io2);
     }
 
     @Test
@@ -1985,12 +2050,12 @@ relativeError));
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
         VectorSpecies<?> asIntegralSpecies = asIntegral.species();
         Assert.assertNotEquals(asIntegralSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asIntegralSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
+        assertEquals(asIntegralSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asIntegralSpecies.length(), SPECIES.length());
+        assertEquals(asIntegral.viewAsFloatingLanes().species(), SPECIES);
 #else[FP]
         Vector<?> asIntegral = SPECIES.zero().viewAsIntegralLanes();
-        Assert.assertEquals(asIntegral.species(), SPECIES);
+        assertEquals(asIntegral.species(), SPECIES);
 #end[FP]
     }
 #if[FP]
@@ -1998,7 +2063,7 @@ relativeError));
     @Test
     void viewAsFloatingLanesTest() {
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
-        Assert.assertEquals(asFloating.species(), SPECIES);
+        assertEquals(asFloating.species(), SPECIES);
     }
 #else[FP]
 #if[byteOrShort]
@@ -2014,9 +2079,9 @@ relativeError));
         Vector<?> asFloating = SPECIES.zero().viewAsFloatingLanes();
         VectorSpecies<?> asFloatingSpecies = asFloating.species();
         Assert.assertNotEquals(asFloatingSpecies.elementType(), SPECIES.elementType());
-        Assert.assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
-        Assert.assertEquals(asFloatingSpecies.length(), SPECIES.length());
-        Assert.assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
+        assertEquals(asFloatingSpecies.vectorShape(), SPECIES.vectorShape());
+        assertEquals(asFloatingSpecies.length(), SPECIES.length());
+        assertEquals(asFloating.viewAsIntegralLanes().species(), SPECIES);
     }
 #end[byteOrShort]
 #end[FP]
diff --git a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
index a68103e1060..6779c78a490 100644
--- a/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
+++ b/test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,14 +81,29 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / $bits$);
 
+    static void assertEquals($type$ actual, $type$ expected) {
+        Assert.assertEquals(actual, expected);
+    }
+
+    static void assertEquals($type$ actual, $type$ expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
+    static void assertEquals($type$ [] actual, $type$ [] expected) {
+        Assert.assertEquals(actual, expected);
+    }
+    static void assertEquals($type$ [] actual, $type$ [] expected, String msg) {
+        Assert.assertEquals(actual, expected, msg);
+    }
+
     static void assertArraysEquals($type$[] r, $type$[] a, boolean[] mask) {
         int i = 0;
         try {
             for (; i < a.length; i++) {
-                Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : ($type$) 0);
+                assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : ($type$) 0);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : ($type$) 0, "at index #" + i);
+            assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : ($type$) 0, "at index #" + i);
         }
     }
 
@@ -342,7 +357,7 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
                 av.intoArray(r, i);
             }
         }
-        Assert.assertEquals(r, a);
+        assertEquals(r, a);
     }
 
     @Test(dataProvider = "$type$ProviderForIOOBE")
@@ -1225,11 +1240,11 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], a[i + indexMap[j]]);
+                    assertEquals(r[j], a[i + indexMap[j]]);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
+            assertEquals(r[j], a[i + indexMap[j]], "at index #" + j);
         }
     }
 
@@ -1240,11 +1255,11 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
             for (; i < a.length; i += SPECIES.length()) {
                 j = i;
                 for (; j < i + SPECIES.length(); j++) {
-                    Assert.assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: ($type$) 0);
+                    assertEquals(r[j], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: ($type$) 0);
                 }
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: ($type$) 0, "at index #" + j);
+            assertEquals(r[i], mask[j % SPECIES.length()] ? a[i + indexMap[j]]: ($type$) 0, "at index #" + j);
         }
     }
 
@@ -1260,7 +1275,7 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     static void assertScatterArraysEquals($type$[] r, $type$[] a, int[] indexMap) {
@@ -1273,7 +1288,7 @@ public class $vectorteststype$ extends AbstractVectorLoadStoreTest {
             }
         }
 
-        Assert.assertEquals(r, expected);
+        assertEquals(r, expected);
     }
 
     @DataProvider
diff --git a/test/jdk/jdk/internal/loader/URLClassPath/JarManifestClassPathOrder.java b/test/jdk/jdk/internal/loader/URLClassPath/JarManifestClassPathOrder.java
new file mode 100644
index 00000000000..c1cda1d448a
--- /dev/null
+++ b/test/jdk/jdk/internal/loader/URLClassPath/JarManifestClassPathOrder.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/*
+ * @test
+ * @summary Verify that URLClassPath discovers JAR Class-Path URLs in the expected order
+ * @run junit JarManifestClassPathOrder
+ */
+public class JarManifestClassPathOrder {
+
+    // Name of the JAR resource use for lookups
+    private static final String ENTRY_NAME = "JarClassPathOrdering.txt";
+
+    /**
+     * Verify that URLClassPath discovers JAR files in the expected order when
+     * only root JARs are on the 'original' class path and the other JARs are
+     * found via multiple levels of Class-Path Manifest attributes.
+     *
+     * @throws IOException if an unexpected error occurs
+     */
+    @Test
+    public void shouldLoadJARsInExpectedOrder() throws IOException {
+
+        // Set up a 'Class-Path' JAR tree of depth 3
+        JarTree specs = new JarTree();
+        specs.addJars(3);
+
+        // List of "root" JAR file URLs to use for URLClassLoader
+        List<URL> searchPath = new ArrayList<>();
+
+        // Order of JAR files we expect URLClassPath to find after a DFS search
+        List<String> expectedJarNames = new ArrayList<>();
+
+        for (JarSpec spec : specs.dfs) {
+            Path jar = createJar(spec);
+            expectedJarNames.add(jar.getFileName().toString());
+            // Only root JARs in the search path, others are discovered transitively via "Class-Path"
+            if (spec.isRoot()) {
+                searchPath.add(jar.toUri().toURL());
+            }
+        }
+
+        // Load ENTRY_NAME to identify all JARs found by URLClassPath
+        try (URLClassLoader loader = new URLClassLoader(searchPath.toArray(new URL[0]))) {
+            Enumeration<URL> resources = loader.getResources(ENTRY_NAME);
+            // Collect all JAR file names in the order discovered by URLClassPath
+            List<String> actualJarNames = Collections.list(resources)
+                    .stream()
+                    .map(this::extractJarName)
+                    .collect(Collectors.toList());
+            // JARs should be found in DFS order
+            assertEquals(expectedJarNames, actualJarNames, "JAR files not found in expected order");
+        }
+    }
+
+    // Extract file name of JAR file from a JAR URL
+    private String extractJarName(URL url) {
+        String jarPath = url.getPath().substring(0, url.getPath().indexOf("!/"));
+        String jarName = jarPath.substring(jarPath.lastIndexOf('/') + 1);
+        return jarName;
+    }
+
+    // Create a JAR file according to the spec, possibly including a Class-Path attribute
+    private Path createJar(JarSpec spec) throws IOException {
+        Path file = Path.of(spec.name +".jar");
+        Manifest man = new Manifest();
+        Attributes attrs = man.getMainAttributes();
+        attrs.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+
+        // Set Class-Path attribute
+        if (!spec.children.isEmpty()) {
+            String path = String.join(" ", spec.children
+                    .stream()
+                    .map(js -> js.name +".jar")
+                    .collect(Collectors.toList()));
+            attrs.put(Attributes.Name.CLASS_PATH, path);
+        }
+
+        try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(file), man)) {
+            // All JARs include the same entry
+            out.putNextEntry(new JarEntry(ENTRY_NAME));
+        }
+
+        return file;
+    }
+
+
+    // Helper class to represent a tree of JARs related by "Class-Path"
+    static class JarTree {
+        static final List<String> NAMES = List.of("a", "b", "c");
+        List<JarSpec> dfs = new ArrayList<>();
+
+        private void addJar(String prefix, String name, JarSpec parent, int depth, int maxDepth) {
+            if (depth > maxDepth) {
+                return;
+            }
+            JarSpec spec = new JarSpec(prefix + name, parent);
+            dfs.add(spec);
+
+            if (parent != null) {
+                parent.children.add(spec);
+            }
+
+            for (String childName : NAMES) {
+                addJar(prefix + name, childName, spec, depth + 1, maxDepth);
+            }
+        }
+
+        /* Make a tree of JARs related by the 'Class-Path' Manifest attribute:
+         * a.jar
+         *  aa.jar
+         *    aaa.jar
+         *    aab.jar
+         * [...]
+         *    ccc.jar
+         */
+        public void addJars(int maxDepth) {
+            for (String name : NAMES) {
+                addJar("", name, null, 1, maxDepth);
+            }
+        }
+    }
+
+    // Helper class to represent a JAR file to be found by URLClassPath
+    static class JarSpec {
+        final String name;
+        final JarSpec parent;
+        final List<JarSpec> children = new ArrayList<>();
+
+        JarSpec(String name, JarSpec parent) {
+            this.name = name;
+            this.parent = parent;
+        }
+        boolean isRoot() {
+            return parent == null;
+        }
+    }
+}
diff --git a/test/jdk/jdk/internal/misc/VM/RuntimeArguments.java b/test/jdk/jdk/internal/misc/VM/RuntimeArguments.java
index dbcb30255a8..b86593d84ba 100644
--- a/test/jdk/jdk/internal/misc/VM/RuntimeArguments.java
+++ b/test/jdk/jdk/internal/misc/VM/RuntimeArguments.java
@@ -24,6 +24,7 @@
 /**
  * @test
  * @requires vm.flagless
+ * @requires test.thread.factory == null
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.zipfs
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
index 7d5dbca6f7c..4b487934169 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
@@ -91,7 +91,8 @@ public class TestDockerMemoryMetricsSubgroup {
             .addDockerOpts("--volume", Utils.TEST_JDK + ":/jdk")
             .addDockerOpts("--privileged")
             .addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
-            .addDockerOpts("--memory", outerGroupMemorySize);
+            .addDockerOpts("--memory", outerGroupMemorySize)
+            .addDockerOpts("-e", "LANG=C.UTF-8");
         opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
             "echo " + innerSize + " > /sys/fs/cgroup/memory/test/memory.limit_in_bytes ; " +
             "echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
@@ -112,6 +113,7 @@ public class TestDockerMemoryMetricsSubgroup {
             .addDockerOpts("--volume", Utils.TEST_JDK + ":/jdk")
             .addDockerOpts("--privileged")
             .addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
+            .addDockerOpts("-e", "LANG=C.UTF-8")
             .addDockerOpts("--memory", outerGroupMemorySize);
         opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
             "echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
diff --git a/test/jdk/jdk/internal/vm/ThreadSnapshot/ThreadNotAlive.java b/test/jdk/jdk/internal/vm/ThreadSnapshot/ThreadNotAlive.java
new file mode 100644
index 00000000000..6b9905e2fa4
--- /dev/null
+++ b/test/jdk/jdk/internal/vm/ThreadSnapshot/ThreadNotAlive.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Test jdk.internal.vm.ThreadSnapshot.of(Thread) when thread is not alive
+ * @modules java.base/jdk.internal.vm
+ * @compile/module=java.base jdk/internal/vm/Helper.java
+ * @run junit ThreadNotAlive
+ */
+
+import jdk.internal.vm.Helper;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ThreadNotAlive {
+
+    @Test
+    void unstartedPlatformThread() {
+        Thread t = Thread.ofPlatform().unstarted(() -> { });
+        assertFalse(Helper.isAlive(t));
+    }
+
+    @Test
+    void terminatedPlatformThread() throws InterruptedException {
+        Thread t = Thread.ofPlatform().start(() -> { });
+        t.join();
+        assertFalse(Helper.isAlive(t));
+    }
+
+    @Test
+    void unstartedVirtualhread() {
+        Thread t = Thread.ofVirtual().unstarted(() -> { });
+        assertFalse(Helper.isAlive(t));
+    }
+
+    @Test
+    void terminatedVirtualThread() throws InterruptedException {
+        Thread t = Thread.ofVirtual().start(() -> { });
+        t.join();
+        assertFalse(Helper.isAlive(t));
+    }
+
+}
diff --git a/test/jdk/jdk/internal/vm/ThreadSnapshot/java.base/jdk/internal/vm/Helper.java b/test/jdk/jdk/internal/vm/ThreadSnapshot/java.base/jdk/internal/vm/Helper.java
new file mode 100644
index 00000000000..99be9d2241a
--- /dev/null
+++ b/test/jdk/jdk/internal/vm/ThreadSnapshot/java.base/jdk/internal/vm/Helper.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.vm;
+
+/**
+ * Defines methods that use package-private methods on ThreadSnapshot.
+ */
+public class Helper {
+
+    /**
+     * Uses ThreadSnapshot.of(Thread) to take a snapshot of the given thread, returning
+     * {@code true} if the thread is alive.
+     */
+    public static boolean isAlive(Thread thread) {
+        return ThreadSnapshot.of(thread) != null;
+    }
+}
diff --git a/test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java b/test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java
index 1234655f31a..960a4ca73d2 100644
--- a/test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 package jdk.jfr.api.recording.misc;
 
+import jdk.jfr.FlightRecorder;
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
 import jdk.jfr.consumer.RecordedEvent;
@@ -79,8 +80,14 @@ public class TestRecordingCopy {
         Asserts.assertEquals(stoppedCopy.getState(), RecordingState.STOPPED);
         assertCopy(stoppedCopy, original);
 
-        // Clean-up
         original.close();
+        int beforeCount  = FlightRecorder.getFlightRecorder().getRecordings().size();
+        Recording closedCopy = original.copy(true);
+        Asserts.assertEquals(closedCopy.getState(), RecordingState.CLOSED);
+        int afterCount = FlightRecorder.getFlightRecorder().getRecordings().size();
+        Asserts.assertEquals(beforeCount, afterCount);
+
+        // Clean-up
         runningCopy.stop();
         runningCopy.close();
         stoppedCopy.close();
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java
index b2f20450d0d..b6f96e9f244 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZAllocationStallEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,8 @@ import jdk.test.lib.jfr.Events;
  * @requires vm.hasJFR & vm.gc.Z
  * @requires vm.flagless
  * @library /test/lib /test/jdk /test/hotspot/jtreg
- * @run main/othervm -XX:+UseZGC -Xmx32M -Xlog:gc*:gc.log::filecount=0 jdk.jfr.event.gc.detailed.TestZAllocationStallEvent
+ * @run main/othervm -XX:+UseZGC -Xmx64M -Xlog:gc*:gc.log::filecount=0
+ *                   jdk.jfr.event.gc.detailed.TestZAllocationStallEvent
  */
 
 public class TestZAllocationStallEvent {
@@ -47,7 +48,7 @@ public class TestZAllocationStallEvent {
             recording.start();
 
             // Allocate many large objects quickly, to outrun the GC
-            for (int i = 0; i < 100; i++) {
+            for (int i = 0; i < 1000; i++) {
                 blackHole(new byte[4 * 1024 * 1024]);
             }
 
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java
index e64d6f83ab8..6217de6e235 100644
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestZRelocationSetEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@ package jdk.jfr.event.gc.detailed;
 
 import java.util.List;
 
-import static gc.testlibrary.Allocation.blackHole;
 import jdk.jfr.Recording;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.EventNames;
@@ -36,7 +35,7 @@ import jdk.test.lib.jfr.Events;
  * @requires vm.hasJFR & vm.gc.Z
  * @requires vm.flagless
  * @library /test/lib /test/jdk /test/hotspot/jtreg
- * @run main/othervm -XX:+UseZGC -Xmx32M jdk.jfr.event.gc.detailed.TestZRelocationSetEvent
+ * @run main/othervm -XX:+UseZGC -Xmx64M jdk.jfr.event.gc.detailed.TestZRelocationSetEvent
  */
 
 public class TestZRelocationSetEvent {
diff --git a/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java b/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java
index d540acd853b..b3630fa7f77 100644
--- a/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java
+++ b/test/jdk/jdk/jfr/event/oldobject/TestEmergencyDumpAtOOM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2025, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -98,8 +98,8 @@ public class TestEmergencyDumpAtOOM {
             // Check OldObjectSample events
             if (oldObjects.get() > 0L) {
                 if (shouldCrash) {
-                    Asserts.assertEquals("VM Error", shutdownReason.get());
-                    Asserts.assertEquals("Out of Memory", dumpReason.get());
+                    Asserts.assertEquals("CrashOnOutOfMemoryError", shutdownReason.get());
+                    Asserts.assertEquals("CrashOnOutOfMemoryError", dumpReason.get());
                 } else {
                     Asserts.assertEquals("No remaining non-daemon Java threads", shutdownReason.get());
                 }
diff --git a/test/jdk/jdk/nio/zipfs/EndOfCenValidation.java b/test/jdk/jdk/nio/zipfs/EndOfCenValidation.java
new file mode 100644
index 00000000000..ed0bdbb52ea
--- /dev/null
+++ b/test/jdk/jdk/nio/zipfs/EndOfCenValidation.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @modules java.base/jdk.internal.util
+ * @summary Verify that ZipFileSystem rejects files with CEN sizes exceeding the implementation limit
+ * @library /test/lib
+ * @build jdk.test.lib.util.ZipUtils
+ * @run junit/othervm EndOfCenValidation
+ */
+
+import jdk.internal.util.ArraysSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.zip.ZipException;
+
+import static jdk.test.lib.util.ZipUtils.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * This test augments {@link TestTooManyEntries}. It creates sparse ZIPs where
+ * the CEN size is inflated to the desired value. This helps this test run
+ * fast with much less resources.
+ *
+ * While the CEN in these files are zero-filled and the produced ZIPs are technically
+ * invalid, the CEN is never actually read by ZipFileSystem since it does
+ * 'End of central directory record' (END header) validation before reading the CEN.
+ */
+public class EndOfCenValidation {
+
+    // Zip files produced by this test
+    static final Path CEN_TOO_LARGE_ZIP = Path.of("cen-size-too-large.zip");
+    static final Path INVALID_CEN_SIZE = Path.of("invalid-zen-size.zip");
+    static final Path BAD_CEN_OFFSET_ZIP = Path.of("bad-cen-offset.zip");
+    static final Path BAD_ENTRY_COUNT_ZIP = Path.of("bad-entry-count.zip");
+
+    // Maximum allowed CEN size allowed by ZipFileSystem
+    static final int MAX_CEN_SIZE = ArraysSupport.SOFT_MAX_ARRAY_LENGTH;
+
+    /**
+     * Delete big files after test, in case the file system did not support sparse files.
+     * @throws IOException if an error occurs
+     */
+    @AfterEach
+    public void cleanup() throws IOException {
+        Files.deleteIfExists(CEN_TOO_LARGE_ZIP);
+        Files.deleteIfExists(INVALID_CEN_SIZE);
+        Files.deleteIfExists(BAD_CEN_OFFSET_ZIP);
+        Files.deleteIfExists(BAD_ENTRY_COUNT_ZIP);
+    }
+
+    /**
+     * Validates that an 'End of central directory record' (END header) with a CEN
+     * length exceeding {@link #MAX_CEN_SIZE} limit is rejected
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void shouldRejectTooLargeCenSize() throws IOException {
+        int size = MAX_CEN_SIZE + 1;
+        Path zip = zipWithModifiedEndRecord(size, true, 0, CEN_TOO_LARGE_ZIP);
+        verifyRejection(zip, INVALID_CEN_SIZE_TOO_LARGE);
+    }
+
+    /**
+     * Validate that an 'End of central directory record' (END header)
+     * where the value of the CEN size field exceeds the position of
+     * the END header is rejected.
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void shouldRejectInvalidCenSize() throws IOException {
+        int size = MAX_CEN_SIZE;
+        Path zip = zipWithModifiedEndRecord(size, false, 0, INVALID_CEN_SIZE);
+        verifyRejection(zip, INVALID_CEN_BAD_SIZE);
+    }
+
+    /**
+     * Validate that an 'End of central directory record' (the END header)
+     * where the value of the CEN offset field is larger than the position
+     * of the END header minus the CEN size is rejected
+     * @throws IOException if an error occurs
+     */
+    @Test
+    public void shouldRejectInvalidCenOffset() throws IOException {
+        int size = MAX_CEN_SIZE;
+        Path zip = zipWithModifiedEndRecord(size, true, 100, BAD_CEN_OFFSET_ZIP);
+        verifyRejection(zip, INVALID_CEN_BAD_OFFSET);
+    }
+
+    /**
+     * Validate that a 'Zip64 End of Central Directory' record (the END header)
+     * where the value of the 'total entries' field is larger than what fits
+     * in the CEN size is rejected.
+     *
+     * @throws IOException if an error occurs
+     */
+    @ParameterizedTest
+    @ValueSource(longs = {
+            -1,                   // Negative
+            Long.MIN_VALUE,       // Very negative
+            0x3B / 3L - 1,        // Cannot fit in test ZIP's CEN
+            MAX_CEN_SIZE / 3 + 1, // Too large to allocate int[] entries array
+            Long.MAX_VALUE        // Unreasonably large
+    })
+    public void shouldRejectBadTotalEntries(long totalEntries) throws IOException {
+        Path zip = zip64WithModifiedTotalEntries(BAD_ENTRY_COUNT_ZIP, totalEntries);
+        verifyRejection(zip, INVALID_BAD_ENTRY_COUNT);
+    }
+
+    /**
+     * Verify that ZipFileSystem.newFileSystem rejects the ZIP file with a ZipException
+     * with the given message
+     * @param zip ZIP file to open
+     * @param msg exception message to expect
+     */
+    private static void verifyRejection(Path zip, String msg) {
+        ZipException ex = assertThrows(ZipException.class, () -> {
+            FileSystems.newFileSystem(zip);
+        });
+        assertEquals(msg, ex.getMessage());
+    }
+}
diff --git a/test/jdk/jdk/nio/zipfs/PathOps.java b/test/jdk/jdk/nio/zipfs/PathOps.java
index 0fefd16fa0f..b976894a301 100644
--- a/test/jdk/jdk/nio/zipfs/PathOps.java
+++ b/test/jdk/jdk/nio/zipfs/PathOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,10 +30,10 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.ProviderMismatchException;
 
-/**
+/*
  *
  * @test
- * @bug 8038500 8040059 8139956 8146754 8172921 8186142
+ * @bug 8038500 8040059 8139956 8146754 8172921 8186142 8326487
  * @summary Tests path operations for zip provider.
  *
  * @modules jdk.zipfs
@@ -92,6 +92,10 @@ public class PathOps {
         check(result, Boolean.toString(expected));
     }
 
+    void check(Object result, int expected) {
+        check(result, Integer.toString(expected));
+    }
+
     PathOps root(String expected) {
         out.println("check root");
         checkPath();
@@ -113,6 +117,13 @@ public class PathOps {
         return this;
     }
 
+    PathOps nameCount(int expected) {
+        out.println("check nameCount");
+        checkPath();
+        check(path.getNameCount(), expected);
+        return this;
+    }
+
     PathOps element(int index, String expected) {
         out.format("check element %d\n", index);
         checkPath();
@@ -284,7 +295,15 @@ public class PathOps {
         test("/")
             .root("/")
             .parent(null)
-            .name(null);
+            .name(null)
+            .nameCount(0);
+
+        // empty name
+        test("")
+            .root(null)
+            .parent(null)
+            .name("")
+            .nameCount(1);
 
         // no root component
         test("a/b")
diff --git a/test/jdk/sun/awt/image/ImageRepresentation/LUTCompareTest.java b/test/jdk/sun/awt/image/ImageRepresentation/LUTCompareTest.java
index aca2ff1071c..498fe227651 100644
--- a/test/jdk/sun/awt/image/ImageRepresentation/LUTCompareTest.java
+++ b/test/jdk/sun/awt/image/ImageRepresentation/LUTCompareTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,13 @@
 
 /*
  * @test
- * @bug     6570475
+ * @bug     6570475 8375338
  * @summary Test verifies that palette comparison procedure of
  *          ImageRepresentation class does not produce extra transparent
  *          pixels.
  *
- * @run     main LUTCompareTest
+ * @run     main/othervm LUTCompareTest
+ * @run     main/othervm -Xcheck:jni LUTCompareTest
  */
 
 
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java b/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java
index 61359084297..1f4707fab3b 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java
+++ b/test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015, Red Hat Inc
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -205,6 +206,7 @@ public class JMXInterfaceBindingTest {
             // This is needed for testing on loopback
             args.add("-Djava.rmi.server.hostname=" + address);
             if (useSSL) {
+                args.add("-Djdk.rmi.ssl.client.enableEndpointIdentification=false");
                 args.add("-Dcom.sun.management.jmxremote.registry.ssl=true");
                 args.add("-Djavax.net.ssl.keyStore=" + KEYSTORE_LOC);
                 args.add("-Djavax.net.ssl.trustStore=" + TRUSTSTORE_LOC);
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
index 2a99c5e7d52..b62d3f1bbd7 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -169,6 +169,7 @@ public class RmiBootstrapTest extends RmiTestBase {
         final List<Path> credentialFiles = prepareTestFiles(args[0]);
 
         Security.setProperty("jdk.tls.disabledAlgorithms", "");
+        System.setProperty("jdk.rmi.ssl.client.enableEndpointIdentification", "false");
 
         try {
             MAX_GET_FREE_PORT_TRIES = Integer.parseInt(System.getProperty("test.getfreeport.max.tries", "10"));
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java b/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java
index 1aa20937962..b4ef5e224f8 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java
+++ b/test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java
@@ -179,6 +179,7 @@ public class RmiRegistrySslTest {
             initTestEnvironment();
 
             List<String> command = new ArrayList<>();
+            command.add("-Djdk.rmi.ssl.client.enableEndpointIdentification=false");
             command.add("-Dtest.src=" + TEST_SRC);
             command.add("-Dtest.rmi.port=" + port);
             command.addAll(Arrays.asList(args));
diff --git a/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/GetServerCertificates.java b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/GetServerCertificates.java
new file mode 100644
index 00000000000..5de0d7aeb1a
--- /dev/null
+++ b/test/jdk/sun/net/www/protocol/https/HttpsURLConnection/GetServerCertificates.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 8376031
+ * @modules jdk.httpserver
+ * @library /test/lib
+ * @summary Ensure HttpsURLConnection::getServerCertificates does not
+ *   throw after calling getResponseCode() if the response doesn't have
+ *   a body.
+ * @run main/othervm ${test.main.class}
+ * @run main/othervm -Djava.net.preferIPv6Addresses=true ${test.main.class}
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.net.URIBuilder;
+
+import static com.sun.net.httpserver.HttpExchange.RSPBODY_EMPTY;
+
+
+public class GetServerCertificates {
+
+    static final String URI_PATH = "/GetServerCertificates/";
+    static final String BODY = "Go raibh maith agat";
+    enum TESTS {
+        HEAD("head", 200, "HEAD"),
+        NOBODY("nobody", 200, "GET", "POST"),
+        S204("204", 204, "GET", "POST"),
+        S304("304", 304, "GET", "POST"),
+        S200("200", 200, "GET", "POST");
+        final String test;
+        final int code;
+        final List<String> methods;
+        private TESTS(String test, int code, String... methods) {
+            this.test = test;
+            this.code = code;
+            this.methods = List.of(methods);
+        }
+        boolean isFor(String path) {
+            return path != null && path.endsWith("/" + test);
+        }
+
+        String test() { return test; }
+        int code() { return code; }
+        List<String> methods() { return methods; }
+        static Optional<TESTS> fromPath(String path) {
+            return Stream.of(values())
+                    .filter(test -> test.isFor(path))
+                    .findFirst();
+        }
+    }
+
+     void test(String[] args) throws Exception {
+         SSLContext.setDefault(SimpleSSLContext.findSSLContext());
+         HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
+             @Override
+             public boolean verify(String hostname, SSLSession session) {
+                 return true;
+             }
+         });
+         HttpServer server = startHttpServer();
+         try {
+            InetSocketAddress address = server.getAddress();
+            URI uri = URIBuilder.newBuilder()
+                                .scheme("https")
+                                .host(address.getAddress())
+                                .port(address.getPort())
+                                .path(URI_PATH)
+                                .build();
+            for (var test : TESTS.values()) {
+                for (String method : test.methods()) {
+                    doClient(method, uri, test);
+                }
+            }
+
+        } finally {
+             server.stop(1000);
+         }
+    }
+
+    void doClient(String method, URI baseUri, TESTS test) throws Exception {
+        assert baseUri.getRawQuery() == null;
+        assert baseUri.getRawFragment() == null;
+        assert test.methods().contains(method);
+
+        String uriStr = baseUri.toString();
+        if (!uriStr.endsWith("/")) uriStr = uriStr + "/";
+
+        URI uri = new URI(uriStr + test.test());
+        assert uri.toString().endsWith("/" + test.test());
+        int code = test.code();
+        System.out.println("doClient(%s, %s, %s)"
+                .formatted(method, test.test(), test.code));
+
+        // first request - should create a TCP connection
+        HttpsURLConnection uc = (HttpsURLConnection)
+                uri.toURL().openConnection(Proxy.NO_PROXY);
+        if (!"GET".equals(method)) {
+            uc.setRequestMethod(method);
+        }
+        try {
+            uc.getServerCertificates();
+            throw new AssertionError("Expected IllegalStateException not thrown");
+        } catch (IllegalStateException ise) {
+            System.out.println("Got expected ISE: " + ise);
+        }
+        int resp = uc.getResponseCode();
+        check(resp == code, "Unexpected response code. Expected %s, got %s"
+                .formatted(code, resp));
+
+        check(uc.getServerCertificates());
+        if (test == TESTS.S200) {
+            byte[] bytes = uc.getInputStream().readAllBytes();
+            String body = new String(bytes, StandardCharsets.UTF_8);
+            System.out.println("body: " + body);
+            check(BODY.equals(body), "Unexpected response body. Expected \"%s\", got \"%s\""
+                    .formatted(BODY, body));
+        }
+
+        // second request - should go on the same TCP connection.
+        // We don't have a reliable way to test that, and it could
+        // go on a new TCP connection if the previous connection
+        // was already closed. It is not an issue either way.
+        uc = (HttpsURLConnection)
+                uri.toURL().openConnection(Proxy.NO_PROXY);
+        if (!"GET".equals(method)) {
+            uc.setRequestMethod(method);
+        }
+        try {
+            uc.getServerCertificates();
+            throw new AssertionError("Expected IllegalStateException not thrown");
+        } catch (IllegalStateException ise) {
+            System.out.println("Got expected ISE: " + ise);
+        }
+        resp = uc.getResponseCode();
+        check(resp == code, "Unexpected response code. Expected %s, got %s"
+                .formatted(code, resp));
+
+        check(uc.getServerCertificates());
+        if (test == TESTS.S200) {
+            byte[] bytes = uc.getInputStream().readAllBytes();
+            String body = new String(bytes, StandardCharsets.UTF_8);
+            System.out.println("body: " + body);
+            check(BODY.equals(body), "Unexpected response body. Expected \"%s\", got \"%s\""
+                    .formatted(BODY, body));
+        }
+
+        uc.disconnect();
+        try {
+            uc.getServerCertificates();
+            throw new AssertionError("Expected IllegalStateException not thrown");
+        } catch (IllegalStateException ise) {
+            System.out.println("Got expected ISE: " + ise);
+        }
+
+        // third request - forces the connection to close
+        // after use so that we don't find any connection in the pool
+        // for the next test case, assuming there was only
+        // one connection in the first place.
+        // Again there's no easy way to verify that the pool
+        // is empty (and it's not really necessary to bother)
+        uc = (HttpsURLConnection)
+                uri.toURL().openConnection(Proxy.NO_PROXY);
+        if (!"GET".equals(method)) {
+            uc.setRequestMethod(method);
+        }
+        uc.setRequestProperty("Connection", "close");
+        try {
+            uc.getServerCertificates();
+            throw new AssertionError("Expected IllegalStateException not thrown");
+        } catch (IllegalStateException ise) {
+            System.out.println("Got expected ISE: " + ise);
+        }
+        resp = uc.getResponseCode();
+        check(resp == code, "Unexpected response code. Expected %s, got %s"
+                .formatted(code, resp));
+        check(uc.getServerCertificates());
+        uc.disconnect();
+        try {
+            uc.getServerCertificates();
+            throw new AssertionError("Expected IllegalStateException not thrown");
+        } catch (IllegalStateException ise) {
+            System.out.println("Got expected ISE: " + ise);
+        }
+    }
+
+    // HTTP Server
+    HttpServer startHttpServer() throws IOException {
+        InetAddress localhost = InetAddress.getLoopbackAddress();
+        HttpsServer httpServer = HttpsServer
+                .create(new InetSocketAddress(localhost, 0), 0);
+        var configurator = new HttpsConfigurator(SimpleSSLContext.findSSLContext());
+        httpServer.setHttpsConfigurator(configurator);
+        httpServer.createContext(URI_PATH, new SimpleHandler());
+        httpServer.start();
+        return httpServer;
+    }
+
+    static class SimpleHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            try {
+                String path = t.getRequestURI().getRawPath();
+                var test = TESTS.fromPath(path);
+                if (!path.startsWith(URI_PATH) || !test.isPresent()) {
+                    t.getRequestBody().close();
+                    t.getResponseHeaders().add("Connection", "close");
+                    t.sendResponseHeaders(421, RSPBODY_EMPTY);
+                    t.close();
+                    return;
+                }
+                try (var is = t.getRequestBody()) {
+                    is.readAllBytes();
+                }
+                switch (test.get()) {
+                    case S204, S304, NOBODY ->
+                        t.sendResponseHeaders(test.get().code(), RSPBODY_EMPTY);
+                    case S200 -> {
+                        byte[] bytes = BODY.getBytes(StandardCharsets.UTF_8);
+                        t.sendResponseHeaders(test.get().code(), bytes.length);
+                        try (var os = t.getResponseBody()) {
+                            os.write(bytes);
+                        }
+                    }
+                    case HEAD -> {
+                        assert t.getRequestMethod().equals("HEAD");
+                        byte[] bytes = BODY.getBytes(StandardCharsets.UTF_8);
+                        t.sendResponseHeaders(test.get().code(), bytes.length);
+                    }
+                }
+                t.close();
+            } catch (Throwable error) {
+                error.printStackTrace();
+                throw error;
+            }
+        }
+    }
+
+    volatile int passed = 0, failed = 0;
+    boolean debug = false;
+    void pass() {passed++;}
+    void fail() {failed++;}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void debug(String message) { if (debug) System.out.println(message); }
+    void check(boolean cond, String failMessage) {if (cond) pass(); else fail(failMessage);}
+    void check(java.security.cert.Certificate[] certs) {
+        // Use List.of to check that certs is not null and does not
+        // contain null. NullPointerException will be thrown here
+        // if that happens, which will make the test fail.
+        check(!List.of(certs).isEmpty(), "no certificates returned");
+    }
+    public static void main(String[] args) throws Throwable {
+        Class<?> k = new Object(){}.getClass().getEnclosingClass();
+        try {k.getMethod("instanceMain",String[].class)
+                .invoke( k.newInstance(), (Object) args);}
+        catch (Throwable e) {throw e.getCause();}}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/test/jdk/sun/net/www/protocol/jar/JarURLConnectionCertsAndCodeSigners.java b/test/jdk/sun/net/www/protocol/jar/JarURLConnectionCertsAndCodeSigners.java
new file mode 100644
index 00000000000..9b786938e10
--- /dev/null
+++ b/test/jdk/sun/net/www/protocol/jar/JarURLConnectionCertsAndCodeSigners.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.JarURLConnection;
+import java.net.URI;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.CodeSigner;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipFile;
+
+import jdk.security.jarsigner.JarSigner;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import sun.security.tools.keytool.CertAndKeyGen;
+import sun.security.x509.X500Name;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+/*
+ * @test
+ * @bug 8378003
+ * @summary Verify that JarURLConnection.getCertificates() and
+ *          JarURLConnection.getJarEntry().getCodeSigners() returns the
+ *          expected results for entries in a signed JAR file
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.tools.keytool
+ * @run junit ${test.main.class}
+ */
+class JarURLConnectionCertsAndCodeSigners {
+
+    private static final String JAR_ENTRY_NAME = "foo-bar";
+    private static final String CERT_SUBJECT = "CN=duke";
+    private static Path SIGNED_JAR;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        final KeyStore.PrivateKeyEntry key = generatePrivateKey();
+        SIGNED_JAR = createSignedJar(key);
+    }
+
+    /*
+     * Verifies that JarURLConnection.getCertificates() returns the correct
+     * certificates for entries in a signed JAR file.
+     */
+    @Test
+    void testCertificates() throws Exception {
+        final URI uri = new URI("jar:" + SIGNED_JAR.toUri() + "!/" + JAR_ENTRY_NAME);
+        System.err.println("running test against signed JAR entry: " + uri);
+        final URLConnection urlConn = uri.toURL().openConnection();
+        assertInstanceOf(JarURLConnection.class, urlConn, "unexpected URLConnection type");
+        final JarURLConnection jarURLConn = (JarURLConnection) urlConn;
+        try (InputStream is = jarURLConn.getInputStream()) {
+            is.readAllBytes();
+        }
+        Certificate[] prevIterationCerts = null;
+        for (int i = 1; i <= 2; i++) {
+            final Certificate[] certs = jarURLConn.getCertificates();
+            assertNotNull(certs, "null certificates for signed JAR entry: " + uri);
+            assertNotEquals(0, certs.length, "empty certificates for signed JAR entry: " + uri);
+            assertInstanceOf(X509Certificate.class, certs[0], "unexpected certificate type");
+            final String subject = ((X509Certificate) certs[0]).getSubjectX500Principal().getName();
+            assertEquals(CERT_SUBJECT, subject, "unexpected subject in certificate");
+            if (i > 1) {
+                // verify that each call to getCertificates() returns
+                // a new instance of the array.
+                // intentional identity check
+                assertNotSame(prevIterationCerts, certs, "getCertificates() did not return" +
+                        " a new array");
+            }
+            prevIterationCerts = certs;
+        }
+    }
+
+    /*
+     * Verifies that JarURLConnection.getJarEntry().getCodeSigners() returns the correct
+     * codesigners for entries in a signed JAR file.
+     */
+    @Test
+    void testCodeSigners() throws Exception {
+        final URI uri = new URI("jar:" + SIGNED_JAR.toUri() + "!/" + JAR_ENTRY_NAME);
+        System.err.println("running test against signed JAR entry: " + uri);
+        final URLConnection urlConn = uri.toURL().openConnection();
+        assertInstanceOf(JarURLConnection.class, urlConn, "unexpected URLConnection type");
+        final JarURLConnection jarURLConn = (JarURLConnection) urlConn;
+        try (InputStream is = jarURLConn.getInputStream()) {
+            is.readAllBytes();
+        }
+        CodeSigner[] prevIterationCodeSigners = null;
+        for (int i = 1; i <= 2; i++) {
+            final CodeSigner[] codeSigners = jarURLConn.getJarEntry().getCodeSigners();
+            assertNotNull(codeSigners, "null codesigners for signed JAR entry: " + uri);
+            assertNotEquals(0, codeSigners.length, "empty codesigners for signed JAR entry: " + uri);
+            final List<? extends Certificate> certs = codeSigners[0].getSignerCertPath().getCertificates();
+            assertNotNull(certs, "null certificates from codesigner");
+            assertNotEquals(0, certs.size(), "empty certificates from codesigner");
+            assertInstanceOf(X509Certificate.class, certs.getFirst(), "unexpected certificate type");
+            final String subject = ((X509Certificate) certs.getFirst()).getSubjectX500Principal().getName();
+            assertEquals(CERT_SUBJECT, subject, "unexpected subject in certificate");
+            if (i > 1) {
+                // verify that each call to getCodeSigners() returns
+                // a new instance of the array.
+                // intentional identity check
+                assertNotSame(prevIterationCodeSigners, codeSigners, "getCodeSigners() did not"
+                        + " return a new array");
+            }
+            prevIterationCodeSigners = codeSigners;
+        }
+    }
+
+    private static KeyStore.PrivateKeyEntry generatePrivateKey() throws Exception {
+        final CertAndKeyGen gen = new CertAndKeyGen("RSA", "SHA256withRSA");
+        gen.generate(1048); // Small key size makes test run faster
+        final long oneDay = TimeUnit.DAYS.toSeconds(1);
+        final Certificate cert = gen.getSelfCertificate(new X500Name(CERT_SUBJECT), oneDay);
+        return new KeyStore.PrivateKeyEntry(gen.getPrivateKey(), new Certificate[]{cert});
+    }
+
+    private static Path createSignedJar(final KeyStore.PrivateKeyEntry privateKey)
+            throws Exception {
+
+        // first create a unsigned JAR
+        final Path unsignedJar = Path.of("test-8377985-unsigned.jar");
+        final Manifest manifest = new Manifest();
+        final Attributes mainAttributes = manifest.getMainAttributes();
+        mainAttributes.putValue("Manifest-Version", "1.0");
+        try (OutputStream os = Files.newOutputStream(unsignedJar);
+             JarOutputStream jaros = new JarOutputStream(os, manifest)) {
+            jaros.putNextEntry(new JarEntry(JAR_ENTRY_NAME));
+            jaros.write(new byte[]{0x42});
+            jaros.closeEntry();
+        }
+
+        // use a JarSigner to sign the JAR
+        final JarSigner signer = new JarSigner.Builder(privateKey)
+                .signerName("abcdef")
+                .digestAlgorithm("SHA-256")
+                .signatureAlgorithm("SHA256withRSA")
+                .build();
+
+        final Path signedJar = Path.of("test-8377985-signed.jar");
+        try (ZipFile zip = new ZipFile(unsignedJar.toFile());
+             OutputStream out = Files.newOutputStream(signedJar)) {
+            signer.sign(zip, out);
+        }
+        return signedJar;
+    }
+}
diff --git a/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java b/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
index a8f50dddb53..4c9ab1faf81 100644
--- a/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
+++ b/test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6687725
+ * @bug 6687725 8365883
  * @summary Test internal PKCS5Padding impl with various error conditions.
  * @author Valerie Peng
  * @library /test/lib ..
@@ -34,6 +34,8 @@
 import java.security.AlgorithmParameters;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
+import java.security.Security;
+import java.util.Arrays;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
@@ -63,21 +65,35 @@ public class TestPKCS5PaddingError extends PKCS11Test {
     };
 
     private static StringBuffer debugBuf = new StringBuffer();
+    private static final String sunJCEProvider =
+            System.getProperty("test.provider.name", "SunJCE");
 
     @Override
     public void main(Provider p) throws Exception {
-        try {
-            byte[] plainText = new byte[200];
 
-            for (int i = 0; i < TEST_LIST.length; i++) {
-                CI currTest = TEST_LIST[i];
+        // Checking for SunJCE first
+        System.out.println("Checking " + sunJCEProvider + " provider");
+        doTest(Security.getProvider(sunJCEProvider));
+
+        System.out.printf("Checking %s provider%n", p.getName());
+        doTest(p);
+    }
+
+    private void doTest(final Provider p) throws Exception {
+        try {
+            byte[] plainText = "testtexttesttext".getBytes(); // 16 bytes text
+
+            for (CI currTest : TEST_LIST) {
                 System.out.println("===" + currTest.transformation + "===");
                 try {
                     KeyGenerator kg =
                             KeyGenerator.getInstance(currTest.keyAlgo, p);
                     SecretKey key = kg.generateKey();
-                    Cipher c1 = Cipher.getInstance(currTest.transformation,
-                               System.getProperty("test.provider.name", "SunJCE"));
+                    // Encrypting without padding to guarantee bad padding
+                    // exception when decrypting
+                    Cipher c1 = Cipher.getInstance(currTest.transformation
+                                    .replace("/PKCS5Padding", "/NoPadding"),
+                            sunJCEProvider);
                     c1.init(Cipher.ENCRYPT_MODE, key);
                     byte[] cipherText = c1.doFinal(plainText);
                     AlgorithmParameters params = c1.getParameters();
@@ -85,30 +101,42 @@ public class TestPKCS5PaddingError extends PKCS11Test {
                     c2.init(Cipher.DECRYPT_MODE, key, params);
 
                     // 1st test: wrong output length
-                    // NOTE: Skip NSS since it reports CKR_DEVICE_ERROR when
-                    // the data passed to its EncryptUpdate/DecryptUpdate is
-                    // not multiple of blocks
+                    // NOTE: Skip NSS since it reports CKR_DEVICE_ERROR when the
+                    // data passed to its EncryptUpdate and
+                    // CKR_ENCRYPTED_DATA_LEN_RANGE when passed through
+                    // DecryptUpdate are not multiple of blocks
                     if (!p.getName().equals("SunPKCS11-NSS")) {
                         try {
                             System.out.println("Testing with wrong cipherText length");
                             c2.doFinal(cipherText, 0, cipherText.length - 2);
+                            throw new RuntimeException(
+                                    "Expected IBSE NOT thrown");
                         } catch (IllegalBlockSizeException ibe) {
                             // expected
                         } catch (Exception ex) {
                             System.out.println("Error: Unexpected Ex " + ex);
-                            ex.printStackTrace();
+                            throw ex;
                         }
                     }
                     // 2nd test: wrong padding value
                     try {
                         System.out.println("Testing with wrong padding bytes");
-                        cipherText[cipherText.length - 1]++;
-                        c2.doFinal(cipherText);
+                        byte[] result = c2.doFinal(cipherText);
+
+                        final String errorDescription =
+                                "Decrypted text " + Arrays.toString(result);
+                        if (Arrays.equals(result, plainText)) {
+                            System.out.println("WARNING: initial text and " +
+                                               "decoded text are the same");
+                        }
+                        System.out.println(errorDescription);
+                        throw new RuntimeException(
+                                "Expected BPE NOT thrown \n" + errorDescription);
                     } catch (BadPaddingException bpe) {
                         // expected
                     } catch (Exception ex) {
                         System.out.println("Error: Unexpected Ex " + ex);
-                        ex.printStackTrace();
+                        throw ex;
                     }
                     System.out.println("DONE");
                 } catch (NoSuchAlgorithmException nsae) {
@@ -119,13 +147,12 @@ public class TestPKCS5PaddingError extends PKCS11Test {
         } catch (Exception ex) {
             // print out debug info when exception is encountered
             if (debugBuf != null) {
-                System.out.println(debugBuf.toString());
+                System.out.println(debugBuf);
                 debugBuf = new StringBuffer();
             }
             throw ex;
         }
     }
-
     public static void main(String[] args) throws Exception {
         main(new TestPKCS5PaddingError(), args);
     }
diff --git a/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java b/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
index 8799f2305bf..a54bb501f78 100644
--- a/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
+++ b/test/jdk/sun/security/pkcs11/tls/fips/FipsModeTLS.java
@@ -34,8 +34,12 @@
  *      -Djdk.tls.useExtendedMasterSecret=false
  *      -Djdk.tls.client.enableSessionTicketExtension=false FipsModeTLS
  * @comment SunPKCS11 does not support (TLS1.2) SunTlsExtendedMasterSecret yet.
- *   Stateless resumption doesn't currently work with NSS-FIPS, see JDK-8368669
- * @run main/othervm/timeout=120 -Djdk.tls.client.protocols=TLSv1.3 FipsModeTLS
+ *   Stateless resumption doesn't currently work with NSS-FIPS, see JDK-8368669.
+ *   NSS-FIPS does not support ML-KEM, so configures the list of named groups.
+ * @run main/othervm/timeout=120
+ *      -Djdk.tls.client.protocols=TLSv1.3
+ *      -Djdk.tls.namedGroups=x25519,secp256r1,secp384r1,secp521r1,x448,ffdhe2048,ffdhe3072,ffdhe4096,ffdhe6144,ffdhe8192
+ *      FipsModeTLS
  */
 
 import java.io.File;
diff --git a/test/jdk/sun/security/provider/KeyStore/DKSTest.java b/test/jdk/sun/security/provider/KeyStore/DKSTest.java
index 9c35a1c1dd9..ee655f5a2a6 100644
--- a/test/jdk/sun/security/provider/KeyStore/DKSTest.java
+++ b/test/jdk/sun/security/provider/KeyStore/DKSTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,30 @@
 
 /*
  * @test
- * @bug 8007755
+ * @bug 8007755 8374808
  * @library /test/lib
  * @summary Support the logical grouping of keystores
  */
 
-import java.io.*;
-import java.net.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
 import java.nio.file.Paths;
-import java.security.*;
+import java.security.DomainLoadStoreParameter;
 import java.security.KeyStore;
-import java.security.cert.*;
+import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
-import java.util.*;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 
@@ -205,17 +216,26 @@ public class DKSTest {
             new KeyStore.TrustedCertificateEntry(cert), null);
     }
 
-    private static void checkEntries(KeyStore keystore, int expected)
+    private static void checkEntries(KeyStore keystore, int expectedCount)
         throws Exception {
-        int i = 0;
+        int currCount = 0;
         for (String alias : Collections.list(keystore.aliases())) {
             System.out.print(".");
-            i++;
+            currCount++;
+
+            // check creation date and instant
+            if(!keystore.getCreationDate(alias).equals(
+                    Date.from(keystore.getCreationInstant(alias)))
+            ){
+                throw new RuntimeException(
+                        "Creation Date is not the same as Instant timestamp");
+            }
         }
         System.out.println();
-        if (expected != i) {
+        // Check if current count is expected
+        if (expectedCount != currCount) {
             throw new Exception("Error: unexpected entry count in keystore: " +
-                "loaded=" + i + ", expected=" + expected);
+                "loaded=" + currCount + ", expected=" + expectedCount);
         }
     }
 
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
index 680d1026275..2ee0ff96bd1 100644
--- a/test/jdk/sun/security/provider/acvp/Launcher.java
+++ b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -41,6 +41,8 @@ import java.util.zip.ZipFile;
  *      ML_DSA_Impls.version might be modified
  * @library /test/lib
  * @modules java.base/sun.security.provider
+ *          java.base/sun.security.util
+ *          java.base/com.sun.crypto.provider
  * @run main/othervm/timeout=480 Launcher
  */
 
@@ -50,6 +52,8 @@ import java.util.zip.ZipFile;
  * @summary Test verifying the intrinsic implementation.
  * @library /test/lib
  * @modules java.base/sun.security.provider
+ *          java.base/sun.security.util
+ *          java.base/com.sun.crypto.provider
  * @run main/othervm/timeout=480 -Xcomp Launcher
  */
 
diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
index 281bb415305..ac56642b8d7 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
@@ -24,6 +24,7 @@ import jdk.test.lib.Asserts;
 import jdk.test.lib.json.JSONValue;
 import jdk.test.lib.security.FixedSecureRandom;
 import sun.security.provider.ML_DSA_Impls;
+import sun.security.util.DerOutputStream;
 
 import java.security.*;
 import java.security.spec.EncodedKeySpec;
@@ -68,12 +69,13 @@ public class ML_DSA_Test {
             System.out.println(">> " + pname);
             for (var c : t.get("tests").asArray()) {
                 System.out.print(c.get("tcId").asString() + " ");
-                g.initialize(np, new FixedSecureRandom(toByteArray(c.get("seed").asString())));
+                var seed = toByteArray(c.get("seed").asString());
+                g.initialize(np, new FixedSecureRandom(seed));
                 var kp = g.generateKeyPair();
                 var pk = f.getKeySpec(kp.getPublic(), EncodedKeySpec.class).getEncoded();
-                var sk = f.getKeySpec(kp.getPrivate(), EncodedKeySpec.class).getEncoded();
                 Asserts.assertEqualsByteArray(toByteArray(c.get("pk").asString()), pk);
-                Asserts.assertEqualsByteArray(toByteArray(c.get("sk").asString()), sk);
+                Asserts.assertEqualsByteArray(toByteArray(c.get("sk").asString()),
+                        ML_DSA_Impls.seedToExpanded(pname, seed));
             }
             System.out.println();
         }
@@ -106,7 +108,7 @@ public class ML_DSA_Test {
                 var sk = new PrivateKey() {
                     public String getAlgorithm() { return pname; }
                     public String getFormat() { return "RAW"; }
-                    public byte[] getEncoded() { return toByteArray(c.get("sk").asString()); }
+                    public byte[] getEncoded() { return oct(toByteArray(c.get("sk").asString())); }
                 };
                 var sr = new FixedSecureRandom(
                         det ? new byte[32] : toByteArray(c.get("rnd").asString()));
@@ -119,6 +121,10 @@ public class ML_DSA_Test {
         }
     }
 
+    static byte[] oct(byte[] in) {
+        return new DerOutputStream().putOctetString(in).toByteArray();
+    }
+
     static void sigVerTest(JSONValue kat, Provider p) throws Exception {
         var s = p == null
                 ? Signature.getInstance("ML-DSA")
diff --git a/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java b/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
index c46c6a99e6d..35c1ce611da 100644
--- a/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,9 +20,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+import com.sun.crypto.provider.ML_KEM_Impls;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.json.JSONValue;
 import jdk.test.lib.security.FixedSecureRandom;
+import sun.security.util.DerOutputStream;
 
 import javax.crypto.KEM;
 import java.security.*;
@@ -65,13 +67,14 @@ public class ML_KEM_Test {
             System.out.println(">> " + pname);
             for (var c : t.get("tests").asArray()) {
                 System.out.print(c.get("tcId").asString() + " ");
-                g.initialize(np, new FixedSecureRandom(
-                        toByteArray(c.get("d").asString()), toByteArray(c.get("z").asString())));
+                var seed = toByteArray(c.get("d").asString() + c.get("z").asString());
+                g.initialize(np, new FixedSecureRandom(seed));
                 var kp = g.generateKeyPair();
                 var pk = f.getKeySpec(kp.getPublic(), EncodedKeySpec.class).getEncoded();
-                var sk = f.getKeySpec(kp.getPrivate(), EncodedKeySpec.class).getEncoded();
                 Asserts.assertEqualsByteArray(toByteArray(c.get("ek").asString()), pk);
-                Asserts.assertEqualsByteArray(toByteArray(c.get("dk").asString()), sk);
+                Asserts.assertEqualsByteArray(
+                        toByteArray(c.get("dk").asString()),
+                        ML_KEM_Impls.seedToExpanded(pname, seed));
             }
             System.out.println();
         }
@@ -106,7 +109,7 @@ public class ML_KEM_Test {
                 var dk = new PrivateKey() {
                     public String getAlgorithm() { return pname; }
                     public String getFormat() { return "RAW"; }
-                    public byte[] getEncoded() { return toByteArray(t.get("dk").asString()); }
+                    public byte[] getEncoded() { return oct(toByteArray(t.get("dk").asString())); }
                 };
                 for (var c : t.get("tests").asArray()) {
                     System.out.print(c.get("tcId").asString() + " ");
@@ -118,4 +121,8 @@ public class ML_KEM_Test {
             }
         }
     }
+
+    static byte[] oct(byte[] in) {
+        return new DerOutputStream().putOctetString(in).toByteArray();
+    }
 }
diff --git a/test/jdk/sun/security/provider/NamedEdDSA.java b/test/jdk/sun/security/provider/named/NamedEdDSA.java
similarity index 84%
rename from test/jdk/sun/security/provider/NamedEdDSA.java
rename to test/jdk/sun/security/provider/named/NamedEdDSA.java
index 4d0e3e9228a..30df8b22b31 100644
--- a/test/jdk/sun/security/provider/NamedEdDSA.java
+++ b/test/jdk/sun/security/provider/named/NamedEdDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,12 @@
 
 /*
  * @test
- * @bug 8340327
+ * @bug 8340327 8347938
  * @modules java.base/sun.security.ec.ed
  *          java.base/sun.security.ec.point
  *          java.base/sun.security.jca
  *          java.base/sun.security.provider
+ *          java.base/sun.security.util
  * @library /test/lib
  */
 
@@ -40,7 +41,10 @@ import sun.security.jca.JCAUtil;
 import sun.security.provider.NamedKeyFactory;
 import sun.security.provider.NamedKeyPairGenerator;
 import sun.security.provider.NamedSignature;
+import sun.security.util.DerOutputStream;
+import sun.security.util.DerValue;
 
+import java.io.IOException;
 import java.security.*;
 import java.security.spec.EdDSAParameterSpec;
 import java.security.spec.NamedParameterSpec;
@@ -66,11 +70,11 @@ public class NamedEdDSA {
 
     public static class EdDSASignature extends NamedSignature {
         public EdDSASignature() {
-            super("EdDSA", "Ed25519", "Ed448");
+            super("EdDSA", new EdDSAKeyFactory());
         }
 
         protected EdDSASignature(String pname) {
-            super("EdDSA", pname);
+            super("EdDSA", new EdDSAKeyFactory(pname));
         }
 
         public static class Ed25519 extends EdDSASignature {
@@ -86,22 +90,32 @@ public class NamedEdDSA {
         }
 
         @Override
-        public byte[] implSign(String name, byte[] sk, Object sk2, byte[] msg, SecureRandom sr) throws SignatureException {
-            return getOps(name).sign(plain, sk, msg);
+        public byte[] implSign(String pname, byte[] sk, Object sk2, byte[] msg, SecureRandom sr) {
+            return getOps(pname).sign(plain, sk, msg);
         }
 
         @Override
-        public boolean implVerify(String name, byte[] pk, Object pk2, byte[] msg, byte[] sig) throws SignatureException {
-            return getOps(name).verify(plain, (AffinePoint) pk2, pk, msg, sig);
+        public boolean implVerify(String pname, byte[] pk, Object pk2, byte[] msg, byte[] sig) throws SignatureException {
+            return getOps(pname).verify(plain, (AffinePoint) pk2, pk, msg, sig);
         }
 
         @Override
-        public Object implCheckPublicKey(String name, byte[] pk) throws InvalidKeyException {
-            return getOps(name).decodeAffinePoint(InvalidKeyException::new, pk);
+        public Object implCheckPublicKey(String pname, byte[] pk) throws InvalidKeyException {
+            return getOps(pname).decodeAffinePoint(InvalidKeyException::new, pk);
         }
     }
 
     public static class EdDSAKeyFactory extends NamedKeyFactory {
+        @Override
+        protected byte[] implExpand(String pname, byte[] input)
+                throws InvalidKeyException {
+            try {
+                return new DerValue(input).getOctetString();
+            } catch (IOException e) {
+                throw new InvalidKeyException(e);
+            }
+        }
+
         public EdDSAKeyFactory() {
             super("EdDSA", "Ed25519", "Ed448");
         }
@@ -157,7 +171,10 @@ public class NamedEdDSA {
             // set the high-order bit of the encoded point
             byte msb = (byte) (point.isXOdd() ? 0x80 : 0);
             encodedPoint[encodedPoint.length - 1] |= msb;
-            return new byte[][] { encodedPoint, sk };
+            return new byte[][] {
+                    encodedPoint,
+                    new DerOutputStream().putOctetString(sk).toByteArray(),
+                    sk};
         }
 
         private static void swap(byte[] arr, int i, int j) {
diff --git a/test/jdk/sun/security/provider/NamedKeyFactoryTest.java b/test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java
similarity index 85%
rename from test/jdk/sun/security/provider/NamedKeyFactoryTest.java
rename to test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java
index 1ca179bc046..e58809fcb69 100644
--- a/test/jdk/sun/security/provider/NamedKeyFactoryTest.java
+++ b/test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8340327
+ * @bug 8340327 8347938
  * @modules java.base/sun.security.x509
  *          java.base/sun.security.pkcs
  *          java.base/sun.security.provider
@@ -41,10 +41,13 @@ import sun.security.x509.NamedX509Key;
 
 import java.security.*;
 import java.security.spec.*;
+import java.util.Arrays;
 
 public class NamedKeyFactoryTest {
 
     private static final SeededSecureRandom RAND = SeededSecureRandom.one();
+    private static final byte[] RAW_SK = RAND.nBytes(16);
+    private static final byte[] RAW_PK = RAND.nBytes(16);
 
     public static void main(String[] args) throws Exception {
         Security.addProvider(new ProviderImpl());
@@ -78,8 +81,8 @@ public class NamedKeyFactoryTest {
         g.initialize(new NamedParameterSpec("ShA-256"));
         checkKeyPair(g.generateKeyPair(), "SHA", "SHA-256");
 
-        var pk = new NamedX509Key("sHa", "ShA-256", RAND.nBytes(2));
-        var sk = new NamedPKCS8Key("sHa", "SHa-256", RAND.nBytes(2));
+        var pk = new NamedX509Key("sHa", "ShA-256", RAW_PK);
+        var sk = NamedPKCS8Key.internalCreate("sHa", "SHa-256", RAW_SK, null);
         checkKey(pk, "sHa", "ShA-256");
         checkKey(sk, "sHa", "SHa-256");
 
@@ -134,25 +137,27 @@ public class NamedKeyFactoryTest {
         Asserts.assertEquals("RAW", srk2.getFormat());
         Asserts.assertEqualsByteArray(srk2.getEncoded(), sk.getRawBytes());
 
+        checkKey(kf2.generatePrivate(srk), "SHA", "SHA-256");
         Asserts.assertEqualsByteArray(kf2.generatePrivate(srk).getEncoded(), sk.getEncoded());
         Utils.runAndCheckException(() -> kf.generatePrivate(srk), InvalidKeySpecException.class); // no pname
+        checkKey(kf2.generatePrivate(srk), "SHA", "SHA-256");
         Asserts.assertEqualsByteArray(kf2.generatePrivate(srk2).getEncoded(), sk.getEncoded());
         Utils.runAndCheckException(() -> kf.generatePrivate(srk2), InvalidKeySpecException.class); // no pname
 
         var pk1 = new PublicKey() {
             public String getAlgorithm() { return "SHA"; }
             public String getFormat() { return "RAW"; }
-            public byte[] getEncoded() { return RAND.nBytes(2); }
+            public byte[] getEncoded() { return RAW_PK; }
         };
         var pk2 = new PublicKey() {
             public String getAlgorithm() { return "sHA-256"; }
             public String getFormat() { return "RAW"; }
-            public byte[] getEncoded() { return RAND.nBytes(2); }
+            public byte[] getEncoded() { return RAW_PK; }
         };
         var pk3 = new PublicKey() {
             public String getAlgorithm() { return "SHA"; }
             public String getFormat() { return "RAW"; }
-            public byte[] getEncoded() { return RAND.nBytes(2); }
+            public byte[] getEncoded() { return RAW_PK; }
             public AlgorithmParameterSpec getParams() { return new NamedParameterSpec("sHA-256"); }
         };
 
@@ -167,17 +172,17 @@ public class NamedKeyFactoryTest {
         var sk1 = new PrivateKey() {
             public String getAlgorithm() { return "SHA"; }
             public String getFormat() { return "RAW"; }
-            public byte[] getEncoded() { return RAND.nBytes(2); }
+            public byte[] getEncoded() { return RAW_SK; }
         };
         var sk2 = new PrivateKey() {
             public String getAlgorithm() { return "sHA-256"; }
             public String getFormat() { return "RAW"; }
-            public byte[] getEncoded() { return RAND.nBytes(2); }
+            public byte[] getEncoded() { return RAW_SK; }
         };
         var sk3 = new PrivateKey() {
             public String getAlgorithm() { return "SHA"; }
             public String getFormat() { return "RAW"; }
-            public byte[] getEncoded() { return RAND.nBytes(2); }
+            public byte[] getEncoded() { return RAW_SK; }
             public AlgorithmParameterSpec getParams() { return new NamedParameterSpec("sHA-256"); }
         };
 
@@ -201,6 +206,14 @@ public class NamedKeyFactoryTest {
         if (k instanceof AsymmetricKey ak && ak.getParams() instanceof NamedParameterSpec nps) {
             Asserts.assertEquals(pname, nps.getName());
         }
+        if (k instanceof NamedPKCS8Key nsk) {
+            var raw = nsk.getRawBytes();
+            Asserts.assertEqualsByteArray(Arrays.copyOf(RAW_SK, raw.length), raw);
+        }
+        if (k instanceof NamedX509Key npk) {
+            var raw = npk.getRawBytes();
+            Asserts.assertEqualsByteArray(Arrays.copyOf(RAW_PK, raw.length), raw);
+        }
     }
 
     // Provider
@@ -220,15 +233,24 @@ public class NamedKeyFactoryTest {
         public KF() {
             super("SHA", "SHA-256", "SHA-512");
         }
-    }
-    public static class KF1 extends NamedKeyFactory {
-        public KF1() {
-            super("SHA", "SHA-256");
+
+        public KF(String name) {
+            super("SHA", name);
+        }
+
+        @Override
+        protected byte[] implExpand(String pname, byte[] input) throws InvalidKeyException {
+            return null;
         }
     }
-    public static class KF2 extends NamedKeyFactory {
+    public static class KF1 extends KF {
+        public KF1() {
+            super("SHA-256");
+        }
+    }
+    public static class KF2 extends KF {
         public KF2() {
-            super("SHA", "SHA-512");
+            super("SHA-512");
         }
     }
     public static class KPG extends NamedKeyPairGenerator {
@@ -243,8 +265,8 @@ public class NamedKeyFactoryTest {
         @Override
         public byte[][] implGenerateKeyPair(String name, SecureRandom sr) {
             var out = new byte[2][];
-            out[0] = RAND.nBytes(name.endsWith("256") ? 2 : 4);
-            out[1] = RAND.nBytes(name.endsWith("256") ? 2 : 4);
+            out[0] = name.endsWith("256") ? Arrays.copyOf(RAW_PK, 8) : RAW_PK;
+            out[1] = name.endsWith("256") ? Arrays.copyOf(RAW_SK, 8) : RAW_SK;
             return out;
         }
     }
diff --git a/test/jdk/sun/security/provider/named/NamedKeys.java b/test/jdk/sun/security/provider/named/NamedKeys.java
new file mode 100644
index 00000000000..e46cd981c70
--- /dev/null
+++ b/test/jdk/sun/security/provider/named/NamedKeys.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8347938
+ * @modules java.base/sun.security.pkcs
+ *          java.base/sun.security.x509
+ * @library /test/lib
+ * @summary check the Named***Key behavior
+ */
+import jdk.test.lib.Asserts;
+import jdk.test.lib.security.SeededSecureRandom;
+import sun.security.pkcs.NamedPKCS8Key;
+import sun.security.x509.NamedX509Key;
+
+import java.util.Arrays;
+
+public class NamedKeys {
+    public static void main(String[] args) throws Exception {
+
+        // This test uses fictional key algorithms SHA and SHA-256,
+        // simply because they look like a family name and parameter
+        // set name and SHA-256 already have its OID defined.
+
+        var r = SeededSecureRandom.one();
+        var raw = r.nBytes(32);
+
+        // Create a key using raw bytes
+        var sk = NamedPKCS8Key.internalCreate("SHA", "SHA-256", raw, null);
+        var enc = sk.getEncoded();
+
+        // The raw bytes array is re-used
+        Asserts.assertTrue(sk.getRawBytes() == sk.getRawBytes());
+        // but the encoding is different
+        Asserts.assertTrue(sk.getEncoded() != sk.getEncoded());
+
+        // When source change
+        Arrays.fill(raw, (byte)0);
+        // Internal raw bytes also changes
+        Asserts.assertEqualsByteArray(sk.getRawBytes(), new byte[32]);
+        // No guarantee on getEncoded() output, could be cached
+
+        // Create a key using encoding
+        var sk1 = new NamedPKCS8Key("SHA", enc, null);
+        var sk2 = new NamedPKCS8Key("SHA", enc, null);
+        var raw1 = sk1.getRawBytes();
+        Asserts.assertTrue(raw1 != sk2.getRawBytes());
+        Asserts.assertTrue(sk1.getEncoded() != sk2.getEncoded());
+
+        var encCopy = enc.clone(); // store a copy
+        Arrays.fill(enc, (byte)0); // clean the source and the key unchanged
+        Asserts.assertEqualsByteArray(encCopy, sk1.getEncoded());
+
+        // Same with public key
+        // Create a key using raw bytes
+        raw = r.nBytes(32);
+        var pk = new NamedX509Key("SHA", "SHA-256", raw);
+        enc = pk.getEncoded().clone();
+
+        // The raw bytes array is re-used
+        Asserts.assertTrue(pk.getRawBytes() == pk.getRawBytes());
+        // but the encoding is different
+        Asserts.assertTrue(pk.getEncoded() != pk.getEncoded());
+
+        // When source change
+        Arrays.fill(raw, (byte)0);
+        // Internal raw bytes also changes
+        Asserts.assertEqualsByteArray(pk.getRawBytes(), new byte[32]);
+        // No guarantee on getEncoded() output, could be cached
+
+        // Create a key using encoding
+        var pk1 = new NamedX509Key("SHA", enc);
+        var pk2 = new NamedX509Key("SHA", enc);
+        raw1 = pk1.getRawBytes();
+        Asserts.assertTrue(raw1 != pk2.getRawBytes());
+        Asserts.assertTrue(pk1.getEncoded() != pk2.getEncoded());
+
+        encCopy = enc.clone(); // store a copy
+        Arrays.fill(enc, (byte)0); // clean the source and the key unchanged
+        Asserts.assertEqualsByteArray(encCopy, pk1.getEncoded());
+    }
+}
diff --git a/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java b/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java
new file mode 100644
index 00000000000..25060d0b74e
--- /dev/null
+++ b/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8347938
+ * @library /test/lib
+ * @summary ensure ML-KEM and ML-DSA encodings consistent with
+ *      draft-ietf-lamps-kyber-certificates-11 and RFC 9881
+ * @modules java.base/com.sun.crypto.provider
+ *          java.base/sun.security.pkcs
+ *          java.base/sun.security.provider
+ * @run main/othervm PrivateKeyEncodings
+ */
+import com.sun.crypto.provider.ML_KEM_Impls;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.security.RepositoryFileReader;
+import jdk.test.lib.security.FixedSecureRandom;
+import sun.security.pkcs.NamedPKCS8Key;
+import sun.security.provider.ML_DSA_Impls;
+
+import javax.crypto.KEM;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.cert.CertificateFactory;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.NamedParameterSpec;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class PrivateKeyEncodings {
+
+    public static void main(String[] args) throws Exception {
+        // Example keys and certificates draft-ietf-lamps-kyber-certificates-11, Appendix B
+        // (https://datatracker.ietf.org/doc/html/draft-ietf-lamps-kyber-certificates-11#autoid-17)
+        // and RFC 9881, Appendix C.3
+        // (https://datatracker.ietf.org/doc/html/rfc9881#name-example-certificates)
+        //
+        // These data can be retrieved from the following GitHub releases:
+        //   https://github.com/lamps-wg/kyber-certificates/releases/tag/draft-ietf-lamps-kyber-certificates-11
+        //   https://github.com/lamps-wg/dilithium-certificates/releases/tag/draft-ietf-lamps-dilithium-certificates-13
+        //
+        // Although the release tags include "draft", these values are the
+        // same as those in the final RFC 9881.
+        try (var kemReader = RepositoryFileReader.of(RepositoryFileReader.KYBER_CERTIFICATES.class,
+                    "kyber-certificates-draft-ietf-lamps-kyber-certificates-11/");
+             var dsaReader = RepositoryFileReader.of(RepositoryFileReader.DILITHIUM_CERTIFICATES.class,
+                     "dilithium-certificates-draft-ietf-lamps-dilithium-certificates-13/")) {
+            good(kemReader, dsaReader);
+            badkem(kemReader);
+            baddsa(dsaReader);
+        }
+    }
+
+    static void badkem(RepositoryFileReader f) throws Exception {
+        var kf = KeyFactory.getInstance("ML-KEM");
+
+        // The first ML-KEM-512-PrivateKey example includes the both CHOICE,
+        // i.e., both seed and expandedKey are included. The seed and expanded
+        // values can be checked for inconsistencies.
+        Asserts.assertThrows(InvalidKeySpecException.class, () ->
+                kf.generatePrivate(new PKCS8EncodedKeySpec(
+                        readData(f, "example/bad-ML-KEM-512-1.priv"))));
+
+        // The second ML-KEM-512-PrivateKey example includes only expandedKey.
+        // The expanded private key has a mutated s_0 and a valid public key hash,
+        // but a pairwise consistency check would find that the public key
+        // fails to match private.
+        var k2 = kf.generatePrivate(new PKCS8EncodedKeySpec(
+                readData(f, "example/bad-ML-KEM-512-2.priv")));
+        var pk2 = ML_KEM_Impls.privKeyToPubKey((NamedPKCS8Key) k2);
+        var enc = KEM.getInstance("ML-KEM").newEncapsulator(pk2).encapsulate();
+        var dk = KEM.getInstance("ML-KEM").newDecapsulator(k2).decapsulate(enc.encapsulation());
+        Asserts.assertNotEqualsByteArray(enc.key().getEncoded(), dk.getEncoded());
+
+        // The third ML-KEM-512-PrivateKey example includes only expandedKey.
+        // The expanded private key has a mutated H(ek); both a public key
+        // digest check and a pairwise consistency check should fail.
+        var k3 = kf.generatePrivate(new PKCS8EncodedKeySpec(
+                readData(f, "example/bad-ML-KEM-512-3.priv")));
+        Asserts.assertThrows(InvalidKeyException.class, () ->
+                KEM.getInstance("ML-KEM").newDecapsulator(k3));
+
+        // The fourth ML-KEM-512-PrivateKey example includes the both CHOICE,
+        // i.e., both seed and expandedKey are included. There is mismatch
+        // of the seed and expanded private key in only the z implicit rejection
+        // secret; here the private and public vectors match and the pairwise
+        // consistency check passes, but z is different.
+        Asserts.assertThrows(InvalidKeySpecException.class, () ->
+                kf.generatePrivate(new PKCS8EncodedKeySpec(
+                        readData(f, "example/bad-ML-KEM-512-4.priv"))));
+    }
+
+    static void baddsa(RepositoryFileReader f) throws Exception {
+        var kf = KeyFactory.getInstance("ML-DSA");
+
+        // The first ML-DSA-PrivateKey example includes the both CHOICE, i.e.,
+        // both seed and expandedKey are included. The seed and expanded values
+        // can be checked for inconsistencies.
+        Asserts.assertThrows(InvalidKeySpecException.class, () ->
+                kf.generatePrivate(new PKCS8EncodedKeySpec(
+                        readData(f, "examples/bad-ML-DSA-44-1.priv"))));
+
+        // The second ML-DSA-PrivateKey example includes only expandedKey.
+        // The public key fails to match the tr hash value in the private key.
+        var k2 = kf.generatePrivate(new PKCS8EncodedKeySpec(
+                readData(f, "examples/bad-ML-DSA-44-2.priv")));
+        Asserts.assertThrows(IllegalArgumentException.class, () ->
+                ML_DSA_Impls.privKeyToPubKey((NamedPKCS8Key) k2));
+
+        // The third ML-DSA-PrivateKey example also includes only expandedKey.
+        // The private s_1 and s_2 vectors imply a t vector whose private low
+        // bits do not match the t_0 vector portion of the private key
+        // (its high bits t_1 are the primary content of the public key).
+        var k3 = kf.generatePrivate(new PKCS8EncodedKeySpec(
+                readData(f, "examples/bad-ML-DSA-44-3.priv")));
+        Asserts.assertThrows(IllegalArgumentException.class, () ->
+                ML_DSA_Impls.privKeyToPubKey((NamedPKCS8Key) k3));
+    }
+
+    static void good(RepositoryFileReader kemReader, RepositoryFileReader dsaReader)
+            throws Exception {
+
+        var seed = new byte[64];
+        for (var i = 0; i < seed.length; i++) {
+            seed[i] = (byte) i;
+        }
+        var cf = CertificateFactory.getInstance("X.509");
+        var allPublicKeys = new HashMap<String, PublicKey>();
+
+        for (var pname: List.of("ML-DSA-44", "ML-DSA-65", "ML-DSA-87", // DSA first, will sign KEM
+                "ML-KEM-512", "ML-KEM-768", "ML-KEM-1024")) {
+
+            var isKem = pname.startsWith("ML-KEM");
+            KeyPairGenerator g = KeyPairGenerator.getInstance(isKem ? "ML-KEM" : "ML-DSA");
+            var prop = isKem ? "mlkem" : "mldsa";
+            var f = isKem ? kemReader : dsaReader;
+            var example = isKem ? "example/" : "examples/";
+
+            g.initialize(new NamedParameterSpec(pname), new FixedSecureRandom(seed));
+            var pk = g.generateKeyPair().getPublic();
+            allPublicKeys.put(pname, pk);
+            Asserts.assertEqualsByteArray(readData(f, example + pname + ".pub"), pk.getEncoded());
+
+            var in = new ByteArrayInputStream(readData(f, example + pname + ".crt"));
+            var c = cf.generateCertificate(in);
+            var signer = switch (pname) {
+                case "ML-KEM-512" -> allPublicKeys.get("ML-DSA-44");
+                case "ML-KEM-768" -> allPublicKeys.get("ML-DSA-65");
+                case "ML-KEM-1024" -> allPublicKeys.get("ML-DSA-87");
+                default -> c.getPublicKey();
+            };
+            c.verify(signer);
+            Asserts.assertEquals(c.getPublicKey(), pk);
+
+            for (var type : List.of("seed", "expandedkey", "both")) {
+                System.err.println(pname + " " + type);
+                System.setProperty("jdk." + prop + ".pkcs8.encoding", type);
+                g.initialize(new NamedParameterSpec(pname), new FixedSecureRandom(seed));
+                var sk = g.generateKeyPair().getPrivate();
+                if (type.equals("expandedkey")) type = "expanded";
+                Asserts.assertEqualsByteArray(
+                        readData(f, example + pname + "-" + type + ".priv"), sk.getEncoded());
+                checkInterop(pk, sk);
+            }
+        }
+    }
+
+    // Ensures pk and sk interop with each other
+    static void checkInterop(PublicKey pk, PrivateKey sk) throws Exception {
+        if (pk.getAlgorithm().startsWith("ML-KEM")) {
+            var kem = KEM.getInstance("ML-KEM");
+            var enc = kem.newEncapsulator(pk).encapsulate();
+            var k = kem.newDecapsulator(sk).decapsulate(enc.encapsulation());
+            Asserts.assertEqualsByteArray(k.getEncoded(), enc.key().getEncoded());
+        } else {
+            var msg = "hello".getBytes(StandardCharsets.UTF_8);
+            var s = Signature.getInstance("ML-DSA");
+            s.initSign(sk);
+            s.update(msg);
+            var sig = s.sign();
+            s.initVerify(pk);
+            s.update(msg);
+            Asserts.assertTrue(s.verify(sig));
+        }
+    }
+
+    static byte[] readData(RepositoryFileReader f, String entry) throws Exception {
+        byte[] data = f.read(entry);
+        var pem = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(data)))
+                .lines()
+                .filter(s -> !s.contains("-----"))
+                .collect(Collectors.joining());
+        return Base64.getMimeDecoder().decode(pem);
+    }
+}
diff --git a/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java b/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java
new file mode 100644
index 00000000000..0a5b462b037
--- /dev/null
+++ b/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8347938
+ * @library /test/lib
+ * @modules java.base/com.sun.crypto.provider
+ *          java.base/sun.security.pkcs
+ *          java.base/sun.security.provider
+ *          java.base/sun.security.util
+ *          java.base/sun.security.x509
+ * @summary check key reading compatibility
+ * @run main/othervm SeedOrExpanded
+ */
+
+import com.sun.crypto.provider.ML_KEM_Impls;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.security.DerUtils;
+import jdk.test.lib.security.FixedSecureRandom;
+import jdk.test.lib.security.SeededSecureRandom;
+import sun.security.pkcs.NamedPKCS8Key;
+import sun.security.provider.ML_DSA_Impls;
+import sun.security.util.DerValue;
+
+import javax.crypto.KEM;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+
+public class SeedOrExpanded {
+
+    static final SeededSecureRandom RAND = SeededSecureRandom.one();
+
+    public static void main(String[] args) throws Exception {
+        test("mlkem", "ML-KEM-768");
+        test("mldsa", "ML-DSA-65");
+    }
+
+    static void test(String type, String alg) throws Exception {
+
+        var seed = RAND.nBytes(alg.contains("ML-KEM") ? 64 : 32);
+        var g = KeyPairGenerator.getInstance(alg);
+
+        // Generation
+
+        g.initialize(-1, new FixedSecureRandom(seed));
+        var kp = g.generateKeyPair();
+        var pk = kp.getPublic();
+        var kDefault = kp.getPrivate();
+
+        // Property value is case-insensitive
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "SEED");
+        g.initialize(-1, new FixedSecureRandom(seed));
+        var kSeed = g.generateKeyPair().getPrivate();
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "expandedkey");
+        g.initialize(-1, new FixedSecureRandom(seed));
+        var kExpanded = g.generateKeyPair().getPrivate();
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "boTH");
+        g.initialize(-1, new FixedSecureRandom(seed));
+        var kBoth = g.generateKeyPair().getPrivate();
+
+        // Invalid property value
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "bogus");
+        g.initialize(-1, new FixedSecureRandom(seed));
+        Asserts.assertThrows(IllegalArgumentException.class,
+                () -> g.generateKeyPair().getPrivate());
+
+        byte[] kExpandedEncoded = kExpanded.getEncoded();
+        byte[] kSeedEncoded = kSeed.getEncoded();
+        byte[] kBothEncoded = kBoth.getEncoded();
+
+        // Ensure tags match the CHOICE definition
+        Asserts.assertEquals((byte) 0x80, DerUtils.innerDerValue(kSeedEncoded, "2c").tag);
+        Asserts.assertEquals((byte) 0x04, DerUtils.innerDerValue(kExpandedEncoded, "2c").tag);
+        Asserts.assertEquals((byte) 0x30, DerUtils.innerDerValue(kBothEncoded, "2c").tag);
+
+        byte[] seedData = DerUtils.innerDerValue(kSeedEncoded, "2c")
+                .withTag(DerValue.tag_OctetString).getOctetString();
+        byte[] expandedData = DerUtils.innerDerValue(kExpandedEncoded, "2c").getOctetString();
+
+        Asserts.assertEqualsByteArray(seed, seedData);
+        Asserts.assertEqualsByteArray(
+                seedData,
+                DerUtils.innerDerValue(kBothEncoded, "2c0").getOctetString());
+        Asserts.assertEqualsByteArray(
+                expandedData,
+                DerUtils.innerDerValue(kBothEncoded, "2c1").getOctetString());
+
+        // Ensure seedToExpanded correctly called
+        if (alg.contains("ML-KEM")) {
+            Asserts.assertEqualsByteArray(expandedData,
+                    ML_KEM_Impls.seedToExpanded(alg, seedData));
+        } else {
+            Asserts.assertEqualsByteArray(expandedData,
+                    ML_DSA_Impls.seedToExpanded(alg, seedData));
+        }
+
+        test(alg, pk, kSeed);
+        test(alg, pk, kExpanded);
+        test(alg, pk, kBoth);
+
+        var kf = KeyFactory.getInstance(alg);
+
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "seed");
+        Asserts.assertEqualsByteArray(
+                test(alg, pk, kf.translateKey(kBoth)).getEncoded(),
+                kSeedEncoded);
+        Asserts.assertTrue(kf.translateKey(kSeed) == kSeed);
+        Asserts.assertThrows(InvalidKeyException.class, () -> kf.translateKey(kExpanded));
+
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "expandedkey");
+        Asserts.assertEqualsByteArray(
+                test(alg, pk, kf.translateKey(kBoth)).getEncoded(),
+                kExpandedEncoded);
+        Asserts.assertEqualsByteArray(
+                test(alg, pk, kf.translateKey(kSeed)).getEncoded(),
+                kExpandedEncoded);
+        Asserts.assertTrue(kf.translateKey(kExpanded) == kExpanded);
+
+        System.setProperty("jdk." + type + ".pkcs8.encoding", "both");
+        Asserts.assertTrue(kf.translateKey(kBoth) == kBoth);
+        Asserts.assertEqualsByteArray(
+                test(alg, pk, kf.translateKey(kSeed)).getEncoded(),
+                kBothEncoded);
+        Asserts.assertThrows(InvalidKeyException.class, () -> kf.translateKey(kExpanded));
+
+        // The following makes sure key is not mistakenly cleaned during
+        // translations.
+        var xk = new PrivateKey() {
+            public String getAlgorithm() { return alg; }
+            public String getFormat() { return "PKCS#8"; }
+            public byte[] getEncoded() { return kBothEncoded.clone(); }
+        };
+        test(alg, pk, xk);
+        var xk2 = (PrivateKey) kf.translateKey(xk);
+        test(alg, pk, xk2);
+        test(alg, pk, xk);
+    }
+
+    static PrivateKey test(String alg, PublicKey pk, Key k) throws Exception {
+        var sk = (PrivateKey) k;
+        if (alg.contains("ML-KEM")) {
+            var kem = KEM.getInstance("ML-KEM");
+            var e = kem.newEncapsulator(pk, RAND);
+            var enc = e.encapsulate();
+            var k1 = kem.newDecapsulator(sk).decapsulate(enc.encapsulation());
+            Asserts.assertEqualsByteArray(k1.getEncoded(), enc.key().getEncoded());
+            if (k instanceof NamedPKCS8Key npk) {
+                Asserts.assertEqualsByteArray(
+                        ML_KEM_Impls.privKeyToPubKey(npk).getEncoded(), pk.getEncoded());
+            }
+        } else {
+            var s = Signature.getInstance("ML-DSA");
+            var rnd = RAND.nBytes(32); // randomness for signature generation
+            var msg = RAND.nBytes(20);
+            s.initSign(sk, new FixedSecureRandom(rnd));
+            s.update(msg);
+            var sig1 = s.sign();
+            s.initVerify(pk);
+            s.update(msg);
+            Asserts.assertTrue(s.verify(sig1));
+            if (k instanceof NamedPKCS8Key npk) {
+                Asserts.assertEqualsByteArray(
+                        ML_DSA_Impls.privKeyToPubKey(npk).getEncoded(), pk.getEncoded());
+            }
+        }
+        return sk;
+    }
+}
diff --git a/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java b/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java
new file mode 100644
index 00000000000..44c9d566dc0
--- /dev/null
+++ b/test/jdk/sun/security/ssl/CipherSuite/DefaultNamedGroups.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLEngine;
+import jdk.test.lib.security.SecurityUtils;
+
+/*
+ * @test
+ * @bug 8370885
+ * @summary Default namedGroups values are not being filtered against
+ *          algorithm constraints
+ * @library /javax/net/ssl/templates
+ *          /test/lib
+ * @run main/othervm DefaultNamedGroups
+ */
+
+public class DefaultNamedGroups extends SSLEngineTemplate {
+
+    protected static final String DISABLED_NG = "secp256r1";
+    protected static final List<String> REFERENCE_NG = Stream.of(
+                    "X25519MLKEM768",
+                    "x25519",
+                    "secp256r1",
+                    "secp384r1",
+                    "secp521r1",
+                    "x448",
+                    "ffdhe2048",
+                    "ffdhe3072",
+                    "ffdhe4096",
+                    "ffdhe6144",
+                    "ffdhe8192")
+            .sorted()
+            .toList();
+
+    protected DefaultNamedGroups() throws Exception {
+        super();
+    }
+
+    public static void main(String[] args) throws Exception {
+        SecurityUtils.addToDisabledTlsAlgs(DISABLED_NG);
+        var test = new DefaultNamedGroups();
+
+        for (SSLEngine engine :
+                new SSLEngine[]{test.serverEngine, test.clientEngine}) {
+            checkEngineDefaultNG(engine);
+        }
+    }
+
+    private static void checkEngineDefaultNG(SSLEngine engine) {
+        var defaultConfigNG = new ArrayList<>(List.of(
+                engine.getSSLParameters().getNamedGroups()));
+
+        assertFalse(defaultConfigNG.contains(DISABLED_NG));
+        defaultConfigNG.add(DISABLED_NG);
+        assertTrue(REFERENCE_NG.equals(
+                        defaultConfigNG.stream().sorted().toList()),
+                "Named groups returned by engine: " + defaultConfigNG);
+    }
+}
diff --git a/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java b/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java
index 26304c5df95..a13f8570f14 100644
--- a/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java
+++ b/test/jdk/sun/security/ssl/CipherSuite/DisabledCurve.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,24 @@
 
 /*
  * @test
- * @bug 8246330
+ * @bug 8246330 8314323
  * @library /javax/net/ssl/templates /test/lib
  * @run main/othervm -Djdk.tls.namedGroups="secp384r1"
         DisabledCurve DISABLE_NONE PASS
  * @run main/othervm -Djdk.tls.namedGroups="secp384r1"
         DisabledCurve secp384r1 FAIL
+ * @run main/othervm -Djdk.tls.namedGroups="X25519MLKEM768"
+        DisabledCurve DISABLE_NONE PASS
+ * @run main/othervm -Djdk.tls.namedGroups="X25519MLKEM768"
+        DisabledCurve X25519MLKEM768 FAIL
+ * @run main/othervm -Djdk.tls.namedGroups="SecP256r1MLKEM768"
+        DisabledCurve DISABLE_NONE PASS
+ * @run main/othervm -Djdk.tls.namedGroups="SecP256r1MLKEM768"
+        DisabledCurve SecP256r1MLKEM768 FAIL
+ * @run main/othervm -Djdk.tls.namedGroups="SecP384r1MLKEM1024"
+        DisabledCurve DISABLE_NONE PASS
+ * @run main/othervm -Djdk.tls.namedGroups="SecP384r1MLKEM1024"
+        DisabledCurve SecP384r1MLKEM1024 FAIL
 */
 import java.security.Security;
 import java.util.Arrays;
@@ -45,8 +57,10 @@ public class DisabledCurve extends SSLSocketTemplate {
     private static final String[][][] protocols = {
             { { "TLSv1.3", "TLSv1.2", "TLSv1.1", "TLSv1" }, { "TLSv1.2" } },
             { { "TLSv1.2" }, { "TLSv1.3", "TLSv1.2", "TLSv1.1", "TLSv1" } },
-            { { "TLSv1.2" }, { "TLSv1.2" } }, { { "TLSv1.1" }, { "TLSv1.1" } },
-            { { "TLSv1" }, { "TLSv1" } } };
+            { { "TLSv1.2" }, { "TLSv1.2" } },
+            { { "TLSv1.1" }, { "TLSv1.1" } },
+            { { "TLSv1" }, { "TLSv1" } },
+            { { "TLSv1.3" }, { "TLSv1.3" } } };
 
     @Override
     protected SSLContext createClientSSLContext() throws Exception {
@@ -94,17 +108,36 @@ public class DisabledCurve extends SSLSocketTemplate {
         String expected = args[1];
         String disabledName = ("DISABLE_NONE".equals(args[0]) ? "" : args[0]);
         boolean disabled = false;
-        if (disabledName.equals("")) {
+
+        if (disabledName.isEmpty()) {
             Security.setProperty("jdk.disabled.namedCurves", "");
+            Security.setProperty("jdk.certpath.disabledAlgorithms", "");
         } else {
             disabled = true;
-            Security.setProperty("jdk.certpath.disabledAlgorithms", "secp384r1");
+            Security.setProperty("jdk.certpath.disabledAlgorithms", disabledName);
+            if (!disabledName.contains("MLKEM")) {
+                Security.setProperty("jdk.disabled.namedCurves", disabledName);
+            } else {
+                Security.setProperty("jdk.disabled.namedCurves", "");
+            }
         }
 
         // Re-enable TLSv1 and TLSv1.1 since test depends on it.
         SecurityUtils.removeFromDisabledTlsAlgs("TLSv1", "TLSv1.1");
 
+        String namedGroups = System.getProperty("jdk.tls.namedGroups", "");
+        boolean hybridGroup = namedGroups.contains("MLKEM");
+
         for (index = 0; index < protocols.length; index++) {
+            if (hybridGroup) {
+                String[] clientProtos = protocols[index][0];
+                String[] serverProtos = protocols[index][1];
+
+                if (!(isTLS13(clientProtos) && isTLS13(serverProtos))) {
+                    continue;
+                }
+            }
+
             try {
                 (new DisabledCurve()).run();
                 if (expected.equals("FAIL")) {
@@ -123,4 +156,8 @@ public class DisabledCurve extends SSLSocketTemplate {
 
         }
     }
+
+    private static boolean isTLS13(String[] protocols) {
+        return protocols.length == 1 && "TLSv1.3".equals(protocols[0]);
+    }
 }
diff --git a/test/jdk/sun/security/ssl/CipherSuite/NamedGroupsWithCipherSuite.java b/test/jdk/sun/security/ssl/CipherSuite/NamedGroupsWithCipherSuite.java
index 5732f42982c..9080f549683 100644
--- a/test/jdk/sun/security/ssl/CipherSuite/NamedGroupsWithCipherSuite.java
+++ b/test/jdk/sun/security/ssl/CipherSuite/NamedGroupsWithCipherSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,8 @@
  * questions.
  */
 
+import java.util.Arrays;
+import java.util.List;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLSocket;
@@ -29,7 +31,7 @@ import jdk.test.lib.security.SecurityUtils;
 
 /*
   * @test
-  * @bug 8224650 8242929
+  * @bug 8224650 8242929 8314323
   * @library /javax/net/ssl/templates
   *          /javax/net/ssl/TLSCommon
   *          /test/lib
@@ -44,17 +46,20 @@ import jdk.test.lib.security.SecurityUtils;
   * @run main/othervm NamedGroupsWithCipherSuite ffdhe4096
   * @run main/othervm NamedGroupsWithCipherSuite ffdhe6144
   * @run main/othervm NamedGroupsWithCipherSuite ffdhe8192
+  * @run main/othervm NamedGroupsWithCipherSuite X25519MLKEM768
+  * @run main/othervm NamedGroupsWithCipherSuite SecP256r1MLKEM768
+  * @run main/othervm NamedGroupsWithCipherSuite SecP384r1MLKEM1024
  */
 public class NamedGroupsWithCipherSuite extends SSLSocketTemplate {
 
-    private static final Protocol[] PROTOCOLS = new Protocol[] {
+    private static final List<Protocol> PROTOCOLS = List.of(
             Protocol.TLSV1_3,
             Protocol.TLSV1_2,
             Protocol.TLSV1_1,
             Protocol.TLSV1
-    };
+    );
 
-    private static final CipherSuite[] CIPHER_SUITES = new CipherSuite[] {
+    private static final List<CipherSuite> CIPHER_SUITES = List.of(
             CipherSuite.TLS_AES_128_GCM_SHA256,
             CipherSuite.TLS_AES_256_GCM_SHA384,
             CipherSuite.TLS_CHACHA20_POLY1305_SHA256,
@@ -75,7 +80,23 @@ public class NamedGroupsWithCipherSuite extends SSLSocketTemplate {
             CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
             CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
             CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-    };
+    );
+
+    private static final List<String> HYBRID_NAMEDGROUPS = List.of(
+            "X25519MLKEM768",
+            "SecP256r1MLKEM768",
+            "SecP384r1MLKEM1024"
+    );
+
+    private static final List<Protocol> HYBRID_PROTOCOL = List.of(
+            Protocol.TLSV1_3
+    );
+
+    private static final List<CipherSuite> HYBRID_CIPHER_SUITES = List.of(
+            CipherSuite.TLS_AES_128_GCM_SHA256,
+            CipherSuite.TLS_AES_256_GCM_SHA384,
+            CipherSuite.TLS_CHACHA20_POLY1305_SHA256
+    );
 
     private String protocol;
     private String cipher;
@@ -151,48 +172,59 @@ public class NamedGroupsWithCipherSuite extends SSLSocketTemplate {
         // Re-enable TLSv1 and TLSv1.1 since test depends on it.
         SecurityUtils.removeFromDisabledTlsAlgs("TLSv1", "TLSv1.1");
 
-        for (Protocol protocol : PROTOCOLS) {
-            for (CipherSuite cipherSuite : CIPHER_SUITES) {
-                // Named group converted to lower case just
-                // to satisfy Test condition
+        boolean hybridGroup = HYBRID_NAMEDGROUPS.contains(namedGroup);
+        List<Protocol> protocolList = hybridGroup ?
+                HYBRID_PROTOCOL : PROTOCOLS;
+        List<CipherSuite> cipherList = hybridGroup ?
+                HYBRID_CIPHER_SUITES : CIPHER_SUITES;
+
+        // non-Hybrid named group converted to lower case just
+        // to satisfy Test condition
+        String normalizedGroup = hybridGroup ?
+                namedGroup : namedGroup.toLowerCase();
+
+        for (Protocol protocol : protocolList) {
+            for (CipherSuite cipherSuite : cipherList) {
                 if (cipherSuite.supportedByProtocol(protocol)
-                        && groupSupportdByCipher(namedGroup.toLowerCase(),
-                                cipherSuite)) {
+                        && groupSupportedByCipher(normalizedGroup,
+                        cipherSuite)) {
                     System.out.printf("Protocol: %s, cipher suite: %s%n",
                             protocol, cipherSuite);
-                    // Named group converted to lower case just
-                    // to satisfy Test condition
                     new NamedGroupsWithCipherSuite(protocol,
-                            cipherSuite, namedGroup.toLowerCase()).run();
+                            cipherSuite, normalizedGroup).run();
                 }
             }
         }
     }
 
-    private static boolean groupSupportdByCipher(String group,
+    private static boolean groupSupportedByCipher(String group,
             CipherSuite cipherSuite) {
+        if (HYBRID_NAMEDGROUPS.contains(group)) {
+            return cipherSuite.keyExAlgorithm == null;
+        }
+
         return (group.startsWith("x")
-                        && xdhGroupSupportdByCipher(cipherSuite))
+                        && xdhGroupSupportedByCipher(cipherSuite))
                 || (group.startsWith("secp")
-                        && ecdhGroupSupportdByCipher(cipherSuite))
+                        && ecdhGroupSupportedByCipher(cipherSuite))
                 || (group.startsWith("ffdhe")
-                        && ffdhGroupSupportdByCipher(cipherSuite));
+                        && ffdhGroupSupportedByCipher(cipherSuite));
     }
 
-    private static boolean xdhGroupSupportdByCipher(
+    private static boolean xdhGroupSupportedByCipher(
             CipherSuite cipherSuite) {
         return cipherSuite.keyExAlgorithm == null
                 || cipherSuite.keyExAlgorithm == KeyExAlgorithm.ECDHE_RSA;
     }
 
-    private static boolean ecdhGroupSupportdByCipher(
+    private static boolean ecdhGroupSupportedByCipher(
             CipherSuite cipherSuite) {
         return cipherSuite.keyExAlgorithm == null
                 || cipherSuite.keyExAlgorithm == KeyExAlgorithm.ECDHE_RSA
                 || cipherSuite.keyExAlgorithm == KeyExAlgorithm.ECDHE_ECDSA;
     }
 
-    private static boolean ffdhGroupSupportdByCipher(
+    private static boolean ffdhGroupSupportedByCipher(
             CipherSuite cipherSuite) {
         return cipherSuite.keyExAlgorithm == null
                 || cipherSuite.keyExAlgorithm == KeyExAlgorithm.DHE_DSS
diff --git a/test/jdk/sun/security/ssl/CipherSuite/RestrictNamedGroup.java b/test/jdk/sun/security/ssl/CipherSuite/RestrictNamedGroup.java
index c4c343bf84e..4ff0c6e6e15 100644
--- a/test/jdk/sun/security/ssl/CipherSuite/RestrictNamedGroup.java
+++ b/test/jdk/sun/security/ssl/CipherSuite/RestrictNamedGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8226374 8242929
+ * @bug 8226374 8242929 8314323
  * @library /javax/net/ssl/templates
  * @summary Restrict signature algorithms and named groups
  * @run main/othervm RestrictNamedGroup x25519
@@ -36,6 +36,9 @@
  * @run main/othervm RestrictNamedGroup ffdhe4096
  * @run main/othervm RestrictNamedGroup ffdhe6144
  * @run main/othervm RestrictNamedGroup ffdhe8192
+ * @run main/othervm RestrictNamedGroup X25519MLKEM768
+ * @run main/othervm RestrictNamedGroup SecP256r1MLKEM768
+ * @run main/othervm RestrictNamedGroup SecP384r1MLKEM1024
  */
 
 import java.security.Security;
diff --git a/test/jdk/sun/security/ssl/CipherSuite/SupportedGroups.java b/test/jdk/sun/security/ssl/CipherSuite/SupportedGroups.java
index 88b0bf2489a..8cf6ee2b5e6 100644
--- a/test/jdk/sun/security/ssl/CipherSuite/SupportedGroups.java
+++ b/test/jdk/sun/security/ssl/CipherSuite/SupportedGroups.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
  /*
   * @test
-  * @bug 8171279
+  * @bug 8171279 8314323
   * @library /javax/net/ssl/templates
   * @summary Test TLS connection with each individual supported group
   * @run main/othervm SupportedGroups x25519
@@ -36,6 +36,9 @@
   * @run main/othervm SupportedGroups ffdhe4096
   * @run main/othervm SupportedGroups ffdhe6144
   * @run main/othervm SupportedGroups ffdhe8192
+  * @run main/othervm SupportedGroups X25519MLKEM768
+  * @run main/othervm SupportedGroups SecP256r1MLKEM768
+  * @run main/othervm SupportedGroups SecP384r1MLKEM1024
  */
 import java.net.InetAddress;
 import java.util.Arrays;
@@ -45,15 +48,24 @@ import javax.net.ssl.SSLServerSocket;
 public class SupportedGroups extends SSLSocketTemplate {
 
     private static volatile int index;
-    private static final String[][][] protocols = {
+    private static final String[][][] protocolsForClassic = {
         {{"TLSv1.3"}, {"TLSv1.3"}},
         {{"TLSv1.3", "TLSv1.2"}, {"TLSv1.2"}},
         {{"TLSv1.2"}, {"TLSv1.3", "TLSv1.2"}},
         {{"TLSv1.2"}, {"TLSv1.2"}}
     };
 
-    public SupportedGroups() {
+    private static final String[][][] protocolsForHybrid = {
+            {{"TLSv1.3"}, {"TLSv1.3"}},
+            {{"TLSv1.3", "TLSv1.2"}, {"TLSv1.3"}},
+            {{"TLSv1.3"}, {"TLSv1.3", "TLSv1.2"}}
+    };
+
+    private final String[][][] protocols;
+
+    public SupportedGroups(String[][][] protocols) {
         this.serverAddress = InetAddress.getLoopbackAddress();
+        this.protocols = protocols;
     }
 
     // Servers are configured before clients, increment test case after.
@@ -85,8 +97,18 @@ public class SupportedGroups extends SSLSocketTemplate {
     public static void main(String[] args) throws Exception {
         System.setProperty("jdk.tls.namedGroups", args[0]);
 
+        boolean hybridGroup = hybridNamedGroup(args[0]);
+        String[][][] protocols = hybridGroup ?
+                protocolsForHybrid : protocolsForClassic;
+
         for (index = 0; index < protocols.length; index++) {
-            (new SupportedGroups()).run();
+            (new SupportedGroups(protocols)).run();
         }
     }
+
+    private static boolean hybridNamedGroup(String namedGroup) {
+        return namedGroup.equals("X25519MLKEM768") ||
+                namedGroup.equals("SecP256r1MLKEM768") ||
+                namedGroup.equals("SecP384r1MLKEM1024");
+    }
 }
diff --git a/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java
index 5a704ef4d1f..9c813c46bdc 100644
--- a/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java
+++ b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java
@@ -111,7 +111,7 @@ public class SSLEngineKeyLimit extends SSLContextTemplate {
             System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
                     " -Dtest.src=" + System.getProperty("test.src") +
                             " -Dtest.jdk=" + System.getProperty("test.jdk") +
-                            " -Djavax.net.debug=ssl,handshake" +
+                            " -Djavax.net.debug=ssl" +
                             " -Djava.security.properties=" + f.getName());
 
             System.out.println("test.java.opts: " +
diff --git a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
index f32d0e381a6..59becf3b664 100644
--- a/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
+++ b/test/jdk/sun/security/ssl/SSLLogger/DebugPropertyValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8350582 8340312 8369995 8372004
+ * @bug 8350582 8340312 8369995 8044609 8372004 8371333
  * @library /test/lib /javax/net/ssl/templates
  * @summary Correct the parsing of the ssl value in javax.net.debug
  * @run junit DebugPropertyValuesTest
@@ -58,30 +58,31 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
         debugMessages.put("handshake",
                 List.of("Produced ClientHello handshake message",
                         "supported_versions"));
+        debugMessages.put("handshake-expand",
+                List.of("\"logger\".*: \"javax.net.ssl\",",
+                    "\"specifics\"   : \\[",
+                    "\"message\".*: \"Produced ClientHello handshake message"));
         debugMessages.put("keymanager", List.of("Choosing key:"));
         debugMessages.put("packet", List.of("Raw write"));
         debugMessages.put("plaintext",
                 List.of("Plaintext before ENCRYPTION"));
         debugMessages.put("record", List.of("handshake, length =", "WRITE:"));
-        debugMessages.put("session", List.of("Session initialized:"));
-        debugMessages.put("sslctx",
-                List.of("trigger seeding of SecureRandom"));
-        debugMessages.put("ssl", List.of("jdk.tls.keyLimits:"));
-        debugMessages.put("trustmanager",
-                List.of("adding as trusted certificates"));
-        debugMessages.put("verbose",
-                List.of("Ignore unsupported cipher suite:"));
-        debugMessages.put("handshake-expand",
-                List.of("\"logger\".*: \"javax.net.ssl\",",
-                        "\"specifics\"   : \\[",
-                        "\"message\".*: \"Produced ClientHello handshake message"));
         debugMessages.put("record-expand",
                 List.of("\"logger\".*: \"javax.net.ssl\",",
-                        "\"specifics\"   : \\[",
                         "\"message\".*: \"READ: TLSv1.2 application_data"));
+        debugMessages.put("session", List.of("Session initialized:"));
+        debugMessages.put("ssl", List.of("jdk.tls.keyLimits:"));
+        debugMessages.put("sslctx",
+                List.of("trigger seeding of SecureRandom",
+                        // Available list should finish with this style
+                        "TLS_EMPTY_RENEGOTIATION_INFO_SCSV]",
+                        "Ignore disabled cipher suites for protocols: " +
+                                "\\[TLSv1.3, TLSv1.2\\]"));
+        debugMessages.put("trustmanager",
+                List.of("adding as trusted certificates"));
         debugMessages.put("help",
-                List.of("print the help messages",
-                        "debugging can be widened with:"));
+                List.of("print this help message and exit",
+                        "verbose handshake message printing"));
         debugMessages.put("java.security.debug",
                 List.of("properties\\[.*\\|main\\|.*" + DATE_REGEX + ".*\\]:",
                         "certpath\\[.*\\|main\\|.*" + DATE_REGEX + ".*\\]:"));
@@ -111,78 +112,64 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
                 Arguments.of(List.of("-Djavax.net.debug=all"),
                         List.of("handshake", "keymanager", "packet",
                                 "plaintext", "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose")),
+                                "sslctx", "trustmanager")),
                 // ssl should print most details except verbose details
                 Arguments.of(List.of("-Djavax.net.debug=ssl"),
                         List.of("handshake", "keymanager",
                                 "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose")),
+                                "sslctx", "trustmanager")),
                 // allow expand option for more verbose output
                 Arguments.of(
                         List.of("-Djavax.net.debug=ssl,handshake,expand"),
-                        List.of("handshake", "handshake-expand",
-                                "keymanager", "record", "session",
-                                "record-expand", "ssl", "sslctx",
-                                "trustmanager", "verbose")),
+                        List.of("handshake", "handshake-expand", "ssl")),
                 // filtering on record option, with expand
                 Arguments.of(List.of("-Djavax.net.debug=ssl:record,expand"),
-                        List.of("handshake", "handshake-expand",
-                                "keymanager", "record", "record-expand",
-                                "session", "ssl", "sslctx", "trustmanager",
-                                "verbose")),
+                        List.of("record", "record-expand", "ssl")),
+                // reverse the input params of last example. should be same result
+                Arguments.of(List.of("-Djavax.net.debug=expand,record:ssl"),
+                        List.of("record", "record-expand", "ssl")),
                 // this test is equivalent to ssl:record mode
                 Arguments.of(List.of("-Djavax.net.debug=ssl,record"),
-                        List.of("handshake", "keymanager", "record",
-                                "session", "ssl", "sslctx",
-                                "trustmanager", "verbose")),
+                        List.of("record", "ssl")),
                 // example of test where no "ssl" value is passed
                 // handshake debugging with verbose mode
-                // only verbose gets printed. Needs fixing (JDK-8044609)
+                // No debug logs should be printed
                 Arguments.of(List.of("-Djavax.net.debug=handshake:verbose"),
-                        List.of("verbose")),
+                        List.of()),
                 // another example of test where no "ssl" value is passed
                 Arguments.of(List.of("-Djavax.net.debug=record"),
-                        List.of("record")),
+                        List.of()),
                 // ignore bad sub-option. treat like "ssl"
                 Arguments.of(List.of("-Djavax.net.debug=ssl,typo"),
                         List.of("handshake", "keymanager",
                                 "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose")),
+                                "sslctx", "trustmanager")),
                 // ssltypo contains "ssl". Treat like "ssl"
                 Arguments.of(List.of("-Djavax.net.debug=ssltypo"),
                         List.of("handshake", "keymanager",
                                 "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose")),
+                                "sslctx", "trustmanager")),
                 // plaintext is valid for record option
-                Arguments.of(
-                        List.of("-Djavax.net.debug=ssl:record:plaintext"),
-                        List.of("handshake", "keymanager", "plaintext",
-                                "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose")),
+                Arguments.of(List.of("-Djavax.net.debug=ssl:record:plaintext"),
+                        List.of("plaintext", "record", "ssl")),
                 Arguments.of(List.of("-Djavax.net.debug=ssl:trustmanager"),
-                        List.of("handshake", "keymanager", "record",
-                                "session", "ssl", "sslctx", "trustmanager",
-                                "verbose")),
+                        List.of("ssl", "trustmanager")),
                 Arguments.of(List.of("-Djavax.net.debug=ssl:sslctx"),
-                        List.of("handshake", "keymanager", "record",
-                                "session", "ssl", "sslctx", "trustmanager",
-                                "verbose")),
+                        List.of("ssl", "sslctx")),
                 // help message test. Should exit without running test
                 Arguments.of(List.of("-Djavax.net.debug=help"),
                         List.of("help")),
                 // add in javax.net.debug sanity test
                 Arguments.of(List.of("-Djavax.net.debug=ssl:trustmanager",
                                 "-Djava.security.debug=all"),
-                        List.of("handshake", "java.security.debug",
-                                "keymanager", "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose")),
+                        List.of("java.security.debug", "ssl", "trustmanager")),
                 // empty invokes System.Logger use
                 Arguments.of(List.of("-Djavax.net.debug",
                         "-Djava.util.logging.config.file=" + LOG_FILE),
                         List.of("handshake", "javax.net.debug.logger",
                                 "keymanager", "packet", "plaintext",
                                 "record", "session", "ssl",
-                                "sslctx", "trustmanager", "verbose"))
+                                "sslctx", "trustmanager"))
         );
     }
 
@@ -196,11 +183,23 @@ public class DebugPropertyValuesTest extends SSLSocketTemplate {
         OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(args);
         outputAnalyzer.shouldHaveExitValue(0);
         for (String s : debugMessages.keySet()) {
-            for (String output : debugMessages.get(s)) {
-                if (expected.contains(s)) {
+            List<String> patterns = debugMessages.get(s);
+            if (expected.contains(s)) {
+                for (String output : patterns) {
                     outputAnalyzer.shouldMatch(output);
-                } else {
-                    outputAnalyzer.shouldNotMatch(output);
+                }
+            } else {
+                // some debug messages overlap with each other. Only fail if
+                // all the messages in the list were unexpected
+                boolean allUnexpected = true;
+                for (String output : patterns) {
+                    if (!outputAnalyzer.contains(output)) {
+                        allUnexpected = false;
+                        break;
+                    }
+                }
+                if (allUnexpected) {
+                    throw new AssertionError("Unexpected output for key: " + s);
                 }
             }
         }
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java
index a851a5d72bb..646db0b68e6 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java
@@ -54,7 +54,7 @@ public class MultiNSTNoSessionCreation {
                 " -Dtest.src=" + System.getProperty("test.src") +
                     " -Dtest.jdk=" + System.getProperty("test.jdk") +
                     " -Dtest.root=" + System.getProperty("test.root") +
-                    " -Djavax.net.debug=ssl,handshake " + params);
+                    " -Djavax.net.debug=ssl " + params);
 
             System.out.println("test.java.opts: " +
                 System.getProperty("test.java.opts"));
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
index 2784875d426..d9ac85c4897 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java
@@ -181,7 +181,7 @@ public class ResumptionUpdateBoundValues extends SSLContextTemplate {
             System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
                     " -Dtest.src=" + System.getProperty("test.src") +
                             " -Dtest.jdk=" + System.getProperty("test.jdk") +
-                            " -Djavax.net.debug=ssl,handshake");
+                            " -Djavax.net.debug=ssl");
 
             System.out.println("test.java.opts: " +
                     System.getProperty("test.java.opts"));
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java
index 7ce4d97a7a2..6c45505d9f6 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java
@@ -127,7 +127,7 @@ public class SSLSocketKeyLimit {
             System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
                     " -Dtest.src=" + System.getProperty("test.src") +
                             " -Dtest.jdk=" + System.getProperty("test.jdk") +
-                            " -Djavax.net.debug=ssl,handshake" +
+                            " -Djavax.net.debug=ssl" +
                             " -Djava.security.properties=" + f.getName());
 
             System.out.println("test.java.opts: " +
diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java
index 6b0f365edc7..64779facd26 100644
--- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java
+++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketReset.java
@@ -21,16 +21,14 @@
  * questions.
  */
 
-//
-// Please run in othervm mode.  SunJSSE does not support dynamic system
-// properties, no way to re-use system properties in samevm/agentvm mode.
-//
-
 /*
  * @test
  * @bug 8268965
  * @summary Socket reset issue for TLS socket close
- * @run main/othervm -Djdk.net.usePlainSocketImpl=true SSLSocketReset
+ * @comment The test uses SSLContext.getDefault(), so we use othervm to prevent
+ *          usage of unexpected default SSLContext that might be set by some
+ *          other test
+ * @run main/othervm SSLSocketReset
  */
 
 import javax.net.ssl.*;
diff --git a/test/jdk/sun/security/tools/keytool/ListAlias.java b/test/jdk/sun/security/tools/keytool/ListAlias.java
new file mode 100644
index 00000000000..91994c04a9c
--- /dev/null
+++ b/test/jdk/sun/security/tools/keytool/ListAlias.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8286032
+ * @summary Validate the warnings of the keytool -list -alias command
+ * @library /test/lib
+ */
+
+import jdk.test.lib.SecurityTools;
+
+public class ListAlias {
+
+    public static void main(String[] args) throws Exception {
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                "-genseckey -keyalg DES -alias deskey")
+                .shouldContain("Warning")
+                .shouldMatch("The generated secret key uses the DES algorithm.*considered a security risk")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                        "-list -alias deskey -v")
+                .shouldContain("Warning")
+                .shouldMatch("<deskey> uses the DES algorithm.*considered a security risk")
+                .shouldNotContain("The certificate")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                        "-genkeypair -keyalg RSA -alias ca -dname CN=CA -ext bc:c " +
+                        "-sigalg SHA1withRSA")
+                .shouldContain("Warning")
+                .shouldMatch("The generated certificate uses the SHA1withRSA.*considered a security risk")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                        "-list -alias ca -v")
+                .shouldContain("Warning")
+                .shouldMatch("<ca> uses the SHA1withRSA.*considered a security risk")
+                .shouldNotContain("The certificate")
+                .shouldHaveExitValue(0);
+
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                        "-list -v")
+                .shouldContain("Warning")
+                .shouldMatch("<deskey> uses the DES algorithm.*considered a security risk")
+                .shouldMatch("<ca> uses the SHA1withRSA.*considered a security risk")
+                .shouldNotContain("The certificate")
+                .shouldHaveExitValue(0);
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/sun/security/tools/keytool/WeakAlg.java b/test/jdk/sun/security/tools/keytool/WeakAlg.java
index de2435a4f4b..546a4182e97 100644
--- a/test/jdk/sun/security/tools/keytool/WeakAlg.java
+++ b/test/jdk/sun/security/tools/keytool/WeakAlg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -750,7 +750,7 @@ public class WeakAlg {
             oa.shouldNotContain("Warning");
         } else {
             oa.shouldContain("Warning")
-                    .shouldMatch("The certificate.*" + bad + ".*is disabled");
+                    .shouldMatch("uses.*" + bad + ".*is disabled");
         }
 
         // With cert content
@@ -770,7 +770,7 @@ public class WeakAlg {
         } else {
             oa.shouldContain("Warning")
                     .shouldContain(bad + " (disabled)")
-                    .shouldMatch("The certificate.*" + bad + ".*is disabled");
+                    .shouldMatch("uses.*" + bad + ".*is disabled");
         }
     }
 
@@ -844,11 +844,11 @@ public class WeakAlg {
                 break;
             case "SHA1withRSA":
                 oa.shouldContain("Warning")
-                        .shouldMatch("The certificate.*" + bad + ".*considered a security risk");
+                        .shouldMatch("uses.*" + bad + ".*considered a security risk");
                 break;
             case "1024-bit RSA key":
                 oa.shouldContain("Warning")
-                        .shouldMatch("The certificate.*" + bad + ".*will be disabled");
+                        .shouldMatch("uses.*" + bad + ".*will be disabled");
                 break;
         }
 
@@ -879,12 +879,12 @@ public class WeakAlg {
             case "SHA1withRSA":
                 oa.shouldContain("Warning")
                         .shouldContain(bad + " (weak)")
-                        .shouldMatch("The certificate.*" + bad + ".*considered a security risk");
+                        .shouldMatch("uses.*" + bad + ".*considered a security risk");
                 break;
             case "1024-bit RSA key":
                 oa.shouldContain("Warning")
                         .shouldContain(bad + " (weak)")
-                        .shouldMatch("The certificate.*" + bad + ".*will be disabled");
+                        .shouldMatch("uses.*" + bad + ".*will be disabled");
                 break;
         }
     }
diff --git a/test/jdk/sun/security/x509/URICertStore/AIACertTimeout.java b/test/jdk/sun/security/x509/URICertStore/AIACertTimeout.java
index cabb225bf1c..5491d7b0d7a 100644
--- a/test/jdk/sun/security/x509/URICertStore/AIACertTimeout.java
+++ b/test/jdk/sun/security/x509/URICertStore/AIACertTimeout.java
@@ -47,6 +47,7 @@ import com.sun.net.httpserver.*;
 import java.io.*;
 import java.math.BigInteger;
 import java.net.InetSocketAddress;
+import java.security.Security;
 import java.security.cert.*;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -69,6 +70,7 @@ public class AIACertTimeout {
     private static X509Certificate  eeCert;
 
     public static void main(String[] args) throws Exception {
+        Security.setProperty("com.sun.security.allowedAIALocations", "any");
         int servTimeoutMsec = (args != null && args.length >= 1) ?
                 Integer.parseInt(args[0]) : -1;
         boolean expectedPass = args != null && args.length >= 2 &&
diff --git a/test/jdk/sun/security/x509/URICertStore/ExtensionsWithLDAP.java b/test/jdk/sun/security/x509/URICertStore/ExtensionsWithLDAP.java
index 3b598d78d9f..2214e9256c3 100644
--- a/test/jdk/sun/security/x509/URICertStore/ExtensionsWithLDAP.java
+++ b/test/jdk/sun/security/x509/URICertStore/ExtensionsWithLDAP.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.security.Security;
 import java.security.cert.CertPath;
 import java.security.cert.CertPathValidator;
 import java.security.cert.CertPathValidatorException;
@@ -47,7 +48,6 @@ import java.security.cert.PKIXParameters;
 import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -67,25 +67,27 @@ public class ExtensionsWithLDAP {
      *        Not After : Jan 17 18:03:59 2043 GMT
      *    Subject: CN=Root
      */
-    private static final String CA_CERT = ""
-        + "-----BEGIN CERTIFICATE-----\n"
-        + "MIIC8TCCAdmgAwIBAgIJAJsSNtj5wdqqMA0GCSqGSIb3DQEBDQUAMA8xDTALBgNV\n"
-        + "BAMMBFJvb3QwHhcNMTUwOTAxMTgwMzU5WhcNNDMwMTE3MTgwMzU5WjAPMQ0wCwYD\n"
-        + "VQQDDARSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvj892vPm\n"
-        + "bB++x9QqqyBveP+ZqQ2B1stV7vh5JmDnOTevkZUOcemp3SXu/esNLSbpL+fARYXH\n"
-        + "V5ubnrfip6RbvcxPfVIIDJrRTLIIsU6W7M6/LJLbLkEVGy4ZV4IHkOw9W2O92rcv\n"
-        + "BkoqhzZnOTGR6uT3rRcKx4RevEKBKhZO+OPPf//lnckOybmYL7t7yQrajzHro76b\n"
-        + "QTXYjAUq/DKhglXfC7vF/JzlAvG2IunGmIfjGcnuDo/9X3Bxef/q5TxCS35fvb7t\n"
-        + "svC+g2QhTcBkQh4uNW2jSjlTIVp1uErCfP5aCjLaez5mqmb1hxPIlcvsNR23HwU6\n"
-        + "bQO7z7NBo9Do6QIDAQABo1AwTjAdBgNVHQ4EFgQUmLZNOBBkqdYoElyxklPYHmAb\n"
-        + "QXIwHwYDVR0jBBgwFoAUmLZNOBBkqdYoElyxklPYHmAbQXIwDAYDVR0TBAUwAwEB\n"
-        + "/zANBgkqhkiG9w0BAQ0FAAOCAQEAYV4fOhDi5q7+XNXCxO8Eil2frR9jqdP4LaQp\n"
-        + "3L0evW0gvPX68s2WmkPWzIu4TJcpdGFQqxyQFSXuKBXjthyiln77QItGTHWeafES\n"
-        + "q5ESrKdSaJZq1bTIrrReCIP74f+fY/F4Tnb3dCqzaljXfzpdbeRsIW6gF71xcOUQ\n"
-        + "nnPEjGVPLUegN+Wn/jQpeLxxIB7FmNXncdRUfMfZ43xVSKuMCy1UUYqJqTa/pXZj\n"
-        + "jCMeRPThRjRqHlJ69jStfWUQATbLyj9KN09rUaJxzmUSt61UqJi7sjcGySaCjAJc\n"
-        + "IcCdVmX/DmRLsdv8W36O3MgrvpT1zR3kaAlv2d8HppnBqcL3xg==\n"
-        + "-----END CERTIFICATE-----";
+    private static final String CA_CERT =
+            """
+            -----BEGIN CERTIFICATE-----
+            MIIC8TCCAdmgAwIBAgIJAJsSNtj5wdqqMA0GCSqGSIb3DQEBDQUAMA8xDTALBgNV
+            BAMMBFJvb3QwHhcNMTUwOTAxMTgwMzU5WhcNNDMwMTE3MTgwMzU5WjAPMQ0wCwYD
+            VQQDDARSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvj892vPm
+            bB++x9QqqyBveP+ZqQ2B1stV7vh5JmDnOTevkZUOcemp3SXu/esNLSbpL+fARYXH
+            V5ubnrfip6RbvcxPfVIIDJrRTLIIsU6W7M6/LJLbLkEVGy4ZV4IHkOw9W2O92rcv
+            BkoqhzZnOTGR6uT3rRcKx4RevEKBKhZO+OPPf//lnckOybmYL7t7yQrajzHro76b
+            QTXYjAUq/DKhglXfC7vF/JzlAvG2IunGmIfjGcnuDo/9X3Bxef/q5TxCS35fvb7t
+            svC+g2QhTcBkQh4uNW2jSjlTIVp1uErCfP5aCjLaez5mqmb1hxPIlcvsNR23HwU6
+            bQO7z7NBo9Do6QIDAQABo1AwTjAdBgNVHQ4EFgQUmLZNOBBkqdYoElyxklPYHmAb
+            QXIwHwYDVR0jBBgwFoAUmLZNOBBkqdYoElyxklPYHmAbQXIwDAYDVR0TBAUwAwEB
+            /zANBgkqhkiG9w0BAQ0FAAOCAQEAYV4fOhDi5q7+XNXCxO8Eil2frR9jqdP4LaQp
+            3L0evW0gvPX68s2WmkPWzIu4TJcpdGFQqxyQFSXuKBXjthyiln77QItGTHWeafES
+            q5ESrKdSaJZq1bTIrrReCIP74f+fY/F4Tnb3dCqzaljXfzpdbeRsIW6gF71xcOUQ
+            nnPEjGVPLUegN+Wn/jQpeLxxIB7FmNXncdRUfMfZ43xVSKuMCy1UUYqJqTa/pXZj
+            jCMeRPThRjRqHlJ69jStfWUQATbLyj9KN09rUaJxzmUSt61UqJi7sjcGySaCjAJc
+            IcCdVmX/DmRLsdv8W36O3MgrvpT1zR3kaAlv2d8HppnBqcL3xg==
+            -----END CERTIFICATE-----
+            """;
 
     /*
      *  Certificate:
@@ -106,39 +108,41 @@ public class ExtensionsWithLDAP {
      *       Authority Information Access:
      *           CA Issuers - URI:ldap://ldap.host.for.aia/dc=Root?cACertificate
      */
-    private static final String EE_CERT = ""
-        + "-----BEGIN CERTIFICATE-----\n"
-        + "MIIDHTCCAgWgAwIBAgIBBzANBgkqhkiG9w0BAQ0FADAPMQ0wCwYDVQQDDARSb290\n"
-        + "MB4XDTE1MDkwMTE4MDM1OVoXDTQzMDExNzE4MDM1OVowDTELMAkGA1UEAwwCRUUw\n"
-        + "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpyz97liuWPDYcLH9TX8Bi\n"
-        + "T78olCmAfmevvch6ncXUVuCzbdaKuKXwn4EVbDszsVJLoK5zdtP+X3iDhutj+IgK\n"
-        + "mLhuczF3M9VIcWr+JJUyTH4+3h/RT8cjCDZOmk9iXkb5ifruVsLqzb9g+Vp140Oz\n"
-        + "7leikne7KmclHvTfvFd0WDI7Gb9vo4f5rT717BXJ/n+M6pNk8DLpLiEu6eziYvXR\n"
-        + "v5x+t5Go3x0eCXdaxEQUf2j876Wfr2qHRJK7lDfFe1DDsMg/KpKGiILYZ+g2qtVM\n"
-        + "ZSxtp5BZEtfB5qV/IE5kWO+mCIAGpXSZIdbERR6pZUq8GLEe1T9e+sO6H24w2F19\n"
-        + "AgMBAAGjgYUwgYIwNAYDVR0fBC0wKzApoCegJYYjbGRhcDovL2xkYXAuaG9zdC5m\n"
-        + "b3IuY3JsZHAvbWFpbi5jcmwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzAChi5s\n"
-        + "ZGFwOi8vbGRhcC5ob3N0LmZvci5haWEvZGM9Um9vdD9jQUNlcnRpZmljYXRlMA0G\n"
-        + "CSqGSIb3DQEBDQUAA4IBAQBWDfZHpuUx0yn5d3+BuztFqoks1MkGdk+USlH0TB1/\n"
-        + "gWWBd+4S4PCKlpSur0gj2rMW4fP5HQfNlHci8JV8/bG4KuKRAXW56dg1818Hl3pc\n"
-        + "iIrUSRn8uUjH3p9qb+Rb/u3mmVQRyJjN2t/zceNsO8/+Dd808OB9aEwGs8lMT0nn\n"
-        + "ZYaaAqYz1GIY/Ecyx1vfEZEQ1ljo6i/r70C3igbypBUShxSiGsleiVTLOGNA+MN1\n"
-        + "/a/Qh0bkaQyTGqK3bwvzzMeQVqWu2EWTBD/PmND5ExkpRICdv8LBVXfLnpoBr4lL\n"
-        + "hnxn9+e0Ah+t8dS5EKfn44w5bI5PCu2bqxs6RCTxNjcY\n"
-        + "-----END CERTIFICATE-----";
+    private static final String EE_CERT =
+            """
+            -----BEGIN CERTIFICATE-----
+            MIIDHTCCAgWgAwIBAgIBBzANBgkqhkiG9w0BAQ0FADAPMQ0wCwYDVQQDDARSb290
+            MB4XDTE1MDkwMTE4MDM1OVoXDTQzMDExNzE4MDM1OVowDTELMAkGA1UEAwwCRUUw
+            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpyz97liuWPDYcLH9TX8Bi
+            T78olCmAfmevvch6ncXUVuCzbdaKuKXwn4EVbDszsVJLoK5zdtP+X3iDhutj+IgK
+            mLhuczF3M9VIcWr+JJUyTH4+3h/RT8cjCDZOmk9iXkb5ifruVsLqzb9g+Vp140Oz
+            7leikne7KmclHvTfvFd0WDI7Gb9vo4f5rT717BXJ/n+M6pNk8DLpLiEu6eziYvXR
+            v5x+t5Go3x0eCXdaxEQUf2j876Wfr2qHRJK7lDfFe1DDsMg/KpKGiILYZ+g2qtVM
+            ZSxtp5BZEtfB5qV/IE5kWO+mCIAGpXSZIdbERR6pZUq8GLEe1T9e+sO6H24w2F19
+            AgMBAAGjgYUwgYIwNAYDVR0fBC0wKzApoCegJYYjbGRhcDovL2xkYXAuaG9zdC5m
+            b3IuY3JsZHAvbWFpbi5jcmwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzAChi5s
+            ZGFwOi8vbGRhcC5ob3N0LmZvci5haWEvZGM9Um9vdD9jQUNlcnRpZmljYXRlMA0G
+            CSqGSIb3DQEBDQUAA4IBAQBWDfZHpuUx0yn5d3+BuztFqoks1MkGdk+USlH0TB1/
+            gWWBd+4S4PCKlpSur0gj2rMW4fP5HQfNlHci8JV8/bG4KuKRAXW56dg1818Hl3pc
+            iIrUSRn8uUjH3p9qb+Rb/u3mmVQRyJjN2t/zceNsO8/+Dd808OB9aEwGs8lMT0nn
+            ZYaaAqYz1GIY/Ecyx1vfEZEQ1ljo6i/r70C3igbypBUShxSiGsleiVTLOGNA+MN1
+            /a/Qh0bkaQyTGqK3bwvzzMeQVqWu2EWTBD/PmND5ExkpRICdv8LBVXfLnpoBr4lL
+            hnxn9+e0Ah+t8dS5EKfn44w5bI5PCu2bqxs6RCTxNjcY
+            -----END CERTIFICATE-----""";
 
     public static void main(String[] args) throws Exception {
         String extension = args[0];
         String targetHost = args[1];
-
+        Security.setProperty("com.sun.security.allowedAIALocations",
+                "ldap://" + targetHost + "/dc=Root");
         X509Certificate trustedCert = loadCertificate(CA_CERT);
         X509Certificate eeCert = loadCertificate(EE_CERT);
 
         Set<TrustAnchor> trustedCertsSet = new HashSet<>();
         trustedCertsSet.add(new TrustAnchor(trustedCert, null));
 
-        CertPath cp = (CertPath) CertificateFactory.getInstance("X509")
-                .generateCertPath(Arrays.asList(eeCert));
+        CertPath cp = CertificateFactory.getInstance("X509")
+                .generateCertPath(List.of(eeCert));
 
         // CertPath validator should try to parse CRLDP and AIA extensions,
         // and load CRLs/certs which they point to.
@@ -151,7 +155,7 @@ public class ExtensionsWithLDAP {
                     = (InetSocketAddress) socket.getRemoteSocketAddress();
             hosts.add(remoteAddress.getHostName());
         };
-        try (SocksProxy proxy = SocksProxy.startProxy(socketConsumer)) {
+        try (SocksProxy _ = SocksProxy.startProxy(socketConsumer)) {
             CertPathValidator.getInstance("PKIX").validate(cp,
                     new PKIXParameters(trustedCertsSet));
             throw new RuntimeException("CertPathValidatorException not thrown");
diff --git a/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java b/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java
index 80eda6fc091..d743485373e 100644
--- a/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java
+++ b/test/jdk/sun/tools/jstack/DeadlockDetectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,10 +76,8 @@ public class DeadlockDetectionTest {
         }
 
         try {
-            String[] vmArgs = Utils.appendTestJavaOpts("-XX:+UsePerfData");
-
             theApp = new LingeredAppWithDeadlock();
-            LingeredApp.startApp(theApp, vmArgs);
+            LingeredApp.startApp(theApp, "-XX:+UsePerfData");
             OutputAnalyzer output = jstack(Long.toString(theApp.getPid()));
             System.out.println(output.getOutput());
 
diff --git a/test/jdk/tools/jar/ValidatorTest.java b/test/jdk/tools/jar/ValidatorTest.java
index c2dfeae8dec..e3f649a04a2 100644
--- a/test/jdk/tools/jar/ValidatorTest.java
+++ b/test/jdk/tools/jar/ValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,8 @@
 
 /*
  * @test
- * @bug 8345431
+ * @bug 8345431 8375433
  * @summary test validator to report malformed jar file
- * @library /test/lib
- * @modules jdk.jartool
- * @build jdk.test.lib.Platform
- *        jdk.test.lib.util.FileUtils
  * @run junit/othervm ValidatorTest
  */
 
@@ -40,6 +36,7 @@ import org.junit.jupiter.api.TestInstance.Lifecycle;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertLinesMatch;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -59,13 +56,15 @@ import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import jdk.test.lib.util.FileUtils;
-
 class ValidatorTest {
     private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
         .orElseThrow(() ->
             new RuntimeException("jar tool not found")
         );
+    private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac")
+        .orElseThrow(() ->
+            new RuntimeException("javac tool not found")
+        );
 
     private final String nl = System.lineSeparator();
     private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -310,6 +309,44 @@ class ValidatorTest {
         }
     }
 
+    @Test
+    public void testInvalidAutomaticModuleName() throws Exception {
+        System.out.printf("%n%n*****Creating Jar with invalid Automatic-Module-Name in Manifest*****%n%n");
+        var file = Path.of("InvalidAutomaticModuleName.jar");
+        var manifest = Path.of("MANIFEST.MF");
+        Files.writeString(manifest,
+                """
+                Automatic-Module-Name: default
+                """);
+        jar("--create --file " + file + " --manifest " + manifest);
+        var e = assertThrows(IOException.class, () -> jar("--validate --file " + file.toString()));
+        var err = e.getMessage();
+        System.out.println(err);
+        assertTrue(err.contains("invalid module name of Automatic-Module-Name entry in manifest: default"), "missing warning for: default");
+    }
+
+    @Test
+    public void testWrongAutomaticModuleName() throws Exception {
+        System.out.printf("%n%n*****Creating Jar with wrong Automatic-Module-Name in Manifest*****%n%n");
+        var file = Path.of("WrongAutomaticModuleName.jar");
+        var foo = Path.of("module-info.java");
+        Files.writeString(foo,
+                """
+                module foo {}
+                """);
+        var manifest = Path.of("MANIFEST.MF");
+        Files.writeString(manifest,
+                """
+                Automatic-Module-Name: bar
+                """);
+        JAVAC_TOOL.run(System.out, System.err, foo.toString());
+        jar("--create --file " + file + " --manifest " + manifest + " module-info.class");
+        var e = assertThrows(IOException.class, () -> jar("--validate --file " + file.toString()));
+        var err = e.getMessage();
+        System.out.println(err);
+        assertTrue(err.contains("expected Automatic-Module-Name entry in manifest: bar to match name of compiled module: foo"), "missing warning for: foo/bar");
+    }
+
     /**
      * Validates that base manifest-related entries are at expected LOC positions.
      * <p>
diff --git a/test/jdk/tools/jimage/JImageBadFileTest.java b/test/jdk/tools/jimage/JImageBadFileTest.java
new file mode 100644
index 00000000000..d25c994b265
--- /dev/null
+++ b/test/jdk/tools/jimage/JImageBadFileTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Consumer;
+
+import jdk.test.lib.Utils;
+
+import static java.nio.file.StandardOpenOption.READ;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+import static java.util.regex.Pattern.quote;
+
+/*
+ * @test
+ * @summary Tests to verify behavior for "invalid" jimage files
+ * @library /test/lib
+ * @modules jdk.jlink/jdk.tools.jimage
+ * @build jdk.test.lib.Asserts
+ * @run main JImageBadFileTest
+ */
+public class JImageBadFileTest extends JImageCliTest {
+    // src/java.base/share/native/libjimage/imageFile.hpp
+    //
+    //      31 -------- bits -------- 0
+    //  IDX +-------------------------+
+    //   0  |   Magic (0xCAFEDADA)    |
+    //      +------------+------------+
+    //   1  | Major Vers | Minor Vers |
+    //      +------------+------------+
+    //   2  |          Flags          |
+    //      +-------------------------+
+    //   3  |      Resource Count     |
+    //      +-------------------------+
+    //   4  |       Table Length      |
+    //      +-------------------------+
+    //   5  |      Attributes Size    |
+    //      +-------------------------+
+    //   6  |       Strings Size      |
+    //      +-------------------------+
+    private static final int HEADER_SIZE_BYTES = 7 * 4;
+
+    /**
+     * Helper to copy the default jimage file for the runtime under test and
+     * allow it to be corrupted in various ways.
+     *
+     * @param label    label for the temporary file (arbitrary debug name)
+     * @param maxLen   maximum number of bytes to copy (-1 to copy all)
+     * @param headerFn function which may corrupt specific header values
+     * @return the path of a temporary jimage file in the test directory containing
+     * the possibly corrupted jimage file (caller should delete)
+     */
+    private Path writeModifiedJimage(String label, int maxLen, Consumer<IntBuffer> headerFn)
+            throws IOException {
+        int remaining = maxLen >= 0 ? maxLen : Integer.MAX_VALUE;
+        Path dst = Utils.createTempFile("modules-" + label, "");
+        try (InputStream rest = Files.newInputStream(Path.of(getImagePath()), READ);
+             OutputStream out = Files.newOutputStream(dst, TRUNCATE_EXISTING)) {
+            ByteBuffer bytes = ByteBuffer.wrap(rest.readNBytes(HEADER_SIZE_BYTES));
+            bytes.order(ByteOrder.nativeOrder());
+            headerFn.accept(bytes.asIntBuffer());
+            int headerSize = Math.min(remaining, HEADER_SIZE_BYTES);
+            out.write(bytes.array(), 0, headerSize);
+            remaining -= headerSize;
+            if (remaining > 0) {
+                byte[] block = new byte[8192];
+                do {
+                    int copySize = Math.min(remaining, block.length);
+                    out.write(block, 0, rest.readNBytes(block, 0, copySize));
+                    remaining -= copySize;
+                } while (rest.available() > 0 && remaining > 0);
+            }
+            return dst.toAbsolutePath();
+        }
+    }
+
+    public void testBadMagicNumber() throws IOException {
+        // Flip some bits in the magic number.
+        Path tempJimage = writeModifiedJimage("bad_magic", -1, b -> b.put(0, b.get(1) ^ 0x1010));
+        JImageResult result = jimage("info", tempJimage.toString());
+        result.assertShowsError();
+        assertMatches(quote("Unable to open"), result.output);
+        assertMatches(quote("is not an image file"), result.output);
+    }
+
+    public void testMismatchedVersion() throws IOException {
+        // Add one to minor version (lowest bits).
+        Path tempJimage = writeModifiedJimage("bad_version", -1, b -> b.put(1, b.get(1) + 1));
+        JImageResult result = jimage("info", tempJimage.toString());
+        result.assertShowsError();
+        assertMatches(quote("Unable to open"), result.output);
+        assertMatches(quote("<JAVA_HOME>/bin/jimage"), result.output);
+        assertMatches(quote("not the correct version"), result.output);
+        assertMatches("Major: \\d+", result.output);
+        assertMatches("Minor: \\d+", result.output);
+    }
+
+    public void testTruncatedHeader() throws IOException {
+        // Copy less than the header.
+        Path tempJimage = writeModifiedJimage("truncated_header", HEADER_SIZE_BYTES - 4, b -> {});
+        JImageResult result = jimage("info", tempJimage.toString());
+        result.assertShowsError();
+        assertMatches(quote("Unable to open"), result.output);
+        assertMatches(quote("is not an image file"), result.output);
+    }
+
+    public void testTruncatedData() throws IOException {
+        // Copy more than the header, but definitely less than the whole file.
+        Path tempJimage = writeModifiedJimage("truncated_data", HEADER_SIZE_BYTES + 1024, b -> {});
+        JImageResult result = jimage("info", tempJimage.toString());
+        result.assertShowsError();
+        assertMatches(quote("Unable to open"), result.output);
+        assertMatches("image file \".*\" is corrupted", result.output);
+    }
+
+    public void testGoodFileCopy() throws IOException {
+        // Self test that the file copying isn't itself corrupting anything.
+        Path tempJimage = writeModifiedJimage("good_file", -1, b -> {});
+        jimage("info", tempJimage.toString()).assertSuccess();
+    }
+
+    public static void main(String[] args) throws Throwable {
+        new JImageBadFileTest().runTests();
+    }
+}
diff --git a/test/jdk/tools/jimage/VerifyJimage.java b/test/jdk/tools/jimage/VerifyJimage.java
index 08f567cbecb..723ad089fa9 100644
--- a/test/jdk/tools/jimage/VerifyJimage.java
+++ b/test/jdk/tools/jimage/VerifyJimage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,15 +145,9 @@ public abstract class VerifyJimage implements Runnable {
                         pool.execute(new ModuleResourceComparator(rootDir, modName, jimage));
                     }
                 }
-                pool.shutdown();
-                if (!pool.awaitTermination(20, TimeUnit.SECONDS)) {
-                    failed.add("Directory verification timed out");
-                }
+                pool.close();
             } catch (IOException ex) {
                 throw new UncheckedIOException(ex);
-            } catch (InterruptedException e) {
-                failed.add("Directory verification was interrupted");
-                Thread.currentThread().interrupt();
             }
         }
 
diff --git a/test/jdk/tools/jpackage/TEST.properties b/test/jdk/tools/jpackage/TEST.properties
index 19eda305364..5cc4aa7a1b9 100644
--- a/test/jdk/tools/jpackage/TEST.properties
+++ b/test/jdk/tools/jpackage/TEST.properties
@@ -13,7 +13,7 @@ maxOutputSize = 2000000
 # Run jpackage tests on windows platform sequentially.
 # Having "share" directory in the list affects tests on other platforms.
 # The better option would be:
-#   if (platfrom == windowws) {
+#   if (platfrom == windows) {
 #     exclusiveAccess.dirs=share windows
 #   }
 # but conditionals are not supported by jtreg configuration files.
@@ -29,4 +29,6 @@ modules = \
     jdk.jpackage/jdk.jpackage.internal.util.function \
     jdk.jpackage/jdk.jpackage.internal.resources:+open \
     java.base/jdk.internal.util \
+    java.base/sun.security.util \
+    java.base/sun.security.x509 \
     jdk.jlink/jdk.tools.jlink.internal
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JPackageCommandTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JPackageCommandTest.java
new file mode 100644
index 00000000000..b0d44702d47
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JPackageCommandTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.spi.ToolProvider;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class JPackageCommandTest extends JUnitAdapter.TestSrcInitializer {
+
+    @ParameterizedTest
+    @MethodSource
+    void testUseToolProvider(UseToolProviderTestSpec spec) {
+        // Run the test with the new state to avoid UnsupportedOperationException
+        // that will be thrown if it attempts to alter global variables in the default R/O state.
+        TKit.withNewState(spec::test);
+    }
+
+    private static List<UseToolProviderTestSpec> testUseToolProvider() {
+
+        var testCases = new ArrayList<UseToolProviderTestSpec>();
+
+        for (var globalToolProvider : ExecutableSetterType.values()) {
+            for (var instanceToolProvider : ExecutableSetterType.values()) {
+                testCases.add(new UseToolProviderTestSpec(globalToolProvider, instanceToolProvider));
+            }
+        }
+
+        return testCases;
+    }
+
+    record UseToolProviderTestSpec(ExecutableSetterType globalType, ExecutableSetterType instanceType) {
+
+        UseToolProviderTestSpec {
+            Objects.requireNonNull(globalType);
+            Objects.requireNonNull(instanceType);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s, global=%s", instanceType, globalType);
+        }
+
+        void test() {
+
+            final Optional<ToolProvider> global;
+            switch (globalType) {
+                case SET_CUSTOM_TOOL_PROVIDER -> {
+                    global = Optional.of(createNewToolProvider("jpackage-mock-global"));
+                    JPackageCommand.useToolProviderByDefault(global.get());
+                }
+                case SET_DEFAULT_TOOL_PROVIDER -> {
+                    global = Optional.of(JavaTool.JPACKAGE.asToolProvider());
+                    JPackageCommand.useToolProviderByDefault();
+                }
+                case SET_PROCESS -> {
+                    global = Optional.empty();
+                    JPackageCommand.useExecutableByDefault();
+                }
+                case SET_NONE -> {
+                    global = Optional.empty();
+                }
+                default -> {
+                    throw ExceptionBox.reachedUnreachable();
+                }
+            }
+
+            var cmd = new JPackageCommand();
+
+            final Optional<ToolProvider> instance;
+            switch (instanceType) {
+                case SET_CUSTOM_TOOL_PROVIDER -> {
+                    instance = Optional.of(createNewToolProvider("jpackage-mock"));
+                    cmd.useToolProvider(instance.get());
+                }
+                case SET_DEFAULT_TOOL_PROVIDER -> {
+                    instance = Optional.of(JavaTool.JPACKAGE.asToolProvider());
+                    cmd.useToolProvider(true);
+                }
+                case SET_PROCESS -> {
+                    instance = Optional.empty();
+                    cmd.useToolProvider(false);
+                }
+                case SET_NONE -> {
+                    instance = Optional.empty();
+                }
+                default -> {
+                    throw ExceptionBox.reachedUnreachable();
+                }
+            }
+
+            var actual = cmd.createExecutor().getToolProvider();
+
+            switch (instanceType) {
+                case SET_CUSTOM_TOOL_PROVIDER -> {
+                    assertSame(actual.get(), instance.get());
+                    assertTrue(cmd.isWithToolProvider());
+                }
+                case SET_DEFAULT_TOOL_PROVIDER -> {
+                    global.ifPresentOrElse(expected -> {
+                        assertEquals(expected.name(), actual.orElseThrow().name());
+                    }, () -> {
+                        assertEquals(instance.get().name(), actual.get().name());
+                    });
+                    assertTrue(cmd.isWithToolProvider());
+                }
+                case SET_PROCESS -> {
+                    assertFalse(actual.isPresent());
+                    assertFalse(cmd.isWithToolProvider());
+                }
+                case SET_NONE -> {
+                    switch (globalType) {
+                        case SET_CUSTOM_TOOL_PROVIDER -> {
+                            assertSame(global.get(), actual.get());
+                            assertTrue(cmd.isWithToolProvider());
+                        }
+                        case SET_DEFAULT_TOOL_PROVIDER -> {
+                            assertEquals(global.get().name(), actual.orElseThrow().name());
+                            assertTrue(cmd.isWithToolProvider());
+                        }
+                        case SET_PROCESS, SET_NONE -> {
+                            assertFalse(actual.isPresent());
+                            assertFalse(cmd.isWithToolProvider());
+                        }
+                    }
+                }
+            }
+        }
+
+        private static ToolProvider createNewToolProvider(String name) {
+            return new ToolProvider() {
+                @Override
+                public int run(PrintWriter out, PrintWriter err, String... args) {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public String name() {
+                    return name;
+                }
+            };
+        }
+    }
+
+    enum ExecutableSetterType {
+        SET_DEFAULT_TOOL_PROVIDER,
+        SET_CUSTOM_TOOL_PROVIDER,
+        SET_PROCESS,
+        SET_NONE,
+        ;
+    }
+}
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/MacHelperTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/MacHelperTest.java
index 5d14f021eaf..b8f7bfd456e 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/MacHelperTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/MacHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,14 +31,20 @@ import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
 import jdk.jpackage.internal.util.PListReader;
 import jdk.jpackage.internal.util.XmlUtils;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-public class MacHelperTest {
+public class MacHelperTest extends JUnitAdapter {
 
     @Test
     public void test_flatMapPList() {
@@ -105,6 +111,18 @@ public class MacHelperTest {
         ), props);
     }
 
+    @ParameterizedTest
+    @MethodSource
+    public void test_appImageSigned(SignedTestSpec spec) {
+        spec.test(MacHelper::appImageSigned);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test_nativePackageSigned(SignedTestSpec spec) {
+        spec.test(MacHelper::nativePackageSigned);
+    }
+
     private static String createPListXml(String ...xml) {
         final List<String> content = new ArrayList<>();
         content.add("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -125,4 +143,126 @@ public class MacHelperTest {
             throw new RuntimeException(ex);
         }
     }
+
+    private static Stream<SignedTestSpec> test_appImageSigned() {
+
+        List<SignedTestSpec.Builder> data = new ArrayList<>();
+
+        for (var signingIdentityOption : List.of(
+                List.<String>of(),
+                List.of("--mac-signing-key-user-name", "foo"),
+                List.of("--mac-app-image-sign-identity", "foo"),
+                List.of("--mac-installer-sign-identity", "foo"),
+                List.of("--mac-installer-sign-identity", "foo", "--mac-app-image-sign-identity", "bar")
+        )) {
+            for (var type : List.of(PackageType.IMAGE, PackageType.MAC_DMG, PackageType.MAC_PKG)) {
+                for (var withMacSign : List.of(true, false)) {
+                    if (signingIdentityOption.contains("--mac-installer-sign-identity") && type != PackageType.MAC_PKG) {
+                        continue;
+                    }
+
+                    var builder = SignedTestSpec.build().type(type).cmdline(signingIdentityOption);
+                    if (withMacSign) {
+                        builder.cmdline("--mac-sign");
+                        if (Stream.of(
+                                "--mac-signing-key-user-name",
+                                "--mac-app-image-sign-identity"
+                        ).anyMatch(signingIdentityOption::contains) || signingIdentityOption.isEmpty()) {
+                            builder.signed();
+                        }
+                    }
+
+                    data.add(builder);
+                }
+            }
+        }
+
+        return data.stream().map(SignedTestSpec.Builder::create);
+    }
+
+    private static Stream<SignedTestSpec> test_nativePackageSigned() {
+
+        List<SignedTestSpec.Builder> data = new ArrayList<>();
+
+        for (var signingIdentityOption : List.of(
+                List.<String>of(),
+                List.of("--mac-signing-key-user-name", "foo"),
+                List.of("--mac-app-image-sign-identity", "foo"),
+                List.of("--mac-installer-sign-identity", "foo"),
+                List.of("--mac-installer-sign-identity", "foo", "--mac-app-image-sign-identity", "bar")
+        )) {
+            for (var type : List.of(PackageType.MAC_DMG, PackageType.MAC_PKG)) {
+                for (var withMacSign : List.of(true, false)) {
+                    if (signingIdentityOption.contains("--mac-installer-sign-identity") && type != PackageType.MAC_PKG) {
+                        continue;
+                    }
+
+                    var builder = SignedTestSpec.build().type(type).cmdline(signingIdentityOption);
+                    if (withMacSign) {
+                        builder.cmdline("--mac-sign");
+                        if (type == PackageType.MAC_PKG && (Stream.of(
+                                "--mac-signing-key-user-name",
+                                "--mac-installer-sign-identity"
+                        ).anyMatch(signingIdentityOption::contains) || signingIdentityOption.isEmpty())) {
+                            builder.signed();
+                        }
+                    }
+
+                    data.add(builder);
+                }
+            }
+        }
+
+        return data.stream().map(SignedTestSpec.Builder::create);
+    }
+
+    private record SignedTestSpec(boolean expectedSigned, PackageType type, List<String> cmdline) {
+
+        SignedTestSpec {
+            Objects.requireNonNull(type);
+            cmdline.forEach(Objects::requireNonNull);
+        }
+
+        void test(Function<JPackageCommand, Boolean> func) {
+            var actualSigned = func.apply((new JPackageCommand().addArguments(cmdline).setPackageType(type)));
+            assertEquals(expectedSigned, actualSigned);
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static final class Builder {
+
+            SignedTestSpec create() {
+                return new SignedTestSpec(
+                        expectedSigned,
+                        Optional.ofNullable(type).orElse(PackageType.IMAGE),
+                        cmdline);
+            }
+
+            Builder signed() {
+                expectedSigned = true;
+                return this;
+            }
+
+            Builder type(PackageType v) {
+                type = v;
+                return this;
+            }
+
+            Builder cmdline(String... args) {
+                return cmdline(List.of(args));
+            }
+
+            Builder cmdline(List<String> v) {
+                cmdline.addAll(v);
+                return this;
+            }
+
+            private boolean expectedSigned;
+            private PackageType type;
+            private List<String> cmdline = new ArrayList<>();
+        }
+    }
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
index 1c6c0ce4447..55b13a06620 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AppImageFile.java
@@ -47,7 +47,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public record AppImageFile(String mainLauncherName, Optional<String> mainLauncherClassName,
-        String version, boolean macSigned, boolean macAppStore, Map<String, Map<String, String>> launchers) {
+        String version, boolean macAppStore, Map<String, Map<String, String>> launchers) {
 
     public static Path getPathInAppImage(Path appImageDir) {
         return ApplicationLayout.platformAppImage()
@@ -66,7 +66,7 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
     }
 
     public AppImageFile(String mainLauncherName, Optional<String> mainLauncherClassName) {
-        this(mainLauncherName, mainLauncherClassName, "1.0", false, false, Map.of(mainLauncherName, Map.of()));
+        this(mainLauncherName, mainLauncherClassName, "1.0", false, Map.of(mainLauncherName, Map.of()));
     }
 
     public AppImageFile(String mainLauncherName, String mainLauncherClassName) {
@@ -103,10 +103,6 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
                 xml.writeEndElement();
             }));
 
-            xml.writeStartElement("signed");
-            xml.writeCharacters(Boolean.toString(macSigned));
-            xml.writeEndElement();
-
             xml.writeStartElement("app-store");
             xml.writeCharacters(Boolean.toString(macAppStore));
             xml.writeEndElement();
@@ -140,10 +136,6 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
             var mainLauncherClassName = Optional.ofNullable(xPath.evaluate(
                     "/jpackage-state/main-class/text()", doc));
 
-            var macSigned = Optional.ofNullable(xPath.evaluate(
-                    "/jpackage-state/signed/text()", doc)).map(
-                            Boolean::parseBoolean).orElse(false);
-
             var macAppStore = Optional.ofNullable(xPath.evaluate(
                     "/jpackage-state/app-store/text()", doc)).map(
                             Boolean::parseBoolean).orElse(false);
@@ -171,7 +163,6 @@ public record AppImageFile(String mainLauncherName, Optional<String> mainLaunche
                     mainLauncherName,
                     mainLauncherClassName,
                     version,
-                    macSigned,
                     macAppStore,
                     Collections.unmodifiableMap(launchers));
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
index 5d3033e2e8c..1ae678cd944 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -35,6 +35,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.spi.ToolProvider;
 import java.util.stream.IntStream;
@@ -62,6 +63,7 @@ public final class Executor extends CommandArguments<Executor> {
     }
 
     public Executor() {
+        commandOutputControl.dumpStdout(TKit.state().out()).dumpStderr(TKit.state().err());
     }
 
     public Executor setExecutable(String v) {
@@ -84,6 +86,10 @@ public final class Executor extends CommandArguments<Executor> {
         return setToolProvider(v.asToolProvider());
     }
 
+    public Optional<ToolProvider> getToolProvider() {
+        return Optional.ofNullable(toolProvider);
+    }
+
     public Optional<Path> getExecutable() {
         return Optional.ofNullable(executable);
     }
@@ -109,15 +115,6 @@ public final class Executor extends CommandArguments<Executor> {
         return this;
     }
 
-    public Executor setWinRunWithEnglishOutput(boolean value) {
-        if (!TKit.isWindows()) {
-            throw new UnsupportedOperationException(
-                    "setWinRunWithEnglishOutput is only valid on Windows platform");
-        }
-        winEnglishOutput = value;
-        return this;
-    }
-
     public Executor setWindowsTmpDir(String tmp) {
         if (!TKit.isWindows()) {
             throw new UnsupportedOperationException(
@@ -186,15 +183,20 @@ public final class Executor extends CommandArguments<Executor> {
         return commandOutputControl.charset();
     }
 
-    Executor storeOutputInFiles(boolean v) {
+    public Executor storeOutputInFiles(boolean v) {
         commandOutputControl.storeOutputInFiles(v);
         return this;
     }
 
-    Executor storeOutputInFiles() {
+    public Executor storeOutputInFiles() {
         return storeOutputInFiles(true);
     }
 
+    public Executor processListener(Consumer<Process> v) {
+        commandOutputControl.processListener(v);
+        return this;
+    }
+
     public record Result(CommandOutputControl.Result base) {
         public Result {
             Objects.requireNonNull(base);
@@ -281,11 +283,11 @@ public final class Executor extends CommandArguments<Executor> {
                     long expectedExitCode = expectedExitCodes.getFirst();
                     TKit.assertEquals(expectedExitCode, getExitCode(), String.format(
                             "Check command %s exited with %d code",
-                            base.execAttrs(), expectedExitCode));
+                            base.execAttrs().printableCommandLine(), expectedExitCode));
                 } default -> {
                     TKit.assertTrue(expectedExitCodes.contains(getExitCode()), String.format(
                             "Check command %s exited with one of %s codes",
-                            base.execAttrs(), expectedExitCodes.stream().sorted().toList()));
+                            base.execAttrs().printableCommandLine(), expectedExitCodes.stream().sorted().toList()));
                 }
             }
             return this;
@@ -300,7 +302,7 @@ public final class Executor extends CommandArguments<Executor> {
         }
 
         public String getPrintableCommandLine() {
-            return base.execAttrs().toString();
+            return base.execAttrs().printableCommandLine();
         }
     }
 
@@ -310,11 +312,6 @@ public final class Executor extends CommandArguments<Executor> {
                     "Can't change directory when using tool provider");
         }
 
-        if (toolProvider != null && winEnglishOutput) {
-            throw new IllegalArgumentException(
-                    "Can't change locale when using tool provider");
-        }
-
         return ThrowingSupplier.toSupplier(() -> {
             if (toolProvider != null) {
                 return runToolProvider();
@@ -434,17 +431,8 @@ public final class Executor extends CommandArguments<Executor> {
         return executable.toAbsolutePath();
     }
 
-    private List<String> prefixCommandLineArgs() {
-        if (winEnglishOutput) {
-            return List.of("cmd.exe", "/c", "chcp", "437", ">nul", "2>&1", "&&");
-        } else {
-            return List.of();
-        }
-    }
-
     private Result runExecutable() throws IOException, InterruptedException {
         List<String> command = new ArrayList<>();
-        command.addAll(prefixCommandLineArgs());
         command.add(executablePath().toString());
         command.addAll(args);
         ProcessBuilder builder = new ProcessBuilder(command);
@@ -522,27 +510,21 @@ public final class Executor extends CommandArguments<Executor> {
             exec = executablePath().toString();
         }
 
-        var cmdline = Stream.of(prefixCommandLineArgs(), List.of(exec), args).flatMap(
-                List::stream).toList();
+        var cmdline = Stream.of(List.of(exec), args).flatMap(List::stream).toList();
 
         return String.format(format, CommandLineFormat.DEFAULT.apply(cmdline), cmdline.size());
     }
 
-    private record ExecutableAttributes(CommandOutputControl.ExecutableAttributes base, String toStringValue)
+    private record ExecutableAttributes(CommandOutputControl.ExecutableAttributes base, String printableCommandLine)
             implements CommandOutputControl.ExecutableAttributes {
 
         ExecutableAttributes {
             Objects.requireNonNull(base);
-            if (toStringValue.isBlank()) {
+            if (printableCommandLine.isBlank()) {
                 throw new IllegalArgumentException();
             }
         }
 
-        @Override
-        public String toString() {
-            return toStringValue;
-        }
-
         @Override
         public List<String> commandLine() {
             return base.commandLine();
@@ -559,6 +541,5 @@ public final class Executor extends CommandArguments<Executor> {
     private Path directory;
     private Set<String> removeEnvVars = new HashSet<>();
     private Map<String, String> setEnvVars = new HashMap<>();
-    private boolean winEnglishOutput;
     private String winTmpDir = null;
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FailedCommandErrorValidator.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FailedCommandErrorValidator.java
new file mode 100644
index 00000000000..f082e079dd6
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/FailedCommandErrorValidator.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package jdk.jpackage.test;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+/**
+ * Validates failed command error in jpackage's output.
+ */
+public final class FailedCommandErrorValidator {
+
+    public FailedCommandErrorValidator(Pattern cmdlinePattern) {
+        this.cmdlinePattern = Objects.requireNonNull(cmdlinePattern);
+    }
+
+    public JPackageOutputValidator create() {
+        var asPredicate = cmdlinePattern.asPredicate();
+
+        var errorMessage = exitCode().map(v -> {
+            return JPackageStringBundle.MAIN.cannedFormattedString("error.command-failed-unexpected-exit-code", v, "");
+        }).orElseGet(() -> {
+            return JPackageStringBundle.MAIN.cannedFormattedString("error.command-failed-unexpected-output", "");
+        });
+
+        var errorMessageWithPrefix = JPackageCommand.makeError(errorMessage).getValue();
+
+        var validator = new JPackageOutputValidator().stderr();
+
+        validator.add(TKit.assertTextStream(cmdlinePattern.pattern()).predicate(line -> {
+            if (line.startsWith(errorMessageWithPrefix)) {
+                line = line.substring(errorMessageWithPrefix.length());
+                return asPredicate.test(line);
+            } else {
+                return false;
+            }
+        }));
+
+        validator.expectMatchingStrings(JPackageStringBundle.MAIN.cannedFormattedString("message.failed-command-output-header"));
+
+        outputValidator().ifPresent(validator::add);
+
+        return validator;
+    }
+
+    public void applyTo(JPackageCommand cmd) {
+        create().applyTo(cmd);
+    }
+
+    public FailedCommandErrorValidator validator(JPackageOutputValidator v) {
+        outputValidator = v;
+        return this;
+    }
+
+    public FailedCommandErrorValidator validator(List<TKit.TextStreamVerifier> validators) {
+        return validator(new JPackageOutputValidator().add(validators));
+    }
+
+    public FailedCommandErrorValidator validators(TKit.TextStreamVerifier... validators) {
+        return validator(List.of(validators));
+    }
+
+    public FailedCommandErrorValidator output(List<String> v) {
+        return validator(v.stream().map(TKit::assertTextStream).toList());
+    }
+
+    public FailedCommandErrorValidator output(String... output) {
+        return output(List.of(output));
+    }
+
+    public FailedCommandErrorValidator exitCode(int v) {
+        exitCode = v;
+        return this;
+    }
+
+    private Optional<Integer> exitCode() {
+        return Optional.ofNullable(exitCode);
+    }
+
+    private Optional<JPackageOutputValidator> outputValidator() {
+        return Optional.ofNullable(outputValidator);
+    }
+
+    private final Pattern cmdlinePattern;
+    private JPackageOutputValidator outputValidator;
+    private Integer exitCode;
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
index 6c7b6a25255..bc731e18136 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
@@ -315,37 +316,33 @@ public final class HelloApp {
 
     public static void executeLauncherAndVerifyOutput(JPackageCommand cmd,
             String... args) {
-        AppOutputVerifier av = assertMainLauncher(cmd, args);
-        if (av != null) {
+        assertMainLauncher(cmd, args).ifPresent(av -> {
             av.executeAndVerifyOutput(args);
-        }
+        });
     }
 
     public static Executor.Result executeLauncher(JPackageCommand cmd,
             String... args) {
-        AppOutputVerifier av = assertMainLauncher(cmd, args);
-        if (av != null) {
+        return assertMainLauncher(cmd, args).map(av -> {
             return av.saveOutput(true).execute(args);
-        } else {
-            return null;
-        }
+        }).orElseThrow();
     }
 
-    public static AppOutputVerifier assertMainLauncher(JPackageCommand cmd,
+    public static Optional<AppOutputVerifier> assertMainLauncher(JPackageCommand cmd,
             String... args) {
         final Path launcherPath = cmd.appLauncherPath();
         if (!cmd.canRunLauncher(String.format("Not running [%s] launcher",
                 launcherPath))) {
-            return null;
+            return Optional.empty();
         }
 
-        return assertApp(launcherPath)
+        return Optional.of(assertApp(launcherPath)
         .addDefaultArguments(Optional
                 .ofNullable(cmd.getAllArgumentValues("--arguments"))
                 .orElseGet(() -> new String[0]))
         .addJavaOptions(Optional
                 .ofNullable(cmd.getAllArgumentValues("--java-options"))
-                .orElseGet(() -> new String[0]));
+                .orElseGet(() -> new String[0])));
     }
 
 
@@ -426,6 +423,11 @@ public final class HelloApp {
             .collect(Collectors.toList()));
         }
 
+        public AppOutputVerifier processListener(Consumer<Process> v) {
+            processListener = v;
+            return this;
+        }
+
         public void verifyOutput(String... args) {
             final List<String> launcherArgs = List.of(args);
             final List<String> appArgs;
@@ -479,6 +481,7 @@ public final class HelloApp {
                     .saveOutput(saveOutput)
                     .dumpOutput()
                     .setExecutable(executablePath)
+                    .processListener(processListener)
                     .addArguments(List.of(args));
 
             env.forEach((envVarName, envVarValue) -> {
@@ -493,6 +496,7 @@ public final class HelloApp {
         private final Path launcherPath;
         private Path outputFilePath;
         private int expectedExitCode;
+        private Consumer<Process> processListener;
         private final List<String> defaultLauncherArgs;
         private final Map<String, String> params;
         private final Map<String, String> env;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
index c5c4f87b097..251d95a1089 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -52,8 +52,6 @@ import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -63,6 +61,7 @@ import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
@@ -77,26 +76,29 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
     @SuppressWarnings("this-escape")
     public JPackageCommand() {
+        toolProviderSource = new ToolProviderSource();
         prerequisiteActions = new Actions();
         verifyActions = new Actions();
         excludeStandardAsserts(StandardAssert.MAIN_LAUNCHER_DESCRIPTION);
+        removeOldOutputBundle = true;
     }
 
     private JPackageCommand(JPackageCommand cmd, boolean immutable) {
         args.addAll(cmd.args);
-        withToolProvider = cmd.withToolProvider;
+        toolProviderSource = cmd.toolProviderSource.copy();
         saveConsoleOutput = cmd.saveConsoleOutput;
         discardStdout = cmd.discardStdout;
         discardStderr = cmd.discardStderr;
         suppressOutput = cmd.suppressOutput;
         ignoreDefaultRuntime = cmd.ignoreDefaultRuntime;
         ignoreDefaultVerbose = cmd.ignoreDefaultVerbose;
+        removeOldOutputBundle = cmd.removeOldOutputBundle;
         this.immutable = immutable;
         prerequisiteActions = new Actions(cmd.prerequisiteActions);
         verifyActions = new Actions(cmd.verifyActions);
         standardAsserts = cmd.standardAsserts;
         readOnlyPathAsserts = cmd.readOnlyPathAsserts;
-        outputValidators = cmd.outputValidators;
+        validators = cmd.validators;
         executeInDirectory = cmd.executeInDirectory;
         winMsiLogFile = cmd.winMsiLogFile;
         unpackedPackageDirectory = cmd.unpackedPackageDirectory;
@@ -292,34 +294,8 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
     public JPackageCommand setFakeRuntime() {
         verifyMutable();
-
-        ThrowingConsumer<Path, IOException> createBulkFile = path -> {
-            Files.createDirectories(path.getParent());
-            try (FileOutputStream out = new FileOutputStream(path.toFile())) {
-                byte[] bytes = new byte[4 * 1024];
-                new SecureRandom().nextBytes(bytes);
-                out.write(bytes);
-            }
-        };
-
         addPrerequisiteAction(cmd -> {
-            Path fakeRuntimeDir = TKit.createTempDirectory("fake_runtime");
-
-            TKit.trace(String.format("Init fake runtime in [%s] directory",
-                    fakeRuntimeDir));
-
-            if (TKit.isOSX()) {
-                // Make MacAppImageBuilder happy
-                createBulkFile.accept(fakeRuntimeDir.resolve(Path.of(
-                        "lib/jli/libjli.dylib")));
-            }
-
-            // Make sure fake runtime takes some disk space.
-            // Package bundles with 0KB size are unexpected and considered
-            // an error by PackageTest.
-            createBulkFile.accept(fakeRuntimeDir.resolve(Path.of("lib", "bulk")));
-
-            cmd.setArgumentValue("--runtime-image", fakeRuntimeDir);
+            cmd.setArgumentValue("--runtime-image", createInputRuntimeImage(RuntimeImageType.RUNTIME_TYPE_FAKE));
         });
 
         return this;
@@ -388,24 +364,77 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return cmd;
     }
 
+    public enum RuntimeImageType {
+
+        /**
+         * Runtime suitable for running the default "Hello" test app.
+         */
+        RUNTIME_TYPE_HELLO_APP,
+
+        /**
+         * Fake runtime.
+         */
+        RUNTIME_TYPE_FAKE,
+
+        ;
+    }
+
     public static Path createInputRuntimeImage() {
+        return createInputRuntimeImage(RuntimeImageType.RUNTIME_TYPE_HELLO_APP);
+    }
+
+    public static Path createInputRuntimeImage(RuntimeImageType role) {
+        Objects.requireNonNull(role);
 
         final Path runtimeImageDir;
+        switch (role) {
 
-        if (JPackageCommand.DEFAULT_RUNTIME_IMAGE != null) {
-            runtimeImageDir = JPackageCommand.DEFAULT_RUNTIME_IMAGE;
-        } else {
-            runtimeImageDir = TKit.createTempDirectory("runtime-image").resolve("data");
+            case RUNTIME_TYPE_FAKE -> {
+                Consumer<Path> createBulkFile = ThrowingConsumer.toConsumer(path -> {
+                    Files.createDirectories(path.getParent());
+                    try (FileOutputStream out = new FileOutputStream(path.toFile())) {
+                        byte[] bytes = new byte[4 * 1024];
+                        new SecureRandom().nextBytes(bytes);
+                        out.write(bytes);
+                    }
+                });
 
-            new Executor().setToolProvider(JavaTool.JLINK)
-                    .dumpOutput()
-                    .addArguments(
-                            "--output", runtimeImageDir.toString(),
-                            "--add-modules", "java.desktop",
-                            "--strip-debug",
-                            "--no-header-files",
-                            "--no-man-pages")
-                    .execute();
+                runtimeImageDir = TKit.createTempDirectory("fake_runtime");
+
+                TKit.trace(String.format("Init fake runtime in [%s] directory", runtimeImageDir));
+
+                if (TKit.isOSX()) {
+                    // Make MacAppImageBuilder happy
+                    createBulkFile.accept(runtimeImageDir.resolve(Path.of("lib/jli/libjli.dylib")));
+                }
+
+                // Make sure fake runtime takes some disk space.
+                // Package bundles with 0KB size are unexpected and considered
+                // an error by PackageTest.
+                createBulkFile.accept(runtimeImageDir.resolve(Path.of("lib", "bulk")));
+            }
+
+            case RUNTIME_TYPE_HELLO_APP -> {
+                if (JPackageCommand.DEFAULT_RUNTIME_IMAGE != null && !isFakeRuntime(DEFAULT_RUNTIME_IMAGE)) {
+                    runtimeImageDir = JPackageCommand.DEFAULT_RUNTIME_IMAGE;
+                } else {
+                    runtimeImageDir = TKit.createTempDirectory("runtime-image").resolve("data");
+
+                    new Executor().setToolProvider(JavaTool.JLINK)
+                            .dumpOutput()
+                            .addArguments(
+                                    "--output", runtimeImageDir.toString(),
+                                    "--add-modules", "java.desktop",
+                                    "--strip-debug",
+                                    "--no-header-files",
+                                    "--no-man-pages")
+                            .execute();
+                }
+            }
+
+            default -> {
+                throw ExceptionBox.reachedUnreachable();
+            }
         }
 
         return runtimeImageDir;
@@ -770,7 +799,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     }
 
     public static void useToolProviderByDefault(ToolProvider jpackageToolProvider) {
-        defaultToolProvider.set(Optional.of(jpackageToolProvider));
+        TKit.state().setProperty(DefaultToolProviderKey.VALUE, Objects.requireNonNull(jpackageToolProvider));
     }
 
     public static void useToolProviderByDefault() {
@@ -778,45 +807,22 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     }
 
     public static void useExecutableByDefault() {
-        defaultToolProvider.set(Optional.empty());
-    }
-
-    /**
-     * In a separate thread calls {@link #useToolProviderByDefault(ToolProvider)}
-     * with the specified {@code jpackageToolProvider} and then calls
-     * {@code workload.run()}. Joins the thread.
-     * <p>
-     * The idea is to run the {@code workload} in the context of the specified
-     * jpackage {@code ToolProvider} without altering the global variable holding
-     * the default jpackage {@code ToolProvider}. The global variable is
-     * thread-local; setting its value in a new thread doesn't alter its copy in the
-     * calling thread.
-     *
-     * @param jpackageToolProvider jpackage {@code ToolProvider}
-     * @param workload             the workload to run
-     */
-    public static void withToolProvider(Runnable workload, ToolProvider jpackageToolProvider) {
-        Objects.requireNonNull(workload);
-        Objects.requireNonNull(jpackageToolProvider);
-
-        CompletableFuture.runAsync(() -> {
-            var oldValue = defaultToolProvider.get();
-            useToolProviderByDefault(jpackageToolProvider);
-            try {
-                workload.run();
-            } finally {
-                defaultToolProvider.set(oldValue);
-            }
-            // Run the future in a new native thread. Don't run it in a virtual/pooled thread.
-            // Pooled and/or virtual threads are problematic when used with inheritable thread-local variables.
-            // TKit class depends on such a variable, which results in intermittent test failures
-            // if the default executor runs this future.
-        }, Executors.newThreadPerTaskExecutor(Thread.ofPlatform().factory())).join();
+        TKit.state().setProperty(DefaultToolProviderKey.VALUE, null);
     }
 
     public JPackageCommand useToolProvider(boolean v) {
         verifyMutable();
-        withToolProvider = v;
+        if (v) {
+            toolProviderSource.useDefaultToolProvider();
+        } else {
+            toolProviderSource.useProcess();
+        }
+        return this;
+    }
+
+    public JPackageCommand useToolProvider(ToolProvider v) {
+        verifyMutable();
+        toolProviderSource.useToolProvider(v);
         return this;
     }
 
@@ -867,14 +873,42 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return this;
     }
 
-    public JPackageCommand validateOutput(TKit.TextStreamVerifier validator) {
-        return validateOutput(validator::apply);
+    /**
+     * Configures this instance to optionally remove the existing output bundle
+     * before running the jpackage command.
+     *
+     * @param v {@code true} to remove existing output bundle before running the
+     *          jpackage command, and {@code false} otherwise
+     * @return this
+     */
+    public JPackageCommand removeOldOutputBundle(boolean v) {
+        verifyMutable();
+        removeOldOutputBundle = v;
+        return this;
     }
 
-    public JPackageCommand validateOutput(Consumer<Iterator<String>> validator) {
+    /**
+     * Returns {@code true} if this instance will remove existing output bundle
+     * before running the jpackage command, and {@code false} otherwise.
+     */
+    public boolean isRemoveOldOutputBundle() {
+        return removeOldOutputBundle;
+    }
+
+    public JPackageCommand validateOut(TKit.TextStreamVerifier validator) {
+        new JPackageOutputValidator().add(validator).applyTo(this);
+        return this;
+    }
+
+    public JPackageCommand validateErr(TKit.TextStreamVerifier validator) {
+        new JPackageOutputValidator().stderr().add(validator).applyTo(this);
+        return this;
+    }
+
+    public JPackageCommand validateResult(Consumer<Executor.Result> validator) {
         Objects.requireNonNull(validator);
         saveConsoleOutput(true);
-        outputValidators.add(validator);
+        validators.add(validator);
         return this;
     }
 
@@ -883,7 +917,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         public String value(JPackageCommand cmd);
     }
 
-    public static Object cannedArgument(Function<JPackageCommand, Object> supplier, String label) {
+    public static CannedArgument cannedArgument(Function<JPackageCommand, Object> supplier, String label) {
         Objects.requireNonNull(supplier);
         Objects.requireNonNull(label);
         return new CannedArgument() {
@@ -903,10 +937,18 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return v.addPrefix("message.error-header");
     }
 
+    public static CannedFormattedString makeError(String key, Object ... args) {
+        return makeError(JPackageStringBundle.MAIN.cannedFormattedString(key, args));
+    }
+
     public static CannedFormattedString makeAdvice(CannedFormattedString v) {
         return v.addPrefix("message.advice-header");
     }
 
+    public static CannedFormattedString makeAdvice(String key, Object ... args) {
+        return makeAdvice(JPackageStringBundle.MAIN.cannedFormattedString(key, args));
+    }
+
     public String getValue(CannedFormattedString str) {
         return new CannedFormattedString(str.formatter(), str.key(), Stream.of(str.args()).map(arg -> {
             if (arg instanceof CannedArgument cannedArg) {
@@ -917,20 +959,18 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }).toArray()).getValue();
     }
 
-    public JPackageCommand validateOutput(CannedFormattedString... str) {
-        // Will look up the given errors in the order they are specified.
-        Stream.of(str).map(this::getValue)
-                .map(TKit::assertTextStream)
-                .reduce(TKit.TextStreamVerifier.group(),
-                        TKit.TextStreamVerifier.Group::add,
-                        TKit.TextStreamVerifier.Group::add).tryCreate().ifPresent(this::validateOutput);
+    public JPackageCommand validateOut(CannedFormattedString... strings) {
+        new JPackageOutputValidator().expectMatchingStrings(strings).applyTo(this);
+        return this;
+    }
+
+    public JPackageCommand validateErr(CannedFormattedString... strings) {
+        new JPackageOutputValidator().stderr().expectMatchingStrings(strings).applyTo(this);
         return this;
     }
 
     public boolean isWithToolProvider() {
-        return Optional.ofNullable(withToolProvider).orElseGet(() -> {
-            return defaultToolProvider.get().isPresent();
-        });
+        return toolProviderSource.toolProvider().isPresent();
     }
 
     public JPackageCommand executePrerequisiteActions() {
@@ -938,21 +978,19 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return this;
     }
 
-    private Executor createExecutor() {
+    Executor createExecutor() {
         Executor exec = new Executor()
                 .saveOutput(saveConsoleOutput).dumpOutput(!suppressOutput)
                 .discardStdout(discardStdout).discardStderr(discardStderr)
                 .setDirectory(executeInDirectory)
                 .addArguments(args);
 
-        if (isWithToolProvider()) {
-            exec.setToolProvider(defaultToolProvider.get().orElseGet(JavaTool.JPACKAGE::asToolProvider));
-        } else {
-            exec.setExecutable(JavaTool.JPACKAGE);
-            if (TKit.isWindows()) {
-                exec.setWindowsTmpDir(System.getProperty("java.io.tmpdir"));
-            }
-        }
+        toolProviderSource.toolProvider().ifPresentOrElse(exec::setToolProvider, () -> {
+                    exec.setExecutable(JavaTool.JPACKAGE);
+                    if (TKit.isWindows()) {
+                        exec.setWindowsTmpDir(System.getProperty("java.io.tmpdir"));
+                    }
+                });
 
         return exec;
     }
@@ -973,21 +1011,18 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         verifyMutable();
         executePrerequisiteActions();
 
-        if (hasArgument("--dest")) {
-            nullableOutputBundle().ifPresent(path -> {
-                ThrowingRunnable.toRunnable(() -> {
-                    if (Files.isDirectory(path)) {
-                        TKit.deleteDirectoryRecursive(path, String.format(
-                                "Delete [%s] folder before running jpackage",
-                                path));
-                    } else if (TKit.deleteIfExists(path)) {
-                        TKit.trace(String.format(
-                                "Deleted [%s] file before running jpackage",
-                                path));
-                    }
-                }).run();
-            });
-        }
+        nullableOutputBundle().filter(_ -> {
+            return !(TKit.isOSX() && MacHelper.signPredefinedAppImage(this)) && removeOldOutputBundle;
+        }).ifPresent(path -> {
+            ThrowingRunnable.toRunnable(() -> {
+                if (Files.isDirectory(path)) {
+                    TKit.deleteDirectoryRecursive(path,
+                            String.format("Delete [%s] folder before running jpackage", path));
+                } else if (TKit.deleteIfExists(path)) {
+                    TKit.trace(String.format("Deleted [%s] file before running jpackage", path));
+                }
+            }).run();
+        });
 
         Path resourceDir = getArgumentValue("--resource-dir", () -> null, Path::of);
         if (resourceDir != null && Files.isDirectory(resourceDir)) {
@@ -1029,8 +1064,8 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             ConfigFilesStasher.INSTANCE.accept(this);
         }
 
-        for (final var outputValidator: outputValidators) {
-            outputValidator.accept(result.getOutput().iterator());
+        for (final var validator: validators) {
+            validator.accept(result);
         }
 
         if (result.getExitCode() == 0 && expectedExitCode.isPresent()) {
@@ -1117,7 +1152,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         private final Map<ReadOnlyPathAssert, List<TKit.PathSnapshot>> snapshots;
     }
 
-    public static enum ReadOnlyPathAssert{
+    public static enum ReadOnlyPathAssert {
         APP_IMAGE(new Builder("--app-image").enable(cmd -> {
             // External app image should be R/O unless it is an app image signing on macOS.
             return !(TKit.isOSX() && MacHelper.signPredefinedAppImage(cmd));
@@ -1153,14 +1188,13 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
             Function<JPackageCommand, List<Path>> create() {
                 return cmd -> {
-                    if (enable != null && !enable.test(cmd)) {
+                    if (!cmd.hasArgument(argName) || (enable != null && !enable.test(cmd))) {
                         return List.of();
                     } else {
                         final List<Optional<Path>> dirs;
                         if (multiple) {
                             dirs = Stream.of(cmd.getAllArgumentValues(argName))
-                                    .map(Builder::tokenizeValue)
-                                    .flatMap(x -> x)
+                                    .flatMap(Builder::tokenizeValue)
                                     .map(Builder::toExistingFile).toList();
                         } else {
                             dirs = Optional.ofNullable(cmd.getArgumentValue(argName))
@@ -1171,11 +1205,11 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                                 .map(cmd::getArgumentValue)
                                 .filter(Objects::nonNull)
                                 .map(Builder::toExistingFile)
-                                .filter(Optional::isPresent).map(Optional::orElseThrow)
+                                .flatMap(Optional::stream)
                                 .collect(toSet());
 
                         return dirs.stream()
-                                .filter(Optional::isPresent).map(Optional::orElseThrow)
+                                .flatMap(Optional::stream)
                                 .filter(Predicate.not(mutablePaths::contains))
                                 .toList();
                     }
@@ -1258,7 +1292,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             }
         }),
         MAC_BUNDLE_UNSIGNED_SIGNATURE(cmd -> {
-            if (TKit.isOSX() && !MacHelper.appImageSigned(cmd)) {
+            if (TKit.isOSX()) {
                 MacHelper.verifyUnsignedBundleSignature(cmd);
             }
         }),
@@ -1282,7 +1316,14 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }),
         PREDEFINED_APP_IMAGE_COPY(cmd -> {
             Optional.ofNullable(cmd.getArgumentValue("--app-image")).filter(_ -> {
-                return !TKit.isOSX() || !MacHelper.signPredefinedAppImage(cmd);
+                if (!TKit.isOSX() || !cmd.hasArgument("--mac-sign")) {
+                    return true;
+                } else {
+                    var signAppImage = MacHelper.signPredefinedAppImage(cmd)
+                            || MacHelper.hasAppImageSignIdentity(cmd)
+                            || MacHelper.isSignWithoutSignIdentity(cmd);
+                    return !signAppImage;
+                }
             }).filter(_ -> {
                 // Don't examine the contents of the output app image if this is Linux package installing in the "/usr" subtree.
                 return Optional.<Boolean>ofNullable(cmd.onLinuxPackageInstallDir(null, _ -> false)).orElse(true);
@@ -1385,7 +1426,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             if (!isImagePackageType() && hasArgument("--app-image")) {
                 // Build native macOS package from an external app image.
                 // If the external app image is signed, ".jpackage.xml" file should be kept, otherwise removed.
-                return AppImageFile.load(Path.of(getArgumentValue("--app-image"))).macSigned();
+                return MacHelper.isBundleSigned(Path.of(getArgumentValue("--app-image")));
             }
         }
 
@@ -1406,13 +1447,8 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             final AppImageFile aif = AppImageFile.load(rootDir);
 
             if (TKit.isOSX()) {
-                boolean expectedValue = MacHelper.appImageSigned(this);
-                boolean actualValue = aif.macSigned();
-                TKit.assertEquals(expectedValue, actualValue,
-                    "Check for unexpected value of <signed> property in app image file");
-
-                expectedValue = hasArgument("--mac-app-store");
-                actualValue = aif.macAppStore();
+                var expectedValue = hasArgument("--mac-app-store");
+                var actualValue = aif.macAppStore();
                 TKit.assertEquals(expectedValue, actualValue,
                     "Check for unexpected value of <app-store> property in app image file");
             }
@@ -1437,7 +1473,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         } else {
             if (TKit.isOSX() && hasArgument("--app-image")) {
                 String appImage = getArgumentValue("--app-image");
-                if (AppImageFile.load(Path.of(appImage)).macSigned()) {
+                if (MacHelper.isBundleSigned(Path.of(appImage))) {
                     assertFileNotInAppImage(lookupPath);
                 } else {
                     assertFileInAppImage(lookupPath);
@@ -1635,10 +1671,6 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }).collect(Collectors.joining(" "));
     }
 
-    public static Stream<String> stripTimestamps(Stream<String> stream) {
-        return stream.map(JPackageCommand::stripTimestamp);
-    }
-
     public static String stripTimestamp(String str) {
         final var m = TIMESTAMP_REGEXP.matcher(str);
         if (m.find()) {
@@ -1736,13 +1768,77 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         private final List<Action> actions;
     }
 
-    private Boolean withToolProvider;
+    private static final class ToolProviderSource {
+
+        ToolProviderSource copy() {
+            return new ToolProviderSource(this);
+        }
+
+        void useDefaultToolProvider() {
+            customToolProvider = null;
+            mode = Mode.USE_TOOL_PROVIDER;
+        }
+
+        void useToolProvider(ToolProvider tp) {
+            customToolProvider = Objects.requireNonNull(tp);
+            mode = Mode.USE_TOOL_PROVIDER;
+        }
+
+        void useProcess() {
+            customToolProvider = null;
+            mode = Mode.USE_PROCESS;
+        }
+
+        Optional<ToolProvider> toolProvider() {
+            switch (mode) {
+                case USE_PROCESS -> {
+                    return Optional.empty();
+                }
+                case USE_TOOL_PROVIDER -> {
+                    if (customToolProvider != null) {
+                        return Optional.of(customToolProvider);
+                    } else {
+                        return TKit.state().findProperty(DefaultToolProviderKey.VALUE).map(ToolProvider.class::cast).or(() -> {
+                            return Optional.of(JavaTool.JPACKAGE.asToolProvider());
+                        });
+                    }
+                }
+                case INHERIT_DEFAULTS -> {
+                    return TKit.state().findProperty(DefaultToolProviderKey.VALUE).map(ToolProvider.class::cast);
+                }
+                default -> {
+                    throw ExceptionBox.reachedUnreachable();
+                }
+            }
+        }
+
+        ToolProviderSource() {
+            mode = Mode.INHERIT_DEFAULTS;
+        }
+
+        private ToolProviderSource(ToolProviderSource other) {
+            this.customToolProvider = other.customToolProvider;
+            this.mode = other.mode;
+        }
+
+        private enum Mode {
+            INHERIT_DEFAULTS,
+            USE_PROCESS,
+            USE_TOOL_PROVIDER
+        }
+
+        private ToolProvider customToolProvider;
+        private Mode mode;
+    }
+
+    private final ToolProviderSource toolProviderSource;
     private boolean saveConsoleOutput;
     private boolean discardStdout;
     private boolean discardStderr;
     private boolean suppressOutput;
     private boolean ignoreDefaultRuntime;
     private boolean ignoreDefaultVerbose;
+    private boolean removeOldOutputBundle;
     private boolean immutable;
     private final Actions prerequisiteActions;
     private final Actions verifyActions;
@@ -1751,13 +1847,11 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     private Path unpackedPackageDirectory;
     private Set<ReadOnlyPathAssert> readOnlyPathAsserts = Set.of(ReadOnlyPathAssert.values());
     private Set<StandardAssert> standardAsserts = Set.of(StandardAssert.values());
-    private List<Consumer<Iterator<String>>> outputValidators = new ArrayList<>();
-    private static InheritableThreadLocal<Optional<ToolProvider>> defaultToolProvider = new InheritableThreadLocal<>() {
-        @Override
-        protected Optional<ToolProvider> initialValue() {
-            return Optional.empty();
-        }
-    };
+    private List<Consumer<Executor.Result>> validators = new ArrayList<>();
+
+    private enum DefaultToolProviderKey {
+        VALUE
+    }
 
     private static final Map<String, PackageType> PACKAGE_TYPES = Stream.of(PackageType.values()).collect(toMap(PackageType::getType, x -> x));
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java
new file mode 100644
index 00000000000..c5c9c018b6a
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.test;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+
+/**
+ * Validates a stream (stderr or stdout) in jpackage console output.
+ */
+public final class JPackageOutputValidator {
+
+    public JPackageOutputValidator() {
+    }
+
+    public JPackageOutputValidator(JPackageOutputValidator other) {
+        stdout = other.stdout;
+        match = other.match;
+        matchTimestamps = other.matchTimestamps;
+        stripTimestamps = other.stripTimestamps;
+        validators.addAll(other.validators);
+    }
+
+    JPackageOutputValidator copy() {
+        return new JPackageOutputValidator(this);
+    }
+
+    /**
+     * Configures this validator to validate stdout.
+     * @return this
+     */
+    public JPackageOutputValidator stdout() {
+        stdout = true;
+        return this;
+    }
+
+    /**
+     * Configures this validator to validate stderr.
+     * @return this
+     */
+    public JPackageOutputValidator stderr() {
+        stdout = false;
+        return this;
+    }
+
+    /**
+     * Configures the mode of this validator. Similar to how a regexp pattern can be
+     * configured for matching or finding.
+     *
+     * @param v {@code true} if the entire stream should match the criteria of this
+     *          validator, and {@code false} if the stream may contain additional
+     *          content
+     * @return this
+     */
+    public JPackageOutputValidator match(boolean v) {
+        match = v;
+        return this;
+    }
+
+    /**
+     * A shorthand for {@code match(true)}.
+     * @see #match(boolean)
+     * @return this
+     */
+    public JPackageOutputValidator match() {
+        return match(true);
+    }
+
+    /**
+     * A shorthand for {@code match(false)}.
+     * @see #match(boolean)
+     * @return this
+     */
+    public JPackageOutputValidator find() {
+        return match(false);
+    }
+
+    /**
+     * Configures this validator to filter out lines without a timestamp in the
+     * stream to be validated.
+     *
+     * @return this
+     */
+    public JPackageOutputValidator matchTimestamps() {
+        matchTimestamps = true;
+        return this;
+    }
+
+    /**
+     * Configures this validator to strip the leading timestamp from lines the
+     * stream to be validated.
+     * <p>
+     * If the stream contains lines without timestampts, the validation will fail.
+     * <p>
+     * Use {@link #matchTimestamps()) to filter out lines without timestamps and
+     * prevent validation failure.
+     *
+     * @return this
+     */
+    public JPackageOutputValidator stripTimestamps() {
+        stripTimestamps = true;
+        return this;
+    }
+
+    public void applyTo(JPackageCommand cmd) {
+        toResultConsumer(cmd).ifPresent(cmd::validateResult);
+    }
+
+    public void applyTo(JPackageCommand cmd, Executor.Result result) {
+        Objects.requireNonNull(result);
+        toResultConsumer(cmd).ifPresent(validator -> {
+            validator.accept(result);
+        });
+    }
+
+    public JPackageOutputValidator add(List<TKit.TextStreamVerifier> validators) {
+        this.validators.addAll(validators);
+        return this;
+    }
+
+    public JPackageOutputValidator add(TKit.TextStreamVerifier... validators) {
+        return add(List.of(validators));
+    }
+
+    public JPackageOutputValidator validateEndOfStream() {
+        validators.add(EndOfStreamValidator.INSTANCE);
+        return this;
+    }
+
+    public JPackageOutputValidator expectMatchingStrings(List<CannedFormattedString> strings) {
+        return expectMatchingStrings(strings.toArray(CannedFormattedString[]::new));
+    }
+
+    public JPackageOutputValidator expectMatchingStrings(CannedFormattedString... strings) {
+        validators.add(strings);
+        return this;
+    }
+
+    public JPackageOutputValidator add(JPackageOutputValidator other) {
+        validators.addAll(other.validators);
+        return this;
+    }
+
+    public JPackageOutputValidator compose(JPackageOutputValidator other) {
+        if (stdout != other.stdout) {
+            throw new IllegalArgumentException();
+        }
+        if (match != other.match) {
+            throw new IllegalArgumentException();
+        }
+        if (matchTimestamps != other.matchTimestamps) {
+            throw new IllegalArgumentException();
+        }
+        if (stripTimestamps != other.stripTimestamps) {
+            throw new IllegalArgumentException();
+        }
+        return add(other);
+    }
+
+    private Optional<Consumer<Executor.Result>> toResultConsumer(JPackageCommand cmd) {
+        return toStringIteratorConsumer(cmd).map(validator -> {
+            return toResultConsumer(validator, stdout, match, label());
+        });
+    }
+
+    private Optional<Consumer<Iterator<String>>> toStringIteratorConsumer(JPackageCommand cmd) {
+        Objects.requireNonNull(cmd);
+
+        var consumers = validators.stream().map(v -> {
+            return toStringIteratorConsumer(cmd, v);
+        }).flatMap(Optional::stream);
+
+        if (match && (validators.isEmpty() || !(validators.getLast() instanceof EndOfStreamValidator))) {
+            consumers = Stream.concat(consumers, Stream.of(TKit.assertEndOfTextStream(label())));
+        }
+
+        return consumers.reduce(Consumer::andThen).map(validator -> {
+
+            if (stripTimestamps) {
+                validator = stripTimestamps(validator, label());
+            }
+
+            if (matchTimestamps) {
+                validator = matchTimestamps(validator, label());
+            }
+
+            return validator;
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    private Optional<Consumer<Iterator<String>>> toStringIteratorConsumer(JPackageCommand cmd, Object validator) {
+        Objects.requireNonNull(cmd);
+        switch (validator) {
+            case TKit.TextStreamVerifier tv -> {
+                return Optional.of(decorate(tv.copy().label(label())));
+            }
+            case CannedFormattedString[] strings -> {
+                // Will look up the given strings in the order they are specified.
+                return Stream.of(strings)
+                        .map(cmd::getValue)
+                        .map(TKit::assertTextStream)
+                        .map(v -> {
+                            return v.predicate(String::equals).label(label());
+                        })
+                        .map(this::decorate).reduce(Consumer::andThen);
+            }
+            case EndOfStreamValidator eos -> {
+                return Optional.of(TKit.assertEndOfTextStream(label()));
+            }
+            default -> {
+                throw ExceptionBox.reachedUnreachable();
+            }
+        }
+    }
+
+    private String label() {
+        return stdout ? "'stdout'" : "'stderr'";
+    }
+
+    private Consumer<Iterator<String>> decorate(TKit.TextStreamVerifier validator) {
+        if (match) {
+            return new OneLineFeeder(validator::apply);
+        } else {
+            return validator::apply;
+        }
+    }
+
+    private static Consumer<Executor.Result> toResultConsumer(
+            Consumer<Iterator<String>> validator, boolean stdout, boolean match, String label) {
+        Objects.requireNonNull(validator);
+        Objects.requireNonNull(label);
+
+        return result -> {
+            List<String> content;
+            if (stdout) {
+                content = result.stdout();
+            } else {
+                content = result.stderr();
+            }
+
+            if (match) {
+                TKit.trace(String.format("Checking %s for exact match against defined validators...", label));
+            }
+
+            validator.accept(content.iterator());
+
+        };
+    }
+
+    private static Consumer<Iterator<String>> stripTimestamps(Consumer<Iterator<String>> consumer, String label) {
+        Objects.requireNonNull(consumer);
+        Objects.requireNonNull(label);
+        return it -> {
+            Objects.requireNonNull(it);
+            TKit.trace(String.format("Strip timestamps in %s...", label));
+            consumer.accept(new Iterator<String>() {
+
+                @Override
+                public boolean hasNext() {
+                    return it.hasNext();
+                }
+
+                @Override
+                public String next() {
+                    var str = it.next();
+                    var strippedStr = JPackageCommand.stripTimestamp(str);
+                    if (str.length() == strippedStr.length()) {
+                        throw new IllegalArgumentException(String.format("String [%s] doesn't have a timestamp", str));
+                    } else {
+                        return strippedStr;
+                    }
+                }
+
+            });
+            TKit.trace("Done");
+        };
+    }
+
+    private static Consumer<Iterator<String>> matchTimestamps(Consumer<Iterator<String>> consumer, String label) {
+        Objects.requireNonNull(consumer);
+        Objects.requireNonNull(label);
+        return it -> {
+            Objects.requireNonNull(it);
+            TKit.trace(String.format("Match lines with timestamps in %s...", label));
+            consumer.accept(new FilteringIterator<>(it, JPackageCommand::withTimestamp));
+            TKit.trace("Done");
+        };
+    }
+
+    private enum EndOfStreamValidator {
+        INSTANCE
+    }
+
+    private static final class FilteringIterator<T> implements Iterator<T> {
+
+        public FilteringIterator(Iterator<T> it, Predicate<T> predicate) {
+            this.it = Objects.requireNonNull(it);
+            this.predicate = Objects.requireNonNull(predicate);
+        }
+
+        @Override
+        public boolean hasNext() {
+            while (!nextReady && it.hasNext()) {
+                var v = it.next();
+                if (predicate.test(v)) {
+                    next = v;
+                    nextReady = true;
+                }
+            }
+            return nextReady;
+        }
+
+        @Override
+        public T next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            nextReady = false;
+            return next;
+        }
+
+        @Override
+        public void remove() {
+            it.remove();
+        }
+
+        private final Iterator<T> it;
+        private final Predicate<T> predicate;
+        private T next;
+        private boolean nextReady;
+    }
+
+    private record OneLineFeeder(Consumer<Iterator<String>> consumer) implements Consumer<Iterator<String>> {
+        OneLineFeeder {
+            Objects.requireNonNull(consumer);
+        }
+
+        @Override
+        public void accept(Iterator<String> it) {
+            consumer.accept(List.of(it.next()).iterator());
+        }
+    }
+
+    boolean stdout = true;
+    boolean match;
+    boolean matchTimestamps;
+    boolean stripTimestamps;
+    private final List<Object> validators = new ArrayList<>();
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
index 6a5be77457a..1372058d440 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -33,6 +33,7 @@ import static jdk.jpackage.internal.util.PListWriter.writeStringArray;
 import static jdk.jpackage.internal.util.PListWriter.writeStringOptional;
 import static jdk.jpackage.internal.util.XmlUtils.initDocumentBuilder;
 import static jdk.jpackage.internal.util.XmlUtils.toXmlConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
 
 import java.io.ByteArrayInputStream;
@@ -45,6 +46,8 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -59,21 +62,24 @@ import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
+import jdk.jpackage.internal.util.Enquoter;
 import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.MacBundle;
 import jdk.jpackage.internal.util.PListReader;
 import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.RetryExecutor;
 import jdk.jpackage.internal.util.XmlUtils;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
+import jdk.jpackage.test.MacSign.CertificateHash;
 import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.CertificateType;
+import jdk.jpackage.test.MacSign.ResolvedKeychain;
 import jdk.jpackage.test.PackageTest.PackageHandlers;
 import jdk.jpackage.test.RunnablePackageTest.Action;
 import org.xml.sax.SAXException;
@@ -89,8 +95,8 @@ public final class MacHelper {
         // See JDK-8373105. "hdiutil" does not handle such cases very good.
         final var mountRoot = TKit.createTempDirectory("mountRoot");
 
-        // Explode DMG assuming this can require interaction, thus use `yes`.
-        final var attachStdout = Executor.of("sh", "-c", String.join(" ",
+        // Explode the DMG assuming this can require interaction if the DMG has a license, thus use `yes`.
+        final var attachExec = Executor.of("sh", "-c", String.join(" ",
                 "yes",
                 "|",
                 "/usr/bin/hdiutil",
@@ -99,14 +105,34 @@ public final class MacHelper {
                 "-mountroot", PathUtils.normalizedAbsolutePathString(mountRoot),
                 "-nobrowse",
                 "-plist"
-        )).saveOutput().storeOutputInFiles().executeAndRepeatUntilExitCode(0, 10, 6).stdout();
+        )).saveOutput().storeOutputInFiles().binaryOutput();
+
+        final var attachResult = attachExec.executeAndRepeatUntilExitCode(0, 10, 6);
 
         final Path mountPoint;
 
         boolean mountPointInitialized = false;
         try {
+            byte[] stdout = attachResult.byteStdout();
+
+            // If the DMG has a license, it will be printed to the stdout before the plist content.
+            // All bytes before the XML declaration of the plist must be skipped.
+            // We need to find the location of the {'<', '?', 'x', 'm', 'l'} byte array
+            // (the XML declaration) in the captured binary stdout.
+            // Instead of crafting an ad-hoc function that operates on byte arrays,
+            // we will convert the byte array into a String instance using
+            // an 8-bit character set (ISO-8859-1) and use the standard String#indexOf().
+            var startPlistIndex = new String(stdout, StandardCharsets.ISO_8859_1).indexOf("<?xml");
+
+            byte[] plistXml;
+            if (startPlistIndex > 0) {
+                plistXml = Arrays.copyOfRange(stdout, startPlistIndex, stdout.length);
+            } else {
+                plistXml = stdout;
+            }
+
             // One of "dict" items of "system-entities" array property should contain "mount-point" string property.
-            mountPoint = readPList(attachStdout).queryArrayValue("system-entities", false)
+            mountPoint = readPList(plistXml).queryArrayValue("system-entities", false)
                     .map(PListReader.class::cast)
                     .map(dict -> {
                         return dict.findValue("mount-point");
@@ -117,7 +143,7 @@ public final class MacHelper {
         } finally {
             if (!mountPointInitialized) {
                 TKit.trace("Unexpected plist file missing `system-entities` array:");
-                attachStdout.forEach(TKit::trace);
+                attachResult.toCharacterResult(attachExec.charset(), false).stdout().forEach(TKit::trace);
                 TKit.trace("Done");
             }
         }
@@ -168,19 +194,13 @@ public final class MacHelper {
 
     public static PListReader readPList(Path path) {
         TKit.assertReadableFileExists(path);
-        return ThrowingSupplier.toSupplier(() -> readPList(Files.readAllLines(
-                path))).get();
+        return readPList(toFunction(Files::readAllBytes).apply(path));
     }
 
-    public static PListReader readPList(List<String> lines) {
-        return readPList(lines.stream());
-    }
-
-    public static PListReader readPList(Stream<String> lines) {
-        return ThrowingSupplier.toSupplier(() -> new PListReader(lines
-                // Skip leading lines before xml declaration
-                .dropWhile(Pattern.compile("\\s?<\\?xml\\b.+\\?>").asPredicate().negate())
-                .collect(Collectors.joining()).getBytes(StandardCharsets.UTF_8))).get();
+    public static PListReader readPList(byte[] xml) {
+        return ThrowingSupplier.toSupplier(() -> {
+            return new PListReader(xml);
+        }).get();
     }
 
     public static Map<String, String> flatMapPList(PListReader plistReader) {
@@ -240,10 +260,7 @@ public final class MacHelper {
      *         predefined app image in place and {@code false} otherwise.
      */
     public static boolean signPredefinedAppImage(JPackageCommand cmd) {
-        Objects.requireNonNull(cmd);
-        if (!TKit.isOSX()) {
-            throw new UnsupportedOperationException();
-        }
+        cmd.verifyIsOfType(PackageType.MAC_DMG, PackageType.MAC_PKG, PackageType.IMAGE);
         return cmd.hasArgument("--mac-sign") && cmd.hasArgument("--app-image") && cmd.isImagePackageType();
     }
 
@@ -260,35 +277,111 @@ public final class MacHelper {
      *         otherwise.
      */
     public static boolean appImageSigned(JPackageCommand cmd) {
-        Objects.requireNonNull(cmd);
-        if (!TKit.isOSX()) {
-            throw new UnsupportedOperationException();
-        }
+        cmd.verifyIsOfType(PackageType.MAC_DMG, PackageType.MAC_PKG, PackageType.IMAGE);
 
-        var runtimeImage = Optional.ofNullable(cmd.getArgumentValue("--runtime-image")).map(Path::of);
+        var runtimeImageBundle = Optional.ofNullable(cmd.getArgumentValue("--runtime-image")).map(Path::of).flatMap(MacBundle::fromPath);
         var appImage = Optional.ofNullable(cmd.getArgumentValue("--app-image")).map(Path::of);
 
-        if (cmd.isRuntime() && Files.isDirectory(runtimeImage.orElseThrow().resolve("Contents/_CodeSignature"))) {
+        if (cmd.isRuntime() && runtimeImageBundle.map(MacHelper::isBundleSigned).orElse(false)) {
             // If the predefined runtime is a signed bundle, bundled image should be signed too.
             return true;
-        } else if (appImage.map(AppImageFile::load).map(AppImageFile::macSigned).orElse(false)) {
-            // The external app image is signed, so the app image is signed too.
+        } else if (appImage.map(MacHelper::isBundleSigned).orElse(false)) {
+            // The predefined app image is signed, so the app image is signed too.
             return true;
         }
 
-        if (!cmd.isImagePackageType() && appImage.isPresent()) {
-            // Building a ".pkg" or a ".dmg" bundle from the predefined app image.
-            // The predefined app image is unsigned, so the app image bundled
-            // in the output native package will be unsigned too
-            // (even if the ".pkg" file may be signed itself, and we never sign ".dmg" files).
-            return false;
-        }
-
         if (!cmd.hasArgument("--mac-sign")) {
             return false;
+        } else {
+            return isSignWithoutSignIdentity(cmd) || hasAppImageSignIdentity(cmd);
         }
+    }
 
-        return (cmd.hasArgument("--mac-signing-key-user-name") || cmd.hasArgument("--mac-app-image-sign-identity"));
+    /**
+     * Returns {@code true} if the given jpackage command line is configured such
+     * that the native package it will produce will be signed.
+     *
+     * @param cmd the jpackage command to examine
+     * @return {@code true} if the given jpackage command line is configured such
+     *         the native package it will produce will be signed and {@code false}
+     *         otherwise.
+     */
+    public static boolean nativePackageSigned(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC);
+
+        switch (cmd.packageType()) {
+            case MAC_DMG -> {
+                return false;
+            }
+            case MAC_PKG -> {
+                if (!cmd.hasArgument("--mac-sign")) {
+                    return false;
+                } else {
+                    return isSignWithoutSignIdentity(cmd) || hasPkgInstallerSignIdentity(cmd);
+                }
+            }
+            default -> {
+                throw new IllegalStateException();
+            }
+        }
+    }
+
+    /**
+     * Returns {@code true} if the given jpackage command line has app image signing
+     * identity option. The command line must have "--mac-sign" option.
+     *
+     * @param cmd the jpackage command to examine
+     * @return {@code true} if the given jpackage command line has app image signing
+     *         identity option and {@code false} otherwise.
+     */
+    public static boolean hasAppImageSignIdentity(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_DMG, PackageType.MAC_PKG, PackageType.IMAGE);
+        if (!cmd.hasArgument("--mac-sign")) {
+            throw new IllegalArgumentException();
+        }
+        return Stream.of(
+                "--mac-signing-key-user-name",
+                "--mac-app-image-sign-identity"
+        ).anyMatch(cmd::hasArgument);
+    }
+
+    /**
+     * Returns {@code true} if the given jpackage command line has PKG installer signing
+     * identity option. The command line must have "--mac-sign" option.
+     *
+     * @param cmd the jpackage command to examine
+     * @return {@code true} if the given jpackage command line has PKG installer signing
+     *         identity option and {@code false} otherwise.
+     */
+    public static boolean hasPkgInstallerSignIdentity(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_PKG);
+        if (!cmd.hasArgument("--mac-sign")) {
+            throw new IllegalArgumentException();
+        }
+        return Stream.of(
+                "--mac-signing-key-user-name",
+                "--mac-installer-sign-identity"
+        ).anyMatch(cmd::hasArgument);
+    }
+
+    /**
+     * Returns {@code true} if the given jpackage command line doesn't have signing
+     * identity options. The command line must have "--mac-sign" option.
+     *
+     * @param cmd the jpackage command to examine
+     * @return {@code true} if the given jpackage command line doesn't have signing
+     *         identity options and {@code false} otherwise.
+     */
+    public static boolean isSignWithoutSignIdentity(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_DMG, PackageType.MAC_PKG, PackageType.IMAGE);
+        if (!cmd.hasArgument("--mac-sign")) {
+            throw new IllegalArgumentException();
+        }
+        return Stream.of(
+                "--mac-signing-key-user-name",
+                "--mac-app-image-sign-identity",
+                "--mac-installer-sign-identity"
+        ).noneMatch(cmd::hasArgument);
     }
 
     public static void writeFaPListFragment(JPackageCommand cmd, XMLStreamWriter xml) {
@@ -301,6 +394,14 @@ public final class MacHelper {
         }).run();
     }
 
+    static boolean isBundleSigned(Path bundleRoot) {
+        return isBundleSigned(MacBundle.fromPath(bundleRoot).orElseThrow(IllegalArgumentException::new));
+    }
+
+    static boolean isBundleSigned(MacBundle bundle) {
+        return MacSignVerify.findSpctlSignOrigin(MacSignVerify.SpctlType.EXEC, bundle.root(), true).isPresent();
+    }
+
     private static void createFaPListFragmentFromFaProperties(JPackageCommand cmd, XMLStreamWriter xml)
             throws XMLStreamException, IOException {
 
@@ -383,7 +484,7 @@ public final class MacHelper {
 
         var predefinedAppImage = Path.of(Optional.ofNullable(cmd.getArgumentValue("--app-image")).orElseThrow(IllegalArgumentException::new));
 
-        var plistPath = ApplicationLayout.macAppImage().resolveAt(predefinedAppImage).contentDirectory().resolve("Info.plist");
+        var plistPath = MacBundle.fromPath(predefinedAppImage).orElseThrow().infoPlistFile();
 
         try (var plistStream = Files.newInputStream(plistPath)) {
             var plist = new PListReader(initDocumentBuilder().parse(plistStream));
@@ -407,18 +508,50 @@ public final class MacHelper {
         }
     }
 
+    public static final class RuntimeBundleBuilder {
+
+        public Path create() {
+            return createRuntimeBundle(type, Optional.ofNullable(mutator));
+        }
+
+        public RuntimeBundleBuilder type(JPackageCommand.RuntimeImageType v) {
+            type = Objects.requireNonNull(v);
+            return this;
+        }
+
+        public RuntimeBundleBuilder mutator(Consumer<JPackageCommand> v) {
+            mutator = v;
+            return this;
+        }
+
+        public RuntimeBundleBuilder mutate(Consumer<RuntimeBundleBuilder> mutator) {
+            mutator.accept(this);
+            return this;
+        }
+
+        private RuntimeBundleBuilder() {
+        }
+
+        private JPackageCommand.RuntimeImageType type = JPackageCommand.RuntimeImageType.RUNTIME_TYPE_HELLO_APP;
+        private Consumer<JPackageCommand> mutator;
+    };
+
+    public static RuntimeBundleBuilder buildRuntimeBundle() {
+        return new RuntimeBundleBuilder();
+    }
+
     public static Path createRuntimeBundle(Consumer<JPackageCommand> mutator) {
-        return createRuntimeBundle(Optional.of(mutator));
+        return buildRuntimeBundle().mutator(Objects.requireNonNull(mutator)).create();
     }
 
     public static Path createRuntimeBundle() {
-        return createRuntimeBundle(Optional.empty());
+        return buildRuntimeBundle().create();
     }
 
-    public static Path createRuntimeBundle(Optional<Consumer<JPackageCommand>> mutator) {
+    private static Path createRuntimeBundle(JPackageCommand.RuntimeImageType type, Optional<Consumer<JPackageCommand>> mutator) {
         Objects.requireNonNull(mutator);
 
-        final var runtimeImage = JPackageCommand.createInputRuntimeImage();
+        final var runtimeImage = JPackageCommand.createInputRuntimeImage(type);
 
         final var runtimeBundleWorkDir = TKit.createTempDirectory("runtime-bundle");
 
@@ -472,25 +605,274 @@ public final class MacHelper {
         return cmd;
     }
 
-    public record SignKeyOption(Type type, CertificateRequest certRequest) {
+    public static final class ResolvableCertificateRequest {
+
+        public ResolvableCertificateRequest(
+                CertificateRequest certRequest,
+                Function<CertificateRequest, X509Certificate> certResolver,
+                String label) {
+
+            Objects.requireNonNull(certRequest);
+            Objects.requireNonNull(certResolver);
+            Objects.requireNonNull(label);
+            if (label.isBlank()) {
+                throw new IllegalArgumentException();
+            }
+
+            this.certRequest = certRequest;
+            this.certResolver = certResolver;
+            this.label = label;
+        }
+
+        public ResolvableCertificateRequest(
+                CertificateRequest certRequest,
+                ResolvedKeychain keychain,
+                String label) {
+            this(certRequest, keychain.asCertificateResolver(), label);
+        }
+
+        @Override
+        public String toString() {
+            return label;
+        }
+
+        public CertificateRequest certRequest() {
+            return certRequest;
+        }
+
+        public X509Certificate cert() {
+            return certResolver.apply(certRequest);
+        }
+
+        public CertificateType type() {
+            return certRequest.type();
+        }
+
+        public String name() {
+            return certRequest.name();
+        }
+
+        public String shortName() {
+            return certRequest.shortName();
+        }
+
+        public int days() {
+            return certRequest.days();
+        }
+
+        public boolean expired() {
+            return certRequest.expired();
+        }
+
+        public boolean trusted() {
+            return certRequest.trusted();
+        }
+
+        private final CertificateRequest certRequest;
+        private final Function<CertificateRequest, X509Certificate> certResolver;
+        private final String label;
+    }
+
+    public interface NamedCertificateRequestSupplier {
+
+        String name();
+
+        CertificateRequest certRequest();
+
+        default ResolvableCertificateRequest certRequest(ResolvedKeychain keychain) {
+            Objects.requireNonNull(keychain);
+            var certRequest = Objects.requireNonNull(certRequest());
+            if (keychain.spec().certificateRequests().contains(certRequest)) {
+                return new ResolvableCertificateRequest(certRequest, keychain.asCertificateResolver(), name());
+            } else {
+                throw new IllegalArgumentException(String.format(
+                        "Certificate request %s not found in [%s] keychain",
+                        name(), keychain.spec().keychain().name()));
+            }
+        }
+    }
+
+    public record SignKeyOption(Type type, ResolvableCertificateRequest certRequest, Optional<String> customOptionValue) {
 
         public SignKeyOption {
             Objects.requireNonNull(type);
             Objects.requireNonNull(certRequest);
+            Objects.requireNonNull(customOptionValue);
+            if (customOptionValue.isEmpty() == (type == Type.SIGN_KEY_USER_NAME)) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        public SignKeyOption(Type type, ResolvableCertificateRequest certRequest) {
+            this(type, certRequest, Optional.empty());
+        }
+
+        public SignKeyOption(
+                Type type,
+                NamedCertificateRequestSupplier certRequestSupplier,
+                ResolvedKeychain keychain) {
+
+            this(type, certRequestSupplier.certRequest(keychain));
+        }
+
+        public SignKeyOption(String optionValue, ResolvableCertificateRequest certRequest) {
+            this(Type.SIGN_KEY_USER_NAME, certRequest, Optional.of(optionValue));
+        }
+
+        public SignKeyOption(
+                String optionValue,
+                NamedCertificateRequestSupplier certRequestSupplier,
+                ResolvedKeychain keychain) {
+
+            this(optionValue, certRequestSupplier.certRequest(keychain));
+        }
+
+        public enum Name {
+            KEY_USER_NAME("--mac-signing-key-user-name"),
+            KEY_IDENTITY_APP_IMAGE("--mac-app-image-sign-identity"),
+            KEY_IDENTITY_INSTALLER("--mac-installer-sign-identity"),
+            ;
+
+            Name(String optionName) {
+                this.optionName = Objects.requireNonNull(optionName);
+            }
+
+            public String optionName() {
+                return optionName;
+            }
+
+            public boolean passThrough() {
+                return this != KEY_USER_NAME;
+            }
+
+            private final String optionName;
         }
 
         public enum Type {
-            SIGN_KEY_USER_NAME,
-            SIGN_KEY_IDENTITY,
+            /**
+             * "--mac-signing-key-user-name" option with custom value
+             */
+            SIGN_KEY_USER_NAME(Name.KEY_USER_NAME),
+
+            /**
+             * "--mac-signing-key-user-name" option with the short user name, e.g.:
+             * {@code --mac-signing-key-user-name foo}
+             */
+            SIGN_KEY_USER_SHORT_NAME(Name.KEY_USER_NAME),
+
+            /**
+             * "--mac-signing-key-user-name" option with the full user name (aka signing
+             * identity name), e.g.:
+             * {@code --mac-signing-key-user-name 'Developer ID Application: foo'}
+             */
+            SIGN_KEY_USER_FULL_NAME(Name.KEY_USER_NAME),
+
+            /**
+             * "--mac-installer-sign-identity" or "--mac-app-image-sign-identity" option
+             * with the signing identity name, e.g.:
+             * {@code --mac-app-image-sign-identity 'Developer ID Application: foo'}
+             */
+            SIGN_KEY_IDENTITY(Map.of(
+                    MacSign.CertificateType.CODE_SIGN, Name.KEY_IDENTITY_APP_IMAGE,
+                    MacSign.CertificateType.INSTALLER, Name.KEY_IDENTITY_INSTALLER)),
+
+            /**
+             * "--mac-installer-sign-identity" or "--mac-app-image-sign-identity" option
+             * with the SHA1 of a signing certificate
+             */
+            SIGN_KEY_IDENTITY_SHA1(Map.of(
+                    MacSign.CertificateType.CODE_SIGN, Name.KEY_IDENTITY_APP_IMAGE,
+                    MacSign.CertificateType.INSTALLER, Name.KEY_IDENTITY_INSTALLER)),
+
+            /**
+             * "--mac-app-image-sign-identity" regardless of the type of signing identity
+             * (for signing app image or .pkg installer).
+             */
+            SIGN_KEY_IDENTITY_APP_IMAGE(Name.KEY_IDENTITY_APP_IMAGE),
+
+            /**
+             * "--mac-installer-sign-identity" regardless of the type of signing identity
+             * (for signing app image or .pkg installer).
+             */
+            SIGN_KEY_IDENTITY_INSTALLER(Name.KEY_IDENTITY_INSTALLER),
+
+            /**
+             * No explicit option specifying signing identity. jpackage will pick one from
+             * the specified keychain.
+             */
+            SIGN_KEY_IMPLICIT,
+
             ;
+
+            Type(Map<MacSign.CertificateType, Name> optionNameMap) {
+                Objects.requireNonNull(optionNameMap);
+                this.optionNameMapper = certType -> {
+                    return Optional.of(optionNameMap.get(certType));
+                };
+            }
+
+            Type(Name optionName) {
+                Objects.requireNonNull(optionName);
+                this.optionNameMapper = _ -> Optional.of(optionName);
+            }
+
+            Type() {
+                this.optionNameMapper = _ -> Optional.empty();
+            }
+
+            public Optional<Name> mapOptionName(MacSign.CertificateType certType) {
+                return optionNameMapper.apply(Objects.requireNonNull(certType));
+            }
+
+            public boolean passThrough() {
+                return Stream.of(MacSign.CertificateType.values())
+                        .map(this::mapOptionName)
+                        .flatMap(Optional::stream)
+                        .map(Name::passThrough)
+                        .distinct()
+                        .reduce((_, _) -> {
+                            throw new IllegalStateException();
+                        }).orElse(false);
+            }
+
+            public static Type[] defaultValues() {
+                return new Type[] {
+                        SIGN_KEY_USER_SHORT_NAME,
+                        SIGN_KEY_USER_FULL_NAME,
+                        SIGN_KEY_IDENTITY,
+                        SIGN_KEY_IDENTITY_SHA1,
+                        SIGN_KEY_IMPLICIT
+                };
+            }
+
+            private final Function<MacSign.CertificateType, Optional<Name>> optionNameMapper;
         }
 
         @Override
         public String toString() {
             var sb = new StringBuilder();
-            applyTo((optionName, _) -> {
-                sb.append(String.format("{%s: %s}", optionName, certRequest));
+            sb.append('{');
+            type.mapOptionName(certRequest.type()).ifPresent(optionName -> {
+                sb.append(optionName);
+                switch (type) {
+                    case SIGN_KEY_USER_FULL_NAME -> {
+                        sb.append("/full");
+                    }
+                    case SIGN_KEY_USER_NAME -> {
+                        customOptionValue.ifPresent(optionValue -> {
+                            sb.append("=").append(ENQUOTER.applyTo(optionValue));
+                        });
+                    }
+                    case SIGN_KEY_IDENTITY_SHA1 -> {
+                        sb.append("/sha1");
+                    }
+                    default -> {
+                        // NOP
+                    }
+                }
+                sb.append(": ");
             });
+            sb.append(certRequest).append('}');
             return sb.toString();
         }
 
@@ -504,35 +886,150 @@ public final class MacHelper {
             return sign(cmd);
         }
 
-        private void applyTo(BiConsumer<String, String> sink) {
-            switch (certRequest.type()) {
-                case INSTALLER -> {
-                    switch (type) {
-                        case SIGN_KEY_IDENTITY -> {
-                            sink.accept("--mac-installer-sign-identity", certRequest.name());
-                            return;
-                        }
-                        case SIGN_KEY_USER_NAME -> {
-                            sink.accept("--mac-signing-key-user-name", certRequest.shortName());
-                            return;
-                        }
-                    }
-                }
-                case CODE_SIGN -> {
-                    switch (type) {
-                        case SIGN_KEY_IDENTITY -> {
-                            sink.accept("--mac-app-image-sign-identity", certRequest.name());
-                            return;
-                        }
-                        case SIGN_KEY_USER_NAME -> {
-                            sink.accept("--mac-signing-key-user-name", certRequest.shortName());
-                            return;
-                        }
-                    }
-                }
-            }
+        public Optional<Name> optionName() {
+            return type.mapOptionName(certRequest.type());
+        }
 
-            throw new AssertionError();
+        public List<String> asCmdlineArgs() {
+            if (type == Type.SIGN_KEY_IMPLICIT) {
+                return List.of();
+            } else {
+                String[] args = new String[2];
+                applyTo((optionName, optionValue) -> {
+                    args[0] = optionName;
+                    args[1] = optionValue;
+                });
+                return List.of(args);
+            }
+        }
+
+        public Optional<Boolean> passThrough() {
+            return optionName().map(Name::passThrough);
+        }
+
+        private void applyTo(BiConsumer<String, String> sink) {
+            type.mapOptionName(certRequest.type()).ifPresent(optionName -> {
+                sink.accept(optionName.optionName(), optionValue());
+            });
+        }
+
+        private String optionValue() {
+            return customOptionValue.orElseGet(() -> {
+                switch (type) {
+                    case    SIGN_KEY_IDENTITY,
+                            SIGN_KEY_USER_FULL_NAME,
+                            SIGN_KEY_IDENTITY_APP_IMAGE,
+                            SIGN_KEY_IDENTITY_INSTALLER -> {
+                        return certRequest.name();
+                    }
+                    case SIGN_KEY_USER_SHORT_NAME -> {
+                        return certRequest.shortName();
+                    }
+                    case SIGN_KEY_IDENTITY_SHA1 -> {
+                        return CertificateHash.of(certRequest.cert()).toString();
+                    }
+                    default -> {
+                        throw new IllegalStateException();
+                    }
+                }
+            });
+        }
+
+        private static final Enquoter ENQUOTER = Enquoter.identity()
+                .setEnquotePredicate(Enquoter.QUOTE_IF_WHITESPACES).setQuoteChar('\'');
+    }
+
+    public record SignKeyOptionWithKeychain(SignKeyOption signKeyOption, ResolvedKeychain keychain) {
+
+        public SignKeyOptionWithKeychain {
+            Objects.requireNonNull(signKeyOption);
+            Objects.requireNonNull(keychain);
+        }
+
+        public SignKeyOptionWithKeychain(
+                SignKeyOption.Type type,
+                ResolvableCertificateRequest certRequest,
+                ResolvedKeychain keychain) {
+
+            this(new SignKeyOption(type, certRequest), keychain);
+        }
+
+        public SignKeyOptionWithKeychain(
+                SignKeyOption.Type type,
+                NamedCertificateRequestSupplier certRequestSupplier,
+                ResolvedKeychain keychain) {
+
+            this(type, certRequestSupplier.certRequest(keychain), keychain);
+        }
+
+        public SignKeyOptionWithKeychain(
+                String optionValue,
+                ResolvableCertificateRequest certRequest,
+                ResolvedKeychain keychain) {
+
+            this(new SignKeyOption(optionValue, certRequest), keychain);
+        }
+
+        public SignKeyOptionWithKeychain(
+                String optionValue,
+                NamedCertificateRequestSupplier certRequestSupplier,
+                ResolvedKeychain keychain) {
+
+            this(optionValue, certRequestSupplier.certRequest(keychain), keychain);
+        }
+
+        public SignKeyOptionWithKeychain(
+                SignKeyOption.Type type,
+                CertificateRequest certRequest,
+                ResolvedKeychain keychain) {
+
+            this(new SignKeyOption(
+                    type,
+                    new ResolvableCertificateRequest(
+                            certRequest,
+                            keychain.asCertificateResolver(),
+                            certRequest.toString())),
+                    keychain);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s@%s", signKeyOption, keychain.name());
+        }
+
+        public SignKeyOption.Type type() {
+            return signKeyOption.type();
+        }
+
+        public ResolvableCertificateRequest certRequest() {
+            return signKeyOption.certRequest();
+        }
+
+        public Optional<SignKeyOption.Name> optionName() {
+            return signKeyOption.optionName();
+        }
+
+        public Optional<Boolean> passThrough() {
+            return signKeyOption.passThrough();
+        }
+
+        public JPackageCommand addTo(JPackageCommand cmd) {
+            Optional.ofNullable(cmd.getArgumentValue("--mac-signing-keychain")).ifPresentOrElse(configuredKeychain -> {
+                if (!configuredKeychain.equals(keychain.name())) {
+                    throw new IllegalStateException(String.format(
+                            "Command line [%s] already has the '--mac-signing-keychain' option, not adding another one with [%s] value",
+                            cmd, keychain.name()));
+                }
+            }, () -> {
+                useKeychain(cmd, keychain);
+            });
+            return signKeyOption.addTo(cmd);
+        }
+
+        public JPackageCommand setTo(JPackageCommand cmd) {
+            cmd.removeArgumentWithValue("--mac-signing-keychain");
+            useKeychain(cmd, keychain);
+            return signKeyOption.setTo(cmd);
         }
     }
 
@@ -574,18 +1071,21 @@ public final class MacHelper {
     }
 
     static void verifyUnsignedBundleSignature(JPackageCommand cmd) {
-        if (!cmd.isImagePackageType()) {
+
+        if (!cmd.isImagePackageType() && !nativePackageSigned(cmd)) {
             MacSignVerify.assertUnsigned(cmd.outputBundle());
         }
 
-        final Path bundleRoot;
-        if (cmd.isImagePackageType()) {
-            bundleRoot = cmd.outputBundle();
-        } else {
-            bundleRoot = cmd.pathToUnpackedPackageFile(cmd.appInstallationDirectory());
-        }
+        if (!appImageSigned(cmd)) {
+            final Path bundleRoot;
+            if (cmd.isImagePackageType()) {
+                bundleRoot = cmd.outputBundle();
+            } else {
+                bundleRoot = cmd.pathToUnpackedPackageFile(cmd.appInstallationDirectory());
+            }
 
-        MacSignVerify.assertAdhocSigned(bundleRoot);
+            MacSignVerify.assertAdhocSigned(bundleRoot);
+        }
     }
 
     static PackageHandlers createDmgPackageHandlers() {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
index 70de6ba92af..20f7ac41eef 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -61,10 +61,13 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
+import jdk.jpackage.internal.util.MemoizingSupplier;
 import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
@@ -279,8 +282,15 @@ public final class MacSign {
             return sb.toString();
         }
 
+        public static Builder build() {
+            return new Builder();
+        }
+
         public static final class Builder {
 
+            private Builder() {
+            }
+
             public Builder name(String v) {
                 keychainBuilder.name(v);
                 return this;
@@ -305,8 +315,8 @@ public final class MacSign {
                 return new KeychainWithCertsSpec(keychain, List.copyOf(certs));
             }
 
-            private Keychain.Builder keychainBuilder = new Keychain.Builder();
-            private List<CertificateRequest> certs = new ArrayList<>();
+            private final Keychain.Builder keychainBuilder = Keychain.build();
+            private final List<CertificateRequest> certs = new ArrayList<>();
         }
     }
 
@@ -325,8 +335,15 @@ public final class MacSign {
             }
         }
 
+        public static Builder build() {
+            return new Builder();
+        }
+
         public static final class Builder {
 
+            private Builder() {
+            }
+
             public Builder name(String v) {
                 name = v;
                 return this;
@@ -598,12 +615,7 @@ public final class MacSign {
 
         @Override
         public String toString() {
-            final var sb = new StringBuilder();
-            sb.append(frame("BEGIN " + label));
-            sb.append(ENCODER.encodeToString(data));
-            sb.append("\n");
-            sb.append(frame("END " + label));
-            return sb.toString();
+            return PemDataFormatter.format(label, data);
         }
 
         static PemData of(X509Certificate cert) {
@@ -618,6 +630,21 @@ public final class MacSign {
                 throw new UncheckedIOException(ex);
             }
         }
+    }
+
+    private final class PemDataFormatter {
+
+        static String format(String label, byte[] data) {
+            Objects.requireNonNull(label);
+            Objects.requireNonNull(data);
+
+            final var sb = new StringBuilder();
+            sb.append(frame("BEGIN " + label));
+            sb.append(ENCODER.encodeToString(data));
+            sb.append("\n");
+            sb.append(frame("END " + label));
+            return sb.toString();
+        }
 
         private static String frame(String str) {
             return String.format("-----%s-----\n", Objects.requireNonNull(str));
@@ -626,6 +653,11 @@ public final class MacSign {
         private static final Base64.Encoder ENCODER = Base64.getMimeEncoder(64, "\n".getBytes());
     }
 
+    public static String formatX509Certificate(X509Certificate cert) {
+        Objects.requireNonNull(cert);
+        return PemDataFormatter.format("CERTIFICATE", toSupplier(cert::getEncoded).get());
+    }
+
     public enum DigestAlgorithm {
         SHA1(20, () -> MessageDigest.getInstance("SHA-1")),
         SHA256(32, () -> MessageDigest.getInstance("SHA-256"));
@@ -711,7 +743,7 @@ public final class MacSign {
     }
 
     public enum StandardCertificateNamePrefix {
-        CODE_SIGND("Developer ID Application: "),
+        CODE_SIGN("Developer ID Application: "),
         INSTALLER("Developer ID Installer: ");
 
         StandardCertificateNamePrefix(String value) {
@@ -772,8 +804,15 @@ public final class MacSign {
             return COMPARATOR.compare(this, o);
         }
 
+        public static Builder build() {
+            return new Builder();
+        }
+
         public static final class Builder {
 
+            private Builder() {
+            }
+
             public Builder userName(String v) {
                 userName = v;
                 return this;
@@ -824,7 +863,7 @@ public final class MacSign {
                 return Optional.ofNullable(subjectCommonName).orElseGet(() -> {
                     switch (type) {
                         case CODE_SIGN -> {
-                            return StandardCertificateNamePrefix.CODE_SIGND.value() + validatedUserName();
+                            return StandardCertificateNamePrefix.CODE_SIGN.value() + validatedUserName();
                         }
                         case INSTALLER -> {
                             return StandardCertificateNamePrefix.INSTALLER.value() + validatedUserName();
@@ -1067,6 +1106,15 @@ public final class MacSign {
         return !missingKeychain && !missingCertificates && !invalidCertificates;
     }
 
+    /**
+     * Creates an empty keychain with unique name in the work directory of the current test.
+     */
+    public static Keychain createEmptyKeychain() {
+        return Keychain.build()
+                .name(TKit.createUniquePath(TKit.workDir().resolve("empty.keychain")).toAbsolutePath().toString())
+                .create().create();
+    }
+
     public static Keychain.UsageBuilder withKeychains(KeychainWithCertsSpec... keychains) {
         return withKeychains(Stream.of(keychains).map(KeychainWithCertsSpec::keychain).toArray(Keychain[]::new));
     }
@@ -1099,9 +1147,14 @@ public final class MacSign {
 
     public static void withKeychain(Consumer<ResolvedKeychain> consumer, Consumer<Keychain.UsageBuilder> mutator, ResolvedKeychain keychain) {
         Objects.requireNonNull(consumer);
-        withKeychains(() -> {
+        Objects.requireNonNull(mutator);
+        if (keychain.isMock()) {
             consumer.accept(keychain);
-        }, mutator, keychain.spec().keychain());
+        } else {
+            withKeychains(() -> {
+                consumer.accept(keychain);
+            }, mutator, keychain.spec().keychain());
+        }
     }
 
     public static void withKeychain(Consumer<ResolvedKeychain> consumer, ResolvedKeychain keychain) {
@@ -1110,7 +1163,15 @@ public final class MacSign {
 
     public static final class ResolvedKeychain {
         public ResolvedKeychain(KeychainWithCertsSpec spec) {
+            isMock = false;
             this.spec = Objects.requireNonNull(spec);
+            certMapSupplier = MemoizingSupplier.runOnce(() -> {
+                return MacSign.mapCertificateRequests(spec);
+            });
+        }
+
+        public static ResolvedKeychain createMock(String name, Map<CertificateRequest, X509Certificate> certs) {
+            return new ResolvedKeychain(name, certs);
         }
 
         public KeychainWithCertsSpec spec() {
@@ -1121,19 +1182,61 @@ public final class MacSign {
             return spec.keychain().name();
         }
 
-        public Map<CertificateRequest, X509Certificate> mapCertificateRequests() {
-            if (certMap == null) {
-                synchronized (this) {
-                    if (certMap == null) {
-                        certMap = MacSign.mapCertificateRequests(spec);
-                    }
-                }
-            }
-            return certMap;
+        public boolean isMock() {
+            return isMock;
         }
 
+        public ResolvedKeychain toMock(Map<CertificateRequest, X509Certificate> signEnv) {
+            if (isMock) {
+                throw new UnsupportedOperationException("Already a mock");
+            }
+
+            var comm = Comm.compare(Set.copyOf(spec.certificateRequests()), signEnv.keySet());
+            if (!comm.unique1().isEmpty()) {
+                throw new IllegalArgumentException(String.format(
+                        "Signing environment missing %s certificate request mappings in [%s] keychain",
+                        comm.unique1(), name()));
+            }
+
+            var certs = new HashMap<>(signEnv);
+            certs.keySet().retainAll(comm.common());
+
+            return createMock(name(), certs);
+        }
+
+        public Map<CertificateRequest, X509Certificate> mapCertificateRequests() {
+            return certMapSupplier.get();
+        }
+
+        public Function<CertificateRequest, X509Certificate> asCertificateResolver() {
+            return certRequest -> {
+                if (!spec.certificateRequests().contains(certRequest)) {
+                    throw new IllegalArgumentException(String.format(
+                            "Certificate request %s not found in [%s] keychain",
+                            certRequest, name()));
+                } else {
+                    return Objects.requireNonNull(mapCertificateRequests().get(certRequest));
+                }
+            };
+        }
+
+        private ResolvedKeychain(String name, Map<CertificateRequest, X509Certificate> certs) {
+
+            var keychainBuilder = KeychainWithCertsSpec.build().name(Objects.requireNonNull(name));
+            certs.keySet().forEach(keychainBuilder::addCert);
+
+            var certsCopy = Map.copyOf(Objects.requireNonNull(certs));
+
+            isMock = true;
+            spec = keychainBuilder.create();
+            certMapSupplier = MemoizingSupplier.runOnce(() -> {
+                return certsCopy;
+            });
+        }
+
+        private final boolean isMock;
         private final KeychainWithCertsSpec spec;
-        private volatile Map<CertificateRequest, X509Certificate> certMap;
+        private final Supplier<Map<CertificateRequest, X509Certificate>> certMapSupplier;
     }
 
     private static Map<CertificateRequest, X509Certificate> mapCertificateRequests(KeychainWithCertsSpec spec) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
index 0ecfd4c3432..01c510070be 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSignVerify.java
@@ -22,20 +22,21 @@
  */
 package jdk.jpackage.test;
 
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 import static jdk.jpackage.test.MacSign.DigestAlgorithm.SHA256;
 
 import java.nio.file.Path;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.HexFormat;
+import java.util.Iterator;
 import java.util.List;
-import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import jdk.jpackage.internal.util.PListReader;
+import jdk.jpackage.test.MacHelper.ResolvableCertificateRequest;
 import jdk.jpackage.test.MacSign.CertificateHash;
 import jdk.jpackage.test.MacSign.CertificateRequest;
 
@@ -44,12 +45,10 @@ import jdk.jpackage.test.MacSign.CertificateRequest;
  */
 public final class MacSignVerify {
 
-    public static void verifyAppImageSigned(
-            JPackageCommand cmd, CertificateRequest certRequest, MacSign.ResolvedKeychain keychain) {
+    public static void verifyAppImageSigned(JPackageCommand cmd, ResolvableCertificateRequest certRequest) {
 
-        cmd.verifyIsOfType(PackageType.MAC);
+        cmd.verifyIsOfType(PackageType.MAC_DMG, PackageType.MAC_PKG, PackageType.IMAGE);
         Objects.requireNonNull(certRequest);
-        Objects.requireNonNull(keychain);
 
         final Path bundleRoot;
         if (cmd.isImagePackageType()) {
@@ -66,20 +65,19 @@ public final class MacSignVerify {
         });
 
         // Set to "null" if the sign origin is not found, instead of bailing out with an exception.
-        // Let is fail in the following TKit.assertEquals() call with a proper log message.
+        // Let it fail in the following TKit.assertEquals() call with a proper log message.
         var signOrigin = findSpctlSignOrigin(SpctlType.EXEC, bundleRoot).orElse(null);
 
         TKit.assertEquals(certRequest.name(), signOrigin,
                 String.format("Check [%s] has sign origin as expected", bundleRoot));
     }
 
-    public static void verifyPkgSigned(JPackageCommand cmd, CertificateRequest certRequest, MacSign.ResolvedKeychain keychain) {
+    public static void verifyPkgSigned(JPackageCommand cmd, ResolvableCertificateRequest certRequest) {
         cmd.verifyIsOfType(PackageType.MAC_PKG);
-        assertPkgSigned(cmd.outputBundle(), certRequest,
-                Objects.requireNonNull(keychain.mapCertificateRequests().get(certRequest)));
+        assertPkgSigned(cmd.outputBundle(), certRequest);
     }
 
-    public static void assertSigned(Path path, CertificateRequest certRequest) {
+    public static void assertSigned(Path path, ResolvableCertificateRequest certRequest) {
         assertSigned(path);
         TKit.assertEquals(certRequest.name(), findCodesignSignOrigin(path).orElse(null),
                 String.format("Check [%s] signed with certificate", path));
@@ -92,10 +90,14 @@ public final class MacSignVerify {
     }
 
     public static Optional<PListReader> findEntitlements(Path path) {
-        final var exec = Executor.of("/usr/bin/codesign", "-d", "--entitlements", "-", "--xml", path.toString()).saveOutput().dumpOutput();
+        final var exec = Executor.of(
+                "/usr/bin/codesign",
+                "-d",
+                "--entitlements", "-",
+                "--xml", path.toString()).saveOutput().dumpOutput().binaryOutput();
         final var result = exec.execute();
-        var xml = result.stdout();
-        if (xml.isEmpty()) {
+        var xml = result.byteStdout();
+        if (xml.length == 0) {
             return Optional.empty();
         } else {
             return Optional.of(MacHelper.readPList(xml));
@@ -107,6 +109,10 @@ public final class MacSignVerify {
                 String.format("Check [%s] unsigned", path));
     }
 
+    public static void assertPkgSigned(Path path, ResolvableCertificateRequest certRequest) {
+        assertPkgSigned(path, certRequest.certRequest(), certRequest.cert());
+    }
+
     public static void assertPkgSigned(Path path, CertificateRequest certRequest, X509Certificate cert) {
         final var expectedCertChain = List.of(new SignIdentity(certRequest.name(), CertificateHash.of(cert, SHA256)));
         final var actualCertChain = getPkgCertificateChain(path);
@@ -135,17 +141,33 @@ public final class MacSignVerify {
     public static final String ADHOC_SIGN_ORIGIN = "-";
 
     public static Optional<String> findSpctlSignOrigin(SpctlType type, Path path) {
-        final var exec = Executor.of("/usr/sbin/spctl", "-vv", "--raw", "--assess", "--type", type.value(), path.toString()).saveOutput().discardStderr();
-        final var result = exec.executeWithoutExitCodeCheck();
-        TKit.assertTrue(Set.of(0, 3).contains(result.getExitCode()),
-                String.format("Check exit code of command %s is either 0 or 3", exec.getPrintableCommandLine()));
-        return toSupplier(() -> {
-            try {
-                return Optional.of(new PListReader(String.join("", result.getOutput()).getBytes()).queryValue("assessment:originator"));
-            } catch (NoSuchElementException ex) {
-                return Optional.<String>empty();
+        return findSpctlSignOrigin(type, path, false);
+    }
+
+    public static Optional<String> findSpctlSignOrigin(SpctlType type, Path path, boolean acceptBrokenSignature) {
+        final var exec = Executor.of(
+                "/usr/sbin/spctl",
+                "-vv",
+                "--raw",
+                "--assess",
+                "--type", type.value(),
+                path.toString()).saveOutput().discardStderr().binaryOutput();
+        Executor.Result result;
+        if (acceptBrokenSignature) {
+            result = exec.executeWithoutExitCodeCheck();
+            switch (result.getExitCode()) {
+                case 0, 3 -> {
+                    // NOP
+                }
+                default -> {
+                    // No plist XML to process.
+                    return Optional.empty();
+                }
             }
-        }).get();
+        } else {
+            result = exec.execute(0, 3);
+        }
+        return MacHelper.readPList(result.byteStdout()).findValue("assessment:originator");
     }
 
     public static Optional<String> findCodesignSignOrigin(Path path) {
@@ -192,10 +214,13 @@ public final class MacSignVerify {
         exec.addArguments("--verify", "--deep", "--strict", "--verbose=2", path.toString());
         final var result = exec.saveOutput().executeWithoutExitCodeCheck();
         if (result.getExitCode() == 0) {
-            TKit.TextStreamVerifier.group()
-                    .add(TKit.assertTextStream(": valid on disk").predicate(String::endsWith))
-                    .add(TKit.assertTextStream(": satisfies its Designated Requirement").predicate(String::endsWith))
-                    .create().accept(result.getOutput().iterator());
+            Stream.of(
+                    ": valid on disk",
+                    ": satisfies its Designated Requirement"
+            ).map(TKit::assertTextStream).map(v -> {
+                Consumer<Iterator<String>> consumer = v.predicate(String::endsWith)::apply;
+                return consumer;
+            }).reduce(Consumer::andThen).orElseThrow().accept(result.getOutput().iterator());
         } else if (!sudo && result.getOutput().stream().findFirst().filter(str -> {
             // By some reason /usr/bin/codesign command fails for some installed bundles.
             // It is known to fail for some AppContentTest test cases and all FileAssociationsTest test cases.
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
index fee5b65c897..c0bc858eb1e 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,24 @@ import static java.util.stream.Collectors.toCollection;
 import static java.util.stream.Collectors.toMap;
 import static jdk.jpackage.test.TestBuilder.CMDLINE_ARG_PREFIX;
 
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Deque;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.internal.util.function.ThrowingRunnable;
 
 
 public final class Main {
@@ -47,10 +54,52 @@ public final class Main {
     }
 
     public static void main(TestBuilder.Builder builder, String... args) throws Exception {
+        Objects.requireNonNull(builder);
+
+        var argList = List.of(args);
+
+        var ignoreLogfile = argList.contains(CMDLINE_ARG_PREFIX + "ignore-logfile");
+
+        List<String> filteredArgs;
+        if (ignoreLogfile) {
+            filteredArgs = argList.stream().filter(Predicate.isEqual(CMDLINE_ARG_PREFIX + "ignore-logfile").negate()).toList();
+        } else {
+            filteredArgs = argList;
+        }
+
+        ThrowingRunnable<Exception> workload = () -> {
+            run(builder, filteredArgs);
+        };
+
+        try {
+            Optional.ofNullable(TKit.getConfigProperty("logfile")).filter(_ -> {
+                return !ignoreLogfile;
+            }).map(Path::of).ifPresentOrElse(logfile -> {
+
+                try (var out = new PrintStream(
+                        Files.newOutputStream(logfile, StandardOpenOption.CREATE, StandardOpenOption.APPEND),
+                        true,
+                        System.out.charset())) {
+
+                    TKit.withOutput(workload, out, out);
+
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+
+            }, () -> {
+                ThrowingRunnable.toRunnable(workload).run();
+            });
+        } catch (Exception ex) {
+            throw ExceptionBox.unbox(ex);
+        }
+    }
+
+    private static void run(TestBuilder.Builder builder, List<String> args) throws Exception {
         boolean listTests = false;
         List<TestInstance> tests = new ArrayList<>();
         try (TestBuilder testBuilder = builder.testConsumer(tests::add).create()) {
-            Deque<String> argsAsList = new ArrayDeque<>(List.of(args));
+            Deque<String> argsAsList = new ArrayDeque<>(args);
             while (!argsAsList.isEmpty()) {
                 var arg = argsAsList.pop();
                 TestBuilder.trace(String.format("Parsing [%s]...", arg));
@@ -115,7 +164,7 @@ public final class Main {
             return;
         }
 
-        TKit.withExtraLogStream(() -> runTests(orderedTests));
+        runTests(orderedTests);
     }
 
     private static void runTests(List<TestInstance> tests) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
index 2e4f11d056f..2baf6683fdf 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -726,12 +726,30 @@ public final class PackageTest extends RunnablePackageTest {
                 }
 
                 case CREATE -> {
-                    Executor.Result result = cmd.execute(expectedJPackageExitCode);
+                    var nullableOutputBundle = cmd.nullableOutputBundle();
+
+                    var oldOutputBundleSnapshot = nullableOutputBundle
+                            .filter(Files::exists)
+                            .filter(_ -> {
+                                return !cmd.isRemoveOldOutputBundle();
+                            })
+                            .map(TKit.PathSnapshot::new);
+
+                    var result = cmd.execute(expectedJPackageExitCode);
+
                     if (expectedJPackageExitCode == 0) {
                         TKit.assertFileExists(cmd.outputBundle());
                     } else {
-                        cmd.nullableOutputBundle().ifPresent(outputBundle -> {
-                            TKit.assertPathExists(outputBundle, false);
+                        nullableOutputBundle.ifPresent(outputBundle -> {
+                            oldOutputBundleSnapshot.ifPresentOrElse(snapshot -> {
+                                // jpackage failed, but the output bundle exists.
+                                // This output bundle existed before the jpackage was invoked.
+                                // Verify jpackage didn't modify it.
+                                new TKit.PathSnapshot(outputBundle).assertEquals(snapshot, String.format(
+                                        "Check jpackage didn't modify the old output bundle [%s]", outputBundle));
+                            }, () -> {
+                                TKit.assertPathExists(outputBundle, false);
+                            });
                         });
                     }
                     verifyPackageBundle(cmd, result, expectedJPackageExitCode);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PathDeletionPreventer.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PathDeletionPreventer.java
new file mode 100644
index 00000000000..d16b63d9c69
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PathDeletionPreventer.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.test;
+
+import java.io.Closeable;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.channels.FileLock;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Supplier;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.util.SetBuilder;
+
+/**
+ * Path deletion preventer. Encapsulates platform-specifics of how to make a
+ * file or a directory non-deletable.
+ * <p>
+ * Implementation should be sufficient to make {@code Files#delete(Path)}
+ * applied to the path protected from deletion throw.
+ */
+public sealed interface PathDeletionPreventer {
+
+    enum Implementation {
+        /**
+         * Uses Java file lock to prevent deletion of a file.
+         * Works on Windows. Doesn't work on Linux and macOS.
+         */
+        FILE_CHANNEL_LOCK,
+
+        /**
+         * Removes write permission from a non-empty directory to prevent its deletion.
+         * Works on Linux and macOS. Doesn't work on Windows.
+         */
+        READ_ONLY_NON_EMPTY_DIRECTORY,
+        ;
+    }
+
+    Implementation implementation();
+
+    Closeable preventPathDeletion(Path path) throws IOException;
+
+    enum FileChannelLockPathDeletionPreventer implements PathDeletionPreventer {
+        INSTANCE;
+
+        @Override
+        public Implementation implementation() {
+            return Implementation.FILE_CHANNEL_LOCK;
+        }
+
+        @Override
+        public Closeable preventPathDeletion(Path path) throws IOException {
+            return new UndeletablePath(path);
+        }
+
+        private static final class UndeletablePath implements Closeable {
+
+            UndeletablePath(Path file) throws IOException {
+                var fos = new FileOutputStream(Objects.requireNonNull(file).toFile());
+                boolean lockCreated = false;
+                try {
+                    this.lock = fos.getChannel().lock();
+                    this.fos = fos;
+                    lockCreated = true;
+                } finally {
+                    if (!lockCreated) {
+                        fos.close();
+                    }
+                }
+            }
+
+            @Override
+            public void close() throws IOException {
+                try {
+                    lock.close();
+                } finally {
+                    fos.close();
+                }
+            }
+
+            private final FileOutputStream fos;
+            private final FileLock lock;
+        }
+    }
+
+    enum ReadOnlyDirectoryPathDeletionPreventer implements PathDeletionPreventer {
+        INSTANCE;
+
+        @Override
+        public Implementation implementation() {
+            return Implementation.READ_ONLY_NON_EMPTY_DIRECTORY;
+        }
+
+        @Override
+        public Closeable preventPathDeletion(Path path) throws IOException {
+            return new UndeletablePath(path);
+        }
+
+        private static final class UndeletablePath implements Closeable {
+
+            UndeletablePath(Path dir) throws IOException {
+                this.dir = Objects.requireNonNull(dir);
+
+                // Deliberately don't use Files#createDirectories() as don't want to create missing directories.
+                try {
+                    Files.createDirectory(dir);
+                    Files.createFile(dir.resolve("empty"));
+                } catch (FileAlreadyExistsException ex) {
+                }
+
+                perms = Files.getPosixFilePermissions(dir);
+                if (perms.contains(PosixFilePermission.OWNER_WRITE)) {
+                    Files.setPosixFilePermissions(dir, SetBuilder.<PosixFilePermission>build()
+                            .add(perms)
+                            .remove(PosixFilePermission.OWNER_WRITE)
+                            .emptyAllowed(true)
+                            .create());
+                }
+            }
+
+            @Override
+            public void close() throws IOException {
+                if (perms.contains(PosixFilePermission.OWNER_WRITE)) {
+                    Files.setPosixFilePermissions(dir, perms);
+                }
+            }
+
+            private final Path dir;
+            private final Set<PosixFilePermission> perms;
+        }
+    }
+
+    static final PathDeletionPreventer DEFAULT = new Supplier<PathDeletionPreventer>() {
+
+        @Override
+        public PathDeletionPreventer get() {
+            switch (OperatingSystem.current()) {
+                case WINDOWS -> {
+                    return FileChannelLockPathDeletionPreventer.INSTANCE;
+                }
+                default -> {
+                    return ReadOnlyDirectoryPathDeletionPreventer.INSTANCE;
+                }
+            }
+        }
+
+    }.get();
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
index 47ab838f8d6..88d11d75f45 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,6 @@ import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.nio.file.StandardOpenOption;
 import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
@@ -52,6 +51,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -65,6 +65,7 @@ import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
@@ -109,56 +110,45 @@ public final class TKit {
         throw throwUnknownPlatformError();
     }).get();
 
-    static void withExtraLogStream(ThrowingRunnable<? extends Exception> action) {
-        if (state().extraLogStream != null) {
-            ThrowingRunnable.toRunnable(action).run();
-        } else {
-            try (PrintStream logStream = openLogStream()) {
-                withExtraLogStream(action, logStream);
+    public static void withOutput(ThrowingRunnable<? extends Exception> action, PrintStream out, PrintStream err) {
+        Objects.requireNonNull(action);
+        Objects.requireNonNull(out);
+        Objects.requireNonNull(err);
+
+        try {
+            withState(action, stateBuilder -> {
+                stateBuilder.out(out).err(err);
+            });
+        } finally {
+            try {
+                out.flush();
+            } finally {
+                err.flush();
             }
         }
     }
 
-    static void withExtraLogStream(ThrowingRunnable<? extends Exception> action, PrintStream logStream) {
-        withNewState(action, stateBuilder -> {
-            stateBuilder.extraLogStream(logStream);
-        });
-    }
-
-    public static void withMainLogStream(ThrowingRunnable<? extends Exception> action, PrintStream logStream) {
-        withNewState(action, stateBuilder -> {
-            stateBuilder.mainLogStream(logStream);
-        });
-    }
-
-    public static void withStackTraceStream(ThrowingRunnable<? extends Exception> action, PrintStream logStream) {
-        withNewState(action, stateBuilder -> {
-            stateBuilder.stackTraceStream(logStream);
-        });
-    }
-
-    public static State state() {
-        return STATE.get();
-    }
-
-    public static void state(State v) {
-        STATE.set(Objects.requireNonNull(v));
-    }
-
-    private static void withNewState(ThrowingRunnable<? extends Exception> action, Consumer<State.Builder> stateBuilderMutator) {
+    public static void withState(ThrowingRunnable<? extends Exception> action, Consumer<State.Builder> stateBuilderMutator) {
         Objects.requireNonNull(action);
         Objects.requireNonNull(stateBuilderMutator);
 
-        var oldState = state();
-        var builder = oldState.buildCopy();
-        stateBuilderMutator.accept(builder);
-        var newState = builder.create();
-        try {
-            state(newState);
-            ThrowingRunnable.toRunnable(action).run();
-        } finally {
-            state(oldState);
-        }
+        var stateBuilder = state().buildCopy();
+        stateBuilderMutator.accept(stateBuilder);
+        withState(action, stateBuilder.create());
+    }
+
+    public static void withNewState(ThrowingRunnable<? extends Exception> action) {
+        withState(action, _ -> {});
+    }
+
+    public static void withState(ThrowingRunnable<? extends Exception> action, State state) {
+        Objects.requireNonNull(action);
+        Objects.requireNonNull(state);
+        ScopedValue.where(STATE, state).run(ThrowingRunnable.toRunnable(action));
+    }
+
+    public static State state() {
+        return STATE.orElse(DEFAULT_STATE);
     }
 
     enum RunTestMode {
@@ -178,33 +168,19 @@ public final class TKit {
             throw new IllegalStateException("Unexpected nested Test.run() call");
         }
 
-        withExtraLogStream(() -> {
-            tests.stream().forEach(test -> {
-                withNewState(() -> {
-                    try {
-                        if (modes.contains(RunTestMode.FAIL_FAST)) {
-                            test.run();
-                        } else {
-                            ignoreExceptions(test).run();
-                        }
-                    } finally {
-                        Optional.ofNullable(state().extraLogStream).ifPresent(PrintStream::flush);
-                    }
-                }, stateBuilder -> {
-                    stateBuilder.currentTest(test);
-                });
+        tests.stream().forEach(test -> {
+            withState(() -> {
+                if (modes.contains(RunTestMode.FAIL_FAST)) {
+                    test.run();
+                } else {
+                    ignoreExceptions(test).run();
+                }
+            }, stateBuilder -> {
+                stateBuilder.currentTest(test);
             });
         });
     }
 
-    static <T> T runAdhocTest(ThrowingSupplier<T, ? extends Exception> action) {
-        final List<T> box = new ArrayList<>();
-        runAdhocTest(() -> {
-            box.add(action.get());
-        });
-        return box.getFirst();
-    }
-
     static void runAdhocTest(ThrowingRunnable<? extends Exception> action) {
         Objects.requireNonNull(action);
 
@@ -281,10 +257,7 @@ public final class TKit {
     static void log(String v) {
         v = addTimestamp(v);
         var state = state();
-        state.mainLogStream.println(v);
-        if (state.extraLogStream != null) {
-            state.extraLogStream.println(v);
-        }
+        state.out.println(v);
     }
 
     static Path removeRootFromAbsolutePath(Path v) {
@@ -692,8 +665,7 @@ public final class TKit {
 
     static void printStackTrace(Throwable throwable) {
         var state = state();
-        Optional.ofNullable(state.extraLogStream).ifPresent(throwable::printStackTrace);
-        throwable.printStackTrace(state.stackTraceStream);
+        throwable.printStackTrace(state.err);
     }
 
     private static String concatMessages(String msg, String msg2) {
@@ -1111,15 +1083,23 @@ public final class TKit {
             predicate(String::contains);
         }
 
+        TextStreamVerifier(Pattern value) {
+            this(Objects.requireNonNull(value).pattern());
+            predicate(value.asPredicate());
+        }
+
         TextStreamVerifier(TextStreamVerifier other) {
             predicate = other.predicate;
             label = other.label;
             negate = other.negate;
             createException = other.createException;
-            anotherVerifier = other.anotherVerifier;
             value = other.value;
         }
 
+        public TextStreamVerifier copy() {
+            return new TextStreamVerifier(this);
+        }
+
         public TextStreamVerifier label(String v) {
             label = v;
             return this;
@@ -1130,6 +1110,13 @@ public final class TKit {
             return this;
         }
 
+        public TextStreamVerifier predicate(Predicate<String> v) {
+            Objects.requireNonNull(v);
+            return predicate((str, _) -> {
+                return v.test(str);
+            });
+        }
+
         public TextStreamVerifier negate() {
             negate = true;
             return this;
@@ -1145,7 +1132,12 @@ public final class TKit {
             return this;
         }
 
-        private String findMatch(Iterator<String> lineIt) {
+        public TextStreamVerifier mutate(Consumer<TextStreamVerifier> mutator) {
+            mutator.accept(this);
+            return this;
+        }
+
+        private String find(Iterator<String> lineIt) {
             while (lineIt.hasNext()) {
                 final var line = lineIt.next();
                 if (predicate.test(line, value)) {
@@ -1160,7 +1152,7 @@ public final class TKit {
         }
 
         public void apply(Iterator<String> lineIt) {
-            final String matchedStr = findMatch(lineIt);
+            final String matchedStr = find(lineIt);
             final String labelStr = Optional.ofNullable(label).orElse("output");
             if (negate) {
                 String msg = String.format(
@@ -1185,69 +1177,12 @@ public final class TKit {
                     }
                 }
             }
-
-            if (anotherVerifier != null) {
-                anotherVerifier.accept(lineIt);
-            }
-        }
-
-        public static TextStreamVerifier.Group group() {
-            return new TextStreamVerifier.Group();
-        }
-
-        public static final class Group {
-            public Group add(TextStreamVerifier verifier) {
-                if (verifier.anotherVerifier != null) {
-                    throw new IllegalArgumentException();
-                }
-                verifiers.add(verifier);
-                return this;
-            }
-
-            public Group add(Group other) {
-                verifiers.addAll(other.verifiers);
-                return this;
-            }
-
-            public boolean isEmpty() {
-                return verifiers.isEmpty();
-            }
-
-            public Optional<Consumer<Iterator<String>>> tryCreate() {
-                if (isEmpty()) {
-                    return Optional.empty();
-                } else {
-                    return Optional.of(create());
-                }
-            }
-
-            public Consumer<Iterator<String>> create() {
-                if (verifiers.isEmpty()) {
-                    throw new IllegalStateException();
-                }
-
-                if (verifiers.size() == 1) {
-                    return verifiers.getFirst()::apply;
-                }
-
-                final var head = new TextStreamVerifier(verifiers.getFirst());
-                var prev = head;
-                for (var verifier : verifiers.subList(1, verifiers.size())) {
-                    verifier = new TextStreamVerifier(verifier);
-                    prev.anotherVerifier = verifier::apply;
-                    prev = verifier;
-                }
-                return head::apply;
-            }
-
-            private final List<TextStreamVerifier> verifiers = new ArrayList<>();
         }
 
         private BiPredicate<String, String> predicate;
         private String label;
         private boolean negate;
         private Supplier<RuntimeException> createException;
-        private Consumer<? super Iterator<String>> anotherVerifier;
         private final String value;
     }
 
@@ -1255,14 +1190,17 @@ public final class TKit {
         return new TextStreamVerifier(what);
     }
 
-    private static PrintStream openLogStream() {
-        return state().logFile.map(logfile -> {
-            try {
-                return Files.newOutputStream(logfile, StandardOpenOption.CREATE, StandardOpenOption.APPEND);
-            } catch (IOException ex) {
-                throw new UncheckedIOException(ex);
-            }
-        }).map(PrintStream::new).orElse(null);
+    public static TextStreamVerifier assertTextStream(Pattern what) {
+        return new TextStreamVerifier(what);
+    }
+
+    public static Consumer<Iterator<String>> assertEndOfTextStream(String label) {
+        Objects.requireNonNull(label);
+        return it -> {
+            var tail = new ArrayList<String>();
+            it.forEachRemaining(tail::add);
+            assertStringListEquals(List.of(), tail, String.format("Check the end of %s", label));
+        };
     }
 
     public record PathSnapshot(List<String> contentHashes) {
@@ -1376,25 +1314,23 @@ public final class TKit {
     public static final class State {
 
         private State(
-                Optional<Path> logFile,
                 TestInstance currentTest,
-                PrintStream mainLogStream,
-                PrintStream stackTraceStream,
-                PrintStream extraLogStream,
+                PrintStream out,
+                PrintStream err,
+                Map<Object, Object> properties,
                 boolean trace,
                 boolean traceAsserts,
                 boolean verboseJPackage,
                 boolean verboseTestSetup) {
 
-            Objects.requireNonNull(logFile);
-            Objects.requireNonNull(mainLogStream);
-            Objects.requireNonNull(stackTraceStream);
+            Objects.requireNonNull(out);
+            Objects.requireNonNull(err);
+            Objects.requireNonNull(properties);
 
-            this.logFile = logFile;
             this.currentTest = currentTest;
-            this.mainLogStream = mainLogStream;
-            this.stackTraceStream = stackTraceStream;
-            this.extraLogStream = extraLogStream;
+            this.out = out;
+            this.err = err;
+            this.properties = Collections.synchronizedMap(properties);
 
             this.trace = trace;
             this.traceAsserts = traceAsserts;
@@ -1403,11 +1339,30 @@ public final class TKit {
             this.verboseTestSetup = verboseTestSetup;
         }
 
-
         Builder buildCopy() {
             return build().initFrom(this);
         }
 
+        PrintStream out() {
+            return out;
+        }
+
+        PrintStream err() {
+            return err;
+        }
+
+        Optional<Object> findProperty(Object key) {
+            return Optional.ofNullable(properties.get(Objects.requireNonNull(key)));
+        }
+
+        void setProperty(Object key, Object value) {
+            if (value == null) {
+                properties.remove(Objects.requireNonNull(key));
+            } else {
+                properties.put(Objects.requireNonNull(key), value);
+            }
+        }
+
         static Builder build() {
             return new Builder();
         }
@@ -1416,11 +1371,9 @@ public final class TKit {
         static final class Builder {
 
             Builder initDefaults() {
-                logFile = Optional.ofNullable(getConfigProperty("logfile")).map(Path::of);
                 currentTest = null;
-                mainLogStream = System.out;
-                stackTraceStream = System.err;
-                extraLogStream = null;
+                out = System.out;
+                err = System.err;
 
                 var logOptions = tokenizeConfigProperty("suppress-logging");
                 if (logOptions == null) {
@@ -1444,15 +1397,17 @@ public final class TKit {
                     verboseTestSetup = isNonOf.test(Set.of("init", "i"));
                 }
 
+                mutable = true;
+
                 return this;
             }
 
             Builder initFrom(State state) {
-                logFile = state.logFile;
                 currentTest = state.currentTest;
-                mainLogStream = state.mainLogStream;
-                stackTraceStream = state.stackTraceStream;
-                extraLogStream = state.extraLogStream;
+                out = state.out;
+                err = state.err;
+                properties.clear();
+                properties.putAll(state.properties);
 
                 trace = state.trace;
                 traceAsserts = state.traceAsserts;
@@ -1463,54 +1418,67 @@ public final class TKit {
                 return this;
             }
 
-            Builder logFile(Optional<Path> v) {
-                logFile = v;
-                return this;
-            }
-
             Builder currentTest(TestInstance v) {
                 currentTest = v;
                 return this;
             }
 
-            Builder mainLogStream(PrintStream v) {
-                mainLogStream = v;
+            Builder out(PrintStream v) {
+                out = v;
                 return this;
             }
 
-            Builder stackTraceStream(PrintStream v) {
-                stackTraceStream = v;
+            Builder err(PrintStream v) {
+                err = v;
                 return this;
             }
 
-            Builder extraLogStream(PrintStream v) {
-                extraLogStream = v;
+            Builder property(Object key, Object value) {
+                if (value == null) {
+                    properties.remove(Objects.requireNonNull(key));
+                } else {
+                    properties.put(Objects.requireNonNull(key), value);
+                }
+                return this;
+            }
+
+            Builder mutable(boolean v) {
+                mutable = v;
                 return this;
             }
 
             State create() {
-                return new State(logFile, currentTest, mainLogStream, stackTraceStream, extraLogStream, trace, traceAsserts, verboseJPackage, verboseTestSetup);
+                return new State(
+                        currentTest,
+                        out,
+                        err,
+                        mutable ? new HashMap<>(properties) : Map.copyOf(properties),
+                        trace,
+                        traceAsserts,
+                        verboseJPackage,
+                        verboseTestSetup);
             }
 
-            private Optional<Path> logFile;
             private TestInstance currentTest;
-            private PrintStream mainLogStream;
-            private PrintStream stackTraceStream;
-            private PrintStream extraLogStream;
+            private PrintStream out;
+            private PrintStream err;
+            private Map<Object, Object> properties = new HashMap<>();
 
             private boolean trace;
             private boolean traceAsserts;
 
             private boolean verboseJPackage;
             private boolean verboseTestSetup;
+
+            private boolean mutable = true;
         }
 
 
-        private final Optional<Path> logFile;
         private final TestInstance currentTest;
-        private final PrintStream mainLogStream;
-        private final PrintStream stackTraceStream;
-        private final PrintStream extraLogStream;
+        private final PrintStream out;
+        private final PrintStream err;
+
+        private final Map<Object, Object> properties;
 
         private final boolean trace;
         private final boolean traceAsserts;
@@ -1520,10 +1488,6 @@ public final class TKit {
     }
 
 
-    private static final InheritableThreadLocal<State> STATE = new InheritableThreadLocal<>() {
-        @Override
-        protected State initialValue() {
-            return State.build().initDefaults().create();
-        }
-    };
+    private static final ScopedValue<State> STATE = ScopedValue.newInstance();
+    private static final State DEFAULT_STATE = State.build().initDefaults().mutable(false).create();
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
index f9fbf285b49..c7b55ed1de7 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -42,8 +42,6 @@ import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
 import jdk.jpackage.test.PackageTest.PackageHandlers;
@@ -306,91 +304,6 @@ public class WindowsHelper {
                 "Failed to get file description of [%s]", pathToExeFile));
     }
 
-    public static void killProcess(long pid) {
-        Executor.of("taskkill", "/F", "/PID", Long.toString(pid)).dumpOutput(true).execute();
-    }
-
-    public static void killAppLauncherProcess(JPackageCommand cmd,
-            String launcherName, int expectedCount) {
-        var pids = findAppLauncherPIDs(cmd, launcherName);
-        try {
-            TKit.assertEquals(expectedCount, pids.length, String.format(
-                    "Check [%d] %s app launcher processes found running",
-                    expectedCount, Optional.ofNullable(launcherName).map(
-                            str -> "[" + str + "]").orElse("<main>")));
-        } finally {
-            if (pids.length != 0) {
-                killProcess(pids[0]);
-            }
-        }
-    }
-
-    private static long[] findAppLauncherPIDs(JPackageCommand cmd, String launcherName) {
-        // Get the list of PIDs and PPIDs of app launcher processes. Run setWinRunWithEnglishOutput(true) for JDK-8344275.
-        // powershell -NoLogo -NoProfile -NonInteractive -Command
-        //   "Get-CimInstance Win32_Process -Filter \"Name = 'foo.exe'\" | select ProcessID,ParentProcessID"
-        String command = "Get-CimInstance Win32_Process -Filter \\\"Name = '"
-                + cmd.appLauncherPath(launcherName).getFileName().toString()
-                + "'\\\" | select ProcessID,ParentProcessID";
-        List<String> output = Executor.of("powershell", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command", command)
-                .dumpOutput(true).saveOutput().setWinRunWithEnglishOutput(true).executeAndGetOutput();
-
-        if (output.size() < 1) {
-            return new long[0];
-        }
-
-        String[] headers = Stream.of(output.get(1).split("\\s+", 2)).map(
-                String::trim).map(String::toLowerCase).toArray(String[]::new);
-        Pattern pattern;
-        if (headers[0].equals("parentprocessid") && headers[1].equals(
-                "processid")) {
-            pattern = Pattern.compile("^\\s+(?<ppid>\\d+)\\s+(?<pid>\\d+)$");
-        } else if (headers[1].equals("parentprocessid") && headers[0].equals(
-                "processid")) {
-            pattern = Pattern.compile("^\\s+(?<pid>\\d+)\\s+(?<ppid>\\d+)$");
-        } else {
-            throw new RuntimeException(
-                    "Unrecognizable output of \'Get-CimInstance Win32_Process\' command");
-        }
-
-        List<long[]> processes = output.stream().skip(3).map(line -> {
-            Matcher m = pattern.matcher(line);
-            long[] pids = null;
-            if (m.matches()) {
-                pids = new long[]{Long.parseLong(m.group("pid")), Long.
-                    parseLong(m.group("ppid"))};
-            }
-            return pids;
-        }).filter(Objects::nonNull).toList();
-
-        switch (processes.size()) {
-            case 2 -> {
-                final long parentPID;
-                final long childPID;
-                if (processes.get(0)[0] == processes.get(1)[1]) {
-                    parentPID = processes.get(0)[0];
-                    childPID = processes.get(1)[0];
-                } else if (processes.get(1)[0] == processes.get(0)[1]) {
-                    parentPID = processes.get(1)[0];
-                    childPID = processes.get(0)[0];
-                } else {
-                    TKit.assertUnexpected("App launcher processes unrelated");
-                    return null; // Unreachable
-                }
-                return new long[]{parentPID, childPID};
-            }
-            case 1 -> {
-                return new long[]{processes.get(0)[0]};
-            }
-            default -> {
-                TKit.assertUnexpected(String.format(
-                        "Unexpected number of running processes [%d]",
-                        processes.size()));
-                return null; // Unreachable
-            }
-        }
-    }
-
     static boolean isUserLocalInstall(JPackageCommand cmd) {
         return cmd.hasArgument("--win-per-user-install");
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandAction.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandAction.java
index d9ab38e006a..c4899a5376f 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandAction.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandAction.java
@@ -60,6 +60,36 @@ public interface CommandAction {
         public MockIllegalStateException unexpectedArguments() {
             return new MockIllegalStateException(String.format("Unexpected arguments: %s", args));
         }
+
+        public Context shift(int count) {
+            if (count < 0) {
+                throw new IllegalArgumentException();
+            } else if (count == 0) {
+                return this;
+            } else {
+                return new Context(out, err, args.subList(Integer.min(count, args.size()), args.size()));
+            }
+        }
+
+        public Context shift() {
+            return shift(1);
+        }
+
+        public void printlnOut(Object obj) {
+            out.println(obj);
+        }
+
+        public void printlnOut(String str) {
+            out.println(str);
+        }
+
+        public void printlnErr(Object obj) {
+            err.println(obj);
+        }
+
+        public void printlnErr(String str) {
+            err.println(str);
+        }
     }
 
     /**
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandActionSpecs.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandActionSpecs.java
index e89e458c02d..ce3aa6f80e1 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandActionSpecs.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/CommandActionSpecs.java
@@ -115,6 +115,13 @@ public record CommandActionSpecs(List<CommandActionSpec> specs) {
             return printToStderr(List.of(str));
         }
 
+        public Builder argsListener(Consumer<List<String>> listener) {
+            Objects.requireNonNull(listener);
+            return action(CommandActionSpec.create("args-listener", context -> {
+                listener.accept(context.args());
+            }));
+        }
+
         public Builder exit(int exitCode) {
             return action(CommandActionSpec.create(String.format("exit(%d)", exitCode), () -> {
                 return exitCode;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/MockIllegalStateException.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/MockIllegalStateException.java
index 1817587364a..4656e1d4f7b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/MockIllegalStateException.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/mock/MockIllegalStateException.java
@@ -22,13 +22,15 @@
  */
 package jdk.jpackage.test.mock;
 
+import java.util.Objects;
+
 /**
  * Indicates command mock internal error.
  */
 public final class MockIllegalStateException extends IllegalStateException {
 
     public MockIllegalStateException(String msg) {
-        super(msg);
+        super(Objects.requireNonNull(msg));
     }
 
     private static final long serialVersionUID = 1L;
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/JPackageMockUtils.java
similarity index 76%
rename from test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java
rename to test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/JPackageMockUtils.java
index e88077a6c9d..604bcd0711f 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/JPackageMockUtils.java
@@ -21,18 +21,27 @@
  * questions.
  */
 
-package jdk.jpackage.internal;
+package jdk.jpackage.test.stdmock;
 
+import static jdk.jpackage.internal.util.MemoizingSupplier.runOnce;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
 import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.spi.ToolProvider;
+import java.util.stream.Collectors;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.Executor;
+import jdk.jpackage.internal.ExecutorFactory;
+import jdk.jpackage.internal.Globals;
+import jdk.jpackage.internal.ObjectFactory;
 import jdk.jpackage.internal.cli.CliBundlingEnvironment;
 import jdk.jpackage.internal.cli.Main;
 import jdk.jpackage.internal.util.function.ExceptionBox;
@@ -41,11 +50,11 @@ import jdk.jpackage.test.mock.ToolProviderCommandMock;
 import jdk.jpackage.test.mock.VerbatimCommandMock;
 
 /**
- * Bridges "jdk.jpackage.internal" and "jdk.jpackage.test.mock" packages.
+ * Utilities to create jpackage mock.
  */
-public final class MockUtils {
+public final class JPackageMockUtils {
 
-    private MockUtils() {
+    private JPackageMockUtils() {
     }
 
     public static JPackageToolProviderBuilder buildJPackage() {
@@ -58,30 +67,23 @@ public final class MockUtils {
             return createJPackageToolProvider(os(), createObjectFactory());
         }
 
-        public Consumer<Globals> createGlobalsMutator() {
-            var objectFactory = createObjectFactory();
-            return globals -> {
-                globals.objectFactory(objectFactory);
-            };
-        }
-
         public void applyToGlobals() {
-            createGlobalsMutator().accept(Globals.instance());
+            Globals.instance().objectFactory(createObjectFactory());
         }
 
-        ExecutorFactory createExecutorFactory() {
-            var commandMocksExecutorFactory = Optional.ofNullable(script).map(MockUtils::withCommandMocks).map(mapper -> {
+        public ExecutorFactory createExecutorFactory() {
+            var commandMocksExecutorFactory = Optional.ofNullable(script).map(JPackageMockUtils::withCommandMocks).map(mapper -> {
                 return mapper.apply(ExecutorFactory.DEFAULT);
             }).orElse(ExecutorFactory.DEFAULT);
 
-            var recordingExecutorFactory = Optional.ofNullable(listener).map(MockUtils::withCommandListener).map(mapper -> {
+            var recordingExecutorFactory = Optional.ofNullable(listener).map(JPackageMockUtils::withCommandListener).map(mapper -> {
                 return mapper.apply(commandMocksExecutorFactory);
             }).orElse(commandMocksExecutorFactory);
 
             return recordingExecutorFactory;
         }
 
-        ObjectFactory createObjectFactory() {
+        public ObjectFactory createObjectFactory() {
             var executorFactory = createExecutorFactory();
             if (executorFactory == ExecutorFactory.DEFAULT) {
                 return ObjectFactory.DEFAULT;
@@ -125,6 +127,31 @@ public final class MockUtils {
         return createJPackageToolProvider(OperatingSystem.current(), script);
     }
 
+    public static Map<OperatingSystem, Supplier<CliBundlingEnvironment>> availableBundlingEnvironments() {
+        return Map.ofEntries(
+                Map.entry(OperatingSystem.WINDOWS, "WinBundlingEnvironment"),
+                Map.entry(OperatingSystem.LINUX, "LinuxBundlingEnvironment"),
+                Map.entry(OperatingSystem.MACOS, "MacBundlingEnvironment")
+        ).entrySet().stream().map(e -> {
+            Constructor<?> ctor;
+            try {
+                ctor = Class.forName("jdk.jpackage.internal." + e.getValue()).getConstructor();
+            } catch (NoSuchMethodException | SecurityException ex) {
+                throw ExceptionBox.toUnchecked(ex);
+            } catch (ClassNotFoundException ex) {
+                return Optional.<Map.Entry<OperatingSystem, Supplier<CliBundlingEnvironment>>>empty();
+            }
+            return Optional.of(Map.entry(e.getKey(), toSupplier(() -> {
+                return (CliBundlingEnvironment)ctor.newInstance();
+            })));
+        }).flatMap(Optional::stream).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    public static CliBundlingEnvironment createBundlingEnvironment(OperatingSystem os) {
+        Objects.requireNonNull(os);
+        return Objects.requireNonNull(availableBundlingEnvironments().get(os)).get();
+    }
+
     private static UnaryOperator<ExecutorFactory> withCommandListener(Consumer<List<String>> listener) {
         Objects.requireNonNull(listener);
         return executorFactory -> {
@@ -180,39 +207,11 @@ public final class MockUtils {
         };
     }
 
-    public static CliBundlingEnvironment createBundlingEnvironment(OperatingSystem os) {
-        Objects.requireNonNull(os);
-
-        String bundlingEnvironmentClassName;
-        switch (os) {
-            case WINDOWS -> {
-                bundlingEnvironmentClassName = "WinBundlingEnvironment";
-            }
-            case LINUX -> {
-                bundlingEnvironmentClassName = "LinuxBundlingEnvironment";
-            }
-            case MACOS -> {
-                bundlingEnvironmentClassName = "MacBundlingEnvironment";
-            }
-            default -> {
-                throw new IllegalArgumentException();
-            }
-        }
-
-        return toSupplier(() -> {
-            var ctor = Class.forName(String.join(".",
-                    DefaultBundlingEnvironment.class.getPackageName(),
-                    bundlingEnvironmentClassName
-            )).getConstructor();
-            return (CliBundlingEnvironment)ctor.newInstance();
-        }).get();
-    }
-
-    static ToolProvider createJPackageToolProvider(OperatingSystem os, ObjectFactory of) {
+    private static ToolProvider createJPackageToolProvider(OperatingSystem os, ObjectFactory of) {
         Objects.requireNonNull(os);
         Objects.requireNonNull(of);
 
-        var impl = new Main.Provider(DefaultBundlingEnvironment.runOnce(() -> {
+        var impl = new Main.Provider(runOnce(() -> {
             return createBundlingEnvironment(os);
         }));
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/MacSecurityMock.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/MacSecurityMock.java
new file mode 100644
index 00000000000..fe9a67f1889
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/MacSecurityMock.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.test.stdmock;
+
+import java.nio.file.Path;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.ResolvedKeychain;
+import jdk.jpackage.test.mock.CommandAction;
+import jdk.jpackage.test.mock.MockIllegalStateException;
+
+/**
+ * Mocks /usr/bin/security command.
+ */
+final class MacSecurityMock implements CommandAction {
+
+    MacSecurityMock(MacSignMockUtils.SignEnv signEnv) {
+        Objects.requireNonNull(signEnv);
+
+        var keychains = signEnv.keychains();
+
+        var stdUserKeychains = Stream.of(StandardKeychain.values()).map(StandardKeychain::keychainName).filter(name -> {
+            // Add standard keychain unless it is defined in the signing environment.
+            return keychains.stream().noneMatch(keychain -> {
+                return keychain.name().equals(name);
+            });
+        }).map(name -> {
+            // Assume the standard keychain is empty.
+            return ResolvedKeychain.createMock(name, Map.of());
+        });
+
+        allKnownKeychains = Stream.of(
+                stdUserKeychains,
+                keychains.stream()
+        ).flatMap(x -> x).collect(Collectors.toUnmodifiableMap(ResolvedKeychain::name, x -> x));
+
+        currentKeychains.addAll(Stream.of(StandardKeychain.values())
+                .map(StandardKeychain::keychainName)
+                .map(allKnownKeychains::get)
+                .map(Objects::requireNonNull).toList());
+    }
+
+    @Override
+    public Optional<Integer> run(Context context) {
+        switch (context.args().getFirst()) {
+            case "list-keychains" -> {
+                listKeychains(context.shift());
+                return Optional.of(0);
+            }
+            case "find-certificate" -> {
+                findCertificate(context.shift());
+                return Optional.of(0);
+            }
+            default -> {
+                throw context.unexpectedArguments();
+            }
+        }
+    }
+
+    private void listKeychains(Context context) {
+        if (context.args().getFirst().equals("-s")) {
+            currentKeychains.clear();
+            currentKeychains.addAll(context.shift().args().stream().map(name -> {
+                return Optional.ofNullable(allKnownKeychains.get(name)).orElseThrow(() -> {
+                    throw new MockIllegalStateException(String.format("Unknown keychain name: %s", name));
+                });
+            }).toList());
+        } else if (context.args().isEmpty()) {
+            currentKeychains.stream().map(keychain -> {
+                return String.format("  \"%s\"", keychain.name());
+            }).forEach(context::printlnOut);
+        } else {
+            throw context.unexpectedArguments();
+        }
+    }
+
+    private void findCertificate(Context context) {
+
+        var args = new ArrayList<>(context.args());
+        for (var mandatoryArg : List.of("-p", "-a")) {
+            if (!args.remove(mandatoryArg)) {
+                throw context.unexpectedArguments();
+            }
+        }
+
+        var certNameFilter = context.findOptionValue("-c").map(certNameSubstr -> {
+
+            // Remove option name and its value.
+            var idx = args.indexOf("-c");
+            args.remove(idx);
+            args.remove(idx);
+
+            Predicate<Map.Entry<CertificateRequest, X509Certificate>> pred = e -> {
+                return e.getKey().name().contains(certNameSubstr);
+            };
+            return pred;
+        });
+
+        Stream<ResolvedKeychain> keychains;
+        if (args.isEmpty()) {
+            keychains = currentKeychains.stream();
+        } else {
+            // Remaining arguments must be keychain names.
+            keychains = args.stream().map(keychainName -> {
+                return Optional.ofNullable(allKnownKeychains.get(keychainName)).orElseThrow(() -> {
+                    throw new MockIllegalStateException(String.format("Unknown keychain name: %s", keychainName));
+                });
+            });
+        }
+
+        var certStream = keychains.flatMap(keychain -> {
+            return keychain.mapCertificateRequests().entrySet().stream();
+        });
+
+        if (certNameFilter.isPresent()) {
+            certStream = certStream.filter(certNameFilter.get());
+        }
+
+        certStream.map(Map.Entry::getValue).map(MacSign::formatX509Certificate).forEach(formattedCert -> {
+            context.out().print(formattedCert);
+        });
+    }
+
+    // Keep the order of the items as the corresponding keychains appear
+    // in the output of the "/usr/bin/security list-keychains" command.
+    private enum StandardKeychain {
+        USER_KEYCHAIN {
+            @Override
+            String keychainName() {
+                return Path.of(System.getProperty("user.home")).resolve("Library/Keychains/login.keychain-db").toString();
+            }
+        },
+        SYSTEM_KEYCHAIN {
+            @Override
+            String keychainName() {
+                return "/Library/Keychains/System.keychain";
+            }
+        },
+        ;
+
+        abstract String keychainName();
+    }
+
+    private final List<ResolvedKeychain> currentKeychains = new ArrayList<ResolvedKeychain>();
+    private final Map<String, ResolvedKeychain> allKnownKeychains;
+}
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/MacSignMockUtils.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/MacSignMockUtils.java
new file mode 100644
index 00000000000..164261a6000
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/stdmock/MacSignMockUtils.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.test.stdmock;
+
+import static jdk.jpackage.internal.util.function.ExceptionBox.toUnchecked;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.KeychainWithCertsSpec;
+import jdk.jpackage.test.MacSign.ResolvedKeychain;
+import jdk.jpackage.test.mock.CommandActionSpec;
+import jdk.jpackage.test.mock.CommandActionSpecs;
+import jdk.jpackage.test.mock.CommandMockSpec;
+
+
+/**
+ * Utilities to create macOS signing tool mocks.
+ */
+public final class MacSignMockUtils {
+
+    private MacSignMockUtils() {
+    }
+
+    public static Map<CertificateRequest, X509Certificate> resolveCertificateRequests(
+            Collection<CertificateRequest> certificateRequests) {
+        Objects.requireNonNull(certificateRequests);
+
+        var caKeys = createKeyPair();
+
+        Function<CertificateRequest, X509Certificate> resolver = toFunction(certRequest -> {
+            var builder = new CertificateBuilder()
+                    .setSubjectName("CN=" + certRequest.name())
+                    .setPublicKey(caKeys.getPublic())
+                    .setSerialNumber(BigInteger.ONE)
+                    .addSubjectKeyIdExt(caKeys.getPublic())
+                    .addAuthorityKeyIdExt(caKeys.getPublic());
+
+            Instant from;
+            Instant to;
+            if (certRequest.expired()) {
+                from = LocalDate.now().minusDays(10).atStartOfDay(ZoneId.systemDefault()).toInstant();
+                to = from.plus(Duration.ofDays(1));
+            } else {
+                from = LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant();
+                to = from.plus(Duration.ofDays(certRequest.days()));
+            }
+            builder.setValidity(Date.from(from), Date.from(to));
+
+            return builder.build(null, caKeys.getPrivate());
+        });
+
+        return certificateRequests.stream()
+            .distinct()
+            .collect(Collectors.toUnmodifiableMap(x -> x, resolver));
+    }
+
+    public static Map<CertificateRequest, X509Certificate> resolveCertificateRequests(
+            CertificateRequest... certificateRequests) {
+        return resolveCertificateRequests(List.of(certificateRequests));
+    }
+
+    public static final class SignEnv {
+
+        public SignEnv(List<KeychainWithCertsSpec> spec) {
+            Objects.requireNonNull(spec);
+
+            spec.stream().map(keychain -> {
+                return keychain.keychain().name();
+            }).collect(Collectors.toMap(x -> x, x -> x, (a, b) -> {
+                throw new IllegalArgumentException(String.format("Multiple keychains with the same name: %s", a));
+            }));
+
+            this.spec = List.copyOf(spec);
+            this.env = resolveCertificateRequests(
+                    spec.stream().map(KeychainWithCertsSpec::certificateRequests).flatMap(Collection::stream).toList());
+        }
+
+        public SignEnv(KeychainWithCertsSpec... spec) {
+            this(List.of(spec));
+        }
+
+        public List<ResolvedKeychain> keychains() {
+            return spec.stream().map(ResolvedKeychain::new).map(keychain -> {
+                return keychain.toMock(env);
+            }).toList();
+        }
+
+        public Map<CertificateRequest, X509Certificate> env() {
+            return env;
+        }
+
+        private final Map<CertificateRequest, X509Certificate> env;
+        private final List<KeychainWithCertsSpec> spec;
+    }
+
+    public static CommandMockSpec securityMock(SignEnv signEnv) {
+        var action = CommandActionSpec.create("/usr/bin/security", new MacSecurityMock(signEnv));
+        return new CommandMockSpec(action.description(), CommandActionSpecs.build().action(action).create());
+    }
+
+    private static KeyPair createKeyPair() {
+        try {
+            var kpg = KeyPairGenerator.getInstance("RSA");
+            return kpg.generateKeyPair();
+        } catch (NoSuchAlgorithmException ex) {
+            throw ExceptionBox.toUnchecked(ex);
+        }
+    }
+
+    //
+    // Reflection proxy for jdk.test.lib.security.CertificateBuilder class.
+    //
+    // Can't use it directly because it is impossible to cherry-pick this class from the JDK test lib in JUnit tests due to limitations of jtreg.
+    //
+    // Shared jpackage JUnit tests don't require "jdk.jpackage.test.stdmock", but they depend on "jdk.jpackage.test" package.
+    // Source code for these two packages resides in the same directory tree, so jtreg will pull in classes from both packages for the jpackage JUnit tests.
+    // Static dependency on jdk.test.lib.security.CertificateBuilder class will force pulling in the entire JDK test lib, because of jtreg limitations.
+    //
+    // Use dynamic dependency as a workaround. Tests that require jdk.test.lib.security.CertificateBuilder class, should have
+    //
+    // /*
+    //  * ...
+    //  * @library /test/lib
+    //  * @build jdk.test.lib.security.CertificateBuilder
+    //  */
+    //
+    // in their declarations. They also should have
+    //
+    //  --add-exports java.base/sun.security.x509=ALL-UNNAMED
+    //  --add-exports java.base/sun.security.util=ALL-UNNAMED
+    //
+    // on javac and java command lines.
+    //
+    private static final class CertificateBuilder {
+
+        CertificateBuilder() {
+            instance = toSupplier(ctor::newInstance).get();
+        }
+
+        CertificateBuilder setSubjectName(String v) {
+            toRunnable(() -> {
+                setSubjectName.invoke(instance, v);
+            }).run();
+            return this;
+        }
+
+        CertificateBuilder setPublicKey(PublicKey v) {
+            toRunnable(() -> {
+                setPublicKey.invoke(instance, v);
+            }).run();
+            return this;
+        }
+
+        CertificateBuilder setSerialNumber(BigInteger v) {
+            toRunnable(() -> {
+                setSerialNumber.invoke(instance, v);
+            }).run();
+            return this;
+        }
+
+        CertificateBuilder addSubjectKeyIdExt(PublicKey v) {
+            toRunnable(() -> {
+                addSubjectKeyIdExt.invoke(instance, v);
+            }).run();
+            return this;
+        }
+
+        CertificateBuilder addAuthorityKeyIdExt(PublicKey v) {
+            toRunnable(() -> {
+                addAuthorityKeyIdExt.invoke(instance, v);
+            }).run();
+            return this;
+        }
+
+        CertificateBuilder setValidity(Date from, Date to) {
+            toRunnable(() -> {
+                setValidity.invoke(instance, from, to);
+            }).run();
+            return this;
+        }
+
+        X509Certificate build(X509Certificate issuerCert, PrivateKey issuerKey) throws IOException, CertificateException {
+            try {
+                return (X509Certificate)toSupplier(() -> {
+                    return build.invoke(instance, issuerCert, issuerKey);
+                }).get();
+            } catch (ExceptionBox box) {
+                switch (ExceptionBox.unbox(box)) {
+                    case IOException ex -> {
+                        throw ex;
+                    }
+                    case CertificateException ex -> {
+                        throw ex;
+                    }
+                    default -> {
+                        throw box;
+                    }
+                }
+            }
+        }
+
+        private final Object instance;
+
+        private static final Constructor<?> ctor;
+        private static final Method setSubjectName;
+        private static final Method setPublicKey;
+        private static final Method setSerialNumber;
+        private static final Method addSubjectKeyIdExt;
+        private static final Method addAuthorityKeyIdExt;
+        private static final Method setValidity;
+        private static final Method build;
+
+        static {
+            try {
+                var certificateBuilderClass = Class.forName("jdk.test.lib.security.CertificateBuilder");
+
+                ctor = certificateBuilderClass.getConstructor();
+
+                setSubjectName = certificateBuilderClass.getMethod("setSubjectName", String.class);
+
+                setPublicKey = certificateBuilderClass.getMethod("setPublicKey", PublicKey.class);
+
+                setSerialNumber = certificateBuilderClass.getMethod("setSerialNumber", BigInteger.class);
+
+                addSubjectKeyIdExt = certificateBuilderClass.getMethod("addSubjectKeyIdExt", PublicKey.class);
+
+                addAuthorityKeyIdExt = certificateBuilderClass.getMethod("addAuthorityKeyIdExt", PublicKey.class);
+
+                setValidity = certificateBuilderClass.getMethod("setValidity", Date.class, Date.class);
+
+                build = certificateBuilderClass.getMethod("build", X509Certificate.class, PrivateKey.class);
+
+            } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
+                throw toUnchecked(ex);
+            }
+        }
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxPackageArchTest.java b/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxPackageArchTest.java
index baf03a32142..d1332fc59e5 100644
--- a/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxPackageArchTest.java
+++ b/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxPackageArchTest.java
@@ -37,6 +37,7 @@ import jdk.jpackage.test.mock.CommandActionSpecs;
 import jdk.jpackage.test.mock.CommandMockExit;
 import jdk.jpackage.test.mock.CommandMockSpec;
 import jdk.jpackage.test.mock.Script;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -137,7 +138,7 @@ public class LinuxPackageArchTest {
 
         Globals.main(() -> {
 
-            MockUtils.buildJPackage().script(script).applyToGlobals();
+            JPackageMockUtils.buildJPackage().script(script).applyToGlobals();
 
             Result<LinuxPackageArch> arch = LinuxPackageArch.create(pkgType);
 
diff --git a/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxSystemEnvironmentTest.java b/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxSystemEnvironmentTest.java
index 8ff958491b1..5104dd1b252 100644
--- a/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxSystemEnvironmentTest.java
+++ b/test/jdk/tools/jpackage/junit/linux/jdk.jpackage/jdk/jpackage/internal/LinuxSystemEnvironmentTest.java
@@ -34,6 +34,7 @@ import jdk.jpackage.test.mock.CommandActionSpecs;
 import jdk.jpackage.test.mock.CommandMockExit;
 import jdk.jpackage.test.mock.CommandMockSpec;
 import jdk.jpackage.test.mock.Script;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -86,7 +87,7 @@ public class LinuxSystemEnvironmentTest {
 
             Globals.main(() -> {
 
-                MockUtils.buildJPackage().script(script).applyToGlobals();
+                JPackageMockUtils.buildJPackage().script(script).applyToGlobals();
 
                 var actual = LinuxSystemEnvironment.detectNativePackageType();
 
diff --git a/test/jdk/tools/jpackage/junit/linux/junit.java b/test/jdk/tools/jpackage/junit/linux/junit.java
index 0fd337c812c..ba06cb30db7 100644
--- a/test/jdk/tools/jpackage/junit/linux/junit.java
+++ b/test/jdk/tools/jpackage/junit/linux/junit.java
@@ -36,9 +36,9 @@
  * @requires (os.family == "linux")
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.mock.*
+ * @build jdk.jpackage.test.stdmock.*
  * @compile/module=jdk.jpackage -Xlint:all -Werror
  *    jdk/jpackage/internal/LinuxSystemEnvironmentTest.java
- *    ../../share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java
  * @run junit jdk.jpackage/jdk.jpackage.internal.LinuxSystemEnvironmentTest
  */
 
@@ -57,8 +57,8 @@
  * @requires (os.family == "linux")
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.mock.*
+ * @build jdk.jpackage.test.stdmock.*
  * @compile/module=jdk.jpackage -Xlint:all -Werror
  *    jdk/jpackage/internal/LinuxPackageArchTest.java
- *    ../../share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java
  * @run junit jdk.jpackage/jdk.jpackage.internal.LinuxPackageArchTest
  */
diff --git a/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgPackagerTest.java b/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgPackagerTest.java
index e5da383142a..0e4893c8a06 100644
--- a/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgPackagerTest.java
+++ b/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgPackagerTest.java
@@ -56,6 +56,7 @@ import jdk.jpackage.test.mock.CommandMockSpec;
 import jdk.jpackage.test.mock.MockIllegalStateException;
 import jdk.jpackage.test.mock.ScriptSpec;
 import jdk.jpackage.test.mock.ScriptSpecInDir;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -240,7 +241,7 @@ public class MacDmgPackagerTest {
 
             var script = dir(Objects.requireNonNull(workDir)).create();
 
-            ExecutorFactory executorFactory = MockUtils.buildJPackage()
+            ExecutorFactory executorFactory = JPackageMockUtils.buildJPackage()
                     .script(script).listener(System.out::println).createExecutorFactory();
 
             var objectFactory = ObjectFactory.build()
@@ -406,14 +407,14 @@ public class MacDmgPackagerTest {
         }
     }
 
-    private final static BiConsumer<Path, Consumer<Path>> EXPAND_PATH = (path, sink) -> {
+    private static final BiConsumer<Path, Consumer<Path>> EXPAND_PATH = (path, sink) -> {
         do {
             sink.accept(path);
             path = path.getParent();
         } while (path != null);
     };
 
-    private final static List<Path> DMG_ICON_FILES = Stream.of(
+    private static final List<Path> DMG_ICON_FILES = Stream.of(
             ".VolumeIcon.icns",
             ".background/background.tiff"
     ).map(Path::of).collect(Collectors.toUnmodifiableList());
diff --git a/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgSystemEnvironmentTest.java b/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgSystemEnvironmentTest.java
index de2b07e86a6..8e892106cb4 100644
--- a/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgSystemEnvironmentTest.java
+++ b/test/jdk/tools/jpackage/junit/macosx/jdk.jpackage/jdk/jpackage/internal/MacDmgSystemEnvironmentTest.java
@@ -32,11 +32,11 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import jdk.jpackage.internal.util.RetryExecutor;
 import jdk.jpackage.test.mock.CommandActionSpecs;
 import jdk.jpackage.test.mock.CommandMockExit;
 import jdk.jpackage.test.mock.CommandMockSpec;
 import jdk.jpackage.test.mock.Script;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -143,7 +143,7 @@ public class MacDmgSystemEnvironmentTest {
             }).createSequence();
 
             Globals.main(() -> {
-                MockUtils.buildJPackage().script(script).applyToGlobals();
+                JPackageMockUtils.buildJPackage().script(script).applyToGlobals();
 
                 var actual = MacDmgSystemEnvironment.findSetFileUtility();
 
diff --git a/test/jdk/tools/jpackage/junit/macosx/junit.java b/test/jdk/tools/jpackage/junit/macosx/junit.java
index c7fd2bc5f8d..2253211add0 100644
--- a/test/jdk/tools/jpackage/junit/macosx/junit.java
+++ b/test/jdk/tools/jpackage/junit/macosx/junit.java
@@ -36,9 +36,9 @@
  * @requires (os.family == "mac")
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.mock.*
+ * @build jdk.jpackage.test.stdmock.*
  * @compile/module=jdk.jpackage -Xlint:all -Werror
  *    jdk/jpackage/internal/MacDmgSystemEnvironmentTest.java
- *    ../../share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java
  * @run junit jdk.jpackage/jdk.jpackage.internal.MacDmgSystemEnvironmentTest
  */
 
@@ -47,8 +47,8 @@
  * @requires (os.family == "mac")
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.mock.*
+ * @build jdk.jpackage.test.stdmock.*
  * @compile/module=jdk.jpackage -Xlint:all -Werror
  *    jdk/jpackage/internal/MacDmgPackagerTest.java
- *    ../../share/jdk.jpackage/jdk/jpackage/internal/MockUtils.java
  * @run junit jdk.jpackage/jdk.jpackage.internal.MacDmgPackagerTest
  */
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
index 375c6aa637a..8fdcc96acff 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_AS_S
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LAUNCHER_NAME;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.LINUX_LAUNCHER_SHORTCUT;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_APP_STORE;
-import static jdk.jpackage.internal.cli.StandardAppImageFileOption.MAC_SIGNED;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.WIN_LAUNCHER_DESKTOP_SHORTCUT;
 import static jdk.jpackage.internal.cli.StandardAppImageFileOption.WIN_LAUNCHER_MENU_SHORTCUT;
 import static jdk.jpackage.internal.cli.StandardOption.APPCLASS;
@@ -223,7 +222,7 @@ public class AppImageFileTest {
                     version,
                     null,
                     null,
-                    Optional.empty(),
+                    List.of(),
                     List.of(),
                     null,
                     Optional.empty(),
@@ -514,7 +513,6 @@ public class AppImageFileTest {
                 "<main-class>Foo</main-class>",
                 "<y/>",
                 "<x>property-x</x>",
-                "<signed>true</signed>",
                 "<app-store>False</app-store>",
                 "<add-launcher name='add-launcher'>",
                 "  <description>Quick brown fox</description>",
@@ -546,8 +544,7 @@ public class AppImageFileTest {
                 .addExtra(WIN_LAUNCHER_MENU_SHORTCUT, new LauncherShortcut(LauncherShortcutStartupDirectory.APP_DIR)).commit()).create());
 
         testCases.add(builder.os(OperatingSystem.MACOS).expect(appBuilder.get().commit()
-                .addExtra(MAC_APP_STORE, false)
-                .addExtra(MAC_SIGNED, true)).create());
+                .addExtra(MAC_APP_STORE, false)).create());
 
         return testCases;
     }
@@ -580,7 +577,6 @@ public class AppImageFileTest {
                         "<main-class>OverwrittenMain</main-class>",
                         "<main-class>Main</main-class>",
                         "<x>property-x</x>",
-                        "<signed>true</signed>",
                         "<add-launcher name='service-launcher' service='true'>",
                         "  <linux-shortcut><nested>foo</nested></linux-shortcut>",
                         "  <description>service-launcher description</description>",
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
index 1a14330fe6e..ac05f5e2b69 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DefaultBundlingEnvironmentTest.java
@@ -41,7 +41,7 @@ import java.util.spi.ToolProvider;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.cli.StandardBundlingOperation;
-import jdk.jpackage.internal.model.AppImagePackageType;
+import jdk.jpackage.internal.model.AppImageBundleType;
 import jdk.jpackage.internal.model.BundlingOperationDescriptor;
 import jdk.jpackage.internal.model.PackageType;
 import jdk.jpackage.internal.model.StandardPackageType;
@@ -54,6 +54,7 @@ import jdk.jpackage.test.mock.CommandActionSpecs;
 import jdk.jpackage.test.mock.CommandMock;
 import jdk.jpackage.test.mock.CommandMockExit;
 import jdk.jpackage.test.mock.Script;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
 import org.junit.jupiter.api.Test;
 
 
@@ -96,7 +97,7 @@ public class DefaultBundlingEnvironmentTest extends JUnitAdapter {
 
         var script = createMockScript(op);
 
-        ToolProvider jpackage = MockUtils.buildJPackage()
+        ToolProvider jpackage = JPackageMockUtils.buildJPackage()
                 .os(op.os())
                 .script(script)
                 .listener(executedCommands::add).create();
@@ -119,9 +120,9 @@ public class DefaultBundlingEnvironmentTest extends JUnitAdapter {
         // #2 - jpackage should bail out earlier).
         //
 
-        final var type = op.packageTypeValue();
+        final var type = op.bundleTypeValue();
         final int iterationCount;
-        if (op.packageType() instanceof AppImagePackageType) {
+        if (op.bundleType() instanceof AppImageBundleType) {
             iterationCount = 1;
         } else {
             iterationCount = 2;
@@ -165,7 +166,7 @@ public class DefaultBundlingEnvironmentTest extends JUnitAdapter {
 
     private static Script createMockScript(StandardBundlingOperation op) {
 
-        if (op.packageType() instanceof AppImagePackageType) {
+        if (op.bundleType() instanceof AppImageBundleType) {
             return Script.build().createSequence();
         }
 
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
index 721e0802d16..de0ba67fece 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PackagingPipelineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -616,7 +616,7 @@ public class PackagingPipelineTest {
                 "1.0",
                 "Acme",
                 "copyright",
-                Optional.empty(),
+                List.of(),
                 List.of(),
                 appImageLayout,
                 runtimeBuilder,
@@ -633,7 +633,12 @@ public class PackagingPipelineTest {
         Package create() {
             return new Package.Stub(
                     app,
-                    new PackageType() {},
+                    new PackageType() {
+                        @Override
+                        public String label() {
+                            throw new UnsupportedOperationException();
+                        }
+                    },
                     "the-package",
                     "My package",
                     "1.0",
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/TempDirectoryTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/TempDirectoryTest.java
new file mode 100644
index 00000000000..221e7d9f433
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/TempDirectoryTest.java
@@ -0,0 +1,570 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardOption;
+import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.util.RetryExecutor;
+import jdk.jpackage.internal.util.function.ThrowingFunction;
+import jdk.jpackage.internal.util.function.ThrowingSupplier;
+import jdk.jpackage.test.PathDeletionPreventer;
+import jdk.jpackage.test.PathDeletionPreventer.ReadOnlyDirectoryPathDeletionPreventer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class TempDirectoryTest {
+
+    @Test
+    void test_directory_use(@TempDir Path tempDirPath) throws IOException {
+        try (var tempDir = new TempDirectory(Optional.of(tempDirPath), RetryExecutorFactory.DEFAULT)) {
+            assertEquals(tempDir.path(), tempDirPath);
+            assertFalse(tempDir.deleteOnClose());
+
+            var cmdline = Options.of(Map.of());
+            assertSame(cmdline, tempDir.map(cmdline));
+        }
+
+        assertTrue(Files.isDirectory(tempDirPath));
+    }
+
+    @Test
+    void test_directory_new() throws IOException {
+        var tempDir = new TempDirectory(Optional.empty(), RetryExecutorFactory.DEFAULT);
+        try (tempDir) {
+            assertTrue(Files.isDirectory(tempDir.path()));
+            assertTrue(tempDir.deleteOnClose());
+
+            var cmdline = Options.of(Map.of());
+            var mappedCmdline = tempDir.map(cmdline);
+            assertEquals(tempDir.path(), StandardOption.TEMP_ROOT.getFrom(mappedCmdline));
+        }
+
+        assertFalse(Files.isDirectory(tempDir.path()));
+    }
+
+    @SuppressWarnings("try")
+    @ParameterizedTest
+    @MethodSource
+    void test_close(CloseType closeType, @TempDir Path root) {
+        Globals.main(ThrowingSupplier.toSupplier(() -> {
+            test_close_impl(closeType, root);
+            return 0;
+        }));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void test_DirectoryListing_listFilesAndEmptyDirectories(
+            ListFilesAndEmptyDirectoriesTestSpec test, @TempDir Path root) throws IOException {
+        test.run(root);
+    }
+
+    @Test
+    void test_DirectoryListing_listFilesAndEmptyDirectories_negative(@TempDir Path root) throws IOException {
+        assertThrowsExactly(IllegalArgumentException.class, () -> {
+            TempDirectory.DirectoryListing.listFilesAndEmptyDirectories(root, -1);
+        });
+    }
+
+    @ParameterizedTest
+    @CsvSource({"100", "101", "1", "0"})
+    void test_DirectoryListing_listFilesAndEmptyDirectories_nonexistent(int limit, @TempDir Path root) throws IOException {
+
+        var path = root.resolve("foo");
+
+        var listing = TempDirectory.DirectoryListing.listFilesAndEmptyDirectories(path, limit);
+        assertTrue(listing.complete());
+
+        List<Path> expected;
+        if (limit == 0) {
+            expected = List.of();
+        } else {
+            expected = List.of(path);
+        }
+        assertEquals(expected, listing.paths());
+    }
+
+    private static Stream<CloseType> test_close() {
+        switch (PathDeletionPreventer.DEFAULT.implementation()) {
+            case READ_ONLY_NON_EMPTY_DIRECTORY -> {
+                return Stream.of(CloseType.values());
+            }
+            default -> {
+                return Stream.of(CloseType.values())
+                        .filter(Predicate.not(Set.of(
+                                CloseType.FAIL_NO_LEFTOVER_FILES,
+                                CloseType.FAIL_NO_LEFTOVER_FILES_VERBOSE)::contains));
+            }
+        }
+    }
+
+    @SuppressWarnings({ "try" })
+    private void test_close_impl(CloseType closeType, Path root) throws IOException {
+        var logSink = new StringWriter();
+        var logPrintWriter = new PrintWriter(logSink, true);
+        Globals.instance().loggerOutputStreams(logPrintWriter, logPrintWriter);
+        if (closeType.isVerbose()) {
+            Globals.instance().loggerVerbose();
+        }
+
+        final var workDir = root.resolve("workdir");
+        Files.createDirectories(workDir);
+
+        final Path leftoverPath;
+        final TempDirectory tempDir;
+
+        switch (closeType) {
+            case FAIL_NO_LEFTOVER_FILES_VERBOSE, FAIL_NO_LEFTOVER_FILES -> {
+                leftoverPath = workDir;
+                tempDir = new TempDirectory(workDir, true, new RetryExecutorFactory() {
+                    @Override
+                    public <T, E extends Exception> RetryExecutor<T, E> retryExecutor(Class<? extends E> exceptionType) {
+                        return new RetryExecutor<T, E>(exceptionType).setSleepFunction(_ -> {});
+                    }
+                });
+
+                // Lock the parent directory of the work directory and don't create any files in the work directory.
+                // This should trigger the error message about the failure to delete the empty work directory.
+                try (var lockWorkDir = ReadOnlyDirectoryPathDeletionPreventer.INSTANCE.preventPathDeletion(workDir.getParent())) {
+                    tempDir.close();
+                }
+            }
+            default -> {
+                Files.createFile(workDir.resolve("b"));
+
+                final var lockedPath = workDir.resolve("a");
+                switch (PathDeletionPreventer.DEFAULT.implementation()) {
+                    case FILE_CHANNEL_LOCK -> {
+                        Files.createFile(lockedPath);
+                        leftoverPath = lockedPath;
+                    }
+                    case READ_ONLY_NON_EMPTY_DIRECTORY -> {
+                        Files.createDirectories(lockedPath);
+                        leftoverPath = lockedPath.resolve("a");
+                        Files.createFile(leftoverPath);
+                    }
+                    default -> {
+                        throw new AssertionError();
+                    }
+                }
+
+                tempDir = new TempDirectory(workDir, true, new RetryExecutorFactory() {
+                    @Override
+                    public <T, E extends Exception> RetryExecutor<T, E> retryExecutor(Class<? extends E> exceptionType) {
+                        var config = new RetryExecutorMock.Config(lockedPath, closeType.isSuccess());
+                        return new RetryExecutorMock<>(exceptionType, config);
+                    }
+                });
+
+                tempDir.close();
+            }
+        }
+
+        logPrintWriter.flush();
+        var logMessages = new BufferedReader(new StringReader(logSink.toString())).lines().toList();
+
+        assertTrue(Files.isDirectory(root));
+
+        if (closeType.isSuccess()) {
+            assertFalse(Files.exists(tempDir.path()));
+            assertEquals(List.of(), logMessages);
+        } else {
+            assertTrue(Files.isDirectory(tempDir.path()));
+            assertTrue(Files.exists(leftoverPath));
+            assertFalse(Files.exists(tempDir.path().resolve("b")));
+
+            String errMessage;
+            switch (closeType) {
+                case FAIL_SOME_LEFTOVER_FILES_VERBOSE, FAIL_SOME_LEFTOVER_FILES -> {
+                    errMessage = "warning.tempdir.cleanup-file-failed";
+                }
+                case FAIL_NO_LEFTOVER_FILES_VERBOSE, FAIL_NO_LEFTOVER_FILES -> {
+                    errMessage = "warning.tempdir.cleanup-failed";
+                }
+                default -> {
+                    throw new AssertionError();
+                }
+            }
+            assertEquals(List.of(I18N.format(errMessage, leftoverPath)), logMessages.subList(0, 1));
+
+            if (closeType.isVerbose()) {
+                // Check the log contains a stacktrace
+                assertNotEquals(1, logMessages.size());
+            }
+            FileUtils.deleteRecursive(tempDir.path());
+        }
+    }
+
+    private static Collection<ListFilesAndEmptyDirectoriesTestSpec> test_DirectoryListing_listFilesAndEmptyDirectories() {
+
+        var testCases = new ArrayList<ListFilesAndEmptyDirectoriesTestSpec>();
+
+        Supplier<ListFilesAndEmptyDirectoriesTestSpec.Builder> builder = ListFilesAndEmptyDirectoriesTestSpec::build;
+
+        Stream.of(
+                builder.get().dirs("").complete(),
+                builder.get().dirs("").limit(0),
+                builder.get().dirs("foo").complete(),
+                builder.get().dirs("foo").limit(0),
+                builder.get().dirs("foo").limit(1).complete(),
+                builder.get().dirs("foo").limit(2).complete(),
+                builder.get().dirs("a/b/c").files("foo").files("b/b", "b/c").complete(),
+                builder.get().dirs("a/b/c").files("foo").files("b/b", "b/c").limit(4).complete(),
+                builder.get().dirs("a/b/c").files("foo").files("b/b", "b/c").limit(3)
+        ).map(ListFilesAndEmptyDirectoriesTestSpec.Builder::create).forEach(testCases::add);
+
+        if (!OperatingSystem.isWindows()) {
+            Stream.of(
+                    // A directory with the sibling symlink pointing to this directory
+                    builder.get().dirs("foo").symlink("foo-symlink", "foo").complete(),
+                    // A file with the sibling symlink pointing to this file
+                    builder.get().symlink("foo-symlink", "foo").files("foo").complete(),
+                    // A dangling symlink
+                    builder.get().nonexistent("foo/bar/buz").symlink("dangling-symlink", "foo/bar/buz").complete()
+            ).map(ListFilesAndEmptyDirectoriesTestSpec.Builder::create).forEach(testCases::add);
+        }
+
+        return testCases;
+    }
+
+    enum CloseType {
+        SUCCEED,
+        FAIL_SOME_LEFTOVER_FILES,
+        FAIL_SOME_LEFTOVER_FILES_VERBOSE,
+        FAIL_NO_LEFTOVER_FILES,
+        FAIL_NO_LEFTOVER_FILES_VERBOSE,
+        ;
+
+        boolean isSuccess() {
+            return this == SUCCEED;
+        }
+
+        boolean isVerbose() {
+            return name().endsWith("_VERBOSE");
+        }
+    }
+
+    private static final class RetryExecutorMock<T, E extends Exception> extends RetryExecutor<T, E> {
+
+        RetryExecutorMock(Class<? extends E> exceptionType, Config config) {
+            super(exceptionType);
+            setSleepFunction(_ -> {});
+            this.config = Objects.requireNonNull(config);
+        }
+
+        @SuppressWarnings({ "try", "unchecked" })
+        @Override
+        public RetryExecutor<T,E> setExecutable(ThrowingFunction<Context<RetryExecutor<T, E>>, T, E> v) {
+            return super.setExecutable(context -> {
+                if (context.isLastAttempt() && config.unlockOnLastAttempt()) {
+                    return v.apply(context);
+                } else {
+                    try (var lock = PathDeletionPreventer.DEFAULT.preventPathDeletion(config.lockedPath())) {
+                        return v.apply(context);
+                    } catch (IOException ex) {
+                        if (exceptionType().isInstance(ex)) {
+                            throw (E)ex;
+                        } else {
+                            throw new AssertionError();
+                        }
+                    }
+                }
+            });
+        };
+
+        private final Config config;
+
+        record Config(Path lockedPath, boolean unlockOnLastAttempt) {
+            Config {
+                Objects.requireNonNull(lockedPath);
+            }
+        }
+    }
+
+    sealed interface FileSpec extends Comparable<FileSpec> {
+        Path path();
+        Path create(Path root) throws IOException;
+        public default int compareTo(FileSpec other) {
+            return path().compareTo(other.path());
+        }
+
+        static File file(Path path) {
+            return new File(path);
+        }
+
+        static Directory dir(Path path) {
+            return new Directory(path);
+        }
+
+        static Nonexistent nonexistent(Path path) {
+            return new Nonexistent(path);
+        }
+
+        static Symlink symlink(Path path, FileSpec target) {
+            return new Symlink(path, target);
+        }
+    };
+
+    record File(Path path) implements FileSpec {
+        File {
+            path = normalizePath(path);
+            if (path.getNameCount() == 0) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        @Override
+        public Path create(Path root) throws IOException {
+            var resolvedPath = root.resolve(path);
+            if (!Files.isRegularFile(resolvedPath)) {
+                Files.createDirectories(resolvedPath.getParent());
+                Files.createFile(resolvedPath);
+            }
+            return resolvedPath;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("f:%s", path);
+        }
+    }
+
+    record Nonexistent(Path path) implements FileSpec {
+        Nonexistent {
+            path = normalizePath(path);
+            if (path.getNameCount() == 0) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        @Override
+        public Path create(Path root) throws IOException {
+            return root.resolve(path);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("x:%s", path);
+        }
+    }
+
+    record Symlink(Path path, FileSpec target) implements FileSpec {
+        Symlink {
+            path = normalizePath(path);
+            if (path.getNameCount() == 0) {
+                throw new IllegalArgumentException();
+            }
+            Objects.requireNonNull(target);
+        }
+
+        @Override
+        public Path create(Path root) throws IOException {
+            var resolvedPath = root.resolve(path);
+            var targetPath = target.create(root);
+            Files.createDirectories(resolvedPath.getParent());
+            return Files.createSymbolicLink(resolvedPath, targetPath);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("s:%s->%s", path, target);
+        }
+    }
+
+    record Directory(Path path) implements FileSpec {
+        Directory {
+            path = normalizePath(path);
+        }
+
+        @Override
+        public Path create(Path root) throws IOException {
+            return Files.createDirectories(root.resolve(path));
+        }
+
+        @Override
+        public String toString() {
+            return String.format("d:%s", path);
+        }
+    }
+
+    private static Path normalizePath(Path path) {
+        path = path.normalize();
+        if (path.isAbsolute()) {
+            throw new IllegalArgumentException();
+        }
+        return path;
+    }
+
+    private record ListFilesAndEmptyDirectoriesTestSpec(Set<FileSpec> input, int limit, boolean complete) {
+
+        ListFilesAndEmptyDirectoriesTestSpec {
+            Objects.requireNonNull(input);
+
+            if (!(input instanceof SortedSet)) {
+                input = new TreeSet<>(input);
+            }
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static final class Builder {
+
+            ListFilesAndEmptyDirectoriesTestSpec create() {
+                return new ListFilesAndEmptyDirectoriesTestSpec(Set.copyOf(input), limit, complete);
+            }
+
+            Builder files(String... paths) {
+                Stream.of(paths).map(Path::of).map(FileSpec::file).forEach(input::add);
+                return this;
+            }
+
+            Builder dirs(String... paths) {
+                Stream.of(paths).map(Path::of).map(FileSpec::dir).forEach(input::add);
+                return this;
+            }
+
+            Builder nonexistent(String... paths) {
+                Stream.of(paths).map(Path::of).map(FileSpec::nonexistent).forEach(input::add);
+                return this;
+            }
+
+            Builder symlink(String path, String target) {
+                Objects.requireNonNull(target);
+
+                var targetSpec = input.stream().filter(v -> {
+                    return v.path().equals(Path.of(target));
+                }).findFirst();
+
+                if (targetSpec.isEmpty()) {
+                    var v = FileSpec.file(Path.of(target));
+                    input.add(v);
+                    targetSpec = Optional.ofNullable(v);
+                }
+
+                input.add(FileSpec.symlink(Path.of(path), targetSpec.get()));
+
+                return this;
+            }
+
+            Builder limit(int v) {
+                limit = v;
+                return this;
+            }
+
+            Builder complete(boolean v) {
+                complete = v;
+                return this;
+            }
+
+            Builder complete() {
+                return complete(true);
+            }
+
+            private final Set<FileSpec> input = new HashSet<>();
+            private int limit = Integer.MAX_VALUE;
+            private boolean complete;
+        }
+
+        void run(Path root) throws IOException {
+            for (var v : input) {
+                v.create(root);
+            }
+
+            for (var v : input) {
+                Predicate<Path> validator;
+                switch (v) {
+                    case File _ -> {
+                        validator = Files::isRegularFile;
+                    }
+                    case Directory _ -> {
+                        validator = Files::isDirectory;
+                    }
+                    case Symlink _ -> {
+                        validator = Files::isSymbolicLink;
+                    }
+                    case Nonexistent _ -> {
+                        validator = Predicate.not(Files::exists);
+                    }
+                }
+                assertTrue(validator.test(root.resolve(v.path())));
+            }
+
+            var listing = TempDirectory.DirectoryListing.listFilesAndEmptyDirectories(root, limit);
+            assertEquals(complete, listing.complete());
+
+            if (complete) {
+                var actual = listing.paths().stream().peek(p -> {
+                    assertTrue(p.startsWith(root));
+                }).map(root::relativize).sorted().toList();
+                var expected = input.stream()
+                        .filter(Predicate.not(Nonexistent.class::isInstance))
+                        .map(FileSpec::path)
+                        .sorted()
+                        .toList();
+                assertEquals(expected, actual);
+            } else {
+                assertEquals(limit, listing.paths().size());
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s; limit=%d; complete=%s", input, limit, complete);
+        }
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
index 365a8a50b33..1c06d592006 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 package jdk.jpackage.internal.cli;
 
+import static jdk.jpackage.internal.model.ExecutableAttributesWithCapturedOutput.augmentResultWithOutput;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -37,25 +38,40 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
+import java.util.spi.ToolProvider;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.Globals;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.ExecutableAttributesWithCapturedOutput;
 import jdk.jpackage.internal.model.JPackageException;
+import jdk.jpackage.internal.model.SelfContainedException;
+import jdk.jpackage.internal.util.CommandOutputControl;
+import jdk.jpackage.internal.util.CommandOutputControl.UnexpectedExitCodeException;
+import jdk.jpackage.internal.util.CommandOutputControl.UnexpectedResultException;
+import jdk.jpackage.internal.util.IdentityWrapper;
 import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.test.Annotations;
+import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JUnitAdapter;
 import jdk.jpackage.test.TKit;
+import jdk.jpackage.test.mock.CommandActionSpecs;
+import jdk.jpackage.test.mock.Script;
+import jdk.jpackage.test.mock.VerbatimCommandMock;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-public class MainTest extends JUnitAdapter.TestSrcInitializer {
+public class MainTest extends JUnitAdapter {
 
     @ParameterizedTest
     @MethodSource
@@ -78,6 +94,70 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
         assertNotEquals(str, msg);
     }
 
+    /**
+     * Run app image packaging and simulate jlink failure.
+     * <p>
+     * The test verifies that jpackage prints an error message with jlink exit code,
+     * command line, and output.
+     */
+    @Annotations.Test
+    public void testFailedCommandOutput() {
+
+        var jlinkMockExitCode = 17;
+
+        var jlinkArgs = new ArrayList<String>();
+
+        var jlinkMock = CommandActionSpecs.build()
+                .stdout("It").stderr("fell").stdout("apart")
+                .argsListener(jlinkArgs::addAll)
+                .exit(jlinkMockExitCode).create().toCommandMockBuilder().name("jlink-mock").create();
+
+        var script = Script.build()
+                // Replace jlink with the mock.
+                .map(Script.cmdlineStartsWith("jlink"), jlinkMock)
+                // Don't mock other external commands.
+                .map(_ -> true, VerbatimCommandMock.INSTANCE)
+                .createLoop();
+
+        var jpackageExitCode = 1;
+
+        var jpackageToolProviderMock = new ToolProvider() {
+            @Override
+            public int run(PrintWriter out, PrintWriter err, String... args) {
+               return Globals.main(() -> {
+                   JPackageMockUtils.buildJPackage().script(script).applyToGlobals();
+
+                    var result = ExecutionResult.create(args);
+
+                    var jlinkMockAttrs = new CommandOutputControl.ToolProviderAttributes(jlinkMock.name(), jlinkArgs);
+
+                    result.stdout().forEach(out::println);
+                    result.stderr().forEach(err::println);
+
+                    assertEquals(jpackageExitCode, result.exitCode());
+                    assertEquals(List.of(), result.stdout());
+                    assertEquals(List.of(
+                            I18N.format("message.error-header", I18N.format("error.command-failed-unexpected-exit-code",
+                                    jlinkMockExitCode, jlinkMockAttrs.printableCommandLine())),
+                            I18N.format("message.failed-command-output-header"),
+                            "It", "fell", "apart"), result.stderr());
+
+                    return jpackageExitCode;
+                });
+            }
+
+            @Override
+            public String name() {
+                return "jpackage-mock";
+            }
+        };
+
+        JPackageCommand.helloAppImage()
+                .ignoreDefaultVerbose(true)
+                .useToolProvider(jpackageToolProviderMock)
+                .execute(jpackageExitCode);
+    }
+
     private static Collection<TestSpec> testOutput() {
         return Stream.of(
                 // Print the tool version
@@ -103,71 +183,157 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
         ).map(TestSpec.Builder::create).toList();
     }
 
-
     private static List<ErrorReporterTestSpec> test_ErrorReporter() {
-        var data = new ArrayList<ErrorReporterTestSpec>();
-
+        var testCases = new ArrayList<ErrorReporterTestSpec>();
         for (var verbose : List.of(true, false)) {
-            for (var makeCause : List.<UnaryOperator<Exception>>of(
-                    ex -> ex,
-                    // UncheckedIOException
-                    ex -> {
-                        if (ex instanceof IOException ioex) {
-                            return new UncheckedIOException(ioex);
-                        } else {
-                            return null;
-                        }
-                    },
-                    // ExceptionBox
-                    ex -> {
-                        var rex = ExceptionBox.toUnchecked(ex);
-                        if (rex != ex) {
-                            return rex;
-                        } else {
-                            return null;
-                        }
-                    }
-            )) {
-                for (var expect : List.of(
-                        Map.entry(new IOException("I/O error"), true),
-                        Map.entry(new NullPointerException(), true),
-                        Map.entry(new JPackageException("Kaput!"), false),
-                        Map.entry(new ConfigException("It is broken", "Fix it!"), false),
-                        Map.entry(new ConfigException("It is broken. No advice how to fix it", (String)null), false),
-                        Map.entry(new Utils.ParseException("Malformed command line"), false),
-                        Map.entry(new StandardOption.AddLauncherIllegalArgumentException("Malformed value of --add-launcher option"), false)
-                )) {
-                    var cause = makeCause.apply(expect.getKey());
-                    if (cause == null) {
-                        continue;
-                    }
-
-                    var expectedOutput = new ArrayList<ExceptionFormatter>();
-                    if (expect.getValue()) {
-                        // An alien exception.
-                        expectedOutput.add(ExceptionFormatter.STACK_TRACE);
-                        expectedOutput.add(ExceptionFormatter.TO_STRING);
-                    } else {
-                        if (verbose) {
-                            expectedOutput.add(ExceptionFormatter.STACK_TRACE);
-                        }
-                        if (expect.getKey() instanceof ConfigException cex) {
-                            if (cex.getAdvice() != null) {
-                                expectedOutput.add(ExceptionFormatter.MESSAGE_WITH_ADVICE);
-                            } else {
-                                expectedOutput.add(ExceptionFormatter.GET_MESSAGE);
-                            }
-                        } else {
-                            expectedOutput.add(ExceptionFormatter.GET_MESSAGE);
-                        }
-                    }
-
-                    data.add(new ErrorReporterTestSpec(cause, expect.getKey(), verbose, expectedOutput));
-                }
-            }
+            test_ErrorReporter_Exception(verbose, testCases::add);
+            test_ErrorReporter_UnexpectedResultException(verbose, testCases::add);
+            test_ErrorReporter_suppressedExceptions(verbose, testCases::add);
         }
 
-        return data;
+        return testCases;
+    }
+
+    private static void test_ErrorReporter_Exception(boolean verbose, Consumer<ErrorReporterTestSpec> sink) {
+
+        for (var makeCause : List.<UnaryOperator<Exception>>of(
+                ex -> ex,
+                // UncheckedIOException
+                ex -> {
+                    if (ex instanceof IOException ioex) {
+                        return new UncheckedIOException(ioex);
+                    } else {
+                        return null;
+                    }
+                },
+                // ExceptionBox
+                ex -> {
+                    var rex = ExceptionBox.toUnchecked(ex);
+                    if (rex != ex) {
+                        return rex;
+                    } else {
+                        return null;
+                    }
+                }
+        )) {
+            for (var expect : List.of(
+                    new IOException("I/O error"),
+                    new NullPointerException(),
+                    new JPackageException("Kaput!"),
+                    new ConfigException("It is broken", "Fix it!"),
+                    new ConfigException("It is broken. No advice how to fix it", (String)null),
+                    new Utils.ParseException("Malformed command line"),
+                    new StandardOption.AddLauncherIllegalArgumentException("Malformed value of --add-launcher option")
+            )) {
+                var cause = makeCause.apply(expect);
+                if (cause == null) {
+                    continue;
+                }
+
+                var expectedOutput = new ArrayList<ExceptionFormatter>();
+                ErrorReporterTestSpec.expectExceptionFormatters(expect, verbose, expectedOutput::add);
+                sink.accept(ErrorReporterTestSpec.create(cause, expect, verbose, expectedOutput));
+            }
+        }
+    }
+
+    private static void test_ErrorReporter_UnexpectedResultException(boolean verbose, Consumer<ErrorReporterTestSpec> sink) {
+
+        var execAttrs = new CommandOutputControl.ProcessAttributes(Optional.of(12345L), List.of("foo", "--bar"));
+
+        for (var makeCause : List.<UnaryOperator<Exception>>of(
+                ex -> ex,
+                ExceptionBox::toUnchecked
+        )) {
+
+            for (var expect : List.of(
+                    augmentResultWithOutput(
+                            CommandOutputControl.Result.build().exitCode(135).execAttrs(execAttrs).create(),
+                            "The quick brown fox\njumps over the lazy dog"
+                    ).unexpected("Kaput!"),
+                    new UnexpectedExitCodeException(augmentResultWithOutput(
+                            CommandOutputControl.Result.build().exitCode(135).create(),
+                            "The quick brown fox\njumps"
+                    )),
+                    augmentResultWithOutput(
+                            CommandOutputControl.Result.build().create(),
+                            "The quick brown fox\njumps"
+                    ).unexpected("Timed out!")
+            )) {
+                var cause = makeCause.apply(expect);
+                var expectedOutput = new ArrayList<ExceptionFormatter>();
+                ErrorReporterTestSpec.expectExceptionFormatters(expect, verbose, expectedOutput::add);
+                sink.accept(ErrorReporterTestSpec.create(cause, expect, verbose, expectedOutput));
+            }
+        }
+    }
+
+    private static Exception suppressException(Exception main, Exception suppressed) {
+        Objects.requireNonNull(main);
+        Objects.requireNonNull(suppressed);
+
+        try (var autoCloseable = new AutoCloseable() {
+
+            @Override
+            public void close() throws Exception {
+                throw suppressed;
+            }}) {
+
+            throw main;
+        } catch (Exception ex) {
+            return ex;
+        }
+    }
+
+    private static void test_ErrorReporter_suppressedExceptions(boolean verbose, Consumer<ErrorReporterTestSpec> sink) {
+
+        var execAttrs = new CommandOutputControl.ProcessAttributes(Optional.of(567L), List.of("foo", "--bar"));
+
+        Supplier<Exception> createUnexpectedResultException = () -> {
+            return augmentResultWithOutput(
+                    CommandOutputControl.Result.build().exitCode(7).execAttrs(execAttrs).create(),
+                    "The quick brown fox\njumps over the lazy dog"
+            ).unexpected("Alas");
+        };
+
+        for (var makeCause : List.<UnaryOperator<Exception>>of(
+                ex -> ex,
+                ex -> {
+                    var rex = ExceptionBox.toUnchecked(ex);
+                    if (rex != ex) {
+                        return rex;
+                    } else {
+                        return null;
+                    }
+                }
+        )) {
+
+            for (var exceptions : List.of(
+                    List.<Exception>of(new JPackageException("Kaput!"), new JPackageException("Suppressed kaput")),
+                    List.<Exception>of(new Exception("Kaput!"), new JPackageException("Suppressed kaput")),
+                    List.<Exception>of(new Exception("Kaput!"), new Exception("Suppressed kaput")),
+                    List.<Exception>of(new Exception("Kaput!"), ExceptionBox.toUnchecked(new Exception("Suppressed kaput"))),
+                    List.<Exception>of(createUnexpectedResultException.get(), new Exception("Suppressed kaput")),
+                    List.<Exception>of(new Exception("Alas!"), createUnexpectedResultException.get()),
+                    List.<Exception>of(new JPackageException("Alas!"), createUnexpectedResultException.get())
+            )) {
+                var main = exceptions.getFirst();
+                var suppressed = exceptions.getLast();
+
+                var cause = makeCause.apply(suppressException(main, suppressed));
+
+                if (cause == null) {
+                    continue;
+                }
+
+                var expectedOutput = new ArrayList<FormattedException>();
+
+                ErrorReporterTestSpec.expectOutputFragments(ExceptionBox.unbox(suppressed), verbose, expectedOutput::add);
+                ErrorReporterTestSpec.expectOutputFragments(main, verbose, expectedOutput::add);
+
+                sink.accept(new ErrorReporterTestSpec(cause, verbose, expectedOutput));
+            }
+        }
     }
 
 
@@ -333,6 +499,19 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
     }
 
 
+    private record FormattedException(ExceptionFormatter formatter, Exception exception) {
+
+        FormattedException {
+            Objects.requireNonNull(formatter);
+            Objects.requireNonNull(exception);
+        }
+
+        String format() {
+            return formatter.format(exception);
+        }
+    }
+
+
     private enum ExceptionFormatter {
         GET_MESSAGE(errorMessage(Exception::getMessage)),
         MESSAGE_WITH_ADVICE(ex -> {
@@ -350,7 +529,24 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
                 ex.printStackTrace(pw);
             }
             return sink.toString();
-        })
+        }),
+        FAILED_COMMAND_OUTPUT(ex -> {
+            var result = failedCommandResult(ex);
+            var commandOutput = ((ExecutableAttributesWithCapturedOutput)result.execAttrs()).printableOutput();
+
+            var sink = new StringWriter();
+            var pw = new PrintWriter(sink);
+
+            pw.println(I18N.format("message.failed-command-output-header"));
+            try (var lines = new BufferedReader(new StringReader(commandOutput)).lines()) {
+                lines.forEach(pw::println);
+            }
+
+            return sink.toString();
+        }),
+        FAILED_COMMAND_UNEXPECTED_OUTPUT_MESSAGE(errorMessage(CommandFailureType.UNEXPECTED_OUTPUT::getMessage)),
+        FAILED_COMMAND_UNEXPECTED_EXIT_CODE_MESSAGE(errorMessage(CommandFailureType.UNEXPECTED_EXIT_CODE::getMessage)),
+        FAILED_COMMAND_TIMEDOUT_MESSAGE(errorMessage(CommandFailureType.TIMEDOUT::getMessage)),
         ;
 
         ExceptionFormatter(Function<Exception, String> formatter) {
@@ -361,6 +557,10 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
             return formatter.apply(v);
         }
 
+        FormattedException bind(Exception v) {
+            return new FormattedException(this, v);
+        }
+
         private static Function<Exception, String> errorMessage(Function<Exception, String> formatter) {
             Objects.requireNonNull(formatter);
             return ex -> {
@@ -369,33 +569,139 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
             };
         }
 
+        private static CommandOutputControl.Result failedCommandResult(Exception ex) {
+            Objects.requireNonNull(ex);
+            if (ex instanceof UnexpectedResultException urex) {
+                return urex.getResult();
+            } else {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        private enum CommandFailureType {
+            UNEXPECTED_OUTPUT,
+            UNEXPECTED_EXIT_CODE,
+            TIMEDOUT,
+            ;
+
+            String getMessage(Exception ex) {
+                var result = failedCommandResult(ex);
+                var printableCommandLine = result.execAttrs().printableCommandLine();
+                switch (this) {
+                    case TIMEDOUT -> {
+                        return I18N.format("error.command-failed-timed-out", printableCommandLine);
+                    }
+                    case UNEXPECTED_EXIT_CODE -> {
+                        return I18N.format("error.command-failed-unexpected-exit-code", result.getExitCode(), printableCommandLine);
+                    }
+                    case UNEXPECTED_OUTPUT -> {
+                        return I18N.format("error.command-failed-unexpected-output", printableCommandLine);
+                    }
+                    default -> {
+                        // Unreachable
+                        throw ExceptionBox.reachedUnreachable();
+                    }
+                }
+            }
+        }
+
         private final Function<Exception, String> formatter;
     }
 
 
-    record ErrorReporterTestSpec(Exception cause, Exception expect, boolean verbose, List<ExceptionFormatter> expectOutput) {
+    record ErrorReporterTestSpec(Exception cause, boolean verbose, List<FormattedException> expectOutput) {
 
         ErrorReporterTestSpec {
             Objects.requireNonNull(cause);
-            Objects.requireNonNull(expect);
             Objects.requireNonNull(expectOutput);
+            if (expectOutput.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
         }
 
-        ErrorReporterTestSpec(Exception cause, boolean verbose, List<ExceptionFormatter> expectOutput) {
-            this(cause, cause, verbose, expectOutput);
+        static ErrorReporterTestSpec create(
+                Exception cause, boolean verbose, List<ExceptionFormatter> expectOutput) {
+            return create(cause, cause, verbose, expectOutput);
+        }
+
+        static ErrorReporterTestSpec create(
+                Exception cause, Exception expect, boolean verbose, List<ExceptionFormatter> expectOutput) {
+            Objects.requireNonNull(cause);
+            Objects.requireNonNull(expect);
+            return new ErrorReporterTestSpec(cause, verbose, expectOutput.stream().map(formatter -> {
+                return new FormattedException(formatter, expect);
+            }).toList());
+        }
+
+        static void expectExceptionFormatters(Exception ex, boolean verbose, Consumer<ExceptionFormatter> sink) {
+            Objects.requireNonNull(ex);
+            Objects.requireNonNull(sink);
+
+            final var isSelfContained = (ex.getClass().getAnnotation(SelfContainedException.class) != null);
+
+            if (verbose || !(isSelfContained || ex instanceof UnexpectedResultException)) {
+                sink.accept(ExceptionFormatter.STACK_TRACE);
+            }
+
+            switch (ex) {
+                case ConfigException cex -> {
+                    if (cex.getAdvice() != null) {
+                        sink.accept(ExceptionFormatter.MESSAGE_WITH_ADVICE);
+                    } else {
+                        sink.accept(ExceptionFormatter.GET_MESSAGE);
+                    }
+                }
+                case UnexpectedResultException urex -> {
+                    if (urex instanceof UnexpectedExitCodeException) {
+                        sink.accept(ExceptionFormatter.FAILED_COMMAND_UNEXPECTED_EXIT_CODE_MESSAGE);
+                    } else if (urex.getResult().exitCode().isPresent()) {
+                        sink.accept(ExceptionFormatter.FAILED_COMMAND_UNEXPECTED_OUTPUT_MESSAGE);
+                    } else {
+                        sink.accept(ExceptionFormatter.FAILED_COMMAND_TIMEDOUT_MESSAGE);
+                    }
+                    sink.accept(ExceptionFormatter.FAILED_COMMAND_OUTPUT);
+                }
+                default -> {
+                    if (isSelfContained) {
+                        sink.accept(ExceptionFormatter.GET_MESSAGE);
+                    } else {
+                        sink.accept(ExceptionFormatter.TO_STRING);
+                    }
+                }
+            }
+        }
+
+        static void expectOutputFragments(Exception ex, boolean verbose, Consumer<FormattedException> sink) {
+            Objects.requireNonNull(sink);
+            expectExceptionFormatters(ex, verbose, formatter -> {
+                sink.accept(formatter.bind(ex));
+            });
         }
 
         @Override
         public String toString() {
             var tokens = new ArrayList<String>();
 
-            if (cause == expect) {
+            var expect = expectOutput.stream()
+                    .map(FormattedException::exception)
+                    .map(IdentityWrapper::new)
+                    .distinct()
+                    .toList();
+
+            if (expect.size() == 1 && expect.getFirst().value() == cause) {
                 tokens.add(cause.toString());
             } else {
-                tokens.add(String.format("[%s] => [%s]", cause, expect));
+                tokens.add(String.format("[%s] => %s", cause, expect.stream().map(IdentityWrapper::value).toList()));
             }
 
-            tokens.add(expectOutput.stream().map(Enum::name).collect(Collectors.joining("+")));
+            if (expect.size() == 1) {
+                tokens.add(expectOutput.stream().map(FormattedException::formatter).map(Enum::name).collect(Collectors.joining("+")));
+            } else {
+                tokens.add(expectOutput.stream().map(fragment -> {
+                    var idx = expect.indexOf(IdentityWrapper.wrapIdentity(fragment.exception()));
+                    return String.format("%s@%d", fragment.formatter(), idx);
+                }).collect(Collectors.joining("+")));
+            }
 
             if (verbose) {
                 tokens.add("verbose");
@@ -415,9 +721,7 @@ public class MainTest extends JUnitAdapter.TestSrcInitializer {
                 }, verbose).reportError(cause);
             }
 
-            var expected = expectOutput.stream().map(formatter -> {
-                return formatter.format(expect);
-            }).collect(Collectors.joining(""));
+            var expected = expectOutput.stream().map(FormattedException::format).collect(Collectors.joining(""));
 
             assertEquals(expected, sink.toString());
         }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
index 1849a3b5333..59c7c85ce85 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecMutatorOptionScopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,11 +75,11 @@ public class OptionSpecMutatorOptionScopeTest {
             assertEquals(OptionName.of("foo"), mappedSpec.name());
         }
 
-        assertEquals("731", mappedSpec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+        assertEquals("731", mappedSpec.convert(spec.name(), StringToken.of("str")).orElseThrow());
 
         assertEquals(OptionName.of("foo"), spec.name());
 
-        assertEquals("123", spec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+        assertEquals("123", spec.convert(spec.name(), StringToken.of("str")).orElseThrow());
     }
 
     @Test
@@ -99,11 +99,11 @@ public class OptionSpecMutatorOptionScopeTest {
 
         var mappedSpec = new DummyContext(731).mapOptionSpec(spec);
 
-        assertArrayEquals(new String[] {"731"}, mappedSpec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+        assertArrayEquals(new String[] {"731"}, mappedSpec.convert(spec.name(), StringToken.of("str")).orElseThrow());
 
         assertEquals(OptionName.of("foo"), spec.name());
 
-        assertArrayEquals(new String[] {"123"}, spec.converter().orElseThrow().convert(spec.name(), StringToken.of("str")).orElseThrow());
+        assertArrayEquals(new String[] {"123"}, spec.convert(spec.name(), StringToken.of("str")).orElseThrow());
 
     }
 
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
index a92c677d9cf..66bd44a2402 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,11 +293,11 @@ public class OptionSpecTest {
         return toOptionNames(List.of(names));
     }
 
-    private static <T> OptionValueConverter<T> converter(ValueConverter<T> conv) {
+    private static <T> OptionValueConverter<String, T> converter(ValueConverter<String, T> conv) {
         return buildConverter(conv).create();
     }
 
-    private static <T> OptionValueConverter.Builder<T> buildConverter(ValueConverter<T> conv) {
+    private static <T> OptionValueConverter.Builder<T> buildConverter(ValueConverter<String, T> conv) {
         return OptionValueConverter.<T>build().converter(conv);
     }
 
@@ -329,7 +329,7 @@ public class OptionSpecTest {
             return this;
         }
 
-        OptionSpecBuilder<T> converter(OptionValueConverter<T> v) {
+        OptionSpecBuilder<T> converter(OptionValueConverter<String, T> v) {
             converter = v;
             return this;
         }
@@ -355,7 +355,7 @@ public class OptionSpecTest {
         }
 
         private List<OptionName> names;
-        private OptionValueConverter<T> converter;
+        private OptionValueConverter<String, T> converter;
         private T defaultOptionalValue;
         private Set<OptionScope> scope = Set.of(new OptionScope() {});
         private MergePolicy mergePolicy = MergePolicy.USE_LAST;
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
index c026ee0639f..3d8f26523a0 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionValueConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,12 @@
  */
 package jdk.jpackage.internal.cli;
 
+import static jdk.jpackage.internal.cli.OptionValueConverter.convertString;
 import static jdk.jpackage.internal.cli.TestUtils.assertExceptionListEquals;
 import static jdk.jpackage.internal.cli.TestUtils.configureConverter;
 import static jdk.jpackage.internal.cli.TestUtils.configureValidator;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
@@ -33,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -55,10 +58,10 @@ public class OptionValueConverterTest {
 
         if (positive) {
             final var token = StringToken.of("758");
-            assertEquals(758, converter.convert(OptionName.of("number"), token).orElseThrow());
+            assertEquals(758, convertString(converter, OptionName.of("number"), token).orElseThrow());
         } else {
             final var token = StringToken.of("foo");
-            final var result = converter.convert(OptionName.of("number"), token);
+            final var result = convertString(converter, OptionName.of("number"), token);
 
             assertEquals(1, result.errors().size());
 
@@ -77,7 +80,7 @@ public class OptionValueConverterTest {
                 .converter(ValueConverter.create(Integer::valueOf, Integer.class)).create();
 
         Function<String, Result<Integer>> convertString = (v) -> {
-            return converter.convert(OptionName.of("foo"), StringToken.of(v));
+            return convertString(converter, OptionName.of("foo"), StringToken.of(v));
         };
 
         assertEquals(10, convertString.apply("10").orElseThrow());
@@ -89,24 +92,32 @@ public class OptionValueConverterTest {
     public void test_Builder_invalid() {
 
         assertThrowsExactly(NullPointerException.class, OptionValueConverter.build()
-                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
+                .converter(phonyConverter(Integer.class))
                 .mutate(configureConverter())
                 .formatString(null)::create);
 
         assertThrowsExactly(NullPointerException.class, OptionValueConverter.build()
-                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
+                .converter(phonyConverter(Integer.class))
                 .mutate(configureConverter())
                 .exceptionFactory(null)::create);
     }
 
-    @Test
-    public void test_Builder_copy() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_Builder_copy(boolean twoStep) {
 
         Function<String, String[]> tokenizer = _ -> { throw new UnsupportedOperationException(); };
 
-        var builder = OptionValueConverter.<Integer>build()
-                .converter(ValueConverter.create(Integer::valueOf, Integer.class))
-                .validator(Validator.<Integer, RuntimeException>build().predicate(_ -> true).create())
+        final OptionValueConverter.Builder<Integer> builder;
+        if (twoStep) {
+            builder = OptionValueConverter.<Path>build()
+                    .converter(phonyConverter(Path.class))
+                    .map(phonyConverter(Integer.class));
+        } else {
+            builder = OptionValueConverter.<Integer>build().converter(phonyConverter(Integer.class));
+        }
+
+        builder.validator(Validator.<Integer, RuntimeException>build().predicate(_ -> true).create())
                 .mutate(configureConverter())
                 .tokenizer(tokenizer);
 
@@ -114,7 +125,10 @@ public class OptionValueConverterTest {
 
         assertNotSame(copy,  builder);
 
-        assertSame(builder.converter().orElse(null), copy.converter().orElse(null));
+        if (!twoStep) {
+            assertSame(builder.converter().orElse(null), copy.converter().orElse(null));
+        }
+
         assertSame(builder.formatString().orElse(null), copy.formatString().orElse(null));
         assertSame(builder.exceptionFactory().orElse(null), copy.exceptionFactory().orElse(null));
         assertSame(builder.tokenizer().orElse(null), copy.tokenizer().orElse(null));
@@ -125,6 +139,23 @@ public class OptionValueConverterTest {
         assertNotEquals(builder.formatString().orElse(null), copy.formatString().orElse(null));
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_Builder_hasConverter(boolean twoStep) {
+
+        if (twoStep) {
+            final var builder = OptionValueConverter.<Path>build()
+                    .converter(phonyConverter(Path.class))
+                    .map(phonyConverter(String.class));
+            assertTrue(builder.hasConverter());
+        } else {
+            final var builder = OptionValueConverter.<String>build();
+            assertFalse(builder.hasConverter());
+            builder.converter(phonyConverter(String.class));
+            assertTrue(builder.hasConverter());
+        }
+    }
+
     @Test
     public void test_Builder_createArray() {
 
@@ -134,7 +165,7 @@ public class OptionValueConverterTest {
                 .tokenizer(str -> str.split(":"))
                 .createArray();
 
-        assertNotEquals(List.of(100, 67, 145), List.of(converter.convert(OptionName.of("foo"), StringToken.of("110:67:145")).orElseThrow()));
+        assertNotEquals(List.of(100, 67, 145), List.of(convertString(converter, OptionName.of("foo"), StringToken.of("110:67:145")).orElseThrow()));
 
         assertEquals(Integer[].class, converter.valueType());
     }
@@ -170,7 +201,7 @@ public class OptionValueConverterTest {
 
         var converter = builder.createArray();
 
-        var result = converter.convert(OptionName.of("foo"), StringToken.of("100:-10:-10:67:str:145:-7"));
+        var result = convertString(converter, OptionName.of("foo"), StringToken.of("100:-10:-10:67:str:145:-7"));
 
         assertExceptionListEquals(Stream.of(
                 new IllegalArgumentException("-10"),
@@ -192,7 +223,7 @@ public class OptionValueConverterTest {
         }, Integer.class)).mutate(configureConverter()).create();
 
         final var token = StringToken.of("foo");
-        final var ex = assertThrowsExactly(ConverterException.class, () -> converter.convert(OptionName.of("number"), token));
+        final var ex = assertThrowsExactly(ConverterException.class, () -> convertString(converter, OptionName.of("number"), token));
 
         assertSame(exception, ex.getCause());
     }
@@ -209,8 +240,133 @@ public class OptionValueConverterTest {
         }).mutate(configureValidator()).create()).create();
 
         final var token = StringToken.of("100");
-        final var ex = assertThrowsExactly(ConverterException.class, () -> converter.convert(OptionName.of("number"), token));
+        final var ex = assertThrowsExactly(ConverterException.class, () -> convertString(converter, OptionName.of("number"), token));
 
         assertSame(exception, ex.getCause());
     }
+
+    @Test
+    public void testTwoStep() {
+
+        final var multiplyConverter = ValueConverter.<Integer, Long>create(v -> {
+            return (long)(v * -1);
+        }, Long.class);
+
+        final var converter = OptionValueConverter.<Integer>build()
+                .converter(ValueConverter.create(Integer::parseInt, Integer.class))
+                .map(multiplyConverter)
+                .create();
+
+        assertEquals(Long.class, converter.valueType());
+
+        var result = convertString(converter, OptionName.of("foo"), StringToken.of("123")).orElseThrow();
+        assertEquals(-123, result);
+    }
+
+    @Test
+    public void testMultiStep() {
+
+        final var converter = OptionValueConverter.<Path>build()
+                .converter(ValueConverter.create(Path::of, Path.class))
+                .map(ValueConverter.create(v -> {
+                    return v.normalize().toString();
+                }, String.class))
+                .map(ValueConverter.create(Integer::valueOf, Integer.class))
+                .create();
+
+        assertEquals(Integer.class, converter.valueType());
+
+        var result = convertString(converter, OptionName.of("foo"), StringToken.of("./123")).orElseThrow();
+        assertEquals(123, result);
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1, 2})
+    public void testTwoStep_map(int type) {
+
+        var tolower = ValueConverter.<String, String>create(String::toLowerCase, String.class);
+        var toupper = ValueConverter.<String, String>create(String::toUpperCase, String.class);
+        var reverse = ValueConverter.<String, String>create(str -> {
+            return new StringBuilder(str).reverse().toString();
+        }, String.class);
+
+        final var baseBuilder = OptionValueConverter.<String>build().converter(toupper);
+
+        switch (type) {
+            case 0 -> {
+                assertThrowsExactly(UnsupportedOperationException.class, () -> {
+                    baseBuilder.map(OptionValueConverter.<Object>build());
+                });
+            }
+            case 1 -> {
+                var builder = baseBuilder.map(reverse);
+                var ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+                    builder.map(OptionValueConverter.<Object>build().converter(phonyConverter(Object.class)));
+                });
+                assertEquals(String.format("Expected (%s); actual (%s)", String.class, Object.class), ex.getMessage());
+
+                assertEquals("CBA", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+
+                var copy = builder.map(baseBuilder);
+                assertNotSame(copy,  builder);
+                assertEquals("CBA", convertString(copy.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+                assertEquals("CBA", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+
+                copy = builder.map(baseBuilder.copy().converter(tolower));
+                assertNotSame(copy,  builder);
+                assertEquals("cba", convertString(copy.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+                assertEquals("CBA", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+            }
+            case 2 -> {
+                var builder = baseBuilder.map(reverse).map(reverse);
+                var ex = assertThrowsExactly(IllegalArgumentException.class, () -> {
+                    builder.map(OptionValueConverter.<Object>build().converter(phonyConverter(Object.class)));
+                });
+                assertEquals(String.format("Expected (%s); actual (%s)", String.class, Object.class), ex.getMessage());
+
+                assertEquals("ABC", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+
+                var copy = builder.map(baseBuilder.map(reverse));
+                assertNotSame(copy,  builder);
+                assertEquals("ABC", convertString(copy.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+                assertEquals("ABC", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+
+                copy = builder.map(baseBuilder.copy().converter(tolower).map(reverse));
+                assertNotSame(copy,  builder);
+                assertEquals("abc", convertString(copy.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+                assertEquals("ABC", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+
+                copy = builder.map(baseBuilder.copy().converter(tolower));
+                assertNotSame(copy,  builder);
+                assertEquals("cba", convertString(copy.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+                assertEquals("ABC", convertString(builder.create(), OptionName.of("foo"), StringToken.of("aBc")).orElseThrow());
+            }
+        }
+    }
+
+    @Test
+    public void testTwoStep_converter() {
+
+        final var builder = OptionValueConverter.<Path>build()
+                // Create the "String -> Path" converter
+                .converter(ValueConverter.create(Path::of, Path.class))
+                // Map the "String -> Path" converter into the "Path -> String" converter
+                .map(phonyConverter(String.class))
+                // Map the "Path -> String" converter into the "String -> String" converter
+                .map(phonyConverter(String.class));
+
+        assertThrowsExactly(UnsupportedOperationException.class, () -> {
+            builder.converter(phonyConverter(String.class));
+        });
+
+        assertThrowsExactly(UnsupportedOperationException.class, () -> {
+            builder.converter();
+        });
+    }
+
+    private static <T, U> ValueConverter<T, U> phonyConverter(Class<? extends U> valueType) {
+        return ValueConverter.create(v -> {
+            throw new AssertionError();
+        }, valueType);
+    }
 }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
index 07757211927..0b98c051238 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.excludes
@@ -1,12 +1,15 @@
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 0.2]; errors=[message.error-header+[message.version-string-first-number-not-zero], message.advice-header+[error.invalid-cfbundle-version.advice]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.2.3.4]; errors=[message.error-header+[message.version-string-too-many-components], message.advice-header+[error.invalid-cfbundle-version.advice]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.]; errors=[message.error-header+[error.version-string-zero-length-component, 1.], message.advice-header+[error.invalid-cfbundle-version.advice]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.]; errors=[message.error-header+[error.version-string-zero-length-component, 1.]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.b.3]; errors=[message.error-header+[error.version-string-invalid-component, 1.b.3, b.3], message.advice-header+[error.invalid-cfbundle-version.advice]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, 1.b.3]; errors=[message.error-header+[error.version-string-invalid-component, 1.b.3, b.3]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, ]; errors=[message.error-header+[error.version-string-empty], message.advice-header+[error.invalid-cfbundle-version.advice]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--app-version, ]; errors=[message.error-header+[error.version-string-empty]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --add-modules]; errors=[message.error-header+[error.blocked.option, --add-modules]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --module-path]; errors=[message.error-header+[error.blocked.option, --module-path]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--jlink-options, --output]; errors=[message.error-header+[error.blocked.option, --output]])
-ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--main-jar, non-existent.jar]; errors=[message.error-header+[error.main-jar-does-not-exist, non-existent.jar]])
+ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--main-jar, non-existent.jar]; find; errors=[message.error-header+[error.main-jar-does-not-exist, non-existent.jar]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@EMPTY_DIR@@, lib/**/libjli.dylib]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
 ErrorTest.test(IMAGE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_IMAGE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_IMAGE@@, lib/**/libjli.dylib]])
@@ -15,7 +18,7 @@ ErrorTest.test(IMAGE; args-add=[--module, com.foo.bar, --runtime-image, @@JAVA_H
 ErrorTest.test(IMAGE; args-add=[--module, java.base, --runtime-image, @@JAVA_HOME@@]; errors=[message.error-header+[ERR_NoMainClass]])
 ErrorTest.test(LINUX_DEB; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[message.error-header+[error.deb-invalid-value-for-package-name, #], message.advice-header+[error.deb-invalid-value-for-package-name.advice]])
 ErrorTest.test(LINUX_RPM; app-desc=Hello; args-add=[--linux-package-name, #]; errors=[message.error-header+[error.rpm-invalid-value-for-package-name, #], message.advice-header+[error.rpm-invalid-value-for-package-name.advice]])
-ErrorTest.test(MAC_PKG; app-desc=Hello; args-add=[--mac-package-identifier, #1]; errors=[message.error-header+[message.invalid-identifier, #1]])
+ErrorTest.test(MAC_PKG; app-desc=Hello; args-add=[--mac-package-identifier, #1]; errors=[message.error-header+[message.invalid-identifier, #1], message.advice-header+[message.invalid-identifier.advice]])
 ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--mac-app-store, --runtime-image, @@JAVA_HOME@@]; errors=[message.error-header+[error.invalid-runtime-image-bin-dir, @@JAVA_HOME@@], message.advice-header+[error.invalid-runtime-image-bin-dir.advice, --mac-app-store]])
 ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@EMPTY_DIR@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@EMPTY_DIR@@, lib/**/libjli.dylib]])
 ErrorTest.test(NATIVE; app-desc=Hello; args-add=[--runtime-image, @@INVALID_MAC_RUNTIME_BUNDLE@@]; errors=[message.error-header+[error.invalid-runtime-image-missing-file, @@INVALID_MAC_RUNTIME_BUNDLE@@, Contents/Home/lib/**/libjli.dylib]])
@@ -36,6 +39,16 @@ ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 1234]; errors=[
 ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--app-version, 256.1]; errors=[message.error-header+[error.msi-product-version-major-out-of-range, 256.1], message.advice-header+[error.version-string-wrong-format.advice]])
 ErrorTest.test(WIN_MSI; app-desc=Hello; args-add=[--launcher-as-service]; errors=[message.error-header+[error.missing-service-installer], message.advice-header+[error.missing-service-installer.advice]])
 ErrorTest.test(args-add=[@foo]; errors=[message.error-header+[ERR_CannotParseOptions, foo]])
+ErrorTest.testMacSignWithoutIdentity(IMAGE; app-desc=Hello; args-add=[--mac-sign, --mac-signing-keychain, @@EMPTY_KEYCHAIN@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, EMPTY_KEYCHAIN]])
+ErrorTest.testMacSignWithoutIdentity(IMAGE; args-add=[--app-image, @@APP_IMAGE_WITH_SHORT_NAME@@, --mac-sign, --mac-signing-keychain, @@EMPTY_KEYCHAIN@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, EMPTY_KEYCHAIN]])
+ErrorTest.testMacSignWithoutIdentity(MAC_DMG; app-desc=Hello; args-add=[--mac-sign, --mac-signing-keychain, @@EMPTY_KEYCHAIN@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, EMPTY_KEYCHAIN]])
+ErrorTest.testMacSignWithoutIdentity(MAC_DMG; args-add=[--app-image, @@APP_IMAGE_WITH_SHORT_NAME@@, --mac-sign, --mac-signing-keychain, @@EMPTY_KEYCHAIN@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, EMPTY_KEYCHAIN]])
+ErrorTest.testMacSignWithoutIdentity(MAC_PKG; app-desc=Hello; args-add=[--mac-sign, --mac-signing-keychain, @@EMPTY_KEYCHAIN@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, EMPTY_KEYCHAIN], message.error-header+[error.cert.not.found, INSTALLER, EMPTY_KEYCHAIN]])
+ErrorTest.testMacSignWithoutIdentity(MAC_PKG; app-desc=Hello; args-add=[--mac-sign, --mac-signing-keychain, @@KEYCHAIN_WITH_APP_IMAGE_CERT@@]; args-del=[--name]; errors=[message.error-header+[error.cert.not.found, INSTALLER, KEYCHAIN_WITH_APP_IMAGE_CERT]])
+ErrorTest.testMacSignWithoutIdentity(MAC_PKG; app-desc=Hello; args-add=[--mac-sign, --mac-signing-keychain, @@KEYCHAIN_WITH_PKG_CERT@@]; args-del=[--name]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, KEYCHAIN_WITH_PKG_CERT]])
+ErrorTest.testMacSignWithoutIdentity(MAC_PKG; args-add=[--app-image, @@APP_IMAGE_WITH_SHORT_NAME@@, --mac-sign, --mac-signing-keychain, @@EMPTY_KEYCHAIN@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, EMPTY_KEYCHAIN], message.error-header+[error.cert.not.found, INSTALLER, EMPTY_KEYCHAIN]])
+ErrorTest.testMacSignWithoutIdentity(MAC_PKG; args-add=[--mac-sign, --mac-signing-keychain, @@KEYCHAIN_WITH_APP_IMAGE_CERT@@, --app-image, @@APP_IMAGE_WITH_SHORT_NAME@@]; errors=[message.error-header+[error.cert.not.found, INSTALLER, KEYCHAIN_WITH_APP_IMAGE_CERT]])
+ErrorTest.testMacSignWithoutIdentity(MAC_PKG; args-add=[--mac-sign, --mac-signing-keychain, @@KEYCHAIN_WITH_PKG_CERT@@, --app-image, @@APP_IMAGE_WITH_SHORT_NAME@@]; errors=[message.error-header+[error.cert.not.found, CODE_SIGN, KEYCHAIN_WITH_PKG_CERT]])
 ErrorTest.testMacSigningIdentityValidation(IMAGE, --mac-app-image-sign-identity, true)
 ErrorTest.testMacSigningIdentityValidation(IMAGE, --mac-signing-key-user-name, false)
 ErrorTest.testMacSigningIdentityValidation(MAC_DMG, --mac-app-image-sign-identity, true)
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
index e15d5130d43..9976a71ef3f 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/OptionsValidationFailTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,7 @@ public class OptionsValidationFailTest {
 
                 var errorReporter = new Main.ErrorReporter(ex -> {
                     ex.printStackTrace(err);
-                }, out::append);
+                }, err::println, false);
 
                 return parse(args).peekErrors(errors -> {
                     final var firstErr = errors.stream().findFirst().orElseThrow();
@@ -200,13 +200,14 @@ public class OptionsValidationFailTest {
                 Stream.of("--jpt-run=ErrorTest")
         ).flatMap(x -> x).toArray(String[]::new)).map(dynamicTest -> {
             return DynamicTest.dynamicTest(dynamicTest.getDisplayName(), () -> {
-                JPackageCommand.withToolProvider(() -> {
+                TKit.withNewState(() -> {
+                    JPackageCommand.useToolProviderByDefault(jpackageToolProviderMock);
                     try {
                         dynamicTest.getExecutable().execute();
                     } catch (Throwable t) {
                         throw ExceptionBox.toUnchecked(ExceptionBox.unbox(t));
                     }
-                }, jpackageToolProviderMock);
+                });
             });
         });
     }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
index 4aa3d5f72c1..58a78edb627 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardOptionTest.java
@@ -24,6 +24,8 @@ package jdk.jpackage.internal.cli;
 
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.cli.TestUtils.assertExceptionListEquals;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -53,12 +55,16 @@ import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.ConvertedOptionsBuilder;
 import jdk.jpackage.internal.cli.JOptSimpleOptionsBuilder.OptionsBuilder;
 import jdk.jpackage.internal.cli.StandardOption.LauncherProperty;
+import jdk.jpackage.internal.model.AppImageBundleType;
+import jdk.jpackage.internal.model.BundleType;
 import jdk.jpackage.internal.model.JPackageException;
 import jdk.jpackage.internal.model.LauncherShortcut;
 import jdk.jpackage.internal.model.LauncherShortcutStartupDirectory;
+import jdk.jpackage.internal.util.RootedPath;
 import jdk.jpackage.internal.util.StringBundle;
 import jdk.jpackage.test.Comm;
 import jdk.jpackage.test.JUnitAdapter;
+import jdk.jpackage.test.JUnitUtils;
 import jdk.jpackage.test.TKit;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -109,7 +115,7 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var spec = StandardOption.ICON.getSpec();
 
-        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(name));
+        var result = spec.convert(spec.name(), StringToken.of(name));
 
         assertEquals(Path.of(name), result.orElseThrow());
     }
@@ -119,7 +125,7 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var spec = StandardOption.ICON.getSpec();
 
-        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(workDir.toString()));
+        var result = spec.convert(spec.name(), StringToken.of(workDir.toString()));
 
         var ex = assertThrows(JPackageException.class, result::orElseThrow);
 
@@ -133,7 +139,7 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var spec = new StandardOptionContext().forFile(propertyFile).mapOptionSpec(StandardOption.ICON.getSpec());
 
-        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(workDir.toString()));
+        var result = spec.convert(spec.name(), StringToken.of(workDir.toString()));
 
         var ex = assertThrows(JPackageException.class, result::orElseThrow);
 
@@ -148,7 +154,7 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var tempRoot = workDir.resolve(dir);
 
-        var value = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString())).orElseThrow();
+        var value = spec.convert(spec.name(), StringToken.of(tempRoot.toString())).orElseThrow();
 
         assertEquals(tempRoot, value);
     }
@@ -163,28 +169,33 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
         Files.writeString(tempRoot, "foo");
 
         var ex = assertThrowsExactly(JPackageException.class,
-                spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
+                spec.convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
         assertEquals(I18N.format("error.parameter-not-empty-directory", tempRoot, "--temp"), ex.getMessage());
         assertEquals(NotDirectoryException.class, ex.getCause().getClass());
 
         tempRoot = workDir;
 
         ex = assertThrowsExactly(JPackageException.class,
-                spec.converter().orElseThrow().convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
+                spec.convert(spec.name(), StringToken.of(tempRoot.toString()))::orElseThrow);
         assertEquals(I18N.format("error.parameter-not-empty-directory", tempRoot, "--temp"), ex.getMessage());
         assertEquals(DirectoryNotEmptyException.class, ex.getCause().getClass());
     }
 
+    @ParameterizedTest
+    @EnumSource(names = {"WINDOWS", "LINUX", "MACOS"})
+    public void test_TYPE_valid(OperatingSystem appImageOS) {
+
+        var spec = new StandardOptionContext(appImageOS).mapOptionSpec(StandardOption.TYPE.getSpec());
+
+        test_TYPE_valid(spec, appImageOS);
+    }
+
     @Test
     public void test_TYPE_valid() {
 
         var spec = StandardOption.TYPE.getSpec();
 
-        Stream.of(StandardBundlingOperation.values()).forEach(bundlingOperation -> {
-            var pkgTypeStr = bundlingOperation.packageTypeValue();
-            var pkgType = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(pkgTypeStr)).orElseThrow();
-            assertSame(bundlingOperation.packageType(), pkgType);
-        });
+        test_TYPE_valid(spec, OperatingSystem.current());
     }
 
     @ParameterizedTest
@@ -193,13 +204,146 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var spec = StandardOption.TYPE.getSpec();
 
-        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(name));
+        var result = spec.convert(spec.name(), StringToken.of(name));
 
         var ex = assertThrows(JPackageException.class, result::orElseThrow);
 
         assertEquals(I18N.format("ERR_InvalidInstallerType", name), ex.getMessage());
     }
 
+    @Test
+    public void test_APP_CONTENT_valid(@TempDir Path workDir) throws IOException {
+
+        var spec = StandardOption.APP_CONTENT.getSpec();
+
+        var contentDir = workDir.resolve("a");
+        var emptyDir = contentDir.resolve("b/empty-dir");
+        var file = contentDir.resolve("file.txt");
+
+        Files.createDirectories(emptyDir);
+        Files.createDirectories(file.getParent());
+        Files.createFile(file);
+
+        Object convertedValue = spec.convert(
+                spec.name(),
+                StringToken.of(Stream.of(contentDir, file).map(Path::toString).collect(joining(",")))
+        ).orElseThrow();
+
+        var paths = StandardOption.APP_CONTENT.getFrom(Options.of(Map.of(StandardOption.APP_CONTENT, convertedValue)));
+        var sortedPathList = paths.stream().flatMap(Collection::stream).map(RootedPath::branch).sorted().toList();
+
+        var expectedPathList = Stream.of(
+                "a",
+                "a/b",
+                "a/b/empty-dir",
+                "a/file.txt",
+                "file.txt"
+        ).map(Path::of).sorted().toList();
+
+        assertEquals(expectedPathList, sortedPathList);
+    }
+
+    @Test
+    public void test_APP_CONTENT_invalid(@TempDir Path workDir) throws IOException {
+        var spec = StandardOption.APP_CONTENT.getSpec();
+
+        var token = StringToken.of(workDir.resolve("nonexistent").toString());
+        var result = spec.convert(spec.name(), token);
+
+        assertExceptionListEquals(Stream.of(
+                "error.parameter-not-directory",
+                "error.parameter-not-file"
+        ).map(key -> {
+            return new JPackageException(I18N.format(key, token.value(), spec.name().formatForCommandLine()));
+        }).toList(), result.errors());
+    }
+
+    @ParameterizedTest
+    @EnumSource(OptionMutatorTest.TestType.class)
+    public void test_pathOptionMutator(OptionMutatorTest.TestType type) {
+        new OptionMutatorTest<>(StandardOption.pathOptionMutator(), StandardValueConverter.pathConv())
+                .validValue("file.txt")
+                .invalidValue("\0")
+                .cmdlineErrorFormatKeys("error.parameter-not-path")
+                .propertyFileErrorFormatKeys("error.properties-parameter-not-path")
+                .test(OptionSpecBuilder.create(Path.class), type);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OptionMutatorTest.TestType.class)
+    public void test_existingPathOptionMutator(OptionMutatorTest.TestType type, @TempDir Path workDir) {
+        new OptionMutatorTest<>(StandardOption.existingPathOptionMutator(), StandardValueConverter.pathConv())
+                .validValue(workDir.toString())
+                .invalidValue(workDir.resolve("nonexistent").toString())
+                .cmdlineErrorFormatKeys("error.parameter-not-directory", "error.parameter-not-file")
+                .propertyFileErrorFormatKeys("error.properties-parameter-not-directory", "error.properties-parameter-not-file")
+                .test(OptionSpecBuilder.create(Path.class), type);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OptionMutatorTest.TestType.class)
+    public void test_directoryOptionMutator(OptionMutatorTest.TestType type, @TempDir Path workDir) {
+        new OptionMutatorTest<>(StandardOption.directoryOptionMutator(), StandardValueConverter.pathConv())
+                .validValue(workDir.toString())
+                .invalidValue(workDir.resolve("nonexistent").toString())
+                .cmdlineErrorFormatKeys("error.parameter-not-directory")
+                .propertyFileErrorFormatKeys("error.properties-parameter-not-directory")
+                .test(OptionSpecBuilder.create(Path.class), type);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OptionMutatorTest.TestType.class)
+    public void test_fileOptionMutator(OptionMutatorTest.TestType type, @TempDir Path workDir) throws IOException {
+        var test = new OptionMutatorTest<>(StandardOption.fileOptionMutator(), StandardValueConverter.pathConv())
+                .invalidValue(workDir.resolve("nonexistent").toString())
+                .cmdlineErrorFormatKeys("error.parameter-not-file")
+                .propertyFileErrorFormatKeys("error.properties-parameter-not-file");
+
+        switch (type) {
+            case TEST_CMDLINE_VALID, TEST_PROPERTY_FILE_VALID -> {
+                var file = workDir.resolve("file.txt");
+                Files.createFile(file);
+                test.validValue(file.toString());
+            }
+            default -> {}
+        }
+
+        test.test(OptionSpecBuilder.create(Path.class), type);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OptionMutatorTest.TestType.class)
+    public void test_explodedPathOptionMapper(OptionMutatorTest.TestType type, @TempDir Path workDir) throws IOException {
+
+        var explodePath = StandardValueConverter.explodedPathConverter().withPathFileName().create();
+
+        ValueConverter<String, RootedPath[]> conv = ValueConverter.create(str -> {
+            var path = StandardValueConverter.pathConv().convert(str);
+            return explodePath.convert(path);
+        }, RootedPath[].class);
+
+        var test = new OptionMutatorTest<>(_ -> {}, conv)
+                .invalidValue(workDir.resolve("nonexistent").toString())
+                .cmdlineErrorFormatKeys("error.parameter-not-directory")
+                .propertyFileErrorFormatKeys("error.properties-parameter-not-directory");
+
+        switch (type) {
+            case TEST_CMDLINE_VALID, TEST_PROPERTY_FILE_VALID -> {
+                var dir = workDir.resolve("dir");
+                Files.createDirectories(dir);
+                for (var file : List.of("foo.txt", "bar.txt")) {
+                    Files.createFile(workDir.resolve(file));
+                }
+                test.validValue(dir.toString());
+            }
+            default -> {}
+        }
+
+        test.test(OptionSpecBuilder.create(Path.class)
+                .mutate(StandardOption.directoryOptionMutator())
+                .map(StandardOption.explodedPathOptionMapper(explodePath)), type);
+    }
+
     @Test
     public void test_booleanOptionMutator() {
 
@@ -214,6 +358,13 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
         assertFalse(option.containsIn(empty));
     }
 
+    @Test
+    public void test_booleanOptionMutator_in_property_file() {
+        new OptionMutatorTest<>(StandardOption.booleanOptionMutator(), StandardValueConverter.booleanConv())
+                .validValue(Boolean.TRUE.toString())
+                .test(OptionSpecBuilder.create(Boolean.class), OptionMutatorTest.TestType.TEST_PROPERTY_FILE_VALID);
+    }
+
     @ParameterizedTest
     @MethodSource
     public void testLauncherShortcutOptions(LauncherShortcutTestSpec testSpec) {
@@ -296,7 +447,7 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
 
         var spec = StandardOption.ARGUMENTS.getOption().spec();
 
-        var result = spec.converter().orElseThrow().convert(spec.name(), StringToken.of(value));
+        var result = spec.convert(spec.name(), StringToken.of(value));
 
         assertEquals(expectedTokens, List.of(result.map(String[].class::cast).orElseThrow()));
     }
@@ -336,6 +487,18 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
         assertEquals(expectedOptionTable, optionTable);
     }
 
+    private void test_TYPE_valid(OptionSpec<BundleType> spec, OperatingSystem appImageOS) {
+        Stream.of(StandardBundlingOperation.values()).filter(bundlingOperation -> {
+            // Skip app image bundle type if it is from another platform.
+            return !(bundlingOperation.bundleType() instanceof AppImageBundleType)
+                    || (bundlingOperation.os() == appImageOS);
+        }).forEach(bundlingOperation -> {
+            var bundleTypeStr = bundlingOperation.bundleTypeValue();
+            var bundleType = spec.convert(spec.name(), StringToken.of(bundleTypeStr)).orElseThrow();
+            assertSame(bundlingOperation.bundleType(), bundleType);
+        });
+    }
+
     private static Collection<Arguments> test_ARGUMENTS() {
         return List.of(
                 Arguments.of("abc", List.of("abc")),
@@ -372,6 +535,100 @@ public class StandardOptionTest extends JUnitAdapter.TestSrcInitializer {
     }
 
 
+    static final class OptionMutatorTest<T> {
+
+        enum TestType {
+            TEST_CMDLINE_VALID,
+            TEST_PROPERTY_FILE_VALID,
+            TEST_CMDLINE_INVALID,
+            TEST_PROPERTY_FILE_INVALID;
+        }
+
+        OptionMutatorTest(Consumer<OptionSpecBuilder<T>> testee, ValueConverter<String, T> conv) {
+            this.testee = Objects.requireNonNull(testee);
+            this.conv = Objects.requireNonNull(conv);
+        }
+
+        void test(OptionSpecBuilder<T> specBuilder, TestType type) {
+            var srcSpec = specBuilder.name("foo").mutate(testee).createOptionSpec();
+            OptionSpec<T> spec;
+
+            var propertyFile = Path.of("foo.properties");
+
+            switch (type) {
+                case TEST_PROPERTY_FILE_VALID, TEST_PROPERTY_FILE_INVALID -> {
+                    spec = new StandardOptionContext().forFile(propertyFile).mapOptionSpec(srcSpec);
+                }
+                default -> {
+                    spec = srcSpec;
+                }
+            }
+
+            StringToken token;
+            switch (type) {
+                case TEST_CMDLINE_VALID, TEST_PROPERTY_FILE_VALID -> {
+                    token = StringToken.of(Objects.requireNonNull(validValue));
+                }
+                default -> {
+                    token = StringToken.of(Objects.requireNonNull(invalidValue));
+                }
+            }
+
+            var result = spec.convert(spec.name(), token);
+
+            switch (type) {
+                case TEST_CMDLINE_VALID, TEST_PROPERTY_FILE_VALID -> {
+                    var expected = toFunction(conv::convert).apply(token.value());
+                    var actual = result.orElseThrow();
+
+                    if (spec.valueType().isArray()) {
+                        JUnitUtils.assertArrayEquals(expected, actual);
+                    } else {
+                        assertEquals(expected, actual);
+                    }
+                }
+                case TEST_CMDLINE_INVALID -> {
+                    assertExceptionListEquals(cmdlineErrorFormatKeys.stream().map(key -> {
+                        return new JPackageException(I18N.format(key, token.value(), spec.name().formatForCommandLine()));
+                    }).map(JUnitUtils::removeExceptionCause).toList(), result.errors().stream().map(JUnitUtils::removeExceptionCause).toList());
+                }
+                case TEST_PROPERTY_FILE_INVALID -> {
+                    assertExceptionListEquals(propertyFileErrorFormatKeys.stream().map(key -> {
+                        return new JPackageException(I18N.format(key, token.value(), spec.name().name(), propertyFile));
+                    }).map(JUnitUtils::removeExceptionCause).toList(), result.errors().stream().map(JUnitUtils::removeExceptionCause).toList());
+                }
+            }
+        }
+
+        OptionMutatorTest<T> validValue(String v) {
+            validValue = v;
+            return this;
+        }
+
+        OptionMutatorTest<T> invalidValue(String v) {
+            invalidValue = v;
+            return this;
+        }
+
+        OptionMutatorTest<T> cmdlineErrorFormatKeys(String... v) {
+            cmdlineErrorFormatKeys = List.of(v);
+            return this;
+        }
+
+        OptionMutatorTest<T> propertyFileErrorFormatKeys(String... v) {
+            propertyFileErrorFormatKeys = List.of(v);
+            return this;
+        }
+
+        private final Consumer<OptionSpecBuilder<T>> testee;
+        private final ValueConverter<String, T> conv;
+        private List<String> cmdlineErrorFormatKeys;
+        private List<String> propertyFileErrorFormatKeys;
+        private String validValue;
+        private String invalidValue;
+    }
+
+
     record AddLauncherTestSpec(Optional<AdditionalLauncher> expected, List<String> expectedErrors, Optional<String> optionValue) {
         AddLauncherTestSpec {
             if (expected.isEmpty() == expectedErrors.isEmpty()) {
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
index 6b16b1099c7..491dae60d5f 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/StandardValueConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ import org.junit.jupiter.params.provider.ValueSource;
 public class StandardValueConverterTest {
 
     @Test
-    public void test_identityConv() {
+    public void test_identityConv() throws Exception {
 
         final var testee = StandardValueConverter.identityConv();
 
@@ -58,7 +58,7 @@ public class StandardValueConverterTest {
 
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    public void test_pathConv(boolean positive) {
+    public void test_pathConv(boolean positive) throws Exception {
 
         final var testee = StandardValueConverter.pathConv();
 
@@ -72,14 +72,14 @@ public class StandardValueConverterTest {
 
     @ParameterizedTest
     @MethodSource
-    public void test_booleanConv(String value, Boolean expected) {
+    public void test_booleanConv(String value, Boolean expected) throws Exception {
 
         assertEquals(expected, StandardValueConverter.booleanConv().convert(value));
     }
 
     @ParameterizedTest
     @MethodSource
-    public void test_mainLauncherShortcutConv(String value, LauncherShortcut expected) {
+    public void test_mainLauncherShortcutConv(String value, LauncherShortcut expected) throws Exception {
 
         assertEquals(expected, StandardValueConverter.mainLauncherShortcutConv().convert(value));
     }
@@ -93,7 +93,7 @@ public class StandardValueConverterTest {
 
     @ParameterizedTest
     @MethodSource
-    public void test_addLauncherShortcutConv(String value, LauncherShortcut expected) {
+    public void test_addLauncherShortcutConv(String value, LauncherShortcut expected) throws Exception {
 
         assertEquals(expected, StandardValueConverter.addLauncherShortcutConv().convert(value));
     }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
index d3e9ecb09e9..2acf45b663d 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/TestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
 import java.util.stream.StreamSupport;
+import jdk.jpackage.internal.cli.Validator.ParsedValue;
+import jdk.jpackage.internal.cli.Validator.ValidatorException;
 import jdk.jpackage.test.JUnitUtils;
 
 final class TestUtils {
@@ -152,6 +154,31 @@ final class TestUtils {
     }
 
 
+    static final class RecordingValidator<T, U extends Exception> implements Validator<T, U> {
+
+        RecordingValidator(Validator<T, U> validator) {
+            this.validator = Objects.requireNonNull(validator);
+        }
+
+        @Override
+        public List<U> validate(OptionName optionName, ParsedValue<T> optionValue) {
+            counter++;
+            return validator.validate(optionName, optionValue);
+        }
+
+        int counter() {
+            return counter;
+        }
+
+        void resetCounter() {
+            counter = 0;
+        }
+
+        private final Validator<T, U> validator;
+        private int counter;
+    }
+
+
     private record RecordingExceptionFactory(OptionValueExceptionFactory<? extends RuntimeException> factory,
             Consumer<OptionFailure> sink) implements OptionValueExceptionFactory<RuntimeException> {
 
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
index d4c48df6a0c..9b8babbfdda 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/ValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,12 @@ import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
+import java.util.function.BinaryOperator;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.cli.TestUtils.RecordingValidator;
 import jdk.jpackage.internal.cli.TestUtils.TestException;
 import jdk.jpackage.internal.cli.Validator.ParsedValue;
 import jdk.jpackage.internal.cli.Validator.ValidatingConsumerException;
@@ -43,6 +46,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 public class ValidatorTest {
 
@@ -186,47 +190,116 @@ public class ValidatorTest {
         assertNotSame(builder.predicate(), copy.predicate());
     }
 
-    @Test
-    public void test_andThen() {
-
-        Function<String, Validator<String, Exception>> createFailingValidator = exceptionMessage -> {
-            Objects.requireNonNull(exceptionMessage);
-            var exceptionFactory = OptionValueExceptionFactory.build().ctor(TestException::new).messageFormatter((_, _) -> {
-                return exceptionMessage;
-            }).create();
-
-            return Validator.<String, Exception>build()
-                    .predicate(_ -> false)
-                    .formatString("")
-                    .exceptionFactory(exceptionFactory).create();
-        };
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_and(boolean greedy) {
 
         Function<Validator<String, ? extends Exception>, List<? extends Exception>> validate = validator -> {
             return validator.validate(OptionName.of("a"), ParsedValue.create("str", StringToken.of("str")));
         };
 
-        var pass = Validator.<String, RuntimeException>build().predicate(_ -> true).create();
+        BinaryOperator<Validator<String, ? extends Exception>> composer = (a, b) -> {
+            if (greedy) {
+                return a.andGreedy(b);
+            } else {
+                return a.andLazy(b);
+            }
+        };
 
-        var foo = createFailingValidator.apply("foo");
-        var bar = createFailingValidator.apply("bar");
-        var buz = createFailingValidator.apply("buz");
+        UnaryOperator<List<TestException>> exceptionFilter;
+        if (greedy) {
+            exceptionFilter = v -> v;
+        } else {
+            exceptionFilter = v -> {
+                return List.of(v.getFirst());
+            };
+        }
+
+        var pass = new RecordingValidator<>(Validator.<String, RuntimeException>build().predicate(_ -> true).create());
+
+        var foo = failingValidator("foo");
+        var bar = failingValidator("bar");
+        var buz = failingValidator("buz");
+
+        assertExceptionListEquals(exceptionFilter.apply(List.of(
+                new TestException("foo"),
+                new TestException("bar"),
+                new TestException("buz")
+        )), validate.apply(Stream.of(foo, bar, pass, buz).reduce(composer).orElseThrow()));
+        assertEquals(greedy ? 1 : 0, pass.counter());
+
+        pass.resetCounter();
+        assertExceptionListEquals(exceptionFilter.apply(List.of(
+                new TestException("bar"),
+                new TestException("buz"),
+                new TestException("foo")
+        )), validate.apply(Stream.of(pass, bar, buz, foo).reduce(composer).orElseThrow()));
+        assertEquals(1, pass.counter());
+
+        assertExceptionListEquals(exceptionFilter.apply(List.of(
+                new TestException("foo"),
+                new TestException("foo")
+        )), validate.apply(composer.apply(foo, foo)));
+
+        pass.resetCounter();
+        assertExceptionListEquals(List.of(
+        ), validate.apply(composer.apply(pass, pass)));
+        assertEquals(2, pass.counter());
+    }
+
+    @Test
+    public void test_or() {
+
+        Function<Validator<String, ? extends Exception>, List<? extends Exception>> validate = validator -> {
+            return validator.validate(OptionName.of("a"), ParsedValue.create("str", StringToken.of("str")));
+        };
+
+        var pass = new RecordingValidator<>(Validator.<String, RuntimeException>build().predicate(_ -> true).create());
+
+        var foo = new RecordingValidator<>(failingValidator("foo"));
+        var bar = new RecordingValidator<>(failingValidator("bar"));
+        var buz = new RecordingValidator<>(failingValidator("buz"));
+
+        Runnable resetCounters = () -> {
+            Stream.of(pass, foo, bar, buz).forEach(RecordingValidator::resetCounter);
+        };
 
         assertExceptionListEquals(List.of(
                 new TestException("foo"),
                 new TestException("bar"),
                 new TestException("buz")
-        ),  validate.apply(foo.andThen(bar).andThen(pass).andThen(buz)));
+        ), validate.apply(foo.or(bar).or(buz)));
+        assertEquals(1, foo.counter());
+        assertEquals(1, bar.counter());
+        assertEquals(1, buz.counter());
 
+        resetCounters.run();
         assertExceptionListEquals(List.of(
-                new TestException("bar"),
-                new TestException("buz"),
-                new TestException("foo")
-        ),  validate.apply(pass.andThen(bar).andThen(buz).andThen(foo)));
+        ), validate.apply(foo.or(bar).or(pass).or(buz)));
+        assertEquals(1, foo.counter());
+        assertEquals(1, bar.counter());
+        assertEquals(1, pass.counter());
+        assertEquals(0, buz.counter());
 
+        resetCounters.run();
+        assertExceptionListEquals(List.of(
+        ), validate.apply(pass.or(bar).or(buz).or(foo)));
+        assertEquals(1, pass.counter());
+        assertEquals(0, bar.counter());
+        assertEquals(0, buz.counter());
+        assertEquals(0, foo.counter());
+
+        resetCounters.run();
         assertExceptionListEquals(List.of(
                 new TestException("foo"),
                 new TestException("foo")
-        ),  validate.apply(foo.andThen(foo)));
+        ), validate.apply(foo.or(foo)));
+        assertEquals(2, foo.counter());
+
+        resetCounters.run();
+        assertExceptionListEquals(List.of(
+        ),  validate.apply(pass.or(pass)));
+        assertEquals(1, pass.counter());
     }
 
     @ParameterizedTest
@@ -269,6 +342,17 @@ public class ValidatorTest {
         return data;
     }
 
+    private static Validator<String, Exception> failingValidator(String exceptionMessage) {
+        var exceptionFactory = OptionValueExceptionFactory.build().ctor(TestException::new).messageFormatter((_, _) -> {
+            return exceptionMessage;
+        }).create();
+
+        return Validator.<String, Exception>build()
+                .predicate(_ -> false)
+                .formatString("")
+                .exceptionFactory(exceptionFactory).create();
+    }
+
 
     static final class FooException extends Exception {
 
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CommandOutputControlTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CommandOutputControlTest.java
index f1d8c142eb9..b179f32447f 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CommandOutputControlTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/CommandOutputControlTest.java
@@ -203,11 +203,11 @@ public class CommandOutputControlTest {
             exec = coc.createExecutable(new ProcessBuilder("runme", "--foo", "--baz=10"));
         }
 
-        assertEquals("runme --foo --baz=10", exec.attributes().toString());
+        assertEquals("runme --foo --baz=10", exec.attributes().printableCommandLine());
     }
 
     @Test
-    public void test_Result_no_args_ctor() {
+    public void test_Result_single_arg_ctor() {
         var result = new CommandOutputControl.Result(7);
         assertFalse(result.findContent().isPresent());
         assertFalse(result.findStdout().isPresent());
@@ -216,6 +216,18 @@ public class CommandOutputControlTest {
         assertSame(Objects.requireNonNull(CommandOutputControl.EMPTY_EXECUTABLE_ATTRIBUTES), result.execAttrs());
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void test_Result_unexpected(boolean customMessage) throws IOException {
+        var result = new CommandOutputControl.Result(7);
+
+        if (customMessage) {
+            assertEquals("Kaput!", result.unexpected("Kaput!").getMessage());
+        } else {
+            assertEquals("Unexpected result from executing the command <unknown>", result.unexpected().getMessage());
+        }
+    }
+
     @Test
     public void test_Result_expectExitCode() throws IOException {
         var result = new CommandOutputControl.Result(7);
@@ -276,14 +288,9 @@ public class CommandOutputControlTest {
         var empty = new CommandOutputControl.Result(0);
 
         var execAttrs = new CommandOutputControl.ExecutableAttributes() {
-            @Override
-            public String toString() {
-                return "foo";
-            }
-
             @Override
             public List<String> commandLine() {
-                return List.of();
+                return List.of("foo");
             }
         };
 
@@ -295,6 +302,20 @@ public class CommandOutputControlTest {
         assertSame(execAttrs, copy.execAttrs());
     }
 
+    @Test
+    public void test_UnexpectedExitCodeException_no_exit_code() {
+
+        var resultWithoutExitCode = CommandOutputControl.Result.build().create();
+
+        assertThrowsExactly(IllegalArgumentException.class, () -> {
+            new CommandOutputControl.UnexpectedExitCodeException(resultWithoutExitCode);
+        });
+
+        assertThrowsExactly(IllegalArgumentException.class, () -> {
+            new CommandOutputControl.UnexpectedExitCodeException(resultWithoutExitCode, "Kaput!");
+        });
+    }
+
     @ParameterizedTest
     @EnumSource(ExecutableType.class)
     public void test_timeout_expires(ExecutableType mode) throws InterruptedException, IOException {
@@ -437,7 +458,7 @@ public class CommandOutputControlTest {
         processDestroyer.get().join();
     }
 
-    @DisabledOnOs(value = OS.MAC, disabledReason = "Closing a stream doesn't consistently cause a trouble as it should")
+    @DisabledOnOs(value = {OS.MAC, OS.LINUX}, disabledReason = "Closing a stream doesn't consistently cause a trouble as expected")
     @ParameterizedTest
     @EnumSource(OutputStreams.class)
     public void test_close_streams(OutputStreams action) throws InterruptedException, IOException {
@@ -1781,7 +1802,7 @@ public class CommandOutputControlTest {
         }
     }
 
-    private final static class InterruptibleToolProvider implements ToolProvider {
+    private static final class InterruptibleToolProvider implements ToolProvider {
 
         InterruptibleToolProvider(ToolProvider impl) {
             this.impl = impl;
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/FileUtilsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/FileUtilsTest.java
index 2067f0fa628..b7639dbfad4 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/FileUtilsTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/FileUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,92 +24,36 @@
 package jdk.jpackage.internal.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.ValueSource;
 
 
 public class FileUtilsTest {
 
-    @ParameterizedTest
-    @EnumSource(ExcludeType.class)
-    public void test_copyRecursive_dir(ExcludeType exclude, @TempDir Path workdir) throws IOException {
+    @Test
+    public void test_copyRecursive_dir(@TempDir Path workdir) throws IOException {
         Files.createDirectories(workdir.resolve("from/foo/bar"));
         Files.createDirectories(workdir.resolve("from/foo/buz"));
         Files.writeString(workdir.resolve("from/foo/bar/file.txt"), "Hello");
 
-        List<Path> excludes = new ArrayList<>();
-        switch (exclude) {
-            case EXCLUDE_FILE -> {
-                excludes.add(Path.of("file.txt"));
-            }
-            case EXCLUDE_DIR -> {
-                excludes.add(Path.of("bar"));
-            }
-            case EXCLUDE_SUBDIR -> {
-                excludes.add(Path.of("foo"));
-            }
-            case EXCLUDE_NONE -> {
-            }
-        }
-
-        FileUtils.copyRecursive(workdir.resolve("from"), workdir.resolve("to"), excludes);
+        FileUtils.copyRecursive(workdir.resolve("from"), workdir.resolve("to"));
 
         assertEquals("Hello", Files.readString(workdir.resolve("from/foo/bar/file.txt")));
-
-        switch (exclude) {
-            case EXCLUDE_FILE -> {
-                assertFalse(Files.exists(workdir.resolve("to/foo/bar/file.txt")));
-                assertTrue(Files.isDirectory(workdir.resolve("to/foo/bar")));
-            }
-            case EXCLUDE_DIR -> {
-                assertFalse(Files.exists(workdir.resolve("to/foo/bar")));
-                assertTrue(Files.isDirectory(workdir.resolve("to/foo/buz")));
-            }
-            case EXCLUDE_SUBDIR -> {
-                assertFalse(Files.exists(workdir.resolve("to/foo")));
-                assertTrue(Files.isDirectory(workdir.resolve("to")));
-            }
-            case EXCLUDE_NONE -> {
-                assertEquals("Hello", Files.readString(workdir.resolve("to/foo/bar/file.txt")));
-            }
-        }
+        assertEquals("Hello", Files.readString(workdir.resolve("to/foo/bar/file.txt")));
     }
 
-    @ParameterizedTest
-    @ValueSource(booleans = {true, false})
-    public void test_copyRecursive_file(boolean exclude, @TempDir Path workdir) throws IOException {
+    @Test
+    public void test_copyRecursive_file(@TempDir Path workdir) throws IOException {
         Files.createDirectories(workdir.resolve("from/foo/bar"));
         Files.writeString(workdir.resolve("from/foo/bar/file.txt"), "Hello");
 
-        List<Path> excludes = new ArrayList<>();
-        if (exclude) {
-            excludes.add(Path.of("bar/file.txt"));
-        }
-
-        FileUtils.copyRecursive(workdir.resolve("from/foo/bar/file.txt"), workdir.resolve("to/foo/bar/file.txt"), excludes);
+        FileUtils.copyRecursive(workdir.resolve("from/foo/bar/file.txt"), workdir.resolve("to/foo/bar/file.txt"));
 
         assertEquals("Hello", Files.readString(workdir.resolve("from/foo/bar/file.txt")));
-        if (exclude) {
-            assertFalse(Files.exists(workdir.resolve("to")));
-        } else {
-            assertEquals("Hello", Files.readString(workdir.resolve("to/foo/bar/file.txt")));
-        }
-    }
-
-    enum ExcludeType {
-        EXCLUDE_NONE,
-        EXCLUDE_FILE,
-        EXCLUDE_DIR,
-        EXCLUDE_SUBDIR,
+        assertEquals("Hello", Files.readString(workdir.resolve("to/foo/bar/file.txt")));
     }
 }
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/MemoizingSupplierTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/MemoizingSupplierTest.java
new file mode 100644
index 00000000000..654071359cb
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/MemoizingSupplierTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jpackage.internal.util;
+
+import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.function.Supplier;
+import java.util.stream.IntStream;
+import org.junit.jupiter.api.Test;
+
+
+class MemoizingSupplierTest {
+
+    @Test
+    void test() {
+        var supplier = count(() -> "foo");
+        var runOnceSupplier = MemoizingSupplier.runOnce(supplier);
+
+        assertEquals(0, supplier.counter());
+
+        assertEquals("foo", runOnceSupplier.get());
+        assertEquals("foo", runOnceSupplier.get());
+
+        assertEquals(1, supplier.counter());
+    }
+
+    @Test
+    void test_null() {
+        CountingSupplier<String> supplier = count(() -> null);
+        var runOnceSupplier = MemoizingSupplier.runOnce(supplier);
+
+        assertEquals(0, supplier.counter());
+
+        assertEquals(null, runOnceSupplier.get());
+        assertEquals(null, runOnceSupplier.get());
+
+        assertEquals(1, supplier.counter());
+    }
+
+    @Test
+    void test_throws_Exception() {
+        CountingSupplier<String> supplier = count(() -> {
+            throw new IllegalStateException("Kaput!");
+        });
+        var runOnceSupplier = MemoizingSupplier.runOnce(supplier);
+
+        assertEquals(0, supplier.counter());
+
+        assertThrowsExactly(IllegalStateException.class, () -> {
+            runOnceSupplier.get();
+        });
+
+        assertThrowsExactly(IllegalStateException.class, () -> {
+            runOnceSupplier.get();
+        });
+
+        assertEquals(1, supplier.counter());
+    }
+
+    @Test
+    void test_throws_Error() {
+        CountingSupplier<String> supplier = count(() -> {
+            throw new Error("Grand kaput!");
+        });
+        var runOnceSupplier = MemoizingSupplier.runOnce(supplier);
+
+        assertEquals(0, supplier.counter());
+
+        assertThrowsExactly(Error.class, () -> {
+            runOnceSupplier.get();
+        });
+
+        assertThrowsExactly(Error.class, () -> {
+            runOnceSupplier.get();
+        });
+
+        assertEquals(1, supplier.counter());
+    }
+
+    @Test
+    void testAsync() throws InterruptedException {
+        var supplier = count(() -> "foo");
+        var runOnceSupplier = MemoizingSupplier.runOnce(supplier);
+
+        final var supplierCount = 100;
+        final var supplierExecutor = Executors.newVirtualThreadPerTaskExecutor();
+
+        // Schedule invoking "runOnceSupplier.get()" in a separate virtual threads.
+        // Start and suspend threads, waiting until all scheduled threads have started.
+        // After all scheduled threads start, resume them.
+        // This should result in multiple simultaneous "runOnceSupplier.get()" calls.
+
+        var readyLatch = new CountDownLatch(supplierCount);
+        var startLatch = new CountDownLatch(1);
+
+        var futures = IntStream.range(0, supplierCount).mapToObj(_ -> {
+            return CompletableFuture.runAsync(toRunnable(() -> {
+                readyLatch.countDown();
+                startLatch.await();
+                runOnceSupplier.get();
+
+            }), supplierExecutor);
+        }).toList();
+
+        readyLatch.await();
+        startLatch.countDown();
+
+        CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).join();
+
+        assertEquals(1, supplier.counter());
+    }
+
+    private static <T> CountingSupplier<T> count(Supplier<T> supplier) {
+        return new CountingSupplier<>(supplier);
+    }
+
+    private static final class CountingSupplier<T> implements Supplier<T> {
+
+        CountingSupplier(Supplier<T> impl) {
+            this.impl = Objects.requireNonNull(impl);
+        }
+
+        @Override
+        public T get() {
+            counter++;
+            return impl.get();
+        }
+
+        int counter() {
+            return counter;
+        }
+
+        private int counter;
+        private final Supplier<T> impl;
+    }
+}
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java
index c3ef239b02d..d7a6f0e714d 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/function/ExceptionBoxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,13 +31,19 @@ import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.UnaryOperator;
+import jdk.jpackage.internal.util.IdentityWrapper;
 import jdk.jpackage.internal.util.Slot;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ExceptionBoxTest {
 
@@ -190,6 +196,16 @@ public class ExceptionBoxTest {
         }
     }
 
+    @ParameterizedTest
+    @MethodSource
+    void test_visitUnboxedExceptionsRecursively(Throwable t, List<Exception> expect) {
+        var actual = new ArrayList<Exception>();
+        ExceptionBox.visitUnboxedExceptionsRecursively(t, actual::add);
+        assertEquals(
+                expect.stream().map(IdentityWrapper::new).toList(),
+                actual.stream().map(IdentityWrapper::new).toList());
+    }
+
     public enum InvocationTargetExceptionType {
         CHECKED("throwIOException", t -> {
             return t.getCause();
@@ -224,13 +240,74 @@ public class ExceptionBoxTest {
         throw new Error("Kaput!");
     }
 
-    private static void assertToUnchecked(Exception cause, boolean asis) {
-        Class<? extends Throwable> expectedType;
-        if (asis) {
-            expectedType = cause.getClass();
-        } else {
-            expectedType = ExceptionBox.class;
+    private static Collection<Arguments> test_visitUnboxedExceptionsRecursively() {
+
+        var testCases = new ArrayList<Arguments>();
+
+        testCases.addAll(test_visitUnboxedExceptionsRecursively_example());
+
+        var t = new Exception("A");
+        for (var box : List.<UnaryOperator<Exception>>of(
+                ex -> ex,
+                ExceptionBox::toUnchecked,
+                InvocationTargetException::new
+        )) {
+            testCases.add(Arguments.of(box.apply(t), List.of(t)));
         }
+
+        // The cause is not traversed.
+        var exWithCause = new Exception("B", t);
+        testCases.add(Arguments.of(exWithCause, List.of(exWithCause)));
+
+        var exWithSuppressed = new Exception("C");
+        exWithSuppressed.addSuppressed(t);
+        exWithSuppressed.addSuppressed(ExceptionBox.toUnchecked(t));
+        exWithSuppressed.addSuppressed(exWithCause);
+        exWithSuppressed.addSuppressed(new InvocationTargetException(exWithCause));
+        var exWithSuppressedExpect = List.of(t, t, exWithCause, exWithCause, exWithSuppressed);
+        testCases.add(Arguments.of(exWithSuppressed, exWithSuppressedExpect));
+
+        for (var box : List.<UnaryOperator<Exception>>of(
+                ExceptionBox::toUnchecked,
+                InvocationTargetException::new
+        )) {
+            // Suppressed exceptions added to ExceptionBox and InvocationTargetException are omitted.
+            var exWithSuppressedBoxed = box.apply(exWithSuppressed);
+            exWithSuppressedBoxed.addSuppressed(exWithSuppressed);
+            testCases.add(Arguments.of(exWithSuppressedBoxed, exWithSuppressedExpect));
+        }
+
+        var exWithSuppressed2 = new Exception("D");
+        exWithSuppressed2.addSuppressed(t);
+        exWithSuppressed2.addSuppressed(exWithSuppressed);
+        exWithSuppressed2.addSuppressed(ExceptionBox.toUnchecked(exWithSuppressed));
+
+        var exWithSuppressed2Expect = new ArrayList<Exception>();
+        exWithSuppressed2Expect.add(t);
+        exWithSuppressed2Expect.addAll(exWithSuppressedExpect);
+        exWithSuppressed2Expect.addAll(exWithSuppressedExpect);
+        exWithSuppressed2Expect.add(exWithSuppressed2);
+        testCases.add(Arguments.of(exWithSuppressed2, exWithSuppressed2Expect));
+
+        return testCases;
+    }
+
+    private static Collection<Arguments> test_visitUnboxedExceptionsRecursively_example() {
+
+        var a = new Exception("A");
+        var b = new Exception("B");
+        var c = new Exception("C");
+        var d = new Exception("D");
+
+        a.addSuppressed(b);
+        a.addSuppressed(c);
+
+        b.addSuppressed(d);
+
+        return List.of(Arguments.of(a, List.of(d, b, c, a)));
+    }
+
+    private static void assertToUnchecked(Exception cause, boolean asis) {
         var unchecked = ExceptionBox.toUnchecked(cause);
         if (asis) {
             assertSame(cause, unchecked);
diff --git a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java
index 952b4b520d5..4ab2c89873c 100644
--- a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java
+++ b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,11 +29,11 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.TeeOutputStream;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
@@ -70,12 +70,16 @@ public class JUnitAdapter {
 
     static List<String> captureJPackageTestLog(ThrowingRunnable<? extends Exception> runnable) {
         final var buf = new ByteArrayOutputStream();
-        try (PrintStream ps = new PrintStream(buf, true, StandardCharsets.UTF_8)) {
-            TKit.withExtraLogStream(runnable, ps);
-        }
+        var ps = new PrintStream(buf, false, TKit.state().out().charset());
+
+        final var out = new PrintStream(new TeeOutputStream(List.of(TKit.state().out(), ps)), true, ps.charset());
+
+        TKit.withOutput(runnable, out, TKit.state().err());
+
+        ps.flush();
 
         try (final var in = new ByteArrayInputStream(buf.toByteArray());
-                final var reader = new InputStreamReader(in, StandardCharsets.UTF_8);
+                final var reader = new InputStreamReader(in, ps.charset());
                 final var bufReader = new BufferedReader(reader)) {
             return bufReader.lines().map(line -> {
                 // Skip timestamp
diff --git a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java
index 0b63688ee20..530a0d5cb1f 100644
--- a/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java
+++ b/test/jdk/tools/jpackage/junit/tools/jdk/jpackage/test/JUnitUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,10 @@ public final class JUnitUtils {
         return EXCEPTION_OM.toMap(ex);
     }
 
+    public static Exception removeExceptionCause(Exception ex) {
+        return new ExceptionCauseRemover(ex);
+    }
+
 
     public static final class ExceptionPattern {
 
@@ -117,6 +121,23 @@ public final class JUnitUtils {
     }
 
 
+    private static final class ExceptionCauseRemover extends Exception {
+
+        ExceptionCauseRemover(Exception ex) {
+            super(ex.getMessage());
+            type = ex.getClass();
+        }
+
+        public Class<?> getType() {
+            return type;
+        }
+
+        private final Class<?> type;
+
+        private static final long serialVersionUID = 1L;
+    }
+
+
     @FunctionalInterface
     private interface ArrayEqualsAsserter<T> {
         void accept(T expected, T actual);
diff --git a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
index 8371dc01e43..b82706fc2c2 100644
--- a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
+++ b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,9 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageOutputValidator;
 import jdk.jpackage.test.LinuxHelper;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
@@ -67,22 +69,26 @@ public class LinuxResourceTest {
             final var arhProp = property("Architecture", "bar");
 
             TKit.createTextFile(controlFile, List.of(
-                packageProp.format(),
-                verProp.format(),
-                "Section: APPLICATION_SECTION",
-                "Maintainer: APPLICATION_MAINTAINER",
-                "Priority: optional",
-                arhProp.format(),
-                "Provides: dont-install-me",
-                "Description: APPLICATION_DESCRIPTION",
-                "Installed-Size: APPLICATION_INSTALLED_SIZE",
-                "Depends: PACKAGE_DEFAULT_DEPENDENCIES"
+                    packageProp.format(),
+                    verProp.format(),
+                    "Section: APPLICATION_SECTION",
+                    "Maintainer: APPLICATION_MAINTAINER",
+                    "Priority: optional",
+                    arhProp.format(),
+                    "Provides: dont-install-me",
+                    "Description: APPLICATION_DESCRIPTION",
+                    "Installed-Size: APPLICATION_INSTALLED_SIZE",
+                    "Depends: PACKAGE_DEFAULT_DEPENDENCIES"
             ));
 
-            cmd.validateOutput(MAIN.cannedFormattedString(
-                    "message.using-custom-resource",
-                    String.format("[%s]", MAIN.cannedFormattedString("resource.deb-control-file").getValue()),
-                    controlFile.getFileName()));
+            new JPackageOutputValidator()
+                    .expectMatchingStrings(MAIN.cannedFormattedString(
+                            "message.using-custom-resource",
+                            String.format("[%s]", MAIN.cannedFormattedString("resource.deb-control-file").getValue()),
+                            controlFile.getFileName()))
+                    .matchTimestamps()
+                    .stripTimestamps()
+                    .applyTo(cmd);
 
             packageProp.expectedValue(LinuxHelper.getPackageName(cmd)).token("APPLICATION_PACKAGE").resourceDirFile(controlFile).validateOutput(cmd);
             verProp.expectedValue(cmd.version()).token("APPLICATION_VERSION_WITH_RELEASE").resourceDirFile(controlFile).validateOutput(cmd);
@@ -98,30 +104,34 @@ public class LinuxResourceTest {
             final var releaseProp = property("Release", "R2");
 
             TKit.createTextFile(specFile, List.of(
-                packageProp.format(),
-                verProp.format(),
-                releaseProp.format(),
-                "Summary: APPLICATION_SUMMARY",
-                "License: APPLICATION_LICENSE_TYPE",
-                "Prefix: %{dirname:APPLICATION_DIRECTORY}",
-                "Provides: dont-install-me",
-                "%define _build_id_links none",
-                "%description",
-                "APPLICATION_DESCRIPTION",
-                "%prep",
-                "%build",
-                "%install",
-                "rm -rf %{buildroot}",
-                "install -d -m 755 %{buildroot}APPLICATION_DIRECTORY",
-                "cp -r %{_sourcedir}APPLICATION_DIRECTORY/* %{buildroot}APPLICATION_DIRECTORY",
-                "%files",
-                "APPLICATION_DIRECTORY"
+                    packageProp.format(),
+                    verProp.format(),
+                    releaseProp.format(),
+                    "Summary: APPLICATION_SUMMARY",
+                    "License: APPLICATION_LICENSE_TYPE",
+                    "Prefix: %{dirname:APPLICATION_DIRECTORY}",
+                    "Provides: dont-install-me",
+                    "%define _build_id_links none",
+                    "%description",
+                    "APPLICATION_DESCRIPTION",
+                    "%prep",
+                    "%build",
+                    "%install",
+                    "rm -rf %{buildroot}",
+                    "install -d -m 755 %{buildroot}APPLICATION_DIRECTORY",
+                    "cp -r %{_sourcedir}APPLICATION_DIRECTORY/* %{buildroot}APPLICATION_DIRECTORY",
+                    "%files",
+                    "APPLICATION_DIRECTORY"
             ));
 
-            cmd.validateOutput(MAIN.cannedFormattedString(
-                    "message.using-custom-resource",
-                    String.format("[%s]", MAIN.cannedFormattedString("resource.rpm-spec-file").getValue()),
-                    specFile.getFileName()));
+            new JPackageOutputValidator()
+                    .expectMatchingStrings(MAIN.cannedFormattedString(
+                            "message.using-custom-resource",
+                            String.format("[%s]", MAIN.cannedFormattedString("resource.rpm-spec-file").getValue()),
+                            specFile.getFileName()))
+                    .matchTimestamps()
+                    .stripTimestamps()
+                    .applyTo(cmd);
 
             packageProp.expectedValue(LinuxHelper.getPackageName(cmd)).token("APPLICATION_PACKAGE").resourceDirFile(specFile).validateOutput(cmd);
             verProp.expectedValue(cmd.version()).token("APPLICATION_VERSION").resourceDirFile(specFile).validateOutput(cmd);
@@ -171,9 +181,15 @@ public class LinuxResourceTest {
             Objects.requireNonNull(resourceDirFile);
 
             final var customResourcePath = customResourcePath();
-            cmd.validateOutput(
-                    MAIN.cannedFormattedString("error.unexpected-package-property", name, expectedValue, customValue, customResourcePath),
-                    MAIN.cannedFormattedString("error.unexpected-package-property.advice", token, customValue, name, customResourcePath));
+
+            new JPackageOutputValidator()
+                    .expectMatchingStrings(
+                            MAIN.cannedFormattedString("error.unexpected-package-property", name, expectedValue, customValue, customResourcePath),
+                            MAIN.cannedFormattedString("error.unexpected-package-property.advice", token, customValue, name, customResourcePath)
+                    )
+                    .matchTimestamps()
+                    .stripTimestamps()
+                    .applyTo(cmd);
         }
 
         private Path customResourcePath() {
diff --git a/test/jdk/tools/jpackage/macosx/ArgumentsFilteringTest.java b/test/jdk/tools/jpackage/macosx/ArgumentsFilteringTest.java
index 1a42a30c00e..e4adf3b9616 100644
--- a/test/jdk/tools/jpackage/macosx/ArgumentsFilteringTest.java
+++ b/test/jdk/tools/jpackage/macosx/ArgumentsFilteringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,11 +49,10 @@ public class ArgumentsFilteringTest {
     public void test1() {
         JPackageCommand cmd = JPackageCommand.helloAppImage();
         cmd.executeAndAssertHelloAppImageCreated();
-        var appVerifier = HelloApp.assertMainLauncher(cmd);
-        if (appVerifier != null) {
+        HelloApp.assertMainLauncher(cmd).ifPresent(appVerifier -> {
             appVerifier.execute("-psn_1_1");
             appVerifier.verifyOutput();
-        }
+        });
     }
 
     @Test
@@ -61,10 +60,9 @@ public class ArgumentsFilteringTest {
         JPackageCommand cmd = JPackageCommand.helloAppImage()
                 .addArguments("--arguments", "-psn_2_2");
         cmd.executeAndAssertHelloAppImageCreated();
-        var appVerifier = HelloApp.assertMainLauncher(cmd);
-        if (appVerifier != null) {
+        HelloApp.assertMainLauncher(cmd).ifPresent(appVerifier -> {
             appVerifier.execute("-psn_1_1");
             appVerifier.verifyOutput("-psn_2_2");
-        }
+        });
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/EntitlementsTest.java b/test/jdk/tools/jpackage/macosx/EntitlementsTest.java
index 6e03c858db3..052e301a9ae 100644
--- a/test/jdk/tools/jpackage/macosx/EntitlementsTest.java
+++ b/test/jdk/tools/jpackage/macosx/EntitlementsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,10 +56,9 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary jpackage with --type app-image "--mac-entitlements" parameter
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build EntitlementsTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror EntitlementsTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=EntitlementsTest
@@ -142,7 +141,8 @@ public class EntitlementsTest {
 
         cmd.mutate(MacHelper.useKeychain(keychain)).mutate(new SignKeyOption(
                 SignKeyOption.Type.SIGN_KEY_IDENTITY,
-                SigningBase.StandardCertificateRequest.CODESIGN.spec()
+                SigningBase.StandardCertificateRequest.CODESIGN,
+                keychain
         )::addTo);
 
         cmd.mutate(new AdditionalLauncher("x")::applyTo);
diff --git a/test/jdk/tools/jpackage/macosx/MacSignTest.java b/test/jdk/tools/jpackage/macosx/MacSignTest.java
index af7cf448bdc..dbb78d2416c 100644
--- a/test/jdk/tools/jpackage/macosx/MacSignTest.java
+++ b/test/jdk/tools/jpackage/macosx/MacSignTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,25 +21,34 @@
  * questions.
  */
 
+import static jdk.jpackage.test.MacHelper.SignKeyOption.Type.SIGN_KEY_IDENTITY;
+import static jdk.jpackage.test.MacHelper.SignKeyOption.Type.SIGN_KEY_USER_FULL_NAME;
+import static jdk.jpackage.test.MacHelper.SignKeyOption.Type.SIGN_KEY_USER_SHORT_NAME;
+
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.function.ExceptionBox;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.FailedCommandErrorValidator;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageOutputValidator;
 import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.MacHelper;
+import jdk.jpackage.test.MacHelper.NamedCertificateRequestSupplier;
+import jdk.jpackage.test.MacHelper.ResolvableCertificateRequest;
+import jdk.jpackage.test.MacHelper.SignKeyOption;
+import jdk.jpackage.test.MacHelper.SignKeyOptionWithKeychain;
 import jdk.jpackage.test.MacSign;
-import jdk.jpackage.test.MacSign.CertificateRequest;
-import jdk.jpackage.test.MacSign.CertificateType;
 import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
@@ -48,10 +57,9 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary jpackage with --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build MacSignTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror MacSignTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=MacSignTest
@@ -68,71 +76,87 @@ public class MacSignTest {
         Files.createDirectory(appContent);
         Files.createFile(appContent.resolve("file"));
 
-        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
-        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.app.content"));
+        final var validator = new JPackageOutputValidator().stderr();
 
-        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("error.tool.failed.with.output", "codesign"));
+        validator.expectMatchingStrings(JPackageStringBundle.MAIN.cannedFormattedString(
+                "message.codesign.failed.reason.app.content"));
+
+        final var xcodeWarning = TKit.assertTextStream(JPackageStringBundle.MAIN.cannedFormattedString(
+                "message.codesign.failed.reason.xcode.tools").getValue()).predicate(String::equals);
 
-        final var xcodeWarning = JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.xcode.tools");
         if (!MacHelper.isXcodeDevToolsInstalled()) {
-            expectedStrings.add(xcodeWarning);
+            validator.add(xcodeWarning);
         }
 
-        MacSign.withKeychain(keychain -> {
+        var keychain = SigningBase.StandardKeychain.MAIN.keychain();
+
+        var signingKeyOption = new SignKeyOptionWithKeychain(
+                SIGN_KEY_IDENTITY,
+                SigningBase.StandardCertificateRequest.CODESIGN,
+                keychain);
+
+        validator.add(buildSignCommandErrorValidator(signingKeyOption).create());
+
+        MacSign.withKeychain(_ -> {
+
             // --app-content and --type app-image
             // Expect `message.codesign.failed.reason.app.content` message in the log.
             // This is not a fatal error, just a warning.
             // To make jpackage fail, specify bad additional content.
-            final var cmd = JPackageCommand.helloAppImage()
-                    .ignoreDefaultVerbose(true)
-                    .validateOutput(expectedStrings.toArray(CannedFormattedString[]::new))
+            JPackageCommand.helloAppImage()
+                    .mutate(MacSignTest::init)
+                    .mutate(validator::applyTo)
                     .addArguments("--app-content", appContent)
-                    .addArguments("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN.spec().name());
+                    .mutate(signingKeyOption::addTo)
+                    .mutate(cmd -> {
+                        if (MacHelper.isXcodeDevToolsInstalled()) {
+                            // Check there is no warning about missing xcode command line developer tools.
+                            cmd.validateErr(xcodeWarning.copy().negate());
+                        }
+                    }).execute(1);
 
-            if (MacHelper.isXcodeDevToolsInstalled()) {
-                // Check there is no warning about missing xcode command line developer tools.
-                cmd.validateOutput(TKit.assertTextStream(xcodeWarning.getValue()).negate());
-            }
-
-            MacHelper.useKeychain(cmd, keychain).execute(1);
-        }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.MAIN.keychain());
+        }, MacSign.Keychain.UsageBuilder::addToSearchList, keychain);
     }
 
     @Test
-    public static void testCodesignUnspecifiedFailure() throws IOException {
-
-        var appImageCmd = JPackageCommand.helloAppImage().setFakeRuntime();
-
-        appImageCmd.executeIgnoreExitCode().assertExitCodeIsZero();
+    public static void testCodesignUnspecificFailure() throws IOException {
 
         // This test expects jpackage to respond in a specific way on a codesign failure.
-        // The simplest option to trigger codesign failure is to request the signing of an invalid bundle.
-        // Create app content directory with the name known to fail signing.
-        final var appContent = appImageCmd.appLayout().contentDirectory().resolve("foo.1");
-        Files.createDirectory(appContent);
-        Files.createFile(appContent.resolve("file"));
+        // There are a few ways to make jpackage fail signing. One is using an erroneous
+        // combination of a signing key and a keychain.
 
-        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
-        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("error.tool.failed.with.output", "codesign"));
+        var signingKeyOption = new SignKeyOption(
+                SIGN_KEY_IDENTITY,
+                SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD.certRequest(
+                        SigningBase.StandardKeychain.MAIN.keychain()));
 
         MacSign.withKeychain(keychain -> {
-            final var cmd = new JPackageCommand().setPackageType(PackageType.IMAGE)
-                    .ignoreDefaultVerbose(true)
-                    .validateOutput(expectedStrings.toArray(CannedFormattedString[]::new))
-                    .addArguments("--app-image", appImageCmd.outputBundle())
-                    .addArguments("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN.spec().name());
 
-            MacHelper.useKeychain(cmd, keychain).execute(1);
-        }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.MAIN.keychain());
+            // Build a matcher for jpackage's failed command output.
+            var errorValidator = buildSignCommandErrorValidator(signingKeyOption, keychain)
+                    .output(String.format("%s: no identity found", signingKeyOption.certRequest().name()))
+                    .create();
+
+            JPackageCommand.helloAppImage()
+                    .mutate(MacSignTest::init)
+                    .mutate(errorValidator::applyTo)
+                    .mutate(signingKeyOption::addTo)
+                    .mutate(MacHelper.useKeychain(keychain))
+                    .execute(1);
+
+        }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.DUPLICATE.keychain());
     }
 
     @Test
     @Parameter({"IMAGE", "EXPIRED_SIGNING_KEY_USER_NAME"})
     @Parameter({"MAC_DMG", "EXPIRED_SIGNING_KEY_USER_NAME"})
     @Parameter({"MAC_PKG", "EXPIRED_SIGNING_KEY_USER_NAME", "EXPIRED_SIGNING_KEY_USER_NAME_PKG"})
+    @Parameter({"MAC_PKG", "EXPIRED_SIGNING_KEY_USER_NAME_PKG", "EXPIRED_SIGNING_KEY_USER_NAME"})
 
     @Parameter({"IMAGE", "EXPIRED_SIGN_IDENTITY"})
     @Parameter({"MAC_DMG", "EXPIRED_SIGN_IDENTITY"})
+
+    // Test that jpackage doesn't print duplicated error messages.
     @Parameter({"MAC_PKG", "EXPIRED_SIGN_IDENTITY"})
 
     @Parameter({"IMAGE", "EXPIRED_CODESIGN_SIGN_IDENTITY"})
@@ -141,16 +165,41 @@ public class MacSignTest {
 
     @Parameter({"MAC_PKG", "GOOD_CODESIGN_SIGN_IDENTITY", "EXPIRED_PKG_SIGN_IDENTITY"})
     @Parameter({"MAC_PKG", "EXPIRED_CODESIGN_SIGN_IDENTITY", "GOOD_PKG_SIGN_IDENTITY"})
-    public static void testExpiredCertificate(PackageType type, SignOption... options) {
+    public static void testExpiredCertificate(PackageType type, SignOption... optionIds) {
+
+        var options = Stream.of(optionIds).map(SignOption::option).toList();
+
+        var badOptions = options.stream().filter(option -> {
+            return option.certRequest().expired();
+        }).toList();
 
         MacSign.withKeychain(keychain -> {
+
             final var cmd = MacHelper.useKeychain(JPackageCommand.helloAppImage(), keychain)
-                    .ignoreDefaultVerbose(true)
-                    .addArguments(Stream.of(options).map(SignOption::args).flatMap(List::stream).toList())
+                    .mutate(MacSignTest::init)
+                    .addArguments(options.stream().map(SignKeyOption::asCmdlineArgs).flatMap(List::stream).toList())
                     .setPackageType(type);
 
-            SignOption.configureOutputValidation(cmd, Stream.of(options).filter(SignOption::expired).toList(), opt -> {
-                return JPackageStringBundle.MAIN.cannedFormattedString("error.certificate.expired", opt.identityName());
+            configureOutputValidation(cmd, expectFailures(badOptions), opt -> {
+                if (!opt.passThrough().orElse(false)) {
+                    return expectConfigurationError("error.certificate.outside-validity-period", opt.certRequest().name());
+                } else {
+                    var builder = buildSignCommandErrorValidator(opt, keychain);
+                    switch (opt.optionName().orElseThrow()) {
+                        case KEY_IDENTITY_APP_IMAGE, KEY_USER_NAME -> {
+                            builder.output(String.format("%s: no identity found", opt.certRequest().name()));
+                        }
+                        case KEY_IDENTITY_INSTALLER -> {
+                            var regexp = Pattern.compile(String.format(
+                                    "^productbuild: error: Cannot write product to \\S+ \\(Could not find appropriate signing identity for “%s” in keychain at “%s”\\.\\)",
+                                    Pattern.quote(opt.certRequest().name()),
+                                    Pattern.quote(keychain.name())
+                            ));
+                            builder.validators(TKit.assertTextStream(regexp));
+                        }
+                    }
+                    return builder.create();
+                }
             }).execute(1);
         }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.EXPIRED.keychain());
     }
@@ -158,30 +207,58 @@ public class MacSignTest {
     @Test
     @Parameter({"IMAGE", "GOOD_SIGNING_KEY_USER_NAME"})
     @Parameter({"MAC_DMG", "GOOD_SIGNING_KEY_USER_NAME"})
+    @Parameter({"MAC_PKG", "GOOD_SIGNING_KEY_USER_NAME", "GOOD_SIGNING_KEY_USER_NAME_PKG"})
     @Parameter({"MAC_PKG", "GOOD_SIGNING_KEY_USER_NAME_PKG", "GOOD_SIGNING_KEY_USER_NAME"})
     @Parameter({"IMAGE", "GOOD_CODESIGN_SIGN_IDENTITY"})
     @Parameter({"MAC_PKG", "GOOD_CODESIGN_SIGN_IDENTITY", "GOOD_PKG_SIGN_IDENTITY"})
     @Parameter({"MAC_PKG", "GOOD_PKG_SIGN_IDENTITY"})
-    public static void testMultipleCertificates(PackageType type, SignOption... options) {
+    public static void testMultipleCertificates(PackageType type, SignOption... optionIds) {
+
+        var options = Stream.of(optionIds).map(SignOption::option).toList();
 
         MacSign.withKeychain(keychain -> {
+
             final var cmd = MacHelper.useKeychain(JPackageCommand.helloAppImage(), keychain)
-                    .ignoreDefaultVerbose(true)
-                    .addArguments(Stream.of(options).map(SignOption::args).flatMap(List::stream).toList())
+                    .mutate(MacSignTest::init)
+                    .addArguments(options.stream().map(SignKeyOption::asCmdlineArgs).flatMap(List::stream).toList())
                     .setPackageType(type);
 
-            Predicate<SignOption> filter = opt -> {
-                if (type == PackageType.MAC_PKG && options.length > 1) {
-                    // Only the first error will be reported and it should always be
-                    // for the app image signing, not for the PKG signing.
-                    return opt.identityType() == CertificateType.CODE_SIGN;
-                } else {
-                    return true;
-                }
-            };
+            if (List.of(optionIds).equals(List.of(SignOption.GOOD_PKG_SIGN_IDENTITY))) {
+                /**
+                 * Normally, if multiple signing identities share the same name, signing should
+                 * fail. However, in pass-through signing, when jpackage passes signing
+                 * identities without validation to signing commands, signing a .pkg installer
+                 * with a name matching two signing identities succeeds.
+                 */
+                new JPackageOutputValidator().stdout()
+                        .expectMatchingStrings(JPackageStringBundle.MAIN.cannedFormattedString("warning.unsigned.app.image", "pkg"))
+                        .validateEndOfStream()
+                        .applyTo(cmd);
 
-            SignOption.configureOutputValidation(cmd, Stream.of(options).filter(filter).toList(), opt -> {
-                return JPackageStringBundle.MAIN.cannedFormattedString("error.multiple.certs.found", opt.identityName(), keychain.name());
+                cmd.execute();
+                return;
+            }
+
+            configureOutputValidation(cmd, expectFailures(options), opt -> {
+                if (!opt.passThrough().orElse(false)) {
+                    return expectConfigurationError("error.multiple.certs.found", opt.certRequest().name(), keychain.name());
+                } else {
+                    var builder = buildSignCommandErrorValidator(opt, keychain);
+                    switch (opt.optionName().orElseThrow()) {
+                        case KEY_IDENTITY_APP_IMAGE, KEY_USER_NAME -> {
+                            builder.output(String.format("%s: ambiguous", opt.certRequest().name()));
+                        }
+                        case KEY_IDENTITY_INSTALLER -> {
+                            var regexp = Pattern.compile(String.format(
+                                    "^productbuild: error: Cannot write product to \\S+ \\(Could not find appropriate signing identity for “%s” in keychain at “%s”\\.\\)",
+                                    Pattern.quote(opt.certRequest().name()),
+                                    Pattern.quote(keychain.name())
+                            ));
+                            builder.validators(TKit.assertTextStream(regexp));
+                        }
+                    }
+                    return builder.create();
+                }
             }).execute(1);
         }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.DUPLICATE.keychain());
     }
@@ -189,94 +266,160 @@ public class MacSignTest {
     @Test
     @ParameterSupplier
     @ParameterSupplier("testSelectSigningIdentity_JDK_8371094")
-    public static void testSelectSigningIdentity(String signingKeyUserName, CertificateRequest certRequest) {
+    public static void testSelectSigningIdentity(SignKeyOptionWithKeychain signKeyOption) {
 
         MacSign.withKeychain(keychain -> {
-            final var cmd = MacHelper.useKeychain(JPackageCommand.helloAppImage(), keychain)
-                    .setFakeRuntime()
-                    .addArguments("--mac-signing-key-user-name", signingKeyUserName);
+            final var cmd = JPackageCommand.helloAppImage().setFakeRuntime().mutate(signKeyOption::addTo);
 
-            cmd.executeAndAssertHelloAppImageCreated();
+            cmd.executeAndAssertImageCreated();
 
-            MacSignVerify.assertSigned(cmd.outputBundle(), certRequest);
+            MacSignVerify.verifyAppImageSigned(cmd, signKeyOption.certRequest());
         }, MacSign.Keychain.UsageBuilder::addToSearchList, SigningBase.StandardKeychain.MAIN.keychain());
     }
 
     public static Collection<Object[]> testSelectSigningIdentity() {
+        var keychain = SigningBase.StandardKeychain.MAIN.keychain();
         return Stream.of(
                 SigningBase.StandardCertificateRequest.CODESIGN,
                 SigningBase.StandardCertificateRequest.CODESIGN_UNICODE
-        ).map(SigningBase.StandardCertificateRequest::spec).<Object[]>mapMulti((certRequest, acc) -> {
-            acc.accept(new Object[] {certRequest.shortName(), certRequest});
-            acc.accept(new Object[] {certRequest.name(), certRequest});
+        ).map(certRequest -> {
+            return Stream.of(
+                    SIGN_KEY_USER_FULL_NAME,
+                    SIGN_KEY_USER_SHORT_NAME
+            ).map(type -> {
+                return new SignKeyOptionWithKeychain(type, certRequest, keychain);
+            });
+        }).flatMap(x -> x).map(v -> {
+            return new Object[] {v};
         }).toList();
     }
 
     public static Collection<Object[]> testSelectSigningIdentity_JDK_8371094() {
         return List.<Object[]>of(new Object[] {
-                "ACME Technologies Limited", SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD.spec()
+                new SignKeyOptionWithKeychain(
+                        "ACME Technologies Limited",
+                        SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD,
+                        SigningBase.StandardKeychain.MAIN.keychain())
         });
     }
 
     enum SignOption {
-        EXPIRED_SIGNING_KEY_USER_NAME("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), true, false),
-        EXPIRED_SIGNING_KEY_USER_NAME_PKG("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.PKG_EXPIRED.spec(), true, false),
-        EXPIRED_SIGN_IDENTITY("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), false, false),
-        EXPIRED_CODESIGN_SIGN_IDENTITY("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED.spec(), false, true),
-        EXPIRED_PKG_SIGN_IDENTITY("--mac-installer-sign-identity", SigningBase.StandardCertificateRequest.PKG_EXPIRED.spec(), false, true),
-        GOOD_SIGNING_KEY_USER_NAME("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.CODESIGN.spec(), true, false),
-        GOOD_SIGNING_KEY_USER_NAME_PKG("--mac-signing-key-user-name", SigningBase.StandardCertificateRequest.PKG.spec(), true, false),
-        GOOD_CODESIGN_SIGN_IDENTITY("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.CODESIGN.spec(), false, true),
-        GOOD_PKG_SIGN_IDENTITY("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.PKG.spec(), false, true);
+        EXPIRED_SIGNING_KEY_USER_NAME(SIGN_KEY_USER_SHORT_NAME, SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED),
+        EXPIRED_SIGNING_KEY_USER_NAME_PKG(SIGN_KEY_USER_SHORT_NAME, SigningBase.StandardCertificateRequest.PKG_EXPIRED),
+        EXPIRED_SIGN_IDENTITY(SIGN_KEY_USER_FULL_NAME, SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED),
+        EXPIRED_CODESIGN_SIGN_IDENTITY(SIGN_KEY_IDENTITY, SigningBase.StandardCertificateRequest.CODESIGN_EXPIRED),
+        EXPIRED_PKG_SIGN_IDENTITY(SIGN_KEY_IDENTITY, SigningBase.StandardCertificateRequest.PKG_EXPIRED),
+        GOOD_SIGNING_KEY_USER_NAME(SIGN_KEY_USER_SHORT_NAME, SigningBase.StandardCertificateRequest.CODESIGN),
+        GOOD_SIGNING_KEY_USER_NAME_PKG(SIGN_KEY_USER_SHORT_NAME, SigningBase.StandardCertificateRequest.PKG),
+        GOOD_CODESIGN_SIGN_IDENTITY(SIGN_KEY_IDENTITY, SigningBase.StandardCertificateRequest.CODESIGN),
+        GOOD_PKG_SIGN_IDENTITY(SIGN_KEY_IDENTITY, SigningBase.StandardCertificateRequest.PKG);
 
-        SignOption(String option, MacSign.CertificateRequest cert, boolean shortName, boolean passThrough) {
-            this.option = Objects.requireNonNull(option);
-            this.cert = Objects.requireNonNull(cert);
-            this.shortName = shortName;
-            this.passThrough = passThrough;
+        SignOption(SignKeyOption.Type optionType, NamedCertificateRequestSupplier certRequestSupplier) {
+            this.option = new SignKeyOption(optionType, new ResolvableCertificateRequest(certRequestSupplier.certRequest(), _ -> {
+                throw new UnsupportedOperationException();
+            }, certRequestSupplier.name()));
         }
 
-        boolean passThrough() {
-            return passThrough;
+        SignKeyOption option() {
+            return option;
         }
 
-        boolean expired() {
-            return cert.expired();
+        private final SignKeyOption option;
+    }
+
+    private static JPackageCommand configureOutputValidation(JPackageCommand cmd, Stream<SignKeyOption> options,
+            Function<SignKeyOption, JPackageOutputValidator> conv) {
+
+        // Validate jpackage's output matches expected output.
+
+        var outputValidator = new JPackageOutputValidator().stderr();
+
+        options.sorted(Comparator.comparing(option -> {
+            return option.certRequest().type();
+        })).map(conv).forEach(outputValidator::add);
+
+        outputValidator.validateEndOfStream().applyTo(cmd);
+
+        return cmd;
+    }
+
+    private static Stream<SignKeyOption> expectFailures(Collection<SignKeyOption> options) {
+
+        if (!options.stream().map(option -> {
+            return option.passThrough().orElse(false);
+        }).distinct().reduce((x, y) -> {
+            throw new IllegalArgumentException();
+        }).get()) {
+            // No pass-through signing options.
+            // This means jpackage will validate them at the configuration phase and report all detected errors.
+            return options.stream();
         }
 
-        String identityName() {
-            return cert.name();
+        // Pass-through signing options.
+        // jpackage will not validate them and will report only one error at the packaging phase.
+
+        Function<MacSign.CertificateType, Predicate<SignKeyOption>> filterType = type -> {
+            return option -> {
+                return option.certRequest().type() == type;
+            };
+        };
+
+        var appImageSignOption = options.stream()
+                .filter(filterType.apply(MacSign.CertificateType.CODE_SIGN)).findFirst();
+        var pkgSignOption = options.stream()
+                .filter(filterType.apply(MacSign.CertificateType.INSTALLER)).findFirst();
+
+        if (appImageSignOption.isPresent() && pkgSignOption.isPresent()) {
+            return options.stream().filter(option -> {
+                return appImageSignOption.get() == option;
+            });
+        } else {
+            return options.stream();
+        }
+    }
+
+    private static JPackageOutputValidator expectConfigurationError(String key, Object ... args) {
+        return new JPackageOutputValidator().expectMatchingStrings(JPackageCommand.makeError(key, args)).stderr();
+    }
+
+    private static FailedCommandErrorValidator buildSignCommandErrorValidator(SignKeyOptionWithKeychain option) {
+        return buildSignCommandErrorValidator(option.signKeyOption(), option.keychain());
+    }
+
+    private static FailedCommandErrorValidator buildSignCommandErrorValidator(SignKeyOption option, MacSign.ResolvedKeychain keychain) {
+
+        Objects.requireNonNull(option);
+        Objects.requireNonNull(keychain);
+
+        String cmdlinePatternFormat;
+        String signIdentity;
+
+        switch (option.optionName().orElseThrow()) {
+            case KEY_IDENTITY_APP_IMAGE, KEY_USER_NAME -> {
+                cmdlinePatternFormat = "^/usr/bin/codesign -s %s -vvvv --timestamp --options runtime --prefix \\S+ --keychain %s";
+                if (option.passThrough().orElse(false)) {
+                    signIdentity = String.format("'%s'", option.asCmdlineArgs().getLast());
+                } else {
+                    signIdentity = MacSign.CertificateHash.of(option.certRequest().cert()).toString();
+                }
+            }
+            case KEY_IDENTITY_INSTALLER -> {
+                cmdlinePatternFormat = "^/usr/bin/productbuild --resources \\S+ --sign %s --keychain %s";
+                signIdentity = String.format("'%s'", option.asCmdlineArgs().getLast());
+            }
+            default -> {
+                throw ExceptionBox.reachedUnreachable();
+            }
         }
 
-        CertificateType identityType() {
-            return cert.type();
-        }
+        return new FailedCommandErrorValidator(Pattern.compile(String.format(
+                cmdlinePatternFormat,
+                Pattern.quote(signIdentity),
+                Pattern.quote(keychain.name())
+        ))).exitCode(1);
+    }
 
-        List<String> args() {
-            return List.of(option, shortName ? cert.shortName() : cert.name());
-        }
-
-        static JPackageCommand configureOutputValidation(JPackageCommand cmd, List<SignOption> options,
-                Function<SignOption, CannedFormattedString> conv) {
-            options.stream().filter(SignOption::passThrough)
-                    .map(conv)
-                    .map(CannedFormattedString::getValue)
-                    .map(TKit::assertTextStream)
-                    .map(TKit.TextStreamVerifier::negate)
-                    .forEach(cmd::validateOutput);
-
-            options.stream().filter(Predicate.not(SignOption::passThrough))
-                    .map(conv)
-                    .map(CannedFormattedString::getValue)
-                    .map(TKit::assertTextStream)
-                    .forEach(cmd::validateOutput);
-
-            return cmd;
-        }
-
-        private final String option;
-        private final MacSign.CertificateRequest cert;
-        private final boolean shortName;
-        private final boolean passThrough;
+    private static void init(JPackageCommand cmd) {
+        cmd.setFakeRuntime().ignoreDefaultVerbose(true);
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java b/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java
index 9ee85ae5245..5b2a8b63020 100644
--- a/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java
+++ b/test/jdk/tools/jpackage/macosx/PkgScriptsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.util.stream.Stream;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageOutputValidator;
 import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.MacHelper;
 import jdk.jpackage.test.PackageTest;
@@ -94,7 +95,13 @@ public class PkgScriptsTest {
                             "message.no-default-resource",
                             String.format("[%s]", role.resourceCategory()),
                             role.scriptName());
-                }).forEach(cmd::validateOutput);
+                }).forEach(str -> {
+                    new JPackageOutputValidator()
+                            .expectMatchingStrings(str)
+                            .matchTimestamps()
+                            .stripTimestamps()
+                            .applyTo(cmd);
+                });
             }).addInstallVerifier(cmd -> {
                 customScripts.forEach(customScript -> {
                     customScript.verify(cmd);
diff --git a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
index 37ba8a6c299..3a257a425b6 100644
--- a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,90 +21,83 @@
  * questions.
  */
 
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
-
-import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import jdk.jpackage.test.AdditionalLauncher;
-import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.MacHelper.SignKeyOption;
+import jdk.jpackage.test.MacHelper.SignKeyOptionWithKeychain;
 import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSignVerify;
 
 /**
- * Tests generation of app image with --mac-sign and related arguments. Test will
- * generate app image and verify signature of main launcher and app bundle itself.
- * This test requires that machine is configured with test certificate for
- * "Developer ID Application: jpackage.openjdk.java.net" or alternately
- * "Developer ID Application: " + name specified by system property:
- * "jpackage.mac.signing.key.user.name"
- * in the jpackagerTest keychain (or alternately the keychain specified with
- * the system property "jpackage.mac.signing.keychain".
- * If this certificate is self-signed, it must have be set to
- * always allowed access to this keychain" for user which runs test.
- * (If cert is real (not self signed), the do not set trust to allow.)
+ * Tests signing of an app image.
+ *
+ * <p>
+ * Prerequisites: Keychains with self-signed certificates as specified in
+ * {@link SigningBase.StandardKeychain#MAIN} and
+ * {@link SigningBase.StandardKeychain#SINGLE}.
  */
 
 /*
  * @test
  * @summary jpackage with --type app-image --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build SigningAppImageTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror SigningAppImageTest.java
  * @requires (jpackage.test.MacSignTests == "run")
- * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningAppImageTest
  *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningAppImageTest {
 
     @Test
-    // ({"sign or not", "signing-key or sign-identity", "certificate index"})
-    // Sign, signing-key and ASCII certificate
-    @Parameter({"true", "true", "ASCII_INDEX"})
-    // Sign, signing-key and UNICODE certificate
-    @Parameter({"true", "true", "UNICODE_INDEX"})
-    // Sign, signing-indentity and UNICODE certificate
-    @Parameter({"true", "false", "UNICODE_INDEX"})
-    // Unsigned
-    @Parameter({"false", "true", "INVALID_INDEX"})
-    public void test(boolean doSign, boolean signingKey, SigningBase.CertIndex certEnum) throws Exception {
-        MacSign.withKeychain(toConsumer(keychain -> {
-            test(keychain, doSign, signingKey, certEnum);
-        }), SigningBase.StandardKeychain.MAIN.keychain());
-    }
+    @ParameterSupplier
+    public static void test(SignKeyOptionWithKeychain sign) {
 
-    private void test(MacSign.ResolvedKeychain keychain, boolean doSign, boolean signingKey, SigningBase.CertIndex certEnum) throws Exception {
-        final var certIndex = certEnum.value();
+        var cmd = JPackageCommand.helloAppImage();
 
-        JPackageCommand cmd = JPackageCommand.helloAppImage();
-        if (doSign) {
-            cmd.addArguments("--mac-sign",
-                    "--mac-signing-keychain",
-                    keychain.name());
-            if (signingKey) {
-                cmd.addArguments("--mac-signing-key-user-name",
-                        SigningBase.getDevName(certIndex));
-            } else {
-                cmd.addArguments("--mac-app-image-sign-identity",
-                        SigningBase.getAppCert(certIndex));
-            }
-        }
-        AdditionalLauncher testAL = new AdditionalLauncher("testAL");
+        var testAL = new AdditionalLauncher("testAL");
         testAL.applyTo(cmd);
         cmd.executeAndAssertHelloAppImageCreated();
 
-        Path launcherPath = cmd.appLauncherPath();
-        SigningBase.verifyCodesign(launcherPath, doSign, certIndex);
+        MacSign.withKeychain(keychain -> {
+            sign.addTo(cmd);
+            cmd.executeAndAssertHelloAppImageCreated();
+            MacSignVerify.verifyAppImageSigned(cmd, sign.certRequest());
+        }, sign.keychain());
+    }
 
-        Path testALPath = launcherPath.getParent().resolve("testAL");
-        SigningBase.verifyCodesign(testALPath, doSign, certIndex);
+    public static Collection<Object[]> test() {
 
-        Path appImage = cmd.outputBundle();
-        SigningBase.verifyCodesign(appImage, doSign, certIndex);
-        if (doSign) {
-            SigningBase.verifySpctl(appImage, "exec", certIndex);
+        List<SignKeyOptionWithKeychain> data = new ArrayList<>();
+
+        for (var certRequest : List.of(
+                SigningBase.StandardCertificateRequest.CODESIGN,
+                SigningBase.StandardCertificateRequest.CODESIGN_UNICODE
+        )) {
+            for (var signIdentityType : SignKeyOption.Type.defaultValues()) {
+                SigningBase.StandardKeychain keychain;
+                if (signIdentityType == SignKeyOption.Type.SIGN_KEY_IMPLICIT) {
+                    keychain = SigningBase.StandardKeychain.SINGLE;
+                    if (!keychain.contains(certRequest)) {
+                        continue;
+                    }
+                } else {
+                    keychain = SigningBase.StandardKeychain.MAIN;
+                }
+
+                data.add(new SignKeyOptionWithKeychain(signIdentityType, certRequest, keychain.keychain()));
+            }
         }
+
+        return data.stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java b/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java
index 906734e6a9c..a6d94b59bd9 100644
--- a/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,38 +21,40 @@
  * questions.
  */
 
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
-
-import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import jdk.jpackage.test.AdditionalLauncher;
-import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.MacHelper.SignKeyOption;
+import jdk.jpackage.test.MacHelper.SignKeyOptionWithKeychain;
 import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
 
 /**
- * Tests generation of app image and then signs generated app image with --mac-sign
- * and related arguments. Test will generate app image and verify signature of main
- * launcher and app bundle itself. This test requires that machine is configured with
- * test certificate for "Developer ID Application: jpackage.openjdk.java.net" or
- * alternately "Developer ID Application: " + name specified by system property:
- * "jpackage.mac.signing.key.user.name" in the jpackagerTest keychain
- * (or alternately the keychain specified with the system property
- * "jpackage.mac.signing.keychain". If this certificate is self-signed, it must
- * have be set to always allowed access to this keychain" for user which runs test.
- * (If cert is real (not self signed), the do not set trust to allow.)
+ * Tests signing of a signed/unsigned predefined app image.
+ *
+ * <p>
+ * Prerequisites: Keychains with self-signed certificates as specified in
+ * {@link SigningBase.StandardKeychain#MAIN} and
+ * {@link SigningBase.StandardKeychain#SINGLE}.
  */
 
 /*
  * @test
  * @summary jpackage with --type app-image --app-image "appImage" --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build SigningAppImageTwoStepsTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror SigningAppImageTwoStepsTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningAppImageTwoStepsTest
@@ -61,67 +63,140 @@ import jdk.jpackage.test.TKit;
 public class SigningAppImageTwoStepsTest {
 
     @Test
-    // ({"sign or not", "signing-key or sign-identity"})
-    // Sign and signing-key
-    @Parameter({"true", "true"})
-    // Sign and sign-identity
-    @Parameter({"true", "false"})
-    // Unsigned
-    @Parameter({"false", "true"})
-    public void test(boolean signAppImage, boolean signingKey) throws Exception {
-        MacSign.withKeychain(toConsumer(keychain -> {
-            test(keychain, signAppImage, signingKey);
-        }), SigningBase.StandardKeychain.MAIN.keychain());
+    @ParameterSupplier
+    public static void test(TestSpec spec) {
+        spec.test();
     }
 
-    private static void test(MacSign.ResolvedKeychain keychain, boolean signAppImage, boolean signingKey) throws Exception {
+    public record TestSpec(Optional<SignKeyOptionWithKeychain> signAppImage, SignKeyOptionWithKeychain sign) {
 
-        Path appimageOutput = TKit.createTempDirectory("appimage");
+        public TestSpec {
+            Objects.requireNonNull(signAppImage);
+            Objects.requireNonNull(sign);
+        }
 
-        // Generate app image. Signed or unsigned based on test
-        // parameter. We should able to sign predfined app images
-        // which are signed or unsigned.
-        JPackageCommand appImageCmd = JPackageCommand.helloAppImage()
-                .setArgumentValue("--dest", appimageOutput);
-        if (signAppImage) {
-            appImageCmd.addArguments("--mac-sign",
-                    "--mac-signing-keychain",
-                    keychain.name());
-            if (signingKey) {
-                appImageCmd.addArguments("--mac-signing-key-user-name",
-                    SigningBase.getDevName(SigningBase.DEFAULT_INDEX));
-            } else {
-                appImageCmd.addArguments("--mac-app-image-sign-identity",
-                    SigningBase.getAppCert(SigningBase.DEFAULT_INDEX));
+        @Override
+        public String toString() {
+            return Stream.of(
+                    String.format("app-image=%s", signAppImage.map(Objects::toString).orElse("unsigned")),
+                    sign.toString()
+            ).collect(Collectors.joining("; "));
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static class Builder {
+
+            TestSpec create() {
+                return new TestSpec(Optional.ofNullable(signAppImage), sign);
+            }
+
+            Builder keychain(SigningBase.StandardKeychain v) {
+                keychain = Objects.requireNonNull(v);
+                return this;
+            }
+
+            Builder certRequest(SigningBase.StandardCertificateRequest v) {
+                certRequest = Objects.requireNonNull(v);
+                return this;
+            }
+
+            Builder signIdentityType(SignKeyOption.Type v) {
+                signIdentityType = Objects.requireNonNull(v);
+                return this;
+            }
+
+            Builder sign() {
+                sign = createSignKeyOption();
+                return this;
+            }
+
+            Builder signAppImage() {
+                signAppImage = createSignKeyOption();
+                return this;
+            }
+
+            private SignKeyOptionWithKeychain createSignKeyOption() {
+                return new SignKeyOptionWithKeychain(
+                        signIdentityType,
+                        certRequest,
+                        keychain.keychain());
+            }
+
+            private SigningBase.StandardKeychain keychain = SigningBase.StandardKeychain.MAIN;
+            private SigningBase.StandardCertificateRequest certRequest = SigningBase.StandardCertificateRequest.CODESIGN;
+            private SignKeyOption.Type signIdentityType = SignKeyOption.Type.SIGN_KEY_IDENTITY;
+
+            private SignKeyOptionWithKeychain signAppImage;
+            private SignKeyOptionWithKeychain sign;
+        }
+
+        void test() {
+            var appImageCmd = JPackageCommand.helloAppImage()
+                    .setFakeRuntime()
+                    .setArgumentValue("--dest", TKit.createTempDirectory("appimage"));
+
+            // Add an additional launcher
+            AdditionalLauncher testAL = new AdditionalLauncher("testAL");
+            testAL.applyTo(appImageCmd);
+
+            signAppImage.ifPresentOrElse(signOption -> {
+                MacSign.withKeychain(keychain -> {
+                    signOption.addTo(appImageCmd);
+                    appImageCmd.execute();
+                    MacSignVerify.verifyAppImageSigned(appImageCmd, signOption.certRequest());
+                }, signOption.keychain());
+            }, appImageCmd::execute);
+
+            MacSign.withKeychain(keychain -> {
+                var cmd = new JPackageCommand()
+                        .setPackageType(PackageType.IMAGE)
+                        .addArguments("--app-image", appImageCmd.outputBundle())
+                        .mutate(sign::addTo);
+
+                cmd.executeAndAssertHelloAppImageCreated();
+                MacSignVerify.verifyAppImageSigned(cmd, sign.certRequest());
+            }, sign.keychain());
+        }
+    }
+
+    public static Collection<Object[]> test() {
+
+        var signIdentityTypes = List.of(
+                SignKeyOption.Type.SIGN_KEY_USER_SHORT_NAME,
+                SignKeyOption.Type.SIGN_KEY_IDENTITY_APP_IMAGE,
+                SignKeyOption.Type.SIGN_KEY_IMPLICIT
+        );
+
+        List<TestSpec> data = new ArrayList<>();
+
+        for (var appImageSign : withAndWithout(SignKeyOption.Type.SIGN_KEY_IDENTITY)) {
+            var builder = TestSpec.build();
+            appImageSign.ifPresent(signIdentityType -> {
+                // Sign the input app image bundle with the key not used in the jpackage command line being tested.
+                // This way we can test if jpackage keeps or replaces the signature of the input app image bundle.
+                builder.signIdentityType(signIdentityType)
+                        .certRequest(SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD)
+                        .signAppImage();
+            });
+            for (var signIdentityType : signIdentityTypes) {
+                builder.signIdentityType(signIdentityType)
+                        .certRequest(SigningBase.StandardCertificateRequest.CODESIGN);
+                if (signIdentityType == SignKeyOption.Type.SIGN_KEY_IMPLICIT) {
+                    builder.keychain(SigningBase.StandardKeychain.SINGLE);
+                }
+                data.add(builder.sign().create());
             }
         }
 
-        // Add addtional launcher
-        AdditionalLauncher testAL = new AdditionalLauncher("testAL");
-        testAL.applyTo(appImageCmd);
+        return data.stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
 
-        // Generate app image
-        appImageCmd.executeAndAssertHelloAppImageCreated();
-
-        // Double check if it is signed or unsigned based on signAppImage
-        SigningBase.verifyAppImageSignature(appImageCmd, signAppImage, "testAL");
-
-        // Sign app image
-        JPackageCommand cmd = new JPackageCommand();
-        cmd.setPackageType(PackageType.IMAGE)
-            .addArguments("--app-image", appImageCmd.outputBundle().toAbsolutePath())
-            .addArguments("--mac-sign")
-            .addArguments("--mac-signing-keychain", keychain.name());
-        if (signingKey) {
-            cmd.addArguments("--mac-signing-key-user-name",
-                SigningBase.getDevName(SigningBase.DEFAULT_INDEX));
-        } else {
-            cmd.addArguments("--mac-app-image-sign-identity",
-                SigningBase.getAppCert(SigningBase.DEFAULT_INDEX));
-        }
-        cmd.executeAndAssertImageCreated();
-
-        // Should be signed app image
-        SigningBase.verifyAppImageSignature(appImageCmd, true, "testAL");
+    private static <T> List<Optional<T>> withAndWithout(T value) {
+        return List.of(Optional.empty(), Optional.of(value));
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/SigningBase.java b/test/jdk/tools/jpackage/macosx/SigningBase.java
new file mode 100644
index 00000000000..e7e2d7e44cf
--- /dev/null
+++ b/test/jdk/tools/jpackage/macosx/SigningBase.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+import jdk.jpackage.test.MacHelper.NamedCertificateRequestSupplier;
+import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.CertificateType;
+import jdk.jpackage.test.MacSign.KeychainWithCertsSpec;
+import jdk.jpackage.test.MacSign.ResolvedKeychain;
+import jdk.jpackage.test.TKit;
+
+
+/*
+ * @test
+ * @summary Setup the environment for jpackage macos signing tests.
+ *          Creates required keychains and signing identities.
+ *          Does NOT run any jpackage tests.
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @requires (jpackage.test.MacSignTests == "setup")
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=SigningBase.setUp
+ */
+
+/*
+ * @test
+ * @summary Tear down the environment for jpackage macos signing tests.
+ *          Deletes required keychains and signing identities.
+ *          Does NOT run any jpackage tests.
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @requires (jpackage.test.MacSignTests == "teardown")
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=SigningBase.tearDown
+ */
+
+public class SigningBase {
+
+    public enum StandardCertificateRequest implements NamedCertificateRequestSupplier {
+        CODESIGN(cert().userName(NAME_ASCII)),
+        CODESIGN_COPY(cert().days(100).userName(NAME_ASCII)),
+        CODESIGN_ACME_TECH_LTD(cert().days(100).userName("ACME Technologies Limited (ABC12345)")),
+        PKG(cert().type(CertificateType.INSTALLER).userName(NAME_ASCII)),
+        PKG_COPY(cert().type(CertificateType.INSTALLER).days(100).userName(NAME_ASCII)),
+        CODESIGN_UNICODE(cert().userName(NAME_UNICODE)),
+        PKG_UNICODE(cert().type(CertificateType.INSTALLER).userName(NAME_UNICODE)),
+        CODESIGN_EXPIRED(cert().expired().userName("expired jpackage test")),
+        PKG_EXPIRED(cert().expired().type(CertificateType.INSTALLER).userName("expired jpackage test"));
+
+        StandardCertificateRequest(CertificateRequest.Builder specBuilder) {
+            this.spec = specBuilder.create();
+        }
+
+        @Override
+        public CertificateRequest certRequest() {
+            return spec;
+        }
+
+        private static CertificateRequest.Builder cert() {
+            return CertificateRequest.build();
+        }
+
+        private final CertificateRequest spec;
+    }
+
+    /**
+     * Standard keychains used in signing tests.
+     */
+    public enum StandardKeychain {
+        /**
+         * The primary keychain with good certificates.
+         */
+        MAIN("jpackagerTest.keychain",
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG,
+                StandardCertificateRequest.CODESIGN_UNICODE,
+                StandardCertificateRequest.PKG_UNICODE,
+                StandardCertificateRequest.CODESIGN_ACME_TECH_LTD),
+        /**
+         * A keychain with some good and some expired certificates.
+         */
+        EXPIRED("jpackagerTest-expired.keychain",
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG,
+                StandardCertificateRequest.CODESIGN_EXPIRED,
+                StandardCertificateRequest.PKG_EXPIRED),
+        /**
+         * A keychain with duplicated certificates.
+         */
+        DUPLICATE("jpackagerTest-duplicate.keychain",
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG,
+                StandardCertificateRequest.CODESIGN_COPY,
+                StandardCertificateRequest.PKG_COPY),
+        /**
+         * A keychain with a single certificate for each role.
+         */
+        SINGLE("jpackagerTest-single.keychain",
+                StandardCertificateRequest.CODESIGN,
+                StandardCertificateRequest.PKG),
+        ;
+
+        StandardKeychain(String keychainName, StandardCertificateRequest... certs) {
+            this(keychainName,
+                    certs[0].certRequest(),
+                    Stream.of(certs).skip(1).map(StandardCertificateRequest::certRequest).toArray(CertificateRequest[]::new));
+        }
+
+        StandardKeychain(String keychainName, CertificateRequest cert, CertificateRequest... otherCerts) {
+            final var builder = keychain(keychainName).addCert(cert);
+            List.of(otherCerts).forEach(builder::addCert);
+            this.keychain = new ResolvedKeychain(builder.create());
+        }
+
+        public ResolvedKeychain keychain() {
+            return keychain;
+        }
+
+        public X509Certificate mapCertificateRequest(CertificateRequest certRequest) {
+            return Objects.requireNonNull(keychain.mapCertificateRequests().get(certRequest));
+        }
+
+        public boolean contains(StandardCertificateRequest certRequest) {
+            return keychain.spec().certificateRequests().contains(certRequest.spec);
+        }
+
+        private static KeychainWithCertsSpec.Builder keychain(String name) {
+            return KeychainWithCertsSpec.build().name(name);
+        }
+
+        private static List<KeychainWithCertsSpec> signingEnv() {
+            return Stream.of(values()).map(StandardKeychain::keychain).map(ResolvedKeychain::spec).toList();
+        }
+
+        private final ResolvedKeychain keychain;
+    }
+
+    public static void setUp() {
+        MacSign.setUp(StandardKeychain.signingEnv());
+    }
+
+    public static void tearDown() {
+        MacSign.tearDown(StandardKeychain.signingEnv());
+    }
+
+    public static void verifySignTestEnvReady() {
+        if (!SignEnvReady.VALUE) {
+            TKit.throwSkippedException(new IllegalStateException("Misconfigured signing test environment"));
+        }
+    }
+
+    private final class SignEnvReady {
+        static final boolean VALUE = MacSign.isDeployed(StandardKeychain.signingEnv());
+    }
+
+    private static final String NAME_ASCII = "jpackage.openjdk.java.net";
+    private static final String NAME_UNICODE = "jpackage.openjdk.java.net (ö)";
+}
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
index b1e9155dacb..d1c17fb61cd 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,180 +21,318 @@
  * questions.
  */
 
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
-
-import java.nio.file.Path;
-import jdk.jpackage.test.Annotations.Parameter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.SequencedSet;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.ApplicationLayout;
-import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.MacHelper;
+import jdk.jpackage.test.MacHelper.ResolvableCertificateRequest;
+import jdk.jpackage.test.MacHelper.SignKeyOption;
 import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 
 /**
- * Tests generation of dmg and pkg with --mac-sign and related arguments.
- * Test will generate pkg and verifies its signature. It verifies that dmg
- * is not signed, but app image inside dmg is signed. This test requires that
- * the machine is configured with test certificate for
- * "Developer ID Installer: jpackage.openjdk.java.net" in
- * jpackagerTest keychain with
- * always allowed access to this keychain for user which runs test.
- * note:
- * "jpackage.openjdk.java.net" can be over-ridden by system property
- * "jpackage.mac.signing.key.user.name", and
- * "jpackagerTest" can be over-ridden by system property
- * "jpackage.mac.signing.keychain"
+ * Tests bundling of .pkg and .dmg packages with various signing options.
+ *
+ * <p>
+ * Prerequisites: Keychains with self-signed certificates as specified in
+ * {@link SigningBase.StandardKeychain#MAIN} and
+ * {@link SigningBase.StandardKeychain#SINGLE}.
  */
 
+
 /*
  * @test
  * @summary jpackage with --type pkg,dmg --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
  * @key jpackagePlatformPackage
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build SigningPackageTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror SigningPackageTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @requires (jpackage.test.SQETest != null)
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
- * --jpt-run=SigningPackageTest
- * --jpt-space-subst=*
- * --jpt-include=SigningPackageTest.test(true,*true,*true,*ASCII_INDEX)
- * --jpt-before-run=SigningBase.verifySignTestEnvReady
+ *  --jpt-run=SigningPackageTest.test
+ *  --jpt-space-subst=*
+ *  --jpt-include=({--mac-signing-key-user-name:*CODESIGN},*{--mac-signing-key-user-name:*PKG},*MAC_DMG+MAC_PKG)
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 
 /*
  * @test
  * @summary jpackage with --type pkg,dmg --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
  * @key jpackagePlatformPackage
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build SigningPackageTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror SigningPackageTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @requires (jpackage.test.SQETest == null)
- * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=SigningPackageTest
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=SigningPackageTest.test
  *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningPackageTest {
 
-    private static boolean isAppImageSigned(JPackageCommand cmd) {
-        return cmd.hasArgument("--mac-signing-key-user-name") ||
-               cmd.hasArgument("--mac-app-image-sign-identity");
+    @Test
+    @ParameterSupplier
+    public static void test(TestSpec spec) {
+        MacSign.withKeychain(_ -> {
+            spec.test();
+        }, spec.keychain());
     }
 
-    private static boolean isPKGSigned(JPackageCommand cmd) {
-        return cmd.hasArgument("--mac-signing-key-user-name") ||
-               cmd.hasArgument("--mac-installer-sign-identity");
+    public static Collection<Object[]> test() {
+        return TestSpec.testCases().stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
     }
 
-    private static void verifyPKG(JPackageCommand cmd) {
-        Path outputBundle = cmd.outputBundle();
-        SigningBase.verifyPkgutil(outputBundle, isPKGSigned(cmd), getCertIndex(cmd));
-        if (isPKGSigned(cmd)) {
-            SigningBase.verifySpctl(outputBundle, "install", getCertIndex(cmd));
-        }
-    }
+    record TestSpec(
+            Optional<SignKeyOption> appImageSignOption,
+            Optional<SignKeyOption> packageSignOption,
+            Set<PackageType> packageTypes) {
 
-    private static void verifyDMG(JPackageCommand cmd) {
-        Path outputBundle = cmd.outputBundle();
-        SigningBase.verifyDMG(outputBundle);
-    }
+        TestSpec {
+            Objects.requireNonNull(appImageSignOption);
+            Objects.requireNonNull(packageSignOption);
+            Objects.requireNonNull(packageTypes);
 
-    private static void verifyAppImageInDMG(JPackageCommand cmd) {
-        MacHelper.withExplodedDmg(cmd, dmgImage -> {
-            Path launcherPath = ApplicationLayout.platformAppImage()
-                    .resolveAt(dmgImage).launchersDirectory().resolve(cmd.name());
-            // We will be called with all folders in DMG since JDK-8263155, but
-            // we only need to verify app.
-            if (dmgImage.endsWith(cmd.name() + ".app")) {
-                SigningBase.verifyCodesign(launcherPath, isAppImageSigned(cmd),
-                                           getCertIndex(cmd));
-                SigningBase.verifyCodesign(dmgImage, isAppImageSigned(cmd),
-                                           getCertIndex(cmd));
-                if (isAppImageSigned(cmd)) {
-                    SigningBase.verifySpctl(dmgImage, "exec", getCertIndex(cmd));
+            if (appImageSignOption.isEmpty() && packageSignOption.isEmpty()) {
+                // No signing.
+                throw new IllegalArgumentException();
+            }
+
+            if (packageTypes.isEmpty() || !PackageType.MAC.containsAll(packageTypes)) {
+                // Invalid package types.
+                throw new IllegalArgumentException();
+            }
+
+            if (packageSignOption.isPresent()) {
+                if (!packageTypes.contains(PackageType.MAC_PKG)) {
+                    // .pkg installer should be signed, but .pkg type is missing.
+                    throw new IllegalArgumentException();
+                }
+
+                if (appImageSignOption.isEmpty()) {
+                    if (!List.of(
+                            SignKeyOption.Type.SIGN_KEY_IDENTITY,
+                            SignKeyOption.Type.SIGN_KEY_IDENTITY_SHA1
+                    ).contains(packageSignOption.get().type())) {
+                        // They request to sign the .pkg installer without
+                        // the "--mac-installer-sign-identity" option,
+                        // but didn't specify a signing option for the packaged app image.
+                        // This is wrong because only the "--mac-installer-sign-identity" option
+                        // allows signing a .pkg installer without signing its packaged app image.
+                        throw new IllegalArgumentException();
+                    }
+                } else if (appImageSignOption.get().type() != packageSignOption.get().type()) {
+                    // Signing option types should be the same.
+                    throw new IllegalArgumentException();
                 }
             }
-        });
-    }
 
-    private static int getCertIndex(JPackageCommand cmd) {
-        if (cmd.hasArgument("--mac-signing-key-user-name")) {
-            String devName = cmd.getArgumentValue("--mac-signing-key-user-name");
-            return SigningBase.getDevNameIndex(devName);
-        } else {
-            // Signing-indentity
-            return SigningBase.CertIndex.UNICODE_INDEX.value();
+            if (!(packageTypes instanceof SequencedSet)) {
+                packageTypes = new TreeSet<>(packageTypes);
+            }
+        }
+
+        TestSpec(
+                Optional<SignKeyOption> appImageSignOption,
+                Optional<SignKeyOption> packageSignOption,
+                PackageType... packageTypes) {
+            this(appImageSignOption, packageSignOption, Set.of(packageTypes));
+        }
+
+        @Override
+        public String toString() {
+            return Stream.of(
+                    signKeyOptions(),
+                    Stream.of(packageTypes.stream().map(Object::toString).collect(Collectors.joining("+")))
+            ).flatMap(x -> x).map(Object::toString).collect(Collectors.joining(", "));
+        }
+
+        Stream<SignKeyOption> signKeyOptions() {
+            return Stream.concat(appImageSignOption.stream(), packageSignOption.stream());
+        }
+
+        Optional<ResolvableCertificateRequest> bundleSignIdentity(PackageType type) {
+            switch (type) {
+                case MAC_DMG -> {
+                    return Optional.empty();
+                }
+                case MAC_PKG -> {
+                    return packageSignOption.map(SignKeyOption::certRequest);
+                }
+                default -> {
+                    throw new IllegalArgumentException();
+                }
+            }
+        }
+
+        void test() {
+            initTest().configureHelloApp().addInstallVerifier(cmd -> {
+                appImageSignOption.map(SignKeyOption::certRequest).ifPresent(signIdentity -> {
+                    MacSignVerify.verifyAppImageSigned(cmd, signIdentity);
+                });
+            }).run();
+        }
+
+        PackageTest initTest() {
+            return new PackageTest().forTypes(packageTypes).mutate(test -> {
+                appImageSignOption.ifPresent(signOption -> {
+                    test.addInitializer(signOption::setTo);
+                });
+                packageSignOption.ifPresent(signOption -> {
+                    test.forTypes(PackageType.MAC_PKG, () -> {
+                        test.addInitializer(signOption::setTo);
+                    });
+                });
+            }).addBundleVerifier(cmd -> {
+                bundleSignIdentity(cmd.packageType()).ifPresent(signIdentity -> {
+                    MacSignVerify.verifyPkgSigned(cmd, signIdentity);
+                });
+            }).addInitializer(MacHelper.useKeychain(keychain())::accept);
+        }
+
+        MacSign.ResolvedKeychain keychain() {
+            return chooseKeychain(Stream.of(
+                    appImageSignOption.stream(),
+                    packageSignOption.stream()
+            ).flatMap(x -> x).map(SignKeyOption::type).findFirst().orElseThrow()).keychain();
+        }
+
+        /**
+         * Types of test cases to skip.
+         */
+        enum SkipTestCases {
+            /**
+             * Skip test cases with signing identities/key names with symbols outside of the
+             * ASCII codepage.
+             */
+            SKIP_UNICODE,
+            /**
+             * Skip test cases in which the value of the "--mac-signing-key-user-name"
+             * option is the full signing identity name.
+             */
+            SKIP_SIGN_KEY_USER_FULL_NAME,
+            /**
+             * Skip test cases in which the value of the "--mac-installer-sign-identity" or
+             * "--mac-app-image-sign-identity" option is the SHA1 digest of the signing
+             * certificate.
+             */
+            SKIP_SIGN_KEY_IDENTITY_SHA1,
+            ;
+        }
+
+        static List<TestSpec> minimalTestCases() {
+            return testCases(SkipTestCases.values());
+        }
+
+        static List<TestSpec> testCases(SkipTestCases... skipTestCases) {
+
+            final var skipTestCasesAsSet = Set.of(skipTestCases);
+
+            final var signIdentityTypes = Stream.of(SignKeyOption.Type.defaultValues()).filter(v -> {
+                switch (v) {
+                    case SIGN_KEY_USER_FULL_NAME -> {
+                        return !skipTestCasesAsSet.contains(SkipTestCases.SKIP_SIGN_KEY_USER_FULL_NAME);
+                    }
+                    case SIGN_KEY_IDENTITY_SHA1 -> {
+                        return !skipTestCasesAsSet.contains(SkipTestCases.SKIP_SIGN_KEY_IDENTITY_SHA1);
+                    }
+                    default -> {
+                        return true;
+                    }
+                }
+            }).toList();
+
+            List<TestSpec> data = new ArrayList<>();
+
+            List<List<SigningBase.StandardCertificateRequest>> certRequestGroups;
+            if (!skipTestCasesAsSet.contains(SkipTestCases.SKIP_UNICODE)) {
+                certRequestGroups = List.of(
+                        List.of(SigningBase.StandardCertificateRequest.CODESIGN, SigningBase.StandardCertificateRequest.PKG),
+                        List.of(SigningBase.StandardCertificateRequest.CODESIGN_UNICODE, SigningBase.StandardCertificateRequest.PKG_UNICODE)
+                );
+            } else {
+                certRequestGroups = List.of(
+                        List.of(SigningBase.StandardCertificateRequest.CODESIGN, SigningBase.StandardCertificateRequest.PKG)
+                );
+            }
+
+            for (var certRequests : certRequestGroups) {
+                for (var signIdentityType : signIdentityTypes) {
+                    if (signIdentityType == SignKeyOption.Type.SIGN_KEY_IMPLICIT
+                            && !SigningBase.StandardKeychain.SINGLE.contains(certRequests.getFirst())) {
+                        // Skip invalid test case: the keychain for testing signing without
+                        // an explicitly specified signing key option doesn't have this signing key.
+                        break;
+                    }
+
+                    if (signIdentityType.passThrough() && !certRequests.contains(SigningBase.StandardCertificateRequest.CODESIGN)) {
+                        // Using a pass-through signing option.
+                        // Doesn't make sense to waste time on testing it with multiple certificates.
+                        // Skip the test cases using non "default" certificate.
+                        break;
+                    }
+
+                    var keychain = chooseKeychain(signIdentityType).keychain();
+                    var appImageSignKeyOption = new SignKeyOption(signIdentityType, certRequests.getFirst(), keychain);
+                    var pkgSignKeyOption = new SignKeyOption(signIdentityType, certRequests.getLast(), keychain);
+
+                    switch (signIdentityType) {
+                        case SIGN_KEY_IDENTITY, SIGN_KEY_IDENTITY_SHA1 -> {
+                            // Use "--mac-installer-sign-identity" and "--mac-app-image-sign-identity" signing options.
+                            // They allows to sign the packaged app image and the installer (.pkg) separately.
+                            data.add(new TestSpec(Optional.of(appImageSignKeyOption), Optional.empty(), PackageType.MAC));
+                            data.add(new TestSpec(Optional.empty(), Optional.of(pkgSignKeyOption), PackageType.MAC_PKG));
+                        }
+                        case SIGN_KEY_USER_SHORT_NAME, SIGN_KEY_IMPLICIT -> {
+                            // Use "--mac-signing-key-user-name" signing option with short user name or implicit signing option.
+                            // It signs both the packaged app image and the installer (.pkg).
+                            // Thus, if the installer is not signed, it can be used only with .dmg packaging.
+                            data.add(new TestSpec(Optional.of(appImageSignKeyOption), Optional.empty(), PackageType.MAC_DMG));
+                        }
+                        case SIGN_KEY_USER_FULL_NAME -> {
+                            // Use "--mac-signing-key-user-name" signing option with the full user name.
+                            // Like SIGN_KEY_USER_SHORT_NAME, jpackage will try to use it to sign both
+                            // the packaged app image and the installer (.pkg).
+                            // It will fail to sign the installer, though, because the signing identity is unsuitable.
+                            // That is why, use it with .dmg packaging only and not with .pkg packaging.
+                            data.add(new TestSpec(Optional.of(appImageSignKeyOption), Optional.empty(), PackageType.MAC_DMG));
+                            continue;
+                        }
+                        default -> {
+                            // SignKeyOption.Type.defaultValues() should return
+                            // such a sequence that makes this code location unreachable.
+                            throw ExceptionBox.reachedUnreachable();
+                        }
+                    }
+                    data.add(new TestSpec(Optional.of(appImageSignKeyOption), Optional.of(pkgSignKeyOption), PackageType.MAC));
+                }
+            }
+
+            return data;
+        }
+
+        private static SigningBase.StandardKeychain chooseKeychain(SignKeyOption.Type signIdentityType) {
+            if (signIdentityType == SignKeyOption.Type.SIGN_KEY_IMPLICIT) {
+                return SigningBase.StandardKeychain.SINGLE;
+            } else {
+                return SigningBase.StandardKeychain.MAIN;
+            }
         }
     }
-
-    @Test
-    // ("signing-key or sign-identity", "sign app-image", "sign pkg", "certificate index"})
-    // Signing-key and ASCII certificate
-    @Parameter({"true", "true", "true", "ASCII_INDEX"})
-    // Signing-key and UNICODE certificate
-    @Parameter({"true", "true", "true", "UNICODE_INDEX"})
-    // Signing-indentity and UNICODE certificate
-    @Parameter({"false", "true", "true", "UNICODE_INDEX"})
-    // Signing-indentity, but sign app-image only and UNICODE certificate
-    @Parameter({"false", "true", "false", "UNICODE_INDEX"})
-    // Signing-indentity, but sign pkg only and UNICODE certificate
-    @Parameter({"false", "false", "true", "UNICODE_INDEX"})
-    public static void test(boolean signingKey, boolean signAppImage, boolean signPKG, SigningBase.CertIndex certEnum) throws Exception {
-        MacSign.withKeychain(toConsumer(keychain -> {
-            test(keychain, signingKey, signAppImage, signPKG, certEnum);
-        }), SigningBase.StandardKeychain.MAIN.keychain());
-    }
-
-    private static void test(MacSign.ResolvedKeychain keychain, boolean signingKey, boolean signAppImage, boolean signPKG, SigningBase.CertIndex certEnum) throws Exception {
-        final var certIndex = certEnum.value();
-
-        new PackageTest()
-                .configureHelloApp()
-                .forTypes(PackageType.MAC)
-                .addInitializer(cmd -> {
-                    cmd.addArguments("--mac-sign",
-                            "--mac-signing-keychain", keychain.name());
-                    if (signingKey) {
-                        cmd.addArguments("--mac-signing-key-user-name",
-                                         SigningBase.getDevName(certIndex));
-                    } else {
-                        if (signAppImage) {
-                            cmd.addArguments("--mac-app-image-sign-identity",
-                                             SigningBase.getAppCert(certIndex));
-                        }
-                        if (signPKG) {
-                            cmd.addArguments("--mac-installer-sign-identity",
-                                             SigningBase.getInstallerCert(certIndex));
-                        }
-                    }
-                })
-                .forTypes(PackageType.MAC_PKG)
-                .addBundleVerifier(SigningPackageTest::verifyPKG)
-                .forTypes(PackageType.MAC_DMG)
-                .addInitializer(cmd -> {
-                    if (!signingKey) {
-                        // jpackage throws expected error with
-                        // --mac-installer-sign-identity and DMG type
-                        cmd.removeArgumentWithValue("--mac-installer-sign-identity");
-                        // In case of not signing app image and DMG we need to
-                        // remove signing completely, otherwise we will default
-                        // to --mac-signing-key-user-name once
-                        // --mac-installer-sign-identity is removed.
-                        if (!signAppImage) {
-                            cmd.removeArgumentWithValue("--mac-signing-keychain");
-                            cmd.removeArgument("--mac-sign");
-                        }
-                    }
-                })
-                .addBundleVerifier(SigningPackageTest::verifyDMG)
-                .addBundleVerifier(SigningPackageTest::verifyAppImageInDMG)
-                .run();
-    }
 }
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
index 586d8d68444..d0de9c8c704 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,25 +21,22 @@
  * questions.
  */
 
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
-import jdk.jpackage.test.MacHelper;
+import jdk.jpackage.test.MacHelper.ResolvableCertificateRequest;
 import jdk.jpackage.test.MacHelper.SignKeyOption;
+import jdk.jpackage.test.MacHelper.SignKeyOptionWithKeychain;
 import jdk.jpackage.test.MacSign;
 import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.PackageFile;
@@ -52,22 +49,23 @@ import jdk.jpackage.test.TKit;
  * signed/unsigned .pkg or .dmg package.
  *
  * <p>
- * Prerequisites: A keychain with self-signed certificates as specified in
- * {@link SigningBase.StandardKeychain#MAIN}.
+ * Prerequisites: Keychains with self-signed certificates as specified in
+ * {@link SigningBase.StandardKeychain#MAIN} and
+ * {@link SigningBase.StandardKeychain#SINGLE}.
  */
 
 /*
  * @test
  * @summary jpackage with --type pkg,dmg --app-image
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
  * @key jpackagePlatformPackage
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build SigningPackageTwoStepTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror SigningPackageTest.java
+ * @compile -Xlint:all -Werror SigningPackageTwoStepTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @requires (jpackage.test.SQETest == null)
- * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningPackageTwoStepTest
  *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
@@ -75,176 +73,148 @@ public class SigningPackageTwoStepTest {
 
     @Test
     @ParameterSupplier
-    public static void test(TestSpec spec) {
-        MacSign.withKeychain(toConsumer(keychain -> {
-            spec.test(keychain);
-        }), SigningBase.StandardKeychain.MAIN.keychain());
+    public static void test(TwoStepsTestSpec spec) {
+        spec.test();
     }
 
-    public record TestSpec(Optional<SignKeyOption> signAppImage, Map<PackageType, SignKeyOption> signPackage) {
+    @Test
+    public static void testBundleSignedAppImage() {
 
-        public TestSpec {
-            Objects.requireNonNull(signAppImage);
-            Objects.requireNonNull(signPackage);
+        var appImageCmd = JPackageCommand.helloAppImage();
 
-            if ((signAppImage.isEmpty() && signPackage.isEmpty()) || !PackageType.MAC.containsAll(signPackage.keySet())) {
-                // Unexpected package types.
-                throw new IllegalArgumentException();
-            }
+        var predefinedAppImageSignOption = predefinedAppImageSignOption();
 
-            // Ensure stable result of toString() call.
-            if (!SortedMap.class.isInstance(signPackage)) {
-                signPackage = new TreeMap<>(signPackage);
-            }
-        }
-
-        @Override
-        public String toString() {
-            var sb = new StringBuilder();
-
-            signAppImage.ifPresent(signOption -> {
-                sb.append(String.format("app-image=%s", signOption));
-            });
-
-            if (!sb.isEmpty() && !signPackage.isEmpty()) {
-                sb.append("; ");
-            }
-
-            if (!signPackage.isEmpty()) {
-                sb.append(signPackage);
-            }
-
-            return sb.toString();
-        }
-
-        boolean signNativeBundle() {
-            return signPackage.isEmpty();
-        }
-
-        static Builder build() {
-            return new Builder();
-        }
-
-        static class Builder {
-
-            TestSpec create() {
-                return new TestSpec(Optional.ofNullable(signAppImage), signPackage);
-            }
-
-            Builder certRequest(SigningBase.StandardCertificateRequest v) {
-                return certRequest(v.spec());
-            }
-
-            Builder certRequest(MacSign.CertificateRequest v) {
-                certRequest = Objects.requireNonNull(v);
-                return this;
-            }
-
-            Builder signIdentityType(SignKeyOption.Type v) {
-                signIdentityType = Objects.requireNonNull(v);
-                return this;
-            }
-
-            Builder signAppImage() {
-                signAppImage = createSignKeyOption();
-                return this;
-            }
-
-            Builder signPackage(PackageType type) {
-                Objects.requireNonNull(type);
-                signPackage.put(type, createSignKeyOption());
-                return this;
-            }
-
-            Builder signPackage() {
-                PackageType.MAC.forEach(this::signPackage);
-                return this;
-            }
-
-            private SignKeyOption createSignKeyOption() {
-                return new SignKeyOption(signIdentityType, certRequest);
-            }
-
-            private MacSign.CertificateRequest certRequest = SigningBase.StandardCertificateRequest.CODESIGN.spec();
-            private SignKeyOption.Type signIdentityType = SignKeyOption.Type.SIGN_KEY_IDENTITY;
-
-            private SignKeyOption signAppImage;
-            private Map<PackageType, SignKeyOption> signPackage = new HashMap<>();
-        }
-
-        void test(MacSign.ResolvedKeychain keychain) {
-
-            var appImageCmd = JPackageCommand.helloAppImage().setFakeRuntime();
-            MacHelper.useKeychain(appImageCmd, keychain);
-            signAppImage.ifPresent(signOption -> {
-                signOption.setTo(appImageCmd);
-            });
-
-            var test = new PackageTest();
-
-            signAppImage.map(SignKeyOption::certRequest).ifPresent(certRequest -> {
-                // The predefined app image is signed, verify bundled app image is signed too.
-                test.addInstallVerifier(cmd -> {
-                    MacSignVerify.verifyAppImageSigned(cmd, certRequest, keychain);
-                });
-            });
-
-            Optional.ofNullable(signPackage.get(PackageType.MAC_PKG)).map(SignKeyOption::certRequest).ifPresent(certRequest -> {
-                test.forTypes(PackageType.MAC_PKG, () -> {
-                    test.addBundleVerifier(cmd -> {
-                        MacSignVerify.verifyPkgSigned(cmd, certRequest, keychain);
-                    });
-                });
-            });
-
-            test.forTypes(signPackage.keySet()).addRunOnceInitializer(() -> {
-                appImageCmd.setArgumentValue("--dest", TKit.createTempDirectory("appimage")).execute(0);
-            }).usePredefinedAppImage(appImageCmd).addInitializer(cmd -> {
-                MacHelper.useKeychain(cmd, keychain);
-                Optional.ofNullable(signPackage.get(cmd.packageType())).ifPresent(signOption -> {
-                    signOption.setTo(cmd);
-                });
-
-                if (signAppImage.isPresent()) {
-                    // Predefined app image is signed. Expect a warning.
-                    cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString(
-                            "warning.per.user.app.image.signed",
-                            PackageFile.getPathInAppImage(Path.of(""))));
-                } else if (cmd.packageType() == PackageType.MAC_PKG && signPackage.containsKey(cmd.packageType())) {
-                    // Create signed ".pkg" bundle from the unsigned predefined app image. Expect a warning.
-                    cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString("warning.unsigned.app.image", "pkg"));
-                }
-            })
-            .run();
-        }
+        new PackageTest().addRunOnceInitializer(() -> {
+            createPredefinedAppImage(appImageCmd, Optional.of(predefinedAppImageSignOption));
+        }).usePredefinedAppImage(appImageCmd).addInitializer(cmd -> {
+            configureOutputValidator(cmd, true, false);
+        }).addInstallVerifier(cmd -> {
+            MacSignVerify.verifyAppImageSigned(cmd, predefinedAppImageSignOption.certRequest());
+        }).run();
     }
 
     public static Collection<Object[]> test() {
 
-        List<TestSpec.Builder> data = new ArrayList<>();
+        List<TwoStepsTestSpec> data = new ArrayList<>();
 
-        Stream.of(SignKeyOption.Type.values()).flatMap(signIdentityType -> {
-            return Stream.of(
-                    // Sign both predefined app image and native package.
-                    TestSpec.build().signIdentityType(signIdentityType)
-                            .signAppImage()
-                            .signPackage()
-                            .certRequest(SigningBase.StandardCertificateRequest.PKG)
-                            .signPackage(PackageType.MAC_PKG),
+        for (var signAppImage : List.of(true, false)) {
+            Optional<SignKeyOptionWithKeychain> appImageSignOption;
+            if (signAppImage) {
+                // Sign the predefined app image bundle with the key not used in the jpackage command line being tested.
+                // This way we can test if jpackage keeps or replaces the signature of
+                // the predefined app image bundle when backing it in the pkg or dmg installer.
+                appImageSignOption = Optional.of(predefinedAppImageSignOption());
+            } else {
+                appImageSignOption = Optional.empty();
+            }
 
-                    // Don't sign predefined app image, sign native package.
-                    TestSpec.build().signIdentityType(signIdentityType)
-                            .signPackage()
-                            .certRequest(SigningBase.StandardCertificateRequest.PKG)
-                            .signPackage(PackageType.MAC_PKG),
+            for (var signPackage : SigningPackageTest.TestSpec.minimalTestCases()) {
+                data.add(new TwoStepsTestSpec(appImageSignOption, signPackage));
+            }
+        }
 
-                    // Sign predefined app image, don't sign native package.
-                    TestSpec.build().signIdentityType(signIdentityType).signAppImage()
-            );
-        }).forEach(data::add);
-
-        return data.stream().map(TestSpec.Builder::create).map(v -> {
+        return data.stream().map(v -> {
             return new Object[] {v};
         }).toList();
     }
+
+    record TwoStepsTestSpec(Optional<SignKeyOptionWithKeychain> signAppImage, SigningPackageTest.TestSpec signPackage) {
+
+        TwoStepsTestSpec {
+            Objects.requireNonNull(signAppImage);
+            Objects.requireNonNull(signPackage);
+        }
+
+        @Override
+        public String toString() {
+            return Stream.of(
+                    String.format("app-image=%s", signAppImage.map(Objects::toString).orElse("unsigned")),
+                    signPackage.toString()
+            ).collect(Collectors.joining("; "));
+        }
+
+        Optional<ResolvableCertificateRequest> packagedAppImageSignIdentity() {
+            return signAppImage.map(SignKeyOptionWithKeychain::certRequest);
+        }
+
+        void test() {
+
+            var appImageCmd = JPackageCommand.helloAppImage();
+
+            var test = signPackage.initTest().addRunOnceInitializer(() -> {
+                createPredefinedAppImage(appImageCmd, signAppImage);
+            }).usePredefinedAppImage(appImageCmd).addInitializer(cmd -> {
+                configureOutputValidator(cmd,
+                        signAppImage.isPresent(),
+                        (cmd.packageType() == PackageType.MAC_PKG) && signPackage.packageSignOption().isPresent());
+            }).addInstallVerifier(cmd -> {
+                packagedAppImageSignIdentity().ifPresent(certRequest -> {
+                    MacSignVerify.verifyAppImageSigned(cmd, certRequest);
+                });
+            });
+
+            MacSign.withKeychain(_ -> {
+                test.run();
+            }, signPackage.keychain());
+        }
+    }
+
+    private static SignKeyOptionWithKeychain predefinedAppImageSignOption() {
+        // Sign the predefined app image bundle with the key not used in the jpackage command line being tested.
+        // This way we can test if jpackage keeps or replaces the signature of the input app image bundle.
+        return new SignKeyOptionWithKeychain(
+                SignKeyOption.Type.SIGN_KEY_USER_SHORT_NAME,
+                SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD,
+                SigningBase.StandardKeychain.MAIN.keychain());
+    }
+
+    private static void createPredefinedAppImage(JPackageCommand appImageCmd, Optional<SignKeyOptionWithKeychain> signAppImage) {
+        Objects.requireNonNull(appImageCmd);
+        Objects.requireNonNull(signAppImage);
+
+        appImageCmd.setFakeRuntime().setArgumentValue("--dest", TKit.createTempDirectory("appimage"));
+
+        signAppImage.ifPresentOrElse(signOption -> {
+            signOption.setTo(appImageCmd);
+
+            MacSign.withKeychain(_ -> {
+                appImageCmd.execute(0);
+            }, signOption.keychain());
+
+            // Verify that the predefined app image is signed.
+            MacSignVerify.verifyAppImageSigned(appImageCmd, signOption.certRequest());
+        }, () -> {
+            appImageCmd.execute(0);
+        });
+    }
+
+    private static void configureOutputValidator(JPackageCommand cmd, boolean signAppImage, boolean signPackage) {
+        var signedPredefinedAppImageWarning = JPackageStringBundle.MAIN.cannedFormattedString(
+                "warning.per.user.app.image.signed",
+                PackageFile.getPathInAppImage(Path.of("")));
+
+        var signedInstallerFromUnsignedPredefinedAppImageWarning =
+                JPackageStringBundle.MAIN.cannedFormattedString("warning.unsigned.app.image", "pkg");
+
+        // The warnings are mutually exclusive
+        final Optional<CannedFormattedString> expected;
+        final List<CannedFormattedString> unexpected = new ArrayList<>();
+
+        if (signAppImage) {
+            expected = Optional.of(signedPredefinedAppImageWarning);
+        } else {
+            unexpected.add(signedPredefinedAppImageWarning);
+            if (signPackage) {
+                expected = Optional.of(signedInstallerFromUnsignedPredefinedAppImageWarning);
+            } else {
+                expected = Optional.empty();
+                unexpected.add(signedInstallerFromUnsignedPredefinedAppImageWarning);
+            }
+        }
+
+        expected.ifPresent(cmd::validateOut);
+        unexpected.forEach(str -> {
+            cmd.validateOut(TKit.assertTextStream(cmd.getValue(str)).negate());
+        });
+    }
 }
diff --git a/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java b/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java
index ccc39f7a367..54021aa2a0b 100644
--- a/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,17 +21,31 @@
  * questions.
  */
 
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+import static jdk.jpackage.test.JPackageCommand.RuntimeImageType.RUNTIME_TYPE_FAKE;
 
 import java.nio.file.Path;
-import java.util.function.Predicate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.internal.util.MacBundle;
+import jdk.jpackage.internal.util.Slot;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.MacHelper;
+import jdk.jpackage.test.MacHelper.ResolvableCertificateRequest;
+import jdk.jpackage.test.MacHelper.SignKeyOption;
+import jdk.jpackage.test.MacHelper.SignKeyOptionWithKeychain;
 import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSignVerify;
+import jdk.jpackage.test.MacSignVerify.SpctlType;
 import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.TKit;
 
 /**
  * Tests generation of dmg and pkg with --mac-sign and related arguments. Test
@@ -43,126 +57,182 @@ import jdk.jpackage.test.PackageTest;
  * app image signing and it will be covered by SigningPackageTest.
  *
  * <p>
- * Following combinations are tested:
- * <ol>
- * <li>"--runtime-image" points to unsigned JDK bundle and --mac-sign is not
- * provided. Expected result: runtime image ad-hoc signed.
- * <li>"--runtime-image" points to unsigned JDK bundle and --mac-sign is
- * provided. Expected result: Everything is signed with provided certificate.
- * <li>"--runtime-image" points to signed JDK bundle and --mac-sign is not
- * provided. Expected result: runtime image is signed with original certificate.
- * <li>"--runtime-image" points to signed JDK bundle and --mac-sign is provided.
- * Expected result: runtime image is signed with provided certificate.
- * <li>"--runtime-image" points to JDK image and --mac-sign is not provided.
- * Expected result: runtime image ad-hoc signed.
- * <li>"--runtime-image" points to JDK image and --mac-sign is provided.
- * Expected result: Everything is signed with provided certificate.
- * </ol>
- *
- * This test requires that the machine is configured with test certificate for
- * "Developer ID Installer: jpackage.openjdk.java.net" in jpackagerTest keychain
- * with always allowed access to this keychain for user which runs test. note:
- * "jpackage.openjdk.java.net" can be over-ridden by system property
- * "jpackage.mac.signing.key.user.name"
+ * Prerequisites: Keychains with self-signed certificates as specified in
+ * {@link SigningBase.StandardKeychain#MAIN} and
+ * {@link SigningBase.StandardKeychain#SINGLE}.
  */
 
 /*
  * @test
  * @summary jpackage with --type pkg,dmg --runtime-image --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library base
  * @key jpackagePlatformPackage
- * @build SigningBase
  * @build jdk.jpackage.test.*
- * @build SigningRuntimeImagePackageTest
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @compile -Xlint:all -Werror SigningPackageTest.java
+ * @compile -Xlint:all -Werror SigningRuntimeImagePackageTest.java
  * @requires (jpackage.test.MacSignTests == "run")
  * @requires (jpackage.test.SQETest == null)
- * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningRuntimeImagePackageTest
  *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningRuntimeImagePackageTest {
 
-    private static JPackageCommand addSignOptions(JPackageCommand cmd, MacSign.ResolvedKeychain keychain, int certIndex) {
-        if (certIndex != SigningBase.CertIndex.INVALID_INDEX.value()) {
-            cmd.addArguments(
-                    "--mac-sign",
-                    "--mac-signing-keychain", keychain.name(),
-                    "--mac-signing-key-user-name", SigningBase.getDevName(certIndex));
-        }
-        return cmd;
-    }
-
-    private static Path createInputRuntimeBundle(MacSign.ResolvedKeychain keychain, int certIndex) {
-        return MacHelper.createRuntimeBundle(cmd -> {
-            addSignOptions(cmd, keychain, certIndex);
-        });
+    @Test
+    @ParameterSupplier
+    public static void test(RuntimeTestSpec spec) {
+        spec.test();
     }
 
     @Test
-    // useJDKBundle  - If "true" predefined runtime image will be converted to
-    //                 JDK bundle. If "false" JDK image will be used.
-    // JDKBundleCert - Certificate to sign JDK bundle before calling jpackage.
-    // signCert      - Certificate to sign bundle produced by jpackage.
-    // 1) unsigned JDK bundle and --mac-sign is not provided
-    @Parameter({"true", "INVALID_INDEX", "INVALID_INDEX"})
-    // 2) unsigned JDK bundle and --mac-sign is provided
-    @Parameter({"true", "INVALID_INDEX", "ASCII_INDEX"})
-    // 3) signed JDK bundle and --mac-sign is not provided
-    @Parameter({"true", "UNICODE_INDEX", "INVALID_INDEX"})
-    // 4) signed JDK bundle and --mac-sign is provided
-    @Parameter({"true", "UNICODE_INDEX", "ASCII_INDEX"})
-    // 5) JDK image and --mac-sign is not provided
-    @Parameter({"false", "INVALID_INDEX", "INVALID_INDEX"})
-    // 6) JDK image and --mac-sign is provided
-    @Parameter({"false", "INVALID_INDEX", "ASCII_INDEX"})
-    public static void test(boolean useJDKBundle,
-                            SigningBase.CertIndex jdkBundleCert,
-                            SigningBase.CertIndex signCert) throws Exception {
-        MacSign.withKeychain(toConsumer(keychain -> {
-            test(keychain, useJDKBundle, jdkBundleCert, signCert);
-        }), SigningBase.StandardKeychain.MAIN.keychain());
+    public static void testBundleSignedRuntime() {
+
+        Slot<Path> predefinedRuntime = Slot.createEmpty();
+
+        var signRuntime = runtimeImageSignOption();
+
+        new PackageTest().addRunOnceInitializer(() -> {
+            predefinedRuntime.set(createRuntime(Optional.of(signRuntime), RuntimeType.BUNDLE));
+        }).addInitializer(cmd -> {
+            cmd.ignoreDefaultRuntime(true);
+            cmd.removeArgumentWithValue("--input");
+            cmd.setArgumentValue("--runtime-image", predefinedRuntime.get());
+        }).addInstallVerifier(cmd -> {
+            MacSignVerify.verifyAppImageSigned(cmd, signRuntime.certRequest());
+        }).run();
     }
 
-    private static void test(MacSign.ResolvedKeychain keychain, boolean useJDKBundle,
-            SigningBase.CertIndex jdkBundleCert,
-            SigningBase.CertIndex signCert) throws Exception {
+    public static Collection<Object[]> test() {
 
-        final Path inputRuntime[] = new Path[1];
+        List<RuntimeTestSpec> data = new ArrayList<>();
 
-        new PackageTest()
-                .addRunOnceInitializer(() -> {
-                    if (useJDKBundle) {
-                        inputRuntime[0] = createInputRuntimeBundle(keychain, jdkBundleCert.value());
-                    } else {
-                        inputRuntime[0] = JPackageCommand.createInputRuntimeImage();
-                    }
-                })
-                .addInitializer(cmd -> {
-                    cmd.addArguments("--runtime-image", inputRuntime[0]);
-                    // Remove --input parameter from jpackage command line as we don't
-                    // create input directory in the test and jpackage fails
-                    // if --input references non existent directory.
-                    cmd.removeArgumentWithValue("--input");
-                    addSignOptions(cmd, keychain, signCert.value());
-                })
-                .addInstallVerifier(cmd -> {
-                    final var certIndex = Stream.of(signCert, jdkBundleCert)
-                            .filter(Predicate.isEqual(SigningBase.CertIndex.INVALID_INDEX).negate())
-                            .findFirst().orElse(SigningBase.CertIndex.INVALID_INDEX).value();
+        for (var runtimeSpec : List.of(
+                Map.entry(RuntimeType.IMAGE, false /* unsigned */),
+                Map.entry(RuntimeType.BUNDLE, false /* unsigned */),
+                Map.entry(RuntimeType.BUNDLE, true /* signed */)
+        )) {
+            var runtimeType = runtimeSpec.getKey();
+            var signRuntime = runtimeSpec.getValue();
 
-                    final var signed = certIndex != SigningBase.CertIndex.INVALID_INDEX.value();
+            Optional<SignKeyOptionWithKeychain> runtimeSignOption;
+            if (signRuntime) {
+                // Sign the runtime bundle with the key not used in the jpackage command line being tested.
+                // This way we can test if jpackage keeps or replaces the signature of
+                // the predefined runtime bundle when backing it in the pkg or dmg installer.
+                runtimeSignOption = Optional.of(runtimeImageSignOption());
+            } else {
+                runtimeSignOption = Optional.empty();
+            }
 
-                    final var unfoldedBundleDir = cmd.appRuntimeDirectory();
+            for (var signPackage : SigningPackageTest.TestSpec.minimalTestCases()) {
+                data.add(new RuntimeTestSpec(runtimeSignOption, runtimeType, signPackage));
+            }
+        }
 
-                    final var libjli = unfoldedBundleDir.resolve("Contents/MacOS/libjli.dylib");
+        return data.stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
 
-                    SigningBase.verifyCodesign(libjli, signed, certIndex);
-                    SigningBase.verifyCodesign(unfoldedBundleDir, signed, certIndex);
-                    if (signed) {
-                        SigningBase.verifySpctl(unfoldedBundleDir, "exec", certIndex);
-                    }
-                })
-                .run();
+    enum RuntimeType {
+        IMAGE,
+        BUNDLE,
+        ;
+    }
+
+    record RuntimeTestSpec(
+            Optional<SignKeyOptionWithKeychain> signRuntime,
+            RuntimeType runtimeType,
+            SigningPackageTest.TestSpec signPackage) {
+
+        RuntimeTestSpec {
+            Objects.requireNonNull(signRuntime);
+            Objects.requireNonNull(runtimeType);
+            Objects.requireNonNull(signPackage);
+        }
+
+        @Override
+        public String toString() {
+            var runtimeToken = new StringBuilder();
+            runtimeToken.append("runtime={").append(runtimeType);
+            signRuntime.ifPresent(v -> {
+                runtimeToken.append(", ").append(v);
+            });
+            runtimeToken.append('}');
+            return Stream.of(runtimeToken, signPackage).map(Objects::toString).collect(Collectors.joining("; "));
+        }
+
+        Optional<ResolvableCertificateRequest> packagedAppImageSignIdentity() {
+            if (runtimeType == RuntimeType.IMAGE) {
+                return signPackage.appImageSignOption().map(SignKeyOption::certRequest);
+            } else {
+                return signPackage.appImageSignOption().or(() -> {
+                    return signRuntime.map(SignKeyOptionWithKeychain::signKeyOption);
+                }).map(SignKeyOption::certRequest);
+            }
+        }
+
+        void test() {
+
+            Slot<Path> predefinedRuntime = Slot.createEmpty();
+
+            var test = signPackage.initTest().addRunOnceInitializer(() -> {
+                predefinedRuntime.set(createRuntime(signRuntime, runtimeType));
+            }).addInitializer(cmd -> {
+                cmd.ignoreDefaultRuntime(true);
+                cmd.removeArgumentWithValue("--input");
+                cmd.setArgumentValue("--runtime-image", predefinedRuntime.get());
+            }).addInstallVerifier(cmd -> {
+                packagedAppImageSignIdentity().ifPresent(certRequest -> {
+                    MacSignVerify.verifyAppImageSigned(cmd, certRequest);
+                });
+            });
+
+            MacSign.withKeychain(_ -> {
+                test.run();
+            }, signPackage.keychain());
+        }
+    }
+
+    private static SignKeyOptionWithKeychain runtimeImageSignOption() {
+        // Sign the runtime bundle with the key not used in the jpackage command line being tested.
+        // This way we can test if jpackage keeps or replaces the signature of
+        // the predefined runtime bundle when backing it in the pkg or dmg installer.
+        return new SignKeyOptionWithKeychain(
+                SignKeyOption.Type.SIGN_KEY_USER_SHORT_NAME,
+                SigningBase.StandardCertificateRequest.CODESIGN_ACME_TECH_LTD,
+                SigningBase.StandardKeychain.MAIN.keychain());
+    }
+
+    private static Path createRuntime(Optional<SignKeyOptionWithKeychain> signRuntime, RuntimeType runtimeType) {
+        if (runtimeType == RuntimeType.IMAGE && signRuntime.isEmpty()) {
+            return JPackageCommand.createInputRuntimeImage(RUNTIME_TYPE_FAKE);
+        } else {
+            Slot<Path> runtimeBundle = Slot.createEmpty();
+
+            MacSign.withKeychain(keychain -> {
+                var runtimeBundleBuilder = MacHelper.buildRuntimeBundle();
+                signRuntime.ifPresent(signingOption -> {
+                    runtimeBundleBuilder.mutator(signingOption::setTo);
+                });
+                runtimeBundle.set(runtimeBundleBuilder.type(RUNTIME_TYPE_FAKE).create());
+            }, SigningBase.StandardKeychain.MAIN.keychain());
+
+            if (runtimeType == RuntimeType.IMAGE) {
+                return MacBundle.fromPath(runtimeBundle.get()).orElseThrow().homeDir();
+            } else {
+                // Verify the runtime bundle is properly signed/unsigned.
+                signRuntime.map(SignKeyOptionWithKeychain::certRequest).ifPresentOrElse(certRequest -> {
+                    MacSignVerify.assertSigned(runtimeBundle.get(), certRequest);
+                    var signOrigin = MacSignVerify.findSpctlSignOrigin(SpctlType.EXEC, runtimeBundle.get()).orElse(null);
+                    TKit.assertEquals(certRequest.name(), signOrigin,
+                            String.format("Check [%s] has sign origin as expected", runtimeBundle.get()));
+                }, () -> {
+                    MacSignVerify.assertAdhocSigned(runtimeBundle.get());
+                });
+                return runtimeBundle.get();
+            }
+        }
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningBase.java b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
deleted file mode 100644
index b1a709c9cf0..00000000000
--- a/test/jdk/tools/jpackage/macosx/base/SigningBase.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.nio.file.Path;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Stream;
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.MacSign;
-import jdk.jpackage.test.MacSign.CertificateRequest;
-import jdk.jpackage.test.MacSign.CertificateType;
-import jdk.jpackage.test.MacSign.KeychainWithCertsSpec;
-import jdk.jpackage.test.MacSign.ResolvedKeychain;
-import jdk.jpackage.test.MacSignVerify;
-import jdk.jpackage.test.TKit;
-
-
-/*
- * @test
- * @summary Setup the environment for jpackage macos signing tests.
- *          Creates required keychains and signing identities.
- *          Does NOT run any jpackag tests.
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @compile -Xlint:all -Werror SigningBase.java
- * @requires (jpackage.test.MacSignTests == "setup")
- * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=SigningBase.setUp
- */
-
-/*
- * @test
- * @summary Tear down the environment for jpackage macos signing tests.
- *          Deletes required keychains and signing identities.
- *          Does NOT run any jpackag tests.
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @compile -Xlint:all -Werror SigningBase.java
- * @requires (jpackage.test.MacSignTests == "teardown")
- * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=SigningBase.tearDown
- */
-
-public class SigningBase {
-
-    public enum StandardCertificateRequest {
-        CODESIGN(cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
-        CODESIGN_COPY(cert().days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
-        CODESIGN_ACME_TECH_LTD(cert().days(100).userName("ACME Technologies Limited (ABC12345)")),
-        PKG(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
-        PKG_COPY(cert().type(CertificateType.INSTALLER).days(100).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
-        CODESIGN_UNICODE(cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
-        PKG_UNICODE(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
-        CODESIGN_EXPIRED(cert().expired().userName("expired jpackage test")),
-        PKG_EXPIRED(cert().expired().type(CertificateType.INSTALLER).userName("expired jpackage test"));
-
-        StandardCertificateRequest(CertificateRequest.Builder specBuilder) {
-            this.spec = specBuilder.create();
-        }
-
-        public CertificateRequest spec() {
-            return spec;
-        }
-
-        private static CertificateRequest.Builder cert() {
-            return new CertificateRequest.Builder();
-        }
-
-        private final CertificateRequest spec;
-    }
-
-    /**
-     * Standard keychains used in signing tests.
-     */
-    public enum StandardKeychain {
-        /**
-         * The primary keychain with good certificates.
-         */
-        MAIN("jpackagerTest.keychain",
-                StandardCertificateRequest.CODESIGN,
-                StandardCertificateRequest.PKG,
-                StandardCertificateRequest.CODESIGN_UNICODE,
-                StandardCertificateRequest.PKG_UNICODE,
-                StandardCertificateRequest.CODESIGN_ACME_TECH_LTD),
-        /**
-         * A keychain with some good and some expired certificates.
-         */
-        EXPIRED("jpackagerTest-expired.keychain",
-                StandardCertificateRequest.CODESIGN,
-                StandardCertificateRequest.PKG,
-                StandardCertificateRequest.CODESIGN_EXPIRED,
-                StandardCertificateRequest.PKG_EXPIRED),
-        /**
-         * A keychain with duplicated certificates.
-         */
-        DUPLICATE("jpackagerTest-duplicate.keychain",
-                StandardCertificateRequest.CODESIGN,
-                StandardCertificateRequest.PKG,
-                StandardCertificateRequest.CODESIGN_COPY,
-                StandardCertificateRequest.PKG_COPY);
-
-        StandardKeychain(String keychainName, StandardCertificateRequest... certs) {
-            this(keychainName, certs[0].spec(), Stream.of(certs).skip(1).map(StandardCertificateRequest::spec).toArray(CertificateRequest[]::new));
-        }
-
-        StandardKeychain(String keychainName, CertificateRequest cert, CertificateRequest... otherCerts) {
-            final var builder = keychain(keychainName).addCert(cert);
-            List.of(otherCerts).forEach(builder::addCert);
-            this.keychain = new ResolvedKeychain(builder.create());
-        }
-
-        public ResolvedKeychain keychain() {
-            return keychain;
-        }
-
-        public X509Certificate mapCertificateRequest(CertificateRequest certRequest) {
-            return Objects.requireNonNull(keychain.mapCertificateRequests().get(certRequest));
-        }
-
-        private static KeychainWithCertsSpec.Builder keychain(String name) {
-            return new KeychainWithCertsSpec.Builder().name(name);
-        }
-
-        private static List<KeychainWithCertsSpec> signingEnv() {
-            return Stream.of(values()).map(StandardKeychain::keychain).map(ResolvedKeychain::spec).toList();
-        }
-
-        private final ResolvedKeychain keychain;
-    }
-
-    public static void setUp() {
-        MacSign.setUp(StandardKeychain.signingEnv());
-    }
-
-    public static void tearDown() {
-        MacSign.tearDown(StandardKeychain.signingEnv());
-    }
-
-    public static void verifySignTestEnvReady() {
-        if (!Inner.SIGN_ENV_READY) {
-            TKit.throwSkippedException(new IllegalStateException("Misconfigured signing test environment"));
-        }
-    }
-
-    private final class Inner {
-        private static final boolean SIGN_ENV_READY = MacSign.isDeployed(StandardKeychain.signingEnv());
-    }
-
-    enum CertIndex {
-        ASCII_INDEX(0),
-        UNICODE_INDEX(1),
-        INVALID_INDEX(-1);
-
-        CertIndex(int value) {
-            this.value = value;
-        }
-
-        int value() {
-            return value;
-        }
-
-        private final int value;
-    }
-
-    public static int DEFAULT_INDEX = 0;
-    private static String [] DEV_NAMES = {
-        "jpackage.openjdk.java.net",
-        "jpackage.openjdk.java.net (ö)",
-    };
-
-    public static String getDevName(int certIndex) {
-        // Always use values from system properties if set
-        String value = System.getProperty("jpackage.mac.signing.key.user.name");
-        if (value != null) {
-            return value;
-        }
-
-        return DEV_NAMES[certIndex];
-    }
-
-    public static int getDevNameIndex(String devName) {
-        return Arrays.binarySearch(DEV_NAMES, devName);
-    }
-
-    public static String getAppCert(int certIndex) {
-        return "Developer ID Application: " + getDevName(certIndex);
-    }
-
-    public static String getInstallerCert(int certIndex) {
-        return "Developer ID Installer: " + getDevName(certIndex);
-    }
-
-    public static void verifyCodesign(Path target, boolean signed, int certIndex) {
-        if (signed) {
-            final var certRequest = getCertRequest(certIndex);
-            MacSignVerify.assertSigned(target, certRequest);
-        } else {
-            MacSignVerify.assertAdhocSigned(target);
-        }
-    }
-
-    // Since we no longer have unsigned app image, but we need to check
-    // DMG which is not adhoc or certificate signed and we cannot use verifyCodesign
-    // for this. verifyDMG() is introduced to check that DMG is unsigned.
-    // Should not be used to validated anything else.
-    public static void verifyDMG(Path target) {
-        if (!target.toString().toLowerCase().endsWith(".dmg")) {
-            throw new IllegalArgumentException("Unexpected target: " + target);
-        }
-
-        MacSignVerify.assertUnsigned(target);
-    }
-
-    public static void verifySpctl(Path target, String type, int certIndex) {
-        final var standardCertIndex = Stream.of(CertIndex.values()).filter(v -> {
-            return v.value() == certIndex;
-        }).findFirst().orElseThrow();
-
-        final var standardType = Stream.of(MacSignVerify.SpctlType.values()).filter(v -> {
-            return v.value().equals(type);
-        }).findFirst().orElseThrow();
-
-        final String expectedSignOrigin;
-        if (standardCertIndex == CertIndex.INVALID_INDEX) {
-            expectedSignOrigin = null;
-        } else if (standardType == MacSignVerify.SpctlType.EXEC) {
-            expectedSignOrigin = getCertRequest(certIndex).name();
-        } else if (standardType == MacSignVerify.SpctlType.INSTALL) {
-            expectedSignOrigin = getPkgCertRequest(certIndex).name();
-        } else {
-            throw new IllegalArgumentException();
-        }
-
-        final var signOrigin = MacSignVerify.findSpctlSignOrigin(standardType, target).orElse(null);
-
-        TKit.assertEquals(signOrigin, expectedSignOrigin,
-                String.format("Check [%s] has sign origin as expected", target));
-    }
-
-    public static void verifyPkgutil(Path target, boolean signed, int certIndex) {
-        if (signed) {
-            final var certRequest = getPkgCertRequest(certIndex);
-            MacSignVerify.assertPkgSigned(target, certRequest, StandardKeychain.MAIN.mapCertificateRequest(certRequest));
-        } else {
-            MacSignVerify.assertUnsigned(target);
-        }
-    }
-
-    public static void verifyAppImageSignature(JPackageCommand appImageCmd,
-            boolean isSigned, String... launchers) throws Exception {
-        Path launcherPath = appImageCmd.appLauncherPath();
-        SigningBase.verifyCodesign(launcherPath, isSigned, SigningBase.DEFAULT_INDEX);
-
-        final List<String> launchersList = List.of(launchers);
-        launchersList.forEach(launcher -> {
-            Path testALPath = launcherPath.getParent().resolve(launcher);
-            SigningBase.verifyCodesign(testALPath, isSigned, SigningBase.DEFAULT_INDEX);
-        });
-
-        Path appImage = appImageCmd.outputBundle();
-        SigningBase.verifyCodesign(appImage, isSigned, SigningBase.DEFAULT_INDEX);
-        if (isSigned) {
-            SigningBase.verifySpctl(appImage, "exec", SigningBase.DEFAULT_INDEX);
-        }
-    }
-
-    private static CertificateRequest getCertRequest(int certIndex) {
-        switch (CertIndex.values()[certIndex]) {
-            case ASCII_INDEX -> {
-                return StandardCertificateRequest.CODESIGN.spec();
-            }
-            case UNICODE_INDEX -> {
-                return StandardCertificateRequest.CODESIGN_UNICODE.spec();
-            }
-            default -> {
-                throw new IllegalArgumentException();
-            }
-        }
-    }
-
-    private static CertificateRequest getPkgCertRequest(int certIndex) {
-        switch (CertIndex.values()[certIndex]) {
-            case ASCII_INDEX -> {
-                return StandardCertificateRequest.PKG.spec();
-            }
-            case UNICODE_INDEX -> {
-                return StandardCertificateRequest.PKG_UNICODE.spec();
-            }
-            default -> {
-                throw new IllegalArgumentException();
-            }
-        }
-    }
-}
diff --git a/test/jdk/tools/jpackage/share/AppContentTest.java b/test/jdk/tools/jpackage/share/AppContentTest.java
index b6066bb9cc4..46f5286e48a 100644
--- a/test/jdk/tools/jpackage/share/AppContentTest.java
+++ b/test/jdk/tools/jpackage/share/AppContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -85,6 +86,7 @@ public class AppContentTest {
     @Test
     @ParameterSupplier("test")
     @ParameterSupplier(value="testSymlink", ifNotOS = WINDOWS)
+    @ParameterSupplier
     public void testAppImage(TestSpec testSpec) throws Exception {
         testSpec.test(new ConfigurationTarget(JPackageCommand.helloAppImage()));
     }
@@ -100,7 +102,7 @@ public class AppContentTest {
         JPackageCommand.helloAppImage()
             .addArguments("--app-content", appContentValue)
             .setFakeRuntime()
-            .validateOutput(expectedWarning)
+            .validateOut(expectedWarning)
             .executeIgnoreExitCode();
     }
 
@@ -126,6 +128,14 @@ public class AppContentTest {
         }).toList();
     }
 
+    public static Collection<Object[]> testAppImage() {
+        return Stream.of(
+                build().add(NonExistentPath.create("*output-app-image*", JPackageCommand::outputBundle))
+        ).map(TestSpec.Builder::create).map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
+
     public static Collection<Object[]> testSymlink() {
         return Stream.of(
                 build().add(TEST_JAVA)
@@ -150,7 +160,7 @@ public class AppContentTest {
 
         void test(ConfigurationTarget target) {
             final int expectedJPackageExitCode;
-            if (contentFactories.stream().flatMap(List::stream).anyMatch(TEST_BAD::equals)) {
+            if (contentFactories.stream().flatMap(List::stream).anyMatch(NonExistentPath.class::isInstance)) {
                 expectedJPackageExitCode = 1;
             } else {
                 expectedJPackageExitCode = 0;
@@ -159,9 +169,11 @@ public class AppContentTest {
             final List<List<Content>> allContent = new ArrayList<>();
 
             target.addInitializer(JPackageCommand::setFakeRuntime)
-            .addRunOnceInitializer(_ -> {
+            .addInitializer(cmd -> {
                 contentFactories.stream().map(group -> {
-                    return group.stream().map(ContentFactory::create).toList();
+                    return group.stream().map(contentFactory -> {
+                        return contentFactory.create(cmd);
+                    }).toList();
                 }).forEach(allContent::add);
             }).addInitializer(cmd -> {
                 allContent.stream().map(group -> {
@@ -192,6 +204,10 @@ public class AppContentTest {
             });
 
             target.addInstallVerifier(cmd -> {
+                if (expectedJPackageExitCode != 0) {
+                    return;
+                }
+
                 var appContentRoot = getAppContentRoot(cmd);
 
                 Set<PathVerifier> disabledVerifiers = new HashSet<>();
@@ -329,7 +345,7 @@ public class AppContentTest {
 
     @FunctionalInterface
     private interface ContentFactory {
-        Content create();
+        Content create(JPackageCommand cmd);
     }
 
     private interface Content {
@@ -337,12 +353,7 @@ public class AppContentTest {
         Iterable<PathVerifier> verifiers(Path appContentRoot);
     }
 
-    private sealed interface PathVerifier permits
-            RegularFileVerifier,
-            DirectoryVerifier,
-            SymlinkTargetVerifier,
-            NoPathVerifier {
-
+    private sealed interface PathVerifier {
         Path path();
         void verify();
     }
@@ -467,22 +478,45 @@ public class AppContentTest {
     /**
      * Non-existing content.
      */
-    private static final class NonExistantPath implements ContentFactory {
+    private static final class NonExistentPath implements ContentFactory {
+
+        private NonExistentPath(String label, Function<JPackageCommand, Path> makePath) {
+            this.label = Objects.requireNonNull(label);
+            this.makePath = Objects.requireNonNull(makePath);
+        }
+
         @Override
-        public Content create() {
-            var nonExistant = TKit.createTempFile("non-existant");
-            try {
-                TKit.deleteIfExists(nonExistant);
-            } catch (IOException ex) {
-                throw new UncheckedIOException(ex);
+        public Content create(JPackageCommand cmd) {
+            var nonexistent = makePath.apply(cmd);
+            if (Files.exists(nonexistent)) {
+                throw new IllegalStateException();
             }
-            return new FileContent(nonExistant, 0);
+            return new FileContent(nonexistent, 0);
         }
 
         @Override
         public String toString() {
-            return "*non-existant*";
+            return label;
         }
+
+        static NonExistentPath create(String label, Function<JPackageCommand, Path> makePath) {
+            return new NonExistentPath(label, makePath);
+        }
+
+        static NonExistentPath create(String path) {
+            return new NonExistentPath(String.format("*%s*", Objects.requireNonNull(path)), _ -> {
+                var nonexistent = TKit.createTempFile(path);
+                try {
+                    TKit.deleteIfExists(nonexistent);
+                    return nonexistent;
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            });
+        }
+
+        private final String label;
+        private final Function<JPackageCommand, Path> makePath;
     }
 
     /**
@@ -565,7 +599,7 @@ public class AppContentTest {
         }
 
         @Override
-        public Content create() {
+        public Content create(JPackageCommand cmd) {
             final var appContentRoot = createAppContentRoot();
 
             final var symlinkPath = appContentRoot.resolve(symlinkPath());
@@ -639,7 +673,7 @@ public class AppContentTest {
         }
 
         @Override
-        public Content create() {
+        public Content create(JPackageCommand cmd) {
             Path srcPath = factory.get();
             if (!srcPath.endsWith(pathInAppContentRoot)) {
                 throw new IllegalArgumentException();
@@ -672,7 +706,7 @@ public class AppContentTest {
     private static final ContentFactory TEST_JAVA = createTextFileContent("apps/PrintEnv.java", "Not what someone would expect");
     private static final ContentFactory TEST_DUKE = createTextFileContent("duke.txt", "Hi Duke!");
     private static final ContentFactory TEST_DIR = createDirTreeContent("apps");
-    private static final ContentFactory TEST_BAD = new NonExistantPath();
+    private static final ContentFactory TEST_BAD = NonExistentPath.create("non-existent");
 
     // On OSX `--app-content` paths will be copied into the "Contents" folder
     // of the output app image.
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index bfd731b67d5..e91b3113816 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.function.Predicate;
 import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.internal.util.MacBundle;
 import jdk.jpackage.internal.util.XmlUtils;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
@@ -133,8 +134,7 @@ public class AppImagePackageTest {
      */
     @Test
     public static void testBadAppImage() throws IOException {
-        Path appImageDir = TKit.createTempDirectory("appimage");
-        Files.createFile(appImageDir.resolve("foo"));
+        Path appImageDir = createInvalidAppImage();
         configureBadAppImage(appImageDir).addInitializer(cmd -> {
             cmd.removeArgumentWithValue("--name");
         }).run(Action.CREATE);
@@ -145,8 +145,7 @@ public class AppImagePackageTest {
      */
     @Test
     public static void testBadAppImage2() throws IOException {
-        Path appImageDir = TKit.createTempDirectory("appimage");
-        Files.createFile(appImageDir.resolve("foo"));
+        Path appImageDir = createInvalidAppImage();
         configureBadAppImage(appImageDir).run(Action.CREATE);
     }
 
@@ -174,7 +173,7 @@ public class AppImagePackageTest {
 
         final var appImageDir = appImageCmd.outputBundle();
 
-        final var expectedError = JPackageStringBundle.MAIN.cannedFormattedString(
+        final var expectedError = JPackageCommand.makeError(
                 "error.invalid-app-image-file", AppImageFile.getPathInAppImage(Path.of("")), appImageDir);
 
         configureBadAppImage(appImageDir, expectedError).addRunOnceInitializer(() -> {
@@ -205,7 +204,7 @@ public class AppImagePackageTest {
     }
 
     private static PackageTest configureBadAppImage(Path appImageDir) {
-        return configureBadAppImage(appImageDir, JPackageStringBundle.MAIN.cannedFormattedString(
+        return configureBadAppImage(appImageDir, JPackageCommand.makeError(
                 "error.missing-app-image-file", AppImageFile.getPathInAppImage(Path.of("")), appImageDir));
     }
 
@@ -213,7 +212,7 @@ public class AppImagePackageTest {
         return new PackageTest().addInitializer(cmd -> {
             cmd.usePredefinedAppImage(appImageDir);
             cmd.ignoreDefaultVerbose(true); // no "--verbose" option
-            cmd.validateOutput(expectedError);
+            cmd.validateErr(expectedError);
         }).setExpectedExitCode(1);
     }
 
@@ -227,4 +226,19 @@ public class AppImagePackageTest {
                 + TKit.ICON_SUFFIX));
     }
 
+    private static Path createInvalidAppImage() throws IOException {
+        Path appImageDir = TKit.createTempDirectory("appimage");
+        if (TKit.isOSX()) {
+            // Create minimal macOS bundle to prevent jpackage bail out early
+            // with "error.parameter-not-mac-bundle" error.
+            var bundle = new MacBundle(appImageDir);
+            Files.createDirectories(bundle.macOsDir());
+            Files.createFile(bundle.infoPlistFile());
+        } else {
+            Files.createFile(appImageDir.resolve("foo"));
+        }
+
+        return appImageDir;
+    }
+
 }
diff --git a/test/jdk/tools/jpackage/share/AsyncTest.java b/test/jdk/tools/jpackage/share/AsyncTest.java
index e3a3f7e3cb8..b7dd13f91fa 100644
--- a/test/jdk/tools/jpackage/share/AsyncTest.java
+++ b/test/jdk/tools/jpackage/share/AsyncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -34,15 +33,12 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
-import java.util.spi.ToolProvider;
 import java.util.stream.IntStream;
-import jdk.jpackage.internal.util.function.ThrowingRunnable;
 import jdk.jpackage.internal.util.Slot;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.JavaAppDesc;
 import jdk.jpackage.test.Main;
 import jdk.jpackage.test.PackageTest;
@@ -66,10 +62,10 @@ public class AsyncTest {
 
         // Create test jar only once.
         // Besides of saving time, this avoids asynchronous invocations of java tool provider that randomly fail.
-        APP_JAR.set(HelloApp.createBundle(JavaAppDesc.parse("Hello!"), TKit.workDir()));
+        var appJar = HelloApp.createBundle(JavaAppDesc.parse("Hello!"), TKit.workDir());
 
         //
-        // Run test cases from InternalAsyncTest class asynchronously.
+        // Run test cases from AsyncInnerTest class asynchronously.
         // Spawn a thread for every test case.
         // Input data for test cases will be cooked asynchronously but in a safe way because every test case has an isolated work directory.
         // Multiple jpackage tool provider instances will be invoked asynchronously.
@@ -79,14 +75,10 @@ public class AsyncTest {
 
             var testFuncNames = List.of("testAppImage", "testNativeBundle");
 
-            var runArg = String.format("--jpt-run=%s", AsyncInnerTest.class.getName());
-
             var futures = executor.invokeAll(IntStream.range(0, JOB_COUNT).mapToObj(Integer::toString).<Workload>mapMulti((idx, consumer) -> {
                 for (var testFuncName : testFuncNames) {
                     var id = String.format("%s(%s)", testFuncName, idx);
-                    consumer.accept(new Workload(() -> {
-                        Main.main(runArg, String.format("--jpt-include=%s", id));
-                    }, id));
+                    consumer.accept(new Workload(id, appJar));
                 }
             }).toList());
 
@@ -99,10 +91,8 @@ public class AsyncTest {
 
             for (var future : futures) {
                 var result = future.get();
-                TKit.trace(String.format("[%s] STDOUT BEGIN\n%s", result.id(), result.stdoutBuffer()));
-                TKit.trace(String.format("[%s] STDOUT END", result.id()));
-                TKit.trace(String.format("[%s] STDERR BEGIN\n%s", result.id(), result.stderrBuffer()));
-                TKit.trace(String.format("[%s] STDERR END", result.id()));
+                TKit.trace(String.format("[%s] OUTPUT BEGIN\n%s", result.testCaseId(), result.testOutput()));
+                TKit.trace(String.format("[%s] OUTPUT END", result.testCaseId()));
                 result.exception().filter(Predicate.not(TKit::isSkippedException)).ifPresent(fatalError::set);
             }
 
@@ -142,80 +132,56 @@ public class AsyncTest {
     }
 
 
-    private record Result(String stdoutBuffer, String stderrBuffer, String id, Optional<Exception> exception) {
+    private record Result(String testOutput, String testCaseId, Optional<Exception> exception) {
 
         Result {
-            Objects.requireNonNull(stdoutBuffer);
-            Objects.requireNonNull(stderrBuffer);
-            Objects.requireNonNull(id);
+            Objects.requireNonNull(testOutput);
+            Objects.requireNonNull(testCaseId);
             Objects.requireNonNull(exception);
         }
     }
 
 
     private record Workload(
-            ByteArrayOutputStream stdoutBuffer,
-            ByteArrayOutputStream stderrBuffer,
-            ThrowingRunnable<? extends Exception> runnable,
-            String id) implements Callable<Result>  {
+            String testCaseId,
+            ByteArrayOutputStream outputSink,
+            Path appJar) implements Callable<Result> {
 
         Workload {
-            Objects.requireNonNull(stdoutBuffer);
-            Objects.requireNonNull(stderrBuffer);
-            Objects.requireNonNull(runnable);
-            Objects.requireNonNull(id);
+            Objects.requireNonNull(testCaseId);
+            Objects.requireNonNull(outputSink);
+            Objects.requireNonNull(appJar);
         }
 
-        Workload(ThrowingRunnable<? extends Exception> runnable, String id) {
-            this(new ByteArrayOutputStream(), new ByteArrayOutputStream(), runnable, id);
+        Workload(String testCaseId, Path appJar) {
+            this(testCaseId, new ByteArrayOutputStream(), appJar);
         }
 
-        private String stdoutBufferAsString() {
-            return new String(stdoutBuffer.toByteArray(), StandardCharsets.UTF_8);
-        }
-
-        private String stderrBufferAsString() {
-            return new String(stderrBuffer.toByteArray(), StandardCharsets.UTF_8);
+        private String testOutput() {
+            return new String(outputSink.toByteArray(), StandardCharsets.UTF_8);
         }
 
         @Override
         public Result call() {
-            // Reset the current test inherited in the state from the parent thread.
-            TKit.state(DEFAULT_STATE);
-
-            var defaultToolProvider = JavaTool.JPACKAGE.asToolProvider();
-
-            JPackageCommand.useToolProviderByDefault(new ToolProvider() {
-
-                @Override
-                public int run(PrintWriter out, PrintWriter err, String... args) {
-                    try (var bufOut = new PrintWriter(stdoutBuffer, true, StandardCharsets.UTF_8);
-                            var bufErr = new PrintWriter(stderrBuffer, true, StandardCharsets.UTF_8)) {
-                        return defaultToolProvider.run(bufOut, bufErr, args);
-                    }
-                }
-
-                @Override
-                public String name() {
-                    return defaultToolProvider.name();
-                }
-            });
+            var runArg = String.format("--jpt-run=%s", AsyncInnerTest.class.getName());
 
             Optional<Exception> err = Optional.empty();
-            try (var bufOut = new PrintStream(stdoutBuffer, true, StandardCharsets.UTF_8);
-                    var bufErr = new PrintStream(stderrBuffer, true, StandardCharsets.UTF_8)) {
-                TKit.withStackTraceStream(() -> {
-                    TKit.withMainLogStream(runnable, bufOut);
-                }, bufErr);
+            try {
+                try (var out = new PrintStream(outputSink, false, System.out.charset())) {
+                    ScopedValue.where(APP_JAR, appJar).run(() -> {
+                        TKit.withOutput(() -> {
+                            JPackageCommand.useToolProviderByDefault();
+                            Main.main("--jpt-ignore-logfile", runArg, String.format("--jpt-include=%s", testCaseId));
+                        }, out, out);
+                    });
+                }
             } catch (Exception ex) {
                 err = Optional.of(ex);
             }
-            return new Result(stdoutBufferAsString(), stderrBufferAsString(), id, err);
+            return new Result(testOutput(), testCaseId, err);
         }
     }
 
-
     private static final int JOB_COUNT = 30;
-    private static final TKit.State DEFAULT_STATE = TKit.state();
-    private static final InheritableThreadLocal<Path> APP_JAR = new InheritableThreadLocal<>();
+    private static final ScopedValue<Path> APP_JAR = ScopedValue.newInstance();
 }
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index afa847f6e1b..7ea3f578116 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 
+import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE;
 import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;
 
 import java.io.IOException;
@@ -32,6 +33,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -41,9 +43,11 @@ import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.ConfigurationTarget;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageOutputValidator;
 import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.JavaAppDesc;
 import jdk.jpackage.test.JavaTool;
@@ -176,57 +180,78 @@ public final class BasicTest {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
-    public void testVerbose() {
-        JPackageCommand cmd = JPackageCommand.helloAppImage()
-                // Disable default logic adding `--verbose` option
-                // to jpackage command line.
-                .ignoreDefaultVerbose(true)
-                .saveConsoleOutput(true)
-                .setFakeRuntime().executePrerequisiteActions();
+    @Parameter("false")
+    @Parameter("true")
+    public void testQuiet(boolean appImage) {
 
-        List<String> expectedVerboseOutputStrings = new ArrayList<>();
-        expectedVerboseOutputStrings.add("Creating app package:");
-        if (TKit.isWindows()) {
-            expectedVerboseOutputStrings.add(
-                    "Succeeded in building Windows Application Image package");
-        } else if (TKit.isLinux()) {
-            expectedVerboseOutputStrings.add(
-                    "Succeeded in building Linux Application Image package");
-        } else if (TKit.isOSX()) {
-            expectedVerboseOutputStrings.add("Preparing Info.plist:");
-            expectedVerboseOutputStrings.add(
-                    "Succeeded in building Mac Application Image package");
+        ConfigurationTarget target;
+        if (appImage) {
+            target = new ConfigurationTarget(JPackageCommand.helloAppImage());
         } else {
-            TKit.throwUnknownPlatformError();
+            target = new ConfigurationTarget(new PackageTest().configureHelloApp());
         }
 
-        TKit.deleteDirectoryContentsRecursive(cmd.outputDir());
-        List<String> nonVerboseOutput = cmd.execute().getOutput();
-        List<String>[] verboseOutput = (List<String>[])new List<?>[1];
-
-        // Directory clean up is not 100% reliable on Windows because of
-        // antivirus software that can lock .exe files. Setup
-        // different output directory instead of cleaning the default one for
-        // verbose jpackage run.
-        TKit.withTempDirectory("verbose-output", tempDir -> {
-            cmd.setArgumentValue("--dest", tempDir);
-            cmd.addArgument("--verbose");
-            verboseOutput[0] = cmd.execute().getOutput();
+        target.addInitializer(cmd -> {
+            // Disable the default logic adding `--verbose` option to jpackage command line.
+            cmd.ignoreDefaultVerbose(true)
+            .useToolProvider(true)
+            .saveConsoleOutput(true)
+            .setFakeRuntime();
         });
 
-        TKit.assertTrue(nonVerboseOutput.size() < verboseOutput[0].size(),
-                "Check verbose output is longer than regular");
+        Consumer<Executor.Result> asserter = result -> {
+            TKit.assertStringListEquals(List.of(), result.getOutput(), "Check output is empty");
+        };
 
-        expectedVerboseOutputStrings.forEach(str -> {
-            TKit.assertTextStream(str).label("regular output")
-                    .predicate(String::contains).negate()
-                    .apply(nonVerboseOutput);
+        target.cmd().map(JPackageCommand::execute).ifPresent(asserter);
+        target.test().ifPresent(test -> {
+            test.addBundleVerifier((_, result) -> {
+                asserter.accept(result);
+            }).run(CREATE);
+        });
+    }
+
+    @Test
+    @Parameter("false")
+    @Parameter("true")
+    public void testVerbose(boolean appImage) {
+
+        ConfigurationTarget target;
+        if (appImage) {
+            target = new ConfigurationTarget(JPackageCommand.helloAppImage());
+        } else {
+            target = new ConfigurationTarget(new PackageTest().configureHelloApp());
+        }
+
+        target.addInitializer(cmd -> {
+            // Disable the default logic adding `--verbose` option to jpackage command line.
+            cmd.ignoreDefaultVerbose(true)
+                    .useToolProvider(true)
+                    .addArgument("--verbose")
+                    .saveConsoleOutput(true)
+                    .setFakeRuntime();
+
+            List<CannedFormattedString> verboseContent;
+            if (appImage) {
+                verboseContent = List.of(
+                        JPackageStringBundle.MAIN.cannedFormattedString("message.create-app-image"),
+                        JPackageStringBundle.MAIN.cannedFormattedString("message.app-image-created"));
+            } else {
+                verboseContent = List.of(
+                        JPackageStringBundle.MAIN.cannedFormattedString("message.create-package"),
+                        JPackageStringBundle.MAIN.cannedFormattedString("message.package-created"));
+            }
+
+            new JPackageOutputValidator()
+                    .expectMatchingStrings(verboseContent.toArray(CannedFormattedString[]::new))
+                    .matchTimestamps()
+                    .stripTimestamps()
+                    .applyTo(cmd);
         });
 
-        expectedVerboseOutputStrings.forEach(str -> {
-            TKit.assertTextStream(str).label("verbose output")
-                    .apply(verboseOutput[0]);
+        target.cmd().ifPresent(JPackageCommand::execute);
+        target.test().ifPresent(test -> {
+            test.run(CREATE);
         });
     }
 
@@ -244,12 +269,9 @@ public final class BasicTest {
             cmd.addArgument("--verbose");
         }
 
-        cmd.validateOutput(Stream.of(
-                List.of("error.no-main-class-with-main-jar", "hello.jar"),
-                List.of("error.no-main-class-with-main-jar.advice", "hello.jar")
-        ).map(args -> {
-            return JPackageStringBundle.MAIN.cannedFormattedString(args.getFirst(), args.subList(1, args.size()).toArray());
-        }).toArray(CannedFormattedString[]::new));
+        cmd.validateErr(
+                JPackageCommand.makeError("error.no-main-class-with-main-jar", "hello.jar"),
+                JPackageCommand.makeAdvice("error.no-main-class-with-main-jar.advice", "hello.jar"));
 
         cmd.execute(1);
     }
@@ -409,7 +431,7 @@ public final class BasicTest {
 
         if (TestTempType.TEMPDIR_NOT_EMPTY.equals(type)) {
             pkgTest.setExpectedExitCode(1).addInitializer(cmd -> {
-                cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString(
+                cmd.validateErr(JPackageCommand.makeError(
                         "error.parameter-not-empty-directory", cmd.getArgumentValue("--temp"), "--temp"));
             }).addBundleVerifier(cmd -> {
                 // Check jpackage didn't use the supplied directory.
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index ca1189a191e..2133823381c 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -26,7 +26,7 @@ import static java.util.stream.Collectors.toMap;
 import static jdk.internal.util.OperatingSystem.LINUX;
 import static jdk.internal.util.OperatingSystem.MACOS;
 import static jdk.internal.util.OperatingSystem.WINDOWS;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 import static jdk.jpackage.test.JPackageCommand.makeAdvice;
 import static jdk.jpackage.test.JPackageCommand.makeError;
 
@@ -43,7 +43,9 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 import java.util.regex.Pattern;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
+import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.internal.util.TokenReplace;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
@@ -51,15 +53,28 @@ import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CannedArgument;
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.JPackageStringBundle;
+import jdk.jpackage.test.JPackageOutputValidator;
+import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.CertificateType;
+import jdk.jpackage.test.MacSign.KeychainWithCertsSpec;
+import jdk.jpackage.test.MacSign.ResolvedKeychain;
+import jdk.jpackage.test.MacSign.StandardCertificateNamePrefix;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
+import jdk.jpackage.test.mock.Script;
+import jdk.jpackage.test.mock.VerbatimCommandMock;
+import jdk.jpackage.test.stdmock.JPackageMockUtils;
+import jdk.jpackage.test.stdmock.MacSignMockUtils;
 
 /*
  * @test
  * @summary Test jpackage output for erroneous input
  * @library /test/jdk/tools/jpackage/helpers
+ * @library /test/lib
  * @build jdk.jpackage.test.*
+ * @build jdk.jpackage.test.stdmock.*
+ * @build jdk.test.lib.security.CertificateBuilder
  * @compile -Xlint:all -Werror ErrorTest.java
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=ErrorTest
@@ -70,7 +85,10 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary Test jpackage output for erroneous input
  * @library /test/jdk/tools/jpackage/helpers
+ * @library /test/lib
  * @build jdk.jpackage.test.*
+ * @build jdk.jpackage.test.stdmock.*
+ * @build jdk.test.lib.security.CertificateBuilder
  * @compile -Xlint:all -Werror ErrorTest.java
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=ErrorTest
@@ -80,10 +98,10 @@ import jdk.jpackage.test.TKit;
 public final class ErrorTest {
 
     enum Token {
-        JAVA_HOME(cmd -> {
+        JAVA_HOME(() -> {
             return System.getProperty("java.home");
         }),
-        APP_IMAGE(cmd -> {
+        APP_IMAGE(() -> {
             final var appImageRoot = TKit.createTempDirectory("appimage");
 
             final var appImageCmd = JPackageCommand.helloAppImage()
@@ -91,28 +109,44 @@ public final class ErrorTest {
 
             appImageCmd.execute();
 
-            return appImageCmd.outputBundle().toString();
+            return appImageCmd.outputBundle();
         }),
-        INVALID_MAC_RUNTIME_BUNDLE(toFunction(cmd -> {
+        APP_IMAGE_WITH_SHORT_NAME(() -> {
+            final var appImageRoot = TKit.createTempDirectory("appimage");
+
+            final var appImageCmd = JPackageCommand.helloAppImage()
+                    .setFakeRuntime().setArgumentValue("--dest", appImageRoot);
+
+            // Let jpackage pick the name from the main class (Hello). It qualifies as the "short" name.
+            appImageCmd.removeArgumentWithValue("--name");
+
+            appImageCmd.execute();
+
+            return appImageCmd.outputBundle();
+        }),
+        INVALID_MAC_RUNTIME_BUNDLE(toSupplier(() -> {
             // Has "Contents/MacOS/libjli.dylib", but missing "Contents/Home/lib/libjli.dylib".
             final Path root = TKit.createTempDirectory("mac-invalid-runtime-bundle");
             Files.createDirectories(root.resolve("Contents/Home"));
             Files.createFile(root.resolve("Contents/Info.plist"));
             Files.createDirectories(root.resolve("Contents/MacOS"));
             Files.createFile(root.resolve("Contents/MacOS/libjli.dylib"));
-            return root.toString();
+            return root;
         })),
-        INVALID_MAC_RUNTIME_IMAGE(toFunction(cmd -> {
+        INVALID_MAC_RUNTIME_IMAGE(toSupplier(() -> {
             // Has some files in the "lib" subdirectory, but doesn't have the "lib/libjli.dylib" file.
             final Path root = TKit.createTempDirectory("mac-invalid-runtime-image");
             Files.createDirectories(root.resolve("lib"));
             Files.createFile(root.resolve("lib/foo"));
-            return root.toString();
+            return root;
         })),
-        EMPTY_DIR(toFunction(cmd -> {
+        EMPTY_DIR(() -> {
             return TKit.createTempDirectory("empty-dir");
-        })),
+        }),
         ADD_LAUNCHER_PROPERTY_FILE,
+        EMPTY_KEYCHAIN,
+        KEYCHAIN_WITH_APP_IMAGE_CERT,
+        KEYCHAIN_WITH_PKG_CERT,
         ;
 
         private Token() {
@@ -123,6 +157,12 @@ public final class ErrorTest {
             this.valueSupplier = Optional.of(valueSupplier);
         }
 
+        private Token(Supplier<Object> valueSupplier) {
+            this(_ -> {
+                return valueSupplier.get();
+            });
+        }
+
         String token() {
             return makeToken(name());
         }
@@ -202,11 +242,35 @@ public final class ErrorTest {
         private static final Optional<PackageType> NATIVE_TYPE = defaultNativeType();
     }
 
-    public record TestSpec(Optional<PackageTypeSpec> type, Optional<String> appDesc, List<String> addArgs,
-            List<String> removeArgs, List<CannedFormattedString> expectedMessages) {
+    public record TestSpec(
+            Optional<PackageTypeSpec> type,
+            Optional<String> appDesc,
+            List<String> addArgs,
+            List<String> removeArgs,
+            List<CannedFormattedString> expectedMessages,
+            boolean match) {
 
         static final class Builder {
 
+            Builder() {
+                type = new PackageTypeSpec(PackageType.IMAGE);
+                appDesc = DEFAULT_APP_DESC;
+                match = true;
+            }
+
+            Builder(Builder other) {
+                type = other.type;
+                appDesc = other.appDesc;
+                match = other.match;
+                addArgs.addAll(other.addArgs);
+                removeArgs.addAll(other.removeArgs);
+                expectedMessages.addAll(other.expectedMessages);
+            }
+
+            Builder copy() {
+                return new Builder(this);
+            }
+
             Builder type(PackageType v) {
                 type = Optional.ofNullable(v).map(PackageTypeSpec::new).orElse(null);
                 return this;
@@ -230,6 +294,19 @@ public final class ErrorTest {
                 return appDesc(null);
             }
 
+            Builder match(boolean v) {
+                match = v;
+                return this;
+            }
+
+            Builder match() {
+                return match(true);
+            }
+
+            Builder find() {
+                return match(false);
+            }
+
             Builder setAddArgs(List<String> v) {
                 addArgs.clear();
                 addArgs.addAll(v);
@@ -269,7 +346,8 @@ public final class ErrorTest {
             }
 
             Builder setMessages(List<CannedFormattedString> v) {
-                expectedMessages = v;
+                expectedMessages.clear();
+                expectedMessages.addAll(v);
                 return this;
             }
 
@@ -287,11 +365,11 @@ public final class ErrorTest {
             }
 
             Builder error(String key, Object ... args) {
-                return messages(makeError(JPackageStringBundle.MAIN.cannedFormattedString(key, args)));
+                return messages(makeError(key, args));
             }
 
             Builder advice(String key, Object ... args) {
-                return messages(makeAdvice(JPackageStringBundle.MAIN.cannedFormattedString(key, args)));
+                return messages(makeAdvice(key, args));
             }
 
             Builder invalidTypeArg(String arg, String... otherArgs) {
@@ -304,15 +382,21 @@ public final class ErrorTest {
             }
 
             TestSpec create() {
-                return new TestSpec(Optional.ofNullable(type), Optional.ofNullable(appDesc),
-                        List.copyOf(addArgs), List.copyOf(removeArgs), List.copyOf(expectedMessages));
+                return new TestSpec(
+                        Optional.ofNullable(type),
+                        Optional.ofNullable(appDesc),
+                        List.copyOf(addArgs),
+                        List.copyOf(removeArgs),
+                        List.copyOf(expectedMessages),
+                        match);
             }
 
-            private PackageTypeSpec type = new PackageTypeSpec(PackageType.IMAGE);
-            private String appDesc = DEFAULT_APP_DESC;
-            private List<String> addArgs = new ArrayList<>();
-            private List<String> removeArgs = new ArrayList<>();
-            private List<CannedFormattedString> expectedMessages = new ArrayList<>();
+            private PackageTypeSpec type;
+            private String appDesc;
+            private boolean match;
+            private final List<String> addArgs = new ArrayList<>();
+            private final List<String> removeArgs = new ArrayList<>();
+            private final List<CannedFormattedString> expectedMessages = new ArrayList<>();
         }
 
         public TestSpec {
@@ -360,12 +444,29 @@ public final class ErrorTest {
                 cmd.clearArguments().addArguments(newArgs);
             }
 
-            defaultInit(cmd, expectedMessages);
-            cmd.execute(1);
+            // Disable default logic adding `--verbose` option
+            // to jpackage command line.
+            // It will affect jpackage error messages if the command line is malformed.
+            cmd.ignoreDefaultVerbose(true);
+
+            // Ignore external runtime as it will interfere
+            // with jpackage arguments in this test.
+            cmd.ignoreDefaultRuntime(true);
+
+            var validator = new JPackageOutputValidator().stderr().expectMatchingStrings(expectedMessages).match(match);
+            if (match) {
+                new JPackageOutputValidator().stdout().validateEndOfStream().applyTo(cmd);
+            }
+
+            cmd.mutate(validator::applyTo).execute(1);
         }
 
         TestSpec mapExpectedMessages(UnaryOperator<CannedFormattedString> mapper) {
-            return new TestSpec(type, appDesc, addArgs, removeArgs, expectedMessages.stream().map(mapper).toList());
+            return new TestSpec(type, appDesc, addArgs, removeArgs, expectedMessages.stream().map(mapper).toList(), match);
+        }
+
+        TestSpec copyWithExpectedMessages(List<CannedFormattedString> expectedMessages) {
+            return new TestSpec(type, appDesc, addArgs, removeArgs, expectedMessages, match);
         }
 
         @Override
@@ -383,6 +484,9 @@ public final class ErrorTest {
             if (!removeArgs.isEmpty()) {
                 sb.append("args-del=").append(removeArgs).append("; ");
             }
+            if (!match) {
+                sb.append("find; ");
+            }
             sb.append("errors=").append(expectedMessages);
             return sb.toString();
         }
@@ -408,7 +512,7 @@ public final class ErrorTest {
                     .error("error.no-main-class-with-main-jar", "hello.jar")
                     .advice("error.no-main-class-with-main-jar.advice", "hello.jar"),
             // non-existent main jar
-            testSpec().addArgs("--main-jar", "non-existent.jar")
+            testSpec().addArgs("--main-jar", "non-existent.jar").find()
                     .error("error.main-jar-does-not-exist", "non-existent.jar"),
             // non-existent runtime
             testSpec().addArgs("--runtime-image", "non-existent.runtime")
@@ -448,7 +552,7 @@ public final class ErrorTest {
         createMutuallyExclusive(
                 new ArgumentGroup("--module", "foo.bar"),
                 new ArgumentGroup("--main-jar", "foo.jar")
-        ).map(TestSpec.Builder::noAppDesc).map(TestSpec.Builder::create).forEach(testCases::add);
+        ).map(TestSpec.Builder::noAppDesc).map(TestSpec.Builder::find).map(TestSpec.Builder::create).forEach(testCases::add);
 
         // forbidden jlink options
         testCases.addAll(Stream.of("--output", "--add-modules", "--module-path").map(opt -> {
@@ -493,13 +597,18 @@ public final class ErrorTest {
     }
 
     public static Collection<Object[]> invalidAppVersion() {
-        return fromTestSpecBuilders(Stream.of(
+        return toTestArgs(Stream.of(
                 // Invalid app version. Just cover all different error messages.
                 // Extensive testing of invalid version strings is done in DottedVersionTest unit test.
                 testSpec().addArgs("--app-version", "").error("error.version-string-empty"),
                 testSpec().addArgs("--app-version", "1.").error("error.version-string-zero-length-component", "1."),
                 testSpec().addArgs("--app-version", "1.b.3").error("error.version-string-invalid-component", "1.b.3", "b.3")
-        ));
+        ).map(builder -> {
+            if (TKit.isOSX()) {
+                builder.advice("error.invalid-cfbundle-version.advice");
+            };
+            return builder;
+        }));
     }
 
     @Test
@@ -531,11 +640,14 @@ public final class ErrorTest {
             argsStream = Stream.concat(argsStream, Stream.of(List.of("--win-console")));
         }
 
-        return fromTestSpecBuilders(argsStream.map(args -> {
-            return testSpec().noAppDesc().nativeType()
+        return toTestArgs(argsStream.map(args -> {
+            var builder = testSpec().noAppDesc().nativeType()
                     .addArgs("--runtime-image", Token.JAVA_HOME.token())
-                    .addArgs(args)
-                    .error("ERR_NoInstallerEntryPoint", args.getFirst());
+                    .addArgs(args);
+            if (args.contains("--add-modules")) {
+                builder.error("ERR_MutuallyExclusiveOptions", "--runtime-image", "--add-modules");
+            }
+            return builder.error("ERR_NoInstallerEntryPoint", args.getFirst());
         }));
     }
 
@@ -556,7 +668,7 @@ public final class ErrorTest {
     }
 
     public static Collection<Object[]> testAdditionLaunchers() {
-        return fromTestSpecBuilders(Stream.of(
+        return toTestArgs(Stream.of(
             testSpec().addArgs("--add-launcher", Token.ADD_LAUNCHER_PROPERTY_FILE.token())
                     .error("error.parameter-add-launcher-malformed", Token.ADD_LAUNCHER_PROPERTY_FILE, "--add-launcher"),
             testSpec().removeArgs("--name").addArgs("--name", "foo", "--add-launcher", "foo=" + Token.ADD_LAUNCHER_PROPERTY_FILE.token())
@@ -564,19 +676,201 @@ public final class ErrorTest {
         ));
     }
 
-    @Test
-    @ParameterSupplier("invalidNames")
-    public static void testInvalidAppName(String name) {
-        testSpec().removeArgs("--name").addArgs("--name", name)
-                .error("ERR_InvalidAppName", adjustTextStreamVerifierArg(name)).create().test();
+    @Test(ifOS = MACOS)
+    @ParameterSupplier
+    @ParameterSupplier("testMacPkgSignWithoutIdentity")
+    public static void testMacSignWithoutIdentity(TestSpec spec) {
+        // The test called JPackage Command.useToolProviderBy Default(),
+        // which alters global variables in the test library,
+        // so run the test case with a new global state to isolate the alteration of the globals.
+        TKit.withNewState(() -> {
+            testMacSignWithoutIdentityWithNewTKitState(spec);
+        });
+    }
+
+   private static void testMacSignWithoutIdentityWithNewTKitState(TestSpec spec) {
+        final Token keychainToken = spec.expectedMessages().stream().flatMap(cannedStr -> {
+            return Stream.of(cannedStr.args()).filter(Token.class::isInstance).map(Token.class::cast).filter(token -> {
+                switch (token) {
+                    case EMPTY_KEYCHAIN, KEYCHAIN_WITH_APP_IMAGE_CERT, KEYCHAIN_WITH_PKG_CERT -> {
+                        return true;
+                    }
+                    default -> {
+                        return false;
+                    }
+                }
+            });
+        }).distinct().reduce((a, b) -> {
+            throw new IllegalStateException(String.format(
+                    "Error messages %s reference multiple keychains: %s and %s", spec.expectedMessages(), a, b));
+        }).orElseThrow();
+
+        final ResolvedKeychain keychain;
+
+        switch (keychainToken) {
+            case EMPTY_KEYCHAIN -> {
+                keychain = new ResolvedKeychain(new KeychainWithCertsSpec(MacSign.createEmptyKeychain(), List.of()));
+            }
+            case KEYCHAIN_WITH_APP_IMAGE_CERT, KEYCHAIN_WITH_PKG_CERT -> {
+                CertificateType existingCertType;
+                switch (keychainToken) {
+                    case KEYCHAIN_WITH_APP_IMAGE_CERT -> {
+                        existingCertType = CertificateType.CODE_SIGN;
+                    }
+                    case KEYCHAIN_WITH_PKG_CERT -> {
+                        existingCertType = CertificateType.INSTALLER;
+                    }
+                    default -> {
+                        throw new AssertionError();
+                    }
+                }
+
+                keychain = Stream.of(SignEnvMock.SingleCertificateKeychain.values()).filter(k -> {
+                    return k.certificateType() == existingCertType;
+                }).findFirst().orElseThrow().keychain();
+
+                var script = Script.build()
+                        // Disable the mutation making mocks "run once".
+                        .commandMockBuilderMutator(null)
+                        // Replace "/usr/bin/security" with the mock bound to the keychain mock.
+                        .map(MacSignMockUtils.securityMock(SignEnvMock.VALUE))
+                        // Don't mock other external commands.
+                        .use(VerbatimCommandMock.INSTANCE)
+                        .createLoop();
+
+                // Create jpackage tool provider using the /usr/bin/security mock.
+                var jpackage = JPackageMockUtils.createJPackageToolProvider(OperatingSystem.MACOS, script);
+
+                // Override the default jpackage tool provider with the one using the /usr/bin/security mock.
+                JPackageCommand.useToolProviderByDefault(jpackage);
+            }
+            default -> {
+                throw new AssertionError();
+            }
+        }
+
+        MacSign.withKeychain(_ -> {
+            spec.mapExpectedMessages(cannedStr -> {
+                return cannedStr.mapArgs(arg -> {
+                    switch (arg) {
+                        case StandardCertificateNamePrefix certPrefix -> {
+                            return certPrefix.value();
+                        }
+                        case Token _ -> {
+                            return keychain.name();
+                        }
+                        default -> {
+                            return arg;
+                        }
+                    }
+                });
+            }).test(Map.of(keychainToken, _ -> keychain.name()));
+        }, keychain);
+    }
+
+    public static Collection<Object[]> testMacSignWithoutIdentity() {
+        final List<TestSpec> testCases = new ArrayList<>();
+
+        final var signArgs = List.of("--mac-sign", "--mac-signing-keychain", Token.EMPTY_KEYCHAIN.token());
+        final var appImageArgs = List.of("--app-image", Token.APP_IMAGE_WITH_SHORT_NAME.token());
+
+        for (var withAppImage : List.of(true, false)) {
+            var builder = testSpec();
+            if (withAppImage) {
+                builder.noAppDesc().addArgs(appImageArgs);
+            }
+            builder.addArgs(signArgs);
+
+            for (var type: List.of(PackageType.IMAGE, PackageType.MAC_PKG, PackageType.MAC_DMG)) {
+                builder.setMessages().error("error.cert.not.found",
+                        MacSign.StandardCertificateNamePrefix.CODE_SIGN, Token.EMPTY_KEYCHAIN);
+                switch (type) {
+                    case MAC_PKG -> {
+                        // jpackage must report two errors:
+                        //  1. It can't find signing identity to sign the app image
+                        //  2. It can't find signing identity to sign the PKG installer
+                        builder.error("error.cert.not.found",
+                                MacSign.StandardCertificateNamePrefix.INSTALLER, Token.EMPTY_KEYCHAIN);
+                    }
+                    default -> {
+                        // NOP
+                    }
+                }
+                var testSpec = builder.type(type).create();
+                testCases.add(testSpec);
+            }
+        }
+
+        return toTestArgs(testCases);
+    }
+
+    public static Collection<Object[]> testMacPkgSignWithoutIdentity() {
+        final List<TestSpec.Builder> testCases = new ArrayList<>();
+
+        final var appImageArgs = List.of("--app-image", Token.APP_IMAGE_WITH_SHORT_NAME.token());
+
+        for (var withAppImage : List.of(true, false)) {
+            for (var existingCertType : CertificateType.values()) {
+                Token keychain;
+                StandardCertificateNamePrefix missingCertificateNamePrefix;
+                switch (existingCertType) {
+                    case INSTALLER -> {
+                        keychain = Token.KEYCHAIN_WITH_PKG_CERT;
+                        missingCertificateNamePrefix = StandardCertificateNamePrefix.CODE_SIGN;
+                    }
+                    case CODE_SIGN -> {
+                        keychain = Token.KEYCHAIN_WITH_APP_IMAGE_CERT;
+                        missingCertificateNamePrefix = StandardCertificateNamePrefix.INSTALLER;
+                    }
+                    default -> {
+                        throw new AssertionError();
+                    }
+                }
+
+                var builder = testSpec()
+                        .type(PackageType.MAC_PKG)
+                        .addArgs("--mac-sign", "--mac-signing-keychain", keychain.token())
+                        .error("error.cert.not.found", missingCertificateNamePrefix, keychain);
+
+                if (withAppImage) {
+                    builder.noAppDesc().addArgs(appImageArgs);
+                } else {
+                    /*
+                     * Use shorter name to avoid
+                     *
+                     * [03:08:55.623] --mac-package-name is set to 'MacSignWithoutIdentityErrorTest', which is longer than 16 characters. For a better Mac experience consider shortening it.
+                     *
+                     * in the output.
+                     * The same idea is behind using the "APP_IMAGE_WITH_SHORT_NAME" token
+                     * instead of the "APP_IMAGE" for the predefined app image.
+                     */
+                    builder.removeArgs("--name");
+                }
+
+                testCases.add(builder);
+            }
+        }
+
+        return toTestArgs(testCases);
     }
 
     @Test
     @ParameterSupplier("invalidNames")
-    public static void testInvalidAddLauncherName(String name) {
+    public static void testInvalidAppName(InvalidName name) {
+        testSpec().removeArgs("--name").addArgs("--name", name.value())
+                .error("ERR_InvalidAppName", adjustTextStreamVerifierArg(name.value()))
+                .match(!name.isMessingUpConsoleOutput())
+                .create()
+                .test();
+    }
+
+    @Test
+    @ParameterSupplier("invalidNames")
+    public static void testInvalidAddLauncherName(InvalidName name) {
         testAdditionLaunchers(testSpec()
                 .addArgs("--add-launcher", name + "=" + Token.ADD_LAUNCHER_PROPERTY_FILE.token())
-                .error("ERR_InvalidSLName", adjustTextStreamVerifierArg(name))
+                .error("ERR_InvalidSLName", adjustTextStreamVerifierArg(name.value()))
+                .match(!name.isMessingUpConsoleOutput())
                 .create());
     }
 
@@ -586,7 +880,27 @@ public final class ErrorTest {
         if (TKit.isWindows()) {
             data.add("foo\\bar");
         }
-        return toTestArgs(data.stream());
+        return toTestArgs(data.stream().map(InvalidName::new));
+    }
+
+    record InvalidName(String value) {
+        InvalidName {
+            Objects.requireNonNull(value);
+        }
+
+        boolean isMessingUpConsoleOutput() {
+            var controlChars = "\r\n\t".codePoints().toArray();
+            return value.codePoints().anyMatch(cp -> {
+                return IntStream.of(controlChars).anyMatch(v -> {
+                    return v == cp;
+                });
+            });
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
     }
 
     public static Collection<Object[]> testWindows() {
@@ -640,10 +954,16 @@ public final class ErrorTest {
                 testSpec().noAppDesc().addArgs("--app-image", Token.APP_IMAGE.token())
                         .error("error.app-image.mac-sign.required"),
                 testSpec().type(PackageType.MAC_PKG).addArgs("--mac-package-identifier", "#1")
-                        .error("message.invalid-identifier", "#1"),
+                        .error("message.invalid-identifier", "#1")
+                        .advice("message.invalid-identifier.advice"),
                 // Bundle for mac app store should not have runtime commands
                 testSpec().nativeType().addArgs("--mac-app-store", "--jlink-options", "--bind-services")
-                        .error("ERR_MissingJLinkOptMacAppStore", "--strip-native-commands")
+                        .error("ERR_MissingJLinkOptMacAppStore", "--strip-native-commands"),
+                // Predefined app image must be a valid macOS bundle.
+                testSpec().noAppDesc().nativeType().addArgs("--app-image", Token.EMPTY_DIR.token())
+                        .error("error.parameter-not-mac-bundle", JPackageCommand.cannedArgument(cmd -> {
+                            return Path.of(cmd.getArgumentValue("--app-image"));
+                        }, Token.EMPTY_DIR.token()), "--app-image")
         ).map(TestSpec.Builder::create).toList());
 
         macInvalidRuntime(testCases::add);
@@ -653,21 +973,62 @@ public final class ErrorTest {
                 new ArgumentGroup("--app-version", "2.0"),
                 new ArgumentGroup("--name", "foo"),
                 new ArgumentGroup("--mac-app-store")
-        ).map(argGroup -> {
-            return testSpec().noAppDesc().addArgs(argGroup.asArray()).addArgs("--app-image", Token.APP_IMAGE.token())
-                    .error("ERR_InvalidOptionWithAppImageSigning", argGroup.arg());
-         // It should bail out with the same error message regardless of `--mac-sign` option.
-        }).mapMulti(ErrorTest::duplicateForMacSign).toList());
+        ).flatMap(argGroup -> {
+            var withoutSign = testSpec()
+                    .noAppDesc()
+                    .addArgs(argGroup.asArray())
+                    .addArgs("--app-image", Token.APP_IMAGE.token());
+
+            var withSign = withoutSign.copy().addArgs("--mac-sign");
+
+            withoutSign.error("error.app-image.mac-sign.required");
+
+            // It should bail out with the same error message regardless of `--mac-sign` option.
+            return Stream.of(withoutSign, withSign).map(builder -> {
+                return builder.error("ERR_InvalidOptionWithAppImageSigning", argGroup.arg());
+            });
+
+        }).map(TestSpec.Builder::create).toList());
 
         testCases.addAll(createMutuallyExclusive(
                 new ArgumentGroup("--mac-signing-key-user-name", "foo"),
                 new ArgumentGroup("--mac-app-image-sign-identity", "bar")
         ).mapMulti(ErrorTest::duplicateForMacSign).toList());
 
-        testCases.addAll(createMutuallyExclusive(
-                new ArgumentGroup("--mac-signing-key-user-name", "foo"),
-                new ArgumentGroup("--mac-installer-sign-identity", "bar")
-        ).map(TestSpec.Builder::nativeType).mapMulti(ErrorTest::duplicateForMacSign).toList());
+        for (var packageType : PackageType.MAC) {
+            testCases.addAll(createMutuallyExclusive(
+                    new ArgumentGroup("--mac-signing-key-user-name", "foo"),
+                    new ArgumentGroup("--mac-installer-sign-identity", "bar")
+            ).map(builder -> {
+                return builder.type(packageType);
+            }).mapMulti(ErrorTest::duplicateForMacSign).map(testCase -> {
+                if (packageType != PackageType.MAC_PKG) {
+                    /*
+                     * This is a bit tricky.
+                     * The error output should also contain
+                     *
+                     *  Error: Option [--mac-installer-sign-identity] is not valid with type [dmg]" error message.
+                     *
+                     * The order of errors is defined by the order of options on the command line causing them.
+                     * If "--mac-installer-sign-identity" goes before "--mac-signing-key-user-name", the error output will be:
+                     *
+                     *  Error: Option [--mac-installer-sign-identity] is not valid with type [dmg]
+                     *  Error: Mutually exclusive options [--mac-signing-key-user-name] and [--mac-installer-sign-identity]
+                     *
+                     * otherwise errors in the output will be in reverse order.
+                     */
+                    var expectedMessages = new ArrayList<>(testCase.expectedMessages());
+                    var invalidTypeOption = makeError("ERR_InvalidTypeOption", "--mac-installer-sign-identity", packageType.getType());
+                    if (testCase.addArgs().indexOf("--mac-installer-sign-identity") < testCase.addArgs().indexOf("--mac-signing-key-user-name")) {
+                        expectedMessages.addFirst(invalidTypeOption);
+                    } else {
+                        expectedMessages.add(invalidTypeOption);
+                    }
+                    testCase = testCase.copyWithExpectedMessages(expectedMessages);
+                }
+                return testCase;
+            }).toList());
+        }
 
         return toTestArgs(testCases.stream());
     }
@@ -702,8 +1063,7 @@ public final class ErrorTest {
         final var signingId = "foo";
 
         final List<CannedFormattedString> errorMessages = new ArrayList<>();
-        errorMessages.add(makeError(JPackageStringBundle.MAIN.cannedFormattedString(
-                "error.cert.not.found", "Developer ID Application: " + signingId, "")));
+        errorMessages.add(makeError("error.cert.not.found", "Developer ID Application: " + signingId, ""));
 
         final var cmd = JPackageCommand.helloAppImage()
                 .ignoreDefaultVerbose(true)
@@ -715,9 +1075,9 @@ public final class ErrorTest {
             errorMessages.stream()
                     .map(CannedFormattedString::getValue)
                     .map(TKit::assertTextStream)
-                    .map(TKit.TextStreamVerifier::negate).forEach(cmd::validateOutput);
+                    .map(TKit.TextStreamVerifier::negate).forEach(cmd::validateErr);
         } else {
-            cmd.validateOutput(errorMessages.toArray(CannedFormattedString[]::new));
+            cmd.validateErr(errorMessages.toArray(CannedFormattedString[]::new));
         }
 
         cmd.execute(1);
@@ -745,12 +1105,12 @@ public final class ErrorTest {
     }
 
     private static void macInvalidRuntime(Consumer<TestSpec> accumulator) {
-        var runtimeWithBinDirErr = makeError(JPackageStringBundle.MAIN.cannedFormattedString(
+        var runtimeWithBinDirErr = makeError(
                 "error.invalid-runtime-image-bin-dir", JPackageCommand.cannedArgument(cmd -> {
                     return Path.of(cmd.getArgumentValue("--runtime-image"));
-                }, Token.JAVA_HOME.token())));
-        var runtimeWithBinDirErrAdvice = makeAdvice(JPackageStringBundle.MAIN.cannedFormattedString(
-                "error.invalid-runtime-image-bin-dir.advice", "--mac-app-store"));
+                }, Token.JAVA_HOME.token()));
+        var runtimeWithBinDirErrAdvice = makeAdvice(
+                "error.invalid-runtime-image-bin-dir.advice", "--mac-app-store");
 
         Stream.of(
                 testSpec().nativeType().addArgs("--mac-app-store", "--runtime-image", Token.JAVA_HOME.token())
@@ -790,10 +1150,10 @@ public final class ErrorTest {
         }
 
         private CannedFormattedString expectedErrorMsg() {
-            return makeError(JPackageStringBundle.MAIN.cannedFormattedString(
+            return makeError(
                     "error.invalid-runtime-image-missing-file", JPackageCommand.cannedArgument(cmd -> {
                         return Path.of(cmd.getArgumentValue("--runtime-image"));
-                    }, runtimeDir.token()), missingFile));
+                    }, runtimeDir.token()), missingFile);
         }
     }
 
@@ -864,22 +1224,14 @@ public final class ErrorTest {
         );
     }
 
-    private static void defaultInit(JPackageCommand cmd, List<CannedFormattedString> expectedMessages) {
-
-        // Disable default logic adding `--verbose` option
-        // to jpackage command line.
-        // It will affect jpackage error messages if the command line is malformed.
-        cmd.ignoreDefaultVerbose(true);
-
-        // Ignore external runtime as it will interfere
-        // with jpackage arguments in this test.
-        cmd.ignoreDefaultRuntime(true);
-
-        cmd.validateOutput(expectedMessages.toArray(CannedFormattedString[]::new));
-    }
-
-    private static <T> Collection<Object[]> toTestArgs(Stream<T> stream) {
-        return stream.filter(v -> {
+    private static Collection<Object[]> toTestArgs(Stream<?> stream) {
+        return stream.map(v -> {
+            if (v instanceof TestSpec.Builder builder) {
+                return builder.create();
+            } else {
+                return v;
+            }
+        }).filter(v -> {
             if (v instanceof TestSpec ts) {
                 return ts.isSupported();
             } else {
@@ -890,8 +1242,8 @@ public final class ErrorTest {
         }).toList();
     }
 
-    private static Collection<Object[]> fromTestSpecBuilders(Stream<TestSpec.Builder> stream) {
-        return toTestArgs(stream.map(TestSpec.Builder::create));
+    private static Collection<Object[]> toTestArgs(Collection<?> col) {
+        return toTestArgs(col.stream());
     }
 
     private static String adjustTextStreamVerifierArg(String str) {
@@ -899,4 +1251,40 @@ public final class ErrorTest {
     }
 
     private static final Pattern LINE_SEP_REGEXP = Pattern.compile("\\R");
+
+    private final class SignEnvMock {
+
+        enum SingleCertificateKeychain {
+            FOO(CertificateType.CODE_SIGN),
+            BAR(CertificateType.INSTALLER),
+            ;
+
+            SingleCertificateKeychain(CertificateType certificateType) {
+                this.keychain = KeychainWithCertsSpec.build()
+                        .name(name().toLowerCase() + ".keychain")
+                        .addCert(CertificateRequest.build()
+                                .userName(name().toLowerCase())
+                                .type(Objects.requireNonNull(certificateType)))
+                        .create();
+            }
+
+            static List<KeychainWithCertsSpec> signingEnv() {
+                return Stream.of(values()).map(v -> {
+                    return v.keychain;
+                }).toList();
+            }
+
+            CertificateType certificateType() {
+                return keychain.certificateRequests().getFirst().type();
+            }
+
+            ResolvedKeychain keychain() {
+                return new ResolvedKeychain(keychain).toMock(VALUE.env());
+            }
+
+            private final KeychainWithCertsSpec keychain;
+        }
+
+        static final MacSignMockUtils.SignEnv VALUE = new MacSignMockUtils.SignEnv(SingleCertificateKeychain.signingEnv());
+    }
 }
diff --git a/test/jdk/tools/jpackage/share/FileAssociationsTest.java b/test/jdk/tools/jpackage/share/FileAssociationsTest.java
index cd4a0491532..c9bd690d73f 100644
--- a/test/jdk/tools/jpackage/share/FileAssociationsTest.java
+++ b/test/jdk/tools/jpackage/share/FileAssociationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,9 @@
  */
 
 import static java.util.Map.entry;
-import static jdk.jpackage.test.JPackageStringBundle.MAIN;
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.FileAssociations;
@@ -123,9 +120,9 @@ public class FileAssociationsTest {
             ));
         }).addInitializer(cmd -> {
             cmd.addArguments("--file-associations", propFile);
-            cmd.validateOutput(
-                    MAIN.cannedFormattedString("error.no-content-types-for-file-association", 1),
-                    MAIN.cannedFormattedString("error.no-content-types-for-file-association.advice", 1));
+            cmd.validateErr(
+                    JPackageCommand.makeError("error.no-content-types-for-file-association", 1),
+                    JPackageCommand.makeAdvice("error.no-content-types-for-file-association.advice", 1));
         }).run();
     }
 
@@ -141,9 +138,9 @@ public class FileAssociationsTest {
             ));
         }).addInitializer(cmd -> {
             cmd.addArguments("--file-associations", propFile);
-            cmd.validateOutput(
-                    MAIN.cannedFormattedString("error.too-many-content-types-for-file-association", 1),
-                    MAIN.cannedFormattedString("error.too-many-content-types-for-file-association.advice", 1));
+            cmd.validateErr(
+                    JPackageCommand.makeError("error.too-many-content-types-for-file-association", 1),
+                    JPackageCommand.makeAdvice("error.too-many-content-types-for-file-association.advice", 1));
         }).run();
     }
 
diff --git a/test/jdk/tools/jpackage/share/InOutPathTest.java b/test/jdk/tools/jpackage/share/InOutPathTest.java
index 6956f66df42..a9fa48dc1c6 100644
--- a/test/jdk/tools/jpackage/share/InOutPathTest.java
+++ b/test/jdk/tools/jpackage/share/InOutPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,26 +24,28 @@
 import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.test.Annotations.Parameters;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.AppImageFile;
 import jdk.jpackage.test.ApplicationLayout;
+import jdk.jpackage.test.ConfigurationTarget;
 import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.JPackageCommand.StandardAssert;
 import jdk.jpackage.test.PackageFile;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
 
 /*
  * @test
@@ -76,25 +78,6 @@ public final class InOutPathTest {
         return data;
     }
 
-    @Parameters(ifNotOS = OperatingSystem.MACOS)
-    public static Collection<Object[]> appContentInputOther() {
-        return List.of(new Object[][]{
-            {PackageTypeAlias.IMAGE, wrap(cmd -> {
-                additionalContent(cmd, "--app-content", cmd.outputBundle());
-            }, "--app-content same as output bundle")},
-        });
-    }
-
-    @Parameters(ifOS = OperatingSystem.MACOS)
-    public static Collection<Object[]> appContentInputOSX() {
-        var contentsFolder = "Contents/MacOS";
-        return List.of(new Object[][]{
-            {PackageTypeAlias.IMAGE, wrap(cmd -> {
-                additionalContent(cmd, "--app-content", cmd.outputBundle().resolve(contentsFolder));
-            }, String.format("--app-content same as the \"%s\" folder in the output bundle", contentsFolder))},
-        });
-    }
-
     @Parameters(ifOS = OperatingSystem.MACOS)
     public static Collection<Object[]> inputOSX() {
         return List.of(additionalContentInput(PackageType.MAC_DMG, "--mac-dmg-content").toArray(Object[][]::new));
@@ -146,67 +129,54 @@ public final class InOutPathTest {
     }
 
     @Test
-    public void test() throws Exception {
+    public void test() {
         runTest(packageTypes, configure);
     }
 
     private static Envelope wrap(ThrowingConsumer<JPackageCommand, ? extends Exception> v, String label) {
-        return new Envelope(v, label);
-    }
-
-    private static boolean isAppImageValid(JPackageCommand cmd) {
-        return !cmd.hasArgument("--app-content") && !cmd.hasArgument("--mac-dmg-content");
+        return new Envelope(ThrowingConsumer.toConsumer(v), label);
     }
 
     private static void runTest(Set<PackageType> packageTypes,
-            ThrowingConsumer<JPackageCommand, ? extends Exception> configure) throws Exception {
-        ThrowingConsumer<JPackageCommand, Exception> configureWrapper = cmd -> {
+            Consumer<JPackageCommand> configure) {
+
+        ConfigurationTarget cfg;
+        if (packageTypes.contains(PackageType.IMAGE)) {
+            cfg = new ConfigurationTarget(
+                    JPackageCommand.helloAppImage(JAR_PATH.toString() + ":"));
+        } else {
+            cfg = new ConfigurationTarget(new PackageTest()
+                    .forTypes(packageTypes)
+                    .configureHelloApp(JAR_PATH.toString() + ":"));
+        }
+
+        var verifier = new AppDirContentVerifier();
+
+        cfg.addInitializer(cmd -> {
             // Make sure the input directory is empty in every test run.
             // This is needed because jpackage output directories in this test
             // are subdirectories of the input directory.
             cmd.setInputToEmptyDirectory();
             configure.accept(cmd);
             if (cmd.hasArgument("--temp") && cmd.isImagePackageType()) {
-                // Request to build app image wit user supplied temp directory,
+                // Request to build app image with user supplied temp directory,
                 // ignore external runtime if any to make use of the temp directory
                 // for runtime generation.
                 cmd.ignoreDefaultRuntime(true);
             } else {
                 cmd.setFakeRuntime();
             }
+        })
+        .addInitializer(JPackageCommand::executePrerequisiteActions)
+        .addInitializer(verifier::captureInputDir);
 
-            if (!isAppImageValid(cmd)) {
-                // Standard asserts for .jpackage.xml fail in messed up app image. Disable them.
-                // Other standard asserts for app image contents should pass.
-                cmd.excludeStandardAsserts(StandardAssert.APP_IMAGE_FILE);
-            }
-        };
+        cfg.cmd().ifPresent(JPackageCommand::executeAndAssertHelloAppImageCreated);
 
-        if (packageTypes.contains(PackageType.IMAGE)) {
-            JPackageCommand cmd = JPackageCommand.helloAppImage(JAR_PATH.toString() + ":");
-            configureWrapper.accept(cmd);
-            cmd.executeAndAssertHelloAppImageCreated();
-            if (isAppImageValid(cmd)) {
-                verifyAppImage(cmd);
-            }
+        cfg.addInstallVerifier(verifier::verify);
 
-            if (cmd.hasArgument("--app-content")) {
-                // `--app-content` can be set to the app image directory which
-                // should not exist before jpackage is executed:
-                //  jpackage --name Foo --dest output --app-content output/Foo
-                // Verify the directory exists after jpackage execution.
-                // At least this will catch the case when the value of
-                // `--app-content` option refers to a path unrelated to jpackage I/O.
-                TKit.assertDirectoryExists(Path.of(cmd.getArgumentValue("--app-content")));
-            }
-        } else {
-            new PackageTest()
-                    .forTypes(packageTypes)
-                    .configureHelloApp(JAR_PATH.toString() + ":")
-                    .addInitializer(configureWrapper)
-                    .addInstallVerifier(InOutPathTest::verifyAppImage)
-                    .run(CREATE_AND_UNPACK);
-        }
+        cfg.test().ifPresent(pkg -> {
+            pkg.run(CREATE_AND_UNPACK);
+        });
     }
 
     private static void outputDirInInputDir(JPackageCommand cmd) throws
@@ -217,8 +187,7 @@ public final class InOutPathTest {
         cmd.setArgumentValue("--dest", outputDir);
     }
 
-    private static void outputDirSameAsInputDir(JPackageCommand cmd) throws
-            IOException {
+    private static void outputDirSameAsInputDir(JPackageCommand cmd) {
         // Set output dir the same as the input dir
         cmd.setArgumentValue("--dest", cmd.inputDir());
     }
@@ -238,38 +207,7 @@ public final class InOutPathTest {
         cmd.addArguments(argName, appContentFile.getParent());
     }
 
-    private static void verifyAppImage(JPackageCommand cmd) throws IOException {
-        if (!isAppImageValid(cmd)) {
-            // Don't verify the contents of app image as it is invalid.
-            // jpackage exited without getting stuck in infinite spiral.
-            // No more expectations from the tool for the give arguments.
-            return;
-        }
-
-        final Path rootDir = cmd.isImagePackageType() ? cmd.outputBundle() : cmd.pathToUnpackedPackageFile(
-                cmd.appInstallationDirectory());
-        final Path appDir = ApplicationLayout.platformAppImage().resolveAt(
-                rootDir).appDirectory();
-
-        final var knownFiles = Set.of(
-                JAR_PATH.getName(0).toString(),
-                PackageFile.getPathInAppImage(Path.of("")).getFileName().toString(),
-                AppImageFile.getPathInAppImage(Path.of("")).getFileName().toString(),
-                cmd.name() + ".cfg"
-        );
-
-        TKit.assertFileExists(appDir.resolve(JAR_PATH));
-
-        try (Stream<Path> actualFilesStream = Files.list(appDir)) {
-            var unexpectedFiles = actualFilesStream.map(path -> {
-                return path.getFileName().toString();
-            }).filter(Predicate.not(knownFiles::contains)).toList();
-            TKit.assertStringListEquals(List.of(), unexpectedFiles,
-                    "Check there are no unexpected files in `app` folder");
-        }
-    }
-
-    private static final record Envelope(ThrowingConsumer<JPackageCommand, ? extends Exception> value, String label) {
+    private record Envelope(Consumer<JPackageCommand> value, String label) {
         @Override
         public String toString() {
             // Will produce the same test description for the same label every
@@ -291,8 +229,49 @@ public final class InOutPathTest {
         private final Set<PackageType> packageTypes;
     }
 
+    private static final class AppDirContentVerifier {
+
+        void captureInputDir(JPackageCommand cmd) {
+            var root = Path.of(cmd.getArgumentValue("--input"));
+            try (var walk = Files.walk(root)) {
+                inputDirFiles = walk.map(root::relativize).toList();
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+
+        void verify(JPackageCommand cmd) {
+            var expectedContent = new HashSet<>(inputDirFiles);
+
+            expectedContent.add(Path.of(cmd.name() + ".cfg"));
+            if (cmd.isImagePackageType()) {
+                expectedContent.add(AppImageFile.getPathInAppImage(Path.of("")).getFileName());
+            } else {
+                expectedContent.add(PackageFile.getPathInAppImage(Path.of("")).getFileName());
+            }
+
+            final var rootDir = cmd.isImagePackageType() ? cmd.outputBundle() : cmd.pathToUnpackedPackageFile(
+                    cmd.appInstallationDirectory());
+            final var appDir = ApplicationLayout.platformAppImage().resolveAt(rootDir).appDirectory();
+
+            try (var walk = Files.walk(appDir)) {
+                var unexpectedFiles = walk
+                        .map(appDir::relativize)
+                        .filter(Predicate.not(expectedContent::contains))
+                        .map(Path::toString)
+                        .toList();
+                TKit.assertStringListEquals(List.of(), unexpectedFiles,
+                        "Check there are no unexpected files in `app` folder");
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+
+        private Collection<Path> inputDirFiles;
+    }
+
     private final Set<PackageType> packageTypes;
-    private final ThrowingConsumer<JPackageCommand, ? extends Exception> configure;
+    private final Consumer<JPackageCommand> configure;
 
     // Placing jar file in the "Resources" subdir of the input directory would allow
     // to use the input directory with `--app-content` on OSX.
diff --git a/test/jdk/tools/jpackage/share/InstallDirTest.java b/test/jdk/tools/jpackage/share/InstallDirTest.java
index db22077cd62..81d1fb3556e 100644
--- a/test/jdk/tools/jpackage/share/InstallDirTest.java
+++ b/test/jdk/tools/jpackage/share/InstallDirTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@ import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.RunnablePackageTest.Action;
@@ -106,7 +105,7 @@ public class InstallDirTest {
             cmd.saveConsoleOutput(true);
         })
         .addBundleVerifier((cmd, result) -> {
-            cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString("error.invalid-install-dir"));
+            cmd.validateErr(JPackageCommand.makeError("error.invalid-install-dir"));
         })
         .run();
     }
diff --git a/test/jdk/tools/jpackage/share/LicenseTest.java b/test/jdk/tools/jpackage/share/LicenseTest.java
index 1c6bfd51b62..9c2d1077584 100644
--- a/test/jdk/tools/jpackage/share/LicenseTest.java
+++ b/test/jdk/tools/jpackage/share/LicenseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,9 @@ import jdk.jpackage.test.TKit;
  *
  * Mac:
  *
+ * For DMG license should be displayed on command line when "hdiutil attach"
+ * is called.
+ *
  * Windows
  *
  * Installer should display license text matching contents of the license file
@@ -96,6 +99,7 @@ public class LicenseTest {
                     LICENSE_FILE));
         });
 
+        initMacDmgLicenseVerifier(test.forTypes(PackageType.MAC_DMG));
         initLinuxLicenseVerifier(test.forTypes(PackageType.LINUX));
 
         test.run();
@@ -131,6 +135,33 @@ public class LicenseTest {
         new CustomDebianCopyrightTest().withSubstitution(true).run();
     }
 
+    private static PackageTest initMacDmgLicenseVerifier(PackageTest test) {
+        return test
+        .addBundleVerifier(cmd -> {
+            verifyLicenseFileInDMGPackage(cmd);
+        });
+    }
+
+    private static void verifyLicenseFileInDMGPackage(JPackageCommand cmd)
+            throws IOException {
+        // DMG should have license, so attach with "no", since we only need license.
+        // With "no" attach will be canceled.
+        final var attachExec = Executor.of("sh", "-c", String.join(" ",
+                "no",
+                "|",
+                "/usr/bin/hdiutil",
+                "attach",
+                JPackageCommand.escapeAndJoin(cmd.outputBundle().toString())
+        )).saveOutput().storeOutputInFiles();
+
+        // Expected exit code is 1, since we canceling license.
+        final var attachResult = attachExec.executeAndRepeatUntilExitCode(1, 10, 6);
+        TKit.assertStringListEquals(Files.readAllLines(LICENSE_FILE),
+                attachResult.stdout(), String.format(
+                "Check output of \"hdiutil attach\" has the same license as contents of source license file [%s]",
+                LICENSE_FILE));
+    }
+
     private static PackageTest initLinuxLicenseVerifier(PackageTest test) {
         return test
         .addBundleVerifier(cmd -> {
diff --git a/test/jdk/tools/jpackage/share/MainClassTest.java b/test/jdk/tools/jpackage/share/MainClassTest.java
index bc813c4ec15..ab4dfe1e1fa 100644
--- a/test/jdk/tools/jpackage/share/MainClassTest.java
+++ b/test/jdk/tools/jpackage/share/MainClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ public final class MainClassTest {
         }
 
         Script expectedErrorMessage(String key, Object... args) {
-            expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(key, args);
+            expectedErrorMessage = JPackageCommand.makeError(key, args);
             return this;
         }
 
@@ -222,7 +222,7 @@ public final class MainClassTest {
         if (script.expectedErrorMessage != null) {
             // This is the case when main class is not found nor in jar
             // file nor on command line.
-            cmd.validateOutput(script.expectedErrorMessage).execute(1);
+            cmd.validateErr(script.expectedErrorMessage).execute(1);
             return;
         }
 
@@ -240,8 +240,7 @@ public final class MainClassTest {
             cmd.executeAndAssertHelloAppImageCreated();
         } else {
             cmd.executeAndAssertImageCreated();
-            var appVerifier = HelloApp.assertMainLauncher(cmd);
-            if (appVerifier != null) {
+            HelloApp.assertMainLauncher(cmd).ifPresent(appVerifier -> {
                 List<String> output = appVerifier
                         .saveOutput(true)
                         .expectedExitCode(1)
@@ -249,7 +248,7 @@ public final class MainClassTest {
                 TKit.assertTextStream(String.format(
                         "Error: Could not find or load main class %s",
                         nonExistingMainClass)).apply(output);
-            }
+            });
         }
 
         CfgFile cfg = cmd.readLauncherCfgFile();
diff --git a/test/jdk/tools/jpackage/share/ModulePathTest.java b/test/jdk/tools/jpackage/share/ModulePathTest.java
index 5e053fc0fae..583dd1eb0c4 100644
--- a/test/jdk/tools/jpackage/share/ModulePathTest.java
+++ b/test/jdk/tools/jpackage/share/ModulePathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,14 +125,14 @@ public final class ModulePathTest {
         } else {
             final CannedFormattedString expectedErrorMessage;
             if (modulePathArgs.isEmpty()) {
-                expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
+                expectedErrorMessage = JPackageCommand.makeError(
                         "ERR_MissingArgument2", "--runtime-image", "--module-path");
             } else {
-                expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
+                expectedErrorMessage = JPackageCommand.makeError(
                         "error.no-module-in-path", appDesc.moduleName());
             }
 
-            cmd.validateOutput(expectedErrorMessage).execute(1);
+            cmd.validateErr(expectedErrorMessage).execute(1);
         }
     }
 
diff --git a/test/jdk/tools/jpackage/share/OutputErrorTest.java b/test/jdk/tools/jpackage/share/OutputErrorTest.java
new file mode 100644
index 00000000000..28dca22a244
--- /dev/null
+++ b/test/jdk/tools/jpackage/share/OutputErrorTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.spi.ToolProvider;
+import jdk.internal.util.OperatingSystem;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JavaTool;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.TKit;
+
+/*
+ * @test
+ * @summary Test how jpackage handles errors writing output bundle
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror OutputErrorTest.java
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=OutputErrorTest
+ */
+
+public final class OutputErrorTest {
+
+    @Test
+    @Parameter("DIR")
+    // "Locked file error" reliably works only on Windows
+    @Parameter(value = "LOCKED_FILE", ifOS = OperatingSystem.WINDOWS)
+    public void testPackage(ExistingOutputBundleType existingOutputBundleType) {
+
+        new PackageTest().configureHelloApp().addInitializer(cmd -> {
+
+            cmd.setFakeRuntime();
+            cmd.setArgumentValue("--dest", TKit.createTempDirectory("output"));
+            cmd.removeOldOutputBundle(false);
+            cmd.validateErr(JPackageCommand.makeError(
+                    "error.output-bundle-cannot-be-overwritten", cmd.outputBundle().toAbsolutePath()));
+
+            var outputBundle = cmd.outputBundle();
+
+            switch (existingOutputBundleType) {
+                case DIR -> {
+                    Files.createDirectories(outputBundle);
+                    Files.writeString(outputBundle.resolve("foo.txt"), "Hello");
+                }
+                case LOCKED_FILE -> {
+                    Files.writeString(outputBundle, "Hello");
+                    cmd.useToolProvider(createToolProviderWithLockedFile(
+                            JavaTool.JPACKAGE.asToolProvider(), outputBundle));
+                }
+            }
+
+        }).setExpectedExitCode(1).run();
+    }
+
+    enum ExistingOutputBundleType {
+        DIR,
+        LOCKED_FILE,
+        ;
+    }
+
+    private static ToolProvider createToolProviderWithLockedFile(ToolProvider tp, Path lockedFile) {
+        Objects.requireNonNull(tp);
+        if (!Files.isRegularFile(lockedFile)) {
+            throw new IllegalArgumentException();
+        }
+
+        return new ToolProvider() {
+
+            @Override
+            public String name() {
+                return "jpackage-mock";
+            }
+
+            @SuppressWarnings("try")
+            @Override
+            public int run(PrintWriter out, PrintWriter err, String... args) {
+                try {
+                    var lastModifiedTime = Files.getLastModifiedTime(lockedFile);
+                    try (var fos = new FileOutputStream(lockedFile.toFile()); var lock = fos.getChannel().lock()) {
+                        Files.setLastModifiedTime(lockedFile, lastModifiedTime);
+                        return tp.run(out, err, args);
+                    }
+                } catch (IOException ex) {
+                    throw new UncheckedIOException(ex);
+                }
+            }
+        };
+    }
+}
diff --git a/test/jdk/tools/jpackage/windows/Win8301247Test.java b/test/jdk/tools/jpackage/windows/Win8301247Test.java
index 2f98141dcb4..bed795281f4 100644
--- a/test/jdk/tools/jpackage/windows/Win8301247Test.java
+++ b/test/jdk/tools/jpackage/windows/Win8301247Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,14 @@
  * questions.
  */
 
-import static jdk.jpackage.test.WindowsHelper.killAppLauncherProcess;
-
 import java.time.Duration;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.TKit;
 
 /**
  * Test that terminating of the parent app launcher process automatically
@@ -46,7 +48,7 @@ import jdk.jpackage.test.JPackageCommand;
 public class Win8301247Test {
 
     @Test
-    public void test() throws InterruptedException {
+    public void test() throws InterruptedException, ExecutionException {
         var cmd = JPackageCommand.helloAppImage().ignoreFakeRuntime();
 
         // Launch the app in a way it doesn't exit to let us trap app laucnher
@@ -54,20 +56,44 @@ public class Win8301247Test {
         cmd.addArguments("--java-options", "-Djpackage.test.noexit=true");
         cmd.executeAndAssertImageCreated();
 
+        var state = TKit.state();
+        var f = new CompletableFuture<Process>();
+
         // Launch the app in a separate thread
         new Thread(() -> {
-            HelloApp.executeLauncher(cmd);
+            TKit.withState(() -> {
+                HelloApp.assertMainLauncher(cmd).get().processListener(f::complete).execute();
+            }, state);
         }).start();
 
-        // Wait a bit to let the app start
-        Thread.sleep(Duration.ofSeconds(10));
+        var mainLauncherProcess = f.get();
 
-        // Find the main app launcher process and kill it
-        killAppLauncherProcess(cmd, null, 2);
+        Optional<ProcessHandle> childProcess = Optional.empty();
 
-        // Wait a bit and check if child app launcher process is still running (it must NOT)
-        Thread.sleep(Duration.ofSeconds(5));
+        try {
+            // Wait a bit to let the app start
+            Thread.sleep(Duration.ofSeconds(10));
 
-        killAppLauncherProcess(cmd, null, 0);
+            try (var children = mainLauncherProcess.children()) {
+                childProcess = children.filter(p -> {
+                    return mainLauncherProcess.info().command().equals(p.info().command());
+                }).findFirst();
+            }
+
+            TKit.assertTrue(childProcess.isPresent(),
+                    String.format("Check the main launcher process with PID=%d restarted", mainLauncherProcess.pid()));
+        } finally {
+            // Kill the main app launcher process
+            TKit.trace("About to kill the main launcher process...");
+            mainLauncherProcess.destroyForcibly();
+
+            // Wait a bit and check if child app launcher process is still running (it must NOT)
+            Thread.sleep(Duration.ofSeconds(5));
+
+            childProcess.ifPresent(p -> {
+                TKit.assertTrue(!p.isAlive(), String.format(
+                        "Check restarted main launcher process with PID=%d is not alive", p.pid()));
+            });
+        }
     }
 }
diff --git a/test/jdk/tools/jpackage/windows/Win8365790Test.java b/test/jdk/tools/jpackage/windows/Win8365790Test.java
index 6376a16cecc..5a690ea0146 100644
--- a/test/jdk/tools/jpackage/windows/Win8365790Test.java
+++ b/test/jdk/tools/jpackage/windows/Win8365790Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
 import jdk.jpackage.test.AdditionalLauncher;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CfgFile;
@@ -101,13 +103,18 @@ public class Win8365790Test {
 
     private static String runLauncher(JPackageCommand cmd, String launcherName, Path traceFile, Path outputFile) throws IOException {
         // Launch the specified launcher and send Ctrl+C signal to it.
-        Thread.ofVirtual().start(() -> {
-            configureAndExecute(0, Executor.of("powershell", "-NonInteractive", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Unrestricted")
-                    .addArgument("-File").addArgument(TEST_PS1)
-                    .addArguments("-TimeoutSeconds", Long.toString(Duration.ofSeconds(5).getSeconds()))
-                    .addArgument("-Executable").addArgument(cmd.appLauncherPath(launcherName))
-                    .dumpOutput());
-        });
+
+        var state = TKit.state();
+
+        var future = CompletableFuture.runAsync(() -> {
+            TKit.withState(() -> {
+                configureAndExecute(0, Executor.of("powershell", "-NonInteractive", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Unrestricted")
+                        .addArgument("-File").addArgument(TEST_PS1)
+                        .addArguments("-TimeoutSeconds", Long.toString(Duration.ofSeconds(5).getSeconds()))
+                        .addArgument("-Executable").addArgument(cmd.appLauncherPath(launcherName))
+                        .dumpOutput());
+            }, state);
+        }, Executors.newVirtualThreadPerTaskExecutor());
 
         TKit.waitForFileCreated(traceFile, Duration.ofSeconds(20), Duration.ofSeconds(2));
 
@@ -118,6 +125,10 @@ public class Win8365790Test {
         }
 
         TKit.assertFileExists(outputFile);
+
+        // Call join() on the future to make the test fail if the future execution resulted in a throw.
+        future.join();
+
         return Files.readString(outputFile);
     }
 
diff --git a/test/jdk/tools/jpackage/windows/WinChildProcessTest.java b/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
index a83ef837331..e5de19d182a 100644
--- a/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
+++ b/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@ import static jdk.jpackage.test.HelloApp.configureAndExecute;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.TKit;
-import static jdk.jpackage.test.WindowsHelper.killProcess;
 
 public class WinChildProcessTest {
     private static final Path TEST_APP_JAVA = TKit.TEST_SRC_ROOT
@@ -52,7 +51,7 @@ public class WinChildProcessTest {
 
     @Test
     public static void test() {
-        long childPid = 0;
+        Optional<ProcessHandle> child = Optional.empty();
         try {
             JPackageCommand cmd = JPackageCommand
                     .helloAppImage(TEST_APP_JAVA + "*Hello")
@@ -69,21 +68,18 @@ public class WinChildProcessTest {
             String pidStr = output.get(0);
 
             // parse child PID
-            childPid = Long.parseLong(pidStr.split("=", 2)[1]);
+            var childPid = Long.parseLong(pidStr.split("=", 2)[1]);
 
             // Check whether the termination of third party application launcher
             // also terminating the launched third party application
             // If third party application is not terminated the test is
             // successful else failure
-            Optional<ProcessHandle> processHandle = ProcessHandle.of(childPid);
-            boolean isAlive = processHandle.isPresent()
-                    && processHandle.get().isAlive();
-            TKit.assertTrue(isAlive, "Check child process is alive");
+            child = ProcessHandle.of(childPid);
+            boolean isAlive = child.map(ProcessHandle::isAlive).orElse(false);
+            TKit.assertTrue(isAlive, String.format("Check child process with PID=%d is alive", childPid));
         } finally {
-            if (childPid != 0) {
-                // Kill only a specific child instance
-                killProcess(childPid);
-            }
+            TKit.trace("About to kill the child process...");
+            child.ifPresent(ProcessHandle::destroyForcibly);
         }
     }
 }
diff --git a/test/jdk/tools/jpackage/windows/WinNoRestartTest.java b/test/jdk/tools/jpackage/windows/WinNoRestartTest.java
index 909ee06b01a..7390b2f79a3 100644
--- a/test/jdk/tools/jpackage/windows/WinNoRestartTest.java
+++ b/test/jdk/tools/jpackage/windows/WinNoRestartTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,18 @@
  * questions.
  */
 
-import static jdk.jpackage.test.WindowsHelper.killAppLauncherProcess;
 
 import java.io.IOException;
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CfgFile;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.TKit;
 
 /* @test
  * @bug 8340311
@@ -47,7 +50,7 @@ import jdk.jpackage.test.JPackageCommand;
 public class WinNoRestartTest {
 
     @Test
-    public static void test() throws InterruptedException, IOException {
+    public static void test() throws InterruptedException, IOException, ExecutionException {
         var cmd = JPackageCommand.helloAppImage().ignoreFakeRuntime();
 
         // Configure test app to launch in a way it will not exit
@@ -77,7 +80,7 @@ public class WinNoRestartTest {
     private static record NoRerunConfig(NoRerunSectionConfig firstSection,
             NoRerunSectionConfig secondSection, boolean expectedNoRestarted) {
 
-        void apply(JPackageCommand cmd, CfgFile origCfgFile) throws InterruptedException {
+        void apply(JPackageCommand cmd, CfgFile origCfgFile) throws InterruptedException, ExecutionException {
             // Alter the main launcher .cfg file
             var cfgFile = new CfgFile();
             if (firstSection != null) {
@@ -92,16 +95,43 @@ public class WinNoRestartTest {
             // Save updated main launcher .cfg file
             cfgFile.save(cmd.appLauncherCfgPath(null));
 
+            var state = TKit.state();
+            var f = new CompletableFuture<Process>();
+
             // Launch the app in a separate thread
             new Thread(() -> {
-                HelloApp.executeLauncher(cmd);
+                TKit.withState(() -> {
+                    HelloApp.assertMainLauncher(cmd).get().processListener(f::complete).execute();
+                }, state);
             }).start();
 
-            // Wait a bit to let the app start
-            Thread.sleep(Duration.ofSeconds(10));
+            var mainLauncherProcess = f.get();
 
-            // Find the main app launcher process and kill it
-            killAppLauncherProcess(cmd, null, expectedNoRestarted ? 1 : 2);
+            try {
+                // Wait a bit to let the app start
+                Thread.sleep(Duration.ofSeconds(10));
+
+                try (var children = mainLauncherProcess.children()) {
+                    Optional<String> childPid = children.filter(p -> {
+                        return mainLauncherProcess.info().command().equals(p.info().command());
+                    }).map(ProcessHandle::pid).map(Object::toString).findFirst();
+
+                    Optional<String> expectedChildPid;
+                    if (expectedNoRestarted) {
+                        expectedChildPid = Optional.empty();
+                    } else {
+                        expectedChildPid = childPid.or(() -> {
+                            return Optional.of("<some>");
+                        });
+                    }
+                    TKit.assertEquals(expectedChildPid, childPid, String.format(
+                            "Check the main launcher process with PID=%d restarted",
+                            mainLauncherProcess.pid()));
+                }
+            } finally {
+                TKit.trace("About to kill the main launcher process...");
+                mainLauncherProcess.destroyForcibly();
+            }
         }
     }
 
diff --git a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
index 6a78f78e804..68f39426c32 100644
--- a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
+++ b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,9 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Iterator;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.PackageTest;
@@ -74,10 +77,13 @@ public class WinOSConditionTest {
             // MSI error code 1603 is generic.
             // Dig into the last msi log file for log messages specific to failed condition.
             try (final var lines = cmd.winMsiLogFileContents().orElseThrow()) {
-                TKit.TextStreamVerifier.group()
-                        .add(TKit.assertTextStream("Doing action: LaunchConditions").predicate(String::endsWith))
-                        .add(TKit.assertTextStream("Not supported on this version of Windows").predicate(String::endsWith))
-                        .create().accept(lines.iterator());
+                Stream.of(
+                        "Doing action: LaunchConditions",
+                        "Not supported on this version of Windows"
+                ).map(TKit::assertTextStream).map(v -> {
+                    Consumer<Iterator<String>> consumer = v.predicate(String::endsWith)::apply;
+                    return consumer;
+                }).reduce(Consumer::andThen).orElseThrow().accept(lines.iterator());
             }
         })
         .createMsiLog(true)
diff --git a/test/jdk/tools/jpackage/windows/WinResourceTest.java b/test/jdk/tools/jpackage/windows/WinResourceTest.java
index b22501ac6cc..6327b94b420 100644
--- a/test/jdk/tools/jpackage/windows/WinResourceTest.java
+++ b/test/jdk/tools/jpackage/windows/WinResourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,17 +21,20 @@
  * questions.
  */
 
+import static jdk.jpackage.test.WindowsHelper.getWixTypeFromVerboseJPackageOutput;
+import static jdk.jpackage.test.WindowsHelper.WixType.WIX3;
+
 import java.io.IOException;
 import java.nio.file.Path;
-import jdk.jpackage.test.TKit;
+import java.util.List;
+import jdk.jpackage.test.Annotations.Parameters;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.JPackageOutputValidator;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.Annotations.Parameters;
-import java.util.List;
-import static jdk.jpackage.test.WindowsHelper.WixType.WIX3;
-import static jdk.jpackage.test.WindowsHelper.getWixTypeFromVerboseJPackageOutput;
+import jdk.jpackage.test.TKit;
 
 /**
  * Test --resource-dir option. The test should set --resource-dir to point to
@@ -52,7 +55,7 @@ import static jdk.jpackage.test.WindowsHelper.getWixTypeFromVerboseJPackageOutpu
 
 public class WinResourceTest {
 
-    public WinResourceTest(String wixSource, String expectedLogMessage) {
+    public WinResourceTest(String wixSource, CannedFormattedString expectedLogMessage) {
          this.wixSource = wixSource;
          this.expectedLogMessage = expectedLogMessage;
     }
@@ -60,8 +63,10 @@ public class WinResourceTest {
     @Parameters
     public static List<Object[]> data() {
         return List.of(new Object[][]{
-            {"main.wxs", "Using custom package resource [Main WiX project file]"},
-            {"overrides.wxi", "Using custom package resource [Overrides WiX project file]"},
+            {"main.wxs", JPackageStringBundle.MAIN.cannedFormattedString(
+                    "message.using-custom-resource", "[Main WiX project file]", "main.wxs")},
+            {"overrides.wxi", JPackageStringBundle.MAIN.cannedFormattedString(
+                    "message.using-custom-resource", "[Overrides WiX project file]", "overrides.wxi")},
         });
     }
 
@@ -81,6 +86,12 @@ public class WinResourceTest {
             // Create invalid WiX source file in a resource dir.
             TKit.createTextFile(resourceDir.resolve(wixSource), List.of(
                     "any string that is an invalid WiX source file"));
+
+            new JPackageOutputValidator()
+                    .matchTimestamps()
+                    .stripTimestamps()
+                    .expectMatchingStrings(expectedLogMessage)
+                    .applyTo(cmd);
         })
         .addBundleVerifier((cmd, result) -> {
             // Assert jpackage picked custom main.wxs and failed as expected by
@@ -92,17 +103,12 @@ public class WinResourceTest {
                 expectedWixErrorMsg = "error WIX0104: Not a valid source file";
             }
 
-            TKit.assertTextStream(expectedLogMessage)
-                    .predicate(String::startsWith)
-                    .apply(JPackageCommand.stripTimestamps(
-                            result.getOutput().stream()).iterator());
-            TKit.assertTextStream(expectedWixErrorMsg)
-                    .apply(result.getOutput());
+            TKit.assertTextStream(expectedWixErrorMsg).apply(result.stderr());
         })
         .setExpectedExitCode(1)
         .run();
     }
 
     final String wixSource;
-    final String expectedLogMessage;
+    final CannedFormattedString expectedLogMessage;
 }
diff --git a/test/jdk/tools/sincechecker/modules/java.naming/JavaNamingCheckSince.java b/test/jdk/tools/sincechecker/modules/java.naming/JavaNamingCheckSince.java
new file mode 100644
index 00000000000..6d99ab9b727
--- /dev/null
+++ b/test/jdk/tools/sincechecker/modules/java.naming/JavaNamingCheckSince.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Test for "@since" in java.naming module
+ * @library /test/lib /test/jdk/tools/sincechecker
+ * @run main SinceChecker java.naming
+ */
diff --git a/test/langtools/ProblemList-StaticJdk.txt b/test/langtools/ProblemList-StaticJdk.txt
index 70f0438c0c6..700099656e8 100644
--- a/test/langtools/ProblemList-StaticJdk.txt
+++ b/test/langtools/ProblemList-StaticJdk.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,3 +24,16 @@
 ###########################################################################
 
 # Currently empty
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/langtools/ProblemList-enable-preview.txt b/test/langtools/ProblemList-enable-preview.txt
new file mode 100644
index 00000000000..1a831a0dde3
--- /dev/null
+++ b/test/langtools/ProblemList-enable-preview.txt
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing with --enable-preview
+#
+# These are failures that ONLY occur with the '--enable-preview' option
+# specified. There are separate sub-sections for each preview project.
+#
+#############################################################################
+
diff --git a/test/langtools/ProblemList.txt b/test/langtools/ProblemList.txt
index 9d61a20663d..07ab6937c07 100644
--- a/test/langtools/ProblemList.txt
+++ b/test/langtools/ProblemList.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -71,3 +71,16 @@ tools/javap/output/RepeatingTypeAnnotations.java
 ###########################################################################
 #
 # jdeps
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT
index 14636716882..434cf91b0ec 100644
--- a/test/langtools/TEST.ROOT
+++ b/test/langtools/TEST.ROOT
@@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=8.1+1
+requiredVersion=8.2.1+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index ee1fa538a57..6740bace528 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -122,7 +122,7 @@ public class CheckStylesheetClasses {
                 "modifiers", "permits", "return-type");
 
         // misc: these are defined in HtmlStyle, and used by the doclet
-        removeAll(htmlStyleNames, "col-plain", "external-link", "header", "index",
+        removeAll(htmlStyleNames, "col-plain", "external-link", "header",
                 "package-uses", "packages", "permits-note", "serialized-package-container",
                 "source-container");
 
diff --git a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
index e914f8022fd..1c3e8306d7b 100644
--- a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6251738 8226279 8297802 8305407
+ * @bug 6251738 8226279 8297802 8305407 8309748
  * @summary JDK-8226279 javadoc should support a new at-spec tag
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -343,16 +343,15 @@ public class TestSpecTag extends JavadocTester {
 
         checkOutput("external-specs.html", true,
                 """
-                    <div class="table-tabs" role="tablist" aria-orientation="horizontal">\
-                    <button id="external-specs-tab0" role="tab" aria-selected="true" aria-controls="external-specs.tabpanel" \
-                    tabindex="0" onkeydown="switchTab(event)" onclick="show('external-specs', 'external-specs', 2)" \
-                    class="active-table-tab">All Specifications</button>\
-                    <button id="external-specs-tab1" role="tab" aria-selected="false" aria-controls="external-specs.tabpanel" \
-                    tabindex="-1" onkeydown="switchTab(event)" onclick="show('external-specs', 'external-specs-tab1', 2)" \
-                    class="table-tab">example.com</button>\
-                    <button id="external-specs-tab2" role="tab" aria-selected="false" aria-controls="external-specs.tabpanel" \
-                    tabindex="-1" onkeydown="switchTab(event)" onclick="show('external-specs', 'external-specs-tab2', 2)" \
-                    class="table-tab">example.net</button></div>
+                    <label for="specs-by-domain">Show specifications by host name:</label> <select id="specs-by-domain">
+                    <option value>All host names</option>
+                    <option value="1">example.com</option>
+                    <option value="2">example.net</option>
+                    </select>
+                    <div id="external-specs">
+                    <div class="table-tabs">
+                    <div class="caption"><span>External Specifications</span></div>
+                    </div>
                     <div id="external-specs.tabpanel" role="tabpanel" aria-labelledby="external-specs-tab0">
                     <div class="summary-table two-column-summary">
                     <div class="table-header col-first">Specification</div>
@@ -369,7 +368,25 @@ public class TestSpecTag extends JavadocTester {
                     <ul class="ref-list">
                     <li><code><a href="p/C.html#example-2">class p.C</a></code></li>
                     </ul>
-                    </div>""");
+                    </div>""",
+                """
+                    <script type="text/javascript">let select = document.getElementById('specs-by-domain');
+                    select.addEventListener("change", selectHost);
+                    addEventListener("pageshow", selectHost);
+                    function selectHost() {
+                        const selectedClass = select.value ? "external-specs-tab" + select.value : "external-specs";
+                        let tabPanel = document.getElementById("external-specs.tabpanel");
+                        let count = 0;
+                        tabPanel.querySelectorAll("div.external-specs").forEach(function(elem) {
+                            elem.style.display = elem.classList.contains(selectedClass) ? "" : "none";
+                            if (elem.style.display === "") {
+                                let isEvenRow = count++ % 4 < 2;
+                                toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor);
+                            }
+                        });
+                    }
+                    selectHost();
+                    </script>""");
     }
 
     @Test
diff --git a/test/langtools/jdk/jshell/CompletionAPITest.java b/test/langtools/jdk/jshell/CompletionAPITest.java
index ad5dea90a95..932482ce6dc 100644
--- a/test/langtools/jdk/jshell/CompletionAPITest.java
+++ b/test/langtools/jdk/jshell/CompletionAPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8366691
+ * @bug 8366691 8375015
  * @summary Test JShell Completion API
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -67,7 +67,7 @@ import org.junit.jupiter.api.Test;
 
 public class CompletionAPITest extends KullaTesting {
 
-    private static final long TIMEOUT = 2_000;
+    private static final long TIMEOUT = 20_000;
 
     @Test
     public void testAPI() {
@@ -144,7 +144,7 @@ public class CompletionAPITest extends KullaTesting {
     }
 
     @Test
-    public void testDocumentation() {
+    public void testDocumentation() throws Exception {
         waitIndexingFinished();
 
         Path classes = prepareZip();
@@ -171,6 +171,7 @@ public class CompletionAPITest extends KullaTesting {
 
         while (clazz.get().get() != null && (System.currentTimeMillis() - start) < TIMEOUT) {
             System.gc();
+            Thread.sleep(100);
         }
 
         assertNull(clazz.get().get());
diff --git a/test/langtools/jdk/jshell/SnippetHighlightTest.java b/test/langtools/jdk/jshell/SnippetHighlightTest.java
index dbf3418af83..33f7f263617 100644
--- a/test/langtools/jdk/jshell/SnippetHighlightTest.java
+++ b/test/langtools/jdk/jshell/SnippetHighlightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8274148 8301580 8359497
+ * @bug 8274148 8301580 8359497 8374293
  * @summary Check snippet highlighting
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -122,6 +122,13 @@ public class SnippetHighlightTest extends KullaTesting {
                          """);
     }
 
+    @Test // 8374293: The returned Highlights should not overlap
+    public void testHighlightsOverlap() {
+        assertHighlights("public void E test()", "Highlight[start=0, end=6, attributes=[KEYWORD]]",
+                "Highlight[start=7, end=11, attributes=[KEYWORD]]",
+                "Highlight[start=14, end=18, attributes=[DECLARATION]]");
+    }
+
     private void assertHighlights(String code, String... expected) {
         List<String> completions = computeHighlights(code);
         assertEquals(Arrays.asList(expected), completions, "Input: " + code + ", " + completions.toString());
@@ -134,7 +141,6 @@ public class SnippetHighlightTest extends KullaTesting {
                 getAnalysis().highlights(code);
         return highlights.stream()
                           .map(h -> h.toString())
-                          .distinct()
                           .collect(Collectors.toList());
     }
 }
diff --git a/test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java b/test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java
index 02c94b589c8..ed5936210a8 100644
--- a/test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java
+++ b/test/langtools/lib/combo/tools/javac/combo/JavacTemplateTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -237,18 +237,17 @@ public abstract class JavacTemplateTestBase {
             if (classpaths.size() > 0)
                 fm.setLocation(StandardLocation.CLASS_PATH, classpaths);
             JavacTask ct = (JavacTask) systemJavaCompiler.getTask(null, fm, diags, compileOptions, null, files);
+            File destDir;
             if (generate) {
-                File destDir = new File(root, Integer.toString(counter.incrementAndGet()));
+                destDir = new File(root, Integer.toString(counter.incrementAndGet()));
                 // @@@ Assert that this directory didn't exist, or start counter at max+1
                 destDir.mkdirs();
                 fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(destDir));
-                ct.generate();
-                return destDir;
-            }
-            else {
-                ct.analyze();
-                return nullDir;
+            } else {
+                destDir = nullDir;
             }
+            ct.generate(); // throws ISE if javac crashes
+            return destDir;
         }
     }
 
diff --git a/test/langtools/tools/javac/6304921/TestLog.java b/test/langtools/tools/javac/6304921/TestLog.java
index 8f00a14b9e2..9d0219accf1 100644
--- a/test/langtools/tools/javac/6304921/TestLog.java
+++ b/test/langtools/tools/javac/6304921/TestLog.java
@@ -42,7 +42,6 @@ import com.sun.tools.javac.file.JavacFileManager;
 import com.sun.tools.javac.parser.Parser;
 import com.sun.tools.javac.parser.ParserFactory;
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Context;
@@ -96,9 +95,8 @@ public class TestLog
         CharSequence cs = fo.getCharContent(true);
         Parser parser = pfac.newParser(cs, false, genEndPos, false);
         JCTree.JCCompilationUnit tree = parser.parseCompilationUnit();
-        log.setEndPosTable(fo, tree.endPositions);
 
-        TreeScanner ts = new LogTester(log, tree.endPositions);
+        TreeScanner ts = new LogTester(log);
         ts.scan(tree);
 
         check(log.nerrors, 4, "errors");
@@ -117,9 +115,8 @@ public class TestLog
     }
 
     private static class LogTester extends TreeScanner {
-        LogTester(Log log, EndPosTable endPosTable) {
+        LogTester(Log log) {
             this.log = log;
-            this.endPosTable = endPosTable;
         }
 
         public void visitIf(JCTree.JCIf tree) {
@@ -138,7 +135,6 @@ public class TestLog
         }
 
         private Log log;
-        private EndPosTable endPosTable;
     }
 
     private static class StringJavaFileObject extends SimpleJavaFileObject {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java
index dfa266ef035..b8ee32fcacd 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsPositionsOnRecords.java
@@ -78,6 +78,17 @@ public class TypeAnnotationsPositionsOnRecords {
             record Record6(String t1, @Nullable String t2) {
                 public Record6 {}
             }
+
+            class Test2 {
+                @Target(ElementType.TYPE_USE)
+                @Retention(RetentionPolicy.RUNTIME)
+                public @interface Anno {}
+
+                class Foo {}
+                record Record7(Test2.@Anno Foo foo) {
+                    public Record7 {} // compact constructor
+                }
+            }
             """;
 
     public static void main(String... args) throws Exception {
@@ -100,6 +111,8 @@ public class TypeAnnotationsPositionsOnRecords {
                 "Record5.class").toUri()), 1);
         checkClassFile(new File(Paths.get(System.getProperty("user.dir"),
                 "Record6.class").toUri()), 1);
+        checkClassFile(new File(Paths.get(System.getProperty("user.dir"),
+                "Test2$Record7.class").toUri()), 0);
     }
 
     void compileTestClass() throws Exception {
@@ -110,6 +123,7 @@ public class TypeAnnotationsPositionsOnRecords {
 
     void checkClassFile(final File cfile, int... taPositions) throws Exception {
         ClassModel classFile = ClassFile.of().parse(cfile.toPath());
+        System.err.println("-----------loading " + cfile.getPath());
         int accessorPos = 0;
         int checkedAccessors = 0;
         for (MethodModel method : classFile.methods()) {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables-old.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables-old.out
new file mode 100644
index 00000000000..2b447e4a842
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables-old.out
@@ -0,0 +1,7 @@
+VarVariables.java:34:36: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.deconstruction.patterns), 19, 21
+VarVariables.java:18:9: compiler.err.annotation.type.not.applicable
+VarVariables.java:24:14: compiler.err.annotation.type.not.applicable
+VarVariables.java:27:14: compiler.err.annotation.type.not.applicable
+VarVariables.java:32:14: compiler.err.annotation.type.not.applicable
+VarVariables.java:36:37: compiler.err.annotation.type.not.applicable
+6 errors
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables.java
new file mode 100644
index 00000000000..a47b8b31da7
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables.java
@@ -0,0 +1,52 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8371683
+ * @summary Test that type annotations cannot appears on 'var' variables
+ * @compile/fail/ref=VarVariables.out -XDrawDiagnostics VarVariables.java
+ * @compile/fail/ref=VarVariables-old.out --release 19 -XDrawDiagnostics -XDshould-stop.at=FLOW VarVariables.java
+ */
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.util.List;
+import java.util.function.Consumer;
+
+class VarVariables {
+    private void test(Object o) {
+        @DA var v1 = "";
+        @DTA var v2 = "";
+        @TA var v3 = "";
+        Consumer<String> c1 = (@DA var v) -> {};
+        Consumer<String> c2 = (@DTA var v) -> {};
+        Consumer<String> c3 = (@TA var v) -> {};
+        for (@DA var v = ""; !v.isEmpty(); ) {}
+        for (@DTA var v = ""; !v.isEmpty(); ) {}
+        for (@TA var v = ""; !v.isEmpty(); ) {}
+        for (@DA var v : List.of("")) {}
+        for (@DTA var v : List.of("")) {}
+        for (@TA var v : List.of("")) {}
+        try (@DA var v = open()) {
+        } catch (Exception ex) {}
+        try (@DTA var v = open()) {
+        } catch (Exception ex) {}
+        try (@TA var v = open()) {
+        } catch (Exception ex) {}
+        boolean b1 = o instanceof R(@DA var v);
+        boolean b2 = o instanceof R(@DTA var v);
+        boolean b3 = o instanceof R(@TA var v);
+    }
+
+    private AutoCloseable open() {
+        return null;
+    }
+    record R(String str) {}
+
+    @Target(ElementType.TYPE_USE)
+    @interface TA { }
+
+    @Target({ElementType.TYPE_USE, ElementType.LOCAL_VARIABLE, ElementType.PARAMETER})
+    @interface DTA { }
+
+    @Target({ElementType.LOCAL_VARIABLE, ElementType.PARAMETER})
+    @interface DA { }
+}
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables.out
new file mode 100644
index 00000000000..7f055040855
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/target/VarVariables.out
@@ -0,0 +1,7 @@
+VarVariables.java:18:9: compiler.err.annotation.type.not.applicable
+VarVariables.java:21:32: compiler.err.annotation.type.not.applicable
+VarVariables.java:24:14: compiler.err.annotation.type.not.applicable
+VarVariables.java:27:14: compiler.err.annotation.type.not.applicable
+VarVariables.java:32:14: compiler.err.annotation.type.not.applicable
+VarVariables.java:36:37: compiler.err.annotation.type.not.applicable
+6 errors
diff --git a/test/langtools/tools/javac/api/TestGetScopeResult.java b/test/langtools/tools/javac/api/TestGetScopeResult.java
index 533c640096e..adae4ccdb5a 100644
--- a/test/langtools/tools/javac/api/TestGetScopeResult.java
+++ b/test/langtools/tools/javac/api/TestGetScopeResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8205418 8207229 8207230 8230847 8245786 8247334 8248641 8240658 8246774 8274347 8347989
+ * @bug 8205418 8207229 8207230 8230847 8245786 8247334 8248641 8240658 8246774 8274347 8347989 8308637
  * @summary Test the outcomes from Trees.getScope
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.comp
@@ -100,6 +100,7 @@ public class TestGetScopeResult {
         new TestGetScopeResult().testNestedSwitchExpression();
         new TestGetScopeResult().testModuleImportScope();
         new TestGetScopeResult().testClassTypeSetInEnterGetScope();
+        new TestGetScopeResult().testNotYetAttributedGetScope();
     }
 
     public void run() throws IOException {
@@ -966,6 +967,110 @@ public class TestGetScopeResult {
         }
     }
 
+    void testNotYetAttributedGetScope() throws IOException { //JDK-8308637
+        JavacTool c = JavacTool.create();
+        record TestCase(String code, List<List<String>> expected) {}
+        TestCase[] cases = new TestCase[] {
+            new TestCase("""
+                          class B {
+                              public class Test {}
+                              void m() {
+                                  this.new Test() {};
+                              }
+                          }
+                          """,
+                          List.of(List.of("super:java.lang.Object",
+                                          "this:B"))),
+            new TestCase("""
+                          class B {
+                              public class Test {}
+                              void m() {
+                                  int local1 = 0;
+                                  new Test() {};
+                                  this.new Test() {};
+                                  class Inner {
+                                       class InnerNested {
+                                           void m() {
+                                               int local2 = 0;
+                                               new Test() {};
+                                               B.this.new Test() {};
+                                           }
+                                       }
+                                  }
+                              }
+                          }
+                          """,
+                          List.of(
+                            List.of("local1:int",
+                                    "super:java.lang.Object",
+                                    "this:B"),
+                            List.of(":<anonymous B.Test>",
+                                    "local1:int",
+                                    "super:java.lang.Object",
+                                    "this:B"),
+                            List.of("local2:int",
+                                    "super:java.lang.Object",
+                                    "this:Inner.InnerNested",
+                                    "super:java.lang.Object",
+                                    "this:Inner",
+                                    "Inner:Inner",
+                                    ":<anonymous B.Test>",
+                                    ":<anonymous B.Test>",
+                                    "local1:int",
+                                    "super:java.lang.Object",
+                                    "this:B"),
+                            List.of(":<anonymous B.Test>",
+                                    "local2:int",
+                                    "super:java.lang.Object",
+                                    "this:Inner.InnerNested",
+                                    "super:java.lang.Object",
+                                    "this:Inner",
+                                    "Inner:Inner",
+                                    ":<anonymous B.Test>",
+                                    ":<anonymous B.Test>",
+                                    "local1:int",
+                                    "super:java.lang.Object",
+                                    "this:B")
+                            )),
+        };
+        try (StandardJavaFileManager fm = c.getStandardFileManager(null, null, null)) {
+            for (TestCase tc : cases) {
+                JavaFileObject input =
+                        SimpleJavaFileObject.forSource(URI.create("myfo:///Test.java"), tc.code());
+                JavacTask t = (JavacTask) c.getTask(null, fm, null, null, null,
+                                                    List.of(input));
+                Trees trees = Trees.instance(t);
+                List<List<String>> actual = new ArrayList<>();
+
+                t.addTaskListener(new TaskListener() {
+                    @Override
+                    public void finished(TaskEvent e) {
+                        if (e.getKind() == TaskEvent.Kind.ENTER) {
+                            new TreePathScanner<Void, Void>() {
+                                @Override
+                                public Void visitIdentifier(IdentifierTree node, Void p) {
+                                    if (node.getName().contentEquals("Test")) {
+                                        Scope scope = trees.getScope(getCurrentPath());
+                                        actual.add(dumpScope(scope));
+                                    }
+                                    return super.visitIdentifier(node, p);
+                                }
+                            }.scan(e.getCompilationUnit(), null);
+                        }
+                    }
+
+                });
+
+                t.analyze();
+
+                if (!tc.expected().equals(actual)) {
+                    throw new AssertionError("Unexpected Scope content: " + actual +
+                                             ", expected: " + tc.expected());
+                }
+            }
+        }
+    }
+
     private List<String> dumpScope(Scope scope) {
         List<String> content = new ArrayList<>();
         while (scope.getEnclosingClass() != null) {
diff --git a/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java b/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java
index 1835cd46167..160f358f32f 100644
--- a/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java
+++ b/test/langtools/tools/javac/diags/DiagnosticGetEndPosition.java
@@ -118,9 +118,16 @@ public class DiagnosticGetEndPosition {
             compiler.getTask(
                 null,
                 null,
-                d -> assertEquals("", //ideally would be "0", but the positions are not fully set yet
-                                  implCode.substring((int) d.getStartPosition(),
-                                                     (int) d.getEndPosition())),
+                d -> {
+                    // Use line and column instead of start and end positions
+                    // to handle platform-dependent newlines, which could be
+                    // different between the text block and the written file.
+                    int line = (int) d.getLineNumber();
+                    int col = (int) d.getColumnNumber();
+                    assertEquals(1, d.getEndPosition() - d.getStartPosition());
+                    String substring = implCode.split("\\R")[line - 1].substring(col - 1, col);
+                    assertEquals("0", substring);
+                },
                 List.of("-sourcepath", src.toString(), "-Xlint:divzero"),
                 null,
                 fm.getJavaFileObjects(src.resolve("test").resolve("Test.java"))
diff --git a/test/langtools/tools/javac/diags/examples/BindingPattern.java b/test/langtools/tools/javac/diags/examples/BindingPattern.java
new file mode 100644
index 00000000000..01913a47fd7
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/BindingPattern.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.not.exhaustive.details
+// key: compiler.misc.binding.pattern
+
+class BindingPattern {
+    int t(Object o) {
+        return switch (o) {
+            case String s -> 0;
+        };
+    }
+}
diff --git a/test/langtools/tools/javac/diags/examples/EnumConstantPattern.java b/test/langtools/tools/javac/diags/examples/EnumConstantPattern.java
new file mode 100644
index 00000000000..b2ab5b9028d
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/EnumConstantPattern.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.not.exhaustive.details
+// key: compiler.misc.enum.constant.pattern
+
+class NotExhaustiveDetails {
+    int t(I i) {
+        return switch (i) {
+            case R r -> -1;
+            case E.A -> -1;
+        };
+    }
+    sealed interface I {}
+    enum E implements I {A, B}
+    record R(E e) implements I {}
+}
diff --git a/test/langtools/tools/javac/diags/examples/LambdaDeserializationStat.java b/test/langtools/tools/javac/diags/examples/LambdaDeserializationStat.java
new file mode 100644
index 00000000000..4ab23ed0b3d
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/LambdaDeserializationStat.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026, Google LLC and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.note.lambda.deserialization.stat
+// options: --debug=dumpLambdaDeserializationStats
+
+import java.io.Serializable;
+
+class LambdaDeserializationStat {
+    Runnable r = (Runnable & Serializable) () -> {};
+}
diff --git a/test/langtools/tools/javac/diags/examples/NotExhaustive.java b/test/langtools/tools/javac/diags/examples/NotExhaustive.java
index 8d36b013677..f048755ec79 100644
--- a/test/langtools/tools/javac/diags/examples/NotExhaustive.java
+++ b/test/langtools/tools/javac/diags/examples/NotExhaustive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 // key: compiler.err.not.exhaustive
+// options: -XDexhaustivityMaxBaseChecks=0
 
 class NotExhaustive {
     int t(int i) {
diff --git a/test/langtools/tools/javac/diags/examples/NotExhaustiveStatement.java b/test/langtools/tools/javac/diags/examples/NotExhaustiveStatement.java
index 65a11abb0e6..49e4955cbdb 100644
--- a/test/langtools/tools/javac/diags/examples/NotExhaustiveStatement.java
+++ b/test/langtools/tools/javac/diags/examples/NotExhaustiveStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,7 @@
  */
 
 // key: compiler.err.not.exhaustive.statement
+// options: -XDexhaustivityMaxBaseChecks=0
 
 class NotExhaustive {
     void t(Object o) {
diff --git a/test/langtools/tools/javac/diags/examples/RecordPattern.java b/test/langtools/tools/javac/diags/examples/RecordPattern.java
new file mode 100644
index 00000000000..2bb43bfd800
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/RecordPattern.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.not.exhaustive.statement.details
+// key: compiler.misc.record.pattern
+
+class RecordPattern {
+    void t(R r) {
+        switch (r) {
+            case R(C1 _) -> {}
+        };
+    }
+    sealed interface I {}
+    record C1() implements I {}
+    record C2() implements I {}
+    record R(I i) {}
+}
diff --git a/test/langtools/tools/javac/failover/CheckAttributedTree.java b/test/langtools/tools/javac/failover/CheckAttributedTree.java
index 9b28d2bebd4..050a302bc6e 100644
--- a/test/langtools/tools/javac/failover/CheckAttributedTree.java
+++ b/test/langtools/tools/javac/failover/CheckAttributedTree.java
@@ -92,7 +92,6 @@ import com.sun.source.util.TaskEvent.Kind;
 import com.sun.source.util.TaskListener;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCBreak;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
@@ -367,8 +366,7 @@ public class CheckAttributedTree {
         private class NPETester extends TreeScanner {
             void test(JCCompilationUnit cut, JCTree tree) {
                 sourcefile = cut.sourcefile;
-                endPosTable = cut.endPositions;
-                encl = new Info(tree, endPosTable);
+                encl = new Info(tree);
                 tree.accept(this);
             }
 
@@ -379,7 +377,7 @@ public class CheckAttributedTree {
                     return;
                 }
 
-                Info self = new Info(tree, endPosTable);
+                Info self = new Info(tree);
                 if (mandatoryType(tree)) {
                     check(tree.type != null,
                             "'null' field 'type' found in tree ", self);
@@ -454,7 +452,6 @@ public class CheckAttributedTree {
             }
 
             JavaFileObject sourcefile;
-            EndPosTable endPosTable;
             Info encl;
         }
     }
@@ -498,12 +495,12 @@ public class CheckAttributedTree {
             end = Integer.MAX_VALUE;
         }
 
-        Info(JCTree tree, EndPosTable endPosTable) {
+        Info(JCTree tree) {
             this.tree = tree;
             tag = tree.getTag();
             start = TreeInfo.getStartPos(tree);
             pos = tree.pos;
-            end = TreeInfo.getEndPos(tree, endPosTable);
+            end = TreeInfo.getEndPos(tree);
         }
 
         @Override
diff --git a/test/langtools/tools/javac/lambda/LambdaSerializedClassCastException.java b/test/langtools/tools/javac/lambda/LambdaSerializedClassCastException.java
new file mode 100644
index 00000000000..f63f4b64e79
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/LambdaSerializedClassCastException.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, Alphabet LLC. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8208752
+ * @summary NPE generating serializedLambdaName for nested lambda
+ * @compile/ref=LambdaSerializedClassCastException.out -XDrawDiagnostics --debug=dumpLambdaDeserializationStats LambdaSerializedClassCastException.java
+ * @run main LambdaSerializedClassCastException
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.function.Function;
+
+public class LambdaSerializedClassCastException {
+
+    public static void main(String[] args) throws Exception {
+
+        Function<String, String> lambda1 =
+                (Function<String, String> & Serializable) Object::toString;
+        Function<Object, String> lambda2 =
+                (Function<Object, String> & Serializable) Object::toString;
+
+        Function<Object, String> deserial = serialDeserial(lambda2);
+        deserial.apply(new Object());
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> T serialDeserial(T object) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+            oos.writeObject(object);
+        }
+        try (ObjectInputStream ois =
+                new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()))) {
+            return (T) ois.readObject();
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/lambda/LambdaSerializedClassCastException.out b/test/langtools/tools/javac/lambda/LambdaSerializedClassCastException.out
new file mode 100644
index 00000000000..4ad61e5e00e
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/LambdaSerializedClassCastException.out
@@ -0,0 +1,2 @@
+LambdaSerializedClassCastException.java:44:59: compiler.note.lambda.deserialization.stat: java/util/function/Function, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, toString, ()Ljava/lang/String;, (Ljava/lang/String;)Ljava/lang/String;
+LambdaSerializedClassCastException.java:46:59: compiler.note.lambda.deserialization.stat: java/util/function/Function, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, toString, ()Ljava/lang/String;, (Ljava/lang/Object;)Ljava/lang/String;
diff --git a/test/langtools/tools/javac/lambda/SerializableObjectMethodReferencesOnInterfaces.java b/test/langtools/tools/javac/lambda/SerializableObjectMethodReferencesOnInterfaces.java
new file mode 100644
index 00000000000..18d732fb0dd
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SerializableObjectMethodReferencesOnInterfaces.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2026, Google LLC and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8374654 8208752
+ * @summary test lambda deserialization for Object method references on interfaces
+ * @compile/ref=SerializableObjectMethodReferencesOnInterfaces.out -XDrawDiagnostics --debug=dumpLambdaDeserializationStats SerializableObjectMethodReferencesOnInterfaces.java
+ * @run main SerializableObjectMethodReferencesOnInterfaces
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+public class SerializableObjectMethodReferencesOnInterfaces {
+
+    public static void main(String[] args) throws Exception {
+        new Test().run();
+    }
+
+    static class Test {
+        interface I1 extends Serializable {}
+
+        interface I2 extends I1 {
+            @Override
+            public int hashCode();
+        }
+
+        interface F<T, R> extends Serializable {
+            R apply(T t);
+        }
+
+        enum E {
+            ONE
+        }
+
+        void run() throws Exception {
+            F<I1, Integer> f1 = I1::hashCode;
+            F<I2, Integer> f2 = I2::hashCode;
+            F<E, Integer> f3 = E::hashCode;
+            F<Object, Integer> f4 = Object::hashCode;
+
+            serialDeserial(f1).apply(new I1() {});
+            serialDeserial(f2).apply(new I2() {});
+            serialDeserial(f3).apply(E.ONE);
+            serialDeserial(f4).apply(new Object());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> T serialDeserial(T object) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
+            oos.writeObject(object);
+        }
+        try (ObjectInputStream ois =
+                new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()))) {
+            return (T) ois.readObject();
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/lambda/SerializableObjectMethodReferencesOnInterfaces.out b/test/langtools/tools/javac/lambda/SerializableObjectMethodReferencesOnInterfaces.out
new file mode 100644
index 00000000000..657235aa6fe
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SerializableObjectMethodReferencesOnInterfaces.out
@@ -0,0 +1,4 @@
+SerializableObjectMethodReferencesOnInterfaces.java:61:33: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethodReferencesOnInterfaces$Test$I1;)Ljava/lang/Integer;
+SerializableObjectMethodReferencesOnInterfaces.java:62:33: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethodReferencesOnInterfaces$Test$I2;)Ljava/lang/Integer;
+SerializableObjectMethodReferencesOnInterfaces.java:63:32: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Enum, hashCode, ()I, (LSerializableObjectMethodReferencesOnInterfaces$Test$E;)Ljava/lang/Integer;
+SerializableObjectMethodReferencesOnInterfaces.java:64:37: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (Ljava/lang/Object;)Ljava/lang/Integer;
diff --git a/test/langtools/tools/javac/lambda/SerializableObjectMethods.java b/test/langtools/tools/javac/lambda/SerializableObjectMethods.java
index 52d4cfc7bf6..b489a22c7b4 100644
--- a/test/langtools/tools/javac/lambda/SerializableObjectMethods.java
+++ b/test/langtools/tools/javac/lambda/SerializableObjectMethods.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8282080
  * @summary Check that serializable lambdas referring to j.l.Object methods work.
- * @compile SerializableObjectMethods.java
+ * @compile/ref=SerializableObjectMethods.out -XDrawDiagnostics --debug=dumpLambdaDeserializationStats SerializableObjectMethods.java
  * @run main SerializableObjectMethods
  */
 import java.io.ByteArrayInputStream;
diff --git a/test/langtools/tools/javac/lambda/SerializableObjectMethods.out b/test/langtools/tools/javac/lambda/SerializableObjectMethods.out
new file mode 100644
index 00000000000..56caaabc6de
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SerializableObjectMethods.out
@@ -0,0 +1,4 @@
+SerializableObjectMethods.java:59:35: compiler.note.lambda.deserialization.stat: SerializableObjectMethods$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethods$I1;)Ljava/lang/Integer;
+SerializableObjectMethods.java:60:35: compiler.note.lambda.deserialization.stat: SerializableObjectMethods$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethods$I2;)Ljava/lang/Integer;
+- compiler.note.unchecked.filename: SerializableObjectMethods.java
+- compiler.note.unchecked.recompile
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index 37d50674855..c3c8fb19a1b 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8192920 8204588 8246774 8248843 8268869 8235876 8328339 8335896 8344706
- *      8362237
+ *      8362237 8376534
  * @summary Test source launcher
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -890,6 +890,57 @@ public class SourceLauncherTest extends TestRunner {
                     "correct\n");
     }
 
+    @Test
+    public void testInheritedMain(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            """
+            class Sub extends Super {}
+            """,
+            """
+            class Super {
+                void main() {
+                    System.out.println(getClass().getName());
+                }
+            }
+            """);
+        testSuccess(base.resolve("Sub.java"),
+                    "Sub\n");
+    }
+
+    @Test
+    public void testInheritedMainFromAbstract(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            """
+            class Sub extends Super {}
+            """,
+            """
+            abstract class Super {
+                void main() {
+                    System.out.println(getClass().getName());
+                }
+            }
+            """);
+        testSuccess(base.resolve("Sub.java"),
+                    "Sub\n");
+    }
+
+    @Test
+    public void testInheritedMainFromInterface(Path base) throws IOException {
+        tb.writeJavaFiles(base,
+            """
+            public class Sub implements Super {}
+            """,
+            """
+            public interface Super {
+                default void main() {
+                    System.out.println(getClass().getName());
+                }
+            }
+            """);
+        testSuccess(base.resolve("Sub.java"),
+                    "Sub\n");
+    }
+
     Result run(Path file, List<String> runtimeArgs, List<String> appArgs) {
         List<String> args = new ArrayList<>();
         args.add(file.toString());
diff --git a/test/langtools/tools/javac/lint/AssignShift64Bits.java b/test/langtools/tools/javac/lint/AssignShift64Bits.java
new file mode 100644
index 00000000000..bb889d09022
--- /dev/null
+++ b/test/langtools/tools/javac/lint/AssignShift64Bits.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ * @test
+ * @bug 8371162
+ * @summary Verify no lossy conversion warning for 64 bit shift amount
+ * @compile -Xlint:lossy-conversions -Werror AssignShift64Bits.java
+ */
+
+public class AssignShift64Bits {
+    void m() {
+        int a = 1 << 1L;
+        a <<= 1L;
+        long b = 1 << 1L;
+        b <<= 1L;
+    }
+}
diff --git a/test/langtools/tools/javac/lint/ShiftOutOfRange.out b/test/langtools/tools/javac/lint/ShiftOutOfRange.out
index 7aee0b014af..6942e7e6809 100644
--- a/test/langtools/tools/javac/lint/ShiftOutOfRange.out
+++ b/test/langtools/tools/javac/lint/ShiftOutOfRange.out
@@ -1,17 +1,13 @@
 ShiftOutOfRange.java:14:18: compiler.warn.bit.shift.out.of.range: int, -32, 0
 ShiftOutOfRange.java:15:18: compiler.warn.bit.shift.out.of.range: int, -32, 0
 ShiftOutOfRange.java:16:19: compiler.warn.bit.shift.out.of.range: int, -32, 0
-ShiftOutOfRange.java:17:15: compiler.warn.possible.loss.of.precision: long, int
 ShiftOutOfRange.java:17:15: compiler.warn.bit.shift.out.of.range: int, -32, 0
 ShiftOutOfRange.java:18:15: compiler.warn.bit.shift.out.of.range: int, -32, 0
 ShiftOutOfRange.java:19:16: compiler.warn.bit.shift.out.of.range: int, -32, 0
-ShiftOutOfRange.java:25:15: compiler.warn.possible.loss.of.precision: long, int
-ShiftOutOfRange.java:32:15: compiler.warn.possible.loss.of.precision: long, int
 ShiftOutOfRange.java:39:18: compiler.warn.bit.shift.out.of.range: int, 32, 0
 ShiftOutOfRange.java:40:18: compiler.warn.bit.shift.out.of.range: int, 32, 0
 ShiftOutOfRange.java:41:19: compiler.warn.bit.shift.out.of.range: int, 32, 0
 ShiftOutOfRange.java:42:15: compiler.warn.bit.shift.out.of.range: int, 32, 0
-ShiftOutOfRange.java:43:15: compiler.warn.possible.loss.of.precision: long, int
 ShiftOutOfRange.java:43:15: compiler.warn.bit.shift.out.of.range: int, 32, 0
 ShiftOutOfRange.java:44:16: compiler.warn.bit.shift.out.of.range: int, 32, 0
 ShiftOutOfRange.java:51:18: compiler.warn.bit.shift.out.of.range: long, -64, 0
@@ -26,4 +22,4 @@ ShiftOutOfRange.java:78:19: compiler.warn.bit.shift.out.of.range: long, 64, 0
 ShiftOutOfRange.java:79:15: compiler.warn.bit.shift.out.of.range: long, 64, 0
 ShiftOutOfRange.java:80:15: compiler.warn.bit.shift.out.of.range: long, 64, 0
 ShiftOutOfRange.java:81:16: compiler.warn.bit.shift.out.of.range: long, 64, 0
-28 warnings
+24 warnings
diff --git a/test/langtools/tools/javac/lvti/VarAccessibility.java b/test/langtools/tools/javac/lvti/VarAccessibility.java
new file mode 100644
index 00000000000..d39d706faea
--- /dev/null
+++ b/test/langtools/tools/javac/lvti/VarAccessibility.java
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Check behavior of var when the inferred type is inaccessible
+ * @library /tools/lib
+ * @modules java.logging
+ *          java.sql
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run junit VarAccessibility
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+
+import toolbox.JavacTask;
+import toolbox.JavaTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class VarAccessibility {
+
+    private static final ToolBox tb = new ToolBox();
+
+    @Test
+    public void testInaccessibleInferredTypeLocalVariable() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          public class API {
+                              public static PackagePrivate get() {
+                                  return new PackagePrivate();
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          class PackagePrivate {
+                              public String toString() {
+                                  return "pass";
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  var v = API.get();
+                                  System.out.println(v);
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.SUCCESS)
+            .writeAll();
+
+        var out = new JavaTask(tb)
+                .classpath(classes.toString())
+                .className("p2.Test")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.STDOUT);
+
+        var expectedOut = List.of("pass");
+
+        if (!Objects.equals(expectedOut, out)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testInaccessibleInferredTypeForEachIterable() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          import java.util.List;
+                          public class API {
+                              public static Iterable<PackagePrivate> get() {
+                                  return List.of(new PackagePrivate());
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          class PackagePrivate {
+                              public String toString() {
+                                  return "pass";
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  for (var v : API.get()) {
+                                      System.out.println(v);
+                                  }
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        var out = new JavacTask(tb)
+                .options("-XDrawDiagnostics")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        var expectedOut = List.of(
+                "Test.java:5:22: compiler.err.not.def.public.cant.access: p1.PackagePrivate, p1",
+                "1 error");
+
+        if (!Objects.equals(expectedOut, out)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testInaccessibleInferredTypeForEachArray() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          import java.util.List;
+                          public class API {
+                              public static PackagePrivate[] get() {
+                                  return new PackagePrivate[] {new PackagePrivate()};
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          class PackagePrivate {
+                              public String toString() {
+                                  return "pass";
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  for (var v : API.get()) {
+                                      System.out.println(v);
+                                  }
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        new JavacTask(tb)
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.SUCCESS)
+            .writeAll();
+
+        var out = new JavaTask(tb)
+                .classpath(classes.toString())
+                .className("p2.Test")
+                .run()
+                .writeAll()
+                .getOutputLines(Task.OutputKind.STDOUT);
+
+        var expectedOut = List.of("pass");
+
+        if (!Objects.equals(expectedOut, out)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testInaccessibleInferredTypeLambda() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          import java.util.function.Consumer;
+                          public class API {
+                              public static void run(Consumer<PackagePrivate> c) {
+                                  c.accept(new PackagePrivate());
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          class PackagePrivate {
+                              public String toString() {
+                                  return "pass";
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  API.run(v -> System.out.println(v));
+                                  API.run((var v) -> System.out.println(v));
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        var out = new JavacTask(tb)
+                .options("-XDrawDiagnostics")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        var expectedOut = List.of(
+                "Test.java:5:17: compiler.err.not.def.public.cant.access: p1.PackagePrivate, p1",
+                "Test.java:6:17: compiler.err.not.def.public.cant.access: p1.PackagePrivate, p1",
+                "2 errors");
+
+        if (!Objects.equals(expectedOut, out)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testInaccessibleInferredTypeCanUse() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          public class API {
+                              public static PackagePrivate get() {
+                                  return null;
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          class PackagePrivate {
+                              public String toString() {
+                                  return "pass";
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  var v = API.get();
+                                  System.out.println(v.toString());
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        List<String> log = new JavacTask(tb)
+            .options("-XDrawDiagnostics")
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.FAIL)
+            .writeAll()
+            .getOutputLines(Task.OutputKind.DIRECT);
+
+        var expectedOut = List.of(
+            "Test.java:6:29: compiler.err.not.def.access.class.intf.cant.access: toString(), p1.PackagePrivate",
+            "1 error"
+        );
+
+        if (!Objects.equals(expectedOut, log)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + log);
+
+        }
+    }
+
+    @Test
+    public void testInaccessibleInferredBindingPattern() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          public record API(PackagePrivate p) {
+                              public static API create() {
+                                  return new API(new PackagePrivate());
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          class PackagePrivate {
+                              public String toString() {
+                                  return "pass";
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  Object o = API.create();
+                                  if (o instanceof API(var v)) {
+                                      System.out.println(v.toString());
+                                  }
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        List<String> log = new JavacTask(tb)
+            .options("-XDrawDiagnostics")
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .run(Task.Expect.FAIL)
+            .writeAll()
+            .getOutputLines(Task.OutputKind.DIRECT);
+
+        var expectedOut = List.of(
+            "Test.java:7:33: compiler.err.not.def.access.class.intf.cant.access: toString(), p1.PackagePrivate",
+            "1 error"
+        );
+
+        if (!Objects.equals(expectedOut, log)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + log);
+
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/lvti/VarWarnings.java b/test/langtools/tools/javac/lvti/VarWarnings.java
new file mode 100644
index 00000000000..a1fbadc0393
--- /dev/null
+++ b/test/langtools/tools/javac/lvti/VarWarnings.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Check behavior of warnings related to var
+ * @library /tools/lib
+ * @modules java.logging
+ *          java.sql
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run junit VarWarnings
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class VarWarnings {
+
+    private static final ToolBox tb = new ToolBox();
+
+    @Test
+    public void testDeprecationWarning() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          import java.util.List;
+                          import java.util.function.Consumer;
+                          @SuppressWarnings("deprecation")
+                          public class API {
+                              public static DeprOutter<DeprInner> get() {
+                                  return new DeprOutter<>();
+                              }
+                              public static Iterable<DeprOutter<DeprInner>> getIterable() {
+                                  return null;
+                              }
+                              public static void run(Consumer<DeprOutter<DeprInner>> task) {
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          @Deprecated
+                          public class DeprInner {
+                          }
+                          """,
+                          """
+                          package p1;
+                          @Deprecated
+                          public class DeprOutter<T> {
+                              public T get() {
+                                  return null;
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  var v1 = API.get();
+                                  API.run(v -> v.get().toString());
+                                  API.run((var v) -> v.get().toString());
+                                  for (var v2 : API.getIterable()) {}
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        var out = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Werror",
+                         "-Xlint:deprecation")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        var expectedOut = List.of("");
+
+        if (!Objects.equals(expectedOut, out)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + out);
+
+        }
+    }
+
+    @Test
+    public void testRawTypeWarning() throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        Path classes = base.resolve("classes");
+        tb.writeJavaFiles(src,
+                          """
+                          package p1;
+                          import java.util.List;
+                          import java.util.function.Consumer;
+                          @SuppressWarnings("rawtypes")
+                          public class API {
+                              public static RawOutter<RawInner> get() {
+                                  return new RawOutter<>();
+                              }
+                              public static Iterable<RawOutter<RawInner>> getIterable() {
+                                  return null;
+                              }
+                              public static void run(Consumer<RawOutter<RawInner>> task) {
+                              }
+                          }
+                          """,
+                          """
+                          package p1;
+                          public class RawInner<T> {
+                          }
+                          """,
+                          """
+                          package p1;
+                          public class RawOutter<T> {
+                              public T get() {
+                                  return null;
+                              }
+                          }
+                          """,
+                          """
+                          package p2;
+                          import p1.API;
+                          public class Test {
+                              public static void main(String... args) {
+                                  var v1 = API.get();
+                                  API.run(v -> v.get().toString());
+                                  API.run((var v) -> v.get().toString());
+                                  for (var v2 : API.getIterable()) {}
+                              }
+                          }
+                          """);
+
+        Files.createDirectories(classes);
+
+        var out = new JavacTask(tb)
+                .options("-XDrawDiagnostics",
+                         "-Werror",
+                         "-Xlint:rawtypes")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.SUCCESS)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        var expectedOut = List.of("");
+
+        if (!Objects.equals(expectedOut, out)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
+                                      ", actual: " + out);
+
+        }
+    }
+
+}
diff --git a/test/langtools/tools/javac/parser/DeclarationEndPositions.java b/test/langtools/tools/javac/parser/DeclarationEndPositions.java
index 226b77769d1..fe4ca8c1652 100644
--- a/test/langtools/tools/javac/parser/DeclarationEndPositions.java
+++ b/test/langtools/tools/javac/parser/DeclarationEndPositions.java
@@ -78,7 +78,7 @@ public class DeclarationEndPositions {
                         throw new AssertionError(String.format(
                           "wrong %s pos %d for \"%s\" in \"%s\"", "start", start, tree, input));
                     }
-                    int end = TreeInfo.getEndPos(tree, unit.endPositions);
+                    int end = TreeInfo.getEndPos(tree);
                     if (markers.charAt(end - 1) != '>') {
                         throw new AssertionError(String.format(
                           "wrong %s pos %d for \"%s\" in \"%s\"", "end", end, tree, input));
@@ -86,10 +86,12 @@ public class DeclarationEndPositions {
 
                     // For variable declarations using "var", verify the "var" position
                     if (tree instanceof JCVariableDecl varDecl && varDecl.declaredUsingVar()) {
-                        int vpos = varDecl.typePos;
-                        if (!input.substring(vpos).startsWith("var")) {
+                        int varStart = varDecl.vartype.getStartPosition();
+                        int varEnd = varDecl.vartype.getEndPosition();
+
+                        if (!input.substring(varStart, varEnd).startsWith("var")) {
                             throw new AssertionError(String.format(
-                              "wrong %s pos %d for \"%s\" in \"%s\"", "var", vpos, tree, input));
+                              "wrong %s start pos %d end pos %d for \"%s\" in \"%s\"", "var", varStart, varEnd, tree, input));
                         }
                     }
                 }
diff --git a/test/langtools/tools/javac/parser/JavacParserTest.java b/test/langtools/tools/javac/parser/JavacParserTest.java
index 25aeb19f1bb..0bce1ef017c 100644
--- a/test/langtools/tools/javac/parser/JavacParserTest.java
+++ b/test/langtools/tools/javac/parser/JavacParserTest.java
@@ -87,7 +87,9 @@ import javax.tools.ToolProvider;
 
 import com.sun.source.tree.CaseTree;
 import com.sun.source.tree.DefaultCaseLabelTree;
+import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.ModuleTree;
+import com.sun.source.tree.VarTypeTree;
 import com.sun.source.util.TreePathScanner;
 import com.sun.tools.javac.api.JavacTaskPool;
 import com.sun.tools.javac.api.JavacTaskPool.Worker;
@@ -1070,8 +1072,8 @@ public class JavacParserTest extends TestCase {
         VariableTree stmt2 = (VariableTree) method.getBody().getStatements().get(1);
         Tree v1Type = stmt1.getType();
         Tree v2Type = stmt2.getType();
-        assertEquals("Implicit type for v1 is not correct: ", Kind.PRIMITIVE_TYPE, v1Type.getKind());
-        assertEquals("Implicit type for v2 is not correct: ", Kind.PRIMITIVE_TYPE, v2Type.getKind());
+        assertEquals("Implicit type for v1 is not correct: ", Kind.VAR_TYPE, v1Type.getKind());
+        assertEquals("Implicit type for v2 is not correct: ", Kind.VAR_TYPE, v2Type.getKind());
     }
 
     @Test
@@ -3151,6 +3153,37 @@ public class JavacParserTest extends TestCase {
                      codes);
     }
 
+    @Test
+    void testVarPositions() throws IOException {
+        String code = """
+                      public class Test {
+                          void t() {
+                              var v =
+                          }
+                      }
+                      """;
+        DiagnosticCollector<JavaFileObject> coll =
+                new DiagnosticCollector<>();
+        JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll,
+                null,
+                null, Arrays.asList(new MyFileObject(code)));
+        Trees trees = Trees.instance(ct);
+        SourcePositions sp = trees.getSourcePositions();
+        CompilationUnitTree cut = ct.parse().iterator().next();
+        new TreeScanner<Void, Void>() {
+            @Override
+            public Void visitVarType(VarTypeTree node, Void p) {
+                long start = sp.getStartPosition(cut, node);
+                long end = sp.getEndPosition(cut, node);
+                String text = code.substring((int) start, (int) end);
+                assertEquals("var start pos",
+                             "var",
+                             text);
+                return null;
+            }
+        };
+    }
+
     void run(String[] args) throws Exception {
         int passed = 0, failed = 0;
         final Pattern p = (args != null && args.length > 0)
diff --git a/test/langtools/tools/javac/parser/ReversedSourcePositions.java b/test/langtools/tools/javac/parser/ReversedSourcePositions.java
index d092d23d8c1..6596430dca5 100644
--- a/test/langtools/tools/javac/parser/ReversedSourcePositions.java
+++ b/test/langtools/tools/javac/parser/ReversedSourcePositions.java
@@ -72,7 +72,7 @@ public class ReversedSourcePositions {
             public Void scan(Tree node, Void aVoid) {
                 if (node instanceof JCTree tree) {
                     int start = tree.getStartPosition();
-                    int end = tree.getEndPosition(unit.endPositions);
+                    int end = tree.getEndPosition();
                     if (start >= end) {
                         throw new AssertionError(
                           String.format("[%d, %d] %s %s\n", start, end, tree.getKind(), tree));
diff --git a/test/langtools/tools/javac/parser/extend/TrialParser.java b/test/langtools/tools/javac/parser/extend/TrialParser.java
index c9a858fbc47..ca4e3995bc3 100644
--- a/test/langtools/tools/javac/parser/extend/TrialParser.java
+++ b/test/langtools/tools/javac/parser/extend/TrialParser.java
@@ -66,9 +66,8 @@ class TrialParser extends JavacParser {
     public TrialParser(ParserFactory fac,
             com.sun.tools.javac.parser.Lexer S,
             boolean keepDocComments,
-            boolean keepLineMap,
-            boolean keepEndPositions) {
-        super(fac, S, keepDocComments, keepLineMap, keepEndPositions);
+            boolean keepLineMap) {
+        super(fac, S, keepDocComments, keepLineMap);
     }
 
     @Override
@@ -102,7 +101,7 @@ class TrialParser extends JavacParser {
 
         boolean firstTypeDecl = true;
         while (token.kind != EOF) {
-            if (token.pos > 0 && token.pos <= endPosTable.errorEndPos) {
+            if (token.pos > 0 && token.pos <= errorEndPos) {
                 // error recovery
                 skip(true, false, false, false);
                 if (token.kind == EOF) {
@@ -139,7 +138,6 @@ class TrialParser extends JavacParser {
             storeEnd(toplevel, S.prevToken().endPos);
         }
         toplevel.lineMap = S.getLineMap();
-        toplevel.endPositions = this.endPosTable;
         return toplevel;
     }
 
diff --git a/test/langtools/tools/javac/parser/extend/TrialParserFactory.java b/test/langtools/tools/javac/parser/extend/TrialParserFactory.java
index 6ac4c60d279..6f62175c82a 100644
--- a/test/langtools/tools/javac/parser/extend/TrialParserFactory.java
+++ b/test/langtools/tools/javac/parser/extend/TrialParserFactory.java
@@ -48,13 +48,8 @@ class TrialParserFactory extends ParserFactory {
     }
 
     @Override
-    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap) {
+    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepLineMap, boolean parseModuleInfo) {
         com.sun.tools.javac.parser.Lexer lexer = scannerFactory.newScanner(input, keepDocComments);
-        return new TrialParser(this, lexer, keepDocComments, keepLineMap, keepEndPos);
-    }
-
-    @Override
-    public JavacParser newParser(CharSequence input, boolean keepDocComments, boolean keepEndPos, boolean keepLineMap, boolean parseModuleInfo) {
-        return newParser(input, keepDocComments, keepEndPos, keepLineMap);
+        return new TrialParser(this, lexer, keepDocComments, keepLineMap);
     }
 }
diff --git a/test/langtools/tools/javac/patterns/BindingPatternVarTypeModel.java b/test/langtools/tools/javac/patterns/BindingPatternVarTypeModel.java
index e63cbeb2008..01d742eb9e3 100644
--- a/test/langtools/tools/javac/patterns/BindingPatternVarTypeModel.java
+++ b/test/langtools/tools/javac/patterns/BindingPatternVarTypeModel.java
@@ -83,7 +83,7 @@ public class BindingPatternVarTypeModel {
         new TreeScanner<Void, Void>() {
             @Override
             public Void visitBindingPattern(BindingPatternTree node, Void p) {
-                if (node.getVariable().getType().getKind() != Tree.Kind.PRIMITIVE_TYPE) {
+                if (node.getVariable().getType().getKind() != Tree.Kind.VAR_TYPE) {
                     throw new AssertionError("Unexpected type for var: " +
                                              node.getVariable().getType().getKind() +
                                              ":" + node.getVariable().getType());
diff --git a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java
index 4e1a7d7f669..804c2a3f622 100644
--- a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java
+++ b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.java
@@ -1,5 +1,6 @@
 /**
  * @test /nodynamiccopyright/
+ * @bug 8375571
  * @summary Verify error reports for erroneous deconstruction patterns are sensible
  * @compile/fail/ref=DeconstructionPatternErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW -XDdev DeconstructionPatternErrors.java
  */
@@ -39,6 +40,10 @@ public class DeconstructionPatternErrors {
         boolean b = p instanceof P(int i) p; //introducing a variable for the record pattern
     }
 
+    <T> void typeVarTest(T p) {
+        if (p instanceof T(int i) && i == 0); //T is a type variable
+    }
+
     public record P(int i) {
     }
 
diff --git a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
index f947142cd66..4d21d6069d8 100644
--- a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
+++ b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
@@ -1,23 +1,24 @@
-DeconstructionPatternErrors.java:35:37: compiler.err.illegal.start.of.type
-DeconstructionPatternErrors.java:37:28: compiler.err.illegal.start.of.type
-DeconstructionPatternErrors.java:39:42: compiler.err.expected: ';'
-DeconstructionPatternErrors.java:39:43: compiler.err.not.stmt
-DeconstructionPatternErrors.java:15:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<java.lang.String>, java.util.ArrayList<java.lang.Integer>)
-DeconstructionPatternErrors.java:16:29: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, java.util.ArrayList<java.lang.Integer>
-DeconstructionPatternErrors.java:17:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
-DeconstructionPatternErrors.java:18:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
-DeconstructionPatternErrors.java:19:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, DeconstructionPatternErrors.P)
-DeconstructionPatternErrors.java:20:26: compiler.err.incorrect.number.of.nested.patterns: java.lang.Runnable,java.lang.Runnable, java.lang.Runnable
+DeconstructionPatternErrors.java:36:37: compiler.err.illegal.start.of.type
+DeconstructionPatternErrors.java:38:28: compiler.err.illegal.start.of.type
+DeconstructionPatternErrors.java:40:42: compiler.err.expected: ';'
+DeconstructionPatternErrors.java:40:43: compiler.err.not.stmt
+DeconstructionPatternErrors.java:16:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.util.List<java.lang.String>, java.util.ArrayList<java.lang.Integer>)
+DeconstructionPatternErrors.java:17:29: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, java.util.ArrayList<java.lang.Integer>
+DeconstructionPatternErrors.java:18:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
+DeconstructionPatternErrors.java:19:28: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
+DeconstructionPatternErrors.java:20:29: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, DeconstructionPatternErrors.P)
 DeconstructionPatternErrors.java:21:26: compiler.err.incorrect.number.of.nested.patterns: java.lang.Runnable,java.lang.Runnable, java.lang.Runnable
-DeconstructionPatternErrors.java:22:26: compiler.err.incorrect.number.of.nested.patterns: int, int,compiler.misc.type.none
-DeconstructionPatternErrors.java:23:26: compiler.err.incorrect.number.of.nested.patterns: int, int,int
-DeconstructionPatternErrors.java:24:36: compiler.err.cant.resolve.location: kindname.class, Unresolvable, , , (compiler.misc.location: kindname.class, DeconstructionPatternErrors, null)
-DeconstructionPatternErrors.java:24:26: compiler.err.incorrect.number.of.nested.patterns: int, int,Unresolvable
-DeconstructionPatternErrors.java:25:13: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
-DeconstructionPatternErrors.java:26:29: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
-DeconstructionPatternErrors.java:27:44: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer)
-DeconstructionPatternErrors.java:27:13: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
-DeconstructionPatternErrors.java:28:40: compiler.err.match.binding.exists
-DeconstructionPatternErrors.java:29:56: compiler.err.already.defined: kindname.variable, v1, kindname.method, meth()
-DeconstructionPatternErrors.java:29:64: compiler.err.already.defined: kindname.variable, v2, kindname.method, meth()
-22 errors
\ No newline at end of file
+DeconstructionPatternErrors.java:22:26: compiler.err.incorrect.number.of.nested.patterns: java.lang.Runnable,java.lang.Runnable, java.lang.Runnable
+DeconstructionPatternErrors.java:23:26: compiler.err.incorrect.number.of.nested.patterns: int, int,compiler.misc.type.none
+DeconstructionPatternErrors.java:24:26: compiler.err.incorrect.number.of.nested.patterns: int, int,int
+DeconstructionPatternErrors.java:25:36: compiler.err.cant.resolve.location: kindname.class, Unresolvable, , , (compiler.misc.location: kindname.class, DeconstructionPatternErrors, null)
+DeconstructionPatternErrors.java:25:26: compiler.err.incorrect.number.of.nested.patterns: int, int,Unresolvable
+DeconstructionPatternErrors.java:26:13: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
+DeconstructionPatternErrors.java:27:29: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
+DeconstructionPatternErrors.java:28:44: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer)
+DeconstructionPatternErrors.java:28:13: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
+DeconstructionPatternErrors.java:29:40: compiler.err.match.binding.exists
+DeconstructionPatternErrors.java:30:56: compiler.err.already.defined: kindname.variable, v1, kindname.method, meth()
+DeconstructionPatternErrors.java:30:64: compiler.err.already.defined: kindname.variable, v2, kindname.method, meth()
+DeconstructionPatternErrors.java:44:26: compiler.err.deconstruction.pattern.only.records: T
+23 errors
diff --git a/test/langtools/tools/javac/patterns/Exhaustiveness.java b/test/langtools/tools/javac/patterns/Exhaustiveness.java
index 84e67855b3b..f1809e99e45 100644
--- a/test/langtools/tools/javac/patterns/Exhaustiveness.java
+++ b/test/langtools/tools/javac/patterns/Exhaustiveness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2523,6 +2523,7 @@ public class Exhaustiveness extends TestRunner {
                              "-Xlint:-preview",
                              "--class-path", libClasses.toString(),
                              "-XDshould-stop.at=FLOW",
+                             "-XDexhaustivityMaxBaseChecks=0",
                              stopAtFlow ? "-XDshould-stop.ifNoError=FLOW"
                                         : "-XDnoop")
                     .outdir(classes)
diff --git a/test/langtools/tools/javac/patterns/ExhaustivenessConvenientErrors.java b/test/langtools/tools/javac/patterns/ExhaustivenessConvenientErrors.java
new file mode 100644
index 00000000000..6935fcfa006
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/ExhaustivenessConvenientErrors.java
@@ -0,0 +1,593 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8367530
+ * @summary Check enhanced exhaustiveness errors
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main ExhaustivenessConvenientErrors
+*/
+
+import com.sun.tools.javac.api.ClientCodeWrapper.DiagnosticSourceUnwrapper;
+import com.sun.tools.javac.util.JCDiagnostic;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class ExhaustivenessConvenientErrors extends TestRunner {
+
+    ToolBox tb;
+
+    public static void main(String... args) throws Exception {
+        new ExhaustivenessConvenientErrors().runTests();
+    }
+
+    ExhaustivenessConvenientErrors() {
+        super(System.err);
+        tb = new ToolBox();
+    }
+
+    public void runTests() throws Exception {
+        runTests(m -> new Object[] { Paths.get(m.getName()) });
+    }
+
+    @Test
+    public void testExhaustiveSealedClasses(Path base) throws Exception {
+        doTest(base,
+               new String[]{"""
+                            package lib;
+                            public sealed interface S permits A, B {}
+                            """,
+                            """
+                            package lib;
+                            public final class A implements S {}
+                            """,
+                            """
+                            package lib;
+                            public final class B implements S {}
+                            """},
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(S obj) {
+                       return switch (obj) {
+                           case A a -> 0;
+                       };
+                   }
+               }
+               """,
+               "lib.B _");
+    }
+
+    @Test
+    public void testExhaustiveSealedClassesTransitive(Path base) throws Exception {
+        doTest(base,
+               new String[]{"""
+                            package lib;
+                            public sealed interface S1 permits S2, A {}
+                            """,
+                            """
+                            package lib;
+                            public sealed interface S2 extends S1 permits S3, B {}
+                            """,
+                            """
+                            package lib;
+                            public sealed interface S3 extends S2 permits C, D {}
+                            """,
+                            """
+                            package lib;
+                            public final class A implements S1 {}
+                            """,
+                            """
+                            package lib;
+                            public final class B implements S2 {}
+                            """,
+                            """
+                            package lib;
+                            public final class C implements S3 {}
+                            """,
+                            """
+                            package lib;
+                            public final class D implements S3 {}
+                            """},
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(S1 obj) {
+                       return switch (obj) {
+                           case A a -> 0;
+                           case B a -> 0;
+                           case D a -> 0;
+                       };
+                   }
+               }
+               """,
+               "lib.C _");
+    }
+
+    @Test
+    public void testTrivialRecord(Path base) throws Exception {
+        doTest(base,
+               new String[]{"""
+                            package lib;
+                            public sealed interface S permits A, B {}
+                            """,
+                            """
+                            package lib;
+                            public final class A implements S {}
+                            """,
+                            """
+                            package lib;
+                            public final class B implements S {}
+                            """,
+                            """
+                            package lib;
+                            public record R(S s) {}
+                            """},
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(R r) {
+                       return switch (r) {
+                           case R(A a) -> 0;
+                       };
+                   }
+               }
+               """,
+               "lib.R(lib.B _)");
+    }
+
+    @Test
+    public void testNonNestedRecord(Path base) throws Exception {
+        doTest(base,
+               new String[]{"""
+                            package lib;
+                            public sealed interface S permits A, B {}
+                            """,
+                            """
+                            package lib;
+                            public final class A implements S {}
+                            """,
+                            """
+                            package lib;
+                            public final class B implements S {}
+                            """,
+                            """
+                            package lib;
+                            public record R(S s1, S s2) {}
+                            """},
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(R r) {
+                       return switch (r) {
+                           case R(A a, B b) -> 0;
+                           case R(B b, A a) -> 0;
+                       };
+                   }
+               }
+               """,
+               "lib.R(lib.A _,lib.A _)",
+               "lib.R(lib.B _,lib.B _)");
+    }
+
+    @Test
+    public void testComplex1(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(Root r) {
+                       return switch (r) {
+                           case Root(R1 _, _, _) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2() implements Base {}
+                   record R3(Base b1, Base b2) implements Base {}
+                   record Root(Base b1, Base b2, Base b3) {}
+               }
+               """,
+               "test.Test.Root(test.Test.R2 _,test.Test.Base _,test.Test.Base _)",
+               "test.Test.Root(test.Test.R3 _,test.Test.Base _,test.Test.Base _)");
+    }
+
+    @Test
+    public void testComplex2(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(Root r) {
+                       return switch (r) {
+                           case Root(R1 _, _, _) -> 0;
+                           case Root(R2 _, R1 _, _) -> 0;
+                           case Root(R2 _, R2 _, R1 _) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R1 _)) -> 0;
+//                           case Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R2 _)) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2(Base b1, Base b2) implements Base {}
+                   record Root(Base b1, Base b2, Base b3) {}
+               }
+               """,
+               "test.Test.Root(test.Test.R2 _,test.Test.R2(test.Test.R2 _,test.Test.R2 _),test.Test.R2(test.Test.R2 _,test.Test.R2 _))");
+    }
+
+    @Test
+    public void testComplex3(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Triple p) {
+                       return switch (p) {
+                           case Triple(B _, _, _) -> 0;
+                           case Triple(_, A _, _) -> 0;
+                           case Triple(_, _, A _) -> 0;
+                           case Triple(A p, C(Nested _, NestedBaseA _), _) -> 0;
+                           case Triple(A p, C(Nested _, NestedBaseB _), C(Nested _, NestedBaseA _)) -> 0;
+                           case Triple(A p, C(Nested _, NestedBaseB _), C(Nested _, NestedBaseB _)) -> 0;
+                           case Triple(A p, C(Nested _, NestedBaseB _), C(Nested _, NestedBaseC _)) -> 0;
+                           case Triple(A p, C(Nested _, NestedBaseC _), C(Nested _, NestedBaseA _)) -> 0;
+                           case Triple(A p, C(Nested _, NestedBaseC _), C(Nested _, NestedBaseB _)) -> 0;
+//                           case Path(A p, C(Nested _, NestedBaseC _), C(Nested _, NestedBaseC _)) -> 0;
+                       };
+                   }
+                   record Triple(Base c1, Base c2, Base c3) {}
+                   sealed interface Base permits A, B {}
+                   record A(boolean key) implements Base {
+                   }
+                   sealed interface B extends Base {}
+                   record C(Nested n, NestedBase b) implements B {}
+                   record Nested() {}
+                   sealed interface NestedBase {}
+                   record NestedBaseA() implements NestedBase {}
+                   record NestedBaseB() implements NestedBase {}
+                   record NestedBaseC() implements NestedBase {}
+               }
+               """,
+               "test.Test.Triple(test.Test.A _,test.Test.C(test.Test.Nested _,test.Test.NestedBaseC _),test.Test.C(test.Test.Nested _,test.Test.NestedBaseC _))");
+    }
+
+    @Test
+    public void testComplex4(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               import lib.*;
+               public class Test {
+                   private int test(Root r) {
+                       return switch (r) {
+                           case Root(R1 _, _, _) -> 0;
+                           case Root(R2 _, R1 _, _) -> 0;
+                           case Root(R2 _, R2 _, R1 _) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R1 _, R2 _)) -> 0;
+//                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R1 _, R2 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R1 _), R2(R2 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R1 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R1 _, R2 _)) -> 0;
+                           case Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R1 _)) -> 0;
+//                           case Root(R2 _, R2(R2 _, R2 _), R2(R2 _, R2 _)) -> 0;
+                       };
+                   }
+                   sealed interface Base {}
+                   record R1() implements Base {}
+                   record R2(Base b1, Base b2) implements Base {}
+                   record Root(Base b1, Base b2, Base b3) {}
+               }
+               """,
+               "test.Test.Root(test.Test.R2 _,test.Test.R2(test.Test.Base _,test.Test.R2 _),test.Test.R2(test.Test.R2 _,test.Test.Base _))");
+               //ideally,the result would be as follow,but it is difficult to split Base on two distinct places:
+//               "test.Test.Root(test.Test.R2 _,test.Test.R2(test.Test.R1 _,test.Test.R2 _),test.Test.R2(test.Test.R2 _,test.Test.R1 _))",
+//               "test.Test.Root(test.Test.R2 _,test.Test.R2(test.Test.R2 _,test.Test.R2 _),test.Test.R2(test.Test.R2 _,test.Test.R2 _))");
+    }
+
+    @Test
+    public void testComplex5(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Triple p) {
+                       return switch (p) {
+                           case Triple(B _, _, _) -> 0;
+                           case Triple(_, A _, _) -> 0;
+                           case Triple(_, _, A _) -> 0;
+//                           case Triple(A _, C(Nested _, NestedBaseA _), _) -> 0;
+                           case Triple(A _, C(Nested _, NestedBaseB _), C(Nested _, NestedBaseA _)) -> 0;
+                           case Triple(A _, C(Nested _, NestedBaseB _), C(Nested _, NestedBaseB _)) -> 0;
+                           case Triple(A _, C(Nested _, NestedBaseB _), C(Nested _, NestedBaseC _)) -> 0;
+                           case Triple(A _, C(Nested _, NestedBaseC _), C(Nested _, NestedBaseA _)) -> 0;
+                           case Triple(A _, C(Nested _, NestedBaseC _), C(Nested _, NestedBaseB _)) -> 0;
+//                           case Path(A _, C(Nested _, NestedBaseC _), C(Nested _, NestedBaseC _)) -> 0;
+                       };
+                   }
+                   record Triple(Base c1, Base c2, Base c3) {}
+                   sealed interface Base permits A, B {}
+                   record A(boolean key) implements Base {
+                   }
+                   sealed interface B extends Base {}
+                   record C(Nested n, NestedBase b) implements B {}
+                   record Nested() {}
+                   sealed interface NestedBase {}
+                   record NestedBaseA() implements NestedBase {}
+                   record NestedBaseB() implements NestedBase {}
+                   record NestedBaseC() implements NestedBase {}
+               }
+               """,
+               "test.Test.Triple(test.Test.A _,test.Test.C(test.Test.Nested _,test.Test.NestedBaseA _),test.Test.C _)",
+               //the following could be:
+               //test.Test.Triple(test.Test.A _,test.Test.C(test.Test.Nested _,test.Test.NestedBaseC _),test.Test.C(test.Test.Nested _,test.Test.NestedBaseC _))
+               "test.Test.Triple(test.Test.A _,test.Test.C(test.Test.Nested _,test.Test.NestedBaseC _),test.Test.C _)");
+    }
+
+    @Test
+    public void testNoInfiniteRecursion(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(R r) {
+                       return switch (r) {
+                           case R(_, _, R(_, _, _, _), String s) -> 0;
+                           case R(_, _, R(_, _, _, String str), _) -> 0;
+                       };
+                   }
+               }
+               public record R(R r1, R r2, R r3, Object o) {}
+               """,
+               "test.R(test.R _,test.R _,test.R(test.R _,test.R _,test.R _,java.lang.Object _),java.lang.Object _)");
+    }
+
+    @Test
+    public void testEnum(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(I i) {
+                       return switch (i) {
+                           case E.A -> 0;
+                           case C _ -> 1;
+                       };
+                   }
+                   sealed interface I {}
+                   enum E implements I {A, B}
+                   final class C implements I {}
+               }
+               public record R(R r1, R r2, R r3, Object o) {}
+               """,
+               "test.Test.E.B");
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(I i) {
+                       return switch (i) {
+                           case C _ -> 1;
+                       };
+                   }
+                   sealed interface I {}
+                   enum E implements I {A, B}
+                   final class C implements I {}
+               }
+               public record R(R r1, R r2, R r3, Object o) {}
+               """,
+               "test.Test.E _");
+    }
+
+    @Test
+    public void testInstantiateComponentTypes(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+               public class Test {
+                   private int test(Pair<Base<Base>> p) {
+                       return switch (p) {
+                           case Pair(A(A(_)) -> 0;
+                           case Pair(A(B(_)) -> 0;
+                           case Pair(B(A(_)) -> 0;
+                       };
+                   }
+                   record Pair<T>(T c) {}
+                   sealed interface Base<T> permits A, B {}
+                   record A<T>(T c) implements Base<T> {}
+                   record B<T>(T c) implements Base<T> {}
+               }
+               """,
+               "test.Test.Pair(test.Test.B(test.Test.B _))");
+    }
+
+    @Test
+    public void testNeedToExpandIfRecordExists(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               package test;
+                class Test {
+                   sealed interface A { }
+                   record B() implements A { }
+                   record C(A a) implements A { }
+
+                   void test(A a) {
+                       switch (a) {
+                           case C(B _) -> throw null;
+                       }
+                   }
+               }               """,
+               "test.Test.B _",
+               "test.Test.C(test.Test.C _)");
+    }
+
+    @Test
+    public void testComplex6(Path base) throws Exception {
+        doTest(base,
+               new String[0],
+               """
+               public class Test {
+                   sealed interface Base {}
+                   record NoOp() implements Base {}
+                   record Const() implements Base {}
+                   record Pair(Base n1,
+                               Base b2) implements Base {}
+
+                   int t(Base b) {
+                       return switch (b) {
+                           case NoOp _ -> 0;
+                           case Const _ -> 0;
+                           case Pair(NoOp _, _) -> 0;
+                           case Pair(Const _, _) -> 0;
+                           case Pair(Pair _, NoOp _) -> 0;
+                           case Pair(Pair _, Const _) -> 0;
+                           case Pair(Pair _, Pair(NoOp _, _)) -> 0;
+                           case Pair(Pair _, Pair(Const _, _)) -> 0;
+                           case Pair(Pair _, Pair(Pair(NoOp _, _), _)) -> 0;
+                           case Pair(Pair _, Pair(Pair(Const _, _), _)) -> 0;
+                           case Pair(Pair(NoOp _, _), Pair(Pair(Pair _, _), _)) -> 0;
+                           case Pair(Pair(Const _, _), Pair(Pair(Pair _, _), _)) -> 0;
+//                           case Pair(Pair(Pair _, _), Pair(Pair(Pair _, _), _)) -> 0;
+                       };
+                   }
+               }
+               """,
+               "Test.Pair(Test.Pair(Test.Pair _,Test.Base _),Test.Pair(Test.Pair(Test.Pair _,Test.Base _),Test.Base _))");
+    }
+
+    private void doTest(Path base, String[] libraryCode, String testCode, String... expectedMissingPatterns) throws IOException {
+        Path current = base.resolve(".");
+        Path libClasses = current.resolve("libClasses");
+
+        Files.createDirectories(libClasses);
+
+        if (libraryCode.length != 0) {
+            Path libSrc = current.resolve("lib-src");
+
+            for (String code : libraryCode) {
+                tb.writeJavaFiles(libSrc, code);
+            }
+
+            new JavacTask(tb)
+                    .outdir(libClasses)
+                    .files(tb.findJavaFiles(libSrc))
+                    .run();
+        }
+
+        Path src = current.resolve("src");
+        tb.writeJavaFiles(src, testCode);
+
+        Path classes = current.resolve("libClasses");
+
+        Files.createDirectories(libClasses);
+        Set<String> missingPatterns = new HashSet<>();
+
+        new JavacTask(tb)
+            .options("-XDrawDiagnostics",
+                     "--class-path", libClasses.toString(),
+                     "-XDshould-stop.at=FLOW",
+                     "-XDshould-stop.ifNoError=FLOW",
+                     "-XDexhaustivityMaxBaseChecks=" + Long.MAX_VALUE) //never give up
+            .outdir(classes)
+            .files(tb.findJavaFiles(src))
+            .diagnosticListener(d -> {
+                if ("compiler.err.not.exhaustive.details".equals(d.getCode()) ||
+                    "compiler.err.not.exhaustive.statement.details".equals(d.getCode())) {
+                    if (d instanceof DiagnosticSourceUnwrapper uw) {
+                        d = uw.d;
+                    }
+                    if (d instanceof JCDiagnostic.MultilineDiagnostic diag) {
+                        diag.getSubdiagnostics()
+                                .stream()
+                                .map(fragment -> fragment.toString())
+                                .forEach(missingPatterns::add);
+                    }
+                }
+            })
+            .run(Task.Expect.FAIL)
+            .writeAll();
+
+        Set<String> expectedPatterns = new HashSet<>(List.of(expectedMissingPatterns));
+
+        if (!expectedPatterns.equals(missingPatterns)) {
+            throw new AssertionError("Incorrect errors, expected: " + expectedPatterns +
+                                      ", actual: " + missingPatterns);
+        }
+    }
+
+}
diff --git a/test/langtools/tools/javac/patterns/InstanceOfModelTest.java b/test/langtools/tools/javac/patterns/InstanceOfModelTest.java
index b756c9263bd..288abec9659 100644
--- a/test/langtools/tools/javac/patterns/InstanceOfModelTest.java
+++ b/test/langtools/tools/javac/patterns/InstanceOfModelTest.java
@@ -79,7 +79,7 @@ public class InstanceOfModelTest {
         List<String> expectedInstanceOf = List.of(
             "null:R",
             "R r:R",
-            "R(int v):null"
+            "R(var v):null"
         );
 
         if (!Objects.equals(expectedInstanceOf, instanceOf)) {
diff --git a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfComboTest.java b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfComboTest.java
index 82064bd4baf..1830afeb187 100644
--- a/test/langtools/tools/javac/patterns/PrimitiveInstanceOfComboTest.java
+++ b/test/langtools/tools/javac/patterns/PrimitiveInstanceOfComboTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,16 +103,19 @@ public class PrimitiveInstanceOfComboTest extends ComboInstance<PrimitiveInstanc
         ComboTask task1 = newCompilationTask()
                 .withSourceFromTemplate(test1.replace("#{TYPE1}", type1.code).replace("#{TYPE2}", type2.code))
                 .withOption("--enable-preview")
+                .withOption("-XDexhaustivityMaxBaseChecks=0")
                 .withOption("-source").withOption(JAVA_VERSION);
 
         ComboTask task2 = newCompilationTask()
                 .withSourceFromTemplate(test2.replace("#{TYPE1}", type1.code).replace("#{TYPE2}", type2.code))
                 .withOption("--enable-preview")
+                .withOption("-XDexhaustivityMaxBaseChecks=0")
                 .withOption("-source").withOption(JAVA_VERSION);
 
         ComboTask task3 = newCompilationTask()
                 .withSourceFromTemplate(test3.replace("#{TYPE1}", type1.code).replace("#{TYPE2}", type2.code))
                 .withOption("--enable-preview")
+                .withOption("-XDexhaustivityMaxBaseChecks=0")
                 .withOption("-source").withOption(JAVA_VERSION);
 
         task1.generate(result1 -> {
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java
index 2890b315e62..249cdeb2464 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchConstants.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @summary Retain exhaustiveness properties of switches with a constant selector
  * @enablePreview
- * @compile/fail/ref=PrimitivePatternsSwitchConstants.out -XDrawDiagnostics -XDshould-stop.at=FLOW PrimitivePatternsSwitchConstants.java
+ * @compile/fail/ref=PrimitivePatternsSwitchConstants.out -XDrawDiagnostics -XDshould-stop.at=FLOW -XDexhaustivityMaxBaseChecks=0 PrimitivePatternsSwitchConstants.java
  */
 public class PrimitivePatternsSwitchConstants {
     void testConstExpressions() {
diff --git a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
index dacd48f441c..3eab2fc83d0 100644
--- a/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/PrimitivePatternsSwitchErrors.java
@@ -3,7 +3,7 @@
  * @bug 8304487 8325653 8332463
  * @summary Compiler Implementation for Primitive types in patterns, instanceof, and switch (Preview)
  * @enablePreview
- * @compile/fail/ref=PrimitivePatternsSwitchErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW PrimitivePatternsSwitchErrors.java
+ * @compile/fail/ref=PrimitivePatternsSwitchErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW -XDexhaustivityMaxBaseChecks=0 PrimitivePatternsSwitchErrors.java
  */
 public class PrimitivePatternsSwitchErrors {
     record R_int(int x) {}
diff --git a/test/langtools/tools/javac/patterns/SwitchErrors.java b/test/langtools/tools/javac/patterns/SwitchErrors.java
index 607052be583..ebff13e7fa5 100644
--- a/test/langtools/tools/javac/patterns/SwitchErrors.java
+++ b/test/langtools/tools/javac/patterns/SwitchErrors.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8262891 8269146 8269113 8348928
  * @summary Verify errors related to pattern switches.
- * @compile/fail/ref=SwitchErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW SwitchErrors.java
+ * @compile/fail/ref=SwitchErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW -XDexhaustivityMaxBaseChecks=0 SwitchErrors.java
  */
 
 public class SwitchErrors {
diff --git a/test/langtools/tools/javac/platform/NonExportedPermittedTypes.java b/test/langtools/tools/javac/platform/NonExportedPermittedTypes.java
index bdafef7e39a..9a378ce346a 100644
--- a/test/langtools/tools/javac/platform/NonExportedPermittedTypes.java
+++ b/test/langtools/tools/javac/platform/NonExportedPermittedTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@
  * @bug 8318913
  * @summary Verify no error is when compiling a class whose permitted types are not exported
  * @modules jdk.compiler
- * @compile/fail/ref=NonExportedPermittedTypes.out -XDrawDiagnostics NonExportedPermittedTypes.java
- * @compile/fail/ref=NonExportedPermittedTypes.out --release 21 -XDrawDiagnostics NonExportedPermittedTypes.java
- * @compile/fail/ref=NonExportedPermittedTypes.out --release ${jdk.version} -XDrawDiagnostics NonExportedPermittedTypes.java
+ * @compile/fail/ref=NonExportedPermittedTypes.out -XDrawDiagnostics -XDexhaustivityMaxBaseChecks=0 NonExportedPermittedTypes.java
+ * @compile/fail/ref=NonExportedPermittedTypes.out --release 21 -XDrawDiagnostics -XDexhaustivityMaxBaseChecks=0 NonExportedPermittedTypes.java
+ * @compile/fail/ref=NonExportedPermittedTypes.out --release ${jdk.version} -XDrawDiagnostics -XDexhaustivityMaxBaseChecks=0 NonExportedPermittedTypes.java
  */
 
 
diff --git a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java
index ee3bb8c897d..334db17fe39 100644
--- a/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java
+++ b/test/langtools/tools/javac/platform/createsymbols/CreateSymbolsReproducibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ import org.junit.jupiter.api.Test;
  * @summary verifies that the ct.sym file created by build.tools.symbolgenerator.CreateSymbols
  *          is reproducible
  * @library /test/lib
+ * @requires os.arch != "s390x"
  * @modules java.compiler
  *          jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.jvm
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java
index 1de0ec48f0d..48b5cdd8588 100644
--- a/test/langtools/tools/javac/records/RecordCompilationTests.java
+++ b/test/langtools/tools/javac/records/RecordCompilationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,7 +335,7 @@ class RecordCompilationTests extends CompilationTestCase {
 
         assertFail("compiler.err.invalid.accessor.method.in.record",
                 "public record R(int x) {\n" +
-                        "    static private final j = 0;" +
+                        "    static private final int j = 0;" +
                         "    static public int x() { return j; };" +
                         "}");
     }
@@ -539,10 +539,10 @@ class RecordCompilationTests extends CompilationTestCase {
                 "record R() { void test1() { class X { U u; } } }",
 
                 "interface I { default void test1() { class X { void test2() { System.err.println(localVar); } } } }",
-                "interface I() { default void test1() { class X { void test2() {System.err.println(param);} } } }",
+                "interface I { default void test1() { class X { void test2() {System.err.println(param);} } } }",
                 "interface I { default void test1() { class X { void test2() { System.err.println(instanceField); } } } }",
                 "interface I { default void test1() { class X { T t; } } }",
-                "interface I() { default void test1() { class X {U u;} } }",
+                "interface I { default void test1() { class X {U u;} } }",
 
                 "enum E { A; void test1() { class X { void test2() { System.err.println(localVar); } } } }",
                 "enum E { A; void test1() { class X { void test2() {System.err.println(param);} } } }",
@@ -2169,4 +2169,56 @@ class RecordCompilationTests extends CompilationTestCase {
                 """
         );
     }
+
+    @Test
+    void testDeprecatedJavadoc() {
+        String[] previousOptions = getCompileOptions();
+        try {
+            setCompileOptions(new String[] {"-Xlint:deprecation"});
+            assertOKWithWarning("compiler.warn.has.been.deprecated",
+                """
+                record R(
+                    /**
+                     * @deprecated
+                     */
+                    @Deprecated
+                    int i
+                ) {}
+                class Client {
+                    R r;
+                    int j = r.i();
+                }
+                """
+            );
+            assertOKWithWarning("compiler.warn.has.been.deprecated",
+                """
+                record R(
+                    @Deprecated
+                    int i
+                ) {}
+                class Client {
+                    R r;
+                    int j = r.i();
+                }
+                """
+            );
+            // javadoc tag only has no effect
+            assertOK(
+                    """
+                    record R(
+                        /**
+                         * @deprecated
+                         */
+                        int i
+                    ) {}
+                    class Client {
+                        R r;
+                        int j = r.i();
+                    }
+                    """
+            );
+        } finally {
+            setCompileOptions(previousOptions);
+        }
+    }
 }
diff --git a/test/langtools/tools/javac/sealed/SealedCompilationTests.java b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
index 17141ee3c67..b7207b777c6 100644
--- a/test/langtools/tools/javac/sealed/SealedCompilationTests.java
+++ b/test/langtools/tools/javac/sealed/SealedCompilationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -855,12 +855,13 @@ class SealedCompilationTests extends CompilationTestCase {
 
     @Test
     void testSealedNonSealedWithOtherModifiers() {
+        // Sup must be static so Sub may be static
         String template1 =
             """
             @interface A {}
 
             class Outer {
-                sealed class Sup { }
+                static sealed class Sup { }
                 # # class Sub extends Sup {}
                 final class Sub2 extends Sub {}
             }
diff --git a/test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.java b/test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.java
index 802e66570ef..05a73c0ba7a 100644
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.java
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.java
@@ -2,7 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8206986
  * @summary Verify behavior of not exhaustive switch expressions.
- * @compile/fail/ref=ExpressionSwitchNotExhaustive.out -XDrawDiagnostics ExpressionSwitchNotExhaustive.java
+ * @compile/fail/ref=ExpressionSwitchNotExhaustive.out -XDrawDiagnostics -XDexhaustivityMaxBaseChecks=0 ExpressionSwitchNotExhaustive.java
  */
 
 public class ExpressionSwitchNotExhaustive {
diff --git a/test/langtools/tools/javac/tree/MissingSemicolonTest.java b/test/langtools/tools/javac/tree/MissingSemicolonTest.java
index 2c70c4841be..cedcf1e5f98 100644
--- a/test/langtools/tools/javac/tree/MissingSemicolonTest.java
+++ b/test/langtools/tools/javac/tree/MissingSemicolonTest.java
@@ -115,7 +115,7 @@ public class MissingSemicolonTest {
             public Void scan(Tree tree, Void p) {
                 if (tree != null) {
                     int start = ((JCTree) tree).getStartPosition();
-                    int end = ((JCTree) tree).getEndPosition(unit.endPositions);
+                    int end = ((JCTree) tree).getEndPosition();
 
                     spans.add(new int[] {start, end});
                 }
@@ -134,7 +134,7 @@ public class MissingSemicolonTest {
             public Void scan(Tree tree, Void p) {
                 if (tree != null) {
                     int start = ((JCTree) tree).getStartPosition();
-                    int end = ((JCTree) tree).getEndPosition(updated.endPositions);
+                    int end = ((JCTree) tree).getEndPosition();
 
                     if (tree.getKind() != Kind.ERRONEOUS) {
                         int[] expected = nextSpan.next();
diff --git a/test/langtools/tools/javac/tree/TreePosTest.java b/test/langtools/tools/javac/tree/TreePosTest.java
index 9e6dcf61306..ecc0d477cdb 100644
--- a/test/langtools/tools/javac/tree/TreePosTest.java
+++ b/test/langtools/tools/javac/tree/TreePosTest.java
@@ -69,7 +69,6 @@ import com.sun.source.tree.CompilationUnitTree;
 import com.sun.tools.javac.api.JavacTaskPool;
 import com.sun.tools.javac.api.JavacTool;
 import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCAnnotatedType;
 import com.sun.tools.javac.tree.JCTree.JCCase;
@@ -347,7 +346,6 @@ public class TreePosTest {
         private boolean compactSourceFile;
         void test(JCCompilationUnit tree) {
             sourcefile = tree.sourcefile;
-            endPosTable = tree.endPositions;
             encl = new Info();
             List<JCTree> nonImports = tree.defs
                                           .stream()
@@ -355,7 +353,7 @@ public class TreePosTest {
                                           .toList();
             compactSourceFile = nonImports.size() == 1 &&
                                 nonImports.get(0) instanceof JCClassDecl classDecl &&
-                                tree.endPositions.getEndPos(classDecl) == NOPOS;
+                                classDecl.endpos == NOPOS;
             tree.accept(this);
         }
 
@@ -364,7 +362,7 @@ public class TreePosTest {
             if (tree == null)
                 return;
 
-            Info self = new Info(tree, endPosTable);
+            Info self = new Info(tree);
             if (check(encl, self)) {
                 // Modifiers nodes are present throughout the tree even where
                 // there is no corresponding source text.
@@ -504,7 +502,6 @@ public class TreePosTest {
         }
 
         JavaFileObject sourcefile;
-        EndPosTable endPosTable;
         Info encl;
 
     }
@@ -521,12 +518,12 @@ public class TreePosTest {
             end = Integer.MAX_VALUE;
         }
 
-        Info(JCTree tree, EndPosTable endPosTable) {
+        Info(JCTree tree) {
             this.tree = tree;
             tag = tree.getTag();
             start = TreeInfo.getStartPos(tree);
             pos = tree.pos;
-            end = TreeInfo.getEndPos(tree, endPosTable);
+            end = TreeInfo.getEndPos(tree);
         }
 
         @Override
diff --git a/test/langtools/tools/javac/tree/VarTree.java b/test/langtools/tools/javac/tree/VarTree.java
index 6efd080bd4f..70caf66862e 100644
--- a/test/langtools/tools/javac/tree/VarTree.java
+++ b/test/langtools/tools/javac/tree/VarTree.java
@@ -52,27 +52,27 @@ public class VarTree {
     public static void main(String... args) throws Exception {
         VarTree test = new VarTree();
         test.run("|var testVar = 0;| ",
-                 "int testVar = 0");
+                 "var testVar = 0");
         test.run("|var testVar = 0;| undef undef;",
-                 "int testVar = 0");
+                 "var testVar = 0");
         test.run("|final var testVar = 0;| ",
-                 "final int testVar = 0");
+                 "final var testVar = 0");
         test.run("for (|var testVar| : java.util.Arrays.asList(0, 1)) {}",
-                 "java.lang.Integer testVar");
+                 "var testVar");
         test.run("for (|final var testVar| : java.util.Arrays.asList(0, 1)) {}",
-                 "final java.lang.Integer testVar");
+                 "final var testVar");
         test.run("java.util.function.Consumer<String> c = |testVar| -> {};",
-                 "java.lang.String testVar");
+                 "/*missing*/ testVar"); //TODO: is the /*missing*/ here ideal?
         test.run("java.util.function.Consumer<String> c = (|testVar|) -> {};",
-                 "java.lang.String testVar");
+                 "/*missing*/ testVar"); //TODO: is the /*missing*/ here ideal?
         test.run("java.util.function.Consumer<String> c = (|var testVar|) -> {};",
-                 "java.lang.String testVar");
+                 "var testVar");
         test.run("java.util.function.Consumer<String> c = (|final var testVar|) -> {};",
-                 "final java.lang.String testVar");
+                 "final var testVar");
         test.run("record Rec(int x) { }; switch (null) { case Rec(|var testVar|) -> {} default -> {} };",
-                 "int testVar");
+                 "var testVar");
         test.run("record Rec(int x) { }; switch (null) { case Rec(|final var testVar|) -> {} default -> {} };",
-                 "final int testVar");
+                 "final var testVar");
     }
 
     void run(String code, String expected) throws IOException {
@@ -136,11 +136,13 @@ public class VarTree {
                             throw new AssertionError("Unexpected span: " + snip);
                         }
 
-                        int typeStart = (int) trees.getSourcePositions().getStartPosition(cut, node.getType());
-                        int typeEnd   = (int) trees.getSourcePositions().getEndPosition(cut, node.getType());
+                        if (node.getType() != null) {
+                            int typeStart = (int) trees.getSourcePositions().getStartPosition(cut, node.getType());
+                            int typeEnd   = (int) trees.getSourcePositions().getEndPosition(cut, node.getType());
 
-                        if (typeStart != (-1) && typeEnd != (-1)) {
-                            throw new AssertionError("Unexpected type position: " + typeStart + ", " + typeEnd);
+                            if (typeStart + 3 != typeEnd) {
+                                throw new AssertionError("Unexpected type position: " + typeStart + ", " + typeEnd);
+                            }
                         }
 
                         found[0] = true;
diff --git a/test/langtools/tools/javac/tree/VarWarnPosition.java b/test/langtools/tools/javac/tree/VarWarnPosition.java
index f1d5f4346d0..5cdfa41d6ef 100644
--- a/test/langtools/tools/javac/tree/VarWarnPosition.java
+++ b/test/langtools/tools/javac/tree/VarWarnPosition.java
@@ -25,6 +25,9 @@ public class VarWarnPosition {
 
         // Test 4
         Consumer<Depr> c3 = (final var d) -> { };
+
+        // Test 5
+        var d = deprecatedList.get(0);
     }
 }
 
diff --git a/test/langtools/tools/javac/tree/VarWarnPosition.out b/test/langtools/tools/javac/tree/VarWarnPosition.out
index 87a4ca3a1fd..0bd92acd035 100644
--- a/test/langtools/tools/javac/tree/VarWarnPosition.out
+++ b/test/langtools/tools/javac/tree/VarWarnPosition.out
@@ -1,8 +1,4 @@
-VarWarnPosition.java:18:14: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
 VarWarnPosition.java:21:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
-VarWarnPosition.java:21:28: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
 VarWarnPosition.java:24:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
-VarWarnPosition.java:24:30: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
 VarWarnPosition.java:27:18: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
-VarWarnPosition.java:27:36: compiler.warn.has.been.deprecated: Depr, compiler.misc.unnamed.package
-7 warnings
+3 warnings
\ No newline at end of file
diff --git a/test/lib-test/ProblemList-StaticJdk.txt b/test/lib-test/ProblemList-StaticJdk.txt
index 70f0438c0c6..700099656e8 100644
--- a/test/lib-test/ProblemList-StaticJdk.txt
+++ b/test/lib-test/ProblemList-StaticJdk.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,3 +24,16 @@
 ###########################################################################
 
 # Currently empty
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/lib-test/ProblemList.txt b/test/lib-test/ProblemList.txt
index 011466088d3..2a5caedc8d8 100644
--- a/test/lib-test/ProblemList.txt
+++ b/test/lib-test/ProblemList.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -37,3 +37,16 @@
 # More than one label is allowed but must be on the same line.
 #
 #############################################################################
+
+#############################################################################
+
+# Preview project specific failures go here at the end of the file.
+#
+# These are NOT failures that occur with the '--enable-preview' option
+# specified; those go in the appropriate ProblemList-enable-preview.txt file.
+# These are failures that occur WITHOUT the '--enable-preview' option
+# specified AND occur because of some issue with preview project code,
+# in either implementation or test code.
+
+#############################################################################
+
diff --git a/test/lib-test/TEST.ROOT b/test/lib-test/TEST.ROOT
index ebdf3f1a334..f23d38c1e66 100644
--- a/test/lib-test/TEST.ROOT
+++ b/test/lib-test/TEST.ROOT
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 keys=randomness
 
 # Minimum jtreg version
-requiredVersion=8.1+1
+requiredVersion=8.2.1+1
 
 # Allow querying of various System properties in @requires clauses
 requires.extraPropDefns = ../jtreg-ext/requires/VMProps.java
diff --git a/test/lib-test/jdk/test/whitebox/vm_flags/Uint64Test.java b/test/lib-test/jdk/test/whitebox/vm_flags/Uint64Test.java
index 64dd7544ebb..bf8bf0104ac 100644
--- a/test/lib-test/jdk/test/whitebox/vm_flags/Uint64Test.java
+++ b/test/lib-test/jdk/test/whitebox/vm_flags/Uint64Test.java
@@ -35,7 +35,7 @@
  */
 
 public class Uint64Test {
-    private static final String FLAG_NAME = "MaxRAM";
+    private static final String FLAG_NAME = "StringDeduplicationHashSeed";
     private static final Long[] TESTS = {0L, 100L, (long) Integer.MAX_VALUE,
             -1L, Long.MAX_VALUE, Long.MIN_VALUE};
 
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index 75fdef048bc..170e53930d8 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import static java.util.Locale.ROOT;
 
 public class Platform {
@@ -188,14 +189,17 @@ public class Platform {
     }
 
     public static boolean isMusl() {
-        try {
-            ProcessBuilder pb = new ProcessBuilder("ldd", "--version");
+        var lddPath = Stream.of("/bin/ldd", "/usr/bin/ldd").filter(p -> Files.exists(Path.of(p))).findFirst();
+        if (lddPath.isPresent()) {
+            ProcessBuilder pb = new ProcessBuilder(lddPath.get(), "--version");
             pb.redirectErrorStream(true);
-            Process p = pb.start();
-            BufferedReader b = new BufferedReader(new InputStreamReader(p.getInputStream()));
-            String l = b.readLine();
-            if (l != null && l.contains("musl")) { return true; }
-        } catch(Exception e) {
+            try (Process p = pb.start()) {
+                BufferedReader b = new BufferedReader(new InputStreamReader(p.getInputStream()));
+                String l = b.readLine();
+                return (l != null && l.contains("musl"));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return false;
     }
diff --git a/test/lib/jdk/test/lib/SA/SATestUtils.java b/test/lib/jdk/test/lib/SA/SATestUtils.java
index 01233b5bf55..50f5d71f1f1 100644
--- a/test/lib/jdk/test/lib/SA/SATestUtils.java
+++ b/test/lib/jdk/test/lib/SA/SATestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,13 +26,21 @@ import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.Platform;
 import jtreg.SkippedException;
 
+import java.lang.foreign.Arena;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.ValueLayout;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 public class SATestUtils {
     /**
@@ -259,4 +267,112 @@ public class SATestUtils {
             throw new SkippedException("Cannot run this test on OSX if adding privileges is required.");
         }
     }
+
+    /**
+     * Find library file that provides strlen(3), then returns it as libc.
+     * This method works on Linux only.
+     * @return path to libc
+     */
+    @SuppressWarnings("restricted")
+    public static String getLibCPath() {
+        var linker = Linker.nativeLinker();
+        var ptrStrlen = linker.defaultLookup()
+                              .findOrThrow("strlen");
+        var strlen = linker.downcallHandle(
+            ptrStrlen,
+            FunctionDescriptor.of(linker.canonicalLayouts().get("size_t"), ValueLayout.ADDRESS)
+        );
+        var dladdr = linker.downcallHandle(
+            linker.defaultLookup().findOrThrow("dladdr"),
+            FunctionDescriptor.of(ValueLayout.JAVA_INT, ValueLayout.ADDRESS, ValueLayout.ADDRESS)
+        );
+
+        var structDLInfo = MemoryLayout.structLayout(
+            ValueLayout.ADDRESS.withName("dli_fname"),
+            ValueLayout.ADDRESS.withName("dli_fbase"),
+            ValueLayout.ADDRESS.withName("dli_sname"),
+            ValueLayout.ADDRESS.withName("dli_saddr")
+        ).withName("Dl_info");
+        var hndDliFname = structDLInfo.varHandle(MemoryLayout.PathElement.groupElement("dli_fname"));
+
+        try(var arena = Arena.ofConfined()){
+            var info = arena.allocate(structDLInfo);
+            int result = (int)dladdr.invoke(ptrStrlen, info);
+            if (result == 0) {
+                throw new RuntimeException("dladdr() returns zero");
+            }
+
+            var ptrDliFname = (MemorySegment)hndDliFname.get(info, 0);
+            var libcPathLen = (long)strlen.invoke(ptrDliFname);
+            return ptrDliFname.reinterpret(libcPathLen + 1) // +1 for NUL
+                              .getString(0);
+        } catch (Throwable t) {
+            throw new RuntimeException("getLibCPath() failed due to Throwable.", t);
+        }
+    }
+
+    /**
+     * Find debuginfo file for the library.
+     * This method will work on Linux only.
+     * "readelf" has to be available.
+     * @return null if debuginfo is not available.
+     */
+    public static String getDebugInfo(String lib) {
+        try {
+            // Attempt to find debuginfo in /usr/lib/debug
+            Path debuginfoPath = Path.of("/usr/lib/debug", lib + ".debug");
+            boolean exists = Files.exists(debuginfoPath);
+            if (!exists) {
+                // Attempt to find debuginfo with build ID
+                var proc = (new ProcessBuilder("readelf", "-n", lib)).start();
+                try (var reader = proc.inputReader()) {
+                    var buildID =  reader.lines()
+                                         .filter(l -> l.contains("Build ID:"))
+                                         .findAny()
+                                         .map(l -> l.replace("Build ID:", "").trim())
+                                         .get();
+                    String dir = buildID.substring(0, 2);
+                    String file = buildID.substring(2);
+                    debuginfoPath = Path.of("/usr/lib/debug/.build_id", dir, file + ".debug");
+                    exists = Files.exists(debuginfoPath);
+                } catch (NoSuchElementException _) {
+                    // return null if vDSO not found.
+                    return null;
+                }
+            }
+            return exists ? debuginfoPath.toString() : null;
+        } catch (IOException e) {
+            throw new RuntimeException("getDebugInfo() failed due to IOException.", e);
+        }
+    }
+
+    private static boolean isSymbolAvailableInternal(String lib, String symbol) throws IOException {
+        var proc = (new ProcessBuilder("nm", lib)).start();
+        try (var reader = proc.inputReader()) {
+            return reader.lines()
+                         .anyMatch(l -> l.endsWith(" " + symbol));
+        }
+    }
+
+    /**
+     * This method will work on Linux only.
+     * Both "readelf" and "nm" have to be available.
+     * @return true if given symbol is available in given lib.
+     */
+    public static boolean isSymbolAvailable(String lib, String symbol) {
+        try {
+            // Attempt to find symbol from lib
+            boolean result = isSymbolAvailableInternal(lib, symbol);
+            if (!result) {
+                // Attempt to find symbol from debuginfo
+                String debuginfoPath = getDebugInfo(lib);
+                if (debuginfoPath != null) {
+                    result = isSymbolAvailableInternal(debuginfoPath, symbol);
+                }
+            }
+            return result;
+        } catch (IOException e) {
+            throw new RuntimeException("isSymbolAvailable() failed due to IOException.", e);
+        }
+    }
 }
diff --git a/test/lib/jdk/test/lib/apps/LingeredApp.java b/test/lib/jdk/test/lib/apps/LingeredApp.java
index 13008e68c54..9a8395d7879 100644
--- a/test/lib/jdk/test/lib/apps/LingeredApp.java
+++ b/test/lib/jdk/test/lib/apps/LingeredApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@ import java.util.UUID;
 import jdk.test.lib.JDKToolFinder;
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputBuffer;
+import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.StreamPumper;
 import jdk.test.lib.util.CoreUtils;
 
@@ -122,6 +123,12 @@ public class LingeredApp {
         this.forceCrash = forceCrash;
     }
 
+    private static Runnable crasher;
+
+    public static void setCrasher(Runnable runnable) {
+        crasher = runnable;
+    }
+
     native private static int crash();
 
     /**
@@ -445,6 +452,7 @@ public class LingeredApp {
         long t1 = System.currentTimeMillis();
         theApp.createLock();
         try {
+            ProcessTools.checkDuplicateAgentOpts(jvmOpts);
             theApp.runAppExactJvmOpts(jvmOpts);
             theApp.waitAppReadyOrCrashed();
         } catch (Exception ex) {
@@ -628,8 +636,12 @@ public class LingeredApp {
             synchronized(steadyStateObj) {
                 startSteadyStateThread(steadyStateObj);
                 if (forceCrash) {
-                    System.loadLibrary("LingeredApp"); // location of native crash() method
-                    crash();
+                    if (crasher == null) {
+                        System.loadLibrary("LingeredApp"); // location of native crash() method
+                        crash();
+                    } else {
+                        crasher.run();
+                    }
                 }
                 while (Files.exists(path)) {
                     // Touch the lock to indicate our readiness
diff --git a/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java b/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
index 8e28ea08365..a9ae57bca71 100644
--- a/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
+++ b/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -107,7 +107,6 @@ public abstract class CommandLineOptionTest {
         List<String> finalOptions = new ArrayList<>();
         if (addTestVMOptions) {
             Collections.addAll(finalOptions, InputArguments.getVmInputArgs());
-            Collections.addAll(finalOptions, Utils.getTestJavaOpts());
         }
         Collections.addAll(finalOptions, options);
         finalOptions.add("-version");
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
index b013561be0b..bd9a706e3a4 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -380,6 +380,7 @@ public class DockerTestUtils {
         }
         template = template + "COPY /jdk /jdk\n" +
             "ENV JAVA_HOME=/jdk\n" +
+            "ENV LANG=C.UTF-8\n" +
             "CMD [\"/bin/bash\"]\n";
         String dockerFileStr = String.format(template, baseImage, baseImageVersion);
         Files.writeString(dockerfile, dockerFileStr);
diff --git a/test/lib/jdk/test/lib/process/Proc.java b/test/lib/jdk/test/lib/process/Proc.java
index 2fe802fed6c..a989906b2ab 100644
--- a/test/lib/jdk/test/lib/process/Proc.java
+++ b/test/lib/jdk/test/lib/process/Proc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -256,6 +256,15 @@ public class Proc {
                 }
             }
         }
+        String patchPath = System.getProperty("test.patch.path");
+        if (patchPath != null) {
+            try (var subs = Files.newDirectoryStream(Path.of(patchPath))) {
+                for (var sub : subs) {
+                    var name = sub.getFileName();
+                    cmd.add("--patch-module=" + name + "=" + sub);
+                }
+            }
+        }
 
         var lcp = fullcp();
         if (lcp != null) {
diff --git a/test/lib/jdk/test/lib/process/ProcessTools.java b/test/lib/jdk/test/lib/process/ProcessTools.java
index 7d03268cac4..fe9c1de9f30 100644
--- a/test/lib/jdk/test/lib/process/ProcessTools.java
+++ b/test/lib/jdk/test/lib/process/ProcessTools.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,10 @@ import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -448,7 +450,7 @@ public final class ProcessTools {
     private static ProcessBuilder createJavaProcessBuilder(String... command) {
         String javapath = JDKToolFinder.getJDKTool("java");
 
-        ArrayList<String> args = new ArrayList<>();
+        List<String> args = new ArrayList<>();
         args.add(javapath);
 
         String noCPString = System.getProperty("test.noclasspath", "false");
@@ -465,6 +467,8 @@ public final class ProcessTools {
             Collections.addAll(args, command);
         }
 
+        checkDuplicateAgentOpts(args);
+
         // Reporting
         StringBuilder cmdLine = new StringBuilder();
         for (String cmd : args)
@@ -479,6 +483,30 @@ public final class ProcessTools {
         return pb;
     }
 
+    // 8377729: Check for duplicate VM JVMTI agent options, as it may
+    // cause test to fail
+    public static void checkDuplicateAgentOpts(List<String> args) {
+        if (args == null || args.isEmpty()) {
+            return;
+        }
+
+        Set<String> seen = new HashSet<>();
+        List<String> dupArgs = args.stream()
+                .filter(arg -> (arg.startsWith("-agent")
+                                || arg.startsWith("-javaagent:"))
+                        && !seen.add(arg))
+                .collect(Collectors.toList());
+
+        if (!dupArgs.isEmpty()) {
+            System.err.println("WARNING: Duplicate JVMTI agent options may"
+                + " cause test to fail:\n" + dupArgs);
+        }
+    }
+
+    public static void checkDuplicateAgentOpts(String[] args) {
+        checkDuplicateAgentOpts(Arrays.asList(args));
+    }
+
     private static void printStack(Thread t, StackTraceElement[] stack) {
         System.out.println("\t" + t + " stack: (length = " + stack.length + ")");
         if (t != null) {
diff --git a/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
index 6fa8cb2e408..f66ad542e47 100644
--- a/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
+++ b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import jtreg.SkippedException;
 
 public class OpensslArtifactFetcher {
 
-    private static final String OPENSSL_BUNDLE_VERSION = "3.5.1";
+    private static final String OPENSSL_BUNDLE_VERSION = "3.5.4";
     private static final String OPENSSL_ORG = "jpg.tests.jdk.openssl";
 
     /**
diff --git a/test/lib/jdk/test/lib/security/RepositoryFileReader.java b/test/lib/jdk/test/lib/security/RepositoryFileReader.java
index 4eefc7d82db..04bc3c88d2a 100644
--- a/test/lib/jdk/test/lib/security/RepositoryFileReader.java
+++ b/test/lib/jdk/test/lib/security/RepositoryFileReader.java
@@ -148,4 +148,13 @@ public sealed interface RepositoryFileReader extends AutoCloseable {
             unpack = false)
     public static class CMS_ML_DSA {
     }
+
+    @Artifact(
+            organization = "jpg.tests.jdk.repos.lamps-wg",
+            name = "kyber-certificates",
+            revision = "29f3215",
+            extension = "zip",
+            unpack = false)
+    public static class KYBER_CERTIFICATES {
+    }
 }
diff --git a/test/lib/jdk/test/lib/util/CoreUtils.java b/test/lib/jdk/test/lib/util/CoreUtils.java
index f7a486def2b..72c1d89af44 100644
--- a/test/lib/jdk/test/lib/util/CoreUtils.java
+++ b/test/lib/jdk/test/lib/util/CoreUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -203,6 +203,7 @@ public class CoreUtils {
 
     private static final String CORE_PATTERN_FILE_NAME = "/proc/sys/kernel/core_pattern";
     private static final String LOCATION_STRING = "location: ";
+    private static final String ALT_LOCATION_STRING = "alternatively, falling back to";
 
     private static String parseCoreFileLocationFromOutput(String crashOutputString) {
         System.out.println("crashOutputString = [" + crashOutputString + "]");
@@ -220,12 +221,25 @@ public class CoreUtils {
 
         // Find the core file name in the output.
         String coreWithPid;
-        if (stringWithLocation.contains("or ") && !Platform.isWindows()) {
-            Matcher m = Pattern.compile("or.* ([^ ]+[^\\)])\\)?").matcher(stringWithLocation);
+        if (Platform.isLinux() && stringWithLocation.contains(ALT_LOCATION_STRING)) {
+            /*
+             * If hotspot detects that /proc/sys/kernel/core_pattern starts with a "|",
+             * it generates a messages something like the following:
+             * # Core dump will be written. Default location: Determined by the following:
+             *   "/var/bin/core.sh %p" (alternatively, falling back to
+             *   /ws/jdk/build/linux-x64/test-support/jtreg_open_test_hotspot_jtreg_serviceability_sa_ClhsdbFindPC_java/scratch/2/core.10353)
+             * We try to detect this and glean this alternative path from the message. The
+             * hope here is that either this is where the core file actually ends up, or that
+             * the script referenced by the core_pattern is just zipping the core file, in
+             * which case a call to unzipCores() will have already unzipped the core file
+             * into this path.
+             */
+            Matcher m = Pattern.compile(ALT_LOCATION_STRING + ".* ([^ ]+[^\\)])\\)?").matcher(stringWithLocation);
             if (!m.find()) {
                 throw new RuntimeException("Couldn't find path to core inside location string");
             }
             coreWithPid = m.group(1);
+            System.out.println("getCoreFileLocation found alt coreWithPid = " + coreWithPid);
         } else {
             coreWithPid = stringWithLocation.trim();
         }
diff --git a/test/lib/jdk/test/lib/util/ZipUtils.java b/test/lib/jdk/test/lib/util/ZipUtils.java
new file mode 100644
index 00000000000..a1568e51cc1
--- /dev/null
+++ b/test/lib/jdk/test/lib/util/ZipUtils.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.test.lib.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.EnumSet;
+import java.util.HexFormat;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * This class consists exclusively of static utility methods that are useful
+ * for creating and manipulating ZIP files.
+ */
+public final class ZipUtils {
+    // Some ZipFile constants for manipulating the 'End of central directory record' (END header)
+    private static final int ENDHDR = ZipFile.ENDHDR; // End of central directory record size
+    private static final int ENDSIZ = ZipFile.ENDSIZ; // Offset of CEN size field within ENDHDR
+    private static final int ENDOFF = ZipFile.ENDOFF; // Offset of CEN offset field within ENDHDR
+    // Expected message when CEN size does not match file size
+    public static final String INVALID_CEN_BAD_SIZE = "invalid END header (bad central directory size)";
+    // Expected message when CEN offset is too large
+    public static final String INVALID_CEN_BAD_OFFSET = "invalid END header (bad central directory offset)";
+    // Expected message when CEN size is too large
+    public static final String INVALID_CEN_SIZE_TOO_LARGE = "invalid END header (central directory size too large)";
+    // Expected message when total entry count is too large
+    public static final String INVALID_BAD_ENTRY_COUNT = "invalid END header (total entries count too large)";
+
+    private ZipUtils() { }
+
+    /**
+     * Create an ZIP file with a single entry, then modify the CEN size
+     * in the 'End of central directory record' (END header)  to the given size.
+     *
+     * The CEN is optionally "inflated" with trailing zero bytes such that
+     * its actual size matches the one stated in the END header.
+     *
+     * The CEN offset is optiontially adjusted by the given amount
+     *
+     * The resulting ZIP is technically not valid, but it does allow us
+     * to test that large or invalid CEN sizes are rejected
+     * @param cenSize the CEN size to put in the END record
+     * @param inflateCen if true, zero-pad the CEN to the desired size
+     * @param cenOffAdjust Adjust the CEN offset field of the END record with this amount
+     * @throws IOException if an error occurs
+     */
+    public static Path zipWithModifiedEndRecord(int cenSize,
+                                          boolean inflateCen,
+                                          int cenOffAdjust,
+                                          Path zip) throws IOException {
+        // A byte buffer for reading the END
+        ByteBuffer buffer = ByteBuffer.wrap(templateZip()).order(ByteOrder.LITTLE_ENDIAN);
+
+        // Offset of the END header
+        int endOffset = buffer.limit() - ENDHDR;
+
+        // Modify the CEN size
+        int sizeOffset = endOffset + ENDSIZ;
+        int currentCenSize = buffer.getInt(sizeOffset);
+        buffer.putInt(sizeOffset, cenSize);
+
+        // Optionally modify the CEN offset
+        if (cenOffAdjust != 0) {
+            int offOffset = endOffset + ENDOFF;
+            int currentCenOff = buffer.getInt(offOffset);
+            buffer.putInt(offOffset, currentCenOff + cenOffAdjust);
+        }
+        // When creating a sparse file, the file must not already exit
+        Files.deleteIfExists(zip);
+
+        // Open a FileChannel for writing a sparse file
+        EnumSet<StandardOpenOption> options = EnumSet.of(StandardOpenOption.CREATE_NEW,
+                StandardOpenOption.WRITE,
+                StandardOpenOption.SPARSE);
+
+        try (FileChannel channel = FileChannel.open(zip, options)) {
+            // Write everything up to END
+            channel.write(buffer.slice(0, buffer.limit() - ENDHDR));
+            if (inflateCen) {
+                // Inject "empty bytes" to make the actual CEN size match the END
+                int injectBytes = cenSize - currentCenSize;
+                channel.position(channel.position() + injectBytes);
+            }
+            // Write the modified END
+            channel.write(buffer.slice(buffer.limit() - ENDHDR, ENDHDR));
+        }
+        return zip;
+    }
+
+    /**
+     * Create a small Zip64 ZIP file, then modify the Zip64 END header
+     * with a possibly very large total entry count
+     *
+     * @param zip file to write to
+     * @param totalEntries the number of entries wanted in the Zip64 END header
+     * @return the modified ZIP file
+     * @throws IOException if an unexpeced IO error occurs
+     */
+    public static Path zip64WithModifiedTotalEntries(Path zip, long totalEntries) throws IOException {
+        /**
+         * A small ZIP using the ZIP64 format.
+         *
+         * ZIP created using: "echo -n hello | zip zip64.zip -"
+         * Hex encoded using: "cat zip64.zip | xxd -ps"
+         *
+         * The file has the following structure:
+         *
+         * 0000 LOCAL HEADER #1       04034B50
+         * 0004 Extract Zip Spec      2D '4.5'
+         * 0005 Extract OS            00 'MS-DOS'
+         * 0006 General Purpose Flag  0000
+         * 0008 Compression Method    0000 'Stored'
+         * 000A Last Mod Time         5947AB78 'Mon Oct  7 21:27:48 2024'
+         * 000E CRC                   363A3020
+         * 0012 Compressed Length     FFFFFFFF
+         * 0016 Uncompressed Length   FFFFFFFF
+         * 001A Filename Length       0001
+         * 001C Extra Length          0014
+         * 001E Filename              '-'
+         * 001F Extra ID #0001        0001 'ZIP64'
+         * 0021   Length              0010
+         * 0023   Uncompressed Size   0000000000000006
+         * 002B   Compressed Size     0000000000000006
+         * 0033 PAYLOAD               hello.
+         *
+         * 0039 CENTRAL HEADER #1     02014B50
+         * 003D Created Zip Spec      1E '3.0'
+         * 003E Created OS            03 'Unix'
+         * 003F Extract Zip Spec      2D '4.5'
+         * 0040 Extract OS            00 'MS-DOS'
+         * 0041 General Purpose Flag  0000
+         * 0043 Compression Method    0000 'Stored'
+         * 0045 Last Mod Time         5947AB78 'Mon Oct  7 21:27:48 2024'
+         * 0049 CRC                   363A3020
+         * 004D Compressed Length     00000006
+         * 0051 Uncompressed Length   FFFFFFFF
+         * 0055 Filename Length       0001
+         * 0057 Extra Length          000C
+         * 0059 Comment Length        0000
+         * 005B Disk Start            0000
+         * 005D Int File Attributes   0001
+         *      [Bit 0]               1 Text Data
+         * 005F Ext File Attributes   11B00000
+         * 0063 Local Header Offset   00000000
+         * 0067 Filename              '-'
+         * 0068 Extra ID #0001        0001 'ZIP64'
+         * 006A   Length              0008
+         * 006C   Uncompressed Size   0000000000000006
+         *
+         * 0074 ZIP64 END CENTRAL DIR 06064B50
+         *      RECORD
+         * 0078 Size of record        000000000000002C
+         * 0080 Created Zip Spec      1E '3.0'
+         * 0081 Created OS            03 'Unix'
+         * 0082 Extract Zip Spec      2D '4.5'
+         * 0083 Extract OS            00 'MS-DOS'
+         * 0084 Number of this disk   00000000
+         * 0088 Central Dir Disk no   00000000
+         * 008C Entries in this disk  0000000000000001
+         * 0094 Total Entries         0000000000000001
+         * 009C Size of Central Dir   000000000000003B
+         * 00A4 Offset to Central dir 0000000000000039
+         *
+         * 00AC ZIP64 END CENTRAL DIR 07064B50
+         *      LOCATOR
+         * 00B0 Central Dir Disk no   00000000
+         * 00B4 Offset to Central dir 0000000000000074
+         * 00BC Total no of Disks     00000001
+         *
+         * 00C0 END CENTRAL HEADER    06054B50
+         * 00C4 Number of this disk   0000
+         * 00C6 Central Dir Disk no   0000
+         * 00C8 Entries in this disk  0001
+         * 00CA Total Entries         0001
+         * 00CC Size of Central Dir   0000003B
+         * 00D0 Offset to Central Dir FFFFFFFF
+         * 00D4 Comment Length        0000
+         */
+
+        byte[] zipBytes = HexFormat.of().parseHex("""
+                504b03042d000000000078ab475920303a36ffffffffffffffff01001400
+                2d010010000600000000000000060000000000000068656c6c6f0a504b01
+                021e032d000000000078ab475920303a3606000000ffffffff01000c0000
+                00000001000000b011000000002d010008000600000000000000504b0606
+                2c000000000000001e032d00000000000000000001000000000000000100
+                0000000000003b000000000000003900000000000000504b060700000000
+                740000000000000001000000504b050600000000010001003b000000ffff
+                ffff0000
+                """.replaceAll("\n",""));
+
+        // Buffer to manipulate the above ZIP
+        ByteBuffer buf = ByteBuffer.wrap(zipBytes).order(ByteOrder.LITTLE_ENDIAN);
+        // Offset of the 'total entries' in the 'ZIP64 END CENTRAL DIR' record
+        // Update ZIP64 entry count to a value which cannot possibly fit in the small CEN
+        buf.putLong(0x94, totalEntries);
+        // The corresponding END field needs the ZIP64 magic value
+        buf.putShort(0xCA, (short) 0xFFFF);
+        // Write the ZIP to disk
+        Files.write(zip, zipBytes);
+        return zip;
+    }
+
+    /**
+     * Produce a byte array of a ZIP with a single entry
+     *
+     * @throws IOException if an error occurs
+     */
+    private static byte[] templateZip() throws IOException {
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        try (ZipOutputStream zo = new ZipOutputStream(bout)) {
+            ZipEntry entry = new ZipEntry("duke.txt");
+            zo.putNextEntry(entry);
+            zo.write("duke".getBytes(StandardCharsets.UTF_8));
+        }
+        return bout.toByteArray();
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index cc570caef7c..c915cee41b0 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -799,8 +799,6 @@ public class WhiteBox {
   public native boolean cdsMemoryMappingFailed();
   public native boolean isSharingEnabled();
   public native boolean isSharedClass(Class<?> c);
-  public native boolean areSharedStringsMapped();
-  public native boolean isSharedInternedString(String s);
   public native boolean isCDSIncluded();
   public native boolean isJFRIncluded();
   public native boolean isDTraceIncluded();
diff --git a/test/micro/org/openjdk/bench/java/lang/FPComparison.java b/test/micro/org/openjdk/bench/java/lang/FPComparison.java
index e6b2ab2d39a..63cbb6db911 100644
--- a/test/micro/org/openjdk/bench/java/lang/FPComparison.java
+++ b/test/micro/org/openjdk/bench/java/lang/FPComparison.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.util.random.RandomGenerator;
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
-@Measurement(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 5)
 @Fork(3)
 public class FPComparison {
     static final int INVOCATIONS = 1024;
@@ -75,331 +75,673 @@ public class FPComparison {
         }
     }
 
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    static int callI() {
+        return 1;
+    }
+
     @Benchmark
-    public void isNanFloat() {
+    public void cMoveIsNanFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = Float.isNaN(f1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void isNanDouble() {
+    public void cMoveIsNanDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = Double.isNaN(d1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void isInfiniteFloat() {
+    public void cMoveIsInfiniteFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = Float.isInfinite(f1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void isInfiniteDouble() {
+    public void cMoveIsInfiniteDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = Double.isInfinite(d1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void isFiniteFloat() {
+    public void cMoveIsFiniteFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = Float.isFinite(f1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void isFiniteDouble() {
+    public void cMoveIsFiniteDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = Double.isFinite(d1[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void equalFloat() {
+    public void cMoveEqualFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (f1[i] == f2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void equalDouble() {
+    public void cMoveEqualDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (d1[i] == d2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void lessFloat() {
+    public void cMoveLessFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (f1[i] < f2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void lessDouble() {
+    public void cMoveLessDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (d1[i] < d2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void lessEqualFloat() {
+    public void cMoveLessEqualFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (f1[i] <= f2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void lessEqualDouble() {
+    public void cMoveLessEqualDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (d1[i] <= d2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void greaterFloat() {
+    public void cMoveGreaterFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (f1[i] > f2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void greaterDouble() {
+    public void cMoveGreaterDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (d1[i] > d2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void greaterEqualFloat() {
+    public void cMoveGreaterEqualFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (f1[i] >= f2[i]) ? 1 : 2;
         }
     }
 
     @Benchmark
-    public void greaterEqualDouble() {
+    public void cMoveGreaterEqualDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             res[i] = (d1[i] >= d2[i]) ? 1 : 2;
         }
     }
 
-    // --------- result: long ---------
+    @Benchmark
+    public void branchIsNanFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = Float.isNaN(f1[i]) ? callI() : 2;
+        }
+    }
 
     @Benchmark
-    public void equalFloatResLong() {
+    public void branchIsNanDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = Double.isNaN(d1[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchIsInfiniteFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = Float.isInfinite(f1[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchIsInfiniteDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = Double.isInfinite(d1[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchIsFiniteFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = Float.isFinite(f1[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchIsFiniteDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = Double.isFinite(d1[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchEqualFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] == f2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchEqualDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] == d2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] < f2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] < d2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] <= f2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] <= d2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] > f2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] > d2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (f1[i] >= f2[i]) ? callI() : 2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            res[i] = (d1[i] >= d2[i]) ? callI() : 2;
+        }
+    }
+
+    // --------- result: long ---------
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    static long callL() {
+        return Long.MAX_VALUE;
+    }
+
+    @Benchmark
+    public void cMoveEqualFloatResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (f1[i] == f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void equalDoubleResLong() {
+    public void cMoveEqualDoubleResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (d1[i] == d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void lessFloatResLong() {
+    public void cMoveLessFloatResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (f1[i] < f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void lessDoubleResLong() {
+    public void cMoveLessDoubleResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (d1[i] < d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void lessEqualFloatResLong() {
+    public void cMoveLessEqualFloatResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (f1[i] <= f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void lessEqualDoubleResLong() {
+    public void cMoveLessEqualDoubleResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (d1[i] <= d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void greaterFloatResLong() {
+    public void cMoveGreaterFloatResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (f1[i] > f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void greaterDoubleResLong() {
+    public void cMoveGreaterDoubleResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (d1[i] > d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void greaterEqualFloatResLong() {
+    public void cMoveGreaterEqualFloatResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (f1[i] >= f2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
     @Benchmark
-    public void greaterEqualDoubleResLong() {
+    public void cMoveGreaterEqualDoubleResLong() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resLong[i] = (d1[i] >= d2[i]) ? Long.MAX_VALUE : Long.MIN_VALUE;
         }
     }
 
-    // --------- result: float ---------
+    @Benchmark
+    public void branchEqualFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] == f2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
 
     @Benchmark
-    public void equalFloatResFloat() {
+    public void branchEqualDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] == d2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchLessFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] < f2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchLessDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] < d2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] <= f2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] <= d2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] > f2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] > d2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualFloatResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (f1[i] >= f2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualDoubleResLong() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resLong[i] = (d1[i] >= d2[i]) ? callL() : Long.MIN_VALUE;
+        }
+    }
+
+    // --------- result: float ---------
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    static float callF() {
+        return 0.1f;
+    }
+
+    @Benchmark
+    public void cMoveEqualFloatResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (f1[i] == f2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void equalDoubleResFloat() {
+    public void cMoveEqualDoubleResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (d1[i] == d2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void lessFloatResFloat() {
+    public void cMoveLessFloatResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (f1[i] < f2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void lessDoubleResFloat() {
+    public void cMoveLessDoubleResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (d1[i] < d2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void lessEqualFloatResFloat() {
+    public void cMoveLessEqualFloatResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (f1[i] <= f2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void lessEqualDoubleResFloat() {
+    public void cMoveLessEqualDoubleResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (d1[i] <= d2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void greaterFloatResFloat() {
+    public void cMoveGreaterFloatResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (f1[i] > f2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void greaterDoubleResFloat() {
+    public void cMoveGreaterDoubleResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (d1[i] > d2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void greaterEqualFloatResFloat() {
+    public void cMoveGreaterEqualFloatResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (f1[i] >= f2[i]) ? 0.1f : 0.2f;
         }
     }
 
     @Benchmark
-    public void greaterEqualDoubleResFloat() {
+    public void cMoveGreaterEqualDoubleResFloat() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resFloat[i] = (d1[i] >= d2[i]) ? 0.1f : 0.2f;
         }
     }
 
-    // --------- result: double ---------
+    @Benchmark
+    public void branchEqualFloatResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (f1[i] == f2[i]) ? callF() : 0.2f;
+        }
+    }
 
     @Benchmark
-    public void equalFloatResDouble() {
+    public void branchEqualDoubleResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (d1[i] == d2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchLessFloatResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (f1[i] < f2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchLessDoubleResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (d1[i] < d2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualFloatResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (f1[i] <= f2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualDoubleResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (d1[i] <= d2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterFloatResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (f1[i] > f2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterDoubleResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (d1[i] > d2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualFloatResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (f1[i] >= f2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualDoubleResFloat() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resFloat[i] = (d1[i] >= d2[i]) ? callF() : 0.2f;
+        }
+    }
+
+    // --------- result: double ---------
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    static double callD() {
+        return 0.1;
+    }
+
+    @Benchmark
+    public void cMoveEqualFloatResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (f1[i] == f2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void equalDoubleResDouble() {
+    public void cMoveEqualDoubleResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (d1[i] == d2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void lessFloatResDouble() {
+    public void cMoveLessFloatResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (f1[i] < f2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void lessDoubleResDouble() {
+    public void cMoveLessDoubleResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (d1[i] < d2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void lessEqualFloatResDouble() {
+    public void cMoveLessEqualFloatResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (f1[i] <= f2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void lessEqualDoubleResDouble() {
+    public void cMoveLessEqualDoubleResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (d1[i] <= d2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void greaterFloatResDouble() {
+    public void cMoveGreaterFloatResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (f1[i] > f2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void greaterDoubleResDouble() {
+    public void cMoveGreaterDoubleResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (d1[i] > d2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void greaterEqualFloatResDouble() {
+    public void cMoveGreaterEqualFloatResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (f1[i] >= f2[i]) ? 0.1 : 0.2;
         }
     }
 
     @Benchmark
-    public void greaterEqualDoubleResDouble() {
+    public void cMoveGreaterEqualDoubleResDouble() {
         for (int i = 0; i < INVOCATIONS; i++) {
             resDouble[i] = (d1[i] >= d2[i]) ? 0.1 : 0.2;
         }
     }
+
+    @Benchmark
+    public void branchEqualFloatResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (f1[i] == f2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchEqualDoubleResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (d1[i] == d2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessFloatResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (f1[i] < f2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessDoubleResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (d1[i] < d2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualFloatResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (f1[i] <= f2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchLessEqualDoubleResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (d1[i] <= d2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterFloatResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (f1[i] > f2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterDoubleResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (d1[i] > d2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualFloatResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (f1[i] >= f2[i]) ? callD() : 0.2;
+        }
+    }
+
+    @Benchmark
+    public void branchGreaterEqualDoubleResDouble() {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            resDouble[i] = (d1[i] >= d2[i]) ? callD() : 0.2;
+        }
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/ThreadGetStackTraceWhenParked.java b/test/micro/org/openjdk/bench/java/lang/ThreadGetStackTraceWhenParked.java
new file mode 100644
index 00000000000..cd75d3a9568
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/ThreadGetStackTraceWhenParked.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.LockSupport;
+import org.openjdk.jmh.annotations.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+@Warmup(iterations = 10, time = 1)
+@Measurement(iterations = 10, time = 1)
+@Fork(value = 3)
+public class ThreadGetStackTraceWhenParked {
+    private volatile boolean done;
+    private Thread thread;
+
+    @Setup
+    public void setup() throws InterruptedException {
+        var started = new CountDownLatch(1);
+        thread = Thread.ofPlatform().start(() -> {
+            started.countDown();
+            while (!done) {
+                LockSupport.park();
+            }
+        });
+        started.await();
+    }
+
+    @TearDown
+    public void shutdown() throws InterruptedException {
+        done = true;
+        LockSupport.unpark(thread);
+        thread.join();
+    }
+
+    @Benchmark
+    public StackTraceElement[] testGetStackTrace() {
+        return thread.getStackTrace();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/ThreadGetStackTraceWhenSpinning.java b/test/micro/org/openjdk/bench/java/lang/ThreadGetStackTraceWhenSpinning.java
new file mode 100644
index 00000000000..26c61d19206
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/ThreadGetStackTraceWhenSpinning.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+@Warmup(iterations = 10, time = 1)
+@Measurement(iterations = 10, time = 1)
+@Fork(value = 3)
+public class ThreadGetStackTraceWhenSpinning {
+    private volatile boolean done;
+    private Thread thread;
+
+    @Setup
+    public void setup() throws InterruptedException {
+        var started = new CountDownLatch(1);
+        thread = Thread.ofPlatform().start(() -> {
+            started.countDown();
+            while (!done) {
+                Thread.onSpinWait();
+            }
+        });
+        started.await();
+    }
+
+    @TearDown
+    public void shutdown() throws InterruptedException {
+        done = true;
+        thread.join();
+    }
+
+    @Benchmark
+    public StackTraceElement[] testGetStackTrace() {
+        return thread.getStackTrace();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenSpinning.java b/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenSpinning.java
new file mode 100644
index 00000000000..59836815bfd
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenSpinning.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+@Warmup(iterations = 10, time = 1)
+@Measurement(iterations = 10, time = 1)
+@Fork(value = 3)
+public class VirtualThreadGetStackTraceWhenSpinning {
+    private volatile boolean done;
+    private Thread thread;
+
+    @Setup
+    public void setup() throws InterruptedException {
+        var started = new CountDownLatch(1);
+        thread = Thread.startVirtualThread(() -> {
+            started.countDown();
+            while (!done) {
+                Thread.onSpinWait();
+            }
+        });
+        started.await();
+    }
+
+    @TearDown
+    public void shutdown() throws InterruptedException {
+        done = true;
+        thread.join();
+    }
+
+    @Benchmark
+    public StackTraceElement[] testGetStackTrace() {
+        return thread.getStackTrace();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenUnmounted.java b/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenUnmounted.java
new file mode 100644
index 00000000000..c972b511bd7
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenUnmounted.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.LockSupport;
+import org.openjdk.jmh.annotations.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+@Warmup(iterations = 10, time = 1)
+@Measurement(iterations = 10, time = 1)
+@Fork(value = 3)
+public class VirtualThreadGetStackTraceWhenUnmounted {
+    private volatile boolean done;
+    private Thread thread;
+
+    @Setup
+    public void setup() throws InterruptedException {
+        var started = new CountDownLatch(1);
+        thread = Thread.startVirtualThread(() -> {
+            started.countDown();
+            while (!done) {
+                LockSupport.park();
+            }
+        });
+        started.await();
+    }
+
+    @TearDown
+    public void shutdown() throws InterruptedException {
+        done = true;
+        LockSupport.unpark(thread);
+        thread.join();
+    }
+
+    @Benchmark
+    public StackTraceElement[] testGetStackTrace() {
+        return thread.getStackTrace();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenYielding.java b/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenYielding.java
new file mode 100644
index 00000000000..0dbefc697c4
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/VirtualThreadGetStackTraceWhenYielding.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.lang;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@State(Scope.Benchmark)
+@Warmup(iterations = 10, time = 1)
+@Measurement(iterations = 10, time = 1)
+@Fork(value = 3)
+public class VirtualThreadGetStackTraceWhenYielding {
+    private volatile boolean done;
+    private Thread thread;
+
+    @Setup
+    public void setup() throws InterruptedException {
+        var started = new CountDownLatch(1);
+        thread = Thread.startVirtualThread(() -> {
+            started.countDown();
+            while (!done) {
+                Thread.yield();
+            }
+        });
+        started.await();
+    }
+
+    @TearDown
+    public void shutdown() throws InterruptedException {
+        done = true;
+        thread.join();
+    }
+
+    @Benchmark
+    public StackTraceElement[] testGetStackTrace() {
+        return thread.getStackTrace();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/nio/CharsetCanEncode.java b/test/micro/org/openjdk/bench/java/nio/CharsetCanEncode.java
new file mode 100644
index 00000000000..ebfbc217a95
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/nio/CharsetCanEncode.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.java.nio;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Fork(3)
+public class CharsetCanEncode {
+
+    private static final char ALEF_CHAR = '\u05d0';
+    private static final String ALEF_STRING = "\u05d0";
+
+    // sun.nio.cs.US_ASCII
+    private CharsetEncoder ascii = Charset.forName("US-ASCII").newEncoder();
+
+    // sun.nio.cs.ISO_8859_1
+    private CharsetEncoder iso88591 = Charset.forName("ISO-8859-1").newEncoder();
+
+    // sun.nio.cs.SingleByte
+    private CharsetEncoder iso88592 = Charset.forName("ISO-8859-2").newEncoder();
+
+    // sun.nio.cs.DoubleByte
+    private CharsetEncoder shiftjis = Charset.forName("Shift_JIS").newEncoder();
+
+    // sun.nio.cs.UTF_8
+    private CharsetEncoder utf8 = Charset.forName("UTF-8").newEncoder();
+
+    // sun.nio.cs.UTF_16LE
+    private CharsetEncoder utf16le = Charset.forName("UTF-16LE").newEncoder();
+
+    @Benchmark
+    public boolean asciiCanEncodeCharYes() {
+        return ascii.canEncode('D');
+    }
+
+    @Benchmark
+    public boolean asciiCanEncodeStringYes() {
+        return ascii.canEncode("D");
+    }
+
+    @Benchmark
+    public boolean asciiCanEncodeCharNo() {
+        return ascii.canEncode(ALEF_CHAR);
+    }
+
+    @Benchmark
+    public boolean asciiCanEncodeStringNo() {
+        return ascii.canEncode(ALEF_STRING);
+    }
+
+    @Benchmark
+    public boolean iso88591CanEncodeCharYes() {
+        return iso88591.canEncode('D');
+    }
+
+    @Benchmark
+    public boolean iso88591CanEncodeStringYes() {
+        return iso88591.canEncode("D");
+    }
+
+    @Benchmark
+    public boolean iso88591CanEncodeCharNo() {
+        return iso88591.canEncode(ALEF_CHAR);
+    }
+
+    @Benchmark
+    public boolean iso88591CanEncodeStringNo() {
+        return iso88591.canEncode(ALEF_STRING);
+    }
+
+    @Benchmark
+    public boolean iso88592CanEncodeCharYes() {
+        return iso88592.canEncode('D');
+    }
+
+    @Benchmark
+    public boolean iso88592CanEncodeStringYes() {
+        return iso88592.canEncode("D");
+    }
+
+    @Benchmark
+    public boolean iso88592CanEncodeCharNo() {
+        return iso88592.canEncode(ALEF_CHAR);
+    }
+
+    @Benchmark
+    public boolean iso88592CanEncodeStringNo() {
+        return iso88592.canEncode(ALEF_STRING);
+    }
+
+    @Benchmark
+    public boolean shiftjisCanEncodeCharYes() {
+        return shiftjis.canEncode('D');
+    }
+
+    @Benchmark
+    public boolean shiftjisCanEncodeStringYes() {
+        return shiftjis.canEncode("D");
+    }
+
+    @Benchmark
+    public boolean shiftjisCanEncodeCharNo() {
+        return shiftjis.canEncode(ALEF_CHAR);
+    }
+
+    @Benchmark
+    public boolean shiftjisCanEncodeStringNo() {
+        return shiftjis.canEncode(ALEF_STRING);
+    }
+
+    @Benchmark
+    public boolean utf8CanEncodeCharYes() {
+        return utf8.canEncode('D');
+    }
+
+    @Benchmark
+    public boolean utf8CanEncodeStringYes() {
+        return utf8.canEncode("D");
+    }
+
+    @Benchmark
+    public boolean utf8CanEncodeCharNo() {
+        return utf8.canEncode(Character.MIN_SURROGATE);
+    }
+
+    @Benchmark
+    public boolean utf8CanEncodeStringNo() {
+        return utf8.canEncode(String.valueOf(Character.MIN_SURROGATE));
+    }
+
+    @Benchmark
+    public boolean utf16leCanEncodeCharYes() {
+        return utf16le.canEncode('D');
+    }
+
+    @Benchmark
+    public boolean utf16leCanEncodeStringYes() {
+        return utf16le.canEncode("D");
+    }
+
+    @Benchmark
+    public boolean utf16leCanEncodeCharNo() {
+        return utf16le.canEncode(Character.MIN_SURROGATE);
+    }
+
+    @Benchmark
+    public boolean utf16leCanEncodeStringNo() {
+        return utf16le.canEncode(String.valueOf(Character.MIN_SURROGATE));
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/security/SSLHandshake.java b/test/micro/org/openjdk/bench/java/security/SSLHandshake.java
index d8773781b58..b46704a01de 100644
--- a/test/micro/org/openjdk/bench/java/security/SSLHandshake.java
+++ b/test/micro/org/openjdk/bench/java/security/SSLHandshake.java
@@ -44,6 +44,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
+import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManagerFactory;
 
@@ -75,8 +76,15 @@ public class SSLHandshake {
     @Param({"true", "false"})
     boolean resume;
 
-    @Param({"TLSv1.2", "TLS"})
-    String tlsVersion;
+    @Param({
+            "TLSv1.2-secp256r1",
+            "TLSv1.3-x25519", "TLSv1.3-secp256r1", "TLSv1.3-secp384r1",
+            "TLSv1.3-X25519MLKEM768", "TLSv1.3-SecP256r1MLKEM768", "TLSv1.3-SecP384r1MLKEM1024"
+    })
+    String versionAndGroup;
+
+    private String tlsVersion;
+    private String namedGroup;
 
     private static SSLContext getServerContext() {
         try {
@@ -96,6 +104,10 @@ public class SSLHandshake {
 
     @Setup(Level.Trial)
     public void init() throws Exception {
+        String[] components = versionAndGroup.split("-", 2);
+        tlsVersion = components[0];
+        namedGroup = components[1];
+
         KeyStore ts = TestCertificates.getTrustStore();
 
         TrustManagerFactory tmf = TrustManagerFactory.getInstance(
@@ -195,5 +207,14 @@ public class SSLHandshake {
          */
         clientEngine = sslClientCtx.createSSLEngine("client", 80);
         clientEngine.setUseClientMode(true);
+
+        // Set the key exchange named group in client and server engines
+        SSLParameters clientParams = clientEngine.getSSLParameters();
+        clientParams.setNamedGroups(new String[]{namedGroup});
+        clientEngine.setSSLParameters(clientParams);
+
+        SSLParameters serverParams = serverEngine.getSSLParameters();
+        serverParams.setNamedGroups(new String[]{namedGroup});
+        serverEngine.setSSLParameters(serverParams);
     }
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java
index 3386039c62e..dc6d2060f5e 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/KEMBench.java
@@ -23,34 +23,69 @@
 package org.openjdk.bench.javax.crypto.full;
 
 import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.OperationsPerInvocation;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.infra.Blackhole;
 
 import javax.crypto.DecapsulateException;
+import java.security.GeneralSecurityException;
+import java.security.InvalidAlgorithmParameterException;
 import javax.crypto.KEM;
 import java.security.InvalidKeyException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.Security;
+import java.security.spec.ECGenParameterSpec;
 
-public class KEMBench extends CryptoBase {
+public abstract class KEMBench extends CryptoBase {
 
     public static final int SET_SIZE = 128;
 
-    @Param({"ML-KEM-512", "ML-KEM-768", "ML-KEM-1024" })
+    @Param({})
     private String algorithm;
 
+    @Param({""})        // Used when the KeyPairGenerator Alg != KEM Alg
+    private String kpgSpec;
+
     private KeyPair[] keys;
     private byte[][] messages;
 
     private KEM kem;
 
     @Setup
-    public void setup() throws NoSuchAlgorithmException, InvalidKeyException {
-        kem = (prov == null) ? KEM.getInstance(algorithm) : KEM.getInstance(algorithm, prov);
-        KeyPairGenerator generator = (prov == null) ? KeyPairGenerator.getInstance(algorithm) : KeyPairGenerator.getInstance(algorithm, prov);
+    public void setup() throws NoSuchAlgorithmException, InvalidKeyException,
+            InvalidAlgorithmParameterException {
+        String kpgAlg;
+        String kpgParams;
+        kem = (prov == null) ? KEM.getInstance(algorithm) :
+                KEM.getInstance(algorithm, prov);
+
+        // By default use the same provider for KEM and KPG
+        Provider kpgProv = prov;
+        if (kpgSpec.isEmpty()) {
+            kpgAlg = algorithm;
+            kpgParams = "";
+        } else {
+            // The key pair generation spec is broken down from a colon-
+            // delimited string spec into 3 fields:
+            // [0] - the provider name
+            // [1] - the algorithm name
+            // [2] - the parameters (i.e. the name of the curve)
+            String[] kpgTok = kpgSpec.split(":");
+            kpgProv = Security.getProvider(kpgTok[0]);
+            kpgAlg = kpgTok[1];
+            kpgParams = kpgTok[2];
+        }
+        KeyPairGenerator generator = (kpgProv == null) ?
+                    KeyPairGenerator.getInstance(kpgAlg) :
+                    KeyPairGenerator.getInstance(kpgAlg, kpgProv);
+        if (kpgParams != null && !kpgParams.isEmpty()) {
+            generator.initialize(new ECGenParameterSpec(kpgParams));
+        }
         keys = new KeyPair[SET_SIZE];
         for (int i = 0; i < keys.length; i++) {
             keys[i] = generator.generateKeyPair();
@@ -63,20 +98,79 @@ public class KEMBench extends CryptoBase {
         }
     }
 
+    private static Provider getInternalJce() {
+        try {
+            Class<?> dhClazz = Class.forName("sun.security.ssl.HybridProvider");
+            return (Provider) dhClazz.getField("PROVIDER").get(null);
+        } catch (ReflectiveOperationException exc) {
+            throw new RuntimeException(exc);
+        }
+    }
+
     @Benchmark
     @OperationsPerInvocation(SET_SIZE)
     public void encapsulate(Blackhole bh) throws InvalidKeyException {
         for (KeyPair kp : keys) {
-            bh.consume(kem.newEncapsulator(kp.getPublic()).encapsulate().encapsulation());
+            bh.consume(kem.newEncapsulator(kp.getPublic()).encapsulate().
+                    encapsulation());
         }
     }
 
     @Benchmark
     @OperationsPerInvocation(SET_SIZE)
-    public void decapsulate(Blackhole bh) throws InvalidKeyException, DecapsulateException {
+    public void decapsulate(Blackhole bh) throws InvalidKeyException,
+            DecapsulateException {
         for (int i = 0; i < messages.length; i++) {
-            bh.consume(kem.newDecapsulator(keys[i].getPrivate()).decapsulate(messages[i]));
+            bh.consume(kem.newDecapsulator(keys[i].getPrivate()).
+                    decapsulate(messages[i]));
         }
     }
 
+    public static class MLKEM extends KEMBench {
+        @Param({"ML-KEM-512", "ML-KEM-768", "ML-KEM-1024" })
+        private String algorithm;
+
+        @Param({""})            // ML-KEM uses the same alg for KPG and KEM
+        private String kpgSpec;
+    }
+
+    @Fork(value = 5, jvmArgs = {"-XX:+AlwaysPreTouch", "--add-opens",
+            "java.base/sun.security.ssl=ALL-UNNAMED"})
+    public static class JSSE_DHasKEM extends KEMBench {
+        @Setup
+        public void init() {
+            try {
+                prov = getInternalJce();
+                super.setup();
+            } catch (GeneralSecurityException gse) {
+                throw new RuntimeException(gse);
+            }
+        }
+
+        @Param({"DH"})
+        private String algorithm;
+
+        @Param({"SunEC:XDH:x25519", "SunEC:EC:secp256r1", "SunEC:EC:secp384r1"})
+        private String kpgSpec;
+    }
+
+    @Fork(value = 5, jvmArgs = {"-XX:+AlwaysPreTouch", "--add-opens",
+            "java.base/sun.security.ssl=ALL-UNNAMED"})
+    public static class JSSE_Hybrid extends KEMBench {
+        @Setup
+        public void init() {
+            try {
+                prov = getInternalJce();
+                super.setup();
+            } catch (GeneralSecurityException gse) {
+                throw new RuntimeException(gse);
+            }
+        }
+
+        @Param({"X25519MLKEM768", "SecP256r1MLKEM768", "SecP384r1MLKEM1024"})
+        private String algorithm;
+
+        @Param({""})            // ML-KEM uses the same alg for KPG and KEM
+        private String kpgSpec;
+    }
 }
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java
index 58daff28d88..5a3c72fb263 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/KeyPairGeneratorBench.java
@@ -22,13 +22,16 @@
  */
 package org.openjdk.bench.javax.crypto.full;
 
+import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Setup;
 
+import java.security.GeneralSecurityException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
 
 public class KeyPairGeneratorBench extends CryptoBase {
 
@@ -45,11 +48,21 @@ public class KeyPairGeneratorBench extends CryptoBase {
         setupProvider();
         generator = (prov == null) ? KeyPairGenerator.getInstance(algorithm)
                                 : KeyPairGenerator.getInstance(algorithm, prov);
-        if (keyLength > 0) { // not all key pair generators allow the use of key length
+        // not all key pair generators allow the use of key length
+        if (keyLength > 0) {
             generator.initialize(keyLength);
         }
     }
 
+    private static Provider getInternalJce() {
+        try {
+            Class<?> dhClazz = Class.forName("sun.security.ssl.HybridProvider");
+            return (Provider) dhClazz.getField("PROVIDER").get(null);
+        } catch (ReflectiveOperationException exc) {
+            throw new RuntimeException(exc);
+        }
+    }
+
     @Benchmark
     public KeyPair generateKeyPair() {
         return generator.generateKeyPair();
@@ -118,4 +131,23 @@ public class KeyPairGeneratorBench extends CryptoBase {
         private int keyLength;
     }
 
+    @Fork(value = 5, jvmArgs = {"-XX:+AlwaysPreTouch", "--add-opens",
+            "java.base/sun.security.ssl=ALL-UNNAMED"})
+    public static class JSSE_Hybrid extends KeyPairGeneratorBench {
+        @Setup
+        public void init() {
+            try {
+                prov = getInternalJce();
+                super.setup();
+            } catch (GeneralSecurityException gse) {
+                throw new RuntimeException(gse);
+            }
+        }
+
+        @Param({"X25519MLKEM768", "SecP256r1MLKEM768", "SecP384r1MLKEM1024"})
+        private String algorithm;
+
+        @Param({"0"})       // Hybrid KPGs don't need key lengths
+        private int keyLength;
+    }
 }
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java
index 2d327958594..876ed43b32e 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/ArrayMismatchBenchmark.java
@@ -26,6 +26,7 @@ package org.openjdk.bench.jdk.incubator.vector;
 
 
 import jdk.incubator.vector.ByteVector;
+import jdk.incubator.vector.ShortVector;
 import jdk.incubator.vector.DoubleVector;
 import jdk.incubator.vector.IntVector;
 import jdk.incubator.vector.LongVector;
@@ -59,6 +60,9 @@ public class ArrayMismatchBenchmark {
     byte[] byteData1;
     byte[] byteData2;
 
+    short[] shortData1;
+    short[] shortData2;
+
     int[] intData1;
     int[] intData2;
 
@@ -69,6 +73,7 @@ public class ArrayMismatchBenchmark {
     double[] doubleData2;
 
     static final VectorSpecies<Byte> BYTE_SPECIES_PREFERRED = ByteVector.SPECIES_PREFERRED;
+    static final VectorSpecies<Short> SHORT_SPECIES_PREFERRED = ShortVector.SPECIES_PREFERRED;
     static final VectorSpecies<Integer> INT_SPECIES_PREFERRED = IntVector.SPECIES_PREFERRED;
     static final VectorSpecies<Double> FLOAT_SPECIES_PREFERRED = DoubleVector.SPECIES_PREFERRED;
     static final VectorSpecies<Long> LONG_SPECIES_PREFERRED = LongVector.SPECIES_PREFERRED;
@@ -89,6 +94,16 @@ public class ArrayMismatchBenchmark {
 
             System.arraycopy(commonBytes, 0, byteData1, 0, common);
             System.arraycopy(commonBytes, 0, byteData2, 0, common);
+        } else if (params.getBenchmark().endsWith("Short")) {
+            shortData1 = new short[size];
+            shortData2 = new short[size];
+            Arrays.fill(shortData1, (short)random.nextInt());
+            Arrays.fill(shortData2, (short)random.nextInt());
+
+            short[] commonShorts = new short[common];
+            Arrays.fill(commonShorts, (short)random.nextInt());
+            System.arraycopy(commonShorts, 0, shortData1, 0, common);
+            System.arraycopy(commonShorts, 0, shortData2, 0, common);
         } else if (params.getBenchmark().endsWith("Int")) {
             intData1 = random.ints(size).toArray();
             intData2 = random.ints(size).toArray();
@@ -141,6 +156,34 @@ public class ArrayMismatchBenchmark {
         return mismatch;
     }
 
+    @Benchmark
+    public int mismatchIntrinsicShort() {
+        return Arrays.mismatch(shortData1, shortData2);
+    }
+
+    @Benchmark
+    public int mismatchVectorShort() {
+        int length = Math.min(shortData1.length, shortData2.length);
+        int index = 0;
+        for (; index < SHORT_SPECIES_PREFERRED.loopBound(length); index += SHORT_SPECIES_PREFERRED.length()) {
+            ShortVector vector1 = ShortVector.fromArray(SHORT_SPECIES_PREFERRED, shortData1, index);
+            ShortVector vector2 = ShortVector.fromArray(SHORT_SPECIES_PREFERRED, shortData2, index);
+            VectorMask<Short> mask = vector1.compare(VectorOperators.NE, vector2);
+            if (mask.anyTrue()) {
+                return index + mask.firstTrue();
+            }
+        }
+        // process the tail
+        int mismatch = -1;
+        for (int i = index; i < length; ++i) {
+            if (shortData1[i] != shortData2[i]) {
+                mismatch = i;
+                break;
+            }
+        }
+        return mismatch;
+    }
+
     @Benchmark
     public int mismatchIntrinsicInt() {
         return Arrays.mismatch(intData1, intData2);
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java
index ebbfbb01cc6..cbfe9958924 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.openjdk.bench.java.lang;
+package org.openjdk.bench.jdk.incubator.vector;
 
 import java.util.stream.IntStream;
 import java.util.concurrent.TimeUnit;
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorUMinUMaxReductionBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorUMinUMaxReductionBenchmark.java
new file mode 100644
index 00000000000..658717184a0
--- /dev/null
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorUMinUMaxReductionBenchmark.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.jdk.incubator.vector;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import jdk.incubator.vector.*;
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(value = 2, jvmArgs = { "--add-modules=jdk.incubator.vector" })
+public class VectorUMinUMaxReductionBenchmark {
+    @Param({"1024"})
+    private int size;
+
+    private static final VectorSpecies<Byte> B_SPECIES = VectorSpecies.ofLargestShape(byte.class);
+    private static final VectorSpecies<Short> S_SPECIES = VectorSpecies.ofLargestShape(short.class);
+    private static final VectorSpecies<Integer> I_SPECIES = VectorSpecies.ofLargestShape(int.class);
+    private static final VectorSpecies<Long> L_SPECIES = VectorSpecies.ofLargestShape(long.class);
+
+    private Random r = new Random();
+    private byte[] ba;
+    private short[] sa;
+    private int[] ia;
+    private long[] la;
+    private boolean[] ma;
+
+    @Setup
+    public void init() {
+        ba = new byte[size];
+        sa = new short[size];
+        ia = new int[size];
+        la = new long[size];
+        ma = new boolean[size];
+
+        for (int i = 0; i < size; i++) {
+            ba[i] = (byte) r.nextInt();
+            sa[i] = (short) r.nextInt();
+            ia[i] = r.nextInt();
+            la[i] = r.nextLong();
+            ma[i] = r.nextInt() % 2 == 0;
+        }
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private byte byteUMinUMaxReductionKernel(VectorOperators.Associative op) {
+        byte res = 0;
+        for (int i = 0; i < B_SPECIES.loopBound(size); i += B_SPECIES.length()) {
+            ByteVector av = ByteVector.fromArray(B_SPECIES, ba, i);
+            res += av.reduceLanes(op);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private byte byteUMinUMaxReductionMaskedKernel(VectorOperators.Associative op) {
+        byte res = 0;
+        VectorMask<Byte> m = VectorMask.fromArray(B_SPECIES, ma, 0);
+        for (int i = 0; i < B_SPECIES.loopBound(size); i += B_SPECIES.length()) {
+            ByteVector av = ByteVector.fromArray(B_SPECIES, ba, i);
+            res += av.reduceLanes(op, m);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private short shortUMinUMaxReductionKernel(VectorOperators.Associative op) {
+        short res = 0;
+        for (int i = 0; i < S_SPECIES.loopBound(size); i += S_SPECIES.length()) {
+            ShortVector av = ShortVector.fromArray(S_SPECIES, sa, i);
+            res += av.reduceLanes(op);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private short shortUMinUMaxReductionMaskedKernel(VectorOperators.Associative op) {
+        short res = 0;
+        VectorMask<Short> m = VectorMask.fromArray(S_SPECIES, ma, 0);
+        for (int i = 0; i < S_SPECIES.loopBound(size); i += S_SPECIES.length()) {
+            ShortVector av = ShortVector.fromArray(S_SPECIES, sa, i);
+            res += av.reduceLanes(op, m);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private int intUMinUMaxReductionKernel(VectorOperators.Associative op) {
+        int res = 0;
+        for (int i = 0; i < I_SPECIES.loopBound(size); i += I_SPECIES.length()) {
+            IntVector av = IntVector.fromArray(I_SPECIES, ia, i);
+            res += av.reduceLanes(op);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private int intUMinUMaxReductionMaskedKernel(VectorOperators.Associative op) {
+        int res = 0;
+        VectorMask<Integer> m = VectorMask.fromArray(I_SPECIES, ma, 0);
+        for (int i = 0; i < I_SPECIES.loopBound(size); i += I_SPECIES.length()) {
+            IntVector av = IntVector.fromArray(I_SPECIES, ia, i);
+            res += av.reduceLanes(op, m);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private long longUMinUMaxReductionKernel(VectorOperators.Associative op) {
+        long res = 0L;
+        for (int i = 0; i < L_SPECIES.loopBound(size); i += L_SPECIES.length()) {
+            LongVector av = LongVector.fromArray(L_SPECIES, la, i);
+            res += av.reduceLanes(op);
+        }
+        return res;
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    private long longUMinUMaxReductionMaskedKernel(VectorOperators.Associative op) {
+        long res = 0L;
+        VectorMask<Long> m = VectorMask.fromArray(L_SPECIES, ma, 0);
+        for (int i = 0; i < L_SPECIES.loopBound(size); i += L_SPECIES.length()) {
+            LongVector av = LongVector.fromArray(L_SPECIES, la, i);
+            res += av.reduceLanes(op, m);
+        }
+        return res;
+    }
+
+    @Benchmark
+    public byte byteUMinReduction() {
+        return byteUMinUMaxReductionKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public byte byteUMaxReduction() {
+        return byteUMinUMaxReductionKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public byte byteUMinReductionMasked() {
+        return byteUMinUMaxReductionMaskedKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public byte byteUMaxReductionMasked() {
+        return byteUMinUMaxReductionMaskedKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public short shortUMinReduction() {
+        return shortUMinUMaxReductionKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public short shortUMaxReduction() {
+        return shortUMinUMaxReductionKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public short shortUMinReductionMasked() {
+        return shortUMinUMaxReductionMaskedKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public short shortUMaxReductionMasked() {
+        return shortUMinUMaxReductionMaskedKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public int intUMinReduction() {
+        return intUMinUMaxReductionKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public int intUMaxReduction() {
+        return intUMinUMaxReductionKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public int intUMinReductionMasked() {
+        return intUMinUMaxReductionMaskedKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public int intUMaxReductionMasked() {
+        return intUMinUMaxReductionMaskedKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public long longUMinReduction() {
+        return longUMinUMaxReductionKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public long longUMaxReduction() {
+        return longUMinUMaxReductionKernel(VectorOperators.UMAX);
+    }
+
+    @Benchmark
+    public long longUMinReductionMasked() {
+        return longUMinUMaxReductionMaskedKernel(VectorOperators.UMIN);
+    }
+
+    @Benchmark
+    public long longUMaxReductionMasked() {
+        return longUMinUMaxReductionMaskedKernel(VectorOperators.UMAX);
+    }
+}
\ No newline at end of file
diff --git a/test/micro/org/openjdk/bench/jdk/internal/jrtfs/ImageReaderBenchmark.java b/test/micro/org/openjdk/bench/jdk/internal/jrtfs/ImageReaderBenchmark.java
index 1b89b510fae..b6876e66d98 100644
--- a/test/micro/org/openjdk/bench/jdk/internal/jrtfs/ImageReaderBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/internal/jrtfs/ImageReaderBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -447,7 +447,6 @@ public class ImageReaderBenchmark {
             "/modules/java.base/jdk/internal/access/JavaLangRefAccess.class",
             "/modules/java.base/java/lang/ref/ReferenceQueue.class",
             "/modules/java.base/java/lang/ref/ReferenceQueue$Null.class",
-            "/modules/java.base/java/lang/ref/ReferenceQueue$Lock.class",
             "/modules/java.base/jdk/internal/access/JavaLangAccess.class",
             "/modules/java.base/jdk/internal/util/SystemProps.class",
             "/modules/java.base/jdk/internal/util/SystemProps$Raw.class",
@@ -1073,6 +1072,5 @@ public class ImageReaderBenchmark {
             "/modules/java.base/java/nio/charset/CoderResult.class",
             "/modules/java.base/java/util/IdentityHashMap$IdentityHashMapIterator.class",
             "/modules/java.base/java/util/IdentityHashMap$KeyIterator.class",
-            "/modules/java.base/java/lang/Shutdown.class",
-            "/modules/java.base/java/lang/Shutdown$Lock.class");
+            "/modules/java.base/java/lang/Shutdown.class");
 }
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithms.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithms.java
new file mode 100644
index 00000000000..911494cb022
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithms.java
@@ -0,0 +1,274 @@
+/*
+ *  Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ *  This code is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 only, as
+ *  published by the Free Software Foundation.
+ *
+ *  This code is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  version 2 for more details (a copy is included in the LICENSE file that
+ *  accompanied this code).
+ *
+ *  You should have received a copy of the GNU General Public License version
+ *  2 along with this work; if not, write to the Free Software Foundation,
+ *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ *  or visit www.oracle.com if you need additional information or have any
+ *  questions.
+ *
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+/**
+ * The goal of this benchmark is to show the power of auto vectorization
+ * and the Vector API.
+ *
+ * Please only modify this benchark in synchronization with the IR test:
+ *   test/hotspot/jtreg/compiler/vectorization/TestVectorAlgorithms.java
+ *
+ * You may want to play with the following VM flags:
+ *  - Disable auto vectorization:
+ *      -XX:+UnlockDiagnosticVMOptions -XX:AutoVectorizationOverrideProfitability=0
+ *  - Smaller vector size:
+ *      -XX:MaxVectorSize=16
+ *  - Disable fill loop detection, so we don't use intrinsic but auto vectorization:
+ *      -XX:-OptimizeFill
+ *  - Lilliput can also have an effect, because it can change alignment and have
+ *    an impact on which exact intrinsic is chosen (e.g. fill and copy):
+ *      -XX:+UseCompactObjectHeaders
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(value = 5, jvmArgs = {"--add-modules=jdk.incubator.vector", "-XX:CompileCommand=inline,*VectorAlgorithmsImpl*::*"})
+public class VectorAlgorithms {
+    @Param({"640000"})
+    public int SIZE;
+
+    @Param({"10000"})
+    public int NUM_X_OBJECTS;
+
+    @Param({"0"})
+    public int SEED;
+
+    VectorAlgorithmsImpl.Data d;
+
+    @Setup
+    public void init() {
+        d = new VectorAlgorithmsImpl.Data(SIZE, SEED, NUM_X_OBJECTS);
+    }
+
+    // ------------------------------------------------------------------------------------------
+    //               Benchmarks just forward arguments and returns.
+    // ------------------------------------------------------------------------------------------
+
+    @Benchmark
+    public Object fillI_loop() {
+        return VectorAlgorithmsImpl.fillI_loop(d.rI1);
+    }
+
+    @Benchmark
+    public Object fillI_VectorAPI() {
+        return VectorAlgorithmsImpl.fillI_VectorAPI(d.rI1);
+    }
+
+    @Benchmark
+    public Object fillI_Arrays() {
+        return VectorAlgorithmsImpl.fillI_Arrays(d.rI1);
+    }
+
+    @Benchmark
+    public Object iotaI_loop() {
+        return VectorAlgorithmsImpl.iotaI_loop(d.rI1);
+    }
+
+    @Benchmark
+    public Object iotaI_VectorAPI() {
+        return VectorAlgorithmsImpl.iotaI_VectorAPI(d.rI1);
+    }
+
+    @Benchmark
+    public Object copyI_loop() {
+        return VectorAlgorithmsImpl.copyI_loop(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object copyI_VectorAPI() {
+        return VectorAlgorithmsImpl.copyI_VectorAPI(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object copyI_System_arraycopy() {
+        return VectorAlgorithmsImpl.copyI_System_arraycopy(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object mapI_loop() {
+        return VectorAlgorithmsImpl.mapI_loop(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object mapI_VectorAPI() {
+        return VectorAlgorithmsImpl.mapI_VectorAPI(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public int reduceAddI_loop() {
+        return VectorAlgorithmsImpl.reduceAddI_loop(d.aI);
+    }
+
+    @Benchmark
+    public int reduceAddI_reassociate() {
+        return VectorAlgorithmsImpl.reduceAddI_reassociate(d.aI);
+    }
+
+    @Benchmark
+    public int reduceAddI_VectorAPI_naive() {
+        return VectorAlgorithmsImpl.reduceAddI_VectorAPI_naive(d.aI);
+    }
+
+    @Benchmark
+    public int reduceAddI_VectorAPI_reduction_after_loop() {
+        return VectorAlgorithmsImpl.reduceAddI_VectorAPI_reduction_after_loop(d.aI);
+    }
+
+    @Benchmark
+    public float dotProductF_loop() {
+        return VectorAlgorithmsImpl.dotProductF_loop(d.aF, d.bF);
+    }
+
+    @Benchmark
+    public float dotProductF_VectorAPI_naive() {
+        return VectorAlgorithmsImpl.dotProductF_VectorAPI_naive(d.aF, d.bF);
+    }
+
+    @Benchmark
+    public float dotProductF_VectorAPI_reduction_after_loop() {
+        return VectorAlgorithmsImpl.dotProductF_VectorAPI_reduction_after_loop(d.aF, d.bF);
+    }
+
+    @Benchmark
+    public int hashCodeB_loop() {
+        return VectorAlgorithmsImpl.hashCodeB_loop(d.aB);
+    }
+
+    @Benchmark
+    public int hashCodeB_Arrays() {
+        return VectorAlgorithmsImpl.hashCodeB_Arrays(d.aB);
+    }
+
+    @Benchmark
+    public int hashCodeB_VectorAPI_v1() {
+        return VectorAlgorithmsImpl.hashCodeB_VectorAPI_v1(d.aB);
+    }
+
+    @Benchmark
+    public int hashCodeB_VectorAPI_v2() {
+        return VectorAlgorithmsImpl.hashCodeB_VectorAPI_v2(d.aB);
+    }
+
+    @Benchmark
+    public Object scanAddI_loop() {
+        return VectorAlgorithmsImpl.scanAddI_loop(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object scanAddI_loop_reassociate() {
+        return VectorAlgorithmsImpl.scanAddI_loop_reassociate(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object scanAddI_VectorAPI_permute_add() {
+        return VectorAlgorithmsImpl.scanAddI_VectorAPI_permute_add(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public int findMinIndexI_loop() {
+        return VectorAlgorithmsImpl.findMinIndexI_loop(d.aI);
+    }
+
+    @Benchmark
+    public int findMinIndexI_VectorAPI() {
+        return VectorAlgorithmsImpl.findMinIndexI_VectorAPI(d.aI);
+    }
+
+    @Benchmark
+    public int findI_loop() {
+        // Every invocation should have a different value for e, so that
+        // we don't get branch-prediction that is too good. And also so
+        // that the position where we exit is more evenly distributed.
+        d.eI_idx = (d.eI_idx + 1) & 0xffff;
+        int e = d.eI[d.eI_idx];
+        return VectorAlgorithmsImpl.findI_loop(d.aI, e);
+    }
+
+    @Benchmark
+    public int findI_VectorAPI() {
+        d.eI_idx = (d.eI_idx + 1) & 0xffff;
+        int e = d.eI[d.eI_idx];
+        return VectorAlgorithmsImpl.findI_VectorAPI(d.aI, e);
+    }
+
+    @Benchmark
+    public Object reverseI_loop() {
+        return VectorAlgorithmsImpl.reverseI_loop(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object reverseI_VectorAPI() {
+        return VectorAlgorithmsImpl.reverseI_VectorAPI(d.aI, d.rI1);
+    }
+
+    @Benchmark
+    public Object filterI_loop() {
+        // Every invocation should have a different value for e, so that
+        // we don't get branch-prediction that is too good. And also so
+        // That the length of the resulting data is more evenly distributed.
+        d.eI_idx = (d.eI_idx + 1) & 0xffff;
+        int e = d.eI[d.eI_idx];
+        return VectorAlgorithmsImpl.filterI_loop(d.aI, d.rI1, e);
+    }
+
+    @Benchmark
+    public Object filterI_VectorAPI() {
+        d.eI_idx = (d.eI_idx + 1) & 0xffff;
+        int e = d.eI[d.eI_idx];
+        return VectorAlgorithmsImpl.filterI_VectorAPI(d.aI, d.rI1, e);
+    }
+
+    @Benchmark
+    public int reduceAddIFieldsX4_loop() {
+        return VectorAlgorithmsImpl.reduceAddIFieldsX4_loop(d.oopsX4, d.memX4);
+    }
+
+    @Benchmark
+    public int reduceAddIFieldsX4_VectorAPI() {
+        return VectorAlgorithmsImpl.reduceAddIFieldsX4_VectorAPI(d.oopsX4, d.memX4);
+    }
+
+    @Benchmark
+    public Object lowerCaseB_loop() {
+        return VectorAlgorithmsImpl.lowerCaseB_loop(d.strB, d.rB1);
+    }
+
+    @Benchmark
+    public Object lowerCaseB_VectorAPI_v1() {
+        return VectorAlgorithmsImpl.lowerCaseB_VectorAPI_v1(d.strB, d.rB1);
+    }
+
+    @Benchmark
+    public Object lowerCaseB_VectorAPI_v2() {
+        return VectorAlgorithmsImpl.lowerCaseB_VectorAPI_v2(d.strB, d.rB1);
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java b/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java
new file mode 100644
index 00000000000..5ab057329d3
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorAlgorithmsImpl.java
@@ -0,0 +1,775 @@
+/*
+ *  Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ *  This code is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 only, as
+ *  published by the Free Software Foundation.
+ *
+ *  This code is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  version 2 for more details (a copy is included in the LICENSE file that
+ *  accompanied this code).
+ *
+ *  You should have received a copy of the GNU General Public License version
+ *  2 along with this work; if not, write to the Free Software Foundation,
+ *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ *  or visit www.oracle.com if you need additional information or have any
+ *  questions.
+ *
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import java.util.Arrays;
+import java.util.Random;
+import jdk.incubator.vector.*;
+
+/**
+ * The code below is supposed to be an exact copy of:
+ *   test/hotspot/jtreg/compiler/vectorization/VectorAlgorithmsImpl.java
+ */
+public class VectorAlgorithmsImpl {
+    private static final VectorSpecies<Integer> SPECIES_I    = IntVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Integer> SPECIES_I512 = IntVector.SPECIES_512;
+    private static final VectorSpecies<Integer> SPECIES_I256 = IntVector.SPECIES_256;
+    private static final VectorSpecies<Byte> SPECIES_B       = ByteVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Byte> SPECIES_B64     = ByteVector.SPECIES_64;
+    private static final VectorSpecies<Float> SPECIES_F      = FloatVector.SPECIES_PREFERRED;
+
+    // This class stores the input and output arrays.
+    // The constructor sets up all the data.
+    //
+    // IMPORTANT:
+    //   If you want to use some array but do NOT modify it: just use it.
+    //   If you want to use it and DO want to modify it: clone it. This
+    //   ensures that each test gets a separate copy, and that when we
+    //   capture the modified arrays they are different for every method
+    //   and run.
+    //   An alternative to cloning is to use different return arrays for
+    //   different implementations of the same group, e.g. rI1, rI2, ...
+    //
+    public static class Data {
+        public int[] aI;
+        public int[] rI1;
+        public int[] rI2;
+        public int[] rI3;
+        public int[] rI4;
+        public int[] eI;
+        // The test has to use the same index into eI for all implementations. But in the
+        // benchmark, we'd like to use random indices, so we use the index to advance through
+        // the array.
+        public int eI_idx = 0;
+
+        public float[] aF;
+        public float[] bF;
+
+        public byte[] aB;
+        public byte[] strB;
+        public byte[] rB1;
+        public byte[] rB2;
+        public byte[] rB3;
+
+        public int[] oopsX4;
+        public int[] memX4;
+
+        public Data(int size, int seed, int numX4Objects) {
+            Random random = new Random(seed);
+
+            // int: one input array and multiple output arrays so different implementations can
+            // store their results to different arrays.
+            aI = new int[size];
+            rI1 = new int[size];
+            rI2 = new int[size];
+            rI3 = new int[size];
+            rI4 = new int[size];
+            Arrays.setAll(aI, i -> random.nextInt());
+
+            // Populate with some random values from aI, and some totally random values.
+            eI = new int[0x10000];
+            for (int i = 0; i < eI.length; i++) {
+                eI[i] = (random.nextInt(10) == 0) ? random.nextInt() : aI[random.nextInt(size)];
+            }
+
+            // X4 oop setup.
+            // oopsX4 holds "addresses" (i.e. indices), that point to the 16-byte objects in memX4.
+            oopsX4 = new int[size];
+            memX4 = new int[numX4Objects * 4];
+            for (int i = 0; i < size; i++) {
+                // assign either a zero=null, or assign a random oop.
+                oopsX4[i] = (random.nextInt(10) == 0) ? 0 : random.nextInt(numX4Objects) * 4;
+            }
+            // Just fill the whole array with random values.
+            // The relevant field is only at every "4 * i + 3" though.
+            memX4 = new int[4 * numX4Objects];
+            for (int i = 0; i < memX4.length; i++) {
+                memX4[i] = random.nextInt();
+            }
+
+            // float inputs. To avoid rounding issues, only use small integers.
+            aF = new float[size];
+            bF = new float[size];
+            for (int i = 0; i < size; i++) {
+                aF[i] = random.nextInt(32) - 16;
+                bF[i] = random.nextInt(32) - 16;
+            }
+
+            // byte: just random data.
+            aB = new byte[size];
+            strB = new byte[size];
+            rB1 = new byte[size];
+            rB2 = new byte[size];
+            rB3 = new byte[size];
+            random.nextBytes(aB);
+            random.nextBytes(strB); // TODO: special data!
+        }
+    }
+
+    public static Object fillI_loop(int[] r) {
+        for (int i = 0; i < r.length; i++) {
+            r[i] = 42;
+        }
+        return r;
+    }
+
+    public static Object fillI_Arrays(int[] r) {
+        Arrays.fill(r, 42);
+        return r;
+    }
+
+    public static Object fillI_VectorAPI(int[] r) {
+        var v = IntVector.broadcast(SPECIES_I, 42);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            v.intoArray(r, i);
+        }
+        for (; i < r.length; i++) {
+            r[i] = 42;
+        }
+        return r;
+    }
+
+    public static Object iotaI_loop(int[] r) {
+        for (int i = 0; i < r.length; i++) {
+            r[i] = i;
+        }
+        return r;
+    }
+
+    public static Object iotaI_VectorAPI(int[] r) {
+        var iota = IntVector.broadcast(SPECIES_I, 0).addIndex(1);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            iota.intoArray(r, i);
+            iota = iota.add(SPECIES_I.length());
+        }
+        for (; i < r.length; i++) {
+            r[i] = i;
+        }
+        return r;
+    }
+
+    public static Object copyI_loop(int[] a, int[] r) {
+        for (int i = 0; i < a.length; i++) {
+            r[i] = a[i];
+        }
+        return r;
+    }
+
+    public static Object copyI_System_arraycopy(int[] a, int[] r) {
+        System.arraycopy(a, 0, r, 0, a.length);
+        return r;
+    }
+
+    public static Object copyI_VectorAPI(int[] a, int[] r) {
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            v.intoArray(r, i);
+        }
+        for (; i < r.length; i++) {
+            r[i] = a[i];
+        }
+        return r;
+    }
+
+    public static Object mapI_loop(int[] a, int[] r) {
+        for (int i = 0; i < a.length; i++) {
+            r[i] = a[i] * 42;
+        }
+        return r;
+    }
+
+    public static Object mapI_VectorAPI(int[] a, int[] r) {
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(r.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            v = v.mul(42);
+            v.intoArray(r, i);
+        }
+        for (; i < r.length; i++) {
+            r[i] = a[i] * 42;
+        }
+        return r;
+    }
+
+    public static int reduceAddI_loop(int[] a) {
+        int sum = 0;
+        for (int i = 0; i < a.length; i++) {
+            // Relying on simple reduction loop should vectorize since JDK26.
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static int reduceAddI_reassociate(int[] a) {
+        int sum = 0;
+        int i;
+        for (i = 0; i < a.length - 3; i += 4) {
+            // Unroll 4x, reassociate inside.
+            sum += a[i] + a[i + 1] + a[i + 2] + a[i + 3];
+        }
+        for (; i < a.length; i++) {
+            // Tail
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static int reduceAddI_VectorAPI_naive(int[] a) {
+        var sum = 0;
+        int i;
+        for (i = 0; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            // reduceLanes in loop is better than scalar performance, but still
+            // relatively slow.
+            sum += v.reduceLanes(VectorOperators.ADD);
+        }
+        for (; i < a.length; i++) {
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static int reduceAddI_VectorAPI_reduction_after_loop(int[] a) {
+        var acc = IntVector.broadcast(SPECIES_I, 0);
+        int i;
+        for (i = 0; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            // Element-wide addition into a vector of partial sums is much faster.
+            // Now, we only need to do a reduceLanes after the loop.
+            // This works because int-addition is associative and commutative.
+            acc = acc.add(v);
+        }
+        int sum = acc.reduceLanes(VectorOperators.ADD);
+        for (; i < a.length; i++) {
+            sum += a[i];
+        }
+        return sum;
+    }
+
+    public static float dotProductF_loop(float[] a, float[] b) {
+        float sum = 0;
+        for (int i = 0; i < a.length; i++) {
+            sum += a[i] * b[i];
+        }
+        return sum;
+    }
+
+    public static float dotProductF_VectorAPI_naive(float[] a, float[] b) {
+        float sum = 0;
+        int i;
+        for (i = 0; i < SPECIES_F.loopBound(a.length); i += SPECIES_F.length()) {
+            var va = FloatVector.fromArray(SPECIES_F, a, i);
+            var vb = FloatVector.fromArray(SPECIES_F, b, i);
+            sum += va.mul(vb).reduceLanes(VectorOperators.ADD);
+        }
+        for (; i < a.length; i++) {
+            sum += a[i] * b[i];
+        }
+        return sum;
+    }
+
+    public static float dotProductF_VectorAPI_reduction_after_loop(float[] a, float[] b) {
+        var sums = FloatVector.broadcast(SPECIES_F, 0.0f);
+        int i;
+        for (i = 0; i < SPECIES_F.loopBound(a.length); i += SPECIES_F.length()) {
+            var va = FloatVector.fromArray(SPECIES_F, a, i);
+            var vb = FloatVector.fromArray(SPECIES_F, b, i);
+            sums = sums.add(va.mul(vb));
+        }
+        float sum = sums.reduceLanes(VectorOperators.ADD);
+        for (; i < a.length; i++) {
+            sum += a[i] * b[i];
+        }
+        return sum;
+    }
+
+    public static int hashCodeB_loop(byte[] a) {
+        int h = 1;
+        for (int i = 0; i < a.length; i++) {
+            h = 31 * h + a[i];
+        }
+        return h;
+    }
+
+    public static int hashCodeB_Arrays(byte[] a) {
+        return Arrays.hashCode(a);
+    }
+
+    // Simplified intrinsic code from C2_MacroAssembler::arrays_hashcode in c2_MacroAssembler_x86.cpp
+    //
+    // Ideas that may help understand the code:
+    //   h(i) = 31 * h(i-1) + a[i]
+    // "unroll" by factor of L=8:
+    //   h(i+8) = h(i) * 31^8 + a[i+1] * 31^7 + a[i+2] * 31^6 + ... + a[i+8] * 1
+    //            -----------   ------------------------------------------------
+    //            scalar        vector: notice the powers of 31 in reverse
+    //
+    // We notice that we can load a[i+1 .. i+8], then element-wise multiply with
+    // the vector of reversed powers-of-31, and then do reduceLanes(ADD).
+    // But we can do even better: By looking at multiple such 8-unrolled iterations.
+    // Instead of applying the "next" factor of "31^8" to the reduced scalar, we can
+    // already apply it element-wise. That allows us to move the reduction out
+    // of the loop.
+    //
+    // Note: the intrinsic additionally unrolls the loop by a factor of 4,
+    //       but we want to keep thins simple for demonstration purposes.
+    //
+    private static int[] REVERSE_POWERS_OF_31 = new int[9];
+    static {
+        int p = 1;
+        for (int i = REVERSE_POWERS_OF_31.length - 1; i >= 0; i--) {
+            REVERSE_POWERS_OF_31[i] = p;
+            p *= 31;
+        }
+    }
+    public static int hashCodeB_VectorAPI_v1(byte[] a) {
+        int result = 1; // initialValue
+        var vresult = IntVector.zero(SPECIES_I256);
+        int next = REVERSE_POWERS_OF_31[0]; // 31^L
+        var vcoef = IntVector.fromArray(SPECIES_I256, REVERSE_POWERS_OF_31, 1); // powers of 2 in reverse
+        int i;
+        for (i = 0; i < SPECIES_B64.loopBound(a.length); i += SPECIES_B64.length()) {
+            // scalar part: result *= 31^L
+            result *= next;
+            // vector part: element-wise apply the next factor and add in the new values.
+            var vb = ByteVector.fromArray(SPECIES_B64, a, i);
+            var vi = vb.castShape(SPECIES_I256, 0);
+            vresult = vresult.mul(next).add(vi);
+        }
+        // reduce the partial hashes in the elements, using the reverse list of powers of 2.
+        result += vresult.mul(vcoef).reduceLanes(VectorOperators.ADD);
+        for (; i < a.length; i++) {
+            result = 31 * result + a[i];
+        }
+        return result;
+    }
+
+    // This second approach follows the idea from this blog post by Otmar Ertl:
+    // https://www.dynatrace.com/news/blog/java-arrays-hashcode-byte-efficiency-techniques/
+    //
+    // I simplified the algorithm a little, so that it is a bit closer
+    // to the solution "v1" above.
+    //
+    // The major issue with "v1" is that we cannot load a full vector of bytes,
+    // because of the cast to ints. So we can only fill 1/4 of the maximal
+    // vector size. The trick here is to do an unrolling of factor 4, from:
+    //   h(i) = 31 * h(i-1) + a[i]
+    // to:
+    //   h(i+4) = h(i) * 31^4 + a[i + 1] * 31^3
+    //                        + a[i + 2] * 31^2
+    //                        + a[i + 3] * 31^1
+    //                        + a[i + 4] * 31^0
+    // The goal is now to compute this value for 4 bytes within a 4 byte
+    // lane of the vector. One concern is that we start with byte values,
+    // but need to do int-multiplication with powers of 31. If we instead
+    // did a byte-multiplication, we could get overflows that we would not
+    // have had in the int-multiplication.
+    // One trick that helps with chaning the size of the lanes from byte
+    // to short to int is doing all operations with unsigned integers. That
+    // way, we can zero-extend instead of sign-bit extend. The first step
+    // is thus to convert the bytes into unsigned values. Since byte is in
+    // range [-128..128), doing "a[i+j] + 128" makes it a positive value,
+    // allowing for unsigned multiplication.
+    // h(i+4) = h(i) * 31^4 +   a[i + 1]              * 31^3
+    //                      +   a[i + 2]              * 31^2
+    //                      +   a[i + 3]              * 31^1
+    //                      +   a[i + 4]              * 31^0
+    //        = h(i) * 31^4 +  (a[i + 1] + 128 - 128) * 31^3
+    //                      +  (a[i + 2] + 128 - 128) * 31^2
+    //                      +  (a[i + 3] + 128 - 128) * 31^1
+    //                      +  (a[i + 4] + 128 - 128) * 31^0
+    //        = h(i) * 31^4 +  (a[i + 1] + 128      ) * 31^3
+    //                      +  (a[i + 2] + 128      ) * 31^2
+    //                      +  (a[i + 3] + 128      ) * 31^1
+    //                      +  (a[i + 4] + 128      ) * 31^0
+    //                      +  -128 * (31^3 + 31^2 + 31^1 + 1)
+    //        = h(i) * 31^4 + ((a[i + 1] + 128) * 31
+    //                      +  (a[i + 2] + 128      ) * 31^2
+    //                      + ((a[i + 3] + 128) * 31
+    //                      +  (a[i + 4] + 128      )
+    //                      +  -128 * (31^3 + 31^2 + 31^1 + 1)
+    //
+    // Getting from the signed a[i] value to unsigned with +128, we can
+    // just xor with 0x80=128. Any numbers there in range [-128..0) are
+    // now in range [0..128). And any numbers that were in range [0..128)
+    // are now in unsigned range [128..255). What a neat trick!
+    //
+    // We then apply a byte->short transition where we crunch 2 bytes
+    // into one short, applying a multiplication with 31 to one of the
+    // two bytes. This multiplication cannot overflow in a short.
+    // then we apply a short->int transition where we crunch 2 shorts
+    // into one int, applying a multiplication with 31^2 to one of the
+    // two shorts. This multiplication cannot overflow in an int.
+    //
+    public static int hashCodeB_VectorAPI_v2(byte[] a) {
+        return HashCodeB_VectorAPI_V2.compute(a);
+    }
+
+    private static class HashCodeB_VectorAPI_V2 {
+        private static final int L = Math.min(ByteVector.SPECIES_PREFERRED.length(),
+                                              IntVector.SPECIES_PREFERRED.length() * 4);
+        private static final VectorShape SHAPE = VectorShape.forBitSize(8 * L);
+        private static final VectorSpecies<Byte>    SPECIES_B = SHAPE.withLanes(byte.class);
+        private static final VectorSpecies<Integer> SPECIES_I = SHAPE.withLanes(int.class);
+
+        private static int[] REVERSE_POWERS_OF_31_STEP_4 = new int[L / 4 + 1];
+        static {
+            int p = 1;
+            int step = 31 * 31 * 31 * 31; // step by 4
+            for (int i = REVERSE_POWERS_OF_31_STEP_4.length - 1; i >= 0; i--) {
+                REVERSE_POWERS_OF_31_STEP_4[i] = p;
+                p *= step;
+            }
+        }
+
+        public static int compute(byte[] a) {
+            int result = 1; // initialValue
+            int next = REVERSE_POWERS_OF_31_STEP_4[0]; // 31^L
+            var vcoef = IntVector.fromArray(SPECIES_I, REVERSE_POWERS_OF_31_STEP_4, 1); // W
+            var vresult = IntVector.zero(SPECIES_I);
+            int i;
+            for (i = 0; i < SPECIES_B.loopBound(a.length); i += SPECIES_B.length()) {
+                var vb = ByteVector.fromArray(SPECIES_B, a, i);
+                // Add 128 to each byte.
+                var vs = vb.lanewise(VectorOperators.XOR, (byte)0x80)
+                           .reinterpretAsShorts();
+                // Each short lane contains 2 bytes, crunch them.
+                var vi = vs.and((short)0xff) // lower byte
+                           .mul((short)31)
+                           .add(vs.lanewise(VectorOperators.LSHR, 8)) // upper byte
+                           .reinterpretAsInts();
+                // Each int contains 2 shorts, crunch them.
+                var v  = vi.and(0xffff) // lower short
+                           .mul(31 * 31)
+                           .add(vi.lanewise(VectorOperators.LSHR, 16)); // upper short
+                // Add the correction for the 128 additions above.
+                v = v.add(-128 * (31*31*31 + 31*31 + 31 + 1));
+                // Every element of v now contains a crunched int-package of 4 bytes.
+                result *= next;
+                vresult = vresult.mul(next).add(v);
+            }
+            result += vresult.mul(vcoef).reduceLanes(VectorOperators.ADD);
+            for (; i < a.length; i++) {
+                result = 31 * result + a[i];
+            }
+            return result;
+        }
+    }
+
+    public static Object scanAddI_loop(int[] a, int[] r) {
+        int sum = 0;
+        for (int i = 0; i < a.length; i++) {
+            sum += a[i];
+            r[i] = sum;
+        }
+        return r;
+    }
+
+    public static Object scanAddI_loop_reassociate(int[] a, int[] r) {
+        int sum = 0;
+        int i = 0;
+        for (; i < a.length - 3; i += 4) {
+            // We cut the latency by a factor of 4, but increase the number of additions.
+            int old_sum = sum;
+            int v0 = a[i + 0];
+            int v1 = a[i + 1];
+            int v2 = a[i + 2];
+            int v3 = a[i + 3];
+            int v01 = v0 + v1;
+            int v23 = v2 + v3;
+            int v0123 = v01 + v23;
+            sum += v0123;
+            r[i + 0] = old_sum + v0;
+            r[i + 1] = old_sum + v01;
+            r[i + 2] = old_sum + v01 + v2;
+            r[i + 3] = old_sum + v0123;
+        }
+        for (; i < a.length; i++) {
+            sum += a[i];
+            r[i] = sum;
+        }
+        return r;
+    }
+
+    public static Object scanAddI_VectorAPI_permute_add(int[] a, int[] r) {
+        // Using Naive Parallel Algorithm: Hills and Steele
+        int sum = 0;
+        int xx = 0; // masked later anyway
+        var shf1 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14}, 0);
+        var shf2 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx, xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13}, 0);
+        var shf3 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx, xx, xx, xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11}, 0);
+        var shf4 = VectorShuffle.fromArray(SPECIES_I512, new int[]{xx, xx, xx, xx, xx, xx, xx, xx,  0,  1,  2,  3,  4,  5,  6,  7}, 0);
+        var mask1 = VectorMask.fromLong(SPECIES_I512, 0b1111111111111110);
+        var mask2 = VectorMask.fromLong(SPECIES_I512, 0b1111111111111100);
+        var mask3 = VectorMask.fromLong(SPECIES_I512, 0b1111111111110000);
+        var mask4 = VectorMask.fromLong(SPECIES_I512, 0b1111111100000000);
+        int i = 0;
+        for (; i < SPECIES_I512.loopBound(a.length); i += SPECIES_I512.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I512, a, i);
+            v = v.add(v.rearrange(shf1), mask1);
+            v = v.add(v.rearrange(shf2), mask2);
+            v = v.add(v.rearrange(shf3), mask3);
+            v = v.add(v.rearrange(shf4), mask4);
+            v = v.add(sum);
+            v.intoArray(r, i);
+            sum = v.lane(SPECIES_I512.length() - 1);
+        }
+        for (; i < a.length; i++) {
+            sum += a[i];
+            r[i] = sum;
+        }
+        return r;
+    }
+
+    public static int findMinIndexI_loop(int[] a) {
+        int min = a[0];
+        int index = 0;
+        for (int i = 1; i < a.length; i++) {
+            int ai = a[i];
+            if (ai < min) {
+                min = ai;
+                index = i;
+            }
+        }
+        return index;
+    }
+
+    public static int findMinIndexI_VectorAPI(int[] a) {
+        // Main approach: have partial results in mins and idxs.
+        var mins = IntVector.broadcast(SPECIES_I, a[0]);
+        var idxs = IntVector.broadcast(SPECIES_I, 0);
+        var iota = IntVector.broadcast(SPECIES_I, 0).addIndex(1);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            var mask = v.compare(VectorOperators.LT, mins);
+            mins = mins.blend(v, mask);
+            idxs = idxs.blend(iota, mask);
+            iota = iota.add(SPECIES_I.length());
+        }
+        // Reduce the vectors down
+        int min = mins.reduceLanes(VectorOperators.MIN);
+        var not_min_mask = mins.compare(VectorOperators.NE, min);
+        int index = idxs.blend(a.length, not_min_mask).reduceLanes(VectorOperators.MIN);
+        // Tail loop
+        for (; i < a.length; i++) {
+            int ai = a[i];
+            if (ai < min) {
+                min = ai;
+                index = i;
+            }
+        }
+        return index;
+    }
+
+    public static int findI_loop(int[] a, int e) {
+        for (int i = 0; i < a.length; i++) {
+            int ai = a[i];
+            if (ai == e) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static int findI_VectorAPI(int[] a, int e) {
+        var es = IntVector.broadcast(SPECIES_I, e);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            var mask = v.compare(VectorOperators.EQ, es);
+            if (mask.anyTrue()) {
+                return i + mask.firstTrue();
+            }
+        }
+        for (; i < a.length; i++) {
+            int ai = a[i];
+            if (ai == e) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static Object reverseI_loop(int[] a, int[] r) {
+        for (int i = 0; i < a.length; i++) {
+            r[a.length - i - 1] = a[i];
+        }
+        return r;
+    }
+
+    private static final VectorShuffle<Integer> REVERSE_SHUFFLE_I = SPECIES_I.iotaShuffle(SPECIES_I.length()-1, -1, true);
+
+    public static Object reverseI_VectorAPI(int[] a, int[] r) {
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            v = v.rearrange(REVERSE_SHUFFLE_I);
+            v.intoArray(r, r.length - SPECIES_I.length() - i);
+        }
+        for (; i < a.length; i++) {
+            r[a.length - i - 1] = a[i];
+        }
+        return r;
+    }
+
+    public static Object filterI_loop(int[] a, int[] r, int threshold) {
+        int j = 0;
+        for (int i = 0; i < a.length; i++) {
+            int ai = a[i];
+            if (ai >= threshold) {
+                r[j++] = ai;
+            }
+        }
+        // Just force the resulting length onto the same array.
+        r[r.length - 1] = j;
+        return r;
+    }
+
+    public static Object filterI_VectorAPI(int[] a, int[] r, int threshold) {
+        var thresholds = IntVector.broadcast(SPECIES_I, threshold);
+        int j = 0;
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(a.length); i += SPECIES_I.length()) {
+            IntVector v = IntVector.fromArray(SPECIES_I, a, i);
+            var mask = v.compare(VectorOperators.GE, thresholds);
+            v = v.compress(mask);
+            int trueCount = mask.trueCount();
+            var prefixMask = mask.compress();
+            v.intoArray(r, j, prefixMask);
+            j += trueCount;
+        }
+
+        for (; i < a.length; i++) {
+            int ai = a[i];
+            if (ai >= threshold) {
+                r[j++] = ai;
+            }
+        }
+        // Just force the resulting length onto the same array.
+        r[r.length - 1] = j;
+        return r;
+    }
+
+    // X4: ints simulate 4-byte oops.
+    // oops: if non-zero (= non-null), every entry simulates a 4-byte oop, pointing into mem.
+    // mem: an int array that simulates the memory.
+    //
+    // Task: Find all non-null oops, and dereference them, get the relevant field.
+    //       Objects have 16 bytes, and the relevant field is at bytes 12-16.
+    //       That maps to 4 ints, and the relevant field is the 4th element of 4.
+    //       Sum up all the field values.
+    public static int reduceAddIFieldsX4_loop(int[] oops, int[] mem) {
+        int sum = 0;
+        for (int i = 0; i < oops.length; i++) {
+            int oop = oops[i];
+            if (oop != 0) {
+                int fieldValue = mem[oop + 3]; // oop+12
+                sum += fieldValue;
+            }
+        }
+        return sum;
+    }
+
+    public static int reduceAddIFieldsX4_VectorAPI(int[] oops, int[] mem) {
+        var acc = IntVector.broadcast(SPECIES_I, 0);
+        int i = 0;
+        for (; i < SPECIES_I.loopBound(oops.length); i += SPECIES_I.length()) {
+            var oopv = IntVector.fromArray(SPECIES_I, oops, i);
+            var mask = oopv.compare(VectorOperators.NE, /* null */0);
+            // We are lucky today: we need to access mem[oop + 3]
+            var fieldValues = IntVector.fromArray(SPECIES_I, mem, 3, oops, i, mask);
+            acc = acc.add(fieldValues);
+        }
+        int sum = acc.reduceLanes(VectorOperators.ADD);
+        for (; i < oops.length; i++) {
+            int oop = oops[i];
+            if (oop != 0) {
+                int fieldValue = mem[oop + 3]; // oop+12
+                sum += fieldValue;
+            }
+        }
+        return sum;
+    }
+
+    // The lowerCase example demonstrates a lane-wise control-flow diamond.
+    public static Object lowerCaseB_loop(byte[] a, byte[] r) {
+        for (int i = 0; i < a.length; i++) {
+            byte c = a[i];
+            if (c >= 'A' && c <= 'Z') {
+                c += ('a' - 'A'); // c += 32
+            }
+            r[i] = c;
+        }
+        return r;
+    }
+
+    // Control-flow diamonds can easily be simulated by "if-conversion", i.e.
+    // by using masked operations. An alternative would be to use blend.
+    public static Object lowerCaseB_VectorAPI_v1(byte[] a, byte[] r) {
+        int i;
+        for (i = 0; i < SPECIES_B.loopBound(a.length); i += SPECIES_B.length()) {
+            var vc = ByteVector.fromArray(SPECIES_B, a, i);
+            var maskA = vc.compare(VectorOperators.GE, (byte)'A');
+            var maskZ = vc.compare(VectorOperators.LE, (byte)'Z');
+            var mask = maskA.and(maskZ);
+            vc = vc.add((byte)32, mask);
+            vc.intoArray(r, i);
+        }
+        for (; i < a.length; i++) {
+            byte c = a[i];
+            if (c >= 'A' && c <= 'Z') {
+                c += ('a' - 'A');
+            }
+            r[i] = c;
+        }
+        return r;
+    }
+
+    public static Object lowerCaseB_VectorAPI_v2(byte[] a, byte[] r) {
+        int i;
+        for (i = 0; i < SPECIES_B.loopBound(a.length); i += SPECIES_B.length()) {
+            var vc = ByteVector.fromArray(SPECIES_B, a, i);
+            // We can convert the range 65..90 (represents ascii A..Z) into a range 0..25.
+            // This allows us to only use a single unsigned comparison.
+            var vt = vc.add((byte)-'A');
+            var mask = vt.compare(VectorOperators.ULE, (byte)25);
+            vc = vc.add((byte)32, mask);
+            vc.intoArray(r, i);
+        }
+        for (; i < a.length; i++) {
+            byte c = a[i];
+            if (c >= 'A' && c <= 'Z') {
+                c += ('a' - 'A');
+            }
+            r[i] = c;
+        }
+        return r;
+    }
+}
+
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorSubword.java b/test/micro/org/openjdk/bench/vm/compiler/VectorSubword.java
new file mode 100644
index 00000000000..5ade452b875
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorSubword.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 2, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3)
+public class VectorSubword {
+    @Param({"1024"})
+    public int SIZE;
+
+    private byte[] bytes;
+    private short[] shorts;
+    private char[] chars;
+    private int[] ints;
+    private long[] longs;
+
+    @Setup
+    public void init() {
+        bytes = new byte[SIZE];
+        shorts = new short[SIZE];
+        chars = new char[SIZE];
+        ints = new int[SIZE];
+        longs = new long[SIZE];
+    }
+
+    // Narrowing
+
+    @Benchmark
+    public void shortToByte() {
+        for (int i = 0; i < SIZE; i++) {
+            bytes[i] = (byte) shorts[i];
+        }
+    }
+
+    @Benchmark
+    public void shortToChar() {
+        for (int i = 0; i < SIZE; i++) {
+            chars[i] = (char) shorts[i];
+        }
+    }
+
+    @Benchmark
+    public void charToByte() {
+        for (int i = 0; i < SIZE; i++) {
+            bytes[i] = (byte) chars[i];
+        }
+    }
+
+    @Benchmark
+    public void charToShort() {
+        for (int i = 0; i < SIZE; i++) {
+            shorts[i] = (short) chars[i];
+        }
+    }
+
+    @Benchmark
+    public void intToByte() {
+        for (int i = 0; i < SIZE; i++) {
+            bytes[i] = (byte) ints[i];
+        }
+    }
+
+    @Benchmark
+    public void intToShort() {
+        for (int i = 0; i < SIZE; i++) {
+            shorts[i] = (short) ints[i];
+        }
+    }
+
+    @Benchmark
+    public void intToChar() {
+        for (int i = 0; i < SIZE; i++) {
+            chars[i] = (char) ints[i];
+        }
+    }
+
+    @Benchmark
+    public void longToByte() {
+        for (int i = 0; i < SIZE; i++) {
+            bytes[i] = (byte) longs[i];
+        }
+    }
+
+    @Benchmark
+    public void longToShort() {
+        for (int i = 0; i < SIZE; i++) {
+            shorts[i] = (short) longs[i];
+        }
+    }
+
+    @Benchmark
+    public void longToChar() {
+        for (int i = 0; i < SIZE; i++) {
+            chars[i] = (char) longs[i];
+        }
+    }
+
+    @Benchmark
+    public void longToInt() {
+        for (int i = 0; i < SIZE; i++) {
+            ints[i] = (int) longs[i];
+        }
+    }
+
+    // Widening
+
+    @Benchmark
+    public void byteToShort() {
+        for (int i = 0; i < SIZE; i++) {
+            shorts[i] = bytes[i];
+        }
+    }
+
+    @Benchmark
+    public void byteToChar() {
+        for (int i = 0; i < SIZE; i++) {
+            chars[i] = (char) bytes[i];
+        }
+    }
+
+    @Benchmark
+    public void byteToInt() {
+        for (int i = 0; i < SIZE; i++) {
+            ints[i] = bytes[i];
+        }
+    }
+
+    @Benchmark
+    public void byteToLong() {
+        for (int i = 0; i < SIZE; i++) {
+            longs[i] = bytes[i];
+        }
+    }
+
+    @Benchmark
+    public void shortToInt() {
+        for (int i = 0; i < SIZE; i++) {
+            ints[i] = shorts[i];
+        }
+    }
+
+    @Benchmark
+    public void shortToLong() {
+        for (int i = 0; i < SIZE; i++) {
+            longs[i] = shorts[i];
+        }
+    }
+
+    @Benchmark
+    public void charToInt() {
+        for (int i = 0; i < SIZE; i++) {
+            ints[i] = chars[i];
+        }
+    }
+
+    @Benchmark
+    public void charToLong() {
+        for (int i = 0; i < SIZE; i++) {
+            longs[i] = chars[i];
+        }
+    }
+
+    @Benchmark
+    public void intToLong() {
+        for (int i = 0; i < SIZE; i++) {
+            longs[i] = ints[i];
+        }
+    }
+
+}